diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 7f936b0a7e4..75217a47f7b 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,4531 @@ +2010-06-03 Andrew John Hughes + + * 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. + 2010-07-30 Andrew Haley * javax/print/attribute/standard/JobStateReasons.java (add): Fix diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/NamingService/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/NamingService/Demo.java index 38c4ecb987a..f71c24f2bbf 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/NamingService/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/NamingService/Demo.java @@ -89,7 +89,7 @@ public class Demo System.out.println("Starting the GNU Classpath " + "built-in transient naming service" ); - + final String[] args = an_args; new Thread() diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java index f53609cf718..944f661910c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/Demo.java @@ -90,7 +90,7 @@ public class Demo System.out.print("."); } System.out.println("ok."); - System.out.println(); + System.out.println(); // Test the stream oriented communication. DirectTest.main(args); diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java index d17e91fbac0..eecf6f3a616 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToPass.java @@ -47,11 +47,11 @@ package gnu.classpath.examples.CORBA.SimpleCommunication.communication; public class StructureToPass implements org.omg.CORBA.portable.IDLEntity { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The first string, stored in this structure (defined as * "narrow string"). diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java index 5dc843ae8c7..2f497cba472 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/StructureToReturn.java @@ -47,11 +47,11 @@ import org.omg.CORBA.portable.IDLEntity; public class StructureToReturn implements IDLEntity { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The string field. */ diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java index b267f39eaff..4fb28345a75 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/TreeNode.java @@ -47,11 +47,11 @@ package gnu.classpath.examples.CORBA.SimpleCommunication.communication; public class TreeNode implements org.omg.CORBA.portable.IDLEntity { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** The TreeNode name */ public String name = null; diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java index cf20d61ecdc..fcf632b328e 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisException.java @@ -53,11 +53,11 @@ public class WeThrowThisException extends UserException implements IDLEntity { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Our specific field, transferred to client. */ diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java index adf4d25d583..23ebc825637 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/WeThrowThisExceptionHelper.java @@ -114,4 +114,4 @@ public abstract class WeThrowThisExceptionHelper ostream.write_string(id()); ostream.write_long(value.ourField); } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java index 237c23086eb..02e5e1a4937 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterImplBase.java @@ -54,7 +54,7 @@ import org.omg.CORBA.portable.ResponseHandler; /** * The base for the class that is actually implementing the functionality * of the object on the server side ({@link DemoServant} of our case). - * + * * Following CORBA standards, the name of this class must start from * underscore and end by the "ImplBase". * diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java index c8e0ccd6d27..7481c4eade5 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/SimpleCommunication/communication/_DemoTesterStub.java @@ -55,7 +55,7 @@ import org.omg.CORBA.portable.RemarshalException; * side. It has all the same methods as the actual implementation * on the server side. These methods contain the code for remote * invocation. - * + * * Following CORBA standards, the name of this class must start from * underscore and end by the "Stub". * diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java index 9e1a70fcc16..5ec902dbdf4 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/CanvasWorld.java @@ -56,8 +56,8 @@ import javax.swing.JScrollPane; * The purpose of this simple example is to check if the mouse events are * correctly received in a scrollable canvas and also if the canvas are * correctly repainted. The similar canvas are used in various games and - * interactive demonstrations. - * + * interactive demonstrations. + * * The user can set one of the three possible figures with the different * mouse buttons. The figure must be set where the user have clicked the * mouse. @@ -82,17 +82,17 @@ public class CanvasWorld * Black cross, set by the right mouse button. */ public static final int BLACK = 1; - + /** * Blue and smaller oval, set by the middle mouse button. */ public static final int HINT = 2; - + /** * The message string is displayed at the top of the window. */ String message = "Click left, right or middle button in to set the figure"; - + /** * The additinal message, related to the mouse events. */ @@ -117,7 +117,7 @@ public class CanvasWorld * The collection of the black crosses. */ ArrayList blacks = new ArrayList(); - + /** * The collection of the smaller blue crosses. */ @@ -147,12 +147,12 @@ public class CanvasWorld g.fillRect(0, 0, w, h); drawGrid(w, h, g); - + g.setColor(Color.black); - + g.drawString(message, W, W); g.drawString(mouse, W, 2*W); - + drawFigures(g); } @@ -177,7 +177,7 @@ public class CanvasWorld g.setColor(Color.lightGray); int xs = 2*W+W/2; - + // Draw vertical lines: for (int x = 0; x < w; x += W) { @@ -189,7 +189,7 @@ public class CanvasWorld { g.drawLine(0, y, w, y); } - + g.setColor(Color.gray); } @@ -200,7 +200,7 @@ public class CanvasWorld g.setColor(Color.black); drawDots(blacks, g, BLACK); - + g.setColor(Color.blue); drawDots(hints, g, HINT); } @@ -273,7 +273,7 @@ public class CanvasWorld public void mouseEntered(MouseEvent m) { mouse = "Mouse entered."; - repaint(); + repaint(); } public void mousePressed(MouseEvent m) @@ -284,7 +284,7 @@ public class CanvasWorld public void mouseReleased(MouseEvent m) { - mouse = "Mouse released at "+m.getX()+","+m.getY(); + mouse = "Mouse released at "+m.getX()+","+m.getY(); repaint(); } @@ -293,7 +293,7 @@ public class CanvasWorld mouse = "Mouse exited"; repaint(); } - + public static void main(String[] args) { JFrame frame = new JFrame(); @@ -304,4 +304,4 @@ public class CanvasWorld frame.setVisible(true); } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java index b0552b43943..5b3d7557b3c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ChatConstants.java @@ -44,8 +44,8 @@ import java.awt.Color; * The chat color code constants, used to indicate who is talking. * Additionally, the red color is reseved for the most important messages, * related to the start and end of the game. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class ChatConstants { @@ -68,7 +68,7 @@ public class ChatConstants * Messages from the game server/ */ public static byte GAME_SERVER = 3; - + /** * The array of the used colors. */ @@ -77,4 +77,4 @@ public class ChatConstants { Color.black, new Color(0, 80, 0), new Color(0, 0, 128), Color.blue }; -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java index c3d8300b7c3..04b8dd976f8 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/ClientFrame.java @@ -63,8 +63,8 @@ public class ClientFrame /** * The size of the playing field. */ - public final Dimension DESK_SIZE = - new Dimension(624, 352-PlayingDesk.W); + public final Dimension DESK_SIZE = + new Dimension(624, 352-PlayingDesk.W); /** * Use serialVersionUID for interoperability. @@ -123,7 +123,7 @@ public class ClientFrame JLabel lbState = new JLabel(); JButton bChat = new JButton(); - + JButton bPaste = new JButton(); public ClientFrame() @@ -204,7 +204,7 @@ public class ClientFrame bChat_actionPerformed(e); } }); - + bPaste.setText("Paste"); bPaste.setToolTipText("Paste, same as Ctrl-V"); bPaste.addActionListener(new java.awt.event.ActionListener() @@ -214,10 +214,10 @@ public class ClientFrame bPaste_actionPerformed(e); } }); - + desk.setMaximumSize(DESK_SIZE); desk.setPreferredSize(DESK_SIZE); - + scroll.getViewport().add(desk, null); getContentPane().add(scroll, BorderLayout.CENTER); getContentPane().add(pnBottom, BorderLayout.SOUTH); @@ -235,7 +235,7 @@ public class ClientFrame pnButtons.add(bLeave, null); pnButtons.add(bReset, null); pnButtons.add(bExit, null); - pnButtons.add(bPaste, null); + pnButtons.add(bPaste, null); desk.player.set_current_state(State.DISCONNECTED); } @@ -405,7 +405,7 @@ public class ClientFrame ex.printStackTrace(); } } - + /** * Work around our keyboard shortcut handling that is still not working * properly. @@ -413,5 +413,5 @@ public class ClientFrame void bPaste_actionPerformed(ActionEvent e) { taUrl.paste(); - } -} \ No newline at end of file + } +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java index b83217896d5..3461f02842e 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Demo.java @@ -46,8 +46,8 @@ import java.io.FileReader; /** * The main executable class of the game client. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class Demo { @@ -96,4 +96,4 @@ public class Demo e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java index 4d632e8bf57..c08f49a7c81 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManager.java @@ -43,11 +43,11 @@ import java.rmi.RemoteException; /** * The game manager interface. - * + * * Defines the operations of the game server that connects two players into * the game. The game server does not participate in the game itself. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public interface GameManager extends Remote { @@ -65,4 +65,4 @@ public interface GameManager extends Remote * @throws RemoteException */ void unregister(Player player) throws RemoteException; -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java index fc449bc50ba..cf305318a5d 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/GameManagerImpl.java @@ -44,8 +44,8 @@ import org.omg.CORBA.Object; /** * The manager connects two players into the game. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class GameManagerImpl implements GameManager @@ -132,4 +132,4 @@ public class GameManagerImpl } System.out.println("Unregistering player"); } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java index 73a8eecab93..4afd47549b6 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/IorReader.java @@ -49,14 +49,14 @@ import org.omg.CORBA.BAD_PARAM; import org.omg.CORBA.DATA_CONVERSION; /** - * Reads the remote URL. Following formal/04-03-12, CORBA should be able to do + * Reads the remote URL. Following formal/04-03-12, CORBA should be able to do * this without the help of this class. However some popular class libraries - * are written using the older CORBA specifications and may not handle + * are written using the older CORBA specifications and may not handle * functionality, require by this game. This class substitutes the functionality, * ensuring that these implementations will also start and we will be able * to test the interoperability. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class IorReader { @@ -93,7 +93,7 @@ public class IorReader throw d; } } - + /** * Read IOR from the file in the local file system. */ @@ -120,5 +120,5 @@ public class IorReader d.initCause(ex); throw (d); } - } + } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java index 3852945c6b9..54632658d4a 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/OrbStarter.java @@ -51,7 +51,7 @@ import org.omg.PortableServer.Servant; /** * Starts the ORBs, involved into this application. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class OrbStarter @@ -61,12 +61,12 @@ public class OrbStarter * manager by host (IP) and port rather than by the rather long IOR string. */ static int MANAGER_NAMER_PORT = 1500; - + /** * The used port range (understood and used by GNU Classpath only). */ static String USED_PORT_RANGE = "1501-1503"; - + /** * Specify the file where under start the game manager writes its IOR. * You may specify the path if the game manager and player clients have @@ -74,8 +74,8 @@ public class OrbStarter * floppy and then read from the floppy on the client side. Both clients * and server will use this constant. Set to null not to write the IOR. */ - static String WRITE_URL_TO_FILE = "game_manager_ior.txt"; - + static String WRITE_URL_TO_FILE = "game_manager_ior.txt"; + /** * Start the manager ORB. * @return the manager URL if it starts. @@ -148,7 +148,7 @@ public class OrbStarter return "Exception: " + e; } } - + /** * Start the client ORB. */ @@ -156,10 +156,10 @@ public class OrbStarter { desk.ior = null; desk.ok = false; - + final Properties p = new Properties(); p.put("gnu.CORBA.ListenerPort", USED_PORT_RANGE); - + try { new Thread() @@ -232,5 +232,5 @@ public class OrbStarter } }); return desk.ior; - } + } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Player.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Player.java index ff5624b79c4..ced7d5d8231 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Player.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/Player.java @@ -45,8 +45,8 @@ import java.rmi.RemoteException; /** * Defines remote methods that are invoked by another player or by the * challenge server. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public interface Player extends Remote { @@ -93,4 +93,4 @@ public interface Player extends Remote * containing the ends of the builded line. */ void receive_move(int x, int y, Point[] victory) throws RemoteException; -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java index c30f7d51a42..30b32c4b68e 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayerImpl.java @@ -47,8 +47,8 @@ import java.rmi.RemoteException; * The implementation of the PlayerCommunicator, providing the local * functionality. Apart remote methods, the class also defines some local * methods, needed for the co-ordinated work with the game user interface. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class PlayerImpl implements Player, State @@ -107,10 +107,10 @@ public class PlayerImpl /** * Called when we make the move. The PlayingTable is responsible for checking * the correctness of the move and detecting the victory. - * + * * @param x x position of the new dot. * @param y y position of the new dot. - * + * * @param victory array of two memebers, representing the endpoints of the * drawn line (victory detected) or null if no such yet exists. */ @@ -189,14 +189,14 @@ public class PlayerImpl /** * Receive the invitation to play from the patner or the game manager. - * + * * @param address the address (host and port) of the remote partner. * @param youStart if true, the game manager instructs to start the game first * (another side is instructed to start the game second). - * + * * Game server may also chat a little bit with both players, saying that the * game has started. - * + * * @return true on success. */ public boolean start_game(Player otherPlayer, boolean youStart) @@ -232,7 +232,7 @@ public class PlayerImpl /** * Receive the chat message from the friend or challenge server (remote). * Possible at any state, always remote. - * + * * @param color the color code, used to highlight the message. * @param text the message text. */ @@ -260,7 +260,7 @@ public class PlayerImpl /** * Receive friends move (possible at I_WAIT_FOR_YOUR_MOVE). - * + * * @param x grid position. * @param y grid position. * @param victory if not a null, the friend thinks that it has won, the @@ -272,4 +272,4 @@ public class PlayerImpl // The state changes are handled by the PlayingTable desk.friendsMove(x, y, victory); } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java index fa8966f266d..681d42e6ba0 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/PlayingDesk.java @@ -269,10 +269,10 @@ public class PlayingDesk { g.drawLine(0, y, w, y); } - + g.setColor(Color.gray); g.drawRect(0,0, frame.DESK_SIZE.width, frame.DESK_SIZE.height); - g.drawRect(0,0, frame.DESK_SIZE.width+3, frame.DESK_SIZE.height+3); + g.drawRect(0,0, frame.DESK_SIZE.width+3, frame.DESK_SIZE.height+3); } public void drawFigures(Graphics g) @@ -446,8 +446,8 @@ public class PlayingDesk frame.talk(Color.black, "Partner goes " + x + "-" + y + ". Your move?"); player.set_current_state(I_THINK); - } - repaint(); + } + repaint(); } } catch (RemoteException rex) @@ -509,4 +509,4 @@ public class PlayingDesk ex.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/State.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/State.java index 7285396cdc8..a759225bb73 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/State.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/State.java @@ -40,15 +40,15 @@ package gnu.classpath.examples.CORBA.swing.x5; /** * Defines the states in that the player can be. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public interface State { /** * The initial ("disconnected") state. */ int DISCONNECTED = 0; - + /** * The state, indicating that the player has been queued for the game and * waiting for the partner to come. @@ -74,9 +74,9 @@ public interface State { * States that we have lost. */ int I_HAVE_LOST = 5; - + /** * The "inconsistent" state when it is not possible to continue the game. */ int ERROR = -1; -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java index 77178346043..516c701e1ee 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/X5Server.java @@ -49,22 +49,22 @@ import java.net.Socket; /** * The main executable class of the game manager server. - * + * * The manager address server returns the IOR address string of the game * manager. Hence the user does not need to enter the rather long IOR address * string and only needs to specify the host and port of the machine where the * game manager is running. - * + * * The manager address server starts the main game manager as well. - * + * * This server acts as a HTTP server that always returns the same response. This * primitive functionality is sufficient for its task. - * + * * The more complex CORBA applications should use the name service instead. We * do not use the name service as this would require to start additional * external application, specific for the different java platforms. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class X5Server { diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java index a0c33df34d0..54ef1e93b9d 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManagerImpl_Tie.java @@ -56,14 +56,14 @@ import org.omg.PortableServer.Servant; * Normally generated with rmic compiler, this class represents the GameManager * Tie on the client side. The Game Manager methods contain the code for remote * invocation. - * - * This class is normally generated with rmic or grmic from the + * + * This class is normally generated with rmic or grmic from the * {@link GameManagerImpl}. See tools/gnu/classpath/tools/giop/README. - * + * * In this example the class was manually edited and commented for better * understanding of functionality. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class _GameManagerImpl_Tie extends Servant @@ -77,7 +77,7 @@ public class _GameManagerImpl_Tie /** * The GameManager repository Id. */ - private static final String[] _type_ids = + private static final String[] _type_ids = { "RMI:gnu.classpath.examples.CORBA.swing.x5.GameManager:0000000000000000" }; /** @@ -161,7 +161,7 @@ public class _GameManagerImpl_Tie /** * This method is invoked by CORBA system to handle the remote invocation. - * + * * @param method the name of the method being invoked. * @param _in the stream to read the method parameters. * @param reply the responsed handler that can create the output stream to @@ -173,7 +173,7 @@ public class _GameManagerImpl_Tie { try { - org.omg.CORBA_2_3.portable.InputStream in = + org.omg.CORBA_2_3.portable.InputStream in = (org.omg.CORBA_2_3.portable.InputStream) _in; if (method.equals("requestTheGame")) { @@ -206,4 +206,4 @@ public class _GameManagerImpl_Tie throw new UnknownException(ex); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java index e9279963a6a..52fd103d6ea 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_GameManager_Stub.java @@ -54,22 +54,22 @@ import org.omg.CORBA.portable.ServantObject; * Normally generated with rmic compiler, this class represents the GameManager * Stub on the client side. The Game Manager methods contain the code for * remote invocation. - * + * * This class is normally generated with rmic from the {@link GameManagerImpl}: * 
  * rmic -iiop -poa -keep gnu.classpath.examples.CORBA.swing.x5.GameManagerImpl
  *
* (the compiled package must be present in the current folder). - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class _GameManager_Stub extends Stub implements GameManager { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + private static final String[] _type_ids = { "RMI:gnu.classpath.examples.CORBA.swing.x5.GameManager:0000000000000000" }; @@ -77,7 +77,7 @@ public class _GameManager_Stub extends Stub implements GameManager { return _type_ids; } - + /** * Notify the manager that the player is no longer willing to play and * should be removed from the queue. @@ -141,7 +141,7 @@ public class _GameManager_Stub extends Stub implements GameManager } } } - + /** * The method that the user should invoke. */ @@ -204,4 +204,4 @@ public class _GameManager_Stub extends Stub implements GameManager } } } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java index f6c5f476521..bc2333c07f9 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_PlayerImpl_Tie.java @@ -57,14 +57,14 @@ import org.omg.PortableServer.Servant; * Generate with rmic, command line * rmic -iiop -poa -keep gnu.classpath.examples.CORBA.swing.x5.PlayerImpl * (the compiled package must be present in the current folder). - * - * This class is normally generated with rmic or grmic from the + * + * This class is normally generated with rmic or grmic from the * {@link PlayerImpl}. See tools/gnu/classpath/tools/giop/README. - * - * In this example the class was manually edited and commented for better + * + * In this example the class was manually edited and commented for better * understanding of functionality. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class _PlayerImpl_Tie extends Servant implements Tie { @@ -206,4 +206,4 @@ public class _PlayerImpl_Tie extends Servant implements Tie throw new UnknownException(ex); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java index eeb5cf0daa4..c5a2089ee8f 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java +++ b/libjava/classpath/examples/gnu/classpath/examples/CORBA/swing/x5/_Player_Stub.java @@ -56,25 +56,25 @@ import org.omg.CORBA.portable.ServantObject; * Generate with rmic, command line * rmic -iiop -poa -keep gnu.classpath.examples.CORBA.swing.x5.PlayerImpl * (the compiled package must be present in the current folder). - * + * * This class is normally generated with rmic from the {@link GameManagerImpl}: * 
  * rmic -iiop -poa -keep gnu.classpath.examples.CORBA.swing.x5.GameManagerImpl
  *
* (the compiled package must be present in the current folder). - * - * In this example the class was manually edited and commented for better + * + * In this example the class was manually edited and commented for better * understanding of functionality. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class _Player_Stub extends Stub implements Player { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + private static final String[] _type_ids = { "RMI:gnu.classpath.examples.CORBA.swing.x5.Player:0000000000000000" }; @@ -82,7 +82,7 @@ public class _Player_Stub extends Stub implements Player { return _type_ids; } - + public boolean start_game(Player arg0, boolean arg1) throws RemoteException { @@ -394,4 +394,4 @@ public class _Player_Stub extends Stub implements Player { return (Serializable) obj; } -} \ No newline at end of file +} diff --git a/libjava/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java b/libjava/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java index 5bb4ec48ac1..20cd5926ea8 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java +++ b/libjava/classpath/examples/gnu/classpath/examples/awt/AicasGraphicsBenchmark.java @@ -82,8 +82,8 @@ public class AicasGraphicsBenchmark extends Panel ; int iterations = 1; - private int screenWidth = DEFAULT_SCREEN_WIDTH; - private int screenHeight = DEFAULT_SCREEN_HEIGHT; + private int screenWidth = DEFAULT_SCREEN_WIDTH; + private int screenHeight = DEFAULT_SCREEN_HEIGHT; boolean doubleBufferFlag = true; private int awtTests = AWTTEST_ALL; @@ -693,7 +693,7 @@ public class AicasGraphicsBenchmark extends Panel "Skipping 'test_drawImage' due to missing resource."); return; } - + int maxTests = DEFAULT_TEST_SIZE / 2; if(maxTests == 0) maxTests = 1; @@ -726,7 +726,7 @@ public class AicasGraphicsBenchmark extends Panel return; } - + int maxTests = DEFAULT_TEST_SIZE / 5; if(maxTests == 0) maxTests = 1; @@ -757,7 +757,7 @@ public class AicasGraphicsBenchmark extends Panel String testString = "HelloWorld"; int stringWidth = g.getFontMetrics().stringWidth(testString); int stringHeight = g.getFontMetrics().getHeight(); - + long startTime = System.currentTimeMillis(); for(int i = 0; i < maxTests; i += 1) { diff --git a/libjava/classpath/examples/gnu/classpath/examples/awt/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/awt/Demo.java index bd5e755cbb5..62bee8f5739 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/awt/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/awt/Demo.java @@ -92,16 +92,16 @@ class Demo MainWindow f = new MainWindow(); f.show(); } - + static interface SubWindow { public void init (); } - + static class PrettyPanel extends Panel { Insets myInsets; - + public PrettyPanel () { myInsets = new Insets (10, 10, 10, 10); @@ -111,7 +111,7 @@ class Demo return myInsets; } } - + static abstract class PrettyFrame extends Frame { public PrettyFrame () @@ -119,46 +119,46 @@ class Demo ((BorderLayout) getLayout ()).setHgap (5); ((BorderLayout) getLayout ()).setVgap (5); } - + public Insets getInsets() { Insets oldInsets = super.getInsets (); return new Insets (oldInsets.top+10, - oldInsets.left+10, - oldInsets.bottom+10, - oldInsets.right+10); + oldInsets.left+10, + oldInsets.bottom+10, + oldInsets.right+10); } } static abstract class SubFrame extends PrettyFrame implements SubWindow { boolean initted = false; - + public void setVisible (boolean visible) { if (!initted && visible) - init(); + init(); super.setVisible (visible); - } + } } - static class MainWindow extends PrettyFrame implements ActionListener + static class MainWindow extends PrettyFrame implements ActionListener { Button closeButton; - + Hashtable windows; Vector buttons; - + void addSubWindow (String name, SubWindow w) { Button b = new Button (name); b.addActionListener (this); - + buttons.addElement (b); - windows.put (b, w); + windows.put (b, w); } - - MainWindow () + + MainWindow () { MenuBar mb = new MenuBar (); Menu menu = new Menu ("File"); @@ -188,20 +188,20 @@ class Demo helpMenu.add(new MenuItem("About")); mb.add(helpMenu); mb.setHelpMenu(helpMenu); - + setMenuBar (mb); - + String version = System.getProperty("gnu.classpath.version"); add (new Label ("GNU Classpath " + version), "North"); - + closeButton = new Button ("Close"); closeButton.addActionListener (this); closeButton.setFont (new Font ("Serif", Font.BOLD | Font.ITALIC, 18)); add (closeButton, "South"); - + windows = new Hashtable (); buttons = new Vector (); - + addSubWindow ("Buttons", new ButtonsWindow ()); addSubWindow ("Cursors", new CursorsWindow ()); addSubWindow ("Dialog", new DialogWindow (this)); @@ -220,62 +220,62 @@ class Demo Panel sp = new Panel(); PrettyPanel p = new PrettyPanel(); p.setLayout (new GridLayout (windows.size(), 1)); - + for (Enumeration e = buttons.elements (); e.hasMoreElements (); ) - { - p.add ((Button) e.nextElement ()); - } - + { + p.add ((Button) e.nextElement ()); + } + sp.add (p); add (sp, "Center"); - + setTitle ("AWT Demo"); pack(); } - + public void actionPerformed (ActionEvent evt) { Button source = (Button) evt.getSource (); - + if (source==closeButton) - { - dispose(); - System.exit (0); - } - + { + dispose(); + System.exit (0); + } + Window w = (Window) windows.get (source); if (w.isVisible ()) - w.dispose (); - else - { - if (w instanceof Dialog) - { - w.show(); - } - else - { - w.setVisible (true); - } - } + w.dispose (); + else + { + if (w instanceof Dialog) + { + w.show(); + } + else + { + w.setVisible (true); + } + } } } - + static class ButtonsWindow extends SubFrame implements ActionListener { Button b[] = new Button [9]; - + public void init () { initted = true; Panel p = new Panel (); p.setLayout (new GridLayout (0, 3, 5, 5)); - - for (int i=0; i<9; i++) - { - b[i]=new Button ("button" + (i+1)); - b[i].addActionListener (this); - } - + + for (int i=0; i<9; i++) + { + b[i]=new Button ("button" + (i+1)); + b[i].addActionListener (this); + } + p.add (b[0]); p.add (b[6]); p.add (b[4]); @@ -285,135 +285,135 @@ class Demo p.add (b[3]); p.add (b[5]); p.add (b[2]); - + add (p, "North"); - + Button cb = new Button ("close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); add (cb, "South"); setTitle ("Buttons"); pack(); } - + public void actionPerformed (ActionEvent evt) { Button source = (Button) evt.getSource (); - + for (int i = 0; i < 9; i++) - { - if (source == b[i]) - { - int i2 = ((i + 1) == 9) ? 0 : (i + 1); - if (b[i2].isVisible()) - b[i2].setVisible(false); - else - b[i2].setVisible(true); - } - } + { + if (source == b[i]) + { + int i2 = ((i + 1) == 9) ? 0 : (i + 1); + if (b[i2].isVisible()) + b[i2].setVisible(false); + else + b[i2].setVisible(true); + } + } } } - - + + static class DialogWindow extends Dialog implements SubWindow { Label text; Frame parent; boolean initted = false; - + public DialogWindow (Frame f) { super (f, true); - + this.parent = f; - + addWindowListener (new WindowAdapter () - { - public void windowClosing (WindowEvent e) - { - text.setVisible (false); - hide (); - } - }); + { + public void windowClosing (WindowEvent e) + { + text.setVisible (false); + hide (); + } + }); } - + public void setVisible (boolean visible) { if (!initted && visible) - init(); + init(); super.setVisible (visible); } - + public void show () { if (!initted) - init(); + init(); super.show (); } - + public void init () { text = new Label ("Dialog Test"); text.setAlignment (Label.CENTER); - + add (text, "North"); text.setVisible (false); - + Panel p = new PrettyPanel(); - + Button cb = new Button ("OK"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) - { - text.setVisible (false); - hide(); - } - }); - + public void actionPerformed (ActionEvent e) + { + text.setVisible (false); + hide(); + } + }); + p.setLayout (new GridLayout (1, 3)); ((GridLayout) p.getLayout ()).setHgap (5); ((GridLayout) p.getLayout ()).setVgap (5); p.add (cb); - + Button toggle = new Button ("Toggle"); p.add (toggle); - + toggle.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) - { - if (text.isVisible ()) - text.setVisible (false); - else - text.setVisible (true); - doLayout(); - } - }); - + public void actionPerformed (ActionEvent e) + { + if (text.isVisible ()) + text.setVisible (false); + else + text.setVisible (true); + doLayout(); + } + }); + Button subdlg = new Button ("SubDialog"); p.add (subdlg); - + subdlg.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) - { + public void actionPerformed (ActionEvent e) + { DialogWindow sw = new DialogWindow (parent); sw.show (); - } - }); - + } + }); + add (p, "South"); setTitle ("Dialog"); pack(); } } - + static class CursorsWindow extends SubFrame implements ItemListener { Choice cursorChoice; Canvas cursorCanvas; - + public void init () { cursorChoice = new Choice(); @@ -431,253 +431,253 @@ class Demo cursorChoice.add ("East Resize"); cursorChoice.add ("Hand"); cursorChoice.add ("Move"); - + cursorChoice.addItemListener(this); - + add (cursorChoice, "North"); - - cursorCanvas = new Canvas () - { - public void paint (Graphics g) - { - Dimension d = this.getSize(); - g.setColor(Color.white); - g.fillRect(0, 0, d.width, d.height/2); - g.setColor(Color.black); - g.fillRect(0, d.height/2, d.width, d.height/2); - g.setColor(this.getBackground()); - g.fillRect(d.width/3, d.height/3, d.width/3, - d.height/3); - } - }; - + + cursorCanvas = new Canvas () + { + public void paint (Graphics g) + { + Dimension d = this.getSize(); + g.setColor(Color.white); + g.fillRect(0, 0, d.width, d.height/2); + g.setColor(Color.black); + g.fillRect(0, d.height/2, d.width, d.height/2); + g.setColor(this.getBackground()); + g.fillRect(d.width/3, d.height/3, d.width/3, + d.height/3); + } + }; + cursorCanvas.setSize (80,80); - + add (cursorCanvas, "Center"); - + Button cb = new Button ("Close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); - + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); + add (cb, "South"); setTitle ("Cursors"); pack(); } - + public void itemStateChanged (ItemEvent e) { int index = cursorChoice.getSelectedIndex(); cursorCanvas.setCursor(Cursor.getPredefinedCursor(index)); } } - + static class TextFieldWindow extends SubFrame implements ItemListener { Checkbox editable, visible, sensitive; TextField text; - + public void init () { initted = true; text = new TextField ("hello world"); add (text, "North"); - + Panel p = new Panel(); p.setLayout (new GridLayout (3, 1)); ((GridLayout) p.getLayout ()).setHgap (5); ((GridLayout) p.getLayout ()).setVgap (5); - + editable = new Checkbox("Editable", true); p.add (editable); editable.addItemListener (this); - + visible = new Checkbox("Visible", true); p.add (visible); visible.addItemListener (this); - + sensitive = new Checkbox("Sensitive", true); p.add (sensitive); sensitive.addItemListener (this); - + add (p, "Center"); - + Button cb = new Button ("Close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); - + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); + add (cb, "South"); setTitle ("TextField"); pack(); } - + public void itemStateChanged (ItemEvent e) { boolean on=true; - + if (e.getStateChange () == ItemEvent.DESELECTED) - on=false; + on=false; if (e.getSource() == editable) - text.setEditable (on); + text.setEditable (on); if (e.getSource() == visible) - if (on) - text.setEchoChar ((char) 0); - else - text.setEchoChar ('*'); + if (on) + text.setEchoChar ((char) 0); + else + text.setEchoChar ('*'); if (e.getSource() == sensitive) - text.setEnabled (on); - + text.setEnabled (on); + } } - + static class FileWindow extends FileDialog implements SubWindow { boolean initted = false; - + public FileWindow (MainWindow mw) { super (mw); } - + public void setVisible (boolean visible) { if (!initted && visible) - init(); + init(); super.setVisible (visible); } - - public void init() + + public void init() { initted = true; } } - + static class LabelWindow extends SubFrame { public void init () { initted = true; - + Panel p = new Panel(); p.setLayout (new GridLayout (3, 1)); ((GridLayout) p.getLayout ()).setHgap (5); ((GridLayout) p.getLayout ()).setVgap (5); - + p.add (new Label ("left justified label", Label.LEFT)); p.add (new Label ("center justified label", Label.CENTER)); p.add (new Label ("right justified label", Label.RIGHT)); - + add (p, "Center"); - + Button cb = new Button ("Close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); - + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); + add (cb, "South"); setTitle ("Labels"); pack(); } } - + static class ListWindow extends SubFrame { public void init () { initted = true; - + Panel p = new Panel (); p.setLayout (new GridLayout (3, 1)); - + List l = new List (5, true); for (int i = 0; i < 10; i++) - l.add ("List item " + i); + l.add ("List item " + i); p.add (l); add (p, "Center"); - + Button cb = new Button ("Close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); - + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); + add (cb, "South"); setTitle ("List"); pack(); } - } - - + } + + static class RadioWindow extends SubFrame { public void init () { initted = true; - + Panel p = new Panel(); p.setLayout (new GridLayout (3, 1)); ((GridLayout) p.getLayout ()).setHgap (5); ((GridLayout) p.getLayout ()).setVgap (5); - + final CheckboxGroup cg = new CheckboxGroup(); final Checkbox[] boxes = new Checkbox[3]; for (int i = 0; i < 3; ++i) - { - boxes[i] = new Checkbox("button" + i, cg, i == 0); - p.add(boxes[i]); - } - + { + boxes[i] = new Checkbox("button" + i, cg, i == 0); + p.add(boxes[i]); + } + add (p, "North"); - + p = new Panel(); p.setLayout (new GridLayout (1, 3)); ((GridLayout) p.getLayout ()).setHgap (5); ((GridLayout) p.getLayout ()).setVgap (5); - + for (int i = 0; i < 3; ++i) - { - final int val = i; - Button tweak = new Button ("Set " + i); - tweak.addActionListener(new ActionListener () - { - public void actionPerformed (ActionEvent e) - { - cg.setSelectedCheckbox(boxes[val]); - } - }); - p.add(tweak); - } - + { + final int val = i; + Button tweak = new Button ("Set " + i); + tweak.addActionListener(new ActionListener () + { + public void actionPerformed (ActionEvent e) + { + cg.setSelectedCheckbox(boxes[val]); + } + }); + p.add(tweak); + } + add (p, "Center"); - + Button cb = new Button ("Close"); cb.addActionListener(new ActionListener () { - public void actionPerformed (ActionEvent e) { - dispose(); - } - }); - + public void actionPerformed (ActionEvent e) { + dispose(); + } + }); + add (cb, "South"); setTitle ("Radio Buttons"); pack(); } } - + static class TestWindow extends SubFrame { static int xs = 5, ys = 5; final Frame parent; - + public TestWindow(Frame f) { parent = f; @@ -686,7 +686,7 @@ class Demo public void init() { initted = true; - + addWindowListener (new WindowAdapter () { public void windowClosing (WindowEvent e) @@ -696,37 +696,37 @@ class Demo }); Panel pan = new Panel(); - + final Label l = new Label ("Pithy Message:"); l.setCursor (Cursor.getPredefinedCursor (Cursor.WAIT_CURSOR)); pan.add (l); - + TextField tf = new TextField("Hello world!"); pan.add(tf); add(pan,"North"); - + final Image img; URL imageurl; imageurl = this.getClass() - .getResource("/gnu/classpath/examples/icons/big-warning.png"); + .getResource("/gnu/classpath/examples/icons/big-warning.png"); img = Toolkit.getDefaultToolkit().createImage(imageurl); final Canvas ch = new Canvas() - { - public void paint (Graphics g) - { - g.drawImage(img, xs + 25, ys + 25, this); + { + public void paint (Graphics g) + { + g.drawImage(img, xs + 25, ys + 25, this); - Font font = new Font ("Serif", Font.PLAIN, 18); - g.setFont (font); - g.setXORMode (Color.red); + Font font = new Font ("Serif", Font.PLAIN, 18); + g.setFont (font); + g.setXORMode (Color.red); - g.drawString("Hi Red!", xs + 15, ys + 10); - g.setColor (Color.blue); - g.drawLine (xs, ys, xs + 100, ys + 100); - - } - }; + g.drawString("Hi Red!", xs + 15, ys + 10); + g.setColor (Color.blue); + g.drawLine (xs, ys, xs + 100, ys + 100); + + } + }; ch.setSize(150, 150); add(ch, "Center"); @@ -755,70 +755,70 @@ class Demo final Button wb = new Button(); wb.setLabel("Hello World!"); wb.addActionListener(new ActionListener() - { - public void actionPerformed (ActionEvent e) - { - l.setText ("Hello World!"); - - final Dialog d = new Dialog(parent); - d.setLayout(new FlowLayout()); - d.setModal(true); - Button b = new Button("foobar"); - b.addMouseListener(new MouseAdapter() - { - public void mousePressed (MouseEvent me) - { - d.hide (); - } - }); - d.add (b); + { + public void actionPerformed (ActionEvent e) + { + l.setText ("Hello World!"); - List ch = new List(); - ch.add("Ding"); - ch.add("September"); - ch.add("Red"); - ch.add("Quassia"); - ch.add("Pterodactyl"); - d.add(ch); + final Dialog d = new Dialog(parent); + d.setLayout(new FlowLayout()); + d.setModal(true); + Button b = new Button("foobar"); + b.addMouseListener(new MouseAdapter() + { + public void mousePressed (MouseEvent me) + { + d.hide (); + } + }); + d.add (b); - d.pack (); - d.show (); - } - }); + List ch = new List(); + ch.add("Ding"); + ch.add("September"); + ch.add("Red"); + ch.add("Quassia"); + ch.add("Pterodactyl"); + d.add(ch); + + d.pack (); + d.show (); + } + }); wb.addMouseListener(new MouseAdapter() - { - public void mousePressed(MouseEvent e) { - xs++; - ys++; - ch.repaint (); - } - }); - + { + public void mousePressed(MouseEvent e) { + xs++; + ys++; + ch.repaint (); + } + }); + add(wb,"West"); - + pack(); show(); - + sp.setScrollPosition (10,0); - + Toolkit t = Toolkit.getDefaultToolkit(); t.beep(); } } - + static class ResolutionWindow extends SubFrame { GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice(); - + public void init () { initted = true; - + setTitle("Change Screen Resolution"); final List list = new List(); DisplayMode[] modes = gd.getDisplayModes(); - + for (int i=0;i FillRect2 [-sleep ] [-size ] [-nopaint]\n" + "Example: jamvm FillRect2 -sleep 10 -size 100\n" ); @@ -342,7 +342,7 @@ public class JNIOverhead } if ("-nopaint".equals(args[i])) { - fillRectDemo.enableRepaints = false; + fillRectDemo.enableRepaints = false; } } @@ -368,7 +368,7 @@ public class JNIOverhead * @return a DemoFactory that creates a SliderDemo */ public static DemoFactory createDemoFactory() - { + { return new DemoFactory() { public JComponent createDemo() diff --git a/libjava/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.java b/libjava/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.java index ff688964be7..c8f931ece9c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.java +++ b/libjava/classpath/examples/gnu/classpath/examples/jawt/DemoJAWT.java @@ -52,10 +52,10 @@ public class DemoJAWT extends Canvas f.addWindowListener (new WindowAdapter () { - public void windowClosing (WindowEvent evt) - { - System.exit (0); - } + public void windowClosing (WindowEvent evt) + { + System.exit (0); + } }); f.show (); @@ -63,13 +63,13 @@ public class DemoJAWT extends Canvas while (true) { try - { - Thread.sleep (500); - } + { + Thread.sleep (500); + } catch (InterruptedException ie) - { - // ignored - } + { + // ignored + } jawtDemo.on = ! jawtDemo.on; f.repaint(); } diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestClassLoading.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestClassLoading.java index b4e8d98268c..8465510ac3a 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestClassLoading.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestClassLoading.java @@ -51,19 +51,19 @@ public class TestClassLoading System.out.println("Bean: " + classBean); System.out.println("Loaded classes: " + server.getAttribute(classBean, "LoadedClassCount")); System.out.println("Unloaded classes: " + server.getAttribute(classBean, - "UnloadedClassCount")); + "UnloadedClassCount")); System.out.println("Total loaded classes: " + server.getAttribute(classBean, - "TotalLoadedClassCount")); + "TotalLoadedClassCount")); verbosity = (Boolean) server.getAttribute(classBean, "Verbose"); System.out.println("Verbose class output: " + (verbosity ? "yes" : "no")); System.out.println("Changing verbose setting..."); server.setAttribute(classBean, new Attribute("Verbose", !verbosity)); System.out.println("Verbose class output: " + ((Boolean) - server.getAttribute(classBean, "Verbose") ? - "yes" : "no")); + server.getAttribute(classBean, "Verbose") ? + "yes" : "no")); System.out.println("Testing via the proxy..."); bean = ManagementFactory.newPlatformMXBeanProxy(server, CLASS_LOADING_MXBEAN_NAME, - ClassLoadingMXBean.class); + ClassLoadingMXBean.class); System.out.println("Bean: " + bean); System.out.println("Loaded classes: " + bean.getLoadedClassCount()); System.out.println("Unloaded classes: " + bean.getUnloadedClassCount()); diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestCompilation.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestCompilation.java index ea8f45f6d1e..b8c44752fd5 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestCompilation.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestCompilation.java @@ -31,8 +31,8 @@ public class TestCompilation CompilationMXBean bean = ManagementFactory.getCompilationMXBean(); if (bean == null) { - System.out.println("The compilation bean is not supported by this VM."); - System.exit(-1); + System.out.println("The compilation bean is not supported by this VM."); + System.exit(-1); } System.out.println("Bean: " + bean); System.out.println("JIT compiler name: " + bean.getName()); @@ -40,8 +40,8 @@ public class TestCompilation System.out.println("Compilation time monitoring supported: " + timeMonitoring); if (timeMonitoring) { - System.out.println("Compilation time: " - + bean.getTotalCompilationTime() + "ms"); + System.out.println("Compilation time: " + + bean.getTotalCompilationTime() + "ms"); } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestGarbageCollector.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestGarbageCollector.java index 5d6d56797c4..ddb22c30c87 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestGarbageCollector.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestGarbageCollector.java @@ -34,20 +34,17 @@ public class TestGarbageCollector Iterator beans = ManagementFactory.getGarbageCollectorMXBeans().iterator(); while (beans.hasNext()) { - GarbageCollectorMXBean bean = (GarbageCollectorMXBean) beans.next(); - System.out.println("Bean: " + bean); - System.out.println("Name: " + bean.getName()); - System.out.println("Memory pool names: " - + Arrays.toString(bean.getMemoryPoolNames())); - System.out.println("Is valid: " - + (bean.isValid() ? "yes" : "no")); - System.out.println("Collection count: " - + bean.getCollectionCount()); - System.out.println("Collection time: " - + bean.getCollectionTime() + "ms"); + GarbageCollectorMXBean bean = (GarbageCollectorMXBean) beans.next(); + System.out.println("Bean: " + bean); + System.out.println("Name: " + bean.getName()); + System.out.println("Memory pool names: " + + Arrays.toString(bean.getMemoryPoolNames())); + System.out.println("Is valid: " + + (bean.isValid() ? "yes" : "no")); + System.out.println("Collection count: " + + bean.getCollectionCount()); + System.out.println("Collection time: " + + bean.getCollectionTime() + "ms"); } } } - - - diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemory.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemory.java index ca25d62119b..7a5065f14e9 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemory.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemory.java @@ -29,20 +29,20 @@ public class TestMemory { MemoryMXBean bean = ManagementFactory.getMemoryMXBean(); System.out.println("Bean: " + bean); - System.out.println("Heap memory usage: " - + bean.getHeapMemoryUsage()); - System.out.println("Non-heap memory usage: " - + bean.getNonHeapMemoryUsage()); - System.out.println("Objects pending finalization: " - + bean.getObjectPendingFinalizationCount()); + System.out.println("Heap memory usage: " + + bean.getHeapMemoryUsage()); + System.out.println("Non-heap memory usage: " + + bean.getNonHeapMemoryUsage()); + System.out.println("Objects pending finalization: " + + bean.getObjectPendingFinalizationCount()); System.out.println("Running garbage collector via bean..."); bean.gc(); - System.out.println("Heap memory usage: " - + bean.getHeapMemoryUsage()); - System.out.println("Non-heap memory usage: " - + bean.getNonHeapMemoryUsage()); - System.out.println("Objects pending finalization: " - + bean.getObjectPendingFinalizationCount()); + System.out.println("Heap memory usage: " + + bean.getHeapMemoryUsage()); + System.out.println("Non-heap memory usage: " + + bean.getNonHeapMemoryUsage()); + System.out.println("Objects pending finalization: " + + bean.getObjectPendingFinalizationCount()); boolean verbosity = bean.isVerbose(); System.out.println("Verbose memory output: " + (verbosity ? "yes" : "no")); System.out.println("Changing verbose setting..."); diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryManager.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryManager.java index 30a0c985b9f..8e98acd4c4b 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryManager.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryManager.java @@ -34,16 +34,13 @@ public class TestMemoryManager Iterator beans = ManagementFactory.getMemoryManagerMXBeans().iterator(); while (beans.hasNext()) { - MemoryManagerMXBean bean = (MemoryManagerMXBean) beans.next(); - System.out.println("Bean: " + bean); - System.out.println("Name: " + bean.getName()); - System.out.println("Memory pool names: " - + Arrays.toString(bean.getMemoryPoolNames())); - System.out.println("Is valid: " - + (bean.isValid() ? "yes" : "no")); + MemoryManagerMXBean bean = (MemoryManagerMXBean) beans.next(); + System.out.println("Bean: " + bean); + System.out.println("Name: " + bean.getName()); + System.out.println("Memory pool names: " + + Arrays.toString(bean.getMemoryPoolNames())); + System.out.println("Is valid: " + + (bean.isValid() ? "yes" : "no")); } } } - - - diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryPool.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryPool.java index 1836c3025d5..a5e24fd50f1 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryPool.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestMemoryPool.java @@ -38,54 +38,54 @@ public class TestMemoryPool Iterator beans = ManagementFactory.getMemoryPoolMXBeans().iterator(); while (beans.hasNext()) { - MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); - System.out.println("Bean: " + bean); - System.out.println("Name: " + bean.getName()); - System.out.println("Collection usage: " + bean.getCollectionUsage()); - boolean collectionUsage = bean.isCollectionUsageThresholdSupported(); - System.out.println("Collection usage threshold supported: " - + collectionUsage); - if (collectionUsage) - { - System.out.println("Collection usage threshold: " - + bean.getCollectionUsageThreshold()); - System.out.println("Setting collection usage threshold to 1MB (" - + MB + " bytes)"); - bean.setCollectionUsageThreshold(MB); - System.out.println("Collection usage threshold: " - + bean.getCollectionUsageThreshold()); - System.out.println("Collection usage threshold count: " - + bean.getCollectionUsageThresholdCount()); - System.out.println("Collection usage threshold exceeded: " - + (bean.isCollectionUsageThresholdExceeded() - ? "yes" : "no")); - } - System.out.println("Memory manager names: " - + Arrays.toString(bean.getMemoryManagerNames())); - System.out.println("Peak usage: " + bean.getPeakUsage()); - System.out.println("Current usage: " + bean.getUsage()); - System.out.println("Resetting peak usage..."); - bean.resetPeakUsage(); - System.out.println("Peak usage: " + bean.getPeakUsage()); - System.out.println("Current usage: " + bean.getUsage()); - boolean usage = bean.isUsageThresholdSupported(); - System.out.println("Usage threshold supported: " + usage); - if (usage) - { - System.out.println("Usage threshold: " - + bean.getUsageThreshold()); - System.out.println("Setting usage threshold to 1MB (" - + MB + " bytes)"); - bean.setUsageThreshold(MB); - System.out.println("Usage threshold: " - + bean.getUsageThreshold()); - System.out.println("Usage threshold count: " - + bean.getUsageThresholdCount()); - System.out.println("Usage threshold exceeded: " - + (bean.isUsageThresholdExceeded() - ? "yes" : "no")); - } - System.out.println("Valid: " + (bean.isValid() ? "yes" : "no")); + MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); + System.out.println("Bean: " + bean); + System.out.println("Name: " + bean.getName()); + System.out.println("Collection usage: " + bean.getCollectionUsage()); + boolean collectionUsage = bean.isCollectionUsageThresholdSupported(); + System.out.println("Collection usage threshold supported: " + + collectionUsage); + if (collectionUsage) + { + System.out.println("Collection usage threshold: " + + bean.getCollectionUsageThreshold()); + System.out.println("Setting collection usage threshold to 1MB (" + + MB + " bytes)"); + bean.setCollectionUsageThreshold(MB); + System.out.println("Collection usage threshold: " + + bean.getCollectionUsageThreshold()); + System.out.println("Collection usage threshold count: " + + bean.getCollectionUsageThresholdCount()); + System.out.println("Collection usage threshold exceeded: " + + (bean.isCollectionUsageThresholdExceeded() + ? "yes" : "no")); + } + System.out.println("Memory manager names: " + + Arrays.toString(bean.getMemoryManagerNames())); + System.out.println("Peak usage: " + bean.getPeakUsage()); + System.out.println("Current usage: " + bean.getUsage()); + System.out.println("Resetting peak usage..."); + bean.resetPeakUsage(); + System.out.println("Peak usage: " + bean.getPeakUsage()); + System.out.println("Current usage: " + bean.getUsage()); + boolean usage = bean.isUsageThresholdSupported(); + System.out.println("Usage threshold supported: " + usage); + if (usage) + { + System.out.println("Usage threshold: " + + bean.getUsageThreshold()); + System.out.println("Setting usage threshold to 1MB (" + + MB + " bytes)"); + bean.setUsageThreshold(MB); + System.out.println("Usage threshold: " + + bean.getUsageThreshold()); + System.out.println("Usage threshold count: " + + bean.getUsageThresholdCount()); + System.out.println("Usage threshold exceeded: " + + (bean.isUsageThresholdExceeded() + ? "yes" : "no")); + } + System.out.println("Valid: " + (bean.isValid() ? "yes" : "no")); } } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/management/TestThread.java b/libjava/classpath/examples/gnu/classpath/examples/management/TestThread.java index e49776ce227..ff57ee5fffe 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/management/TestThread.java +++ b/libjava/classpath/examples/gnu/classpath/examples/management/TestThread.java @@ -40,26 +40,26 @@ public class TestThread System.out.println("Current thread CPU time monitoring supported: " + currentTimeMonitoring); if (currentTimeMonitoring) { - boolean timeEnabled = bean.isThreadCpuTimeEnabled(); - System.out.println("Is time monitoring enabled... " + - (timeEnabled ? "yes" : "no")); - if (!timeEnabled) - { - System.out.println("Enabling..."); - bean.setThreadCpuTimeEnabled(true); - timeEnabled = bean.isThreadCpuTimeEnabled(); - System.out.println("Should now be enabled... " + - (timeEnabled ? "yes" : "no")); - } - if (timeEnabled) - { - System.out.println("Current thread CPU time: " - + bean.getCurrentThreadCpuTime() - + "ns"); - System.out.println("Current thread user time: " - + bean.getCurrentThreadUserTime() - + "ns"); - } + boolean timeEnabled = bean.isThreadCpuTimeEnabled(); + System.out.println("Is time monitoring enabled... " + + (timeEnabled ? "yes" : "no")); + if (!timeEnabled) + { + System.out.println("Enabling..."); + bean.setThreadCpuTimeEnabled(true); + timeEnabled = bean.isThreadCpuTimeEnabled(); + System.out.println("Should now be enabled... " + + (timeEnabled ? "yes" : "no")); + } + if (timeEnabled) + { + System.out.println("Current thread CPU time: " + + bean.getCurrentThreadCpuTime() + + "ns"); + System.out.println("Current thread user time: " + + bean.getCurrentThreadUserTime() + + "ns"); + } } System.out.println("Daemon thread count: " + bean.getDaemonThreadCount()); System.out.println("Peak thread count: " + bean.getPeakThreadCount()); @@ -71,48 +71,48 @@ public class TestThread System.out.println("Thread CPU time monitoring supported: " + timeMonitoring); if (timeMonitoring) { - for (int a = 0; a < ids.length; ++a) - { - System.out.println("Thread " + a - + " CPU time: " - + bean.getThreadCpuTime(ids[a]) + "ns"); - System.out.println("Thread " - + a + " user time: " - + bean.getThreadUserTime(ids[a]) + "ns"); - } + for (int a = 0; a < ids.length; ++a) + { + System.out.println("Thread " + a + + " CPU time: " + + bean.getThreadCpuTime(ids[a]) + "ns"); + System.out.println("Thread " + + a + " user time: " + + bean.getThreadUserTime(ids[a]) + "ns"); + } } System.out.println("Current thread info: " - + bean.getThreadInfo(Thread.currentThread().getId())); + + bean.getThreadInfo(Thread.currentThread().getId())); System.out.println("All thread info: " + Arrays.toString(bean.getThreadInfo(ids))); System.out.println("Total started threads: " + bean.getTotalStartedThreadCount()); boolean contentionMonitoring = bean.isThreadContentionMonitoringSupported(); System.out.println("Thread contention monitoring supported: " + contentionMonitoring); if (contentionMonitoring) { - boolean contentionEnabled = bean.isThreadContentionMonitoringEnabled(); - System.out.println("Thread contention monitoring shouldn't be enabled... " + - (contentionEnabled ? "but it is" : "true")); - if (!contentionEnabled) - { - System.out.println("Enabling..."); - bean.setThreadContentionMonitoringEnabled(true); - contentionEnabled = bean.isThreadContentionMonitoringEnabled(); - System.out.println("Should now be enabled... " + - (contentionEnabled ? "it is" : "nope")); - } - if (contentionEnabled) - { - ThreadInfo[] info = bean.getThreadInfo(ids); - for (int a = 0; a < info.length; ++a) - { - System.out.println("Blocked time for thread " - + info[a].getThreadId() + ": " - + info[a].getBlockedTime() + "ms"); - System.out.println("Waited time for thread " - + info[a].getThreadId() + ": " - + info[a].getWaitedTime() + "ms"); - } - } + boolean contentionEnabled = bean.isThreadContentionMonitoringEnabled(); + System.out.println("Thread contention monitoring shouldn't be enabled... " + + (contentionEnabled ? "but it is" : "true")); + if (!contentionEnabled) + { + System.out.println("Enabling..."); + bean.setThreadContentionMonitoringEnabled(true); + contentionEnabled = bean.isThreadContentionMonitoringEnabled(); + System.out.println("Should now be enabled... " + + (contentionEnabled ? "it is" : "nope")); + } + if (contentionEnabled) + { + ThreadInfo[] info = bean.getThreadInfo(ids); + for (int a = 0; a < info.length; ++a) + { + System.out.println("Blocked time for thread " + + info[a].getThreadId() + ": " + + info[a].getBlockedTime() + "ms"); + System.out.println("Waited time for thread " + + info[a].getThreadId() + ": " + + info[a].getWaitedTime() + "ms"); + } + } } } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/midi/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/midi/Demo.java index 7e403d8d686..81c71dc11cb 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/midi/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/midi/Demo.java @@ -35,7 +35,7 @@ public class Demo extends Frame implements ItemListener MidiDevice inDevice = null; MidiDevice outDevice = null; - + ArrayList inDevices = new ArrayList(); ArrayList outDevices = new ArrayList(); @@ -46,32 +46,32 @@ public class Demo extends Frame implements ItemListener MenuItem quit = new MenuItem("Quit", new MenuShortcut('Q')); quit.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) - { - System.exit(0); - } + public void actionPerformed(ActionEvent e) + { + System.exit(0); + } }); menu.add (quit); mb.add(menu); - + setTitle("synthcity: the GNU Classpath MIDI Demo"); setLayout(new FlowLayout()); - + MidiDevice.Info[] infos = MidiSystem.getMidiDeviceInfo(); for (int i = 0; i < infos.length; i++) { - MidiDevice device = MidiSystem.getMidiDevice(infos[i]); - if (device.getMaxReceivers() > 0) - { - midiOutChoice.addItem(infos[i].getDescription()); - outDevices.add(device); - } - if (device.getMaxTransmitters() > 0) - { - midiInChoice.addItem(infos[i].getDescription()); - inDevices.add(device); - } + MidiDevice device = MidiSystem.getMidiDevice(infos[i]); + if (device.getMaxReceivers() > 0) + { + midiOutChoice.addItem(infos[i].getDescription()); + outDevices.add(device); + } + if (device.getMaxTransmitters() > 0) + { + midiInChoice.addItem(infos[i].getDescription()); + inDevices.add(device); + } } setMenuBar (mb); @@ -86,47 +86,47 @@ public class Demo extends Frame implements ItemListener pack(); show(); } - + public void itemStateChanged (ItemEvent e) { try { - if (e.getItemSelectable() == midiInChoice) - { - if (inDevice != null) - inDevice.close(); - inDevice = (MidiDevice) - inDevices.get(midiInChoice.getSelectedIndex()); - } - - if (e.getItemSelectable() == midiOutChoice) - { - if (outDevice != null) - outDevice.close(); - outDevice = (MidiDevice) - outDevices.get(midiOutChoice.getSelectedIndex()); - } - - if (inDevice != null && outDevice != null) - { - if (! inDevice.isOpen()) - inDevice.open(); - if (! outDevice.isOpen()) - outDevice.open(); - Transmitter t = inDevice.getTransmitter(); - if (t == null) - System.err.println (inDevice + ".getTransmitter() == null"); - Receiver r = outDevice.getReceiver(); - if (r == null) - System.err.println (outDevice + ".getReceiver() == null"); - - if (t != null && r != null) - t.setReceiver (r); - } + if (e.getItemSelectable() == midiInChoice) + { + if (inDevice != null) + inDevice.close(); + inDevice = (MidiDevice) + inDevices.get(midiInChoice.getSelectedIndex()); + } + + if (e.getItemSelectable() == midiOutChoice) + { + if (outDevice != null) + outDevice.close(); + outDevice = (MidiDevice) + outDevices.get(midiOutChoice.getSelectedIndex()); + } + + if (inDevice != null && outDevice != null) + { + if (! inDevice.isOpen()) + inDevice.open(); + if (! outDevice.isOpen()) + outDevice.open(); + Transmitter t = inDevice.getTransmitter(); + if (t == null) + System.err.println (inDevice + ".getTransmitter() == null"); + Receiver r = outDevice.getReceiver(); + if (r == null) + System.err.println (outDevice + ".getReceiver() == null"); + + if (t != null && r != null) + t.setReceiver (r); + } } catch (Exception ex) { - ex.printStackTrace(); + ex.printStackTrace(); } } diff --git a/libjava/classpath/examples/gnu/classpath/examples/print/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/print/Demo.java index 0f6a5c8eac6..fb4d74373fd 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/print/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/print/Demo.java @@ -76,12 +76,12 @@ import javax.swing.JTextField; * A simple demo showing the use of the Java Print Service API. * @author Wolfgang Baer (WBaer@gmx.de) */ -public class Demo extends JFrame +public class Demo extends JFrame implements ActionListener { // The discovered print services private static PrintService[] services; - + // variables for the PrintPanel demo private HashPrintRequestAttributeSet atts; private PrintService dialogSelectedService; @@ -90,102 +90,102 @@ public class Demo extends JFrame private JComboBox dialogSelectedServicedocFormat; private JTextField selectedFileTf; private File selectedFile; - + // variables for the PrintServicePanel demo private JComboBox serviceBox; private JList docFormat; private JList attCategories; - + static { // lookup all services without any constraints - services = PrintServiceLookup.lookupPrintServices(null, null); + services = PrintServiceLookup.lookupPrintServices(null, null); } - + /** * Constructs the Print Demo * @param title - the demo title. */ - public Demo(String title) + public Demo(String title) { super(title); JPanel content = new JPanel(new BorderLayout()); - + JTabbedPane tabbed = new JTabbedPane(); tabbed.addTab("Discover print services", createPrintServicePanel()); tabbed.addTab("Print a file", createPrintPanel()); - + JPanel closePanel = new JPanel(); JButton closeButton = new JButton("Close"); closeButton.setActionCommand("CLOSE"); closeButton.addActionListener(this); closePanel.add(closeButton); - + content.add(tabbed, BorderLayout.CENTER); content.add(closePanel, BorderLayout.SOUTH); getContentPane().add(content); } - - private JPanel createPrintServicePanel() - { + + private JPanel createPrintServicePanel() + { JPanel panel = new JPanel(new GridBagLayout()); GridBagConstraints c = new GridBagConstraints(); - + c.insets = new Insets(5,5,5,5); c.gridx = 0; - c.gridy = 0; + c.gridy = 0; c.anchor = GridBagConstraints.WEST; c.fill = GridBagConstraints.HORIZONTAL; JLabel serviceBoxLb = new JLabel("Available print services: "); - panel.add(serviceBoxLb, c); - + panel.add(serviceBoxLb, c); + c.gridx = 1; c.gridy = 0; serviceBox = new JComboBox(services); serviceBox.setActionCommand("SERVICE"); serviceBox.addActionListener(this); - panel.add(serviceBox, c); - + panel.add(serviceBox, c); + c.gridx = 0; c.gridy = 1; JLabel docFormatLb = new JLabel("Supported DocFormat: "); - panel.add(docFormatLb, c); - + panel.add(docFormatLb, c); + c.gridx = 1; c.gridy = 1; docFormat = new JList(services[0].getSupportedDocFlavors()); docFormat.setVisibleRowCount(3); JScrollPane scrollPane = new JScrollPane(docFormat); - panel.add(scrollPane, c); - + panel.add(scrollPane, c); + c.gridx = 0; c.gridy = 2; JLabel categoriesLb = new JLabel("Supported Attribute categories: "); - panel.add(categoriesLb, c); - + panel.add(categoriesLb, c); + c.gridx = 1; c.gridy = 2; attCategories = new JList(services[0].getSupportedAttributeCategories()); attCategories.setVisibleRowCount(3); - JScrollPane scrollPane2 = new JScrollPane(attCategories); - panel.add(scrollPane2, c); - + JScrollPane scrollPane2 = new JScrollPane(attCategories); + panel.add(scrollPane2, c); + return panel; } - - private JPanel createPrintPanel() + + private JPanel createPrintPanel() { - JPanel panel = new JPanel(new GridBagLayout()); + JPanel panel = new JPanel(new GridBagLayout()); GridBagConstraints c = new GridBagConstraints(); - + c.insets = new Insets(5,5,5,5); c.gridx = 0; c.gridy = 0; - c.gridwidth = 2; + c.gridwidth = 2; JButton serviceBtn = new JButton("Show print dialog ..."); serviceBtn.addActionListener(this); - panel.add(serviceBtn, c); - + panel.add(serviceBtn, c); + c.gridx = 0; c.gridy = 1; c.gridwidth = 1; @@ -193,55 +193,55 @@ public class Demo extends JFrame c.fill = GridBagConstraints.HORIZONTAL; JLabel selectedLb = new JLabel("Selected print service: "); panel.add(selectedLb, c); - + c.gridx = 1; c.gridy = 1; dialogSelectedService_Tf = new JTextField(25); panel.add(dialogSelectedService_Tf, c); - + c.gridx = 0; c.gridy = 2; JLabel selectedAttsLb = new JLabel("Selected Attributes: "); panel.add(selectedAttsLb, c); - + c.gridx = 1; c.gridy = 2; c.weighty = 1.5; c.fill = GridBagConstraints.BOTH; dialogSelectedServiceAtts = new JList(); - dialogSelectedServiceAtts.setVisibleRowCount(3); + dialogSelectedServiceAtts.setVisibleRowCount(3); JScrollPane scrollPane = new JScrollPane(dialogSelectedServiceAtts); panel.add(scrollPane, c); - + c.gridx = 0; c.gridy = 3; c.fill = GridBagConstraints.HORIZONTAL; JLabel fileLb = new JLabel("File to print: "); panel.add(fileLb, c); - + c.gridx = 1; c.gridy = 3; selectedFileTf = new JTextField(25); panel.add(selectedFileTf, c); - + c.gridx = 2; c.gridy = 3; c.fill = GridBagConstraints.NONE; JButton fileBt = new JButton("Choose file"); fileBt.addActionListener(this); panel.add(fileBt, c); - + c.gridx = 0; c.gridy = 4; c.fill = GridBagConstraints.HORIZONTAL; JLabel docFormatLb = new JLabel("Document format of file: "); panel.add(docFormatLb, c); - + c.gridx = 1; c.gridy = 4; dialogSelectedServicedocFormat = new JComboBox(); panel.add(dialogSelectedServicedocFormat, c); - + c.gridx = 0; c.gridy = 5; c.gridwidth = 2; @@ -251,7 +251,7 @@ public class Demo extends JFrame printBt.setActionCommand("PRINT"); printBt.addActionListener(this); panel.add(printBt, c); - + return panel; } @@ -264,14 +264,14 @@ public class Demo extends JFrame if (event.getActionCommand().equals("CLOSE")) { System.exit(0); - } + } else if (event.getActionCommand().equals("Choose file")) { JFileChooser chooser = new JFileChooser(); chooser.showOpenDialog(this); - + selectedFile = chooser.getSelectedFile(); - + if (selectedFile != null) selectedFileTf.setText(selectedFile.getName()); else @@ -279,17 +279,17 @@ public class Demo extends JFrame } else if (event.getActionCommand().equals("Show print dialog ...")) { - atts = new HashPrintRequestAttributeSet(); + atts = new HashPrintRequestAttributeSet(); dialogSelectedService = ServiceUI.printDialog(null, 50, 50, services, null, null, atts); - + if (dialogSelectedService != null) { dialogSelectedService_Tf.setText(dialogSelectedService.getName()); - + // we do not want to have the class representation in the dialog // as we later always use an InputStream to open the file selected - + // use set to remove duplicates DocFlavor[] docflavors = dialogSelectedService.getSupportedDocFlavors(); HashSet set = new HashSet(); @@ -301,8 +301,8 @@ public class Demo extends JFrame mimetype += "; charset=" + charset; set.add(mimetype); } - - dialogSelectedServicedocFormat.removeAllItems(); + + dialogSelectedServicedocFormat.removeAllItems(); for (Iterator it = set.iterator(); it.hasNext(); ) dialogSelectedServicedocFormat.addItem(it.next()); } @@ -314,19 +314,19 @@ public class Demo extends JFrame for (int i = 0; i < attsSTr.length; i++) attsSTr[i] = attsArray[i].getName() + " - " + attsArray[i].toString(); - dialogSelectedServiceAtts.setListData(attsSTr); - - validate(); - } + dialogSelectedServiceAtts.setListData(attsSTr); + + validate(); + } else if (event.getActionCommand().equals("PRINT")) - { - if (selectedFile != null && dialogSelectedService != null) + { + if (selectedFile != null && dialogSelectedService != null) { DocPrintJob job = dialogSelectedService.createPrintJob(); - + // choose correct docflavor String mimetype = (String) dialogSelectedServicedocFormat.getSelectedItem(); - + DocFlavor flavor = null; if (mimetype.equals(DocFlavor.INPUT_STREAM.GIF.getMimeType())) flavor = DocFlavor.INPUT_STREAM.GIF; @@ -348,7 +348,7 @@ public class Demo extends JFrame flavor = DocFlavor.INPUT_STREAM.TEXT_PLAIN_HOST; else flavor = new DocFlavor(mimetype, "java.io.InputStream"); - + try { SimpleDoc doc = new SimpleDoc(new FileInputStream(selectedFile), flavor, null); @@ -363,7 +363,7 @@ public class Demo extends JFrame { JOptionPane.showMessageDialog(this, e, "PrintException", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); - } + } } else JOptionPane.showMessageDialog(this, "Please select a file to print using the FileChooser", "No file selected", JOptionPane.INFORMATION_MESSAGE); @@ -371,7 +371,7 @@ public class Demo extends JFrame else if (event.getActionCommand().equals("SERVICE")) { // A new service was selected PrintService selected = (PrintService) serviceBox.getSelectedItem(); - + DocFlavor[] flavors = selected.getSupportedDocFlavors(); docFormat.setListData(flavors); attCategories.setListData(selected.getSupportedAttributeCategories()); diff --git a/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java b/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java index 5c44c9a10f1..4518e25b1fa 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java +++ b/libjava/classpath/examples/gnu/classpath/examples/sound/AudioPlayerSample.java @@ -52,15 +52,15 @@ import javax.sound.sampled.UnsupportedAudioFileException; * A simple demo to show the use of the Java Sound API. * It plays the given file (up to the end, so don't pass the 26 minutes long * Pink Floyd's Echoes unless you really want!!). - * + * * See: http://jsresources.org/examples/SimpleAudioPlayer.java.html - * + * * @author Mario Torre */ public class AudioPlayerSample { private static final int EXTERNAL_BUFFER_SIZE = 128000; - + /** * @param args */ @@ -72,12 +72,12 @@ public class AudioPlayerSample "AudioPlayerSample [file]"); return; } - + String file = args[0]; - + System.out.println("Welcome to Radio Classpath, only great music for you!"); System.out.println("Today's DJ Tap The WaterDroplet"); - + // now create the AudioInputStream AudioInputStream audioInputStream = null; try @@ -98,15 +98,15 @@ public class AudioPlayerSample e.printStackTrace(); return; } - + // get informations about the kind of file we are about to play AudioFormat audioFormat = audioInputStream.getFormat(); - + System.out.println("Playing file: " + file); System.out.println("format: " + audioFormat.toString()); - + System.out.print("Additional properties: "); - + // now, we try to get all the properties we have in this AudioFormat // and display them Map properties = audioFormat.properties(); @@ -122,18 +122,18 @@ public class AudioPlayerSample System.out.println(key + ": " + properties.get(key)); } } - + // let's setup things for playing // first, we require a Line. As we are doing playing, we will ask for a // SourceDataLine SourceDataLine line = null; - + // To get the source line, we first need to build an Info object // this is done in one line: DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); - + System.out.println("searching line..."); - + // usually, if a backend can parse a file type, it can also // create a line to handle it, but that's not guaranteed // so we need to take care and to handle a possible @@ -141,9 +141,9 @@ public class AudioPlayerSample try { line = (SourceDataLine) AudioSystem.getLine(info); - + System.out.println("line found, opening..."); - + // once created, a line must be opened to let data flow // though it. line.open(audioFormat); @@ -160,24 +160,24 @@ public class AudioPlayerSample e.printStackTrace(); return; } - + // an open line pass data to the backend only when it is in // a state called "started" ("playing" or "play" in some other // framework) System.out.print("starting line... "); - + line.start(); System.out.println("done"); - + // now we can start reading data from the AudioStream and writing // data to the pipeline. The Java Sound API is rather low level // so let you pass up to one byte of data at a time // (with some constraints, refer to the API documentation to know more) // We will do some buffering. You may want to check the frame size // to allow a better buffering, also. - + System.out.println("now playing..."); - + int nBytesRead = 0; byte[] abData = new byte[EXTERNAL_BUFFER_SIZE]; while (nBytesRead != - 1) @@ -190,7 +190,7 @@ public class AudioPlayerSample { e.printStackTrace(); } - + if (nBytesRead >= 0) { // this method returns the number of bytes actuall written @@ -200,9 +200,9 @@ public class AudioPlayerSample line.write(abData, 0, nBytesRead); } } - + System.out.print("stream finished, draining line... "); - + // call this method to ensure that all the data in the internal buffer // reach the audio backend, otherwise your application will // cut the last frames of audio data (and users will not enjoy the last @@ -212,10 +212,10 @@ public class AudioPlayerSample // Once done, we can close the line. Note that a line, once closed // may not be reopened (depends on the backend, in some cases a "reopen", // if allowed, really opens a new line, reallocating all the resources) - + System.out.println("line drained, now exiting"); line.close(); - + System.out.println("We hope you enjoyed Radio Classpath!"); } diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java b/libjava/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java index f61275e5766..a929683b8e9 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/BrowserEditorKit.java @@ -54,4 +54,3 @@ public class BrowserEditorKit setAutoFormSubmission(false); } } - diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/ButtonDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/ButtonDemo.java index 1c6dfa01b02..8b05dac1347 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/ButtonDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/ButtonDemo.java @@ -43,23 +43,23 @@ import javax.swing.plaf.metal.MetalIconFactory; /** * A simple button demo showing various buttons in different states. */ -public class ButtonDemo - extends JPanel - implements ActionListener +public class ButtonDemo + extends JPanel + implements ActionListener { - private JCheckBox buttonState; + private JCheckBox buttonState; private JButton button1; private JButton button2; private JButton button3; private JButton button4; - private JCheckBox toggleState; + private JCheckBox toggleState; private JToggleButton toggle1; private JToggleButton toggle2; private JToggleButton toggle3; private JToggleButton toggle4; - + private JCheckBox checkBoxState; private JCheckBox checkBox1; private JCheckBox checkBox2; @@ -73,16 +73,16 @@ public class ButtonDemo /** * Creates a new demo instance. */ - public ButtonDemo() + public ButtonDemo() { createContent(); - // initFrameContent() is only called (from main) when running this app + // initFrameContent() is only called (from main) when running this app // standalone } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. @@ -100,10 +100,10 @@ public class ButtonDemo /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ + */ private void createContent() { setLayout(new BorderLayout()); @@ -114,64 +114,64 @@ public class ButtonDemo panel.add(createRadioPanel()); add(panel); } - - private JPanel createButtonPanel() + + private JPanel createButtonPanel() { JPanel panel = new JPanel(new BorderLayout()); this.buttonState = new JCheckBox("Enabled", true); this.buttonState.setActionCommand("BUTTON_STATE"); this.buttonState.addActionListener(this); panel.add(this.buttonState, BorderLayout.EAST); - + JPanel buttonPanel = new JPanel(); buttonPanel.setBorder(BorderFactory.createTitledBorder("JButton")); this.button1 = new JButton("Button 1"); - + this.button2 = new JButton("Button 2"); this.button2.setIcon(MetalIconFactory.getInternalFrameDefaultMenuIcon()); - + this.button3 = new JButton("Button 3"); this.button3.setIcon(MetalIconFactory.getFileChooserHomeFolderIcon()); this.button3.setHorizontalTextPosition(SwingConstants.CENTER); this.button3.setVerticalTextPosition(SwingConstants.BOTTOM); - + this.button4 = new JButton("Button 4"); this.button4.setIcon(MetalIconFactory.getFileChooserUpFolderIcon()); this.button4.setText(null); - + buttonPanel.add(button1); buttonPanel.add(button2); buttonPanel.add(button3); buttonPanel.add(button4); - + panel.add(buttonPanel); - + return panel; } - - private JPanel createTogglePanel() + + private JPanel createTogglePanel() { JPanel panel = new JPanel(new BorderLayout()); - + this.toggleState = new JCheckBox("Enabled", true); this.toggleState.setActionCommand("TOGGLE_STATE"); this.toggleState.addActionListener(this); - + panel.add(this.toggleState, BorderLayout.EAST); - + JPanel buttonPanel = new JPanel(); buttonPanel.setBorder(BorderFactory.createTitledBorder("JToggleButton")); - + this.toggle1 = new JToggleButton("Toggle 1"); - + this.toggle2 = new JToggleButton("Toggle 2"); this.toggle2.setIcon(MetalIconFactory.getInternalFrameDefaultMenuIcon()); - + this.toggle3 = new JToggleButton("Toggle 3"); this.toggle3.setIcon(MetalIconFactory.getFileChooserHomeFolderIcon()); this.toggle3.setHorizontalTextPosition(SwingConstants.CENTER); this.toggle3.setVerticalTextPosition(SwingConstants.BOTTOM); - + this.toggle4 = new JToggleButton("Toggle 4"); this.toggle4.setIcon(MetalIconFactory.getFileChooserUpFolderIcon()); this.toggle4.setText(null); @@ -181,98 +181,98 @@ public class ButtonDemo toggleGroup.add(toggle2); toggleGroup.add(toggle3); toggleGroup.add(toggle4); - + buttonPanel.add(toggle1); buttonPanel.add(toggle2); buttonPanel.add(toggle3); buttonPanel.add(toggle4); - + panel.add(buttonPanel); - + return panel; } - private JPanel createCheckBoxPanel() + private JPanel createCheckBoxPanel() { JPanel panel = new JPanel(new BorderLayout()); - + this.checkBoxState = new JCheckBox("Enabled", true); this.checkBoxState.setActionCommand("CHECKBOX_STATE"); this.checkBoxState.addActionListener(this); - + panel.add(this.checkBoxState, BorderLayout.EAST); - + JPanel buttonPanel = new JPanel(); buttonPanel.setBorder(BorderFactory.createTitledBorder("JCheckBox")); this.checkBox1 = new JCheckBox("CheckBox 1"); - + this.checkBox2 = new JCheckBox("CheckBox 2"); - + this.checkBox3 = new JCheckBox("CheckBox 3"); - + buttonPanel.add(checkBox1); buttonPanel.add(checkBox2); buttonPanel.add(checkBox3); - + panel.add(buttonPanel); - + return panel; } - private JPanel createRadioPanel() + private JPanel createRadioPanel() { JPanel panel = new JPanel(new BorderLayout()); - + this.radioState = new JCheckBox("Enabled", true); this.radioState.setActionCommand("RADIO_STATE"); this.radioState.addActionListener(this); panel.add(this.radioState, BorderLayout.EAST); - + JPanel buttonPanel = new JPanel(); buttonPanel.setBorder(BorderFactory.createTitledBorder("JRadioButton")); this.radio1 = new JRadioButton("Radio 1"); - + this.radio2 = new JRadioButton("Radio 2"); - + this.radio3 = new JRadioButton("Radio 3"); - + ButtonGroup radioGroup = new ButtonGroup(); radioGroup.add(radio1); radioGroup.add(radio2); radioGroup.add(radio3); - + buttonPanel.add(radio1); buttonPanel.add(radio2); buttonPanel.add(radio3); - + panel.add(buttonPanel); - + return panel; } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("BUTTON_STATE")) + if (e.getActionCommand().equals("BUTTON_STATE")) { button1.setEnabled(buttonState.isSelected()); button2.setEnabled(buttonState.isSelected()); button3.setEnabled(buttonState.isSelected()); button4.setEnabled(buttonState.isSelected()); } - else if (e.getActionCommand().equals("TOGGLE_STATE")) + else if (e.getActionCommand().equals("TOGGLE_STATE")) { toggle1.setEnabled(toggleState.isSelected()); toggle2.setEnabled(toggleState.isSelected()); toggle3.setEnabled(toggleState.isSelected()); toggle4.setEnabled(toggleState.isSelected()); } - else if (e.getActionCommand().equals("CHECKBOX_STATE")) + else if (e.getActionCommand().equals("CHECKBOX_STATE")) { checkBox1.setEnabled(checkBoxState.isSelected()); checkBox2.setEnabled(checkBoxState.isSelected()); checkBox3.setEnabled(checkBoxState.isSelected()); } - else if (e.getActionCommand().equals("RADIO_STATE")) + else if (e.getActionCommand().equals("RADIO_STATE")) { radio1.setEnabled(radioState.isSelected()); radio2.setEnabled(radioState.isSelected()); @@ -284,7 +284,7 @@ public class ButtonDemo } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/ComboBoxDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/ComboBoxDemo.java index 61dee06f2ff..682af0bdd5b 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/ComboBoxDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/ComboBoxDemo.java @@ -47,11 +47,11 @@ import javax.swing.plaf.metal.MetalIconFactory; /** * A simple demo showing various combo boxes in different states. */ -public class ComboBoxDemo +public class ComboBoxDemo extends JPanel - implements ActionListener + implements ActionListener { - + class CustomCellRenderer extends DefaultListCellRenderer { public Component getListCellRendererComponent(JList list, @@ -60,9 +60,9 @@ public class ComboBoxDemo boolean isSelected, boolean cellHasFocus) { - DefaultListCellRenderer result = (DefaultListCellRenderer) - super.getListCellRendererComponent(list, value, index, isSelected, - cellHasFocus); + DefaultListCellRenderer result = (DefaultListCellRenderer) + super.getListCellRendererComponent(list, value, index, isSelected, + cellHasFocus); Icon icon = (Icon) value; result.setIcon(icon); result.setText("Index = " + index); @@ -70,47 +70,47 @@ public class ComboBoxDemo } } - private JCheckBox comboState1; + private JCheckBox comboState1; private JComboBox combo1; private JComboBox combo2; - private JCheckBox comboState2; + private JCheckBox comboState2; private JComboBox combo3; private JComboBox combo4; - - private JCheckBox comboState3; + + private JCheckBox comboState3; private JComboBox combo5; private JComboBox combo6; - private JCheckBox comboState4; + private JCheckBox comboState4; private JComboBox combo7; private JComboBox combo8; - private JCheckBox comboState5; + private JCheckBox comboState5; private JComboBox combo9; private JComboBox combo10; - + private JCheckBox comboState6; private JComboBox combo11; private JComboBox combo12; - + /** * Creates a new demo instance. */ - public ComboBoxDemo() + public ComboBoxDemo() { super(); createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. */ - void initFrameContent() + void initFrameContent() { JPanel closePanel = new JPanel(); JButton closeButton = new JButton("Close"); @@ -119,15 +119,15 @@ public class ComboBoxDemo closePanel.add(closeButton); add(closePanel, BorderLayout.SOUTH); } - + /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ - private void createContent() + */ + private void createContent() { setLayout(new BorderLayout()); JPanel panel = new JPanel(new GridLayout(6, 1)); @@ -139,127 +139,127 @@ public class ComboBoxDemo panel.add(createPanel6()); add(panel); } - - private JPanel createPanel1() + + private JPanel createPanel1() { JPanel panel = new JPanel(new BorderLayout()); this.comboState1 = new JCheckBox("Enabled", true); this.comboState1.setActionCommand("COMBO_STATE1"); this.comboState1.addActionListener(this); panel.add(this.comboState1, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Regular: ")); - this.combo1 = new JComboBox(new Object[] {"Australia", "New Zealand", + this.combo1 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); - - this.combo2 = new JComboBox(new Object[] {"Australia", "New Zealand", + + this.combo2 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); this.combo2.setEditable(true); - + controlPanel.add(combo1); controlPanel.add(combo2); - + panel.add(controlPanel); - + return panel; } - - private JPanel createPanel2() + + private JPanel createPanel2() { JPanel panel = new JPanel(new BorderLayout()); this.comboState2 = new JCheckBox("Enabled", true); this.comboState2.setActionCommand("COMBO_STATE2"); this.comboState2.addActionListener(this); panel.add(this.comboState2, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Large Font: ")); - this.combo3 = new JComboBox(new Object[] {"Australia", "New Zealand", + this.combo3 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); this.combo3.setFont(new Font("Dialog", Font.PLAIN, 20)); - - this.combo4 = new JComboBox(new Object[] {"Australia", "New Zealand", + + this.combo4 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); this.combo4.setEditable(true); this.combo4.setFont(new Font("Dialog", Font.PLAIN, 20)); - + controlPanel.add(combo3); controlPanel.add(combo4); - + panel.add(controlPanel); - + return panel; } - private JPanel createPanel3() + private JPanel createPanel3() { JPanel panel = new JPanel(new BorderLayout()); this.comboState3 = new JCheckBox("Enabled", true); this.comboState3.setActionCommand("COMBO_STATE3"); this.comboState3.addActionListener(this); panel.add(this.comboState3, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Colored Background: ")); - this.combo5 = new JComboBox(new Object[] {"Australia", "New Zealand", + this.combo5 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); this.combo5.setBackground(Color.yellow); - - this.combo6 = new JComboBox(new Object[] {"Australia", "New Zealand", + + this.combo6 = new JComboBox(new Object[] {"Australia", "New Zealand", "England"}); this.combo6.setEditable(true); this.combo6.setBackground(Color.yellow); - + controlPanel.add(combo5); controlPanel.add(combo6); - + panel.add(controlPanel); - + return panel; } - + /** * This panel contains combo boxes that are empty. - * + * * @return A panel. */ - private JPanel createPanel4() + private JPanel createPanel4() { JPanel panel = new JPanel(new BorderLayout()); this.comboState4 = new JCheckBox("Enabled", true); this.comboState4.setActionCommand("COMBO_STATE4"); this.comboState4.addActionListener(this); panel.add(this.comboState4, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Empty: ")); this.combo7 = new JComboBox(); this.combo8 = new JComboBox(); this.combo8.setEditable(true); - + controlPanel.add(combo7); controlPanel.add(combo8); - + panel.add(controlPanel); - + return panel; } - + /** - * This panel contains combo boxes that are narrow but contain long text + * This panel contains combo boxes that are narrow but contain long text * items. - * + * * @return A panel. */ - private JPanel createPanel5() + private JPanel createPanel5() { JPanel panel = new JPanel(new BorderLayout()); this.comboState5 = new JCheckBox("Enabled", true); this.comboState5.setActionCommand("COMBO_STATE5"); this.comboState5.addActionListener(this); panel.add(this.comboState5, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Narrow: ")); this.combo9 = new JComboBox(new Object[] { @@ -269,28 +269,28 @@ public class ComboBoxDemo "A really long item that will be truncated when displayed"}); this.combo10.setPreferredSize(new Dimension(100, 30)); this.combo10.setEditable(true); - + controlPanel.add(combo9); controlPanel.add(combo10); - + panel.add(controlPanel); - + return panel; } /** * This panel contains combo boxes with a custom renderer. - * + * * @return A panel. */ - private JPanel createPanel6() + private JPanel createPanel6() { JPanel panel = new JPanel(new BorderLayout()); this.comboState6 = new JCheckBox("Enabled", true); this.comboState6.setActionCommand("COMBO_STATE6"); this.comboState6.addActionListener(this); panel.add(this.comboState6, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Custom Renderer: ")); this.combo11 = new JComboBox(new Object[] { @@ -304,43 +304,43 @@ public class ComboBoxDemo this.combo12.setPreferredSize(new Dimension(100, 30)); this.combo12.setRenderer(new CustomCellRenderer()); this.combo12.setEditable(true); - + controlPanel.add(combo11); controlPanel.add(combo12); - + panel.add(controlPanel); - + return panel; } - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("COMBO_STATE1")) + if (e.getActionCommand().equals("COMBO_STATE1")) { combo1.setEnabled(comboState1.isSelected()); combo2.setEnabled(comboState1.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE2")) + else if (e.getActionCommand().equals("COMBO_STATE2")) { combo3.setEnabled(comboState2.isSelected()); combo4.setEnabled(comboState2.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE3")) + else if (e.getActionCommand().equals("COMBO_STATE3")) { combo5.setEnabled(comboState3.isSelected()); combo6.setEnabled(comboState3.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE4")) + else if (e.getActionCommand().equals("COMBO_STATE4")) { combo7.setEnabled(comboState4.isSelected()); combo8.setEnabled(comboState4.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE5")) + else if (e.getActionCommand().equals("COMBO_STATE5")) { combo9.setEnabled(comboState5.isSelected()); combo10.setEnabled(comboState5.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE6")) + else if (e.getActionCommand().equals("COMBO_STATE6")) { combo11.setEnabled(comboState6.isSelected()); combo12.setEnabled(comboState6.isSelected()); @@ -351,7 +351,7 @@ public class ComboBoxDemo } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java index 3c7f0b887ef..772df6a3bba 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/Demo.java @@ -76,7 +76,7 @@ public class Demo private JMenuBar mkMenuBar() { JMenuBar bar = new JMenuBar(); - + JMenu file = new JMenu("File"); JMenu edit = new JMenu("Edit"); JMenu help = new JMenu("Help"); @@ -113,9 +113,9 @@ public class Demo JMenu preferences = new JMenu("Preferences..."); preferences.add(new JCheckBoxMenuItem("Microphone Active", - stockIcon("mic"))); + stockIcon("mic"))); preferences.add(new JCheckBoxMenuItem("Check Spelling", - stockIcon("spell-check"))); + stockIcon("spell-check"))); preferences.add(new JCheckBoxMenuItem("World Peace")); preferences.add(new JSeparator()); preferences.add(new JRadioButtonMenuItem("Radio Button")); @@ -165,7 +165,7 @@ public class Demo final JMenuItem vmMenu; - + help.add(new JMenuItem("just play with the widgets")); help.add(new JMenuItem("and enjoy the sensation of")); help.add(new JMenuItem("your neural connections growing")); @@ -182,14 +182,14 @@ public class Demo + " distributed by " + System.getProperty("java.vm.vendor") + "."; - + String gnuClasspath = System.getProperty("gnu.classpath.version"); if(gnuClasspath != null) message += "\nThe runtime's libraries are " + "kindly provided by the " + "members of GNU Classpath and are in version " + gnuClasspath + "."; - + JOptionPane.showMessageDialog(vmMenu, message); } }); @@ -197,7 +197,7 @@ public class Demo // Installs the BasicLookAndFeel. UIManager.installLookAndFeel("(Basic Look And Feel)", InstantiableBasicLookAndFeel.class.getName()); - + // Create L&F menu. JMenu lafMenu = new JMenu("Look and Feel"); ButtonGroup lafGroup = new ButtonGroup(); @@ -211,7 +211,7 @@ public class Demo boolean selected = laf.getClassName().equals(currentLaf); lafItem.setSelected(selected); lafMenu.add(lafItem); - + lafGroup.add(lafItem); } @@ -231,7 +231,7 @@ public class Demo { // Ignore it. } - + if (m != null) { JRadioButtonMenuItem ocean = @@ -239,7 +239,7 @@ public class Demo ocean.setSelected(MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme); themesMenu.add(ocean); themesGroup.add(ocean); - + JRadioButtonMenuItem steel = new JRadioButtonMenuItem(new ChangeThemeAction(new DefaultMetalTheme())); ocean.setSelected(MetalLookAndFeel.getCurrentTheme() @@ -251,7 +251,7 @@ public class Demo { themesMenu.setEnabled(false); } - + bar.add(file); bar.add(edit); bar.add(examples); @@ -267,10 +267,10 @@ public class Demo { public void actionPerformed(ActionEvent e) { - JOptionPane.showConfirmDialog(but, + JOptionPane.showConfirmDialog(but, "Sure you want to go " + dir + "?", "Confirm", - JOptionPane.OK_CANCEL_OPTION, + JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, bigStockIcon("warning")); } @@ -310,10 +310,10 @@ public class Demo } } - private static JButton mkButton(String title, Icon icon, + private static JButton mkButton(String title, Icon icon, int hAlign, int vAlign, int hPos, int vPos) - { + { JButton b; if (icon == null) b = new JButton(title); @@ -321,12 +321,12 @@ public class Demo b = new JButton(icon); else b = new JButton(title, icon); - + b.setToolTipText(title); if (hAlign != -1) b.setHorizontalAlignment(hAlign); if (vAlign != -1) b.setVerticalAlignment(vAlign); if (hPos != -1) b.setHorizontalTextPosition(hPos); - if (vPos != -1) b.setVerticalTextPosition(vPos); + if (vPos != -1) b.setVerticalTextPosition(vPos); return b; } @@ -363,7 +363,7 @@ public class Demo { public void run() { - new Demo(); + new Demo(); } } @@ -442,7 +442,7 @@ public class Demo } private JPanel mkButtonBar() - { + { JPanel panel = new JPanel(new GridLayout(3, 1, 5, 5)); panel.add(new JButton(new PopupAction("Buttons", ButtonDemo.createDemoFactory()))); @@ -479,15 +479,15 @@ public class Demo JButton exitDisposer = mkDisposerButton(frame); panel.add(exitDisposer); - - panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, + + panel.setMaximumSize(new Dimension(Integer.MAX_VALUE, panel.getPreferredSize().height)); exitDisposer.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) - { - System.exit(1); - } + public void actionPerformed(ActionEvent e) + { + System.exit(1); + } }); return panel; } @@ -546,7 +546,7 @@ public class Demo } SwingUtilities.updateComponentTreeUI(frame); } - + } /** @@ -585,16 +585,16 @@ public class Demo { ex.printStackTrace(); } - + SwingUtilities.updateComponentTreeUI(frame); themesMenu.setEnabled(laf.getClassName() .equals("javax.swing.plaf.metal.MetalLookAndFeel")); } } - + /** * An implementation of BasicLookAndFeel which can be instantiated. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -604,9 +604,9 @@ public class Demo { return "An instantiable implementation of BasicLookAndFeel"; } - + public String getID() - { + { return "instantiableBasicLookAndFeel"; } @@ -614,12 +614,12 @@ public class Demo { return "Instantiable Basic Look And Feel"; } - + public boolean isNativeLookAndFeel() { return false; } - + public boolean isSupportedLookAndFeel() { return true; diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/DemoFactory.java b/libjava/classpath/examples/gnu/classpath/examples/swing/DemoFactory.java index 0320f31e365..0bbd0220a5e 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/DemoFactory.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/DemoFactory.java @@ -50,7 +50,7 @@ public interface DemoFactory /** * Creates the component that should be as demo application. - * + * * @return the component that should be as demo application */ JComponent createDemo(); diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java index b338e438027..58db9911017 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/DocumentFilterDemo.java @@ -47,20 +47,20 @@ import javax.swing.text.DocumentFilter; /** * A demonstration of the javax.swing.text.DocumentFilter class. - * + * *

Similar to a dialog in a popular programming IDE the user can insert * a CVS URL into a textfield and the filter will split the components apart * and will put them into the right textfields saving the user a lot of * typing time.

- * + * * @author Robert Schuster */ -public class DocumentFilterDemo - extends JPanel - implements ActionListener +public class DocumentFilterDemo + extends JPanel + implements ActionListener { JTextField target; - + JTextField host; JTextField repositoryPath; JTextField user; @@ -70,16 +70,16 @@ public class DocumentFilterDemo /** * Creates a new demo instance. */ - public DocumentFilterDemo() + public DocumentFilterDemo() { createContent(); - // initFrameContent() is only called (from main) when running this app + // initFrameContent() is only called (from main) when running this app // standalone } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. @@ -97,30 +97,30 @@ public class DocumentFilterDemo private void createContent() { setLayout(new BorderLayout()); - + JPanel panel = new JPanel(new GridLayout(7, 2)); panel.add(new JLabel("CVS URL:")); panel.add(target = new JTextField(20)); target.setBackground(Color.RED); - + panel.add(new JLabel("Host:")); panel.add(host = new JTextField(20)); - + panel.add(new JLabel("Repository Path:")); panel.add(repositoryPath = new JTextField(20)); - + panel.add(new JLabel("Username:")); panel.add(user = new JTextField(20)); - + panel.add(new JLabel("Password:")); panel.add(password = new JTextField(20)); - + panel.add(new JLabel("Connection Type:")); panel.add(connectionType = new JComboBox()); - + JButton helpButton = new JButton("Help"); panel.add(helpButton); - + helpButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) @@ -134,7 +134,7 @@ public class DocumentFilterDemo "string into your clipboard."); } }); - + JButton exampleButton = new JButton("Provide me an example!"); panel.add(exampleButton); exampleButton.addActionListener(new ActionListener() @@ -148,9 +148,9 @@ public class DocumentFilterDemo StringSelection selection = new StringSelection(":extssh:gnu@cvs.savannah.gnu.org:" + "/cvs/example/project"); - + cb.setContents(selection, selection); - + // Confirm success with a beep. tk.beep(); } @@ -164,25 +164,25 @@ public class DocumentFilterDemo } } }); - + connectionType.addItem("pserver"); connectionType.addItem("ext"); connectionType.addItem("extssh"); - + add(panel); - + AbstractDocument doc = (AbstractDocument) target.getDocument(); doc.setDocumentFilter(new CVSFilter()); } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) System.exit(0); - - } - public static void main(String[] args) + } + + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() @@ -215,7 +215,7 @@ public class DocumentFilterDemo } }; } - + class CVSFilter extends DocumentFilter { // example: pserver:anonymous@cvs.sourceforge.net:/cvsroot/fmj @@ -228,7 +228,7 @@ public class DocumentFilterDemo { filterString(fb, offset, 0, string, attr, true); } - + public void replace(DocumentFilter.FilterBypass fb, int offset, int length, String string, @@ -237,7 +237,7 @@ public class DocumentFilterDemo { filterString(fb, offset, length, string, attr, false); } - + public void filterString(DocumentFilter.FilterBypass fb, int offset, int length, String string, AttributeSet attr, boolean insertion) @@ -253,12 +253,12 @@ public class DocumentFilterDemo // operation on the remaining string and continue. if(result[0].equals("")) result = result[1].split(":", 2); - + connectionType.setSelectedItem(result[0]); - + // Split off the username and password part result = result[1].split("@", 2); - + // Break username and password in half String[] userCredentials = result[0].split(":"); user.setText(userCredentials[0]); @@ -267,22 +267,22 @@ public class DocumentFilterDemo // be the password. if (userCredentials.length == 2) password.setText(userCredentials[1]); - + // Now break the host part apart. result = result[1].split(":"); - + host.setText(result[0]); - + repositoryPath.setText(result[1]); } - + // The unmodified string is put into the document. if (insertion) fb.insertString(offset, string, attr); else fb.replace(offset, length, string, attr); } - + } - + } diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/FileChooserDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/FileChooserDemo.java index 86cc015d9b7..444453bf55c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/FileChooserDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/FileChooserDemo.java @@ -46,57 +46,57 @@ import javax.swing.filechooser.FileFilter; */ public class FileChooserDemo extends JPanel - implements ActionListener + implements ActionListener { /** * A file filter for Java source files. */ static class JavaFileFilter extends FileFilter { - public String getDescription() + public String getDescription() { return "Java Source Files (.java)"; } public boolean accept(File f) { - if (f != null) + if (f != null) { return f.getName().endsWith(".java") || f.isDirectory(); } - else + else return false; } } /** A label to display the selected file. */ JLabel selectedFileLabel; - - /** - * A list showing the selected files (where multi selections are - * allowed). + + /** + * A list showing the selected files (where multi selections are + * allowed). */ JList selectedFilesList; - + /** A label to display the return code for the JFileChooser. */ JLabel returnCodeLabel; - + /** - * Creates a new demo instance. + * Creates a new demo instance. */ - public FileChooserDemo() + public FileChooserDemo() { super(); createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. */ - void initFrameContent() + void initFrameContent() { JPanel closePanel = new JPanel(); JButton closeButton = new JButton("Close"); @@ -105,7 +105,7 @@ public class FileChooserDemo closePanel.add(closeButton); add(closePanel, BorderLayout.SOUTH); } - + /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area @@ -116,8 +116,8 @@ public class FileChooserDemo private void createContent() { setLayout(new BorderLayout()); - - // create a panel of buttons to select the different styles of file + + // create a panel of buttons to select the different styles of file // chooser... JPanel buttonPanel = new JPanel(new GridLayout(5, 1)); JButton openButton = new JButton("Open..."); @@ -141,30 +141,30 @@ public class FileChooserDemo openMultiButton.addActionListener(this); buttonPanel.add(openMultiButton); add(buttonPanel, BorderLayout.WEST); - + // create a panel to display the selected file(s) and the return code JPanel displayPanel = new JPanel(new BorderLayout()); - + selectedFileLabel = new JLabel("-"); selectedFileLabel.setBorder(BorderFactory.createTitledBorder("Selected File/Directory: ")); displayPanel.add(selectedFileLabel, BorderLayout.NORTH); - + selectedFilesList = new JList(); JScrollPane sp = new JScrollPane(selectedFilesList); sp.setBorder(BorderFactory.createTitledBorder("Selected Files: ")); displayPanel.add(sp); - + returnCodeLabel = new JLabel("0"); returnCodeLabel.setBorder(BorderFactory.createTitledBorder("Return Code:")); displayPanel.add(returnCodeLabel, BorderLayout.SOUTH); - + add(displayPanel); } - + /** * When the user clicks on a button, launch the appropriate file chooser * and report the results. - * + * * @param e the event. */ public void actionPerformed(ActionEvent e) @@ -172,7 +172,7 @@ public class FileChooserDemo int option = 0; File selectedFile = null; File[] selectedFiles = new File[0]; - + if (e.getActionCommand().equals("CLOSE")) { System.exit(0); @@ -216,7 +216,7 @@ public class FileChooserDemo selectedFile = chooser.getSelectedFile(); selectedFiles = chooser.getSelectedFiles(); } - + // display the selection and return code if (selectedFile != null) selectedFileLabel.setText(selectedFile.toString()); @@ -228,8 +228,8 @@ public class FileChooserDemo selectedFilesList.setModel(listModel); returnCodeLabel.setText(Integer.toString(option)); } - - public static void main(String[] args) + + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java index 1a24ae2760e..20977b21854 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java @@ -68,11 +68,11 @@ import javax.swing.text.html.FormSubmitEvent; /** * Parses and displays HTML content. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public class HtmlDemo extends JPanel -{ +{ private class LoadActionListener implements ActionListener @@ -101,10 +101,10 @@ public class HtmlDemo extends JPanel /** * The URL entry field. */ - JTextField url = new JTextField(); + JTextField url = new JTextField(); JTextPane html = new JTextPane(); - + int n; /** @@ -152,7 +152,7 @@ public class HtmlDemo extends JPanel } } } - + }); JScrollPane scroller = new JScrollPane(html); @@ -190,7 +190,7 @@ public class HtmlDemo extends JPanel } setPreferredSize(new Dimension(800, 600)); } - + /** * Creates the toolbar with the control buttons. @@ -254,7 +254,7 @@ public class HtmlDemo extends JPanel /** * The executable method to display the editable table. - * + * * @param args * unused. */ @@ -377,4 +377,3 @@ public class HtmlDemo extends JPanel }; } } - diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/ListDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/ListDemo.java index 7ed15beffb5..8caa1dc6245 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/ListDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/ListDemo.java @@ -62,7 +62,7 @@ public class ListDemo implements ActionListener { - private static class LabelCellRenderer + private static class LabelCellRenderer extends DefaultListCellRenderer { public Component getListCellRendererComponent(JList list, @@ -71,14 +71,14 @@ public class ListDemo boolean isSelected, boolean cellHasFocus) { - Component c = super.getListCellRendererComponent(list, value, index, + Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); return c; } } - private static class CheckCellRenderer + private static class CheckCellRenderer extends JCheckBox implements ListCellRenderer { @@ -90,7 +90,7 @@ public class ListDemo { setSelected(isSelected); setText(value.toString()); - + return this; } } @@ -104,7 +104,7 @@ public class ListDemo private void createContent() { - String foo[] = new String[] { + String foo[] = new String[] { "non alcoholic ", "carbonated ", "malted ", @@ -113,8 +113,8 @@ public class ListDemo "high fructose ", "enriched " }; - - String bar[] = new String[] { + + String bar[] = new String[] { "orange juice", "ginger beer", "yak milk", @@ -162,7 +162,7 @@ public class ListDemo splitter.add(new JScrollPane(list2), JSplitPane.RIGHT); setLayout(new BorderLayout()); - JPanel p2 = new JPanel(); + JPanel p2 = new JPanel(); p2.setLayout(new GridLayout(1, 2)); p2.add(add); p2.add(del); @@ -171,7 +171,7 @@ public class ListDemo add(splitter, BorderLayout.CENTER); } - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -181,7 +181,7 @@ public class ListDemo /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/MetalThemeEditor.java b/libjava/classpath/examples/gnu/classpath/examples/swing/MetalThemeEditor.java index d3be0b85de8..1360f9b59da 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/MetalThemeEditor.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/MetalThemeEditor.java @@ -134,7 +134,7 @@ public class MetalThemeEditor g.setColor(color); g.fillRect(x, y, 30, 10); } - + } /** @@ -477,7 +477,7 @@ public class MetalThemeEditor { ex.printStackTrace(); } - + } /** diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java index a7472dfb514..761c575280c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/NavigationFilterDemo.java @@ -42,32 +42,32 @@ import javax.swing.text.Utilities; /** * A demonstration of the javax.swing.text.NavigationFilter class. - * + * *

It shows a NavigationFilter which lets you walk word-wise * through a text.

- * + * * @author Robert Schuster */ -public class NavigationFilterDemo - extends JPanel - implements ActionListener +public class NavigationFilterDemo + extends JPanel + implements ActionListener { - + JTextArea textArea; /** * Creates a new demo instance. */ - public NavigationFilterDemo() + public NavigationFilterDemo() { createContent(); - // initFrameContent() is only called (from main) when running this app + // initFrameContent() is only called (from main) when running this app // standalone } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. @@ -85,29 +85,29 @@ public class NavigationFilterDemo private void createContent() { setLayout(new BorderLayout()); - + add(textArea = new JTextArea(10, 20)); - + textArea.setWrapStyleWord(true); - + textArea.setLineWrap(true); - + textArea.setNavigationFilter(new WordFilter()); - + textArea.setText("GNU Classpath, Essential Libraries for Java, " + "is a GNU project to create free core class " + "libraries for use with virtual machines and " + "compilers for the java programming language."); } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) System.exit(0); - - } - public static void main(String[] args) + } + + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() @@ -140,7 +140,7 @@ public class NavigationFilterDemo } }; } - + class WordFilter extends NavigationFilter { public int getNextVisualPositionFrom(JTextComponent text, @@ -151,14 +151,14 @@ public class NavigationFilterDemo throws BadLocationException { Point pt; - + int newpos = pos; switch (direction) { case SwingConstants.NORTH: // Find out where the caret want to be positioned ideally. pt = text.getCaret().getMagicCaretPosition(); - + // Calculate its position above. newpos = Utilities.getPositionAbove(text, pos, (pt != null) ? pt.x : 0); @@ -184,7 +184,7 @@ public class NavigationFilterDemo case SwingConstants.WEST: // Calculate the next word start. newpos = Utilities.getWordStart(text, newpos); - + // If that means that the caret will not move, return // the start of the previous word. if (newpos != pos) @@ -199,7 +199,7 @@ public class NavigationFilterDemo direction, biasRet); } } - + } - + } diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/ScrollBarDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/ScrollBarDemo.java index 505991e1918..ac500d61289 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/ScrollBarDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/ScrollBarDemo.java @@ -37,23 +37,23 @@ import javax.swing.SwingUtilities; /** * A simple scroll bar demo showing various scroll bars in different states. */ -public class ScrollBarDemo +public class ScrollBarDemo extends JPanel - implements ActionListener + implements ActionListener { /** * Creates a new demo instance. */ - public ScrollBarDemo() + public ScrollBarDemo() { super(); createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. @@ -67,27 +67,27 @@ public class ScrollBarDemo closePanel.add(closeButton); add(closePanel, BorderLayout.SOUTH); } - + /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ - private void createContent() + */ + private void createContent() { setLayout(new BorderLayout()); JPanel panel = createScrollBarPanel(); add(panel); } - - private JPanel createScrollBarPanel() + + private JPanel createScrollBarPanel() { JPanel panel = new JPanel(new BorderLayout()); - + JPanel horizontalPanel = new JPanel(); - + JScrollBar scroll1a = new JScrollBar(JScrollBar.HORIZONTAL); JScrollBar scroll1b = new JScrollBar(JScrollBar.HORIZONTAL); scroll1b.setEnabled(false); @@ -100,12 +100,12 @@ public class ScrollBarDemo horizontalPanel.add(scroll1b); horizontalPanel.add(scroll1c); horizontalPanel.add(scroll1d); - + panel.add(horizontalPanel, BorderLayout.NORTH); - + JPanel verticalPanel = new JPanel(); verticalPanel.setLayout(new GridLayout(1, 7)); - + JScrollBar scroll2a = new JScrollBar(JScrollBar.VERTICAL); JScrollBar scroll2b = new JScrollBar(JScrollBar.VERTICAL); scroll2b.setEnabled(false); @@ -114,7 +114,7 @@ public class ScrollBarDemo JScrollBar scroll2d = new JScrollBar(JScrollBar.VERTICAL); scroll2d.setEnabled(false); scroll2d.putClientProperty("JScrollBar.isFreeStanding", Boolean.FALSE); - + verticalPanel.add(scroll2a); verticalPanel.add(new JPanel()); verticalPanel.add(scroll2b); @@ -122,17 +122,17 @@ public class ScrollBarDemo verticalPanel.add(scroll2c); verticalPanel.add(new JPanel()); verticalPanel.add(scroll2d); - + panel.add(verticalPanel, BorderLayout.EAST); - + JPanel centerPanel = new JPanel(new GridLayout(1, 2)); centerPanel.add(new JScrollBar(JScrollBar.HORIZONTAL)); centerPanel.add(new JScrollBar(JScrollBar.VERTICAL)); panel.add(centerPanel); - return panel; + return panel; } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -140,7 +140,7 @@ public class ScrollBarDemo } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/SliderDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/SliderDemo.java index df84cc63645..76d68c9849f 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/SliderDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/SliderDemo.java @@ -37,7 +37,7 @@ import javax.swing.SwingUtilities; public class SliderDemo extends JPanel - implements ActionListener + implements ActionListener { JSlider hslider1; @@ -48,7 +48,7 @@ public class SliderDemo JSlider hslider6; JSlider hslider7; JSlider hslider8; - + JSlider vslider1; JSlider vslider2; JSlider vslider3; @@ -59,15 +59,15 @@ public class SliderDemo JSlider vslider8; JCheckBox enabledCheckBox; - - public SliderDemo() + + public SliderDemo() { createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. @@ -81,15 +81,15 @@ public class SliderDemo closePanel.add(closeButton); add(closePanel, BorderLayout.SOUTH); } - + /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ - private void createContent() + */ + private void createContent() { setLayout(new BorderLayout()); JPanel panel = new JPanel(new GridLayout(1, 2)); @@ -106,14 +106,14 @@ public class SliderDemo panel2.add(checkBoxPanel, BorderLayout.SOUTH); add(panel2); } - - private JPanel createHorizontalPanel() + + private JPanel createHorizontalPanel() { JPanel panel = new JPanel(new GridLayout(8, 1)); - + hslider1 = new JSlider(JSlider.HORIZONTAL, 0, 100, 35); panel.add(hslider1); - + hslider2 = new JSlider(JSlider.HORIZONTAL, 0, 100, 35); hslider2.setMajorTickSpacing(20); hslider2.setMinorTickSpacing(5); @@ -138,7 +138,7 @@ public class SliderDemo hslider5 = new JSlider(JSlider.HORIZONTAL, 0, 100, 35); hslider5.setInverted(true); panel.add(hslider5); - + hslider6 = new JSlider(JSlider.HORIZONTAL, 0, 100, 35); hslider6.setInverted(true); hslider6.setMajorTickSpacing(20); @@ -165,14 +165,14 @@ public class SliderDemo return panel; } - - private JPanel createVerticalPanel() + + private JPanel createVerticalPanel() { JPanel panel = new JPanel(new GridLayout(1, 8)); - + vslider1 = new JSlider(JSlider.VERTICAL, 0, 100, 35); panel.add(vslider1); - + vslider2 = new JSlider(JSlider.VERTICAL, 0, 100, 35); vslider2.setMajorTickSpacing(20); vslider2.setMinorTickSpacing(5); @@ -197,7 +197,7 @@ public class SliderDemo vslider5 = new JSlider(JSlider.VERTICAL, 0, 100, 35); vslider5.setInverted(true); panel.add(vslider5); - + vslider6 = new JSlider(JSlider.VERTICAL, 0, 100, 35); vslider6.setInverted(true); vslider6.setMajorTickSpacing(20); @@ -223,8 +223,8 @@ public class SliderDemo panel.add(vslider8); return panel; } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -251,7 +251,7 @@ public class SliderDemo vslider8.setEnabled(enabled); } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/SpinnerDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/SpinnerDemo.java index d0edd96ba7e..abf72bce22c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/SpinnerDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/SpinnerDemo.java @@ -45,39 +45,39 @@ import javax.swing.SwingUtilities; /** * A simple demo showing various spinners in different states. */ -public class SpinnerDemo - extends JPanel - implements ActionListener +public class SpinnerDemo + extends JPanel + implements ActionListener { - private JCheckBox spinnerState1; + private JCheckBox spinnerState1; private JSpinner spinner1; private JSpinner spinner2; - private JCheckBox spinnerState2; + private JCheckBox spinnerState2; private JSpinner spinner3; private JSpinner spinner4; - - private JCheckBox spinnerState3; + + private JCheckBox spinnerState3; private JSpinner spinner5; private JSpinner spinner6; - + /** * Creates a new demo instance. */ - public SpinnerDemo() + public SpinnerDemo() { super(); createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. */ - void initFrameContent() + void initFrameContent() { JPanel closePanel = new JPanel(); JButton closeButton = new JButton("Close"); @@ -86,15 +86,15 @@ public class SpinnerDemo closePanel.add(closeButton); add(closePanel, BorderLayout.SOUTH); } - + /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ - private void createContent() + */ + private void createContent() { setLayout(new BorderLayout()); JPanel panel = new JPanel(new GridLayout(3, 1)); @@ -103,15 +103,15 @@ public class SpinnerDemo panel.add(createPanel3()); add(panel); } - - private JPanel createPanel1() + + private JPanel createPanel1() { JPanel panel = new JPanel(new BorderLayout()); this.spinnerState1 = new JCheckBox("Enabled", true); this.spinnerState1.setActionCommand("COMBO_STATE1"); this.spinnerState1.addActionListener(this); panel.add(this.spinnerState1, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder( "Number Spinner: ")); @@ -120,76 +120,76 @@ public class SpinnerDemo this.spinner2.setFont(new Font("Dialog", Font.PLAIN, 20)); controlPanel.add(this.spinner1); controlPanel.add(this.spinner2); - + panel.add(controlPanel); - + return panel; } - - private JPanel createPanel2() + + private JPanel createPanel2() { JPanel panel = new JPanel(new BorderLayout()); this.spinnerState2 = new JCheckBox("Enabled", true); this.spinnerState2.setActionCommand("COMBO_STATE2"); this.spinnerState2.addActionListener(this); panel.add(this.spinnerState2, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("Date Spinner: ")); - this.spinner3 = new JSpinner(new SpinnerDateModel(new Date(), null, null, + this.spinner3 = new JSpinner(new SpinnerDateModel(new Date(), null, null, Calendar.DATE)); - - this.spinner4 = new JSpinner(new SpinnerDateModel(new Date(), null, null, + + this.spinner4 = new JSpinner(new SpinnerDateModel(new Date(), null, null, Calendar.YEAR)); this.spinner4.setFont(new Font("Dialog", Font.PLAIN, 20)); - + controlPanel.add(this.spinner3); controlPanel.add(this.spinner4); - + panel.add(controlPanel); - + return panel; } - private JPanel createPanel3() + private JPanel createPanel3() { JPanel panel = new JPanel(new BorderLayout()); this.spinnerState3 = new JCheckBox("Enabled", true); this.spinnerState3.setActionCommand("COMBO_STATE3"); this.spinnerState3.addActionListener(this); panel.add(this.spinnerState3, BorderLayout.EAST); - + JPanel controlPanel = new JPanel(); controlPanel.setBorder(BorderFactory.createTitledBorder("List Spinner: ")); - this.spinner5 = new JSpinner(new SpinnerListModel(new Object[] {"Red", + this.spinner5 = new JSpinner(new SpinnerListModel(new Object[] {"Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet"})); - - this.spinner6 = new JSpinner(new SpinnerListModel(new Object[] {"Red", + + this.spinner6 = new JSpinner(new SpinnerListModel(new Object[] {"Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet"})); this.spinner6.setValue("Yellow"); this.spinner6.setFont(new Font("Dialog", Font.PLAIN, 20)); - + controlPanel.add(this.spinner5); controlPanel.add(this.spinner6); - + panel.add(controlPanel); - + return panel; } - - public void actionPerformed(ActionEvent e) + + public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("COMBO_STATE1")) + if (e.getActionCommand().equals("COMBO_STATE1")) { spinner1.setEnabled(spinnerState1.isSelected()); spinner2.setEnabled(spinnerState1.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE2")) + else if (e.getActionCommand().equals("COMBO_STATE2")) { spinner3.setEnabled(spinnerState2.isSelected()); spinner4.setEnabled(spinnerState2.isSelected()); } - else if (e.getActionCommand().equals("COMBO_STATE3")) + else if (e.getActionCommand().equals("COMBO_STATE3")) { spinner5.setEnabled(spinnerState3.isSelected()); spinner6.setEnabled(spinnerState3.isSelected()); @@ -200,7 +200,7 @@ public class SpinnerDemo } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/TabbedPaneDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/TabbedPaneDemo.java index bd0e6bf15b6..7cf02ce291c 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/TabbedPaneDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/TabbedPaneDemo.java @@ -78,26 +78,26 @@ public class TabbedPaneDemo { JPanel p = new JPanel(); p.setLayout(new GridLayout(1, 1)); - + int COUNT = 25; JTabbedPane tp = createTabbedPane(SwingConstants.TOP, "tab", COUNT); p.add(tp); - + final JPopupMenu popup = new JPopupMenu(); JMenu menu = new JMenu("tab placement"); menu.add(createPlacementChangingMenuItem("top", SwingConstants.TOP, tp)); - + menu.add(createPlacementChangingMenuItem("bottom", SwingConstants.BOTTOM, tp)); - + menu.add(createPlacementChangingMenuItem("left", SwingConstants.LEFT, tp)); - + menu.add(createPlacementChangingMenuItem("right", SwingConstants.RIGHT, tp)); @@ -107,40 +107,40 @@ public class TabbedPaneDemo menu.add(createLayoutPolicyChangingMenuItem("wrapping tabs", JTabbedPane.WRAP_TAB_LAYOUT, tp)); - + menu.add(createLayoutPolicyChangingMenuItem("scrolling tabs", JTabbedPane.SCROLL_TAB_LAYOUT, tp)); popup.add(menu); - + tp.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { showPopup(e); } - + public void mouseReleased(MouseEvent e) { showPopup(e); } - + void showPopup(MouseEvent e) { if (e.isPopupTrigger()) { popup.show(e.getComponent(), e.getX(), e.getY()); } } }); - + setLayout(new BorderLayout()); add(p, BorderLayout.CENTER); - + } - + private JMenuItem createPlacementChangingMenuItem(String t, final int v, final JTabbedPane dst) { JMenuItem item = new JMenuItem(t); - + item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) @@ -148,16 +148,16 @@ public class TabbedPaneDemo dst.setTabPlacement(v); } }); - + return item; } - + private JMenuItem createLayoutPolicyChangingMenuItem(String t, final int v, final JTabbedPane dst) { JMenuItem item = new JMenuItem(t); - + item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) @@ -165,24 +165,24 @@ public class TabbedPaneDemo dst.setTabLayoutPolicy(v); } }); - + return item; } - + private JTabbedPane createTabbedPane(int direction, String name, int count) { JTabbedPane pane = new JTabbedPane(direction); - + for(int i = 0; i< count; i++) { pane.addTab(name + " " + i, createTabContent(name + " " + i)); if (Math.random() >= 0.75) pane.setEnabledAt(i, false); } - + return pane; } - + private JPanel createTabContent(String name) { JTextArea ta; @@ -190,13 +190,13 @@ public class TabbedPaneDemo panel.add(new JLabel(name)); panel.add(new JButton(name)); panel.add(new JScrollPane(ta = new JTextArea(5, 5))); - + ta.setBackground(colors[(int) (Math.random() * colors.length)]); - + return panel; } - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -206,7 +206,7 @@ public class TabbedPaneDemo /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/TableDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/TableDemo.java index 9f8e3e7d58c..6aa9ba558a5 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/TableDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/TableDemo.java @@ -65,28 +65,28 @@ import javax.swing.table.TableColumnModel; /** * Displays the editable table. The first column consists of check boxes. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public class TableDemo extends JPanel -{ +{ /** * The initial row count for this table. - */ + */ static int rows = 32; - + /** * The initial column count for this table. - */ + */ static int cols = 7; - - + + /** * The table model. */ class TModel extends DefaultTableModel { - + /** * All cells are editable in our table. */ @@ -94,7 +94,7 @@ public class TableDemo extends JPanel { return true; } - + /** * Get the number of the table rows. */ @@ -110,7 +110,7 @@ public class TableDemo extends JPanel { return cols; } - + /** * Set the value at the given position */ @@ -118,7 +118,7 @@ public class TableDemo extends JPanel { values[aRow][aColumn] = aValue; } - + /** * Get the value at the given position. */ @@ -126,7 +126,7 @@ public class TableDemo extends JPanel { return values[aRow][aColumn]; } - + /** * The column name, as suggested by model. This header should not be * visible, as it is overridden by setting the header name with @@ -136,9 +136,9 @@ public class TableDemo extends JPanel { return "Error "+column; } - + /** - * The first column contains booleans, the second - icons, + * The first column contains booleans, the second - icons, * others - default class. */ public Class getColumnClass(int column) @@ -149,7 +149,7 @@ public class TableDemo extends JPanel return Icon.class; else return super.getColumnClass(column); - } + } } /** @@ -163,12 +163,12 @@ public class TableDemo extends JPanel * The editor bar. */ JSlider bar; - + /** * The renderer bar. */ JSlider rendererBar; - + /** * The border around the bar, if required. */ @@ -179,9 +179,9 @@ public class TableDemo extends JPanel bar = new JSlider(); bar.setOrientation(JScrollBar.HORIZONTAL); bar.setMinimum(0); - bar.setMaximum(rows); + bar.setMaximum(rows); bar.setBorder(border); - + rendererBar = new JSlider(); rendererBar.setMinimum(0); rendererBar.setMaximum(rows); @@ -199,7 +199,7 @@ public class TableDemo extends JPanel bar.setValue(((Integer) value).intValue()); return bar; } - + /** * Get the renderer. */ @@ -221,13 +221,13 @@ public class TableDemo extends JPanel return new Integer(bar.getValue()); } - } - + } + /** * The table being displayed. */ JTable table = new JTable(); - + /** * The table model. */ @@ -237,26 +237,26 @@ public class TableDemo extends JPanel * The table value array. */ Object[][] values; - + /** * The icons that appear in the icon column. - */ + */ Icon[] icons = new Icon[] - { + { MetalIconFactory.getTreeComputerIcon(), MetalIconFactory.getTreeHardDriveIcon(), MetalIconFactory.getTreeFolderIcon(), }; - + /** * The choices in the combo boxes */ String [] sides = new String[] { - "north", "south", "east", "west" + "north", "south", "east", "west" }; - - + + /** * Create the table demo with the given titel. */ @@ -265,7 +265,7 @@ public class TableDemo extends JPanel super(); createContent(); } - + /** * Returns a panel with the demo content. The panel uses a BorderLayout(), and * the BorderLayout.SOUTH area is empty, to allow callers to add controls to @@ -276,7 +276,7 @@ public class TableDemo extends JPanel { setLayout(new BorderLayout()); values = new Object[rows][]; - + for (int i = 0; i < values.length; i++) { values[i] = new Object[cols]; @@ -289,44 +289,44 @@ public class TableDemo extends JPanel values [i][2] = sides [ i % sides.length ]; values [i][4] = new Integer(i); } - - table.setModel(model); - + + table.setModel(model); + // Make the columns with gradually increasing width: DefaultTableColumnModel cm = new DefaultTableColumnModel(); table.setColumnModel(cm); - + for (int i = 0; i < cols; i++) { TableColumn column = new TableColumn(i); - + // Showing the variable width columns. int width = 100+10*i; column.setPreferredWidth(width); - + // If we do not set the header value here, the value, returned // by model, is used. column.setHeaderValue("Width +"+(20*i)); - - cm.addColumn(column); + + cm.addColumn(column); } - + setCustomEditors(); setInformativeHeaders(); // Create the table, place it into scroll pane and place // the pane into this frame. JScrollPane scroll = new JScrollPane(); - + // The horizontal scroll bar is never needed. scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); scroll.getViewport().add(table); add(scroll, BorderLayout.CENTER); - + // Increase the row height to make the icons and sliders look better. table.setRowHeight(table.getRowHeight()+2); } - + /** * Set the more informative column headers for specific columns. */ @@ -340,7 +340,7 @@ public class TableDemo extends JPanel cm.getColumn(3).setHeaderValue("edit combo"); cm.getColumn(4).setHeaderValue("slider"); } - + /** * Set the custom editors for combo boxes. This method also sets one * custom renderer. @@ -348,31 +348,31 @@ public class TableDemo extends JPanel void setCustomEditors() { TableColumnModel cm = table.getColumnModel(); - + // Set combo-box based editor for icons (note that no custom // renderer is needed for JComboBox to work with icons. JComboBox combo0 = new JComboBox(icons); cm.getColumn(1).setCellEditor(new DefaultCellEditor(combo0)); - + // Set the simple combo box editor for the third column: JComboBox combo1 = new JComboBox(sides); cm.getColumn(2).setCellEditor(new DefaultCellEditor(combo1)); - + // Set the editable combo box for the forth column: JComboBox combo2 = new JComboBox(sides); combo2.setEditable(true); cm.getColumn(3).setCellEditor(new DefaultCellEditor(combo2)); - + SliderCell scrollView = new SliderCell(); cm.getColumn(4).setCellEditor(scrollView); - cm.getColumn(4).setCellRenderer(scrollView); + cm.getColumn(4).setCellRenderer(scrollView); table.setColumnModel(cm); } - + /** * The executable method to display the editable table. - * + * * @param args * unused. */ @@ -408,4 +408,3 @@ public class TableDemo extends JPanel }; } } - diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/TextAreaDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/TextAreaDemo.java index b72997cb3cb..5381f7ead0b 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/TextAreaDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/TextAreaDemo.java @@ -63,7 +63,7 @@ public class TextAreaDemo /** * A custom caret for demonstration purposes. This class is inspired by the * CornerCaret from the OReilly Swing book. - * + * * @author Roman Kennke (kennke@aicas.com) */ static class CornerCaret @@ -491,7 +491,7 @@ public class TextAreaDemo return DemoHighlightPainter.INSTANCE; } }); - + innerPanel.add(new JScrollPane(textarea16)); panel.add(innerPanel); diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/TextFieldDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/TextFieldDemo.java index ba0fefa31f3..e630228804f 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/TextFieldDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/TextFieldDemo.java @@ -58,7 +58,7 @@ import javax.swing.text.LayeredHighlighter.LayerPainter; /** * A simple textfield demo showing various textfields in different states. */ -public class TextFieldDemo +public class TextFieldDemo extends JPanel implements ActionListener { @@ -118,7 +118,7 @@ public class TextFieldDemo } } } - + static class DemoHighlightPainter extends LayerPainter { @@ -167,14 +167,14 @@ public class TextFieldDemo return bounds; } - + } /** * The left aligned textfields and state buttons. */ Compound compound1; - + /** * The right aligned textfields and state buttons. */ @@ -195,7 +195,7 @@ public class TextFieldDemo * Some miscellaneous textfield demos. */ Compound compound6; - + /** * Some textfields with custom borders. */ @@ -204,20 +204,20 @@ public class TextFieldDemo /** * Creates a new demo instance. */ - public TextFieldDemo() + public TextFieldDemo() { super(); createContent(); } - + /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. */ - void initFrameContent() + void initFrameContent() { JPanel closePanel = new JPanel(); JButton closeButton = new JButton("Close"); @@ -230,11 +230,11 @@ public class TextFieldDemo /** * Returns a panel with the demo content. The panel * uses a BorderLayout(), and the BorderLayout.SOUTH area - * is empty, to allow callers to add controls to the + * is empty, to allow callers to add controls to the * bottom of the panel if they want to (a close button is * added if this demo is being run as a standalone demo). - */ - private void createContent() + */ + private void createContent() { setLayout(new BorderLayout()); JPanel panel = new JPanel(new GridLayout(7, 1)); @@ -245,13 +245,13 @@ public class TextFieldDemo panel.add(createCustomColorPanel2()); panel.add(createCustomBordersPanel()); panel.add(createMiscPanel()); - + // Put everything in a scroll pane to make it neccessary // to reach the bottom inner panels if the screen is to small. add(new JScrollPane(panel)); } - - private JPanel createLeftAlignedPanel() + + private JPanel createLeftAlignedPanel() { compound1 = createTextFieldCompound("Left aligned", 1); @@ -261,16 +261,16 @@ public class TextFieldDemo new Font("Dialog", Font.ITALIC, 12), new Font("Dialog", Font.BOLD, 14) }); - + return compound1.panel; } - + private Compound createTextFieldCompound(String title, int actionCommandNo) { Compound compound = new Compound(); compound.panel = new JPanel(new BorderLayout()); compound.panel.setBorder(BorderFactory.createTitledBorder(title)); - + compound.textFieldPanel = new JPanel(); compound.textFieldPanel.setLayout(new BoxLayout(compound.textFieldPanel, BoxLayout.X_AXIS)); @@ -295,7 +295,7 @@ public class TextFieldDemo return compound; } - private JPanel createRightAlignedPanel() + private JPanel createRightAlignedPanel() { compound2 = createTextFieldCompound("Right aligned", 2); @@ -305,11 +305,11 @@ public class TextFieldDemo new Font("Dialog", Font.ITALIC, 12), new Font("Dialog", Font.BOLD, 14) }); - + return compound2.panel; } - private JPanel createCenteredPanel() + private JPanel createCenteredPanel() { compound3 = createTextFieldCompound("Centered", 3); @@ -319,7 +319,7 @@ public class TextFieldDemo new Font("Dialog", Font.ITALIC, 12), new Font("Dialog", Font.BOLD, 14) }); - + return compound3.panel; } @@ -339,11 +339,11 @@ public class TextFieldDemo compound4.textfield3.setForeground(Color.RED); compound4.textfield3.setBackground(Color.YELLOW); compound4.textFieldPanel.add(compound4.textfield3); - + return compound4.panel; - + } - + private JPanel createCustomColorPanel2() { compound5 = createTextFieldCompound("Custom colors II", 5); @@ -359,12 +359,12 @@ public class TextFieldDemo compound5.textfield3 = new JTextField("custom selection color"); compound5.textfield3.setSelectionColor(Color.BLACK); compound5.textFieldPanel.add(compound5.textfield3); - + return compound5.panel; - + } - private JPanel createMiscPanel() + private JPanel createMiscPanel() { compound6 = createTextFieldCompound("Miscellaneous", 6); @@ -392,8 +392,8 @@ public class TextFieldDemo return compound6.panel; } - - private JPanel createCustomBordersPanel() + + private JPanel createCustomBordersPanel() { compound7 = createTextFieldCompound("Custom borders", 7); @@ -415,7 +415,7 @@ public class TextFieldDemo return compound7.panel; } - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -476,7 +476,7 @@ public class TextFieldDemo compound4.textfield1.setEditable(editable); compound4.textfield2.setEditable(editable); compound4.textfield3.setEditable(editable); - } + } else if (e.getActionCommand().equals("ENABLED5")) { boolean enabled = compound5.enabled.isSelected(); @@ -521,7 +521,7 @@ public class TextFieldDemo } } - public static void main(String[] args) + public static void main(String[] args) { SwingUtilities.invokeLater (new Runnable() @@ -557,16 +557,16 @@ public class TextFieldDemo static class Compound { JTextField textfield1; - JTextField textfield2; + JTextField textfield2; JTextField textfield3; JCheckBox enabled; JCheckBox editable; JPanel textFieldPanel; JPanel panel; - + /** Creates and initializes the textfields with the same text and * alignment but with a different font. - * + * * @param title The text for the textfields. * @param align The alignment for the textfields. * @param fonts The fonts to be used for the textfields. @@ -582,13 +582,13 @@ public class TextFieldDemo textfield2.setHorizontalAlignment(align); textfield2.setFont(fonts[1]); textFieldPanel.add(textfield2); - + textfield3 = new JTextField(title); textfield3.setHorizontalAlignment(align); textfield3.setFont(fonts[2]); textFieldPanel.add(textfield3); } - + } - + } diff --git a/libjava/classpath/examples/gnu/classpath/examples/swing/TreeDemo.java b/libjava/classpath/examples/gnu/classpath/examples/swing/TreeDemo.java index 8da37507152..f8f7ae6b4db 100644 --- a/libjava/classpath/examples/gnu/classpath/examples/swing/TreeDemo.java +++ b/libjava/classpath/examples/gnu/classpath/examples/swing/TreeDemo.java @@ -72,13 +72,13 @@ public class TreeDemo } private void createContent() - { + { // non-leafs DefaultMutableTreeNode root = new DefaultMutableTreeNode("Exotic Subsistence"); DefaultMutableTreeNode fruit = new DefaultMutableTreeNode("Interesting Fruit"); DefaultMutableTreeNode veg = new DefaultMutableTreeNode("Extraordinary Vegetables"); DefaultMutableTreeNode liq = new DefaultMutableTreeNode("Peculiar Liquids"); - + // leafs DefaultMutableTreeNode f1 = new DefaultMutableTreeNode("Abiu"); DefaultMutableTreeNode f2 = new DefaultMutableTreeNode("Bamboo Shoots"); @@ -88,7 +88,7 @@ public class TreeDemo DefaultMutableTreeNode f6 = new DefaultMutableTreeNode("Guava"); DefaultMutableTreeNode f7 = new DefaultMutableTreeNode("Jakfruit"); DefaultMutableTreeNode f8 = new DefaultMutableTreeNode("Quaribea"); - + DefaultMutableTreeNode v1 = new DefaultMutableTreeNode("Amaranth"); DefaultMutableTreeNode v2 = new DefaultMutableTreeNode("Kiwano"); DefaultMutableTreeNode v3 = new DefaultMutableTreeNode("Leeks"); @@ -96,7 +96,7 @@ public class TreeDemo DefaultMutableTreeNode v5 = new DefaultMutableTreeNode("Chayote"); DefaultMutableTreeNode v6 = new DefaultMutableTreeNode("Jicama"); DefaultMutableTreeNode v7 = new DefaultMutableTreeNode("Okra"); - + DefaultMutableTreeNode l1 = new DefaultMutableTreeNode("Alcoholic"); DefaultMutableTreeNode l11 = new DefaultMutableTreeNode("Caipirinha"); DefaultMutableTreeNode l21 = new DefaultMutableTreeNode("Mojito"); @@ -105,7 +105,7 @@ public class TreeDemo DefaultMutableTreeNode l5 = new DefaultMutableTreeNode("Non Alcoholic"); DefaultMutableTreeNode l55 = new DefaultMutableTreeNode("Babaji"); DefaultMutableTreeNode l65 = new DefaultMutableTreeNode("Chikita"); - + root.add(fruit); root.add(veg); root.add(liq); @@ -140,7 +140,7 @@ public class TreeDemo selModel.setSelectionMode( DefaultTreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION); tree.setSelectionModel(selModel); - + // buttons to add and delete JButton add = new JButton("add element"); add.addActionListener(new ActionListener() @@ -155,22 +155,22 @@ public class TreeDemo DefaultMutableTreeNode n = (DefaultMutableTreeNode) p. getLastPathComponent(); n.add(new DefaultMutableTreeNode("New Element")); - + // The expansion state of the parent node does not change // by default. We will expand it manually, to ensure that the // added node is immediately visible. tree.expandPath(p); - + // Refresh the tree (.repaint would be not enough both in // Classpath and Sun implementations). - DefaultTreeModel model = (DefaultTreeModel) tree.getModel(); + DefaultTreeModel model = (DefaultTreeModel) tree.getModel(); model.reload(n); break; } } } }); - + // Demonstration of the various selection modes final JCheckBox cbSingle = new JCheckBox("single selection"); cbSingle.addActionListener(new ActionListener() @@ -185,7 +185,7 @@ public class TreeDemo DefaultTreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION); } }); - + // Demonstration of the root visibility changes final JCheckBox cbRoot = new JCheckBox("root"); cbRoot.addActionListener(new ActionListener() @@ -196,7 +196,7 @@ public class TreeDemo } }); cbRoot.setSelected(true); - + // Demonstration of the tree selection listener. final JLabel choice = new JLabel("Make a choice"); tree.getSelectionModel().addTreeSelectionListener( @@ -206,18 +206,18 @@ public class TreeDemo { TreePath was = event.getOldLeadSelectionPath(); TreePath now = event.getNewLeadSelectionPath(); - String swas = + String swas = was == null ? "none":was.getLastPathComponent().toString(); - String snow = + String snow = now == null ? "none":now.getLastPathComponent().toString(); choice.setText("From "+swas+" to "+snow); } } ); - + setLayout(new BorderLayout()); - - JPanel p2 = new JPanel(); + + JPanel p2 = new JPanel(); p2.add(add); p2.add(cbSingle); p2.add(cbRoot); @@ -258,7 +258,7 @@ public class TreeDemo add(choice, BorderLayout.SOUTH); } - public void actionPerformed(ActionEvent e) + public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("CLOSE")) { @@ -268,7 +268,7 @@ public class TreeDemo /** * When the demo is run independently, the frame is displayed, so we should - * initialise the content panel (including the demo content and a close + * initialise the content panel (including the demo content and a close * button). But when the demo is run as part of the Swing activity board, * only the demo content panel is used, the frame itself is never displayed, * so we can avoid this step. diff --git a/libjava/classpath/external/jsr166/java/util/ArrayDeque.java b/libjava/classpath/external/jsr166/java/util/ArrayDeque.java index c0ee16ea7b3..a4bc75c9939 100644 --- a/libjava/classpath/external/jsr166/java/util/ArrayDeque.java +++ b/libjava/classpath/external/jsr166/java/util/ArrayDeque.java @@ -479,11 +479,11 @@ public class ArrayDeque extends AbstractCollection } private void checkInvariants() { - assert elements[tail] == null; - assert head == tail ? elements[head] == null : - (elements[head] != null && - elements[(tail - 1) & (elements.length - 1)] != null); - assert elements[(head - 1) & (elements.length - 1)] == null; + assert elements[tail] == null; + assert head == tail ? elements[head] == null : + (elements[head] != null && + elements[(tail - 1) & (elements.length - 1)] != null); + assert elements[(head - 1) & (elements.length - 1)] == null; } /** @@ -497,42 +497,42 @@ public class ArrayDeque extends AbstractCollection * @return true if elements moved backwards */ private boolean delete(int i) { - checkInvariants(); - final E[] elements = this.elements; - final int mask = elements.length - 1; - final int h = head; - final int t = tail; - final int front = (i - h) & mask; - final int back = (t - i) & mask; + checkInvariants(); + final E[] elements = this.elements; + final int mask = elements.length - 1; + final int h = head; + final int t = tail; + final int front = (i - h) & mask; + final int back = (t - i) & mask; - // Invariant: head <= i < tail mod circularity - if (front >= ((t - h) & mask)) - throw new ConcurrentModificationException(); + // Invariant: head <= i < tail mod circularity + if (front >= ((t - h) & mask)) + throw new ConcurrentModificationException(); - // Optimize for least element motion - if (front < back) { - if (h <= i) { - System.arraycopy(elements, h, elements, h + 1, front); - } else { // Wrap around - System.arraycopy(elements, 0, elements, 1, i); - elements[0] = elements[mask]; - System.arraycopy(elements, h, elements, h + 1, mask - h); - } - elements[h] = null; - head = (h + 1) & mask; - return false; - } else { - if (i < t) { // Copy the null tail as well - System.arraycopy(elements, i + 1, elements, i, back); - tail = t - 1; - } else { // Wrap around - System.arraycopy(elements, i + 1, elements, i, mask - i); - elements[mask] = elements[0]; - System.arraycopy(elements, 1, elements, 0, t); - tail = (t - 1) & mask; - } - return true; - } + // Optimize for least element motion + if (front < back) { + if (h <= i) { + System.arraycopy(elements, h, elements, h + 1, front); + } else { // Wrap around + System.arraycopy(elements, 0, elements, 1, i); + elements[0] = elements[mask]; + System.arraycopy(elements, h, elements, h + 1, mask - h); + } + elements[h] = null; + head = (h + 1) & mask; + return false; + } else { + if (i < t) { // Copy the null tail as well + System.arraycopy(elements, i + 1, elements, i, back); + tail = t - 1; + } else { // Wrap around + System.arraycopy(elements, i + 1, elements, i, mask - i); + elements[mask] = elements[0]; + System.arraycopy(elements, 1, elements, 0, t); + tail = (t - 1) & mask; + } + return true; + } } // *** Collection Methods *** @@ -611,8 +611,8 @@ public class ArrayDeque extends AbstractCollection throw new IllegalStateException(); if (delete(lastRet)) { // if left-shifted, undo increment in next() cursor = (cursor - 1) & (elements.length - 1); - fence = tail; - } + fence = tail; + } lastRet = -1; } } @@ -635,7 +635,7 @@ public class ArrayDeque extends AbstractCollection if (cursor == fence) throw new NoSuchElementException(); cursor = (cursor - 1) & (elements.length - 1); - E result = elements[cursor]; + E result = elements[cursor]; if (head != fence || result == null) throw new ConcurrentModificationException(); lastRet = cursor; @@ -647,8 +647,8 @@ public class ArrayDeque extends AbstractCollection throw new IllegalStateException(); if (!delete(lastRet)) { cursor = (cursor + 1) & (elements.length - 1); - fence = head; - } + fence = head; + } lastRet = -1; } } @@ -724,7 +724,7 @@ public class ArrayDeque extends AbstractCollection * @return an array containing all of the elements in this deque */ public Object[] toArray() { - return copyElements(new Object[size()]); + return copyElements(new Object[size()]); } /** @@ -769,7 +769,7 @@ public class ArrayDeque extends AbstractCollection if (a.length < size) a = (T[])java.lang.reflect.Array.newInstance( a.getClass().getComponentType(), size); - copyElements(a); + copyElements(a); if (a.length > size) a[size] = null; return a; diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java b/libjava/classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java index bdf34d28a20..3ce9ed85902 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ArrayBlockingQueue.java @@ -205,7 +205,7 @@ public class ArrayBlockingQueue extends AbstractQueue * @throws NullPointerException if the specified element is null */ public boolean add(E e) { - return super.add(e); + return super.add(e); } /** @@ -271,7 +271,7 @@ public class ArrayBlockingQueue extends AbstractQueue throws InterruptedException { if (e == null) throw new NullPointerException(); - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); final ReentrantLock lock = this.lock; lock.lockInterruptibly(); try { @@ -326,7 +326,7 @@ public class ArrayBlockingQueue extends AbstractQueue } public E poll(long timeout, TimeUnit unit) throws InterruptedException { - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); final ReentrantLock lock = this.lock; lock.lockInterruptibly(); try { diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java index 7f6d4493c06..9ad9ab25bad 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentHashMap.java @@ -196,10 +196,10 @@ public class ConcurrentHashMap extends AbstractMap this.value = value; } - @SuppressWarnings("unchecked") - static final HashEntry[] newArray(int i) { - return new HashEntry[i]; - } + @SuppressWarnings("unchecked") + static final HashEntry[] newArray(int i) { + return new HashEntry[i]; + } } /** @@ -287,9 +287,9 @@ public class ConcurrentHashMap extends AbstractMap setTable(HashEntry.newArray(initialCapacity)); } - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") static final Segment[] newArray(int i) { - return new Segment[i]; + return new Segment[i]; } /** @@ -775,7 +775,7 @@ public class ConcurrentHashMap extends AbstractMap * @throws NullPointerException if the specified key is null */ public boolean containsKey(Object key) { - int hash = hash(key.hashCode()); + int hash = hash(key.hashCode()); return segmentFor(hash).containsKey(key, hash); } @@ -915,7 +915,7 @@ public class ConcurrentHashMap extends AbstractMap * @throws NullPointerException if the specified key is null */ public V remove(Object key) { - int hash = hash(key.hashCode()); + int hash = hash(key.hashCode()); return segmentFor(hash).remove(key, hash, null); } @@ -1107,16 +1107,16 @@ public class ConcurrentHashMap extends AbstractMap } final class KeyIterator - extends HashIterator - implements Iterator, Enumeration + extends HashIterator + implements Iterator, Enumeration { public K next() { return super.nextEntry().key; } public K nextElement() { return super.nextEntry().key; } } final class ValueIterator - extends HashIterator - implements Iterator, Enumeration + extends HashIterator + implements Iterator, Enumeration { public V next() { return super.nextEntry().value; } public V nextElement() { return super.nextEntry().value; } @@ -1127,7 +1127,7 @@ public class ConcurrentHashMap extends AbstractMap * setValue changes to the underlying map. */ final class WriteThroughEntry - extends AbstractMap.SimpleEntry + extends AbstractMap.SimpleEntry { WriteThroughEntry(K k, V v) { super(k,v); @@ -1142,7 +1142,7 @@ public class ConcurrentHashMap extends AbstractMap * removed in which case the put will re-establish). We do not * and cannot guarantee more. */ - public V setValue(V value) { + public V setValue(V value) { if (value == null) throw new NullPointerException(); V v = super.setValue(value); ConcurrentHashMap.this.put(getKey(), value); @@ -1151,8 +1151,8 @@ public class ConcurrentHashMap extends AbstractMap } final class EntryIterator - extends HashIterator - implements Iterator> + extends HashIterator + implements Iterator> { public Map.Entry next() { HashEntry e = super.nextEntry(); diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java index bbb00a0f0a0..1ad9244548d 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListMap.java @@ -1175,7 +1175,7 @@ public class ConcurrentSkipListMap extends AbstractMap findFirst(); // retry clearIndexToFirst(); return new AbstractMap.SimpleImmutableEntry(n.key, (V)v); - } + } } /** @@ -1852,19 +1852,19 @@ public class ConcurrentSkipListMap extends AbstractMap * @return true if the specified object is equal to this map */ public boolean equals(Object o) { - if (o == this) - return true; - if (!(o instanceof Map)) - return false; - Map m = (Map) o; + if (o == this) + return true; + if (!(o instanceof Map)) + return false; + Map m = (Map) o; try { - for (Map.Entry e : this.entrySet()) - if (! e.getValue().equals(m.get(e.getKey()))) + for (Map.Entry e : this.entrySet()) + if (! e.getValue().equals(m.get(e.getKey()))) return false; - for (Map.Entry e : m.entrySet()) { + for (Map.Entry e : m.entrySet()) { Object k = e.getKey(); Object v = e.getValue(); - if (k == null || v == null || !v.equals(get(k))) + if (k == null || v == null || !v.equals(get(k))) return false; } return true; @@ -2208,20 +2208,20 @@ public class ConcurrentSkipListMap extends AbstractMap Node lastReturned; /** the next node to return from next(); */ Node next; - /** Cache of next value field to maintain weak consistency */ - V nextValue; + /** Cache of next value field to maintain weak consistency */ + V nextValue; /** Initializes ascending iterator for entire range. */ Iter() { for (;;) { - next = findFirst(); + next = findFirst(); if (next == null) break; Object x = next.value; if (x != null && x != next) { - nextValue = (V) x; + nextValue = (V) x; break; - } + } } } @@ -2234,14 +2234,14 @@ public class ConcurrentSkipListMap extends AbstractMap if ((lastReturned = next) == null) throw new NoSuchElementException(); for (;;) { - next = next.next; + next = next.next; if (next == null) break; Object x = next.value; if (x != null && x != next) { - nextValue = (V) x; + nextValue = (V) x; break; - } + } } } @@ -2252,7 +2252,7 @@ public class ConcurrentSkipListMap extends AbstractMap // It would not be worth all of the overhead to directly // unlink from here. Using remove is fast enough. ConcurrentSkipListMap.this.remove(l.key); - lastReturned = null; + lastReturned = null; } } @@ -2305,11 +2305,11 @@ public class ConcurrentSkipListMap extends AbstractMap */ static final List toList(Collection c) { - // Using size() here would be a pessimization. - List list = new ArrayList(); - for (E e : c) - list.add(e); - return list; + // Using size() here would be a pessimization. + List list = new ArrayList(); + for (E e : c) + list.add(e); + return list; } static final class KeySet extends AbstractSet implements NavigableSet { @@ -2355,8 +2355,8 @@ public class ConcurrentSkipListMap extends AbstractMap return false; } } - public Object[] toArray() { return toList(this).toArray(); } - public T[] toArray(T[] a) { return toList(this).toArray(a); } + public Object[] toArray() { return toList(this).toArray(); } + public T[] toArray(T[] a) { return toList(this).toArray(a); } public Iterator descendingIterator() { return descendingSet().iterator(); } @@ -2411,8 +2411,8 @@ public class ConcurrentSkipListMap extends AbstractMap public void clear() { m.clear(); } - public Object[] toArray() { return toList(this).toArray(); } - public T[] toArray(T[] a) { return toList(this).toArray(a); } + public Object[] toArray() { return toList(this).toArray(); } + public T[] toArray(T[] a) { return toList(this).toArray(a); } } static final class EntrySet extends AbstractSet> { @@ -2465,8 +2465,8 @@ public class ConcurrentSkipListMap extends AbstractMap return false; } } - public Object[] toArray() { return toList(this).toArray(); } - public T[] toArray(T[] a) { return toList(this).toArray(a); } + public Object[] toArray() { return toList(this).toArray(); } + public T[] toArray(T[] a) { return toList(this).toArray(a); } } /** @@ -2820,10 +2820,10 @@ public class ConcurrentSkipListMap extends AbstractMap public Comparator comparator() { Comparator cmp = m.comparator(); - if (isDescending) - return Collections.reverseOrder(cmp); - else - return cmp; + if (isDescending) + return Collections.reverseOrder(cmp); + else + return cmp; } /** @@ -3020,12 +3020,12 @@ public class ConcurrentSkipListMap extends AbstractMap next = isDescending ? hiNode() : loNode(); if (next == null) break; - Object x = next.value; + Object x = next.value; if (x != null && x != next) { - if (! inBounds(next.key)) + if (! inBounds(next.key)) next = null; - else - nextValue = (V) x; + else + nextValue = (V) x; break; } } @@ -3049,12 +3049,12 @@ public class ConcurrentSkipListMap extends AbstractMap next = next.next; if (next == null) break; - Object x = next.value; + Object x = next.value; if (x != null && x != next) { if (tooHigh(next.key)) next = null; else - nextValue = (V) x; + nextValue = (V) x; break; } } @@ -3065,11 +3065,11 @@ public class ConcurrentSkipListMap extends AbstractMap next = m.findNear(lastReturned.key, LT); if (next == null) break; - Object x = next.value; + Object x = next.value; if (x != null && x != next) { if (tooLow(next.key)) next = null; - else + else nextValue = (V) x; break; } @@ -3081,7 +3081,7 @@ public class ConcurrentSkipListMap extends AbstractMap if (l == null) throw new IllegalStateException(); m.remove(l.key); - lastReturned = null; + lastReturned = null; } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java index 7da50d593ae..7fd1c7608a0 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ConcurrentSkipListSet.java @@ -128,12 +128,12 @@ public class ConcurrentSkipListSet */ public ConcurrentSkipListSet clone() { ConcurrentSkipListSet clone = null; - try { - clone = (ConcurrentSkipListSet) super.clone(); + try { + clone = (ConcurrentSkipListSet) super.clone(); clone.setMap(new ConcurrentSkipListMap(m)); - } catch (CloneNotSupportedException e) { - throw new InternalError(); - } + } catch (CloneNotSupportedException e) { + throw new InternalError(); + } return clone; } @@ -157,7 +157,7 @@ public class ConcurrentSkipListSet * @return the number of elements in this set */ public int size() { - return m.size(); + return m.size(); } /** @@ -165,7 +165,7 @@ public class ConcurrentSkipListSet * @return true if this set contains no elements */ public boolean isEmpty() { - return m.isEmpty(); + return m.isEmpty(); } /** @@ -180,7 +180,7 @@ public class ConcurrentSkipListSet * @throws NullPointerException if the specified element is null */ public boolean contains(Object o) { - return m.containsKey(o); + return m.containsKey(o); } /** @@ -198,7 +198,7 @@ public class ConcurrentSkipListSet * @throws NullPointerException if the specified element is null */ public boolean add(E e) { - return m.putIfAbsent(e, Boolean.TRUE) == null; + return m.putIfAbsent(e, Boolean.TRUE) == null; } /** @@ -216,14 +216,14 @@ public class ConcurrentSkipListSet * @throws NullPointerException if the specified element is null */ public boolean remove(Object o) { - return m.remove(o, Boolean.TRUE); + return m.remove(o, Boolean.TRUE); } /** * Removes all of the elements from this set. */ public void clear() { - m.clear(); + m.clear(); } /** @@ -241,7 +241,7 @@ public class ConcurrentSkipListSet * @return an iterator over the elements in this set in descending order */ public Iterator descendingIterator() { - return m.descendingKeySet().iterator(); + return m.descendingKeySet().iterator(); } @@ -261,11 +261,11 @@ public class ConcurrentSkipListSet */ public boolean equals(Object o) { // Override AbstractSet version to avoid calling size() - if (o == this) - return true; - if (!(o instanceof Set)) - return false; - Collection c = (Collection) o; + if (o == this) + return true; + if (!(o instanceof Set)) + return false; + Collection c = (Collection) o; try { return containsAll(c) && c.containsAll(this); } catch (ClassCastException unused) { @@ -373,7 +373,7 @@ public class ConcurrentSkipListSet boolean fromInclusive, E toElement, boolean toInclusive) { - return new ConcurrentSkipListSet + return new ConcurrentSkipListSet (m.subMap(fromElement, fromInclusive, toElement, toInclusive)); } @@ -384,7 +384,7 @@ public class ConcurrentSkipListSet * @throws IllegalArgumentException {@inheritDoc} */ public NavigableSet headSet(E toElement, boolean inclusive) { - return new ConcurrentSkipListSet(m.headMap(toElement, inclusive)); + return new ConcurrentSkipListSet(m.headMap(toElement, inclusive)); } /** @@ -393,7 +393,7 @@ public class ConcurrentSkipListSet * @throws IllegalArgumentException {@inheritDoc} */ public NavigableSet tailSet(E fromElement, boolean inclusive) { - return new ConcurrentSkipListSet(m.tailMap(fromElement, inclusive)); + return new ConcurrentSkipListSet(m.tailMap(fromElement, inclusive)); } /** @@ -403,7 +403,7 @@ public class ConcurrentSkipListSet * @throws IllegalArgumentException {@inheritDoc} */ public NavigableSet subSet(E fromElement, E toElement) { - return subSet(fromElement, true, toElement, false); + return subSet(fromElement, true, toElement, false); } /** @@ -412,7 +412,7 @@ public class ConcurrentSkipListSet * @throws IllegalArgumentException {@inheritDoc} */ public NavigableSet headSet(E toElement) { - return headSet(toElement, false); + return headSet(toElement, false); } /** @@ -421,7 +421,7 @@ public class ConcurrentSkipListSet * @throws IllegalArgumentException {@inheritDoc} */ public NavigableSet tailSet(E fromElement) { - return tailSet(fromElement, true); + return tailSet(fromElement, true); } /** @@ -437,7 +437,7 @@ public class ConcurrentSkipListSet * @return a reverse order view of this set */ public NavigableSet descendingSet() { - return new ConcurrentSkipListSet(m.descendingMap()); + return new ConcurrentSkipListSet(m.descendingMap()); } // Support for resetting map in clone diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java b/libjava/classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java index 39c0e5868de..063636bd81e 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/CopyOnWriteArraySet.java @@ -89,7 +89,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return the number of elements in this set */ public int size() { - return al.size(); + return al.size(); } /** @@ -98,7 +98,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return true if this set contains no elements */ public boolean isEmpty() { - return al.isEmpty(); + return al.isEmpty(); } /** @@ -111,7 +111,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return true if this set contains the specified element */ public boolean contains(Object o) { - return al.contains(o); + return al.contains(o); } /** @@ -131,7 +131,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return an array containing all the elements in this set */ public Object[] toArray() { - return al.toArray(); + return al.toArray(); } /** @@ -177,7 +177,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @throws NullPointerException if the specified array is null */ public T[] toArray(T[] a) { - return al.toArray(a); + return al.toArray(a); } /** @@ -201,7 +201,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return true if this set contained the specified element */ public boolean remove(Object o) { - return al.remove(o); + return al.remove(o); } /** @@ -217,7 +217,7 @@ public class CopyOnWriteArraySet extends AbstractSet * element */ public boolean add(E e) { - return al.addIfAbsent(e); + return al.addIfAbsent(e); } /** @@ -227,12 +227,12 @@ public class CopyOnWriteArraySet extends AbstractSet * * @param c collection to be checked for containment in this set * @return true if this set contains all of the elements of the - * specified collection + * specified collection * @throws NullPointerException if the specified collection is null * @see #contains(Object) */ public boolean containsAll(Collection c) { - return al.containsAll(c); + return al.containsAll(c); } /** @@ -249,7 +249,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @see #add(Object) */ public boolean addAll(Collection c) { - return al.addAllAbsent(c) > 0; + return al.addAllAbsent(c) > 0; } /** @@ -268,7 +268,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @see #remove(Object) */ public boolean removeAll(Collection c) { - return al.removeAll(c); + return al.removeAll(c); } /** @@ -289,7 +289,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @see #remove(Object) */ public boolean retainAll(Collection c) { - return al.retainAll(c); + return al.retainAll(c); } /** @@ -304,7 +304,7 @@ public class CopyOnWriteArraySet extends AbstractSet * @return an iterator over the elements in this set */ public Iterator iterator() { - return al.iterator(); + return al.iterator(); } /** @@ -329,14 +329,14 @@ public class CopyOnWriteArraySet extends AbstractSet if (!(o instanceof Set)) return false; Set set = (Set)(o); - Iterator it = set.iterator(); + Iterator it = set.iterator(); // Uses O(n^2) algorithm that is only appropriate // for small sets, which CopyOnWriteArraySets should be. // Use a single snapshot of underlying array - Object[] elements = al.getArray(); - int len = elements.length; + Object[] elements = al.getArray(); + int len = elements.length; // Mark matched elements to avoid re-checking boolean[] matched = new boolean[len]; int k = 0; @@ -347,10 +347,10 @@ public class CopyOnWriteArraySet extends AbstractSet for (int i = 0; i < len; ++i) { if (!matched[i] && eq(x, elements[i])) { matched[i] = true; - continue outer; + continue outer; } } - return false; + return false; } return k == len; } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java b/libjava/classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java index e72577537d4..d5738c5ae8b 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/CyclicBarrier.java @@ -152,7 +152,7 @@ public class CyclicBarrier { */ private void breakBarrier() { generation.broken = true; - count = parties; + count = parties; trip.signalAll(); } @@ -179,7 +179,7 @@ public class CyclicBarrier { if (index == 0) { // tripped boolean ranAction = false; try { - final Runnable command = barrierCommand; + final Runnable command = barrierCommand; if (command != null) command.run(); ranAction = true; @@ -201,13 +201,13 @@ public class CyclicBarrier { } catch (InterruptedException ie) { if (g == generation && ! g.broken) { breakBarrier(); - throw ie; - } else { - // We're about to finish waiting even if we had not - // been interrupted, so this interrupt is deemed to - // "belong" to subsequent execution. - Thread.currentThread().interrupt(); - } + throw ie; + } else { + // We're about to finish waiting even if we had not + // been interrupted, so this interrupt is deemed to + // "belong" to subsequent execution. + Thread.currentThread().interrupt(); + } } if (g.broken) diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/DelayQueue.java b/libjava/classpath/external/jsr166/java/util/concurrent/DelayQueue.java index 8b839878c3a..4ce7bc65217 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/DelayQueue.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/DelayQueue.java @@ -444,8 +444,8 @@ public class DelayQueue extends AbstractQueue */ private class Itr implements Iterator { final Object[] array; // Array of all elements - int cursor; // index of next element to return; - int lastRet; // index of last element, or -1 if no such + int cursor; // index of next element to return; + int lastRet; // index of last element, or -1 if no such Itr(Object[] array) { lastRet = -1; @@ -465,7 +465,7 @@ public class DelayQueue extends AbstractQueue public void remove() { if (lastRet < 0) - throw new IllegalStateException(); + throw new IllegalStateException(); Object x = array[lastRet]; lastRet = -1; // Traverse underlying queue to find == element, diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/Executors.java b/libjava/classpath/external/jsr166/java/util/concurrent/Executors.java index f44e66160f7..18e6b33cc9f 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/Executors.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/Executors.java @@ -362,7 +362,7 @@ public class Executors { if (action == null) throw new NullPointerException(); return new Callable() { - public Object call() { return action.run(); }}; + public Object call() { return action.run(); }}; } /** @@ -376,8 +376,8 @@ public class Executors { public static Callable callable(final PrivilegedExceptionAction action) { if (action == null) throw new NullPointerException(); - return new Callable() { - public Object call() throws Exception { return action.run(); }}; + return new Callable() { + public Object call() throws Exception { return action.run(); }}; } /** @@ -625,13 +625,13 @@ public class Executors { } static class FinalizableDelegatedExecutorService - extends DelegatedExecutorService { - FinalizableDelegatedExecutorService(ExecutorService executor) { - super(executor); - } - protected void finalize() { - super.shutdown(); - } + extends DelegatedExecutorService { + FinalizableDelegatedExecutorService(ExecutorService executor) { + super(executor); + } + protected void finalize() { + super.shutdown(); + } } /** diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/FutureTask.java b/libjava/classpath/external/jsr166/java/util/concurrent/FutureTask.java index bbe49d7aed0..94742405dec 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/FutureTask.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/FutureTask.java @@ -233,59 +233,59 @@ public class FutureTask implements RunnableFuture { } void innerSet(V v) { - for (;;) { - int s = getState(); - if (s == RAN) - return; + for (;;) { + int s = getState(); + if (s == RAN) + return; if (s == CANCELLED) { - // aggressively release to set runner to null, - // in case we are racing with a cancel request - // that will try to interrupt runner + // aggressively release to set runner to null, + // in case we are racing with a cancel request + // that will try to interrupt runner releaseShared(0); return; } - if (compareAndSetState(s, RAN)) { + if (compareAndSetState(s, RAN)) { result = v; releaseShared(0); done(); - return; + return; } } } void innerSetException(Throwable t) { - for (;;) { - int s = getState(); - if (s == RAN) - return; + for (;;) { + int s = getState(); + if (s == RAN) + return; if (s == CANCELLED) { - // aggressively release to set runner to null, - // in case we are racing with a cancel request - // that will try to interrupt runner + // aggressively release to set runner to null, + // in case we are racing with a cancel request + // that will try to interrupt runner releaseShared(0); return; } - if (compareAndSetState(s, RAN)) { + if (compareAndSetState(s, RAN)) { exception = t; result = null; releaseShared(0); done(); - return; + return; } - } + } } boolean innerCancel(boolean mayInterruptIfRunning) { - for (;;) { - int s = getState(); - if (ranOrCancelled(s)) - return false; - if (compareAndSetState(s, CANCELLED)) - break; - } + for (;;) { + int s = getState(); + if (ranOrCancelled(s)) + return false; + if (compareAndSetState(s, CANCELLED)) + break; + } if (mayInterruptIfRunning) { Thread r = runner; - if (r != null) + if (r != null) r.interrupt(); } releaseShared(0); diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java b/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java index 91acccfbe8c..2dc8fa8774a 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingDeque.java @@ -57,7 +57,7 @@ public class LinkedBlockingDeque /** Doubly-linked list node class */ static final class Node { - E item; + E item; Node prev; Node next; Node(E x, Node p, Node n) { @@ -299,7 +299,7 @@ public class LinkedBlockingDeque public boolean offerFirst(E e, long timeout, TimeUnit unit) throws InterruptedException { if (e == null) throw new NullPointerException(); - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { for (;;) { @@ -321,7 +321,7 @@ public class LinkedBlockingDeque public boolean offerLast(E e, long timeout, TimeUnit unit) throws InterruptedException { if (e == null) throw new NullPointerException(); - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { for (;;) { @@ -398,7 +398,7 @@ public class LinkedBlockingDeque public E pollFirst(long timeout, TimeUnit unit) throws InterruptedException { - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { for (;;) { @@ -416,7 +416,7 @@ public class LinkedBlockingDeque public E pollLast(long timeout, TimeUnit unit) throws InterruptedException { - long nanos = unit.toNanos(timeout); + long nanos = unit.toNanos(timeout); lock.lockInterruptibly(); try { for (;;) { @@ -514,15 +514,15 @@ public class LinkedBlockingDeque * @throws NullPointerException if the specified element is null */ public boolean add(E e) { - addLast(e); - return true; + addLast(e); + return true; } /** * @throws NullPointerException if the specified element is null */ public boolean offer(E e) { - return offerLast(e); + return offerLast(e); } /** @@ -530,7 +530,7 @@ public class LinkedBlockingDeque * @throws InterruptedException {@inheritDoc} */ public void put(E e) throws InterruptedException { - putLast(e); + putLast(e); } /** @@ -539,7 +539,7 @@ public class LinkedBlockingDeque */ public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException { - return offerLast(e, timeout, unit); + return offerLast(e, timeout, unit); } /** @@ -553,19 +553,19 @@ public class LinkedBlockingDeque * @throws NoSuchElementException if this deque is empty */ public E remove() { - return removeFirst(); + return removeFirst(); } public E poll() { - return pollFirst(); + return pollFirst(); } public E take() throws InterruptedException { - return takeFirst(); + return takeFirst(); } public E poll(long timeout, TimeUnit unit) throws InterruptedException { - return pollFirst(timeout, unit); + return pollFirst(timeout, unit); } /** @@ -579,11 +579,11 @@ public class LinkedBlockingDeque * @throws NoSuchElementException if this deque is empty */ public E element() { - return getFirst(); + return getFirst(); } public E peek() { - return peekFirst(); + return peekFirst(); } /** @@ -668,14 +668,14 @@ public class LinkedBlockingDeque * @throws NullPointerException {@inheritDoc} */ public void push(E e) { - addFirst(e); + addFirst(e); } /** * @throws NoSuchElementException {@inheritDoc} */ public E pop() { - return removeFirst(); + return removeFirst(); } // Collection methods @@ -695,7 +695,7 @@ public class LinkedBlockingDeque * @return true if this deque changed as a result of the call */ public boolean remove(Object o) { - return removeFirstOccurrence(o); + return removeFirstOccurrence(o); } /** diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java b/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java index 3dedee56da0..62018096a50 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/LinkedBlockingQueue.java @@ -584,8 +584,8 @@ public class LinkedBlockingQueue extends AbstractQueue fullyLock(); try { head.next = null; - assert head.item == null; - last = head; + assert head.item == null; + last = head; if (count.getAndSet(0) == capacity) notFull.signalAll(); } finally { @@ -609,8 +609,8 @@ public class LinkedBlockingQueue extends AbstractQueue try { first = head.next; head.next = null; - assert head.item == null; - last = head; + assert head.item == null; + last = head; if (count.getAndSet(0) == capacity) notFull.signalAll(); } finally { @@ -649,9 +649,9 @@ public class LinkedBlockingQueue extends AbstractQueue } if (n != 0) { head.next = p; - assert head.item == null; - if (p == null) - last = head; + assert head.item == null; + if (p == null) + last = head; if (count.getAndAdd(-n) == capacity) notFull.signalAll(); } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java b/libjava/classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java index 91ae61b631f..9466aa477a8 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/PriorityBlockingQueue.java @@ -503,8 +503,8 @@ public class PriorityBlockingQueue extends AbstractQueue */ private class Itr implements Iterator { final Object[] array; // Array of all elements - int cursor; // index of next element to return; - int lastRet; // index of last element, or -1 if no such + int cursor; // index of next element to return; + int lastRet; // index of last element, or -1 if no such Itr(Object[] array) { lastRet = -1; @@ -524,7 +524,7 @@ public class PriorityBlockingQueue extends AbstractQueue public void remove() { if (lastRet < 0) - throw new IllegalStateException(); + throw new IllegalStateException(); Object x = array[lastRet]; lastRet = -1; // Traverse underlying queue to find == element, diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java b/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java index 976537ef5d6..c170c4a52d2 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledExecutorService.java @@ -82,7 +82,7 @@ public interface ScheduledExecutorService extends ExecutorService { * @throws NullPointerException if command is null */ public ScheduledFuture schedule(Runnable command, - long delay, TimeUnit unit); + long delay, TimeUnit unit); /** * Creates and executes a ScheduledFuture that becomes enabled after the @@ -97,7 +97,7 @@ public interface ScheduledExecutorService extends ExecutorService { * @throws NullPointerException if callable is null */ public ScheduledFuture schedule(Callable callable, - long delay, TimeUnit unit); + long delay, TimeUnit unit); /** * Creates and executes a periodic action that becomes enabled first @@ -125,9 +125,9 @@ public interface ScheduledExecutorService extends ExecutorService { * @throws IllegalArgumentException if period less than or equal to zero */ public ScheduledFuture scheduleAtFixedRate(Runnable command, - long initialDelay, - long period, - TimeUnit unit); + long initialDelay, + long period, + TimeUnit unit); /** * Creates and executes a periodic action that becomes enabled first @@ -152,8 +152,8 @@ public interface ScheduledExecutorService extends ExecutorService { * @throws IllegalArgumentException if delay less than or equal to zero */ public ScheduledFuture scheduleWithFixedDelay(Runnable command, - long initialDelay, - long delay, - TimeUnit unit); + long initialDelay, + long delay, + TimeUnit unit); } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java b/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java index d4da334c6e0..f08b9ac2eed 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ScheduledThreadPoolExecutor.java @@ -587,11 +587,11 @@ public class ScheduledThreadPoolExecutor } public boolean add(Runnable x) { - return dq.add((RunnableScheduledFuture)x); - } + return dq.add((RunnableScheduledFuture)x); + } public boolean offer(Runnable x) { - return dq.offer((RunnableScheduledFuture)x); - } + return dq.offer((RunnableScheduledFuture)x); + } public void put(Runnable x) { dq.put((RunnableScheduledFuture)x); } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/Semaphore.java b/libjava/classpath/external/jsr166/java/util/concurrent/Semaphore.java index 94e9746ae85..10523643909 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/Semaphore.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/Semaphore.java @@ -614,7 +614,7 @@ public class Semaphore implements java.io.Serializable { * @throws IllegalArgumentException if {@code reduction} is negative */ protected void reducePermits(int reduction) { - if (reduction < 0) throw new IllegalArgumentException(); + if (reduction < 0) throw new IllegalArgumentException(); sync.reducePermits(reduction); } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java b/libjava/classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java index e47e0401cfe..92f586ce8e5 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/SynchronousQueue.java @@ -737,11 +737,11 @@ public class SynchronousQueue extends AbstractQueue advanceHead(h, hn); continue; } - QNode t = tail; // Ensure consistent read for tail + QNode t = tail; // Ensure consistent read for tail if (t == h) return; - QNode tn = t.next; - if (t != tail) + QNode tn = t.next; + if (t != tail) continue; if (tn != null) { advanceTail(t, tn); @@ -808,9 +808,9 @@ public class SynchronousQueue extends AbstractQueue public void put(E o) throws InterruptedException { if (o == null) throw new NullPointerException(); if (transferer.transfer(o, false, 0) == null) { - Thread.interrupted(); + Thread.interrupted(); throw new InterruptedException(); - } + } } /** @@ -857,7 +857,7 @@ public class SynchronousQueue extends AbstractQueue Object e = transferer.transfer(null, false, 0); if (e != null) return (E)e; - Thread.interrupted(); + Thread.interrupted(); throw new InterruptedException(); } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java b/libjava/classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java index ea89a2c082f..e303f14a827 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/ThreadPoolExecutor.java @@ -669,8 +669,8 @@ public class ThreadPoolExecutor extends AbstractExecutorService { runLock.lock(); try { // If not shutting down then clear an outstanding interrupt. - if (runState != STOP && - Thread.interrupted() && + if (runState != STOP && + Thread.interrupted() && runState == STOP) // Re-interrupt if stopped after clearing thread.interrupt(); boolean ran = false; @@ -911,8 +911,8 @@ public class ThreadPoolExecutor extends AbstractExecutorService { */ public void shutdown() { // Fail if caller doesn't have modifyThread permission. - SecurityManager security = System.getSecurityManager(); - if (security != null) + SecurityManager security = System.getSecurityManager(); + if (security != null) security.checkPermission(shutdownPerm); boolean fullyTerminated = false; @@ -978,8 +978,8 @@ public class ThreadPoolExecutor extends AbstractExecutorService { */ public List shutdownNow() { // Almost the same code as shutdown() - SecurityManager security = System.getSecurityManager(); - if (security != null) + SecurityManager security = System.getSecurityManager(); + if (security != null) security.checkPermission(shutdownPerm); boolean fullyTerminated = false; diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java index dc4d470c32a..0f723f61362 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicInteger.java @@ -103,7 +103,7 @@ public class AtomicInteger extends Number implements java.io.Serializable { * the actual value was not equal to the expected value. */ public final boolean compareAndSet(int expect, int update) { - return unsafe.compareAndSwapInt(this, valueOffset, expect, update); + return unsafe.compareAndSwapInt(this, valueOffset, expect, update); } /** @@ -117,7 +117,7 @@ public class AtomicInteger extends Number implements java.io.Serializable { * @return true if successful. */ public final boolean weakCompareAndSet(int expect, int update) { - return unsafe.compareAndSwapInt(this, valueOffset, expect, update); + return unsafe.compareAndSwapInt(this, valueOffset, expect, update); } /** @@ -216,19 +216,19 @@ public class AtomicInteger extends Number implements java.io.Serializable { public int intValue() { - return get(); + return get(); } public long longValue() { - return (long)get(); + return (long)get(); } public float floatValue() { - return (float)get(); + return (float)get(); } public double doubleValue() { - return (double)get(); + return (double)get(); } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java index 102c2a7c9bd..c957bbf3f98 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java @@ -240,15 +240,15 @@ public abstract class AtomicIntegerFieldUpdater { AtomicIntegerFieldUpdaterImpl(Class tclass, String fieldName) { Field field = null; - Class caller = null; - int modifiers = 0; + Class caller = null; + int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); - caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); + caller = sun.reflect.Reflection.getCallerClass(3); + modifiers = field.getModifiers(); sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); - sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); + caller, tclass, null, modifiers); + sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); } catch(Exception ex) { throw new RuntimeException(ex); } @@ -256,12 +256,12 @@ public abstract class AtomicIntegerFieldUpdater { Class fieldt = field.getType(); if (fieldt != int.class) throw new IllegalArgumentException("Must be integer type"); - + if (!Modifier.isVolatile(modifiers)) throw new IllegalArgumentException("Must be volatile type"); - - this.cclass = (Modifier.isProtected(modifiers) && - caller != tclass) ? caller : null; + + this.cclass = (Modifier.isProtected(modifiers) && + caller != tclass) ? caller : null; this.tclass = tclass; offset = unsafe.objectFieldOffset(field); } @@ -269,8 +269,8 @@ public abstract class AtomicIntegerFieldUpdater { private void fullCheck(T obj) { if (!tclass.isInstance(obj)) throw new ClassCastException(); - if (cclass != null) - ensureProtectedAccess(obj); + if (cclass != null) + ensureProtectedAccess(obj); } public boolean compareAndSet(T obj, int expect, int update) { @@ -298,19 +298,19 @@ public abstract class AtomicIntegerFieldUpdater { return unsafe.getIntVolatile(obj, offset); } - private void ensureProtectedAccess(T obj) { - if (cclass.isInstance(obj)) { - return; - } - throw new RuntimeException( + private void ensureProtectedAccess(T obj) { + if (cclass.isInstance(obj)) { + return; + } + throw new RuntimeException( new IllegalAccessException("Class " + - cclass.getName() + + cclass.getName() + " can not access a protected member of class " + tclass.getName() + - " using an instance of " + + " using an instance of " + obj.getClass().getName() - ) - ); - } + ) + ); + } } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java index 136dc60fb7d..fa254ba626d 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLong.java @@ -117,7 +117,7 @@ public class AtomicLong extends Number implements java.io.Serializable { * the actual value was not equal to the expected value. */ public final boolean compareAndSet(long expect, long update) { - return unsafe.compareAndSwapLong(this, valueOffset, expect, update); + return unsafe.compareAndSwapLong(this, valueOffset, expect, update); } /** @@ -131,7 +131,7 @@ public class AtomicLong extends Number implements java.io.Serializable { * @return true if successful. */ public final boolean weakCompareAndSet(long expect, long update) { - return unsafe.compareAndSwapLong(this, valueOffset, expect, update); + return unsafe.compareAndSwapLong(this, valueOffset, expect, update); } /** @@ -230,19 +230,19 @@ public class AtomicLong extends Number implements java.io.Serializable { public int intValue() { - return (int)get(); + return (int)get(); } public long longValue() { - return (long)get(); + return (long)get(); } public float floatValue() { - return (float)get(); + return (float)get(); } public double doubleValue() { - return (double)get(); + return (double)get(); } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java index dafd089236e..f6135d1fc84 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicLongFieldUpdater.java @@ -239,15 +239,15 @@ public abstract class AtomicLongFieldUpdater { CASUpdater(Class tclass, String fieldName) { Field field = null; - Class caller = null; - int modifiers = 0; + Class caller = null; + int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); - caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); + caller = sun.reflect.Reflection.getCallerClass(3); + modifiers = field.getModifiers(); sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); - sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); + caller, tclass, null, modifiers); + sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); } catch(Exception ex) { throw new RuntimeException(ex); } @@ -259,8 +259,8 @@ public abstract class AtomicLongFieldUpdater { if (!Modifier.isVolatile(modifiers)) throw new IllegalArgumentException("Must be volatile type"); - this.cclass = (Modifier.isProtected(modifiers) && - caller != tclass) ? caller : null; + this.cclass = (Modifier.isProtected(modifiers) && + caller != tclass) ? caller : null; this.tclass = tclass; offset = unsafe.objectFieldOffset(field); } @@ -268,9 +268,9 @@ public abstract class AtomicLongFieldUpdater { private void fullCheck(T obj) { if (!tclass.isInstance(obj)) throw new ClassCastException(); - if (cclass != null) - ensureProtectedAccess(obj); - } + if (cclass != null) + ensureProtectedAccess(obj); + } public boolean compareAndSet(T obj, long expect, long update) { if (obj == null || obj.getClass() != tclass || cclass != null) fullCheck(obj); @@ -297,20 +297,20 @@ public abstract class AtomicLongFieldUpdater { return unsafe.getLongVolatile(obj, offset); } - private void ensureProtectedAccess(T obj) { - if (cclass.isInstance(obj)) { - return; - } - throw new RuntimeException ( + private void ensureProtectedAccess(T obj) { + if (cclass.isInstance(obj)) { + return; + } + throw new RuntimeException ( new IllegalAccessException("Class " + - cclass.getName() + + cclass.getName() + " can not access a protected member of class " + tclass.getName() + - " using an instance of " + + " using an instance of " + obj.getClass().getName() - ) - ); - } + ) + ); + } } @@ -322,15 +322,15 @@ public abstract class AtomicLongFieldUpdater { LockedUpdater(Class tclass, String fieldName) { Field field = null; - Class caller = null; - int modifiers = 0; + Class caller = null; + int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); - caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); + caller = sun.reflect.Reflection.getCallerClass(3); + modifiers = field.getModifiers(); sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); - sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); + caller, tclass, null, modifiers); + sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); } catch(Exception ex) { throw new RuntimeException(ex); } @@ -342,8 +342,8 @@ public abstract class AtomicLongFieldUpdater { if (!Modifier.isVolatile(modifiers)) throw new IllegalArgumentException("Must be volatile type"); - this.cclass = (Modifier.isProtected(modifiers) && - caller != tclass) ? caller : null; + this.cclass = (Modifier.isProtected(modifiers) && + caller != tclass) ? caller : null; this.tclass = tclass; offset = unsafe.objectFieldOffset(field); } @@ -351,9 +351,9 @@ public abstract class AtomicLongFieldUpdater { private void fullCheck(T obj) { if (!tclass.isInstance(obj)) throw new ClassCastException(); - if (cclass != null) - ensureProtectedAccess(obj); - } + if (cclass != null) + ensureProtectedAccess(obj); + } public boolean compareAndSet(T obj, long expect, long update) { if (obj == null || obj.getClass() != tclass || cclass != null) fullCheck(obj); @@ -378,7 +378,7 @@ public abstract class AtomicLongFieldUpdater { } public void lazySet(T obj, long newValue) { - set(obj, newValue); + set(obj, newValue); } public long get(T obj) { @@ -388,19 +388,19 @@ public abstract class AtomicLongFieldUpdater { } } - private void ensureProtectedAccess(T obj) { - if (cclass.isInstance(obj)) { - return; - } - throw new RuntimeException ( + private void ensureProtectedAccess(T obj) { + if (cclass.isInstance(obj)) { + return; + } + throw new RuntimeException ( new IllegalAccessException("Class " + - cclass.getName() + + cclass.getName() + " can not access a protected member of class " + tclass.getName() + - " using an instance of " + + " using an instance of " + obj.getClass().getName() - ) - ); - } + ) + ); + } } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java index 5c18eca33cf..24014a9df75 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java @@ -149,7 +149,7 @@ public abstract class AtomicReferenceFieldUpdater { } private static final class AtomicReferenceFieldUpdaterImpl - extends AtomicReferenceFieldUpdater { + extends AtomicReferenceFieldUpdater { private static final Unsafe unsafe = Unsafe.getUnsafe(); private final long offset; private final Class tclass; @@ -169,19 +169,19 @@ public abstract class AtomicReferenceFieldUpdater { */ AtomicReferenceFieldUpdaterImpl(Class tclass, - Class vclass, - String fieldName) { + Class vclass, + String fieldName) { Field field = null; Class fieldClass = null; - Class caller = null; - int modifiers = 0; + Class caller = null; + int modifiers = 0; try { field = tclass.getDeclaredField(fieldName); - caller = sun.reflect.Reflection.getCallerClass(3); - modifiers = field.getModifiers(); + caller = sun.reflect.Reflection.getCallerClass(3); + modifiers = field.getModifiers(); sun.reflect.misc.ReflectUtil.ensureMemberAccess( - caller, tclass, null, modifiers); - sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); + caller, tclass, null, modifiers); + sun.reflect.misc.ReflectUtil.checkPackageAccess(tclass); fieldClass = field.getType(); } catch (Exception ex) { throw new RuntimeException(ex); @@ -189,12 +189,12 @@ public abstract class AtomicReferenceFieldUpdater { if (vclass != fieldClass) throw new ClassCastException(); - + if (!Modifier.isVolatile(modifiers)) throw new IllegalArgumentException("Must be volatile type"); - this.cclass = (Modifier.isProtected(modifiers) && - caller != tclass) ? caller : null; + this.cclass = (Modifier.isProtected(modifiers) && + caller != tclass) ? caller : null; this.tclass = tclass; if (vclass == Object.class) this.vclass = null; @@ -206,16 +206,16 @@ public abstract class AtomicReferenceFieldUpdater { void targetCheck(T obj) { if (!tclass.isInstance(obj)) throw new ClassCastException(); - if (cclass != null) - ensureProtectedAccess(obj); + if (cclass != null) + ensureProtectedAccess(obj); } void updateCheck(T obj, V update) { if (!tclass.isInstance(obj) || (update != null && vclass != null && !vclass.isInstance(update))) throw new ClassCastException(); - if (cclass != null) - ensureProtectedAccess(obj); + if (cclass != null) + ensureProtectedAccess(obj); } public boolean compareAndSet(T obj, V expect, V update) { @@ -257,19 +257,19 @@ public abstract class AtomicReferenceFieldUpdater { return (V)unsafe.getObjectVolatile(obj, offset); } - private void ensureProtectedAccess(T obj) { - if (cclass.isInstance(obj)) { - return; - } - throw new RuntimeException ( + private void ensureProtectedAccess(T obj) { + if (cclass.isInstance(obj)) { + return; + } + throw new RuntimeException ( new IllegalAccessException("Class " + - cclass.getName() + + cclass.getName() + " can not access a protected member of class " + tclass.getName() + - " using an instance of " + + " using an instance of " + obj.getClass().getName() - ) - ); - } + ) + ); + } } } diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java index 88a4354bc71..45d744bb841 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java @@ -892,10 +892,10 @@ public abstract class AbstractQueuedLongSynchronizer * @throws InterruptedException if the current thread is interrupted */ public final boolean tryAcquireNanos(long arg, long nanosTimeout) throws InterruptedException { - if (Thread.interrupted()) - throw new InterruptedException(); - return tryAcquire(arg) || - doAcquireNanos(arg, nanosTimeout); + if (Thread.interrupted()) + throw new InterruptedException(); + return tryAcquire(arg) || + doAcquireNanos(arg, nanosTimeout); } /** @@ -971,10 +971,10 @@ public abstract class AbstractQueuedLongSynchronizer * @throws InterruptedException if the current thread is interrupted */ public final boolean tryAcquireSharedNanos(long arg, long nanosTimeout) throws InterruptedException { - if (Thread.interrupted()) - throw new InterruptedException(); - return tryAcquireShared(arg) >= 0 || - doAcquireSharedNanos(arg, nanosTimeout); + if (Thread.interrupted()) + throw new InterruptedException(); + return tryAcquireShared(arg) >= 0 || + doAcquireSharedNanos(arg, nanosTimeout); } /** diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java index a3abb2cf553..647f4fcbcdb 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/locks/AbstractQueuedSynchronizer.java @@ -1119,10 +1119,10 @@ public abstract class AbstractQueuedSynchronizer * @throws InterruptedException if the current thread is interrupted */ public final boolean tryAcquireNanos(int arg, long nanosTimeout) throws InterruptedException { - if (Thread.interrupted()) - throw new InterruptedException(); - return tryAcquire(arg) || - doAcquireNanos(arg, nanosTimeout); + if (Thread.interrupted()) + throw new InterruptedException(); + return tryAcquire(arg) || + doAcquireNanos(arg, nanosTimeout); } /** @@ -1198,10 +1198,10 @@ public abstract class AbstractQueuedSynchronizer * @throws InterruptedException if the current thread is interrupted */ public final boolean tryAcquireSharedNanos(int arg, long nanosTimeout) throws InterruptedException { - if (Thread.interrupted()) - throw new InterruptedException(); - return tryAcquireShared(arg) >= 0 || - doAcquireSharedNanos(arg, nanosTimeout); + if (Thread.interrupted()) + throw new InterruptedException(); + return tryAcquireShared(arg) >= 0 || + doAcquireSharedNanos(arg, nanosTimeout); } /** diff --git a/libjava/classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java b/libjava/classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java index df18a7c0884..a6eadff5b13 100644 --- a/libjava/classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java +++ b/libjava/classpath/external/jsr166/java/util/concurrent/locks/ReentrantReadWriteLock.java @@ -746,7 +746,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab /** * Throws {@code UnsupportedOperationException} because - * {@code ReadLocks} do not support conditions. + * {@code ReadLocks} do not support conditions. * * @throws UnsupportedOperationException always */ @@ -773,7 +773,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab */ public static class WriteLock implements Lock, java.io.Serializable { private static final long serialVersionUID = -4992448646407690164L; - private final Sync sync; + private final Sync sync; /** * Constructor for use by subclasses @@ -789,7 +789,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab * Acquires the write lock. * *

Acquires the write lock if neither the read nor write lock - * are held by another thread + * are held by another thread * and returns immediately, setting the write lock hold count to * one. * @@ -811,7 +811,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab * {@linkplain Thread#interrupt interrupted}. * *

Acquires the write lock if neither the read nor write lock - * are held by another thread + * are held by another thread * and returns immediately, setting the write lock hold count to * one. * @@ -866,7 +866,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab * at the time of invocation. * *

Acquires the write lock if neither the read nor write lock - * are held by another thread + * are held by another thread * and returns immediately with the value {@code true}, * setting the write lock hold count to one. Even when this lock has * been set to use a fair ordering policy, a call to @@ -900,7 +900,7 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab * not been {@linkplain Thread#interrupt interrupted}. * *

Acquires the write lock if neither the read nor write lock - * are held by another thread + * are held by another thread * and returns immediately with the value {@code true}, * setting the write lock hold count to one. If this lock has been * set to use a fair ordering policy then an available lock @@ -1053,32 +1053,32 @@ public class ReentrantReadWriteLock implements ReadWriteLock, java.io.Serializab "[Locked by thread " + o.getName() + "]"); } - /** - * Queries if this write lock is held by the current thread. - * Identical in effect to {@link - * ReentrantReadWriteLock#isWriteLockedByCurrentThread}. - * - * @return {@code true} if the current thread holds this lock and - * {@code false} otherwise - * @since 1.6 - */ - public boolean isHeldByCurrentThread() { - return sync.isHeldExclusively(); - } + /** + * Queries if this write lock is held by the current thread. + * Identical in effect to {@link + * ReentrantReadWriteLock#isWriteLockedByCurrentThread}. + * + * @return {@code true} if the current thread holds this lock and + * {@code false} otherwise + * @since 1.6 + */ + public boolean isHeldByCurrentThread() { + return sync.isHeldExclusively(); + } - /** - * Queries the number of holds on this write lock by the current - * thread. A thread has a hold on a lock for each lock action - * that is not matched by an unlock action. Identical in effect - * to {@link ReentrantReadWriteLock#getWriteHoldCount}. - * - * @return the number of holds on this lock by the current thread, - * or zero if this lock is not held by the current thread - * @since 1.6 - */ - public int getHoldCount() { - return sync.getWriteHoldCount(); - } + /** + * Queries the number of holds on this write lock by the current + * thread. A thread has a hold on a lock for each lock action + * that is not matched by an unlock action. Identical in effect + * to {@link ReentrantReadWriteLock#getWriteHoldCount}. + * + * @return the number of holds on this lock by the current thread, + * or zero if this lock is not held by the current thread + * @since 1.6 + */ + public int getHoldCount() { + return sync.getWriteHoldCount(); + } } // Instrumentation and status diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java index cf2dac134d8..325384c27d8 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/Datatype.java @@ -1,237 +1,237 @@ -package org.relaxng.datatype; - -/** - * Datatype object. - * - * This object has the following functionality: - * - *

    - *
  1. functionality to identify a class of character sequences. This is - * done through the isValid method. - * - *
  2. functionality to produce a "value object" from a character sequence and - * context information. - * - *
  3. functionality to test the equality of two value objects. - *
- * - * This interface also defines the createStreamingValidator method, - * which is intended to efficiently support the validation of - * large character sequences. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface Datatype { - - /** - * Checks if the specified 'literal' matches this Datatype - * with respect to the current context. - * - * @param literal - * the lexical representation to be checked. - * @param context - * If this datatype is context-dependent - * (i.e. the {@link #isContextDependent} method returns true), - * then the caller must provide a non-null valid context object. - * Otherwise, the caller can pass null. - * - * @return - * true if the 'literal' is a member of this Datatype; - * false if it's not a member of this Datatype. - */ - boolean isValid( String literal, ValidationContext context ); - - /** - * Similar to the isValid method but throws an exception with diagnosis - * in case of errors. - * - *

- * If the specified 'literal' is a valid lexical representation for this - * datatype, then this method must return without throwing any exception. - * If not, the callee must throw an exception (with diagnosis message, - * if possible.) - * - *

- * The application can use this method to provide detailed error message - * to users. This method is kept separate from the isValid method to - * achieve higher performance during normal validation. - * - * @exception DatatypeException - * If the given literal is invalid, then this exception is thrown. - * If the callee supports error diagnosis, then the exception should - * contain a diagnosis message. - */ - void checkValid( String literal, ValidationContext context ) - throws DatatypeException; - - /** - * Creates an instance of a streaming validator for this type. - * - *

- * By using streaming validators instead of the isValid method, - * the caller can avoid keeping the entire string, which is - * sometimes quite big, in memory. - * - * @param context - * If this datatype is context-dependent - * (i.e. the {@link #isContextDependent} method returns true), - * then the caller must provide a non-null valid context object. - * Otherwise, the caller can pass null. - * The callee may keep a reference to this context object - * only while the returned streaming validator is being used. - */ - DatatypeStreamingValidator createStreamingValidator( ValidationContext context ); - - /** - * Converts lexcial value and the current context to the corresponding - * value object. - * - *

- * The caller cannot generally assume that the value object is - * a meaningful Java object. For example, the caller cannot expect - * this method to return java.lang.Number type for - * the "integer" type of XML Schema Part 2. - * - *

- * Also, the caller cannot assume that the equals method and - * the hashCode method of the value object are consistent with - * the semantics of the datatype. For that purpose, the sameValue - * method and the valueHashCode method have to be used. Note that - * this means you cannot use classes like - * java.util.Hashtable to store the value objects. - * - *

- * The returned value object should be used solely for the sameValue - * and valueHashCode methods. - * - * @param context - * If this datatype is context-dependent - * (when the {@link #isContextDependent} method returns true), - * then the caller must provide a non-null valid context object. - * Otherwise, the caller can pass null. - * - * @return null - * when the given lexical value is not a valid lexical - * value for this type. - */ - Object createValue( String literal, ValidationContext context ); - - /** - * Tests the equality of two value objects which were originally - * created by the createValue method of this object. - * - * The behavior is undefined if objects not created by this type - * are passed. It is the caller's responsibility to ensure that - * value objects belong to this type. - * - * @return - * true if two value objects are considered equal according to - * the definition of this datatype; false if otherwise. - */ - boolean sameValue( Object value1, Object value2 ); - - - /** - * Computes the hash code for a value object, - * which is consistent with the sameValue method. - * - * @return - * hash code for the specified value object. - */ - int valueHashCode( Object value ); - - - - - /** - * Indicates that the datatype doesn't have ID/IDREF semantics. - * - * This value is one of the possible return values of the - * {@link #getIdType} method. - */ - public static final int ID_TYPE_NULL = 0; - - /** - * Indicates that RELAX NG compatibility processors should - * treat this datatype as having ID semantics. - * - * This value is one of the possible return values of the - * {@link #getIdType} method. - */ - public static final int ID_TYPE_ID = 1; - - /** - * Indicates that RELAX NG compatibility processors should - * treat this datatype as having IDREF semantics. - * - * This value is one of the possible return values of the - * {@link #getIdType} method. - */ - public static final int ID_TYPE_IDREF = 2; - - /** - * Indicates that RELAX NG compatibility processors should - * treat this datatype as having IDREFS semantics. - * - * This value is one of the possible return values of the - * {@link #getIdType} method. - */ - public static final int ID_TYPE_IDREFS = 3; - - /** - * Checks if the ID/IDREF semantics is associated with this - * datatype. - * - *

- * This method is introduced to support the RELAX NG DTD - * compatibility spec. (Of course it's always free to use - * this method for other purposes.) - * - *

- * If you are implementing a datatype library and have no idea about - * the "RELAX NG DTD compatibility" thing, just return - * ID_TYPE_NULL is fine. - * - * @return - * If this datatype doesn't have any ID/IDREF semantics, - * it returns {@link #ID_TYPE_NULL}. If it has such a semantics - * (for example, XSD:ID, XSD:IDREF and comp:ID type), then - * it returns {@link #ID_TYPE_ID}, {@link #ID_TYPE_IDREF} or - * {@link #ID_TYPE_IDREFS}. - */ - public int getIdType(); - - - /** - * Checks if this datatype may need a context object for - * the validation. - * - *

- * The callee must return true even when the context - * is not always necessary. (For example, the "QName" type - * doesn't need a context object when validating unprefixed - * string. But nonetheless QName must return true.) - * - *

- * XSD's string and short types - * are examples of context-independent datatypes. - * Its QName and ENTITY types - * are examples of context-dependent datatypes. - * - *

- * When a datatype is context-independent, then - * the {@link #isValid} method, the {@link #checkValid} method, - * the {@link #createStreamingValidator} method and - * the {@link #createValue} method can be called without - * providing a context object. - * - * @return - * true if this datatype is context-dependent - * (it needs a context object sometimes); - * - * false if this datatype is context-independent - * (it never needs a context object). - */ - public boolean isContextDependent(); -} +package org.relaxng.datatype; + +/** + * Datatype object. + * + * This object has the following functionality: + * + *

    + *
  1. functionality to identify a class of character sequences. This is + * done through the isValid method. + * + *
  2. functionality to produce a "value object" from a character sequence and + * context information. + * + *
  3. functionality to test the equality of two value objects. + *
+ * + * This interface also defines the createStreamingValidator method, + * which is intended to efficiently support the validation of + * large character sequences. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface Datatype { + + /** + * Checks if the specified 'literal' matches this Datatype + * with respect to the current context. + * + * @param literal + * the lexical representation to be checked. + * @param context + * If this datatype is context-dependent + * (i.e. the {@link #isContextDependent} method returns true), + * then the caller must provide a non-null valid context object. + * Otherwise, the caller can pass null. + * + * @return + * true if the 'literal' is a member of this Datatype; + * false if it's not a member of this Datatype. + */ + boolean isValid( String literal, ValidationContext context ); + + /** + * Similar to the isValid method but throws an exception with diagnosis + * in case of errors. + * + *

+ * If the specified 'literal' is a valid lexical representation for this + * datatype, then this method must return without throwing any exception. + * If not, the callee must throw an exception (with diagnosis message, + * if possible.) + * + *

+ * The application can use this method to provide detailed error message + * to users. This method is kept separate from the isValid method to + * achieve higher performance during normal validation. + * + * @exception DatatypeException + * If the given literal is invalid, then this exception is thrown. + * If the callee supports error diagnosis, then the exception should + * contain a diagnosis message. + */ + void checkValid( String literal, ValidationContext context ) + throws DatatypeException; + + /** + * Creates an instance of a streaming validator for this type. + * + *

+ * By using streaming validators instead of the isValid method, + * the caller can avoid keeping the entire string, which is + * sometimes quite big, in memory. + * + * @param context + * If this datatype is context-dependent + * (i.e. the {@link #isContextDependent} method returns true), + * then the caller must provide a non-null valid context object. + * Otherwise, the caller can pass null. + * The callee may keep a reference to this context object + * only while the returned streaming validator is being used. + */ + DatatypeStreamingValidator createStreamingValidator( ValidationContext context ); + + /** + * Converts lexcial value and the current context to the corresponding + * value object. + * + *

+ * The caller cannot generally assume that the value object is + * a meaningful Java object. For example, the caller cannot expect + * this method to return java.lang.Number type for + * the "integer" type of XML Schema Part 2. + * + *

+ * Also, the caller cannot assume that the equals method and + * the hashCode method of the value object are consistent with + * the semantics of the datatype. For that purpose, the sameValue + * method and the valueHashCode method have to be used. Note that + * this means you cannot use classes like + * java.util.Hashtable to store the value objects. + * + *

+ * The returned value object should be used solely for the sameValue + * and valueHashCode methods. + * + * @param context + * If this datatype is context-dependent + * (when the {@link #isContextDependent} method returns true), + * then the caller must provide a non-null valid context object. + * Otherwise, the caller can pass null. + * + * @return null + * when the given lexical value is not a valid lexical + * value for this type. + */ + Object createValue( String literal, ValidationContext context ); + + /** + * Tests the equality of two value objects which were originally + * created by the createValue method of this object. + * + * The behavior is undefined if objects not created by this type + * are passed. It is the caller's responsibility to ensure that + * value objects belong to this type. + * + * @return + * true if two value objects are considered equal according to + * the definition of this datatype; false if otherwise. + */ + boolean sameValue( Object value1, Object value2 ); + + + /** + * Computes the hash code for a value object, + * which is consistent with the sameValue method. + * + * @return + * hash code for the specified value object. + */ + int valueHashCode( Object value ); + + + + + /** + * Indicates that the datatype doesn't have ID/IDREF semantics. + * + * This value is one of the possible return values of the + * {@link #getIdType} method. + */ + public static final int ID_TYPE_NULL = 0; + + /** + * Indicates that RELAX NG compatibility processors should + * treat this datatype as having ID semantics. + * + * This value is one of the possible return values of the + * {@link #getIdType} method. + */ + public static final int ID_TYPE_ID = 1; + + /** + * Indicates that RELAX NG compatibility processors should + * treat this datatype as having IDREF semantics. + * + * This value is one of the possible return values of the + * {@link #getIdType} method. + */ + public static final int ID_TYPE_IDREF = 2; + + /** + * Indicates that RELAX NG compatibility processors should + * treat this datatype as having IDREFS semantics. + * + * This value is one of the possible return values of the + * {@link #getIdType} method. + */ + public static final int ID_TYPE_IDREFS = 3; + + /** + * Checks if the ID/IDREF semantics is associated with this + * datatype. + * + *

+ * This method is introduced to support the RELAX NG DTD + * compatibility spec. (Of course it's always free to use + * this method for other purposes.) + * + *

+ * If you are implementing a datatype library and have no idea about + * the "RELAX NG DTD compatibility" thing, just return + * ID_TYPE_NULL is fine. + * + * @return + * If this datatype doesn't have any ID/IDREF semantics, + * it returns {@link #ID_TYPE_NULL}. If it has such a semantics + * (for example, XSD:ID, XSD:IDREF and comp:ID type), then + * it returns {@link #ID_TYPE_ID}, {@link #ID_TYPE_IDREF} or + * {@link #ID_TYPE_IDREFS}. + */ + public int getIdType(); + + + /** + * Checks if this datatype may need a context object for + * the validation. + * + *

+ * The callee must return true even when the context + * is not always necessary. (For example, the "QName" type + * doesn't need a context object when validating unprefixed + * string. But nonetheless QName must return true.) + * + *

+ * XSD's string and short types + * are examples of context-independent datatypes. + * Its QName and ENTITY types + * are examples of context-dependent datatypes. + * + *

+ * When a datatype is context-independent, then + * the {@link #isValid} method, the {@link #checkValid} method, + * the {@link #createStreamingValidator} method and + * the {@link #createValue} method can be called without + * providing a context object. + * + * @return + * true if this datatype is context-dependent + * (it needs a context object sometimes); + * + * false if this datatype is context-independent + * (it never needs a context object). + */ + public boolean isContextDependent(); +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java index 75530de3c55..0a2b55e2ecd 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeBuilder.java @@ -1,45 +1,45 @@ -package org.relaxng.datatype; - -/** - * Creates a user-defined type by adding parameters to - * the pre-defined type. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface DatatypeBuilder { - - /** - * Adds a new parameter. - * - * @param name - * The name of the parameter to be added. - * @param strValue - * The raw value of the parameter. Caller may not normalize - * this value because any white space is potentially significant. - * @param context - * The context information which can be used by the callee to - * acquire additional information. This context object is - * valid only during this method call. The callee may not - * keep a reference to this object. - * @exception DatatypeException - * When the given parameter is inappropriate for some reason. - * The callee is responsible to recover from this error. - * That is, the object should behave as if no such error - * was occured. - */ - void addParameter( String name, String strValue, ValidationContext context ) - throws DatatypeException; - - /** - * Derives a new Datatype from a Datatype by parameters that - * were already set through the addParameter method. - * - * @exception DatatypeException - * DatatypeException must be thrown if the derivation is - * somehow invalid. For example, a required parameter is missing, - * etc. The exception should contain a diagnosis message - * if possible. - */ - Datatype createDatatype() throws DatatypeException; -} +package org.relaxng.datatype; + +/** + * Creates a user-defined type by adding parameters to + * the pre-defined type. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface DatatypeBuilder { + + /** + * Adds a new parameter. + * + * @param name + * The name of the parameter to be added. + * @param strValue + * The raw value of the parameter. Caller may not normalize + * this value because any white space is potentially significant. + * @param context + * The context information which can be used by the callee to + * acquire additional information. This context object is + * valid only during this method call. The callee may not + * keep a reference to this object. + * @exception DatatypeException + * When the given parameter is inappropriate for some reason. + * The callee is responsible to recover from this error. + * That is, the object should behave as if no such error + * was occured. + */ + void addParameter( String name, String strValue, ValidationContext context ) + throws DatatypeException; + + /** + * Derives a new Datatype from a Datatype by parameters that + * were already set through the addParameter method. + * + * @exception DatatypeException + * DatatypeException must be thrown if the derivation is + * somehow invalid. For example, a required parameter is missing, + * etc. The exception should contain a diagnosis message + * if possible. + */ + Datatype createDatatype() throws DatatypeException; +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java index 970a99548b7..554385fe49b 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeException.java @@ -1,39 +1,39 @@ -package org.relaxng.datatype; - -/** - * Signals Datatype related exceptions. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public class DatatypeException extends Exception { - - public DatatypeException( int index, String msg ) { - super(msg); - this.index = index; - } - public DatatypeException( String msg ) { - this(UNKNOWN,msg); - } - /** - * A constructor for those datatype libraries which don't support any - * diagnostic information at all. - */ - public DatatypeException() { - this(UNKNOWN,null); - } - - - private final int index; - - public static final int UNKNOWN = -1; - - /** - * Gets the index of the content where the error occured. - * UNKNOWN can be returned to indicate that no index information - * is available. - */ - public int getIndex() { - return index; - } -} +package org.relaxng.datatype; + +/** + * Signals Datatype related exceptions. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public class DatatypeException extends Exception { + + public DatatypeException( int index, String msg ) { + super(msg); + this.index = index; + } + public DatatypeException( String msg ) { + this(UNKNOWN,msg); + } + /** + * A constructor for those datatype libraries which don't support any + * diagnostic information at all. + */ + public DatatypeException() { + this(UNKNOWN,null); + } + + + private final int index; + + public static final int UNKNOWN = -1; + + /** + * Gets the index of the content where the error occured. + * UNKNOWN can be returned to indicate that no index information + * is available. + */ + public int getIndex() { + return index; + } +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java index e18f2b379f6..3a9b4d0bb18 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibrary.java @@ -1,37 +1,37 @@ -package org.relaxng.datatype; - -/** - * A Datatype library - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface DatatypeLibrary { - - /** - * Creates a new instance of DatatypeBuilder. - * - * The callee should throw a DatatypeException in case of an error. - * - * @param baseTypeLocalName - * The local name of the base type. - * - * @return - * A non-null valid datatype object. - */ - DatatypeBuilder createDatatypeBuilder( String baseTypeLocalName ) - throws DatatypeException; - - /** - * Gets or creates a pre-defined type. - * - * This is just a short-cut of - * createDatatypeBuilder(typeLocalName).createDatatype(); - * - * The callee should throw a DatatypeException in case of an error. - * - * @return - * A non-null valid datatype object. - */ - Datatype createDatatype( String typeLocalName ) throws DatatypeException; -} +package org.relaxng.datatype; + +/** + * A Datatype library + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface DatatypeLibrary { + + /** + * Creates a new instance of DatatypeBuilder. + * + * The callee should throw a DatatypeException in case of an error. + * + * @param baseTypeLocalName + * The local name of the base type. + * + * @return + * A non-null valid datatype object. + */ + DatatypeBuilder createDatatypeBuilder( String baseTypeLocalName ) + throws DatatypeException; + + /** + * Gets or creates a pre-defined type. + * + * This is just a short-cut of + * createDatatypeBuilder(typeLocalName).createDatatype(); + * + * The callee should throw a DatatypeException in case of an error. + * + * @return + * A non-null valid datatype object. + */ + Datatype createDatatype( String typeLocalName ) throws DatatypeException; +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java index cdf1eef3c42..ebc9b910b2f 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeLibraryFactory.java @@ -1,26 +1,26 @@ -package org.relaxng.datatype; - -/** - * Factory class for the DatatypeLibrary class. - * - *

- * The datatype library should provide the implementation of - * this interface if it wants to be found by the schema processors. - * The implementor also have to place a file in your jar file. - * See the reference datatype library implementation for detail. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface DatatypeLibraryFactory -{ - /** - * Creates a new instance of a DatatypeLibrary that supports - * the specified namespace URI. - * - * @return - * null if the specified namespace URI is not - * supported. - */ - DatatypeLibrary createDatatypeLibrary( String namespaceURI ); -} +package org.relaxng.datatype; + +/** + * Factory class for the DatatypeLibrary class. + * + *

+ * The datatype library should provide the implementation of + * this interface if it wants to be found by the schema processors. + * The implementor also have to place a file in your jar file. + * See the reference datatype library implementation for detail. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface DatatypeLibraryFactory +{ + /** + * Creates a new instance of a DatatypeLibrary that supports + * the specified namespace URI. + * + * @return + * null if the specified namespace URI is not + * supported. + */ + DatatypeLibrary createDatatypeLibrary( String namespaceURI ); +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java index 99520573148..d181b032927 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/DatatypeStreamingValidator.java @@ -1,46 +1,46 @@ -package org.relaxng.datatype; - -/** - * Datatype streaming validator. - * - *

- * The streaming validator is an optional feature that is useful for - * certain Datatypes. It allows the caller to incrementally provide - * the literal. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface DatatypeStreamingValidator { - - /** - * Passes an additional fragment of the literal. - * - *

- * The application can call this method several times, then call - * the isValid method (or the checkValid method) to check the validity - * of the accumulated characters. - */ - void addCharacters( char[] buf, int start, int len ); - - /** - * Tells if the accumulated literal is valid with respect to - * the underlying Datatype. - * - * @return - * True if it is valid. False if otherwise. - */ - boolean isValid(); - - /** - * Similar to the isValid method, but this method throws - * Exception (with possibly diagnostic information), instead of - * returning false. - * - * @exception DatatypeException - * If the callee supports the diagnosis and the accumulated - * literal is invalid, then this exception that possibly - * contains diagnosis information is thrown. - */ - void checkValid() throws DatatypeException; -} +package org.relaxng.datatype; + +/** + * Datatype streaming validator. + * + *

+ * The streaming validator is an optional feature that is useful for + * certain Datatypes. It allows the caller to incrementally provide + * the literal. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface DatatypeStreamingValidator { + + /** + * Passes an additional fragment of the literal. + * + *

+ * The application can call this method several times, then call + * the isValid method (or the checkValid method) to check the validity + * of the accumulated characters. + */ + void addCharacters( char[] buf, int start, int len ); + + /** + * Tells if the accumulated literal is valid with respect to + * the underlying Datatype. + * + * @return + * True if it is valid. False if otherwise. + */ + boolean isValid(); + + /** + * Similar to the isValid method, but this method throws + * Exception (with possibly diagnostic information), instead of + * returning false. + * + * @exception DatatypeException + * If the callee supports the diagnosis and the accumulated + * literal is invalid, then this exception that possibly + * contains diagnosis information is thrown. + */ + void checkValid() throws DatatypeException; +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java index 61e38f28d29..b25df7c7ad8 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/ValidationContext.java @@ -1,66 +1,66 @@ -package org.relaxng.datatype; - -/** - * An interface that must be implemented by caller to - * provide context information that is necessary to - * perform validation of some Datatypes. - * - * @author James Clark - * @author Kohsuke KAWAGUCHI - */ -public interface ValidationContext { - - /** - * Resolves a namespace prefix to the corresponding namespace URI. - * - * This method is used for validating the QName type, for example. - * - *

- * If the prefix is "" (empty string), it indicates - * an unprefixed value. The callee - * should resolve it as for an unprefixed - * element, rather than for an unprefixed attribute. - * - *

- * If the prefix is "xml", then the callee must resolve - * this prefix into "http://www.w3.org/XML/1998/namespace", - * as defined in the XML Namespaces Recommendation. - * - * @return - * namespace URI of this prefix. - * If the specified prefix is not declared, - * the implementation must return null. - */ - String resolveNamespacePrefix( String prefix ); - - /** - * Returns the base URI of the context. The null string may be returned - * if no base URI is known. - */ - String getBaseUri(); - - /** - * Checks if an unparsed entity is declared with the - * specified name. - * - * @return - * true - * if the DTD has an unparsed entity declaration for - * the specified name. - * false - * otherwise. - */ - boolean isUnparsedEntity( String entityName ); - - /** - * Checks if a notation is declared with the - * specified name. - * - * @return - * true - * if the DTD has a notation declaration for the specified name. - * false - * otherwise. - */ - boolean isNotation( String notationName ); -} +package org.relaxng.datatype; + +/** + * An interface that must be implemented by caller to + * provide context information that is necessary to + * perform validation of some Datatypes. + * + * @author James Clark + * @author Kohsuke KAWAGUCHI + */ +public interface ValidationContext { + + /** + * Resolves a namespace prefix to the corresponding namespace URI. + * + * This method is used for validating the QName type, for example. + * + *

+ * If the prefix is "" (empty string), it indicates + * an unprefixed value. The callee + * should resolve it as for an unprefixed + * element, rather than for an unprefixed attribute. + * + *

+ * If the prefix is "xml", then the callee must resolve + * this prefix into "http://www.w3.org/XML/1998/namespace", + * as defined in the XML Namespaces Recommendation. + * + * @return + * namespace URI of this prefix. + * If the specified prefix is not declared, + * the implementation must return null. + */ + String resolveNamespacePrefix( String prefix ); + + /** + * Returns the base URI of the context. The null string may be returned + * if no base URI is known. + */ + String getBaseUri(); + + /** + * Checks if an unparsed entity is declared with the + * specified name. + * + * @return + * true + * if the DTD has an unparsed entity declaration for + * the specified name. + * false + * otherwise. + */ + boolean isUnparsedEntity( String entityName ); + + /** + * Checks if a notation is declared with the + * specified name. + * + * @return + * true + * if the DTD has a notation declaration for the specified name. + * false + * otherwise. + */ + boolean isNotation( String notationName ); +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java index 43c44382f9c..3aa7c0481b4 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java @@ -1,262 +1,261 @@ -/** - * Copyright (c) 2001, Thai Open Source Software Center Ltd - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Thai Open Source Software Center Ltd nor - * the names of its contributors may be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package org.relaxng.datatype.helpers; - -import org.relaxng.datatype.DatatypeLibraryFactory; -import org.relaxng.datatype.DatatypeLibrary; -import java.util.Enumeration; -import java.util.NoSuchElementException; -import java.util.Vector; -import java.io.Reader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URL; - -/** - * Discovers the datatype library implementation from the classpath. - * - *

- * The call of the createDatatypeLibrary method finds an implementation - * from a given datatype library URI at run-time. - */ -public class DatatypeLibraryLoader implements DatatypeLibraryFactory { - private final Service service = new Service(DatatypeLibraryFactory.class); - - public DatatypeLibrary createDatatypeLibrary(String uri) { - for (Enumeration e = service.getProviders(); - e.hasMoreElements();) { - DatatypeLibraryFactory factory - = (DatatypeLibraryFactory)e.nextElement(); - DatatypeLibrary library = factory.createDatatypeLibrary(uri); - if (library != null) - return library; - } - return null; - } - - private static class Service { - private final Class serviceClass; - private final Enumeration configFiles; - private Enumeration classNames = null; - private final Vector providers = new Vector(); - private Loader loader; - - private class ProviderEnumeration implements Enumeration { - private int nextIndex = 0; - - public boolean hasMoreElements() { - return nextIndex < providers.size() || moreProviders(); - } - - public Object nextElement() { - try { - return providers.elementAt(nextIndex++); - } - catch (ArrayIndexOutOfBoundsException e) { - throw new NoSuchElementException(); - } - } - } - - private static class Singleton implements Enumeration { - private Object obj; - private Singleton(Object obj) { - this.obj = obj; - } - - public boolean hasMoreElements() { - return obj != null; - } - - public Object nextElement() { - if (obj == null) - throw new NoSuchElementException(); - Object tem = obj; - obj = null; - return tem; - } - } - - // JDK 1.1 - private static class Loader { - Enumeration getResources(String resName) { - ClassLoader cl = Loader.class.getClassLoader(); - URL url; - if (cl == null) - url = ClassLoader.getSystemResource(resName); - else - url = cl.getResource(resName); - return new Singleton(url); - } - - Class loadClass(String name) throws ClassNotFoundException { - return Class.forName(name); - } - } - - // JDK 1.2+ - private static class Loader2 extends Loader { - private ClassLoader cl; - - Loader2() { - cl = Loader2.class.getClassLoader(); - // If the thread context class loader has the class loader - // of this class as an ancestor, use the thread context class - // loader. Otherwise, the thread context class loader - // probably hasn't been set up properly, so don't use it. - ClassLoader clt = Thread.currentThread().getContextClassLoader(); - for (ClassLoader tem = clt; tem != null; tem = tem.getParent()) - if (tem == cl) { - cl = clt; - break; - } - } - - Enumeration getResources(String resName) { - try { - return cl.getResources(resName); - } - catch (IOException e) { - return new Singleton(null); - } - } - - Class loadClass(String name) throws ClassNotFoundException { - return Class.forName(name, true, cl); - } - } - - public Service(Class cls) { - try { - loader = new Loader2(); - } - catch (NoSuchMethodError e) { - loader = new Loader(); - } - serviceClass = cls; - String resName = "META-INF/services/" + serviceClass.getName(); - configFiles = loader.getResources(resName); - } - - public Enumeration getProviders() { - return new ProviderEnumeration(); - } - - synchronized private boolean moreProviders() { - for (;;) { - while (classNames == null) { - if (!configFiles.hasMoreElements()) - return false; - classNames = parseConfigFile((URL)configFiles.nextElement()); - } - while (classNames.hasMoreElements()) { - String className = (String)classNames.nextElement(); - try { - Class cls = loader.loadClass(className); - Object obj = cls.newInstance(); - if (serviceClass.isInstance(obj)) { - providers.addElement(obj); - return true; - } - } - catch (ClassNotFoundException e) { } - catch (InstantiationException e) { } - catch (IllegalAccessException e) { } - catch (LinkageError e) { } - } - classNames = null; - } - } - - private static final int START = 0; - private static final int IN_NAME = 1; - private static final int IN_COMMENT = 2; - - private static Enumeration parseConfigFile(URL url) { - try { - InputStream in = url.openStream(); - Reader r; - try { - r = new InputStreamReader(in, "UTF-8"); - } - catch (UnsupportedEncodingException e) { - r = new InputStreamReader(in, "UTF8"); - } - r = new BufferedReader(r); - Vector tokens = new Vector(); - StringBuffer tokenBuf = new StringBuffer(); - int state = START; - for (;;) { - int n = r.read(); - if (n < 0) - break; - char c = (char)n; - switch (c) { - case '\r': - case '\n': - state = START; - break; - case ' ': - case '\t': - break; - case '#': - state = IN_COMMENT; - break; - default: - if (state != IN_COMMENT) { - state = IN_NAME; - tokenBuf.append(c); - } - break; - } - if (tokenBuf.length() != 0 && state != IN_NAME) { - tokens.addElement(tokenBuf.toString()); - tokenBuf.setLength(0); - } - } - if (tokenBuf.length() != 0) - tokens.addElement(tokenBuf.toString()); - return tokens.elements(); - } - catch (IOException e) { - return null; - } - } - } - -} - +/** + * Copyright (c) 2001, Thai Open Source Software Center Ltd + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Thai Open Source Software Center Ltd nor + * the names of its contributors may be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.relaxng.datatype.helpers; + +import org.relaxng.datatype.DatatypeLibraryFactory; +import org.relaxng.datatype.DatatypeLibrary; +import java.util.Enumeration; +import java.util.NoSuchElementException; +import java.util.Vector; +import java.io.Reader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URL; + +/** + * Discovers the datatype library implementation from the classpath. + * + *

+ * The call of the createDatatypeLibrary method finds an implementation + * from a given datatype library URI at run-time. + */ +public class DatatypeLibraryLoader implements DatatypeLibraryFactory { + private final Service service = new Service(DatatypeLibraryFactory.class); + + public DatatypeLibrary createDatatypeLibrary(String uri) { + for (Enumeration e = service.getProviders(); + e.hasMoreElements();) { + DatatypeLibraryFactory factory + = (DatatypeLibraryFactory)e.nextElement(); + DatatypeLibrary library = factory.createDatatypeLibrary(uri); + if (library != null) + return library; + } + return null; + } + + private static class Service { + private final Class serviceClass; + private final Enumeration configFiles; + private Enumeration classNames = null; + private final Vector providers = new Vector(); + private Loader loader; + + private class ProviderEnumeration implements Enumeration { + private int nextIndex = 0; + + public boolean hasMoreElements() { + return nextIndex < providers.size() || moreProviders(); + } + + public Object nextElement() { + try { + return providers.elementAt(nextIndex++); + } + catch (ArrayIndexOutOfBoundsException e) { + throw new NoSuchElementException(); + } + } + } + + private static class Singleton implements Enumeration { + private Object obj; + private Singleton(Object obj) { + this.obj = obj; + } + + public boolean hasMoreElements() { + return obj != null; + } + + public Object nextElement() { + if (obj == null) + throw new NoSuchElementException(); + Object tem = obj; + obj = null; + return tem; + } + } + + // JDK 1.1 + private static class Loader { + Enumeration getResources(String resName) { + ClassLoader cl = Loader.class.getClassLoader(); + URL url; + if (cl == null) + url = ClassLoader.getSystemResource(resName); + else + url = cl.getResource(resName); + return new Singleton(url); + } + + Class loadClass(String name) throws ClassNotFoundException { + return Class.forName(name); + } + } + + // JDK 1.2+ + private static class Loader2 extends Loader { + private ClassLoader cl; + + Loader2() { + cl = Loader2.class.getClassLoader(); + // If the thread context class loader has the class loader + // of this class as an ancestor, use the thread context class + // loader. Otherwise, the thread context class loader + // probably hasn't been set up properly, so don't use it. + ClassLoader clt = Thread.currentThread().getContextClassLoader(); + for (ClassLoader tem = clt; tem != null; tem = tem.getParent()) + if (tem == cl) { + cl = clt; + break; + } + } + + Enumeration getResources(String resName) { + try { + return cl.getResources(resName); + } + catch (IOException e) { + return new Singleton(null); + } + } + + Class loadClass(String name) throws ClassNotFoundException { + return Class.forName(name, true, cl); + } + } + + public Service(Class cls) { + try { + loader = new Loader2(); + } + catch (NoSuchMethodError e) { + loader = new Loader(); + } + serviceClass = cls; + String resName = "META-INF/services/" + serviceClass.getName(); + configFiles = loader.getResources(resName); + } + + public Enumeration getProviders() { + return new ProviderEnumeration(); + } + + synchronized private boolean moreProviders() { + for (;;) { + while (classNames == null) { + if (!configFiles.hasMoreElements()) + return false; + classNames = parseConfigFile((URL)configFiles.nextElement()); + } + while (classNames.hasMoreElements()) { + String className = (String)classNames.nextElement(); + try { + Class cls = loader.loadClass(className); + Object obj = cls.newInstance(); + if (serviceClass.isInstance(obj)) { + providers.addElement(obj); + return true; + } + } + catch (ClassNotFoundException e) { } + catch (InstantiationException e) { } + catch (IllegalAccessException e) { } + catch (LinkageError e) { } + } + classNames = null; + } + } + + private static final int START = 0; + private static final int IN_NAME = 1; + private static final int IN_COMMENT = 2; + + private static Enumeration parseConfigFile(URL url) { + try { + InputStream in = url.openStream(); + Reader r; + try { + r = new InputStreamReader(in, "UTF-8"); + } + catch (UnsupportedEncodingException e) { + r = new InputStreamReader(in, "UTF8"); + } + r = new BufferedReader(r); + Vector tokens = new Vector(); + StringBuffer tokenBuf = new StringBuffer(); + int state = START; + for (;;) { + int n = r.read(); + if (n < 0) + break; + char c = (char)n; + switch (c) { + case '\r': + case '\n': + state = START; + break; + case ' ': + case '\t': + break; + case '#': + state = IN_COMMENT; + break; + default: + if (state != IN_COMMENT) { + state = IN_NAME; + tokenBuf.append(c); + } + break; + } + if (tokenBuf.length() != 0 && state != IN_NAME) { + tokens.addElement(tokenBuf.toString()); + tokenBuf.setLength(0); + } + } + if (tokenBuf.length() != 0) + tokens.addElement(tokenBuf.toString()); + return tokens.elements(); + } + catch (IOException e) { + return null; + } + } + } + +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java index 1f571978f7c..c59b0935529 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java @@ -1,42 +1,42 @@ -package org.relaxng.datatype.helpers; - -import org.relaxng.datatype.*; - -/** - * Dummy implementation of {@link DatatypeBuilder}. - * - * This implementation can be used for Datatypes which have no parameters. - * Any attempt to add parameters will be rejected. - * - *

- * Typical usage would be: - * 


- * class MyDatatypeLibrary implements DatatypeLibrary {
- *     ....
- *     DatatypeBuilder createDatatypeBuilder( String typeName ) {
- *         return new ParameterleessDatatypeBuilder(createDatatype(typeName));
- *     }
- *     ....
- * }
- *
- * - * @author Kohsuke KAWAGUCHI - */ -public final class ParameterlessDatatypeBuilder implements DatatypeBuilder { - - /** This type object is returned for the derive method. */ - private final Datatype baseType; - - public ParameterlessDatatypeBuilder( Datatype baseType ) { - this.baseType = baseType; - } - - public void addParameter( String name, String strValue, ValidationContext context ) - throws DatatypeException { - throw new DatatypeException(); - } - - public Datatype createDatatype() throws DatatypeException { - return baseType; - } -} +package org.relaxng.datatype.helpers; + +import org.relaxng.datatype.*; + +/** + * Dummy implementation of {@link DatatypeBuilder}. + * + * This implementation can be used for Datatypes which have no parameters. + * Any attempt to add parameters will be rejected. + * + *

+ * Typical usage would be: + * 


+ * class MyDatatypeLibrary implements DatatypeLibrary {
+ *     ....
+ *     DatatypeBuilder createDatatypeBuilder( String typeName ) {
+ *         return new ParameterleessDatatypeBuilder(createDatatype(typeName));
+ *     }
+ *     ....
+ * }
+ *
+ * + * @author Kohsuke KAWAGUCHI + */ +public final class ParameterlessDatatypeBuilder implements DatatypeBuilder { + + /** This type object is returned for the derive method. */ + private final Datatype baseType; + + public ParameterlessDatatypeBuilder( Datatype baseType ) { + this.baseType = baseType; + } + + public void addParameter( String name, String strValue, ValidationContext context ) + throws DatatypeException { + throw new DatatypeException(); + } + + public Datatype createDatatype() throws DatatypeException { + return baseType; + } +} diff --git a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java index 63686706576..f553e908ede 100755 --- a/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java +++ b/libjava/classpath/external/relaxngDatatype/org/relaxng/datatype/helpers/StreamingValidatorImpl.java @@ -1,55 +1,55 @@ -package org.relaxng.datatype.helpers; - -import org.relaxng.datatype.*; - -/** - * Dummy implementation of {@link DatatypeStreamingValidator}. - * - *

- * This implementation can be used as a quick hack when the performance - * of streaming validation is not important. And this implementation - * also shows you how to implement the DatatypeStreamingValidator interface. - * - *

- * Typical usage would be: - * 


- * class MyDatatype implements Datatype {
- *     ....
- *     public DatatypeStreamingValidator createStreamingValidator( ValidationContext context ) {
- *         return new StreamingValidatorImpl(this,context);
- *     }
- *     ....
- * }
- *
- * - * @author Kohsuke KAWAGUCHI - */ -public final class StreamingValidatorImpl implements DatatypeStreamingValidator { - - /** This buffer accumulates characters. */ - private final StringBuffer buffer = new StringBuffer(); - - /** Datatype obejct that creates this streaming validator. */ - private final Datatype baseType; - - /** The current context. */ - private final ValidationContext context; - - public void addCharacters( char[] buf, int start, int len ) { - // append characters to the current buffer. - buffer.append(buf,start,len); - } - - public boolean isValid() { - return baseType.isValid(buffer.toString(),context); - } - - public void checkValid() throws DatatypeException { - baseType.checkValid(buffer.toString(),context); - } - - public StreamingValidatorImpl( Datatype baseType, ValidationContext context ) { - this.baseType = baseType; - this.context = context; - } -} +package org.relaxng.datatype.helpers; + +import org.relaxng.datatype.*; + +/** + * Dummy implementation of {@link DatatypeStreamingValidator}. + * + *

+ * This implementation can be used as a quick hack when the performance + * of streaming validation is not important. And this implementation + * also shows you how to implement the DatatypeStreamingValidator interface. + * + *

+ * Typical usage would be: + * 


+ * class MyDatatype implements Datatype {
+ *     ....
+ *     public DatatypeStreamingValidator createStreamingValidator( ValidationContext context ) {
+ *         return new StreamingValidatorImpl(this,context);
+ *     }
+ *     ....
+ * }
+ *
+ * + * @author Kohsuke KAWAGUCHI + */ +public final class StreamingValidatorImpl implements DatatypeStreamingValidator { + + /** This buffer accumulates characters. */ + private final StringBuffer buffer = new StringBuffer(); + + /** Datatype obejct that creates this streaming validator. */ + private final Datatype baseType; + + /** The current context. */ + private final ValidationContext context; + + public void addCharacters( char[] buf, int start, int len ) { + // append characters to the current buffer. + buffer.append(buf,start,len); + } + + public boolean isValid() { + return baseType.isValid(buffer.toString(),context); + } + + public void checkValid() throws DatatypeException { + baseType.checkValid(buffer.toString(),context); + } + + public StreamingValidatorImpl( Datatype baseType, ValidationContext context ) { + this.baseType = baseType; + this.context = context; + } +} diff --git a/libjava/classpath/external/sax/org/xml/sax/AttributeList.java b/libjava/classpath/external/sax/org/xml/sax/AttributeList.java index 7d8e9beec37..cceac8983b9 100644 --- a/libjava/classpath/external/sax/org/xml/sax/AttributeList.java +++ b/libjava/classpath/external/sax/org/xml/sax/AttributeList.java @@ -71,11 +71,11 @@ package org.xml.sax; */ public interface AttributeList { - + //////////////////////////////////////////////////////////////////// // Iteration methods. //////////////////////////////////////////////////////////////////// - + /** * Return the number of attributes in this list. @@ -85,11 +85,11 @@ public interface AttributeList { * declared or specified. The number of attributes may be * zero.

* - * @return The number of attributes in the list. + * @return The number of attributes in the list. */ public abstract int getLength (); - - + + /** * Return the name of an attribute in this list (by position). * @@ -104,11 +104,11 @@ public interface AttributeList { * @param i The index of the attribute in the list (starting at 0). * @return The name of the indexed attribute, or null * if the index is out of range. - * @see #getLength + * @see #getLength */ public abstract String getName (int i); - - + + /** * Return the type of an attribute in the list (by position). * @@ -127,12 +127,12 @@ public interface AttributeList { * @param i The index of the attribute in the list (starting at 0). * @return The attribute type as a string, or * null if the index is out of range. - * @see #getLength + * @see #getLength * @see #getType(java.lang.String) */ public abstract String getType (int i); - - + + /** * Return the value of an attribute in the list (by position). * @@ -149,12 +149,12 @@ public interface AttributeList { public abstract String getValue (int i); - + //////////////////////////////////////////////////////////////////// // Lookup methods. //////////////////////////////////////////////////////////////////// - - + + /** * Return the type of an attribute in the list (by name). * @@ -170,8 +170,8 @@ public interface AttributeList { * @see #getType(int) */ public abstract String getType (String name); - - + + /** * Return the value of an attribute in the list (by name). * @@ -187,7 +187,7 @@ public interface AttributeList { * @see #getValue(int) */ public abstract String getValue (String name); - + } // end of AttributeList.java diff --git a/libjava/classpath/external/sax/org/xml/sax/Attributes.java b/libjava/classpath/external/sax/org/xml/sax/Attributes.java index 51735908936..0f3c23682fc 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Attributes.java +++ b/libjava/classpath/external/sax/org/xml/sax/Attributes.java @@ -29,8 +29,8 @@ package org.xml.sax; *

The list will not contain attributes that were declared * #IMPLIED but not specified in the start tag. It will also not * contain attributes used as Namespace declarations (xmlns*) unless - * the http://xml.org/sax/features/namespace-prefixes - * feature is set to true (it is false by + * the http://xml.org/sax/features/namespace-prefixes + * feature is set to true (it is false by * default). * Because SAX2 conforms to the original "Namespaces in XML" * recommendation, it normally does not @@ -53,8 +53,8 @@ package org.xml.sax; * available.

* *

This interface replaces the now-deprecated SAX1 {@link - * org.xml.sax.AttributeList AttributeList} interface, which does not - * contain Namespace support. In addition to Namespace support, it + * org.xml.sax.AttributeList AttributeList} interface, which does not + * contain Namespace support. In addition to Namespace support, it * adds the getIndex methods (below).

* *

The order of attributes in the list is unspecified, and will @@ -69,7 +69,7 @@ package org.xml.sax; public interface Attributes { - + //////////////////////////////////////////////////////////////////// // Indexed access. //////////////////////////////////////////////////////////////////// @@ -166,7 +166,7 @@ public interface Attributes public abstract String getValue (int index); - + //////////////////////////////////////////////////////////////////// // Name-based query. //////////////////////////////////////////////////////////////////// diff --git a/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java b/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java index c0df614108d..f5f439d78c1 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ContentHandler.java @@ -18,11 +18,11 @@ package org.xml.sax; * * *

This is the main interface that most SAX applications - * implement: if the application needs to be informed of basic parsing - * events, it implements this interface and registers an instance with - * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler - * setContentHandler} method. The parser uses the instance to report - * basic document-related events like the start and end of elements + * implement: if the application needs to be informed of basic parsing + * events, it implements this interface and registers an instance with + * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler + * setContentHandler} method. The parser uses the instance to report + * basic document-related events like the start and end of elements * and character data.

* *

The order of events in this interface is very important, and @@ -36,7 +36,7 @@ package org.xml.sax; * and for reporting skipped entities (in non-validating XML * processors).

* - *

Implementors should note that there is also a + *

Implementors should note that there is also a * ContentHandler class in the java.net * package; that means that it's probably a bad idea to do

* @@ -92,7 +92,7 @@ public interface ContentHandler * Receive notification of the beginning of a document. * *

The SAX parser will invoke this method only once, before any - * other event callbacks (except for {@link #setDocumentLocator + * other event callbacks (except for {@link #setDocumentLocator * setDocumentLocator}).

* * @throws org.xml.sax.SAXException any SAX exception, possibly @@ -100,7 +100,7 @@ public interface ContentHandler * @see #endDocument */ public void startDocument () - throws SAXException; + throws SAXException; /** @@ -125,14 +125,14 @@ public interface ContentHandler * @see #startDocument */ public void endDocument() - throws SAXException; + throws SAXException; /** * Begin the scope of a prefix-URI Namespace mapping. * *

The information from this event is not necessary for - * normal Namespace processing: the SAX XML reader will + * normal Namespace processing: the SAX XML reader will * automatically replace prefixes for element and attribute * names when the http://xml.org/sax/features/namespaces * feature is true (the default).

@@ -147,19 +147,19 @@ public interface ContentHandler *

Note that start/endPrefixMapping events are not * guaranteed to be properly nested relative to each other: * all startPrefixMapping events will occur immediately before the - * corresponding {@link #startElement startElement} event, + * corresponding {@link #startElement startElement} event, * and all {@link #endPrefixMapping endPrefixMapping} * events will occur immediately after the corresponding * {@link #endElement endElement} event, - * but their order is not otherwise + * but their order is not otherwise * guaranteed.

* *

There should never be start/endPrefixMapping events for the * "xml" prefix, since it is predeclared and immutable.

* * @param prefix the Namespace prefix being declared. - * An empty string is used for the default element namespace, - * which has no prefix. + * An empty string is used for the default element namespace, + * which has no prefix. * @param uri the Namespace URI the prefix is mapped to * @throws org.xml.sax.SAXException the client may throw * an exception during processing @@ -167,27 +167,27 @@ public interface ContentHandler * @see #startElement */ public void startPrefixMapping (String prefix, String uri) - throws SAXException; + throws SAXException; /** * End the scope of a prefix-URI mapping. * - *

See {@link #startPrefixMapping startPrefixMapping} for + *

See {@link #startPrefixMapping startPrefixMapping} for * details. These events will always occur immediately after the - * corresponding {@link #endElement endElement} event, but the order of + * corresponding {@link #endElement endElement} event, but the order of * {@link #endPrefixMapping endPrefixMapping} events is not otherwise * guaranteed.

* * @param prefix the prefix that was being mapped. - * This is the empty string when a default mapping scope ends. + * This is the empty string when a default mapping scope ends. * @throws org.xml.sax.SAXException the client may throw * an exception during processing * @see #startPrefixMapping * @see #endElement */ public void endPrefixMapping (String prefix) - throws SAXException; + throws SAXException; /** @@ -215,7 +215,7 @@ public interface ContentHandler * properties:

* *
    - *
  • the Namespace URI and local name are required when + *
  • the Namespace URI and local name are required when * the namespaces property is true (the default), and are * optional when the namespaces property is false (if one is * specified, both must be);
    • @@ -230,7 +230,7 @@ public interface ContentHandler * will contain attributes used for Namespace declarations * (xmlns* attributes) only if the * http://xml.org/sax/features/namespace-prefixes - * property is true (it is false by default, and support for a + * property is true (it is false by default, and support for a * true value is optional).

    * *

    Like {@link #characters characters()}, attribute values may have @@ -255,8 +255,8 @@ public interface ContentHandler * @see org.xml.sax.helpers.AttributesImpl */ public void startElement (String uri, String localName, - String qName, Attributes atts) - throws SAXException; + String qName, Attributes atts) + throws SAXException; /** @@ -264,7 +264,7 @@ public interface ContentHandler * *

    The SAX parser will invoke this method at the end of every * element in the XML document; there will be a corresponding - * {@link #startElement startElement} event for every endElement + * {@link #startElement startElement} event for every endElement * event (even when the element is empty).

    * *

    For information on the names, see startElement.

    @@ -281,8 +281,8 @@ public interface ContentHandler * wrapping another exception */ public void endElement (String uri, String localName, - String qName) - throws SAXException; + String qName) + throws SAXException; /** @@ -317,7 +317,7 @@ public interface ContentHandler * *

    Note that some parsers will report whitespace in element * content using the {@link #ignorableWhitespace ignorableWhitespace} - * method rather than this one (validating parsers must + * method rather than this one (validating parsers must * do so).

    * * @param ch the characters from the XML document @@ -325,11 +325,11 @@ public interface ContentHandler * @param length the number of characters to read from the array * @throws org.xml.sax.SAXException any SAX exception, possibly * wrapping another exception - * @see #ignorableWhitespace + * @see #ignorableWhitespace * @see org.xml.sax.Locator */ public void characters (char ch[], int start, int length) - throws SAXException; + throws SAXException; /** @@ -358,7 +358,7 @@ public interface ContentHandler * @see #characters */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException; + throws SAXException; /** @@ -384,7 +384,7 @@ public interface ContentHandler * wrapping another exception */ public void processingInstruction (String target, String data) - throws SAXException; + throws SAXException; /** @@ -405,7 +405,7 @@ public interface ContentHandler * http://xml.org/sax/features/external-parameter-entities * properties.

    * - * @param name the name of the skipped entity. If it is a + * @param name the name of the skipped entity. If it is a * parameter entity, the name will begin with '%', and if * it is the external DTD subset, it will be the string * "[dtd]" @@ -413,7 +413,7 @@ public interface ContentHandler * wrapping another exception */ public void skippedEntity (String name) - throws SAXException; + throws SAXException; } // end of ContentHandler.java diff --git a/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java b/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java index f894298cded..67f5bd6a3a4 100644 --- a/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/DTDHandler.java @@ -16,10 +16,10 @@ package org.xml.sax; * * *

    If a SAX application needs information about notations and - * unparsed entities, then the application implements this - * interface and registers an instance with the SAX parser using - * the parser's setDTDHandler method. The parser uses the - * instance to report notation and unparsed entity declarations to + * unparsed entities, then the application implements this + * interface and registers an instance with the SAX parser using + * the parser's setDTDHandler method. The parser uses the + * instance to report notation and unparsed entity declarations to * the application.

    * *

    Note that this interface includes only those DTD events that @@ -35,7 +35,7 @@ package org.xml.sax; * used, these events must also be reported before the endDTD event.) *

    * - *

    It is up to the application to store the information for + *

    It is up to the application to store the information for * future use (perhaps in a hash table or object tree). * If the application encounters attributes of type "NOTATION", * "ENTITY", or "ENTITIES", it can use the information that it @@ -48,8 +48,8 @@ package org.xml.sax; * @see org.xml.sax.XMLReader#setDTDHandler */ public interface DTDHandler { - - + + /** * Receive notification of a notation declaration event. * @@ -78,19 +78,19 @@ public interface DTDHandler { * @see org.xml.sax.Attributes */ public abstract void notationDecl (String name, - String publicId, - String systemId) - throws SAXException; - - + String publicId, + String systemId) + throws SAXException; + + /** * Receive notification of an unparsed entity declaration event. * *

    Note that the notation name corresponds to a notation - * reported by the {@link #notationDecl notationDecl} event. - * It is up to the application to record the entity for later + * reported by the {@link #notationDecl notationDecl} event. + * It is up to the application to record the entity for later * reference, if necessary; - * unparsed entities may appear as attribute values. + * unparsed entities may appear as attribute values. *

    * *

    If the system identifier is a URL, the parser must resolve it @@ -107,11 +107,11 @@ public interface DTDHandler { * @see org.xml.sax.Attributes */ public abstract void unparsedEntityDecl (String name, - String publicId, - String systemId, - String notationName) - throws SAXException; - + String publicId, + String systemId, + String notationName) + throws SAXException; + } // end of DTDHandler.java diff --git a/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java b/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java index 08429b6bcf4..339a0ea657a 100644 --- a/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/DocumentHandler.java @@ -45,8 +45,8 @@ package org.xml.sax; * @see org.xml.sax.HandlerBase */ public interface DocumentHandler { - - + + /** * Receive an object for locating the origin of SAX document events. * @@ -73,8 +73,8 @@ public interface DocumentHandler { * @see org.xml.sax.Locator */ public abstract void setDocumentLocator (Locator locator); - - + + /** * Receive notification of the beginning of a document. * @@ -86,9 +86,9 @@ public interface DocumentHandler { * wrapping another exception. */ public abstract void startDocument () - throws SAXException; - - + throws SAXException; + + /** * Receive notification of the end of a document. * @@ -102,9 +102,9 @@ public interface DocumentHandler { * wrapping another exception. */ public abstract void endDocument () - throws SAXException; - - + throws SAXException; + + /** * Receive notification of the beginning of an element. * @@ -125,12 +125,12 @@ public interface DocumentHandler { * @exception org.xml.sax.SAXException Any SAX exception, possibly * wrapping another exception. * @see #endElement - * @see org.xml.sax.AttributeList + * @see org.xml.sax.AttributeList */ public abstract void startElement (String name, AttributeList atts) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of the end of an element. * @@ -147,9 +147,9 @@ public interface DocumentHandler { * wrapping another exception. */ public abstract void endElement (String name) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of character data. * @@ -172,13 +172,13 @@ public interface DocumentHandler { * @param length The number of characters to read from the array. * @exception org.xml.sax.SAXException Any SAX exception, possibly * wrapping another exception. - * @see #ignorableWhitespace + * @see #ignorableWhitespace * @see org.xml.sax.Locator */ public abstract void characters (char ch[], int start, int length) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of ignorable whitespace in element content. * @@ -204,9 +204,9 @@ public interface DocumentHandler { * @see #characters */ public abstract void ignorableWhitespace (char ch[], int start, int length) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of a processing instruction. * @@ -225,8 +225,8 @@ public interface DocumentHandler { * wrapping another exception. */ public abstract void processingInstruction (String target, String data) - throws SAXException; - + throws SAXException; + } // end of DocumentHandler.java diff --git a/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java b/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java index e240ba14b48..f1953d5ba0e 100644 --- a/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java +++ b/libjava/classpath/external/sax/org/xml/sax/EntityResolver.java @@ -67,8 +67,8 @@ import java.io.IOException; * @see org.xml.sax.InputSource */ public interface EntityResolver { - - + + /** * Allow the application to resolve external entities. * @@ -111,9 +111,9 @@ public interface EntityResolver { * @see org.xml.sax.InputSource */ public abstract InputSource resolveEntity (String publicId, - String systemId) - throws SAXException, IOException; - + String systemId) + throws SAXException, IOException; + } // end of EntityResolver.java diff --git a/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java b/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java index 5ebe3926321..b315ec06d39 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ErrorHandler.java @@ -29,12 +29,12 @@ package org.xml.sax; * In order to detect validity errors, an ErrorHandler that does something * with {@link #error error()} calls must be registered.

    * - *

    For XML processing errors, a SAX driver must use this interface - * in preference to throwing an exception: it is up to the application - * to decide whether to throw an exception for different types of - * errors and warnings. Note, however, that there is no requirement that - * the parser continue to report additional errors after a call to - * {@link #fatalError fatalError}. In other words, a SAX driver class + *

    For XML processing errors, a SAX driver must use this interface + * in preference to throwing an exception: it is up to the application + * to decide whether to throw an exception for different types of + * errors and warnings. Note, however, that there is no requirement that + * the parser continue to report additional errors after a call to + * {@link #fatalError fatalError}. In other words, a SAX driver class * may throw an exception after reporting any fatalError. * Also parsers may throw appropriate exceptions for non-XML errors. * For example, {@link XMLReader#parse XMLReader.parse()} would throw @@ -44,11 +44,11 @@ package org.xml.sax; * @author David Megginson * @version 2.0.1+ (sax2r3pre1) * @see org.xml.sax.XMLReader#setErrorHandler - * @see org.xml.sax.SAXParseException + * @see org.xml.sax.SAXParseException */ public interface ErrorHandler { - - + + /** * Receive notification of a warning. * @@ -68,12 +68,12 @@ public interface ErrorHandler { * SAX parse exception. * @exception org.xml.sax.SAXException Any SAX exception, possibly * wrapping another exception. - * @see org.xml.sax.SAXParseException + * @see org.xml.sax.SAXParseException */ public abstract void warning (SAXParseException exception) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of a recoverable error. * @@ -97,12 +97,12 @@ public interface ErrorHandler { * SAX parse exception. * @exception org.xml.sax.SAXException Any SAX exception, possibly * wrapping another exception. - * @see org.xml.sax.SAXParseException + * @see org.xml.sax.SAXParseException */ public abstract void error (SAXParseException exception) - throws SAXException; - - + throws SAXException; + + /** * Receive notification of a non-recoverable error. * @@ -126,14 +126,14 @@ public interface ErrorHandler { * other events once this method has been invoked.

    * * @param exception The error information encapsulated in a - * SAX parse exception. + * SAX parse exception. * @exception org.xml.sax.SAXException Any SAX exception, possibly * wrapping another exception. * @see org.xml.sax.SAXParseException */ public abstract void fatalError (SAXParseException exception) - throws SAXException; - + throws SAXException; + } // end of ErrorHandler.java diff --git a/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java b/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java index 7d6ce73616a..da27249fd50 100644 --- a/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java +++ b/libjava/classpath/external/sax/org/xml/sax/HandlerBase.java @@ -45,12 +45,12 @@ package org.xml.sax; public class HandlerBase implements EntityResolver, DTDHandler, DocumentHandler, ErrorHandler { - - + + //////////////////////////////////////////////////////////////////// // Default implementation of the EntityResolver interface. //////////////////////////////////////////////////////////////////// - + /** * Resolve an external entity. * @@ -62,7 +62,7 @@ public class HandlerBase * * @param publicId The public identifer, or null if none is * available. - * @param systemId The system identifier provided in the XML + * @param systemId The system identifier provided in the XML * document. * @return The new input source, or null to require the * default behaviour. @@ -71,18 +71,18 @@ public class HandlerBase * @see org.xml.sax.EntityResolver#resolveEntity */ public InputSource resolveEntity (String publicId, String systemId) - throws SAXException + throws SAXException { - return null; + return null; } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of DTDHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive notification of a notation declaration. * @@ -98,10 +98,10 @@ public class HandlerBase */ public void notationDecl (String name, String publicId, String systemId) { - // no op + // no op } - - + + /** * Receive notification of an unparsed entity declaration. * @@ -117,18 +117,18 @@ public class HandlerBase * @see org.xml.sax.DTDHandler#unparsedEntityDecl */ public void unparsedEntityDecl (String name, String publicId, - String systemId, String notationName) + String systemId, String notationName) { - // no op + // no op } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of DocumentHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive a Locator object for document events. * @@ -142,10 +142,10 @@ public class HandlerBase */ public void setDocumentLocator (Locator locator) { - // no op + // no op } - - + + /** * Receive notification of the beginning of the document. * @@ -159,12 +159,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#startDocument */ public void startDocument () - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the end of the document. * @@ -178,12 +178,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#endDocument */ public void endDocument () - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the start of an element. * @@ -199,12 +199,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#startElement */ public void startElement (String name, AttributeList attributes) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the end of an element. * @@ -219,12 +219,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#endElement */ public void endElement (String name) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of character data inside an element. * @@ -242,12 +242,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#characters */ public void characters (char ch[], int start, int length) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of ignorable whitespace in element content. * @@ -265,12 +265,12 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#ignorableWhitespace */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of a processing instruction. * @@ -287,18 +287,18 @@ public class HandlerBase * @see org.xml.sax.DocumentHandler#processingInstruction */ public void processingInstruction (String target, String data) - throws SAXException + throws SAXException { - // no op + // no op } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of the ErrorHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive notification of a parser warning. * @@ -314,12 +314,12 @@ public class HandlerBase * @see org.xml.sax.SAXParseException */ public void warning (SAXParseException e) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of a recoverable parser error. * @@ -335,12 +335,12 @@ public class HandlerBase * @see org.xml.sax.SAXParseException */ public void error (SAXParseException e) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Report a fatal XML parsing error. * @@ -359,11 +359,11 @@ public class HandlerBase * @see org.xml.sax.SAXParseException */ public void fatalError (SAXParseException e) - throws SAXException + throws SAXException { - throw e; + throw e; } - + } // end of HandlerBase.java diff --git a/libjava/classpath/external/sax/org/xml/sax/InputSource.java b/libjava/classpath/external/sax/org/xml/sax/InputSource.java index 3737b63712d..b5474921c3e 100644 --- a/libjava/classpath/external/sax/org/xml/sax/InputSource.java +++ b/libjava/classpath/external/sax/org/xml/sax/InputSource.java @@ -43,7 +43,7 @@ import java.io.InputStream; * identifier.

    * *

    An InputSource object belongs to the application: the SAX parser - * shall never modify it in any way (it may modify a copy if + * shall never modify it in any way (it may modify a copy if * necessary). However, standard processing of both byte and * character streams is to close them on as part of end-of-parse cleanup, * so applications should not attempt to re-use such streams after they @@ -58,7 +58,7 @@ import java.io.InputStream; * @see java.io.Reader */ public class InputSource { - + /** * Zero-argument default constructor. * @@ -71,12 +71,12 @@ public class InputSource { public InputSource () { } - - + + /** * Create a new input source with a system identifier. * - *

    Applications may use setPublicId to include a + *

    Applications may use setPublicId to include a * public identifier as well, or setEncoding to specify * the character encoding, if known.

    * @@ -92,15 +92,15 @@ public class InputSource { */ public InputSource (String systemId) { - setSystemId(systemId); + setSystemId(systemId); } - - + + /** * Create a new input source with a byte stream. * - *

    Application writers should use setSystemId() to provide a base - * for resolving relative URIs, may use setPublicId to include a + *

    Application writers should use setSystemId() to provide a base + * for resolving relative URIs, may use setPublicId to include a * public identifier, and may use setEncoding to specify the object's * character encoding.

    * @@ -113,15 +113,15 @@ public class InputSource { */ public InputSource (InputStream byteStream) { - setByteStream(byteStream); + setByteStream(byteStream); } - - + + /** * Create a new input source with a character stream. * - *

    Application writers should use setSystemId() to provide a base - * for resolving relative URIs, and may use setPublicId to include a + *

    Application writers should use setSystemId() to provide a base + * for resolving relative URIs, and may use setPublicId to include a * public identifier.

    * *

    The character stream shall not include a byte order mark.

    @@ -133,10 +133,10 @@ public class InputSource { */ public InputSource (Reader characterStream) { - setCharacterStream(characterStream); + setCharacterStream(characterStream); } - - + + /** * Set the public identifier for this input source. * @@ -151,10 +151,10 @@ public class InputSource { */ public void setPublicId (String publicId) { - this.publicId = publicId; + this.publicId = publicId; } - - + + /** * Get the public identifier for this input source. * @@ -163,10 +163,10 @@ public class InputSource { */ public String getPublicId () { - return publicId; + return publicId; } - - + + /** * Set the system identifier for this input source. * @@ -192,10 +192,10 @@ public class InputSource { */ public void setSystemId (String systemId) { - this.systemId = systemId; + this.systemId = systemId; } - - + + /** * Get the system identifier for this input source. * @@ -210,10 +210,10 @@ public class InputSource { */ public String getSystemId () { - return systemId; + return systemId; } - - + + /** * Set the byte stream for this input source. * @@ -233,10 +233,10 @@ public class InputSource { */ public void setByteStream (InputStream byteStream) { - this.byteStream = byteStream; + this.byteStream = byteStream; } - - + + /** * Get the byte stream for this input source. * @@ -249,11 +249,11 @@ public class InputSource { */ public InputStream getByteStream () { - return byteStream; + return byteStream; } - - - /** + + + /** * Set the character encoding, if known. * *

    The encoding must be a string acceptable for an @@ -270,10 +270,10 @@ public class InputSource { */ public void setEncoding (String encoding) { - this.encoding = encoding; + this.encoding = encoding; } - - + + /** * Get the character encoding for a byte stream or URI. * This value will be ignored when the application provides a @@ -286,10 +286,10 @@ public class InputSource { */ public String getEncoding () { - return encoding; + return encoding; } - - + + /** * Set the character stream for this input source. * @@ -304,10 +304,10 @@ public class InputSource { */ public void setCharacterStream (Reader characterStream) { - this.characterStream = characterStream; + this.characterStream = characterStream; } - - + + /** * Get the character stream for this input source. * @@ -316,21 +316,21 @@ public class InputSource { */ public Reader getCharacterStream () { - return characterStream; + return characterStream; } - - - + + + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// - + private String publicId; private String systemId; private InputStream byteStream; private String encoding; private Reader characterStream; - + } // end of InputSource.java diff --git a/libjava/classpath/external/sax/org/xml/sax/Locator.java b/libjava/classpath/external/sax/org/xml/sax/Locator.java index 63947df7ac7..910f0d294fa 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Locator.java +++ b/libjava/classpath/external/sax/org/xml/sax/Locator.java @@ -34,17 +34,17 @@ package org.xml.sax; * locator, it must do so before reporting any other document events. * If no locator has been set by the time the application receives * the {@link org.xml.sax.ContentHandler#startDocument startDocument} - * event, the application should assume that a locator is not + * event, the application should assume that a locator is not * available.

    * * @since SAX 1.0 * @author David Megginson * @version 2.0.1 (sax2r2) - * @see org.xml.sax.ContentHandler#setDocumentLocator + * @see org.xml.sax.ContentHandler#setDocumentLocator */ public interface Locator { - - + + /** * Return the public identifier for the current document event. * @@ -57,8 +57,8 @@ public interface Locator { * @see #getSystemId */ public abstract String getPublicId (); - - + + /** * Return the system identifier for the current document event. * @@ -76,8 +76,8 @@ public interface Locator { * @see #getPublicId */ public abstract String getSystemId (); - - + + /** * Return the line number where the current document event ends. * Lines are delimited by line ends, which are defined in @@ -95,16 +95,16 @@ public interface Locator { * in the document entity or external parsed entity where the * markup triggering the event appears.

    * - *

    If possible, the SAX driver should provide the line position - * of the first character after the text associated with the document + *

    If possible, the SAX driver should provide the line position + * of the first character after the text associated with the document * event. The first line is line 1.

    * * @return The line number, or -1 if none is available. * @see #getColumnNumber */ public abstract int getLineNumber (); - - + + /** * Return the column number where the current document event ends. * This is one-based number of Java char values since @@ -122,15 +122,15 @@ public interface Locator { * in the document entity or external parsed entity where the * markup triggering the event appears.

    * - *

    If possible, the SAX driver should provide the line position - * of the first character after the text associated with the document + *

    If possible, the SAX driver should provide the line position + * of the first character after the text associated with the document * event. The first column in each line is column 1.

    * * @return The column number, or -1 if none is available. * @see #getLineNumber */ public abstract int getColumnNumber (); - + } // end of Locator.java diff --git a/libjava/classpath/external/sax/org/xml/sax/Parser.java b/libjava/classpath/external/sax/org/xml/sax/Parser.java index 5866eb09ce1..994648897ba 100644 --- a/libjava/classpath/external/sax/org/xml/sax/Parser.java +++ b/libjava/classpath/external/sax/org/xml/sax/Parser.java @@ -49,9 +49,9 @@ import java.util.Locale; * @see org.xml.sax.HandlerBase * @see org.xml.sax.InputSource */ -public interface Parser +public interface Parser { - + /** * Allow an application to request a locale for errors and warnings. * @@ -62,15 +62,15 @@ public interface Parser * * @param locale A Java Locale object. * @exception org.xml.sax.SAXException Throws an exception - * (using the previous or default locale) if the + * (using the previous or default locale) if the * requested locale is not supported. * @see org.xml.sax.SAXException * @see org.xml.sax.SAXParseException */ public abstract void setLocale (Locale locale) - throws SAXException; - - + throws SAXException; + + /** * Allow an application to register a custom entity resolver. * @@ -88,8 +88,8 @@ public interface Parser * @see HandlerBase */ public abstract void setEntityResolver (EntityResolver resolver); - - + + /** * Allow an application to register a DTD event handler. * @@ -107,8 +107,8 @@ public interface Parser * @see HandlerBase */ public abstract void setDTDHandler (DTDHandler handler); - - + + /** * Allow an application to register a document event handler. * @@ -126,8 +126,8 @@ public interface Parser * @see HandlerBase */ public abstract void setDocumentHandler (DocumentHandler handler); - - + + /** * Allow an application to register an error event handler. * @@ -146,8 +146,8 @@ public interface Parser * @see HandlerBase */ public abstract void setErrorHandler (ErrorHandler handler); - - + + /** * Parse an XML document. * @@ -176,9 +176,9 @@ public interface Parser * @see #setErrorHandler */ public abstract void parse (InputSource source) - throws SAXException, IOException; - - + throws SAXException, IOException; + + /** * Parse an XML document from a system identifier (URI). * @@ -202,8 +202,8 @@ public interface Parser * @see #parse(org.xml.sax.InputSource) */ public abstract void parse (String systemId) - throws SAXException, IOException; - + throws SAXException, IOException; + } // end of Parser.java diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXException.java b/libjava/classpath/external/sax/org/xml/sax/SAXException.java index b3c23e9aedb..f8691bc575e 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXException.java @@ -42,22 +42,22 @@ public class SAXException extends Exception { */ public SAXException () { - super(); - this.exception = null; + super(); + this.exception = null; } - - + + /** * Create a new SAXException. * * @param message The error or warning message. */ public SAXException (String message) { - super(message); - this.exception = null; + super(message); + this.exception = null; } - - + + /** * Create a new SAXException wrapping an existing exception. * @@ -69,11 +69,11 @@ public class SAXException extends Exception { */ public SAXException (Exception e) { - super(); - this.exception = e; + super(); + this.exception = e; } - - + + /** * Create a new SAXException from an existing exception. * @@ -85,11 +85,11 @@ public class SAXException extends Exception { */ public SAXException (String message, Exception e) { - super(message); - this.exception = e; + super(message); + this.exception = e; } - - + + /** * Return a detail message for this exception. * @@ -101,16 +101,16 @@ public class SAXException extends Exception { */ public String getMessage () { - String message = super.getMessage(); - - if (message == null && exception != null) { - return exception.getMessage(); - } else { - return message; - } + String message = super.getMessage(); + + if (message == null && exception != null) { + return exception.getMessage(); + } else { + return message; + } } - - + + /** * Return the embedded exception, if any. * @@ -118,7 +118,7 @@ public class SAXException extends Exception { */ public Exception getException () { - return exception; + return exception; } @@ -129,15 +129,15 @@ public class SAXException extends Exception { */ public String toString () { - if (exception != null) { - return exception.toString(); - } else { - return super.toString(); - } + if (exception != null) { + return exception.toString(); + } else { + return super.toString(); + } } - - - + + + ////////////////////////////////////////////////////////////////////// // Internal state. ////////////////////////////////////////////////////////////////////// @@ -145,9 +145,9 @@ public class SAXException extends Exception { /** * @serial The embedded exception if tunnelling, or null. - */ + */ private Exception exception; - + } // end of SAXException.java diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java b/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java index dc411b105ce..b512288ec74 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java @@ -34,7 +34,7 @@ public class SAXNotRecognizedException extends SAXException */ public SAXNotRecognizedException () { - super(); + super(); } @@ -45,7 +45,7 @@ public class SAXNotRecognizedException extends SAXException */ public SAXNotRecognizedException (String message) { - super(message); + super(message); } } diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java b/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java index 232ce8026de..e59fd40e0f2 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java @@ -24,7 +24,7 @@ package org.xml.sax; * @since SAX 2.0 * @author David Megginson * @version 2.0.1 (sax2r2) - * @see org.xml.sax.SAXNotRecognizedException + * @see org.xml.sax.SAXNotRecognizedException */ public class SAXNotSupportedException extends SAXException { @@ -34,7 +34,7 @@ public class SAXNotSupportedException extends SAXException */ public SAXNotSupportedException () { - super(); + super(); } @@ -45,7 +45,7 @@ public class SAXNotSupportedException extends SAXException */ public SAXNotSupportedException (String message) { - super(message); + super(message); } } diff --git a/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java b/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java index c49ff095be3..0921be76241 100644 --- a/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java +++ b/libjava/classpath/external/sax/org/xml/sax/SAXParseException.java @@ -19,12 +19,12 @@ package org.xml.sax; * in the original XML document, as if it came from a {@link Locator} * object. Note that although the application * will receive a SAXParseException as the argument to the handlers - * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface, - * the application is not actually required to throw the exception; - * instead, it can simply read the information in it and take a + * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface, + * the application is not actually required to throw the exception; + * instead, it can simply read the information in it and take a * different action.

    * - *

    Since this exception is a subclass of {@link org.xml.sax.SAXException + *

    Since this exception is a subclass of {@link org.xml.sax.SAXException * SAXException}, it inherits the ability to wrap another exception.

    * * @since SAX 1.0 @@ -35,8 +35,8 @@ package org.xml.sax; * @see org.xml.sax.ErrorHandler */ public class SAXParseException extends SAXException { - - + + ////////////////////////////////////////////////////////////////////// // Constructors. ////////////////////////////////////////////////////////////////////// @@ -55,16 +55,16 @@ public class SAXParseException extends SAXException { * @see org.xml.sax.Locator */ public SAXParseException (String message, Locator locator) { - super(message); - if (locator != null) { - init(locator.getPublicId(), locator.getSystemId(), - locator.getLineNumber(), locator.getColumnNumber()); - } else { - init(null, null, -1, -1); - } + super(message); + if (locator != null) { + init(locator.getPublicId(), locator.getSystemId(), + locator.getLineNumber(), locator.getColumnNumber()); + } else { + init(null, null, -1, -1); + } } - - + + /** * Wrap an existing exception in a SAXParseException. * @@ -81,17 +81,17 @@ public class SAXParseException extends SAXException { * @see org.xml.sax.Locator */ public SAXParseException (String message, Locator locator, - Exception e) { - super(message, e); - if (locator != null) { - init(locator.getPublicId(), locator.getSystemId(), - locator.getLineNumber(), locator.getColumnNumber()); - } else { - init(null, null, -1, -1); - } + Exception e) { + super(message, e); + if (locator != null) { + init(locator.getPublicId(), locator.getSystemId(), + locator.getLineNumber(), locator.getColumnNumber()); + } else { + init(null, null, -1, -1); + } } - - + + /** * Create a new SAXParseException. * @@ -114,13 +114,13 @@ public class SAXParseException extends SAXException { * cause the error or warning. */ public SAXParseException (String message, String publicId, String systemId, - int lineNumber, int columnNumber) + int lineNumber, int columnNumber) { - super(message); - init(publicId, systemId, lineNumber, columnNumber); + super(message); + init(publicId, systemId, lineNumber, columnNumber); } - - + + /** * Create a new SAXParseException with an embedded exception. * @@ -146,10 +146,10 @@ public class SAXParseException extends SAXException { * @param e Another exception to embed in this one. */ public SAXParseException (String message, String publicId, String systemId, - int lineNumber, int columnNumber, Exception e) + int lineNumber, int columnNumber, Exception e) { - super(message, e); - init(publicId, systemId, lineNumber, columnNumber); + super(message, e); + init(publicId, systemId, lineNumber, columnNumber); } @@ -164,15 +164,15 @@ public class SAXParseException extends SAXException { * @param columnNumber The column number of the error, or -1. */ private void init (String publicId, String systemId, - int lineNumber, int columnNumber) + int lineNumber, int columnNumber) { - this.publicId = publicId; - this.systemId = systemId; - this.lineNumber = lineNumber; - this.columnNumber = columnNumber; + this.publicId = publicId; + this.systemId = systemId; + this.lineNumber = lineNumber; + this.columnNumber = columnNumber; } - - + + /** * Get the public identifier of the entity where the exception occurred. * @@ -182,10 +182,10 @@ public class SAXParseException extends SAXException { */ public String getPublicId () { - return this.publicId; + return this.publicId; } - - + + /** * Get the system identifier of the entity where the exception occurred. * @@ -198,10 +198,10 @@ public class SAXParseException extends SAXException { */ public String getSystemId () { - return this.systemId; + return this.systemId; } - - + + /** * The line number of the end of the text where the exception occurred. * @@ -213,10 +213,10 @@ public class SAXParseException extends SAXException { */ public int getLineNumber () { - return this.lineNumber; + return this.lineNumber; } - - + + /** * The column number of the end of the text where the exception occurred. * @@ -228,10 +228,10 @@ public class SAXParseException extends SAXException { */ public int getColumnNumber () { - return this.columnNumber; + return this.columnNumber; } - - + + ////////////////////////////////////////////////////////////////////// // Internal state. ////////////////////////////////////////////////////////////////////// @@ -240,7 +240,7 @@ public class SAXParseException extends SAXException { /** * @serial The public identifier, or null. * @see #getPublicId - */ + */ private String publicId; @@ -263,7 +263,7 @@ public class SAXParseException extends SAXException { * @see #getColumnNumber */ private int columnNumber; - + } // end of SAXParseException.java diff --git a/libjava/classpath/external/sax/org/xml/sax/XMLReader.java b/libjava/classpath/external/sax/org/xml/sax/XMLReader.java index 92d0a94e3d1..d334f03fbfd 100644 --- a/libjava/classpath/external/sax/org/xml/sax/XMLReader.java +++ b/libjava/classpath/external/sax/org/xml/sax/XMLReader.java @@ -19,9 +19,9 @@ import java.io.IOException; * for further information. * * - *

    Note: despite its name, this interface does - * not extend the standard Java {@link java.io.Reader Reader} - * interface, because reading XML is a fundamentally different activity + *

    Note: despite its name, this interface does + * not extend the standard Java {@link java.io.Reader Reader} + * interface, because reading XML is a fundamentally different activity * than reading character data.

    * *

    XMLReader is the interface that an XML parser's SAX2 driver must @@ -41,7 +41,7 @@ import java.io.IOException; * interface (as well as some minor ones):

    * *
      - *
    1. it adds a standard way to query and set features and + *
    2. it adds a standard way to query and set features and * properties; and
      3. *
    3. it adds Namespace support, which is required for many * higher-level XML standards.
      4. @@ -55,12 +55,12 @@ import java.io.IOException; * @version 2.0.1+ (sax2r3pre1) * @see org.xml.sax.XMLFilter * @see org.xml.sax.helpers.ParserAdapter - * @see org.xml.sax.helpers.XMLReaderAdapter + * @see org.xml.sax.helpers.XMLReaderAdapter */ public interface XMLReader { - + //////////////////////////////////////////////////////////////////// // Configuration. //////////////////////////////////////////////////////////////////// @@ -93,7 +93,7 @@ public interface XMLReader * try { * r.setFeature("http://xml.org/sax/features/validation", true); * } catch (SAXException e) { - * System.err.println("Cannot activate validation."); + * System.err.println("Cannot activate validation."); * } * * // register event handlers @@ -118,7 +118,7 @@ public interface XMLReader * @exception org.xml.sax.SAXNotRecognizedException If the feature * value can't be assigned or retrieved. * @exception org.xml.sax.SAXNotSupportedException When the - * XMLReader recognizes the feature name but + * XMLReader recognizes the feature name but * cannot determine its value at this time. * @see #setFeature */ @@ -132,8 +132,8 @@ public interface XMLReader *

      The feature name is any fully-qualified URI. It is * possible for an XMLReader to expose a feature value but * to be unable to change the current value. - * Some feature values may be immutable or mutable only - * in specific contexts, such as before, during, or after + * Some feature values may be immutable or mutable only + * in specific contexts, such as before, during, or after * a parse.

      * *

      All XMLReaders are required to support setting @@ -145,12 +145,12 @@ public interface XMLReader * @exception org.xml.sax.SAXNotRecognizedException If the feature * value can't be assigned or retrieved. * @exception org.xml.sax.SAXNotSupportedException When the - * XMLReader recognizes the feature name but + * XMLReader recognizes the feature name but * cannot set the requested value. * @see #getFeature */ public void setFeature (String name, boolean value) - throws SAXNotRecognizedException, SAXNotSupportedException; + throws SAXNotRecognizedException, SAXNotSupportedException; /** @@ -174,12 +174,12 @@ public interface XMLReader * @exception org.xml.sax.SAXNotRecognizedException If the property * value can't be assigned or retrieved. * @exception org.xml.sax.SAXNotSupportedException When the - * XMLReader recognizes the property name but + * XMLReader recognizes the property name but * cannot determine its value at this time. * @see #setProperty */ public Object getProperty (String name) - throws SAXNotRecognizedException, SAXNotSupportedException; + throws SAXNotRecognizedException, SAXNotSupportedException; /** @@ -188,12 +188,12 @@ public interface XMLReader *

      The property name is any fully-qualified URI. It is * possible for an XMLReader to recognize a property name but * to be unable to change the current value. - * Some property values may be immutable or mutable only - * in specific contexts, such as before, during, or after + * Some property values may be immutable or mutable only + * in specific contexts, such as before, during, or after * a parse.

      * *

      XMLReaders are not required to recognize setting - * any specific property names, though a core set is defined by + * any specific property names, though a core set is defined by * SAX2.

      * *

      This method is also the standard mechanism for setting @@ -204,14 +204,14 @@ public interface XMLReader * @exception org.xml.sax.SAXNotRecognizedException If the property * value can't be assigned or retrieved. * @exception org.xml.sax.SAXNotSupportedException When the - * XMLReader recognizes the property name but + * XMLReader recognizes the property name but * cannot set the requested value. */ public void setProperty (String name, Object value) - throws SAXNotRecognizedException, SAXNotSupportedException; + throws SAXNotRecognizedException, SAXNotSupportedException; + - //////////////////////////////////////////////////////////////////// // Event handlers. //////////////////////////////////////////////////////////////////// @@ -325,7 +325,7 @@ public interface XMLReader public ErrorHandler getErrorHandler (); - + //////////////////////////////////////////////////////////////////// // Parsing. //////////////////////////////////////////////////////////////////// @@ -355,7 +355,7 @@ public interface XMLReader * handlers.

      * *

      This method is synchronous: it will not return until parsing - * has ended. If a client application wants to terminate + * has ended. If a client application wants to terminate * parsing early, it should throw an exception.

      * * @param input The input source for the top-level of the @@ -370,10 +370,10 @@ public interface XMLReader * @see #setEntityResolver * @see #setDTDHandler * @see #setContentHandler - * @see #setErrorHandler + * @see #setErrorHandler */ public void parse (InputSource input) - throws IOException, SAXException; + throws IOException, SAXException; /** @@ -399,6 +399,6 @@ public interface XMLReader * @see #parse(org.xml.sax.InputSource) */ public void parse (String systemId) - throws IOException, SAXException; + throws IOException, SAXException; } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java index 5c839bd1acf..a814d9de31b 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2.java @@ -46,7 +46,7 @@ public interface Attributes2 extends Attributes * * @param index The attribute index (zero-based). * @return true if the attribute was declared in the DTD, - * false otherwise. + * false otherwise. * @exception java.lang.ArrayIndexOutOfBoundsException When the * supplied index does not identify an attribute. */ @@ -60,7 +60,7 @@ public interface Attributes2 extends Attributes * * @param qName The XML qualified (prefixed) name. * @return true if the attribute was declared in the DTD, - * false otherwise. + * false otherwise. * @exception java.lang.IllegalArgumentException When the * supplied name does not identify an attribute. */ @@ -81,7 +81,7 @@ public interface Attributes2 extends Attributes * the name has no Namespace URI. * @param localName The attribute's local name. * @return true if the attribute was declared in the DTD, - * false otherwise. + * false otherwise. * @exception java.lang.IllegalArgumentException When the * supplied names do not identify an attribute. */ @@ -93,7 +93,7 @@ public interface Attributes2 extends Attributes * * @param index The attribute index (zero-based). * @return true if the value was found in the XML text, - * false if the value was provided by DTD defaulting. + * false if the value was provided by DTD defaulting. * @exception java.lang.ArrayIndexOutOfBoundsException When the * supplied index does not identify an attribute. */ @@ -112,7 +112,7 @@ public interface Attributes2 extends Attributes * the name has no Namespace URI. * @param localName The attribute's local name. * @return true if the value was found in the XML text, - * false if the value was provided by DTD defaulting. + * false if the value was provided by DTD defaulting. * @exception java.lang.IllegalArgumentException When the * supplied names do not identify an attribute. */ @@ -124,7 +124,7 @@ public interface Attributes2 extends Attributes * * @param qName The XML qualified (prefixed) name. * @return true if the value was found in the XML text, - * false if the value was provided by DTD defaulting. + * false if the value was provided by DTD defaulting. * @exception java.lang.IllegalArgumentException When the * supplied name does not identify an attribute. */ diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java index 485a5d6ac44..08225593307 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java @@ -28,7 +28,7 @@ import org.xml.sax.helpers.AttributesImpl; * is false), non-CDATA attributes, or when it is set to true using * {@link #setDeclared}. * If you change an attribute's type by hand, you may need to modify - * its declared flag to match. + * its declared flag to match. *

      * * @since SAX 2.0 (extensions 1.1 alpha) @@ -37,8 +37,8 @@ import org.xml.sax.helpers.AttributesImpl; */ public class Attributes2Impl extends AttributesImpl implements Attributes2 { - private boolean declared []; - private boolean specified []; + private boolean declared []; + private boolean specified []; /** @@ -63,7 +63,7 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public Attributes2Impl (Attributes atts) { - super (atts); + super (atts); } @@ -78,10 +78,10 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 // javadoc mostly from interface public boolean isDeclared (int index) { - if (index < 0 || index >= getLength ()) - throw new ArrayIndexOutOfBoundsException ( - "No attribute at index: " + index); - return declared [index]; + if (index < 0 || index >= getLength ()) + throw new ArrayIndexOutOfBoundsException ( + "No attribute at index: " + index); + return declared [index]; } @@ -91,13 +91,13 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 // javadoc mostly from interface public boolean isDeclared (String uri, String localName) { - int index = getIndex (uri, localName); + int index = getIndex (uri, localName); - if (index < 0) - throw new IllegalArgumentException ( - "No such attribute: local=" + localName - + ", namespace=" + uri); - return declared [index]; + if (index < 0) + throw new IllegalArgumentException ( + "No such attribute: local=" + localName + + ", namespace=" + uri); + return declared [index]; } @@ -107,12 +107,12 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 // javadoc mostly from interface public boolean isDeclared (String qName) { - int index = getIndex (qName); + int index = getIndex (qName); - if (index < 0) - throw new IllegalArgumentException ( - "No such attribute: " + qName); - return declared [index]; + if (index < 0) + throw new IllegalArgumentException ( + "No such attribute: " + qName); + return declared [index]; } @@ -126,10 +126,10 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public boolean isSpecified (int index) { - if (index < 0 || index >= getLength ()) - throw new ArrayIndexOutOfBoundsException ( - "No attribute at index: " + index); - return specified [index]; + if (index < 0 || index >= getLength ()) + throw new ArrayIndexOutOfBoundsException ( + "No attribute at index: " + index); + return specified [index]; } @@ -145,13 +145,13 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public boolean isSpecified (String uri, String localName) { - int index = getIndex (uri, localName); + int index = getIndex (uri, localName); - if (index < 0) - throw new IllegalArgumentException ( - "No such attribute: local=" + localName - + ", namespace=" + uri); - return specified [index]; + if (index < 0) + throw new IllegalArgumentException ( + "No such attribute: local=" + localName + + ", namespace=" + uri); + return specified [index]; } @@ -165,12 +165,12 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public boolean isSpecified (String qName) { - int index = getIndex (qName); + int index = getIndex (qName); - if (index < 0) - throw new IllegalArgumentException ( - "No such attribute: " + qName); - return specified [index]; + if (index < 0) + throw new IllegalArgumentException ( + "No such attribute: " + qName); + return specified [index]; } @@ -190,24 +190,24 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public void setAttributes (Attributes atts) { - int length = atts.getLength (); + int length = atts.getLength (); - super.setAttributes (atts); - declared = new boolean [length]; - specified = new boolean [length]; + super.setAttributes (atts); + declared = new boolean [length]; + specified = new boolean [length]; - if (atts instanceof Attributes2) { - Attributes2 a2 = (Attributes2) atts; - for (int i = 0; i < length; i++) { - declared [i] = a2.isDeclared (i); - specified [i] = a2.isSpecified (i); - } - } else { - for (int i = 0; i < length; i++) { - declared [i] = !"CDATA".equals (atts.getType (i)); - specified [i] = true; - } - } + if (atts instanceof Attributes2) { + Attributes2 a2 = (Attributes2) atts; + for (int i = 0; i < length; i++) { + declared [i] = a2.isDeclared (i); + specified [i] = a2.isSpecified (i); + } + } else { + for (int i = 0; i < length; i++) { + declared [i] = !"CDATA".equals (atts.getType (i)); + specified [i] = true; + } + } } @@ -223,41 +223,41 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 * @see AttributesImpl#addAttribute */ public void addAttribute (String uri, String localName, String qName, - String type, String value) + String type, String value) { - super.addAttribute (uri, localName, qName, type, value); + super.addAttribute (uri, localName, qName, type, value); - int length = getLength (); + int length = getLength (); - if (length < specified.length) { - boolean newFlags []; + if (length < specified.length) { + boolean newFlags []; - newFlags = new boolean [length]; - System.arraycopy (declared, 0, newFlags, 0, declared.length); - declared = newFlags; + newFlags = new boolean [length]; + System.arraycopy (declared, 0, newFlags, 0, declared.length); + declared = newFlags; - newFlags = new boolean [length]; - System.arraycopy (specified, 0, newFlags, 0, specified.length); - specified = newFlags; - } + newFlags = new boolean [length]; + System.arraycopy (specified, 0, newFlags, 0, specified.length); + specified = newFlags; + } - specified [length - 1] = true; - declared [length - 1] = !"CDATA".equals (type); + specified [length - 1] = true; + declared [length - 1] = !"CDATA".equals (type); } // javadoc entirely from superclass public void removeAttribute (int index) { - int origMax = getLength () - 1; + int origMax = getLength () - 1; - super.removeAttribute (index); - if (index != origMax) { - System.arraycopy (declared, index + 1, declared, index, - origMax - index); - System.arraycopy (specified, index + 1, specified, index, - origMax - index); - } + super.removeAttribute (index); + if (index != origMax) { + System.arraycopy (declared, index + 1, declared, index, + origMax - index); + System.arraycopy (specified, index + 1, specified, index, + origMax - index); + } } @@ -274,10 +274,10 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public void setDeclared (int index, boolean value) { - if (index < 0 || index >= getLength ()) - throw new ArrayIndexOutOfBoundsException ( - "No attribute at index: " + index); - declared [index] = value; + if (index < 0 || index >= getLength ()) + throw new ArrayIndexOutOfBoundsException ( + "No attribute at index: " + index); + declared [index] = value; } @@ -293,9 +293,9 @@ public class Attributes2Impl extends AttributesImpl implements Attributes2 */ public void setSpecified (int index, boolean value) { - if (index < 0 || index >= getLength ()) - throw new ArrayIndexOutOfBoundsException ( - "No attribute at index: " + index); - specified [index] = value; + if (index < 0 || index >= getLength ()) + throw new ArrayIndexOutOfBoundsException ( + "No attribute at index: " + index); + specified [index] = value; } } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java b/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java index 1bb4dea4a41..42d92269f6f 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/DeclHandler.java @@ -54,9 +54,9 @@ public interface DeclHandler *

      The content model will consist of the string "EMPTY", the * string "ANY", or a parenthesised group, optionally followed * by an occurrence indicator. The model will be normalized so - * that all parameter entities are fully resolved and all whitespace + * that all parameter entities are fully resolved and all whitespace * is removed,and will include the enclosing parentheses. Other - * normalization (such as removing redundant parentheses or + * normalization (such as removing redundant parentheses or * simplifying occurrence indicators) is at the discretion of the * parser.

      * @@ -65,7 +65,7 @@ public interface DeclHandler * @exception SAXException The application may raise an exception. */ public abstract void elementDecl (String name, String model) - throws SAXException; + throws SAXException; /** @@ -74,7 +74,7 @@ public interface DeclHandler *

      Only the effective (first) declaration for an attribute will * be reported. The type will be one of the strings "CDATA", * "ID", "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", - * "ENTITIES", a parenthesized token group with + * "ENTITIES", a parenthesized token group with * the separator "|" and all whitespace removed, or the word * "NOTATION" followed by a space followed by a parenthesized * token group with all whitespace removed.

      @@ -94,11 +94,11 @@ public interface DeclHandler * @exception SAXException The application may raise an exception. */ public abstract void attributeDecl (String eName, - String aName, - String type, - String mode, - String value) - throws SAXException; + String aName, + String type, + String mode, + String value) + throws SAXException; /** @@ -116,7 +116,7 @@ public interface DeclHandler * @see org.xml.sax.DTDHandler#unparsedEntityDecl */ public abstract void internalEntityDecl (String name, String value) - throws SAXException; + throws SAXException; /** @@ -138,8 +138,8 @@ public interface DeclHandler * @see org.xml.sax.DTDHandler#unparsedEntityDecl */ public abstract void externalEntityDecl (String name, String publicId, - String systemId) - throws SAXException; + String systemId) + throws SAXException; } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java b/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java index 2b792e9df24..bf47ea889df 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java @@ -45,52 +45,52 @@ public class DefaultHandler2 extends DefaultHandler public void startCDATA () throws SAXException - {} + {} public void endCDATA () throws SAXException - {} + {} public void startDTD (String name, String publicId, String systemId) throws SAXException - {} + {} public void endDTD () throws SAXException - {} + {} public void startEntity (String name) throws SAXException - {} + {} public void endEntity (String name) throws SAXException - {} + {} public void comment (char ch [], int start, int length) throws SAXException - { } + { } // SAX2 ext-1.0 DeclHandler public void attributeDecl (String eName, String aName, - String type, String mode, String value) + String type, String mode, String value) throws SAXException - {} + {} public void elementDecl (String name, String model) throws SAXException - {} + {} public void externalEntityDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException - {} + {} public void internalEntityDecl (String name, String value) throws SAXException - {} + {} // SAX2 ext-1.1 EntityResolver2 @@ -100,22 +100,22 @@ public class DefaultHandler2 extends DefaultHandler */ public InputSource getExternalSubset (String name, String baseURI) throws SAXException, IOException - { return null; } + { return null; } /** * Tells the parser to resolve the systemId against the baseURI * and read the entity text from that resulting absolute URI. * Note that because the older * {@link DefaultHandler#resolveEntity DefaultHandler.resolveEntity()}, - * method is overridden to call this one, this method may sometimes + * method is overridden to call this one, this method may sometimes * be invoked with null name and baseURI, and * with the systemId already absolutized. */ public InputSource resolveEntity (String name, String publicId, - String baseURI, String systemId) + String baseURI, String systemId) throws SAXException, IOException - { return null; } - + { return null; } + // SAX1 EntityResolver /** @@ -126,5 +126,5 @@ public class DefaultHandler2 extends DefaultHandler */ public InputSource resolveEntity (String publicId, String systemId) throws SAXException, IOException - { return resolveEntity (null, publicId, null, systemId); } + { return resolveEntity (null, publicId, null, systemId); } } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java b/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java index 1936f7e0421..96dcf6779b7 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java @@ -108,28 +108,28 @@ public interface EntityResolver2 extends EntityResolver * that attributes are handled consistently. * For example, an XPath processor needs to know which attibutes have * type "ID" before it can process a widely used type of reference.

      - * + * *

      Warning: Returning an external subset modifies * the input document. By providing definitions for general entities, * it can make a malformed document appear to be well formed. *

      * * @param name Identifies the document root element. This name comes - * from a DOCTYPE declaration (where available) or from the actual - * root element. + * from a DOCTYPE declaration (where available) or from the actual + * root element. * @param baseURI The document's base URI, serving as an additional - * hint for selecting the external subset. This is always an absolute - * URI, unless it is null because the XMLReader was given an InputSource - * without one. + * hint for selecting the external subset. This is always an absolute + * URI, unless it is null because the XMLReader was given an InputSource + * without one. * * @return An InputSource object describing the new external subset - * to be used by the parser, or null to indicate that no external - * subset is provided. + * to be used by the parser, or null to indicate that no external + * subset is provided. * * @exception SAXException Any SAX exception, possibly wrapping - * another exception. + * another exception. * @exception IOException Probably indicating a failure to create - * a new InputStream or Reader, or an illegal URL. + * a new InputStream or Reader, or an illegal URL. */ public InputSource getExternalSubset (String name, String baseURI) throws SAXException, IOException; @@ -142,8 +142,8 @@ public interface EntityResolver2 extends EntityResolver * This method provides more flexibility than the {@link EntityResolver} * interface, supporting implementations of more complex catalogue * schemes such as the one defined by the OASIS XML Catalogs specification.

      + "http://www.oasis-open.org/committees/entity/spec-2001-08-06.html" + >OASIS XML Catalogs specification.

      * *

      Parsers configured to use this resolver method will call it * to determine the input source to use for any external entity @@ -156,42 +156,42 @@ public interface EntityResolver2 extends EntityResolver * *

      Note that the entity naming scheme used here is the same one * used in the {@link LexicalHandler}, or in the {@link - org.xml.sax.ContentHandler#skippedEntity - ContentHandler.skippedEntity()} + org.xml.sax.ContentHandler#skippedEntity + ContentHandler.skippedEntity()} * method.

      * * @param name Identifies the external entity being resolved. - * Either "[dtd]" for the external subset, or a name starting - * with "%" to indicate a parameter entity, or else the name of - * a general entity. This is never null when invoked by a SAX2 - * parser. + * Either "[dtd]" for the external subset, or a name starting + * with "%" to indicate a parameter entity, or else the name of + * a general entity. This is never null when invoked by a SAX2 + * parser. * @param publicId The public identifier of the external entity being - * referenced (normalized as required by the XML specification), or - * null if none was supplied. + * referenced (normalized as required by the XML specification), or + * null if none was supplied. * @param baseURI The URI with respect to which relative systemIDs - * are interpreted. This is always an absolute URI, unless it is - * null (likely because the XMLReader was given an InputSource without + * are interpreted. This is always an absolute URI, unless it is + * null (likely because the XMLReader was given an InputSource without * one). This URI is defined by the XML specification to be the one - * associated with the "<" starting the relevant declaration. + * associated with the "<" starting the relevant declaration. * @param systemId The system identifier of the external entity - * being referenced; either a relative or absolute URI. + * being referenced; either a relative or absolute URI. * This is never null when invoked by a SAX2 parser; only declared - * entities, and any external subset, are resolved by such parsers. + * entities, and any external subset, are resolved by such parsers. * * @return An InputSource object describing the new input source to - * be used by the parser. Returning null directs the parser to - * resolve the system ID against the base URI and open a connection - * to resulting URI. + * be used by the parser. Returning null directs the parser to + * resolve the system ID against the base URI and open a connection + * to resulting URI. * * @exception SAXException Any SAX exception, possibly wrapping - * another exception. + * another exception. * @exception IOException Probably indicating a failure to create - * a new InputStream or Reader, or an illegal URL. + * a new InputStream or Reader, or an illegal URL. */ public InputSource resolveEntity ( - String name, - String publicId, - String baseURI, - String systemId + String name, + String publicId, + String baseURI, + String systemId ) throws SAXException, IOException; } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java b/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java index 076bdf857c2..376d1c8d005 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java @@ -51,7 +51,7 @@ public interface LexicalHandler * DOCTYPE declaration; if the document has no DOCTYPE declaration, * this method will not be invoked.

      * - *

      All declarations reported through + *

      All declarations reported through * {@link org.xml.sax.DTDHandler DTDHandler} or * {@link org.xml.sax.ext.DeclHandler DeclHandler} events must appear * between the startDTD and {@link #endDTD endDTD} events. @@ -59,14 +59,14 @@ public interface LexicalHandler * unless they appear between {@link #startEntity startEntity} * and {@link #endEntity endEntity} events. Comments and * processing instructions from the DTD should also be reported - * between the startDTD and endDTD events, in their original + * between the startDTD and endDTD events, in their original * order of (logical) occurrence; they are not required to * appear in their correct locations relative to DTDHandler * or DeclHandler events, however.

      * *

      Note that the start/endDTD events will appear within * the start/endDocument events from ContentHandler and - * before the first + * before the first * {@link org.xml.sax.ContentHandler#startElement startElement} * event.

      * @@ -83,8 +83,8 @@ public interface LexicalHandler * @see #startEntity */ public abstract void startDTD (String name, String publicId, - String systemId) - throws SAXException; + String systemId) + throws SAXException; /** @@ -98,7 +98,7 @@ public interface LexicalHandler * @see #startDTD */ public abstract void endDTD () - throws SAXException; + throws SAXException; /** @@ -112,12 +112,12 @@ public interface LexicalHandler * feature to query or control the reporting of parameter entities.

      * *

      General entities are reported with their regular names, - * parameter entities have '%' prepended to their names, and + * parameter entities have '%' prepended to their names, and * the external DTD subset has the pseudo-entity name "[dtd]".

      * - *

      When a SAX2 driver is providing these events, all other - * events must be properly nested within start/end entity - * events. There is no additional requirement that events from + *

      When a SAX2 driver is providing these events, all other + * events must be properly nested within start/end entity + * events. There is no additional requirement that events from * {@link org.xml.sax.ext.DeclHandler DeclHandler} or * {@link org.xml.sax.DTDHandler DTDHandler} be properly ordered.

      * @@ -126,7 +126,7 @@ public interface LexicalHandler * event, which is part of the ContentHandler interface.

      * *

      Because of the streaming event model that SAX uses, some - * entity boundaries cannot be reported under any + * entity boundaries cannot be reported under any * circumstances:

      * *
        @@ -148,10 +148,10 @@ public interface LexicalHandler * @exception SAXException The application may raise an exception. * @see #endEntity * @see org.xml.sax.ext.DeclHandler#internalEntityDecl - * @see org.xml.sax.ext.DeclHandler#externalEntityDecl + * @see org.xml.sax.ext.DeclHandler#externalEntityDecl */ public abstract void startEntity (String name) - throws SAXException; + throws SAXException; /** @@ -162,7 +162,7 @@ public interface LexicalHandler * @see #startEntity */ public abstract void endEntity (String name) - throws SAXException; + throws SAXException; /** @@ -177,7 +177,7 @@ public interface LexicalHandler * @see #endCDATA */ public abstract void startCDATA () - throws SAXException; + throws SAXException; /** @@ -187,7 +187,7 @@ public interface LexicalHandler * @see #startCDATA */ public abstract void endCDATA () - throws SAXException; + throws SAXException; /** @@ -205,7 +205,7 @@ public interface LexicalHandler * @exception SAXException The application may raise an exception. */ public abstract void comment (char ch[], int start, int length) - throws SAXException; + throws SAXException; } diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java index 5fe3ba7706a..b186d3a282c 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2.java @@ -9,7 +9,7 @@ import org.xml.sax.Locator; /** - * SAX2 extension to augment the entity information provided + * SAX2 extension to augment the entity information provided * though a {@link Locator}. * If an implementation supports this extension, the Locator * provided in {@link org.xml.sax.ContentHandler#setDocumentLocator diff --git a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java index f0b35459dba..d3c7511144f 100644 --- a/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java +++ b/libjava/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java @@ -26,8 +26,8 @@ import org.xml.sax.helpers.LocatorImpl; */ public class Locator2Impl extends LocatorImpl implements Locator2 { - private String encoding; - private String version; + private String encoding; + private String version; /** @@ -41,32 +41,32 @@ public class Locator2Impl extends LocatorImpl implements Locator2 * Copy an existing Locator or Locator2 object. * If the object implements Locator2, values of the * encoding and versionstrings are copied, - * otherwise they set to null. + * otherwise they set to null. * * @param locator The existing Locator object. */ public Locator2Impl (Locator locator) { - super (locator); - if (locator instanceof Locator2) { - Locator2 l2 = (Locator2) locator; + super (locator); + if (locator instanceof Locator2) { + Locator2 l2 = (Locator2) locator; - version = l2.getXMLVersion (); - encoding = l2.getEncoding (); - } + version = l2.getXMLVersion (); + encoding = l2.getEncoding (); + } } //////////////////////////////////////////////////////////////////// // Locator2 method implementations //////////////////////////////////////////////////////////////////// - + /** * Returns the current value of the version property. * * @see #setXMLVersion */ public String getXMLVersion () - { return version; } + { return version; } /** * Returns the current value of the encoding property. @@ -74,13 +74,13 @@ public class Locator2Impl extends LocatorImpl implements Locator2 * @see #setEncoding */ public String getEncoding () - { return encoding; } + { return encoding; } //////////////////////////////////////////////////////////////////// - // Setters + // Setters //////////////////////////////////////////////////////////////////// - + /** * Assigns the current value of the version property. * @@ -88,7 +88,7 @@ public class Locator2Impl extends LocatorImpl implements Locator2 * @see #getXMLVersion */ public void setXMLVersion (String version) - { this.version = version; } + { this.version = version; } /** * Assigns the current value of the encoding property. @@ -97,5 +97,5 @@ public class Locator2Impl extends LocatorImpl implements Locator2 * @see #getEncoding */ public void setEncoding (String encoding) - { this.encoding = encoding; } + { this.encoding = encoding; } } diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java index ca859fb1450..decf3abc199 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java @@ -26,10 +26,10 @@ import java.util.Vector; * AttributesImpl} interface.

        * *

        This class provides a convenience implementation of the SAX - * {@link org.xml.sax.AttributeList AttributeList} interface. This - * implementation is useful both for SAX parser writers, who can use - * it to provide attributes to the application, and for SAX application - * writers, who can use it to create a persistent copy of an element's + * {@link org.xml.sax.AttributeList AttributeList} interface. This + * implementation is useful both for SAX parser writers, who can use + * it to provide attributes to the application, and for SAX application + * writers, who can use it to create a persistent copy of an element's * attribute specifications:

        * * 
        @@ -46,7 +46,7 @@ import java.util.Vector;
  *
  * 
        Please note that SAX parsers are not required to use this
  * class to provide an implementation of AttributeList; it is
- * supplied only as an optional convenience.  In particular, 
+ * supplied only as an optional convenience.  In particular,
  * parser writers are encouraged to invent more efficient
  * implementations.
        
  *
@@ -55,17 +55,17 @@ import java.util.Vector;
  *             that interface has been replaced by
  *             {@link org.xml.sax.Attributes Attributes},
  *             which is implemented in the
- *             {@link org.xml.sax.helpers.AttributesImpl 
+ *             {@link org.xml.sax.helpers.AttributesImpl
  *            AttributesImpl} helper class.
  * @since SAX 1.0
  * @author David Megginson
  * @version 2.0.1 (sax2r2)
  * @see org.xml.sax.AttributeList
- * @see org.xml.sax.DocumentHandler#startElement 
+ * @see org.xml.sax.DocumentHandler#startElement
  */
 public class AttributeListImpl implements AttributeList
 {
-    
+
     /**
      * Create an empty attribute list.
      *
@@ -79,8 +79,8 @@ public class AttributeListImpl implements AttributeList
     public AttributeListImpl ()
     {
     }
-    
-    
+
+
     /**
      * Construct a persistent copy of an existing attribute list.
      *
@@ -93,16 +93,16 @@ public class AttributeListImpl implements AttributeList
      */
     public AttributeListImpl (AttributeList atts)
     {
-	setAttributeList(atts);
+        setAttributeList(atts);
     }
-    
-    
-
+
+
+
     ////////////////////////////////////////////////////////////////////
     // Methods specific to this class.
     ////////////////////////////////////////////////////////////////////
-    
-    
+
+
     /**
      * Set the attribute list, discarding previous contents.
      *
@@ -113,16 +113,16 @@ public class AttributeListImpl implements AttributeList
      */
     public void setAttributeList (AttributeList atts)
     {
-	int count = atts.getLength();
-	
-	clear();
-	
-	for (int i = 0; i < count; i++) {
-	    addAttribute(atts.getName(i), atts.getType(i), atts.getValue(i));
-	}
+        int count = atts.getLength();
+
+        clear();
+
+        for (int i = 0; i < count; i++) {
+            addAttribute(atts.getName(i), atts.getType(i), atts.getValue(i));
+        }
     }
-    
-    
+
+
     /**
      * Add an attribute to an attribute list.
      *
@@ -138,12 +138,12 @@ public class AttributeListImpl implements AttributeList
      */
     public void addAttribute (String name, String type, String value)
     {
-	names.addElement(name);
-	types.addElement(type);
-	values.addElement(value);
+        names.addElement(name);
+        types.addElement(type);
+        values.addElement(value);
     }
-    
-    
+
+
     /**
      * Remove an attribute from the list.
      *
@@ -160,16 +160,16 @@ public class AttributeListImpl implements AttributeList
      */
     public void removeAttribute (String name)
     {
-	int i = names.indexOf(name);
-	
-	if (i >= 0) {
-	    names.removeElementAt(i);
-	    types.removeElementAt(i);
-	    values.removeElementAt(i);
-	}
+        int i = names.indexOf(name);
+
+        if (i >= 0) {
+            names.removeElementAt(i);
+            types.removeElementAt(i);
+            values.removeElementAt(i);
+        }
     }
-    
-    
+
+
     /**
      * Clear the attribute list.
      *
@@ -182,18 +182,18 @@ public class AttributeListImpl implements AttributeList
      */
     public void clear ()
     {
-	names.removeAllElements();
-	types.removeAllElements();
-	values.removeAllElements();
+        names.removeAllElements();
+        types.removeAllElements();
+        values.removeAllElements();
     }
-    
-    
-
+
+
+
     ////////////////////////////////////////////////////////////////////
     // Implementation of org.xml.sax.AttributeList
     ////////////////////////////////////////////////////////////////////
-    
-    
+
+
     /**
      * Return the number of attributes in the list.
      *
@@ -202,10 +202,10 @@ public class AttributeListImpl implements AttributeList
      */
     public int getLength ()
     {
-	return names.size();
+        return names.size();
     }
-    
-    
+
+
     /**
      * Get the name of an attribute (by position).
      *
@@ -216,17 +216,17 @@ public class AttributeListImpl implements AttributeList
      */
     public String getName (int i)
     {
-	if (i < 0) {
-	    return null;
-	}
-	try {
-	    return (String)names.elementAt(i);
-	} catch (ArrayIndexOutOfBoundsException e) {
-	    return null;
-	}
+        if (i < 0) {
+            return null;
+        }
+        try {
+            return (String)names.elementAt(i);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
     }
-    
-    
+
+
     /**
      * Get the type of an attribute (by position).
      *
@@ -239,17 +239,17 @@ public class AttributeListImpl implements AttributeList
      */
     public String getType (int i)
     {
-	if (i < 0) {
-	    return null;
-	}
-	try {
-	    return (String)types.elementAt(i);
-	} catch (ArrayIndexOutOfBoundsException e) {
-	    return null;
-	}
+        if (i < 0) {
+            return null;
+        }
+        try {
+            return (String)types.elementAt(i);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
     }
-    
-    
+
+
     /**
      * Get the value of an attribute (by position).
      *
@@ -260,17 +260,17 @@ public class AttributeListImpl implements AttributeList
      */
     public String getValue (int i)
     {
-	if (i < 0) {
-	    return null;
-	}
-	try {
-	    return (String)values.elementAt(i);
-	} catch (ArrayIndexOutOfBoundsException e) {
-	    return null;
-	}
+        if (i < 0) {
+            return null;
+        }
+        try {
+            return (String)values.elementAt(i);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            return null;
+        }
     }
-    
-    
+
+
     /**
      * Get the type of an attribute (by name).
      *
@@ -282,10 +282,10 @@ public class AttributeListImpl implements AttributeList
      */
     public String getType (String name)
     {
-	return getType(names.indexOf(name));
+        return getType(names.indexOf(name));
     }
-    
-    
+
+
     /**
      * Get the value of an attribute (by name).
      *
@@ -294,11 +294,11 @@ public class AttributeListImpl implements AttributeList
      */
     public String getValue (String name)
     {
-	return getValue(names.indexOf(name));
+        return getValue(names.indexOf(name));
     }
-    
-    
-
+
+
+
     ////////////////////////////////////////////////////////////////////
     // Internal state.
     ////////////////////////////////////////////////////////////////////
diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
index 8753968ba0a..589b9209fae 100644
--- a/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
+++ b/libjava/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
@@ -20,8 +20,8 @@ import org.xml.sax.Attributes;
  * 
  *
  * 
        This class provides a default implementation of the SAX2
- * {@link org.xml.sax.Attributes Attributes} interface, with the 
- * addition of manipulators so that the list can be modified or 
+ * {@link org.xml.sax.Attributes Attributes} interface, with the
+ * addition of manipulators so that the list can be modified or
  * reused.
        
  *
  * 
        There are two typical uses of this class:
        
@@ -32,11 +32,11 @@ import org.xml.sax.Attributes;
  * 
      • to construct or modify an Attributes object in a SAX2 driver or filter.
        • 
  *
    * - *

    This class replaces the now-deprecated SAX1 {@link + *

    This class replaces the now-deprecated SAX1 {@link * org.xml.sax.helpers.AttributeListImpl AttributeListImpl} * class; in addition to supporting the updated Attributes * interface rather than the deprecated {@link org.xml.sax.AttributeList - * AttributeList} interface, it also includes a much more efficient + * AttributeList} interface, it also includes a much more efficient * implementation using a single array rather than a set of Vectors.

    * * @since SAX 2.0 @@ -46,7 +46,7 @@ import org.xml.sax.Attributes; public class AttributesImpl implements Attributes { - + //////////////////////////////////////////////////////////////////// // Constructors. //////////////////////////////////////////////////////////////////// @@ -57,8 +57,8 @@ public class AttributesImpl implements Attributes */ public AttributesImpl () { - length = 0; - data = null; + length = 0; + data = null; } @@ -72,11 +72,11 @@ public class AttributesImpl implements Attributes */ public AttributesImpl (Attributes atts) { - setAttributes(atts); + setAttributes(atts); } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.Attributes. //////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ public class AttributesImpl implements Attributes */ public int getLength () { - return length; + return length; } @@ -104,11 +104,11 @@ public class AttributesImpl implements Attributes */ public String getURI (int index) { - if (index >= 0 && index < length) { - return data[index*5]; - } else { - return null; - } + if (index >= 0 && index < length) { + return data[index*5]; + } else { + return null; + } } @@ -116,17 +116,17 @@ public class AttributesImpl implements Attributes * Return an attribute's local name. * * @param index The attribute's index (zero-based). - * @return The attribute's local name, the empty string if + * @return The attribute's local name, the empty string if * none is available, or null if the index if out of range. * @see org.xml.sax.Attributes#getLocalName */ public String getLocalName (int index) { - if (index >= 0 && index < length) { - return data[index*5+1]; - } else { - return null; - } + if (index >= 0 && index < length) { + return data[index*5+1]; + } else { + return null; + } } @@ -134,17 +134,17 @@ public class AttributesImpl implements Attributes * Return an attribute's qualified (prefixed) name. * * @param index The attribute's index (zero-based). - * @return The attribute's qualified name, the empty string if + * @return The attribute's qualified name, the empty string if * none is available, or null if the index is out of bounds. * @see org.xml.sax.Attributes#getQName */ public String getQName (int index) { - if (index >= 0 && index < length) { - return data[index*5+2]; - } else { - return null; - } + if (index >= 0 && index < length) { + return data[index*5+2]; + } else { + return null; + } } @@ -158,11 +158,11 @@ public class AttributesImpl implements Attributes */ public String getType (int index) { - if (index >= 0 && index < length) { - return data[index*5+3]; - } else { - return null; - } + if (index >= 0 && index < length) { + return data[index*5+3]; + } else { + return null; + } } @@ -175,11 +175,11 @@ public class AttributesImpl implements Attributes */ public String getValue (int index) { - if (index >= 0 && index < length) { - return data[index*5+4]; - } else { - return null; - } + if (index >= 0 && index < length) { + return data[index*5+4]; + } else { + return null; + } } @@ -198,13 +198,13 @@ public class AttributesImpl implements Attributes */ public int getIndex (String uri, String localName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i].equals(uri) && data[i+1].equals(localName)) { - return i / 5; - } - } - return -1; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return i / 5; + } + } + return -1; } @@ -217,13 +217,13 @@ public class AttributesImpl implements Attributes */ public int getIndex (String qName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i+2].equals(qName)) { - return i / 5; - } - } - return -1; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return i / 5; + } + } + return -1; } @@ -239,13 +239,13 @@ public class AttributesImpl implements Attributes */ public String getType (String uri, String localName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i].equals(uri) && data[i+1].equals(localName)) { - return data[i+3]; - } - } - return null; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return data[i+3]; + } + } + return null; } @@ -259,13 +259,13 @@ public class AttributesImpl implements Attributes */ public String getType (String qName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i+2].equals(qName)) { - return data[i+3]; - } - } - return null; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return data[i+3]; + } + } + return null; } @@ -281,13 +281,13 @@ public class AttributesImpl implements Attributes */ public String getValue (String uri, String localName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i].equals(uri) && data[i+1].equals(localName)) { - return data[i+4]; - } - } - return null; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return data[i+4]; + } + } + return null; } @@ -301,17 +301,17 @@ public class AttributesImpl implements Attributes */ public String getValue (String qName) { - int max = length * 5; - for (int i = 0; i < max; i += 5) { - if (data[i+2].equals(qName)) { - return data[i+4]; - } - } - return null; + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return data[i+4]; + } + } + return null; } - + //////////////////////////////////////////////////////////////////// // Manipulators. //////////////////////////////////////////////////////////////////// @@ -321,16 +321,16 @@ public class AttributesImpl implements Attributes * Clear the attribute list for reuse. * *

    Note that little memory is freed by this call: - * the current array is kept so it can be + * the current array is kept so it can be * reused.

    */ public void clear () { - if (data != null) { - for (int i = 0; i < (length * 5); i++) - data [i] = null; - } - length = 0; + if (data != null) { + for (int i = 0; i < (length * 5); i++) + data [i] = null; + } + length = 0; } @@ -339,7 +339,7 @@ public class AttributesImpl implements Attributes * *

    It may be more efficient to reuse an existing object * rather than constantly allocating new ones.

    - * + * * @param atts The attributes to copy. */ public void setAttributes (Attributes atts) @@ -355,7 +355,7 @@ public class AttributesImpl implements Attributes data[i*5+3] = atts.getType(i); data[i*5+4] = atts.getValue(i); } - } + } } @@ -377,15 +377,15 @@ public class AttributesImpl implements Attributes * @param value The attribute value. */ public void addAttribute (String uri, String localName, String qName, - String type, String value) + String type, String value) { - ensureCapacity(length+1); - data[length*5] = uri; - data[length*5+1] = localName; - data[length*5+2] = qName; - data[length*5+3] = type; - data[length*5+4] = value; - length++; + ensureCapacity(length+1); + data[length*5] = uri; + data[length*5+1] = localName; + data[length*5+2] = qName; + data[length*5+3] = type; + data[length*5+4] = value; + length++; } @@ -411,17 +411,17 @@ public class AttributesImpl implements Attributes * in the list. */ public void setAttribute (int index, String uri, String localName, - String qName, String type, String value) + String qName, String type, String value) { - if (index >= 0 && index < length) { - data[index*5] = uri; - data[index*5+1] = localName; - data[index*5+2] = qName; - data[index*5+3] = type; - data[index*5+4] = value; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5] = uri; + data[index*5+1] = localName; + data[index*5+2] = qName; + data[index*5+3] = type; + data[index*5+4] = value; + } else { + badIndex(index); + } } @@ -435,21 +435,21 @@ public class AttributesImpl implements Attributes */ public void removeAttribute (int index) { - if (index >= 0 && index < length) { - if (index < length - 1) { - System.arraycopy(data, (index+1)*5, data, index*5, - (length-index-1)*5); - } - index = (length - 1) * 5; - data [index++] = null; - data [index++] = null; - data [index++] = null; - data [index++] = null; - data [index] = null; - length--; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + if (index < length - 1) { + System.arraycopy(data, (index+1)*5, data, index*5, + (length-index-1)*5); + } + index = (length - 1) * 5; + data [index++] = null; + data [index++] = null; + data [index++] = null; + data [index++] = null; + data [index] = null; + length--; + } else { + badIndex(index); + } } @@ -465,11 +465,11 @@ public class AttributesImpl implements Attributes */ public void setURI (int index, String uri) { - if (index >= 0 && index < length) { - data[index*5] = uri; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5] = uri; + } else { + badIndex(index); + } } @@ -485,11 +485,11 @@ public class AttributesImpl implements Attributes */ public void setLocalName (int index, String localName) { - if (index >= 0 && index < length) { - data[index*5+1] = localName; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5+1] = localName; + } else { + badIndex(index); + } } @@ -505,11 +505,11 @@ public class AttributesImpl implements Attributes */ public void setQName (int index, String qName) { - if (index >= 0 && index < length) { - data[index*5+2] = qName; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5+2] = qName; + } else { + badIndex(index); + } } @@ -524,11 +524,11 @@ public class AttributesImpl implements Attributes */ public void setType (int index, String type) { - if (index >= 0 && index < length) { - data[index*5+3] = type; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5+3] = type; + } else { + badIndex(index); + } } @@ -543,15 +543,15 @@ public class AttributesImpl implements Attributes */ public void setValue (int index, String value) { - if (index >= 0 && index < length) { - data[index*5+4] = value; - } else { - badIndex(index); - } + if (index >= 0 && index < length) { + data[index*5+4] = value; + } else { + badIndex(index); + } } - + //////////////////////////////////////////////////////////////////// // Internal methods. //////////////////////////////////////////////////////////////////// @@ -596,15 +596,15 @@ public class AttributesImpl implements Attributes * @exception java.lang.ArrayIndexOutOfBoundsException Always. */ private void badIndex (int index) - throws ArrayIndexOutOfBoundsException + throws ArrayIndexOutOfBoundsException { - String msg = - "Attempt to modify attribute at illegal index: " + index; - throw new ArrayIndexOutOfBoundsException(msg); + String msg = + "Attempt to modify attribute at illegal index: " + index; + throw new ArrayIndexOutOfBoundsException(msg); } - + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// @@ -615,4 +615,3 @@ public class AttributesImpl implements Attributes } // end of AttributesImpl.java - diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java b/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java index e01c3be403d..f3d6eae44c6 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java @@ -59,12 +59,12 @@ import org.xml.sax.SAXParseException; public class DefaultHandler implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler { - - + + //////////////////////////////////////////////////////////////////// // Default implementation of the EntityResolver interface. //////////////////////////////////////////////////////////////////// - + /** * Resolve an external entity. * @@ -76,7 +76,7 @@ public class DefaultHandler * * @param publicId The public identifer, or null if none is * available. - * @param systemId The system identifier provided in the XML + * @param systemId The system identifier provided in the XML * document. * @return The new input source, or null to require the * default behaviour. @@ -87,18 +87,18 @@ public class DefaultHandler * @see org.xml.sax.EntityResolver#resolveEntity */ public InputSource resolveEntity (String publicId, String systemId) - throws IOException, SAXException + throws IOException, SAXException { - return null; + return null; } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of DTDHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive notification of a notation declaration. * @@ -115,12 +115,12 @@ public class DefaultHandler * @see org.xml.sax.DTDHandler#notationDecl */ public void notationDecl (String name, String publicId, String systemId) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of an unparsed entity declaration. * @@ -138,19 +138,19 @@ public class DefaultHandler * @see org.xml.sax.DTDHandler#unparsedEntityDecl */ public void unparsedEntityDecl (String name, String publicId, - String systemId, String notationName) - throws SAXException + String systemId, String notationName) + throws SAXException { - // no op + // no op } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of ContentHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive a Locator object for document events. * @@ -164,10 +164,10 @@ public class DefaultHandler */ public void setDocumentLocator (Locator locator) { - // no op + // no op } - - + + /** * Receive notification of the beginning of the document. * @@ -181,12 +181,12 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#startDocument */ public void startDocument () - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the end of the document. * @@ -200,9 +200,9 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#endDocument */ public void endDocument () - throws SAXException + throws SAXException { - // no op + // no op } @@ -220,9 +220,9 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#startPrefixMapping */ public void startPrefixMapping (String prefix, String uri) - throws SAXException + throws SAXException { - // no op + // no op } @@ -239,12 +239,12 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#endPrefixMapping */ public void endPrefixMapping (String prefix) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the start of an element. * @@ -269,13 +269,13 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#startElement */ public void startElement (String uri, String localName, - String qName, Attributes attributes) - throws SAXException + String qName, Attributes attributes) + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of the end of an element. * @@ -297,12 +297,12 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#endElement */ public void endElement (String uri, String localName, String qName) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of character data inside an element. * @@ -320,12 +320,12 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#characters */ public void characters (char ch[], int start, int length) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of ignorable whitespace in element content. * @@ -343,12 +343,12 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#ignorableWhitespace */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of a processing instruction. * @@ -365,9 +365,9 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#processingInstruction */ public void processingInstruction (String target, String data) - throws SAXException + throws SAXException { - // no op + // no op } @@ -385,18 +385,18 @@ public class DefaultHandler * @see org.xml.sax.ContentHandler#processingInstruction */ public void skippedEntity (String name) - throws SAXException + throws SAXException { - // no op + // no op } - - - + + + //////////////////////////////////////////////////////////////////// // Default implementation of the ErrorHandler interface. //////////////////////////////////////////////////////////////////// - - + + /** * Receive notification of a parser warning. * @@ -412,12 +412,12 @@ public class DefaultHandler * @see org.xml.sax.SAXParseException */ public void warning (SAXParseException e) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Receive notification of a recoverable parser error. * @@ -433,12 +433,12 @@ public class DefaultHandler * @see org.xml.sax.SAXParseException */ public void error (SAXParseException e) - throws SAXException + throws SAXException { - // no op + // no op } - - + + /** * Report a fatal XML parsing error. * @@ -457,11 +457,11 @@ public class DefaultHandler * @see org.xml.sax.SAXParseException */ public void fatalError (SAXParseException e) - throws SAXException + throws SAXException { - throw e; + throw e; } - + } // end of DefaultHandler.java diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java index 6fa4857277c..d45813e5b00 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java @@ -51,8 +51,8 @@ import org.xml.sax.Locator; */ public class LocatorImpl implements Locator { - - + + /** * Zero-argument constructor. * @@ -62,8 +62,8 @@ public class LocatorImpl implements Locator public LocatorImpl () { } - - + + /** * Copy constructor. * @@ -76,19 +76,19 @@ public class LocatorImpl implements Locator */ public LocatorImpl (Locator locator) { - setPublicId(locator.getPublicId()); - setSystemId(locator.getSystemId()); - setLineNumber(locator.getLineNumber()); - setColumnNumber(locator.getColumnNumber()); + setPublicId(locator.getPublicId()); + setSystemId(locator.getSystemId()); + setLineNumber(locator.getLineNumber()); + setColumnNumber(locator.getColumnNumber()); } - - - + + + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.Locator //////////////////////////////////////////////////////////////////// - - + + /** * Return the saved public identifier. * @@ -99,10 +99,10 @@ public class LocatorImpl implements Locator */ public String getPublicId () { - return publicId; + return publicId; } - - + + /** * Return the saved system identifier. * @@ -113,10 +113,10 @@ public class LocatorImpl implements Locator */ public String getSystemId () { - return systemId; + return systemId; } - - + + /** * Return the saved line number (1-based). * @@ -126,10 +126,10 @@ public class LocatorImpl implements Locator */ public int getLineNumber () { - return lineNumber; + return lineNumber; } - - + + /** * Return the saved column number (1-based). * @@ -139,42 +139,42 @@ public class LocatorImpl implements Locator */ public int getColumnNumber () { - return columnNumber; + return columnNumber; } - - - + + + //////////////////////////////////////////////////////////////////// // Setters for the properties (not in org.xml.sax.Locator) //////////////////////////////////////////////////////////////////// - - + + /** * Set the public identifier for this locator. * - * @param publicId The new public identifier, or null + * @param publicId The new public identifier, or null * if none is available. * @see #getPublicId */ public void setPublicId (String publicId) { - this.publicId = publicId; + this.publicId = publicId; } - - + + /** * Set the system identifier for this locator. * - * @param systemId The new system identifier, or null + * @param systemId The new system identifier, or null * if none is available. * @see #getSystemId */ public void setSystemId (String systemId) { - this.systemId = systemId; + this.systemId = systemId; } - - + + /** * Set the line number for this locator (1-based). * @@ -183,10 +183,10 @@ public class LocatorImpl implements Locator */ public void setLineNumber (int lineNumber) { - this.lineNumber = lineNumber; + this.lineNumber = lineNumber; } - - + + /** * Set the column number for this locator (1-based). * @@ -195,20 +195,20 @@ public class LocatorImpl implements Locator */ public void setColumnNumber (int columnNumber) { - this.columnNumber = columnNumber; + this.columnNumber = columnNumber; } - - - + + + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// - + private String publicId; private String systemId; private int lineNumber; private int columnNumber; - + } // end of LocatorImpl.java diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java b/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java index 01e11faf83e..d1e74639ac4 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java @@ -72,7 +72,7 @@ import java.util.Vector; public class NamespaceSupport { - + //////////////////////////////////////////////////////////////////// // Constants. //////////////////////////////////////////////////////////////////// @@ -87,16 +87,16 @@ public class NamespaceSupport * to the "xml" prefix.

    */ public final static String XMLNS = - "http://www.w3.org/XML/1998/namespace"; + "http://www.w3.org/XML/1998/namespace"; /** * The namespace declaration URI as a constant. * The value is http://www.w3.org/xmlns/2000/, as defined * in a backwards-incompatible erratum to the "Namespaces in XML" - * recommendation. Because that erratum postdated SAX2, SAX2 defaults + * recommendation. Because that erratum postdated SAX2, SAX2 defaults * to the original recommendation, and does not normally use this URI. - * + * * *

    This is the Namespace URI that is optionally applied to * xmlns and xmlns:* attributes, which are used to @@ -107,16 +107,16 @@ public class NamespaceSupport * @see #isNamespaceDeclUris */ public final static String NSDECL = - "http://www.w3.org/xmlns/2000/"; + "http://www.w3.org/xmlns/2000/"; /** * An empty enumeration. */ private final static Enumeration EMPTY_ENUMERATION = - new Vector().elements(); + new Vector().elements(); + - //////////////////////////////////////////////////////////////////// // Constructor. //////////////////////////////////////////////////////////////////// @@ -127,11 +127,11 @@ public class NamespaceSupport */ public NamespaceSupport () { - reset(); + reset(); } - + //////////////////////////////////////////////////////////////////// // Context management. //////////////////////////////////////////////////////////////////// @@ -150,11 +150,11 @@ public class NamespaceSupport */ public void reset () { - contexts = new Context[32]; - namespaceDeclUris = false; - contextPos = 0; - contexts[contextPos] = currentContext = new Context(); - currentContext.declarePrefix("xml", XMLNS); + contexts = new Context[32]; + namespaceDeclUris = false; + contextPos = 0; + contexts[contextPos] = currentContext = new Context(); + currentContext.declarePrefix("xml", XMLNS); } @@ -196,29 +196,29 @@ public class NamespaceSupport */ public void pushContext () { - int max = contexts.length; + int max = contexts.length; - contexts [contextPos].declsOK = false; - contextPos++; + contexts [contextPos].declsOK = false; + contextPos++; - // Extend the array if necessary - if (contextPos >= max) { - Context newContexts[] = new Context[max*2]; - System.arraycopy(contexts, 0, newContexts, 0, max); - max *= 2; - contexts = newContexts; - } + // Extend the array if necessary + if (contextPos >= max) { + Context newContexts[] = new Context[max*2]; + System.arraycopy(contexts, 0, newContexts, 0, max); + max *= 2; + contexts = newContexts; + } - // Allocate the context if necessary. - currentContext = contexts[contextPos]; - if (currentContext == null) { - contexts[contextPos] = currentContext = new Context(); - } + // Allocate the context if necessary. + currentContext = contexts[contextPos]; + if (currentContext == null) { + contexts[contextPos] = currentContext = new Context(); + } - // Set the parent, if any. - if (contextPos > 0) { - currentContext.setParent(contexts[contextPos - 1]); - } + // Set the parent, if any. + if (contextPos > 0) { + currentContext.setParent(contexts[contextPos - 1]); + } } @@ -237,16 +237,16 @@ public class NamespaceSupport */ public void popContext () { - contexts[contextPos].clear(); - contextPos--; - if (contextPos < 0) { - throw new EmptyStackException(); - } - currentContext = contexts[contextPos]; + contexts[contextPos].clear(); + contextPos--; + if (contextPos < 0) { + throw new EmptyStackException(); + } + currentContext = contexts[contextPos]; } - + //////////////////////////////////////////////////////////////////// // Operations within a context. //////////////////////////////////////////////////////////////////// @@ -281,8 +281,8 @@ public class NamespaceSupport * for attribute names, where the default prefix is not allowed.

    * * @param prefix The prefix to declare, or the empty string to - * indicate the default element namespace. This may never have - * the value "xml" or "xmlns". + * indicate the default element namespace. This may never have + * the value "xml" or "xmlns". * @param uri The Namespace URI to associate with the prefix. * @return true if the prefix was legal, false otherwise * @@ -292,12 +292,12 @@ public class NamespaceSupport */ public boolean declarePrefix (String prefix, String uri) { - if (prefix.equals("xml") || prefix.equals("xmlns")) { - return false; - } else { - currentContext.declarePrefix(prefix, uri); - return true; - } + if (prefix.equals("xml") || prefix.equals("xmlns")) { + return false; + } else { + currentContext.declarePrefix(prefix, uri); + return true; + } } @@ -335,24 +335,24 @@ public class NamespaceSupport * holding at least three members. * @param isAttribute A flag indicating whether this is an * attribute name (true) or an element name (false). - * @return The supplied array holding three internalized strings + * @return The supplied array holding three internalized strings * representing the Namespace URI (or empty string), the * local name, and the XML qualified name; or null if there * is an undeclared prefix. * @see #declarePrefix * @see java.lang.String#intern */ public String [] processName (String qName, String parts[], - boolean isAttribute) + boolean isAttribute) { - String myParts[] = currentContext.processName(qName, isAttribute); - if (myParts == null) { - return null; - } else { - parts[0] = myParts[0]; - parts[1] = myParts[1]; - parts[2] = myParts[2]; - return parts; - } + String myParts[] = currentContext.processName(qName, isAttribute); + if (myParts == null) { + return null; + } else { + parts[0] = myParts[0]; + parts[1] = myParts[1]; + parts[2] = myParts[2]; + return parts; + } } @@ -370,7 +370,7 @@ public class NamespaceSupport */ public String getURI (String prefix) { - return currentContext.getURI(prefix); + return currentContext.getURI(prefix); } @@ -390,7 +390,7 @@ public class NamespaceSupport */ public Enumeration getPrefixes () { - return currentContext.getPrefixes(); + return currentContext.getPrefixes(); } @@ -415,7 +415,7 @@ public class NamespaceSupport */ public String getPrefix (String uri) { - return currentContext.getPrefix(uri); + return currentContext.getPrefix(uri); } @@ -427,7 +427,7 @@ public class NamespaceSupport * *

    This method returns prefixes mapped to a specific Namespace * URI. The xml: prefix will be included. If you want only one - * prefix that's mapped to the Namespace URI, and you don't care + * prefix that's mapped to the Namespace URI, and you don't care * which one you get, use the {@link #getPrefix getPrefix} * method instead.

    * @@ -444,22 +444,22 @@ public class NamespaceSupport */ public Enumeration getPrefixes (String uri) { - Vector prefixes = new Vector(); - Enumeration allPrefixes = getPrefixes(); - while (allPrefixes.hasMoreElements()) { - String prefix = (String)allPrefixes.nextElement(); - if (uri.equals(getURI(prefix))) { - prefixes.addElement(prefix); - } - } - return prefixes.elements(); + Vector prefixes = new Vector(); + Enumeration allPrefixes = getPrefixes(); + while (allPrefixes.hasMoreElements()) { + String prefix = (String)allPrefixes.nextElement(); + if (uri.equals(getURI(prefix))) { + prefixes.addElement(prefix); + } + } + return prefixes.elements(); } /** * Return an enumeration of all prefixes declared in this context. * - *

    The empty (default) prefix will be included in this + *

    The empty (default) prefix will be included in this * enumeration; note that this behaviour differs from that of * {@link #getPrefix} and {@link #getPrefixes}.

    * @@ -470,7 +470,7 @@ public class NamespaceSupport */ public Enumeration getDeclaredPrefixes () { - return currentContext.getDeclaredPrefixes(); + return currentContext.getDeclaredPrefixes(); } /** @@ -482,21 +482,21 @@ public class NamespaceSupport * @since SAX 2.1alpha * * @exception IllegalStateException when attempting to set this - * after any context has been pushed. + * after any context has been pushed. */ public void setNamespaceDeclUris (boolean value) { - if (contextPos != 0) - throw new IllegalStateException (); - if (value == namespaceDeclUris) - return; - namespaceDeclUris = value; - if (value) - currentContext.declarePrefix ("xmlns", NSDECL); - else { - contexts[contextPos] = currentContext = new Context(); - currentContext.declarePrefix("xml", XMLNS); - } + if (contextPos != 0) + throw new IllegalStateException (); + if (value == namespaceDeclUris) + return; + namespaceDeclUris = value; + if (value) + currentContext.declarePrefix ("xmlns", NSDECL); + else { + contexts[contextPos] = currentContext = new Context(); + currentContext.declarePrefix("xml", XMLNS); + } } /** @@ -506,10 +506,10 @@ public class NamespaceSupport * @since SAX 2.1alpha */ public boolean isNamespaceDeclUris () - { return namespaceDeclUris; } + { return namespaceDeclUris; } + - //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// @@ -519,7 +519,7 @@ public class NamespaceSupport private int contextPos; private boolean namespaceDeclUris; - + //////////////////////////////////////////////////////////////////// // Internal classes. //////////////////////////////////////////////////////////////////// @@ -538,297 +538,297 @@ public class NamespaceSupport */ final class Context { - /** - * Create the root-level Namespace context. - */ - Context () - { - copyTables(); - } - - - /** - * (Re)set the parent of this Namespace context. - * The context must either have been freshly constructed, - * or must have been cleared. - * - * @param context The parent Namespace context object. - */ - void setParent (Context parent) - { - this.parent = parent; - declarations = null; - prefixTable = parent.prefixTable; - uriTable = parent.uriTable; - elementNameTable = parent.elementNameTable; - attributeNameTable = parent.attributeNameTable; - defaultNS = parent.defaultNS; - declSeen = false; - declsOK = true; - } - - /** - * Makes associated state become collectible, - * invalidating this context. - * {@link #setParent} must be called before - * this context may be used again. - */ - void clear () - { - parent = null; - prefixTable = null; - uriTable = null; - elementNameTable = null; - attributeNameTable = null; - defaultNS = null; - } - - - /** - * Declare a Namespace prefix for this context. - * - * @param prefix The prefix to declare. - * @param uri The associated Namespace URI. - * @see org.xml.sax.helpers.NamespaceSupport#declarePrefix - */ - void declarePrefix (String prefix, String uri) - { - // Lazy processing... - if (!declsOK) - throw new IllegalStateException ( - "can't declare any more prefixes in this context"); - if (!declSeen) { - copyTables(); - } - if (declarations == null) { - declarations = new Vector(); - } - - prefix = prefix.intern(); - uri = uri.intern(); - if ("".equals(prefix)) { - if ("".equals(uri)) { - defaultNS = null; - } else { - defaultNS = uri; - } - } else { - prefixTable.put(prefix, uri); - uriTable.put(uri, prefix); // may wipe out another prefix - } - declarations.addElement(prefix); - } + /** + * Create the root-level Namespace context. + */ + Context () + { + copyTables(); + } - /** - * Process an XML qualified name in this context. - * - * @param qName The XML qualified name. - * @param isAttribute true if this is an attribute name. - * @return An array of three strings containing the - * URI part (or empty string), the local part, - * and the raw name, all internalized, or null - * if there is an undeclared prefix. - * @see org.xml.sax.helpers.NamespaceSupport#processName - */ - String [] processName (String qName, boolean isAttribute) - { - String name[]; - Hashtable table; - - // detect errors in call sequence - declsOK = false; + /** + * (Re)set the parent of this Namespace context. + * The context must either have been freshly constructed, + * or must have been cleared. + * + * @param context The parent Namespace context object. + */ + void setParent (Context parent) + { + this.parent = parent; + declarations = null; + prefixTable = parent.prefixTable; + uriTable = parent.uriTable; + elementNameTable = parent.elementNameTable; + attributeNameTable = parent.attributeNameTable; + defaultNS = parent.defaultNS; + declSeen = false; + declsOK = true; + } - // Select the appropriate table. - if (isAttribute) { - table = attributeNameTable; - } else { - table = elementNameTable; - } - - // Start by looking in the cache, and - // return immediately if the name - // is already known in this content - name = (String[])table.get(qName); - if (name != null) { - return name; - } - - // We haven't seen this name in this - // context before. Maybe in the parent - // context, but we can't assume prefix - // bindings are the same. - name = new String[3]; - name[2] = qName.intern(); - int index = qName.indexOf(':'); - - - // No prefix. - if (index == -1) { - if (isAttribute) { - if (qName == "xmlns" && namespaceDeclUris) - name[0] = NSDECL; - else - name[0] = ""; - } else if (defaultNS == null) { - name[0] = ""; - } else { - name[0] = defaultNS; - } - name[1] = name[2]; - } - - // Prefix - else { - String prefix = qName.substring(0, index); - String local = qName.substring(index+1); - String uri; - if ("".equals(prefix)) { - uri = defaultNS; - } else { - uri = (String)prefixTable.get(prefix); - } - if (uri == null - || (!isAttribute && "xmlns".equals (prefix))) { - return null; - } - name[0] = uri; - name[1] = local.intern(); - } - - // Save in the cache for future use. - // (Could be shared with parent context...) - table.put(name[2], name); - return name; - } - - - /** - * Look up the URI associated with a prefix in this context. - * - * @param prefix The prefix to look up. - * @return The associated Namespace URI, or null if none is - * declared. - * @see org.xml.sax.helpers.NamespaceSupport#getURI - */ - String getURI (String prefix) - { - if ("".equals(prefix)) { - return defaultNS; - } else if (prefixTable == null) { - return null; - } else { - return (String)prefixTable.get(prefix); - } - } + /** + * Makes associated state become collectible, + * invalidating this context. + * {@link #setParent} must be called before + * this context may be used again. + */ + void clear () + { + parent = null; + prefixTable = null; + uriTable = null; + elementNameTable = null; + attributeNameTable = null; + defaultNS = null; + } - /** - * Look up one of the prefixes associated with a URI in this context. - * - *

    Since many prefixes may be mapped to the same URI, - * the return value may be unreliable.

    - * - * @param uri The URI to look up. - * @return The associated prefix, or null if none is declared. - * @see org.xml.sax.helpers.NamespaceSupport#getPrefix - */ - String getPrefix (String uri) - { - if (uriTable == null) { - return null; - } else { - return (String)uriTable.get(uri); - } - } - - - /** - * Return an enumeration of prefixes declared in this context. - * - * @return An enumeration of prefixes (possibly empty). - * @see org.xml.sax.helpers.NamespaceSupport#getDeclaredPrefixes - */ - Enumeration getDeclaredPrefixes () - { - if (declarations == null) { - return EMPTY_ENUMERATION; - } else { - return declarations.elements(); - } - } - - - /** - * Return an enumeration of all prefixes currently in force. - * - *

    The default prefix, if in force, is not - * returned, and will have to be checked for separately.

    - * - * @return An enumeration of prefixes (never empty). - * @see org.xml.sax.helpers.NamespaceSupport#getPrefixes - */ - Enumeration getPrefixes () - { - if (prefixTable == null) { - return EMPTY_ENUMERATION; - } else { - return prefixTable.keys(); - } - } - - - - //////////////////////////////////////////////////////////////// - // Internal methods. - //////////////////////////////////////////////////////////////// + /** + * Declare a Namespace prefix for this context. + * + * @param prefix The prefix to declare. + * @param uri The associated Namespace URI. + * @see org.xml.sax.helpers.NamespaceSupport#declarePrefix + */ + void declarePrefix (String prefix, String uri) + { + // Lazy processing... + if (!declsOK) + throw new IllegalStateException ( + "can't declare any more prefixes in this context"); + if (!declSeen) { + copyTables(); + } + if (declarations == null) { + declarations = new Vector(); + } + + prefix = prefix.intern(); + uri = uri.intern(); + if ("".equals(prefix)) { + if ("".equals(uri)) { + defaultNS = null; + } else { + defaultNS = uri; + } + } else { + prefixTable.put(prefix, uri); + uriTable.put(uri, prefix); // may wipe out another prefix + } + declarations.addElement(prefix); + } - /** - * Copy on write for the internal tables in this context. - * - *

    This class is optimized for the normal case where most - * elements do not contain Namespace declarations.

    - */ - private void copyTables () - { - if (prefixTable != null) { - prefixTable = (Hashtable)prefixTable.clone(); - } else { - prefixTable = new Hashtable(); - } - if (uriTable != null) { - uriTable = (Hashtable)uriTable.clone(); - } else { - uriTable = new Hashtable(); - } - elementNameTable = new Hashtable(); - attributeNameTable = new Hashtable(); - declSeen = true; - } + /** + * Process an XML qualified name in this context. + * + * @param qName The XML qualified name. + * @param isAttribute true if this is an attribute name. + * @return An array of three strings containing the + * URI part (or empty string), the local part, + * and the raw name, all internalized, or null + * if there is an undeclared prefix. + * @see org.xml.sax.helpers.NamespaceSupport#processName + */ + String [] processName (String qName, boolean isAttribute) + { + String name[]; + Hashtable table; + + // detect errors in call sequence + declsOK = false; + + // Select the appropriate table. + if (isAttribute) { + table = attributeNameTable; + } else { + table = elementNameTable; + } + + // Start by looking in the cache, and + // return immediately if the name + // is already known in this content + name = (String[])table.get(qName); + if (name != null) { + return name; + } + + // We haven't seen this name in this + // context before. Maybe in the parent + // context, but we can't assume prefix + // bindings are the same. + name = new String[3]; + name[2] = qName.intern(); + int index = qName.indexOf(':'); - - //////////////////////////////////////////////////////////////// - // Protected state. - //////////////////////////////////////////////////////////////// - - Hashtable prefixTable; - Hashtable uriTable; - Hashtable elementNameTable; - Hashtable attributeNameTable; - String defaultNS = null; - boolean declsOK = true; - + // No prefix. + if (index == -1) { + if (isAttribute) { + if (qName == "xmlns" && namespaceDeclUris) + name[0] = NSDECL; + else + name[0] = ""; + } else if (defaultNS == null) { + name[0] = ""; + } else { + name[0] = defaultNS; + } + name[1] = name[2]; + } - - //////////////////////////////////////////////////////////////// - // Internal state. - //////////////////////////////////////////////////////////////// - - private Vector declarations = null; - private boolean declSeen = false; - private Context parent = null; + // Prefix + else { + String prefix = qName.substring(0, index); + String local = qName.substring(index+1); + String uri; + if ("".equals(prefix)) { + uri = defaultNS; + } else { + uri = (String)prefixTable.get(prefix); + } + if (uri == null + || (!isAttribute && "xmlns".equals (prefix))) { + return null; + } + name[0] = uri; + name[1] = local.intern(); + } + + // Save in the cache for future use. + // (Could be shared with parent context...) + table.put(name[2], name); + return name; + } + + + /** + * Look up the URI associated with a prefix in this context. + * + * @param prefix The prefix to look up. + * @return The associated Namespace URI, or null if none is + * declared. + * @see org.xml.sax.helpers.NamespaceSupport#getURI + */ + String getURI (String prefix) + { + if ("".equals(prefix)) { + return defaultNS; + } else if (prefixTable == null) { + return null; + } else { + return (String)prefixTable.get(prefix); + } + } + + + /** + * Look up one of the prefixes associated with a URI in this context. + * + *

    Since many prefixes may be mapped to the same URI, + * the return value may be unreliable.

    + * + * @param uri The URI to look up. + * @return The associated prefix, or null if none is declared. + * @see org.xml.sax.helpers.NamespaceSupport#getPrefix + */ + String getPrefix (String uri) + { + if (uriTable == null) { + return null; + } else { + return (String)uriTable.get(uri); + } + } + + + /** + * Return an enumeration of prefixes declared in this context. + * + * @return An enumeration of prefixes (possibly empty). + * @see org.xml.sax.helpers.NamespaceSupport#getDeclaredPrefixes + */ + Enumeration getDeclaredPrefixes () + { + if (declarations == null) { + return EMPTY_ENUMERATION; + } else { + return declarations.elements(); + } + } + + + /** + * Return an enumeration of all prefixes currently in force. + * + *

    The default prefix, if in force, is not + * returned, and will have to be checked for separately.

    + * + * @return An enumeration of prefixes (never empty). + * @see org.xml.sax.helpers.NamespaceSupport#getPrefixes + */ + Enumeration getPrefixes () + { + if (prefixTable == null) { + return EMPTY_ENUMERATION; + } else { + return prefixTable.keys(); + } + } + + + + //////////////////////////////////////////////////////////////// + // Internal methods. + //////////////////////////////////////////////////////////////// + + + /** + * Copy on write for the internal tables in this context. + * + *

    This class is optimized for the normal case where most + * elements do not contain Namespace declarations.

    + */ + private void copyTables () + { + if (prefixTable != null) { + prefixTable = (Hashtable)prefixTable.clone(); + } else { + prefixTable = new Hashtable(); + } + if (uriTable != null) { + uriTable = (Hashtable)uriTable.clone(); + } else { + uriTable = new Hashtable(); + } + elementNameTable = new Hashtable(); + attributeNameTable = new Hashtable(); + declSeen = true; + } + + + + //////////////////////////////////////////////////////////////// + // Protected state. + //////////////////////////////////////////////////////////////// + + Hashtable prefixTable; + Hashtable uriTable; + Hashtable elementNameTable; + Hashtable attributeNameTable; + String defaultNS = null; + boolean declsOK = true; + + + + //////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////// + + private Vector declarations = null; + private boolean declSeen = false; + private Context parent = null; } } diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java b/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java index 70c043eb42f..211f47f1c0b 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/NewInstance.java @@ -54,7 +54,7 @@ class NewInstance { /** * Figure out which ClassLoader to use. For JDK 1.2 and later use * the context ClassLoader. - */ + */ static ClassLoader getClassLoader () { Method m = null; diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java index 748ad1c8499..cc0695d2727 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.Enumeration; import java.util.Vector; -import org.xml.sax.Parser; // deprecated +import org.xml.sax.Parser; // deprecated import org.xml.sax.InputSource; import org.xml.sax.Locator; import org.xml.sax.AttributeList; // deprecated @@ -57,7 +57,7 @@ import org.xml.sax.SAXNotSupportedException; public class ParserAdapter implements XMLReader, DocumentHandler { - + //////////////////////////////////////////////////////////////////// // Constructors. //////////////////////////////////////////////////////////////////// @@ -76,35 +76,35 @@ public class ParserAdapter implements XMLReader, DocumentHandler public ParserAdapter () throws SAXException { - super(); + super(); - String driver = System.getProperty("org.xml.sax.parser"); + String driver = System.getProperty("org.xml.sax.parser"); - try { - setup(ParserFactory.makeParser()); - } catch (ClassNotFoundException e1) { - throw new - SAXException("Cannot find SAX1 driver class " + - driver, e1); - } catch (IllegalAccessException e2) { - throw new - SAXException("SAX1 driver class " + - driver + - " found but cannot be loaded", e2); - } catch (InstantiationException e3) { - throw new - SAXException("SAX1 driver class " + - driver + - " loaded but cannot be instantiated", e3); - } catch (ClassCastException e4) { - throw new - SAXException("SAX1 driver class " + - driver + - " does not implement org.xml.sax.Parser"); - } catch (NullPointerException e5) { - throw new - SAXException("System property org.xml.sax.parser not specified"); - } + try { + setup(ParserFactory.makeParser()); + } catch (ClassNotFoundException e1) { + throw new + SAXException("Cannot find SAX1 driver class " + + driver, e1); + } catch (IllegalAccessException e2) { + throw new + SAXException("SAX1 driver class " + + driver + + " found but cannot be loaded", e2); + } catch (InstantiationException e3) { + throw new + SAXException("SAX1 driver class " + + driver + + " loaded but cannot be instantiated", e3); + } catch (ClassCastException e4) { + throw new + SAXException("SAX1 driver class " + + driver + + " does not implement org.xml.sax.Parser"); + } catch (NullPointerException e5) { + throw new + SAXException("System property org.xml.sax.parser not specified"); + } } @@ -121,8 +121,8 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public ParserAdapter (Parser parser) { - super(); - setup(parser); + super(); + setup(parser); } @@ -135,18 +135,18 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ private void setup (Parser parser) { - if (parser == null) { - throw new - NullPointerException("Parser argument must not be null"); - } - this.parser = parser; - atts = new AttributesImpl(); - nsSupport = new NamespaceSupport(); - attAdapter = new AttributeListAdapter(); + if (parser == null) { + throw new + NullPointerException("Parser argument must not be null"); + } + this.parser = parser; + atts = new AttributesImpl(); + nsSupport = new NamespaceSupport(); + attAdapter = new AttributeListAdapter(); } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.XMLReader. //////////////////////////////////////////////////////////////////// @@ -164,7 +164,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler /** * Set a feature flag for the parser. * - *

    The only features recognized are namespaces and + *

    The only features recognized are namespaces and * namespace-prefixes.

    * * @param name The feature name, as a complete URI. @@ -176,33 +176,33 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.XMLReader#setFeature */ public void setFeature (String name, boolean value) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (name.equals(NAMESPACES)) { - checkNotParsing("feature", name); - namespaces = value; - if (!namespaces && !prefixes) { - prefixes = true; - } - } else if (name.equals(NAMESPACE_PREFIXES)) { - checkNotParsing("feature", name); - prefixes = value; - if (!prefixes && !namespaces) { - namespaces = true; - } - } else if (name.equals(XMLNS_URIs)) { - checkNotParsing("feature", name); - uris = value; - } else { - throw new SAXNotRecognizedException("Feature: " + name); - } + if (name.equals(NAMESPACES)) { + checkNotParsing("feature", name); + namespaces = value; + if (!namespaces && !prefixes) { + prefixes = true; + } + } else if (name.equals(NAMESPACE_PREFIXES)) { + checkNotParsing("feature", name); + prefixes = value; + if (!prefixes && !namespaces) { + namespaces = true; + } + } else if (name.equals(XMLNS_URIs)) { + checkNotParsing("feature", name); + uris = value; + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } } /** * Check a parser feature flag. * - *

    The only features recognized are namespaces and + *

    The only features recognized are namespaces and * namespace-prefixes.

    * * @param name The feature name, as a complete URI. @@ -214,17 +214,17 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.XMLReader#setFeature */ public boolean getFeature (String name) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (name.equals(NAMESPACES)) { - return namespaces; - } else if (name.equals(NAMESPACE_PREFIXES)) { - return prefixes; - } else if (name.equals(XMLNS_URIs)) { - return uris; - } else { - throw new SAXNotRecognizedException("Feature: " + name); - } + if (name.equals(NAMESPACES)) { + return namespaces; + } else if (name.equals(NAMESPACE_PREFIXES)) { + return prefixes; + } else if (name.equals(XMLNS_URIs)) { + return uris; + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } } @@ -242,9 +242,9 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.XMLReader#setProperty */ public void setProperty (String name, Object value) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - throw new SAXNotRecognizedException("Property: " + name); + throw new SAXNotRecognizedException("Property: " + name); } @@ -262,9 +262,9 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.XMLReader#getProperty */ public Object getProperty (String name) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - throw new SAXNotRecognizedException("Property: " + name); + throw new SAXNotRecognizedException("Property: " + name); } @@ -276,7 +276,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public void setEntityResolver (EntityResolver resolver) { - entityResolver = resolver; + entityResolver = resolver; } @@ -288,7 +288,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public EntityResolver getEntityResolver () { - return entityResolver; + return entityResolver; } @@ -300,7 +300,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public void setDTDHandler (DTDHandler handler) { - dtdHandler = handler; + dtdHandler = handler; } @@ -312,7 +312,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public DTDHandler getDTDHandler () { - return dtdHandler; + return dtdHandler; } @@ -324,7 +324,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public void setContentHandler (ContentHandler handler) { - contentHandler = handler; + contentHandler = handler; } @@ -336,7 +336,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public ContentHandler getContentHandler () { - return contentHandler; + return contentHandler; } @@ -348,7 +348,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public void setErrorHandler (ErrorHandler handler) { - errorHandler = handler; + errorHandler = handler; } @@ -360,7 +360,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public ErrorHandler getErrorHandler () { - return errorHandler; + return errorHandler; } @@ -376,9 +376,9 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.Parser#parse(java.lang.String) */ public void parse (String systemId) - throws IOException, SAXException + throws IOException, SAXException { - parse(new InputSource(systemId)); + parse(new InputSource(systemId)); } @@ -394,19 +394,19 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource) */ public void parse (InputSource input) - throws IOException, SAXException + throws IOException, SAXException { - if (parsing) { - throw new SAXException("Parser is already in use"); - } - setupParser(); - parsing = true; - try { - parser.parse(input); - } finally { - parsing = false; - } - parsing = false; + if (parsing) { + throw new SAXException("Parser is already in use"); + } + setupParser(); + parsing = true; + try { + parser.parse(input); + } finally { + parsing = false; + } + parsing = false; } @@ -425,10 +425,10 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ public void setDocumentLocator (Locator locator) { - this.locator = locator; - if (contentHandler != null) { - contentHandler.setDocumentLocator(locator); - } + this.locator = locator; + if (contentHandler != null) { + contentHandler.setDocumentLocator(locator); + } } @@ -441,11 +441,11 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#startDocument */ public void startDocument () - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.startDocument(); - } + if (contentHandler != null) { + contentHandler.startDocument(); + } } @@ -458,11 +458,11 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#endDocument */ public void endDocument () - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.endDocument(); - } + if (contentHandler != null) { + contentHandler.endDocument(); + } } @@ -478,124 +478,124 @@ public class ParserAdapter implements XMLReader, DocumentHandler * processing exception. */ public void startElement (String qName, AttributeList qAtts) - throws SAXException + throws SAXException { - // These are exceptions from the - // first pass; they should be - // ignored if there's a second pass, - // but reported otherwise. - Vector exceptions = null; + // These are exceptions from the + // first pass; they should be + // ignored if there's a second pass, + // but reported otherwise. + Vector exceptions = null; - // If we're not doing Namespace - // processing, dispatch this quickly. - if (!namespaces) { - if (contentHandler != null) { - attAdapter.setAttributeList(qAtts); - contentHandler.startElement("", "", qName.intern(), - attAdapter); - } - return; - } + // If we're not doing Namespace + // processing, dispatch this quickly. + if (!namespaces) { + if (contentHandler != null) { + attAdapter.setAttributeList(qAtts); + contentHandler.startElement("", "", qName.intern(), + attAdapter); + } + return; + } - // OK, we're doing Namespace processing. - nsSupport.pushContext(); - int length = qAtts.getLength(); - - // First pass: handle NS decls - for (int i = 0; i < length; i++) { - String attQName = qAtts.getName(i); + // OK, we're doing Namespace processing. + nsSupport.pushContext(); + int length = qAtts.getLength(); - if (!attQName.startsWith("xmlns")) - continue; - // Could be a declaration... - String prefix; - int n = attQName.indexOf(':'); + // First pass: handle NS decls + for (int i = 0; i < length; i++) { + String attQName = qAtts.getName(i); - // xmlns=... - if (n == -1 && attQName.length () == 5) { - prefix = ""; - } else if (n != 5) { - // XML namespaces spec doesn't discuss "xmlnsf:oo" - // (and similarly named) attributes ... at most, warn - continue; - } else // xmlns:foo=... - prefix = attQName.substring(n+1); + if (!attQName.startsWith("xmlns")) + continue; + // Could be a declaration... + String prefix; + int n = attQName.indexOf(':'); - String value = qAtts.getValue(i); - if (!nsSupport.declarePrefix(prefix, value)) { - reportError("Illegal Namespace prefix: " + prefix); - continue; - } - if (contentHandler != null) - contentHandler.startPrefixMapping(prefix, value); - } - - // Second pass: copy all relevant - // attributes into the SAX2 AttributeList - // using updated prefix bindings - atts.clear(); - for (int i = 0; i < length; i++) { - String attQName = qAtts.getName(i); - String type = qAtts.getType(i); - String value = qAtts.getValue(i); + // xmlns=... + if (n == -1 && attQName.length () == 5) { + prefix = ""; + } else if (n != 5) { + // XML namespaces spec doesn't discuss "xmlnsf:oo" + // (and similarly named) attributes ... at most, warn + continue; + } else // xmlns:foo=... + prefix = attQName.substring(n+1); - // Declaration? - if (attQName.startsWith("xmlns")) { - String prefix; - int n = attQName.indexOf(':'); + String value = qAtts.getValue(i); + if (!nsSupport.declarePrefix(prefix, value)) { + reportError("Illegal Namespace prefix: " + prefix); + continue; + } + if (contentHandler != null) + contentHandler.startPrefixMapping(prefix, value); + } - if (n == -1 && attQName.length () == 5) { - prefix = ""; - } else if (n != 5) { - // XML namespaces spec doesn't discuss "xmlnsf:oo" - // (and similarly named) attributes ... ignore - prefix = null; - } else { - prefix = attQName.substring(6); - } - // Yes, decl: report or prune - if (prefix != null) { - if (prefixes) { - if (uris) - // note funky case: localname can be null - // when declaring the default prefix, and - // yet the uri isn't null. - atts.addAttribute (nsSupport.XMLNS, prefix, - attQName.intern(), type, value); - else - atts.addAttribute ("", "", - attQName.intern(), type, value); - } - continue; - } - } + // Second pass: copy all relevant + // attributes into the SAX2 AttributeList + // using updated prefix bindings + atts.clear(); + for (int i = 0; i < length; i++) { + String attQName = qAtts.getName(i); + String type = qAtts.getType(i); + String value = qAtts.getValue(i); - // Not a declaration -- report - try { - String attName[] = processName(attQName, true, true); - atts.addAttribute(attName[0], attName[1], attName[2], - type, value); - } catch (SAXException e) { - if (exceptions == null) - exceptions = new Vector(); - exceptions.addElement(e); - atts.addAttribute("", attQName, attQName, type, value); - } - } - - // now handle the deferred exception reports - if (exceptions != null && errorHandler != null) { - for (int i = 0; i < exceptions.size(); i++) - errorHandler.error((SAXParseException) - (exceptions.elementAt(i))); - } + // Declaration? + if (attQName.startsWith("xmlns")) { + String prefix; + int n = attQName.indexOf(':'); - // OK, finally report the event. - if (contentHandler != null) { - String name[] = processName(qName, false, false); - contentHandler.startElement(name[0], name[1], name[2], atts); - } + if (n == -1 && attQName.length () == 5) { + prefix = ""; + } else if (n != 5) { + // XML namespaces spec doesn't discuss "xmlnsf:oo" + // (and similarly named) attributes ... ignore + prefix = null; + } else { + prefix = attQName.substring(6); + } + // Yes, decl: report or prune + if (prefix != null) { + if (prefixes) { + if (uris) + // note funky case: localname can be null + // when declaring the default prefix, and + // yet the uri isn't null. + atts.addAttribute (nsSupport.XMLNS, prefix, + attQName.intern(), type, value); + else + atts.addAttribute ("", "", + attQName.intern(), type, value); + } + continue; + } + } + + // Not a declaration -- report + try { + String attName[] = processName(attQName, true, true); + atts.addAttribute(attName[0], attName[1], attName[2], + type, value); + } catch (SAXException e) { + if (exceptions == null) + exceptions = new Vector(); + exceptions.addElement(e); + atts.addAttribute("", attQName, attQName, type, value); + } + } + + // now handle the deferred exception reports + if (exceptions != null && errorHandler != null) { + for (int i = 0; i < exceptions.size(); i++) + errorHandler.error((SAXParseException) + (exceptions.elementAt(i))); + } + + // OK, finally report the event. + if (contentHandler != null) { + String name[] = processName(qName, false, false); + contentHandler.startElement(name[0], name[1], name[2], atts); + } } @@ -609,28 +609,28 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#endElement */ public void endElement (String qName) - throws SAXException + throws SAXException { - // If we're not doing Namespace - // processing, dispatch this quickly. - if (!namespaces) { - if (contentHandler != null) { - contentHandler.endElement("", "", qName.intern()); - } - return; - } + // If we're not doing Namespace + // processing, dispatch this quickly. + if (!namespaces) { + if (contentHandler != null) { + contentHandler.endElement("", "", qName.intern()); + } + return; + } - // Split the name. - String names[] = processName(qName, false, false); - if (contentHandler != null) { - contentHandler.endElement(names[0], names[1], names[2]); - Enumeration prefixes = nsSupport.getDeclaredPrefixes(); - while (prefixes.hasMoreElements()) { - String prefix = (String)prefixes.nextElement(); - contentHandler.endPrefixMapping(prefix); - } - } - nsSupport.popContext(); + // Split the name. + String names[] = processName(qName, false, false); + if (contentHandler != null) { + contentHandler.endElement(names[0], names[1], names[2]); + Enumeration prefixes = nsSupport.getDeclaredPrefixes(); + while (prefixes.hasMoreElements()) { + String prefix = (String)prefixes.nextElement(); + contentHandler.endPrefixMapping(prefix); + } + } + nsSupport.popContext(); } @@ -646,11 +646,11 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#characters */ public void characters (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.characters(ch, start, length); - } + if (contentHandler != null) { + contentHandler.characters(ch, start, length); + } } @@ -666,11 +666,11 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#ignorableWhitespace */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.ignorableWhitespace(ch, start, length); - } + if (contentHandler != null) { + contentHandler.ignorableWhitespace(ch, start, length); + } } @@ -685,15 +685,15 @@ public class ParserAdapter implements XMLReader, DocumentHandler * @see org.xml.sax.DocumentHandler#processingInstruction */ public void processingInstruction (String target, String data) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.processingInstruction(target, data); - } + if (contentHandler != null) { + contentHandler.processingInstruction(target, data); + } } - + //////////////////////////////////////////////////////////////////// // Internal utility methods. //////////////////////////////////////////////////////////////////// @@ -704,25 +704,25 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ private void setupParser () { - // catch an illegal "nonsense" state. - if (!prefixes && !namespaces) - throw new IllegalStateException (); + // catch an illegal "nonsense" state. + if (!prefixes && !namespaces) + throw new IllegalStateException (); - nsSupport.reset(); - if (uris) - nsSupport.setNamespaceDeclUris (true); + nsSupport.reset(); + if (uris) + nsSupport.setNamespaceDeclUris (true); - if (entityResolver != null) { - parser.setEntityResolver(entityResolver); - } - if (dtdHandler != null) { - parser.setDTDHandler(dtdHandler); - } - if (errorHandler != null) { - parser.setErrorHandler(errorHandler); - } - parser.setDocumentHandler(this); - locator = null; + if (entityResolver != null) { + parser.setEntityResolver(entityResolver); + } + if (dtdHandler != null) { + parser.setDTDHandler(dtdHandler); + } + if (errorHandler != null) { + parser.setErrorHandler(errorHandler); + } + parser.setDocumentHandler(this); + locator = null; } @@ -740,20 +740,20 @@ public class ParserAdapter implements XMLReader, DocumentHandler * an exception if there is an error callback. */ private String [] processName (String qName, boolean isAttribute, - boolean useException) - throws SAXException + boolean useException) + throws SAXException { - String parts[] = nsSupport.processName(qName, nameParts, - isAttribute); - if (parts == null) { - if (useException) - throw makeException("Undeclared prefix: " + qName); - reportError("Undeclared prefix: " + qName); - parts = new String[3]; - parts[0] = parts[1] = ""; - parts[2] = qName.intern(); - } - return parts; + String parts[] = nsSupport.processName(qName, nameParts, + isAttribute); + if (parts == null) { + if (useException) + throw makeException("Undeclared prefix: " + qName); + reportError("Undeclared prefix: " + qName); + parts = new String[3]; + parts[0] = parts[1] = ""; + parts[2] = qName.intern(); + } + return parts; } @@ -765,13 +765,13 @@ public class ParserAdapter implements XMLReader, DocumentHandler * an exception. */ void reportError (String message) - throws SAXException + throws SAXException { - if (errorHandler != null) - errorHandler.error(makeException(message)); + if (errorHandler != null) + errorHandler.error(makeException(message)); } - + /** * Construct an exception for the current context. * @@ -779,11 +779,11 @@ public class ParserAdapter implements XMLReader, DocumentHandler */ private SAXParseException makeException (String message) { - if (locator != null) { - return new SAXParseException(message, locator); - } else { - return new SAXParseException(message, null, null, -1, -1); - } + if (locator != null) { + return new SAXParseException(message, locator); + } else { + return new SAXParseException(message, null, null, -1, -1); + } } @@ -799,18 +799,18 @@ public class ParserAdapter implements XMLReader, DocumentHandler * document is currently being parsed. */ private void checkNotParsing (String type, String name) - throws SAXNotSupportedException + throws SAXNotSupportedException { - if (parsing) { - throw new SAXNotSupportedException("Cannot change " + - type + ' ' + - name + " while parsing"); - - } + if (parsing) { + throw new SAXNotSupportedException("Cannot change " + + type + ' ' + + name + " while parsing"); + + } } - + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// @@ -825,14 +825,14 @@ public class ParserAdapter implements XMLReader, DocumentHandler private AttributesImpl atts = null; - // Features + // Features private boolean namespaces = true; private boolean prefixes = false; private boolean uris = false; - // Properties + // Properties - // Handlers + // Handlers Locator locator; EntityResolver entityResolver = null; @@ -841,7 +841,7 @@ public class ParserAdapter implements XMLReader, DocumentHandler ErrorHandler errorHandler = null; - + //////////////////////////////////////////////////////////////////// // Inner class to wrap an AttributeList when not doing NS proc. //////////////////////////////////////////////////////////////////// @@ -855,191 +855,191 @@ public class ParserAdapter implements XMLReader, DocumentHandler * *

    This wrapper class is used only when Namespace support * is disabled -- it provides pretty much a direct mapping - * from SAX1 to SAX2, except that names and types are + * from SAX1 to SAX2, except that names and types are * interned whenever requested.

    */ final class AttributeListAdapter implements Attributes { - /** - * Construct a new adapter. - */ - AttributeListAdapter () - { - } + /** + * Construct a new adapter. + */ + AttributeListAdapter () + { + } - /** - * Set the embedded AttributeList. - * - *

    This method must be invoked before any of the others - * can be used.

    - * - * @param The SAX1 attribute list (with qnames). - */ - void setAttributeList (AttributeList qAtts) - { - this.qAtts = qAtts; - } + /** + * Set the embedded AttributeList. + * + *

    This method must be invoked before any of the others + * can be used.

    + * + * @param The SAX1 attribute list (with qnames). + */ + void setAttributeList (AttributeList qAtts) + { + this.qAtts = qAtts; + } - /** - * Return the length of the attribute list. - * - * @return The number of attributes in the list. - * @see org.xml.sax.Attributes#getLength - */ - public int getLength () - { - return qAtts.getLength(); - } + /** + * Return the length of the attribute list. + * + * @return The number of attributes in the list. + * @see org.xml.sax.Attributes#getLength + */ + public int getLength () + { + return qAtts.getLength(); + } - /** - * Return the Namespace URI of the specified attribute. - * - * @param The attribute's index. - * @return Always the empty string. - * @see org.xml.sax.Attributes#getURI - */ - public String getURI (int i) - { - return ""; - } + /** + * Return the Namespace URI of the specified attribute. + * + * @param The attribute's index. + * @return Always the empty string. + * @see org.xml.sax.Attributes#getURI + */ + public String getURI (int i) + { + return ""; + } - /** - * Return the local name of the specified attribute. - * - * @param The attribute's index. - * @return Always the empty string. - * @see org.xml.sax.Attributes#getLocalName - */ - public String getLocalName (int i) - { - return ""; - } + /** + * Return the local name of the specified attribute. + * + * @param The attribute's index. + * @return Always the empty string. + * @see org.xml.sax.Attributes#getLocalName + */ + public String getLocalName (int i) + { + return ""; + } - /** - * Return the qualified (prefixed) name of the specified attribute. - * - * @param The attribute's index. - * @return The attribute's qualified name, internalized. - */ - public String getQName (int i) - { - return qAtts.getName(i).intern(); - } + /** + * Return the qualified (prefixed) name of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's qualified name, internalized. + */ + public String getQName (int i) + { + return qAtts.getName(i).intern(); + } - /** - * Return the type of the specified attribute. - * - * @param The attribute's index. - * @return The attribute's type as an internalized string. - */ - public String getType (int i) - { - return qAtts.getType(i).intern(); - } + /** + * Return the type of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's type as an internalized string. + */ + public String getType (int i) + { + return qAtts.getType(i).intern(); + } - /** - * Return the value of the specified attribute. - * - * @param The attribute's index. - * @return The attribute's value. - */ - public String getValue (int i) - { - return qAtts.getValue(i); - } + /** + * Return the value of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's value. + */ + public String getValue (int i) + { + return qAtts.getValue(i); + } - /** - * Look up an attribute index by Namespace name. - * - * @param uri The Namespace URI or the empty string. - * @param localName The local name. - * @return The attributes index, or -1 if none was found. - * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String) - */ - public int getIndex (String uri, String localName) - { - return -1; - } + /** + * Look up an attribute index by Namespace name. + * + * @param uri The Namespace URI or the empty string. + * @param localName The local name. + * @return The attributes index, or -1 if none was found. + * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String) + */ + public int getIndex (String uri, String localName) + { + return -1; + } - /** - * Look up an attribute index by qualified (prefixed) name. - * - * @param qName The qualified name. - * @return The attributes index, or -1 if none was found. - * @see org.xml.sax.Attributes#getIndex(java.lang.String) - */ - public int getIndex (String qName) - { - int max = atts.getLength(); - for (int i = 0; i < max; i++) { - if (qAtts.getName(i).equals(qName)) { - return i; - } - } - return -1; - } + /** + * Look up an attribute index by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attributes index, or -1 if none was found. + * @see org.xml.sax.Attributes#getIndex(java.lang.String) + */ + public int getIndex (String qName) + { + int max = atts.getLength(); + for (int i = 0; i < max; i++) { + if (qAtts.getName(i).equals(qName)) { + return i; + } + } + return -1; + } - /** - * Look up the type of an attribute by Namespace name. - * - * @param uri The Namespace URI - * @param localName The local name. - * @return The attribute's type as an internalized string. - */ - public String getType (String uri, String localName) - { - return null; - } + /** + * Look up the type of an attribute by Namespace name. + * + * @param uri The Namespace URI + * @param localName The local name. + * @return The attribute's type as an internalized string. + */ + public String getType (String uri, String localName) + { + return null; + } - /** - * Look up the type of an attribute by qualified (prefixed) name. - * - * @param qName The qualified name. - * @return The attribute's type as an internalized string. - */ - public String getType (String qName) - { - return qAtts.getType(qName).intern(); - } + /** + * Look up the type of an attribute by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's type as an internalized string. + */ + public String getType (String qName) + { + return qAtts.getType(qName).intern(); + } - /** - * Look up the value of an attribute by Namespace name. - * - * @param uri The Namespace URI - * @param localName The local name. - * @return The attribute's value. - */ - public String getValue (String uri, String localName) - { - return null; - } + /** + * Look up the value of an attribute by Namespace name. + * + * @param uri The Namespace URI + * @param localName The local name. + * @return The attribute's value. + */ + public String getValue (String uri, String localName) + { + return null; + } - /** - * Look up the value of an attribute by qualified (prefixed) name. - * - * @param qName The qualified name. - * @return The attribute's value. - */ - public String getValue (String qName) - { - return qAtts.getValue(qName); - } + /** + * Look up the value of an attribute by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's value. + */ + public String getValue (String qName) + { + return qAtts.getValue(qName); + } - private AttributeList qAtts; + private AttributeList qAtts; } } diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java index 23139981088..ec822b540cc 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java @@ -47,16 +47,16 @@ import org.xml.sax.Parser; * @version 2.0.1 (sax2r2) */ public class ParserFactory { - - + + /** * Private null constructor. */ private ParserFactory () { } - - + + /** * Create a new SAX parser using the `org.xml.sax.parser' system property. * @@ -79,21 +79,21 @@ public class ParserFactory { * @see org.xml.sax.Parser */ public static Parser makeParser () - throws ClassNotFoundException, - IllegalAccessException, - InstantiationException, - NullPointerException, - ClassCastException + throws ClassNotFoundException, + IllegalAccessException, + InstantiationException, + NullPointerException, + ClassCastException { - String className = System.getProperty("org.xml.sax.parser"); - if (className == null) { - throw new NullPointerException("No value for sax.parser property"); - } else { - return makeParser(className); - } + String className = System.getProperty("org.xml.sax.parser"); + if (className == null) { + throw new NullPointerException("No value for sax.parser property"); + } else { + return makeParser(className); + } } - - + + /** * Create a new SAX parser object using the class name provided. * @@ -116,14 +116,13 @@ public class ParserFactory { * @see org.xml.sax.Parser */ public static Parser makeParser (String className) - throws ClassNotFoundException, - IllegalAccessException, - InstantiationException, - ClassCastException + throws ClassNotFoundException, + IllegalAccessException, + InstantiationException, + ClassCastException { - return (Parser) NewInstance.newInstance ( - NewInstance.getClassLoader (), className); + return (Parser) NewInstance.newInstance ( + NewInstance.getClassLoader (), className); } - -} +} diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java index 64ff0a4cf88..4b4aba092b3 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java @@ -54,7 +54,7 @@ public class XMLFilterImpl implements XMLFilter, EntityResolver, DTDHandler, ContentHandler, ErrorHandler { - + //////////////////////////////////////////////////////////////////// // Constructors. //////////////////////////////////////////////////////////////////// @@ -74,7 +74,7 @@ public class XMLFilterImpl */ public XMLFilterImpl () { - super(); + super(); } @@ -87,11 +87,11 @@ public class XMLFilterImpl public XMLFilterImpl (XMLReader parent) { super(); - setParent(parent); + setParent(parent); } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.XMLFilter. //////////////////////////////////////////////////////////////////// @@ -100,8 +100,8 @@ public class XMLFilterImpl /** * Set the parent reader. * - *

    This is the {@link org.xml.sax.XMLReader XMLReader} from which - * this filter will obtain its events and to which it will pass its + *

    This is the {@link org.xml.sax.XMLReader XMLReader} from which + * this filter will obtain its events and to which it will pass its * configuration requests. The parent may itself be another filter.

    * *

    If there is no parent reader set, any attempt to parse @@ -112,7 +112,7 @@ public class XMLFilterImpl */ public void setParent (XMLReader parent) { - this.parent = parent; + this.parent = parent; } @@ -124,11 +124,11 @@ public class XMLFilterImpl */ public XMLReader getParent () { - return parent; + return parent; } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.XMLReader. //////////////////////////////////////////////////////////////////// @@ -144,17 +144,17 @@ public class XMLFilterImpl * @exception org.xml.sax.SAXNotRecognizedException If the feature * value can't be assigned or retrieved from the parent. * @exception org.xml.sax.SAXNotSupportedException When the - * parent recognizes the feature name but + * parent recognizes the feature name but * cannot set the requested value. */ public void setFeature (String name, boolean value) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (parent != null) { - parent.setFeature(name, value); - } else { - throw new SAXNotRecognizedException("Feature: " + name); - } + if (parent != null) { + parent.setFeature(name, value); + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } } @@ -168,17 +168,17 @@ public class XMLFilterImpl * @exception org.xml.sax.SAXNotRecognizedException If the feature * value can't be assigned or retrieved from the parent. * @exception org.xml.sax.SAXNotSupportedException When the - * parent recognizes the feature name but + * parent recognizes the feature name but * cannot determine its value at this time. */ public boolean getFeature (String name) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (parent != null) { - return parent.getFeature(name); - } else { - throw new SAXNotRecognizedException("Feature: " + name); - } + if (parent != null) { + return parent.getFeature(name); + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } } @@ -192,17 +192,17 @@ public class XMLFilterImpl * @exception org.xml.sax.SAXNotRecognizedException If the property * value can't be assigned or retrieved from the parent. * @exception org.xml.sax.SAXNotSupportedException When the - * parent recognizes the property name but + * parent recognizes the property name but * cannot set the requested value. */ public void setProperty (String name, Object value) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (parent != null) { - parent.setProperty(name, value); - } else { - throw new SAXNotRecognizedException("Property: " + name); - } + if (parent != null) { + parent.setProperty(name, value); + } else { + throw new SAXNotRecognizedException("Property: " + name); + } } @@ -214,17 +214,17 @@ public class XMLFilterImpl * @exception org.xml.sax.SAXNotRecognizedException If the property * value can't be assigned or retrieved from the parent. * @exception org.xml.sax.SAXNotSupportedException When the - * parent recognizes the property name but + * parent recognizes the property name but * cannot determine its value at this time. */ public Object getProperty (String name) - throws SAXNotRecognizedException, SAXNotSupportedException + throws SAXNotRecognizedException, SAXNotSupportedException { - if (parent != null) { - return parent.getProperty(name); - } else { - throw new SAXNotRecognizedException("Property: " + name); - } + if (parent != null) { + return parent.getProperty(name); + } else { + throw new SAXNotRecognizedException("Property: " + name); + } } @@ -235,7 +235,7 @@ public class XMLFilterImpl */ public void setEntityResolver (EntityResolver resolver) { - entityResolver = resolver; + entityResolver = resolver; } @@ -246,7 +246,7 @@ public class XMLFilterImpl */ public EntityResolver getEntityResolver () { - return entityResolver; + return entityResolver; } @@ -257,7 +257,7 @@ public class XMLFilterImpl */ public void setDTDHandler (DTDHandler handler) { - dtdHandler = handler; + dtdHandler = handler; } @@ -268,7 +268,7 @@ public class XMLFilterImpl */ public DTDHandler getDTDHandler () { - return dtdHandler; + return dtdHandler; } @@ -279,7 +279,7 @@ public class XMLFilterImpl */ public void setContentHandler (ContentHandler handler) { - contentHandler = handler; + contentHandler = handler; } @@ -290,7 +290,7 @@ public class XMLFilterImpl */ public ContentHandler getContentHandler () { - return contentHandler; + return contentHandler; } @@ -301,7 +301,7 @@ public class XMLFilterImpl */ public void setErrorHandler (ErrorHandler handler) { - errorHandler = handler; + errorHandler = handler; } @@ -312,7 +312,7 @@ public class XMLFilterImpl */ public ErrorHandler getErrorHandler () { - return errorHandler; + return errorHandler; } @@ -327,10 +327,10 @@ public class XMLFilterImpl * supplied by the application. */ public void parse (InputSource input) - throws SAXException, IOException + throws SAXException, IOException { - setupParse(); - parent.parse(input); + setupParse(); + parent.parse(input); } @@ -345,13 +345,13 @@ public class XMLFilterImpl * supplied by the application. */ public void parse (String systemId) - throws SAXException, IOException + throws SAXException, IOException { - parse(new InputSource(systemId)); + parse(new InputSource(systemId)); } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.EntityResolver. //////////////////////////////////////////////////////////////////// @@ -370,22 +370,22 @@ public class XMLFilterImpl * new InputSource. */ public InputSource resolveEntity (String publicId, String systemId) - throws SAXException, IOException + throws SAXException, IOException { - if (entityResolver != null) { - return entityResolver.resolveEntity(publicId, systemId); - } else { - return null; - } + if (entityResolver != null) { + return entityResolver.resolveEntity(publicId, systemId); + } else { + return null; + } } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.DTDHandler. //////////////////////////////////////////////////////////////////// - + /** * Filter a notation declaration event. * @@ -396,14 +396,14 @@ public class XMLFilterImpl * an exception during processing. */ public void notationDecl (String name, String publicId, String systemId) - throws SAXException + throws SAXException { - if (dtdHandler != null) { - dtdHandler.notationDecl(name, publicId, systemId); - } + if (dtdHandler != null) { + dtdHandler.notationDecl(name, publicId, systemId); + } } - + /** * Filter an unparsed entity declaration event. * @@ -415,17 +415,17 @@ public class XMLFilterImpl * an exception during processing. */ public void unparsedEntityDecl (String name, String publicId, - String systemId, String notationName) - throws SAXException + String systemId, String notationName) + throws SAXException { - if (dtdHandler != null) { - dtdHandler.unparsedEntityDecl(name, publicId, systemId, - notationName); - } + if (dtdHandler != null) { + dtdHandler.unparsedEntityDecl(name, publicId, systemId, + notationName); + } } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.ContentHandler. //////////////////////////////////////////////////////////////////// @@ -438,10 +438,10 @@ public class XMLFilterImpl */ public void setDocumentLocator (Locator locator) { - this.locator = locator; - if (contentHandler != null) { - contentHandler.setDocumentLocator(locator); - } + this.locator = locator; + if (contentHandler != null) { + contentHandler.setDocumentLocator(locator); + } } @@ -452,11 +452,11 @@ public class XMLFilterImpl * an exception during processing. */ public void startDocument () - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.startDocument(); - } + if (contentHandler != null) { + contentHandler.startDocument(); + } } @@ -467,11 +467,11 @@ public class XMLFilterImpl * an exception during processing. */ public void endDocument () - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.endDocument(); - } + if (contentHandler != null) { + contentHandler.endDocument(); + } } @@ -484,11 +484,11 @@ public class XMLFilterImpl * an exception during processing. */ public void startPrefixMapping (String prefix, String uri) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.startPrefixMapping(prefix, uri); - } + if (contentHandler != null) { + contentHandler.startPrefixMapping(prefix, uri); + } } @@ -500,11 +500,11 @@ public class XMLFilterImpl * an exception during processing. */ public void endPrefixMapping (String prefix) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.endPrefixMapping(prefix); - } + if (contentHandler != null) { + contentHandler.endPrefixMapping(prefix); + } } @@ -520,12 +520,12 @@ public class XMLFilterImpl * an exception during processing. */ public void startElement (String uri, String localName, String qName, - Attributes atts) - throws SAXException + Attributes atts) + throws SAXException { - if (contentHandler != null) { - contentHandler.startElement(uri, localName, qName, atts); - } + if (contentHandler != null) { + contentHandler.startElement(uri, localName, qName, atts); + } } @@ -540,11 +540,11 @@ public class XMLFilterImpl * an exception during processing. */ public void endElement (String uri, String localName, String qName) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.endElement(uri, localName, qName); - } + if (contentHandler != null) { + contentHandler.endElement(uri, localName, qName); + } } @@ -558,11 +558,11 @@ public class XMLFilterImpl * an exception during processing. */ public void characters (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.characters(ch, start, length); - } + if (contentHandler != null) { + contentHandler.characters(ch, start, length); + } } @@ -576,11 +576,11 @@ public class XMLFilterImpl * an exception during processing. */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.ignorableWhitespace(ch, start, length); - } + if (contentHandler != null) { + contentHandler.ignorableWhitespace(ch, start, length); + } } @@ -593,11 +593,11 @@ public class XMLFilterImpl * an exception during processing. */ public void processingInstruction (String target, String data) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.processingInstruction(target, data); - } + if (contentHandler != null) { + contentHandler.processingInstruction(target, data); + } } @@ -609,15 +609,15 @@ public class XMLFilterImpl * an exception during processing. */ public void skippedEntity (String name) - throws SAXException + throws SAXException { - if (contentHandler != null) { - contentHandler.skippedEntity(name); - } + if (contentHandler != null) { + contentHandler.skippedEntity(name); + } } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.ErrorHandler. //////////////////////////////////////////////////////////////////// @@ -631,11 +631,11 @@ public class XMLFilterImpl * an exception during processing. */ public void warning (SAXParseException e) - throws SAXException + throws SAXException { - if (errorHandler != null) { - errorHandler.warning(e); - } + if (errorHandler != null) { + errorHandler.warning(e); + } } @@ -647,11 +647,11 @@ public class XMLFilterImpl * an exception during processing. */ public void error (SAXParseException e) - throws SAXException + throws SAXException { - if (errorHandler != null) { - errorHandler.error(e); - } + if (errorHandler != null) { + errorHandler.error(e); + } } @@ -663,15 +663,15 @@ public class XMLFilterImpl * an exception during processing. */ public void fatalError (SAXParseException e) - throws SAXException + throws SAXException { - if (errorHandler != null) { - errorHandler.fatalError(e); - } + if (errorHandler != null) { + errorHandler.fatalError(e); + } } - + //////////////////////////////////////////////////////////////////// // Internal methods. //////////////////////////////////////////////////////////////////// @@ -681,22 +681,22 @@ public class XMLFilterImpl * Set up before a parse. * *

    Before every parse, check whether the parent is - * non-null, and re-register the filter for all of the + * non-null, and re-register the filter for all of the * events.

    */ private void setupParse () { - if (parent == null) { - throw new NullPointerException("No parent for filter"); - } - parent.setEntityResolver(this); - parent.setDTDHandler(this); - parent.setContentHandler(this); - parent.setErrorHandler(this); + if (parent == null) { + throw new NullPointerException("No parent for filter"); + } + parent.setEntityResolver(this); + parent.setDTDHandler(this); + parent.setContentHandler(this); + parent.setErrorHandler(this); } - + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java index d2214747d74..8ab909a7754 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java @@ -9,7 +9,7 @@ package org.xml.sax.helpers; import java.io.IOException; import java.util.Locale; -import org.xml.sax.Parser; // deprecated +import org.xml.sax.Parser; // deprecated import org.xml.sax.Locator; import org.xml.sax.InputSource; import org.xml.sax.AttributeList; // deprecated @@ -36,11 +36,11 @@ import org.xml.sax.SAXNotSupportedException; * * *

    This class wraps a SAX2 {@link org.xml.sax.XMLReader XMLReader} - * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader - * must support a true value for the + * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader + * must support a true value for the * http://xml.org/sax/features/namespace-prefixes property or parsing will fail - * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader - * supports a false value for the http://xml.org/sax/features/namespaces + * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader + * supports a false value for the http://xml.org/sax/features/namespaces * property, that will also be used to improve efficiency.

    * * @since SAX 2.0 @@ -52,7 +52,7 @@ import org.xml.sax.SAXNotSupportedException; public class XMLReaderAdapter implements Parser, ContentHandler { - + //////////////////////////////////////////////////////////////////// // Constructor. //////////////////////////////////////////////////////////////////// @@ -71,7 +71,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler public XMLReaderAdapter () throws SAXException { - setup(XMLReaderFactory.createXMLReader()); + setup(XMLReaderFactory.createXMLReader()); } @@ -87,7 +87,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public XMLReaderAdapter (XMLReader xmlReader) { - setup(xmlReader); + setup(xmlReader); } @@ -99,11 +99,11 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ private void setup (XMLReader xmlReader) { - if (xmlReader == null) { - throw new NullPointerException("XMLReader must not be null"); - } - this.xmlReader = xmlReader; - qAtts = new AttributesAdapter(); + if (xmlReader == null) { + throw new NullPointerException("XMLReader must not be null"); + } + this.xmlReader = xmlReader; + qAtts = new AttributesAdapter(); } @@ -124,9 +124,9 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @exception org.xml.sax.SAXException Thrown unless overridden. */ public void setLocale (Locale locale) - throws SAXException + throws SAXException { - throw new SAXNotSupportedException("setLocale not supported"); + throw new SAXNotSupportedException("setLocale not supported"); } @@ -138,7 +138,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public void setEntityResolver (EntityResolver resolver) { - xmlReader.setEntityResolver(resolver); + xmlReader.setEntityResolver(resolver); } @@ -150,7 +150,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public void setDTDHandler (DTDHandler handler) { - xmlReader.setDTDHandler(handler); + xmlReader.setDTDHandler(handler); } @@ -165,7 +165,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public void setDocumentHandler (DocumentHandler handler) { - documentHandler = handler; + documentHandler = handler; } @@ -177,7 +177,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public void setErrorHandler (ErrorHandler handler) { - xmlReader.setErrorHandler(handler); + xmlReader.setErrorHandler(handler); } @@ -185,7 +185,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler * Parse the document. * *

    This method will throw an exception if the embedded - * XMLReader does not support the + * XMLReader does not support the * http://xml.org/sax/features/namespace-prefixes property.

    * * @param systemId The absolute URL of the document. @@ -197,9 +197,9 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.Parser#parse(java.lang.String) */ public void parse (String systemId) - throws IOException, SAXException + throws IOException, SAXException { - parse(new InputSource(systemId)); + parse(new InputSource(systemId)); } @@ -207,7 +207,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler * Parse the document. * *

    This method will throw an exception if the embedded - * XMLReader does not support the + * XMLReader does not support the * http://xml.org/sax/features/namespace-prefixes property.

    * * @param input An input source for the document. @@ -219,10 +219,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource) */ public void parse (InputSource input) - throws IOException, SAXException + throws IOException, SAXException { - setupXMLReader(); - xmlReader.parse(input); + setupXMLReader(); + xmlReader.parse(input); } @@ -230,20 +230,20 @@ public class XMLReaderAdapter implements Parser, ContentHandler * Set up the XML reader. */ private void setupXMLReader () - throws SAXException + throws SAXException { - xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - try { - xmlReader.setFeature("http://xml.org/sax/features/namespaces", - false); - } catch (SAXException e) { - // NO OP: it's just extra information, and we can ignore it - } - xmlReader.setContentHandler(this); + xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); + try { + xmlReader.setFeature("http://xml.org/sax/features/namespaces", + false); + } catch (SAXException e) { + // NO OP: it's just extra information, and we can ignore it + } + xmlReader.setContentHandler(this); } - + //////////////////////////////////////////////////////////////////// // Implementation of org.xml.sax.ContentHandler. //////////////////////////////////////////////////////////////////// @@ -257,8 +257,8 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ public void setDocumentLocator (Locator locator) { - if (documentHandler != null) - documentHandler.setDocumentLocator(locator); + if (documentHandler != null) + documentHandler.setDocumentLocator(locator); } @@ -270,10 +270,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#startDocument */ public void startDocument () - throws SAXException + throws SAXException { - if (documentHandler != null) - documentHandler.startDocument(); + if (documentHandler != null) + documentHandler.startDocument(); } @@ -285,10 +285,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#endDocument */ public void endDocument () - throws SAXException + throws SAXException { - if (documentHandler != null) - documentHandler.endDocument(); + if (documentHandler != null) + documentHandler.endDocument(); } @@ -327,13 +327,13 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#endDocument */ public void startElement (String uri, String localName, - String qName, Attributes atts) - throws SAXException + String qName, Attributes atts) + throws SAXException { - if (documentHandler != null) { - qAtts.setAttributes(atts); - documentHandler.startElement(qName, qAtts); - } + if (documentHandler != null) { + qAtts.setAttributes(atts); + documentHandler.startElement(qName, qAtts); + } } @@ -348,11 +348,11 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#endElement */ public void endElement (String uri, String localName, - String qName) - throws SAXException + String qName) + throws SAXException { - if (documentHandler != null) - documentHandler.endElement(qName); + if (documentHandler != null) + documentHandler.endElement(qName); } @@ -367,10 +367,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#characters */ public void characters (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (documentHandler != null) - documentHandler.characters(ch, start, length); + if (documentHandler != null) + documentHandler.characters(ch, start, length); } @@ -385,10 +385,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#ignorableWhitespace */ public void ignorableWhitespace (char ch[], int start, int length) - throws SAXException + throws SAXException { - if (documentHandler != null) - documentHandler.ignorableWhitespace(ch, start, length); + if (documentHandler != null) + documentHandler.ignorableWhitespace(ch, start, length); } @@ -402,10 +402,10 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @see org.xml.sax.ContentHandler#processingInstruction */ public void processingInstruction (String target, String data) - throws SAXException + throws SAXException { - if (documentHandler != null) - documentHandler.processingInstruction(target, data); + if (documentHandler != null) + documentHandler.processingInstruction(target, data); } @@ -417,12 +417,12 @@ public class XMLReaderAdapter implements Parser, ContentHandler * @exception org.xml.sax.SAXException Throwable by subclasses. */ public void skippedEntity (String name) - throws SAXException + throws SAXException { } - + //////////////////////////////////////////////////////////////////// // Internal state. //////////////////////////////////////////////////////////////////// @@ -432,7 +432,7 @@ public class XMLReaderAdapter implements Parser, ContentHandler AttributesAdapter qAtts; - + //////////////////////////////////////////////////////////////////// // Internal class. //////////////////////////////////////////////////////////////////// @@ -443,94 +443,94 @@ public class XMLReaderAdapter implements Parser, ContentHandler */ final class AttributesAdapter implements AttributeList { - AttributesAdapter () - { - } + AttributesAdapter () + { + } - /** - * Set the embedded Attributes object. - * - * @param The embedded SAX2 Attributes. - */ - void setAttributes (Attributes attributes) - { - this.attributes = attributes; - } + /** + * Set the embedded Attributes object. + * + * @param The embedded SAX2 Attributes. + */ + void setAttributes (Attributes attributes) + { + this.attributes = attributes; + } - /** - * Return the number of attributes. - * - * @return The length of the attribute list. - * @see org.xml.sax.AttributeList#getLength - */ - public int getLength () - { - return attributes.getLength(); - } + /** + * Return the number of attributes. + * + * @return The length of the attribute list. + * @see org.xml.sax.AttributeList#getLength + */ + public int getLength () + { + return attributes.getLength(); + } - /** - * Return the qualified (prefixed) name of an attribute by position. - * - * @return The qualified name. - * @see org.xml.sax.AttributeList#getName - */ - public String getName (int i) - { - return attributes.getQName(i); - } + /** + * Return the qualified (prefixed) name of an attribute by position. + * + * @return The qualified name. + * @see org.xml.sax.AttributeList#getName + */ + public String getName (int i) + { + return attributes.getQName(i); + } - /** - * Return the type of an attribute by position. - * - * @return The type. - * @see org.xml.sax.AttributeList#getType(int) - */ - public String getType (int i) - { - return attributes.getType(i); - } + /** + * Return the type of an attribute by position. + * + * @return The type. + * @see org.xml.sax.AttributeList#getType(int) + */ + public String getType (int i) + { + return attributes.getType(i); + } - /** - * Return the value of an attribute by position. - * - * @return The value. - * @see org.xml.sax.AttributeList#getValue(int) - */ - public String getValue (int i) - { - return attributes.getValue(i); - } + /** + * Return the value of an attribute by position. + * + * @return The value. + * @see org.xml.sax.AttributeList#getValue(int) + */ + public String getValue (int i) + { + return attributes.getValue(i); + } - /** - * Return the type of an attribute by qualified (prefixed) name. - * - * @return The type. - * @see org.xml.sax.AttributeList#getType(java.lang.String) - */ - public String getType (String qName) - { - return attributes.getType(qName); - } + /** + * Return the type of an attribute by qualified (prefixed) name. + * + * @return The type. + * @see org.xml.sax.AttributeList#getType(java.lang.String) + */ + public String getType (String qName) + { + return attributes.getType(qName); + } - /** - * Return the value of an attribute by qualified (prefixed) name. - * - * @return The value. - * @see org.xml.sax.AttributeList#getValue(java.lang.String) - */ - public String getValue (String qName) - { - return attributes.getValue(qName); - } + /** + * Return the value of an attribute by qualified (prefixed) name. + * + * @return The value. + * @see org.xml.sax.AttributeList#getValue(java.lang.String) + */ + public String getValue (String qName) + { + return attributes.getValue(qName); + } - private Attributes attributes; + private Attributes attributes; } } diff --git a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java index 304f750b9cc..9a04f9b0dda 100644 --- a/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java +++ b/libjava/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java @@ -102,64 +102,64 @@ final public class XMLReaderFactory * @see #createXMLReader(java.lang.String) */ public static XMLReader createXMLReader () - throws SAXException + throws SAXException { - String className = null; - ClassLoader loader = NewInstance.getClassLoader (); - - // 1. try the JVM-instance-wide system property - try { className = System.getProperty (property); } - catch (RuntimeException e) { /* normally fails for applets */ } + String className = null; + ClassLoader loader = NewInstance.getClassLoader (); - // 2. if that fails, try META-INF/services/ - if (className == null) { - try { - String service = "META-INF/services/" + property; - InputStream in; - BufferedReader reader; + // 1. try the JVM-instance-wide system property + try { className = System.getProperty (property); } + catch (RuntimeException e) { /* normally fails for applets */ } - if (loader == null) - in = ClassLoader.getSystemResourceAsStream (service); - else - in = loader.getResourceAsStream (service); + // 2. if that fails, try META-INF/services/ + if (className == null) { + try { + String service = "META-INF/services/" + property; + InputStream in; + BufferedReader reader; - if (in != null) { - reader = new BufferedReader ( - new InputStreamReader (in, "UTF8")); - className = reader.readLine (); - in.close (); - } - } catch (Exception e) { - } - } + if (loader == null) + in = ClassLoader.getSystemResourceAsStream (service); + else + in = loader.getResourceAsStream (service); - // 3. Distro-specific fallback - if (className == null) { + if (in != null) { + reader = new BufferedReader ( + new InputStreamReader (in, "UTF8")); + className = reader.readLine (); + in.close (); + } + } catch (Exception e) { + } + } + + // 3. Distro-specific fallback + if (className == null) { // BEGIN DISTRIBUTION-SPECIFIC - // CLASSPATH LOCAL: have to code in the backup. - // Among other things, see PR 31303, and this thread: - // http://gcc.gnu.org/ml/java-patches/2007-q1/msg00661.html - className = "gnu.xml.stream.SAXParser"; + // CLASSPATH LOCAL: have to code in the backup. + // Among other things, see PR 31303, and this thread: + // http://gcc.gnu.org/ml/java-patches/2007-q1/msg00661.html + className = "gnu.xml.stream.SAXParser"; - // EXAMPLE: - // className = "com.example.sax.XmlReader"; - // or a $JAVA_HOME/jre/lib/*properties setting... + // EXAMPLE: + // className = "com.example.sax.XmlReader"; + // or a $JAVA_HOME/jre/lib/*properties setting... // END DISTRIBUTION-SPECIFIC - } - - // do we know the XMLReader implementation class yet? - if (className != null) - return loadClass (loader, className); + } - // 4. panic -- adapt any SAX1 parser - try { - return new ParserAdapter (ParserFactory.makeParser ()); - } catch (Exception e) { - throw new SAXException ("Can't create default XMLReader; " - + "is system property org.xml.sax.driver set?"); - } + // do we know the XMLReader implementation class yet? + if (className != null) + return loadClass (loader, className); + + // 4. panic -- adapt any SAX1 parser + try { + return new ParserAdapter (ParserFactory.makeParser ()); + } catch (Exception e) { + throw new SAXException ("Can't create default XMLReader; " + + "is system property org.xml.sax.driver set?"); + } } @@ -179,29 +179,29 @@ final public class XMLReaderFactory * @see #createXMLReader() */ public static XMLReader createXMLReader (String className) - throws SAXException + throws SAXException { - return loadClass (NewInstance.getClassLoader (), className); + return loadClass (NewInstance.getClassLoader (), className); } private static XMLReader loadClass (ClassLoader loader, String className) throws SAXException { - try { - return (XMLReader) NewInstance.newInstance (loader, className); - } catch (ClassNotFoundException e1) { - throw new SAXException("SAX2 driver class " + className + - " not found", e1); - } catch (IllegalAccessException e2) { - throw new SAXException("SAX2 driver class " + className + - " found but cannot be loaded", e2); - } catch (InstantiationException e3) { - throw new SAXException("SAX2 driver class " + className + - " loaded but cannot be instantiated (no empty public constructor?)", - e3); - } catch (ClassCastException e4) { - throw new SAXException("SAX2 driver class " + className + - " does not implement XMLReader", e4); - } + try { + return (XMLReader) NewInstance.newInstance (loader, className); + } catch (ClassNotFoundException e1) { + throw new SAXException("SAX2 driver class " + className + + " not found", e1); + } catch (IllegalAccessException e2) { + throw new SAXException("SAX2 driver class " + className + + " found but cannot be loaded", e2); + } catch (InstantiationException e3) { + throw new SAXException("SAX2 driver class " + className + + " loaded but cannot be instantiated (no empty public constructor?)", + e3); + } catch (ClassCastException e4) { + throw new SAXException("SAX2 driver class " + className + + " does not implement XMLReader", e4); + } } } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Attr.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Attr.java index d9ed6ffe128..94404512993 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Attr.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Attr.java @@ -13,79 +13,79 @@ package org.w3c.dom; /** - * The Attr interface represents an attribute in an - * Element object. Typically the allowable values for the + * The Attr interface represents an attribute in an + * Element object. Typically the allowable values for the * attribute are defined in a schema associated with the document. - *

    Attr objects inherit the Node interface, but - * since they are not actually child nodes of the element they describe, the - * DOM does not consider them part of the document tree. Thus, the - * Node attributes parentNode, - * previousSibling, and nextSibling have a - * null value for Attr objects. The DOM takes the - * view that attributes are properties of elements rather than having a - * separate identity from the elements they are associated with; this should - * make it more efficient to implement such features as default attributes - * associated with all elements of a given type. Furthermore, - * Attr nodes may not be immediate children of a - * DocumentFragment. However, they can be associated with - * Element nodes contained within a - * DocumentFragment. In short, users and implementors of the - * DOM need to be aware that Attr nodes have some things in - * common with other objects inheriting the Node interface, but + *

    Attr objects inherit the Node interface, but + * since they are not actually child nodes of the element they describe, the + * DOM does not consider them part of the document tree. Thus, the + * Node attributes parentNode, + * previousSibling, and nextSibling have a + * null value for Attr objects. The DOM takes the + * view that attributes are properties of elements rather than having a + * separate identity from the elements they are associated with; this should + * make it more efficient to implement such features as default attributes + * associated with all elements of a given type. Furthermore, + * Attr nodes may not be immediate children of a + * DocumentFragment. However, they can be associated with + * Element nodes contained within a + * DocumentFragment. In short, users and implementors of the + * DOM need to be aware that Attr nodes have some things in + * common with other objects inheriting the Node interface, but * they also are quite distinct. - *

    The attribute's effective value is determined as follows: if this - * attribute has been explicitly assigned any value, that value is the - * attribute's effective value; otherwise, if there is a declaration for - * this attribute, and that declaration includes a default value, then that - * default value is the attribute's effective value; otherwise, the - * attribute does not exist on this element in the structure model until it - * has been explicitly added. Note that the Node.nodeValue - * attribute on the Attr instance can also be used to retrieve + *

    The attribute's effective value is determined as follows: if this + * attribute has been explicitly assigned any value, that value is the + * attribute's effective value; otherwise, if there is a declaration for + * this attribute, and that declaration includes a default value, then that + * default value is the attribute's effective value; otherwise, the + * attribute does not exist on this element in the structure model until it + * has been explicitly added. Note that the Node.nodeValue + * attribute on the Attr instance can also be used to retrieve * the string version of the attribute's value(s). - *

    If the attribute was not explicitly given a value in the instance - * document but has a default value provided by the schema associated with - * the document, an attribute node will be created with - * specified set to false. Removing attribute - * nodes for which a default value is defined in the schema generates a new - * attribute node with the default value and specified set to - * false. If validation occurred while invoking - * Document.normalizeDocument(), attribute nodes with - * specified equals to false are recomputed - * according to the default attribute values provided by the schema. If no - * default value is associate with this attribute in the schema, the - * attribute node is discarded. - *

    In XML, where the value of an attribute can contain entity references, - * the child nodes of the Attr node may be either - * Text or EntityReference nodes (when these are - * in use; see the description of EntityReference for - * discussion). - *

    The DOM Core represents all attribute values as simple strings, even if - * the DTD or schema associated with the document declares them of some - * specific type such as tokenized. - *

    The way attribute value normalization is performed by the DOM - * implementation depends on how much the implementation knows about the - * schema in use. Typically, the value and - * nodeValue attributes of an Attr node initially - * returns the normalized value given by the parser. It is also the case - * after Document.normalizeDocument() is called (assuming the - * right options have been set). But this may not be the case after - * mutation, independently of whether the mutation is performed by setting - * the string value directly or by changing the Attr child - * nodes. In particular, this is true when character - * references are involved, given that they are not represented in the DOM and they - * impact attribute value normalization. On the other hand, if the - * implementation knows about the schema in use when the attribute value is - * changed, and it is of a different type than CDATA, it may normalize it - * again at that time. This is especially true of specialized DOM - * implementations, such as SVG DOM implementations, which store attribute + *

    If the attribute was not explicitly given a value in the instance + * document but has a default value provided by the schema associated with + * the document, an attribute node will be created with + * specified set to false. Removing attribute + * nodes for which a default value is defined in the schema generates a new + * attribute node with the default value and specified set to + * false. If validation occurred while invoking + * Document.normalizeDocument(), attribute nodes with + * specified equals to false are recomputed + * according to the default attribute values provided by the schema. If no + * default value is associate with this attribute in the schema, the + * attribute node is discarded. + *

    In XML, where the value of an attribute can contain entity references, + * the child nodes of the Attr node may be either + * Text or EntityReference nodes (when these are + * in use; see the description of EntityReference for + * discussion). + *

    The DOM Core represents all attribute values as simple strings, even if + * the DTD or schema associated with the document declares them of some + * specific type such as tokenized. + *

    The way attribute value normalization is performed by the DOM + * implementation depends on how much the implementation knows about the + * schema in use. Typically, the value and + * nodeValue attributes of an Attr node initially + * returns the normalized value given by the parser. It is also the case + * after Document.normalizeDocument() is called (assuming the + * right options have been set). But this may not be the case after + * mutation, independently of whether the mutation is performed by setting + * the string value directly or by changing the Attr child + * nodes. In particular, this is true when character + * references are involved, given that they are not represented in the DOM and they + * impact attribute value normalization. On the other hand, if the + * implementation knows about the schema in use when the attribute value is + * changed, and it is of a different type than CDATA, it may normalize it + * again at that time. This is especially true of specialized DOM + * implementations, such as SVG DOM implementations, which store attribute * values in an internal form different from a string. - *

    The following table gives some examples of the relations between the - * attribute value in the original document (parsed attribute), the value as - * exposed in the DOM, and the serialization of the value: + *

    The following table gives some examples of the relations between the + * attribute value in the original document (parsed attribute), the value as + * exposed in the DOM, and the serialization of the value: * * * - * * * @@ -104,7 +104,7 @@ package org.w3c.dom; * * * - * * * * *
    ExamplesParsed + * Parsed * attribute valueInitial Attr.valueSerialized attribute value
    Built-in + * Built-in * character entity * 
    "y&lt;6"
    @@ -132,7 +132,7 @@ package org.w3c.dom; *
    Normalized newline between - * 
    "x=5 
+ * 
    "x=5
  * y=6"
    
  *
    		@@ -156,51 +156,51 @@ package org.w3c.dom; */ public interface Attr extends Node { /** - * Returns the name of this attribute. If Node.localName is + * Returns the name of this attribute. If Node.localName is * different from null, this attribute is a qualified name. */ public String getName(); /** - * True if this attribute was explicitly given a value in - * the instance document, false otherwise. If the - * application changed the value of this attribute node (even if it ends - * up having the same value as the default value) then it is set to - * true. The implementation may handle attributes with - * default values from other schemas similarly but applications should - * use Document.normalizeDocument() to guarantee this - * information is up-to-date. + * True if this attribute was explicitly given a value in + * the instance document, false otherwise. If the + * application changed the value of this attribute node (even if it ends + * up having the same value as the default value) then it is set to + * true. The implementation may handle attributes with + * default values from other schemas similarly but applications should + * use Document.normalizeDocument() to guarantee this + * information is up-to-date. */ public boolean getSpecified(); /** - * On retrieval, the value of the attribute is returned as a string. - * Character and general entity references are replaced with their - * values. See also the method getAttribute on the + * On retrieval, the value of the attribute is returned as a string. + * Character and general entity references are replaced with their + * values. See also the method getAttribute on the * Element interface. - *
    On setting, this creates a Text node with the unparsed - * contents of the string, i.e. any characters that an XML processor - * would recognize as markup are instead treated as literal text. See + *
    On setting, this creates a Text node with the unparsed + * contents of the string, i.e. any characters that an XML processor + * would recognize as markup are instead treated as literal text. See * also the method Element.setAttribute(). - *
    Some specialized implementations, such as some [SVG 1.1] - * implementations, may do normalization automatically, even after - * mutation; in such case, the value on retrieval may differ from the - * value on setting. + *
    Some specialized implementations, such as some [SVG 1.1] + * implementations, may do normalization automatically, even after + * mutation; in such case, the value on retrieval may differ from the + * value on setting. */ public String getValue(); /** - * On retrieval, the value of the attribute is returned as a string. - * Character and general entity references are replaced with their - * values. See also the method getAttribute on the + * On retrieval, the value of the attribute is returned as a string. + * Character and general entity references are replaced with their + * values. See also the method getAttribute on the * Element interface. - *
    On setting, this creates a Text node with the unparsed - * contents of the string, i.e. any characters that an XML processor - * would recognize as markup are instead treated as literal text. See + *
    On setting, this creates a Text node with the unparsed + * contents of the string, i.e. any characters that an XML processor + * would recognize as markup are instead treated as literal text. See * also the method Element.setAttribute(). - *
    Some specialized implementations, such as some [SVG 1.1] - * implementations, may do normalization automatically, even after - * mutation; in such case, the value on retrieval may differ from the - * value on setting. + *
    Some specialized implementations, such as some [SVG 1.1] + * implementations, may do normalization automatically, even after + * mutation; in such case, the value on retrieval may differ from the + * value on setting. * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. */ @@ -208,66 +208,66 @@ public interface Attr extends Node { throws DOMException; /** - * The Element node this attribute is attached to or + * The Element node this attribute is attached to or * null if this attribute is not in use. * @since DOM Level 2 */ public Element getOwnerElement(); /** - * The type information associated with this attribute. While the type - * information contained in this attribute is guarantee to be correct - * after loading the document or invoking + * The type information associated with this attribute. While the type + * information contained in this attribute is guarantee to be correct + * after loading the document or invoking * Document.normalizeDocument(), schemaTypeInfo - * may not be reliable if the node was moved. + * may not be reliable if the node was moved. * @since DOM Level 3 */ public TypeInfo getSchemaTypeInfo(); /** - * Returns whether this attribute is known to be of type ID (i.e. to - * contain an identifier for its owner element) or not. When it is and - * its value is unique, the ownerElement of this attribute + * Returns whether this attribute is known to be of type ID (i.e. to + * contain an identifier for its owner element) or not. When it is and + * its value is unique, the ownerElement of this attribute * can be retrieved using the method Document.getElementById - * . The implementation could use several ways to determine if an - * attribute node is known to contain an identifier: + * . The implementation could use several ways to determine if an + * attribute node is known to contain an identifier: *
      - *
    • If validation + *
    • If validation * occurred using an XML Schema [XML Schema Part 1] - * while loading the document or while invoking - * Document.normalizeDocument(), the post-schema-validation - * infoset contributions (PSVI contributions) values are used to - * determine if this attribute is a schema-determined ID attribute using + * while loading the document or while invoking + * Document.normalizeDocument(), the post-schema-validation + * infoset contributions (PSVI contributions) values are used to + * determine if this attribute is a schema-determined ID attribute using * the * schema-determined ID definition in [XPointer] - * . + * . *
      • - *
    • If validation occurred using a DTD while loading the document or - * while invoking Document.normalizeDocument(), the infoset [type definition] value is used to determine if this attribute is a DTD-determined ID + *
    • If validation occurred using a DTD while loading the document or + * while invoking Document.normalizeDocument(), the infoset [type definition] value is used to determine if this attribute is a DTD-determined ID * attribute using the * DTD-determined ID definition in [XPointer] - * . + * . *
      • - *
    • from the use of the methods Element.setIdAttribute(), - * Element.setIdAttributeNS(), or - * Element.setIdAttributeNode(), i.e. it is an - * user-determined ID attribute; + *
    • from the use of the methods Element.setIdAttribute(), + * Element.setIdAttributeNS(), or + * Element.setIdAttributeNode(), i.e. it is an + * user-determined ID attribute; *

      Note: XPointer framework (see section 3.2 in [XPointer] - * ) consider the DOM user-determined ID attribute as being part of the - * XPointer externally-determined ID definition. + * ) consider the DOM user-determined ID attribute as being part of the + * XPointer externally-determined ID definition. *

      • - *
    • using mechanisms that - * are outside the scope of this specification, it is then an - * externally-determined ID attribute. This includes using schema - * languages different from XML schema and DTD. + *
    • using mechanisms that + * are outside the scope of this specification, it is then an + * externally-determined ID attribute. This includes using schema + * languages different from XML schema and DTD. *
      • *
    - *
    If validation occurred while invoking - * Document.normalizeDocument(), all user-determined ID - * attributes are reset and all attribute nodes ID information are then - * reevaluated in accordance to the schema used. As a consequence, if - * the Attr.schemaTypeInfo attribute contains an ID type, - * isId will always return true. + *
    If validation occurred while invoking + * Document.normalizeDocument(), all user-determined ID + * attributes are reset and all attribute nodes ID information are then + * reevaluated in accordance to the schema used. As a consequence, if + * the Attr.schemaTypeInfo attribute contains an ID type, + * isId will always return true. * @since DOM Level 3 */ public boolean isId(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/CDATASection.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/CDATASection.java index 9267227e42d..ce4b346eba3 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/CDATASection.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/CDATASection.java @@ -13,40 +13,40 @@ package org.w3c.dom; /** - * CDATA sections are used to escape blocks of text containing characters that - * would otherwise be regarded as markup. The only delimiter that is - * recognized in a CDATA section is the "]]>" string that ends the CDATA - * section. CDATA sections cannot be nested. Their primary purpose is for - * including material such as XML fragments, without needing to escape all + * CDATA sections are used to escape blocks of text containing characters that + * would otherwise be regarded as markup. The only delimiter that is + * recognized in a CDATA section is the "]]>" string that ends the CDATA + * section. CDATA sections cannot be nested. Their primary purpose is for + * including material such as XML fragments, without needing to escape all * the delimiters. - *

    The CharacterData.data attribute holds the text that is - * contained by the CDATA section. Note that this may contain characters that need to be escaped outside of CDATA sections and - * that, depending on the character encoding ("charset") chosen for - * serialization, it may be impossible to write out some characters as part + *

    The CharacterData.data attribute holds the text that is + * contained by the CDATA section. Note that this may contain characters that need to be escaped outside of CDATA sections and + * that, depending on the character encoding ("charset") chosen for + * serialization, it may be impossible to write out some characters as part * of a CDATA section. - *

    The CDATASection interface inherits from the - * CharacterData interface through the Text - * interface. Adjacent CDATASection nodes are not merged by use + *

    The CDATASection interface inherits from the + * CharacterData interface through the Text + * interface. Adjacent CDATASection nodes are not merged by use * of the normalize method of the Node interface. - *

    No lexical check is done on the content of a CDATA section and it is - * therefore possible to have the character sequence "]]>" - * in the content, which is illegal in a CDATA section per section 2.7 of [XML 1.0]. The - * presence of this character sequence must generate a fatal error during - * serialization or the cdata section must be splitted before the - * serialization (see also the parameter "split-cdata-sections" - * in the DOMConfiguration interface). - *

    Note: Because no markup is recognized within a - * CDATASection, character numeric references cannot be used as - * an escape mechanism when serializing. Therefore, action needs to be taken - * when serializing a CDATASection with a character encoding - * where some of the contained characters cannot be represented. Failure to + *

    No lexical check is done on the content of a CDATA section and it is + * therefore possible to have the character sequence "]]>" + * in the content, which is illegal in a CDATA section per section 2.7 of [XML 1.0]. The + * presence of this character sequence must generate a fatal error during + * serialization or the cdata section must be splitted before the + * serialization (see also the parameter "split-cdata-sections" + * in the DOMConfiguration interface). + *

    Note: Because no markup is recognized within a + * CDATASection, character numeric references cannot be used as + * an escape mechanism when serializing. Therefore, action needs to be taken + * when serializing a CDATASection with a character encoding + * where some of the contained characters cannot be represented. Failure to * do so would not produce well-formed XML. - *

    Note: One potential solution in the serialization process is to - * end the CDATA section before the character, output the character using a - * character reference or entity reference, and open a new CDATA section for - * any further characters in the text node. Note, however, that some code - * conversion libraries at the time of writing do not return an error or - * exception when a character is missing from the encoding, making the task + *

    Note: One potential solution in the serialization process is to + * end the CDATA section before the character, output the character using a + * character reference or entity reference, and open a new CDATA section for + * any further characters in the text node. Note, however, that some code + * conversion libraries at the time of writing do not return an error or + * exception when a character is missing from the encoding, making the task * of ensuring that data is not corrupted on serialization more difficult. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/CharacterData.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/CharacterData.java index a12dcedfae3..37aa8dffaa0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/CharacterData.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/CharacterData.java @@ -13,42 +13,42 @@ package org.w3c.dom; /** - * The CharacterData interface extends Node with a set of - * attributes and methods for accessing character data in the DOM. For - * clarity this set is defined here rather than on each object that uses - * these attributes and methods. No DOM objects correspond directly to - * CharacterData, though Text and others do - * inherit the interface from it. All offsets in this interface + * The CharacterData interface extends Node with a set of + * attributes and methods for accessing character data in the DOM. For + * clarity this set is defined here rather than on each object that uses + * these attributes and methods. No DOM objects correspond directly to + * CharacterData, though Text and others do + * inherit the interface from it. All offsets in this interface * start from 0. - *

    As explained in the DOMString interface, text strings in - * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In - * the following, the term 16-bit units is used whenever necessary to + *

    As explained in the DOMString interface, text strings in + * the DOM are represented in UTF-16, i.e. as a sequence of 16-bit units. In + * the following, the term 16-bit units is used whenever necessary to * indicate that indexing on CharacterData is done in 16-bit units. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface CharacterData extends Node { /** - * The character data of the node that implements this interface. The DOM - * implementation may not put arbitrary limits on the amount of data - * that may be stored in a CharacterData node. However, - * implementation limits may mean that the entirety of a node's data may - * not fit into a single DOMString. In such cases, the user - * may call substringData to retrieve the data in + * The character data of the node that implements this interface. The DOM + * implementation may not put arbitrary limits on the amount of data + * that may be stored in a CharacterData node. However, + * implementation limits may mean that the entirety of a node's data may + * not fit into a single DOMString. In such cases, the user + * may call substringData to retrieve the data in * appropriately sized pieces. * @exception DOMException - * DOMSTRING_SIZE_ERR: Raised when it would return more characters than - * fit in a DOMString variable on the implementation + * DOMSTRING_SIZE_ERR: Raised when it would return more characters than + * fit in a DOMString variable on the implementation * platform. */ public String getData() throws DOMException; /** - * The character data of the node that implements this interface. The DOM - * implementation may not put arbitrary limits on the amount of data - * that may be stored in a CharacterData node. However, - * implementation limits may mean that the entirety of a node's data may - * not fit into a single DOMString. In such cases, the user - * may call substringData to retrieve the data in + * The character data of the node that implements this interface. The DOM + * implementation may not put arbitrary limits on the amount of data + * that may be stored in a CharacterData node. However, + * implementation limits may mean that the entirety of a node's data may + * not fit into a single DOMString. In such cases, the user + * may call substringData to retrieve the data in * appropriately sized pieces. * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. @@ -57,8 +57,8 @@ public interface CharacterData extends Node { throws DOMException; /** - * The number of 16-bit units that are available through data - * and the substringData method below. This may have the + * The number of 16-bit units that are available through data + * and the substringData method below. This may have the * value zero, i.e., CharacterData nodes may be empty. */ public int getLength(); @@ -67,24 +67,24 @@ public interface CharacterData extends Node { * Extracts a range of data from the node. * @param offset Start offset of substring to extract. * @param count The number of 16-bit units to extract. - * @return The specified substring. If the sum of offset and - * count exceeds the length, then all 16-bit + * @return The specified substring. If the sum of offset and + * count exceeds the length, then all 16-bit * units to the end of the data are returned. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified offset is - * negative or greater than the number of 16-bit units in - * data, or if the specified count is + * INDEX_SIZE_ERR: Raised if the specified offset is + * negative or greater than the number of 16-bit units in + * data, or if the specified count is * negative. - *
    DOMSTRING_SIZE_ERR: Raised if the specified range of text does + *
    DOMSTRING_SIZE_ERR: Raised if the specified range of text does * not fit into a DOMString. */ - public String substringData(int offset, + public String substringData(int offset, int count) throws DOMException; /** - * Append the string to the end of the character data of the node. Upon - * success, data provides access to the concatenation of + * Append the string to the end of the character data of the node. Upon + * success, data provides access to the concatenation of * data and the DOMString specified. * @param arg The DOMString to append. * @exception DOMException @@ -98,55 +98,55 @@ public interface CharacterData extends Node { * @param offset The character offset at which to insert. * @param arg The DOMString to insert. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified offset is - * negative or greater than the number of 16-bit units in + * INDEX_SIZE_ERR: Raised if the specified offset is + * negative or greater than the number of 16-bit units in * data. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. */ - public void insertData(int offset, + public void insertData(int offset, String arg) throws DOMException; /** - * Remove a range of 16-bit units from the node. Upon success, + * Remove a range of 16-bit units from the node. Upon success, * data and length reflect the change. * @param offset The offset from which to start removing. - * @param count The number of 16-bit units to delete. If the sum of - * offset and count exceeds - * length then all 16-bit units from offset + * @param count The number of 16-bit units to delete. If the sum of + * offset and count exceeds + * length then all 16-bit units from offset * to the end of the data are deleted. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified offset is - * negative or greater than the number of 16-bit units in - * data, or if the specified count is + * INDEX_SIZE_ERR: Raised if the specified offset is + * negative or greater than the number of 16-bit units in + * data, or if the specified count is * negative. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. */ - public void deleteData(int offset, + public void deleteData(int offset, int count) throws DOMException; /** - * Replace the characters starting at the specified 16-bit unit offset + * Replace the characters starting at the specified 16-bit unit offset * with the specified string. * @param offset The offset from which to start replacing. - * @param count The number of 16-bit units to replace. If the sum of - * offset and count exceeds - * length, then all 16-bit units to the end of the data + * @param count The number of 16-bit units to replace. If the sum of + * offset and count exceeds + * length, then all 16-bit units to the end of the data * are replaced; (i.e., the effect is the same as a remove * method call with the same range, followed by an append * method invocation). - * @param arg The DOMString with which the range must be + * @param arg The DOMString with which the range must be * replaced. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified offset is - * negative or greater than the number of 16-bit units in - * data, or if the specified count is + * INDEX_SIZE_ERR: Raised if the specified offset is + * negative or greater than the number of 16-bit units in + * data, or if the specified count is * negative. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. */ - public void replaceData(int offset, - int count, + public void replaceData(int offset, + int count, String arg) throws DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Comment.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Comment.java index b04ed4d0a5e..40b75274ba2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Comment.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Comment.java @@ -13,17 +13,17 @@ package org.w3c.dom; /** - * This interface inherits from CharacterData and represents the + * This interface inherits from CharacterData and represents the * content of a comment, i.e., all the characters between the starting ' - * <!--' and ending '-->'. Note that this is - * the definition of a comment in XML, and, in practice, HTML, although some - * HTML tools may implement the full SGML comment structure. - *

    No lexical check is done on the content of a comment and it is - * therefore possible to have the character sequence "--" - * (double-hyphen) in the content, which is illegal in a comment per section - * 2.5 of [XML 1.0]. The - * presence of this character sequence must generate a fatal error during - * serialization. + * <!--' and ending '-->'. Note that this is + * the definition of a comment in XML, and, in practice, HTML, although some + * HTML tools may implement the full SGML comment structure. + *

    No lexical check is done on the content of a comment and it is + * therefore possible to have the character sequence "--" + * (double-hyphen) in the content, which is illegal in a comment per section + * 2.5 of [XML 1.0]. The + * presence of this character sequence must generate a fatal error during + * serialization. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface Comment extends CharacterData { diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMConfiguration.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMConfiguration.java index 7cce1609e19..d05257868aa 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMConfiguration.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMConfiguration.java @@ -13,47 +13,47 @@ package org.w3c.dom; /** - * The DOMConfiguration interface represents the configuration - * of a document and maintains a table of recognized parameters. Using the - * configuration, it is possible to change - * Document.normalizeDocument() behavior, such as replacing the - * CDATASection nodes with Text nodes or - * specifying the type of the schema that must be used when the validation - * of the Document is requested. DOMConfiguration + * The DOMConfiguration interface represents the configuration + * of a document and maintains a table of recognized parameters. Using the + * configuration, it is possible to change + * Document.normalizeDocument() behavior, such as replacing the + * CDATASection nodes with Text nodes or + * specifying the type of the schema that must be used when the validation + * of the Document is requested. DOMConfiguration * objects are also used in [DOM Level 3 Load and Save] - * in the DOMParser and DOMSerializer interfaces. - *

    The parameter names used by the DOMConfiguration object - * are defined throughout the DOM Level 3 specifications. Names are - * case-insensitive. To avoid possible conflicts, as a convention, names - * referring to parameters defined outside the DOM specification should be - * made unique. Because parameters are exposed as properties in the , names - * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not - * enforced by the DOM implementation. DOM Level 3 Core Implementations are - * required to recognize all parameters defined in this specification. Some - * parameter values may also be required to be supported by the - * implementation. Refer to the definition of the parameter to know if a - * value must be supported or not. - *

    Note: Parameters are similar to features and properties used in - * SAX2 [SAX]. - *

    The following list of parameters defined in the DOM: + * in the DOMParser and DOMSerializer interfaces. + *

    The parameter names used by the DOMConfiguration object + * are defined throughout the DOM Level 3 specifications. Names are + * case-insensitive. To avoid possible conflicts, as a convention, names + * referring to parameters defined outside the DOM specification should be + * made unique. Because parameters are exposed as properties in the , names + * are recommended to follow the section 5.16 Identifiers of [Unicode] with the addition of the character '-' (HYPHEN-MINUS) but it is not + * enforced by the DOM implementation. DOM Level 3 Core Implementations are + * required to recognize all parameters defined in this specification. Some + * parameter values may also be required to be supported by the + * implementation. Refer to the definition of the parameter to know if a + * value must be supported or not. + *

    Note: Parameters are similar to features and properties used in + * SAX2 [SAX]. + *

    The following list of parameters defined in the DOM: *

    *
    * "canonical-form"
    *
    *
    *
    true
    - *
    [optional] Canonicalize the document according to the rules specified in [Canonical XML], - * such as removing the DocumentType node (if any) from the - * tree, or removing superfluous namespace declarations from each element. - * Note that this is limited to what can be represented in the DOM; in - * particular, there is no way to specify the order of the attributes in the - * DOM. In addition, Setting this parameter to true will also - * set the state of the parameters listed below. Later changes to the state - * of one of those parameters will revert "canonical-form" back to + *
    [optional] Canonicalize the document according to the rules specified in [Canonical XML], + * such as removing the DocumentType node (if any) from the + * tree, or removing superfluous namespace declarations from each element. + * Note that this is limited to what can be represented in the DOM; in + * particular, there is no way to specify the order of the attributes in the + * DOM. In addition, Setting this parameter to true will also + * set the state of the parameters listed below. Later changes to the state + * of one of those parameters will revert "canonical-form" back to * false. Parameters set to false: "entities", " - * normalize-characters", "cdata-sections". Parameters set to - * true: "namespaces", "namespace-declarations", "well-formed", - * "element-content-whitespace". Other parameters are not changed unless + * normalize-characters", "cdata-sections". Parameters set to + * true: "namespaces", "namespace-declarations", "well-formed", + * "element-content-whitespace". Other parameters are not changed unless * explicitly specified in the description of the parameters.
    *
    * false
    @@ -66,8 +66,8 @@ package org.w3c.dom; * true *
    [required] (default)Keep CDATASection nodes in the document.
    *
    false
    - *
    [required]Transform CDATASection nodes in the document into - * Text nodes. The new Text node is then combined + *
    [required]Transform CDATASection nodes in the document into + * Text nodes. The new Text node is then combined * with any adjacent Text node.
    *
    *
    @@ -75,10 +75,10 @@ package org.w3c.dom; *
    *
    *
    true
    - *
    [optional] Check if the characters in the document are fully - * normalized, as defined in appendix B of [XML 1.1]. When a - * sequence of characters is encountered that fails normalization checking, - * an error with the DOMError.type equals to + *
    [optional] Check if the characters in the document are fully + * normalized, as defined in appendix B of [XML 1.1]. When a + * sequence of characters is encountered that fails normalization checking, + * an error with the DOMError.type equals to * "check-character-normalization-failure" is issued.
    *
    false
    *
    [required] (default)Do not check if characters are normalized.
    @@ -97,14 +97,14 @@ package org.w3c.dom; *
    *
    *
    true
    - *
    [optional] Expose schema normalized values in the tree, such as XML - * Schema normalized values in the case of XML Schema. Since this parameter requires to have schema - * information, the "validate" parameter will also be set to - * true. Having this parameter activated when "validate" is - * false has no effect and no schema-normalization will happen. - *

    Note: Since the document contains the result of the XML 1.0 - * processing, this parameter does not apply to attribute value - * normalization as defined in section 3.3.3 of [XML 1.0] and is only + *

    [optional] Expose schema normalized values in the tree, such as XML + * Schema normalized values in the case of XML Schema. Since this parameter requires to have schema + * information, the "validate" parameter will also be set to + * true. Having this parameter activated when "validate" is + * false has no effect and no schema-normalization will happen. + *

    Note: Since the document contains the result of the XML 1.0 + * processing, this parameter does not apply to attribute value + * normalization as defined in section 3.3.3 of [XML 1.0] and is only * meant for schema languages other than Document Type Definition (DTD).

    *
    * false
    @@ -117,10 +117,10 @@ package org.w3c.dom; *
    true
    *
    [required] (default)Keep all whitespaces in the document.
    *
    false
    - *
    [optional] Discard all Text nodes that contain whitespaces in element + *
    [optional] Discard all Text nodes that contain whitespaces in element * content, as described in - * [element content whitespace]. The implementation is expected to use the attribute - * Text.isElementContentWhitespace to determine if a + * [element content whitespace]. The implementation is expected to use the attribute + * Text.isElementContentWhitespace to determine if a * Text node should be discarded or not.
    *
    *
    "entities"
    @@ -131,23 +131,23 @@ package org.w3c.dom; *
    [required] (default)Keep EntityReference nodes in the document.
    *
    * false
    - *
    [required] Remove all EntityReference nodes from the document, - * putting the entity expansions directly in their place. Text + *
    [required] Remove all EntityReference nodes from the document, + * putting the entity expansions directly in their place. Text * nodes are normalized, as defined in Node.normalize. Only * unexpanded entity references are kept in the document.
    *
    *

    Note: This parameter does not affect Entity nodes.

    *
    * "error-handler"
    - *
    [required] Contains a DOMErrorHandler object. If an error is - * encountered in the document, the implementation will call back the - * DOMErrorHandler registered using this parameter. The - * implementation may provide a default DOMErrorHandler object. - * When called, DOMError.relatedData will contain the closest - * node to where the error occurred. If the implementation is unable to - * determine the node where the error occurs, - * DOMError.relatedData will contain the Document - * node. Mutations to the document from within an error handler will result + *
    [required] Contains a DOMErrorHandler object. If an error is + * encountered in the document, the implementation will call back the + * DOMErrorHandler registered using this parameter. The + * implementation may provide a default DOMErrorHandler object. + * When called, DOMError.relatedData will contain the closest + * node to where the error occurred. If the implementation is unable to + * determine the node where the error occurs, + * DOMError.relatedData will contain the Document + * node. Mutations to the document from within an error handler will result * in implementation dependent behavior.
    *
    "infoset"
    *
    @@ -159,13 +159,13 @@ package org.w3c.dom; * validate-if-schema", "entities", "datatype-normalization", "cdata-sections * ".This forces the following parameters to true: " * namespace-declarations", "well-formed", "element-content-whitespace", " - * comments", "namespaces".Other parameters are not changed unless - * explicitly specified in the description of the parameters. Note that - * querying this parameter with getParameter returns - * true only if the individual parameters specified above are + * comments", "namespaces".Other parameters are not changed unless + * explicitly specified in the description of the parameters. Note that + * querying this parameter with getParameter returns + * true only if the individual parameters specified above are * appropriately set.
    *
    false
    - *
    Setting infoset to + *
    Setting infoset to * false has no effect.
    *
    *
    "namespaces"
    @@ -179,119 +179,119 @@ package org.w3c.dom; * *
    * "namespace-declarations"
    - *
    This parameter has no effect if the - * parameter "namespaces" is set to false. + *
    This parameter has no effect if the + * parameter "namespaces" is set to false. *
    *
    true
    - *
    [required] (default) Include namespace declaration attributes, specified or defaulted from - * the schema, in the document. See also the sections "Declaring Namespaces" + *
    [required] (default) Include namespace declaration attributes, specified or defaulted from + * the schema, in the document. See also the sections "Declaring Namespaces" * in [XML Namespaces] * and [XML Namespaces 1.1] * .
    *
    false
    *
    [required]Discard all namespace declaration attributes. The namespace prefixes ( - * Node.prefix) are retained even if this parameter is set to + * Node.prefix) are retained even if this parameter is set to * false.
    *
    *
    "normalize-characters"
    *
    *
    *
    true
    - *
    [optional] Fully + *
    [optional] Fully * normalized the characters in the document as defined in appendix B of [XML 1.1].
    *
    * false
    *
    [required] (default)Do not perform character normalization.
    *
    *
    "schema-location"
    - *
    [optional] Represent a DOMString object containing a list of URIs, - * separated by whitespaces (characters matching the nonterminal - * production S defined in section 2.3 [XML 1.0]), that - * represents the schemas against which validation should occur, i.e. the - * current schema. The types of schemas referenced in this list must match - * the type specified with schema-type, otherwise the behavior - * of an implementation is undefined. The schemas specified using this - * property take precedence to the schema information specified in the - * document itself. For namespace aware schema, if a schema specified using - * this property and a schema specified in the document instance (i.e. using - * the schemaLocation attribute) in a schema document (i.e. - * using schema import mechanisms) share the same - * targetNamespace, the schema specified by the user using this - * property will be used. If two schemas specified using this property share - * the same targetNamespace or have no namespace, the behavior - * is implementation dependent. If no location has been provided, this - * parameter is null. - *

    Note: The "schema-location" parameter is ignored - * unless the "schema-type" parameter value is set. It is strongly - * recommended that Document.documentURI will be set so that an + *

    [optional] Represent a DOMString object containing a list of URIs, + * separated by whitespaces (characters matching the nonterminal + * production S defined in section 2.3 [XML 1.0]), that + * represents the schemas against which validation should occur, i.e. the + * current schema. The types of schemas referenced in this list must match + * the type specified with schema-type, otherwise the behavior + * of an implementation is undefined. The schemas specified using this + * property take precedence to the schema information specified in the + * document itself. For namespace aware schema, if a schema specified using + * this property and a schema specified in the document instance (i.e. using + * the schemaLocation attribute) in a schema document (i.e. + * using schema import mechanisms) share the same + * targetNamespace, the schema specified by the user using this + * property will be used. If two schemas specified using this property share + * the same targetNamespace or have no namespace, the behavior + * is implementation dependent. If no location has been provided, this + * parameter is null. + *

    Note: The "schema-location" parameter is ignored + * unless the "schema-type" parameter value is set. It is strongly + * recommended that Document.documentURI will be set so that an * implementation can successfully resolve any external entities referenced.

    *
    * "schema-type"
    - *
    [optional] Represent a DOMString object containing an absolute URI - * and representing the type of the schema language used to validate a - * document against. Note that no lexical checking is done on the absolute - * URI. If this parameter is not set, a default value may be provided by - * the implementation, based on the schema languages supported and on the - * schema language used at load time. If no value is provided, this - * parameter is null. + *
    [optional] Represent a DOMString object containing an absolute URI + * and representing the type of the schema language used to validate a + * document against. Note that no lexical checking is done on the absolute + * URI. If this parameter is not set, a default value may be provided by + * the implementation, based on the schema languages supported and on the + * schema language used at load time. If no value is provided, this + * parameter is null. *

    Note: For XML Schema [XML Schema Part 1] - * , applications must use the value - * "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0], - * applications must use the value - * "http://www.w3.org/TR/REC-xml". Other schema languages are - * outside the scope of the W3C and therefore should recommend an absolute + * , applications must use the value + * "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0], + * applications must use the value + * "http://www.w3.org/TR/REC-xml". Other schema languages are + * outside the scope of the W3C and therefore should recommend an absolute * URI in order to use this method.

    *
    "split-cdata-sections"
    *
    *
    *
    * true
    - *
    [required] (default)Split CDATA sections containing the CDATA section termination marker - * ']]>'. When a CDATA section is split a warning is issued with a - * DOMError.type equals to - * "cdata-sections-splitted" and - * DOMError.relatedData equals to the first + *
    [required] (default)Split CDATA sections containing the CDATA section termination marker + * ']]>'. When a CDATA section is split a warning is issued with a + * DOMError.type equals to + * "cdata-sections-splitted" and + * DOMError.relatedData equals to the first * CDATASection node in document order resulting from the split.
    *
    * false
    - *
    [required]Signal an error if a CDATASection contains an + *
    [required]Signal an error if a CDATASection contains an * unrepresentable character.
    *
    *
    "validate"
    *
    *
    *
    true
    - *
    [optional] Require the validation against a schema (i.e. XML schema, DTD, any - * other type or representation of schema) of the document as it is being - * normalized as defined by [XML 1.0]. If - * validation errors are found, or no schema was found, the error handler is - * notified. Schema-normalized values will not be exposed according to the - * schema in used unless the parameter "datatype-normalization" is - * true. This parameter will reevaluate: + *
    [optional] Require the validation against a schema (i.e. XML schema, DTD, any + * other type or representation of schema) of the document as it is being + * normalized as defined by [XML 1.0]. If + * validation errors are found, or no schema was found, the error handler is + * notified. Schema-normalized values will not be exposed according to the + * schema in used unless the parameter "datatype-normalization" is + * true. This parameter will reevaluate: *
      - *
    • Attribute nodes with - * Attr.specified equals to false, as specified in - * the description of the Attr interface; + *
    • Attribute nodes with + * Attr.specified equals to false, as specified in + * the description of the Attr interface; *
      • - *
    • The value of the - * attribute Text.isElementContentWhitespace for all - * Text nodes; + *
    • The value of the + * attribute Text.isElementContentWhitespace for all + * Text nodes; *
      • - *
    • The value of the attribute - * Attr.isId for all Attr nodes; + *
    • The value of the attribute + * Attr.isId for all Attr nodes; *
      • - *
    • The attributes - * Element.schemaTypeInfo and Attr.schemaTypeInfo. + *
    • The attributes + * Element.schemaTypeInfo and Attr.schemaTypeInfo. *
      • *
    - *

    Note: "validate-if-schema" and "validate" are mutually - * exclusive, setting one of them to true will set the other - * one to false. Applications should also consider setting the - * parameter "well-formed" to true, which is the default for + *

    Note: "validate-if-schema" and "validate" are mutually + * exclusive, setting one of them to true will set the other + * one to false. Applications should also consider setting the + * parameter "well-formed" to true, which is the default for * that option, when validating the document.

    *
    false
    - *
    [required] (default) Do not accomplish schema processing, including the internal subset - * processing. Default attribute values information are kept. Note that + *
    [required] (default) Do not accomplish schema processing, including the internal subset + * processing. Default attribute values information are kept. Note that * validation might still happen if "validate-if-schema" is true * .
    *
    @@ -299,17 +299,17 @@ package org.w3c.dom; *
    *
    *
    true
    - *
    [optional]Enable validation only if a declaration for the document element can be - * found in a schema (independently of where it is found, i.e. XML schema, - * DTD, or any other type or representation of schema). If validation is - * enabled, this parameter has the same behavior as the parameter "validate" - * set to true. - *

    Note: "validate-if-schema" and "validate" are mutually - * exclusive, setting one of them to true will set the other + *

    [optional]Enable validation only if a declaration for the document element can be + * found in a schema (independently of where it is found, i.e. XML schema, + * DTD, or any other type or representation of schema). If validation is + * enabled, this parameter has the same behavior as the parameter "validate" + * set to true. + *

    Note: "validate-if-schema" and "validate" are mutually + * exclusive, setting one of them to true will set the other * one to false.

    *
    false
    - *
    [required] (default) No schema processing should be performed if the document has a schema, - * including internal subset processing. Default attribute values + *
    [required] (default) No schema processing should be performed if the document has a schema, + * including internal subset processing. Default attribute values * information are kept. Note that validation must still happen if "validate * " is true.
    *
    @@ -317,27 +317,27 @@ package org.w3c.dom; *
    *
    *
    true
    - *
    [required] (default) Check if all nodes are XML well formed according to the XML version in - * use in Document.xmlVersion: + *
    [required] (default) Check if all nodes are XML well formed according to the XML version in + * use in Document.xmlVersion: *
      - *
    • check if the attribute - * Node.nodeName contains invalid characters according to its - * node type and generate a DOMError of type - * "wf-invalid-character-in-node-name", with a - * DOMError.SEVERITY_ERROR severity, if necessary; + *
    • check if the attribute + * Node.nodeName contains invalid characters according to its + * node type and generate a DOMError of type + * "wf-invalid-character-in-node-name", with a + * DOMError.SEVERITY_ERROR severity, if necessary; *
      • - *
    • check if - * the text content inside Attr, Element, - * Comment, Text, CDATASection nodes - * for invalid characters and generate a DOMError of type - * "wf-invalid-character", with a - * DOMError.SEVERITY_ERROR severity, if necessary; + *
    • check if + * the text content inside Attr, Element, + * Comment, Text, CDATASection nodes + * for invalid characters and generate a DOMError of type + * "wf-invalid-character", with a + * DOMError.SEVERITY_ERROR severity, if necessary; *
      • - *
    • check if - * the data inside ProcessingInstruction nodes for invalid - * characters and generate a DOMError of type - * "wf-invalid-character", with a - * DOMError.SEVERITY_ERROR severity, if necessary; + *
    • check if + * the data inside ProcessingInstruction nodes for invalid + * characters and generate a DOMError of type + * "wf-invalid-character", with a + * DOMError.SEVERITY_ERROR severity, if necessary; *
      • *
    *
    @@ -345,14 +345,14 @@ package org.w3c.dom; *
    [optional] Do not check for XML well-formedness.
    *
    * - *

    The resolution of the system identifiers associated with entities is - * done using Document.documentURI. However, when the feature + *

    The resolution of the system identifiers associated with entities is + * done using Document.documentURI. However, when the feature * "LS" defined in [DOM Level 3 Load and Save] - * is supported by the DOM implementation, the parameter - * "resource-resolver" can also be used on DOMConfiguration - * objects attached to Document nodes. If this parameter is - * set, Document.normalizeDocument() will invoke the resource - * resolver instead of using Document.documentURI. + * is supported by the DOM implementation, the parameter + * "resource-resolver" can also be used on DOMConfiguration + * objects attached to Document nodes. If this parameter is + * set, Document.normalizeDocument() will invoke the resource + * resolver instead of using Document.documentURI. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ @@ -360,31 +360,31 @@ public interface DOMConfiguration { /** * Set the value of a parameter. * @param name The name of the parameter to set. - * @param value The new value or null if the user wishes to - * unset the parameter. While the type of the value parameter is - * defined as DOMUserData, the object type must match the - * type defined by the definition of the parameter. For example, if - * the parameter is "error-handler", the value must be of type - * DOMErrorHandler. + * @param value The new value or null if the user wishes to + * unset the parameter. While the type of the value parameter is + * defined as DOMUserData, the object type must match the + * type defined by the definition of the parameter. For example, if + * the parameter is "error-handler", the value must be of type + * DOMErrorHandler. * @exception DOMException - * NOT_FOUND_ERR: Raised when the parameter name is not recognized. - *
    NOT_SUPPORTED_ERR: Raised when the parameter name is recognized - * but the requested value cannot be set. - *
    TYPE_MISMATCH_ERR: Raised if the value type for this parameter - * name is incompatible with the expected value type. + * NOT_FOUND_ERR: Raised when the parameter name is not recognized. + *
    NOT_SUPPORTED_ERR: Raised when the parameter name is recognized + * but the requested value cannot be set. + *
    TYPE_MISMATCH_ERR: Raised if the value type for this parameter + * name is incompatible with the expected value type. */ - public void setParameter(String name, + public void setParameter(String name, Object value) throws DOMException; /** - * Return the value of a parameter if known. - * @param name The name of the parameter. - * @return The current object associated with the specified parameter or - * null if no object has been associated or if the - * parameter is not supported. + * Return the value of a parameter if known. + * @param name The name of the parameter. + * @return The current object associated with the specified parameter or + * null if no object has been associated or if the + * parameter is not supported. * @exception DOMException - * NOT_FOUND_ERR: Raised when the parameter name is not recognized. + * NOT_FOUND_ERR: Raised when the parameter name is not recognized. */ public Object getParameter(String name) throws DOMException; @@ -392,21 +392,21 @@ public interface DOMConfiguration { /** * Check if setting a parameter to a specific value is supported. * @param name The name of the parameter to check. - * @param value An object. if null, the returned value is - * true. - * @return true if the parameter could be successfully set - * to the specified value, or false if the parameter is - * not recognized or the requested value is not supported. This does - * not change the current value of the parameter itself. + * @param value An object. if null, the returned value is + * true. + * @return true if the parameter could be successfully set + * to the specified value, or false if the parameter is + * not recognized or the requested value is not supported. This does + * not change the current value of the parameter itself. */ - public boolean canSetParameter(String name, + public boolean canSetParameter(String name, Object value); /** - * The list of the parameters supported by this - * DOMConfiguration object and for which at least one value - * can be set by the application. Note that this list can also contain - * parameter names defined outside this specification. + * The list of the parameters supported by this + * DOMConfiguration object and for which at least one value + * can be set by the application. Note that this list can also contain + * parameter names defined outside this specification. */ public DOMStringList getParameterNames(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMError.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMError.java index 37ed7d10d89..2634df37c8e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMError.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMError.java @@ -20,31 +20,31 @@ package org.w3c.dom; public interface DOMError { // ErrorSeverity /** - * The severity of the error described by the DOMError is - * warning. A SEVERITY_WARNING will not cause the - * processing to stop, unless DOMErrorHandler.handleError() + * The severity of the error described by the DOMError is + * warning. A SEVERITY_WARNING will not cause the + * processing to stop, unless DOMErrorHandler.handleError() * returns false. */ public static final short SEVERITY_WARNING = 1; /** - * The severity of the error described by the DOMError is - * error. A SEVERITY_ERROR may not cause the processing to - * stop if the error can be recovered, unless + * The severity of the error described by the DOMError is + * error. A SEVERITY_ERROR may not cause the processing to + * stop if the error can be recovered, unless * DOMErrorHandler.handleError() returns false. */ public static final short SEVERITY_ERROR = 2; /** - * The severity of the error described by the DOMError is - * fatal error. A SEVERITY_FATAL_ERROR will cause the - * normal processing to stop. The return value of - * DOMErrorHandler.handleError() is ignored unless the - * implementation chooses to continue, in which case the behavior + * The severity of the error described by the DOMError is + * fatal error. A SEVERITY_FATAL_ERROR will cause the + * normal processing to stop. The return value of + * DOMErrorHandler.handleError() is ignored unless the + * implementation chooses to continue, in which case the behavior * becomes undefined. */ public static final short SEVERITY_FATAL_ERROR = 3; /** - * The severity of the error, either SEVERITY_WARNING, + * The severity of the error, either SEVERITY_WARNING, * SEVERITY_ERROR, or SEVERITY_FATAL_ERROR. */ public short getSeverity(); @@ -55,17 +55,17 @@ public interface DOMError { public String getMessage(); /** - * A DOMString indicating which related data is expected in - * relatedData. Users should refer to the specification of - * the error in order to find its DOMString type and - * relatedData definitions if any. - *

    Note: As an example, - * Document.normalizeDocument() does generate warnings when - * the "split-cdata-sections" parameter is in use. Therefore, the method - * generates a SEVERITY_WARNING with type - * "cdata-sections-splitted" and the first - * CDATASection node in document order resulting from the - * split is returned by the relatedData attribute. + * A DOMString indicating which related data is expected in + * relatedData. Users should refer to the specification of + * the error in order to find its DOMString type and + * relatedData definitions if any. + *

    Note: As an example, + * Document.normalizeDocument() does generate warnings when + * the "split-cdata-sections" parameter is in use. Therefore, the method + * generates a SEVERITY_WARNING with type + * "cdata-sections-splitted" and the first + * CDATASection node in document order resulting from the + * split is returned by the relatedData attribute. */ public String getType(); @@ -75,7 +75,7 @@ public interface DOMError { public Object getRelatedException(); /** - * The related DOMError.type dependent data if any. + * The related DOMError.type dependent data if any. */ public Object getRelatedData(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java index 3d4ad2aba58..7dcc9015256 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMErrorHandler.java @@ -13,32 +13,32 @@ package org.w3c.dom; /** - * DOMErrorHandler is a callback interface that the DOM - * implementation can call when reporting errors that happens while - * processing XML data, or when doing some other processing (e.g. validating - * a document). A DOMErrorHandler object can be attached to a - * Document using the "error-handler" on the - * DOMConfiguration interface. If more than one error needs to - * be reported during an operation, the sequence and numbers of the errors - * passed to the error handler are implementation dependent. - *

    The application that is using the DOM implementation is expected to - * implement this interface. + * DOMErrorHandler is a callback interface that the DOM + * implementation can call when reporting errors that happens while + * processing XML data, or when doing some other processing (e.g. validating + * a document). A DOMErrorHandler object can be attached to a + * Document using the "error-handler" on the + * DOMConfiguration interface. If more than one error needs to + * be reported during an operation, the sequence and numbers of the errors + * passed to the error handler are implementation dependent. + *

    The application that is using the DOM implementation is expected to + * implement this interface. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface DOMErrorHandler { /** * This method is called on the error handler when an error occurs. - *
    If an exception is thrown from this method, it is considered to be - * equivalent of returning true. - * @param error The error object that describes the error. This object - * may be reused by the DOM implementation across multiple calls to - * the handleError method. - * @return If the handleError method returns - * false, the DOM implementation should stop the current - * processing when possible. If the method returns true, - * the processing may continue depending on - * DOMError.severity. + *
    If an exception is thrown from this method, it is considered to be + * equivalent of returning true. + * @param error The error object that describes the error. This object + * may be reused by the DOM implementation across multiple calls to + * the handleError method. + * @return If the handleError method returns + * false, the DOM implementation should stop the current + * processing when possible. If the method returns true, + * the processing may continue depending on + * DOMError.severity. */ public boolean handleError(DOMError error); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMException.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMException.java index 0b2578f92f6..23c70c400de 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMException.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMException.java @@ -13,20 +13,20 @@ package org.w3c.dom; /** - * DOM operations only raise exceptions in "exceptional" circumstances, i.e., - * when an operation is impossible to perform (either for logical reasons, - * because data is lost, or because the implementation has become unstable). - * In general, DOM methods return specific error values in ordinary - * processing situations, such as out-of-bound errors when using + * DOM operations only raise exceptions in "exceptional" circumstances, i.e., + * when an operation is impossible to perform (either for logical reasons, + * because data is lost, or because the implementation has become unstable). + * In general, DOM methods return specific error values in ordinary + * processing situations, such as out-of-bound errors when using * NodeList. - *

    Implementations should raise other exceptions under other circumstances. - * For example, implementations should raise an implementation-dependent + *

    Implementations should raise other exceptions under other circumstances. + * For example, implementations should raise an implementation-dependent * exception if a null argument is passed when null * was not expected. - *

    Some languages and object systems do not support the concept of - * exceptions. For such systems, error conditions may be indicated using - * native error reporting mechanisms. For some bindings, for example, - * methods may return error codes similar to those listed in the + *

    Some languages and object systems do not support the concept of + * exceptions. For such systems, error conditions may be indicated using + * native error reporting mechanisms. For some bindings, for example, + * methods may return error codes similar to those listed in the * corresponding method descriptions. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ @@ -42,7 +42,7 @@ public class DOMException extends RuntimeException { */ public static final short INDEX_SIZE_ERR = 1; /** - * If the specified range of text does not fit into a + * If the specified range of text does not fit into a * DOMString. */ public static final short DOMSTRING_SIZE_ERR = 2; @@ -51,7 +51,7 @@ public class DOMException extends RuntimeException { */ public static final short HIERARCHY_REQUEST_ERR = 3; /** - * If a Node is used in a different document than the one + * If a Node is used in a different document than the one * that created it (that doesn't support it). */ public static final short WRONG_DOCUMENT_ERR = 4; @@ -60,32 +60,32 @@ public class DOMException extends RuntimeException { */ public static final short INVALID_CHARACTER_ERR = 5; /** - * If data is specified for a Node which does not support + * If data is specified for a Node which does not support * data. */ public static final short NO_DATA_ALLOWED_ERR = 6; /** - * If an attempt is made to modify an object where modifications are not + * If an attempt is made to modify an object where modifications are not * allowed. */ public static final short NO_MODIFICATION_ALLOWED_ERR = 7; /** - * If an attempt is made to reference a Node in a context + * If an attempt is made to reference a Node in a context * where it does not exist. */ public static final short NOT_FOUND_ERR = 8; /** - * If the implementation does not support the requested type of object or + * If the implementation does not support the requested type of object or * operation. */ public static final short NOT_SUPPORTED_ERR = 9; /** - * If an attempt is made to add an attribute that is already in use + * If an attempt is made to add an attribute that is already in use * elsewhere. */ public static final short INUSE_ATTRIBUTE_ERR = 10; /** - * If an attempt is made to use an object that is not, or is no longer, + * If an attempt is made to use an object that is not, or is no longer, * usable. * @since DOM Level 2 */ @@ -101,29 +101,29 @@ public class DOMException extends RuntimeException { */ public static final short INVALID_MODIFICATION_ERR = 13; /** - * If an attempt is made to create or change an object in a way which is + * If an attempt is made to create or change an object in a way which is * incorrect with regard to namespaces. * @since DOM Level 2 */ public static final short NAMESPACE_ERR = 14; /** - * If a parameter or an operation is not supported by the underlying + * If a parameter or an operation is not supported by the underlying * object. * @since DOM Level 2 */ public static final short INVALID_ACCESS_ERR = 15; /** - * If a call to a method such as insertBefore or - * removeChild would make the Node invalid - * with respect to "partial validity", this exception would be raised + * If a call to a method such as insertBefore or + * removeChild would make the Node invalid + * with respect to "partial validity", this exception would be raised * and the operation would not be done. This code is used in [DOM Level 3 Validation] * . Refer to this specification for further information. * @since DOM Level 3 */ public static final short VALIDATION_ERR = 16; /** - * If the type of an object is incompatible with the expected type of the - * parameter associated to the object. + * If the type of an object is incompatible with the expected type of the + * parameter associated to the object. * @since DOM Level 3 */ public static final short TYPE_MISMATCH_ERR = 17; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementation.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementation.java index 5bb71e263a9..9b07574333b 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementation.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementation.java @@ -13,124 +13,124 @@ package org.w3c.dom; /** - * The DOMImplementation interface provides a number of methods - * for performing operations that are independent of any particular instance + * The DOMImplementation interface provides a number of methods + * for performing operations that are independent of any particular instance * of the document object model. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface DOMImplementation { /** - * Test if the DOM implementation implements a specific feature and + * Test if the DOM implementation implements a specific feature and * version, as specified in . - * @param feature The name of the feature to test. - * @param version This is the version number of the feature to test. - * @return true if the feature is implemented in the + * @param feature The name of the feature to test. + * @param version This is the version number of the feature to test. + * @return true if the feature is implemented in the * specified version, false otherwise. */ - public boolean hasFeature(String feature, + public boolean hasFeature(String feature, String version); /** - * Creates an empty DocumentType node. Entity declarations - * and notations are not made available. Entity reference expansions and + * Creates an empty DocumentType node. Entity declarations + * and notations are not made available. Entity reference expansions and * default attribute additions do not occur.. - * @param qualifiedName The qualified name of the document type to be + * @param qualifiedName The qualified name of the document type to be * created. * @param publicId The external subset public identifier. * @param systemId The external subset system identifier. - * @return A new DocumentType node with + * @return A new DocumentType node with * Node.ownerDocument set to null. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not + * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not * an XML name according to [XML 1.0]. - *
    NAMESPACE_ERR: Raised if the qualifiedName is + *
    NAMESPACE_ERR: Raised if the qualifiedName is * malformed. - *
    NOT_SUPPORTED_ERR: May be raised if the implementation does not - * support the feature "XML" and the language exposed through the - * Document does not support XML Namespaces (such as [HTML 4.01]). + *
    NOT_SUPPORTED_ERR: May be raised if the implementation does not + * support the feature "XML" and the language exposed through the + * Document does not support XML Namespaces (such as [HTML 4.01]). * @since DOM Level 2 */ - public DocumentType createDocumentType(String qualifiedName, - String publicId, + public DocumentType createDocumentType(String qualifiedName, + String publicId, String systemId) throws DOMException; /** - * Creates a DOM Document object of the specified type with its document + * Creates a DOM Document object of the specified type with its document * element. - *
    Note that based on the DocumentType given to create - * the document, the implementation may instantiate specialized - * Document objects that support additional features than + *
    Note that based on the DocumentType given to create + * the document, the implementation may instantiate specialized + * Document objects that support additional features than * the "Core", such as "HTML" [DOM Level 2 HTML] - * . On the other hand, setting the DocumentType after the - * document was created makes this very unlikely to happen. - * Alternatively, specialized Document creation methods, + * . On the other hand, setting the DocumentType after the + * document was created makes this very unlikely to happen. + * Alternatively, specialized Document creation methods, * such as createHTMLDocument [DOM Level 2 HTML] - * , can be used to obtain specific types of Document + * , can be used to obtain specific types of Document * objects. - * @param namespaceURI The namespace URI of the document element to + * @param namespaceURI The namespace URI of the document element to * create or null. - * @param qualifiedName The qualified name of the document element to be + * @param qualifiedName The qualified name of the document element to be * created or null. * @param doctype The type of document to be created or null. - * When doctype is not null, its - * Node.ownerDocument attribute is set to the document + * When doctype is not null, its + * Node.ownerDocument attribute is set to the document * being created. - * @return A new Document object with its document element. - * If the NamespaceURI, qualifiedName, and - * doctype are null, the returned + * @return A new Document object with its document element. + * If the NamespaceURI, qualifiedName, and + * doctype are null, the returned * Document is empty with no document element. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not + * INVALID_CHARACTER_ERR: Raised if the specified qualified name is not * an XML name according to [XML 1.0]. - *
    NAMESPACE_ERR: Raised if the qualifiedName is - * malformed, if the qualifiedName has a prefix and the - * namespaceURI is null, or if the - * qualifiedName is null and the - * namespaceURI is different from null, or - * if the qualifiedName has a prefix that is "xml" and + *
    NAMESPACE_ERR: Raised if the qualifiedName is + * malformed, if the qualifiedName has a prefix and the + * namespaceURI is null, or if the + * qualifiedName is null and the + * namespaceURI is different from null, or + * if the qualifiedName has a prefix that is "xml" and * the namespaceURI is different from " * http://www.w3.org/XML/1998/namespace" [XML Namespaces] - * , or if the DOM implementation does not support the - * "XML" feature but a non-null namespace URI was + * , or if the DOM implementation does not support the + * "XML" feature but a non-null namespace URI was * provided, since namespaces were defined by XML. - *
    WRONG_DOCUMENT_ERR: Raised if doctype has already - * been used with a different document or was created from a different + *
    WRONG_DOCUMENT_ERR: Raised if doctype has already + * been used with a different document or was created from a different * implementation. - *
    NOT_SUPPORTED_ERR: May be raised if the implementation does not - * support the feature "XML" and the language exposed through the - * Document does not support XML Namespaces (such as [HTML 4.01]). + *
    NOT_SUPPORTED_ERR: May be raised if the implementation does not + * support the feature "XML" and the language exposed through the + * Document does not support XML Namespaces (such as [HTML 4.01]). * @since DOM Level 2 */ - public Document createDocument(String namespaceURI, - String qualifiedName, + public Document createDocument(String namespaceURI, + String qualifiedName, DocumentType doctype) throws DOMException; /** - * This method returns a specialized object which implements the - * specialized APIs of the specified feature and version, as specified - * in . The specialized object may also be obtained by using - * binding-specific casting methods but is not necessarily expected to, - * as discussed in . This method also allow the implementation to - * provide specialized objects which do not support the - * DOMImplementation interface. - * @param feature The name of the feature requested. Note that any plus - * sign "+" prepended to the name of the feature will be ignored since - * it is not significant in the context of this method. - * @param version This is the version number of the feature to test. - * @return Returns an object which implements the specialized APIs of - * the specified feature and version, if any, or null if - * there is no object which implements interfaces associated with that - * feature. If the DOMObject returned by this method - * implements the DOMImplementation interface, it must - * delegate to the primary core DOMImplementation and not - * return results inconsistent with the primary core - * DOMImplementation such as hasFeature, - * getFeature, etc. + * This method returns a specialized object which implements the + * specialized APIs of the specified feature and version, as specified + * in . The specialized object may also be obtained by using + * binding-specific casting methods but is not necessarily expected to, + * as discussed in . This method also allow the implementation to + * provide specialized objects which do not support the + * DOMImplementation interface. + * @param feature The name of the feature requested. Note that any plus + * sign "+" prepended to the name of the feature will be ignored since + * it is not significant in the context of this method. + * @param version This is the version number of the feature to test. + * @return Returns an object which implements the specialized APIs of + * the specified feature and version, if any, or null if + * there is no object which implements interfaces associated with that + * feature. If the DOMObject returned by this method + * implements the DOMImplementation interface, it must + * delegate to the primary core DOMImplementation and not + * return results inconsistent with the primary core + * DOMImplementation such as hasFeature, + * getFeature, etc. * @since DOM Level 3 */ - public Object getFeature(String feature, + public Object getFeature(String feature, String version); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationList.java index 18349fdd411..877de6efea0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationList.java @@ -13,30 +13,30 @@ package org.w3c.dom; /** - * The DOMImplementationList interface provides the abstraction - * of an ordered collection of DOM implementations, without defining or - * constraining how this collection is implemented. The items in the - * DOMImplementationList are accessible via an integral index, - * starting from 0. + * The DOMImplementationList interface provides the abstraction + * of an ordered collection of DOM implementations, without defining or + * constraining how this collection is implemented. The items in the + * DOMImplementationList are accessible via an integral index, + * starting from 0. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface DOMImplementationList { /** - * Returns the indexth item in the collection. If - * index is greater than or equal to the number of - * DOMImplementations in the list, this returns - * null. + * Returns the indexth item in the collection. If + * index is greater than or equal to the number of + * DOMImplementations in the list, this returns + * null. * @param index Index into the collection. * @return The DOMImplementation at the index - * th position in the DOMImplementationList, or - * null if that is not a valid index. + * th position in the DOMImplementationList, or + * null if that is not a valid index. */ public DOMImplementation item(int index); /** - * The number of DOMImplementations in the list. The range - * of valid child node indices is 0 to length-1 inclusive. + * The number of DOMImplementations in the list. The range + * of valid child node indices is 0 to length-1 inclusive. */ public int getLength(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java index 3c32c188378..1c5c0b2feba 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMImplementationSource.java @@ -13,44 +13,44 @@ package org.w3c.dom; /** - * This interface permits a DOM implementer to supply one or more - * implementations, based upon requested features and versions, as specified - * in . Each implemented DOMImplementationSource object is - * listed in the binding-specific list of available sources so that its + * This interface permits a DOM implementer to supply one or more + * implementations, based upon requested features and versions, as specified + * in . Each implemented DOMImplementationSource object is + * listed in the binding-specific list of available sources so that its * DOMImplementation objects are made available. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface DOMImplementationSource { /** - * A method to request the first DOM implementation that supports the - * specified features. - * @param features A string that specifies which features and versions - * are required. This is a space separated list in which each feature - * is specified by its name optionally followed by a space and a - * version number. This method returns the first item of the list - * returned by getDOMImplementationList. As an example, - * the string "XML 3.0 Traversal +Events 2.0" will - * request a DOM implementation that supports the module "XML" for its - * 3.0 version, a module that support of the "Traversal" module for - * any version, and the module "Events" for its 2.0 version. The - * module "Events" must be accessible using the method - * Node.getFeature() and - * DOMImplementation.getFeature(). - * @return The first DOM implementation that support the desired + * A method to request the first DOM implementation that supports the + * specified features. + * @param features A string that specifies which features and versions + * are required. This is a space separated list in which each feature + * is specified by its name optionally followed by a space and a + * version number. This method returns the first item of the list + * returned by getDOMImplementationList. As an example, + * the string "XML 3.0 Traversal +Events 2.0" will + * request a DOM implementation that supports the module "XML" for its + * 3.0 version, a module that support of the "Traversal" module for + * any version, and the module "Events" for its 2.0 version. The + * module "Events" must be accessible using the method + * Node.getFeature() and + * DOMImplementation.getFeature(). + * @return The first DOM implementation that support the desired * features, or null if this source has none. */ public DOMImplementation getDOMImplementation(String features); /** - * A method to request a list of DOM implementations that support the + * A method to request a list of DOM implementations that support the * specified features and versions, as specified in . - * @param features A string that specifies which features and versions - * are required. This is a space separated list in which each feature - * is specified by its name optionally followed by a space and a - * version number. This is something like: "XML 3.0 Traversal +Events + * @param features A string that specifies which features and versions + * are required. This is a space separated list in which each feature + * is specified by its name optionally followed by a space and a + * version number. This is something like: "XML 3.0 Traversal +Events * 2.0" - * @return A list of DOM implementations that support the desired + * @return A list of DOM implementations that support the desired * features. */ public DOMImplementationList getDOMImplementationList(String features); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMLocator.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMLocator.java index fcaaa23de87..50cd7d24060 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMLocator.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMLocator.java @@ -13,44 +13,44 @@ package org.w3c.dom; /** - * DOMLocator is an interface that describes a location (e.g. + * DOMLocator is an interface that describes a location (e.g. * where an error occurred). *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface DOMLocator { /** - * The line number this locator is pointing to, or -1 if + * The line number this locator is pointing to, or -1 if * there is no column number available. */ public int getLineNumber(); /** - * The column number this locator is pointing to, or -1 if + * The column number this locator is pointing to, or -1 if * there is no column number available. */ public int getColumnNumber(); /** - * The byte offset into the input source this locator is pointing to or + * The byte offset into the input source this locator is pointing to or * -1 if there is no byte offset available. */ public int getByteOffset(); /** - * The UTF-16, as defined in [Unicode] and Amendment 1 of [ISO/IEC 10646], offset into the input source this locator is pointing to or + * The UTF-16, as defined in [Unicode] and Amendment 1 of [ISO/IEC 10646], offset into the input source this locator is pointing to or * -1 if there is no UTF-16 offset available. */ public int getUtf16Offset(); /** - * The node this locator is pointing to, or null if no node + * The node this locator is pointing to, or null if no node * is available. */ public Node getRelatedNode(); /** - * The URI this locator is pointing to, or null if no URI is + * The URI this locator is pointing to, or null if no URI is * available. */ public String getUri(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMStringList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMStringList.java index e6c348ae8c4..53a40964e1d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMStringList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DOMStringList.java @@ -13,37 +13,37 @@ package org.w3c.dom; /** - * The DOMStringList interface provides the abstraction of an - * ordered collection of DOMString values, without defining or - * constraining how this collection is implemented. The items in the - * DOMStringList are accessible via an integral index, starting - * from 0. + * The DOMStringList interface provides the abstraction of an + * ordered collection of DOMString values, without defining or + * constraining how this collection is implemented. The items in the + * DOMStringList are accessible via an integral index, starting + * from 0. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface DOMStringList { /** - * Returns the indexth item in the collection. If - * index is greater than or equal to the number of - * DOMStrings in the list, this returns null. + * Returns the indexth item in the collection. If + * index is greater than or equal to the number of + * DOMStrings in the list, this returns null. * @param index Index into the collection. - * @return The DOMString at the indexth - * position in the DOMStringList, or null if - * that is not a valid index. + * @return The DOMString at the indexth + * position in the DOMStringList, or null if + * that is not a valid index. */ public String item(int index); /** - * The number of DOMStrings in the list. The range of valid + * The number of DOMStrings in the list. The range of valid * child node indices is 0 to length-1 inclusive. */ public int getLength(); /** - * Test if a string is part of this DOMStringList. - * @param str The string to look for. - * @return true if the string has been found, - * false otherwise. + * Test if a string is part of this DOMStringList. + * @param str The string to look for. + * @return true if the string has been found, + * false otherwise. */ public boolean contains(String str); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Document.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Document.java index 43ebd4ec420..3193fa260fe 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Document.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Document.java @@ -13,73 +13,73 @@ package org.w3c.dom; /** - * The Document interface represents the entire HTML or XML - * document. Conceptually, it is the root of the document tree, and provides + * The Document interface represents the entire HTML or XML + * document. Conceptually, it is the root of the document tree, and provides * the primary access to the document's data. - *

    Since elements, text nodes, comments, processing instructions, etc. - * cannot exist outside the context of a Document, the - * Document interface also contains the factory methods needed - * to create these objects. The Node objects created have a - * ownerDocument attribute which associates them with the + *

    Since elements, text nodes, comments, processing instructions, etc. + * cannot exist outside the context of a Document, the + * Document interface also contains the factory methods needed + * to create these objects. The Node objects created have a + * ownerDocument attribute which associates them with the * Document within whose context they were created. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface Document extends Node { /** - * The Document Type Declaration (see DocumentType) - * associated with this document. For XML documents without a document - * type declaration this returns null. For HTML documents, - * a DocumentType object may be returned, independently of - * the presence or absence of document type declaration in the HTML + * The Document Type Declaration (see DocumentType) + * associated with this document. For XML documents without a document + * type declaration this returns null. For HTML documents, + * a DocumentType object may be returned, independently of + * the presence or absence of document type declaration in the HTML * document. - *
    This provides direct access to the DocumentType node, - * child node of this Document. This node can be set at - * document creation time and later changed through the use of child - * nodes manipulation methods, such as Node.insertBefore, - * or Node.replaceChild. Note, however, that while some - * implementations may instantiate different types of - * Document objects supporting additional features than the + *
    This provides direct access to the DocumentType node, + * child node of this Document. This node can be set at + * document creation time and later changed through the use of child + * nodes manipulation methods, such as Node.insertBefore, + * or Node.replaceChild. Note, however, that while some + * implementations may instantiate different types of + * Document objects supporting additional features than the * "Core", such as "HTML" [DOM Level 2 HTML] - * , based on the DocumentType specified at creation time, - * changing it afterwards is very unlikely to result in a change of the + * , based on the DocumentType specified at creation time, + * changing it afterwards is very unlikely to result in a change of the * features supported. * @version DOM Level 3 */ public DocumentType getDoctype(); /** - * The DOMImplementation object that handles this document. A + * The DOMImplementation object that handles this document. A * DOM application may use objects from multiple implementations. */ public DOMImplementation getImplementation(); /** - * This is a convenience attribute that allows direct access to the child + * This is a convenience attribute that allows direct access to the child * node that is the document element of the document. */ public Element getDocumentElement(); /** - * Creates an element of the type specified. Note that the instance - * returned implements the Element interface, so attributes + * Creates an element of the type specified. Note that the instance + * returned implements the Element interface, so attributes * can be specified directly on the returned object. - *
    In addition, if there are known attributes with default values, - * Attr nodes representing them are automatically created + *
    In addition, if there are known attributes with default values, + * Attr nodes representing them are automatically created * and attached to the element. - *
    To create an element with a qualified name and namespace URI, use + *
    To create an element with a qualified name and namespace URI, use * the createElementNS method. - * @param tagName The name of the element type to instantiate. For XML, - * this is case-sensitive, otherwise it depends on the - * case-sensitivity of the markup language in use. In that case, the - * name is mapped to the canonical form of that markup by the DOM + * @param tagName The name of the element type to instantiate. For XML, + * this is case-sensitive, otherwise it depends on the + * case-sensitivity of the markup language in use. In that case, the + * name is mapped to the canonical form of that markup by the DOM * implementation. - * @return A new Element object with the - * nodeName attribute set to tagName, and - * localName, prefix, and + * @return A new Element object with the + * nodeName attribute set to tagName, and + * localName, prefix, and * namespaceURI set to null. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML - * name according to the XML version in use specified in the + * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML + * name according to the XML version in use specified in the * Document.xmlVersion attribute. */ public Element createElement(String tagName) @@ -106,7 +106,7 @@ public interface Document extends Node { public Comment createComment(String data); /** - * Creates a CDATASection node whose value is the specified + * Creates a CDATASection node whose value is the specified * string. * @param data The data for the CDATASection contents. * @return The new CDATASection object. @@ -117,68 +117,68 @@ public interface Document extends Node { throws DOMException; /** - * Creates a ProcessingInstruction node given the specified + * Creates a ProcessingInstruction node given the specified * name and data strings. - * @param target The target part of the processing instruction.Unlike - * Document.createElementNS or - * Document.createAttributeNS, no namespace well-formed - * checking is done on the target name. Applications should invoke + * @param target The target part of the processing instruction.Unlike + * Document.createElementNS or + * Document.createAttributeNS, no namespace well-formed + * checking is done on the target name. Applications should invoke * Document.normalizeDocument() with the parameter " - * namespaces" set to true in order to ensure that the - * target name is namespace well-formed. + * namespaces" set to true in order to ensure that the + * target name is namespace well-formed. * @param data The data for the node. * @return The new ProcessingInstruction object. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified target is not an XML - * name according to the XML version in use specified in the + * INVALID_CHARACTER_ERR: Raised if the specified target is not an XML + * name according to the XML version in use specified in the * Document.xmlVersion attribute. *
    NOT_SUPPORTED_ERR: Raised if this document is an HTML document. */ - public ProcessingInstruction createProcessingInstruction(String target, + public ProcessingInstruction createProcessingInstruction(String target, String data) throws DOMException; /** - * Creates an Attr of the given name. Note that the - * Attr instance can then be set on an Element - * using the setAttributeNode method. - *
    To create an attribute with a qualified name and namespace URI, use + * Creates an Attr of the given name. Note that the + * Attr instance can then be set on an Element + * using the setAttributeNode method. + *
    To create an attribute with a qualified name and namespace URI, use * the createAttributeNS method. * @param name The name of the attribute. - * @return A new Attr object with the nodeName - * attribute set to name, and localName, - * prefix, and namespaceURI set to + * @return A new Attr object with the nodeName + * attribute set to name, and localName, + * prefix, and namespaceURI set to * null. The value of the attribute is the empty string. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML - * name according to the XML version in use specified in the + * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML + * name according to the XML version in use specified in the * Document.xmlVersion attribute. */ public Attr createAttribute(String name) throws DOMException; /** - * Creates an EntityReference object. In addition, if the - * referenced entity is known, the child list of the - * EntityReference node is made the same as that of the + * Creates an EntityReference object. In addition, if the + * referenced entity is known, the child list of the + * EntityReference node is made the same as that of the * corresponding Entity node. - *

    Note: If any descendant of the Entity node has - * an unbound namespace prefix, the corresponding descendant of the - * created EntityReference node is also unbound; (its - * namespaceURI is null). The DOM Level 2 and - * 3 do not support any mechanism to resolve namespace prefixes in this + *

    Note: If any descendant of the Entity node has + * an unbound namespace prefix, the corresponding descendant of the + * created EntityReference node is also unbound; (its + * namespaceURI is null). The DOM Level 2 and + * 3 do not support any mechanism to resolve namespace prefixes in this * case. - * @param name The name of the entity to reference.Unlike - * Document.createElementNS or - * Document.createAttributeNS, no namespace well-formed - * checking is done on the entity name. Applications should invoke + * @param name The name of the entity to reference.Unlike + * Document.createElementNS or + * Document.createAttributeNS, no namespace well-formed + * checking is done on the entity name. Applications should invoke * Document.normalizeDocument() with the parameter " - * namespaces" set to true in order to ensure that the - * entity name is namespace well-formed. + * namespaces" set to true in order to ensure that the + * entity name is namespace well-formed. * @return The new EntityReference object. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML - * name according to the XML version in use specified in the + * INVALID_CHARACTER_ERR: Raised if the specified name is not an XML + * name according to the XML version in use specified in the * Document.xmlVersion attribute. *
    NOT_SUPPORTED_ERR: Raised if this document is an HTML document. */ @@ -186,142 +186,142 @@ public interface Document extends Node { throws DOMException; /** - * Returns a NodeList of all the Elements in - * document order with a given tag name and are contained in the + * Returns a NodeList of all the Elements in + * document order with a given tag name and are contained in the * document. - * @param tagname The name of the tag to match on. The special value "*" - * matches all tags. For XML, the tagname parameter is - * case-sensitive, otherwise it depends on the case-sensitivity of the - * markup language in use. - * @return A new NodeList object containing all the matched + * @param tagname The name of the tag to match on. The special value "*" + * matches all tags. For XML, the tagname parameter is + * case-sensitive, otherwise it depends on the case-sensitivity of the + * markup language in use. + * @return A new NodeList object containing all the matched * Elements. */ public NodeList getElementsByTagName(String tagname); /** - * Imports a node from another document to this document, without altering - * or removing the source node from the original document; this method - * creates a new copy of the source node. The returned node has no + * Imports a node from another document to this document, without altering + * or removing the source node from the original document; this method + * creates a new copy of the source node. The returned node has no * parent; (parentNode is null). - *
    For all nodes, importing a node creates a node object owned by the - * importing document, with attribute values identical to the source - * node's nodeName and nodeType, plus the - * attributes related to namespaces (prefix, - * localName, and namespaceURI). As in the - * cloneNode operation, the source node is not altered. - * User data associated to the imported node is not carried over. - * However, if any UserDataHandlers has been specified - * along with the associated data these handlers will be called with the + *
    For all nodes, importing a node creates a node object owned by the + * importing document, with attribute values identical to the source + * node's nodeName and nodeType, plus the + * attributes related to namespaces (prefix, + * localName, and namespaceURI). As in the + * cloneNode operation, the source node is not altered. + * User data associated to the imported node is not carried over. + * However, if any UserDataHandlers has been specified + * along with the associated data these handlers will be called with the * appropriate parameters before this method returns. - *
    Additional information is copied as appropriate to the - * nodeType, attempting to mirror the behavior expected if - * a fragment of XML or HTML source was copied from one document to - * another, recognizing that the two documents may have different DTDs - * in the XML case. The following list describes the specifics for each - * type of node. + *
    Additional information is copied as appropriate to the + * nodeType, attempting to mirror the behavior expected if + * a fragment of XML or HTML source was copied from one document to + * another, recognizing that the two documents may have different DTDs + * in the XML case. The following list describes the specifics for each + * type of node. *

    *
    ATTRIBUTE_NODE
    - *
    The ownerElement attribute - * is set to null and the specified flag is - * set to true on the generated Attr. The - * descendants of the source Attr are recursively imported + *
    The ownerElement attribute + * is set to null and the specified flag is + * set to true on the generated Attr. The + * descendants of the source Attr are recursively imported * and the resulting nodes reassembled to form the corresponding subtree. - * Note that the deep parameter has no effect on - * Attr nodes; they always carry their children with them + * Note that the deep parameter has no effect on + * Attr nodes; they always carry their children with them * when imported.
    *
    DOCUMENT_FRAGMENT_NODE
    - *
    If the deep option - * was set to true, the descendants of the source - * DocumentFragment are recursively imported and the - * resulting nodes reassembled under the imported - * DocumentFragment to form the corresponding subtree. - * Otherwise, this simply generates an empty + *
    If the deep option + * was set to true, the descendants of the source + * DocumentFragment are recursively imported and the + * resulting nodes reassembled under the imported + * DocumentFragment to form the corresponding subtree. + * Otherwise, this simply generates an empty * DocumentFragment.
    *
    DOCUMENT_NODE
    - *
    Document + *
    Document * nodes cannot be imported.
    *
    DOCUMENT_TYPE_NODE
    - *
    DocumentType + *
    DocumentType * nodes cannot be imported.
    *
    ELEMENT_NODE
    - *
    Specified attribute nodes of the source element are imported, and the generated - * Attr nodes are attached to the generated - * Element. Default attributes are not copied, though if the document being imported into defines default - * attributes for this element name, those are assigned. If the - * importNode deep parameter was set to - * true, the descendants of the source element are - * recursively imported and the resulting nodes reassembled to form the + *
    Specified attribute nodes of the source element are imported, and the generated + * Attr nodes are attached to the generated + * Element. Default attributes are not copied, though if the document being imported into defines default + * attributes for this element name, those are assigned. If the + * importNode deep parameter was set to + * true, the descendants of the source element are + * recursively imported and the resulting nodes reassembled to form the * corresponding subtree.
    *
    ENTITY_NODE
    - *
    Entity nodes can be - * imported, however in the current release of the DOM the - * DocumentType is readonly. Ability to add these imported - * nodes to a DocumentType will be considered for addition - * to a future release of the DOM.On import, the publicId, - * systemId, and notationName attributes are - * copied. If a deep import is requested, the descendants - * of the the source Entity are recursively imported and + *
    Entity nodes can be + * imported, however in the current release of the DOM the + * DocumentType is readonly. Ability to add these imported + * nodes to a DocumentType will be considered for addition + * to a future release of the DOM.On import, the publicId, + * systemId, and notationName attributes are + * copied. If a deep import is requested, the descendants + * of the the source Entity are recursively imported and * the resulting nodes reassembled to form the corresponding subtree.
    *
    * ENTITY_REFERENCE_NODE
    - *
    Only the EntityReference itself is - * copied, even if a deep import is requested, since the - * source and destination documents might have defined the entity - * differently. If the document being imported into provides a + *
    Only the EntityReference itself is + * copied, even if a deep import is requested, since the + * source and destination documents might have defined the entity + * differently. If the document being imported into provides a * definition for this entity name, its value is assigned.
    *
    NOTATION_NODE
    *
    - * Notation nodes can be imported, however in the current - * release of the DOM the DocumentType is readonly. Ability - * to add these imported nodes to a DocumentType will be - * considered for addition to a future release of the DOM.On import, the + * Notation nodes can be imported, however in the current + * release of the DOM the DocumentType is readonly. Ability + * to add these imported nodes to a DocumentType will be + * considered for addition to a future release of the DOM.On import, the * publicId and systemId attributes are copied. - * Note that the deep parameter has no effect on this type + * Note that the deep parameter has no effect on this type * of nodes since they cannot have any children.
    *
    * PROCESSING_INSTRUCTION_NODE
    - *
    The imported node copies its - * target and data values from those of the - * source node.Note that the deep parameter has no effect + *
    The imported node copies its + * target and data values from those of the + * source node.Note that the deep parameter has no effect * on this type of nodes since they cannot have any children.
    - *
    TEXT_NODE, + *
    TEXT_NODE, * CDATA_SECTION_NODE, COMMENT_NODE
    - *
    These three types of nodes inheriting - * from CharacterData copy their data and - * length attributes from those of the source node.Note - * that the deep parameter has no effect on these types of + *
    These three types of nodes inheriting + * from CharacterData copy their data and + * length attributes from those of the source node.Note + * that the deep parameter has no effect on these types of * nodes since they cannot have any children.
    - *
    + * * @param importedNode The node to import. - * @param deep If true, recursively import the subtree under - * the specified node; if false, import only the node - * itself, as explained above. This has no effect on nodes that cannot - * have any children, and on Attr, and + * @param deep If true, recursively import the subtree under + * the specified node; if false, import only the node + * itself, as explained above. This has no effect on nodes that cannot + * have any children, and on Attr, and * EntityReference nodes. * @return The imported node that belongs to this Document. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the type of node being imported is not + * NOT_SUPPORTED_ERR: Raised if the type of node being imported is not * supported. - *
    INVALID_CHARACTER_ERR: Raised if one of the imported names is not - * an XML name according to the XML version in use specified in the - * Document.xmlVersion attribute. This may happen when - * importing an XML 1.1 [XML 1.1] element + *
    INVALID_CHARACTER_ERR: Raised if one of the imported names is not + * an XML name according to the XML version in use specified in the + * Document.xmlVersion attribute. This may happen when + * importing an XML 1.1 [XML 1.1] element * into an XML 1.0 document, for instance. * @since DOM Level 2 */ - public Node importNode(Node importedNode, + public Node importNode(Node importedNode, boolean deep) throws DOMException; /** * Creates an element of the given qualified name and namespace URI. *
    Per [XML Namespaces] - * , applications must use the value null as the + * , applications must use the value null as the * namespaceURI parameter for methods if they wish to have no namespace. * @param namespaceURI The namespace URI of the element to create. - * @param qualifiedName The qualified name of the element type to + * @param qualifiedName The qualified name of the element type to * instantiate. - * @return A new Element object with the following + * @return A new Element object with the following * attributes: * * @@ -340,13 +340,13 @@ public interface Document extends Node { * * * - * * * * - * * * @@ -356,35 +356,35 @@ public interface Document extends Node { * *
    Node.prefixprefix, extracted - * from qualifiedName, or null if there is + * prefix, extracted + * from qualifiedName, or null if there is * no prefix
    Node.localNamelocal name, extracted from + * local name, extracted from * qualifiedName
    * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified - * qualifiedName is not an XML name according to the XML - * version in use specified in the Document.xmlVersion + * INVALID_CHARACTER_ERR: Raised if the specified + * qualifiedName is not an XML name according to the XML + * version in use specified in the Document.xmlVersion * attribute. - *
    NAMESPACE_ERR: Raised if the qualifiedName is a - * malformed qualified name, if the qualifiedName has a - * prefix and the namespaceURI is null, or - * if the qualifiedName has a prefix that is "xml" and + *
    NAMESPACE_ERR: Raised if the qualifiedName is a + * malformed qualified name, if the qualifiedName has a + * prefix and the namespaceURI is null, or + * if the qualifiedName has a prefix that is "xml" and * the namespaceURI is different from " * http://www.w3.org/XML/1998/namespace" [XML Namespaces] - * , or if the qualifiedName or its prefix is "xmlns" and + * , or if the qualifiedName or its prefix is "xmlns" and * the namespaceURI is different from "http://www.w3.org/2000/xmlns/", or if the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the qualifiedName nor its prefix is "xmlns". - *
    NOT_SUPPORTED_ERR: Always thrown if the current document does not - * support the "XML" feature, since namespaces were + *
    NOT_SUPPORTED_ERR: Always thrown if the current document does not + * support the "XML" feature, since namespaces were * defined by XML. * @since DOM Level 2 */ - public Element createElementNS(String namespaceURI, + public Element createElementNS(String namespaceURI, String qualifiedName) throws DOMException; /** * Creates an attribute of the given qualified name and namespace URI. *
    Per [XML Namespaces] - * , applications must use the value null as the - * namespaceURI parameter for methods if they wish to have + * , applications must use the value null as the + * namespaceURI parameter for methods if they wish to have * no namespace. * @param namespaceURI The namespace URI of the attribute to create. - * @param qualifiedName The qualified name of the attribute to + * @param qualifiedName The qualified name of the attribute to * instantiate. * @return A new Attr object with the following attributes: * @@ -405,13 +405,13 @@ public interface Document extends Node { * * - * * * * - * * * @@ -421,53 +421,53 @@ public interface Document extends Node { * * * - * * *
    * Node.prefixprefix, extracted from - * qualifiedName, or null if there is no + * prefix, extracted from + * qualifiedName, or null if there is no * prefix
    Node.localNamelocal name, extracted from + * local name, extracted from * qualifiedName
    Node.nodeValuethe empty + * the empty * string
    * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified - * qualifiedName is not an XML name according to the XML - * version in use specified in the Document.xmlVersion + * INVALID_CHARACTER_ERR: Raised if the specified + * qualifiedName is not an XML name according to the XML + * version in use specified in the Document.xmlVersion * attribute. - *
    NAMESPACE_ERR: Raised if the qualifiedName is a - * malformed qualified name, if the qualifiedName has a - * prefix and the namespaceURI is null, if - * the qualifiedName has a prefix that is "xml" and the + *
    NAMESPACE_ERR: Raised if the qualifiedName is a + * malformed qualified name, if the qualifiedName has a + * prefix and the namespaceURI is null, if + * the qualifiedName has a prefix that is "xml" and the * namespaceURI is different from " - * http://www.w3.org/XML/1998/namespace", if the qualifiedName or its prefix is "xmlns" and the + * http://www.w3.org/XML/1998/namespace", if the qualifiedName or its prefix is "xmlns" and the * namespaceURI is different from "http://www.w3.org/2000/xmlns/", or if the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the qualifiedName nor its prefix is "xmlns". - *
    NOT_SUPPORTED_ERR: Always thrown if the current document does not - * support the "XML" feature, since namespaces were + *
    NOT_SUPPORTED_ERR: Always thrown if the current document does not + * support the "XML" feature, since namespaces were * defined by XML. * @since DOM Level 2 */ - public Attr createAttributeNS(String namespaceURI, + public Attr createAttributeNS(String namespaceURI, String qualifiedName) throws DOMException; /** - * Returns a NodeList of all the Elements with a + * Returns a NodeList of all the Elements with a * given local name and namespace URI in document order. - * @param namespaceURI The namespace URI of the elements to match on. The + * @param namespaceURI The namespace URI of the elements to match on. The * special value "*" matches all namespaces. - * @param localName The local name of the elements to match on. The + * @param localName The local name of the elements to match on. The * special value "*" matches all local names. - * @return A new NodeList object containing all the matched + * @return A new NodeList object containing all the matched * Elements. * @since DOM Level 2 */ - public NodeList getElementsByTagNameNS(String namespaceURI, + public NodeList getElementsByTagNameNS(String namespaceURI, String localName); /** - * Returns the Element that has an ID attribute with the + * Returns the Element that has an ID attribute with the * given value. If no such element exists, this returns null - * . If more than one element has an ID attribute with that value, what - * is returned is undefined. - *
    The DOM implementation is expected to use the attribute - * Attr.isId to determine if an attribute is of type ID. - *

    Note: Attributes with the name "ID" or "id" are not of type + * . If more than one element has an ID attribute with that value, what + * is returned is undefined. + *
    The DOM implementation is expected to use the attribute + * Attr.isId to determine if an attribute is of type ID. + *

    Note: Attributes with the name "ID" or "id" are not of type * ID unless so defined. * @param elementId The unique id value for an element. * @return The matching element or null if there is none. @@ -476,179 +476,179 @@ public interface Document extends Node { public Element getElementById(String elementId); /** - * An attribute specifying the encoding used for this document at the time - * of the parsing. This is null when it is not known, such + * An attribute specifying the encoding used for this document at the time + * of the parsing. This is null when it is not known, such * as when the Document was created in memory. * @since DOM Level 3 */ public String getInputEncoding(); /** - * An attribute specifying, as part of the XML declaration, the encoding of this document. This is null when - * unspecified or when it is not known, such as when the + * An attribute specifying, as part of the XML declaration, the encoding of this document. This is null when + * unspecified or when it is not known, such as when the * Document was created in memory. * @since DOM Level 3 */ public String getXmlEncoding(); /** - * An attribute specifying, as part of the XML declaration, whether this document is standalone. This is false when + * An attribute specifying, as part of the XML declaration, whether this document is standalone. This is false when * unspecified. - *

    Note: No verification is done on the value when setting - * this attribute. Applications should use - * Document.normalizeDocument() with the "validate" - * parameter to verify if the value matches the validity - * constraint for standalone document declaration as defined in [XML 1.0]. + *

    Note: No verification is done on the value when setting + * this attribute. Applications should use + * Document.normalizeDocument() with the "validate" + * parameter to verify if the value matches the validity + * constraint for standalone document declaration as defined in [XML 1.0]. * @since DOM Level 3 */ public boolean getXmlStandalone(); /** - * An attribute specifying, as part of the XML declaration, whether this document is standalone. This is false when + * An attribute specifying, as part of the XML declaration, whether this document is standalone. This is false when * unspecified. - *

    Note: No verification is done on the value when setting - * this attribute. Applications should use - * Document.normalizeDocument() with the "validate" - * parameter to verify if the value matches the validity - * constraint for standalone document declaration as defined in [XML 1.0]. + *

    Note: No verification is done on the value when setting + * this attribute. Applications should use + * Document.normalizeDocument() with the "validate" + * parameter to verify if the value matches the validity + * constraint for standalone document declaration as defined in [XML 1.0]. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if this document does not support the - * "XML" feature. + * NOT_SUPPORTED_ERR: Raised if this document does not support the + * "XML" feature. * @since DOM Level 3 */ public void setXmlStandalone(boolean xmlStandalone) throws DOMException; /** - * An attribute specifying, as part of the XML declaration, the version number of this document. If there is no declaration and if - * this document supports the "XML" feature, the value is - * "1.0". If this document does not support the "XML" - * feature, the value is always null. Changing this - * attribute will affect methods that check for invalid characters in - * XML names. Application should invoke - * Document.normalizeDocument() in order to check for - * invalid characters in the Nodes that are already part of - * this Document. - *
    DOM applications may use the - * DOMImplementation.hasFeature(feature, version) method - * with parameter values "XMLVersion" and "1.0" (respectively) to - * determine if an implementation supports [XML 1.0]. DOM - * applications may use the same method with parameter values - * "XMLVersion" and "1.1" (respectively) to determine if an - * implementation supports [XML 1.1]. In both - * cases, in order to support XML, an implementation must also support + * An attribute specifying, as part of the XML declaration, the version number of this document. If there is no declaration and if + * this document supports the "XML" feature, the value is + * "1.0". If this document does not support the "XML" + * feature, the value is always null. Changing this + * attribute will affect methods that check for invalid characters in + * XML names. Application should invoke + * Document.normalizeDocument() in order to check for + * invalid characters in the Nodes that are already part of + * this Document. + *
    DOM applications may use the + * DOMImplementation.hasFeature(feature, version) method + * with parameter values "XMLVersion" and "1.0" (respectively) to + * determine if an implementation supports [XML 1.0]. DOM + * applications may use the same method with parameter values + * "XMLVersion" and "1.1" (respectively) to determine if an + * implementation supports [XML 1.1]. In both + * cases, in order to support XML, an implementation must also support * the "XML" feature defined in this specification. Document - * objects supporting a version of the "XMLVersion" feature must not - * raise a NOT_SUPPORTED_ERR exception for the same version - * number when using Document.xmlVersion. + * objects supporting a version of the "XMLVersion" feature must not + * raise a NOT_SUPPORTED_ERR exception for the same version + * number when using Document.xmlVersion. * @since DOM Level 3 */ public String getXmlVersion(); /** - * An attribute specifying, as part of the XML declaration, the version number of this document. If there is no declaration and if - * this document supports the "XML" feature, the value is - * "1.0". If this document does not support the "XML" - * feature, the value is always null. Changing this - * attribute will affect methods that check for invalid characters in - * XML names. Application should invoke - * Document.normalizeDocument() in order to check for - * invalid characters in the Nodes that are already part of - * this Document. - *
    DOM applications may use the - * DOMImplementation.hasFeature(feature, version) method - * with parameter values "XMLVersion" and "1.0" (respectively) to - * determine if an implementation supports [XML 1.0]. DOM - * applications may use the same method with parameter values - * "XMLVersion" and "1.1" (respectively) to determine if an - * implementation supports [XML 1.1]. In both - * cases, in order to support XML, an implementation must also support + * An attribute specifying, as part of the XML declaration, the version number of this document. If there is no declaration and if + * this document supports the "XML" feature, the value is + * "1.0". If this document does not support the "XML" + * feature, the value is always null. Changing this + * attribute will affect methods that check for invalid characters in + * XML names. Application should invoke + * Document.normalizeDocument() in order to check for + * invalid characters in the Nodes that are already part of + * this Document. + *
    DOM applications may use the + * DOMImplementation.hasFeature(feature, version) method + * with parameter values "XMLVersion" and "1.0" (respectively) to + * determine if an implementation supports [XML 1.0]. DOM + * applications may use the same method with parameter values + * "XMLVersion" and "1.1" (respectively) to determine if an + * implementation supports [XML 1.1]. In both + * cases, in order to support XML, an implementation must also support * the "XML" feature defined in this specification. Document - * objects supporting a version of the "XMLVersion" feature must not - * raise a NOT_SUPPORTED_ERR exception for the same version - * number when using Document.xmlVersion. + * objects supporting a version of the "XMLVersion" feature must not + * raise a NOT_SUPPORTED_ERR exception for the same version + * number when using Document.xmlVersion. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the version is set to a value that is - * not supported by this Document or if this document - * does not support the "XML" feature. + * NOT_SUPPORTED_ERR: Raised if the version is set to a value that is + * not supported by this Document or if this document + * does not support the "XML" feature. * @since DOM Level 3 */ public void setXmlVersion(String xmlVersion) throws DOMException; /** - * An attribute specifying whether error checking is enforced or not. When - * set to false, the implementation is free to not test - * every possible error case normally defined on DOM operations, and not - * raise any DOMException on DOM operations or report - * errors while using Document.normalizeDocument(). In case - * of error, the behavior is undefined. This attribute is + * An attribute specifying whether error checking is enforced or not. When + * set to false, the implementation is free to not test + * every possible error case normally defined on DOM operations, and not + * raise any DOMException on DOM operations or report + * errors while using Document.normalizeDocument(). In case + * of error, the behavior is undefined. This attribute is * true by default. * @since DOM Level 3 */ public boolean getStrictErrorChecking(); /** - * An attribute specifying whether error checking is enforced or not. When - * set to false, the implementation is free to not test - * every possible error case normally defined on DOM operations, and not - * raise any DOMException on DOM operations or report - * errors while using Document.normalizeDocument(). In case - * of error, the behavior is undefined. This attribute is + * An attribute specifying whether error checking is enforced or not. When + * set to false, the implementation is free to not test + * every possible error case normally defined on DOM operations, and not + * raise any DOMException on DOM operations or report + * errors while using Document.normalizeDocument(). In case + * of error, the behavior is undefined. This attribute is * true by default. * @since DOM Level 3 */ public void setStrictErrorChecking(boolean strictErrorChecking); /** - * The location of the document or null if undefined or if - * the Document was created using - * DOMImplementation.createDocument. No lexical checking is - * performed when setting this attribute; this could result in a + * The location of the document or null if undefined or if + * the Document was created using + * DOMImplementation.createDocument. No lexical checking is + * performed when setting this attribute; this could result in a * null value returned when using Node.baseURI - * . - *
    Beware that when the Document supports the feature + * . + *
    Beware that when the Document supports the feature * "HTML" [DOM Level 2 HTML] - * , the href attribute of the HTML BASE element takes precedence over - * this attribute when computing Node.baseURI. + * , the href attribute of the HTML BASE element takes precedence over + * this attribute when computing Node.baseURI. * @since DOM Level 3 */ public String getDocumentURI(); /** - * The location of the document or null if undefined or if - * the Document was created using - * DOMImplementation.createDocument. No lexical checking is - * performed when setting this attribute; this could result in a + * The location of the document or null if undefined or if + * the Document was created using + * DOMImplementation.createDocument. No lexical checking is + * performed when setting this attribute; this could result in a * null value returned when using Node.baseURI - * . - *
    Beware that when the Document supports the feature + * . + *
    Beware that when the Document supports the feature * "HTML" [DOM Level 2 HTML] - * , the href attribute of the HTML BASE element takes precedence over - * this attribute when computing Node.baseURI. + * , the href attribute of the HTML BASE element takes precedence over + * this attribute when computing Node.baseURI. * @since DOM Level 3 */ public void setDocumentURI(String documentURI); /** - * Attempts to adopt a node from another document to this document. If - * supported, it changes the ownerDocument of the source - * node, its children, as well as the attached attribute nodes if there - * are any. If the source node has a parent it is first removed from the - * child list of its parent. This effectively allows moving a subtree - * from one document to another (unlike importNode() which - * create a copy of the source node instead of moving it). When it - * fails, applications should use Document.importNode() - * instead. Note that if the adopted node is already part of this - * document (i.e. the source and target document are the same), this - * method still has the effect of removing the source node from the - * child list of its parent, if any. The following list describes the - * specifics for each type of node. + * Attempts to adopt a node from another document to this document. If + * supported, it changes the ownerDocument of the source + * node, its children, as well as the attached attribute nodes if there + * are any. If the source node has a parent it is first removed from the + * child list of its parent. This effectively allows moving a subtree + * from one document to another (unlike importNode() which + * create a copy of the source node instead of moving it). When it + * fails, applications should use Document.importNode() + * instead. Note that if the adopted node is already part of this + * document (i.e. the source and target document are the same), this + * method still has the effect of removing the source node from the + * child list of its parent, if any. The following list describes the + * specifics for each type of node. *

    *
    ATTRIBUTE_NODE
    - *
    The - * ownerElement attribute is set to null and - * the specified flag is set to true on the - * adopted Attr. The descendants of the source + *
    The + * ownerElement attribute is set to null and + * the specified flag is set to true on the + * adopted Attr. The descendants of the source * Attr are recursively adopted.
    *
    DOCUMENT_FRAGMENT_NODE
    - *
    The + *
    The * descendants of the source node are recursively adopted.
    *
    DOCUMENT_NODE
    *
    @@ -657,41 +657,41 @@ public interface Document extends Node { *
    * DocumentType nodes cannot be adopted.
    *
    ELEMENT_NODE
    - *
    Specified attribute nodes of the source element are adopted. Default attributes - * are discarded, though if the document being adopted into defines - * default attributes for this element name, those are assigned. The + *
    Specified attribute nodes of the source element are adopted. Default attributes + * are discarded, though if the document being adopted into defines + * default attributes for this element name, those are assigned. The * descendants of the source element are recursively adopted.
    *
    ENTITY_NODE
    *
    * Entity nodes cannot be adopted.
    *
    ENTITY_REFERENCE_NODE
    - *
    Only - * the EntityReference node itself is adopted, the - * descendants are discarded, since the source and destination documents - * might have defined the entity differently. If the document being - * imported into provides a definition for this entity name, its value + *
    Only + * the EntityReference node itself is adopted, the + * descendants are discarded, since the source and destination documents + * might have defined the entity differently. If the document being + * imported into provides a definition for this entity name, its value * is assigned.
    *
    NOTATION_NODE
    - *
    Notation nodes cannot be + *
    Notation nodes cannot be * adopted.
    - *
    PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE, + *
    PROCESSING_INSTRUCTION_NODE, TEXT_NODE, CDATA_SECTION_NODE, * COMMENT_NODE
    *
    These nodes can all be adopted. No specifics.
    - *
    - *

    Note: Since it does not create new nodes unlike the - * Document.importNode() method, this method does not raise - * an INVALID_CHARACTER_ERR exception, and applications - * should use the Document.normalizeDocument() method to - * check if an imported name is not an XML name according to the XML - * version in use. + * + *

    Note: Since it does not create new nodes unlike the + * Document.importNode() method, this method does not raise + * an INVALID_CHARACTER_ERR exception, and applications + * should use the Document.normalizeDocument() method to + * check if an imported name is not an XML name according to the XML + * version in use. * @param source The node to move into this document. - * @return The adopted node, or null if this operation - * fails, such as when the source node comes from a different + * @return The adopted node, or null if this operation + * fails, such as when the source node comes from a different * implementation. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the source node is of type + * NOT_SUPPORTED_ERR: Raised if the source node is of type * DOCUMENT, DOCUMENT_TYPE. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised when the source node is * readonly. * @since DOM Level 3 */ @@ -699,115 +699,115 @@ public interface Document extends Node { throws DOMException; /** - * The configuration used when Document.normalizeDocument() - * is invoked. + * The configuration used when Document.normalizeDocument() + * is invoked. * @since DOM Level 3 */ public DOMConfiguration getDomConfig(); /** - * This method acts as if the document was going through a save and load - * cycle, putting the document in a "normal" form. As a consequence, - * this method updates the replacement tree of - * EntityReference nodes and normalizes Text - * nodes, as defined in the method Node.normalize(). - *
    Otherwise, the actual result depends on the features being set on - * the Document.domConfig object and governing what - * operations actually take place. Noticeably this method could also - * make the document namespace well-formed according to the algorithm - * described in , check the character normalization, remove the - * CDATASection nodes, etc. See - * DOMConfiguration for details. - * 

    // Keep in the document 
-     * the information defined // in the XML Information Set (Java example) 
-     * DOMConfiguration docConfig = myDocument.getDomConfig(); 
-     * docConfig.setParameter("infoset", Boolean.TRUE); 
+     *  This method acts as if the document was going through a save and load
+     * cycle, putting the document in a "normal" form. As a consequence,
+     * this method updates the replacement tree of
+     * EntityReference nodes and normalizes Text
+     * nodes, as defined in the method Node.normalize().
+     * 
     Otherwise, the actual result depends on the features being set on
+     * the Document.domConfig object and governing what
+     * operations actually take place. Noticeably this method could also
+     * make the document namespace well-formed according to the algorithm
+     * described in , check the character normalization, remove the
+     * CDATASection nodes, etc. See
+     * DOMConfiguration for details.
+     * 
    // Keep in the document
+     * the information defined // in the XML Information Set (Java example)
+     * DOMConfiguration docConfig = myDocument.getDomConfig();
+     * docConfig.setParameter("infoset", Boolean.TRUE);
      * myDocument.normalizeDocument();
    
-     * 
-     * 
    Mutation events, when supported, are generated to reflect the 
+     *
+     * 
    Mutation events, when supported, are generated to reflect the
      * changes occurring on the document.
-     * 
     If errors occur during the invocation of this method, such as an 
-     * attempt to update a read-only node or a Node.nodeName 
-     * contains an invalid character according to the XML version in use, 
-     * errors or warnings (DOMError.SEVERITY_ERROR or 
-     * DOMError.SEVERITY_WARNING) will be reported using the 
+     * 
     If errors occur during the invocation of this method, such as an
+     * attempt to update a read-only node or a Node.nodeName
+     * contains an invalid character according to the XML version in use,
+     * errors or warnings (DOMError.SEVERITY_ERROR or
+     * DOMError.SEVERITY_WARNING) will be reported using the
      * DOMErrorHandler object associated with the "error-handler
      * " parameter. Note this method might also report fatal errors (
-     * DOMError.SEVERITY_FATAL_ERROR) if an implementation 
-     * cannot recover from an error. 
+     * DOMError.SEVERITY_FATAL_ERROR) if an implementation
+     * cannot recover from an error.
      * @since DOM Level 3
      */
     public void normalizeDocument();
 
     /**
-     * Rename an existing node of type ELEMENT_NODE or 
+     * Rename an existing node of type ELEMENT_NODE or
      * ATTRIBUTE_NODE.
-     * 
    When possible this simply changes the name of the given node, 
-     * otherwise this creates a new node with the specified name and 
+     * 
    When possible this simply changes the name of the given node,
+     * otherwise this creates a new node with the specified name and
      * replaces the existing node with the new node as described below.
-     * 
    If simply changing the name of the given node is not possible, the 
-     * following operations are performed: a new node is created, any 
-     * registered event listener is registered on the new node, any user 
-     * data attached to the old node is removed from that node, the old node 
-     * is removed from its parent if it has one, the children are moved to 
-     * the new node, if the renamed node is an Element its 
-     * attributes are moved to the new node, the new node is inserted at the 
-     * position the old node used to have in its parent's child nodes list 
-     * if it has one, the user data that was attached to the old node is 
+     * 
    If simply changing the name of the given node is not possible, the
+     * following operations are performed: a new node is created, any
+     * registered event listener is registered on the new node, any user
+     * data attached to the old node is removed from that node, the old node
+     * is removed from its parent if it has one, the children are moved to
+     * the new node, if the renamed node is an Element its
+     * attributes are moved to the new node, the new node is inserted at the
+     * position the old node used to have in its parent's child nodes list
+     * if it has one, the user data that was attached to the old node is
      * attached to the new node.
-     * 
    When the node being renamed is an Element only the 
-     * specified attributes are moved, default attributes originated from 
-     * the DTD are updated according to the new element name. In addition, 
-     * the implementation may update default attributes from other schemas. 
-     * Applications should use Document.normalizeDocument() to 
+     * 
    When the node being renamed is an Element only the
+     * specified attributes are moved, default attributes originated from
+     * the DTD are updated according to the new element name. In addition,
+     * the implementation may update default attributes from other schemas.
+     * Applications should use Document.normalizeDocument() to
      * guarantee these attributes are up-to-date.
-     * 
    When the node being renamed is an Attr that is 
-     * attached to an Element, the node is first removed from 
-     * the Element attributes map. Then, once renamed, either 
-     * by modifying the existing node or creating a new one as described 
+     * 
    When the node being renamed is an Attr that is
+     * attached to an Element, the node is first removed from
+     * the Element attributes map. Then, once renamed, either
+     * by modifying the existing node or creating a new one as described
      * above, it is put back.
      * 
    In addition,
      * 
      
-     * 
    •  a user data event NODE_RENAMED is fired, 
+     * 
    •  a user data event NODE_RENAMED is fired,
      * 
      • 
-     * 
    •  
-     * when the implementation supports the feature "MutationNameEvents", 
-     * each mutation operation involved in this method fires the appropriate 
+     * 
    • 
+     * when the implementation supports the feature "MutationNameEvents",
+     * each mutation operation involved in this method fires the appropriate
      * event, and in the end the event {
-     * http://www.w3.org/2001/xml-events, 
+     * http://www.w3.org/2001/xml-events,
      * DOMElementNameChanged} or {
-     * http://www.w3.org/2001/xml-events, 
-     * DOMAttributeNameChanged} is fired. 
+     * http://www.w3.org/2001/xml-events,
+     * DOMAttributeNameChanged} is fired.
      * 
      • 
      * 
    
      * @param n The node to rename.
      * @param namespaceURI The new namespace URI.
      * @param qualifiedName The new qualified name.
-     * @return The renamed node. This is either the specified node or the new 
+     * @return The renamed node. This is either the specified node or the new
      *   node that was created to replace the specified node.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: Raised when the type of the specified node is 
-     *   neither ELEMENT_NODE nor ATTRIBUTE_NODE, 
-     *   or if the implementation does not support the renaming of the 
+     *   NOT_SUPPORTED_ERR: Raised when the type of the specified node is
+     *   neither ELEMENT_NODE nor ATTRIBUTE_NODE,
+     *   or if the implementation does not support the renaming of the
      *   document element.
-     *   
    INVALID_CHARACTER_ERR: Raised if the new qualified name is not an 
-     *   XML name according to the XML version in use specified in the 
+     *   
    INVALID_CHARACTER_ERR: Raised if the new qualified name is not an
+     *   XML name according to the XML version in use specified in the
      *   Document.xmlVersion attribute.
-     *   
    WRONG_DOCUMENT_ERR: Raised when the specified node was created 
+     *   
    WRONG_DOCUMENT_ERR: Raised when the specified node was created
      *   from a different document than this document.
-     *   
    NAMESPACE_ERR: Raised if the qualifiedName is a 
-     *   malformed qualified name, if the qualifiedName has a 
-     *   prefix and the namespaceURI is null, or 
-     *   if the qualifiedName has a prefix that is "xml" and 
+     *   
    NAMESPACE_ERR: Raised if the qualifiedName is a
+     *   malformed qualified name, if the qualifiedName has a
+     *   prefix and the namespaceURI is null, or
+     *   if the qualifiedName has a prefix that is "xml" and
      *   the namespaceURI is different from "
      *   http://www.w3.org/XML/1998/namespace" [XML Namespaces]
-     *   . Also raised, when the node being renamed is an attribute, if the 
-     *   qualifiedName, or its prefix, is "xmlns" and the 
+     *   . Also raised, when the node being renamed is an attribute, if the
+     *   qualifiedName, or its prefix, is "xmlns" and the
      *   namespaceURI is different from "http://www.w3.org/2000/xmlns/".
      * @since DOM Level 3
      */
-    public Node renameNode(Node n, 
-                           String namespaceURI, 
+    public Node renameNode(Node n,
+                           String namespaceURI,
                            String qualifiedName)
                            throws DOMException;
 
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentFragment.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentFragment.java
index 8c4531eff87..68739154e0e 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentFragment.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentFragment.java
@@ -13,39 +13,39 @@
 package org.w3c.dom;
 
 /**
- * DocumentFragment is a "lightweight" or "minimal" 
- * Document object. It is very common to want to be able to 
- * extract a portion of a document's tree or to create a new fragment of a 
- * document. Imagine implementing a user command like cut or rearranging a 
- * document by moving fragments around. It is desirable to have an object 
- * which can hold such fragments and it is quite natural to use a Node for 
- * this purpose. While it is true that a Document object could 
- * fulfill this role, a Document object can potentially be a 
- * heavyweight object, depending on the underlying implementation. What is 
- * really needed for this is a very lightweight object. 
+ * DocumentFragment is a "lightweight" or "minimal"
+ * Document object. It is very common to want to be able to
+ * extract a portion of a document's tree or to create a new fragment of a
+ * document. Imagine implementing a user command like cut or rearranging a
+ * document by moving fragments around. It is desirable to have an object
+ * which can hold such fragments and it is quite natural to use a Node for
+ * this purpose. While it is true that a Document object could
+ * fulfill this role, a Document object can potentially be a
+ * heavyweight object, depending on the underlying implementation. What is
+ * really needed for this is a very lightweight object.
  * DocumentFragment is such an object.
- * 
    Furthermore, various operations -- such as inserting nodes as children 
- * of another Node -- may take DocumentFragment 
- * objects as arguments; this results in all the child nodes of the 
+ * 
    Furthermore, various operations -- such as inserting nodes as children
+ * of another Node -- may take DocumentFragment
+ * objects as arguments; this results in all the child nodes of the
  * DocumentFragment being moved to the child list of this node.
- * 
    The children of a DocumentFragment node are zero or more 
- * nodes representing the tops of any sub-trees defining the structure of 
- * the document. DocumentFragment nodes do not need to be 
- * well-formed XML documents (although they do need to follow the rules 
- * imposed upon well-formed XML parsed entities, which can have multiple top 
- * nodes). For example, a DocumentFragment might have only one 
- * child and that child node could be a Text node. Such a 
- * structure model represents neither an HTML document nor a well-formed XML 
+ * 
    The children of a DocumentFragment node are zero or more
+ * nodes representing the tops of any sub-trees defining the structure of
+ * the document. DocumentFragment nodes do not need to be
+ * well-formed XML documents (although they do need to follow the rules
+ * imposed upon well-formed XML parsed entities, which can have multiple top
+ * nodes). For example, a DocumentFragment might have only one
+ * child and that child node could be a Text node. Such a
+ * structure model represents neither an HTML document nor a well-formed XML
  * document.
- * 
    When a DocumentFragment is inserted into a 
- * Document (or indeed any other Node that may 
- * take children) the children of the DocumentFragment and not 
- * the DocumentFragment itself are inserted into the 
- * Node. This makes the DocumentFragment very 
- * useful when the user wishes to create nodes that are siblings; the 
- * DocumentFragment acts as the parent of these nodes so that 
- * the user can use the standard methods from the Node 
- * interface, such as Node.insertBefore and 
+ * 
    When a DocumentFragment is inserted into a
+ * Document (or indeed any other Node that may
+ * take children) the children of the DocumentFragment and not
+ * the DocumentFragment itself are inserted into the
+ * Node. This makes the DocumentFragment very
+ * useful when the user wishes to create nodes that are siblings; the
+ * DocumentFragment acts as the parent of these nodes so that
+ * the user can use the standard methods from the Node
+ * interface, such as Node.insertBefore and
  * Node.appendChild.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentType.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentType.java
index 6221c7b5ef6..785578171b5 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentType.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/DocumentType.java
@@ -13,45 +13,45 @@
 package org.w3c.dom;
 
 /**
- * Each Document has a doctype attribute whose value 
- * is either null or a DocumentType object. The 
- * DocumentType interface in the DOM Core provides an interface 
- * to the list of entities that are defined for the document, and little 
- * else because the effect of namespaces and the various XML schema efforts 
+ * Each Document has a doctype attribute whose value
+ * is either null or a DocumentType object. The
+ * DocumentType interface in the DOM Core provides an interface
+ * to the list of entities that are defined for the document, and little
+ * else because the effect of namespaces and the various XML schema efforts
  * on DTD representation are not clearly understood as of this writing.
- * 
    DOM Level 3 doesn't support editing DocumentType nodes. 
+ * 
    DOM Level 3 doesn't support editing DocumentType nodes.
  * DocumentType nodes are read-only.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
 public interface DocumentType extends Node {
     /**
-     * The name of DTD; i.e., the name immediately following the 
+     * The name of DTD; i.e., the name immediately following the
      * DOCTYPE keyword.
      */
     public String getName();
 
     /**
-     * A NamedNodeMap containing the general entities, both 
-     * external and internal, declared in the DTD. Parameter entities are 
-     * not contained. Duplicates are discarded. For example in: 
-     * 
    <!DOCTYPE 
-     * ex SYSTEM "ex.dtd" [ <!ENTITY foo "foo"> <!ENTITY bar 
-     * "bar"> <!ENTITY bar "bar2"> <!ENTITY % baz "baz"> 
+     * A NamedNodeMap containing the general entities, both
+     * external and internal, declared in the DTD. Parameter entities are
+     * not contained. Duplicates are discarded. For example in:
+     * 
    <!DOCTYPE
+     * ex SYSTEM "ex.dtd" [ <!ENTITY foo "foo"> <!ENTITY bar
+     * "bar"> <!ENTITY bar "bar2"> <!ENTITY % baz "baz">
      * ]> <ex/>
    
-     *  the interface provides access to foo 
-     * and the first declaration of bar but not the second 
-     * declaration of bar or baz. Every node in 
+     *  the interface provides access to foo
+     * and the first declaration of bar but not the second
+     * declaration of bar or baz. Every node in
      * this map also implements the Entity interface.
-     * 
    The DOM Level 2 does not support editing entities, therefore 
+     * 
    The DOM Level 2 does not support editing entities, therefore
      * entities cannot be altered in any way.
      */
     public NamedNodeMap getEntities();
 
     /**
-     * A NamedNodeMap containing the notations declared in the 
-     * DTD. Duplicates are discarded. Every node in this map also implements 
+     * A NamedNodeMap containing the notations declared in the
+     * DTD. Duplicates are discarded. Every node in this map also implements
      * the Notation interface.
-     * 
    The DOM Level 2 does not support editing notations, therefore 
+     * 
    The DOM Level 2 does not support editing notations, therefore
      * notations cannot be altered in any way.
      */
     public NamedNodeMap getNotations();
@@ -63,18 +63,18 @@ public interface DocumentType extends Node {
     public String getPublicId();
 
     /**
-     * The system identifier of the external subset. This may be an absolute 
+     * The system identifier of the external subset. This may be an absolute
      * URI or not.
      * @since DOM Level 2
      */
     public String getSystemId();
 
     /**
-     * The internal subset as a string, or null if there is none. 
+     * The internal subset as a string, or null if there is none.
      * This is does not contain the delimiting square brackets.
-     * 
    Note: The actual content returned depends on how much 
-     * information is available to the implementation. This may vary 
-     * depending on various parameters, including the XML processor used to 
+     * 
    Note: The actual content returned depends on how much
+     * information is available to the implementation. This may vary
+     * depending on various parameters, including the XML processor used to
      * build the document.
      * @since DOM Level 2
      */
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Element.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Element.java
index 6a7f7e3d0c7..beca7fc8712 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Element.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Element.java
@@ -13,33 +13,33 @@
 package org.w3c.dom;
 
 /**
- * The Element interface represents an element in an HTML or XML 
- * document. Elements may have attributes associated with them; since the 
- * Element interface inherits from Node, the 
- * generic Node interface attribute attributes may 
- * be used to retrieve the set of all attributes for an element. There are 
- * methods on the Element interface to retrieve either an 
- * Attr object by name or an attribute value by name. In XML, 
- * where an attribute value may contain entity references, an 
- * Attr object should be retrieved to examine the possibly 
- * fairly complex sub-tree representing the attribute value. On the other 
- * hand, in HTML, where all attributes have simple string values, methods to 
+ * The Element interface represents an element in an HTML or XML
+ * document. Elements may have attributes associated with them; since the
+ * Element interface inherits from Node, the
+ * generic Node interface attribute attributes may
+ * be used to retrieve the set of all attributes for an element. There are
+ * methods on the Element interface to retrieve either an
+ * Attr object by name or an attribute value by name. In XML,
+ * where an attribute value may contain entity references, an
+ * Attr object should be retrieved to examine the possibly
+ * fairly complex sub-tree representing the attribute value. On the other
+ * hand, in HTML, where all attributes have simple string values, methods to
  * directly access an attribute value can safely be used as a convenience.
- * 
    Note: In DOM Level 2, the method normalize is 
+ * 
    Note: In DOM Level 2, the method normalize is
  * inherited from the Node interface where it was moved.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
 public interface Element extends Node {
     /**
-     * The name of the element. If Node.localName is different 
-     * from null, this attribute is a qualified name. For 
-     * example, in: 
-     * 
     <elementExample id="demo"> ... 
+     * The name of the element. If Node.localName is different
+     * from null, this attribute is a qualified name. For
+     * example, in:
+     * 
     <elementExample id="demo"> ...
      * </elementExample> , 
    
-     *  tagName has the value 
-     * "elementExample". Note that this is case-preserving in 
-     * XML, as are all of the operations of the DOM. The HTML DOM returns 
-     * the tagName of an HTML element in the canonical 
+     *  tagName has the value
+     * "elementExample". Note that this is case-preserving in
+     * XML, as are all of the operations of the DOM. The HTML DOM returns
+     * the tagName of an HTML element in the canonical
      * uppercase form, regardless of the case in the source HTML document.
      */
     public String getTagName();
@@ -47,47 +47,47 @@ public interface Element extends Node {
     /**
      * Retrieves an attribute value by name.
      * @param name The name of the attribute to retrieve.
-     * @return The Attr value as a string, or the empty string 
+     * @return The Attr value as a string, or the empty string
      *   if that attribute does not have a specified or default value.
      */
     public String getAttribute(String name);
 
     /**
-     * Adds a new attribute. If an attribute with that name is already present 
-     * in the element, its value is changed to be that of the value 
-     * parameter. This value is a simple string; it is not parsed as it is 
-     * being set. So any markup (such as syntax to be recognized as an 
-     * entity reference) is treated as literal text, and needs to be 
-     * appropriately escaped by the implementation when it is written out. 
-     * In order to assign an attribute value that contains entity 
-     * references, the user must create an Attr node plus any 
-     * Text and EntityReference nodes, build the 
-     * appropriate subtree, and use setAttributeNode to assign 
+     * Adds a new attribute. If an attribute with that name is already present
+     * in the element, its value is changed to be that of the value
+     * parameter. This value is a simple string; it is not parsed as it is
+     * being set. So any markup (such as syntax to be recognized as an
+     * entity reference) is treated as literal text, and needs to be
+     * appropriately escaped by the implementation when it is written out.
+     * In order to assign an attribute value that contains entity
+     * references, the user must create an Attr node plus any
+     * Text and EntityReference nodes, build the
+     * appropriate subtree, and use setAttributeNode to assign
      * it as the value of an attribute.
-     * 
    To set an attribute with a qualified name and namespace URI, use 
+     * 
    To set an attribute with a qualified name and namespace URI, use
      * the setAttributeNS method.
      * @param name The name of the attribute to create or alter.
      * @param value Value to set in string form.
      * @exception DOMException
-     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML 
-     *   name according to the XML version in use specified in the 
+     *   INVALID_CHARACTER_ERR: Raised if the specified name is not an XML
+     *   name according to the XML version in use specified in the
      *   Document.xmlVersion attribute.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
      */
-    public void setAttribute(String name, 
+    public void setAttribute(String name,
                              String value)
                              throws DOMException;
 
     /**
-     * Removes an attribute by name. If a default value for the removed 
-     * attribute is defined in the DTD, a new attribute immediately appears 
-     * with the default value as well as the corresponding namespace URI, 
-     * local name, and prefix when applicable. The implementation may handle 
-     * default values from other schemas similarly but applications should 
-     * use Document.normalizeDocument() to guarantee this 
+     * Removes an attribute by name. If a default value for the removed
+     * attribute is defined in the DTD, a new attribute immediately appears
+     * with the default value as well as the corresponding namespace URI,
+     * local name, and prefix when applicable. The implementation may handle
+     * default values from other schemas similarly but applications should
+     * use Document.normalizeDocument() to guarantee this
      * information is up-to-date.
      * 
    If no attribute with this name is found, this method has no effect.
-     * 
    To remove an attribute by local name and namespace URI, use the 
+     * 
    To remove an attribute by local name and namespace URI, use the
      * removeAttributeNS method.
      * @param name The name of the attribute to remove.
      * @exception DOMException
@@ -98,63 +98,63 @@ public interface Element extends Node {
 
     /**
      * Retrieves an attribute node by name.
-     * 
    To retrieve an attribute node by qualified name and namespace URI, 
+     * 
    To retrieve an attribute node by qualified name and namespace URI,
      * use the getAttributeNodeNS method.
-     * @param name The name (nodeName) of the attribute to 
+     * @param name The name (nodeName) of the attribute to
      *   retrieve.
      * @return The Attr node with the specified name (
-     *   nodeName) or null if there is no such 
+     *   nodeName) or null if there is no such
      *   attribute.
      */
     public Attr getAttributeNode(String name);
 
     /**
      * Adds a new attribute node. If an attribute with that name (
-     * nodeName) is already present in the element, it is 
-     * replaced by the new one. Replacing an attribute node by itself has no 
+     * nodeName) is already present in the element, it is
+     * replaced by the new one. Replacing an attribute node by itself has no
      * effect.
-     * 
    To add a new attribute node with a qualified name and namespace 
+     * 
    To add a new attribute node with a qualified name and namespace
      * URI, use the setAttributeNodeNS method.
      * @param newAttr The Attr node to add to the attribute list.
-     * @return If the newAttr attribute replaces an existing 
-     *   attribute, the replaced Attr node is returned, 
+     * @return If the newAttr attribute replaces an existing
+     *   attribute, the replaced Attr node is returned,
      *   otherwise null is returned.
      * @exception DOMException
-     *   WRONG_DOCUMENT_ERR: Raised if newAttr was created from a 
+     *   WRONG_DOCUMENT_ERR: Raised if newAttr was created from a
      *   different document than the one that created the element.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    INUSE_ATTRIBUTE_ERR: Raised if newAttr is already an 
-     *   attribute of another Element object. The DOM user must 
-     *   explicitly clone Attr nodes to re-use them in other 
+     *   
    INUSE_ATTRIBUTE_ERR: Raised if newAttr is already an
+     *   attribute of another Element object. The DOM user must
+     *   explicitly clone Attr nodes to re-use them in other
      *   elements.
      */
     public Attr setAttributeNode(Attr newAttr)
                                  throws DOMException;
 
     /**
-     * Removes the specified attribute node. If a default value for the 
-     * removed Attr node is defined in the DTD, a new node 
-     * immediately appears with the default value as well as the 
-     * corresponding namespace URI, local name, and prefix when applicable. 
-     * The implementation may handle default values from other schemas 
-     * similarly but applications should use 
-     * Document.normalizeDocument() to guarantee this 
+     * Removes the specified attribute node. If a default value for the
+     * removed Attr node is defined in the DTD, a new node
+     * immediately appears with the default value as well as the
+     * corresponding namespace URI, local name, and prefix when applicable.
+     * The implementation may handle default values from other schemas
+     * similarly but applications should use
+     * Document.normalizeDocument() to guarantee this
      * information is up-to-date.
-     * @param oldAttr The Attr node to remove from the attribute 
+     * @param oldAttr The Attr node to remove from the attribute
      *   list.
      * @return The Attr node that was removed.
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NOT_FOUND_ERR: Raised if oldAttr is not an attribute 
+     *   
    NOT_FOUND_ERR: Raised if oldAttr is not an attribute
      *   of the element.
      */
     public Attr removeAttributeNode(Attr oldAttr)
                                     throws DOMException;
 
     /**
-     * Returns a NodeList of all descendant Elements 
+     * Returns a NodeList of all descendant Elements
      * with a given tag name, in document order.
-     * @param name The name of the tag to match on. The special value "*" 
+     * @param name The name of the tag to match on. The special value "*"
      *   matches all tags.
      * @return A list of matching Element nodes.
      */
@@ -163,174 +163,174 @@ public interface Element extends Node {
     /**
      * Retrieves an attribute value by local name and namespace URI.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
      * @param namespaceURI The namespace URI of the attribute to retrieve.
      * @param localName The local name of the attribute to retrieve.
-     * @return The Attr value as a string, or the empty string 
+     * @return The Attr value as a string, or the empty string
      *   if that attribute does not have a specified or default value.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public String getAttributeNS(String namespaceURI, 
+    public String getAttributeNS(String namespaceURI,
                                  String localName)
                                  throws DOMException;
 
     /**
-     * Adds a new attribute. If an attribute with the same local name and 
-     * namespace URI is already present on the element, its prefix is 
-     * changed to be the prefix part of the qualifiedName, and 
-     * its value is changed to be the value parameter. This 
-     * value is a simple string; it is not parsed as it is being set. So any 
-     * markup (such as syntax to be recognized as an entity reference) is 
-     * treated as literal text, and needs to be appropriately escaped by the 
-     * implementation when it is written out. In order to assign an 
-     * attribute value that contains entity references, the user must create 
-     * an Attr node plus any Text and 
-     * EntityReference nodes, build the appropriate subtree, 
-     * and use setAttributeNodeNS or 
-     * setAttributeNode to assign it as the value of an 
+     * Adds a new attribute. If an attribute with the same local name and
+     * namespace URI is already present on the element, its prefix is
+     * changed to be the prefix part of the qualifiedName, and
+     * its value is changed to be the value parameter. This
+     * value is a simple string; it is not parsed as it is being set. So any
+     * markup (such as syntax to be recognized as an entity reference) is
+     * treated as literal text, and needs to be appropriately escaped by the
+     * implementation when it is written out. In order to assign an
+     * attribute value that contains entity references, the user must create
+     * an Attr node plus any Text and
+     * EntityReference nodes, build the appropriate subtree,
+     * and use setAttributeNodeNS or
+     * setAttributeNode to assign it as the value of an
      * attribute.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
-     * @param namespaceURI The namespace URI of the attribute to create or 
+     * @param namespaceURI The namespace URI of the attribute to create or
      *   alter.
-     * @param qualifiedName The qualified name of the attribute to create or 
+     * @param qualifiedName The qualified name of the attribute to create or
      *   alter.
      * @param value The value to set in string form.
      * @exception DOMException
-     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name is not 
-     *   an XML name according to the XML version in use specified in the 
+     *   INVALID_CHARACTER_ERR: Raised if the specified qualified name is not
+     *   an XML name according to the XML version in use specified in the
      *   Document.xmlVersion attribute.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NAMESPACE_ERR: Raised if the qualifiedName is 
-     *   malformed per the Namespaces in XML specification, if the 
-     *   qualifiedName has a prefix and the 
-     *   namespaceURI is null, if the 
-     *   qualifiedName has a prefix that is "xml" and the 
+     *   
    NAMESPACE_ERR: Raised if the qualifiedName is
+     *   malformed per the Namespaces in XML specification, if the
+     *   qualifiedName has a prefix and the
+     *   namespaceURI is null, if the
+     *   qualifiedName has a prefix that is "xml" and the
      *   namespaceURI is different from "
-     *   http://www.w3.org/XML/1998/namespace", if the qualifiedName or its prefix is "xmlns" and the 
+     *   http://www.w3.org/XML/1998/namespace", if the qualifiedName or its prefix is "xmlns" and the
      *   namespaceURI is different from "http://www.w3.org/2000/xmlns/", or if the namespaceURI is "http://www.w3.org/2000/xmlns/" and neither the qualifiedName nor its prefix is "xmlns".
-     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public void setAttributeNS(String namespaceURI, 
-                               String qualifiedName, 
+    public void setAttributeNS(String namespaceURI,
+                               String qualifiedName,
                                String value)
                                throws DOMException;
 
     /**
-     * Removes an attribute by local name and namespace URI. If a default 
-     * value for the removed attribute is defined in the DTD, a new 
-     * attribute immediately appears with the default value as well as the 
-     * corresponding namespace URI, local name, and prefix when applicable. 
-     * The implementation may handle default values from other schemas 
-     * similarly but applications should use 
-     * Document.normalizeDocument() to guarantee this 
+     * Removes an attribute by local name and namespace URI. If a default
+     * value for the removed attribute is defined in the DTD, a new
+     * attribute immediately appears with the default value as well as the
+     * corresponding namespace URI, local name, and prefix when applicable.
+     * The implementation may handle default values from other schemas
+     * similarly but applications should use
+     * Document.normalizeDocument() to guarantee this
      * information is up-to-date.
-     * 
    If no attribute with this local name and namespace URI is found, 
+     * 
    If no attribute with this local name and namespace URI is found,
      * this method has no effect.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
      * @param namespaceURI The namespace URI of the attribute to remove.
      * @param localName The local name of the attribute to remove.
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public void removeAttributeNS(String namespaceURI, 
+    public void removeAttributeNS(String namespaceURI,
                                   String localName)
                                   throws DOMException;
 
     /**
      * Retrieves an Attr node by local name and namespace URI.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
      * @param namespaceURI The namespace URI of the attribute to retrieve.
      * @param localName The local name of the attribute to retrieve.
-     * @return The Attr node with the specified attribute local 
-     *   name and namespace URI or null if there is no such 
+     * @return The Attr node with the specified attribute local
+     *   name and namespace URI or null if there is no such
      *   attribute.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public Attr getAttributeNodeNS(String namespaceURI, 
+    public Attr getAttributeNodeNS(String namespaceURI,
                                    String localName)
                                    throws DOMException;
 
     /**
-     * Adds a new attribute. If an attribute with that local name and that 
-     * namespace URI is already present in the element, it is replaced by 
+     * Adds a new attribute. If an attribute with that local name and that
+     * namespace URI is already present in the element, it is replaced by
      * the new one. Replacing an attribute node by itself has no effect.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
      * @param newAttr The Attr node to add to the attribute list.
-     * @return If the newAttr attribute replaces an existing 
-     *   attribute with the same local name and namespace URI, the replaced 
-     *   Attr node is returned, otherwise null is 
+     * @return If the newAttr attribute replaces an existing
+     *   attribute with the same local name and namespace URI, the replaced
+     *   Attr node is returned, otherwise null is
      *   returned.
      * @exception DOMException
-     *   WRONG_DOCUMENT_ERR: Raised if newAttr was created from a 
+     *   WRONG_DOCUMENT_ERR: Raised if newAttr was created from a
      *   different document than the one that created the element.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    INUSE_ATTRIBUTE_ERR: Raised if newAttr is already an 
-     *   attribute of another Element object. The DOM user must 
-     *   explicitly clone Attr nodes to re-use them in other 
+     *   
    INUSE_ATTRIBUTE_ERR: Raised if newAttr is already an
+     *   attribute of another Element object. The DOM user must
+     *   explicitly clone Attr nodes to re-use them in other
      *   elements.
-     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
     public Attr setAttributeNodeNS(Attr newAttr)
                                    throws DOMException;
 
     /**
-     * Returns a NodeList of all the descendant 
-     * Elements with a given local name and namespace URI in 
+     * Returns a NodeList of all the descendant
+     * Elements with a given local name and namespace URI in
      * document order.
-     * @param namespaceURI The namespace URI of the elements to match on. The 
+     * @param namespaceURI The namespace URI of the elements to match on. The
      *   special value "*" matches all namespaces.
-     * @param localName The local name of the elements to match on. The 
+     * @param localName The local name of the elements to match on. The
      *   special value "*" matches all local names.
-     * @return A new NodeList object containing all the matched 
+     * @return A new NodeList object containing all the matched
      *   Elements.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public NodeList getElementsByTagNameNS(String namespaceURI, 
+    public NodeList getElementsByTagNameNS(String namespaceURI,
                                            String localName)
                                            throws DOMException;
 
     /**
-     * Returns true when an attribute with a given name is 
-     * specified on this element or has a default value, false 
+     * Returns true when an attribute with a given name is
+     * specified on this element or has a default value, false
      * otherwise.
      * @param name The name of the attribute to look for.
-     * @return true if an attribute with the given name is 
+     * @return true if an attribute with the given name is
      *   specified on this element or has a default value, false
      *    otherwise.
      * @since DOM Level 2
@@ -338,101 +338,101 @@ public interface Element extends Node {
     public boolean hasAttribute(String name);
 
     /**
-     * Returns true when an attribute with a given local name and 
-     * namespace URI is specified on this element or has a default value, 
+     * Returns true when an attribute with a given local name and
+     * namespace URI is specified on this element or has a default value,
      * false otherwise.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the 
-     * namespaceURI parameter for methods if they wish to have 
+     * , applications must use the value null as the
+     * namespaceURI parameter for methods if they wish to have
      * no namespace.
      * @param namespaceURI The namespace URI of the attribute to look for.
      * @param localName The local name of the attribute to look for.
-     * @return true if an attribute with the given local name 
-     *   and namespace URI is specified or has a default value on this 
+     * @return true if an attribute with the given local name
+     *   and namespace URI is specified or has a default value on this
      *   element, false otherwise.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed 
-     *   through the Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed
+     *   through the Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public boolean hasAttributeNS(String namespaceURI, 
+    public boolean hasAttributeNS(String namespaceURI,
                                   String localName)
                                   throws DOMException;
 
     /**
-     *  The type information associated with this element. 
+     *  The type information associated with this element.
      * @since DOM Level 3
      */
     public TypeInfo getSchemaTypeInfo();
 
     /**
-     *  If the parameter isId is true, this method 
+     *  If the parameter isId is true, this method
      * declares the specified attribute to be a user-determined ID attribute
-     * . This affects the value of Attr.isId and the behavior 
-     * of Document.getElementById, but does not change any 
-     * schema that may be in use, in particular this does not affect the 
-     * Attr.schemaTypeInfo of the specified Attr 
-     * node. Use the value false for the parameter 
-     * isId to undeclare an attribute for being a 
-     * user-determined ID attribute. 
-     * 
     To specify an attribute by local name and namespace URI, use the 
-     * setIdAttributeNS method. 
+     * . This affects the value of Attr.isId and the behavior
+     * of Document.getElementById, but does not change any
+     * schema that may be in use, in particular this does not affect the
+     * Attr.schemaTypeInfo of the specified Attr
+     * node. Use the value false for the parameter
+     * isId to undeclare an attribute for being a
+     * user-determined ID attribute.
+     * 
     To specify an attribute by local name and namespace URI, use the
+     * setIdAttributeNS method.
      * @param name The name of the attribute.
      * @param isId Whether the attribute is a of type ID.
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
      * @since DOM Level 3
      */
-    public void setIdAttribute(String name, 
+    public void setIdAttribute(String name,
                                boolean isId)
                                throws DOMException;
 
     /**
-     *  If the parameter isId is true, this method 
+     *  If the parameter isId is true, this method
      * declares the specified attribute to be a user-determined ID attribute
-     * . This affects the value of Attr.isId and the behavior 
-     * of Document.getElementById, but does not change any 
-     * schema that may be in use, in particular this does not affect the 
-     * Attr.schemaTypeInfo of the specified Attr 
-     * node. Use the value false for the parameter 
-     * isId to undeclare an attribute for being a 
-     * user-determined ID attribute. 
+     * . This affects the value of Attr.isId and the behavior
+     * of Document.getElementById, but does not change any
+     * schema that may be in use, in particular this does not affect the
+     * Attr.schemaTypeInfo of the specified Attr
+     * node. Use the value false for the parameter
+     * isId to undeclare an attribute for being a
+     * user-determined ID attribute.
      * @param namespaceURI The namespace URI of the attribute.
      * @param localName The local name of the attribute.
      * @param isId Whether the attribute is a of type ID.
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
      * @since DOM Level 3
      */
-    public void setIdAttributeNS(String namespaceURI, 
-                                 String localName, 
+    public void setIdAttributeNS(String namespaceURI,
+                                 String localName,
                                  boolean isId)
                                  throws DOMException;
 
     /**
-     *  If the parameter isId is true, this method 
+     *  If the parameter isId is true, this method
      * declares the specified attribute to be a user-determined ID attribute
-     * . This affects the value of Attr.isId and the behavior 
-     * of Document.getElementById, but does not change any 
-     * schema that may be in use, in particular this does not affect the 
-     * Attr.schemaTypeInfo of the specified Attr 
-     * node. Use the value false for the parameter 
-     * isId to undeclare an attribute for being a 
-     * user-determined ID attribute. 
+     * . This affects the value of Attr.isId and the behavior
+     * of Document.getElementById, but does not change any
+     * schema that may be in use, in particular this does not affect the
+     * Attr.schemaTypeInfo of the specified Attr
+     * node. Use the value false for the parameter
+     * isId to undeclare an attribute for being a
+     * user-determined ID attribute.
      * @param idAttr The attribute node.
      * @param isId Whether the attribute is a of type ID.
      * @exception DOMException
      *   NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly.
-     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute 
+     *   
    NOT_FOUND_ERR: Raised if the specified node is not an attribute
      *   of this element.
      * @since DOM Level 3
      */
-    public void setIdAttributeNode(Attr idAttr, 
+    public void setIdAttributeNode(Attr idAttr,
                                    boolean isId)
                                    throws DOMException;
 
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Entity.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Entity.java
index f621c3386b1..fc89248d9d2 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Entity.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Entity.java
@@ -13,75 +13,75 @@
 package org.w3c.dom;
 
 /**
- * This interface represents a known entity, either parsed or unparsed, in an 
+ * This interface represents a known entity, either parsed or unparsed, in an
  * XML document. Note that this models the entity itself not the entity declaration.
- * 
    The nodeName attribute that is inherited from 
+ * 
    The nodeName attribute that is inherited from
  * Node contains the name of the entity.
- * 
    An XML processor may choose to completely expand entities before the 
- * structure model is passed to the DOM; in this case there will be no 
+ * 
    An XML processor may choose to completely expand entities before the
+ * structure model is passed to the DOM; in this case there will be no
  * EntityReference nodes in the document tree.
- * 
    XML does not mandate that a non-validating XML processor read and 
- * process entity declarations made in the external subset or declared in 
- * parameter entities. This means that parsed entities declared in the 
- * external subset need not be expanded by some classes of applications, and 
+ * 
    XML does not mandate that a non-validating XML processor read and
+ * process entity declarations made in the external subset or declared in
+ * parameter entities. This means that parsed entities declared in the
+ * external subset need not be expanded by some classes of applications, and
  * that the replacement text of the entity may not be available. When the 
- * replacement text is available, the corresponding Entity node's child list 
- * represents the structure of that replacement value. Otherwise, the child 
+ * replacement text is available, the corresponding Entity node's child list
+ * represents the structure of that replacement value. Otherwise, the child
  * list is empty.
- * 
    DOM Level 3 does not support editing Entity nodes; if a 
- * user wants to make changes to the contents of an Entity, 
- * every related EntityReference node has to be replaced in the 
- * structure model by a clone of the Entity's contents, and 
- * then the desired changes must be made to each of those clones instead. 
+ * 
    DOM Level 3 does not support editing Entity nodes; if a
+ * user wants to make changes to the contents of an Entity,
+ * every related EntityReference node has to be replaced in the
+ * structure model by a clone of the Entity's contents, and
+ * then the desired changes must be made to each of those clones instead.
  * Entity nodes and all their descendants are readonly.
  * 
    An Entity node does not have any parent.
- * 
    Note: If the entity contains an unbound namespace prefix, the 
- * namespaceURI of the corresponding node in the 
- * Entity node subtree is null. The same is true 
- * for EntityReference nodes that refer to this entity, when 
- * they are created using the createEntityReference method of 
+ * 
    Note: If the entity contains an unbound namespace prefix, the
+ * namespaceURI of the corresponding node in the
+ * Entity node subtree is null. The same is true
+ * for EntityReference nodes that refer to this entity, when
+ * they are created using the createEntityReference method of
  * the Document interface.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
 public interface Entity extends Node {
     /**
-     * The public identifier associated with the entity if specified, and 
+     * The public identifier associated with the entity if specified, and
      * null otherwise.
      */
     public String getPublicId();
 
     /**
-     * The system identifier associated with the entity if specified, and 
+     * The system identifier associated with the entity if specified, and
      * null otherwise. This may be an absolute URI or not.
      */
     public String getSystemId();
 
     /**
-     * For unparsed entities, the name of the notation for the entity. For 
+     * For unparsed entities, the name of the notation for the entity. For
      * parsed entities, this is null.
      */
     public String getNotationName();
 
     /**
-     * An attribute specifying the encoding used for this entity at the time 
-     * of parsing, when it is an external parsed entity. This is 
-     * null if it an entity from the internal subset or if it 
+     * An attribute specifying the encoding used for this entity at the time
+     * of parsing, when it is an external parsed entity. This is
+     * null if it an entity from the internal subset or if it
      * is not known.
      * @since DOM Level 3
      */
     public String getInputEncoding();
 
     /**
-     * An attribute specifying, as part of the text declaration, the encoding 
-     * of this entity, when it is an external parsed entity. This is 
+     * An attribute specifying, as part of the text declaration, the encoding
+     * of this entity, when it is an external parsed entity. This is
      * null otherwise.
      * @since DOM Level 3
      */
     public String getXmlEncoding();
 
     /**
-     * An attribute specifying, as part of the text declaration, the version 
-     * number of this entity, when it is an external parsed entity. This is 
+     * An attribute specifying, as part of the text declaration, the version
+     * number of this entity, when it is an external parsed entity. This is
      * null otherwise.
      * @since DOM Level 3
      */
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/EntityReference.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/EntityReference.java
index b42b0913bc8..66cc6616883 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/EntityReference.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/EntityReference.java
@@ -13,29 +13,29 @@
 package org.w3c.dom;
 
 /**
- * EntityReference nodes may be used to represent an entity 
- * reference in the tree. Note that character references and references to 
- * predefined entities are considered to be expanded by the HTML or XML 
- * processor so that characters are represented by their Unicode equivalent 
- * rather than by an entity reference. Moreover, the XML processor may 
- * completely expand references to entities while building the 
- * Document, instead of providing EntityReference 
- * nodes. If it does provide such nodes, then for an 
- * EntityReference node that represents a reference to a known 
- * entity an Entity exists, and the subtree of the 
- * EntityReference node is a copy of the Entity 
- * node subtree. However, the latter may not be true when an entity contains 
- * an unbound namespace prefix. In such a case, because the namespace prefix 
- * resolution depends on where the entity reference is, the descendants of 
- * the EntityReference node may be bound to different namespace 
- * URIs. When an EntityReference node represents a reference to 
- * an unknown entity, the node has no children and its replacement value, 
+ * EntityReference nodes may be used to represent an entity
+ * reference in the tree. Note that character references and references to
+ * predefined entities are considered to be expanded by the HTML or XML
+ * processor so that characters are represented by their Unicode equivalent
+ * rather than by an entity reference. Moreover, the XML processor may
+ * completely expand references to entities while building the
+ * Document, instead of providing EntityReference
+ * nodes. If it does provide such nodes, then for an
+ * EntityReference node that represents a reference to a known
+ * entity an Entity exists, and the subtree of the
+ * EntityReference node is a copy of the Entity
+ * node subtree. However, the latter may not be true when an entity contains
+ * an unbound namespace prefix. In such a case, because the namespace prefix
+ * resolution depends on where the entity reference is, the descendants of
+ * the EntityReference node may be bound to different namespace
+ * URIs. When an EntityReference node represents a reference to
+ * an unknown entity, the node has no children and its replacement value,
  * when used by Attr.value for example, is empty.
- * 
    As for Entity nodes, EntityReference nodes and 
+ * 
    As for Entity nodes, EntityReference nodes and
  * all their descendants are readonly.
- * 
    Note: EntityReference nodes may cause element 
- * content and attribute value normalization problems when, such as in XML 
- * 1.0 and XML Schema, the normalization is performed after entity reference 
+ * 
    Note: EntityReference nodes may cause element
+ * content and attribute value normalization problems when, such as in XML
+ * 1.0 and XML Schema, the normalization is performed after entity reference
  * are expanded.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/NameList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/NameList.java
index 10caa90f6a0..e94433f987b 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/NameList.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/NameList.java
@@ -13,56 +13,56 @@
 package org.w3c.dom;
 
 /**
- *  The NameList interface provides the abstraction of an ordered 
- * collection of parallel pairs of name and namespace values (which could be 
- * null values), without defining or constraining how this collection is 
- * implemented. The items in the NameList are accessible via an 
- * integral index, starting from 0. 
+ *  The NameList interface provides the abstraction of an ordered
+ * collection of parallel pairs of name and namespace values (which could be
+ * null values), without defining or constraining how this collection is
+ * implemented. The items in the NameList are accessible via an
+ * integral index, starting from 0.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  * @since DOM Level 3
  */
 public interface NameList {
     /**
-     *  Returns the indexth name item in the collection. 
+     *  Returns the indexth name item in the collection.
      * @param index Index into the collection.
-     * @return  The name at the indexth position in the 
-     *   NameList, or null if there is no name for 
-     *   the specified index or if the index is out of range. 
+     * @return  The name at the indexth position in the
+     *   NameList, or null if there is no name for
+     *   the specified index or if the index is out of range.
      */
     public String getName(int index);
 
     /**
-     *  Returns the indexth namespaceURI item in the collection. 
+     *  Returns the indexth namespaceURI item in the collection.
      * @param index Index into the collection.
-     * @return  The namespace URI at the indexth position in the 
-     *   NameList, or null if there is no name for 
-     *   the specified index or if the index is out of range. 
+     * @return  The namespace URI at the indexth position in the
+     *   NameList, or null if there is no name for
+     *   the specified index or if the index is out of range.
      */
     public String getNamespaceURI(int index);
 
     /**
-     *  The number of pairs (name and namespaceURI) in the list. The range of 
-     * valid child node indices is 0 to length-1 inclusive. 
+     *  The number of pairs (name and namespaceURI) in the list. The range of
+     * valid child node indices is 0 to length-1 inclusive.
      */
     public int getLength();
 
     /**
-     *  Test if a name is part of this NameList. 
-     * @param str  The name to look for. 
-     * @return  true if the name has been found, 
-     *   false otherwise. 
+     *  Test if a name is part of this NameList.
+     * @param str  The name to look for.
+     * @return  true if the name has been found,
+     *   false otherwise.
      */
     public boolean contains(String str);
 
     /**
-     *  Test if the pair namespaceURI/name is part of this 
-     * NameList. 
-     * @param namespaceURI  The namespace URI to look for. 
-     * @param name  The name to look for. 
-     * @return  true if the pair namespaceURI/name has been 
-     *   found, false otherwise. 
+     *  Test if the pair namespaceURI/name is part of this
+     * NameList.
+     * @param namespaceURI  The namespace URI to look for.
+     * @param name  The name to look for.
+     * @return  true if the pair namespaceURI/name has been
+     *   found, false otherwise.
      */
-    public boolean containsNS(String namespaceURI, 
+    public boolean containsNS(String namespaceURI,
                               String name);
 
 }
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/NamedNodeMap.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
index ad1e67bcdeb..d74ace7a3e9 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/NamedNodeMap.java
@@ -13,14 +13,14 @@
 package org.w3c.dom;
 
 /**
- * Objects implementing the NamedNodeMap interface are used to 
- * represent collections of nodes that can be accessed by name. Note that 
- * NamedNodeMap does not inherit from NodeList; 
- * NamedNodeMaps are not maintained in any particular order. 
- * Objects contained in an object implementing NamedNodeMap may 
- * also be accessed by an ordinal index, but this is simply to allow 
- * convenient enumeration of the contents of a NamedNodeMap, 
- * and does not imply that the DOM specifies an order to these Nodes. 
+ * Objects implementing the NamedNodeMap interface are used to
+ * represent collections of nodes that can be accessed by name. Note that
+ * NamedNodeMap does not inherit from NodeList;
+ * NamedNodeMaps are not maintained in any particular order.
+ * Objects contained in an object implementing NamedNodeMap may
+ * also be accessed by an ordinal index, but this is simply to allow
+ * convenient enumeration of the contents of a NamedNodeMap,
+ * and does not imply that the DOM specifies an order to these Nodes.
  * 
    NamedNodeMap objects in the DOM are live.
  * 
    See also the Document Object Model (DOM) Level 3 Core Specification.
  */
@@ -28,54 +28,54 @@ public interface NamedNodeMap {
     /**
      * Retrieves a node specified by name.
      * @param name The nodeName of a node to retrieve.
-     * @return A Node (of any type) with the specified 
-     *   nodeName, or null if it does not identify 
+     * @return A Node (of any type) with the specified
+     *   nodeName, or null if it does not identify
      *   any node in this map.
      */
     public Node getNamedItem(String name);
 
     /**
-     * Adds a node using its nodeName attribute. If a node with 
-     * that name is already present in this map, it is replaced by the new 
+     * Adds a node using its nodeName attribute. If a node with
+     * that name is already present in this map, it is replaced by the new
      * one. Replacing a node by itself has no effect.
-     * 
    As the nodeName attribute is used to derive the name 
-     * which the node must be stored under, multiple nodes of certain types 
-     * (those that have a "special" string value) cannot be stored as the 
-     * names would clash. This is seen as preferable to allowing nodes to be 
+     * 
    As the nodeName attribute is used to derive the name
+     * which the node must be stored under, multiple nodes of certain types
+     * (those that have a "special" string value) cannot be stored as the
+     * names would clash. This is seen as preferable to allowing nodes to be
      * aliased.
-     * @param arg A node to store in this map. The node will later be 
+     * @param arg A node to store in this map. The node will later be
      *   accessible using the value of its nodeName attribute.
-     * @return If the new Node replaces an existing node the 
-     *   replaced Node is returned, otherwise null 
+     * @return If the new Node replaces an existing node the
+     *   replaced Node is returned, otherwise null
      *   is returned.
      * @exception DOMException
-     *   WRONG_DOCUMENT_ERR: Raised if arg was created from a 
+     *   WRONG_DOCUMENT_ERR: Raised if arg was created from a
      *   different document than the one that created this map.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
-     *   
    INUSE_ATTRIBUTE_ERR: Raised if arg is an 
-     *   Attr that is already an attribute of another 
-     *   Element object. The DOM user must explicitly clone 
+     *   
    INUSE_ATTRIBUTE_ERR: Raised if arg is an
+     *   Attr that is already an attribute of another
+     *   Element object. The DOM user must explicitly clone
      *   Attr nodes to re-use them in other elements.
-     *   
    HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node 
-     *   doesn't belong in this NamedNodeMap. Examples would include trying 
-     *   to insert something other than an Attr node into an Element's map 
-     *   of attributes, or a non-Entity node into the DocumentType's map of 
+     *   
    HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
+     *   doesn't belong in this NamedNodeMap. Examples would include trying
+     *   to insert something other than an Attr node into an Element's map
+     *   of attributes, or a non-Entity node into the DocumentType's map of
      *   Entities.
      */
     public Node setNamedItem(Node arg)
                              throws DOMException;
 
     /**
-     * Removes a node specified by name. When this map contains the attributes 
-     * attached to an element, if the removed attribute is known to have a 
-     * default value, an attribute immediately appears containing the 
-     * default value as well as the corresponding namespace URI, local name, 
+     * Removes a node specified by name. When this map contains the attributes
+     * attached to an element, if the removed attribute is known to have a
+     * default value, an attribute immediately appears containing the
+     * default value as well as the corresponding namespace URI, local name,
      * and prefix when applicable.
      * @param name The nodeName of the node to remove.
-     * @return The node removed from this map if a node with such a name 
+     * @return The node removed from this map if a node with such a name
      *   exists.
      * @exception DOMException
-     *   NOT_FOUND_ERR: Raised if there is no node named name in 
+     *   NOT_FOUND_ERR: Raised if there is no node named name in
      *   this map.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
      */
@@ -83,17 +83,17 @@ public interface NamedNodeMap {
                                 throws DOMException;
 
     /**
-     * Returns the indexth item in the map. If index 
-     * is greater than or equal to the number of nodes in this map, this 
+     * Returns the indexth item in the map. If index
+     * is greater than or equal to the number of nodes in this map, this
      * returns null.
      * @param index Index into this map.
-     * @return The node at the indexth position in the map, or 
+     * @return The node at the indexth position in the map, or
      *   null if that is not a valid index.
      */
     public Node item(int index);
 
     /**
-     * The number of nodes in this map. The range of valid child node indices 
+     * The number of nodes in this map. The range of valid child node indices
      * is 0 to length-1 inclusive.
      */
     public int getLength();
@@ -101,82 +101,82 @@ public interface NamedNodeMap {
     /**
      * Retrieves a node specified by local name and namespace URI.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the namespaceURI parameter 
+     * , applications must use the value null as the namespaceURI parameter
      * for methods if they wish to have no namespace.
      * @param namespaceURI The namespace URI of the node to retrieve.
      * @param localName The local name of the node to retrieve.
-     * @return A Node (of any type) with the specified local 
-     *   name and namespace URI, or null if they do not 
+     * @return A Node (of any type) with the specified local
+     *   name and namespace URI, or null if they do not
      *   identify any node in this map.
      * @exception DOMException
-     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed through the 
-     *   Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed through the
+     *   Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public Node getNamedItemNS(String namespaceURI, 
+    public Node getNamedItemNS(String namespaceURI,
                                String localName)
                                throws DOMException;
 
     /**
-     * Adds a node using its namespaceURI and 
-     * localName. If a node with that namespace URI and that 
-     * local name is already present in this map, it is replaced by the new 
+     * Adds a node using its namespaceURI and
+     * localName. If a node with that namespace URI and that
+     * local name is already present in this map, it is replaced by the new
      * one. Replacing a node by itself has no effect.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the namespaceURI parameter 
+     * , applications must use the value null as the namespaceURI parameter
      * for methods if they wish to have no namespace.
-     * @param arg A node to store in this map. The node will later be 
-     *   accessible using the value of its namespaceURI and 
+     * @param arg A node to store in this map. The node will later be
+     *   accessible using the value of its namespaceURI and
      *   localName attributes.
-     * @return If the new Node replaces an existing node the 
-     *   replaced Node is returned, otherwise null 
+     * @return If the new Node replaces an existing node the
+     *   replaced Node is returned, otherwise null
      *   is returned.
      * @exception DOMException
-     *   WRONG_DOCUMENT_ERR: Raised if arg was created from a 
+     *   WRONG_DOCUMENT_ERR: Raised if arg was created from a
      *   different document than the one that created this map.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
-     *   
    INUSE_ATTRIBUTE_ERR: Raised if arg is an 
-     *   Attr that is already an attribute of another 
-     *   Element object. The DOM user must explicitly clone 
+     *   
    INUSE_ATTRIBUTE_ERR: Raised if arg is an
+     *   Attr that is already an attribute of another
+     *   Element object. The DOM user must explicitly clone
      *   Attr nodes to re-use them in other elements.
-     *   
    HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node 
-     *   doesn't belong in this NamedNodeMap. Examples would include trying 
-     *   to insert something other than an Attr node into an Element's map 
-     *   of attributes, or a non-Entity node into the DocumentType's map of 
+     *   
    HIERARCHY_REQUEST_ERR: Raised if an attempt is made to add a node
+     *   doesn't belong in this NamedNodeMap. Examples would include trying
+     *   to insert something other than an Attr node into an Element's map
+     *   of attributes, or a non-Entity node into the DocumentType's map of
      *   Entities.
-     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed through the 
-     *   Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed through the
+     *   Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
     public Node setNamedItemNS(Node arg)
                                throws DOMException;
 
     /**
-     * Removes a node specified by local name and namespace URI. A removed 
-     * attribute may be known to have a default value when this map contains 
-     * the attributes attached to an element, as returned by the attributes 
-     * attribute of the Node interface. If so, an attribute 
-     * immediately appears containing the default value as well as the 
+     * Removes a node specified by local name and namespace URI. A removed
+     * attribute may be known to have a default value when this map contains
+     * the attributes attached to an element, as returned by the attributes
+     * attribute of the Node interface. If so, an attribute
+     * immediately appears containing the default value as well as the
      * corresponding namespace URI, local name, and prefix when applicable.
      * 
    Per [XML Namespaces]
-     * , applications must use the value null as the namespaceURI parameter 
+     * , applications must use the value null as the namespaceURI parameter
      * for methods if they wish to have no namespace.
      * @param namespaceURI The namespace URI of the node to remove.
      * @param localName The local name of the node to remove.
-     * @return The node removed from this map if a node with such a local 
+     * @return The node removed from this map if a node with such a local
      *   name and namespace URI exists.
      * @exception DOMException
-     *   NOT_FOUND_ERR: Raised if there is no node with the specified 
+     *   NOT_FOUND_ERR: Raised if there is no node with the specified
      *   namespaceURI and localName in this map.
      *   
    NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
-     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not 
-     *   support the feature "XML" and the language exposed through the 
-     *   Document does not support XML Namespaces (such as [HTML 4.01]). 
+     *   
    NOT_SUPPORTED_ERR: May be raised if the implementation does not
+     *   support the feature "XML" and the language exposed through the
+     *   Document does not support XML Namespaces (such as [HTML 4.01]).
      * @since DOM Level 2
      */
-    public Node removeNamedItemNS(String namespaceURI, 
+    public Node removeNamedItemNS(String namespaceURI,
                                   String localName)
                                   throws DOMException;
 
diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Node.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Node.java
index 989d49a2ea0..c9a6d00984e 100644
--- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Node.java
+++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Node.java
@@ -13,25 +13,25 @@
 package org.w3c.dom;
 
 /**
- * The Node interface is the primary datatype for the entire 
- * Document Object Model. It represents a single node in the document tree. 
- * While all objects implementing the Node interface expose 
- * methods for dealing with children, not all objects implementing the 
- * Node interface may have children. For example, 
- * Text nodes may not have children, and adding children to 
+ * The Node interface is the primary datatype for the entire
+ * Document Object Model. It represents a single node in the document tree.
+ * While all objects implementing the Node interface expose
+ * methods for dealing with children, not all objects implementing the
+ * Node interface may have children. For example,
+ * Text nodes may not have children, and adding children to
  * such nodes results in a DOMException being raised.
- * 
    The attributes nodeName, nodeValue and 
- * attributes are included as a mechanism to get at node 
- * information without casting down to the specific derived interface. In 
- * cases where there is no obvious mapping of these attributes for a 
- * specific nodeType (e.g., nodeValue for an 
+ * 
    The attributes nodeName, nodeValue and
+ * attributes are included as a mechanism to get at node
+ * information without casting down to the specific derived interface. In
+ * cases where there is no obvious mapping of these attributes for a
+ * specific nodeType (e.g., nodeValue for an
  * Element or attributes for a Comment
- * ), this returns null. Note that the specialized interfaces 
- * may contain additional and more convenient mechanisms to get and set the 
+ * ), this returns null. Note that the specialized interfaces
+ * may contain additional and more convenient mechanisms to get and set the
  * relevant information.
- * 
    The values of nodeName, 
- * nodeValue, and attributes vary according to the 
- * node type as follows: 
+ * 
    The values of nodeName,
+ * nodeValue, and attributes vary according to the
+ * node type as follows:
  * 
  * 
  * 
@@ -43,7 +43,7 @@ package org.w3c.dom;
  * 
  * 
- * 
  * 
  * 
@@ -51,7 +51,7 @@ package org.w3c.dom;
  * 
  * 
- * 
  * 
  * 
@@ -59,7 +59,7 @@ package org.w3c.dom;
  * 
  * 
- * 
  * 
  * 
@@ -80,7 +80,7 @@ package org.w3c.dom;
  * 
  * 
  * 
- * 
  * 
  * 
@@ -116,9 +116,9 @@ package org.w3c.dom;
  * 
  * 
  * 
- * 
- * 
  * 
  * 
@@ -126,11 +126,11 @@ package org.w3c.dom;
  * 
  * 
- * 
  * 
  * 
- * 
    Interface
  * Attrsame as Attr.namesame as 
+ * same as
  * Attr.valuenull
    CDATASection
  * "#cdata-section"same as CharacterData.data, the 
+ * same as CharacterData.data, the
  * content of the CDATA Sectionnull
    Comment
  * "#comment"same as CharacterData.data, the 
+ * same as CharacterData.data, the
  * content of the commentnull
    DocumentTypesame as 
+ * same as
  * DocumentType.namenullnull
    ProcessingInstructionsame 
+ * same
  * as ProcessingInstruction.targetsame as 
+ * same as
  * ProcessingInstruction.datanull
    Text
  * "#text"same as CharacterData.data, the content 
+ * same as CharacterData.data, the content
  * of the text nodenull
     
+ *
    *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface Node { @@ -190,22 +190,22 @@ public interface Node { public String getNodeName(); /** - * The value of this node, depending on its type; see the table above. - * When it is defined to be null, setting it has no effect, + * The value of this node, depending on its type; see the table above. + * When it is defined to be null, setting it has no effect, * including if the node is read-only. * @exception DOMException - * DOMSTRING_SIZE_ERR: Raised when it would return more characters than - * fit in a DOMString variable on the implementation + * DOMSTRING_SIZE_ERR: Raised when it would return more characters than + * fit in a DOMString variable on the implementation * platform. */ public String getNodeValue() throws DOMException; /** - * The value of this node, depending on its type; see the table above. - * When it is defined to be null, setting it has no effect, + * The value of this node, depending on its type; see the table above. + * When it is defined to be null, setting it has no effect, * including if the node is read-only. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly and if + * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly and if * it is not defined to be null. */ public void setNodeValue(String nodeValue) @@ -217,148 +217,148 @@ public interface Node { public short getNodeType(); /** - * The parent of this node. All nodes, except Attr, - * Document, DocumentFragment, - * Entity, and Notation may have a parent. - * However, if a node has just been created and not yet added to the - * tree, or if it has been removed from the tree, this is - * null. + * The parent of this node. All nodes, except Attr, + * Document, DocumentFragment, + * Entity, and Notation may have a parent. + * However, if a node has just been created and not yet added to the + * tree, or if it has been removed from the tree, this is + * null. */ public Node getParentNode(); /** - * A NodeList that contains all children of this node. If - * there are no children, this is a NodeList containing no + * A NodeList that contains all children of this node. If + * there are no children, this is a NodeList containing no * nodes. */ public NodeList getChildNodes(); /** - * The first child of this node. If there is no such node, this returns + * The first child of this node. If there is no such node, this returns * null. */ public Node getFirstChild(); /** - * The last child of this node. If there is no such node, this returns + * The last child of this node. If there is no such node, this returns * null. */ public Node getLastChild(); /** - * The node immediately preceding this node. If there is no such node, + * The node immediately preceding this node. If there is no such node, * this returns null. */ public Node getPreviousSibling(); /** - * The node immediately following this node. If there is no such node, + * The node immediately following this node. If there is no such node, * this returns null. */ public Node getNextSibling(); /** - * A NamedNodeMap containing the attributes of this node (if + * A NamedNodeMap containing the attributes of this node (if * it is an Element) or null otherwise. */ public NamedNodeMap getAttributes(); /** - * The Document object associated with this node. This is - * also the Document object used to create new nodes. When - * this node is a Document or a DocumentType - * which is not used with any Document yet, this is + * The Document object associated with this node. This is + * also the Document object used to create new nodes. When + * this node is a Document or a DocumentType + * which is not used with any Document yet, this is * null. * @version DOM Level 2 */ public Document getOwnerDocument(); /** - * Inserts the node newChild before the existing child node - * refChild. If refChild is null, + * Inserts the node newChild before the existing child node + * refChild. If refChild is null, * insert newChild at the end of the list of children. - *
    If newChild is a DocumentFragment object, - * all of its children are inserted, in the same order, before - * refChild. If the newChild is already in the + *
    If newChild is a DocumentFragment object, + * all of its children are inserted, in the same order, before + * refChild. If the newChild is already in the * tree, it is first removed. - *

    Note: Inserting a node before itself is implementation - * dependent. + *

    Note: Inserting a node before itself is implementation + * dependent. * @param newChild The node to insert. - * @param refChild The reference node, i.e., the node before which the + * @param refChild The reference node, i.e., the node before which the * new node must be inserted. * @return The node being inserted. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not - * allow children of the type of the newChild node, or if - * the node to insert is one of this node's ancestors or this node - * itself, or if this node is of type Document and the - * DOM application attempts to insert a second + * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not + * allow children of the type of the newChild node, or if + * the node to insert is one of this node's ancestors or this node + * itself, or if this node is of type Document and the + * DOM application attempts to insert a second * DocumentType or Element node. - *
    WRONG_DOCUMENT_ERR: Raised if newChild was created + *
    WRONG_DOCUMENT_ERR: Raised if newChild was created * from a different document than the one that created this node. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or * if the parent of the node being inserted is readonly. - *
    NOT_FOUND_ERR: Raised if refChild is not a child of + *
    NOT_FOUND_ERR: Raised if refChild is not a child of * this node. - *
    NOT_SUPPORTED_ERR: if this node is of type Document, - * this exception might be raised if the DOM implementation doesn't - * support the insertion of a DocumentType or + *
    NOT_SUPPORTED_ERR: if this node is of type Document, + * this exception might be raised if the DOM implementation doesn't + * support the insertion of a DocumentType or * Element node. * @version DOM Level 3 */ - public Node insertBefore(Node newChild, + public Node insertBefore(Node newChild, Node refChild) throws DOMException; /** * Replaces the child node oldChild with newChild * in the list of children, and returns the oldChild node. - *
    If newChild is a DocumentFragment object, - * oldChild is replaced by all of the - * DocumentFragment children, which are inserted in the - * same order. If the newChild is already in the tree, it + *
    If newChild is a DocumentFragment object, + * oldChild is replaced by all of the + * DocumentFragment children, which are inserted in the + * same order. If the newChild is already in the tree, it * is first removed. - *

    Note: Replacing a node with itself is implementation - * dependent. + *

    Note: Replacing a node with itself is implementation + * dependent. * @param newChild The new node to put in the child list. * @param oldChild The node being replaced in the list. * @return The node replaced. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not - * allow children of the type of the newChild node, or if - * the node to put in is one of this node's ancestors or this node - * itself, or if this node is of type Document and the - * result of the replacement operation would add a second - * DocumentType or Element on the + * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not + * allow children of the type of the newChild node, or if + * the node to put in is one of this node's ancestors or this node + * itself, or if this node is of type Document and the + * result of the replacement operation would add a second + * DocumentType or Element on the * Document node. - *
    WRONG_DOCUMENT_ERR: Raised if newChild was created + *
    WRONG_DOCUMENT_ERR: Raised if newChild was created * from a different document than the one that created this node. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node or the parent of * the new node is readonly. - *
    NOT_FOUND_ERR: Raised if oldChild is not a child of + *
    NOT_FOUND_ERR: Raised if oldChild is not a child of * this node. - *
    NOT_SUPPORTED_ERR: if this node is of type Document, - * this exception might be raised if the DOM implementation doesn't - * support the replacement of the DocumentType child or + *
    NOT_SUPPORTED_ERR: if this node is of type Document, + * this exception might be raised if the DOM implementation doesn't + * support the replacement of the DocumentType child or * Element child. * @version DOM Level 3 */ - public Node replaceChild(Node newChild, + public Node replaceChild(Node newChild, Node oldChild) throws DOMException; /** - * Removes the child node indicated by oldChild from the list + * Removes the child node indicated by oldChild from the list * of children, and returns it. * @param oldChild The node being removed. * @return The node removed. * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - *
    NOT_FOUND_ERR: Raised if oldChild is not a child of + *
    NOT_FOUND_ERR: Raised if oldChild is not a child of * this node. - *
    NOT_SUPPORTED_ERR: if this node is of type Document, - * this exception might be raised if the DOM implementation doesn't - * support the removal of the DocumentType child or the + *
    NOT_SUPPORTED_ERR: if this node is of type Document, + * this exception might be raised if the DOM implementation doesn't + * support the removal of the DocumentType child or the * Element child. * @version DOM Level 3 */ @@ -366,27 +366,27 @@ public interface Node { throws DOMException; /** - * Adds the node newChild to the end of the list of children - * of this node. If the newChild is already in the tree, it + * Adds the node newChild to the end of the list of children + * of this node. If the newChild is already in the tree, it * is first removed. - * @param newChild The node to add.If it is a - * DocumentFragment object, the entire contents of the + * @param newChild The node to add.If it is a + * DocumentFragment object, the entire contents of the * document fragment are moved into the child list of this node * @return The node added. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not - * allow children of the type of the newChild node, or if - * the node to append is one of this node's ancestors or this node - * itself, or if this node is of type Document and the - * DOM application attempts to append a second + * HIERARCHY_REQUEST_ERR: Raised if this node is of a type that does not + * allow children of the type of the newChild node, or if + * the node to append is one of this node's ancestors or this node + * itself, or if this node is of type Document and the + * DOM application attempts to append a second * DocumentType or Element node. - *
    WRONG_DOCUMENT_ERR: Raised if newChild was created + *
    WRONG_DOCUMENT_ERR: Raised if newChild was created * from a different document than the one that created this node. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly or * if the previous parent of the node being inserted is readonly. - *
    NOT_SUPPORTED_ERR: if the newChild node is a child - * of the Document node, this exception might be raised - * if the DOM implementation doesn't support the removal of the + *
    NOT_SUPPORTED_ERR: if the newChild node is a child + * of the Document node, this exception might be raised + * if the DOM implementation doesn't support the removal of the * DocumentType child or Element child. * @version DOM Level 3 */ @@ -395,154 +395,154 @@ public interface Node { /** * Returns whether this node has any children. - * @return Returns true if this node has any children, + * @return Returns true if this node has any children, * false otherwise. */ public boolean hasChildNodes(); /** - * Returns a duplicate of this node, i.e., serves as a generic copy + * Returns a duplicate of this node, i.e., serves as a generic copy * constructor for nodes. The duplicate node has no parent ( - * parentNode is null) and no user data. User - * data associated to the imported node is not carried over. However, if - * any UserDataHandlers has been specified along with the - * associated data these handlers will be called with the appropriate + * parentNode is null) and no user data. User + * data associated to the imported node is not carried over. However, if + * any UserDataHandlers has been specified along with the + * associated data these handlers will be called with the appropriate * parameters before this method returns. - *
    Cloning an Element copies all attributes and their - * values, including those generated by the XML processor to represent - * defaulted attributes, but this method does not copy any children it - * contains unless it is a deep clone. This includes text contained in - * an the Element since the text is contained in a child - * Text node. Cloning an Attr directly, as - * opposed to be cloned as part of an Element cloning - * operation, returns a specified attribute (specified is - * true). Cloning an Attr always clones its - * children, since they represent its value, no matter whether this is a - * deep clone or not. Cloning an EntityReference - * automatically constructs its subtree if a corresponding - * Entity is available, no matter whether this is a deep - * clone or not. Cloning any other type of node simply returns a copy of + *
    Cloning an Element copies all attributes and their + * values, including those generated by the XML processor to represent + * defaulted attributes, but this method does not copy any children it + * contains unless it is a deep clone. This includes text contained in + * an the Element since the text is contained in a child + * Text node. Cloning an Attr directly, as + * opposed to be cloned as part of an Element cloning + * operation, returns a specified attribute (specified is + * true). Cloning an Attr always clones its + * children, since they represent its value, no matter whether this is a + * deep clone or not. Cloning an EntityReference + * automatically constructs its subtree if a corresponding + * Entity is available, no matter whether this is a deep + * clone or not. Cloning any other type of node simply returns a copy of * this node. - *
    Note that cloning an immutable subtree results in a mutable copy, + *
    Note that cloning an immutable subtree results in a mutable copy, * but the children of an EntityReference clone are readonly - * . In addition, clones of unspecified Attr nodes are - * specified. And, cloning Document, - * DocumentType, Entity, and + * . In addition, clones of unspecified Attr nodes are + * specified. And, cloning Document, + * DocumentType, Entity, and * Notation nodes is implementation dependent. - * @param deep If true, recursively clone the subtree under - * the specified node; if false, clone only the node + * @param deep If true, recursively clone the subtree under + * the specified node; if false, clone only the node * itself (and its attributes, if it is an Element). * @return The duplicate node. */ public Node cloneNode(boolean deep); /** - * Puts all Text nodes in the full depth of the sub-tree - * underneath this Node, including attribute nodes, into a - * "normal" form where only structure (e.g., elements, comments, - * processing instructions, CDATA sections, and entity references) - * separates Text nodes, i.e., there are neither adjacent - * Text nodes nor empty Text nodes. This can - * be used to ensure that the DOM view of a document is the same as if - * it were saved and re-loaded, and is useful when operations (such as + * Puts all Text nodes in the full depth of the sub-tree + * underneath this Node, including attribute nodes, into a + * "normal" form where only structure (e.g., elements, comments, + * processing instructions, CDATA sections, and entity references) + * separates Text nodes, i.e., there are neither adjacent + * Text nodes nor empty Text nodes. This can + * be used to ensure that the DOM view of a document is the same as if + * it were saved and re-loaded, and is useful when operations (such as * XPointer [XPointer] - * lookups) that depend on a particular document tree structure are to - * be used. If the parameter "normalize-characters" of the - * DOMConfiguration object attached to the - * Node.ownerDocument is true, this method - * will also fully normalize the characters of the Text - * nodes. - *

    Note: In cases where the document contains - * CDATASections, the normalize operation alone may not be - * sufficient, since XPointers do not differentiate between + * lookups) that depend on a particular document tree structure are to + * be used. If the parameter "normalize-characters" of the + * DOMConfiguration object attached to the + * Node.ownerDocument is true, this method + * will also fully normalize the characters of the Text + * nodes. + *

    Note: In cases where the document contains + * CDATASections, the normalize operation alone may not be + * sufficient, since XPointers do not differentiate between * Text nodes and CDATASection nodes. * @version DOM Level 3 */ public void normalize(); /** - * Tests whether the DOM implementation implements a specific feature and - * that feature is supported by this node, as specified in . - * @param feature The name of the feature to test. - * @param version This is the version number of the feature to test. - * @return Returns true if the specified feature is + * Tests whether the DOM implementation implements a specific feature and + * that feature is supported by this node, as specified in . + * @param feature The name of the feature to test. + * @param version This is the version number of the feature to test. + * @return Returns true if the specified feature is * supported on this node, false otherwise. * @since DOM Level 2 */ - public boolean isSupported(String feature, + public boolean isSupported(String feature, String version); /** - * The namespace URI of this node, or null if it is + * The namespace URI of this node, or null if it is * unspecified (see ). - *
    This is not a computed value that is the result of a namespace - * lookup based on an examination of the namespace declarations in + *
    This is not a computed value that is the result of a namespace + * lookup based on an examination of the namespace declarations in * scope. It is merely the namespace URI given at creation time. - *
    For nodes of any type other than ELEMENT_NODE and - * ATTRIBUTE_NODE and nodes created with a DOM Level 1 - * method, such as Document.createElement(), this is always + *
    For nodes of any type other than ELEMENT_NODE and + * ATTRIBUTE_NODE and nodes created with a DOM Level 1 + * method, such as Document.createElement(), this is always * null. *

    Note: Per the Namespaces in XML Specification [XML Namespaces] - * an attribute does not inherit its namespace from the element it is - * attached to. If an attribute is not explicitly given a namespace, it + * an attribute does not inherit its namespace from the element it is + * attached to. If an attribute is not explicitly given a namespace, it * simply has no namespace. * @since DOM Level 2 */ public String getNamespaceURI(); /** - * The namespace prefix of this node, or null if it is - * unspecified. When it is defined to be null, setting it + * The namespace prefix of this node, or null if it is + * unspecified. When it is defined to be null, setting it * has no effect, including if the node is read-only. - *
    Note that setting this attribute, when permitted, changes the - * nodeName attribute, which holds the qualified name, as - * well as the tagName and name attributes of - * the Element and Attr interfaces, when + *
    Note that setting this attribute, when permitted, changes the + * nodeName attribute, which holds the qualified name, as + * well as the tagName and name attributes of + * the Element and Attr interfaces, when * applicable. - *
    Setting the prefix to null makes it unspecified, + *
    Setting the prefix to null makes it unspecified, * setting it to an empty string is implementation dependent. - *
    Note also that changing the prefix of an attribute that is known to - * have a default value, does not make a new attribute with the default - * value and the original prefix appear, since the + *
    Note also that changing the prefix of an attribute that is known to + * have a default value, does not make a new attribute with the default + * value and the original prefix appear, since the * namespaceURI and localName do not change. - *
    For nodes of any type other than ELEMENT_NODE and - * ATTRIBUTE_NODE and nodes created with a DOM Level 1 - * method, such as createElement from the + *
    For nodes of any type other than ELEMENT_NODE and + * ATTRIBUTE_NODE and nodes created with a DOM Level 1 + * method, such as createElement from the * Document interface, this is always null. * @since DOM Level 2 */ public String getPrefix(); /** - * The namespace prefix of this node, or null if it is - * unspecified. When it is defined to be null, setting it + * The namespace prefix of this node, or null if it is + * unspecified. When it is defined to be null, setting it * has no effect, including if the node is read-only. - *
    Note that setting this attribute, when permitted, changes the - * nodeName attribute, which holds the qualified name, as - * well as the tagName and name attributes of - * the Element and Attr interfaces, when + *
    Note that setting this attribute, when permitted, changes the + * nodeName attribute, which holds the qualified name, as + * well as the tagName and name attributes of + * the Element and Attr interfaces, when * applicable. - *
    Setting the prefix to null makes it unspecified, + *
    Setting the prefix to null makes it unspecified, * setting it to an empty string is implementation dependent. - *
    Note also that changing the prefix of an attribute that is known to - * have a default value, does not make a new attribute with the default - * value and the original prefix appear, since the + *
    Note also that changing the prefix of an attribute that is known to + * have a default value, does not make a new attribute with the default + * value and the original prefix appear, since the * namespaceURI and localName do not change. - *
    For nodes of any type other than ELEMENT_NODE and - * ATTRIBUTE_NODE and nodes created with a DOM Level 1 - * method, such as createElement from the + *
    For nodes of any type other than ELEMENT_NODE and + * ATTRIBUTE_NODE and nodes created with a DOM Level 1 + * method, such as createElement from the * Document interface, this is always null. * @exception DOMException - * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an - * illegal character according to the XML version in use specified in + * INVALID_CHARACTER_ERR: Raised if the specified prefix contains an + * illegal character according to the XML version in use specified in * the Document.xmlVersion attribute. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. - *
    NAMESPACE_ERR: Raised if the specified prefix is - * malformed per the Namespaces in XML specification, if the - * namespaceURI of this node is null, if the - * specified prefix is "xml" and the namespaceURI of this + *
    NAMESPACE_ERR: Raised if the specified prefix is + * malformed per the Namespaces in XML specification, if the + * namespaceURI of this node is null, if the + * specified prefix is "xml" and the namespaceURI of this * node is different from " - * http://www.w3.org/XML/1998/namespace", if this node is an attribute and the specified prefix is "xmlns" and - * the namespaceURI of this node is different from "http://www.w3.org/2000/xmlns/", or if this node is an attribute and the qualifiedName of + * http://www.w3.org/XML/1998/namespace", if this node is an attribute and the specified prefix is "xmlns" and + * the namespaceURI of this node is different from "http://www.w3.org/2000/xmlns/", or if this node is an attribute and the qualifiedName of * this node is "xmlns" [XML Namespaces] * . * @since DOM Level 2 @@ -552,9 +552,9 @@ public interface Node { /** * Returns the local part of the qualified name of this node. - *
    For nodes of any type other than ELEMENT_NODE and - * ATTRIBUTE_NODE and nodes created with a DOM Level 1 - * method, such as Document.createElement(), this is always + *
    For nodes of any type other than ELEMENT_NODE and + * ATTRIBUTE_NODE and nodes created with a DOM Level 1 + * method, such as Document.createElement(), this is always * null. * @since DOM Level 2 */ @@ -562,20 +562,20 @@ public interface Node { /** * Returns whether this node (if it is an element) has any attributes. - * @return Returns true if this node has any attributes, + * @return Returns true if this node has any attributes, * false otherwise. * @since DOM Level 2 */ public boolean hasAttributes(); /** - * The absolute base URI of this node or null if the - * implementation wasn't able to obtain an absolute URI. This value is - * computed as described in . However, when the Document + * The absolute base URI of this node or null if the + * implementation wasn't able to obtain an absolute URI. This value is + * computed as described in . However, when the Document * supports the feature "HTML" [DOM Level 2 HTML] - * , the base URI is computed using first the value of the href - * attribute of the HTML BASE element if any, and the value of the - * documentURI attribute from the Document + * , the base URI is computed using first the value of the href + * attribute of the HTML BASE element if any, and the value of the + * documentURI attribute from the Document * interface otherwise. * @since DOM Level 3 */ @@ -583,7 +583,7 @@ public interface Node { // DocumentPosition /** - * The two nodes are disconnected. Order between disconnected nodes is + * The two nodes are disconnected. Order between disconnected nodes is * always implementation-specific. */ public static final short DOCUMENT_POSITION_DISCONNECTED = 0x01; @@ -596,32 +596,32 @@ public interface Node { */ public static final short DOCUMENT_POSITION_FOLLOWING = 0x04; /** - * The node contains the reference node. A node which contains is always + * The node contains the reference node. A node which contains is always * preceding, too. */ public static final short DOCUMENT_POSITION_CONTAINS = 0x08; /** - * The node is contained by the reference node. A node which is contained + * The node is contained by the reference node. A node which is contained * is always following, too. */ public static final short DOCUMENT_POSITION_CONTAINED_BY = 0x10; /** - * The determination of preceding versus following is + * The determination of preceding versus following is * implementation-specific. */ public static final short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20; /** - * Compares the reference node, i.e. the node on which this method is - * being called, with a node, i.e. the one passed as a parameter, with - * regard to their position in the document and according to the + * Compares the reference node, i.e. the node on which this method is + * being called, with a node, i.e. the one passed as a parameter, with + * regard to their position in the document and according to the * document order. * @param other The node to compare against the reference node. - * @return Returns how the node is positioned relatively to the reference + * @return Returns how the node is positioned relatively to the reference * node. * @exception DOMException - * NOT_SUPPORTED_ERR: when the compared nodes are from different DOM - * implementations that do not coordinate to return consistent + * NOT_SUPPORTED_ERR: when the compared nodes are from different DOM + * implementations that do not coordinate to return consistent * implementation-specific results. * @since DOM Level 3 */ @@ -629,21 +629,21 @@ public interface Node { throws DOMException; /** - * This attribute returns the text content of this node and its - * descendants. When it is defined to be null, setting it - * has no effect. On setting, any possible children this node may have - * are removed and, if it the new string is not empty or - * null, replaced by a single Text node - * containing the string this attribute is set to. - *
    On getting, no serialization is performed, the returned string - * does not contain any markup. No whitespace normalization is performed - * and the returned string does not contain the white spaces in element - * content (see the attribute - * Text.isElementContentWhitespace). Similarly, on setting, - * no parsing is performed either, the input string is taken as pure - * textual content. - *
    The string returned is made of the text content of this node - * depending on its type, as defined below: + * This attribute returns the text content of this node and its + * descendants. When it is defined to be null, setting it + * has no effect. On setting, any possible children this node may have + * are removed and, if it the new string is not empty or + * null, replaced by a single Text node + * containing the string this attribute is set to. + *
    On getting, no serialization is performed, the returned string + * does not contain any markup. No whitespace normalization is performed + * and the returned string does not contain the white spaces in element + * content (see the attribute + * Text.isElementContentWhitespace). Similarly, on setting, + * no parsing is performed either, the input string is taken as pure + * textual content. + *
    The string returned is made of the text content of this node + * depending on its type, as defined below: * * * @@ -651,48 +651,48 @@ public interface Node { * * * - * * * - * * * * - * * * *
    Node type
    - * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, + * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, * DOCUMENT_FRAGMENT_NODEconcatenation of the textContent - * attribute value of every child node, excluding COMMENT_NODE and - * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the + * concatenation of the textContent + * attribute value of every child node, excluding COMMENT_NODE and + * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the * node has no children.
    TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, + * TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, * PROCESSING_INSTRUCTION_NODEnodeValue
    DOCUMENT_NODE, + * DOCUMENT_NODE, * DOCUMENT_TYPE_NODE, NOTATION_NODEnull
    * @exception DOMException - * DOMSTRING_SIZE_ERR: Raised when it would return more characters than - * fit in a DOMString variable on the implementation + * DOMSTRING_SIZE_ERR: Raised when it would return more characters than + * fit in a DOMString variable on the implementation * platform. * @since DOM Level 3 */ public String getTextContent() throws DOMException; /** - * This attribute returns the text content of this node and its - * descendants. When it is defined to be null, setting it - * has no effect. On setting, any possible children this node may have - * are removed and, if it the new string is not empty or - * null, replaced by a single Text node - * containing the string this attribute is set to. - *
    On getting, no serialization is performed, the returned string - * does not contain any markup. No whitespace normalization is performed - * and the returned string does not contain the white spaces in element - * content (see the attribute - * Text.isElementContentWhitespace). Similarly, on setting, - * no parsing is performed either, the input string is taken as pure - * textual content. - *
    The string returned is made of the text content of this node - * depending on its type, as defined below: + * This attribute returns the text content of this node and its + * descendants. When it is defined to be null, setting it + * has no effect. On setting, any possible children this node may have + * are removed and, if it the new string is not empty or + * null, replaced by a single Text node + * containing the string this attribute is set to. + *
    On getting, no serialization is performed, the returned string + * does not contain any markup. No whitespace normalization is performed + * and the returned string does not contain the white spaces in element + * content (see the attribute + * Text.isElementContentWhitespace). Similarly, on setting, + * no parsing is performed either, the input string is taken as pure + * textual content. + *
    The string returned is made of the text content of this node + * depending on its type, as defined below: * * * @@ -700,20 +700,20 @@ public interface Node { * * * - * * * - * * * * - * * * @@ -727,53 +727,53 @@ public interface Node { /** * Returns whether this node is the same node as the given one. - *
    This method provides a way to determine whether two - * Node references returned by the implementation reference - * the same object. When two Node references are references - * to the same object, even if through a proxy, the references may be - * used completely interchangeably, such that all attributes have the - * same values and calling the same DOM method on either reference + *
    This method provides a way to determine whether two + * Node references returned by the implementation reference + * the same object. When two Node references are references + * to the same object, even if through a proxy, the references may be + * used completely interchangeably, such that all attributes have the + * same values and calling the same DOM method on either reference * always has exactly the same effect. * @param other The node to test against. - * @return Returns true if the nodes are the same, + * @return Returns true if the nodes are the same, * false otherwise. * @since DOM Level 3 */ public boolean isSameNode(Node other); /** - * Look up the prefix associated to the given namespace URI, starting from - * this node. The default namespace declarations are ignored by this + * Look up the prefix associated to the given namespace URI, starting from + * this node. The default namespace declarations are ignored by this * method. *
    See for details on the algorithm used by this method. * @param namespaceURI The namespace URI to look for. - * @return Returns an associated namespace prefix if found or - * null if none is found. If more than one prefix are - * associated to the namespace prefix, the returned namespace prefix + * @return Returns an associated namespace prefix if found or + * null if none is found. If more than one prefix are + * associated to the namespace prefix, the returned namespace prefix * is implementation dependent. * @since DOM Level 3 */ public String lookupPrefix(String namespaceURI); /** - * This method checks if the specified namespaceURI is the - * default namespace or not. + * This method checks if the specified namespaceURI is the + * default namespace or not. * @param namespaceURI The namespace URI to look for. - * @return Returns true if the specified - * namespaceURI is the default namespace, - * false otherwise. + * @return Returns true if the specified + * namespaceURI is the default namespace, + * false otherwise. * @since DOM Level 3 */ public boolean isDefaultNamespace(String namespaceURI); /** - * Look up the namespace URI associated to the given prefix, starting from + * Look up the namespace URI associated to the given prefix, starting from * this node. *
    See for details on the algorithm used by this method. - * @param prefix The prefix to look for. If this parameter is - * null, the method will return the default namespace URI + * @param prefix The prefix to look for. If this parameter is + * null, the method will return the default namespace URI * if any. - * @return Returns the associated namespace URI or null if + * @return Returns the associated namespace URI or null if * none is found. * @since DOM Level 3 */ @@ -781,117 +781,117 @@ public interface Node { /** * Tests whether two nodes are equal. - *
    This method tests for equality of nodes, not sameness (i.e., - * whether the two nodes are references to the same object) which can be - * tested with Node.isSameNode(). All nodes that are the + *
    This method tests for equality of nodes, not sameness (i.e., + * whether the two nodes are references to the same object) which can be + * tested with Node.isSameNode(). All nodes that are the * same will also be equal, though the reverse may not be true. - *
    Two nodes are equal if and only if the following conditions are - * satisfied: + *
    Two nodes are equal if and only if the following conditions are + * satisfied: *
      *
    • The two nodes are of the same type. *
      • - *
    • The following string - * attributes are equal: nodeName, localName, + *
    • The following string + * attributes are equal: nodeName, localName, * namespaceURI, prefix, nodeValue - * . This is: they are both null, or they have the same + * . This is: they are both null, or they have the same * length and are character for character identical. *
      • - *
    • The - * attributes NamedNodeMaps are equal. This - * is: they are both null, or they have the same length and - * for each node that exists in one map there is a node that exists in - * the other map and is equal, although not necessarily at the same + *
    • The + * attributes NamedNodeMaps are equal. This + * is: they are both null, or they have the same length and + * for each node that exists in one map there is a node that exists in + * the other map and is equal, although not necessarily at the same * index. *
      • - *
    • The childNodes NodeLists are equal. - * This is: they are both null, or they have the same - * length and contain equal nodes at the same index. Note that - * normalization can affect equality; to avoid this, nodes should be + *
    • The childNodes NodeLists are equal. + * This is: they are both null, or they have the same + * length and contain equal nodes at the same index. Note that + * normalization can affect equality; to avoid this, nodes should be * normalized before being compared. *
      • - *
    - *
    For two DocumentType nodes to be equal, the following - * conditions must also be satisfied: + * + *
    For two DocumentType nodes to be equal, the following + * conditions must also be satisfied: *
      - *
    • The following string attributes - * are equal: publicId, systemId, + *
    • The following string attributes + * are equal: publicId, systemId, * internalSubset. *
      • - *
    • The entities + *
    • The entities * NamedNodeMaps are equal. *
      • - *
    • The notations + *
    • The notations * NamedNodeMaps are equal. *
      • - *
    - *
    On the other hand, the following do not affect equality: the - * ownerDocument, baseURI, and - * parentNode attributes, the specified + * + *
    On the other hand, the following do not affect equality: the + * ownerDocument, baseURI, and + * parentNode attributes, the specified * attribute for Attr nodes, the schemaTypeInfo - * attribute for Attr and Element nodes, the - * Text.isElementContentWhitespace attribute for - * Text nodes, as well as any user data or event listeners - * registered on the nodes. - *

    Note: As a general rule, anything not mentioned in the - * description above is not significant in consideration of equality - * checking. Note that future versions of this specification may take - * into account more attributes and implementations conform to this - * specification are expected to be updated accordingly. + * attribute for Attr and Element nodes, the + * Text.isElementContentWhitespace attribute for + * Text nodes, as well as any user data or event listeners + * registered on the nodes. + *

    Note: As a general rule, anything not mentioned in the + * description above is not significant in consideration of equality + * checking. Note that future versions of this specification may take + * into account more attributes and implementations conform to this + * specification are expected to be updated accordingly. * @param arg The node to compare equality with. - * @return Returns true if the nodes are equal, + * @return Returns true if the nodes are equal, * false otherwise. * @since DOM Level 3 */ public boolean isEqualNode(Node arg); /** - * This method returns a specialized object which implements the - * specialized APIs of the specified feature and version, as specified - * in . The specialized object may also be obtained by using - * binding-specific casting methods but is not necessarily expected to, - * as discussed in . This method also allow the implementation to + * This method returns a specialized object which implements the + * specialized APIs of the specified feature and version, as specified + * in . The specialized object may also be obtained by using + * binding-specific casting methods but is not necessarily expected to, + * as discussed in . This method also allow the implementation to * provide specialized objects which do not support the Node - * interface. - * @param feature The name of the feature requested. Note that any plus - * sign "+" prepended to the name of the feature will be ignored since - * it is not significant in the context of this method. - * @param version This is the version number of the feature to test. - * @return Returns an object which implements the specialized APIs of - * the specified feature and version, if any, or null if - * there is no object which implements interfaces associated with that - * feature. If the DOMObject returned by this method - * implements the Node interface, it must delegate to the - * primary core Node and not return results inconsistent - * with the primary core Node such as attributes, - * childNodes, etc. + * interface. + * @param feature The name of the feature requested. Note that any plus + * sign "+" prepended to the name of the feature will be ignored since + * it is not significant in the context of this method. + * @param version This is the version number of the feature to test. + * @return Returns an object which implements the specialized APIs of + * the specified feature and version, if any, or null if + * there is no object which implements interfaces associated with that + * feature. If the DOMObject returned by this method + * implements the Node interface, it must delegate to the + * primary core Node and not return results inconsistent + * with the primary core Node such as attributes, + * childNodes, etc. * @since DOM Level 3 */ - public Object getFeature(String feature, + public Object getFeature(String feature, String version); /** - * Associate an object to a key on this node. The object can later be - * retrieved from this node by calling getUserData with the + * Associate an object to a key on this node. The object can later be + * retrieved from this node by calling getUserData with the * same key. * @param key The key to associate the object to. - * @param data The object to associate to the given key, or + * @param data The object to associate to the given key, or * null to remove any existing association to that key. - * @param handler The handler to associate to that key, or + * @param handler The handler to associate to that key, or * null. - * @return Returns the DOMUserData previously associated to + * @return Returns the DOMUserData previously associated to * the given key on this node, or null if there was none. * @since DOM Level 3 */ - public Object setUserData(String key, - Object data, + public Object setUserData(String key, + Object data, UserDataHandler handler); /** - * Retrieves the object associated to a key on a this node. The object - * must first have been set to this node by calling + * Retrieves the object associated to a key on a this node. The object + * must first have been set to this node by calling * setUserData with the same key. * @param key The key the object is associated to. - * @return Returns the DOMUserData associated to the given + * @return Returns the DOMUserData associated to the given * key on this node, or null if there was none. * @since DOM Level 3 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/NodeList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/NodeList.java index e4204ec974c..4a98a9030fa 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/NodeList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/NodeList.java @@ -13,27 +13,27 @@ package org.w3c.dom; /** - * The NodeList interface provides the abstraction of an ordered - * collection of nodes, without defining or constraining how this collection + * The NodeList interface provides the abstraction of an ordered + * collection of nodes, without defining or constraining how this collection * is implemented. NodeList objects in the DOM are live. - *

    The items in the NodeList are accessible via an integral + *

    The items in the NodeList are accessible via an integral * index, starting from 0. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface NodeList { /** - * Returns the indexth item in the collection. If - * index is greater than or equal to the number of nodes in + * Returns the indexth item in the collection. If + * index is greater than or equal to the number of nodes in * the list, this returns null. * @param index Index into the collection. - * @return The node at the indexth position in the - * NodeList, or null if that is not a valid + * @return The node at the indexth position in the + * NodeList, or null if that is not a valid * index. */ public Node item(int index); /** - * The number of nodes in the list. The range of valid child node indices + * The number of nodes in the list. The range of valid child node indices * is 0 to length-1 inclusive. */ public int getLength(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Notation.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Notation.java index 3739f928443..a7ad40992d5 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Notation.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Notation.java @@ -13,26 +13,26 @@ package org.w3c.dom; /** - * This interface represents a notation declared in the DTD. A notation either - * declares, by name, the format of an unparsed entity (see section 4.7 of the XML 1.0 specification [XML 1.0]), or is - * used for formal declaration of processing instruction targets (see section 2.6 of the XML 1.0 specification [XML 1.0]). The - * nodeName attribute inherited from Node is set + * This interface represents a notation declared in the DTD. A notation either + * declares, by name, the format of an unparsed entity (see section 4.7 of the XML 1.0 specification [XML 1.0]), or is + * used for formal declaration of processing instruction targets (see section 2.6 of the XML 1.0 specification [XML 1.0]). The + * nodeName attribute inherited from Node is set * to the declared name of the notation. - *

    The DOM Core does not support editing Notation nodes; they + *

    The DOM Core does not support editing Notation nodes; they * are therefore readonly. *

    A Notation node does not have any parent. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface Notation extends Node { /** - * The public identifier of this notation. If the public identifier was + * The public identifier of this notation. If the public identifier was * not specified, this is null. */ public String getPublicId(); /** - * The system identifier of this notation. If the system identifier was - * not specified, this is null. This may be an absolute URI + * The system identifier of this notation. If the system identifier was + * not specified, this is null. This may be an absolute URI * or not. */ public String getSystemId(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java index 0b6825f104c..61b7892311d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ProcessingInstruction.java @@ -13,34 +13,34 @@ package org.w3c.dom; /** - * The ProcessingInstruction interface represents a "processing - * instruction", used in XML as a way to keep processor-specific information + * The ProcessingInstruction interface represents a "processing + * instruction", used in XML as a way to keep processor-specific information * in the text of the document. - *

    No lexical check is done on the content of a processing instruction and - * it is therefore possible to have the character sequence - * "?>" in the content, which is illegal a processing - * instruction per section 2.6 of [XML 1.0]. The - * presence of this character sequence must generate a fatal error during - * serialization. + *

    No lexical check is done on the content of a processing instruction and + * it is therefore possible to have the character sequence + * "?>" in the content, which is illegal a processing + * instruction per section 2.6 of [XML 1.0]. The + * presence of this character sequence must generate a fatal error during + * serialization. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface ProcessingInstruction extends Node { /** - * The target of this processing instruction. XML defines this as being - * the first token following the markup that begins the processing + * The target of this processing instruction. XML defines this as being + * the first token following the markup that begins the processing * instruction. */ public String getTarget(); /** - * The content of this processing instruction. This is from the first non - * white space character after the target to the character immediately + * The content of this processing instruction. This is from the first non + * white space character after the target to the character immediately * preceding the ?>. */ public String getData(); /** - * The content of this processing instruction. This is from the first non - * white space character after the target to the character immediately + * The content of this processing instruction. This is from the first non + * white space character after the target to the character immediately * preceding the ?>. * @exception DOMException * NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly. diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/Text.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/Text.java index 9c294a4a488..872c5499d24 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/Text.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/Text.java @@ -13,45 +13,45 @@ package org.w3c.dom; /** - * The Text interface inherits from CharacterData - * and represents the textual content (termed character data in XML) of an Element or Attr. If there is no - * markup inside an element's content, the text is contained in a single - * object implementing the Text interface that is the only - * child of the element. If there is markup, it is parsed into the - * information items (elements, comments, etc.) and Text nodes + * The Text interface inherits from CharacterData + * and represents the textual content (termed character data in XML) of an Element or Attr. If there is no + * markup inside an element's content, the text is contained in a single + * object implementing the Text interface that is the only + * child of the element. If there is markup, it is parsed into the + * information items (elements, comments, etc.) and Text nodes * that form the list of children of the element. - *

    When a document is first made available via the DOM, there is only one - * Text node for each block of text. Users may create adjacent - * Text nodes that represent the contents of a given element - * without any intervening markup, but should be aware that there is no way - * to represent the separations between these nodes in XML or HTML, so they - * will not (in general) persist between DOM editing sessions. The - * Node.normalize() method merges any such adjacent + *

    When a document is first made available via the DOM, there is only one + * Text node for each block of text. Users may create adjacent + * Text nodes that represent the contents of a given element + * without any intervening markup, but should be aware that there is no way + * to represent the separations between these nodes in XML or HTML, so they + * will not (in general) persist between DOM editing sessions. The + * Node.normalize() method merges any such adjacent * Text objects into a single node for each block of text. - *

    No lexical check is done on the content of a Text node - * and, depending on its position in the document, some characters must be - * escaped during serialization using character references; e.g. the - * characters "<&" if the textual content is part of an element or of - * an attribute, the character sequence "]]>" when part of an element, - * the quotation mark character " or the apostrophe character ' when part of - * an attribute. + *

    No lexical check is done on the content of a Text node + * and, depending on its position in the document, some characters must be + * escaped during serialization using character references; e.g. the + * characters "<&" if the textual content is part of an element or of + * an attribute, the character sequence "]]>" when part of an element, + * the quotation mark character " or the apostrophe character ' when part of + * an attribute. *

    See also the Document Object Model (DOM) Level 3 Core Specification. */ public interface Text extends CharacterData { /** - * Breaks this node into two nodes at the specified offset, - * keeping both in the tree as siblings. After being split, this node - * will contain all the content up to the offset point. A - * new node of the same type, which contains all the content at and - * after the offset point, is returned. If the original - * node had a parent node, the new node is inserted as the next sibling - * of the original node. When the offset is equal to the + * Breaks this node into two nodes at the specified offset, + * keeping both in the tree as siblings. After being split, this node + * will contain all the content up to the offset point. A + * new node of the same type, which contains all the content at and + * after the offset point, is returned. If the original + * node had a parent node, the new node is inserted as the next sibling + * of the original node. When the offset is equal to the * length of this node, the new node has no data. - * @param offset The 16-bit unit offset at which to split, starting from + * @param offset The 16-bit unit offset at which to split, starting from * 0. * @return The new node, of the same type as this node. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater + * INDEX_SIZE_ERR: Raised if the specified offset is negative or greater * than the number of 16-bit units in data. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this node is readonly. */ @@ -60,63 +60,63 @@ public interface Text extends CharacterData { /** * Returns whether this text node contains - * element content whitespace, often abusively called "ignorable whitespace". The text node is - * determined to contain whitespace in element content during the load - * of the document or if validation occurs while using + * element content whitespace, often abusively called "ignorable whitespace". The text node is + * determined to contain whitespace in element content during the load + * of the document or if validation occurs while using * Document.normalizeDocument(). * @since DOM Level 3 */ public boolean isElementContentWhitespace(); /** - * Returns all text of Text nodes logically-adjacent text + * Returns all text of Text nodes logically-adjacent text * nodes to this node, concatenated in document order. - *
    For instance, in the example below wholeText on the - * Text node that contains "bar" returns "barfoo", while on - * the Text node that contains "foo" it returns "barfoo". + *
    For instance, in the example below wholeText on the + * Text node that contains "bar" returns "barfoo", while on + * the Text node that contains "foo" it returns "barfoo". * @since DOM Level 3 */ public String getWholeText(); /** - * Replaces the text of the current node and all logically-adjacent text - * nodes with the specified text. All logically-adjacent text nodes are - * removed including the current node unless it was the recipient of the + * Replaces the text of the current node and all logically-adjacent text + * nodes with the specified text. All logically-adjacent text nodes are + * removed including the current node unless it was the recipient of the * replacement text. - *
    This method returns the node which received the replacement text. - * The returned node is: + *
    This method returns the node which received the replacement text. + * The returned node is: *

      - *
    • null, when the replacement text is + *
    • null, when the replacement text is * the empty string; *
      • - *
    • the current node, except when the current node is + *
    • the current node, except when the current node is * read-only; *
      • *
    • a new Text node of the same type ( - * Text or CDATASection) as the current node + * Text or CDATASection) as the current node * inserted at the location of the replacement. *
      • *
    - *
    For instance, in the above example calling - * replaceWholeText on the Text node that - * contains "bar" with "yo" in argument results in the following: - *
    Where the nodes to be removed are read-only descendants of an - * EntityReference, the EntityReference must - * be removed instead of the read-only nodes. If any - * EntityReference to be removed has descendants that are - * not EntityReference, Text, or - * CDATASection nodes, the replaceWholeText - * method must fail before performing any modification of the document, - * raising a DOMException with the code + *
    For instance, in the above example calling + * replaceWholeText on the Text node that + * contains "bar" with "yo" in argument results in the following: + *
    Where the nodes to be removed are read-only descendants of an + * EntityReference, the EntityReference must + * be removed instead of the read-only nodes. If any + * EntityReference to be removed has descendants that are + * not EntityReference, Text, or + * CDATASection nodes, the replaceWholeText + * method must fail before performing any modification of the document, + * raising a DOMException with the code * NO_MODIFICATION_ALLOWED_ERR. - *
    For instance, in the example below calling - * replaceWholeText on the Text node that - * contains "bar" fails, because the EntityReference node + *
    For instance, in the example below calling + * replaceWholeText on the Text node that + * contains "bar" fails, because the EntityReference node * "ent" contains an Element node which cannot be removed. * @param content The content of the replacing Text node. * @return The Text node created with the specified content. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if one of the Text + * NO_MODIFICATION_ALLOWED_ERR: Raised if one of the Text * nodes being replaced is readonly. * @since DOM Level 3 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/TypeInfo.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/TypeInfo.java index 054f9907245..d36f3cc3711 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/TypeInfo.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/TypeInfo.java @@ -13,95 +13,95 @@ package org.w3c.dom; /** - * The TypeInfo interface represents a type referenced from - * Element or Attr nodes, specified in the schemas - * associated with the document. The type is a pair of a namespace URI and - * name properties, and depends on the document's schema. - *

    If the document's schema is an XML DTD [XML 1.0], the values - * are computed as follows: + * The TypeInfo interface represents a type referenced from + * Element or Attr nodes, specified in the schemas + * associated with the document. The type is a pair of a namespace URI and + * name properties, and depends on the document's schema. + *

    If the document's schema is an XML DTD [XML 1.0], the values + * are computed as follows: *

      - *
    • If this type is referenced from an - * Attr node, typeNamespace is - * "http://www.w3.org/TR/REC-xml" and typeName + *
    • If this type is referenced from an + * Attr node, typeNamespace is + * "http://www.w3.org/TR/REC-xml" and typeName * represents the [attribute type] property in the [XML Information Set] * . If there is no declaration for the attribute, typeNamespace - * and typeName are null. + * and typeName are null. *
      • - *
    • If this type is - * referenced from an Element node, typeNamespace - * and typeName are null. + *
    • If this type is + * referenced from an Element node, typeNamespace + * and typeName are null. *
      • *
    *

    If the document's schema is an XML Schema [XML Schema Part 1] - * , the values are computed as follows using the post-schema-validation - * infoset contributions (also called PSVI contributions): + * , the values are computed as follows using the post-schema-validation + * infoset contributions (also called PSVI contributions): *

      - *
    • If the [validity] property exists AND is "invalid" or "notKnown": the {target namespace} and {name} properties of the declared type if - * available, otherwise null. - *

      Note: At the time of writing, the XML Schema specification does - * not require exposing the declared type. Thus, DOM implementations might - * choose not to provide type information if validity is not valid. + *

    • If the [validity] property exists AND is "invalid" or "notKnown": the {target namespace} and {name} properties of the declared type if + * available, otherwise null. + *

      Note: At the time of writing, the XML Schema specification does + * not require exposing the declared type. Thus, DOM implementations might + * choose not to provide type information if validity is not valid. *

      • - *
    • If the [validity] property exists and is "valid": + *
    • If the [validity] property exists and is "valid": *
        - *
      1. If [member type definition] exists: + *
      2. If [member type definition] exists: *
          - *
        1. If {name} is not absent, then expose {name} and {target + *
        2. If {name} is not absent, then expose {name} and {target * namespace} properties of the [member type definition] property; *
          3. - *
        3. Otherwise, expose the namespace and local name of the + *
        4. Otherwise, expose the namespace and local name of the * corresponding anonymous type name. *
          5. *
        *
        3. - *
      3. If the [type definition] property exists: + *
      4. If the [type definition] property exists: *
          - *
        1. If {name} is not absent, then expose {name} and {target + *
        2. If {name} is not absent, then expose {name} and {target * namespace} properties of the [type definition] property; *
          3. - *
        3. Otherwise, expose the namespace and local name of the + *
        4. Otherwise, expose the namespace and local name of the * corresponding anonymous type name. *
          5. - *
        + *
      *
      • - *
    • If the [member type definition anonymous] exists: + *
    • If the [member type definition anonymous] exists: *
        *
      1. If it is false, then expose [member type definition name] and [member type definition namespace] properties; *
        2. - *
      2. Otherwise, expose the namespace and local name of the + *
      3. Otherwise, expose the namespace and local name of the * corresponding anonymous type name. *
        4. - *
      + * *
      • - *
    • If the [type definition anonymous] exists: + *
    • If the [type definition anonymous] exists: *
        *
      1. If it is false, then expose [type definition name] and [type definition namespace] properties; *
        2. - *
      2. Otherwise, expose the namespace and local name of the + *
      3. Otherwise, expose the namespace and local name of the * corresponding anonymous type name. *
        4. - *
      + * *
      • * * *
    - *

    Note: Other schema languages are outside the scope of the W3C - * and therefore should define how to represent their type systems using - * TypeInfo. + *

    Note: Other schema languages are outside the scope of the W3C + * and therefore should define how to represent their type systems using + * TypeInfo. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ public interface TypeInfo { /** - * The name of a type declared for the associated element or attribute, - * or null if unknown. + * The name of a type declared for the associated element or attribute, + * or null if unknown. */ public String getTypeName(); /** - * The namespace of the type declared for the associated element or - * attribute or null if the element does not have - * declaration or if no namespace information is available. + * The namespace of the type declared for the associated element or + * attribute or null if the element does not have + * declaration or if no namespace information is available. */ public String getTypeNamespace(); @@ -110,76 +110,76 @@ public interface TypeInfo { * If the document's schema is an XML Schema [XML Schema Part 1] * , this constant represents the derivation by * restriction if complex types are involved, or a - * restriction if simple types are involved. - *
    The reference type definition is derived by restriction from the - * other type definition if the other type definition is the same as the - * reference type definition, or if the other type definition can be - * reached recursively following the {base type definition} property - * from the reference type definition, and all the derivation methods involved are restriction. + * restriction if simple types are involved. + *
    The reference type definition is derived by restriction from the + * other type definition if the other type definition is the same as the + * reference type definition, or if the other type definition can be + * reached recursively following the {base type definition} property + * from the reference type definition, and all the derivation methods involved are restriction. */ public static final int DERIVATION_RESTRICTION = 0x00000001; /** * If the document's schema is an XML Schema [XML Schema Part 1] * , this constant represents the derivation by - * extension. - *
    The reference type definition is derived by extension from the - * other type definition if the other type definition can be reached - * recursively following the {base type definition} property from the - * reference type definition, and at least one of the derivation methods involved is an extension. + * extension. + *
    The reference type definition is derived by extension from the + * other type definition if the other type definition can be reached + * recursively following the {base type definition} property from the + * reference type definition, and at least one of the derivation methods involved is an extension. */ public static final int DERIVATION_EXTENSION = 0x00000002; /** * If the document's schema is an XML Schema [XML Schema Part 1] * , this constant represents the - * union if simple types are involved. - *
    The reference type definition is derived by union from the other - * type definition if there exists two type definitions T1 and T2 such - * as the reference type definition is derived from T1 by - * DERIVATION_RESTRICTION or - * DERIVATION_EXTENSION, T2 is derived from the other type - * definition by DERIVATION_RESTRICTION, T1 has {variety} union, and one of the {member type definitions} is T2. Note that T1 could be - * the same as the reference type definition, and T2 could be the same - * as the other type definition. + * union if simple types are involved. + *
    The reference type definition is derived by union from the other + * type definition if there exists two type definitions T1 and T2 such + * as the reference type definition is derived from T1 by + * DERIVATION_RESTRICTION or + * DERIVATION_EXTENSION, T2 is derived from the other type + * definition by DERIVATION_RESTRICTION, T1 has {variety} union, and one of the {member type definitions} is T2. Note that T1 could be + * the same as the reference type definition, and T2 could be the same + * as the other type definition. */ public static final int DERIVATION_UNION = 0x00000004; /** * If the document's schema is an XML Schema [XML Schema Part 1] - * , this constant represents the list. - *
    The reference type definition is derived by list from the other - * type definition if there exists two type definitions T1 and T2 such - * as the reference type definition is derived from T1 by - * DERIVATION_RESTRICTION or - * DERIVATION_EXTENSION, T2 is derived from the other type - * definition by DERIVATION_RESTRICTION, T1 has {variety} list, and T2 is the {item type definition}. Note that T1 could be the same as - * the reference type definition, and T2 could be the same as the other - * type definition. + * , this constant represents the list. + *
    The reference type definition is derived by list from the other + * type definition if there exists two type definitions T1 and T2 such + * as the reference type definition is derived from T1 by + * DERIVATION_RESTRICTION or + * DERIVATION_EXTENSION, T2 is derived from the other type + * definition by DERIVATION_RESTRICTION, T1 has {variety} list, and T2 is the {item type definition}. Note that T1 could be the same as + * the reference type definition, and T2 could be the same as the other + * type definition. */ public static final int DERIVATION_LIST = 0x00000008; /** - * This method returns if there is a derivation between the reference - * type definition, i.e. the TypeInfo on which the method - * is being called, and the other type definition, i.e. the one passed - * as parameters. - * @param typeNamespaceArg the namespace of the other type definition. - * @param typeNameArg the name of the other type definition. - * @param derivationMethod the type of derivation and conditions applied - * between two types, as described in the list of constants provided - * in this interface. - * @return If the document's schema is a DTD or no schema is associated + * This method returns if there is a derivation between the reference + * type definition, i.e. the TypeInfo on which the method + * is being called, and the other type definition, i.e. the one passed + * as parameters. + * @param typeNamespaceArg the namespace of the other type definition. + * @param typeNameArg the name of the other type definition. + * @param derivationMethod the type of derivation and conditions applied + * between two types, as described in the list of constants provided + * in this interface. + * @return If the document's schema is a DTD or no schema is associated * with the document, this method will always return false - * . If the document's schema is an XML Schema, the method will - * true if the reference type definition is derived from - * the other type definition according to the derivation parameter. If - * the value of the parameter is 0 (no bit is set to - * 1 for the derivationMethod parameter), - * the method will return true if the other type - * definition can be reached by recursing any combination of {base - * type definition}, {item type definition}, or {member type - * definitions} from the reference type definition. + * . If the document's schema is an XML Schema, the method will + * true if the reference type definition is derived from + * the other type definition according to the derivation parameter. If + * the value of the parameter is 0 (no bit is set to + * 1 for the derivationMethod parameter), + * the method will return true if the other type + * definition can be reached by recursing any combination of {base + * type definition}, {item type definition}, or {member type + * definitions} from the reference type definition. */ - public boolean isDerivedFrom(String typeNamespaceArg, - String typeNameArg, + public boolean isDerivedFrom(String typeNamespaceArg, + String typeNameArg, int derivationMethod); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/UserDataHandler.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/UserDataHandler.java index a16ea7308c2..cf6ee5669e6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/UserDataHandler.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/UserDataHandler.java @@ -13,12 +13,12 @@ package org.w3c.dom; /** - * When associating an object to a key on a node using - * Node.setUserData() the application can provide a handler - * that gets called when the node the object is associated to is being - * cloned, imported, or renamed. This can be used by the application to - * implement various behaviors regarding the data it associates to the DOM - * nodes. This interface defines that handler. + * When associating an object to a key on a node using + * Node.setUserData() the application can provide a handler + * that gets called when the node the object is associated to is being + * cloned, imported, or renamed. This can be used by the application to + * implement various behaviors regarding the data it associates to the DOM + * nodes. This interface defines that handler. *

    See also the Document Object Model (DOM) Level 3 Core Specification. * @since DOM Level 3 */ @@ -34,8 +34,8 @@ public interface UserDataHandler { public static final short NODE_IMPORTED = 2; /** * The node is deleted. - *

    Note: This may not be supported or may not be reliable in - * certain environments, such as Java, where the implementation has no + *

    Note: This may not be supported or may not be reliable in + * certain environments, such as Java, where the implementation has no * real control over when objects are actually deleted. */ public static final short NODE_DELETED = 3; @@ -49,24 +49,24 @@ public interface UserDataHandler { public static final short NODE_ADOPTED = 5; /** - * This method is called whenever the node for which this handler is + * This method is called whenever the node for which this handler is * registered is imported or cloned. - *
    DOM applications must not raise exceptions in a - * UserDataHandler. The effect of throwing exceptions from - * the handler is DOM implementation dependent. - * @param operation Specifies the type of operation that is being + *
    DOM applications must not raise exceptions in a + * UserDataHandler. The effect of throwing exceptions from + * the handler is DOM implementation dependent. + * @param operation Specifies the type of operation that is being * performed on the node. - * @param key Specifies the key for which this handler is being called. - * @param data Specifies the data for which this handler is being called. - * @param src Specifies the node being cloned, adopted, imported, or + * @param key Specifies the key for which this handler is being called. + * @param data Specifies the data for which this handler is being called. + * @param src Specifies the node being cloned, adopted, imported, or * renamed. This is null when the node is being deleted. - * @param dst Specifies the node newly created if any, or + * @param dst Specifies the node newly created if any, or * null. */ - public void handle(short operation, - String key, - Object data, - Node src, + public void handle(short operation, + String key, + Object data, + Node src, Node dst); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java index be73f396bd8..5be8c3ab1e5 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/bootstrap/DOMImplementationRegistry.java @@ -58,26 +58,26 @@ public final class DOMImplementationRegistry { * DOMImplementationSource class names. */ public static final String PROPERTY = - "org.w3c.dom.DOMImplementationSourceList"; - + "org.w3c.dom.DOMImplementationSourceList"; + /** * Default columns per line. */ private static final int DEFAULT_LINE_LENGTH = 80; - + /** * The list of DOMImplementationSources. */ private Vector sources; - + /** * Private constructor. * @param srcs Vector List of DOMImplementationSources */ private DOMImplementationRegistry(final Vector srcs) { - sources = srcs; + sources = srcs; } - + /** * Obtain a new instance of a DOMImplementationRegistry. * @@ -106,49 +106,49 @@ public final class DOMImplementationRegistry { * DOMImplementationSource */ public static DOMImplementationRegistry newInstance() - throws - ClassNotFoundException, - InstantiationException, - IllegalAccessException, - ClassCastException { - Vector sources = new Vector(); - - ClassLoader classLoader = getClassLoader(); - // fetch system property: - String p = getSystemProperty(PROPERTY); - - // - // if property is not specified then use contents of + throws + ClassNotFoundException, + InstantiationException, + IllegalAccessException, + ClassCastException { + Vector sources = new Vector(); + + ClassLoader classLoader = getClassLoader(); + // fetch system property: + String p = getSystemProperty(PROPERTY); + + // + // if property is not specified then use contents of // META_INF/org.w3c.dom.DOMImplementationSourceList from classpath - if (p == null) { - p = getServiceValue(classLoader); - } if (p == null) { - // - // DOM Implementations can modify here to add *additional* fallback - // mechanisms to access a list of default DOMImplementationSources. - p = "gnu.xml.dom.ImplementationSource"; - } - if (p != null) { - StringTokenizer st = new StringTokenizer(p); - while (st.hasMoreTokens()) { - String sourceName = st.nextToken(); - // Use context class loader, falling back to Class.forName - // if and only if this fails... - Class sourceClass = null; - if (classLoader != null) { - sourceClass = classLoader.loadClass(sourceName); - } else { - sourceClass = Class.forName(sourceName); - } - DOMImplementationSource source = - (DOMImplementationSource) sourceClass.newInstance(); - sources.addElement(source); - } - } - return new DOMImplementationRegistry(sources); + p = getServiceValue(classLoader); + } + if (p == null) { + // + // DOM Implementations can modify here to add *additional* fallback + // mechanisms to access a list of default DOMImplementationSources. + p = "gnu.xml.dom.ImplementationSource"; + } + if (p != null) { + StringTokenizer st = new StringTokenizer(p); + while (st.hasMoreTokens()) { + String sourceName = st.nextToken(); + // Use context class loader, falling back to Class.forName + // if and only if this fails... + Class sourceClass = null; + if (classLoader != null) { + sourceClass = classLoader.loadClass(sourceName); + } else { + sourceClass = Class.forName(sourceName); + } + DOMImplementationSource source = + (DOMImplementationSource) sourceClass.newInstance(); + sources.addElement(source); + } + } + return new DOMImplementationRegistry(sources); } - + /** * Return the first implementation that has the desired * features, or null if none is found. @@ -162,19 +162,19 @@ public final class DOMImplementationRegistry { * or null if none found. */ public DOMImplementation getDOMImplementation(final String features) { - int size = sources.size(); - String name = null; - for (int i = 0; i < size; i++) { - DOMImplementationSource source = - (DOMImplementationSource) sources.elementAt(i); - DOMImplementation impl = source.getDOMImplementation(features); - if (impl != null) { - return impl; - } - } - return null; + int size = sources.size(); + String name = null; + for (int i = 0; i < size; i++) { + DOMImplementationSource source = + (DOMImplementationSource) sources.elementAt(i); + DOMImplementation impl = source.getDOMImplementation(features); + if (impl != null) { + return impl; + } + } + return null; } - + /** * Return a list of implementations that support the * desired features. @@ -187,51 +187,51 @@ public final class DOMImplementationRegistry { * @return A list of DOMImplementations that support the desired features. */ public DOMImplementationList getDOMImplementationList(final String features) { - final Vector implementations = new Vector(); - int size = sources.size(); - for (int i = 0; i < size; i++) { - DOMImplementationSource source = - (DOMImplementationSource) sources.elementAt(i); - DOMImplementationList impls = - source.getDOMImplementationList(features); - for (int j = 0; j < impls.getLength(); j++) { - DOMImplementation impl = impls.item(j); - implementations.addElement(impl); - } - } - return new DOMImplementationList() { - public DOMImplementation item(final int index) { - if (index >= 0 && index < implementations.size()) { - try { - return (DOMImplementation) - implementations.elementAt(index); - } catch (ArrayIndexOutOfBoundsException e) { - return null; - } - } - return null; - } - - public int getLength() { - return implementations.size(); - } - }; + final Vector implementations = new Vector(); + int size = sources.size(); + for (int i = 0; i < size; i++) { + DOMImplementationSource source = + (DOMImplementationSource) sources.elementAt(i); + DOMImplementationList impls = + source.getDOMImplementationList(features); + for (int j = 0; j < impls.getLength(); j++) { + DOMImplementation impl = impls.item(j); + implementations.addElement(impl); + } + } + return new DOMImplementationList() { + public DOMImplementation item(final int index) { + if (index >= 0 && index < implementations.size()) { + try { + return (DOMImplementation) + implementations.elementAt(index); + } catch (ArrayIndexOutOfBoundsException e) { + return null; + } + } + return null; + } + + public int getLength() { + return implementations.size(); + } + }; } - + /** * Register an implementation. * * @param s The source to be registered, may not be null */ public void addSource(final DOMImplementationSource s) { - if (s == null) { - throw new NullPointerException(); - } - if (!sources.contains(s)) { - sources.addElement(s); - } + if (s == null) { + throw new NullPointerException(); + } + if (!sources.contains(s)) { + sources.addElement(s); + } } - + /** * * Gets a class loader. @@ -239,20 +239,20 @@ public final class DOMImplementationRegistry { * @return A class loader, possibly null */ private static ClassLoader getClassLoader() { - try { - ClassLoader contextClassLoader = getContextClassLoader(); - - if (contextClassLoader != null) { - return contextClassLoader; - } - } catch (Exception e) { - // Assume that the DOM application is in a JRE 1.1, use the - // current ClassLoader - return DOMImplementationRegistry.class.getClassLoader(); - } - return DOMImplementationRegistry.class.getClassLoader(); + try { + ClassLoader contextClassLoader = getContextClassLoader(); + + if (contextClassLoader != null) { + return contextClassLoader; + } + } catch (Exception e) { + // Assume that the DOM application is in a JRE 1.1, use the + // current ClassLoader + return DOMImplementationRegistry.class.getClassLoader(); + } + return DOMImplementationRegistry.class.getClassLoader(); } - + /** * This method attempts to return the first line of the resource * META_INF/services/org.w3c.dom.DOMImplementationSourceList @@ -262,52 +262,52 @@ public final class DOMImplementationRegistry { * @return first line of resource, or null */ private static String getServiceValue(final ClassLoader classLoader) { - String serviceId = "META-INF/services/" + PROPERTY; - // try to find services in CLASSPATH - try { - InputStream is = getResourceAsStream(classLoader, serviceId); - - if (is != null) { - BufferedReader rd; - try { - rd = - new BufferedReader(new InputStreamReader(is, "UTF-8"), - DEFAULT_LINE_LENGTH); - } catch (java.io.UnsupportedEncodingException e) { - rd = - new BufferedReader(new InputStreamReader(is), - DEFAULT_LINE_LENGTH); - } - String serviceValue = rd.readLine(); - rd.close(); - if (serviceValue != null && serviceValue.length() > 0) { - return serviceValue; - } - } - } catch (Exception ex) { - return null; - } - return null; + String serviceId = "META-INF/services/" + PROPERTY; + // try to find services in CLASSPATH + try { + InputStream is = getResourceAsStream(classLoader, serviceId); + + if (is != null) { + BufferedReader rd; + try { + rd = + new BufferedReader(new InputStreamReader(is, "UTF-8"), + DEFAULT_LINE_LENGTH); + } catch (java.io.UnsupportedEncodingException e) { + rd = + new BufferedReader(new InputStreamReader(is), + DEFAULT_LINE_LENGTH); + } + String serviceValue = rd.readLine(); + rd.close(); + if (serviceValue != null && serviceValue.length() > 0) { + return serviceValue; + } + } + } catch (Exception ex) { + return null; + } + return null; } - + /** * A simple JRE (Java Runtime Environment) 1.1 test * - * @return true if JRE 1.1 + * @return true if JRE 1.1 */ private static boolean isJRE11() { - try { - Class c = Class.forName("java.security.AccessController"); - // java.security.AccessController existed since 1.2 so, if no - // exception was thrown, the DOM application is running in a JRE - // 1.2 or higher - return false; - } catch (Exception ex) { - // ignore - } - return true; + try { + Class c = Class.forName("java.security.AccessController"); + // java.security.AccessController existed since 1.2 so, if no + // exception was thrown, the DOM application is running in a JRE + // 1.2 or higher + return false; + } catch (Exception ex) { + // ignore + } + return true; } - + /** * This method returns the ContextClassLoader or null if * running in a JRE 1.1 @@ -315,73 +315,73 @@ public final class DOMImplementationRegistry { * @return The Context Classloader */ private static ClassLoader getContextClassLoader() { - return isJRE11() - ? null - : (ClassLoader) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - ClassLoader classLoader = null; - try { - classLoader = - Thread.currentThread().getContextClassLoader(); - } catch (SecurityException ex) { - } - return classLoader; - } - }); + return isJRE11() + ? null + : (ClassLoader) + AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + ClassLoader classLoader = null; + try { + classLoader = + Thread.currentThread().getContextClassLoader(); + } catch (SecurityException ex) { + } + return classLoader; + } + }); } - + /** * This method returns the system property indicated by the specified name * after checking access control privileges. For a JRE 1.1, this check is * not done. - * - * @param name the name of the system property + * + * @param name the name of the system property * @return the system property */ private static String getSystemProperty(final String name) { - return isJRE11() - ? (String) System.getProperty(name) - : (String) AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - return System.getProperty(name); - } - }); + return isJRE11() + ? (String) System.getProperty(name) + : (String) AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + return System.getProperty(name); + } + }); } - + /** * This method returns an Inputstream for the reading resource * META_INF/services/org.w3c.dom.DOMImplementationSourceList after checking * access control privileges. For a JRE 1.1, this check is not done. * - * @param classLoader classLoader - * @param name the resource + * @param classLoader classLoader + * @param name the resource * @return an Inputstream for the resource specified */ private static InputStream getResourceAsStream(final ClassLoader classLoader, - final String name) { - if (isJRE11()) { - InputStream ris; - if (classLoader == null) { - ris = ClassLoader.getSystemResourceAsStream(name); - } else { - ris = classLoader.getResourceAsStream(name); - } - return ris; - } else { - return (InputStream) - AccessController.doPrivileged(new PrivilegedAction() { - public Object run() { - InputStream ris; - if (classLoader == null) { - ris = - ClassLoader.getSystemResourceAsStream(name); - } else { - ris = classLoader.getResourceAsStream(name); - } - return ris; - } - }); - } + final String name) { + if (isJRE11()) { + InputStream ris; + if (classLoader == null) { + ris = ClassLoader.getSystemResourceAsStream(name); + } else { + ris = classLoader.getResourceAsStream(name); + } + return ris; + } else { + return (InputStream) + AccessController.doPrivileged(new PrivilegedAction() { + public Object run() { + InputStream ris; + if (classLoader == null) { + ris = + ClassLoader.getSystemResourceAsStream(name); + } else { + ris = classLoader.getResourceAsStream(name); + } + return ris; + } + }); + } } } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java index 89ccf5048ef..238eea342d2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSS2Properties.java @@ -15,65 +15,65 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSS2Properties interface represents a convenience - * mechanism for retrieving and setting properties within a - * CSSStyleDeclaration. The attributes of this interface - * correspond to all the properties specified in CSS2. Getting an attribute - * of this interface is equivalent to calling the - * getPropertyValue method of the - * CSSStyleDeclaration interface. Setting an attribute of this - * interface is equivalent to calling the setProperty method of - * the CSSStyleDeclaration interface. - *

    A conformant implementation of the CSS module is not required to - * implement the CSS2Properties interface. If an implementation - * does implement this interface, the expectation is that language-specific - * methods can be used to cast from an instance of the - * CSSStyleDeclaration interface to the - * CSS2Properties interface. - *

    If an implementation does implement this interface, it is expected to - * understand the specific syntax of the shorthand properties, and apply - * their semantics; when the margin property is set, for - * example, the marginTop, marginRight, - * marginBottom and marginLeft properties are - * actually being set by the underlying implementation. - *

    When dealing with CSS "shorthand" properties, the shorthand properties - * should be decomposed into their component longhand properties as - * appropriate, and when querying for their value, the form returned should - * be the shortest form exactly equivalent to the declarations made in the - * ruleset. However, if there is no shorthand declaration that could be - * added to the ruleset without changing in any way the rules already - * declared in the ruleset (i.e., by adding longhand rules that were - * previously not declared in the ruleset), then the empty string should be - * returned for the shorthand property. - *

    For example, querying for the font property should not - * return "normal normal normal 14pt/normal Arial, sans-serif", when "14pt - * Arial, sans-serif" suffices. (The normals are initial values, and are - * implied by use of the longhand property.) - *

    If the values for all the longhand properties that compose a particular - * string are the initial values, then a string consisting of all the - * initial values should be returned (e.g. a border-width value - * of "medium" should be returned as such, not as ""). - *

    For some shorthand properties that take missing values from other - * sides, such as the margin, padding, and - * border-[width|style|color] properties, the minimum number of - * sides possible should be used; i.e., "0px 10px" will be returned instead - * of "0px 10px 0px 10px". - *

    If the value of a shorthand property can not be decomposed into its - * component longhand properties, as is the case for the font - * property with a value of "menu", querying for the values of the component - * longhand properties should return the empty string. + * The CSS2Properties interface represents a convenience + * mechanism for retrieving and setting properties within a + * CSSStyleDeclaration. The attributes of this interface + * correspond to all the properties specified in CSS2. Getting an attribute + * of this interface is equivalent to calling the + * getPropertyValue method of the + * CSSStyleDeclaration interface. Setting an attribute of this + * interface is equivalent to calling the setProperty method of + * the CSSStyleDeclaration interface. + *

    A conformant implementation of the CSS module is not required to + * implement the CSS2Properties interface. If an implementation + * does implement this interface, the expectation is that language-specific + * methods can be used to cast from an instance of the + * CSSStyleDeclaration interface to the + * CSS2Properties interface. + *

    If an implementation does implement this interface, it is expected to + * understand the specific syntax of the shorthand properties, and apply + * their semantics; when the margin property is set, for + * example, the marginTop, marginRight, + * marginBottom and marginLeft properties are + * actually being set by the underlying implementation. + *

    When dealing with CSS "shorthand" properties, the shorthand properties + * should be decomposed into their component longhand properties as + * appropriate, and when querying for their value, the form returned should + * be the shortest form exactly equivalent to the declarations made in the + * ruleset. However, if there is no shorthand declaration that could be + * added to the ruleset without changing in any way the rules already + * declared in the ruleset (i.e., by adding longhand rules that were + * previously not declared in the ruleset), then the empty string should be + * returned for the shorthand property. + *

    For example, querying for the font property should not + * return "normal normal normal 14pt/normal Arial, sans-serif", when "14pt + * Arial, sans-serif" suffices. (The normals are initial values, and are + * implied by use of the longhand property.) + *

    If the values for all the longhand properties that compose a particular + * string are the initial values, then a string consisting of all the + * initial values should be returned (e.g. a border-width value + * of "medium" should be returned as such, not as ""). + *

    For some shorthand properties that take missing values from other + * sides, such as the margin, padding, and + * border-[width|style|color] properties, the minimum number of + * sides possible should be used; i.e., "0px 10px" will be returned instead + * of "0px 10px 0px 10px". + *

    If the value of a shorthand property can not be decomposed into its + * component longhand properties, as is the case for the font + * property with a value of "menu", querying for the values of the component + * longhand properties should return the empty string. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSS2Properties { /** - * See the azimuth property definition in CSS2. + * See the azimuth property definition in CSS2. */ public String getAzimuth(); /** - * See the azimuth property definition in CSS2. + * See the azimuth property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -81,13 +81,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background property definition in CSS2. + * See the background property definition in CSS2. */ public String getBackground(); /** - * See the background property definition in CSS2. + * See the background property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -95,13 +95,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background-attachment property definition in CSS2. + * See the background-attachment property definition in CSS2. */ public String getBackgroundAttachment(); /** - * See the background-attachment property definition in CSS2. + * See the background-attachment property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -109,13 +109,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background-color property definition in CSS2. + * See the background-color property definition in CSS2. */ public String getBackgroundColor(); /** - * See the background-color property definition in CSS2. + * See the background-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -123,13 +123,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background-image property definition in CSS2. + * See the background-image property definition in CSS2. */ public String getBackgroundImage(); /** - * See the background-image property definition in CSS2. + * See the background-image property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -137,13 +137,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background-position property definition in CSS2. + * See the background-position property definition in CSS2. */ public String getBackgroundPosition(); /** - * See the background-position property definition in CSS2. + * See the background-position property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -151,13 +151,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the background-repeat property definition in CSS2. + * See the background-repeat property definition in CSS2. */ public String getBackgroundRepeat(); /** - * See the background-repeat property definition in CSS2. + * See the background-repeat property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -165,13 +165,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border property definition in CSS2. + * See the border property definition in CSS2. */ public String getBorder(); /** - * See the border property definition in CSS2. + * See the border property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -179,13 +179,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-collapse property definition in CSS2. + * See the border-collapse property definition in CSS2. */ public String getBorderCollapse(); /** - * See the border-collapse property definition in CSS2. + * See the border-collapse property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -193,13 +193,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-color property definition in CSS2. + * See the border-color property definition in CSS2. */ public String getBorderColor(); /** - * See the border-color property definition in CSS2. + * See the border-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -207,13 +207,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-spacing property definition in CSS2. + * See the border-spacing property definition in CSS2. */ public String getBorderSpacing(); /** - * See the border-spacing property definition in CSS2. + * See the border-spacing property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -221,13 +221,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-style property definition in CSS2. + * See the border-style property definition in CSS2. */ public String getBorderStyle(); /** - * See the border-style property definition in CSS2. + * See the border-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -235,13 +235,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-top property definition in CSS2. + * See the border-top property definition in CSS2. */ public String getBorderTop(); /** - * See the border-top property definition in CSS2. + * See the border-top property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -249,13 +249,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-right property definition in CSS2. + * See the border-right property definition in CSS2. */ public String getBorderRight(); /** - * See the border-right property definition in CSS2. + * See the border-right property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -263,13 +263,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-bottom property definition in CSS2. + * See the border-bottom property definition in CSS2. */ public String getBorderBottom(); /** - * See the border-bottom property definition in CSS2. + * See the border-bottom property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -277,13 +277,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-left property definition in CSS2. + * See the border-left property definition in CSS2. */ public String getBorderLeft(); /** - * See the border-left property definition in CSS2. + * See the border-left property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -291,13 +291,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-top-color property definition in CSS2. + * See the border-top-color property definition in CSS2. */ public String getBorderTopColor(); /** - * See the border-top-color property definition in CSS2. + * See the border-top-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -305,13 +305,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-right-color property definition in CSS2. + * See the border-right-color property definition in CSS2. */ public String getBorderRightColor(); /** - * See the border-right-color property definition in CSS2. + * See the border-right-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -319,13 +319,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-bottom-color property definition in CSS2. + * See the border-bottom-color property definition in CSS2. */ public String getBorderBottomColor(); /** - * See the border-bottom-color property definition in CSS2. + * See the border-bottom-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -333,13 +333,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-left-color property definition in CSS2. + * See the border-left-color property definition in CSS2. */ public String getBorderLeftColor(); /** - * See the border-left-color property definition in CSS2. + * See the border-left-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -347,13 +347,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-top-style property definition in CSS2. + * See the border-top-style property definition in CSS2. */ public String getBorderTopStyle(); /** - * See the border-top-style property definition in CSS2. + * See the border-top-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -361,13 +361,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-right-style property definition in CSS2. + * See the border-right-style property definition in CSS2. */ public String getBorderRightStyle(); /** - * See the border-right-style property definition in CSS2. + * See the border-right-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -375,13 +375,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-bottom-style property definition in CSS2. + * See the border-bottom-style property definition in CSS2. */ public String getBorderBottomStyle(); /** - * See the border-bottom-style property definition in CSS2. + * See the border-bottom-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -389,13 +389,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-left-style property definition in CSS2. + * See the border-left-style property definition in CSS2. */ public String getBorderLeftStyle(); /** - * See the border-left-style property definition in CSS2. + * See the border-left-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -403,13 +403,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-top-width property definition in CSS2. + * See the border-top-width property definition in CSS2. */ public String getBorderTopWidth(); /** - * See the border-top-width property definition in CSS2. + * See the border-top-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -417,13 +417,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-right-width property definition in CSS2. + * See the border-right-width property definition in CSS2. */ public String getBorderRightWidth(); /** - * See the border-right-width property definition in CSS2. + * See the border-right-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -431,13 +431,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-bottom-width property definition in CSS2. + * See the border-bottom-width property definition in CSS2. */ public String getBorderBottomWidth(); /** - * See the border-bottom-width property definition in CSS2. + * See the border-bottom-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -445,13 +445,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-left-width property definition in CSS2. + * See the border-left-width property definition in CSS2. */ public String getBorderLeftWidth(); /** - * See the border-left-width property definition in CSS2. + * See the border-left-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -459,13 +459,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the border-width property definition in CSS2. + * See the border-width property definition in CSS2. */ public String getBorderWidth(); /** - * See the border-width property definition in CSS2. + * See the border-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -473,13 +473,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the bottom property definition in CSS2. + * See the bottom property definition in CSS2. */ public String getBottom(); /** - * See the bottom property definition in CSS2. + * See the bottom property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -487,13 +487,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the caption-side property definition in CSS2. + * See the caption-side property definition in CSS2. */ public String getCaptionSide(); /** - * See the caption-side property definition in CSS2. + * See the caption-side property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -501,13 +501,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the clear property definition in CSS2. + * See the clear property definition in CSS2. */ public String getClear(); /** - * See the clear property definition in CSS2. + * See the clear property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -515,13 +515,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the clip property definition in CSS2. + * See the clip property definition in CSS2. */ public String getClip(); /** - * See the clip property definition in CSS2. + * See the clip property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -529,13 +529,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the color property definition in CSS2. + * See the color property definition in CSS2. */ public String getColor(); /** - * See the color property definition in CSS2. + * See the color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -543,13 +543,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the content property definition in CSS2. + * See the content property definition in CSS2. */ public String getContent(); /** - * See the content property definition in CSS2. + * See the content property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -557,13 +557,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the counter-increment property definition in CSS2. + * See the counter-increment property definition in CSS2. */ public String getCounterIncrement(); /** - * See the counter-increment property definition in CSS2. + * See the counter-increment property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -571,13 +571,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the counter-reset property definition in CSS2. + * See the counter-reset property definition in CSS2. */ public String getCounterReset(); /** - * See the counter-reset property definition in CSS2. + * See the counter-reset property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -585,13 +585,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the cue property definition in CSS2. + * See the cue property definition in CSS2. */ public String getCue(); /** - * See the cue property definition in CSS2. + * See the cue property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -599,13 +599,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the cue-after property definition in CSS2. + * See the cue-after property definition in CSS2. */ public String getCueAfter(); /** - * See the cue-after property definition in CSS2. + * See the cue-after property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -613,13 +613,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the cue-before property definition in CSS2. + * See the cue-before property definition in CSS2. */ public String getCueBefore(); /** - * See the cue-before property definition in CSS2. + * See the cue-before property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -627,13 +627,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the cursor property definition in CSS2. + * See the cursor property definition in CSS2. */ public String getCursor(); /** - * See the cursor property definition in CSS2. + * See the cursor property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -641,13 +641,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the direction property definition in CSS2. + * See the direction property definition in CSS2. */ public String getDirection(); /** - * See the direction property definition in CSS2. + * See the direction property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -655,13 +655,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the display property definition in CSS2. + * See the display property definition in CSS2. */ public String getDisplay(); /** - * See the display property definition in CSS2. + * See the display property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -669,13 +669,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the elevation property definition in CSS2. + * See the elevation property definition in CSS2. */ public String getElevation(); /** - * See the elevation property definition in CSS2. + * See the elevation property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -683,13 +683,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the empty-cells property definition in CSS2. + * See the empty-cells property definition in CSS2. */ public String getEmptyCells(); /** - * See the empty-cells property definition in CSS2. + * See the empty-cells property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -697,13 +697,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the float property definition in CSS2. + * See the float property definition in CSS2. */ public String getCssFloat(); /** - * See the float property definition in CSS2. + * See the float property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -711,13 +711,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font property definition in CSS2. + * See the font property definition in CSS2. */ public String getFont(); /** - * See the font property definition in CSS2. + * See the font property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -725,13 +725,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-family property definition in CSS2. + * See the font-family property definition in CSS2. */ public String getFontFamily(); /** - * See the font-family property definition in CSS2. + * See the font-family property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -739,13 +739,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-size property definition in CSS2. + * See the font-size property definition in CSS2. */ public String getFontSize(); /** - * See the font-size property definition in CSS2. + * See the font-size property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -753,13 +753,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-size-adjust property definition in CSS2. + * See the font-size-adjust property definition in CSS2. */ public String getFontSizeAdjust(); /** - * See the font-size-adjust property definition in CSS2. + * See the font-size-adjust property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -767,13 +767,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-stretch property definition in CSS2. + * See the font-stretch property definition in CSS2. */ public String getFontStretch(); /** - * See the font-stretch property definition in CSS2. + * See the font-stretch property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -781,13 +781,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-style property definition in CSS2. + * See the font-style property definition in CSS2. */ public String getFontStyle(); /** - * See the font-style property definition in CSS2. + * See the font-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -795,13 +795,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-variant property definition in CSS2. + * See the font-variant property definition in CSS2. */ public String getFontVariant(); /** - * See the font-variant property definition in CSS2. + * See the font-variant property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -809,13 +809,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the font-weight property definition in CSS2. + * See the font-weight property definition in CSS2. */ public String getFontWeight(); /** - * See the font-weight property definition in CSS2. + * See the font-weight property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -823,13 +823,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the height property definition in CSS2. + * See the height property definition in CSS2. */ public String getHeight(); /** - * See the height property definition in CSS2. + * See the height property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -837,13 +837,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the left property definition in CSS2. + * See the left property definition in CSS2. */ public String getLeft(); /** - * See the left property definition in CSS2. + * See the left property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -851,13 +851,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the letter-spacing property definition in CSS2. + * See the letter-spacing property definition in CSS2. */ public String getLetterSpacing(); /** - * See the letter-spacing property definition in CSS2. + * See the letter-spacing property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -865,13 +865,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the line-height property definition in CSS2. + * See the line-height property definition in CSS2. */ public String getLineHeight(); /** - * See the line-height property definition in CSS2. + * See the line-height property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -879,13 +879,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the list-style property definition in CSS2. + * See the list-style property definition in CSS2. */ public String getListStyle(); /** - * See the list-style property definition in CSS2. + * See the list-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -893,13 +893,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the list-style-image property definition in CSS2. + * See the list-style-image property definition in CSS2. */ public String getListStyleImage(); /** - * See the list-style-image property definition in CSS2. + * See the list-style-image property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -907,13 +907,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the list-style-position property definition in CSS2. + * See the list-style-position property definition in CSS2. */ public String getListStylePosition(); /** - * See the list-style-position property definition in CSS2. + * See the list-style-position property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -921,13 +921,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the list-style-type property definition in CSS2. + * See the list-style-type property definition in CSS2. */ public String getListStyleType(); /** - * See the list-style-type property definition in CSS2. + * See the list-style-type property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -935,13 +935,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the margin property definition in CSS2. + * See the margin property definition in CSS2. */ public String getMargin(); /** - * See the margin property definition in CSS2. + * See the margin property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -949,13 +949,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the margin-top property definition in CSS2. + * See the margin-top property definition in CSS2. */ public String getMarginTop(); /** - * See the margin-top property definition in CSS2. + * See the margin-top property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -963,13 +963,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the margin-right property definition in CSS2. + * See the margin-right property definition in CSS2. */ public String getMarginRight(); /** - * See the margin-right property definition in CSS2. + * See the margin-right property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -977,13 +977,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the margin-bottom property definition in CSS2. + * See the margin-bottom property definition in CSS2. */ public String getMarginBottom(); /** - * See the margin-bottom property definition in CSS2. + * See the margin-bottom property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -991,13 +991,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the margin-left property definition in CSS2. + * See the margin-left property definition in CSS2. */ public String getMarginLeft(); /** - * See the margin-left property definition in CSS2. + * See the margin-left property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1005,13 +1005,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the marker-offset property definition in CSS2. + * See the marker-offset property definition in CSS2. */ public String getMarkerOffset(); /** - * See the marker-offset property definition in CSS2. + * See the marker-offset property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1019,13 +1019,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the marks property definition in CSS2. + * See the marks property definition in CSS2. */ public String getMarks(); /** - * See the marks property definition in CSS2. + * See the marks property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1033,13 +1033,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the max-height property definition in CSS2. + * See the max-height property definition in CSS2. */ public String getMaxHeight(); /** - * See the max-height property definition in CSS2. + * See the max-height property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1047,13 +1047,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the max-width property definition in CSS2. + * See the max-width property definition in CSS2. */ public String getMaxWidth(); /** - * See the max-width property definition in CSS2. + * See the max-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1061,13 +1061,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the min-height property definition in CSS2. + * See the min-height property definition in CSS2. */ public String getMinHeight(); /** - * See the min-height property definition in CSS2. + * See the min-height property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1075,13 +1075,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the min-width property definition in CSS2. + * See the min-width property definition in CSS2. */ public String getMinWidth(); /** - * See the min-width property definition in CSS2. + * See the min-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1089,13 +1089,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the orphans property definition in CSS2. + * See the orphans property definition in CSS2. */ public String getOrphans(); /** - * See the orphans property definition in CSS2. + * See the orphans property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1103,13 +1103,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the outline property definition in CSS2. + * See the outline property definition in CSS2. */ public String getOutline(); /** - * See the outline property definition in CSS2. + * See the outline property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1117,13 +1117,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the outline-color property definition in CSS2. + * See the outline-color property definition in CSS2. */ public String getOutlineColor(); /** - * See the outline-color property definition in CSS2. + * See the outline-color property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1131,13 +1131,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the outline-style property definition in CSS2. + * See the outline-style property definition in CSS2. */ public String getOutlineStyle(); /** - * See the outline-style property definition in CSS2. + * See the outline-style property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1145,13 +1145,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the outline-width property definition in CSS2. + * See the outline-width property definition in CSS2. */ public String getOutlineWidth(); /** - * See the outline-width property definition in CSS2. + * See the outline-width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1159,13 +1159,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the overflow property definition in CSS2. + * See the overflow property definition in CSS2. */ public String getOverflow(); /** - * See the overflow property definition in CSS2. + * See the overflow property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1173,13 +1173,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the padding property definition in CSS2. + * See the padding property definition in CSS2. */ public String getPadding(); /** - * See the padding property definition in CSS2. + * See the padding property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1187,13 +1187,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the padding-top property definition in CSS2. + * See the padding-top property definition in CSS2. */ public String getPaddingTop(); /** - * See the padding-top property definition in CSS2. + * See the padding-top property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1201,13 +1201,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the padding-right property definition in CSS2. + * See the padding-right property definition in CSS2. */ public String getPaddingRight(); /** - * See the padding-right property definition in CSS2. + * See the padding-right property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1215,13 +1215,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the padding-bottom property definition in CSS2. + * See the padding-bottom property definition in CSS2. */ public String getPaddingBottom(); /** - * See the padding-bottom property definition in CSS2. + * See the padding-bottom property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1229,13 +1229,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the padding-left property definition in CSS2. + * See the padding-left property definition in CSS2. */ public String getPaddingLeft(); /** - * See the padding-left property definition in CSS2. + * See the padding-left property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1243,13 +1243,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the page property definition in CSS2. + * See the page property definition in CSS2. */ public String getPage(); /** - * See the page property definition in CSS2. + * See the page property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1257,13 +1257,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the page-break-after property definition in CSS2. + * See the page-break-after property definition in CSS2. */ public String getPageBreakAfter(); /** - * See the page-break-after property definition in CSS2. + * See the page-break-after property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1271,13 +1271,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the page-break-before property definition in CSS2. + * See the page-break-before property definition in CSS2. */ public String getPageBreakBefore(); /** - * See the page-break-before property definition in CSS2. + * See the page-break-before property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1285,13 +1285,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the page-break-inside property definition in CSS2. + * See the page-break-inside property definition in CSS2. */ public String getPageBreakInside(); /** - * See the page-break-inside property definition in CSS2. + * See the page-break-inside property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1299,13 +1299,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the pause property definition in CSS2. + * See the pause property definition in CSS2. */ public String getPause(); /** - * See the pause property definition in CSS2. + * See the pause property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1313,13 +1313,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the pause-after property definition in CSS2. + * See the pause-after property definition in CSS2. */ public String getPauseAfter(); /** - * See the pause-after property definition in CSS2. + * See the pause-after property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1327,13 +1327,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the pause-before property definition in CSS2. + * See the pause-before property definition in CSS2. */ public String getPauseBefore(); /** - * See the pause-before property definition in CSS2. + * See the pause-before property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1341,13 +1341,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the pitch property definition in CSS2. + * See the pitch property definition in CSS2. */ public String getPitch(); /** - * See the pitch property definition in CSS2. + * See the pitch property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1355,13 +1355,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the pitch-range property definition in CSS2. + * See the pitch-range property definition in CSS2. */ public String getPitchRange(); /** - * See the pitch-range property definition in CSS2. + * See the pitch-range property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1369,13 +1369,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the play-during property definition in CSS2. + * See the play-during property definition in CSS2. */ public String getPlayDuring(); /** - * See the play-during property definition in CSS2. + * See the play-during property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1383,13 +1383,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the position property definition in CSS2. + * See the position property definition in CSS2. */ public String getPosition(); /** - * See the position property definition in CSS2. + * See the position property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1397,13 +1397,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the quotes property definition in CSS2. + * See the quotes property definition in CSS2. */ public String getQuotes(); /** - * See the quotes property definition in CSS2. + * See the quotes property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1411,13 +1411,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the richness property definition in CSS2. + * See the richness property definition in CSS2. */ public String getRichness(); /** - * See the richness property definition in CSS2. + * See the richness property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1425,13 +1425,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the right property definition in CSS2. + * See the right property definition in CSS2. */ public String getRight(); /** - * See the right property definition in CSS2. + * See the right property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1439,13 +1439,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the size property definition in CSS2. + * See the size property definition in CSS2. */ public String getSize(); /** - * See the size property definition in CSS2. + * See the size property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1453,13 +1453,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the speak property definition in CSS2. + * See the speak property definition in CSS2. */ public String getSpeak(); /** - * See the speak property definition in CSS2. + * See the speak property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1467,13 +1467,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the speak-header property definition in CSS2. + * See the speak-header property definition in CSS2. */ public String getSpeakHeader(); /** - * See the speak-header property definition in CSS2. + * See the speak-header property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1481,13 +1481,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the speak-numeral property definition in CSS2. + * See the speak-numeral property definition in CSS2. */ public String getSpeakNumeral(); /** - * See the speak-numeral property definition in CSS2. + * See the speak-numeral property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1495,13 +1495,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the speak-punctuation property definition in CSS2. + * See the speak-punctuation property definition in CSS2. */ public String getSpeakPunctuation(); /** - * See the speak-punctuation property definition in CSS2. + * See the speak-punctuation property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1509,13 +1509,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the speech-rate property definition in CSS2. + * See the speech-rate property definition in CSS2. */ public String getSpeechRate(); /** - * See the speech-rate property definition in CSS2. + * See the speech-rate property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1523,13 +1523,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the stress property definition in CSS2. + * See the stress property definition in CSS2. */ public String getStress(); /** - * See the stress property definition in CSS2. + * See the stress property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1537,13 +1537,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the table-layout property definition in CSS2. + * See the table-layout property definition in CSS2. */ public String getTableLayout(); /** - * See the table-layout property definition in CSS2. + * See the table-layout property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1551,13 +1551,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the text-align property definition in CSS2. + * See the text-align property definition in CSS2. */ public String getTextAlign(); /** - * See the text-align property definition in CSS2. + * See the text-align property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1565,13 +1565,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the text-decoration property definition in CSS2. + * See the text-decoration property definition in CSS2. */ public String getTextDecoration(); /** - * See the text-decoration property definition in CSS2. + * See the text-decoration property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1579,13 +1579,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the text-indent property definition in CSS2. + * See the text-indent property definition in CSS2. */ public String getTextIndent(); /** - * See the text-indent property definition in CSS2. + * See the text-indent property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1593,13 +1593,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the text-shadow property definition in CSS2. + * See the text-shadow property definition in CSS2. */ public String getTextShadow(); /** - * See the text-shadow property definition in CSS2. + * See the text-shadow property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1607,13 +1607,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the text-transform property definition in CSS2. + * See the text-transform property definition in CSS2. */ public String getTextTransform(); /** - * See the text-transform property definition in CSS2. + * See the text-transform property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1621,13 +1621,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the top property definition in CSS2. + * See the top property definition in CSS2. */ public String getTop(); /** - * See the top property definition in CSS2. + * See the top property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1635,13 +1635,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the unicode-bidi property definition in CSS2. + * See the unicode-bidi property definition in CSS2. */ public String getUnicodeBidi(); /** - * See the unicode-bidi property definition in CSS2. + * See the unicode-bidi property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1649,13 +1649,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the vertical-align property definition in CSS2. + * See the vertical-align property definition in CSS2. */ public String getVerticalAlign(); /** - * See the vertical-align property definition in CSS2. + * See the vertical-align property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1663,13 +1663,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the visibility property definition in CSS2. + * See the visibility property definition in CSS2. */ public String getVisibility(); /** - * See the visibility property definition in CSS2. + * See the visibility property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1677,13 +1677,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the voice-family property definition in CSS2. + * See the voice-family property definition in CSS2. */ public String getVoiceFamily(); /** - * See the voice-family property definition in CSS2. + * See the voice-family property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1691,13 +1691,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the volume property definition in CSS2. + * See the volume property definition in CSS2. */ public String getVolume(); /** - * See the volume property definition in CSS2. + * See the volume property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1705,13 +1705,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the white-space property definition in CSS2. + * See the white-space property definition in CSS2. */ public String getWhiteSpace(); /** - * See the white-space property definition in CSS2. + * See the white-space property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1719,13 +1719,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the widows property definition in CSS2. + * See the widows property definition in CSS2. */ public String getWidows(); /** - * See the widows property definition in CSS2. + * See the widows property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1733,13 +1733,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the width property definition in CSS2. + * See the width property definition in CSS2. */ public String getWidth(); /** - * See the width property definition in CSS2. + * See the width property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1747,13 +1747,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the word-spacing property definition in CSS2. + * See the word-spacing property definition in CSS2. */ public String getWordSpacing(); /** - * See the word-spacing property definition in CSS2. + * See the word-spacing property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ @@ -1761,13 +1761,13 @@ public interface CSS2Properties { throws DOMException; /** - * See the z-index property definition in CSS2. + * See the z-index property definition in CSS2. */ public String getZIndex(); /** - * See the z-index property definition in CSS2. + * See the z-index property definition in CSS2. * @exception DOMException - * SYNTAX_ERR: Raised if the new value has a syntax error and is + * SYNTAX_ERR: Raised if the new value has a syntax error and is * unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java index 8c0defa4753..55dc6f8ccd0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSCharsetRule.java @@ -15,34 +15,34 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSCharsetRule interface represents a @charset rule in a - * CSS style sheet. The value of the encoding attribute does - * not affect the encoding of text data in the DOM objects; this encoding is - * always UTF-16. After a stylesheet is loaded, the value of the - * encoding attribute is the value found in the - * @charset rule. If there was no @charset in the - * original document, then no CSSCharsetRule is created. The - * value of the encoding attribute may also be used as a hint - * for the encoding used on serialization of the style sheet. - *

    The value of the @charset rule (and therefore of the - * CSSCharsetRule) may not correspond to the encoding the - * document actually came in; character encoding information e.g. in an HTTP - * header, has priority (see CSS document representation) but this is not - * reflected in the CSSCharsetRule. + * The CSSCharsetRule interface represents a @charset rule in a + * CSS style sheet. The value of the encoding attribute does + * not affect the encoding of text data in the DOM objects; this encoding is + * always UTF-16. After a stylesheet is loaded, the value of the + * encoding attribute is the value found in the + * @charset rule. If there was no @charset in the + * original document, then no CSSCharsetRule is created. The + * value of the encoding attribute may also be used as a hint + * for the encoding used on serialization of the style sheet. + *

    The value of the @charset rule (and therefore of the + * CSSCharsetRule) may not correspond to the encoding the + * document actually came in; character encoding information e.g. in an HTTP + * header, has priority (see CSS document representation) but this is not + * reflected in the CSSCharsetRule. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSCharsetRule extends CSSRule { /** - * The encoding information used in this @charset rule. + * The encoding information used in this @charset rule. */ public String getEncoding(); /** - * The encoding information used in this @charset rule. + * The encoding information used in this @charset rule. * @exception DOMException - * SYNTAX_ERR: Raised if the specified encoding value has a syntax error + * SYNTAX_ERR: Raised if the specified encoding value has a syntax error * and is unparsable. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this encoding rule is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this encoding rule is * readonly. */ public void setEncoding(String encoding) diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java index a1795706118..e446ea8c5ab 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSFontFaceRule.java @@ -13,15 +13,15 @@ package org.w3c.dom.css; /** - * The CSSFontFaceRule interface represents a @font-face rule in - * a CSS style sheet. The @font-face rule is used to hold a set - * of font descriptions. + * The CSSFontFaceRule interface represents a @font-face rule in + * a CSS style sheet. The @font-face rule is used to hold a set + * of font descriptions. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSFontFaceRule extends CSSRule { /** - * The declaration-block of this rule. + * The declaration-block of this rule. */ public CSSStyleDeclaration getStyle(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java index e18ad569bcb..3dee5d80b37 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSImportRule.java @@ -15,29 +15,29 @@ package org.w3c.dom.css; import org.w3c.dom.stylesheets.MediaList; /** - * The CSSImportRule interface represents a @import rule within - * a CSS style sheet. The @import rule is used to import style - * rules from other style sheets. + * The CSSImportRule interface represents a @import rule within + * a CSS style sheet. The @import rule is used to import style + * rules from other style sheets. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSImportRule extends CSSRule { /** - * The location of the style sheet to be imported. The attribute will not - * contain the "url(...)" specifier around the URI. + * The location of the style sheet to be imported. The attribute will not + * contain the "url(...)" specifier around the URI. */ public String getHref(); /** - * A list of media types for which this style sheet may be used. + * A list of media types for which this style sheet may be used. */ public MediaList getMedia(); /** - * The style sheet referred to by this rule, if it has been loaded. The - * value of this attribute is null if the style sheet has - * not yet been loaded or if it will not be loaded (e.g. if the style - * sheet is for a media type not supported by the user agent). + * The style sheet referred to by this rule, if it has been loaded. The + * value of this attribute is null if the style sheet has + * not yet been loaded or if it will not be loaded (e.g. if the style + * sheet is for a media type not supported by the user agent). */ public CSSStyleSheet getStyleSheet(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java index 68a73045ede..6e977923db1 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSMediaRule.java @@ -16,58 +16,58 @@ import org.w3c.dom.DOMException; import org.w3c.dom.stylesheets.MediaList; /** - * The CSSMediaRule interface represents a @media rule in a CSS - * style sheet. A @media rule can be used to delimit style - * rules for specific media types. + * The CSSMediaRule interface represents a @media rule in a CSS + * style sheet. A @media rule can be used to delimit style + * rules for specific media types. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSMediaRule extends CSSRule { /** - * A list of media types for this rule. + * A list of media types for this rule. */ public MediaList getMedia(); /** - * A list of all CSS rules contained within the media block. + * A list of all CSS rules contained within the media block. */ public CSSRuleList getCssRules(); /** - * Used to insert a new rule into the media block. - * @param rule The parsable text representing the rule. For rule sets - * this contains both the selector and the style declaration. For - * at-rules, this specifies both the at-identifier and the rule - * content. - * @param index The index within the media block's rule collection of - * the rule before which to insert the specified rule. If the - * specified index is equal to the length of the media blocks's rule - * collection, the rule will be added to the end of the media block. - * @return The index within the media block's rule collection of the - * newly inserted rule. + * Used to insert a new rule into the media block. + * @param rule The parsable text representing the rule. For rule sets + * this contains both the selector and the style declaration. For + * at-rules, this specifies both the at-identifier and the rule + * content. + * @param index The index within the media block's rule collection of + * the rule before which to insert the specified rule. If the + * specified index is equal to the length of the media blocks's rule + * collection, the rule will be added to the end of the media block. + * @return The index within the media block's rule collection of the + * newly inserted rule. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the - * specified index, e.g., if an @import rule is inserted + * HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the + * specified index, e.g., if an @import rule is inserted * after a standard rule set or other at-rule. - *
    INDEX_SIZE_ERR: Raised if the specified index is not a valid + *
    INDEX_SIZE_ERR: Raised if the specified index is not a valid * insertion point. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is * readonly. - *
    SYNTAX_ERR: Raised if the specified rule has a syntax error and + *
    SYNTAX_ERR: Raised if the specified rule has a syntax error and * is unparsable. */ - public int insertRule(String rule, + public int insertRule(String rule, int index) throws DOMException; /** - * Used to delete a rule from the media block. - * @param index The index within the media block's rule collection of - * the rule to remove. + * Used to delete a rule from the media block. + * @param index The index within the media block's rule collection of + * the rule to remove. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index does not correspond to + * INDEX_SIZE_ERR: Raised if the specified index does not correspond to * a rule in the media rule list. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media rule is * readonly. */ public void deleteRule(int index) diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java index 538626a97e9..eb8f783f5f8 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPageRule.java @@ -15,21 +15,21 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSPageRule interface represents a @page rule within a - * CSS style sheet. The @page rule is used to specify the - * dimensions, orientation, margins, etc. of a page box for paged media. + * The CSSPageRule interface represents a @page rule within a + * CSS style sheet. The @page rule is used to specify the + * dimensions, orientation, margins, etc. of a page box for paged media. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSPageRule extends CSSRule { /** - * The parsable textual representation of the page selector for the rule. + * The parsable textual representation of the page selector for the rule. */ public String getSelectorText(); /** - * The parsable textual representation of the page selector for the rule. + * The parsable textual representation of the page selector for the rule. * @exception DOMException - * SYNTAX_ERR: Raised if the specified CSS string value has a syntax + * SYNTAX_ERR: Raised if the specified CSS string value has a syntax * error and is unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is readonly. */ @@ -37,7 +37,7 @@ public interface CSSPageRule extends CSSRule { throws DOMException; /** - * The declaration-block of this rule. + * The declaration-block of this rule. */ public CSSStyleDeclaration getStyle(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java index 4131d26cda3..25f906a7068 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSPrimitiveValue.java @@ -16,153 +16,153 @@ import org.w3c.dom.DOMException; /** * The CSSPrimitiveValue interface represents a single CSS value - * . This interface may be used to determine the value of a specific style - * property currently set in a block or to set a specific style property - * explicitly within the block. An instance of this interface might be - * obtained from the getPropertyCSSValue method of the - * CSSStyleDeclaration interface. A - * CSSPrimitiveValue object only occurs in a context of a CSS - * property. - *

    Conversions are allowed between absolute values (from millimeters to - * centimeters, from degrees to radians, and so on) but not between relative - * values. (For example, a pixel value cannot be converted to a centimeter - * value.) Percentage values can't be converted since they are relative to - * the parent value (or another property value). There is one exception for - * color percentage values: since a color percentage value is relative to - * the range 0-255, a color percentage value can be converted to a number; - * (see also the RGBColor interface). + * . This interface may be used to determine the value of a specific style + * property currently set in a block or to set a specific style property + * explicitly within the block. An instance of this interface might be + * obtained from the getPropertyCSSValue method of the + * CSSStyleDeclaration interface. A + * CSSPrimitiveValue object only occurs in a context of a CSS + * property. + *

    Conversions are allowed between absolute values (from millimeters to + * centimeters, from degrees to radians, and so on) but not between relative + * values. (For example, a pixel value cannot be converted to a centimeter + * value.) Percentage values can't be converted since they are relative to + * the parent value (or another property value). There is one exception for + * color percentage values: since a color percentage value is relative to + * the range 0-255, a color percentage value can be converted to a number; + * (see also the RGBColor interface). *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSPrimitiveValue extends CSSValue { // UnitTypes /** - * The value is not a recognized CSS2 value. The value can only be + * The value is not a recognized CSS2 value. The value can only be * obtained by using the cssText attribute. */ public static final short CSS_UNKNOWN = 0; /** - * The value is a simple number. The value can be obtained by using the + * The value is a simple number. The value can be obtained by using the * getFloatValue method. */ public static final short CSS_NUMBER = 1; /** - * The value is a percentage. The value can be obtained by using the + * The value is a percentage. The value can be obtained by using the * getFloatValue method. */ public static final short CSS_PERCENTAGE = 2; /** - * The value is a length (ems). The value can be obtained by using the + * The value is a length (ems). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_EMS = 3; /** - * The value is a length (exs). The value can be obtained by using the + * The value is a length (exs). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_EXS = 4; /** - * The value is a length (px). The value can be obtained by using the + * The value is a length (px). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_PX = 5; /** - * The value is a length (cm). The value can be obtained by using the + * The value is a length (cm). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_CM = 6; /** - * The value is a length (mm). The value can be obtained by using the + * The value is a length (mm). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_MM = 7; /** - * The value is a length (in). The value can be obtained by using the + * The value is a length (in). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_IN = 8; /** - * The value is a length (pt). The value can be obtained by using the + * The value is a length (pt). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_PT = 9; /** - * The value is a length (pc). The value can be obtained by using the + * The value is a length (pc). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_PC = 10; /** - * The value is an angle (deg). The value can be obtained by using the + * The value is an angle (deg). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_DEG = 11; /** - * The value is an angle (rad). The value can be obtained by using the + * The value is an angle (rad). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_RAD = 12; /** - * The value is an angle (grad). The value can be obtained by using the + * The value is an angle (grad). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_GRAD = 13; /** - * The value is a time (ms). The value can be obtained by using the + * The value is a time (ms). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_MS = 14; /** - * The value is a time (s). The value can be obtained by using the + * The value is a time (s). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_S = 15; /** - * The value is a frequency (Hz). The value can be obtained by using the + * The value is a frequency (Hz). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_HZ = 16; /** - * The value is a frequency (kHz). The value can be obtained by using the + * The value is a frequency (kHz). The value can be obtained by using the * getFloatValue method. */ public static final short CSS_KHZ = 17; /** - * The value is a number with an unknown dimension. The value can be + * The value is a number with an unknown dimension. The value can be * obtained by using the getFloatValue method. */ public static final short CSS_DIMENSION = 18; /** - * The value is a STRING. The value can be obtained by using the + * The value is a STRING. The value can be obtained by using the * getStringValue method. */ public static final short CSS_STRING = 19; /** - * The value is a URI. The value can be obtained by using the + * The value is a URI. The value can be obtained by using the * getStringValue method. */ public static final short CSS_URI = 20; /** - * The value is an identifier. The value can be obtained by using the + * The value is an identifier. The value can be obtained by using the * getStringValue method. */ public static final short CSS_IDENT = 21; /** - * The value is a attribute function. The value can be obtained by using + * The value is a attribute function. The value can be obtained by using * the getStringValue method. */ public static final short CSS_ATTR = 22; /** - * The value is a counter or counters function. The value can be obtained + * The value is a counter or counters function. The value can be obtained * by using the getCounterValue method. */ public static final short CSS_COUNTER = 23; /** - * The value is a rect function. The value can be obtained by using the + * The value is a rect function. The value can be obtained by using the * getRectValue method. */ public static final short CSS_RECT = 24; /** - * The value is a RGB color. The value can be obtained by using the + * The value is a RGB color. The value can be obtained by using the * getRGBColorValue method. */ public static final short CSS_RGBCOLOR = 25; @@ -173,122 +173,122 @@ public interface CSSPrimitiveValue extends CSSValue { public short getPrimitiveType(); /** - * A method to set the float value with a specified unit. If the property - * attached with this value can not accept the specified unit or the - * float value, the value will be unchanged and a - * DOMException will be raised. - * @param unitType A unit code as defined above. The unit code can only - * be a float unit type (i.e. CSS_NUMBER, - * CSS_PERCENTAGE, CSS_EMS, - * CSS_EXS, CSS_PX, CSS_CM, - * CSS_MM, CSS_IN, CSS_PT, - * CSS_PC, CSS_DEG, CSS_RAD, - * CSS_GRAD, CSS_MS, CSS_S, - * CSS_HZ, CSS_KHZ, - * CSS_DIMENSION). - * @param floatValue The new float value. + * A method to set the float value with a specified unit. If the property + * attached with this value can not accept the specified unit or the + * float value, the value will be unchanged and a + * DOMException will be raised. + * @param unitType A unit code as defined above. The unit code can only + * be a float unit type (i.e. CSS_NUMBER, + * CSS_PERCENTAGE, CSS_EMS, + * CSS_EXS, CSS_PX, CSS_CM, + * CSS_MM, CSS_IN, CSS_PT, + * CSS_PC, CSS_DEG, CSS_RAD, + * CSS_GRAD, CSS_MS, CSS_S, + * CSS_HZ, CSS_KHZ, + * CSS_DIMENSION). + * @param floatValue The new float value. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the attached property doesn't support + * INVALID_ACCESS_ERR: Raised if the attached property doesn't support * the float value or the unit type. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ - public void setFloatValue(short unitType, + public void setFloatValue(short unitType, float floatValue) throws DOMException; /** - * This method is used to get a float value in a specified unit. If this - * CSS value doesn't contain a float value or can't be converted into - * the specified unit, a DOMException is raised. - * @param unitType A unit code to get the float value. The unit code can - * only be a float unit type (i.e. CSS_NUMBER, - * CSS_PERCENTAGE, CSS_EMS, - * CSS_EXS, CSS_PX, CSS_CM, - * CSS_MM, CSS_IN, CSS_PT, - * CSS_PC, CSS_DEG, CSS_RAD, - * CSS_GRAD, CSS_MS, CSS_S, - * CSS_HZ, CSS_KHZ, - * CSS_DIMENSION). - * @return The float value in the specified unit. + * This method is used to get a float value in a specified unit. If this + * CSS value doesn't contain a float value or can't be converted into + * the specified unit, a DOMException is raised. + * @param unitType A unit code to get the float value. The unit code can + * only be a float unit type (i.e. CSS_NUMBER, + * CSS_PERCENTAGE, CSS_EMS, + * CSS_EXS, CSS_PX, CSS_CM, + * CSS_MM, CSS_IN, CSS_PT, + * CSS_PC, CSS_DEG, CSS_RAD, + * CSS_GRAD, CSS_MS, CSS_S, + * CSS_HZ, CSS_KHZ, + * CSS_DIMENSION). + * @return The float value in the specified unit. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a float - * value or if the float value can't be converted into the specified - * unit. + * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a float + * value or if the float value can't be converted into the specified + * unit. */ public float getFloatValue(short unitType) throws DOMException; /** - * A method to set the string value with the specified unit. If the - * property attached to this value can't accept the specified unit or - * the string value, the value will be unchanged and a - * DOMException will be raised. - * @param stringType A string code as defined above. The string code can - * only be a string unit type (i.e. CSS_STRING, - * CSS_URI, CSS_IDENT, and - * CSS_ATTR). - * @param stringValue The new string value. + * A method to set the string value with the specified unit. If the + * property attached to this value can't accept the specified unit or + * the string value, the value will be unchanged and a + * DOMException will be raised. + * @param stringType A string code as defined above. The string code can + * only be a string unit type (i.e. CSS_STRING, + * CSS_URI, CSS_IDENT, and + * CSS_ATTR). + * @param stringValue The new string value. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string - * value or if the string value can't be converted into the specified + * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string + * value or if the string value can't be converted into the specified * unit. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this property is readonly. */ - public void setStringValue(short stringType, + public void setStringValue(short stringType, String stringValue) throws DOMException; /** - * This method is used to get the string value. If the CSS value doesn't - * contain a string value, a DOMException is raised. Some - * properties (like 'font-family' or 'voice-family') convert a - * whitespace separated list of idents to a string. - * @return The string value in the current unit. The current - * primitiveType can only be a string unit type (i.e. - * CSS_STRING, CSS_URI, - * CSS_IDENT and CSS_ATTR). + * This method is used to get the string value. If the CSS value doesn't + * contain a string value, a DOMException is raised. Some + * properties (like 'font-family' or 'voice-family') convert a + * whitespace separated list of idents to a string. + * @return The string value in the current unit. The current + * primitiveType can only be a string unit type (i.e. + * CSS_STRING, CSS_URI, + * CSS_IDENT and CSS_ATTR). * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string - * value. + * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a string + * value. */ public String getStringValue() throws DOMException; /** - * This method is used to get the Counter value. If this CSS value - * doesn't contain a counter value, a DOMException is - * raised. Modification to the corresponding style property can be - * achieved using the Counter interface. + * This method is used to get the Counter value. If this CSS value + * doesn't contain a counter value, a DOMException is + * raised. Modification to the corresponding style property can be + * achieved using the Counter interface. * @return The Counter value. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a - * Counter value (e.g. this is not CSS_COUNTER). + * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a + * Counter value (e.g. this is not CSS_COUNTER). */ public Counter getCounterValue() throws DOMException; /** - * This method is used to get the Rect value. If this CSS value doesn't - * contain a rect value, a DOMException is raised. - * Modification to the corresponding style property can be achieved - * using the Rect interface. + * This method is used to get the Rect value. If this CSS value doesn't + * contain a rect value, a DOMException is raised. + * Modification to the corresponding style property can be achieved + * using the Rect interface. * @return The Rect value. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a Rect - * value. (e.g. this is not CSS_RECT). + * INVALID_ACCESS_ERR: Raised if the CSS value doesn't contain a Rect + * value. (e.g. this is not CSS_RECT). */ public Rect getRectValue() throws DOMException; /** - * This method is used to get the RGB color. If this CSS value doesn't - * contain a RGB color value, a DOMException is raised. - * Modification to the corresponding style property can be achieved - * using the RGBColor interface. + * This method is used to get the RGB color. If this CSS value doesn't + * contain a RGB color value, a DOMException is raised. + * Modification to the corresponding style property can be achieved + * using the RGBColor interface. * @return the RGB color value. * @exception DOMException - * INVALID_ACCESS_ERR: Raised if the attached property can't return a - * RGB color value (e.g. this is not CSS_RGBCOLOR). + * INVALID_ACCESS_ERR: Raised if the attached property can't return a + * RGB color value (e.g. this is not CSS_RGBCOLOR). */ public RGBColor getRGBColorValue() throws DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRule.java index 788f946eca5..dfd98aed901 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRule.java @@ -15,11 +15,11 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSRule interface is the abstract base interface for any - * type of CSS statement. This includes both rule sets and at-rules. An - * implementation is expected to preserve all rules specified in a CSS style - * sheet, even if the rule is not recognized by the parser. Unrecognized - * rules are represented using the CSSUnknownRule interface. + * The CSSRule interface is the abstract base interface for any + * type of CSS statement. This includes both rule sets and at-rules. An + * implementation is expected to preserve all rules specified in a CSS style + * sheet, even if the rule is not recognized by the parser. Unrecognized + * rules are represented using the CSSUnknownRule interface. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ @@ -55,27 +55,27 @@ public interface CSSRule { public static final short PAGE_RULE = 6; /** - * The type of the rule, as defined above. The expectation is that - * binding-specific casting methods can be used to cast down from an - * instance of the CSSRule interface to the specific - * derived interface implied by the type. + * The type of the rule, as defined above. The expectation is that + * binding-specific casting methods can be used to cast down from an + * instance of the CSSRule interface to the specific + * derived interface implied by the type. */ public short getType(); /** - * The parsable textual representation of the rule. This reflects the - * current state of the rule and not its initial value. + * The parsable textual representation of the rule. This reflects the + * current state of the rule and not its initial value. */ public String getCssText(); /** - * The parsable textual representation of the rule. This reflects the - * current state of the rule and not its initial value. + * The parsable textual representation of the rule. This reflects the + * current state of the rule and not its initial value. * @exception DOMException - * SYNTAX_ERR: Raised if the specified CSS string value has a syntax + * SYNTAX_ERR: Raised if the specified CSS string value has a syntax * error and is unparsable. - *
    INVALID_MODIFICATION_ERR: Raised if the specified CSS string + *
    INVALID_MODIFICATION_ERR: Raised if the specified CSS string * value represents a different type of rule than the current one. - *
    HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at + *
    HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at * this point in the style sheet. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if the rule is readonly. */ @@ -83,14 +83,14 @@ public interface CSSRule { throws DOMException; /** - * The style sheet that contains this rule. + * The style sheet that contains this rule. */ public CSSStyleSheet getParentStyleSheet(); /** - * If this rule is contained inside another rule (e.g. a style rule - * inside an @media block), this is the containing rule. If this rule is - * not nested inside any other rules, this returns null. + * If this rule is contained inside another rule (e.g. a style rule + * inside an @media block), this is the containing rule. If this rule is + * not nested inside any other rules, this returns null. */ public CSSRule getParentRule(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java index 41c2c68377c..b875210cccd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSRuleList.java @@ -13,30 +13,30 @@ package org.w3c.dom.css; /** - * The CSSRuleList interface provides the abstraction of an - * ordered collection of CSS rules. - *

    The items in the CSSRuleList are accessible via an - * integral index, starting from 0. + * The CSSRuleList interface provides the abstraction of an + * ordered collection of CSS rules. + *

    The items in the CSSRuleList are accessible via an + * integral index, starting from 0. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSRuleList { /** - * The number of CSSRules in the list. The range of valid - * child rule indices is 0 to length-1 - * inclusive. + * The number of CSSRules in the list. The range of valid + * child rule indices is 0 to length-1 + * inclusive. */ public int getLength(); /** - * Used to retrieve a CSS rule by ordinal index. The order in this - * collection represents the order of the rules in the CSS style sheet. - * If index is greater than or equal to the number of rules in the list, - * this returns null. + * Used to retrieve a CSS rule by ordinal index. The order in this + * collection represents the order of the rules in the CSS style sheet. + * If index is greater than or equal to the number of rules in the list, + * this returns null. * @param index Index into the collection - * @return The style rule at the index position in the - * CSSRuleList, or null if that is not a - * valid index. + * @return The style rule at the index position in the + * CSSRuleList, or null if that is not a + * valid index. */ public CSSRule item(int index); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java index e5e346b0a71..91b9d9adf02 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleDeclaration.java @@ -15,147 +15,147 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSStyleDeclaration interface represents a single CSS - * declaration block. This interface may be used to determine the style - * properties currently set in a block or to set style properties explicitly - * within the block. - *

    While an implementation may not recognize all CSS properties within a - * CSS declaration block, it is expected to provide access to all specified + * The CSSStyleDeclaration interface represents a single CSS + * declaration block. This interface may be used to determine the style + * properties currently set in a block or to set style properties explicitly + * within the block. + *

    While an implementation may not recognize all CSS properties within a + * CSS declaration block, it is expected to provide access to all specified * properties in the style sheet through the CSSStyleDeclaration - * interface. Furthermore, implementations that support a specific level of - * CSS should correctly handle CSS shorthand properties for that level. For - * a further discussion of shorthand properties, see the - * CSS2Properties interface. - *

    This interface is also used to provide a read-only access to the - * computed values of an element. See also the ViewCSS - * interface. The CSS Object Model doesn't provide an access to the - * specified or actual values of the CSS cascade. + * interface. Furthermore, implementations that support a specific level of + * CSS should correctly handle CSS shorthand properties for that level. For + * a further discussion of shorthand properties, see the + * CSS2Properties interface. + *

    This interface is also used to provide a read-only access to the + * computed values of an element. See also the ViewCSS + * interface. The CSS Object Model doesn't provide an access to the + * specified or actual values of the CSS cascade. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSStyleDeclaration { /** - * The parsable textual representation of the declaration block - * (excluding the surrounding curly braces). Setting this attribute will - * result in the parsing of the new value and resetting of all the - * properties in the declaration block including the removal or addition - * of properties. + * The parsable textual representation of the declaration block + * (excluding the surrounding curly braces). Setting this attribute will + * result in the parsing of the new value and resetting of all the + * properties in the declaration block including the removal or addition + * of properties. */ public String getCssText(); /** - * The parsable textual representation of the declaration block - * (excluding the surrounding curly braces). Setting this attribute will - * result in the parsing of the new value and resetting of all the - * properties in the declaration block including the removal or addition - * of properties. + * The parsable textual representation of the declaration block + * (excluding the surrounding curly braces). Setting this attribute will + * result in the parsing of the new value and resetting of all the + * properties in the declaration block including the removal or addition + * of properties. * @exception DOMException - * SYNTAX_ERR: Raised if the specified CSS string value has a syntax + * SYNTAX_ERR: Raised if the specified CSS string value has a syntax * error and is unparsable. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is * readonly or a property is readonly. */ public void setCssText(String cssText) throws DOMException; /** - * Used to retrieve the value of a CSS property if it has been explicitly - * set within this declaration block. - * @param propertyName The name of the CSS property. See the CSS - * property index. - * @return Returns the value of the property if it has been explicitly - * set for this declaration block. Returns the empty string if the - * property has not been set. + * Used to retrieve the value of a CSS property if it has been explicitly + * set within this declaration block. + * @param propertyName The name of the CSS property. See the CSS + * property index. + * @return Returns the value of the property if it has been explicitly + * set for this declaration block. Returns the empty string if the + * property has not been set. */ public String getPropertyValue(String propertyName); /** - * Used to retrieve the object representation of the value of a CSS - * property if it has been explicitly set within this declaration block. - * This method returns null if the property is a shorthand - * property. Shorthand property values can only be accessed and modified - * as strings, using the getPropertyValue and - * setProperty methods. - * @param propertyName The name of the CSS property. See the CSS - * property index. - * @return Returns the value of the property if it has been explicitly - * set for this declaration block. Returns null if the - * property has not been set. + * Used to retrieve the object representation of the value of a CSS + * property if it has been explicitly set within this declaration block. + * This method returns null if the property is a shorthand + * property. Shorthand property values can only be accessed and modified + * as strings, using the getPropertyValue and + * setProperty methods. + * @param propertyName The name of the CSS property. See the CSS + * property index. + * @return Returns the value of the property if it has been explicitly + * set for this declaration block. Returns null if the + * property has not been set. */ public CSSValue getPropertyCSSValue(String propertyName); /** - * Used to remove a CSS property if it has been explicitly set within - * this declaration block. - * @param propertyName The name of the CSS property. See the CSS - * property index. - * @return Returns the value of the property if it has been explicitly - * set for this declaration block. Returns the empty string if the - * property has not been set or the property name does not correspond - * to a known CSS property. + * Used to remove a CSS property if it has been explicitly set within + * this declaration block. + * @param propertyName The name of the CSS property. See the CSS + * property index. + * @return Returns the value of the property if it has been explicitly + * set for this declaration block. Returns the empty string if the + * property has not been set or the property name does not correspond + * to a known CSS property. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is readonly + * NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is readonly * or the property is readonly. */ public String removeProperty(String propertyName) throws DOMException; /** - * Used to retrieve the priority of a CSS property (e.g. the - * "important" qualifier) if the priority has been - * explicitly set in this declaration block. - * @param propertyName The name of the CSS property. See the CSS - * property index. - * @return A string representing the priority (e.g. - * "important") if the property has been explicitly set - * in this declaration block and has a priority specified. The empty - * string otherwise. + * Used to retrieve the priority of a CSS property (e.g. the + * "important" qualifier) if the priority has been + * explicitly set in this declaration block. + * @param propertyName The name of the CSS property. See the CSS + * property index. + * @return A string representing the priority (e.g. + * "important") if the property has been explicitly set + * in this declaration block and has a priority specified. The empty + * string otherwise. */ public String getPropertyPriority(String propertyName); /** - * Used to set a property value and priority within this declaration - * block. setProperty permits to modify a property or add a - * new one in the declaration block. Any call to this method may modify + * Used to set a property value and priority within this declaration + * block. setProperty permits to modify a property or add a + * new one in the declaration block. Any call to this method may modify * the order of properties in the item method. - * @param propertyName The name of the CSS property. See the CSS - * property index. - * @param value The new value of the property. - * @param priority The new priority of the property (e.g. - * "important") or the empty string if none. + * @param propertyName The name of the CSS property. See the CSS + * property index. + * @param value The new value of the property. + * @param priority The new priority of the property (e.g. + * "important") or the empty string if none. * @exception DOMException - * SYNTAX_ERR: Raised if the specified value has a syntax error and is + * SYNTAX_ERR: Raised if the specified value has a syntax error and is * unparsable. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this declaration is * readonly or the property is readonly. */ - public void setProperty(String propertyName, - String value, + public void setProperty(String propertyName, + String value, String priority) throws DOMException; /** - * The number of properties that have been explicitly set in this - * declaration block. The range of valid indices is 0 to length-1 - * inclusive. + * The number of properties that have been explicitly set in this + * declaration block. The range of valid indices is 0 to length-1 + * inclusive. */ public int getLength(); /** - * Used to retrieve the properties that have been explicitly set in this - * declaration block. The order of the properties retrieved using this - * method does not have to be the order in which they were set. This - * method can be used to iterate over all properties in this declaration - * block. - * @param index Index of the property name to retrieve. - * @return The name of the property at this ordinal position. The empty - * string if no property exists at this position. + * Used to retrieve the properties that have been explicitly set in this + * declaration block. The order of the properties retrieved using this + * method does not have to be the order in which they were set. This + * method can be used to iterate over all properties in this declaration + * block. + * @param index Index of the property name to retrieve. + * @return The name of the property at this ordinal position. The empty + * string if no property exists at this position. */ public String item(int index); /** - * The CSS rule that contains this declaration block or null - * if this CSSStyleDeclaration is not attached to a - * CSSRule. + * The CSS rule that contains this declaration block or null + * if this CSSStyleDeclaration is not attached to a + * CSSRule. */ public CSSRule getParentRule(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java index 626f3224b4c..e7377dcbee9 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleRule.java @@ -15,24 +15,24 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSStyleRule interface represents a single rule set in a - * CSS style sheet. + * The CSSStyleRule interface represents a single rule set in a + * CSS style sheet. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSStyleRule extends CSSRule { /** - * The textual representation of the selector for the rule set. The - * implementation may have stripped out insignificant whitespace while - * parsing the selector. + * The textual representation of the selector for the rule set. The + * implementation may have stripped out insignificant whitespace while + * parsing the selector. */ public String getSelectorText(); /** - * The textual representation of the selector for the rule set. The - * implementation may have stripped out insignificant whitespace while - * parsing the selector. + * The textual representation of the selector for the rule set. The + * implementation may have stripped out insignificant whitespace while + * parsing the selector. * @exception DOMException - * SYNTAX_ERR: Raised if the specified CSS string value has a syntax + * SYNTAX_ERR: Raised if the specified CSS string value has a syntax * error and is unparsable. *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this rule is readonly. */ @@ -40,7 +40,7 @@ public interface CSSStyleRule extends CSSRule { throws DOMException; /** - * The declaration-block of this rule set. + * The declaration-block of this rule set. */ public CSSStyleDeclaration getStyle(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java index b529e5db089..c9538e436df 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSStyleSheet.java @@ -16,67 +16,67 @@ import org.w3c.dom.DOMException; import org.w3c.dom.stylesheets.StyleSheet; /** - * The CSSStyleSheet interface is a concrete interface used to - * represent a CSS style sheet i.e., a style sheet whose content type is - * "text/css". + * The CSSStyleSheet interface is a concrete interface used to + * represent a CSS style sheet i.e., a style sheet whose content type is + * "text/css". *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSStyleSheet extends StyleSheet { /** - * If this style sheet comes from an @import rule, the - * ownerRule attribute will contain the - * CSSImportRule. In that case, the ownerNode - * attribute in the StyleSheet interface will be - * null. If the style sheet comes from an element or a - * processing instruction, the ownerRule attribute will be - * null and the ownerNode attribute will - * contain the Node. + * If this style sheet comes from an @import rule, the + * ownerRule attribute will contain the + * CSSImportRule. In that case, the ownerNode + * attribute in the StyleSheet interface will be + * null. If the style sheet comes from an element or a + * processing instruction, the ownerRule attribute will be + * null and the ownerNode attribute will + * contain the Node. */ public CSSRule getOwnerRule(); /** - * The list of all CSS rules contained within the style sheet. This - * includes both rule sets and at-rules. + * The list of all CSS rules contained within the style sheet. This + * includes both rule sets and at-rules. */ public CSSRuleList getCssRules(); /** - * Used to insert a new rule into the style sheet. The new rule now - * becomes part of the cascade. - * @param rule The parsable text representing the rule. For rule sets - * this contains both the selector and the style declaration. For - * at-rules, this specifies both the at-identifier and the rule - * content. - * @param index The index within the style sheet's rule list of the rule - * before which to insert the specified rule. If the specified index - * is equal to the length of the style sheet's rule collection, the - * rule will be added to the end of the style sheet. - * @return The index within the style sheet's rule collection of the - * newly inserted rule. + * Used to insert a new rule into the style sheet. The new rule now + * becomes part of the cascade. + * @param rule The parsable text representing the rule. For rule sets + * this contains both the selector and the style declaration. For + * at-rules, this specifies both the at-identifier and the rule + * content. + * @param index The index within the style sheet's rule list of the rule + * before which to insert the specified rule. If the specified index + * is equal to the length of the style sheet's rule collection, the + * rule will be added to the end of the style sheet. + * @return The index within the style sheet's rule collection of the + * newly inserted rule. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the - * specified index e.g. if an @import rule is inserted + * HIERARCHY_REQUEST_ERR: Raised if the rule cannot be inserted at the + * specified index e.g. if an @import rule is inserted * after a standard rule set or other at-rule. - *
    INDEX_SIZE_ERR: Raised if the specified index is not a valid + *
    INDEX_SIZE_ERR: Raised if the specified index is not a valid * insertion point. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is * readonly. - *
    SYNTAX_ERR: Raised if the specified rule has a syntax error and + *
    SYNTAX_ERR: Raised if the specified rule has a syntax error and * is unparsable. */ - public int insertRule(String rule, + public int insertRule(String rule, int index) throws DOMException; /** - * Used to delete a rule from the style sheet. - * @param index The index within the style sheet's rule list of the rule - * to remove. + * Used to delete a rule from the style sheet. + * @param index The index within the style sheet's rule list of the rule + * to remove. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index does not correspond to + * INDEX_SIZE_ERR: Raised if the specified index does not correspond to * a rule in the style sheet's rule list. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this style sheet is * readonly. */ public void deleteRule(int index) diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java index 763d5f1b61f..d01c1ac2789 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSUnknownRule.java @@ -13,8 +13,8 @@ package org.w3c.dom.css; /** - * The CSSUnknownRule interface represents an at-rule not - * supported by this user agent. + * The CSSUnknownRule interface represents an at-rule not + * supported by this user agent. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValue.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValue.java index 0285bcc7721..3a43a17f1d2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValue.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValue.java @@ -15,9 +15,9 @@ package org.w3c.dom.css; import org.w3c.dom.DOMException; /** - * The CSSValue interface represents a simple or a complex - * value. A CSSValue object only occurs in a context of a CSS - * property. + * The CSSValue interface represents a simple or a complex + * value. A CSSValue object only occurs in a context of a CSS + * property. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ @@ -28,16 +28,16 @@ public interface CSSValue { */ public static final short CSS_INHERIT = 0; /** - * The value is a primitive value and an instance of the - * CSSPrimitiveValue interface can be obtained by using - * binding-specific casting methods on this instance of the + * The value is a primitive value and an instance of the + * CSSPrimitiveValue interface can be obtained by using + * binding-specific casting methods on this instance of the * CSSValue interface. */ public static final short CSS_PRIMITIVE_VALUE = 1; /** - * The value is a CSSValue list and an instance of the - * CSSValueList interface can be obtained by using - * binding-specific casting methods on this instance of the + * The value is a CSSValue list and an instance of the + * CSSValueList interface can be obtained by using + * binding-specific casting methods on this instance of the * CSSValue interface. */ public static final short CSS_VALUE_LIST = 2; @@ -47,24 +47,24 @@ public interface CSSValue { public static final short CSS_CUSTOM = 3; /** - * A string representation of the current value. + * A string representation of the current value. */ public String getCssText(); /** - * A string representation of the current value. + * A string representation of the current value. * @exception DOMException - * SYNTAX_ERR: Raised if the specified CSS string value has a syntax - * error (according to the attached property) or is unparsable. - *
    INVALID_MODIFICATION_ERR: Raised if the specified CSS string - * value represents a different type of values than the values allowed + * SYNTAX_ERR: Raised if the specified CSS string value has a syntax + * error (according to the attached property) or is unparsable. + *
    INVALID_MODIFICATION_ERR: Raised if the specified CSS string + * value represents a different type of values than the values allowed * by the CSS property. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this value is readonly. + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this value is readonly. */ public void setCssText(String cssText) throws DOMException; /** - * A code defining the type of the value as defined above. + * A code defining the type of the value as defined above. */ public short getCssValueType(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValueList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValueList.java index bf15bb3ebfd..4e29bfa3f84 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValueList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/CSSValueList.java @@ -13,32 +13,32 @@ package org.w3c.dom.css; /** - * The CSSValueList interface provides the abstraction of an + * The CSSValueList interface provides the abstraction of an * ordered collection of CSS values. - *

    Some properties allow an empty list into their syntax. In that case, - * these properties take the none identifier. So, an empty list - * means that the property has the value none. - *

    The items in the CSSValueList are accessible via an - * integral index, starting from 0. + *

    Some properties allow an empty list into their syntax. In that case, + * these properties take the none identifier. So, an empty list + * means that the property has the value none. + *

    The items in the CSSValueList are accessible via an + * integral index, starting from 0. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface CSSValueList extends CSSValue { /** - * The number of CSSValues in the list. The range of valid - * values of the indices is 0 to length-1 + * The number of CSSValues in the list. The range of valid + * values of the indices is 0 to length-1 * inclusive. */ public int getLength(); /** - * Used to retrieve a CSSValue by ordinal index. The order in - * this collection represents the order of the values in the CSS style - * property. If index is greater than or equal to the number of values + * Used to retrieve a CSSValue by ordinal index. The order in + * this collection represents the order of the values in the CSS style + * property. If index is greater than or equal to the number of values * in the list, this returns null. * @param index Index into the collection. - * @return The CSSValue at the index position - * in the CSSValueList, or null if that is + * @return The CSSValue at the index position + * in the CSSValueList, or null if that is * not a valid index. */ public CSSValue item(int index); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Counter.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Counter.java index 8cd4967b32d..7bfcc79f8bd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Counter.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Counter.java @@ -13,25 +13,25 @@ package org.w3c.dom.css; /** - * The Counter interface is used to represent any counter or - * counters function value. This interface reflects the values in the - * underlying style property. + * The Counter interface is used to represent any counter or + * counters function value. This interface reflects the values in the + * underlying style property. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface Counter { /** - * This attribute is used for the identifier of the counter. + * This attribute is used for the identifier of the counter. */ public String getIdentifier(); /** - * This attribute is used for the style of the list. + * This attribute is used for the style of the list. */ public String getListStyle(); /** - * This attribute is used for the separator of the nested counters. + * This attribute is used for the separator of the nested counters. */ public String getSeparator(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java index 65c97291ef4..90c6c135d6e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DOMImplementationCSS.java @@ -16,24 +16,24 @@ import org.w3c.dom.DOMImplementation; import org.w3c.dom.DOMException; /** - * This interface allows the DOM user to create a CSSStyleSheet - * outside the context of a document. There is no way to associate the new - * CSSStyleSheet with a document in DOM Level 2. + * This interface allows the DOM user to create a CSSStyleSheet + * outside the context of a document. There is no way to associate the new + * CSSStyleSheet with a document in DOM Level 2. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface DOMImplementationCSS extends DOMImplementation { /** * Creates a new CSSStyleSheet. - * @param title The advisory title. See also the section. - * @param media The comma-separated list of media associated with the - * new style sheet. See also the section. + * @param title The advisory title. See also the section. + * @param media The comma-separated list of media associated with the + * new style sheet. See also the section. * @return A new CSS style sheet. * @exception DOMException - * SYNTAX_ERR: Raised if the specified media string value has a syntax - * error and is unparsable. + * SYNTAX_ERR: Raised if the specified media string value has a syntax + * error and is unparsable. */ - public CSSStyleSheet createCSSStyleSheet(String title, + public CSSStyleSheet createCSSStyleSheet(String title, String media) throws DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java index 8fe93c79a7e..68a91075454 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/DocumentCSS.java @@ -17,34 +17,34 @@ import org.w3c.dom.stylesheets.DocumentStyle; /** * This interface represents a document with a CSS view. - *

    The getOverrideStyle method provides a mechanism through - * which a DOM author could effect immediate change to the style of an - * element without modifying the explicitly linked style sheets of a - * document or the inline style of elements in the style sheets. This style - * sheet comes after the author style sheet in the cascade algorithm and is - * called override style sheet. The override style sheet takes precedence - * over author style sheets. An "!important" declaration still takes - * precedence over a normal declaration. Override, author, and user style - * sheets all may contain "!important" declarations. User "!important" rules - * take precedence over both override and author "!important" rules, and - * override "!important" rules take precedence over author "!important" - * rules. - *

    The expectation is that an instance of the DocumentCSS - * interface can be obtained by using binding-specific casting methods on an - * instance of the Document interface. + *

    The getOverrideStyle method provides a mechanism through + * which a DOM author could effect immediate change to the style of an + * element without modifying the explicitly linked style sheets of a + * document or the inline style of elements in the style sheets. This style + * sheet comes after the author style sheet in the cascade algorithm and is + * called override style sheet. The override style sheet takes precedence + * over author style sheets. An "!important" declaration still takes + * precedence over a normal declaration. Override, author, and user style + * sheets all may contain "!important" declarations. User "!important" rules + * take precedence over both override and author "!important" rules, and + * override "!important" rules take precedence over author "!important" + * rules. + *

    The expectation is that an instance of the DocumentCSS + * interface can be obtained by using binding-specific casting methods on an + * instance of the Document interface. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface DocumentCSS extends DocumentStyle { /** - * This method is used to retrieve the override style declaration for a - * specified element and a specified pseudo-element. - * @param elt The element whose style is to be modified. This parameter - * cannot be null. - * @param pseudoElt The pseudo-element or null if none. - * @return The override style declaration. + * This method is used to retrieve the override style declaration for a + * specified element and a specified pseudo-element. + * @param elt The element whose style is to be modified. This parameter + * cannot be null. + * @param pseudoElt The pseudo-element or null if none. + * @return The override style declaration. */ - public CSSStyleDeclaration getOverrideStyle(Element elt, + public CSSStyleDeclaration getOverrideStyle(Element elt, String pseudoElt); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java index 98b60bf9ddf..e1f25060c24 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ElementCSSInlineStyle.java @@ -13,19 +13,19 @@ package org.w3c.dom.css; /** - * Inline style information attached to elements is exposed through the - * style attribute. This represents the contents of the STYLE - * attribute for HTML elements (or elements in other schemas or DTDs which - * use the STYLE attribute in the same way). The expectation is that an - * instance of the ElementCSSInlineStyle interface can be obtained by using - * binding-specific casting methods on an instance of the Element interface - * when the element supports inline CSS style informations. + * Inline style information attached to elements is exposed through the + * style attribute. This represents the contents of the STYLE + * attribute for HTML elements (or elements in other schemas or DTDs which + * use the STYLE attribute in the same way). The expectation is that an + * instance of the ElementCSSInlineStyle interface can be obtained by using + * binding-specific casting methods on an instance of the Element interface + * when the element supports inline CSS style informations. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface ElementCSSInlineStyle { /** - * The style attribute. + * The style attribute. */ public CSSStyleDeclaration getStyle(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/RGBColor.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/RGBColor.java index cd5daa56703..215e291da86 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/RGBColor.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/RGBColor.java @@ -13,34 +13,34 @@ package org.w3c.dom.css; /** - * The RGBColor interface is used to represent any RGB color - * value. This interface reflects the values in the underlying style - * property. Hence, modifications made to the CSSPrimitiveValue - * objects modify the style property. - *

    A specified RGB color is not clipped (even if the number is outside the - * range 0-255 or 0%-100%). A computed RGB color is clipped depending on the - * device. - *

    Even if a style sheet can only contain an integer for a color value, - * the internal storage of this integer is a float, and this can be used as - * a float in the specified or the computed style. - *

    A color percentage value can always be converted to a number and vice - * versa. + * The RGBColor interface is used to represent any RGB color + * value. This interface reflects the values in the underlying style + * property. Hence, modifications made to the CSSPrimitiveValue + * objects modify the style property. + *

    A specified RGB color is not clipped (even if the number is outside the + * range 0-255 or 0%-100%). A computed RGB color is clipped depending on the + * device. + *

    Even if a style sheet can only contain an integer for a color value, + * the internal storage of this integer is a float, and this can be used as + * a float in the specified or the computed style. + *

    A color percentage value can always be converted to a number and vice + * versa. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface RGBColor { /** - * This attribute is used for the red value of the RGB color. + * This attribute is used for the red value of the RGB color. */ public CSSPrimitiveValue getRed(); /** - * This attribute is used for the green value of the RGB color. + * This attribute is used for the green value of the RGB color. */ public CSSPrimitiveValue getGreen(); /** - * This attribute is used for the blue value of the RGB color. + * This attribute is used for the blue value of the RGB color. */ public CSSPrimitiveValue getBlue(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Rect.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Rect.java index f5efb1084d9..ffbf9654773 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Rect.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/Rect.java @@ -13,31 +13,31 @@ package org.w3c.dom.css; /** - * The Rect interface is used to represent any rect value. This - * interface reflects the values in the underlying style property. Hence, - * modifications made to the CSSPrimitiveValue objects modify - * the style property. + * The Rect interface is used to represent any rect value. This + * interface reflects the values in the underlying style property. Hence, + * modifications made to the CSSPrimitiveValue objects modify + * the style property. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface Rect { /** - * This attribute is used for the top of the rect. + * This attribute is used for the top of the rect. */ public CSSPrimitiveValue getTop(); /** - * This attribute is used for the right of the rect. + * This attribute is used for the right of the rect. */ public CSSPrimitiveValue getRight(); /** - * This attribute is used for the bottom of the rect. + * This attribute is used for the bottom of the rect. */ public CSSPrimitiveValue getBottom(); /** - * This attribute is used for the left of the rect. + * This attribute is used for the left of the rect. */ public CSSPrimitiveValue getLeft(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ViewCSS.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ViewCSS.java index 76b585a54d2..1db9ac44c9f 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ViewCSS.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/css/ViewCSS.java @@ -16,28 +16,28 @@ import org.w3c.dom.Element; import org.w3c.dom.views.AbstractView; /** - * This interface represents a CSS view. The getComputedStyle - * method provides a read only access to the computed values of an element. - *

    The expectation is that an instance of the ViewCSS - * interface can be obtained by using binding-specific casting methods on an - * instance of the AbstractView interface. - *

    Since a computed style is related to an Element node, if - * this element is removed from the document, the associated - * CSSStyleDeclaration and CSSValue related to - * this declaration are no longer valid. + * This interface represents a CSS view. The getComputedStyle + * method provides a read only access to the computed values of an element. + *

    The expectation is that an instance of the ViewCSS + * interface can be obtained by using binding-specific casting methods on an + * instance of the AbstractView interface. + *

    Since a computed style is related to an Element node, if + * this element is removed from the document, the associated + * CSSStyleDeclaration and CSSValue related to + * this declaration are no longer valid. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface ViewCSS extends AbstractView { /** - * This method is used to get the computed style as it is defined in [CSS2]. - * @param elt The element whose style is to be computed. This parameter - * cannot be null. - * @param pseudoElt The pseudo-element or null if none. - * @return The computed style. The CSSStyleDeclaration is - * read-only and contains only absolute values. + * This method is used to get the computed style as it is defined in [CSS2]. + * @param elt The element whose style is to be computed. This parameter + * cannot be null. + * @param pseudoElt The pseudo-element or null if none. + * @return The computed style. The CSSStyleDeclaration is + * read-only and contains only absolute values. */ - public CSSStyleDeclaration getComputedStyle(Element elt, + public CSSStyleDeclaration getComputedStyle(Element elt, String pseudoElt); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java index 76644bc5a3d..55c838603ee 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/DocumentEvent.java @@ -15,39 +15,39 @@ package org.w3c.dom.events; import org.w3c.dom.DOMException; /** - * The DocumentEvent interface provides a mechanism by which the - * user can create an Event of a type supported by the implementation. It is - * expected that the DocumentEvent interface will be - * implemented on the same object which implements the Document - * interface in an implementation which supports the Event model. + * The DocumentEvent interface provides a mechanism by which the + * user can create an Event of a type supported by the implementation. It is + * expected that the DocumentEvent interface will be + * implemented on the same object which implements the Document + * interface in an implementation which supports the Event model. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ public interface DocumentEvent { /** - * - * @param eventType The eventType parameter specifies the - * type of Event interface to be created. If the - * Event interface specified is supported by the - * implementation this method will return a new Event of - * the interface type requested. If the Event is to be - * dispatched via the dispatchEvent method the - * appropriate event init method must be called after creation in - * order to initialize the Event's values. As an example, - * a user wishing to synthesize some kind of UIEvent - * would call createEvent with the parameter "UIEvents". - * The initUIEvent method could then be called on the - * newly created UIEvent to set the specific type of - * UIEvent to be dispatched and set its context information.The - * createEvent method is used in creating - * Events when it is either inconvenient or unnecessary - * for the user to create an Event themselves. In cases - * where the implementation provided Event is - * insufficient, users may supply their own Event + * + * @param eventType The eventType parameter specifies the + * type of Event interface to be created. If the + * Event interface specified is supported by the + * implementation this method will return a new Event of + * the interface type requested. If the Event is to be + * dispatched via the dispatchEvent method the + * appropriate event init method must be called after creation in + * order to initialize the Event's values. As an example, + * a user wishing to synthesize some kind of UIEvent + * would call createEvent with the parameter "UIEvents". + * The initUIEvent method could then be called on the + * newly created UIEvent to set the specific type of + * UIEvent to be dispatched and set its context information.The + * createEvent method is used in creating + * Events when it is either inconvenient or unnecessary + * for the user to create an Event themselves. In cases + * where the implementation provided Event is + * insufficient, users may supply their own Event * implementations for use with the dispatchEvent method. * @return The newly created Event * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the implementation does not support the + * NOT_SUPPORTED_ERR: Raised if the implementation does not support the * type of Event interface requested */ public Event createEvent(String eventType) diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/Event.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/Event.java index 14a9239ed76..29a96c50ac2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/Event.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/Event.java @@ -13,14 +13,14 @@ package org.w3c.dom.events; /** - * The Event interface is used to provide contextual information - * about an event to the handler processing the event. An object which - * implements the Event interface is generally passed as the - * first parameter to an event handler. More specific context information is - * passed to event handlers by deriving additional interfaces from - * Event which contain information directly relating to the - * type of event they accompany. These derived interfaces are also - * implemented by the object passed to the event listener. + * The Event interface is used to provide contextual information + * about an event to the handler processing the event. An object which + * implements the Event interface is generally passed as the + * first parameter to an event handler. More specific context information is + * passed to event handlers by deriving additional interfaces from + * Event which contain information directly relating to the + * type of event they accompany. These derived interfaces are also + * implemented by the object passed to the event listener. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ @@ -31,7 +31,7 @@ public interface Event { */ public static final short CAPTURING_PHASE = 1; /** - * The event is currently being evaluated at the target + * The event is currently being evaluated at the target * EventTarget. */ public static final short AT_TARGET = 2; @@ -46,96 +46,96 @@ public interface Event { public String getType(); /** - * Used to indicate the EventTarget to which the event was - * originally dispatched. + * Used to indicate the EventTarget to which the event was + * originally dispatched. */ public EventTarget getTarget(); /** - * Used to indicate the EventTarget whose - * EventListeners are currently being processed. This is - * particularly useful during capturing and bubbling. + * Used to indicate the EventTarget whose + * EventListeners are currently being processed. This is + * particularly useful during capturing and bubbling. */ public EventTarget getCurrentTarget(); /** - * Used to indicate which phase of event flow is currently being - * evaluated. + * Used to indicate which phase of event flow is currently being + * evaluated. */ public short getEventPhase(); /** - * Used to indicate whether or not an event is a bubbling event. If the - * event can bubble the value is true, else the value is false. + * Used to indicate whether or not an event is a bubbling event. If the + * event can bubble the value is true, else the value is false. */ public boolean getBubbles(); /** - * Used to indicate whether or not an event can have its default action - * prevented. If the default action can be prevented the value is true, - * else the value is false. + * Used to indicate whether or not an event can have its default action + * prevented. If the default action can be prevented the value is true, + * else the value is false. */ public boolean getCancelable(); /** - * Used to specify the time (in milliseconds relative to the epoch) at - * which the event was created. Due to the fact that some systems may - * not provide this information the value of timeStamp may - * be not available for all events. When not available, a value of 0 - * will be returned. Examples of epoch time are the time of the system - * start or 0:0:0 UTC 1st January 1970. + * Used to specify the time (in milliseconds relative to the epoch) at + * which the event was created. Due to the fact that some systems may + * not provide this information the value of timeStamp may + * be not available for all events. When not available, a value of 0 + * will be returned. Examples of epoch time are the time of the system + * start or 0:0:0 UTC 1st January 1970. */ public long getTimeStamp(); /** - * The stopPropagation method is used prevent further - * propagation of an event during event flow. If this method is called - * by any EventListener the event will cease propagating - * through the tree. The event will complete dispatch to all listeners - * on the current EventTarget before event flow stops. This + * The stopPropagation method is used prevent further + * propagation of an event during event flow. If this method is called + * by any EventListener the event will cease propagating + * through the tree. The event will complete dispatch to all listeners + * on the current EventTarget before event flow stops. This * method may be used during any stage of event flow. */ public void stopPropagation(); /** - * If an event is cancelable, the preventDefault method is - * used to signify that the event is to be canceled, meaning any default - * action normally taken by the implementation as a result of the event - * will not occur. If, during any stage of event flow, the - * preventDefault method is called the event is canceled. - * Any default action associated with the event will not occur. Calling - * this method for a non-cancelable event has no effect. Once - * preventDefault has been called it will remain in effect - * throughout the remainder of the event's propagation. This method may - * be used during any stage of event flow. + * If an event is cancelable, the preventDefault method is + * used to signify that the event is to be canceled, meaning any default + * action normally taken by the implementation as a result of the event + * will not occur. If, during any stage of event flow, the + * preventDefault method is called the event is canceled. + * Any default action associated with the event will not occur. Calling + * this method for a non-cancelable event has no effect. Once + * preventDefault has been called it will remain in effect + * throughout the remainder of the event's propagation. This method may + * be used during any stage of event flow. */ public void preventDefault(); /** - * The initEvent method is used to initialize the value of an - * Event created through the DocumentEvent - * interface. This method may only be called before the - * Event has been dispatched via the - * dispatchEvent method, though it may be called multiple - * times during that phase if necessary. If called multiple times the - * final invocation takes precedence. If called from a subclass of - * Event interface only the values specified in the - * initEvent method are modified, all other attributes are + * The initEvent method is used to initialize the value of an + * Event created through the DocumentEvent + * interface. This method may only be called before the + * Event has been dispatched via the + * dispatchEvent method, though it may be called multiple + * times during that phase if necessary. If called multiple times the + * final invocation takes precedence. If called from a subclass of + * Event interface only the values specified in the + * initEvent method are modified, all other attributes are * left unchanged. - * @param eventTypeArg Specifies the event type. This type may be any - * event type currently defined in this specification or a new event - * type.. The string must be an XML name. Any new event type must not - * begin with any upper, lower, or mixed case version of the string - * "DOM". This prefix is reserved for future DOM event sets. It is - * also strongly recommended that third parties adding their own - * events use their own prefix to avoid confusion and lessen the + * @param eventTypeArg Specifies the event type. This type may be any + * event type currently defined in this specification or a new event + * type.. The string must be an XML name. Any new event type must not + * begin with any upper, lower, or mixed case version of the string + * "DOM". This prefix is reserved for future DOM event sets. It is + * also strongly recommended that third parties adding their own + * events use their own prefix to avoid confusion and lessen the * probability of conflicts with other new events. * @param canBubbleArg Specifies whether or not the event can bubble. - * @param cancelableArg Specifies whether or not the event's default + * @param cancelableArg Specifies whether or not the event's default * action can be prevented. */ - public void initEvent(String eventTypeArg, - boolean canBubbleArg, + public void initEvent(String eventTypeArg, + boolean canBubbleArg, boolean cancelableArg); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventException.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventException.java index 7a6ff262052..9a62f1fc51d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventException.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventException.java @@ -13,8 +13,8 @@ package org.w3c.dom.events; /** - * Event operations may throw an EventException as specified in - * their method descriptions. + * Event operations may throw an EventException as specified in + * their method descriptions. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ @@ -26,10 +26,10 @@ public class EventException extends RuntimeException { public short code; // EventExceptionCode /** - * If the Event's type was not specified by initializing the - * event before the method was called. Specification of the Event's type - * as null or an empty string will also trigger this - * exception. + * If the Event's type was not specified by initializing the + * event before the method was called. Specification of the Event's type + * as null or an empty string will also trigger this + * exception. */ public static final short UNSPECIFIED_EVENT_TYPE_ERR = 0; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventListener.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventListener.java index 1df80202cea..1be3523fb60 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventListener.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventListener.java @@ -13,28 +13,28 @@ package org.w3c.dom.events; /** - * The EventListener interface is the primary method for - * handling events. Users implement the EventListener interface - * and register their listener on an EventTarget using the - * AddEventListener method. The users should also remove their - * EventListener from its EventTarget after they - * have completed using the listener. - *

    When a Node is copied using the cloneNode - * method the EventListeners attached to the source - * Node are not attached to the copied Node. If - * the user wishes the same EventListeners to be added to the - * newly created copy the user must add them manually. + * The EventListener interface is the primary method for + * handling events. Users implement the EventListener interface + * and register their listener on an EventTarget using the + * AddEventListener method. The users should also remove their + * EventListener from its EventTarget after they + * have completed using the listener. + *

    When a Node is copied using the cloneNode + * method the EventListeners attached to the source + * Node are not attached to the copied Node. If + * the user wishes the same EventListeners to be added to the + * newly created copy the user must add them manually. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ public interface EventListener { /** - * This method is called whenever an event occurs of the type for which - * the EventListener interface was registered. - * @param evt The Event contains contextual information - * about the event. It also contains the stopPropagation - * and preventDefault methods which are used in - * determining the event's flow and default action. + * This method is called whenever an event occurs of the type for which + * the EventListener interface was registered. + * @param evt The Event contains contextual information + * about the event. It also contains the stopPropagation + * and preventDefault methods which are used in + * determining the event's flow and default action. */ public void handleEvent(Event evt); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventTarget.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventTarget.java index f07663660fd..3b66a8debae 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventTarget.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/EventTarget.java @@ -13,87 +13,87 @@ package org.w3c.dom.events; /** - * The EventTarget interface is implemented by all - * Nodes in an implementation which supports the DOM Event - * Model. Therefore, this interface can be obtained by using - * binding-specific casting methods on an instance of the Node - * interface. The interface allows registration and removal of - * EventListeners on an EventTarget and dispatch + * The EventTarget interface is implemented by all + * Nodes in an implementation which supports the DOM Event + * Model. Therefore, this interface can be obtained by using + * binding-specific casting methods on an instance of the Node + * interface. The interface allows registration and removal of + * EventListeners on an EventTarget and dispatch * of events to that EventTarget. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ public interface EventTarget { /** - * This method allows the registration of event listeners on the event - * target. If an EventListener is added to an - * EventTarget while it is processing an event, it will not - * be triggered by the current actions but may be triggered during a - * later stage of event flow, such as the bubbling phase. - *
    If multiple identical EventListeners are registered - * on the same EventTarget with the same parameters the - * duplicate instances are discarded. They do not cause the - * EventListener to be called twice and since they are - * discarded they do not need to be removed with the - * removeEventListener method. + * This method allows the registration of event listeners on the event + * target. If an EventListener is added to an + * EventTarget while it is processing an event, it will not + * be triggered by the current actions but may be triggered during a + * later stage of event flow, such as the bubbling phase. + *
    If multiple identical EventListeners are registered + * on the same EventTarget with the same parameters the + * duplicate instances are discarded. They do not cause the + * EventListener to be called twice and since they are + * discarded they do not need to be removed with the + * removeEventListener method. * @param type The event type for which the user is registering - * @param listener The listener parameter takes an interface - * implemented by the user which contains the methods to be called + * @param listener The listener parameter takes an interface + * implemented by the user which contains the methods to be called * when the event occurs. - * @param useCapture If true, useCapture indicates that the - * user wishes to initiate capture. After initiating capture, all - * events of the specified type will be dispatched to the registered - * EventListener before being dispatched to any - * EventTargets beneath them in the tree. Events which - * are bubbling upward through the tree will not trigger an + * @param useCapture If true, useCapture indicates that the + * user wishes to initiate capture. After initiating capture, all + * events of the specified type will be dispatched to the registered + * EventListener before being dispatched to any + * EventTargets beneath them in the tree. Events which + * are bubbling upward through the tree will not trigger an * EventListener designated to use capture. */ - public void addEventListener(String type, - EventListener listener, + public void addEventListener(String type, + EventListener listener, boolean useCapture); /** - * This method allows the removal of event listeners from the event - * target. If an EventListener is removed from an - * EventTarget while it is processing an event, it will not - * be triggered by the current actions. EventListeners can + * This method allows the removal of event listeners from the event + * target. If an EventListener is removed from an + * EventTarget while it is processing an event, it will not + * be triggered by the current actions. EventListeners can * never be invoked after being removed. - *
    Calling removeEventListener with arguments which do - * not identify any currently registered EventListener on + *
    Calling removeEventListener with arguments which do + * not identify any currently registered EventListener on * the EventTarget has no effect. - * @param type Specifies the event type of the EventListener - * being removed. - * @param listener The EventListener parameter indicates the - * EventListener to be removed. - * @param useCapture Specifies whether the EventListener - * being removed was registered as a capturing listener or not. If a - * listener was registered twice, one with capture and one without, - * each must be removed separately. Removal of a capturing listener - * does not affect a non-capturing version of the same listener, and - * vice versa. + * @param type Specifies the event type of the EventListener + * being removed. + * @param listener The EventListener parameter indicates the + * EventListener to be removed. + * @param useCapture Specifies whether the EventListener + * being removed was registered as a capturing listener or not. If a + * listener was registered twice, one with capture and one without, + * each must be removed separately. Removal of a capturing listener + * does not affect a non-capturing version of the same listener, and + * vice versa. */ - public void removeEventListener(String type, - EventListener listener, + public void removeEventListener(String type, + EventListener listener, boolean useCapture); /** - * This method allows the dispatch of events into the implementations - * event model. Events dispatched in this manner will have the same - * capturing and bubbling behavior as events dispatched directly by the - * implementation. The target of the event is the - * EventTarget on which dispatchEvent is - * called. - * @param evt Specifies the event type, behavior, and contextual + * This method allows the dispatch of events into the implementations + * event model. Events dispatched in this manner will have the same + * capturing and bubbling behavior as events dispatched directly by the + * implementation. The target of the event is the + * EventTarget on which dispatchEvent is + * called. + * @param evt Specifies the event type, behavior, and contextual * information to be used in processing the event. - * @return The return value of dispatchEvent indicates - * whether any of the listeners which handled the event called - * preventDefault. If preventDefault was - * called the value is false, else the value is true. + * @return The return value of dispatchEvent indicates + * whether any of the listeners which handled the event called + * preventDefault. If preventDefault was + * called the value is false, else the value is true. * @exception EventException - * UNSPECIFIED_EVENT_TYPE_ERR: Raised if the Event's type - * was not specified by initializing the event before - * dispatchEvent was called. Specification of the - * Event's type as null or an empty string + * UNSPECIFIED_EVENT_TYPE_ERR: Raised if the Event's type + * was not specified by initializing the event before + * dispatchEvent was called. Specification of the + * Event's type as null or an empty string * will also trigger this exception. */ public boolean dispatchEvent(Event evt) diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MouseEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MouseEvent.java index be780357a88..67e20572f16 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MouseEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MouseEvent.java @@ -15,142 +15,142 @@ package org.w3c.dom.events; import org.w3c.dom.views.AbstractView; /** - * The MouseEvent interface provides specific contextual + * The MouseEvent interface provides specific contextual * information associated with Mouse events. - *

    The detail attribute inherited from UIEvent - * indicates the number of times a mouse button has been pressed and - * released over the same screen location during a user action. The - * attribute value is 1 when the user begins this action and increments by 1 - * for each full sequence of pressing and releasing. If the user moves the - * mouse between the mousedown and mouseup the value will be set to 0, + *

    The detail attribute inherited from UIEvent + * indicates the number of times a mouse button has been pressed and + * released over the same screen location during a user action. The + * attribute value is 1 when the user begins this action and increments by 1 + * for each full sequence of pressing and releasing. If the user moves the + * mouse between the mousedown and mouseup the value will be set to 0, * indicating that no click is occurring. - *

    In the case of nested elements mouse events are always targeted at the - * most deeply nested element. Ancestors of the targeted element may use - * bubbling to obtain notification of mouse events which occur within its + *

    In the case of nested elements mouse events are always targeted at the + * most deeply nested element. Ancestors of the targeted element may use + * bubbling to obtain notification of mouse events which occur within its * descendent elements. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ public interface MouseEvent extends UIEvent { /** - * The horizontal coordinate at which the event occurred relative to the + * The horizontal coordinate at which the event occurred relative to the * origin of the screen coordinate system. */ public int getScreenX(); /** - * The vertical coordinate at which the event occurred relative to the + * The vertical coordinate at which the event occurred relative to the * origin of the screen coordinate system. */ public int getScreenY(); /** - * The horizontal coordinate at which the event occurred relative to the + * The horizontal coordinate at which the event occurred relative to the * DOM implementation's client area. */ public int getClientX(); /** - * The vertical coordinate at which the event occurred relative to the DOM + * The vertical coordinate at which the event occurred relative to the DOM * implementation's client area. */ public int getClientY(); /** - * Used to indicate whether the 'ctrl' key was depressed during the firing + * Used to indicate whether the 'ctrl' key was depressed during the firing * of the event. */ public boolean getCtrlKey(); /** - * Used to indicate whether the 'shift' key was depressed during the + * Used to indicate whether the 'shift' key was depressed during the * firing of the event. */ public boolean getShiftKey(); /** - * Used to indicate whether the 'alt' key was depressed during the firing - * of the event. On some platforms this key may map to an alternative + * Used to indicate whether the 'alt' key was depressed during the firing + * of the event. On some platforms this key may map to an alternative * key name. */ public boolean getAltKey(); /** - * Used to indicate whether the 'meta' key was depressed during the firing - * of the event. On some platforms this key may map to an alternative + * Used to indicate whether the 'meta' key was depressed during the firing + * of the event. On some platforms this key may map to an alternative * key name. */ public boolean getMetaKey(); /** - * During mouse events caused by the depression or release of a mouse - * button, button is used to indicate which mouse button - * changed state. The values for button range from zero to - * indicate the left button of the mouse, one to indicate the middle - * button if present, and two to indicate the right button. For mice - * configured for left handed use in which the button actions are + * During mouse events caused by the depression or release of a mouse + * button, button is used to indicate which mouse button + * changed state. The values for button range from zero to + * indicate the left button of the mouse, one to indicate the middle + * button if present, and two to indicate the right button. For mice + * configured for left handed use in which the button actions are * reversed the values are instead read from right to left. */ public short getButton(); /** - * Used to identify a secondary EventTarget related to a UI - * event. Currently this attribute is used with the mouseover event to - * indicate the EventTarget which the pointing device - * exited and with the mouseout event to indicate the + * Used to identify a secondary EventTarget related to a UI + * event. Currently this attribute is used with the mouseover event to + * indicate the EventTarget which the pointing device + * exited and with the mouseout event to indicate the * EventTarget which the pointing device entered. */ public EventTarget getRelatedTarget(); /** - * The initMouseEvent method is used to initialize the value - * of a MouseEvent created through the - * DocumentEvent interface. This method may only be called - * before the MouseEvent has been dispatched via the - * dispatchEvent method, though it may be called multiple - * times during that phase if necessary. If called multiple times, the + * The initMouseEvent method is used to initialize the value + * of a MouseEvent created through the + * DocumentEvent interface. This method may only be called + * before the MouseEvent has been dispatched via the + * dispatchEvent method, though it may be called multiple + * times during that phase if necessary. If called multiple times, the * final invocation takes precedence. * @param typeArg Specifies the event type. * @param canBubbleArg Specifies whether or not the event can bubble. - * @param cancelableArg Specifies whether or not the event's default + * @param cancelableArg Specifies whether or not the event's default * action can be prevented. - * @param viewArg Specifies the Event's + * @param viewArg Specifies the Event's * AbstractView. * @param detailArg Specifies the Event's mouse click count. - * @param screenXArg Specifies the Event's screen x + * @param screenXArg Specifies the Event's screen x * coordinate - * @param screenYArg Specifies the Event's screen y + * @param screenYArg Specifies the Event's screen y * coordinate - * @param clientXArg Specifies the Event's client x + * @param clientXArg Specifies the Event's client x * coordinate - * @param clientYArg Specifies the Event's client y + * @param clientYArg Specifies the Event's client y * coordinate - * @param ctrlKeyArg Specifies whether or not control key was depressed + * @param ctrlKeyArg Specifies whether or not control key was depressed * during the Event. - * @param altKeyArg Specifies whether or not alt key was depressed during + * @param altKeyArg Specifies whether or not alt key was depressed during * the Event. - * @param shiftKeyArg Specifies whether or not shift key was depressed + * @param shiftKeyArg Specifies whether or not shift key was depressed * during the Event. - * @param metaKeyArg Specifies whether or not meta key was depressed + * @param metaKeyArg Specifies whether or not meta key was depressed * during the Event. * @param buttonArg Specifies the Event's mouse button. - * @param relatedTargetArg Specifies the Event's related + * @param relatedTargetArg Specifies the Event's related * EventTarget. */ - public void initMouseEvent(String typeArg, - boolean canBubbleArg, - boolean cancelableArg, - AbstractView viewArg, - int detailArg, - int screenXArg, - int screenYArg, - int clientXArg, - int clientYArg, - boolean ctrlKeyArg, - boolean altKeyArg, - boolean shiftKeyArg, - boolean metaKeyArg, - short buttonArg, + public void initMouseEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, + int detailArg, + int screenXArg, + int screenYArg, + int clientXArg, + int clientYArg, + boolean ctrlKeyArg, + boolean altKeyArg, + boolean shiftKeyArg, + boolean metaKeyArg, + short buttonArg, EventTarget relatedTargetArg); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MutationEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MutationEvent.java index 3db40038e93..2cbedb76894 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MutationEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/MutationEvent.java @@ -15,8 +15,8 @@ package org.w3c.dom.events; import org.w3c.dom.Node; /** - * The MutationEvent interface provides specific contextual - * information associated with Mutation events. + * The MutationEvent interface provides specific contextual + * information associated with Mutation events. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 */ @@ -36,73 +36,73 @@ public interface MutationEvent extends Event { public static final short REMOVAL = 3; /** - * relatedNode is used to identify a secondary node related - * to a mutation event. For example, if a mutation event is dispatched - * to a node indicating that its parent has changed, the - * relatedNode is the changed parent. If an event is - * instead dispatched to a subtree indicating a node was changed within - * it, the relatedNode is the changed node. In the case of - * the DOMAttrModified event it indicates the Attr node - * which was modified, added, or removed. + * relatedNode is used to identify a secondary node related + * to a mutation event. For example, if a mutation event is dispatched + * to a node indicating that its parent has changed, the + * relatedNode is the changed parent. If an event is + * instead dispatched to a subtree indicating a node was changed within + * it, the relatedNode is the changed node. In the case of + * the DOMAttrModified event it indicates the Attr node + * which was modified, added, or removed. */ public Node getRelatedNode(); /** - * prevValue indicates the previous value of the - * Attr node in DOMAttrModified events, and of the - * CharacterData node in DOMCharacterDataModified events. + * prevValue indicates the previous value of the + * Attr node in DOMAttrModified events, and of the + * CharacterData node in DOMCharacterDataModified events. */ public String getPrevValue(); /** - * newValue indicates the new value of the Attr - * node in DOMAttrModified events, and of the CharacterData - * node in DOMCharacterDataModified events. + * newValue indicates the new value of the Attr + * node in DOMAttrModified events, and of the CharacterData + * node in DOMCharacterDataModified events. */ public String getNewValue(); /** - * attrName indicates the name of the changed - * Attr node in a DOMAttrModified event. + * attrName indicates the name of the changed + * Attr node in a DOMAttrModified event. */ public String getAttrName(); /** - * attrChange indicates the type of change which triggered + * attrChange indicates the type of change which triggered * the DOMAttrModified event. The values can be MODIFICATION - * , ADDITION, or REMOVAL. + * , ADDITION, or REMOVAL. */ public short getAttrChange(); /** - * The initMutationEvent method is used to initialize the - * value of a MutationEvent created through the - * DocumentEvent interface. This method may only be called - * before the MutationEvent has been dispatched via the - * dispatchEvent method, though it may be called multiple - * times during that phase if necessary. If called multiple times, the + * The initMutationEvent method is used to initialize the + * value of a MutationEvent created through the + * DocumentEvent interface. This method may only be called + * before the MutationEvent has been dispatched via the + * dispatchEvent method, though it may be called multiple + * times during that phase if necessary. If called multiple times, the * final invocation takes precedence. * @param typeArg Specifies the event type. * @param canBubbleArg Specifies whether or not the event can bubble. - * @param cancelableArg Specifies whether or not the event's default + * @param cancelableArg Specifies whether or not the event's default * action can be prevented. * @param relatedNodeArg Specifies the Event's related Node. - * @param prevValueArg Specifies the Event's + * @param prevValueArg Specifies the Event's * prevValue attribute. This value may be null. - * @param newValueArg Specifies the Event's + * @param newValueArg Specifies the Event's * newValue attribute. This value may be null. - * @param attrNameArg Specifies the Event's + * @param attrNameArg Specifies the Event's * attrName attribute. This value may be null. - * @param attrChangeArg Specifies the Event's + * @param attrChangeArg Specifies the Event's * attrChange attribute */ - public void initMutationEvent(String typeArg, - boolean canBubbleArg, - boolean cancelableArg, - Node relatedNodeArg, - String prevValueArg, - String newValueArg, - String attrNameArg, + public void initMutationEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + Node relatedNodeArg, + String prevValueArg, + String newValueArg, + String attrNameArg, short attrChangeArg); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/UIEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/UIEvent.java index 15affe8791e..e3617c0268d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/events/UIEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/events/UIEvent.java @@ -15,7 +15,7 @@ package org.w3c.dom.events; import org.w3c.dom.views.AbstractView; /** - * The UIEvent interface provides specific contextual information + * The UIEvent interface provides specific contextual information * associated with User Interface events. *

    See also the Document Object Model (DOM) Level 2 Events Specification. * @since DOM Level 2 @@ -28,31 +28,31 @@ public interface UIEvent extends Event { public AbstractView getView(); /** - * Specifies some detail information about the Event, + * Specifies some detail information about the Event, * depending on the type of event. */ public int getDetail(); /** - * The initUIEvent method is used to initialize the value of - * a UIEvent created through the DocumentEvent - * interface. This method may only be called before the - * UIEvent has been dispatched via the - * dispatchEvent method, though it may be called multiple - * times during that phase if necessary. If called multiple times, the + * The initUIEvent method is used to initialize the value of + * a UIEvent created through the DocumentEvent + * interface. This method may only be called before the + * UIEvent has been dispatched via the + * dispatchEvent method, though it may be called multiple + * times during that phase if necessary. If called multiple times, the * final invocation takes precedence. * @param typeArg Specifies the event type. * @param canBubbleArg Specifies whether or not the event can bubble. - * @param cancelableArg Specifies whether or not the event's default + * @param cancelableArg Specifies whether or not the event's default * action can be prevented. - * @param viewArg Specifies the Event's + * @param viewArg Specifies the Event's * AbstractView. * @param detailArg Specifies the Event's detail. */ - public void initUIEvent(String typeArg, - boolean canBubbleArg, - boolean cancelableArg, - AbstractView viewArg, + public void initUIEvent(String typeArg, + boolean canBubbleArg, + boolean cancelableArg, + AbstractView viewArg, int detailArg); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java index eaac35c8a76..a3ec0b5040e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAnchorElement.java @@ -18,58 +18,58 @@ package org.w3c.dom.html2; */ public interface HTMLAnchorElement extends HTMLElement { /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * The character encoding of the linked resource. See the charset + * The character encoding of the linked resource. See the charset * attribute definition in HTML 4.01. */ public String getCharset(); /** - * The character encoding of the linked resource. See the charset + * The character encoding of the linked resource. See the charset * attribute definition in HTML 4.01. */ public void setCharset(String charset); /** - * Comma-separated list of lengths, defining an active region geometry. - * See also shape for the shape of the region. See the + * Comma-separated list of lengths, defining an active region geometry. + * See also shape for the shape of the region. See the * coords attribute definition in HTML 4.01. */ public String getCoords(); /** - * Comma-separated list of lengths, defining an active region geometry. - * See also shape for the shape of the region. See the + * Comma-separated list of lengths, defining an active region geometry. + * See also shape for the shape of the region. See the * coords attribute definition in HTML 4.01. */ public void setCoords(String coords); /** - * The absolute URI [IETF RFC 2396] of the linked resource. See the href attribute + * The absolute URI [IETF RFC 2396] of the linked resource. See the href attribute * definition in HTML 4.01. */ public String getHref(); /** - * The absolute URI [IETF RFC 2396] of the linked resource. See the href attribute + * The absolute URI [IETF RFC 2396] of the linked resource. See the href attribute * definition in HTML 4.01. */ public void setHref(String href); /** - * Language code of the linked resource. See the hreflang attribute + * Language code of the linked resource. See the hreflang attribute * definition in HTML 4.01. */ public String getHreflang(); /** - * Language code of the linked resource. See the hreflang attribute + * Language code of the linked resource. See the hreflang attribute * definition in HTML 4.01. */ public void setHreflang(String hreflang); @@ -102,34 +102,34 @@ public interface HTMLAnchorElement extends HTMLElement { public void setRev(String rev); /** - * The shape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * coords. See the shape attribute definition in HTML 4.01. */ public String getShape(); /** - * The shape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * coords. See the shape attribute definition in HTML 4.01. */ public void setShape(String shape); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public String getTarget(); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public void setTarget(String target); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java index f27b51afb7a..2e0fc153c21 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAppletElement.java @@ -13,142 +13,142 @@ package org.w3c.dom.html2; /** - * An embedded Java applet. See the APPLET element definition in HTML 4.01. + * An embedded Java applet. See the APPLET element definition in HTML 4.01. * This element is deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLAppletElement extends HTMLElement { /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Alternate text for user agents not rendering the normal content of this - * element. See the alt attribute definition in HTML 4.01. This + * Alternate text for user agents not rendering the normal content of this + * element. See the alt attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getAlt(); /** - * Alternate text for user agents not rendering the normal content of this - * element. See the alt attribute definition in HTML 4.01. This + * Alternate text for user agents not rendering the normal content of this + * element. See the alt attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setAlt(String alt); /** - * Comma-separated archive list. See the archive attribute definition in + * Comma-separated archive list. See the archive attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getArchive(); /** - * Comma-separated archive list. See the archive attribute definition in + * Comma-separated archive list. See the archive attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setArchive(String archive); /** - * Applet class file. See the code attribute definition in HTML 4.01. This + * Applet class file. See the code attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getCode(); /** - * Applet class file. See the code attribute definition in HTML 4.01. This + * Applet class file. See the code attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setCode(String code); /** - * Optional base URI [IETF RFC 2396] for applet. See the codebase attribute definition in + * Optional base URI [IETF RFC 2396] for applet. See the codebase attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getCodeBase(); /** - * Optional base URI [IETF RFC 2396] for applet. See the codebase attribute definition in + * Optional base URI [IETF RFC 2396] for applet. See the codebase attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCodeBase(String codeBase); /** - * Override height. See the height attribute definition in HTML 4.01. This + * Override height. See the height attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getHeight(); /** - * Override height. See the height attribute definition in HTML 4.01. This + * Override height. See the height attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setHeight(String height); /** - * Horizontal space, in pixels, to the left and right of this image, - * applet, or object. See the hspace attribute definition in HTML 4.01. + * Horizontal space, in pixels, to the left and right of this image, + * applet, or object. See the hspace attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public int getHspace(); /** - * Horizontal space, in pixels, to the left and right of this image, - * applet, or object. See the hspace attribute definition in HTML 4.01. + * Horizontal space, in pixels, to the left and right of this image, + * applet, or object. See the hspace attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public void setHspace(int hspace); /** - * The name of the applet. See the name attribute definition in HTML 4.01. + * The name of the applet. See the name attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getName(); /** - * The name of the applet. See the name attribute definition in HTML 4.01. + * The name of the applet. See the name attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setName(String name); /** * The value of the "object" attribute. See the object attribute definition - * in HTML 4.01. This attribute is deprecated in HTML 4.01. + * in HTML 4.01. This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public String getObject(); /** * The value of the "object" attribute. See the object attribute definition - * in HTML 4.01. This attribute is deprecated in HTML 4.01. + * in HTML 4.01. This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public void setObject(String object); /** - * Vertical space, in pixels, above and below this image, applet, or - * object. See the vspace attribute definition in HTML 4.01. This + * Vertical space, in pixels, above and below this image, applet, or + * object. See the vspace attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public int getVspace(); /** - * Vertical space, in pixels, above and below this image, applet, or - * object. See the vspace attribute definition in HTML 4.01. This + * Vertical space, in pixels, above and below this image, applet, or + * object. See the vspace attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public void setVspace(int vspace); /** - * Override width. See the width attribute definition in HTML 4.01. This + * Override width. See the width attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getWidth(); /** - * Override width. See the width attribute definition in HTML 4.01. This + * Override width. See the width attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setWidth(String width); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java index 75d1dc5cfa9..403b94d50b0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLAreaElement.java @@ -13,97 +13,97 @@ package org.w3c.dom.html2; /** - * Client-side image map area definition. See the AREA element definition in + * Client-side image map area definition. See the AREA element definition in * HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLAreaElement extends HTMLElement { /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public String getAlt(); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public void setAlt(String alt); /** - * Comma-separated list of lengths, defining an active region geometry. - * See also shape for the shape of the region. See the + * Comma-separated list of lengths, defining an active region geometry. + * See also shape for the shape of the region. See the * coords attribute definition in HTML 4.01. */ public String getCoords(); /** - * Comma-separated list of lengths, defining an active region geometry. - * See also shape for the shape of the region. See the + * Comma-separated list of lengths, defining an active region geometry. + * See also shape for the shape of the region. See the * coords attribute definition in HTML 4.01. */ public void setCoords(String coords); /** - * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in + * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in * HTML 4.01. */ public String getHref(); /** - * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in + * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in * HTML 4.01. */ public void setHref(String href); /** - * Specifies that this area is inactive, i.e., has no associated action. + * Specifies that this area is inactive, i.e., has no associated action. * See the nohref attribute definition in HTML 4.01. */ public boolean getNoHref(); /** - * Specifies that this area is inactive, i.e., has no associated action. + * Specifies that this area is inactive, i.e., has no associated action. * See the nohref attribute definition in HTML 4.01. */ public void setNoHref(boolean noHref); /** - * The shape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * coords. See the shape attribute definition in HTML 4.01. */ public String getShape(); /** - * The shape of the active area. The coordinates are given by + * The shape of the active area. The coordinates are given by * coords. See the shape attribute definition in HTML 4.01. */ public void setShape(String shape); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public String getTarget(); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public void setTarget(String target); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java index a865d282d41..74dbe1f3f81 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBRElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLBRElement extends HTMLElement { /** - * Control flow of text around floats. See the clear attribute definition + * Control flow of text around floats. See the clear attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getClear(); /** - * Control flow of text around floats. See the clear attribute definition + * Control flow of text around floats. See the clear attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setClear(String clear); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java index 7b52dbcc209..9dde9b3da57 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseElement.java @@ -27,12 +27,12 @@ public interface HTMLBaseElement extends HTMLElement { public void setHref(String href); /** - * The default target frame. See the target attribute definition in HTML + * The default target frame. See the target attribute definition in HTML * 4.01. */ public String getTarget(); /** - * The default target frame. See the target attribute definition in HTML + * The default target frame. See the target attribute definition in HTML * 4.01. */ public void setTarget(String target); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java index 5a3c5c93cee..1ae8834d7ec 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBaseFontElement.java @@ -13,41 +13,41 @@ package org.w3c.dom.html2; /** - * Base font. See the BASEFONT element definition in HTML 4.01. This element + * Base font. See the BASEFONT element definition in HTML 4.01. This element * is deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLBaseFontElement extends HTMLElement { /** - * Font color. See the color attribute definition in HTML 4.01. This + * Font color. See the color attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getColor(); /** - * Font color. See the color attribute definition in HTML 4.01. This + * Font color. See the color attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setColor(String color); /** - * Font face identifier. See the face attribute definition in HTML 4.01. + * Font face identifier. See the face attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getFace(); /** - * Font face identifier. See the face attribute definition in HTML 4.01. + * Font face identifier. See the face attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setFace(String face); /** - * Computed font size. See the size attribute definition in HTML 4.01. + * Computed font size. See the size attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ public int getSize(); /** - * Computed font size. See the size attribute definition in HTML 4.01. + * Computed font size. See the size attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. * @version DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java index 8898c5de030..7e1aabe1fe6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLBodyElement.java @@ -13,80 +13,80 @@ package org.w3c.dom.html2; /** - * The HTML document body. This element is always present in the DOM API, even - * if the tags are not present in the source document. See the BODY element + * The HTML document body. This element is always present in the DOM API, even + * if the tags are not present in the source document. See the BODY element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLBodyElement extends HTMLElement { /** - * Color of active links (after mouse-button down, but before mouse-button - * up). See the alink attribute definition in HTML 4.01. This attribute + * Color of active links (after mouse-button down, but before mouse-button + * up). See the alink attribute definition in HTML 4.01. This attribute * is deprecated in HTML 4.01. */ public String getALink(); /** - * Color of active links (after mouse-button down, but before mouse-button - * up). See the alink attribute definition in HTML 4.01. This attribute + * Color of active links (after mouse-button down, but before mouse-button + * up). See the alink attribute definition in HTML 4.01. This attribute * is deprecated in HTML 4.01. */ public void setALink(String aLink); /** - * URI [IETF RFC 2396] of the background texture tile image. See the background attribute + * URI [IETF RFC 2396] of the background texture tile image. See the background attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getBackground(); /** - * URI [IETF RFC 2396] of the background texture tile image. See the background attribute + * URI [IETF RFC 2396] of the background texture tile image. See the background attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setBackground(String background); /** - * Document background color. See the bgcolor attribute definition in HTML + * Document background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getBgColor(); /** - * Document background color. See the bgcolor attribute definition in HTML + * Document background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setBgColor(String bgColor); /** - * Color of links that are not active and unvisited. See the link - * attribute definition in HTML 4.01. This attribute is deprecated in + * Color of links that are not active and unvisited. See the link + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public String getLink(); /** - * Color of links that are not active and unvisited. See the link - * attribute definition in HTML 4.01. This attribute is deprecated in + * Color of links that are not active and unvisited. See the link + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public void setLink(String link); /** - * Document text color. See the text attribute definition in HTML 4.01. + * Document text color. See the text attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getText(); /** - * Document text color. See the text attribute definition in HTML 4.01. + * Document text color. See the text attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setText(String text); /** - * Color of links that have been visited by the user. See the vlink - * attribute definition in HTML 4.01. This attribute is deprecated in + * Color of links that have been visited by the user. See the vlink + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public String getVLink(); /** - * Color of links that have been visited by the user. See the vlink - * attribute definition in HTML 4.01. This attribute is deprecated in + * Color of links that have been visited by the user. See the vlink + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public void setVLink(String vLink); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java index 7efe1834c26..8e31b103ce2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLButtonElement.java @@ -18,69 +18,69 @@ package org.w3c.dom.html2; */ public interface HTMLButtonElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public void setName(String name); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * The type of button (all lower case). See the type attribute definition + * The type of button (all lower case). See the type attribute definition * in HTML 4.01. */ public String getType(); /** - * The current form control value. See the value attribute definition in + * The current form control value. See the value attribute definition in * HTML 4.01. */ public String getValue(); /** - * The current form control value. See the value attribute definition in + * The current form control value. See the value attribute definition in * HTML 4.01. */ public void setValue(String value); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java index 6b6751783fe..d6ec5473f70 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLCollection.java @@ -15,43 +15,43 @@ package org.w3c.dom.html2; import org.w3c.dom.Node; /** - * An HTMLCollection is a list of nodes. An individual node may - * be accessed by either ordinal index or the node's name or - * id attributes. Collections in the HTML DOM are assumed to be - * live meaning that they are automatically updated when the underlying - * document is changed. + * An HTMLCollection is a list of nodes. An individual node may + * be accessed by either ordinal index or the node's name or + * id attributes. Collections in the HTML DOM are assumed to be + * live meaning that they are automatically updated when the underlying + * document is changed. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLCollection { /** - * This attribute specifies the length or size of the list. + * This attribute specifies the length or size of the list. */ public int getLength(); /** - * This method retrieves a node specified by ordinal index. Nodes are + * This method retrieves a node specified by ordinal index. Nodes are * numbered in tree order (depth-first traversal order). - * @param index The index of the node to be fetched. The index origin is + * @param index The index of the node to be fetched. The index origin is * 0. - * @return The Node at the corresponding position upon - * success. A value of null is returned if the index is - * out of range. + * @return The Node at the corresponding position upon + * success. A value of null is returned if the index is + * out of range. */ public Node item(int index); /** - * This method retrieves a Node using a name. With [HTML 4.01] - * documents, it first searches for a Node with a matching - * id attribute. If it doesn't find one, it then searches - * for a Node with a matching name attribute, - * but only on those elements that are allowed a name attribute. With [XHTML 1.0] - * documents, this method only searches for Nodes with a - * matching id attribute. This method is case insensitive + * This method retrieves a Node using a name. With [HTML 4.01] + * documents, it first searches for a Node with a matching + * id attribute. If it doesn't find one, it then searches + * for a Node with a matching name attribute, + * but only on those elements that are allowed a name attribute. With [XHTML 1.0] + * documents, this method only searches for Nodes with a + * matching id attribute. This method is case insensitive * in HTML documents and case sensitive in XHTML documents. * @param name The name of the Node to be fetched. - * @return The Node with a name or - * id attribute whose value corresponds to the specified - * string. Upon failure (e.g., no node with this name exists), returns + * @return The Node with a name or + * id attribute whose value corresponds to the specified + * string. Upon failure (e.g., no node with this name exists), returns * null. */ public Node namedItem(String name); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java index e8a3bb4a064..e6f17b6ad80 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDListElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLDListElement extends HTMLElement { /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getCompact(); /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCompact(boolean compact); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java index 5a405c80432..b66de037c81 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDirectoryElement.java @@ -13,18 +13,18 @@ package org.w3c.dom.html2; /** - * Directory list. See the DIR element definition in HTML 4.01. This element + * Directory list. See the DIR element definition in HTML 4.01. This element * is deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLDirectoryElement extends HTMLElement { /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getCompact(); /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCompact(boolean compact); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java index 31107c5f168..5f5c0dc88f6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDivElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLDivElement extends HTMLElement { /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java index 79ad1b3363f..b038783f671 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLDocument.java @@ -17,218 +17,218 @@ import org.w3c.dom.NodeList; import org.w3c.dom.DOMException; /** - * An HTMLDocument is the root of the HTML hierarchy and holds - * the entire content. Besides providing access to the hierarchy, it also - * provides some convenience methods for accessing certain sets of + * An HTMLDocument is the root of the HTML hierarchy and holds + * the entire content. Besides providing access to the hierarchy, it also + * provides some convenience methods for accessing certain sets of * information from the document. - *

    The following properties have been deprecated in favor of the + *

    The following properties have been deprecated in favor of the * corresponding ones for the BODY element:alinkColorbackground - * bgColorfgColorlinkColorvlinkColorIn DOM Level 2, the method - * getElementById is inherited from the Document + * bgColorfgColorlinkColorvlinkColorIn DOM Level 2, the method + * getElementById is inherited from the Document * interface where it was moved to. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLDocument extends Document { /** - * The title of a document as specified by the TITLE element - * in the head of the document. + * The title of a document as specified by the TITLE element + * in the head of the document. */ public String getTitle(); /** - * The title of a document as specified by the TITLE element - * in the head of the document. + * The title of a document as specified by the TITLE element + * in the head of the document. */ public void setTitle(String title); /** - * Returns the URI [IETF RFC 2396] of the page that linked to this page. The value is an - * empty string if the user navigated to the page directly (not through - * a link, but, for example, via a bookmark). + * Returns the URI [IETF RFC 2396] of the page that linked to this page. The value is an + * empty string if the user navigated to the page directly (not through + * a link, but, for example, via a bookmark). */ public String getReferrer(); /** - * The domain name of the server that served the document, or - * null if the server cannot be identified by a domain - * name. + * The domain name of the server that served the document, or + * null if the server cannot be identified by a domain + * name. */ public String getDomain(); /** - * The absolute URI [IETF RFC 2396] of the document. + * The absolute URI [IETF RFC 2396] of the document. */ public String getURL(); /** - * The element that contains the content for the document. In documents - * with BODY contents, returns the BODY - * element. In frameset documents, this returns the outermost - * FRAMESET element. + * The element that contains the content for the document. In documents + * with BODY contents, returns the BODY + * element. In frameset documents, this returns the outermost + * FRAMESET element. */ public HTMLElement getBody(); /** - * The element that contains the content for the document. In documents - * with BODY contents, returns the BODY - * element. In frameset documents, this returns the outermost - * FRAMESET element. + * The element that contains the content for the document. In documents + * with BODY contents, returns the BODY + * element. In frameset documents, this returns the outermost + * FRAMESET element. */ public void setBody(HTMLElement body); /** - * A collection of all the IMG elements in a document. The - * behavior is limited to IMG elements for backwards - * compatibility. As suggested by [HTML 4.01], to include images, authors may use - * the OBJECT element or the IMG element. - * Therefore, it is recommended not to use this attribute to find the - * images in the document but getElementsByTagName with + * A collection of all the IMG elements in a document. The + * behavior is limited to IMG elements for backwards + * compatibility. As suggested by [HTML 4.01], to include images, authors may use + * the OBJECT element or the IMG element. + * Therefore, it is recommended not to use this attribute to find the + * images in the document but getElementsByTagName with * HTML 4.01 or getElementsByTagNameNS with XHTML 1.0. */ public HTMLCollection getImages(); /** - * A collection of all the OBJECT elements that include - * applets and APPLET (deprecated) elements in a document. + * A collection of all the OBJECT elements that include + * applets and APPLET (deprecated) elements in a document. */ public HTMLCollection getApplets(); /** * A collection of all AREA elements and anchor ( - * A) elements in a document with a value for the - * href attribute. + * A) elements in a document with a value for the + * href attribute. */ public HTMLCollection getLinks(); /** - * A collection of all the forms of a document. + * A collection of all the forms of a document. */ public HTMLCollection getForms(); /** - * A collection of all the anchor (A) elements in a document - * with a value for the name attribute. For reasons of - * backward compatibility, the returned set of anchors only contains - * those anchors created with the name attribute, not those - * created with the id attribute. Note that in [XHTML 1.0], the - * name attribute (see section 4.10) has no semantics and - * is only present for legacy user agents: the id attribute - * is used instead. Users should prefer the iterator mechanisms provided - * by [DOM Level 2 Traversal] instead. + * A collection of all the anchor (A) elements in a document + * with a value for the name attribute. For reasons of + * backward compatibility, the returned set of anchors only contains + * those anchors created with the name attribute, not those + * created with the id attribute. Note that in [XHTML 1.0], the + * name attribute (see section 4.10) has no semantics and + * is only present for legacy user agents: the id attribute + * is used instead. Users should prefer the iterator mechanisms provided + * by [DOM Level 2 Traversal] instead. */ public HTMLCollection getAnchors(); /** - * This mutable string attribute denotes persistent state information - * that (1) is associated with the current frame or document and (2) is - * composed of information described by the cookies - * non-terminal of [IETF RFC 2965], Section 4.2.2. - *
    If no persistent state information is available for the current - * frame or document document, then this property's value is an empty - * string. - *
    When this attribute is read, all cookies are returned as a single - * string, with each cookie's name-value pair concatenated into a list - * of name-value pairs, each list item being separated by a ';' - * (semicolon). - *
    When this attribute is set, the value it is set to should be a - * string that adheres to the cookie non-terminal of [IETF RFC 2965]; that - * is, it should be a single name-value pair followed by zero or more - * cookie attribute values. If no domain attribute is specified, then - * the domain attribute for the new value defaults to the host portion - * of an absolute URI [IETF RFC 2396] of the current frame or document. If no path - * attribute is specified, then the path attribute for the new value - * defaults to the absolute path portion of the URI [IETF RFC 2396] of the current - * frame or document. If no max-age attribute is specified, then the - * max-age attribute for the new value defaults to a user agent defined - * value. If a cookie with the specified name is already associated with - * the current frame or document, then the new value as well as the new - * attributes replace the old value and attributes. If a max-age - * attribute of 0 is specified for the new value, then any existing - * cookies of the specified name are removed from the cookie storage. - * See [IETF RFC 2965] for the semantics of persistent state item attribute value - * pairs. The precise nature of a user agent session is not defined by - * this specification. + * This mutable string attribute denotes persistent state information + * that (1) is associated with the current frame or document and (2) is + * composed of information described by the cookies + * non-terminal of [IETF RFC 2965], Section 4.2.2. + *
    If no persistent state information is available for the current + * frame or document document, then this property's value is an empty + * string. + *
    When this attribute is read, all cookies are returned as a single + * string, with each cookie's name-value pair concatenated into a list + * of name-value pairs, each list item being separated by a ';' + * (semicolon). + *
    When this attribute is set, the value it is set to should be a + * string that adheres to the cookie non-terminal of [IETF RFC 2965]; that + * is, it should be a single name-value pair followed by zero or more + * cookie attribute values. If no domain attribute is specified, then + * the domain attribute for the new value defaults to the host portion + * of an absolute URI [IETF RFC 2396] of the current frame or document. If no path + * attribute is specified, then the path attribute for the new value + * defaults to the absolute path portion of the URI [IETF RFC 2396] of the current + * frame or document. If no max-age attribute is specified, then the + * max-age attribute for the new value defaults to a user agent defined + * value. If a cookie with the specified name is already associated with + * the current frame or document, then the new value as well as the new + * attributes replace the old value and attributes. If a max-age + * attribute of 0 is specified for the new value, then any existing + * cookies of the specified name are removed from the cookie storage. + * See [IETF RFC 2965] for the semantics of persistent state item attribute value + * pairs. The precise nature of a user agent session is not defined by + * this specification. */ public String getCookie(); /** - * This mutable string attribute denotes persistent state information - * that (1) is associated with the current frame or document and (2) is - * composed of information described by the cookies - * non-terminal of [IETF RFC 2965], Section 4.2.2. - *
    If no persistent state information is available for the current - * frame or document document, then this property's value is an empty - * string. - *
    When this attribute is read, all cookies are returned as a single - * string, with each cookie's name-value pair concatenated into a list - * of name-value pairs, each list item being separated by a ';' - * (semicolon). - *
    When this attribute is set, the value it is set to should be a - * string that adheres to the cookie non-terminal of [IETF RFC 2965]; that - * is, it should be a single name-value pair followed by zero or more - * cookie attribute values. If no domain attribute is specified, then - * the domain attribute for the new value defaults to the host portion - * of an absolute URI [IETF RFC 2396] of the current frame or document. If no path - * attribute is specified, then the path attribute for the new value - * defaults to the absolute path portion of the URI [IETF RFC 2396] of the current - * frame or document. If no max-age attribute is specified, then the - * max-age attribute for the new value defaults to a user agent defined - * value. If a cookie with the specified name is already associated with - * the current frame or document, then the new value as well as the new - * attributes replace the old value and attributes. If a max-age - * attribute of 0 is specified for the new value, then any existing - * cookies of the specified name are removed from the cookie storage. - * See [IETF RFC 2965] for the semantics of persistent state item attribute value - * pairs. The precise nature of a user agent session is not defined by - * this specification. + * This mutable string attribute denotes persistent state information + * that (1) is associated with the current frame or document and (2) is + * composed of information described by the cookies + * non-terminal of [IETF RFC 2965], Section 4.2.2. + *
    If no persistent state information is available for the current + * frame or document document, then this property's value is an empty + * string. + *
    When this attribute is read, all cookies are returned as a single + * string, with each cookie's name-value pair concatenated into a list + * of name-value pairs, each list item being separated by a ';' + * (semicolon). + *
    When this attribute is set, the value it is set to should be a + * string that adheres to the cookie non-terminal of [IETF RFC 2965]; that + * is, it should be a single name-value pair followed by zero or more + * cookie attribute values. If no domain attribute is specified, then + * the domain attribute for the new value defaults to the host portion + * of an absolute URI [IETF RFC 2396] of the current frame or document. If no path + * attribute is specified, then the path attribute for the new value + * defaults to the absolute path portion of the URI [IETF RFC 2396] of the current + * frame or document. If no max-age attribute is specified, then the + * max-age attribute for the new value defaults to a user agent defined + * value. If a cookie with the specified name is already associated with + * the current frame or document, then the new value as well as the new + * attributes replace the old value and attributes. If a max-age + * attribute of 0 is specified for the new value, then any existing + * cookies of the specified name are removed from the cookie storage. + * See [IETF RFC 2965] for the semantics of persistent state item attribute value + * pairs. The precise nature of a user agent session is not defined by + * this specification. * @exception DOMException - * SYNTAX_ERR: If the new value does not adhere to the cookie syntax - * specified by [IETF RFC 2965]. + * SYNTAX_ERR: If the new value does not adhere to the cookie syntax + * specified by [IETF RFC 2965]. */ public void setCookie(String cookie) throws DOMException; /** - * Open a document stream for writing. If a document exists in the target, - * this method clears it. This method and the ones following allow a - * user to add to or replace the structure model of a document using - * strings of unparsed HTML. At the time of writing alternate methods - * for providing similar functionality for both HTML and XML documents + * Open a document stream for writing. If a document exists in the target, + * this method clears it. This method and the ones following allow a + * user to add to or replace the structure model of a document using + * strings of unparsed HTML. At the time of writing alternate methods + * for providing similar functionality for both HTML and XML documents * were being considered (see [DOM Level 3 Load and Save]). */ public void open(); /** - * Closes a document stream opened by open() and forces + * Closes a document stream opened by open() and forces * rendering. */ public void close(); /** - * Write a string of text to a document stream opened by - * open(). Note that the function will produce a document - * which is not necessarily driven by a DTD and therefore might be + * Write a string of text to a document stream opened by + * open(). Note that the function will produce a document + * which is not necessarily driven by a DTD and therefore might be * produce an invalid result in the context of the document. - * @param text The string to be parsed into some structure in the + * @param text The string to be parsed into some structure in the * document structure model. */ public void write(String text); /** - * Write a string of text followed by a newline character to a document - * stream opened by open(). Note that the function will - * produce a document which is not necessarily driven by a DTD and - * therefore might be produce an invalid result in the context of the + * Write a string of text followed by a newline character to a document + * stream opened by open(). Note that the function will + * produce a document which is not necessarily driven by a DTD and + * therefore might be produce an invalid result in the context of the * document - * @param text The string to be parsed into some structure in the + * @param text The string to be parsed into some structure in the * document structure model. */ public void writeln(String text); /** - * With [HTML 4.01] documents, this method returns the (possibly empty) collection - * of elements whose name value is given by - * elementName. In [XHTML 1.0] documents, this methods only return the - * (possibly empty) collection of form controls with matching name. This - * method is case sensitive. - * @param elementName The name attribute value for an + * With [HTML 4.01] documents, this method returns the (possibly empty) collection + * of elements whose name value is given by + * elementName. In [XHTML 1.0] documents, this methods only return the + * (possibly empty) collection of form controls with matching name. This + * method is case sensitive. + * @param elementName The name attribute value for an * element. * @return The matching elements. */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java index ed37419d3bc..c6450301b8f 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLElement.java @@ -15,15 +15,15 @@ package org.w3c.dom.html2; import org.w3c.dom.Element; /** - * All HTML element interfaces derive from this class. Elements that only - * expose the HTML core attributes are represented by the base - * HTMLElement interface. These elements are as follows: + * All HTML element interfaces derive from this class. Elements that only + * expose the HTML core attributes are represented by the base + * HTMLElement interface. These elements are as follows: * special: SUB, SUP, SPAN, BDOfont: TT, I, B, U, S, STRIKE, BIG, SMALL - * phrase: EM, STRONG, DFN, CODE, SAMP, KBD, VAR, CITE, ACRONYM, ABBRlist: - * DD, DTNOFRAMES, NOSCRIPTADDRESS, CENTERThe style attribute - * of an HTML element is accessible through the - * ElementCSSInlineStyle interface which is defined in the CSS - * module [DOM Level 2 Style Sheets and CSS]. + * phrase: EM, STRONG, DFN, CODE, SAMP, KBD, VAR, CITE, ACRONYM, ABBRlist: + * DD, DTNOFRAMES, NOSCRIPTADDRESS, CENTERThe style attribute + * of an HTML element is accessible through the + * ElementCSSInlineStyle interface which is defined in the CSS + * module [DOM Level 2 Style Sheets and CSS]. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLElement extends Element { @@ -37,49 +37,49 @@ public interface HTMLElement extends Element { public void setId(String id); /** - * The element's advisory title. See the title attribute definition in + * The element's advisory title. See the title attribute definition in * HTML 4.01. */ public String getTitle(); /** - * The element's advisory title. See the title attribute definition in + * The element's advisory title. See the title attribute definition in * HTML 4.01. */ public void setTitle(String title); /** - * Language code defined in RFC 1766. See the lang attribute definition in + * Language code defined in RFC 1766. See the lang attribute definition in * HTML 4.01. */ public String getLang(); /** - * Language code defined in RFC 1766. See the lang attribute definition in + * Language code defined in RFC 1766. See the lang attribute definition in * HTML 4.01. */ public void setLang(String lang); /** - * Specifies the base direction of directionally neutral text and the - * directionality of tables. See the dir attribute definition in HTML + * Specifies the base direction of directionally neutral text and the + * directionality of tables. See the dir attribute definition in HTML * 4.01. */ public String getDir(); /** - * Specifies the base direction of directionally neutral text and the - * directionality of tables. See the dir attribute definition in HTML + * Specifies the base direction of directionally neutral text and the + * directionality of tables. See the dir attribute definition in HTML * 4.01. */ public void setDir(String dir); /** - * The class attribute of the element. This attribute has been renamed due - * to conflicts with the "class" keyword exposed by many languages. See + * The class attribute of the element. This attribute has been renamed due + * to conflicts with the "class" keyword exposed by many languages. See * the class attribute definition in HTML 4.01. */ public String getClassName(); /** - * The class attribute of the element. This attribute has been renamed due - * to conflicts with the "class" keyword exposed by many languages. See + * The class attribute of the element. This attribute has been renamed due + * to conflicts with the "class" keyword exposed by many languages. See * the class attribute definition in HTML 4.01. */ public void setClassName(String className); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java index c962a567d1b..f3bcb7df7e5 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFieldSetElement.java @@ -13,15 +13,15 @@ package org.w3c.dom.html2; /** - * Organizes form controls into logical groups. See the FIELDSET element + * Organizes form controls into logical groups. See the FIELDSET element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLFieldSetElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java index 8fa25893c35..aa6a2847bd1 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFontElement.java @@ -13,40 +13,40 @@ package org.w3c.dom.html2; /** - * Local change to font. See the FONT element definition in HTML 4.01. This + * Local change to font. See the FONT element definition in HTML 4.01. This * element is deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLFontElement extends HTMLElement { /** - * Font color. See the color attribute definition in HTML 4.01. This + * Font color. See the color attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getColor(); /** - * Font color. See the color attribute definition in HTML 4.01. This + * Font color. See the color attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setColor(String color); /** - * Font face identifier. See the face attribute definition in HTML 4.01. + * Font face identifier. See the face attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getFace(); /** - * Font face identifier. See the face attribute definition in HTML 4.01. + * Font face identifier. See the face attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setFace(String face); /** - * Font size. See the size attribute definition in HTML 4.01. This + * Font size. See the size attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getSize(); /** - * Font size. See the size attribute definition in HTML 4.01. This + * Font size. See the size attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setSize(String size); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java index 109f31a57dd..60ec7736fbb 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFormElement.java @@ -13,15 +13,15 @@ package org.w3c.dom.html2; /** - * The FORM element encompasses behavior similar to a collection - * and an element. It provides direct access to the contained form controls - * as well as the attributes of the form element. See the FORM element + * The FORM element encompasses behavior similar to a collection + * and an element. It provides direct access to the contained form controls + * as well as the attributes of the form element. See the FORM element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLFormElement extends HTMLElement { /** - * Returns a collection of all form control elements in the form. + * Returns a collection of all form control elements in the form. */ public HTMLCollection getElements(); @@ -31,73 +31,73 @@ public interface HTMLFormElement extends HTMLElement { public int getLength(); /** - * Names the form. + * Names the form. */ public String getName(); /** - * Names the form. + * Names the form. */ public void setName(String name); /** - * List of character sets supported by the server. See the accept-charset + * List of character sets supported by the server. See the accept-charset * attribute definition in HTML 4.01. */ public String getAcceptCharset(); /** - * List of character sets supported by the server. See the accept-charset + * List of character sets supported by the server. See the accept-charset * attribute definition in HTML 4.01. */ public void setAcceptCharset(String acceptCharset); /** - * Server-side form handler. See the action attribute definition in HTML + * Server-side form handler. See the action attribute definition in HTML * 4.01. */ public String getAction(); /** - * Server-side form handler. See the action attribute definition in HTML + * Server-side form handler. See the action attribute definition in HTML * 4.01. */ public void setAction(String action); /** - * The content type of the submitted form, generally - * "application/x-www-form-urlencoded". See the enctype attribute - * definition in HTML 4.01. The onsubmit even handler is not guaranteed - * to be triggered when invoking this method. The behavior is - * inconsistent for historical reasons and authors should not rely on a - * particular one. + * The content type of the submitted form, generally + * "application/x-www-form-urlencoded". See the enctype attribute + * definition in HTML 4.01. The onsubmit even handler is not guaranteed + * to be triggered when invoking this method. The behavior is + * inconsistent for historical reasons and authors should not rely on a + * particular one. */ public String getEnctype(); /** - * The content type of the submitted form, generally - * "application/x-www-form-urlencoded". See the enctype attribute - * definition in HTML 4.01. The onsubmit even handler is not guaranteed - * to be triggered when invoking this method. The behavior is - * inconsistent for historical reasons and authors should not rely on a - * particular one. + * The content type of the submitted form, generally + * "application/x-www-form-urlencoded". See the enctype attribute + * definition in HTML 4.01. The onsubmit even handler is not guaranteed + * to be triggered when invoking this method. The behavior is + * inconsistent for historical reasons and authors should not rely on a + * particular one. */ public void setEnctype(String enctype); /** - * HTTP method [IETF RFC 2616] used to submit form. See the method attribute definition + * HTTP method [IETF RFC 2616] used to submit form. See the method attribute definition * in HTML 4.01. */ public String getMethod(); /** - * HTTP method [IETF RFC 2616] used to submit form. See the method attribute definition + * HTTP method [IETF RFC 2616] used to submit form. See the method attribute definition * in HTML 4.01. */ public void setMethod(String method); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public String getTarget(); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public void setTarget(String target); @@ -108,7 +108,7 @@ public interface HTMLFormElement extends HTMLElement { public void submit(); /** - * Restores a form element's default values. It performs the same action + * Restores a form element's default values. It performs the same action * as a reset button. */ public void reset(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java index d6100815f5a..dfe877f152e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameElement.java @@ -20,95 +20,95 @@ import org.w3c.dom.Document; */ public interface HTMLFrameElement extends HTMLElement { /** - * Request frame borders. See the frameborder attribute definition in HTML + * Request frame borders. See the frameborder attribute definition in HTML * 4.01. */ public String getFrameBorder(); /** - * Request frame borders. See the frameborder attribute definition in HTML + * Request frame borders. See the frameborder attribute definition in HTML * 4.01. */ public void setFrameBorder(String frameBorder); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public String getLongDesc(); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public void setLongDesc(String longDesc); /** - * Frame margin height, in pixels. See the marginheight attribute + * Frame margin height, in pixels. See the marginheight attribute * definition in HTML 4.01. */ public String getMarginHeight(); /** - * Frame margin height, in pixels. See the marginheight attribute + * Frame margin height, in pixels. See the marginheight attribute * definition in HTML 4.01. */ public void setMarginHeight(String marginHeight); /** - * Frame margin width, in pixels. See the marginwidth attribute definition + * Frame margin width, in pixels. See the marginwidth attribute definition * in HTML 4.01. */ public String getMarginWidth(); /** - * Frame margin width, in pixels. See the marginwidth attribute definition + * Frame margin width, in pixels. See the marginwidth attribute definition * in HTML 4.01. */ public void setMarginWidth(String marginWidth); /** - * The frame name (object of the target attribute). See the + * The frame name (object of the target attribute). See the * name attribute definition in HTML 4.01. */ public String getName(); /** - * The frame name (object of the target attribute). See the + * The frame name (object of the target attribute). See the * name attribute definition in HTML 4.01. */ public void setName(String name); /** - * When true, forbid user from resizing frame. See the noresize attribute + * When true, forbid user from resizing frame. See the noresize attribute * definition in HTML 4.01. */ public boolean getNoResize(); /** - * When true, forbid user from resizing frame. See the noresize attribute + * When true, forbid user from resizing frame. See the noresize attribute * definition in HTML 4.01. */ public void setNoResize(boolean noResize); /** - * Specify whether or not the frame should have scrollbars. See the + * Specify whether or not the frame should have scrollbars. See the * scrolling attribute definition in HTML 4.01. */ public String getScrolling(); /** - * Specify whether or not the frame should have scrollbars. See the + * Specify whether or not the frame should have scrollbars. See the * scrolling attribute definition in HTML 4.01. */ public void setScrolling(String scrolling); /** - * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute + * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute * definition in HTML 4.01. */ public String getSrc(); /** - * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute + * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute * definition in HTML 4.01. */ public void setSrc(String src); /** - * The document this frame contains, if there is any and it is available, + * The document this frame contains, if there is any and it is available, * or null otherwise. * @since DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java index 4e5d75bde1b..d2b9c34e96c 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLFrameSetElement.java @@ -18,23 +18,23 @@ package org.w3c.dom.html2; */ public interface HTMLFrameSetElement extends HTMLElement { /** - * The number of columns of frames in the frameset. See the cols attribute + * The number of columns of frames in the frameset. See the cols attribute * definition in HTML 4.01. */ public String getCols(); /** - * The number of columns of frames in the frameset. See the cols attribute + * The number of columns of frames in the frameset. See the cols attribute * definition in HTML 4.01. */ public void setCols(String cols); /** - * The number of rows of frames in the frameset. See the rows attribute + * The number of rows of frames in the frameset. See the rows attribute * definition in HTML 4.01. */ public String getRows(); /** - * The number of rows of frames in the frameset. See the rows attribute + * The number of rows of frames in the frameset. See the rows attribute * definition in HTML 4.01. */ public void setRows(String rows); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java index b09ec0f3fb1..d832bc3f032 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHRElement.java @@ -18,47 +18,47 @@ package org.w3c.dom.html2; */ public interface HTMLHRElement extends HTMLElement { /** - * Align the rule on the page. See the align attribute definition in HTML + * Align the rule on the page. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Align the rule on the page. See the align attribute definition in HTML + * Align the rule on the page. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Indicates to the user agent that there should be no shading in the - * rendering of this element. See the noshade attribute definition in + * Indicates to the user agent that there should be no shading in the + * rendering of this element. See the noshade attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getNoShade(); /** - * Indicates to the user agent that there should be no shading in the - * rendering of this element. See the noshade attribute definition in + * Indicates to the user agent that there should be no shading in the + * rendering of this element. See the noshade attribute definition in * HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setNoShade(boolean noShade); /** - * The height of the rule. See the size attribute definition in HTML 4.01. + * The height of the rule. See the size attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getSize(); /** - * The height of the rule. See the size attribute definition in HTML 4.01. + * The height of the rule. See the size attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setSize(String size); /** - * The width of the rule. See the width attribute definition in HTML 4.01. + * The width of the rule. See the width attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getWidth(); /** - * The width of the rule. See the width attribute definition in HTML 4.01. + * The width of the rule. See the width attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setWidth(String width); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java index c4550a50711..85617a7ee20 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLHeadElement extends HTMLElement { /** - * URI [IETF RFC 2396] designating a metadata profile. See the profile attribute + * URI [IETF RFC 2396] designating a metadata profile. See the profile attribute * definition in HTML 4.01. */ public String getProfile(); /** - * URI [IETF RFC 2396] designating a metadata profile. See the profile attribute + * URI [IETF RFC 2396] designating a metadata profile. See the profile attribute * definition in HTML 4.01. */ public void setProfile(String profile); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java index 149752507e3..291f5d87a30 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHeadingElement.java @@ -13,18 +13,18 @@ package org.w3c.dom.html2; /** - * For the H1 to H6 elements. See the H1 element + * For the H1 to H6 elements. See the H1 element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLHeadingElement extends HTMLElement { /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java index 5ba30fe3177..3601d7eb360 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLHtmlElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLHtmlElement extends HTMLElement { /** - * Version information about the document's DTD. See the version attribute + * Version information about the document's DTD. See the version attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getVersion(); /** - * Version information about the document's DTD. See the version attribute + * Version information about the document's DTD. See the version attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setVersion(String version); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java index 7cac12f89e5..6106e62a26a 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIFrameElement.java @@ -20,25 +20,25 @@ import org.w3c.dom.Document; */ public interface HTMLIFrameElement extends HTMLElement { /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Request frame borders. See the frameborder attribute definition in HTML + * Request frame borders. See the frameborder attribute definition in HTML * 4.01. */ public String getFrameBorder(); /** - * Request frame borders. See the frameborder attribute definition in HTML + * Request frame borders. See the frameborder attribute definition in HTML * 4.01. */ public void setFrameBorder(String frameBorder); @@ -53,67 +53,67 @@ public interface HTMLIFrameElement extends HTMLElement { public void setHeight(String height); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public String getLongDesc(); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public void setLongDesc(String longDesc); /** - * Frame margin height, in pixels. See the marginheight attribute + * Frame margin height, in pixels. See the marginheight attribute * definition in HTML 4.01. */ public String getMarginHeight(); /** - * Frame margin height, in pixels. See the marginheight attribute + * Frame margin height, in pixels. See the marginheight attribute * definition in HTML 4.01. */ public void setMarginHeight(String marginHeight); /** - * Frame margin width, in pixels. See the marginwidth attribute definition + * Frame margin width, in pixels. See the marginwidth attribute definition * in HTML 4.01. */ public String getMarginWidth(); /** - * Frame margin width, in pixels. See the marginwidth attribute definition + * Frame margin width, in pixels. See the marginwidth attribute definition * in HTML 4.01. */ public void setMarginWidth(String marginWidth); /** - * The frame name (object of the target attribute). See the + * The frame name (object of the target attribute). See the * name attribute definition in HTML 4.01. */ public String getName(); /** - * The frame name (object of the target attribute). See the + * The frame name (object of the target attribute). See the * name attribute definition in HTML 4.01. */ public void setName(String name); /** - * Specify whether or not the frame should have scrollbars. See the + * Specify whether or not the frame should have scrollbars. See the * scrolling attribute definition in HTML 4.01. */ public String getScrolling(); /** - * Specify whether or not the frame should have scrollbars. See the + * Specify whether or not the frame should have scrollbars. See the * scrolling attribute definition in HTML 4.01. */ public void setScrolling(String scrolling); /** - * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute + * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute * definition in HTML 4.01. */ public String getSrc(); /** - * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute + * A URI [IETF RFC 2396] designating the initial frame contents. See the src attribute * definition in HTML 4.01. */ public void setSrc(String src); @@ -128,7 +128,7 @@ public interface HTMLIFrameElement extends HTMLElement { public void setWidth(String width); /** - * The document this frame contains, if there is any and it is available, + * The document this frame contains, if there is any and it is available, * or null otherwise. * @since DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java index 8e8142184d4..0a1d4b72279 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLImageElement.java @@ -18,156 +18,156 @@ package org.w3c.dom.html2; */ public interface HTMLImageElement extends HTMLElement { /** - * The name of the element (for backwards compatibility). + * The name of the element (for backwards compatibility). */ public String getName(); /** - * The name of the element (for backwards compatibility). + * The name of the element (for backwards compatibility). */ public void setName(String name); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public String getAlt(); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public void setAlt(String alt); /** - * Width of border around image. See the border attribute definition in - * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the + * Width of border around image. See the border attribute definition in + * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the * type of this attribute was DOMString in DOM Level 1 HTML [DOM Level 1] * . */ public String getBorder(); /** - * Width of border around image. See the border attribute definition in - * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the + * Width of border around image. See the border attribute definition in + * HTML 4.01. This attribute is deprecated in HTML 4.01. Note that the * type of this attribute was DOMString in DOM Level 1 HTML [DOM Level 1] * . */ public void setBorder(String border); /** - * Height of the image in pixels. See the height attribute definition in - * HTML 4.01. Note that the type of this attribute was + * Height of the image in pixels. See the height attribute definition in + * HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public int getHeight(); /** - * Height of the image in pixels. See the height attribute definition in - * HTML 4.01. Note that the type of this attribute was + * Height of the image in pixels. See the height attribute definition in + * HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public void setHeight(int height); /** - * Horizontal space to the left and right of this image in pixels. See the - * hspace attribute definition in HTML 4.01. This attribute is - * deprecated in HTML 4.01. Note that the type of this attribute was + * Horizontal space to the left and right of this image in pixels. See the + * hspace attribute definition in HTML 4.01. This attribute is + * deprecated in HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public int getHspace(); /** - * Horizontal space to the left and right of this image in pixels. See the - * hspace attribute definition in HTML 4.01. This attribute is - * deprecated in HTML 4.01. Note that the type of this attribute was + * Horizontal space to the left and right of this image in pixels. See the + * hspace attribute definition in HTML 4.01. This attribute is + * deprecated in HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public void setHspace(int hspace); /** - * Use server-side image map. See the ismap attribute definition in HTML + * Use server-side image map. See the ismap attribute definition in HTML * 4.01. */ public boolean getIsMap(); /** - * Use server-side image map. See the ismap attribute definition in HTML + * Use server-side image map. See the ismap attribute definition in HTML * 4.01. */ public void setIsMap(boolean isMap); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public String getLongDesc(); /** - * URI [IETF RFC 2396] designating a long description of this image or frame. See the + * URI [IETF RFC 2396] designating a long description of this image or frame. See the * longdesc attribute definition in HTML 4.01. */ public void setLongDesc(String longDesc); /** - * URI [IETF RFC 2396] designating the source of this image. See the src attribute + * URI [IETF RFC 2396] designating the source of this image. See the src attribute * definition in HTML 4.01. */ public String getSrc(); /** - * URI [IETF RFC 2396] designating the source of this image. See the src attribute + * URI [IETF RFC 2396] designating the source of this image. See the src attribute * definition in HTML 4.01. */ public void setSrc(String src); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public String getUseMap(); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public void setUseMap(String useMap); /** - * Vertical space above and below this image in pixels. See the vspace - * attribute definition in HTML 4.01. This attribute is deprecated in - * HTML 4.01. Note that the type of this attribute was "DOMString" in + * Vertical space above and below this image in pixels. See the vspace + * attribute definition in HTML 4.01. This attribute is deprecated in + * HTML 4.01. Note that the type of this attribute was "DOMString" in * DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public int getVspace(); /** - * Vertical space above and below this image in pixels. See the vspace - * attribute definition in HTML 4.01. This attribute is deprecated in - * HTML 4.01. Note that the type of this attribute was "DOMString" in + * Vertical space above and below this image in pixels. See the vspace + * attribute definition in HTML 4.01. This attribute is deprecated in + * HTML 4.01. Note that the type of this attribute was "DOMString" in * DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public void setVspace(int vspace); /** - * The width of the image in pixels. See the width attribute definition in - * HTML 4.01. Note that the type of this attribute was + * The width of the image in pixels. See the width attribute definition in + * HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ public int getWidth(); /** - * The width of the image in pixels. See the width attribute definition in - * HTML 4.01. Note that the type of this attribute was + * The width of the image in pixels. See the width attribute definition in + * HTML 4.01. Note that the type of this attribute was * DOMString in DOM Level 1 HTML [DOM Level 1]. * @version DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java index b0d0d9d091b..c557e0bcec6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLInputElement.java @@ -13,265 +13,265 @@ package org.w3c.dom.html2; /** - * Form control.Depending upon the environment in which the page is being - * viewed, the value property may be read-only for the file upload input - * type. For the "password" input type, the actual value returned may be + * Form control.Depending upon the environment in which the page is being + * viewed, the value property may be read-only for the file upload input + * type. For the "password" input type, the actual value returned may be * masked to prevent unauthorized use. See the INPUT element definition in [HTML 4.01]. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLInputElement extends HTMLElement { /** - * When the type attribute of the element has the value - * "text", "file" or "password", this represents the HTML value - * attribute of the element. The value of this attribute does not change - * if the contents of the corresponding form control, in an interactive + * When the type attribute of the element has the value + * "text", "file" or "password", this represents the HTML value + * attribute of the element. The value of this attribute does not change + * if the contents of the corresponding form control, in an interactive * user agent, changes. See the value attribute definition in HTML 4.01. */ public String getDefaultValue(); /** - * When the type attribute of the element has the value - * "text", "file" or "password", this represents the HTML value - * attribute of the element. The value of this attribute does not change - * if the contents of the corresponding form control, in an interactive + * When the type attribute of the element has the value + * "text", "file" or "password", this represents the HTML value + * attribute of the element. The value of this attribute does not change + * if the contents of the corresponding form control, in an interactive * user agent, changes. See the value attribute definition in HTML 4.01. */ public void setDefaultValue(String defaultValue); /** - * When type has the value "radio" or "checkbox", this - * represents the HTML checked attribute of the element. The value of - * this attribute does not change if the state of the corresponding form - * control, in an interactive user agent, changes. See the checked + * When type has the value "radio" or "checkbox", this + * represents the HTML checked attribute of the element. The value of + * this attribute does not change if the state of the corresponding form + * control, in an interactive user agent, changes. See the checked * attribute definition in HTML 4.01. */ public boolean getDefaultChecked(); /** - * When type has the value "radio" or "checkbox", this - * represents the HTML checked attribute of the element. The value of - * this attribute does not change if the state of the corresponding form - * control, in an interactive user agent, changes. See the checked + * When type has the value "radio" or "checkbox", this + * represents the HTML checked attribute of the element. The value of + * this attribute does not change if the state of the corresponding form + * control, in an interactive user agent, changes. See the checked * attribute definition in HTML 4.01. */ public void setDefaultChecked(boolean defaultChecked); /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * A comma-separated list of content types that a server processing this - * form will handle correctly. See the accept attribute definition in + * A comma-separated list of content types that a server processing this + * form will handle correctly. See the accept attribute definition in * HTML 4.01. */ public String getAccept(); /** - * A comma-separated list of content types that a server processing this - * form will handle correctly. See the accept attribute definition in + * A comma-separated list of content types that a server processing this + * form will handle correctly. See the accept attribute definition in * HTML 4.01. */ public void setAccept(String accept); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public String getAlt(); /** - * Alternate text for user agents not rendering the normal content of this + * Alternate text for user agents not rendering the normal content of this * element. See the alt attribute definition in HTML 4.01. */ public void setAlt(String alt); /** - * When the type attribute of the element has the value - * "radio" or "checkbox", this represents the current state of the form - * control, in an interactive user agent. Changes to this attribute - * change the state of the form control, but do not change the value of - * the HTML checked attribute of the INPUT element.During the handling - * of a click event on an input element with a type attribute that has - * the value "radio" or "checkbox", some implementations may change the - * value of this property before the event is being dispatched in the - * document. If the default action of the event is canceled, the value - * of the property may be changed back to its original value. This means - * that the value of this property during the handling of click events + * When the type attribute of the element has the value + * "radio" or "checkbox", this represents the current state of the form + * control, in an interactive user agent. Changes to this attribute + * change the state of the form control, but do not change the value of + * the HTML checked attribute of the INPUT element.During the handling + * of a click event on an input element with a type attribute that has + * the value "radio" or "checkbox", some implementations may change the + * value of this property before the event is being dispatched in the + * document. If the default action of the event is canceled, the value + * of the property may be changed back to its original value. This means + * that the value of this property during the handling of click events * is implementation dependent. */ public boolean getChecked(); /** - * When the type attribute of the element has the value - * "radio" or "checkbox", this represents the current state of the form - * control, in an interactive user agent. Changes to this attribute - * change the state of the form control, but do not change the value of - * the HTML checked attribute of the INPUT element.During the handling - * of a click event on an input element with a type attribute that has - * the value "radio" or "checkbox", some implementations may change the - * value of this property before the event is being dispatched in the - * document. If the default action of the event is canceled, the value - * of the property may be changed back to its original value. This means - * that the value of this property during the handling of click events + * When the type attribute of the element has the value + * "radio" or "checkbox", this represents the current state of the form + * control, in an interactive user agent. Changes to this attribute + * change the state of the form control, but do not change the value of + * the HTML checked attribute of the INPUT element.During the handling + * of a click event on an input element with a type attribute that has + * the value "radio" or "checkbox", some implementations may change the + * value of this property before the event is being dispatched in the + * document. If the default action of the event is canceled, the value + * of the property may be changed back to its original value. This means + * that the value of this property during the handling of click events * is implementation dependent. */ public void setChecked(boolean checked); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); /** - * Maximum number of characters for text fields, when type - * has the value "text" or "password". See the maxlength attribute + * Maximum number of characters for text fields, when type + * has the value "text" or "password". See the maxlength attribute * definition in HTML 4.01. */ public int getMaxLength(); /** - * Maximum number of characters for text fields, when type - * has the value "text" or "password". See the maxlength attribute + * Maximum number of characters for text fields, when type + * has the value "text" or "password". See the maxlength attribute * definition in HTML 4.01. */ public void setMaxLength(int maxLength); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public void setName(String name); /** - * This control is read-only. Relevant only when type has the - * value "text" or "password". See the readonly attribute definition in + * This control is read-only. Relevant only when type has the + * value "text" or "password". See the readonly attribute definition in * HTML 4.01. */ public boolean getReadOnly(); /** - * This control is read-only. Relevant only when type has the - * value "text" or "password". See the readonly attribute definition in + * This control is read-only. Relevant only when type has the + * value "text" or "password". See the readonly attribute definition in * HTML 4.01. */ public void setReadOnly(boolean readOnly); /** - * Size information. The precise meaning is specific to each type of + * Size information. The precise meaning is specific to each type of * field. See the size attribute definition in HTML 4.01. * @version DOM Level 2 */ public int getSize(); /** - * Size information. The precise meaning is specific to each type of + * Size information. The precise meaning is specific to each type of * field. See the size attribute definition in HTML 4.01. * @version DOM Level 2 */ public void setSize(int size); /** - * When the type attribute has the value "image", this - * attribute specifies the location of the image to be used to decorate - * the graphical submit button. See the src attribute definition in HTML + * When the type attribute has the value "image", this + * attribute specifies the location of the image to be used to decorate + * the graphical submit button. See the src attribute definition in HTML * 4.01. */ public String getSrc(); /** - * When the type attribute has the value "image", this - * attribute specifies the location of the image to be used to decorate - * the graphical submit button. See the src attribute definition in HTML + * When the type attribute has the value "image", this + * attribute specifies the location of the image to be used to decorate + * the graphical submit button. See the src attribute definition in HTML * 4.01. */ public void setSrc(String src); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * The type of control created (all lower case). See the type attribute + * The type of control created (all lower case). See the type attribute * definition in HTML 4.01. * @version DOM Level 2 */ public String getType(); /** - * The type of control created (all lower case). See the type attribute + * The type of control created (all lower case). See the type attribute * definition in HTML 4.01. * @version DOM Level 2 */ public void setType(String type); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public String getUseMap(); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public void setUseMap(String useMap); /** - * When the type attribute of the element has the value - * "text", "file" or "password", this represents the current contents of - * the corresponding form control, in an interactive user agent. - * Changing this attribute changes the contents of the form control, but - * does not change the value of the HTML value attribute of the element. - * When the type attribute of the element has the value - * "button", "hidden", "submit", "reset", "image", "checkbox" or - * "radio", this represents the HTML value attribute of the element. See + * When the type attribute of the element has the value + * "text", "file" or "password", this represents the current contents of + * the corresponding form control, in an interactive user agent. + * Changing this attribute changes the contents of the form control, but + * does not change the value of the HTML value attribute of the element. + * When the type attribute of the element has the value + * "button", "hidden", "submit", "reset", "image", "checkbox" or + * "radio", this represents the HTML value attribute of the element. See * the value attribute definition in HTML 4.01. */ public String getValue(); /** - * When the type attribute of the element has the value - * "text", "file" or "password", this represents the current contents of - * the corresponding form control, in an interactive user agent. - * Changing this attribute changes the contents of the form control, but - * does not change the value of the HTML value attribute of the element. - * When the type attribute of the element has the value - * "button", "hidden", "submit", "reset", "image", "checkbox" or - * "radio", this represents the HTML value attribute of the element. See + * When the type attribute of the element has the value + * "text", "file" or "password", this represents the current contents of + * the corresponding form control, in an interactive user agent. + * Changing this attribute changes the contents of the form control, but + * does not change the value of the HTML value attribute of the element. + * When the type attribute of the element has the value + * "button", "hidden", "submit", "reset", "image", "checkbox" or + * "radio", this represents the HTML value attribute of the element. See * the value attribute definition in HTML 4.01. */ public void setValue(String value); @@ -287,15 +287,15 @@ public interface HTMLInputElement extends HTMLElement { public void focus(); /** - * Select the contents of the text area. For INPUT elements - * whose type attribute has one of the following values: + * Select the contents of the text area. For INPUT elements + * whose type attribute has one of the following values: * "text", "file", or "password". */ public void select(); /** - * Simulate a mouse-click. For INPUT elements whose - * type attribute has one of the following values: + * Simulate a mouse-click. For INPUT elements whose + * type attribute has one of the following values: * "button", "checkbox", "radio", "reset", or "submit". */ public void click(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java index 898b9e46a01..f1b4b7478ce 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLIsIndexElement.java @@ -13,25 +13,25 @@ package org.w3c.dom.html2; /** - * This element is used for single-line text input. See the ISINDEX element + * This element is used for single-line text input. See the ISINDEX element * definition in HTML 4.01. This element is deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLIsIndexElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * The prompt message. See the prompt attribute definition in HTML 4.01. + * The prompt message. See the prompt attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getPrompt(); /** - * The prompt message. See the prompt attribute definition in HTML 4.01. + * The prompt message. See the prompt attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setPrompt(String prompt); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java index df20c000ac2..3a69f5e9ec2 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLIElement.java @@ -18,25 +18,25 @@ package org.w3c.dom.html2; */ public interface HTMLLIElement extends HTMLElement { /** - * List item bullet style. See the type attribute definition in HTML 4.01. + * List item bullet style. See the type attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getType(); /** - * List item bullet style. See the type attribute definition in HTML 4.01. + * List item bullet style. See the type attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setType(String type); /** - * Reset sequence number when used in OL. See the value - * attribute definition in HTML 4.01. This attribute is deprecated in + * Reset sequence number when used in OL. See the value + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public int getValue(); /** - * Reset sequence number when used in OL. See the value - * attribute definition in HTML 4.01. This attribute is deprecated in + * Reset sequence number when used in OL. See the value + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public void setValue(int value); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java index 69a104053c2..ef1a10aea57 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLabelElement.java @@ -18,32 +18,32 @@ package org.w3c.dom.html2; */ public interface HTMLLabelElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * This attribute links this label with another form control by - * id attribute. See the for attribute definition in HTML + * This attribute links this label with another form control by + * id attribute. See the for attribute definition in HTML * 4.01. */ public String getHtmlFor(); /** - * This attribute links this label with another form control by - * id attribute. See the for attribute definition in HTML + * This attribute links this label with another form control by + * id attribute. See the for attribute definition in HTML * 4.01. */ public void setHtmlFor(String htmlFor); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java index b976d099a6a..774a11640dd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLegendElement.java @@ -13,38 +13,38 @@ package org.w3c.dom.html2; /** - * Provides a caption for a FIELDSET grouping. See the LEGEND + * Provides a caption for a FIELDSET grouping. See the LEGEND * element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLLegendElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * Text alignment relative to FIELDSET. See the align - * attribute definition in HTML 4.01. This attribute is deprecated in + * Text alignment relative to FIELDSET. See the align + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public String getAlign(); /** - * Text alignment relative to FIELDSET. See the align - * attribute definition in HTML 4.01. This attribute is deprecated in + * Text alignment relative to FIELDSET. See the align + * attribute definition in HTML 4.01. This attribute is deprecated in * HTML 4.01. */ public void setAlign(String align); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java index 4ed72ca9483..8210a4a3535 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLLinkElement.java @@ -13,64 +13,64 @@ package org.w3c.dom.html2; /** - * The LINK element specifies a link to an external resource, and - * defines this document's relationship to that resource (or vice versa). - * See the LINK element definition in HTML 4.01 (see also the + * The LINK element specifies a link to an external resource, and + * defines this document's relationship to that resource (or vice versa). + * See the LINK element definition in HTML 4.01 (see also the * LinkStyle interface in the StyleSheet module [DOM Level 2 Style Sheets and CSS]). *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLLinkElement extends HTMLElement { /** - * Enables/disables the link. This is currently only used for style sheet - * links, and may be used to activate or deactivate style sheets. + * Enables/disables the link. This is currently only used for style sheet + * links, and may be used to activate or deactivate style sheets. */ public boolean getDisabled(); /** - * Enables/disables the link. This is currently only used for style sheet - * links, and may be used to activate or deactivate style sheets. + * Enables/disables the link. This is currently only used for style sheet + * links, and may be used to activate or deactivate style sheets. */ public void setDisabled(boolean disabled); /** - * The character encoding of the resource being linked to. See the charset + * The character encoding of the resource being linked to. See the charset * attribute definition in HTML 4.01. */ public String getCharset(); /** - * The character encoding of the resource being linked to. See the charset + * The character encoding of the resource being linked to. See the charset * attribute definition in HTML 4.01. */ public void setCharset(String charset); /** - * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in + * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in * HTML 4.01. */ public String getHref(); /** - * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in + * The URI [IETF RFC 2396] of the linked resource. See the href attribute definition in * HTML 4.01. */ public void setHref(String href); /** - * Language code of the linked resource. See the hreflang attribute + * Language code of the linked resource. See the hreflang attribute * definition in HTML 4.01. */ public String getHreflang(); /** - * Language code of the linked resource. See the hreflang attribute + * Language code of the linked resource. See the hreflang attribute * definition in HTML 4.01. */ public void setHreflang(String hreflang); /** - * Designed for use with one or more target media. See the media attribute + * Designed for use with one or more target media. See the media attribute * definition in HTML 4.01. */ public String getMedia(); /** - * Designed for use with one or more target media. See the media attribute + * Designed for use with one or more target media. See the media attribute * definition in HTML 4.01. */ public void setMedia(String media); @@ -94,12 +94,12 @@ public interface HTMLLinkElement extends HTMLElement { public void setRev(String rev); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public String getTarget(); /** - * Frame to render the resource in. See the target attribute definition in + * Frame to render the resource in. See the target attribute definition in * HTML 4.01. */ public void setTarget(String target); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java index e413727ab4d..b1f78682a1a 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMapElement.java @@ -18,17 +18,17 @@ package org.w3c.dom.html2; */ public interface HTMLMapElement extends HTMLElement { /** - * The list of areas defined for the image map. + * The list of areas defined for the image map. */ public HTMLCollection getAreas(); /** - * Names the map (for use with usemap). See the name + * Names the map (for use with usemap). See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Names the map (for use with usemap). See the name + * Names the map (for use with usemap). See the name * attribute definition in HTML 4.01. */ public void setName(String name); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java index 7c8ec62d0eb..17e81c597e0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMenuElement.java @@ -13,18 +13,18 @@ package org.w3c.dom.html2; /** - * Menu list. See the MENU element definition in HTML 4.01. This element is + * Menu list. See the MENU element definition in HTML 4.01. This element is * deprecated in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLMenuElement extends HTMLElement { /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getCompact(); /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCompact(boolean compact); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java index b6bf05d40c7..a56fed5fc6d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLMetaElement.java @@ -13,29 +13,29 @@ package org.w3c.dom.html2; /** - * This contains generic meta-information about the document. See the META + * This contains generic meta-information about the document. See the META * element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLMetaElement extends HTMLElement { /** - * Associated information. See the content attribute definition in HTML + * Associated information. See the content attribute definition in HTML * 4.01. */ public String getContent(); /** - * Associated information. See the content attribute definition in HTML + * Associated information. See the content attribute definition in HTML * 4.01. */ public void setContent(String content); /** - * HTTP response header name [IETF RFC 2616]. See the http-equiv attribute definition in + * HTTP response header name [IETF RFC 2616]. See the http-equiv attribute definition in * HTML 4.01. */ public String getHttpEquiv(); /** - * HTTP response header name [IETF RFC 2616]. See the http-equiv attribute definition in + * HTTP response header name [IETF RFC 2616]. See the http-equiv attribute definition in * HTML 4.01. */ public void setHttpEquiv(String httpEquiv); @@ -50,12 +50,12 @@ public interface HTMLMetaElement extends HTMLElement { public void setName(String name); /** - * Select form of content. See the scheme attribute definition in HTML + * Select form of content. See the scheme attribute definition in HTML * 4.01. */ public String getScheme(); /** - * Select form of content. See the scheme attribute definition in HTML + * Select form of content. See the scheme attribute definition in HTML * 4.01. */ public void setScheme(String scheme); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java index 006ba69c4bd..f7659f0921f 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLModElement.java @@ -13,29 +13,29 @@ package org.w3c.dom.html2; /** - * Notice of modification to part of a document. See the INS and DEL element - * definitions in HTML 4.01. + * Notice of modification to part of a document. See the INS and DEL element + * definitions in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLModElement extends HTMLElement { /** - * A URI [IETF RFC 2396] designating a document that describes the reason for the change. + * A URI [IETF RFC 2396] designating a document that describes the reason for the change. * See the cite attribute definition in HTML 4.01. */ public String getCite(); /** - * A URI [IETF RFC 2396] designating a document that describes the reason for the change. + * A URI [IETF RFC 2396] designating a document that describes the reason for the change. * See the cite attribute definition in HTML 4.01. */ public void setCite(String cite); /** - * The date and time of the change. See the datetime attribute definition + * The date and time of the change. See the datetime attribute definition * in HTML 4.01. */ public String getDateTime(); /** - * The date and time of the change. See the datetime attribute definition + * The date and time of the change. See the datetime attribute definition * in HTML 4.01. */ public void setDateTime(String dateTime); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java index 13041c8a106..298d474397a 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOListElement.java @@ -18,34 +18,34 @@ package org.w3c.dom.html2; */ public interface HTMLOListElement extends HTMLElement { /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getCompact(); /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCompact(boolean compact); /** - * Starting sequence number. See the start attribute definition in HTML + * Starting sequence number. See the start attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public int getStart(); /** - * Starting sequence number. See the start attribute definition in HTML + * Starting sequence number. See the start attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setStart(int start); /** - * Numbering style. See the type attribute definition in HTML 4.01. This + * Numbering style. See the type attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getType(); /** - * Numbering style. See the type attribute definition in HTML 4.01. This + * Numbering style. See the type attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setType(String type); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java index 11795468d77..e49af5f03a8 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLObjectElement.java @@ -15,108 +15,108 @@ package org.w3c.dom.html2; import org.w3c.dom.Document; /** - * Generic embedded object.In principle, all properties on the object element - * are read-write but in some environments some properties may be read-only - * once the underlying object is instantiated. See the OBJECT element + * Generic embedded object.In principle, all properties on the object element + * are read-write but in some environments some properties may be read-only + * once the underlying object is instantiated. See the OBJECT element * definition in [HTML 4.01]. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLObjectElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * Applet class file. See the code attribute for - * HTMLAppletElement. + * Applet class file. See the code attribute for + * HTMLAppletElement. */ public String getCode(); /** - * Applet class file. See the code attribute for - * HTMLAppletElement. + * Applet class file. See the code attribute for + * HTMLAppletElement. */ public void setCode(String code); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Aligns this object (vertically or horizontally) with respect to its - * surrounding text. See the align attribute definition in HTML 4.01. + * Aligns this object (vertically or horizontally) with respect to its + * surrounding text. See the align attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Space-separated list of archives. See the archive attribute definition + * Space-separated list of archives. See the archive attribute definition * in HTML 4.01. */ public String getArchive(); /** - * Space-separated list of archives. See the archive attribute definition + * Space-separated list of archives. See the archive attribute definition * in HTML 4.01. */ public void setArchive(String archive); /** - * Width of border around the object. See the border attribute definition + * Width of border around the object. See the border attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getBorder(); /** - * Width of border around the object. See the border attribute definition + * Width of border around the object. See the border attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setBorder(String border); /** - * Base URI [IETF RFC 2396] for classid, data, and + * Base URI [IETF RFC 2396] for classid, data, and * archive attributes. See the codebase attribute definition * in HTML 4.01. */ public String getCodeBase(); /** - * Base URI [IETF RFC 2396] for classid, data, and + * Base URI [IETF RFC 2396] for classid, data, and * archive attributes. See the codebase attribute definition * in HTML 4.01. */ public void setCodeBase(String codeBase); /** - * Content type for data downloaded via classid attribute. + * Content type for data downloaded via classid attribute. * See the codetype attribute definition in HTML 4.01. */ public String getCodeType(); /** - * Content type for data downloaded via classid attribute. + * Content type for data downloaded via classid attribute. * See the codetype attribute definition in HTML 4.01. */ public void setCodeType(String codeType); /** - * A URI [IETF RFC 2396] specifying the location of the object's data. See the data + * A URI [IETF RFC 2396] specifying the location of the object's data. See the data * attribute definition in HTML 4.01. */ public String getData(); /** - * A URI [IETF RFC 2396] specifying the location of the object's data. See the data + * A URI [IETF RFC 2396] specifying the location of the object's data. See the data * attribute definition in HTML 4.01. */ public void setData(String data); /** - * Declare (for future reference), but do not instantiate, this object. + * Declare (for future reference), but do not instantiate, this object. * See the declare attribute definition in HTML 4.01. */ public boolean getDeclare(); /** - * Declare (for future reference), but do not instantiate, this object. + * Declare (for future reference), but do not instantiate, this object. * See the declare attribute definition in HTML 4.01. */ public void setDeclare(boolean declare); @@ -131,82 +131,82 @@ public interface HTMLObjectElement extends HTMLElement { public void setHeight(String height); /** - * Horizontal space, in pixels, to the left and right of this image, - * applet, or object. See the hspace attribute definition in HTML 4.01. + * Horizontal space, in pixels, to the left and right of this image, + * applet, or object. See the hspace attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public int getHspace(); /** - * Horizontal space, in pixels, to the left and right of this image, - * applet, or object. See the hspace attribute definition in HTML 4.01. + * Horizontal space, in pixels, to the left and right of this image, + * applet, or object. See the hspace attribute definition in HTML 4.01. * This attribute is deprecated in HTML 4.01. */ public void setHspace(int hspace); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public void setName(String name); /** - * Message to render while loading the object. See the standby attribute + * Message to render while loading the object. See the standby attribute * definition in HTML 4.01. */ public String getStandby(); /** - * Message to render while loading the object. See the standby attribute + * Message to render while loading the object. See the standby attribute * definition in HTML 4.01. */ public void setStandby(String standby); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * Content type for data downloaded via data attribute. See + * Content type for data downloaded via data attribute. See * the type attribute definition in HTML 4.01. */ public String getType(); /** - * Content type for data downloaded via data attribute. See + * Content type for data downloaded via data attribute. See * the type attribute definition in HTML 4.01. */ public void setType(String type); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public String getUseMap(); /** - * Use client-side image map. See the usemap attribute definition in HTML + * Use client-side image map. See the usemap attribute definition in HTML * 4.01. */ public void setUseMap(String useMap); /** - * Vertical space, in pixels, above and below this image, applet, or - * object. See the vspace attribute definition in HTML 4.01. This + * Vertical space, in pixels, above and below this image, applet, or + * object. See the vspace attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public int getVspace(); /** - * Vertical space, in pixels, above and below this image, applet, or - * object. See the vspace attribute definition in HTML 4.01. This + * Vertical space, in pixels, above and below this image, applet, or + * object. See the vspace attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setVspace(int vspace); @@ -221,7 +221,7 @@ public interface HTMLObjectElement extends HTMLElement { public void setWidth(String width); /** - * The document this object contains, if there is any and it is available, + * The document this object contains, if there is any and it is available, * or null otherwise. * @since DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java index 8bd606a7126..8e680a23cf3 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptGroupElement.java @@ -13,18 +13,18 @@ package org.w3c.dom.html2; /** - * Group options together in logical subdivisions. See the OPTGROUP element + * Group options together in logical subdivisions. See the OPTGROUP element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLOptGroupElement extends HTMLElement { /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java index f3b38a6019c..fe932ca87f5 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionElement.java @@ -18,31 +18,31 @@ package org.w3c.dom.html2; */ public interface HTMLOptionElement extends HTMLElement { /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * Represents the value of the HTML selected attribute. The value of this - * attribute does not change if the state of the corresponding form - * control, in an interactive user agent, changes. See the selected + * Represents the value of the HTML selected attribute. The value of this + * attribute does not change if the state of the corresponding form + * control, in an interactive user agent, changes. See the selected * attribute definition in HTML 4.01. * @version DOM Level 2 */ public boolean getDefaultSelected(); /** - * Represents the value of the HTML selected attribute. The value of this - * attribute does not change if the state of the corresponding form - * control, in an interactive user agent, changes. See the selected + * Represents the value of the HTML selected attribute. The value of this + * attribute does not change if the state of the corresponding form + * control, in an interactive user agent, changes. See the selected * attribute definition in HTML 4.01. * @version DOM Level 2 */ public void setDefaultSelected(boolean defaultSelected); /** - * The text contained within the option element. + * The text contained within the option element. */ public String getText(); @@ -54,49 +54,49 @@ public interface HTMLOptionElement extends HTMLElement { public int getIndex(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); /** - * Option label for use in hierarchical menus. See the label attribute + * Option label for use in hierarchical menus. See the label attribute * definition in HTML 4.01. */ public String getLabel(); /** - * Option label for use in hierarchical menus. See the label attribute + * Option label for use in hierarchical menus. See the label attribute * definition in HTML 4.01. */ public void setLabel(String label); /** - * Represents the current state of the corresponding form control, in an - * interactive user agent. Changing this attribute changes the state of - * the form control, but does not change the value of the HTML selected + * Represents the current state of the corresponding form control, in an + * interactive user agent. Changing this attribute changes the state of + * the form control, but does not change the value of the HTML selected * attribute of the element. */ public boolean getSelected(); /** - * Represents the current state of the corresponding form control, in an - * interactive user agent. Changing this attribute changes the state of - * the form control, but does not change the value of the HTML selected + * Represents the current state of the corresponding form control, in an + * interactive user agent. Changing this attribute changes the state of + * the form control, but does not change the value of the HTML selected * attribute of the element. */ public void setSelected(boolean selected); /** - * The current form control value. See the value attribute definition in + * The current form control value. See the value attribute definition in * HTML 4.01. */ public String getValue(); /** - * The current form control value. See the value attribute definition in + * The current form control value. See the value attribute definition in * HTML 4.01. */ public void setValue(String value); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java index d70d92d73e2..a28c5ac274c 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLOptionsCollection.java @@ -16,51 +16,51 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * An HTMLOptionsCollection is a list of nodes representing HTML - * option element. An individual node may be accessed by either ordinal - * index or the node's name or id attributes. - * Collections in the HTML DOM are assumed to be live meaning that they are - * automatically updated when the underlying document is changed. + * An HTMLOptionsCollection is a list of nodes representing HTML + * option element. An individual node may be accessed by either ordinal + * index or the node's name or id attributes. + * Collections in the HTML DOM are assumed to be live meaning that they are + * automatically updated when the underlying document is changed. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. * @since DOM Level 2 */ public interface HTMLOptionsCollection { /** - * This attribute specifies the length or size of the list. + * This attribute specifies the length or size of the list. */ public int getLength(); /** - * This attribute specifies the length or size of the list. + * This attribute specifies the length or size of the list. * @exception DOMException - * NOT_SUPPORTED_ERR: if setting the length is not allowed by the - * implementation. + * NOT_SUPPORTED_ERR: if setting the length is not allowed by the + * implementation. */ public void setLength(int length) throws DOMException; /** - * This method retrieves a node specified by ordinal index. Nodes are - * numbered in tree order (depth-first traversal order). - * @param index The index of the node to be fetched. The index origin is + * This method retrieves a node specified by ordinal index. Nodes are + * numbered in tree order (depth-first traversal order). + * @param index The index of the node to be fetched. The index origin is * 0. - * @return The Node at the corresponding position upon - * success. A value of null is returned if the index is - * out of range. + * @return The Node at the corresponding position upon + * success. A value of null is returned if the index is + * out of range. */ public Node item(int index); /** - * This method retrieves a Node using a name. It first - * searches for a Node with a matching id - * attribute. If it doesn't find one, it then searches for a - * Node with a matching name attribute, but - * only on those elements that are allowed a name attribute. This method - * is case insensitive in HTML documents and case sensitive in XHTML + * This method retrieves a Node using a name. It first + * searches for a Node with a matching id + * attribute. If it doesn't find one, it then searches for a + * Node with a matching name attribute, but + * only on those elements that are allowed a name attribute. This method + * is case insensitive in HTML documents and case sensitive in XHTML * documents. * @param name The name of the Node to be fetched. - * @return The Node with a name or - * id attribute whose value corresponds to the specified - * string. Upon failure (e.g., no node with this name exists), returns + * @return The Node with a name or + * id attribute whose value corresponds to the specified + * string. Upon failure (e.g., no node with this name exists), returns * null. */ public Node namedItem(String name); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java index 1cb8e04203b..b59f505f930 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParagraphElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLParagraphElement extends HTMLElement { /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Horizontal text alignment. See the align attribute definition in HTML + * Horizontal text alignment. See the align attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java index ecf91c287d3..33f5f7788c4 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLParamElement.java @@ -13,53 +13,53 @@ package org.w3c.dom.html2; /** - * Parameters fed to the OBJECT element. See the PARAM element + * Parameters fed to the OBJECT element. See the PARAM element * definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLParamElement extends HTMLElement { /** - * The name of a run-time parameter. See the name attribute definition in + * The name of a run-time parameter. See the name attribute definition in * HTML 4.01. */ public String getName(); /** - * The name of a run-time parameter. See the name attribute definition in + * The name of a run-time parameter. See the name attribute definition in * HTML 4.01. */ public void setName(String name); /** - * Content type for the value attribute when - * valuetype has the value "ref". See the type attribute + * Content type for the value attribute when + * valuetype has the value "ref". See the type attribute * definition in HTML 4.01. */ public String getType(); /** - * Content type for the value attribute when - * valuetype has the value "ref". See the type attribute + * Content type for the value attribute when + * valuetype has the value "ref". See the type attribute * definition in HTML 4.01. */ public void setType(String type); /** - * The value of a run-time parameter. See the value attribute definition + * The value of a run-time parameter. See the value attribute definition * in HTML 4.01. */ public String getValue(); /** - * The value of a run-time parameter. See the value attribute definition + * The value of a run-time parameter. See the value attribute definition * in HTML 4.01. */ public void setValue(String value); /** - * Information about the meaning of the value attribute + * Information about the meaning of the value attribute * value. See the valuetype attribute definition in HTML 4.01. */ public String getValueType(); /** - * Information about the meaning of the value attribute + * Information about the meaning of the value attribute * value. See the valuetype attribute definition in HTML 4.01. */ public void setValueType(String valueType); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java index bab7358a730..2d39837ed97 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLPreElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLPreElement extends HTMLElement { /** - * Fixed width for content. See the width attribute definition in HTML + * Fixed width for content. See the width attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public int getWidth(); /** - * Fixed width for content. See the width attribute definition in HTML + * Fixed width for content. See the width attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setWidth(int width); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java index c7cc666f417..aba49746e3a 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLQuoteElement.java @@ -13,18 +13,18 @@ package org.w3c.dom.html2; /** - * For the Q and BLOCKQUOTE elements. See the Q + * For the Q and BLOCKQUOTE elements. See the Q * element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLQuoteElement extends HTMLElement { /** - * A URI [IETF RFC 2396] designating a source document or message. See the cite attribute + * A URI [IETF RFC 2396] designating a source document or message. See the cite attribute * definition in HTML 4.01. */ public String getCite(); /** - * A URI [IETF RFC 2396] designating a source document or message. See the cite attribute + * A URI [IETF RFC 2396] designating a source document or message. See the cite attribute * definition in HTML 4.01. */ public void setCite(String cite); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java index a35f7ddc1cb..226b394a926 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLScriptElement.java @@ -18,72 +18,72 @@ package org.w3c.dom.html2; */ public interface HTMLScriptElement extends HTMLElement { /** - * The script content of the element. + * The script content of the element. */ public String getText(); /** - * The script content of the element. + * The script content of the element. */ public void setText(String text); /** - * Reserved for future use. + * Reserved for future use. */ public String getHtmlFor(); /** - * Reserved for future use. + * Reserved for future use. */ public void setHtmlFor(String htmlFor); /** - * Reserved for future use. + * Reserved for future use. */ public String getEvent(); /** - * Reserved for future use. + * Reserved for future use. */ public void setEvent(String event); /** - * The character encoding of the linked resource. See the charset + * The character encoding of the linked resource. See the charset * attribute definition in HTML 4.01. */ public String getCharset(); /** - * The character encoding of the linked resource. See the charset + * The character encoding of the linked resource. See the charset * attribute definition in HTML 4.01. */ public void setCharset(String charset); /** - * Indicates that the user agent can defer processing of the script. See + * Indicates that the user agent can defer processing of the script. See * the defer attribute definition in HTML 4.01. */ public boolean getDefer(); /** - * Indicates that the user agent can defer processing of the script. See + * Indicates that the user agent can defer processing of the script. See * the defer attribute definition in HTML 4.01. */ public void setDefer(boolean defer); /** - * URI [IETF RFC 2396] designating an external script. See the src attribute definition + * URI [IETF RFC 2396] designating an external script. See the src attribute definition * in HTML 4.01. */ public String getSrc(); /** - * URI [IETF RFC 2396] designating an external script. See the src attribute definition + * URI [IETF RFC 2396] designating an external script. See the src attribute definition * in HTML 4.01. */ public void setSrc(String src); /** - * The content type of the script language. See the type attribute + * The content type of the script language. See the type attribute * definition in HTML 4.01. */ public String getType(); /** - * The content type of the script language. See the type attribute + * The content type of the script language. See the type attribute * definition in HTML 4.01. */ public void setType(String type); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java index c5d83b05182..98dbc836d94 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLSelectElement.java @@ -15,105 +15,105 @@ package org.w3c.dom.html2; import org.w3c.dom.DOMException; /** - * The select element allows the selection of an option. The contained options - * can be directly accessed through the select element as a collection. See + * The select element allows the selection of an option. The contained options + * can be directly accessed through the select element as a collection. See * the SELECT element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLSelectElement extends HTMLElement { /** - * The type of this form control. This is the string "select-multiple" - * when the multiple attribute is true and the string + * The type of this form control. This is the string "select-multiple" + * when the multiple attribute is true and the string * "select-one" when false. */ public String getType(); /** - * The ordinal index of the selected option, starting from 0. The value -1 - * is returned if no element is selected. If multiple options are - * selected, the index of the first selected option is returned. + * The ordinal index of the selected option, starting from 0. The value -1 + * is returned if no element is selected. If multiple options are + * selected, the index of the first selected option is returned. */ public int getSelectedIndex(); /** - * The ordinal index of the selected option, starting from 0. The value -1 - * is returned if no element is selected. If multiple options are - * selected, the index of the first selected option is returned. + * The ordinal index of the selected option, starting from 0. The value -1 + * is returned if no element is selected. If multiple options are + * selected, the index of the first selected option is returned. */ public void setSelectedIndex(int selectedIndex); /** - * The current form control value (i.e. the value of the currently - * selected option), if multiple options are selected this is the value - * of the first selected option. + * The current form control value (i.e. the value of the currently + * selected option), if multiple options are selected this is the value + * of the first selected option. */ public String getValue(); /** - * The current form control value (i.e. the value of the currently - * selected option), if multiple options are selected this is the value - * of the first selected option. + * The current form control value (i.e. the value of the currently + * selected option), if multiple options are selected this is the value + * of the first selected option. */ public void setValue(String value); /** - * The number of options in this SELECT. + * The number of options in this SELECT. * @version DOM Level 2 */ public int getLength(); /** - * The number of options in this SELECT. + * The number of options in this SELECT. * @exception DOMException - * NOT_SUPPORTED_ERR: if setting the length is not allowed by the - * implementation. + * NOT_SUPPORTED_ERR: if setting the length is not allowed by the + * implementation. * @version DOM Level 2 */ public void setLength(int length) throws DOMException; /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * The collection of OPTION elements contained by this - * element. + * The collection of OPTION elements contained by this + * element. * @version DOM Level 2 */ public HTMLOptionsCollection getOptions(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); /** - * If true, multiple OPTION elements may be selected in this - * SELECT. See the multiple attribute definition in HTML + * If true, multiple OPTION elements may be selected in this + * SELECT. See the multiple attribute definition in HTML * 4.01. */ public boolean getMultiple(); /** - * If true, multiple OPTION elements may be selected in this - * SELECT. See the multiple attribute definition in HTML + * If true, multiple OPTION elements may be selected in this + * SELECT. See the multiple attribute definition in HTML * 4.01. */ public void setMultiple(boolean multiple); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public void setName(String name); @@ -128,39 +128,39 @@ public interface HTMLSelectElement extends HTMLElement { public void setSize(int size); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); /** - * Add a new element to the collection of OPTION elements for - * this SELECT. This method is the equivalent of the - * appendChild method of the Node interface if - * the before parameter is null. It is - * equivalent to the insertBefore method on the parent of - * before in all other cases. This method may have no - * effect if the new element is not an OPTION or an + * Add a new element to the collection of OPTION elements for + * this SELECT. This method is the equivalent of the + * appendChild method of the Node interface if + * the before parameter is null. It is + * equivalent to the insertBefore method on the parent of + * before in all other cases. This method may have no + * effect if the new element is not an OPTION or an * OPTGROUP. * @param element The element to add. - * @param before The element to insert before, or null for + * @param before The element to insert before, or null for * the tail of the list. * @exception DOMException - * NOT_FOUND_ERR: Raised if before is not a descendant of - * the SELECT element. + * NOT_FOUND_ERR: Raised if before is not a descendant of + * the SELECT element. */ - public void add(HTMLElement element, + public void add(HTMLElement element, HTMLElement before) throws DOMException; /** - * Remove an element from the collection of OPTION elements - * for this SELECT. Does nothing if no element has the + * Remove an element from the collection of OPTION elements + * for this SELECT. Does nothing if no element has the * given index. * @param index The index of the item to remove, starting from 0. */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java index 148bcda1cf2..2512d63a6bc 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLStyleElement.java @@ -13,39 +13,39 @@ package org.w3c.dom.html2; /** - * Style information. See the STYLE element definition in HTML 4.01, the CSS - * module [DOM Level 2 Style Sheets and CSS] and the LinkStyle interface in the StyleSheets - * module [DOM Level 2 Style Sheets and CSS]. + * Style information. See the STYLE element definition in HTML 4.01, the CSS + * module [DOM Level 2 Style Sheets and CSS] and the LinkStyle interface in the StyleSheets + * module [DOM Level 2 Style Sheets and CSS]. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLStyleElement extends HTMLElement { /** - * Enables/disables the style sheet. + * Enables/disables the style sheet. */ public boolean getDisabled(); /** - * Enables/disables the style sheet. + * Enables/disables the style sheet. */ public void setDisabled(boolean disabled); /** - * Designed for use with one or more target media. See the media attribute + * Designed for use with one or more target media. See the media attribute * definition in HTML 4.01. */ public String getMedia(); /** - * Designed for use with one or more target media. See the media attribute + * Designed for use with one or more target media. See the media attribute * definition in HTML 4.01. */ public void setMedia(String media); /** - * The content type of the style sheet language. See the type attribute + * The content type of the style sheet language. See the type attribute * definition in HTML 4.01. */ public String getType(); /** - * The content type of the style sheet language. See the type attribute + * The content type of the style sheet language. See the type attribute * definition in HTML 4.01. */ public void setType(String type); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java index 6c0d872e541..47466e9e977 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCaptionElement.java @@ -18,12 +18,12 @@ package org.w3c.dom.html2; */ public interface HTMLTableCaptionElement extends HTMLElement { /** - * Caption alignment with respect to the table. See the align attribute + * Caption alignment with respect to the table. See the align attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Caption alignment with respect to the table. See the align attribute + * Caption alignment with respect to the table. See the align attribute * definition in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setAlign(String align); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java index 1e8dc3d4738..2e4db709551 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableCellElement.java @@ -13,24 +13,24 @@ package org.w3c.dom.html2; /** - * The object used to represent the TH and TD + * The object used to represent the TH and TD * elements. See the TD element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLTableCellElement extends HTMLElement { /** - * The index of this cell in the row, starting from 0. This index is in + * The index of this cell in the row, starting from 0. This index is in * document tree order and not display order. */ public int getCellIndex(); /** - * Abbreviation for header cells. See the abbr attribute definition in + * Abbreviation for header cells. See the abbr attribute definition in * HTML 4.01. */ public String getAbbr(); /** - * Abbreviation for header cells. See the abbr attribute definition in + * Abbreviation for header cells. See the abbr attribute definition in * HTML 4.01. */ public void setAbbr(String abbr); @@ -47,133 +47,133 @@ public interface HTMLTableCellElement extends HTMLElement { public void setAlign(String align); /** - * Names group of related headers. See the axis attribute definition in + * Names group of related headers. See the axis attribute definition in * HTML 4.01. */ public String getAxis(); /** - * Names group of related headers. See the axis attribute definition in + * Names group of related headers. See the axis attribute definition in * HTML 4.01. */ public void setAxis(String axis); /** - * Cell background color. See the bgcolor attribute definition in HTML + * Cell background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getBgColor(); /** - * Cell background color. See the bgcolor attribute definition in HTML + * Cell background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setBgColor(String bgColor); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public String getCh(); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public void setCh(String ch); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public String getChOff(); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public void setChOff(String chOff); /** - * Number of columns spanned by cell. See the colspan attribute definition + * Number of columns spanned by cell. See the colspan attribute definition * in HTML 4.01. */ public int getColSpan(); /** - * Number of columns spanned by cell. See the colspan attribute definition + * Number of columns spanned by cell. See the colspan attribute definition * in HTML 4.01. */ public void setColSpan(int colSpan); /** - * List of id attribute values for header cells. See the + * List of id attribute values for header cells. See the * headers attribute definition in HTML 4.01. */ public String getHeaders(); /** - * List of id attribute values for header cells. See the + * List of id attribute values for header cells. See the * headers attribute definition in HTML 4.01. */ public void setHeaders(String headers); /** - * Cell height. See the height attribute definition in HTML 4.01. This + * Cell height. See the height attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getHeight(); /** - * Cell height. See the height attribute definition in HTML 4.01. This + * Cell height. See the height attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setHeight(String height); /** - * Suppress word wrapping. See the nowrap attribute definition in HTML + * Suppress word wrapping. See the nowrap attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getNoWrap(); /** - * Suppress word wrapping. See the nowrap attribute definition in HTML + * Suppress word wrapping. See the nowrap attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setNoWrap(boolean noWrap); /** - * Number of rows spanned by cell. See the rowspan attribute definition in + * Number of rows spanned by cell. See the rowspan attribute definition in * HTML 4.01. */ public int getRowSpan(); /** - * Number of rows spanned by cell. See the rowspan attribute definition in + * Number of rows spanned by cell. See the rowspan attribute definition in * HTML 4.01. */ public void setRowSpan(int rowSpan); /** - * Scope covered by header cells. See the scope attribute definition in + * Scope covered by header cells. See the scope attribute definition in * HTML 4.01. */ public String getScope(); /** - * Scope covered by header cells. See the scope attribute definition in + * Scope covered by header cells. See the scope attribute definition in * HTML 4.01. */ public void setScope(String scope); /** - * Vertical alignment of data in cell. See the valign attribute definition + * Vertical alignment of data in cell. See the valign attribute definition * in HTML 4.01. */ public String getVAlign(); /** - * Vertical alignment of data in cell. See the valign attribute definition + * Vertical alignment of data in cell. See the valign attribute definition * in HTML 4.01. */ public void setVAlign(String vAlign); /** - * Cell width. See the width attribute definition in HTML 4.01. This + * Cell width. See the width attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getWidth(); /** - * Cell width. See the width attribute definition in HTML 4.01. This + * Cell width. See the width attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setWidth(String width); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java index 85a42ddd2bb..57bb35cfcb9 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableColElement.java @@ -13,62 +13,62 @@ package org.w3c.dom.html2; /** - * Regroups the COL and COLGROUP elements. See the + * Regroups the COL and COLGROUP elements. See the * COL element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLTableColElement extends HTMLElement { /** - * Horizontal alignment of cell data in column. See the align attribute + * Horizontal alignment of cell data in column. See the align attribute * definition in HTML 4.01. */ public String getAlign(); /** - * Horizontal alignment of cell data in column. See the align attribute + * Horizontal alignment of cell data in column. See the align attribute * definition in HTML 4.01. */ public void setAlign(String align); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public String getCh(); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public void setCh(String ch); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public String getChOff(); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public void setChOff(String chOff); /** - * Indicates the number of columns in a group or affected by a grouping. + * Indicates the number of columns in a group or affected by a grouping. * See the span attribute definition in HTML 4.01. */ public int getSpan(); /** - * Indicates the number of columns in a group or affected by a grouping. + * Indicates the number of columns in a group or affected by a grouping. * See the span attribute definition in HTML 4.01. */ public void setSpan(int span); /** - * Vertical alignment of cell data in column. See the valign attribute + * Vertical alignment of cell data in column. See the valign attribute * definition in HTML 4.01. */ public String getVAlign(); /** - * Vertical alignment of cell data in column. See the valign attribute + * Vertical alignment of cell data in column. See the valign attribute * definition in HTML 4.01. */ public void setVAlign(String vAlign); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java index d36b19cfa78..ae15deb77d1 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableElement.java @@ -15,65 +15,65 @@ package org.w3c.dom.html2; import org.w3c.dom.DOMException; /** - * The create* and delete* methods on the table allow authors to construct and - * modify tables. [HTML 4.01] specifies that only one of each of the - * CAPTION, THEAD, and TFOOT elements - * may exist in a table. Therefore, if one exists, and the createTHead() or - * createTFoot() method is called, the method returns the existing THead or + * The create* and delete* methods on the table allow authors to construct and + * modify tables. [HTML 4.01] specifies that only one of each of the + * CAPTION, THEAD, and TFOOT elements + * may exist in a table. Therefore, if one exists, and the createTHead() or + * createTFoot() method is called, the method returns the existing THead or * TFoot element. See the TABLE element definition in HTML 4.01. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLTableElement extends HTMLElement { /** - * Returns the table's CAPTION, or void if none exists. + * Returns the table's CAPTION, or void if none exists. * @version DOM Level 2 */ public HTMLTableCaptionElement getCaption(); /** - * Returns the table's CAPTION, or void if none exists. + * Returns the table's CAPTION, or void if none exists. * @exception DOMException - * HIERARCHY_REQUEST_ERR: if the element is not a CAPTION. + * HIERARCHY_REQUEST_ERR: if the element is not a CAPTION. * @version DOM Level 2 */ public void setCaption(HTMLTableCaptionElement caption) throws DOMException; /** - * Returns the table's THEAD, or null if none - * exists. + * Returns the table's THEAD, or null if none + * exists. * @version DOM Level 2 */ public HTMLTableSectionElement getTHead(); /** - * Returns the table's THEAD, or null if none - * exists. + * Returns the table's THEAD, or null if none + * exists. * @exception DOMException - * HIERARCHY_REQUEST_ERR: if the element is not a THEAD. + * HIERARCHY_REQUEST_ERR: if the element is not a THEAD. * @version DOM Level 2 */ public void setTHead(HTMLTableSectionElement tHead) throws DOMException; /** - * Returns the table's TFOOT, or null if none - * exists. + * Returns the table's TFOOT, or null if none + * exists. * @version DOM Level 2 */ public HTMLTableSectionElement getTFoot(); /** - * Returns the table's TFOOT, or null if none - * exists. + * Returns the table's TFOOT, or null if none + * exists. * @exception DOMException - * HIERARCHY_REQUEST_ERR: if the element is not a TFOOT. + * HIERARCHY_REQUEST_ERR: if the element is not a TFOOT. * @version DOM Level 2 */ public void setTFoot(HTMLTableSectionElement tFoot) throws DOMException; /** - * Returns a collection of all the rows in the table, including all in - * THEAD, TFOOT, all TBODY - * elements. + * Returns a collection of all the rows in the table, including all in + * THEAD, TFOOT, all TBODY + * elements. */ public HTMLCollection getRows(); @@ -83,102 +83,102 @@ public interface HTMLTableElement extends HTMLElement { public HTMLCollection getTBodies(); /** - * Specifies the table's position with respect to the rest of the - * document. See the align attribute definition in HTML 4.01. This + * Specifies the table's position with respect to the rest of the + * document. See the align attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getAlign(); /** - * Specifies the table's position with respect to the rest of the - * document. See the align attribute definition in HTML 4.01. This + * Specifies the table's position with respect to the rest of the + * document. See the align attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setAlign(String align); /** - * Cell background color. See the bgcolor attribute definition in HTML + * Cell background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getBgColor(); /** - * Cell background color. See the bgcolor attribute definition in HTML + * Cell background color. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setBgColor(String bgColor); /** - * The width of the border around the table. See the border attribute + * The width of the border around the table. See the border attribute * definition in HTML 4.01. */ public String getBorder(); /** - * The width of the border around the table. See the border attribute + * The width of the border around the table. See the border attribute * definition in HTML 4.01. */ public void setBorder(String border); /** - * Specifies the horizontal and vertical space between cell content and + * Specifies the horizontal and vertical space between cell content and * cell borders. See the cellpadding attribute definition in HTML 4.01. */ public String getCellPadding(); /** - * Specifies the horizontal and vertical space between cell content and + * Specifies the horizontal and vertical space between cell content and * cell borders. See the cellpadding attribute definition in HTML 4.01. */ public void setCellPadding(String cellPadding); /** - * Specifies the horizontal and vertical separation between cells. See the + * Specifies the horizontal and vertical separation between cells. See the * cellspacing attribute definition in HTML 4.01. */ public String getCellSpacing(); /** - * Specifies the horizontal and vertical separation between cells. See the + * Specifies the horizontal and vertical separation between cells. See the * cellspacing attribute definition in HTML 4.01. */ public void setCellSpacing(String cellSpacing); /** - * Specifies which external table borders to render. See the frame + * Specifies which external table borders to render. See the frame * attribute definition in HTML 4.01. */ public String getFrame(); /** - * Specifies which external table borders to render. See the frame + * Specifies which external table borders to render. See the frame * attribute definition in HTML 4.01. */ public void setFrame(String frame); /** - * Specifies which internal table borders to render. See the rules + * Specifies which internal table borders to render. See the rules * attribute definition in HTML 4.01. */ public String getRules(); /** - * Specifies which internal table borders to render. See the rules + * Specifies which internal table borders to render. See the rules * attribute definition in HTML 4.01. */ public void setRules(String rules); /** - * Description about the purpose or structure of a table. See the summary + * Description about the purpose or structure of a table. See the summary * attribute definition in HTML 4.01. */ public String getSummary(); /** - * Description about the purpose or structure of a table. See the summary + * Description about the purpose or structure of a table. See the summary * attribute definition in HTML 4.01. */ public void setSummary(String summary); /** - * Specifies the desired table width. See the width attribute definition + * Specifies the desired table width. See the width attribute definition * in HTML 4.01. */ public String getWidth(); /** - * Specifies the desired table width. See the width attribute definition + * Specifies the desired table width. See the width attribute definition * in HTML 4.01. */ public void setWidth(String width); @@ -217,19 +217,19 @@ public interface HTMLTableElement extends HTMLElement { public void deleteCaption(); /** - * Insert a new empty row in the table. The new row is inserted - * immediately before and in the same section as the current - * indexth row in the table. If index is -1 or - * equal to the number of rows, the new row is appended. In addition, - * when the table is empty the row is inserted into a TBODY - * which is created and inserted into the table.A table row cannot be + * Insert a new empty row in the table. The new row is inserted + * immediately before and in the same section as the current + * indexth row in the table. If index is -1 or + * equal to the number of rows, the new row is appended. In addition, + * when the table is empty the row is inserted into a TBODY + * which is created and inserted into the table.A table row cannot be * empty according to [HTML 4.01]. - * @param index The row number where to insert a new row. This index - * starts from 0 and is relative to the logical order (not document + * @param index The row number where to insert a new row. This index + * starts from 0 and is relative to the logical order (not document * order) of all the rows contained inside the table. * @return The newly created row. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater than the + * INDEX_SIZE_ERR: Raised if the specified index is greater than the * number of rows or if the index is a negative number other than -1. * @version DOM Level 2 */ @@ -238,13 +238,13 @@ public interface HTMLTableElement extends HTMLElement { /** * Delete a table row. - * @param index The index of the row to be deleted. This index starts - * from 0 and is relative to the logical order (not document order) of - * all the rows contained inside the table. If the index is -1 the + * @param index The index of the row to be deleted. This index starts + * from 0 and is relative to the logical order (not document order) of + * all the rows contained inside the table. If the index is -1 the * last row in the table is deleted. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater than or - * equal to the number of rows or if the index is a negative number + * INDEX_SIZE_ERR: Raised if the specified index is greater than or + * equal to the number of rows or if the index is a negative number * other than -1. * @version DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java index 9f4fbf96c67..8c3618f397e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableRowElement.java @@ -20,11 +20,11 @@ import org.w3c.dom.DOMException; */ public interface HTMLTableRowElement extends HTMLElement { /** - * This is in logical order and not in document order. The + * This is in logical order and not in document order. The * rowIndex does take into account sections ( - * THEAD, TFOOT, or TBODY) within - * the table, placing THEAD rows first in the index, - * followed by TBODY rows, followed by TFOOT + * THEAD, TFOOT, or TBODY) within + * the table, placing THEAD rows first in the index, + * followed by TBODY rows, followed by TFOOT * rows. * @version DOM Level 2 */ @@ -32,82 +32,82 @@ public interface HTMLTableRowElement extends HTMLElement { /** * The index of this row, relative to the current section ( - * THEAD, TFOOT, or TBODY), + * THEAD, TFOOT, or TBODY), * starting from 0. * @version DOM Level 2 */ public int getSectionRowIndex(); /** - * The collection of cells in this row. + * The collection of cells in this row. * @version DOM Level 2 */ public HTMLCollection getCells(); /** - * Horizontal alignment of data within cells of this row. See the align + * Horizontal alignment of data within cells of this row. See the align * attribute definition in HTML 4.01. */ public String getAlign(); /** - * Horizontal alignment of data within cells of this row. See the align + * Horizontal alignment of data within cells of this row. See the align * attribute definition in HTML 4.01. */ public void setAlign(String align); /** - * Background color for rows. See the bgcolor attribute definition in HTML + * Background color for rows. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public String getBgColor(); /** - * Background color for rows. See the bgcolor attribute definition in HTML + * Background color for rows. See the bgcolor attribute definition in HTML * 4.01. This attribute is deprecated in HTML 4.01. */ public void setBgColor(String bgColor); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public String getCh(); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public void setCh(String ch); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public String getChOff(); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public void setChOff(String chOff); /** - * Vertical alignment of data within cells of this row. See the valign + * Vertical alignment of data within cells of this row. See the valign * attribute definition in HTML 4.01. */ public String getVAlign(); /** - * Vertical alignment of data within cells of this row. See the valign + * Vertical alignment of data within cells of this row. See the valign * attribute definition in HTML 4.01. */ public void setVAlign(String vAlign); /** - * Insert an empty TD cell into this row. If - * index is -1 or equal to the number of cells, the new + * Insert an empty TD cell into this row. If + * index is -1 or equal to the number of cells, the new * cell is appended. * @param index The place to insert the cell, starting from 0. * @return The newly created cell. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater - * than the number of cells or if the index is a negative number other + * INDEX_SIZE_ERR: Raised if the specified index is greater + * than the number of cells or if the index is a negative number other * than -1. * @version DOM Level 2 */ @@ -116,11 +116,11 @@ public interface HTMLTableRowElement extends HTMLElement { /** * Delete a cell from the current row. - * @param index The index of the cell to delete, starting from 0. If the + * @param index The index of the cell to delete, starting from 0. If the * index is -1 the last cell in the row is deleted. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater - * than or equal to the number of cells or if the index is a negative + * INDEX_SIZE_ERR: Raised if the specified index is greater + * than or equal to the number of cells or if the index is a negative * number other than -1. * @version DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java index 5aa6ce4402d..5e3d6e53ff1 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTableSectionElement.java @@ -15,71 +15,71 @@ package org.w3c.dom.html2; import org.w3c.dom.DOMException; /** - * The THEAD, TFOOT, and TBODY - * elements. + * The THEAD, TFOOT, and TBODY + * elements. *

    See also the Document Object Model (DOM) Level 2 HTML Specification. */ public interface HTMLTableSectionElement extends HTMLElement { /** - * Horizontal alignment of data in cells. See the align - * attribute for HTMLTheadElement for details. + * Horizontal alignment of data in cells. See the align + * attribute for HTMLTheadElement for details. */ public String getAlign(); /** - * Horizontal alignment of data in cells. See the align - * attribute for HTMLTheadElement for details. + * Horizontal alignment of data in cells. See the align + * attribute for HTMLTheadElement for details. */ public void setAlign(String align); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public String getCh(); /** - * Alignment character for cells in a column. See the char attribute + * Alignment character for cells in a column. See the char attribute * definition in HTML 4.01. */ public void setCh(String ch); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public String getChOff(); /** - * Offset of alignment character. See the charoff attribute definition in + * Offset of alignment character. See the charoff attribute definition in * HTML 4.01. */ public void setChOff(String chOff); /** - * Vertical alignment of data in cells. See the valign - * attribute for HTMLTheadElement for details. + * Vertical alignment of data in cells. See the valign + * attribute for HTMLTheadElement for details. */ public String getVAlign(); /** - * Vertical alignment of data in cells. See the valign - * attribute for HTMLTheadElement for details. + * Vertical alignment of data in cells. See the valign + * attribute for HTMLTheadElement for details. */ public void setVAlign(String vAlign); /** - * The collection of rows in this table section. + * The collection of rows in this table section. */ public HTMLCollection getRows(); /** - * Insert a row into this section. The new row is inserted immediately - * before the current indexth row in this section. If - * index is -1 or equal to the number of rows in this + * Insert a row into this section. The new row is inserted immediately + * before the current indexth row in this section. If + * index is -1 or equal to the number of rows in this * section, the new row is appended. - * @param index The row number where to insert a new row. This index - * starts from 0 and is relative only to the rows contained inside + * @param index The row number where to insert a new row. This index + * starts from 0 and is relative only to the rows contained inside * this section, not all the rows in the table. * @return The newly created row. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater than the + * INDEX_SIZE_ERR: Raised if the specified index is greater than the * number of rows of if the index is a negative number other than -1. * @version DOM Level 2 */ @@ -88,12 +88,12 @@ public interface HTMLTableSectionElement extends HTMLElement { /** * Delete a row from this section. - * @param index The index of the row to be deleted, or -1 to delete the - * last row. This index starts from 0 and is relative only to the rows + * @param index The index of the row to be deleted, or -1 to delete the + * last row. This index starts from 0 and is relative only to the rows * contained inside this section, not all the rows in the table. * @exception DOMException - * INDEX_SIZE_ERR: Raised if the specified index is greater than or - * equal to the number of rows or if the index is a negative number + * INDEX_SIZE_ERR: Raised if the specified index is greater than or + * equal to the number of rows or if the index is a negative number * other than -1. * @version DOM Level 2 */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java index ed5c6c978d6..caabe4a19af 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTextAreaElement.java @@ -18,78 +18,78 @@ package org.w3c.dom.html2; */ public interface HTMLTextAreaElement extends HTMLElement { /** - * Represents the contents of the element. The value of this attribute - * does not change if the contents of the corresponding form control, in + * Represents the contents of the element. The value of this attribute + * does not change if the contents of the corresponding form control, in * an interactive user agent, changes. * @version DOM Level 2 */ public String getDefaultValue(); /** - * Represents the contents of the element. The value of this attribute - * does not change if the contents of the corresponding form control, in + * Represents the contents of the element. The value of this attribute + * does not change if the contents of the corresponding form control, in * an interactive user agent, changes. * @version DOM Level 2 */ public void setDefaultValue(String defaultValue); /** - * Returns the FORM element containing this control. Returns - * null if this control is not within the context of a - * form. + * Returns the FORM element containing this control. Returns + * null if this control is not within the context of a + * form. */ public HTMLFormElement getForm(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public String getAccessKey(); /** - * A single character access key to give access to the form control. See + * A single character access key to give access to the form control. See * the accesskey attribute definition in HTML 4.01. */ public void setAccessKey(String accessKey); /** - * Width of control (in characters). See the cols attribute definition in + * Width of control (in characters). See the cols attribute definition in * HTML 4.01. */ public int getCols(); /** - * Width of control (in characters). See the cols attribute definition in + * Width of control (in characters). See the cols attribute definition in * HTML 4.01. */ public void setCols(int cols); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public boolean getDisabled(); /** - * The control is unavailable in this context. See the disabled attribute + * The control is unavailable in this context. See the disabled attribute * definition in HTML 4.01. */ public void setDisabled(boolean disabled); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public String getName(); /** - * Form control or object name when submitted with a form. See the name + * Form control or object name when submitted with a form. See the name * attribute definition in HTML 4.01. */ public void setName(String name); /** - * This control is read-only. See the readonly attribute definition in + * This control is read-only. See the readonly attribute definition in * HTML 4.01. */ public boolean getReadOnly(); /** - * This control is read-only. See the readonly attribute definition in + * This control is read-only. See the readonly attribute definition in * HTML 4.01. */ public void setReadOnly(boolean readOnly); @@ -104,12 +104,12 @@ public interface HTMLTextAreaElement extends HTMLElement { public void setRows(int rows); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public int getTabIndex(); /** - * Index that represents the element's position in the tabbing order. See + * Index that represents the element's position in the tabbing order. See * the tabindex attribute definition in HTML 4.01. */ public void setTabIndex(int tabIndex); @@ -120,18 +120,18 @@ public interface HTMLTextAreaElement extends HTMLElement { public String getType(); /** - * Represents the current contents of the corresponding form control, in - * an interactive user agent. Changing this attribute changes the - * contents of the form control, but does not change the contents of the - * element. If the entirety of the data can not fit into a single + * Represents the current contents of the corresponding form control, in + * an interactive user agent. Changing this attribute changes the + * contents of the form control, but does not change the contents of the + * element. If the entirety of the data can not fit into a single * DOMString, the implementation may truncate the data. */ public String getValue(); /** - * Represents the current contents of the corresponding form control, in - * an interactive user agent. Changing this attribute changes the - * contents of the form control, but does not change the contents of the - * element. If the entirety of the data can not fit into a single + * Represents the current contents of the corresponding form control, in + * an interactive user agent. Changing this attribute changes the + * contents of the form control, but does not change the contents of the + * element. If the entirety of the data can not fit into a single * DOMString, the implementation may truncate the data. */ public void setValue(String value); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java index 67122bb0a71..a86b3a92650 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLTitleElement.java @@ -18,11 +18,11 @@ package org.w3c.dom.html2; */ public interface HTMLTitleElement extends HTMLElement { /** - * The specified title as a string. + * The specified title as a string. */ public String getText(); /** - * The specified title as a string. + * The specified title as a string. */ public void setText(String text); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java index 61ccb322f45..e5828fd39ee 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/html2/HTMLUListElement.java @@ -18,23 +18,23 @@ package org.w3c.dom.html2; */ public interface HTMLUListElement extends HTMLElement { /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public boolean getCompact(); /** - * Reduce spacing between list items. See the compact attribute definition + * Reduce spacing between list items. See the compact attribute definition * in HTML 4.01. This attribute is deprecated in HTML 4.01. */ public void setCompact(boolean compact); /** - * Bullet style. See the type attribute definition in HTML 4.01. This + * Bullet style. See the type attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public String getType(); /** - * Bullet style. See the type attribute definition in HTML 4.01. This + * Bullet style. See the type attribute definition in HTML 4.01. This * attribute is deprecated in HTML 4.01. */ public void setType(String type); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java index c94fc8e4651..4d1b0971d45 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/DOMImplementationLS.java @@ -15,17 +15,17 @@ package org.w3c.dom.ls; import org.w3c.dom.DOMException; /** - * DOMImplementationLS contains the factory methods for creating - * Load and Save objects. - *

    The expectation is that an instance of the - * DOMImplementationLS interface can be obtained by using - * binding-specific casting methods on an instance of the - * DOMImplementation interface or, if the Document - * supports the feature "Core" version "3.0" + * DOMImplementationLS contains the factory methods for creating + * Load and Save objects. + *

    The expectation is that an instance of the + * DOMImplementationLS interface can be obtained by using + * binding-specific casting methods on an instance of the + * DOMImplementation interface or, if the Document + * supports the feature "Core" version "3.0" * defined in [DOM Level 3 Core] - * , by using the method DOMImplementation.getFeature with - * parameter values "LS" (or "LS-Async") and - * "3.0" (respectively). + * , by using the method DOMImplementation.getFeature with + * parameter values "LS" (or "LS-Async") and + * "3.0" (respectively). *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ @@ -41,81 +41,81 @@ public interface DOMImplementationLS { public static final short MODE_ASYNCHRONOUS = 2; /** - * Create a new LSParser. The newly constructed parser may - * then be configured by means of its DOMConfiguration + * Create a new LSParser. The newly constructed parser may + * then be configured by means of its DOMConfiguration * object, and used to parse documents by means of its parse - * method. - * @param mode The mode argument is either - * MODE_SYNCHRONOUS or MODE_ASYNCHRONOUS, if - * mode is MODE_SYNCHRONOUS then the - * LSParser that is created will operate in synchronous - * mode, if it's MODE_ASYNCHRONOUS then the - * LSParser that is created will operate in asynchronous - * mode. - * @param schemaType An absolute URI representing the type of the schema - * language used during the load of a Document using the - * newly created LSParser. Note that no lexical checking - * is done on the absolute URI. In order to create a - * LSParser for any kind of schema types (i.e. the - * LSParser will be free to use any schema found), use the value - * null. + * method. + * @param mode The mode argument is either + * MODE_SYNCHRONOUS or MODE_ASYNCHRONOUS, if + * mode is MODE_SYNCHRONOUS then the + * LSParser that is created will operate in synchronous + * mode, if it's MODE_ASYNCHRONOUS then the + * LSParser that is created will operate in asynchronous + * mode. + * @param schemaType An absolute URI representing the type of the schema + * language used during the load of a Document using the + * newly created LSParser. Note that no lexical checking + * is done on the absolute URI. In order to create a + * LSParser for any kind of schema types (i.e. the + * LSParser will be free to use any schema found), use the value + * null. *

    Note: For W3C XML Schema [XML Schema Part 1] - * , applications must use the value - * "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0], - * applications must use the value - * "http://www.w3.org/TR/REC-xml". Other Schema languages - * are outside the scope of the W3C and therefore should recommend an - * absolute URI in order to use this method. - * @return The newly created LSParser object. This - * LSParser is either synchronous or asynchronous - * depending on the value of the mode argument. - *

    Note: By default, the newly created LSParser - * does not contain a DOMErrorHandler, i.e. the value of + * , applications must use the value + * "http://www.w3.org/2001/XMLSchema". For XML DTD [XML 1.0], + * applications must use the value + * "http://www.w3.org/TR/REC-xml". Other Schema languages + * are outside the scope of the W3C and therefore should recommend an + * absolute URI in order to use this method. + * @return The newly created LSParser object. This + * LSParser is either synchronous or asynchronous + * depending on the value of the mode argument. + *

    Note: By default, the newly created LSParser + * does not contain a DOMErrorHandler, i.e. the value of * the " - * error-handler" configuration parameter is null. However, implementations - * may provide a default error handler at creation time. In that case, - * the initial value of the "error-handler" configuration - * parameter on the new LSParser object contains a - * reference to the default error handler. + * error-handler" configuration parameter is null. However, implementations + * may provide a default error handler at creation time. In that case, + * the initial value of the "error-handler" configuration + * parameter on the new LSParser object contains a + * reference to the default error handler. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the requested mode or schema type is - * not supported. + * NOT_SUPPORTED_ERR: Raised if the requested mode or schema type is + * not supported. */ - public LSParser createLSParser(short mode, + public LSParser createLSParser(short mode, String schemaType) throws DOMException; /** - * Create a new LSSerializer object. + * Create a new LSSerializer object. * @return The newly created LSSerializer object. - *

    Note: By default, the newly created - * LSSerializer has no DOMErrorHandler, i.e. - * the value of the "error-handler" configuration - * parameter is null. However, implementations may - * provide a default error handler at creation time. In that case, the - * initial value of the "error-handler" configuration - * parameter on the new LSSerializer object contains a - * reference to the default error handler. + *

    Note: By default, the newly created + * LSSerializer has no DOMErrorHandler, i.e. + * the value of the "error-handler" configuration + * parameter is null. However, implementations may + * provide a default error handler at creation time. In that case, the + * initial value of the "error-handler" configuration + * parameter on the new LSSerializer object contains a + * reference to the default error handler. */ public LSSerializer createLSSerializer(); /** - * Create a new empty input source object where + * Create a new empty input source object where * LSInput.characterStream, LSInput.byteStream - * , LSInput.stringData LSInput.systemId, - * LSInput.publicId, LSInput.baseURI, and - * LSInput.encoding are null, and - * LSInput.certifiedText is false. - * @return The newly created input object. + * , LSInput.stringData LSInput.systemId, + * LSInput.publicId, LSInput.baseURI, and + * LSInput.encoding are null, and + * LSInput.certifiedText is false. + * @return The newly created input object. */ public LSInput createLSInput(); /** - * Create a new empty output destination object where - * LSOutput.characterStream, - * LSOutput.byteStream, LSOutput.systemId, - * LSOutput.encoding are null. - * @return The newly created output object. + * Create a new empty output destination object where + * LSOutput.characterStream, + * LSOutput.byteStream, LSOutput.systemId, + * LSOutput.encoding are null. + * @return The newly created output object. */ public LSOutput createLSOutput(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSException.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSException.java index 65a83f0ded1..677ad385c64 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSException.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSException.java @@ -13,16 +13,16 @@ package org.w3c.dom.ls; /** - * Parser or write operations may throw an LSException if the - * processing is stopped. The processing can be stopped due to a - * DOMError with a severity of - * DOMError.SEVERITY_FATAL_ERROR or a non recovered - * DOMError.SEVERITY_ERROR, or if - * DOMErrorHandler.handleError() returned false. - *

    Note: As suggested in the definition of the constants in the - * DOMError interface, a DOM implementation may choose to - * continue after a fatal error, but the resulting DOM tree is then - * implementation dependent. + * Parser or write operations may throw an LSException if the + * processing is stopped. The processing can be stopped due to a + * DOMError with a severity of + * DOMError.SEVERITY_FATAL_ERROR or a non recovered + * DOMError.SEVERITY_ERROR, or if + * DOMErrorHandler.handleError() returned false. + *

    Note: As suggested in the definition of the constants in the + * DOMError interface, a DOM implementation may choose to + * continue after a fatal error, but the resulting DOM tree is then + * implementation dependent. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ @@ -34,13 +34,13 @@ public class LSException extends RuntimeException { public short code; // LSExceptionCode /** - * If an attempt was made to load a document, or an XML Fragment, using - * LSParser and the processing has been stopped. + * If an attempt was made to load a document, or an XML Fragment, using + * LSParser and the processing has been stopped. */ public static final short PARSE_ERR = 81; /** - * If an attempt was made to serialize a Node using - * LSSerializer and the processing has been stopped. + * If an attempt was made to serialize a Node using + * LSSerializer and the processing has been stopped. */ public static final short SERIALIZE_ERR = 82; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSInput.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSInput.java index 862bf7703b7..bba1792cd08 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSInput.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSInput.java @@ -13,205 +13,205 @@ package org.w3c.dom.ls; /** - * This interface represents an input source for data. - *

    This interface allows an application to encapsulate information about - * an input source in a single object, which may include a public - * identifier, a system identifier, a byte stream (possibly with a specified - * encoding), a base URI, and/or a character stream. - *

    The exact definitions of a byte stream and a character stream are - * binding dependent. - *

    The application is expected to provide objects that implement this - * interface whenever such objects are needed. The application can either - * provide its own objects that implement this interface, or it can use the - * generic factory method DOMImplementationLS.createLSInput() - * to create objects that implement this interface. - *

    The LSParser will use the LSInput object to - * determine how to read data. The LSParser will look at the - * different inputs specified in the LSInput in the following - * order to know which one to read from, the first one that is not null and - * not an empty string will be used: + * This interface represents an input source for data. + *

    This interface allows an application to encapsulate information about + * an input source in a single object, which may include a public + * identifier, a system identifier, a byte stream (possibly with a specified + * encoding), a base URI, and/or a character stream. + *

    The exact definitions of a byte stream and a character stream are + * binding dependent. + *

    The application is expected to provide objects that implement this + * interface whenever such objects are needed. The application can either + * provide its own objects that implement this interface, or it can use the + * generic factory method DOMImplementationLS.createLSInput() + * to create objects that implement this interface. + *

    The LSParser will use the LSInput object to + * determine how to read data. The LSParser will look at the + * different inputs specified in the LSInput in the following + * order to know which one to read from, the first one that is not null and + * not an empty string will be used: *

      - *
    1. LSInput.characterStream + *
    2. LSInput.characterStream *
      3. - *
    3. - * LSInput.byteStream + *
    4. + * LSInput.byteStream *
      5. - *
    5. LSInput.stringData + *
    6. LSInput.stringData *
      7. - *
    7. - * LSInput.systemId + *
    8. + * LSInput.systemId *
      9. - *
    9. LSInput.publicId + *
    10. LSInput.publicId *
      11. - *
    - *

    If all inputs are null, the LSParser will report a - * DOMError with its DOMError.type set to - * "no-input-specified" and its DOMError.severity - * set to DOMError.SEVERITY_FATAL_ERROR. - *

    LSInput objects belong to the application. The DOM - * implementation will never modify them (though it may make copies and - * modify the copies, if necessary). + * + *

    If all inputs are null, the LSParser will report a + * DOMError with its DOMError.type set to + * "no-input-specified" and its DOMError.severity + * set to DOMError.SEVERITY_FATAL_ERROR. + *

    LSInput objects belong to the application. The DOM + * implementation will never modify them (though it may make copies and + * modify the copies, if necessary). *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSInput { /** - * An attribute of a language and binding dependent type that represents - * a stream of 16-bit units. The application must encode the stream - * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when - * using character streams. If an XML declaration is present, the value - * of the encoding attribute will be ignored. + * An attribute of a language and binding dependent type that represents + * a stream of 16-bit units. The application must encode the stream + * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when + * using character streams. If an XML declaration is present, the value + * of the encoding attribute will be ignored. */ public java.io.Reader getCharacterStream(); /** - * An attribute of a language and binding dependent type that represents - * a stream of 16-bit units. The application must encode the stream - * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when - * using character streams. If an XML declaration is present, the value - * of the encoding attribute will be ignored. + * An attribute of a language and binding dependent type that represents + * a stream of 16-bit units. The application must encode the stream + * using UTF-16 (defined in [Unicode] and in [ISO/IEC 10646]). It is not a requirement to have an XML declaration when + * using character streams. If an XML declaration is present, the value + * of the encoding attribute will be ignored. */ public void setCharacterStream(java.io.Reader characterStream); /** - * An attribute of a language and binding dependent type that represents - * a stream of bytes. - *
    If the application knows the character encoding of the byte - * stream, it should set the encoding attribute. Setting the encoding in - * this way will override any encoding specified in an XML declaration - * in the data. + * An attribute of a language and binding dependent type that represents + * a stream of bytes. + *
    If the application knows the character encoding of the byte + * stream, it should set the encoding attribute. Setting the encoding in + * this way will override any encoding specified in an XML declaration + * in the data. */ public java.io.InputStream getByteStream(); /** - * An attribute of a language and binding dependent type that represents - * a stream of bytes. - *
    If the application knows the character encoding of the byte - * stream, it should set the encoding attribute. Setting the encoding in - * this way will override any encoding specified in an XML declaration - * in the data. + * An attribute of a language and binding dependent type that represents + * a stream of bytes. + *
    If the application knows the character encoding of the byte + * stream, it should set the encoding attribute. Setting the encoding in + * this way will override any encoding specified in an XML declaration + * in the data. */ public void setByteStream(java.io.InputStream byteStream); /** - * String data to parse. If provided, this will always be treated as a - * sequence of 16-bit units (UTF-16 encoded characters). It is not a - * requirement to have an XML declaration when using - * stringData. If an XML declaration is present, the value - * of the encoding attribute will be ignored. + * String data to parse. If provided, this will always be treated as a + * sequence of 16-bit units (UTF-16 encoded characters). It is not a + * requirement to have an XML declaration when using + * stringData. If an XML declaration is present, the value + * of the encoding attribute will be ignored. */ public String getStringData(); /** - * String data to parse. If provided, this will always be treated as a - * sequence of 16-bit units (UTF-16 encoded characters). It is not a - * requirement to have an XML declaration when using - * stringData. If an XML declaration is present, the value - * of the encoding attribute will be ignored. + * String data to parse. If provided, this will always be treated as a + * sequence of 16-bit units (UTF-16 encoded characters). It is not a + * requirement to have an XML declaration when using + * stringData. If an XML declaration is present, the value + * of the encoding attribute will be ignored. */ public void setStringData(String stringData); /** - * The system identifier, a URI reference [IETF RFC 2396], for this - * input source. The system identifier is optional if there is a byte - * stream, a character stream, or string data. It is still useful to - * provide one, since the application will use it to resolve any - * relative URIs and can include it in error messages and warnings. (The - * LSParser will only attempt to fetch the resource identified by the - * URI reference if there is no other input available in the input - * source.) - *
    If the application knows the character encoding of the object - * pointed to by the system identifier, it can set the encoding using - * the encoding attribute. - *
    If the specified system ID is a relative URI reference (see - * section 5 in [IETF RFC 2396]), the DOM - * implementation will attempt to resolve the relative URI with the - * baseURI as the base, if that fails, the behavior is - * implementation dependent. + * The system identifier, a URI reference [IETF RFC 2396], for this + * input source. The system identifier is optional if there is a byte + * stream, a character stream, or string data. It is still useful to + * provide one, since the application will use it to resolve any + * relative URIs and can include it in error messages and warnings. (The + * LSParser will only attempt to fetch the resource identified by the + * URI reference if there is no other input available in the input + * source.) + *
    If the application knows the character encoding of the object + * pointed to by the system identifier, it can set the encoding using + * the encoding attribute. + *
    If the specified system ID is a relative URI reference (see + * section 5 in [IETF RFC 2396]), the DOM + * implementation will attempt to resolve the relative URI with the + * baseURI as the base, if that fails, the behavior is + * implementation dependent. */ public String getSystemId(); /** - * The system identifier, a URI reference [IETF RFC 2396], for this - * input source. The system identifier is optional if there is a byte - * stream, a character stream, or string data. It is still useful to - * provide one, since the application will use it to resolve any - * relative URIs and can include it in error messages and warnings. (The - * LSParser will only attempt to fetch the resource identified by the - * URI reference if there is no other input available in the input - * source.) - *
    If the application knows the character encoding of the object - * pointed to by the system identifier, it can set the encoding using - * the encoding attribute. - *
    If the specified system ID is a relative URI reference (see - * section 5 in [IETF RFC 2396]), the DOM - * implementation will attempt to resolve the relative URI with the - * baseURI as the base, if that fails, the behavior is - * implementation dependent. + * The system identifier, a URI reference [IETF RFC 2396], for this + * input source. The system identifier is optional if there is a byte + * stream, a character stream, or string data. It is still useful to + * provide one, since the application will use it to resolve any + * relative URIs and can include it in error messages and warnings. (The + * LSParser will only attempt to fetch the resource identified by the + * URI reference if there is no other input available in the input + * source.) + *
    If the application knows the character encoding of the object + * pointed to by the system identifier, it can set the encoding using + * the encoding attribute. + *
    If the specified system ID is a relative URI reference (see + * section 5 in [IETF RFC 2396]), the DOM + * implementation will attempt to resolve the relative URI with the + * baseURI as the base, if that fails, the behavior is + * implementation dependent. */ public void setSystemId(String systemId); /** - * The public identifier for this input source. This may be mapped to an - * input source using an implementation dependent mechanism (such as - * catalogues or other mappings). The public identifier, if specified, - * may also be reported as part of the location information when errors - * are reported. + * The public identifier for this input source. This may be mapped to an + * input source using an implementation dependent mechanism (such as + * catalogues or other mappings). The public identifier, if specified, + * may also be reported as part of the location information when errors + * are reported. */ public String getPublicId(); /** - * The public identifier for this input source. This may be mapped to an - * input source using an implementation dependent mechanism (such as - * catalogues or other mappings). The public identifier, if specified, - * may also be reported as part of the location information when errors - * are reported. + * The public identifier for this input source. This may be mapped to an + * input source using an implementation dependent mechanism (such as + * catalogues or other mappings). The public identifier, if specified, + * may also be reported as part of the location information when errors + * are reported. */ public void setPublicId(String publicId); /** - * The base URI to be used (see section 5.1.4 in [IETF RFC 2396]) for - * resolving a relative systemId to an absolute URI. - *
    If, when used, the base URI is itself a relative URI, an empty - * string, or null, the behavior is implementation dependent. + * The base URI to be used (see section 5.1.4 in [IETF RFC 2396]) for + * resolving a relative systemId to an absolute URI. + *
    If, when used, the base URI is itself a relative URI, an empty + * string, or null, the behavior is implementation dependent. */ public String getBaseURI(); /** - * The base URI to be used (see section 5.1.4 in [IETF RFC 2396]) for - * resolving a relative systemId to an absolute URI. - *
    If, when used, the base URI is itself a relative URI, an empty - * string, or null, the behavior is implementation dependent. + * The base URI to be used (see section 5.1.4 in [IETF RFC 2396]) for + * resolving a relative systemId to an absolute URI. + *
    If, when used, the base URI is itself a relative URI, an empty + * string, or null, the behavior is implementation dependent. */ public void setBaseURI(String baseURI); /** - * The character encoding, if known. The encoding must be a string - * acceptable for an XML encoding declaration ([XML 1.0] section - * 4.3.3 "Character Encoding in Entities"). - *
    This attribute has no effect when the application provides a - * character stream or string data. For other sources of input, an - * encoding specified by means of this attribute will override any - * encoding specified in the XML declaration or the Text declaration, or - * an encoding obtained from a higher level protocol, such as HTTP [IETF RFC 2616]. + * The character encoding, if known. The encoding must be a string + * acceptable for an XML encoding declaration ([XML 1.0] section + * 4.3.3 "Character Encoding in Entities"). + *
    This attribute has no effect when the application provides a + * character stream or string data. For other sources of input, an + * encoding specified by means of this attribute will override any + * encoding specified in the XML declaration or the Text declaration, or + * an encoding obtained from a higher level protocol, such as HTTP [IETF RFC 2616]. */ public String getEncoding(); /** - * The character encoding, if known. The encoding must be a string - * acceptable for an XML encoding declaration ([XML 1.0] section - * 4.3.3 "Character Encoding in Entities"). - *
    This attribute has no effect when the application provides a - * character stream or string data. For other sources of input, an - * encoding specified by means of this attribute will override any - * encoding specified in the XML declaration or the Text declaration, or - * an encoding obtained from a higher level protocol, such as HTTP [IETF RFC 2616]. + * The character encoding, if known. The encoding must be a string + * acceptable for an XML encoding declaration ([XML 1.0] section + * 4.3.3 "Character Encoding in Entities"). + *
    This attribute has no effect when the application provides a + * character stream or string data. For other sources of input, an + * encoding specified by means of this attribute will override any + * encoding specified in the XML declaration or the Text declaration, or + * an encoding obtained from a higher level protocol, such as HTTP [IETF RFC 2616]. */ public void setEncoding(String encoding); /** - * If set to true, assume that the input is certified (see section 2.13 - * in [XML 1.1]) when - * parsing [XML 1.1]. + * If set to true, assume that the input is certified (see section 2.13 + * in [XML 1.1]) when + * parsing [XML 1.1]. */ public boolean getCertifiedText(); /** - * If set to true, assume that the input is certified (see section 2.13 - * in [XML 1.1]) when - * parsing [XML 1.1]. + * If set to true, assume that the input is certified (see section 2.13 + * in [XML 1.1]) when + * parsing [XML 1.1]. */ public void setCertifiedText(boolean certifiedText); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java index 601a5be11b7..0140b4123e0 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSLoadEvent.java @@ -16,8 +16,8 @@ import org.w3c.dom.Document; import org.w3c.dom.events.Event; /** - * This interface represents a load event object that signals the completion - * of a document load. + * This interface represents a load event object that signals the completion + * of a document load. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSOutput.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSOutput.java index 2f8675c571e..789b95a936c 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSOutput.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSOutput.java @@ -13,93 +13,93 @@ package org.w3c.dom.ls; /** - * This interface represents an output destination for data. - *

    This interface allows an application to encapsulate information about - * an output destination in a single object, which may include a URI, a byte - * stream (possibly with a specified encoding), a base URI, and/or a - * character stream. - *

    The exact definitions of a byte stream and a character stream are - * binding dependent. - *

    The application is expected to provide objects that implement this - * interface whenever such objects are needed. The application can either - * provide its own objects that implement this interface, or it can use the - * generic factory method DOMImplementationLS.createLSOutput() - * to create objects that implement this interface. - *

    The LSSerializer will use the LSOutput object - * to determine where to serialize the output to. The - * LSSerializer will look at the different outputs specified in - * the LSOutput in the following order to know which one to - * output to, the first one that is not null and not an empty string will be - * used: + * This interface represents an output destination for data. + *

    This interface allows an application to encapsulate information about + * an output destination in a single object, which may include a URI, a byte + * stream (possibly with a specified encoding), a base URI, and/or a + * character stream. + *

    The exact definitions of a byte stream and a character stream are + * binding dependent. + *

    The application is expected to provide objects that implement this + * interface whenever such objects are needed. The application can either + * provide its own objects that implement this interface, or it can use the + * generic factory method DOMImplementationLS.createLSOutput() + * to create objects that implement this interface. + *

    The LSSerializer will use the LSOutput object + * to determine where to serialize the output to. The + * LSSerializer will look at the different outputs specified in + * the LSOutput in the following order to know which one to + * output to, the first one that is not null and not an empty string will be + * used: *

      - *
    1. LSOutput.characterStream + *
    2. LSOutput.characterStream *
      3. - *
    3. - * LSOutput.byteStream + *
    4. + * LSOutput.byteStream *
      5. - *
    5. LSOutput.systemId + *
    6. LSOutput.systemId *
      7. - *
    - *

    LSOutput objects belong to the application. The DOM - * implementation will never modify them (though it may make copies and - * modify the copies, if necessary). + * + *

    LSOutput objects belong to the application. The DOM + * implementation will never modify them (though it may make copies and + * modify the copies, if necessary). *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSOutput { /** - * An attribute of a language and binding dependent type that represents - * a writable stream to which 16-bit units can be output. + * An attribute of a language and binding dependent type that represents + * a writable stream to which 16-bit units can be output. */ public java.io.Writer getCharacterStream(); /** - * An attribute of a language and binding dependent type that represents - * a writable stream to which 16-bit units can be output. + * An attribute of a language and binding dependent type that represents + * a writable stream to which 16-bit units can be output. */ public void setCharacterStream(java.io.Writer characterStream); /** - * An attribute of a language and binding dependent type that represents - * a writable stream of bytes. + * An attribute of a language and binding dependent type that represents + * a writable stream of bytes. */ public java.io.OutputStream getByteStream(); /** - * An attribute of a language and binding dependent type that represents - * a writable stream of bytes. + * An attribute of a language and binding dependent type that represents + * a writable stream of bytes. */ public void setByteStream(java.io.OutputStream byteStream); /** - * The system identifier, a URI reference [IETF RFC 2396], for this - * output destination. - *
    If the system ID is a relative URI reference (see section 5 in [IETF RFC 2396]), the - * behavior is implementation dependent. + * The system identifier, a URI reference [IETF RFC 2396], for this + * output destination. + *
    If the system ID is a relative URI reference (see section 5 in [IETF RFC 2396]), the + * behavior is implementation dependent. */ public String getSystemId(); /** - * The system identifier, a URI reference [IETF RFC 2396], for this - * output destination. - *
    If the system ID is a relative URI reference (see section 5 in [IETF RFC 2396]), the - * behavior is implementation dependent. + * The system identifier, a URI reference [IETF RFC 2396], for this + * output destination. + *
    If the system ID is a relative URI reference (see section 5 in [IETF RFC 2396]), the + * behavior is implementation dependent. */ public void setSystemId(String systemId); /** - * The character encoding to use for the output. The encoding must be a - * string acceptable for an XML encoding declaration ([XML 1.0] section - * 4.3.3 "Character Encoding in Entities"), it is recommended that - * character encodings registered (as charsets) with the Internet + * The character encoding to use for the output. The encoding must be a + * string acceptable for an XML encoding declaration ([XML 1.0] section + * 4.3.3 "Character Encoding in Entities"), it is recommended that + * character encodings registered (as charsets) with the Internet * Assigned Numbers Authority [IANA-CHARSETS] - * should be referred to using their registered names. + * should be referred to using their registered names. */ public String getEncoding(); /** - * The character encoding to use for the output. The encoding must be a - * string acceptable for an XML encoding declaration ([XML 1.0] section - * 4.3.3 "Character Encoding in Entities"), it is recommended that - * character encodings registered (as charsets) with the Internet + * The character encoding to use for the output. The encoding must be a + * string acceptable for an XML encoding declaration ([XML 1.0] section + * 4.3.3 "Character Encoding in Entities"), it is recommended that + * character encodings registered (as charsets) with the Internet * Assigned Numbers Authority [IANA-CHARSETS] - * should be referred to using their registered names. + * should be referred to using their registered names. */ public void setEncoding(String encoding); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParser.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParser.java index ee918e0dce7..41781fa33ea 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParser.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParser.java @@ -18,156 +18,156 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * An interface to an object that is able to build, or augment, a DOM tree - * from various input sources. - *

    LSParser provides an API for parsing XML and building the - * corresponding DOM document structure. A LSParser instance - * can be obtained by invoking the - * DOMImplementationLS.createLSParser() method. + * An interface to an object that is able to build, or augment, a DOM tree + * from various input sources. + *

    LSParser provides an API for parsing XML and building the + * corresponding DOM document structure. A LSParser instance + * can be obtained by invoking the + * DOMImplementationLS.createLSParser() method. *

    As specified in [DOM Level 3 Core] - * , when a document is first made available via the LSParser: + * , when a document is first made available via the LSParser: *

      - *
    • there will - * never be two adjacent nodes of type NODE_TEXT, and there will never be - * empty text nodes. + *
    • there will + * never be two adjacent nodes of type NODE_TEXT, and there will never be + * empty text nodes. *
      • - *
    • it is expected that the value and - * nodeValue attributes of an Attr node initially - * return the XML 1.0 + *
    • it is expected that the value and + * nodeValue attributes of an Attr node initially + * return the XML 1.0 * normalized value. However, if the parameters " * validate-if-schema" and " - * datatype-normalization" are set to true, depending on the attribute normalization - * used, the attribute values may differ from the ones obtained by the XML + * datatype-normalization" are set to true, depending on the attribute normalization + * used, the attribute values may differ from the ones obtained by the XML * 1.0 attribute normalization. If the parameters " - * datatype-normalization" is set to false, the XML 1.0 attribute normalization is - * guaranteed to occur, and if the attributes list does not contain - * namespace declarations, the attributes attribute on + * datatype-normalization" is set to false, the XML 1.0 attribute normalization is + * guaranteed to occur, and if the attributes list does not contain + * namespace declarations, the attributes attribute on * Element node represents the property [attributes] defined in [XML Information Set] - * . + * . *
      • *
    - *

    Asynchronous LSParser objects are expected to also - * implement the events::EventTarget interface so that event - * listeners can be registered on asynchronous LSParser - * objects. - *

    Events supported by asynchronous LSParser objects are: + *

    Asynchronous LSParser objects are expected to also + * implement the events::EventTarget interface so that event + * listeners can be registered on asynchronous LSParser + * objects. + *

    Events supported by asynchronous LSParser objects are: *

    *
    load
    *
    - * The LSParser finishes to load the document. See also the + * The LSParser finishes to load the document. See also the * definition of the LSLoadEvent interface.
    *
    progress
    - *
    The - * LSParser signals progress as data is parsed. This - * specification does not attempt to define exactly when progress events - * should be dispatched. That is intentionally left as - * implementation-dependent. Here is one example of how an application might - * dispatch progress events: Once the parser starts receiving data, a - * progress event is dispatched to indicate that the parsing starts. From - * there on, a progress event is dispatched for every 4096 bytes of data - * that is received and processed. This is only one example, though, and - * implementations can choose to dispatch progress events at any time while - * parsing, or not dispatch them at all. See also the definition of the + *
    The + * LSParser signals progress as data is parsed. This + * specification does not attempt to define exactly when progress events + * should be dispatched. That is intentionally left as + * implementation-dependent. Here is one example of how an application might + * dispatch progress events: Once the parser starts receiving data, a + * progress event is dispatched to indicate that the parsing starts. From + * there on, a progress event is dispatched for every 4096 bytes of data + * that is received and processed. This is only one example, though, and + * implementations can choose to dispatch progress events at any time while + * parsing, or not dispatch them at all. See also the definition of the * LSProgressEvent interface.
    *
    - *

    Note: All events defined in this specification use the - * namespace URI "http://www.w3.org/2002/DOMLS". - *

    While parsing an input source, errors are reported to the application + *

    Note: All events defined in this specification use the + * namespace URI "http://www.w3.org/2002/DOMLS". + *

    While parsing an input source, errors are reported to the application * through the error handler (LSParser.domConfig's " - * error-handler" parameter). This specification does in no way try to define all possible - * errors that can occur while parsing XML, or any other markup, but some - * common error cases are defined. The types (DOMError.type) of - * errors and warnings defined by this specification are: + * error-handler" parameter). This specification does in no way try to define all possible + * errors that can occur while parsing XML, or any other markup, but some + * common error cases are defined. The types (DOMError.type) of + * errors and warnings defined by this specification are: *

    - *
    + *
    * "check-character-normalization-failure" [error]
    - *
    Raised if + *
    Raised if * the parameter " - * check-character-normalization" is set to true and a string is encountered that fails normalization + * check-character-normalization" is set to true and a string is encountered that fails normalization * checking.
    *
    "doctype-not-allowed" [fatal]
    - *
    Raised if the - * configuration parameter "disallow-doctype" is set to true + *
    Raised if the + * configuration parameter "disallow-doctype" is set to true * and a doctype is encountered.
    *
    "no-input-specified" [fatal]
    - *
    - * Raised when loading a document and no input is specified in the + *
    + * Raised when loading a document and no input is specified in the * LSInput object.
    *
    * "pi-base-uri-not-preserved" [warning]
    - *
    Raised if a processing - * instruction is encountered in a location where the base URI of the - * processing instruction can not be preserved. One example of a case where + *
    Raised if a processing + * instruction is encountered in a location where the base URI of the + * processing instruction can not be preserved. One example of a case where * this warning will be raised is if the configuration parameter " - * entities" is set to false and the following XML file is parsed: + * entities" is set to false and the following XML file is parsed: * 
    - * <!DOCTYPE root [ <!ENTITY e SYSTEM 'subdir/myentity.ent' ]> 
+ * <!DOCTYPE root [ <!ENTITY e SYSTEM 'subdir/myentity.ent' ]>
  * <root> &e; </root>
    - * And subdir/myentity.ent - * contains: - * 
    <one> <two/> </one> <?pi 3.14159?> 
+ *  And subdir/myentity.ent
+ * contains:
+ * 
    <one> <two/> </one> <?pi 3.14159?>
  * <more/>
    
  *
    *
    "unbound-prefix-in-entity" [warning]
    - *
    An - * implementation dependent warning that may be raised if the configuration + *
    An + * implementation dependent warning that may be raised if the configuration * parameter " - * namespaces" is set to true and an unbound namespace prefix is - * encountered in an entity's replacement text. Raising this warning is not - * enforced since some existing parsers may not recognize unbound namespace + * namespaces" is set to true and an unbound namespace prefix is + * encountered in an entity's replacement text. Raising this warning is not + * enforced since some existing parsers may not recognize unbound namespace * prefixes in the replacement text of entities.
    *
    * "unknown-character-denormalization" [fatal]
    - *
    Raised if the - * configuration parameter "ignore-unknown-character-denormalizations" is - * set to false and a character is encountered for which the + *
    Raised if the + * configuration parameter "ignore-unknown-character-denormalizations" is + * set to false and a character is encountered for which the * processor cannot determine the normalization properties.
    *
    * "unsupported-encoding" [fatal]
    - *
    Raised if an unsupported + *
    Raised if an unsupported * encoding is encountered.
    *
    "unsupported-media-type" [fatal]
    - *
    - * Raised if the configuration parameter "supported-media-types-only" is set + *
    + * Raised if the configuration parameter "supported-media-types-only" is set * to true and an unsupported media type is encountered.
    - *
    - *

    In addition to raising the defined errors and warnings, implementations - * are expected to raise implementation specific errors and warnings for any - * other error and warning cases such as IO errors (file not found, - * permission denied,...), XML well-formedness errors, and so on. + * + *

    In addition to raising the defined errors and warnings, implementations + * are expected to raise implementation specific errors and warnings for any + * other error and warning cases such as IO errors (file not found, + * permission denied,...), XML well-formedness errors, and so on. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSParser { /** - * The DOMConfiguration object used when parsing an input - * source. This DOMConfiguration is specific to the parse + * The DOMConfiguration object used when parsing an input + * source. This DOMConfiguration is specific to the parse * operation. No parameter values from this DOMConfiguration - * object are passed automatically to the DOMConfiguration - * object on the Document that is created, or used, by the - * parse operation. The DOM application is responsible for passing any - * needed parameter values from this DOMConfiguration - * object to the DOMConfiguration object referenced by the - * Document object. + * object are passed automatically to the DOMConfiguration + * object on the Document that is created, or used, by the + * parse operation. The DOM application is responsible for passing any + * needed parameter values from this DOMConfiguration + * object to the DOMConfiguration object referenced by the + * Document object. *
    In addition to the parameters recognized in on the * DOMConfiguration interface defined in [DOM Level 3 Core] - * , the DOMConfiguration objects for LSParser - * add or modify the following parameters: + * , the DOMConfiguration objects for LSParser + * add or modify the following parameters: *

    *
    * "charset-overrides-xml-encoding"
    *
    *
    *
    true
    - *
    [optional] (default) If a higher level protocol such as HTTP [IETF RFC 2616] provides an - * indication of the character encoding of the input stream being - * processed, that will override any encoding specified in the XML - * declaration or the Text declaration (see also section 4.3.3, - * "Character Encoding in Entities", in [XML 1.0]). - * Explicitly setting an encoding in the LSInput overrides + *
    [optional] (default) If a higher level protocol such as HTTP [IETF RFC 2616] provides an + * indication of the character encoding of the input stream being + * processed, that will override any encoding specified in the XML + * declaration or the Text declaration (see also section 4.3.3, + * "Character Encoding in Entities", in [XML 1.0]). + * Explicitly setting an encoding in the LSInput overrides * any encoding from the protocol.
    *
    false
    - *
    [required] The parser ignores any character set encoding information from + *
    [required] The parser ignores any character set encoding information from * higher-level protocols.
    *
    *
    "disallow-doctype"
    @@ -175,8 +175,8 @@ public interface LSParser { *
    *
    * true
    - *
    [optional] Throw a fatal "doctype-not-allowed" error if a doctype node is found while parsing the document. This is - * useful when dealing with things like SOAP envelopes where doctype + *
    [optional] Throw a fatal "doctype-not-allowed" error if a doctype node is found while parsing the document. This is + * useful when dealing with things like SOAP envelopes where doctype * nodes are not allowed.
    *
    false
    *
    [required] (default) Allow doctype nodes in the document.
    @@ -187,21 +187,21 @@ public interface LSParser { *
    *
    * true
    - *
    [required] (default) If, while verifying full normalization when [XML 1.1] is - * supported, a processor encounters characters for which it cannot - * determine the normalization properties, then the processor will - * ignore any possible denormalizations caused by these characters. + *
    [required] (default) If, while verifying full normalization when [XML 1.1] is + * supported, a processor encounters characters for which it cannot + * determine the normalization properties, then the processor will + * ignore any possible denormalizations caused by these characters. * This parameter is ignored for [XML 1.0].
    *
    * false
    - *
    [optional] Report an fatal "unknown-character-denormalization" error if a character is encountered for which the processor cannot + *
    [optional] Report an fatal "unknown-character-denormalization" error if a character is encountered for which the processor cannot * determine the normalization properties.
    *
    *
    "infoset"
    - *
    See - * the definition of DOMConfiguration for a description of + *
    See + * the definition of DOMConfiguration for a description of * this parameter. Unlike in [DOM Level 3 Core] - * , this parameter will default to true for + * , this parameter will default to true for * LSParser.
    *
    "namespaces"
    *
    @@ -215,41 +215,41 @@ public interface LSParser { *
    *
    * "resource-resolver"
    - *
    [required] A reference to a LSResourceResolver object, or null. If - * the value of this parameter is not null when an external resource - * (such as an external XML entity or an XML schema location) is - * encountered, the implementation will request that the - * LSResourceResolver referenced in this parameter resolves + *
    [required] A reference to a LSResourceResolver object, or null. If + * the value of this parameter is not null when an external resource + * (such as an external XML entity or an XML schema location) is + * encountered, the implementation will request that the + * LSResourceResolver referenced in this parameter resolves * the resource.
    *
    "supported-media-types-only"
    *
    *
    *
    * true
    - *
    [optional] Check that the media type of the parsed resource is a supported media - * type. If an unsupported media type is encountered, a fatal error of - * type "unsupported-media-type" will be raised. The media types defined in [IETF RFC 3023] must always + *
    [optional] Check that the media type of the parsed resource is a supported media + * type. If an unsupported media type is encountered, a fatal error of + * type "unsupported-media-type" will be raised. The media types defined in [IETF RFC 3023] must always * be accepted.
    *
    false
    *
    [required] (default) Accept any media type.
    *
    *
    "validate"
    - *
    See the definition of - * DOMConfiguration for a description of this parameter. + *
    See the definition of + * DOMConfiguration for a description of this parameter. * Unlike in [DOM Level 3 Core] - * , the processing of the internal subset is always accomplished, even + * , the processing of the internal subset is always accomplished, even * if this parameter is set to false.
    *
    * "validate-if-schema"
    - *
    See the definition of - * DOMConfiguration for a description of this parameter. + *
    See the definition of + * DOMConfiguration for a description of this parameter. * Unlike in [DOM Level 3 Core] - * , the processing of the internal subset is always accomplished, even + * , the processing of the internal subset is always accomplished, even * if this parameter is set to false.
    *
    * "well-formed"
    - *
    See the definition of - * DOMConfiguration for a description of this parameter. + *
    See the definition of + * DOMConfiguration for a description of this parameter. * Unlike in [DOM Level 3 Core] * , this parameter cannot be set to false.
    *
    @@ -257,209 +257,209 @@ public interface LSParser { public DOMConfiguration getDomConfig(); /** - * When a filter is provided, the implementation will call out to the - * filter as it is constructing the DOM tree structure. The filter can - * choose to remove elements from the document being constructed, or to - * terminate the parsing early. - *
    The filter is invoked after the operations requested by the - * DOMConfiguration parameters have been applied. For + * When a filter is provided, the implementation will call out to the + * filter as it is constructing the DOM tree structure. The filter can + * choose to remove elements from the document being constructed, or to + * terminate the parsing early. + *
    The filter is invoked after the operations requested by the + * DOMConfiguration parameters have been applied. For * example, if " - * validate" is set to true, the validation is done before invoking the - * filter. + * validate" is set to true, the validation is done before invoking the + * filter. */ public LSParserFilter getFilter(); /** - * When a filter is provided, the implementation will call out to the - * filter as it is constructing the DOM tree structure. The filter can - * choose to remove elements from the document being constructed, or to - * terminate the parsing early. - *
    The filter is invoked after the operations requested by the - * DOMConfiguration parameters have been applied. For + * When a filter is provided, the implementation will call out to the + * filter as it is constructing the DOM tree structure. The filter can + * choose to remove elements from the document being constructed, or to + * terminate the parsing early. + *
    The filter is invoked after the operations requested by the + * DOMConfiguration parameters have been applied. For * example, if " - * validate" is set to true, the validation is done before invoking the - * filter. + * validate" is set to true, the validation is done before invoking the + * filter. */ public void setFilter(LSParserFilter filter); /** - * true if the LSParser is asynchronous, - * false if it is synchronous. + * true if the LSParser is asynchronous, + * false if it is synchronous. */ public boolean getAsync(); /** - * true if the LSParser is currently busy - * loading a document, otherwise false. + * true if the LSParser is currently busy + * loading a document, otherwise false. */ public boolean getBusy(); /** - * Parse an XML document from a resource identified by a + * Parse an XML document from a resource identified by a * LSInput. - * @param input The LSInput from which the source of the - * document is to be read. - * @return If the LSParser is a synchronous - * LSParser, the newly created and populated - * Document is returned. If the LSParser is - * asynchronous, null is returned since the document - * object may not yet be constructed when this method returns. + * @param input The LSInput from which the source of the + * document is to be read. + * @return If the LSParser is a synchronous + * LSParser, the newly created and populated + * Document is returned. If the LSParser is + * asynchronous, null is returned since the document + * object may not yet be constructed when this method returns. * @exception DOMException - * INVALID_STATE_ERR: Raised if the LSParser's - * LSParser.busy attribute is true. + * INVALID_STATE_ERR: Raised if the LSParser's + * LSParser.busy attribute is true. * @exception LSException - * PARSE_ERR: Raised if the LSParser was unable to load - * the XML document. DOM applications should attach a + * PARSE_ERR: Raised if the LSParser was unable to load + * the XML document. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ public Document parse(LSInput input) throws DOMException, LSException; /** - * Parse an XML document from a location identified by a URI reference [IETF RFC 2396]. If the URI - * contains a fragment identifier (see section 4.1 in [IETF RFC 2396]), the - * behavior is not defined by this specification, future versions of - * this specification may define the behavior. + * Parse an XML document from a location identified by a URI reference [IETF RFC 2396]. If the URI + * contains a fragment identifier (see section 4.1 in [IETF RFC 2396]), the + * behavior is not defined by this specification, future versions of + * this specification may define the behavior. * @param uri The location of the XML document to be read. - * @return If the LSParser is a synchronous - * LSParser, the newly created and populated - * Document is returned, or null if an error - * occured. If the LSParser is asynchronous, - * null is returned since the document object may not yet - * be constructed when this method returns. + * @return If the LSParser is a synchronous + * LSParser, the newly created and populated + * Document is returned, or null if an error + * occured. If the LSParser is asynchronous, + * null is returned since the document object may not yet + * be constructed when this method returns. * @exception DOMException - * INVALID_STATE_ERR: Raised if the LSParser.busy - * attribute is true. + * INVALID_STATE_ERR: Raised if the LSParser.busy + * attribute is true. * @exception LSException - * PARSE_ERR: Raised if the LSParser was unable to load - * the XML document. DOM applications should attach a + * PARSE_ERR: Raised if the LSParser was unable to load + * the XML document. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ public Document parseURI(String uri) throws DOMException, LSException; // ACTION_TYPES /** - * Append the result of the parse operation as children of the context - * node. For this action to work, the context node must be an - * Element or a DocumentFragment. + * Append the result of the parse operation as children of the context + * node. For this action to work, the context node must be an + * Element or a DocumentFragment. */ public static final short ACTION_APPEND_AS_CHILDREN = 1; /** - * Replace all the children of the context node with the result of the - * parse operation. For this action to work, the context node must be an - * Element, a Document, or a - * DocumentFragment. + * Replace all the children of the context node with the result of the + * parse operation. For this action to work, the context node must be an + * Element, a Document, or a + * DocumentFragment. */ public static final short ACTION_REPLACE_CHILDREN = 2; /** - * Insert the result of the parse operation as the immediately preceding - * sibling of the context node. For this action to work the context - * node's parent must be an Element or a - * DocumentFragment. + * Insert the result of the parse operation as the immediately preceding + * sibling of the context node. For this action to work the context + * node's parent must be an Element or a + * DocumentFragment. */ public static final short ACTION_INSERT_BEFORE = 3; /** - * Insert the result of the parse operation as the immediately following - * sibling of the context node. For this action to work the context - * node's parent must be an Element or a - * DocumentFragment. + * Insert the result of the parse operation as the immediately following + * sibling of the context node. For this action to work the context + * node's parent must be an Element or a + * DocumentFragment. */ public static final short ACTION_INSERT_AFTER = 4; /** - * Replace the context node with the result of the parse operation. For - * this action to work, the context node must have a parent, and the - * parent must be an Element or a - * DocumentFragment. + * Replace the context node with the result of the parse operation. For + * this action to work, the context node must have a parent, and the + * parent must be an Element or a + * DocumentFragment. */ public static final short ACTION_REPLACE = 5; /** - * Parse an XML fragment from a resource identified by a - * LSInput and insert the content into an existing document - * at the position specified with the context and - * action arguments. When parsing the input stream, the - * context node (or its parent, depending on where the result will be - * inserted) is used for resolving unbound namespace prefixes. The - * context node's ownerDocument node (or the node itself if - * the node of type DOCUMENT_NODE) is used to resolve - * default attributes and entity references. - *
    As the new data is inserted into the document, at least one - * mutation event is fired per new immediate child or sibling of the - * context node. - *
    If the context node is a Document node and the action - * is ACTION_REPLACE_CHILDREN, then the document that is - * passed as the context node will be changed such that its - * xmlEncoding, documentURI, - * xmlVersion, inputEncoding, - * xmlStandalone, and all other such attributes are set to - * what they would be set to if the input source was parsed using - * LSParser.parse(). - *
    This method is always synchronous, even if the - * LSParser is asynchronous (LSParser.async is - * true). - *
    If an error occurs while parsing, the caller is notified through + * Parse an XML fragment from a resource identified by a + * LSInput and insert the content into an existing document + * at the position specified with the context and + * action arguments. When parsing the input stream, the + * context node (or its parent, depending on where the result will be + * inserted) is used for resolving unbound namespace prefixes. The + * context node's ownerDocument node (or the node itself if + * the node of type DOCUMENT_NODE) is used to resolve + * default attributes and entity references. + *
    As the new data is inserted into the document, at least one + * mutation event is fired per new immediate child or sibling of the + * context node. + *
    If the context node is a Document node and the action + * is ACTION_REPLACE_CHILDREN, then the document that is + * passed as the context node will be changed such that its + * xmlEncoding, documentURI, + * xmlVersion, inputEncoding, + * xmlStandalone, and all other such attributes are set to + * what they would be set to if the input source was parsed using + * LSParser.parse(). + *
    This method is always synchronous, even if the + * LSParser is asynchronous (LSParser.async is + * true). + *
    If an error occurs while parsing, the caller is notified through * the ErrorHandler instance associated with the " - * error-handler" parameter of the DOMConfiguration. - *
    When calling parseWithContext, the values of the - * following configuration parameters will be ignored and their default + * error-handler" parameter of the DOMConfiguration. + *
    When calling parseWithContext, the values of the + * following configuration parameters will be ignored and their default * values will always be used instead: " * validate", " * validate-if-schema", and " - * element-content-whitespace". Other parameters will be treated normally, and the parser is expected - * to call the LSParserFilter just as if a whole document - * was parsed. - * @param input The LSInput from which the source document - * is to be read. The source document must be an XML fragment, i.e. - * anything except a complete XML document (except in the case where - * the context node of type DOCUMENT_NODE, and the action - * is ACTION_REPLACE_CHILDREN), a DOCTYPE (internal - * subset), entity declaration(s), notation declaration(s), or XML or - * text declaration(s). - * @param contextArg The node that is used as the context for the data - * that is being parsed. This node must be a Document - * node, a DocumentFragment node, or a node of a type - * that is allowed as a child of an Element node, e.g. it - * cannot be an Attribute node. - * @param action This parameter describes which action should be taken - * between the new set of nodes being inserted and the existing - * children of the context node. The set of possible actions is - * defined in ACTION_TYPES above. - * @return Return the node that is the result of the parse operation. If - * the result is more than one top-level node, the first one is - * returned. + * element-content-whitespace". Other parameters will be treated normally, and the parser is expected + * to call the LSParserFilter just as if a whole document + * was parsed. + * @param input The LSInput from which the source document + * is to be read. The source document must be an XML fragment, i.e. + * anything except a complete XML document (except in the case where + * the context node of type DOCUMENT_NODE, and the action + * is ACTION_REPLACE_CHILDREN), a DOCTYPE (internal + * subset), entity declaration(s), notation declaration(s), or XML or + * text declaration(s). + * @param contextArg The node that is used as the context for the data + * that is being parsed. This node must be a Document + * node, a DocumentFragment node, or a node of a type + * that is allowed as a child of an Element node, e.g. it + * cannot be an Attribute node. + * @param action This parameter describes which action should be taken + * between the new set of nodes being inserted and the existing + * children of the context node. The set of possible actions is + * defined in ACTION_TYPES above. + * @return Return the node that is the result of the parse operation. If + * the result is more than one top-level node, the first one is + * returned. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be - * inserted before, after, or as a child of the context node (see also + * HIERARCHY_REQUEST_ERR: Raised if the content cannot replace, be + * inserted before, after, or as a child of the context node (see also * Node.insertBefore or Node.replaceChild in [DOM Level 3 Core] * ). - *
    NOT_SUPPORTED_ERR: Raised if the LSParser doesn't - * support this method, or if the context node is of type - * Document and the DOM implementation doesn't support - * the replacement of the DocumentType child or - * Element child. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a - * read only node and the content is being appended to its child list, - * or if the parent node of the context node is read only node and the + *
    NOT_SUPPORTED_ERR: Raised if the LSParser doesn't + * support this method, or if the context node is of type + * Document and the DOM implementation doesn't support + * the replacement of the DocumentType child or + * Element child. + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if the context node is a + * read only node and the content is being appended to its child list, + * or if the parent node of the context node is read only node and the * content is being inserted in its child list. - *
    INVALID_STATE_ERR: Raised if the LSParser.busy - * attribute is true. + *
    INVALID_STATE_ERR: Raised if the LSParser.busy + * attribute is true. * @exception LSException - * PARSE_ERR: Raised if the LSParser was unable to load - * the XML fragment. DOM applications should attach a + * PARSE_ERR: Raised if the LSParser was unable to load + * the XML fragment. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ - public Node parseWithContext(LSInput input, - Node contextArg, + public Node parseWithContext(LSInput input, + Node contextArg, short action) throws DOMException, LSException; /** - * Abort the loading of the document that is currently being loaded by - * the LSParser. If the LSParser is currently - * not busy, a call to this method does nothing. + * Abort the loading of the document that is currently being loaded by + * the LSParser. If the LSParser is currently + * not busy, a call to this method does nothing. */ public void abort(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java index 4e612945e95..00db4d3c230 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSParserFilter.java @@ -16,32 +16,32 @@ import org.w3c.dom.Node; import org.w3c.dom.Element; /** - * LSParserFilters provide applications the ability to examine - * nodes as they are being constructed while parsing. As each node is - * examined, it may be modified or removed, or the entire parse may be - * terminated early. - *

    At the time any of the filter methods are called by the parser, the - * owner Document and DOMImplementation objects exist and are accessible. - * The document element is never passed to the LSParserFilter - * methods, i.e. it is not possible to filter out the document element. - * Document, DocumentType, Notation, - * Entity, and Attr nodes are never passed to the - * acceptNode method on the filter. The child nodes of an - * EntityReference node are passed to the filter if the + * LSParserFilters provide applications the ability to examine + * nodes as they are being constructed while parsing. As each node is + * examined, it may be modified or removed, or the entire parse may be + * terminated early. + *

    At the time any of the filter methods are called by the parser, the + * owner Document and DOMImplementation objects exist and are accessible. + * The document element is never passed to the LSParserFilter + * methods, i.e. it is not possible to filter out the document element. + * Document, DocumentType, Notation, + * Entity, and Attr nodes are never passed to the + * acceptNode method on the filter. The child nodes of an + * EntityReference node are passed to the filter if the * parameter " * entities" is set to false. Note that, as described by the parameter " - * entities", unexpanded entity reference nodes are never discarded and are always - * passed to the filter. - *

    All validity checking while parsing a document occurs on the source - * document as it appears on the input stream, not on the DOM document as it - * is built in memory. With filters, the document in memory may be a subset - * of the document on the stream, and its validity may have been affected by - * the filtering. - *

    All default attributes must be present on elements when the elements - * are passed to the filter methods. All other default content must be - * passed to the filter methods. - *

    DOM applications must not raise exceptions in a filter. The effect of - * throwing exceptions from a filter is DOM implementation dependent. + * entities", unexpanded entity reference nodes are never discarded and are always + * passed to the filter. + *

    All validity checking while parsing a document occurs on the source + * document as it appears on the input stream, not on the DOM document as it + * is built in memory. With filters, the document in memory may be a subset + * of the document on the stream, and its validity may have been affected by + * the filtering. + *

    All default attributes must be present on elements when the elements + * are passed to the filter methods. All other default content must be + * passed to the filter methods. + *

    DOM applications must not raise exceptions in a filter. The effect of + * throwing exceptions from a filter is DOM implementation dependent. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ @@ -56,116 +56,116 @@ public interface LSParserFilter { */ public static final short FILTER_REJECT = 2; /** - * Skip this single node. The children of this node will still be - * considered. + * Skip this single node. The children of this node will still be + * considered. */ public static final short FILTER_SKIP = 3; /** - * Interrupt the normal processing of the document. + * Interrupt the normal processing of the document. */ public static final short FILTER_INTERRUPT = 4; /** - * The parser will call this method after each Element start - * tag has been scanned, but before the remainder of the - * Element is processed. The intent is to allow the - * element, including any children, to be efficiently skipped. Note that - * only element nodes are passed to the startElement - * function. - *
    The element node passed to startElement for filtering - * will include all of the Element's attributes, but none of the - * children nodes. The Element may not yet be in place in the document - * being constructed (it may not have a parent node.) - *
    A startElement filter function may access or change - * the attributes for the Element. Changing Namespace declarations will + * The parser will call this method after each Element start + * tag has been scanned, but before the remainder of the + * Element is processed. The intent is to allow the + * element, including any children, to be efficiently skipped. Note that + * only element nodes are passed to the startElement + * function. + *
    The element node passed to startElement for filtering + * will include all of the Element's attributes, but none of the + * children nodes. The Element may not yet be in place in the document + * being constructed (it may not have a parent node.) + *
    A startElement filter function may access or change + * the attributes for the Element. Changing Namespace declarations will * have no effect on namespace resolution by the parser. - *
    For efficiency, the Element node passed to the filter may not be - * the same one as is actually placed in the tree if the node is - * accepted. And the actual node (node object identity) may be reused + *
    For efficiency, the Element node passed to the filter may not be + * the same one as is actually placed in the tree if the node is + * accepted. And the actual node (node object identity) may be reused * during the process of reading in and filtering a document. - * @param elementArg The newly encountered element. At the time this - * method is called, the element is incomplete - it will have its - * attributes, but no children. - * @return + * @param elementArg The newly encountered element. At the time this + * method is called, the element is incomplete - it will have its + * attributes, but no children. + * @return *

      - *
    • FILTER_ACCEPT if the Element should - * be included in the DOM document being built. + *
    • FILTER_ACCEPT if the Element should + * be included in the DOM document being built. *
      • - *
    • - * FILTER_REJECT if the Element and all of - * its children should be rejected. + *
    • + * FILTER_REJECT if the Element and all of + * its children should be rejected. *
      • - *
    • FILTER_SKIP if the - * Element should be skipped. All of its children are - * inserted in place of the skipped Element node. + *
    • FILTER_SKIP if the + * Element should be skipped. All of its children are + * inserted in place of the skipped Element node. *
      • - *
    • - * FILTER_INTERRUPT if the filter wants to stop the - * processing of the document. Interrupting the processing of the - * document does no longer guarantee that the resulting DOM tree is - * XML well-formed. The Element is rejected. + *
    • + * FILTER_INTERRUPT if the filter wants to stop the + * processing of the document. Interrupting the processing of the + * document does no longer guarantee that the resulting DOM tree is + * XML well-formed. The Element is rejected. *
      • - *
    Returning - * any other values will result in unspecified behavior. + * Returning + * any other values will result in unspecified behavior. */ public short startElement(Element elementArg); /** - * This method will be called by the parser at the completion of the - * parsing of each node. The node and all of its descendants will exist - * and be complete. The parent node will also exist, although it may be - * incomplete, i.e. it may have additional children that have not yet + * This method will be called by the parser at the completion of the + * parsing of each node. The node and all of its descendants will exist + * and be complete. The parent node will also exist, although it may be + * incomplete, i.e. it may have additional children that have not yet * been parsed. Attribute nodes are never passed to this function. - *
    From within this method, the new node may be freely modified - - * children may be added or removed, text nodes modified, etc. The state - * of the rest of the document outside this node is not defined, and the - * affect of any attempt to navigate to, or to modify any other part of - * the document is undefined. - *
    For validating parsers, the checks are made on the original - * document, before any modification by the filter. No validity checks + *
    From within this method, the new node may be freely modified - + * children may be added or removed, text nodes modified, etc. The state + * of the rest of the document outside this node is not defined, and the + * affect of any attempt to navigate to, or to modify any other part of + * the document is undefined. + *
    For validating parsers, the checks are made on the original + * document, before any modification by the filter. No validity checks * are made on any document modifications made by the filter. - *
    If this new node is rejected, the parser might reuse the new node + *
    If this new node is rejected, the parser might reuse the new node * and any of its descendants. - * @param nodeArg The newly constructed element. At the time this method - * is called, the element is complete - it has all of its children - * (and their children, recursively) and attributes, and is attached - * as a child to its parent. - * @return + * @param nodeArg The newly constructed element. At the time this method + * is called, the element is complete - it has all of its children + * (and their children, recursively) and attributes, and is attached + * as a child to its parent. + * @return *
      - *
    • FILTER_ACCEPT if this Node should - * be included in the DOM document being built. + *
    • FILTER_ACCEPT if this Node should + * be included in the DOM document being built. *
      • - *
    • - * FILTER_REJECT if the Node and all of its - * children should be rejected. + *
    • + * FILTER_REJECT if the Node and all of its + * children should be rejected. *
      • - *
    • FILTER_SKIP if the - * Node should be skipped and the Node - * should be replaced by all the children of the Node. + *
    • FILTER_SKIP if the + * Node should be skipped and the Node + * should be replaced by all the children of the Node. *
      • - *
    • - * FILTER_INTERRUPT if the filter wants to stop the - * processing of the document. Interrupting the processing of the - * document does no longer guarantee that the resulting DOM tree is - * XML well-formed. The Node is accepted and will be the - * last completely parsed node. + *
    • + * FILTER_INTERRUPT if the filter wants to stop the + * processing of the document. Interrupting the processing of the + * document does no longer guarantee that the resulting DOM tree is + * XML well-formed. The Node is accepted and will be the + * last completely parsed node. *
      • *
    */ public short acceptNode(Node nodeArg); /** - * Tells the LSParser what types of nodes to show to the - * method LSParserFilter.acceptNode. If a node is not shown - * to the filter using this attribute, it is automatically included in - * the DOM document being built. See NodeFilter for + * Tells the LSParser what types of nodes to show to the + * method LSParserFilter.acceptNode. If a node is not shown + * to the filter using this attribute, it is automatically included in + * the DOM document being built. See NodeFilter for * definition of the constants. The constants SHOW_ATTRIBUTE - * , SHOW_DOCUMENT, SHOW_DOCUMENT_TYPE, - * SHOW_NOTATION, SHOW_ENTITY, and - * SHOW_DOCUMENT_FRAGMENT are meaningless here. Those nodes - * will never be passed to LSParserFilter.acceptNode. + * , SHOW_DOCUMENT, SHOW_DOCUMENT_TYPE, + * SHOW_NOTATION, SHOW_ENTITY, and + * SHOW_DOCUMENT_FRAGMENT are meaningless here. Those nodes + * will never be passed to LSParserFilter.acceptNode. *
    The constants used here are defined in [DOM Level 2 Traversal and Range] - * . + * . */ public int getWhatToShow(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java index da98e14ad5b..adf7b098ceb 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSProgressEvent.java @@ -15,13 +15,13 @@ package org.w3c.dom.ls; import org.w3c.dom.events.Event; /** - * This interface represents a progress event object that notifies the - * application about progress as a document is parsed. It extends the + * This interface represents a progress event object that notifies the + * application about progress as a document is parsed. It extends the * Event interface defined in [DOM Level 3 Events] - * . - *

    The units used for the attributes position and - * totalSize are not specified and can be implementation and - * input dependent. + * . + *

    The units used for the attributes position and + * totalSize are not specified and can be implementation and + * input dependent. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ @@ -32,15 +32,15 @@ public interface LSProgressEvent extends Event { public LSInput getInput(); /** - * The current position in the input source, including all external + * The current position in the input source, including all external * entities and other resources that have been read. */ public int getPosition(); /** - * The total size of the document including all external resources, this - * number might change as a document is being parsed if references to - * more external resources are seen. A value of 0 is + * The total size of the document including all external resources, this + * number might change as a document is being parsed if references to + * more external resources are seen. A value of 0 is * returned if the total size cannot be determined or estimated. */ public int getTotalSize(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java index c0c523c8a00..5301beb8f13 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSResourceResolver.java @@ -13,69 +13,69 @@ package org.w3c.dom.ls; /** - * LSResourceResolver provides a way for applications to - * redirect references to external resources. - *

    Applications needing to implement custom handling for external - * resources can implement this interface and register their implementation - * by setting the "resource-resolver" parameter of - * DOMConfiguration objects attached to LSParser - * and LSSerializer. It can also be register on - * DOMConfiguration objects attached to Document - * if the "LS" feature is supported. - *

    The LSParser will then allow the application to intercept - * any external entities, including the external DTD subset and external - * parameter entities, before including them. The top-level document entity - * is never passed to the resolveResource method. - *

    Many DOM applications will not need to implement this interface, but it - * will be especially useful for applications that build XML documents from - * databases or other specialized input sources, or for applications that - * use URNs. - *

    Note: LSResourceResolver is based on the SAX2 [SAX] EntityResolver - * interface. + * LSResourceResolver provides a way for applications to + * redirect references to external resources. + *

    Applications needing to implement custom handling for external + * resources can implement this interface and register their implementation + * by setting the "resource-resolver" parameter of + * DOMConfiguration objects attached to LSParser + * and LSSerializer. It can also be register on + * DOMConfiguration objects attached to Document + * if the "LS" feature is supported. + *

    The LSParser will then allow the application to intercept + * any external entities, including the external DTD subset and external + * parameter entities, before including them. The top-level document entity + * is never passed to the resolveResource method. + *

    Many DOM applications will not need to implement this interface, but it + * will be especially useful for applications that build XML documents from + * databases or other specialized input sources, or for applications that + * use URNs. + *

    Note: LSResourceResolver is based on the SAX2 [SAX] EntityResolver + * interface. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSResourceResolver { /** - * Allow the application to resolve external resources. - *
    The LSParser will call this method before opening any - * external resource, including the external DTD subset, external - * entities referenced within the DTD, and external entities referenced - * within the document element (however, the top-level document entity - * is not passed to this method). The application may then request that - * the LSParser resolve the external resource itself, that - * it use an alternative URI, or that it use an entirely different input - * source. - *
    Application writers can use this method to redirect external - * system identifiers to secure and/or local URI, to look up public - * identifiers in a catalogue, or to read an entity from a database or - * other input source (including, for example, a dialog box). - * @param type The type of the resource being resolved. For XML [XML 1.0] resources - * (i.e. entities), applications must use the value + * Allow the application to resolve external resources. + *
    The LSParser will call this method before opening any + * external resource, including the external DTD subset, external + * entities referenced within the DTD, and external entities referenced + * within the document element (however, the top-level document entity + * is not passed to this method). The application may then request that + * the LSParser resolve the external resource itself, that + * it use an alternative URI, or that it use an entirely different input + * source. + *
    Application writers can use this method to redirect external + * system identifiers to secure and/or local URI, to look up public + * identifiers in a catalogue, or to read an entity from a database or + * other input source (including, for example, a dialog box). + * @param type The type of the resource being resolved. For XML [XML 1.0] resources + * (i.e. entities), applications must use the value * "http://www.w3.org/TR/REC-xml". For XML Schema [XML Schema Part 1] - * , applications must use the value - * "http://www.w3.org/2001/XMLSchema". Other types of - * resources are outside the scope of this specification and therefore - * should recommend an absolute URI in order to use this method. - * @param namespaceURI The namespace of the resource being resolved, + * , applications must use the value + * "http://www.w3.org/2001/XMLSchema". Other types of + * resources are outside the scope of this specification and therefore + * should recommend an absolute URI in order to use this method. + * @param namespaceURI The namespace of the resource being resolved, * e.g. the target namespace of the XML Schema [XML Schema Part 1] - * when resolving XML Schema resources. - * @param publicId The public identifier of the external entity being - * referenced, or null if no public identifier was - * supplied or if the resource is not an entity. - * @param systemId The system identifier, a URI reference [IETF RFC 2396], of the - * external resource being referenced, or null if no - * system identifier was supplied. - * @param baseURI The absolute base URI of the resource being parsed, or - * null if there is no base URI. - * @return A LSInput object describing the new input - * source, or null to request that the parser open a - * regular URI connection to the resource. + * when resolving XML Schema resources. + * @param publicId The public identifier of the external entity being + * referenced, or null if no public identifier was + * supplied or if the resource is not an entity. + * @param systemId The system identifier, a URI reference [IETF RFC 2396], of the + * external resource being referenced, or null if no + * system identifier was supplied. + * @param baseURI The absolute base URI of the resource being parsed, or + * null if there is no base URI. + * @return A LSInput object describing the new input + * source, or null to request that the parser open a + * regular URI connection to the resource. */ - public LSInput resolveResource(String type, - String namespaceURI, - String publicId, - String systemId, + public LSInput resolveResource(String type, + String namespaceURI, + String publicId, + String systemId, String baseURI); } diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java index e7b6350d304..2a6fb6ff475 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializer.java @@ -17,187 +17,187 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * A LSSerializer provides an API for serializing (writing) a - * DOM document out into XML. The XML data is written to a string or an - * output stream. Any changes or fixups made during the serialization affect - * only the serialized data. The Document object and its - * children are never altered by the serialization operation. + * A LSSerializer provides an API for serializing (writing) a + * DOM document out into XML. The XML data is written to a string or an + * output stream. Any changes or fixups made during the serialization affect + * only the serialized data. The Document object and its + * children are never altered by the serialization operation. *

    During serialization of XML data, namespace fixup is done as defined in [DOM Level 3 Core] * , Appendix B. [DOM Level 2 Core] - * allows empty strings as a real namespace URI. If the - * namespaceURI of a Node is empty string, the - * serialization will treat them as null, ignoring the prefix - * if any. - *

    LSSerializer accepts any node type for serialization. For - * nodes of type Document or Entity, well-formed - * XML will be created when possible (well-formedness is guaranteed if the - * document or entity comes from a parse operation and is unchanged since it - * was created). The serialized output for these node types is either as a - * XML document or an External XML Entity, respectively, and is acceptable - * input for an XML parser. For all other types of nodes the serialized form - * is implementation dependent. - *

    Within a Document, DocumentFragment, or - * Entity being serialized, Nodes are processed as + * allows empty strings as a real namespace URI. If the + * namespaceURI of a Node is empty string, the + * serialization will treat them as null, ignoring the prefix + * if any. + *

    LSSerializer accepts any node type for serialization. For + * nodes of type Document or Entity, well-formed + * XML will be created when possible (well-formedness is guaranteed if the + * document or entity comes from a parse operation and is unchanged since it + * was created). The serialized output for these node types is either as a + * XML document or an External XML Entity, respectively, and is acceptable + * input for an XML parser. For all other types of nodes the serialized form + * is implementation dependent. + *

    Within a Document, DocumentFragment, or + * Entity being serialized, Nodes are processed as * follows *

      - *
    • Document nodes are written, including the XML - * declaration (unless the parameter "xml-declaration" is set to - * false) and a DTD subset, if one exists in the DOM. Writing a - * Document node serializes the entire document. + *
    • Document nodes are written, including the XML + * declaration (unless the parameter "xml-declaration" is set to + * false) and a DTD subset, if one exists in the DOM. Writing a + * Document node serializes the entire document. *
      • - *
    • - * Entity nodes, when written directly by - * LSSerializer.write, outputs the entity expansion but no - * namespace fixup is done. The resulting output will be valid as an - * external entity. + *
    • + * Entity nodes, when written directly by + * LSSerializer.write, outputs the entity expansion but no + * namespace fixup is done. The resulting output will be valid as an + * external entity. *
      • *
    • If the parameter " - * entities" is set to true, EntityReference nodes are + * entities" is set to true, EntityReference nodes are * serialized as an entity reference of the form " - * &entityName;" in the output. Child nodes (the expansion) + * &entityName;" in the output. Child nodes (the expansion) * of the entity reference are ignored. If the parameter " - * entities" is set to false, only the children of the entity reference - * are serialized. EntityReference nodes with no children (no - * corresponding Entity node or the corresponding - * Entity nodes have no children) are always serialized. + * entities" is set to false, only the children of the entity reference + * are serialized. EntityReference nodes with no children (no + * corresponding Entity node or the corresponding + * Entity nodes have no children) are always serialized. *
      • - *
    • - * CDATAsections containing content characters that cannot be - * represented in the specified output encoding are handled according to the + *
    • + * CDATAsections containing content characters that cannot be + * represented in the specified output encoding are handled according to the * " - * split-cdata-sections" parameter. If the parameter is set to true, - * CDATAsections are split, and the unrepresentable characters - * are serialized as numeric character references in ordinary content. The - * exact position and number of splits is not specified. If the parameter - * is set to false, unrepresentable characters in a - * CDATAsection are reported as + * split-cdata-sections" parameter. If the parameter is set to true, + * CDATAsections are split, and the unrepresentable characters + * are serialized as numeric character references in ordinary content. The + * exact position and number of splits is not specified. If the parameter + * is set to false, unrepresentable characters in a + * CDATAsection are reported as * "wf-invalid-character" errors if the parameter " - * well-formed" is set to true. The error is not recoverable - there is no - * mechanism for supplying alternative characters and continuing with the - * serialization. + * well-formed" is set to true. The error is not recoverable - there is no + * mechanism for supplying alternative characters and continuing with the + * serialization. *
      • - *
    • DocumentFragment nodes are serialized by - * serializing the children of the document fragment in the order they - * appear in the document fragment. + *
    • DocumentFragment nodes are serialized by + * serializing the children of the document fragment in the order they + * appear in the document fragment. *
      • - *
    • All other node types (Element, Text, - * etc.) are serialized to their corresponding XML source form. + *
    • All other node types (Element, Text, + * etc.) are serialized to their corresponding XML source form. *
      • *
    - *

    Note: The serialization of a Node does not always - * generate a well-formed XML document, i.e. a LSParser might - * throw fatal errors when parsing the resulting serialization. - *

    Within the character data of a document (outside of markup), any - * characters that cannot be represented directly are replaced with - * character references. Occurrences of '<' and '&' are replaced by - * the predefined entities &lt; and &amp;. The other predefined - * entities (&gt;, &apos;, and &quot;) might not be used, except - * where needed (e.g. using &gt; in cases such as ']]>'). Any - * characters that cannot be represented directly in the output character - * encoding are serialized as numeric character references (and since - * character encoding standards commonly use hexadecimal representations of - * characters, using the hexadecimal representation when serializing - * character references is encouraged). - *

    To allow attribute values to contain both single and double quotes, the - * apostrophe or single-quote character (') may be represented as - * "&apos;", and the double-quote character (") as "&quot;". New - * line characters and other characters that cannot be represented directly - * in attribute values in the output character encoding are serialized as a - * numeric character reference. - *

    Within markup, but outside of attributes, any occurrence of a character - * that cannot be represented in the output character encoding is reported - * as a DOMError fatal error. An example would be serializing - * the element <LaCa\u00f1ada/> with encoding="us-ascii". - * This will result with a generation of a DOMError + *

    Note: The serialization of a Node does not always + * generate a well-formed XML document, i.e. a LSParser might + * throw fatal errors when parsing the resulting serialization. + *

    Within the character data of a document (outside of markup), any + * characters that cannot be represented directly are replaced with + * character references. Occurrences of '<' and '&' are replaced by + * the predefined entities &lt; and &amp;. The other predefined + * entities (&gt;, &apos;, and &quot;) might not be used, except + * where needed (e.g. using &gt; in cases such as ']]>'). Any + * characters that cannot be represented directly in the output character + * encoding are serialized as numeric character references (and since + * character encoding standards commonly use hexadecimal representations of + * characters, using the hexadecimal representation when serializing + * character references is encouraged). + *

    To allow attribute values to contain both single and double quotes, the + * apostrophe or single-quote character (') may be represented as + * "&apos;", and the double-quote character (") as "&quot;". New + * line characters and other characters that cannot be represented directly + * in attribute values in the output character encoding are serialized as a + * numeric character reference. + *

    Within markup, but outside of attributes, any occurrence of a character + * that cannot be represented in the output character encoding is reported + * as a DOMError fatal error. An example would be serializing + * the element <LaCa\u00f1ada/> with encoding="us-ascii". + * This will result with a generation of a DOMError * "wf-invalid-character-in-node-name" (as proposed in " - * well-formed"). + * well-formed"). *

    When requested by setting the parameter " - * normalize-characters" on LSSerializer to true, character normalization is - * performed according to the definition of fully - * normalized characters included in appendix E of [XML 1.1] on all - * data to be serialized, both markup and character data. The character - * normalization process affects only the data as it is being written; it - * does not alter the DOM's view of the document after serialization has - * completed. - *

    Implementations are required to support the encodings "UTF-8", - * "UTF-16", "UTF-16BE", and "UTF-16LE" to guarantee that data is - * serializable in all encodings that are required to be supported by all - * XML parsers. When the encoding is UTF-8, whether or not a byte order mark - * is serialized, or if the output is big-endian or little-endian, is - * implementation dependent. When the encoding is UTF-16, whether or not the - * output is big-endian or little-endian is implementation dependent, but a - * Byte Order Mark must be generated for non-character outputs, such as - * LSOutput.byteStream or LSOutput.systemId. If - * the Byte Order Mark is not generated, a "byte-order-mark-needed" warning - * is reported. When the encoding is UTF-16LE or UTF-16BE, the output is - * big-endian (UTF-16BE) or little-endian (UTF-16LE) and the Byte Order Mark - * is not be generated. In all cases, the encoding declaration, if - * generated, will correspond to the encoding used during the serialization - * (e.g. encoding="UTF-16" will appear if UTF-16 was - * requested). - *

    Namespaces are fixed up during serialization, the serialization process - * will verify that namespace declarations, namespace prefixes and the - * namespace URI associated with elements and attributes are consistent. If - * inconsistencies are found, the serialized form of the document will be - * altered to remove them. The method used for doing the namespace fixup - * while serializing a document is the algorithm defined in Appendix B.1, + * normalize-characters" on LSSerializer to true, character normalization is + * performed according to the definition of fully + * normalized characters included in appendix E of [XML 1.1] on all + * data to be serialized, both markup and character data. The character + * normalization process affects only the data as it is being written; it + * does not alter the DOM's view of the document after serialization has + * completed. + *

    Implementations are required to support the encodings "UTF-8", + * "UTF-16", "UTF-16BE", and "UTF-16LE" to guarantee that data is + * serializable in all encodings that are required to be supported by all + * XML parsers. When the encoding is UTF-8, whether or not a byte order mark + * is serialized, or if the output is big-endian or little-endian, is + * implementation dependent. When the encoding is UTF-16, whether or not the + * output is big-endian or little-endian is implementation dependent, but a + * Byte Order Mark must be generated for non-character outputs, such as + * LSOutput.byteStream or LSOutput.systemId. If + * the Byte Order Mark is not generated, a "byte-order-mark-needed" warning + * is reported. When the encoding is UTF-16LE or UTF-16BE, the output is + * big-endian (UTF-16BE) or little-endian (UTF-16LE) and the Byte Order Mark + * is not be generated. In all cases, the encoding declaration, if + * generated, will correspond to the encoding used during the serialization + * (e.g. encoding="UTF-16" will appear if UTF-16 was + * requested). + *

    Namespaces are fixed up during serialization, the serialization process + * will verify that namespace declarations, namespace prefixes and the + * namespace URI associated with elements and attributes are consistent. If + * inconsistencies are found, the serialized form of the document will be + * altered to remove them. The method used for doing the namespace fixup + * while serializing a document is the algorithm defined in Appendix B.1, * "Namespace normalization", of [DOM Level 3 Core] - * . - *

    While serializing a document, the parameter "discard-default-content" - * controls whether or not non-specified data is serialized. - *

    While serializing, errors and warnings are reported to the application + * . + *

    While serializing a document, the parameter "discard-default-content" + * controls whether or not non-specified data is serialized. + *

    While serializing, errors and warnings are reported to the application * through the error handler (LSSerializer.domConfig's " - * error-handler" parameter). This specification does in no way try to define all possible - * errors and warnings that can occur while serializing a DOM node, but some + * error-handler" parameter). This specification does in no way try to define all possible + * errors and warnings that can occur while serializing a DOM node, but some * common error and warning cases are defined. The types ( - * DOMError.type) of errors and warnings defined by this - * specification are: + * DOMError.type) of errors and warnings defined by this + * specification are: *

    *
    "no-output-specified" [fatal]
    - *
    Raised when - * writing to a LSOutput if no output is specified in the + *
    Raised when + * writing to a LSOutput if no output is specified in the * LSOutput.
    - *
    + *
    * "unbound-prefix-in-entity-reference" [fatal]
    - *
    Raised if the + *
    Raised if the * configuration parameter " - * namespaces" is set to true and an entity whose replacement text - * contains unbound namespace prefixes is referenced in a location where + * namespaces" is set to true and an entity whose replacement text + * contains unbound namespace prefixes is referenced in a location where * there are no bindings for the namespace prefixes.
    *
    * "unsupported-encoding" [fatal]
    - *
    Raised if an unsupported + *
    Raised if an unsupported * encoding is encountered.
    - *
    - *

    In addition to raising the defined errors and warnings, implementations - * are expected to raise implementation specific errors and warnings for any - * other error and warning cases such as IO errors (file not found, - * permission denied,...) and so on. + * + *

    In addition to raising the defined errors and warnings, implementations + * are expected to raise implementation specific errors and warnings for any + * other error and warning cases such as IO errors (file not found, + * permission denied,...) and so on. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSSerializer { /** - * The DOMConfiguration object used by the - * LSSerializer when serializing a DOM node. + * The DOMConfiguration object used by the + * LSSerializer when serializing a DOM node. *
    In addition to the parameters recognized by the * DOMConfiguration interface defined in [DOM Level 3 Core] - * , the DOMConfiguration objects for - * LSSerializer adds, or modifies, the following - * parameters: + * , the DOMConfiguration objects for + * LSSerializer adds, or modifies, the following + * parameters: *

    *
    "canonical-form"
    *
    *
    *
    true
    - *
    [optional] Writes the document according to the rules specified in [Canonical XML]. + *
    [optional] Writes the document according to the rules specified in [Canonical XML]. * In addition to the behavior described in " * canonical-form" [DOM Level 3 Core] - * , setting this parameter to true will set the parameters + * , setting this parameter to true will set the parameters * "format-pretty-print", "discard-default-content", and "xml-declaration - * ", to false. Setting one of those parameters to - * true will set this parameter to false. - * Serializing an XML 1.1 document when "canonical-form" is + * ", to false. Setting one of those parameters to + * true will set this parameter to false. + * Serializing an XML 1.1 document when "canonical-form" is * true will generate a fatal error.
    *
    false
    *
    [required] (default) Do not canonicalize the output.
    @@ -207,11 +207,11 @@ public interface LSSerializer { *
    *
    * true
    - *
    [required] (default) Use the Attr.specified attribute to decide what attributes - * should be discarded. Note that some implementations might use - * whatever information available to the implementation (i.e. XML - * schema, DTD, the Attr.specified attribute, and so on) to - * determine what attributes and content to discard if this parameter is + *
    [required] (default) Use the Attr.specified attribute to decide what attributes + * should be discarded. Note that some implementations might use + * whatever information available to the implementation (i.e. XML + * schema, DTD, the Attr.specified attribute, and so on) to + * determine what attributes and content to discard if this parameter is * set to true.
    *
    false
    *
    [required]Keep all attributes and all content.
    @@ -221,40 +221,40 @@ public interface LSSerializer { *
    *
    * true
    - *
    [optional] Formatting the output by adding whitespace to produce a pretty-printed, - * indented, human-readable form. The exact form of the transformations - * is not specified by this specification. Pretty-printing changes the - * content of the document and may affect the validity of the document, + *
    [optional] Formatting the output by adding whitespace to produce a pretty-printed, + * indented, human-readable form. The exact form of the transformations + * is not specified by this specification. Pretty-printing changes the + * content of the document and may affect the validity of the document, * validating implementations should preserve validity.
    *
    * false
    *
    [required] (default) Don't pretty-print the result.
    *
    - *
    + *
    * "ignore-unknown-character-denormalizations"
    *
    *
    *
    * true
    - *
    [required] (default) If, while verifying full normalization when [XML 1.1] is - * supported, a character is encountered for which the normalization - * properties cannot be determined, then raise a - * "unknown-character-denormalization" warning (instead of - * raising an error, if this parameter is not set) and ignore any + *
    [required] (default) If, while verifying full normalization when [XML 1.1] is + * supported, a character is encountered for which the normalization + * properties cannot be determined, then raise a + * "unknown-character-denormalization" warning (instead of + * raising an error, if this parameter is not set) and ignore any * possible denormalizations caused by these characters.
    *
    * false
    - *
    [optional] Report a fatal error if a character is encountered for which the + *
    [optional] Report a fatal error if a character is encountered for which the * processor cannot determine the normalization properties.
    *
    *
    * "normalize-characters"
    - *
    This parameter is equivalent to + *
    This parameter is equivalent to * the one defined by DOMConfiguration in [DOM Level 3 Core] - * . Unlike in the Core, the default value for this parameter is - * true. While DOM implementations are not required to - * support fully - * normalizing the characters in the document according to appendix E of [XML 1.1], this + * . Unlike in the Core, the default value for this parameter is + * true. While DOM implementations are not required to + * support fully + * normalizing the characters in the document according to appendix E of [XML 1.1], this * parameter must be activated by default if supported.
    *
    * "xml-declaration"
    @@ -262,17 +262,17 @@ public interface LSSerializer { *
    *
    true
    *
    [required] (default) If a Document, Element, or Entity - * node is serialized, the XML declaration, or text declaration, should - * be included. The version (Document.xmlVersion if the - * document is a Level 3 document and the version is non-null, otherwise - * use the value "1.0"), and the output encoding (see - * LSSerializer.write for details on how to find the output + * node is serialized, the XML declaration, or text declaration, should + * be included. The version (Document.xmlVersion if the + * document is a Level 3 document and the version is non-null, otherwise + * use the value "1.0"), and the output encoding (see + * LSSerializer.write for details on how to find the output * encoding) are specified in the serialized XML declaration.
    *
    * false
    - *
    [required] Do not serialize the XML and text declarations. Report a - * "xml-declaration-needed" warning if this will cause - * problems (i.e. the serialized data is of an XML version other than [XML 1.0], or an + *
    [required] Do not serialize the XML and text declarations. Report a + * "xml-declaration-needed" warning if this will cause + * problems (i.e. the serialized data is of an XML version other than [XML 1.0], or an * encoding would be needed to be able to re-parse the serialized data).
    *
    *
    @@ -280,155 +280,155 @@ public interface LSSerializer { public DOMConfiguration getDomConfig(); /** - * The end-of-line sequence of characters to be used in the XML being - * written out. Any string is supported, but XML treats only a certain - * set of characters sequence as end-of-line (See section 2.11, - * "End-of-Line Handling" in [XML 1.0], if the - * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" - * in [XML 1.1], if the - * serialized content is XML 1.1). Using other character sequences than - * the recommended ones can result in a document that is either not - * serializable or not well-formed). - *
    On retrieval, the default value of this attribute is the - * implementation specific default end-of-line sequence. DOM - * implementations should choose the default to match the usual - * convention for text files in the environment being used. - * Implementations must choose a default sequence that matches one of - * those allowed by XML 1.0 or XML 1.1, depending on the serialized - * content. Setting this attribute to null will reset its - * value to the default value. - *
    + * The end-of-line sequence of characters to be used in the XML being + * written out. Any string is supported, but XML treats only a certain + * set of characters sequence as end-of-line (See section 2.11, + * "End-of-Line Handling" in [XML 1.0], if the + * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" + * in [XML 1.1], if the + * serialized content is XML 1.1). Using other character sequences than + * the recommended ones can result in a document that is either not + * serializable or not well-formed). + *
    On retrieval, the default value of this attribute is the + * implementation specific default end-of-line sequence. DOM + * implementations should choose the default to match the usual + * convention for text files in the environment being used. + * Implementations must choose a default sequence that matches one of + * those allowed by XML 1.0 or XML 1.1, depending on the serialized + * content. Setting this attribute to null will reset its + * value to the default value. + *
    */ public String getNewLine(); /** - * The end-of-line sequence of characters to be used in the XML being - * written out. Any string is supported, but XML treats only a certain - * set of characters sequence as end-of-line (See section 2.11, - * "End-of-Line Handling" in [XML 1.0], if the - * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" - * in [XML 1.1], if the - * serialized content is XML 1.1). Using other character sequences than - * the recommended ones can result in a document that is either not - * serializable or not well-formed). - *
    On retrieval, the default value of this attribute is the - * implementation specific default end-of-line sequence. DOM - * implementations should choose the default to match the usual - * convention for text files in the environment being used. - * Implementations must choose a default sequence that matches one of - * those allowed by XML 1.0 or XML 1.1, depending on the serialized - * content. Setting this attribute to null will reset its - * value to the default value. - *
    + * The end-of-line sequence of characters to be used in the XML being + * written out. Any string is supported, but XML treats only a certain + * set of characters sequence as end-of-line (See section 2.11, + * "End-of-Line Handling" in [XML 1.0], if the + * serialized content is XML 1.0 or section 2.11, "End-of-Line Handling" + * in [XML 1.1], if the + * serialized content is XML 1.1). Using other character sequences than + * the recommended ones can result in a document that is either not + * serializable or not well-formed). + *
    On retrieval, the default value of this attribute is the + * implementation specific default end-of-line sequence. DOM + * implementations should choose the default to match the usual + * convention for text files in the environment being used. + * Implementations must choose a default sequence that matches one of + * those allowed by XML 1.0 or XML 1.1, depending on the serialized + * content. Setting this attribute to null will reset its + * value to the default value. + *
    */ public void setNewLine(String newLine); /** - * When the application provides a filter, the serializer will call out - * to the filter before serializing each Node. The filter implementation - * can choose to remove the node from the stream or to terminate the - * serialization early. - *
    The filter is invoked after the operations requested by the - * DOMConfiguration parameters have been applied. For + * When the application provides a filter, the serializer will call out + * to the filter before serializing each Node. The filter implementation + * can choose to remove the node from the stream or to terminate the + * serialization early. + *
    The filter is invoked after the operations requested by the + * DOMConfiguration parameters have been applied. For * example, CDATA sections won't be passed to the filter if " - * cdata-sections" is set to false. + * cdata-sections" is set to false. */ public LSSerializerFilter getFilter(); /** - * When the application provides a filter, the serializer will call out - * to the filter before serializing each Node. The filter implementation - * can choose to remove the node from the stream or to terminate the - * serialization early. - *
    The filter is invoked after the operations requested by the - * DOMConfiguration parameters have been applied. For + * When the application provides a filter, the serializer will call out + * to the filter before serializing each Node. The filter implementation + * can choose to remove the node from the stream or to terminate the + * serialization early. + *
    The filter is invoked after the operations requested by the + * DOMConfiguration parameters have been applied. For * example, CDATA sections won't be passed to the filter if " - * cdata-sections" is set to false. + * cdata-sections" is set to false. */ public void setFilter(LSSerializerFilter filter); /** - * Serialize the specified node as described above in the general - * description of the LSSerializer interface. The output is - * written to the supplied LSOutput. - *
    When writing to a LSOutput, the encoding is found by - * looking at the encoding information that is reachable through the - * LSOutput and the item to be written (or its owner - * document) in this order: + * Serialize the specified node as described above in the general + * description of the LSSerializer interface. The output is + * written to the supplied LSOutput. + *
    When writing to a LSOutput, the encoding is found by + * looking at the encoding information that is reachable through the + * LSOutput and the item to be written (or its owner + * document) in this order: *
      - *
    1. LSOutput.encoding, + *
    2. LSOutput.encoding, *
      3. - *
    3. - * Document.inputEncoding, + *
    4. + * Document.inputEncoding, *
      5. - *
    5. - * Document.xmlEncoding. + *
    6. + * Document.xmlEncoding. *
      7. *
    - *
    If no encoding is reachable through the above properties, a - * default encoding of "UTF-8" will be used. If the specified encoding - * is not supported an "unsupported-encoding" fatal error is raised. - *
    If no output is specified in the LSOutput, a - * "no-output-specified" fatal error is raised. - *
    The implementation is responsible of associating the appropriate - * media type with the serialized data. - *
    When writing to a HTTP URI, a HTTP PUT is performed. When writing - * to other types of URIs, the mechanism for writing the data to the URI - * is implementation dependent. - * @param nodeArg The node to serialize. + *
    If no encoding is reachable through the above properties, a + * default encoding of "UTF-8" will be used. If the specified encoding + * is not supported an "unsupported-encoding" fatal error is raised. + *
    If no output is specified in the LSOutput, a + * "no-output-specified" fatal error is raised. + *
    The implementation is responsible of associating the appropriate + * media type with the serialized data. + *
    When writing to a HTTP URI, a HTTP PUT is performed. When writing + * to other types of URIs, the mechanism for writing the data to the URI + * is implementation dependent. + * @param nodeArg The node to serialize. * @param destination The destination for the serialized DOM. - * @return Returns true if node was - * successfully serialized. Return false in case the - * normal processing stopped but the implementation kept serializing - * the document; the result of the serialization being implementation - * dependent then. + * @return Returns true if node was + * successfully serialized. Return false in case the + * normal processing stopped but the implementation kept serializing + * the document; the result of the serialization being implementation + * dependent then. * @exception LSException - * SERIALIZE_ERR: Raised if the LSSerializer was unable to - * serialize the node. DOM applications should attach a + * SERIALIZE_ERR: Raised if the LSSerializer was unable to + * serialize the node. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ - public boolean write(Node nodeArg, + public boolean write(Node nodeArg, LSOutput destination) throws LSException; /** - * A convenience method that acts as if LSSerializer.write - * was called with a LSOutput with no encoding specified - * and LSOutput.systemId set to the uri - * argument. - * @param nodeArg The node to serialize. + * A convenience method that acts as if LSSerializer.write + * was called with a LSOutput with no encoding specified + * and LSOutput.systemId set to the uri + * argument. + * @param nodeArg The node to serialize. * @param uri The URI to write to. - * @return Returns true if node was - * successfully serialized. Return false in case the - * normal processing stopped but the implementation kept serializing - * the document; the result of the serialization being implementation - * dependent then. + * @return Returns true if node was + * successfully serialized. Return false in case the + * normal processing stopped but the implementation kept serializing + * the document; the result of the serialization being implementation + * dependent then. * @exception LSException - * SERIALIZE_ERR: Raised if the LSSerializer was unable to - * serialize the node. DOM applications should attach a + * SERIALIZE_ERR: Raised if the LSSerializer was unable to + * serialize the node. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ - public boolean writeToURI(Node nodeArg, + public boolean writeToURI(Node nodeArg, String uri) throws LSException; /** - * Serialize the specified node as described above in the general - * description of the LSSerializer interface. The output is - * written to a DOMString that is returned to the caller. - * The encoding used is the encoding of the DOMString type, - * i.e. UTF-16. Note that no Byte Order Mark is generated in a - * DOMString object. - * @param nodeArg The node to serialize. - * @return Returns the serialized data. + * Serialize the specified node as described above in the general + * description of the LSSerializer interface. The output is + * written to a DOMString that is returned to the caller. + * The encoding used is the encoding of the DOMString type, + * i.e. UTF-16. Note that no Byte Order Mark is generated in a + * DOMString object. + * @param nodeArg The node to serialize. + * @return Returns the serialized data. * @exception DOMException - * DOMSTRING_SIZE_ERR: Raised if the resulting string is too long to - * fit in a DOMString. + * DOMSTRING_SIZE_ERR: Raised if the resulting string is too long to + * fit in a DOMString. * @exception LSException - * SERIALIZE_ERR: Raised if the LSSerializer was unable to - * serialize the node. DOM applications should attach a + * SERIALIZE_ERR: Raised if the LSSerializer was unable to + * serialize the node. DOM applications should attach a * DOMErrorHandler using the parameter " - * error-handler" if they wish to get details on the error. + * error-handler" if they wish to get details on the error. */ public String writeToString(Node nodeArg) throws DOMException, LSException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java index 049459c6417..b046556775e 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ls/LSSerializerFilter.java @@ -15,48 +15,48 @@ package org.w3c.dom.ls; import org.w3c.dom.traversal.NodeFilter; /** - * LSSerializerFilters provide applications the ability to - * examine nodes as they are being serialized and decide what nodes should - * be serialized or not. The LSSerializerFilter interface is + * LSSerializerFilters provide applications the ability to + * examine nodes as they are being serialized and decide what nodes should + * be serialized or not. The LSSerializerFilter interface is * based on the NodeFilter interface defined in [DOM Level 2 Traversal and Range] - * . - *

    Document, DocumentType, + * . + *

    Document, DocumentType, * DocumentFragment, Notation, Entity - * , and children of Attr nodes are not passed to the filter. - * The child nodes of an EntityReference node are only passed - * to the filter if the EntityReference node is skipped by the - * method LSParserFilter.acceptNode(). - *

    When serializing an Element, the element is passed to the - * filter before any of its attributes are passed to the filter. Namespace + * , and children of Attr nodes are not passed to the filter. + * The child nodes of an EntityReference node are only passed + * to the filter if the EntityReference node is skipped by the + * method LSParserFilter.acceptNode(). + *

    When serializing an Element, the element is passed to the + * filter before any of its attributes are passed to the filter. Namespace * declaration attributes, and default attributes (except in the case when " - * discard-default-content" is set to false), are never passed - * to the filter. - *

    The result of any attempt to modify a node passed to a - * LSSerializerFilter is implementation dependent. - *

    DOM applications must not raise exceptions in a filter. The effect of - * throwing exceptions from a filter is DOM implementation dependent. - *

    For efficiency, a node passed to the filter may not be the same as the - * one that is actually in the tree. And the actual node (node object - * identity) may be reused during the process of filtering and serializing a - * document. + * discard-default-content" is set to false), are never passed + * to the filter. + *

    The result of any attempt to modify a node passed to a + * LSSerializerFilter is implementation dependent. + *

    DOM applications must not raise exceptions in a filter. The effect of + * throwing exceptions from a filter is DOM implementation dependent. + *

    For efficiency, a node passed to the filter may not be the same as the + * one that is actually in the tree. And the actual node (node object + * identity) may be reused during the process of filtering and serializing a + * document. *

    See also the Document Object Model (DOM) Level 3 Load and Save Specification. */ public interface LSSerializerFilter extends NodeFilter { /** - * Tells the LSSerializer what types of nodes to show to the - * filter. If a node is not shown to the filter using this attribute, it - * is automatically serialized. See NodeFilter for + * Tells the LSSerializer what types of nodes to show to the + * filter. If a node is not shown to the filter using this attribute, it + * is automatically serialized. See NodeFilter for * definition of the constants. The constants SHOW_DOCUMENT * , SHOW_DOCUMENT_TYPE, SHOW_DOCUMENT_FRAGMENT - * , SHOW_NOTATION, and SHOW_ENTITY are - * meaningless here, such nodes will never be passed to a - * LSSerializerFilter. + * , SHOW_NOTATION, and SHOW_ENTITY are + * meaningless here, such nodes will never be passed to a + * LSSerializerFilter. *
    Unlike [DOM Level 2 Traversal and Range] - * , the SHOW_ATTRIBUTE constant indicates that the - * Attr nodes are shown and passed to the filter. + * , the SHOW_ATTRIBUTE constant indicates that the + * Attr nodes are shown and passed to the filter. *
    The constants used here are defined in [DOM Level 2 Traversal and Range] - * . + * . */ public int getWhatToShow(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java index 6b522670e20..de56e07d629 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/DocumentRange.java @@ -18,14 +18,14 @@ package org.w3c.dom.ranges; */ public interface DocumentRange { /** - * This interface can be obtained from the object implementing the - * Document interface using binding-specific casting + * This interface can be obtained from the object implementing the + * Document interface using binding-specific casting * methods. - * @return The initial state of the Range returned from this method is - * such that both of its boundary-points are positioned at the - * beginning of the corresponding Document, before any content. The - * Range returned can only be used to select content associated with - * this Document, or with DocumentFragments and Attrs for which this + * @return The initial state of the Range returned from this method is + * such that both of its boundary-points are positioned at the + * beginning of the corresponding Document, before any content. The + * Range returned can only be used to select content associated with + * this Document, or with DocumentFragments and Attrs for which this * Document is the ownerDocument. */ public Range createRange(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/Range.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/Range.java index a576b4dd642..9e1957883e5 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/Range.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/Range.java @@ -22,120 +22,120 @@ import org.w3c.dom.DocumentFragment; */ public interface Range { /** - * Node within which the Range begins + * Node within which the Range begins * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public Node getStartContainer() throws DOMException; /** - * Offset within the starting node of the Range. + * Offset within the starting node of the Range. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public int getStartOffset() throws DOMException; /** - * Node within which the Range ends + * Node within which the Range ends * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public Node getEndContainer() throws DOMException; /** - * Offset within the ending node of the Range. + * Offset within the ending node of the Range. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public int getEndOffset() throws DOMException; /** - * TRUE if the Range is collapsed + * TRUE if the Range is collapsed * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public boolean getCollapsed() throws DOMException; /** - * The deepest common ancestor container of the Range's two + * The deepest common ancestor container of the Range's two * boundary-points. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public Node getCommonAncestorContainer() throws DOMException; /** - * Sets the attributes describing the start of the Range. - * @param refNode The refNode value. This parameter must be + * Sets the attributes describing the start of the Range. + * @param refNode The refNode value. This parameter must be * different from null. - * @param offset The startOffset value. + * @param offset The startOffset value. * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor - * of refNode is an Entity, Notation, or DocumentType + * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor + * of refNode is an Entity, Notation, or DocumentType * node. * @exception DOMException - * INDEX_SIZE_ERR: Raised if offset is negative or greater - * than the number of child units in refNode. Child units - * are 16-bit units if refNode is a type of CharacterData - * node (e.g., a Text or Comment node) or a ProcessingInstruction + * INDEX_SIZE_ERR: Raised if offset is negative or greater + * than the number of child units in refNode. Child units + * are 16-bit units if refNode is a type of CharacterData + * node (e.g., a Text or Comment node) or a ProcessingInstruction * node. Child units are Nodes in all other cases. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ - public void setStart(Node refNode, + public void setStart(Node refNode, int offset) throws RangeException, DOMException; /** * Sets the attributes describing the end of a Range. - * @param refNode The refNode value. This parameter must be + * @param refNode The refNode value. This parameter must be * different from null. - * @param offset The endOffset value. + * @param offset The endOffset value. * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor - * of refNode is an Entity, Notation, or DocumentType + * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor + * of refNode is an Entity, Notation, or DocumentType * node. * @exception DOMException - * INDEX_SIZE_ERR: Raised if offset is negative or greater - * than the number of child units in refNode. Child units - * are 16-bit units if refNode is a type of CharacterData - * node (e.g., a Text or Comment node) or a ProcessingInstruction + * INDEX_SIZE_ERR: Raised if offset is negative or greater + * than the number of child units in refNode. Child units + * are 16-bit units if refNode is a type of CharacterData + * node (e.g., a Text or Comment node) or a ProcessingInstruction * node. Child units are Nodes in all other cases. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ - public void setEnd(Node refNode, + public void setEnd(Node refNode, int offset) throws RangeException, DOMException; /** * Sets the start position to be before a node - * @param refNode Range starts before refNode + * @param refNode Range starts before refNode * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if the root container of - * refNode is not an Attr, Document, or DocumentFragment - * node or if refNode is a Document, DocumentFragment, + * INVALID_NODE_TYPE_ERR: Raised if the root container of + * refNode is not an Attr, Document, or DocumentFragment + * node or if refNode is a Document, DocumentFragment, * Attr, Entity, or Notation node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void setStartBefore(Node refNode) @@ -143,93 +143,93 @@ public interface Range { /** * Sets the start position to be after a node - * @param refNode Range starts after refNode + * @param refNode Range starts after refNode * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if the root container of - * refNode is not an Attr, Document, or DocumentFragment - * node or if refNode is a Document, DocumentFragment, + * INVALID_NODE_TYPE_ERR: Raised if the root container of + * refNode is not an Attr, Document, or DocumentFragment + * node or if refNode is a Document, DocumentFragment, * Attr, Entity, or Notation node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void setStartAfter(Node refNode) throws RangeException, DOMException; /** - * Sets the end position to be before a node. - * @param refNode Range ends before refNode + * Sets the end position to be before a node. + * @param refNode Range ends before refNode * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if the root container of - * refNode is not an Attr, Document, or DocumentFragment - * node or if refNode is a Document, DocumentFragment, + * INVALID_NODE_TYPE_ERR: Raised if the root container of + * refNode is not an Attr, Document, or DocumentFragment + * node or if refNode is a Document, DocumentFragment, * Attr, Entity, or Notation node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void setEndBefore(Node refNode) throws RangeException, DOMException; /** - * Sets the end of a Range to be after a node - * @param refNode Range ends after refNode. + * Sets the end of a Range to be after a node + * @param refNode Range ends after refNode. * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if the root container of - * refNode is not an Attr, Document or DocumentFragment - * node or if refNode is a Document, DocumentFragment, + * INVALID_NODE_TYPE_ERR: Raised if the root container of + * refNode is not an Attr, Document or DocumentFragment + * node or if refNode is a Document, DocumentFragment, * Attr, Entity, or Notation node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void setEndAfter(Node refNode) throws RangeException, DOMException; /** - * Collapse a Range onto one of its boundary-points - * @param toStart If TRUE, collapses the Range onto its start; if FALSE, - * collapses it onto its end. + * Collapse a Range onto one of its boundary-points + * @param toStart If TRUE, collapses the Range onto its start; if FALSE, + * collapses it onto its end. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public void collapse(boolean toStart) throws DOMException; /** - * Select a node and its contents - * @param refNode The node to select. + * Select a node and its contents + * @param refNode The node to select. * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if an ancestor of refNode - * is an Entity, Notation or DocumentType node or if - * refNode is a Document, DocumentFragment, Attr, Entity, + * INVALID_NODE_TYPE_ERR: Raised if an ancestor of refNode + * is an Entity, Notation or DocumentType node or if + * refNode is a Document, DocumentFragment, Attr, Entity, * or Notation node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void selectNode(Node refNode) throws RangeException, DOMException; /** - * Select the contents within a node - * @param refNode Node to select from + * Select the contents within a node + * @param refNode Node to select from * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor + * INVALID_NODE_TYPE_ERR: Raised if refNode or an ancestor * of refNode is an Entity, Notation or DocumentType node. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. - *
    WRONG_DOCUMENT_ERR: Raised if refNode was created + *
    WRONG_DOCUMENT_ERR: Raised if refNode was created * from a different document than the one that created this range. */ public void selectNodeContents(Node refNode) @@ -237,177 +237,177 @@ public interface Range { // CompareHow /** - * Compare start boundary-point of sourceRange to start - * boundary-point of Range on which compareBoundaryPoints + * Compare start boundary-point of sourceRange to start + * boundary-point of Range on which compareBoundaryPoints * is invoked. */ public static final short START_TO_START = 0; /** - * Compare start boundary-point of sourceRange to end - * boundary-point of Range on which compareBoundaryPoints + * Compare start boundary-point of sourceRange to end + * boundary-point of Range on which compareBoundaryPoints * is invoked. */ public static final short START_TO_END = 1; /** - * Compare end boundary-point of sourceRange to end - * boundary-point of Range on which compareBoundaryPoints + * Compare end boundary-point of sourceRange to end + * boundary-point of Range on which compareBoundaryPoints * is invoked. */ public static final short END_TO_END = 2; /** - * Compare end boundary-point of sourceRange to start - * boundary-point of Range on which compareBoundaryPoints + * Compare end boundary-point of sourceRange to start + * boundary-point of Range on which compareBoundaryPoints * is invoked. */ public static final short END_TO_START = 3; /** * Compare the boundary-points of two Ranges in a document. - * @param how A code representing the type of comparison, as defined + * @param how A code representing the type of comparison, as defined * above. - * @param sourceRange The Range on which this current + * @param sourceRange The Range on which this current * Range is compared to. - * @return -1, 0 or 1 depending on whether the corresponding - * boundary-point of the Range is respectively before, equal to, or - * after the corresponding boundary-point of sourceRange. + * @return -1, 0 or 1 depending on whether the corresponding + * boundary-point of the Range is respectively before, equal to, or + * after the corresponding boundary-point of sourceRange. * @exception DOMException - * WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in the same + * WRONG_DOCUMENT_ERR: Raised if the two Ranges are not in the same * Document or DocumentFragment. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. */ - public short compareBoundaryPoints(short how, + public short compareBoundaryPoints(short how, Range sourceRange) throws DOMException; /** - * Removes the contents of a Range from the containing document or - * document fragment without returning a reference to the removed - * content. + * Removes the contents of a Range from the containing document or + * document fragment without returning a reference to the removed + * content. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of - * the Range is read-only or any of the nodes that contain any of the + * NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of + * the Range is read-only or any of the nodes that contain any of the * content of the Range are read-only. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. */ public void deleteContents() throws DOMException; /** - * Moves the contents of a Range from the containing document or document - * fragment to a new DocumentFragment. - * @return A DocumentFragment containing the extracted contents. + * Moves the contents of a Range from the containing document or document + * fragment to a new DocumentFragment. + * @return A DocumentFragment containing the extracted contents. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of - * the Range is read-only or any of the nodes which contain any of the + * NO_MODIFICATION_ALLOWED_ERR: Raised if any portion of the content of + * the Range is read-only or any of the nodes which contain any of the * content of the Range are read-only. - *
    HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be + *
    HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be * extracted into the new DocumentFragment. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. */ public DocumentFragment extractContents() throws DOMException; /** - * Duplicates the contents of a Range - * @return A DocumentFragment that contains content equivalent to this + * Duplicates the contents of a Range + * @return A DocumentFragment that contains content equivalent to this * Range. * @exception DOMException - * HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be + * HIERARCHY_REQUEST_ERR: Raised if a DocumentType node would be * extracted into the new DocumentFragment. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. */ public DocumentFragment cloneContents() throws DOMException; /** - * Inserts a node into the Document or DocumentFragment at the start of - * the Range. If the container is a Text node, this will be split at the - * start of the Range (as if the Text node's splitText method was - * performed at the insertion point) and the insertion will occur - * between the two resulting Text nodes. Adjacent Text nodes will not be - * automatically merged. If the node to be inserted is a - * DocumentFragment node, the children will be inserted rather than the + * Inserts a node into the Document or DocumentFragment at the start of + * the Range. If the container is a Text node, this will be split at the + * start of the Range (as if the Text node's splitText method was + * performed at the insertion point) and the insertion will occur + * between the two resulting Text nodes. Adjacent Text nodes will not be + * automatically merged. If the node to be inserted is a + * DocumentFragment node, the children will be inserted rather than the * DocumentFragment node itself. - * @param newNode The node to insert at the start of the Range + * @param newNode The node to insert at the start of the Range * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of the + * NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of the * start of the Range is read-only. - *
    WRONG_DOCUMENT_ERR: Raised if newNode and the - * container of the start of the Range were not created from the same + *
    WRONG_DOCUMENT_ERR: Raised if newNode and the + * container of the start of the Range were not created from the same * document. - *
    HIERARCHY_REQUEST_ERR: Raised if the container of the start of - * the Range is of a type that does not allow children of the type of - * newNode or if newNode is an ancestor of + *
    HIERARCHY_REQUEST_ERR: Raised if the container of the start of + * the Range is of a type that does not allow children of the type of + * newNode or if newNode is an ancestor of * the container. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. * @exception RangeException - * INVALID_NODE_TYPE_ERR: Raised if newNode is an Attr, + * INVALID_NODE_TYPE_ERR: Raised if newNode is an Attr, * Entity, Notation, or Document node. */ public void insertNode(Node newNode) throws DOMException, RangeException; /** - * Reparents the contents of the Range to the given node and inserts the - * node at the position of the start of the Range. - * @param newParent The node to surround the contents with. + * Reparents the contents of the Range to the given node and inserts the + * node at the position of the start of the Range. + * @param newParent The node to surround the contents with. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of + * NO_MODIFICATION_ALLOWED_ERR: Raised if an ancestor container of * either boundary-point of the Range is read-only. - *
    WRONG_DOCUMENT_ERR: Raised if newParent and the - * container of the start of the Range were not created from the same + *
    WRONG_DOCUMENT_ERR: Raised if newParent and the + * container of the start of the Range were not created from the same * document. - *
    HIERARCHY_REQUEST_ERR: Raised if the container of the start of - * the Range is of a type that does not allow children of the type of - * newParent or if newParent is an ancestor - * of the container or if node would end up with a child + *
    HIERARCHY_REQUEST_ERR: Raised if the container of the start of + * the Range is of a type that does not allow children of the type of + * newParent or if newParent is an ancestor + * of the container or if node would end up with a child * node of a type not allowed by the type of node. - *
    INVALID_STATE_ERR: Raised if detach() has already + *
    INVALID_STATE_ERR: Raised if detach() has already * been invoked on this object. * @exception RangeException - * BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially selects a + * BAD_BOUNDARYPOINTS_ERR: Raised if the Range partially selects a * non-text node. - *
    INVALID_NODE_TYPE_ERR: Raised if node is an Attr, + *
    INVALID_NODE_TYPE_ERR: Raised if node is an Attr, * Entity, DocumentType, Notation, Document, or DocumentFragment node. */ public void surroundContents(Node newParent) throws DOMException, RangeException; /** - * Produces a new Range whose boundary-points are equal to the - * boundary-points of the Range. - * @return The duplicated Range. + * Produces a new Range whose boundary-points are equal to the + * boundary-points of the Range. + * @return The duplicated Range. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public Range cloneRange() throws DOMException; /** - * Returns the contents of a Range as a string. This string contains only - * the data characters, not any markup. + * Returns the contents of a Range as a string. This string contains only + * the data characters, not any markup. * @return The contents of the Range. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public String toString() throws DOMException; /** - * Called to indicate that the Range is no longer in use and that the - * implementation may relinquish any resources associated with this - * Range. Subsequent calls to any methods or attribute getters on this - * Range will result in a DOMException being thrown with an + * Called to indicate that the Range is no longer in use and that the + * implementation may relinquish any resources associated with this + * Range. Subsequent calls to any methods or attribute getters on this + * Range will result in a DOMException being thrown with an * error code of INVALID_STATE_ERR. * @exception DOMException - * INVALID_STATE_ERR: Raised if detach() has already been + * INVALID_STATE_ERR: Raised if detach() has already been * invoked on this object. */ public void detach() diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/RangeException.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/RangeException.java index 551008e5dba..2dee8195b80 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/RangeException.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/ranges/RangeException.java @@ -13,7 +13,7 @@ package org.w3c.dom.ranges; /** - * Range operations may throw a RangeException as specified in + * Range operations may throw a RangeException as specified in * their method descriptions. *

    See also the Document Object Model (DOM) Level 2 Traversal and Range Specification. * @since DOM Level 2 @@ -30,8 +30,8 @@ public class RangeException extends RuntimeException { */ public static final short BAD_BOUNDARYPOINTS_ERR = 1; /** - * If the container of an boundary-point of a Range is being set to either - * a node of an invalid type or a node with an ancestor of an invalid + * If the container of an boundary-point of a Range is being set to either + * a node of an invalid type or a node with an ancestor of an invalid * type. */ public static final short INVALID_NODE_TYPE_ERR = 2; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java index 612a561135a..ecfba994cdd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/DocumentStyle.java @@ -13,21 +13,21 @@ package org.w3c.dom.stylesheets; /** - * The DocumentStyle interface provides a mechanism by which the - * style sheets embedded in a document can be retrieved. The expectation is - * that an instance of the DocumentStyle interface can be - * obtained by using binding-specific casting methods on an instance of the - * Document interface. + * The DocumentStyle interface provides a mechanism by which the + * style sheets embedded in a document can be retrieved. The expectation is + * that an instance of the DocumentStyle interface can be + * obtained by using binding-specific casting methods on an instance of the + * Document interface. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface DocumentStyle { /** - * A list containing all the style sheets explicitly linked into or - * embedded in a document. For HTML documents, this includes external - * style sheets, included via the HTML LINK element, and inline STYLE - * elements. In XML, this includes external style sheets, included via - * style sheet processing instructions (see [XML StyleSheet]). + * A list containing all the style sheets explicitly linked into or + * embedded in a document. For HTML documents, this includes external + * style sheets, included via the HTML LINK element, and inline STYLE + * elements. In XML, this includes external style sheets, included via + * style sheet processing instructions (see [XML StyleSheet]). */ public StyleSheetList getStyleSheets(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java index 481bd19dbab..c7560d64715 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/LinkStyle.java @@ -13,18 +13,18 @@ package org.w3c.dom.stylesheets; /** - * The LinkStyle interface provides a mechanism by which a style - * sheet can be retrieved from the node responsible for linking it into a - * document. An instance of the LinkStyle interface can be - * obtained using binding-specific casting methods on an instance of a - * linking node (HTMLLinkElement, HTMLStyleElement - * or ProcessingInstruction in DOM Level 2). + * The LinkStyle interface provides a mechanism by which a style + * sheet can be retrieved from the node responsible for linking it into a + * document. An instance of the LinkStyle interface can be + * obtained using binding-specific casting methods on an instance of a + * linking node (HTMLLinkElement, HTMLStyleElement + * or ProcessingInstruction in DOM Level 2). *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface LinkStyle { /** - * The style sheet. + * The style sheet. */ public StyleSheet getSheet(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java index f83d5f13d62..000c90c4366 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/MediaList.java @@ -15,69 +15,69 @@ package org.w3c.dom.stylesheets; import org.w3c.dom.DOMException; /** - * The MediaList interface provides the abstraction of an - * ordered collection of media, without defining or constraining how this - * collection is implemented. An empty list is the same as a list that - * contains the medium "all". - *

    The items in the MediaList are accessible via an integral - * index, starting from 0. + * The MediaList interface provides the abstraction of an + * ordered collection of media, without defining or constraining how this + * collection is implemented. An empty list is the same as a list that + * contains the medium "all". + *

    The items in the MediaList are accessible via an integral + * index, starting from 0. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface MediaList { /** - * The parsable textual representation of the media list. This is a - * comma-separated list of media. + * The parsable textual representation of the media list. This is a + * comma-separated list of media. */ public String getMediaText(); /** - * The parsable textual representation of the media list. This is a - * comma-separated list of media. + * The parsable textual representation of the media list. This is a + * comma-separated list of media. * @exception DOMException - * SYNTAX_ERR: Raised if the specified string value has a syntax error + * SYNTAX_ERR: Raised if the specified string value has a syntax error * and is unparsable. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media list is + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this media list is * readonly. */ public void setMediaText(String mediaText) throws DOMException; /** - * The number of media in the list. The range of valid media is - * 0 to length-1 inclusive. + * The number of media in the list. The range of valid media is + * 0 to length-1 inclusive. */ public int getLength(); /** - * Returns the indexth in the list. If index is - * greater than or equal to the number of media in the list, this - * returns null. - * @param index Index into the collection. - * @return The medium at the indexth position in the - * MediaList, or null if that is not a valid - * index. + * Returns the indexth in the list. If index is + * greater than or equal to the number of media in the list, this + * returns null. + * @param index Index into the collection. + * @return The medium at the indexth position in the + * MediaList, or null if that is not a valid + * index. */ public String item(int index); /** - * Deletes the medium indicated by oldMedium from the list. + * Deletes the medium indicated by oldMedium from the list. * @param oldMedium The medium to delete in the media list. * @exception DOMException - * NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. - *
    NOT_FOUND_ERR: Raised if oldMedium is not in the - * list. + * NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. + *
    NOT_FOUND_ERR: Raised if oldMedium is not in the + * list. */ public void deleteMedium(String oldMedium) throws DOMException; /** - * Adds the medium newMedium to the end of the list. If the - * newMedium is already used, it is first removed. + * Adds the medium newMedium to the end of the list. If the + * newMedium is already used, it is first removed. * @param newMedium The new medium to add. * @exception DOMException - * INVALID_CHARACTER_ERR: If the medium contains characters that are - * invalid in the underlying style language. - *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. + * INVALID_CHARACTER_ERR: If the medium contains characters that are + * invalid in the underlying style language. + *
    NO_MODIFICATION_ALLOWED_ERR: Raised if this list is readonly. */ public void appendMedium(String newMedium) throws DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java index 3da43076994..8289028178d 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheet.java @@ -15,88 +15,88 @@ package org.w3c.dom.stylesheets; import org.w3c.dom.Node; /** - * The StyleSheet interface is the abstract base interface for - * any type of style sheet. It represents a single style sheet associated - * with a structured document. In HTML, the StyleSheet interface represents - * either an external style sheet, included via the HTML LINK element, or - * an inline STYLE element. In XML, this interface represents an external - * style sheet, included via a style sheet processing instruction. + * The StyleSheet interface is the abstract base interface for + * any type of style sheet. It represents a single style sheet associated + * with a structured document. In HTML, the StyleSheet interface represents + * either an external style sheet, included via the HTML LINK element, or + * an inline STYLE element. In XML, this interface represents an external + * style sheet, included via a style sheet processing instruction. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface StyleSheet { /** - * This specifies the style sheet language for this style sheet. The - * style sheet language is specified as a content type (e.g. - * "text/css"). The content type is often specified in the - * ownerNode. Also see the type attribute definition for - * the LINK element in HTML 4.0, and the type - * pseudo-attribute for the XML style sheet processing instruction. + * This specifies the style sheet language for this style sheet. The + * style sheet language is specified as a content type (e.g. + * "text/css"). The content type is often specified in the + * ownerNode. Also see the type attribute definition for + * the LINK element in HTML 4.0, and the type + * pseudo-attribute for the XML style sheet processing instruction. */ public String getType(); /** - * false if the style sheet is applied to the document. - * true if it is not. Modifying this attribute may cause a - * new resolution of style for the document. A stylesheet only applies - * if both an appropriate medium definition is present and the disabled - * attribute is false. So, if the media doesn't apply to the current - * user agent, the disabled attribute is ignored. + * false if the style sheet is applied to the document. + * true if it is not. Modifying this attribute may cause a + * new resolution of style for the document. A stylesheet only applies + * if both an appropriate medium definition is present and the disabled + * attribute is false. So, if the media doesn't apply to the current + * user agent, the disabled attribute is ignored. */ public boolean getDisabled(); /** - * false if the style sheet is applied to the document. - * true if it is not. Modifying this attribute may cause a - * new resolution of style for the document. A stylesheet only applies - * if both an appropriate medium definition is present and the disabled - * attribute is false. So, if the media doesn't apply to the current - * user agent, the disabled attribute is ignored. + * false if the style sheet is applied to the document. + * true if it is not. Modifying this attribute may cause a + * new resolution of style for the document. A stylesheet only applies + * if both an appropriate medium definition is present and the disabled + * attribute is false. So, if the media doesn't apply to the current + * user agent, the disabled attribute is ignored. */ public void setDisabled(boolean disabled); /** - * The node that associates this style sheet with the document. For HTML, - * this may be the corresponding LINK or STYLE - * element. For XML, it may be the linking processing instruction. For - * style sheets that are included by other style sheets, the value of - * this attribute is null. + * The node that associates this style sheet with the document. For HTML, + * this may be the corresponding LINK or STYLE + * element. For XML, it may be the linking processing instruction. For + * style sheets that are included by other style sheets, the value of + * this attribute is null. */ public Node getOwnerNode(); /** - * For style sheet languages that support the concept of style sheet - * inclusion, this attribute represents the including style sheet, if - * one exists. If the style sheet is a top-level style sheet, or the - * style sheet language does not support inclusion, the value of this - * attribute is null. + * For style sheet languages that support the concept of style sheet + * inclusion, this attribute represents the including style sheet, if + * one exists. If the style sheet is a top-level style sheet, or the + * style sheet language does not support inclusion, the value of this + * attribute is null. */ public StyleSheet getParentStyleSheet(); /** - * If the style sheet is a linked style sheet, the value of its attribute - * is its location. For inline style sheets, the value of this attribute - * is null. See the href attribute definition for the - * LINK element in HTML 4.0, and the href pseudo-attribute - * for the XML style sheet processing instruction. + * If the style sheet is a linked style sheet, the value of its attribute + * is its location. For inline style sheets, the value of this attribute + * is null. See the href attribute definition for the + * LINK element in HTML 4.0, and the href pseudo-attribute + * for the XML style sheet processing instruction. */ public String getHref(); /** - * The advisory title. The title is often specified in the - * ownerNode. See the title attribute definition for the - * LINK element in HTML 4.0, and the title pseudo-attribute - * for the XML style sheet processing instruction. + * The advisory title. The title is often specified in the + * ownerNode. See the title attribute definition for the + * LINK element in HTML 4.0, and the title pseudo-attribute + * for the XML style sheet processing instruction. */ public String getTitle(); /** - * The intended destination media for style information. The media is - * often specified in the ownerNode. If no media has been - * specified, the MediaList will be empty. See the media - * attribute definition for the LINK element in HTML 4.0, - * and the media pseudo-attribute for the XML style sheet processing - * instruction . Modifying the media list may cause a change to the - * attribute disabled. + * The intended destination media for style information. The media is + * often specified in the ownerNode. If no media has been + * specified, the MediaList will be empty. See the media + * attribute definition for the LINK element in HTML 4.0, + * and the media pseudo-attribute for the XML style sheet processing + * instruction . Modifying the media list may cause a change to the + * attribute disabled. */ public MediaList getMedia(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java index b8f9a442330..6bb085fcad6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/stylesheets/StyleSheetList.java @@ -13,29 +13,29 @@ package org.w3c.dom.stylesheets; /** - * The StyleSheetList interface provides the abstraction of an - * ordered collection of style sheets. - *

    The items in the StyleSheetList are accessible via an - * integral index, starting from 0. + * The StyleSheetList interface provides the abstraction of an + * ordered collection of style sheets. + *

    The items in the StyleSheetList are accessible via an + * integral index, starting from 0. *

    See also the Document Object Model (DOM) Level 2 Style Specification. * @since DOM Level 2 */ public interface StyleSheetList { /** - * The number of StyleSheets in the list. The range of valid - * child stylesheet indices is 0 to length-1 - * inclusive. + * The number of StyleSheets in the list. The range of valid + * child stylesheet indices is 0 to length-1 + * inclusive. */ public int getLength(); /** - * Used to retrieve a style sheet by ordinal index. If index is greater - * than or equal to the number of style sheets in the list, this returns - * null. + * Used to retrieve a style sheet by ordinal index. If index is greater + * than or equal to the number of style sheets in the list, this returns + * null. * @param index Index into the collection - * @return The style sheet at the index position in the - * StyleSheetList, or null if that is not a - * valid index. + * @return The style sheet at the index position in the + * StyleSheetList, or null if that is not a + * valid index. */ public StyleSheet item(int index); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java index bc45ad9f753..e68d656f2dd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/DocumentTraversal.java @@ -16,77 +16,77 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * DocumentTraversal contains methods that create - * NodeIterators and TreeWalkers to traverse a - * node and its children in document order (depth first, pre-order - * traversal, which is equivalent to the order in which the start tags occur - * in the text representation of the document). In DOMs which support the - * Traversal feature, DocumentTraversal will be implemented by + * DocumentTraversal contains methods that create + * NodeIterators and TreeWalkers to traverse a + * node and its children in document order (depth first, pre-order + * traversal, which is equivalent to the order in which the start tags occur + * in the text representation of the document). In DOMs which support the + * Traversal feature, DocumentTraversal will be implemented by * the same objects that implement the Document interface. *

    See also the Document Object Model (DOM) Level 2 Traversal and Range Specification. * @since DOM Level 2 */ public interface DocumentTraversal { /** - * Create a new NodeIterator over the subtree rooted at the + * Create a new NodeIterator over the subtree rooted at the * specified node. - * @param root The node which will be iterated together with its - * children. The NodeIterator is initially positioned - * just before this node. The whatToShow flags and the - * filter, if any, are not considered when setting this position. The + * @param root The node which will be iterated together with its + * children. The NodeIterator is initially positioned + * just before this node. The whatToShow flags and the + * filter, if any, are not considered when setting this position. The * root must not be null. - * @param whatToShow This flag specifies which node types may appear in - * the logical view of the tree presented by the - * NodeIterator. See the description of - * NodeFilter for the set of possible SHOW_ + * @param whatToShow This flag specifies which node types may appear in + * the logical view of the tree presented by the + * NodeIterator. See the description of + * NodeFilter for the set of possible SHOW_ * values.These flags can be combined using OR. - * @param filter The NodeFilter to be used with this - * NodeIterator, or null to indicate no + * @param filter The NodeFilter to be used with this + * NodeIterator, or null to indicate no * filter. - * @param entityReferenceExpansion The value of this flag determines + * @param entityReferenceExpansion The value of this flag determines * whether entity reference nodes are expanded. * @return The newly created NodeIterator. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the specified root is + * NOT_SUPPORTED_ERR: Raised if the specified root is * null. */ - public NodeIterator createNodeIterator(Node root, - int whatToShow, - NodeFilter filter, + public NodeIterator createNodeIterator(Node root, + int whatToShow, + NodeFilter filter, boolean entityReferenceExpansion) throws DOMException; /** - * Create a new TreeWalker over the subtree rooted at the + * Create a new TreeWalker over the subtree rooted at the * specified node. - * @param root The node which will serve as the root for the - * TreeWalker. The whatToShow flags and the - * NodeFilter are not considered when setting this value; - * any node type will be accepted as the root. The - * currentNode of the TreeWalker is - * initialized to this node, whether or not it is visible. The - * root functions as a stopping point for traversal - * methods that look upward in the document structure, such as - * parentNode and nextNode. The root must + * @param root The node which will serve as the root for the + * TreeWalker. The whatToShow flags and the + * NodeFilter are not considered when setting this value; + * any node type will be accepted as the root. The + * currentNode of the TreeWalker is + * initialized to this node, whether or not it is visible. The + * root functions as a stopping point for traversal + * methods that look upward in the document structure, such as + * parentNode and nextNode. The root must * not be null. - * @param whatToShow This flag specifies which node types may appear in - * the logical view of the tree presented by the - * TreeWalker. See the description of - * NodeFilter for the set of possible SHOW_ + * @param whatToShow This flag specifies which node types may appear in + * the logical view of the tree presented by the + * TreeWalker. See the description of + * NodeFilter for the set of possible SHOW_ * values.These flags can be combined using OR. - * @param filter The NodeFilter to be used with this + * @param filter The NodeFilter to be used with this * TreeWalker, or null to indicate no filter. - * @param entityReferenceExpansion If this flag is false, the contents of - * EntityReference nodes are not presented in the logical + * @param entityReferenceExpansion If this flag is false, the contents of + * EntityReference nodes are not presented in the logical * view. * @return The newly created TreeWalker. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if the specified root is + * NOT_SUPPORTED_ERR: Raised if the specified root is * null. */ - public TreeWalker createTreeWalker(Node root, - int whatToShow, - NodeFilter filter, + public TreeWalker createTreeWalker(Node root, + int whatToShow, + NodeFilter filter, boolean entityReferenceExpansion) throws DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java index b9beac476b3..5547750788c 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeFilter.java @@ -15,19 +15,19 @@ package org.w3c.dom.traversal; import org.w3c.dom.Node; /** - * Filters are objects that know how to "filter out" nodes. If a - * NodeIterator or TreeWalker is given a - * NodeFilter, it applies the filter before it returns the next - * node. If the filter says to accept the node, the traversal logic returns - * it; otherwise, traversal looks for the next node and pretends that the + * Filters are objects that know how to "filter out" nodes. If a + * NodeIterator or TreeWalker is given a + * NodeFilter, it applies the filter before it returns the next + * node. If the filter says to accept the node, the traversal logic returns + * it; otherwise, traversal looks for the next node and pretends that the * node that was rejected was not there. - *

    The DOM does not provide any filters. NodeFilter is just an - * interface that users can implement to provide their own filters. - *

    NodeFilters do not need to know how to traverse from node - * to node, nor do they need to know anything about the data structure that - * is being traversed. This makes it very easy to write filters, since the - * only thing they have to know how to do is evaluate a single node. One - * filter may be used with a number of different kinds of traversals, + *

    The DOM does not provide any filters. NodeFilter is just an + * interface that users can implement to provide their own filters. + *

    NodeFilters do not need to know how to traverse from node + * to node, nor do they need to know anything about the data structure that + * is being traversed. This makes it very easy to write filters, since the + * only thing they have to know how to do is evaluate a single node. One + * filter may be used with a number of different kinds of traversals, * encouraging code reuse. *

    See also the Document Object Model (DOM) Level 2 Traversal and Range Specification. * @since DOM Level 2 @@ -35,25 +35,25 @@ import org.w3c.dom.Node; public interface NodeFilter { // Constants returned by acceptNode /** - * Accept the node. Navigation methods defined for - * NodeIterator or TreeWalker will return this + * Accept the node. Navigation methods defined for + * NodeIterator or TreeWalker will return this * node. */ public static final short FILTER_ACCEPT = 1; /** - * Reject the node. Navigation methods defined for - * NodeIterator or TreeWalker will not return - * this node. For TreeWalker, the children of this node - * will also be rejected. NodeIterators treat this as a + * Reject the node. Navigation methods defined for + * NodeIterator or TreeWalker will not return + * this node. For TreeWalker, the children of this node + * will also be rejected. NodeIterators treat this as a * synonym for FILTER_SKIP. */ public static final short FILTER_REJECT = 2; /** - * Skip this single node. Navigation methods defined for - * NodeIterator or TreeWalker will not return - * this node. For both NodeIterator and - * TreeWalker, the children of this node will still be - * considered. + * Skip this single node. Navigation methods defined for + * NodeIterator or TreeWalker will not return + * this node. For both NodeIterator and + * TreeWalker, the children of this node will still be + * considered. */ public static final short FILTER_SKIP = 3; @@ -67,11 +67,11 @@ public interface NodeFilter { */ public static final int SHOW_ELEMENT = 0x00000001; /** - * Show Attr nodes. This is meaningful only when creating an - * NodeIterator or TreeWalker with an - * attribute node as its root; in this case, it means that - * the attribute node will appear in the first position of the iteration - * or traversal. Since attributes are never children of other nodes, + * Show Attr nodes. This is meaningful only when creating an + * NodeIterator or TreeWalker with an + * attribute node as its root; in this case, it means that + * the attribute node will appear in the first position of the iteration + * or traversal. Since attributes are never children of other nodes, * they do not appear when traversing over the document tree. */ public static final int SHOW_ATTRIBUTE = 0x00000002; @@ -88,12 +88,12 @@ public interface NodeFilter { */ public static final int SHOW_ENTITY_REFERENCE = 0x00000010; /** - * Show Entity nodes. This is meaningful only when creating - * an NodeIterator or TreeWalker with an - * Entity node as its root; in this case, it - * means that the Entity node will appear in the first - * position of the traversal. Since entities are not part of the - * document tree, they do not appear when traversing over the document + * Show Entity nodes. This is meaningful only when creating + * an NodeIterator or TreeWalker with an + * Entity node as its root; in this case, it + * means that the Entity node will appear in the first + * position of the traversal. Since entities are not part of the + * document tree, they do not appear when traversing over the document * tree. */ public static final int SHOW_ENTITY = 0x00000020; @@ -118,25 +118,25 @@ public interface NodeFilter { */ public static final int SHOW_DOCUMENT_FRAGMENT = 0x00000400; /** - * Show Notation nodes. This is meaningful only when creating - * an NodeIterator or TreeWalker with a - * Notation node as its root; in this case, it - * means that the Notation node will appear in the first - * position of the traversal. Since notations are not part of the - * document tree, they do not appear when traversing over the document + * Show Notation nodes. This is meaningful only when creating + * an NodeIterator or TreeWalker with a + * Notation node as its root; in this case, it + * means that the Notation node will appear in the first + * position of the traversal. Since notations are not part of the + * document tree, they do not appear when traversing over the document * tree. */ public static final int SHOW_NOTATION = 0x00000800; /** - * Test whether a specified node is visible in the logical view of a - * TreeWalker or NodeIterator. This function - * will be called by the implementation of TreeWalker and - * NodeIterator; it is not normally called directly from - * user code. (Though you could do so if you wanted to use the same + * Test whether a specified node is visible in the logical view of a + * TreeWalker or NodeIterator. This function + * will be called by the implementation of TreeWalker and + * NodeIterator; it is not normally called directly from + * user code. (Though you could do so if you wanted to use the same * filter to guide your own application logic.) * @param n The node to check to see if it passes the filter or not. - * @return A constant to determine whether the node is accepted, + * @return A constant to determine whether the node is accepted, * rejected, or skipped, as defined above. */ public short acceptNode(Node n); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java index d1f0d08399d..40deef2f325 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/NodeIterator.java @@ -16,32 +16,32 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * NodeIterators are used to step through a set of nodes, e.g. - * the set of nodes in a NodeList, the document subtree - * governed by a particular Node, the results of a query, or - * any other set of nodes. The set of nodes to be iterated is determined by - * the implementation of the NodeIterator. DOM Level 2 - * specifies a single NodeIterator implementation for - * document-order traversal of a document subtree. Instances of these - * NodeIterators are created by calling + * NodeIterators are used to step through a set of nodes, e.g. + * the set of nodes in a NodeList, the document subtree + * governed by a particular Node, the results of a query, or + * any other set of nodes. The set of nodes to be iterated is determined by + * the implementation of the NodeIterator. DOM Level 2 + * specifies a single NodeIterator implementation for + * document-order traversal of a document subtree. Instances of these + * NodeIterators are created by calling * DocumentTraversal.createNodeIterator(). *

    See also the Document Object Model (DOM) Level 2 Traversal and Range Specification. * @since DOM Level 2 */ public interface NodeIterator { /** - * The root node of the NodeIterator, as specified when it + * The root node of the NodeIterator, as specified when it * was created. */ public Node getRoot(); /** - * This attribute determines which node types are presented via the - * NodeIterator. The available set of constants is defined - * in the NodeFilter interface. Nodes not accepted by - * whatToShow will be skipped, but their children may still - * be considered. Note that this skip takes precedence over the filter, - * if any. + * This attribute determines which node types are presented via the + * NodeIterator. The available set of constants is defined + * in the NodeFilter interface. Nodes not accepted by + * whatToShow will be skipped, but their children may still + * be considered. Note that this skip takes precedence over the filter, + * if any. */ public int getWhatToShow(); @@ -51,57 +51,57 @@ public interface NodeIterator { public NodeFilter getFilter(); /** - * The value of this flag determines whether the children of entity - * reference nodes are visible to the NodeIterator. If - * false, these children and their descendants will be rejected. Note - * that this rejection takes precedence over whatToShow and - * the filter. Also note that this is currently the only situation where - * NodeIterators may reject a complete subtree rather than - * skipping individual nodes. + * The value of this flag determines whether the children of entity + * reference nodes are visible to the NodeIterator. If + * false, these children and their descendants will be rejected. Note + * that this rejection takes precedence over whatToShow and + * the filter. Also note that this is currently the only situation where + * NodeIterators may reject a complete subtree rather than + * skipping individual nodes. *
    - *
    To produce a view of the document that has entity references - * expanded and does not expose the entity reference node itself, use - * the whatToShow flags to hide the entity reference node - * and set expandEntityReferences to true when creating the - * NodeIterator. To produce a view of the document that has - * entity reference nodes but no entity expansion, use the - * whatToShow flags to show the entity reference node and + *
    To produce a view of the document that has entity references + * expanded and does not expose the entity reference node itself, use + * the whatToShow flags to hide the entity reference node + * and set expandEntityReferences to true when creating the + * NodeIterator. To produce a view of the document that has + * entity reference nodes but no entity expansion, use the + * whatToShow flags to show the entity reference node and * set expandEntityReferences to false. */ public boolean getExpandEntityReferences(); /** - * Returns the next node in the set and advances the position of the - * NodeIterator in the set. After a - * NodeIterator is created, the first call to + * Returns the next node in the set and advances the position of the + * NodeIterator in the set. After a + * NodeIterator is created, the first call to * nextNode() returns the first node in the set. - * @return The next Node in the set being iterated over, or + * @return The next Node in the set being iterated over, or * null if there are no more members in that set. * @exception DOMException - * INVALID_STATE_ERR: Raised if this method is called after the + * INVALID_STATE_ERR: Raised if this method is called after the * detach method was invoked. */ public Node nextNode() throws DOMException; /** - * Returns the previous node in the set and moves the position of the + * Returns the previous node in the set and moves the position of the * NodeIterator backwards in the set. - * @return The previous Node in the set being iterated over, - * or null if there are no more members in that set. + * @return The previous Node in the set being iterated over, + * or null if there are no more members in that set. * @exception DOMException - * INVALID_STATE_ERR: Raised if this method is called after the + * INVALID_STATE_ERR: Raised if this method is called after the * detach method was invoked. */ public Node previousNode() throws DOMException; /** - * Detaches the NodeIterator from the set which it iterated - * over, releasing any computational resources and placing the - * NodeIterator in the INVALID state. After - * detach has been invoked, calls to nextNode - * or previousNode will raise the exception + * Detaches the NodeIterator from the set which it iterated + * over, releasing any computational resources and placing the + * NodeIterator in the INVALID state. After + * detach has been invoked, calls to nextNode + * or previousNode will raise the exception * INVALID_STATE_ERR. */ public void detach(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java index f5fff86be09..74527f30df8 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/traversal/TreeWalker.java @@ -16,37 +16,37 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * TreeWalker objects are used to navigate a document tree or - * subtree using the view of the document defined by their - * whatToShow flags and filter (if any). Any function which - * performs navigation using a TreeWalker will automatically + * TreeWalker objects are used to navigate a document tree or + * subtree using the view of the document defined by their + * whatToShow flags and filter (if any). Any function which + * performs navigation using a TreeWalker will automatically * support any view defined by a TreeWalker. - *

    Omitting nodes from the logical view of a subtree can result in a - * structure that is substantially different from the same subtree in the - * complete, unfiltered document. Nodes that are siblings in the - * TreeWalker view may be children of different, widely - * separated nodes in the original view. For instance, consider a - * NodeFilter that skips all nodes except for Text nodes and - * the root node of a document. In the logical view that results, all text - * nodes will be siblings and appear as direct children of the root node, no + *

    Omitting nodes from the logical view of a subtree can result in a + * structure that is substantially different from the same subtree in the + * complete, unfiltered document. Nodes that are siblings in the + * TreeWalker view may be children of different, widely + * separated nodes in the original view. For instance, consider a + * NodeFilter that skips all nodes except for Text nodes and + * the root node of a document. In the logical view that results, all text + * nodes will be siblings and appear as direct children of the root node, no * matter how deeply nested the structure of the original document. *

    See also the Document Object Model (DOM) Level 2 Traversal and Range Specification. * @since DOM Level 2 */ public interface TreeWalker { /** - * The root node of the TreeWalker, as specified + * The root node of the TreeWalker, as specified * when it was created. */ public Node getRoot(); /** - * This attribute determines which node types are presented via the - * TreeWalker. The available set of constants is defined in - * the NodeFilter interface. Nodes not accepted by - * whatToShow will be skipped, but their children may still - * be considered. Note that this skip takes precedence over the filter, - * if any. + * This attribute determines which node types are presented via the + * TreeWalker. The available set of constants is defined in + * the NodeFilter interface. Nodes not accepted by + * whatToShow will be skipped, but their children may still + * be considered. Note that this skip takes precedence over the filter, + * if any. */ public int getWhatToShow(); @@ -56,123 +56,123 @@ public interface TreeWalker { public NodeFilter getFilter(); /** - * The value of this flag determines whether the children of entity - * reference nodes are visible to the TreeWalker. If false, - * these children and their descendants will be rejected. Note that - * this rejection takes precedence over whatToShow and the - * filter, if any. - *
    To produce a view of the document that has entity references - * expanded and does not expose the entity reference node itself, use - * the whatToShow flags to hide the entity reference node - * and set expandEntityReferences to true when creating the - * TreeWalker. To produce a view of the document that has - * entity reference nodes but no entity expansion, use the - * whatToShow flags to show the entity reference node and + * The value of this flag determines whether the children of entity + * reference nodes are visible to the TreeWalker. If false, + * these children and their descendants will be rejected. Note that + * this rejection takes precedence over whatToShow and the + * filter, if any. + *
    To produce a view of the document that has entity references + * expanded and does not expose the entity reference node itself, use + * the whatToShow flags to hide the entity reference node + * and set expandEntityReferences to true when creating the + * TreeWalker. To produce a view of the document that has + * entity reference nodes but no entity expansion, use the + * whatToShow flags to show the entity reference node and * set expandEntityReferences to false. */ public boolean getExpandEntityReferences(); /** * The node at which the TreeWalker is currently positioned. - *
    Alterations to the DOM tree may cause the current node to no longer - * be accepted by the TreeWalker's associated filter. - * currentNode may also be explicitly set to any node, - * whether or not it is within the subtree specified by the - * root node or would be accepted by the filter and - * whatToShow flags. Further traversal occurs relative to - * currentNode even if it is not part of the current view, - * by applying the filters in the requested direction; if no traversal - * is possible, currentNode is not changed. + *
    Alterations to the DOM tree may cause the current node to no longer + * be accepted by the TreeWalker's associated filter. + * currentNode may also be explicitly set to any node, + * whether or not it is within the subtree specified by the + * root node or would be accepted by the filter and + * whatToShow flags. Further traversal occurs relative to + * currentNode even if it is not part of the current view, + * by applying the filters in the requested direction; if no traversal + * is possible, currentNode is not changed. */ public Node getCurrentNode(); /** * The node at which the TreeWalker is currently positioned. - *
    Alterations to the DOM tree may cause the current node to no longer - * be accepted by the TreeWalker's associated filter. - * currentNode may also be explicitly set to any node, - * whether or not it is within the subtree specified by the - * root node or would be accepted by the filter and - * whatToShow flags. Further traversal occurs relative to - * currentNode even if it is not part of the current view, - * by applying the filters in the requested direction; if no traversal - * is possible, currentNode is not changed. + *
    Alterations to the DOM tree may cause the current node to no longer + * be accepted by the TreeWalker's associated filter. + * currentNode may also be explicitly set to any node, + * whether or not it is within the subtree specified by the + * root node or would be accepted by the filter and + * whatToShow flags. Further traversal occurs relative to + * currentNode even if it is not part of the current view, + * by applying the filters in the requested direction; if no traversal + * is possible, currentNode is not changed. * @exception DOMException - * NOT_SUPPORTED_ERR: Raised if an attempt is made to set + * NOT_SUPPORTED_ERR: Raised if an attempt is made to set * currentNode to null. */ public void setCurrentNode(Node currentNode) throws DOMException; /** - * Moves to and returns the closest visible ancestor node of the current - * node. If the search for parentNode attempts to step - * upward from the TreeWalker's root node, or - * if it fails to find a visible ancestor node, this method retains the + * Moves to and returns the closest visible ancestor node of the current + * node. If the search for parentNode attempts to step + * upward from the TreeWalker's root node, or + * if it fails to find a visible ancestor node, this method retains the * current position and returns null. - * @return The new parent node, or null if the current node - * has no parent in the TreeWalker's logical view. + * @return The new parent node, or null if the current node + * has no parent in the TreeWalker's logical view. */ public Node parentNode(); /** - * Moves the TreeWalker to the first visible child of the - * current node, and returns the new node. If the current node has no - * visible children, returns null, and retains the current + * Moves the TreeWalker to the first visible child of the + * current node, and returns the new node. If the current node has no + * visible children, returns null, and retains the current * node. - * @return The new node, or null if the current node has no - * visible children in the TreeWalker's logical view. + * @return The new node, or null if the current node has no + * visible children in the TreeWalker's logical view. */ public Node firstChild(); /** - * Moves the TreeWalker to the last visible child of the - * current node, and returns the new node. If the current node has no - * visible children, returns null, and retains the current + * Moves the TreeWalker to the last visible child of the + * current node, and returns the new node. If the current node has no + * visible children, returns null, and retains the current * node. - * @return The new node, or null if the current node has no - * children in the TreeWalker's logical view. + * @return The new node, or null if the current node has no + * children in the TreeWalker's logical view. */ public Node lastChild(); /** - * Moves the TreeWalker to the previous sibling of the - * current node, and returns the new node. If the current node has no - * visible previous sibling, returns null, and retains the + * Moves the TreeWalker to the previous sibling of the + * current node, and returns the new node. If the current node has no + * visible previous sibling, returns null, and retains the * current node. - * @return The new node, or null if the current node has no - * previous sibling. in the TreeWalker's logical view. + * @return The new node, or null if the current node has no + * previous sibling. in the TreeWalker's logical view. */ public Node previousSibling(); /** - * Moves the TreeWalker to the next sibling of the current - * node, and returns the new node. If the current node has no visible + * Moves the TreeWalker to the next sibling of the current + * node, and returns the new node. If the current node has no visible * next sibling, returns null, and retains the current node. - * @return The new node, or null if the current node has no - * next sibling. in the TreeWalker's logical view. + * @return The new node, or null if the current node has no + * next sibling. in the TreeWalker's logical view. */ public Node nextSibling(); /** - * Moves the TreeWalker to the previous visible node in - * document order relative to the current node, and returns the new - * node. If the current node has no previous node, or if the search for - * previousNode attempts to step upward from the - * TreeWalker's root node, returns - * null, and retains the current node. - * @return The new node, or null if the current node has no - * previous node in the TreeWalker's logical view. + * Moves the TreeWalker to the previous visible node in + * document order relative to the current node, and returns the new + * node. If the current node has no previous node, or if the search for + * previousNode attempts to step upward from the + * TreeWalker's root node, returns + * null, and retains the current node. + * @return The new node, or null if the current node has no + * previous node in the TreeWalker's logical view. */ public Node previousNode(); /** - * Moves the TreeWalker to the next visible node in document - * order relative to the current node, and returns the new node. If the - * current node has no next node, or if the search for nextNode attempts - * to step upward from the TreeWalker's root + * Moves the TreeWalker to the next visible node in document + * order relative to the current node, and returns the new node. If the + * current node has no next node, or if the search for nextNode attempts + * to step upward from the TreeWalker's root * node, returns null, and retains the current node. - * @return The new node, or null if the current node has no - * next node in the TreeWalker's logical view. + * @return The new node, or null if the current node has no + * next node in the TreeWalker's logical view. */ public Node nextNode(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/views/AbstractView.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/views/AbstractView.java index 97e8f0e2b0b..b024cc780cd 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/views/AbstractView.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/views/AbstractView.java @@ -19,7 +19,7 @@ package org.w3c.dom.views; */ public interface AbstractView { /** - * The source DocumentView of which this is an + * The source DocumentView of which this is an * AbstractView. */ public DocumentView getDocument(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/views/DocumentView.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/views/DocumentView.java index 2cb9eebb84b..37dfbe1a3ab 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/views/DocumentView.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/views/DocumentView.java @@ -13,16 +13,16 @@ package org.w3c.dom.views; /** - * The DocumentView interface is implemented by - * Document objects in DOM implementations supporting DOM - * Views. It provides an attribute to retrieve the default view of a + * The DocumentView interface is implemented by + * Document objects in DOM implementations supporting DOM + * Views. It provides an attribute to retrieve the default view of a * document. *

    See also the Document Object Model (DOM) Level 2 Views Specification. * @since DOM Level 2 */ public interface DocumentView { /** - * The default AbstractView for this Document, + * The default AbstractView for this Document, * or null if none available. */ public AbstractView getDefaultView(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java index a85c0e811da..848c67329be 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathEvaluator.java @@ -16,118 +16,118 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * The evaluation of XPath expressions is provided by - * XPathEvaluator. In a DOM implementation which supports the - * XPath 3.0 feature, as described above, the XPathEvaluator - * interface will be implemented on the same object which implements the - * Document interface permitting it to be obtained by the usual - * binding-specific method such as casting or by using the DOM Level 3 - * getInterface method. In this case the implementation obtained from the - * Document supports the XPath DOM module and is compatible with the XPath - * 1.0 specification. - *

    Evaluation of expressions with specialized extension functions or - * variables may not work in all implementations and is, therefore, not - * portable. XPathEvaluator implementations may be available - * from other sources that could provide specific support for specialized - * extension functions or variables as would be defined by other - * specifications. + * The evaluation of XPath expressions is provided by + * XPathEvaluator. In a DOM implementation which supports the + * XPath 3.0 feature, as described above, the XPathEvaluator + * interface will be implemented on the same object which implements the + * Document interface permitting it to be obtained by the usual + * binding-specific method such as casting or by using the DOM Level 3 + * getInterface method. In this case the implementation obtained from the + * Document supports the XPath DOM module and is compatible with the XPath + * 1.0 specification. + *

    Evaluation of expressions with specialized extension functions or + * variables may not work in all implementations and is, therefore, not + * portable. XPathEvaluator implementations may be available + * from other sources that could provide specific support for specialized + * extension functions or variables as would be defined by other + * specifications. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ public interface XPathEvaluator { /** - * Creates a parsed XPath expression with resolved namespaces. This is - * useful when an expression will be reused in an application since it - * makes it possible to compile the expression string into a more - * efficient internal form and preresolve all namespace prefixes which + * Creates a parsed XPath expression with resolved namespaces. This is + * useful when an expression will be reused in an application since it + * makes it possible to compile the expression string into a more + * efficient internal form and preresolve all namespace prefixes which * occur within the expression. * @param expression The XPath expression string to be parsed. - * @param resolver The resolver permits translation of all - * prefixes, including the xml namespace prefix, within - * the XPath expression into appropriate namespace URIs. If this is - * specified as null, any namespace prefix within the - * expression will result in DOMException being thrown + * @param resolver The resolver permits translation of all + * prefixes, including the xml namespace prefix, within + * the XPath expression into appropriate namespace URIs. If this is + * specified as null, any namespace prefix within the + * expression will result in DOMException being thrown * with the code NAMESPACE_ERR. * @return The compiled form of the XPath expression. * @exception XPathException - * INVALID_EXPRESSION_ERR: Raised if the expression is not legal + * INVALID_EXPRESSION_ERR: Raised if the expression is not legal * according to the rules of the XPathEvaluator. * @exception DOMException - * NAMESPACE_ERR: Raised if the expression contains namespace prefixes - * which cannot be resolved by the specified + * NAMESPACE_ERR: Raised if the expression contains namespace prefixes + * which cannot be resolved by the specified * XPathNSResolver. */ - public XPathExpression createExpression(String expression, + public XPathExpression createExpression(String expression, XPathNSResolver resolver) throws XPathException, DOMException; /** - * Adapts any DOM node to resolve namespaces so that an XPath expression - * can be easily evaluated relative to the context of the node where it - * appeared within the document. This adapter works like the DOM Level 3 - * method lookupNamespaceURI on nodes in resolving the - * namespaceURI from a given prefix using the current information - * available in the node's hierarchy at the time lookupNamespaceURI is + * Adapts any DOM node to resolve namespaces so that an XPath expression + * can be easily evaluated relative to the context of the node where it + * appeared within the document. This adapter works like the DOM Level 3 + * method lookupNamespaceURI on nodes in resolving the + * namespaceURI from a given prefix using the current information + * available in the node's hierarchy at the time lookupNamespaceURI is * called. also correctly resolving the implicit xml prefix. - * @param nodeResolver The node to be used as a context for namespace + * @param nodeResolver The node to be used as a context for namespace * resolution. - * @return XPathNSResolver which resolves namespaces with + * @return XPathNSResolver which resolves namespaces with * respect to the definitions in scope for a specified node. */ public XPathNSResolver createNSResolver(Node nodeResolver); /** - * Evaluates an XPath expression string and returns a result of the + * Evaluates an XPath expression string and returns a result of the * specified type if possible. - * @param expression The XPath expression string to be parsed and + * @param expression The XPath expression string to be parsed and * evaluated. - * @param contextNode The context is context node for the - * evaluation of this XPath expression. If the XPathEvaluator was - * obtained by casting the Document then this must be - * owned by the same document and must be a Document, - * Element, Attribute, Text, - * CDATASection, Comment, - * ProcessingInstruction, or XPathNamespace - * node. If the context node is a Text or a - * CDATASection, then the context is interpreted as the - * whole logical text node as seen by XPath, unless the node is empty + * @param contextNode The context is context node for the + * evaluation of this XPath expression. If the XPathEvaluator was + * obtained by casting the Document then this must be + * owned by the same document and must be a Document, + * Element, Attribute, Text, + * CDATASection, Comment, + * ProcessingInstruction, or XPathNamespace + * node. If the context node is a Text or a + * CDATASection, then the context is interpreted as the + * whole logical text node as seen by XPath, unless the node is empty * in which case it may not serve as the XPath context. - * @param resolver The resolver permits translation of all - * prefixes, including the xml namespace prefix, within - * the XPath expression into appropriate namespace URIs. If this is - * specified as null, any namespace prefix within the - * expression will result in DOMException being thrown + * @param resolver The resolver permits translation of all + * prefixes, including the xml namespace prefix, within + * the XPath expression into appropriate namespace URIs. If this is + * specified as null, any namespace prefix within the + * expression will result in DOMException being thrown * with the code NAMESPACE_ERR. - * @param type If a specific type is specified, then the - * result will be returned as the corresponding type.For XPath 1.0 - * results, this must be one of the codes of the + * @param type If a specific type is specified, then the + * result will be returned as the corresponding type.For XPath 1.0 + * results, this must be one of the codes of the * XPathResult interface. - * @param result The result specifies a specific result - * object which may be reused and returned by this method. If this is - * specified as nullor the implementation does not reuse - * the specified result, a new result object will be constructed and - * returned.For XPath 1.0 results, this object will be of type + * @param result The result specifies a specific result + * object which may be reused and returned by this method. If this is + * specified as nullor the implementation does not reuse + * the specified result, a new result object will be constructed and + * returned.For XPath 1.0 results, this object will be of type * XPathResult. - * @return The result of the evaluation of the XPath expression.For XPath + * @return The result of the evaluation of the XPath expression.For XPath * 1.0 results, this object will be of type XPathResult. * @exception XPathException - * INVALID_EXPRESSION_ERR: Raised if the expression is not legal + * INVALID_EXPRESSION_ERR: Raised if the expression is not legal * according to the rules of the XPathEvaluatori - *
    TYPE_ERR: Raised if the result cannot be converted to return the + *
    TYPE_ERR: Raised if the result cannot be converted to return the * specified type. * @exception DOMException - * NAMESPACE_ERR: Raised if the expression contains namespace prefixes - * which cannot be resolved by the specified + * NAMESPACE_ERR: Raised if the expression contains namespace prefixes + * which cannot be resolved by the specified * XPathNSResolver. - *
    WRONG_DOCUMENT_ERR: The Node is from a document that is not + *
    WRONG_DOCUMENT_ERR: The Node is from a document that is not * supported by this XPathEvaluator. - *
    NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath - * context node or the request type is not permitted by this + *
    NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath + * context node or the request type is not permitted by this * XPathEvaluator. */ - public Object evaluate(String expression, - Node contextNode, - XPathNSResolver resolver, - short type, + public Object evaluate(String expression, + Node contextNode, + XPathNSResolver resolver, + short type, Object result) throws XPathException, DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathException.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathException.java index deb1bd78394..6b13cdf00a8 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathException.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathException.java @@ -13,7 +13,7 @@ package org.w3c.dom.xpath; /** - * A new exception has been created for exceptions specific to these XPath + * A new exception has been created for exceptions specific to these XPath * interfaces. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ @@ -25,9 +25,9 @@ public class XPathException extends RuntimeException { public short code; // XPathExceptionCode /** - * If the expression has a syntax error or otherwise is not a legal - * expression according to the rules of the specific - * XPathEvaluator or contains specialized extension + * If the expression has a syntax error or otherwise is not a legal + * expression according to the rules of the specific + * XPathEvaluator or contains specialized extension * functions or variables not supported by this implementation. */ public static final short INVALID_EXPRESSION_ERR = 51; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java index e972532544d..ab5d28c43d6 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathExpression.java @@ -16,49 +16,49 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * The XPathExpression interface represents a parsed and resolved + * The XPathExpression interface represents a parsed and resolved * XPath expression. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ public interface XPathExpression { /** * Evaluates this XPath expression and returns a result. - * @param contextNode The context is context node for the - * evaluation of this XPath expression.If the XPathEvaluator was - * obtained by casting the Document then this must be - * owned by the same document and must be a Document, - * Element, Attribute, Text, - * CDATASection, Comment, - * ProcessingInstruction, or XPathNamespace - * node.If the context node is a Text or a - * CDATASection, then the context is interpreted as the - * whole logical text node as seen by XPath, unless the node is empty + * @param contextNode The context is context node for the + * evaluation of this XPath expression.If the XPathEvaluator was + * obtained by casting the Document then this must be + * owned by the same document and must be a Document, + * Element, Attribute, Text, + * CDATASection, Comment, + * ProcessingInstruction, or XPathNamespace + * node.If the context node is a Text or a + * CDATASection, then the context is interpreted as the + * whole logical text node as seen by XPath, unless the node is empty * in which case it may not serve as the XPath context. - * @param type If a specific type is specified, then the - * result will be coerced to return the specified type relying on - * XPath conversions and fail if the desired coercion is not possible. + * @param type If a specific type is specified, then the + * result will be coerced to return the specified type relying on + * XPath conversions and fail if the desired coercion is not possible. * This must be one of the type codes of XPathResult. - * @param result The result specifies a specific result - * object which may be reused and returned by this method. If this is - * specified as nullor the implementation does not reuse - * the specified result, a new result object will be constructed and - * returned.For XPath 1.0 results, this object will be of type + * @param result The result specifies a specific result + * object which may be reused and returned by this method. If this is + * specified as nullor the implementation does not reuse + * the specified result, a new result object will be constructed and + * returned.For XPath 1.0 results, this object will be of type * XPathResult. - * @return The result of the evaluation of the XPath expression.For XPath + * @return The result of the evaluation of the XPath expression.For XPath * 1.0 results, this object will be of type XPathResult. * @exception XPathException - * TYPE_ERR: Raised if the result cannot be converted to return the + * TYPE_ERR: Raised if the result cannot be converted to return the * specified type. * @exception DOMException - * WRONG_DOCUMENT_ERR: The Node is from a document that is not supported + * WRONG_DOCUMENT_ERR: The Node is from a document that is not supported * by the XPathEvaluator that created this XPathExpression * . - *
    NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath - * context node or the request type is not permitted by this + *
    NOT_SUPPORTED_ERR: The Node is not a type permitted as an XPath + * context node or the request type is not permitted by this * XPathExpression. */ - public Object evaluate(Node contextNode, - short type, + public Object evaluate(Node contextNode, + short type, Object result) throws XPathException, DOMException; diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java index b8f05213812..5ce068de9d7 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNSResolver.java @@ -13,20 +13,20 @@ package org.w3c.dom.xpath; /** - * The XPathNSResolver interface permit prefix - * strings in the expression to be properly bound to - * namespaceURI strings. XPathEvaluator can - * construct an implementation of XPathNSResolver from a node, + * The XPathNSResolver interface permit prefix + * strings in the expression to be properly bound to + * namespaceURI strings. XPathEvaluator can + * construct an implementation of XPathNSResolver from a node, * or the interface may be implemented by any application. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ public interface XPathNSResolver { /** - * Look up the namespace URI associated to the given namespace prefix. The - * XPath evaluator must never call this with a null or + * Look up the namespace URI associated to the given namespace prefix. The + * XPath evaluator must never call this with a null or * empty argument, because the result of doing this is undefined. * @param prefix The prefix to look for. - * @return Returns the associated namespace URI or null if + * @return Returns the associated namespace URI or null if * none is found. */ public String lookupNamespaceURI(String prefix); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java index 9f15481d584..d644051f21a 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathNamespace.java @@ -16,36 +16,36 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; /** - * The XPathNamespace interface is returned by - * XPathResult interfaces to represent the XPath namespace node - * type that DOM lacks. There is no public constructor for this node type. - * Attempts to place it into a hierarchy or a NamedNodeMap result in a + * The XPathNamespace interface is returned by + * XPathResult interfaces to represent the XPath namespace node + * type that DOM lacks. There is no public constructor for this node type. + * Attempts to place it into a hierarchy or a NamedNodeMap result in a * DOMException with the code HIERARCHY_REQUEST_ERR - * . This node is read only, so methods or setting of attributes that would - * mutate the node result in a DOMException with the code + * . This node is read only, so methods or setting of attributes that would + * mutate the node result in a DOMException with the code * NO_MODIFICATION_ALLOWED_ERR. - *

    The core specification describes attributes of the Node - * interface that are different for different node types but does not - * describe XPATH_NAMESPACE_NODE, so here is a description of - * those attributes for this node type. All attributes of Node - * not described in this section have a null or + *

    The core specification describes attributes of the Node + * interface that are different for different node types but does not + * describe XPATH_NAMESPACE_NODE, so here is a description of + * those attributes for this node type. All attributes of Node + * not described in this section have a null or * false value. - *

    ownerDocument matches the ownerDocument of the + *

    ownerDocument matches the ownerDocument of the * ownerElement even if the element is later adopted. *

    nodeName is always the string "#namespace". - *

    prefix is the prefix of the namespace represented by the + *

    prefix is the prefix of the namespace represented by the * node. *

    localName is the same as prefix. *

    nodeType is equal to XPATH_NAMESPACE_NODE. - *

    namespaceURI is the namespace URI of the namespace + *

    namespaceURI is the namespace URI of the namespace * represented by the node. *

    nodeValue is the same as namespaceURI. - *

    adoptNode, cloneNode, and - * importNode fail on this node type by raising a + *

    adoptNode, cloneNode, and + * importNode fail on this node type by raising a * DOMException with the code NOT_SUPPORTED_ERR. - *

    Note: In future versions of the XPath specification, the - * definition of a namespace node may be changed incomatibly, in which case - * incompatible changes to field values may be required to implement + *

    Note: In future versions of the XPath specification, the + * definition of a namespace node may be changed incomatibly, in which case + * incompatible changes to field values may be required to implement * versions beyond XPath 1.0. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ @@ -57,9 +57,9 @@ public interface XPathNamespace extends Node { public static final short XPATH_NAMESPACE_NODE = 13; /** - * The Element on which the namespace was in scope when it - * was requested. This does not change on a returned namespace node even - * if the document changes such that the namespace goes out of scope on + * The Element on which the namespace was in scope when it + * was requested. This does not change on a returned namespace node even + * if the document changes such that the namespace goes out of scope on * that element and this node is no longer found there by XPath. */ public Element getOwnerElement(); diff --git a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java index 56064b90ecf..06fd29dac91 100644 --- a/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java +++ b/libjava/classpath/external/w3c_dom/org/w3c/dom/xpath/XPathResult.java @@ -16,115 +16,115 @@ import org.w3c.dom.Node; import org.w3c.dom.DOMException; /** - * The XPathResult interface represents the result of the - * evaluation of an XPath 1.0 expression within the context of a particular - * node. Since evaluation of an XPath expression can result in various - * result types, this object makes it possible to discover and manipulate + * The XPathResult interface represents the result of the + * evaluation of an XPath 1.0 expression within the context of a particular + * node. Since evaluation of an XPath expression can result in various + * result types, this object makes it possible to discover and manipulate * the type and value of the result. *

    See also the Document Object Model (DOM) Level 3 XPath Specification. */ public interface XPathResult { // XPathResultType /** - * This code does not represent a specific type. An evaluation of an XPath - * expression will never produce this type. If this type is requested, - * then the evaluation returns whatever type naturally results from - * evaluation of the expression. - *
    If the natural result is a node set when ANY_TYPE was - * requested, then UNORDERED_NODE_ITERATOR_TYPE is always - * the resulting type. Any other representation of a node set must be + * This code does not represent a specific type. An evaluation of an XPath + * expression will never produce this type. If this type is requested, + * then the evaluation returns whatever type naturally results from + * evaluation of the expression. + *
    If the natural result is a node set when ANY_TYPE was + * requested, then UNORDERED_NODE_ITERATOR_TYPE is always + * the resulting type. Any other representation of a node set must be * explicitly requested. */ public static final short ANY_TYPE = 0; /** - * The result is a number as defined by [XPath 1.0]. - * Document modification does not invalidate the number, but may mean + * The result is a number as defined by [XPath 1.0]. + * Document modification does not invalidate the number, but may mean * that reevaluation would not yield the same number. */ public static final short NUMBER_TYPE = 1; /** - * The result is a string as defined by [XPath 1.0]. - * Document modification does not invalidate the string, but may mean + * The result is a string as defined by [XPath 1.0]. + * Document modification does not invalidate the string, but may mean * that the string no longer corresponds to the current document. */ public static final short STRING_TYPE = 2; /** - * The result is a boolean as defined by [XPath 1.0]. - * Document modification does not invalidate the boolean, but may mean + * The result is a boolean as defined by [XPath 1.0]. + * Document modification does not invalidate the boolean, but may mean * that reevaluation would not yield the same boolean. */ public static final short BOOLEAN_TYPE = 3; /** - * The result is a node set as defined by [XPath 1.0] that - * will be accessed iteratively, which may not produce nodes in a + * The result is a node set as defined by [XPath 1.0] that + * will be accessed iteratively, which may not produce nodes in a * particular order. Document modification invalidates the iteration. - *
    This is the default type returned if the result is a node set and + *
    This is the default type returned if the result is a node set and * ANY_TYPE is requested. */ public static final short UNORDERED_NODE_ITERATOR_TYPE = 4; /** - * The result is a node set as defined by [XPath 1.0] that - * will be accessed iteratively, which will produce document-ordered + * The result is a node set as defined by [XPath 1.0] that + * will be accessed iteratively, which will produce document-ordered * nodes. Document modification invalidates the iteration. */ public static final short ORDERED_NODE_ITERATOR_TYPE = 5; /** - * The result is a node set as defined by [XPath 1.0] that - * will be accessed as a snapshot list of nodes that may not be in a - * particular order. Document modification does not invalidate the - * snapshot but may mean that reevaluation would not yield the same - * snapshot and nodes in the snapshot may have been altered, moved, or + * The result is a node set as defined by [XPath 1.0] that + * will be accessed as a snapshot list of nodes that may not be in a + * particular order. Document modification does not invalidate the + * snapshot but may mean that reevaluation would not yield the same + * snapshot and nodes in the snapshot may have been altered, moved, or * removed from the document. */ public static final short UNORDERED_NODE_SNAPSHOT_TYPE = 6; /** - * The result is a node set as defined by [XPath 1.0] that - * will be accessed as a snapshot list of nodes that will be in original - * document order. Document modification does not invalidate the - * snapshot but may mean that reevaluation would not yield the same - * snapshot and nodes in the snapshot may have been altered, moved, or + * The result is a node set as defined by [XPath 1.0] that + * will be accessed as a snapshot list of nodes that will be in original + * document order. Document modification does not invalidate the + * snapshot but may mean that reevaluation would not yield the same + * snapshot and nodes in the snapshot may have been altered, moved, or * removed from the document. */ public static final short ORDERED_NODE_SNAPSHOT_TYPE = 7; /** - * The result is a node set as defined by [XPath 1.0] and - * will be accessed as a single node, which may be nullif - * the node set is empty. Document modification does not invalidate the - * node, but may mean that the result node no longer corresponds to the - * current document. This is a convenience that permits optimization - * since the implementation can stop once any node in the resulting set + * The result is a node set as defined by [XPath 1.0] and + * will be accessed as a single node, which may be nullif + * the node set is empty. Document modification does not invalidate the + * node, but may mean that the result node no longer corresponds to the + * current document. This is a convenience that permits optimization + * since the implementation can stop once any node in the resulting set * has been found. - *
    If there is more than one node in the actual result, the single + *
    If there is more than one node in the actual result, the single * node returned might not be the first in document order. */ public static final short ANY_UNORDERED_NODE_TYPE = 8; /** - * The result is a node set as defined by [XPath 1.0] and - * will be accessed as a single node, which may be null if - * the node set is empty. Document modification does not invalidate the - * node, but may mean that the result node no longer corresponds to the - * current document. This is a convenience that permits optimization - * since the implementation can stop once the first node in document + * The result is a node set as defined by [XPath 1.0] and + * will be accessed as a single node, which may be null if + * the node set is empty. Document modification does not invalidate the + * node, but may mean that the result node no longer corresponds to the + * current document. This is a convenience that permits optimization + * since the implementation can stop once the first node in document * order of the resulting set has been found. - *
    If there are more than one node in the actual result, the single + *
    If there are more than one node in the actual result, the single * node returned will be the first in document order. */ public static final short FIRST_ORDERED_NODE_TYPE = 9; /** - * A code representing the type of this result, as defined by the type + * A code representing the type of this result, as defined by the type * constants. */ public short getResultType(); /** - * The value of this number result. If the native double type of the DOM - * binding does not directly support the exact IEEE 754 result of the - * XPath expression, then it is up to the definition of the binding to - * specify how the XPath number is converted to the native binding + * The value of this number result. If the native double type of the DOM + * binding does not directly support the exact IEEE 754 result of the + * XPath expression, then it is up to the definition of the binding to + * specify how the XPath number is converted to the native binding * number. * @exception XPathException - * TYPE_ERR: raised if resultType is not + * TYPE_ERR: raised if resultType is not * NUMBER_TYPE. */ public double getNumberValue() @@ -133,7 +133,7 @@ public interface XPathResult { /** * The value of this string result. * @exception XPathException - * TYPE_ERR: raised if resultType is not + * TYPE_ERR: raised if resultType is not * STRING_TYPE. */ public String getStringValue() @@ -142,7 +142,7 @@ public interface XPathResult { /** * The value of this boolean result. * @exception XPathException - * TYPE_ERR: raised if resultType is not + * TYPE_ERR: raised if resultType is not * BOOLEAN_TYPE. */ public boolean getBooleanValue() @@ -151,61 +151,61 @@ public interface XPathResult { /** * The value of this single node result, which may be null. * @exception XPathException - * TYPE_ERR: raised if resultType is not - * ANY_UNORDERED_NODE_TYPE or + * TYPE_ERR: raised if resultType is not + * ANY_UNORDERED_NODE_TYPE or * FIRST_ORDERED_NODE_TYPE. */ public Node getSingleNodeValue() throws XPathException; /** - * Signifies that the iterator has become invalid. True if - * resultType is UNORDERED_NODE_ITERATOR_TYPE - * or ORDERED_NODE_ITERATOR_TYPE and the document has been + * Signifies that the iterator has become invalid. True if + * resultType is UNORDERED_NODE_ITERATOR_TYPE + * or ORDERED_NODE_ITERATOR_TYPE and the document has been * modified since this result was returned. */ public boolean getInvalidIteratorState(); /** - * The number of nodes in the result snapshot. Valid values for - * snapshotItem indices are 0 to + * The number of nodes in the result snapshot. Valid values for + * snapshotItem indices are 0 to * snapshotLength-1 inclusive. * @exception XPathException - * TYPE_ERR: raised if resultType is not - * UNORDERED_NODE_SNAPSHOT_TYPE or + * TYPE_ERR: raised if resultType is not + * UNORDERED_NODE_SNAPSHOT_TYPE or * ORDERED_NODE_SNAPSHOT_TYPE. */ public int getSnapshotLength() throws XPathException; /** - * Iterates and returns the next node from the node set or + * Iterates and returns the next node from the node set or * nullif there are no more nodes. * @return Returns the next node. * @exception XPathException - * TYPE_ERR: raised if resultType is not - * UNORDERED_NODE_ITERATOR_TYPE or + * TYPE_ERR: raised if resultType is not + * UNORDERED_NODE_ITERATOR_TYPE or * ORDERED_NODE_ITERATOR_TYPE. * @exception DOMException - * INVALID_STATE_ERR: The document has been mutated since the result was + * INVALID_STATE_ERR: The document has been mutated since the result was * returned. */ public Node iterateNext() throws XPathException, DOMException; /** - * Returns the indexth item in the snapshot collection. If - * index is greater than or equal to the number of nodes in - * the list, this method returns null. Unlike the iterator - * result, the snapshot does not become invalid, but may not correspond + * Returns the indexth item in the snapshot collection. If + * index is greater than or equal to the number of nodes in + * the list, this method returns null. Unlike the iterator + * result, the snapshot does not become invalid, but may not correspond * to the current document if it is mutated. * @param index Index into the snapshot collection. - * @return The node at the indexth position in the - * NodeList, or null if that is not a valid + * @return The node at the indexth position in the + * NodeList, or null if that is not a valid * index. * @exception XPathException - * TYPE_ERR: raised if resultType is not - * UNORDERED_NODE_SNAPSHOT_TYPE or + * TYPE_ERR: raised if resultType is not + * UNORDERED_NODE_SNAPSHOT_TYPE or * ORDERED_NODE_SNAPSHOT_TYPE. */ public Node snapshotItem(int index) diff --git a/libjava/classpath/gnu/CORBA/BigDecimalHelper.java b/libjava/classpath/gnu/CORBA/BigDecimalHelper.java index 33b74bb7780..c5c8f99abfb 100644 --- a/libjava/classpath/gnu/CORBA/BigDecimalHelper.java +++ b/libjava/classpath/gnu/CORBA/BigDecimalHelper.java @@ -117,7 +117,7 @@ public class BigDecimalHelper if (f >= 0) bout.write(f); } - // The last byte has 0xC or 0xD in the last halfbyte. + // The last byte has 0xC or 0xD in the last halfbyte. while ((f & 0xF) <= 0x9); return createFixed(scale, bout.toByteArray()); @@ -126,7 +126,7 @@ public class BigDecimalHelper /** * Write the big decimal as CORBA fixed<.code>. * The scale will not be stored. - * + * * @param out a stream to write into. * @param x a big decimal to write. * diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java index f582c31bd18..fae16eed9d7 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java @@ -86,13 +86,13 @@ import java.math.BigDecimal; * from the given {@link java.io.InputStream}. The primitive types are aligned * on they natural boundaries by implementing the abstract method * {@link #align(int boundary)}. - * + * * The same class also implements {@link org.omg.CORBA.DataInputStream} to read * the object content in a user defined way. - * + * * TODO This class uses 16 bits per Unicode character only, as it was until jdk * 1.4 inclusive. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public abstract class AbstractCdrInput @@ -173,7 +173,7 @@ public abstract class AbstractCdrInput /** * Creates the stream. The stream reads Big Endian by default. - * + * * @param readFrom a stream to read CORBA input from. */ public AbstractCdrInput(java.io.InputStream readFrom) @@ -194,7 +194,7 @@ public abstract class AbstractCdrInput /** * Set the Big Endian or Little Endian encoding. The stream reads Big Endian * by default. - * + * * @param use_big_endian if true, the stream expect the multi-byte data in * the form "most significant byte first" (Big Endian). This is the * java standard. @@ -207,7 +207,7 @@ public abstract class AbstractCdrInput /** * Get the used encoding. - * + * * @return true for Big Endian, false for Little Endian. */ public boolean isBigEndian() @@ -228,7 +228,7 @@ public abstract class AbstractCdrInput /** * Set the input stream that receives the CORBA input. - * + * * @param readFrom the stream. */ public void setInputStream(java.io.InputStream readFrom) @@ -249,7 +249,7 @@ public abstract class AbstractCdrInput /** * Set the orb, associated with this stream. - * + * * @param an_orb */ public void setOrb(ORB an_orb) @@ -323,7 +323,7 @@ public abstract class AbstractCdrInput /** * Return the associated {@link ORB}. - * + * * @return the associated {@link ORB} or null is no such is set. */ public ORB orb() @@ -393,14 +393,14 @@ public abstract class AbstractCdrInput * plain (not a string-encoded) IOR profile without the heading endian * indicator. The responsible method for reading such data is * {@link IOR.read_no_endian}. - * + * * The returned object is usually casted into the given type using the .narrow * method of its helper, despite in some cases the direct cast would also * work. - * + * * The null objects are recognised from the empty profile set. For such * objects, null is returned. - * + * * @return the loaded and constructed object. */ public org.omg.CORBA.Object read_Object() @@ -991,7 +991,7 @@ public abstract class AbstractCdrInput * Read a singe byte string. The method firs reads the byte array and then * calls a constructor to create a string from this array. The character * encoding, if previously set, is taken into consideration. - * + * * @return a loaded string. */ public String read_string() @@ -1195,7 +1195,7 @@ public abstract class AbstractCdrInput /** * Reads the string in wide character format (ussually UTF-16, Unicode). Takes * the currently set charset into consideration. - * + * * If the native (UTF-16) encoding is used of the GIOP protocol is before 1.2, * delegates functionality to "plain" {@link #read_wstring_UTF_16}. */ @@ -1239,7 +1239,7 @@ public abstract class AbstractCdrInput { int p = 0; int n = read_long(); - + if (n<0) { MARSHAL m = new MARSHAL("Negative string size"); @@ -1336,9 +1336,9 @@ public abstract class AbstractCdrInput * Read the object that is an instance of the given class. The current * implementation delegates functionality to the parameterless * {@link readObject()}. - * + * * @param klass a class of that this object the instance is. - * + * * @return the returned object. */ public org.omg.CORBA.Object read_Object(Class klass) @@ -1348,11 +1348,11 @@ public abstract class AbstractCdrInput /** * Read a value type structure from the stream. - * + * * OMG specification states the writing format is outside the scope of GIOP * definition. This implementation uses java serialization mechanism, calling * {@link ObjectInputStream#readObject} - * + * * @return an value type structure, unmarshaled from the stream */ public Serializable read_Value() @@ -1363,11 +1363,11 @@ public abstract class AbstractCdrInput /** * Read the abstract interface. An abstract interface can be either CORBA * value type or CORBA object and is returned as an abstract java.lang.Object. - * + * * As specified in OMG specification, this reads a single boolean and then * delegates either to {@link #read_Object()} (for false) or to * {@link #read_Value()} (for true). - * + * * @return an abstract interface, unmarshaled from the stream */ public java.lang.Object read_Abstract() @@ -1402,11 +1402,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the char array to fit the newly read * values. - * + * * @param holder_value the existing char array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1450,11 +1450,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the int array to fit the newly read values. - * + * * @param holder_value the existing int array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1487,11 +1487,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the float array to fit the newly read * values. - * + * * @param holder_value the existing float array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1524,11 +1524,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the double array to fit the newly read * values. - * + * * @param holder_value the existing double array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1568,11 +1568,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the short array to fit the newly read * values. - * + * * @param holder_value the existing short array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1605,11 +1605,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the byte array to fit the newly read * values. - * + * * @param holder_value the existing byte array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1656,11 +1656,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of longs to fit the newly read * values. - * + * * @param holder_value the existing array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1693,11 +1693,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of booleans to fit the newly read * values. - * + * * @param holder_value the existing array of booleans, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1733,11 +1733,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of Anys to fit the newly read * values. - * + * * @param holder_value the existing array of Anys, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1758,11 +1758,11 @@ public abstract class AbstractCdrInput /** * This method is required to represent the DataInputStream as a value type * object. - * + * * @return a single entity "IDL:omg.org/CORBA/DataInputStream:1.0", always. */ public String[] _truncatable_ids() { return new String[] { "IDL:omg.org/CORBA/DataInputStream:1.0" }; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java index 7f3e3ab0daf..ab0b982ab4a 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java @@ -79,7 +79,7 @@ import java.math.BigDecimal; * The same class also implements the {@link DataInputStream}, * providing support for writing the value type objects * in a user defined way. - * + * * TODO This class uses 16 bits per Unicode character only, as it was until * jdk 1.4 inclusive. * @@ -90,11 +90,11 @@ public abstract class AbstractCdrOutput implements org.omg.CORBA.DataOutputStream { /** - * The runtime, associated with this stream. This field is only used when + * The runtime, associated with this stream. This field is only used when * reading and writing value types and filled-in in gnu.CORBA.CDR.Vio. */ - public transient gnuRuntime runtime; - + public transient gnuRuntime runtime; + /** * This instance is used to convert primitive data types into the * byte sequences. @@ -177,7 +177,7 @@ public abstract class AbstractCdrOutput * stream is different from 0. */ public abstract void setOffset(int an_offset); - + /** * Clone all important settings to another stream. */ @@ -187,7 +187,7 @@ public abstract class AbstractCdrOutput stream.setCodeSet(getCodeSet()); stream.setVersion(giop); stream.setOrb(orb); - } + } /** * Set the current code set context. @@ -336,7 +336,7 @@ public abstract class AbstractCdrOutput * Read the CORBA object. The object is written form of the plain (not a * string-encoded) IOR profile without the heading endian indicator. The * responsible method for reading such data is {@link IOR.write_no_endian}. - * + * * The null value is written as defined in OMG specification (zero length * string, followed by an empty set of profiles). */ @@ -901,7 +901,7 @@ public abstract class AbstractCdrOutput /** * Writes the character as two byte short integer (Unicode value), high byte * first. Writes in Big Endian, but never writes the endian indicator. - * + * * The character is always written using the native UTF-16BE charset because * its size under arbitrary encoding is not evident. */ @@ -944,11 +944,11 @@ public abstract class AbstractCdrOutput /** * Write the array of wide chars. - * + * * @param chars the array of wide chars * @param offset offset * @param length length - * + * * The char array is always written using the native UTF-16BE charset because * the character size under arbitrary encoding is not evident. */ @@ -1044,4 +1044,4 @@ public abstract class AbstractCdrOutput { write_value(value); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java index 4d120fa2c0c..0ad98bed7bf 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java @@ -389,4 +389,4 @@ public interface AbstractDataInput */ int skipBytes(int n) throws IOException; -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java index e37c0cb7ddd..e41ec598aec 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java @@ -182,4 +182,4 @@ public interface AbstractDataOutput */ void writeDouble(double value) throws IOException; -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AligningInput.java b/libjava/classpath/gnu/CORBA/CDR/AligningInput.java index e2710628a52..8d438ab0610 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AligningInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AligningInput.java @@ -107,17 +107,17 @@ public class AligningInput { return buf; } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return pos + offset; - } - + } + /** * Jump to the given position, taking offset into consideration. */ @@ -127,5 +127,5 @@ public class AligningInput throw new ArrayIndexOutOfBoundsException(position + " is out of valid ["+offset+".." + (count+offset) + "[ range"); pos = position - offset; - } + } } diff --git a/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java b/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java index 135f75af6a7..b0c569ec879 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java @@ -117,17 +117,17 @@ public class AligningOutput write(0); } } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return size()+offset; } - + /** * Seek to the given position (not in use). */ @@ -135,7 +135,7 @@ public class AligningOutput { count = position - offset; } - + /** * Get the buffer without copying it. Use with care. */ @@ -143,6 +143,6 @@ public class AligningOutput { return buf; } - + } diff --git a/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java b/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java index 7a4d9c5aa8f..0578f13b857 100644 --- a/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java +++ b/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java @@ -63,7 +63,7 @@ import javax.rmi.CORBA.ValueHandler; * Writes arrays as a boxed value types. A single instance is used to write a * single array. This class is only used with RMI/IIOP, to handle array boxed * values. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ class ArrayValueHelper diff --git a/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java b/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java index 1559d75a41e..5579789a58b 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java @@ -58,4 +58,4 @@ public class BigEndianInputStream { super(in); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java b/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java index 7d3b02ec950..dda14a03a33 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java @@ -59,4 +59,4 @@ public class BigEndianOutputStream { super(out); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java b/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java index 69bf95beb66..ae510b39c9b 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java @@ -42,7 +42,7 @@ import java.io.ByteArrayOutputStream; /** * A CORBA output stream, writing data into the internal buffer ({@link ByteArrayOutputStream}). - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class BufferedCdrOutput @@ -61,7 +61,7 @@ public class BufferedCdrOutput /** * Creates the instance with the given initial buffer size. - * + * * @param bufSize the buffer size. */ public BufferedCdrOutput(int bufSize) @@ -121,7 +121,7 @@ public class BufferedCdrOutput /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() diff --git a/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java b/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java index f0159a88dac..accb65a0db6 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java @@ -45,14 +45,14 @@ package gnu.CORBA.CDR; * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class BufferredCdrInput - extends AbstractCdrInput + extends AbstractCdrInput implements gnuValueStream { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The byte array input stream to read data from. */ @@ -114,17 +114,17 @@ public class BufferredCdrInput buffer.reset(); setInputStream(buffer); } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return buffer.getPosition(); } - + /** * Jump to the given position, taking offset into consideration. */ @@ -133,15 +133,15 @@ public class BufferredCdrInput buffer.seek(position); setInputStream(buffer); } - + /** * Get the associated RunTime. */ public gnuRuntime getRunTime() { return runtime; - } - + } + /** * Replace the instance of RunTime. */ @@ -149,5 +149,5 @@ public class BufferredCdrInput { runtime = a_runtime; } - + } diff --git a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java index 273ecea5024..5e97c73b8db 100644 --- a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java @@ -71,10 +71,10 @@ import java.math.BigDecimal; * Substitutes the main stream in factories when the header is already behind. * Overrides methods that may be invoked from the factory, forcing not to read * the header if called first time on this stream. - * + * * This stream reverts to default behavior if one or more call are made (reading * value types that are nested fields of the value type). - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class HeadlessInput @@ -103,7 +103,7 @@ public class HeadlessInput /** * Create an instance, reading from the given buffer. - * + * * @param a_stream a stream from where the data will be read. * @param inheritSettings a stream from that endian and other settings are * inherited. @@ -746,4 +746,4 @@ public class HeadlessInput stream.seek(position); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java b/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java index 3259a48770c..663e041961f 100644 --- a/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java +++ b/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java @@ -52,7 +52,7 @@ import java.lang.reflect.Modifier; /** * Handles case when the CORBA IDL type with the known helper is wrapped into * Value type. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class IDLTypeHelper @@ -118,7 +118,7 @@ public class IDLTypeHelper catch (Exception ex) { MARSHAL m = new MARSHAL(msg() + " read(..)"); - m.minor = Minor.Boxed; + m.minor = Minor.Boxed; m.initCause(ex); throw m; } @@ -152,7 +152,7 @@ public class IDLTypeHelper catch (Exception ex) { MARSHAL m = new MARSHAL(msg() + " write(..)"); - m.minor = Minor.Boxed; + m.minor = Minor.Boxed; m.initCause(ex); throw m; } diff --git a/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java b/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java index 6791a82e7c3..f1b8e04b3d2 100644 --- a/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java @@ -250,4 +250,4 @@ public class LittleEndianOutputStream { writeLong(Double.doubleToLongBits(value)); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java b/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java index 314dd8eb948..cb36f8c4297 100644 --- a/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java +++ b/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java @@ -54,7 +54,7 @@ import javax.rmi.CORBA.Util; /** * Reads the data about an unknown exception from the UnknownExceptionInfo. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class UnknownExceptionCtxHandler @@ -109,16 +109,16 @@ public class UnknownExceptionCtxHandler * Following the documentation, this must be just value type, but it seems * that in Sun's implementation is is not, as starts from 0x0. For value type, * this would be null. - * + * * TODO Implement reading and writing in Sun format, making Classpath IIOP * interoperable with Sun's implementation. Current inmplementation reads and * reproduces the exception class type only. - * + * * @param input the input stream to read the context (orb and other settings * are inherited from the main stream that received the message). - * + * * @param contexts all service contexts that were present in the message. - * + * * @return the Throwable, extracted from context, on null, if this has failed. */ public static Throwable read(BufferredCdrInput input, ServiceContext[] contexts) diff --git a/libjava/classpath/gnu/CORBA/CDR/VMVio.java b/libjava/classpath/gnu/CORBA/CDR/VMVio.java index 9b719fd7c50..47a6c0c25cc 100644 --- a/libjava/classpath/gnu/CORBA/CDR/VMVio.java +++ b/libjava/classpath/gnu/CORBA/CDR/VMVio.java @@ -36,13 +36,13 @@ exception statement from your version. */ /** - * This is a temporary replacement for the native call that would allocate + * This is a temporary replacement for the native call that would allocate * objects without public constructors. The replacement only allocates * objects with public parameterless constructor and objects with public * constructor taking string (like some Throwables). * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) - * + * * TODO FIXME replace by native call like in VMObjectInputStream. * Required modification of Classpath the build system. */ diff --git a/libjava/classpath/gnu/CORBA/CDR/Vio.java b/libjava/classpath/gnu/CORBA/CDR/Vio.java index 86f842c34bb..1eecb651b20 100644 --- a/libjava/classpath/gnu/CORBA/CDR/Vio.java +++ b/libjava/classpath/gnu/CORBA/CDR/Vio.java @@ -69,7 +69,7 @@ import javax.rmi.CORBA.ValueHandler; /** * A specialised class for reading and writing the value types. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public abstract class Vio @@ -79,7 +79,7 @@ public abstract class Vio * and is not required for interoperability with jdk 1.5, but is left in the * implementation as the optional mode for solving possible interoperability * problems with non-Sun CORBA implementations. - * + * * The current implementation would accept both single chunk or multiple * chunks, but will always send a single chunk (if true) or unchunked data (if * false). @@ -155,11 +155,11 @@ public abstract class Vio * required when an unitialised instance or at least class of the value type * is known. Hence it may be faster to use the alternative methods, * read(InputStream, Class) or read(InputStream, Serializable). - * + * * @param input a stream to read from. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input) @@ -173,12 +173,12 @@ public abstract class Vio * required when an unitialised instance or at least class of the value type * is known. Hence it may be faster to use the alternative methods, * read(InputStream, Class) or read(InputStream, Serializable). - * + * * @param input a stream to read from. * @param repository_id a repository id of the object being read, may be null. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input, String repository_id) @@ -240,7 +240,7 @@ public abstract class Vio catch (Exception ex) { MARSHAL m = new MARSHAL(); - m.minor = Minor.Value; + m.minor = Minor.Value; m.initCause(ex); throw m; } @@ -249,12 +249,12 @@ public abstract class Vio /** * Read the value base from the given input stream when the value base class * is available. Hence there is no need to guess it from the repository id. - * + * * @param input a stream to read from. * @param value_class the class of the value being read. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input, Class value_class) @@ -353,18 +353,18 @@ public abstract class Vio * Read the value base from the given input stream when the unitialised * instance is available. Hence there is no need to guess the class from the * repository id and then to instantiate an instance. - * + * * @param input a stream to read from. - * + * * @param value_instance an pre-created instance of the value. If the helper * is not null, this parameter is ignored an should be null. - * + * * @param helper a helper to create an instance and read the object- specific * part of the record. If the value_instance is used instead, this parameter * should be null. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Object read(InputStream input, Object value_instance, @@ -431,10 +431,10 @@ public abstract class Vio * Read using provided boxed value helper. This method expects the full value * type header, followed by contents, that are delegated to the provided * helper. It handles null. - * + * * @param input the stream to read from. * @param helper the helper that reads the type-specific part of the content. - * + * * @return the value, created by the helper, or null if the header indicates * that null was previously written. */ @@ -447,17 +447,17 @@ public abstract class Vio * Fill in the instance fields by the data from the input stream. The method * assumes that the value header, if any, is already behind. The information * from the stream is stored into the passed ox parameter. - * + * * @param input an input stream to read from. - * + * * @param value a pre-instantiated value type object, must be either * Streamable or CustomMarshal. If the helper is used, this parameter is * ignored and should be null. - * + * * @param value_tag the tag that must be read previously. * @param helper the helper for read object specific part; may be null to read * in using other methods. - * + * * @return the value that was read. */ static Object read_instance(InputStream input, final int position, @@ -542,13 +542,13 @@ public abstract class Vio /** * Read the chunked nested value from the given input stream, transferring the * contents to the given output stream. - * + * * @param value_tag the value tag of the value being read. * @param input the input stream from where the remainder of the nested value * must be read. * @param output the output stream where the unchunked nested value must be * copied. - * + * * @return the tag that ended the nested value. */ public static int readNestedValue(int value_tag, InputStream input, @@ -769,12 +769,12 @@ public abstract class Vio /** * Write the value base into the given stream. - * + * * @param output a stream to write to. - * + * * @param value a value type object, must be either Streamable or * CustomMarshal. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value) @@ -791,11 +791,11 @@ public abstract class Vio /** * Write the value base into the given stream, stating that it is an instance * of the given class. - * + * * @param output a stream to write to. - * + * * @param value a value to write. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value, @@ -831,11 +831,11 @@ public abstract class Vio * Write the value base into the given stream, supplementing it with an array * of the provided repository ids plus the repository id, derived from the * passed value. - * + * * @param output a stream to write to. - * + * * @param value a value to write. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value, @@ -857,7 +857,7 @@ public abstract class Vio /** * Write value when its repository Id is explicitly given. Only this Id is * written, the type of value is not taken into consideration. - * + * * @param output an output stream to write into. * @param value a value to write. * @param id a value repository id. @@ -873,7 +873,7 @@ public abstract class Vio /** * Write standard value type header, followed by contents, produced by the * boxed value helper. - * + * * @param output the stream to write to. * @param value the value to write, can be null. * @param helper the helper that writes the value content if it is not null @@ -902,7 +902,7 @@ public abstract class Vio /** * Write value when its repository Id is explicitly given. Does not handle * null. - * + * * @param output an output stream to write into. * @param value a value to write. * @param ids a value repository id (can be either single string or string @@ -1070,7 +1070,7 @@ public abstract class Vio /** * Read the indirection data and return the object that was already written to * this stream. - * + * * @param an_input the input stream, must be BufferredCdrInput. */ static Serializable readIndirection(InputStream an_input) @@ -1106,9 +1106,9 @@ public abstract class Vio /** * Check the passed value tag for correctness. - * + * * @param value_tag a tag to check, must be between 0x7fffff00 and 0x7fffffff - * + * * @throws MARSHAL if the tag is outside this interval. */ static void checkTag(int value_tag) @@ -1452,7 +1452,7 @@ public abstract class Vio * Instantiate an instance of this class anyway; also in the case when it has * no parameterless or any other constructor. The fields will be assigned * while reading the class from the stream. - * + * * @param clazz a class for that the instance should be instantiated. */ public static Object instantiateAnyWay(Class clazz) diff --git a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java index 4af8c68515a..1d07094e968 100644 --- a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java +++ b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java @@ -56,7 +56,7 @@ import java.util.TreeSet; /** * Our implementation of the sending context runtime. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class gnuRuntime @@ -165,7 +165,7 @@ public class gnuRuntime /** * Create Runtime. - * + * * @param a_id a repository Id, if only one Id was specified in the stream. * @param a_ids a repository Ids, if the multiple Ids were specified in te * stream. @@ -200,7 +200,7 @@ public class gnuRuntime /** * Check if the object is already written. - * + * * @return the position, at that the object is allready written or -1 if it is * not yet written. */ @@ -224,9 +224,9 @@ public class gnuRuntime /** * Get the object, written at the given position. This returs both shared * objects and repository Ids. - * + * * @return the position, at that the object is allready written. - * + * * @throws MARSHAL if there is no object written at that position. */ public Object isObjectWrittenAt(int x, int offset) @@ -238,7 +238,7 @@ public class gnuRuntime return e.object; else { - MARSHAL m = new MARSHAL("No object was written at " + x + + MARSHAL m = new MARSHAL("No object was written at " + x + " (offset " + offset + ") r " + this + dump()); m.minor = Minor.Graph; throw m; @@ -268,7 +268,7 @@ public class gnuRuntime public void multipleIdsWritten(String[] ids, int at) { if (sh_ids.containsKey(ids)) - throw new InternalError("Repetetive writing of the same string " + + throw new InternalError("Repetetive writing of the same string " + ids + dump()); Entry e = new Entry(); @@ -281,7 +281,7 @@ public class gnuRuntime /** * Check if the object is already written. - * + * * @return the position, at that the object is allready written or -1 if it is * not yet written. */ diff --git a/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java b/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java index 663c9901861..95d9edb2e74 100644 --- a/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java @@ -48,24 +48,24 @@ public interface gnuValueStream { /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition(); - + /** * Jump to the given position, taking offset into consideration. */ public void seek(int position); - + /** - * Get the RunTime information. + * Get the RunTime information. */ public gnuRuntime getRunTime(); - + /** - * Replace the instance of RunTime. + * Replace the instance of RunTime. */ public void setRunTime(gnuRuntime a_runtime); - + } diff --git a/libjava/classpath/gnu/CORBA/CdrEncapsCodecImpl.java b/libjava/classpath/gnu/CORBA/CdrEncapsCodecImpl.java index 93dd1cdcdfb..1dc7f9282e3 100644 --- a/libjava/classpath/gnu/CORBA/CdrEncapsCodecImpl.java +++ b/libjava/classpath/gnu/CORBA/CdrEncapsCodecImpl.java @@ -57,7 +57,7 @@ import org.omg.IOP.CodecPackage.TypeMismatch; /** * The local {@link Codec} implementation for ENCODING_CDR_ENCAPS * encoding. This is a local implementation; the remote side should - * have its own Codec of this kind. + * have its own Codec of this kind. * * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) @@ -66,8 +66,8 @@ public class CdrEncapsCodecImpl extends LocalObject implements Codec { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; @@ -355,4 +355,4 @@ public class CdrEncapsCodecImpl { lengthIndicator = use_lengthIndicator; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CollocatedOrbs.java b/libjava/classpath/gnu/CORBA/CollocatedOrbs.java index 51ad836231c..5634ff3cf15 100644 --- a/libjava/classpath/gnu/CORBA/CollocatedOrbs.java +++ b/libjava/classpath/gnu/CORBA/CollocatedOrbs.java @@ -51,33 +51,33 @@ import java.util.ArrayList; * between two independent ORBs, instantiated via ORB.init. The call to the * object, obtained via IOR reference from the ORB where it was locally * connected is always local anyway. - * + * * For security reasons it may be sensible to keep this class and all support * package private. - * + * * @author Audrius Meskauskas */ class CollocatedOrbs { /** * This field is used in automated Classpath specific testing to disable - * the direct calls. + * the direct calls. */ static boolean DIRECT_CALLS_ALLOWED = true; - + /** * Containts the references of the all running GNU Classpath ORBs in the * local virtual machine. GNU Classpath ORBs register themselves here when - * created and unregister when either ORB.destroy is called or in the + * created and unregister when either ORB.destroy is called or in the * finalizer. */ private static ArrayList orbs = new ArrayList(); - + /** * The address of the local host. */ static String localHost; - + static { try @@ -89,10 +89,10 @@ class CollocatedOrbs throw new InternalError("Local host is not accessible:" + ex); } } - + /** * Register the new ORB - * + * * @param orb the orb to register */ static void registerOrb(OrbFunctional orb) @@ -104,11 +104,11 @@ class CollocatedOrbs orbs.add(orb); } } - + /** * Unregister the ORB. The ORB will no longer be reacheable locally but may * be reacheable via network as if it would be remote. - * + * * @param orb the orb to unregister */ static void unregisterOrb(OrbFunctional orb) @@ -120,11 +120,11 @@ class CollocatedOrbs orbs.remove(orb); } } - + /** * Search the possibly local object. If the IOR is not local or none of the * found ORBs of this virtual machine knows about it, null is returned. - * + * * @param ior the IOR to search * @return the found local CORBA object or null in not found. */ @@ -156,5 +156,5 @@ class CollocatedOrbs } return null; } - + } diff --git a/libjava/classpath/gnu/CORBA/Connected_objects.java b/libjava/classpath/gnu/CORBA/Connected_objects.java index 655dbe38844..62976c71fa2 100644 --- a/libjava/classpath/gnu/CORBA/Connected_objects.java +++ b/libjava/classpath/gnu/CORBA/Connected_objects.java @@ -242,14 +242,14 @@ public class Connected_objects free_object_number++; return instance_number; } - + /** * Get the number of the connected objects. - * + * * @return the size of the internal map. */ public int size() { return objects.size(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DefaultSocketFactory.java b/libjava/classpath/gnu/CORBA/DefaultSocketFactory.java index 51df047192c..e540fd0a453 100644 --- a/libjava/classpath/gnu/CORBA/DefaultSocketFactory.java +++ b/libjava/classpath/gnu/CORBA/DefaultSocketFactory.java @@ -47,7 +47,7 @@ import java.net.Socket; /** * The default socket factory that forges "plain" server and client sockets. The * class can be replaced by setting the gnu.CORBA.SocketFactory property. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class DefaultSocketFactory diff --git a/libjava/classpath/gnu/CORBA/DuplicateNameHolder.java b/libjava/classpath/gnu/CORBA/DuplicateNameHolder.java index ad004bc41b2..d98f0ed4044 100644 --- a/libjava/classpath/gnu/CORBA/DuplicateNameHolder.java +++ b/libjava/classpath/gnu/CORBA/DuplicateNameHolder.java @@ -103,4 +103,4 @@ public class DuplicateNameHolder { return DuplicateNameHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java b/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java index 7060f86b27f..0f3b897df14 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java +++ b/libjava/classpath/gnu/CORBA/DynAn/AbstractAny.java @@ -174,4 +174,4 @@ public abstract class AbstractAny { return "Size mismatch, " + other + " (expected " + here + ")"; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java index 63fe117f4de..ae73cfe6f04 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java +++ b/libjava/classpath/gnu/CORBA/DynAn/DivideableAny.java @@ -509,4 +509,4 @@ public abstract class DivideableAny throw u; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/NameValuePairHolder.java b/libjava/classpath/gnu/CORBA/DynAn/NameValuePairHolder.java index 2558f5335aa..c3214e6ad03 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/NameValuePairHolder.java +++ b/libjava/classpath/gnu/CORBA/DynAn/NameValuePairHolder.java @@ -91,4 +91,4 @@ public class NameValuePairHolder { NameValuePairHelper.write(output, value); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java b/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java index a3e3680d966..8badd201183 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java +++ b/libjava/classpath/gnu/CORBA/DynAn/RecordAny.java @@ -402,4 +402,4 @@ public abstract class RecordAny throw t; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java b/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java index 59727615999..4c3a456d265 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java +++ b/libjava/classpath/gnu/CORBA/DynAn/ValueChangeListener.java @@ -47,4 +47,4 @@ package gnu.CORBA.DynAn; public interface ValueChangeListener { void changed(); -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java index 23141de3d96..314426c8213 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAny.java @@ -942,4 +942,4 @@ public class gnuDynAny extends AbstractAny implements DynAny, Serializable if (t.value() != final_type.kind().value()) throw new TypeMismatch(t.value() + "!=" + final_type.kind().value()); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java index b8b39bfbcdf..b42e6321359 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynAnyFactory.java @@ -353,4 +353,4 @@ public class gnuDynAnyFactory } return created; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java index dc056adff9b..5676c3d3900 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynArray.java @@ -334,4 +334,4 @@ public class gnuDynArray if (array.length != Array.getLength(members)) throw new InvalidValue(sizeMismatch(array.length, Array.getLength(members))); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java index 6eb7fe2bcac..76b0a9527b4 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynEnum.java @@ -241,4 +241,4 @@ public class gnuDynEnum extends UndivideableAny implements DynEnum a.type(official_type); return a; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java index 9655f0387da..9c7ea82522c 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynFixed.java @@ -249,4 +249,4 @@ public class gnuDynFixed extends UndivideableAny implements DynFixed g.insert_fixed(value, official_type); return g; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynSequence.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynSequence.java index cfa122f07d7..d006c24a543 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynSequence.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynSequence.java @@ -251,4 +251,4 @@ public class gnuDynSequence if (get_length() != Array.getLength(members)) set_length(Array.getLength(members)); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java index 3cd8efe18f4..adbc5731d98 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynUnion.java @@ -434,4 +434,4 @@ public class gnuDynUnion throw new Unexpected(ex); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java index 57150f74695..32b2f0d1a60 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValue.java @@ -377,4 +377,4 @@ public class gnuDynValue extends RecordAny implements DynValue, from_any(a); valueChanged(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java index a13e9fc2c50..9c50534ed09 100644 --- a/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java +++ b/libjava/classpath/gnu/CORBA/DynAn/gnuDynValueBox.java @@ -386,4 +386,4 @@ public class gnuDynValueBox a.type(orb.get_primitive_tc(TCKind.tk_null)); return a; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/DynAnySeqHolder.java b/libjava/classpath/gnu/CORBA/DynAnySeqHolder.java index 52d66d9e924..4447aa685fb 100644 --- a/libjava/classpath/gnu/CORBA/DynAnySeqHolder.java +++ b/libjava/classpath/gnu/CORBA/DynAnySeqHolder.java @@ -113,4 +113,4 @@ public class DynAnySeqHolder { return DynAnySeqHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java b/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java index 6f84da8e5ea..a48b6056246 100644 --- a/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java +++ b/libjava/classpath/gnu/CORBA/EmptyExceptionHolder.java @@ -128,4 +128,4 @@ public class EmptyExceptionHolder throw bad; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/ForwardRequestHelper.java b/libjava/classpath/gnu/CORBA/ForwardRequestHelper.java index 5b77fa03073..320b6d23235 100644 --- a/libjava/classpath/gnu/CORBA/ForwardRequestHelper.java +++ b/libjava/classpath/gnu/CORBA/ForwardRequestHelper.java @@ -129,9 +129,9 @@ public abstract class ForwardRequestHelper { ORB orb = OrbRestricted.Singleton; StructMember[] members = new StructMember[ 1 ]; - + TypeCode field; - + field = ObjectHelper.type(); members [ 0 ] = new StructMember("forward_reference", field, null); return orb.create_exception_tc(id(), "ForwardRequest", members); @@ -149,4 +149,4 @@ public abstract class ForwardRequestHelper output.write_string(id()); output.write_Object(value.forward_reference); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/GIOP/CharSets_OSF.java b/libjava/classpath/gnu/CORBA/GIOP/CharSets_OSF.java index bffb02678aa..6cefe995ffa 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/CharSets_OSF.java +++ b/libjava/classpath/gnu/CORBA/GIOP/CharSets_OSF.java @@ -48,7 +48,7 @@ import java.util.Set; * This class contains the codes, used to identify character sets * in CORBA. These codes are defined in Open Software Foundation (OSF) * code set registry. - * + * * The name of this class specially sets "OSF" apart if somebody would start * searching Open Software Foundation abbreviation. * diff --git a/libjava/classpath/gnu/CORBA/GIOP/CloseMessage.java b/libjava/classpath/gnu/CORBA/GIOP/CloseMessage.java index 38039c2ed21..c555f2b9488 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/CloseMessage.java +++ b/libjava/classpath/gnu/CORBA/GIOP/CloseMessage.java @@ -58,11 +58,11 @@ import java.io.OutputStream; public class CloseMessage extends MessageHeader { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The singleton close message is typically enough, despite new * instances may be instantiated if the specific version field @@ -103,4 +103,4 @@ public class CloseMessage throw m; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/GIOP/ErrorMessage.java b/libjava/classpath/gnu/CORBA/GIOP/ErrorMessage.java index 99942fee359..0bd48dea87d 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/ErrorMessage.java +++ b/libjava/classpath/gnu/CORBA/GIOP/ErrorMessage.java @@ -62,11 +62,11 @@ import org.omg.CORBA.ORB; public class ErrorMessage extends MessageHeader { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Create a new error message, setting the message field * to the {@link MESSAGE_ERROR} and the version number to @@ -83,7 +83,7 @@ public class ErrorMessage * * @param ior the IOR address (host and port, other fields * are not used). - * + * * @param orb the ORB, sending the error message. */ public void send(IOR ior, ORB orb) @@ -91,7 +91,7 @@ public class ErrorMessage try { Socket socket; - + if (orb instanceof OrbFunctional) socket = ((OrbFunctional) orb).socketFactory.createClientSocket( ior.Internet.host, ior.Internet.port); diff --git a/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java b/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java index f63cbea1708..3137343edee 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java +++ b/libjava/classpath/gnu/CORBA/GIOP/MessageHeader.java @@ -62,7 +62,7 @@ import java.util.Arrays; /** * The GIOP message header. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class MessageHeader @@ -159,7 +159,7 @@ public class MessageHeader /** * Create an empty message header, corresponding the given version. - * + * * @param major the major message header version. * @param minor the minot message header version. */ @@ -187,7 +187,7 @@ public class MessageHeader /** * Set the encoding to use. - * + * * @param use_big_endian if true (default), the Big Endian encoding is used. * If false, the Little Endian encoding is used. */ @@ -209,9 +209,9 @@ public class MessageHeader /** * Get the message type as string. - * + * * @param type the message type as int (the field {@link message_type}). - * + * * @return the message type as string. */ public String getTypeString(int type) @@ -228,7 +228,7 @@ public class MessageHeader /** * Creates reply header, matching the message header version number. - * + * * @return one of {@link gnu.CORBA.GIOP.v1_0.ReplyHeader}, * {@link gnu.CORBA.GIOP.v1_2.ReplyHeader}, etc - depending on the version * number in this header. @@ -243,7 +243,7 @@ public class MessageHeader /** * Creates request header, matching the message header version number. - * + * * @return one of {@link gnu.CORBA.GIOP.v1_0.RequestHeader}, * {@link gnu.CORBA.GIOP.v1_2.RequestHeader}, etc - depending on the version * number in this header. @@ -274,11 +274,11 @@ public class MessageHeader /** * Read the header from the stream. - * + * * @param istream a stream to read from. * @throws MARSHAL if this is not a GIOP 1.0 header. */ - public void read(java.io.InputStream istream) + public void read(java.io.InputStream istream) throws MARSHAL, EOFException { try @@ -336,7 +336,7 @@ public class MessageHeader /** * Get the short string summary of the message. - * + * * @return a short message summary. */ public String toString() @@ -348,7 +348,7 @@ public class MessageHeader /** * Write the header to stream. - * + * * @param out a stream to write into. */ public void write(java.io.OutputStream out) @@ -382,7 +382,7 @@ public class MessageHeader /** * Read data, followed by the message header. Handle fragmented messages. - * + * * @param source the data source to read from. * @param service the socket on that the time outs are set. Can be null (no * timeouts are set). diff --git a/libjava/classpath/gnu/CORBA/GIOP/ServiceContext.java b/libjava/classpath/gnu/CORBA/GIOP/ServiceContext.java index 78519510cb7..673ae0ba9c5 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/ServiceContext.java +++ b/libjava/classpath/gnu/CORBA/GIOP/ServiceContext.java @@ -48,7 +48,7 @@ import org.omg.CORBA.portable.IDLEntity; /** * Contains the ORB service data being passed. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class ServiceContext @@ -134,7 +134,7 @@ public class ServiceContext /** * Read the context values from the stream. - * + * * @param istream a stream to read from. */ public static ServiceContext read(AbstractCdrInput istream) @@ -172,7 +172,7 @@ public class ServiceContext /** * Write the context values into the stream. - * + * * @param ostream a stream to write the data to. */ public void write(AbstractCdrOutput ostream) diff --git a/libjava/classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java b/libjava/classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java index 2afa4b3a1d5..d083536a7f8 100644 --- a/libjava/classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java +++ b/libjava/classpath/gnu/CORBA/GIOP/v1_2/RequestHeader.java @@ -59,11 +59,11 @@ import org.omg.CORBA.NO_IMPLEMENT; public class RequestHeader extends gnu.CORBA.GIOP.v1_0.RequestHeader { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Indicates that the object is addressed by the object key. */ diff --git a/libjava/classpath/gnu/CORBA/GeneralHolder.java b/libjava/classpath/gnu/CORBA/GeneralHolder.java index ffba69d79f6..d4550bf683d 100644 --- a/libjava/classpath/gnu/CORBA/GeneralHolder.java +++ b/libjava/classpath/gnu/CORBA/GeneralHolder.java @@ -175,4 +175,4 @@ public class GeneralHolder throw new Unexpected(ex); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/IOR.java b/libjava/classpath/gnu/CORBA/IOR.java index 7f63471eef0..1a476b094f5 100644 --- a/libjava/classpath/gnu/CORBA/IOR.java +++ b/libjava/classpath/gnu/CORBA/IOR.java @@ -142,7 +142,7 @@ public class IOR b.append(' '); return b.toString(); } - + /** * Get a better formatted multiline string representation. */ @@ -162,7 +162,7 @@ public class IOR b.append("\n"); return b.toString(); } - + /** * Write into CDR stream. @@ -613,9 +613,9 @@ public class IOR return b.toString(); } - + /** - * Returns a multiline formatted human readable string representation of + * Returns a multiline formatted human readable string representation of * this IOR object. */ public String toStringFormatted() @@ -629,7 +629,7 @@ public class IOR if (Big_Endian) b.append("\n Big endian encoding"); else - b.append("\n Little endian encoding."); + b.append("\n Little endian encoding."); b.append("\nObject Key\n "); @@ -645,7 +645,7 @@ public class IOR b.append(Internet.CodeSets.wide.toStringFormatted()); return b.toString(); - } + } /** * Returs a stringified reference. @@ -774,7 +774,7 @@ public class IOR // The future supported tagged profiles should be added here. throw new BAD_PARAM("Unsupported profile type " + profile.tag); } - + /** * Checks for equality. */ @@ -786,10 +786,10 @@ public class IOR boolean hosts = true; IOR other = (IOR) x; - + if (Internet==null || other.Internet==null) return Internet == other.Internet; - + if (key != null && other.key != null) keys = Arrays.equals(key, other.key); else @@ -804,7 +804,7 @@ public class IOR else return false; } - + /** * Get the hashcode of this IOR. */ diff --git a/libjava/classpath/gnu/CORBA/Interceptor/ClientRequestInterceptors.java b/libjava/classpath/gnu/CORBA/Interceptor/ClientRequestInterceptors.java index 5c15e121d29..783e321d7f8 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/ClientRequestInterceptors.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/ClientRequestInterceptors.java @@ -136,4 +136,4 @@ public class ClientRequestInterceptors { return getClass().getName(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/ForwardRequestHolder.java b/libjava/classpath/gnu/CORBA/Interceptor/ForwardRequestHolder.java index d9ced03a332..a250ceaa138 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/ForwardRequestHolder.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/ForwardRequestHolder.java @@ -103,4 +103,4 @@ public class ForwardRequestHolder implements Streamable { return ForwardRequestHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java index d8dcabf120f..67474c17333 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java @@ -162,7 +162,7 @@ public class IORInterceptors implements IORInterceptor_3_0Operations /** * Call this method for all registered CORBA 3.0 interceptors. - * + * * @throws OBJ_ADAPTER minor 6 on any failure (as defined by OMG specs). */ public void components_established(IORInfo info) @@ -186,4 +186,4 @@ public class IORInterceptors implements IORInterceptor_3_0Operations } } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java index e0ce16a1496..23ae54a10b6 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java @@ -184,7 +184,7 @@ public class Registrator extends LocalObject implements ORBInitInfo { String cn = sk.substring(m_prefix.length()); Class iClass = ObjectCreator.forName(cn); - + ORBInitializer initializer = (ORBInitializer) iClass.newInstance(); m_initializers.add(initializer); @@ -469,4 +469,4 @@ public class Registrator extends LocalObject implements ORBInitInfo { return m_ior.size() > 0; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/ServerRequestInterceptors.java b/libjava/classpath/gnu/CORBA/Interceptor/ServerRequestInterceptors.java index 4b9bede98eb..5cb5b1ab443 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/ServerRequestInterceptors.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/ServerRequestInterceptors.java @@ -136,4 +136,4 @@ public class ServerRequestInterceptors { return getClass().getName(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/gnuClientRequestInfo.java b/libjava/classpath/gnu/CORBA/Interceptor/gnuClientRequestInfo.java index beb81c81f6c..226e7f3164a 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/gnuClientRequestInfo.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/gnuClientRequestInfo.java @@ -334,4 +334,4 @@ public class gnuClientRequestInfo extends LocalObject { return request.get_request_service_context(ctx_name); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/gnuIcCurrent.java b/libjava/classpath/gnu/CORBA/Interceptor/gnuIcCurrent.java index a33afc3362e..caed69aeb6d 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/gnuIcCurrent.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/gnuIcCurrent.java @@ -252,4 +252,4 @@ public class gnuIcCurrent extends ObjectImpl implements Current throw new InvalidSlot("Slot " + slot_id); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/gnuIorInfo.java b/libjava/classpath/gnu/CORBA/Interceptor/gnuIorInfo.java index 256a28cb567..257c49728ac 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/gnuIorInfo.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/gnuIorInfo.java @@ -137,7 +137,7 @@ public class gnuIorInfo extends LocalObject implements IORInfo } /** - * Set the object factory of the current POA. + * Set the object factory of the current POA. */ public void current_factory(ObjectReferenceFactory factory) { @@ -145,12 +145,12 @@ public class gnuIorInfo extends LocalObject implements IORInfo } /** - * The method currently uses system identity hashcode that should be + * The method currently uses system identity hashcode that should be * different for each object. */ public int manager_id() { - // The System.identityHashCode is also called in gnuPoaManager. + // The System.identityHashCode is also called in gnuPoaManager. return System.identityHashCode(poa.the_POAManager()); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java b/libjava/classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java index 8d5c681e705..03ad773d956 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/gnuServerRequestInfo.java @@ -472,5 +472,5 @@ public class gnuServerRequestInfo extends LocalObject { return OrbFunctional.server_id; } - -} \ No newline at end of file + +} diff --git a/libjava/classpath/gnu/CORBA/IorDelegate.java b/libjava/classpath/gnu/CORBA/IorDelegate.java index a2c5a0469be..5f0a59df4d2 100644 --- a/libjava/classpath/gnu/CORBA/IorDelegate.java +++ b/libjava/classpath/gnu/CORBA/IorDelegate.java @@ -152,18 +152,18 @@ public class IorDelegate extends SimpleDelegate * request to the new direction. The ReplyHeader.LOCATION_FORWARD_PERM will * cause additionally to remember the new location by this delegate, so * subsequent calls will be immediately delivered to the new target. - * + * * @param target the target object. * @param output the output stream, previously returned by * {@link #request(org.omg.CORBA.Object, String, boolean)}. - * + * * @return the input stream, to read the response from or null for a one-way * request. - * + * * @throws SystemException if the SystemException has been thrown on the * remote side (the exact type and the minor code matches the data of the * remote exception that has been thrown). - * + * * @throws org.omg.CORBA.portable.ApplicationException as specified. * @throws org.omg.CORBA.portable.RemarshalException as specified. */ @@ -422,4 +422,4 @@ public class IorDelegate extends SimpleDelegate { return false; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/IorObject.java b/libjava/classpath/gnu/CORBA/IorObject.java index 02f5a495d49..921d18d0098 100644 --- a/libjava/classpath/gnu/CORBA/IorObject.java +++ b/libjava/classpath/gnu/CORBA/IorObject.java @@ -83,7 +83,7 @@ public class IorObject _set_delegate(new IorDelegate(orb, ior)); id = new String[] { ior.Id }; } - + /** * Get the IOR of this object. */ @@ -115,4 +115,4 @@ public class IorObject { _get_delegate().release(this); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Minor.java b/libjava/classpath/gnu/CORBA/Minor.java index 511a34d559b..8832162bc28 100644 --- a/libjava/classpath/gnu/CORBA/Minor.java +++ b/libjava/classpath/gnu/CORBA/Minor.java @@ -43,7 +43,7 @@ package gnu.CORBA; * Provides information and operations, related to about the 20 bit vendor minor * code Id. This code is included into all CORBA system exceptions and is also * transferred to remote side. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public interface Minor @@ -257,22 +257,22 @@ public interface Minor * for the given policy type. */ int PolicyType = 15 | vendor; - + /* NO_RESOURCES */ - + /** * Unable to get a free port for a new socket. Proably too many objects under * unsuitable POA policy. */ int Ports = 20 | vendor; - + /** * Too many parallel calls (too many parallel threads). The thread control * prevents malicios client from knocking the server out by suddenly * submitting large number of requests. */ int Threads = 21 | vendor; - + /** * The IOR starts with file://, http:// or ftp://, but this local or remote * resource is not accessible. diff --git a/libjava/classpath/gnu/CORBA/NameDynAnyPairHolder.java b/libjava/classpath/gnu/CORBA/NameDynAnyPairHolder.java index 6ceb9aae06f..e8047b8d772 100644 --- a/libjava/classpath/gnu/CORBA/NameDynAnyPairHolder.java +++ b/libjava/classpath/gnu/CORBA/NameDynAnyPairHolder.java @@ -112,4 +112,4 @@ public class NameDynAnyPairHolder { return NameDynAnyPairHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/NameDynAnyPairSeqHolder.java b/libjava/classpath/gnu/CORBA/NameDynAnyPairSeqHolder.java index 71b6174c1ad..8bf8ee89da9 100644 --- a/libjava/classpath/gnu/CORBA/NameDynAnyPairSeqHolder.java +++ b/libjava/classpath/gnu/CORBA/NameDynAnyPairSeqHolder.java @@ -112,4 +112,4 @@ public class NameDynAnyPairSeqHolder { return NameDynAnyPairSeqHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/NameValuePairHolder.java b/libjava/classpath/gnu/CORBA/NameValuePairHolder.java index 9a939d5e337..d757bdb398f 100644 --- a/libjava/classpath/gnu/CORBA/NameValuePairHolder.java +++ b/libjava/classpath/gnu/CORBA/NameValuePairHolder.java @@ -102,4 +102,4 @@ public class NameValuePairHolder { return NameValuePairHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/NameValuePairSeqHolder.java b/libjava/classpath/gnu/CORBA/NameValuePairSeqHolder.java index 216d78e04c8..5515bd30674 100644 --- a/libjava/classpath/gnu/CORBA/NameValuePairSeqHolder.java +++ b/libjava/classpath/gnu/CORBA/NameValuePairSeqHolder.java @@ -102,4 +102,4 @@ public class NameValuePairSeqHolder { return NameValuePairSeqHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java index 5d4b729a569..93e4e3b1664 100644 --- a/libjava/classpath/gnu/CORBA/NamingService/NameParser.java +++ b/libjava/classpath/gnu/CORBA/NamingService/NameParser.java @@ -68,15 +68,15 @@ import java.util.StringTokenizer; /** * Parses the alternative IOR representations into our IOR structure. - * + * * TODO This parser currently supports only one address per target string. A * string with the multiple addresses will be accepted, but only the last * address will be taken into consideration. The fault tolerance is not yet * implemented. - * + * * The key string is filtered using {@link java.net.URLDecoder} that replaces * the agreed escape sequences by the corresponding non alphanumeric characters. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class NameParser @@ -96,17 +96,17 @@ public class NameParser * The IOR prefix. */ public static final String pxIOR = "ior"; - + /** * The file:// prefix. */ public static final String pxFILE = "file://"; - + /** * The ftp:// prefix. */ public static final String pxFTP = "ftp://"; - + /** * The http:// prefix. */ @@ -149,7 +149,7 @@ public class NameParser /** * Parse CORBALOC. - * + * * The expected format is:
    * 1. corbaloc:[iiop][version.subversion@]:host[:port]/key
    * 2. corbaloc:rir:[/key]
    @@ -158,12 +158,12 @@ public class NameParser * 5. file://[file name]
    * 6. http://[url]
    * 7. ftp://[url]
    - * + * * Protocol defaults to IOP, the object key defaults to the NameService. - * + * * @param corbaloc the string to parse. * @param orb the ORB, needed to create IORs and resolve rir references. - * + * * @return the resolved object. */ public synchronized org.omg.CORBA.Object corbaloc(String corbaloc, @@ -172,7 +172,7 @@ public class NameParser { return corbaloc(corbaloc, orb, 0); } - + /** * Parse controlling against the infinite recursion loop. */ @@ -184,7 +184,7 @@ public class NameParser // by malicious attempt. if (recursion > 10) throw new DATA_CONVERSION("More than 10 redirections"); - + if (corbaloc.startsWith(pxFILE)) return corbaloc(readFile(corbaloc.substring(pxFILE.length())), orb, recursion+1); else if (corbaloc.startsWith(pxHTTP)) @@ -347,7 +347,7 @@ public class NameParser else throw new DATA_CONVERSION("Unsupported protocol '" + t[p] + "'"); } - + /** * Read IOR from the file in the local file system. */ @@ -376,7 +376,7 @@ public class NameParser throw (d); } } - + /** * Read IOR from the remote URL. */ diff --git a/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java b/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java index f4e940ea907..40fef0a3ab0 100644 --- a/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java +++ b/libjava/classpath/gnu/CORBA/NamingService/NamingMap.java @@ -95,7 +95,7 @@ public class NamingMap if (containsValue(object)) throw new AlreadyBound("The object has another name"); } - + // There are no restrictions in binding the object. rebind(name, object); } diff --git a/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java b/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java index a8cd0b313b3..5ccc4d8cc5c 100644 --- a/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java +++ b/libjava/classpath/gnu/CORBA/NamingService/NamingServiceTransient.java @@ -51,11 +51,11 @@ import java.io.UnsupportedEncodingException; * The server for the gnu classpath naming service. This is an executable class * that must be started to launch the GNU Classpath CORBA transient naming * service. - * + * * GNU Classpath currently works with this naming service and is also * interoperable with the Sun Microsystems naming services from releases 1.3 and * 1.4, both transient tnameserv and persistent orbd. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class NamingServiceTransient @@ -69,7 +69,7 @@ public class NamingServiceTransient /** * Get the object key for the naming service. The default key is the string * "NameService" in ASCII. - * + * * @return the byte array. */ public static byte[] getDefaultKey() @@ -86,7 +86,7 @@ public class NamingServiceTransient /** * Start the naming service on the current host at the given port. - * + * * @param portArgument the port on which the service will be * started, or -1 to use the default port, 900 * @param fileArgument if non-null, store the IOR string of this diff --git a/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java b/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java index cec87931e28..6ed07d7992e 100644 --- a/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java +++ b/libjava/classpath/gnu/CORBA/NamingService/TransientContext.java @@ -77,7 +77,7 @@ public class TransientContext * Use serial version UID for interoperability. */ private static final long serialVersionUID = 2; - + /** * The already named contexts. */ @@ -87,7 +87,7 @@ public class TransientContext * The already named objects. */ protected final NamingMap named_objects; - + /** * Create the naming conetxt with default (transient) naming maps. */ @@ -95,10 +95,10 @@ public class TransientContext { this(new NamingMap(), new NamingMap()); } - + /** * Create the naming conetxt with the two provided naming maps. - * + * * @param context_map the map for contexts * @param object_map the map for objectss */ diff --git a/libjava/classpath/gnu/CORBA/ObjectCreator.java b/libjava/classpath/gnu/CORBA/ObjectCreator.java index 939d6923326..292495a1f24 100644 --- a/libjava/classpath/gnu/CORBA/ObjectCreator.java +++ b/libjava/classpath/gnu/CORBA/ObjectCreator.java @@ -68,7 +68,7 @@ import javax.rmi.CORBA.Util; /** * Creates java objects from the agreed IDL names for the simple case when the * CORBA object is directly mapped into the locally defined java class. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class ObjectCreator @@ -110,7 +110,7 @@ public class ObjectCreator * Try to instantiate an object with the given IDL name. The object must be * mapped to the local java class. The omg.org domain must be mapped into the * object in either org/omg or gnu/CORBA namespace. - * + * * @param idl name * @return instantiated object instance or null if no such available. */ @@ -165,10 +165,10 @@ public class ObjectCreator /** * Read the system exception from the given stream. - * + * * @param input the CDR stream to read from. * @param contexts the service contexts in request/reply header/ - * + * * @return the exception that has been stored in the stream (IDL name, minor * code and completion status). */ @@ -228,10 +228,10 @@ public class ObjectCreator * Reads the user exception, having the given Id, from the input stream. The * id is expected to be in the form like * 'IDL:test/org/omg/CORBA/ORB/communication/ourUserException:1.0' - * + * * @param idl the exception idl name. * @param input the stream to read from. - * + * * @return the loaded exception. * @return null if the helper class cannot be found. */ @@ -261,7 +261,7 @@ public class ObjectCreator /** * Gets the helper class name from the string like * 'IDL:test/org/omg/CORBA/ORB/communication/ourUserException:1.0' - * + * * @param IDL the idl name. */ public static String toHelperName(String IDL) @@ -280,7 +280,7 @@ public class ObjectCreator /** * Writes the system exception data to CDR output stream. - * + * * @param output a stream to write data to. * @param ex an exception to write. */ @@ -295,9 +295,9 @@ public class ObjectCreator /** * Converts the given IDL name to class name. - * + * * @param IDL the idl name. - * + * */ protected static String toClassName(String prefix, String IDL) { @@ -317,9 +317,9 @@ public class ObjectCreator * Converts the given IDL name to class name and tries to load the matching * class. The OMG prefix (omg.org) is replaced by the java prefix org.omg. No * other prefixes are added. - * + * * @param IDL the idl name. - * + * * @return the matching class or null if no such is available. */ public static Class Idl2class(String IDL) @@ -362,9 +362,9 @@ public class ObjectCreator * and create an object instance with parameterless constructor. The OMG * prefix (omg.org) is replaced by the java prefix org.omg. No other prefixes * are added. - * + * * @param IDL the idl name. - * + * * @return instantiated object instance or null if such attempt was not * successful. */ @@ -390,9 +390,9 @@ public class ObjectCreator * inherits from IDLEntity, ValueBase or SystemException, returns repository * Id in the IDL:(..) form. If it does not, returns repository Id in the * RMI:(..) form. - * + * * @param cx the class for that the name must be computed. - * + * * @return the idl or rmi name. */ public static synchronized String getRepositoryId(Class cx) @@ -427,12 +427,12 @@ public class ObjectCreator * Insert the passed parameter into the given Any, assuming that the helper * class is available. The helper class must have the "Helper" suffix and be * in the same package as the class of the object being inserted. - * + * * @param into the target to insert. - * + * * @param object the object to insert. It can be any object as far as the * corresponding helper is provided. - * + * * @return true on success, false otherwise. */ public static boolean insertWithHelper(Any into, Object object) @@ -547,7 +547,7 @@ public class ObjectCreator } } } - + /** * Load the class with the given name. This method tries to use the context * class loader first. If this fails, it searches for the suitable class @@ -587,4 +587,4 @@ public class ObjectCreator } throw new ClassNotFoundException(className); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/OrbFocused.java b/libjava/classpath/gnu/CORBA/OrbFocused.java index 572acbc1131..de5d49e36ba 100644 --- a/libjava/classpath/gnu/CORBA/OrbFocused.java +++ b/libjava/classpath/gnu/CORBA/OrbFocused.java @@ -62,16 +62,16 @@ import java.util.StringTokenizer; * to allow CORBA to work on one fixed port or (for better performance) on a * small fixed range of ports. This does not restrict the maximal number of the * connected objects as the objects can share the same port. - * + * * The used port or the used port range can be specified via property * gnu.CORBA.ListenerPort. The value of this property is a single port or range * of ports, boundary values (inclusive) being separeted by dash (for instance, * "1245-1250"). - * + * * It is possible to instantiate multiple instances of the focused ORBs and * combine them with the ordinary ORBs. If you instantiate several instances of * the focused ORBs on the same host, they used port sets should not overlap. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class OrbFocused @@ -136,7 +136,7 @@ public class OrbFocused /** * Set the port range. - * + * * @param from - start of the port range, inclusive. * @param to - end of the port range, inclusive. */ @@ -231,7 +231,7 @@ public class OrbFocused /** * Start the ORBs main working cycle (receive invocation - invoke on the local * object - send response - wait for another invocation). - * + * * The method only returns after calling {@link #shutdown(boolean)}. */ public void run() @@ -281,7 +281,7 @@ public class OrbFocused * Connect the given CORBA object to this ORB, explicitly specifying the * object key and the identity of the thread (and port), where the object must * be served. The identity is normally the POA. - * + * * The new port server will be started only if there is no one already running * for the same identity. Otherwise, the task of the existing port server will * be widened, including duty to serve the given object. All objects, @@ -289,13 +289,13 @@ public class OrbFocused * subsequently in the same thread. The method is used when the expected * number of the objects is too large to have a single port and thread per * object. This method is used by POAs, having a single thread policy. - * + * * @param object the object, must implement the {@link InvokeHandler}) * interface. * @param key the object key, usually used to identify the object from remote * side. * @param port the port, where the object must be connected. - * + * * @throws BAD_PARAM if the object does not implement the * {@link InvokeHandler}). */ diff --git a/libjava/classpath/gnu/CORBA/OrbFunctional.java b/libjava/classpath/gnu/CORBA/OrbFunctional.java index 25344cb2ec0..88848dd1bcc 100644 --- a/libjava/classpath/gnu/CORBA/OrbFunctional.java +++ b/libjava/classpath/gnu/CORBA/OrbFunctional.java @@ -184,7 +184,7 @@ public class OrbFunctional extends OrbRestricted /** * Perform a single serving step. - * + * * @throws java.lang.Exception */ void tick() @@ -251,19 +251,19 @@ public class OrbFunctional extends OrbRestricted * for a free port. */ public static int DEFAULT_INITIAL_PORT = 1126; - + /** * When trying to open the socket on a random port, start of the interval to * try. */ public static int RANDOM_PORT_FROM = 1024; - + /** * When trying to open the socket on a random port, end of the interval to * try. */ public static int RANDOM_PORT_TO = 4024; - + /** * The number of attempts to try when opening random port. */ @@ -296,18 +296,18 @@ public class OrbFunctional extends OrbRestricted * The string, defining the naming service initial reference. */ public static final String NAME_SERVICE = "NameService"; - + /** * Defines the ORB ID that is accessible by IOR interceptors. */ public static final String ORB_ID = "org.omg.CORBA.ORBid"; - - + + /** * Defines the SERVER ID that is accessible by IOR interceptors. */ public static final String SERVER_ID = "org.omg.CORBA.ServerId"; - + /** * The if the client has once opened a socket, it should start sending the * message header in a given time. Otherwise the server will close the socket. @@ -331,7 +331,7 @@ public class OrbFunctional extends OrbRestricted */ public static String AFTER_RECEIVING = "gnu.classpath.CORBA.TOUT_AFTER_RECEIVING"; - + /** * The server waits for this duration after the potentially transient error * during its servicing cycle. @@ -366,7 +366,7 @@ public class OrbFunctional extends OrbRestricted * received task. We make it 40 minutes. */ public int TOUT_AFTER_RECEIVING = 40 * 60 * 1000; - + /** * The server waits for this duration after the potentially transient error * during its servicing cycle. @@ -381,17 +381,17 @@ public class OrbFunctional extends OrbRestricted * seven seconds. */ public static int TANDEM_REQUESTS = 7000; - + /** * The Id of this ORB. */ public String orb_id = "orb_"+hashCode(); - + /** * The Id of this Server. This field is defined static to ensure it has * the same value over all ORB's in this machine. */ - public static String server_id = "server_"+OrbFunctional.class.hashCode(); + public static String server_id = "server_"+OrbFunctional.class.hashCode(); /** * The map of the already conncted objects. @@ -440,7 +440,7 @@ public class OrbFunctional extends OrbRestricted * The port, on that the name service is expected to be running. */ private int ns_port = 900; - + /** * The name parser. */ @@ -468,7 +468,7 @@ public class OrbFunctional extends OrbRestricted * exceeding this limit, the NO_RESOURCES is thrown back to the client. */ private int MAX_RUNNING_THREADS = 256; - + /** * The producer of the client and server sockets for this ORB. */ @@ -516,9 +516,9 @@ public class OrbFunctional extends OrbRestricted /** * Get the currently free port, starting from the initially set port and going * up max 20 steps, then trying to bind into any free address. - * + * * @return the currently available free port. - * + * * @throws NO_RESOURCES if the server socked cannot be opened on the local * host. */ @@ -595,7 +595,7 @@ public class OrbFunctional extends OrbRestricted * on this port first. It the port is busy, or if more objects are connected, * the subsequent object will receive a larger port values, skipping * unavailable ports, if required. The change applies globally. - * + * * @param a_Port a port, on that the server is listening for requests. */ public static void setPort(int a_Port) @@ -988,17 +988,17 @@ public class OrbFunctional extends OrbRestricted CollocatedOrbs.unregisterOrb(this); } } - + /** * Start the server in a new thread, if not already running. This method is - * used to ensure that the objects being transfered will be served from the + * used to ensure that the objects being transfered will be served from the * remote side, if required. If the ORB is started using this method, it * starts as a daemon thread. */ public void ensureRunning() { final OrbFunctional THIS = this; - + if (!running) { Thread t = new Thread() @@ -1039,9 +1039,9 @@ public class OrbFunctional extends OrbRestricted * representation. The object can (an usually is) located on a remote * computer, possibly running a different (not necessary java) CORBA * implementation. - * + * * @param an_ior the object IOR representation string. - * + * * @return the found CORBA object. * @see object_to_string(org.omg.CORBA.Object) */ @@ -1049,7 +1049,7 @@ public class OrbFunctional extends OrbRestricted { return nameParser.corbaloc(an_ior, this); } - + /** * Convert ior reference to CORBA object. */ @@ -1106,10 +1106,10 @@ public class OrbFunctional extends OrbRestricted /** * Find and return the object, that must be previously connected to this ORB. * Return null if no such object is available. - * + * * @param key the object key. * @param port the port where the object is connected. - * + * * @return the connected object, null if none. */ protected org.omg.CORBA.Object find_connected_object(byte[] key, int port) @@ -1126,9 +1126,9 @@ public class OrbFunctional extends OrbRestricted /** * Set the ORB parameters. This method is normally called from * {@link #init(Applet, Properties)}. - * + * * @param app the current applet. - * + * * @param props application specific properties, passed as the second * parameter in {@link #init(Applet, Properties)}. Can be null. */ @@ -1184,11 +1184,11 @@ public class OrbFunctional extends OrbRestricted /** * Set the ORB parameters. This method is normally called from * {@link #init(String[], Properties)}. - * + * * @param para the parameters, that were passed as the parameters to the * main(String[] args) method of the current standalone * application. - * + * * @param props application specific properties that were passed as a second * parameter in {@link init(String[], Properties)}). Can be null. */ @@ -1433,11 +1433,11 @@ public class OrbFunctional extends OrbRestricted /** * A single servicing step, when the client socket is alrady open. - * + * * Normally, each task matches a single remote invocation. However under * frequent tandem submissions the same task may span over several * invocations. - * + * * @param service the opened client socket. * @param no_resources if true, the "NO RESOURCES" exception is thrown to the * client. @@ -1555,12 +1555,12 @@ public class OrbFunctional extends OrbRestricted catch (SystemException ex) { sysEx = ex; - + org.omg.CORBA.portable.OutputStream ech = handler.createExceptionReply(); - + rh_reply.service_context = UnknownExceptionCtxHandler.addExceptionContext( rh_reply.service_context, ex, ech); - + ObjectCreator.writeSystemException(ech, ex); } catch (Exception except) @@ -1620,7 +1620,7 @@ public class OrbFunctional extends OrbRestricted } finally { - try + try { if (service!=null && !service.isClosed()) service.close(); @@ -1631,7 +1631,7 @@ public class OrbFunctional extends OrbRestricted } } } - + /** * Set the ORB parameters from the properties that were accumulated * from several locations. @@ -1658,7 +1658,7 @@ public class OrbFunctional extends OrbRestricted TOUT_AFTER_RECEIVING = Integer.parseInt(props.getProperty(AFTER_RECEIVING)); if (props.containsKey(SERVER_ERROR_PAUSE)) - TWAIT_SERVER_ERROR_PAUSE = + TWAIT_SERVER_ERROR_PAUSE = Integer.parseInt(props.getProperty(SERVER_ERROR_PAUSE)); } catch (NumberFormatException ex) @@ -1668,7 +1668,7 @@ public class OrbFunctional extends OrbRestricted "'" ); } - + if (props.containsKey(SocketFactory.PROPERTY)) { String factory = null; @@ -1676,7 +1676,7 @@ public class OrbFunctional extends OrbRestricted { factory = props.getProperty(SocketFactory.PROPERTY); if (factory!=null) - socketFactory = (SocketFactory) + socketFactory = (SocketFactory) ObjectCreator.forName(factory).newInstance(); } catch (Exception ex) @@ -1686,13 +1686,13 @@ public class OrbFunctional extends OrbRestricted throw p; } } - + if (props.containsKey(ORB_ID)) orb_id = props.getProperty(ORB_ID); - + if (props.containsKey(SERVER_ID)) server_id = props.getProperty(SERVER_ID); - + Enumeration en = props.elements(); while (en.hasMoreElements()) { @@ -1781,14 +1781,14 @@ public class OrbFunctional extends OrbRestricted running = false; super.finalize(); } - + /** * Get the number of objects that are connected to this ORB. - * + * * @return the number of objects, connected to this ORB. */ public int countConnectedObjects() - { + { return connected_objects.size(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/OrbRestricted.java b/libjava/classpath/gnu/CORBA/OrbRestricted.java index 4ae50b1a3a1..35f0b172481 100644 --- a/libjava/classpath/gnu/CORBA/OrbRestricted.java +++ b/libjava/classpath/gnu/CORBA/OrbRestricted.java @@ -527,7 +527,7 @@ public class OrbRestricted extends org.omg.CORBA_2_3.ORB super.destroy(); } - + /** * Create a typecode, representing a tree-like structure. * This structure contains a member that is a sequence of the same type, @@ -565,7 +565,7 @@ public class OrbRestricted extends org.omg.CORBA_2_3.ORB r.add(new StructMember("", recurs, null)); return r; } - + /** * Get the default context of this ORB. This is an initial root of all * contexts. @@ -579,5 +579,5 @@ public class OrbRestricted extends org.omg.CORBA_2_3.ORB { return new gnuContext("", null); } - -} \ No newline at end of file + +} diff --git a/libjava/classpath/gnu/CORBA/Poa/AOM.java b/libjava/classpath/gnu/CORBA/Poa/AOM.java index f8820bff83b..4b2264f3ce9 100644 --- a/libjava/classpath/gnu/CORBA/Poa/AOM.java +++ b/libjava/classpath/gnu/CORBA/Poa/AOM.java @@ -162,9 +162,9 @@ public class AOM /** * Get the record of the stored object. If the object is mapped several times * under the different keys, one of the mappings is used. - * + * * @param stored_object the stored object - * + * * @return the record about the stored object, null if this object is not * stored here. */ @@ -214,9 +214,9 @@ public class AOM /** * Find the reference info for the given servant. If the servant is mapped to * several objects, this returns the first found occurence. - * + * * @param servant a servant to find. - * + * * @return the servant/object/POA binding or null if no such found. */ public Obj findServant(Servant servant) @@ -403,4 +403,4 @@ public class AOM return r; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java b/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java index 44ebaf45351..5468d229269 100644 --- a/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/AccessiblePolicy.java @@ -59,4 +59,4 @@ public interface AccessiblePolicy */ int getCode(); -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java b/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java index 903f8bfbbe1..4ee02995d6c 100644 --- a/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java +++ b/libjava/classpath/gnu/CORBA/Poa/DynamicImpHandler.java @@ -82,4 +82,4 @@ public class DynamicImpHandler { throw new BAD_OPERATION(servant + " is not an InvokeHandler."); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java b/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java index 5e2455952d2..a8517352638 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java +++ b/libjava/classpath/gnu/CORBA/Poa/ForwardRequestHolder.java @@ -104,4 +104,4 @@ public class ForwardRequestHolder { ForwardRequestHelper.write(output, value); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java b/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java index b1d5eaf8c03..c54a0265413 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java +++ b/libjava/classpath/gnu/CORBA/Poa/ForwardedServant.java @@ -206,4 +206,4 @@ public class ForwardedServant { return ref._ids(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java b/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java index 154762acf00..b415034a32f 100644 --- a/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java +++ b/libjava/classpath/gnu/CORBA/Poa/InvalidPolicyHolder.java @@ -103,4 +103,4 @@ public class InvalidPolicyHolder { return InvalidPolicyHelper.type(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java b/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java index 72dd8f0cf50..7b42fde1ea2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalDelegate.java @@ -70,7 +70,7 @@ import java.util.Arrays; * A local delegate, transferring all object requests to the locally available * servant. This class is involved in handling the method invocations on the * local object, obtained by POA.create_reference_with_id. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class LocalDelegate @@ -98,7 +98,7 @@ public class LocalDelegate poa = a_poa; Id = an_id; } - + /** * Get the IOR of the connected object. */ @@ -171,9 +171,9 @@ public class LocalDelegate /** * Check if this object could be named by the given repository id. - * + * * @param idl_id the repository id to check. - * + * * @return true if it is one of the possible repository ids of this object. */ public boolean is_a(org.omg.CORBA.Object a_servant, String idl_id) @@ -238,11 +238,11 @@ public class LocalDelegate /** * Create a request to invoke the method of this CORBA object. - * + * * @param operation the name of the method to invoke. * @param response_expected specifies if this is one way message or the * response to the message is expected. - * + * * @return the stream where the method arguments should be written. */ public org.omg.CORBA.portable.OutputStream request( @@ -289,7 +289,7 @@ public class LocalDelegate /** * Make an invocation. - * + * * @param target not in use. * @param output the stream request that should be returned by * {@link #m_request} in this method. @@ -382,4 +382,4 @@ public class LocalDelegate { release(target); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java b/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java index 4a9ef8d9044..ca5b57b0036 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalRequest.java @@ -199,8 +199,8 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, public org.omg.CORBA.portable.InputStream v_invoke(InvokeHandler handler) { // Check maybe POA is in the discarding mode (will throw TRANSIENT if it is). - poa.checkDiscarding(); - + poa.checkDiscarding(); + // Local request must be intercepted both by server and request // interceptors. boolean s_intercept = false; @@ -249,7 +249,7 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, s_interceptor.receive_request_service_contexts(s_info); } - + if (handler == null) { handler = object.getHandler(operation(), cookie, false); @@ -684,4 +684,4 @@ public class LocalRequest extends gnuRequest implements ResponseHandler, { return poa; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java b/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java index 6d0b39650c1..714e029fea8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/LocalServerRequest.java @@ -196,4 +196,4 @@ public class LocalServerRequest { set_exception(exc); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java b/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java index 4fc51ff154b..360537e2c95 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java +++ b/libjava/classpath/gnu/CORBA/Poa/ORB_1_4.java @@ -255,7 +255,7 @@ public class ORB_1_4 super.set_parameters(para, props); registerInterceptors(props, para); } - + /** * This method is called by RMI-IIOP {@link javax.rmi.Tie#orb(ORB)}, passing * this as parameter. The ORB will try to connect that tie as @@ -288,6 +288,6 @@ public class ORB_1_4 throw bad; } } - } + } } diff --git a/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java b/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java index e65214d4a9a..2123a1c9cb2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java +++ b/libjava/classpath/gnu/CORBA/Poa/ServantDelegateImpl.java @@ -229,4 +229,4 @@ public class ServantDelegateImpl if (servant != some_servant) throw new InternalError("Only one servant per delegate is supported."); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java b/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java index b2edc4056ab..6b84031f1a2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java +++ b/libjava/classpath/gnu/CORBA/Poa/StandardPolicies.java @@ -125,4 +125,4 @@ public class StandardPolicies } return complete; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java b/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java index 17d5a0f9e04..fc64e6bb184 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuAdapterActivator.java @@ -78,4 +78,4 @@ public class gnuAdapterActivator } return true; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java b/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java index 02fc42470b3..01c6cccd5b7 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuForwardRequest.java @@ -87,4 +87,4 @@ public class gnuForwardRequest else throw new BAD_PARAM("ObjectImpl expected"); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java index 91531909a6a..1234abce673 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuIdAssignmentPolicy.java @@ -77,4 +77,4 @@ public class gnuIdAssignmentPolicy { return (IdAssignmentPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java index 0b5fa1420bd..21d8c54c4f8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuIdUniquenessPolicy.java @@ -77,4 +77,4 @@ public class gnuIdUniquenessPolicy { return (IdUniquenessPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java index f1721beef64..96ce42708f8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuImplicitActivationPolicy.java @@ -77,4 +77,4 @@ public class gnuImplicitActivationPolicy { return (ImplicitActivationPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java index f26596cd951..6efb9d603d7 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuLifespanPolicy.java @@ -77,4 +77,4 @@ public class gnuLifespanPolicy { return (LifespanPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java index 32fc5bfd221..5d323305a97 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOA.java @@ -110,16 +110,16 @@ public class gnuPOA { /** * The object reference template, associated with this POA. - * + * * @since 1.5 */ class RefTemplate implements ObjectReferenceTemplate { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + RefTemplate() { // The adapter name is computed once. @@ -140,12 +140,12 @@ public class gnuPOA for (int i = 0; i < m_adapter_name.length; i++) m_adapter_name[i] = (String) names.get(m_adapter_name.length - i - 1); } - + /** * The adapter name */ final String[] m_adapter_name; - + /** * Get the name of this POA. */ @@ -186,24 +186,24 @@ public class gnuPOA return ref_template_ids; } } - - /** - * Use serialVersionUID for interoperability. + + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The adapter reference template. */ ObjectReferenceTemplate refTemplate; - + /** * The reference template repository ids. Defined outside the class as it * cannot have static members. */ - final static String[] ref_template_ids = + final static String[] ref_template_ids = new String[] { ObjectReferenceTemplateHelper.id() }; - + /** * The active object map, mapping between object keys, objects and servants. */ @@ -287,7 +287,7 @@ public class gnuPOA * necessity of the frequent checks. */ public final boolean retain_servant; - + /** * The object reference factory, used to create the new object * references. @@ -339,7 +339,7 @@ public class gnuPOA retain_servant = applies(ServantRetentionPolicyValue.RETAIN); validatePolicies(a_policies); - + refTemplate = new RefTemplate(); } @@ -538,16 +538,16 @@ public class gnuPOA * Generate the Object Id for the given servant and add the servant to the * Active Object Map using this Id a a key. If the servant activator is set, * its incarnate method will be called. - * + * * @param a_servant a servant that would serve the object with the returned * Object Id. If null is passed, under apporoprate policies the servant * activator is invoked. - * + * * @return the generated objert Id for the given servant. - * + * * @throws ServantAlreadyActive if this servant is already in the Active * Object Map and the UNIQUE_ID policy applies. - * + * * @throws WrongPolicy if the required policies SYSTEM_ID and RETAIN do not * apply to this POA. */ @@ -589,12 +589,12 @@ public class gnuPOA * Add the given servant to the Active Object Map as a servant for the object * with the provided Object Id. If the servant activator is set, its incarnate * method will be called. - * + * * @param an_Object_Id an object id for the given object. * @param a_servant a servant that will serve the object with the given Object * Id. If null is passed, under apporoprate policies the servant activator is * invoked. - * + * * @throws ObjectAlreadyActive if the given object id is already in the Active * Object Map. * @throws ServantAlreadyActive if the UNIQUE_ID policy applies and this @@ -659,13 +659,13 @@ public class gnuPOA /** * Locate the servant for this object Id and connect it to ORB. - * + * * @param an_Object_Id the object id. * @param a_servant the servant (may be null). * @param exists an existing active object map entry. * @param use_forwarding allow to throw the gnuForwardRequest if the activator * throws ForwardRequest. - * + * * @throws OBJ_ADAPTER minor 4 if the servant cannot be located (the required * servant manager may be missing). */ @@ -1054,12 +1054,12 @@ public class gnuPOA /** * Returns the servant that is serving this object. - * + * * @return if the RETAIN policy applies and the object is in the Active Object * Map, the method returns the servant, associated with this object. * Otherwise, if the USE_DEFAULT_SERVANT policy applies, the method returns * the default servant (if one was set). - * + * * @throws ObjectNotActive if none of the conditions above are satisfied. * @throws WrongAdapter if the object reference was not created with this POA. * @throws WrongPolicy. This method requires either RETAIN or @@ -1076,7 +1076,7 @@ public class gnuPOA { String object; if (the_Object == null) - object = "null passed"; + object = "null passed"; else if (the_Object instanceof gnuServantObject) { gnuServantObject gs = (gnuServantObject) the_Object; @@ -1123,7 +1123,7 @@ public class gnuPOA * executing a request on the default servant, the method returns the ObjectId * associated with the current invocation. * - * + * * @throws ServantNotActive in all cases, not listed in the list above. * @throws WrongPolicy The method requres USE_DEFAULT_SERVANT policy or a * combination of the RETAIN policy and either the UNIQUE_ID or @@ -1182,12 +1182,12 @@ public class gnuPOA * this case, if the servant activator is set, the * {@link ServantActivatorOperations#incarnate} method will be called. *

    - * + * * @throws ServantNotActive if the servant is inactive and no * IMPLICIT_ACTIVATION policy applies. * @throws WrongPolicy This method needs the RETAIN policy and either the * UNIQUE_ID or IMPLICIT_ACTIVATION policies. - * + * * @return the object, exposing the given servant in the context of this POA. */ public org.omg.CORBA.Object servant_to_reference(Servant the_Servant) @@ -1237,15 +1237,15 @@ public class gnuPOA /** * Incarnate in cases when request forwarding is not expected because the * servant must be provided by the servant activator. - * + * * @param x the aom entry, where the object is replaced by value, returned by * servant activator (if not null). - * + * * @param object_key the object key. - * + * * @param a_servant the servant that was passed as a parameter in the * activation method. - * + * * @param use_forwarding if true, the gnuForwardRequest is throw under the * forwarding exception (for remote client). Otherwise, the request is * internally redirected (for local invocation). @@ -1415,14 +1415,14 @@ public class gnuPOA * The remote invocation on the target, belonging to the POA that is currently * destroyed return the remote exception ({@link TRANSIENT}, minor code 4). *

    - * + * * @param etherealize_objects if true, and POA has RETAIN policy, and the * servant manager is available, the servant manager method * {@link ServantActivatorOperations#etherealize} is called for each active * object in the Active Object Map. This method should not try to access POA * being destroyed. If destroy is called multiple times before * the destruction completes, the etherialization should be invoked only once. - * + * * @param wait_for_completion if true, the method waits till the POA being * destroyed completes all current requests and etherialization. If false, the * method returns immediately. @@ -1669,7 +1669,7 @@ public class gnuPOA } return h; } - + /** * Recursively searches for the given key in the POA tree. * @param ior_key the key, ecapsulating both object @@ -1748,7 +1748,7 @@ public class gnuPOA else return null; } - + /** * Recursively searches for the given servant in the POA tree. */ @@ -1768,7 +1768,7 @@ public class gnuPOA } return h; } - + /** * Get the object reference template of this POA. * Instantiate a singleton instance, if required. @@ -1777,15 +1777,15 @@ public class gnuPOA { if (refTemplate == null) refTemplate = new RefTemplate(); - + return refTemplate; } - + public ObjectReferenceFactory getReferenceFactory() { return m_object_factory; } - + public void setReferenceFactory(ObjectReferenceFactory factory) { m_object_factory = factory; diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java index 28f4ecd281f..db43751a7e3 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPOAManager.java @@ -60,11 +60,11 @@ public class gnuPOAManager extends LocalObject implements POAManager { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The POAs, controlled by this manager. */ @@ -75,7 +75,7 @@ public class gnuPOAManager * in the holding state. */ State state = State.HOLDING; - + /** * Get the state of the POA manager. */ @@ -99,8 +99,8 @@ public class gnuPOAManager state = State.ACTIVE; else throw new AdapterInactive(); - - notifyInterceptors(state.value()); + + notifyInterceptors(state.value()); } /** @@ -120,9 +120,9 @@ public class gnuPOAManager state = State.HOLDING; else throw new AdapterInactive(); - + notifyInterceptors(state.value()); - + if (wait_for_completion) waitForIdle(); } @@ -154,9 +154,9 @@ public class gnuPOAManager if (state == State.INACTIVE) throw new AdapterInactive("Repetetive inactivation"); state = State.INACTIVE; - - notifyInterceptors(state.value()); - + + notifyInterceptors(state.value()); + if (wait_for_completion) waitForIdle(); @@ -191,9 +191,9 @@ public class gnuPOAManager state = State.DISCARDING; else throw new AdapterInactive(); - - notifyInterceptors(state.value()); - + + notifyInterceptors(state.value()); + if (wait_for_completion) waitForIdle(); } @@ -209,10 +209,10 @@ public class gnuPOAManager { if (state == State.ACTIVE) throw new BAD_INV_ORDER("The state is active"); - + gnuPOA poa; Iterator iter = POAs.iterator(); - + while (iter.hasNext()) { poa = (gnuPOA) iter.next(); @@ -240,16 +240,16 @@ public class gnuPOAManager { POAs.remove(poa); } - + /** * This method is called when POA is destryed. The interceptors are * notified. */ public void poaDestroyed(gnuPOA poa) { - notifyInterceptors(NON_EXISTENT.value); + notifyInterceptors(NON_EXISTENT.value); } - + /** * Notify CORBA 3.0 interceptors about the status change. */ @@ -269,4 +269,4 @@ public class gnuPOAManager } } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java b/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java index 927d02fe3d2..d489d0e83ac 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuPoaCurrent.java @@ -176,4 +176,4 @@ public class gnuPoaCurrent threads.remove(t.getName()); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java index 2f77639c698..4e322e5e2d8 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuRequestProcessingPolicy.java @@ -77,4 +77,4 @@ public class gnuRequestProcessingPolicy { return (RequestProcessingPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java index 7e9b4f2f599..17ef452a776 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuServantObject.java @@ -131,7 +131,7 @@ public class gnuServantObject extends ObjectImpl * ids are requested from the servant. */ public final String[] repository_ids; - + /** * True indicates that the NO_RETAIN policy applies for the servant. * The servant must be discarded after the each call. @@ -155,16 +155,16 @@ public class gnuServantObject extends ObjectImpl manager = a_poa.the_POAManager(); poa = a_poa; orb = an_orb; - - noRetain = poa.applies(ServantRetentionPolicyValue.NON_RETAIN); + + noRetain = poa.applies(ServantRetentionPolicyValue.NON_RETAIN); } - + /** * Get the IOR as it would be for this object. */ public IOR getIor() { - return orb.getLocalIor(this); + return orb.getLocalIor(this); } /** @@ -192,7 +192,7 @@ public class gnuServantObject extends ObjectImpl } repository_ids = null; orb = an_orb; - + noRetain = poa != null && poa.applies(ServantRetentionPolicyValue.NON_RETAIN); } diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java index 9fb61ab3f1f..95958d299c2 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuServantRetentionPolicy.java @@ -77,4 +77,4 @@ public class gnuServantRetentionPolicy { return (ServantRetentionPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java b/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java index 1de94a10145..e7dac0f6ae4 100644 --- a/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java +++ b/libjava/classpath/gnu/CORBA/Poa/gnuThreadPolicy.java @@ -77,4 +77,4 @@ public class gnuThreadPolicy { return (ThreadPolicyValue) getValue(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java b/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java index c55405cedf6..0c21f6f4512 100644 --- a/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java +++ b/libjava/classpath/gnu/CORBA/ServiceRequestAdapter.java @@ -164,4 +164,4 @@ public class ServiceRequestAdapter throw new InternalError(); } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/SetOverrideTypeHolder.java b/libjava/classpath/gnu/CORBA/SetOverrideTypeHolder.java index 12b4b9f0cc8..478ec3f7027 100644 --- a/libjava/classpath/gnu/CORBA/SetOverrideTypeHolder.java +++ b/libjava/classpath/gnu/CORBA/SetOverrideTypeHolder.java @@ -87,4 +87,4 @@ public class SetOverrideTypeHolder { SetOverrideTypeHelper.write(out, value); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/SimpleDelegate.java b/libjava/classpath/gnu/CORBA/SimpleDelegate.java index cb0a7d6034d..d1c6ab407c9 100644 --- a/libjava/classpath/gnu/CORBA/SimpleDelegate.java +++ b/libjava/classpath/gnu/CORBA/SimpleDelegate.java @@ -118,7 +118,7 @@ public class SimpleDelegate g.set_args(parameters); if (returns != null) g.set_result(returns); - return g; + return g; } /** @@ -315,4 +315,4 @@ public class SimpleDelegate g.m_target = target; return g; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/SocketRepository.java b/libjava/classpath/gnu/CORBA/SocketRepository.java index 5d4a5099c15..71e073adb42 100644 --- a/libjava/classpath/gnu/CORBA/SocketRepository.java +++ b/libjava/classpath/gnu/CORBA/SocketRepository.java @@ -57,7 +57,7 @@ public class SocketRepository * The socket map. */ private static HashMap sockets = new HashMap(); - + /** * Put a socket. This method also discards all not reusable sockets from * the map. @@ -74,28 +74,28 @@ public class SocketRepository gc(); } } - + /** * Removes all non reusable sockets. As it is private, - * we know we call from the synchronized code already. + * we know we call from the synchronized code already. */ private static void gc() { Iterator iter = sockets.entrySet().iterator(); - + Map.Entry e; Socket sx; - + while (iter.hasNext()) { e = (Map.Entry) iter.next(); sx = (Socket) e.getValue(); - + if (not_reusable(sx)) iter.remove(); } } - + /** * Return true if the socket is no longer reusable. */ @@ -107,9 +107,9 @@ public class SocketRepository /** * Get a socket. - * + * * @param key a socket key. - * + * * @return an opened socket for reuse, null if no such available or it is * closed, its input or output has been shutown or otherwise the socket is not * reuseable. @@ -145,4 +145,4 @@ public class SocketRepository } } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/StreamHolder.java b/libjava/classpath/gnu/CORBA/StreamHolder.java index de2fda0ba89..992b4af21cc 100644 --- a/libjava/classpath/gnu/CORBA/StreamHolder.java +++ b/libjava/classpath/gnu/CORBA/StreamHolder.java @@ -120,4 +120,4 @@ public class StreamHolder { return stream; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/TypeCodeHelper.java b/libjava/classpath/gnu/CORBA/TypeCodeHelper.java index 4ffb0b74446..46831e8d2ba 100644 --- a/libjava/classpath/gnu/CORBA/TypeCodeHelper.java +++ b/libjava/classpath/gnu/CORBA/TypeCodeHelper.java @@ -84,7 +84,7 @@ public class TypeCodeHelper p.setLength(in.read_long()); rt = p; break; - + case TCKind._tk_string : case TCKind._tk_wstring : s = new StringTypeCode(kind); diff --git a/libjava/classpath/gnu/CORBA/TypeKindNamer.java b/libjava/classpath/gnu/CORBA/TypeKindNamer.java index 3296db3600a..464fd98a1a9 100644 --- a/libjava/classpath/gnu/CORBA/TypeKindNamer.java +++ b/libjava/classpath/gnu/CORBA/TypeKindNamer.java @@ -180,4 +180,4 @@ public class TypeKindNamer return "type of kind '" + type.kind().value() + "'"; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/Version.java b/libjava/classpath/gnu/CORBA/Version.java index efc27c22081..20449a38977 100644 --- a/libjava/classpath/gnu/CORBA/Version.java +++ b/libjava/classpath/gnu/CORBA/Version.java @@ -99,7 +99,7 @@ public class Version Version that = (Version) other; return same(that); } - + /** * Get the hashcode, higher 8 bits being the major version and lower 8 bits * the minor version. @@ -107,7 +107,7 @@ public class Version public int hashCode() { return major << 8 | minor; - } + } /** * Read from the input stream, major number first. @@ -218,5 +218,5 @@ public class Version throw m; } } - + } diff --git a/libjava/classpath/gnu/CORBA/_PolicyImplBase.java b/libjava/classpath/gnu/CORBA/_PolicyImplBase.java index 17a5f4a40e5..a235080c142 100644 --- a/libjava/classpath/gnu/CORBA/_PolicyImplBase.java +++ b/libjava/classpath/gnu/CORBA/_PolicyImplBase.java @@ -165,7 +165,7 @@ public abstract class _PolicyImplBase output.write_long(policyCode); } else - throw new BAD_OPERATION(method, Minor.Method, + throw new BAD_OPERATION(method, Minor.Method, CompletionStatus.COMPLETED_MAYBE); return output; @@ -229,4 +229,4 @@ public abstract class _PolicyImplBase { return x == null ? false : getValue().equals(x); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/gnuAny.java b/libjava/classpath/gnu/CORBA/gnuAny.java index 729386da2c4..6692d623e46 100644 --- a/libjava/classpath/gnu/CORBA/gnuAny.java +++ b/libjava/classpath/gnu/CORBA/gnuAny.java @@ -90,11 +90,11 @@ import java.util.zip.Adler32; public class gnuAny extends Any { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The value, returned by {@link #type()} if the value has been * not intialized. @@ -209,7 +209,7 @@ public class gnuAny return Arrays.equals(ba, bb); } - + /** * Get the content - dependent hashcode. */ @@ -224,10 +224,10 @@ public class gnuAny BufferedCdrOutput a = new BufferedCdrOutput(); a.setOrb(orb); write_value(a); - + adler.update(a.buffer.toByteArray()); adler.update(type().kind().value()); - + return (int) adler.getValue() & Integer.MAX_VALUE; } } @@ -856,7 +856,7 @@ public class gnuAny /** * Check if the current value if the value of the given kind. - * + * * @param kind a kind to check. * @throws BAD_OPERATION if the value is not set of is different kind. */ @@ -904,4 +904,4 @@ public class gnuAny typecode = null; xKind = -1; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/gnuCodecFactory.java b/libjava/classpath/gnu/CORBA/gnuCodecFactory.java index 8cf9ccf7bc4..5dfd56df17b 100644 --- a/libjava/classpath/gnu/CORBA/gnuCodecFactory.java +++ b/libjava/classpath/gnu/CORBA/gnuCodecFactory.java @@ -87,4 +87,4 @@ public class gnuCodecFactory extends LocalObject implements CodecFactory new Version(for_encoding.major_version, for_encoding.minor_version) ); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/gnuEnvironment.java b/libjava/classpath/gnu/CORBA/gnuEnvironment.java index ba02e3b194a..beb805e6f1f 100644 --- a/libjava/classpath/gnu/CORBA/gnuEnvironment.java +++ b/libjava/classpath/gnu/CORBA/gnuEnvironment.java @@ -51,7 +51,7 @@ public class gnuEnvironment * The stored exception. */ protected Exception exception; - + /** {@inheritDoc} */ public void clear() { diff --git a/libjava/classpath/gnu/CORBA/gnuRequest.java b/libjava/classpath/gnu/CORBA/gnuRequest.java index 3ec2a797f0f..56c9dbb1f40 100644 --- a/libjava/classpath/gnu/CORBA/gnuRequest.java +++ b/libjava/classpath/gnu/CORBA/gnuRequest.java @@ -592,7 +592,7 @@ public class gnuRequest extends Request implements Cloneable { final gnuRequest cloned = Clone(); cloned.oneWay = true; - + new Thread() { public void run() @@ -714,7 +714,7 @@ public class gnuRequest extends Request implements Cloneable /** * Do the actual invocation. This implementation requires to set the IOR * property ({@link #setIOR(IOR)} before calling this method. - * + * * @throws BAD_INV_ORDER, minor code 0, if the IOR has not been previously set * or if the direct argument addition is mixed with the direct * argument writing into the output stream. @@ -936,7 +936,7 @@ public synchronized RawReply submit() throws SystemException, ForwardRequest { RawReply response = submit(); - + // If this is a one way message, do not care about the response. if (oneWay && response == EMPTY) return; @@ -1420,4 +1420,4 @@ public synchronized RawReply submit() CompletionStatus.COMPLETED_MAYBE ); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/gnuValueHolder.java b/libjava/classpath/gnu/CORBA/gnuValueHolder.java index 8263113ec2a..d3f2b6b5839 100644 --- a/libjava/classpath/gnu/CORBA/gnuValueHolder.java +++ b/libjava/classpath/gnu/CORBA/gnuValueHolder.java @@ -132,4 +132,4 @@ public class gnuValueHolder helper_NA = true; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/interfaces/SocketFactory.java b/libjava/classpath/gnu/CORBA/interfaces/SocketFactory.java index 7797dcbf917..d1d7d418b18 100644 --- a/libjava/classpath/gnu/CORBA/interfaces/SocketFactory.java +++ b/libjava/classpath/gnu/CORBA/interfaces/SocketFactory.java @@ -49,11 +49,11 @@ import java.net.Socket; * for implementing the desired timeout policies, for HTTP tunnels and in some * other similar cases. While such functionality is provided by near all * existing CORBA implementations, no standard mechanism is defined. - * + * * The socket factory may need to put additional information to the IORs of the * objects, released by the ORB. Because of this reason, this interface extends * IORInterceptorOperations. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public interface SocketFactory @@ -63,28 +63,28 @@ public interface SocketFactory * factory class, the name of that (String) is the value of this property. */ final String PROPERTY = "gnu.CORBA.SocketFactory"; - + /** * Create a server socket that should serve remote invocations on the given * port. The ORB may use this socket to serve either one or more objects. - * + * * @param port the port, on that the socket should be listening for requests. * The port policy can be controlled by {@link gnuPortManager}. - * + * * @throws IOException if the socket cannot be created on the given port due * any reasons. The ORB may try to open the socket on another port, calling * this method with the different parameter. */ ServerSocket createServerSocket(int port) throws IOException; - + /** * Create a client socket that should send a request to the remote side. When * returned, the socket should be opened and ready to communicate. - * + * * @param port the port, on that the socket should be openend. The port is * usually part of the internet profile. - * + * * @throws IOException if the socket cannot be created on the given port due * any reasons. The ORB may try to open the socket on another port, calling * this method with the different parameter. diff --git a/libjava/classpath/gnu/CORBA/typecodes/AliasTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/AliasTypeCode.java index 3cb8ebfb393..41d0fbe8a2b 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/AliasTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/AliasTypeCode.java @@ -51,11 +51,11 @@ import org.omg.CORBA.TypeCodePackage.BadKind; public class AliasTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The typecode repository id. */ diff --git a/libjava/classpath/gnu/CORBA/typecodes/ArrayTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/ArrayTypeCode.java index bb798101a99..394efb36a6e 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/ArrayTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/ArrayTypeCode.java @@ -50,12 +50,12 @@ import org.omg.CORBA.TypeCodePackage.BadKind; public class ArrayTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - - + + /** * The array components. */ diff --git a/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java index af7f46ecfce..9e9f3eff669 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/FixedTypeCode.java @@ -52,12 +52,12 @@ import org.omg.CORBA.TypeCodePackage.BadKind; public class FixedTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - - + + /** * The number of the used digits. */ diff --git a/libjava/classpath/gnu/CORBA/typecodes/GeneralTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/GeneralTypeCode.java index 0a907844ad9..a00f6982352 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/GeneralTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/GeneralTypeCode.java @@ -59,12 +59,12 @@ import org.omg.CORBA.TypeCodePackage.BadKind; public class GeneralTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - - + + /** * Indicates that the field value has not been previously set. */ diff --git a/libjava/classpath/gnu/CORBA/typecodes/PrimitiveTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/PrimitiveTypeCode.java index 22d39a82c97..8f8ce3ea360 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/PrimitiveTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/PrimitiveTypeCode.java @@ -64,11 +64,11 @@ public class PrimitiveTypeCode extends TypeCode implements IDLEntity, Serializable { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The kind of this TypeCode. */ diff --git a/libjava/classpath/gnu/CORBA/typecodes/RecordTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/RecordTypeCode.java index 89f3425465b..8f13de9a9ae 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/RecordTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/RecordTypeCode.java @@ -58,11 +58,11 @@ import org.omg.CORBA.ValueMember; public class RecordTypeCode extends GeneralTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The individual field of the record. */ @@ -151,7 +151,7 @@ public class RecordTypeCode f.name = m.name; f.type = m.type; f.visibility = m.access; - + } /** diff --git a/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java index 8ec2f5474d0..7277736746b 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/RecursiveTypeCode.java @@ -48,11 +48,11 @@ import org.omg.CORBA.TCKind; public class RecursiveTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The id of the type for that this type serves as a * placeholder. diff --git a/libjava/classpath/gnu/CORBA/typecodes/StringTypeCode.java b/libjava/classpath/gnu/CORBA/typecodes/StringTypeCode.java index 2d1689b4560..7f463d7b03b 100644 --- a/libjava/classpath/gnu/CORBA/typecodes/StringTypeCode.java +++ b/libjava/classpath/gnu/CORBA/typecodes/StringTypeCode.java @@ -48,11 +48,11 @@ import org.omg.CORBA.TCKind; public class StringTypeCode extends PrimitiveTypeCode { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + private int len = 0; /** diff --git a/libjava/classpath/gnu/classpath/Pair.java b/libjava/classpath/gnu/classpath/Pair.java index 57af37a7464..f7a07a29cb3 100644 --- a/libjava/classpath/gnu/classpath/Pair.java +++ b/libjava/classpath/gnu/classpath/Pair.java @@ -101,11 +101,11 @@ public class Pair { if (obj instanceof Pair) { - Pair p = (Pair) obj; - A lp = p.getLeft(); - B rp = p.getRight(); - return (lp == null ? left == null : lp.equals(left)) && - (rp == null ? right == null : rp.equals(right)); + Pair p = (Pair) obj; + A lp = p.getLeft(); + B rp = p.getRight(); + return (lp == null ? left == null : lp.equals(left)) && + (rp == null ? right == null : rp.equals(right)); } return false; } diff --git a/libjava/classpath/gnu/classpath/Pointer.java b/libjava/classpath/gnu/classpath/Pointer.java index 27634a8941b..bc1ce62c2ee 100644 --- a/libjava/classpath/gnu/classpath/Pointer.java +++ b/libjava/classpath/gnu/classpath/Pointer.java @@ -39,7 +39,7 @@ exception statement from your version. */ package gnu.classpath; -/** A type used to indicate special data used by native code that should not +/** A type used to indicate special data used by native code that should not be marked by the garbage collector. */ public abstract class Pointer diff --git a/libjava/classpath/gnu/classpath/Pointer32.java b/libjava/classpath/gnu/classpath/Pointer32.java index 42b6c1d2db0..13d72e12e4e 100644 --- a/libjava/classpath/gnu/classpath/Pointer32.java +++ b/libjava/classpath/gnu/classpath/Pointer32.java @@ -38,13 +38,13 @@ exception statement from your version. */ package gnu.classpath; /** - * A type used to indicate special data used by native code that should not + * A type used to indicate special data used by native code that should not * be marked by the garbage collector. */ public final class Pointer32 extends Pointer { final int data; - + public Pointer32(int data) { this.data = data; diff --git a/libjava/classpath/gnu/classpath/Pointer64.java b/libjava/classpath/gnu/classpath/Pointer64.java index 6d27e1ba133..5db60a80e20 100644 --- a/libjava/classpath/gnu/classpath/Pointer64.java +++ b/libjava/classpath/gnu/classpath/Pointer64.java @@ -38,13 +38,13 @@ exception statement from your version. */ package gnu.classpath; /** - * A type used to indicate special data used by native code that should not + * A type used to indicate special data used by native code that should not * be marked by the garbage collector. */ public final class Pointer64 extends Pointer { final long data; - + public Pointer64(long data) { this.data = data; diff --git a/libjava/classpath/gnu/classpath/ServiceFactory.java b/libjava/classpath/gnu/classpath/ServiceFactory.java index 6c9728e0cbd..f41d8e19160 100644 --- a/libjava/classpath/gnu/classpath/ServiceFactory.java +++ b/libjava/classpath/gnu/classpath/ServiceFactory.java @@ -224,7 +224,7 @@ public final class ServiceFactory * null. */ public static

    Iterator

    lookupProviders(Class

    spi, - ClassLoader loader) + ClassLoader loader) { return lookupProviders(spi, loader, false); } @@ -268,8 +268,8 @@ public final class ServiceFactory * null. */ public static

    Iterator

    lookupProviders(Class

    spi, - ClassLoader loader, - boolean error) + ClassLoader loader, + boolean error) { String resourceName; Enumeration urls; @@ -292,18 +292,18 @@ public final class ServiceFactory * does not return anything (no providers installed). */ log(Level.WARNING, "cannot access {0}", resourceName, ioex); - if (error) - throw new ServiceConfigurationError("Failed to access + " + - resourceName, ioex); - else - { - List

    empty = Collections.emptyList(); - return empty.iterator(); - } + if (error) + throw new ServiceConfigurationError("Failed to access + " + + resourceName, ioex); + else + { + List

    empty = Collections.emptyList(); + return empty.iterator(); + } } return new ServiceIterator

    (spi, urls, loader, error, - AccessController.getContext()); + AccessController.getContext()); } @@ -379,7 +379,7 @@ public final class ServiceFactory * been fetched. */ private BufferedReader reader; - + /** * The URL currently being processed. This is only used for @@ -425,7 +425,7 @@ public final class ServiceFactory * and initializing service providers. */ ServiceIterator(Class

    spi, Enumeration urls, ClassLoader loader, - boolean error, AccessControlContext securityContext) + boolean error, AccessControlContext securityContext) { this.spi = spi; this.urls = urls; @@ -468,7 +468,7 @@ public final class ServiceFactory private P loadNextServiceProvider() { String line; - + if (reader == null) advanceReader(); @@ -489,9 +489,9 @@ public final class ServiceFactory log(Level.WARNING, "IOException upon reading {0}", currentURL, readProblem); line = null; - if (error) - throw new ServiceConfigurationError("Error reading " + - currentURL, readProblem); + if (error) + throw new ServiceConfigurationError("Error reading " + + currentURL, readProblem); } /* When we are at the end of one list of services, @@ -540,16 +540,16 @@ public final class ServiceFactory + " of \"{1}\". Specified" + " by \"META-INF/services/{1}\" in {2}."; - log(Level.WARNING, msg, + log(Level.WARNING, msg, new Object[] { line, spi.getName(), currentURL }, ex); - if (error) - throw new ServiceConfigurationError("Cannot load service "+ - "provider class " + - line + " specified by "+ - "\"META-INF/services/"+ - spi.getName() + "\" in "+ - currentURL, ex); + if (error) + throw new ServiceConfigurationError("Cannot load service "+ + "provider class " + + line + " specified by "+ + "\"META-INF/services/"+ + spi.getName() + "\" in "+ + currentURL, ex); continue; } } @@ -570,9 +570,9 @@ public final class ServiceFactory catch (Exception ex) { log(Level.WARNING, "cannot close {0}", currentURL, ex); - if (error) - throw new ServiceConfigurationError("Cannot close " + - currentURL, ex); + if (error) + throw new ServiceConfigurationError("Cannot close " + + currentURL, ex); } reader = null; currentURL = null; @@ -591,9 +591,9 @@ public final class ServiceFactory catch (Exception ex) { log(Level.WARNING, "cannot open {0}", currentURL, ex); - if (error) - throw new ServiceConfigurationError("Cannot open " + - currentURL, ex); + if (error) + throw new ServiceConfigurationError("Cannot open " + + currentURL, ex); } } while (reader == null); diff --git a/libjava/classpath/gnu/classpath/ServiceProviderLoadingAction.java b/libjava/classpath/gnu/classpath/ServiceProviderLoadingAction.java index 51f5a2fa911..78a11cd50b5 100644 --- a/libjava/classpath/gnu/classpath/ServiceProviderLoadingAction.java +++ b/libjava/classpath/gnu/classpath/ServiceProviderLoadingAction.java @@ -108,7 +108,7 @@ final class ServiceProviderLoadingAction

    this.loader = loader; } - + /** * Loads an implementation class for a service provider, and creates * a new instance of the loaded class by invoking its public diff --git a/libjava/classpath/gnu/classpath/SystemProperties.java b/libjava/classpath/gnu/classpath/SystemProperties.java index d091f1ed0c0..4aad2612e7e 100644 --- a/libjava/classpath/gnu/classpath/SystemProperties.java +++ b/libjava/classpath/gnu/classpath/SystemProperties.java @@ -75,31 +75,31 @@ public class SystemProperties // Set base URL if not already set. if (defaultProperties.get("gnu.classpath.home.url") == null) defaultProperties.put("gnu.classpath.home.url", - "file://" - + Configuration.CLASSPATH_HOME - + "/lib"); + "file://" + + Configuration.CLASSPATH_HOME + + "/lib"); // Set short name if not already set. if (defaultProperties.get("gnu.classpath.vm.shortname") == null) { - String value = defaultProperties.getProperty("java.vm.name"); - int index = value.lastIndexOf(' '); - if (index != -1) - value = value.substring(index + 1); - defaultProperties.put("gnu.classpath.vm.shortname", value); + String value = defaultProperties.getProperty("java.vm.name"); + int index = value.lastIndexOf(' '); + if (index != -1) + value = value.substring(index + 1); + defaultProperties.put("gnu.classpath.vm.shortname", value); } // Network properties if (defaultProperties.get("http.agent") == null) { - String userAgent = ("gnu-classpath/" - + defaultProperties.getProperty("gnu.classpath.version") - + " (" - + defaultProperties.getProperty("gnu.classpath.vm.shortname") - + "/" - + defaultProperties.getProperty("java.vm.version") - + ")"); - defaultProperties.put("http.agent", userAgent); + String userAgent = ("gnu-classpath/" + + defaultProperties.getProperty("gnu.classpath.version") + + " (" + + defaultProperties.getProperty("gnu.classpath.vm.shortname") + + "/" + + defaultProperties.getProperty("java.vm.version") + + ")"); + defaultProperties.put("http.agent", userAgent); } // 8859_1 is a safe default encoding to use when not explicitly set @@ -160,7 +160,7 @@ public class SystemProperties /** * Removes the supplied system property and its current value. * If the specified property does not exist, nothing happens. - * + * * @throws NullPointerException if the property name is null. * @return the value of the removed property, or null if no * such property exists. diff --git a/libjava/classpath/gnu/classpath/debug/Component.java b/libjava/classpath/gnu/classpath/debug/Component.java index dce257502a7..3cad8a2a78f 100644 --- a/libjava/classpath/gnu/classpath/debug/Component.java +++ b/libjava/classpath/gnu/classpath/debug/Component.java @@ -97,7 +97,7 @@ public final class Component extends Level * Trace details about the SSL key exchange. */ public static final Component SSL_KEY_EXCHANGE = new Component ("SSL KEY EXCHANGE", 2); - + /** * Trace running of delegated tasks. */ @@ -120,7 +120,7 @@ public final class Component extends Level * java.policy files. */ public static final Component POLICY = new Component ("POLICY", 7); - + /** * Trace ipp implementation. */ @@ -151,15 +151,15 @@ public final class Component extends Level { try { - Field f = Component.class.getField (name.toUpperCase ()); - if (!Modifier.isStatic (f.getModifiers ()) - || Component.class.isAssignableFrom (f.getClass ())) - return null; - return (Component) f.get (null); + Field f = Component.class.getField (name.toUpperCase ()); + if (!Modifier.isStatic (f.getModifiers ()) + || Component.class.isAssignableFrom (f.getClass ())) + return null; + return (Component) f.get (null); } catch (Throwable _) { - return null; + return null; } } @@ -172,4 +172,4 @@ public final class Component extends Level { return endIndex; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/classpath/debug/PreciseFilter.java b/libjava/classpath/gnu/classpath/debug/PreciseFilter.java index 7b88b2c8c92..91f5a9e6c98 100644 --- a/libjava/classpath/gnu/classpath/debug/PreciseFilter.java +++ b/libjava/classpath/gnu/classpath/debug/PreciseFilter.java @@ -95,11 +95,11 @@ public final class PreciseFilter implements Filter { try { - return isEnabled ((Component) record.getLevel ()); + return isEnabled ((Component) record.getLevel ()); } catch (ClassCastException cce) { - return true; + return true; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/classpath/debug/SystemLogger.java b/libjava/classpath/gnu/classpath/debug/SystemLogger.java index 8919e80c785..eaca0fe98e5 100644 --- a/libjava/classpath/gnu/classpath/debug/SystemLogger.java +++ b/libjava/classpath/gnu/classpath/debug/SystemLogger.java @@ -79,7 +79,7 @@ public final class SystemLogger extends Logger // XXX Check some permission here? return SYSTEM; } - + /** * Keep only one instance of the system logger. */ @@ -87,10 +87,10 @@ public final class SystemLogger extends Logger { super("gnu.classpath", null); } - + /** * Variable-arguments log method. - * + * * @param level The level to log to. * @param format The format string. * @param args The arguments. diff --git a/libjava/classpath/gnu/classpath/debug/TeeInputStream.java b/libjava/classpath/gnu/classpath/debug/TeeInputStream.java index ef6b2ed3dc1..0b17633f653 100644 --- a/libjava/classpath/gnu/classpath/debug/TeeInputStream.java +++ b/libjava/classpath/gnu/classpath/debug/TeeInputStream.java @@ -94,5 +94,5 @@ public class TeeInputStream { return false; } - + } diff --git a/libjava/classpath/gnu/classpath/debug/TeeReader.java b/libjava/classpath/gnu/classpath/debug/TeeReader.java index 8fa742e21a1..d1f755dc9b5 100644 --- a/libjava/classpath/gnu/classpath/debug/TeeReader.java +++ b/libjava/classpath/gnu/classpath/debug/TeeReader.java @@ -94,5 +94,5 @@ public class TeeReader { return false; } - + } diff --git a/libjava/classpath/gnu/classpath/jdwp/Jdwp.java b/libjava/classpath/gnu/classpath/jdwp/Jdwp.java index 1d2329255cb..e90a2c762b3 100644 --- a/libjava/classpath/gnu/classpath/jdwp/Jdwp.java +++ b/libjava/classpath/gnu/classpath/jdwp/Jdwp.java @@ -118,14 +118,14 @@ public class Jdwp /** * Get the thread group used by JDWP threads - * + * * @return the thread group */ public ThreadGroup getJdwpThreadGroup() { return _group; } - + /** * Should the virtual machine suspend on startup? */ @@ -134,9 +134,9 @@ public class Jdwp Jdwp jdwp = getDefault (); if (jdwp != null) { - String suspend = (String) jdwp._properties.get (_PROPERTY_SUSPEND); - if (suspend != null && suspend.equals ("y")) - return true; + String suspend = (String) jdwp._properties.get (_PROPERTY_SUSPEND); + if (suspend != null && suspend.equals ("y")) + return true; } return false; @@ -167,10 +167,10 @@ public class Jdwp _packetProcessor = new PacketProcessor (_connection); _ppThread = new Thread (_group, new Runnable () { - public void run () - { - AccessController.doPrivileged (_packetProcessor); - } + public void run () + { + AccessController.doPrivileged (_packetProcessor); + } }, "packet processor"); _ppThread.start (); } @@ -178,24 +178,24 @@ public class Jdwp /** * Shutdown the JDWP back-end * - * NOTE: This does not quite work properly. See notes in + * NOTE: This does not quite work properly. See notes in * run() on this subject (catch of InterruptedException). */ public void shutdown () { if (!_shutdown) { - _packetProcessor.shutdown (); - _ppThread.interrupt (); - _connection.shutdown (); - _shutdown = true; - isDebugging = false; + _packetProcessor.shutdown (); + _ppThread.interrupt (); + _connection.shutdown (); + _shutdown = true; + isDebugging = false; - /* FIXME: probably need to check state of user's - program -- if it is suspended, we need to either - resume or kill them. */ + /* FIXME: probably need to check state of user's + program -- if it is suspended, we need to either + resume or kill them. */ - interrupt (); + interrupt (); } } @@ -215,25 +215,25 @@ public class Jdwp Jdwp jdwp = getDefault(); if (jdwp != null) { - EventManager em = EventManager.getDefault(); - EventRequest[] requests = em.getEventRequests(event); - for (int i = 0; i < requests.length; ++i) - { - try - { - sendEvent(requests[i], event); - jdwp._enforceSuspendPolicy(requests[i].getSuspendPolicy()); - } - catch (Exception e) - { - /* Really not much we can do. For now, just print out - a warning to the user. */ - System.out.println ("Jdwp.notify: caught exception: " + e); - } - } + EventManager em = EventManager.getDefault(); + EventRequest[] requests = em.getEventRequests(event); + for (int i = 0; i < requests.length; ++i) + { + try + { + sendEvent(requests[i], event); + jdwp._enforceSuspendPolicy(requests[i].getSuspendPolicy()); + } + catch (Exception e) + { + /* Really not much we can do. For now, just print out + a warning to the user. */ + System.out.println ("Jdwp.notify: caught exception: " + e); + } + } } } - + /** * Notify the debugger of "co-located" events. This method should * not be called if debugging is not active (but it would not @@ -248,45 +248,45 @@ public class Jdwp public static void notify(Event[] events) { Jdwp jdwp = getDefault(); - + if (jdwp != null) { - byte suspendPolicy = JdwpConstants.SuspendPolicy.NONE; - EventManager em = EventManager.getDefault(); - ArrayList allEvents = new ArrayList (); - ArrayList allRequests = new ArrayList (); - for (int i = 0; i < events.length; ++i) - { - EventRequest[] r = em.getEventRequests(events[i]); - for (int j = 0; j < r.length; ++j) - { - /* This is hacky, but it's not clear whether this - can really happen, and if it does, what should - occur. */ - allEvents.add (events[i]); - allRequests.add (r[j]); + byte suspendPolicy = JdwpConstants.SuspendPolicy.NONE; + EventManager em = EventManager.getDefault(); + ArrayList allEvents = new ArrayList (); + ArrayList allRequests = new ArrayList (); + for (int i = 0; i < events.length; ++i) + { + EventRequest[] r = em.getEventRequests(events[i]); + for (int j = 0; j < r.length; ++j) + { + /* This is hacky, but it's not clear whether this + can really happen, and if it does, what should + occur. */ + allEvents.add (events[i]); + allRequests.add (r[j]); - // Perhaps this is overkill? - if (r[j].getSuspendPolicy() > suspendPolicy) - suspendPolicy = r[j].getSuspendPolicy(); - } - } + // Perhaps this is overkill? + if (r[j].getSuspendPolicy() > suspendPolicy) + suspendPolicy = r[j].getSuspendPolicy(); + } + } - try - { - Event[] e = new Event[allEvents.size()]; - allEvents.toArray(e); - EventRequest[] r = new EventRequest[allRequests.size()]; - allRequests.toArray(r); - sendEvents(r, e, suspendPolicy); - jdwp._enforceSuspendPolicy(suspendPolicy); - } - catch (Exception e) - { - /* Really not much we can do. For now, just print out - a warning to the user. */ - System.out.println ("Jdwp.notify: caught exception: " + e); - } + try + { + Event[] e = new Event[allEvents.size()]; + allEvents.toArray(e); + EventRequest[] r = new EventRequest[allRequests.size()]; + allRequests.toArray(r); + sendEvents(r, e, suspendPolicy); + jdwp._enforceSuspendPolicy(suspendPolicy); + } + catch (Exception e) + { + /* Really not much we can do. For now, just print out + a warning to the user. */ + System.out.println ("Jdwp.notify: caught exception: " + e); + } } } @@ -303,7 +303,7 @@ public class Jdwp throws IOException { sendEvents (new EventRequest[] { request }, new Event[] { event }, - request.getSuspendPolicy()); + request.getSuspendPolicy()); } /** @@ -317,16 +317,16 @@ public class Jdwp * @throws IOException if a communications failure occurs */ public static void sendEvents (EventRequest[] requests, Event[] events, - byte suspendPolicy) + byte suspendPolicy) throws IOException { Jdwp jdwp = getDefault(); if (jdwp != null) { - synchronized (jdwp._connection) - { - jdwp._connection.sendEvents (requests, events, suspendPolicy); - } + synchronized (jdwp._connection) + { + jdwp._connection.sendEvents (requests, events, suspendPolicy); + } } } @@ -337,16 +337,16 @@ public class Jdwp switch (suspendPolicy) { case EventRequest.SUSPEND_NONE: - // do nothing - break; + // do nothing + break; case EventRequest.SUSPEND_THREAD: - VMVirtualMachine.suspendThread (Thread.currentThread ()); - break; + VMVirtualMachine.suspendThread (Thread.currentThread ()); + break; case EventRequest.SUSPEND_ALL: - VMVirtualMachine.suspendAllThreads (); - break; + VMVirtualMachine.suspendAllThreads (); + break; } } @@ -360,8 +360,8 @@ public class Jdwp { synchronized (_initLock) { - ++_initCount; - _initLock.notify (); + ++_initCount; + _initLock.notify (); } } @@ -369,22 +369,22 @@ public class Jdwp { try { - _doInitialization (); + _doInitialization (); - /* We need a little internal synchronization here, so that - when this thread dies, the back-end will be fully initialized, - ready to start servicing the VM and debugger. */ - synchronized (_initLock) - { - while (_initCount != 2) - _initLock.wait (); - } - _initLock = null; + /* We need a little internal synchronization here, so that + when this thread dies, the back-end will be fully initialized, + ready to start servicing the VM and debugger. */ + synchronized (_initLock) + { + while (_initCount != 2) + _initLock.wait (); + } + _initLock = null; } catch (Throwable t) { - System.out.println ("Exception in JDWP back-end: " + t); - System.exit (1); + System.out.println ("Exception in JDWP back-end: " + t); + System.exit (1); } /* Force creation of the EventManager. If the event manager @@ -407,10 +407,10 @@ public class Jdwp String[] options = configString.split (","); for (int i = 0; i < options.length; ++i) { - String[] property = options[i].split ("="); - if (property.length == 2) - _properties.put (property[0], property[1]); - // ignore malformed options + String[] property = options[i].split ("="); + if (property.length == 2) + _properties.put (property[0], property[1]); + // ignore malformed options } } } diff --git a/libjava/classpath/gnu/classpath/jdwp/JdwpConstants.java b/libjava/classpath/gnu/classpath/jdwp/JdwpConstants.java index f38774d622e..80dd3f73ad3 100644 --- a/libjava/classpath/gnu/classpath/jdwp/JdwpConstants.java +++ b/libjava/classpath/gnu/classpath/jdwp/JdwpConstants.java @@ -51,7 +51,7 @@ public class JdwpConstants public static final int MAJOR = 1; public static final int MINOR = 4; } - + //////////////////////////////////////// // Commands/Sets // //////////////////////////////////////// @@ -77,7 +77,7 @@ public class JdwpConstants public static final byte CAPABILITIES = 12; public static final byte CLASS_PATHS = 13; public static final byte DISPOSE_OBJECTS = 14; - public static final byte HOLD_EVENTS = 15; + public static final byte HOLD_EVENTS = 15; public static final byte RELEASE_EVENTS = 16; public static final byte CAPABILITIES_NEW = 17; public static final byte REDEFINE_CLASSES = 18; @@ -94,7 +94,7 @@ public class JdwpConstants public static final byte CLASS_LOADER= 2; public static final byte MODIFIERS = 3; public static final byte FIELDS = 4; - public static final byte METHODS = 5; + public static final byte METHODS = 5; public static final byte GET_VALUES = 6; public static final byte SOURCE_FILE = 7; public static final byte NESTED_TYPES = 8; @@ -587,7 +587,7 @@ public class JdwpConstants public static final byte METHOD_ENTRY = 40; public static final byte METHOD_EXIT = 41; public static final byte VM_INIT = 90; - public static final byte VM_DEATH = 99; + public static final byte VM_DEATH = 99; public static final byte VM_DISCONNECTED = 100; public static final byte VM_START = VM_INIT; @@ -617,7 +617,7 @@ public class JdwpConstants public static final byte THREAD_ONLY = 3; /** - * For class prepare events, restricts generated events + * For class prepare events, restricts generated events * to be the preparation of the given reference type and any * subtypes. * @@ -647,7 +647,7 @@ public class JdwpConstants /** * Restricts reported events to those for classes whose name does not * match the given restricted regular expression. - * + * * For class prepare events, the prepared class name is matched. * For class unload events, the unloaded class name is matched. * For other events, the class name of the event's location is matched. @@ -682,7 +682,7 @@ public class JdwpConstants /** * Restricts reported step events to those which satisfy depth and * size constraints. - * + * * May be used with step event kinds only. */ public static final byte STEP = 10; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java index abf280d6ec6..46e50de167f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java @@ -62,7 +62,7 @@ public class BreakpointEvent // Location where breakpoint occurred private Location _location; - + //object instance private Object _instance; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java index 5341daa42b5..f21f8e7c059 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java @@ -141,7 +141,7 @@ public class ClassPrepareEvent tid.write (outStream); rid.writeTagged (outStream); JdwpString.writeString (outStream, - Signature.computeClassSignature (_class)); + Signature.computeClassSignature (_class)); outStream.writeInt (_status); } } diff --git a/libjava/classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java index 4ba8bc80666..a35d3b9bd35 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/ClassUnloadEvent.java @@ -47,7 +47,7 @@ import java.io.IOException; /** * "Notification of a class unload in the target VM" -- JDWP 1.4.2 - * + * * @author Kyle Galloway (kgallowa@redhat.com) */ public class ClassUnloadEvent @@ -58,7 +58,7 @@ public class ClassUnloadEvent /** * Constructs a new ClassUnloadEvent - * + * * @param signature the signature reported from the VM */ public ClassUnloadEvent(String signature) @@ -70,7 +70,7 @@ public class ClassUnloadEvent /** * Returns a specific filtering parameter for this event. Class is the only * valid type. - * + * * @param type the type of parameter desired * @returns the desired parameter or null */ @@ -82,10 +82,10 @@ public class ClassUnloadEvent /** * Writes the event to the given stream - * + * * @param outStream the output stream to write the event to */ - protected void _writeData(DataOutputStream outStream) + protected void _writeData(DataOutputStream outStream) throws IOException { VMIdManager idm = VMIdManager.getDefault(); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/Event.java b/libjava/classpath/gnu/classpath/jdwp/event/Event.java index c89b25cb93b..492cadbccad 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/Event.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/Event.java @@ -58,22 +58,22 @@ public abstract class Event * The class of the object in which the event occurred */ public static final int EVENT_CLASS = 1; - + /** * The thread where the event occurred */ public static final int EVENT_THREAD = 2; - + /** * The location where an event occurred */ public static final int EVENT_LOCATION = 3; - + /** * The instance of the class where the event occurred */ public static final int EVENT_INSTANCE = 4; - + /** * The field acted on by an event */ @@ -88,7 +88,7 @@ public abstract class Event * Whether this exception was caught (only valid for ExceptionEvents) */ public static final int EVENT_EXCEPTION_CAUGHT = 7; - + // The kind of event represented by this event private byte _eventKind; @@ -144,25 +144,25 @@ public abstract class Event * @returns a JdwpPacket of the events */ public static JdwpPacket toPacket (DataOutputStream dos, - Event[] events, - EventRequest[] requests, - byte suspendPolicy) + Event[] events, + EventRequest[] requests, + byte suspendPolicy) { JdwpPacket pkt; try { - dos.writeByte (suspendPolicy); - dos.writeInt (events.length); - for (int i = 0; i < events.length; ++i) - _toData (dos, events[i], requests[i]); + dos.writeByte (suspendPolicy); + dos.writeInt (events.length); + for (int i = 0; i < events.length; ++i) + _toData (dos, events[i], requests[i]); - pkt - = new JdwpCommandPacket (JdwpConstants.CommandSet.Event.CS_VALUE, - JdwpConstants.CommandSet.Event.COMPOSITE); + pkt + = new JdwpCommandPacket (JdwpConstants.CommandSet.Event.CS_VALUE, + JdwpConstants.CommandSet.Event.COMPOSITE); } catch (IOException ioe) { - pkt = null; + pkt = null; } return pkt; @@ -170,7 +170,7 @@ public abstract class Event // Helper function for toPacket private static void _toData (DataOutputStream dos, Event event, - EventRequest request) + EventRequest request) throws IOException { dos.writeByte (event._eventKind); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/EventManager.java b/libjava/classpath/gnu/classpath/jdwp/event/EventManager.java index aa3d5d6292c..3f34a5ee90f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/EventManager.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/EventManager.java @@ -53,10 +53,10 @@ import java.util.Iterator; * Manages event requests and filters event notifications. * * The purpose of this class is actually two-fold: - * + * * 1) Maintain a list of event requests from the debugger * 2) Filter event notifications from the VM - * + * * If an event request arrives from the debugger, the back-end will * call {@link #requestEvent}, which will first check for a valid event. * If it is valid, EventManager will record the request @@ -65,7 +65,7 @@ import java.util.Iterator; * breakpoints and other execution-related events), or it may decide to * allow the EventManager to handle notifications and all * filtering (which is convenient for other events such as class (un)loading). - * + * * @author Keith Seitz (keiths@redhat.com) */ public class EventManager @@ -96,53 +96,53 @@ public class EventManager // Add lists for all the event types _requests.put (new Byte (EventRequest.EVENT_SINGLE_STEP), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_BREAKPOINT), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_FRAME_POP), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_EXCEPTION), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_USER_DEFINED), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_THREAD_START), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_THREAD_END), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_CLASS_PREPARE), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_CLASS_UNLOAD), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_CLASS_LOAD), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_FIELD_ACCESS), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_FIELD_MODIFY), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_METHOD_ENTRY), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_METHOD_EXIT), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_VM_INIT), - new Hashtable ()); + new Hashtable ()); _requests.put (new Byte (EventRequest.EVENT_VM_DEATH), - new Hashtable ()); + new Hashtable ()); // Add auto-generated event notifications // only two: VM_INIT, VM_DEATH try { - byte sp = (Jdwp.suspendOnStartup() - ? EventRequest.SUSPEND_THREAD : EventRequest.SUSPEND_NONE); - requestEvent (new EventRequest (0, - EventRequest.EVENT_VM_INIT, sp)); - requestEvent (new EventRequest (0, - EventRequest.EVENT_VM_DEATH, - EventRequest.SUSPEND_NONE)); + byte sp = (Jdwp.suspendOnStartup() + ? EventRequest.SUSPEND_THREAD : EventRequest.SUSPEND_NONE); + requestEvent (new EventRequest (0, + EventRequest.EVENT_VM_INIT, sp)); + requestEvent (new EventRequest (0, + EventRequest.EVENT_VM_DEATH, + EventRequest.SUSPEND_NONE)); } catch (JdwpException e) { - // This can't happen + // This can't happen } } @@ -163,8 +163,8 @@ public class EventManager requests = (Hashtable) _requests.get(kind); if (requests == null) { - // Did not get a valid event type - throw new IllegalArgumentException("invalid event kind: " + kind); + // Did not get a valid event type + throw new IllegalArgumentException("invalid event kind: " + kind); } // Loop through the requests. Must look at ALL requests in order @@ -172,9 +172,9 @@ public class EventManager Iterator rIter = requests.values().iterator(); while (rIter.hasNext()) { - EventRequest request = (EventRequest) rIter.next(); - if (request.matches(event)) - interestedEvents.add(request); + EventRequest request = (EventRequest) rIter.next(); + if (request.matches(event)) + interestedEvents.add(request); } EventRequest[] r = new EventRequest[interestedEvents.size()]; @@ -205,8 +205,8 @@ public class EventManager requests = (Hashtable) _requests.get (kind); if (requests == null) { - // Did not get a valid event type - throw new InvalidEventTypeException (request.getEventKind ()); + // Did not get a valid event type + throw new InvalidEventTypeException (request.getEventKind ()); } // Register the event with the VM @@ -229,16 +229,16 @@ public class EventManager requests = (Hashtable) _requests.get (new Byte (kind)); if (requests == null) { - // Did not get a valid event type - throw new IllegalArgumentException ("invalid event kind: " + kind); + // Did not get a valid event type + throw new IllegalArgumentException ("invalid event kind: " + kind); } Integer iid = new Integer (id); EventRequest request = (EventRequest) requests.get (iid); if (request != null) { - VMVirtualMachine.unregisterEvent (request); - requests.remove (iid); + VMVirtualMachine.unregisterEvent (request); + requests.remove (iid); } } @@ -255,8 +255,8 @@ public class EventManager Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); if (requests == null) { - // Did not get a valid event type - throw new IllegalArgumentException ("invalid event kind: " + kind); + // Did not get a valid event type + throw new IllegalArgumentException ("invalid event kind: " + kind); } VMVirtualMachine.clearEvents (kind); @@ -277,8 +277,8 @@ public class EventManager Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); if (requests == null) { - // Did not get a valid event type - throw new IllegalArgumentException ("invalid event kind: " + kind); + // Did not get a valid event type + throw new IllegalArgumentException ("invalid event kind: " + kind); } return (EventRequest) requests.get (new Integer (id)); @@ -296,10 +296,10 @@ public class EventManager Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); if (requests == null) { - // Did not get a valid event type - throw new IllegalArgumentException ("invalid event kind: " + kind); + // Did not get a valid event type + throw new IllegalArgumentException ("invalid event kind: " + kind); } - + return requests.values (); } } diff --git a/libjava/classpath/gnu/classpath/jdwp/event/EventRequest.java b/libjava/classpath/gnu/classpath/jdwp/event/EventRequest.java index 34637f6a2f9..891da229b41 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/EventRequest.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/EventRequest.java @@ -88,13 +88,13 @@ public class EventRequest /** * User-defined event */ - public static final byte EVENT_USER_DEFINED = + public static final byte EVENT_USER_DEFINED = JdwpConstants.EventKind.USER_DEFINED; /** * Thread start event */ - public static final byte EVENT_THREAD_START = + public static final byte EVENT_THREAD_START = JdwpConstants.EventKind.THREAD_START; /** @@ -142,7 +142,7 @@ public class EventRequest /** * Method exit event */ - public static final byte EVENT_METHOD_EXIT = + public static final byte EVENT_METHOD_EXIT = JdwpConstants.EventKind.METHOD_EXIT; /** @@ -165,7 +165,7 @@ public class EventRequest /** * Do not suspend any threads */ - public static final byte SUSPEND_NONE = + public static final byte SUSPEND_NONE = JdwpConstants.SuspendPolicy.NONE; /** @@ -207,7 +207,7 @@ public class EventRequest _filters = new LinkedList (); synchronized (_idLock) { - _id = ++_last_id; + _id = ++_last_id; } _kind = kind; _suspendPolicy = suspendPolicy; @@ -243,75 +243,75 @@ public class EventRequest Class clazz = filter.getClass (); if (clazz == ClassExcludeFilter.class) { - if (_kind == EVENT_THREAD_START - || _kind == EVENT_THREAD_END) - valid = false; + if (_kind == EVENT_THREAD_START + || _kind == EVENT_THREAD_END) + valid = false; } else if (clazz == ClassMatchFilter.class) { - if (_kind == EVENT_THREAD_START - || _kind == EVENT_THREAD_END) - valid = false; + if (_kind == EVENT_THREAD_START + || _kind == EVENT_THREAD_END) + valid = false; } else if (clazz == ClassOnlyFilter.class) { - if (_kind == EVENT_CLASS_UNLOAD - || _kind == EVENT_THREAD_START - || _kind == EVENT_THREAD_END) - valid = false; + if (_kind == EVENT_CLASS_UNLOAD + || _kind == EVENT_THREAD_START + || _kind == EVENT_THREAD_END) + valid = false; } else if (clazz == ConditionalFilter.class) { - // JDWP 1.4 does not say much about this + // JDWP 1.4 does not say much about this } else if (clazz == CountFilter.class) { - // may be used with any event + // may be used with any event } else if (clazz == ExceptionOnlyFilter.class) { - if (_kind != EVENT_EXCEPTION) - valid = false; + if (_kind != EVENT_EXCEPTION) + valid = false; } else if (clazz == FieldOnlyFilter.class) { - if (_kind != EVENT_FIELD_ACCESS - && _kind != EVENT_FIELD_MODIFY) - valid = false; + if (_kind != EVENT_FIELD_ACCESS + && _kind != EVENT_FIELD_MODIFY) + valid = false; } else if (clazz == InstanceOnlyFilter.class) { - if (_kind == EVENT_CLASS_PREPARE - || _kind == EVENT_CLASS_UNLOAD - || _kind == EVENT_THREAD_START - || _kind == EVENT_THREAD_END) - valid = false; + if (_kind == EVENT_CLASS_PREPARE + || _kind == EVENT_CLASS_UNLOAD + || _kind == EVENT_THREAD_START + || _kind == EVENT_THREAD_END) + valid = false; } else if (clazz == LocationOnlyFilter.class) { - if (_kind != EVENT_BREAKPOINT - && _kind != EVENT_FIELD_ACCESS - && _kind != EVENT_FIELD_MODIFY - && _kind != EVENT_SINGLE_STEP - && _kind != EVENT_EXCEPTION) - valid = false; + if (_kind != EVENT_BREAKPOINT + && _kind != EVENT_FIELD_ACCESS + && _kind != EVENT_FIELD_MODIFY + && _kind != EVENT_SINGLE_STEP + && _kind != EVENT_EXCEPTION) + valid = false; } else if (clazz == StepFilter.class) { - if (_kind != EVENT_SINGLE_STEP) - valid = false; + if (_kind != EVENT_SINGLE_STEP) + valid = false; } else if (clazz == ThreadOnlyFilter.class) { - if (_kind == EVENT_CLASS_UNLOAD) - valid = false; + if (_kind == EVENT_CLASS_UNLOAD) + valid = false; } if (!valid) { - String msg = ("cannot use " + filter.getClass ().getName () - + " with class unload events"); - throw new JdwpIllegalArgumentException (msg); + String msg = ("cannot use " + filter.getClass ().getName () + + " with class unload events"); + throw new JdwpIllegalArgumentException (msg); } // Add filter to list @@ -373,9 +373,9 @@ public class EventRequest Iterator iter = _filters.iterator (); while (iter.hasNext ()) { - IEventFilter filter = (IEventFilter) iter.next (); - if (!filter.matches (theEvent)) - matches = false; + IEventFilter filter = (IEventFilter) iter.next (); + if (!filter.matches (theEvent)) + matches = false; } return matches; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java index 1bb339969ec..e63f5df1274 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/ExceptionEvent.java @@ -50,7 +50,7 @@ import java.io.IOException; /** * Notification from the VM that an exception has occurred along with where it * occurred, and if and where it was caught. - * + * * @author Kyle Galloway (kgallowa@redhat.com) */ public class ExceptionEvent @@ -58,7 +58,7 @@ public class ExceptionEvent { //object instance private Object _instance; - + // the exception thrown private Throwable _exception; @@ -67,17 +67,17 @@ public class ExceptionEvent // the location where the exception was thrown private Location _location; - + //the location where the exception was caught private Location _catchLocation; - + //the class where the exeption was thrown private Class _klass; /** * Constructs a new ExceptionEvent where the exception was * caught. - * + * * @param exception the throwable object that generated the event * @param thread the thread where the exception occurred * @param location the location where the exception was thrown @@ -99,7 +99,7 @@ public class ExceptionEvent /** * Returns a specific filtering parameter for this event. Valid types are * thread, location, and catchLocation. - * + * * @param type the type of parameter desired * @returns the desired parameter or null */ @@ -123,11 +123,11 @@ public class ExceptionEvent return null; } - + /** * Sets the catchLocation, used for exceptions that are caught in different * stack frames from where they are thrown. - * + * * @param catchLoc the location of the catch */ public void setCatchLoc(Location catchLoc) @@ -137,11 +137,11 @@ public class ExceptionEvent /** * Writes the event to the given stream - * + * * @param outStream the output stream to write the event to * @throws IOException */ - protected void _writeData(DataOutputStream outStream) + protected void _writeData(DataOutputStream outStream) throws IOException { VMIdManager idm = VMIdManager.getDefault(); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java index 40c0516c716..1ec1a5d4b4f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/MethodEntryEvent.java @@ -48,7 +48,7 @@ import java.io.IOException; /** * Notification from the VM that that a method has been invoked - * + * * @author Kyle Galloway (kgallowa@redhat.com) */ public class MethodEntryEvent @@ -65,7 +65,7 @@ public class MethodEntryEvent /** * Constructs a new MethodEntryEvent - * + * * @param thread the thread where the exception occurred * @param location the location single stepped to * @param instance instance from which the method was called @@ -81,7 +81,7 @@ public class MethodEntryEvent /** * Returns a specific filtering parameter for this event. Valid types are * thread and location - * + * * @param type the type of parameter desired * @returns the desired parameter or null */ @@ -101,11 +101,11 @@ public class MethodEntryEvent /** * Writes the event to the given stream - * + * * @param outStream the output stream to write the event to * @throws IOException */ - protected void _writeData(DataOutputStream outStream) + protected void _writeData(DataOutputStream outStream) throws IOException { VMIdManager idm = VMIdManager.getDefault(); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java index ce03dd264e2..84c9099010d 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/MethodExitEvent.java @@ -48,7 +48,7 @@ import java.io.IOException; /** * Notification from the VM that that a method has returned - * + * * @author Kyle Galloway (kgallowa@redhat.com) */ public class MethodExitEvent @@ -65,7 +65,7 @@ public class MethodExitEvent /** * Constructs a new MethodExitEvent - * + * * @param thread the thread where the exception occurred * @param location the location single stepped to * @param instance the instance from which the method was called @@ -81,7 +81,7 @@ public class MethodExitEvent /** * Returns a specific filtering parameter for this event. Valid types are * thread and location - * + * * @param type the type of parameter desired * @returns the desired parameter or null */ @@ -99,11 +99,11 @@ public class MethodExitEvent /** * Writes the event to the given stream - * + * * @param outStream the output stream to write the event to * @throws IOException */ - protected void _writeData(DataOutputStream outStream) + protected void _writeData(DataOutputStream outStream) throws IOException { VMIdManager idm = VMIdManager.getDefault(); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java index cd69dd99d6b..40cf50c6542 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/SingleStepEvent.java @@ -51,7 +51,7 @@ import java.io.IOException; /** * Notification from the VM that a single step has compleated including the * thread and location stepped to - * + * * @author Kyle Galloway (kgallowa@redhat.com) */ public class SingleStepEvent @@ -68,7 +68,7 @@ public class SingleStepEvent /** * Constructs a new SingleStepEvent - * + * * @param thread the thread where the exception occurred * @param location the location single stepped to * @param instance the instance in which the single step occurred @@ -84,7 +84,7 @@ public class SingleStepEvent /** * Returns a specific filtering parameter for this event. Valid types are * thread and location - * + * * @param type the type of parameter desired * @returns the desired parameter or null */ @@ -104,11 +104,11 @@ public class SingleStepEvent /** * Writes the event to the given stream - * + * * @param outStream the output stream to write the event to * @throws IOException */ - protected void _writeData(DataOutputStream outStream) + protected void _writeData(DataOutputStream outStream) throws IOException { VMIdManager idm = VMIdManager.getDefault(); diff --git a/libjava/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java index c665428fb6a..a36015a82f5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java @@ -102,4 +102,3 @@ public class ThreadEndEvent tid.write (outStream); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java index a729bd47ec0..c197ecef415 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java @@ -46,7 +46,7 @@ import java.io.IOException; /** * Event notifying the debugger that the virtual machine has terminated. - * + * * @author Keith Seitz (keiths@redhat.com) */ public class VmDeathEvent diff --git a/libjava/classpath/gnu/classpath/jdwp/event/VmInitEvent.java b/libjava/classpath/gnu/classpath/jdwp/event/VmInitEvent.java index 1ed63b24799..8c1db4f337c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/VmInitEvent.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/VmInitEvent.java @@ -50,7 +50,7 @@ import java.io.IOException; * "Notification of initialization of a target VM. This event is * received before the main thread is started and before any application * code has been executed." -- JDWP 1.4.2 - * + * * @author Keith Seitz (keiths@redhat.com) */ public class VmInitEvent diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java index c8ec51c756b..5514f1b725f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassExcludeFilter.java @@ -43,7 +43,7 @@ import gnu.classpath.jdwp.event.Event; import gnu.classpath.jdwp.exception.InvalidStringException; /** - * An event filter which excludes events matching a + * An event filter which excludes events matching a * specified class pattern (exact match or start/end with "*"). * * @author Keith Seitz (keiths@redhat.com) diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java index a8984316957..edb84d7ef4c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java @@ -43,7 +43,7 @@ import gnu.classpath.jdwp.event.Event; import gnu.classpath.jdwp.exception.InvalidStringException; /** - * An event filter which includes events matching a + * An event filter which includes events matching a * specified class pattern (exact match or start/end with "*"). * * @author Keith Seitz (keiths@redhat.com) @@ -66,9 +66,9 @@ public class ClassMatchFilter int index = pattern.indexOf ('*'); if (index != -1 && index != 0 && index != (pattern.length () - 1)) { - // '*' must be first char or last char - throw new InvalidStringException ("pattern may be an exact match or " - + "start/end with \"*\""); + // '*' must be first char or last char + throw new InvalidStringException ("pattern may be an exact match or " + + "start/end with \"*\""); } _pattern = pattern; } @@ -93,18 +93,18 @@ public class ClassMatchFilter Object type = event.getParameter (Event.EVENT_CLASS); if (type != null) { - Class eventClass = (Class) type; - String name = eventClass.getName (); - - if (_pattern.startsWith ("*")) - return name.endsWith (_pattern.substring (1)); - else if (_pattern.endsWith ("*")) - { - int end = _pattern.length () - 1; - return name.startsWith (_pattern.substring (0, end)); - } - else - return name.matches (_pattern); + Class eventClass = (Class) type; + String name = eventClass.getName (); + + if (_pattern.startsWith ("*")) + return name.endsWith (_pattern.substring (1)); + else if (_pattern.endsWith ("*")) + { + int end = _pattern.length () - 1; + return name.startsWith (_pattern.substring (0, end)); + } + else + return name.matches (_pattern); } return false; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java index 455cac6c04c..d912cb5ef2f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java @@ -90,18 +90,18 @@ public class ClassOnlyFilter Object type = event.getParameter (Event.EVENT_CLASS); if (type != null) { - try - { - Class clazz = _id.getType (); - Class eventClass = (Class) type; - if (clazz.isAssignableFrom (eventClass)) - return true; - } - catch (InvalidClassException ice) - { - // class is no longer valid - return false; - } + try + { + Class clazz = _id.getType (); + Class eventClass = (Class) type; + if (clazz.isAssignableFrom (eventClass)) + return true; + } + catch (InvalidClassException ice) + { + // class is no longer valid + return false; + } } return false; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java index 8bb56ed78f7..d4687fa4e9d 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java @@ -46,7 +46,7 @@ import gnu.classpath.jdwp.id.ReferenceTypeId; /** * Restricts reported exceptions by their class and whether they are caught * or uncaught. - * + * * This modifier can be used with exception event kinds only. * * @author Keith Seitz (keiths@redhat.com) @@ -67,7 +67,7 @@ public class ExceptionOnlyFilter * @throws InvalidClassException if refid is invalid */ public ExceptionOnlyFilter (ReferenceTypeId refId, boolean caught, - boolean uncaught) + boolean uncaught) throws InvalidClassException { if (refId != null && refId.getReference().get() == null) @@ -88,10 +88,10 @@ public class ExceptionOnlyFilter return _refId; } - + /** * Does the given event match the filter? - * + * * @param event the Event to scrutinize */ public boolean matches(Event event) @@ -103,7 +103,7 @@ public class ExceptionOnlyFilter { try { - Class klass + Class klass = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS); classMatch = klass == _refId.getType(); } @@ -112,12 +112,12 @@ public class ExceptionOnlyFilter classMatch = false; } } - + // check against the caught and uncaught options - Boolean caught + Boolean caught = (Boolean) event.getParameter(Event.EVENT_EXCEPTION_CAUGHT); return classMatch && ((caught.booleanValue()) ? _caught : _uncaught); } - + } diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java index 20a9edf2237..47a80410199 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java @@ -46,7 +46,7 @@ import gnu.classpath.jdwp.id.ReferenceTypeId; /** * Restricts reported events to those that occur for a given field. - * + * * This modifier can be used with field access and field modification event * kinds only. * @@ -80,7 +80,7 @@ public class FieldOnlyFilter } /** - * Returns the class in which the field is declared + * Returns the class in which the field is declared * * @return the class's id */ diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java index bda5b27d6c1..45ab3c4288a 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java @@ -46,7 +46,7 @@ import gnu.classpath.jdwp.id.ObjectId; /** * Restricts reported events to those whose active 'this' object is the * given object. Match value is the null object for static methods. - * + * * This modifier can be used with any event kind except class prepare, * class unload, thread start, and thread end. Introduced in JDWP version 1.4. * @@ -92,8 +92,8 @@ public class InstanceOnlyFilter Object eventInstance = event.getParameter (Event.EVENT_INSTANCE); if (eventInstance != null) { - Object myInstance = _instance.getReference().get (); - return ((myInstance != null) && (myInstance == eventInstance)); + Object myInstance = _instance.getReference().get (); + return ((myInstance != null) && (myInstance == eventInstance)); } return false; diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/StepFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/StepFilter.java index fd412716c84..b620b7953d4 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/StepFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/StepFilter.java @@ -51,9 +51,9 @@ import gnu.classpath.jdwp.id.ThreadId; * This "filter" is not really a filter. It is simply a way to communicate * stepping information in a convenient way between the JDWP backend and * the virtual machine. - * + * * Consequently, this "filter" always matches. - * + * * @author Keith Seitz (keiths@redhat.com) */ public class StepFilter diff --git a/libjava/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java b/libjava/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java index bc1eab883d3..de9fb3ec6ff 100644 --- a/libjava/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java +++ b/libjava/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java @@ -91,9 +91,9 @@ public class ThreadOnlyFilter Object thread = event.getParameter (Event.EVENT_THREAD); if (thread != null) { - Thread eventThread = (Thread) thread; - Thread myThread = (Thread) _tid.getReference().get (); - return (eventThread == myThread); + Thread eventThread = (Thread) thread; + Thread myThread = (Thread) _tid.getReference().get (); + return (eventThread == myThread); } return false; diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassException.java index cd276be8c7a..de15000a4a2 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassException.java @@ -53,7 +53,7 @@ public class InvalidClassException public InvalidClassException (long id) { super (JdwpConstants.Error.INVALID_CLASS, - "invalid class id (" + id + ")"); + "invalid class id (" + id + ")"); } public InvalidClassException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java index 17bbfb34a34..ca91e6eb6eb 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidClassLoaderException.java @@ -52,7 +52,7 @@ public class InvalidClassLoaderException public InvalidClassLoaderException (long id) { super (JdwpConstants.Error.INVALID_CLASS_LOADER, - "invalid class loader (" + id + ")"); + "invalid class loader (" + id + ")"); } public InvalidClassLoaderException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java index e0402283ff9..17341ce1d65 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidEventTypeException.java @@ -53,7 +53,7 @@ public class InvalidEventTypeException public InvalidEventTypeException (byte kind) { super (JdwpConstants.Error.INVALID_EVENT_TYPE, - "invalid event type (" + kind + ")"); + "invalid event type (" + kind + ")"); } public InvalidEventTypeException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java index f088c73db1c..47470ab8ccb 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFieldException.java @@ -53,7 +53,7 @@ public class InvalidFieldException public InvalidFieldException (long id) { super (JdwpConstants.Error.INVALID_FIELDID, - "invalid field id (" + id + ")"); + "invalid field id (" + id + ")"); } public InvalidFieldException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFrameException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFrameException.java index 6d622a5e6f5..876c0a88c0c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFrameException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidFrameException.java @@ -52,8 +52,8 @@ public class InvalidFrameException { public InvalidFrameException(long id) { - super(JdwpConstants.Error.INVALID_FRAMEID, - "invalid frame id (" + id + ")"); + super(JdwpConstants.Error.INVALID_FRAMEID, + "invalid frame id (" + id + ")"); } public InvalidFrameException(String msg) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java index c67951fa2b3..e8cc78fac63 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidLocationException.java @@ -52,7 +52,7 @@ public class InvalidLocationException public InvalidLocationException (/*something*/) { super (JdwpConstants.Error.INVALID_LOCATION, - "invalid location (" + "something" + ")"); + "invalid location (" + "something" + ")"); } public InvalidLocationException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java index 3299915b8a5..83569f48122 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidMethodException.java @@ -53,7 +53,7 @@ public class InvalidMethodException public InvalidMethodException (long id) { super (JdwpConstants.Error.INVALID_METHODID, - "invalid method id (" + id + ")"); + "invalid method id (" + id + ")"); } public InvalidMethodException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java index 49e8ac1e56d..8b1a2802d58 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidObjectException.java @@ -53,7 +53,7 @@ public class InvalidObjectException public InvalidObjectException (long id) { super (JdwpConstants.Error.INVALID_OBJECT, - "invalid object id (" + id + ")"); + "invalid object id (" + id + ")"); } public InvalidObjectException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidSlotException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidSlotException.java index 1827edab9a6..bf6bc904d1f 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidSlotException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidSlotException.java @@ -42,7 +42,7 @@ package gnu.classpath.jdwp.exception; import gnu.classpath.jdwp.JdwpConstants; /** - * An exception thrown when an invalid Slot id is used by the debugger + * An exception thrown when an invalid Slot id is used by the debugger * (i.e. when trying to access a variable slot which doesn't exist). * * @author Kyle Galloway (kgallowa@redhat.com) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidStringException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidStringException.java index c84a960f163..b9864a6e650 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidStringException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidStringException.java @@ -52,13 +52,13 @@ public class InvalidStringException public InvalidStringException (String str) { super (JdwpConstants.Error.INVALID_STRING, - "invalid string (" + str + ")"); + "invalid string (" + str + ")"); } public InvalidStringException (long id) { super (JdwpConstants.Error.INVALID_STRING, - "invalid string id (" + id + ")"); + "invalid string id (" + id + ")"); } public InvalidStringException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java index 985b1a79109..9cebfba50db 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadException.java @@ -53,7 +53,7 @@ public class InvalidThreadException public InvalidThreadException (long id) { super (JdwpConstants.Error.INVALID_THREAD, - "invalid thread id (" + id + ")"); + "invalid thread id (" + id + ")"); } public InvalidThreadException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java index 8b05e0446d2..7d9e62252a4 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java @@ -53,7 +53,7 @@ public class InvalidThreadGroupException public InvalidThreadGroupException (long id) { super (JdwpConstants.Error.INVALID_THREAD_GROUP, - "invalid thread group id (" + id + ")"); + "invalid thread group id (" + id + ")"); } public InvalidThreadGroupException (Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/NativeMethodException.java b/libjava/classpath/gnu/classpath/jdwp/exception/NativeMethodException.java index ae1a696bea1..36c03c43109 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/NativeMethodException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/NativeMethodException.java @@ -53,7 +53,7 @@ public class NativeMethodException public NativeMethodException(long id) { super(JdwpConstants.Error.NATIVE_METHOD, - "invalid method id (" + id + ")"); + "invalid method id (" + id + ")"); } public NativeMethodException(Throwable t) diff --git a/libjava/classpath/gnu/classpath/jdwp/exception/NotImplementedException.java b/libjava/classpath/gnu/classpath/jdwp/exception/NotImplementedException.java index fba627ea274..a4ec7b224c8 100644 --- a/libjava/classpath/gnu/classpath/jdwp/exception/NotImplementedException.java +++ b/libjava/classpath/gnu/classpath/jdwp/exception/NotImplementedException.java @@ -53,6 +53,6 @@ public class NotImplementedException public NotImplementedException (String feature) { super (JdwpConstants.Error.NOT_IMPLEMENTED, - feature + " is not yet implemented"); + feature + " is not yet implemented"); } } diff --git a/libjava/classpath/gnu/classpath/jdwp/id/JdwpId.java b/libjava/classpath/gnu/classpath/jdwp/id/JdwpId.java index 61cc15d2ee7..6caaa3a0122 100644 --- a/libjava/classpath/gnu/classpath/jdwp/id/JdwpId.java +++ b/libjava/classpath/gnu/classpath/jdwp/id/JdwpId.java @@ -119,7 +119,7 @@ public abstract class JdwpId /** * Compares two object ids for equality. Two object ids * are equal if they point to the same type and contain to - * the same id number. + * the same id number. */ public boolean equals (JdwpId id) { diff --git a/libjava/classpath/gnu/classpath/jdwp/id/NullObjectId.java b/libjava/classpath/gnu/classpath/jdwp/id/NullObjectId.java index 0e7b5e39cd8..5dc9753b7a1 100644 --- a/libjava/classpath/gnu/classpath/jdwp/id/NullObjectId.java +++ b/libjava/classpath/gnu/classpath/jdwp/id/NullObjectId.java @@ -57,7 +57,7 @@ public class NullObjectId * The object class that this id represents */ public static final Class typeClass = NullObject.class; - + /** * Constructs a new NullObjectId */ diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java index 5f579050aa3..93c9d73e359 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ArrayReferenceCommandSet.java @@ -56,7 +56,7 @@ import java.nio.ByteBuffer; /** * A class representing the ArrayReference Command Set. - * + * * @author Aaron Luchko */ public class ArrayReferenceCommandSet diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java index b77c3a833a2..899bf2997aa 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ArrayTypeCommandSet.java @@ -1,6 +1,6 @@ /* ArrayTypeCommandSet.java -- class to implement the ArrayType Command Set Copyright (C) 2005 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ import java.nio.ByteBuffer; /** * A class representing the ArrayType Command Set. - * + * * @author Aaron Luchko */ public class ArrayTypeCommandSet diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java index cc591b17dd1..295410f6caa 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ClassLoaderReferenceCommandSet.java @@ -1,4 +1,4 @@ -/* ClassLoaderReferenceCommandSet.java -- class to implement the +/* ClassLoaderReferenceCommandSet.java -- class to implement the ClassLoaderReference Command Set Copyright (C) 2005 Free Software Foundation @@ -56,7 +56,7 @@ import java.util.Iterator; /** * A class representing the ClassLoaderReference Command Set. - * + * * @author Aaron Luchko */ public class ClassLoaderReferenceCommandSet diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java index cfec20bc7ce..b32dbc2e544 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ClassObjectReferenceCommandSet.java @@ -1,4 +1,4 @@ -/* ClassObjectReferenceCommandSet.java -- class to implement the +/* ClassObjectReferenceCommandSet.java -- class to implement the ClassObjectReference Command Set Copyright (C) 2005 Free Software Foundation @@ -52,7 +52,7 @@ import java.nio.ByteBuffer; /** * A class representing the ClassObjectReference Command Set. - * + * * @author Aaron Luchko */ public class ClassObjectReferenceCommandSet diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java index 500152ea661..ec496bfe9e4 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ClassTypeCommandSet.java @@ -61,7 +61,7 @@ import java.nio.ByteBuffer; /** * A class representing the ClassType Command Set. - * + * * @author Aaron Luchko */ public class ClassTypeCommandSet @@ -109,10 +109,10 @@ public class ClassTypeCommandSet Class superClazz = clazz.getSuperclass(); if (superClazz == null) { - os.writeLong(0L); + os.writeLong(0L); } else { - ReferenceTypeId clazzId = idMan.getReferenceTypeId(superClazz); - clazzId.write(os); + ReferenceTypeId clazzId = idMan.getReferenceTypeId(superClazz); + clazzId.write(os); } } @@ -198,8 +198,8 @@ public class ClassTypeCommandSet int invokeOpts = bb.getInt(); MethodResult mr = VMVirtualMachine.executeMethod(null, thread, - clazz, method, - values, invokeOpts); + clazz, method, + values, invokeOpts); return mr; } } diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/CommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/CommandSet.java index d3a27532b39..e1b71c10dfa 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/CommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/CommandSet.java @@ -61,7 +61,7 @@ public abstract class CommandSet /** * Runs the given command with the data in distr and writes the data for the * reply packet to ostr. - * + * * @param bb holds the data portion of the Command Packet * @param os data portion of the Reply Packet will be written here * @param command the command field of the Command Packet @@ -69,6 +69,6 @@ public abstract class CommandSet * @throws JdwpException command wasn't carried out successfully */ public abstract boolean runCommand(ByteBuffer bb, DataOutputStream os, - byte command) + byte command) throws JdwpException; } diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java index d7ebbc3a358..477a79d836b 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/EventRequestCommandSet.java @@ -1,7 +1,7 @@ /* EventRequestCommandSet.java -- class to implement the EventRequest Command Set Copyright (C) 2005, 2007 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -70,7 +70,7 @@ import java.nio.ByteBuffer; /** * A class representing the EventRequest Command Set. - * + * * @author Aaron Luchko */ public class EventRequestCommandSet @@ -93,7 +93,7 @@ public class EventRequestCommandSet executeClearAllBreakpoints(bb, os); break; default: - throw new NotImplementedException("Command " + command + + throw new NotImplementedException("Command " + command + " not found in EventRequest Reference Command Set."); } } @@ -116,24 +116,24 @@ public class EventRequestCommandSet switch (eventKind) { - case JdwpConstants.EventKind.FIELD_ACCESS: - if (!VMVirtualMachine.canWatchFieldAccess) - { - String msg = "watching field accesses is not supported"; - throw new NotImplementedException(msg); - } - break; + case JdwpConstants.EventKind.FIELD_ACCESS: + if (!VMVirtualMachine.canWatchFieldAccess) + { + String msg = "watching field accesses is not supported"; + throw new NotImplementedException(msg); + } + break; - case JdwpConstants.EventKind.FIELD_MODIFICATION: - if (!VMVirtualMachine.canWatchFieldModification) - { - String msg = "watching field modifications is not supported"; - throw new NotImplementedException(msg); - } - break; + case JdwpConstants.EventKind.FIELD_MODIFICATION: + if (!VMVirtualMachine.canWatchFieldModification) + { + String msg = "watching field modifications is not supported"; + throw new NotImplementedException(msg); + } + break; default: - // okay + // okay } EventRequest eventReq = new EventRequest(eventKind, suspendPolicy); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/FieldCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/FieldCommandSet.java index 090770038ad..d7bb64878bc 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/FieldCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/FieldCommandSet.java @@ -46,7 +46,7 @@ import java.nio.ByteBuffer; /** * A class representing the Field Command Set. - * + * * @author Aaron Luchko */ public class FieldCommandSet @@ -55,7 +55,7 @@ public class FieldCommandSet /** * There are no commands for this CommandSet at this time so we just throw a * NotImplementedException whenever it's called. - * + * * @throws JdwpException An exception will always be thrown */ public boolean runCommand(ByteBuffer bb, DataOutputStream os, byte command) diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java index 5b29182ecb6..74e2f4c4d4c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/InterfaceTypeCommandSet.java @@ -47,7 +47,7 @@ import java.nio.ByteBuffer; /** * A class representing the InterfaceType Command Set. - * + * * @author Aaron Luchko */ public class InterfaceTypeCommandSet @@ -56,7 +56,7 @@ public class InterfaceTypeCommandSet /** * There are no commands for this CommandSet at this time so we just throw a * NotImplementedException whenever it's called. - * + * * @throws JdwpException An exception will always be thrown */ public boolean runCommand(ByteBuffer bb, DataOutputStream os, byte command) diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/MethodCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/MethodCommandSet.java index 4d1bf709800..043be7cf00d 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/MethodCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/MethodCommandSet.java @@ -54,7 +54,7 @@ import java.nio.ByteBuffer; /** * A class representing the Method Command Set. - * + * * @author Aaron Luchko */ public class MethodCommandSet @@ -124,8 +124,8 @@ public class MethodCommandSet { if (!VMVirtualMachine.canGetBytecodes) { - String msg = "getting bytecodes is unsupported"; - throw new NotImplementedException(msg); + String msg = "getting bytecodes is unsupported"; + throw new NotImplementedException(msg); } ReferenceTypeId id = idMan.readReferenceTypeId(bb); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java index 1a70b9c091e..f6bf8a6564c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ObjectReferenceCommandSet.java @@ -60,7 +60,7 @@ import java.nio.ByteBuffer; /** * A class representing the ObjectReference Command Set. - * + * * @author Aaron Luchko */ public class ObjectReferenceCommandSet @@ -139,7 +139,7 @@ public class ObjectReferenceCommandSet { field.setAccessible(true); // Might be a private field Object value = field.get(obj); - Value val = ValueFactory.createFromObject(value, + Value val = ValueFactory.createFromObject(value, field.getType()); val.writeTagged(os); } @@ -191,8 +191,8 @@ public class ObjectReferenceCommandSet { if (!VMVirtualMachine.canGetMonitorInfo) { - String msg = "getting monitor info not supported"; - throw new NotImplementedException(msg); + String msg = "getting monitor info not supported"; + throw new NotImplementedException(msg); } ObjectId oid = idMan.readObjectId(bb); @@ -223,8 +223,8 @@ public class ObjectReferenceCommandSet int invokeOptions = bb.getInt(); MethodResult mr = VMVirtualMachine.executeMethod(obj, thread, - clazz, method, - values, invokeOptions); + clazz, method, + values, invokeOptions); Throwable exception = mr.getThrownException(); ObjectId eId = idMan.getObjectId(exception); mr.getReturnedValue().writeTagged(os); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java b/libjava/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java index 4df3f472875..c4818aed8c1 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/PacketProcessor.java @@ -67,10 +67,10 @@ public class PacketProcessor { // The connection to the debugger private JdwpConnection _connection; - + // Shutdown this thread? private boolean _shutdown; - + // A Mapping of the command set (Byte) to the specific CommandSet private CommandSet[] _sets; @@ -79,7 +79,7 @@ public class PacketProcessor // Output stream around _outputBytes private DataOutputStream _os; - + /** * Constructs a new PacketProcessor object * Connection must be validated before getting here! @@ -90,8 +90,8 @@ public class PacketProcessor { _connection = con; _shutdown = false; - - // MAXIMUM is the value of the largest command set we may receive + + // MAXIMUM is the value of the largest command set we may receive _sets = new CommandSet[JdwpConstants.CommandSet.MAXIMUM + 1]; _outputBytes = new ByteArrayOutputStream(); _os = new DataOutputStream (_outputBytes); @@ -130,7 +130,7 @@ public class PacketProcessor _sets[JdwpConstants.CommandSet.ClassObjectReference.CS_VALUE] = new ClassObjectReferenceCommandSet(); } - + /** * Main run routine for this thread. Will loop getting packets * from the connection and processing them. @@ -140,7 +140,7 @@ public class PacketProcessor // Notify initialization thread (gnu.classpath.jdwp.Jdwp) that // the PacketProcessor thread is ready. Jdwp.getDefault().subcomponentInitialized (); - + try { while (!_shutdown) @@ -156,7 +156,7 @@ public class PacketProcessor Jdwp.getDefault().shutdown(); return null; } - + /** * Shutdown the packet processor */ @@ -164,34 +164,34 @@ public class PacketProcessor { _shutdown = true; } - + // Helper function which actually does all the work of waiting // for a packet and getting it processed. private void _processOnePacket () throws IOException { JdwpPacket pkt = _connection.getPacket (); - + if (!(pkt instanceof JdwpCommandPacket)) { // We're not supposed to get these from the debugger! // Drop it on the floor return; } - + if (pkt != null) { JdwpCommandPacket commandPkt = (JdwpCommandPacket) pkt; JdwpReplyPacket reply = new JdwpReplyPacket(commandPkt); - + // Reset our output stream _outputBytes.reset(); - - // Create a ByteBuffer around the command packet + + // Create a ByteBuffer around the command packet ByteBuffer bb = ByteBuffer.wrap(commandPkt.getData()); byte command = commandPkt.getCommand(); byte commandSet = commandPkt.getCommandSet(); - + CommandSet set = null; try { @@ -200,7 +200,7 @@ public class PacketProcessor { set = _sets[commandPkt.getCommandSet()]; } - if (set != null) + if (set != null) { _shutdown = set.runCommand(bb, _os, command); reply.setData(_outputBytes.toByteArray()); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java index cde3fc24cac..3489588dfe5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ReferenceTypeCommandSet.java @@ -60,7 +60,7 @@ import java.nio.ByteBuffer; /** * A class representing the ReferenceType Command Set. - * + * * @author Aaron Luchko */ public class ReferenceTypeCommandSet @@ -219,7 +219,7 @@ public class ReferenceTypeCommandSet { field.setAccessible(true); // Might be a private field Object value = field.get(null); - Value val = ValueFactory.createFromObject(value, + Value val = ValueFactory.createFromObject(value, field.getType()); val.writeTagged(os); } @@ -306,8 +306,8 @@ public class ReferenceTypeCommandSet { if (!VMVirtualMachine.canGetSourceDebugExtension) { - String msg = "source debug extension is not supported"; - throw new NotImplementedException(msg); + String msg = "source debug extension is not supported"; + throw new NotImplementedException(msg); } ReferenceTypeId id = idMan.readReferenceTypeId(bb); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/StackFrameCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/StackFrameCommandSet.java index 2d90e8064ae..2b82e05ffa6 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/StackFrameCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/StackFrameCommandSet.java @@ -1,6 +1,6 @@ /* StackFrameCommandSet.java -- class to implement the StackFrame Command Set Copyright (C) 2005, 2007 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -56,7 +56,7 @@ import java.nio.ByteBuffer; /** * A class representing the StackFrame Command Set. - * + * * @author Aaron Luchko */ public class StackFrameCommandSet @@ -83,7 +83,7 @@ public class StackFrameCommandSet executePopFrames(bb, os); break; default: - throw new NotImplementedException("Command " + command + + throw new NotImplementedException("Command " + command + " not found in Stack Frame Command Set."); } } @@ -158,8 +158,8 @@ public class StackFrameCommandSet { if (!VMVirtualMachine.canPopFrames) { - String msg = "popping frames is unsupported"; - throw new NotImplementedException(msg); + String msg = "popping frames is unsupported"; + throw new NotImplementedException(msg); } ThreadId tid = (ThreadId) idMan.readObjectId(bb); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/StringReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/StringReferenceCommandSet.java index 13fde0ac732..6571bc8e270 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/StringReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/StringReferenceCommandSet.java @@ -1,7 +1,7 @@ /* StringReferenceCommandSet.java -- class to implement the StringReference Command Set Copyright (C) 2005 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ import java.nio.ByteBuffer; /** * A class representing the StringReference Command Set. - * + * * @author Aaron Luchko */ public class StringReferenceCommandSet diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java index 103199a2b6e..7682fa9bfbe 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ThreadGroupReferenceCommandSet.java @@ -1,7 +1,7 @@ -/* ThreadGroupReferenceCommandSet.java -- class to implement the +/* ThreadGroupReferenceCommandSet.java -- class to implement the ThreadGroupReference Command Set Copyright (C) 2005 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -52,7 +52,7 @@ import java.nio.ByteBuffer; /** * A class representing the ThreadGroupReference Command Set. - * + * * @author Aaron Luchko */ public class ThreadGroupReferenceCommandSet @@ -104,10 +104,10 @@ public class ThreadGroupReferenceCommandSet ThreadGroup group = (ThreadGroup) oid.getObject(); ThreadGroup parent = group.getParent(); if (parent == null) { - os.writeLong(0L); + os.writeLong(0L); } else { - ObjectId parentId = idMan.getObjectId(parent); - parentId.write(os); + ObjectId parentId = idMan.getObjectId(parent); + parentId.write(os); } } diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java index 6fbcf698f8f..2bbff44deb5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/ThreadReferenceCommandSet.java @@ -1,6 +1,6 @@ /* ThreadReferenceCommandSet.java -- class to implement the ThreadReference Command Set Copyright (C) 2005, 2007 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -57,7 +57,7 @@ import java.util.ArrayList; /** * A class representing the ThreadReference Command Set. - * + * * @author Aaron Luchko */ public class ThreadReferenceCommandSet @@ -107,7 +107,7 @@ public class ThreadReferenceCommandSet executeSuspendCount(bb, os); break; default: - throw new NotImplementedException("Command " + command + + throw new NotImplementedException("Command " + command + " not found in Thread Reference Command Set."); } } @@ -202,8 +202,8 @@ public class ThreadReferenceCommandSet { if (!VMVirtualMachine.canGetOwnedMonitorInfo) { - String msg = "getting owned monitors is not supported"; - throw new NotImplementedException(msg); + String msg = "getting owned monitors is not supported"; + throw new NotImplementedException(msg); } ThreadId tid = (ThreadId) idMan.readObjectId(bb); @@ -213,8 +213,8 @@ public class ThreadReferenceCommandSet os.write(monitors.length); for (int i = 0; i < monitors.length; ++i) { - ObjectId id = idMan.getObjectId(monitors[i]); - id.writeTagged(os); + ObjectId id = idMan.getObjectId(monitors[i]); + id.writeTagged(os); } } @@ -224,8 +224,8 @@ public class ThreadReferenceCommandSet { if (!VMVirtualMachine.canGetCurrentContendedMonitor) { - String msg = "getting current contended monitor is not supported"; - throw new NotImplementedException(msg); + String msg = "getting current contended monitor is not supported"; + throw new NotImplementedException(msg); } ThreadId tid = (ThreadId) idMan.readObjectId(bb); diff --git a/libjava/classpath/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java b/libjava/classpath/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java index b6e0cfeb8b3..c476a04e9b0 100644 --- a/libjava/classpath/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java +++ b/libjava/classpath/gnu/classpath/jdwp/processor/VirtualMachineCommandSet.java @@ -1,7 +1,7 @@ /* VirtualMachineCommandSet.java -- class to implement the VirtualMachine Command Set Copyright (C) 2005, 2006, 2007 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify @@ -60,7 +60,7 @@ import java.util.Properties; /** * A class representing the VirtualMachine Command Set. - * + * * @author Aaron Luchko */ public class VirtualMachineCommandSet @@ -103,7 +103,7 @@ public class VirtualMachineCommandSet executeResume(bb, os); break; case JdwpConstants.CommandSet.VirtualMachine.EXIT: - shutdown = true; + shutdown = true; executeExit(bb, os); break; case JdwpConstants.CommandSet.VirtualMachine.CREATE_STRING: @@ -321,7 +321,7 @@ public class VirtualMachineCommandSet { String string = JdwpString.readString(bb); ObjectId stringId = idMan.getObjectId(string); - + // Since this string isn't referenced anywhere we'll disable garbage // collection on it so it's still around when the debugger gets back to it. stringId.disableCollection(); @@ -404,8 +404,8 @@ public class VirtualMachineCommandSet os.writeBoolean(VMVirtualMachine.canSetDefaultStratum); for (int i = 15; i < CAPABILITIES_NEW_SIZE; i++) { - // Future capabilities (currently unused) - os.writeBoolean(false); + // Future capabilities (currently unused) + os.writeBoolean(false); } } @@ -414,8 +414,8 @@ public class VirtualMachineCommandSet { if (!VMVirtualMachine.canRedefineClasses) { - String msg = "redefinition of classes is not supported"; - throw new NotImplementedException(msg); + String msg = "redefinition of classes is not supported"; + throw new NotImplementedException(msg); } int classes = bb.getInt(); @@ -423,12 +423,12 @@ public class VirtualMachineCommandSet byte[][] bytecodes = new byte[classes][]; for (int i = 0; i < classes; ++i) { - ReferenceTypeId id = idMan.readReferenceTypeId(bb); - int classfile = bb.getInt(); - byte[] bytecode = new byte[classfile]; - bb.get(bytecode); - types[i] = id.getType(); - bytecodes[i] = bytecode; + ReferenceTypeId id = idMan.readReferenceTypeId(bb); + int classfile = bb.getInt(); + byte[] bytecode = new byte[classfile]; + bb.get(bytecode); + types[i] = id.getType(); + bytecodes[i] = bytecode; } VMVirtualMachine.redefineClasses (types, bytecodes); @@ -439,8 +439,8 @@ public class VirtualMachineCommandSet { if (!VMVirtualMachine.canSetDefaultStratum) { - String msg = "setting the default stratum is not supported"; - throw new NotImplementedException(msg); + String msg = "setting the default stratum is not supported"; + throw new NotImplementedException(msg); } String stratum = JdwpString.readString(bb); diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpCommandPacket.java b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpCommandPacket.java index e99159aad9b..c565ee77909 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpCommandPacket.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpCommandPacket.java @@ -74,7 +74,7 @@ public class JdwpCommandPacket extends JdwpPacket // Don't assign an id. This constructor is called by // JdwpPacket.fromBytes, and that will assign a packet id. } - + /** * Constructs a new JdwpCommandPacket * with the given command set and command @@ -109,7 +109,7 @@ public class JdwpCommandPacket extends JdwpPacket * Sets the command set */ public void setCommandSet (byte cs) - { + { _commandSet = cs; } diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java index 44158aa26ec..3c91f048e9c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpConnection.java @@ -60,7 +60,7 @@ import java.util.Arrays; *

    This class is also a thread that is responsible for pulling * packets off the wire and sticking them in a queue for packet * processing threads. - * + * * @author Keith Seitz (keiths@redhat.com) */ public class JdwpConnection @@ -68,7 +68,7 @@ public class JdwpConnection { // The JDWP handshake private static final byte[] _HANDSHAKE = {'J', 'D', 'W', 'P', '-', 'H', 'a', - 'n', 'd', 's', 'h', 'a', 'k', 'e'}; + 'n', 'd', 's', 'h', 'a', 'k', 'e'}; // Transport method private ITransport _transport; @@ -121,13 +121,13 @@ public class JdwpConnection // Do handshake try { - _inStream = new DataInputStream (_transport.getInputStream ()); - _outStream = new DataOutputStream (_transport.getOutputStream ()); - _doHandshake (); + _inStream = new DataInputStream (_transport.getInputStream ()); + _outStream = new DataOutputStream (_transport.getOutputStream ()); + _doHandshake (); } catch (IOException ioe) { - throw new TransportException (ioe); + throw new TransportException (ioe); } } @@ -147,13 +147,13 @@ public class JdwpConnection if (Arrays.equals (hshake, _HANDSHAKE)) { - // Send reply handshake - _outStream.write (_HANDSHAKE, 0, _HANDSHAKE.length); - return; + // Send reply handshake + _outStream.write (_HANDSHAKE, 0, _HANDSHAKE.length); + return; } else { - throw new IOException ("invalid JDWP handshake (\"" + hshake + "\")"); + throw new IOException ("invalid JDWP handshake (\"" + hshake + "\")"); } } @@ -171,25 +171,25 @@ public class JdwpConnection while (!_shutdown) { - try - { - _readOnePacket (); - } - catch (IOException ioe) - { - /* IOException can occur for two reasons: - 1. Lost connection with the other side - 2. Transport was shutdown - In either case, we make sure that all of the - back-end gets shutdown. */ - Jdwp.getDefault().shutdown (); - } - catch (Throwable t) - { - System.out.println ("JdwpConnection.run: caught an exception: " - + t); - // Just keep going - } + try + { + _readOnePacket (); + } + catch (IOException ioe) + { + /* IOException can occur for two reasons: + 1. Lost connection with the other side + 2. Transport was shutdown + In either case, we make sure that all of the + back-end gets shutdown. */ + Jdwp.getDefault().shutdown (); + } + catch (Throwable t) + { + System.out.println ("JdwpConnection.run: caught an exception: " + + t); + // Just keep going + } } } @@ -204,8 +204,8 @@ public class JdwpConnection int length = _inStream.readInt (); if (length < 11) { - throw new IOException ("JDWP packet length < 11 (" - + length + ")"); + throw new IOException ("JDWP packet length < 11 (" + + length + ")"); } data = new byte[length]; @@ -218,11 +218,11 @@ public class JdwpConnection JdwpPacket packet = JdwpPacket.fromBytes (data); if (packet != null) { - synchronized (_commandQueue) - { - _commandQueue.add (packet); - _commandQueue.notifyAll (); - } + synchronized (_commandQueue) + { + _commandQueue.add (packet); + _commandQueue.notifyAll (); + } } } @@ -236,21 +236,21 @@ public class JdwpConnection { synchronized (_commandQueue) { - while (_commandQueue.isEmpty ()) - { - try - { - _commandQueue.wait (); - } - catch (InterruptedException ie) - { - /* PacketProcessor is interrupted - when shutting down */ - return null; - } - } + while (_commandQueue.isEmpty ()) + { + try + { + _commandQueue.wait (); + } + catch (InterruptedException ie) + { + /* PacketProcessor is interrupted + when shutting down */ + return null; + } + } - return (JdwpPacket) _commandQueue.remove (0); + return (JdwpPacket) _commandQueue.remove (0); } } @@ -277,16 +277,16 @@ public class JdwpConnection * @throws IOException */ public void sendEvents(EventRequest[] requests, Event[] events, - byte suspendPolicy) + byte suspendPolicy) throws IOException { JdwpPacket pkt; synchronized (_bytes) { - _bytes.reset (); - pkt = Event.toPacket (_doStream, events, requests, suspendPolicy); - pkt.setData (_bytes.toByteArray ()); + _bytes.reset (); + pkt = Event.toPacket (_doStream, events, requests, suspendPolicy); + pkt.setData (_bytes.toByteArray ()); } sendPacket (pkt); @@ -299,9 +299,9 @@ public class JdwpConnection { if (!_shutdown) { - _transport.shutdown (); - _shutdown = true; - interrupt (); + _transport.shutdown (); + _shutdown = true; + interrupt (); } } } diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpPacket.java b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpPacket.java index a3afe842167..b967d9bc505 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpPacket.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpPacket.java @@ -113,7 +113,7 @@ public abstract class JdwpPacket * Returns the packet id */ public int getId () - { + { return _id; } @@ -121,7 +121,7 @@ public abstract class JdwpPacket * Sets the packet id */ public void setId (int id) - { + { _id = id; } @@ -129,7 +129,7 @@ public abstract class JdwpPacket * Returns the packet flags */ public byte getFlags () - { + { return _flags; } @@ -137,7 +137,7 @@ public abstract class JdwpPacket * Sets the packet flags */ public void setFlags (byte flags) - { + { _flags = flags; } @@ -145,7 +145,7 @@ public abstract class JdwpPacket * Gets the command/reply-specific data in this packet */ public byte[] getData () - { + { return _data; } @@ -153,7 +153,7 @@ public abstract class JdwpPacket * Sets the command/reply-specific data in this packet */ public void setData (byte[] data) - { + { _data = data; } @@ -161,13 +161,13 @@ public abstract class JdwpPacket * Returns the length of this entire packet */ public int getLength () - { + { return MINIMUM_SIZE + (_data == null ? 0 : _data.length); } /** * Allow subclasses to initialize from data - * + * * @param bytes packet data from the wire * @param index index into bytes to start processing * @return number of bytes in bytes processed @@ -181,7 +181,7 @@ public abstract class JdwpPacket * * If the given data does not represent a valid JDWP packet, it returns * null. - * + * * @param bytes packet data from the wire * @return number of bytes in bytes processed */ @@ -195,48 +195,48 @@ public abstract class JdwpPacket if (bytes.length == length) { - id = ((bytes[i++] & 0xff) << 24 | (bytes[i++] & 0xff) << 16 + id = ((bytes[i++] & 0xff) << 24 | (bytes[i++] & 0xff) << 16 | (bytes[i++] & 0xff) << 8 | (bytes[i++] & 0xff)); - flags = bytes[i++]; + flags = bytes[i++]; - Class clazz = null; - if (flags == 0) - clazz = JdwpCommandPacket.class; - else if ((flags & JDWP_FLAG_REPLY) != 0) - clazz = JdwpReplyPacket.class; - else - { - // Malformed packet. Discard it. - return null; - } + Class clazz = null; + if (flags == 0) + clazz = JdwpCommandPacket.class; + else if ((flags & JDWP_FLAG_REPLY) != 0) + clazz = JdwpReplyPacket.class; + else + { + // Malformed packet. Discard it. + return null; + } - JdwpPacket pkt = null; - try - { - pkt = (JdwpPacket) clazz.newInstance (); - } - catch (InstantiationException ie) - { - // Discard packet - return null; - } - catch (IllegalAccessException iae) - { - // Discard packet - return null; - } + JdwpPacket pkt = null; + try + { + pkt = (JdwpPacket) clazz.newInstance (); + } + catch (InstantiationException ie) + { + // Discard packet + return null; + } + catch (IllegalAccessException iae) + { + // Discard packet + return null; + } - pkt.setId (id); - pkt.setFlags (flags); + pkt.setId (id); + pkt.setFlags (flags); - i += pkt.myFromBytes (bytes, i); - byte[] data = new byte[length - i]; - System.arraycopy (bytes, i, data, 0, data.length); - pkt.setData (data); + i += pkt.myFromBytes (bytes, i); + byte[] data = new byte[length - i]; + System.arraycopy (bytes, i, data, 0, data.length); + pkt.setData (data); - return pkt; + return pkt; } - + return null; } diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpReplyPacket.java b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpReplyPacket.java index d060dec995f..a8dc9978e5b 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/JdwpReplyPacket.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/JdwpReplyPacket.java @@ -124,7 +124,7 @@ public class JdwpReplyPacket extends JdwpPacket { int i = 0; setErrorCode ((short) ((bytes[index + i++] & 0xff) << 8 - | (bytes[index + i++] & 0xff))); + | (bytes[index + i++] & 0xff))); return i; } diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/SocketTransport.java b/libjava/classpath/gnu/classpath/jdwp/transport/SocketTransport.java index 3b0a8e7fe12..4872ba17645 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/SocketTransport.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/SocketTransport.java @@ -76,7 +76,7 @@ class SocketTransport // Host name private String _host; - + // Are we acting as a server? private boolean _server = false; @@ -96,29 +96,29 @@ class SocketTransport String p = (String) properties.get(_PROPERTY_SERVER); if (p != null) { - if (p.toLowerCase().equals("y")) - _server = true; + if (p.toLowerCase().equals("y")) + _server = true; } // Get address [form: "hostname:port"] p = (String) properties.get(_PROPERTY_ADDRESS); if (p != null) { - String[] s = p.split(":"); - if (s.length == 1) - { - // Port number only. Assume "localhost" - _port = Integer.parseInt(s[0]); - _host = "localhost"; - } - else - { - if (s[0].length() == 0) - _host = "localhost"; - else - _host = s[0]; - _port = Integer.parseInt(s[1]); - } + String[] s = p.split(":"); + if (s.length == 1) + { + // Port number only. Assume "localhost" + _port = Integer.parseInt(s[0]); + _host = "localhost"; + } + else + { + if (s[0].length() == 0) + _host = "localhost"; + else + _host = s[0]; + _port = Integer.parseInt(s[1]); + } } } @@ -133,24 +133,24 @@ class SocketTransport { try { - if (_server) - { - // Get a server socket - ServerSocketFactory ssf = ServerSocketFactory.getDefault (); - ServerSocket ss = ssf.createServerSocket (_port, 1); - _socket = ss.accept (); - } - else - { - // Get a client socket (the factory will connect it) - SocketFactory sf = SocketFactory.getDefault (); - _socket = sf.createSocket (_host, _port); - } + if (_server) + { + // Get a server socket + ServerSocketFactory ssf = ServerSocketFactory.getDefault (); + ServerSocket ss = ssf.createServerSocket (_port, 1); + _socket = ss.accept (); + } + else + { + // Get a client socket (the factory will connect it) + SocketFactory sf = SocketFactory.getDefault (); + _socket = sf.createSocket (_host, _port); + } } catch (IOException ioe) { - // This will grab UnknownHostException, too. - throw new TransportException (ioe); + // This will grab UnknownHostException, too. + throw new TransportException (ioe); } } @@ -162,11 +162,11 @@ class SocketTransport { try { - _socket.close (); + _socket.close (); } catch (Throwable t) { - // We don't really care about errors at this point + // We don't really care about errors at this point } } diff --git a/libjava/classpath/gnu/classpath/jdwp/transport/TransportFactory.java b/libjava/classpath/gnu/classpath/jdwp/transport/TransportFactory.java index 480fb362939..681967b7712 100644 --- a/libjava/classpath/gnu/classpath/jdwp/transport/TransportFactory.java +++ b/libjava/classpath/gnu/classpath/jdwp/transport/TransportFactory.java @@ -90,24 +90,24 @@ public class TransportFactory for (int i = 0; i < _transportMethods.length; ++i) { - if (_transportMethods[i].name.equals (name)) - { - try - { - ITransport t; - t = (ITransport) _transportMethods[i].clazz.newInstance (); - t.configure (properties); - return t; - } - catch (TransportException te) - { - throw te; - } - catch (Exception e) - { - throw new TransportException (e); - } - } + if (_transportMethods[i].name.equals (name)) + { + try + { + ITransport t; + t = (ITransport) _transportMethods[i].clazz.newInstance (); + t.configure (properties); + return t; + } + catch (TransportException te) + { + throw te; + } + catch (Exception e) + { + throw new TransportException (e); + } + } } throw new TransportException ("transport \"" + name + "\" not found"); diff --git a/libjava/classpath/gnu/classpath/jdwp/util/JdwpString.java b/libjava/classpath/gnu/classpath/jdwp/util/JdwpString.java index e94700fe1ed..eca7060fd29 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/JdwpString.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/JdwpString.java @@ -1,13 +1,13 @@ /* JdwpString.java -- utility class to read and write jdwp strings Copyright (C) 2005 Free Software Foundation - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,7 +46,7 @@ import java.nio.ByteBuffer; /** * A class to compute the JDWP representation of Strings. - * + * * @author Aaron Luchko */ public class JdwpString @@ -54,7 +54,7 @@ public class JdwpString /** * Write this String to the outStream as a string understood by jdwp. - * + * * @param os write the String here * @param string the String to write * @throws IOException @@ -70,7 +70,7 @@ public class JdwpString /** * Read a jdwp style string from the ByteBuffer. - * + * * @param bb contains the string * @return the String that was read * @throws JdwpInternalErrorException bb didn't contain a value UTF-8 string diff --git a/libjava/classpath/gnu/classpath/jdwp/util/LineTable.java b/libjava/classpath/gnu/classpath/jdwp/util/LineTable.java index 7078b17dbfe..2307fa27e6e 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/LineTable.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/LineTable.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * A class representing a Line Table for a method. - * + * * @author Aaron Luchko */ public class LineTable @@ -57,7 +57,7 @@ public class LineTable /** * Construct a line table with the given parameters. - * + * * @param start lowest code index for method, -1 if native * @param end highest code index for method, -1 if native * @param lineNum line numbers for in line tables @@ -73,10 +73,10 @@ public class LineTable this.lineNum = lineNum; this.lineCI = lineCI; } - + /** * Writes this line table to the given DataOutputStream. - * + * * @param os the stream to write it to * @throws IOException */ diff --git a/libjava/classpath/gnu/classpath/jdwp/util/Location.java b/libjava/classpath/gnu/classpath/jdwp/util/Location.java index ff045a5eccc..6d8c2e7b999 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/Location.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/Location.java @@ -49,7 +49,7 @@ import java.nio.ByteBuffer; /** * A class to read/write JDWP locations. - * + * * @author Aaron Luchko */ public class Location @@ -59,7 +59,7 @@ public class Location /** * Create a location with the given parameters. - * + * * @param method the method * @param index location in the method */ @@ -72,7 +72,7 @@ public class Location /** * Read a location from the given bytebuffer, consists of a TAG (byte), * followed by a ReferenceTypeId, a MethodId and an index (long). - * + * * @param bb this holds the location * @throws IOException when an error occurs reading from the buffer * @throws JdwpException for invalid class or method IDs @@ -81,7 +81,7 @@ public class Location throws IOException, JdwpException { byte tag = bb.get(); - ClassReferenceTypeId classId = + ClassReferenceTypeId classId = (ClassReferenceTypeId) VMIdManager.getDefault().readReferenceTypeId(bb); Class klass = classId.getType(); method = VMMethod.readId(klass, bb); @@ -90,19 +90,19 @@ public class Location /** * Write the given location to an output stream. - * + * * @param os stream to write to * @throws IOException when an error occurs writing to the stream */ - public void write(DataOutputStream os) + public void write(DataOutputStream os) throws IOException { // check if this is an empty location if (method != null) { VMIdManager idm = VMIdManager.getDefault(); - ClassReferenceTypeId crti = - (ClassReferenceTypeId) + ClassReferenceTypeId crti = + (ClassReferenceTypeId) idm.getReferenceTypeId(method.getDeclaringClass()); crti.writeTagged(os); @@ -117,20 +117,20 @@ public class Location os.writeLong((long) 0); } } - + /** * Sets up an empty location - * + * * @return new Location (setup as empty) */ public static Location getEmptyLocation() { return new Location(null, 0); } - + /** * Gets the method of this location - * + * * @return the method */ public VMMethod getMethod() @@ -140,7 +140,7 @@ public class Location /** * Gets the code index of this location - * + * * @return the code index */ public long getIndex () @@ -158,9 +158,9 @@ public class Location { if (obj instanceof Location) { - Location l = (Location) obj; - return (getMethod().equals(l.getMethod()) - && getIndex() == l.getIndex()); + Location l = (Location) obj; + return (getMethod().equals(l.getMethod()) + && getIndex() == l.getIndex()); } return false; diff --git a/libjava/classpath/gnu/classpath/jdwp/util/MethodResult.java b/libjava/classpath/gnu/classpath/jdwp/util/MethodResult.java index bf3ee8ed548..76d8828f6cd 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/MethodResult.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/MethodResult.java @@ -1,5 +1,5 @@ /* MethodResult.java -- class to wrap around values returned from a Method call - in the VM + in the VM Copyright (C) 2005, 2007 Free Software Foundation This file is part of GNU Classpath. @@ -44,17 +44,17 @@ import gnu.classpath.jdwp.value.Value; /** * A class to wrap around values returned from a Method call in the VM. - * + * * @author Aaron Luchko */ public class MethodResult { // The Object returned by the executing method private Value returnedValue; - + // Any Exception that was thrown by the executing method private Throwable thrownException; - + /** * Constructs a new MethodResult object * diff --git a/libjava/classpath/gnu/classpath/jdwp/util/MonitorInfo.java b/libjava/classpath/gnu/classpath/jdwp/util/MonitorInfo.java index f28eabf834e..34c098da2b3 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/MonitorInfo.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/MonitorInfo.java @@ -69,8 +69,8 @@ public class MonitorInfo os.write(waiters.length); for (int i = 0; i < waiters.length; ++i) { - id = idm.getObjectId(waiters[i]); - id.write(os); + id = idm.getObjectId(waiters[i]); + id.write(os); } } } diff --git a/libjava/classpath/gnu/classpath/jdwp/util/Signature.java b/libjava/classpath/gnu/classpath/jdwp/util/Signature.java index e7453bf0174..3d192e89719 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/Signature.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/Signature.java @@ -89,17 +89,17 @@ public class Signature public static String computeMethodSignature (Method method) { return _computeSignature (method.getReturnType (), - method.getParameterTypes ()); + method.getParameterTypes ()); } private static String _computeSignature (Class returnType, - Class[] paramTypes) + Class[] paramTypes) { CPStringBuilder sb = new CPStringBuilder ("("); if (paramTypes != null) { - for (int i = 0; i < paramTypes.length; ++i) - _addToSignature (sb, paramTypes[i]); + for (int i = 0; i < paramTypes.length; ++i) + _addToSignature (sb, paramTypes[i]); } sb.append (")"); _addToSignature (sb, returnType); @@ -132,7 +132,7 @@ public class Signature sb.append('J'); return; } - + String name = k.getName (); int len = name.length (); sb.ensureCapacity (len); @@ -140,10 +140,10 @@ public class Signature sb.append('L'); for (int i = 0; i < len; ++i) { - char c = name.charAt (i); - if (c == '.') - c = '/'; - sb.append (c); + char c = name.charAt (i); + if (c == '.') + c = '/'; + sb.append (c); } if (! k.isArray ()) sb.append(';'); diff --git a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java index 9732422f57e..8cbb299c2e6 100644 --- a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java +++ b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * A class representing a Variable Table for a method. - * + * * @author Aaron Luchko */ public class VariableTable @@ -66,7 +66,7 @@ public class VariableTable /** * Make a new variable table with the given values. - * + * * @param argCnt number of words used by arguments in this frame * @param slots number of variables * @param lineCI first code index of given variable (size slots) @@ -89,7 +89,7 @@ public class VariableTable /** * Writes this line table to the given DataOutputStream. - * + * * @param os the stream to write it to * @throws IOException */ diff --git a/libjava/classpath/gnu/classpath/jdwp/value/ArrayValue.java b/libjava/classpath/gnu/classpath/jdwp/value/ArrayValue.java index 66e7c4e32b4..69b1ebd2a83 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/ArrayValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/ArrayValue.java @@ -46,7 +46,7 @@ import java.io.IOException; /** * Wrapper for an Array value. - * + * * @author Kyle Galloway */ public class ArrayValue @@ -57,7 +57,7 @@ public class ArrayValue /** * Create a new ArrayValue from an Object - * + * * @param value the Object to wrap */ public ArrayValue(Object value) @@ -65,10 +65,10 @@ public class ArrayValue super(JdwpConstants.Tag.ARRAY); _value = value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -79,7 +79,7 @@ public class ArrayValue /** * Write the wrapped object to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override diff --git a/libjava/classpath/gnu/classpath/jdwp/value/BooleanValue.java b/libjava/classpath/gnu/classpath/jdwp/value/BooleanValue.java index 42bb806fadb..1ae5b4dee04 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/BooleanValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/BooleanValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an boolean value. - * + * * @author Kyle Galloway */ public final class BooleanValue @@ -55,7 +55,7 @@ public final class BooleanValue /** * Create a new BooleanValue from an boolean - * + * * @param value the boolean to wrap */ public BooleanValue(boolean value) @@ -63,20 +63,20 @@ public final class BooleanValue super(JdwpConstants.Tag.BOOLEAN); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public boolean getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class BooleanValue /** * Write the wrapped boolean to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class BooleanValue os.writeBoolean(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/ByteValue.java b/libjava/classpath/gnu/classpath/jdwp/value/ByteValue.java index 204fe86b0e8..64de0dc88d5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/ByteValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/ByteValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an byte value. - * + * * @author Kyle Galloway */ public final class ByteValue @@ -55,7 +55,7 @@ public final class ByteValue /** * Create a new ByteValue from an byte - * + * * @param value the byte to wrap */ public ByteValue(byte value) @@ -63,20 +63,20 @@ public final class ByteValue super(JdwpConstants.Tag.BYTE); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public byte getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class ByteValue /** * Write the wrapped byte to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override diff --git a/libjava/classpath/gnu/classpath/jdwp/value/CharValue.java b/libjava/classpath/gnu/classpath/jdwp/value/CharValue.java index f68fc88d156..3781065a6c2 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/CharValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/CharValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an char value. - * + * * @author Kyle Galloway */ public final class CharValue @@ -55,7 +55,7 @@ public final class CharValue /** * Create a new CharValue from an char - * + * * @param value the char to wrap */ public CharValue(char value) @@ -63,20 +63,20 @@ public final class CharValue super(JdwpConstants.Tag.CHAR); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public char getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class CharValue /** * Write the wrapped char to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class CharValue os.writeChar(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/DoubleValue.java b/libjava/classpath/gnu/classpath/jdwp/value/DoubleValue.java index 45923c4dac4..1c9a8714dcf 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/DoubleValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/DoubleValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an double value. - * + * * @author Kyle Galloway */ public final class DoubleValue @@ -55,7 +55,7 @@ public final class DoubleValue /** * Create a new DoubleValue from an double - * + * * @param value the double to wrap */ public DoubleValue(double value) @@ -63,20 +63,20 @@ public final class DoubleValue super(JdwpConstants.Tag.DOUBLE); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public double getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class DoubleValue /** * Write the wrapped double to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class DoubleValue os.writeDouble(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/FloatValue.java b/libjava/classpath/gnu/classpath/jdwp/value/FloatValue.java index 970f77c07b4..ffd79f66017 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/FloatValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/FloatValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an float value. - * + * * @author Kyle Galloway */ public final class FloatValue @@ -55,7 +55,7 @@ public final class FloatValue /** * Create a new FloatValue from an float - * + * * @param value the float to wrap */ public FloatValue(float value) @@ -63,20 +63,20 @@ public final class FloatValue super(JdwpConstants.Tag.FLOAT); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public float getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class FloatValue /** * Write the wrapped float to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class FloatValue os.writeFloat(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/IntValue.java b/libjava/classpath/gnu/classpath/jdwp/value/IntValue.java index 27868754f7f..b1a07fd1e57 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/IntValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/IntValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an int value. - * + * * @author Kyle Galloway */ public final class IntValue @@ -55,7 +55,7 @@ public final class IntValue /** * Create a new IntValue from an int - * + * * @param value the int to wrap */ public IntValue(int value) @@ -63,20 +63,20 @@ public final class IntValue super(JdwpConstants.Tag.INT); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public int getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class IntValue /** * Write the wrapped int to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class IntValue os.writeInt(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/LongValue.java b/libjava/classpath/gnu/classpath/jdwp/value/LongValue.java index 0ebe0e9f98a..7483117080c 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/LongValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/LongValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an long value. - * + * * @author Kyle Galloway */ public final class LongValue @@ -55,7 +55,7 @@ public final class LongValue /** * Create a new LongValue from an long - * + * * @param value the long to wrap */ public LongValue(long value) @@ -63,20 +63,20 @@ public final class LongValue super(JdwpConstants.Tag.LONG); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public long getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class LongValue /** * Write the wrapped long to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class LongValue os.writeLong(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/ObjectValue.java b/libjava/classpath/gnu/classpath/jdwp/value/ObjectValue.java index b5cdb1f9e53..d7dc7dae9bb 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/ObjectValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/ObjectValue.java @@ -46,7 +46,7 @@ import java.io.IOException; /** * Wrapper for an Object value. - * + * * @author Kyle Galloway */ public final class ObjectValue @@ -57,7 +57,7 @@ public final class ObjectValue /** * Create a new ObjectValue from an Object - * + * * @param value the Object to wrap */ public ObjectValue(Object value) @@ -65,10 +65,10 @@ public final class ObjectValue super(JdwpConstants.Tag.OBJECT); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public Object getValue() @@ -78,7 +78,7 @@ public final class ObjectValue /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -89,7 +89,7 @@ public final class ObjectValue /** * Write the wrapped object to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override diff --git a/libjava/classpath/gnu/classpath/jdwp/value/ShortValue.java b/libjava/classpath/gnu/classpath/jdwp/value/ShortValue.java index cbde2269e6c..16fae4759c5 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/ShortValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/ShortValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an short value. - * + * * @author Kyle Galloway */ public final class ShortValue @@ -55,7 +55,7 @@ public final class ShortValue /** * Create a new ShortValue from a short - * + * * @param value the short to wrap */ public ShortValue(short value) @@ -63,20 +63,20 @@ public final class ShortValue super(JdwpConstants.Tag.SHORT); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public short getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -87,7 +87,7 @@ public final class ShortValue /** * Write the wrapped short to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override @@ -97,4 +97,3 @@ public final class ShortValue os.writeShort(_value); } } - diff --git a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java index 1a7d0328d56..f64661f9f59 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java @@ -46,7 +46,7 @@ import java.io.IOException; /** * Wrapper for an String value. - * + * * @author Kyle Galloway */ public final class StringValue @@ -57,7 +57,7 @@ public final class StringValue /** * Create a new StringValue from an String - * + * * @param value the String to wrap */ public StringValue(String value) @@ -65,20 +65,20 @@ public final class StringValue super(JdwpConstants.Tag.STRING); _value = value; } - + /** * Get the value held in this Value - * + * * @return the value represented by this Value object */ public String getValue() { return _value; } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -89,7 +89,7 @@ public final class StringValue /** * Write the wrapped object to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override diff --git a/libjava/classpath/gnu/classpath/jdwp/value/Value.java b/libjava/classpath/gnu/classpath/jdwp/value/Value.java index 4ad8bec0703..39f1c9cce33 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/Value.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/Value.java @@ -49,50 +49,50 @@ import java.nio.ByteBuffer; /** * Superclass for all JDWP Values. - * + * * @author Kyle Galloway */ public abstract class Value { // A Tag representing the type of this value private byte _tag; - + /** * Create a new value of type tag. - * + * * @param tag the type of the value - */ + */ protected Value(byte tag) { _tag = tag; } - + /** * Get the tag for this Value - * + * * @return the byte tag of this Value */ public byte getTag() { return _tag; } - + /** - * Calls the dervied classes writeValue method to write its value to the + * Calls the dervied classes writeValue method to write its value to the * DataOutputStream. - * + * * @param os write the value here * @throws IOException - */ + */ public void writeUntagged(DataOutputStream os) throws IOException { write(os); } - + /** * Will write the given object as a tagged value to the DataOutputStream. - * + * * @param os write the value here * @param obj the Object to write * @throws IOException @@ -103,27 +103,27 @@ public abstract class Value os.write (_tag); write(os); } - + /** * This method must write the value to the DataOutputStream in a manner * appropriate for the type of the value. - * + * * @param os DataOutputStream to write to * @throws IOException */ protected abstract void write(DataOutputStream os) throws IOException; - + /** * Returns an object representing this type - * + * * @return an Object represntation of this value */ protected abstract Object getObject(); - + /** * Get an untagged object from the ByteBuffer - * + * * @param bb the ByteBuffer to extract the value from * @param type a Class representing the type * @return an Object from the ByteBuffer of the type of the Class parameter @@ -136,10 +136,10 @@ public abstract class Value Value val = ValueFactory.createFromUntagged(bb, type); return val.getObject(); } - + /** * Get an untagged object from the ByteBuffer - * + * * @param bb the ByteBuffer to extract the value from * @param tag a byte tag representing the type * @return an Object from the ByteBuffer of the type of the Class parameter diff --git a/libjava/classpath/gnu/classpath/jdwp/value/ValueFactory.java b/libjava/classpath/gnu/classpath/jdwp/value/ValueFactory.java index 8f1a8780eeb..ee7ddfae198 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/ValueFactory.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/ValueFactory.java @@ -50,7 +50,7 @@ import java.nio.ByteBuffer; /** * A factory to create JDWP Values. - * + * * @author Kyle Galloway */ public class ValueFactory @@ -58,7 +58,7 @@ public class ValueFactory /** * Creates a new Value of appropriate type for the value in the ByteBuffer * by reading the tag byte from the front of the buffer. - * + * * @param bb contains the Object * @return A new Value of appropriate type * @throws JdwpInternalErrorException @@ -69,11 +69,11 @@ public class ValueFactory { return create(bb, bb.get()); } - + /** * Creates a new Value of appropriate type for the value in the ByteBuffer * by checking the type of the Class passed in. - * + * * @param bb contains the Object * @param type a Class representing the type of the value in the ByteBuffer * @return A new Value of appropriate type @@ -84,7 +84,7 @@ public class ValueFactory throws JdwpInternalErrorException, InvalidObjectException, InvalidClassException { byte tag = getTagForClass(type); - + try { return create(bb, tag); @@ -94,10 +94,10 @@ public class ValueFactory throw new InvalidClassException(ite); } } - + /** * Creates a new Value of appropriate type for the value in the ByteBuffer. - * + * * @param bb contains the Object * @param tag a byte representing the type of the object * @return A new Value of appropriate type @@ -152,13 +152,13 @@ public class ValueFactory default: throw new InvalidTagException(tag); } - + return val; } - + /** * Creates a tag for the type of the class. - * + * * @param klass the type to get a tag for * @return a byte tag representing the class * @throws JdwpInternalErrorException @@ -168,7 +168,7 @@ public class ValueFactory throws JdwpInternalErrorException { byte tag; - + if (klass.isPrimitive()) { if (klass == byte.class) @@ -196,15 +196,15 @@ public class ValueFactory { tag = JdwpConstants.Tag.OBJECT; } - + return tag; } - + /** * Create a value type for an Object of type determined by a Class. This is * a special case where a value needs to be created, but the value to create * it for is already in an object, not in a buffer. - * + * * @param value the Object to convert to a Value * @param type the Class type of the object * @return a new Value representing this object @@ -212,7 +212,7 @@ public class ValueFactory public static Value createFromObject(Object value, Class type) { Value val = null; - + if (type.isPrimitive()) { if (type == byte.class) @@ -241,7 +241,7 @@ public class ValueFactory else val = new ObjectValue(value); } - + return val; } } diff --git a/libjava/classpath/gnu/classpath/jdwp/value/VoidValue.java b/libjava/classpath/gnu/classpath/jdwp/value/VoidValue.java index 82cded92903..ae117347d3a 100644 --- a/libjava/classpath/gnu/classpath/jdwp/value/VoidValue.java +++ b/libjava/classpath/gnu/classpath/jdwp/value/VoidValue.java @@ -44,7 +44,7 @@ import java.io.IOException; /** * Wrapper for an void value. - * + * * @author Kyle Galloway */ public class VoidValue @@ -57,10 +57,10 @@ public class VoidValue { super(JdwpConstants.Tag.VOID); } - + /** * Return an object representing this type - * + * * @return an Object represntation of this value */ @Override @@ -71,11 +71,11 @@ public class VoidValue /** * Write the wrapped void to the given DataOutputStream. - * + * * @param os the output stream to write to */ @Override - protected void write(DataOutputStream os) + protected void write(DataOutputStream os) throws IOException { } diff --git a/libjava/classpath/gnu/classpath/toolkit/DefaultDaemonThreadFactory.java b/libjava/classpath/gnu/classpath/toolkit/DefaultDaemonThreadFactory.java index cb56c7641ff..29fc0ffd751 100644 --- a/libjava/classpath/gnu/classpath/toolkit/DefaultDaemonThreadFactory.java +++ b/libjava/classpath/gnu/classpath/toolkit/DefaultDaemonThreadFactory.java @@ -1,5 +1,5 @@ /* DefaultDaemonThreadFactory.java -- Factory for Deamon Threads. - + Copyright (C) 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ import java.util.concurrent.ThreadFactory;; * Create a new thread using all the default settings as returned by * Executors.defaultThreadFactory() plus calling * thread.setDaemon(true) on the newly created thread. - * + * * @author Mario Torre */ public class DefaultDaemonThreadFactory implements ThreadFactory diff --git a/libjava/classpath/gnu/java/awt/AWTUtilities.java b/libjava/classpath/gnu/java/awt/AWTUtilities.java index dcebc67fa25..1b308cef486 100644 --- a/libjava/classpath/gnu/java/awt/AWTUtilities.java +++ b/libjava/classpath/gnu/java/awt/AWTUtilities.java @@ -57,7 +57,7 @@ import java.util.WeakHashMap; import java.lang.reflect.InvocationTargetException; /** - * This class mirrors the javax.swing.SwingUtilities class. It + * This class mirrors the javax.swing.SwingUtilities class. It * provides commonly needed functionalities for AWT classes without * the need to reference classes in the javax.swing package. */ @@ -91,13 +91,13 @@ public class AWTUtilities */ VisibleComponentIterator(int listIndex) { - this.listIndex = listIndex; - int visibleComponentsFound = 0; - for (index = 0; visibleComponentsFound != listIndex; index++) - { - if (components[index].isVisible()) - visibleComponentsFound++; - } + this.listIndex = listIndex; + int visibleComponentsFound = 0; + for (index = 0; visibleComponentsFound != listIndex; index++) + { + if (components[index].isVisible()) + visibleComponentsFound++; + } } /** @@ -109,16 +109,16 @@ public class AWTUtilities */ public boolean hasNext() { - boolean hasNext = false; - for (int i = index; i < components.length; i++) - { - if (components[i].isVisible()) - { - hasNext = true; - break; - } - } - return hasNext; + boolean hasNext = false; + for (int i = index; i < components.length; i++) + { + if (components[i].isVisible()) + { + hasNext = true; + break; + } + } + return hasNext; } /** @@ -130,23 +130,23 @@ public class AWTUtilities */ public Object next() { - Object o = null; - for (; index < components.length; index++) - { - if (components[index].isVisible()) - { - o = components[index]; - break; - } - } - if (o != null) - { - index++; - listIndex++; - return o; - } - else - throw new NoSuchElementException(); + Object o = null; + for (; index < components.length; index++) + { + if (components[index].isVisible()) + { + o = components[index]; + break; + } + } + if (o != null) + { + index++; + listIndex++; + return o; + } + else + throw new NoSuchElementException(); } /** @@ -158,16 +158,16 @@ public class AWTUtilities */ public boolean hasPrevious() { - boolean hasPrevious = false; - for (int i = index - 1; i >= 0; i--) - { - if (components[i].isVisible()) - { - hasPrevious = true; - break; - } - } - return hasPrevious; + boolean hasPrevious = false; + for (int i = index - 1; i >= 0; i--) + { + if (components[i].isVisible()) + { + hasPrevious = true; + break; + } + } + return hasPrevious; } /** @@ -179,22 +179,22 @@ public class AWTUtilities */ public Object previous() { - Object o = null; - for (index--; index >= 0; index--) - { - if (components[index].isVisible()) - { - o = components[index]; - break; - } - } - if (o != null) - { - listIndex--; - return o; - } - else - throw new NoSuchElementException(); + Object o = null; + for (index--; index >= 0; index--) + { + if (components[index].isVisible()) + { + o = components[index]; + break; + } + } + if (o != null) + { + listIndex--; + return o; + } + else + throw new NoSuchElementException(); } /** @@ -204,7 +204,7 @@ public class AWTUtilities */ public int nextIndex() { - return listIndex + 1; + return listIndex + 1; } /** @@ -214,7 +214,7 @@ public class AWTUtilities */ public int previousIndex() { - return listIndex - 1; + return listIndex - 1; } /** @@ -224,8 +224,8 @@ public class AWTUtilities */ public void remove() { - throw new UnsupportedOperationException - ("VisibleComponentList is immutable"); + throw new UnsupportedOperationException + ("VisibleComponentList is immutable"); } /** @@ -237,8 +237,8 @@ public class AWTUtilities */ public void set(Object o) { - throw new UnsupportedOperationException - ("VisibleComponentList is immutable"); + throw new UnsupportedOperationException + ("VisibleComponentList is immutable"); } /** @@ -250,8 +250,8 @@ public class AWTUtilities */ public void add(Object o) { - throw new UnsupportedOperationException - ("VisibleComponentList is immutable"); + throw new UnsupportedOperationException + ("VisibleComponentList is immutable"); } } @@ -291,8 +291,8 @@ public class AWTUtilities { int visibleComponents = 0; for (int i = 0; i < components.length; i++) - if (components[i].isVisible()) - visibleComponents++; + if (components[i].isVisible()) + visibleComponents++; return visibleComponents; } } @@ -322,8 +322,8 @@ public class AWTUtilities VisibleComponentList visibleChildren = null; if (o == null) { - visibleChildren = new VisibleComponentList(children); - visibleChildrenCache.put(children, visibleChildren); + visibleChildren = new VisibleComponentList(children); + visibleChildrenCache.put(children, visibleChildren); } else visibleChildren = (VisibleComponentList) o; @@ -419,8 +419,8 @@ public class AWTUtilities * * @see #getAncestorOfClass * @see #windowForComponent - * @see - * + * @see + * */ public static Container getAncestorOfClass(Class c, Component comp) { @@ -432,7 +432,7 @@ public class AWTUtilities /** * Equivalent to calling getAncestorOfClass(Window, comp). * - * @param comp The component to search for an ancestor window + * @param comp The component to search for an ancestor window * * @return An ancestral window, or null if none exists */ @@ -500,7 +500,7 @@ public class AWTUtilities * (x,y). Returns null when either * (x,y) is outside the bounds of parent, or parent is * null. - * + * * @param parent The component to search the descendents of * @param x Horizontal coordinate to search for * @param y Vertical coordinate to search for @@ -593,7 +593,7 @@ public class AWTUtilities if (destination == null) destination = getRoot(source); - + if (source.isShowing() && destination.isShowing()) { convertPointToScreen(pt, source); @@ -603,7 +603,7 @@ public class AWTUtilities return pt; } - + /** * Converts a rectangle from the coordinate space of one component to * another. This is equivalent to converting the rectangle from @@ -668,18 +668,18 @@ public class AWTUtilities } - /** + /** * Calls {@link java.awt.EventQueue.invokeLater} with the - * specified {@link Runnable}. + * specified {@link Runnable}. */ public static void invokeLater(Runnable doRun) { java.awt.EventQueue.invokeLater(doRun); } - /** + /** * Calls {@link java.awt.EventQueue.invokeAndWait} with the - * specified {@link Runnable}. + * specified {@link Runnable}. */ public static void invokeAndWait(Runnable doRun) throws InterruptedException, @@ -688,7 +688,7 @@ public class AWTUtilities java.awt.EventQueue.invokeAndWait(doRun); } - /** + /** * Calls {@link java.awt.EventQueue.isEventDispatchThread}. */ public static boolean isEventDispatchThread() diff --git a/libjava/classpath/gnu/java/awt/BitMaskExtent.java b/libjava/classpath/gnu/java/awt/BitMaskExtent.java index 28134991099..be66fccc613 100644 --- a/libjava/classpath/gnu/java/awt/BitMaskExtent.java +++ b/libjava/classpath/gnu/java/awt/BitMaskExtent.java @@ -36,7 +36,7 @@ exception statement from your version. */ package gnu.java.awt; -/** +/** * Simple transparent utility class that can be used to perform bit * mask extent calculations. */ @@ -47,7 +47,7 @@ public final class BitMaskExtent /** The number of bits in the bit mask extent. */ public byte bitWidth; - + /** * Set the bit mask. This will calculate and set the leastSignificantBit * and bitWidth fields. @@ -63,17 +63,17 @@ public final class BitMaskExtent long shiftMask = mask; for (; (shiftMask&1) == 0; shiftMask >>>=1) leastSignificantBit++; for (; (shiftMask&1) != 0; shiftMask >>>=1) bitWidth++; - + if (shiftMask != 0) throw new IllegalArgumentException("mask must be continuous"); } - - /** + + /** * Calculate the bit mask based on the values of the * leastSignificantBit and bitWidth fields. */ public long toMask() { return ((1<The purpose of this composite is to support the {@link * Graphics#setXORMode(Color)} method in composite-aware graphics * implementations. Applications typically would use @@ -96,7 +96,7 @@ public class BitwiseXORComposite */ protected Color xorColor; - + /** * Constructs a new composite for xor-ing the pixel value. * @@ -128,7 +128,7 @@ public class BitwiseXORComposite return new GeneralContext(srcColorModel, dstColorModel, xorColor); } - + /** * A fallback CompositeContext that performs bitwise XOR of pixel * values with the pixel value of the specified xorColor. @@ -164,7 +164,7 @@ public class BitwiseXORComposite Rectangle srcRect = src.getBounds(); Rectangle dstInRect = dstIn.getBounds(); Rectangle dstOutRect = dstOut.getBounds(); - + int xp = xorColor.getRGB(); int w = Math.min(Math.min(srcRect.width, dstOutRect.width), dstInRect.width); @@ -186,7 +186,7 @@ public class BitwiseXORComposite int sp = srcColorModel.getRGB(srcPix); int dp = dstColorModel.getRGB(dstPix); int rp = sp ^ xp ^ dp; - dstOut.setDataElements(x + dstOutRect.x, y + dstOutRect.y, + dstOut.setDataElements(x + dstOutRect.x, y + dstOutRect.y, dstColorModel.getDataElements(rp, rpPix)); } } @@ -249,7 +249,7 @@ public class BitwiseXORComposite srcLine = new int[width]; dstLine = new int[width]; - + /* We need an int[] array with at least one element here; * srcLine is as good as any other. */ @@ -268,7 +268,7 @@ public class BitwiseXORComposite } } - + /** * Determines whether an instance of this CompositeContext would * be able to process the specified color models. diff --git a/libjava/classpath/gnu/java/awt/Buffers.java b/libjava/classpath/gnu/java/awt/Buffers.java index 2015634bbf5..0c8d438c7ce 100644 --- a/libjava/classpath/gnu/java/awt/Buffers.java +++ b/libjava/classpath/gnu/java/awt/Buffers.java @@ -46,7 +46,7 @@ import java.awt.image.DataBufferInt; import java.awt.image.DataBufferShort; import java.awt.image.DataBufferUShort; -/** +/** * Utility class for creating and accessing data buffers of arbitrary * data types. */ @@ -60,7 +60,7 @@ public final class Buffers * @param size the size of the data buffer bank */ public static DataBuffer createBuffer(int dataType, Object data, - int size) + int size) { if (data == null) return createBuffer(dataType, size, 1); @@ -90,22 +90,22 @@ public final class Buffers switch (dataType) { case DataBuffer.TYPE_BYTE: - return new DataBufferByte(size, numBanks); + return new DataBufferByte(size, numBanks); case DataBuffer.TYPE_SHORT: - return new DataBufferShort(size, numBanks); + return new DataBufferShort(size, numBanks); case DataBuffer.TYPE_USHORT: - return new DataBufferUShort(size, numBanks); + return new DataBufferUShort(size, numBanks); case DataBuffer.TYPE_INT: - return new DataBufferInt(size, numBanks); + return new DataBufferInt(size, numBanks); case DataBuffer.TYPE_FLOAT: - return new DataBufferFloat(size, numBanks); + return new DataBufferFloat(size, numBanks); case DataBuffer.TYPE_DOUBLE: - return new DataBufferDouble(size, numBanks); + return new DataBufferDouble(size, numBanks); default: - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); } } - + /** * Create a data buffer of a particular type. * @@ -114,28 +114,28 @@ public final class Buffers * @param size the size of the data buffer bank */ public static DataBuffer createBufferFromData(int dataType, Object data, - int size) + int size) { switch (dataType) { case DataBuffer.TYPE_BYTE: - return new DataBufferByte((byte[]) data, size); + return new DataBufferByte((byte[]) data, size); case DataBuffer.TYPE_SHORT: - return new DataBufferShort((short[]) data, size); + return new DataBufferShort((short[]) data, size); case DataBuffer.TYPE_USHORT: - return new DataBufferUShort((short[]) data, size); + return new DataBufferUShort((short[]) data, size); case DataBuffer.TYPE_INT: - return new DataBufferInt((int[]) data, size); + return new DataBufferInt((int[]) data, size); case DataBuffer.TYPE_FLOAT: - return new DataBufferFloat((float[]) data, size); + return new DataBufferFloat((float[]) data, size); case DataBuffer.TYPE_DOUBLE: - return new DataBufferDouble((double[]) data, size); + return new DataBufferDouble((double[]) data, size); default: - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); } } - /** + /** * Return the data array of a data buffer, regardless of the data * type. * @@ -147,56 +147,56 @@ public final class Buffers return getData(buffer, 0, null, 0, buffer.getSize()); } - + /** * Copy data from array contained in data buffer, much like * System.arraycopy. Create a suitable destination array if the * given destination array is null. */ public static Object getData(DataBuffer src, int srcOffset, - Object dest, int dstOffset, - int length) + Object dest, int dstOffset, + int length) { Object from; switch(src.getDataType()) { case DataBuffer.TYPE_BYTE: - if (dest == null) dest = new byte[length+dstOffset]; - for(int i = 0; i < length; i++) - ((byte[])dest)[i + dstOffset] = (byte)src.getElem(i + srcOffset); - break; + if (dest == null) dest = new byte[length+dstOffset]; + for(int i = 0; i < length; i++) + ((byte[])dest)[i + dstOffset] = (byte)src.getElem(i + srcOffset); + break; case DataBuffer.TYPE_DOUBLE: - if (dest == null) dest = new double[length+dstOffset]; - for(int i = 0; i < length; i++) - ((double[])dest)[i + dstOffset] = src.getElemDouble(i + srcOffset); - break; + if (dest == null) dest = new double[length+dstOffset]; + for(int i = 0; i < length; i++) + ((double[])dest)[i + dstOffset] = src.getElemDouble(i + srcOffset); + break; case DataBuffer.TYPE_FLOAT: - if (dest == null) dest = new float[length+dstOffset]; - for(int i = 0; i < length; i++) - ((float[])dest)[i + dstOffset] = src.getElemFloat(i + srcOffset); - break; + if (dest == null) dest = new float[length+dstOffset]; + for(int i = 0; i < length; i++) + ((float[])dest)[i + dstOffset] = src.getElemFloat(i + srcOffset); + break; case DataBuffer.TYPE_INT: - if (dest == null) dest = new int[length+dstOffset]; - for(int i = 0; i < length; i++) - ((int[])dest)[i + dstOffset] = src.getElem(i + srcOffset); - break; + if (dest == null) dest = new int[length+dstOffset]; + for(int i = 0; i < length; i++) + ((int[])dest)[i + dstOffset] = src.getElem(i + srcOffset); + break; case DataBuffer.TYPE_SHORT: case DataBuffer.TYPE_USHORT: - if (dest == null) dest = new short[length+dstOffset]; - for(int i = 0; i < length; i++) - ((short[])dest)[i + dstOffset] = (short)src.getElem(i + srcOffset); - break; + if (dest == null) dest = new short[length+dstOffset]; + for(int i = 0; i < length; i++) + ((short[])dest)[i + dstOffset] = (short)src.getElem(i + srcOffset); + break; case DataBuffer.TYPE_UNDEFINED: - throw new ClassCastException("Unknown data buffer type"); + throw new ClassCastException("Unknown data buffer type"); } return dest; } - + /** * @param bits the width of a data element measured in bits * @@ -207,19 +207,19 @@ public final class Buffers { if (bits <= 8) { - return DataBuffer.TYPE_BYTE; + return DataBuffer.TYPE_BYTE; } else if (bits <= 16) { - return DataBuffer.TYPE_USHORT; - } + return DataBuffer.TYPE_USHORT; + } else if (bits <= 32) { - return DataBuffer.TYPE_INT; + return DataBuffer.TYPE_INT; } else { - return DataBuffer.TYPE_UNDEFINED; + return DataBuffer.TYPE_UNDEFINED; } } } diff --git a/libjava/classpath/gnu/java/awt/ClasspathGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/ClasspathGraphicsEnvironment.java index 865da1d9594..fecefa03e8e 100644 --- a/libjava/classpath/gnu/java/awt/ClasspathGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/ClasspathGraphicsEnvironment.java @@ -45,7 +45,7 @@ import java.awt.image.WritableRaster; /** * This class extends the GraphicsEnvironment API with some Classpath-specific * methods, in order to provide optimized graphics handling. - * + * * @author Francis Kung */ public abstract class ClasspathGraphicsEnvironment @@ -54,7 +54,7 @@ public abstract class ClasspathGraphicsEnvironment /** * Returns an appropriate Raster that can efficiently back a * BufferedImage with the given ColorModel and SampleModel. - * + * * @param cm The color model. * @param sm The samepl model. * @return An appropriate WritableRaster, or null if acceleration/optimization diff --git a/libjava/classpath/gnu/java/awt/ClasspathToolkit.java b/libjava/classpath/gnu/java/awt/ClasspathToolkit.java index 7bbc70ccb1f..99c186aaabb 100644 --- a/libjava/classpath/gnu/java/awt/ClasspathToolkit.java +++ b/libjava/classpath/gnu/java/awt/ClasspathToolkit.java @@ -102,7 +102,7 @@ public abstract class ClasspathToolkit * * @param name The logical name of the font. This may be either a face * name or a logical font name, or may even be null. A default - * implementation of name decoding is provided in + * implementation of name decoding is provided in * {@link ClasspathFontPeer}, but may be overridden in other toolkits. * * @param attrs Any extra {@link java.awt.font.TextAttribute} attributes @@ -110,17 +110,17 @@ public abstract class ClasspathToolkit * transformation. */ public abstract ClasspathFontPeer getClasspathFontPeer (String name, - Map attrs); + Map attrs); - /** + /** * Creates a {@link Font}, in a platform-specific manner. - * + * * The default implementation simply constructs a {@link Font}, but some - * toolkits may wish to override this, to return {@link Font} subclasses + * toolkits may wish to override this, to return {@link Font} subclasses * which implement {@link java.awt.font.OpenType} or * {@link java.awt.font.MultipleMaster}. */ - public Font getFont (String name, Map attrs) + public Font getFont (String name, Map attrs) { Font f = null; @@ -170,7 +170,7 @@ public abstract class ClasspathToolkit * * @throws IllegalArgumentException if format is * not supported. - * + * * @throws FontFormatException if stream does not * contain data in the expected format, or if required tables are * missing from a font. @@ -211,11 +211,11 @@ public abstract class ClasspathToolkit * toolkit implementors should overload this method if possible. * @since 1.5 */ - public int getMouseNumberOfButtons() + public int getMouseNumberOfButtons() { return -1; } - + /* (non-Javadoc) * @see java.awt.Toolkit#createDesktopPeer(java.awt.Desktop) */ @@ -224,9 +224,8 @@ public abstract class ClasspathToolkit { if (GraphicsEnvironment.isHeadless()) throw new HeadlessException(); - + return ClasspathDesktopPeer.getDesktop(); } } - diff --git a/libjava/classpath/gnu/java/awt/ComponentDataBlitOp.java b/libjava/classpath/gnu/java/awt/ComponentDataBlitOp.java index 545427ea767..becf541677a 100644 --- a/libjava/classpath/gnu/java/awt/ComponentDataBlitOp.java +++ b/libjava/classpath/gnu/java/awt/ComponentDataBlitOp.java @@ -52,7 +52,7 @@ import java.awt.image.WritableRaster; * * @throws java.lang.ClassCastException if the sample models of the * rasters are not of type ComponentSampleModel. - * + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public class ComponentDataBlitOp implements RasterOp @@ -63,14 +63,14 @@ public class ComponentDataBlitOp implements RasterOp { if (dest == null) dest = createCompatibleDestRaster(src); - + DataBuffer srcDB = src.getDataBuffer(); DataBuffer destDB = dest.getDataBuffer(); - + ComponentSampleModel srcSM = (ComponentSampleModel) src.getSampleModel(); ComponentSampleModel destSM = (ComponentSampleModel) dest.getSampleModel(); - + // Calculate offset to data in the underlying arrays: int srcScanlineStride = srcSM.getScanlineStride(); @@ -84,8 +84,8 @@ public class ComponentDataBlitOp implements RasterOp /* We can't use getOffset(x, y) from the sample model since we don't want the band offset added in. */ - - int srcOffset = + + int srcOffset = numBands*srcX + srcScanlineStride*srcY + // from sample model srcDB.getOffset(); // from data buffer @@ -94,44 +94,44 @@ public class ComponentDataBlitOp implements RasterOp destDB.getOffset(); // from data buffer // Determine how much, and how many times to blit. - + int rowSize = src.getWidth()*numBands; int h = src.getHeight(); - + if ((rowSize == srcScanlineStride) && - (rowSize == destScanlineStride)) + (rowSize == destScanlineStride)) { - // collapse scan line blits to one large blit. - rowSize *= h; - h = 1; + // collapse scan line blits to one large blit. + rowSize *= h; + h = 1; } - + // Do blitting - + Object srcArray = Buffers.getData(srcDB); Object destArray = Buffers.getData(destDB); - + for (int yd = 0; ydCIE XYZ conversions in SrgbConverter are used. * * @author Sven de Marothy diff --git a/libjava/classpath/gnu/java/awt/color/ClutProfileConverter.java b/libjava/classpath/gnu/java/awt/color/ClutProfileConverter.java index bff97cc9b87..5229ce804f5 100644 --- a/libjava/classpath/gnu/java/awt/color/ClutProfileConverter.java +++ b/libjava/classpath/gnu/java/awt/color/ClutProfileConverter.java @@ -56,24 +56,24 @@ public class ClutProfileConverter implements ColorSpaceConverter nChannels = profile.getNumComponents(); // Sun does not specifiy which rendering intent should be used, - // neither does the ICC v2 spec really. + // neither does the ICC v2 spec really. // Try intent 0 try { - toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); + toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); } catch (Exception e) { - toPCS = null; + toPCS = null; } try { - fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); + fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); } catch (Exception e) { - fromPCS = null; + fromPCS = null; } if (toPCS != null || fromPCS != null) @@ -82,20 +82,20 @@ public class ClutProfileConverter implements ColorSpaceConverter // If no intent 0 clut is available, look for a intent 1 clut. try { - toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB1Tag); + toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB1Tag); } catch (Exception e) { - toPCS = null; + toPCS = null; } try { - fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA1Tag); + fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA1Tag); } catch (Exception e) { - fromPCS = null; + fromPCS = null; } if (toPCS != null || fromPCS != null) @@ -104,20 +104,20 @@ public class ClutProfileConverter implements ColorSpaceConverter // Last shot.. intent 2 CLUT. try { - toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB2Tag); + toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB2Tag); } catch (Exception e) { - toPCS = null; + toPCS = null; } try { - fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA2Tag); + fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA2Tag); } catch (Exception e) { - fromPCS = null; + fromPCS = null; } if (toPCS == null && fromPCS == null) diff --git a/libjava/classpath/gnu/java/awt/color/ColorLookUpTable.java b/libjava/classpath/gnu/java/awt/color/ColorLookUpTable.java index 6b6418bc284..581320c3ede 100644 --- a/libjava/classpath/gnu/java/awt/color/ColorLookUpTable.java +++ b/libjava/classpath/gnu/java/awt/color/ColorLookUpTable.java @@ -77,7 +77,7 @@ public class ColorLookUpTable float[][] inMatrix; // input matrix (XYZ only) boolean useMatrix; // Whether to use the matrix or not. int[] multiplier; - int[] offsets; // Hypercube offsets + int[] offsets; // Hypercube offsets boolean inputLab; // Set if the CLUT input CS is Lab boolean outputLab; // Set if the CLUT output CS is Lab @@ -95,21 +95,21 @@ public class ColorLookUpTable case ICC_Profile.icSigAToB0Tag: case ICC_Profile.icSigAToB1Tag: case ICC_Profile.icSigAToB2Tag: - if (profile.getColorSpaceType() == ColorSpace.TYPE_XYZ) - useMatrix = true; - inputLab = false; - outputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab); - break; + if (profile.getColorSpaceType() == ColorSpace.TYPE_XYZ) + useMatrix = true; + inputLab = false; + outputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab); + break; case ICC_Profile.icSigBToA0Tag: case ICC_Profile.icSigBToA1Tag: case ICC_Profile.icSigBToA2Tag: - if (profile.getPCSType() == ColorSpace.TYPE_XYZ) - useMatrix = true; - inputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab); - outputLab = false; - break; + if (profile.getPCSType() == ColorSpace.TYPE_XYZ) + useMatrix = true; + inputLab = (profile.getPCSType() == ColorSpace.TYPE_Lab); + outputLab = false; + break; default: - throw new IllegalArgumentException("Not a clut-type tag."); + throw new IllegalArgumentException("Not a clut-type tag."); } byte[] data = profile.getData(tag); @@ -144,24 +144,24 @@ public class ColorLookUpTable inMatrix = new float[3][3]; for (int i = 0; i < 3; i++) for (int j = 0; j < 3; j++) - inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f; + inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f; inTable = new double[nIn][nInTableEntries]; for (int channel = 0; channel < nIn; channel++) for (int i = 0; i < nInTableEntries; i++) - inTable[channel][i] = (double) ((int) buf.getShort(52 - + (channel * nInTableEntries - + i) * 2) - & (0xFFFF)) / 65536.0; + inTable[channel][i] = (double) ((int) buf.getShort(52 + + (channel * nInTableEntries + + i) * 2) + & (0xFFFF)) / 65536.0; nClut = nOut; multiplier = new int[nIn]; multiplier[nIn - 1] = nOut; for (int i = 0; i < nIn; i++) { - nClut *= gridpoints; - if (i > 0) - multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints; + nClut *= gridpoints; + if (i > 0) + multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints; } int clutOffset = 52 + nIn * nInTableEntries * 2; @@ -172,18 +172,18 @@ public class ColorLookUpTable outTable = new short[nOut][nOutTableEntries]; for (int channel = 0; channel < nOut; channel++) for (int i = 0; i < nOutTableEntries; i++) - outTable[channel][i] = buf.getShort(clutOffset - + (nClut - + channel * nOutTableEntries + i) * 2); + outTable[channel][i] = buf.getShort(clutOffset + + (nClut + + channel * nOutTableEntries + i) * 2); // calculate the hypercube corner offsets offsets = new int[(1 << nIn)]; offsets[0] = 0; for (int j = 0; j < nIn; j++) { - int factor = 1 << j; - for (int i = 0; i < factor; i++) - offsets[factor + i] = offsets[i] + multiplier[j]; + int factor = 1 << j; + for (int i = 0; i < factor; i++) + offsets[factor + i] = offsets[i] + multiplier[j]; } } @@ -203,23 +203,23 @@ public class ColorLookUpTable inMatrix = new float[3][3]; for (int i = 0; i < 3; i++) for (int j = 0; j < 3; j++) - inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f; + inMatrix[i][j] = ((float) (buf.getInt(12 + (i * 3 + j) * 4))) / 65536.0f; inTable = new double[nIn][nInTableEntries]; for (int channel = 0; channel < nIn; channel++) for (int i = 0; i < nInTableEntries; i++) - inTable[channel][i] = (double) ((int) buf.get(48 - + (channel * nInTableEntries - + i)) & (0xFF)) / 255.0; + inTable[channel][i] = (double) ((int) buf.get(48 + + (channel * nInTableEntries + + i)) & (0xFF)) / 255.0; nClut = nOut; multiplier = new int[nIn]; multiplier[nIn - 1] = nOut; for (int i = 0; i < nIn; i++) { - nClut *= gridpoints; - if (i > 0) - multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints; + nClut *= gridpoints; + if (i > 0) + multiplier[nIn - i - 1] = multiplier[nIn - i] * gridpoints; } int clutOffset = 48 + nIn * nInTableEntries; @@ -230,18 +230,18 @@ public class ColorLookUpTable outTable = new short[nOut][nOutTableEntries]; for (int channel = 0; channel < nOut; channel++) for (int i = 0; i < nOutTableEntries; i++) - outTable[channel][i] = (short) (buf.get(clutOffset + nClut - + channel * nOutTableEntries - + i) * 257); + outTable[channel][i] = (short) (buf.get(clutOffset + nClut + + channel * nOutTableEntries + + i) * 257); // calculate the hypercube corner offsets offsets = new int[(1 << nIn)]; offsets[0] = 0; for (int j = 0; j < nIn; j++) { - int factor = 1 << j; - for (int i = 0; i < factor; i++) - offsets[factor + i] = offsets[i] + multiplier[j]; + int factor = 1 << j; + for (int i = 0; i < factor; i++) + offsets[factor + i] = offsets[i] + multiplier[j]; } } @@ -260,32 +260,32 @@ public class ColorLookUpTable float[] in2 = new float[in.length]; if (useMatrix) { - for (int i = 0; i < 3; i++) - in2[i] = in[0] * inMatrix[i][0] + in[1] * inMatrix[i][1] - + in[2] * inMatrix[i][2]; + for (int i = 0; i < 3; i++) + in2[i] = in[0] * inMatrix[i][0] + in[1] * inMatrix[i][1] + + in[2] * inMatrix[i][2]; } else if (inputLab) in2 = XYZtoLab(in); else System.arraycopy(in, 0, in2, 0, in.length); - // input table + // input table for (int i = 0; i < nIn; i++) { - int index = (int) Math.floor(in2[i] * (double) (nInTableEntries - 1)); // floor in + int index = (int) Math.floor(in2[i] * (double) (nInTableEntries - 1)); // floor in - // clip values. - if (index >= nInTableEntries - 1) - in2[i] = (float) inTable[i][nInTableEntries - 1]; - else if (index < 0) - in2[i] = (float) inTable[i][0]; - else - { - // linear interpolation - double alpha = in2[i] * ((double) nInTableEntries - 1.0) - index; - in2[i] = (float) (inTable[i][index] * (1 - alpha) - + inTable[i][index + 1] * alpha); - } + // clip values. + if (index >= nInTableEntries - 1) + in2[i] = (float) inTable[i][nInTableEntries - 1]; + else if (index < 0) + in2[i] = (float) inTable[i][0]; + else + { + // linear interpolation + double alpha = in2[i] * ((double) nInTableEntries - 1.0) - index; + in2[i] = (float) (inTable[i][index] * (1 - alpha) + + inTable[i][index + 1] * alpha); + } } // CLUT lookup @@ -295,31 +295,31 @@ public class ColorLookUpTable int offset = 0; // = gp for (int i = 0; i < nIn; i++) { - int index = (int) Math.floor(in2[i] * ((double) gridpoints - 1.0)); - double alpha = in2[i] * ((double) gridpoints - 1.0) - (double) index; + int index = (int) Math.floor(in2[i] * ((double) gridpoints - 1.0)); + double alpha = in2[i] * ((double) gridpoints - 1.0) - (double) index; - // clip values. - if (index >= gridpoints - 1) - { - index = gridpoints - 1; - alpha = 1.0; - } - else if (index < 0) - index = 0; - clutalpha[i] = alpha; - offset += index * multiplier[i]; + // clip values. + if (index >= gridpoints - 1) + { + index = gridpoints - 1; + alpha = 1.0; + } + else if (index < 0) + index = 0; + clutalpha[i] = alpha; + offset += index * multiplier[i]; } // Calculate interpolation weights weights[0] = 1.0; for (int j = 0; j < nIn; j++) { - int factor = 1 << j; - for (int i = 0; i < factor; i++) - { - weights[factor + i] = weights[i] * clutalpha[j]; - weights[i] *= (1.0 - clutalpha[j]); - } + int factor = 1 << j; + for (int i = 0; i < factor; i++) + { + weights[factor + i] = weights[i] * clutalpha[j]; + weights[i] *= (1.0 - clutalpha[j]); + } } for (int i = 0; i < nOut; i++) @@ -327,32 +327,32 @@ public class ColorLookUpTable for (int i = 1; i < (1 << nIn); i++) { - int offset2 = offset + offsets[i]; - for (int f = 0; f < nOut; f++) - output2[f] += weights[i] * clut[offset2 + f]; + int offset2 = offset + offsets[i]; + for (int f = 0; f < nOut; f++) + output2[f] += weights[i] * clut[offset2 + f]; } - // output table + // output table float[] output = new float[nOut]; for (int i = 0; i < nOut; i++) { - int index = (int) Math.floor(output2[i] * ((double) nOutTableEntries - - 1.0)); + int index = (int) Math.floor(output2[i] * ((double) nOutTableEntries + - 1.0)); - // clip values. - if (index >= nOutTableEntries - 1) - output[i] = outTable[i][nOutTableEntries - 1]; - else if (index < 0) - output[i] = outTable[i][0]; - else - { - // linear interpolation - double a = output2[i] * ((double) nOutTableEntries - 1.0) - - (double) index; - output[i] = (float) ((double) ((int) outTable[i][index] & (0xFFFF)) * (1 - - a) - + (double) ((int) outTable[i][index + 1] & (0xFFFF)) * a) / 65536f; - } + // clip values. + if (index >= nOutTableEntries - 1) + output[i] = outTable[i][nOutTableEntries - 1]; + else if (index < 0) + output[i] = outTable[i][0]; + else + { + // linear interpolation + double a = output2[i] * ((double) nOutTableEntries - 1.0) + - (double) index; + output[i] = (float) ((double) ((int) outTable[i][index] & (0xFFFF)) * (1 + - a) + + (double) ((int) outTable[i][index + 1] & (0xFFFF)) * a) / 65536f; + } } if (outputLab) @@ -365,7 +365,7 @@ public class ColorLookUpTable */ private float[] LabtoXYZ(float[] in) { - // Convert from byte-packed format to a + // Convert from byte-packed format to a // more convenient one (actual Lab values) // (See ICC spec for details) // factor is 100 * 65536 / 65280 @@ -381,12 +381,12 @@ public class ColorLookUpTable for (int i = 0; i < 3; i++) { - double exp = out[i] * out[i] * out[i]; - if (exp <= 0.008856) - out[i] = (out[i] - 16.0f / 116.0f) / 7.787f; - else - out[i] = (float) exp; - out[i] = D50[i] * out[i]; + double exp = out[i] * out[i] * out[i]; + if (exp <= 0.008856) + out[i] = (out[i] - 16.0f / 116.0f) / 7.787f; + else + out[i] = (float) exp; + out[i] = D50[i] * out[i]; } return out; } @@ -400,12 +400,12 @@ public class ColorLookUpTable for (int i = 0; i < 3; i++) { - temp[i] = in[i] / D50[i]; + temp[i] = in[i] / D50[i]; - if (temp[i] <= 0.008856f) - temp[i] = (7.7870689f * temp[i]) + (16f / 116.0f); - else - temp[i] = (float) Math.exp((1.0 / 3.0) * Math.log(temp[i])); + if (temp[i] <= 0.008856f) + temp[i] = (7.7870689f * temp[i]) + (16f / 116.0f); + else + temp[i] = (float) Math.exp((1.0 / 3.0) * Math.log(temp[i])); } float[] out = new float[3]; @@ -419,10 +419,10 @@ public class ColorLookUpTable out[2] = (out[2] + 128f) / 256f; for (int i = 0; i < 3; i++) { - if (out[i] < 0f) - out[i] = 0f; - if (out[i] > 1f) - out[i] = 1f; + if (out[i] < 0f) + out[i] = 0f; + if (out[i] > 1f) + out[i] = 1f; } return out; } diff --git a/libjava/classpath/gnu/java/awt/color/GrayProfileConverter.java b/libjava/classpath/gnu/java/awt/color/GrayProfileConverter.java index 3c725138a66..3f95b07d76b 100644 --- a/libjava/classpath/gnu/java/awt/color/GrayProfileConverter.java +++ b/libjava/classpath/gnu/java/awt/color/GrayProfileConverter.java @@ -67,11 +67,11 @@ public class GrayProfileConverter implements ColorSpaceConverter { try { - trc = new ToneReproductionCurve(profile.getGamma()); + trc = new ToneReproductionCurve(profile.getGamma()); } catch (ProfileDataException e) { - trc = new ToneReproductionCurve(profile.getTRC()); + trc = new ToneReproductionCurve(profile.getTRC()); } // linear grayscale converter @@ -84,20 +84,20 @@ public class GrayProfileConverter implements ColorSpaceConverter // unpredictable results. This is in line with the Java specification, try { - toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); + toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); } catch (Exception e) { - toPCS = null; + toPCS = null; } try { - fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); + fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); } catch (Exception e) { - fromPCS = null; + fromPCS = null; } } diff --git a/libjava/classpath/gnu/java/awt/color/GrayScaleConverter.java b/libjava/classpath/gnu/java/awt/color/GrayScaleConverter.java index 7a27ddba828..beea9d28789 100644 --- a/libjava/classpath/gnu/java/awt/color/GrayScaleConverter.java +++ b/libjava/classpath/gnu/java/awt/color/GrayScaleConverter.java @@ -95,15 +95,15 @@ public class GrayScaleConverter implements ColorSpaceConverter out[0] = 0; for (int i = 0; i < 3; i++) { - float n = in[i]; - if (n < 0) - n = 0f; - if (n > 1) - n = 1f; - if (n <= 0.03928f) - out[0] += (float) (coeff[i] * n / 12.92); - else - out[0] += (float) (coeff[i] * Math.exp(2.4 * Math.log((n + 0.055) / 1.055))); + float n = in[i]; + if (n < 0) + n = 0f; + if (n > 1) + n = 1f; + if (n <= 0.03928f) + out[0] += (float) (coeff[i] * n / 12.92); + else + out[0] += (float) (coeff[i] * Math.exp(2.4 * Math.log((n + 0.055) / 1.055))); } return out; } diff --git a/libjava/classpath/gnu/java/awt/color/LinearRGBConverter.java b/libjava/classpath/gnu/java/awt/color/LinearRGBConverter.java index 13a4e2c04f4..1eaf6479e8c 100644 --- a/libjava/classpath/gnu/java/awt/color/LinearRGBConverter.java +++ b/libjava/classpath/gnu/java/awt/color/LinearRGBConverter.java @@ -58,16 +58,16 @@ public class LinearRGBConverter implements ColorSpaceConverter float[] out = new float[3]; for (int i = 0; i < 3; i++) { - float n = in[i]; - if (n < 0) - n = 0f; - if (n > 1) - n = 1f; - if (n <= 0.00304f) - out[i] = in[0] * 12.92f; - else - out[i] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(n))) - - 0.055f; + float n = in[i]; + if (n < 0) + n = 0f; + if (n > 1) + n = 1f; + if (n <= 0.00304f) + out[i] = in[0] * 12.92f; + else + out[i] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(n))) + - 0.055f; } return out; } @@ -84,15 +84,15 @@ public class LinearRGBConverter implements ColorSpaceConverter // numbers from the w3 spec. for (int i = 0; i < 3; i++) { - float n = in[i]; - if (n < 0) - n = 0f; - if (n > 1) - n = 1f; - if (n <= 0.03928f) - out[i] = (float) (n / 12.92); - else - out[i] = (float) (Math.exp(2.4 * Math.log((n + 0.055) / 1.055))); + float n = in[i]; + if (n < 0) + n = 0f; + if (n > 1) + n = 1f; + if (n <= 0.03928f) + out[i] = (float) (n / 12.92); + else + out[i] = (float) (Math.exp(2.4 * Math.log((n + 0.055) / 1.055))); } return out; } diff --git a/libjava/classpath/gnu/java/awt/color/ProfileHeader.java b/libjava/classpath/gnu/java/awt/color/ProfileHeader.java index 4fdef560a42..2a6402dbc6b 100644 --- a/libjava/classpath/gnu/java/awt/color/ProfileHeader.java +++ b/libjava/classpath/gnu/java/awt/color/ProfileHeader.java @@ -57,7 +57,7 @@ public class ProfileHeader /** * Mapping from ICC Profile signatures to ColorSpace types */ - private static final int[] csTypeMap = + private static final int[] csTypeMap = { ICC_Profile.icSigXYZData, ColorSpace.TYPE_XYZ, @@ -119,7 +119,7 @@ public class ProfileHeader /** * Mapping of ICC class signatures to profile class constants */ - private static final int[] classMap = + private static final int[] classMap = { ICC_Profile.icSigInputClass, ICC_Profile.CLASS_INPUT, @@ -194,7 +194,7 @@ public class ProfileHeader { ByteBuffer buf = ByteBuffer.wrap(data); - // Get size (the sign bit shouldn't matter. + // Get size (the sign bit shouldn't matter. // A valid profile can never be +2Gb) size = buf.getInt(ICC_Profile.icHdrSize); @@ -211,8 +211,8 @@ public class ProfileHeader for (int i = 0; i < classMap.length; i += 2) if (classMap[i] == classSig) { - profileClass = classMap[i + 1]; - break; + profileClass = classMap[i + 1]; + break; } // get the data color space @@ -221,8 +221,8 @@ public class ProfileHeader for (int i = 0; i < csTypeMap.length; i += 2) if (csTypeMap[i] == csSig) { - colorSpace = csTypeMap[i + 1]; - break; + colorSpace = csTypeMap[i + 1]; + break; } // get the profile color space (PCS), must be xyz or lab except @@ -231,19 +231,19 @@ public class ProfileHeader profileColorSpace = -1; if (profileClass != ICC_Profile.CLASS_DEVICELINK) { - if (pcsSig == ICC_Profile.icSigXYZData) - profileColorSpace = ColorSpace.TYPE_XYZ; - if (pcsSig == ICC_Profile.icSigLabData) - profileColorSpace = ColorSpace.TYPE_Lab; + if (pcsSig == ICC_Profile.icSigXYZData) + profileColorSpace = ColorSpace.TYPE_XYZ; + if (pcsSig == ICC_Profile.icSigLabData) + profileColorSpace = ColorSpace.TYPE_Lab; } else { - for (int i = 0; i < csTypeMap.length; i += 2) - if (csTypeMap[i] == pcsSig) - { - profileColorSpace = csTypeMap[i + 1]; - break; - } + for (int i = 0; i < csTypeMap.length; i += 2) + if (csTypeMap[i] == pcsSig) + { + profileColorSpace = csTypeMap[i + 1]; + break; + } } // creation timestamp @@ -266,7 +266,7 @@ public class ProfileHeader System.arraycopy(data, ICC_Profile.icHdrAttributes, attributes, 0, 8); // rendering intent intent = buf.getInt(ICC_Profile.icHdrRenderingIntent); - // illuminant info + // illuminant info illuminant = new byte[12]; System.arraycopy(data, ICC_Profile.icHdrIlluminant, illuminant, 0, 12); // Creator signature @@ -321,13 +321,13 @@ public class ProfileHeader (short) (majorVersion << 8 | minorVersion)); for (int i = 1; i < classMap.length; i += 2) if (profileClass == classMap[i]) - buf.putInt(ICC_Profile.icHdrDeviceClass, classMap[i - 1]); + buf.putInt(ICC_Profile.icHdrDeviceClass, classMap[i - 1]); for (int i = 1; i < csTypeMap.length; i += 2) if (csTypeMap[i] == colorSpace) - buf.putInt(ICC_Profile.icHdrColorSpace, csTypeMap[i - 1]); + buf.putInt(ICC_Profile.icHdrColorSpace, csTypeMap[i - 1]); for (int i = 1; i < csTypeMap.length; i += 2) if (csTypeMap[i] == profileColorSpace) - buf.putInt(ICC_Profile.icHdrPcs, csTypeMap[i - 1]); + buf.putInt(ICC_Profile.icHdrPcs, csTypeMap[i - 1]); System.arraycopy(timestamp, 0, data, ICC_Profile.icHdrDate, timestamp.length); diff --git a/libjava/classpath/gnu/java/awt/color/RgbProfileConverter.java b/libjava/classpath/gnu/java/awt/color/RgbProfileConverter.java index 0cbd28f6cca..7623890a496 100644 --- a/libjava/classpath/gnu/java/awt/color/RgbProfileConverter.java +++ b/libjava/classpath/gnu/java/awt/color/RgbProfileConverter.java @@ -82,27 +82,27 @@ public class RgbProfileConverter implements ColorSpaceConverter // get TRCs try { - rTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.REDCOMPONENT)); + rTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.REDCOMPONENT)); } catch (ProfileDataException e) { - rTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.REDCOMPONENT)); + rTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.REDCOMPONENT)); } try { - gTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.GREENCOMPONENT)); + gTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.GREENCOMPONENT)); } catch (ProfileDataException e) { - gTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.GREENCOMPONENT)); + gTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.GREENCOMPONENT)); } try { - bTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.BLUECOMPONENT)); + bTRC = new ToneReproductionCurve(profile.getGamma(ICC_ProfileRGB.BLUECOMPONENT)); } catch (ProfileDataException e) { - bTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.BLUECOMPONENT)); + bTRC = new ToneReproductionCurve(profile.getTRC(ICC_ProfileRGB.BLUECOMPONENT)); } // If a CLUT is available, it should be used, and the TRCs ignored. @@ -112,30 +112,30 @@ public class RgbProfileConverter implements ColorSpaceConverter // unpredictable results. This is in line with the Java specification, try { - toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); + toPCS = new ColorLookUpTable(profile, ICC_Profile.icSigAToB0Tag); } catch (Exception e) { - toPCS = null; + toPCS = null; } try { - fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); + fromPCS = new ColorLookUpTable(profile, ICC_Profile.icSigBToA0Tag); } catch (Exception e) { - fromPCS = null; + fromPCS = null; } // Calculate the inverse matrix if no reverse CLUT is available if(fromPCS == null) - inv_matrix = invertMatrix(matrix); - else + inv_matrix = invertMatrix(matrix); + else { // otherwise just set it to an identity matrix - inv_matrix = new float[3][3]; - inv_matrix[0][0] = inv_matrix[1][1] = inv_matrix[2][2] = 1.0f; + inv_matrix = new float[3][3]; + inv_matrix[0][0] = inv_matrix[1][1] = inv_matrix[2][2] = 1.0f; } } @@ -191,7 +191,7 @@ public class RgbProfileConverter implements ColorSpaceConverter out[2] = bTRC.reverseLookup(temp[2]); // FIXME: Sun appears to clip the return values to [0,1] - // I don't believe that is a Good Thing, + // I don't believe that is a Good Thing, // (some colorspaces may allow values outside that range.) // So we return the actual values here. return out; diff --git a/libjava/classpath/gnu/java/awt/color/SrgbConverter.java b/libjava/classpath/gnu/java/awt/color/SrgbConverter.java index a30a0db906c..76831c0eaaa 100644 --- a/libjava/classpath/gnu/java/awt/color/SrgbConverter.java +++ b/libjava/classpath/gnu/java/awt/color/SrgbConverter.java @@ -107,15 +107,15 @@ public class SrgbConverter implements ColorSpaceConverter float[] out = new float[3]; for (int i = 0; i < 3; i++) { - if (temp[i] < 0) - temp[i] = 0.0f; - if (temp[i] > 1) - temp[i] = 1.0f; - if (temp[i] <= 0.00304f) - out[i] = temp[i] * 12.92f; - else - out[i] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(temp[i]))) - - 0.055f; + if (temp[i] < 0) + temp[i] = 0.0f; + if (temp[i] > 1) + temp[i] = 1.0f; + if (temp[i] <= 0.00304f) + out[i] = temp[i] * 12.92f; + else + out[i] = 1.055f * ((float) Math.exp((1 / 2.4) * Math.log(temp[i]))) + - 0.055f; } return out; } @@ -132,9 +132,9 @@ public class SrgbConverter implements ColorSpaceConverter float[] out = new float[3]; for (int i = 0; i < 3; i++) if (in[i] <= 0.03928f) - temp[i] = in[i] / 12.92f; + temp[i] = in[i] / 12.92f; else - temp[i] = (float) Math.exp(2.4 * Math.log((in[i] + 0.055) / 1.055)); + temp[i] = (float) Math.exp(2.4 * Math.log((in[i] + 0.055) / 1.055)); /* * Note: The numbers which were used to calculate this only had four diff --git a/libjava/classpath/gnu/java/awt/color/ToneReproductionCurve.java b/libjava/classpath/gnu/java/awt/color/ToneReproductionCurve.java index a1bccbd4068..208e1688316 100644 --- a/libjava/classpath/gnu/java/awt/color/ToneReproductionCurve.java +++ b/libjava/classpath/gnu/java/awt/color/ToneReproductionCurve.java @@ -103,20 +103,20 @@ public class ToneReproductionCurve if (trc == null) { - if (in == 0f) - return 0.0f; - return (float) Math.exp(gamma * Math.log(in)); + if (in == 0f) + return 0.0f; + return (float) Math.exp(gamma * Math.log(in)); } else { - double alpha = in * (trc.length - 1); - int index = (int) Math.floor(alpha); - alpha = alpha - (double) index; - if (index >= trc.length - 1) - return trc[trc.length - 1]; - if (index <= 0) - return trc[0]; - out = (float) (trc[index] * (1.0 - alpha) + trc[index + 1] * alpha); + double alpha = in * (trc.length - 1); + int index = (int) Math.floor(alpha); + alpha = alpha - (double) index; + if (index >= trc.length - 1) + return trc[trc.length - 1]; + if (index <= 0) + return trc[0]; + out = (float) (trc[index] * (1.0 - alpha) + trc[index + 1] * alpha); } return out; } @@ -130,21 +130,21 @@ public class ToneReproductionCurve if (trc == null) { - if (in == 0f) - return 0.0f; - return (float) Math.exp((1.0 / gamma) * Math.log(in)); + if (in == 0f) + return 0.0f; + return (float) Math.exp((1.0 / gamma) * Math.log(in)); } else { - double alpha = in * (reverseTrc.length - 1); - int index = (int) Math.floor(alpha); - alpha = alpha - (double) index; - if (index >= reverseTrc.length - 1) - return reverseTrc[reverseTrc.length - 1]; - if (index <= 0) - return reverseTrc[0]; - out = (float) (reverseTrc[index] * (1.0 - alpha) - + reverseTrc[index + 1] * alpha); + double alpha = in * (reverseTrc.length - 1); + int index = (int) Math.floor(alpha); + alpha = alpha - (double) index; + if (index >= reverseTrc.length - 1) + return reverseTrc[reverseTrc.length - 1]; + if (index <= 0) + return reverseTrc[0]; + out = (float) (reverseTrc[index] * (1.0 - alpha) + + reverseTrc[index + 1] * alpha); } return out; } @@ -164,14 +164,14 @@ public class ToneReproductionCurve int j = 0; for (int i = 0; i < 10000; i++) { - float n = ((float) i) / 10000f; - while (trc[j + 1] < n && j < trc.length - 2) - j++; + float n = ((float) i) / 10000f; + while (trc[j + 1] < n && j < trc.length - 2) + j++; - if (j == trc.length - 2) - reverseTrc[i] = trc[trc.length - 1]; - else - reverseTrc[i] = (j + (n - trc[j]) / (trc[j + 1] - trc[j])) / ((float) trc.length); + if (j == trc.length - 2) + reverseTrc[i] = trc[trc.length - 1]; + else + reverseTrc[i] = (j + (n - trc[j]) / (trc[j + 1] - trc[j])) / ((float) trc.length); } } } diff --git a/libjava/classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java b/libjava/classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java index 1f0c3ad2da6..4ef8c29188c 100644 --- a/libjava/classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java +++ b/libjava/classpath/gnu/java/awt/dnd/GtkMouseDragGestureRecognizer.java @@ -59,28 +59,28 @@ public class GtkMouseDragGestureRecognizer { this (ds, c, 0, null); } - + public GtkMouseDragGestureRecognizer (DragSource ds, Component c, int act) { this(ds, c, act, null); } - + public GtkMouseDragGestureRecognizer (DragSource ds, Component c, int act, DragGestureListener dgl) { super(ds, c, act, dgl); } - + public void registerListeners () { super.registerListeners(); } - + public void unregisterListeners () { super.unregisterListeners(); } - + public void mouseClicked (MouseEvent e) { // Nothing to do here. @@ -115,7 +115,7 @@ public class GtkMouseDragGestureRecognizer if (!events.isEmpty()) { int act = getDropActionFromEvent(e); - + if (act == DnDConstants.ACTION_NONE) return; @@ -124,14 +124,14 @@ public class GtkMouseDragGestureRecognizer int dx = Math.abs(origin.x - current.x); int dy = Math.abs(origin.y - current.y); int threshold = DragSource.getDragThreshold(); - + if (dx > threshold || dy > threshold) fireDragGestureRecognized(act, origin); else appendEvent(e); } } - + public void mouseMoved (MouseEvent e) { // Nothing to do here. @@ -142,10 +142,10 @@ public class GtkMouseDragGestureRecognizer int modEx = e.getModifiersEx(); int buttons = modEx & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON2_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK); - if (!(buttons == MouseEvent.BUTTON1_DOWN_MASK || + if (!(buttons == MouseEvent.BUTTON1_DOWN_MASK || buttons == MouseEvent.BUTTON2_DOWN_MASK)) return DnDConstants.ACTION_NONE; - + // Convert modifier to a drop action int sourceActions = getSourceActions(); int mod = modEx diff --git a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java index b68fa105803..4d109762615 100644 --- a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java +++ b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDragSourceContextPeer.java @@ -62,54 +62,54 @@ public class GtkDragSourceContextPeer private Cursor cursor; private DragSourceContext context; public static Component target; - + native void nativeStartDrag(Image i, int x, int y, int action, String target); native void connectSignals(ComponentPeer comp); native void create(ComponentPeer comp); native void nativeSetCursor(int cursor); native void setTarget(GtkDropTargetContextPeer target); - + public GtkDragSourceContextPeer(DragGestureEvent e) { super(e.getComponent()); Component comp = e.getComponent(); peer = getComponentPeer(comp); - + create(peer); connectSignals(peer); cursor = comp.getCursor(); - + // FIXME: Where do we set the target? - + if ((target != null)) setTarget(new GtkDropTargetContextPeer(target)); } - + ComponentPeer getComponentPeer(Component c) { if (c == null) return null; - + Component curr = c; while (curr.getPeer() instanceof LightweightPeer) curr = curr.getParent(); - + if (curr != null) return curr.getPeer(); return null; } - + public void startDrag(DragSourceContext context, Cursor c, Image i, Point p) throws InvalidDnDOperationException - { + { this.context = context; if (p == null) p = new Point(); - + // FIXME: use proper DataFlavor, not "text/plain". // Also, add check to determine if dragging. - + setCursor(c); nativeStartDrag(i, p.x, p.y, context.getTrigger().getDragAction(), "text/plain"); @@ -133,7 +133,7 @@ public class GtkDragSourceContextPeer { // Nothing to do here. } - + /** * Called from native code. */ diff --git a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java index f24b3f39bcb..315a2bdf150 100644 --- a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java +++ b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetContextPeer.java @@ -50,12 +50,12 @@ public class GtkDropTargetContextPeer extends GtkGenericPeer implements DropTargetContextPeer { - + public GtkDropTargetContextPeer(Object obj) { super(obj); } - + public void setTargetActions(int actions) { // FIXME: Not Implemented diff --git a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java index 88b75ad96ee..0799df5ba08 100644 --- a/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java +++ b/libjava/classpath/gnu/java/awt/dnd/peer/gtk/GtkDropTargetPeer.java @@ -52,7 +52,7 @@ public class GtkDropTargetPeer { super(null); } - + public void addDropTarget(DropTarget target) { // FIXME: Not Implemented diff --git a/libjava/classpath/gnu/java/awt/font/FontDelegate.java b/libjava/classpath/gnu/java/awt/font/FontDelegate.java index a7787330984..e5c03a10f4e 100644 --- a/libjava/classpath/gnu/java/awt/font/FontDelegate.java +++ b/libjava/classpath/gnu/java/awt/font/FontDelegate.java @@ -77,8 +77,8 @@ public interface FontDelegate * @return the face name. */ public String getFullName(Locale locale); - - + + /** * Returns the name of the family to which this font face belongs, * for example “Univers”. @@ -99,8 +99,8 @@ public interface FontDelegate * @return the name of the face inside its family. */ public String getSubFamilyName(Locale locale); - - + + /** * Returns the PostScript name of this font face, for example * “Helvetica-Bold”. @@ -131,7 +131,7 @@ public interface FontDelegate * glyph as an empty box. */ public int getMissingGlyphCode(); - + /** * Creates a GlyphVector by mapping each character in a @@ -205,7 +205,7 @@ public interface FontDelegate boolean fractionalMetrics, boolean horizontal, Point2D advance); - + /** * Returns the shape of a glyph. diff --git a/libjava/classpath/gnu/java/awt/font/FontFactory.java b/libjava/classpath/gnu/java/awt/font/FontFactory.java index 6c1084eefb0..53eb5df5f3f 100644 --- a/libjava/classpath/gnu/java/awt/font/FontFactory.java +++ b/libjava/classpath/gnu/java/awt/font/FontFactory.java @@ -58,7 +58,7 @@ public final class FontFactory { } - + /** * Creates FontDelegate objects for the fonts in the specified buffer. * The following font formats are currently recognized: diff --git a/libjava/classpath/gnu/java/awt/font/GNUGlyphVector.java b/libjava/classpath/gnu/java/awt/font/GNUGlyphVector.java index 22f331e15d1..9fd80e79ec6 100644 --- a/libjava/classpath/gnu/java/awt/font/GNUGlyphVector.java +++ b/libjava/classpath/gnu/java/awt/font/GNUGlyphVector.java @@ -113,7 +113,7 @@ public class GNUGlyphVector this.font = font; this.renderContext = renderContext; this.glyphs = glyphs; - + fontSize = font.getSize2D(); transform = font.getTransform(); // returns a modifiable copy //transform.concatenate(renderContext.getTransform()); @@ -156,7 +156,7 @@ public class GNUGlyphVector for (i = p = 0; i < glyphs.length; i++) { p += 2; - + if ((transforms == null) || (tx = transforms[i]) == null) tx = this.transform; else @@ -164,7 +164,7 @@ public class GNUGlyphVector tx = new AffineTransform(tx); tx.concatenate(this.transform); } - + fontDelegate.getAdvance(glyphs[i], fontSize, tx, renderContext.isAntiAliased(), renderContext.usesFractionalMetrics(), @@ -502,11 +502,11 @@ public class GNUGlyphVector { return layoutFlags; } - - + + /** * Returns the positions of a range of glyphs in this vector. - * + * * @param firstGlyphIndex the index of the first glyph whose * position is retrieved. * @@ -546,7 +546,7 @@ public class GNUGlyphVector return outPositions; } - + private float getAscent() { return fontDelegate.getAscent(fontSize, transform, @@ -561,7 +561,7 @@ public class GNUGlyphVector return fontDelegate.getDescent(fontSize, transform, renderContext.isAntiAliased(), renderContext.usesFractionalMetrics(), - /* horizontal */ true); + /* horizontal */ true); } diff --git a/libjava/classpath/gnu/java/awt/font/OpenTypeFontPeer.java b/libjava/classpath/gnu/java/awt/font/OpenTypeFontPeer.java index e8124528e6a..d8bff119997 100644 --- a/libjava/classpath/gnu/java/awt/font/OpenTypeFontPeer.java +++ b/libjava/classpath/gnu/java/awt/font/OpenTypeFontPeer.java @@ -180,7 +180,7 @@ public class OpenTypeFontPeer { return 0.F; } - + } private class XFontMetrics @@ -207,7 +207,7 @@ public class OpenTypeFontPeer return (int) fontDelegate.getDescent(getFont().getSize(), IDENDITY, false, false, false); } - + public int getHeight() { GlyphVector gv = fontDelegate.createGlyphVector(getFont(), @@ -441,7 +441,7 @@ public class OpenTypeFontPeer case Font.PLAIN: default: key.append("p"); - + } return key.toString(); diff --git a/libjava/classpath/gnu/java/awt/font/autofit/GlyphHints.java b/libjava/classpath/gnu/java/awt/font/autofit/GlyphHints.java index 72f07ed81fc..033d63fa456 100644 --- a/libjava/classpath/gnu/java/awt/font/autofit/GlyphHints.java +++ b/libjava/classpath/gnu/java/awt/font/autofit/GlyphHints.java @@ -84,7 +84,7 @@ class GlyphHints metrics = m; // TODO: Copy scalerFlags. } - + void reload(Zone outline) { numPoints = 0; diff --git a/libjava/classpath/gnu/java/awt/font/autofit/Latin.java b/libjava/classpath/gnu/java/awt/font/autofit/Latin.java index 8951e8b19db..c132c2cdc7a 100644 --- a/libjava/classpath/gnu/java/awt/font/autofit/Latin.java +++ b/libjava/classpath/gnu/java/awt/font/autofit/Latin.java @@ -103,7 +103,7 @@ class Latin hints.alignStrongPoints(dim); if (hints.doAlignWeakPoints()) hints.alignWeakPoints(dim); - + } } // FreeType does a save call here. I guess that's not needed as we operate @@ -407,7 +407,7 @@ class Latin dist += 54; else dist += delta; - + } else { @@ -969,7 +969,7 @@ class Latin blue.flags = 0; if (isTopBlue(bb)) blue.flags |= LatinBlue.FLAG_TOP; - // The following flag is used later to adjust y and x scales in + // The following flag is used later to adjust y and x scales in // order to optimize the pixel grid alignment of the top small // letters. if (bb == SMALL_TOP) @@ -1043,7 +1043,7 @@ class Latin last = point; boolean passed = false; boolean onEdge = false; - while (true) + while (true) { int u, v; if (onEdge) @@ -1099,7 +1099,7 @@ class Latin point = point.getNext(); } } - + } private boolean isTopBlue(int b) @@ -1276,7 +1276,7 @@ class Latin // Debug: Print out all edges. // System.err.println("edge# " + e + ": " + edge); - } + } } private void computeBlueEdges(GlyphHints hints, LatinMetrics metrics) @@ -1297,7 +1297,7 @@ class Latin // System.err.println("checking edge: " + edge); Width bestBlue = null; int bestDist = Fixed.mul16(metrics.unitsPerEm / 40, scale); - + if (bestDist > 64 / 2) bestDist = 64 / 2; for (int bb = 0; bb < BLUE_MAX; bb++) diff --git a/libjava/classpath/gnu/java/awt/font/autofit/Utils.java b/libjava/classpath/gnu/java/awt/font/autofit/Utils.java index 4df4705a8d1..ca45bb2e462 100644 --- a/libjava/classpath/gnu/java/awt/font/autofit/Utils.java +++ b/libjava/classpath/gnu/java/awt/font/autofit/Utils.java @@ -158,7 +158,7 @@ class Utils return angle; } - + angle = 0; if (dx < 0) { diff --git a/libjava/classpath/gnu/java/awt/font/opentype/CharGlyphMap.java b/libjava/classpath/gnu/java/awt/font/opentype/CharGlyphMap.java index 184075094b6..8529f7e4766 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/CharGlyphMap.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/CharGlyphMap.java @@ -89,7 +89,7 @@ public abstract class CharGlyphMap /** * Reads a CharGlyphMap from an OpenType or TrueType cmap * table. The current implementation works as follows: - * + * *

    1. If the font has a type 4 cmap for the Unicode platform * (encoding 0, 1, 2, 3 or 4), or a type 4 cmap for the Microsoft * platform (encodings 1 or 10), that table is used to map Unicode @@ -132,7 +132,7 @@ public abstract class CharGlyphMap version = buf.getChar(); if (version != 0) return null; - + numTables = buf.getChar(); for (int i = 0; i < numTables; i++) { @@ -229,8 +229,8 @@ public abstract class CharGlyphMap return 0; } } - - + + /** * A mapping from Unicode code points to glyph IDs through CMAP Type * 0 tables. These tables have serious limitations: Only the first @@ -255,8 +255,8 @@ public abstract class CharGlyphMap * Unicode code point of glyph i in the font. */ private char[] glyphToUCS2 = new char[256]; - - + + /** * A String whose charAt(i) is the Unicode character * that corresponds to the codepoint i + 127 in the @@ -562,7 +562,7 @@ public abstract class CharGlyphMap /* The CMAP version must be 0. */ if (buf.getChar() != 0) throw new IllegalStateException(); - + numTables = buf.getChar(); for (int i = 0; i < numTables; i++) { @@ -705,7 +705,7 @@ public abstract class CharGlyphMap return null; } } - + /** * A mapping from Unicode code points to glyph IDs through CMAP Type @@ -805,7 +805,7 @@ public abstract class CharGlyphMap buf.position(pos); idRangeOffset_glyphID = buf.asCharBuffer(); - + endCode.limit(segCount); startCode.limit(segCount); idDelta.limit(segCount); @@ -856,7 +856,7 @@ public abstract class CharGlyphMap segStart = firstChar.get(segment); if ((c < segStart) || (c > lastChar.get(segment))) return 0; - + /* * System.out.println("seg " + segment * + ", range=" + (int) rangeID[segment] @@ -912,8 +912,8 @@ public abstract class CharGlyphMap { int numGroups; IntBuffer data; - - + + /** * Determines whether this implementation supports a combination * of platform and encoding for a type 12 cmap table. @@ -964,8 +964,8 @@ public abstract class CharGlyphMap numGroups = buf.getInt(); data = buf.asIntBuffer(); } - - + + /** * Determines the glyph index for a given Unicode codepoint. Users * should be aware that the character-to-glyph mapping not not @@ -993,7 +993,7 @@ public abstract class CharGlyphMap startCharCode = data.get(3 * mid); endCharCode = data.get(3 * mid + 1); - + /* System.out.println("group " + mid + " (U+" + Integer.toHexString(startCharCode) @@ -1005,7 +1005,7 @@ public abstract class CharGlyphMap return ucs4 - startCharCode + /* startGlyphID */ data.get(mid * 3 + 2); - + if (endCharCode < ucs4) min = mid + 1; else diff --git a/libjava/classpath/gnu/java/awt/font/opentype/GlyphNamer.java b/libjava/classpath/gnu/java/awt/font/opentype/GlyphNamer.java index c2b009de3e6..72cecb5424d 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/GlyphNamer.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/GlyphNamer.java @@ -411,7 +411,7 @@ final class GlyphNamer readPost(); } - + /** * Sets up the information which allows to retrieve the information @@ -625,7 +625,7 @@ final class GlyphNamer * print " private static final String %s" % name * for i in range(0, len(s), 60): * print ' + "%s"' % s[i:i+60] - * + * * glyphs = {} * for line in open('aglfn13.txt', 'r').readlines(): * if line[0] == '#': continue @@ -1009,7 +1009,7 @@ final class GlyphNamer */ min = 0; max = AGLFN_GLYPHS.length() - 1; - mid = max >> 1; + mid = max >> 1; midChar = AGLFN_GLYPHS.charAt(mid); do { @@ -1023,7 +1023,7 @@ final class GlyphNamer midChar = AGLFN_GLYPHS.charAt(mid); } while (min < max); - + if (midChar != c) return null; @@ -1078,7 +1078,7 @@ final class GlyphNamer if (name != null) return name; } - + CPStringBuilder buf = new CPStringBuilder(numChars * 8); for (int i = 0; i < numChars; i++) { diff --git a/libjava/classpath/gnu/java/awt/font/opentype/MacResourceFork.java b/libjava/classpath/gnu/java/awt/font/opentype/MacResourceFork.java index 8115e0403ef..c0f3de80e80 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/MacResourceFork.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/MacResourceFork.java @@ -123,7 +123,7 @@ final class MacResourceFork } } } - + public Resource[] getResources(int type) { @@ -137,7 +137,7 @@ final class MacResourceFork } return null; } - + public Resource getResource(int type, short id) { @@ -149,7 +149,7 @@ final class MacResourceFork { if (types[i] != type) continue; - + res = resources[i]; for (int j = 0; j < res.length; j++) if (res[j].getID() == id) diff --git a/libjava/classpath/gnu/java/awt/font/opentype/NameDecoder.java b/libjava/classpath/gnu/java/awt/font/opentype/NameDecoder.java index e4ea202bb6c..1f1d50ac1b2 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/NameDecoder.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/NameDecoder.java @@ -139,20 +139,20 @@ public class NameDecoder nameLen = nameTable.getShort(); nameStart = offset + nameTable.getShort(); - + if (nameID != name) continue; // Handle PS seperately as it can be only ASCII, although // possibly encoded as UTF-16BE if ( name == NAME_POSTSCRIPT ) - { - if( nameTable.get(nameStart) == 0 ) // Peek at top byte - result = decodeName("UTF-16BE", nameTable, nameStart, nameLen); - else - result = decodeName("ASCII", nameTable, nameStart, nameLen); - return result; - } + { + if( nameTable.get(nameStart) == 0 ) // Peek at top byte + result = decodeName("UTF-16BE", nameTable, nameStart, nameLen); + else + result = decodeName("ASCII", nameTable, nameStart, nameLen); + return result; + } match = false; switch (namePlatform) @@ -186,7 +186,7 @@ public class NameDecoder break; } - + if (match) { result = decodeName(namePlatform, nameEncoding, nameLanguage, @@ -316,7 +316,7 @@ public class NameDecoder if (loc == null) return -1; - + code = findLanguageCode(loc.getLanguage(), macLanguageCodes); switch (code) { @@ -333,10 +333,10 @@ public class NameDecoder // know what do do about them. See the method documentation for // details. } - + return code; } - + /** * Maps a Java Locale into a Microsoft language code. @@ -348,7 +348,7 @@ public class NameDecoder if (locale == null) return -1; - + isoCode = locale.getLanguage(); code = findLanguageCode(isoCode, microsoftLanguageCodes); if (code == -1) @@ -572,7 +572,7 @@ public class NameDecoder } } - + /** * Maps a Microsoft locale ID (LCID) to the name of the * corresponding Java Charset. @@ -664,7 +664,7 @@ public class NameDecoder case 3: /* Microsoft Windows */ return getWindowsLocale(language); - + default: return null; } diff --git a/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFont.java b/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFont.java index 6c2193b94ae..f46addc3cad 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFont.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFont.java @@ -83,7 +83,7 @@ public final class OpenTypeFont static final int TAG_TRUE = 0x74727565; // 'true' static final int TAG_TTCF = 0x74746366; // 'ttcf' static final int TAG_ZAPF = 0x5a617066; // 'Zapf' - + /** * A buffer containing the font data. Note that this may well be an @@ -112,7 +112,7 @@ public final class OpenTypeFont */ private int version; - + /** * The number of font units per em. For fonts with TrueType * outlines, this is usually a power of two (such as 2048). For @@ -133,7 +133,7 @@ public final class OpenTypeFont * The scaler to which the actual scaling work is delegated. */ private Scaler scaler; - + /** * A delegate object for mapping Unicode UCS-4 codepoints to glyph @@ -277,8 +277,8 @@ public final class OpenTypeFont return i; return -1; } - - + + /** * Returns the name of the family to which this font face belongs, @@ -352,8 +352,8 @@ public final class OpenTypeFont return name; } - - + + /** * Returns the full name of this font face, for example @@ -404,7 +404,7 @@ public final class OpenTypeFont */ return numGlyphs; } - + /** * Returns the index of the glyph which gets displayed if the font @@ -489,7 +489,7 @@ public final class OpenTypeFont result.limit(len); return result; } - + /** * Returns the size of one of the tables in the font, @@ -508,7 +508,7 @@ public final class OpenTypeFont { if (cmap != null) return cmap; - + synchronized (this) { if (cmap == null) @@ -545,7 +545,7 @@ public final class OpenTypeFont return getCharGlyphMap().getGlyph(ucs4); } - + /** * Creates a GlyphVector by mapping each character in a * CharacterIterator to the corresponding glyph. @@ -584,7 +584,7 @@ public final class OpenTypeFont // Initialize hinter if necessary. checkHinter(FontDelegate.FLAG_FITTED); - CharGlyphMap cmap; + CharGlyphMap cmap; int numGlyphs; int[] glyphs; int glyph; diff --git a/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java b/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java index 3a00dfba2cf..32c4828c98d 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/OpenTypeFontFactory.java @@ -126,7 +126,7 @@ public final class OpenTypeFontFactory rsrc = fork.getResources(OpenTypeFont.TAG_SFNT); fonts = new OpenTypeFont[rsrc.length]; - for (int i = 0; i < fonts.length; i++) + for (int i = 0; i < fonts.length; i++) fonts[i] = new OpenTypeFont(rsrc[i].getContent(), 0); return fonts; diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java index 249a87dd403..8a3c56665ed 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLoader.java @@ -71,8 +71,8 @@ final class GlyphLoader * glyph. */ private final GlyphMeasurer glyphMeasurer; - - + + /** * The virtual machine for executing TrueType bytecodes. */ @@ -157,7 +157,7 @@ final class GlyphLoader yMin = glyph.getChar(); xMax = glyph.getChar(); yMax = glyph.getChar(); - + if (numContours >= 0) loadSimpleGlyph(glyphIndex, pointSize, transform, antialias, @@ -272,13 +272,13 @@ final class GlyphLoader if ((flags & WE_HAVE_A_SCALE) != 0) { a = d = getDouble214(glyph); - b = c = 0.0; + b = c = 0.0; } else if ((flags & WE_HAVE_AN_X_AND_Y_SCALE) != 0) { a = getDouble214(glyph); d = getDouble214(glyph); - b = c = 0.0; + b = c = 0.0; } else if ((flags & WE_HAVE_A_TWO_BY_TWO) != 0) { @@ -310,7 +310,7 @@ final class GlyphLoader if (Math.abs(Math.abs(c) - Math.abs(d)) <= 33.0/65536.0) n = n * 2; - + if ((flags & ARGS_ARE_XY_VALUES) != 0) { e = m * arg1; @@ -320,14 +320,14 @@ final class GlyphLoader e = f = 0.0; componentTransform.setTransform(a, b, c, d, 0.0, 0.0); - + // System.out.println("componentTransform = " + componentTransform // + ", e=" + e + ", f=" + f); componentTransform.concatenate(transform); int pos = glyph.position(); int lim = glyph.limit(); - + loadSubGlyph(subGlyphIndex, pointSize, componentTransform, antialias, subGlyphZone, Math.round((float) e + preTranslateX), @@ -431,7 +431,7 @@ final class GlyphLoader glyphMeasurer.getAdvanceWidth(glyphIndex, true)); glyphZone.setOriginalY(numPoints + 1, glyphMeasurer.getAdvanceHeight(glyphIndex, true)); - + /* Phantom point 2: Vertical origin. */ int vertX = glyphMeasurer.getAscent(/* vertical */ false); int vertY = glyphMeasurer.getAscent(/* horizontal */ true); diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java index a2db8aca7e4..fc2256b154e 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphLocator.java @@ -94,7 +94,7 @@ abstract class GlyphLocator case 1: return new GlyphLocator.FourByte(loca, glyf); - + default: throw new FontFormatException("unsupported loca format"); } diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java index bbd0b9bffbc..452456d13c8 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/GlyphMeasurer.java @@ -69,7 +69,7 @@ final class GlyphMeasurer * font’s vmtx table as shorts. */ private final ShortBuffer verticalGlyphMetrics; - + private final int numLongHorizontalMetricsEntries; private final int numLongVerticalMetricsEntries; @@ -82,7 +82,7 @@ final class GlyphMeasurer private final int horizontalLineGap; - + /** * Constructs a GlyphMeasurer from TrueType/OpenType font tables. * @@ -145,7 +145,7 @@ final class GlyphMeasurer { return horizontal ? horizontalAscent : verticalAscent; } - + /** * Returns the distance from the baseline to the lowest descender. @@ -156,7 +156,7 @@ final class GlyphMeasurer * @return the maximal descent, in font units. */ public int getDescent(boolean horizontal) - { + { return horizontal ? horizontalDescent : verticalDescent; } @@ -188,7 +188,7 @@ final class GlyphMeasurer * @return the advance width, in font units. */ public int getAdvanceWidth(int glyphIndex, boolean horizontal) - { + { if (!horizontal) return 0; diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/Point.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/Point.java index 31c12037c27..438eb6558d3 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/Point.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/Point.java @@ -53,7 +53,7 @@ public class Point public static final short FLAG_INFLECTION = 32; public static final short FLAG_DONE_X = 64; public static final short FLAG_DONE_Y = 128; - + /** * Right direction. */ diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java index 5f5cc0001d9..1d5c53f9ddf 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/TrueTypeScaler.java @@ -137,7 +137,7 @@ public final class TrueTypeScaler ByteBuffer htmx, ByteBuffer vhea, ByteBuffer vtmx, - ByteBuffer maxp, + ByteBuffer maxp, ByteBuffer controlValueTable, ByteBuffer fpgm, int locaFormat, ByteBuffer loca, @@ -254,7 +254,7 @@ public final class TrueTypeScaler advance.setLocation( scaleFactor * glyphMeasurer.getAdvanceWidth(glyphIndex, horizontal), scaleFactor * glyphMeasurer.getAdvanceHeight(glyphIndex, horizontal)); - + transform.transform(advance, advance); } diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java index c88d4c6491c..512c39ffd43 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/VirtualMachine.java @@ -70,7 +70,7 @@ import java.nio.ShortBuffer; * obtained from Apple Computer to use the patented technology inside * the United States. For other countries, different dates might * apply, or no license might be needed. - * + * *

      The default build of this class does not use the patented * algorithms. If you have obtained a license from Apple, or if the * patent protection has expired, or if no license is required for @@ -348,7 +348,7 @@ class VirtualMachine /* Read the contents of the Control Value Table. */ if (controlValueTable != null) this.controlValueTable = controlValueTable.asShortBuffer(); - + maxInstructionDefs = maxp.getChar(22); maxStackElements = maxp.getChar(24); storage = new int[maxStorage]; @@ -356,7 +356,7 @@ class VirtualMachine this.preProgram = preProgram; numTwilightPoints = maxp.getChar(16); } - + /** * Sets the graphics state to default values. @@ -462,7 +462,7 @@ class VirtualMachine changeCTM = ((pointSize_Fixed != this.pointSize) || !deviceTransform.equals(this.deviceTransform) || (antialiased != this.antialiased)); - + if (changeCTM) { this.pointSize = pointSize_Fixed; @@ -489,7 +489,7 @@ class VirtualMachine return executeGlyphInstructions; } - + /** * Executes a stream of TrueType instructions. @@ -577,7 +577,7 @@ class VirtualMachine sbuf.append(getHex(inst.get(pc + 1 + i))); } } - + while (sbuf.length() < 30) sbuf.append(' '); sbuf.append('|'); @@ -814,7 +814,7 @@ class VirtualMachine case 0x16: // SZPS, Set Zone PointerS zp0 = zp1 = zp2 = getZone(stack[sp--]); break; - + case 0x17: // SLOOP, Set LOOP variable loop = stack[sp--]; break; @@ -837,7 +837,7 @@ class VirtualMachine /* illegal: --, -- */ -1, -1, /* handle nested if clauses */ true); break; - + case 0x1C: // JMPR, JuMP Relative inst.position(inst.position() - 1 + stack[sp--]); break; @@ -905,7 +905,7 @@ class VirtualMachine execute(fdefBuffer[i], fdefEntryPoint[i]); inst.position(e1); break; - + case 0x2C: // FDEF, Function DEFinition i = stack[sp--]; fdefBuffer[i] = inst; @@ -1170,7 +1170,7 @@ class VirtualMachine sp -= 2 * count; deltaC(stack, sp + 1, count, 32); break; - + case 0x76: // SROUND, Super ROUND setRoundingMode(Fixed.ONE, stack[sp--]); break; @@ -1198,7 +1198,7 @@ class VirtualMachine break; case 0x7c: // RUTG, Round Up To Grid - setRoundingMode(Fixed.ONE, 0x40); + setRoundingMode(Fixed.ONE, 0x40); break; case 0x7d: // RDTG, Round Down To Grid @@ -1279,7 +1279,7 @@ class VirtualMachine break; } break; - + case 0xb0: // PUSHB[0] case 0xb1: // PUSHB[1] case 0xb2: // PUSHB[2] @@ -1424,7 +1424,7 @@ class VirtualMachine delta = (arg & 15) - 8; if (delta >= 0) ++delta; - + rightShift = deltaShift - 6; if (rightShift > 0) delta = delta >> rightShift; @@ -1570,7 +1570,7 @@ class VirtualMachine org_a = getOriginalProjection(zp0, rp1); cur_a = getProjection(zp0, rp1); - org_b = getOriginalProjection(zp1, rp2); + org_b = getOriginalProjection(zp1, rp2); cur_b = getProjection(zp1, rp2); while (--loop >= 0) @@ -1643,7 +1643,7 @@ class VirtualMachine { result = compensation - roundPhase + roundThreshold - distance; result &= -roundPeriod; - return Math.max(-result, 0) - roundPhase; + return Math.max(-result, 0) - roundPhase; } } @@ -1694,7 +1694,7 @@ class VirtualMachine { cachedPixelsPerEM = Fixed.intValue(Fixed.vectorLength( applyCTM_x(projX >> 8, projY >> 8), - applyCTM_y(projX >> 8, projY >> 8))); + applyCTM_y(projX >> 8, projY >> 8))); } return cachedPixelsPerEM; diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/Zone.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/Zone.java index 7c25a0a6a49..b0559e0e39d 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/Zone.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/Zone.java @@ -229,7 +229,7 @@ public final class Zone System.out.print('.'); else System.out.print('c'); - if (isContourEnd(i)) + if (isContourEnd(i)) System.out.print('E'); System.out.println(); if (isContourEnd(i)) diff --git a/libjava/classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java b/libjava/classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java index 0f60828b892..f4534f36fed 100644 --- a/libjava/classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java +++ b/libjava/classpath/gnu/java/awt/font/opentype/truetype/ZonePathIterator.java @@ -70,7 +70,7 @@ final class ZonePathIterator */ private static final int EMIT_CLOSE = 1; - + /** * If state has this value, currentSegment * will emit a SEG_MOVETO segment to the first point in @@ -115,7 +115,7 @@ final class ZonePathIterator */ private int contourStart; - + private int type; /** @@ -152,7 +152,7 @@ final class ZonePathIterator return (state != EMIT_CLOSE) && (curPoint >= numPoints); } - + public void next() { boolean onCurve; @@ -231,7 +231,7 @@ final class ZonePathIterator else return p + 1; } - + /** @@ -244,7 +244,7 @@ final class ZonePathIterator { case EMIT_CLOSE: return PathIterator.SEG_CLOSE; - + case EMIT_MOVETO: return getStartSegment(curPoint, coords); @@ -270,7 +270,7 @@ final class ZonePathIterator if (floats == null) floats = new float[6]; int result; - + result = currentSegment(floats); for (int i = 0; i < 6; i++) coords[i] = floats[i]; @@ -362,7 +362,7 @@ final class ZonePathIterator if (zone.isOnCurve(contourStart)) { x = zone.getX(contourStart, type); - y = zone.getY(contourStart, type); + y = zone.getY(contourStart, type); } else { diff --git a/libjava/classpath/gnu/java/awt/image/AsyncImage.java b/libjava/classpath/gnu/java/awt/image/AsyncImage.java index 935601a8898..4fa33740e19 100644 --- a/libjava/classpath/gnu/java/awt/image/AsyncImage.java +++ b/libjava/classpath/gnu/java/awt/image/AsyncImage.java @@ -159,9 +159,9 @@ public class AsyncImage g = r.getGraphics(); // Should we return some dummy graphics instead? return g; } - + public boolean isComplete() { - return complete; + return complete; } public int getHeight(ImageObserver observer) diff --git a/libjava/classpath/gnu/java/awt/image/ImageConverter.java b/libjava/classpath/gnu/java/awt/image/ImageConverter.java index f607b349630..f9c6268c3d2 100644 --- a/libjava/classpath/gnu/java/awt/image/ImageConverter.java +++ b/libjava/classpath/gnu/java/awt/image/ImageConverter.java @@ -55,7 +55,7 @@ import java.util.Hashtable; /** * Convert an Image to a BufferedImage. - * + * * @author Roman Kennke (kennke@aicas.com) */ public class ImageConverter implements ImageConsumer @@ -121,7 +121,7 @@ public class ImageConverter implements ImageConsumer scansize, transparency); } else if (model instanceof IndexColorModel - && targetColorModel.equals(ColorModel.getRGBdefault())) + && targetColorModel.equals(ColorModel.getRGBdefault())) { transparency = convertIndexColorModelToSRGB(x, y, w, h, (IndexColorModel) model, @@ -246,7 +246,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int transferPixels(int x, int y, int w, int h, ColorModel model, @@ -281,7 +281,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int transferPixels(int x, int y, int w, int h, ColorModel model, @@ -317,7 +317,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int convertPixels(int x, int y, int w, int h, ColorModel model, @@ -356,7 +356,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int convertPixels(int x, int y, int w, int h, ColorModel model, @@ -394,7 +394,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int convertIndexColorModelToSRGB(int x, int y, int w, int h, @@ -447,7 +447,7 @@ public class ImageConverter implements ImageConsumer * @param offset the offset in the pixel array * @param scansize the scanline size * @param transparency the assumed transparency - * + * * @return the determined transparency */ private int convertIndexColorModelToSRGB(int x, int y, int w, int h, diff --git a/libjava/classpath/gnu/java/awt/image/ImageDecoder.java b/libjava/classpath/gnu/java/awt/image/ImageDecoder.java index 8e8eecb2599..a572ea33b97 100644 --- a/libjava/classpath/gnu/java/awt/image/ImageDecoder.java +++ b/libjava/classpath/gnu/java/awt/image/ImageDecoder.java @@ -48,7 +48,7 @@ import java.io.InputStream; import java.net.URL; import java.util.Vector; -public abstract class ImageDecoder implements ImageProducer +public abstract class ImageDecoder implements ImageProducer { Vector consumers = new Vector (); String filename; @@ -94,7 +94,7 @@ public abstract class ImageDecoder implements ImageProducer length = imagelength; } - public void addConsumer (ImageConsumer ic) + public void addConsumer (ImageConsumer ic) { consumers.addElement (ic); } @@ -103,7 +103,7 @@ public abstract class ImageDecoder implements ImageProducer { return consumers.contains (ic); } - + public void removeConsumer (ImageConsumer ic) { consumers.removeElement (ic); @@ -115,20 +115,20 @@ public abstract class ImageDecoder implements ImageProducer addConsumer(ic); Vector list = (Vector) consumers.clone (); - try + try { - // Create the input stream here rather than in the - // ImageDecoder constructors so that exceptions cause - // imageComplete to be called with an appropriate error - // status. + // Create the input stream here rather than in the + // ImageDecoder constructors so that exceptions cause + // imageComplete to be called with an appropriate error + // status. if (input == null) { - try + try { if (url != null) input = url.openStream(); - else if (datainput != null) - input = new DataInputStreamWrapper(datainput); + else if (datainput != null) + input = new DataInputStreamWrapper(datainput); else { if (filename != null) @@ -137,8 +137,8 @@ public abstract class ImageDecoder implements ImageProducer input = new ByteArrayInputStream (data, offset, length); } produce (list, input); - } - finally + } + finally { input = null; } @@ -150,16 +150,16 @@ public abstract class ImageDecoder implements ImageProducer } catch (Exception e) { - for (int i = 0; i < list.size (); i++) - { - ImageConsumer ic2 = (ImageConsumer) list.elementAt (i); - ic2.imageComplete (ImageConsumer.IMAGEERROR); - } + for (int i = 0; i < list.size (); i++) + { + ImageConsumer ic2 = (ImageConsumer) list.elementAt (i); + ic2.imageComplete (ImageConsumer.IMAGEERROR); + } } } - public void requestTopDownLeftRightResend (ImageConsumer ic) - { + public void requestTopDownLeftRightResend (ImageConsumer ic) + { } public abstract void produce (Vector v, InputStream is) throws IOException; @@ -176,13 +176,13 @@ public abstract class ImageDecoder implements ImageProducer public int read() throws IOException { try - { - return datainput.readByte() & 0xFF; - } + { + return datainput.readByte() & 0xFF; + } catch (EOFException eofe) - { - return -1; - } + { + return -1; + } } } } diff --git a/libjava/classpath/gnu/java/awt/image/XBMDecoder.java b/libjava/classpath/gnu/java/awt/image/XBMDecoder.java index 0793d8ee749..35a3568b844 100644 --- a/libjava/classpath/gnu/java/awt/image/XBMDecoder.java +++ b/libjava/classpath/gnu/java/awt/image/XBMDecoder.java @@ -55,8 +55,8 @@ public class XBMDecoder extends ImageDecoder static final ColorModel cm = ColorModel.getRGBdefault (); static final int black = 0xff000000; static final int transparent = 0x00000000; - static final int masktable[] = { 0x01, 0x02, 0x04, 0x08, - 0x10, 0x20, 0x40, 0x80 }; + static final int masktable[] = { 0x01, 0x02, 0x04, 0x08, + 0x10, 0x20, 0x40, 0x80 }; public XBMDecoder (String filename) { @@ -75,27 +75,27 @@ public class XBMDecoder extends ImageDecoder for (int i = 0; i < 2; i++) { - String line = reader.readLine (); - StringTokenizer st = new StringTokenizer (line); - - st.nextToken (); // #define - st.nextToken (); // name_[width|height] - if (i == 0) - width = Integer.parseInt (st.nextToken (), 10); - else - height = Integer.parseInt (st.nextToken (), 10); + String line = reader.readLine (); + StringTokenizer st = new StringTokenizer (line); + + st.nextToken (); // #define + st.nextToken (); // name_[width|height] + if (i == 0) + width = Integer.parseInt (st.nextToken (), 10); + else + height = Integer.parseInt (st.nextToken (), 10); } for (int i = 0; i < v.size (); i++) { - ImageConsumer ic = (ImageConsumer) v.elementAt (i); + ImageConsumer ic = (ImageConsumer) v.elementAt (i); - ic.setDimensions (width, height); - ic.setColorModel (cm); - ic.setHints (ImageConsumer.COMPLETESCANLINES - | ImageConsumer.SINGLEFRAME - | ImageConsumer.SINGLEPASS - | ImageConsumer.TOPDOWNLEFTRIGHT); + ic.setDimensions (width, height); + ic.setColorModel (cm); + ic.setHints (ImageConsumer.COMPLETESCANLINES + | ImageConsumer.SINGLEFRAME + | ImageConsumer.SINGLEPASS + | ImageConsumer.TOPDOWNLEFTRIGHT); } /* skip to the byte array */ @@ -104,22 +104,22 @@ public class XBMDecoder extends ImageDecoder /* loop through each scanline */ for (int line = 0; line < height; line++) { - int scanline[] = getScanline (reader, width); + int scanline[] = getScanline (reader, width); - for (int i = 0; i < v.size (); i++) - { - ImageConsumer ic = (ImageConsumer) v.elementAt (i); - ic.setPixels (0, 0 + line, width, 1, cm, scanline, 0, width); - } + for (int i = 0; i < v.size (); i++) + { + ImageConsumer ic = (ImageConsumer) v.elementAt (i); + ic.setPixels (0, 0 + line, width, 1, cm, scanline, 0, width); + } } /* tell each ImageConsumer that we're finished */ for (int i = 0; i < v.size (); i++) { - ImageConsumer ic = (ImageConsumer) v.elementAt (i); - ic.imageComplete (ImageConsumer.STATICIMAGEDONE); + ImageConsumer ic = (ImageConsumer) v.elementAt (i); + ic.imageComplete (ImageConsumer.STATICIMAGEDONE); } - } + } public static int[] getScanline (Reader in, int len) throws IOException { @@ -129,25 +129,25 @@ public class XBMDecoder extends ImageDecoder while (x < len) { - int ch = in.read (); - if (ch == '0') - { - in.read (); // 'x' - - byteStr[0] = (char) in.read (); - byteStr[1] = (char) in.read (); + int ch = in.read (); + if (ch == '0') + { + in.read (); // 'x' - int byteVal = Integer.parseInt (new String (byteStr), 16); + byteStr[0] = (char) in.read (); + byteStr[1] = (char) in.read (); - for (int i = 0; i < 8; i++, x++) - { - if (x == len) // condition occurs if bitmap is padded - return scanline; + int byteVal = Integer.parseInt (new String (byteStr), 16); - scanline[x] = ((byteVal & masktable[i]) != 0) ? - black : transparent; - } - } + for (int i = 0; i < 8; i++, x++) + { + if (x == len) // condition occurs if bitmap is padded + return scanline; + + scanline[x] = ((byteVal & masktable[i]) != 0) ? + black : transparent; + } + } } return scanline; diff --git a/libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java b/libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java index 8504659388c..1334866f270 100644 --- a/libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java +++ b/libjava/classpath/gnu/java/awt/java2d/AbstractGraphics2D.java @@ -166,7 +166,7 @@ public abstract class AbstractGraphics2D */ protected static final WeakHashMap> imageCache = new WeakHashMap>(); - + /** * Wether we use anti aliasing for rendering text by default or not. */ @@ -234,7 +234,7 @@ public abstract class AbstractGraphics2D */ private Color foreground = Color.BLACK; private boolean isForegroundColorNull = true; - + /** * The current font. */ @@ -287,16 +287,16 @@ public abstract class AbstractGraphics2D private static final HashMap STANDARD_HINTS; static { - + HashMap hints = new HashMap(); hints.put(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT); hints.put(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_DEFAULT); - + STANDARD_HINTS = hints; } - + /** * Creates a new AbstractGraphics2D instance. */ @@ -398,8 +398,8 @@ public abstract class AbstractGraphics2D * * @param image the source buffered image * @param op the filter to apply to the buffered image before rendering - * @param x the x coordinate to render the image to - * @param y the y coordinate to render the image to + * @param x the x coordinate to render the image to + * @param y the y coordinate to render the image to */ public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y) { @@ -415,7 +415,7 @@ public abstract class AbstractGraphics2D * transform is used to convert the image into user space. The transform * of this AbstractGraphics2D object is used to transform from user space * to device space. - * + * * The rendering is performed using the scanline algorithm that performs the * rendering of other shapes and a custom Paint implementation, that supplies * the pixel values of the rendered image. @@ -438,7 +438,7 @@ public abstract class AbstractGraphics2D * of this AbstractGraphics2D object is used to transform from user space * to device space. Only the area specified by areaOfInterest * is finally rendered to the target. - * + * * The rendering is performed using the scanline algorithm that performs the * rendering of other shapes and a custom Paint implementation, that supplies * the pixel values of the rendered image. @@ -504,7 +504,7 @@ public abstract class AbstractGraphics2D (int) image.getWidth(), (int) image.getHeight()); drawRenderableImageImpl(image, xform, areaOfInterest); - + } /** @@ -648,7 +648,7 @@ public abstract class AbstractGraphics2D if (p != null) { paint = p; - + if (! (paint instanceof Color)) { isOptimized = false; @@ -665,11 +665,11 @@ public abstract class AbstractGraphics2D this.foreground = Color.BLACK; isForegroundColorNull = true; } - + // free resources if needed, then put the paint context to null if (this.paintContext != null) this.paintContext.dispose(); - + this.paintContext = null; } @@ -745,7 +745,7 @@ public abstract class AbstractGraphics2D * Translates the coordinate system by (x, y). * * @param x the translation X coordinate - * @param y the translation Y coordinate + * @param y the translation Y coordinate */ public void translate(int x, int y) { @@ -775,7 +775,7 @@ public abstract class AbstractGraphics2D * Translates the coordinate system by (tx, ty). * * @param tx the translation X coordinate - * @param ty the translation Y coordinate + * @param ty the translation Y coordinate */ public void translate(double tx, double ty) { @@ -992,7 +992,7 @@ public abstract class AbstractGraphics2D if (clip == null) setClip(s); - // This is so common, let's optimize this. + // This is so common, let's optimize this. else if (clip instanceof Rectangle && s instanceof Rectangle) { Rectangle clipRect = (Rectangle) clip; @@ -1076,8 +1076,8 @@ public abstract class AbstractGraphics2D else copy.clip = null; - copy.renderingHints = new RenderingHints(null); - copy.renderingHints.putAll(renderingHints); + copy.renderingHints = new RenderingHints(null); + copy.renderingHints.putAll(renderingHints); copy.transform = new AffineTransform(transform); // The remaining state is inmmutable and doesn't need to be copied. return copy; @@ -1097,7 +1097,7 @@ public abstract class AbstractGraphics2D { if (isForegroundColorNull) return null; - + return this.foreground; } @@ -1107,7 +1107,7 @@ public abstract class AbstractGraphics2D * @param color the foreground to set */ public void setColor(Color color) - { + { this.setPaint(color); } @@ -1298,7 +1298,7 @@ public abstract class AbstractGraphics2D /** * Fills a rectangle with the current background color. * - * This implementation temporarily sets the foreground color to the + * This implementation temporarily sets the foreground color to the * background and forwards the call to {@link #fillRect(int, int, int, int)}. * * @param x the upper left corner, X coordinate @@ -1590,7 +1590,7 @@ public abstract class AbstractGraphics2D int dy = Math.min(dy1, dy2); int dw = Math.abs(dx1 - dx2); int dh = Math.abs(dy1 - dy2); - + AffineTransform t = new AffineTransform(); t.translate(sx - dx, sy - dy); double scaleX = (double) sw / (double) dw; @@ -1693,7 +1693,7 @@ public abstract class AbstractGraphics2D * * @param x0 the starting point, X coordinate * @param y0 the starting point, Y coordinate - * @param x1 the end point, X coordinate + * @param x1 the end point, X coordinate * @param y1 the end point, Y coordinate */ protected void rawDrawLine(int x0, int y0, int x1, int y1) @@ -1806,7 +1806,7 @@ public abstract class AbstractGraphics2D public void renderScanline(int y, ScanlineCoverage c) { PaintContext pCtx = getPaintContext(); - + int x0 = c.getMinX(); int x1 = c.getMaxX(); Raster paintRaster = pCtx.getRaster(x0, y, x1 - x0, 1); @@ -1842,7 +1842,7 @@ public abstract class AbstractGraphics2D renderingHints); WritableRaster raster = getDestinationRaster(); WritableRaster targetChild = raster.createWritableTranslatedChild(-x0, -y); - + cCtx.compose(paintRaster, targetChild, targetChild); updateRaster(raster, x0, y, x1 - x0, 1); cCtx.dispose(); @@ -2042,7 +2042,7 @@ public abstract class AbstractGraphics2D getTransform(), getRenderingHints()); } - + return this.paintContext; } diff --git a/libjava/classpath/gnu/java/awt/java2d/AlphaCompositeContext.java b/libjava/classpath/gnu/java/awt/java2d/AlphaCompositeContext.java index 2e3690d8348..f1f082abe06 100644 --- a/libjava/classpath/gnu/java/awt/java2d/AlphaCompositeContext.java +++ b/libjava/classpath/gnu/java/awt/java2d/AlphaCompositeContext.java @@ -82,7 +82,7 @@ public class AlphaCompositeContext /** * Creates a new AlphaCompositeContext. * - * @param aComp the AlphaComposite object + * @param aComp the AlphaComposite object * @param srcCM the source color model * @param dstCM the destination color model */ @@ -93,7 +93,7 @@ public class AlphaCompositeContext srcColorModel = srcCM; dstColorModel = dstCM; - + // Determine the blending factors according to the rule in the // AlphaComposite. For some rules the factors must be determined // dynamically because they depend on the actual pixel value. @@ -301,7 +301,7 @@ public class AlphaCompositeContext { for (int i = 0; i < dstComponentsLength - 1; i++) { - dstComponents[i] = dstComponents[i] / dstAlpha; + dstComponents[i] = dstComponents[i] / dstAlpha; } } diff --git a/libjava/classpath/gnu/java/awt/java2d/CubicSegment.java b/libjava/classpath/gnu/java/awt/java2d/CubicSegment.java index bf66be870c0..8197c94c5c6 100644 --- a/libjava/classpath/gnu/java/awt/java2d/CubicSegment.java +++ b/libjava/classpath/gnu/java/awt/java2d/CubicSegment.java @@ -80,11 +80,11 @@ public class CubicSegment extends Segment public Object clone() { CubicSegment segment = null; - + try { segment = (CubicSegment) super.clone(); - + segment.P1 = (Point2D) P1.clone(); segment.P2 = (Point2D) P2.clone(); segment.cp1 = (Point2D) cp1.clone(); @@ -96,7 +96,7 @@ public class CubicSegment extends Segment ie.initCause(cnse); throw ie; } - + return segment; } @@ -161,7 +161,7 @@ public class CubicSegment extends Segment return new Segment[] { segmentTop, segmentBottom }; } - + public void reverse() { Point2D temp = P1; @@ -174,11 +174,11 @@ public class CubicSegment extends Segment public double[] cp1() { - return new double[]{cp1.getX(), cp1.getY()}; + return new double[]{cp1.getX(), cp1.getY()}; } public double[] cp2() { - return new double[]{cp2.getX(), cp2.getY()}; + return new double[]{cp2.getX(), cp2.getY()}; } } // class CubicSegment diff --git a/libjava/classpath/gnu/java/awt/java2d/LineSegment.java b/libjava/classpath/gnu/java/awt/java2d/LineSegment.java index 0395fd0af7b..904037989c0 100644 --- a/libjava/classpath/gnu/java/awt/java2d/LineSegment.java +++ b/libjava/classpath/gnu/java/awt/java2d/LineSegment.java @@ -63,7 +63,7 @@ public class LineSegment extends Segment public Object clone() { LineSegment segment = null; - + try { segment = (LineSegment) super.clone(); @@ -76,7 +76,7 @@ public class LineSegment extends Segment ie.initCause(cnse); throw ie; } - + return segment; } @@ -108,11 +108,11 @@ public class LineSegment extends Segment public double[] cp1() { - return new double[]{P2.getX(), P2.getY()}; + return new double[]{P2.getX(), P2.getY()}; } public double[] cp2() { - return new double[]{P1.getX(), P1.getY()}; + return new double[]{P1.getX(), P1.getY()}; } } // class LineSegment diff --git a/libjava/classpath/gnu/java/awt/java2d/PixelCoverage.java b/libjava/classpath/gnu/java/awt/java2d/PixelCoverage.java index c83ad1fff8f..356021b3d16 100644 --- a/libjava/classpath/gnu/java/awt/java2d/PixelCoverage.java +++ b/libjava/classpath/gnu/java/awt/java2d/PixelCoverage.java @@ -124,7 +124,7 @@ final class PixelCoverage Bucket match = current; while (match != null && match.xPos != x) { - + } return match; diff --git a/libjava/classpath/gnu/java/awt/java2d/QuadSegment.java b/libjava/classpath/gnu/java/awt/java2d/QuadSegment.java index 97a5372f6bd..b8d0ff52e3a 100644 --- a/libjava/classpath/gnu/java/awt/java2d/QuadSegment.java +++ b/libjava/classpath/gnu/java/awt/java2d/QuadSegment.java @@ -89,7 +89,7 @@ public class QuadSegment extends Segment public Object clone() { QuadSegment segment = null; - + try { segment = (QuadSegment) super.clone(); @@ -104,7 +104,7 @@ public class QuadSegment extends Segment ie.initCause(cnse); throw ie; } - + return segment; } @@ -135,10 +135,10 @@ public class QuadSegment extends Segment return new Segment[]{s1, s2}; } - + private QuadSegment offsetSubdivided(QuadCurve2D curve, boolean plus) { - double[] n1 = normal(curve.getX1(), curve.getY1(), + double[] n1 = normal(curve.getX1(), curve.getY1(), curve.getCtrlX(), curve.getCtrlY()); double[] n2 = normal(curve.getCtrlX(), curve.getCtrlY(), curve.getX2(), curve.getY2()); @@ -152,7 +152,7 @@ public class QuadSegment extends Segment n2[0] = -n2[0]; n2[1] = -n2[1]; } - + // Handle special cases where the control point is equal to an end point // or end points are equal (ie, straight lines) if (curve.getP1().equals(curve.getCtrlPt())) @@ -179,7 +179,7 @@ public class QuadSegment extends Segment double ratio = radius / length; deltaX *= ratio; deltaY *= ratio; - + if (plus) cp.setLocation(cp.getX() + deltaX, cp.getY() + deltaY); else @@ -192,16 +192,16 @@ public class QuadSegment extends Segment } else { - cp = lineIntersection(curve.getX1() + n1[0], + cp = lineIntersection(curve.getX1() + n1[0], curve.getY1() + n1[1], curve.getCtrlX() + n1[0], curve.getCtrlY() + n1[1], curve.getCtrlX() + n2[0], curve.getCtrlY() + n2[1], - curve.getX2() + n2[0], + curve.getX2() + n2[0], curve.getY2() + n2[1], true); } - + s = new QuadSegment(curve.getX1() + n1[0], curve.getY1() + n1[1], cp.getX(), cp.getY(), curve.getX2() + n2[0], curve.getY2() + n2[1]); @@ -209,9 +209,9 @@ public class QuadSegment extends Segment return s; } - 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) { @@ -250,11 +250,11 @@ public class QuadSegment extends Segment public double[] cp1() { - return new double[]{cp.getX(), cp.getY()}; + return new double[]{cp.getX(), cp.getY()}; } public double[] cp2() { - return new double[]{cp.getX(), cp.getY()}; + return new double[]{cp.getX(), cp.getY()}; } } diff --git a/libjava/classpath/gnu/java/awt/java2d/RasterGraphics.java b/libjava/classpath/gnu/java/awt/java2d/RasterGraphics.java index 04eb55eb8d8..193ea4c7c28 100644 --- a/libjava/classpath/gnu/java/awt/java2d/RasterGraphics.java +++ b/libjava/classpath/gnu/java/awt/java2d/RasterGraphics.java @@ -77,10 +77,10 @@ public class RasterGraphics { if (y >= getDeviceBounds().width) return; - + super.renderScanline(y, c); } - + /** * Returns the color model of this Graphics object. * diff --git a/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java b/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java index b00a15c16ac..2c3481b6c10 100644 --- a/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java +++ b/libjava/classpath/gnu/java/awt/java2d/ScanlineConverter.java @@ -206,7 +206,7 @@ public final class ScanlineConverter // Ok, now we can perform the actual scanlining. int realY = Fixed.intValue(FIXED_DIGITS, y + resolution); boolean push = lastRealY != realY; - + doScanline(p, y, push, haveClip); // Remove obsolete active edges. @@ -299,7 +299,7 @@ public final class ScanlineConverter p.renderScanline(Fixed.intValue(FIXED_DIGITS, y), scanlineCoverage); scanlineCoverage.clear(); } - } + } /** diff --git a/libjava/classpath/gnu/java/awt/java2d/ScanlineCoverage.java b/libjava/classpath/gnu/java/awt/java2d/ScanlineCoverage.java index deb603bcb51..9ffb63e1ddf 100644 --- a/libjava/classpath/gnu/java/awt/java2d/ScanlineCoverage.java +++ b/libjava/classpath/gnu/java/awt/java2d/ScanlineCoverage.java @@ -199,7 +199,7 @@ public final class ScanlineCoverage /** * Returns the X start position (left) on the scanline. This value * is considered to be in pixels and device space. - * + * * @return the X position on the scanline */ public int getXPos() @@ -445,7 +445,7 @@ public final class ScanlineCoverage * Returns the maximum coverage value for the scanline. * * @return the maximum coverage value for the scanline - */ + */ public int getMaxCoverage() { return maxCoverage; @@ -574,7 +574,7 @@ public final class ScanlineCoverage // Testpoint 6. cov = new Coverage(); } - + cov.xPos = x; cov.covDelta = 0; cov.pixelCoverage = 0; diff --git a/libjava/classpath/gnu/java/awt/java2d/Segment.java b/libjava/classpath/gnu/java/awt/java2d/Segment.java index df1f67605d0..1d9a5700125 100644 --- a/libjava/classpath/gnu/java/awt/java2d/Segment.java +++ b/libjava/classpath/gnu/java/awt/java2d/Segment.java @@ -45,12 +45,12 @@ public abstract class Segment implements Cloneable // Start and end points of THIS segment public Point2D P1; public Point2D P2; - + // Segments can be linked together internally as a linked list public Segment first; public Segment next; public Segment last; - + // Half the stroke width protected double radius; @@ -116,7 +116,7 @@ public abstract class Segment implements Cloneable { dy = radius * ((dx > 0)?1:-1); dx = 0; - } + } else if( dx == 0 ) { dx = radius * ((dy > 0)?-1:1); @@ -148,7 +148,7 @@ public abstract class Segment implements Cloneable * for a line segment. */ public abstract double[] cp1(); - + /** * Returns the coordinates of the second control point, or the end point * for a line segment. diff --git a/libjava/classpath/gnu/java/awt/java2d/TexturePaintContext.java b/libjava/classpath/gnu/java/awt/java2d/TexturePaintContext.java index db0a2e65804..2523d23110d 100644 --- a/libjava/classpath/gnu/java/awt/java2d/TexturePaintContext.java +++ b/libjava/classpath/gnu/java/awt/java2d/TexturePaintContext.java @@ -148,7 +148,7 @@ public class TexturePaintContext * @param h the height * * @return the Raster that is used for painting - * + * */ public Raster getRaster(int x1, int y1, int w, int h) { @@ -175,9 +175,9 @@ public class TexturePaintContext int dy = (int) dest[1]; // The modulo operation gives us the replication effect. - dx = ((dx - minX) % width) + minX; + dx = ((dx - minX) % width) + minX; dy = ((dy - minY) % height) + minY; - + // Handle possible negative values (replicating above the top-left) if (dx < 0) dx += width; diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java index bef42dcea34..fd4f498aa4b 100644 --- a/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/ClasspathDesktopPeer.java @@ -51,7 +51,7 @@ import java.util.prefs.Preferences; /** * Offers a common implementation for the Desktop peers, that enables * access to default system application within java processes. - * + * * @author Mario Torre */ public class ClasspathDesktopPeer @@ -59,39 +59,39 @@ public class ClasspathDesktopPeer { /** This is the fallback browser, if no desktop was detected. */ protected static final String _DEFAULT_BROWSER = "firefox"; - + /** gnu.java.awt.peer.Desktop.html.command */ protected static final String _BROWSE = "html"; - + /** gnu.java.awt.peer.Desktop.mail.command */ protected static final String _MAIL = "mail"; - + /** gnu.java.awt.peer.Desktop.edit.command */ protected static final String _EDIT = "edit"; - + /** gnu.java.awt.peer.Desktop.print.command */ protected static final String _PRINT = "print"; - + /** gnu.java.awt.peer.Desktop.open.command */ protected static final String _OPEN = "open"; - + /** */ protected static final KDEDesktopPeer kde = new KDEDesktopPeer(); - + /** */ protected static final GnomeDesktopPeer gnome = new GnomeDesktopPeer(); - + /** */ protected static final ClasspathDesktopPeer classpath = - new ClasspathDesktopPeer(); - + new ClasspathDesktopPeer(); + /** * Preference subsystem. Packagers and users can override the default * behaviour of this class via preferences and system properties. */ protected Preferences prefs = Preferences.userNodeForPackage(ClasspathDesktopPeer.class).node("Desktop"); - + /** * @param target */ @@ -103,131 +103,131 @@ public class ClasspathDesktopPeer public boolean isSupported(Action action) { String check = null; - + switch(action) { case BROWSE: check = _BROWSE; break; - + case MAIL: check = _MAIL; break; - + case EDIT: check = _EDIT; break; - + case PRINT: check = _PRINT; break; - + case OPEN: default: check = _OPEN; break; } - + return this.supportCommand(check); } public void browse(URI url) throws IOException { checkPermissions(); - + String browser = getCommand(_BROWSE); - + if (browser == null) throw new UnsupportedOperationException(); - + browser = browser + " " + url.toString(); - + Runtime.getRuntime().exec(browser); } public void edit(File file) throws IOException { checkPermissions(file, false); - + String edit = getCommand(_EDIT); - + if (edit == null) throw new UnsupportedOperationException(); - - edit = edit + " " + file.getAbsolutePath(); + + edit = edit + " " + file.getAbsolutePath(); Runtime.getRuntime().exec(edit); } public void mail(URI mailtoURL) throws IOException { checkPermissions(); - + String scheme = mailtoURL.getScheme(); if (scheme == null || !scheme.equalsIgnoreCase("mailto")) throw new IllegalArgumentException("URI Scheme not of type mailto"); - + String mail = getCommand(_MAIL); - + if (mail == null) throw new UnsupportedOperationException(); - + mail = mail + " " + mailtoURL.toString(); - + Runtime.getRuntime().exec(mail); } public void mail() throws IOException { checkPermissions(); - + String mail = getCommand(_MAIL); - + if (mail == null) throw new UnsupportedOperationException(); - + Runtime.getRuntime().exec(mail); } - + public void open(File file) throws IOException { checkPermissions(file, true); - + String open = getCommand(_OPEN); - + if (open == null) throw new UnsupportedOperationException(); - - open = open + " " + file.getAbsolutePath(); + + open = open + " " + file.getAbsolutePath(); Runtime.getRuntime().exec(open); } public void print(File file) throws IOException { checkPrintPermissions(file); - + String print = getCommand(_PRINT); - + if (print == null) throw new UnsupportedOperationException(); - - print = print + " " + file.getAbsolutePath(); + + print = print + " " + file.getAbsolutePath(); Runtime.getRuntime().exec(print); } - + protected String getCommand(String action) { // check if a system property exist String command = System.getProperty("gnu.java.awt.peer.Desktop." + action + ".command"); - + // otherwise, get it from preferences, if any if (command == null) { command = prefs.node(action).get("command", null); } - + return command; } - + /** * Note: Checks for AWTPermission("showWindowWithoutWarningBanner") only. */ @@ -238,22 +238,22 @@ public class ClasspathDesktopPeer sm.checkPermission(new AWTPermission("showWindowWithoutWarningBanner")); } } - + /** - * Calls checkPermissions() and checks for SecurityManager.checkRead() - * and, if readOnly is false, for SecurityManager.checkWrite() + * Calls checkPermissions() and checks for SecurityManager.checkRead() + * and, if readOnly is false, for SecurityManager.checkWrite() */ protected void checkPermissions(File file, boolean readOnly) { checkPermissions(); - + SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkRead(file.toString()); if (!readOnly) sm.checkWrite(file.toString()); } } - + /** * Calls checkPermissions(file, true) and checks for * SecurityManager.checkPrintJobAccess() @@ -261,13 +261,13 @@ public class ClasspathDesktopPeer protected void checkPrintPermissions(File file) { checkPermissions(file, true); - + SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPrintJobAccess(); - } + } } - + /** * @param check * @return @@ -276,7 +276,7 @@ public class ClasspathDesktopPeer { return ((this.getCommand(check) != null) ? true : false); } - + /** * @return */ @@ -285,7 +285,7 @@ public class ClasspathDesktopPeer // check if we are under Gnome or KDE or anything else String desktopSession = System.getenv("GNOME_DESKTOP_SESSION_ID"); if (desktopSession == null) - { + { desktopSession = System.getenv("KDE_FULL_SESSION"); if (desktopSession != null) return kde; @@ -294,7 +294,7 @@ public class ClasspathDesktopPeer { return gnome; } - + // revert to this class for default values return classpath; } diff --git a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java index e43e5f284ed..96677a4af72 100644 --- a/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/ClasspathFontPeer.java @@ -68,7 +68,7 @@ import java.util.Map; * object in the default implementation. If you wish to share peers between * fonts, you will need to subclass both ClasspathFontPeer and * {@link ClasspathToolKit}.

      - * + * *

      Thread Safety: Methods of this interface may be called * from arbitrary threads at any time. Implementations of the * ClasspathFontPeer interface are required to perform @@ -85,11 +85,11 @@ public abstract class ClasspathFontPeer { /*************************************************************************/ - + /* * Instance Variables */ - + /** * The 3 names of this font. all fonts have 3 names, some of which * may be equal: @@ -98,19 +98,19 @@ public abstract class ClasspathFontPeer * family -- a designer or brand name (Helvetica) * face -- specific instance of a design (Helvetica Regular) * - * @see isLogicalFontName + * @see isLogicalFontName */ - + protected String logicalName; protected String familyName; protected String faceName; - + /** * The font style, which is a combination (by OR-ing) of the font style * constants PLAIN, BOLD and ITALIC, in this class. */ protected int style; - + /** * The font point size. A point is 1/72 of an inch. */ @@ -143,13 +143,13 @@ public abstract class ClasspathFontPeer return (ClasspathToolkit)(Toolkit.getDefaultToolkit ()); } - /* + /* * Confusingly, a Logical Font is a concept unrelated to - * a Font's Logical Name. + * a Font's Logical Name. * * A Logical Font is one of 6 built-in, abstract font types * which must be supported by any java environment: SansSerif, - * Serif, Monospaced, Dialog, and DialogInput. + * Serif, Monospaced, Dialog, and DialogInput. * * A Font's Logical Name is the name the font was constructed * from. This might be the name of a Logical Font, or it might @@ -209,32 +209,32 @@ public abstract class ClasspathFontPeer if (fam != null) attrs.put (TextAttribute.FAMILY, fam); } - + public static void copySizeToAttrs (float size, Map attrs) { attrs.put (TextAttribute.SIZE, new Float (size)); } - + protected static void copyTransformToAttrs (AffineTransform trans, Map attrs) { if (trans != null) { - TransformAttribute ta; + TransformAttribute ta; synchronized(transCache) { - ta = transCache.get(trans); - if (ta == null) - { - ta = new TransformAttribute(trans); - transCache.put(trans, ta); - } - } - attrs.put(TextAttribute.TRANSFORM, ta); + ta = transCache.get(trans); + if (ta == null) + { + ta = new TransformAttribute(trans); + transCache.put(trans, ta); + } + } + attrs.put(TextAttribute.TRANSFORM, ta); } } - protected void setStandardAttributes (String name, String family, int style, + protected void setStandardAttributes (String name, String family, int style, float size, AffineTransform trans) { this.logicalName = name; @@ -248,7 +248,7 @@ public abstract class ClasspathFontPeer this.familyName = family; else this.familyName = faceNameToFamilyName (faceName); - + this.style = style; this.size = size; this.transform = trans; @@ -296,16 +296,16 @@ public abstract class ClasspathFontPeer if (attribs.containsKey (TextAttribute.TRANSFORM)) { - TransformAttribute ta = (TransformAttribute) + TransformAttribute ta = (TransformAttribute) attribs.get(TextAttribute.TRANSFORM); - trans = ta.getTransform (); + trans = ta.getTransform (); } setStandardAttributes (name, family, style, size, trans); } protected void getStandardAttributes (Map attrs) - { + { copyFamilyToAttrs (this.familyName, attrs); copySizeToAttrs (this.size, attrs); copyStyleToAttrs (this.style, attrs); @@ -322,11 +322,11 @@ public abstract class ClasspathFontPeer public ClasspathFontPeer (String name, int style, int size) { - setStandardAttributes (name, (String)null, style, + setStandardAttributes (name, (String)null, style, (float)size, (AffineTransform)null); } - /** + /** * Implementation of {@link Font#getName} * * @param font the font this peer is being called from. This may be @@ -334,12 +334,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public String getName (Font font) - { - return logicalName; + public String getName (Font font) + { + return logicalName; } - /** + /** * Implementation of {@link Font#getFamily()} * * @param font the font this peer is being called from. This may be @@ -347,12 +347,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public String getFamily (Font font) - { - return familyName; + public String getFamily (Font font) + { + return familyName; } - /** + /** * Implementation of {@link Font#getFamily(Locale)} * * @param font the font this peer is being called from. This may be @@ -360,12 +360,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public String getFamily (Font font, Locale lc) - { - return familyName; + public String getFamily (Font font, Locale lc) + { + return familyName; } - /** + /** * Implementation of {@link Font#getFontName()} * * @param font the font this peer is being called from. This may be @@ -373,12 +373,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public String getFontName (Font font) - { - return faceName; + public String getFontName (Font font) + { + return faceName; } - /** + /** * Implementation of {@link Font#getFontName(Locale)} * * @param font the font this peer is being called from. This may be @@ -386,12 +386,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public String getFontName (Font font, Locale lc) - { - return faceName; + public String getFontName (Font font, Locale lc) + { + return faceName; } - /** + /** * Implementation of {@link Font#getSize} * * @param font the font this peer is being called from. This may be @@ -399,38 +399,38 @@ public abstract class ClasspathFontPeer * be ignored. */ - public float getSize (Font font) - { - return size; + public float getSize (Font font) + { + return size; } - /** + /** * Implementation of {@link Font#isPlain} * * @param font the font this peer is being called from. This may be * useful if you are sharing peers between Font objects. Otherwise it may * be ignored. */ - - public boolean isPlain (Font font) - { - return style == Font.PLAIN; + + public boolean isPlain (Font font) + { + return style == Font.PLAIN; } - /** + /** * Implementation of {@link Font#isBold} * * @param font the font this peer is being called from. This may be * useful if you are sharing peers between Font objects. Otherwise it may * be ignored. */ - - public boolean isBold (Font font) - { - return ((style & Font.BOLD) == Font.BOLD); + + public boolean isBold (Font font) + { + return ((style & Font.BOLD) == Font.BOLD); } - /** + /** * Implementation of {@link Font#isItalic} * * @param font the font this peer is being called from. This may be @@ -438,12 +438,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public boolean isItalic (Font font) - { - return ((style & Font.ITALIC) == Font.ITALIC); + public boolean isItalic (Font font) + { + return ((style & Font.ITALIC) == Font.ITALIC); } - /** + /** * Implementation of {@link Font#deriveFont(int, float)} * * @param font the font this peer is being called from. This may be @@ -460,7 +460,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#deriveFont(float)} * * @param font the font this peer is being called from. This may be @@ -476,7 +476,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#deriveFont(int)} * * @param font the font this peer is being called from. This may be @@ -492,7 +492,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#deriveFont(int, AffineTransform)} * * @param font the font this peer is being called from. This may be @@ -509,7 +509,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#deriveFont(AffineTransform)} * * @param font the font this peer is being called from. This may be @@ -525,7 +525,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#deriveFont(Map)} * * @param font the font this peer is being called from. This may be @@ -538,7 +538,7 @@ public abstract class ClasspathFontPeer return tk().getFont (logicalName, attrs); } - /** + /** * Implementation of {@link Font#getAttributes()} * * @param font the font this peer is being called from. This may be @@ -553,7 +553,7 @@ public abstract class ClasspathFontPeer return h; } - /** + /** * Implementation of {@link Font#getAvailableAttributes()} * * @param font the font this peer is being called from. This may be @@ -563,7 +563,7 @@ public abstract class ClasspathFontPeer public AttributedCharacterIterator.Attribute[] getAvailableAttributes(Font font) { - AttributedCharacterIterator.Attribute a[] = + AttributedCharacterIterator.Attribute a[] = new AttributedCharacterIterator.Attribute[5]; a[0] = TextAttribute.FAMILY; a[1] = TextAttribute.SIZE; @@ -573,7 +573,7 @@ public abstract class ClasspathFontPeer return a; } - /** + /** * Implementation of {@link Font#getTransform()} * * @param font the font this peer is being called from. This may be @@ -588,7 +588,7 @@ public abstract class ClasspathFontPeer return transform; } - /** + /** * Implementation of {@link Font#isTransformed()} * * @param font the font this peer is being called from. This may be @@ -601,7 +601,7 @@ public abstract class ClasspathFontPeer return ! transform.isIdentity (); } - /** + /** * Implementation of {@link Font#getItalicAngle()} * * @param font the font this peer is being called from. This may be @@ -618,7 +618,7 @@ public abstract class ClasspathFontPeer } - /** + /** * Implementation of {@link Font#getStyle()} * * @param font the font this peer is being called from. This may be @@ -626,9 +626,9 @@ public abstract class ClasspathFontPeer * be ignored. */ - public int getStyle (Font font) - { - return style; + public int getStyle (Font font) + { + return style; } @@ -636,7 +636,7 @@ public abstract class ClasspathFontPeer /* Remaining methods are abstract */ - /** + /** * Implementation of {@link Font#canDisplay(char)} * * @param font the font this peer is being called from. This may be @@ -646,7 +646,7 @@ public abstract class ClasspathFontPeer public abstract boolean canDisplay (Font font, int c); - /** + /** * Implementation of {@link Font#canDisplay(String)}, * {@link Font#canDisplay(char [], int, int)}, and * {@link Font#canDisplay(CharacterIterator, int, int)}. @@ -678,9 +678,9 @@ public abstract class ClasspathFontPeer */ public abstract String getSubFamilyName (Font font, Locale locale); - - /** + + /** * Implementation of {@link Font#getPSName()} * * @param font the font this peer is being called from. This may be @@ -691,7 +691,7 @@ public abstract class ClasspathFontPeer public abstract String getPostScriptName (Font font); - /** + /** * Implementation of {@link Font#getNumGlyphs()} * * @param font the font this peer is being called from. This may be @@ -702,7 +702,7 @@ public abstract class ClasspathFontPeer public abstract int getNumGlyphs (Font font); - /** + /** * Implementation of {@link Font#getMissingGlyphCode()} * * @param font the font this peer is being called from. This may be @@ -713,7 +713,7 @@ public abstract class ClasspathFontPeer public abstract int getMissingGlyphCode (Font font); - /** + /** * Implementation of {@link Font#getBaselineFor(char)} * * @param font the font this peer is being called from. This may be @@ -767,7 +767,7 @@ public abstract class ClasspathFontPeer public abstract String getGlyphName (Font font, int glyphIndex); - /** + /** * Implementation of {@link * Font#createGlyphVector(FontRenderContext, String)}, {@link * Font#createGlyphVector(FontRenderContext, char[])}, and {@link @@ -782,9 +782,9 @@ public abstract class ClasspathFontPeer public abstract GlyphVector createGlyphVector (Font font, FontRenderContext frc, CharacterIterator ci); - - /** + + /** * Implementation of {@link Font#createGlyphVector(FontRenderContext, * int[])}. * @@ -794,12 +794,12 @@ public abstract class ClasspathFontPeer * not with font peers. */ - public abstract GlyphVector createGlyphVector (Font font, - FontRenderContext ctx, + public abstract GlyphVector createGlyphVector (Font font, + FontRenderContext ctx, int[] glyphCodes); - /** + /** * Implementation of {@link Font#layoutGlyphVector(FontRenderContext, * char[], int, int, int)}. * @@ -809,13 +809,13 @@ public abstract class ClasspathFontPeer * not with font peers. */ - public abstract GlyphVector layoutGlyphVector (Font font, - FontRenderContext frc, - char[] chars, int start, + public abstract GlyphVector layoutGlyphVector (Font font, + FontRenderContext frc, + char[] chars, int start, int limit, int flags); - /** + /** * Implementation of {@link Font#getFontMetrics()} * * @param font the font this peer is being called from. This may be @@ -826,7 +826,7 @@ public abstract class ClasspathFontPeer public abstract FontMetrics getFontMetrics (Font font); - /** + /** * Implementation of {@link Font#hasUniformLineMetrics()} * * @param font the font this peer is being called from. This may be @@ -837,7 +837,7 @@ public abstract class ClasspathFontPeer public abstract boolean hasUniformLineMetrics (Font font); - /** + /** * Implementation of {@link Font#getLineMetrics(CharacterIterator, int, * int, FontRenderContext)} * @@ -846,12 +846,12 @@ public abstract class ClasspathFontPeer * be ignored. */ - public abstract LineMetrics getLineMetrics (Font font, - CharacterIterator ci, - int begin, int limit, + public abstract LineMetrics getLineMetrics (Font font, + CharacterIterator ci, + int begin, int limit, FontRenderContext rc); - /** + /** * Implementation of {@link Font#getMaxCharBounds(FontRenderContext)} * * @param font the font this peer is being called from. This may be @@ -859,7 +859,7 @@ public abstract class ClasspathFontPeer * be ignored. */ - public abstract Rectangle2D getMaxCharBounds (Font font, + public abstract Rectangle2D getMaxCharBounds (Font font, FontRenderContext rc); } diff --git a/libjava/classpath/gnu/java/awt/peer/GLightweightPeer.java b/libjava/classpath/gnu/java/awt/peer/GLightweightPeer.java index bf40bf379fa..fe128c26ccd 100644 --- a/libjava/classpath/gnu/java/awt/peer/GLightweightPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/GLightweightPeer.java @@ -71,7 +71,7 @@ import java.awt.peer.LightweightPeer; * Lightweight components are painted directly onto their parent * containers through an Image object provided by the toolkit. */ -public class GLightweightPeer +public class GLightweightPeer implements LightweightPeer, ContainerPeer { public GLightweightPeer() @@ -80,39 +80,39 @@ public class GLightweightPeer } // -------- java.awt.peer.ContainerPeer implementation: - + public Insets insets() { // Nothing to do here for lightweights. return null; } - + public Insets getInsets() { // Nothing to do here for lightweights. return null; } - + public void beginValidate() { // Nothing to do here for lightweights. } - + public void endValidate() { // Nothing to do here for lightweights. } - + public void beginLayout() { // Nothing to do here for lightweights. } - + public void endLayout() { // Nothing to do here for lightweights. } - + public boolean isPaintPending() { // Nothing to do here for lightweights. @@ -235,7 +235,7 @@ public class GLightweightPeer // Nothing to do here for lightweights. } - public boolean isFocusable() + public boolean isFocusable() { // Nothing to do here for lightweights. return false; @@ -263,7 +263,7 @@ public class GLightweightPeer } public boolean prepareImage(Image img, int width, int height, - ImageObserver o) + ImageObserver o) { // Nothing to do here for lightweights. return false; @@ -373,10 +373,10 @@ public class GLightweightPeer // Nothing to do here for lightweights. } - public VolatileImage createVolatileImage(int width, int height) - { + public VolatileImage createVolatileImage(int width, int height) + { // Nothing to do here for lightweights. - return null; + return null; } public boolean handlesWheelScrolling() @@ -385,7 +385,7 @@ public class GLightweightPeer return false; } - public void createBuffers(int x, BufferCapabilities capabilities) + public void createBuffers(int x, BufferCapabilities capabilities) throws AWTException { // Nothing to do here for lightweights. diff --git a/libjava/classpath/gnu/java/awt/peer/GnomeDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/GnomeDesktopPeer.java index cc41f749dc0..2347371adf2 100644 --- a/libjava/classpath/gnu/java/awt/peer/GnomeDesktopPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/GnomeDesktopPeer.java @@ -60,13 +60,13 @@ public class GnomeDesktopPeer { // check if a command already exists String command = super.getCommand(action); - + if (command == null) { try { if (action == _BROWSE) - { + { command = execQuery(BROWSER_QUERY_GNOME); } else if (action == _PRINT) @@ -83,46 +83,46 @@ public class GnomeDesktopPeer command = null; } } - + return command; } - + public void browse(URI url) throws IOException { checkPermissions(); - + String browser = getCommand(_BROWSE); - + if (browser == null) throw new UnsupportedOperationException(); - + browser = browser + " " + url.toString(); - + Runtime.getRuntime().exec(browser); } protected boolean supportCommand(String check) { if (check == _PRINT) - { + { return super.supportCommand(check); } - + return true; } public void mail() throws IOException { checkPermissions(); - + String mail = getCommand(_MAIL); - + if (mail == null) throw new UnsupportedOperationException(); - + Runtime.getRuntime().exec(mail + " mailto:"); } - + protected String execQuery(String command) throws IOException { InputStream in = null; @@ -149,7 +149,7 @@ public class GnomeDesktopPeer // remove %s from the string, leave only the command line int index = output.indexOf("%s"); output.delete(index, index + 1); - + return output.toString().trim(); } } diff --git a/libjava/classpath/gnu/java/awt/peer/KDEDesktopPeer.java b/libjava/classpath/gnu/java/awt/peer/KDEDesktopPeer.java index 8bc3e65b24e..44a508435ec 100644 --- a/libjava/classpath/gnu/java/awt/peer/KDEDesktopPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/KDEDesktopPeer.java @@ -56,16 +56,16 @@ public class KDEDesktopPeer "gconftool-2 -g /desktop/gnome/url-handlers/http/command"; protected String getCommand(String action) - { + { // check if a command already exists String command = super.getCommand(action); - + if (command == null) { try { if (action == _MAIL) - { + { command = "kfmclient exec"; } else if (action == _PRINT) @@ -82,27 +82,27 @@ public class KDEDesktopPeer command = null; } } - + return command; } - + protected boolean supportCommand(String check) { return true; } - + public void mail() throws IOException { checkPermissions(); - + String mail = getCommand(_MAIL); - + if (mail == null) throw new UnsupportedOperationException(); - + Runtime.getRuntime().exec(mail + " 'mailto: '"); } - + protected String execQuery(String command) throws IOException { InputStream in = null; @@ -129,7 +129,7 @@ public class KDEDesktopPeer // remove %s from the string, leave only the command line int index = output.indexOf("%s"); output.delete(index, index + 1); - + return output.toString().trim(); } } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/AsyncImage.java b/libjava/classpath/gnu/java/awt/peer/gtk/AsyncImage.java index dad537aa748..786dcf26b50 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/AsyncImage.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/AsyncImage.java @@ -98,7 +98,7 @@ public class AsyncImage ic.imageComplete(ImageConsumer.SINGLEFRAMEDONE); } } - + } /** diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java b/libjava/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java index 31c5e641ec8..f9609bff6f1 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/BufferedImageGraphics.java @@ -64,7 +64,7 @@ import java.util.WeakHashMap; /** * Implementation of Graphics2D on a Cairo surface. * - * Simutanously maintains a CairoSurface and updates the + * Simutanously maintains a CairoSurface and updates the * BufferedImage from that after each drawing operation. */ public class BufferedImageGraphics extends CairoGraphics2D @@ -73,7 +73,7 @@ public class BufferedImageGraphics extends CairoGraphics2D * the buffered Image. */ private BufferedImage image, buffer; - + /** * Image size. */ @@ -104,7 +104,7 @@ public class BufferedImageGraphics extends CairoGraphics2D this.image = bi; imageWidth = bi.getWidth(); imageHeight = bi.getHeight(); - + if (!(image.getSampleModel() instanceof SinglePixelPackedSampleModel)) hasFastCM = false; else if(bi.getColorModel().equals(CairoSurface.cairoCM_opaque)) @@ -151,11 +151,11 @@ public class BufferedImageGraphics extends CairoGraphics2D { int[] pixels2 = new int[imageWidth * imageHeight]; int scanline = sm.getScanlineStride(); - + for (int i = 0; i < imageHeight; i++) System.arraycopy(pixels, (i - minY) * scanline - minX, pixels2, i * imageWidth, imageWidth); - + pixels = pixels2; } @@ -172,11 +172,11 @@ public class BufferedImageGraphics extends CairoGraphics2D System.arraycopy(pixels, 0, surface.getData(), 0, pixels.length); } - + setup( cairo_t ); setClip(0, 0, imageWidth, imageHeight); } - + BufferedImageGraphics(BufferedImageGraphics copyFrom) { image = copyFrom.image; @@ -184,7 +184,7 @@ public class BufferedImageGraphics extends CairoGraphics2D cairo_t = surface.newCairoContext(); imageWidth = copyFrom.imageWidth; imageHeight = copyFrom.imageHeight; - + hasFastCM = copyFrom.hasFastCM; hasAlpha = copyFrom.hasAlpha; @@ -195,7 +195,7 @@ public class BufferedImageGraphics extends CairoGraphics2D * Update a rectangle of the bufferedImage. This can be improved upon a lot. */ private void updateBufferedImage(int x, int y, int width, int height) - { + { Rectangle bounds = new Rectangle(x, y, width, height); bounds = getTransformedBounds(bounds, transform).getBounds(); x = bounds.x; @@ -207,7 +207,7 @@ public class BufferedImageGraphics extends CairoGraphics2D if( x > imageWidth || y > imageHeight ) return; - + // Deal with negative width/height. if (height < 0) { @@ -219,44 +219,44 @@ public class BufferedImageGraphics extends CairoGraphics2D x += width; width = -width; } - + // Clip edges. if( x < 0 ) x = 0; if( y < 0 ) y = 0; - - if( x + width > imageWidth ) + + if( x + width > imageWidth ) width = imageWidth - x; - if( y + height > imageHeight ) + if( y + height > imageHeight ) height = imageHeight - y; - + if(!hasFastCM) { - image.setRGB(x, y, width, height, pixels, + image.setRGB(x, y, width, height, pixels, x + y * imageWidth, imageWidth); // The setRGB method assumes (or should assume) that pixels are NOT // alpha-premultiplied, but Cairo stores data with premultiplication // (thus the pixels returned in getPixels are premultiplied). // This is ignored for consistency, however, since in // CairoGrahpics2D.drawImage we also use non-premultiplied data - + } else { int[] db = ((DataBufferInt)image.getRaster().getDataBuffer()). getData(); - + // This should not fail, as we check the image sample model when we // set the hasFastCM flag SinglePixelPackedSampleModel sm = (SinglePixelPackedSampleModel)image.getSampleModel() ; - + int minX = image.getRaster().getSampleModelTranslateX(); int minY = image.getRaster().getSampleModelTranslateY(); - - if (sm.getScanlineStride() == imageWidth && minX == 0) + + if (sm.getScanlineStride() == imageWidth && minX == 0) { - System.arraycopy(pixels, y * imageWidth, + System.arraycopy(pixels, y * imageWidth, db, (y - minY) * imageWidth, height * imageWidth); } @@ -266,19 +266,19 @@ public class BufferedImageGraphics extends CairoGraphics2D for (int i = y; i < (height + y); i++) System.arraycopy(pixels, i * imageWidth + x, db, (i - minY) * scanline + x - minX, width); - + } } } /** * Abstract methods. - */ + */ public Graphics create() { return new BufferedImageGraphics(this); } - + public GraphicsConfiguration getDeviceConfiguration() { return null; @@ -288,7 +288,7 @@ public class BufferedImageGraphics extends CairoGraphics2D { return new Rectangle2D.Double(0.0, 0.0, imageWidth, imageHeight); } - + public void copyAreaImpl(int x, int y, int width, int height, int dx, int dy) { surface.copyAreaNative(x, y, width, height, dx, dy, surface.width); @@ -296,7 +296,7 @@ public class BufferedImageGraphics extends CairoGraphics2D } /** - * Overloaded methods that do actual drawing need to enter the gdk threads + * Overloaded methods that do actual drawing need to enter the gdk threads * and also do certain things before and after. */ public void draw(Shape s) @@ -308,7 +308,7 @@ public class BufferedImageGraphics extends CairoGraphics2D r.width++; r.height++; } - + // Do the drawing if (comp == null || comp instanceof AlphaComposite) { @@ -318,13 +318,13 @@ public class BufferedImageGraphics extends CairoGraphics2D else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setStroke(this.getStroke()); g2d.setColor(this.getColor()); g2d.setTransform(transform); g2d.draw(s); - + drawComposite(r.getBounds2D(), null); } } @@ -340,13 +340,13 @@ public class BufferedImageGraphics extends CairoGraphics2D else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setPaint(this.getPaint()); g2d.setColor(this.getColor()); g2d.setTransform(transform); g2d.fill(s); - + drawComposite(s.getBounds2D(), null); } } @@ -366,14 +366,14 @@ public class BufferedImageGraphics extends CairoGraphics2D g2d.setRenderingHints(this.getRenderingHints()); g2d.setTransform(transform); g2d.drawRenderedImage(image, xform); - + drawComposite(buffer.getRaster().getBounds(), null); } } protected boolean drawImage(Image img, AffineTransform xform, - Color bgcolor, ImageObserver obs) + Color bgcolor, ImageObserver obs) { if (comp == null || comp instanceof AlphaComposite) { @@ -392,16 +392,16 @@ public class BufferedImageGraphics extends CairoGraphics2D img = Toolkit.getDefaultToolkit().createImage(source); } BufferedImage bImg = (BufferedImage) img; - + // Find translated bounds Rectangle2D bounds = new Rectangle(bImg.getMinX(), bImg.getMinY(), bImg.getWidth(), bImg.getHeight()); if (xform != null) bounds = getTransformedBounds(bounds, xform); - + // Create buffer and draw image createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setRenderingHints(this.getRenderingHints()); g2d.drawImage(img, xform, obs); @@ -413,20 +413,20 @@ public class BufferedImageGraphics extends CairoGraphics2D public void drawGlyphVector(GlyphVector gv, float x, float y) { - // Find absolute bounds, in user-space, of this glyph vector + // Find absolute bounds, in user-space, of this glyph vector Rectangle2D bounds = gv.getLogicalBounds(); bounds = new Rectangle2D.Double(x + bounds.getX(), y + bounds.getY(), bounds.getWidth(), bounds.getHeight()); - + // Perform draw operation if (comp == null || comp instanceof AlphaComposite) { super.drawGlyphVector(gv, x, y); - + // this returns an integer-based Rectangle (rather than a // Rectangle2D), which takes care of any necessary rounding for us. bounds = bounds.getBounds(); - + updateBufferedImage((int)bounds.getX(), (int)bounds.getY(), (int)bounds.getWidth(), (int)bounds.getHeight()); } @@ -439,17 +439,17 @@ public class BufferedImageGraphics extends CairoGraphics2D g2d.setStroke(this.getStroke()); g2d.setTransform(transform); g2d.drawGlyphVector(gv, x, y); - + drawComposite(bounds, null); } } - + /** * Perform composite drawing from the buffer onto the main image. - * + * * The image to be composited should already be drawn into the buffer, in the * proper place, after all necessary transforms have been applied. - * + * * @param bounds The bounds to draw, in user-space. * @param observer The image observer, if any (may be null). * @return True on success, false on failure. @@ -465,7 +465,7 @@ public class BufferedImageGraphics extends CairoGraphics2D devClip = new Rectangle(buffer.getMinX(), buffer.getMinY(), buffer.getWidth(), buffer.getHeight()); Rectangle2D.intersect(bounds, devClip, bounds); - + // Round bounds as needed, but be careful in our rounding // (otherwise it may leave unpainted stripes) double x = bounds.getX(); @@ -475,7 +475,7 @@ public class BufferedImageGraphics extends CairoGraphics2D x = Math.round(x); y = Math.round(y); bounds.setRect(x, y, Math.round(maxX - x), Math.round(maxY - y)); - + // Find subimage of internal buffer for updating BufferedImage buffer2 = buffer; if (!bounds.equals(buffer2.getRaster().getBounds())) @@ -492,12 +492,12 @@ public class BufferedImageGraphics extends CairoGraphics2D // Perform actual composite operation compCtx.compose(buffer2.getRaster(), current.getRaster(), current.getRaster()); - + // Set cairo's composite to direct SRC, since we've already done our own - // compositing + // compositing Composite oldcomp = comp; setComposite(AlphaComposite.Src); - + // This MUST call directly into the "action" method in CairoGraphics2D, // not one of the wrappers, to ensure that the composite isn't processed // more than once! @@ -509,7 +509,7 @@ public class BufferedImageGraphics extends CairoGraphics2D updateColor(); return rv; } - + private void createBuffer() { if (buffer == null) @@ -520,20 +520,19 @@ public class BufferedImageGraphics extends CairoGraphics2D else { Graphics2D g2d = ((Graphics2D)buffer.getGraphics()); - + g2d.setBackground(new Color(0,0,0,0)); g2d.clearRect(0, 0, buffer.getWidth(), buffer.getHeight()); } } - + protected ColorModel getNativeCM() { return image.getColorModel(); } - + protected ColorModel getBufferCM() { return ColorModel.getRGBdefault(); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java index 8f8d7ea8bbb..05d35c573fc 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java @@ -101,7 +101,7 @@ import java.util.HashMap; import java.util.Map; /** - * This is an abstract implementation of Graphics2D on Cairo. + * This is an abstract implementation of Graphics2D on Cairo. * * It should be subclassed for different Cairo contexts. * @@ -112,7 +112,7 @@ import java.util.Map; * GraphicsConfiguration getDeviceConfiguration() * copyArea(int x, int y, int width, int height, int dx, int dy) * - * Also, dispose() must be overloaded to free any native datastructures + * Also, dispose() must be overloaded to free any native datastructures * used by subclass and in addition call super.dispose() to free the * native cairographics2d structure and cairo_t. * @@ -120,7 +120,7 @@ import java.util.Map; */ public abstract class CairoGraphics2D extends Graphics2D { - static + static { if (true) // GCJ LOCAL { @@ -177,7 +177,7 @@ public abstract class CairoGraphics2D extends Graphics2D * Rendering hint map. */ private RenderingHints hints; - + /** * Status of the anti-alias flag in cairo. */ @@ -187,7 +187,7 @@ public abstract class CairoGraphics2D extends Graphics2D /** * Some operations (drawing rather than filling) require that their * coords be shifted to land on 0.5-pixel boundaries, in order to land on - * "middle of pixel" coordinates and light up complete pixels. + * "middle of pixel" coordinates and light up complete pixels. */ protected boolean shiftDrawCalls = false; @@ -203,8 +203,8 @@ public abstract class CairoGraphics2D extends Graphics2D private static BasicStroke draw3DRectStroke = new BasicStroke(); static ColorModel rgb32 = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF); - static ColorModel argb32 = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, - 0xFF000000); + static ColorModel argb32 = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, + 0xFF000000); /** * Native constants for interpolation methods. @@ -217,7 +217,7 @@ public abstract class CairoGraphics2D extends Graphics2D ALPHA_INTERPOLATION_QUALITY = 3, ALPHA_INTERPOLATION_DEFAULT = 4; // TODO: Does ALPHA_INTERPOLATION really correspond to CAIRO_FILTER_FAST/BEST/GOOD? - + /** * Constructor does nothing. */ @@ -230,7 +230,7 @@ public abstract class CairoGraphics2D extends Graphics2D * @param cairo_t_pointer a native pointer to a cairo_t of the context. */ public void setup(long cairo_t_pointer) - { + { nativePointer = init(cairo_t_pointer); setRenderingHints(new RenderingHints(getDefaultHints())); setFont(new Font("SansSerif", Font.PLAIN, 12)); @@ -251,7 +251,7 @@ public abstract class CairoGraphics2D extends Graphics2D paint = g.paint; stroke = g.stroke; setRenderingHints(g.hints); - + Color foreground; if (g.fg.getAlpha() != -1) @@ -286,7 +286,7 @@ public abstract class CairoGraphics2D extends Graphics2D setTransformImpl(transform); setClip(clip); setComposite(comp); - + antialias = !g.antialias; setAntialias(g.antialias); } @@ -300,9 +300,9 @@ public abstract class CairoGraphics2D extends Graphics2D } /** - * Disposes the native cairographics2d structure, including the - * cairo_t and any gradient stuff, if allocated. - * Subclasses should of course overload and call this if + * Disposes the native cairographics2d structure, including the + * cairo_t and any gradient stuff, if allocated. + * Subclasses should of course overload and call this if * they have additional native structures. */ public void dispose() @@ -332,7 +332,7 @@ public abstract class CairoGraphics2D extends Graphics2D /** * Find the bounds of this graphics context, in device space. - * + * * @return the bounds in device-space */ protected abstract Rectangle2D getRealBounds(); @@ -359,7 +359,7 @@ public abstract class CairoGraphics2D extends Graphics2D double x2, double y2, int r1, int g1, int b1, int a1, int r2, int g2, int b2, int a2, boolean cyclic); - + protected native void setPaintPixels(long pointer, int[] pixels, int w, int h, int stride, boolean repeat, int x, int y); @@ -368,7 +368,7 @@ public abstract class CairoGraphics2D extends Graphics2D * Set the current transform matrix */ protected native void cairoSetMatrix(long pointer, double[] m); - + /** * Scaling method */ @@ -406,8 +406,8 @@ public abstract class CairoGraphics2D extends Graphics2D /* * Draws a Glyph Vector */ - protected native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, - float x, float y, int n, + protected native void cairoDrawGlyphVector(long pointer, GdkFontPeer font, + float x, float y, int n, int[] codes, float[] positions, long[] fontset); /** @@ -420,7 +420,7 @@ public abstract class CairoGraphics2D extends Graphics2D */ protected native void cairoRectangle(long pointer, double x, double y, double width, double height); - + /** * Appends an arc to the current path */ @@ -438,7 +438,7 @@ public abstract class CairoGraphics2D extends Graphics2D */ protected native void cairoNewPath(long pointer); - /** + /** * Close current path */ protected native void cairoClosePath(long pointer); @@ -464,16 +464,16 @@ public abstract class CairoGraphics2D extends Graphics2D */ protected native void cairoFill(long pointer, double alpha); - /** + /** * Clip current path */ protected native void cairoClip(long pointer); - /** + /** * Clear clip */ protected native void cairoResetClip(long pointer); - + /** * Set antialias. */ @@ -483,7 +483,7 @@ public abstract class CairoGraphics2D extends Graphics2D ///////////////////////// TRANSFORMS /////////////////////////////////// /** * Set the current transform - */ + */ public void setTransform(AffineTransform tx) { // Transform clip into target space using the old transform. @@ -588,7 +588,7 @@ public abstract class CairoGraphics2D extends Graphics2D setTransformImpl(transform); } - + public void translate(int x, int y) { translate((double) x, (double) y); @@ -670,13 +670,13 @@ public abstract class CairoGraphics2D extends Graphics2D setColor((Color) paint); customPaint = false; } - + else if (paint instanceof TexturePaint) { TexturePaint tp = (TexturePaint) paint; BufferedImage img = tp.getImage(); - // map the image to the anchor rectangle + // map the image to the anchor rectangle int width = (int) tp.getAnchorRect().getWidth(); int height = (int) tp.getAnchorRect().getHeight(); @@ -690,7 +690,7 @@ public abstract class CairoGraphics2D extends Graphics2D setPaintPixels(nativePointer, pixels, width, height, width, true, 0, 0); customPaint = false; } - + else if (paint instanceof GradientPaint) { GradientPaint gp = (GradientPaint) paint; @@ -707,12 +707,12 @@ public abstract class CairoGraphics2D extends Graphics2D else { customPaint = true; - } + } } - + /** * Sets a custom paint - * + * * @param bounds the bounding box, in user space */ protected void setCustomPaint(Rectangle bounds) @@ -720,12 +720,12 @@ public abstract class CairoGraphics2D extends Graphics2D if (paint instanceof Color || paint instanceof TexturePaint || paint instanceof GradientPaint) return; - + int userX = bounds.x; int userY = bounds.y; int userWidth = bounds.width; int userHeight = bounds.height; - + // Find bounds in device space Rectangle2D bounds2D = getTransformedBounds(bounds, transform); int deviceX = (int)bounds2D.getX(); @@ -740,14 +740,14 @@ public abstract class CairoGraphics2D extends Graphics2D deviceHeight), bounds, transform, hints); - + Raster raster = pc.getRaster(deviceX, deviceY, deviceWidth, deviceHeight); - + // Clear the transform matrix in Cairo, since the raster returned by the // PaintContext is already in device-space AffineTransform oldTx = new AffineTransform(transform); - setTransformImpl(new AffineTransform()); + setTransformImpl(new AffineTransform()); // Set pixels in cairo, aligning the top-left of the background image // to the top-left corner in device space @@ -762,7 +762,7 @@ public abstract class CairoGraphics2D extends Graphics2D deviceWidth, deviceHeight, deviceWidth, false, deviceX, deviceY); } - + else if (pc.getColorModel().equals(CairoSurface.cairoCM_opaque) && raster.getSampleModel().getTransferType() == DataBuffer.TYPE_INT) { @@ -770,36 +770,36 @@ public abstract class CairoGraphics2D extends Graphics2D // but without an alpha channel; we just add the alpha int[] pixels = (int[])raster.getDataElements(0, 0, deviceWidth, deviceHeight, null); - + for (int i = 0; i < pixels.length; i++) pixels[i] = 0xff000000 | (pixels[i] & 0x00ffffff); - + setPaintPixels(nativePointer, pixels, deviceWidth, deviceHeight, deviceWidth, false, deviceX, deviceY); } - + else { - // Fall back on wrapping the raster in a BufferedImage, and - // use BufferedImage.getRGB() to do color-model conversion + // Fall back on wrapping the raster in a BufferedImage, and + // use BufferedImage.getRGB() to do color-model conversion WritableRaster wr = Raster.createWritableRaster(raster.getSampleModel(), new Point(raster.getMinX(), raster.getMinY())); wr.setRect(raster); - + BufferedImage img2 = new BufferedImage(pc.getColorModel(), wr, pc.getColorModel().isAlphaPremultiplied(), null); - + setPaintPixels(nativePointer, img2.getRGB(0, 0, deviceWidth, deviceHeight, null, 0, deviceWidth), deviceWidth, deviceHeight, deviceWidth, false, deviceX, deviceY); } - + // Restore transform - setTransformImpl(oldTx); + setTransformImpl(oldTx); } public Stroke getStroke() @@ -813,7 +813,7 @@ public abstract class CairoGraphics2D extends Graphics2D if (stroke instanceof BasicStroke) { BasicStroke bs = (BasicStroke) stroke; - cairoSetLine(nativePointer, bs.getLineWidth(), bs.getEndCap(), + cairoSetLine(nativePointer, bs.getLineWidth(), bs.getEndCap(), bs.getLineJoin(), bs.getMiterLimit()); float[] dashes = bs.getDashArray(); @@ -822,7 +822,7 @@ public abstract class CairoGraphics2D extends Graphics2D double[] double_dashes = new double[dashes.length]; for (int i = 0; i < dashes.length; i++) double_dashes[i] = dashes[i]; - + cairoSetDash(nativePointer, double_dashes, double_dashes.length, (double) bs.getDashPhase()); } @@ -833,14 +833,14 @@ public abstract class CairoGraphics2D extends Graphics2D /** * Utility method to find the bounds of a shape, including the stroke width. - * + * * @param s the shape * @return the bounds of the shape, including stroke width */ protected Rectangle findStrokedBounds(Shape s) { Rectangle r = s.getBounds(); - + if (stroke instanceof BasicStroke) { int strokeWidth = (int)Math.ceil(((BasicStroke)stroke).getLineWidth()); @@ -854,7 +854,7 @@ public abstract class CairoGraphics2D extends Graphics2D Shape s2 = stroke.createStrokedShape(s); r = s2.getBounds(); } - + return r; } @@ -877,7 +877,7 @@ public abstract class CairoGraphics2D extends Graphics2D paint = c; updateColor(); } - + /** * Set the current fg value as the cairo color. */ @@ -885,7 +885,7 @@ public abstract class CairoGraphics2D extends Graphics2D { if (fg == null) fg = Color.BLACK; - + cairoSetRGBAColor(nativePointer, fg.getRed() / 255.0, fg.getGreen() / 255.0,fg.getBlue() / 255.0, fg.getAlpha() / 255.0); @@ -951,9 +951,9 @@ public abstract class CairoGraphics2D extends Graphics2D public void setClip(Shape s) { - // The first time the clip is set, save it as the original clip - // to reset to on s == null. We can rely on this being non-null - // because the constructor in subclasses is expected to set the + // The first time the clip is set, save it as the original clip + // to reset to on s == null. We can rely on this being non-null + // because the constructor in subclasses is expected to set the // initial clip properly. if( firstClip ) { @@ -975,7 +975,7 @@ public abstract class CairoGraphics2D extends Graphics2D } else walkPath(clip.getPathIterator(null), false); - + cairoClip(nativePointer); } } @@ -1010,7 +1010,7 @@ public abstract class CairoGraphics2D extends Graphics2D { if (this.comp == comp) return; - + this.comp = comp; if (compCtx != null) compCtx.dispose(); @@ -1021,11 +1021,11 @@ public abstract class CairoGraphics2D extends Graphics2D AlphaComposite a = (AlphaComposite) comp; cairoSetOperator(nativePointer, a.getRule()); } - + else { cairoSetOperator(nativePointer, AlphaComposite.SRC_OVER); - + if (comp != null) { // FIXME: this check is only required "if this Graphics2D @@ -1033,24 +1033,24 @@ public abstract class CairoGraphics2D extends Graphics2D SecurityManager sm = System.getSecurityManager(); if (sm != null) sm.checkPermission(new AWTPermission("readDisplayPixels")); - + compCtx = comp.createContext(getBufferCM(), getNativeCM(), hints); } } } - + /** * Returns the Colour Model describing the native, raw image data for this * specific peer. - * + * * @return ColorModel the ColorModel of native data in this peer */ protected abstract ColorModel getNativeCM(); - + /** * Returns the Color Model describing the buffer that this peer uses * for custom composites. - * + * * @return ColorModel the ColorModel of the composite buffer in this peer. */ protected ColorModel getBufferCM() @@ -1107,7 +1107,7 @@ public abstract class CairoGraphics2D extends Graphics2D if (s instanceof Rectangle2D) { Rectangle2D r = (Rectangle2D) s; - + // Pixels need to be shifted in draw operations to ensure that they // light up entire pixels, but we also need to make sure the rectangle // does not get distorted by this shifting operation @@ -1117,7 +1117,7 @@ public abstract class CairoGraphics2D extends Graphics2D double h = Math.round(r.getHeight()); cairoRectangle(nativePointer, x, y, w, h); } - + // Lines are easy too else if (s instanceof Line2D) { @@ -1170,7 +1170,7 @@ public abstract class CairoGraphics2D extends Graphics2D /** * Note that the rest of the drawing methods go via fill() or draw() for the drawing, - * although subclasses may with to overload these methods where context-specific + * although subclasses may with to overload these methods where context-specific * optimizations are possible (e.g. bitmaps and fillRect(int, int, int, int) */ @@ -1274,17 +1274,17 @@ public abstract class CairoGraphics2D extends Graphics2D } /** - * CopyArea - performs clipping to the native surface as a convenience + * CopyArea - performs clipping to the native surface as a convenience * (requires getRealBounds). Then calls copyAreaImpl. */ - public void copyArea(int ox, int oy, int owidth, int oheight, - int odx, int ody) + public void copyArea(int ox, int oy, int owidth, int oheight, + int odx, int ody) { // FIXME: does this handle a rotation transform properly? // (the width/height might not be correct) Point2D pos = transform.transform(new Point2D.Double(ox, oy), (Point2D) null); - Point2D dim = transform.transform(new Point2D.Double(ox + owidth, + Point2D dim = transform.transform(new Point2D.Double(ox + owidth, oy + oheight), (Point2D) null); Point2D p2 = transform.transform(new Point2D.Double(ox + odx, oy + ody), @@ -1307,7 +1307,7 @@ public abstract class CairoGraphics2D extends Graphics2D if( x + dx + width < r.getX() || y + dy + height < r.getY() ) return; - // Clip edges if necessary + // Clip edges if necessary if( x + dx < r.getX() ) // left { width = x + dx + width; @@ -1348,10 +1348,10 @@ public abstract class CairoGraphics2D extends Graphics2D { this.hints = new RenderingHints(getDefaultHints()); this.hints.putAll(hints); - + shiftDrawCalls = hints.containsValue(RenderingHints.VALUE_STROKE_NORMALIZE) || hints.containsValue(RenderingHints.VALUE_STROKE_DEFAULT); - + if (compCtx != null) { compCtx.dispose(); @@ -1368,7 +1368,7 @@ public abstract class CairoGraphics2D extends Graphics2D { return hints; } - + private int getInterpolation() { if (this.hints.containsValue(RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR)) @@ -1392,18 +1392,18 @@ public abstract class CairoGraphics2D extends Graphics2D // Do bilinear interpolation as default return INTERPOLATION_BILINEAR; } - + /** * Set antialias if needed. If the ignoreAA flag is set, this method will * return without doing anything. - * + * * @param needAA RenderingHints.VALUE_ANTIALIAS_ON or RenderingHints.VALUE_ANTIALIAS_OFF */ private void setAntialias(boolean needAA) { if (ignoreAA) return; - + if (needAA != antialias) { antialias = !antialias; @@ -1425,8 +1425,8 @@ public abstract class CairoGraphics2D extends Graphics2D // In this case, xform is an AffineTransform that transforms bounding // box of the specified image from image space to user space. However // when we pass this transform to cairo, cairo will use this transform - // to map "user coordinates" to "pixel" coordinates, which is the - // other way around. Therefore to get the "user -> pixel" transform + // to map "user coordinates" to "pixel" coordinates, which is the + // other way around. Therefore to get the "user -> pixel" transform // that cairo wants from "image -> user" transform that we currently // have, we will need to invert the transformation matrix. AffineTransform invertedXform; @@ -1459,10 +1459,10 @@ public abstract class CairoGraphics2D extends Graphics2D double[] i2u = new double[6]; int width = b.getWidth(); int height = b.getHeight(); - - // If this BufferedImage has a BufferedImageGraphics object, + + // If this BufferedImage has a BufferedImageGraphics object, // use the cached CairoSurface that BIG is drawing onto - + if( BufferedImageGraphics.bufferedImages.get( b ) != null ) raster = BufferedImageGraphics.bufferedImages.get( b ); else @@ -1481,18 +1481,18 @@ public abstract class CairoGraphics2D extends Graphics2D updateColor(); return true; } - + if( bgcolor != null ) { Color oldColor = bg; setBackground(bgcolor); - + Rectangle2D bounds = new Rectangle2D.Double(0, 0, width, height); bounds = getTransformedBounds(bounds, xform); - + clearRect((int)bounds.getX(), (int)bounds.getY(), (int)bounds.getWidth(), (int)bounds.getHeight()); - + setBackground(oldColor); } @@ -1500,7 +1500,7 @@ public abstract class CairoGraphics2D extends Graphics2D // FIXME: The above method returns data in the standard ARGB colorspace, // meaning data should NOT be alpha pre-multiplied; however Cairo expects // data to be premultiplied. - + cairoSave(nativePointer); Rectangle2D bounds = new Rectangle2D.Double(0, 0, width, height); bounds = getTransformedBounds(bounds, xform); @@ -1510,7 +1510,7 @@ public abstract class CairoGraphics2D extends Graphics2D drawPixels(nativePointer, pixels, width, height, width, i2u, alpha, getInterpolation()); - + cairoRestore(nativePointer); // Cairo seems to lose the current color which must be restored. @@ -1585,7 +1585,7 @@ public abstract class CairoGraphics2D extends Graphics2D int destWidth = dx2 - dx1; int destHeight = dy2 - dy1; - if(destWidth == 0 || destHeight == 0 || sourceWidth == 0 || + if(destWidth == 0 || destHeight == 0 || sourceWidth == 0 || sourceHeight == 0) return true; @@ -1593,18 +1593,18 @@ public abstract class CairoGraphics2D extends Graphics2D double scaleY = destHeight / (double) sourceHeight; // FIXME: Avoid using an AT if possible here - it's at least twice as slow. - + Shape oldClip = getClip(); int cx, cy, cw, ch; - if( dx1 < dx2 ) + if( dx1 < dx2 ) { cx = dx1; cw = dx2 - dx1; } else { cx = dx2; cw = dx1 - dx2; } - if( dy1 < dy2 ) + if( dy1 < dy2 ) { cy = dy1; ch = dy2 - dy1; } else { cy = dy2; ch = dy1 - dy2; } - + clipRect( cx, cy, cw, ch ); AffineTransform tx = new AffineTransform(); @@ -1622,10 +1622,10 @@ public abstract class CairoGraphics2D extends Graphics2D { return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, observer); } - + /** * Optimized method for drawing a CairoSurface onto this graphics context. - * + * * @param surface The surface to draw. * @param tx The transformation matrix (cannot be null). * @param alpha The alpha value to paint with ( 0 <= alpha <= 1). @@ -1642,19 +1642,19 @@ public abstract class CairoGraphics2D extends Graphics2D Point2D origin = new Point2D.Double(0, 0); Point2D offset = new Point2D.Double(surface.getSampleModelTranslateX(), surface.getSampleModelTranslateY()); - + tx.transform(origin, origin); tx.transform(offset, offset); - + tx.translate(offset.getX() - origin.getX(), offset.getY() - origin.getY()); } - + // Find dimensions of this surface relative to the root parent surface Rectangle bounds = new Rectangle(-surface.getSampleModelTranslateX(), -surface.getSampleModelTranslateY(), surface.width, surface.height); - + // Clip to the translated image // We use direct cairo methods to avoid the overhead of maintaining a // java copy of the clip, since we will be reverting it immediately @@ -1663,7 +1663,7 @@ public abstract class CairoGraphics2D extends Graphics2D cairoSave(nativePointer); walkPath(newBounds.getPathIterator(null), false); cairoClip(nativePointer); - + // Draw the surface try { @@ -1677,7 +1677,7 @@ public abstract class CairoGraphics2D extends Graphics2D // This should never happen(?), so we don't need to do anything here. ; } - + // Restore clip cairoRestore(nativePointer); } @@ -1696,13 +1696,13 @@ public abstract class CairoGraphics2D extends Graphics2D tl = new TextLayout( str, getFont(), getFontRenderContext() ); fontPeer.textLayoutCache.put(str, tl); } - + // Set antialias to text_antialiasing, and set the ignoreAA flag so that // the setting doesn't get overridden in a draw() or fill() call. setAntialias(!hints.get(RenderingHints.KEY_TEXT_ANTIALIASING) .equals(RenderingHints.VALUE_TEXT_ANTIALIAS_OFF)); ignoreAA = true; - + tl.draw(this, x, y); ignoreAA = false; } @@ -1726,14 +1726,14 @@ public abstract class CairoGraphics2D extends Graphics2D if (customPaint) setCustomPaint(gv.getOutline().getBounds()); - + if (comp instanceof AlphaComposite) alpha = ((AlphaComposite) comp).getAlpha(); - + setAntialias(!hints.get(RenderingHints.KEY_TEXT_ANTIALIASING) .equals(RenderingHints.VALUE_TEXT_ANTIALIAS_OFF)); ignoreAA = true; - + if (gv instanceof FreetypeGlyphVector && alpha == 1.0 && !((FreetypeGlyphVector)gv).hasTransforms()) { @@ -1744,8 +1744,8 @@ public abstract class CairoGraphics2D extends Graphics2D setFont (gv.getFont ()); GdkFontPeer fontPeer = (GdkFontPeer) font.getPeer(); - synchronized (fontPeer) - { + synchronized (fontPeer) + { cairoDrawGlyphVector(nativePointer, fontPeer, x, y, n, codes, positions, fontset); } @@ -1756,7 +1756,7 @@ public abstract class CairoGraphics2D extends Graphics2D fill(gv.getOutline()); translate(-x, -y); } - + ignoreAA = false; } @@ -1767,7 +1767,7 @@ public abstract class CairoGraphics2D extends Graphics2D } /** - * Should perhaps be contexct dependent, but this is left for now as an + * Should perhaps be contexct dependent, but this is left for now as an * overloadable default implementation. */ public FontRenderContext getFontRenderContext() @@ -1799,10 +1799,10 @@ public abstract class CairoGraphics2D extends Graphics2D if (f.getPeer() instanceof GdkFontPeer) font = f; else - font = + font = ((ClasspathToolkit)(Toolkit.getDefaultToolkit())) - .getFont(f.getName(), f.getAttributes()); - + .getFont(f.getName(), f.getAttributes()); + GdkFontPeer fontpeer = (GdkFontPeer) getFont().getPeer(); synchronized (fontpeer) { @@ -1824,11 +1824,11 @@ public abstract class CairoGraphics2D extends Graphics2D if( onStroke ) { Shape stroked = stroke.createStrokedShape( s ); - return stroked.intersects( (double)rect.x, (double)rect.y, + return stroked.intersects( (double)rect.x, (double)rect.y, (double)rect.width, (double)rect.height ); } - return s.intersects( (double)rect.x, (double)rect.y, - (double)rect.width, (double)rect.height ); + return s.intersects( (double)rect.x, (double)rect.y, + (double)rect.width, (double)rect.height ); } public String toString() @@ -1836,7 +1836,7 @@ public abstract class CairoGraphics2D extends Graphics2D return (getClass().getName() + "[font=" + getFont().toString() + ",color=" + fg.toString() - + "]"); + + "]"); } ///////////////////////// PRIVATE METHODS /////////////////////////////////// @@ -1845,7 +1845,7 @@ public abstract class CairoGraphics2D extends Graphics2D * All the drawImage() methods eventually get delegated here if the image * is not a Cairo surface. * - * @param bgcolor - if non-null draws the background color before + * @param bgcolor - if non-null draws the background color before * drawing the image. */ private boolean drawRaster(ColorModel cm, Raster r, @@ -1881,7 +1881,7 @@ public abstract class CairoGraphics2D extends Graphics2D if (pixels == null) { // FIXME: I don't think this code will work correctly with a non-RGB - // MultiPixelPackedSampleModel. Although this entire method should + // MultiPixelPackedSampleModel. Although this entire method should // probably be rewritten to better utilize Cairo's different supported // data formats. if (sm instanceof MultiPixelPackedSampleModel) @@ -1917,13 +1917,13 @@ public abstract class CairoGraphics2D extends Graphics2D double alpha = 1.0; if (comp instanceof AlphaComposite) alpha = ((AlphaComposite) comp).getAlpha(); - + drawPixels(nativePointer, pixels, r.getWidth(), r.getHeight(), r.getWidth(), i2u, alpha, getInterpolation()); // Cairo seems to lose the current color which must be restored. updateColor(); - + return true; } @@ -2112,7 +2112,7 @@ public abstract class CairoGraphics2D extends Graphics2D { if (! (clip instanceof GeneralPath)) clip = new GeneralPath(clip); - + GeneralPath p = (GeneralPath) clip; p.transform(t); } @@ -2138,7 +2138,7 @@ public abstract class CairoGraphics2D extends Graphics2D return rect; } - + static Rectangle2D getTransformedBounds(Rectangle2D bounds, AffineTransform tx) { double x1 = bounds.getX(); @@ -2149,10 +2149,10 @@ public abstract class CairoGraphics2D extends Graphics2D double y2 = y1; double y3 = bounds.getY() + bounds.getHeight(); double y4 = y3; - + double[] points = new double[] {x1, y1, x2, y2, x3, y3, x4, y4}; tx.transform(points, 0, points, 0, 4); - + double minX = points[0]; double maxX = minX; double minY = points[1]; @@ -2164,13 +2164,13 @@ public abstract class CairoGraphics2D extends Graphics2D if (points[i] > maxX) maxX = points[i]; i++; - + if (points[i] < minY) minY = points[i]; if (points[i] > maxY) maxY = points[i]; } - + return new Rectangle2D.Double(minX, minY, (maxX - minX), (maxY - minY)); } } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurface.java b/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurface.java index 6c8a30d1143..71f6638e47c 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurface.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurface.java @@ -68,7 +68,7 @@ public class CairoSurface extends WritableRaster int width = -1, height = -1; /** - * The native pointer to the Cairo surface. + * The native pointer to the Cairo surface. */ long surfacePointer; @@ -93,8 +93,8 @@ public class CairoSurface extends WritableRaster 0xFF000000, true, Buffers.smallestAppropriateTransferType(32)); - - // This CM corresponds to the CAIRO_FORMAT_RGB24 type in Cairo + + // This CM corresponds to the CAIRO_FORMAT_RGB24 type in Cairo static ColorModel cairoCM_opaque = new DirectColorModel(24, 0x00FF0000, 0x0000FF00, 0x000000FF); @@ -112,7 +112,7 @@ public class CairoSurface extends WritableRaster private native void destroy(long surfacePointer, int[] buf); /** - * Draws this image to a given CairoGraphics context, + * Draws this image to a given CairoGraphics context, * with an affine transform given by i2u. */ public native void nativeDrawSurface(long surfacePointer, long contextPointer, @@ -122,23 +122,23 @@ public class CairoSurface extends WritableRaster /** * Synchronizes the image's data buffers, copying any changes made in the * Java array into the native array. - * + * * This method should only be called if (sharedBuffers == false). */ native void syncNativeToJava(long surfacePointer, int[] buffer); - + /** * Synchronizes the image's data buffers, copying any changes made in the * native array into the Java array. - * + * * This method should only be called if (sharedBuffers == false). */ native void syncJavaToNative(long surfacePointer, int[] buffer); - + /** * Return the buffer, with the sample values of each pixel reversed - * (ie, in ABGR instead of ARGB). - * + * (ie, in ABGR instead of ARGB). + * * @return A pointer to a flipped buffer. The memory is allocated in native * code, and must be explicitly freed when it is no longer needed. */ @@ -146,21 +146,21 @@ public class CairoSurface extends WritableRaster /** * Create a cairo_surface_t with specified width and height. - * The format will be ARGB32 with premultiplied alpha and native bit + * The format will be ARGB32 with premultiplied alpha and native bit * and word ordering. */ public CairoSurface(int width, int height) { this(0, 0, width, height); } - + public CairoSurface(int x, int y, int width, int height) { super(createCairoSampleModel(width, height), null, new Point(x, y)); if(width <= 0 || height <= 0) throw new IllegalArgumentException("Image must be at least 1x1 pixels."); - + this.width = width; this.height = height; dataBuffer = new DataBufferInt(width * height); @@ -169,7 +169,7 @@ public class CairoSurface extends WritableRaster if(surfacePointer == 0) throw new Error("Could not allocate bitmap."); } - + /** * Create a Cairo Surface that is a subimage of another Cairo Surface */ @@ -177,7 +177,7 @@ public class CairoSurface extends WritableRaster Point origin) { super(sm, parent.dataBuffer, bounds, origin, parent); - + this.width = super.width; this.height = super.height; this.surfacePointer = parent.surfacePointer; @@ -258,10 +258,10 @@ public class CairoSurface extends WritableRaster { return new GtkImage(width, height, getFlippedBuffer(surfacePointer)); } - + /** * Convenience method to quickly grab the data array backing this Raster. - * + * * @return The array behind the databuffer. */ public int[] getData() @@ -271,16 +271,16 @@ public class CairoSurface extends WritableRaster /** * Returns a BufferedImage backed by a Cairo surface. - */ + */ public static BufferedImage getBufferedImage(int width, int height) { return getBufferedImage(new CairoSurface(width, height)); } /** - * Returns a BufferedImage backed by a Cairo surface, + * Returns a BufferedImage backed by a Cairo surface, * created from a GtkImage. - */ + */ public static BufferedImage getBufferedImage(GtkImage image) { return getBufferedImage(new CairoSurface(image)); @@ -288,7 +288,7 @@ public class CairoSurface extends WritableRaster /** * Returns a BufferedImage backed by a Cairo surface. - */ + */ public static BufferedImage getBufferedImage(CairoSurface surface) { return new BufferedImage(cairoColorModel, surface, @@ -302,7 +302,7 @@ public class CairoSurface extends WritableRaster public Graphics2D getGraphics() { return new CairoSurfaceGraphics(this); - } + } ///// Methods used by CairoSurfaceGraphics ///// /** @@ -319,7 +319,7 @@ public class CairoSurface extends WritableRaster /** * Copy a portion of this surface to another area on the surface. The given * parameters must be within bounds - count on a segfault otherwise. - * + * * @param x The x coordinate of the area to be copied from. * @param y The y coordinate of the area to be copied from. * @param width The width of the area to be copied. @@ -336,7 +336,7 @@ public class CairoSurface extends WritableRaster native void copyAreaNative2(long surfacePointer, int x, int y, int width, int height, int dx, int dy, int stride); - + /** * Creates a SampleModel that matches Cairo's native format */ @@ -344,12 +344,12 @@ public class CairoSurface extends WritableRaster { return new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT, w, h, new int[]{0x00FF0000, 0x0000FF00, - 0x000000FF, 0xFF000000}); + 0x000000FF, 0xFF000000}); } - + /** * Returns whether this ColorModel is compatible with Cairo's native types. - * + * * @param cm The color model to check. * @return Whether it is compatible. */ @@ -358,10 +358,10 @@ public class CairoSurface extends WritableRaster return (cm.equals(cairoCM_pre) || cm.equals(cairoCM_opaque) || cm.equals(cairoColorModel)); } - + /** * Returns whether this SampleModel is compatible with Cairo's native types. - * + * * @param sm The sample model to check. * @return Whether it is compatible. */ @@ -381,23 +381,23 @@ public class CairoSurface extends WritableRaster return createWritableChild(parentX, parentY, width, height, childMinX, childMinY, bandList); } - + public WritableRaster createCompatibleWritableRaster() { return new CairoSurface(width, height); } - + public WritableRaster createCompatibleWritableRaster (int x, int y, int w, int h) { return new CairoSurface(x, y, w, h); } - + public Raster createTranslatedChild(int childMinX, int childMinY) { return createWritableTranslatedChild(childMinX, childMinY); } - + public WritableRaster createWritableChild(int parentX, int parentY, int w, int h, int childMinX, int childMinY, int[] bandList) @@ -405,7 +405,7 @@ public class CairoSurface extends WritableRaster 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); @@ -415,12 +415,12 @@ public class CairoSurface extends WritableRaster new Point(sampleModelTranslateX + childMinX - parentX, sampleModelTranslateY + childMinY - parentY)); } - + public WritableRaster createWritableTranslatedChild(int x, int y) { int tcx = sampleModelTranslateX - minX + x; int tcy = sampleModelTranslateY - minY + y; - + return new CairoSurface(sampleModel, this, new Rectangle(x, y, width, height), new Point(tcx, tcy)); diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java b/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java index 35b015f3200..a0c6caa9a32 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/CairoSurfaceGraphics.java @@ -67,7 +67,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D protected CairoSurface surface; private BufferedImage buffer; private long cairo_t; - + /** * Create a graphics context from a cairo surface */ @@ -82,24 +82,24 @@ public class CairoSurfaceGraphics extends CairoGraphics2D /** * Creates another context from a surface. * Used by create(). - */ + */ private CairoSurfaceGraphics(CairoSurfaceGraphics copyFrom) { surface = copyFrom.surface; cairo_t = surface.newCairoContext(); copy( copyFrom, cairo_t ); } - + public Graphics create() { return new CairoSurfaceGraphics(this); } - + public GraphicsConfiguration getDeviceConfiguration() { return GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration(); } - + protected Rectangle2D getRealBounds() { return new Rectangle2D.Double(0.0, 0.0, surface.width, surface.height); @@ -109,7 +109,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D { surface.copyAreaNative(x, y, width, height, dx, dy, surface.width); } - + /** * Overloaded methods that do actual drawing need to account for custom * composites @@ -118,7 +118,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D { if (!surface.sharedBuffer) surface.syncJavaToNative(surface.surfacePointer, surface.getData()); - + // Find total bounds of shape Rectangle r = findStrokedBounds(s); if (shiftDrawCalls) @@ -126,24 +126,24 @@ public class CairoSurfaceGraphics extends CairoGraphics2D r.width++; r.height++; } - + // Do the drawing if (comp == null || comp instanceof AlphaComposite) super.draw(s); - + else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setStroke(this.getStroke()); g2d.setColor(this.getColor()); g2d.setTransform(transform); g2d.draw(s); - + drawComposite(r.getBounds2D(), null); } - + if (!surface.sharedBuffer) surface.syncNativeToJava(surface.surfacePointer, surface.getData()); } @@ -152,23 +152,23 @@ public class CairoSurfaceGraphics extends CairoGraphics2D { if (!surface.sharedBuffer) surface.syncJavaToNative(surface.surfacePointer, surface.getData()); - + if (comp == null || comp instanceof AlphaComposite) super.fill(s); - + else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setPaint(this.getPaint()); g2d.setColor(this.getColor()); g2d.setTransform(transform); g2d.fill(s); - + drawComposite(s.getBounds2D(), null); } - + if (!surface.sharedBuffer) surface.syncNativeToJava(surface.surfacePointer, surface.getData()); } @@ -177,10 +177,10 @@ public class CairoSurfaceGraphics extends CairoGraphics2D { if (!surface.sharedBuffer) surface.syncJavaToNative(surface.surfacePointer, surface.getData()); - + if (comp == null || comp instanceof AlphaComposite) super.drawRenderedImage(image, xform); - + else { createBuffer(); @@ -189,10 +189,10 @@ public class CairoSurfaceGraphics extends CairoGraphics2D g2d.setRenderingHints(this.getRenderingHints()); g2d.setTransform(transform); g2d.drawRenderedImage(image, xform); - + drawComposite(buffer.getRaster().getBounds(), null); } - + if (!surface.sharedBuffer) surface.syncNativeToJava(surface.surfacePointer, surface.getData()); } @@ -206,7 +206,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D boolean ret; if (comp == null || comp instanceof AlphaComposite) ret = super.drawImage(img, xform, bgcolor, obs); - + else { // Get buffered image of source @@ -218,16 +218,16 @@ public class CairoSurfaceGraphics extends CairoGraphics2D img = Toolkit.getDefaultToolkit().createImage(source); } BufferedImage bImg = (BufferedImage) img; - + // Find translated bounds Rectangle2D bounds = new Rectangle(bImg.getMinX(), bImg.getMinY(), bImg.getWidth(), bImg.getHeight()); if (xform != null) bounds = getTransformedBounds(bounds, xform); - + // Create buffer and draw image createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setRenderingHints(this.getRenderingHints()); g2d.drawImage(img, xform, obs); @@ -235,10 +235,10 @@ public class CairoSurfaceGraphics extends CairoGraphics2D // Perform compositing ret = drawComposite(bounds, obs); } - + if (!surface.sharedBuffer) surface.syncNativeToJava(surface.surfacePointer, surface.getData()); - + return ret; } @@ -246,10 +246,10 @@ public class CairoSurfaceGraphics extends CairoGraphics2D { if (!surface.sharedBuffer) surface.syncJavaToNative(surface.surfacePointer, surface.getData()); - + if (comp == null || comp instanceof AlphaComposite) super.drawGlyphVector(gv, x, y); - + else { createBuffer(); @@ -258,17 +258,17 @@ public class CairoSurfaceGraphics extends CairoGraphics2D g2d.setPaint(this.getPaint()); g2d.setStroke(this.getStroke()); g2d.drawGlyphVector(gv, x, y); - + Rectangle2D bounds = gv.getLogicalBounds(); bounds = new Rectangle2D.Double(x + bounds.getX(), y + bounds.getY(), bounds.getWidth(), bounds.getHeight()); drawComposite(bounds, null); } - + if (!surface.sharedBuffer) surface.syncNativeToJava(surface.surfacePointer, surface.getData()); } - + private boolean drawComposite(Rectangle2D bounds, ImageObserver observer) { // Find bounds in device space @@ -280,7 +280,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D devClip = new Rectangle(buffer.getMinX(), buffer.getMinY(), buffer.getWidth(), buffer.getHeight()); Rectangle2D.intersect(bounds, devClip, bounds); - + // Round bounds as needed, but be careful in our rounding // (otherwise it may leave unpainted stripes) double x = bounds.getX(); @@ -290,7 +290,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D x = Math.round(x); y = Math.round(y); bounds.setRect(x, y, Math.round(maxX - x), Math.round(maxY - y)); - + // Find subimage of internal buffer for updating BufferedImage buffer2 = buffer; if (!bounds.equals(buffer2.getRaster().getBounds())) @@ -307,12 +307,12 @@ public class CairoSurfaceGraphics extends CairoGraphics2D // Perform actual composite operation compCtx.compose(buffer2.getRaster(), current.getRaster(), buffer2.getRaster()); - + // Set cairo's composite to direct SRC, since we've already done our own - // compositing + // compositing Composite oldcomp = comp; setComposite(AlphaComposite.Src); - + // This MUST call directly into the "action" method in CairoGraphics2D, // not one of the wrappers, to ensure that the composite isn't processed // more than once! @@ -324,7 +324,7 @@ public class CairoSurfaceGraphics extends CairoGraphics2D updateColor(); return rv; } - + private void createBuffer() { if (buffer == null) @@ -337,17 +337,17 @@ public class CairoSurfaceGraphics extends CairoGraphics2D else { Graphics2D g2d = ((Graphics2D)buffer.getGraphics()); - + g2d.setBackground(new Color(0,0,0,0)); g2d.clearRect(0, 0, buffer.getWidth(), buffer.getHeight()); } } - + protected ColorModel getNativeCM() { return CairoSurface.cairoCM_pre; } - + protected ColorModel getBufferCM() { return CairoSurface.cairoColorModel; diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java index bfa3bc96ac3..50161b2b7e8 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphics.java @@ -83,7 +83,7 @@ public class ComponentGraphics extends CairoGraphics2D ComponentGraphics() { } - + private ComponentGraphics(GtkComponentPeer component) { this.component = component; @@ -114,7 +114,7 @@ public class ComponentGraphics extends CairoGraphics2D /** * Obtain and hold a GDK lock, which is required for all drawing operations * in this graphics context (since it is backed by an X surface). - * + * * This method causes the GDK locking behaviour to be re-entrant. No race * conditions are caused since a ThreadLocal is used and each thread has its * own lock counter. @@ -176,11 +176,11 @@ public class ComponentGraphics extends CairoGraphics2D */ private static native Pointer nativeGrab(GtkComponentPeer component); - private native void copyAreaNative(GtkComponentPeer component, int x, int y, + private native void copyAreaNative(GtkComponentPeer component, int x, int y, int width, int height, int dx, int dy); private native void drawVolatile(GtkComponentPeer component, - long vimg, int x, int y, + long vimg, int x, int y, int width, int height, int cx, int cy, int cw, int ch); @@ -193,7 +193,7 @@ public class ComponentGraphics extends CairoGraphics2D } /** - * Returns a Graphics2D object for a component, either an instance of this + * Returns a Graphics2D object for a component, either an instance of this * class (if xrender is supported), or a context which copies. */ public static Graphics2D getComponentGraphics(GtkComponentPeer component) @@ -214,7 +214,7 @@ public class ComponentGraphics extends CairoGraphics2D { return new ComponentGraphics(this); } - + protected Rectangle2D getRealBounds() { return component.awtComponent.getBounds(); @@ -226,23 +226,23 @@ public class ComponentGraphics extends CairoGraphics2D } /** - * Overloaded methods that do actual drawing need to enter the gdk threads + * Overloaded methods that do actual drawing need to enter the gdk threads * and also do certain things before and after. */ public void draw(Shape s) { if (comp == null || comp instanceof AlphaComposite) super.draw(s); - + else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setStroke(this.getStroke()); g2d.setColor(this.getColor()); g2d.draw(s); - + drawComposite(s.getBounds2D(), null); } } @@ -251,16 +251,16 @@ public class ComponentGraphics extends CairoGraphics2D { if (comp == null || comp instanceof AlphaComposite) super.fill(s); - + else { createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setPaint(this.getPaint()); g2d.setColor(this.getColor()); g2d.fill(s); - + drawComposite(s.getBounds2D(), null); } } @@ -269,7 +269,7 @@ public class ComponentGraphics extends CairoGraphics2D { if (comp == null || comp instanceof AlphaComposite) super.drawRenderedImage(image, xform); - + else { createBuffer(); @@ -277,18 +277,18 @@ public class ComponentGraphics extends CairoGraphics2D Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setRenderingHints(this.getRenderingHints()); g2d.drawRenderedImage(image, xform); - + drawComposite(buffer.getRaster().getBounds(), null); } } protected boolean drawImage(Image img, AffineTransform xform, - Color bgcolor, ImageObserver obs) + Color bgcolor, ImageObserver obs) { boolean rv; if (comp == null || comp instanceof AlphaComposite) rv = super.drawImage(img, xform, bgcolor, obs); - + else { // Get buffered image of source @@ -300,7 +300,7 @@ public class ComponentGraphics extends CairoGraphics2D img = Toolkit.getDefaultToolkit().createImage(source); } BufferedImage bImg = (BufferedImage) img; - + // Find translated bounds Point2D origin = new Point2D.Double(bImg.getMinX(), bImg.getMinY()); Point2D pt = new Point2D.Double(bImg.getWidth() + bImg.getMinX(), @@ -310,10 +310,10 @@ public class ComponentGraphics extends CairoGraphics2D origin = xform.transform(origin, origin); pt = xform.transform(pt, pt); } - + // Create buffer and draw image createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setRenderingHints(this.getRenderingHints()); g2d.drawImage(img, xform, obs); @@ -331,7 +331,7 @@ public class ComponentGraphics extends CairoGraphics2D { if (comp == null || comp instanceof AlphaComposite) super.drawGlyphVector(gv, x, y); - + else { createBuffer(); @@ -340,14 +340,14 @@ public class ComponentGraphics extends CairoGraphics2D g2d.setPaint(this.getPaint()); g2d.setStroke(this.getStroke()); g2d.drawGlyphVector(gv, x, y); - + Rectangle2D bounds = gv.getLogicalBounds(); bounds = new Rectangle2D.Double(x + bounds.getX(), y + bounds.getY(), bounds.getWidth(), bounds.getHeight()); drawComposite(bounds, null); } } - + public boolean drawImage(Image img, int x, int y, ImageObserver observer) { // If it is a GtkVolatileImage with an "easy" transform then @@ -390,7 +390,7 @@ public class ComponentGraphics extends CairoGraphics2D } return super.drawImage(bimg, x, y, observer); } - + public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) { @@ -446,41 +446,41 @@ public class ComponentGraphics extends CairoGraphics2D clip = new Rectangle(buffer.getMinX(), buffer.getMinY(), buffer.getWidth(), buffer.getHeight()); Rectangle2D.intersect(bounds, clip, bounds); - + BufferedImage buffer2 = buffer; if (!bounds.equals(buffer2.getRaster().getBounds())) buffer2 = buffer2.getSubimage((int)bounds.getX(), (int)bounds.getY(), (int)bounds.getWidth(), (int)bounds.getHeight()); - + // Get destination clip to bounds double[] points = new double[] {bounds.getX(), bounds.getY(), bounds.getMaxX(), bounds.getMaxY()}; transform.transform(points, 0, points, 0, 2); - + Rectangle2D deviceBounds = new Rectangle2D.Double(points[0], points[1], points[2] - points[0], points[3] - points[1]); - + Rectangle2D.intersect(deviceBounds, this.getClipInDevSpace(), deviceBounds); - + // Get current image on the component GtkImage img = grab(component); Graphics gr = componentBuffer.createGraphics(); gr.drawImage(img, 0, 0, null); gr.dispose(); - + BufferedImage cBuffer = componentBuffer; if (!deviceBounds.equals(cBuffer.getRaster().getBounds())) cBuffer = cBuffer.getSubimage((int)deviceBounds.getX(), (int)deviceBounds.getY(), (int)deviceBounds.getWidth(), (int)deviceBounds.getHeight()); - + // Perform actual composite operation compCtx.compose(buffer2.getRaster(), cBuffer.getRaster(), cBuffer.getRaster()); - + // This MUST call directly into the "action" method in CairoGraphics2D, // not one of the wrappers, to ensure that the composite isn't processed // more than once! @@ -490,7 +490,7 @@ public class ComponentGraphics extends CairoGraphics2D null, null); return rv; } - + private void createBuffer() { if (buffer == null) @@ -499,7 +499,7 @@ public class ComponentGraphics extends CairoGraphics2D rst = Raster.createWritableRaster(GtkVolatileImage.createGdkSampleModel(component.awtComponent.getWidth(), component.awtComponent.getHeight()), new Point(0,0)); - + buffer = new BufferedImage(GtkVolatileImage.gdkColorModel, rst, GtkVolatileImage.gdkColorModel.isAlphaPremultiplied(), new Hashtable()); @@ -507,60 +507,60 @@ public class ComponentGraphics extends CairoGraphics2D else { Graphics2D g2d = ((Graphics2D)buffer.getGraphics()); - + g2d.setBackground(new Color(0,0,0,0)); g2d.clearRect(0, 0, buffer.getWidth(), buffer.getHeight()); } - + if (componentBuffer == null) { WritableRaster rst; rst = Raster.createWritableRaster(GtkVolatileImage.createGdkSampleModel(component.awtComponent.getWidth(), component.awtComponent.getHeight()), new Point(0,0)); - + componentBuffer = new BufferedImage(GtkVolatileImage.gdkColorModel, rst, GtkVolatileImage.gdkColorModel.isAlphaPremultiplied(), new Hashtable()); } } - + protected ColorModel getNativeCM() { return GtkVolatileImage.gdkColorModel; } - + /* --- START OVERRIDDEN NATIVE METHODS ---- * All native methods in CairoGraphics2D should be overridden here and * enclosed in locks, since the cairo surface is backed by an X surface * in this graphics context and the X surface requires external locking. - * + * * We lock everything "just in case", since it's difficult to know which * calls are and aren't thread-safe. Overriding and locking the native - * methods allows superclass code in CairoGraphics2D to execute properly, + * methods allows superclass code in CairoGraphics2D to execute properly, * without the need to override every single method. - * + * * CAVEAT: if native code obtains a lock (using gdk_threads_enter(), not the * lock() method provided here) and then calls back into Java and one of these * methods ends up being called, we will deadlock. The lock is only reentrant - * when called via our lock() method. + * when called via our lock() method. */ - + /* These methods are already locked in the superclass CairoGraphics2D * so they do not need to be overridden: - * + * * public void disposeNative * * protected void cairoDrawGlyphVector - * + * * protected void cairoSetFont */ - + @Override protected long init(long pointer) { long ret; - + try { lock(); @@ -570,10 +570,10 @@ public class ComponentGraphics extends CairoGraphics2D { unlock(); } - + return ret; } - + @Override protected void drawPixels(long pointer, int[] pixels, int w, int h, int stride, double[] i2u, double alpha, @@ -590,10 +590,10 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override - protected void setGradient(long pointer, double x1, double y1, - double x2, double y2, + protected void setGradient(long pointer, double x1, double y1, + double x2, double y2, int r1, int g1, int b1, int a1, int r2, int g2, int b2, int a2, boolean cyclic) { @@ -608,7 +608,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void setPaintPixels(long pointer, int[] pixels, int w, int h, int stride, boolean repeat, int x, int y) @@ -623,7 +623,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetMatrix(long pointer, double[] m) { @@ -637,7 +637,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoScale(long pointer, double x, double y) { @@ -651,7 +651,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetOperator(long pointer, int cairoOperator) { @@ -665,7 +665,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetRGBAColor(long pointer, double red, double green, double blue, double alpha) @@ -680,7 +680,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetFillRule(long pointer, int cairoFillRule) { @@ -694,7 +694,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetLine(long pointer, double width, int cap, int join, double miterLimit) @@ -709,9 +709,9 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override - protected void cairoSetDash(long pointer, double[] dashes, int ndash, + protected void cairoSetDash(long pointer, double[] dashes, int ndash, double offset) { try @@ -739,9 +739,9 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override - protected void cairoArc(long pointer, double x, double y, + protected void cairoArc(long pointer, double x, double y, double radius, double angle1, double angle2) { try @@ -754,7 +754,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSave(long pointer) { @@ -768,7 +768,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoRestore(long pointer) { @@ -782,7 +782,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoNewPath(long pointer) { @@ -796,7 +796,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoClosePath(long pointer) { @@ -810,7 +810,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoMoveTo(long pointer, double x, double y) { @@ -824,7 +824,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoLineTo(long pointer, double x, double y) { @@ -838,7 +838,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoCurveTo(long pointer, double x1, double y1, double x2, double y2, double x3, double y3) @@ -853,7 +853,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoStroke(long pointer) { @@ -867,7 +867,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoFill(long pointer, double alpha) { @@ -881,7 +881,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoClip(long pointer) { @@ -895,7 +895,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoResetClip(long pointer) { @@ -909,7 +909,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void cairoSetAntialias(long pointer, boolean aa) { @@ -923,7 +923,7 @@ public class ComponentGraphics extends CairoGraphics2D unlock(); } } - + @Override protected void drawCairoSurface(CairoSurface surface, AffineTransform tx, double alpha, int interpolation) diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java index 2216d459a0e..a73012d9fc7 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/ComponentGraphicsCopy.java @@ -48,7 +48,7 @@ import java.awt.image.RenderedImage; import java.awt.image.ImageObserver; /** - * Implementation of Graphics2D for Components for servers which + * Implementation of Graphics2D for Components for servers which * do not have xrender. * * A mirrored GtkImage of the component is stored in memory @@ -62,17 +62,17 @@ public class ComponentGraphicsCopy extends CairoSurfaceGraphics * GtkImage sharing its data buffer with this Cairo surface. */ private GtkImage gtkimage; - + private int width, height; native void getPixbuf( GtkComponentPeer component, GtkImage image ); - native void copyPixbuf( GtkComponentPeer component, GtkImage image, - int x, int y, int w, int h ); + native void copyPixbuf( GtkComponentPeer component, GtkImage image, + int x, int y, int w, int h ); - public ComponentGraphicsCopy(int width, int height, - GtkComponentPeer component) - { + public ComponentGraphicsCopy(int width, int height, + GtkComponentPeer component) + { super( new CairoSurface( width, height ) ); this.component = component; this.width = width; @@ -82,7 +82,7 @@ public class ComponentGraphicsCopy extends CairoSurfaceGraphics } /** - * Overloaded methods that do actual drawing need to enter the gdk threads + * Overloaded methods that do actual drawing need to enter the gdk threads * and also do certain things before and after. */ public void draw(Shape s) @@ -106,7 +106,7 @@ public class ComponentGraphicsCopy extends CairoSurfaceGraphics } protected boolean drawImage(Image img, AffineTransform xform, - Color bgcolor, ImageObserver obs) + Color bgcolor, ImageObserver obs) { boolean rv = super.drawImage(img, xform, bgcolor, obs); copyPixbuf(component, gtkimage, 0, 0, width, height); @@ -120,4 +120,3 @@ public class ComponentGraphicsCopy extends CairoSurfaceGraphics copyPixbuf(component, gtkimage, r.x, r.y, r.width, r.height); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java b/libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java index af975f394ca..8fd73479949 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java @@ -81,7 +81,7 @@ public class FreetypeGlyphVector extends GlyphVector * The glyph codes */ private int[] glyphCodes; - + /** * The set of fonts used in this glyph vector. */ @@ -89,22 +89,22 @@ public class FreetypeGlyphVector extends GlyphVector /** * Glyph transforms. Supports all transform operations. - * + * * The identity transform should not be stored in this array; use a null * instead (will result in performance improvements). */ private AffineTransform[] glyphTransforms; private GlyphMetrics[] metricsCache; - + private native void dispose(long[] fonts); - + /** * Returns a pointer to the native PangoFcFont object. - * + * * The object will be referenced with g_object_ref n times before being * returned, and must be unreferenced a corresponding number of times. - * + * * @param n Number of times to reference the object. * @return Pointer to the native default font. */ @@ -158,19 +158,19 @@ public class FreetypeGlyphVector extends GlyphVector glyphCodes = new int[ codes.length ]; System.arraycopy(codes, 0, glyphCodes, 0, codes.length); nGlyphs = glyphCodes.length; - + if (fontSet == null) { fontSet = new long[nGlyphs]; Arrays.fill(fontSet, getNativeFontPointer(nGlyphs)); } - + performDefaultLayout(); } /** * Cloning constructor - */ + */ private FreetypeGlyphVector( FreetypeGlyphVector gv ) { font = gv.font; @@ -191,7 +191,7 @@ public class FreetypeGlyphVector extends GlyphVector glyphPositions = new float[(nGlyphs + 1) * 2]; glyphTransforms = new AffineTransform[ nGlyphs ]; Arrays.fill(glyphTransforms, null); - + for(int i = 0; i < nGlyphs; i++ ) { if (gv.glyphTransforms[i] != null) @@ -203,7 +203,7 @@ public class FreetypeGlyphVector extends GlyphVector System.arraycopy(gv.glyphCodes, 0, glyphCodes, 0, nGlyphs); System.arraycopy(gv.fontSet, 0, fontSet, 0, nGlyphs); } - + public void finalize() { dispose(fontSet); @@ -247,8 +247,8 @@ public class FreetypeGlyphVector extends GlyphVector /** * Returns the kerning of a glyph pair */ - private native void getKerning(int leftGlyph, int rightGlyph, long font, - float[] p); + private native void getKerning(int leftGlyph, int rightGlyph, long font, + float[] p); private native double[] getMetricsNative(int glyphCode, long font); @@ -268,9 +268,9 @@ public class FreetypeGlyphVector extends GlyphVector if( ! (gv instanceof FreetypeGlyphVector) ) return false; - return (((FreetypeGlyphVector)gv).font.equals(font) && - ((FreetypeGlyphVector)gv).frc.equals(frc) - && ((FreetypeGlyphVector)gv).s.equals(s)); + return (((FreetypeGlyphVector)gv).font.equals(font) && + ((FreetypeGlyphVector)gv).frc.equals(frc) + && ((FreetypeGlyphVector)gv).s.equals(s)); } /** @@ -323,19 +323,19 @@ public class FreetypeGlyphVector extends GlyphVector } glyphPositions[nGlyphs * 2] = x; glyphPositions[nGlyphs * 2 + 1] = y; - + // Apply any transform that may be in the font's attributes TransformAttribute ta; ta = (TransformAttribute)font.getAttributes().get(TextAttribute.TRANSFORM); if (ta != null) { AffineTransform tx = ta.getTransform(); - + // Transform glyph positions tx.transform(glyphPositions, 0, glyphPositions, 0, glyphPositions.length / 2); - - // Also store per-glyph scale/shear/rotate (but not translation) + + // Also store per-glyph scale/shear/rotate (but not translation) double[] matrix = new double[4]; tx.getMatrix(matrix); AffineTransform deltaTx = new AffineTransform(matrix); @@ -355,7 +355,7 @@ public class FreetypeGlyphVector extends GlyphVector /** * Returns multiple glyphcodes. */ - public int[] getGlyphCodes(int beginGlyphIndex, int numEntries, + public int[] getGlyphCodes(int beginGlyphIndex, int numEntries, int[] codeReturn) { int[] rval; @@ -364,7 +364,7 @@ public class FreetypeGlyphVector extends GlyphVector rval = new int[ numEntries ]; else rval = codeReturn; - + System.arraycopy(glyphCodes, beginGlyphIndex, rval, 0, numEntries); return rval; @@ -372,10 +372,10 @@ public class FreetypeGlyphVector extends GlyphVector /** * Returns pointers to the fonts used in this glyph vector. - * + * * The array index matches that of the glyph vector itself. */ - protected long[] getGlyphFonts(int beginGlyphIndex, int numEntries, + protected long[] getGlyphFonts(int beginGlyphIndex, int numEntries, long[] codeReturn) { long[] rval; @@ -384,7 +384,7 @@ public class FreetypeGlyphVector extends GlyphVector rval = new long[ numEntries ]; else rval = codeReturn; - + System.arraycopy(fontSet, beginGlyphIndex, rval, 0, numEntries); return rval; @@ -394,18 +394,18 @@ public class FreetypeGlyphVector extends GlyphVector { GlyphMetrics gm = getGlyphMetrics( glyphIndex ); if( gm == null ) - return null; + return null; Rectangle2D r = gm.getBounds2D(); Point2D p = getGlyphPosition( glyphIndex ); - + double[] bounds = new double[] {p.getX() + r.getX() - gm.getLSB(), p.getY() + r.getY(), p.getX() + r.getX() - gm.getLSB() + gm.getAdvanceX(), p.getY() + r.getY() + r.getHeight()}; - + if (glyphTransforms[glyphIndex] != null) glyphTransforms[glyphIndex].transform(bounds, 0, bounds, 0, 2); - + return new Rectangle2D.Double(bounds[0], bounds[1], bounds[2] - bounds[0], bounds[3] - bounds[1]); } @@ -428,10 +428,10 @@ public class FreetypeGlyphVector extends GlyphVector gm = null; else { - gm = new GlyphMetrics(true, - (float)val[1], - (float)val[2], - new Rectangle2D.Double(val[3], val[4], + gm = new GlyphMetrics(true, + (float)val[1], + (float)val[2], + new Rectangle2D.Double(val[3], val[4], val[5], val[6] ), GlyphMetrics.STANDARD ); peer.putGlyphMetrics( glyphCodes[ i ], gm ); @@ -454,7 +454,7 @@ public class FreetypeGlyphVector extends GlyphVector /** * Returns the outline of a single glyph. - * + * * Despite what the Sun API says, this method returns the glyph relative to * the origin of the *entire string*, not each individual glyph. */ @@ -462,7 +462,7 @@ public class FreetypeGlyphVector extends GlyphVector { GeneralPath gp = getGlyphOutlineNative(glyphCodes[glyphIndex], fontSet[glyphIndex]); - + AffineTransform tx = AffineTransform.getTranslateInstance(glyphPositions[glyphIndex*2], glyphPositions[glyphIndex*2+1]); if (glyphTransforms[glyphIndex] != null) @@ -484,12 +484,12 @@ public class FreetypeGlyphVector extends GlyphVector /** * Returns the positions of multiple glyphs. */ - public float[] getGlyphPositions(int beginGlyphIndex, int numEntries, - float[] positionReturn) + public float[] getGlyphPositions(int beginGlyphIndex, int numEntries, + float[] positionReturn) { if (positionReturn == null || positionReturn.length < (numEntries * 2)) positionReturn = new float[numEntries*2]; - + System.arraycopy(glyphPositions, beginGlyphIndex*2, positionReturn, 0, numEntries*2); return positionReturn; @@ -502,7 +502,7 @@ public class FreetypeGlyphVector extends GlyphVector { return glyphTransforms[glyphIndex]; } - + /** * Checks whether any transform has been set on any glyphs. */ @@ -511,10 +511,10 @@ public class FreetypeGlyphVector extends GlyphVector for (int i = 0; i < glyphTransforms.length; i++) if (glyphTransforms[i] != null) return true; - + return false; } - + /** * Returns the visual bounds of a glyph * May be off by a pixel or two due to hinting/rasterization. @@ -538,7 +538,7 @@ public class FreetypeGlyphVector extends GlyphVector for( int i = 1; i < nGlyphs; i++ ) { Rectangle2D r2 = (Rectangle2D)getGlyphLogicalBounds( i ); - + rect = rect.createUnion( r2 ); } @@ -566,9 +566,9 @@ public class FreetypeGlyphVector extends GlyphVector } /** - * TODO: - * FreeType does not currently have an API for the JSTF table. We should - * probably get the table ourselves from FT and pass it to some parser + * TODO: + * FreeType does not currently have an API for the JSTF table. We should + * probably get the table ourselves from FT and pass it to some parser * which the native font peers will need. */ public GlyphJustificationInfo getGlyphJustificationInfo(int glyphIndex) @@ -615,14 +615,14 @@ public class FreetypeGlyphVector extends GlyphVector // using and checking for nulls can be much faster. if (newTX != null && newTX.isIdentity()) newTX = null; - + // If the old and new transforms are identical, bail if (glyphTransforms[glyphIndex] == null && newTX == null) return; - + if (newTX != null && newTX.equals(glyphTransforms[glyphIndex])) return; - + // Invalidate bounds cache and set new transform logicalBounds = null; glyphTransforms[glyphIndex] = newTX; diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java index 826cfbecead..6b099063f30 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkFontPeer.java @@ -78,7 +78,7 @@ public class GdkFontPeer extends ClasspathFontPeer { public GdkFontMetrics (Font font) - { + { super(initFont(font)); } @@ -167,7 +167,7 @@ public class GdkFontPeer extends ClasspathFontPeer GdkFontMetrics metrics; - static + static { if (true) // GCJ LOCAL { @@ -204,7 +204,7 @@ public class GdkFontPeer extends ClasspathFontPeer dispose (); } - /* + /* * Helpers for the 3-way overloading that this class seems to suffer * from. Remove them if you feel like they're a performance bottleneck, * for the time being I prefer my code not be written and debugged in @@ -214,7 +214,7 @@ public class GdkFontPeer extends ClasspathFontPeer private String buildString(CharacterIterator iter) { CPStringBuilder sb = new CPStringBuilder(); - 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); return sb.toString(); } @@ -223,7 +223,7 @@ public class GdkFontPeer extends ClasspathFontPeer { CPStringBuilder sb = new CPStringBuilder(); int i = 0; - for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++) + for(char c = iter.first(); c != CharacterIterator.DONE; c = iter.next(), i++) { if (begin <= i) sb.append(c); @@ -232,7 +232,7 @@ public class GdkFontPeer extends ClasspathFontPeer } return sb.toString(); } - + private String buildString(char[] chars, int begin, int limit) { return new String(chars, begin, limit - begin); @@ -247,8 +247,8 @@ public class GdkFontPeer extends ClasspathFontPeer } public GdkFontPeer (String name, int style, int size) - { - super(name, style, size); + { + super(name, style, size); initState (); setFont (this.familyName, this.style, (int)this.size); metricsCache = new HashMap(); @@ -299,14 +299,14 @@ public class GdkFontPeer extends ClasspathFontPeer /** * Unneeded, but implemented anyway. - */ + */ public String getSubFamilyName(Font font, Locale locale) { String name; - + if (locale == null) locale = Locale.getDefault(); - + name = getName(NameDecoder.NAME_SUBFAMILY, locale); if (name == null) { @@ -322,20 +322,20 @@ public class GdkFontPeer extends ClasspathFontPeer * Returns the bytes belonging to a TrueType/OpenType table, * Parameters n,a,m,e identify the 4-byte ASCII tag of the table. * - * Returns null if the font is not TT, the table is nonexistant, + * Returns null if the font is not TT, the table is nonexistant, * or if some other unexpected error occured. * */ private native byte[] getTrueTypeTable(byte n, byte a, byte m, byte e); /** - * Returns the PostScript name of the font, defaults to the familyName if + * Returns the PostScript name of the font, defaults to the familyName if * a PS name could not be retrieved. */ public String getPostScriptName(Font font) { - String name = getName(NameDecoder.NAME_POSTSCRIPT, - /* any language */ null); + String name = getName(NameDecoder.NAME_POSTSCRIPT, + /* any language */ null); if( name == null ) return this.familyName; @@ -356,7 +356,7 @@ public class GdkFontPeer extends ClasspathFontPeer { if (nameTable == null) { - byte[] data = getTrueTypeTable((byte)'n', (byte) 'a', + byte[] data = getTrueTypeTable((byte)'n', (byte) 'a', (byte) 'm', (byte) 'e'); if( data == null ) return null; @@ -378,16 +378,16 @@ public class GdkFontPeer extends ClasspathFontPeer // FIXME: inquire with pango return -1; } - - public GlyphVector createGlyphVector (Font font, - FontRenderContext ctx, + + public GlyphVector createGlyphVector (Font font, + FontRenderContext ctx, CharacterIterator i) { return new FreetypeGlyphVector(font, buildString (i), ctx); } - public GlyphVector createGlyphVector (Font font, - FontRenderContext ctx, + public GlyphVector createGlyphVector (Font font, + FontRenderContext ctx, int[] glyphCodes) { return new FreetypeGlyphVector(font, glyphCodes, ctx); @@ -411,32 +411,32 @@ public class GdkFontPeer extends ClasspathFontPeer { return ascent; } - + public int getBaselineIndex() - { + { // FIXME return Font.ROMAN_BASELINE; } - + public float[] getBaselineOffsets() { return new float[3]; } - + public float getDescent() { return descent; } - + public float getHeight() { return height; } - + public float getLeading() { return height - (ascent + descent); - } + } public int getNumChars() { @@ -447,13 +447,13 @@ public class GdkFontPeer extends ClasspathFontPeer { // FreeType doesn't seem to provide a value here. return ascent / 2; - } + } public float getStrikethroughThickness() { // FreeType doesn't seem to provide a value here. return 1.f; - } + } public float getUnderlineOffset() { @@ -467,7 +467,7 @@ public class GdkFontPeer extends ClasspathFontPeer } - public LineMetrics getLineMetrics (Font font, CharacterIterator ci, + public LineMetrics getLineMetrics (Font font, CharacterIterator ci, int begin, int limit, FontRenderContext rc) { return new GdkFontLineMetrics (this, limit - begin); @@ -490,12 +490,12 @@ public class GdkFontPeer extends ClasspathFontPeer public int getNumGlyphs (Font font) { - byte[] data = getTrueTypeTable((byte)'m', (byte) 'a', - (byte)'x', (byte) 'p'); + byte[] data = getTrueTypeTable((byte)'m', (byte) 'a', + (byte)'x', (byte) 'p'); if( data == null ) return -1; - ByteBuffer buf = ByteBuffer.wrap( data ); + ByteBuffer buf = ByteBuffer.wrap( data ); return buf.getShort(4); } @@ -504,15 +504,15 @@ public class GdkFontPeer extends ClasspathFontPeer return true; } - public GlyphVector layoutGlyphVector (Font font, FontRenderContext frc, - char[] chars, int start, int limit, + public GlyphVector layoutGlyphVector (Font font, FontRenderContext frc, + char[] chars, int start, int limit, int flags) { return new FreetypeGlyphVector(font, chars, start, limit - start, frc, flags); } - public LineMetrics getLineMetrics (Font font, String str, + public LineMetrics getLineMetrics (Font font, String str, FontRenderContext frc) { return new GdkFontLineMetrics (this, str.length ()); @@ -536,7 +536,7 @@ public class GdkFontPeer extends ClasspathFontPeer /** * Put a GlyphMetrics object in the cache. - */ + */ void putGlyphMetrics( int glyphCode, GlyphMetrics metrics ) { metricsCache.put( new Integer( glyphCode ), metrics ); diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java index 147f8f3e675..40474ff3b3d 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsConfiguration.java @@ -51,21 +51,21 @@ import java.awt.image.ColorModel; import java.awt.image.DirectColorModel; import java.awt.image.VolatileImage; -public class GdkGraphicsConfiguration +public class GdkGraphicsConfiguration extends GraphicsConfiguration { GdkScreenGraphicsDevice gdkScreenGraphicsDevice; - + ColorModel opaqueColorModel; ColorModel bitmaskColorModel; ColorModel translucentColorModel; - + public GdkGraphicsConfiguration(GdkScreenGraphicsDevice dev) { gdkScreenGraphicsDevice = dev; - + opaqueColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0); bitmaskColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0x1000000); translucentColorModel = new DirectColorModel(32, 0xFF0000, 0xFF00, 0xFF, 0xFF000000); @@ -81,7 +81,7 @@ public class GdkGraphicsConfiguration return new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB); } - public BufferedImage createCompatibleImage(int w, int h, + public BufferedImage createCompatibleImage(int w, int h, int transparency) { return createCompatibleImage(w, h); @@ -137,7 +137,7 @@ public class GdkGraphicsConfiguration public BufferCapabilities getBufferCapabilities() { - return new BufferCapabilities(getImageCapabilities(), + return new BufferCapabilities(getImageCapabilities(), getImageCapabilities(), BufferCapabilities.FlipContents.UNDEFINED); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index dd6299492a4..d931f44196c 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java @@ -58,9 +58,9 @@ import gnu.classpath.Pointer; public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment { private final int native_state = GtkGenericPeer.getUniqueInteger (); - + private GdkScreenGraphicsDevice defaultDevice; - + private GdkScreenGraphicsDevice[] devices; /** @@ -81,14 +81,14 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment GtkToolkit.initializeGlobalIDs(); initIDs(); } - + private static native void initIDs(); - + public GdkGraphicsEnvironment () { nativeInitState(); } - + native void nativeInitState(); public GraphicsDevice[] getScreenDevices () @@ -97,17 +97,17 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment { devices = nativeGetScreenDevices(); } - + return (GraphicsDevice[]) devices.clone(); } - + private native GdkScreenGraphicsDevice[] nativeGetScreenDevices(); public GraphicsDevice getDefaultScreenDevice () { if (GraphicsEnvironment.isHeadless ()) throw new HeadlessException (); - + synchronized (GdkGraphicsEnvironment.class) { if (defaultDevice == null) @@ -115,10 +115,10 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment defaultDevice = nativeGetDefaultScreenDevice(); } } - + return defaultDevice; } - + private native GdkScreenGraphicsDevice nativeGetDefaultScreenDevice(); public Graphics2D createGraphics (BufferedImage image) @@ -129,7 +129,7 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment return new BufferedImageGraphics( image ); } - + private native int nativeGetNumFontFamilies(); private native void nativeGetFontFamilies(String[] family_names); @@ -157,10 +157,10 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment /** * Used by GtkMouseInfoPeer. - */ + */ native int[] getMouseCoordinates(); native boolean isWindowUnderMouse(GtkWindowPeer windowPeer); - + public WritableRaster createRaster(ColorModel cm, SampleModel sm) { if (CairoSurface.isCompatibleSampleModel(sm) diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java index 9b026953d76..1b247c6ebf7 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java @@ -73,7 +73,7 @@ import gnu.classpath.Pointer; public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder { - static + static { if (true) // GCJ LOCAL { @@ -82,7 +82,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder initStaticState (); } - + /** * Lock that should be held for all gdkpixbuf operations. We don't use * the global gdk_threads_enter/leave functions since gdkpixbuf @@ -124,9 +124,9 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder boolean hasAlpha, GdkPixbufWriter writer); // gdk-pixbuf provids data in RGBA format - static final ColorModel cm = new DirectColorModel (32, 0xff000000, - 0x00ff0000, - 0x0000ff00, + static final ColorModel cm = new DirectColorModel (32, 0xff000000, + 0x00ff0000, + 0x0000ff00, 0x000000ff); public GdkPixbufDecoder (DataInput datainput) { @@ -142,7 +142,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder { super (filename); } - + public GdkPixbufDecoder (URL url) { super (url); @@ -168,21 +168,21 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder ic.setHints (ImageConsumer.RANDOMPIXELORDER); } } - + // called back by native side: area_updated_cb - void areaUpdated (int x, int y, int width, int height, + void areaUpdated (int x, int y, int width, int height, int pixels[], int scansize) { if (curr == null) return; - + for (int i = 0; i < curr.size (); i++) { ImageConsumer ic = (ImageConsumer) curr.elementAt (i); ic.setPixels (x, y, width, height, cm, pixels, 0, scansize); } } - + // called from an async image loader of one sort or another, this method // repeatedly reads bytes from the input stream and passes them through a // GdkPixbufLoader using the native method pumpBytes. pumpBytes in turn @@ -217,7 +217,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder } needsClose = false; - + for (int i = 0; i < curr.size (); i++) { ImageConsumer ic = (ImageConsumer) curr.elementAt (i); @@ -239,7 +239,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder public static class ImageFormatSpec { public String name; - public boolean writable = false; + public boolean writable = false; public ArrayList mimeTypes = new ArrayList(); public ArrayList extensions = new ArrayList(); @@ -257,12 +257,12 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder public synchronized void addExtension(String e) { extensions.add(e); - } + } } static ArrayList imageFormatSpecs; - public static ImageFormatSpec registerFormat(String name, boolean writable) + public static ImageFormatSpec registerFormat(String name, boolean writable) { ImageFormatSpec ifs = new ImageFormatSpec(name, writable); synchronized(GdkPixbufDecoder.class) @@ -277,7 +277,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder static String[] getFormatNames(boolean writable) { ArrayList names = new ArrayList(); - synchronized (imageFormatSpecs) + synchronized (imageFormatSpecs) { Iterator i = imageFormatSpecs.iterator(); while (i.hasNext()) @@ -287,10 +287,10 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder continue; names.add(ifs.name); - /* + /* * In order to make the filtering code work, we need to register * this type under every "format name" likely to be used as a synonym. - * This generally means "all the extensions people might use". + * This generally means "all the extensions people might use". */ Iterator j = ifs.extensions.iterator(); @@ -304,7 +304,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder static String[] getFormatExtensions(boolean writable) { ArrayList extensions = new ArrayList(); - synchronized (imageFormatSpecs) + synchronized (imageFormatSpecs) { Iterator i = imageFormatSpecs.iterator(); while (i.hasNext()) @@ -323,7 +323,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder static String[] getFormatMimeTypes(boolean writable) { ArrayList mimeTypes = new ArrayList(); - synchronized (imageFormatSpecs) + synchronized (imageFormatSpecs) { Iterator i = imageFormatSpecs.iterator(); while (i.hasNext()) @@ -339,7 +339,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder return mimeTypes.toArray(new String[mimeTypes.size()]); } - + static String findFormatName(Object ext, boolean needWritable) { if (ext == null) @@ -361,7 +361,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder if (ifs.name.equals(str)) return str; - Iterator j = ifs.extensions.iterator(); + Iterator j = ifs.extensions.iterator(); while (j.hasNext()) { String extension = j.next(); @@ -369,14 +369,14 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder return ifs.name; } - j = ifs.mimeTypes.iterator(); + j = ifs.mimeTypes.iterator(); while (j.hasNext()) { String mimeType = j.next(); if (mimeType.equals(str)) return ifs.name; } - } + } throw new IllegalArgumentException("unknown extension '" + str + "'"); } @@ -397,7 +397,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder return writerSpi; } - public static void registerSpis(IIORegistry reg) + public static void registerSpis(IIORegistry reg) { reg.registerServiceProvider(getReaderSpi(), ImageReaderSpi.class); reg.registerServiceProvider(getWriterSpi(), ImageWriterSpi.class); @@ -405,11 +405,11 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder public static class GdkPixbufWriterSpi extends ImageWriterSpi { - public GdkPixbufWriterSpi() - { + public GdkPixbufWriterSpi() + { super("GdkPixbuf", "2.x", - GdkPixbufDecoder.getFormatNames(true), - GdkPixbufDecoder.getFormatExtensions(true), + GdkPixbufDecoder.getFormatNames(true), + GdkPixbufDecoder.getFormatExtensions(true), GdkPixbufDecoder.getFormatMimeTypes(true), "gnu.java.awt.peer.gtk.GdkPixbufDecoder$GdkPixbufWriter", new Class[] { ImageOutputStream.class }, @@ -437,11 +437,11 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder public static class GdkPixbufReaderSpi extends ImageReaderSpi { - public GdkPixbufReaderSpi() - { + public GdkPixbufReaderSpi() + { super("GdkPixbuf", "2.x", - GdkPixbufDecoder.getFormatNames(false), - GdkPixbufDecoder.getFormatExtensions(false), + GdkPixbufDecoder.getFormatNames(false), + GdkPixbufDecoder.getFormatExtensions(false), GdkPixbufDecoder.getFormatMimeTypes(false), "gnu.java.awt.peer.gtk.GdkPixbufDecoder$GdkPixbufReader", new Class[] { ImageInputStream.class }, @@ -450,9 +450,9 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder false, null, null, null, null); } - public boolean canDecodeInput(Object obj) - { - return true; + public boolean canDecodeInput(Object obj) + { + return true; } public ImageReader createReaderInstance(Object ext) @@ -489,7 +489,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder return null; } - public IIOMetadata getDefaultImageMetadata (ImageTypeSpecifier imageType, + public IIOMetadata getDefaultImageMetadata (ImageTypeSpecifier imageType, ImageWriteParam param) { return null; @@ -509,7 +509,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder int height = ras.getHeight(); ColorModel model = image.getColorModel(); int[] pixels = CairoGraphics2D.findSimpleIntegerArray (image.getColorModel(), ras); - + if (pixels == null) { BufferedImage img; @@ -520,7 +520,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder for (int y = 0; y < height; ++y) for (int x = 0; x < width; ++x) img.setRGB(x, y, model.getRGB(ras.getPixel(x, y, pix))); - pixels = CairoGraphics2D.findSimpleIntegerArray (img.getColorModel(), + pixels = CairoGraphics2D.findSimpleIntegerArray (img.getColorModel(), img.getRaster()); model = img.getColorModel(); } @@ -530,7 +530,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder processImageStarted(1); synchronized(pixbufLock) { - streamImage(pixels, this.ext, width, height, model.hasAlpha(), + streamImage(pixels, this.ext, width, height, model.hasAlpha(), this); } synchronized(data) @@ -555,7 +555,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder throw exception; processImageComplete(); - } + } /** * Object marking end of data from native streamImage code. @@ -627,7 +627,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder } } - private static class GdkPixbufReader + private static class GdkPixbufReader extends ImageReader implements ImageConsumer { @@ -638,7 +638,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder int width; int height; String ext; - + public GdkPixbufReader(GdkPixbufReaderSpi ownerSpi, Object ext) { super(ownerSpi); @@ -658,29 +658,29 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder width = w; height = h; } - + public void setProperties(Hashtable props) {} - public void setColorModel(ColorModel model) + public void setColorModel(ColorModel model) { defaultModel = model; } public void setHints(int flags) {} - public void setPixels(int x, int y, int w, int h, - ColorModel model, byte[] pixels, + 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, int[] pixels, + public void setPixels(int x, int y, int w, int h, + ColorModel model, int[] pixels, int offset, int scansize) { if (model == null) model = defaultModel; - + if (bufferedImage == null) { if(model != null && model.hasAlpha()) @@ -709,7 +709,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder processImageProgress(y / (height == 0 ? 1 : height)); } - public void imageComplete(int status) + public void imageComplete(int status) { processImageComplete(); } @@ -729,7 +729,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder return 1; } - public IIOMetadata getImageMetadata(int i) + public IIOMetadata getImageMetadata(int i) { return null; } @@ -748,7 +748,7 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder vec.add(new ImageTypeSpecifier(img)); return vec.iterator(); } - + public int getHeight(int imageIndex) throws IOException { diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java index d3e9774daa0..2609bad0916 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkRobotPeer.java @@ -53,9 +53,9 @@ public class GdkRobotPeer implements RobotPeer { // gdk-pixbuf provides data in RGBA format static final ColorModel cm = new DirectColorModel (32, 0xff000000, - 0x00ff0000, - 0x0000ff00, - 0x000000ff); + 0x00ff0000, + 0x0000ff00, + 0x000000ff); public GdkRobotPeer (GraphicsDevice screen) throws AWTException { diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java index 58b5834cb73..1c849dfc091 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.java @@ -52,28 +52,28 @@ import gnu.classpath.Pointer; class GdkScreenGraphicsDevice extends GraphicsDevice { private final int native_state = GtkGenericPeer.getUniqueInteger (); - + private Window fullscreenWindow; - + private boolean oldWindowDecorationState; - + private Rectangle oldWindowBounds; - + private Rectangle bounds; - + private GdkGraphicsConfiguration[] configurations; - + /** The GdkGraphicsEnvironment instance that created this * GdkScreenGraphicsDevice. This is only needed for native * methods which need to access the 'native_state' field storing a pointer * to a GdkDisplay object. - */ + */ GdkGraphicsEnvironment env; - + /** An identifier that is created by Gdk */ String idString; - + /** The display modes supported by this GdkScreenGraphicsDevice. * If the array is null nativeGetDisplayModes has * to be called. @@ -85,7 +85,7 @@ class GdkScreenGraphicsDevice extends GraphicsDevice * is still null afterwards, the XRandR extension is available * and display mode changes are possible. If it is non-null XRandR is not * available, no display mode changes are possible and no other native - * method must be called. + * method must be called. */ DisplayMode fixedDisplayMode; @@ -107,14 +107,14 @@ class GdkScreenGraphicsDevice extends GraphicsDevice GtkToolkit.initializeGlobalIDs(); initIDs(); } - + static native void initIDs(); - + GdkScreenGraphicsDevice (GdkGraphicsEnvironment e) { super(); env = e; - + configurations = new GdkGraphicsConfiguration[1]; configurations[0] = new GdkGraphicsConfiguration(this); } @@ -126,13 +126,13 @@ class GdkScreenGraphicsDevice extends GraphicsDevice { fixedDisplayMode = nativeGetFixedDisplayMode(env); } - + /** Depending on the availability of the XRandR extension the method returns * the screens' non-changeable display mode or null, meaning that XRandR can * handle display mode changes. */ native DisplayMode nativeGetFixedDisplayMode(GdkGraphicsEnvironment env); - + public int getType () { // Gdk manages only raster screens. @@ -143,17 +143,17 @@ class GdkScreenGraphicsDevice extends GraphicsDevice { if (idString == null) idString = nativeGetIDString(); - + return idString; } - - private native String nativeGetIDString(); + + private native String nativeGetIDString(); public GraphicsConfiguration[] getConfigurations () { return (GraphicsConfiguration[]) configurations.clone(); } - + public GraphicsConfiguration getDefaultConfiguration () { return configurations[0]; @@ -172,7 +172,7 @@ class GdkScreenGraphicsDevice extends GraphicsDevice { if (fixedDisplayMode != null) return fixedDisplayMode; - + synchronized (this) { if (displayModes == null) @@ -181,28 +181,28 @@ class GdkScreenGraphicsDevice extends GraphicsDevice int index = nativeGetDisplayModeIndex(env); int rate = nativeGetDisplayModeRate(env); - + return new DisplayMode(displayModes[index].width, displayModes[index].height, DisplayMode.BIT_DEPTH_MULTI, rate); } - + native int nativeGetDisplayModeIndex(GdkGraphicsEnvironment env); - + native int nativeGetDisplayModeRate(GdkGraphicsEnvironment env); - + public DisplayMode[] getDisplayModes() { if (fixedDisplayMode != null) return new DisplayMode[] { fixedDisplayMode }; - + synchronized (this) { if (displayModes == null) displayModes = nativeGetDisplayModes(env); } - + ArrayList list = new ArrayList(); for(int i=0;i properties) + public void setImage(int width, int height, + int[] pixels, Hashtable properties) { this.width = width; this.height = height; @@ -392,12 +392,12 @@ public class GtkImage extends Image return width; } - + public synchronized int getHeight (ImageObserver observer) { if (addObserver(observer)) return -1; - + return height; } @@ -405,7 +405,7 @@ public class GtkImage extends Image { if (addObserver(observer)) return UndefinedProperty; - + Object value = props.get (name); return (value == null) ? UndefinedProperty : value; } @@ -426,7 +426,7 @@ public class GtkImage extends Image else return null; } - return new MemoryImageSource(width, height, nativeModel, pixels, + return new MemoryImageSource(width, height, nativeModel, pixels, 0, width); } @@ -438,7 +438,7 @@ public class GtkImage extends Image throw new IllegalAccessError("This method only works for off-screen" +" Images."); } - + /** * Returns a scaled instance of this pixbuf. */ @@ -454,7 +454,7 @@ public class GtkImage extends Image } /** - * If the image is loaded and comes from an ImageProducer, + * If the image is loaded and comes from an ImageProducer, * regenerate the image from there. * * I have no idea if this is ever actually used. Since GtkImage can't be @@ -468,9 +468,9 @@ public class GtkImage extends Image observers = new Vector(); isLoaded = false; synchronized(pixbufLock) - { - freePixbuf(); - } + { + freePixbuf(); + } source.startProduction(new GtkImageConsumer(this, source)); } } @@ -510,7 +510,7 @@ public class GtkImage extends Image */ private void deliver() { - int flags = ImageObserver.HEIGHT | + int flags = ImageObserver.HEIGHT | ImageObserver.WIDTH | ImageObserver.PROPERTIES | ImageObserver.ALLBITS; @@ -522,7 +522,7 @@ public class GtkImage extends Image observers = null; } - + /** * Adds an observer, if we need to. * @return true if an observer was added. diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java index 44cfaf9266a..65cae7a89ed 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkImageConsumer.java @@ -92,11 +92,11 @@ public class GtkImageConsumer implements ImageConsumer public synchronized void setHints (int flags) { // This method informs us in which order the pixels are - // delivered, for progressive-loading support, etc. + // delivered, for progressive-loading support, etc. // Since we wait until it's all loaded, we can ignore the hints. } - public synchronized void setPixels (int x, int y, int width, int height, + public synchronized void setPixels (int x, int y, int width, int height, ColorModel cm, byte[] pixels, int offset, int scansize) { @@ -158,7 +158,7 @@ public class GtkImageConsumer implements ImageConsumer for (int i = 0; i < pixels.length; i++) ret[i] = pixels[i] & 0xFF; - + return ret; } @@ -167,5 +167,3 @@ public class GtkImageConsumer implements ImageConsumer this.properties = props; } } - - diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java index 76f8e5fe331..0bdacbf3317 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkLabelPeer.java @@ -74,7 +74,7 @@ public class GtkLabelPeer extends GtkComponentPeer if (text != null) setNativeText(text); } - + public GtkLabelPeer (Label l) { super (l); diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkListPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkListPeer.java index f943a75d171..b1cc6e522a0 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkListPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkListPeer.java @@ -73,7 +73,7 @@ public class GtkListPeer extends GtkComponentPeer public GtkListPeer (List list) { super (list); - + setMultipleMode (list.isMultipleMode ()); if (list.getItemCount () > 0) @@ -83,20 +83,20 @@ public class GtkListPeer extends GtkComponentPeer native void append (String items[]); public native void add (String item, int index); - + public void addItem (String item, int index) { add (item, index); } - + public void clear () { removeAll (); } - + public native void delItems (int start, int end); public native void deselect (int index); - + public Dimension getMinimumSize (int rows) { return minimumSize (rows); @@ -106,7 +106,7 @@ public class GtkListPeer extends GtkComponentPeer { return preferredSize (rows); } - + public native int[] getSelectedIndexes (); public native void makeVisible (int index); @@ -158,7 +158,7 @@ public class GtkListPeer extends GtkComponentPeer // Double-click only generates an Action event if // something is selected. if (selectedItem != null) - postActionEvent (((List) awtComponent).getSelectedItem (), + postActionEvent (((List) awtComponent).getSelectedItem (), me.getModifiersEx ()); } } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java index 1e37cefc144..78f6403618e 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java @@ -60,7 +60,7 @@ public abstract class GtkMenuComponentPeer extends GtkGenericPeer { MenuComponent mc = ((MenuComponent) awtWidget); Font f = mc.getFont(); - + if (f == null) { MenuContainer parent = mc.getParent (); diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java index ff6bdca9fbe..c553473934c 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMenuPeer.java @@ -57,7 +57,7 @@ public class GtkMenuPeer extends GtkMenuItemPeer protected native void create (String label); private native void addItem(MenuItemPeer item, int key, - boolean shiftModifier); + boolean shiftModifier); /** XXX - Document this and the override in GtkPopupMenuPeer. */ native void setupAccelGroup (GtkGenericPeer container); @@ -75,7 +75,7 @@ public class GtkMenuPeer extends GtkMenuItemPeer public GtkMenuPeer (Menu menu) { super (menu); - + if (menu.isTearOff()) addTearOff(); diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java index 7407744af9e..55c9146c480 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java @@ -49,18 +49,17 @@ import java.awt.peer.MouseInfoPeer; public class GtkMouseInfoPeer implements MouseInfoPeer { private static GdkGraphicsEnvironment gde = new GdkGraphicsEnvironment(); - + public int fillPointWithCoords(Point p) { int[] coords = gde.getMouseCoordinates(); - p.x = coords[1]; + p.x = coords[1]; p.y = coords[2]; return coords[0]; } - + public boolean isWindowUnderMouse(Window w) { return gde.isWindowUnderMouse((GtkWindowPeer) w.getPeer()); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java index e0053f763f5..00b506c1087 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkPanelPeer.java @@ -59,7 +59,7 @@ public class GtkPanelPeer extends GtkContainerPeer if (id == MouseEvent.MOUSE_PRESSED) awtComponent.requestFocusInWindow(); - + super.handleEvent(event); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java index 4d66a3f509d..1b0ec8e63dc 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java @@ -60,7 +60,7 @@ public class GtkPopupMenuPeer extends GtkMenuPeer Point abs = origin.getLocationOnScreen (); show (abs.x + x, abs.y + y, 0); } - + public void show (Event e) { diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java index c29706f408f..d3f160c83d9 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkScrollbarPeer.java @@ -50,7 +50,7 @@ public class GtkScrollbarPeer extends GtkComponentPeer Scrollbar sb = (Scrollbar) awtComponent; create (sb.getOrientation (), sb.getValue (), - sb.getMinimum (), sb.getMaximum (), + sb.getMinimum (), sb.getMaximum (), sb.getUnitIncrement (), sb.getBlockIncrement (), sb.getVisibleAmount ()); } @@ -85,7 +85,7 @@ public class GtkScrollbarPeer extends GtkComponentPeer protected void postAdjustmentEvent (int type, int value) { Scrollbar bar = (Scrollbar) awtComponent; - q().postEvent(new AdjustmentEvent(bar, + q().postEvent(new AdjustmentEvent(bar, AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED, type, value, true)); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkSelection.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkSelection.java index 967a2edb432..78ed696763b 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkSelection.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkSelection.java @@ -87,7 +87,7 @@ public class GtkSelection implements Transferable * mimeTypesDelivered is true. */ private DataFlavor[] dataFlavors; - + /** * Indicates a requestText() call was made and the corresponding * textAvailable() callback was triggered. @@ -100,7 +100,7 @@ public class GtkSelection implements Transferable * is true. */ private String text; - + /** * Indicates a requestImage() call was made and the corresponding * imageAvailable() callback was triggered. @@ -228,7 +228,7 @@ public class GtkSelection implements Transferable // extra element. ArrayList flavorsList = new ArrayList(mimeTypes.length + 1); - + for (int i = 0; i < mimeTypes.length; i++) { try @@ -262,7 +262,7 @@ public class GtkSelection implements Transferable npe.printStackTrace(); } } - + dataFlavors = new DataFlavor[flavorsList.size()]; flavorsList.toArray(dataFlavors); } @@ -406,10 +406,10 @@ public class GtkSelection implements Transferable } requestInProgress = false; } - + if (imagePointer != null) image = new GtkImage(imagePointer); - + imagePointer = null; result = image; if (! GtkClipboard.canCache) @@ -572,7 +572,7 @@ public class GtkSelection implements Transferable bytes = null; bytesDelivered = false; requestInProgress = false; - + requestLock.notifyAll(); } return result; diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java index 3b114468f4c..150656511e7 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -182,10 +182,10 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit */ initializeGlobalIDs(); - int portableNativeSync; - String portNatSyncProp = + int portableNativeSync; + String portNatSyncProp = System.getProperty("gnu.classpath.awt.gtk.portable.native.sync"); - + if (portNatSyncProp == null) portableNativeSync = -1; // unset else if (Boolean.valueOf(portNatSyncProp).booleanValue()) @@ -204,12 +204,12 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit public native void beep(); private native void getScreenSizeDimensions(int[] xy); - - public int checkImage (Image image, int width, int height, - ImageObserver observer) + + public int checkImage (Image image, int width, int height, + ImageObserver observer) { - int status = ImageObserver.ALLBITS - | ImageObserver.WIDTH + int status = ImageObserver.ALLBITS + | ImageObserver.WIDTH | ImageObserver.HEIGHT; if (image instanceof GtkImage) @@ -223,17 +223,17 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit -1, -1, image.getWidth (observer), image.getHeight (observer)); - + return status; } - /** + /** * Helper to return either a Image -- the argument -- or a * GtkImage with the errorLoading flag set if the argument is null. */ static Image imageOrError(Image b) { - if (b == null) + if (b == null) return GtkImage.getErrorImage(); else return b; @@ -243,7 +243,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit { if (filename.length() == 0) return new GtkImage (); - + Image image; try { @@ -261,11 +261,11 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new AsyncImage(url); } - public Image createImage (ImageProducer producer) + public Image createImage (ImageProducer producer) { if (producer == null) return null; - + Image image; try { @@ -279,7 +279,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit } public Image createImage (byte[] imagedata, int imageoffset, - int imagelength) + int imagelength) { Image image; try @@ -294,13 +294,13 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit } return imageOrError(image); } - + /** * Creates an ImageProducer from the specified URL. The image is assumed - * to be in a recognised format. + * to be in a recognised format. * * @param url URL to read image data from. - */ + */ public ImageProducer createImageProducer(URL url) { return createImage( url ).getSource(); @@ -308,29 +308,29 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit /** * Returns the native color model (which isn't the same as the default - * ARGB color model, but doesn't have to be). + * ARGB color model, but doesn't have to be). */ - public ColorModel getColorModel () + public ColorModel getColorModel () { /* Return the GDK-native ABGR format */ - return new DirectColorModel(32, + return new DirectColorModel(32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000); } - public String[] getFontList () + public String[] getFontList () { - return (new String[] { "Dialog", - "DialogInput", - "Monospaced", + return (new String[] { "Dialog", + "DialogInput", + "Monospaced", "Serif", "SansSerif" }); } static class LRUCache extends LinkedHashMap - { + { int max_entries; public LRUCache(int max) { @@ -347,12 +347,12 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit new LRUCache(50); private LRUCache imageCache = new LRUCache(50); - public FontMetrics getFontMetrics (Font font) + public FontMetrics getFontMetrics (Font font) { return ((GdkFontPeer) font.getPeer()).getFontMetrics(font); } - public Image getImage (String filename) + public Image getImage (String filename) { if (imageCache.containsKey(filename)) return imageCache.get(filename); @@ -364,7 +364,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit } } - public Image getImage (URL url) + public Image getImage (URL url) { if (imageCache.containsKey(url)) return imageCache.get(url); @@ -376,7 +376,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit } } - public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props) + public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props) { SecurityManager sm; sm = System.getSecurityManager(); @@ -395,7 +395,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new Dimension(dim[0], dim[1]); } - public Clipboard getSystemClipboard() + public Clipboard getSystemClipboard() { SecurityManager secman = System.getSecurityManager(); if (secman != null) @@ -409,7 +409,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit SecurityManager secman = System.getSecurityManager(); if (secman != null) secman.checkSystemClipboardAccess(); - + return GtkClipboard.getSelectionInstance(); } @@ -417,8 +417,8 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit * Prepares a GtkImage. For every other kind of Image it just * assumes the image is already prepared for rendering. */ - public boolean prepareImage (Image image, int width, int height, - ImageObserver observer) + public boolean prepareImage (Image image, int width, int height, + ImageObserver observer) { /* GtkImages are always prepared, as long as they're loaded. */ if (image instanceof GtkImage) @@ -446,13 +446,13 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit if (c.getBackground () == null) c.setBackground (cp.getBackground ()); // if (c.getFont () == null) - // c.setFont (cp.getFont ()); - + // c.setFont (cp.getFont ()); + /* Make the Peer reflect the state of the Component */ if (! (c instanceof Window)) { cp.setCursor (c.getCursor ()); - + Rectangle bounds = c.getBounds (); cp.setBounds (bounds.x, bounds.y, bounds.width, bounds.height); cp.setVisible (c.isVisible ()); @@ -465,13 +465,13 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new GtkButtonPeer (b); } - protected CanvasPeer createCanvas (Canvas c) + protected CanvasPeer createCanvas (Canvas c) { checkHeadless(); return new GtkCanvasPeer (c); } - protected CheckboxPeer createCheckbox (Checkbox cb) + protected CheckboxPeer createCheckbox (Checkbox cb) { checkHeadless(); return new GtkCheckboxPeer (cb); @@ -483,7 +483,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new GtkCheckboxMenuItemPeer (cmi); } - protected ChoicePeer createChoice (Choice c) + protected ChoicePeer createChoice (Choice c) { checkHeadless(); return new GtkChoicePeer (c); @@ -509,7 +509,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new GtkFramePeer (f); } - protected LabelPeer createLabel (Label label) + protected LabelPeer createLabel (Label label) { checkHeadless(); return new GtkLabelPeer (label); @@ -521,55 +521,55 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new GtkListPeer (list); } - protected MenuPeer createMenu (Menu m) + protected MenuPeer createMenu (Menu m) { checkHeadless(); return new GtkMenuPeer (m); } - protected MenuBarPeer createMenuBar (MenuBar mb) + protected MenuBarPeer createMenuBar (MenuBar mb) { checkHeadless(); return new GtkMenuBarPeer (mb); } - protected MenuItemPeer createMenuItem (MenuItem mi) + protected MenuItemPeer createMenuItem (MenuItem mi) { checkHeadless(); return new GtkMenuItemPeer (mi); } - protected PanelPeer createPanel (Panel p) + protected PanelPeer createPanel (Panel p) { checkHeadless(); return new GtkPanelPeer (p); } - protected PopupMenuPeer createPopupMenu (PopupMenu target) + protected PopupMenuPeer createPopupMenu (PopupMenu target) { checkHeadless(); return new GtkPopupMenuPeer (target); } - protected ScrollPanePeer createScrollPane (ScrollPane sp) + protected ScrollPanePeer createScrollPane (ScrollPane sp) { checkHeadless(); return new GtkScrollPanePeer (sp); } - protected ScrollbarPeer createScrollbar (Scrollbar sb) + protected ScrollbarPeer createScrollbar (Scrollbar sb) { checkHeadless(); return new GtkScrollbarPeer (sb); } - protected TextAreaPeer createTextArea (TextArea ta) + protected TextAreaPeer createTextArea (TextArea ta) { checkHeadless(); return new GtkTextAreaPeer (ta); } - protected TextFieldPeer createTextField (TextField tf) + protected TextFieldPeer createTextField (TextField tf) { checkHeadless(); return new GtkTextFieldPeer (tf); @@ -589,7 +589,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit return new GtkEmbeddedWindowPeer (w); } - /** + /** * @deprecated part of the older "logical font" system in earlier AWT * implementations. Our newer Font class uses getClasspathFontPeer. */ @@ -601,7 +601,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit /** * Private method that allows size to be set at initialization time. */ - private FontPeer getFontPeer (String name, int style, int size) + private FontPeer getFontPeer (String name, int style, int size) { Map attrs = new HashMap(); ClasspathFontPeer.copyStyleToAttrs (style, attrs); @@ -612,7 +612,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit /** * Newer method to produce a peer for a Font object, even though Sun's * design claims Font should now be peerless, we do not agree with this - * model, hence "ClasspathFontPeer". + * model, hence "ClasspathFontPeer". */ public ClasspathFontPeer getClasspathFontPeer (String name, @@ -634,7 +634,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit } } - protected EventQueue getSystemEventQueueImpl() + protected EventQueue getSystemEventQueueImpl() { synchronized (GtkToolkit.class) { @@ -642,7 +642,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit { q = new EventQueue(); } - } + } return q; } @@ -659,9 +659,9 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit throw new InvalidDnDOperationException(); return new GtkDragSourceContextPeer(e); } - + public T - createDragGestureRecognizer(Class recognizer, DragSource ds, + createDragGestureRecognizer(Class recognizer, DragSource ds, Component comp, int actions, DragGestureListener l) { @@ -690,7 +690,7 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit getScreenSizeDimensions(dims); return new Rectangle(0, 0, dims[0], dims[1]); } - + // ClasspathToolkit methods public GraphicsEnvironment getLocalGraphicsEnvironment() @@ -711,14 +711,14 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit public boolean getLockingKeyState(int keyCode) { int state = getLockState(keyCode); - + if (state != -1) return state == 1; - + if (AWTUtilities.isValidKey(keyCode)) throw new UnsupportedOperationException ("cannot get locking state of key code " + keyCode); - + throw new IllegalArgumentException("invalid key code " + keyCode); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java index 8660ced8ec1..663839f238f 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkVolatileImage.java @@ -65,7 +65,7 @@ public class GtkVolatileImage extends VolatileImage 0x0000FF00, 0x00FF0000, 0xFF000000); - + /** * Don't touch, accessed from native code. */ @@ -76,15 +76,15 @@ public class GtkVolatileImage extends VolatileImage native void destroy(long pointer); native int[] nativeGetPixels(long pointer); - + /** * Gets the pixels in the current image from GDK. - * + * * Note that pixels are in 32-bit RGBA, non-premultiplied, which is different * from Cairo's premultiplied ARGB, which is different from Java's standard * non-premultiplied ARGB. Caution is advised when using this method, to * ensure that the data format remains consistent with what you expect. - * + * * @return the current pixels, as reported by GDK. */ public int[] getPixels() @@ -106,8 +106,8 @@ public class GtkVolatileImage extends VolatileImage nativeDrawVolatile(nativePointer, srcPtr, x, y, w, h); } - public GtkVolatileImage(GtkComponentPeer component, - int width, int height, ImageCapabilities caps) + public GtkVolatileImage(GtkComponentPeer component, + int width, int height, ImageCapabilities caps) { this.width = width; this.height = height; @@ -184,7 +184,7 @@ public class GtkVolatileImage extends VolatileImage { return width; } - + public int getHeight(java.awt.image.ImageObserver observer) { return height; @@ -194,7 +194,7 @@ public class GtkVolatileImage extends VolatileImage { return null; } - + /** * Creates a SampleModel that matches GDK's native format */ diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java index 9744c3a532e..c8e1bceb746 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -119,13 +119,13 @@ public class GtkWindowPeer extends GtkContainerPeer y = awtComponent.getY(); height = awtComponent.getHeight(); width = awtComponent.getWidth(); - + if (!window.isFocusableWindow()) type = GDK_WINDOW_TYPE_HINT_MENU; - + if (parent != null) parent_peer = (GtkWindowPeer) awtComponent.getParent().getPeer(); - + create (type, decorated, parent_peer); } @@ -173,14 +173,14 @@ public class GtkWindowPeer extends GtkContainerPeer public void setBounds (int x, int y, int width, int height) { - if (x != getX() || y != getY() || width != getWidth() + if (x != getX() || y != getY() || width != getWidth() || height != getHeight()) { this.x = x; this.y = y; this.width = width; this.height = height; - + nativeSetBounds (x, y, width - insets.left - insets.right, height - insets.top - insets.bottom); @@ -194,7 +194,7 @@ public class GtkWindowPeer extends GtkContainerPeer // Called from setResizable protected native void setSize (int width, int height); - + /** * Needed by both GtkFramePeer and GtkDialogPeer subclasses, so * implemented here. But never actually called on a GtkWindowPeer @@ -215,7 +215,7 @@ public class GtkWindowPeer extends GtkContainerPeer } protected void postInsetsChangedEvent (int top, int left, - int bottom, int right) + int bottom, int right) { insets.top = top; insets.left = left; @@ -324,8 +324,8 @@ public class GtkWindowPeer extends GtkContainerPeer // insets but GtkFramePeer and GtkDialogPeer insets will be // non-zero. q().postEvent (new PaintEvent (awtComponent, PaintEvent.PAINT, - new Rectangle (x + insets.left, - y + insets.top, + new Rectangle (x + insets.left, + y + insets.top, width, height))); } @@ -335,7 +335,7 @@ public class GtkWindowPeer extends GtkContainerPeer return false; } - public boolean requestFocus (Component request, boolean temporary, + public boolean requestFocus (Component request, boolean temporary, boolean allowWindowFocus, long time) { assert request == awtComponent || isLightweightDescendant(request); @@ -380,7 +380,7 @@ public class GtkWindowPeer extends GtkContainerPeer return g; } - protected void postMouseEvent(int id, long when, int mods, int x, int y, + protected void postMouseEvent(int id, long when, int mods, int x, int y, int clickCount, boolean popupTrigger) { // Translate AWT co-ordinates, which include a window frame's @@ -388,8 +388,8 @@ public class GtkWindowPeer extends GtkContainerPeer // frame's insets. GtkWindowPeer should always have all-zero // insets but GtkFramePeer and GtkDialogPeer insets will be // non-zero. - super.postMouseEvent (id, when, mods, - x + insets.left, y + insets.top, + super.postMouseEvent (id, when, mods, + x + insets.left, y + insets.top, clickCount, popupTrigger); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java b/libjava/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java index b5858f90595..2dfcdbdecb2 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/VolatileImageGraphics.java @@ -108,7 +108,7 @@ public class VolatileImageGraphics extends ComponentGraphics { if (comp == null || comp instanceof AlphaComposite) super.draw(s); - + // Custom composite else { @@ -119,11 +119,11 @@ public class VolatileImageGraphics extends ComponentGraphics g2d.setColor(this.getColor()); g2d.setStroke(this.getStroke()); g2d.draw(s); - + drawComposite(s.getBounds2D(), null); } } - + public void fill(Shape s) { if (comp == null || comp instanceof AlphaComposite) @@ -139,16 +139,16 @@ public class VolatileImageGraphics extends ComponentGraphics g2d.setPaint(this.getPaint()); g2d.setColor(this.getColor()); g2d.fill(s); - + drawComposite(s.getBounds2D(), null); } } - + public void drawGlyphVector(GlyphVector gv, float x, float y) { if (comp == null || comp instanceof AlphaComposite) super.drawGlyphVector(gv, x, y); - + // Custom composite else { @@ -156,11 +156,11 @@ public class VolatileImageGraphics extends ComponentGraphics createBuffer(); Graphics2D g2d = (Graphics2D)buffer.getGraphics(); - + g2d.setPaint(this.getPaint()); g2d.setColor(this.getColor()); g2d.drawGlyphVector(gv, x, y); - + Rectangle2D bounds = gv.getLogicalBounds(); bounds = new Rectangle2D.Double(x + bounds.getX(), y + bounds.getY(), bounds.getWidth(), bounds.getHeight()); @@ -173,7 +173,7 @@ public class VolatileImageGraphics extends ComponentGraphics { if (comp == null || comp instanceof AlphaComposite) return super.drawImage(img, xform, bgcolor, obs); - + // Custom composite else { @@ -186,7 +186,7 @@ public class VolatileImageGraphics extends ComponentGraphics img = Toolkit.getDefaultToolkit().createImage(source); } BufferedImage bImg = (BufferedImage) img; - + // Find dimensions of translation Point2D origin = new Point2D.Double(bImg.getMinX(), bImg.getMinY()); Point2D pt = new Point2D.Double(bImg.getWidth(), bImg.getHeight()); @@ -195,10 +195,10 @@ public class VolatileImageGraphics extends ComponentGraphics origin = xform.transform(origin, origin); pt = xform.transform(pt, pt); } - + // Create buffer and draw image createBuffer(); - + Graphics2D g2d = (Graphics2D)buffer.getGraphics(); g2d.setRenderingHints(this.getRenderingHints()); g2d.drawImage(img, xform, obs); @@ -211,31 +211,31 @@ public class VolatileImageGraphics extends ComponentGraphics obs); } } - + public boolean drawImage(Image img, int x, int y, ImageObserver observer) { if (img instanceof GtkVolatileImage && (comp == null || comp instanceof AlphaComposite)) { - owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, + owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, x, y, - ((GtkVolatileImage)img).width, + ((GtkVolatileImage)img).width, ((GtkVolatileImage)img).height ); return true; - } + } return super.drawImage( img, x, y, observer ); } - + public boolean drawImage(Image img, int x, int y, int width, int height, ImageObserver observer) { if ((img instanceof GtkVolatileImage) && (comp == null || comp instanceof AlphaComposite)) { - owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, + owner.drawVolatile( ((GtkVolatileImage)img).nativePointer, x, y, width, height ); return true; - } + } return super.drawImage( img, x, y, width, height, observer ); } @@ -243,31 +243,31 @@ public class VolatileImageGraphics extends ComponentGraphics { return new Rectangle2D.Double(0, 0, owner.width, owner.height); } - + private boolean drawComposite(Rectangle2D bounds, ImageObserver observer) { // Clip source to visible areas that need updating Rectangle2D clip = this.getClipBounds(); Rectangle2D.intersect(bounds, clip, bounds); - + BufferedImage buffer2 = buffer; if (!bounds.equals(buffer2.getRaster().getBounds())) buffer2 = buffer2.getSubimage((int)bounds.getX(), (int)bounds.getY(), (int)bounds.getWidth(), (int)bounds.getHeight()); - + // Get current on-screen pixels (destination) and clip to bounds BufferedImage current = owner.getSnapshot(); double[] points = new double[] {bounds.getX(), bounds.getY(), bounds.getMaxX(), bounds.getMaxY()}; transform.transform(points, 0, points, 0, 2); - + Rectangle2D deviceBounds = new Rectangle2D.Double(points[0], points[1], points[2] - points[0], points[3] - points[1]); Rectangle2D.intersect(deviceBounds, this.getClipInDevSpace(), deviceBounds); - + current = current.getSubimage((int)deviceBounds.getX(), (int)deviceBounds.getY(), (int)deviceBounds.getWidth(), @@ -276,7 +276,7 @@ public class VolatileImageGraphics extends ComponentGraphics // Perform actual composite operation compCtx.compose(buffer2.getRaster(), current.getRaster(), buffer2.getRaster()); - + // This MUST call directly into the "action" method in CairoGraphics2D, // not one of the wrappers, to ensure that the composite isn't processed // more than once! @@ -290,7 +290,7 @@ public class VolatileImageGraphics extends ComponentGraphics return rv; } - + private void createBuffer() { if (buffer == null) @@ -299,7 +299,7 @@ public class VolatileImageGraphics extends ComponentGraphics rst = Raster.createWritableRaster(GtkVolatileImage.createGdkSampleModel(owner.width, owner.height), new Point(0,0)); - + buffer = new BufferedImage(GtkVolatileImage.gdkColorModel, rst, GtkVolatileImage.gdkColorModel.isAlphaPremultiplied(), new Hashtable()); @@ -307,12 +307,12 @@ public class VolatileImageGraphics extends ComponentGraphics else { Graphics2D g2d = ((Graphics2D)buffer.getGraphics()); - + g2d.setBackground(new Color(0,0,0,0)); g2d.clearRect(0, 0, buffer.getWidth(), buffer.getHeight()); } } - + protected ColorModel getNativeCM() { // We should really return GtkVolatileImage.gdkColorModel , @@ -323,4 +323,3 @@ public class VolatileImageGraphics extends ComponentGraphics return CairoSurface.cairoCM_pre; } } - diff --git a/libjava/classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java index b3eeb1baa84..401b895b877 100644 --- a/libjava/classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/headless/HeadlessGraphicsEnvironment.java @@ -1,4 +1,4 @@ -/* HeadlessGraphicsEnvironment.java -- A graphics environment for headless mode +/* HeadlessGraphicsEnvironment.java -- A graphics environment for headless mode Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/awt/peer/qt/MainQtThread.java b/libjava/classpath/gnu/java/awt/peer/qt/MainQtThread.java index fdd6da0a639..bee979ac715 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/MainQtThread.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/MainQtThread.java @@ -81,6 +81,4 @@ public class MainQtThread extends Thread exec(QApplicationPointer); } -} - - +} diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QMatrix.java b/libjava/classpath/gnu/java/awt/peer/qt/QMatrix.java index 428cda17308..ca4d55b5962 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QMatrix.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QMatrix.java @@ -53,8 +53,8 @@ public class QMatrix extends NativeWrapper init( matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5] ); } - private native void init(double m00, double m10, double m01, double m11, - double m02, double m12 ); + private native void init(double m00, double m10, double m01, double m11, + double m02, double m12 ); private native double[] getMatrix(); @@ -64,10 +64,9 @@ public class QMatrix extends NativeWrapper } public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QPainterPath.java b/libjava/classpath/gnu/java/awt/peer/qt/QPainterPath.java index 8d176a15698..848b1049756 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QPainterPath.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QPainterPath.java @@ -61,31 +61,31 @@ public class QPainterPath extends NativeWrapper while( !pi.isDone() ) { - switch( pi.currentSegment(coords) ) - { - case PathIterator.SEG_MOVETO: - moveTo( coords[0], coords[1] ); - break; + switch( pi.currentSegment(coords) ) + { + case PathIterator.SEG_MOVETO: + moveTo( coords[0], coords[1] ); + break; - case PathIterator.SEG_CLOSE: - close(); - break; - - case PathIterator.SEG_LINETO: - lineTo( coords[0], coords[1] ); - break; - - case PathIterator.SEG_QUADTO: - quadTo( coords[0], coords[1], coords[2], coords[3] ); - break; - - case PathIterator.SEG_CUBICTO: - cubicTo( coords[0], coords[1], - coords[2], coords[3], - coords[4], coords[5] ); - break; - } - pi.next(); + case PathIterator.SEG_CLOSE: + close(); + break; + + case PathIterator.SEG_LINETO: + lineTo( coords[0], coords[1] ); + break; + + case PathIterator.SEG_QUADTO: + quadTo( coords[0], coords[1], coords[2], coords[3] ); + break; + + case PathIterator.SEG_CUBICTO: + cubicTo( coords[0], coords[1], + coords[2], coords[3], + coords[4], coords[5] ); + break; + } + pi.next(); } } @@ -129,13 +129,12 @@ public class QPainterPath extends NativeWrapper private native void quadTo(double x1, double y1, double x2, double y2); private native void cubicTo(double x1, double y1, double x2, double y2, - double x3, double y3); + double x3, double y3); public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QPen.java b/libjava/classpath/gnu/java/awt/peer/qt/QPen.java index ec41015ed60..aee308c2662 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QPen.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QPen.java @@ -62,10 +62,9 @@ public class QPen extends NativeWrapper private native void init(double width, int cap, int join, double miterlimit); public native void dispose(); - + public void finalize() { dispose(); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtAudioClip.java b/libjava/classpath/gnu/java/awt/peer/qt/QtAudioClip.java index 43387acf6aa..ae2e350ebaf 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtAudioClip.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtAudioClip.java @@ -57,9 +57,9 @@ public class QtAudioClip extends NativeWrapper implements AudioClip File f = new File(filename); try { - String fn = f.getCanonicalPath(); - loadClip( fn ); - } + String fn = f.getCanonicalPath(); + loadClip( fn ); + } catch(IOException e) { } @@ -67,7 +67,7 @@ public class QtAudioClip extends NativeWrapper implements AudioClip public QtAudioClip(URL url) { - + } private native void loadClip(String filename); @@ -78,7 +78,7 @@ public class QtAudioClip extends NativeWrapper implements AudioClip /** * Checks that Qt and sound is available. - */ + */ private void checkForQt() { if( t == null ) diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java index 629f4591117..6722eb28529 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtButtonPeer.java @@ -62,18 +62,14 @@ public class QtButtonPeer extends QtComponentPeer implements ButtonPeer void fireClick(int modifiers) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((Button)owner).getActionCommand(), - System.currentTimeMillis(), - modifiers); + ActionEvent.ACTION_PERFORMED, + ((Button)owner).getActionCommand(), + System.currentTimeMillis(), + modifiers); QtToolkit.eventQueue.postEvent(e); } // ************ Public methods ********************* - + public native void setLabel( String label ); } - - - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java index acac5e460a4..37fb51c48e8 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtCheckboxPeer.java @@ -50,18 +50,18 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer // Map QButtonGroup<->CheckboxGroup private static WeakHashMap groupMap; - static + static { groupMap = new WeakHashMap(); } - + public QtCheckboxPeer( QtToolkit kit, Checkbox owner ) { super( kit, owner ); } - + protected native void init(); - + protected void setup() { super.setup(); @@ -73,32 +73,32 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer private void fireToggle(boolean checked) { if (group == null) - ((Checkbox)owner).setState( checked ); + ((Checkbox)owner).setState( checked ); else if ( checked ) - group.setSelectedCheckbox((Checkbox)owner); + group.setSelectedCheckbox((Checkbox)owner); int sel = checked ? ItemEvent.SELECTED : ItemEvent.DESELECTED; - ItemEvent e = new ItemEvent((Checkbox)owner, - ItemEvent.ITEM_STATE_CHANGED, - ((Checkbox)owner).getLabel(), - sel); + ItemEvent e = new ItemEvent((Checkbox)owner, + ItemEvent.ITEM_STATE_CHANGED, + ((Checkbox)owner).getLabel(), + sel); QtToolkit.eventQueue.postEvent(e); } - + // ************ Public methods ********************* - + public void setCheckboxGroup( CheckboxGroup group ) - { - if(this.group == group) + { + if(this.group == group) return; // if we change from a checkbox to a radio button or vice versa if((this.group == null) != (group == null)) { - this.group = group; - callInit(); - setup(); + this.group = group; + callInit(); + setup(); } this.group = group; @@ -109,5 +109,3 @@ public class QtCheckboxPeer extends QtComponentPeer implements CheckboxPeer public native void setState( boolean state ); } - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtChoicePeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtChoicePeer.java index 30674b36eca..d279468cd75 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtChoicePeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtChoicePeer.java @@ -47,16 +47,16 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer { super( kit, owner ); } - + protected native void init(); protected void setup() { super.setup(); - + Choice c = (Choice) owner; int n = c.getItemCount(); - for ( int i = 0; i < n ; i++ ) + for ( int i = 0; i < n ; i++ ) add( c.getItem( i ), i ); select( c.getSelectedIndex() ); } @@ -64,10 +64,10 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer private void fireChoice( int index ) { ((Choice)owner).select( index ); - ItemEvent e = new ItemEvent((Choice)owner, - ItemEvent.ITEM_STATE_CHANGED, - ((Choice)owner).getItem(index), - ItemEvent.SELECTED); + ItemEvent e = new ItemEvent((Choice)owner, + ItemEvent.ITEM_STATE_CHANGED, + ((Choice)owner).getItem(index), + ItemEvent.SELECTED); QtToolkit.eventQueue.postEvent(e); } @@ -91,5 +91,3 @@ public class QtChoicePeer extends QtComponentPeer implements ChoicePeer public native void select( int index ); } - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java b/libjava/classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java index c5c839e321a..27e12e65924 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtComponentGraphics.java @@ -43,8 +43,8 @@ import java.awt.Graphics; import java.awt.Rectangle; /** - * QtComponentPainter is a Graphics2D context for painting directly to AWT - * components. They require an existing QPainter object (the one passed into + * QtComponentPainter is a Graphics2D context for painting directly to AWT + * components. They require an existing QPainter object (the one passed into * the native paint method), and are created there (ONLY). * * Since this context does direct on-screen drawing it is NOT thread-safe, @@ -63,15 +63,15 @@ public class QtComponentGraphics extends QtGraphics * * @param ptr the pointer to the QPainter object. */ - public QtComponentGraphics(long ptr, QtComponentPeer component, - int x, int y, int w, int h) + public QtComponentGraphics(long ptr, QtComponentPeer component, + int x, int y, int w, int h) { nativeObject = ptr; peer = component; Rectangle r = new Rectangle(x, y, w, h); initialClip = r; - + setAlpha( 1.0 ); Color c = component.owner.getBackground(); if(c == null) @@ -103,11 +103,11 @@ public class QtComponentGraphics extends QtGraphics /** * This is a tricky one - */ - public void copyArea(int x, int y, int width, int height, - int dx, int dy) + */ + public void copyArea(int x, int y, int width, int height, + int dx, int dy) { - // FIXME + // FIXME } /** @@ -117,6 +117,4 @@ public class QtComponentGraphics extends QtGraphics { return peer.getGraphicsConfiguration(); } -} - - +} diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java index 334f5908825..16149b2e656 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtComponentPeer.java @@ -66,7 +66,7 @@ import java.awt.event.ComponentEvent; // 100% import java.awt.event.FocusEvent; // 100% import java.awt.event.InputEvent; // (abstract) import java.awt.event.KeyEvent; // 2/3 -import java.awt.event.MouseEvent; // 70%? +import java.awt.event.MouseEvent; // 70%? import java.awt.event.PaintEvent; // Yup. import java.awt.event.WindowEvent; // 2/ 12 import java.util.Timer; @@ -117,16 +117,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer this.toolkit = kit; qtApp = QtToolkit.guiThread.QApplicationPointer; nativeObject = 0; - synchronized(this) + synchronized(this) { - callInit(); // Calls the init method FROM THE MAIN THREAD. - try - { - wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + callInit(); // Calls the init method FROM THE MAIN THREAD. + try + { + wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } setup(); hasMotionListeners = false; @@ -147,30 +147,30 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer settingUp = true; if (owner != null) { - if (owner instanceof javax.swing.JComponent) - setBackground(owner.getBackground()); - else - owner.setBackground(getNativeBackground()); - - if (owner.getForeground() != null) - setForeground(owner.getForeground()); - else - setForeground( Color.black ); + if (owner instanceof javax.swing.JComponent) + setBackground(owner.getBackground()); + else + owner.setBackground(getNativeBackground()); - if (owner.getCursor() != null) - if (owner.getCursor().getType() != Cursor.DEFAULT_CURSOR) - setCursor(owner.getCursor()); - - if (owner.getFont() != null) - setFont(owner.getFont()); + if (owner.getForeground() != null) + setForeground(owner.getForeground()); + else + setForeground( Color.black ); - setEnabled( owner.isEnabled() ); + if (owner.getCursor() != null) + if (owner.getCursor().getType() != Cursor.DEFAULT_CURSOR) + setCursor(owner.getCursor()); - backBuffer = null; - updateBounds(); + if (owner.getFont() != null) + setFont(owner.getFont()); - setVisible( owner.isVisible() ); - QtToolkit.repaintThread.queueComponent(this); + setEnabled( owner.isEnabled() ); + + backBuffer = null; + updateBounds(); + + setVisible( owner.isVisible() ); + QtToolkit.repaintThread.queueComponent(this); } settingUp = false; } @@ -189,9 +189,9 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer private boolean drawableComponent() { - return ((this instanceof QtContainerPeer && - !(this instanceof QtScrollPanePeer)) || - (this instanceof QtCanvasPeer)); + return ((this instanceof QtContainerPeer && + !(this instanceof QtScrollPanePeer)) || + (this instanceof QtCanvasPeer)); } void updateBounds() @@ -204,19 +204,19 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if(width <= 0 || height <= 0) return; - + if( !drawableComponent() && backBuffer == null) return; if( backBuffer != null ) { - if( width < backBuffer.width && height < backBuffer.height ) - return; - backBuffer.dispose(); + if( width < backBuffer.width && height < backBuffer.height ) + return; + backBuffer.dispose(); } backBuffer = new QtImage(width, height); } - + // ************ Event methods ********************* @@ -227,18 +227,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if (owner instanceof Window) { - WindowEvent e = new WindowEvent((Window)owner, - WindowEvent.WINDOW_CLOSING); - QtToolkit.eventQueue.postEvent(e); + WindowEvent e = new WindowEvent((Window)owner, + WindowEvent.WINDOW_CLOSING); + QtToolkit.eventQueue.postEvent(e); } } protected void enterEvent(int modifiers, int x, int y, int dummy) { - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_ENTERED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, 0, false); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_ENTERED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, 0, false); QtToolkit.eventQueue.postEvent(e); } @@ -257,31 +257,31 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer protected void keyPressEvent(int modifiers, int code, int unicode, int dummy) { KeyboardFocusManager manager = KeyboardFocusManager.getCurrentKeyboardFocusManager (); - KeyEvent e = new KeyEvent(owner, - KeyEvent.KEY_PRESSED, - System.currentTimeMillis(), - modifiers, code, (char)(unicode & 0xFFFF), - KeyEvent.KEY_LOCATION_UNKNOWN); + KeyEvent e = new KeyEvent(owner, + KeyEvent.KEY_PRESSED, + System.currentTimeMillis(), + modifiers, code, (char)(unicode & 0xFFFF), + KeyEvent.KEY_LOCATION_UNKNOWN); if (!manager.dispatchEvent (e)) QtToolkit.eventQueue.postEvent(e); } protected void keyReleaseEvent(int modifiers, int code, int unicode, int dummy) { - KeyEvent e = new KeyEvent(owner, - KeyEvent.KEY_RELEASED, - System.currentTimeMillis(), - modifiers, code, (char)(unicode & 0xFFFF), - KeyEvent.KEY_LOCATION_UNKNOWN); + KeyEvent e = new KeyEvent(owner, + KeyEvent.KEY_RELEASED, + System.currentTimeMillis(), + modifiers, code, (char)(unicode & 0xFFFF), + KeyEvent.KEY_LOCATION_UNKNOWN); QtToolkit.eventQueue.postEvent(e); } protected void leaveEvent(int modifiers, int x, int y, int dummy) { - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_EXITED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, 0, false); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_EXITED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, 0, false); QtToolkit.eventQueue.postEvent(e); } @@ -291,17 +291,17 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_CLICKED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_CLICKED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -311,21 +311,21 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == - InputEvent.BUTTON3_DOWN_MASK) button = 3; + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + InputEvent.BUTTON3_DOWN_MASK) button = 3; - int type = (button != 0) ? + int type = (button != 0) ? MouseEvent.MOUSE_DRAGGED :MouseEvent.MOUSE_MOVED; - - MouseEvent e = new MouseEvent(owner, - type, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + + MouseEvent e = new MouseEvent(owner, + type, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -334,18 +334,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_PRESSED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - ( button == POPUP_TRIGGER ), - button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_PRESSED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + ( button == POPUP_TRIGGER ), + button); QtToolkit.eventQueue.postEvent(e); } @@ -354,18 +354,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer if( (eventMask & AWTEvent.MOUSE_EVENT_MASK) == 0 ) return; int button = 0; - if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON1_DOWN_MASK) == InputEvent.BUTTON1_DOWN_MASK) button = 1; - if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK) button = 2; - if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == + if((modifiers & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK) button = 3; - MouseEvent e = new MouseEvent(owner, - MouseEvent.MOUSE_RELEASED, - System.currentTimeMillis(), - (modifiers & 0x2FF), x, y, clickCount, - false, button); + MouseEvent e = new MouseEvent(owner, + MouseEvent.MOUSE_RELEASED, + System.currentTimeMillis(), + (modifiers & 0x2FF), x, y, clickCount, + false, button); QtToolkit.eventQueue.postEvent(e); } @@ -373,16 +373,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if( !ignoreResize ) { - // Since Component.setLocation calls back to setBounds, - // we need to ignore that. - ignoreResize = true; - owner.setLocation( x, y ); - ignoreResize = false; + // Since Component.setLocation calls back to setBounds, + // we need to ignore that. + ignoreResize = true; + owner.setLocation( x, y ); + ignoreResize = false; } } - protected void resizeEvent(int oldWidth, int oldHeight, - int width, int height) + protected void resizeEvent(int oldWidth, int oldHeight, + int width, int height) { if(!(owner instanceof Window)) return; @@ -390,8 +390,8 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer ignoreResize = true; owner.setSize(width, height); ignoreResize = false; - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_RESIZED); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_RESIZED); QtToolkit.eventQueue.postEvent(e); QtToolkit.repaintThread.queueComponent(this); } @@ -400,22 +400,22 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { if (owner instanceof Window) { - WindowEvent e = new WindowEvent((Window)owner, - WindowEvent.WINDOW_OPENED); - QtToolkit.eventQueue.postEvent(e); + WindowEvent e = new WindowEvent((Window)owner, + WindowEvent.WINDOW_OPENED); + QtToolkit.eventQueue.postEvent(e); } - else + else { - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_SHOWN); - QtToolkit.eventQueue.postEvent(e); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_SHOWN); + QtToolkit.eventQueue.postEvent(e); } } protected void hideEvent() { - ComponentEvent e = new ComponentEvent(owner, - ComponentEvent.COMPONENT_HIDDEN); + ComponentEvent e = new ComponentEvent(owner, + ComponentEvent.COMPONENT_HIDDEN); QtToolkit.eventQueue.postEvent(e); } @@ -431,18 +431,18 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public boolean canDetermineObscurity() { return true; - } + } public int checkImage(Image img, - int w, - int h, - ImageObserver o) + int w, + int h, + ImageObserver o) { return toolkit.checkImage(img, w, h, o); } public void createBuffers(int numBuffers, BufferCapabilities caps) - throws AWTException + throws AWTException { // FIXME } @@ -516,9 +516,9 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public Graphics getGraphics() { if( backBuffer == null ) - { - Rectangle r = owner.getBounds(); - backBuffer = new QtImage( r.width, r.height ); + { + Rectangle r = owner.getBounds(); + backBuffer = new QtImage( r.width, r.height ); } return backBuffer.getDirectGraphics( this ); } @@ -533,16 +533,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public Point getLocationOnScreen() { Point p = new Point(); - synchronized( p ) + synchronized( p ) { - getLocationOnScreenNative( p ); - try - { - p.wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + getLocationOnScreenNative( p ); + try + { + p.wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } return p; } @@ -552,16 +552,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer private Dimension getSize(boolean preferred) { Dimension d = new Dimension(); - synchronized( d ) + synchronized( d ) { - getSizeNative(d, preferred); - try - { - d.wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + getSizeNative(d, preferred); + try + { + d.wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } return d; } @@ -570,7 +570,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer { return getSize( false ); } - + public Dimension getPreferredSize() { return getSize( true ); @@ -582,7 +582,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer } public native boolean handlesWheelScrolling(); - + public void hide() { setVisible(false); @@ -610,17 +610,17 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public native void requestFocus(); - public boolean requestFocus (Component source, boolean bool1, - boolean bool2, long x) + public boolean requestFocus (Component source, boolean bool1, + boolean bool2, long x) { // FIXME return true; } public void reshape(int x, - int y, - int width, - int height) + int y, + int width, + int height) { setBounds( x, y, width, height ); } @@ -662,7 +662,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer return; setGround(c.getRed(), c.getGreen(), c.getBlue(), true); } - + public native void setVisible(boolean b); public void show() @@ -678,71 +678,71 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer switch (eventID) { case ComponentEvent.COMPONENT_SHOWN: - QtToolkit.repaintThread.queueComponent(this); + QtToolkit.repaintThread.queueComponent(this); break; case PaintEvent.PAINT: - case PaintEvent.UPDATE: - r = ((PaintEvent)e).getUpdateRect(); - QtToolkit.repaintThread.queueComponent(this, r.x, r.y, - r.width, r.height); + case PaintEvent.UPDATE: + r = ((PaintEvent)e).getUpdateRect(); + QtToolkit.repaintThread.queueComponent(this, r.x, r.y, + r.width, r.height); break; case KeyEvent.KEY_PRESSED: - break; + break; case KeyEvent.KEY_RELEASED: - break; + break; } } /** * paint() is called back from the native side in response to a native * repaint event. - */ + */ public void paint(Graphics g) { Rectangle r = g.getClipBounds(); if (backBuffer != null) - backBuffer.drawPixelsScaledFlipped ((QtGraphics) g, - 0, 0, 0, /* bg colors */ - false, false, /* no flipping */ - r.x, r.y, r.width, r.height, - r.x, r.y, r.width, r.height, - false ); /* no compositing */ + backBuffer.drawPixelsScaledFlipped ((QtGraphics) g, + 0, 0, 0, /* bg colors */ + false, false, /* no flipping */ + r.x, r.y, r.width, r.height, + r.x, r.y, r.width, r.height, + false ); /* no compositing */ } public void paintBackBuffer() throws InterruptedException { if( backBuffer != null ) { - backBuffer.clear(); - Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); - owner.paint(bbg); - bbg.dispose(); + backBuffer.clear(); + Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); + owner.paint(bbg); + bbg.dispose(); } } - public void paintBackBuffer(int x, int y, int w, int h) + public void paintBackBuffer(int x, int y, int w, int h) throws InterruptedException { if( backBuffer != null ) { - Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); - bbg.setBackground( getNativeBackground() ); - bbg.clearRect(x, y, w, h); - bbg.setClip(x, y, w, h); - owner.paint(bbg); - bbg.dispose(); + Graphics2D bbg = (Graphics2D)backBuffer.getGraphics(); + bbg.setBackground( getNativeBackground() ); + bbg.clearRect(x, y, w, h); + bbg.setClip(x, y, w, h); + owner.paint(bbg); + bbg.dispose(); } } public boolean prepareImage(Image img, - int w, - int h, - ImageObserver o) + int w, + int h, + ImageObserver o) { return toolkit.prepareImage(img, w, h, o); } - + public void print(Graphics g) { // FIXME @@ -752,16 +752,16 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer * Schedules a timed repaint. */ public void repaint(long tm, - int x, - int y, - int w, - int h) + int x, + int y, + int w, + int h) { if( tm <= 0 ) { - QtToolkit.repaintThread.queueComponent(this, x, y, w, h); - return; - } + QtToolkit.repaintThread.queueComponent(this, x, y, w, h); + return; + } Timer t = new Timer(); t.schedule(new RepaintTimerTask(this, x, y, w, h), tm); } @@ -778,20 +778,20 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer /** * Timed repainter */ - private class RepaintTimerTask extends TimerTask - { + private class RepaintTimerTask extends TimerTask + { private int x, y, w, h; private QtComponentPeer peer; RepaintTimerTask(QtComponentPeer peer, int x, int y, int w, int h) - { + { this.x=x; this.y=y; this.w=w; - this.h=h; + this.h=h; this.peer=peer; } public void run() - { + { QtToolkit.repaintThread.queueComponent(peer, x, y, w, h); } } @@ -808,7 +808,7 @@ public class QtComponentPeer extends NativeWrapper implements ComponentPeer public void setBounds(int x, int y, int width, int height, int z) { // TODO Auto-generated method stub - + } public boolean isReparentSupported() diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java index ec04b0567d8..ee2873730ef 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtContainerPeer.java @@ -60,13 +60,13 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer // ************ Public methods ********************* public void beginLayout() { - // FIXME + // FIXME } public void beginValidate() { } - + public void endLayout() { QtUpdate(); @@ -75,7 +75,7 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer public void endValidate() { } - + public Insets getInsets() { return new Insets(0, 0, 0, 0); @@ -101,15 +101,12 @@ public class QtContainerPeer extends QtComponentPeer implements ContainerPeer public void cancelPendingPaint(int x, int y, int width, int height) { // TODO Auto-generated method stub - + } public void restack() { // TODO Auto-generated method stub - + } } - - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtDialogPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtDialogPeer.java index 23e5c065396..2f2c255501c 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtDialogPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtDialogPeer.java @@ -68,6 +68,6 @@ public class QtDialogPeer extends QtWindowPeer implements DialogPeer public void setBounds(int x, int y, int width, int height) { setBoundsNative(x, y, width, height, - !((Dialog)owner).isResizable()); + !((Dialog)owner).isResizable()); } } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java index 0f859b78e4f..de76cd17f0e 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtEmbeddedWindowPeer.java @@ -40,7 +40,7 @@ package gnu.java.awt.peer.qt; import java.awt.Component; import gnu.java.awt.peer.EmbeddedWindowPeer; -/** +/** * Embedded window peer for applets. * FIXME: EmbeddedWindowPeer and this class should extend Window, NOT Frame. */ @@ -50,7 +50,7 @@ public class QtEmbeddedWindowPeer extends QtFramePeer implements EmbeddedWindowP { super( kit, owner ); } - + protected native void init(); protected void setup() diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtFileDialogPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtFileDialogPeer.java index 4937031aa05..06943d95538 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtFileDialogPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtFileDialogPeer.java @@ -81,4 +81,3 @@ public class QtFileDialogPeer extends QtDialogPeer implements FileDialogPeer // FIXME } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtFontMetrics.java b/libjava/classpath/gnu/java/awt/peer/qt/QtFontMetrics.java index 3b182b5eada..1998339dc7b 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtFontMetrics.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtFontMetrics.java @@ -93,7 +93,7 @@ public class QtFontMetrics extends FontMetrics native Rectangle2D getStringBounds(String s); // ****************** Package private *************************** - + native boolean canDisplay( int c ); // ****************** Public methods **************************** diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtFontPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtFontPeer.java index bd16daf28cb..03ed1d2dfe3 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtFontPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtFontPeer.java @@ -103,17 +103,17 @@ public class QtFontPeer extends ClasspathFontPeer return metrics.canDisplay( c ); } - public int canDisplayUpTo (Font font, CharacterIterator i, - int start, int limit) + public int canDisplayUpTo (Font font, CharacterIterator i, + int start, int limit) { int index = start; char c = i.setIndex( index ); while( index <= limit ) { - if(!canDisplay(font, c)) - return index; - index++; - c = i.next(); + if(!canDisplay(font, c)) + return index; + index++; + c = i.next(); } return -1; } @@ -149,23 +149,23 @@ public class QtFontPeer extends ClasspathFontPeer } public GlyphVector createGlyphVector (Font font, - FontRenderContext frc, - CharacterIterator ci) + FontRenderContext frc, + CharacterIterator ci) { throw new UnsupportedOperationException(); } - public GlyphVector createGlyphVector (Font font, - FontRenderContext ctx, - int[] glyphCodes) + public GlyphVector createGlyphVector (Font font, + FontRenderContext ctx, + int[] glyphCodes) { throw new UnsupportedOperationException(); } - public GlyphVector layoutGlyphVector (Font font, - FontRenderContext frc, - char[] chars, int start, - int limit, int flags) + public GlyphVector layoutGlyphVector (Font font, + FontRenderContext frc, + char[] chars, int start, + int limit, int flags) { throw new UnsupportedOperationException(); } @@ -180,16 +180,16 @@ public class QtFontPeer extends ClasspathFontPeer throw new UnsupportedOperationException(); } - public LineMetrics getLineMetrics (Font font, - CharacterIterator ci, - int begin, int limit, - FontRenderContext rc) + public LineMetrics getLineMetrics (Font font, + CharacterIterator ci, + int begin, int limit, + FontRenderContext rc) { throw new UnsupportedOperationException(); } - public Rectangle2D getMaxCharBounds (Font font, - FontRenderContext rc) + public Rectangle2D getMaxCharBounds (Font font, + FontRenderContext rc) { throw new UnsupportedOperationException(); } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtFramePeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtFramePeer.java index e3b578933ac..d5162106f0d 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtFramePeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtFramePeer.java @@ -75,7 +75,7 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer private native int menuBarHeight(); // ************ Public methods ********************* - + public void destroy() { dispose(); @@ -83,13 +83,13 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer public int getState() { - // FIXME + // FIXME return theState; } public Insets getInsets() { - int mbHeight = ( ((Frame)owner).getMenuBar() != null ) ? + int mbHeight = ( ((Frame)owner).getMenuBar() != null ) ? menuBarHeight() : 0; return new Insets(mbHeight, 0, 0, 0); } @@ -98,30 +98,30 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer { if (im instanceof QtImage) setIcon( (QtImage)im ); - else + else setIcon( new QtImage( im.getSource() ) ); } public void setMaximizedBounds(Rectangle rect) { // FIXME - } + } public void setMenuBar(MenuBar mb) { if( mb != null ) { - QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer(); - if( mbpeer == null ) - { - mb.addNotify(); - mbpeer = (QtMenuBarPeer)mb.getPeer(); - if( mbpeer == null ) - throw new IllegalStateException("No menu bar peer."); - } - mbpeer.addMenus(); - setMenu( mbpeer ); - } + QtMenuBarPeer mbpeer = (QtMenuBarPeer)mb.getPeer(); + if( mbpeer == null ) + { + mb.addNotify(); + mbpeer = (QtMenuBarPeer)mb.getPeer(); + if( mbpeer == null ) + throw new IllegalStateException("No menu bar peer."); + } + mbpeer.addMenus(); + setMenu( mbpeer ); + } else setMenu( null ); } @@ -140,13 +140,13 @@ public class QtFramePeer extends QtWindowPeer implements FramePeer public void setBoundsPrivate(int x, int y, int width, int height) { // TODO Auto-generated method stub - + } public void updateAlwaysOnTop() { // TODO Auto-generated method stub - + } public boolean requestWindowFocus() diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtGraphics.java b/libjava/classpath/gnu/java/awt/peer/qt/QtGraphics.java index 5694e8d2076..f68cc0dbdcc 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtGraphics.java @@ -75,7 +75,7 @@ import java.util.Map; /** * QtGraphics is an abstract implementation of Graphics2D over a QPainter - * object. This is to be subclassed for different drawing contexts, + * object. This is to be subclassed for different drawing contexts, * which may have different requirements. */ public abstract class QtGraphics extends Graphics2D @@ -100,9 +100,9 @@ public abstract class QtGraphics extends Graphics2D protected Paint currentPaint; // current paint protected RenderingHints renderingHints; // the rendering hints. - /** + /** * Owner Graphics, used by subcontext created by create() - * to avoid GC of the original context. + * to avoid GC of the original context. */ Graphics parent; @@ -154,12 +154,12 @@ public abstract class QtGraphics extends Graphics2D { AffineTransform current = getTransform(); setTransform( identity ); - setClip( initialClip ); + setClip( initialClip ); setTransform( current ); } - protected native void initImage(QtImage image); - protected native void initVolatileImage(QtVolatileImage image); + protected native void initImage(QtImage image); + protected native void initVolatileImage(QtVolatileImage image); // Creates a new native QPainter object on the same context. private native void cloneNativeContext( QtGraphics parent ); @@ -174,10 +174,10 @@ public abstract class QtGraphics extends Graphics2D private native void setNativeStroke(QPen p); private native void setNativeComposite(int alphaMode); private native void drawStringNative(String string, double x, double y); - private native void setLinearGradient(int r1, int g1, int b1, - int r2, int g2, int b2, - double x1, double y1, - double x2, double y2, boolean cyclic); + private native void setLinearGradient(int r1, int g1, int b1, + int r2, int g2, int b2, + double x1, double y1, + double x2, double y2, boolean cyclic); private native void setAlphaNative(double alpha); private native void setFontNative(QtFontPeer font); private native QPainterPath getClipNative(); @@ -195,8 +195,8 @@ public abstract class QtGraphics extends Graphics2D */ public abstract Graphics create(); - public abstract void copyArea(int x, int y, int width, int height, - int dx, int dy); + public abstract void copyArea(int x, int y, int width, int height, + int dx, int dy); public abstract GraphicsConfiguration getDeviceConfiguration(); @@ -210,7 +210,7 @@ public abstract class QtGraphics extends Graphics2D { if( c == null ) c = Color.white; - this.color = c; + this.color = c; int alpha = (int)(c.getAlpha() * currentAlpha); setColor(c.getRed(), c.getGreen(), c.getBlue(), alpha); } @@ -238,15 +238,15 @@ public abstract class QtGraphics extends Graphics2D { if( onStroke ) { - Shape stroked = currentStroke.createStrokedShape( s ); - return stroked.intersects( (double)rect.x, (double)rect.y, - (double)rect.width, (double)rect.height ); + Shape stroked = currentStroke.createStrokedShape( s ); + return stroked.intersects( (double)rect.x, (double)rect.y, + (double)rect.width, (double)rect.height ); } - return s.intersects( (double)rect.x, (double)rect.y, - (double)rect.width, (double)rect.height ); + return s.intersects( (double)rect.x, (double)rect.y, + (double)rect.width, (double)rect.height ); } - // ******************* Font *********************** + // ******************* Font *********************** public Font getFont() { return font; @@ -287,7 +287,7 @@ public abstract class QtGraphics extends Graphics2D } public Shape getClip() - { + { return getClipNative().getPath(); } @@ -307,7 +307,7 @@ public abstract class QtGraphics extends Graphics2D // ***************** Drawing primitives ********************* public void draw(Shape s) - { + { if( nativeStroking ) drawNative( new QPainterPath(s) ); else @@ -330,14 +330,14 @@ public abstract class QtGraphics extends Graphics2D public void drawRect(int x, int y, int width, int height) { if( nativeStroking ) - drawNative( new QPainterPath((double)x, (double)y, - (double)width, (double)height) ); + drawNative( new QPainterPath((double)x, (double)y, + (double)width, (double)height) ); else fillNative( new QPainterPath - ( currentStroke.createStrokedShape - (new Rectangle2D.Double - ((double)x, (double)y, - (double)width, (double)height) ) ) ); + ( currentStroke.createStrokedShape + (new Rectangle2D.Double + ((double)x, (double)y, + (double)width, (double)height) ) ) ); } public void fillRect(int x, int y, int width, int height) @@ -353,24 +353,24 @@ public abstract class QtGraphics extends Graphics2D setColor( c ); } - public void drawRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void drawRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { - draw( new RoundRectangle2D.Double(x, y, width, height, - arcWidth, arcHeight) ); + draw( new RoundRectangle2D.Double(x, y, width, height, + arcWidth, arcHeight) ); } - public void fillRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void fillRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { - fill( new RoundRectangle2D.Double(x, y, width, height, - arcWidth, arcHeight) ); + fill( new RoundRectangle2D.Double(x, y, width, height, + arcWidth, arcHeight) ); } public void drawOval(int x, int y, int width, int height) { - draw( new Ellipse2D.Double((double)x, (double)y, - (double)width, (double)height) ); + draw( new Ellipse2D.Double((double)x, (double)y, + (double)width, (double)height) ); } public void fillOval(int x, int y, int width, int height) @@ -378,18 +378,18 @@ public abstract class QtGraphics extends Graphics2D fill( new Ellipse2D.Double(x, y, width, height) ); } - public void drawArc(int x, int y, int width, int height, - int arcStart, int arcAngle) + public void drawArc(int x, int y, int width, int height, + int arcStart, int arcAngle) { - draw( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, - Arc2D.OPEN) ); + draw( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, + Arc2D.OPEN) ); } - public void fillArc(int x, int y, int width, int height, - int arcStart, int arcAngle) + public void fillArc(int x, int y, int width, int height, + int arcStart, int arcAngle) { - fill( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, - Arc2D.CHORD) ); + fill( new Arc2D.Double(x, y, width, height, arcStart, arcAngle, + Arc2D.CHORD) ); } public void drawPolyline(int xPoints[], int yPoints[], int npoints) @@ -428,17 +428,17 @@ public abstract class QtGraphics extends Graphics2D { // FIXME - to something more correct ? String s = ""; - for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) + for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) s += c; drawString(s, x, y); } - public void drawString(AttributedCharacterIterator ci, - float x, float y) + public void drawString(AttributedCharacterIterator ci, + float x, float y) { // FIXME - to something more correct ? String s = ""; - for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) + for(char c = ci.first(); c != CharacterIterator.DONE; c = ci.next()) s += c; drawString(s, x, y); } @@ -450,68 +450,68 @@ public abstract class QtGraphics extends Graphics2D // ******************* Image drawing ****************************** public boolean drawImage(Image image, - AffineTransform Tx, - ImageObserver obs) + AffineTransform Tx, + ImageObserver obs) { if (image instanceof QtImage) return ((QtImage)image).drawImage(this, new QMatrix( Tx ), obs); - return (new QtImage(image.getSource())).drawImage(this, - new QMatrix( Tx ), - obs); + return (new QtImage(image.getSource())).drawImage(this, + new QMatrix( Tx ), + obs); } - public boolean drawImage(Image image, int x, int y, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, Color bgcolor, + ImageObserver observer) { if (image instanceof QtImage) return ((QtImage)image).drawImage (this, x, y, bgcolor, observer); - return (new QtImage(image.getSource())).drawImage (this, x, y, - bgcolor, observer); + return (new QtImage(image.getSource())).drawImage (this, x, y, + bgcolor, observer); } - public boolean drawImage(Image image, - int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage(Image image, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { if (image instanceof QtImage) - return ((QtImage)image).drawImage(this, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, bgcolor, observer); + return ((QtImage)image).drawImage(this, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, bgcolor, observer); - return (new QtImage(image.getSource())).drawImage(this, dx1, dy1, - dx2, dy2, - sx1, sy1, sx2, sy2, - bgcolor, observer); + return (new QtImage(image.getSource())).drawImage(this, dx1, dy1, + dx2, dy2, + sx1, sy1, sx2, sy2, + bgcolor, observer); } - public boolean drawImage(Image image, int x, int y, - int width, int height, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, + int width, int height, Color bgcolor, + ImageObserver observer) { if (image instanceof QtImage) - return ((QtImage)image).drawImage (this, x, y, width, height, - bgcolor, observer); - return (new QtImage(image.getSource())).drawImage (this, x, y, - width, height, - bgcolor, observer); + return ((QtImage)image).drawImage (this, x, y, width, height, + bgcolor, observer); + return (new QtImage(image.getSource())).drawImage (this, x, y, + width, height, + bgcolor, observer); } - - public boolean drawImage(Image image, int x, int y, int width, int height, - ImageObserver observer) + + public boolean drawImage(Image image, int x, int y, int width, int height, + ImageObserver observer) { return drawImage(image, x, y, width, height, null, observer); } - + public boolean drawImage(Image image, int x, int y, ImageObserver observer) { return drawImage(image, x, y, null, observer); } - + public boolean drawImage(Image image, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver observer) { - return drawImage(image, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, null, observer); + return drawImage(image, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, null, observer); } // *********************** Transform methods ************************* @@ -531,7 +531,7 @@ public abstract class QtGraphics extends Graphics2D xform.rotate( theta ); setQtTransform( new QMatrix( xform ) ); } - + public void rotate(double theta, double x, double y) { xform.rotate(theta, x, y); @@ -549,7 +549,7 @@ public abstract class QtGraphics extends Graphics2D xform.shear(shx, shy); setQtTransform( new QMatrix( xform ) ); } - + public void transform(AffineTransform Tx) { xform.concatenate( Tx ); @@ -572,14 +572,14 @@ public abstract class QtGraphics extends Graphics2D { try // ..to convert the stroke into a native one. { - QPen pen = new QPen( s ); - nativeStroking = true; - setNativeStroke( pen ); - setColor( color ); - } + QPen pen = new QPen( s ); + nativeStroking = true; + setNativeStroke( pen ); + setColor( color ); + } catch (IllegalArgumentException e) { - nativeStroking = false; + nativeStroking = false; } currentStroke = s; } @@ -593,27 +593,27 @@ public abstract class QtGraphics extends Graphics2D { if( comp == null) { - setNativeComposite( AlphaComposite.SRC_OVER ); - return; + setNativeComposite( AlphaComposite.SRC_OVER ); + return; } if( comp instanceof AlphaComposite ) { - if( ((AlphaComposite)comp).getRule() != AlphaComposite.XOR ) - setAlpha( ((AlphaComposite)comp).getAlpha() ); - setNativeComposite( ((AlphaComposite)comp).getRule() ); - composite = comp; + if( ((AlphaComposite)comp).getRule() != AlphaComposite.XOR ) + setAlpha( ((AlphaComposite)comp).getAlpha() ); + setNativeComposite( ((AlphaComposite)comp).getRule() ); + composite = comp; } else { - // FIXME: this check is only required "if this Graphics2D - // context is drawing to a Component on the display screen". - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkPermission(new AWTPermission("readDisplayPixels")); + // FIXME: this check is only required "if this Graphics2D + // context is drawing to a Component on the display screen". + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new AWTPermission("readDisplayPixels")); - throw new UnsupportedOperationException("We don't support custom"+ - " composites yet."); + throw new UnsupportedOperationException("We don't support custom"+ + " composites yet."); } } @@ -625,28 +625,28 @@ public abstract class QtGraphics extends Graphics2D public void setPaint(Paint p) { if( p == null ) - return; + return; // FIXME currentPaint = p; if( p instanceof GradientPaint ) { - GradientPaint lg = (GradientPaint)p; - setLinearGradient(lg.getColor1().getRed(), lg.getColor1().getGreen(), - lg.getColor1().getBlue(), lg.getColor2().getRed(), - lg.getColor2().getGreen(), lg.getColor2().getBlue(), - lg.getPoint1().getX(), lg.getPoint1().getY(), - lg.getPoint2().getX(), lg.getPoint2().getY(), - lg.isCyclic() ); - return; + GradientPaint lg = (GradientPaint)p; + setLinearGradient(lg.getColor1().getRed(), lg.getColor1().getGreen(), + lg.getColor1().getBlue(), lg.getColor2().getRed(), + lg.getColor2().getGreen(), lg.getColor2().getBlue(), + lg.getPoint1().getX(), lg.getPoint1().getY(), + lg.getPoint2().getX(), lg.getPoint2().getY(), + lg.isCyclic() ); + return; } if( p instanceof Color ) { - setColor((Color) p); - return; + setColor((Color) p); + return; } throw new UnsupportedOperationException("We don't support custom"+ - " paints yet."); + " paints yet."); } public Paint getPaint() @@ -671,7 +671,7 @@ public abstract class QtGraphics extends Graphics2D { return (RenderingHints) renderingHints.clone(); } - + public void setRenderingHints(Map hints) { renderingHints = new RenderingHints( null ); @@ -711,5 +711,4 @@ public abstract class QtGraphics extends Graphics2D { throw new UnsupportedOperationException("Not implemented yet"); } -} - +} diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java index 15a01592277..dec4db2c859 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtGraphicsEnvironment.java @@ -55,7 +55,7 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment toolkit = tk; // Get the number of screens from Qt. int n = toolkit.numScreens(); - + /** * Create the screen device objects */ @@ -77,7 +77,7 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment { return toolkit.getFontList(); } - + public String[] getAvailableFontFamilyNames(Locale l) { return getAvailableFontFamilyNames(); @@ -103,5 +103,3 @@ public class QtGraphicsEnvironment extends GraphicsEnvironment return toolkit; } } - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtImage.java b/libjava/classpath/gnu/java/awt/peer/qt/QtImage.java index b6fbb1dca41..b7e50ea2581 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtImage.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtImage.java @@ -95,11 +95,11 @@ public class QtImage extends Image /* * The 32-bit AARRGGBB format the uses. */ - static ColorModel nativeModel = new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + static ColorModel nativeModel = new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); /** * HashMap of Graphics objects painting on this Image. */ @@ -126,7 +126,7 @@ public class QtImage extends Image private native void setPixels(int[] pixels); /** - * Loads an image + * Loads an image */ private native boolean loadImage(String name); @@ -153,35 +153,35 @@ public class QtImage extends Image /** * Draws the image optionally composited. */ - native void drawPixels (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, - boolean composite); + native void drawPixels (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, + boolean composite); /** * Draws the image, optionally scaled and composited. */ - private native void drawPixelsScaled (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, int width, int height, - boolean composite); + private native void drawPixelsScaled (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, int width, int height, + boolean composite); /** * Draws the image transformed. */ private native void drawPixelsTransformed (QtGraphics gc, QMatrix transform); - + /** * Draws the image scaled flipped and optionally composited. */ - native void drawPixelsScaledFlipped (QtGraphics gc, - int bg_red, int bg_green, - int bg_blue, - boolean flipX, boolean flipY, - int srcX, int srcY, - int srcWidth, int srcHeight, - int dstX, int dstY, - int dstWidth, int dstHeight, - boolean composite); + native void drawPixelsScaledFlipped (QtGraphics gc, + int bg_red, int bg_green, + int bg_blue, + boolean flipX, boolean flipY, + int srcX, int srcY, + int srcWidth, int srcHeight, + int dstX, int dstY, + int dstWidth, int dstHeight, + boolean composite); /** * Creates the image from an ImageProducer. May result in an error image. @@ -216,13 +216,13 @@ public class QtImage extends Image byte[] buf = new byte[5000]; int n = 0; - while ( (n = bis.read( buf )) != -1 ) - baos.write(buf, 0, n); + while ( (n = bis.read( buf )) != -1 ) + baos.write(buf, 0, n); bis.close(); } catch(IOException e) { - throw new IllegalArgumentException("Couldn't load image."); + throw new IllegalArgumentException("Couldn't load image."); } if ( loadImageFromData( baos.toByteArray() ) != true ) throw new IllegalArgumentException("Couldn't load image."); @@ -245,19 +245,19 @@ public class QtImage extends Image props = new Hashtable(); try { - String fn = f.getCanonicalPath(); - if (loadImage( fn ) != true) - { - errorLoading = true; - isLoaded = false; - return; - } - } + String fn = f.getCanonicalPath(); + if (loadImage( fn ) != true) + { + errorLoading = true; + isLoaded = false; + return; + } + } catch(IOException e) { - errorLoading = true; - isLoaded = false; - return; + errorLoading = true; + isLoaded = false; + return; } errorLoading = false; isLoaded = true; @@ -315,8 +315,8 @@ public class QtImage extends Image /** * Callback from the image consumer. */ - public void setImage(int width, int height, - int[] pixels, Hashtable properties) + public void setImage(int width, int height, + int[] pixels, Hashtable properties) { this.width = width; this.height = height; @@ -324,8 +324,8 @@ public class QtImage extends Image if (width <= 0 || height <= 0 || pixels == null) { - errorLoading = true; - return; + errorLoading = true; + return; } isLoaded = true; @@ -343,12 +343,12 @@ public class QtImage extends Image return width; } - + public int getHeight (ImageObserver observer) { if (addObserver(observer)) return -1; - + return height; } @@ -356,7 +356,7 @@ public class QtImage extends Image { if (addObserver(observer)) return UndefinedProperty; - + Object value = props.get (name); return (value == null) ? UndefinedProperty : value; } @@ -368,8 +368,8 @@ public class QtImage extends Image { if (!isLoaded) return null; - return new MemoryImageSource(width, height, nativeModel, getPixels(), - 0, width); + return new MemoryImageSource(width, height, nativeModel, getPixels(), + 0, width); } void putPainter(QtImageGraphics g) @@ -391,7 +391,7 @@ public class QtImage extends Image */ public Graphics getGraphics () { - if (!isLoaded || killFlag) + if (!isLoaded || killFlag) return null; return new QtImageGraphics(this); @@ -402,28 +402,28 @@ public class QtImage extends Image */ Graphics getDirectGraphics(QtComponentPeer peer) { - if (!isLoaded) + if (!isLoaded) return null; return new QtImageDirectGraphics(this, peer); } - + /** * Returns a scaled instance of this image. */ public Image getScaledInstance(int width, - int height, - int hints) + int height, + int hints) { if (width <= 0 || height <= 0) throw new IllegalArgumentException("Width and height of scaled bitmap"+ - "must be >= 0"); + "must be >= 0"); return new QtImage(this, width, height, hints); } /** - * If the image is loaded and comes from an ImageProducer, + * If the image is loaded and comes from an ImageProducer, * regenerate the image from there. * * I have no idea if this is ever actually used. Since QtImage can't be @@ -434,10 +434,10 @@ public class QtImage extends Image { if (isLoaded && source != null) { - observers = new Vector(); - isLoaded = false; - freeImage(); - source.startProduction(new QtImageConsumer(this, source)); + observers = new Vector(); + isLoaded = false; + freeImage(); + source.startProduction(new QtImageConsumer(this, source)); } } @@ -450,11 +450,11 @@ public class QtImage extends Image { if (isLoaded) { - if( painters == null || painters.isEmpty() ) - freeImage(); - else - killFlag = true; // can't destroy image yet. - // Do so when all painters are gone. + if( painters == null || painters.isEmpty() ) + freeImage(); + else + killFlag = true; // can't destroy image yet. + // Do so when all painters are gone. } } @@ -465,12 +465,12 @@ public class QtImage extends Image { if (addObserver(observer)) { - if (errorLoading == true) - return ImageObserver.ERROR; - else - return 0; + if (errorLoading == true) + return ImageObserver.ERROR; + else + return 0; } - + return ImageObserver.ALLBITS | ImageObserver.WIDTH | ImageObserver.HEIGHT; } @@ -480,7 +480,7 @@ public class QtImage extends Image * Draws an image with eventual scaling/transforming. */ public boolean drawImage (QtGraphics g, QMatrix matrix, - ImageObserver observer) + ImageObserver observer) { if (addObserver(observer)) return false; @@ -495,14 +495,14 @@ public class QtImage extends Image * compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; if(bgcolor != null) - drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, true); + drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, true); else drawPixels(g, 0, 0, 0, x, y, false); @@ -510,18 +510,18 @@ public class QtImage extends Image } /** - * Draws an image to the QtGraphics context, at (x,y) scaled to + * Draws an image to the QtGraphics context, at (x,y) scaled to * width and height, with optional compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; if(bgcolor != null) - drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, width, height, true); + drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, width, height, true); else drawPixelsScaled(g, 0, 0, 0, x, y, width, height, false); @@ -531,9 +531,9 @@ public class QtImage extends Image /** * Draws an image with eventual scaling/transforming. */ - public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { if (addObserver(observer)) return false; @@ -549,53 +549,53 @@ public class QtImage extends Image int dstX = (dx1 < dx2) ? dx1 : dx2; int dstY = (dy1 < dy2) ? dy1 : dy2; - // Clipping. This requires the dst to be scaled as well, + // Clipping. This requires the dst to be scaled as well, if (srcWidth > width) { - dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); + srcWidth = width - srcX; } - if (srcHeight > height) + if (srcHeight > height) { - dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); + srcHeight = height - srcY; } if (srcWidth + srcX > width) { - dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); + srcWidth = width - srcX; } if (srcHeight + srcY > height) { - dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); + srcHeight = height - srcY; } if ( srcWidth <= 0 || srcHeight <= 0 || dstWidth <= 0 || dstHeight <= 0) return true; if(bgcolor != null) - drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), - flipX, flipY, - srcX, srcY, - srcWidth, srcHeight, - dstX, dstY, - dstWidth, dstHeight, - true); + drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), + flipX, flipY, + srcX, srcY, + srcWidth, srcHeight, + dstX, dstY, + dstWidth, dstHeight, + true); else drawPixelsScaledFlipped (g, 0, 0, 0, flipX, flipY, - srcX, srcY, srcWidth, srcHeight, - dstX, dstY, dstWidth, dstHeight, - false); + srcX, srcY, srcWidth, srcHeight, + dstX, dstY, dstWidth, dstHeight, + false); return true; } - public native void copyArea(int x, int y, int width, int height, - int dx, int dy); + public native void copyArea(int x, int y, int width, int height, + int dx, int dy); // Private methods //////////////////////////////////////////////// @@ -604,19 +604,19 @@ public class QtImage extends Image */ private void deliver() { - int flags = ImageObserver.HEIGHT | + int flags = ImageObserver.HEIGHT | ImageObserver.WIDTH | ImageObserver.PROPERTIES | ImageObserver.ALLBITS; if (observers != null) for(int i=0; i < observers.size(); i++) - ((ImageObserver)observers.elementAt(i)). - imageUpdate(this, flags, 0, 0, width, height); + ((ImageObserver)observers.elementAt(i)). + imageUpdate(this, flags, 0, 0, width, height); observers = null; } - + /** * Adds an observer, if we need to. * @return true if an observer was added. @@ -625,10 +625,10 @@ public class QtImage extends Image { if (!isLoaded) { - if(observer != null) - if (!observers.contains (observer)) - observers.addElement (observer); - return true; + if(observer != null) + if (!observers.contains (observer)) + observers.addElement (observer); + return true; } return false; } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtImageConsumer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtImageConsumer.java index 7096c21e48d..9883475f9a3 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtImageConsumer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtImageConsumer.java @@ -86,44 +86,44 @@ public class QtImageConsumer implements ImageConsumer public synchronized void setHints (int flags) { // This method informs us in which order the pixels are - // delivered, for progressive-loading support, etc. + // delivered, for progressive-loading support, etc. // Since we wait until it's all loaded, we can ignore the hints. } - public synchronized void setPixels (int x, int y, int width, int height, - ColorModel cm, byte[] pixels, - int offset, int scansize) + public synchronized void setPixels (int x, int y, int width, int height, + ColorModel cm, byte[] pixels, + int offset, int scansize) { setPixels (x, y, width, height, cm, convertPixels (pixels), offset, scansize); } - public synchronized void setPixels (int x, int y, int width, int height, - ColorModel cm, int[] pixels, - int offset, int scansize) + public synchronized void setPixels (int x, int y, int width, int height, + ColorModel cm, int[] pixels, + int offset, int scansize) { if (pixelCache == null) return; // Not sure this should ever happen. if (cm.equals(QtImage.nativeModel)) for (int i = 0; i < height; i++) - System.arraycopy (pixels, offset + (i * scansize), - pixelCache, (y + i) * this.width + x, - width); + System.arraycopy (pixels, offset + (i * scansize), + pixelCache, (y + i) * this.width + x, + width); else { - for (int i = 0; i < height; i++) - for (int j = 0; j < width; j++) - { - // get in AARRGGBB and convert to AABBGGRR - int pix = cm.getRGB(pixels[offset + (i * scansize) + x + j]); - byte b = (byte)(pix & 0xFF); - byte r = (byte)(((pix & 0x00FF0000) >> 16) & 0xFF); - pix &= 0xFF00FF00; - pix |= ((b & 0xFF) << 16); - pix |= (r & 0xFF); - pixelCache[(y + i) * this.width + x + j] = pix; - } + for (int i = 0; i < height; i++) + for (int j = 0; j < width; j++) + { + // get in AARRGGBB and convert to AABBGGRR + int pix = cm.getRGB(pixels[offset + (i * scansize) + x + j]); + byte b = (byte)(pix & 0xFF); + byte r = (byte)(((pix & 0x00FF0000) >> 16) & 0xFF); + pix &= 0xFF00FF00; + pix |= ((b & 0xFF) << 16); + pix |= (r & 0xFF); + pixelCache[(y + i) * this.width + x + j] = pix; + } } } @@ -136,7 +136,7 @@ public class QtImageConsumer implements ImageConsumer for (int i = 0; i < pixels.length; i++) ret[i] = pixels[i] & 0xFF; - + return ret; } @@ -145,5 +145,3 @@ public class QtImageConsumer implements ImageConsumer this.properties = props; } } - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java b/libjava/classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java index d49084af831..daa174ad449 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtImageDirectGraphics.java @@ -75,7 +75,7 @@ public class QtImageDirectGraphics extends QtImageGraphics } public void draw(Shape s) - { + { super.draw(s); scheduleUpdate(); } @@ -105,43 +105,41 @@ public class QtImageDirectGraphics extends QtImageGraphics } public boolean drawImage(Image image, - AffineTransform Tx, - ImageObserver obs) + AffineTransform Tx, + ImageObserver obs) { boolean r = super.drawImage(image, Tx, obs); scheduleUpdate(); return r; } - public boolean drawImage(Image image, int x, int y, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, Color bgcolor, + ImageObserver observer) { boolean r = super.drawImage(image, x, y, bgcolor, observer); scheduleUpdate(); return r; } - public boolean drawImage(Image image, - int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage(Image image, + int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { - boolean r = super.drawImage( image, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, - bgcolor, observer); + boolean r = super.drawImage( image, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, + bgcolor, observer); scheduleUpdate(); return r; } - public boolean drawImage(Image image, int x, int y, - int width, int height, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image image, int x, int y, + int width, int height, Color bgcolor, + ImageObserver observer) { - boolean r = super.drawImage(image, x, y, width, height, bgcolor, - observer); + boolean r = super.drawImage(image, x, y, width, height, bgcolor, + observer); scheduleUpdate(); return r; } -} - - +} diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtImageGraphics.java b/libjava/classpath/gnu/java/awt/peer/qt/QtImageGraphics.java index 1224d69150f..bba25e06830 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtImageGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtImageGraphics.java @@ -65,17 +65,17 @@ public class QtImageGraphics extends QtGraphics int w, h; if(image instanceof QtImage) { - w = ((QtImage)image).width; - h = ((QtImage)image).height; - initImage((QtImage) image ); - ((QtImage)image).putPainter( this ); - } + w = ((QtImage)image).width; + h = ((QtImage)image).height; + initImage((QtImage) image ); + ((QtImage)image).putPainter( this ); + } else { - w = ((QtVolatileImage)image).width; - h = ((QtVolatileImage)image).height; - initVolatileImage((QtVolatileImage) image ); - ((QtVolatileImage)image).putPainter( this ); + w = ((QtVolatileImage)image).width; + h = ((QtVolatileImage)image).height; + initVolatileImage((QtVolatileImage) image ); + ((QtVolatileImage)image).putPainter( this ); } parentImage = image; @@ -92,7 +92,7 @@ public class QtImageGraphics extends QtGraphics */ QtImageGraphics( QtImageGraphics g ) { - super( g ); + super( g ); parentImage = g.parentImage; if(parentImage instanceof QtImage) ((QtImage)parentImage).putPainter( this ); @@ -119,9 +119,9 @@ public class QtImageGraphics extends QtGraphics /** * Copy an area. - */ - public void copyArea(int x, int y, int width, int height, - int dx, int dy) + */ + public void copyArea(int x, int y, int width, int height, + int dx, int dy) { if(parentImage instanceof QtImage) ((QtImage)parentImage).copyArea(x, y, width, height, dx, dy); @@ -136,6 +136,4 @@ public class QtImageGraphics extends QtGraphics { throw new UnsupportedOperationException("Not implemented yet"); } -} - - +} diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtLabelPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtLabelPeer.java index 449c9b3cb58..80acd491da9 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtLabelPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtLabelPeer.java @@ -46,9 +46,9 @@ public class QtLabelPeer extends QtComponentPeer implements LabelPeer { super( kit, owner ); } - + protected native void init(); - + protected void setup() { super.setup(); diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtListPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtListPeer.java index 9df250a42d3..14ae2a0cde0 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtListPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtListPeer.java @@ -84,26 +84,26 @@ public class QtListPeer extends QtComponentPeer implements ListPeer if( index == -1) ((List)owner).deselect( ((List)owner).getSelectedIndex() ); else - { - ((List)owner).select( index ); - ItemEvent e = new ItemEvent((List)owner, - ItemEvent.ITEM_STATE_CHANGED, - ""+index, - ItemEvent.SELECTED); - QtToolkit.eventQueue.postEvent(e); - } + { + ((List)owner).select( index ); + ItemEvent e = new ItemEvent((List)owner, + ItemEvent.ITEM_STATE_CHANGED, + ""+index, + ItemEvent.SELECTED); + QtToolkit.eventQueue.postEvent(e); + } } /** * Called back when an item is double-clicked. - */ + */ private void itemDoubleClicked( int index, int modifiers ) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((List)owner).getItem( index ), - System.currentTimeMillis(), - modifiers); + ActionEvent.ACTION_PERFORMED, + ((List)owner).getItem( index ), + System.currentTimeMillis(), + modifiers); QtToolkit.eventQueue.postEvent(e); } @@ -129,10 +129,10 @@ public class QtListPeer extends QtComponentPeer implements ListPeer public native void delItems(int start_index, int end_index); public void deselect(int index) - { + { if( ignoreNextSelect == true ) ignoreNextSelect = false; - else + else select(index, false); } @@ -159,7 +159,7 @@ public class QtListPeer extends QtComponentPeer implements ListPeer { if( ignoreNextSelect == true ) ignoreNextSelect = false; - else + else select(index, true); } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java index c91b37f3711..962d76d4150 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuBarPeer.java @@ -47,15 +47,15 @@ public class QtMenuBarPeer extends QtMenuComponentPeer implements MenuBarPeer { super( kit, owner ); } - + protected native void init(); - + protected void setup() { } - /** - * Recurses the menubar adding menus (and menu items), + /** + * Recurses the menubar adding menus (and menu items), * called from the Frame peer. */ void addMenus() @@ -99,4 +99,3 @@ public class QtMenuBarPeer extends QtMenuComponentPeer implements MenuBarPeer delMenu( (QtMenuPeer)m.getPeer() ); } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java index 7e292d00fbf..2050bef06d8 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuComponentPeer.java @@ -41,27 +41,27 @@ import java.awt.Font; import java.awt.MenuComponent; import java.awt.peer.MenuComponentPeer; -public class QtMenuComponentPeer extends NativeWrapper +public class QtMenuComponentPeer extends NativeWrapper implements MenuComponentPeer { protected QtToolkit toolkit; protected MenuComponent owner; - + public QtMenuComponentPeer( QtToolkit kit, MenuComponent owner ) { this.toolkit = kit; this.owner = owner; nativeObject = 0; - synchronized(this) + synchronized(this) { - callInit(); // Calls the init method FROM THE MAIN THREAD. - try - { - wait(); // Wait for the thing to be created. - } - catch(InterruptedException e) - { - } + callInit(); // Calls the init method FROM THE MAIN THREAD. + try + { + wait(); // Wait for the thing to be created. + } + catch(InterruptedException e) + { + } } setup(); } @@ -80,7 +80,7 @@ public class QtMenuComponentPeer extends NativeWrapper { dispose(); } - + // ************ Public methods ********************* public native void dispose(); @@ -88,7 +88,7 @@ public class QtMenuComponentPeer extends NativeWrapper public void setFont(Font font) { // TODO Auto-generated method stub - + } } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java index 7658ff078f1..2b77540a5fb 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuItemPeer.java @@ -43,7 +43,7 @@ import java.awt.event.ActionEvent; import java.awt.peer.MenuItemPeer; import java.awt.peer.CheckboxMenuItemPeer; -public class QtMenuItemPeer extends QtMenuComponentPeer +public class QtMenuItemPeer extends QtMenuComponentPeer implements MenuItemPeer, CheckboxMenuItemPeer { public QtMenuItemPeer( QtToolkit toolkit, MenuItem owner ) @@ -73,15 +73,15 @@ public class QtMenuItemPeer extends QtMenuComponentPeer private void fireClick(int modifiers) { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((MenuItem)owner).getActionCommand(), - System.currentTimeMillis(), - (modifiers & 0x2FF)); + ActionEvent.ACTION_PERFORMED, + ((MenuItem)owner).getActionCommand(), + System.currentTimeMillis(), + (modifiers & 0x2FF)); QtToolkit.eventQueue.postEvent(e); } // ************ Public methods ********************* - + public void disable() { setEnabled(false); @@ -98,10 +98,3 @@ public class QtMenuItemPeer extends QtMenuComponentPeer public native void setState(boolean state); } - - - - - - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java index 87324c71043..0f65fecbd9e 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtMenuPeer.java @@ -56,7 +56,7 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer } protected native void init(); - + protected void setup() { items = new Vector(); @@ -65,29 +65,29 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer allowTearOff(); } - // Recurse the menu tree adding items, + // Recurse the menu tree adding items, // called from the MenuBar addMenus() method, called from the Frame peer. void addItems() { if(!itemsAdded) { - Menu o = (Menu)owner; - for( int i=0; i < o.getItemCount(); i++ ) - { - MenuItem ci = o.getItem(i); - if (ci instanceof Menu && ci.getPeer() != null) - ((QtMenuPeer)ci.getPeer()).addItems(); - addItem( ci ); - } - itemsAdded = true; + Menu o = (Menu)owner; + for( int i=0; i < o.getItemCount(); i++ ) + { + MenuItem ci = o.getItem(i); + if (ci instanceof Menu && ci.getPeer() != null) + ((QtMenuPeer)ci.getPeer()).addItems(); + addItem( ci ); + } + itemsAdded = true; } } private void fireClick() { ActionEvent e = new ActionEvent(owner, - ActionEvent.ACTION_PERFORMED, - ((Menu)owner).getActionCommand()); + ActionEvent.ACTION_PERFORMED, + ((Menu)owner).getActionCommand()); QtToolkit.eventQueue.postEvent(e); } @@ -112,13 +112,13 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer { if( item instanceof Menu || item instanceof PopupMenu) insertMenu((QtMenuPeer)item.getPeer()); - else + else { - QtMenuItemPeer p = (QtMenuItemPeer)item.getPeer(); - insertItem(p); + QtMenuItemPeer p = (QtMenuItemPeer)item.getPeer(); + insertItem(p); } } - + public void addSeparator() { insertSeperator(); @@ -147,6 +147,3 @@ public class QtMenuPeer extends QtMenuComponentPeer implements MenuPeer public native void setLabel(String text); } - - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtPanelPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtPanelPeer.java index 9e435233110..1ac0ca9a69f 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtPanelPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtPanelPeer.java @@ -46,7 +46,7 @@ public class QtPanelPeer extends QtContainerPeer implements PanelPeer { super( kit, owner ); } - + protected native void init(); protected void setup() diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java index b96c5c51045..eb4dae40465 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtPopupMenuPeer.java @@ -74,6 +74,3 @@ public class QtPopupMenuPeer extends QtMenuPeer implements PopupMenuPeer show((Component)e.target, e.x, e.y); } } - - - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtRepaintThread.java b/libjava/classpath/gnu/java/awt/peer/qt/QtRepaintThread.java index 405505e9bc8..6861be8fc9d 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtRepaintThread.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtRepaintThread.java @@ -42,13 +42,13 @@ package gnu.java.awt.peer.qt; * do this directly from the paint callback in QtComponentPeer, because that * is executed from the main thread. Thus, if a call is made at the same time * which requires execution by the main thread, and this is sharing a lock with - * paint(), then a deadlock will occur, which must be avoided. In general, + * paint(), then a deadlock will occur, which must be avoided. In general, * the main Qt thread should avoid calling into java code as far as possible. * */ -public class QtRepaintThread extends Thread +public class QtRepaintThread extends Thread { - static class RepaintComponent + static class RepaintComponent { public QtComponentPeer curr; public RepaintComponent next; @@ -72,7 +72,7 @@ public class QtRepaintThread extends Thread this.h = h; } } - + RepaintComponent component; boolean busy; @@ -85,39 +85,39 @@ public class QtRepaintThread extends Thread { while( true ) { - try - { - busy = false; - // Wait for a repaint - sleep(100); - busy = true; - } - catch (InterruptedException ie) - { - while( component != null ) - { - try - { - if( component.paintAll ) - { - // update the back-buffer. - component.curr.paintBackBuffer(); - component.curr.QtUpdate(); // trigger a native repaint event - } - else - { - component.curr.paintBackBuffer(component.x, component.y, - component.w, component.h); - component.curr.QtUpdateArea(component.x, component.y, - component.w, component.h); - } - } - catch (InterruptedException e) - { - } - component = component.next; - } - } + try + { + busy = false; + // Wait for a repaint + sleep(100); + busy = true; + } + catch (InterruptedException ie) + { + while( component != null ) + { + try + { + if( component.paintAll ) + { + // update the back-buffer. + component.curr.paintBackBuffer(); + component.curr.QtUpdate(); // trigger a native repaint event + } + else + { + component.curr.paintBackBuffer(component.x, component.y, + component.w, component.h); + component.curr.QtUpdateArea(component.x, component.y, + component.w, component.h); + } + } + catch (InterruptedException e) + { + } + component = component.next; + } + } } } @@ -130,9 +130,9 @@ public class QtRepaintThread extends Thread component = new RepaintComponent(p); else { - RepaintComponent r = component; - while( r.next != null ) r = r.next; - r.next = new RepaintComponent(p); + RepaintComponent r = component; + while( r.next != null ) r = r.next; + r.next = new RepaintComponent(p); } interrupt(); } @@ -140,16 +140,16 @@ public class QtRepaintThread extends Thread /** * Enqueue a component for repainting. */ - public synchronized void queueComponent(QtComponentPeer p, int x, int y, - int w, int h) + public synchronized void queueComponent(QtComponentPeer p, int x, int y, + int w, int h) { if( component == null ) component = new RepaintComponent(p, x, y, w, h); else { - RepaintComponent r = component; - while( r.next != null ) r = r.next; - r.next = new RepaintComponent(p, x, y, w, h); + RepaintComponent r = component; + while( r.next != null ) r = r.next; + r.next = new RepaintComponent(p, x, y, w, h); } interrupt(); } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDevice.java b/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDevice.java index c2d73aed1cb..c7d8a478435 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDevice.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDevice.java @@ -113,4 +113,3 @@ public class QtScreenDevice extends GraphicsDevice { } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java b/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java index c67b55bf42f..34de36c0949 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtScreenDeviceConfiguration.java @@ -47,7 +47,7 @@ import java.awt.image.VolatileImage; import java.awt.geom.AffineTransform; public class QtScreenDeviceConfiguration extends GraphicsConfiguration { - + private QtScreenDevice owner; private Rectangle bounds; private double dpiX, dpiY; @@ -67,21 +67,21 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { switch( depth ) { case 24: - return new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR); + return new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR); case 16: - return new BufferedImage(width, height, - BufferedImage.TYPE_USHORT_565_RGB); + return new BufferedImage(width, height, + BufferedImage.TYPE_USHORT_565_RGB); case 8: - return new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED); + return new BufferedImage(width, height, BufferedImage.TYPE_BYTE_INDEXED); default: case 32: - return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); } } public BufferedImage createCompatibleImage(int width, int height, int transparency) { - // FIXME: Take the transpareny flag into account? + // FIXME: Take the transpareny flag into account? // For now, ignore it and just use an alpha channel. if(depth == 32) return new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); @@ -92,9 +92,9 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { { return new QtVolatileImage( width, height ); } - - public VolatileImage createCompatibleVolatileImage(int width, int height, - ImageCapabilities caps) + + public VolatileImage createCompatibleVolatileImage(int width, int height, + ImageCapabilities caps) { return createCompatibleVolatileImage( width, height ); } @@ -121,7 +121,7 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { return new AffineTransform(); } - public GraphicsDevice getDevice() + public GraphicsDevice getDevice() { return owner; } @@ -137,8 +137,8 @@ public class QtScreenDeviceConfiguration extends GraphicsConfiguration { return nTrans; } - public VolatileImage createCompatibleVolatileImage(int width, int height, - int transparency) + public VolatileImage createCompatibleVolatileImage(int width, int height, + int transparency) { return createCompatibleVolatileImage(width, height); } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java index c3731cbd5f2..079d06de79e 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtScrollPanePeer.java @@ -48,7 +48,7 @@ public class QtScrollPanePeer extends QtContainerPeer implements ScrollPanePeer { super( kit, owner ); } - + protected native void init(); protected void setup() @@ -73,9 +73,9 @@ public class QtScrollPanePeer extends QtContainerPeer implements ScrollPanePeer { // FIXME : more accurate? return new Insets(5 + getHScrollbarHeight(), // Top - 5 + getVScrollbarWidth(), // Left - 5, // Bottom - 5); // Right + 5 + getVScrollbarWidth(), // Left + 5, // Bottom + 5); // Right } public void setUnitIncrement(Adjustable item, int inc) diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java index 838cca62d20..69428713106 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtScrollbarPeer.java @@ -65,13 +65,13 @@ public class QtScrollbarPeer extends QtComponentPeer implements ScrollbarPeer private void fireMoved(int type, int value) { AdjustmentEvent e = new AdjustmentEvent((Scrollbar)owner, - AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED, - type, value); + AdjustmentEvent.ADJUSTMENT_VALUE_CHANGED, + type, value); QtToolkit.eventQueue.postEvent(e); } - + // ************ Public methods ********************* - + public native void setLineIncrement(int inc); public native void setPageIncrement(int inc); diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java index f37b9537cfa..a5aff58efa6 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtTextAreaPeer.java @@ -69,7 +69,7 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer * Called back on a text edit. */ private void textChanged() - { + { TextEvent e = new TextEvent(owner, TextEvent.TEXT_VALUE_CHANGED); QtToolkit.eventQueue.postEvent(e); } @@ -95,7 +95,7 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer public native int getIndexAtPoint(int x, int y); // public void reshape(int x, int y, -// int width, int height) +// int width, int height) // { // if(width != 0 || height != 0) // super.reshape(x, y, width, height); @@ -177,4 +177,3 @@ public class QtTextAreaPeer extends QtComponentPeer implements TextAreaPeer return null; } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java index 0e3d5af7816..f9294320244 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtTextFieldPeer.java @@ -80,7 +80,7 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer // ************ Public methods ********************* - public long filterEvents(long e) + public long filterEvents(long e) { return e; } @@ -91,7 +91,7 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer { return new Rectangle(0,0,0,0); } - + public int getIndexAtPoint(int x, int y) { // FIXME @@ -157,4 +157,3 @@ public class QtTextFieldPeer extends QtComponentPeer implements TextFieldPeer return null; } } - diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java b/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java index 4cea976ac22..9f8a691c66a 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java @@ -111,7 +111,7 @@ import java.util.Properties; public class QtToolkit extends ClasspathToolkit { public static EventQueue eventQueue = null; // the native event queue - public static QtRepaintThread repaintThread = null; + public static QtRepaintThread repaintThread = null; public static MainQtThread guiThread = null; public static QtGraphicsEnvironment graphicsEnv = null; @@ -122,12 +122,12 @@ public class QtToolkit extends ClasspathToolkit System.loadLibrary("qtpeer"); String theme = null; - try + try { - String style = System.getProperty("qtoptions.style"); - if(style != null) - theme = style; - } + String style = System.getProperty("qtoptions.style"); + if(style != null) + theme = style; + } catch(SecurityException e) { } @@ -136,12 +136,12 @@ public class QtToolkit extends ClasspathToolkit } boolean doublebuffer = true; - try + try { - String style = System.getProperty("qtoptions.nodoublebuffer"); - if(style != null) - doublebuffer = false; - } + String style = System.getProperty("qtoptions.nodoublebuffer"); + if(style != null) + doublebuffer = false; + } catch(SecurityException e) { } @@ -171,7 +171,7 @@ public class QtToolkit extends ClasspathToolkit } native String[] nativeFontFamilies(); - + native int numScreens(); native int defaultScreen(); @@ -213,7 +213,7 @@ public class QtToolkit extends ClasspathToolkit return new QtMenuItemPeer( this, target ); } - public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge) + public DragSourceContextPeer createDragSourceContextPeer(DragGestureEvent dge) { throw new RuntimeException("Not implemented"); } @@ -232,16 +232,16 @@ public class QtToolkit extends ClasspathToolkit { return new QtImage( producer ); } - + public Image createImage(byte[] imageData, - int imageOffset, - int imageLength) + int imageOffset, + int imageLength) { byte[] dataCopy = new byte[imageLength]; System.arraycopy(imageData, imageOffset, dataCopy, 0, imageLength); return new QtImage( dataCopy ); } - + public Image createImage(String filename) { return new QtImage( filename ); @@ -256,7 +256,7 @@ public class QtToolkit extends ClasspathToolkit { return new QtTextFieldPeer(this,target); } - + protected LabelPeer createLabel(Label target) { return new QtLabelPeer( this, target ); @@ -335,11 +335,11 @@ public class QtToolkit extends ClasspathToolkit public ColorModel getColorModel() { - return new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + return new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); } /** @@ -347,11 +347,11 @@ public class QtToolkit extends ClasspathToolkit */ public String[] getFontList() { - String[] builtIn = new String[] { "Dialog", - "DialogInput", - "Monospaced", - "Serif", - "SansSerif" }; + String[] builtIn = new String[] { "Dialog", + "DialogInput", + "Monospaced", + "Serif", + "SansSerif" }; String[] nat = nativeFontFamilies(); String[] allFonts = new String[ nat.length + 5 ]; System.arraycopy(builtIn, 0, allFonts, 0, 5); @@ -365,7 +365,7 @@ public class QtToolkit extends ClasspathToolkit } protected FontPeer getFontPeer(String name, - int style) + int style) { Map attrs = new HashMap (); ClasspathFontPeer.copyStyleToAttrs(style, attrs); @@ -384,14 +384,14 @@ public class QtToolkit extends ClasspathToolkit } public PrintJob getPrintJob(Frame frame, - String jobtitle, - Properties props) + String jobtitle, + Properties props) { SecurityManager sm; sm = System.getSecurityManager(); if (sm != null) sm.checkPrintJobAccess(); - + throw new RuntimeException("Not implemented"); } @@ -412,8 +412,8 @@ public class QtToolkit extends ClasspathToolkit public Map mapInputMethodHighlight(InputMethodHighlight highlight) { return null; // FIXME - } - + } + public boolean prepareImage(Image image, int w, int h, ImageObserver observer) { if(image instanceof QtImage) @@ -431,7 +431,7 @@ public class QtToolkit extends ClasspathToolkit } public ClasspathFontPeer getClasspathFontPeer (String name, Map attrs) - { + { return new QtFontPeer (name, attrs); } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtVolatileImage.java b/libjava/classpath/gnu/java/awt/peer/qt/QtVolatileImage.java index c81bb2a098b..a203de0d094 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtVolatileImage.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtVolatileImage.java @@ -74,11 +74,11 @@ public class QtVolatileImage extends VolatileImage /* * The 32-bit AARRGGBB format the uses. */ - static ColorModel nativeModel = new DirectColorModel(32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); + static ColorModel nativeModel = new DirectColorModel(32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); /** * Clears the image to RGBA 0 @@ -111,7 +111,7 @@ public class QtVolatileImage extends VolatileImage private native void freeImage(); /** - * Blit a QImage + * Blit a QImage */ public native void blit(QtImage i); public native void blit(QtImage i, int x, int y, int w, int h); @@ -124,35 +124,35 @@ public class QtVolatileImage extends VolatileImage /** * Draws the image optionally composited. */ - private native void drawPixels (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, - boolean composite); + private native void drawPixels (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, + boolean composite); /** * Draws the image, optionally scaled and composited. */ - private native void drawPixelsScaled (QtGraphics gc, - int bg_red, int bg_green, int bg_blue, - int x, int y, int width, int height, - boolean composite); + private native void drawPixelsScaled (QtGraphics gc, + int bg_red, int bg_green, int bg_blue, + int x, int y, int width, int height, + boolean composite); /** * Draws the image transformed. */ private native void drawPixelsTransformed (QtGraphics gc, QMatrix transform); - + /** * Draws the image scaled flipped and optionally composited. */ - native void drawPixelsScaledFlipped (QtGraphics gc, - int bg_red, int bg_green, - int bg_blue, - boolean flipX, boolean flipY, - int srcX, int srcY, - int srcWidth, int srcHeight, - int dstX, int dstY, - int dstWidth, int dstHeight, - boolean composite); + native void drawPixelsScaledFlipped (QtGraphics gc, + int bg_red, int bg_green, + int bg_blue, + boolean flipX, boolean flipY, + int srcX, int srcY, + int srcWidth, int srcHeight, + int dstX, int dstY, + int dstWidth, int dstHeight, + boolean composite); /** * Constructs an empty QtVolatileImage. @@ -169,8 +169,8 @@ public class QtVolatileImage extends VolatileImage /** * Constructs a scaled version of the src bitmap, using Qt */ - private QtVolatileImage (QtVolatileImage src, int width, int height, - int hints) + private QtVolatileImage (QtVolatileImage src, int width, int height, + int hints) { this.width = width; this.height = height; @@ -190,7 +190,7 @@ public class QtVolatileImage extends VolatileImage if( painters == null || painters.isEmpty() ) freeImage(); else - killFlag = true; // can't destroy image yet. + killFlag = true; // can't destroy image yet. // Do so when all painters are gone. } @@ -200,7 +200,7 @@ public class QtVolatileImage extends VolatileImage { return getWidth(); } - + public int getHeight (ImageObserver observer) { return getHeight(); @@ -217,8 +217,8 @@ public class QtVolatileImage extends VolatileImage */ public ImageProducer getSource () { - return new MemoryImageSource(width, height, nativeModel, getPixels(), - 0, width); + return new MemoryImageSource(width, height, nativeModel, getPixels(), + 0, width); } void putPainter(QtImageGraphics g) @@ -244,17 +244,17 @@ public class QtVolatileImage extends VolatileImage putPainter( g ); return g; } - + /** * Returns a scaled instance of this image. */ public Image getScaledInstance(int width, - int height, - int hints) + int height, + int hints) { if (width <= 0 || height <= 0) throw new IllegalArgumentException("Width and height of scaled bitmap"+ - "must be >= 0"); + "must be >= 0"); return new QtVolatileImage(this, width, height, hints); } @@ -280,7 +280,7 @@ public class QtVolatileImage extends VolatileImage * Draws an image with eventual scaling/transforming. */ public boolean drawImage (QtGraphics g, QMatrix matrix, - ImageObserver observer) + ImageObserver observer) { drawPixelsTransformed (g, matrix); return true; @@ -291,11 +291,11 @@ public class QtVolatileImage extends VolatileImage * compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if(bgcolor != null) - drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, true); + drawPixels(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, true); else drawPixels(g, 0, 0, 0, x, y, false); @@ -303,27 +303,27 @@ public class QtVolatileImage extends VolatileImage } /** - * Draws an image to the QtGraphics context, at (x,y) scaled to + * Draws an image to the QtGraphics context, at (x,y) scaled to * width and height, with optional compositing with a background color. */ public boolean drawImage (QtGraphics g, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { if(bgcolor != null) - drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), x, y, width, height, true); + drawPixelsScaled(g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), x, y, width, height, true); else drawPixelsScaled(g, 0, 0, 0, x, y, width, height, false); - + return true; } /** * Draws an image with eventual scaling/transforming. */ - public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, - Color bgcolor, ImageObserver observer) + public boolean drawImage (QtGraphics g, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, + Color bgcolor, ImageObserver observer) { boolean flipX = (dx1 > dx2)^(sx1 > sx2); boolean flipY = (dy1 > dy2)^(sy1 > sy2); @@ -336,53 +336,53 @@ public class QtVolatileImage extends VolatileImage int dstX = (dx1 < dx2) ? dx1 : dx2; int dstY = (dy1 < dy2) ? dy1 : dy2; - // Clipping. This requires the dst to be scaled as well, + // Clipping. This requires the dst to be scaled as well, if (srcWidth > width) { - dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth*((double)width/(double)srcWidth)); + srcWidth = width - srcX; } - if (srcHeight > height) + if (srcHeight > height) { - dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight*((double)height/(double)srcHeight)); + srcHeight = height - srcY; } if (srcWidth + srcX > width) { - dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); - srcWidth = width - srcX; + dstWidth = (int)((double)dstWidth * (double)(width - srcX)/(double)srcWidth); + srcWidth = width - srcX; } if (srcHeight + srcY > height) { - dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); - srcHeight = height - srcY; + dstHeight = (int)((double)dstHeight * (double)(width - srcY)/(double)srcHeight); + srcHeight = height - srcY; } if ( srcWidth <= 0 || srcHeight <= 0 || dstWidth <= 0 || dstHeight <= 0) return true; if(bgcolor != null) - drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), - bgcolor.getBlue (), - flipX, flipY, - srcX, srcY, - srcWidth, srcHeight, - dstX, dstY, - dstWidth, dstHeight, - true); + drawPixelsScaledFlipped (g, bgcolor.getRed (), bgcolor.getGreen (), + bgcolor.getBlue (), + flipX, flipY, + srcX, srcY, + srcWidth, srcHeight, + dstX, dstY, + dstWidth, dstHeight, + true); else drawPixelsScaledFlipped (g, 0, 0, 0, flipX, flipY, - srcX, srcY, srcWidth, srcHeight, - dstX, dstY, dstWidth, dstHeight, - false); + srcX, srcY, srcWidth, srcHeight, + dstX, dstY, dstWidth, dstHeight, + false); return true; } - - public native void copyArea(int x, int y, int width, int height, - int dx, int dy); + + public native void copyArea(int x, int y, int width, int height, + int dx, int dy); //******************** VolatileImage stuff ******************** @@ -402,10 +402,10 @@ public class QtVolatileImage extends VolatileImage { return new ImageCapabilities(false) { - public boolean isTrueVolatile() - { - return false; - } + public boolean isTrueVolatile() + { + return false; + } }; } @@ -416,8 +416,8 @@ public class QtVolatileImage extends VolatileImage public BufferedImage getSnapshot() { - BufferedImage bi = new BufferedImage(width, height, - BufferedImage.TYPE_INT_ARGB_PRE); + BufferedImage bi = new BufferedImage(width, height, + BufferedImage.TYPE_INT_ARGB_PRE); bi.setRGB( 0, 0, width, height, getPixels(), 0, width); return bi; } diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java index e0a9e8c55d9..2dfe2ec5a98 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtWindowPeer.java @@ -53,7 +53,7 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer { super.setup(); } - + // ************ Public methods ********************* public native void toBack(); @@ -68,7 +68,7 @@ public class QtWindowPeer extends QtContainerPeer implements WindowPeer public void updateAlwaysOnTop() { // TODO Auto-generated method stub - + } public boolean requestWindowFocus() diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java index 192d612ee79..1a42fc9532b 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingButtonPeer.java @@ -185,7 +185,7 @@ public class SwingButtonPeer par = button.getParent(); return par; } - + /** * Handles focus events by forwarding it to * processFocusEvent(). @@ -232,7 +232,7 @@ public class SwingButtonPeer for (int i = 0; i < l.length; ++i) l[i].actionPerformed(ev); } - + } /** diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java index 03d6388e9f2..7080831a23f 100755 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingCheckboxPeer.java @@ -62,7 +62,7 @@ public class SwingCheckboxPeer extends SwingComponentPeer implements /** * A spezialized Swing checkbox used to paint the checkbox for the - * AWT checkbox. + * AWT checkbox. */ private class SwingCheckbox extends JCheckBox @@ -211,7 +211,7 @@ public class SwingCheckboxPeer extends SwingComponentPeer implements * Receives notification when an action was performend on the button. * * @param event the action event - */ + */ public void itemStateChanged(ItemEvent event) { awtCheckbox.setState(event.getStateChange()==ItemEvent.SELECTED); @@ -224,7 +224,7 @@ public class SwingCheckboxPeer extends SwingComponentPeer implements l[i].itemStateChanged(ev); } } - + /** * Creates a new SwingCheckboxPeer instance. */ diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingComponent.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingComponent.java index d22f55d6f19..ca42fb748cc 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingComponent.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingComponent.java @@ -87,7 +87,7 @@ public interface SwingComponent * @param ev the key event */ void handleKeyEvent(KeyEvent ev); - + /** * Handles a focus event. This is usually forwarded to * {@link Component#processFocusEvent(FocusEvent)} of the swing diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java index 71a7bac4d00..8be95dcb724 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingComponentPeer.java @@ -195,7 +195,7 @@ public class SwingComponentPeer public Image createImage(ImageProducer prod) { Image image = Toolkit.getDefaultToolkit().createImage(prod); - return image; + return image; } /** @@ -379,7 +379,7 @@ public class SwingComponentPeer /** * 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 @@ -458,7 +458,7 @@ public class SwingComponentPeer /** * Returns true if the component can receive keyboard input * focus. This is called from {@link Component#isFocusTraversable()}. - * + * * This is implemented to return isFocusable() from the Swing component. * * @specnote Part of the earlier 1.1 API, replaced by isFocusable(). @@ -591,10 +591,10 @@ public class SwingComponentPeer /** * Requests that this component receives the focus. This is called from * {@link Component#requestFocus()}. - * + * * This calls requestFocus() on the Swing component. * - * @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. */ public void requestFocus() @@ -762,7 +762,7 @@ public class SwingComponentPeer swingComponent.getJComponent().setVisible(true); } - /** + /** * Get the graphics configuration of the component. The color model * of the component can be derived from the configuration. * @@ -845,7 +845,7 @@ public class SwingComponentPeer * Returns true, if this component can handle wheel scrolling, * false otherwise. * - * This is not yet implemented and returns false. + * This is not yet implemented and returns false. * * @return true, if this component can handle wheel scrolling, * false otherwise @@ -979,7 +979,7 @@ public class SwingComponentPeer /** * Reparent this component under another container. - * + * * @param parent * @since 1.5 */ @@ -1009,7 +1009,7 @@ public class SwingComponentPeer /** * Check if this component supports being reparented. - * + * * @return true if this component can be reparented, * false otherwise. * @since 1.5 @@ -1051,13 +1051,13 @@ public class SwingComponentPeer } finally { userGraphics.dispose(); } - + } /** * Paints the actual 'heavyweight' swing component, if there is one * associated to this peer. - * + * * @param g the graphics to paint the component with */ protected void peerPaintComponent(Graphics g) @@ -1115,7 +1115,7 @@ public class SwingComponentPeer swingComponent.handleFocusEvent(e); } - + /** * Returns the AWT component for this peer. * diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java index 2d5d97ff14b..ca3adc4c723 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingContainerPeer.java @@ -340,7 +340,7 @@ public class SwingContainerPeer } } } - + /** * Handles key events on the component. This is usually forwarded to the * SwingComponent's processKeyEvent() method. @@ -352,12 +352,12 @@ public class SwingContainerPeer Component owner = getFocusOwner(); if(owner != null) owner.getPeer().handleEvent(e); - else + else super.handleKeyEvent(e); } private Component focusOwner = null; - + private Component getFocusOwner() { if(focusOwner == null) @@ -369,10 +369,10 @@ public class SwingContainerPeer { focusOwner = child; break; - } + } } } return focusOwner; } - + } diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java index 55c394ecb6e..5c979d613c7 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingLabelPeer.java @@ -62,7 +62,7 @@ public class SwingLabelPeer { /** - * A spezialized Swing label used to paint the label for the AWT Label. + * A spezialized Swing label used to paint the label for the AWT Label. * * @author Roman Kennke (kennke@aicas.com) */ @@ -71,13 +71,13 @@ public class SwingLabelPeer implements SwingComponent { Label label; - - + + SwingLabel(Label label) { this.label = label; } - + /** * Returns this label. * diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingListPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingListPeer.java index 22a6052bb7e..cf766fd4f01 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingListPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingListPeer.java @@ -63,7 +63,7 @@ public class SwingListPeer { /** - * A spezialized Swing scroller used to hold the list. + * A spezialized Swing scroller used to hold the list. * * @author Roman Kennke (kennke@aicas.com) */ @@ -139,7 +139,7 @@ public class SwingListPeer processFocusEvent(ev); } - + /** * Overridden so that this method returns the correct value even without a * peer. @@ -356,7 +356,7 @@ public class SwingListPeer super.peerPaint(g, update); jList.doLayout(); jList.list(); - + Rectangle r = getBounds(); g.setColor(Color.RED); g.drawRect(r.x, r.y, r.width, r.height); diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java index 8b9d47ec015..721b3349f8f 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuItemPeer.java @@ -83,7 +83,7 @@ public class SwingMenuItemPeer event.setSource(awtMenuItem); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event); } - + } /** diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java index ecb54a52479..afe20616d92 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingMenuPeer.java @@ -140,7 +140,7 @@ public class SwingMenuPeer { MenuItem item = awtMenu.getItem(i); item.addNotify(); - SwingMenuItemPeer peer = (SwingMenuItemPeer) item.getPeer(); + SwingMenuItemPeer peer = (SwingMenuItemPeer) item.getPeer(); menu.add(peer.menuItem); } } diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingTextAreaPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingTextAreaPeer.java index 5be82f69593..d56e950ecf3 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingTextAreaPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingTextAreaPeer.java @@ -66,7 +66,7 @@ public class SwingTextAreaPeer { /** - * A spezialized Swing scroller used to hold the textarea. + * A spezialized Swing scroller used to hold the textarea. * * @author Roman Kennke (kennke@aicas.com) */ @@ -112,7 +112,7 @@ public class SwingTextAreaPeer else { ev.setSource(this); - this.dispatchEvent(ev); + this.dispatchEvent(ev); } } @@ -208,7 +208,7 @@ public class SwingTextAreaPeer par = SwingTextAreaPeer.this.awtComponent.getParent(); return par; } - + public void requestFocus() { SwingTextAreaPeer.this.requestFocus(awtComponent, false, true, 0); } @@ -311,7 +311,7 @@ public class SwingTextAreaPeer true, 0); } } - + /** * The actual JTextArea. */ @@ -349,7 +349,7 @@ public class SwingTextAreaPeer rows = 5; textArea.setRows(rows); } - + jTextArea.setColumns(columns); jTextArea.setRows(rows); } diff --git a/libjava/classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java b/libjava/classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java index 28dc5f339bf..9750c9bf7b1 100644 --- a/libjava/classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/swing/SwingTextFieldPeer.java @@ -76,7 +76,7 @@ public class SwingTextFieldPeer SwingTextField(TextField textField) { - this.textField = textField; + this.textField = textField; } /** @@ -173,7 +173,7 @@ public class SwingTextFieldPeer processFocusEvent(ev); } - + public Container getParent() { Container par = null; @@ -186,7 +186,7 @@ public class SwingTextFieldPeer { return SwingTextFieldPeer.this.getGraphics(); } - + public void requestFocus() { SwingTextFieldPeer.this.requestFocus(awtComponent, false, true, 0); } diff --git a/libjava/classpath/gnu/java/awt/peer/x/GLGraphics.java b/libjava/classpath/gnu/java/awt/peer/x/GLGraphics.java index dde5b919537..3cf3797ab19 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/GLGraphics.java +++ b/libjava/classpath/gnu/java/awt/peer/x/GLGraphics.java @@ -72,7 +72,7 @@ public class GLGraphics extends AbstractGraphics2D public void setBackground(Color b) { super.setBackground(b); - + gl.clearColor(b.getRed() / 255.F, b.getGreen() / 255.F, b.getBlue() / 255.F, b.getAlpha() / 255.F); } @@ -128,7 +128,7 @@ public class GLGraphics extends AbstractGraphics2D { // FIXME: not sure it's correct return new Rectangle(0, 0, - gl.display.default_screen.width, + gl.display.default_screen.width, gl.display.default_screen.height); } } diff --git a/libjava/classpath/gnu/java/awt/peer/x/KeyboardMapping.java b/libjava/classpath/gnu/java/awt/peer/x/KeyboardMapping.java index 8cda31d81dd..c982a30d5d7 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/KeyboardMapping.java +++ b/libjava/classpath/gnu/java/awt/peer/x/KeyboardMapping.java @@ -54,7 +54,7 @@ final class KeyboardMapping /** * Maps X keycodes to AWT keycodes. - * + * * @param xInput the X input event * @param xKeyCode the X keycode to map * @param xMods the X modifiers diff --git a/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java b/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java index 379839196b2..8e80b97a385 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java @@ -178,7 +178,7 @@ public class XEventPump { target = awtWindow; } - + MouseEvent mp = new MouseEvent(target, MouseEvent.MOUSE_PRESSED, System.currentTimeMillis(), KeyboardMapping.mapModifiers(event.getState()) @@ -187,26 +187,26 @@ public class XEventPump 1, false, button); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mp); } - + private void handleButtonRelease(ButtonRelease event) { Integer key = new Integer(event.getEventWindowID()); Window awtWindow = (Window) windows.get(key); int button = event.detail(); - + // AWT cannot handle more than 3 buttons and expects 0 instead. if (button >= gnu.x11.Input.BUTTON3) button = 0; drag = -1; - + Component target = findMouseEventTarget(awtWindow, event.getEventX(), event.getEventY()); if(target == null) { target = awtWindow; } - + MouseEvent mr = new MouseEvent(target, MouseEvent.MOUSE_RELEASED, System.currentTimeMillis(), KeyboardMapping.mapModifiers(event.getState()) @@ -215,15 +215,15 @@ public class XEventPump 1, false, button); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mr); } - - + + private void handleMotionNotify(MotionNotify event) { Integer key = new Integer(event.getEventWindowID()); Window awtWindow = (Window) windows.get(key); int button = event.detail(); - + // AWT cannot handle more than 3 buttons and expects 0 instead. if (button >= gnu.x11.Input.BUTTON3) button = 0; @@ -250,26 +250,26 @@ public class XEventPump } Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(mm); } - + // FIME: refactor and make faster, maybe caching the event and handle // and/or check timing (timing is generated for PropertyChange)? private void handleExpose(Expose event) { Integer key = new Integer(event.window_id); Window awtWindow = (Window) windows.get(key); - + if (XToolkit.DEBUG) System.err.println("expose request for window id: " + key); - + Rectangle r = new Rectangle(event.x(), event.y(), event.width(), event.height()); // We need to clear the background of the exposed rectangle. assert awtWindow != null : "awtWindow == null for window ID: " + key; - + Graphics g = awtWindow.getGraphics(); g.clearRect(r.x, r.y, r.width, r.height); g.dispose(); - + XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer(); Insets i = xwindow.insets(); if (event.width() != awtWindow.getWidth() - i.left - i.right @@ -279,75 +279,75 @@ public class XEventPump int h = event.height(); int x = xwindow.xwindow.x; int y = xwindow.xwindow.y; - + if (XToolkit.DEBUG) System.err.println("Setting size on AWT window: " + w + ", " + h + ", " + awtWindow.getWidth() + ", " + awtWindow.getHeight()); - + // new width and height xwindow.xwindow.width = w; xwindow.xwindow.height = h; - + // reshape the window ComponentReshapeEvent cre = new ComponentReshapeEvent(awtWindow, x, y, w, h); awtWindow.dispatchEvent(cre); } - + ComponentEvent ce = new ComponentEvent(awtWindow, ComponentEvent.COMPONENT_RESIZED); awtWindow.dispatchEvent(ce); - + PaintEvent pev = new PaintEvent(awtWindow, PaintEvent.UPDATE, r); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(pev); } - + private void handleDestroyNotify(DestroyNotify destroyNotify) { if (XToolkit.DEBUG) System.err.println("DestroyNotify event: " + destroyNotify); - + Integer key = new Integer(destroyNotify.event_window_id); Window awtWindow = (Window) windows.get(key); - + AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSED); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event); } - + private void handleClientMessage(ClientMessage clientMessage) { if (XToolkit.DEBUG) System.err.println("ClientMessage event: " + clientMessage); - + if (clientMessage.delete_window()) { if (XToolkit.DEBUG) System.err.println("ClientMessage is a delete_window event"); - + Integer key = new Integer(clientMessage.window_id); Window awtWindow = (Window) windows.get(key); - + AWTEvent event = new WindowEvent(awtWindow, WindowEvent.WINDOW_CLOSING); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(event); } } - + private void handleEvent(Event xEvent) { if (XToolkit.DEBUG) System.err.println("fetched event: " + xEvent); - + switch (xEvent.code() & 0x7f) { case ButtonPress.CODE: this.handleButtonPress((ButtonPress) xEvent); break; case ButtonRelease.CODE: - this.handleButtonRelease((ButtonRelease) xEvent); + this.handleButtonRelease((ButtonRelease) xEvent); break; case MotionNotify.CODE: - this.handleMotionNotify((MotionNotify) xEvent); + this.handleMotionNotify((MotionNotify) xEvent); break; case Expose.CODE: this.handleExpose((Expose) xEvent); @@ -410,7 +410,7 @@ public class XEventPump keyChar); Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(ke); } - + } else { @@ -438,9 +438,9 @@ public class XEventPump return MouseEvent.BUTTON3_DOWN_MASK | MouseEvent.BUTTON3_MASK; } - return 0; + return 0; } - + /** * Finds the heavyweight mouse event target. * diff --git a/libjava/classpath/gnu/java/awt/peer/x/XFontPeer.java b/libjava/classpath/gnu/java/awt/peer/x/XFontPeer.java index 4372c965ffe..1902090140f 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XFontPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XFontPeer.java @@ -98,12 +98,12 @@ public class XFontPeer { /** * The ascent of the font. - */ + */ int ascent; /** * The descent of the font. - */ + */ int descent; /** @@ -253,7 +253,7 @@ public class XFontPeer * * @param c the char buffer holding the string * @param offset the starting offset of the string in the buffer - * @param length the number of characters in the string buffer + * @param length the number of characters in the string buffer * * @return the overall width of the specified string */ @@ -393,7 +393,7 @@ public class XFontPeer { return 1.F; // TODO: Provided by X?? } - + } /** @@ -410,7 +410,7 @@ public class XFontPeer /** * The font metrics for this font. */ - XFontMetrics fontMetrics; + XFontMetrics fontMetrics; /** * Creates a new XFontPeer for the specified font name, style and size. @@ -694,7 +694,7 @@ public class XFontPeer case Font.PLAIN: default: key.append("plain"); - + } String protoType = fontProperties.getProperty(key.toString()); diff --git a/libjava/classpath/gnu/java/awt/peer/x/XFramePeer.java b/libjava/classpath/gnu/java/awt/peer/x/XFramePeer.java index a355c68b383..cde67778d9f 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XFramePeer.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XFramePeer.java @@ -107,10 +107,10 @@ public class XFramePeer // TODO: Implement this. throw new UnsupportedOperationException("Not yet implemented."); } - + /** * Check if this frame peer supports being restacked. - * + * * @return true if this frame peer can be restacked, * false otherwise * @since 1.5 @@ -120,10 +120,10 @@ public class XFramePeer // TODO: Implement this. throw new UnsupportedOperationException("Not yet implemented."); } - + /** * 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 diff --git a/libjava/classpath/gnu/java/awt/peer/x/XGraphics2D.java b/libjava/classpath/gnu/java/awt/peer/x/XGraphics2D.java index 0339a424dac..1fce2dcf781 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XGraphics2D.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XGraphics2D.java @@ -325,7 +325,7 @@ public class XGraphics2D colorMap.put(c, col); }*/ //xgc.set_foreground(col); - + xgc.set_foreground(c.getRGB()); foreground = c; } @@ -394,19 +394,19 @@ public class XGraphics2D xdrawable.put_image(xgc, zpixmap, x, y); imageCache.put(image, zpixmap); } else { - + // TODO optimize reusing the rectangles Rectangle source = new Rectangle(0, 0, xdrawable.width, xdrawable.height); Rectangle target = new Rectangle(x, y, w, h); - - Rectangle destination = source.intersection(target); - + + Rectangle destination = source.intersection(target); + x = destination.x; y = destination.y; w = destination.width; h = destination.height; - + ZPixmap zpixmap = (ZPixmap) xdrawable.image(x, y, w, h, 0xffffffff, @@ -506,4 +506,3 @@ public class XGraphics2D } } - diff --git a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java index becb92a7d72..aed11a3afe2 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsConfiguration.java @@ -127,7 +127,7 @@ public class XGraphicsConfiguration throw new UnsupportedOperationException("Not yet implemented"); default: throw new IllegalArgumentException("Unknown transparency type: " - + transparency); + + transparency); } return im; } @@ -159,8 +159,8 @@ public class XGraphicsConfiguration { Display d = device.getDisplay(); Screen screen = d.default_screen; - - return new Rectangle(0, 0, screen.width, screen.height); + + return new Rectangle(0, 0, screen.width, screen.height); } /** diff --git a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java index ca37f3adbbd..6b65e14edf5 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsDevice.java @@ -136,7 +136,7 @@ public class XGraphicsDevice } catch (EscherServerConnectionException e) { - throw new RuntimeException(e.getCause()); + throw new RuntimeException(e.getCause()); } } } @@ -155,7 +155,7 @@ public class XGraphicsDevice throw new RuntimeException(e.getCause()); } } - + eventPump = new XEventPump(display); } return display; @@ -167,7 +167,7 @@ public class XGraphicsDevice } /** - * Tries to load the LocalSocket class and initiate a connection to the + * Tries to load the LocalSocket class and initiate a connection to the * local X server. */ private Socket createLocalSocket() diff --git a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java index 8ec8d57bb90..7b1d82fee49 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XGraphicsEnvironment.java @@ -130,7 +130,7 @@ public class XGraphicsEnvironment defaultDevice = initDefaultDevice(); devices = new XGraphicsDevice[]{ defaultDevice }; } - + } /** diff --git a/libjava/classpath/gnu/java/awt/peer/x/XImage.java b/libjava/classpath/gnu/java/awt/peer/x/XImage.java index fa94d00c131..f3df89f4dff 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XImage.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XImage.java @@ -81,7 +81,7 @@ public class XImage public ImageProducer getSource() { - return new XImageProducer(); + return new XImageProducer(); } /** @@ -113,11 +113,11 @@ public class XImage { pixmap.free(); } - + protected class XImageProducer implements ImageProducer { private Vector consumers = new Vector(); - + public void addConsumer(ImageConsumer ic) { if (ic != null && !isConsumer(ic)) @@ -148,30 +148,30 @@ public class XImage { int width = XImage.this.getWidth(null); int height = XImage.this.getHeight(null); - + XGraphics2D graphics = (XGraphics2D) getGraphics(); ColorModel model = graphics.getColorModel(); graphics.dispose(); - + ZPixmap zpixmap = (ZPixmap) XImage.this.pixmap.image(0, 0, width, height, 0xffffffff, gnu.x11.image.Image.Format.ZPIXMAP); - + int size = zpixmap.get_data_length(); System.out.println("size: " + size + ", w = " + width + ", h = " + height); - + int [] pixel = new int[size]; for (int i = 0; i < size; i++) pixel[i] = zpixmap.get_data_element(i); consumer.setHints(ImageConsumer.SINGLEPASS); - + consumer.setDimensions(width, height); consumer.setPixels(0, 0, width, height, model, pixel, 0, width); consumer.imageComplete(ImageConsumer.STATICIMAGEDONE); } - + System.out.println("done!"); } } diff --git a/libjava/classpath/gnu/java/awt/peer/x/XToolkit.java b/libjava/classpath/gnu/java/awt/peer/x/XToolkit.java index af12574a150..a3eeb0f5339 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XToolkit.java @@ -239,23 +239,23 @@ public class XToolkit protected ButtonPeer createButton(Button target) { checkHeadLess("No ButtonPeer can be created in an headless" + - "graphics environment."); - + "graphics environment."); + return new SwingButtonPeer(target); } protected TextFieldPeer createTextField(TextField target) { checkHeadLess("No TextFieldPeer can be created in an headless " + - "graphics environment."); - + "graphics environment."); + return new SwingTextFieldPeer(target); } protected LabelPeer createLabel(Label target) { checkHeadLess("No LabelPeer can be created in an headless graphics " + - "environment."); + "environment."); return new SwingLabelPeer(target); } @@ -269,7 +269,7 @@ public class XToolkit { checkHeadLess("No CheckboxPeer can be created in an headless graphics " + "environment."); - + return new SwingCheckboxPeer(target); } @@ -288,8 +288,8 @@ public class XToolkit protected TextAreaPeer createTextArea(TextArea target) { checkHeadLess("No TextAreaPeer can be created in an headless graphics " + - "environment."); - + "environment."); + return new SwingTextAreaPeer(target); } @@ -518,7 +518,7 @@ public class XToolkit /** * Creates an image that is returned when calls to createImage() yields an * error. - * + * * @return an image that is returned when calls to createImage() yields an * error */ @@ -660,7 +660,7 @@ public class XToolkit { if(message == null) message = "This method cannot be called in headless mode."; - + throw new HeadlessException(message); } } diff --git a/libjava/classpath/gnu/java/awt/peer/x/XWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/x/XWindowPeer.java index 930247da5c2..541eb74fa3f 100644 --- a/libjava/classpath/gnu/java/awt/peer/x/XWindowPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/x/XWindowPeer.java @@ -80,7 +80,7 @@ public class XWindowPeer | Event.KEY_RELEASE_MASK //| Event.VISIBILITY_CHANGE_MASK // ; - + /** * The X window. */ @@ -105,10 +105,10 @@ public class XWindowPeer int h = Math.max(window.getHeight(), 1); xwindow = new Window(dev.getDisplay().default_root, x, y, w, h, 0, atts); xwindow.select_input(standardSelect); - + dev.getEventPump().registerWindow(xwindow, window); xwindow.set_wm_delete_window(); - + boolean undecorated; if (awtComponent instanceof Frame) { @@ -178,11 +178,11 @@ public class XWindowPeer */ public Graphics getGraphics() { - XGraphics2D xg2d = new XGraphics2D(xwindow); - xg2d.setColor(awtComponent.getForeground()); - xg2d.setBackground(awtComponent.getBackground()); - xg2d.setFont(awtComponent.getFont()); - return xg2d; + XGraphics2D xg2d = new XGraphics2D(xwindow); + xg2d.setColor(awtComponent.getForeground()); + xg2d.setBackground(awtComponent.getBackground()); + xg2d.setFont(awtComponent.getFont()); + return xg2d; } public Image createImage(int w, int h) @@ -226,7 +226,7 @@ public class XWindowPeer // // Reset input selection. // atts.set_override_redirect(false); // xwindow.change_attributes(atts); - + // Determine the frame insets. Atom atom = (Atom) Atom.intern(dev.getDisplay(), "_NET_FRAME_EXTENTS"); Window.Property p = xwindow.get_property(false, atom, Atom.CARDINAL, 0, @@ -295,7 +295,7 @@ public class XWindowPeer XGraphicsDevice dev = XToolkit.getDefaultDevice(); dev.getEventPump().unregisterWindow(xwindow); } - + public Window getXwindow() { return xwindow; diff --git a/libjava/classpath/gnu/java/awt/print/JavaPrinterGraphics.java b/libjava/classpath/gnu/java/awt/print/JavaPrinterGraphics.java index b86eea50b20..64d197cd00f 100644 --- a/libjava/classpath/gnu/java/awt/print/JavaPrinterGraphics.java +++ b/libjava/classpath/gnu/java/awt/print/JavaPrinterGraphics.java @@ -107,47 +107,47 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics * If Pageable is non-null, it will print that, otherwise it will use * the supplied printable and pageFormat. */ - public SpooledDocument spoolPostScript(Printable printable, - PageFormat pageFormat, - Pageable pageable) + public SpooledDocument spoolPostScript(Printable printable, + PageFormat pageFormat, + Pageable pageable) throws PrinterException { - try + try { - // spool to a temporary file - File temp = File.createTempFile("cpspool", ".ps"); - temp.deleteOnExit(); - - PrintWriter out = new PrintWriter - (new BufferedWriter - (new OutputStreamWriter - (new FileOutputStream(temp), "ISO8859_1"), 1000000)); + // spool to a temporary file + File temp = File.createTempFile("cpspool", ".ps"); + temp.deleteOnExit(); - writePSHeader(out); - - if(pageable != null) - { - for(int index = 0; index < pageable.getNumberOfPages(); index++) - spoolPage(out, pageable.getPrintable(index), - pageable.getPageFormat(index), index); - } - else - { - int index = 0; - while(spoolPage(out, printable, pageFormat, index++) == - Printable.PAGE_EXISTS) + PrintWriter out = new PrintWriter + (new BufferedWriter + (new OutputStreamWriter + (new FileOutputStream(temp), "ISO8859_1"), 1000000)); + + writePSHeader(out); + + if(pageable != null) + { + for(int index = 0; index < pageable.getNumberOfPages(); index++) + spoolPage(out, pageable.getPrintable(index), + pageable.getPageFormat(index), index); + } + else + { + int index = 0; + while(spoolPage(out, printable, pageFormat, index++) == + Printable.PAGE_EXISTS) ; - } - out.println("%%Trailer"); - out.println("%%EOF"); - out.close(); - return new SpooledDocument( temp ); - } - catch (IOException e) + } + out.println("%%Trailer"); + out.println("%%EOF"); + out.close(); + return new SpooledDocument( temp ); + } + catch (IOException e) { - PrinterException pe = new PrinterException(); - pe.initCause(e); - throw pe; + PrinterException pe = new PrinterException(); + pe.initCause(e); + throw pe; } } @@ -156,9 +156,9 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics * PAGE_EXISTS if it was. */ public int spoolPage(PrintWriter out, - Printable printable, - PageFormat pageFormat, - int index) throws IOException, PrinterException + Printable printable, + PageFormat pageFormat, + int index) throws IOException, PrinterException { initImage( pageFormat ); if(printable.print(this, pageFormat, index) == Printable.NO_SUCH_PAGE) @@ -168,22 +168,22 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics writePage( out, pageFormat ); return Printable.PAGE_EXISTS; } - + private void initImage(PageFormat pageFormat) { // Create a really big image and draw to that. xSize = (int)(DPI*pageFormat.getWidth()/72.0); ySize = (int)(DPI*pageFormat.getHeight()/72.0); - + // Swap X and Y sizes if it's a Landscape page. if( pageFormat.getOrientation() != PageFormat.PORTRAIT ) { - int t = xSize; - xSize = ySize; - ySize = t; + int t = xSize; + xSize = ySize; + ySize = t; } - // FIXME: This should at least be BufferedImage. + // FIXME: This should at least be BufferedImage. // Fix once we have a working B.I. // Graphics2D should also be supported of course. image = CairoSurface.getBufferedImage(xSize, ySize); @@ -196,7 +196,7 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics private void writePSHeader(PrintWriter out) { - out.println("%!PS-Adobe-3.0"); + out.println("%!PS-Adobe-3.0"); out.println("%%Title: "+printerJob.getJobName()); out.println("%%Creator: GNU Classpath "); out.println("%%DocumentData: Clean8Bit"); @@ -204,19 +204,19 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics out.println("%%DocumentNeededResources: font Times-Roman Helvetica Courier"); // out.println("%%Pages: "+); // FIXME # pages. out.println("%%EndComments"); - + out.println("%%BeginProlog"); out.println("%%EndProlog"); out.println("%%BeginSetup"); - + // FIXME: Paper name // E.g. "A4" "Letter" // out.println("%%BeginFeature: *PageSize A4"); - + out.println("%%EndFeature"); out.println("%%EndSetup"); - + // out.println("%%Page: 1 1"); } @@ -232,14 +232,14 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics out.println( "%%Orientation: Portrait" ); else { - out.println( "%%Orientation: Landscape" ); - double t = pWidth; - pWidth = pHeight; - pHeight = t; + out.println( "%%Orientation: Landscape" ); + double t = pWidth; + pWidth = pHeight; + pHeight = t; } - + out.println("gsave % first save"); - + // 595x842; 612x792 respectively out.println("<< /PageSize [" +pWidth + " "+pHeight+ "] >> setpagedevice"); @@ -247,8 +247,8 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics AffineTransform pageTransform = new AffineTransform(); if( pageFormat.getOrientation() == PageFormat.REVERSE_LANDSCAPE ) { - pageTransform.translate(pWidth, pHeight); - pageTransform.scale(-1.0, -1.0); + pageTransform.translate(pWidth, pHeight); + pageTransform.scale(-1.0, -1.0); } concatCTM(out, pageTransform); out.println("%%EndPageSetup"); @@ -257,7 +257,7 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics // Draw the image - out.println(xSize+" "+ySize+" 8 [1 0 0 -1 0 "+ySize+" ]"); + out.println(xSize+" "+ySize+" 8 [1 0 0 -1 0 "+ySize+" ]"); out.println("{currentfile 3 string readhexstring pop} bind"); out.println("false 3 colorimage"); int[] pixels = new int[xSize * ySize]; @@ -272,19 +272,19 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics int n = 0; for (int j = 0; j < ySize; j++) { for (int i = 0; i < xSize; i++) { - out.print( colorTripleHex(pixels[j * xSize + i]) ); - if(((++n)%11) == 0) out.println(); + out.print( colorTripleHex(pixels[j * xSize + i]) ); + if(((++n)%11) == 0) out.println(); } } - + out.println(); out.println("%%EOF"); out.println("grestore"); out.println("showpage"); } - + /** - * Get a nonsperated hex RGB triple, e.g. FFFFFF = white + * Get a nonsperated hex RGB triple, e.g. FFFFFF = white */ private String colorTripleHex(int num){ String s = ""; @@ -292,10 +292,10 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics try { s = Integer.toHexString( ( num & 0x00FFFFFF ) ); if( s.length() < 6 ) - { - s = "000000"+s; - return s.substring(s.length()-6); - } + { + s = "000000"+s; + return s.substring(s.length()-6); + } } catch (Exception e){ s = "FFFFFF"; } @@ -306,7 +306,7 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics private void concatCTM(PrintWriter out, AffineTransform Tx){ double[] matrixElements = new double[6]; Tx.getMatrix(matrixElements); - + out.print("[ "); for(int i=0;i<6;i++) out.print(matrixElements[i]+" "); @@ -349,14 +349,14 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics { } - public void drawArc(int x, int y, int width, int height, int startAngle, - int arcAngle) + public void drawArc(int x, int y, int width, int height, int startAngle, + int arcAngle) { g.drawArc(x, y, width, height, startAngle, arcAngle); } - public boolean drawImage(Image img, int x, int y, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image img, int x, int y, Color bgcolor, + ImageObserver observer) { return g.drawImage(img, x, y, bgcolor, observer); } @@ -366,31 +366,31 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics return g.drawImage(img, x, y, observer); } - public boolean drawImage(Image img, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + public boolean drawImage(Image img, int x, int y, int width, int height, + Color bgcolor, ImageObserver observer) { return g.drawImage(img, x, y, width, height, bgcolor, observer); } - public boolean drawImage(Image img, int x, int y, int width, int height, - ImageObserver observer) + public boolean drawImage(Image img, int x, int y, int width, int height, + ImageObserver observer) { return g.drawImage(img, x, y, width, height, observer); } - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, Color bgcolor, - ImageObserver observer) + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, Color bgcolor, + ImageObserver observer) { - return g.drawImage(img, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, bgcolor, observer); + return g.drawImage(img, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, bgcolor, observer); } - public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, - int sx1, int sy1, int sx2, int sy2, ImageObserver observer) + public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, + int sx1, int sy1, int sx2, int sy2, ImageObserver observer) { - return g.drawImage(img, dx1, dy1, dx2, dy2, - sx1, sy1, sx2, sy2, observer); + return g.drawImage(img, dx1, dy1, dx2, dy2, + sx1, sy1, sx2, sy2, observer); } public void drawLine(int x1, int y1, int x2, int y2) @@ -413,8 +413,8 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics g.drawPolyline(xPoints, yPoints, nPoints); } - public void drawRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void drawRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { g.drawRoundRect(x, y, width, height, arcWidth, arcHeight); } @@ -429,8 +429,8 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics g.drawString(str, x, y); } - public void fillArc(int x, int y, int width, int height, - int startAngle, int arcAngle) + public void fillArc(int x, int y, int width, int height, + int startAngle, int arcAngle) { g.fillArc(x, y, width, height, startAngle, arcAngle); } @@ -450,8 +450,8 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics g.fillRect(x, y, width, height); } - public void fillRoundRect(int x, int y, int width, int height, - int arcWidth, int arcHeight) + public void fillRoundRect(int x, int y, int width, int height, + int arcWidth, int arcHeight) { g.fillRoundRect(x, y, width, height, arcWidth, arcHeight); } @@ -516,4 +516,3 @@ public class JavaPrinterGraphics extends Graphics implements PrinterGraphics g.translate(x, y); } } - diff --git a/libjava/classpath/gnu/java/awt/print/JavaPrinterJob.java b/libjava/classpath/gnu/java/awt/print/JavaPrinterJob.java index adeeba04a1d..295d231cbd7 100644 --- a/libjava/classpath/gnu/java/awt/print/JavaPrinterJob.java +++ b/libjava/classpath/gnu/java/awt/print/JavaPrinterJob.java @@ -113,15 +113,15 @@ public class JavaPrinterJob extends PrinterJob { // lookup all services without any constraints services = PrintServiceLookup.lookupPrintServices - (DocFlavor.INPUT_STREAM.POSTSCRIPT, null); + (DocFlavor.INPUT_STREAM.POSTSCRIPT, null); } private static final Class copyClass = (new Copies(1)).getClass(); private static final Class jobNameClass = (new JobName("", null)).getClass(); private static final Class userNameClass = (new RequestingUserName("", null)).getClass(); - + /** - * Initializes a new instance of PrinterJob. + * Initializes a new instance of PrinterJob. */ public JavaPrinterJob() { @@ -143,7 +143,7 @@ public class JavaPrinterJob extends PrinterJob else if( orientation.equals(OrientationRequested.LANDSCAPE) ) pageFormat.setOrientation(PageFormat.LANDSCAPE); else if( orientation.equals(OrientationRequested.REVERSE_LANDSCAPE) ) - pageFormat.setOrientation(PageFormat.REVERSE_LANDSCAPE); + pageFormat.setOrientation(PageFormat.REVERSE_LANDSCAPE); } /** @@ -203,11 +203,11 @@ public class JavaPrinterJob extends PrinterJob { try { - if(printJob != null && (printJob instanceof CancelablePrintJob)) - { - ((CancelablePrintJob)printJob).cancel(); - cancelled = true; - } + if(printJob != null && (printJob instanceof CancelablePrintJob)) + { + ((CancelablePrintJob)printJob).cancel(); + cancelled = true; + } } catch(PrintException pe) { @@ -261,20 +261,20 @@ public class JavaPrinterJob extends PrinterJob return; PostScriptGraphics2D pg = new PostScriptGraphics2D( this ); - SpooledDocument doc = pg.spoolPostScript( printable, pageFormat, - pageable ); + SpooledDocument doc = pg.spoolPostScript( printable, pageFormat, + pageable ); cancelled = false; printJob = printer.createPrintJob(); try { - printJob.print(doc, attributes); + printJob.print(doc, attributes); } - catch (PrintException pe) + catch (PrintException pe) { - PrinterException p = new PrinterException(); - p.initCause(pe); - throw p; + PrinterException p = new PrinterException(); + p.initCause(pe); + throw p; } // no printjob active. printJob = null; @@ -313,22 +313,22 @@ public class JavaPrinterJob extends PrinterJob throws HeadlessException { PrintService chosenPrinter = ServiceUI.printDialog - (null, 50, 50, services, null, + (null, 50, 50, services, null, DocFlavor.INPUT_STREAM.POSTSCRIPT, attributes); getPageAttributes(); if( chosenPrinter != null ) { - try - { - setPrintService( chosenPrinter ); - } - catch(PrinterException pe) - { - // Should not happen. - } - return true; + try + { + setPrintService( chosenPrinter ); + } + catch(PrinterException pe) + { + // Should not happen. + } + return true; } return false; } diff --git a/libjava/classpath/gnu/java/awt/print/PostScriptGraphics2D.java b/libjava/classpath/gnu/java/awt/print/PostScriptGraphics2D.java index 01894e5a43e..10fc25c2f92 100644 --- a/libjava/classpath/gnu/java/awt/print/PostScriptGraphics2D.java +++ b/libjava/classpath/gnu/java/awt/print/PostScriptGraphics2D.java @@ -126,7 +126,7 @@ class PostScriptGraphics2D extends Graphics2D private double Y = pageY; private boolean gradientOn = false; - /** + /** * Constructor * */ @@ -162,74 +162,74 @@ class PostScriptGraphics2D extends Graphics2D * If Pageable is non-null, it will print that, otherwise it will use * the supplied printable and pageFormat. */ - public SpooledDocument spoolPostScript(Printable printable, - PageFormat pageFormat, - Pageable pageable) + public SpooledDocument spoolPostScript(Printable printable, + PageFormat pageFormat, + Pageable pageable) throws PrinterException { - try + try { - // spool to a temporary file - File temp = File.createTempFile("cpspool", ".ps"); - temp.deleteOnExit(); - - out = new PrintWriter(new BufferedWriter - (new OutputStreamWriter - (new FileOutputStream(temp), - "ISO8859_1"), 1000000)); - - writePSHeader(); - - if(pageable != null) - { - for(int index = 0; index < pageable.getNumberOfPages(); index++) - spoolPage(out, pageable.getPrintable(index), - pageable.getPageFormat(index), index); - } - else - { - int index = 0; - while(spoolPage(out, printable, pageFormat, index++) == - Printable.PAGE_EXISTS) + // spool to a temporary file + File temp = File.createTempFile("cpspool", ".ps"); + temp.deleteOnExit(); + + out = new PrintWriter(new BufferedWriter + (new OutputStreamWriter + (new FileOutputStream(temp), + "ISO8859_1"), 1000000)); + + writePSHeader(); + + if(pageable != null) + { + for(int index = 0; index < pageable.getNumberOfPages(); index++) + spoolPage(out, pageable.getPrintable(index), + pageable.getPageFormat(index), index); + } + else + { + int index = 0; + while(spoolPage(out, printable, pageFormat, index++) == + Printable.PAGE_EXISTS) ; - } - out.println("%%Trailer"); - out.println("%%EOF"); - out.close(); - return new SpooledDocument( temp ); - } - catch (IOException e) + } + out.println("%%Trailer"); + out.println("%%EOF"); + out.close(); + return new SpooledDocument( temp ); + } + catch (IOException e) { - PrinterException pe = new PrinterException(); - pe.initCause(e); - throw pe; + PrinterException pe = new PrinterException(); + pe.initCause(e); + throw pe; } } //-------------------------------------------------------------------------- - /** + /** * Write the postscript file header, - * setup the page format and transforms. + * setup the page format and transforms. */ private void writePSHeader() { - out.println("%!PS-Adobe-3.0"); + out.println("%!PS-Adobe-3.0"); out.println("%%Title: "+printerJob.getJobName()); out.println("%%Creator: GNU Classpath "); out.println("%%DocumentData: Clean8Bit"); out.println("%%DocumentNeededResources: font Times-Roman Helvetica Courier"); out.println("%%EndComments"); - + out.println("%%BeginProlog"); out.println("%%EndProlog"); out.println("%%BeginSetup"); - + out.println("%%EndFeature"); setupFonts(); out.println("%%EndSetup"); - + // set default fonts and colors setFont( new Font("Dialog", Font.PLAIN, 12) ); currentColor = Color.white; @@ -268,9 +268,9 @@ class PostScriptGraphics2D extends Graphics2D * PAGE_EXISTS if it was. */ public int spoolPage(PrintWriter out, - Printable printable, - PageFormat pageFormat, - int index) throws IOException, PrinterException + Printable printable, + PageFormat pageFormat, + int index) throws IOException, PrinterException { out.println("%%BeginPageSetup"); @@ -282,23 +282,23 @@ class PostScriptGraphics2D extends Graphics2D out.println( "%%Orientation: Portrait" ); else { - out.println( "%%Orientation: Landscape" ); - double t = pageX; - pageX = pageY; - pageY = t; + out.println( "%%Orientation: Landscape" ); + double t = pageX; + pageX = pageY; + pageY = t; } - + setClip(0, 0, (int)pageX, (int)pageY); out.println("gsave % first save"); - + // 595x842; 612x792 respectively out.println("<< /PageSize [" +pageX + " "+pageY+ "] >> setpagedevice"); if( pageFormat.getOrientation() != PageFormat.LANDSCAPE ) { - pageTransform.translate(pageX, 0); - pageTransform.scale(-1.0, 1.0); + pageTransform.translate(pageX, 0); + pageTransform.scale(-1.0, 1.0); } // save the original CTM @@ -312,7 +312,7 @@ class PostScriptGraphics2D extends Graphics2D if( printable.print(this, pageFormat, index) == Printable.NO_SUCH_PAGE ) return Printable.NO_SUCH_PAGE; - + out.println("grestore"); out.println("showpage"); @@ -417,7 +417,7 @@ class PostScriptGraphics2D extends Graphics2D setStroke(currentStroke); } - //--------------- Image drawing ------------------------------------------ + //--------------- Image drawing ------------------------------------------ public boolean drawImage(Image img, int x, int y, Color bgcolor, ImageObserver observer) { @@ -425,7 +425,7 @@ class PostScriptGraphics2D extends Graphics2D int h = img.getHeight(null); return drawImage(img, x, y, x + w, y + h, 0, 0, w - 1, h - 1, bgcolor, - observer); + observer); } public boolean drawImage(Image img, int dx1, int dy1, int dx2, int dy2, @@ -439,31 +439,31 @@ class PostScriptGraphics2D extends Graphics2D // swap X and Y's if (sx1 > sx2) { - n = sx1; - sx1 = sx2; - sx2 = n; - flipx = ! flipx; + n = sx1; + sx1 = sx2; + sx2 = n; + flipx = ! flipx; } if (sy1 > sy2) { - n = sy1; - sy1 = sy2; - sy2 = n; - flipy = ! flipy; + n = sy1; + sy1 = sy2; + sy2 = n; + flipy = ! flipy; } if (dx1 > dx2) { - n = dx1; - dx1 = dx2; - dx2 = n; - flipx = ! flipx; + n = dx1; + dx1 = dx2; + dx2 = n; + flipx = ! flipx; } if (dy1 > dy2) { - n = dy1; - dy1 = dy2; - dy2 = n; - flipy = ! flipy; + n = dy1; + dy1 = dy2; + dy2 = n; + flipy = ! flipy; } n = 0; int sw = sx2 - sx1; // source width @@ -487,28 +487,28 @@ class PostScriptGraphics2D extends Graphics2D PixelGrabber pg = new PixelGrabber(img, sx1, sy1, sw, sh, pixels, 0, sw); try { - pg.grabPixels(); + pg.grabPixels(); } catch (InterruptedException e) { - System.err.println("interrupted waiting for pixels!"); - return (false); + System.err.println("interrupted waiting for pixels!"); + return (false); } if ((pg.getStatus() & ImageObserver.ABORT) != 0) { - System.err.println("image fetch aborted or errored"); - return (false); + System.err.println("image fetch aborted or errored"); + return (false); } for (int j = 0; j < sh; j++) { - for (int i = 0; i < sw; i++) - { - out.print(colorTripleHex(new Color(pixels[j * sw + i]))); - if (((++n) % 11) == 0) - out.println(); - } + for (int i = 0; i < sw; i++) + { + out.print(colorTripleHex(new Color(pixels[j * sw + i]))); + if (((++n) % 11) == 0) + out.println(); + } } out.println(); @@ -522,7 +522,7 @@ class PostScriptGraphics2D extends Graphics2D ImageObserver observer) { return drawImage(img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null, - observer); + observer); } public boolean drawImage(Image img, int x, int y, ImageObserver observer) @@ -531,18 +531,18 @@ class PostScriptGraphics2D extends Graphics2D } public boolean drawImage(Image img, int x, int y, int width, int height, - Color bgcolor, ImageObserver observer) + Color bgcolor, ImageObserver observer) { int sw = img.getWidth(null); int sh = img.getHeight(null); return drawImage(img, x, y, x + width, y + height, /* destination */ - 0, 0, sw - 1, sh - 1, /* source */ - bgcolor, observer); + 0, 0, sw - 1, sh - 1, /* source */ + bgcolor, observer); // correct? } public boolean drawImage(Image img, int x, int y, int width, int height, - ImageObserver observer) + ImageObserver observer) { return drawImage(img, x, y, width, height, null, observer); } @@ -602,8 +602,8 @@ class PostScriptGraphics2D extends Graphics2D if( currentFontIsPS ) { - drawStringPSFont(str, x, y); - return; + drawStringPSFont(str, x, y); + return; } TextLayout text = new TextLayout(str, currentFont, getFontRenderContext()); @@ -626,22 +626,22 @@ class PostScriptGraphics2D extends Graphics2D popCTM(); pushCTM(); - double[] test = + double[] test = { - pageTransform.getScaleX(), pageTransform.getShearY(), - pageTransform.getShearX(), pageTransform.getScaleY(), - pageTransform.getTranslateX(), - -pageTransform.getTranslateY() + pageY + pageTransform.getScaleX(), pageTransform.getShearY(), + pageTransform.getShearX(), pageTransform.getScaleY(), + pageTransform.getTranslateX(), + -pageTransform.getTranslateY() + pageY }; - double[] test2 = + double[] test2 = { - currentTransform.getScaleX(), - currentTransform.getShearY(), - -currentTransform.getShearX(), - -currentTransform.getScaleY(), - currentTransform.getTranslateX(), - currentTransform.getTranslateY() + currentTransform.getScaleX(), + currentTransform.getShearY(), + -currentTransform.getShearX(), + -currentTransform.getScaleY(), + currentTransform.getTranslateX(), + currentTransform.getTranslateY() }; AffineTransform total = new AffineTransform(test); @@ -673,43 +673,43 @@ class PostScriptGraphics2D extends Graphics2D while (! pi.isDone()) { - switch (pi.currentSegment(coords)) - { - case PathIterator.SEG_MOVETO: - out.println((coords[0]) + " " + (Y - coords[1]) + " moveto"); - cx = coords[0]; - cy = coords[1]; - break; - case PathIterator.SEG_LINETO: - out.println((coords[0]) + " " + (Y - coords[1]) + " lineto"); - cx = coords[0]; - cy = coords[1]; - break; - case PathIterator.SEG_QUADTO: - // convert to cubic bezier points - float x1 = (cx + 2 * coords[0]) / 3; - float y1 = (cy + 2 * coords[1]) / 3; - float x2 = (2 * coords[2] + coords[0]) / 3; - float y2 = (2 * coords[3] + coords[1]) / 3; + switch (pi.currentSegment(coords)) + { + case PathIterator.SEG_MOVETO: + out.println((coords[0]) + " " + (Y - coords[1]) + " moveto"); + cx = coords[0]; + cy = coords[1]; + break; + case PathIterator.SEG_LINETO: + out.println((coords[0]) + " " + (Y - coords[1]) + " lineto"); + cx = coords[0]; + cy = coords[1]; + break; + case PathIterator.SEG_QUADTO: + // convert to cubic bezier points + float x1 = (cx + 2 * coords[0]) / 3; + float y1 = (cy + 2 * coords[1]) / 3; + float x2 = (2 * coords[2] + coords[0]) / 3; + float y2 = (2 * coords[3] + coords[1]) / 3; - out.print((x1) + " " + (Y - y1) + " "); - out.print((x2) + " " + (Y - y2) + " "); - out.println((coords[2]) + " " + (Y - coords[3]) + " curveto"); - cx = coords[2]; - cy = coords[3]; - break; - case PathIterator.SEG_CUBICTO: - out.print((coords[0]) + " " + (Y - coords[1]) + " "); - out.print((coords[2]) + " " + (Y - coords[3]) + " "); - out.println((coords[4]) + " " + (Y - coords[5]) + " curveto"); - cx = coords[4]; - cy = coords[5]; - break; - case PathIterator.SEG_CLOSE: - out.println("closepath"); - break; - } - pi.next(); + out.print((x1) + " " + (Y - y1) + " "); + out.print((x2) + " " + (Y - y2) + " "); + out.println((coords[2]) + " " + (Y - coords[3]) + " curveto"); + cx = coords[2]; + cy = coords[3]; + break; + case PathIterator.SEG_CUBICTO: + out.print((coords[0]) + " " + (Y - coords[1]) + " "); + out.print((coords[2]) + " " + (Y - coords[3]) + " "); + out.println((coords[4]) + " " + (Y - coords[5]) + " curveto"); + cx = coords[4]; + cy = coords[5]; + break; + case PathIterator.SEG_CLOSE: + out.println("closepath"); + break; + } + pi.next(); } out.println("fill"); @@ -851,7 +851,7 @@ class PostScriptGraphics2D extends Graphics2D try { - out.close(); + out.close(); } catch (Exception e) { @@ -877,43 +877,43 @@ class PostScriptGraphics2D extends Graphics2D while (! pi.isDone()) { - switch (pi.currentSegment(coords)) - { - case PathIterator.SEG_MOVETO: - out.println(coords[0] + " " + (coords[1]) + " moveto"); - cx = coords[0]; - cy = coords[1]; - break; - case PathIterator.SEG_LINETO: - out.println(coords[0] + " " + (coords[1]) + " lineto"); - cx = coords[0]; - cy = coords[1]; - break; - case PathIterator.SEG_QUADTO: - // convert to cubic bezier points - float x1 = (cx + 2 * coords[0]) / 3; - float y1 = (cy + 2 * coords[1]) / 3; - float x2 = (2 * coords[2] + coords[0]) / 3; - float y2 = (2 * coords[3] + coords[1]) / 3; + switch (pi.currentSegment(coords)) + { + case PathIterator.SEG_MOVETO: + out.println(coords[0] + " " + (coords[1]) + " moveto"); + cx = coords[0]; + cy = coords[1]; + break; + case PathIterator.SEG_LINETO: + out.println(coords[0] + " " + (coords[1]) + " lineto"); + cx = coords[0]; + cy = coords[1]; + break; + case PathIterator.SEG_QUADTO: + // convert to cubic bezier points + float x1 = (cx + 2 * coords[0]) / 3; + float y1 = (cy + 2 * coords[1]) / 3; + float x2 = (2 * coords[2] + coords[0]) / 3; + float y2 = (2 * coords[3] + coords[1]) / 3; - out.print(x1 + " " + (Y - y1) + " "); - out.print(x2 + " " + (Y - y2) + " "); - out.println(coords[2] + " " + (Y - coords[3]) + " curveto"); - cx = coords[2]; - cy = coords[3]; - break; - case PathIterator.SEG_CUBICTO: - out.print(coords[0] + " " + coords[1] + " "); - out.print(coords[2] + " " + coords[3] + " "); - out.println(coords[4] + " " + coords[5] + " curveto"); - cx = coords[4]; - cy = coords[5]; - break; - case PathIterator.SEG_CLOSE: - out.println("closepath"); - break; - } - pi.next(); + out.print(x1 + " " + (Y - y1) + " "); + out.print(x2 + " " + (Y - y2) + " "); + out.println(coords[2] + " " + (Y - coords[3]) + " curveto"); + cx = coords[2]; + cy = coords[3]; + break; + case PathIterator.SEG_CUBICTO: + out.print(coords[0] + " " + coords[1] + " "); + out.print(coords[2] + " " + coords[3] + " "); + out.println(coords[4] + " " + coords[5] + " curveto"); + cx = coords[4]; + cy = coords[5]; + break; + case PathIterator.SEG_CLOSE: + out.println("closepath"); + break; + } + pi.next(); } } @@ -923,8 +923,8 @@ class PostScriptGraphics2D extends Graphics2D { clipShape = s; out.println("% clip INACTIVE"); - // writeShape(s); - // out.println("clip"); + // writeShape(s); + // out.println("clip"); } /** Strokes the outline of a Shape using the @@ -946,7 +946,7 @@ class PostScriptGraphics2D extends Graphics2D out.println("% drawGlyphVector"); Shape s = gv.getOutline(); drawStringShape(AffineTransform.getTranslateInstance(x, y) - .createTransformedShape(s)); + .createTransformedShape(s)); } /** Renders the text of the specified iterator, @@ -971,17 +971,17 @@ class PostScriptGraphics2D extends Graphics2D out.println("% fill"); if (! gradientOn) { - writeShape(s); - out.println("fill"); + writeShape(s); + out.println("fill"); } else { - out.println("gsave"); - writeShape(s); - out.println("clip"); - writeGradient(); - out.println("shfill"); - out.println("grestore"); + out.println("gsave"); + writeShape(s); + out.println("clip"); + writeGradient(); + out.println("shfill"); + out.println("grestore"); } } @@ -1011,10 +1011,10 @@ class PostScriptGraphics2D extends Graphics2D { out.println("% getFontRenderContext()"); - double[] scaling = + double[] scaling = { - pageTransform.getScaleX(), 0, 0, - -pageTransform.getScaleY(), 0, 0 + pageTransform.getScaleX(), 0, 0, + -pageTransform.getScaleY(), 0, 0 }; return (new FontRenderContext(new AffineTransform(scaling), false, true)); @@ -1050,15 +1050,15 @@ class PostScriptGraphics2D extends Graphics2D return currentTransform; } - /** - * Checks whether or not the specified Shape intersects - * the specified Rectangle, which is in device space. + /** + * Checks whether or not the specified Shape intersects + * the specified Rectangle, which is in device space. */ public boolean hit(Rectangle rect, Shape s, boolean onStroke) { Rectangle2D.Double r = new Rectangle2D.Double(rect.getX(), rect.getY(), - rect.getWidth(), - rect.getHeight()); + rect.getWidth(), + rect.getHeight()); return s.intersects(r); } @@ -1082,13 +1082,13 @@ class PostScriptGraphics2D extends Graphics2D gradientOn = false; if (paint instanceof Color) { - setColor((Color) paint); - return; + setColor((Color) paint); + return; } if (paint instanceof GradientPaint) { - gradientOn = true; - return; + gradientOn = true; + return; } } @@ -1096,13 +1096,13 @@ class PostScriptGraphics2D extends Graphics2D private String colorTriple(Color c) { return (((double) c.getRed() / 255.0) + " " - + ((double) c.getGreen() / 255.0) + " " - + ((double) c.getBlue() / 255.0)); + + ((double) c.getGreen() / 255.0) + " " + + ((double) c.getBlue() / 255.0)); } /** * Get a nonsperated hex RGB triple, eg FFFFFF = white - * used by writeGradient and drawImage + * used by writeGradient and drawImage */ private String colorTripleHex(Color c) { @@ -1135,11 +1135,11 @@ class PostScriptGraphics2D extends Graphics2D // get number of repetitions while (x + n * dx < pageY && y + n * dy < pageX && x + n * dx > 0 - && y + n * dy > 0) + && y + n * dy > 0) n++; out.println("<<"); // start - out.println("/ShadingType 2"); // gradient fill + out.println("/ShadingType 2"); // gradient fill out.println("/ColorSpace [ /DeviceRGB ]"); // RGB colors out.print("/Coords ["); out.print(x + " " + y + " " + (x + n * dx) + " " + (y + n * dy) + " "); @@ -1152,17 +1152,17 @@ class PostScriptGraphics2D extends Graphics2D out.println("/BitsPerSample 8"); out.println("/Size [ " + (1 + n) + " ]"); out.print("/DataSource < " + colorTripleHex(paint.getColor1()) + " " - + colorTripleHex(paint.getColor2()) + " "); + + colorTripleHex(paint.getColor2()) + " "); for (; n > 1; n--) if (paint.isCyclic()) - { - if ((n % 2) == 1) - out.print(colorTripleHex(paint.getColor1()) + " "); - else - out.print(colorTripleHex(paint.getColor2()) + " "); - } + { + if ((n % 2) == 1) + out.print(colorTripleHex(paint.getColor1()) + " "); + else + out.print(colorTripleHex(paint.getColor2()) + " "); + } else - out.print(colorTripleHex(paint.getColor2()) + " "); + out.print(colorTripleHex(paint.getColor2()) + " "); out.println(">"); out.println(">>"); out.println(">>"); @@ -1181,7 +1181,7 @@ class PostScriptGraphics2D extends Graphics2D /* we don't allow the changing of rendering hints. */ } - /** + /** * Sets the Stroke for the Graphics2D context. BasicStroke fully implemented. */ public void setStroke(Stroke s) @@ -1195,53 +1195,53 @@ class PostScriptGraphics2D extends Graphics2D out.println("% setStroke()"); try { - // set the line width - out.println(bs.getLineWidth() + " setlinewidth"); + // set the line width + out.println(bs.getLineWidth() + " setlinewidth"); - // set the line dash - float[] dashArray = bs.getDashArray(); - if (dashArray != null) - { - out.print("[ "); - for (int i = 0; i < dashArray.length; i++) - out.print(dashArray[i] + " "); - out.println("] " + bs.getDashPhase() + " setdash"); - } - else - out.println("[] 0 setdash"); // set solid + // set the line dash + float[] dashArray = bs.getDashArray(); + if (dashArray != null) + { + out.print("[ "); + for (int i = 0; i < dashArray.length; i++) + out.print(dashArray[i] + " "); + out.println("] " + bs.getDashPhase() + " setdash"); + } + else + out.println("[] 0 setdash"); // set solid - // set the line cap - switch (bs.getEndCap()) - { - case BasicStroke.CAP_BUTT: - out.println("0 setlinecap"); - break; - case BasicStroke.CAP_ROUND: - out.println("1 setlinecap"); - break; - case BasicStroke.CAP_SQUARE: - out.println("2 setlinecap"); - break; - } + // set the line cap + switch (bs.getEndCap()) + { + case BasicStroke.CAP_BUTT: + out.println("0 setlinecap"); + break; + case BasicStroke.CAP_ROUND: + out.println("1 setlinecap"); + break; + case BasicStroke.CAP_SQUARE: + out.println("2 setlinecap"); + break; + } - // set the line join - switch (bs.getLineJoin()) - { - case BasicStroke.JOIN_BEVEL: - out.println("2 setlinejoin"); - break; - case BasicStroke.JOIN_MITER: - out.println("0 setlinejoin"); - out.println(bs.getMiterLimit() + " setmiterlimit"); - break; - case BasicStroke.JOIN_ROUND: - out.println("1 setlinejoin"); - break; - } + // set the line join + switch (bs.getLineJoin()) + { + case BasicStroke.JOIN_BEVEL: + out.println("2 setlinejoin"); + break; + case BasicStroke.JOIN_MITER: + out.println("0 setlinejoin"); + out.println(bs.getMiterLimit() + " setmiterlimit"); + break; + case BasicStroke.JOIN_ROUND: + out.println("1 setlinejoin"); + break; + } } catch (Exception e) { - out.println("% Exception in setStroke()"); + out.println("% Exception in setStroke()"); } } diff --git a/libjava/classpath/gnu/java/awt/print/SpooledDocument.java b/libjava/classpath/gnu/java/awt/print/SpooledDocument.java index 812906b189d..54819984fde 100644 --- a/libjava/classpath/gnu/java/awt/print/SpooledDocument.java +++ b/libjava/classpath/gnu/java/awt/print/SpooledDocument.java @@ -53,13 +53,13 @@ public class SpooledDocument implements Doc public SpooledDocument(File file) { - try + try { - fis = new FileInputStream(file); + fis = new FileInputStream(file); } - catch (FileNotFoundException ffne) + catch (FileNotFoundException ffne) { - // Shouldn't happen. + // Shouldn't happen. } } @@ -77,7 +77,7 @@ public class SpooledDocument implements Doc { return fis; } - + public Reader getReaderForText() { return new InputStreamReader(fis); diff --git a/libjava/classpath/gnu/java/beans/BeanInfoEmbryo.java b/libjava/classpath/gnu/java/beans/BeanInfoEmbryo.java index 0cf73e5b9ae..cc474e817b8 100644 --- a/libjava/classpath/gnu/java/beans/BeanInfoEmbryo.java +++ b/libjava/classpath/gnu/java/beans/BeanInfoEmbryo.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -70,79 +70,79 @@ import java.util.Vector; public class BeanInfoEmbryo { - // by using a TreeMap the properties will be sorted alphabetically by name - // which matches the (undocumented) behavior of jdk - TreeMap properties = new TreeMap(); - Hashtable events = new Hashtable(); - Vector methods = new Vector(); + // by using a TreeMap the properties will be sorted alphabetically by name + // which matches the (undocumented) behavior of jdk + TreeMap properties = new TreeMap(); + Hashtable events = new Hashtable(); + Vector methods = new Vector(); - BeanDescriptor beanDescriptor; - BeanInfo[] additionalBeanInfo; - java.awt.Image[] im; - String defaultPropertyName; - String defaultEventName; + BeanDescriptor beanDescriptor; + BeanInfo[] additionalBeanInfo; + java.awt.Image[] im; + String defaultPropertyName; + String defaultEventName; - public BeanInfoEmbryo() { - } + public BeanInfoEmbryo() { + } - public BeanInfo getBeanInfo() { - int defaultProperty = -1; - int defaultEvent = -1; + public BeanInfo getBeanInfo() { + int defaultProperty = -1; + int defaultEvent = -1; - PropertyDescriptor[] Aproperties = new PropertyDescriptor[properties.size()]; - int i = 0; - Iterator it = properties.entrySet().iterator(); - while (it.hasNext()) { - Aproperties[i] = (PropertyDescriptor) (((Map.Entry)it.next()).getValue()); - if(defaultPropertyName != null && Aproperties[i].getName().equals(defaultPropertyName)) { - defaultProperty = i; - } - i++; - } + PropertyDescriptor[] Aproperties = new PropertyDescriptor[properties.size()]; + int i = 0; + Iterator it = properties.entrySet().iterator(); + while (it.hasNext()) { + Aproperties[i] = (PropertyDescriptor) (((Map.Entry)it.next()).getValue()); + if(defaultPropertyName != null && Aproperties[i].getName().equals(defaultPropertyName)) { + defaultProperty = i; + } + i++; + } - EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()]; - i = 0; - Enumeration e = events.elements(); - while (e.hasMoreElements()) { - Aevents[i] = (EventSetDescriptor) e.nextElement(); - if(defaultEventName != null && Aevents[i].getName().equals(defaultEventName)) { - defaultEvent = i; - } - i++; - } + EventSetDescriptor[] Aevents = new EventSetDescriptor[events.size()]; + i = 0; + Enumeration e = events.elements(); + while (e.hasMoreElements()) { + Aevents[i] = (EventSetDescriptor) e.nextElement(); + if(defaultEventName != null && Aevents[i].getName().equals(defaultEventName)) { + defaultEvent = i; + } + i++; + } - MethodDescriptor[] Amethods = new MethodDescriptor[methods.size()]; - methods.copyInto(Amethods); + MethodDescriptor[] Amethods = new MethodDescriptor[methods.size()]; + methods.copyInto(Amethods); - return new ExplicitBeanInfo(beanDescriptor,additionalBeanInfo,Aproperties,defaultProperty,Aevents,defaultEvent,Amethods,im); - } + return new ExplicitBeanInfo(beanDescriptor,additionalBeanInfo,Aproperties,defaultProperty,Aevents,defaultEvent,Amethods,im); + } - public void setBeanDescriptor(BeanDescriptor b) { - beanDescriptor = b; - } + public void setBeanDescriptor(BeanDescriptor b) { + beanDescriptor = b; + } - public void setAdditionalBeanInfo(BeanInfo[] b) { - additionalBeanInfo = b; - } + public void setAdditionalBeanInfo(BeanInfo[] b) { + additionalBeanInfo = b; + } - public boolean hasProperty(PropertyDescriptor p) { - return properties.get(p.getName()) != null; - } - public void addProperty(PropertyDescriptor p) { - properties.put(p.getName(),p); - } - public void addIndexedProperty(IndexedPropertyDescriptor p) { - properties.put(p.getName(),p); - } + public boolean hasProperty(PropertyDescriptor p) { + return properties.get(p.getName()) != null; + } + public void addProperty(PropertyDescriptor p) { + properties.put(p.getName(),p); + } + public void addIndexedProperty(IndexedPropertyDescriptor p) { + properties.put(p.getName(),p); + } - public boolean hasEvent(EventSetDescriptor e) { - return events.get(e.getName()) != null; - } - public void addEvent(EventSetDescriptor e) { - events.put(e.getName(),e); - } + public boolean hasEvent(EventSetDescriptor e) { + return events.get(e.getName()) != null; + } + public void addEvent(EventSetDescriptor e) { + events.put(e.getName(),e); + } - public boolean hasMethod(MethodDescriptor m) { + public boolean hasMethod(MethodDescriptor m) { for(int i=0;i - *

    2. boolean "is" getter
      3. - *
    3. "get" style getter
      4. - *
    4. single argument setter
      5. - *
    5. indiced setter and getter
      6. - * - * It files the method as a listener method if all of these rules apply: - *
        - *
      • the method name starts with "add" or "remove"
        • - *
      • there is only a single argument
        • - *
      • the argument type is a subclass of java.util.EventListener
        • - *
      - * All public methods are filed as such. - * - * @param method The method instance to examine. - */ - public void addMethod(Method method) { - if(Modifier.isPublic(method.getModifiers())) { - String name = ClassHelper.getTruncatedName(method.getName()); - Class retType = method.getReturnType(); - Class[] params = method.getParameterTypes(); - boolean isVoid = retType.equals(java.lang.Void.TYPE); - Class methodClass = method.getDeclaringClass(); - - /* Accepts the method for examination if no stop class is given or the method is declared in a subclass of the stop class. - * The rules for this are described in {@link java.beans.Introspector.getBeanInfo(Class, Class)}. - * This block finds out whether the method is a suitable getter or setter method (or read/write method). - */ - if(isReachable(propertyStopClass, methodClass)) { - /* At this point a method may regarded as a property's read or write method if its name - * starts with "is", "get" or "set". However, if a method is static it cannot be part - * of a property. - */ - if(Modifier.isStatic(method.getModifiers())) { - // files method as other because it is static - otherMethods.addElement(method); - } else if(name.startsWith("is") - && retType.equals(java.lang.Boolean.TYPE) - && params.length == 0) { - // files method as boolean "is" style getter - addToPropertyHash(name,method,IS); - } else if(name.startsWith("get") && !isVoid) { - if(params.length == 0) { - // files as legal non-argument getter - addToPropertyHash(name,method,GET); - } else if(params.length == 1 && params[0].equals(java.lang.Integer.TYPE)) { - // files as legal indiced getter - addToPropertyHash(name,method,GET_I); - } else { - // files as other because the method's signature is not Bean-like - otherMethods.addElement(method); - } - } else if(name.startsWith("set") && isVoid) { - if(params.length == 1) { - // files as legal single-argument setter method - addToPropertyHash(name,method,SET); - } else if(params.length == 2 && params[0].equals(java.lang.Integer.TYPE)) { - // files as legal indiced setter method - addToPropertyHash(name,method,SET_I); - } else { - // files as other because the method's signature is not Bean-like - otherMethods.addElement(method); - } - } - } - - if(isReachable(eventStopClass, methodClass)) { - if(name.startsWith("add") - && isVoid - && params.length == 1 - && java.util.EventListener.class.isAssignableFrom(params[0])) { - addToListenerHash(name,method,ADD); - } else if(name.startsWith("remove") - && isVoid - && params.length == 1 - && java.util.EventListener.class.isAssignableFrom(params[0])) { - addToListenerHash(name,method,REMOVE); - } - } - - if(isReachable(methodStopClass, methodClass)) { - // files as reachable public method - otherMethods.addElement(method); - } - - } - } + /** Examines the given method and files it in a suitable collection. + * It files the method as a property method if it finds: + *
        + *
      • boolean "is" getter
        • + *
      • "get" style getter
        • + *
      • single argument setter
        • + *
      • indiced setter and getter
        • + *
      + * It files the method as a listener method if all of these rules apply: + *
        + *
      • the method name starts with "add" or "remove"
        • + *
      • there is only a single argument
        • + *
      • the argument type is a subclass of java.util.EventListener
        • + *
      + * All public methods are filed as such. + * + * @param method The method instance to examine. + */ + public void addMethod(Method method) { + if(Modifier.isPublic(method.getModifiers())) { + String name = ClassHelper.getTruncatedName(method.getName()); + Class retType = method.getReturnType(); + Class[] params = method.getParameterTypes(); + boolean isVoid = retType.equals(java.lang.Void.TYPE); + Class methodClass = method.getDeclaringClass(); - public void addMethods(Method[] m) { - for(int i=0;istopClass       is null - * or declaringClass is a true subclass of stopClass. - * This expression is useful to detect whether a method should be introspected or not. - * The rules for this are described in {@link java.beans.Introspector.getBeanInfo(Class, Class)}. - */ - static boolean isReachable(Class stopClass, Class declaringClass) { - return stopClass == null || (stopClass.isAssignableFrom(declaringClass) && !stopClass.equals(declaringClass)); - } + /* Determines whether stopClass is null + * or declaringClass is a true subclass of stopClass. + * This expression is useful to detect whether a method should be introspected or not. + * The rules for this are described in {@link java.beans.Introspector.getBeanInfo(Class, Class)}. + */ + static boolean isReachable(Class stopClass, Class declaringClass) { + return stopClass == null || (stopClass.isAssignableFrom(declaringClass) && !stopClass.equals(declaringClass)); + } - /** Transforms a property name into a part of a method name. - * E.g. "value" becomes "Value" which can then concatenated with - * "set", "get" or "is" to form a valid method name. - * - * Implementation notes: - * If "" is the argument, it is returned without changes. - * If null is the argument, null is returned. - * - * @param name Name of a property. - * @return Part of a method name of a property. - */ - static String capitalize(String name) { - try { - if(Character.isUpperCase(name.charAt(0))) { - return name; - } else { - char[] c = name.toCharArray(); - c[0] = Character.toLowerCase(c[0]); - return new String(c); - } - } catch(StringIndexOutOfBoundsException E) { - return name; - } catch(NullPointerException E) { - return null; - } - } + /** Transforms a property name into a part of a method name. + * E.g. "value" becomes "Value" which can then concatenated with + * "set", "get" or "is" to form a valid method name. + * + * Implementation notes: + * If "" is the argument, it is returned without changes. + * If null is the argument, null is returned. + * + * @param name Name of a property. + * @return Part of a method name of a property. + */ + static String capitalize(String name) { + try { + if(Character.isUpperCase(name.charAt(0))) { + return name; + } else { + char[] c = name.toCharArray(); + c[0] = Character.toLowerCase(c[0]); + return new String(c); + } + } catch(StringIndexOutOfBoundsException E) { + return name; + } catch(NullPointerException E) { + return null; + } + } } /** This class is a hashmap key that consists of a Class and a * String element. - * + * * It is used for XXX: find out what this is used for - * + * * @author John Keiser * @author Robert Schuster - */ + */ class DoubleKey { - Class type; - String name; + Class type; + String name; - DoubleKey(Class type, String name) { - this.type = type; - this.name = name; - } + DoubleKey(Class type, String name) { + this.type = type; + this.name = name; + } - Class getType() { - return type; - } + Class getType() { + return type; + } - String getName() { - return name; - } + String getName() { + return name; + } - public boolean equals(Object o) { - if(o instanceof DoubleKey) { - DoubleKey d = (DoubleKey)o; - return d.type.equals(type) && d.name.equals(name); - } else { - return false; - } - } + public boolean equals(Object o) { + if(o instanceof DoubleKey) { + DoubleKey d = (DoubleKey)o; + return d.type.equals(type) && d.name.equals(name); + } else { + return false; + } + } - public int hashCode() { - return type.hashCode() ^ name.hashCode(); - } + public int hashCode() { + return type.hashCode() ^ name.hashCode(); + } } diff --git a/libjava/classpath/gnu/java/beans/decoder/AbstractContext.java b/libjava/classpath/gnu/java/beans/decoder/AbstractContext.java index 0e95d432986..e6f90e21f0d 100644 --- a/libjava/classpath/gnu/java/beans/decoder/AbstractContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/AbstractContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/AbstractCreatableObjectContext.java b/libjava/classpath/gnu/java/beans/decoder/AbstractCreatableObjectContext.java index 47f04fa1cbe..d108f191c55 100644 --- a/libjava/classpath/gnu/java/beans/decoder/AbstractCreatableObjectContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/AbstractCreatableObjectContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -65,7 +65,7 @@ abstract class AbstractCreatableObjectContext extends AbstractObjectContext /** Adds a parameter object to this Context. Implement this without caring * for illegal states because this has been done already. * - * @param obj The parameter object to be added. + * @param obj The parameter object to be added. */ protected abstract void addParameterObjectImpl(Object obj); @@ -83,7 +83,7 @@ abstract class AbstractCreatableObjectContext extends AbstractObjectContext /** Creates the result object. This method is called only once. Implement this * without checking for double invocations as this is already being prevented. * - * @param outerContext The Context that exists around this one. + * @param outerContext The Context that exists around this one. * @return The result object. * @throws AssemblerException if the object creation fails somehow. */ diff --git a/libjava/classpath/gnu/java/beans/decoder/AbstractElementHandler.java b/libjava/classpath/gnu/java/beans/decoder/AbstractElementHandler.java index e5578a990bc..51765658fe1 100644 --- a/libjava/classpath/gnu/java/beans/decoder/AbstractElementHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/AbstractElementHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -91,21 +91,21 @@ abstract class AbstractElementHandler implements ElementHandler { try { - // lets the subclass create the appropriate Context instance - context = startElement(attributes, exceptionListener); + // lets the subclass create the appropriate Context instance + context = startElement(attributes, exceptionListener); } catch (AssemblyException pe) { - Throwable t = pe.getCause(); + Throwable t = pe.getCause(); - if (t instanceof Exception) - exceptionListener.exceptionThrown((Exception) t); - else - throw new InternalError("Unexpected Throwable type in AssemblerException. Please file a bug report."); + if (t instanceof Exception) + exceptionListener.exceptionThrown((Exception) t); + else + throw new InternalError("Unexpected Throwable type in AssemblerException. Please file a bug report."); - notifyContextFailed(); + notifyContextFailed(); - return; + return; } } @@ -129,48 +129,48 @@ abstract class AbstractElementHandler implements ElementHandler // is then invalid or may not exist at all) if (!hasFailed) { - try - { - // note: the order of operations is very important here - // sends the stored character data to the Context - endElement(buffer.toString()); + try + { + // note: the order of operations is very important here + // sends the stored character data to the Context + endElement(buffer.toString()); - // reports to the parent handler if this handler's Context is a - // statement (returning no value BACK to the parent's Context) - if (context.isStatement()) - { - // This may create a valid result in the parent's Context - // or let it fail - parent.notifyStatement(exceptionListener); + // reports to the parent handler if this handler's Context is a + // statement (returning no value BACK to the parent's Context) + if (context.isStatement()) + { + // This may create a valid result in the parent's Context + // or let it fail + parent.notifyStatement(exceptionListener); - // skips any further processing if the parent handler is now marked - // as failed - if (parent.hasFailed()) - return; - } + // skips any further processing if the parent handler is now marked + // as failed + if (parent.hasFailed()) + return; + } - // processes the Context and stores the result - putObject(context.getId(), context.endContext(parent.getContext())); + // processes the Context and stores the result + putObject(context.getId(), context.endContext(parent.getContext())); - // transfers the Context's results to the parent's Context - // if it is an expression (rather than a statement) - if (! context.isStatement()) - parent.getContext().addParameterObject(context.getResult()); - } - catch (AssemblyException pe) - { - // notifies that an exception was thrown in this handler's Context - Throwable t = pe.getCause(); + // transfers the Context's results to the parent's Context + // if it is an expression (rather than a statement) + if (! context.isStatement()) + parent.getContext().addParameterObject(context.getResult()); + } + catch (AssemblyException pe) + { + // notifies that an exception was thrown in this handler's Context + Throwable t = pe.getCause(); - if (t instanceof Exception) - exceptionListener.exceptionThrown((Exception) t); - else - throw (InternalError) new InternalError("Severe problem while decoding XML data.") - .initCause(t); + if (t instanceof Exception) + exceptionListener.exceptionThrown((Exception) t); + else + throw (InternalError) new InternalError("Severe problem while decoding XML data.") + .initCause(t); - // marks the handler as failed - notifyContextFailed(); - } + // marks the handler as failed + notifyContextFailed(); + } } } @@ -184,31 +184,31 @@ abstract class AbstractElementHandler implements ElementHandler { try { - - // propagates to parent handler first to generate objects - // needed by this Context instance - if(context.isStatement()) - { - parent.notifyStatement(exceptionListener); - } - - // Some Context instances do stuff which can fail now. If that - // happens this handler is marked as failed. - context.notifyStatement(parent.getContext()); + + // propagates to parent handler first to generate objects + // needed by this Context instance + if(context.isStatement()) + { + parent.notifyStatement(exceptionListener); + } + + // Some Context instances do stuff which can fail now. If that + // happens this handler is marked as failed. + context.notifyStatement(parent.getContext()); } catch (AssemblyException ae) { - // notifies that an exception was thrown in this handler's Context - Throwable t = ae.getCause(); + // notifies that an exception was thrown in this handler's Context + Throwable t = ae.getCause(); - if (t instanceof Exception) - exceptionListener.exceptionThrown((Exception) t); - else - throw (InternalError) new InternalError("Severe problem while decoding XML data.") - .initCause(t); + if (t instanceof Exception) + exceptionListener.exceptionThrown((Exception) t); + else + throw (InternalError) new InternalError("Severe problem while decoding XML data.") + .initCause(t); - // marks the handler as failed - notifyContextFailed(); + // marks the handler as failed + notifyContextFailed(); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/AbstractObjectContext.java b/libjava/classpath/gnu/java/beans/decoder/AbstractObjectContext.java index 202c33b3413..963ef09058a 100644 --- a/libjava/classpath/gnu/java/beans/decoder/AbstractObjectContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/AbstractObjectContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/ArrayContext.java b/libjava/classpath/gnu/java/beans/decoder/ArrayContext.java index cf4267f2779..bdec1c647e0 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ArrayContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/ArrayContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -67,7 +67,7 @@ class ArrayContext extends AbstractContext */ public void notifyStatement(Context outerContext) { - // method call intentionally ignored because there is not any useful effect + // method call intentionally ignored because there is not any useful effect } /* (non-Javadoc) @@ -92,11 +92,11 @@ class ArrayContext extends AbstractContext { try { - Array.set(array, index, o); + Array.set(array, index, o); } catch (ArrayIndexOutOfBoundsException aioobe) { - throw new AssemblyException(aioobe); + throw new AssemblyException(aioobe); } } @@ -104,11 +104,11 @@ class ArrayContext extends AbstractContext { try { - return Array.get(array, index); + return Array.get(array, index); } catch (ArrayIndexOutOfBoundsException aioobe) { - throw new AssemblyException(aioobe); + throw new AssemblyException(aioobe); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/ArrayHandler.java b/libjava/classpath/gnu/java/beans/decoder/ArrayHandler.java index 23f0285192b..28930f51944 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ArrayHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ArrayHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -86,31 +86,31 @@ class ArrayHandler extends AbstractElementHandler if (className != null) { - try - { - Class klass; + try + { + Class klass; - if (typeMap.containsKey(className)) - klass = (Class) typeMap.get(className); - else - klass = instantiateClass(className); + if (typeMap.containsKey(className)) + klass = (Class) typeMap.get(className); + else + klass = instantiateClass(className); - String length = attributes.getValue("length"); - if (length != null) - // creates Array with predefined length - return new ArrayContext(id, klass, Integer.parseInt(length)); - else - // creates Array without length restriction - return new GrowableArrayContext(id, klass); - } - catch (ClassNotFoundException cnfe) - { - throw new AssemblyException(cnfe); - } - catch (NumberFormatException nfe) - { - throw new AssemblyException(nfe); - } + String length = attributes.getValue("length"); + if (length != null) + // creates Array with predefined length + return new ArrayContext(id, klass, Integer.parseInt(length)); + else + // creates Array without length restriction + return new GrowableArrayContext(id, klass); + } + catch (ClassNotFoundException cnfe) + { + throw new AssemblyException(cnfe); + } + catch (NumberFormatException nfe) + { + throw new AssemblyException(nfe); + } } throw new AssemblyException(new IllegalArgumentException("Missing 'class' attribute in tag.")); diff --git a/libjava/classpath/gnu/java/beans/decoder/AssemblyException.java b/libjava/classpath/gnu/java/beans/decoder/AssemblyException.java index 29dfa65ac7c..206c5841b69 100644 --- a/libjava/classpath/gnu/java/beans/decoder/AssemblyException.java +++ b/libjava/classpath/gnu/java/beans/decoder/AssemblyException.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,7 +41,7 @@ package gnu.java.beans.decoder; /** The AssemblyException is used to wrap the cause of problems when assembling objects. * In all cases only the wrapped exception is given to the PersistenceParser's * ExceptionListener instance (never the AssemblyException itself). - * + * *

      Note: Often multiple steps are needed to construct a fully usuable object instance. * Such a construction can be called assembly and thats why this exception was * named AssemblyException.

      diff --git a/libjava/classpath/gnu/java/beans/decoder/BooleanHandler.java b/libjava/classpath/gnu/java/beans/decoder/BooleanHandler.java index a675e8c9012..20aed9a3fed 100644 --- a/libjava/classpath/gnu/java/beans/decoder/BooleanHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/BooleanHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/ByteHandler.java b/libjava/classpath/gnu/java/beans/decoder/ByteHandler.java index d6c33d14d21..830bbc74768 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ByteHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ByteHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/CharHandler.java b/libjava/classpath/gnu/java/beans/decoder/CharHandler.java index 1b31e5b0559..114df8b79ce 100644 --- a/libjava/classpath/gnu/java/beans/decoder/CharHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/CharHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/ClassHandler.java b/libjava/classpath/gnu/java/beans/decoder/ClassHandler.java index 1dbdd63e79a..c67a79a4806 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ClassHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ClassHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,11 +56,11 @@ class ClassHandler extends SimpleHandler { try { - return instantiateClass(characters); + return instantiateClass(characters); } catch (ClassNotFoundException cnfe) { - throw new AssemblyException(cnfe); + throw new AssemblyException(cnfe); } } } diff --git a/libjava/classpath/gnu/java/beans/decoder/ConstructorContext.java b/libjava/classpath/gnu/java/beans/decoder/ConstructorContext.java index 7838fb7e263..32365eef4e0 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ConstructorContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/ConstructorContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -57,7 +57,7 @@ class ConstructorContext extends AbstractCreatableObjectContext ConstructorContext(String id, Class newClass) { setId(id); - // sets superclass field + // sets superclass field klass = newClass; } @@ -76,27 +76,27 @@ class ConstructorContext extends AbstractCreatableObjectContext try { - Constructor constructor = MethodFinder.getConstructor(klass, args); + Constructor constructor = MethodFinder.getConstructor(klass, args); - // instantiates object (klass field gets re-set by superclass) - return constructor.newInstance(args); + // instantiates object (klass field gets re-set by superclass) + return constructor.newInstance(args); } catch (NoSuchMethodException nsme) { - throw new AssemblyException(nsme); + throw new AssemblyException(nsme); } catch (InvocationTargetException ite) { - throw new AssemblyException(ite.getCause()); + throw new AssemblyException(ite.getCause()); } catch (IllegalAccessException iae) { - throw new AssemblyException(iae); + throw new AssemblyException(iae); } catch (InstantiationException ie) { - throw new AssemblyException(ie); + throw new AssemblyException(ie); } } - + } diff --git a/libjava/classpath/gnu/java/beans/decoder/Context.java b/libjava/classpath/gnu/java/beans/decoder/Context.java index a2db09732d1..4bdbc9ce5eb 100644 --- a/libjava/classpath/gnu/java/beans/decoder/Context.java +++ b/libjava/classpath/gnu/java/beans/decoder/Context.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/DecoderContext.java b/libjava/classpath/gnu/java/beans/decoder/DecoderContext.java index 69d84e57656..174a3b71b21 100644 --- a/libjava/classpath/gnu/java/beans/decoder/DecoderContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/DecoderContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -113,12 +113,12 @@ public class DecoderContext extends AbstractContext } /** Returns an Iterator that retrieves the assembled objects. - * + * * @return An Iterator retrieving assembled objects. */ public Iterator iterator() { return objects.iterator(); } - + } diff --git a/libjava/classpath/gnu/java/beans/decoder/DoubleHandler.java b/libjava/classpath/gnu/java/beans/decoder/DoubleHandler.java index 8f6be7ec092..1a14fbabffc 100644 --- a/libjava/classpath/gnu/java/beans/decoder/DoubleHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/DoubleHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/DummyContext.java b/libjava/classpath/gnu/java/beans/decoder/DummyContext.java index f3b24549de2..03f209c8cf4 100644 --- a/libjava/classpath/gnu/java/beans/decoder/DummyContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/DummyContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -60,7 +60,7 @@ public class DummyContext extends AbstractContext */ public void notifyStatement(Context outerContext) throws AssemblyException { - // intentionally ignored + // intentionally ignored } /* (non-Javadoc) @@ -69,7 +69,7 @@ public class DummyContext extends AbstractContext public Object endContext(Context outerContext) throws AssemblyException { fail(); - return null; + return null; } /* (non-Javadoc) @@ -78,7 +78,7 @@ public class DummyContext extends AbstractContext public boolean subContextFailed() { fail(); - return false; + return false; } /* (non-Javadoc) @@ -95,7 +95,7 @@ public class DummyContext extends AbstractContext public Object get(int index) throws AssemblyException { fail(); - return null; + return null; } /* (non-Javadoc) @@ -104,13 +104,13 @@ public class DummyContext extends AbstractContext public Object getResult() { fail(); - return null; + return null; } private void fail() { throw new InternalError("Invoking the DummyContext is not expected" - + " - Please file a bug report at" - + " http://www/gnu.org/software/classpath/."); + + " - Please file a bug report at" + + " http://www/gnu.org/software/classpath/."); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/DummyHandler.java b/libjava/classpath/gnu/java/beans/decoder/DummyHandler.java index 880d76adc0e..f9c133e5483 100644 --- a/libjava/classpath/gnu/java/beans/decoder/DummyHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/DummyHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -89,7 +89,7 @@ class DummyHandler implements ElementHandler throws ClassNotFoundException { fail(); - return null; + return null; } /* (non-Javadoc) @@ -138,19 +138,19 @@ class DummyHandler implements ElementHandler public Object getObject(String objectId) { fail(); - return null; + return null; } public ElementHandler getParent() { fail(); - return null; + return null; } private void fail() { throw new InternalError("Invoking the DummyHandler is not expected" - + " - Please file a bug report at " - + " http://www.gnu.org/software/classpath/."); + + " - Please file a bug report at " + + " http://www.gnu.org/software/classpath/."); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/ElementHandler.java b/libjava/classpath/gnu/java/beans/decoder/ElementHandler.java index e6ae60af886..12e945bbfd5 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ElementHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ElementHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -72,19 +72,19 @@ interface ElementHandler /** Returns whether a subelement of the given name is allowed. The rules * for evaluating this are derived from the javabeans.dtd which can be found * here: Java Persistence Article. - * - * @param subElementName + * + * @param subElementName * @return */ boolean isSubelementAllowed(String subElementName); /** Provides the same functionality as Class.forName() but allows the decoder * to use a different class loader. - * + * * @param className * @return * @throws ClassNotFoundException - */ + */ Class instantiateClass(String className) throws ClassNotFoundException; /** Notifies the handler's Context that its child Context will not return @@ -104,21 +104,21 @@ interface ElementHandler boolean hasFailed(); /** Returns the Context instance this handler is working on. - * + * * @return The handler's Context instance. */ Context getContext(); /** Notifies the handler that its Context failed and starts a recursive * invocation of the parent handler if it is affected by that failure. - * + * * Although the method is a public API member it is only used internally. */ void notifyContextFailed(); /** Stores the object under the given id. The object is not stored if the * id is null. - * + * * @param objectId * @param o */ diff --git a/libjava/classpath/gnu/java/beans/decoder/FloatHandler.java b/libjava/classpath/gnu/java/beans/decoder/FloatHandler.java index 5f0e15cefed..443f38f9199 100644 --- a/libjava/classpath/gnu/java/beans/decoder/FloatHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/FloatHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/GrowableArrayContext.java b/libjava/classpath/gnu/java/beans/decoder/GrowableArrayContext.java index f24a60b4a4b..fb386d1d581 100644 --- a/libjava/classpath/gnu/java/beans/decoder/GrowableArrayContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/GrowableArrayContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,11 +46,11 @@ import java.lang.reflect.Array; class GrowableArrayContext extends AbstractContext { private static final int INITIAL_SIZE = 16; - + private Class klass; private Object array; private int length; - + GrowableArrayContext(String id, Class newClass) { setId(id); @@ -69,7 +69,7 @@ class GrowableArrayContext extends AbstractContext System.arraycopy(array, 0, tmp, 0, length); array = tmp; } - + try { Array.set(array, length++, o); } catch(IllegalArgumentException iae) { @@ -97,7 +97,7 @@ class GrowableArrayContext extends AbstractContext System.arraycopy(array, 0, tmp, 0, length); array = tmp; } - + return array; } @@ -119,7 +119,7 @@ class GrowableArrayContext extends AbstractContext try { Array.set(array, index, o); } catch(IllegalArgumentException iae) { - throw new AssemblyException(iae); + throw new AssemblyException(iae); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/IndexContext.java b/libjava/classpath/gnu/java/beans/decoder/IndexContext.java index 11f840caeec..b5af9019f4c 100644 --- a/libjava/classpath/gnu/java/beans/decoder/IndexContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/IndexContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -65,8 +65,8 @@ class IndexContext extends AbstractContext { if (! isSetter) { - argument = o; - isSetter = true; + argument = o; + isSetter = true; } else throw new AssemblyException(new IllegalStateException("More than one argument for indiced access is not possible.")); @@ -87,10 +87,10 @@ class IndexContext extends AbstractContext { if (isSetter) { - // setter - outerContext.set(index, argument); + // setter + outerContext.set(index, argument); - return null; + return null; } else // getter diff --git a/libjava/classpath/gnu/java/beans/decoder/IntHandler.java b/libjava/classpath/gnu/java/beans/decoder/IntHandler.java index a96f4a0315b..bbd3560d735 100644 --- a/libjava/classpath/gnu/java/beans/decoder/IntHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/IntHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/JavaHandler.java b/libjava/classpath/gnu/java/beans/decoder/JavaHandler.java index 3bc8c60288c..c4b4f92c5ce 100644 --- a/libjava/classpath/gnu/java/beans/decoder/JavaHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/JavaHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -69,7 +69,7 @@ public class JavaHandler extends AbstractElementHandler protected Context startElement(Attributes attributes, ExceptionListener exceptionListener) throws AssemblyException { - // may expect version and class attribute but it not used in JDK + // may expect version and class attribute but it not used in JDK // so we do either return context; } diff --git a/libjava/classpath/gnu/java/beans/decoder/LongHandler.java b/libjava/classpath/gnu/java/beans/decoder/LongHandler.java index d7bfa54e54e..13e0a8dde28 100644 --- a/libjava/classpath/gnu/java/beans/decoder/LongHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/LongHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/MethodContext.java b/libjava/classpath/gnu/java/beans/decoder/MethodContext.java index bad0a213f7f..84eead7a025 100644 --- a/libjava/classpath/gnu/java/beans/decoder/MethodContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/MethodContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/MethodFinder.java b/libjava/classpath/gnu/java/beans/decoder/MethodFinder.java index 3968b173adb..82783fbdefd 100644 --- a/libjava/classpath/gnu/java/beans/decoder/MethodFinder.java +++ b/libjava/classpath/gnu/java/beans/decoder/MethodFinder.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,135 +43,135 @@ import java.util.HashMap; class MethodFinder { - /** Provides a mapping between a wrapper class and its corresponding primitive's type. */ - private static HashMap typeMapping = new HashMap(); + /** Provides a mapping between a wrapper class and its corresponding primitive's type. */ + private static HashMap typeMapping = new HashMap(); - static { - typeMapping.put(Byte.class, Byte.TYPE); - typeMapping.put(Short.class, Short.TYPE); - typeMapping.put(Integer.class, Integer.TYPE); - typeMapping.put(Long.class, Long.TYPE); - typeMapping.put(Float.class, Float.TYPE); - typeMapping.put(Double.class, Double.TYPE); + static { + typeMapping.put(Byte.class, Byte.TYPE); + typeMapping.put(Short.class, Short.TYPE); + typeMapping.put(Integer.class, Integer.TYPE); + typeMapping.put(Long.class, Long.TYPE); + typeMapping.put(Float.class, Float.TYPE); + typeMapping.put(Double.class, Double.TYPE); - typeMapping.put(Character.class, Character.TYPE); - typeMapping.put(Boolean.class, Boolean.TYPE); - } + typeMapping.put(Character.class, Character.TYPE); + typeMapping.put(Boolean.class, Boolean.TYPE); + } - private MethodFinder() - { - } + private MethodFinder() + { + } - /** Searches a Method which can accept the given arguments. - * - * @param klass - * @param name - * @param arguments - * @return - * @throws NoSuchMethodException - */ - static Method getMethod(Class klass, String name, Object[] arguments) - throws NoSuchMethodException - { - // prepares array containing the types of the arguments - Class[] argumentTypes = getArgumentTypes(arguments); + /** Searches a Method which can accept the given arguments. + * + * @param klass + * @param name + * @param arguments + * @return + * @throws NoSuchMethodException + */ + static Method getMethod(Class klass, String name, Object[] arguments) + throws NoSuchMethodException + { + // prepares array containing the types of the arguments + Class[] argumentTypes = getArgumentTypes(arguments); - Method[] methods = klass.getMethods(); + Method[] methods = klass.getMethods(); - // iterates over all public methods - for (int i = 0; i < methods.length; i++) - { - if (methods[i].getName().equals(name)) - { - if (matchingArgumentTypes(methods[i].getParameterTypes(), - argumentTypes)) - return methods[i]; - } - } + // iterates over all public methods + for (int i = 0; i < methods.length; i++) + { + if (methods[i].getName().equals(name)) + { + if (matchingArgumentTypes(methods[i].getParameterTypes(), + argumentTypes)) + return methods[i]; + } + } - throw new NoSuchMethodException( - "Could not find a matching method named " - + name - + "() in class " - + klass); - } + throw new NoSuchMethodException( + "Could not find a matching method named " + + name + + "() in class " + + klass); + } - static Constructor getConstructor(Class klass, Object[] arguments) - throws NoSuchMethodException - { - Class[] argumentTypes = getArgumentTypes(arguments); - Constructor[] constructors = klass.getConstructors(); + static Constructor getConstructor(Class klass, Object[] arguments) + throws NoSuchMethodException + { + Class[] argumentTypes = getArgumentTypes(arguments); + Constructor[] constructors = klass.getConstructors(); - // iterates over all public methods - for (int i = 0; i < constructors.length; i++) - { - if (matchingArgumentTypes(constructors[i].getParameterTypes(), - argumentTypes)) - return constructors[i]; - } + // iterates over all public methods + for (int i = 0; i < constructors.length; i++) + { + if (matchingArgumentTypes(constructors[i].getParameterTypes(), + argumentTypes)) + return constructors[i]; + } - throw new NoSuchMethodException( - "Could not find a matching constructor in class " + klass); - } + throw new NoSuchMethodException( + "Could not find a matching constructor in class " + klass); + } - /** Transforms an array of argument objects into an array of argument types. - * For each argument being null the argument is null, too. An argument type - * being null means: Accepts everything (although this can be ambigous). - * - * @param arguments - * @return - */ - private static Class[] getArgumentTypes(Object[] arguments) - { - if (arguments == null) - return new Class[0]; + /** Transforms an array of argument objects into an array of argument types. + * For each argument being null the argument is null, too. An argument type + * being null means: Accepts everything (although this can be ambigous). + * + * @param arguments + * @return + */ + private static Class[] getArgumentTypes(Object[] arguments) + { + if (arguments == null) + return new Class[0]; - // prepares array containing the types of the arguments - Class[] argumentTypes = new Class[arguments.length]; - for (int i = 0; i < arguments.length; i++) - argumentTypes[i] = - (arguments[i] == null) ? null : arguments[i].getClass(); - return argumentTypes; - } + // prepares array containing the types of the arguments + Class[] argumentTypes = new Class[arguments.length]; + for (int i = 0; i < arguments.length; i++) + argumentTypes[i] = + (arguments[i] == null) ? null : arguments[i].getClass(); + return argumentTypes; + } - /** Tests whether the argument types supplied to the method argument types - * are assignable. In addition to the assignment specifications this method - * handles the primitive's wrapper classes as if they were of their - * primitive type (e.g Boolean.class equals Boolean.TYPE). - * When a supplied argument type is null it is assumed that no argument - * object was supplied for it and the test for this particular parameter will - * pass. - * - * @param methodArgTypes - * @param suppliedArgTypes - * @return - */ - private static boolean matchingArgumentTypes( - Class[] methodArgTypes, - Class[] suppliedArgTypes) - { - if (methodArgTypes.length != suppliedArgTypes.length) - return false; + /** Tests whether the argument types supplied to the method argument types + * are assignable. In addition to the assignment specifications this method + * handles the primitive's wrapper classes as if they were of their + * primitive type (e.g Boolean.class equals Boolean.TYPE). + * When a supplied argument type is null it is assumed that no argument + * object was supplied for it and the test for this particular parameter will + * pass. + * + * @param methodArgTypes + * @param suppliedArgTypes + * @return + */ + private static boolean matchingArgumentTypes( + Class[] methodArgTypes, + Class[] suppliedArgTypes) + { + if (methodArgTypes.length != suppliedArgTypes.length) + return false; - for (int i = 0; i < methodArgTypes.length; i++) - { - if (suppliedArgTypes[i] == null) - { - // by definition a non-existant argument type (null) can be converted to everything - continue; - } - else if (typeMapping.containsKey(suppliedArgTypes[i])) - { - Class primitiveType = - (Class) typeMapping.get(suppliedArgTypes[i]); - if (!(methodArgTypes[i].isAssignableFrom(suppliedArgTypes[i]) - || methodArgTypes[i].isAssignableFrom(primitiveType))) - return false; - } - else if (!methodArgTypes[i].isAssignableFrom(suppliedArgTypes[i])) - return false; - } + for (int i = 0; i < methodArgTypes.length; i++) + { + if (suppliedArgTypes[i] == null) + { + // by definition a non-existant argument type (null) can be converted to everything + continue; + } + else if (typeMapping.containsKey(suppliedArgTypes[i])) + { + Class primitiveType = + (Class) typeMapping.get(suppliedArgTypes[i]); + if (!(methodArgTypes[i].isAssignableFrom(suppliedArgTypes[i]) + || methodArgTypes[i].isAssignableFrom(primitiveType))) + return false; + } + else if (!methodArgTypes[i].isAssignableFrom(suppliedArgTypes[i])) + return false; + } - return true; - } + return true; + } } diff --git a/libjava/classpath/gnu/java/beans/decoder/NullHandler.java b/libjava/classpath/gnu/java/beans/decoder/NullHandler.java index 549617db3cb..01c9727d415 100644 --- a/libjava/classpath/gnu/java/beans/decoder/NullHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/NullHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/ObjectContext.java b/libjava/classpath/gnu/java/beans/decoder/ObjectContext.java index cf88a2c2c5c..883c1d600a6 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ObjectContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/ObjectContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/ObjectHandler.java b/libjava/classpath/gnu/java/beans/decoder/ObjectHandler.java index dc5b3290bb1..ececfbbe272 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ObjectHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ObjectHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -90,78 +90,78 @@ public class ObjectHandler extends AbstractElementHandler // decides whether we are in a static (className present) or dynamic context if (className != null) { - try - { - Class klass = instantiateClass(className); + try + { + Class klass = instantiateClass(className); - // class name exists which means that we are in a static context. - // so we may want to ... - // access a static field if the fieldName exists - if (fieldName != null) - { - try - { - return new ObjectContext(id, - klass.getField(fieldName).get(null)); - } - catch (NoSuchFieldException nsfe) - { - throw new AssemblyException(nsfe); - } - catch (IllegalAccessException iae) - { - throw new AssemblyException(iae); - } - } + // class name exists which means that we are in a static context. + // so we may want to ... + // access a static field if the fieldName exists + if (fieldName != null) + { + try + { + return new ObjectContext(id, + klass.getField(fieldName).get(null)); + } + catch (NoSuchFieldException nsfe) + { + throw new AssemblyException(nsfe); + } + catch (IllegalAccessException iae) + { + throw new AssemblyException(iae); + } + } - // (falling through is important!) - // run a constructor if methodName is "new" or null - if (methodName == null || methodName.equals("new")) - return new ConstructorContext(id, klass); + // (falling through is important!) + // run a constructor if methodName is "new" or null + if (methodName == null || methodName.equals("new")) + return new ConstructorContext(id, klass); - // (falling through is important!) - // run a static method on the given class (if methodName exists, which is implied already) - return new StaticMethodContext(id, klass, methodName); - // XXX: should fail if unexpected attributes are present? - } - catch (ClassNotFoundException cnfe) - { - throw new AssemblyException(cnfe); - } + // (falling through is important!) + // run a static method on the given class (if methodName exists, which is implied already) + return new StaticMethodContext(id, klass, methodName); + // XXX: should fail if unexpected attributes are present? + } + catch (ClassNotFoundException cnfe) + { + throw new AssemblyException(cnfe); + } } else { - // className does not exist which means we are in the context of - // some object and want to ... - // access the get(int index) method if index != null - if (index != null) - { - try - { - // Note: http://java.sun.com/products/jfc/tsc/articles/persistence3/ says - // that will make up a get()-call. But this is wrong because - // tags never return values (to the surrounding context) - return new IndexContext(id, Integer.parseInt(index)); - } - catch (NumberFormatException nfe) - { - throw new AssemblyException(nfe); - } - } + // className does not exist which means we are in the context of + // some object and want to ... + // access the get(int index) method if index != null + if (index != null) + { + try + { + // Note: http://java.sun.com/products/jfc/tsc/articles/persistence3/ says + // that will make up a get()-call. But this is wrong because + // tags never return values (to the surrounding context) + return new IndexContext(id, Integer.parseInt(index)); + } + catch (NumberFormatException nfe) + { + throw new AssemblyException(nfe); + } + } - // access a method if methodName exists - if (methodName != null) - return new MethodContext(id, methodName); + // access a method if methodName exists + if (methodName != null) + return new MethodContext(id, methodName); - // (falling through is important!) - // access a property if a propertyName exists - if (propertyName != null && propertyName.length() > 0) - // this is reported as an ordinary method access where the propertyName is - // converted into a 'getter'-method name: convert first character of property name - // to upper case and prepend 'get' - // Note: This will be a getter-method because the tag implies that a return - // value is expected. - return new PropertyContext(id, propertyName); + // (falling through is important!) + // access a property if a propertyName exists + if (propertyName != null && propertyName.length() > 0) + // this is reported as an ordinary method access where the propertyName is + // converted into a 'getter'-method name: convert first character of property name + // to upper case and prepend 'get' + // Note: This will be a getter-method because the tag implies that a return + // value is expected. + return new PropertyContext(id, propertyName); } throw new AssemblyException(new IllegalArgumentException("Wrong or missing attributes for tag.")); diff --git a/libjava/classpath/gnu/java/beans/decoder/PersistenceParser.java b/libjava/classpath/gnu/java/beans/decoder/PersistenceParser.java index 4eb37abef97..c4c8866c3c7 100644 --- a/libjava/classpath/gnu/java/beans/decoder/PersistenceParser.java +++ b/libjava/classpath/gnu/java/beans/decoder/PersistenceParser.java @@ -62,424 +62,424 @@ import org.xml.sax.helpers.DefaultHandler; */ public class PersistenceParser extends DefaultHandler implements Context { - /** The ExceptionListener instance which is informed of non-critical parsing exceptions. - */ - private ExceptionListener exceptionListener; + /** The ExceptionListener instance which is informed of non-critical parsing exceptions. + */ + private ExceptionListener exceptionListener; - /** When an element was not usable all elements inside it should be skipped. - * This is done by skipping startElement() and endElement() invocations whenever - * this value is above 0. - */ - private int skipElement; + /** When an element was not usable all elements inside it should be skipped. + * This is done by skipping startElement() and endElement() invocations whenever + * this value is above 0. + */ + private int skipElement; - /** Stores the Creator instances which can instantiate the appropriate handler implementation - * for a given element. - */ - private HashMap handlerCreators = new HashMap(); + /** Stores the Creator instances which can instantiate the appropriate handler implementation + * for a given element. + */ + private HashMap handlerCreators = new HashMap(); - /** Denotes the current ElementHandler. To avoid checking for null-values it is pre-assigned - * with a DummyHandler instance which must not be used but acts as a root element. - */ - private ElementHandler currentHandler; + /** Denotes the current ElementHandler. To avoid checking for null-values it is pre-assigned + * with a DummyHandler instance which must not be used but acts as a root element. + */ + private ElementHandler currentHandler; - /** The real root element that stores all objects created during parsing. - * Package-private to avoid an accessor method. - */ - JavaHandler javaHandler; + /** The real root element that stores all objects created during parsing. + * Package-private to avoid an accessor method. + */ + JavaHandler javaHandler; - /** Stores the decoded objects. */ - private List objects = new LinkedList(); + /** Stores the decoded objects. */ + private List objects = new LinkedList(); - /** The XMLDecoder instance that started this PersistenceParser */ - private XMLDecoder decoder; + /** The XMLDecoder instance that started this PersistenceParser */ + private XMLDecoder decoder; - /** Creates a PersistenceParser which reads XML data from the given InputStream, reports - * exceptions to ExceptionListener instance, stores resulting object in the DecoderContext - * and uses the given ClassLoader to resolve classes. - * - * @param inputStream - * @param exceptionListener - * @param decoderContext - * @param cl - */ - public PersistenceParser( - InputStream inputStream, - ExceptionListener exceptionListener, - ClassLoader cl, - XMLDecoder decoder) - { + /** Creates a PersistenceParser which reads XML data from the given InputStream, reports + * exceptions to ExceptionListener instance, stores resulting object in the DecoderContext + * and uses the given ClassLoader to resolve classes. + * + * @param inputStream + * @param exceptionListener + * @param decoderContext + * @param cl + */ + public PersistenceParser( + InputStream inputStream, + ExceptionListener exceptionListener, + ClassLoader cl, + XMLDecoder decoder) + { - this.exceptionListener = exceptionListener; - this.decoder = decoder; + this.exceptionListener = exceptionListener; + this.decoder = decoder; - DummyHandler dummyHandler = new DummyHandler(); - currentHandler = dummyHandler; - javaHandler = new JavaHandler(dummyHandler, this, cl); + DummyHandler dummyHandler = new DummyHandler(); + currentHandler = dummyHandler; + javaHandler = new JavaHandler(dummyHandler, this, cl); - SAXParserFactory factory = SAXParserFactory.newInstance(); + SAXParserFactory factory = SAXParserFactory.newInstance(); - SAXParser parser; - try - { - parser = factory.newSAXParser(); - } - catch (ParserConfigurationException pce) - { - // should not happen when a parser is available because we did - // not request any requirements on the XML parser - throw (InternalError) new InternalError( - "No SAX Parser available.").initCause( - pce); - } - catch (SAXException saxe) - { - // should not happen when a parser is available because we did - // not request any requirements on the XML parser - throw (InternalError) new InternalError( - "No SAX Parser available.").initCause( - saxe); - } + SAXParser parser; + try + { + parser = factory.newSAXParser(); + } + catch (ParserConfigurationException pce) + { + // should not happen when a parser is available because we did + // not request any requirements on the XML parser + throw (InternalError) new InternalError( + "No SAX Parser available.").initCause( + pce); + } + catch (SAXException saxe) + { + // should not happen when a parser is available because we did + // not request any requirements on the XML parser + throw (InternalError) new InternalError( + "No SAX Parser available.").initCause( + saxe); + } - // prepares a map of Creator instances which can instantiate a handler which is - // appropriate for the tag that is used as a key for the Creator - handlerCreators.put("java", new JavaHandlerCreator()); + // prepares a map of Creator instances which can instantiate a handler which is + // appropriate for the tag that is used as a key for the Creator + handlerCreators.put("java", new JavaHandlerCreator()); - // calls methods (properties), constructors, access fields - handlerCreators.put("object", new ObjectHandlerCreator()); - handlerCreators.put("void", new VoidHandlerCreator()); + // calls methods (properties), constructors, access fields + handlerCreators.put("object", new ObjectHandlerCreator()); + handlerCreators.put("void", new VoidHandlerCreator()); - handlerCreators.put("array", new ArrayHandlerCreator()); + handlerCreators.put("array", new ArrayHandlerCreator()); - // these handler directly create an Object (or null) - handlerCreators.put("class", new ClassHandlerCreator()); - handlerCreators.put("null", new NullHandlerCreator()); + // these handler directly create an Object (or null) + handlerCreators.put("class", new ClassHandlerCreator()); + handlerCreators.put("null", new NullHandlerCreator()); - handlerCreators.put("char", new CharHandlerCreator()); - handlerCreators.put("string", new StringHandlerCreator()); - handlerCreators.put("boolean", new BooleanHandlerCreator()); - handlerCreators.put("byte", new ByteHandlerCreator()); - handlerCreators.put("short", new ShortHandlerCreator()); - handlerCreators.put("int", new IntHandlerCreator()); - handlerCreators.put("long", new LongHandlerCreator()); - handlerCreators.put("float", new FloatHandlerCreator()); - handlerCreators.put("double", new DoubleHandlerCreator()); + handlerCreators.put("char", new CharHandlerCreator()); + handlerCreators.put("string", new StringHandlerCreator()); + handlerCreators.put("boolean", new BooleanHandlerCreator()); + handlerCreators.put("byte", new ByteHandlerCreator()); + handlerCreators.put("short", new ShortHandlerCreator()); + handlerCreators.put("int", new IntHandlerCreator()); + handlerCreators.put("long", new LongHandlerCreator()); + handlerCreators.put("float", new FloatHandlerCreator()); + handlerCreators.put("double", new DoubleHandlerCreator()); - // parses the data and sends all exceptions to the ExceptionListener - try - { - parser.parse(inputStream, this); - } - catch (SAXException saxe) - { - exceptionListener.exceptionThrown( - new IllegalArgumentException("XML data not well-formed.")); - } - catch (IOException ioe) - { - exceptionListener.exceptionThrown(ioe); - } - } + // parses the data and sends all exceptions to the ExceptionListener + try + { + parser.parse(inputStream, this); + } + catch (SAXException saxe) + { + exceptionListener.exceptionThrown( + new IllegalArgumentException("XML data not well-formed.")); + } + catch (IOException ioe) + { + exceptionListener.exceptionThrown(ioe); + } + } - public void startElement( - String uri, - String localName, - String qName, - Attributes attributes) - throws SAXException - { - /* The element is skipped if - * a) the current handler has already failed or a previous error occured - * which makes all children obsolete - */ - if (currentHandler.hasFailed() || skipElement > 0) - { - exceptionListener.exceptionThrown( - new IllegalArgumentException( - "Element unusable due to previous error: " + qName)); + public void startElement( + String uri, + String localName, + String qName, + Attributes attributes) + throws SAXException + { + /* The element is skipped if + * a) the current handler has already failed or a previous error occured + * which makes all children obsolete + */ + if (currentHandler.hasFailed() || skipElement > 0) + { + exceptionListener.exceptionThrown( + new IllegalArgumentException( + "Element unusable due to previous error: " + qName)); - skipElement++; + skipElement++; - return; - } + return; + } - /* b) Subelements are not allowed within the current ElementHandler. - */ - if (!currentHandler.isSubelementAllowed(qName)) - { - exceptionListener.exceptionThrown( - new IllegalArgumentException( - "Element is not allowed here: " + qName)); + /* b) Subelements are not allowed within the current ElementHandler. + */ + if (!currentHandler.isSubelementAllowed(qName)) + { + exceptionListener.exceptionThrown( + new IllegalArgumentException( + "Element is not allowed here: " + qName)); - skipElement++; + skipElement++; - return; - } + return; + } - /* c) The tag name is not a key in the map of Creator instances. This means that - * either the XML data is of a newer version or simply contains a miss-spelled element. - */ - if (!handlerCreators.containsKey(qName)) - { - exceptionListener.exceptionThrown( - new IllegalArgumentException( - "Element unusable because tag is unknown: " + qName)); + /* c) The tag name is not a key in the map of Creator instances. This means that + * either the XML data is of a newer version or simply contains a miss-spelled element. + */ + if (!handlerCreators.containsKey(qName)) + { + exceptionListener.exceptionThrown( + new IllegalArgumentException( + "Element unusable because tag is unknown: " + qName)); - skipElement++; + skipElement++; - return; - } + return; + } - // creates a new handler for the new element - AbstractElementHandler handler = - ((Creator) handlerCreators.get(qName)).createHandler( - currentHandler); + // creates a new handler for the new element + AbstractElementHandler handler = + ((Creator) handlerCreators.get(qName)).createHandler( + currentHandler); - // makes it the current handler to receive character data - currentHandler = handler; + // makes it the current handler to receive character data + currentHandler = handler; - // starts the handler - currentHandler.start(attributes, exceptionListener); - } + // starts the handler + currentHandler.start(attributes, exceptionListener); + } - public void endElement(String uri, String localName, String qName) - throws SAXException - { - // skips processing the current handler if we are parsing an element - // which was marked invalid (in startElement() ) - if (skipElement > 0) - { - skipElement--; - return; - } + public void endElement(String uri, String localName, String qName) + throws SAXException + { + // skips processing the current handler if we are parsing an element + // which was marked invalid (in startElement() ) + if (skipElement > 0) + { + skipElement--; + return; + } - // invokes the handler's finishing method - currentHandler.end(exceptionListener); + // invokes the handler's finishing method + currentHandler.end(exceptionListener); - // removes the current handler and reactivates its parent - currentHandler = currentHandler.getParent(); - } + // removes the current handler and reactivates its parent + currentHandler = currentHandler.getParent(); + } - /** Transfers character data to the current handler - */ - public void characters(char[] ch, int start, int length) - throws SAXException - { - // prevents sending character data of invalid elements - if (skipElement > 0) - return; + /** Transfers character data to the current handler + */ + public void characters(char[] ch, int start, int length) + throws SAXException + { + // prevents sending character data of invalid elements + if (skipElement > 0) + return; - currentHandler.characters(ch, start, length); - } + currentHandler.characters(ch, start, length); + } - /** Creator interface provided a mechanism to instantiate ElementHandler instances - * for the appropriate tag. - * - * @author Robert Schuster - */ - interface Creator - { - /** Creates an ElementHandler instance using the given ElementHandler as its parent. - * - * @param parent The parent ElementHandler of the result. - * @return A new ElementHandler instance. - */ - AbstractElementHandler createHandler(ElementHandler parent); - } + /** Creator interface provided a mechanism to instantiate ElementHandler instances + * for the appropriate tag. + * + * @author Robert Schuster + */ + interface Creator + { + /** Creates an ElementHandler instance using the given ElementHandler as its parent. + * + * @param parent The parent ElementHandler of the result. + * @return A new ElementHandler instance. + */ + AbstractElementHandler createHandler(ElementHandler parent); + } - class BooleanHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new BooleanHandler(parent); - } - } + class BooleanHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new BooleanHandler(parent); + } + } - class ByteHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new ByteHandler(parent); - } - } + class ByteHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new ByteHandler(parent); + } + } - class ShortHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new ShortHandler(parent); - } - } + class ShortHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new ShortHandler(parent); + } + } - class IntHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new IntHandler(parent); - } - } + class IntHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new IntHandler(parent); + } + } - class LongHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new LongHandler(parent); - } - } + class LongHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new LongHandler(parent); + } + } - class FloatHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new FloatHandler(parent); - } - } + class FloatHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new FloatHandler(parent); + } + } - class DoubleHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new DoubleHandler(parent); - } - } + class DoubleHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new DoubleHandler(parent); + } + } - class CharHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new CharHandler(parent); - } - } + class CharHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new CharHandler(parent); + } + } - class StringHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new StringHandler(parent); - } - } + class StringHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new StringHandler(parent); + } + } - class JavaHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return javaHandler; - } - } + class JavaHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return javaHandler; + } + } - class ObjectHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new ObjectHandler(parent); - } - } + class ObjectHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new ObjectHandler(parent); + } + } - class VoidHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new VoidHandler(parent); - } - } + class VoidHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new VoidHandler(parent); + } + } - class ClassHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new ClassHandler(parent); - } - } + class ClassHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new ClassHandler(parent); + } + } - class NullHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new NullHandler(parent); - } - } + class NullHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new NullHandler(parent); + } + } - class ArrayHandlerCreator implements Creator - { - public AbstractElementHandler createHandler(ElementHandler parent) - { - return new ArrayHandler(parent); - } - } + class ArrayHandlerCreator implements Creator + { + public AbstractElementHandler createHandler(ElementHandler parent) + { + return new ArrayHandler(parent); + } + } - /** Adds a decoded object to the Context. */ - public void addParameterObject(Object o) throws AssemblyException - { - objects.add(o); - } + /** Adds a decoded object to the Context. */ + public void addParameterObject(Object o) throws AssemblyException + { + objects.add(o); + } - public void notifyStatement(Context outerContext) throws AssemblyException - { - // can be ignored because theis Context does not react to statement and expressions - // differently - } + public void notifyStatement(Context outerContext) throws AssemblyException + { + // can be ignored because theis Context does not react to statement and expressions + // differently + } - public Object endContext(Context outerContext) throws AssemblyException - { - return null; - } + public Object endContext(Context outerContext) throws AssemblyException + { + return null; + } - public boolean subContextFailed() - { - // failing of subcontexts is no problem for the mother of all contexts - return false; - } + public boolean subContextFailed() + { + // failing of subcontexts is no problem for the mother of all contexts + return false; + } - public void set(int index, Object o) throws AssemblyException - { - // not supported - throw new AssemblyException( - new IllegalArgumentException("Set method is not allowed in decoder context.")); - } + public void set(int index, Object o) throws AssemblyException + { + // not supported + throw new AssemblyException( + new IllegalArgumentException("Set method is not allowed in decoder context.")); + } - public Object get(int index) throws AssemblyException - { - // not supported - throw new AssemblyException( - new IllegalArgumentException("Get method is not allowed in decoder context.")); - } + public Object get(int index) throws AssemblyException + { + // not supported + throw new AssemblyException( + new IllegalArgumentException("Get method is not allowed in decoder context.")); + } - public Object getResult() - { - // returns the XMLDecoder instance which is requested by child contexts this way. - // That is needed to invoke methods on the decoder. - return decoder; - } + public Object getResult() + { + // returns the XMLDecoder instance which is requested by child contexts this way. + // That is needed to invoke methods on the decoder. + return decoder; + } - public void setId(String id) - { - exceptionListener.exceptionThrown(new IllegalArgumentException("id attribute is not allowed for tag.")); - } + public void setId(String id) + { + exceptionListener.exceptionThrown(new IllegalArgumentException("id attribute is not allowed for tag.")); + } - public String getId() - { - // appears to have no id - return null; - } + public String getId() + { + // appears to have no id + return null; + } - public boolean isStatement() - { - // this context is a statement by definition because it never returns anything to a parent because - // there is no such parent (DummyContext does not count!) - return true; - } + public boolean isStatement() + { + // this context is a statement by definition because it never returns anything to a parent because + // there is no such parent (DummyContext does not count!) + return true; + } - public void setStatement(boolean b) - { - // ignores that because this Context is always a statement - } + public void setStatement(boolean b) + { + // ignores that because this Context is always a statement + } - /** Returns an Iterator instance which returns the decoded objects. - * - * This method is used by the XMLDecoder directly. - */ - public Iterator iterator() - { - return objects.iterator(); - } + /** Returns an Iterator instance which returns the decoded objects. + * + * This method is used by the XMLDecoder directly. + */ + public Iterator iterator() + { + return objects.iterator(); + } } diff --git a/libjava/classpath/gnu/java/beans/decoder/PropertyContext.java b/libjava/classpath/gnu/java/beans/decoder/PropertyContext.java index 838ef814b01..15751cdbcaa 100644 --- a/libjava/classpath/gnu/java/beans/decoder/PropertyContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/PropertyContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -74,7 +74,7 @@ class PropertyContext extends AbstractObjectContext throw new AssemblyException(new IllegalArgumentException("Property attribut allows zero or one argument only.")); argument = o; - setStatement(true); + setStatement(true); prefix = "set"; } @@ -91,8 +91,8 @@ class PropertyContext extends AbstractObjectContext if (outerObject == null) throw new AssemblyException(new NullPointerException("No object to access property " - + propertyName)); - + + propertyName)); + // converts property name into a method name String methodName = prefix + propertyName.substring(0, 1).toUpperCase() @@ -103,23 +103,23 @@ class PropertyContext extends AbstractObjectContext try { - Method method = MethodFinder.getMethod(outerObject.getClass(), - methodName, args); + Method method = MethodFinder.getMethod(outerObject.getClass(), + methodName, args); - // stores the result whether it is available or not - setObject(method.invoke(outerObject, args)); + // stores the result whether it is available or not + setObject(method.invoke(outerObject, args)); } catch (NoSuchMethodException nsme) { - throw new AssemblyException(nsme); + throw new AssemblyException(nsme); } catch (InvocationTargetException ite) { - throw new AssemblyException(ite.getCause()); + throw new AssemblyException(ite.getCause()); } catch (IllegalAccessException iae) { - throw new AssemblyException(iae); + throw new AssemblyException(iae); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/ShortHandler.java b/libjava/classpath/gnu/java/beans/decoder/ShortHandler.java index ab6ddbece26..c5de50ab97e 100644 --- a/libjava/classpath/gnu/java/beans/decoder/ShortHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/ShortHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/SimpleHandler.java b/libjava/classpath/gnu/java/beans/decoder/SimpleHandler.java index bc187e8a052..1c43bb0c7e7 100644 --- a/libjava/classpath/gnu/java/beans/decoder/SimpleHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/SimpleHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -65,7 +65,7 @@ abstract class SimpleHandler extends AbstractElementHandler protected final Context startElement(Attributes attributes, ExceptionListener exceptionListener) throws AssemblyException { - + // note: simple elements should not have any attributes. We inform // the user of this syntactical but uncritical problem by sending // an IllegalArgumentException for each unneccessary attribute @@ -79,7 +79,7 @@ abstract class SimpleHandler extends AbstractElementHandler + "' discarded."); exceptionListener.exceptionThrown(e); } - + return context = new ObjectContext(); } @@ -89,11 +89,11 @@ abstract class SimpleHandler extends AbstractElementHandler // reports the number when the character data can be parsed try { - context.setObject(parse(characters)); + context.setObject(parse(characters)); } catch (NumberFormatException nfe) { - throw new AssemblyException(nfe); + throw new AssemblyException(nfe); } } diff --git a/libjava/classpath/gnu/java/beans/decoder/StaticMethodContext.java b/libjava/classpath/gnu/java/beans/decoder/StaticMethodContext.java index 959c949f77b..b2cf0e6021e 100644 --- a/libjava/classpath/gnu/java/beans/decoder/StaticMethodContext.java +++ b/libjava/classpath/gnu/java/beans/decoder/StaticMethodContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -75,21 +75,21 @@ class StaticMethodContext extends AbstractCreatableObjectContext try { - Method method = MethodFinder.getMethod(klass, methodName, args); - return method.invoke(null, args); + Method method = MethodFinder.getMethod(klass, methodName, args); + return method.invoke(null, args); } catch (NoSuchMethodException nsme) { - throw new AssemblyException(nsme); + throw new AssemblyException(nsme); } catch (InvocationTargetException ite) { - // rethrows the reason for the InvocationTargetsException (ie. the exception in the called code) - throw new AssemblyException(ite.getCause()); + // rethrows the reason for the InvocationTargetsException (ie. the exception in the called code) + throw new AssemblyException(ite.getCause()); } catch (IllegalAccessException iae) { - throw new AssemblyException(iae); + throw new AssemblyException(iae); } } } diff --git a/libjava/classpath/gnu/java/beans/decoder/StringHandler.java b/libjava/classpath/gnu/java/beans/decoder/StringHandler.java index 6f2311a9e62..97fc57efd91 100644 --- a/libjava/classpath/gnu/java/beans/decoder/StringHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/StringHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/decoder/VoidHandler.java b/libjava/classpath/gnu/java/beans/decoder/VoidHandler.java index ca3664bbed1..56f31563943 100644 --- a/libjava/classpath/gnu/java/beans/decoder/VoidHandler.java +++ b/libjava/classpath/gnu/java/beans/decoder/VoidHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -86,7 +86,7 @@ public class VoidHandler extends AbstractElementHandler return new ConstructorContext(id, klass); // (falling through is important!) - // run a static method on the given class (if methodName exists, which is implied already) + // run a static method on the given class (if methodName exists, which is implied already) return new StaticMethodContext(id, klass, methodName); } catch (ClassNotFoundException cnfe) diff --git a/libjava/classpath/gnu/java/beans/editors/ColorEditor.java b/libjava/classpath/gnu/java/beans/editors/ColorEditor.java index b099eb2f0e9..cb69344cb1a 100644 --- a/libjava/classpath/gnu/java/beans/editors/ColorEditor.java +++ b/libjava/classpath/gnu/java/beans/editors/ColorEditor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,51 +50,51 @@ import java.beans.PropertyEditorSupport; **/ public class ColorEditor extends PropertyEditorSupport { - Color[] stdColors = {Color.black,Color.blue,Color.cyan, - Color.darkGray,Color.gray,Color.green, - Color.lightGray,Color.magenta,Color.orange, - Color.pink,Color.red,Color.white, - Color.yellow}; - String[] stdColorNames = {"black","blue","cyan", - "dark gray","gray","green", - "light gray","magenta","orange", - "pink","red","white", - "yellow"}; + Color[] stdColors = {Color.black,Color.blue,Color.cyan, + Color.darkGray,Color.gray,Color.green, + Color.lightGray,Color.magenta,Color.orange, + Color.pink,Color.red,Color.white, + Color.yellow}; + String[] stdColorNames = {"black","blue","cyan", + "dark gray","gray","green", + "light gray","magenta","orange", + "pink","red","white", + "yellow"}; - /** setAsText for Color checks for standard color names - ** and then checks for a #RRGGBB value or just RRGGBB, - ** both in hex. - **/ - public void setAsText(String val) throws IllegalArgumentException { - if(val.length() == 0) { - throw new IllegalArgumentException("Tried to set empty value!"); - } - for(int i=0;iThe ClassPersistenceDelegate creates * Expression instances which denote class resolutions.

      - * + * *

      The class resolution is always the last step when serializing a tree * of objects. Due to the recursive nature of the algorithm we need a way * to end the recursion. This is achieved by the implementation of this @@ -52,8 +52,8 @@ import java.beans.PersistenceDelegate; * we call getClass() on a String.class instance. * This in turn lead to the resolution of the String class which is always * encoded as "".getClass(). Finally the Encoder - * treats strings in a special way so that the recursion ends here. - * + * treats strings in a special way so that the recursion ends here. + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class ClassPersistenceDelegate extends PersistenceDelegate @@ -62,7 +62,7 @@ public class ClassPersistenceDelegate extends PersistenceDelegate protected Expression instantiate(Object oldInstance, Encoder out) { Class oldClass = (Class) oldInstance; - + // Due to the special handling of String instances in the Encoder // this Expression does not lead to further class resolutions. if (oldClass == String.class) @@ -72,7 +72,7 @@ public class ClassPersistenceDelegate extends PersistenceDelegate if (oldClass == Class.class) return new Expression(oldClass, String.class, "getClass", null); - // This Expression will lead to the class resolution of Class.class. + // This Expression will lead to the class resolution of Class.class. return new Expression(oldClass, Class.class, "forName", new Object[] { oldClass.getName() }); } diff --git a/libjava/classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java b/libjava/classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java index f1375d2ec18..bdf6fda6233 100644 --- a/libjava/classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java +++ b/libjava/classpath/gnu/java/beans/encoder/CollectionPersistenceDelegate.java @@ -7,7 +7,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,10 +49,10 @@ import java.util.Iterator; /**

      A PersistenceDelegate implementation that calls * the no-argument constructor to create the Collection instance and * uses an iterator to add all the objects it reaches through it.

      - * + * *

      It is used for Set and List * implementations.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class CollectionPersistenceDelegate extends PersistenceDelegate diff --git a/libjava/classpath/gnu/java/beans/encoder/Context.java b/libjava/classpath/gnu/java/beans/encoder/Context.java index 9126d496fc5..8acc4907b38 100644 --- a/libjava/classpath/gnu/java/beans/encoder/Context.java +++ b/libjava/classpath/gnu/java/beans/encoder/Context.java @@ -41,20 +41,20 @@ package gnu.java.beans.encoder; /** A Contect object describes the current state * and the call number while processing the original object * tree in the {@link ScanEngine}. - * + * *

      The class allows to distinguish the different calling states * and is neccessary for the child element skipping feature of - * the {@link GenericScannerState}.

      - * + * the {@link GenericScannerState}.

      + * * @author Robert Schuster (robertschuster@fsfe.org) * */ public class Context { private String state; - + private int call; - + Context(String newState, int newCall) { state = newState; @@ -66,21 +66,21 @@ public class Context int hc = 7; hc = 31 * hc + state.hashCode(); hc = 31 * hc + call; - + return hc; } - + public boolean equals(Object o) { if (!(o instanceof Context)) return false; - + Context that = (Context) o; - + return state.equals(that.state) && call == that.call; } - + public String toString() { return "Context [state=" + state + ", call=" + call + "]"; diff --git a/libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java b/libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java index 3c3f8a3d2e7..b07771dbe41 100644 --- a/libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java +++ b/libjava/classpath/gnu/java/beans/encoder/GenericScannerState.java @@ -60,12 +60,12 @@ import gnu.java.beans.encoder.elements.StringReference; * This class is a {@link ScannerState} implementation that creates * suitable {@link gnu.java.beans.encoder.elements.Element} instances * for each transition variant. - * + * *

      Furthermore it can optionally skip a certain number of child - * elements. The algorithm can cope with the fact that one + * elements. The algorithm can cope with the fact that one * GenericScannerState instance may be called at * different levels of recursions.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ class GenericScannerState extends ScannerState @@ -89,19 +89,19 @@ class GenericScannerState extends ScannerState if (skipElements > 0) skipValues = new HashMap(); } - + protected void enterImpl(Context ctx) { if (skipValues != null) { Integer skip = (Integer) skipValues.get(ctx); - + if (skip == null) { skip = Integer.valueOf(initialSkipElements); skipValues.put(ctx, skip); } - + skipElements = skip.intValue(); } } diff --git a/libjava/classpath/gnu/java/beans/encoder/IgnoringScannerState.java b/libjava/classpath/gnu/java/beans/encoder/IgnoringScannerState.java index 054f1f0051c..3ec78cdf9ff 100644 --- a/libjava/classpath/gnu/java/beans/encoder/IgnoringScannerState.java +++ b/libjava/classpath/gnu/java/beans/encoder/IgnoringScannerState.java @@ -40,7 +40,7 @@ package gnu.java.beans.encoder; /** A special {@link ScannerState} implementation that ignores all child * elements. - * + * *

      Consider the call hierarchy: * * methodInvocation @@ -50,16 +50,16 @@ package gnu.java.beans.encoder; * classResolution * *

      - * + * *

      When the ignoring state is active one can filter the elements of * one level. One has to set up the state machine that a transition * via "class resolution" from a state that was reached via "object * instantation" reaches an IgnoringScannerState.

      - * + * *

      Setting the default successor of a IgnoringScannerState * to itself causes all elements of the call hierarchy to be skipped - * until another state is reached by going back.

      - * + * until another state is reached by going back.

      + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -125,9 +125,9 @@ class IgnoringScannerState extends ScannerState void objectReference(ObjectId id) { } - + void end() { } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java b/libjava/classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java index 84cdce94dbe..9ffdb5686ce 100644 --- a/libjava/classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java +++ b/libjava/classpath/gnu/java/beans/encoder/MapPersistenceDelegate.java @@ -8,7 +8,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/beans/encoder/ObjectId.java b/libjava/classpath/gnu/java/beans/encoder/ObjectId.java index eca5c3da477..13d75d6bba4 100644 --- a/libjava/classpath/gnu/java/beans/encoder/ObjectId.java +++ b/libjava/classpath/gnu/java/beans/encoder/ObjectId.java @@ -45,7 +45,7 @@ import java.util.HashMap; * ObjectId provides an object identification mechanism which gives each object * a name in the form <class><Nameindex>. *

      - * + * *

      * Each id can be in an unused state which means that only one instance of the * object is in use and a special id is not needed. Certain {@link @@ -57,7 +57,7 @@ import java.util.HashMap; * The second user should then invoke the {@link #init} method to generate the * identification string and bring the id in the 'used' state. *

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class ObjectId diff --git a/libjava/classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java b/libjava/classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java index 8cb3705b4d8..55626b512c2 100644 --- a/libjava/classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java +++ b/libjava/classpath/gnu/java/beans/encoder/PrimitivePersistenceDelegate.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,7 +44,7 @@ import java.beans.PersistenceDelegate; /** * A shared PersistenceDelegate implementation for all primitive types. - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class PrimitivePersistenceDelegate extends PersistenceDelegate @@ -70,5 +70,5 @@ public class PrimitivePersistenceDelegate extends PersistenceDelegate out.writeExpression(new Expression(oldInstance, oldInstance.getClass(), "new", new Object[] { oldInstance.toString() })); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/ReportingScannerState.java b/libjava/classpath/gnu/java/beans/encoder/ReportingScannerState.java index fb6e061ae4d..c91bb1567d0 100644 --- a/libjava/classpath/gnu/java/beans/encoder/ReportingScannerState.java +++ b/libjava/classpath/gnu/java/beans/encoder/ReportingScannerState.java @@ -42,7 +42,7 @@ package gnu.java.beans.encoder; * A ScannerState implementation that prints useful details * about its arguments. Use it when the XML encoding does not work correctly * and you want to find out how things relate to each other. - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ class ReportingScannerState extends ScannerState @@ -50,12 +50,12 @@ class ReportingScannerState extends ScannerState void methodInvocation(String methodName) { - System.out.println("methodInvocation: " + methodName + "()"); + System.out.println("methodInvocation: " + methodName + "()"); } void staticMethodInvocation(String className, String methodName) { - System.out.println("staticMethodInvocation: " + className + "." + methodName + "()"); + System.out.println("staticMethodInvocation: " + className + "." + methodName + "()"); } void staticFieldAccess(String className, String fieldName) @@ -65,17 +65,17 @@ class ReportingScannerState extends ScannerState void classResolution(String className) { - System.out.println("classResolution: " + className); + System.out.println("classResolution: " + className); } void objectInstantiation(String className, ObjectId objectId) { - System.out.println("objectInstantiation: " + className); + System.out.println("objectInstantiation: " + className); } void primitiveInstantiation(String primitiveName, String valueAsString) { - System.out.println("primitiveInstantiation: (" + primitiveName + ") " + valueAsString); + System.out.println("primitiveInstantiation: (" + primitiveName + ") " + valueAsString); } void objectArrayInstantiation(String arrayClassName, String lengthAsString, ObjectId objectId) @@ -90,27 +90,27 @@ class ReportingScannerState extends ScannerState void arraySet(String indexAsString) { - System.out.println("arraySet: " + indexAsString); + System.out.println("arraySet: " + indexAsString); } void arrayGet(String indexAsString) { - System.out.println("arrayGet: " + indexAsString); + System.out.println("arrayGet: " + indexAsString); } void listGet() { - System.out.println("listGet"); + System.out.println("listGet"); } void listSet() { - System.out.println("listSet"); + System.out.println("listSet"); } void nullObject() { - System.out.println("nullObject"); + System.out.println("nullObject"); } void stringReference(String string) @@ -125,7 +125,7 @@ class ReportingScannerState extends ScannerState void end() { - System.out.println("-close"); + System.out.println("-close"); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/Root.java b/libjava/classpath/gnu/java/beans/encoder/Root.java index f4eade1939d..a6410d716cc 100644 --- a/libjava/classpath/gnu/java/beans/encoder/Root.java +++ b/libjava/classpath/gnu/java/beans/encoder/Root.java @@ -46,14 +46,14 @@ import gnu.java.beans.encoder.elements.Element; /**

      Root provides a simple interface to a tree of * objects.

      - * + * *

      Using an instance of this class a logical representation of * the real object tree that is serialized can be built. When the * actual data should be written as XML Root and * {@link gnu.java.beans.encoder.elements.Element} class can provide * context information which is used to write the best fitting * XML representation.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class Root @@ -61,7 +61,7 @@ public class Root private Stack parents = new Stack(); private Element rootElement, current; - + private boolean started; public Root() @@ -70,10 +70,10 @@ public class Root } /**

      Adds another child element to the tree.

      - * + * *

      The new element automatically becomes the current * element.

      - * + * * @param elem The new child element. */ public void addChild(Element elem) @@ -88,7 +88,7 @@ public class Root *

      Marks that the end of the current element * is reached and that no more childs are added to * it.

      - * + * *

      The behavior is to return to the nearest parent * element.

      */ @@ -100,7 +100,7 @@ public class Root /** *

      Goes back to the nearest parent element but * deletes the just created child.

      - * + * *

      This is used if something went wrong while * processing the child element's {@link java.beans.Expression} * or {@link java.beans.Statement}.

      @@ -117,9 +117,9 @@ public class Root *

      Traverses the elements in the object tree * and creates their XML representation in the output * stream of the given {@link Writer}.

      - * + * *

      Finally the Writer is flushed.

      - * + * * @param writer The Writer instance that generates the XML representation. */ public void traverse(Writer writer) @@ -130,16 +130,16 @@ public class Root rootElement.writeStart(writer); } started = true; - + traverse(writer, rootElement.iterator()); - + rootElement.clear(); - + writer.flush(); } /** Writes the closing element and closes the {@link Writer} - * + * * @param writer The Writer instance that generates the XML representation. */ public void close(Writer writer) @@ -149,7 +149,7 @@ public class Root } /** Recursively traverses the object tree. - * + * * @param writer The Writer instance that generates the XML representation. * @param ite An Iterator returning Element instances. */ @@ -163,19 +163,19 @@ public class Root traverse(writer, e.iterator()); e.writeEnd(writer); - + e.clear(); } } /**

      A special Element implementation that represents the * encoder's context.

      - * + * *

      This element is written only once per Writer.

      - * + * *

      It is assumed that this element is never empty to simplify * the implementation.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org); * */ @@ -187,7 +187,7 @@ public class Root new String[] { System.getProperty("java.version"), XMLEncoder.class.getName() }, false); } - + public void writeEnd(Writer writer) { writer.writeEnd(false); diff --git a/libjava/classpath/gnu/java/beans/encoder/ScanEngine.java b/libjava/classpath/gnu/java/beans/encoder/ScanEngine.java index b78a8141384..9ced143f0dc 100644 --- a/libjava/classpath/gnu/java/beans/encoder/ScanEngine.java +++ b/libjava/classpath/gnu/java/beans/encoder/ScanEngine.java @@ -1,4 +1,4 @@ -/* ScanEngine.java +/* ScanEngine.java -- Scans the input and generates an object tree that can be written as XML. Copyright (C) 2005 Free Software Foundation, Inc. @@ -54,7 +54,7 @@ import java.util.Stack; * {@link #writeObject} method and feeds it to a state machine. The * state machine then constructs and object tree which is finally * written as XML by a {@link Writer} implementation.

      - * + * *

      How does it work?

      *

      The ScanEngine sits below the {@link java.beans.XMLEncoder} * class and is called by it exclusively. The XMLEncoder sends @@ -65,7 +65,7 @@ import java.util.Stack; * Furthermore the meaning of certain Expressions differs * depending on the enclosing elements or the inner elements have to be * simply discarded.

      - * + * *

      To cope with this state dependant nature the ScanEngine * contains a state machine which is programmed statically (no adjustments are * needed, all ScanEngine engines use the same setup). The @@ -83,7 +83,7 @@ import java.util.Stack; * the current state and then the event method is called in the new current * state. The last step allows the state instance to do something meaningful * to the object tree.

      - * + * *

      The state machine knows the concept of returning to the previous * state. This is done using a stack of states which is popped every * time a call to writeStatement, writeExpression @@ -93,7 +93,7 @@ import java.util.Stack; * ScanEngine itself to decide when an expression or statement * ended. This can only be done in case of {@link #writeObject} calls because * they are not nested.

      - * + * *

      When the XML persistence mechanism reaches an object twice (and more) * it should generate an XML element using the "idref" attribute and add * an "id" attribute to its first instantiation. This complicates things a bit @@ -106,12 +106,12 @@ import java.util.Stack; * instance is stored in the ScanEngine and gets cleared whenever * the {@link #flush} method is called. This method also writes the currently * built object tree and generates the XML representation.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class ScanEngine { - + /** Change this to true to let the ScanEngine print state transition * information. */ @@ -145,7 +145,7 @@ public class ScanEngine /** Stores the relationship between objects and their {@link ObjectId} instance. */ IdentityHashMap objects = new IdentityHashMap(); - + public ScanEngine(OutputStream os) { // TODO: Provide another Writer implementation (e.g. one that does not use @@ -182,7 +182,7 @@ public class ScanEngine "newObj0"); conf = register("newObj0", new GenericScannerState(root)); conf.setDefaultSuccessor("ignoreAll"); - + // Simply use the start state to encode method invocations inside of // objects. conf.putSuccessor(ScannerState.TRANSITION_METHOD_INVOCATION, "start"); @@ -203,14 +203,14 @@ public class ScanEngine conf.putSuccessor(ScannerState.TRANSITION_CLASS_RESOLUTION, "ignoreAll"); conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, "ignoreAll"); - + // Get here when a value is set in the array. register("newOArrayGet", conf = new GenericScannerState(root)); - + conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, "newOArrayGet_ignoreFirstInteger"); - + // "newArrayGet_ignoreFirstInteger" is set up mostly identical like the "start" // state. Otherwise things would not behave the same when done inside // arrays. @@ -223,21 +223,21 @@ public class ScanEngine "newPrimitiveArray"); conf.putSuccessor(ScannerState.TRANSITION_OBJECT_ARRAY_INSTANTIATION, "newObjectArray"); - + conf = register("newOArrayGet_ignoreFirstInteger", new GenericScannerState(root, 1)); - + // In non-int primitive arrays class resolutions can happen // but they should be ignored. conf.putSuccessor(ScannerState.TRANSITION_CLASS_RESOLUTION, "ignoreAll"); - + // Spurious object and string references occur when setting array // elements. This suppresses them. conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, "ignoreAll"); conf.putSuccessor(ScannerState.TRANSITION_OBJECT_REFERENCE, "ignoreAll"); conf.putSuccessor(ScannerState.TRANSITION_STRING_REFERENCE, "ignoreAll"); - + conf.setDefaultSuccessor("start"); // Primitive arrays use the ARRAY_SET transition to create setting the @@ -252,11 +252,11 @@ public class ScanEngine conf.putSuccessor(ScannerState.TRANSITION_CLASS_RESOLUTION, "ignoreAll"); conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, "ignoreAll"); - + conf = register("newPArraySet", new GenericScannerState(root)); conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, "newPArraySet_ignoreFirstInteger"); - + // Primitive arrays ignore all kinds of non-primitive object information. conf.putSuccessor(ScannerState.TRANSITION_OBJECT_REFERENCE, "ignoreAll"); @@ -271,11 +271,11 @@ public class ScanEngine conf = register("newPArraySet_ignoreFirstInteger", new GenericScannerState(root, 1)); - + // In non-int primitive arrays class resolutions can happen // but they should be ignored. conf.putSuccessor(ScannerState.TRANSITION_CLASS_RESOLUTION, "ignoreAll"); - + // Spurious object and string references occur when setting array // elements. This suppresses them. conf.putSuccessor(ScannerState.TRANSITION_PRIMITIVE_INSTANTIATION, @@ -287,7 +287,7 @@ public class ScanEngine } /** Registers a ScannerState under a certain name. - * + * * @param name Name of the state * @param state The ScannerState instance. * @return The second argument. @@ -295,26 +295,26 @@ public class ScanEngine private ScannerState register(String name, ScannerState state) { state.init(name); - + states.put(name, state); return state; } - + /** Generates or returns an id for the given object which can be activated * later if the object is suitable. - * + * *

      Objects are unsuitable if they are an instance of a primitive wrapper * or String.

      - * - * @param value The object to retrieve an id for. + * + * @param value The object to retrieve an id for. * @return The id for the object or null. */ private ObjectId retrieveId(Object value) { Class valueClass = value.getClass(); ObjectId id = null; - + // Although multiple accesses to Class objects are not handled // through ids we generate one for them, too. This allows us to detect // second time references to such objects in the writeObject method @@ -329,13 +329,13 @@ public class ScanEngine objects.put(value, id); } } - + return id; } /** Scans the argument and calls one of event methods. See * the introduction of this class for details. - * + * * @param expr The expression to serialize. */ public void writeExpression(Expression expr) @@ -344,7 +344,7 @@ public class ScanEngine Object[] args = expr.getArguments(); Object target = expr.getTarget(); Object value = null; - + try { value = expr.getValue(); @@ -366,9 +366,9 @@ public class ScanEngine if (methodName.equals("newInstance")) { id = retrieveId(value); - + Class ct = (Class) args[0]; - + if (ct.isPrimitive() || ct == Boolean.class || ct == Byte.class || ct == Short.class || ct == Integer.class || ct == Long.class || ct == Float.class || ct == Double.class) @@ -379,7 +379,7 @@ public class ScanEngine objectArrayInstantiation(ct.getName(), args[1].toString(), id); - + return; } else if (methodName.equals("get")) @@ -398,7 +398,7 @@ public class ScanEngine objectReference(id); end(); } - + return; } else if (methodName.equals("set")) @@ -407,7 +407,7 @@ public class ScanEngine return; } } - + id = retrieveId(value); if (target instanceof Class) @@ -517,7 +517,7 @@ public class ScanEngine /** Scans the argument and calls one of event methods. See * the introduction of this class for details. - * + * * @param stmt The statement to serialize. */ public void writeStatement(Statement stmt) @@ -553,7 +553,7 @@ public class ScanEngine /** Scans the argument and calls one of event methods. See * the introduction of this class for details. - * + * * @param o The object to serialize. */ public boolean writeObject(Object o) @@ -585,9 +585,9 @@ public class ScanEngine end(); return false; } - + // If our object has a corresponding ObjectId instance - // then generate an objectReference. This will + // then generate an objectReference. This will // initialize the id (= brings it in the "used" state) // when this is the first referal. objectReference(id); @@ -622,10 +622,10 @@ public class ScanEngine /** * Does a transition from one state to another using the given event. - * + * *

      This involves saving the current state, retrieving it's * successor and setting it as the current state.

      - * + * * @param transition One of {@link ScannerStates]'s transition constants. */ private void transition(int transition) @@ -633,7 +633,7 @@ public class ScanEngine parents.push(current); String stateName = current.getSuccessor(transition); - + if (DEBUG) { System.err.println("from state: " + current.getName() + "\n\troute: " @@ -641,9 +641,9 @@ public class ScanEngine + "\n\t\tto state: " + stateName); } - + ScannerState newState = (ScannerState) states.get(stateName); - + newState.enter(new Context(current.getName(), current.getCalls())); assert (newState != null) : "State '" + stateName + "' was not defined."; @@ -655,7 +655,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param methodName The name of the method which is called. */ void methodInvocation(String methodName) @@ -669,7 +669,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param methodName The name of the method which is called. * @param className The name of the class in which the method is called. */ @@ -684,7 +684,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param fieldName The name of the field whose value is retrieved. * @param className The name of the class in which the method is called. */ @@ -699,7 +699,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param className The name of the class in which the method is called. */ void classResolution(String className) @@ -713,7 +713,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param className The name of the class in which the method is called. * @param objectId An ObjectId instance which can be activated later. */ @@ -728,7 +728,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param primitiveName One of "boolean, "byte", "short", "int", "long" * , "float" or "double" * @param valueAsString The value of the primitive as a String. @@ -744,7 +744,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param arrayClassName The array's class name. * @param objectId An ObjectId instance which can be activated later. * @param lengthAsString The array's length as String. @@ -761,7 +761,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param arrayClassName The array's class name. * @param objectId An ObjectId instance which can be activated later. * @param lengthAsString The array's length as String. @@ -773,12 +773,12 @@ public class ScanEngine current.objectArrayInstantiation(arrayClassName, lengthAsString, objectId); } - + /** Event method that denotes the setting of a value in an array. * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param indexAsString The index to as a String. */ void arraySet(String indexAsString) @@ -792,7 +792,7 @@ public class ScanEngine * *

      More details about this method can be found in this * class' introduction.

      - * + * * @param indexAsString The index to as a String. */ void arrayGet(String indexAsString) @@ -836,7 +836,7 @@ public class ScanEngine } /** Event method that denotes a string. - * + * * @param string The string that should be written. */ void stringReference(String string) @@ -847,7 +847,7 @@ public class ScanEngine } /** Event method that denotes a reference to an existing object. - * + * * @param id The ObjectId to be used. */ void objectReference(ObjectId id) diff --git a/libjava/classpath/gnu/java/beans/encoder/ScannerState.java b/libjava/classpath/gnu/java/beans/encoder/ScannerState.java index 888478a8efd..14d63056eac 100644 --- a/libjava/classpath/gnu/java/beans/encoder/ScannerState.java +++ b/libjava/classpath/gnu/java/beans/encoder/ScannerState.java @@ -42,12 +42,12 @@ import java.util.HashMap; /**

      Provides the infrastructure for the state machine and the transition * mechanism.

      - * + * *

      Each states knows a set of successor. There can be one successor for * every transition variant. Furthermore a state knows about a default * successor which is taken when there is no special setup for a * transition.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -105,42 +105,42 @@ public abstract class ScannerState * transition->successor's state name. */ HashMap transitions = new HashMap(); - + int calls; - + Context context; - + String name; - + final void init(String newName) { assert (name == null); - + name = newName; } - + final String getName() { return name; } - + final void enter(Context ctx) { calls++; context = ctx; - + enterImpl(ctx); } - + protected void enterImpl(Context ctx) { } - + final Context context() { return context; } - + final int getCalls() { return calls; @@ -148,10 +148,10 @@ public abstract class ScannerState /** *

      Stores a successor's state name for a certain transition.

      - * + * *

      This method is only used at the configuration time of the state * machine.

      - * + * * @param transition One of the transition constants. * @param stateName The state name of the successor. */ @@ -165,10 +165,10 @@ public abstract class ScannerState /**

      Retrieves a the state name of a successor for the given transition * constant.

      - * + * *

      Returns the default successor's state name if no special setup was * prepared.

      - * + * * @param transition One of the transition constants. * @return The state name of the successor. */ @@ -181,7 +181,7 @@ public abstract class ScannerState /** * Sets the name for the default successor state. - * + * * @param newDefaultSuccessor The default successor's state name. */ final void setDefaultSuccessor(String newDefaultSuccessor) @@ -203,7 +203,7 @@ public abstract class ScannerState String valueAsString); abstract void objectArrayInstantiation(String arrayClassName, String lengthAsString, ObjectId objectId); - + abstract void primitiveArrayInstantiation(String arrayClassName, String lengthAsString, ObjectId objectId); abstract void arraySet(String indexAsString); @@ -222,7 +222,7 @@ public abstract class ScannerState /** *

      A special event that does not provoke a direct transition.

      - * + * *

      Instead the transition is done by the ScanEngine: It goes * back to the previous state and just uses this method to inform the state * about this happening.

      @@ -232,5 +232,5 @@ public abstract class ScannerState void enter() { } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/StAXWriter.java b/libjava/classpath/gnu/java/beans/encoder/StAXWriter.java index fdb5f7d4571..da88c536111 100644 --- a/libjava/classpath/gnu/java/beans/encoder/StAXWriter.java +++ b/libjava/classpath/gnu/java/beans/encoder/StAXWriter.java @@ -45,7 +45,7 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; /** A {@link Writer} implementation based on the StAX API. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -54,7 +54,7 @@ public class StAXWriter implements Writer XMLStreamWriter writer; int indent = 0; - + public StAXWriter(OutputStream os) { try @@ -71,7 +71,7 @@ public class StAXWriter implements Writer } } - + public void flush() { if (writer != null) @@ -138,7 +138,7 @@ public class StAXWriter implements Writer } } - + public void writeEndNoChildren() { try diff --git a/libjava/classpath/gnu/java/beans/encoder/Writer.java b/libjava/classpath/gnu/java/beans/encoder/Writer.java index 57203d23e82..e08c786d80c 100644 --- a/libjava/classpath/gnu/java/beans/encoder/Writer.java +++ b/libjava/classpath/gnu/java/beans/encoder/Writer.java @@ -40,20 +40,20 @@ package gnu.java.beans.encoder; /** A Writer represents a simplified interface to an XML * writer that is used for the XML persistence mechanism. - * + * *

      Its sole purpose is to allow multiple backends which may remove * the need to have certain APIs in the classpath. Eg. it is possible * to write a stripped down XML Writer that does not rely on SAX, StAX * or DOM APIs.

      - * + * *

      The caller may assume that every action is done immediately. However * it is possible that the underlying implementation uses buffering streams. * To make sure the data is written call the {@link flush} method.

      - * + * *

      The Writer implementation should care about the formatting * of the XML stream making it possible to generate three types of formats using * a special method invocation chain.

      - * + * *

      Write * * <element/> @@ -61,13 +61,13 @@ package gnu.java.beans.encoder; * by issuing write("element", true) (or any of the other * write-variants that allows specifying the isEmpty argument) * and writeEnd(true).

      - * + * *

      Write * * <element>body</element> * * by issuing writeNoChildren("element", "body") and writeNoChildrenEnd().

      - * + * *

      * Write * @@ -80,7 +80,7 @@ package gnu.java.beans.encoder; * by issuing write("element", false) (or any of the other * write-variants that allows specifying the isEmpty argument) * and writeEnd(false).

      - * + * *

      Note: It is important that the values of isEmpty and * wasEmpty match. Otherwise strange things might happen to * the layout.

      @@ -90,40 +90,40 @@ package gnu.java.beans.encoder; */ public interface Writer { - // TODO: This interface's design is not the best. Feel free to + // TODO: This interface's design is not the best. Feel free to // improve it as you like. /** Writes the XML preamble. */ void writePreamble(); /** Writes the end of an XML tag. - * + * *

      If your tag has not generated any body text or child * elements provide true as the argument to generate - * more space efficient variant of the tag.>/p> - * + * more space efficient variant of the tag.>/p> + * * @param wasEmpty Whether the tag was empty or not. */ void writeEnd(boolean wasEmpty); - /** Writes an XML tag without any attributes. - * + /** Writes an XML tag without any attributes. + * * @param tagName The name of the tag to write. * @param empty Whether the element has child elements. */ void write(String tagName, boolean empty); /** Writes an XML tag with one attribute name and value. - * + * * @param tagName The name of the tag to write. - * @param attributeName The name of attribute. + * @param attributeName The name of attribute. * @param attributeValue The attribute's value. * @param empty Whether the element has child elements. */ void write(String tagName, String attributeName, String attributeValue, boolean empty); /** Writes an XML tag with multiple attributes and a body text. - * + * * @param tagName The name of the tag to write. * @param value The element's body content. * @param attributeNames A set of attribute names. @@ -134,7 +134,7 @@ public interface Writer String[] attributeValues, boolean empty); /** Writes an XML tag with multiple attributes without a body text. - * + * * @param tagName The name of the tag to write. * @param attributeNames A set of attribute names. * @param attributeValues A set of attribute values. @@ -144,7 +144,7 @@ public interface Writer /** Writes an XML tag with no attributes but with a body text * that may have child elements. - * + * * @param tagName The name of the tag to write. * @param value The element's body content. */ @@ -152,14 +152,14 @@ public interface Writer /** Writes an XML tag with no attributes but with a body text * that does not have child elements. - * + * * @param tagName The name of the tag to write. * @param value The element's body content. */ void writeNoChildren(String tagName, String value); - + /** Writes the end of an XML tag that has no child elements. - * + * *

      Must be used in combination with {@link writeNoChildren} only.

      */ void writeEndNoChildren(); diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java b/libjava/classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java index a9aef89c772..51e00c361ff 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/ArrayInstantiation.java @@ -42,7 +42,7 @@ import gnu.java.beans.encoder.ObjectId; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the instantiation of an array. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/Array_Get.java b/libjava/classpath/gnu/java/beans/encoder/elements/Array_Get.java index ca2ce0fa663..912ecebb5d0 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/Array_Get.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/Array_Get.java @@ -42,7 +42,7 @@ import gnu.java.beans.encoder.Writer; /** * Generates an XML element denoting the retrieval of an array value. - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public class Array_Get extends Element diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/ClassResolution.java b/libjava/classpath/gnu/java/beans/encoder/elements/ClassResolution.java index 8e640d18350..cb736d5c0c0 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/ClassResolution.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/ClassResolution.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the resolution of a class. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -58,7 +58,7 @@ public class ClassResolution extends Element { writer.writeNoChildren("class", className); } - + public void writeEnd(Writer writer) { writer.writeEndNoChildren(); diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/Element.java b/libjava/classpath/gnu/java/beans/encoder/elements/Element.java index 5681d2b76a0..a8c0ecdf71f 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/Element.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/Element.java @@ -45,11 +45,11 @@ import gnu.java.beans.encoder.ObjectId; import gnu.java.beans.encoder.Writer; /** Element is the base class for the object tree elements. - * + * *

      It provides the neccessary infrastructure every element subclass * needs in order to interact with the {@link gnu.java.beans.encoder.Root} * class.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) */ public abstract class Element @@ -58,100 +58,100 @@ public abstract class Element * Stores the child elements. */ private LinkedList children = new LinkedList(); - + /** * An optional ObjectId instance which is needed for certain subclasses * only. */ private ObjectId objectId; - + /** Sets an {@link gnu.java.beans.encoder.ObjectId} instance in this * Element. - * + * *

      This can only be done once.

      - * + * * @param objectId An ObjectId instance. */ public final void initId(ObjectId objectId) { assert (this.objectId == null); assert (objectId != null); - + this.objectId = objectId; } /** Adds a child element to this Element. - * + * * @param elem The new child. */ public final void addChild(Element elem) { children.add(elem); } - + /** Removes the child element added last. */ public final void removeLast() { children.removeLast(); } - + /** Provides access to the child elements via an iterator. - * + * * @return An iterator for the child elements. */ public final Iterator iterator(){ return children.iterator(); } - + /** Clears all the stored child elements. - * + * */ public final void clear() { - children.clear(); + children.clear(); } - + /** Returns whether this element contains child elements. - * + * *

      This method is useful to decide which formatting variant * for the XML element can be chosen.

      - * + * * @return Whether the element has child elements. */ public final boolean isEmpty() { - return children.isEmpty(); + return children.isEmpty(); } - + /** Retrieves the element's {@link gnu.java.beans.encoder.ObjectId} instance * if it has one. - * + * * @return The ObjectId instance or null. */ public final ObjectId getId() { return objectId; } - + /** Writes the opening XML tag. - * + * * @param writer The writer to be used for XML writing. */ public abstract void writeStart(Writer writer); - + /** Writes the closing XML tag. - * + * *

      By default this does writer.writeEnd(children.isEmpty()). * Override if neccessary, for example when using the * {@link gnu.java.beans.encoder.Writer#writeNoChildren} method - * variants. - * + * variants. + * * @param writer The writer to be used for XML writing. */ public void writeEnd(Writer writer) { writer.writeEnd(children.isEmpty()); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/List_Get.java b/libjava/classpath/gnu/java/beans/encoder/elements/List_Get.java index e73afa8e917..c14ab91f952 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/List_Get.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/List_Get.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the retrieval of a list's element. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -52,5 +52,5 @@ public class List_Get extends Element { writer.write("object", "get"); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/List_Set.java b/libjava/classpath/gnu/java/beans/encoder/elements/List_Set.java index 03c73fd2089..3e7cca62800 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/List_Set.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/List_Set.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the setting of a list's element. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -52,5 +52,5 @@ public class List_Set extends Element { writer.write("object", "set"); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/MethodInvocation.java b/libjava/classpath/gnu/java/beans/encoder/elements/MethodInvocation.java index d5b317496d5..1de5bb62dc4 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/MethodInvocation.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/MethodInvocation.java @@ -41,22 +41,22 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting a non-static method call. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ public class MethodInvocation extends Element { final String methodName; - + public MethodInvocation(String newMethodName) { methodName = newMethodName; } - + public void writeStart(Writer writer) { writer.write("void", "method", methodName, isEmpty()); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/NullObject.java b/libjava/classpath/gnu/java/beans/encoder/elements/NullObject.java index 599c4d85fc3..211e2a74bc3 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/NullObject.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/NullObject.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the null value. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java b/libjava/classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java index 692227d59c5..98614809f06 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/ObjectInstantiation.java @@ -42,7 +42,7 @@ import gnu.java.beans.encoder.ObjectId; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting the instantiation of an object. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/ObjectReference.java b/libjava/classpath/gnu/java/beans/encoder/elements/ObjectReference.java index a44c2ee6055..13a597a5849 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/ObjectReference.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/ObjectReference.java @@ -42,7 +42,7 @@ import gnu.java.beans.encoder.ObjectId; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting referencing an existing object. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ @@ -53,7 +53,7 @@ public class ObjectReference extends Element public ObjectReference(ObjectId newId) { id = newId; - + // Initializing the Id here is making sure it gets // actually used. This step modifies the Id instance // in other elements. @@ -64,5 +64,5 @@ public class ObjectReference extends Element { writer.write("object", "idref", id.toString(), isEmpty()); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java b/libjava/classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java index db08edbf8a0..ae34b9dad28 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/PrimitiveInstantiation.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting a primitive data value. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java b/libjava/classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java index 7ed935d49a0..7fcbf520343 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/StaticFieldAccess.java @@ -41,7 +41,7 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** Generates an XML element denoting a static method call. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java b/libjava/classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java index 40c46a5346b..92d49dc41c2 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/StaticMethodInvocation.java @@ -42,26 +42,26 @@ package gnu.java.beans.encoder.elements; import gnu.java.beans.encoder.Writer; /** - * + * * @author Robert Schuster (robertschuster@fsfe.org) * */ public class StaticMethodInvocation extends Element { final String className; - + final String methodName; - + public StaticMethodInvocation(String newClassName, String newMethodName) { className = newClassName; methodName = newMethodName; } - + public void writeStart(Writer writer) { writer.write("void", new String[] { "class", "method" }, new String[] { className, methodName }, isEmpty()); } - + } diff --git a/libjava/classpath/gnu/java/beans/encoder/elements/StringReference.java b/libjava/classpath/gnu/java/beans/encoder/elements/StringReference.java index c368e652851..7e6787da32c 100644 --- a/libjava/classpath/gnu/java/beans/encoder/elements/StringReference.java +++ b/libjava/classpath/gnu/java/beans/encoder/elements/StringReference.java @@ -54,7 +54,7 @@ public class StringReference extends Element { writer.writeNoChildren("string", string); } - + public void writeEnd(Writer writer) { writer.writeEndNoChildren(); diff --git a/libjava/classpath/gnu/java/io/ASN1ParsingException.java b/libjava/classpath/gnu/java/io/ASN1ParsingException.java index 5d2c64ab54f..9cf98abd34d 100644 --- a/libjava/classpath/gnu/java/io/ASN1ParsingException.java +++ b/libjava/classpath/gnu/java/io/ASN1ParsingException.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,13 +44,13 @@ package gnu.java.io; public class ASN1ParsingException extends java.io.IOException { - public ASN1ParsingException() - { - super(); - } + public ASN1ParsingException() + { + super(); + } - public ASN1ParsingException(String msg) - { - super(msg); - } + public ASN1ParsingException(String msg) + { + super(msg); + } } diff --git a/libjava/classpath/gnu/java/io/Base64InputStream.java b/libjava/classpath/gnu/java/io/Base64InputStream.java index 1f5d220dbb6..1105b6022c4 100644 --- a/libjava/classpath/gnu/java/io/Base64InputStream.java +++ b/libjava/classpath/gnu/java/io/Base64InputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -57,7 +57,7 @@ public class Base64InputStream extends FilterInputStream // ------------------------------------------------------------------------ /** Base-64 digits. */ - private static final String BASE_64 = + private static final String BASE_64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; /** Base-64 padding character. */ diff --git a/libjava/classpath/gnu/java/io/ClassLoaderObjectInputStream.java b/libjava/classpath/gnu/java/io/ClassLoaderObjectInputStream.java index 238ab26b1b9..e3f3d4c42ba 100644 --- a/libjava/classpath/gnu/java/io/ClassLoaderObjectInputStream.java +++ b/libjava/classpath/gnu/java/io/ClassLoaderObjectInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,22 +52,22 @@ import java.io.StreamCorruptedException; */ public class ClassLoaderObjectInputStream extends ObjectInputStream { - ClassLoader myClassLoader; + ClassLoader myClassLoader; - /** Create the new ClassLoaderObjectInputStream. - * @param in the InputStream to read the Objects from. - * @param myClassLoader the ClassLoader to load classes - * with. - */ - public ClassLoaderObjectInputStream(InputStream in, ClassLoader myClassLoader) throws IOException,StreamCorruptedException { - super(in); - this.myClassLoader = myClassLoader; - } + /** Create the new ClassLoaderObjectInputStream. + * @param in the InputStream to read the Objects from. + * @param myClassLoader the ClassLoader to load classes + * with. + */ + public ClassLoaderObjectInputStream(InputStream in, ClassLoader myClassLoader) throws IOException,StreamCorruptedException { + super(in); + this.myClassLoader = myClassLoader; + } - /** Overriden method to use the loadClass() method from - * the ClassLoader. - */ - public Class resolveClass(String name) throws IOException, ClassNotFoundException { - return myClassLoader.loadClass(name); - } + /** Overriden method to use the loadClass() method from + * the ClassLoader. + */ + public Class resolveClass(String name) throws IOException, ClassNotFoundException { + return myClassLoader.loadClass(name); + } } diff --git a/libjava/classpath/gnu/java/io/NullOutputStream.java b/libjava/classpath/gnu/java/io/NullOutputStream.java index 526bd26e830..603a2d3dd67 100644 --- a/libjava/classpath/gnu/java/io/NullOutputStream.java +++ b/libjava/classpath/gnu/java/io/NullOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/io/ObjectIdentityMap2Int.java b/libjava/classpath/gnu/java/io/ObjectIdentityMap2Int.java index 08f089d7921..ed62e838120 100644 --- a/libjava/classpath/gnu/java/io/ObjectIdentityMap2Int.java +++ b/libjava/classpath/gnu/java/io/ObjectIdentityMap2Int.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ package gnu.java.io; * @author Fridtjof Siebert (siebert@aicas.com) */ public class ObjectIdentityMap2Int -{ +{ /** @@ -58,7 +58,7 @@ public class ObjectIdentityMap2Int * prime number since the delta used for conflict resulution must * not have any common divisors with the length. */ - private static final int[] PRIMES = { + private static final int[] PRIMES = { 0x1f, 0x3d, 0x7f, @@ -93,7 +93,7 @@ public class ObjectIdentityMap2Int */ private static final Object NIL = new Object(); - + /** * The objects in this map: * @@ -118,13 +118,13 @@ public class ObjectIdentityMap2Int * invariant * size < limit */ - private int size = 0; + private int size = 0; /** * The index in primes of the size of the tables. */ - private int cap = 0; + private int cap = 0; /** @@ -133,7 +133,7 @@ public class ObjectIdentityMap2Int * invariant * limit = PRIMES[cap] / 4 * 3; */ - private int limit = 0; + private int limit = 0; /** @@ -148,7 +148,7 @@ public class ObjectIdentityMap2Int /** * Helper function to alloc the object and int array for the given * capacity. Set limit, reset size to 0. - * + * * No elements will be stored in the newly allocated arrays. * * @param c the capacity: this is an index in PRIMES, PRIMES[c] @@ -161,8 +161,8 @@ public class ObjectIdentityMap2Int */ private void alloc(int c) { - if (c >= PRIMES.length) - throw new InternalError("Hash table size overflow"); + if (c >= PRIMES.length) + throw new InternalError("Hash table size overflow"); cap = c; int len = PRIMES[c]; @@ -170,7 +170,7 @@ public class ObjectIdentityMap2Int intTable = new int[len]; limit = len / 4 * 3; - size = 0; + size = 0; } @@ -180,7 +180,7 @@ public class ObjectIdentityMap2Int * ensures * (get(o) == i); * - * @param o object reference or null that is to be mapped. + * @param o object reference or null that is to be mapped. * * @param i the integer id to be associated with o * @@ -189,9 +189,9 @@ public class ObjectIdentityMap2Int * @throws InternalError if hash tables has grown to more then * 0x7fffffff entries (ie., size >= 0x7fffffff*3/4). */ - public void put(Object o, int i) + public void put(Object o, int i) { - if (i < 0) + if (i < 0) throw new IllegalArgumentException("int argument must be postive: "+i); o = (o == null) ? NIL : o; @@ -200,8 +200,8 @@ public class ObjectIdentityMap2Int intTable[s] = i; if (objectTable[s] == null) { - objectTable[s] = o; - size++; + objectTable[s] = o; + size++; if (size >= limit) { rehash(); @@ -219,14 +219,14 @@ public class ObjectIdentityMap2Int * * @param o an object, must not be null. * - * @return an index of o + * @return an index of o */ private int slot(Object o) { Object[] ot = objectTable; int hc = System.identityHashCode(o); int len = ot.length; - int result = hc % len; + int result = hc % len; result = result < 0 ? -result : result; int delta = 16 - (hc & 15); Object existing = ot[result]; @@ -249,9 +249,9 @@ public class ObjectIdentityMap2Int * ensure * (cap == \old cap+1); */ - private void rehash() + private void rehash() { - Object[] ot = objectTable; + Object[] ot = objectTable; int [] it = intTable; alloc(cap + 1); @@ -268,7 +268,7 @@ public class ObjectIdentityMap2Int * @return the corresponding integer id for o or -1 if o has not * been put into this map. */ - public int get(Object o) + public int get(Object o) { o = (o == null) ? NIL : o; int s = slot(o); @@ -281,10 +281,10 @@ public class ObjectIdentityMap2Int * ensures * ((size == 0) && \forall Object o: get(o) == -1) */ - public void clear() + public void clear() { - Object[] ot = objectTable; - size = 0; + Object[] ot = objectTable; + size = 0; for (int i = 0; i < ot.length; i++) ot[i] = null; } diff --git a/libjava/classpath/gnu/java/io/ObjectIdentityWrapper.java b/libjava/classpath/gnu/java/io/ObjectIdentityWrapper.java index 6db2e3a52a6..53c9943de5b 100644 --- a/libjava/classpath/gnu/java/io/ObjectIdentityWrapper.java +++ b/libjava/classpath/gnu/java/io/ObjectIdentityWrapper.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/io/PlatformHelper.java b/libjava/classpath/gnu/java/io/PlatformHelper.java index 96231e1be5b..545241110a5 100644 --- a/libjava/classpath/gnu/java/io/PlatformHelper.java +++ b/libjava/classpath/gnu/java/io/PlatformHelper.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,7 +52,7 @@ public class PlatformHelper public static final char pathSeparatorChar = pathSeparator.charAt(0); /** - * On most platforms 260 is equal or greater than a max path value, + * On most platforms 260 is equal or greater than a max path value, * so we can set the initial buffer size of StringBuffer to half of this value * to improve performance. */ @@ -106,7 +106,7 @@ public class PlatformHelper } /** - * This routine removes from input param "path" the tail separator if it exists, + * This routine removes from input param "path" the tail separator if it exists, * and return the remain part. */ public static final String removeTailSeparator(String path) @@ -118,7 +118,7 @@ public class PlatformHelper } /** - * This routine returns last index of separator in input param "path", + * This routine returns last index of separator in input param "path", * and return it. */ public static final int lastIndexOfSeparator(String path) diff --git a/libjava/classpath/gnu/java/lang/CPStringBuilder.java b/libjava/classpath/gnu/java/lang/CPStringBuilder.java index 27e7d2cc7f9..f42629d4643 100644 --- a/libjava/classpath/gnu/java/lang/CPStringBuilder.java +++ b/libjava/classpath/gnu/java/lang/CPStringBuilder.java @@ -215,13 +215,13 @@ public final class CPStringBuilder /* If the StringBuffer's value just grew, then we know that value is newly allocated and the region between count and newLength is filled with '\0'. */ - count = newLength; + count = newLength; } else { - /* The StringBuffer's value doesn't need to grow. However, - we should clear out any cruft that may exist. */ - while (count < newLength) + /* The StringBuffer's value doesn't need to grow. However, + we should clear out any cruft that may exist. */ + while (count < newLength) value[count++] = '\0'; } } @@ -290,7 +290,7 @@ public final class CPStringBuilder * @see System#arraycopy(Object, int, Object, int, int) */ public void getChars(int srcOffset, int srcEnd, - char[] dst, int dstOffset) + char[] dst, int dstOffset) { if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset) throw new StringIndexOutOfBoundsException(); @@ -362,10 +362,10 @@ public final class CPStringBuilder return append("null"); synchronized (stringBuffer) { - int len = stringBuffer.length(); - ensureCapacity(count + len); - stringBuffer.getChars(0, len, value, count); - count += len; + int len = stringBuffer.length(); + ensureCapacity(count + len); + stringBuffer.getChars(0, len, value, count); + count += len; } return this; } @@ -466,9 +466,9 @@ public final class CPStringBuilder return append("null"); if (end - start > 0) { - ensureCapacity(count + end - start); - for (; start < end; ++start) - value[count++] = seq.charAt(start); + ensureCapacity(count + end - start); + for (; start < end; ++start) + value[count++] = seq.charAt(start); } return this; } @@ -979,23 +979,23 @@ public final class CPStringBuilder int count = 0; while (start < end) { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == end - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - ++count; + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == end + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + ++count; } return count; } @@ -1015,22 +1015,22 @@ public final class CPStringBuilder { while (codePoints > 0) { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - --codePoints; + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + --codePoints; } return start; } @@ -1040,7 +1040,7 @@ public final class CPStringBuilder * ensure that an expensive growing operation will not occur until either * minimumCapacity is reached or the array has been allocated. * The buffer is grown to either minimumCapacity * 2, if - * the array has been allocated or the larger of minimumCapacity and + * the array has been allocated or the larger of minimumCapacity and * capacity() * 2 + 2, if it is not already large enough. * * @param minimumCapacity the new capacity @@ -1050,14 +1050,14 @@ public final class CPStringBuilder { if (allocated || minimumCapacity > value.length) { - if (minimumCapacity > value.length) - { - int max = value.length * 2 + 2; - minimumCapacity = (minimumCapacity < max ? max : minimumCapacity); - } - else - minimumCapacity *= 2; - allocateArray(minimumCapacity); + if (minimumCapacity > value.length) + { + int max = value.length * 2 + 2; + minimumCapacity = (minimumCapacity < max ? max : minimumCapacity); + } + else + minimumCapacity *= 2; + allocateArray(minimumCapacity); } } @@ -1076,7 +1076,7 @@ public final class CPStringBuilder value = nb; allocated = false; } - + /** * Get the length of the String this StringBuilder * would create. Not to be confused with the capacity of the diff --git a/libjava/classpath/gnu/java/lang/CharData.java b/libjava/classpath/gnu/java/lang/CharData.java index a84d94da21f..cb33035e6c2 100644 --- a/libjava/classpath/gnu/java/lang/CharData.java +++ b/libjava/classpath/gnu/java/lang/CharData.java @@ -58,7 +58,7 @@ package gnu.java.lang; * attribute tables are much smaller than 0xffff entries; as many characters * in Unicode share common attributes. Numbers that are too large to fit * into NUM_VALUE as 16 bit chars are stored in LARGENUMS and a number N is - * stored in NUM_VALUE such that (-N - 3) is the offset into LARGENUMS for + * stored in NUM_VALUE such that (-N - 3) is the offset into LARGENUMS for * the particular character. The DIRECTION table also contains a field for * detecting characters with multi-character uppercase expansions. * Next, there is a listing for TITLE exceptions (most characters @@ -81,7 +81,7 @@ public interface CharData /** * The character shift amount to look up the block offset. In other words, - * (char) (BLOCKS.value[ch >> SHIFT[p]] + ch) is the index + * (char) (BLOCKS.value[ch >> SHIFT[p]] + ch) is the index * where ch is described in DATA if ch * is in Unicode plane p. Note that p is simply * the integer division of ch and 0x10000. diff --git a/libjava/classpath/gnu/java/lang/InstrumentationImpl.java b/libjava/classpath/gnu/java/lang/InstrumentationImpl.java index 2425b35c8a9..a601baf5579 100644 --- a/libjava/classpath/gnu/java/lang/InstrumentationImpl.java +++ b/libjava/classpath/gnu/java/lang/InstrumentationImpl.java @@ -66,7 +66,7 @@ public final class InstrumentationImpl implements Instrumentation private ArrayList transformers = new ArrayList(); - + InstrumentationImpl() { } @@ -76,7 +76,7 @@ public final class InstrumentationImpl implements Instrumentation * to the instrumentation. Each time a class is defined * or redefined, the transform method of the * transformer object is called. - * + * * @param transformer the transformer to add * @throws NullPointerException if transformer is null */ @@ -89,11 +89,11 @@ public final class InstrumentationImpl implements Instrumentation transformers.add(transformer); } } - + /** * Removes the given transformer from the set of transformers * this Instrumentation object has. - * + * * @param transformer the transformer to remove * @return true if the transformer was found and removed, false if * the transformer was not found @@ -103,8 +103,8 @@ public final class InstrumentationImpl implements Instrumentation { if (transformer == null) throw new NullPointerException(); - - boolean result; + + boolean result; synchronized (transformers) { result = transformers.remove(transformer); @@ -114,22 +114,22 @@ public final class InstrumentationImpl implements Instrumentation /** * Returns if the current JVM supports class redefinition - * + * * @return true if the current JVM supports class redefinition */ public boolean isRedefineClassesSupported() { return VMInstrumentationImpl.isRedefineClassesSupported(); } - + /** * Redefine classes present in the definitions array, with * the corresponding class files. * * @param definitions an array of classes to redefine - * - * @throws ClassNotFoundException if a class cannot be found - * @throws UnmodifiableClassException if a class cannot be modified + * + * @throws ClassNotFoundException if a class cannot be found + * @throws UnmodifiableClassException if a class cannot be modified * @throws UnsupportedOperationException if the JVM does not support * redefinition or the redefinition made unsupported changes * @throws ClassFormatError if a class file is not valid @@ -139,7 +139,7 @@ public final class InstrumentationImpl implements Instrumentation * are unsupported * @throws ClassCircularityError if circularity occured with the new * classes - * @throws LinkageError if a linkage error occurs + * @throws LinkageError if a linkage error occurs * @throws NullPointerException if the definitions array is null, or any * of its element * @@ -153,14 +153,14 @@ public final class InstrumentationImpl implements Instrumentation { if (!isRedefineClassesSupported()) throw new UnsupportedOperationException(); - + VMInstrumentationImpl.redefineClasses(this, definitions); } /** * Get all the classes loaded by the JVM. - * + * * @return an array containing all the classes loaded by the JVM. The array * is empty if no class is loaded. */ @@ -171,9 +171,9 @@ public final class InstrumentationImpl implements Instrumentation /** * Get all the classes loaded by a given class loader - * + * * @param loader the loader - * + * * @return an array containing all the classes loaded by the given loader. * The array is empty if no class was loaded by the loader. */ @@ -184,7 +184,7 @@ public final class InstrumentationImpl implements Instrumentation /** * Get the size of an object. - * + * * @param objectToSize the object * @return the size of the object * @throws NullPointerException if objectToSize is null. @@ -207,12 +207,12 @@ public final class InstrumentationImpl implements Instrumentation * @param protectionDomain the protection domain of the class being defined * or redefined * @param classfileBuffer the input byte buffer in class file format - * + * * @return the new class file */ public byte[] callTransformers(ClassLoader loader, String className, - Class classBeingRedefined, ProtectionDomain protectionDomain, - byte[] classfileBuffer) + Class classBeingRedefined, ProtectionDomain protectionDomain, + byte[] classfileBuffer) { byte[] newBuffer = null; byte[] oldBuffer = classfileBuffer; @@ -227,13 +227,13 @@ public final class InstrumentationImpl implements Instrumentation { newBuffer = current.transform(loader, className, classBeingRedefined, protectionDomain, oldBuffer); - } - catch (IllegalClassFormatException ignored) - { + } + catch (IllegalClassFormatException ignored) + { //IGNORED - } + } if (newBuffer != null) - oldBuffer = newBuffer; + oldBuffer = newBuffer; } } return oldBuffer; diff --git a/libjava/classpath/gnu/java/lang/MainThread.java b/libjava/classpath/gnu/java/lang/MainThread.java index 7ad70cd7c61..a7295642129 100644 --- a/libjava/classpath/gnu/java/lang/MainThread.java +++ b/libjava/classpath/gnu/java/lang/MainThread.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -58,7 +58,7 @@ public class MainThread throws ClassNotFoundException, NoSuchMethodException { Class found = Class.forName(classname, true, - ClassLoader.getSystemClassLoader()); + ClassLoader.getSystemClassLoader()); Class[] argTypes = new Class[1]; argTypes[0] = args.getClass(); mainMethod = found.getMethod("main", argTypes); @@ -69,15 +69,15 @@ public class MainThread { try { - mainMethod.invoke(null,(Object) args); + mainMethod.invoke(null,(Object) args); } catch(IllegalAccessException e) { - // Ignore. + // Ignore. } catch(InvocationTargetException e) { - // Ignore. + // Ignore. } } } diff --git a/libjava/classpath/gnu/java/lang/management/BeanImpl.java b/libjava/classpath/gnu/java/lang/management/BeanImpl.java index a651e3548b4..a7c2357b6ae 100644 --- a/libjava/classpath/gnu/java/lang/management/BeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/BeanImpl.java @@ -116,66 +116,66 @@ public class BeanImpl return; try { - MBeanAttributeInfo[] oldA = info.getAttributes(); - OpenMBeanAttributeInfo[] attribs = - new OpenMBeanAttributeInfoSupport[oldA.length]; - for (int a = 0; a < oldA.length; ++a) - { - OpenMBeanParameterInfo param = Translator.translate(oldA[a].getType()); - if (param.getMinValue() == null) - { - Object[] lv; - if (param.getLegalValues() == null) - lv = null; - else - lv = param.getLegalValues().toArray(); - attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(), - oldA[a].getDescription(), - ((OpenType) - param.getOpenType()), - oldA[a].isReadable(), - oldA[a].isWritable(), - oldA[a].isIs(), - param.getDefaultValue(), - lv); - } - else - attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(), - oldA[a].getDescription(), - ((OpenType) - param.getOpenType()), - oldA[a].isReadable(), - oldA[a].isWritable(), - oldA[a].isIs(), - param.getDefaultValue(), - ((Comparable) - param.getMinValue()), - ((Comparable) - param.getMaxValue())); - } - MBeanConstructorInfo[] oldC = info.getConstructors(); - OpenMBeanConstructorInfo[] cons = new OpenMBeanConstructorInfoSupport[oldC.length]; - for (int a = 0; a < oldC.length; ++a) - cons[a] = - new OpenMBeanConstructorInfoSupport(oldC[a].getName(), - oldC[a].getDescription(), - translateSignature(oldC[a].getSignature())); - MBeanOperationInfo[] oldO = info.getOperations(); - OpenMBeanOperationInfo[] ops = new OpenMBeanOperationInfoSupport[oldO.length]; - for (int a = 0; a < oldO.length; ++a) - ops[a] = - new OpenMBeanOperationInfoSupport(oldO[a].getName(), - oldO[a].getDescription(), - translateSignature(oldO[a].getSignature()), - Translator.translate(oldO[a].getReturnType()).getOpenType(), - oldO[a].getImpact()); - openInfo = new OpenMBeanInfoSupport(info.getClassName(), info.getDescription(), - attribs, cons, ops, info.getNotifications()); + MBeanAttributeInfo[] oldA = info.getAttributes(); + OpenMBeanAttributeInfo[] attribs = + new OpenMBeanAttributeInfoSupport[oldA.length]; + for (int a = 0; a < oldA.length; ++a) + { + OpenMBeanParameterInfo param = Translator.translate(oldA[a].getType()); + if (param.getMinValue() == null) + { + Object[] lv; + if (param.getLegalValues() == null) + lv = null; + else + lv = param.getLegalValues().toArray(); + attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(), + oldA[a].getDescription(), + ((OpenType) + param.getOpenType()), + oldA[a].isReadable(), + oldA[a].isWritable(), + oldA[a].isIs(), + param.getDefaultValue(), + lv); + } + else + attribs[a] = new OpenMBeanAttributeInfoSupport(oldA[a].getName(), + oldA[a].getDescription(), + ((OpenType) + param.getOpenType()), + oldA[a].isReadable(), + oldA[a].isWritable(), + oldA[a].isIs(), + param.getDefaultValue(), + ((Comparable) + param.getMinValue()), + ((Comparable) + param.getMaxValue())); + } + MBeanConstructorInfo[] oldC = info.getConstructors(); + OpenMBeanConstructorInfo[] cons = new OpenMBeanConstructorInfoSupport[oldC.length]; + for (int a = 0; a < oldC.length; ++a) + cons[a] = + new OpenMBeanConstructorInfoSupport(oldC[a].getName(), + oldC[a].getDescription(), + translateSignature(oldC[a].getSignature())); + MBeanOperationInfo[] oldO = info.getOperations(); + OpenMBeanOperationInfo[] ops = new OpenMBeanOperationInfoSupport[oldO.length]; + for (int a = 0; a < oldO.length; ++a) + ops[a] = + new OpenMBeanOperationInfoSupport(oldO[a].getName(), + oldO[a].getDescription(), + translateSignature(oldO[a].getSignature()), + Translator.translate(oldO[a].getReturnType()).getOpenType(), + oldO[a].getImpact()); + openInfo = new OpenMBeanInfoSupport(info.getClassName(), info.getDescription(), + attribs, cons, ops, info.getNotifications()); } catch (OpenDataException e) { - throw (InternalError) (new InternalError("A problem occurred creating the open type " + - "descriptors.").initCause(e)); + throw (InternalError) (new InternalError("A problem occurred creating the open type " + + "descriptors.").initCause(e)); } } @@ -195,7 +195,7 @@ public class BeanImpl public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, - ReflectionException + ReflectionException { Object value = super.getAttribute(attribute); if (value instanceof Enum) @@ -207,60 +207,60 @@ public class BeanImpl String[] allowedTypes = OpenType.ALLOWED_CLASSNAMES; for (int a = 0; a < allowedTypes.length; ++a) if (cName.equals(allowedTypes[a])) - return value; + return value; OpenMBeanInfo info = (OpenMBeanInfo) getMBeanInfo(); MBeanAttributeInfo[] attribs = (MBeanAttributeInfo[]) info.getAttributes(); OpenType type = null; for (int a = 0; a < attribs.length; ++a) if (attribs[a].getName().equals(attribute)) - type = ((OpenMBeanAttributeInfo) attribs[a]).getOpenType(); + type = ((OpenMBeanAttributeInfo) attribs[a]).getOpenType(); if (value instanceof List) { - try - { - Class e = - Class.forName(((ArrayType) type).getElementOpenType().getClassName()); - List l = (List) value; - Object[] array = (Object[]) Array.newInstance(e, l.size()); - return l.toArray(array); - } - catch (ClassNotFoundException e) - { - throw (InternalError) (new InternalError("The class of the list " + - "element type could not " + - "be created").initCause(e)); - } + try + { + Class e = + Class.forName(((ArrayType) type).getElementOpenType().getClassName()); + List l = (List) value; + Object[] array = (Object[]) Array.newInstance(e, l.size()); + return l.toArray(array); + } + catch (ClassNotFoundException e) + { + throw (InternalError) (new InternalError("The class of the list " + + "element type could not " + + "be created").initCause(e)); + } } if (value instanceof Map) { - TabularType ttype = (TabularType) type; - TabularData data = new TabularDataSupport(ttype); - Iterator it = ((Map) value).entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Map.Entry) it.next(); - try - { - data.put(new CompositeDataSupport(ttype.getRowType(), - new String[] { - "key", - "value" - }, - new Object[] { - entry.getKey(), - entry.getValue() - })); - } - catch (OpenDataException e) - { - throw (InternalError) (new InternalError("A problem occurred " + - "converting the map " + - "to a composite data " + - "structure.").initCause(e)); - } - } - return data; + TabularType ttype = (TabularType) type; + TabularData data = new TabularDataSupport(ttype); + Iterator it = ((Map) value).entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Map.Entry) it.next(); + try + { + data.put(new CompositeDataSupport(ttype.getRowType(), + new String[] { + "key", + "value" + }, + new Object[] { + entry.getKey(), + entry.getValue() + })); + } + catch (OpenDataException e) + { + throw (InternalError) (new InternalError("A problem occurred " + + "converting the map " + + "to a composite data " + + "structure.").initCause(e)); + } + } + return data; } CompositeType cType = (CompositeType) type; Set names = cType.keySet(); @@ -268,51 +268,51 @@ public class BeanImpl List values = new ArrayList(names.size()); while (it.hasNext()) { - String field = (String) it.next(); - Method getter = null; - try - { - getter = vClass.getMethod("get" + field); - } - catch (NoSuchMethodException e) - { - /* Ignored; the type tells us it's there. */ - } - try - { - values.add(getter.invoke(value)); - } - catch (IllegalAccessException e) - { - throw new ReflectionException(e, "Failed to retrieve " + field); - } - catch (IllegalArgumentException e) - { - throw new ReflectionException(e, "Failed to retrieve " + field); - } - catch (InvocationTargetException e) - { - throw new MBeanException((Exception) e.getCause(), - "The getter of " + field + - " threw an exception"); - } + String field = (String) it.next(); + Method getter = null; + try + { + getter = vClass.getMethod("get" + field); + } + catch (NoSuchMethodException e) + { + /* Ignored; the type tells us it's there. */ + } + try + { + values.add(getter.invoke(value)); + } + catch (IllegalAccessException e) + { + throw new ReflectionException(e, "Failed to retrieve " + field); + } + catch (IllegalArgumentException e) + { + throw new ReflectionException(e, "Failed to retrieve " + field); + } + catch (InvocationTargetException e) + { + throw new MBeanException((Exception) e.getCause(), + "The getter of " + field + + " threw an exception"); + } } try { - return new CompositeDataSupport(cType, - (String[]) - names.toArray(new String[names.size()]), - values.toArray()); + return new CompositeDataSupport(cType, + (String[]) + names.toArray(new String[names.size()]), + values.toArray()); } catch (OpenDataException e) { - throw (InternalError) (new InternalError("A problem occurred " + - "converting the value " + - "to a composite data " + - "structure.").initCause(e)); + throw (InternalError) (new InternalError("A problem occurred " + + "converting the value " + + "to a composite data " + + "structure.").initCause(e)); } } - + protected MBeanInfo getCachedMBeanInfo() { return (MBeanInfo) openInfo; @@ -322,15 +322,15 @@ public class BeanImpl * Override this method so as to prevent the description of a constructor's * parameter being @code{null}. Open MBeans can not have @code{null} descriptions, * but one will occur as the names of parameters aren't stored for reflection. - * + * * @param constructor the constructor whose parameter needs describing. * @param parameter the parameter to be described. * @param sequenceNo the number of the parameter to describe. * @return a description of the constructor's parameter. */ protected String getDescription(MBeanConstructorInfo constructor, - MBeanParameterInfo parameter, - int sequenceNo) + MBeanParameterInfo parameter, + int sequenceNo) { String desc = parameter.getDescription(); if (desc == null) @@ -343,15 +343,15 @@ public class BeanImpl * Override this method so as to prevent the description of an operation's * parameter being @code{null}. Open MBeans can not have @code{null} descriptions, * but one will occur as the names of parameters aren't stored for reflection. - * + * * @param operation the operation whose parameter needs describing. * @param parameter the parameter to be described. * @param sequenceNo the number of the parameter to describe. * @return a description of the operation's parameter. */ protected String getDescription(MBeanOperationInfo operation, - MBeanParameterInfo parameter, - int sequenceNo) + MBeanParameterInfo parameter, + int sequenceNo) { String desc = parameter.getDescription(); if (desc == null) @@ -364,15 +364,15 @@ public class BeanImpl * Override this method so as to prevent the name of a constructor's * parameter being @code{null}. Open MBeans can not have @code{null} names, * but one will occur as the names of parameters aren't stored for reflection. - * + * * @param constructor the constructor whose parameter needs a name. * @param parameter the parameter to be named. * @param sequenceNo the number of the parameter to name. * @return a description of the constructor's parameter. */ protected String getParameterName(MBeanConstructorInfo constructor, - MBeanParameterInfo parameter, - int sequenceNo) + MBeanParameterInfo parameter, + int sequenceNo) { String name = parameter.getName(); if (name == null) @@ -385,15 +385,15 @@ public class BeanImpl * Override this method so as to prevent the name of an operation's * parameter being @code{null}. Open MBeans can not have @code{null} names, * but one will occur as the names of parameters aren't stored for reflection. - * + * * @param operation the operation whose parameter needs a name. * @param parameter the parameter to be named. * @param sequenceNo the number of the parameter to name. * @return a description of the operation's parameter. */ protected String getParameterName(MBeanOperationInfo operation, - MBeanParameterInfo parameter, - int sequenceNo) + MBeanParameterInfo parameter, + int sequenceNo) { String name = parameter.getName(); if (name == null) @@ -414,31 +414,31 @@ public class BeanImpl OpenMBeanParameterInfo[] sig = new OpenMBeanParameterInfoSupport[oldS.length]; for (int a = 0; a < oldS.length; ++a) { - OpenMBeanParameterInfo param = Translator.translate(oldS[a].getType()); - if (param.getMinValue() == null) - { - Object[] lv; - if (param.getLegalValues() == null) - lv = null; - else - lv = param.getLegalValues().toArray(); - sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(), - oldS[a].getDescription(), - ((OpenType) - param.getOpenType()), - param.getDefaultValue(), - lv); - } - else - sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(), - oldS[a].getDescription(), - ((OpenType) - param.getOpenType()), - param.getDefaultValue(), - ((Comparable) - param.getMinValue()), - ((Comparable) - param.getMaxValue())); + OpenMBeanParameterInfo param = Translator.translate(oldS[a].getType()); + if (param.getMinValue() == null) + { + Object[] lv; + if (param.getLegalValues() == null) + lv = null; + else + lv = param.getLegalValues().toArray(); + sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(), + oldS[a].getDescription(), + ((OpenType) + param.getOpenType()), + param.getDefaultValue(), + lv); + } + else + sig[a] = new OpenMBeanParameterInfoSupport(oldS[a].getName(), + oldS[a].getDescription(), + ((OpenType) + param.getOpenType()), + param.getDefaultValue(), + ((Comparable) + param.getMinValue()), + ((Comparable) + param.getMaxValue())); } return sig; } diff --git a/libjava/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java index 92e68ae7678..d98a39633ff 100644 --- a/libjava/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/ClassLoadingMXBeanImpl.java @@ -42,7 +42,7 @@ import java.lang.management.ClassLoadingMXBean; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about the class loading + * Provides access to information about the class loading * behaviour of the current invocation of the virtual * machine. Instances of this bean are obtained by calling * {@link ManagementFactory#getClassLoadingMXBean()}. @@ -96,4 +96,3 @@ public final class ClassLoadingMXBeanImpl } } - diff --git a/libjava/classpath/gnu/java/lang/management/CompilationMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/CompilationMXBeanImpl.java index b3ad898b57c..1b77edf5aba 100644 --- a/libjava/classpath/gnu/java/lang/management/CompilationMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/CompilationMXBeanImpl.java @@ -44,7 +44,7 @@ import java.lang.management.CompilationMXBean; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about the JIT + * Provides access to information about the JIT * compiler of the virtual machine, if one exists. * Instances of this bean are obtained by calling * {@link ManagementFactory#getCompilationMXBean()}, @@ -66,7 +66,7 @@ public final class CompilationMXBeanImpl /** * Constant for compilation time support. */ - private static final String COMPILATION_TIME_SUPPORT = + private static final String COMPILATION_TIME_SUPPORT = "gnu.java.lang.management.CompilationTimeSupport"; /** @@ -87,7 +87,7 @@ public final class CompilationMXBeanImpl { return SystemProperties.getProperty(COMPILER_NAME); } - + public boolean isCompilationTimeMonitoringSupported() { return SystemProperties.getProperty(COMPILATION_TIME_SUPPORT) != null; @@ -99,7 +99,7 @@ public final class CompilationMXBeanImpl return VMCompilationMXBeanImpl.getTotalCompilationTime(); else throw new UnsupportedOperationException("Compilation time monitoring " - + "is not supported"); + + "is not supported"); } } diff --git a/libjava/classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java index b752e6b8672..7a2d762fa11 100644 --- a/libjava/classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/GarbageCollectorMXBeanImpl.java @@ -42,7 +42,7 @@ import java.lang.management.GarbageCollectorMXBean; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about one of the garbage + * Provides access to information about one of the garbage * collectors used by the current invocation of the * virtual machine. An instance of this bean for each garbage * collector is obtained by calling diff --git a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java index 1e6c63afccf..10e6522f131 100644 --- a/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/MemoryMXBeanImpl.java @@ -63,7 +63,7 @@ import javax.management.openmbean.OpenType; import javax.management.openmbean.SimpleType; /** - * Provides access to information about the memory + * Provides access to information about the memory * management of the current invocation of the virtual * machine. Instances of this bean are obtained by calling * {@link ManagementFactory#getMemoryMXBean()}. @@ -88,39 +88,39 @@ public final class MemoryMXBeanImpl { try { - CompositeType usageType = - new CompositeType(MemoryUsage.class.getName(), - "Describes the usage levels of a pool", - new String[] { "init", "used", - "committed", "max" - }, - new String[] { "Initial level", - "Used level", - "Committed level", - "Maximum level" - }, - new OpenType[] { - SimpleType.LONG, SimpleType.LONG, - SimpleType.LONG, SimpleType.LONG - }); - CompositeType notifType = - new CompositeType(MemoryNotificationInfo.class.getName(), - "Provides the notification info on memory usage", - new String[] { "poolName", "usage", "count" }, - new String[] { "Name of the memory pool", - "Usage level of the memory pool", - "Number of times the threshold " + - "has been crossed" - }, - new OpenType[] { - SimpleType.STRING, usageType, SimpleType.LONG - }); - } - catch (OpenDataException e) - { - throw new IllegalStateException("Something went wrong in creating " + - "the composite data types.", e); - } + CompositeType usageType = + new CompositeType(MemoryUsage.class.getName(), + "Describes the usage levels of a pool", + new String[] { "init", "used", + "committed", "max" + }, + new String[] { "Initial level", + "Used level", + "Committed level", + "Maximum level" + }, + new OpenType[] { + SimpleType.LONG, SimpleType.LONG, + SimpleType.LONG, SimpleType.LONG + }); + CompositeType notifType = + new CompositeType(MemoryNotificationInfo.class.getName(), + "Provides the notification info on memory usage", + new String[] { "poolName", "usage", "count" }, + new String[] { "Name of the memory pool", + "Usage level of the memory pool", + "Number of times the threshold " + + "has been crossed" + }, + new OpenType[] { + SimpleType.STRING, usageType, SimpleType.LONG + }); + } + catch (OpenDataException e) + { + throw new IllegalStateException("Something went wrong in creating " + + "the composite data types.", e); + } } /** @@ -171,8 +171,8 @@ public final class MemoryMXBeanImpl } public void addNotificationListener(NotificationListener listener, - NotificationFilter filter, - Object passback) + NotificationFilter filter, + Object passback) { if (listener == null) throw new IllegalArgumentException("Null listener added to bean."); @@ -183,13 +183,13 @@ public final class MemoryMXBeanImpl { return new MBeanNotificationInfo[] { - new MBeanNotificationInfo(new String[] - { - MemoryNotificationInfo.MEMORY_COLLECTION_THRESHOLD_EXCEEDED, - MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED - }, - Notification.class.getName(), - "Memory Usage Notifications") + new MBeanNotificationInfo(new String[] + { + MemoryNotificationInfo.MEMORY_COLLECTION_THRESHOLD_EXCEEDED, + MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED + }, + Notification.class.getName(), + "Memory Usage Notifications") }; } @@ -200,82 +200,82 @@ public final class MemoryMXBeanImpl boolean foundOne = false; while (it.hasNext()) { - ListenerData data = (ListenerData) it.next(); - if (data.getListener() == listener) - { - it.remove(); - foundOne = true; - } + ListenerData data = (ListenerData) it.next(); + if (data.getListener() == listener) + { + it.remove(); + foundOne = true; + } } if (!foundOne) throw new ListenerNotFoundException("The specified listener, " + listener + - "is not registered with this bean."); + "is not registered with this bean."); } public void removeNotificationListener(NotificationListener listener, - NotificationFilter filter, - Object passback) + NotificationFilter filter, + Object passback) throws ListenerNotFoundException { if (!(listeners.remove(new ListenerData(listener, filter, passback)))) { - throw new ListenerNotFoundException("The specified listener, " + listener + - " with filter " + filter + - "and passback " + passback + - ", is not registered with this bean."); + throw new ListenerNotFoundException("The specified listener, " + listener + + " with filter " + filter + + "and passback " + passback + + ", is not registered with this bean."); } } void fireNotification(String type, String poolName, long init, long used, - long committed, long max, long count) + long committed, long max, long count) { Notification notif = new Notification(type, this, notificationCount); MemoryUsage usage = new MemoryUsage(init, used, committed, max); CompositeData data; try { - data = new CompositeDataSupport(notifType, - new String[] { - "poolName", "usage", "count" - }, - new Object[] { - poolName, usage, Long.valueOf(count) - }); + data = new CompositeDataSupport(notifType, + new String[] { + "poolName", "usage", "count" + }, + new Object[] { + poolName, usage, Long.valueOf(count) + }); } catch (OpenDataException e) { - throw new IllegalStateException("Something went wrong in creating " + - "the composite data instance.", e); + throw new IllegalStateException("Something went wrong in creating " + + "the composite data instance.", e); } notif.setUserData(data); Iterator it = listeners.iterator(); while (it.hasNext()) { - ListenerData ldata = (ListenerData) it.next(); - NotificationFilter filter = ldata.getFilter(); - if (filter == null || filter.isNotificationEnabled(notif)) - ldata.getListener().handleNotification(notif, ldata.getPassback()); + ListenerData ldata = (ListenerData) it.next(); + NotificationFilter filter = ldata.getFilter(); + if (filter == null || filter.isNotificationEnabled(notif)) + ldata.getListener().handleNotification(notif, ldata.getPassback()); } ++notificationCount; } void fireThresholdExceededNotification(String poolName, long init, - long used, long committed, - long max, long count) + long used, long committed, + long max, long count) { fireNotification(MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED, - poolName, init, used, committed, max, count); + poolName, init, used, committed, max, count); } void fireCollectionThresholdExceededNotification(String poolName, - long init, - long used, - long committed, - long max, - long count) + long init, + long used, + long committed, + long max, + long count) { fireNotification(MemoryNotificationInfo.MEMORY_COLLECTION_THRESHOLD_EXCEEDED, - poolName, init, used, committed, max, count); + poolName, init, used, committed, max, count); } } diff --git a/libjava/classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java index 5766af9cc64..51d0ed9721c 100644 --- a/libjava/classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/MemoryManagerMXBeanImpl.java @@ -42,7 +42,7 @@ import java.lang.management.MemoryManagerMXBean; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about one of the memory + * Provides access to information about one of the memory * managers used by the current invocation of the * virtual machine. An instance of this bean for each memory * manager is obtained by calling diff --git a/libjava/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java index e314ca1648a..d92e6703fa0 100644 --- a/libjava/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/MemoryPoolMXBeanImpl.java @@ -46,7 +46,7 @@ import java.lang.management.MemoryUsage; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about one of the memory + * Provides access to information about one of the memory * resources or pools used by the current invocation of the * virtual machine. An instance of this bean for each memory * pool is obtained by calling @@ -68,13 +68,13 @@ public final class MemoryPoolMXBeanImpl /** * Constant for collection usage threshold. */ - private static final String COLLECTION_USAGE_THRESHOLD = + private static final String COLLECTION_USAGE_THRESHOLD = "gnu.java.lang.management.CollectionUsageThresholdSupport"; /** * Constant for thread time support. */ - private static final String USAGE_THRESHOLD = + private static final String USAGE_THRESHOLD = "gnu.java.lang.management.UsageThresholdSupport"; /** @@ -104,7 +104,7 @@ public final class MemoryPoolMXBeanImpl return VMMemoryPoolMXBeanImpl.getCollectionUsageThreshold(name); else throw new UnsupportedOperationException("A collection usage "+ - "threshold is not supported."); + "threshold is not supported."); } public long getCollectionUsageThresholdCount() @@ -113,7 +113,7 @@ public final class MemoryPoolMXBeanImpl return VMMemoryPoolMXBeanImpl.getCollectionUsageThresholdCount(name); else throw new UnsupportedOperationException("A collection usage "+ - "threshold is not supported."); + "threshold is not supported."); } public String[] getMemoryManagerNames() @@ -136,7 +136,7 @@ public final class MemoryPoolMXBeanImpl public MemoryType getType() { - return + return MemoryType.valueOf(VMMemoryPoolMXBeanImpl.getType(name)); } @@ -154,7 +154,7 @@ public final class MemoryPoolMXBeanImpl return VMMemoryPoolMXBeanImpl.getUsageThreshold(name); else throw new UnsupportedOperationException("A usage threshold " + - "is not supported."); + "is not supported."); } public long getUsageThresholdCount() @@ -163,7 +163,7 @@ public final class MemoryPoolMXBeanImpl return VMMemoryPoolMXBeanImpl.getUsageThresholdCount(name); else throw new UnsupportedOperationException("A usage threshold " + - "is not supported."); + "is not supported."); } public boolean isCollectionUsageThresholdExceeded() @@ -202,12 +202,12 @@ public final class MemoryPoolMXBeanImpl checkControlPermissions(); if (threshold < 0) throw new IllegalArgumentException("Threshold of " + threshold + - "is less than zero."); + "is less than zero."); if (isCollectionUsageThresholdSupported()) VMMemoryPoolMXBeanImpl.setCollectionUsageThreshold(name, threshold); else throw new UnsupportedOperationException("A collection usage "+ - "threshold is not supported."); + "threshold is not supported."); } public void setUsageThreshold(long threshold) @@ -215,13 +215,12 @@ public final class MemoryPoolMXBeanImpl checkControlPermissions(); if (threshold < 0) throw new IllegalArgumentException("Threshold of " + threshold + - "is less than zero."); + "is less than zero."); if (isUsageThresholdSupported()) VMMemoryPoolMXBeanImpl.setUsageThreshold(name, threshold); else throw new UnsupportedOperationException("A usage threshold " + - "is not supported."); + "is not supported."); } } - diff --git a/libjava/classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java index 07fb7bf0355..7f5a9586c2a 100644 --- a/libjava/classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/OperatingSystemMXBeanImpl.java @@ -43,7 +43,7 @@ import javax.management.NotCompliantMBeanException; /** * Provides access to information about the underlying operating - * system. + * system. * * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 @@ -91,5 +91,5 @@ public final class OperatingSystemMXBeanImpl { return System.getProperty("os.version"); } - + } diff --git a/libjava/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java index e3ebd162e17..8db943bb600 100644 --- a/libjava/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/RuntimeMXBeanImpl.java @@ -92,8 +92,8 @@ public final class RuntimeMXBeanImpl return bootClassPath; else throw - new UnsupportedOperationException("Retrieving the boot " + - "classpath is not supported."); + new UnsupportedOperationException("Retrieving the boot " + + "classpath is not supported."); } public String getClassPath() @@ -151,16 +151,16 @@ public final class RuntimeMXBeanImpl Iterator entries = props.entrySet().iterator(); while (entries.hasNext()) { - Map.Entry next = (Map.Entry) entries.next(); - Object key = next.getKey(); - Object value = next.getValue(); - if (key instanceof String && - value instanceof String) - map.put(key, value); + Map.Entry next = (Map.Entry) entries.next(); + Object key = next.getKey(); + Object value = next.getValue(); + if (key instanceof String && + value instanceof String) + map.put(key, value); } return map; } - + public long getUptime() { return new Date().getTime() - getStartTime(); @@ -185,11 +185,11 @@ public final class RuntimeMXBeanImpl { if (bootClassPath == null) { - bootClassPath = SystemProperties.getProperty(JAVA_BOOT_CLASS_PATH); - if (bootClassPath == null) - bootClassPath = SystemProperties.getProperty(SUN_BOOT_CLASS_PATH); - if (bootClassPath == null) - bootClassPathSupported = false; + bootClassPath = SystemProperties.getProperty(JAVA_BOOT_CLASS_PATH); + if (bootClassPath == null) + bootClassPath = SystemProperties.getProperty(SUN_BOOT_CLASS_PATH); + if (bootClassPath == null) + bootClassPathSupported = false; } return bootClassPathSupported; } diff --git a/libjava/classpath/gnu/java/lang/management/ThreadMXBeanImpl.java b/libjava/classpath/gnu/java/lang/management/ThreadMXBeanImpl.java index 5d0282301e3..97040997b3d 100644 --- a/libjava/classpath/gnu/java/lang/management/ThreadMXBeanImpl.java +++ b/libjava/classpath/gnu/java/lang/management/ThreadMXBeanImpl.java @@ -45,7 +45,7 @@ import java.lang.management.ThreadMXBean; import javax.management.NotCompliantMBeanException; /** - * Provides access to information about the threads + * Provides access to information about the threads * of the virtual machine. An instance of this bean is * obtained by calling * {@link ManagementFactory#getThreadMXBean()}. @@ -63,25 +63,25 @@ public final class ThreadMXBeanImpl /** * Constant for current thread time support. */ - private static final String CURRENT_THREAD_TIME_SUPPORT = + private static final String CURRENT_THREAD_TIME_SUPPORT = "gnu.java.lang.management.CurrentThreadTimeSupport"; /** * Constant for thread time support. */ - private static final String THREAD_TIME_SUPPORT = + private static final String THREAD_TIME_SUPPORT = "gnu.java.lang.management.ThreadTimeSupport"; /** * Constant for thread contention support. */ - private static final String CONTENTION_SUPPORT = + private static final String CONTENTION_SUPPORT = "gnu.java.lang.management.ThreadContentionSupport"; /** * Constant for initial value of thread time support. */ - private static final String TIME_ENABLED = + private static final String TIME_ENABLED = "gnu.java.lang.management.ThreadTimeInitallyEnabled"; /** @@ -125,10 +125,10 @@ public final class ThreadMXBeanImpl } public ThreadInfo[] dumpAllThreads(boolean lockedMonitors, - boolean lockedSynchronizers) + boolean lockedSynchronizers) { return getThreadInfo(getAllThreadIds(), lockedMonitors, - lockedSynchronizers); + lockedSynchronizers); } public long[] findDeadlockedThreads() @@ -136,8 +136,8 @@ public final class ThreadMXBeanImpl checkMonitorPermissions(); if (!isSynchronizerUsageSupported()) throw new UnsupportedOperationException("Ownable synchronizer usage " + - "monitoring is not provided " + - "by this VM."); + "monitoring is not provided " + + "by this VM."); return VMThreadMXBeanImpl.findDeadlockedThreads(); } @@ -157,7 +157,7 @@ public final class ThreadMXBeanImpl { if (!isCurrentThreadCpuTimeSupported()) throw new UnsupportedOperationException("Current thread CPU " + - "time not supported."); + "time not supported."); if (!timeEnabled) return -1; return VMThreadMXBeanImpl.getCurrentThreadCpuTime(); @@ -167,7 +167,7 @@ public final class ThreadMXBeanImpl { if (!isCurrentThreadCpuTimeSupported()) throw new UnsupportedOperationException("Current thread user " + - "time not supported."); + "time not supported."); if (!timeEnabled) return -1; return VMThreadMXBeanImpl.getCurrentThreadUserTime(); @@ -192,7 +192,7 @@ public final class ThreadMXBeanImpl { if (!isThreadCpuTimeSupported()) throw new UnsupportedOperationException("Thread CPU time not " + - "supported."); + "supported."); if (id <= 0) throw new IllegalArgumentException("Invalid thread id: " + id); if (!timeEnabled) @@ -228,32 +228,32 @@ public final class ThreadMXBeanImpl ThreadInfo[] infos = new ThreadInfo[ids.length]; for (int a = 0; a < ids.length; ++a) { - if (ids[a] <= 0) - throw new IllegalArgumentException("Invalid thread id " + a + - ": " + ids[a]); - infos[a] = VMThreadMXBeanImpl.getThreadInfoForId(ids[a], maxDepth); + if (ids[a] <= 0) + throw new IllegalArgumentException("Invalid thread id " + a + + ": " + ids[a]); + infos[a] = VMThreadMXBeanImpl.getThreadInfoForId(ids[a], maxDepth); } return infos; } public ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors, - boolean lockedSynchronizers) + boolean lockedSynchronizers) { checkMonitorPermissions(); if (lockedMonitors && !isObjectMonitorUsageSupported()) throw new UnsupportedOperationException("Monitor usage monitoring is " + - "not provided by this VM."); + "not provided by this VM."); if (lockedSynchronizers && !isSynchronizerUsageSupported()) throw new UnsupportedOperationException("Ownable synchronizer usage " + - "monitoring is not provided " + - "by this VM."); + "monitoring is not provided " + + "by this VM."); ThreadInfo[] infos = getThreadInfo(ids, Integer.MAX_VALUE); if (lockedMonitors) for (ThreadInfo info : infos) - VMThreadMXBeanImpl.getMonitorInfo(info); + VMThreadMXBeanImpl.getMonitorInfo(info); if (lockedSynchronizers) for (ThreadInfo info : infos) - VMThreadMXBeanImpl.getLockInfo(info); + VMThreadMXBeanImpl.getLockInfo(info); return infos; } @@ -261,7 +261,7 @@ public final class ThreadMXBeanImpl { if (!isThreadCpuTimeSupported()) throw new UnsupportedOperationException("Thread user time not " + - "supported."); + "supported."); if (id <= 0) throw new IllegalArgumentException("Invalid thread id: " + id); if (!timeEnabled) @@ -297,7 +297,7 @@ public final class ThreadMXBeanImpl return contentionEnabled; else throw new UnsupportedOperationException("Contention monitoring " + - "not supported."); + "not supported."); } public boolean isThreadContentionMonitoringSupported() @@ -308,13 +308,13 @@ public final class ThreadMXBeanImpl public boolean isThreadCpuTimeEnabled() { if (isThreadCpuTimeSupported() || - isCurrentThreadCpuTimeSupported()) + isCurrentThreadCpuTimeSupported()) return timeEnabled; else throw new UnsupportedOperationException("Thread time not " + - "supported."); + "supported."); } - + public boolean isThreadCpuTimeSupported() { return SystemProperties.getProperty(THREAD_TIME_SUPPORT) != null; @@ -325,7 +325,7 @@ public final class ThreadMXBeanImpl checkControlPermissions(); VMThreadMXBeanImpl.resetPeakThreadCount(); } - + public void setThreadContentionMonitoringEnabled(boolean enable) { checkControlPermissions(); @@ -333,19 +333,18 @@ public final class ThreadMXBeanImpl contentionEnabled = enable; else throw new UnsupportedOperationException("Contention monitoring " + - "not supported."); - } - + "not supported."); + } + public void setThreadCpuTimeEnabled(boolean enable) { checkControlPermissions(); if (isThreadCpuTimeSupported() || - isCurrentThreadCpuTimeSupported()) + isCurrentThreadCpuTimeSupported()) timeEnabled = enable; else throw new UnsupportedOperationException("Thread time not " + - "supported."); + "supported."); } } - diff --git a/libjava/classpath/gnu/java/lang/reflect/TypeSignature.java b/libjava/classpath/gnu/java/lang/reflect/TypeSignature.java index 612058dbfe8..c0a3ab0a582 100644 --- a/libjava/classpath/gnu/java/lang/reflect/TypeSignature.java +++ b/libjava/classpath/gnu/java/lang/reflect/TypeSignature.java @@ -176,7 +176,7 @@ public class TypeSignature * @see #getClassForEncoding(String, boolean) */ public static Class getClassForEncoding(String type_code, boolean descriptor, - ClassLoader loader) + ClassLoader loader) throws ClassNotFoundException { if (descriptor) diff --git a/libjava/classpath/gnu/java/locale/LocaleHelper.java b/libjava/classpath/gnu/java/locale/LocaleHelper.java index f3aabbdd939..8b108768d61 100644 --- a/libjava/classpath/gnu/java/locale/LocaleHelper.java +++ b/libjava/classpath/gnu/java/locale/LocaleHelper.java @@ -85,7 +85,7 @@ public class LocaleHelper int uscore = variant.indexOf('_'); if (uscore != -1) return new Locale(language, country, - variant.substring(0, uscore)); + variant.substring(0, uscore)); if (!variant.isEmpty()) return new Locale(language, country, ""); if (!country.isEmpty()) @@ -95,7 +95,7 @@ public class LocaleHelper /** * Return an array of all the locales for which there is a - * {@link Collator} instance. A new array is returned each time. + * {@link Collator} instance. A new array is returned each time. */ public static Locale[] getCollatorLocales() { @@ -145,4 +145,3 @@ public class LocaleHelper return LocaleData.localeNames[n]; } } - diff --git a/libjava/classpath/gnu/java/math/Fixed.java b/libjava/classpath/gnu/java/math/Fixed.java index ed4150b108c..6b210dedaab 100644 --- a/libjava/classpath/gnu/java/math/Fixed.java +++ b/libjava/classpath/gnu/java/math/Fixed.java @@ -45,7 +45,7 @@ public final class Fixed { /** - * Private constructor to avoid instantiation. + * Private constructor to avoid instantiation. */ private Fixed() { @@ -138,7 +138,7 @@ public final class Fixed /** * Returns the fixed point value a with n digits * as float. - * + * * @param n the number of digits * @param a the fixed point value * @@ -152,7 +152,7 @@ public final class Fixed /** * Returns the fixed point value a with n digits * as double. - * + * * @param n the number of digits * @param a the fixed point value * @@ -194,7 +194,7 @@ public final class Fixed /** * Returns the integer value of the specified fixed point value * a. This simply cuts of the digits (== floor(a)). - * + * * @param n the number of digits * @param a the fixed point value * diff --git a/libjava/classpath/gnu/java/math/GMP.java b/libjava/classpath/gnu/java/math/GMP.java index 6fb49363ddd..4df790a4002 100644 --- a/libjava/classpath/gnu/java/math/GMP.java +++ b/libjava/classpath/gnu/java/math/GMP.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,11 +47,11 @@ public final class GMP { private Pointer native_ptr; private int refCount = 1; - + public GMP() { super(); - + natInitialize(); } @@ -59,30 +59,30 @@ public final class GMP { refCount++; } - + private synchronized void releaseRef() { refCount--; if (refCount == 0) { - natFinalize(); - native_ptr = null; + natFinalize(); + native_ptr = null; } } - + protected void finalize() { releaseRef(); } - - + + public void fromByteArray(byte[] v) { acquireRef(); natFromByteArray(v); releaseRef(); } - + public void fromBI(GMP x) { acquireRef(); @@ -91,14 +91,14 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void fromLong(long n) { acquireRef(); natFromLong(n); releaseRef(); } - + public int fromString(String s, int rdx) { acquireRef(); @@ -106,14 +106,14 @@ public final class GMP releaseRef(); return result; } - + public void fromSignedMagnitude(byte[] m, boolean isNegative) { acquireRef(); natFromSignedMagnitude(m, isNegative); releaseRef(); } - + public String toString(int b) { acquireRef(); @@ -121,14 +121,14 @@ public final class GMP releaseRef(); return result; } - + public void toByteArray(byte[] r) { acquireRef(); natToByteArray(r); releaseRef(); } - + public double doubleValue() { acquireRef(); @@ -136,7 +136,7 @@ public final class GMP releaseRef(); return result; } - + public int absIntValue() { acquireRef(); @@ -144,7 +144,7 @@ public final class GMP releaseRef(); return result; } - + public int compare(GMP x) { acquireRef(); @@ -154,7 +154,7 @@ public final class GMP releaseRef(); return result; } - + public void add(GMP x, GMP r) { acquireRef(); @@ -165,7 +165,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void subtract(GMP x, GMP r) { acquireRef(); @@ -176,7 +176,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void multiply(GMP x, GMP r) { acquireRef(); @@ -187,7 +187,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void quotient(GMP x, GMP r) { acquireRef(); @@ -198,7 +198,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void remainder(GMP x, GMP r) { acquireRef(); @@ -209,7 +209,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void quotientAndRemainder(GMP x, GMP q, GMP r) { acquireRef(); @@ -222,7 +222,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void modulo(GMP x, GMP r) { acquireRef(); @@ -233,7 +233,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void pow(int n, GMP r) { acquireRef(); @@ -242,7 +242,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public void modPow(GMP e, GMP m, GMP r) { acquireRef(); @@ -255,7 +255,7 @@ public final class GMP e.releaseRef(); releaseRef(); } - + public void modInverse(GMP m, GMP r) { acquireRef(); @@ -277,7 +277,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void shiftLeft(int n, GMP r) { acquireRef(); @@ -286,7 +286,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public void shiftRight(int n, GMP r) { acquireRef(); @@ -295,7 +295,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public void abs(GMP r) { acquireRef(); @@ -304,7 +304,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public void negate(GMP r) { acquireRef(); @@ -313,7 +313,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public int bitLength() { acquireRef(); @@ -321,7 +321,7 @@ public final class GMP releaseRef(); return result; } - + public int bitCount() { acquireRef(); @@ -329,7 +329,7 @@ public final class GMP releaseRef(); return result; } - + public void and(GMP x, GMP r) { acquireRef(); @@ -340,7 +340,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void or(GMP x, GMP r) { acquireRef(); @@ -351,7 +351,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void xor(GMP x, GMP r) { acquireRef(); @@ -362,7 +362,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void andNot(GMP x, GMP r) { acquireRef(); @@ -373,7 +373,7 @@ public final class GMP x.releaseRef(); releaseRef(); } - + public void not(GMP r) { acquireRef(); @@ -382,7 +382,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public void flipBit(int n, GMP r) { acquireRef(); @@ -399,7 +399,7 @@ public final class GMP releaseRef(); return result; } - + public void setBit(int n, boolean setIt, GMP r) { acquireRef(); @@ -408,7 +408,7 @@ public final class GMP r.releaseRef(); releaseRef(); } - + public int testPrimality(int certainty) { acquireRef(); @@ -416,7 +416,7 @@ public final class GMP releaseRef(); return result; } - + public int lowestSetBit() { acquireRef(); @@ -424,25 +424,25 @@ public final class GMP releaseRef(); return result; } - + // Native methods ......................................................... - + public static native void natInitializeLibrary(); - + private native void natInitialize(); private native void natFinalize(); - + private native void natFromLong(long n); private native void natFromBI(Pointer x); private native void natFromByteArray(byte[] v); private native int natFromString(String s, int rdx); private native void natFromSignedMagnitude(byte[] m, boolean isNegative); - + private native String natToString(int base); private native void natToByteArray(byte[] r); private native int natAbsIntValue(); private native double natDoubleValue(); - + private native int natCompare(Pointer y); private native void natAdd(Pointer x, Pointer r); private native void natSubtract(Pointer x, Pointer r); diff --git a/libjava/classpath/gnu/java/math/MPN.java b/libjava/classpath/gnu/java/math/MPN.java index 05491bb7e84..9143ef03bbf 100644 --- a/libjava/classpath/gnu/java/math/MPN.java +++ b/libjava/classpath/gnu/java/math/MPN.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -59,9 +59,9 @@ public class MPN long carry = (long) y & 0xffffffffL; for (int i = 0; i < size; i++) { - carry += ((long) x[i] & 0xffffffffL); - dest[i] = (int) carry; - carry >>= 32; + carry += ((long) x[i] & 0xffffffffL); + dest[i] = (int) carry; + carry >>= 32; } return (int) carry; } @@ -77,10 +77,10 @@ public class MPN long carry = 0; for (int i = 0; i < len; i++) { - carry += ((long) x[i] & 0xffffffffL) - + ((long) y[i] & 0xffffffffL); - dest[i] = (int) carry; - carry >>>= 32; + carry += ((long) x[i] & 0xffffffffL) + + ((long) y[i] & 0xffffffffL); + dest[i] = (int) carry; + carry >>>= 32; } return (int) carry; } @@ -96,15 +96,15 @@ public class MPN int cy = 0; for (int i = 0; i < size; i++) { - int y = Y[i]; - int x = X[i]; - y += cy; /* add previous carry to subtrahend */ - // Invert the high-order bit, because: (unsigned) X > (unsigned) Y - // iff: (int) (X^0x80000000) > (int) (Y^0x80000000). - cy = (y^0x80000000) < (cy^0x80000000) ? 1 : 0; - y = x - y; - cy += (y^0x80000000) > (x ^ 0x80000000) ? 1 : 0; - dest[i] = y; + int y = Y[i]; + int x = X[i]; + y += cy; /* add previous carry to subtrahend */ + // Invert the high-order bit, because: (unsigned) X > (unsigned) Y + // iff: (int) (X^0x80000000) > (int) (Y^0x80000000). + cy = (y^0x80000000) < (cy^0x80000000) ? 1 : 0; + y = x - y; + cy += (y^0x80000000) > (x ^ 0x80000000) ? 1 : 0; + dest[i] = y; } return cy; } @@ -142,23 +142,23 @@ public class MPN * This function is basically the same gmp's mpn_mul. */ public static void mul (int[] dest, - int[] x, int xlen, - int[] y, int ylen) + int[] x, int xlen, + int[] y, int ylen) { dest[xlen] = MPN.mul_1 (dest, x, xlen, y[0]); for (int i = 1; i < ylen; i++) { - long yword = (long) y[i] & 0xffffffffL; - long carry = 0; - for (int j = 0; j < xlen; j++) - { - carry += ((long) x[j] & 0xffffffffL) * yword - + ((long) dest[i+j] & 0xffffffffL); - dest[i+j] = (int) carry; - carry >>>= 32; - } - dest[i+xlen] = (int) carry; + long yword = (long) y[i] & 0xffffffffL; + long carry = 0; + for (int j = 0; j < xlen; j++) + { + carry += ((long) x[j] & 0xffffffffL) * yword + + ((long) dest[i+j] & 0xffffffffL); + dest[i+j] = (int) carry; + carry >>>= 32; + } + dest[i+xlen] = (int) carry; } } @@ -174,71 +174,71 @@ public class MPN long a0 = N & 0xffffffffL; if (D >= 0) { - if (a1 < ((D - a1 - (a0 >>> 31)) & 0xffffffffL)) - { - /* dividend, divisor, and quotient are nonnegative */ - q = N / D; - r = N % D; - } - else - { - /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */ - long c = N - ((long) D << 31); - /* Divide (c1*2^32 + c0) by d */ - q = c / D; - r = c % D; - /* Add 2^31 to quotient */ - q += 1 << 31; - } + if (a1 < ((D - a1 - (a0 >>> 31)) & 0xffffffffL)) + { + /* dividend, divisor, and quotient are nonnegative */ + q = N / D; + r = N % D; + } + else + { + /* Compute c1*2^32 + c0 = a1*2^32 + a0 - 2^31*d */ + long c = N - ((long) D << 31); + /* Divide (c1*2^32 + c0) by d */ + q = c / D; + r = c % D; + /* Add 2^31 to quotient */ + q += 1 << 31; + } } else { - long b1 = D >>> 1; /* d/2, between 2^30 and 2^31 - 1 */ - //long c1 = (a1 >> 1); /* A/2 */ - //int c0 = (a1 << 31) + (a0 >> 1); - long c = N >>> 1; - if (a1 < b1 || (a1 >> 1) < b1) - { - if (a1 < b1) - { - q = c / b1; - r = c % b1; - } - else /* c1 < b1, so 2^31 <= (A/2)/b1 < 2^32 */ - { - c = ~(c - (b1 << 32)); - q = c / b1; /* (A/2) / (d/2) */ - r = c % b1; - q = (~q) & 0xffffffffL; /* (A/2)/b1 */ - r = (b1 - 1) - r; /* r < b1 => new r >= 0 */ - } - r = 2 * r + (a0 & 1); - if ((D & 1) != 0) - { - if (r >= q) { - r = r - q; - } else if (q - r <= ((long) D & 0xffffffffL)) { + long b1 = D >>> 1; /* d/2, between 2^30 and 2^31 - 1 */ + //long c1 = (a1 >> 1); /* A/2 */ + //int c0 = (a1 << 31) + (a0 >> 1); + long c = N >>> 1; + if (a1 < b1 || (a1 >> 1) < b1) + { + if (a1 < b1) + { + q = c / b1; + r = c % b1; + } + else /* c1 < b1, so 2^31 <= (A/2)/b1 < 2^32 */ + { + c = ~(c - (b1 << 32)); + q = c / b1; /* (A/2) / (d/2) */ + r = c % b1; + q = (~q) & 0xffffffffL; /* (A/2)/b1 */ + r = (b1 - 1) - r; /* r < b1 => new r >= 0 */ + } + r = 2 * r + (a0 & 1); + if ((D & 1) != 0) + { + if (r >= q) { + r = r - q; + } else if (q - r <= ((long) D & 0xffffffffL)) { r = r - q + D; - q -= 1; - } else { + q -= 1; + } else { r = r - q + D + D; - q -= 2; - } - } - } - else /* Implies c1 = b1 */ - { /* Hence a1 = d - 1 = 2*b1 - 1 */ - if (a0 >= ((long)(-D) & 0xffffffffL)) - { - q = -1; - r = a0 + D; - } - else - { - q = -2; - r = a0 + D + D; - } - } + q -= 2; + } + } + } + else /* Implies c1 = b1 */ + { /* Hence a1 = d - 1 = 2*b1 - 1 */ + if (a0 >= ((long)(-D) & 0xffffffffL)) + { + q = -1; + r = a0 + D; + } + else + { + q = -2; + r = a0 + D + D; + } + } } return (r << 32) | (q & 0xFFFFFFFFl); @@ -251,7 +251,7 @@ public class MPN */ public static int divmod_1 (int[] quotient, int[] dividend, - int len, int divisor) + int len, int divisor) { int i = len - 1; long r = dividend[i]; @@ -259,16 +259,16 @@ public class MPN r = 0; else { - quotient[i--] = 0; - r <<= 32; + quotient[i--] = 0; + r <<= 32; } for (; i >= 0; i--) { - int n0 = dividend[i]; - r = (r & ~0xffffffffL) | (n0 & 0xffffffffL); - r = udiv_qrnnd (r, divisor); - quotient[i] = (int) r; + int n0 = dividend[i]; + r = (r & ~0xffffffffL) | (n0 & 0xffffffffL); + r = udiv_qrnnd (r, divisor); + quotient[i] = (int) r; } return (int)(r >> 32); } @@ -285,19 +285,19 @@ public class MPN int j = 0; do { - long prod = ((long) x[j] & 0xffffffffL) * yl; - int prod_low = (int) prod; - int prod_high = (int) (prod >> 32); - prod_low += carry; - // Invert the high-order bit, because: (unsigned) X > (unsigned) Y - // iff: (int) (X^0x80000000) > (int) (Y^0x80000000). - carry = ((prod_low ^ 0x80000000) < (carry ^ 0x80000000) ? 1 : 0) - + prod_high; - int x_j = dest[offset+j]; - prod_low = x_j - prod_low; - if ((prod_low ^ 0x80000000) > (x_j ^ 0x80000000)) - carry++; - dest[offset+j] = prod_low; + long prod = ((long) x[j] & 0xffffffffL) * yl; + int prod_low = (int) prod; + int prod_high = (int) (prod >> 32); + prod_low += carry; + // Invert the high-order bit, because: (unsigned) X > (unsigned) Y + // iff: (int) (X^0x80000000) > (int) (Y^0x80000000). + carry = ((prod_low ^ 0x80000000) < (carry ^ 0x80000000) ? 1 : 0) + + prod_high; + int x_j = dest[offset+j]; + prod_low = x_j - prod_low; + if ((prod_low ^ 0x80000000) > (x_j ^ 0x80000000)) + carry++; + dest[offset+j] = prod_low; } while (++j < len); return carry; @@ -328,37 +328,37 @@ public class MPN int j = nx; do { // loop over digits of quotient - // Knuth's j == our nx-j. - // Knuth's u[j:j+n] == our zds[j:j-ny]. - int qhat; // treated as unsigned - if (zds[j]==y[ny-1]) - qhat = -1; // 0xffffffff - else - { - long w = (((long)(zds[j])) << 32) + ((long)zds[j-1] & 0xffffffffL); - qhat = (int) udiv_qrnnd (w, y[ny-1]); - } - if (qhat != 0) - { - int borrow = submul_1 (zds, j - ny, y, ny, qhat); - int save = zds[j]; - long num = ((long)save&0xffffffffL) - ((long)borrow&0xffffffffL); + // Knuth's j == our nx-j. + // Knuth's u[j:j+n] == our zds[j:j-ny]. + int qhat; // treated as unsigned + if (zds[j]==y[ny-1]) + qhat = -1; // 0xffffffff + else + { + long w = (((long)(zds[j])) << 32) + ((long)zds[j-1] & 0xffffffffL); + qhat = (int) udiv_qrnnd (w, y[ny-1]); + } + if (qhat != 0) + { + int borrow = submul_1 (zds, j - ny, y, ny, qhat); + int save = zds[j]; + long num = ((long)save&0xffffffffL) - ((long)borrow&0xffffffffL); while (num != 0) - { - qhat--; - long carry = 0; - for (int i = 0; i < ny; i++) - { - carry += ((long) zds[j-ny+i] & 0xffffffffL) - + ((long) y[i] & 0xffffffffL); - zds[j-ny+i] = (int) carry; - carry >>>= 32; - } - zds[j] += carry; - num = carry - 1; - } - } - zds[j] = qhat; + { + qhat--; + long carry = 0; + for (int i = 0; i < ny; i++) + { + carry += ((long) zds[j-ny+i] & 0xffffffffL) + + ((long) y[i] & 0xffffffffL); + zds[j-ny+i] = (int) carry; + carry >>>= 32; + } + zds[j] += carry; + num = carry - 1; + } + } + zds[j] = qhat; } while (--j >= ny); } @@ -372,19 +372,19 @@ public class MPN { if (radix < 10) { - if (radix < 8) - { - if (radix <= 2) - return 32; - else if (radix == 3) - return 20; - else if (radix == 4) - return 16; - else - return 18 - radix; - } - else - return 10; + if (radix < 8) + { + if (radix <= 2) + return 32; + else if (radix == 3) + return 20; + else if (radix == 4) + return 16; + else + return 18 - radix; + } + else + return 10; } else if (radix < 12) return 9; @@ -410,9 +410,9 @@ public class MPN for (int k = 16; k > 0; k = k >> 1) { int j = i >>> k; if (j == 0) - count += k; + count += k; else - i = j; + i = j; } return count; } @@ -422,61 +422,61 @@ public class MPN int size = 0; if ((base & (base - 1)) == 0) { - // The base is a power of 2. Read the input string from - // least to most significant character/digit. */ + // The base is a power of 2. Read the input string from + // least to most significant character/digit. */ - int next_bitpos = 0; - int bits_per_indigit = 0; - for (int i = base; (i >>= 1) != 0; ) bits_per_indigit++; - int res_digit = 0; + int next_bitpos = 0; + int bits_per_indigit = 0; + for (int i = base; (i >>= 1) != 0; ) bits_per_indigit++; + int res_digit = 0; - for (int i = str_len; --i >= 0; ) - { - int inp_digit = str[i]; - res_digit |= inp_digit << next_bitpos; - next_bitpos += bits_per_indigit; - if (next_bitpos >= 32) - { - dest[size++] = res_digit; - next_bitpos -= 32; - res_digit = inp_digit >> (bits_per_indigit - next_bitpos); - } - } + for (int i = str_len; --i >= 0; ) + { + int inp_digit = str[i]; + res_digit |= inp_digit << next_bitpos; + next_bitpos += bits_per_indigit; + if (next_bitpos >= 32) + { + dest[size++] = res_digit; + next_bitpos -= 32; + res_digit = inp_digit >> (bits_per_indigit - next_bitpos); + } + } - if (res_digit != 0) - dest[size++] = res_digit; + if (res_digit != 0) + dest[size++] = res_digit; } else { - // General case. The base is not a power of 2. - int indigits_per_limb = MPN.chars_per_word (base); - int str_pos = 0; + // General case. The base is not a power of 2. + int indigits_per_limb = MPN.chars_per_word (base); + int str_pos = 0; - while (str_pos < str_len) - { - int chunk = str_len - str_pos; - if (chunk > indigits_per_limb) - chunk = indigits_per_limb; - int res_digit = str[str_pos++]; - int big_base = base; + while (str_pos < str_len) + { + int chunk = str_len - str_pos; + if (chunk > indigits_per_limb) + chunk = indigits_per_limb; + int res_digit = str[str_pos++]; + int big_base = base; - while (--chunk > 0) - { - res_digit = res_digit * base + str[str_pos++]; - big_base *= base; - } + while (--chunk > 0) + { + res_digit = res_digit * base + str[str_pos++]; + big_base *= base; + } - int cy_limb; - if (size == 0) - cy_limb = res_digit; - else - { - cy_limb = MPN.mul_1 (dest, dest, size, big_base); - cy_limb += MPN.add_1 (dest, dest, size, res_digit); - } - if (cy_limb != 0) - dest[size++] = cy_limb; - } + int cy_limb; + if (size == 0) + cy_limb = res_digit; + else + { + cy_limb = MPN.mul_1 (dest, dest, size, big_base); + cy_limb += MPN.add_1 (dest, dest, size, res_digit); + } + if (cy_limb != 0) + dest[size++] = cy_limb; + } } return size; } @@ -489,22 +489,22 @@ public class MPN { while (--size >= 0) { - int x_word = x[size]; - int y_word = y[size]; - if (x_word != y_word) - { - // Invert the high-order bit, because: - // (unsigned) X > (unsigned) Y iff - // (int) (X^0x80000000) > (int) (Y^0x80000000). - return (x_word ^ 0x80000000) > (y_word ^0x80000000) ? 1 : -1; - } + int x_word = x[size]; + int y_word = y[size]; + if (x_word != y_word) + { + // Invert the high-order bit, because: + // (unsigned) X > (unsigned) Y iff + // (int) (X^0x80000000) > (int) (Y^0x80000000). + return (x_word ^ 0x80000000) > (y_word ^0x80000000) ? 1 : -1; + } } return 0; } /** * Compare x[0:xlen-1] with y[0:ylen-1], treating them as unsigned integers. - * + * * @return -1, 0, or 1 depending on if x<y, x==y, or x>y. */ public static int cmp (int[] x, int xlen, int[] y, int ylen) @@ -521,7 +521,7 @@ public class MPN * Assumes: 0 < count < 32 */ public static int rshift (int[] dest, int[] x, int x_start, - int len, int count) + int len, int count) { int count_2 = 32 - count; int low_word = x[x_start]; @@ -529,9 +529,9 @@ public class MPN int i = 1; for (; i < len; i++) { - int high_word = x[x_start+i]; - dest[i-1] = (low_word >>> count) | (high_word << count_2); - low_word = high_word; + int high_word = x[x_start+i]; + dest[i-1] = (low_word >>> count) | (high_word << count_2); + low_word = high_word; } dest[i-1] = low_word >>> count; return retval; @@ -546,13 +546,13 @@ public class MPN * Same as rshift, but handles count==0 (and has no return value). */ public static void rshift0 (int[] dest, int[] x, int x_start, - int len, int count) + int len, int count) { if (count > 0) rshift(dest, x, x_start, len, count); else for (int i = 0; i < len; i++) - dest[i] = x[i + x_start]; + dest[i] = x[i + x_start]; } /** Return the long-truncated value of right shifting. @@ -571,10 +571,10 @@ public class MPN int w1 = wordno >= len ? sign : x[wordno]; if (count != 0) { - wordno++; - int w2 = wordno >= len ? sign : x[wordno]; - w0 = (w0 >>> count) | (w1 << (32-count)); - w1 = (w1 >>> count) | (w2 << (32-count)); + wordno++; + int w2 = wordno >= len ? sign : x[wordno]; + w0 = (w0 >>> count) | (w1 << (32-count)); + w1 = (w1 >>> count) | (w2 << (32-count)); } return ((long)w1 << 32) | ((long)w0 & 0xffffffffL); } @@ -587,7 +587,7 @@ public class MPN */ public static int lshift (int[] dest, int d_offset, - int[] x, int len, int count) + int[] x, int len, int count) { int count_2 = 32 - count; int i = len - 1; @@ -596,9 +596,9 @@ public class MPN d_offset++; while (--i >= 0) { - int low_word = x[i]; - dest[d_offset+i] = (high_word << count) | (low_word >>> count_2); - high_word = low_word; + int low_word = x[i]; + dest[d_offset+i] = (high_word << count) | (low_word >>> count_2); + high_word = low_word; } dest[d_offset+i] = high_word << count; return retval; @@ -611,13 +611,13 @@ public class MPN int i = 0; while ((word & 0xF) == 0) { - word >>= 4; - i += 4; + word >>= 4; + i += 4; } if ((word & 3) == 0) { - word >>= 2; - i += 2; + word >>= 2; + i += 2; } if ((word & 1) == 0) i += 1; @@ -630,8 +630,8 @@ public class MPN { for (int i = 0; ; i++) { - if (words[i] != 0) - return 32 * i + findLowestBit (words[i]); + if (words[i] != 0) + return 32 * i + findLowestBit (words[i]); } } @@ -646,12 +646,12 @@ public class MPN // Find sh such that both x and y are divisible by 2**sh. for (i = 0; ; i++) { - word = x[i] | y[i]; - if (word != 0) - { - // Must terminate, since x and y are non-zero. - break; - } + word = x[i] | y[i]; + if (word != 0) + { + // Must terminate, since x and y are non-zero. + break; + } } int initShiftWords = i; int initShiftBits = findLowestBit (word); @@ -666,69 +666,69 @@ public class MPN int[] other_arg; /* The other one can be even or odd. */ if ((x[0] & 1) != 0) { - odd_arg = x; - other_arg = y; + odd_arg = x; + other_arg = y; } else { - odd_arg = y; - other_arg = x; + odd_arg = y; + other_arg = x; } for (;;) { - // Shift other_arg until it is odd; this doesn't - // affect the gcd, since we divide by 2**k, which does not - // divide odd_arg. - for (i = 0; other_arg[i] == 0; ) i++; - if (i > 0) - { - int j; - for (j = 0; j < len-i; j++) - other_arg[j] = other_arg[j+i]; - for ( ; j < len; j++) - other_arg[j] = 0; - } - i = findLowestBit(other_arg[0]); - if (i > 0) - MPN.rshift (other_arg, other_arg, 0, len, i); + // Shift other_arg until it is odd; this doesn't + // affect the gcd, since we divide by 2**k, which does not + // divide odd_arg. + for (i = 0; other_arg[i] == 0; ) i++; + if (i > 0) + { + int j; + for (j = 0; j < len-i; j++) + other_arg[j] = other_arg[j+i]; + for ( ; j < len; j++) + other_arg[j] = 0; + } + i = findLowestBit(other_arg[0]); + if (i > 0) + MPN.rshift (other_arg, other_arg, 0, len, i); - // Now both odd_arg and other_arg are odd. + // Now both odd_arg and other_arg are odd. - // Subtract the smaller from the larger. - // This does not change the result, since gcd(a-b,b)==gcd(a,b). - i = MPN.cmp(odd_arg, other_arg, len); - if (i == 0) - break; - if (i > 0) - { // odd_arg > other_arg - MPN.sub_n (odd_arg, odd_arg, other_arg, len); - // Now odd_arg is even, so swap with other_arg; - int[] tmp = odd_arg; odd_arg = other_arg; other_arg = tmp; - } - else - { // other_arg > odd_arg - MPN.sub_n (other_arg, other_arg, odd_arg, len); - } - while (odd_arg[len-1] == 0 && other_arg[len-1] == 0) - len--; + // Subtract the smaller from the larger. + // This does not change the result, since gcd(a-b,b)==gcd(a,b). + i = MPN.cmp(odd_arg, other_arg, len); + if (i == 0) + break; + if (i > 0) + { // odd_arg > other_arg + MPN.sub_n (odd_arg, odd_arg, other_arg, len); + // Now odd_arg is even, so swap with other_arg; + int[] tmp = odd_arg; odd_arg = other_arg; other_arg = tmp; + } + else + { // other_arg > odd_arg + MPN.sub_n (other_arg, other_arg, odd_arg, len); + } + while (odd_arg[len-1] == 0 && other_arg[len-1] == 0) + len--; } if (initShiftWords + initShiftBits > 0) { - if (initShiftBits > 0) - { - int sh_out = MPN.lshift (x, initShiftWords, x, len, initShiftBits); - if (sh_out != 0) - x[(len++)+initShiftWords] = sh_out; - } - else - { - for (i = len; --i >= 0;) - x[i+initShiftWords] = x[i]; - } - for (i = initShiftWords; --i >= 0; ) - x[i] = 0; - len += initShiftWords; + if (initShiftBits > 0) + { + int sh_out = MPN.lshift (x, initShiftWords, x, len, initShiftBits); + if (sh_out != 0) + x[(len++)+initShiftWords] = sh_out; + } + else + { + for (i = len; --i >= 0;) + x[i+initShiftWords] = x[i]; + } + for (i = initShiftWords; --i >= 0; ) + x[i] = 0; + len += initShiftWords; } return len; } @@ -761,9 +761,9 @@ public class MPN ps.print('('); for (int i = 0; i < len; i++) { - if (i > 0) - ps.print (' '); - ps.print ("#x" + Long.toString ((long) x[i] & 0xffffffffL, 16)); + if (i > 0) + ps.print (' '); + ps.print ("#x" + Long.toString ((long) x[i] & 0xffffffffL, 16)); } ps.print(')'); } diff --git a/libjava/classpath/gnu/java/net/CRLFInputStream.java b/libjava/classpath/gnu/java/net/CRLFInputStream.java index ac3482679c5..5e394ae2c30 100644 --- a/libjava/classpath/gnu/java/net/CRLFInputStream.java +++ b/libjava/classpath/gnu/java/net/CRLFInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -64,7 +64,7 @@ public class CRLFInputStream * The underlying input stream. */ protected InputStream in; - + private boolean doReset; /** @@ -100,7 +100,7 @@ public class CRLFInputStream } return c; } - + /** * Reads up to b.length bytes of data from this input stream into * an array of bytes. @@ -176,4 +176,3 @@ public class CRLFInputStream } } - diff --git a/libjava/classpath/gnu/java/net/CRLFOutputStream.java b/libjava/classpath/gnu/java/net/CRLFOutputStream.java index f27e0f218ad..0e9428373d7 100644 --- a/libjava/classpath/gnu/java/net/CRLFOutputStream.java +++ b/libjava/classpath/gnu/java/net/CRLFOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -/** +/** * An output stream that filters LFs into CR/LF pairs. * * @author Chris Burdess (dog@gnu.org) @@ -105,7 +105,7 @@ public class CRLFOutputStream } last = ch; } - + /** * Writes a byte array to the underlying stream. * @exception IOException if an I/O error occurred @@ -150,7 +150,7 @@ public class CRLFOutputStream out.write (b, d, len - d); } } - + /** * Writes the specified ASCII string to the underlying stream. * @exception IOException if an I/O error occurred @@ -180,4 +180,3 @@ public class CRLFOutputStream out.write(CRLF, 0, 2); } } - diff --git a/libjava/classpath/gnu/java/net/DefaultContentHandlerFactory.java b/libjava/classpath/gnu/java/net/DefaultContentHandlerFactory.java index e3d1b8e5a96..1d113b935a9 100644 --- a/libjava/classpath/gnu/java/net/DefaultContentHandlerFactory.java +++ b/libjava/classpath/gnu/java/net/DefaultContentHandlerFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,7 +49,7 @@ import java.util.HashSet; class ImageHandler extends ContentHandler { static ImageHandler instance = new ImageHandler(); - + public Object getContent(URLConnection urlc) throws IOException { // FIXME: implement using ImageIO @@ -80,7 +80,7 @@ public class DefaultContentHandlerFactory implements ContentHandlerFactory "image/x-xbitmap", "image/x-xpixmap" }; - + private static HashSet imageTypes = new HashSet(Arrays.asList(known_image_types)); diff --git a/libjava/classpath/gnu/java/net/DefaultProxySelector.java b/libjava/classpath/gnu/java/net/DefaultProxySelector.java index 31f861e8710..f0215a054f3 100644 --- a/libjava/classpath/gnu/java/net/DefaultProxySelector.java +++ b/libjava/classpath/gnu/java/net/DefaultProxySelector.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,13 +50,13 @@ public final class DefaultProxySelector extends ProxySelector { private static final List proxies = new ArrayList(); - + static { // The default proxy selector supports only direct connections. proxies.add(Proxy.NO_PROXY); } - + public DefaultProxySelector() { // Do nothing by default. @@ -69,7 +69,7 @@ public final class DefaultProxySelector // Do nothing by default. } - + public List select(URI uri) { if (uri == null) diff --git a/libjava/classpath/gnu/java/net/EmptyX509TrustManager.java b/libjava/classpath/gnu/java/net/EmptyX509TrustManager.java index b8faf41add7..466b49ef845 100644 --- a/libjava/classpath/gnu/java/net/EmptyX509TrustManager.java +++ b/libjava/classpath/gnu/java/net/EmptyX509TrustManager.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -67,4 +67,3 @@ public class EmptyX509TrustManager return new X509Certificate[0]; } } - diff --git a/libjava/classpath/gnu/java/net/GetLocalHostAction.java b/libjava/classpath/gnu/java/net/GetLocalHostAction.java index fa76015552b..1e18877de9a 100644 --- a/libjava/classpath/gnu/java/net/GetLocalHostAction.java +++ b/libjava/classpath/gnu/java/net/GetLocalHostAction.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -62,4 +62,3 @@ public class GetLocalHostAction } } } - diff --git a/libjava/classpath/gnu/java/net/HeaderFieldHelper.java b/libjava/classpath/gnu/java/net/HeaderFieldHelper.java index a8d13ce153b..ca3b9d2dd49 100644 --- a/libjava/classpath/gnu/java/net/HeaderFieldHelper.java +++ b/libjava/classpath/gnu/java/net/HeaderFieldHelper.java @@ -1,4 +1,4 @@ -/* HeaderFieldHelper.java -- Helps manage headers fields +/* HeaderFieldHelper.java -- Helps manage headers fields Copyright (C) 1998, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -105,12 +105,12 @@ public class HeaderFieldHelper try { - value = headerFieldValues.elementAt(headerFieldKeys.indexOf(key)); + value = headerFieldValues.elementAt(headerFieldKeys.indexOf(key)); } catch (ArrayIndexOutOfBoundsException e) { } - + return value; } @@ -121,8 +121,8 @@ public class HeaderFieldHelper for (int index = 0; index < max; index++) { - headers.put(headerFieldKeys.elementAt(index), - headerFieldValues.elementAt(index)); + headers.put(headerFieldKeys.elementAt(index), + headerFieldValues.elementAt(index)); } return headers; @@ -134,4 +134,3 @@ public class HeaderFieldHelper } } // class HeaderFieldHelper - diff --git a/libjava/classpath/gnu/java/net/IndexListParser.java b/libjava/classpath/gnu/java/net/IndexListParser.java index 2d90ceb6433..bf274b17257 100644 --- a/libjava/classpath/gnu/java/net/IndexListParser.java +++ b/libjava/classpath/gnu/java/net/IndexListParser.java @@ -1,4 +1,4 @@ -/* IndexListParser.java -- +/* IndexListParser.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,11 +47,11 @@ import java.util.Set; import java.util.jar.JarFile; /** - * The INDEX.LIST file contains sections each separated by a blank line. + * The INDEX.LIST file contains sections each separated by a blank line. * Each section defines the content of a jar, with a * header defining the jar file path name, followed by a list of paths. * The jar file paths are relative to the codebase of the root jar. - * + * Specification index file : version-info blankline section* version-info : JarIndex-Version: version-number @@ -60,7 +60,7 @@ import java.util.jar.JarFile; body : header name* header : char+.jar newline name : char+ newline - + * @author langel at redhat dot com */ public class IndexListParser @@ -73,10 +73,10 @@ public class IndexListParser // This is intentionally kept in insertion order. LinkedHashMap> prefixes = new LinkedHashMap>(); - + /** * Parses the given jarfile's INDEX.LIST file if it exists. - * + * * @param jarfile - the given jar file * @param baseJarURL - the codebase of the jar file * @param baseURL - the base url for the headers @@ -90,13 +90,13 @@ public class IndexListParser { BufferedReader br = new BufferedReader(new InputStreamReader(new URL(baseJarURL, JAR_INDEX_FILE).openStream())); - + // Must start with version info String line = br.readLine(); if (!line.startsWith(JAR_INDEX_VERSION_KEY)) return; versionNumber = Double.parseDouble(line.substring(JAR_INDEX_VERSION_KEY.length()).trim()); - + // Blank line must be next line = br.readLine(); if (! "".equals(line)) @@ -104,13 +104,13 @@ public class IndexListParser clearAll(); return; } - + // May contain sections. while ((line = br.readLine()) != null) { URL jarURL = new URL(baseURL, line); HashSet values = new HashSet(); - + // Read the names in the section. while ((line = br.readLine()) != null) { @@ -138,7 +138,7 @@ public class IndexListParser clearAll(); } } - + /** * Clears all the variables. This is called when parsing fails. */ @@ -147,33 +147,33 @@ public class IndexListParser versionNumber = 0; prefixes = null; } - + /** * Gets the version info for the file. - * + * * @return the version info. */ public String getVersionInfo() { return JAR_INDEX_VERSION_KEY + getVersionNumber(); } - + /** * Gets the version number of the file. - * + * * @return the version number. */ public double getVersionNumber() { return versionNumber; } - + /** * Gets the map of all the headers found in the file. * The keys in the map are URLs of jars. The values in the map * are Sets of package prefixes (and top-level file names), as * specifed in INDEX.LIST. - * + * * @return an map of all the headers, or null if no INDEX.LIST was found */ public LinkedHashMap> getHeaders() diff --git a/libjava/classpath/gnu/java/net/LineInputStream.java b/libjava/classpath/gnu/java/net/LineInputStream.java index da307dbddf2..8bd4b69cd58 100644 --- a/libjava/classpath/gnu/java/net/LineInputStream.java +++ b/libjava/classpath/gnu/java/net/LineInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,7 +56,7 @@ public class LineInputStream * The underlying input stream. */ protected InputStream in; - + /* * Line buffer. */ @@ -112,7 +112,7 @@ public class LineInputStream { return in.read(buf); } - + public int read(byte[] buf, int off, int len) throws IOException { @@ -221,4 +221,3 @@ public class LineInputStream return -1; } } - diff --git a/libjava/classpath/gnu/java/net/PlainDatagramSocketImpl.java b/libjava/classpath/gnu/java/net/PlainDatagramSocketImpl.java index a84525e18b8..639c9ff55f3 100644 --- a/libjava/classpath/gnu/java/net/PlainDatagramSocketImpl.java +++ b/libjava/classpath/gnu/java/net/PlainDatagramSocketImpl.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -69,19 +69,19 @@ import java.nio.ByteBuffer; public final class PlainDatagramSocketImpl extends DatagramSocketImpl { private final VMChannel channel; - + /** * The platform-specific socket implementation. */ private final VMPlainSocketImpl impl; - + /** - * Lock object to serialize threads wanting to receive + * Lock object to serialize threads wanting to receive */ private final Object RECEIVE_LOCK = new Object(); - + /** - * Lock object to serialize threads wanting to send + * Lock object to serialize threads wanting to send */ private final Object SEND_LOCK = new Object(); @@ -99,7 +99,7 @@ public final class PlainDatagramSocketImpl extends DatagramSocketImpl synchronized (this) { if (channel.getState().isValid()) - close(); + close(); } super.finalize(); }*/ diff --git a/libjava/classpath/gnu/java/net/PlainSocketImpl.java b/libjava/classpath/gnu/java/net/PlainSocketImpl.java index 5bda0a5e9bf..72db53186e5 100644 --- a/libjava/classpath/gnu/java/net/PlainSocketImpl.java +++ b/libjava/classpath/gnu/java/net/PlainSocketImpl.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -93,13 +93,13 @@ public class PlainSocketImpl extends SocketImpl * is being invoked on this socket. */ private boolean inChannelOperation; - + /** * The socket channel we use for IO operation. Package-private for * use by inner classes. */ SocketChannelImpl channel; - + /** * Indicates whether we should ignore whether any associated * channel is set to non-blocking mode. Certain operations @@ -111,7 +111,7 @@ public class PlainSocketImpl extends SocketImpl { return inChannelOperation; } - + /** * Sets our indicator of whether an I/O operation is being * initiated by a channel. @@ -120,7 +120,7 @@ public class PlainSocketImpl extends SocketImpl { inChannelOperation = b; } - + /** * Default do nothing constructor. */ @@ -149,7 +149,7 @@ public class PlainSocketImpl extends SocketImpl case SO_BROADCAST: case SO_KEEPALIVE: case SO_OOBINLINE: - case TCP_NODELAY: + case TCP_NODELAY: case IP_TOS: case SO_RCVBUF: case SO_SNDBUF: @@ -188,7 +188,7 @@ public class PlainSocketImpl extends SocketImpl throw se; } } - + // This filters options which are invalid for TCP. switch (optionId) { @@ -197,7 +197,7 @@ public class PlainSocketImpl extends SocketImpl case SO_BROADCAST: case SO_KEEPALIVE: case SO_OOBINLINE: - case TCP_NODELAY: + case TCP_NODELAY: case IP_TOS: case SO_RCVBUF: case SO_SNDBUF: @@ -207,7 +207,7 @@ public class PlainSocketImpl extends SocketImpl default: throw new SocketException("Unrecognized TCP option: " + optionId); } - + } public void shutdownInput() throws IOException @@ -281,10 +281,10 @@ public class PlainSocketImpl extends SocketImpl boolean connected = channel.connect(address, timeout); if (!connected) throw new SocketTimeoutException("connect timed out"); - + // Using the given SocketAddress is important to preserve // hostnames given by the caller. - InetSocketAddress addr = (InetSocketAddress) address; + InetSocketAddress addr = (InetSocketAddress) address; this.address = addr.getAddress(); this.port = addr.getPort(); } @@ -314,7 +314,7 @@ public class PlainSocketImpl extends SocketImpl * number, additional connections will be refused. * * @param queuelen The length of the pending connection queue - * + * * @throws IOException If an error occurs */ protected synchronized void listen(int queuelen) @@ -324,7 +324,7 @@ public class PlainSocketImpl extends SocketImpl } /** - * Accepts a new connection on this socket and returns in in the + * Accepts a new connection on this socket and returns in in the * passed in SocketImpl. * * @param impl The SocketImpl object to accept this connection. @@ -349,7 +349,7 @@ public class PlainSocketImpl extends SocketImpl /** * Returns the number of bytes that the caller can read from this socket - * without blocking. + * without blocking. * * @return the number of readable bytes before blocking * @@ -377,7 +377,7 @@ public class PlainSocketImpl extends SocketImpl { if (impl.getState().isValid()) impl.close(); - + address = null; port = -1; } @@ -418,7 +418,7 @@ public class PlainSocketImpl extends SocketImpl return out; } - + public VMChannel getVMChannel() { if (channel == null) @@ -433,7 +433,7 @@ public class PlainSocketImpl extends SocketImpl { if (channel == null) return null; - + try { InetSocketAddress remote = channel.getVMChannel().getPeerAddress(); @@ -444,7 +444,7 @@ public class PlainSocketImpl extends SocketImpl // was created by the native layer (this preserves exact hostnames). if (address != null) return address; - + return remote.getAddress(); } catch (IOException ioe) @@ -472,7 +472,7 @@ public class PlainSocketImpl extends SocketImpl return -1; } } - + public InetSocketAddress getLocalAddress() { if (channel == null) @@ -494,7 +494,7 @@ public class PlainSocketImpl extends SocketImpl { if (channel == null) return -1; - + try { InetSocketAddress remote = channel.getVMChannel().getPeerAddress(); @@ -509,7 +509,7 @@ public class PlainSocketImpl extends SocketImpl } /** - * This class contains an implementation of InputStream for + * This class contains an implementation of InputStream for * sockets. It in an internal only class used by PlainSocketImpl. * * @author Nic Ferrier @@ -536,7 +536,7 @@ public class PlainSocketImpl extends SocketImpl } /** - * Reads the next byte of data and returns it as an int. + * Reads the next byte of data and returns it as an int. * * @return The byte read (as an int) or -1 if end of stream); * @@ -599,8 +599,8 @@ public class PlainSocketImpl extends SocketImpl } /** - * This class is used internally by PlainSocketImpl to be the - * OutputStream subclass returned by its + * This class is used internally by PlainSocketImpl to be the + * OutputStream subclass returned by its * getOutputStream method. It expects only to be used in that * context. * @@ -623,7 +623,7 @@ public class PlainSocketImpl extends SocketImpl /** * Writes a byte (passed in as an int) to the given output stream - * + * * @param b The byte to write * * @exception IOException If an error occurs diff --git a/libjava/classpath/gnu/java/net/loader/FileResource.java b/libjava/classpath/gnu/java/net/loader/FileResource.java index 8071bbf91f8..471584023f5 100644 --- a/libjava/classpath/gnu/java/net/loader/FileResource.java +++ b/libjava/classpath/gnu/java/net/loader/FileResource.java @@ -79,4 +79,4 @@ public final class FileResource extends Resource throw ie; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/FileURLLoader.java b/libjava/classpath/gnu/java/net/loader/FileURLLoader.java index 39d33a4e4be..58b6dcf05d6 100644 --- a/libjava/classpath/gnu/java/net/loader/FileURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/FileURLLoader.java @@ -66,7 +66,7 @@ public final class FileURLLoader extends URLLoader /** get resource with the name "name" in the file url */ public Resource getResource(String name) { - try + try { // Make sure that all components in name are valid by walking through // them @@ -91,7 +91,7 @@ public final class FileURLLoader extends URLLoader * directory or a non directory component (plain file, symbolic link, ...). * An empty or null path is valid. Pathnames components are separated by * File.separatorChar - * + * * @param resourceFileName the name to be checked for validity. * @return the canonical file pointed by the resourceFileName or null if the * walking failed @@ -108,30 +108,30 @@ public final class FileURLLoader extends URLLoader for (int i = 0; i < tokenCount - 1; i++) { String currentToken = stringTokenizer.nextToken(); - + // If we are at the root directory and trying to go up, the walking is // finished with an error if ("..".equals(currentToken) && currentFile.equals(dir)) return null; - + currentFile = new File(currentFile, currentToken); // If the current file doesn't exist or is not a directory, the walking is // finished with an error if (! (currentFile.exists() && currentFile.isDirectory())) return null; - + } - + // Treat the last token differently, if it exists, because it does not need // to be a directory if (tokenCount > 0) { String currentToken = stringTokenizer.nextToken(); - + if ("..".equals(currentToken) && currentFile.equals(dir)) return null; - + currentFile = new File(currentFile, currentToken); // If the current file doesn't exist, the walking is @@ -139,7 +139,7 @@ public final class FileURLLoader extends URLLoader if (! currentFile.exists()) return null; } - + return currentFile.getCanonicalFile(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/JarURLLoader.java b/libjava/classpath/gnu/java/net/loader/JarURLLoader.java index 40194be799a..6f06ad3b2da 100644 --- a/libjava/classpath/gnu/java/net/loader/JarURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/JarURLLoader.java @@ -83,7 +83,7 @@ public final class JarURLLoader extends URLLoader { jarfile = ((JarURLConnection) baseJarURL.openConnection()).getJarFile(); - + Manifest manifest; Attributes attributes; String classPathString; @@ -124,12 +124,12 @@ public final class JarURLLoader extends URLLoader else if ((manifest = jarfile.getManifest()) != null && (attributes = manifest.getMainAttributes()) != null && ((classPathString - = attributes.getValue(Attributes.Name.CLASS_PATH)) + = attributes.getValue(Attributes.Name.CLASS_PATH)) != null)) { this.classPath = new ArrayList(); StringTokenizer st = new StringTokenizer(classPathString, " "); - while (st.hasMoreElements ()) + while (st.hasMoreElements ()) { String e = st.nextToken (); try diff --git a/libjava/classpath/gnu/java/net/loader/JarURLResource.java b/libjava/classpath/gnu/java/net/loader/JarURLResource.java index a9db5ce0b1e..1dec92fd309 100644 --- a/libjava/classpath/gnu/java/net/loader/JarURLResource.java +++ b/libjava/classpath/gnu/java/net/loader/JarURLResource.java @@ -91,4 +91,4 @@ public final class JarURLResource extends Resource throw ie; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/RemoteResource.java b/libjava/classpath/gnu/java/net/loader/RemoteResource.java index f18031581ea..dc33b663610 100644 --- a/libjava/classpath/gnu/java/net/loader/RemoteResource.java +++ b/libjava/classpath/gnu/java/net/loader/RemoteResource.java @@ -75,4 +75,4 @@ public final class RemoteResource extends Resource { return url; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java b/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java index f044740faa5..81ef34f9ef5 100644 --- a/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java @@ -98,4 +98,4 @@ public final class RemoteURLLoader extends URLLoader return null; } } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/Resource.java b/libjava/classpath/gnu/java/net/loader/Resource.java index e367a338802..53720b0395b 100644 --- a/libjava/classpath/gnu/java/net/loader/Resource.java +++ b/libjava/classpath/gnu/java/net/loader/Resource.java @@ -107,4 +107,4 @@ public abstract class Resource * this resource can be loaded. */ public abstract InputStream getInputStream() throws IOException; -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/URLLoader.java b/libjava/classpath/gnu/java/net/loader/URLLoader.java index 5b9b6748b5b..337564f6ae9 100644 --- a/libjava/classpath/gnu/java/net/loader/URLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/URLLoader.java @@ -145,4 +145,4 @@ public abstract class URLLoader { return null; } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/protocol/file/Connection.java b/libjava/classpath/gnu/java/net/protocol/file/Connection.java index 04278d46ac0..80155af0df4 100644 --- a/libjava/classpath/gnu/java/net/protocol/file/Connection.java +++ b/libjava/classpath/gnu/java/net/protocol/file/Connection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -89,7 +89,7 @@ public class Connection extends URLConnection SystemProperties.getProperty("line.separator"); } - + /** * This is a File object for this connection */ @@ -109,7 +109,7 @@ public class Connection extends URLConnection * OutputStream if we are writing to the file */ private OutputStream outputStream; - + /** * FilePermission to read the file */ @@ -124,7 +124,7 @@ public class Connection extends URLConnection permission = new FilePermission(getURL().getFile(), DEFAULT_PERMISSION); } - + /** * Unquote "%" + hex quotes characters * @@ -146,38 +146,38 @@ public class Connection extends URLConnection int pos = 0; for (int i = 0; i < str.length(); i++) { - char c = str.charAt(i); - if (c == '%') - { - if (i + 2 >= str.length()) - throw new MalformedURLException(str + " : Invalid quoted character"); - int hi = Character.digit(str.charAt(++i), 16); - int lo = Character.digit(str.charAt(++i), 16); - if (lo < 0 || hi < 0) - throw new MalformedURLException(str + " : Invalid quoted character"); - buf[pos++] = (byte) (hi * 16 + lo); - } - else if (c > 127) { - try { - byte [] c_as_bytes = Character.toString(c).getBytes("utf-8"); - final int c_length = c_as_bytes.length; - System.arraycopy(c_as_bytes, 0, buf, pos, c_length); - pos += c_length; - } - catch (java.io.UnsupportedEncodingException x2) { - throw (Error) new InternalError().initCause(x2); - } - } - else - buf[pos++] = (byte) c; + char c = str.charAt(i); + if (c == '%') + { + if (i + 2 >= str.length()) + throw new MalformedURLException(str + " : Invalid quoted character"); + int hi = Character.digit(str.charAt(++i), 16); + int lo = Character.digit(str.charAt(++i), 16); + if (lo < 0 || hi < 0) + throw new MalformedURLException(str + " : Invalid quoted character"); + buf[pos++] = (byte) (hi * 16 + lo); + } + else if (c > 127) { + try { + byte [] c_as_bytes = Character.toString(c).getBytes("utf-8"); + final int c_length = c_as_bytes.length; + System.arraycopy(c_as_bytes, 0, buf, pos, c_length); + pos += c_length; + } + catch (java.io.UnsupportedEncodingException x2) { + throw (Error) new InternalError().initCause(x2); + } + } + else + buf[pos++] = (byte) c; } try { - return new String(buf, 0, pos, "utf-8"); + return new String(buf, 0, pos, "utf-8"); } catch (java.io.UnsupportedEncodingException x2) { - throw (Error) new InternalError().initCause(x2); + throw (Error) new InternalError().initCause(x2); } } @@ -189,30 +189,30 @@ public class Connection extends URLConnection // Call is ignored if already connected. if (connected) return; - + // If not connected, then file needs to be openned. file = new File (unquote(getURL().getFile())); if (! file.isDirectory()) { - if (doInput) - inputStream = new BufferedInputStream(new FileInputStream(file)); - - if (doOutput) - outputStream = new BufferedOutputStream(new FileOutputStream(file)); + if (doInput) + inputStream = new BufferedInputStream(new FileInputStream(file)); + + if (doOutput) + outputStream = new BufferedOutputStream(new FileOutputStream(file)); } else { - if (doInput) - { + if (doInput) + { inputStream = new ByteArrayInputStream(getDirectoryListing()); - } + } - if (doOutput) - throw new ProtocolException - ("file: protocol does not support output on directories"); + if (doOutput) + throw new ProtocolException + ("file: protocol does not support output on directories"); } - + connected = true; } @@ -228,9 +228,9 @@ public class Connection extends URLConnection ByteArrayOutputStream sink = new ByteArrayOutputStream(); // NB uses default character encoding for this system Writer writer = new OutputStreamWriter(sink); - + String[] files = file.list(); - + for (int i = 0; i < files.length; i++) { writer.write(files[i]); @@ -239,9 +239,9 @@ public class Connection extends URLConnection directoryListing = sink.toByteArray(); } - return directoryListing; + return directoryListing; } - + /** * Opens the file for reading and returns a stream for it. * @@ -254,10 +254,10 @@ public class Connection extends URLConnection { if (!doInput) throw new ProtocolException("Can't open InputStream if doInput is false"); - + if (!connected) connect(); - + return inputStream; } @@ -273,11 +273,11 @@ public class Connection extends URLConnection { if (!doOutput) throw new - ProtocolException("Can't open OutputStream if doOutput is false"); + ProtocolException("Can't open OutputStream if doOutput is false"); if (!connected) connect(); - + return outputStream; } @@ -290,30 +290,30 @@ public class Connection extends URLConnection { try { - if (!connected) - connect(); + if (!connected) + connect(); - return file.lastModified(); + return file.lastModified(); } catch (IOException e) { - return -1; + return -1; } } - + /** - * Get an http-style header field. Just handle a few common ones. + * Get an http-style header field. Just handle a few common ones. */ public String getHeaderField(String field) { try { - if (!connected) - connect(); + if (!connected) + connect(); - if (field.equals("content-type")) + if (field.equals("content-type")) return guessContentTypeFromName(file.getName()); - else if (field.equals("content-length")) + else if (field.equals("content-length")) { if (file.isDirectory()) { @@ -321,14 +321,14 @@ public class Connection extends URLConnection } return Long.toString(file.length()); } - else if (field.equals("last-modified")) - { - synchronized (StaticData.dateFormat) - { - return StaticData.dateFormat.format( + else if (field.equals("last-modified")) + { + synchronized (StaticData.dateFormat) + { + return StaticData.dateFormat.format( new Date(file.lastModified())); - } - } + } + } } catch (IOException e) { @@ -346,21 +346,21 @@ public class Connection extends URLConnection { try { - if (!connected) - connect(); - + if (!connected) + connect(); + if (file.isDirectory()) { return getDirectoryListing().length; } - return (int) file.length(); + return (int) file.length(); } catch (IOException e) { - return -1; + return -1; } } - + /** * This method returns a Permission object representing the * permissions required to access this URL. This method returns a diff --git a/libjava/classpath/gnu/java/net/protocol/file/Handler.java b/libjava/classpath/gnu/java/net/protocol/file/Handler.java index fc560491d19..58ebe4c4641 100644 --- a/libjava/classpath/gnu/java/net/protocol/file/Handler.java +++ b/libjava/classpath/gnu/java/net/protocol/file/Handler.java @@ -76,14 +76,14 @@ public class Handler extends URLStreamHandler String host = url.getHost(); if ((host != null) && (! host.equals(""))) { - // Reset the protocol (and implicitly the handler) for this URL. - // Then have the URL attempt the connection again, as it will - // get the changed handler the next time around. - // If the ftp protocol handler is not installed, an - // exception will be thrown from the new openConnection() call. - setURL (url, "ftp", url.getHost(), url.getPort(), url.getFile(), - url.getRef()); - return url.openConnection(); + // Reset the protocol (and implicitly the handler) for this URL. + // Then have the URL attempt the connection again, as it will + // get the changed handler the next time around. + // If the ftp protocol handler is not installed, an + // exception will be thrown from the new openConnection() call. + setURL (url, "ftp", url.getHost(), url.getPort(), url.getFile(), + url.getRef()); + return url.openConnection(); } return new Connection(url); diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java b/libjava/classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java index aa3c412b6a1..1ed31b83055 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/ActiveModeDTP.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -128,7 +128,7 @@ final class ActiveModeDTP } acceptThread = null; } - + /** * Returns an input stream from which a remote file can be read. */ @@ -213,7 +213,7 @@ final class ActiveModeDTP transferComplete(); return inProgress; } - + public void transferComplete() { if (socket == null) @@ -247,6 +247,5 @@ final class ActiveModeDTP } } } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/BlockInputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/BlockInputStream.java index 63897f1d6db..09915e7ffe2 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/BlockInputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/BlockInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -147,4 +147,3 @@ class BlockInputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/BlockOutputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/BlockOutputStream.java index 85481c95bd5..d181f9dec38 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/BlockOutputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/BlockOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -108,4 +108,3 @@ class BlockOutputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/CompressedInputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/CompressedInputStream.java index f2e65b7d37e..638d780e694 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/CompressedInputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/CompressedInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -133,13 +133,13 @@ class CompressedInputStream n--; return c; } - + public int read(byte[] buf) throws IOException { return read(buf, 0, buf.length); } - + public int read(byte[] buf, int off, int len) throws IOException { @@ -186,7 +186,7 @@ class CompressedInputStream return l; */ } - + /** * Reads the block header. */ @@ -212,4 +212,3 @@ class CompressedInputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/CompressedOutputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/CompressedOutputStream.java index b960fb3afe8..ec3aef93087 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/CompressedOutputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/CompressedOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -57,7 +57,7 @@ class CompressedOutputStream { super(dtp, out); } - + /** * Just one byte cannot be compressed. * It takes 5 bytes to transmit - hardly very compressed! @@ -190,7 +190,7 @@ class CompressedOutputStream System.arraycopy(buf, 0, ret, 3, pos); return ret; } - + int flush_compressed(byte[] buf, int pos, int count, byte c) { buf[pos++] = (byte) (0x80 | count); @@ -225,4 +225,3 @@ class CompressedOutputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/DTP.java b/libjava/classpath/gnu/java/net/protocol/ftp/DTP.java index 25580af403a..9ba4b7c6c66 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/DTP.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/DTP.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -89,4 +89,3 @@ interface DTP void transferComplete(); } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/DTPInputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/DTPInputStream.java index 363a5590fbb..7280b013340 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/DTPInputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/DTPInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -74,7 +74,7 @@ abstract class DTPInputStream { transferComplete = flag; } - + /** * Notifies the controlling DTP that this stream has completed transfer. */ @@ -85,4 +85,3 @@ abstract class DTPInputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/DTPOutputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/DTPOutputStream.java index 83f0be1e30d..105c6f0957e 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/DTPOutputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/DTPOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java index 98e8a868d60..4e253fcb987 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPConnection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -125,7 +125,7 @@ public class FTPConnection protected static final String STAT = "STAT"; protected static final String HELP = "HELP"; protected static final String NOOP = "NOOP"; - + protected static final String AUTH = "AUTH"; protected static final String PBSZ = "PBSZ"; protected static final String PROT = "PROT"; @@ -211,7 +211,7 @@ public class FTPConnection { this(hostname, -1, 0, 0, false); } - + /** * Creates a new connection to the server. * @param hostname the hostname of the server to connect to @@ -242,7 +242,7 @@ public class FTPConnection { port = FTP_PORT; } - + // Set up socket socket = new Socket(); InetSocketAddress address = new InetSocketAddress(hostname, port); @@ -258,7 +258,7 @@ public class FTPConnection { socket.setSoTimeout(timeout); } - + InputStream in = socket.getInputStream(); in = new BufferedInputStream(in); in = new CRLFInputStream(in); @@ -266,7 +266,7 @@ public class FTPConnection OutputStream out = socket.getOutputStream(); out = new BufferedOutputStream(out); this.out = new CRLFOutputStream(out); - + // Read greeting FTPResponse response = getResponse(); switch (response.getCode()) @@ -277,7 +277,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Authenticate using the specified username and password. * If the username suffices for the server, the password will not be used @@ -331,7 +331,7 @@ public class FTPConnection { return starttls(confidential, new EmptyX509TrustManager()); } - + /** * Negotiates TLS over the current connection. * See IETF draft-murray-auth-ftp-ssl-15.txt for details. @@ -351,7 +351,7 @@ public class FTPConnection TrustManager[] trust = new TrustManager[] { tm }; context.init(null, trust, null); SSLSocketFactory factory = context.getSocketFactory(); - + send(AUTH + ' ' + TLS); FTPResponse response = getResponse(); switch (response.getCode()) @@ -367,7 +367,7 @@ public class FTPConnection default: throw new FTPException(response); } - + String hostname = socket.getInetAddress().getHostName(); int port = socket.getPort(); SSLSocket ss = @@ -403,7 +403,7 @@ public class FTPConnection default: throw new FTPException(response); } - + if (confidential) { // Set up streams @@ -422,7 +422,7 @@ public class FTPConnection return false; } } - + /** * Changes directory to the specified path. * @param path an absolute or relative pathname @@ -447,7 +447,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Changes directory to the parent of the current working directory. * @return true on success, false otherwise @@ -521,7 +521,7 @@ public class FTPConnection { } } - + /** * Initialise the data transfer process. */ @@ -533,7 +533,7 @@ public class FTPConnection dtp.complete(); dtp = null; } - + InetAddress localhost = socket.getLocalAddress(); if (passive) { @@ -568,7 +568,7 @@ public class FTPConnection { c = message.charAt((++end) + 1); } - + String address = message.substring(start, mid1).replace(',', '.'); int port_hi = @@ -576,7 +576,7 @@ public class FTPConnection int port_lo = Integer.parseInt(message.substring(mid2 + 1, end + 1)); int port = (port_hi << 8) | port_lo; - + /*System.out.println("Entering passive mode: " + address + ":" + port);*/ dtp = new PassiveModeDTP(address, port, localhost, @@ -621,7 +621,7 @@ public class FTPConnection } } } - + // Send PORT command CPStringBuilder buf = new CPStringBuilder(PORT); buf.append(' '); @@ -657,7 +657,7 @@ public class FTPConnection } dtp.setTransferMode(transferMode); } - + /** * Set passive mode. * @param flag true if we should use passive mode, false otherwise @@ -671,7 +671,7 @@ public class FTPConnection initialiseDTP(); } } - + /** * Returns the current representation type of the transfer data. * @return TYPE_ASCII, TYPE_EBCDIC, or TYPE_BINARY @@ -809,7 +809,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Retrieves the specified file. * @param filename the filename of the file to retrieve @@ -849,7 +849,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Returns a stream for uploading a file. * If a file with the same filename already exists on the server, it will @@ -903,7 +903,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * This command may be required by some servers to reserve sufficient * storage to accommodate the new file to be transferred. @@ -926,7 +926,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Renames a file. * @param oldName the current name of the file @@ -963,7 +963,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Aborts the transfer in progress. * @return true if a transfer was in progress, false otherwise @@ -993,7 +993,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Causes the file specified to be deleted at the server site. * @param filename the file to delete @@ -1015,7 +1015,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Causes the directory specified to be deleted. * This may be an absolute or relative pathname. @@ -1059,7 +1059,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Returns the current working directory. */ @@ -1097,7 +1097,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Returns a listing of information about the specified pathname. * If the pathname specifies a directory or other group of files, the @@ -1133,7 +1133,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Returns a directory listing. The pathname should specify a * directory or other system-specific file group descriptor; a null @@ -1179,7 +1179,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Returns the type of operating system at the server. */ @@ -1205,7 +1205,7 @@ public class FTPConnection throw new FTPException(response); } } - + /** * Does nothing. * This method can be used to ensure that the connection does not time @@ -1316,7 +1316,7 @@ public class FTPConnection throw new ProtocolException(line); } } - + /* * Parses the 3-digit numeric code at the beginning of the given line. * Returns -1 on failure. @@ -1350,4 +1350,3 @@ public class FTPConnection } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPException.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPException.java index 14ad3813f85..1a7fcb85dcc 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPException.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPException.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -63,7 +63,7 @@ public class FTPException super(response.getMessage()); this.response = response; } - + /** * Returns the response that provoked this exception. */ @@ -73,4 +73,3 @@ public class FTPException } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPResponse.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPResponse.java index ec72c732c1c..2620f0d7092 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPResponse.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPResponse.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -109,4 +109,3 @@ public final class FTPResponse } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java b/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java index cfad5a7c1a6..8cc1fafd174 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/FTPURLConnection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -137,7 +137,7 @@ public class FTPURLConnection connection.setTransferMode(transferMode); } } - + /** * This connection supports doInput. */ @@ -153,7 +153,7 @@ public class FTPURLConnection { doOutput = dooutput; } - + /** * Returns an input stream that reads from this open connection. */ @@ -174,7 +174,7 @@ public class FTPURLConnection return this.new ClosingInputStream(connection.retrieve(path)); } } - + /** * Returns an output stream that writes to this connection. */ @@ -252,7 +252,7 @@ public class FTPURLConnection l.add(value); map.put(key, l); } - + public void setRequestProperty(String key, String value) { if (connected) @@ -351,7 +351,7 @@ public class FTPURLConnection super.close(); connection.logout(); } - + } class ClosingOutputStream @@ -369,8 +369,7 @@ public class FTPURLConnection super.close(); connection.logout(); } - + } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/Handler.java b/libjava/classpath/gnu/java/net/protocol/ftp/Handler.java index 88491b3c15a..7638b6664f0 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/Handler.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/Handler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -67,4 +67,3 @@ public class Handler } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/PassiveModeDTP.java b/libjava/classpath/gnu/java/net/protocol/ftp/PassiveModeDTP.java index 6f4fd634168..a74346c74cd 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/PassiveModeDTP.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/PassiveModeDTP.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -118,7 +118,7 @@ final class PassiveModeDTP in.setTransferComplete(false); return in; } - + /** * Returns an output stream to which a local file can be written for * upload. @@ -147,12 +147,12 @@ final class PassiveModeDTP out.setTransferComplete(false); return out; } - + public void setTransferMode(int mode) { transferMode = mode; } - + public void complete() { completed = true; @@ -198,4 +198,3 @@ final class PassiveModeDTP } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/StreamInputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/StreamInputStream.java index 93eee4e1924..beee14bcbf9 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/StreamInputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/StreamInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,7 +54,7 @@ class StreamInputStream { super(dtp, in); } - + public int read() throws IOException { @@ -92,4 +92,3 @@ class StreamInputStream } } - diff --git a/libjava/classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java b/libjava/classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java index a6e28ece3d4..2df1a87d8dd 100644 --- a/libjava/classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/ftp/StreamOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,7 +54,7 @@ class StreamOutputStream { super(dtp, out); } - + public void write(int c) throws IOException { @@ -70,7 +70,7 @@ class StreamOutputStream { write(b, 0, b.length); } - + public void write(byte[] b, int off, int len) throws IOException { @@ -80,6 +80,5 @@ class StreamOutputStream } out.write(b, off, len); } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/Authenticator.java b/libjava/classpath/gnu/java/net/protocol/http/Authenticator.java index 0d7c9881956..b4ee41e11c8 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Authenticator.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Authenticator.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,6 +54,5 @@ public interface Authenticator * unsuccessful attempt */ Credentials getCredentials(String realm, int attempt); - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java b/libjava/classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java index 35ad2bccf45..22a33ccd3bc 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java +++ b/libjava/classpath/gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -102,6 +102,5 @@ public class ByteArrayRequestBodyWriter } return len; } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/ChunkedInputStream.java b/libjava/classpath/gnu/java/net/protocol/http/ChunkedInputStream.java index 8a30e51db57..33df0df95f7 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/ChunkedInputStream.java +++ b/libjava/classpath/gnu/java/net/protocol/http/ChunkedInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -158,15 +158,15 @@ public class ChunkedInputStream } else { - int canRead = Math.min(size - count, length); - int len = in.read(buffer, offset, canRead); - if (len == -1) - { - // This is an error condition but it isn't clear what we - // should do with it. - eof = true; - return -1; - } + int canRead = Math.min(size - count, length); + int len = in.read(buffer, offset, canRead); + if (len == -1) + { + // This is an error condition but it isn't clear what we + // should do with it. + eof = true; + return -1; + } count += len; if (count == size) { @@ -205,20 +205,19 @@ public class ChunkedInputStream { if (meta) return 0; - + return Math.min(in.available(), size - count); } /** * This method closes the ChunkedInputStream by closing the underlying * InputStream. - * + * * @exception IOException If an error occurs */ public void close() throws IOException { in.close(); } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/Cookie.java b/libjava/classpath/gnu/java/net/protocol/http/Cookie.java index 4482a121e59..122a23f7901 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Cookie.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Cookie.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -138,7 +138,7 @@ public class Cookie { return toString(true, true); } - + public String toString(boolean showPath, boolean showDomain) { CPStringBuilder buf = new CPStringBuilder(); @@ -159,4 +159,3 @@ public class Cookie } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/CookieManager.java b/libjava/classpath/gnu/java/net/protocol/http/CookieManager.java index cc1225c497d..da3686689f9 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/CookieManager.java +++ b/libjava/classpath/gnu/java/net/protocol/http/CookieManager.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -61,5 +61,5 @@ public interface CookieManager * @param path the path to access */ Cookie[] getCookies(String host, boolean secure, String path); - + } diff --git a/libjava/classpath/gnu/java/net/protocol/http/Credentials.java b/libjava/classpath/gnu/java/net/protocol/http/Credentials.java index 9e5fcd172f5..f95b4b53cec 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Credentials.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Credentials.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -83,6 +83,5 @@ public class Credentials { return password; } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/HTTPConnection.java b/libjava/classpath/gnu/java/net/protocol/http/HTTPConnection.java index 44b1a608ac7..b96bf4c547c 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/HTTPConnection.java +++ b/libjava/classpath/gnu/java/net/protocol/http/HTTPConnection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -201,7 +201,7 @@ public class HTTPConnection this(hostname, secure ? HTTPS_PORT : HTTP_PORT, secure, connectionTimeout, timeout); } - + /** * Creates a new HTTP connection on the specified port. * @param hostname the name of the host to connect to @@ -222,7 +222,7 @@ public class HTTPConnection { this(hostname, port, secure, 0, 0); } - + /** * Creates a new HTTP or HTTPS connection on the specified port. * @param hostname the name of the host to connect to @@ -239,7 +239,7 @@ public class HTTPConnection { if (connectionTimeout < 0 || timeout < 0) throw new IllegalArgumentException(); - + this.hostname = hostname; this.port = port; this.secure = secure; @@ -477,8 +477,8 @@ public class HTTPConnection */ synchronized HTTPConnection get(String host, int port, - boolean secure, - int connectionTimeout, int timeout) + boolean secure, + int connectionTimeout, int timeout) { String ttl = SystemProperties.getProperty("classpath.net.http.keepAliveTTL"); @@ -510,7 +510,7 @@ public class HTTPConnection } HTTPConnection c = null; - + ListIterator it = connectionPool.listIterator(0); while (it.hasNext()) { @@ -584,7 +584,7 @@ public class HTTPConnection } } } - + /** * The number of times this HTTPConnection has be used via keep-alive. */ @@ -618,7 +618,7 @@ public class HTTPConnection { useCount++; pool.put(this); - + } else { @@ -878,7 +878,7 @@ public class HTTPConnection } // -- Events -- - + void addHandshakeCompletedListener(HandshakeCompletedListener l) { synchronized (handshakeCompletedListeners) @@ -895,4 +895,3 @@ public class HTTPConnection } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/HTTPDateFormat.java b/libjava/classpath/gnu/java/net/protocol/http/HTTPDateFormat.java index 2f59e43181c..743f8e8e263 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/HTTPDateFormat.java +++ b/libjava/classpath/gnu/java/net/protocol/http/HTTPDateFormat.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -145,7 +145,7 @@ public class HTTPDateFormat // Get time offset in minutes int zoneOffset =(calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET)) / 60000; - + // Apply + or - appropriately if (zoneOffset < 0) { @@ -156,7 +156,7 @@ public class HTTPDateFormat { buf.append('+'); } - + // Set the 2 2-char fields as specified above int tzhours = zoneOffset / 60; buf.append(Character.forDigit(tzhours / 10, 10)); @@ -340,14 +340,14 @@ public class HTTPDateFormat } second = Integer.parseInt(text.substring(start, end)); } - + calendar.set(Calendar.YEAR, year); calendar.set(Calendar.MONTH, month); calendar.set(Calendar.DAY_OF_MONTH, date); calendar.set(Calendar.HOUR, hour); calendar.set(Calendar.MINUTE, minute); calendar.set(Calendar.SECOND, second); - + if (end != len) { // Timezone @@ -380,7 +380,7 @@ public class HTTPDateFormat } } pos.setIndex(end); - + return calendar.getTime(); } catch (NumberFormatException e) @@ -400,7 +400,7 @@ public class HTTPDateFormat { pos++; } - return pos; + return pos; } private int skipNonWhitespace(String text, int pos) @@ -409,7 +409,7 @@ public class HTTPDateFormat { pos++; } - return pos; + return pos; } private int skipTo(String text, int pos, char c) @@ -418,7 +418,7 @@ public class HTTPDateFormat { pos++; } - return pos; + return pos; } /** @@ -438,4 +438,3 @@ public class HTTPDateFormat } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/HTTPURLConnection.java b/libjava/classpath/gnu/java/net/protocol/http/HTTPURLConnection.java index b31f426695f..9ba5c4793e4 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/HTTPURLConnection.java +++ b/libjava/classpath/gnu/java/net/protocol/http/HTTPURLConnection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -151,7 +151,7 @@ public class HTTPURLConnection } final Credentials creds = (username == null) ? null : new Credentials (username, password); - + if ("POST".equals(method)) { String contentType = requestHeaders.getValue("Content-Type"); @@ -241,113 +241,113 @@ public class HTTPURLConnection throw ioe; } } - + if (response.isRedirect() && getInstanceFollowRedirects()) { - // Read the response body, if there is one. If the - // redirect points us back at the same server, we will use - // the cached connection, so we must make sure there is no - // pending data in it. + // Read the response body, if there is one. If the + // redirect points us back at the same server, we will use + // the cached connection, so we must make sure there is no + // pending data in it. InputStream body = response.getBody(); - if (body != null) - { - byte[] ignore = new byte[1024]; - while (true) - { - int n = body.read(ignore, 0, ignore.length); - if (n == -1) - break; - } - } + if (body != null) + { + byte[] ignore = new byte[1024]; + while (true) + { + int n = body.read(ignore, 0, ignore.length); + if (n == -1) + break; + } + } // Follow redirect String location = response.getHeader("Location"); - if (location != null) - { - String connectionUri = connection.getURI(); - int start = connectionUri.length(); - if (location.startsWith(connectionUri) && - location.charAt(start) == '/') - { - file = location.substring(start); - retry = true; - } - else if (location.startsWith("http:")) - { - connection.close(); - connection = null; - secure = false; - start = 7; - int end = location.indexOf('/', start); + if (location != null) + { + String connectionUri = connection.getURI(); + int start = connectionUri.length(); + if (location.startsWith(connectionUri) && + location.charAt(start) == '/') + { + file = location.substring(start); + retry = true; + } + else if (location.startsWith("http:")) + { + connection.close(); + connection = null; + secure = false; + start = 7; + int end = location.indexOf('/', start); if (end == -1) end = location.length(); - host = location.substring(start, end); - int ci = host.lastIndexOf(':'); - if (ci != -1) - { - port = Integer.parseInt(host.substring (ci + 1)); - host = host.substring(0, ci); - } - else - { - port = HTTPConnection.HTTP_PORT; - } - file = location.substring(end); - retry = true; - } - else if (location.startsWith("https:")) - { - connection.close(); - connection = null; - secure = true; - start = 8; - int end = location.indexOf('/', start); + host = location.substring(start, end); + int ci = host.lastIndexOf(':'); + if (ci != -1) + { + port = Integer.parseInt(host.substring (ci + 1)); + host = host.substring(0, ci); + } + else + { + port = HTTPConnection.HTTP_PORT; + } + file = location.substring(end); + retry = true; + } + else if (location.startsWith("https:")) + { + connection.close(); + connection = null; + secure = true; + start = 8; + int end = location.indexOf('/', start); if (end == -1) end = location.length(); - host = location.substring(start, end); - int ci = host.lastIndexOf(':'); - if (ci != -1) - { - port = Integer.parseInt(host.substring (ci + 1)); - host = host.substring(0, ci); - } - else - { - port = HTTPConnection.HTTPS_PORT; - } - file = location.substring(end); - retry = true; - } - else if (location.length() > 0) - { - // Malformed absolute URI, treat as file part of URI - if (location.charAt(0) == '/') - { - // Absolute path - file = location; - } - else - { - // Relative path - int lsi = file.lastIndexOf('/'); - file = (lsi == -1) ? "/" : file.substring(0, lsi + 1); - file += location; - } - retry = true; - } - } + host = location.substring(start, end); + int ci = host.lastIndexOf(':'); + if (ci != -1) + { + port = Integer.parseInt(host.substring (ci + 1)); + host = host.substring(0, ci); + } + else + { + port = HTTPConnection.HTTPS_PORT; + } + file = location.substring(end); + retry = true; + } + else if (location.length() > 0) + { + // Malformed absolute URI, treat as file part of URI + if (location.charAt(0) == '/') + { + // Absolute path + file = location; + } + else + { + // Relative path + int lsi = file.lastIndexOf('/'); + file = (lsi == -1) ? "/" : file.substring(0, lsi + 1); + file += location; + } + retry = true; + } + } } else { responseSink = response.getBody(); - + if (response.isError()) - errorSink = responseSink; + errorSink = responseSink; } } while (retry); connected = true; - } + } /** * Returns a connection, from the pool if necessary. @@ -425,7 +425,7 @@ public class HTTPURLConnection } public String getRequestProperty(String key) - { + { return requestHeaders.getValue(key); } @@ -433,7 +433,7 @@ public class HTTPURLConnection { if (connected) throw new IllegalStateException("Already connected"); - + Map> m = requestHeaders.getAsMap(); return Collections.unmodifiableMap(m); } @@ -441,7 +441,7 @@ public class HTTPURLConnection public void setRequestProperty(String key, String value) { super.setRequestProperty(key, value); - + requestHeaders.put(key, value); } @@ -477,9 +477,9 @@ public class HTTPURLConnection } return requestSink; } - + // -- Response -- - + public InputStream getInputStream() throws IOException { @@ -491,17 +491,17 @@ public class HTTPURLConnection { throw new ProtocolException("doInput is false"); } - + if (response.isError()) { int code = response.getCode(); if (code == 404 || code == 410) throw new FileNotFoundException(url.toString()); - + throw new IOException("Server returned HTTP response code " + code + " for URL " + url.toString()); } - + return responseSink; } @@ -535,7 +535,7 @@ public class HTTPURLConnection " " + response.getCode() + " " + response.getMessage(); } - + public String getHeaderField(int index) { if (!connected) @@ -641,7 +641,7 @@ public class HTTPURLConnection } return handshakeEvent.getCipherSuite(); } - + public Certificate[] getLocalCertificates() { if (!connected) @@ -681,14 +681,13 @@ public class HTTPURLConnection super.setReadTimeout(timeout); if (connection == null) return; - try + try { - connection.getSocket().setSoTimeout(timeout); - } + connection.getSocket().setSoTimeout(timeout); + } catch (IOException se) { - // Ignore socket exceptions. + // Ignore socket exceptions. } } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/Handler.java b/libjava/classpath/gnu/java/net/protocol/http/Handler.java index 64054251331..30810321d9f 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Handler.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Handler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -70,4 +70,3 @@ public class Handler } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/Headers.java b/libjava/classpath/gnu/java/net/protocol/http/Headers.java index 690a0c65bd0..faf5eb19595 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Headers.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Headers.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -71,7 +71,7 @@ class Headers implements Iterable */ private final ArrayList headers = new ArrayList(); - + /** * The HTTP dateformat used to parse date header fields. */ @@ -111,11 +111,11 @@ class Headers implements Iterable { return headers.iterator(); } - + /** * Returns the value of the specified header as a string. If * multiple values are present, the last one is returned. - * + * * @param header the header name (case insensitive search) * @return The header value or null if not found. */ @@ -135,7 +135,7 @@ class Headers implements Iterable /** * Returns the value of the specified header as an integer. If * multiple values are present, the last one is returned. - * + * * @param header the header name (case insensitive search) * @return The header value or -1 if not present or * not an integer value. @@ -161,7 +161,7 @@ class Headers implements Iterable /** * Returns the value of the specified header as a long. If * multiple values are present, the last one is returned. - * + * * @param header the header name (case insensitive search) * @return The header value or -1 if not present or * not a long value. @@ -187,7 +187,7 @@ class Headers implements Iterable /** * Returns the value of the specified header as a date. If * multiple values are present, the last one is returned. - * + * * @param header the header name (case insensitive search) * @return The header value or null if not present or * not a date value. @@ -212,7 +212,7 @@ class Headers implements Iterable /** * Add a header to this set of headers. If there is an existing * header with the same name it's value is replaced with the new value. - * If multiple headers of the same name exist only the last one's value + * If multiple headers of the same name exist only the last one's value * is replaced. * * @param name the header name @@ -221,7 +221,7 @@ class Headers implements Iterable * @see #addValue(String, String) */ public void put(String name, String value) - { + { for (int i = headers.size() - 1; i >= 0; i--) { HeaderElement e = headers.get(i); @@ -231,14 +231,14 @@ class Headers implements Iterable return; } } - + // nothing was replaced so add it as new HeaderElement addValue(name, value); } - + /** - * Add all headers from a set of headers to this set. Any existing header - * with the same (case insensitive) name as one of the new headers will + * Add all headers from a set of headers to this set. Any existing header + * with the same (case insensitive) name as one of the new headers will * be overridden. * * @param o the headers to be added @@ -280,7 +280,7 @@ class Headers implements Iterable { LineInputStream lin = (in instanceof LineInputStream) ? (LineInputStream) in : new LineInputStream(in); - + String name = null; CPStringBuilder value = new CPStringBuilder(); while (true) @@ -307,9 +307,9 @@ class Headers implements Iterable if (c1 == ' ' || c1 == '\t') { // Continuation - int last = len - 1; - if (line.charAt(last) != '\r') - ++last; + int last = len - 1; + if (line.charAt(last) != '\r') + ++last; value.append(line.substring(0, last)); } else @@ -318,7 +318,7 @@ class Headers implements Iterable { addValue(name, value.toString()); } - + int di = line.indexOf(':'); name = line.substring(0, di); value.setLength(0); @@ -327,14 +327,14 @@ class Headers implements Iterable di++; } while (di < len && line.charAt(di) == ' '); - int last = len - 1; - if (line.charAt(last) != '\r') - ++last; + int last = len - 1; + if (line.charAt(last) != '\r') + ++last; value.append(line.substring(di, last)); } } } - + /** * Add a header to this set of headers. If there is an existing @@ -352,12 +352,12 @@ class Headers implements Iterable /** * Get a new Map containing all the headers. The keys of the Map - * are Strings (the header names). The headers will be included + * are Strings (the header names). The headers will be included * case-sensitive in the map so that querying must be done with the * correct case of the needed header name. The values of the Map are * unmodifiable Lists containing Strings (the header values). * - *

      + *

      * The returned map is modifiable. Changing it will not effect this * collection of Headers in any way.

      * @@ -387,7 +387,7 @@ class Headers implements Iterable } return m; } - + /** * Get the name of the Nth header. * @@ -401,7 +401,7 @@ class Headers implements Iterable { if (i >= headers.size() || i < 0) return null; - + return headers.get(i).name; } @@ -418,7 +418,7 @@ class Headers implements Iterable { if (i >= headers.size() || i < 0) return null; - + return headers.get(i).value; } } diff --git a/libjava/classpath/gnu/java/net/protocol/http/Request.java b/libjava/classpath/gnu/java/net/protocol/http/Request.java index 88e2fd077f2..534213eed2c 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Request.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Request.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -280,14 +280,14 @@ public class Request setHeader("Content-Length", Integer.toString(contentLength)); } } - + try { // Loop while authentication fails or continue do { retry = false; - + // Get socket output and input streams OutputStream out = connection.getOutputStream(); @@ -314,7 +314,7 @@ public class Request byte[] buffer = new byte[4096]; int len; int count = 0; - + requestBodyWriter.reset(); do { @@ -372,13 +372,13 @@ public class Request } return response; } - + Response readResponse(InputStream in) throws IOException { String line; int len; - + // Read response status line LineInputStream lis = new LineInputStream(in); @@ -414,7 +414,7 @@ public class Request responseHeaders.parse(lis); notifyHeaderHandlers(responseHeaders); InputStream body = null; - + switch (code) { case 100: @@ -459,7 +459,7 @@ public class Request throws IOException { long contentLength = -1; - + // Persistent connections are the default in HTTP/1.1 boolean doClose = "close".equalsIgnoreCase(getHeader("Connection")) || "close".equalsIgnoreCase(responseHeaders.getValue("Connection")) || @@ -475,9 +475,9 @@ public class Request else if ("chunked".equalsIgnoreCase(transferCoding)) { in = new LimitedLengthInputStream(in, -1, false, connection, doClose); - + in = new ChunkedInputStream(in, responseHeaders); - } + } else { contentLength = responseHeaders.getLongValue("Content-Length"); @@ -505,9 +505,9 @@ public class Request throw new ProtocolException("Unsupported Content-Encoding: " + contentCoding); } - // Remove the Content-Encoding header because the content is - // no longer compressed. - responseHeaders.remove("Content-Encoding"); + // Remove the Content-Encoding header because the content is + // no longer compressed. + responseHeaders.remove("Content-Encoding"); } return in; } @@ -551,7 +551,7 @@ public class Request { MessageDigest md5 = MessageDigest.getInstance("MD5"); final byte[] COLON = { 0x3a }; - + // Calculate H(A1) md5.reset(); md5.update(username.getBytes("US-ASCII")); @@ -572,7 +572,7 @@ public class Request ha1 = md5.digest(); } String ha1Hex = toHexString(ha1); - + // Calculate H(A2) md5.reset(); md5.update(method.getBytes("US-ASCII")); @@ -586,7 +586,7 @@ public class Request } byte[] ha2 = md5.digest(); String ha2Hex = toHexString(ha2); - + // Calculate response md5.reset(); md5.update(ha1Hex.getBytes("US-ASCII")); @@ -606,8 +606,8 @@ public class Request md5.update(COLON); md5.update(ha2Hex.getBytes("US-ASCII")); String digestResponse = toHexString(md5.digest()); - - String authorization = scheme + + + String authorization = scheme + " username=\"" + username + "\"" + " realm=\"" + realm + "\"" + " nonce=\"" + nonce + "\"" + @@ -652,7 +652,7 @@ public class Request buf.setLength(0); } else if (c != ',' || (i <(len - 1) && text.charAt(i + 1) != ' ')) - { + { buf.append(c); } } @@ -855,4 +855,3 @@ public class Request } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/RequestBodyWriter.java b/libjava/classpath/gnu/java/net/protocol/http/RequestBodyWriter.java index 05d98ebb81a..aa5b78a5480 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/RequestBodyWriter.java +++ b/libjava/classpath/gnu/java/net/protocol/http/RequestBodyWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -64,6 +64,5 @@ public interface RequestBodyWriter * @return the number of bytes written */ int write(byte[] buffer); - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/Response.java b/libjava/classpath/gnu/java/net/protocol/http/Response.java index 76fac9344f5..084cf75fa43 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Response.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Response.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -61,7 +61,7 @@ public class Response /** * The HTTP status code of the response. - */ + */ protected final int code; /** @@ -114,7 +114,7 @@ public class Response /** * Returns the HTTP status code of the response. * @see #code - */ + */ public int getCode() { return code; @@ -188,22 +188,22 @@ public class Response { return headers.getDateValue(name); } - + /** * Tests whether this response indicates a redirection. - * + * * @return true if, false otherwise. */ public boolean isRedirect() { return (code != 304 && getCodeClass() == 3); } - + /** * Tests whether this response indicates an error. * Errors are the response codes 4xx - Client error and * 5xx - Server error. - * + * * @return true if, false otherwise. */ public boolean isError() @@ -221,4 +221,3 @@ public class Response return body; } } - diff --git a/libjava/classpath/gnu/java/net/protocol/http/ResponseHeaderHandler.java b/libjava/classpath/gnu/java/net/protocol/http/ResponseHeaderHandler.java index 4c5261da160..ca863440ecc 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/ResponseHeaderHandler.java +++ b/libjava/classpath/gnu/java/net/protocol/http/ResponseHeaderHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,6 +52,5 @@ public interface ResponseHeaderHandler * Sets the value for the header associated with this handler. */ void setValue(String value); - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/http/SimpleCookieManager.java b/libjava/classpath/gnu/java/net/protocol/http/SimpleCookieManager.java index fe05ba09e5e..f0820476905 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/SimpleCookieManager.java +++ b/libjava/classpath/gnu/java/net/protocol/http/SimpleCookieManager.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -133,6 +133,5 @@ public class SimpleCookieManager } } } - -} +} diff --git a/libjava/classpath/gnu/java/net/protocol/https/Handler.java b/libjava/classpath/gnu/java/net/protocol/https/Handler.java index 2b137517021..dbb619905fc 100644 --- a/libjava/classpath/gnu/java/net/protocol/https/Handler.java +++ b/libjava/classpath/gnu/java/net/protocol/https/Handler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -73,4 +73,3 @@ public class Handler } } - diff --git a/libjava/classpath/gnu/java/net/protocol/jar/Connection.java b/libjava/classpath/gnu/java/net/protocol/jar/Connection.java index 386aacef63e..85d27bfc9aa 100644 --- a/libjava/classpath/gnu/java/net/protocol/jar/Connection.java +++ b/libjava/classpath/gnu/java/net/protocol/jar/Connection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -73,13 +73,13 @@ public final class Connection extends JarURLConnection private JarFile jar_file; private JarEntry jar_entry; private URL jar_url; - + public static class JarFileCache { private static Hashtable cache = new Hashtable(); private static final int READBUFSIZE = 4*1024; - + public static synchronized JarFile get (URL url, boolean useCaches) throws IOException { @@ -92,31 +92,31 @@ public final class Connection extends JarURLConnection } if ("file".equals (url.getProtocol())) - { - String fn = url.getFile(); - fn = gnu.java.net.protocol.file.Connection.unquote(fn); - File f = new File (fn); - jf = new JarFile (f, true, ZipFile.OPEN_READ); - } + { + String fn = url.getFile(); + fn = gnu.java.net.protocol.file.Connection.unquote(fn); + File f = new File (fn); + jf = new JarFile (f, true, ZipFile.OPEN_READ); + } else - { - URLConnection urlconn = url.openConnection(); - InputStream is = urlconn.getInputStream(); - byte[] buf = new byte [READBUFSIZE]; - File f = File.createTempFile ("cache", "jar"); - FileOutputStream fos = new FileOutputStream (f); - int len = 0; - - while ((len = is.read (buf)) != -1) - { - fos.write (buf, 0, len); - } - - fos.close(); - // Always verify the Manifest, open read only and delete when done. - jf = new JarFile (f, true, - ZipFile.OPEN_READ | ZipFile.OPEN_DELETE); - } + { + URLConnection urlconn = url.openConnection(); + InputStream is = urlconn.getInputStream(); + byte[] buf = new byte [READBUFSIZE]; + File f = File.createTempFile ("cache", "jar"); + FileOutputStream fos = new FileOutputStream (f); + int len = 0; + + while ((len = is.read (buf)) != -1) + { + fos.write (buf, 0, len); + } + + fos.close(); + // Always verify the Manifest, open read only and delete when done. + jf = new JarFile (f, true, + ZipFile.OPEN_READ | ZipFile.OPEN_DELETE); + } if (useCaches) cache.put (url, jf); @@ -140,7 +140,7 @@ public final class Connection extends JarURLConnection jar_url = getJarFileURL(); jar_file = JarFileCache.get (jar_url, useCaches); String entry_name = getEntryName(); - + if (entry_name != null && !entry_name.equals ("")) { @@ -160,7 +160,7 @@ public final class Connection extends JarURLConnection if (! doInput) throw new ProtocolException("Can't open InputStream if doInput is false"); - + return jar_file.getInputStream (jar_entry); } @@ -179,26 +179,26 @@ public final class Connection extends JarURLConnection { try { - if (!connected) - connect(); + if (!connected) + connect(); - if (field.equals("content-type")) + if (field.equals("content-type")) return guessContentTypeFromName(getJarEntry().getName()); - else if (field.equals("content-length")) + else if (field.equals("content-length")) return Long.toString(getJarEntry().getSize()); - else if (field.equals("last-modified")) - { - // Both creating and manipulating dateFormat need synchronization. - synchronized (Connection.class) - { - if (dateFormat == null) - dateFormat = new SimpleDateFormat - ("EEE, dd MMM yyyy hh:mm:ss 'GMT'", - new Locale ("En", "Us", "Unix")); + else if (field.equals("last-modified")) + { + // Both creating and manipulating dateFormat need synchronization. + synchronized (Connection.class) + { + if (dateFormat == null) + dateFormat = new SimpleDateFormat + ("EEE, dd MMM yyyy hh:mm:ss 'GMT'", + new Locale ("En", "Us", "Unix")); - return dateFormat.format(new Date(getJarEntry().getTime())); - } - } + return dateFormat.format(new Date(getJarEntry().getTime())); + } + } } catch (IOException e) { @@ -222,11 +222,11 @@ public final class Connection extends JarURLConnection try { - return getJarEntry().getTime(); + return getJarEntry().getTime(); } catch (IOException e) { - return -1; + return -1; } } } diff --git a/libjava/classpath/gnu/java/net/protocol/jar/Handler.java b/libjava/classpath/gnu/java/net/protocol/jar/Handler.java index 66f0fb6d983..7d6103e937c 100644 --- a/libjava/classpath/gnu/java/net/protocol/jar/Handler.java +++ b/libjava/classpath/gnu/java/net/protocol/jar/Handler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -91,34 +91,34 @@ public class Handler extends URLStreamHandler // strategy when we encounter an error in parsing is to return without // doing anything. String file = url.getFile(); - + if (!file.equals("")) { //has context url - url_string = url_string.substring (start, end); + url_string = url_string.substring (start, end); if (url_string.startsWith("/")) { //url string is an absolute path int idx = file.lastIndexOf ("!/"); - - if (idx < 0) - throw new URLParseError("no !/ in spec"); - - file = file.substring (0, idx + 1) + url_string; + + if (idx < 0) + throw new URLParseError("no !/ in spec"); + + file = file.substring (0, idx + 1) + url_string; } else if (url_string.length() > 0) { int idx = file.lastIndexOf ("/"); if (idx == -1) //context path is weird - file = "/" + url_string; + file = "/" + url_string; else if (idx == (file.length() - 1)) //just concatenate two parts file = file + url_string; else - // according to Java API Documentation, here is a little different + // according to Java API Documentation, here is a little different // with URLStreamHandler.parseURL // but JDK seems doesn't handle it well file = file.substring(0, idx + 1) + url_string; } - + setURL (url, "jar", url.getHost(), url.getPort(), flat(file), null); return; } @@ -130,7 +130,7 @@ public class Handler extends URLStreamHandler return; if (start > url_string.length()) return; - + // Skip remains of protocol url_string = url_string.substring (start, end); @@ -140,16 +140,16 @@ public class Handler extends URLStreamHandler try { - new URL(url_string.substring (0, jar_stop)); + new URL(url_string.substring (0, jar_stop)); } catch (MalformedURLException e) { - throw new URLParseError("invalid inner URL: " + e.getMessage()); + throw new URLParseError("invalid inner URL: " + e.getMessage()); } - + if (!url.getProtocol().equals ("jar") ) throw new URLParseError("unexpected protocol " + url.getProtocol()); - + setURL (url, "jar", url.getHost(), url.getPort(), url_string, null); } @@ -170,16 +170,16 @@ public class Handler extends URLStreamHandler StringTokenizer st = new StringTokenizer(jar_path, "/"); while (st.hasMoreTokens()) { - String token = st.nextToken(); + String token = st.nextToken(); if (token.equals(".")) continue; else if (token.equals("..")) - { - if (! tokens.isEmpty()) - tokens.remove(tokens.size() - 1); - } - else - tokens.add(token); + { + if (! tokens.isEmpty()) + tokens.remove(tokens.size() - 1); + } + else + tokens.add(token); } CPStringBuilder path = new CPStringBuilder(url_string.length()); @@ -203,8 +203,8 @@ public class Handler extends URLStreamHandler String ref = url.getRef(); // return "jar:" + file; - // Performance!!: - // Do the concatenation manually to avoid resize StringBuffer's + // Performance!!: + // Do the concatenation manually to avoid resize StringBuffer's // internal buffer. The length of ref is not taken into consideration // as it's a rare path. CPStringBuilder sb = new CPStringBuilder (file.length() + 5); diff --git a/libjava/classpath/gnu/java/nio/ChannelInputStream.java b/libjava/classpath/gnu/java/nio/ChannelInputStream.java index f56536d65ad..5cad678c6ef 100644 --- a/libjava/classpath/gnu/java/nio/ChannelInputStream.java +++ b/libjava/classpath/gnu/java/nio/ChannelInputStream.java @@ -1,4 +1,4 @@ -/* ChannelInputStream.java -- +/* ChannelInputStream.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,11 +51,11 @@ import java.nio.channels.SelectableChannel; public final class ChannelInputStream extends InputStream { private ReadableByteChannel ch; - + public ChannelInputStream (ReadableByteChannel ch) { super(); - + this.ch = ch; } @@ -72,9 +72,9 @@ public final class ChannelInputStream extends InputStream public int read() throws IOException { if (ch instanceof SelectableChannel - && (! ((SelectableChannel) ch).isBlocking())) + && (! ((SelectableChannel) ch).isBlocking())) throw new IllegalBlockingModeException(); - + ByteBuffer buffer = ByteBuffer.allocate(1); int result = ch.read(buffer); diff --git a/libjava/classpath/gnu/java/nio/ChannelOutputStream.java b/libjava/classpath/gnu/java/nio/ChannelOutputStream.java index 08323eacec4..606f3775d85 100644 --- a/libjava/classpath/gnu/java/nio/ChannelOutputStream.java +++ b/libjava/classpath/gnu/java/nio/ChannelOutputStream.java @@ -1,4 +1,4 @@ -/* ChannelOutputStream.java -- +/* ChannelOutputStream.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,11 +49,11 @@ import java.nio.channels.WritableByteChannel; public final class ChannelOutputStream extends OutputStream { private WritableByteChannel ch; - + public ChannelOutputStream (WritableByteChannel ch) { super(); - + this.ch = ch; } diff --git a/libjava/classpath/gnu/java/nio/ChannelReader.java b/libjava/classpath/gnu/java/nio/ChannelReader.java index 1e7372d2ede..3c1456a3612 100644 --- a/libjava/classpath/gnu/java/nio/ChannelReader.java +++ b/libjava/classpath/gnu/java/nio/ChannelReader.java @@ -1,4 +1,4 @@ -/* ChannelReader.java -- +/* ChannelReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,11 +50,11 @@ import java.nio.charset.CodingErrorAction; /** * A Reader implementation that works using a ReadableByteChannel and a * CharsetDecoder. - * + * *

      * This is a bridge between NIO <-> IO character decoding. *

      - * + * * @author Robert Schuster */ public class ChannelReader extends Reader @@ -97,36 +97,36 @@ public class ChannelReader extends Reader // I declared channel being null meaning that the reader is closed. if (!channel.isOpen()) throw new IOException("Reader was already closed."); - + // I declared decoder being null meaning that there is no more data to read // and convert. if (decoder == null) return -1; - + // Stores the amount of character being read. It -1 so that if no conversion // occured the caller will see this as an 'end of file'. int sum = -1; - + // Copies any characters which may be left from the last invocation into the // destination array. if (charBuffer.remaining() > 0) { sum = Math.min(count, charBuffer.remaining()); charBuffer.get(buf, offset, sum); - + // Updates the control variables according to the latest copy operation. offset += sum; count -= sum; } - + // Copies the character which have not been put in the destination array to // the beginning. If data is actually copied count will be 0. If no data is // copied count is >0 and we can now convert some more characters. charBuffer.compact(); - + int converted = 0; boolean last = false; - + while (count != 0) { // Tries to convert some bytes (Which will intentionally fail in the @@ -139,7 +139,7 @@ public class ChannelReader extends Reader // unmappable. result.throwException(); } - + // Marks that we should end this loop regardless whether the caller // wants more chars or not, when this was the last conversion. if (last) @@ -149,11 +149,11 @@ public class ChannelReader extends Reader else if (result.isUnderflow()) { // We need more bytes to do the conversion. - + // Copies the not yet converted bytes to the beginning making it // being able to receive more bytes. byteBuffer.compact(); - + // Reads in another bunch of bytes for being converted. if (channel.read(byteBuffer) == -1) { @@ -162,42 +162,42 @@ public class ChannelReader extends Reader // done in the next loop iteration. last = true; } - + // Prepares the byteBuffer for the next character conversion run. byteBuffer.flip(); } - + // Prepares the charBuffer for being drained. charBuffer.flip(); - + converted = Math.min(count, charBuffer.remaining()); charBuffer.get(buf, offset, converted); - + // Copies characters which have not yet being copied into the char-Array // to the beginning making it possible to read them later (If data is // really copied here, then the caller has received enough characters so // far.). charBuffer.compact(); - + // Updates the control variables according to the latest copy operation. offset += converted; count -= converted; - + // Updates the amount of transferred characters. sum += converted; - + if (decoder == null) { break; } - + // Now that more characters have been transfered we let the loop decide // what to do next. } - + // Makes the charBuffer ready for reading on the next invocation. charBuffer.flip(); - + return sum; } } diff --git a/libjava/classpath/gnu/java/nio/ChannelWriter.java b/libjava/classpath/gnu/java/nio/ChannelWriter.java index 8e533ccbfe4..2441fb3959a 100644 --- a/libjava/classpath/gnu/java/nio/ChannelWriter.java +++ b/libjava/classpath/gnu/java/nio/ChannelWriter.java @@ -117,7 +117,7 @@ public class ChannelWriter { if (enc == null) throw new IOException("writer already closed"); - + byteBuffer.clear(); charBuffer.flip(); CoderResult res = enc.encode(charBuffer, byteBuffer, true); @@ -173,7 +173,7 @@ public class ChannelWriter break; } lastLen = len; - + // Convert. byteBuffer.clear(); CoderResult res = enc.encode(charBuffer, byteBuffer, false); diff --git a/libjava/classpath/gnu/java/nio/DatagramChannelImpl.java b/libjava/classpath/gnu/java/nio/DatagramChannelImpl.java index ea8c863e30e..1132796dd02 100644 --- a/libjava/classpath/gnu/java/nio/DatagramChannelImpl.java +++ b/libjava/classpath/gnu/java/nio/DatagramChannelImpl.java @@ -1,4 +1,4 @@ -/* DatagramChannelImpl.java -- +/* DatagramChannelImpl.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ public final class DatagramChannelImpl extends DatagramChannel { private NIODatagramSocket socket; private VMChannel channel; - + /** * Indicates whether this channel initiated whatever operation * is being invoked on our datagram socket. @@ -85,7 +85,7 @@ public final class DatagramChannelImpl extends DatagramChannel { return inChannelOperation; } - + /** * Sets our indicator of whether we are initiating an I/O operation * on our socket. @@ -94,18 +94,18 @@ public final class DatagramChannelImpl extends DatagramChannel { inChannelOperation = b; } - + public DatagramSocket socket () { return socket; } - + protected void implCloseSelectableChannel () throws IOException { channel.close(); } - + protected void implConfigureBlocking (boolean blocking) throws IOException { @@ -117,7 +117,7 @@ public final class DatagramChannelImpl extends DatagramChannel { if (!isOpen()) throw new ClosedChannelException(); - + try { channel.connect((InetSocketAddress) remote, 0); @@ -128,14 +128,14 @@ public final class DatagramChannelImpl extends DatagramChannel } return this; } - + public DatagramChannel disconnect () throws IOException { channel.disconnect(); return this; } - + public boolean isConnected() { try @@ -147,13 +147,13 @@ public final class DatagramChannelImpl extends DatagramChannel return false; } } - + public int write (ByteBuffer src) throws IOException { if (!isConnected ()) throw new NotYetConnectedException (); - + return channel.write(src); } @@ -180,32 +180,32 @@ public final class DatagramChannelImpl extends DatagramChannel { if (!isConnected ()) throw new NotYetConnectedException (); - + return channel.read(dst); } - + public long read (ByteBuffer[] dsts, int offset, int length) throws IOException { if (!isConnected()) throw new NotYetConnectedException(); - + if ((offset < 0) || (offset > dsts.length) || (length < 0) || (length > (dsts.length - offset))) throw new IndexOutOfBoundsException(); - + /* Likewise, see the comment int write above. */ return channel.readScattering(dsts, offset, length); } - + public SocketAddress receive (ByteBuffer dst) throws IOException { if (!isOpen()) throw new ClosedChannelException(); - + try { begin(); @@ -216,23 +216,23 @@ public final class DatagramChannelImpl extends DatagramChannel end(true); } } - + public int send (ByteBuffer src, SocketAddress target) throws IOException { if (!isOpen()) throw new ClosedChannelException(); - + if (!(target instanceof InetSocketAddress)) throw new IOException("can only send to inet socket addresses"); - + InetSocketAddress dst = (InetSocketAddress) target; if (dst.isUnresolved()) throw new IOException("Target address not resolved"); return channel.send(src, dst); } - + public VMChannel getVMChannel() { return channel; diff --git a/libjava/classpath/gnu/java/nio/DatagramChannelSelectionKey.java b/libjava/classpath/gnu/java/nio/DatagramChannelSelectionKey.java index f192e5002d4..93837f341b9 100644 --- a/libjava/classpath/gnu/java/nio/DatagramChannelSelectionKey.java +++ b/libjava/classpath/gnu/java/nio/DatagramChannelSelectionKey.java @@ -1,4 +1,4 @@ -/* DatagramChannelSelectionKey.java -- +/* DatagramChannelSelectionKey.java -- Copyright (C) 2003, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/nio/EpollSelectionKeyImpl.java b/libjava/classpath/gnu/java/nio/EpollSelectionKeyImpl.java index 11113f3975c..c0b7720e3fb 100644 --- a/libjava/classpath/gnu/java/nio/EpollSelectionKeyImpl.java +++ b/libjava/classpath/gnu/java/nio/EpollSelectionKeyImpl.java @@ -58,7 +58,7 @@ public class EpollSelectionKeyImpl extends AbstractSelectionKey int key; boolean valid; boolean cancelled; - + EpollSelectionKeyImpl(EpollSelectorImpl selector, SelectableChannel channel, int fd) { diff --git a/libjava/classpath/gnu/java/nio/EpollSelectorImpl.java b/libjava/classpath/gnu/java/nio/EpollSelectorImpl.java index 2b3c9bbb1b6..f74b087c2e7 100644 --- a/libjava/classpath/gnu/java/nio/EpollSelectorImpl.java +++ b/libjava/classpath/gnu/java/nio/EpollSelectorImpl.java @@ -65,20 +65,20 @@ public class EpollSelectorImpl extends AbstractSelector // XXX is this reasonable? Does it matter? private static final int DEFAULT_EPOLL_SIZE = 128; private static final int sizeof_struct_epoll_event; - + private static final int OP_ACCEPT = SelectionKey.OP_ACCEPT; private static final int OP_CONNECT = SelectionKey.OP_CONNECT; private static final int OP_READ = SelectionKey.OP_READ; private static final int OP_WRITE = SelectionKey.OP_WRITE; - + /** our epoll file descriptor. */ private int epoll_fd; - + private final HashMap keys; private Set selectedKeys; private Thread waitingThread; private ByteBuffer events; - + private static final int INITIAL_CAPACITY; private static final int MAX_DOUBLING_CAPACITY; private static final int CAPACITY_INCREMENT; @@ -87,17 +87,17 @@ public class EpollSelectorImpl extends AbstractSelector { if (Configuration.INIT_LOAD_LIBRARY) System.loadLibrary("javanio"); - + if (epoll_supported()) sizeof_struct_epoll_event = sizeof_struct(); else sizeof_struct_epoll_event = -1; - + INITIAL_CAPACITY = 64 * sizeof_struct_epoll_event; MAX_DOUBLING_CAPACITY = 1024 * sizeof_struct_epoll_event; CAPACITY_INCREMENT = 128 * sizeof_struct_epoll_event; } - + public EpollSelectorImpl(SelectorProvider provider) throws IOException { @@ -135,7 +135,7 @@ public class EpollSelectorImpl extends AbstractSelector throw new IllegalArgumentException("invalid timeout"); return doSelect((int) timeout); } - + private int doSelect(int timeout) throws IOException { synchronized (keys) @@ -152,7 +152,7 @@ public class EpollSelectorImpl extends AbstractSelector it.remove(); deregister(key); } - + // Clear out closed channels. The fds are removed from the epoll // fd when closed, so there is no need to remove them manually. for (Iterator it = keys.values().iterator(); it.hasNext(); ) @@ -165,7 +165,7 @@ public class EpollSelectorImpl extends AbstractSelector it.remove(); } } - + // Don't bother if we have nothing to select. if (keys.isEmpty()) return 0; @@ -183,7 +183,7 @@ public class EpollSelectorImpl extends AbstractSelector waitingThread = null; end(); } - + HashSet s = new HashSet(ret); for (int i = 0; i < ret; i++) { @@ -197,9 +197,9 @@ public class EpollSelectorImpl extends AbstractSelector key.selectedOps = selected_ops(b) & key.interestOps; s.add(key); } - + reallocateBuffer(); - + selectedKeys = s; return ret; } @@ -239,7 +239,7 @@ public class EpollSelectorImpl extends AbstractSelector } return this; } - + /* (non-Javadoc) * @see java.nio.channels.spi.AbstractSelector#implCloseSelector() */ @@ -275,7 +275,7 @@ public class EpollSelectorImpl extends AbstractSelector result.key = System.identityHashCode(result); epoll_add(epoll_fd, result.fd, ops); keys.put(Integer.valueOf(native_fd), result); - reallocateBuffer(); + reallocateBuffer(); return result; } } @@ -284,7 +284,7 @@ public class EpollSelectorImpl extends AbstractSelector throw new IllegalArgumentException(ioe); } } - + private void reallocateBuffer() { // Ensure we have enough space for all potential events that may be @@ -301,18 +301,18 @@ public class EpollSelectorImpl extends AbstractSelector // Ensure that the events buffer is not too large, given the number of // events registered. else if (events.capacity() > keys.size() * sizeof_struct_epoll_event * 2 + 1 - && events.capacity() > INITIAL_CAPACITY) + && events.capacity() > INITIAL_CAPACITY) { int cap = events.capacity() >>> 1; events = ByteBuffer.allocateDirect(cap); } } - + void epoll_modify(EpollSelectionKeyImpl key, int ops) throws IOException { epoll_modify(epoll_fd, key.fd, ops); } - + /** * Tell if epoll is supported by this system, and support was compiled in. * @@ -327,8 +327,8 @@ public class EpollSelectorImpl extends AbstractSelector * @return The size of `struct epoll_event'. */ private static native int sizeof_struct(); - - + + /** * Open a new epoll file descriptor. * @@ -337,7 +337,7 @@ public class EpollSelectorImpl extends AbstractSelector * @throws IOException If allocating a new epoll descriptor fails. */ private static native int epoll_create(int size) throws IOException; - + /** * Add a file descriptor to this selector. * @@ -347,7 +347,7 @@ public class EpollSelectorImpl extends AbstractSelector */ private static native void epoll_add(int efd, int fd, int ops) throws IOException; - + /** * Modify the interest ops of the key selecting for the given FD. * @@ -358,7 +358,7 @@ public class EpollSelectorImpl extends AbstractSelector */ private static native void epoll_modify(int efd, int fd, int ops) throws IOException; - + /** * Remove a file descriptor from this selector. * @@ -367,7 +367,7 @@ public class EpollSelectorImpl extends AbstractSelector * @throws IOException */ private static native void epoll_delete(int efd, int fd) throws IOException; - + /** * Select events. * @@ -380,7 +380,7 @@ public class EpollSelectorImpl extends AbstractSelector */ private static native int epoll_wait(int efd, ByteBuffer state, int n, int timeout) throws IOException; - + /** * Fetch the fd value from a selected struct epoll_event. * @@ -388,7 +388,7 @@ public class EpollSelectorImpl extends AbstractSelector * @return The fd value. */ private static native int selected_fd(ByteBuffer struct); - + /** * Fetch the enabled operations from a selected struct epoll_event. * diff --git a/libjava/classpath/gnu/java/nio/FileChannelImpl.java b/libjava/classpath/gnu/java/nio/FileChannelImpl.java index d4a374b4ac7..c17227d3d15 100644 --- a/libjava/classpath/gnu/java/nio/FileChannelImpl.java +++ b/libjava/classpath/gnu/java/nio/FileChannelImpl.java @@ -1,4 +1,4 @@ -/* FileChannelImpl.java -- +/* FileChannelImpl.java -- Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ import java.nio.channels.WritableByteChannel; /** * This file is not user visible ! * But alas, Java does not have a concept of friendly packages - * so this class is public. + * so this class is public. * Instances of this class are created by invoking getChannel * Upon a Input/Output/RandomAccessFile object. */ @@ -86,7 +86,7 @@ public final class FileChannelImpl extends FileChannel { System.loadLibrary("javanio"); } - + //init(); FileChannelImpl ch = null; @@ -99,7 +99,7 @@ public final class FileChannelImpl extends FileChannel throw new Error(ioe); } in = ch; - + ch = null; try { @@ -110,11 +110,11 @@ public final class FileChannelImpl extends FileChannel throw new Error(ioe); } out = ch; - + ch = null; try { - ch = new FileChannelImpl(VMChannel.getStderr(), WRITE); + ch = new FileChannelImpl(VMChannel.getStderr(), WRITE); } catch (IOException ioe) { @@ -154,16 +154,16 @@ public final class FileChannelImpl extends FileChannel // to avoid race condition. if (file.isDirectory()) { - try - { - close(); - } - catch (IOException e) - { - /* ignore it */ - } + try + { + close(); + } + catch (IOException e) + { + /* ignore it */ + } - throw new FileNotFoundException(description + " is a directory"); + throw new FileNotFoundException(description + " is a directory"); } } @@ -202,7 +202,7 @@ public final class FileChannelImpl extends FileChannel { ch.truncate(size); } - + public void unlock(long pos, long len) throws IOException { ch.unlock(pos, len); @@ -212,7 +212,7 @@ public final class FileChannelImpl extends FileChannel { return ch.size(); } - + protected void implCloseChannel() throws IOException { ch.close(); @@ -241,7 +241,7 @@ public final class FileChannelImpl extends FileChannel position (position); int result = read(dst); position (oldPosition); - + return result; } @@ -260,7 +260,7 @@ public final class FileChannelImpl extends FileChannel { return ch.write(src); } - + public int write (ByteBuffer src, long position) throws IOException { @@ -269,7 +269,7 @@ public final class FileChannelImpl extends FileChannel if (!isOpen ()) throw new ClosedChannelException (); - + if ((mode & WRITE) == 0) throw new NonWritableChannelException (); @@ -280,7 +280,7 @@ public final class FileChannelImpl extends FileChannel seek (position); result = write(src); seek (oldPosition); - + return result; } @@ -296,30 +296,30 @@ public final class FileChannelImpl extends FileChannel } public MappedByteBuffer map (FileChannel.MapMode mode, - long position, long size) + long position, long size) throws IOException { char nmode = 0; if (mode == MapMode.READ_ONLY) { - nmode = 'r'; - if ((this.mode & READ) == 0) - throw new NonReadableChannelException(); + nmode = 'r'; + if ((this.mode & READ) == 0) + throw new NonReadableChannelException(); } else if (mode == MapMode.READ_WRITE || mode == MapMode.PRIVATE) { - nmode = mode == MapMode.READ_WRITE ? '+' : 'c'; - if ((this.mode & WRITE) != WRITE) - throw new NonWritableChannelException(); - if ((this.mode & READ) != READ) - throw new NonReadableChannelException(); + nmode = mode == MapMode.READ_WRITE ? '+' : 'c'; + if ((this.mode & WRITE) != WRITE) + throw new NonWritableChannelException(); + if ((this.mode & READ) != READ) + throw new NonReadableChannelException(); } else throw new IllegalArgumentException ("mode: " + mode); - + if (position < 0 || size < 0 || size > Integer.MAX_VALUE) throw new IllegalArgumentException ("position: " + position - + ", size: " + size); + + ", size: " + size); return ch.map(nmode, position, (int) size); } @@ -335,99 +335,99 @@ public final class FileChannelImpl extends FileChannel } // like transferTo, but with a count of less than 2Gbytes - private int smallTransferTo (long position, int count, - WritableByteChannel target) + private int smallTransferTo (long position, int count, + WritableByteChannel target) throws IOException { ByteBuffer buffer; try { - // Try to use a mapped buffer if we can. If this fails for - // any reason we'll fall back to using a ByteBuffer. - buffer = map (MapMode.READ_ONLY, position, count); + // Try to use a mapped buffer if we can. If this fails for + // any reason we'll fall back to using a ByteBuffer. + buffer = map (MapMode.READ_ONLY, position, count); } catch (IOException e) { - buffer = ByteBuffer.allocate (count); - read (buffer, position); - buffer.flip(); + buffer = ByteBuffer.allocate (count); + read (buffer, position); + buffer.flip(); } return target.write (buffer); } - public long transferTo (long position, long count, - WritableByteChannel target) + public long transferTo (long position, long count, + WritableByteChannel target) throws IOException { if (position < 0 || count < 0) throw new IllegalArgumentException ("position: " + position - + ", count: " + count); + + ", count: " + count); if (!isOpen ()) throw new ClosedChannelException (); if ((mode & READ) == 0) throw new NonReadableChannelException (); - + final int pageSize = 65536; long total = 0; while (count > 0) { - int transferred - = smallTransferTo (position, (int)Math.min (count, pageSize), - target); - if (transferred < 0) - break; - total += transferred; - position += transferred; - count -= transferred; + int transferred + = smallTransferTo (position, (int)Math.min (count, pageSize), + target); + if (transferred < 0) + break; + total += transferred; + position += transferred; + count -= transferred; } return total; } // like transferFrom, but with a count of less than 2Gbytes - private int smallTransferFrom (ReadableByteChannel src, long position, - int count) + private int smallTransferFrom (ReadableByteChannel src, long position, + int count) throws IOException { ByteBuffer buffer = null; if (src instanceof FileChannel) { - try - { - // Try to use a mapped buffer if we can. If this fails - // for any reason we'll fall back to using a ByteBuffer. - buffer = ((FileChannel)src).map (MapMode.READ_ONLY, position, - count); - } - catch (IOException e) - { - } + try + { + // Try to use a mapped buffer if we can. If this fails + // for any reason we'll fall back to using a ByteBuffer. + buffer = ((FileChannel)src).map (MapMode.READ_ONLY, position, + count); + } + catch (IOException e) + { + } } if (buffer == null) { - buffer = ByteBuffer.allocate (count); - src.read (buffer); - buffer.flip(); + buffer = ByteBuffer.allocate (count); + src.read (buffer); + buffer.flip(); } return write (buffer, position); } - public long transferFrom (ReadableByteChannel src, long position, - long count) + public long transferFrom (ReadableByteChannel src, long position, + long count) throws IOException { if (position < 0 || count < 0) throw new IllegalArgumentException ("position: " + position - + ", count: " + count); + + ", count: " + count); if (!isOpen ()) throw new ClosedChannelException (); @@ -440,13 +440,13 @@ public final class FileChannelImpl extends FileChannel while (count > 0) { - int transferred = smallTransferFrom (src, position, - (int)Math.min (count, pageSize)); - if (transferred < 0) - break; - total += transferred; - position += transferred; - count -= transferred; + int transferred = smallTransferFrom (src, position, + (int)Math.min (count, pageSize)); + if (transferred < 0) + break; + total += transferred; + position += transferred; + count -= transferred; } return total; @@ -459,14 +459,14 @@ public final class FileChannelImpl extends FileChannel if (position < 0 || size < 0) throw new IllegalArgumentException ("position: " + position - + ", size: " + size); + + ", size: " + size); if (!isOpen ()) throw new ClosedChannelException(); if (shared && ((mode & READ) == 0)) throw new NonReadableChannelException(); - + if (!shared && ((mode & WRITE) == 0)) throw new NonWritableChannelException(); } @@ -479,19 +479,19 @@ public final class FileChannelImpl extends FileChannel boolean completed = false; try { - begin(); - boolean lockable = ch.lock(position, size, shared, false); - completed = true; - return (lockable - ? new FileLockImpl(this, position, size, shared) - : null); + begin(); + boolean lockable = ch.lock(position, size, shared, false); + completed = true; + return (lockable + ? new FileLockImpl(this, position, size, shared) + : null); } finally { - end(completed); + end(completed); } } - + public FileLock lock (long position, long size, boolean shared) throws IOException { @@ -500,15 +500,15 @@ public final class FileChannelImpl extends FileChannel boolean completed = false; try { - boolean lockable = ch.lock(position, size, shared, true); - completed = true; - return (lockable - ? new FileLockImpl(this, position, size, shared) - : null); + boolean lockable = ch.lock(position, size, shared, true); + completed = true; + return (lockable + ? new FileLockImpl(this, position, size, shared) + : null); } finally { - end(completed); + end(completed); } } @@ -520,7 +520,7 @@ public final class FileChannelImpl extends FileChannel return implPosition (); } - + public FileChannel position (long newPosition) throws IOException { @@ -535,7 +535,7 @@ public final class FileChannelImpl extends FileChannel seek (newPosition); return this; } - + public FileChannel truncate (long size) throws IOException { @@ -557,9 +557,9 @@ public final class FileChannelImpl extends FileChannel public String toString() { return (super.toString() - + "[ fd: " + ch.getState() - + "; mode: " + Integer.toOctalString(mode) - + "; " + description + " ]"); + + "[ fd: " + ch.getState() + + "; mode: " + Integer.toOctalString(mode) + + "; " + description + " ]"); } /** diff --git a/libjava/classpath/gnu/java/nio/FileLockImpl.java b/libjava/classpath/gnu/java/nio/FileLockImpl.java index 768906ce973..e714ea358e5 100644 --- a/libjava/classpath/gnu/java/nio/FileLockImpl.java +++ b/libjava/classpath/gnu/java/nio/FileLockImpl.java @@ -69,14 +69,14 @@ public final class FileLockImpl extends FileLock { try { - release(); + release(); } catch (IOException e) { - // Ignore this. + // Ignore this. } } - + /** * Whether or not this lock is valid, false when channel is closed or * release has been explicitly called. @@ -95,8 +95,8 @@ public final class FileLockImpl extends FileLock { if (isValid()) { - valid = false; - ((FileChannelImpl) channel()).unlock(position(), size()); + valid = false; + ((FileChannelImpl) channel()).unlock(position(), size()); } } } diff --git a/libjava/classpath/gnu/java/nio/InputStreamChannel.java b/libjava/classpath/gnu/java/nio/InputStreamChannel.java index a3dffe24554..9bdfe323846 100644 --- a/libjava/classpath/gnu/java/nio/InputStreamChannel.java +++ b/libjava/classpath/gnu/java/nio/InputStreamChannel.java @@ -1,4 +1,4 @@ -/* InputStreamChannel.java -- +/* InputStreamChannel.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ public final class InputStreamChannel implements ReadableByteChannel { private boolean closed = false; private InputStream in; - + public InputStreamChannel (InputStream in) { super(); @@ -76,7 +76,7 @@ public final class InputStreamChannel implements ReadableByteChannel { if (!isOpen()) throw new ClosedChannelException(); - + byte[] buffer = new byte [dst.remaining()]; int readBytes = in.read (buffer); diff --git a/libjava/classpath/gnu/java/nio/KqueueSelectionKeyImpl.java b/libjava/classpath/gnu/java/nio/KqueueSelectionKeyImpl.java index 11b37cadbe5..9fe6b66139b 100644 --- a/libjava/classpath/gnu/java/nio/KqueueSelectionKeyImpl.java +++ b/libjava/classpath/gnu/java/nio/KqueueSelectionKeyImpl.java @@ -57,12 +57,12 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey /** The selector we were created for. */ private final KqueueSelectorImpl selector; - + /** The channel we are attached to. */ private final SelectableChannel channel; - + private final VMChannelOwner natChannel; - + public KqueueSelectionKeyImpl(KqueueSelectorImpl selector, SelectableChannel channel) { @@ -101,7 +101,7 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey throw new IllegalStateException("key is invalid"); if ((ops & ~channel.validOps()) != 0) throw new IllegalArgumentException("channel does not support all operations"); - + selector.setInterestOps(this, ops); return this; } @@ -123,7 +123,7 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey { return selector; } - + public String toString() { if (!isValid()) @@ -140,12 +140,12 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey + ((readyOps & OP_WRITE) != 0 ? " OP_WRITE" : "") + " } ]"; } - + public int hashCode() { return fd; } - + public boolean equals(Object o) { if (!(o instanceof KqueueSelectionKeyImpl)) @@ -153,8 +153,8 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey KqueueSelectionKeyImpl that = (KqueueSelectionKeyImpl) o; return that.fd == this.fd && that.channel.equals(this.channel); } - - + + boolean isReadActive() { return (activeOps & (OP_READ | OP_ACCEPT)) != 0; @@ -164,17 +164,17 @@ public class KqueueSelectionKeyImpl extends AbstractSelectionKey { return (interestOps & (OP_READ | OP_ACCEPT)) != 0; } - + boolean isWriteActive() { return (activeOps & (OP_WRITE | OP_CONNECT)) != 0; } - + boolean isWriteInterested() { return (interestOps & (OP_WRITE | OP_CONNECT)) != 0; } - + boolean needCommitRead() { return isReadActive() == (!isReadInterested()); diff --git a/libjava/classpath/gnu/java/nio/KqueueSelectorImpl.java b/libjava/classpath/gnu/java/nio/KqueueSelectorImpl.java index 34ca1dc596d..e696c0d7296 100644 --- a/libjava/classpath/gnu/java/nio/KqueueSelectorImpl.java +++ b/libjava/classpath/gnu/java/nio/KqueueSelectorImpl.java @@ -70,7 +70,7 @@ public class KqueueSelectorImpl extends AbstractSelector private static final int MAX_DOUBLING_CAPACITY = 16384; private static final int CAP_INCREMENT = 1024; private static final int INITIAL_CAPACITY; - + static { try @@ -88,7 +88,7 @@ public class KqueueSelectorImpl extends AbstractSelector _sizeof_struct_kevent = -1; INITIAL_CAPACITY = 16 * _sizeof_struct_kevent; } - + /** * Tell if kqueue-based selectors are supported on this system. * @@ -96,15 +96,15 @@ public class KqueueSelectorImpl extends AbstractSelector * compiled in to Classpath. */ public static native boolean kqueue_supported(); - + /* Our native file descriptor. */ private int kq; - + private HashMap/**/ keys; private HashSet/**/ selected; private Thread blockedThread; private ByteBuffer events; - + private static final int OP_ACCEPT = SelectionKey.OP_ACCEPT; private static final int OP_CONNECT = SelectionKey.OP_CONNECT; private static final int OP_READ = SelectionKey.OP_READ; @@ -160,7 +160,7 @@ public class KqueueSelectorImpl extends AbstractSelector { if (!isOpen()) throw new ClosedSelectorException(); - + return selected; } @@ -181,20 +181,20 @@ public class KqueueSelectorImpl extends AbstractSelector blockedThread.interrupt(); return this; } - + public String toString() { return super.toString() + " [ fd: " + kq + " ]"; } - + public boolean equals(Object o) { if (!(o instanceof KqueueSelectorImpl)) return false; - + return ((KqueueSelectorImpl) o).kq == kq; } - + int doSelect(long timeout) throws IOException { Set cancelled = cancelledKeys(); @@ -207,7 +207,7 @@ public class KqueueSelectorImpl extends AbstractSelector KqueueSelectionKeyImpl key = (KqueueSelectionKeyImpl) it.next(); key.interestOps = 0; } - + int events_size = (2 * _sizeof_struct_kevent) * keys.size(); int num_events = 0; @@ -215,7 +215,7 @@ public class KqueueSelectorImpl extends AbstractSelector { Map.Entry e = (Map.Entry) it.next(); KqueueSelectionKeyImpl key = (KqueueSelectionKeyImpl) e.getValue(); - + SelectableChannel ch = key.channel(); if (ch instanceof VMChannelOwner) { @@ -226,7 +226,7 @@ public class KqueueSelectorImpl extends AbstractSelector continue; } } - + // If this key is registering a read filter, add it to the buffer. if (key.needCommitRead()) { @@ -235,7 +235,7 @@ public class KqueueSelectorImpl extends AbstractSelector key.activeOps & (OP_READ | OP_ACCEPT), key.key); num_events++; } - + // If this key is registering a write filter, add it to the buffer. if (key.needCommitWrite()) { @@ -271,7 +271,7 @@ public class KqueueSelectorImpl extends AbstractSelector //System.out.println("dump of keys selected:"); //dump_selection_keys((ByteBuffer) events.duplicate().limit(n * _sizeof_struct_kevent)); - + // Commit the operations we've just added in the call to kevent. for (Iterator it = keys.values().iterator(); it.hasNext(); ) { @@ -288,7 +288,7 @@ public class KqueueSelectorImpl extends AbstractSelector int y = fetch_key(events.slice()); KqueueSelectionKeyImpl key = (KqueueSelectionKeyImpl) keys.get(new Integer(y)); - + if (key == null) { System.out.println("WARNING! no key found for selected key " + y); @@ -301,7 +301,7 @@ public class KqueueSelectorImpl extends AbstractSelector key.readyOps = ready_ops(events.slice(), key.interestOps); selected.add(key); } - + // Finally, remove the cancelled keys. for (Iterator it = cancelled.iterator(); it.hasNext(); ) { @@ -317,7 +317,7 @@ public class KqueueSelectorImpl extends AbstractSelector } } } - + protected SelectionKey register(AbstractSelectableChannel channel, int interestOps, Object attachment) @@ -336,7 +336,7 @@ public class KqueueSelectorImpl extends AbstractSelector { throw new IllegalArgumentException("channel is closed or invalid"); } - + KqueueSelectionKeyImpl result = new KqueueSelectionKeyImpl(this, channel); result.interestOps = interestOps; result.attach(attachment); @@ -351,7 +351,7 @@ public class KqueueSelectorImpl extends AbstractSelector } return result; } - + void setInterestOps(KqueueSelectionKeyImpl key, int ops) { synchronized (keys) @@ -359,11 +359,11 @@ public class KqueueSelectorImpl extends AbstractSelector key.interestOps = ops; } } - + /** * Reallocate the events buffer. This is the destination buffer for * events returned by kevent. This method will: - * + * * * Grow the buffer if there is insufficent space for all registered * events. * * Shrink the buffer if it is more than twice the size needed. @@ -380,7 +380,7 @@ public class KqueueSelectorImpl extends AbstractSelector cap += CAP_INCREMENT; else cap = cap << 1; - + events = ByteBuffer.allocateDirect(cap); } else if (events.capacity() > 4 * (_sizeof_struct_kevent) * keys.size() + 1 @@ -392,12 +392,12 @@ public class KqueueSelectorImpl extends AbstractSelector } } } - + //synchronized void updateOps(KqueueSelectionKeyImpl key, int interestOps) //{ // updateOps(key, interestOps, 0, false); //} - + /*void updateOps(KqueueSelectionKeyImpl key, int interestOps, int activeOps, int fd) { @@ -437,25 +437,25 @@ public class KqueueSelectorImpl extends AbstractSelector + " }"); } } - + /** * Return the size of a struct kevent on this system. * * @return The size of struct kevent. */ private static native int sizeof_struct_kevent(); - + /** * Opens a kqueue descriptor. - * + * * @return The new kqueue descriptor. * @throws IOException If opening fails. */ private static native int implOpen() throws IOException; - + /** * Closes the kqueue file descriptor. - * + * * @param kq The kqueue file descriptor. * @throws IOException */ @@ -474,7 +474,7 @@ public class KqueueSelectorImpl extends AbstractSelector */ private static native void kevent_set(ByteBuffer nstate, int i, int fd, int interestOps, int activeOps, int key); - + /** * Poll for events. The source events are stored in events, * which is also where polled events will be placed. @@ -490,7 +490,7 @@ public class KqueueSelectorImpl extends AbstractSelector */ private static native int kevent(int kq, ByteBuffer events, int nevents, int nout, long timeout); - + /** * Fetch a polled key from a native state buffer. For each kevent key we * create, we put the native state info (one or more struct @@ -503,7 +503,7 @@ public class KqueueSelectorImpl extends AbstractSelector * @return The key object. */ private static native int fetch_key(ByteBuffer nstate); - + /** * Fetch the ready ops of the associated native state. That is, this * inspects the first argument as a struct kevent, looking @@ -516,7 +516,7 @@ public class KqueueSelectorImpl extends AbstractSelector * @return The bit set representing the ready operations. */ private static native int ready_ops(ByteBuffer nstate, int interestOps); - + /** * Check if kevent returned EV_EOF for a selection key. * diff --git a/libjava/classpath/gnu/java/nio/NIODatagramSocket.java b/libjava/classpath/gnu/java/nio/NIODatagramSocket.java index f23236eca88..b0c7b2dc2c6 100644 --- a/libjava/classpath/gnu/java/nio/NIODatagramSocket.java +++ b/libjava/classpath/gnu/java/nio/NIODatagramSocket.java @@ -1,4 +1,4 @@ -/* NIODatagramSocket.java -- +/* NIODatagramSocket.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ public final class NIODatagramSocket extends DatagramSocket { private PlainDatagramSocketImpl impl; private DatagramChannelImpl channel; - + public NIODatagramSocket (PlainDatagramSocketImpl impl, DatagramChannelImpl channel) { diff --git a/libjava/classpath/gnu/java/nio/NIOServerSocket.java b/libjava/classpath/gnu/java/nio/NIOServerSocket.java index fc4d0dbe0da..5dbda6b0068 100644 --- a/libjava/classpath/gnu/java/nio/NIOServerSocket.java +++ b/libjava/classpath/gnu/java/nio/NIOServerSocket.java @@ -1,4 +1,4 @@ -/* NIOServerSocket.java -- +/* NIOServerSocket.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ import java.security.PrivilegedExceptionAction; public final class NIOServerSocket extends ServerSocket { private ServerSocketChannelImpl channel; - + protected NIOServerSocket (ServerSocketChannelImpl channel) throws IOException { @@ -67,24 +67,24 @@ public final class NIOServerSocket extends ServerSocket { try { - final Object t = this; - final Method method = ServerSocket.class.getDeclaredMethod("getImpl", new Class[0]); - method.setAccessible(true); - PrivilegedExceptionAction action = new PrivilegedExceptionAction() - { - public Object run() throws Exception - { - return method.invoke(t, new Object[0]); - } - }; - return (PlainSocketImpl) AccessController.doPrivileged(action); + final Object t = this; + final Method method = ServerSocket.class.getDeclaredMethod("getImpl", new Class[0]); + method.setAccessible(true); + PrivilegedExceptionAction action = new PrivilegedExceptionAction() + { + public Object run() throws Exception + { + return method.invoke(t, new Object[0]); + } + }; + return (PlainSocketImpl) AccessController.doPrivileged(action); } catch (Exception e) { - // This should never happen. - Error error = new InternalError("unable to invoke method ServerSocket.getImpl()"); - error.initCause(e); - throw error; + // This should never happen. + Error error = new InternalError("unable to invoke method ServerSocket.getImpl()"); + error.initCause(e); + throw error; } } diff --git a/libjava/classpath/gnu/java/nio/NIOSocket.java b/libjava/classpath/gnu/java/nio/NIOSocket.java index 87574e49110..a421e019a92 100644 --- a/libjava/classpath/gnu/java/nio/NIOSocket.java +++ b/libjava/classpath/gnu/java/nio/NIOSocket.java @@ -1,4 +1,4 @@ -/* NIOSocket.java -- +/* NIOSocket.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import java.nio.channels.SocketChannel; public final class NIOSocket extends Socket { private SocketChannelImpl channel; - + protected NIOSocket (SocketChannelImpl channel) throws IOException { @@ -66,12 +66,12 @@ public final class NIOSocket extends Socket // this.impl = channel.getPlainSocketImpl(); // this.channel = channel; //} - + public final SocketChannel getChannel() { return channel; } - + public boolean isConnected() { return channel.isConnected(); diff --git a/libjava/classpath/gnu/java/nio/NIOSocketImpl.java b/libjava/classpath/gnu/java/nio/NIOSocketImpl.java index 4b26561a212..15cc07dc83e 100644 --- a/libjava/classpath/gnu/java/nio/NIOSocketImpl.java +++ b/libjava/classpath/gnu/java/nio/NIOSocketImpl.java @@ -50,7 +50,7 @@ public class NIOSocketImpl extends PlainSocketImpl { private final SocketChannelImpl channel; - + NIOSocketImpl(SocketChannelImpl channel) throws IOException { this.channel = channel; diff --git a/libjava/classpath/gnu/java/nio/OutputStreamChannel.java b/libjava/classpath/gnu/java/nio/OutputStreamChannel.java index 8167426b07d..ac2e7888def 100644 --- a/libjava/classpath/gnu/java/nio/OutputStreamChannel.java +++ b/libjava/classpath/gnu/java/nio/OutputStreamChannel.java @@ -1,4 +1,4 @@ -/* OutputStreamChannel.java -- +/* OutputStreamChannel.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,11 +51,11 @@ public final class OutputStreamChannel implements WritableByteChannel { private boolean closed = false; private OutputStream out; - + public OutputStreamChannel (OutputStream out) { super(); - + this.out = out; } @@ -72,12 +72,12 @@ public final class OutputStreamChannel implements WritableByteChannel { return !closed; } - + public int write (ByteBuffer src) throws IOException { if (!isOpen()) throw new ClosedChannelException(); - + int len = src.remaining(); byte[] buffer = new byte [len]; src.get (buffer); diff --git a/libjava/classpath/gnu/java/nio/PipeImpl.java b/libjava/classpath/gnu/java/nio/PipeImpl.java index 8a95b9622ae..143af1a2430 100644 --- a/libjava/classpath/gnu/java/nio/PipeImpl.java +++ b/libjava/classpath/gnu/java/nio/PipeImpl.java @@ -1,4 +1,4 @@ -/* PipeImpl.java -- +/* PipeImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ class PipeImpl extends Pipe implements VMChannelOwner { private VMChannel vmch; - + public SourceChannelImpl (SelectorProvider selectorProvider, VMChannel channel) { @@ -82,18 +82,18 @@ class PipeImpl extends Pipe } public final synchronized long read (ByteBuffer[] srcs, int offset, - int len) + int len) throws IOException { if (offset < 0 - || offset > srcs.length - || len < 0 - || len > srcs.length - offset) - throw new IndexOutOfBoundsException(); + || offset > srcs.length + || len < 0 + || len > srcs.length - offset) + throw new IndexOutOfBoundsException(); return vmch.readScattering(srcs, offset, len); } - + public VMChannel getVMChannel() { return vmch; @@ -104,7 +104,7 @@ class PipeImpl extends Pipe implements VMChannelOwner { private VMChannel vmch; - + public SinkChannelImpl (SelectorProvider selectorProvider, VMChannel channel) { @@ -140,14 +140,14 @@ class PipeImpl extends Pipe throws IOException { if (offset < 0 - || offset > srcs.length - || len < 0 - || len > srcs.length - offset) - throw new IndexOutOfBoundsException(); - + || offset > srcs.length + || len < 0 + || len > srcs.length - offset) + throw new IndexOutOfBoundsException(); + return vmch.writeGathering(srcs, offset, len); } - + public VMChannel getVMChannel() { return vmch; @@ -156,7 +156,7 @@ class PipeImpl extends Pipe private SinkChannelImpl sink; private SourceChannelImpl source; - + public PipeImpl (SelectorProvider provider) throws IOException { diff --git a/libjava/classpath/gnu/java/nio/SelectionKeyImpl.java b/libjava/classpath/gnu/java/nio/SelectionKeyImpl.java index c927f319644..a26ff872639 100644 --- a/libjava/classpath/gnu/java/nio/SelectionKeyImpl.java +++ b/libjava/classpath/gnu/java/nio/SelectionKeyImpl.java @@ -1,4 +1,4 @@ -/* SelectionKeyImpl.java -- +/* SelectionKeyImpl.java -- Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public abstract class SelectionKeyImpl extends AbstractSelectionKey { if (!isValid()) throw new CancelledKeyException(); - + return readyOps; } @@ -73,7 +73,7 @@ public abstract class SelectionKeyImpl extends AbstractSelectionKey { if (!isValid()) throw new CancelledKeyException(); - + readyOps = ops; return this; } @@ -82,10 +82,10 @@ public abstract class SelectionKeyImpl extends AbstractSelectionKey { if (!isValid()) throw new CancelledKeyException(); - + synchronized (impl.selectedKeys()) { - return interestOps; + return interestOps; } } @@ -96,11 +96,11 @@ public abstract class SelectionKeyImpl extends AbstractSelectionKey synchronized (impl.selectedKeys()) { - interestOps = ops; + interestOps = ops; } return this; } - + public Selector selector () { return impl; diff --git a/libjava/classpath/gnu/java/nio/SelectorImpl.java b/libjava/classpath/gnu/java/nio/SelectorImpl.java index c08478c9968..21238f20f8d 100644 --- a/libjava/classpath/gnu/java/nio/SelectorImpl.java +++ b/libjava/classpath/gnu/java/nio/SelectorImpl.java @@ -1,4 +1,4 @@ -/* SelectorImpl.java -- +/* SelectorImpl.java -- Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,12 +62,12 @@ public class SelectorImpl extends AbstractSelector * selectThread and unhandledWakeup fields. */ private Object selectThreadMutex = new Object (); - + /** * Any thread that's currently blocked in a select operation. */ private Thread selectThread; - + /** * Indicates whether we have an unhandled wakeup call. This can * be due to either wakeup() triggering a thread interruption while @@ -82,7 +82,7 @@ public class SelectorImpl extends AbstractSelector public SelectorImpl (SelectorProvider provider) { super (provider); - + keys = new HashSet (); selected = new HashSet (); } @@ -97,7 +97,7 @@ public class SelectorImpl extends AbstractSelector { // Cancel any pending select operation. wakeup(); - + synchronized (keys) { synchronized (selected) @@ -117,7 +117,7 @@ public class SelectorImpl extends AbstractSelector return Collections.unmodifiableSet (keys); } - + public final int selectNow() throws IOException { @@ -174,7 +174,7 @@ public class SelectorImpl extends AbstractSelector { if (!isOpen()) throw new ClosedSelectorException(); - + synchronized (keys) { synchronized (selected) @@ -199,7 +199,7 @@ public class SelectorImpl extends AbstractSelector // FIXME: Not sure from the spec at what point we should // return "immediately". Is it here or immediately upon // entry to this function? - + // NOTE: There's a possibility of another thread calling // wakeup() immediately after our thread releases // selectThreadMutex's monitor here, in which case we'll @@ -285,18 +285,18 @@ public class SelectorImpl extends AbstractSelector // Set new ready write ops for (int i = 0; i < write.length; i++) { - if (key.getNativeFD() == write[i]) - { - if (key.channel() instanceof SocketChannel) - { - if (((SocketChannel) key.channel ()).isConnected ()) - ops = ops | SelectionKey.OP_WRITE; - else - ops = ops | SelectionKey.OP_CONNECT; - } - else - ops = ops | SelectionKey.OP_WRITE; - } + if (key.getNativeFD() == write[i]) + { + if (key.channel() instanceof SocketChannel) + { + if (((SocketChannel) key.channel ()).isConnected ()) + ops = ops | SelectionKey.OP_WRITE; + else + ops = ops | SelectionKey.OP_CONNECT; + } + else + ops = ops | SelectionKey.OP_WRITE; + } } // FIXME: We dont handle exceptional file descriptors yet. @@ -311,12 +311,12 @@ public class SelectorImpl extends AbstractSelector key.readyOps (key.interestOps () & ops); } deregisterCancelledKeys(); - + return result; } } } - + public final Set selectedKeys() { if (!isOpen()) @@ -332,19 +332,19 @@ public class SelectorImpl extends AbstractSelector // do the reverse under the covers: wakeup triggers a thread // interrupt followed by a subsequent reset of the thread's // interrupt status within select(). - + // First, acquire the monitor of the object regulating // access to our selectThread and unhandledWakeup fields. synchronized (selectThreadMutex) { unhandledWakeup = true; - + // Interrupt any thread which is currently blocked in // a select operation. if (selectThread != null) selectThread.interrupt (); } - + return this; } @@ -372,7 +372,7 @@ public class SelectorImpl extends AbstractSelector Object att) { SelectionKeyImpl result; - + if (ch instanceof SocketChannelImpl) result = new SocketChannelSelectionKey (ch, this); else if (ch instanceof DatagramChannelImpl) @@ -388,8 +388,8 @@ public class SelectorImpl extends AbstractSelector { keys.add (result); - result.interestOps (ops); - result.attach (att); + result.interestOps (ops); + result.attach (att); } return result; diff --git a/libjava/classpath/gnu/java/nio/SelectorProviderImpl.java b/libjava/classpath/gnu/java/nio/SelectorProviderImpl.java index 0c509b985ff..a205bbd61b6 100644 --- a/libjava/classpath/gnu/java/nio/SelectorProviderImpl.java +++ b/libjava/classpath/gnu/java/nio/SelectorProviderImpl.java @@ -1,4 +1,4 @@ -/* SelectorProviderImpl.java -- +/* SelectorProviderImpl.java -- Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,7 +54,7 @@ public class SelectorProviderImpl extends SelectorProvider private static final String SELECTOR_IMPL_EPOLL = "epoll"; private static final String SELECTOR_IMPL = "gnu.java.nio.selectorImpl"; private static boolean epoll_failed = false; - + public SelectorProviderImpl () { } @@ -70,7 +70,7 @@ public class SelectorProviderImpl extends SelectorProvider { return new PipeImpl (this); } - + public AbstractSelector openSelector () throws IOException { diff --git a/libjava/classpath/gnu/java/nio/ServerSocketChannelImpl.java b/libjava/classpath/gnu/java/nio/ServerSocketChannelImpl.java index 0128661e5b8..567fc90c706 100644 --- a/libjava/classpath/gnu/java/nio/ServerSocketChannelImpl.java +++ b/libjava/classpath/gnu/java/nio/ServerSocketChannelImpl.java @@ -1,4 +1,4 @@ -/* ServerSocketChannelImpl.java -- +/* ServerSocketChannelImpl.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,7 +97,7 @@ public final class ServerSocketChannelImpl extends ServerSocketChannel throw new NotYetBoundException(); boolean completed = false; - + try { begin(); @@ -120,7 +120,7 @@ public final class ServerSocketChannelImpl extends ServerSocketChannel { return serverSocket; } - + public VMChannel getVMChannel() { return channel; diff --git a/libjava/classpath/gnu/java/nio/ServerSocketChannelSelectionKey.java b/libjava/classpath/gnu/java/nio/ServerSocketChannelSelectionKey.java index 5b510cb6f4d..a4b2891a26e 100644 --- a/libjava/classpath/gnu/java/nio/ServerSocketChannelSelectionKey.java +++ b/libjava/classpath/gnu/java/nio/ServerSocketChannelSelectionKey.java @@ -1,4 +1,4 @@ -/* ServerSocketChannelSelectionKey.java -- +/* ServerSocketChannelSelectionKey.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/nio/SocketChannelImpl.java b/libjava/classpath/gnu/java/nio/SocketChannelImpl.java index 9564592e0cf..0bb378c648c 100644 --- a/libjava/classpath/gnu/java/nio/SocketChannelImpl.java +++ b/libjava/classpath/gnu/java/nio/SocketChannelImpl.java @@ -1,4 +1,4 @@ -/* SocketChannelImpl.java -- +/* SocketChannelImpl.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,7 +62,7 @@ public final class SocketChannelImpl extends SocketChannel private boolean connectionPending; private boolean connected; private InetSocketAddress connectAddress; - + public SocketChannelImpl(boolean create) throws IOException { // XXX consider adding security check; this is used by @@ -74,7 +74,7 @@ public final class SocketChannelImpl extends SocketChannel { this(new SelectorProviderImpl(), channel, false); } - + SocketChannelImpl(SelectorProvider provider) throws IOException { this(provider, true); @@ -85,7 +85,7 @@ public final class SocketChannelImpl extends SocketChannel { this(provider, new VMChannel(), create); } - + SocketChannelImpl(SelectorProvider provider, VMChannel channel, boolean create) throws IOException { @@ -96,7 +96,7 @@ public final class SocketChannelImpl extends SocketChannel socket = new NIOSocket(this); configureBlocking(true); } - + /*SocketChannelImpl (SelectorProvider provider, NIOSocket socket) throws IOException @@ -133,18 +133,18 @@ public final class SocketChannelImpl extends SocketChannel protected void implConfigureBlocking (boolean blocking) throws IOException { channel.setBlocking(blocking); - } + } public boolean connect (SocketAddress remote) throws IOException { return connect(remote, 0); } - + public boolean connect (SocketAddress remote, int timeout) throws IOException { if (!isOpen()) throw new ClosedChannelException(); - + if (isConnected()) throw new AlreadyConnectedException(); @@ -153,12 +153,12 @@ public final class SocketChannelImpl extends SocketChannel if (!(remote instanceof InetSocketAddress)) throw new UnsupportedAddressTypeException(); - + connectAddress = (InetSocketAddress) remote; if (connectAddress.isUnresolved()) throw new UnresolvedAddressException(); - + connected = channel.connect(connectAddress, timeout); connectionPending = !connected; return connected; @@ -176,10 +176,10 @@ public final class SocketChannelImpl extends SocketChannel connectionPending = false; return true; } - + if (!connectionPending) throw new NoConnectionPendingException(); - + return false; } @@ -200,12 +200,12 @@ public final class SocketChannelImpl extends SocketChannel return false; } } - + public boolean isConnectionPending () { return connectionPending; } - + public Socket socket () { return socket; @@ -215,25 +215,25 @@ public final class SocketChannelImpl extends SocketChannel { if (!isConnected()) throw new NotYetConnectedException(); - + return channel.read(dst); } - + public long read (ByteBuffer[] dsts, int offset, int length) throws IOException { if (!isConnected()) throw new NotYetConnectedException(); - + if ((offset < 0) || (offset > dsts.length) || (length < 0) || (length > (dsts.length - offset))) throw new IndexOutOfBoundsException(); - + return channel.readScattering(dsts, offset, length); } - + public int write(ByteBuffer src) throws IOException { if (!isConnected()) @@ -247,7 +247,7 @@ public final class SocketChannelImpl extends SocketChannel { if (!isConnected()) throw new NotYetConnectedException(); - + if ((offset < 0) || (offset > srcs.length) || (length < 0) @@ -256,7 +256,7 @@ public final class SocketChannelImpl extends SocketChannel return channel.writeGathering(srcs, offset, length); } - + public VMChannel getVMChannel() { // XXX security check? diff --git a/libjava/classpath/gnu/java/nio/SocketChannelSelectionKey.java b/libjava/classpath/gnu/java/nio/SocketChannelSelectionKey.java index 9ceebdec90f..1003689951c 100644 --- a/libjava/classpath/gnu/java/nio/SocketChannelSelectionKey.java +++ b/libjava/classpath/gnu/java/nio/SocketChannelSelectionKey.java @@ -1,4 +1,4 @@ -/* SocketChannelSelectionKey.java -- +/* SocketChannelSelectionKey.java -- Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ public final class SocketChannelSelectionKey { super (channel, selector); } - + // FIXME don't use file descriptor integers public int getNativeFD() { diff --git a/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java b/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java index 7557e28c444..786aa361ead 100644 --- a/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java +++ b/libjava/classpath/gnu/java/nio/SocketChannelSelectionKeyImpl.java @@ -49,7 +49,7 @@ public class SocketChannelSelectionKeyImpl extends SelectionKeyImpl { SocketChannelImpl ch; - + /** * @param ch * @param impl diff --git a/libjava/classpath/gnu/java/nio/VMChannelOwner.java b/libjava/classpath/gnu/java/nio/VMChannelOwner.java index 363dea2b214..87cbc1e943e 100644 --- a/libjava/classpath/gnu/java/nio/VMChannelOwner.java +++ b/libjava/classpath/gnu/java/nio/VMChannelOwner.java @@ -50,7 +50,7 @@ interface VMChannelOwner { /** * Return the underlying platform-specific Channel instance. - * + * * @return The platform channel object. */ VMChannel getVMChannel(); diff --git a/libjava/classpath/gnu/java/nio/charset/ByteCharset.java b/libjava/classpath/gnu/java/nio/charset/ByteCharset.java index 043c804b7e4..60d06fc4bc8 100644 --- a/libjava/classpath/gnu/java/nio/charset/ByteCharset.java +++ b/libjava/classpath/gnu/java/nio/charset/ByteCharset.java @@ -47,10 +47,10 @@ import java.nio.charset.CoderResult; /** * A generic encoding framework for single-byte encodings, utilizing a look-up * table. - * + * * This replaces the gnu.java.io.EncoderEightBitLookup class, created by Aron * Renn. - * + * * @author Sven de Marothy * @modified Ian Rogers */ @@ -96,7 +96,7 @@ abstract class ByteCharset extends Charset { /** Lookup of byte to char mappings */ private final char[] lookup; - + /** Helper to decode loops */ private final ByteDecodeLoopHelper helper = new ByteDecodeLoopHelper() { @@ -109,7 +109,7 @@ abstract class ByteCharset extends Charset return lookup[(int) (b & 0xFF)]; } }; - + // Package-private to avoid a trampoline constructor. Decoder(ByteCharset cs) { @@ -127,7 +127,7 @@ abstract class ByteCharset extends Charset { /** Lookup of char to byte mappings */ private final byte[] lookup; - + /** Helper to encode loops */ private final ByteEncodeLoopHelper helper = new ByteEncodeLoopHelper() { @@ -140,7 +140,7 @@ abstract class ByteCharset extends Charset return lookup[c]; } }; - + // Package-private to avoid a trampoline constructor. Encoder(ByteCharset cs) { diff --git a/libjava/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java b/libjava/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java index a1eb5e2067b..76dc2091302 100644 --- a/libjava/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java +++ b/libjava/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java @@ -43,7 +43,7 @@ import java.nio.charset.CoderResult; /** * Helper class to deal with decoding loops that read a byte at a time - * + * * @author Ian Rogers */ public abstract class ByteDecodeLoopHelper @@ -61,7 +61,7 @@ public abstract class ByteDecodeLoopHelper /** * Encodes one or more characters into one or more bytes, mapping each * character to only one byte - * + * * @param in character buffer to read from * @param out byte buffer to write to * @return the result state of the encoder @@ -120,7 +120,7 @@ public abstract class ByteDecodeLoopHelper int outRemaining = out.remaining(); CoderResult result; - bailOut: + bailOut: if (inRemaining <= outRemaining) { for (int i = 0; i < inRemaining; i++) @@ -131,7 +131,7 @@ public abstract class ByteDecodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break bailOut; + break bailOut; } char c = mapToChar(b); outArray[outPos] = c; @@ -149,7 +149,7 @@ public abstract class ByteDecodeLoopHelper { inPos--; result = CoderResult.unmappableForLength(1); - break bailOut; + break bailOut; } char c = mapToChar(b); outArray[outPos] = c; diff --git a/libjava/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java b/libjava/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java index b1a4f10da92..60e6d9bb0ef 100644 --- a/libjava/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java +++ b/libjava/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java @@ -43,7 +43,7 @@ import java.nio.charset.CoderResult; /** * Helper class to deal with encoding loops that write a byte at a time - * + * * @author Ian Rogers */ public abstract class ByteEncodeLoopHelper @@ -62,7 +62,7 @@ public abstract class ByteEncodeLoopHelper /** * Encodes one or more characters into one or more bytes, mapping each * character to only one byte - * + * * @param in character buffer to read from * @param out byte buffer to write to * @return the result state of the encoder @@ -121,7 +121,7 @@ public abstract class ByteEncodeLoopHelper int outRemaining = out.remaining(); CoderResult result; - bailOut: + bailOut: if (inRemaining <= outRemaining) { for (int i = 0; i < inRemaining; i++) diff --git a/libjava/classpath/gnu/java/nio/charset/Cp424.java b/libjava/classpath/gnu/java/nio/charset/Cp424.java index 44e1eba4f6a..14915bf4715 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp424.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp424.java @@ -45,38 +45,38 @@ public final class Cp424 extends ByteCharset */ private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x009C, 0x0009, 0x0086, 0x007F, - 0x0097, 0x008D, 0x008E, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x009D, 0x0085, 0x0008, 0x0087, - 0x0018, 0x0019, 0x0092, 0x008F, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x000A, 0x0017, 0x001B, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x0005, 0x0006, 0x0007, - 0x0090, 0x0091, 0x0016, 0x0093, 0x0094, 0x0095, 0x0096, 0x0004, - 0x0098, 0x0099, 0x009A, 0x009B, 0x0014, 0x0015, 0x009E, 0x001A, - 0x0020, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, - 0x05D7, 0x05D8, 0x00A2, 0x002E, 0x003C, 0x0028, 0x002B, 0x007C, - 0x0026, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x0021, 0x0024, 0x002A, 0x0029, 0x003B, 0x00AC, - 0x002D, 0x002F, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x00A6, 0x002C, 0x0025, 0x005F, 0x003E, 0x003F, - NONE, 0x05EA, NONE, NONE, 0x00A0, NONE, NONE, NONE, - 0x2017, 0x0060, 0x003A, 0x0023, 0x0040, 0x0027, 0x003D, 0x0022, - NONE, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x00AB, 0x00BB, NONE, NONE, NONE, 0x00B1, - 0x00B0, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, - 0x0071, 0x0072, NONE, NONE, NONE, 0x00B8, NONE, 0x00A4, - 0x00B5, 0x007E, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, - 0x0079, 0x007A, NONE, NONE, NONE, NONE, NONE, 0x00AE, - 0x005E, 0x00A3, 0x00A5, 0x00B7, 0x00A9, 0x00A7, 0x00B6, 0x00BC, - 0x00BD, 0x00BE, 0x005B, 0x005D, 0x00AF, 0x00A8, 0x00B4, 0x00D7, - 0x007B, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x00AD, NONE, NONE, NONE, NONE, NONE, - 0x007D, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, - 0x0051, 0x0052, 0x00B9, NONE, NONE, NONE, NONE, NONE, - 0x005C, 0x00F7, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, - 0x0059, 0x005A, 0x00B2, NONE, NONE, NONE, NONE, NONE, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x00B3, NONE, NONE, NONE, NONE, 0x009F + 0x0000, 0x0001, 0x0002, 0x0003, 0x009C, 0x0009, 0x0086, 0x007F, + 0x0097, 0x008D, 0x008E, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x009D, 0x0085, 0x0008, 0x0087, + 0x0018, 0x0019, 0x0092, 0x008F, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x000A, 0x0017, 0x001B, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x0005, 0x0006, 0x0007, + 0x0090, 0x0091, 0x0016, 0x0093, 0x0094, 0x0095, 0x0096, 0x0004, + 0x0098, 0x0099, 0x009A, 0x009B, 0x0014, 0x0015, 0x009E, 0x001A, + 0x0020, 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, + 0x05D7, 0x05D8, 0x00A2, 0x002E, 0x003C, 0x0028, 0x002B, 0x007C, + 0x0026, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, + 0x05E0, 0x05E1, 0x0021, 0x0024, 0x002A, 0x0029, 0x003B, 0x00AC, + 0x002D, 0x002F, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, + 0x05E8, 0x05E9, 0x00A6, 0x002C, 0x0025, 0x005F, 0x003E, 0x003F, + NONE, 0x05EA, NONE, NONE, 0x00A0, NONE, NONE, NONE, + 0x2017, 0x0060, 0x003A, 0x0023, 0x0040, 0x0027, 0x003D, 0x0022, + NONE, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x00AB, 0x00BB, NONE, NONE, NONE, 0x00B1, + 0x00B0, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, 0x0070, + 0x0071, 0x0072, NONE, NONE, NONE, 0x00B8, NONE, 0x00A4, + 0x00B5, 0x007E, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, + 0x0079, 0x007A, NONE, NONE, NONE, NONE, NONE, 0x00AE, + 0x005E, 0x00A3, 0x00A5, 0x00B7, 0x00A9, 0x00A7, 0x00B6, 0x00BC, + 0x00BD, 0x00BE, 0x005B, 0x005D, 0x00AF, 0x00A8, 0x00B4, 0x00D7, + 0x007B, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x00AD, NONE, NONE, NONE, NONE, NONE, + 0x007D, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, + 0x0051, 0x0052, 0x00B9, NONE, NONE, NONE, NONE, NONE, + 0x005C, 0x00F7, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, + 0x0059, 0x005A, 0x00B2, NONE, NONE, NONE, NONE, NONE, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x00B3, NONE, NONE, NONE, NONE, 0x009F }; public Cp424() { diff --git a/libjava/classpath/gnu/java/nio/charset/Cp437.java b/libjava/classpath/gnu/java/nio/charset/Cp437.java index e38a482573a..f60c3add2f1 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp437.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp437.java @@ -43,40 +43,40 @@ public final class Cp437 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, - 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, - 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp437() diff --git a/libjava/classpath/gnu/java/nio/charset/Cp737.java b/libjava/classpath/gnu/java/nio/charset/Cp737.java index 2187987ead7..5dbd4a463f2 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp737.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp737.java @@ -43,45 +43,45 @@ public final class Cp737 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, - 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, - 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, - 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, - 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, - 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD, - 0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E, - 0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, + 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, + 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, + 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, + 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 0x03C0, + 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03C9, 0x03AC, 0x03AD, 0x03AE, 0x03CA, 0x03AF, 0x03CC, 0x03CD, + 0x03CB, 0x03CE, 0x0386, 0x0388, 0x0389, 0x038A, 0x038C, 0x038E, + 0x038F, 0x00B1, 0x2265, 0x2264, 0x03AA, 0x03AB, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp737() { - super("Cp737", new String[] {}, lookup); + super("Cp737", new String[] {}, lookup); } } // class Cp737 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp775.java b/libjava/classpath/gnu/java/nio/charset/Cp775.java index f2fba4356e3..ba3128e304e 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp775.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp775.java @@ -43,45 +43,45 @@ public final class Cp775 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107, - 0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A, - 0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4, - 0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6, - 0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118, - 0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D, - 0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B, - 0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144, - 0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019, - 0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E, - 0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0106, 0x00FC, 0x00E9, 0x0101, 0x00E4, 0x0123, 0x00E5, 0x0107, + 0x0142, 0x0113, 0x0156, 0x0157, 0x012B, 0x0179, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x014D, 0x00F6, 0x0122, 0x00A2, 0x015A, + 0x015B, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x00A4, + 0x0100, 0x012A, 0x00F3, 0x017B, 0x017C, 0x017A, 0x201D, 0x00A6, + 0x00A9, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x0141, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0104, 0x010C, 0x0118, + 0x0116, 0x2563, 0x2551, 0x2557, 0x255D, 0x012E, 0x0160, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0172, 0x016A, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x017D, + 0x0105, 0x010D, 0x0119, 0x0117, 0x012F, 0x0161, 0x0173, 0x016B, + 0x017E, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x00D3, 0x00DF, 0x014C, 0x0143, 0x00F5, 0x00D5, 0x00B5, 0x0144, + 0x0136, 0x0137, 0x013B, 0x013C, 0x0146, 0x0112, 0x0145, 0x2019, + 0x00AD, 0x00B1, 0x201C, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x201E, + 0x00B0, 0x2219, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; public Cp775() { - super("Cp775", new String[] {}, lookup); + super("Cp775", new String[] {}, lookup); } } // class Cp775 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp850.java b/libjava/classpath/gnu/java/nio/charset/Cp850.java index 48d4fb3448a..fef46899474 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp850.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp850.java @@ -43,45 +43,45 @@ public final class Cp850 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, - 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, - 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, - 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, - 0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE, - 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580, - 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, - 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, - 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, - 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x00D7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, + 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, + 0x00F0, 0x00D0, 0x00CA, 0x00CB, 0x00C8, 0x0131, 0x00CD, 0x00CE, + 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580, + 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, 0x00FE, + 0x00DE, 0x00DA, 0x00DB, 0x00D9, 0x00FD, 0x00DD, 0x00AF, 0x00B4, + 0x00AD, 0x00B1, 0x2017, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, + 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; public Cp850() { - super("Cp850", new String[] {}, lookup); + super("Cp850", new String[] {}, lookup); } } // class Cp850 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp852.java b/libjava/classpath/gnu/java/nio/charset/Cp852.java index c550944b526..eea99610d35 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp852.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp852.java @@ -43,45 +43,45 @@ public final class Cp852 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7, - 0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106, - 0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A, - 0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E, - 0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A, - 0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, - 0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE, - 0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580, - 0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161, - 0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4, - 0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8, - 0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x016F, 0x0107, 0x00E7, + 0x0142, 0x00EB, 0x0150, 0x0151, 0x00EE, 0x0179, 0x00C4, 0x0106, + 0x00C9, 0x0139, 0x013A, 0x00F4, 0x00F6, 0x013D, 0x013E, 0x015A, + 0x015B, 0x00D6, 0x00DC, 0x0164, 0x0165, 0x0141, 0x00D7, 0x010D, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x0104, 0x0105, 0x017D, 0x017E, + 0x0118, 0x0119, 0x00AC, 0x017A, 0x010C, 0x015F, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x011A, + 0x015E, 0x2563, 0x2551, 0x2557, 0x255D, 0x017B, 0x017C, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x0102, 0x0103, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, + 0x0111, 0x0110, 0x010E, 0x00CB, 0x010F, 0x0147, 0x00CD, 0x00CE, + 0x011B, 0x2518, 0x250C, 0x2588, 0x2584, 0x0162, 0x016E, 0x2580, + 0x00D3, 0x00DF, 0x00D4, 0x0143, 0x0144, 0x0148, 0x0160, 0x0161, + 0x0154, 0x00DA, 0x0155, 0x0170, 0x00FD, 0x00DD, 0x0163, 0x00B4, + 0x00AD, 0x02DD, 0x02DB, 0x02C7, 0x02D8, 0x00A7, 0x00F7, 0x00B8, + 0x00B0, 0x00A8, 0x02D9, 0x0171, 0x0158, 0x0159, 0x25A0, 0x00A0 }; public Cp852() { - super("Cp852", new String[] {}, lookup); + super("Cp852", new String[] {}, lookup); } } // class Cp852 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp855.java b/libjava/classpath/gnu/java/nio/charset/Cp855.java index 141e891b67c..d148d32b415 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp855.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp855.java @@ -43,45 +43,45 @@ public final class Cp855 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404, - 0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408, - 0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C, - 0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A, - 0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414, - 0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438, - 0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, - 0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E, - 0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580, - 0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443, - 0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116, - 0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D, - 0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0452, 0x0402, 0x0453, 0x0403, 0x0451, 0x0401, 0x0454, 0x0404, + 0x0455, 0x0405, 0x0456, 0x0406, 0x0457, 0x0407, 0x0458, 0x0408, + 0x0459, 0x0409, 0x045A, 0x040A, 0x045B, 0x040B, 0x045C, 0x040C, + 0x045E, 0x040E, 0x045F, 0x040F, 0x044E, 0x042E, 0x044A, 0x042A, + 0x0430, 0x0410, 0x0431, 0x0411, 0x0446, 0x0426, 0x0434, 0x0414, + 0x0435, 0x0415, 0x0444, 0x0424, 0x0433, 0x0413, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x0445, 0x0425, 0x0438, + 0x0418, 0x2563, 0x2551, 0x2557, 0x255D, 0x0439, 0x0419, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x043A, 0x041A, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, + 0x043B, 0x041B, 0x043C, 0x041C, 0x043D, 0x041D, 0x043E, 0x041E, + 0x043F, 0x2518, 0x250C, 0x2588, 0x2584, 0x041F, 0x044F, 0x2580, + 0x042F, 0x0440, 0x0420, 0x0441, 0x0421, 0x0442, 0x0422, 0x0443, + 0x0423, 0x0436, 0x0416, 0x0432, 0x0412, 0x044C, 0x042C, 0x2116, + 0x00AD, 0x044B, 0x042B, 0x0437, 0x0417, 0x0448, 0x0428, 0x044D, + 0x042D, 0x0449, 0x0429, 0x0447, 0x0427, 0x00A7, 0x25A0, 0x00A0 }; public Cp855() { - super("Cp855", new String[] {"cp-855",}, lookup); + super("Cp855", new String[] {"cp-855",}, lookup); } } // class Cp855 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp857.java b/libjava/classpath/gnu/java/nio/charset/Cp857.java index b517b0393c6..0d990ec2cf0 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp857.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp857.java @@ -44,45 +44,45 @@ public final class Cp857 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, - 0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F, - 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, - 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, - 0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, NONE, 0x00CD, 0x00CE, - 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580, - 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, NONE, - 0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4, - 0x00AD, 0x00B1, NONE, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, - 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x0131, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x0130, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x015E, 0x015F, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x011E, 0x011F, + 0x00BF, 0x00AE, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x00C1, 0x00C2, 0x00C0, + 0x00A9, 0x2563, 0x2551, 0x2557, 0x255D, 0x00A2, 0x00A5, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x00E3, 0x00C3, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x00A4, + 0x00BA, 0x00AA, 0x00CA, 0x00CB, 0x00C8, NONE, 0x00CD, 0x00CE, + 0x00CF, 0x2518, 0x250C, 0x2588, 0x2584, 0x00A6, 0x00CC, 0x2580, + 0x00D3, 0x00DF, 0x00D4, 0x00D2, 0x00F5, 0x00D5, 0x00B5, NONE, + 0x00D7, 0x00DA, 0x00DB, 0x00D9, 0x00EC, 0x00FF, 0x00AF, 0x00B4, + 0x00AD, 0x00B1, NONE, 0x00BE, 0x00B6, 0x00A7, 0x00F7, 0x00B8, + 0x00B0, 0x00A8, 0x00B7, 0x00B9, 0x00B3, 0x00B2, 0x25A0, 0x00A0 }; public Cp857() { - super("Cp857", new String[] {"cp-857"}, lookup); + super("Cp857", new String[] {"cp-857"}, lookup); } } // class Cp857 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp860.java b/libjava/classpath/gnu/java/nio/charset/Cp860.java index 58a396446ad..4e15329caa1 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp860.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp860.java @@ -44,45 +44,45 @@ public final class Cp860 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E3, 0x00E0, 0x00C1, 0x00E7, - 0x00EA, 0x00CA, 0x00E8, 0x00CD, 0x00D4, 0x00EC, 0x00C3, 0x00C2, - 0x00C9, 0x00C0, 0x00C8, 0x00F4, 0x00F5, 0x00F2, 0x00DA, 0x00F9, - 0x00CC, 0x00D5, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x20A7, 0x00D3, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, - 0x00BF, 0x00D2, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E3, 0x00E0, 0x00C1, 0x00E7, + 0x00EA, 0x00CA, 0x00E8, 0x00CD, 0x00D4, 0x00EC, 0x00C3, 0x00C2, + 0x00C9, 0x00C0, 0x00C8, 0x00F4, 0x00F5, 0x00F2, 0x00DA, 0x00F9, + 0x00CC, 0x00D5, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x20A7, 0x00D3, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x00D2, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp860() { - super("Cp860", new String[] {"cp-860"}, lookup); + super("Cp860", new String[] {"cp-860"}, lookup); } } // class Cp860 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp861.java b/libjava/classpath/gnu/java/nio/charset/Cp861.java index cf5210d0a2a..e5a103f67c6 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp861.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp861.java @@ -44,45 +44,45 @@ public final class Cp861 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00D0, 0x00F0, 0x00DE, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00FE, 0x00FB, 0x00DD, - 0x00FD, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00C1, 0x00CD, 0x00D3, 0x00DA, - 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00D0, 0x00F0, 0x00DE, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00FE, 0x00FB, 0x00DD, + 0x00FD, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00C1, 0x00CD, 0x00D3, 0x00DA, + 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp861() { - super("Cp861", new String[] {"cp-861"}, lookup); + super("Cp861", new String[] {"cp-861"}, lookup); } } // class Cp861 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp862.java b/libjava/classpath/gnu/java/nio/charset/Cp862.java index f66118021a3..8733574337a 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp862.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp862.java @@ -44,45 +44,45 @@ public final class Cp862 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, - 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, - 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, + 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, + 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, + 0x05E8, 0x05E9, 0x05EA, 0x00A2, 0x00A3, 0x00A5, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp862() { - super("Cp862", new String[] {"Cp-862"}, lookup); + super("Cp862", new String[] {"Cp-862"}, lookup); } } // class Cp862 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp863.java b/libjava/classpath/gnu/java/nio/charset/Cp863.java index 03850234ef6..3a86f3e2dec 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp863.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp863.java @@ -44,45 +44,45 @@ public final class Cp863 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00C2, 0x00E0, 0x00B6, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x2017, 0x00C0, 0x00A7, - 0x00C9, 0x00C8, 0x00CA, 0x00F4, 0x00CB, 0x00CF, 0x00FB, 0x00F9, - 0x00A4, 0x00D4, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x00DB, 0x0192, - 0x00A6, 0x00B4, 0x00F3, 0x00FA, 0x00A8, 0x00B8, 0x00B3, 0x00AF, - 0x00CE, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00BE, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00C2, 0x00E0, 0x00B6, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x2017, 0x00C0, 0x00A7, + 0x00C9, 0x00C8, 0x00CA, 0x00F4, 0x00CB, 0x00CF, 0x00FB, 0x00F9, + 0x00A4, 0x00D4, 0x00DC, 0x00A2, 0x00A3, 0x00D9, 0x00DB, 0x0192, + 0x00A6, 0x00B4, 0x00F3, 0x00FA, 0x00A8, 0x00B8, 0x00B3, 0x00AF, + 0x00CE, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00BE, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp863() { - super("Cp863", new String[] {"Cp-863"}, lookup); + super("Cp863", new String[] {"Cp-863"}, lookup); } } // class Cp863 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp864.java b/libjava/classpath/gnu/java/nio/charset/Cp864.java index 028235dd30c..990e3723d0e 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp864.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp864.java @@ -44,45 +44,45 @@ public final class Cp864 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x066A, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00B0, 0x00B7, 0x2219, 0x221A, 0x2592, 0x2500, 0x2502, 0x253C, - 0x2524, 0x252C, 0x251C, 0x2534, 0x2510, 0x250C, 0x2514, 0x2518, - 0x03B2, 0x221E, 0x03C6, 0x00B1, 0x00BD, 0x00BC, 0x2248, 0x00AB, - 0x00BB, 0xFEF7, 0xFEF8, NONE, NONE, 0xFEFB, 0xFEFC, NONE, - 0x00A0, 0x00AD, 0xFE82, 0x00A3, 0x00A4, 0xFE84, NONE, NONE, - 0xFE8E, 0xFE8F, 0xFE95, 0xFE99, 0x060C, 0xFE9D, 0xFEA1, 0xFEA5, - 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, - 0x0668, 0x0669, 0xFED1, 0x061B, 0xFEB1, 0xFEB5, 0xFEB9, 0x061F, - 0x00A2, 0xFE80, 0xFE81, 0xFE83, 0xFE85, 0xFECA, 0xFE8B, 0xFE8D, - 0xFE91, 0xFE93, 0xFE97, 0xFE9B, 0xFE9F, 0xFEA3, 0xFEA7, 0xFEA9, - 0xFEAB, 0xFEAD, 0xFEAF, 0xFEB3, 0xFEB7, 0xFEBB, 0xFEBF, 0xFEC1, - 0xFEC5, 0xFECB, 0xFECF, 0x00A6, 0x00AC, 0x00F7, 0x00D7, 0xFEC9, - 0x0640, 0xFED3, 0xFED7, 0xFEDB, 0xFEDF, 0xFEE3, 0xFEE7, 0xFEEB, - 0xFEED, 0xFEEF, 0xFEF3, 0xFEBD, 0xFECC, 0xFECE, 0xFECD, 0xFEE1, - 0xFE7D, 0x0651, 0xFEE5, 0xFEE9, 0xFEEC, 0xFEF0, 0xFEF2, 0xFED0, - 0xFED5, 0xFEF5, 0xFEF6, 0xFEDD, 0xFED9, 0xFEF1, 0x25A0, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x066A, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00B0, 0x00B7, 0x2219, 0x221A, 0x2592, 0x2500, 0x2502, 0x253C, + 0x2524, 0x252C, 0x251C, 0x2534, 0x2510, 0x250C, 0x2514, 0x2518, + 0x03B2, 0x221E, 0x03C6, 0x00B1, 0x00BD, 0x00BC, 0x2248, 0x00AB, + 0x00BB, 0xFEF7, 0xFEF8, NONE, NONE, 0xFEFB, 0xFEFC, NONE, + 0x00A0, 0x00AD, 0xFE82, 0x00A3, 0x00A4, 0xFE84, NONE, NONE, + 0xFE8E, 0xFE8F, 0xFE95, 0xFE99, 0x060C, 0xFE9D, 0xFEA1, 0xFEA5, + 0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, + 0x0668, 0x0669, 0xFED1, 0x061B, 0xFEB1, 0xFEB5, 0xFEB9, 0x061F, + 0x00A2, 0xFE80, 0xFE81, 0xFE83, 0xFE85, 0xFECA, 0xFE8B, 0xFE8D, + 0xFE91, 0xFE93, 0xFE97, 0xFE9B, 0xFE9F, 0xFEA3, 0xFEA7, 0xFEA9, + 0xFEAB, 0xFEAD, 0xFEAF, 0xFEB3, 0xFEB7, 0xFEBB, 0xFEBF, 0xFEC1, + 0xFEC5, 0xFECB, 0xFECF, 0x00A6, 0x00AC, 0x00F7, 0x00D7, 0xFEC9, + 0x0640, 0xFED3, 0xFED7, 0xFEDB, 0xFEDF, 0xFEE3, 0xFEE7, 0xFEEB, + 0xFEED, 0xFEEF, 0xFEF3, 0xFEBD, 0xFECC, 0xFECE, 0xFECD, 0xFEE1, + 0xFE7D, 0x0651, 0xFEE5, 0xFEE9, 0xFEEC, 0xFEF0, 0xFEF2, 0xFED0, + 0xFED5, 0xFEF5, 0xFEF6, 0xFEDD, 0xFED9, 0xFEF1, 0x25A0, NONE }; public Cp864() { - super("Cp864", new String[] {"Cp-864"}, lookup); + super("Cp864", new String[] {"Cp-864"}, lookup); } } // class Cp864 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp865.java b/libjava/classpath/gnu/java/nio/charset/Cp865.java index c723e80c995..a708a856069 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp865.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp865.java @@ -44,45 +44,45 @@ public final class Cp865 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, - 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, - 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, - 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192, - 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, - 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00A4, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, - 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, - 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7, + 0x00EA, 0x00EB, 0x00E8, 0x00EF, 0x00EE, 0x00EC, 0x00C4, 0x00C5, + 0x00C9, 0x00E6, 0x00C6, 0x00F4, 0x00F6, 0x00F2, 0x00FB, 0x00F9, + 0x00FF, 0x00D6, 0x00DC, 0x00F8, 0x00A3, 0x00D8, 0x20A7, 0x0192, + 0x00E1, 0x00ED, 0x00F3, 0x00FA, 0x00F1, 0x00D1, 0x00AA, 0x00BA, + 0x00BF, 0x2310, 0x00AC, 0x00BD, 0x00BC, 0x00A1, 0x00AB, 0x00A4, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x03B1, 0x00DF, 0x0393, 0x03C0, 0x03A3, 0x03C3, 0x00B5, 0x03C4, + 0x03A6, 0x0398, 0x03A9, 0x03B4, 0x221E, 0x03C6, 0x03B5, 0x2229, + 0x2261, 0x00B1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00F7, 0x2248, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0 }; public Cp865() { - super("Cp865", new String[] {"Cp-865"}, lookup); + super("Cp865", new String[] {"Cp-865"}, lookup); } } // class Cp865 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp866.java b/libjava/classpath/gnu/java/nio/charset/Cp866.java index 103bca7c30a..0f3c23044ed 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp866.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp866.java @@ -44,45 +44,45 @@ public final class Cp866 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, - 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, - 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, - 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E, - 0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, + 0x2555, 0x2563, 0x2551, 0x2557, 0x255D, 0x255C, 0x255B, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x255E, 0x255F, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x2567, + 0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256B, + 0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, + 0x0401, 0x0451, 0x0404, 0x0454, 0x0407, 0x0457, 0x040E, 0x045E, + 0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0 }; public Cp866() { - super("Cp866", new String[] {"cp-866"}, lookup); + super("Cp866", new String[] {"cp-866"}, lookup); } } // class Cp866 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp869.java b/libjava/classpath/gnu/java/nio/charset/Cp869.java index 0632b37418c..091e2e7b4a4 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp869.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp869.java @@ -44,45 +44,45 @@ public final class Cp869 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - NONE, NONE, NONE, NONE, NONE, NONE, 0x0386, NONE, - 0x00B7, 0x00AC, 0x00A6, 0x2018, 0x2019, 0x0388, 0x2015, 0x0389, - 0x038A, 0x03AA, 0x038C, NONE, NONE, 0x038E, 0x03AB, 0x00A9, - 0x038F, 0x00B2, 0x00B3, 0x03AC, 0x00A3, 0x03AD, 0x03AE, 0x03AF, - 0x03CA, 0x0390, 0x03CC, 0x03CD, 0x0391, 0x0392, 0x0393, 0x0394, - 0x0395, 0x0396, 0x0397, 0x00BD, 0x0398, 0x0399, 0x00AB, 0x00BB, - 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x039A, 0x039B, 0x039C, - 0x039D, 0x2563, 0x2551, 0x2557, 0x255D, 0x039E, 0x039F, 0x2510, - 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x03A0, 0x03A1, - 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x03A3, - 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03B1, 0x03B2, - 0x03B3, 0x2518, 0x250C, 0x2588, 0x2584, 0x03B4, 0x03B5, 0x2580, - 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, - 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x0384, - 0x00AD, 0x00B1, 0x03C5, 0x03C6, 0x03C7, 0x00A7, 0x03C8, 0x0385, - 0x00B0, 0x00A8, 0x03C9, 0x03CB, 0x03B0, 0x03CE, 0x25A0, 0x00A0 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + NONE, NONE, NONE, NONE, NONE, NONE, 0x0386, NONE, + 0x00B7, 0x00AC, 0x00A6, 0x2018, 0x2019, 0x0388, 0x2015, 0x0389, + 0x038A, 0x03AA, 0x038C, NONE, NONE, 0x038E, 0x03AB, 0x00A9, + 0x038F, 0x00B2, 0x00B3, 0x03AC, 0x00A3, 0x03AD, 0x03AE, 0x03AF, + 0x03CA, 0x0390, 0x03CC, 0x03CD, 0x0391, 0x0392, 0x0393, 0x0394, + 0x0395, 0x0396, 0x0397, 0x00BD, 0x0398, 0x0399, 0x00AB, 0x00BB, + 0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x039A, 0x039B, 0x039C, + 0x039D, 0x2563, 0x2551, 0x2557, 0x255D, 0x039E, 0x039F, 0x2510, + 0x2514, 0x2534, 0x252C, 0x251C, 0x2500, 0x253C, 0x03A0, 0x03A1, + 0x255A, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256C, 0x03A3, + 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03B1, 0x03B2, + 0x03B3, 0x2518, 0x250C, 0x2588, 0x2584, 0x03B4, 0x03B5, 0x2580, + 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, + 0x03BE, 0x03BF, 0x03C0, 0x03C1, 0x03C3, 0x03C2, 0x03C4, 0x0384, + 0x00AD, 0x00B1, 0x03C5, 0x03C6, 0x03C7, 0x00A7, 0x03C8, 0x0385, + 0x00B0, 0x00A8, 0x03C9, 0x03CB, 0x03B0, 0x03CE, 0x25A0, 0x00A0 }; public Cp869() { - super("Cp869", new String[] {"Cp-869"}, lookup); + super("Cp869", new String[] {"Cp-869"}, lookup); } } // class Cp869 diff --git a/libjava/classpath/gnu/java/nio/charset/Cp874.java b/libjava/classpath/gnu/java/nio/charset/Cp874.java index f6e52c485ea..d399c723ce3 100644 --- a/libjava/classpath/gnu/java/nio/charset/Cp874.java +++ b/libjava/classpath/gnu/java/nio/charset/Cp874.java @@ -43,45 +43,45 @@ public final class Cp874 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, NONE, NONE, NONE, 0x2026, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, - 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, - 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, - 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, - 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, - 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, - 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, - 0x0E38, 0x0E39, 0x0E3A, NONE, NONE, NONE, NONE, 0x0E3F, - 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, - 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, - 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, - 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, NONE, NONE, NONE, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, NONE, NONE, NONE, 0x2026, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, + 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, + 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, + 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, + 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, + 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, + 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, + 0x0E38, 0x0E39, 0x0E3A, NONE, NONE, NONE, NONE, 0x0E3F, + 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, + 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, + 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, + 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, NONE, NONE, NONE, NONE }; public Cp874() { - super("Cp874", new String[] {}, lookup); + super("Cp874", new String[] {}, lookup); } } // class Cp874 diff --git a/libjava/classpath/gnu/java/nio/charset/EncodingHelper.java b/libjava/classpath/gnu/java/nio/charset/EncodingHelper.java index 479b6e53434..f99818551d1 100644 --- a/libjava/classpath/gnu/java/nio/charset/EncodingHelper.java +++ b/libjava/classpath/gnu/java/nio/charset/EncodingHelper.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.nio.charset.Charset; import java.io.UnsupportedEncodingException; /** - * This class provides some useful utility methods + * This class provides some useful utility methods * for charset encoding for the java.lang and java.io methods. * * @author Sven de Marothy @@ -54,95 +54,95 @@ public class EncodingHelper { /** - * Contains the mapping from java.io canonical names + * Contains the mapping from java.io canonical names * to java.nio canonical names. */ private static final HashMap canonicalNames; static { - canonicalNames = new HashMap(); - canonicalNames.put("US-ASCII", "ASCII"); - canonicalNames.put("windows-1250", "Cp1250"); - canonicalNames.put("windows-1251", "Cp1251"); - canonicalNames.put("windows-1252", "Cp1252"); - canonicalNames.put("windows-1253", "Cp1253"); - canonicalNames.put("windows-1254", "Cp1254"); - canonicalNames.put("windows-1257", "Cp1257"); - canonicalNames.put("ISO-8859-1", "ISO8859_1"); - canonicalNames.put("ISO-8859-2", "ISO8859_2"); - canonicalNames.put("ISO-8859-4", "ISO8859_4"); - canonicalNames.put("ISO-8859-5", "ISO8859_5"); - canonicalNames.put("ISO-8859-7", "ISO8859_7"); - canonicalNames.put("ISO-8859-9", "ISO8859_9"); - canonicalNames.put("ISO-8859-13", "ISO8859_13"); - canonicalNames.put("ISO-8859-15", "ISO8859_15"); - canonicalNames.put("KOI8-R", "KOI8_R"); - canonicalNames.put("UTF-8", "UTF8"); - canonicalNames.put("UTF-16BE", "UnicodeBigUnmarked"); - canonicalNames.put("UTF-16LE", "UnicodeLittleUnmarked"); - canonicalNames.put("windows-1255", "Cp1255"); - canonicalNames.put("windows-1256", "Cp1256"); - canonicalNames.put("windows-1258", "Cp1258"); - canonicalNames.put("ISO-8859-3", "ISO8859_3"); - canonicalNames.put("ISO-8859-6", "ISO8859_6"); - canonicalNames.put("ISO-8859-8", "ISO8859_8"); + canonicalNames = new HashMap(); + canonicalNames.put("US-ASCII", "ASCII"); + canonicalNames.put("windows-1250", "Cp1250"); + canonicalNames.put("windows-1251", "Cp1251"); + canonicalNames.put("windows-1252", "Cp1252"); + canonicalNames.put("windows-1253", "Cp1253"); + canonicalNames.put("windows-1254", "Cp1254"); + canonicalNames.put("windows-1257", "Cp1257"); + canonicalNames.put("ISO-8859-1", "ISO8859_1"); + canonicalNames.put("ISO-8859-2", "ISO8859_2"); + canonicalNames.put("ISO-8859-4", "ISO8859_4"); + canonicalNames.put("ISO-8859-5", "ISO8859_5"); + canonicalNames.put("ISO-8859-7", "ISO8859_7"); + canonicalNames.put("ISO-8859-9", "ISO8859_9"); + canonicalNames.put("ISO-8859-13", "ISO8859_13"); + canonicalNames.put("ISO-8859-15", "ISO8859_15"); + canonicalNames.put("KOI8-R", "KOI8_R"); + canonicalNames.put("UTF-8", "UTF8"); + canonicalNames.put("UTF-16BE", "UnicodeBigUnmarked"); + canonicalNames.put("UTF-16LE", "UnicodeLittleUnmarked"); + canonicalNames.put("windows-1255", "Cp1255"); + canonicalNames.put("windows-1256", "Cp1256"); + canonicalNames.put("windows-1258", "Cp1258"); + canonicalNames.put("ISO-8859-3", "ISO8859_3"); + canonicalNames.put("ISO-8859-6", "ISO8859_6"); + canonicalNames.put("ISO-8859-8", "ISO8859_8"); } /** - * Returns the name of the default encoding, + * Returns the name of the default encoding, * falls back on defaults to Latin-1 if there's a problem. */ public static String getDefaultEncoding() { - try - { - return System.getProperty("file.encoding"); - } catch(SecurityException e) { - } catch(IllegalArgumentException e) { - } - // XXX - Throw an error here? For now, default to the 'safe' encoding. - return "8859_1"; + try + { + return System.getProperty("file.encoding"); + } catch(SecurityException e) { + } catch(IllegalArgumentException e) { + } + // XXX - Throw an error here? For now, default to the 'safe' encoding. + return "8859_1"; } /** - * Returns the java.io canonical name of a charset given with the + * Returns the java.io canonical name of a charset given with the * java.nio canonical name. If the charset does not have a java.io * canonical name, the input string is returned. */ public static String getOldCanonical(String newCanonical) { - String oldCanonical = (String) canonicalNames.get(newCanonical); - return (oldCanonical != null)?oldCanonical : newCanonical; + String oldCanonical = (String) canonicalNames.get(newCanonical); + return (oldCanonical != null)?oldCanonical : newCanonical; } public static boolean isISOLatin1(String s) { - if(s.equals("ISO-8859-1") || - s.equals("8859_1") || - s.equals("ISO_8859-1") || - s.equals("latin1") || - s.equals("ISO8859_1") || - s.equals("ISO_8859_1")) - return true; - return false; + if(s.equals("ISO-8859-1") || + s.equals("8859_1") || + s.equals("ISO_8859-1") || + s.equals("latin1") || + s.equals("ISO8859_1") || + s.equals("ISO_8859_1")) + return true; + return false; } /** - * Gets a charset, throwing the java.io exception and not + * Gets a charset, throwing the java.io exception and not * the java.nio exception if an error occurs. */ - public static Charset getCharset(String name) - throws UnsupportedEncodingException + public static Charset getCharset(String name) + throws UnsupportedEncodingException { - try + try { return Charset.forName(name); - } - catch(IllegalCharsetNameException e) + } + catch(IllegalCharsetNameException e) { throw new UnsupportedEncodingException("Charset "+name+" not found."); - } - catch(UnsupportedCharsetException e) + } + catch(UnsupportedCharsetException e) { throw new UnsupportedEncodingException("Charset "+name+" not found."); } @@ -159,6 +159,3 @@ public class EncodingHelper return new UTF_8(); } } - - - diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_1.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_1.java index 19a538d9fe4..eb7c5ec593d 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_1.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_1.java @@ -1,4 +1,4 @@ -/* ISO_8859_1.java -- +/* ISO_8859_1.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class ISO_8859_1 extends Charset * http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html */ super ("ISO-8859-1", new String[] { - /* These names are provided by + /* These names are provided by * http://www.iana.org/assignments/character-sets */ "iso-ir-100", @@ -111,7 +111,7 @@ final class ISO_8859_1 extends Charset return (char)(b & 0xFF); } }; - + // Package-private to avoid a trampoline constructor. Decoder (Charset cs) { diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_13.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_13.java index 3bbd42f3b49..5e27489743d 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_13.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_13.java @@ -47,57 +47,56 @@ public final class ISO_8859_13 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, - 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, - 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, - 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, - 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, - 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, - 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, - 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, - 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, - 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x201D, 0x00A2, 0x00A3, 0x00A4, 0x201E, 0x00A6, 0x00A7, + 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x201C, 0x00B5, 0x00B6, 0x00B7, + 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, + 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, + 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, + 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, + 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, + 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, + 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, + 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x2019 - }; + }; public ISO_8859_13() { super("ISO-8859-13", new String[] { - "ISO8859_13", - "8859_13", - "ibm-921_P100-1995", - "ibm-921", - "iso_8859_13", - "iso8859_13", - "iso-8859-13", - "8859_13", - "cp921", - "921" + "ISO8859_13", + "8859_13", + "ibm-921_P100-1995", + "ibm-921", + "iso_8859_13", + "iso8859_13", + "iso-8859-13", + "8859_13", + "cp921", + "921" }, lookup); } - -} // class ISO_8859_13 +} // class ISO_8859_13 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_15.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_15.java index df2265ac549..dc5e9e55ac9 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_15.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_15.java @@ -47,64 +47,63 @@ public final class ISO_8859_15 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7, - 0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7, - 0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF - }; + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AC, 0x00A5, 0x0160, 0x00A7, + 0x0161, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x017D, 0x00B5, 0x00B6, 0x00B7, + 0x017E, 0x00B9, 0x00BA, 0x00BB, 0x0152, 0x0153, 0x0178, 0x00BF, + 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, + 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, + 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, + 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF + }; public ISO_8859_15() { super("ISO-8859-15", new String[] { - "8859_15", - "iso8859_15", - "iso-8859-15", - "8859-15", - "latin9", - "iso_8859_15", - "ibm-923_P100-1998", - "ibm-923", - "Latin-9", - "l9", - "latin0", - "csisolatin0", - "csisolatin9", - "iso8859_15_fdis", - "cp923", - "923", - "windows-28605" + "8859_15", + "iso8859_15", + "iso-8859-15", + "8859-15", + "latin9", + "iso_8859_15", + "ibm-923_P100-1998", + "ibm-923", + "Latin-9", + "l9", + "latin0", + "csisolatin0", + "csisolatin9", + "iso8859_15_fdis", + "cp923", + "923", + "windows-28605" }, lookup); } - -} // class ISO_8859_15 +} // class ISO_8859_15 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_2.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_2.java index dbe2b4dbf96..7a086923d3b 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_2.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_2.java @@ -48,7 +48,7 @@ public final class ISO_8859_2 extends ByteCharset * This is the lookup table for this encoding * Note: ranges 0-1F and 7f-97 aren't defined in the spec file aron used. */ - private static final char[] lookup = + private static final char[] lookup = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, @@ -82,28 +82,27 @@ public final class ISO_8859_2 extends ByteCharset 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 - }; + }; public ISO_8859_2() { super("ISO-8859-2", new String[] { - "ISO8859_2", - "8859_2", - "ibm-912_P100-1995", - "ibm-912", - "iso_8859_2", - "iso8859_2", - "iso-8859-2", - "ISO_8859-2:1987", - "latin2", - "csISOLatin2", - "iso-ir-101", - "l2", - "cp912", - "912", - "windows-28592" + "ISO8859_2", + "8859_2", + "ibm-912_P100-1995", + "ibm-912", + "iso_8859_2", + "iso8859_2", + "iso-8859-2", + "ISO_8859-2:1987", + "latin2", + "csISOLatin2", + "iso-ir-101", + "l2", + "cp912", + "912", + "windows-28592" }, lookup); } - -} // class ISO_8859_2 +} // class ISO_8859_2 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_3.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_3.java index 567379e7de4..a3c1ea6920a 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_3.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_3.java @@ -47,62 +47,61 @@ public final class ISO_8859_3 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, NONE, 0x0124, 0x00A7, - 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, NONE, 0x017B, - 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, - 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, NONE, 0x017C, - 0x00C0, 0x00C1, 0x00C2, NONE, 0x00C4, 0x010A, 0x0108, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - NONE, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, - 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, NONE, 0x00E4, 0x010B, 0x0109, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - NONE, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, - 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9 - }; + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x0126, 0x02D8, 0x00A3, 0x00A4, NONE, 0x0124, 0x00A7, + 0x00A8, 0x0130, 0x015E, 0x011E, 0x0134, 0x00AD, NONE, 0x017B, + 0x00B0, 0x0127, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0125, 0x00B7, + 0x00B8, 0x0131, 0x015F, 0x011F, 0x0135, 0x00BD, NONE, 0x017C, + 0x00C0, 0x00C1, 0x00C2, NONE, 0x00C4, 0x010A, 0x0108, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, + NONE, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x0120, 0x00D6, 0x00D7, + 0x011C, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x016C, 0x015C, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, NONE, 0x00E4, 0x010B, 0x0109, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + NONE, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x0121, 0x00F6, 0x00F7, + 0x011D, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x016D, 0x015D, 0x02D9 + }; public ISO_8859_3() { super("ISO-8859-3", new String[] { - "ISO8859_3", - "8859_3", - "ibm-913_P100-2000", - "ibm-913", - "iso_8859_3", - "iso8859_3", - "iso-8859-3", - "ISO_8859-3:1988", - "latin3", - "csISOLatin3", - "iso-ir-109", - "l3", - "cp913", - "913", - "windows-28593" + "ISO8859_3", + "8859_3", + "ibm-913_P100-2000", + "ibm-913", + "iso_8859_3", + "iso8859_3", + "iso-8859-3", + "ISO_8859-3:1988", + "latin3", + "csISOLatin3", + "iso-ir-109", + "l3", + "cp913", + "913", + "windows-28593" }, lookup); } - -} // class ISO_8859_3 +} // class ISO_8859_3 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_4.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_4.java index ca062278a7a..3e92dbe6433 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_4.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_4.java @@ -48,7 +48,7 @@ public final class ISO_8859_4 extends ByteCharset * This is the lookup table for this encoding * Note: ranges 0-1F and 7f-9f aren't defined in the spec file aron used. */ - private static final char[] lookup = + private static final char[] lookup = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, @@ -82,28 +82,27 @@ public final class ISO_8859_4 extends ByteCharset 0x010D, 0x00E9, 0x0119, 0x00EB, 0x0117, 0x00ED, 0x00EE, 0x012B, 0x0111, 0x0146, 0x014D, 0x0137, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x0173, 0x00FA, 0x00FB, 0x00FC, 0x0169, 0x016B, 0x02D9 - }; + }; public ISO_8859_4() { super("ISO-8859-4", new String[] { - "ISO8859_4", - "8859_4", - "ibm-914_P100-1995", - "ibm-914", - "iso_8859_4", - "iso8859_4", - "iso-8859-4", - "latin4", - "csISOLatin4", - "iso-ir-110", - "ISO_8859-4:1988", - "l4", - "cp914", - "914", - "windows-28594" + "ISO8859_4", + "8859_4", + "ibm-914_P100-1995", + "ibm-914", + "iso_8859_4", + "iso8859_4", + "iso-8859-4", + "latin4", + "csISOLatin4", + "iso-ir-110", + "ISO_8859-4:1988", + "l4", + "cp914", + "914", + "windows-28594" }, lookup); } - -} // class ISO_8859_4 +} // class ISO_8859_4 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_5.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_5.java index 70496ce4931..17d11e07797 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_5.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_5.java @@ -47,61 +47,60 @@ public final class ISO_8859_5 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, - 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, - 0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, + 0x0408, 0x0409, 0x040A, 0x040B, 0x040C, 0x00AD, 0x040E, 0x040F, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, + 0x2116, 0x0451, 0x0452, 0x0453, 0x0454, 0x0455, 0x0456, 0x0457, 0x0458, 0x0459, 0x045A, 0x045B, 0x045C, 0x00A7, 0x045E, 0x045F - }; + }; public ISO_8859_5() { super("ISO-8859-5", new String[] { - "ISO8859_5", - "8859_5", - "ibm-915_P100-1995", - "ibm-915", - "iso_8859_5", - "iso8859_5", - "iso-8859-5", - "cyrillic", - "csISOLatinCyrillic", - "iso-ir-144", - "ISO_8859-5:1988", - "cp915", - "915", - "windows-28595" + "ISO8859_5", + "8859_5", + "ibm-915_P100-1995", + "ibm-915", + "iso_8859_5", + "iso8859_5", + "iso-8859-5", + "cyrillic", + "csISOLatinCyrillic", + "iso-ir-144", + "ISO_8859-5:1988", + "cp915", + "915", + "windows-28595" }, lookup); } - -} // class ISO_8859_5 +} // class ISO_8859_5 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_6.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_6.java index dc7a9bef8ca..47dca4e3712 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_6.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_6.java @@ -47,65 +47,64 @@ public final class ISO_8859_6 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, NONE, NONE, NONE, 0x00A4, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, 0x060C, 0x00AD, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, 0x061B, NONE, NONE, NONE, 0x061F, - NONE, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, - 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, - 0x0638, 0x0639, 0x063A, NONE, NONE, NONE, NONE, NONE, - 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, - 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, - 0x0650, 0x0651, 0x0652, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE - }; + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, NONE, NONE, NONE, 0x00A4, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, 0x060C, 0x00AD, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, 0x061B, NONE, NONE, NONE, 0x061F, + NONE, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, + 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, + 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, + 0x0638, 0x0639, 0x063A, NONE, NONE, NONE, NONE, NONE, + 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, + 0x0648, 0x0649, 0x064A, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, + 0x0650, 0x0651, 0x0652, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE + }; public ISO_8859_6() { super("ISO-8859-6", new String[] { - "8859_6", - "ibm-1089_P100-1995", - "ibm-1089", - "iso_8859_6", - "iso8859_6", - "iso-8859-6", - "arabic", - "csISOLatinArabic", - "iso-ir-127", - "ISO_8859-6:1987", - "ECMA-114", - "ASMO-708", - "8859_6", - "cp1089", - "1089", - "windows-28596", - "ISO-8859-6-I", - "ISO-8859-6-E" + "8859_6", + "ibm-1089_P100-1995", + "ibm-1089", + "iso_8859_6", + "iso8859_6", + "iso-8859-6", + "arabic", + "csISOLatinArabic", + "iso-ir-127", + "ISO_8859-6:1987", + "ECMA-114", + "ASMO-708", + "8859_6", + "cp1089", + "1089", + "windows-28596", + "ISO-8859-6-I", + "ISO-8859-6-E" }, lookup); } - -} // class ISO_8859_6 +} // class ISO_8859_6 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_7.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_7.java index 195f1609458..19428cf8a73 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_7.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_7.java @@ -47,64 +47,63 @@ public final class ISO_8859_7 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x02BD, 0x02BC, 0x00A3, NONE, NONE, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, NONE, 0x00AB, 0x00AC, 0x00AD, NONE, 0x2015, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, - 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, - 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, - 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, - 0x03A0, 0x03A1, NONE, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, - 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, - 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, - 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, - 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x02BD, 0x02BC, 0x00A3, NONE, NONE, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, NONE, 0x00AB, 0x00AC, 0x00AD, NONE, 0x2015, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x0385, 0x0386, 0x00B7, + 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, + 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, + 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, + 0x03A0, 0x03A1, NONE, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, + 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, + 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, + 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, + 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, NONE - }; + }; public ISO_8859_7() { super("ISO-8859-7", new String[] { - "ISO8859_7", - "8859_7", - "ibm-813_P100-1995", - "ibm-813", - "iso_8859_7", - "iso8859_7", - "iso-8859-7", - "greek", - "greek8", - "ELOT_928", - "ECMA-118", - "csISOLatinGreek", - "iso-ir-126", - "ISO_8859-7:1987", - "cp813", - "813", - "windows-28597" + "ISO8859_7", + "8859_7", + "ibm-813_P100-1995", + "ibm-813", + "iso_8859_7", + "iso8859_7", + "iso-8859-7", + "greek", + "greek8", + "ELOT_928", + "ECMA-118", + "csISOLatinGreek", + "iso-ir-126", + "ISO_8859-7:1987", + "cp813", + "813", + "windows-28597" }, lookup); } - -} // class ISO_8859_7 +} // class ISO_8859_7 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_8.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_8.java index b58030f174b..fc60d39b5f9 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_8.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_8.java @@ -47,63 +47,62 @@ public final class ISO_8859_8 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, NONE, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x203E, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, 0x2017, - 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, - 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x05EA, NONE, NONE, NONE, NONE, NONE - }; + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, NONE, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x203E, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, 0x2017, + 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, + 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, + 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, + 0x05E8, 0x05E9, 0x05EA, NONE, NONE, NONE, NONE, NONE + }; public ISO_8859_8() { super("ISO-8859-8", new String[] { - "ISO8859_8", - "8859_8", - "ibm-916_P100-1995", - "ibm-916", - "iso_8859_8", - "iso8859_8", - "iso-8859-8", - "hebrew", - "csISOLatinHebrew", - "iso-ir-138", - "ISO_8859-8:1988", - "ISO-8859-8-I", - "ISO-8859-8-E", - "cp916", - "916", - "windows-28598" + "ISO8859_8", + "8859_8", + "ibm-916_P100-1995", + "ibm-916", + "iso_8859_8", + "iso8859_8", + "iso-8859-8", + "hebrew", + "csISOLatinHebrew", + "iso-ir-138", + "ISO_8859-8:1988", + "ISO-8859-8-I", + "ISO-8859-8-E", + "cp916", + "916", + "windows-28598" }, lookup); } - -} // class ISO_8859_8 +} // class ISO_8859_8 diff --git a/libjava/classpath/gnu/java/nio/charset/ISO_8859_9.java b/libjava/classpath/gnu/java/nio/charset/ISO_8859_9.java index 83fb5a222d7..70d987c8ffc 100644 --- a/libjava/classpath/gnu/java/nio/charset/ISO_8859_9.java +++ b/libjava/classpath/gnu/java/nio/charset/ISO_8859_9.java @@ -47,63 +47,62 @@ public final class ISO_8859_9 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, - 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, - 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, - 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, + 0x0088, 0x0089, 0x008A, 0x008B, 0x008C, 0x008D, 0x008E, 0x008F, + 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, + 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, + 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, + 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, + 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF - }; + }; public ISO_8859_9() { super("ISO-8859-9", new String[] { - "ISO8859_9", - "8859_9", - "ibm-920_P100-1995", - "ibm-920", - "iso8859_9", - "iso-8859-9", - "iso_8859_9", - "latin5", - "csISOLatin5", - "iso-ir-148", - "ISO_8859-9:1989", - "l5", - "cp920", - "920", - "windows-28599", - "ECMA-128" + "ISO8859_9", + "8859_9", + "ibm-920_P100-1995", + "ibm-920", + "iso8859_9", + "iso-8859-9", + "iso_8859_9", + "latin5", + "csISOLatin5", + "iso-ir-148", + "ISO_8859-9:1989", + "l5", + "cp920", + "920", + "windows-28599", + "ECMA-128" }, lookup); } - -} // class ISO_8859_9 +} // class ISO_8859_9 diff --git a/libjava/classpath/gnu/java/nio/charset/KOI_8.java b/libjava/classpath/gnu/java/nio/charset/KOI_8.java index 20eb8b198ad..f9dc4b1f6a5 100644 --- a/libjava/classpath/gnu/java/nio/charset/KOI_8.java +++ b/libjava/classpath/gnu/java/nio/charset/KOI_8.java @@ -47,7 +47,7 @@ public final class KOI_8 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, @@ -81,21 +81,20 @@ public final class KOI_8 extends ByteCharset 0x0425, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x042F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, 0x042C, 0x042B, 0x0417, 0x0428, 0x042D, 0x0429, 0x0427, 0x042A - }; + }; public KOI_8() { super("KOI8-R", new String[] { - "KOI8_R", - "KOI8", - "KOI-8", - "KOI_8", - "koi8-r", - "koi8r", - "koi-8-r", - "koi" + "KOI8_R", + "KOI8", + "KOI-8", + "KOI_8", + "koi8-r", + "koi8r", + "koi-8-r", + "koi" }, lookup); } - -} // class KOI_8 +} // class KOI_8 diff --git a/libjava/classpath/gnu/java/nio/charset/MS874.java b/libjava/classpath/gnu/java/nio/charset/MS874.java index f7cf81a2509..ed1f7c64f5c 100644 --- a/libjava/classpath/gnu/java/nio/charset/MS874.java +++ b/libjava/classpath/gnu/java/nio/charset/MS874.java @@ -43,45 +43,45 @@ public final class MS874 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, NONE, NONE, NONE, 0x2026, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, - 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, - 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, - 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, - 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, - 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, - 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, - 0x0E38, 0x0E39, 0x0E3A, NONE, NONE, NONE, NONE, 0x0E3F, - 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, - 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, - 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, - 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, NONE, NONE, NONE, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, NONE, NONE, NONE, 0x2026, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, + 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, + 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, + 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, + 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, + 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, + 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, + 0x0E38, 0x0E39, 0x0E3A, NONE, NONE, NONE, NONE, 0x0E3F, + 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, + 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x0E4E, 0x0E4F, + 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, + 0x0E58, 0x0E59, 0x0E5A, 0x0E5B, NONE, NONE, NONE, NONE }; public MS874() { - super("MS874", new String[] {}, lookup); + super("MS874", new String[] {}, lookup); } } // class MS874 diff --git a/libjava/classpath/gnu/java/nio/charset/MacCentralEurope.java b/libjava/classpath/gnu/java/nio/charset/MacCentralEurope.java index ce085436530..ee31a5dad16 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacCentralEurope.java +++ b/libjava/classpath/gnu/java/nio/charset/MacCentralEurope.java @@ -43,45 +43,45 @@ public final class MacCentralEurope extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, - 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179, - 0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, - 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC, - 0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E, - 0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, - 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145, - 0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156, - 0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, - 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4, - 0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, - 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7 - }; + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x0100, 0x0101, 0x00C9, 0x0104, 0x00D6, 0x00DC, 0x00E1, + 0x0105, 0x010C, 0x00E4, 0x010D, 0x0106, 0x0107, 0x00E9, 0x0179, + 0x017A, 0x010E, 0x00ED, 0x010F, 0x0112, 0x0113, 0x0116, 0x00F3, + 0x0117, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x011A, 0x011B, 0x00FC, + 0x2020, 0x00B0, 0x0118, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x00A9, 0x2122, 0x0119, 0x00A8, 0x2260, 0x0123, 0x012E, + 0x012F, 0x012A, 0x2264, 0x2265, 0x012B, 0x0136, 0x2202, 0x2211, + 0x0142, 0x013B, 0x013C, 0x013D, 0x013E, 0x0139, 0x013A, 0x0145, + 0x0146, 0x0143, 0x00AC, 0x221A, 0x0144, 0x0147, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x0148, 0x0150, 0x00D5, 0x0151, 0x014C, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0x014D, 0x0154, 0x0155, 0x0158, 0x2039, 0x203A, 0x0159, 0x0156, + 0x0157, 0x0160, 0x201A, 0x201E, 0x0161, 0x015A, 0x015B, 0x00C1, + 0x0164, 0x0165, 0x00CD, 0x017D, 0x017E, 0x016A, 0x00D3, 0x00D4, + 0x016B, 0x016E, 0x00DA, 0x016F, 0x0170, 0x0171, 0x0172, 0x0173, + 0x00DD, 0x00FD, 0x0137, 0x017B, 0x0141, 0x017C, 0x0122, 0x02C7 + }; public MacCentralEurope() { - super("MacCentralEurope", new String[] {}, lookup); + super("MacCentralEurope", new String[] {}, lookup); } } // class MacCentralEurope diff --git a/libjava/classpath/gnu/java/nio/charset/MacCroatian.java b/libjava/classpath/gnu/java/nio/charset/MacCroatian.java index 3bb19f5e2ed..acf0184142c 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacCroatian.java +++ b/libjava/classpath/gnu/java/nio/charset/MacCroatian.java @@ -43,45 +43,45 @@ public final class MacCroatian extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, - 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, - 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, - 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x0160, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x017D, 0x00D8, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x2206, 0x00B5, 0x2202, 0x2211, - 0x220F, 0x0161, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x017E, 0x00F8, - 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x0106, 0x00AB, - 0x010C, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, - 0x0110, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0xF8FF, 0x00A9, 0x2044, 0x20AC, 0x2039, 0x203A, 0x00C6, 0x00BB, - 0x2013, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x0107, 0x00C1, - 0x010D, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, - 0x0111, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, - 0x00AF, 0x03C0, 0x00CB, 0x02DA, 0x00B8, 0x00CA, 0x00E6, 0x02C7 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, + 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, + 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, + 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x0160, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x017D, 0x00D8, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x2206, 0x00B5, 0x2202, 0x2211, + 0x220F, 0x0161, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x017E, 0x00F8, + 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x0106, 0x00AB, + 0x010C, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, + 0x0110, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0xF8FF, 0x00A9, 0x2044, 0x20AC, 0x2039, 0x203A, 0x00C6, 0x00BB, + 0x2013, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x0107, 0x00C1, + 0x010D, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, + 0x0111, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, + 0x00AF, 0x03C0, 0x00CB, 0x02DA, 0x00B8, 0x00CA, 0x00E6, 0x02C7 }; public MacCroatian() { - super("MacCroatian", new String[] {}, lookup); + super("MacCroatian", new String[] {}, lookup); } } // class MacCroatian diff --git a/libjava/classpath/gnu/java/nio/charset/MacCyrillic.java b/libjava/classpath/gnu/java/nio/charset/MacCyrillic.java index b1984e57ab1..a788fd2adc1 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacCyrillic.java +++ b/libjava/classpath/gnu/java/nio/charset/MacCyrillic.java @@ -43,45 +43,45 @@ public final class MacCyrillic extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x2020, 0x00B0, 0x0490, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x0406, - 0x00AE, 0x00A9, 0x2122, 0x0402, 0x0452, 0x2260, 0x0403, 0x0453, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x0456, 0x00B5, 0x0491, 0x0408, - 0x0404, 0x0454, 0x0407, 0x0457, 0x0409, 0x0459, 0x040A, 0x045A, - 0x0458, 0x0405, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x040B, 0x045B, 0x040C, 0x045C, 0x0455, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x201E, - 0x040E, 0x045E, 0x040F, 0x045F, 0x2116, 0x0401, 0x0451, 0x044F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x20AC + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x2020, 0x00B0, 0x0490, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x0406, + 0x00AE, 0x00A9, 0x2122, 0x0402, 0x0452, 0x2260, 0x0403, 0x0453, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x0456, 0x00B5, 0x0491, 0x0408, + 0x0404, 0x0454, 0x0407, 0x0457, 0x0409, 0x0459, 0x040A, 0x045A, + 0x0458, 0x0405, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x040B, 0x045B, 0x040C, 0x045C, 0x0455, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x201E, + 0x040E, 0x045E, 0x040F, 0x045F, 0x2116, 0x0401, 0x0451, 0x044F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x20AC }; public MacCyrillic() { - super("MacCyrillic", new String[] {}, lookup); + super("MacCyrillic", new String[] {}, lookup); } } // class MacCyrillic diff --git a/libjava/classpath/gnu/java/nio/charset/MacDingbat.java b/libjava/classpath/gnu/java/nio/charset/MacDingbat.java index ad2f1c851c4..71ef82b1390 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacDingbat.java +++ b/libjava/classpath/gnu/java/nio/charset/MacDingbat.java @@ -43,45 +43,45 @@ public final class MacDingbat extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x2701, 0x2702, 0x2703, 0x2704, 0x260E, 0x2706, 0x2707, - 0x2708, 0x2709, 0x261B, 0x261E, 0x270C, 0x270D, 0x270E, 0x270F, - 0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, - 0x2718, 0x2719, 0x271A, 0x271B, 0x271C, 0x271D, 0x271E, 0x271F, - 0x2720, 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2727, - 0x2605, 0x2729, 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, - 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, - 0x2738, 0x2739, 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, - 0x2740, 0x2741, 0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, - 0x2748, 0x2749, 0x274A, 0x274B, 0x25CF, 0x274D, 0x25A0, 0x274F, - 0x2750, 0x2751, 0x2752, 0x25B2, 0x25BC, 0x25C6, 0x2756, 0x25D7, - 0x2758, 0x2759, 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, NONE, - 0x2768, 0x2769, 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, - 0x2770, 0x2771, 0x2772, 0x2773, 0x2774, 0x2775, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, - 0x2663, 0x2666, 0x2665, 0x2660, 0x2460, 0x2461, 0x2462, 0x2463, - 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x2776, 0x2777, - 0x2778, 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E, 0x277F, - 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, - 0x2788, 0x2789, 0x278A, 0x278B, 0x278C, 0x278D, 0x278E, 0x278F, - 0x2790, 0x2791, 0x2792, 0x2793, 0x2794, 0x2192, 0x2194, 0x2195, - 0x2798, 0x2799, 0x279A, 0x279B, 0x279C, 0x279D, 0x279E, 0x279F, - 0x27A0, 0x27A1, 0x27A2, 0x27A3, 0x27A4, 0x27A5, 0x27A6, 0x27A7, - 0x27A8, 0x27A9, 0x27AA, 0x27AB, 0x27AC, 0x27AD, 0x27AE, 0x27AF, - NONE, 0x27B1, 0x27B2, 0x27B3, 0x27B4, 0x27B5, 0x27B6, 0x27B7, - 0x27B8, 0x27B9, 0x27BA, 0x27BB, 0x27BC, 0x27BD, 0x27BE, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x2701, 0x2702, 0x2703, 0x2704, 0x260E, 0x2706, 0x2707, + 0x2708, 0x2709, 0x261B, 0x261E, 0x270C, 0x270D, 0x270E, 0x270F, + 0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, + 0x2718, 0x2719, 0x271A, 0x271B, 0x271C, 0x271D, 0x271E, 0x271F, + 0x2720, 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2727, + 0x2605, 0x2729, 0x272A, 0x272B, 0x272C, 0x272D, 0x272E, 0x272F, + 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, + 0x2738, 0x2739, 0x273A, 0x273B, 0x273C, 0x273D, 0x273E, 0x273F, + 0x2740, 0x2741, 0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, + 0x2748, 0x2749, 0x274A, 0x274B, 0x25CF, 0x274D, 0x25A0, 0x274F, + 0x2750, 0x2751, 0x2752, 0x25B2, 0x25BC, 0x25C6, 0x2756, 0x25D7, + 0x2758, 0x2759, 0x275A, 0x275B, 0x275C, 0x275D, 0x275E, NONE, + 0x2768, 0x2769, 0x276A, 0x276B, 0x276C, 0x276D, 0x276E, 0x276F, + 0x2770, 0x2771, 0x2772, 0x2773, 0x2774, 0x2775, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, + 0x2663, 0x2666, 0x2665, 0x2660, 0x2460, 0x2461, 0x2462, 0x2463, + 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x2776, 0x2777, + 0x2778, 0x2779, 0x277A, 0x277B, 0x277C, 0x277D, 0x277E, 0x277F, + 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, + 0x2788, 0x2789, 0x278A, 0x278B, 0x278C, 0x278D, 0x278E, 0x278F, + 0x2790, 0x2791, 0x2792, 0x2793, 0x2794, 0x2192, 0x2194, 0x2195, + 0x2798, 0x2799, 0x279A, 0x279B, 0x279C, 0x279D, 0x279E, 0x279F, + 0x27A0, 0x27A1, 0x27A2, 0x27A3, 0x27A4, 0x27A5, 0x27A6, 0x27A7, + 0x27A8, 0x27A9, 0x27AA, 0x27AB, 0x27AC, 0x27AD, 0x27AE, 0x27AF, + NONE, 0x27B1, 0x27B2, 0x27B3, 0x27B4, 0x27B5, 0x27B6, 0x27B7, + 0x27B8, 0x27B9, 0x27BA, 0x27BB, 0x27BC, 0x27BD, 0x27BE, NONE }; public MacDingbat() { - super("MacDingbat", new String[] {}, lookup); + super("MacDingbat", new String[] {}, lookup); } } // class MacDingbat diff --git a/libjava/classpath/gnu/java/nio/charset/MacGreek.java b/libjava/classpath/gnu/java/nio/charset/MacGreek.java index 6d152287408..39ca84554d2 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacGreek.java +++ b/libjava/classpath/gnu/java/nio/charset/MacGreek.java @@ -43,45 +43,45 @@ public final class MacGreek extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00B9, 0x00B2, 0x00C9, 0x00B3, 0x00D6, 0x00DC, 0x0385, - 0x00E0, 0x00E2, 0x00E4, 0x0384, 0x00A8, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00A3, 0x2122, 0x00EE, 0x00EF, 0x2022, 0x00BD, - 0x2030, 0x00F4, 0x00F6, 0x00A6, 0x20AC, 0x00F9, 0x00FB, 0x00FC, - 0x2020, 0x0393, 0x0394, 0x0398, 0x039B, 0x039E, 0x03A0, 0x00DF, - 0x00AE, 0x00A9, 0x03A3, 0x03AA, 0x00A7, 0x2260, 0x00B0, 0x00B7, - 0x0391, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x0392, 0x0395, 0x0396, - 0x0397, 0x0399, 0x039A, 0x039C, 0x03A6, 0x03AB, 0x03A8, 0x03A9, - 0x03AC, 0x039D, 0x00AC, 0x039F, 0x03A1, 0x2248, 0x03A4, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x03A5, 0x03A7, 0x0386, 0x0388, 0x0153, - 0x2013, 0x2015, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x0389, - 0x038A, 0x038C, 0x038E, 0x03AD, 0x03AE, 0x03AF, 0x03CC, 0x038F, - 0x03CD, 0x03B1, 0x03B2, 0x03C8, 0x03B4, 0x03B5, 0x03C6, 0x03B3, - 0x03B7, 0x03B9, 0x03BE, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF, - 0x03C0, 0x03CE, 0x03C1, 0x03C3, 0x03C4, 0x03B8, 0x03C9, 0x03C2, - 0x03C7, 0x03C5, 0x03B6, 0x03CA, 0x03CB, 0x0390, 0x03B0, 0x00AD + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00B9, 0x00B2, 0x00C9, 0x00B3, 0x00D6, 0x00DC, 0x0385, + 0x00E0, 0x00E2, 0x00E4, 0x0384, 0x00A8, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00A3, 0x2122, 0x00EE, 0x00EF, 0x2022, 0x00BD, + 0x2030, 0x00F4, 0x00F6, 0x00A6, 0x20AC, 0x00F9, 0x00FB, 0x00FC, + 0x2020, 0x0393, 0x0394, 0x0398, 0x039B, 0x039E, 0x03A0, 0x00DF, + 0x00AE, 0x00A9, 0x03A3, 0x03AA, 0x00A7, 0x2260, 0x00B0, 0x00B7, + 0x0391, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x0392, 0x0395, 0x0396, + 0x0397, 0x0399, 0x039A, 0x039C, 0x03A6, 0x03AB, 0x03A8, 0x03A9, + 0x03AC, 0x039D, 0x00AC, 0x039F, 0x03A1, 0x2248, 0x03A4, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x03A5, 0x03A7, 0x0386, 0x0388, 0x0153, + 0x2013, 0x2015, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x0389, + 0x038A, 0x038C, 0x038E, 0x03AD, 0x03AE, 0x03AF, 0x03CC, 0x038F, + 0x03CD, 0x03B1, 0x03B2, 0x03C8, 0x03B4, 0x03B5, 0x03C6, 0x03B3, + 0x03B7, 0x03B9, 0x03BE, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF, + 0x03C0, 0x03CE, 0x03C1, 0x03C3, 0x03C4, 0x03B8, 0x03C9, 0x03C2, + 0x03C7, 0x03C5, 0x03B6, 0x03CA, 0x03CB, 0x0390, 0x03B0, 0x00AD }; public MacGreek() { - super("MacGreek", new String[] {}, lookup); + super("MacGreek", new String[] {}, lookup); } } // class MacGreek diff --git a/libjava/classpath/gnu/java/nio/charset/MacIceland.java b/libjava/classpath/gnu/java/nio/charset/MacIceland.java index a8eb7036c17..352314641dc 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacIceland.java +++ b/libjava/classpath/gnu/java/nio/charset/MacIceland.java @@ -43,45 +43,45 @@ public final class MacIceland extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, - 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, - 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, - 0x00DD, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, - 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, - 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0x00FF, 0x0178, 0x2044, 0x20AC, 0x00D0, 0x00F0, 0x00DE, 0x00FE, - 0x00FD, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, - 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, - 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, - 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, + 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, + 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, + 0x00DD, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, + 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, + 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0x00FF, 0x0178, 0x2044, 0x20AC, 0x00D0, 0x00F0, 0x00DE, 0x00FE, + 0x00FD, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, + 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, + 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, + 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 }; public MacIceland() { - super("MacIceland", new String[] {}, lookup); + super("MacIceland", new String[] {}, lookup); } } // class MacIceland diff --git a/libjava/classpath/gnu/java/nio/charset/MacRoman.java b/libjava/classpath/gnu/java/nio/charset/MacRoman.java index 72738a2aa23..f1611b398db 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacRoman.java +++ b/libjava/classpath/gnu/java/nio/charset/MacRoman.java @@ -43,45 +43,45 @@ public final class MacRoman extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, - 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, - 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, - 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, - 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, - 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02, - 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, - 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, - 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, - 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, + 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, + 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, + 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, + 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, + 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0xFB01, 0xFB02, + 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, + 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, + 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, + 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 }; public MacRoman() { - super("MacRoman", new String[] {}, lookup); + super("MacRoman", new String[] {}, lookup); } } // class MacRoman diff --git a/libjava/classpath/gnu/java/nio/charset/MacRomania.java b/libjava/classpath/gnu/java/nio/charset/MacRomania.java index e05e94025e6..00a299b1e4e 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacRomania.java +++ b/libjava/classpath/gnu/java/nio/charset/MacRomania.java @@ -43,45 +43,45 @@ public final class MacRomania extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, - 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, - 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, - 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x0102, 0x0218, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, - 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x0103, 0x0219, - 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0x021A, 0x021B, - 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, - 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, - 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, - 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, + 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, + 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, + 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x0102, 0x0218, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, + 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x0103, 0x0219, + 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0x00FF, 0x0178, 0x2044, 0x20AC, 0x2039, 0x203A, 0x021A, 0x021B, + 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, + 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, + 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0x0131, 0x02C6, 0x02DC, + 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 }; public MacRomania() { - super("MacRomania", new String[] {}, lookup); + super("MacRomania", new String[] {}, lookup); } } // class MacRomania diff --git a/libjava/classpath/gnu/java/nio/charset/MacSymbol.java b/libjava/classpath/gnu/java/nio/charset/MacSymbol.java index 9878efd89d3..a5e6f9428b3 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacSymbol.java +++ b/libjava/classpath/gnu/java/nio/charset/MacSymbol.java @@ -43,45 +43,45 @@ public final class MacSymbol extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D, - 0x0028, 0x0029, 0x2217, 0x002B, 0x002C, 0x2212, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x2245, 0x0391, 0x0392, 0x03A7, 0x0394, 0x0395, 0x03A6, 0x0393, - 0x0397, 0x0399, 0x03D1, 0x039A, 0x039B, 0x039C, 0x039D, 0x039F, - 0x03A0, 0x0398, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03C2, 0x03A9, - 0x039E, 0x03A8, 0x0396, 0x005B, 0x2234, 0x005D, 0x22A5, 0x005F, - 0xF8E5, 0x03B1, 0x03B2, 0x03C7, 0x03B4, 0x03B5, 0x03C6, 0x03B3, - 0x03B7, 0x03B9, 0x03D5, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF, - 0x03C0, 0x03B8, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03D6, 0x03C9, - 0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, - 0x20AC, 0x03D2, 0x2032, 0x2264, 0x2044, 0x221E, 0x0192, 0x2663, - 0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193, - 0x00B0, 0x00B1, 0x2033, 0x2265, 0x00D7, 0x221D, 0x2202, 0x2022, - 0x00F7, 0x2260, 0x2261, 0x2248, 0x2026, 0xF8E6, 0x23AF, 0x21B5, - 0x2135, 0x2111, 0x211C, 0x2118, 0x2297, 0x2295, 0x2205, 0x2229, - 0x222A, 0x2283, 0x2287, 0x2284, 0x2282, 0x2286, 0x2208, 0x2209, - 0x2220, 0x2207, 0x00AE, 0x00A9, 0x2122, 0x220F, 0x221A, 0x22C5, - 0x00AC, 0x2227, 0x2228, 0x21D4, 0x21D0, 0x21D1, 0x21D2, 0x21D3, - 0x22C4, 0x3008, NONE, NONE, NONE, 0x2211, 0x239B, 0x239C, - 0x239D, 0x23A1, 0x23A2, 0x23A3, 0x23A7, 0x23A8, 0x23A9, 0x23AA, - 0xF8FF, 0x3009, 0x222B, 0x2320, 0x23AE, 0x2321, 0x239E, 0x239F, - 0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x2200, 0x0023, 0x2203, 0x0025, 0x0026, 0x220D, + 0x0028, 0x0029, 0x2217, 0x002B, 0x002C, 0x2212, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x2245, 0x0391, 0x0392, 0x03A7, 0x0394, 0x0395, 0x03A6, 0x0393, + 0x0397, 0x0399, 0x03D1, 0x039A, 0x039B, 0x039C, 0x039D, 0x039F, + 0x03A0, 0x0398, 0x03A1, 0x03A3, 0x03A4, 0x03A5, 0x03C2, 0x03A9, + 0x039E, 0x03A8, 0x0396, 0x005B, 0x2234, 0x005D, 0x22A5, 0x005F, + 0xF8E5, 0x03B1, 0x03B2, 0x03C7, 0x03B4, 0x03B5, 0x03C6, 0x03B3, + 0x03B7, 0x03B9, 0x03D5, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BF, + 0x03C0, 0x03B8, 0x03C1, 0x03C3, 0x03C4, 0x03C5, 0x03D6, 0x03C9, + 0x03BE, 0x03C8, 0x03B6, 0x007B, 0x007C, 0x007D, 0x223C, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE, + 0x20AC, 0x03D2, 0x2032, 0x2264, 0x2044, 0x221E, 0x0192, 0x2663, + 0x2666, 0x2665, 0x2660, 0x2194, 0x2190, 0x2191, 0x2192, 0x2193, + 0x00B0, 0x00B1, 0x2033, 0x2265, 0x00D7, 0x221D, 0x2202, 0x2022, + 0x00F7, 0x2260, 0x2261, 0x2248, 0x2026, 0xF8E6, 0x23AF, 0x21B5, + 0x2135, 0x2111, 0x211C, 0x2118, 0x2297, 0x2295, 0x2205, 0x2229, + 0x222A, 0x2283, 0x2287, 0x2284, 0x2282, 0x2286, 0x2208, 0x2209, + 0x2220, 0x2207, 0x00AE, 0x00A9, 0x2122, 0x220F, 0x221A, 0x22C5, + 0x00AC, 0x2227, 0x2228, 0x21D4, 0x21D0, 0x21D1, 0x21D2, 0x21D3, + 0x22C4, 0x3008, NONE, NONE, NONE, 0x2211, 0x239B, 0x239C, + 0x239D, 0x23A1, 0x23A2, 0x23A3, 0x23A7, 0x23A8, 0x23A9, 0x23AA, + 0xF8FF, 0x3009, 0x222B, 0x2320, 0x23AE, 0x2321, 0x239E, 0x239F, + 0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD, NONE }; public MacSymbol() { - super("MacSymbol", new String[] {}, lookup); + super("MacSymbol", new String[] {}, lookup); } } // class MacSymbol diff --git a/libjava/classpath/gnu/java/nio/charset/MacThai.java b/libjava/classpath/gnu/java/nio/charset/MacThai.java index daed7563033..b726c70de10 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacThai.java +++ b/libjava/classpath/gnu/java/nio/charset/MacThai.java @@ -43,45 +43,45 @@ public final class MacThai extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00AB, 0x00BB, 0x2026, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, 0x201C, 0x201D, NONE, - NONE, 0x2022, NONE, NONE, NONE, NONE, NONE, NONE, - NONE, NONE, NONE, NONE, NONE, 0x2018, 0x2019, NONE, - 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, - 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, - 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, - 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, - 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, - 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, - 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, - 0x0E38, 0x0E39, 0x0E3A, 0x2060, 0x200B, 0x2013, 0x2014, 0x0E3F, - 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, - 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x2122, 0x0E4F, - 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, - 0x0E58, 0x0E59, 0x00AE, 0x00A9, NONE, NONE, NONE, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00AB, 0x00BB, 0x2026, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, 0x201C, 0x201D, NONE, + NONE, 0x2022, NONE, NONE, NONE, NONE, NONE, NONE, + NONE, NONE, NONE, NONE, NONE, 0x2018, 0x2019, NONE, + 0x00A0, 0x0E01, 0x0E02, 0x0E03, 0x0E04, 0x0E05, 0x0E06, 0x0E07, + 0x0E08, 0x0E09, 0x0E0A, 0x0E0B, 0x0E0C, 0x0E0D, 0x0E0E, 0x0E0F, + 0x0E10, 0x0E11, 0x0E12, 0x0E13, 0x0E14, 0x0E15, 0x0E16, 0x0E17, + 0x0E18, 0x0E19, 0x0E1A, 0x0E1B, 0x0E1C, 0x0E1D, 0x0E1E, 0x0E1F, + 0x0E20, 0x0E21, 0x0E22, 0x0E23, 0x0E24, 0x0E25, 0x0E26, 0x0E27, + 0x0E28, 0x0E29, 0x0E2A, 0x0E2B, 0x0E2C, 0x0E2D, 0x0E2E, 0x0E2F, + 0x0E30, 0x0E31, 0x0E32, 0x0E33, 0x0E34, 0x0E35, 0x0E36, 0x0E37, + 0x0E38, 0x0E39, 0x0E3A, 0x2060, 0x200B, 0x2013, 0x2014, 0x0E3F, + 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0x0E45, 0x0E46, 0x0E47, + 0x0E48, 0x0E49, 0x0E4A, 0x0E4B, 0x0E4C, 0x0E4D, 0x2122, 0x0E4F, + 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, + 0x0E58, 0x0E59, 0x00AE, 0x00A9, NONE, NONE, NONE, NONE }; public MacThai() { - super("MacThai", new String[] {}, lookup); + super("MacThai", new String[] {}, lookup); } } // class MacThai diff --git a/libjava/classpath/gnu/java/nio/charset/MacTurkish.java b/libjava/classpath/gnu/java/nio/charset/MacTurkish.java index b623ee39a82..259802a3f72 100644 --- a/libjava/classpath/gnu/java/nio/charset/MacTurkish.java +++ b/libjava/classpath/gnu/java/nio/charset/MacTurkish.java @@ -43,45 +43,45 @@ public final class MacTurkish extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, - 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, - 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, - 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, - 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, - 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, - 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, - 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, - 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, - 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, - 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, - 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, - 0x00FF, 0x0178, 0x011E, 0x011F, 0x0130, 0x0131, 0x015E, 0x015F, - 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, - 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, - 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0xF8A0, 0x02C6, 0x02DC, - 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, NONE, + 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1, + 0x00E0, 0x00E2, 0x00E4, 0x00E3, 0x00E5, 0x00E7, 0x00E9, 0x00E8, + 0x00EA, 0x00EB, 0x00ED, 0x00EC, 0x00EE, 0x00EF, 0x00F1, 0x00F3, + 0x00F2, 0x00F4, 0x00F6, 0x00F5, 0x00FA, 0x00F9, 0x00FB, 0x00FC, + 0x2020, 0x00B0, 0x00A2, 0x00A3, 0x00A7, 0x2022, 0x00B6, 0x00DF, + 0x00AE, 0x00A9, 0x2122, 0x00B4, 0x00A8, 0x2260, 0x00C6, 0x00D8, + 0x221E, 0x00B1, 0x2264, 0x2265, 0x00A5, 0x00B5, 0x2202, 0x2211, + 0x220F, 0x03C0, 0x222B, 0x00AA, 0x00BA, 0x03A9, 0x00E6, 0x00F8, + 0x00BF, 0x00A1, 0x00AC, 0x221A, 0x0192, 0x2248, 0x2206, 0x00AB, + 0x00BB, 0x2026, 0x00A0, 0x00C0, 0x00C3, 0x00D5, 0x0152, 0x0153, + 0x2013, 0x2014, 0x201C, 0x201D, 0x2018, 0x2019, 0x00F7, 0x25CA, + 0x00FF, 0x0178, 0x011E, 0x011F, 0x0130, 0x0131, 0x015E, 0x015F, + 0x2021, 0x00B7, 0x201A, 0x201E, 0x2030, 0x00C2, 0x00CA, 0x00C1, + 0x00CB, 0x00C8, 0x00CD, 0x00CE, 0x00CF, 0x00CC, 0x00D3, 0x00D4, + 0xF8FF, 0x00D2, 0x00DA, 0x00DB, 0x00D9, 0xF8A0, 0x02C6, 0x02DC, + 0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7 }; public MacTurkish() { - super("MacTurkish", new String[] {}, lookup); + super("MacTurkish", new String[] {}, lookup); } } // class MacTurkish diff --git a/libjava/classpath/gnu/java/nio/charset/Provider.java b/libjava/classpath/gnu/java/nio/charset/Provider.java index d3b71a61265..8fc42e5f662 100644 --- a/libjava/classpath/gnu/java/nio/charset/Provider.java +++ b/libjava/classpath/gnu/java/nio/charset/Provider.java @@ -1,4 +1,4 @@ -/* Provider.java -- +/* Provider.java -- Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public final class Provider extends CharsetProvider /** * Map from charset name to charset canonical name. The strings * are all lower-case to allow case-insensitive retrieval of - * Charset instances. + * Charset instances. */ private final HashMap canonicalNames; @@ -214,9 +214,9 @@ public final class Provider extends CharsetProvider * Returns a Charset instance by converting the given * name to lower-case, looking up the canonical charset * name and finally looking up the Charset with that name. - * + * *

      The lookup is therefore case-insensitive.

      - * + * * @returns The Charset having charsetName * as its alias or null if no such Charset exist. */ @@ -234,20 +234,20 @@ public final class Provider extends CharsetProvider /** * Puts a Charset under its canonical name into the 'charsets' map. * Then puts a mapping from all its alias names to the canonical name. - * + * *

      All names are converted to lower-case

      . - * + * * @param cs */ private void addCharset (Charset cs) { String canonicalName = cs.name().toLowerCase(); charsets.put (canonicalName, cs); - + /* Adds a mapping between the canonical name * itself making a lookup using that name * no special case. - */ + */ canonicalNames.put(canonicalName, canonicalName); for (Iterator i = cs.aliases ().iterator (); i.hasNext (); ) @@ -259,13 +259,13 @@ public final class Provider extends CharsetProvider // The default provider is safe to instantiate. if (singleton == null) singleton = AccessController.doPrivileged - (new PrivilegedAction() - { - public Provider run() - { - return new Provider(); - } - }); + (new PrivilegedAction() + { + public Provider run() + { + return new Provider(); + } + }); return singleton; } } diff --git a/libjava/classpath/gnu/java/nio/charset/US_ASCII.java b/libjava/classpath/gnu/java/nio/charset/US_ASCII.java index b09c43e61c1..373b37a1f5b 100644 --- a/libjava/classpath/gnu/java/nio/charset/US_ASCII.java +++ b/libjava/classpath/gnu/java/nio/charset/US_ASCII.java @@ -1,4 +1,4 @@ -/* US_ASCII.java -- +/* US_ASCII.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class US_ASCII extends Charset * http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html */ super ("US-ASCII", new String[] { - /* These names are provided by + /* These names are provided by * http://www.iana.org/assignments/character-sets */ "iso-ir-6", @@ -108,7 +108,7 @@ final class US_ASCII extends Charset return (char)b; } }; - + // Package-private to avoid a trampoline constructor. Decoder (Charset cs) { diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16.java b/libjava/classpath/gnu/java/nio/charset/UTF_16.java index b1d7705d41b..d91b15a7fba 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16.java @@ -1,4 +1,4 @@ -/* UTF_16.java -- +/* UTF_16.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16BE.java b/libjava/classpath/gnu/java/nio/charset/UTF_16BE.java index 1fe3b5d7caf..1299b015e75 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16BE.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16BE.java @@ -1,4 +1,4 @@ -/* UTF_16BE.java -- +/* UTF_16BE.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java b/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java index fa1dbc412f4..e078a691978 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16Decoder.java @@ -1,4 +1,4 @@ -/* UTF_16Decoder.java -- +/* UTF_16Decoder.java -- Copyright (C) 2002, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,15 +117,15 @@ final class UTF_16Decoder extends CharsetDecoder } } - // FIXME: Change so you only do a single comparison here. + // FIXME: Change so you only do a single comparison here. char c = (byteOrder == BIG_ENDIAN - ? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF)) - : (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF))); + ? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF)) + : (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF))); if (0xD800 <= c && c <= 0xDFFF) { // c is a surrogate - + // make sure c is a high surrogate if (c > 0xDBFF) return CoderResult.malformedForLength (2); @@ -134,8 +134,8 @@ final class UTF_16Decoder extends CharsetDecoder byte b3 = in.get (); byte b4 = in.get (); char d = (byteOrder == BIG_ENDIAN - ? (char) (((b3 & 0xFF) << 8) | (b4 & 0xFF)) - : (char) (((b4 & 0xFF) << 8) | (b3 & 0xFF))); + ? (char) (((b3 & 0xFF) << 8) | (b4 & 0xFF)) + : (char) (((b4 & 0xFF) << 8) | (b3 & 0xFF))); // make sure d is a low surrogate if (d < 0xDC00 || d > 0xDFFF) return CoderResult.malformedForLength (2); diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16Encoder.java b/libjava/classpath/gnu/java/nio/charset/UTF_16Encoder.java index d5ab744e086..5283be49111 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16Encoder.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16Encoder.java @@ -1,4 +1,4 @@ -/* UTF_16Encoder.java -- +/* UTF_16Encoder.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,8 +68,8 @@ final class UTF_16Encoder extends CharsetEncoder byteOrder == BIG_ENDIAN ? new byte[] { (byte) 0xFF, (byte) 0xFD } : new byte[] { (byte) 0xFD, (byte) 0xFF }); - this.byteOrder = (byteOrder == BIG_ENDIAN) ? - ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN; + this.byteOrder = (byteOrder == BIG_ENDIAN) ? + ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN; this.useByteOrderMark = useByteOrderMark; this.needsByteOrderMark = useByteOrderMark; } @@ -84,11 +84,11 @@ final class UTF_16Encoder extends CharsetEncoder if (needsByteOrderMark) { if (out.remaining () < 2) - { - out.order(originalBO); - return CoderResult.OVERFLOW; - } - out.putChar (BYTE_ORDER_MARK); + { + out.order(originalBO); + return CoderResult.OVERFLOW; + } + out.putChar (BYTE_ORDER_MARK); needsByteOrderMark = false; } @@ -118,15 +118,15 @@ final class UTF_16Encoder extends CharsetEncoder else { if (out.remaining () < 2) - { - out.order(originalBO); - return CoderResult.OVERFLOW; - } + { + out.order(originalBO); + return CoderResult.OVERFLOW; + } out.putChar (c); inPos++; } } - out.order(originalBO); + out.order(originalBO); return CoderResult.UNDERFLOW; } finally diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_16LE.java b/libjava/classpath/gnu/java/nio/charset/UTF_16LE.java index 6d72a324cbd..bede38aa832 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_16LE.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_16LE.java @@ -1,4 +1,4 @@ -/* UTF_16LE.java -- +/* UTF_16LE.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,7 +53,7 @@ final class UTF_16LE extends Charset { super ("UTF-16LE", new String[] { // witnessed by the internet - "UTF16LE", + "UTF16LE", /* These names are provided by * http://oss.software.ibm.com/cgi-bin/icu/convexp?s=ALL */ diff --git a/libjava/classpath/gnu/java/nio/charset/UTF_8.java b/libjava/classpath/gnu/java/nio/charset/UTF_8.java index 0e0730eece3..0423efe51b4 100644 --- a/libjava/classpath/gnu/java/nio/charset/UTF_8.java +++ b/libjava/classpath/gnu/java/nio/charset/UTF_8.java @@ -1,4 +1,4 @@ -/* UTF_8.java -- +/* UTF_8.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,12 +46,12 @@ import java.nio.charset.CoderResult; /** * UTF-8 charset. - * + * *

      UTF-8 references: *

      @@ -101,7 +101,7 @@ final class UTF_8 extends Charset protected CoderResult decodeLoop (ByteBuffer in, CharBuffer out) { // TODO: Optimize this in the case in.hasArray() / out.hasArray() - int inPos = in.position(); + int inPos = in.position(); try { while (in.hasRemaining ()) @@ -117,7 +117,7 @@ final class UTF_8 extends Charset return CoderResult.OVERFLOW; out.put ((char) b1); inPos++; - break; + break; case 0xC: case 0xD: byte b2; @@ -159,7 +159,7 @@ final class UTF_8 extends Charset byte b4; if (in.remaining () < 3) return CoderResult.UNDERFLOW; - if((b1&0x0F) > 4) + if((b1&0x0F) > 4) return CoderResult.malformedForLength (4); if (out.remaining () < 2) return CoderResult.OVERFLOW; @@ -169,12 +169,12 @@ final class UTF_8 extends Charset return CoderResult.malformedForLength (2); if (!isContinuation (b4 = in.get ())) return CoderResult.malformedForLength (1); - int n = (((b1 & 0x3) << 18) - | ((b2 & 0x3F) << 12) - | ((b3 & 0x3F) << 6) - | (b4 & 0x3F)) - 0x10000; - char c1 = (char)(0xD800 | (n & 0xFFC00)>>10); - char c2 = (char)(0xDC00 | (n & 0x003FF)); + int n = (((b1 & 0x3) << 18) + | ((b2 & 0x3F) << 12) + | ((b3 & 0x3F) << 6) + | (b4 & 0x3F)) - 0x10000; + char c1 = (char)(0xD800 | (n & 0xFFC00)>>10); + char c2 = (char)(0xDC00 | (n & 0x003FF)); out.put (c1); out.put (c2); inPos += 4; @@ -213,7 +213,7 @@ final class UTF_8 extends Charset // Most Latin-script languages take about 1.1 bytes. Greek, Russian, // Arabic and Hebrew take about 1.7 bytes, and most others (including // Japanese, Chinese, Korean and Hindi) take about 3 bytes. - // We assume we will be dealing with latin scripts, and use 1.1 + // We assume we will be dealing with latin scripts, and use 1.1 // for averageBytesPerChar. super (cs, 1.1f, 4.0f); } diff --git a/libjava/classpath/gnu/java/nio/charset/UnicodeLittle.java b/libjava/classpath/gnu/java/nio/charset/UnicodeLittle.java index 63f2855d520..2fa22cf3203 100644 --- a/libjava/classpath/gnu/java/nio/charset/UnicodeLittle.java +++ b/libjava/classpath/gnu/java/nio/charset/UnicodeLittle.java @@ -1,4 +1,4 @@ -/* UnicodeLittle.java -- +/* UnicodeLittle.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ import java.nio.charset.CharsetEncoder; /** * UTF-16 little endian with a byte-order mark * Included for java.io completeness. - * ("UTF-16" is equal to UnicodeBig, and + * ("UTF-16" is equal to UnicodeBig, and * UTF-16BE/LE do not have a BOM */ final class UnicodeLittle extends Charset diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1250.java b/libjava/classpath/gnu/java/nio/charset/Windows1250.java index f8fc90ae281..5845873e16d 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1250.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1250.java @@ -39,7 +39,7 @@ exception statement from your version. */ package gnu.java.nio.charset; /** - * Encoding table for Windows-1250-Latin-1, + * Encoding table for Windows-1250-Latin-1, * aka cp1250 or Windows-1250 or whatever. */ public final class Windows1250 extends ByteCharset @@ -48,55 +48,54 @@ public final class Windows1250 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021, - 0xFFFD, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, - 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0xFFFD, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A, - 0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B, - 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C, - 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, - 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, - 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, - 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, - 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, - 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, - 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, - 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021, + 0xFFFD, 0x2030, 0x0160, 0x2039, 0x015A, 0x0164, 0x017D, 0x0179, + 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0xFFFD, 0x2122, 0x0161, 0x203A, 0x015B, 0x0165, 0x017E, 0x017A, + 0x00A0, 0x02C7, 0x02D8, 0x0141, 0x00A4, 0x0104, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x015E, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x017B, + 0x00B0, 0x00B1, 0x02DB, 0x0142, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x0105, 0x015F, 0x00BB, 0x013D, 0x02DD, 0x013E, 0x017C, + 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, + 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, + 0x0110, 0x0143, 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, + 0x0158, 0x016E, 0x00DA, 0x0170, 0x00DC, 0x00DD, 0x0162, 0x00DF, + 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, 0x0107, 0x00E7, + 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, + 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, + 0x0159, 0x016F, 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9 }; public Windows1250() { super("windows-1250", new String[] { - "Windows1250", - "ibm-5346_P100-1998", - "ibm-5346", - "cp1250", - "cp-1250", - "cp_1250", - "windows1250", - "windows_1250" + "Windows1250", + "ibm-5346_P100-1998", + "ibm-5346", + "cp1250", + "cp-1250", + "cp_1250", + "windows1250", + "windows_1250" }, lookup); } - -} // class Windows1250 +} // class Windows1250 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1251.java b/libjava/classpath/gnu/java/nio/charset/Windows1251.java index 51f289e2aa9..052d0ea38dc 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1251.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1251.java @@ -48,53 +48,52 @@ public final class Windows1251 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, - 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, - 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - NONE, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, - 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, - 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, - 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, - 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457, - 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, - 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, - 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, - 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, - 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, - 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, - 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, - 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x0402, 0x0403, 0x201A, 0x0453, 0x201E, 0x2026, 0x2020, 0x2021, + 0x20AC, 0x2030, 0x0409, 0x2039, 0x040A, 0x040C, 0x040B, 0x040F, + 0x0452, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + NONE, 0x2122, 0x0459, 0x203A, 0x045A, 0x045C, 0x045B, 0x045F, + 0x00A0, 0x040E, 0x045E, 0x0408, 0x00A4, 0x0490, 0x00A6, 0x00A7, + 0x0401, 0x00A9, 0x0404, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x0407, + 0x00B0, 0x00B1, 0x0406, 0x0456, 0x0491, 0x00B5, 0x00B6, 0x00B7, + 0x0451, 0x2116, 0x0454, 0x00BB, 0x0458, 0x0405, 0x0455, 0x0457, + 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, + 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, + 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, + 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, + 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, + 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, + 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, + 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F }; public Windows1251() { super("windows-1251", new String[] { - "Windows1251", - "cp1251", - "cp-1251", - "cp_1251", - "windows1251", - "windows_1251" + "Windows1251", + "cp1251", + "cp-1251", + "cp_1251", + "windows1251", + "windows_1251" }, lookup); } - -} // class Windows1251 +} // class Windows1251 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1252.java b/libjava/classpath/gnu/java/nio/charset/Windows1252.java index 03d15802c8a..738f62a336b 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1252.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1252.java @@ -39,7 +39,7 @@ exception statement from your version. */ package gnu.java.nio.charset; /** - * Encoding table for Windows-1252-Latin-1, + * Encoding table for Windows-1252-Latin-1, * aka cp1252 or Windows-1252 or whatever. */ public final class Windows1252 extends ByteCharset @@ -48,52 +48,51 @@ public final class Windows1252 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = - { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, NONE, 0x017D, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, NONE, 0x017E, 0x0178, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, + private static final char[] lookup = + { 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, NONE, 0x017D, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, NONE, 0x017E, 0x0178, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, + 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, + 0x00D0, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, + 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x00F0, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF }; public Windows1252() { super("windows-1252", new String[] { - "Windows1252", - "ibm-5348_P100-1997", - "ibm-5348", - "windows-1252", - "cp1252", - "cp-1252" + "Windows1252", + "ibm-5348_P100-1997", + "ibm-5348", + "windows-1252", + "cp1252", + "cp-1252" }, lookup); } - -} // class Windows1252 +} // class Windows1252 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1253.java b/libjava/classpath/gnu/java/nio/charset/Windows1253.java index 9e5b1f769dc..7112158511f 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1253.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1253.java @@ -48,53 +48,52 @@ public final class Windows1253 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - NONE, 0x2030, NONE, 0x2039, NONE, NONE, NONE, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - NONE, 0x2122, NONE, 0x203A, NONE, NONE, NONE, NONE, - 0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, NONE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, - 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, - 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, - 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, - 0x03A0, 0x03A1, NONE, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, - 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, - 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, - 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, - 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, - 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, NONE + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + NONE, 0x2030, NONE, 0x2039, NONE, NONE, NONE, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + NONE, 0x2122, NONE, 0x203A, NONE, NONE, NONE, NONE, + 0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, NONE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, + 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, + 0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, + 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, + 0x03A0, 0x03A1, NONE, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, + 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, + 0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, + 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, + 0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, + 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, NONE }; public Windows1253() { super("windows-1253", new String[] { - "Windows1253", - "cp1253", - "cp-1253", - "cp_1253", - "windows1253", - "windows_1253" + "Windows1253", + "cp1253", + "cp-1253", + "cp_1253", + "windows1253", + "windows_1253" }, lookup); } - -} // class Windows1253 +} // class Windows1253 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1254.java b/libjava/classpath/gnu/java/nio/charset/Windows1254.java index 9025421b33e..cad2057ff8f 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1254.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1254.java @@ -48,53 +48,52 @@ public final class Windows1254 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, NONE, NONE, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, NONE, NONE, 0x0178, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, - 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, - 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0x0160, 0x2039, 0x0152, NONE, NONE, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, 0x0161, 0x203A, 0x0153, NONE, NONE, 0x0178, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, + 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, + 0x011E, 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, + 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x0130, 0x015E, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, 0x00E3, 0x00E4, 0x00E5, 0x00E6, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x00EC, 0x00ED, 0x00EE, 0x00EF, + 0x011F, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x00F7, + 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x0131, 0x015F, 0x00FF }; public Windows1254() { super("windows-1254", new String[] { - "Windows1254", - "cp1254", - "cp-1254", - "cp_1254", - "windows1254", - "windows_1254" + "Windows1254", + "cp1254", + "cp-1254", + "cp_1254", + "windows1254", + "windows_1254" }, lookup); } - -} // class Windows1254 +} // class Windows1254 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1255.java b/libjava/classpath/gnu/java/nio/charset/Windows1255.java index 61787d184d0..0d954f6ce16 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1255.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1255.java @@ -48,53 +48,52 @@ public final class Windows1255 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, 0xFFFD, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0xFFFD, 0x2039, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, 0xFFFD, 0x203A, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, - 0x05B8, 0x05B9, 0xFFFD, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, - 0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, - 0x05F4, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, - 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, - 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, - 0x05E8, 0x05E9, 0x05EA, 0xFFFD, 0xFFFD, 0x200E, 0x200F, 0xFFFD + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, 0xFFFD, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0xFFFD, 0x2039, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, + 0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, 0xFFFD, 0x203A, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x20AA, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00D7, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00F7, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, + 0x05B0, 0x05B1, 0x05B2, 0x05B3, 0x05B4, 0x05B5, 0x05B6, 0x05B7, + 0x05B8, 0x05B9, 0xFFFD, 0x05BB, 0x05BC, 0x05BD, 0x05BE, 0x05BF, + 0x05C0, 0x05C1, 0x05C2, 0x05C3, 0x05F0, 0x05F1, 0x05F2, 0x05F3, + 0x05F4, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, + 0x05D0, 0x05D1, 0x05D2, 0x05D3, 0x05D4, 0x05D5, 0x05D6, 0x05D7, + 0x05D8, 0x05D9, 0x05DA, 0x05DB, 0x05DC, 0x05DD, 0x05DE, 0x05DF, + 0x05E0, 0x05E1, 0x05E2, 0x05E3, 0x05E4, 0x05E5, 0x05E6, 0x05E7, + 0x05E8, 0x05E9, 0x05EA, 0xFFFD, 0xFFFD, 0x200E, 0x200F, 0xFFFD }; public Windows1255() { super("windows-1255", new String[] { - "Windows1255", - "cp1255", - "cp-1255", - "cp_1255", - "windows1255", - "windows_1255" + "Windows1255", + "cp1255", + "cp-1255", + "cp_1255", + "windows1255", + "windows_1255" }, lookup); } - -} // class Windows1255 +} // class Windows1255 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1256.java b/libjava/classpath/gnu/java/nio/charset/Windows1256.java index cf88c21b47d..ac822e63d71 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1256.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1256.java @@ -48,53 +48,52 @@ public final class Windows1256 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, - 0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, - 0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F, - 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, - 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, - 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, - 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, - 0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, - 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, - 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, 0x067E, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, 0x0679, 0x2039, 0x0152, 0x0686, 0x0698, 0x0688, + 0x06AF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x06A9, 0x2122, 0x0691, 0x203A, 0x0153, 0x200C, 0x200D, 0x06BA, + 0x00A0, 0x060C, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x06BE, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x061B, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x061F, + 0x06C1, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, + 0x0628, 0x0629, 0x062A, 0x062B, 0x062C, 0x062D, 0x062E, 0x062F, + 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x00D7, + 0x0637, 0x0638, 0x0639, 0x063A, 0x0640, 0x0641, 0x0642, 0x0643, + 0x00E0, 0x0644, 0x00E2, 0x0645, 0x0646, 0x0647, 0x0648, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0649, 0x064A, 0x00EE, 0x00EF, + 0x064B, 0x064C, 0x064D, 0x064E, 0x00F4, 0x064F, 0x0650, 0x00F7, + 0x0651, 0x00F9, 0x0652, 0x00FB, 0x00FC, 0x200E, 0x200F, 0x06D2 }; public Windows1256() { super("windows-1256", new String[] { - "Windows1256", - "cp1256", - "cp-1256", - "cp_1256", - "windows1256", - "windows_1256" + "Windows1256", + "cp1256", + "cp-1256", + "cp_1256", + "windows1256", + "windows_1256" }, lookup); } - -} // class Windows1256 +} // class Windows1256 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1257.java b/libjava/classpath/gnu/java/nio/charset/Windows1257.java index 2d281d9cd26..af7b613508c 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1257.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1257.java @@ -48,53 +48,52 @@ public final class Windows1257 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, 0x201A, NONE, 0x201E, 0x2026, 0x2020, 0x2021, - NONE, 0x2030, NONE, 0x2039, NONE, 0x00A8, 0x02C7, 0x00B8, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - NONE, 0x2122, NONE, 0x203A, NONE, 0x00AF, 0x02DB, NONE, - 0x00A0, NONE, 0x00A2, 0x00A3, 0x00A4, NONE, 0x00A6, 0x00A7, - 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, - 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, - 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, - 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, - 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, - 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, - 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, - 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, - 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9 + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, 0x201A, NONE, 0x201E, 0x2026, 0x2020, 0x2021, + NONE, 0x2030, NONE, 0x2039, NONE, 0x00A8, 0x02C7, 0x00B8, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + NONE, 0x2122, NONE, 0x203A, NONE, 0x00AF, 0x02DB, NONE, + 0x00A0, NONE, 0x00A2, 0x00A3, 0x00A4, NONE, 0x00A6, 0x00A7, + 0x00D8, 0x00A9, 0x0156, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00C6, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00E6, + 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112, + 0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, + 0x0160, 0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, + 0x0172, 0x0141, 0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, + 0x0105, 0x012F, 0x0101, 0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, + 0x010D, 0x00E9, 0x017A, 0x0117, 0x0123, 0x0137, 0x012B, 0x013C, + 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D, 0x00F5, 0x00F6, 0x00F7, + 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C, 0x017E, 0x02D9 }; public Windows1257() { super("windows-1257", new String[] { - "Windows1257", - "cp1257", - "cp-1257", - "cp_1257", - "windows1257", - "windows_1257" + "Windows1257", + "cp1257", + "cp-1257", + "cp_1257", + "windows1257", + "windows_1257" }, lookup); } - -} // class Windows1257 +} // class Windows1257 diff --git a/libjava/classpath/gnu/java/nio/charset/Windows1258.java b/libjava/classpath/gnu/java/nio/charset/Windows1258.java index 63ef37f1a31..7fd55d99c7a 100644 --- a/libjava/classpath/gnu/java/nio/charset/Windows1258.java +++ b/libjava/classpath/gnu/java/nio/charset/Windows1258.java @@ -48,53 +48,52 @@ public final class Windows1258 extends ByteCharset /** * This is the lookup table for this encoding */ - private static final char[] lookup = + private static final char[] lookup = { - 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, - 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, - 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, - 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, - 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, - 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, - 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, - 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, - 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, - 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, - 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, - 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, - 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, - 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, - 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, - 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, - 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, - 0x02C6, 0x2030, NONE, 0x2039, 0x0152, NONE, NONE, NONE, - NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, - 0x02DC, 0x2122, NONE, 0x203A, 0x0153, NONE, NONE, 0x0178, - 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, - 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, - 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, - 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, - 0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7, - 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF, - 0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7, - 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF, - 0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7, - 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF, - 0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7, - 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, + 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, + 0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, + 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, 0x001E, 0x001F, + 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, + 0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, + 0x0038, 0x0039, 0x003A, 0x003B, 0x003C, 0x003D, 0x003E, 0x003F, + 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, + 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, + 0x0058, 0x0059, 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, + 0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, + 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F, + 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, + 0x20AC, NONE, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, + 0x02C6, 0x2030, NONE, 0x2039, 0x0152, NONE, NONE, NONE, + NONE, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, + 0x02DC, 0x2122, NONE, 0x203A, 0x0153, NONE, NONE, 0x0178, + 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, + 0x00A8, 0x00A9, 0x00AA, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x00AF, + 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x00B6, 0x00B7, + 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, + 0x00C0, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x00C5, 0x00C6, 0x00C7, + 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x0300, 0x00CD, 0x00CE, 0x00CF, + 0x0110, 0x00D1, 0x0309, 0x00D3, 0x00D4, 0x01A0, 0x00D6, 0x00D7, + 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x01AF, 0x0303, 0x00DF, + 0x00E0, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x00E5, 0x00E6, 0x00E7, + 0x00E8, 0x00E9, 0x00EA, 0x00EB, 0x0301, 0x00ED, 0x00EE, 0x00EF, + 0x0111, 0x00F1, 0x0323, 0x00F3, 0x00F4, 0x01A1, 0x00F6, 0x00F7, + 0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF }; public Windows1258() { super("windows-1258", new String[] { - "Windows1258", - "cp1258", - "cp-1258", - "cp_1258", - "windows1258", - "windows_1258" + "Windows1258", + "cp1258", + "cp-1258", + "cp_1258", + "windows1258", + "windows_1258" }, lookup); } - -} // class Windows1258 +} // class Windows1258 diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java index ffd2a103f98..2c59267b513 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvCharset.java @@ -63,11 +63,11 @@ public final class IconvCharset extends Charset { try { - return new IconvDecoder(this, info); + return new IconvDecoder(this, info); } catch (IllegalArgumentException e) { - return null; + return null; } } @@ -75,11 +75,11 @@ public final class IconvCharset extends Charset { try { - return new IconvEncoder(this, info); + return new IconvEncoder(this, info); } catch (IllegalArgumentException e) { - return null; + return null; } } } diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java index f76d3fd5e1a..86f7107f26b 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvDecoder.java @@ -78,20 +78,20 @@ final class IconvDecoder extends CharsetDecoder inArr = in.array(); else { - inArr = new byte[remIn]; - in.get(inArr); + inArr = new byte[remIn]; + in.get(inArr); } if (out.hasArray()) { - ret = decode(inArr, out.array(), inPos, remIn, outPos, remOut); - out.position(outPos + (remOut - outremaining)); + ret = decode(inArr, out.array(), inPos, remIn, outPos, remOut); + out.position(outPos + (remOut - outremaining)); } else { - char[] outArr = new char[remOut]; - ret = decode(inArr, outArr, inPos, remIn, outPos, remOut); - out.put(outArr, 0, (remOut - outremaining)); + char[] outArr = new char[remOut]; + ret = decode(inArr, outArr, inPos, remIn, outPos, remOut); + out.put(outArr, 0, (remOut - outremaining)); } in.position(inPos + (remIn - inremaining)); @@ -108,5 +108,3 @@ final class IconvDecoder extends CharsetDecoder closeIconv(); } } - - diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java index 47446f98fd4..4f7a34b2819 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvEncoder.java @@ -78,20 +78,20 @@ final class IconvEncoder extends CharsetEncoder inArr = in.array(); else { - inArr = new char[remIn]; - in.get(inArr); + inArr = new char[remIn]; + in.get(inArr); } if (out.hasArray()) { - ret = encode(inArr, out.array(), inPos, remIn, outPos, remOut); - out.position(outPos + (remOut - outremaining)); + ret = encode(inArr, out.array(), inPos, remIn, outPos, remOut); + out.position(outPos + (remOut - outremaining)); } else { - byte[] outArr = new byte[remOut]; - ret = encode(inArr, outArr, inPos, remIn, outPos, remOut); - out.put(outArr, 0, (remOut - outremaining)); + byte[] outArr = new byte[remOut]; + ret = encode(inArr, outArr, inPos, remIn, outPos, remOut); + out.put(outArr, 0, (remOut - outremaining)); } in.position(inPos + (remIn - inremaining)); diff --git a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java index cf9fc56a2f5..1d5ca1052bd 100644 --- a/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java +++ b/libjava/classpath/gnu/java/nio/charset/iconv/IconvProvider.java @@ -72,13 +72,13 @@ public final class IconvProvider extends CharsetProvider Vector charsets = new Vector(); for (int i = 0; i < names.size(); i++) { - try - { - charsets.add(new IconvCharset((IconvMetaData) names.elementAt(i))); - } - catch (IllegalArgumentException e) - { - } + try + { + charsets.add(new IconvCharset((IconvMetaData) names.elementAt(i))); + } + catch (IllegalArgumentException e) + { + } } return charsets.iterator(); } @@ -87,17 +87,17 @@ public final class IconvProvider extends CharsetProvider { try { - IconvMetaData info = IconvMetaData.get(charsetName); + IconvMetaData info = IconvMetaData.get(charsetName); - // Try anyway if the set isn't found. - if (info == null) - info = new IconvMetaData(charsetName, 2.0f, 2.0f, 2.0f, 2.0f, - new String[] { }, charsetName); - return new IconvCharset(info); + // Try anyway if the set isn't found. + if (info == null) + info = new IconvMetaData(charsetName, 2.0f, 2.0f, 2.0f, 2.0f, + new String[] { }, charsetName); + return new IconvCharset(info); } catch (IllegalArgumentException e) { - return null; + return null; } } diff --git a/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java b/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java index 140069379bc..f963107506b 100644 --- a/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java +++ b/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,21 +45,21 @@ import java.io.IOException; import java.io.ObjectInputStream; /** - * This class is only for java.rmi.MarshalledObject to deserialize object from + * This class is only for java.rmi.MarshalledObject to deserialize object from * objBytes and locBytes */ public class RMIMarshalledObjectInputStream extends RMIObjectInputStream { private ObjectInputStream locStream; - + public RMIMarshalledObjectInputStream(byte[] objBytes, byte[] locBytes) throws IOException { super(new ByteArrayInputStream(objBytes)); if(locBytes != null) locStream = new ObjectInputStream(new ByteArrayInputStream(locBytes)); } - + //This method overrides RMIObjectInputStream's protected Object getAnnotation() throws IOException, ClassNotFoundException { @@ -67,5 +67,5 @@ public class RMIMarshalledObjectInputStream extends RMIObjectInputStream return null; return locStream.readObject(); } - + } // End of RMIMarshalledObjectInputStream diff --git a/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java b/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java index 2bbbaacb45f..3bdf9239f63 100644 --- a/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java +++ b/libjava/classpath/gnu/java/rmi/RMIMarshalledObjectOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,34 +46,33 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; /** - * This class is only for java.rmi.MarshalledObject to serialize object and + * This class is only for java.rmi.MarshalledObject to serialize object and * got objBytes and locBytes */ public class RMIMarshalledObjectOutputStream extends RMIObjectOutputStream { private ObjectOutputStream locStream; private ByteArrayOutputStream locBytesStream; - + public RMIMarshalledObjectOutputStream(OutputStream objStream) throws IOException { super(objStream); locBytesStream = new ByteArrayOutputStream(256); locStream = new ObjectOutputStream(locBytesStream); } - + //This method overrides RMIObjectOutputStream's. protected void setAnnotation(String annotation) throws IOException{ locStream.writeObject(annotation); } - + public void flush() throws IOException { super.flush(); locStream.flush(); } - + public byte[] getLocBytes(){ return locBytesStream.toByteArray(); } - -} // End of RMIMarshalledObjectOutputStream +} // End of RMIMarshalledObjectOutputStream diff --git a/libjava/classpath/gnu/java/rmi/activation/ActivationSystemTransient.java b/libjava/classpath/gnu/java/rmi/activation/ActivationSystemTransient.java index 1557220e102..975e13fd186 100644 --- a/libjava/classpath/gnu/java/rmi/activation/ActivationSystemTransient.java +++ b/libjava/classpath/gnu/java/rmi/activation/ActivationSystemTransient.java @@ -59,7 +59,7 @@ import java.util.Map; /** * Provides the default transient activation system. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public class ActivationSystemTransient @@ -69,8 +69,8 @@ public class ActivationSystemTransient /** * Maps group identifiers into group descriptions. */ - protected final BidiTable groupDescs; - + protected final BidiTable groupDescs; + /** * Maps object identifiers into object activation descriptions */ @@ -80,29 +80,29 @@ public class ActivationSystemTransient * Maps group identifiers into already activated groups. */ protected transient final Map groupInstantiators = new Hashtable(); - + /** * The cache of the activated objects, maps activation ids to remote * object stubs. */ protected transient final Map activatedObjects = new HashMap(); - + /** * The object incarnation counter. */ static long groupIncarnations = 0; - + /** * The singleton of this activation system */ static ActivationSystem singleton; - + /** * Set to true to print the event messages to console. */ public static boolean debug = false; - - + + /** * Creates the group which uses the given maps to store the data. */ @@ -112,7 +112,7 @@ public class ActivationSystemTransient descriptions = objectDescriptions; groupDescs = groupDescriptiopns; } - + /** * Creates the group with transient maps. */ @@ -120,14 +120,14 @@ public class ActivationSystemTransient { this (new BidiTable(), new BidiTable()); } - + public static ActivationSystem getInstance() { if (singleton == null) singleton = new ActivationSystemTransient(); return singleton; } - + /** * Activate the given object (try cache first if force = false) */ @@ -149,7 +149,7 @@ public class ActivationSystemTransient throw new UnknownObjectException("Activating unknown object "+ id == null ? "null" : id.toString()); - ActivationInstantiator group = + ActivationInstantiator group = (ActivationInstantiator) groupInstantiators.get(desc.getGroupID()); if (group == null) @@ -159,7 +159,7 @@ public class ActivationSystemTransient ActivationGroupDesc adesc = (ActivationGroupDesc) groupDescs.get(gid); if (adesc == null) - throw new UnknownGroupException("Activating unknown group " + throw new UnknownGroupException("Activating unknown group " + gid + " for "+ id+" this "+this); synchronized (ActivationSystemTransient.class) @@ -179,7 +179,7 @@ public class ActivationSystemTransient } return object; } - + /** * Returns the activation monitor (THIS) and remebers the instantiator, used * by that group. @@ -192,10 +192,10 @@ public class ActivationSystemTransient groupInstantiators.put(id, group); return this; } - + /** * Get the activation descriptor for the given activation id. - * + * * @return the activation descriptor, never null. * @throws UnknownObjectException if such object is unknown. */ @@ -208,10 +208,10 @@ public class ActivationSystemTransient id == null ? "null" : id.toString()); return desc; } - + /** * Get the descriptor of the given activation group. - * + * * @return the activation group descriptor, never null. * @throws UnknownGroupException if such group is unknown */ @@ -245,7 +245,7 @@ public class ActivationSystemTransient return id; } - + /** * Create the object activation id and put this id-descriptor combination into * the group map. The new ID will only be created if this description has not @@ -261,13 +261,13 @@ public class ActivationSystemTransient id = new ActivationID(this); descriptions.put(id, desc); } - + if (debug) System.out.println("Register object " + id +":"+desc+" this "+this); - + return id; } - + /** * Replace the activation descriptor, return the previous descriptor. */ @@ -279,7 +279,7 @@ public class ActivationSystemTransient descriptions.put(id, desc); return prev; } - + /** * Replace the activation group descriptor, return the previous descriptor. */ @@ -292,7 +292,7 @@ public class ActivationSystemTransient groupDescs.put(groupId, groupDesc); return prev; } - + /** * Calls .shutdown on all bidirectional tables (has no effect if these * table are not persistent). @@ -302,7 +302,7 @@ public class ActivationSystemTransient descriptions.shutdown(); groupDescs.shutdown(); } - + /** * Remove the group from the group map */ @@ -311,11 +311,11 @@ public class ActivationSystemTransient { if (! groupDescs.containsKey(groupId)) throw new UnknownGroupException("Unknown group "+groupId); - + groupDescs.removeKey(groupId); groupInstantiators.remove(groupId); } - + /** * Remove the object id from the active object and description maps. */ @@ -331,7 +331,7 @@ public class ActivationSystemTransient activatedObjects.remove(id); } } - + /** * Put the object into active object map. */ @@ -360,7 +360,7 @@ public class ActivationSystemTransient throw un; } } - + /** * Check if the group is known. Remove all active objects, belonging to * that group, from the active object cache. @@ -370,9 +370,9 @@ public class ActivationSystemTransient { if (! groupInstantiators.containsKey(groupId)) throw new UnknownGroupException("Inactivating unkwnon group"); - + groupInstantiators.remove(groupId); - + // Remove all members of this group from the cache. synchronized (activatedObjects) { diff --git a/libjava/classpath/gnu/java/rmi/activation/BidiTable.java b/libjava/classpath/gnu/java/rmi/activation/BidiTable.java index 5e421fe8d42..ed9d9595a29 100644 --- a/libjava/classpath/gnu/java/rmi/activation/BidiTable.java +++ b/libjava/classpath/gnu/java/rmi/activation/BidiTable.java @@ -45,26 +45,26 @@ import java.util.Map; /** * The bidirectional hash table, maps both a to b and b to a. - * - * @author Audrius Meskauskas (audriusa@bioinformatics.org) + * + * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ -public class BidiTable +public class BidiTable { /** * Use serialVerionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Maps keys to values */ protected Map k2v; - + /** * Maps values to keys (in reverse) */ protected Map v2k; - + /** * Create a new table that is ready to use. */ @@ -73,17 +73,17 @@ public class BidiTable k2v = new HashMap(); v2k = new HashMap(); } - + /** * Create a new instance where the hashtable fields are not initialised * (called from derivatives that intialise hashtables in they own way. - * + * * @param flags currently used to mark the different constructor only. */ protected BidiTable(int flags) { } - + /** * Get key by value */ @@ -91,7 +91,7 @@ public class BidiTable { return v2k.get(value); } - + /** * Put key-value pair. */ @@ -100,7 +100,7 @@ public class BidiTable k2v.put(key, value); v2k.put(value, key); } - + /** * Get value from key */ @@ -108,7 +108,7 @@ public class BidiTable { return k2v.get(key); } - + /** * Remove the key-value pair by key */ @@ -121,7 +121,7 @@ public class BidiTable v2k.remove(value); } } - + /** * Check if the table contains this key. */ @@ -129,7 +129,7 @@ public class BidiTable { return k2v.containsKey(key); } - + /** * This method is called before exit and may be used to write the database * to the disk. The default method does nothing. @@ -137,7 +137,7 @@ public class BidiTable public synchronized void shutdown() { } - + /** * Get the size. */ @@ -145,7 +145,7 @@ public class BidiTable { return k2v.size(); } - + /** * Get the key collection. */ @@ -157,7 +157,7 @@ public class BidiTable Iterator iter = keys.iterator(); for (int i = 0; i < k.length; i++) k[i] = iter.next(); - + return k; } } diff --git a/libjava/classpath/gnu/java/rmi/activation/DefaultActivationGroup.java b/libjava/classpath/gnu/java/rmi/activation/DefaultActivationGroup.java index 3a654f2461b..526d2ef40de 100644 --- a/libjava/classpath/gnu/java/rmi/activation/DefaultActivationGroup.java +++ b/libjava/classpath/gnu/java/rmi/activation/DefaultActivationGroup.java @@ -55,9 +55,9 @@ import java.rmi.activation.UnknownObjectException; /** * The default activation group class. This activation group assumes that * all classes are accessible via current thread context class loader. - * The remote class loading is not supported for security reasons. The + * The remote class loading is not supported for security reasons. The * activation always occurs in the current jre. - * + * * @author Audrius Meskauskas (audriusa@Bioinformatics.org) */ public class DefaultActivationGroup @@ -67,7 +67,7 @@ public class DefaultActivationGroup * Use the serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Used during the group creation (required constructor). */ @@ -76,23 +76,23 @@ public class DefaultActivationGroup ActivationID.class, MarshalledObject.class }; - - + + /** * Create the new default activation group. - * + * * @param id the group activation id. * @param data may contain the group initialization data (unused and can be * null) * @throws RemoteException if the super constructor does - */ + */ public DefaultActivationGroup(ActivationGroupID id, MarshalledObject data) throws RemoteException { super(id); } - - + + /** * May be overridden and used as a hook. This method is called each time * the new object is instantiated. @@ -108,14 +108,14 @@ public class DefaultActivationGroup * information, stored in the passed descriptor. The method expects the object * class to have the two parameter constructor, the first parameter being the * {@link ActivationID} and the second the {@link MarshalledObject}. - * + * * @param id the object activation id * @param desc the activation descriptor, providing the information, necessary * to create and activate the object * @return the marshalled object, containing the exported stub of the created * object * @throws ActivationException if the activation fails due any reason - */ + */ public MarshalledObject newInstance(ActivationID id, ActivationDesc desc) throws ActivationException, RemoteException { @@ -123,7 +123,7 @@ public class DefaultActivationGroup { if (ActivationSystemTransient.debug) System.out.println("Instantiating "+desc.getClassName()); - + Remote object; Class objectClass; @@ -132,19 +132,19 @@ public class DefaultActivationGroup Constructor constructor = objectClass.getConstructor(cConstructorTypes); object = (Remote) constructor.newInstance( new Object[] { id, desc.getData() }); - + // Make the object accessible and create the stub. ActivatableServerRef ref = UnicastServer.getActivatableRef(id); Remote stub = ref.exportObject(object); - + MarshalledObject marsh = new MarshalledObject(stub); - + // Notify the activation monitor. activeObject(id, marsh); - + // Make call to the hook that may be overridden. activeObject(id, stub); - + return marsh; } catch (Exception e) diff --git a/libjava/classpath/gnu/java/rmi/activation/DefaultActivationSystem.java b/libjava/classpath/gnu/java/rmi/activation/DefaultActivationSystem.java index 754b5dcb932..3d1625052d8 100644 --- a/libjava/classpath/gnu/java/rmi/activation/DefaultActivationSystem.java +++ b/libjava/classpath/gnu/java/rmi/activation/DefaultActivationSystem.java @@ -44,7 +44,7 @@ import java.rmi.registry.Registry; /** * Finds and returns the default activation system for this jre. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public abstract class DefaultActivationSystem @@ -53,17 +53,17 @@ public abstract class DefaultActivationSystem * The activation system (assigned if once found). */ static ActivationSystem system; - + /** * The default activation registry port. */ static int ACTIVATION_REGISTRY_PORT; - + /** * The name of the activation system registry port property. */ static String AS_PORT_PROPERTY = "java.rmi.activation.port"; - + /** * The defalut name of the activation system in the activation registry. */ diff --git a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl.java b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl.java index a5c036e7b6f..5efbf279636 100644 --- a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl.java +++ b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl.java @@ -68,12 +68,12 @@ public class DGCImpl * The DGCImpl extends UnicastServerRef and not UnicastRemoteObject, because * UnicastRemoteObject must exportObject automatically. */ - + /** * Use the serial version UID for interoperability. */ private static final long serialVersionUID = 1; - + /** * Protects the array of object Id's for the scheduled period of time * (lease). After the time expires, the protector is automatically discarded, @@ -87,11 +87,11 @@ public class DGCImpl * multiple references that are stored to collection. */ Collection[] references; - + /** * Create the new instance of the reference protector that protects the * given array of ids and exists for the given period of time. - * + * * @param ids the ids to protect. */ RefProtector(ObjID[] ids, long timeToLive) @@ -101,11 +101,11 @@ public class DGCImpl { references[i] = UnicastServer.getExported(ids[i]); } - + // Schedule the existence. LeaseRenewingTask.timer.schedule(this, timeToLive); } - + /** * Break all links, ensuring easy collection of the references by the gc. */ @@ -118,16 +118,16 @@ public class DGCImpl } } } - + /** * This defauld lease value is used if the lease value, passed to the * {@link #dirty} is equal to zero. */ static final long LEASE_VALUE = 600000L; - + /** * Create the new DGC implementation. - * + * * @throws RemoteException if the super constructor throws or the * socket factory fails. */ @@ -138,7 +138,7 @@ public class DGCImpl /** * Mark the given objects referecnes as used on the client side. - * + * * @param ids the ids of the used objects. * @param sequenceNum the number of the call (used to detect and discard late * calls). @@ -147,17 +147,17 @@ public class DGCImpl */ public Lease dirty(ObjID[] ids, long sequenceNum, Lease lease) throws RemoteException - { + { // We do not fill in VMID because in this implementation it is not used. long leaseValue = lease.getValue(); - + // Grant the maximal default lease time if the passed value is zero. if (leaseValue <= 0) leaseValue = LEASE_VALUE; - + // Create (and shedule of the given existence) the new reference // protector. - new RefProtector(ids, leaseValue); + new RefProtector(ids, leaseValue); lease = new Lease(lease.getVMID(), leaseValue); return lease; @@ -165,7 +165,7 @@ public class DGCImpl /** * Mark the given objects as no longer used on the client side. - * + * * @param ids the ids of the objects that are no longer used. * @param sequenceNum the number of the call (used to detect and discard late * calls) diff --git a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java index 5f032e72f8a..a40b48ca049 100644 --- a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java +++ b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Skel.java @@ -44,16 +44,16 @@ public final class DGCImpl_Skel implements java.rmi.server.Skeleton { private static final long interfaceHash = -669196253586618813L; - + private static final java.rmi.server.Operation[] operations = { new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean"), new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease") }; - + public java.rmi.server.Operation[] getOperations() { return ((java.rmi.server.Operation[]) operations.clone()); } - + public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) throws java.lang.Exception { if (opnum < 0) { if (hash == -5803803475088455571L) { @@ -69,7 +69,7 @@ public final class DGCImpl_Skel else if (hash != interfaceHash) { throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch"); } - + gnu.java.rmi.dgc.DGCImpl server = (gnu.java.rmi.dgc.DGCImpl)obj; switch (opnum) { case 0: @@ -84,7 +84,7 @@ public final class DGCImpl_Skel $param_1 = (long)in.readLong(); $param_2 = (java.rmi.dgc.VMID)in.readObject(); $param_3 = (boolean)in.readBoolean(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -104,7 +104,7 @@ public final class DGCImpl_Skel } break; } - + case 1: { java.rmi.server.ObjID[] $param_0; @@ -115,7 +115,7 @@ public final class DGCImpl_Skel $param_0 = (java.rmi.server.ObjID[])in.readObject(); $param_1 = (long)in.readLong(); $param_2 = (java.rmi.dgc.Lease)in.readObject(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -136,7 +136,7 @@ public final class DGCImpl_Skel } break; } - + default: throw new java.rmi.UnmarshalException("invalid method number"); } diff --git a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java index 9f18d129e71..dac8b6f4cad 100644 --- a/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java +++ b/libjava/classpath/gnu/java/rmi/dgc/DGCImpl_Stub.java @@ -45,39 +45,39 @@ public final class DGCImpl_Stub implements java.rmi.dgc.DGC { private static final long serialVersionUID = 2L; - + private static final long interfaceHash = -669196253586618813L; - + private static boolean useNewInvoke; - + private static final java.rmi.server.Operation[] operations = { new java.rmi.server.Operation("void clean(java.rmi.server.ObjID[], long, java.rmi.dgc.VMID, boolean)"), new java.rmi.server.Operation("java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[], long, java.rmi.dgc.Lease)") }; - + private static java.lang.reflect.Method $method_clean_0; private static java.lang.reflect.Method $method_dirty_1; - + static { try { java.rmi.server.RemoteRef.class.getMethod("invoke", new java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class }); useNewInvoke = true; $method_clean_0 = gnu.java.rmi.dgc.DGCImpl.class.getMethod("clean", new java.lang.Class[] {java.rmi.server.ObjID[].class, long.class, java.rmi.dgc.VMID.class, boolean.class}); $method_dirty_1 = gnu.java.rmi.dgc.DGCImpl.class.getMethod("dirty", new java.lang.Class[] {java.rmi.server.ObjID[].class, long.class, java.rmi.dgc.Lease.class}); - + } catch (java.lang.NoSuchMethodException e) { useNewInvoke = false; } } - + public DGCImpl_Stub() { super(); } public DGCImpl_Stub(java.rmi.server.RemoteRef ref) { super(ref); } - + public void clean(java.rmi.server.ObjID[] $param_0, long $param_1, java.rmi.dgc.VMID $param_2, boolean $param_3) throws java.rmi.RemoteException { try { if (useNewInvoke) { @@ -114,7 +114,7 @@ public final class DGCImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + public java.rmi.dgc.Lease dirty(java.rmi.server.ObjID[] $param_0, long $param_1, java.rmi.dgc.Lease $param_2) throws java.rmi.RemoteException { try { if (useNewInvoke) { @@ -154,5 +154,5 @@ public final class DGCImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + } diff --git a/libjava/classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java b/libjava/classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java index ffb5560afdf..7995af744d5 100644 --- a/libjava/classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java +++ b/libjava/classpath/gnu/java/rmi/dgc/LeaseRenewingTask.java @@ -54,11 +54,11 @@ import java.util.WeakHashMap; * sheduled task does not prevent it from being garbage collected. If the * reference has not been garbage collected, the task is resheduled after * the lease is renewed. - * + * * @author Audrius Meskauskas (Audriusa@Bioinformatics.org) */ public class LeaseRenewingTask -{ +{ /** * The sheduled timer task to call the renew() method. */ @@ -69,12 +69,12 @@ public class LeaseRenewingTask renew(); } } - + /** * The default requested lease duration time (one minute by default). */ public static long REQUEST_LEASE_DURATION = 60000; - + /** * The reference to the UnicastRef that must renew its lease until not * garbage collected. The different members of this list may point to the @@ -84,28 +84,28 @@ public class LeaseRenewingTask * frequent deletions from the middle easy. */ LinkedList ref = new LinkedList(); - + /** * The granted (or supposed) lease. */ Lease lease = new Lease(null, REQUEST_LEASE_DURATION); - + /** * The timer, shared by all lease renewing tasks. The same instance is also * used for the reference protector discarding in DGCImpl. */ static Timer timer = new Timer(true); - + /** * Maps the UnicastRef to its renewing task. */ - static WeakHashMap existingTasks = new WeakHashMap(); - + static WeakHashMap existingTasks = new WeakHashMap(); + /** * Creates the lease renewing task that renews the lease of the given * UnicastRef until it is not collected. This constructor requests the lease * value from the server and schedules the lease renewal action. - * + * * @param renewIt the reference that must be renewed. */ public LeaseRenewingTask(UnicastRef renewIt) @@ -117,10 +117,10 @@ public class LeaseRenewingTask ref.add(new WeakReference(renewIt)); } } - + /** * Schedule periodic leases for the given UnicastRef reference. - * + * * @param renewIt the reference, for that the leases must be scheduled. */ public static void scheduleLeases(UnicastRef renewIt) @@ -155,23 +155,23 @@ public class LeaseRenewingTask throw ierr; } } - + /** * Shedule the renewing call, taking into consideration that the following * lease was granted. - * + * * @param lease the lease that was granted. */ public void schedule(Lease lease) { long value = lease.getValue(); - + // Shedule a 10 % earlier because some time is needed for the message // to reach the server. long reduced = (value * 90)/100; if (reduced == 0) reduced = value; - + timer.schedule(new LeaseTimerTask(), reduced); } @@ -197,11 +197,11 @@ public class LeaseRenewingTask iter.remove(); } } - + if (renewIt!=null) { Lease lease = notifyDGC( (UnicastRef) renewIt); - + // Schedule the next renewing session. if (lease!=null) schedule(lease); @@ -210,10 +210,10 @@ public class LeaseRenewingTask // All references collected - discard this entry. } } - + /** * Notify DGC that we still hold this reference. - * + * * @param renewIt the reference we still have (must not be null). */ public Lease notifyDGC(UnicastRef renewIt) diff --git a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java index 78c600ad543..acdd463b165 100644 --- a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java +++ b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,99 +56,99 @@ import java.util.Enumeration; import java.util.Hashtable; public class RegistryImpl - extends UnicastRemoteObject implements Registry { + extends UnicastRemoteObject implements Registry { private Hashtable bindings = new Hashtable(); public RegistryImpl(int port) throws RemoteException { - this(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory()); + this(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory()); } public RegistryImpl(int port, RMIClientSocketFactory cf, RMIServerSocketFactory sf) throws RemoteException { - super(new UnicastServerRef(new ObjID(ObjID.REGISTRY_ID), port, sf)); - // The following is unnecessary, because UnicastRemoteObject export itself automatically. - //((UnicastServerRef)getRef()).exportObject(this); + super(new UnicastServerRef(new ObjID(ObjID.REGISTRY_ID), port, sf)); + // The following is unnecessary, because UnicastRemoteObject export itself automatically. + //((UnicastServerRef)getRef()).exportObject(this); } public Remote lookup(String name) throws RemoteException, NotBoundException, AccessException { - Object obj = bindings.get(name); - if (obj == null) { - throw new NotBoundException(name); - } - return ((Remote)obj); + Object obj = bindings.get(name); + if (obj == null) { + throw new NotBoundException(name); + } + return ((Remote)obj); } public void bind(String name, Remote obj) throws RemoteException, AlreadyBoundException, AccessException { - if (bindings.containsKey(name)) { - throw new AlreadyBoundException(name); - } - bindings.put(name, obj); + if (bindings.containsKey(name)) { + throw new AlreadyBoundException(name); + } + bindings.put(name, obj); } public void unbind(String name) throws RemoteException, NotBoundException, AccessException { - Object obj = bindings.remove(name); - if (obj == null) { - throw new NotBoundException(name); - } + Object obj = bindings.remove(name); + if (obj == null) { + throw new NotBoundException(name); + } } public void rebind(String name, Remote obj) throws RemoteException, AccessException { - bindings.put(name, obj); + bindings.put(name, obj); } public String[] list() throws RemoteException, AccessException { - int size = bindings.size(); - String[] strings = new String[size]; - Enumeration e = bindings.keys(); - for (int i = 0; i < size; i++) { - strings[i] = (String)e.nextElement(); - } - return (strings); + int size = bindings.size(); + String[] strings = new String[size]; + Enumeration e = bindings.keys(); + for (int i = 0; i < size; i++) { + strings[i] = (String)e.nextElement(); + } + return (strings); } public static void version() { - System.out.println("rmiregistry (" - + System.getProperty("java.vm.name") - + ") " - + System.getProperty("java.vm.version")); - System.out.println("Copyright 2011 Free Software Foundation, Inc."); - System.out.println("This is free software; see the source for copying conditions. There is NO"); - System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); - System.exit(0); + System.out.println("rmiregistry (" + + System.getProperty("java.vm.name") + + ") " + + System.getProperty("java.vm.version")); + System.out.println("Copyright 2011 Free Software Foundation, Inc."); + System.out.println("This is free software; see the source for copying conditions. There is NO"); + System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); + System.exit(0); } public static void help() { - System.out.println( + System.out.println( "Usage: rmiregistry [OPTION | PORT]\n" + "\n" + " --help Print this help, then exit\n" + " --version Print version number, then exit\n"); - System.exit(0); + System.exit(0); } public static void main(String[] args) { - int port = Registry.REGISTRY_PORT; - if (args.length > 0) { - if (args[0].equals("--version")) { - version(); - } - else if (args[0].equals("--help")) { - help(); - } - try { - port = Integer.parseInt(args[0]); - } - catch (NumberFormatException _) { - System.err.println("Bad port number - using default"); - } - } + int port = Registry.REGISTRY_PORT; + if (args.length > 0) { + if (args[0].equals("--version")) { + version(); + } + else if (args[0].equals("--help")) { + help(); + } + try { + port = Integer.parseInt(args[0]); + } + catch (NumberFormatException _) { + System.err.println("Bad port number - using default"); + } + } - try { - Registry impl = LocateRegistry.createRegistry(port); - } - catch (RemoteException _) { - System.err.println("Registry failed"); - } + try { + Registry impl = LocateRegistry.createRegistry(port); + } + catch (RemoteException _) { + System.err.println("Registry failed"); + } } } diff --git a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java index 8cf14ccc0c4..defa3bf61ab 100644 --- a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java +++ b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Skel.java @@ -44,7 +44,7 @@ public final class RegistryImpl_Skel implements java.rmi.server.Skeleton { private static final long interfaceHash = 4905912898345647071L; - + private static final java.rmi.server.Operation[] operations = { new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote"), new java.rmi.server.Operation("java.lang.String[] list("), @@ -52,11 +52,11 @@ public final class RegistryImpl_Skel new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote"), new java.rmi.server.Operation("void unbind(java.lang.String") }; - + public java.rmi.server.Operation[] getOperations() { return ((java.rmi.server.Operation[]) operations.clone()); } - + public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) throws java.lang.Exception { if (opnum < 0) { if (hash == 7583982177005850366L) { @@ -81,7 +81,7 @@ public final class RegistryImpl_Skel else if (hash != interfaceHash) { throw new java.rmi.server.SkeletonMismatchException("interface hash mismatch"); } - + gnu.java.rmi.registry.RegistryImpl server = (gnu.java.rmi.registry.RegistryImpl)obj; switch (opnum) { case 0: @@ -92,7 +92,7 @@ public final class RegistryImpl_Skel java.io.ObjectInput in = call.getInputStream(); $param_0 = (java.lang.String)in.readObject(); $param_1 = (java.rmi.Remote)in.readObject(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -112,12 +112,12 @@ public final class RegistryImpl_Skel } break; } - + case 1: { try { java.io.ObjectInput in = call.getInputStream(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -135,14 +135,14 @@ public final class RegistryImpl_Skel } break; } - + case 2: { java.lang.String $param_0; try { java.io.ObjectInput in = call.getInputStream(); $param_0 = (java.lang.String)in.readObject(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -163,7 +163,7 @@ public final class RegistryImpl_Skel } break; } - + case 3: { java.lang.String $param_0; @@ -172,7 +172,7 @@ public final class RegistryImpl_Skel java.io.ObjectInput in = call.getInputStream(); $param_0 = (java.lang.String)in.readObject(); $param_1 = (java.rmi.Remote)in.readObject(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -192,14 +192,14 @@ public final class RegistryImpl_Skel } break; } - + case 4: { java.lang.String $param_0; try { java.io.ObjectInput in = call.getInputStream(); $param_0 = (java.lang.String)in.readObject(); - + } catch (java.io.IOException e) { throw new java.rmi.UnmarshalException("error unmarshalling arguments", e); @@ -219,7 +219,7 @@ public final class RegistryImpl_Skel } break; } - + default: throw new java.rmi.UnmarshalException("invalid method number"); } diff --git a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java index b289426b4fc..786a5e1808c 100644 --- a/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java +++ b/libjava/classpath/gnu/java/rmi/registry/RegistryImpl_Stub.java @@ -45,11 +45,11 @@ public final class RegistryImpl_Stub implements java.rmi.registry.Registry { private static final long serialVersionUID = 2L; - + private static final long interfaceHash = 4905912898345647071L; - + private static boolean useNewInvoke; - + private static final java.rmi.server.Operation[] operations = { new java.rmi.server.Operation("void bind(java.lang.String, java.rmi.Remote)"), new java.rmi.server.Operation("java.lang.String[] list()"), @@ -57,13 +57,13 @@ public final class RegistryImpl_Stub new java.rmi.server.Operation("void rebind(java.lang.String, java.rmi.Remote)"), new java.rmi.server.Operation("void unbind(java.lang.String)") }; - + private static java.lang.reflect.Method $method_bind_0; private static java.lang.reflect.Method $method_list_1; private static java.lang.reflect.Method $method_lookup_2; private static java.lang.reflect.Method $method_rebind_3; private static java.lang.reflect.Method $method_unbind_4; - + static { try { java.rmi.server.RemoteRef.class.getMethod("invoke", new java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class }); @@ -73,20 +73,20 @@ public final class RegistryImpl_Stub $method_lookup_2 = gnu.java.rmi.registry.RegistryImpl.class.getMethod("lookup", new java.lang.Class[] {java.lang.String.class}); $method_rebind_3 = gnu.java.rmi.registry.RegistryImpl.class.getMethod("rebind", new java.lang.Class[] {java.lang.String.class, java.rmi.Remote.class}); $method_unbind_4 = gnu.java.rmi.registry.RegistryImpl.class.getMethod("unbind", new java.lang.Class[] {java.lang.String.class}); - + } catch (java.lang.NoSuchMethodException e) { useNewInvoke = false; } } - + public RegistryImpl_Stub() { super(); } public RegistryImpl_Stub(java.rmi.server.RemoteRef ref) { super(ref); } - + public void bind(java.lang.String $param_0, java.rmi.Remote $param_1) throws java.rmi.AccessException, java.rmi.AlreadyBoundException, java.rmi.RemoteException { try { if (useNewInvoke) { @@ -127,7 +127,7 @@ public final class RegistryImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + public java.lang.String[] list() throws java.rmi.AccessException, java.rmi.RemoteException { try { if (useNewInvoke) { @@ -167,7 +167,7 @@ public final class RegistryImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + public java.rmi.Remote lookup(java.lang.String $param_0) throws java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException { try { if (useNewInvoke) { @@ -211,7 +211,7 @@ public final class RegistryImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + public void rebind(java.lang.String $param_0, java.rmi.Remote $param_1) throws java.rmi.AccessException, java.rmi.RemoteException { try { if (useNewInvoke) { @@ -249,7 +249,7 @@ public final class RegistryImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + public void unbind(java.lang.String $param_0) throws java.rmi.AccessException, java.rmi.NotBoundException, java.rmi.RemoteException { try { if (useNewInvoke) { @@ -289,5 +289,5 @@ public final class RegistryImpl_Stub throw new java.rmi.UnexpectedException("undeclared checked exception", e); } } - + } diff --git a/libjava/classpath/gnu/java/rmi/server/ActivatableRef.java b/libjava/classpath/gnu/java/rmi/server/ActivatableRef.java index e7580bcd79d..a6faaca2e58 100644 --- a/libjava/classpath/gnu/java/rmi/server/ActivatableRef.java +++ b/libjava/classpath/gnu/java/rmi/server/ActivatableRef.java @@ -58,7 +58,7 @@ import java.rmi.server.RemoteRef; * appears to be not accessible, it tries to reactivate it before reporting * any errors. Apart the fields of the UnicastRef, the activatable reference * contains the ActivationID that is used for this activation. - * + * * @author Audrius Meskauskas (Audriusa@Bioinformatics.org) */ public class ActivatableRef extends UnicastRef @@ -67,12 +67,12 @@ public class ActivatableRef extends UnicastRef * Use serial version UID for iteroperability */ private static final long serialVersionUID = 1; - + /** * The activation id. */ ActivationID actId; - + /** * Delegate call to the superclass. */ @@ -128,7 +128,7 @@ public class ActivatableRef extends UnicastRef out.writeUTF("UnicastRef2"); super.writeExternal(out); } - + /** * Invoke the remote method on the given object and try to activate the object * if it is not reacheable with the current manager. @@ -153,10 +153,10 @@ public class ActivatableRef extends UnicastRef } else if (Proxy.isProxyClass(reactivated.getClass())) { - RemoteObjectInvocationHandler hander = - (RemoteObjectInvocationHandler) + RemoteObjectInvocationHandler hander = + (RemoteObjectInvocationHandler) Proxy.getInvocationHandler(reactivated); - + RemoteRef ref = hander.getRef(); manager = ((UnicastRef) ref).manager; } diff --git a/libjava/classpath/gnu/java/rmi/server/ActivatableServerRef.java b/libjava/classpath/gnu/java/rmi/server/ActivatableServerRef.java index 5b7dadfd217..31e825a25ae 100644 --- a/libjava/classpath/gnu/java/rmi/server/ActivatableServerRef.java +++ b/libjava/classpath/gnu/java/rmi/server/ActivatableServerRef.java @@ -54,7 +54,7 @@ import java.rmi.server.Skeleton; * additionally activates the associated object on demand, during the first * incoming call. When UnicastServerReference takes the working reference, * the ActivatableServerRef takes the activation id instead. - * + * * @author Audrius Meskauskas (Audriusa@Bioinformatics.org) */ public class ActivatableServerRef extends UnicastServerRef @@ -63,7 +63,7 @@ public class ActivatableServerRef extends UnicastServerRef * Use SVUID for interoperability */ private static final long serialVersionUID = 1; - + /** * The object activation id. */ @@ -76,7 +76,7 @@ public class ActivatableServerRef extends UnicastServerRef { super(); } - + /** * Create the new activatable server reference that will activate object on * the first call using the given activation id. @@ -87,13 +87,13 @@ public class ActivatableServerRef extends UnicastServerRef { super(id, aPort, ssFactory); actId = anId; - + // The object ID will be placed in the object map and should deliver // incoming call to {@link #incommingMessageCall}. The object itself // is currently null. UnicastServer.exportActivatableObject(this); } - + /** * Inactivate the object (stop the server). */ @@ -101,7 +101,7 @@ public class ActivatableServerRef extends UnicastServerRef { manager.stopServer(); } - + /** * Activate the object (normally during the first call). */ @@ -110,7 +110,7 @@ public class ActivatableServerRef extends UnicastServerRef try { Remote self = actId.activate(false); - + // This will call UnicastServer.exportObject, replacing null by // the activated object (self) in the object map. exportObject(self); @@ -139,7 +139,7 @@ public class ActivatableServerRef extends UnicastServerRef } /** - * Export object and ensure it is present in the server activation table + * Export object and ensure it is present in the server activation table * as well. */ public Remote exportObject(Remote obj) throws RemoteException @@ -148,11 +148,11 @@ public class ActivatableServerRef extends UnicastServerRef UnicastServer.registerActivatable(this); return r; } - + /** * Export object and ensure it is present in the server activation table as * well. - * + * * @param aClass the class being exported, must implement Remote. */ public Remote exportClass(Class aClass) throws RemoteException @@ -161,17 +161,17 @@ public class ActivatableServerRef extends UnicastServerRef throw new InternalError(aClass.getName()+" must implement Remote"); String ignoreStubs; - - ClassLoader loader =aClass.getClassLoader(); - + + ClassLoader loader =aClass.getClassLoader(); + // Stubs are always searched for the bootstrap classes that may have // obsolete pattern and may still need also skeletons. if (loader==null) ignoreStubs = "false"; else - ignoreStubs = System.getProperty("java.rmi.server.ignoreStubClasses", + ignoreStubs = System.getProperty("java.rmi.server.ignoreStubClasses", "false"); - + if (! ignoreStubs.equals("true")) { // Find and install the stub @@ -223,5 +223,5 @@ public class ActivatableServerRef extends UnicastServerRef super.writeExternal(out); out.writeObject(actId); } - + } diff --git a/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java b/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java index 6225fb30bc6..3d01d098774 100644 --- a/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java +++ b/libjava/classpath/gnu/java/rmi/server/CombinedClassLoader.java @@ -49,8 +49,8 @@ import java.util.ArrayList; * This class supports the multiple class loaders to load the resources. It is * used for constructing proxy classes that implement interfaces, loaded by * the several different class loaders. - * - * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) + * + * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class CombinedClassLoader extends ClassLoader { @@ -58,20 +58,20 @@ public class CombinedClassLoader extends ClassLoader * The class loader array. */ ClassLoader[] loaders; - + /** * Create a new combined class loader that uses the given collection of * loaders to load the classes and resources. The loader order is equal to * the order, returned by the collection interator. The duplicate loaders * are discarded and the system class loader is added as the last loader. - * + * * @param a_loaders the loadery collection (may contain duplicate instances * that will be discarded. */ public CombinedClassLoader(Collection a_loaders) { ArrayList sLoaders = new ArrayList(a_loaders.size()); - + Iterator iter = a_loaders.iterator(); Object cl; while (iter.hasNext()) @@ -80,7 +80,7 @@ public class CombinedClassLoader extends ClassLoader if (cl!=null && !sLoaders.contains(cl)) sLoaders.add(cl); } - + loaders = new ClassLoader[sLoaders.size()]; for (int i = 0; i < loaders.length; i++) diff --git a/libjava/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java b/libjava/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java index 9f2b3706e86..86660fea733 100644 --- a/libjava/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java +++ b/libjava/classpath/gnu/java/rmi/server/ConnectionRunnerPool.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,61 +45,61 @@ import java.util.Arrays; class ConnectionRunnerPool { - - public static + + public static class ConnectionRunner extends Thread{ private UnicastConnection conn; private volatile boolean exiting = false; - + public ConnectionRunner(ThreadGroup group, String id){ super(group, id); } - + public synchronized void run(){ while(!exiting){ - if(conn == null) - try{ - wait(); - }catch(InterruptedException e){ - continue; - } - else{ - conn.run(); - conn = null; - synchronized(ConnectionRunnerPool.class){ - freelist.add(this); - if(freelist.size() == 1) - ConnectionRunnerPool.class.notifyAll(); - } - } + if(conn == null) + try{ + wait(); + }catch(InterruptedException e){ + continue; + } + else{ + conn.run(); + conn = null; + synchronized(ConnectionRunnerPool.class){ + freelist.add(this); + if(freelist.size() == 1) + ConnectionRunnerPool.class.notifyAll(); + } + } } } - + public synchronized void dispatch(UnicastConnection conn){ this.conn = conn; notify(); } - + void exit(){ exiting = true; if(conn != null) - try{ - join(500); - }catch(InterruptedException e){} + try{ + join(500); + }catch(InterruptedException e){} interrupt(); } - + } - + // Should this value equal to number of CPU? private static int size = 5; private static int max_size = 10; - + // Package-private to avoid a trampoline. static ArrayList freelist; - + private static ThreadGroup group = new ThreadGroup("pool"); - + static { ConnectionRunner[] pools = new ConnectionRunner[size]; for(int i = 0; i < pools.length; i++){ @@ -109,42 +109,42 @@ class ConnectionRunnerPool } freelist = new ArrayList(Arrays.asList(pools)); } - + public static void setSize(int size_){ size = size_; } - + public static void setMaxSize(int size){ max_size = size; } - + private static synchronized ConnectionRunner getConnectionRunner() { if(freelist.size() == 0){ if(size < max_size){ - ++size; - ConnectionRunner a = new ConnectionRunner(group, Integer.toString(size)); - a.start(); - freelist.add(a); + ++size; + ConnectionRunner a = new ConnectionRunner(group, Integer.toString(size)); + a.start(); + freelist.add(a); }else - while(freelist.size() == 0) - try{ - ConnectionRunnerPool.class.wait(); - }catch(InterruptedException e){} + while(freelist.size() == 0) + try{ + ConnectionRunnerPool.class.wait(); + }catch(InterruptedException e){} } - + // always let the first in pool most busy or other scheduling plan?? ConnectionRunner a = (ConnectionRunner)freelist.get(0); freelist.remove(a); return a; } - + public static void dispatchConnection(UnicastConnection conn) { ConnectionRunner r = getConnectionRunner(); r.dispatch(conn); } - + public static void exit() { Thread[] list = new Thread[group.activeCount()]; @@ -152,5 +152,5 @@ class ConnectionRunnerPool for(int i = 0; i < list.length; i++) ((ConnectionRunner)list[i]).exit(); } - + } diff --git a/libjava/classpath/gnu/java/rmi/server/ProtocolConstants.java b/libjava/classpath/gnu/java/rmi/server/ProtocolConstants.java index 30fb5e89b39..72fbefe61df 100644 --- a/libjava/classpath/gnu/java/rmi/server/ProtocolConstants.java +++ b/libjava/classpath/gnu/java/rmi/server/ProtocolConstants.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java b/libjava/classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java index 9c3edef76d8..b090d3444d4 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIClassLoaderImpl.java @@ -90,21 +90,21 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi private final String annotation; } - /** - * This class is used to identify a cached classloader by its codebase and + /** + * This class is used to identify a cached classloader by its codebase and * the context classloader that is its parent. - */ + */ private static class CacheKey { private String mCodeBase; private ClassLoader mContextClassLoader; - + public CacheKey (String theCodebase, ClassLoader theContextClassLoader) { mCodeBase = theCodebase; mContextClassLoader = theContextClassLoader; } - + /** * @return true if the codebase and the context classloader are equal */ @@ -113,13 +113,13 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi if (theOther instanceof CacheKey) { CacheKey key = (CacheKey) theOther; - + return (equals (this.mCodeBase,key.mCodeBase) && equals (this.mContextClassLoader, key.mContextClassLoader)); } return false; } - + /** * Test if the two objects are equal or both null. * @param theOne @@ -132,17 +132,17 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi } /** - * @return hashCode + * @return hashCode */ public int hashCode() { - return ((mCodeBase != null ? mCodeBase.hashCode() : 0) + return ((mCodeBase != null ? mCodeBase.hashCode() : 0) ^(mContextClassLoader != null ? mContextClassLoader.hashCode() : -1)); } public String toString() { - return "[" + mCodeBase + "," + mContextClassLoader + "]"; + return "[" + mCodeBase + "," + mContextClassLoader + "]"; } } @@ -214,7 +214,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi ClassLoader defaultLoader) throws MalformedURLException, ClassNotFoundException { - try + try { if (defaultLoader != null) return Class.forName(name, false, defaultLoader); @@ -236,7 +236,7 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi { clss[i] = loadClass(codeBase, interfaces[i], defaultLoader); } - + // Chain all class loaders (they may differ). ArrayList loaders = new ArrayList(clss.length); ClassLoader loader = null; @@ -266,11 +266,11 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi /** * Gets a classloader for the given codebase and with the current * context classloader as parent. - * + * * @param codebase - * + * * @return a classloader for the given codebase - * + * * @throws MalformedURLException if the codebase contains a malformed URL */ public ClassLoader getClassLoader(String codebase) @@ -283,23 +283,23 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi CacheKey loaderKey = new CacheKey (codebase, Thread.currentThread().getContextClassLoader()); loader = (ClassLoader) cacheLoaders.get (loaderKey); - + if (loader == null) { //create an entry in cacheLoaders mapping a loader to codebases. // codebases are separated by " " StringTokenizer tok = new StringTokenizer (codebase, " "); ArrayList urls = new ArrayList(); - + while (tok.hasMoreTokens()) urls.add (new URL(tok.nextToken())); - + loader = new MyClassLoader((URL[]) urls.toArray(new URL [urls.size()]), Thread.currentThread().getContextClassLoader(), codebase); cacheLoaders.put (loaderKey, loader); } - + return loader; } @@ -315,38 +315,38 @@ public class RMIClassLoaderImpl extends RMIClassLoaderSpi public String getClassAnnotation(Class cl) { ClassLoader loader = cl.getClassLoader(); - + if (loader == null || loader == ClassLoader.getSystemClassLoader()) { return System.getProperty ("java.rmi.server.codebase"); } - + if (loader instanceof MyClassLoader) { return ((MyClassLoader) loader).getClassAnnotation(); } - + String s = (String) cacheAnnotations.get (loader); - + if (s != null) return s; - + if (loader instanceof URLClassLoader) { URL[] urls = ((URLClassLoader) loader).getURLs(); - + if (urls.length == 0) return null; - + CPStringBuilder annotation = new CPStringBuilder (64 * urls.length); - + for (int i = 0; i < urls.length; i++) { annotation.append (urls [i].toExternalForm()); annotation.append (' '); } - + s = annotation.toString(); cacheAnnotations.put (loader, s); return s; diff --git a/libjava/classpath/gnu/java/rmi/server/RMIDefaultSocketFactory.java b/libjava/classpath/gnu/java/rmi/server/RMIDefaultSocketFactory.java index 628e1cc8799..7115ba5431d 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIDefaultSocketFactory.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIDefaultSocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,17 +43,17 @@ import java.net.Socket; import java.rmi.server.RMISocketFactory; public class RMIDefaultSocketFactory - extends RMISocketFactory { + extends RMISocketFactory { public RMIDefaultSocketFactory() { } public Socket createSocket(String host, int port) throws IOException { - return (new Socket(host, port)); + return (new Socket(host, port)); } public ServerSocket createServerSocket(int port) throws IOException { - return (new ServerSocket(port)); + return (new ServerSocket(port)); } } diff --git a/libjava/classpath/gnu/java/rmi/server/RMIHashes.java b/libjava/classpath/gnu/java/rmi/server/RMIHashes.java index c3665a4e73b..03eb09fd002 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIHashes.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIHashes.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,7 +51,7 @@ public class RMIHashes { //There're other places using DigestOutputStream to generate hash in classpath, but I think the way I used //here is more efficient, anyway, you can switch to DigestOutputStream by doing like "//or:" comments say. - + //or:add this statement: private static final NullOutputStream nullOutputStream = new NullOutputStream (); public static long getMethodHash(Method meth) { @@ -62,7 +62,7 @@ public class RMIHashes //or:remove this statement: DigestOutputStream digest_out = new DigestOutputStream (nullOutputStream, md); ByteArrayOutputStream digest_out = new ByteArrayOutputStream(); DataOutputStream data_out = new DataOutputStream (digest_out); - + CPStringBuilder sbuf = new CPStringBuilder(); sbuf.append(meth.getName()); sbuf.append('('); @@ -75,7 +75,7 @@ public class RMIHashes sbuf.append(TypeSignature.getEncodingOfClass(rcls)); else sbuf.append('V'); - + data_out.writeUTF (sbuf.toString()); data_out.flush(); data_out.close (); @@ -97,4 +97,3 @@ public class RMIHashes return clazz.hashCode (); } } - diff --git a/libjava/classpath/gnu/java/rmi/server/RMIIncomingThread.java b/libjava/classpath/gnu/java/rmi/server/RMIIncomingThread.java index 990d37bc521..352b48b31b5 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIIncomingThread.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIIncomingThread.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -35,24 +35,24 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package gnu.java.rmi.server; +package gnu.java.rmi.server; + +public class RMIIncomingThread extends Thread { + + private String clientHost = null; + + public RMIIncomingThread(Runnable runnable, String s_clientHost) { + super(runnable); + clientHost = s_clientHost; + } + + public String toString() { + return "RMIIncoming from " + clientHost + " " + super.toString(); + } + + public String getClientHost() { + return clientHost; + } -public class RMIIncomingThread extends Thread { - - private String clientHost = null; - - public RMIIncomingThread(Runnable runnable, String s_clientHost) { - super(runnable); - clientHost = s_clientHost; - } - - public String toString() { - return "RMIIncoming from " + clientHost + " " + super.toString(); - } - - public String getClientHost() { - return clientHost; - } - } diff --git a/libjava/classpath/gnu/java/rmi/server/RMIObjectInputStream.java b/libjava/classpath/gnu/java/rmi/server/RMIObjectInputStream.java index 65a13f991b3..4ac7a0ae8c5 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIObjectInputStream.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIObjectInputStream.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,44 +48,44 @@ import java.net.MalformedURLException; import java.rmi.server.RMIClassLoader; public class RMIObjectInputStream - extends ObjectInputStream { + extends ObjectInputStream { public RMIObjectInputStream(InputStream strm) throws IOException { - super(strm); - enableResolveObject(true); + super(strm); + enableResolveObject(true); } protected Class resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { - try { + try { return RMIClassLoader.loadClass( (String)getAnnotation(), desc.getName(), VMStackWalker.firstNonNullClassLoader()); - } - catch (MalformedURLException x) { - throw new ClassNotFoundException(desc.getName(), x); - } + } + catch (MalformedURLException x) { + throw new ClassNotFoundException(desc.getName(), x); + } } //Separate it for override by MarshalledObject protected Object getAnnotation() - throws IOException, ClassNotFoundException + throws IOException, ClassNotFoundException { return readObject(); } - + protected Class resolveProxyClass(String intfs[]) throws IOException, ClassNotFoundException { - try + try { return RMIClassLoader.loadProxyClass( (String)getAnnotation(), intfs, VMStackWalker.firstNonNullClassLoader()); } - catch (MalformedURLException x) + catch (MalformedURLException x) { throw new ClassNotFoundException(null, x); } diff --git a/libjava/classpath/gnu/java/rmi/server/RMIObjectOutputStream.java b/libjava/classpath/gnu/java/rmi/server/RMIObjectOutputStream.java index d42908a4147..aaf09860ccd 100644 --- a/libjava/classpath/gnu/java/rmi/server/RMIObjectOutputStream.java +++ b/libjava/classpath/gnu/java/rmi/server/RMIObjectOutputStream.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,11 +47,11 @@ import java.rmi.server.RMIClassLoader; import java.rmi.server.RemoteStub; public class RMIObjectOutputStream - extends ObjectOutputStream { + extends ObjectOutputStream { public RMIObjectOutputStream(OutputStream strm) throws IOException { - super(strm); - enableReplaceObject(true); + super(strm); + enableReplaceObject(true); } //Separate it for override by MarshalledObject @@ -60,7 +60,7 @@ protected void setAnnotation(String annotation) throws IOException{ } protected void annotateClass(Class cls) throws IOException { - setAnnotation(RMIClassLoader.getClassAnnotation(cls)); + setAnnotation(RMIClassLoader.getClassAnnotation(cls)); } protected void annotateProxyClass(Class cls) @@ -68,14 +68,14 @@ protected void annotateProxyClass(Class cls) { annotateClass(cls); } - + protected Object replaceObject(Object obj) throws IOException { if((obj instanceof Remote) && !(obj instanceof RemoteStub)){ - UnicastServerRef ref = UnicastServer.getExportedRef((Remote)obj); - if (ref != null) - return ref.getStub(); + UnicastServerRef ref = UnicastServer.getExportedRef((Remote)obj); + if (ref != null) + return ref.getStub(); } return obj; } diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastConnection.java b/libjava/classpath/gnu/java/rmi/server/UnicastConnection.java index 216e453e72f..8245e0469e1 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastConnection.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastConnection.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,8 +49,8 @@ import java.io.ObjectOutputStream; import java.net.Socket; import java.rmi.RemoteException; -public class UnicastConnection - implements Runnable, ProtocolConstants { +public class UnicastConnection + implements Runnable, ProtocolConstants { UnicastConnectionManager manager; Socket sock; @@ -64,78 +64,78 @@ long reviveTime = 0; long expireTime = Long.MAX_VALUE; UnicastConnection(UnicastConnectionManager man, Socket sock) { - this.manager = man; - this.sock = sock; + this.manager = man; + this.sock = sock; } void acceptConnection() throws IOException { //System.out.println("Accepting connection on " + sock); //Use BufferedXXXStream would be more efficient - din = new DataInputStream(new BufferedInputStream(sock.getInputStream())); - dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream())); + din = new DataInputStream(new BufferedInputStream(sock.getInputStream())); + dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream())); - int sig = din.readInt(); - if (sig != PROTOCOL_HEADER) { - throw new IOException("bad protocol header"); - } - short ver = din.readShort(); - if (ver != PROTOCOL_VERSION) { - throw new IOException("bad protocol version"); - } - int protocol = din.readUnsignedByte(); - if (protocol != SINGLE_OP_PROTOCOL) { - // Send an ACK - dout.writeByte(PROTOCOL_ACK); + int sig = din.readInt(); + if (sig != PROTOCOL_HEADER) { + throw new IOException("bad protocol header"); + } + short ver = din.readShort(); + if (ver != PROTOCOL_VERSION) { + throw new IOException("bad protocol version"); + } + int protocol = din.readUnsignedByte(); + if (protocol != SINGLE_OP_PROTOCOL) { + // Send an ACK + dout.writeByte(PROTOCOL_ACK); - // Send my hostname and port - dout.writeUTF(manager.serverName); - dout.writeInt(manager.serverPort); - dout.flush(); + // Send my hostname and port + dout.writeUTF(manager.serverName); + dout.writeInt(manager.serverPort); + dout.flush(); - // Read their hostname and port - String rhost = din.readUTF(); - int rport = din.readInt(); - } - // Okay, ready to roll ... + // Read their hostname and port + String rhost = din.readUTF(); + int rport = din.readInt(); + } + // Okay, ready to roll ... } void makeConnection(int protocol) throws IOException { //Use BufferedXXXStream would be more efficient - din = new DataInputStream(new BufferedInputStream(sock.getInputStream())); + din = new DataInputStream(new BufferedInputStream(sock.getInputStream())); - dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream())); + dout = new DataOutputStream(new BufferedOutputStream(sock.getOutputStream())); - // Send header - dout.writeInt(PROTOCOL_HEADER); - dout.writeShort(PROTOCOL_VERSION); - dout.writeByte(protocol); + // Send header + dout.writeInt(PROTOCOL_HEADER); + dout.writeShort(PROTOCOL_VERSION); + dout.writeByte(protocol); dout.flush(); - - if (protocol != SINGLE_OP_PROTOCOL) { - // Get back ack. - int ack = din.readUnsignedByte(); - if (ack != PROTOCOL_ACK) { - throw new RemoteException("Unsupported protocol"); - } - // Read in host and port - String dicard_rhost = din.readUTF(); - int discard_rport = din.readInt(); + if (protocol != SINGLE_OP_PROTOCOL) { + // Get back ack. + int ack = din.readUnsignedByte(); + if (ack != PROTOCOL_ACK) { + throw new RemoteException("Unsupported protocol"); + } - // Send them my endpoint - dout.writeUTF(manager.serverName); - dout.writeInt(manager.serverPort); - dout.flush(); - } - // Okay, ready to roll ... + // Read in host and port + String dicard_rhost = din.readUTF(); + int discard_rport = din.readInt(); + + // Send them my endpoint + dout.writeUTF(manager.serverName); + dout.writeInt(manager.serverPort); + dout.flush(); + } + // Okay, ready to roll ... } DataInputStream getDataInputStream() throws IOException { - return (din); + return (din); } DataOutputStream getDataOutputStream() throws IOException { - return (dout); + return (dout); } /* @@ -144,10 +144,10 @@ DataOutputStream getDataOutputStream() throws IOException { * */ ObjectInputStream getObjectInputStream() throws IOException { - if (oin == null) { - throw new IOException("no ObjectInputtream for reading more objects"); - } - return (oin); + if (oin == null) { + throw new IOException("no ObjectInputtream for reading more objects"); + } + return (oin); } /** @@ -156,7 +156,7 @@ ObjectInputStream getObjectInputStream() throws IOException { * */ ObjectInputStream startObjectInputStream() throws IOException { - return (oin = new RMIObjectInputStream(din)); + return (oin = new RMIObjectInputStream(din)); } /** @@ -165,10 +165,10 @@ ObjectInputStream startObjectInputStream() throws IOException { * */ ObjectOutputStream getObjectOutputStream() throws IOException { - if (oout == null) { - throw new IOException("no ObjectOutputStream for sending more objects"); - } - return (oout); + if (oout == null) { + throw new IOException("no ObjectOutputStream for sending more objects"); + } + return (oout); } /** @@ -177,23 +177,23 @@ ObjectOutputStream getObjectOutputStream() throws IOException { * */ ObjectOutputStream startObjectOutputStream() throws IOException { - return (oout = new RMIObjectOutputStream(dout)); -} + return (oout = new RMIObjectOutputStream(dout)); +} void disconnect() { - try { - if(oout != null) - oout.close(); + try { + if(oout != null) + oout.close(); sock.close(); - } - catch (IOException _) { + } + catch (IOException _) { } - oin = null; + oin = null; oout = null; - din = null; - dout = null; - sock = null; + din = null; + dout = null; + sock = null; } public static final long CONNECTION_TIMEOUT = 10000L; @@ -215,15 +215,15 @@ static void resetTime(UnicastConnection conn){ */ public void run() { do{ - try { - UnicastServer.dispatch(this); + try { + UnicastServer.dispatch(this); //don't discardConnection explicitly, only when - // exception happens or the connection's expireTime + // exception happens or the connection's expireTime // comes } catch (Exception e ){ - manager.discardConnection(this); + manager.discardConnection(this); break; - } + } }while(true); } diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java b/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java index a9992af9fa4..981d1179218 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastConnectionManager.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,7 +56,7 @@ import java.util.Hashtable; import java.util.Iterator; public class UnicastConnectionManager - implements Runnable, ProtocolConstants { + implements Runnable, ProtocolConstants { private static String localhost; // use different maps for server/client type UnicastConnectionManager @@ -100,8 +100,8 @@ static { catch (UnknownHostException _) { localhost = "localhost"; } - - + + } //Only one scavenger thread running globally @@ -134,7 +134,7 @@ private static void startScavenger(){ if (UnicastConnection.isExpired(conn, l)){ conns.remove(last); conn.disconnect(); - conn = null; + conn = null; }else liveon = true; //there're still live connections } @@ -159,11 +159,11 @@ private static void startScavenger(){ * Client UnicastConnectionManager constructor */ private UnicastConnectionManager(String host, int port, RMIClientSocketFactory csf) { - ssock = null; - serverName = host; - serverPort = port; - serverFactory = null; - clientFactory = csf; + ssock = null; + serverName = host; + serverPort = port; + serverFactory = null; + clientFactory = csf; connections = new ArrayList(); } @@ -172,24 +172,24 @@ private UnicastConnectionManager(String host, int port, RMIClientSocketFactory c */ private UnicastConnectionManager(int port, RMIServerSocketFactory ssf) throws RemoteException { - try { - ssock = ssf.createServerSocket(port); - serverPort = ssock.getLocalPort(); - } - catch (IOException ioex) { - ssock = null; - serverPort = 0; - throw new java.rmi.server.ExportException("can not create Server Socket on port " + port,ioex); - } - // Note that for compatibility the serverName is "localhost", - // not UnicastConnectionManager.localhost, which is the name - // of the local box. A server listening on localhost:port is - // listening on the loopback interface, 127.0.0.1, but - // UnicastConnectionManager.localhost is an externally - // accessible IP address. - serverName = "localhost"; - serverFactory = ssf; - clientFactory = null; + try { + ssock = ssf.createServerSocket(port); + serverPort = ssock.getLocalPort(); + } + catch (IOException ioex) { + ssock = null; + serverPort = 0; + throw new java.rmi.server.ExportException("can not create Server Socket on port " + port,ioex); + } + // Note that for compatibility the serverName is "localhost", + // not UnicastConnectionManager.localhost, which is the name + // of the local box. A server listening on localhost:port is + // listening on the loopback interface, 127.0.0.1, but + // UnicastConnectionManager.localhost is an externally + // accessible IP address. + serverName = "localhost"; + serverFactory = ssf; + clientFactory = null; } /** @@ -198,31 +198,31 @@ private UnicastConnectionManager(int port, RMIServerSocketFactory ssf) throws Re */ public static synchronized UnicastConnectionManager getInstance(String host, int port, RMIClientSocketFactory csf) { //System.out.println("getInstance: " + host + "," + port + "," + csf); - if (csf == null) { + if (csf == null) { csf = defaultSocketFactory; - } - // change host name to host address to avoid name resolving issues - try{ - host = InetAddress.getByName(host).getHostAddress(); + } + // change host name to host address to avoid name resolving issues + try{ + host = InetAddress.getByName(host).getHostAddress(); }catch(Exception _){} - - TripleKey key = new TripleKey(host, port, csf); - UnicastConnectionManager man = (UnicastConnectionManager)clients.get(key); - if (man == null) { - man = new UnicastConnectionManager(host, port, csf); + + TripleKey key = new TripleKey(host, port, csf); + UnicastConnectionManager man = (UnicastConnectionManager)clients.get(key); + if (man == null) { + man = new UnicastConnectionManager(host, port, csf); if (debug) { ncmanager++; System.out.println("\n\n ====== " + ncmanager + " client managers.\n\n"); } - clients.put(key, man); - + clients.put(key, man); + // Detect if client and server are in the same VM, i.e., their keys are equal UnicastConnectionManager svrman = (UnicastConnectionManager)servers.get(key); if(svrman != null){ // server and client are in the same VM man.serverobj = svrman.serverobj; } - } - return (man); + } + return (man); } /** @@ -231,50 +231,50 @@ public static synchronized UnicastConnectionManager getInstance(String host, int */ public static synchronized UnicastConnectionManager getInstance(int port, RMIServerSocketFactory ssf) throws RemoteException { //System.out.println("getInstance: " + port + "," + ssf); - if (ssf == null) { + if (ssf == null) { ssf = defaultSocketFactory; - } - TripleKey key = new TripleKey(localhost, port, ssf); - UnicastConnectionManager man = (UnicastConnectionManager)servers.get(key); - if (man == null) { - man = new UnicastConnectionManager(port, ssf); + } + TripleKey key = new TripleKey(localhost, port, ssf); + UnicastConnectionManager man = (UnicastConnectionManager)servers.get(key); + if (man == null) { + man = new UnicastConnectionManager(port, ssf); if (debug) { nsmanager++; System.out.println("\n\n ****** " + nsmanager + " server managers.\n\n"); } - // The provided port might not be the set port. - key.port = man.serverPort; - servers.put(key, man); - } - return (man); + // The provided port might not be the set port. + key.port = man.serverPort; + servers.put(key, man); + } + return (man); } /** * Get a connection from this manager. */ public UnicastConnection getConnection() throws IOException { - if (ssock == null) { - return (getClientConnection()); - } - else { - return (getServerConnection()); - } + if (ssock == null) { + return (getClientConnection()); + } + else { + return (getServerConnection()); + } } /** * Accept a connection to this server. */ private UnicastConnection getServerConnection() throws IOException { - Socket sock = ssock.accept(); + Socket sock = ssock.accept(); sock.setTcpNoDelay(true); //?? - UnicastConnection conn = new UnicastConnection(this, sock); - conn.acceptConnection(); + UnicastConnection conn = new UnicastConnection(this, sock); + conn.acceptConnection(); if (debug){ nssock++; System.out.println("\n\n ****** " + nssock + " server socks.\n\n"); } //System.out.println("Server connection " + sock); - return (conn); + return (conn); } /** @@ -283,37 +283,37 @@ private UnicastConnection getServerConnection() throws IOException { private UnicastConnection getClientConnection() throws IOException { ArrayList conns = connections; UnicastConnection conn; - + synchronized(conns) { int nconn = conns.size() - 1; - + // if there're free connections in connection pool if(nconn >= 0) { conn = (UnicastConnection)conns.get(nconn); //Should we check if conn is alive using Ping?? conns.remove(nconn); - + // Check if the connection is already expired long l = System.currentTimeMillis(); if (!UnicastConnection.isExpired(conn, l)){ return conn; }else { conn.disconnect(); - conn = null; + conn = null; } } } - - Socket sock = clientFactory.createSocket(serverName, serverPort); + + Socket sock = clientFactory.createSocket(serverName, serverPort); conn = new UnicastConnection(this, sock); - conn.makeConnection(DEFAULT_PROTOCOL); - + conn.makeConnection(DEFAULT_PROTOCOL); + if (debug) { ncsock++; System.out.println("\n\n ====== " + ncsock + " client socks.\n\n"); } - return (conn); + return (conn); } /** @@ -332,13 +332,13 @@ public void discardConnection(UnicastConnection conn) { //System.out.println("Discarding connection " + conn); //conn.disconnect(); if (ssock != null) //server connection - conn.disconnect(); + conn.disconnect(); else { // To client connection, we'd like to return back to pool UnicastConnection.resetTime(conn); //Ensure there're only one scavenger globally synchronized(GLOBAL_LOCK) { - connections.add(conn); //borrow this lock to garantee thread safety + connections.add(conn); //borrow this lock to garantee thread safety if (scavenger == null) startScavenger(); } @@ -350,15 +350,15 @@ public void discardConnection(UnicastConnection conn) { * already got one running. */ public void startServer() { - synchronized(this) { - if (ssock == null || serverThread != null) { - return; - } - serverThread = new Thread(this); + synchronized(this) { + if (ssock == null || serverThread != null) { + return; + } + serverThread = new Thread(this); // The following is not necessary when java.lang.Thread's constructor do this. // serverThread.setContextClassLoader(Thread.currentThread().getContextClassLoader()); - } - serverThread.start(); + } + serverThread.start(); } /** @@ -366,12 +366,12 @@ public void startServer() { */ public void stopServer() { synchronized(this) { - if(serverThread != null){ - serverThread = null; - try{ - ssock.close(); - }catch(Exception _){} - } + if(serverThread != null){ + serverThread = null; + try{ + ssock.close(); + }catch(Exception _){} + } } } @@ -379,26 +379,26 @@ public void stopServer() { * Server thread for connection manager. */ public void run() { - for (;serverThread != null;) { // if serverThread==null, then exit thread - try { + for (;serverThread != null;) { // if serverThread==null, then exit thread + try { //System.out.println("Waiting for connection on " + serverPort); - UnicastConnection conn = getServerConnection(); + UnicastConnection conn = getServerConnection(); - // get address of remote host for the RMIIncomingThread object - String remoteHost = null; - if (conn.sock != null) { - remoteHost = conn.sock.getInetAddress().getHostAddress(); - } + // get address of remote host for the RMIIncomingThread object + String remoteHost = null; + if (conn.sock != null) { + remoteHost = conn.sock.getInetAddress().getHostAddress(); + } - // use a thread pool to improve performance + // use a thread pool to improve performance //ConnectionRunnerPool.dispatchConnection(conn); (new RMIIncomingThread(conn, remoteHost)).start(); -// (new Thread(conn)).start(); - } - catch (Exception e) { +// (new Thread(conn)).start(); + } + catch (Exception e) { e.printStackTrace(); - } - } + } + } } /** @@ -432,9 +432,9 @@ int port; Object other; TripleKey(String host, int port, Object other) { - this.host = host; - this.port = port; - this.other = other; + this.host = host; + this.port = port; + this.other = other; } /** @@ -442,19 +442,19 @@ TripleKey(String host, int port, Object other) { * this has unusual matching behaviour. */ public int hashCode() { - return (host.hashCode() ^ other.hashCode()); + return (host.hashCode() ^ other.hashCode()); } public boolean equals(Object obj) { - if (obj instanceof TripleKey) { - TripleKey other = (TripleKey)obj; - if (this.host.equals(other.host) && - this.other == other.other && + if (obj instanceof TripleKey) { + TripleKey other = (TripleKey)obj; + if (this.host.equals(other.host) && + this.other == other.other && (this.port == other.port /* || this.port == 0 || other.port == 0*/)) { - return (true); - } - } - return (false); + return (true); + } + } + return (false); } /** diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastRef.java b/libjava/classpath/gnu/java/rmi/server/UnicastRef.java index def1acdcfc1..ca2bab51a8f 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastRef.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastRef.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -461,7 +461,7 @@ public class UnicastRef { return ("UnicastRef"); } - + /** * Return the string representing the remote reference information. */ @@ -497,7 +497,7 @@ public class UnicastRef /** * Check if this UnicastRef points to the object as the passed UnicastRef. * Both the object Id and manager must be the same. - * + * * @return true if the passed reference points to the same remote object as * this reference, false otherwise. */ diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastRemoteCall.java b/libjava/classpath/gnu/java/rmi/server/UnicastRemoteCall.java index c5206e76df2..d0d77304ce8 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastRemoteCall.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastRemoteCall.java @@ -54,7 +54,7 @@ import java.rmi.server.UID; import java.util.Vector; public class UnicastRemoteCall - implements RemoteCall, ProtocolConstants + implements RemoteCall, ProtocolConstants { private UnicastConnection conn; @@ -89,12 +89,12 @@ public class UnicastRemoteCall this.hash = hash; this.objid = objid; } - + UnicastConnection getConnection() { return conn; } - + public ObjectOutput getOutputStream() throws IOException { if (vec == null) @@ -106,33 +106,33 @@ public class UnicastRemoteCall { if (vec != null) { - oout = conn.getObjectOutputStream(); - - for (int i = 0; i < vec.size(); i += 2) - { - boolean primitive = ((Boolean)vec.elementAt(i)).booleanValue(); - Object data = vec.elementAt(i+1); + oout = conn.getObjectOutputStream(); - // No type, this is - if (!primitive) - oout.writeObject(data); - else - { - if (data instanceof Boolean) - oout.writeBoolean(((Boolean)data).booleanValue()); - else if (data instanceof Character) - oout.writeChar(((Character)data).charValue()); - else if (data instanceof Byte) - oout.writeByte(((Byte)data).byteValue()); - else if (data instanceof Short) - oout.writeShort(((Short)data).shortValue()); - else if (data instanceof Integer) - oout.writeInt(((Integer)data).intValue()); - else if (data instanceof Long) - oout.writeLong(((Long)data).longValue()); - } - } - vec = null; + for (int i = 0; i < vec.size(); i += 2) + { + boolean primitive = ((Boolean)vec.elementAt(i)).booleanValue(); + Object data = vec.elementAt(i+1); + + // No type, this is + if (!primitive) + oout.writeObject(data); + else + { + if (data instanceof Boolean) + oout.writeBoolean(((Boolean)data).booleanValue()); + else if (data instanceof Character) + oout.writeChar(((Character)data).charValue()); + else if (data instanceof Byte) + oout.writeByte(((Byte)data).byteValue()); + else if (data instanceof Short) + oout.writeShort(((Short)data).shortValue()); + else if (data instanceof Integer) + oout.writeInt(((Integer)data).intValue()); + else if (data instanceof Long) + oout.writeLong(((Long)data).longValue()); + } + } + vec = null; } if(oout != null) oout.flush(); @@ -142,14 +142,14 @@ public class UnicastRemoteCall * * (re)starts ObjectInputStream * - */ + */ public ObjectInput startInputStream() throws IOException { - if (conn != null) { - return (oin = conn.startObjectInputStream()); - } else { - return getInputStream(); // dummy Input Stream - } + if (conn != null) { + return (oin = conn.startObjectInputStream()); + } else { + return getInputStream(); // dummy Input Stream + } } @@ -157,15 +157,15 @@ public class UnicastRemoteCall { if (conn != null) { - if(oin == null) - return (oin = conn.getObjectInputStream()); - else - return oin; + if(oin == null) + return (oin = conn.getObjectInputStream()); + else + return oin; } else { - ptr = 0; - return (new DummyObjectInputStream()); + ptr = 0; + return (new DummyObjectInputStream()); } } @@ -180,34 +180,34 @@ public class UnicastRemoteCall vec = new Vector(); return new DummyObjectOutputStream(); } - + public void executeCall() throws Exception { byte returncode; ObjectInput oin; - + // signal the call when constructing try { - DataOutputStream dout = conn.getDataOutputStream(); - dout.write(MESSAGE_CALL); - - oout = conn.startObjectOutputStream(); // (re)start ObjectOutputStream - objid.write(oout); - oout.writeInt(opnum); - oout.writeLong(hash); + DataOutputStream dout = conn.getDataOutputStream(); + dout.write(MESSAGE_CALL); + + oout = conn.startObjectOutputStream(); // (re)start ObjectOutputStream + objid.write(oout); + oout.writeInt(opnum); + oout.writeLong(hash); } catch(IOException ex) { - throw new MarshalException("Try to write header but failed.", ex); + throw new MarshalException("Try to write header but failed.", ex); } try { - releaseOutputStream(); - DataInputStream din = conn.getDataInputStream(); + releaseOutputStream(); + DataInputStream din = conn.getDataInputStream(); if (din.readByte() != MESSAGE_CALL_ACK) - throw new RemoteException("Call not acked"); + throw new RemoteException("Call not acked"); oin = startInputStream(); returncode = oin.readByte(); @@ -217,31 +217,31 @@ public class UnicastRemoteCall { throw new UnmarshalException("Try to read header but failed:", ex); } - + //check return code switch(returncode) { case RETURN_ACK: //it's ok - return; + return; case RETURN_NACK: - Object returnobj; - try - { - returnobj = oin.readObject(); - } - catch(Exception ex2) - { - throw new UnmarshalException - ("Try to read exception object but failed", ex2); - } - - if(!(returnobj instanceof Exception)) - throw new UnmarshalException("Should be Exception type here: " - + returnobj); - throw (Exception)returnobj; - + Object returnobj; + try + { + returnobj = oin.readObject(); + } + catch(Exception ex2) + { + throw new UnmarshalException + ("Try to read exception object but failed", ex2); + } + + if(!(returnobj instanceof Exception)) + throw new UnmarshalException("Should be Exception type here: " + + returnobj); + throw (Exception)returnobj; + default: - throw new UnmarshalException("Invalid return code"); + throw new UnmarshalException("Invalid return code"); } } @@ -254,7 +254,7 @@ public class UnicastRemoteCall { return vec.size() > 0; } - + Object returnValue() { // This is not the first one (Boolean) but the second. diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastRemoteStub.java b/libjava/classpath/gnu/java/rmi/server/UnicastRemoteStub.java index 87e932de559..179f3017991 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastRemoteStub.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastRemoteStub.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,10 +41,10 @@ import java.rmi.server.RemoteRef; import java.rmi.server.RemoteStub; public class UnicastRemoteStub - extends RemoteStub { + extends RemoteStub { public static void setStubRef(RemoteStub stub, RemoteRef ref) { - setRef(stub, ref); + setRef(stub, ref); } } diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastServer.java b/libjava/classpath/gnu/java/rmi/server/UnicastServer.java index 7fe539546e9..db2bd2ff854 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastServer.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastServer.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -75,21 +75,21 @@ public class UnicastServer * Mapping obj itself to server ref by identity. */ static private Map refcache = Collections.synchronizedMap(new WeakIdentityHashMap()); - + /** * Mapping the registered activatable objects into they server references. */ public static Map actIds = new Hashtable(); - + /** - * The reference to the local distributed garbage collector. + * The reference to the local distributed garbage collector. */ static private DGCImpl dgc; - + /** * Connect this server reference to the server, allowing the local * implementation, associated with this object, to receive remote calls. - * + * * @param obj the server reference, encloses the (usually local) remote * object. */ @@ -100,7 +100,7 @@ public class UnicastServer refcache.put(obj.myself, obj); obj.manager.startServer(); } - + /** * Register the activatable object into the table of the activatable * objects. @@ -109,7 +109,7 @@ public class UnicastServer { actIds.put(ref.actId, ref); } - + /** * Export tha activatable object. The object id is placed into the map, * but the object itself not. This is enough to deliver call to @@ -123,8 +123,8 @@ public class UnicastServer ref.manager.startServer(); actIds.put(ref.actId, ref); } - - + + /** * Get the activatable server reference that is handling activation of the * given activation id. @@ -137,15 +137,15 @@ public class UnicastServer throw new ActivationException(id + " was not registered with this server"); return ref; } - + /** * Unregister the previously registered activatable server reference. */ public static void unregisterActivatable(ActivationID id) { - actIds.remove(id); + actIds.remove(id); } - + // FIX ME: I haven't handle force parameter /** * Remove the given server reference. The remote object, associated with @@ -156,7 +156,7 @@ public class UnicastServer objects.remove(obj.objid); refcache.remove(obj.myself); obj.manager.stopServer(); - + if (obj instanceof ActivatableServerRef) { ActivationID id = ((ActivatableServerRef) obj).actId; @@ -164,15 +164,15 @@ public class UnicastServer } return true; } - + /** * Get the exported reference of the given Remote. The identity map is used, * the non-null value will only be returned if exactly the passed remote - * is part of the registered UnicastServerRef. - * - * @param remote the Remote that is connected to this server via + * is part of the registered UnicastServerRef. + * + * @param remote the Remote that is connected to this server via * {@link UnicastServerRef}. - * + * * @return the UnicastServerRef that is used to connect the passed * remote with this server or null, if this Remote is not connected * to this server. @@ -186,7 +186,7 @@ public class UnicastServer * Get the server references to the object, previously exported via this * server. As the identity map is scanned, more than one reference may match * this Id. - * + * * @param id the id of the exported object * @return the server reference to this object, null if none. */ @@ -244,10 +244,10 @@ public class UnicastServer throw new Exception("bad method type"); } } - + /** * This method is invoked when the remote call is received. The method - * dispatches the call to the responsible object, connected to this + * dispatches the call to the responsible object, connected to this * server via UnicastServerReference. */ private static void incomingMessageCall(UnicastConnection conn) @@ -287,7 +287,7 @@ public class UnicastServer catch (Error e) { returnval = new ServerError( - "Server error, ObjID: " + objid + + "Server error, ObjID: " + objid + ", method: " + method + ", hash: "+ hash, e); returncode = RETURN_NACK; } diff --git a/libjava/classpath/gnu/java/rmi/server/UnicastServerRef.java b/libjava/classpath/gnu/java/rmi/server/UnicastServerRef.java index 2f7cb9a2d94..59a9f080be9 100644 --- a/libjava/classpath/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/classpath/gnu/java/rmi/server/UnicastServerRef.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -60,39 +60,39 @@ import java.util.Iterator; /** * This class connects the local, remotely available (exported) object to - * the local RMI server that accepts the remote calls. + * the local RMI server that accepts the remote calls. */ public class UnicastServerRef extends UnicastRef -{ +{ /** * Use GNU Classpath v 0.20 SVUID for interoperability */ private static final long serialVersionUID = - 5585608108300801246L; - + /** - * The class array, defining parameters of the jdk 1.2 RMI stub constructor. + * The class array, defining parameters of the jdk 1.2 RMI stub constructor. */ private static final Class[] stubprototype = new Class[] { RemoteRef.class }; - + /** * The exported remote object itself. */ Remote myself; // save the remote object itself - + /** * The skeleton (if any), associated with the exported remote object. */ protected Skeleton skel; - + /** * The stub, associated with the exported remote object (may be proxy class). */ protected Remote stub; - + /** - * The method table (RMI hash code to method) of the methods of the + * The method table (RMI hash code to method) of the methods of the * exported object. */ protected Hashtable methods = new Hashtable(); @@ -110,15 +110,15 @@ public class UnicastServerRef super(id); manager = UnicastConnectionManager.getInstance(port, ssf); } - + /** * Export the object and return its remote stub. The method tries to locate * existing stubs and skeletons. If this fails, the method instantiates the * proxy stub class. - * - * Stubs and skeletons are always ignored (even if present) if the + * + * Stubs and skeletons are always ignored (even if present) if the * java.rmi.server.ignoreStubClasses property is set to true. - * + * * @param obj the object being exported. * @return the stub (existing class or proxy) of the exported object. * @throws RemoteException if the export failed due any reason @@ -133,17 +133,17 @@ public class UnicastServerRef manager.serverobj = obj; String ignoreStubs; - - ClassLoader loader =obj.getClass().getClassLoader(); - + + ClassLoader loader =obj.getClass().getClassLoader(); + // Stubs are always searched for the bootstrap classes that may have // obsolete pattern and may still need also skeletons. if (loader==null) ignoreStubs = "false"; else - ignoreStubs = System.getProperty("java.rmi.server.ignoreStubClasses", + ignoreStubs = System.getProperty("java.rmi.server.ignoreStubClasses", "false"); - + if (! ignoreStubs.equals("true")) { // Find and install the stub @@ -172,21 +172,21 @@ public class UnicastServerRef return stub; } - + /** * Get the stub (actual class or proxy) of the exported remote object. - * + * * @return the remote stub (null if exportObject has not been called). */ public Remote getStub() { return stub; } - + /** - * Unexport the object (remove methods from the method hashcode table + * Unexport the object (remove methods from the method hashcode table * and call UnicastServer.unexportObject. - * + * * @param obj the object being unexported * @param force passed to the UnicastServer.unexportObject. * @return value, returned by the UnicastServer.unexportObject. @@ -202,7 +202,7 @@ public class UnicastServerRef * Return the class in the hierarchy for that the stub class is defined. * The Subs/Skels might not there for the actual class, but maybe for one of * the superclasses. - * + * * @return the class having stub defined, null if none. */ protected Class findStubSkelClass(Class startCls) @@ -231,17 +231,17 @@ public class UnicastServerRef } } } - + /** - * Get the helper (assisting) class with the given type. - * + * Get the helper (assisting) class with the given type. + * * @param cls the class, for that the helper class is requested. This class * and the requested helper class must share the same class loader. - * + * * @param type the type of the assisting helper. The only currently supported * non deprecated value is "_Stub" (load jdk 1.1 or 1.2 RMI stub). Another * (deprecated) value is "_Skel" (load skeleton). - * + * * @return the instantiated instance of the helper class or null if the * helper class cannot be found or instantiated. */ @@ -303,14 +303,14 @@ public class UnicastServerRef { return RemoteServer.getClientHost(); } - + /** * Build the method has code table and put it into {@link #methods} * (mapping RMI hashcode tos method). The same method is used to remove * the table. - * - * @param cls the class for that the method table is built. - * @param build if true, the class methods are added to the table. If + * + * @param cls the class for that the method table is built. + * @param build if true, the class methods are added to the table. If * false, they are removed from the table. */ protected void buildMethodHash(Class cls, boolean build) @@ -342,7 +342,7 @@ public class UnicastServerRef else return null; } - + /** * This method is called from the {@link UnicastServer#incomingMessageCall} * to deliver the remote call to this object. @@ -422,7 +422,7 @@ public class UnicastServerRef { if (skel == null) throw new NoSuchMethodException("JDK 1.1 call - Skeleton required"); - + UnicastRemoteCall call = new UnicastRemoteCall(conn); skel.dispatch(myself, call, method, hash); if (! call.isReturnValue()) @@ -431,16 +431,16 @@ public class UnicastServerRef return (call.returnValue()); } } - + /** * Create the 1.2 proxy stub in the case when the pre-generated stub is not * available of the system is explicitly instructed to use proxy stubs. - * + * * @param stubFor the class for that the proxy class must be constructed. * @param reference the remote reference, used to find the given object - * + * * @return the applicable proxy stub. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ Remote createProxyStub(Class stubFor, RemoteRef reference) @@ -467,17 +467,15 @@ public class UnicastServerRef for (int i = 0; i < intfs.length; i++) intfs[i] = (Class) it.next(); - - RemoteObjectInvocationHandler handler = + + RemoteObjectInvocationHandler handler = new RemoteObjectInvocationHandler(reference); - - Object proxy = + + Object proxy = Proxy.newProxyInstance(stubFor.getClassLoader(), intfs, handler); return (Remote) proxy; } - + } - - diff --git a/libjava/classpath/gnu/java/security/Engine.java b/libjava/classpath/gnu/java/security/Engine.java index 6c39d46acc6..969fcef6ce5 100644 --- a/libjava/classpath/gnu/java/security/Engine.java +++ b/libjava/classpath/gnu/java/security/Engine.java @@ -58,7 +58,7 @@ import java.util.Enumeration; * represents. * * @see Provider - * @author Casey Marshall + * @author Casey Marshall */ public final class Engine { @@ -85,7 +85,7 @@ public final class Engine * Return the implementation for algorithm for service service * from provider. The service is e.g. "Signature", and the algorithm * "DSA". - * + * * @param service The service name. * @param algorithm The name of the algorithm to get. * @param provider The provider to get the implementation from. @@ -111,7 +111,7 @@ public final class Engine * constructor (which cannot be null; pass a zero-length array if the SPI * takes no arguments). The service is e.g. "Signature", and the algorithm * "DSA". - * + * * @param service The service name. * @param algorithm The name of the algorithm to get. * @param provider The provider to get the implementation from. @@ -159,7 +159,7 @@ public final class Engine if (key.equalsIgnoreCase(service + "." + algorithm)) { // remove the service portion from the key - algorithm = key.substring(service.length() + 1); + algorithm = key.substring(service.length() + 1); algorithmFound = true; break; } diff --git a/libjava/classpath/gnu/java/security/OID.java b/libjava/classpath/gnu/java/security/OID.java index a3d70e22019..c7efe6557ca 100644 --- a/libjava/classpath/gnu/java/security/OID.java +++ b/libjava/classpath/gnu/java/security/OID.java @@ -75,7 +75,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable /* Serial version id for serialization. */ static final long serialVersionUID = 5722492029044597779L; - + /** * The numeric ID structure. */ diff --git a/libjava/classpath/gnu/java/security/PolicyFile.java b/libjava/classpath/gnu/java/security/PolicyFile.java index e9c811644df..0560bce0732 100644 --- a/libjava/classpath/gnu/java/security/PolicyFile.java +++ b/libjava/classpath/gnu/java/security/PolicyFile.java @@ -154,7 +154,7 @@ public final class PolicyFile extends Policy // Added to cut redundant AccessController.doPrivileged calls private static GetPropertyAction prop = new GetPropertyAction("file.separator"); private static final String fs = (String) AccessController.doPrivileged(prop); - + private static final String DEFAULT_POLICY = (String) AccessController.doPrivileged(prop.setParameters("java.home")) + fs + "lib" + fs + "security" + fs + "java.policy"; @@ -536,7 +536,7 @@ public final class PolicyFile extends Policy if (clazz == null) { currentPerms.add(new UnresolvedPermission(className, - null, null, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); + null, null, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); continue; } try @@ -558,7 +558,7 @@ public final class PolicyFile extends Policy if (clazz == null) { currentPerms.add(new UnresolvedPermission(className, - target, null, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); + target, null, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); continue; } try @@ -601,7 +601,7 @@ public final class PolicyFile extends Policy if (clazz == null) { currentPerms.add(new UnresolvedPermission(className, - target, action, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); + target, action, (Certificate[]) currentCerts.toArray(new Certificate[currentCerts.size()]))); continue; } else diff --git a/libjava/classpath/gnu/java/security/Properties.java b/libjava/classpath/gnu/java/security/Properties.java index a515a54280a..2213bde0607 100644 --- a/libjava/classpath/gnu/java/security/Properties.java +++ b/libjava/classpath/gnu/java/security/Properties.java @@ -90,7 +90,7 @@ public final class Properties /** * Returns the string representation of the library global configuration * property with the designated key. - * + * * @param key the case-insensitive, non-null and non-empty name of a * configuration property. * @return the string representation of the designated property, or @@ -113,7 +113,7 @@ public final class Properties /** * Sets the value of a designated library global configuration property, to a * string representation of what should be a legal value. - * + * * @param key the case-insensitive, non-null and non-empty name of a * configuration property. * @param value the non-null, non-empty string representation of a legal value @@ -151,7 +151,7 @@ public final class Properties * A convenience method that returns, as a boolean, the library global * configuration property indicating if the default Pseudo Random Number * Generator produces, or not, the same bit stream when instantiated. - * + * * @return true if the default PRNG produces the same bit * stream with every VM instance. Returns false if the * default PRNG is seeded with the time of day of its first @@ -171,7 +171,7 @@ public final class Properties * block ciphers check, or not, for possible/potential weak and semi-weak keys * that may be produced in the course of generating round encryption and/or * decryption keys. - * + * * @return true if the cipher implementations check for weak * and semi-weak keys. Returns false if the cipher * implementations do not check for weak or semi-weak keys. @@ -188,7 +188,7 @@ public final class Properties * A convenience method that returns, as a boolean, the library global * configuration property indicating if RSA decryption (RSADP primitive), * does, or not, blinding against timing attacks. - * + * * @return true if the RSA decryption primitive includes a * blinding operation. Returns false if the RSA * decryption primitive does not include the additional blinding @@ -205,7 +205,7 @@ public final class Properties /** * A convenience method to set the global property for reproducibility of the * default PRNG bit stream output. - * + * * @param value if true then the default PRNG bit stream output * is the same with every invocation of the VM. */ @@ -221,7 +221,7 @@ public final class Properties /** * A convenience method to set the global property for checking for weak and * semi-weak cipher keys. - * + * * @param value if true then the cipher implementations will * invoke additional checks for weak and semi-weak key values that * may get generated. @@ -238,7 +238,7 @@ public final class Properties /** * A convenience method to set the global property fo adding a blinding * operation when executing the RSA decryption primitive. - * + * * @param value if true then the code for performing the RSA * decryption primitive will include a blinding operation. */ diff --git a/libjava/classpath/gnu/java/security/Registry.java b/libjava/classpath/gnu/java/security/Registry.java index 053d7177833..4ce5044ab6d 100644 --- a/libjava/classpath/gnu/java/security/Registry.java +++ b/libjava/classpath/gnu/java/security/Registry.java @@ -1,4 +1,4 @@ -/* Registry.java -- +/* Registry.java -- Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/Requires.java b/libjava/classpath/gnu/java/security/Requires.java index c820336c01e..6b52bd16836 100644 --- a/libjava/classpath/gnu/java/security/Requires.java +++ b/libjava/classpath/gnu/java/security/Requires.java @@ -46,8 +46,8 @@ import static java.lang.annotation.RetentionPolicy.CLASS; import java.security.Permission; /** - * - * + * + * * @author Casey Marshall (csm@gnu.org) */ @Documented @Retention(CLASS) @Target(METHOD) diff --git a/libjava/classpath/gnu/java/security/action/GetPropertyAction.java b/libjava/classpath/gnu/java/security/action/GetPropertyAction.java index 0c8141a4d9b..7295d8d5ab1 100644 --- a/libjava/classpath/gnu/java/security/action/GetPropertyAction.java +++ b/libjava/classpath/gnu/java/security/action/GetPropertyAction.java @@ -57,7 +57,7 @@ public class GetPropertyAction implements PrivilegedAction public GetPropertyAction() { } - + public GetPropertyAction(String propName) { setParameters(propName); @@ -67,12 +67,12 @@ public class GetPropertyAction implements PrivilegedAction { setParameters(propName, defaultValue); } - + public String run() { return System.getProperty(name, value); } - + public GetPropertyAction setParameters(String propName) { this.name = propName; diff --git a/libjava/classpath/gnu/java/security/action/SetAccessibleAction.java b/libjava/classpath/gnu/java/security/action/SetAccessibleAction.java index 77e5fc988b8..d3e3c0f9085 100644 --- a/libjava/classpath/gnu/java/security/action/SetAccessibleAction.java +++ b/libjava/classpath/gnu/java/security/action/SetAccessibleAction.java @@ -41,7 +41,7 @@ import java.lang.reflect.AccessibleObject; import java.security.PrivilegedAction; /** - * PrivilegedAction implementation that calls setAccessible(true) on the + * PrivilegedAction implementation that calls setAccessible(true) on the * AccessibleObject passed to its constructor. * * Example of use: @@ -53,22 +53,22 @@ import java.security.PrivilegedAction; public class SetAccessibleAction implements PrivilegedAction { AccessibleObject member; - + public SetAccessibleAction() { } - + public SetAccessibleAction(AccessibleObject member) { this.member = member; } - + public Object run() { member.setAccessible(true); return null; } - + public SetAccessibleAction setMember(AccessibleObject member) { this.member = member; diff --git a/libjava/classpath/gnu/java/security/der/DERValue.java b/libjava/classpath/gnu/java/security/der/DERValue.java index d98ce78ec55..2cbe3457333 100644 --- a/libjava/classpath/gnu/java/security/der/DERValue.java +++ b/libjava/classpath/gnu/java/security/der/DERValue.java @@ -173,11 +173,11 @@ public class DERValue implements DER public String toString() { String start = "DERValue ( ["; - if (tagClass == DER.UNIVERSAL) + if (tagClass == DER.UNIVERSAL) start = start + "UNIVERSAL "; - else if (tagClass == DER.PRIVATE) + else if (tagClass == DER.PRIVATE) start = start + "PRIVATE "; - else if (tagClass == DER.APPLICATION) + else if (tagClass == DER.APPLICATION) start = start + "APPLICATION "; start = start + tag + "] constructed=" + constructed + ", value="; if (constructed) diff --git a/libjava/classpath/gnu/java/security/hash/BaseHash.java b/libjava/classpath/gnu/java/security/hash/BaseHash.java index ff1750aeae0..bab930f28e1 100644 --- a/libjava/classpath/gnu/java/security/hash/BaseHash.java +++ b/libjava/classpath/gnu/java/security/hash/BaseHash.java @@ -1,4 +1,4 @@ -/* BaseHash.java -- +/* BaseHash.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -61,7 +61,7 @@ public abstract class BaseHash /** * Trivial constructor for use by concrete subclasses. - * + * * @param name the canonical name prefix of this instance. * @param hashSize the block size of the output in bytes. * @param blockSize the block size of the internal transform. @@ -156,7 +156,7 @@ public abstract class BaseHash /** * Returns the byte array to use as padding before completing a hash * operation. - * + * * @return the bytes to pad the remaining bytes in the buffer before * completing a hash operation. */ @@ -164,7 +164,7 @@ public abstract class BaseHash /** * Constructs the result from the contents of the current context. - * + * * @return the output of the completed hash operation. */ protected abstract byte[] getResult(); @@ -174,7 +174,7 @@ public abstract class BaseHash /** * The block digest transformation per se. - * + * * @param in the blockSize long block, as an array of bytes to digest. * @param offset the index where the data to digest is located within the * input buffer. diff --git a/libjava/classpath/gnu/java/security/hash/HashFactory.java b/libjava/classpath/gnu/java/security/hash/HashFactory.java index 2a4e487858c..1210ff4db2f 100644 --- a/libjava/classpath/gnu/java/security/hash/HashFactory.java +++ b/libjava/classpath/gnu/java/security/hash/HashFactory.java @@ -1,4 +1,4 @@ -/* HashFactory.java -- +/* HashFactory.java -- Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -57,7 +57,7 @@ public class HashFactory /** * Return an instance of a hash algorithm given its name. - * + * * @param name the name of the hash algorithm. * @return an instance of the hash algorithm, or null if none found. * @exception InternalError if the implementation does not pass its self- @@ -111,7 +111,7 @@ public class HashFactory /** * Returns a {@link Set} of names of hash algorithms supported by this * Factory. - * + * * @return a {@link Set} of hash names (Strings). */ public static final Set getNames() diff --git a/libjava/classpath/gnu/java/security/hash/Haval.java b/libjava/classpath/gnu/java/security/hash/Haval.java index 662934f34ea..15c30393450 100644 --- a/libjava/classpath/gnu/java/security/hash/Haval.java +++ b/libjava/classpath/gnu/java/security/hash/Haval.java @@ -1,4 +1,4 @@ -/* Haval.java -- +/* Haval.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -105,7 +105,7 @@ public class Haval /** * Calls the constructor with two arguments using the designated output size, * and {@link #HAVAL_3_ROUND} for the value of number of rounds. - * + * * @param size the output size in bytes of this instance. * @throws IllegalArgumentException if the designated output size is invalid. * @see #HAVAL_128_BIT @@ -125,7 +125,7 @@ public class Haval * 20, 24, 28 and * 32. Valid values for rounds are in the range * 3..5 inclusive. - * + * * @param size the output size in bytes of this instance. * @param rounds the number of rounds to apply when transforming data. * @throws IllegalArgumentException if the designated output size is invalid, @@ -160,7 +160,7 @@ public class Haval /** * Private constructor for cloning purposes. - * + * * @param md the instance to clone. */ private Haval(Haval md) diff --git a/libjava/classpath/gnu/java/security/hash/IMessageDigest.java b/libjava/classpath/gnu/java/security/hash/IMessageDigest.java index 2c5bdd41a57..9b716e5965f 100644 --- a/libjava/classpath/gnu/java/security/hash/IMessageDigest.java +++ b/libjava/classpath/gnu/java/security/hash/IMessageDigest.java @@ -1,4 +1,4 @@ -/* IMessageDigest.java -- +/* IMessageDigest.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -49,28 +49,28 @@ public interface IMessageDigest { /** * Returns the canonical name of this algorithm. - * + * * @return the canonical name of this instance. */ String name(); /** * Returns the output length in bytes of this message digest algorithm. - * + * * @return the output length in bytes of this message digest algorithm. */ int hashSize(); /** * Returns the algorithm's (inner) block size in bytes. - * + * * @return the algorithm's inner block size in bytes. */ int blockSize(); /** * Continues a message digest operation using the input byte. - * + * * @param b the input byte to digest. */ void update(byte b); @@ -79,7 +79,7 @@ public interface IMessageDigest * Continues a message digest operation, by filling the buffer, processing * data in the algorithm's HASH_SIZE-bit block(s), updating the context and * count, and buffering the remaining bytes in buffer for the next operation. - * + * * @param in the input block. */ void update(byte[] in); @@ -88,7 +88,7 @@ public interface IMessageDigest * Continues a message digest operation, by filling the buffer, processing * data in the algorithm's HASH_SIZE-bit block(s), updating the context and * count, and buffering the remaining bytes in buffer for the next operation. - * + * * @param in the input block. * @param offset start of meaningful bytes in input block. * @param length number of bytes, in input block, to consider. @@ -98,7 +98,7 @@ public interface IMessageDigest /** * Completes the message digest by performing final operations such as padding * and resetting the instance. - * + * * @return the array of bytes representing the hash value. */ byte[] digest(); @@ -112,7 +112,7 @@ public interface IMessageDigest /** * A basic test. Ensures that the digest of a pre-determined message is equal * to a known pre-computed value. - * + * * @return true if the implementation passes a basic self-test. * Returns false otherwise. */ @@ -120,7 +120,7 @@ public interface IMessageDigest /** * Returns a clone copy of this instance. - * + * * @return a clone copy of this instance. */ Object clone(); diff --git a/libjava/classpath/gnu/java/security/hash/MD2.java b/libjava/classpath/gnu/java/security/hash/MD2.java index 8f6b265b037..d78af93fabd 100644 --- a/libjava/classpath/gnu/java/security/hash/MD2.java +++ b/libjava/classpath/gnu/java/security/hash/MD2.java @@ -1,4 +1,4 @@ -/* MD2.java -- +/* MD2.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/MD4.java b/libjava/classpath/gnu/java/security/hash/MD4.java index dfc1c6bd69f..e6ac11bc8a7 100644 --- a/libjava/classpath/gnu/java/security/hash/MD4.java +++ b/libjava/classpath/gnu/java/security/hash/MD4.java @@ -1,4 +1,4 @@ -/* MD4.java -- +/* MD4.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/MD5.java b/libjava/classpath/gnu/java/security/hash/MD5.java index 653078512d5..dfffd3c8073 100644 --- a/libjava/classpath/gnu/java/security/hash/MD5.java +++ b/libjava/classpath/gnu/java/security/hash/MD5.java @@ -1,4 +1,4 @@ -/* MD5.java -- +/* MD5.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/RipeMD128.java b/libjava/classpath/gnu/java/security/hash/RipeMD128.java index 62f5a05e5bf..bd0adc5e094 100644 --- a/libjava/classpath/gnu/java/security/hash/RipeMD128.java +++ b/libjava/classpath/gnu/java/security/hash/RipeMD128.java @@ -1,4 +1,4 @@ -/* RipeMD128.java -- +/* RipeMD128.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/RipeMD160.java b/libjava/classpath/gnu/java/security/hash/RipeMD160.java index 7949bc2547c..795f5a4b0cf 100644 --- a/libjava/classpath/gnu/java/security/hash/RipeMD160.java +++ b/libjava/classpath/gnu/java/security/hash/RipeMD160.java @@ -1,4 +1,4 @@ -/* RipeMD160.java -- +/* RipeMD160.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Sha160.java b/libjava/classpath/gnu/java/security/hash/Sha160.java index 6adeba07079..88bf0e40542 100644 --- a/libjava/classpath/gnu/java/security/hash/Sha160.java +++ b/libjava/classpath/gnu/java/security/hash/Sha160.java @@ -1,4 +1,4 @@ -/* Sha160.java -- +/* Sha160.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Sha256.java b/libjava/classpath/gnu/java/security/hash/Sha256.java index 536b1c8bab3..76e28d4e02e 100644 --- a/libjava/classpath/gnu/java/security/hash/Sha256.java +++ b/libjava/classpath/gnu/java/security/hash/Sha256.java @@ -1,4 +1,4 @@ -/* Sha256.java -- +/* Sha256.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Sha384.java b/libjava/classpath/gnu/java/security/hash/Sha384.java index a47eb67db95..5fea4f3b1e6 100644 --- a/libjava/classpath/gnu/java/security/hash/Sha384.java +++ b/libjava/classpath/gnu/java/security/hash/Sha384.java @@ -1,4 +1,4 @@ -/* Sha384.java -- +/* Sha384.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Sha512.java b/libjava/classpath/gnu/java/security/hash/Sha512.java index e6f553ed40a..17c4323fad5 100644 --- a/libjava/classpath/gnu/java/security/hash/Sha512.java +++ b/libjava/classpath/gnu/java/security/hash/Sha512.java @@ -1,4 +1,4 @@ -/* Sha512.java -- +/* Sha512.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Tiger.java b/libjava/classpath/gnu/java/security/hash/Tiger.java index 101df39efe9..d2993db9faf 100644 --- a/libjava/classpath/gnu/java/security/hash/Tiger.java +++ b/libjava/classpath/gnu/java/security/hash/Tiger.java @@ -1,4 +1,4 @@ -/* Tiger.java -- +/* Tiger.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/hash/Whirlpool.java b/libjava/classpath/gnu/java/security/hash/Whirlpool.java index aebe1acb699..574104074bb 100644 --- a/libjava/classpath/gnu/java/security/hash/Whirlpool.java +++ b/libjava/classpath/gnu/java/security/hash/Whirlpool.java @@ -1,4 +1,4 @@ -/* Whirlpool.java -- +/* Whirlpool.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -548,7 +548,7 @@ public final class Whirlpool // so far. hence the minimal number of bytes added to the message proper // are 33 (1 for the 1-bit followed by the 0-bits and the encoding of // the count framed in a 256-bit block). our formula is then: - // count + 33 + padding = 0 (mod BLOCK_SIZE) + // count + 33 + padding = 0 (mod BLOCK_SIZE) int n = (int)((count + 33) % BLOCK_SIZE); int padding = n == 0 ? 33 : BLOCK_SIZE - n + 33; byte[] result = new byte[padding]; diff --git a/libjava/classpath/gnu/java/security/jce/hash/HavalSpi.java b/libjava/classpath/gnu/java/security/jce/hash/HavalSpi.java index 159ba3dd8ff..7c0a6027b4e 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/HavalSpi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/HavalSpi.java @@ -1,4 +1,4 @@ -/* HavalSpi.java -- +/* HavalSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/MD2Spi.java b/libjava/classpath/gnu/java/security/jce/hash/MD2Spi.java index 268f2fa6941..76def7acb8b 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/MD2Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/MD2Spi.java @@ -1,4 +1,4 @@ -/* MD2Spi.java -- +/* MD2Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/MD4Spi.java b/libjava/classpath/gnu/java/security/jce/hash/MD4Spi.java index c050ef2df7f..125943d3088 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/MD4Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/MD4Spi.java @@ -1,4 +1,4 @@ -/* MD4Spi.java -- +/* MD4Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/MD5Spi.java b/libjava/classpath/gnu/java/security/jce/hash/MD5Spi.java index 6297416940e..25d9240b42e 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/MD5Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/MD5Spi.java @@ -1,4 +1,4 @@ -/* MD5Spi.java -- +/* MD5Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java b/libjava/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java index 7342ee55123..2651ecf92cb 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java +++ b/libjava/classpath/gnu/java/security/jce/hash/MessageDigestAdapter.java @@ -1,4 +1,4 @@ -/* MessageDigestAdapter.java -- +/* MessageDigestAdapter.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -69,7 +69,7 @@ class MessageDigestAdapter /** * Trivial protected constructor. - * + * * @param mdName the canonical name of the hash algorithm. */ protected MessageDigestAdapter(String mdName) @@ -79,7 +79,7 @@ class MessageDigestAdapter /** * Private constructor for cloning purposes. - * + * * @param adaptee a clone of the underlying hash algorithm instance. */ private MessageDigestAdapter(IMessageDigest adaptee) diff --git a/libjava/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java b/libjava/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java index 159a1173c15..499996c02fa 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/RipeMD128Spi.java @@ -1,4 +1,4 @@ -/* RipeMD128Spi.java -- +/* RipeMD128Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java b/libjava/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java index 579ccb26f14..a62bea6c0f5 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/RipeMD160Spi.java @@ -1,4 +1,4 @@ -/* RipeMD160Spi.java -- +/* RipeMD160Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/Sha160Spi.java b/libjava/classpath/gnu/java/security/jce/hash/Sha160Spi.java index 901cac19158..ea2dfe24c01 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/Sha160Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/Sha160Spi.java @@ -1,4 +1,4 @@ -/* Sha160Spi.java -- +/* Sha160Spi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/Sha256Spi.java b/libjava/classpath/gnu/java/security/jce/hash/Sha256Spi.java index 9d471e65a66..39d31d07b82 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/Sha256Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/Sha256Spi.java @@ -1,4 +1,4 @@ -/* Sha256Spi.java -- +/* Sha256Spi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/Sha384Spi.java b/libjava/classpath/gnu/java/security/jce/hash/Sha384Spi.java index 30d5fce09bc..fa1e3f94834 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/Sha384Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/Sha384Spi.java @@ -1,4 +1,4 @@ -/* Sha384Spi.java -- +/* Sha384Spi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/Sha512Spi.java b/libjava/classpath/gnu/java/security/jce/hash/Sha512Spi.java index a2d44ab2461..4bd39daedc2 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/Sha512Spi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/Sha512Spi.java @@ -1,4 +1,4 @@ -/* Sha512Spi.java -- +/* Sha512Spi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/TigerSpi.java b/libjava/classpath/gnu/java/security/jce/hash/TigerSpi.java index a21e5fe1081..3d38c847f63 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/TigerSpi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/TigerSpi.java @@ -1,4 +1,4 @@ -/* TigerSpi.java -- +/* TigerSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java b/libjava/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java index d7a7a4504d4..68a3a705987 100644 --- a/libjava/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java +++ b/libjava/classpath/gnu/java/security/jce/hash/WhirlpoolSpi.java @@ -1,4 +1,4 @@ -/* WhirlpoolSpi.java -- +/* WhirlpoolSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java index c3d4b941261..ebf80f2d702 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/HavalRandomSpi.java @@ -1,4 +1,4 @@ -/* HavalRandomSpi.java -- +/* HavalRandomSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java index 8ba286804e6..8b9abe4e96f 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/MD2RandomSpi.java @@ -1,4 +1,4 @@ -/* MD2RandomSpi.java -- +/* MD2RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java index d4d182970c7..2a71d6a0d27 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/MD4RandomSpi.java @@ -1,4 +1,4 @@ -/* MD4RandomSpi.java -- +/* MD4RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java index be38add0a0d..8fb50e16fe5 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/MD5RandomSpi.java @@ -1,4 +1,4 @@ -/* MD5RandomSpi.java -- +/* MD5RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java index 530c3ec2141..6f8dde0e062 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/RipeMD128RandomSpi.java @@ -1,4 +1,4 @@ -/* RipeMD128RandomSpi.java -- +/* RipeMD128RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java index 6875cdfa91a..6bb4e2b50c4 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/RipeMD160RandomSpi.java @@ -1,4 +1,4 @@ -/* RipeMD160RandomSpi.java -- +/* RipeMD160RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java b/libjava/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java index 5877e3edb6c..9307cfa7fb4 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java +++ b/libjava/classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java @@ -1,4 +1,4 @@ -/* SecureRandomAdapter.java -- +/* SecureRandomAdapter.java -- Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -68,7 +68,7 @@ import java.net.URL; *

      All the abstract methods in the {@link SecureRandomSpi} class are * implemented by this class and all its sub-classes.

      */ -public abstract class SecureRandomAdapter +public abstract class SecureRandomAdapter extends SecureRandomSpi { @@ -100,7 +100,7 @@ public abstract class SecureRandomAdapter } public static final byte[] getSeed(int numBytes) - { + { URL sourceUrl = null; String urlStr = null; @@ -117,7 +117,7 @@ public abstract class SecureRandomAdapter catch (MalformedURLException ignored) { logger.log(Level.WARNING, - SECURERANDOM_SOURCE + " property is malformed: {0}", + SECURERANDOM_SOURCE + " property is malformed: {0}", urlStr); } @@ -132,7 +132,7 @@ public abstract class SecureRandomAdapter catch (MalformedURLException mue) { logger.log(Level.WARNING, - JAVA_SECURITY_EGD + " property is malformed: {0}", + JAVA_SECURITY_EGD + " property is malformed: {0}", urlStr); } } diff --git a/libjava/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java index 9fded67e0ce..ba4d222658d 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/Sha160RandomSpi.java @@ -1,4 +1,4 @@ -/* Sha160RandomSpi.java -- +/* Sha160RandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java index e3999ffe6e9..a6ddb70afc0 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java @@ -1,4 +1,4 @@ -/* Sha256RandomSpi.java -- +/* Sha256RandomSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java index 978c8fe38b2..4954b1be7e2 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java @@ -1,4 +1,4 @@ -/* Sha384RandomSpi.java -- +/* Sha384RandomSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java index a89e26f004e..27de7f31991 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java @@ -1,4 +1,4 @@ -/* Sha512RandomSpi.java -- +/* Sha512RandomSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java index ba4b22fb892..722ab327921 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/TigerRandomSpi.java @@ -1,4 +1,4 @@ -/* TigerRandomSpi.java -- +/* TigerRandomSpi.java -- Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java b/libjava/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java index 9d937e65f3e..5da43d77ef1 100644 --- a/libjava/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java +++ b/libjava/classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java @@ -1,4 +1,4 @@ -/* WhirlpoolRandomSpi.java -- +/* WhirlpoolRandomSpi.java -- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java b/libjava/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java index 7b57dba70a5..ec993432ce0 100644 --- a/libjava/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java +++ b/libjava/classpath/gnu/java/security/jce/sig/DSSKeyFactory.java @@ -61,7 +61,7 @@ import java.security.spec.X509EncodedKeySpec; /** * DSA key factory. - * + * * @author Casey Marshall (rsdio@metastatic.org) */ public class DSSKeyFactory diff --git a/libjava/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java b/libjava/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java index c4453810653..2d33e16217c 100644 --- a/libjava/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java +++ b/libjava/classpath/gnu/java/security/jce/sig/DSSKeyPairGeneratorSpi.java @@ -1,4 +1,4 @@ -/* DSSKeyPairGeneratorSpi.java -- +/* DSSKeyPairGeneratorSpi.java -- Copyright 2001, 2002, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java b/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java index 8a1cb4ca502..fbf778dae89 100644 --- a/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java +++ b/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java @@ -99,8 +99,8 @@ public class DSSParameters /** * Decodes the set of DSS parameters as per RFC-2459; i.e. the DER-encoded - * form of the following ASN.1 construct: - * + * form of the following ASN.1 construct: + * * 
          *   DssParams ::= SEQUENCE {
    *     p   INTEGER,
@@ -152,8 +152,8 @@ public class DSSParameters
 
   /**
    * Encodes the set of DSS parameters as per RFC-2459; i.e. as the DER-encoded
-   * form of the following ASN.1 construct: 
-   * 
+   * form of the following ASN.1 construct:
+   *
    * 
          *   DssParams ::= SEQUENCE {
    *     p   INTEGER,
diff --git a/libjava/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java b/libjava/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java
index 9b20c03b110..edee4e577e6 100644
--- a/libjava/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/DSSRawSignatureSpi.java
@@ -1,4 +1,4 @@
-/* DSSRawSignatureSpi.java -- 
+/* DSSRawSignatureSpi.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java b/libjava/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java
index bcbbe477d1e..9d3e5efdd02 100644
--- a/libjava/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/KeyPairGeneratorAdapter.java
@@ -1,4 +1,4 @@
-/* KeyPairGeneratorAdapter.java -- 
+/* KeyPairGeneratorAdapter.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public abstract class KeyPairGeneratorAdapter
 
   /**
    * Trivial protected constructor.
-   * 
+   *
    * @param kpgName the canonical name of the keypair generator algorithm.
    */
   protected KeyPairGeneratorAdapter(String kpgName)
diff --git a/libjava/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java b/libjava/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java
index f1ccbde4dc2..496c9caa6f4 100644
--- a/libjava/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/RSAPSSRawSignatureSpi.java
@@ -1,4 +1,4 @@
-/* RSAPSSRawSignatureSpi.java -- 
+/* RSAPSSRawSignatureSpi.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java b/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java
index a65d727eed3..0ed1e2f41fd 100644
--- a/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java
+++ b/libjava/classpath/gnu/java/security/jce/sig/SignatureAdapter.java
@@ -1,4 +1,4 @@
-/* SignatureAdapter.java -- 
+/* SignatureAdapter.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -85,7 +85,7 @@ class SignatureAdapter
 
   /**
    * Trivial protected constructor.
-   * 
+   *
    * @param sigName the canonical name of the signature scheme.
    * @param codec the signature codec engine to use with this scheme.
    */
@@ -96,7 +96,7 @@ class SignatureAdapter
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param adaptee a clone of the underlying signature scheme instance.
    * @param codec the signature codec engine to use with this scheme.
    */
diff --git a/libjava/classpath/gnu/java/security/key/IKeyPairCodec.java b/libjava/classpath/gnu/java/security/key/IKeyPairCodec.java
index f09743d2b60..5c88c86ca1f 100644
--- a/libjava/classpath/gnu/java/security/key/IKeyPairCodec.java
+++ b/libjava/classpath/gnu/java/security/key/IKeyPairCodec.java
@@ -1,4 +1,4 @@
-/* IKeyPairCodec.java -- 
+/* IKeyPairCodec.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -69,14 +69,14 @@ public interface IKeyPairCodec
   /**
    * Returns the unique identifier (within this library) of the format used to
    * externalise public and private keys.
-   * 
+   *
    * @return the identifier of the format, the object supports.
    */
   int getFormatID();
 
   /**
    * Encodes an instance of a public key for storage or transmission purposes.
-   * 
+   *
    * @param key the non-null key to encode.
    * @return a byte sequence representing the encoding of the designated key
    *         according to the format supported by this codec.
@@ -87,7 +87,7 @@ public interface IKeyPairCodec
 
   /**
    * Encodes an instance of a private key for storage or transmission purposes.
-   * 
+   *
    * @param key the non-null key to encode.
    * @return a byte sequence representing the encoding of the designated key
    *         according to the format supported by this codec.
@@ -99,7 +99,7 @@ public interface IKeyPairCodec
   /**
    * Decodes an instance of an external public key into its native Java
    * representation.
-   * 
+   *
    * @param input the source of the externalised key to decode.
    * @return a concrete instance of a public key, reconstructed from the
    *         designated input.
@@ -112,7 +112,7 @@ public interface IKeyPairCodec
   /**
    * Decodes an instance of an external private key into its native Java
    * representation.
-   * 
+   *
    * @param input the source of the externalised key to decode.
    * @return a concrete instance of a private key, reconstructed from the
    *         designated input.
diff --git a/libjava/classpath/gnu/java/security/key/IKeyPairGenerator.java b/libjava/classpath/gnu/java/security/key/IKeyPairGenerator.java
index 8d7842e935f..72aac2463aa 100644
--- a/libjava/classpath/gnu/java/security/key/IKeyPairGenerator.java
+++ b/libjava/classpath/gnu/java/security/key/IKeyPairGenerator.java
@@ -1,4 +1,4 @@
-/* IKeyPairGenerator.java -- 
+/* IKeyPairGenerator.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -48,14 +48,14 @@ public interface IKeyPairGenerator
 {
   /**
    * Returns the canonical name of this keypair generator.
-   * 
+   *
    * @return the canonical name of this instance.
    */
   String name();
 
   /**
    * [Re]-initialises this instance for use with a given set of attributes.
-   * 
+   *
    * @param attributes a map of name/value pairs to use for setting up the
    *          instance.
    * @exception IllegalArgumentException if at least one of the mandatory
@@ -66,7 +66,7 @@ public interface IKeyPairGenerator
   /**
    * Generates a new keypair based on the attributes used to configure the
    * instance.
-   * 
+   *
    * @return a new keypair.
    */
   KeyPair generate();
diff --git a/libjava/classpath/gnu/java/security/key/KeyPairCodecFactory.java b/libjava/classpath/gnu/java/security/key/KeyPairCodecFactory.java
index e68a7d65c3a..d428664235f 100644
--- a/libjava/classpath/gnu/java/security/key/KeyPairCodecFactory.java
+++ b/libjava/classpath/gnu/java/security/key/KeyPairCodecFactory.java
@@ -1,4 +1,4 @@
-/* KeyPairCodecFactory.java -- 
+/* KeyPairCodecFactory.java --
    Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -79,7 +79,7 @@ public class KeyPairCodecFactory
    * IMPORTANT: For backward compatibility, when the encoding format
    * name is missing, the Raw encoding format is assumed. When this is the case
    * the trailing forward slash is discarded from the name.
-   * 
+   *
    * @param name the case-insensitive key codec name.
    * @return an instance of the keypair codec, or null if none
    *         found.
@@ -113,7 +113,7 @@ public class KeyPairCodecFactory
    * Returns an instance of a keypair codec given the canonical name of the
    * key-pair algorithm, and the name of the encoding format to use when
    * externalizing the keys.
-   * 
+   *
    * @param name the case-insensitive key-pair algorithm name.
    * @param format the name of the encoding format to use when externalizing the
    *          keys generated by the key-pair algorithm.
@@ -133,7 +133,7 @@ public class KeyPairCodecFactory
    * Returns an instance of a keypair codec given the canonical name of the
    * key-pair algorithm, and the identifier of the format to use when
    * externalizing the keys.
-   * 
+   *
    * @param name the case-insensitive key-pair algorithm name.
    * @param formatID the identifier of the format to use when externalizing the
    *          keys generated by the key-pair algorithm.
@@ -161,7 +161,7 @@ public class KeyPairCodecFactory
 
   /**
    * Returns an instance of a keypair codec given a key.
-   * 
+   *
    * @param key the key to encode.
    * @return an instance of the keypair codec, or null if none
    *         found.
diff --git a/libjava/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java b/libjava/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java
index 4872fc3d1a1..151cace3912 100644
--- a/libjava/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java
+++ b/libjava/classpath/gnu/java/security/key/KeyPairGeneratorFactory.java
@@ -1,4 +1,4 @@
-/* KeyPairGeneratorFactory.java -- 
+/* KeyPairGeneratorFactory.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,7 +60,7 @@ public class KeyPairGeneratorFactory
 
   /**
    * Returns an instance of a keypair generator given its name.
-   * 
+   *
    * @param name the case-insensitive key generator name.
    * @return an instance of the keypair generator, or null if
    *         none found.
@@ -89,7 +89,7 @@ public class KeyPairGeneratorFactory
    * Returns a {@link Set} of keypair generator names supported by this
    * Factory. Those keypair generators may be used in conjunction with
    * the digital signature schemes with appendix supported by this library.
-   * 
+   *
    * @return a {@link Set} of keypair generator names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSKey.java
index d4cf36513eb..49f229f7b2b 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKey.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKey.java
@@ -1,4 +1,4 @@
-/* DSSKey.java -- 
+/* DSSKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -66,7 +66,7 @@ import java.security.spec.DSAParameterSpec;
  * IMPORTANT: Under certain circumstances (e.g. in an X.509 certificate
  * with inherited AlgorithmIdentifier's parameters of a SubjectPublicKeyInfo
  * element) these three MPIs may be null.
- * 
+ *
  * @see DSSPrivateKey#getEncoded
  * @see DSSPublicKey#getEncoded
  */
@@ -108,7 +108,7 @@ public abstract class DSSKey
 
   /**
    * Trivial protected constructor.
-   * 
+   *
    * @param defaultFormat the identifier of the encoding format to use by
    *          default when externalizing the key.
    * @param p the DSS parameter p.
@@ -156,7 +156,7 @@ public abstract class DSSKey
    * inherited. This may be the case when the key is re-constructed from
    * an X.509 certificate with absent or NULL AlgorithmIdentifier's parameters
    * field.
-   * 
+   *
    * @param obj the other non-null DSS key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java
index 1bad0b62ed6..6bda4e88e34 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairGenerator.java
@@ -1,4 +1,4 @@
-/* DSSKeyPairGenerator.java -- 
+/* DSSKeyPairGenerator.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -217,7 +217,7 @@ public class DSSKeyPairGenerator
 
   /**
    * Configures this instance.
-   * 
+   *
    * @param attributes the map of name/value pairs to use.
    * @exception IllegalArgumentException if the designated MODULUS_LENGTH value
    *              is not greater than 512, less than 1024 and not of the form
@@ -361,7 +361,7 @@ public class DSSKeyPairGenerator
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
index 06b8e849a50..a59ca3cee7a 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairPKCS8Codec.java
@@ -88,7 +88,7 @@ public class DSSKeyPairPKCS8Codec
   /**
    * Returns the PKCS#8 ASN.1 PrivateKeyInfo representation of a DSA
    * private key. The ASN.1 specification is as follows:
-   * 
+   *
    * 
          *   PrivateKeyInfo ::= SEQUENCE {
    *     version              INTEGER, -- MUST be 0
@@ -107,7 +107,7 @@ public class DSSKeyPairPKCS8Codec
    *     g   INTEGER
    *   }
    * 
      
-   * 
+   *
    * @return the DER encoded form of the ASN.1 representation of the
    *         PrivateKeyInfo field in an X.509 certificate.
    * @throw InvalidParameterException if an error occurs during the marshalling
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java
index b1135b75f1f..5b93c6b1e93 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairRawCodec.java
@@ -1,4 +1,4 @@
-/* DSSKeyPairRawCodec.java -- 
+/* DSSKeyPairRawCodec.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -92,7 +92,7 @@ public class DSSKeyPairRawCodec
    * the toByteArray() method on the DSA parameter y,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not a DSS
@@ -235,7 +235,7 @@ public class DSSKeyPairRawCodec
    * the toByteArray() method on the DSA parameter x,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not a DSS
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java
index a5e8e9d47eb..8c26910f129 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSKeyPairX509Codec.java
@@ -103,11 +103,11 @@ public class DSSKeyPairX509Codec
    * 
      
    * The subjectPublicKey field, which is a BIT STRING, contains the
    * DER-encoded form of the DSA public key as an INTEGER.
-   * 
+   *
    * 
          *       DSAPublicKey ::= INTEGER -- public key, Y
    * 
      
-   * 
+   *
    * @param key the {@link PublicKey} instance to encode. MUST be an instance of
    *          {@link DSSPublicKey}.
    * @return the ASN.1 representation of the SubjectPublicKeyInfo in an
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java
index 633fcf7ce08..de3668c0131 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java
@@ -1,4 +1,4 @@
-/* DSSPrivateKey.java -- 
+/* DSSPrivateKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -52,7 +52,7 @@ import java.security.interfaces.DSAPrivateKey;
 
 /**
  * An object that embodies a DSS (Digital Signature Standard) private key.
- * 
+ *
  * @see #getEncoded
  */
 public class DSSPrivateKey
@@ -72,7 +72,7 @@ public class DSSPrivateKey
    * Convenience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
    * encoding format.
-   * 
+   *
    * @param p the public modulus.
    * @param q the public prime divisor of p-1.
    * @param g a generator of the unique cyclic group Z*
@@ -87,7 +87,7 @@ public class DSSPrivateKey
   /**
    * Constructs a new instance of a DSSPrivateKey given the
    * designated arguments.
-   * 
+   *
    * @param preferredFormat the indetifier of the preferred encoding format to
    *          use when externalizing this key.
    * @param p the public modulus.
@@ -110,7 +110,7 @@ public class DSSPrivateKey
    * method of a DSS keypair codec object (an instance implementing
    * {@link gnu.java.security.key.IKeyPairCodec} for DSS keys, and re-constructs
    * an instance of this object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @exception ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *              k, to represent a valid encoding of an
@@ -141,7 +141,7 @@ public class DSSPrivateKey
   /**
    * Returns the encoded form of this private key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -170,7 +170,7 @@ public class DSSPrivateKey
    * Returns true if the designated object is an instance of
    * {@link DSAPrivateKey} and has the same DSS (Digital Signature Standard)
    * parameter values as this one.
-   * 
+   *
    * @param obj the other non-null DSS key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java
index e5c53467176..d7c1afe1517 100644
--- a/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java
+++ b/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java
@@ -1,4 +1,4 @@
-/* DSSPublicKey.java -- 
+/* DSSPublicKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ import java.security.interfaces.DSAPublicKey;
 
 /**
  * An object that embodies a DSS (Digital Signature Standard) public key.
- * 
+ *
  * @see #getEncoded
  */
 public class DSSPublicKey
@@ -71,7 +71,7 @@ public class DSSPublicKey
    * Conveience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
    * encoding format.
-   * 
+   *
    * @param p the public modulus.
    * @param q the public prime divisor of p-1.
    * @param g a generator of the unique cyclic group Z*
@@ -86,7 +86,7 @@ public class DSSPublicKey
   /**
    * Constructs a new instance of DSSPublicKey given the
    * designated arguments.
-   * 
+   *
    * @param preferredFormat the identifier of the preferred encoding format to
    *          use when externalizing this key.
    * @param p the public modulus.
@@ -109,7 +109,7 @@ public class DSSPublicKey
    * method of a DSS keypair codec object (an instance implementing
    * {@link gnu.java.security.key.IKeyPairCodec} for DSS keys, and re-constructs
    * an instance of this object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @exception ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *              k, to represent a valid encoding of an
@@ -140,7 +140,7 @@ public class DSSPublicKey
   /**
    * Returns the encoded form of this public key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -169,7 +169,7 @@ public class DSSPublicKey
    * Returns true if the designated object is an instance of
    * {@link DSAPublicKey} and has the same DSS (Digital Signature Standard)
    * parameter values as this one.
-   * 
+   *
    * @param obj the other non-null DSS key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/dss/FIPS186.java b/libjava/classpath/gnu/java/security/key/dss/FIPS186.java
index 65dc5800c77..5d371e10cfd 100644
--- a/libjava/classpath/gnu/java/security/key/dss/FIPS186.java
+++ b/libjava/classpath/gnu/java/security/key/dss/FIPS186.java
@@ -1,4 +1,4 @@
-/* FIPS186.java -- 
+/* FIPS186.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -241,7 +241,7 @@ public class FIPS186
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java
index 0419ac96ee4..38530ee4c85 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java
@@ -1,4 +1,4 @@
-/* GnuRSAKey.java -- 
+/* GnuRSAKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public abstract class GnuRSAKey
 
   /**
    * Trivial protected constructor.
-   * 
+   *
    * @param defaultFormat the identifier of the encoding format to use by
    *          default when externalizing the key.
    * @param n the public modulus n.
@@ -111,7 +111,7 @@ public abstract class GnuRSAKey
 
   /**
    * Returns the modulus n.
-   * 
+   *
    * @return the modulus n.
    */
   public BigInteger getN()
@@ -121,7 +121,7 @@ public abstract class GnuRSAKey
 
   /**
    * Returns the public exponent e.
-   * 
+   *
    * @return the public exponent e.
    */
   public BigInteger getPublicExponent()
@@ -131,7 +131,7 @@ public abstract class GnuRSAKey
 
   /**
    * Same as {@link #getPublicExponent()}.
-   * 
+   *
    * @return the public exponent e.
    */
   public BigInteger getE()
@@ -142,7 +142,7 @@ public abstract class GnuRSAKey
   /**
    * Returns true if the designated object is an instance of
    * {@link RSAKey} and has the same RSA parameter values as this one.
-   * 
+   *
    * @param obj the other non-null RSA key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
index e554f2f3f02..39f91cbe463 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java
@@ -1,4 +1,4 @@
-/* GnuRSAPrivateKey.java -- 
+/* GnuRSAPrivateKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -92,7 +92,7 @@ public class GnuRSAPrivateKey
    * Convenience constructor. Calls the constructor with 5 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
    * encoding format.
-   * 
+   *
    * @param p the modulus first prime divisor.
    * @param q the modulus second prime divisor.
    * @param e the public exponent.
@@ -106,7 +106,7 @@ public class GnuRSAPrivateKey
   /**
    * Constructs a new instance of a GnuRSAPrivateKey given the
    * designated arguments.
-   * 
+   *
    * @param preferredFormat the indetifier of the preferred encoding format to
    *          use when externalizing this key.
    * @param p the modulus first prime divisor.
@@ -128,7 +128,7 @@ public class GnuRSAPrivateKey
   /**
    * Constructs a new instance of a GnuRSAPrivateKey given the
    * designated arguments.
-   * 
+   *
    * @param preferredFormat the indetifier of the preferred encoding format to
    *          use when externalizing this key.
    * @param n the public modulus, which is also the product of p
@@ -173,7 +173,7 @@ public class GnuRSAPrivateKey
    * method of an RSA keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for RSA keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @throws ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *           k, to represent a valid encoding of an instance
@@ -229,7 +229,7 @@ public class GnuRSAPrivateKey
   /**
    * Returns the encoded form of this private key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -258,7 +258,7 @@ public class GnuRSAPrivateKey
   /**
    * Returns true if the designated object is an instance of this
    * class and has the same RSA parameter values as this one.
-   * 
+   *
    * @param obj the other non-null RSA key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java
index 3217130c258..0bad92881a3 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java
@@ -1,4 +1,4 @@
-/* GnuRSAPublicKey.java -- 
+/* GnuRSAPublicKey.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public class GnuRSAPublicKey
    * Conveience constructor. Calls the constructor with 3 arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the identifier of the preferred
    * encoding format.
-   * 
+   *
    * @param n the modulus.
    * @param e the public exponent.
    */
@@ -84,7 +84,7 @@ public class GnuRSAPublicKey
   /**
    * Constructs a new instance of GnuRSAPublicKey given the
    * designated arguments.
-   * 
+   *
    * @param preferredFormat the identifier of the preferred encoding format to
    *          use when externalizing this key.
    * @param n the modulus.
@@ -102,7 +102,7 @@ public class GnuRSAPublicKey
    * method of an RSA keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for RSA keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @throws ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *           k, to represent a valid encoding of an instance
@@ -128,7 +128,7 @@ public class GnuRSAPublicKey
   /**
    * Returns the encoded form of this public key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -156,7 +156,7 @@ public class GnuRSAPublicKey
   /**
    * Returns true if the designated object is an instance of this
    * class and has the same RSA parameter values as this one.
-   * 
+   *
    * @param obj the other non-null RSA key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
index c31cc4cc1e0..bec60d350ca 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairGenerator.java
@@ -1,4 +1,4 @@
-/* RSAKeyPairGenerator.java -- 
+/* RSAKeyPairGenerator.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -135,7 +135,7 @@ public class RSAKeyPairGenerator
 
   /**
    * Configures this instance.
-   * 
+   *
    * @param attributes the map of name/value pairs to use.
    * @exception IllegalArgumentException if the designated MODULUS_LENGTH value
    *              is less than 1024.
@@ -175,7 +175,7 @@ public class RSAKeyPairGenerator
    * The algorithm used here is described in nessie-pss-B.pdf document
    * which is part of the RSA-PSS submission to NESSIE.
    * 
      
-   * 
+   *
    * @return an RSA keypair.
    */
   public KeyPair generate()
@@ -225,7 +225,7 @@ public class RSAKeyPairGenerator
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
index 7a51d0a0dd0..2785f02c8ae 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairPKCS8Codec.java
@@ -116,7 +116,7 @@ public class RSAKeyPairPKCS8Codec
    *     coefficient             INTEGER, -- (inverse of q) mod p
    *   }
    * 
      
-   * 
+   *
    * @return the DER encoded form of the ASN.1 representation of the
    *         PrivateKeyInfo field for an RSA {@link PrivateKey}..
    * @throw InvalidParameterException if an error occurs during the marshalling
@@ -251,7 +251,7 @@ public class RSAKeyPairPKCS8Codec
         der = new DERReader(pkBytes);
         DERValue derRSAPrivateKey = der.read();
         DerUtil.checkIsConstructed(derRSAPrivateKey, "Wrong RSAPrivateKey field");
-        
+
         val = der.read();
         DerUtil.checkIsBigInteger(val, "Wrong RSAPrivateKey Version field");
         version = (BigInteger) val.getValue();
diff --git a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
index 95220236617..f088e794e68 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairRawCodec.java
@@ -1,4 +1,4 @@
-/* RSAKeyPairRawCodec.java -- 
+/* RSAKeyPairRawCodec.java --
    Copyright 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -190,7 +190,7 @@ public class RSAKeyPairRawCodec
    * the toByteArray() method on the RSA parameter d,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    */
diff --git a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
index b11e1c01371..9ad6ae02978 100644
--- a/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
+++ b/libjava/classpath/gnu/java/security/key/rsa/RSAKeyPairX509Codec.java
@@ -97,14 +97,14 @@ public class RSAKeyPairX509Codec
    * 
      
    * The subjectPublicKey field, which is a BIT STRING, contains the
    * DER-encoded form of the RSA public key defined as:
-   * 
+   *
    * 
          *   RSAPublicKey ::= SEQUENCE {
    *     modulus         INTEGER, -- n
    *     publicExponent  INTEGER  -- e
    *   }
    * 
      
-   * 
+   *
    * @param key the {@link PublicKey} instance to encode. MUST be an instance of
    *          {@link GnuRSAPublicKey}.
    * @return the ASN.1 representation of the SubjectPublicKeyInfo in an
diff --git a/libjava/classpath/gnu/java/security/pkcs/PKCS7Data.java b/libjava/classpath/gnu/java/security/pkcs/PKCS7Data.java
index 3d3052b965b..c6474f08190 100644
--- a/libjava/classpath/gnu/java/security/pkcs/PKCS7Data.java
+++ b/libjava/classpath/gnu/java/security/pkcs/PKCS7Data.java
@@ -52,7 +52,7 @@ public class PKCS7Data
   /**
    * Constructs a new instance of PKCS7Data with the possibly
    * null (implicetly referenced) content data.
-   * 
+   *
    * @param data the raw bytes of the data to use in a PKCS#7 framework.
    */
   public PKCS7Data(byte[] data)
diff --git a/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java b/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
index d59dba3cd0f..adb00a3bea0 100644
--- a/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
+++ b/libjava/classpath/gnu/java/security/pkcs/PKCS7SignedData.java
@@ -333,7 +333,7 @@ public class PKCS7SignedData
   /**
    * Constructs a new instance of PKCS7SignedData given a
    * designated set of fields.
-   * 
+   *
    * @param digestAlgorithms the collection of DigestAlgorithm elements. Each
    *          DigestAlgorithm is a {@link List} of two elements, the first is an
    *          OID while the second is dependent on the value of the OID element.
@@ -401,7 +401,7 @@ public class PKCS7SignedData
   /**
    * Writes to the designated output stream the DER encoding of the current
    * contents of this instance.
-   * 
+   *
    * @param out the destination output stream.
    * @throws IOException if an I/O related exception occurs during the process.
    * @throws CRLException if an exception occurs while encoding the certificate
diff --git a/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java b/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
index 3066401ac4b..645ed67bb14 100644
--- a/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
+++ b/libjava/classpath/gnu/java/security/pkcs/SignerInfo.java
@@ -90,9 +90,9 @@ public class SignerInfo
    *   issuer       Name,
    *   serialNumber CertificateSerialNumber
    * }
-   * 
+   *
    * DigestAlgorithmIdentifier ::= AlgorithmIdentifier
-   * 
+   *
    * DigestEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
    *
    * EncryptedDigest ::= OCTET STRING
@@ -269,7 +269,7 @@ public class SignerInfo
   /**
    * Constructs a new instance of SignerInfo given a designated
    * set of fields.
-   * 
+   *
    * @param issuer the X.500 Principal name of the signer referenced by this
    *          instance.
    * @param serialNumber the serial number of the certificate being used. Both
@@ -369,7 +369,7 @@ public class SignerInfo
   /**
    * Writes to the designated output stream the DER encoding of the current
    * contents of this instance.
-   * 
+   *
    * @param out the destination output stream.
    * @throws IOException if an I/O related exception occurs during the process.
    */
diff --git a/libjava/classpath/gnu/java/security/prng/BasePRNG.java b/libjava/classpath/gnu/java/security/prng/BasePRNG.java
index 3b7c8cf071f..eb5ada71cb4 100644
--- a/libjava/classpath/gnu/java/security/prng/BasePRNG.java
+++ b/libjava/classpath/gnu/java/security/prng/BasePRNG.java
@@ -1,4 +1,4 @@
-/* BasePRNG.java -- 
+/* BasePRNG.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,7 +60,7 @@ public abstract class BasePRNG
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name of this instance.
    */
   protected BasePRNG(String name)
diff --git a/libjava/classpath/gnu/java/security/prng/EntropySource.java b/libjava/classpath/gnu/java/security/prng/EntropySource.java
index 95f68f04872..a7173d3b19a 100644
--- a/libjava/classpath/gnu/java/security/prng/EntropySource.java
+++ b/libjava/classpath/gnu/java/security/prng/EntropySource.java
@@ -1,4 +1,4 @@
-/* EntropySource.java -- 
+/* EntropySource.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,4 +58,4 @@ public interface EntropySource
    * @return The next random bytes.
    */
   byte[] nextBytes();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/java/security/prng/IRandom.java b/libjava/classpath/gnu/java/security/prng/IRandom.java
index 66ad6d2241b..eb1495dd8cb 100644
--- a/libjava/classpath/gnu/java/security/prng/IRandom.java
+++ b/libjava/classpath/gnu/java/security/prng/IRandom.java
@@ -1,4 +1,4 @@
-/* IRandom.java -- 
+/* IRandom.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -79,7 +79,7 @@ public interface IRandom
 {
   /**
    * Returns the canonical name of this instance.
-   * 
+   *
    * @return the canonical name of this instance.
    */
   String name();
@@ -87,7 +87,7 @@ public interface IRandom
   /**
    * Initialises the pseudo-random number generator scheme with the appropriate
    * attributes.
-   * 
+   *
    * @param attributes a set of name-value pairs that describe the desired
    *          future instance behaviour.
    * @exception IllegalArgumentException if at least one of the defined name/
@@ -97,7 +97,7 @@ public interface IRandom
 
   /**
    * Returns the next 8 bits of random data generated from this instance.
-   * 
+   *
    * @return the next 8 bits of random data generated from this instance.
    * @exception IllegalStateException if the instance is not yet initialised.
    * @exception LimitReachedException if this instance has reached its
@@ -110,7 +110,7 @@ public interface IRandom
    * Fills the designated byte array, starting from byte at index
    * offset, for a maximum of length bytes with
    * the output of this generator instance.
-   * 
+   *
    * @param out the placeholder to contain the generated random bytes.
    * @param offset the starting index in out to consider. This method
    *          does nothing if this parameter is not within 0 and
@@ -132,7 +132,7 @@ public interface IRandom
    * Implementations are not required to implement this method in any meaningful
    * way; this may be a no-operation, and implementations may throw an
    * {@link UnsupportedOperationException}.
-   * 
+   *
    * @param b The byte to add.
    */
   void addRandomByte(byte b);
@@ -144,7 +144,7 @@ public interface IRandom
    * Implementations are not required to implement this method in any meaningful
    * way; this may be a no-operation, and implementations may throw an
    * {@link UnsupportedOperationException}.
-   * 
+   *
    * @param in The buffer of new random bytes to add.
    */
   void addRandomBytes(byte[] in);
@@ -156,7 +156,7 @@ public interface IRandom
    * Implementations are not required to implement this method in any meaningful
    * way; this may be a no-operation, and implementations may throw an
    * {@link UnsupportedOperationException}.
-   * 
+   *
    * @param in The buffer of new random bytes to add.
    * @param offset The offset from whence to begin reading random bytes.
    * @param length The number of random bytes to add.
@@ -167,7 +167,7 @@ public interface IRandom
 
   /**
    * Returns a clone copy of this instance.
-   * 
+   *
    * @return a clone copy of this instance.
    */
   Object clone() throws CloneNotSupportedException;
diff --git a/libjava/classpath/gnu/java/security/prng/LimitReachedException.java b/libjava/classpath/gnu/java/security/prng/LimitReachedException.java
index 8d5b30baf90..028c7455342 100644
--- a/libjava/classpath/gnu/java/security/prng/LimitReachedException.java
+++ b/libjava/classpath/gnu/java/security/prng/LimitReachedException.java
@@ -1,4 +1,4 @@
-/* LimitReachedException.java -- 
+/* LimitReachedException.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/prng/MDGenerator.java b/libjava/classpath/gnu/java/security/prng/MDGenerator.java
index 574a2f9d64b..b110486f408 100644
--- a/libjava/classpath/gnu/java/security/prng/MDGenerator.java
+++ b/libjava/classpath/gnu/java/security/prng/MDGenerator.java
@@ -1,4 +1,4 @@
-/* MDGenerator.java -- 
+/* MDGenerator.java --
    Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/prng/PRNGFactory.java b/libjava/classpath/gnu/java/security/prng/PRNGFactory.java
index ae15d053b82..b57d7c7bb2c 100644
--- a/libjava/classpath/gnu/java/security/prng/PRNGFactory.java
+++ b/libjava/classpath/gnu/java/security/prng/PRNGFactory.java
@@ -1,4 +1,4 @@
-/* PRNGFactory.java -- 
+/* PRNGFactory.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -57,7 +57,7 @@ public class PRNGFactory
 
   /**
    * Returns an instance of a padding algorithm given its name.
-   * 
+   *
    * @param prng the case-insensitive name of the PRNG.
    * @return an instance of the pseudo-random number generator.
    * @exception InternalError if the implementation does not pass its self-
@@ -79,7 +79,7 @@ public class PRNGFactory
   /**
    * Returns a {@link Set} of names of padding algorithms supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of pseudo-random number generator algorithm names
    *         (Strings).
    */
diff --git a/libjava/classpath/gnu/java/security/prng/RandomEventListener.java b/libjava/classpath/gnu/java/security/prng/RandomEventListener.java
index beb9087f418..720f2afe431 100644
--- a/libjava/classpath/gnu/java/security/prng/RandomEventListener.java
+++ b/libjava/classpath/gnu/java/security/prng/RandomEventListener.java
@@ -1,4 +1,4 @@
-/* RandomEventListener.java -- 
+/* RandomEventListener.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/provider/DefaultPolicy.java b/libjava/classpath/gnu/java/security/provider/DefaultPolicy.java
index d42be6c908f..566c949dadd 100644
--- a/libjava/classpath/gnu/java/security/provider/DefaultPolicy.java
+++ b/libjava/classpath/gnu/java/security/provider/DefaultPolicy.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.security.PermissionCollection;
 import java.security.Permissions;
 import java.security.Policy;
 
-/** 
+/**
   * This is just a stub policy implementation which grants all permissions
   * to any code source. FIXME: This should be replaced with a real
   * implementation that reads the policy configuration from a file, like
@@ -60,7 +60,7 @@ public class DefaultPolicy extends Policy
     perms.add(allPermission);
     return perms;
   }
-  
+
   public void refresh()
   {
     // Nothing.
diff --git a/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java b/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
index cdfad3f61c2..d4ce4aeb4fa 100644
--- a/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
+++ b/libjava/classpath/gnu/java/security/provider/PKIXCertPathValidatorImpl.java
@@ -91,7 +91,7 @@ import java.util.logging.Logger;
  * See RFC 3280: Internet X.509
  * Public Key Infrastructure Certificate and Certificate Revocation List (CRL)
  * Profile.
- * 
+ *
  * @author Casey Marshall (rsdio@metastatic.org)
  */
 public class PKIXCertPathValidatorImpl
@@ -403,7 +403,7 @@ public class PKIXCertPathValidatorImpl
    * 
    6. The CRL is signed by a certificate in the given cert stores, and that
    * cert is signed by one of the certificates in the path.
      7. 
    * 
-   * 
+   *
    * @param crl The CRL being checked.
    * @param path The path this CRL is being checked against.
    * @param now The value to use as 'now'.
diff --git a/libjava/classpath/gnu/java/security/sig/BaseSignature.java b/libjava/classpath/gnu/java/security/sig/BaseSignature.java
index 9c76cacba0f..ef4d87f261f 100644
--- a/libjava/classpath/gnu/java/security/sig/BaseSignature.java
+++ b/libjava/classpath/gnu/java/security/sig/BaseSignature.java
@@ -1,4 +1,4 @@
-/* BaseSignature.java -- 
+/* BaseSignature.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -77,7 +77,7 @@ public abstract class BaseSignature
 
   /**
    * Trivial constructor.
-   * 
+   *
    * @param schemeName the name of this signature scheme.
    * @param md the underlying instance of the message digest algorithm.
    * @throws IllegalArgumentException if the designated hash instance is
@@ -174,7 +174,7 @@ public abstract class BaseSignature
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   protected void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/java/security/sig/ISignature.java b/libjava/classpath/gnu/java/security/sig/ISignature.java
index ff25f29d9fa..be98f9a9b00 100644
--- a/libjava/classpath/gnu/java/security/sig/ISignature.java
+++ b/libjava/classpath/gnu/java/security/sig/ISignature.java
@@ -1,4 +1,4 @@
-/* ISignature.java -- 
+/* ISignature.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -75,14 +75,14 @@ public interface ISignature
 
   /**
    * Returns the canonical name of this signature scheme.
-   * 
+   *
    * @return the canonical name of this instance.
    */
   String name();
 
   /**
    * Initialises this instance for signature verification.
-   * 
+   *
    * @param attributes the attributes to use for setting up this instance.
    * @throws IllegalArgumentException if the designated public key is not
    *           appropriate for this signature scheme.
@@ -93,7 +93,7 @@ public interface ISignature
 
   /**
    * Initialises this instance for signature generation.
-   * 
+   *
    * @param attributes the attributes to use for setting up this instance.
    * @throws IllegalArgumentException if the designated private key is not
    *           appropriate for this signature scheme.
@@ -104,7 +104,7 @@ public interface ISignature
 
   /**
    * Digests one byte of a message for signing or verification purposes.
-   * 
+   *
    * @param b the message byte to digest.
    * @throws IllegalStateException if this instance was not setup for signature
    *           generation/verification.
@@ -114,7 +114,7 @@ public interface ISignature
   /**
    * Digests a sequence of bytes from a message for signing or verification
    * purposes.
-   * 
+   *
    * @param buffer the byte sequence to consider.
    * @param offset the byte poisition in buffer of the first byte
    *          to consider.
@@ -129,7 +129,7 @@ public interface ISignature
   /**
    * Terminates a signature generation phase by digesting and processing the
    * context of the underlying message digest algorithm instance.
-   * 
+   *
    * @return a {@link Object} representing the native output of the signature
    *         scheme implementation.
    * @throws IllegalStateException if this instance was not setup for signature
@@ -140,7 +140,7 @@ public interface ISignature
   /**
    * Terminates a signature verification phase by digesting and processing the
    * context of the underlying message digest algorithm instance.
-   * 
+   *
    * @param signature a native signature object previously generated by an
    *          invocation of the sign() method.
    * @return true iff the outpout of the verification phase
@@ -153,7 +153,7 @@ public interface ISignature
 
   /**
    * Returns a clone copy of this instance.
-   * 
+   *
    * @return a clone copy of this instance.
    */
   Object clone();
diff --git a/libjava/classpath/gnu/java/security/sig/ISignatureCodec.java b/libjava/classpath/gnu/java/security/sig/ISignatureCodec.java
index aaae6ccb034..f8b14736114 100644
--- a/libjava/classpath/gnu/java/security/sig/ISignatureCodec.java
+++ b/libjava/classpath/gnu/java/security/sig/ISignatureCodec.java
@@ -1,4 +1,4 @@
-/* ISignatureCodec.java -- 
+/* ISignatureCodec.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/sig/SignatureCodecFactory.java b/libjava/classpath/gnu/java/security/sig/SignatureCodecFactory.java
index c5b2ccd4bc8..0026ad1646a 100644
--- a/libjava/classpath/gnu/java/security/sig/SignatureCodecFactory.java
+++ b/libjava/classpath/gnu/java/security/sig/SignatureCodecFactory.java
@@ -74,7 +74,7 @@ public class SignatureCodecFactory
    * When the encoding format name is missing, the Raw encoding format is
    * assumed. When this is the case the trailing forward slash is discarded from
    * the name.
-   * 
+   *
    * @param name the case-insensitive, possibly composed, signature codec name.
    * @return an instance of the signaturecodec, or null if none
    *         found.
@@ -107,7 +107,7 @@ public class SignatureCodecFactory
   /**
    * Returns an instance of a signature codec given the canonical name of the
    * signature algorithm, and that of the encoding format.
-   * 
+   *
    * @param name the case-insensitive signature algorithm name.
    * @param format the name of the format to use when encodigng/decoding
    *          signatures generated by the named algorithm.
@@ -127,7 +127,7 @@ public class SignatureCodecFactory
    * Returns an instance of a signature codec given the canonical name of the
    * signature algorithm, and the identifier of the format to use when
    * encoding/decoding signatures generated by that algorithm.
-   * 
+   *
    * @param name the case-insensitive signature algorithm name.
    * @param formatID the identifier of the format to use when encoding /
    *          decoding signatures generated by the designated algorithm.
diff --git a/libjava/classpath/gnu/java/security/sig/SignatureFactory.java b/libjava/classpath/gnu/java/security/sig/SignatureFactory.java
index 28b68925b21..6cdaf6544ef 100644
--- a/libjava/classpath/gnu/java/security/sig/SignatureFactory.java
+++ b/libjava/classpath/gnu/java/security/sig/SignatureFactory.java
@@ -1,4 +1,4 @@
-/* SignatureFactory.java -- 
+/* SignatureFactory.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -61,7 +61,7 @@ public class SignatureFactory
 
   /**
    * Returns an instance of a signature-with-appendix scheme given its name.
-   * 
+   *
    * @param ssa the case-insensitive signature-with-appendix scheme name.
    * @return an instance of the scheme, or null if none found.
    */
@@ -84,7 +84,7 @@ public class SignatureFactory
   /**
    * Returns a {@link Set} of signature-with-appendix scheme names supported by
    * this Factory.
-   * 
+   *
    * @return a {@link Set} of signature-with-appendix scheme names (Strings).
    */
   public static synchronized final Set getNames()
diff --git a/libjava/classpath/gnu/java/security/sig/dss/DSSSignature.java b/libjava/classpath/gnu/java/security/sig/dss/DSSSignature.java
index 1ef1bea1a7f..024521ba421 100644
--- a/libjava/classpath/gnu/java/security/sig/dss/DSSSignature.java
+++ b/libjava/classpath/gnu/java/security/sig/dss/DSSSignature.java
@@ -1,4 +1,4 @@
-/* DSSSignature.java -- 
+/* DSSSignature.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -211,7 +211,7 @@ public class DSSSignature
 
   /**
    * Returns the output of a signature generation phase.
-   * 
+   *
    * @return an object encapsulating the DSS signature pair r and
    *         s.
    */
@@ -223,7 +223,7 @@ public class DSSSignature
   /**
    * Returns the output of a previously generated signature object as a pair of
    * {@link java.math.BigInteger}.
-   * 
+   *
    * @return the DSS signature pair r and s.
    */
   private BigInteger[] decodeSignature(Object signature)
diff --git a/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java b/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java
index 903d7aad6c9..169f84bd1c6 100644
--- a/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java
+++ b/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureRawCodec.java
@@ -1,4 +1,4 @@
-/* DSSSignatureRawCodec.java -- 
+/* DSSSignatureRawCodec.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -78,7 +78,7 @@ public class DSSSignatureRawCodec
    * the toByteArray() method on the DSS parameter s.
    * 
    * 
-   * 
+   *
    * @param signature the signature to encode, consisting of the two DSS
    *          parameters r and s as a
    *          {@link BigInteger} array.
diff --git a/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureX509Codec.java b/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureX509Codec.java
index 0fdb754a982..d0a0188fba3 100644
--- a/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureX509Codec.java
+++ b/libjava/classpath/gnu/java/security/sig/dss/DSSSignatureX509Codec.java
@@ -60,7 +60,7 @@ import java.util.ArrayList;
  * 
      
  * Digital signatures when transmitted in an X.509 certificates are encoded
  * in DER (Distinguished Encoding Rules) as a BIT STRING; i.e.
- * 
+ *
  * 
        * Certificate ::= SEQUENCE {
  *   tbsCertificate       TBSCertificate,
@@ -77,7 +77,7 @@ import java.util.ArrayList;
  * generates two MPIs, commonly called r and s, as the
  * result of digitally signing a message, these two numbers will be transferred
  * as the following ASN.1 structure:
- * 
+ *
  * 
        *   Dss-Sig-Value ::= SEQUENCE {
  *     r  INTEGER,
@@ -112,7 +112,7 @@ public class DSSSignatureX509Codec
    * Encodes a DSS Signature output as the signature raw bytes which can
    * be used to construct an ASN.1 DER-encoded BIT STRING as defined in the
    * documentation of this class.
-   * 
+   *
    * @param signature the output of the DSS signature algorithm; i.e. the value
    *          returned by the invocation of
    *          {@link gnu.java.security.sig.ISignature#sign()} method. In the
@@ -154,7 +154,7 @@ public class DSSSignatureX509Codec
 
   /**
    * Decodes a signature as defined in the documentation of this class.
-   * 
+   *
    * @param input the byte array to unmarshall into a valid DSS signature
    *          instance; i.e. an array of two MPIs. MUST NOT be null.
    * @return an array of two MPIs, r and s in this
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java b/libjava/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java
index 39de01f0213..329ca8ed692 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/EME_PKCS1_V1_5.java
@@ -1,4 +1,4 @@
-/* EME_PKCS1_V1_5.java -- 
+/* EME_PKCS1_V1_5.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -104,7 +104,7 @@ public class EME_PKCS1_V1_5
    * 
      
    * 
      
    * This method uses a default PRNG to obtain the padding bytes.
-   * 
+   *
    * @param M the message to encode.
    * @return the encoded message EM.
    */
@@ -133,7 +133,7 @@ public class EME_PKCS1_V1_5
    * Similar to {@link #encode(byte[])} method, except that the source of
    * randomness to use for obtaining the padding bytes (an instance of
    * {@link IRandom}) is given as a parameter.
-   * 
+   *
    * @param M the message to encode.
    * @param irnd the {@link IRandom} instance to use as a source of randomness.
    * @return the encoded message EM.
@@ -173,7 +173,7 @@ public class EME_PKCS1_V1_5
   /**
    * Similar to the {@link #encode(byte[], IRandom)} method, except that the
    * source of randmoness is an instance of {@link Random}.
-   * 
+   *
    * @param M the message to encode.
    * @param rnd the {@link Random} instance to use as a source of randomness.
    * @return the encoded message EM.
@@ -213,7 +213,7 @@ public class EME_PKCS1_V1_5
    * hexadecimal value 0x00 to separate PS from
    * M, or if the length of PS is less than
    * 8 octets, output "decryption error" and stop.
-   * 
+   *
    * @param EM the designated encoded message.
    * @return the decoded message M framed in the designated
    *         EM value.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java
index a0c4de17fab..3cddab4aa4d 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PKCS1_V1_5.java
@@ -1,4 +1,4 @@
-/* EMSA_PKCS1_V1_5.java -- 
+/* EMSA_PKCS1_V1_5.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
index 97b3afcf8c1..917d9632334 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/EMSA_PSS.java
@@ -1,4 +1,4 @@
-/* EMSA_PSS.java -- 
+/* EMSA_PSS.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -83,7 +83,7 @@ public class EMSA_PSS
 
   /**
    * Trivial private constructor to enforce use through Factory method.
-   * 
+   *
    * @param hash the message digest instance to use with this scheme instance.
    */
   private EMSA_PSS(IMessageDigest hash)
@@ -97,7 +97,7 @@ public class EMSA_PSS
   /**
    * Returns an instance of this object given a designated name of a hash
    * function.
-   * 
+   *
    * @param mdName the canonical name of a hash function.
    * @return an instance of this object configured for use with the designated
    *         options.
@@ -118,7 +118,7 @@ public class EMSA_PSS
    * M using a hash function and maps the result to an encoded
    * message EM of a specified length using a mask generation
    * function.
-   * 
+   *
    * @param mHash the byte sequence resulting from applying the message digest
    *          algorithm Hash to the message M.
    * @param emBits the maximal bit length of the integer OS2IP(EM), at least
@@ -192,7 +192,7 @@ public class EMSA_PSS
    * The decoding operation EMSA-PSS-Decode recovers the message hash from an
    * encoded message EM and compares it to the hash of
    * M.
-   * 
+   *
    * @param mHash the byte sequence resulting from applying the message digest
    *          algorithm Hash to the message M.
    * @param EM the encoded message, an octet string of length
@@ -324,7 +324,7 @@ public class EMSA_PSS
    * the output. The provable security of RSA-PSS relies on the random nature of
    * the output of the mask generation function, which in turn relies on the
    * random nature of the underlying hash function.
-   * 
+   *
    * @param Z a seed.
    * @param l the desired output length in octets.
    * @return the mask.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSA.java b/libjava/classpath/gnu/java/security/sig/rsa/RSA.java
index cdd9eaa5b8a..343b2cf65fe 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSA.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSA.java
@@ -1,4 +1,4 @@
-/* RSA.java -- 
+/* RSA.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -87,7 +87,7 @@ public class RSA
    * RSA private key is a valid one, this method computes a signature
    * representative for a designated message representative signed
    * by the holder of the designated RSA private key.
-   * 
+   *
    * @param K the RSA private key.
    * @param m the message representative: an integer between
    *          0 and n - 1, where n
@@ -117,7 +117,7 @@ public class RSA
    * representative for the designated signature representative
    * generated by an RSA private key, for a message intended for the holder of
    * the designated RSA public key.
-   * 
+   *
    * @param K the RSA public key.
    * @param s the signature representative, an integer between
    *          0 and n - 1, where n
@@ -143,7 +143,7 @@ public class RSA
 
   /**
    * An implementation of the RSAEP algorithm.
-   * 
+   *
    * @param K the recipient's RSA public key.
    * @param m the message representative as an MPI.
    * @return the resulting MPI --an MPI between 0 and
@@ -170,7 +170,7 @@ public class RSA
 
   /**
    * An implementation of the RSADP algorithm.
-   * 
+   *
    * @param K the recipient's RSA private key.
    * @param c the ciphertext representative as an MPI.
    * @return the message representative, an MPI between 0 and
@@ -197,7 +197,7 @@ public class RSA
   /**
    * Converts a multi-precision integer (MPI) s into an
    * octet sequence of length k.
-   * 
+   *
    * @param s the multi-precision integer to convert.
    * @param k the length of the output.
    * @return the result of the transform.
@@ -302,7 +302,7 @@ public class RSA
   /**
    * Returns a random MPI with a random bit-length of the form 8b,
    * where b is in the range [32..64].
-   * 
+   *
    * @return a random MPI whose length in bytes is between 32 and 64 inclusive.
    */
   private static final BigInteger newR(final BigInteger N)
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java
index 76460c0cafa..1420331ded6 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5Signature.java
@@ -1,4 +1,4 @@
-/* RSAPKCS1V1_5Signature.java -- 
+/* RSAPKCS1V1_5Signature.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -85,7 +85,7 @@ public class RSAPKCS1V1_5Signature
   /**
    * Constructs an instance of this object using the designated message digest
    * algorithm as its underlying hash function.
-   * 
+   *
    * @param mdName the canonical name of the underlying hash function.
    */
   public RSAPKCS1V1_5Signature(final String mdName)
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java
index 68c1edaa6b1..548dc3debff 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureRawCodec.java
@@ -71,7 +71,7 @@ public class RSAPKCS1V1_5SignatureRawCodec
    * signature bytes in internet order,
    * 
    7. the RSA-PKCS#1 (v1.5) signature bytes in internet order.
      8. 
    * 
-   * 
+   *
    * @param signature the signature to encode, consisting of the output of the
    *          sign() method of a {@link RSAPKCS1V1_5Signature}
    *          instance --a byte array.
@@ -116,7 +116,7 @@ public class RSAPKCS1V1_5SignatureRawCodec
   /**
    * Returns the decoded object from a designated input assumed to have been
    * generated by the {@link #encodeSignature(Object)} method.
-   * 
+   *
    * @param input the input bytes of a previously Raw-encoded RSA PKCS1 (v1.5)
    *          signature.
    * @return the signature object.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java
index 3cb375602a0..ee8586f7d82 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPKCS1V1_5SignatureX509Codec.java
@@ -51,7 +51,7 @@ import java.security.InvalidParameterException;
  * 
      
  * Digital signatures when transmitted in an X.509 certificates are encoded
  * in DER (Distinguished Encoding Rules) as a BIT STRING; i.e.
- * 
+ *
  * 
        * Certificate ::= SEQUENCE {
  *   tbsCertificate       TBSCertificate,
@@ -95,7 +95,7 @@ public class RSAPKCS1V1_5SignatureX509Codec
   /**
    * Encodes an RSA Signature output as a signature BIT STRING as
    * defined in the documentation of this class.
-   * 
+   *
    * @param signature the output of the RSA PKCS1 (v1.5) signature algorithm;
    *          i.e. the value returned by the invocation of
    *          {@link gnu.java.security.sig.ISignature#sign()} method. In the
@@ -111,7 +111,7 @@ public class RSAPKCS1V1_5SignatureX509Codec
 
   /**
    * Decodes a signature as defined in the documentation of this class.
-   * 
+   *
    * @param input the byte array to unmarshall into a valid RSA PKCS1 (v1.5)
    *          signature instance; i.e. a byte array. MUST NOT be null.
    * @return an array of raw bytes decoded from the designated input. In the
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
index 27c7fe620fd..d8f8327f1cf 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignature.java
@@ -1,4 +1,4 @@
-/* RSAPSSSignature.java -- 
+/* RSAPSSSignature.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -95,7 +95,7 @@ public class RSAPSSSignature
   /**
    * Constructs an instance of this object using the designated message digest
    * algorithm as its underlying hash function, and having 0-octet salt.
-   * 
+   *
    * @param mdName the canonical name of the underlying hash function.
    */
   public RSAPSSSignature(String mdName)
@@ -106,7 +106,7 @@ public class RSAPSSSignature
   /**
    * Constructs an instance of this object using the designated message digest
    * algorithm as its underlying hash function.
-   * 
+   *
    * @param mdName the canonical name of the underlying hash function.
    * @param sLen the desired length in octets of the salt to use for encoding /
    *          decoding signatures.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
index b5e059c20e0..b147ea3ea21 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSAPSSSignatureRawCodec.java
@@ -1,4 +1,4 @@
-/* RSAPSSSignatureRawCodec.java -- 
+/* RSAPSSSignatureRawCodec.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public class RSAPSSSignatureRawCodec
    * bytes in internet order,
    * 
    8. the RSA-PSS signature bytes in internet order.
      9. 
    * 
-   * 
+   *
    * @param signature the signature to encode, consisting of the output of the
    *          sign() method of a {@link RSAPSSSignature} instance
    *          --a byte array.
diff --git a/libjava/classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java b/libjava/classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java
index b8e12caf769..ba5121b4651 100644
--- a/libjava/classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java
+++ b/libjava/classpath/gnu/java/security/sig/rsa/RSASignatureFactory.java
@@ -71,7 +71,7 @@ public class RSASignatureFactory
    * hyphen chanaracter - followed by the canonical message digest
    * algorithm name. When no message digest algorithm name is given, SHA-160 is
    * used.
-   *  
+   *
    * @param name the composite RSA signature name.
    * @return a new instance of an RSA Signature algorithm implementation.
    * Returns null if the given name does not correspond to any
@@ -102,7 +102,7 @@ public class RSASignatureFactory
   /**
    * Returns a {@link Set} of names of RSA signatures supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of RSA Signature algorithm names (Strings).
    */
   public static synchronized final Set getNames()
diff --git a/libjava/classpath/gnu/java/security/util/ByteArray.java b/libjava/classpath/gnu/java/security/util/ByteArray.java
index 51449204397..a9b9e5d0066 100644
--- a/libjava/classpath/gnu/java/security/util/ByteArray.java
+++ b/libjava/classpath/gnu/java/security/util/ByteArray.java
@@ -65,23 +65,23 @@ public final class ByteArray
     int len = value.length;
     while (i < len)
       {
-	out.print (formatInt (i, 16, 8));
-	out.print ("  ");
-	int l = Math.min (16, len - i);
-	String s = toHexString (value, i, l, ' ');
-	out.print (s);
-	for (int j = 56 - (56 - s.length ()); j < 56; j++)
-	  out.print (" ");
-	for (int j = 0; j < l; j++)
-	  {
-	    byte b = value[i+j];
-	    if ((b & 0xFF) < 0x20 || (b & 0xFF) > 0x7E)
-	      out.print (".");
-	    else
-	      out.print ((char) (b & 0xFF));
-	  }
-	out.println ();
-	i += 16;
+        out.print (formatInt (i, 16, 8));
+        out.print ("  ");
+        int l = Math.min (16, len - i);
+        String s = toHexString (value, i, l, ' ');
+        out.print (s);
+        for (int j = 56 - (56 - s.length ()); j < 56; j++)
+          out.print (" ");
+        for (int j = 0; j < l; j++)
+          {
+            byte b = value[i+j];
+            if ((b & 0xFF) < 0x20 || (b & 0xFF) > 0x7E)
+              out.print (".");
+            else
+              out.print ((char) (b & 0xFF));
+          }
+        out.println ();
+        i += 16;
       }
     return str.toString ();
   }
@@ -91,8 +91,8 @@ public final class ByteArray
     CPStringBuilder str = new CPStringBuilder();
     for (int i = 0; i < len; i++)
       {
-	str.append (Character.forDigit (buf[i+off] >>> 4 & 0x0F, 16));
-	str.append (Character.forDigit (buf[i+off] & 0x0F, 16));
+        str.append (Character.forDigit (buf[i+off] >>> 4 & 0x0F, 16));
+        str.append (Character.forDigit (buf[i+off] & 0x0F, 16));
         if (i < len - 1)
           str.append(sep);
       }
diff --git a/libjava/classpath/gnu/java/security/util/ByteBufferOutputStream.java b/libjava/classpath/gnu/java/security/util/ByteBufferOutputStream.java
index be4d0a98d67..642ccdf68f8 100644
--- a/libjava/classpath/gnu/java/security/util/ByteBufferOutputStream.java
+++ b/libjava/classpath/gnu/java/security/util/ByteBufferOutputStream.java
@@ -47,18 +47,18 @@ import java.nio.ByteBuffer;
 /**
  * An output stream that writes bytes to a ByteBuffer, which will be resized
  * if more space is needed.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class ByteBufferOutputStream extends OutputStream
 {
   private ByteBuffer buffer;
-  
+
   public ByteBufferOutputStream()
   {
     this(256);
   }
-  
+
   public ByteBufferOutputStream(int initialCapacity)
   {
     buffer = ByteBuffer.allocate(initialCapacity);
@@ -71,16 +71,16 @@ public class ByteBufferOutputStream extends OutputStream
   {
     if (!buffer.hasRemaining())
       growBuffer();
-    buffer.put((byte) b); 
+    buffer.put((byte) b);
   }
-  
+
   public @Override synchronized void write(byte[] b, int offset, int length)
   {
     if (buffer.remaining() < length)
       growBuffer();
     buffer.put(b, offset, length);
   }
-  
+
   public @Override void write(byte[] b)
   {
     write(b, 0, b.length);
@@ -90,19 +90,19 @@ public class ByteBufferOutputStream extends OutputStream
    * Get the current state of the buffer. The returned buffer will have
    * its position set to zero, its capacity set to the current limit,
    * and its limit set to its capacity.
-   * 
+   *
    * @return The buffer.
    */
   public ByteBuffer buffer()
   {
     return ((ByteBuffer) buffer.duplicate().flip()).slice();
   }
-  
+
   public String toString()
   {
     return super.toString() + " [ buffer: " + buffer + " ]";
   }
-  
+
   private void growBuffer()
   {
     int newCapacity = buffer.capacity();
diff --git a/libjava/classpath/gnu/java/security/util/ExpirableObject.java b/libjava/classpath/gnu/java/security/util/ExpirableObject.java
index e0c4e6b5984..e24af249aa5 100644
--- a/libjava/classpath/gnu/java/security/util/ExpirableObject.java
+++ b/libjava/classpath/gnu/java/security/util/ExpirableObject.java
@@ -57,7 +57,7 @@ import javax.security.auth.Destroyable;
  * 
      
  * Note that if a {@link DestroyFailedException} occurs when the timeout
  * expires, it will not be reported.
- * 
+ *
  * @see Destroyable
  */
 public abstract class ExpirableObject
@@ -89,7 +89,7 @@ public abstract class ExpirableObject
 
   /**
    * Create a new expirable object that will expire after the specified timeout.
-   * 
+   *
    * @param delay The delay before expiration.
    * @throws IllegalArgumentException If delay is negative, or if
    *           delay + System.currentTimeMillis() is negative.
@@ -104,7 +104,7 @@ public abstract class ExpirableObject
    * Destroys this object. This method calls {@link #doDestroy}, then, if no
    * exception is thrown, cancels the task that would destroy this object when
    * the timeout is reached.
-   * 
+   *
    * @throws DestroyFailedException If this operation fails.
    */
   public final void destroy() throws DestroyFailedException
@@ -116,7 +116,7 @@ public abstract class ExpirableObject
   /**
    * Subclasses must implement this method instead of the {@link
    * Destroyable#destroy()} method.
-   * 
+   *
    * @throws DestroyFailedException If this operation fails.
    */
   protected abstract void doDestroy() throws DestroyFailedException;
diff --git a/libjava/classpath/gnu/java/security/util/FormatUtil.java b/libjava/classpath/gnu/java/security/util/FormatUtil.java
index eed669cc3a4..35da322b813 100644
--- a/libjava/classpath/gnu/java/security/util/FormatUtil.java
+++ b/libjava/classpath/gnu/java/security/util/FormatUtil.java
@@ -53,7 +53,7 @@ public class FormatUtil
 
   /**
    * Returns the fully qualified name of the designated encoding ID.
-   * 
+   *
    * @param formatID the unique identifier of the encoding format.
    * @return the fully qualified name of the designated format. Returns
    *         null if no such encoding format is known.
@@ -83,7 +83,7 @@ public class FormatUtil
   /**
    * Returns the short name of the designated encoding ID. This is used by the
    * JCE Adapters.
-   * 
+   *
    * @param formatID the unique identifier of the encoding format.
    * @return the short name of the designated format. Returns null
    *         if no such encoding format is known.
@@ -112,7 +112,7 @@ public class FormatUtil
 
   /**
    * Returns the identifier of the encoding format given its short name.
-   * 
+   *
    * @param name the case-insensitive canonical short name of an encoding
    *          format.
    * @return the identifier of the designated encoding format, or 0
@@ -134,7 +134,7 @@ public class FormatUtil
       result = Registry.X509_ENCODING_ID;
     else if (name.equalsIgnoreCase(Registry.PKCS8_ENCODING_SHORT_NAME))
       result = Registry.PKCS8_ENCODING_ID;
-    
+
     return result;
   }
 }
diff --git a/libjava/classpath/gnu/java/security/util/IntegerUtil.java b/libjava/classpath/gnu/java/security/util/IntegerUtil.java
index f071308084c..106dc4d6653 100644
--- a/libjava/classpath/gnu/java/security/util/IntegerUtil.java
+++ b/libjava/classpath/gnu/java/security/util/IntegerUtil.java
@@ -71,7 +71,7 @@ public abstract class IntegerUtil
    * This method MUST be used in the gnu.java.security and gnu.javax.crypto
    * packages to ensure they would work with a version 1.4 only of the Java
    * class library API.
-   * 
+   *
    * @param aString a string representation of an integer.
    * @return the {@link Integer} object representing the designated string.
    */
@@ -98,7 +98,7 @@ public abstract class IntegerUtil
    * This method MUST be used in the gnu.java.security and gnu.javax.crypto
    * packages to ensure they would work with a version 1.4 only of the Java
    * class library API.
-   * 
+   *
    * @param anInt a decimal integer.
    * @return the {@link Integer} object representing the designated primitive.
    */
diff --git a/libjava/classpath/gnu/java/security/util/PRNG.java b/libjava/classpath/gnu/java/security/util/PRNG.java
index 7bb27cbf452..1bed04dcd0f 100644
--- a/libjava/classpath/gnu/java/security/util/PRNG.java
+++ b/libjava/classpath/gnu/java/security/util/PRNG.java
@@ -47,7 +47,7 @@ import gnu.java.security.prng.MDGenerator;
 /**
  * A useful hash-based (SHA) pseudo-random number generator used throughout this
  * library.
- * 
+ *
  * @see MDGenerator
  */
 public class PRNG
@@ -57,7 +57,7 @@ public class PRNG
 
   /**
    * Private constructor to enforce using the Factory method.
-   * 
+   *
    * @param delegate the undelying {@link IRandom} object used.
    */
   private PRNG(IRandom delegate)
@@ -93,7 +93,7 @@ public class PRNG
   /**
    * Completely fills the designated buffer with random data
    * generated by the underlying delegate.
-   * 
+   *
    * @param buffer the place holder of random bytes generated by the underlying
    *          delegate. On output, the contents of buffer are
    *          replaced with pseudo-random data, iff the buffer
@@ -108,7 +108,7 @@ public class PRNG
    * Fills the designated buffer, starting from byte at position
    * offset with, at most, length bytes of random
    * data generated by the underlying delegate.
-   * 
+   *
    * @see IRandom#nextBytes
    */
   public void nextBytes(byte[] buffer, int offset, int length)
diff --git a/libjava/classpath/gnu/java/security/util/Prime.java b/libjava/classpath/gnu/java/security/util/Prime.java
index e493ce67503..82c584ff42a 100644
--- a/libjava/classpath/gnu/java/security/util/Prime.java
+++ b/libjava/classpath/gnu/java/security/util/Prime.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -55,49 +55,49 @@ public final class Prime
     BigInteger p = new BigInteger( (pmax + pmin)/2, new Random() );
     if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmin ) ) <= 0 )
       {
-	p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
+        p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin ).subtract( p ) );
       }
-	
+
     //Step 2 - test for even
     if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
       p = p.add( BigInteger.valueOf( 1 ) );
 
     for(;;)
       {
-	//Step 3
-	if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmax)) > 0)
-	  {
-	    //Step 3.1
-	    p = p.subtract( BigInteger.valueOf( 1 ).shiftLeft( pmax) );
-	    p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin) );
-	    p = p.subtract( BigInteger.valueOf( 1 ) );
+        //Step 3
+        if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmax)) > 0)
+          {
+            //Step 3.1
+            p = p.subtract( BigInteger.valueOf( 1 ).shiftLeft( pmax) );
+            p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin) );
+            p = p.subtract( BigInteger.valueOf( 1 ) );
 
-	    //Step 3.2
-	    // put step 2 code here so looping code is cleaner
-	    //Step 2 - test for even
-	    if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
-	      p = p.add( BigInteger.valueOf( 1 ) );
-	    continue;
-	  }
-	
-	//Step 4 - compute GCD
-	d = p.subtract( BigInteger.valueOf(1) );
-	d = d.gcd( f );
+            //Step 3.2
+            // put step 2 code here so looping code is cleaner
+            //Step 2 - test for even
+            if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
+              p = p.add( BigInteger.valueOf( 1 ) );
+            continue;
+          }
 
-	//Step 5 - test d
-	if( d.compareTo( BigInteger.valueOf( 1 ) ) == 0)
-	  {
-	    //Step 5.1 - test primality
-	    if( p.isProbablePrime( 1 ) == true )
-	      {
-				//Step 5.2;
-		return p;
-	      }
-	  }
-	//Step 6
-	p = p.add( BigInteger.valueOf( 2 ) );
+        //Step 4 - compute GCD
+        d = p.subtract( BigInteger.valueOf(1) );
+        d = d.gcd( f );
 
-	//Step 7
+        //Step 5 - test d
+        if( d.compareTo( BigInteger.valueOf( 1 ) ) == 0)
+          {
+            //Step 5.1 - test primality
+            if( p.isProbablePrime( 1 ) == true )
+              {
+                                //Step 5.2;
+                return p;
+              }
+          }
+        //Step 6
+        p = p.add( BigInteger.valueOf( 2 ) );
+
+        //Step 7
       }
   }
 
@@ -122,43 +122,43 @@ public final class Prime
 
       //Step 4 - test for even
       if( p.mod( BigInteger.valueOf(2) ).compareTo( BigInteger.valueOf( 0 )) == 0)
-	p = p.add( r );
+        p = p.add( r );
 
       for(;;)
-	{
-	  //Step 5
-	  if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmax)) > 0)
-	    {
-	      //Step 5.1
-	      p = p.subtract( BigInteger.valueOf( 1 ).shiftLeft( pmax) );
-	      p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin) );
-	      p = p.subtract( BigInteger.valueOf( 1 ) );
+        {
+          //Step 5
+          if( p.compareTo( BigInteger.valueOf( 1 ).shiftLeft( pmax)) > 0)
+            {
+              //Step 5.1
+              p = p.subtract( BigInteger.valueOf( 1 ).shiftLeft( pmax) );
+              p = p.add( BigInteger.valueOf( 1 ).shiftLeft( pmin) );
+              p = p.subtract( BigInteger.valueOf( 1 ) );
 
-	      //Step 5.2 - goto to Step 2
-	      break steptwo;
-	    }
+              //Step 5.2 - goto to Step 2
+              break steptwo;
+            }
 
-	  //Step 6
-	  d = p.subtract( BigInteger.valueOf(1) );
-	  d = d.gcd( f );
+          //Step 6
+          d = p.subtract( BigInteger.valueOf(1) );
+          d = d.gcd( f );
 
-	  //Step 7 - test d
-	  if( d.compareTo( BigInteger.valueOf( 1 ) ) == 0)
-	    {
-	      //Step 7.1 - test primality
-	      if( p.isProbablePrime( 1 ) == true )
-		{
-				//Step 7.2;
-		  return p;
-		}
-	    }
-	  //Step 8
-	  p = p.add( r.multiply( BigInteger.valueOf(2) ) );
+          //Step 7 - test d
+          if( d.compareTo( BigInteger.valueOf( 1 ) ) == 0)
+            {
+              //Step 7.1 - test primality
+              if( p.isProbablePrime( 1 ) == true )
+                {
+                                //Step 7.2;
+                  return p;
+                }
+            }
+          //Step 8
+          p = p.add( r.multiply( BigInteger.valueOf(2) ) );
 
-	  //Step 9
-	}
+          //Step 9
+        }
     }
     //Should never reach here but makes the compiler happy
-    return BigInteger.valueOf(0);	
+    return BigInteger.valueOf(0);
   }
 }
diff --git a/libjava/classpath/gnu/java/security/util/Sequence.java b/libjava/classpath/gnu/java/security/util/Sequence.java
index 5e3a64eaf3e..63086d2bd0f 100644
--- a/libjava/classpath/gnu/java/security/util/Sequence.java
+++ b/libjava/classpath/gnu/java/security/util/Sequence.java
@@ -55,7 +55,7 @@ public final class Sequence
    * through all positive integers then negative integers until the end value is
    * reached. Naturally, this will result in an enormous object, so don't do
    * this.
-   * 
+   *
    * @param end The ending value.
    */
   public Sequence(int end)
@@ -68,7 +68,7 @@ public final class Sequence
    * increment of 1. If end is less than start, then the
    * sequence will wrap around until the end value is reached. Naturally, this
    * will result in an enormous object, so don't do this.
-   * 
+   *
    * @param start The starting value.
    * @param end The ending value.
    */
@@ -88,7 +88,7 @@ public final class Sequence
    * If span is 0, then the sequence will contain {start,
    * end} if start != end, or just the singleton
    * start if start == end.
-   * 
+   *
    * @param start The starting value.
    * @param end The ending value.
    * @param span The increment value.
diff --git a/libjava/classpath/gnu/java/security/util/SimpleList.java b/libjava/classpath/gnu/java/security/util/SimpleList.java
index 74f3bafcead..15d54c988ab 100644
--- a/libjava/classpath/gnu/java/security/util/SimpleList.java
+++ b/libjava/classpath/gnu/java/security/util/SimpleList.java
@@ -54,7 +54,7 @@ public final class SimpleList
 
   /**
    * Create a singleton list.
-   * 
+   *
    * @param element The first element.
    */
   public SimpleList(final Object element)
@@ -65,7 +65,7 @@ public final class SimpleList
 
   /**
    * Create an ordered pair (2-tuple).
-   * 
+   *
    * @param e1 The first element.
    * @param e2 The second element.
    */
@@ -78,7 +78,7 @@ public final class SimpleList
 
   /**
    * Create a 3-tuple.
-   * 
+   *
    * @param e1 The first element.
    * @param e2 The second element.
    * @param e3 The third element.
@@ -93,7 +93,7 @@ public final class SimpleList
 
   /**
    * Create a 4-tuple.
-   * 
+   *
    * @param e1 The first element.
    * @param e2 The second element.
    * @param e3 The third element.
@@ -121,7 +121,7 @@ public final class SimpleList
    * Create an n-tuple of arbitrary size. Even if the supplied collection has no
    * natural order, the created n-tuple will have the order that the elements
    * are returned by the collection's iterator.
-   * 
+   *
    * @param c The collection.
    */
   public SimpleList(Collection c)
diff --git a/libjava/classpath/gnu/java/security/util/Util.java b/libjava/classpath/gnu/java/security/util/Util.java
index 50d4466d539..ef3d480a0b6 100644
--- a/libjava/classpath/gnu/java/security/util/Util.java
+++ b/libjava/classpath/gnu/java/security/util/Util.java
@@ -70,7 +70,7 @@ public class Util
    * 
          * toString(ba, 0, ba.length);
    * 
      
-   * 
+   *
    * @param ba the byte array to convert.
    * @return a string of hexadecimal characters (two for each byte) representing
    *         the designated input byte array.
@@ -84,7 +84,7 @@ public class Util
    * Returns a string of hexadecimal digits from a byte array, starting at
    * offset and consisting of length bytes. Each
    * byte is converted to 2 hex symbols; zero(es) included.
-   * 
+   *
    * @param ba the byte array to convert.
    * @param offset the index from which to start considering the bytes to
    *          convert.
@@ -114,7 +114,7 @@ public class Util
    * 
          * toReversedString(ba, 0, ba.length);
    * 
      
-   * 
+   *
    * @param ba the byte array to convert.
    * @return a string of hexadecimal characters (two for each byte) representing
    *         the designated input byte array.
@@ -131,7 +131,7 @@ public class Util
    * 
      
    * The byte array is treated as a large little-endian integer, and is returned
    * as a large big-endian integer.
-   * 
+   *
    * @param ba the byte array to convert.
    * @param offset the index from which to start considering the bytes to
    *          convert.
@@ -156,7 +156,7 @@ public class Util
    * 
      
    * Returns a byte array from a string of hexadecimal digits.
    * 
      
-   * 
+   *
    * @param s a string of hexadecimal ASCII characters
    * @return the decoded byte array from the input hexadecimal string.
    */
@@ -179,7 +179,7 @@ public class Util
    * Returns a byte array from a string of hexadecimal digits, interpreting them
    * as a large big-endian integer and returning it as a large little-endian
    * integer.
-   * 
+   *
    * @param s a string of hexadecimal ASCII characters
    * @return the decoded byte array from the input hexadecimal string.
    */
@@ -201,7 +201,7 @@ public class Util
   /**
    * Returns a number from 0 to 15 corresponding
    * to the designated hexadecimal digit.
-   * 
+   *
    * @param c a hexadecimal ASCII symbol.
    */
   public static int fromDigit(char c)
@@ -219,7 +219,7 @@ public class Util
   /**
    * Returns a string of 8 hexadecimal digits (most significant digit first)
    * corresponding to the unsigned integer n.
-   * 
+   *
    * @param n the unsigned integer to convert.
    * @return a hexadecimal string 8-character long.
    */
@@ -260,7 +260,7 @@ public class Util
   /**
    * Returns a string of 16 hexadecimal digits (most significant digit first)
    * corresponding to the unsigned long n.
-   * 
+   *
    * @param n the unsigned long to convert.
    * @return a hexadecimal string 16-character long.
    */
@@ -280,7 +280,7 @@ public class Util
    * escape character is inserted before every pair of bytes. Useful to
    * externalise byte arrays that will be constructed later from such strings;
    * eg. s-box values.
-   * 
+   *
    * @throws ArrayIndexOutOfBoundsException if the length is odd.
    */
   public static String toUnicodeString(byte[] ba)
@@ -293,7 +293,7 @@ public class Util
    * escape character is inserted before every pair of bytes. Useful to
    * externalise byte arrays that will be constructed later from such strings;
    * eg. s-box values.
-   * 
+   *
    * @throws ArrayIndexOutOfBoundsException if the length is odd.
    */
   public static final String toUnicodeString(byte[] ba, int offset, int length)
@@ -324,7 +324,7 @@ public class Util
    * escape character is inserted before every pair of bytes. Useful to
    * externalise integer arrays that will be constructed later from such
    * strings; eg. s-box values.
-   * 
+   *
    * @throws ArrayIndexOutOfBoundsException if the length is not a multiple of
    *           4.
    */
@@ -376,7 +376,7 @@ public class Util
    * If offset and length are omitted, the whole
    * array is used. If m is omitted, nothing is prepended to each
    * line.
-   * 
+   *
    * @param data the byte array to be dumped.
    * @param offset the offset within data to start from.
    * @param length the number of bytes to dump.
@@ -433,7 +433,7 @@ public class Util
   /**
    * Returns a string of 2 hexadecimal digits (most significant digit first)
    * corresponding to the lowest 8 bits of n.
-   * 
+   *
    * @param n the byte value to convert.
    * @return a string of 2 hex characters representing the input.
    */
@@ -449,7 +449,7 @@ public class Util
    * '.' (dot) shall be used instead of "+' (plus).
    * 
      
    * Used by SASL password file manipulation primitives.
-   * 
+   *
    * @param buffer an arbitrary sequence of bytes to represent in Base-64.
    * @return unpadded (without the '=' character(s)) Base-64 representation of
    *         the input.
@@ -525,7 +525,7 @@ public class Util
    * 
      
    * Converts a string representing the encoding of some bytes in Base-64 to
    * their original form.
-   * 
+   *
    * @param str the Base-64 encoded representation of some byte(s).
    * @return the bytes represented by the str.
    * @throws NumberFormatException if str is null,
@@ -597,7 +597,7 @@ public class Util
    * Treats the input as the MSB representation of a number, and discards
    * leading zero elements. For efficiency, the input is simply returned if no
    * leading zeroes are found.
-   * 
+   *
    * @param n the {@link BigInteger} to trim.
    * @return the byte array representation of the designated {@link BigInteger}
    *         with no leading 0-bytes.
@@ -618,7 +618,7 @@ public class Util
 
   /**
    * Returns a hexadecimal dump of the trimmed bytes of a {@link BigInteger}.
-   * 
+   *
    * @param x the {@link BigInteger} to display.
    * @return the string representation of the designated {@link BigInteger}.
    */
diff --git a/libjava/classpath/gnu/java/security/x509/X509CRLSelectorImpl.java b/libjava/classpath/gnu/java/security/x509/X509CRLSelectorImpl.java
index 0ada5501689..582d18583f7 100644
--- a/libjava/classpath/gnu/java/security/x509/X509CRLSelectorImpl.java
+++ b/libjava/classpath/gnu/java/security/x509/X509CRLSelectorImpl.java
@@ -135,4 +135,3 @@ public class X509CRLSelectorImpl implements CRLSelector
     return false;
   }
 }
-
diff --git a/libjava/classpath/gnu/java/security/x509/X509CertSelectorImpl.java b/libjava/classpath/gnu/java/security/x509/X509CertSelectorImpl.java
index 36187ad8e64..5201a76b9ef 100644
--- a/libjava/classpath/gnu/java/security/x509/X509CertSelectorImpl.java
+++ b/libjava/classpath/gnu/java/security/x509/X509CertSelectorImpl.java
@@ -194,4 +194,3 @@ public class X509CertSelectorImpl implements CertSelector
     return matchIssuer && matchSubject;
   }
 }
-
diff --git a/libjava/classpath/gnu/java/security/x509/ext/CertificatePolicies.java b/libjava/classpath/gnu/java/security/x509/ext/CertificatePolicies.java
index c451762f8e0..874b8eeeb51 100644
--- a/libjava/classpath/gnu/java/security/x509/ext/CertificatePolicies.java
+++ b/libjava/classpath/gnu/java/security/x509/ext/CertificatePolicies.java
@@ -142,7 +142,7 @@ public class CertificatePolicies extends Extension.Value
   {
     return policies;
   }
-  
+
   /**
    * Returns the list of policy OIDs, formatted as dotted-decimal strings.
    *
diff --git a/libjava/classpath/gnu/java/security/x509/ext/GeneralName.java b/libjava/classpath/gnu/java/security/x509/ext/GeneralName.java
index fbc05339f6d..f399de1b7e0 100644
--- a/libjava/classpath/gnu/java/security/x509/ext/GeneralName.java
+++ b/libjava/classpath/gnu/java/security/x509/ext/GeneralName.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 
 /**
  * The GeneralName structure from X.509.
- * 
+ *
  * 
         GeneralName ::= CHOICE {
     otherName                       [0]     OtherName,
@@ -87,12 +87,12 @@ public class GeneralName
     registeredId (8);
 
     private int tag;
-    
+
     private Kind(int tag)
     {
       this.tag = tag;
     }
-    
+
     public static Kind forTag(final int tag)
     {
       switch (tag)
@@ -107,10 +107,10 @@ public class GeneralName
         case 7: return iPAddress;
         case 8: return registeredId;
       }
-      
+
       throw new IllegalArgumentException("invalid tag: " + tag);
     }
-    
+
     public int tag()
     {
       return tag;
@@ -120,17 +120,17 @@ public class GeneralName
   private final Kind kind;
   private final byte[] name;
   private final byte[] encoded;
-  
+
   public GeneralName(byte[] encoded) throws IOException
   {
     DERReader reader = new DERReader(encoded);
     DERValue value = reader.read();
-    
+
     if (value.getTagClass() != DER.CONTEXT)
       throw new IOException("malformed GeneralName");
-    
+
     this.encoded = value.getEncoded();
-    
+
     kind = Kind.forTag(value.getTag());
     switch (kind)
     {
@@ -176,29 +176,29 @@ public class GeneralName
         name = value.getEncoded();
         name[0] = DER.OBJECT_IDENTIFIER;
         break;
-        
+
       default:
         name = null; // Not reached.
     }
   }
-  
+
   public GeneralName(Kind kind, byte[] name)
   {
     this.kind = kind;
     this.name = (byte[]) name.clone();
     this.encoded = null;
   }
-  
+
   public Kind kind()
   {
     return kind;
   }
-  
+
   public byte[] name()
   {
     return (byte[]) name.clone();
   }
-  
+
   public byte[] encoded()
   {
     try
@@ -210,7 +210,7 @@ public class GeneralName
         return null;
       }
   }
-  
+
   public boolean equals(Object o)
   {
     try
@@ -223,7 +223,7 @@ public class GeneralName
         return false;
       }
   }
-  
+
   public String toString()
   {
     return (super.toString() + " [ kind=" + kind + "; name=" +
diff --git a/libjava/classpath/gnu/java/security/x509/ext/GeneralSubtree.java b/libjava/classpath/gnu/java/security/x509/ext/GeneralSubtree.java
index 5f6ffd98701..5d688deaab2 100644
--- a/libjava/classpath/gnu/java/security/x509/ext/GeneralSubtree.java
+++ b/libjava/classpath/gnu/java/security/x509/ext/GeneralSubtree.java
@@ -1,4 +1,4 @@
-/* GeneralSubtree.java -- 
+/* GeneralSubtree.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -63,20 +63,20 @@ public class GeneralSubtree
   private final GeneralName base;
   private final int minimum;
   private final int maximum;
-  
+
   public GeneralSubtree(byte[] encoded) throws IOException
   {
     DERReader reader = new DERReader(encoded);
     DERValue generalSubtree = reader.read();
-    
+
     if (!generalSubtree.isConstructed())
       throw new IOException("malformed GeneralSubtree");
-    
+
     DERValue generalName = reader.read();
     base = new GeneralName(generalName.getEncoded());
     if (generalName.isConstructed())
       reader.skip(generalName.getLength());
-    
+
     int len = generalName.getEncodedLength();
     if (len < generalSubtree.getLength())
       {
@@ -116,7 +116,7 @@ public class GeneralSubtree
         maximum = -1;
       }
   }
-  
+
   /**
    * Returns the base name.
    *
@@ -126,7 +126,7 @@ public class GeneralSubtree
   {
     return base;
   }
-  
+
   /**
    * Returns the minimum base distance, possibly zero.
    *
@@ -136,7 +136,7 @@ public class GeneralSubtree
   {
     return minimum;
   }
-  
+
   /**
    * Returns the maximum base distance, or -1 if this value was not specified.
    *
@@ -146,7 +146,7 @@ public class GeneralSubtree
   {
     return maximum;
   }
-  
+
   public String toString()
   {
     return (GeneralSubtree.class.getName() + " [ base=" + base
diff --git a/libjava/classpath/gnu/java/security/x509/ext/NameConstraints.java b/libjava/classpath/gnu/java/security/x509/ext/NameConstraints.java
index 607c4296642..8f374d560ff 100644
--- a/libjava/classpath/gnu/java/security/x509/ext/NameConstraints.java
+++ b/libjava/classpath/gnu/java/security/x509/ext/NameConstraints.java
@@ -51,7 +51,7 @@ import java.util.List;
 /**
  * The NameConstraints extension. From RFC 3280, section 4.2.1.11, this
  * extension is defined as:
- * 
+ *
  * 
         id-ce-nameConstraints OBJECT IDENTIFIER ::=  { id-ce 30 }
 
@@ -68,29 +68,29 @@ import java.util.List;
 
   BaseDistance ::= INTEGER (0..MAX)
   
      
- * 
+ *
  * See also the classes {@link GeneralNames} and {@link GeneralSubtree}.
- * 
+ *
  * @author csm
  */
 public class NameConstraints extends Value
 {
   public static final OID ID = new OID("2.5.29.30");
-  
+
   private List permittedSubtrees;
   private List excludedSubtrees;
-  
+
   public NameConstraints(byte[] encoded) throws IOException
   {
     super(encoded);
-    
+
     DERReader der = new DERReader(encoded);
     DERValue value = der.read();
     if (!value.isConstructed())
       {
         throw new IOException("malformed NameConstraints");
       }
-    
+
     permittedSubtrees = new LinkedList();
     excludedSubtrees = new LinkedList();
     int len = 0;
@@ -108,7 +108,7 @@ public class NameConstraints extends Value
                 len2 += subtree.getEncodedLength();
               }
             len += subtrees.getEncodedLength();
-            
+
             if (len < value.getLength())
               {
                 subtrees = der.read();
@@ -134,24 +134,24 @@ public class NameConstraints extends Value
                 excludedSubtrees.add(new GeneralSubtree(subtree.getEncoded()));
                 der.skip(subtree.getLength());
                 len2 += subtree.getEncodedLength();
-              }            
+              }
           }
         else
           throw new IOException("unexpected tag " + subtrees.getTag()
                                 + " (expecting 0 or 1)");
       }
   }
-  
+
   public List permittedSubtrees()
   {
     return Collections.unmodifiableList(permittedSubtrees);
   }
-  
+
   public List excludedSubtrees()
   {
     return Collections.unmodifiableList(excludedSubtrees);
   }
-  
+
   public String toString()
   {
     return NameConstraints.class.getName() + " [ permittedSubtrees="
diff --git a/libjava/classpath/gnu/java/text/AttributedFormatBuffer.java b/libjava/classpath/gnu/java/text/AttributedFormatBuffer.java
index c2aae96092a..2a89ae0972e 100644
--- a/libjava/classpath/gnu/java/text/AttributedFormatBuffer.java
+++ b/libjava/classpath/gnu/java/text/AttributedFormatBuffer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -56,13 +56,13 @@ public class AttributedFormatBuffer implements FormatBuffer
   private final ArrayList ranges;
   private final ArrayList attributes;
   private int[] a_ranges;
-  private HashMap[] a_attributes; 
+  private HashMap[] a_attributes;
   private int startingRange;
   AttributedCharacterIterator.Attribute defaultAttr;
 
   /**
    * This constructor accepts a StringBuffer. If the buffer contains
-   * already some characters they will not be attributed. 
+   * already some characters they will not be attributed.
    */
   public AttributedFormatBuffer(CPStringBuilder buffer)
   {
@@ -72,8 +72,8 @@ public class AttributedFormatBuffer implements FormatBuffer
     this.defaultAttr = null;
     if (buffer.length() != 0)
       {
-	this.startingRange = buffer.length();
-	addAttribute(buffer.length(), null);
+        this.startingRange = buffer.length();
+        addAttribute(buffer.length(), null);
       }
     else
       this.startingRange = -1;
@@ -96,16 +96,16 @@ public class AttributedFormatBuffer implements FormatBuffer
    *
    * @param new_range A new range to insert in the list.
    * @param attr A new attribute to insert in the list.
-   */  
+   */
   private final void addAttribute(int new_range, AttributedCharacterIterator.Attribute attr)
   {
     HashMap map;
 
     if (attr != null)
       {
-	map = new HashMap();
-	map.put(attr, attr);
-	attributes.add(map);
+        map = new HashMap();
+        map.put(attr, attr);
+        attributes.add(map);
       }
     else
       attributes.add(null);
@@ -119,7 +119,7 @@ public class AttributedFormatBuffer implements FormatBuffer
       startingRange = 0;
     buffer.append(s);
   }
-  
+
   public void append(String s, AttributedCharacterIterator.Attribute attr)
   {
     setDefaultAttribute(attr);
@@ -135,11 +135,11 @@ public class AttributedFormatBuffer implements FormatBuffer
     setDefaultAttribute(null);
     if (ranges != null)
       {
-	for (int i = 0; i < ranges.length; i++)
-	  {	    
-	    this.ranges.add(new Integer(ranges[i] + curPos));
-	    this.attributes.add(attrs[i]);
-	  }
+        for (int i = 0; i < ranges.length; i++)
+          {
+            this.ranges.add(new Integer(ranges[i] + curPos));
+            this.attributes.add(attrs[i]);
+          }
       }
     startingRange = buffer.length();
     buffer.append(s);
@@ -168,7 +168,7 @@ public class AttributedFormatBuffer implements FormatBuffer
 
     if (startingRange != currentPos && startingRange >= 0)
       {
-	addAttribute(currentPos, defaultAttr);
+        addAttribute(currentPos, defaultAttr);
       }
     defaultAttr = attr;
     startingRange = currentPos;
@@ -212,7 +212,7 @@ public class AttributedFormatBuffer implements FormatBuffer
     a_ranges = new int[ranges.size()];
     for (int i = 0; i < a_ranges.length; i++)
       a_ranges[i] = ((Integer)(ranges.get (i))).intValue();
-    
+
     a_attributes = new HashMap[attributes.size()];
     System.arraycopy(attributes.toArray(), 0, a_attributes, 0, a_attributes.length);
   }
@@ -239,7 +239,7 @@ public class AttributedFormatBuffer implements FormatBuffer
   }
 
   /**
-   * This method returns the array containing the map on the 
+   * This method returns the array containing the map on the
    * attributes.
    *
    * @return An array of {@link java.util.Map} containing the attributes.
diff --git a/libjava/classpath/gnu/java/text/BaseBreakIterator.java b/libjava/classpath/gnu/java/text/BaseBreakIterator.java
index 4afd8ae6611..b69f698a1c1 100644
--- a/libjava/classpath/gnu/java/text/BaseBreakIterator.java
+++ b/libjava/classpath/gnu/java/text/BaseBreakIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -70,7 +70,7 @@ public abstract class BaseBreakIterator extends BreakIterator
 
   /**
    * Return the first boundary after pos.
-   * This has the side effect of setting the index of the 
+   * This has the side effect of setting the index of the
    * CharacterIterator.
    */
   public int following (int pos)
@@ -98,19 +98,19 @@ public abstract class BaseBreakIterator extends BreakIterator
     int r = iter.getIndex ();
     if (n > 0)
       {
-	while (n > 0 && r != DONE)
-	  {
-	    r = next ();
-	    --n;
-	  }
+        while (n > 0 && r != DONE)
+          {
+            r = next ();
+            --n;
+          }
       }
     else if (n < 0)
       {
-	while (n < 0 && r != DONE)
-	  {
-	    r = previous ();
-	    ++n;
-	  }
+        while (n < 0 && r != DONE)
+          {
+            r = previous ();
+            ++n;
+          }
       }
     return r;
   }
diff --git a/libjava/classpath/gnu/java/text/CharacterBreakIterator.java b/libjava/classpath/gnu/java/text/CharacterBreakIterator.java
index 5274543a9e5..565eb9b9d05 100644
--- a/libjava/classpath/gnu/java/text/CharacterBreakIterator.java
+++ b/libjava/classpath/gnu/java/text/CharacterBreakIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -111,44 +111,44 @@ public class CharacterBreakIterator extends BaseBreakIterator
     char c;
     for (char prev = CharacterIterator.DONE; iter.getIndex() < end; prev = c)
       {
-	c = iter.next();
-	if (c == CharacterIterator.DONE)
-	  break;
-	int type = Character.getType(c);
+        c = iter.next();
+        if (c == CharacterIterator.DONE)
+          break;
+        int type = Character.getType(c);
 
-	// Break after paragraph separators.
-	if (type == Character.PARAGRAPH_SEPARATOR)
-	  break;
+        // Break after paragraph separators.
+        if (type == Character.PARAGRAPH_SEPARATOR)
+          break;
 
-	// Now we need some lookahead.
-	char ahead = iter.next();
-	iter.previous();
-	if (ahead == CharacterIterator.DONE)
-	  break;
-	int aheadType = Character.getType(ahead);
+        // Now we need some lookahead.
+        char ahead = iter.next();
+        iter.previous();
+        if (ahead == CharacterIterator.DONE)
+          break;
+        int aheadType = Character.getType(ahead);
 
-	if (aheadType != Character.NON_SPACING_MARK
-	    && ! isLowSurrogate (ahead)
-	    && ! isLVT (ahead))
-	  break;
-	if (! isLVT (c) && isLVT (ahead))
-	  break;
-	if (isL (c) && ! isLVT (ahead)
-	    && aheadType != Character.NON_SPACING_MARK)
-	  break;
-	if (isV (c) && ! isV (ahead) && !isT (ahead)
-	    && aheadType != Character.NON_SPACING_MARK)
-	  break;
-	if (isT (c) && ! isT (ahead)
-	    && aheadType != Character.NON_SPACING_MARK)
-	  break;
+        if (aheadType != Character.NON_SPACING_MARK
+            && ! isLowSurrogate (ahead)
+            && ! isLVT (ahead))
+          break;
+        if (! isLVT (c) && isLVT (ahead))
+          break;
+        if (isL (c) && ! isLVT (ahead)
+            && aheadType != Character.NON_SPACING_MARK)
+          break;
+        if (isV (c) && ! isV (ahead) && !isT (ahead)
+            && aheadType != Character.NON_SPACING_MARK)
+          break;
+        if (isT (c) && ! isT (ahead)
+            && aheadType != Character.NON_SPACING_MARK)
+          break;
 
-	if (! isHighSurrogate (c) && isLowSurrogate (ahead))
-	  break;
-	if (isHighSurrogate (c) && ! isLowSurrogate (ahead))
-	  break;
-	if (! isHighSurrogate (prev) && isLowSurrogate (c))
-	  break;
+        if (! isHighSurrogate (c) && isLowSurrogate (ahead))
+          break;
+        if (isHighSurrogate (c) && ! isLowSurrogate (ahead))
+          break;
+        if (! isHighSurrogate (prev) && isLowSurrogate (c))
+          break;
       }
 
     return iter.getIndex();
@@ -161,51 +161,51 @@ public class CharacterBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() >= iter.getBeginIndex())
       {
-	char c = iter.previous();
-	if (c == CharacterIterator.DONE)
-	  break;
-	int type = Character.getType(c);
+        char c = iter.previous();
+        if (c == CharacterIterator.DONE)
+          break;
+        int type = Character.getType(c);
 
-	if (type != Character.NON_SPACING_MARK
-	    && ! isLowSurrogate (c)
-	    && ! isLVT (c))
-	  break;
+        if (type != Character.NON_SPACING_MARK
+            && ! isLowSurrogate (c)
+            && ! isLVT (c))
+          break;
 
-	// Now we need some lookahead.
-	char ahead = iter.previous();
-	if (ahead == CharacterIterator.DONE)
-	  {
-	    iter.next();
-	    break;
-	  }
-	char ahead2 = iter.previous();
-	iter.next();
-	iter.next();
-	if (ahead2 == CharacterIterator.DONE)
-	  break;
-	int aheadType = Character.getType(ahead);
+        // Now we need some lookahead.
+        char ahead = iter.previous();
+        if (ahead == CharacterIterator.DONE)
+          {
+            iter.next();
+            break;
+          }
+        char ahead2 = iter.previous();
+        iter.next();
+        iter.next();
+        if (ahead2 == CharacterIterator.DONE)
+          break;
+        int aheadType = Character.getType(ahead);
 
-	if (aheadType == Character.PARAGRAPH_SEPARATOR)
-	  break;
+        if (aheadType == Character.PARAGRAPH_SEPARATOR)
+          break;
 
-	if (isLVT (c) && ! isLVT (ahead))
-	  break;
-	if (! isLVT (c) && type != Character.NON_SPACING_MARK
-	    && isL (ahead))
-	  break;
-	if (! isV (c) && ! isT (c) && type != Character.NON_SPACING_MARK
-	    && isV (ahead))
-	  break;
-	if (! isT (c) && type != Character.NON_SPACING_MARK
-	    && isT (ahead))
-	  break;
+        if (isLVT (c) && ! isLVT (ahead))
+          break;
+        if (! isLVT (c) && type != Character.NON_SPACING_MARK
+            && isL (ahead))
+          break;
+        if (! isV (c) && ! isT (c) && type != Character.NON_SPACING_MARK
+            && isV (ahead))
+          break;
+        if (! isT (c) && type != Character.NON_SPACING_MARK
+            && isT (ahead))
+          break;
 
-	if (isLowSurrogate (c) && ! isHighSurrogate (ahead))
-	  break;
-	if (! isLowSurrogate (c) && isHighSurrogate (ahead))
-	  break;
-	if (isLowSurrogate (ahead) && ! isHighSurrogate (ahead2))
-	  break;
+        if (isLowSurrogate (c) && ! isHighSurrogate (ahead))
+          break;
+        if (! isLowSurrogate (c) && isHighSurrogate (ahead))
+          break;
+        if (isLowSurrogate (ahead) && ! isHighSurrogate (ahead2))
+          break;
       }
 
     return iter.getIndex();
diff --git a/libjava/classpath/gnu/java/text/FormatBuffer.java b/libjava/classpath/gnu/java/text/FormatBuffer.java
index e6b68208792..590b16cce23 100644
--- a/libjava/classpath/gnu/java/text/FormatBuffer.java
+++ b/libjava/classpath/gnu/java/text/FormatBuffer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -42,14 +42,14 @@ import java.util.HashMap;
 /**
  * This interface describes a modifiable buffer which contains attributed
  * characters. The implementation may or may not implements attributes. It
- * aims to greatly simplify and clarify the implementation of java.text 
+ * aims to greatly simplify and clarify the implementation of java.text
  * formatters. The buffer may be appended or have its tail cut. It may also
  * be completely cleant up.
  *
  * @author Guilhem Lavaux 
  * @date April 10, 2004
  */
-public interface FormatBuffer 
+public interface FormatBuffer
 {
   /**
    * This method appends a simple string to the buffer. This part of
@@ -72,8 +72,8 @@ public interface FormatBuffer
   /**
    * This method appends a simple string to the buffer. This part of
    * the buffer will be attributed using the specified ranges and attributes.
-   * To have an example on how to specify ranges see {@link gnu.java.text.FormatCharacterIterator}. 
-   * 
+   * To have an example on how to specify ranges see {@link gnu.java.text.FormatCharacterIterator}.
+   *
    * @param s The string to append to the buffer.
    * @param ranges The ranges describing how the attributes should be applied
    * to the string.
@@ -121,7 +121,7 @@ public interface FormatBuffer
    * @param length Number of characters to cut at the end of the buffer.
    */
   public void cutTail(int length);
-  
+
   /**
    * This method resets completely the buffer.
    */
diff --git a/libjava/classpath/gnu/java/text/FormatCharacterIterator.java b/libjava/classpath/gnu/java/text/FormatCharacterIterator.java
index 60773aa1eb7..889394ca451 100644
--- a/libjava/classpath/gnu/java/text/FormatCharacterIterator.java
+++ b/libjava/classpath/gnu/java/text/FormatCharacterIterator.java
@@ -1,4 +1,4 @@
-/* FormatCharacter.java -- Implementation of AttributedCharacterIterator for 
+/* FormatCharacter.java -- Implementation of AttributedCharacterIterator for
    formatters.
    Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -78,7 +78,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
   }
 
   /**
-   * This constructor take a string s, a set of ranges 
+   * This constructor take a string s, a set of ranges
    * and the corresponding attributes. This is used to build an iterator.
    * The array ranges should be formatted as follow:
    * each element of ranges specifies the index in the string
@@ -98,10 +98,10 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
     this.ranges = ranges;
     this.attributes = attributes;
   }
-  
-  /* 
+
+  /*
    * The following methods are inherited from AttributedCharacterIterator,
-   * and thus are already documented. 
+   * and thus are already documented.
    */
 
   public Set getAllAttributeKeys()
@@ -111,7 +111,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
     else
       return new HashSet();
   }
-  
+
   public Map getAttributes()
   {
     if (attributes != null && attributes[attributeIndex] != null)
@@ -119,7 +119,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
     else
       return new HashMap();
   }
-  
+
   public Object getAttribute (AttributedCharacterIterator.Attribute attrib)
   {
     if (attributes != null && attributes[attributeIndex] != null)
@@ -127,7 +127,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
     else
       return null;
   }
-  
+
   public int getRunLimit(Set reqAttrs)
   {
     if (attributes == null)
@@ -138,19 +138,19 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
 
     do
       {
-	currentAttrIndex++;
-	if (currentAttrIndex == attributes.length)
-	  return formattedString.length();
-	if (attributes[currentAttrIndex] == null)
-	  break;
-	newKeys = attributes[currentAttrIndex].keySet();
+        currentAttrIndex++;
+        if (currentAttrIndex == attributes.length)
+          return formattedString.length();
+        if (attributes[currentAttrIndex] == null)
+          break;
+        newKeys = attributes[currentAttrIndex].keySet();
       }
     while (newKeys.containsAll (reqAttrs));
 
     return ranges[currentAttrIndex-1];
   }
-  
-  public int getRunLimit (AttributedCharacterIterator.Attribute attribute) 
+
+  public int getRunLimit (AttributedCharacterIterator.Attribute attribute)
   {
     Set s = new HashSet();
 
@@ -164,38 +164,38 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
       return formattedString.length();
     if (attributes[attributeIndex] == null)
       {
-	for (int i=attributeIndex+1;i 0) ? ranges[currentAttrIndex-1] : 0;
-  } 
-    
+  }
+
   public int getRunStart()
   {
     if (attributes == null)
@@ -203,19 +203,19 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
 
     if (attributes[attributeIndex] == null)
       {
-	for (int i=attributeIndex;i>0;i--)
-	  if (attributes[i] != null)
-	    return ranges[attributeIndex-1];
-	return 0;
+        for (int i=attributeIndex;i>0;i--)
+          if (attributes[i] != null)
+            return ranges[attributeIndex-1];
+        return 0;
       }
 
     return getRunStart (attributes[attributeIndex].keySet());
   }
-  
-  public int getRunStart (AttributedCharacterIterator.Attribute attribute) 
+
+  public int getRunStart (AttributedCharacterIterator.Attribute attribute)
   {
     Set s = new HashSet();
-    
+
     s.add (attribute);
     return getRunStart (s);
   }
@@ -224,7 +224,7 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
   {
     return new FormatCharacterIterator (formattedString, ranges, attributes);
   }
-  
+
   /*
    * The following methods are inherited from CharacterIterator and thus
    * are already documented.
@@ -234,29 +234,29 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
   {
     return formattedString.charAt (charIndex);
   }
-  
+
   public char first()
   {
     charIndex = 0;
     attributeIndex = 0;
     return formattedString.charAt (0);
   }
-  
+
   public int getBeginIndex()
   {
     return 0;
   }
-  
+
   public int getEndIndex()
   {
     return formattedString.length();
   }
-  
+
   public int getIndex()
   {
     return charIndex;
   }
-  
+
   public char last()
   {
     charIndex = formattedString.length()-1;
@@ -264,53 +264,53 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
       attributeIndex = attributes.length-1;
     return formattedString.charAt (charIndex);
   }
-  
+
   public char next()
   {
     charIndex++;
     if (charIndex >= formattedString.length())
       {
-	charIndex = getEndIndex();
-	return DONE;
+        charIndex = getEndIndex();
+        return DONE;
       }
     if (attributes != null)
       {
-	if (charIndex >= ranges[attributeIndex])
-	  attributeIndex++;
+        if (charIndex >= ranges[attributeIndex])
+          attributeIndex++;
       }
     return formattedString.charAt (charIndex);
   }
-  
+
   public char previous()
   {
     charIndex--;
     if (charIndex < 0)
       {
-	charIndex = 0;
-	return DONE;
+        charIndex = 0;
+        return DONE;
       }
-    
+
     if (attributes != null)
       {
-	if (charIndex < ranges[attributeIndex])
-	  attributeIndex--;
+        if (charIndex < ranges[attributeIndex])
+          attributeIndex--;
       }
     return formattedString.charAt (charIndex);
   }
-  
+
   public char setIndex (int position)
   {
     if (position < 0 || position > formattedString.length())
       throw new IllegalArgumentException ("position is out of range");
-    
+
     charIndex = position;
     if (attributes != null)
       {
-	for (attributeIndex=0;attributeIndex charIndex)
-	    break;
-	attributeIndex--;
+        for (attributeIndex=0;attributeIndex charIndex)
+            break;
+        attributeIndex--;
       }
     if (charIndex == formattedString.length())
       return DONE;
@@ -334,64 +334,64 @@ public class FormatCharacterIterator implements AttributedCharacterIterator
     int i = 0, j = 0;
 
     debug("merging " + attributes.length + " attrs");
-    
+
     while (i < this.ranges.length && j < ranges.length)
       {
-	if (this.attributes[i] != null)
-	  {
-	    new_attributes.add (this.attributes[i]);
-	    if (attributes[j] != null)
-	      this.attributes[i].putAll (attributes[j]);
-	  }
-	else
-	  {
-	    new_attributes.add (attributes[j]);
-	  }
-	if (this.ranges[i] == ranges[j])
-	  {
-	    new_ranges.add (new Integer (ranges[j]));
-	    i++;
-	    j++;
-	  }
-	else if (this.ranges[i] < ranges[j])
-	  {
-	    new_ranges.add (new Integer (this.ranges[i]));
-	    i++;
-	  }
-	else
-	  {
-	    new_ranges.add (new Integer (ranges[j]));
-	    j++;
-	  }
+        if (this.attributes[i] != null)
+          {
+            new_attributes.add (this.attributes[i]);
+            if (attributes[j] != null)
+              this.attributes[i].putAll (attributes[j]);
+          }
+        else
+          {
+            new_attributes.add (attributes[j]);
+          }
+        if (this.ranges[i] == ranges[j])
+          {
+            new_ranges.add (new Integer (ranges[j]));
+            i++;
+            j++;
+          }
+        else if (this.ranges[i] < ranges[j])
+          {
+            new_ranges.add (new Integer (this.ranges[i]));
+            i++;
+          }
+        else
+          {
+            new_ranges.add (new Integer (ranges[j]));
+            j++;
+          }
      }
-    
+
     if (i != this.ranges.length)
       {
-	for (;i " + ranges[i] + ":");
-	if (attributes[i] == null)
-	  System.out.println("null");
-	else
-	  {
-	    Set keyset = attributes[i].keySet();
-	    if (keyset != null)
-	      {
-		Iterator keys = keyset.iterator();
-		
-		while (keys.hasNext())
-		  System.out.print(" " + keys.next());
-	      }
-	    else
-	      System.out.println("keySet null");
-	    System.out.println();
-	  }
+        System.out.print("\t" + start_range + " => " + ranges[i] + ":");
+        if (attributes[i] == null)
+          System.out.println("null");
+        else
+          {
+            Set keyset = attributes[i].keySet();
+            if (keyset != null)
+              {
+                Iterator keys = keyset.iterator();
+
+                while (keys.hasNext())
+                  System.out.print(" " + keys.next());
+              }
+            else
+              System.out.println("keySet null");
+            System.out.println();
+          }
       }
     System.out.println();
     System.out.flush();
diff --git a/libjava/classpath/gnu/java/text/LineBreakIterator.java b/libjava/classpath/gnu/java/text/LineBreakIterator.java
index ad07479fb78..7e44121b05e 100644
--- a/libjava/classpath/gnu/java/text/LineBreakIterator.java
+++ b/libjava/classpath/gnu/java/text/LineBreakIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -65,23 +65,23 @@ public class LineBreakIterator extends BaseBreakIterator
   // Some methods to tell us different properties of characters.
   private final boolean isNb (char c)
   {
-    return (c == 0x00a0		// NO-BREAK SPACE
-	    || c == 0x2011	// NON-BREAKING HYPHEN
-	    || c == 0xfeff);	// ZERO WITH NO-BREAK SPACE
+    return (c == 0x00a0         // NO-BREAK SPACE
+            || c == 0x2011      // NON-BREAKING HYPHEN
+            || c == 0xfeff);    // ZERO WITH NO-BREAK SPACE
   }
   private final boolean isClose (int type)
   {
     return (type == Character.END_PUNCTUATION
-	    // Unicode book says "comma, period, ...", which I take to
-	    // mean "Po" class.
-	    || type == Character.OTHER_PUNCTUATION);
+            // Unicode book says "comma, period, ...", which I take to
+            // mean "Po" class.
+            || type == Character.OTHER_PUNCTUATION);
   }
   private final boolean isIdeo (char c)
   {
-    return (c >= 0x3040 && c <= 0x309f	       // Hiragana
-	    || c >= 0x30a0 && c <= 0x30ff      // Katakana
-	    || c >= 0x4e00 && c <= 0x9fff      // Han
-	    || c >= 0x3100 && c <= 0x312f);    // Bopomofo
+    return (c >= 0x3040 && c <= 0x309f         // Hiragana
+            || c >= 0x30a0 && c <= 0x30ff      // Katakana
+            || c >= 0x4e00 && c <= 0x9fff      // Han
+            || c >= 0x3100 && c <= 0x312f);    // Bopomofo
   }
 
   public int next ()
@@ -92,54 +92,54 @@ public class LineBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() < end)
       {
-	char c = iter.current();
-	int type = Character.getType(c);
+        char c = iter.current();
+        int type = Character.getType(c);
 
-	char n = iter.next();
+        char n = iter.next();
 
-	if (n == CharacterIterator.DONE
-	    || type == Character.PARAGRAPH_SEPARATOR
-	    || type == Character.LINE_SEPARATOR)
-	  break;
+        if (n == CharacterIterator.DONE
+            || type == Character.PARAGRAPH_SEPARATOR
+            || type == Character.LINE_SEPARATOR)
+          break;
 
-	// Handle two cases where we must scan for non-spacing marks.
-	int start = iter.getIndex();
-	if (type == Character.SPACE_SEPARATOR
-	    || type == Character.START_PUNCTUATION
-	    || isIdeo (c))
-	  {
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.NON_SPACING_MARK)
-	      n = iter.next();
-	    if (n == CharacterIterator.DONE)
-	      break;
+        // Handle two cases where we must scan for non-spacing marks.
+        int start = iter.getIndex();
+        if (type == Character.SPACE_SEPARATOR
+            || type == Character.START_PUNCTUATION
+            || isIdeo (c))
+          {
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.NON_SPACING_MARK)
+              n = iter.next();
+            if (n == CharacterIterator.DONE)
+              break;
 
-	    if (type == Character.SPACE_SEPARATOR)
-	      {
-		int nt = Character.getType(n);
-		if (nt != Character.NON_SPACING_MARK
-		    && nt != Character.SPACE_SEPARATOR
-		    && ! isNb (n))
-		  break;
-	      }
-	    else if (type == Character.START_PUNCTUATION)
-	      {
-		if (isIdeo (n))
-		  {
-		    // Open punctuation followed by non spacing marks
-		    // and then ideograph does not have a break in
-		    // it.  So skip all this.
-		    start = iter.getIndex();
-		  }
-	      }
-	    else
-	      {
-		// Ideograph preceded this character.
-		if (isClose (Character.getType(n)))
-		  break;
-	      }
-	  }
-	iter.setIndex(start);
+            if (type == Character.SPACE_SEPARATOR)
+              {
+                int nt = Character.getType(n);
+                if (nt != Character.NON_SPACING_MARK
+                    && nt != Character.SPACE_SEPARATOR
+                    && ! isNb (n))
+                  break;
+              }
+            else if (type == Character.START_PUNCTUATION)
+              {
+                if (isIdeo (n))
+                  {
+                    // Open punctuation followed by non spacing marks
+                    // and then ideograph does not have a break in
+                    // it.  So skip all this.
+                    start = iter.getIndex();
+                  }
+              }
+            else
+              {
+                // Ideograph preceded this character.
+                if (isClose (Character.getType(n)))
+                  break;
+              }
+          }
+        iter.setIndex(start);
       }
 
     return iter.getIndex();
@@ -153,40 +153,40 @@ public class LineBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() >= start)
       {
-	char c = iter.previous();
-	if (c == CharacterIterator.DONE)
-	  break;
-	int type = Character.getType(c);
+        char c = iter.previous();
+        if (c == CharacterIterator.DONE)
+          break;
+        int type = Character.getType(c);
 
-	char n = iter.previous();
-	if (n == CharacterIterator.DONE)
-	  break;
-	iter.next();
+        char n = iter.previous();
+        if (n == CharacterIterator.DONE)
+          break;
+        iter.next();
 
-	int nt = Character.getType(n);
-	// Break after paragraph separators.
-	if (nt == Character.PARAGRAPH_SEPARATOR
-	    || nt == Character.LINE_SEPARATOR)
-	  break;
+        int nt = Character.getType(n);
+        // Break after paragraph separators.
+        if (nt == Character.PARAGRAPH_SEPARATOR
+            || nt == Character.LINE_SEPARATOR)
+          break;
 
-	// Skip non-spacing marks.
-	int init = iter.getIndex();
-	while (n != CharacterIterator.DONE && nt == Character.NON_SPACING_MARK)
-	  {
-	    n = iter.previous();
-	    nt = Character.getType(n);
-	  }
+        // Skip non-spacing marks.
+        int init = iter.getIndex();
+        while (n != CharacterIterator.DONE && nt == Character.NON_SPACING_MARK)
+          {
+            n = iter.previous();
+            nt = Character.getType(n);
+          }
 
-	if (nt == Character.SPACE_SEPARATOR
-	    && type != Character.SPACE_SEPARATOR
-	    && type != Character.NON_SPACING_MARK
-	    && ! isNb (c))
-	  break;
-	if (! isClose (type) && isIdeo (n))
-	  break;
-	if (isIdeo (c) && nt != Character.START_PUNCTUATION)
-	  break;
-	iter.setIndex(init);
+        if (nt == Character.SPACE_SEPARATOR
+            && type != Character.SPACE_SEPARATOR
+            && type != Character.NON_SPACING_MARK
+            && ! isNb (c))
+          break;
+        if (! isClose (type) && isIdeo (n))
+          break;
+        if (isIdeo (c) && nt != Character.START_PUNCTUATION)
+          break;
+        iter.setIndex(init);
       }
 
     return iter.getIndex();
diff --git a/libjava/classpath/gnu/java/text/SentenceBreakIterator.java b/libjava/classpath/gnu/java/text/SentenceBreakIterator.java
index f91d269bb08..4da9df2ea94 100644
--- a/libjava/classpath/gnu/java/text/SentenceBreakIterator.java
+++ b/libjava/classpath/gnu/java/text/SentenceBreakIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -70,66 +70,66 @@ public class SentenceBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() < end)
       {
-	char c = iter.current();
-	if (c == CharacterIterator.DONE)
-	  break;
-	int type = Character.getType(c);
+        char c = iter.current();
+        if (c == CharacterIterator.DONE)
+          break;
+        int type = Character.getType(c);
 
-	char n = iter.next();
-	if (n == CharacterIterator.DONE)
-	  break;
+        char n = iter.next();
+        if (n == CharacterIterator.DONE)
+          break;
 
-	// Always break after paragraph separator.
-	if (type == Character.PARAGRAPH_SEPARATOR)
-	  break;
+        // Always break after paragraph separator.
+        if (type == Character.PARAGRAPH_SEPARATOR)
+          break;
 
-	if (c == '!' || c == '?')
-	  {
-	    // Skip close punctuation.
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.END_PUNCTUATION)
-	      n = iter.next();
-	    // Skip (java) space, line and paragraph separators.
-	    while (n != CharacterIterator.DONE && Character.isWhitespace(n))
-	      n = iter.next();
+        if (c == '!' || c == '?')
+          {
+            // Skip close punctuation.
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.END_PUNCTUATION)
+              n = iter.next();
+            // Skip (java) space, line and paragraph separators.
+            while (n != CharacterIterator.DONE && Character.isWhitespace(n))
+              n = iter.next();
 
-	    // There's always a break somewhere after `!' or `?'.
-	    break;
-	  }
+            // There's always a break somewhere after `!' or `?'.
+            break;
+          }
 
-	if (c == '.')
-	  {
-	    int save = iter.getIndex();
-	    // Skip close punctuation.
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.END_PUNCTUATION)
-	      n = iter.next();
-	    // Skip (java) space, line and paragraph separators.
-	    // We keep count because we need at least one for this period to
-	    // represent a terminator.
-	    int spcount = 0;
-	    while (n != CharacterIterator.DONE && Character.isWhitespace(n))
-	      {
-		n = iter.next();
-		++spcount;
-	      }
-	    if (spcount > 0)
-	      {
-		int save2 = iter.getIndex();
-		// Skip over open puncutation.
-		while (n != CharacterIterator.DONE
-		       && Character.getType(n) == Character.START_PUNCTUATION)
-		  n = iter.next();
-		// Next character must not be lower case.
-		if (n == CharacterIterator.DONE
-		    || ! Character.isLowerCase(n))
-		  {
-		    iter.setIndex(save2);
-		    break;
-		  }
-	      }
-	    iter.setIndex(save);
-	  }
+        if (c == '.')
+          {
+            int save = iter.getIndex();
+            // Skip close punctuation.
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.END_PUNCTUATION)
+              n = iter.next();
+            // Skip (java) space, line and paragraph separators.
+            // We keep count because we need at least one for this period to
+            // represent a terminator.
+            int spcount = 0;
+            while (n != CharacterIterator.DONE && Character.isWhitespace(n))
+              {
+                n = iter.next();
+                ++spcount;
+              }
+            if (spcount > 0)
+              {
+                int save2 = iter.getIndex();
+                // Skip over open puncutation.
+                while (n != CharacterIterator.DONE
+                       && Character.getType(n) == Character.START_PUNCTUATION)
+                  n = iter.next();
+                // Next character must not be lower case.
+                if (n == CharacterIterator.DONE
+                    || ! Character.isLowerCase(n))
+                  {
+                    iter.setIndex(save2);
+                    break;
+                  }
+              }
+            iter.setIndex(save);
+          }
       }
 
     return iter.getIndex();
@@ -143,86 +143,86 @@ public class SentenceBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() >= start)
       {
-	char c = iter.previous();
-	if (c == CharacterIterator.DONE)
-	  break;
+        char c = iter.previous();
+        if (c == CharacterIterator.DONE)
+          break;
 
-	char n = iter.previous();
-	if (n == CharacterIterator.DONE)
-	  break;
-	iter.next();
-	int nt = Character.getType(n);
+        char n = iter.previous();
+        if (n == CharacterIterator.DONE)
+          break;
+        iter.next();
+        int nt = Character.getType(n);
 
-	if (! Character.isLowerCase(c)
-	    && (nt == Character.START_PUNCTUATION
-		|| Character.isWhitespace(n)))
-	  {
-	    int save = iter.getIndex();
-	    int save_nt = nt;
-	    char save_n = n;
-	    // Skip open punctuation.
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.START_PUNCTUATION)
-	      n = iter.previous();
-	    if (n == CharacterIterator.DONE)
-	      break;
-	    if (Character.isWhitespace(n))
-	      {
-		// Must have at least one (java) space after the `.'.
-		int save2 = iter.getIndex();
-		while (n != CharacterIterator.DONE
-		       && Character.isWhitespace(n))
-		  n = iter.previous();
-		// Skip close punctuation.
-		while (n != CharacterIterator.DONE
-		       && Character.getType(n) == Character.END_PUNCTUATION)
-		  n = iter.previous();
-		if (n == CharacterIterator.DONE || n == '.')
-		  {
-		    // Communicate location of actual end.
-		    period = iter.getIndex();
-		    iter.setIndex(save2);
-		    break;
-		  }
-	      }
-	    iter.setIndex(save);
-	    nt = save_nt;
-	    n = save_n;
-	  }
+        if (! Character.isLowerCase(c)
+            && (nt == Character.START_PUNCTUATION
+                || Character.isWhitespace(n)))
+          {
+            int save = iter.getIndex();
+            int save_nt = nt;
+            char save_n = n;
+            // Skip open punctuation.
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.START_PUNCTUATION)
+              n = iter.previous();
+            if (n == CharacterIterator.DONE)
+              break;
+            if (Character.isWhitespace(n))
+              {
+                // Must have at least one (java) space after the `.'.
+                int save2 = iter.getIndex();
+                while (n != CharacterIterator.DONE
+                       && Character.isWhitespace(n))
+                  n = iter.previous();
+                // Skip close punctuation.
+                while (n != CharacterIterator.DONE
+                       && Character.getType(n) == Character.END_PUNCTUATION)
+                  n = iter.previous();
+                if (n == CharacterIterator.DONE || n == '.')
+                  {
+                    // Communicate location of actual end.
+                    period = iter.getIndex();
+                    iter.setIndex(save2);
+                    break;
+                  }
+              }
+            iter.setIndex(save);
+            nt = save_nt;
+            n = save_n;
+          }
 
-	if (nt == Character.PARAGRAPH_SEPARATOR)
-	  {
-	    // Communicate location of actual end.
-	    period = iter.getIndex();
-	    break;
-	  }
-	else if (Character.isWhitespace(n)
-		 || nt == Character.END_PUNCTUATION)
-	  {
-	    int save = iter.getIndex();
-	    // Skip (java) space, line and paragraph separators.
-	    while (n != CharacterIterator.DONE
-		   && Character.isWhitespace(n))
-	      n = iter.previous();
-	    // Skip close punctuation.
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.END_PUNCTUATION)
-	      n = iter.previous();
-	    int here = iter.getIndex();
-	    iter.setIndex(save);
-	    if (n == CharacterIterator.DONE || n == '!' || n == '?')
-	      {
-		// Communicate location of actual end.
-		period = here;
-		break;
-	      }
-	  }
-	else if (n == '!' || n == '?')
-	  {
-	    // Communicate location of actual end.
-	    period = iter.getIndex();
-	    break;
-	  }
+        if (nt == Character.PARAGRAPH_SEPARATOR)
+          {
+            // Communicate location of actual end.
+            period = iter.getIndex();
+            break;
+          }
+        else if (Character.isWhitespace(n)
+                 || nt == Character.END_PUNCTUATION)
+          {
+            int save = iter.getIndex();
+            // Skip (java) space, line and paragraph separators.
+            while (n != CharacterIterator.DONE
+                   && Character.isWhitespace(n))
+              n = iter.previous();
+            // Skip close punctuation.
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.END_PUNCTUATION)
+              n = iter.previous();
+            int here = iter.getIndex();
+            iter.setIndex(save);
+            if (n == CharacterIterator.DONE || n == '!' || n == '?')
+              {
+                // Communicate location of actual end.
+                period = here;
+                break;
+              }
+          }
+        else if (n == '!' || n == '?')
+          {
+            // Communicate location of actual end.
+            period = iter.getIndex();
+            break;
+          }
       }
 
     return iter.getIndex();
diff --git a/libjava/classpath/gnu/java/text/StringFormatBuffer.java b/libjava/classpath/gnu/java/text/StringFormatBuffer.java
index fc8d08ee6f8..2367fccb39e 100644
--- a/libjava/classpath/gnu/java/text/StringFormatBuffer.java
+++ b/libjava/classpath/gnu/java/text/StringFormatBuffer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,7 +41,7 @@ import java.util.HashMap;
 
 /**
  * This class is an implementation of a FormatBuffer without attributes.
- * 
+ *
  * @author Guilhem Lavaux 
  * @date April 10, 2004
  */
@@ -64,7 +64,7 @@ public class StringFormatBuffer implements FormatBuffer
   {
     buffer.append(s);
   }
-  
+
   public void append(String s, AttributedCharacterIterator.Attribute attr)
   {
     buffer.append(s);
@@ -111,7 +111,7 @@ public class StringFormatBuffer implements FormatBuffer
   }
 
   /**
-   * This method returns the internal {@link java.lang.StringBuffer} which 
+   * This method returns the internal {@link java.lang.StringBuffer} which
    * contains the string of character.
    */
   public StringBuffer getBuffer()
diff --git a/libjava/classpath/gnu/java/text/WordBreakIterator.java b/libjava/classpath/gnu/java/text/WordBreakIterator.java
index f140369f8c6..fded4bf2655 100644
--- a/libjava/classpath/gnu/java/text/WordBreakIterator.java
+++ b/libjava/classpath/gnu/java/text/WordBreakIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -84,78 +84,78 @@ public class WordBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() < end)
       {
-	char c = iter.current();
-	if (c == CharacterIterator.DONE)
-	  break;
-	int type = Character.getType(c);
+        char c = iter.current();
+        if (c == CharacterIterator.DONE)
+          break;
+        int type = Character.getType(c);
 
-	char n = iter.next();
-	if (n == CharacterIterator.DONE)
-	  break;
+        char n = iter.next();
+        if (n == CharacterIterator.DONE)
+          break;
 
-	// Break after paragraph separators.
-	if (type == Character.PARAGRAPH_SEPARATOR
-	    || type == Character.LINE_SEPARATOR)
-	  break;
+        // Break after paragraph separators.
+        if (type == Character.PARAGRAPH_SEPARATOR
+            || type == Character.LINE_SEPARATOR)
+          break;
 
-	// Break between letters and non-letters.
-	// FIXME: we treat apostrophe as part of a word.  This
-	// is an English-ism.
-	boolean is_letter = Character.isLetter(c);
-	if (c != '\'' && ! is_letter && type != Character.NON_SPACING_MARK
-	    && Character.isLetter(n))
-	  break;
+        // Break between letters and non-letters.
+        // FIXME: we treat apostrophe as part of a word.  This
+        // is an English-ism.
+        boolean is_letter = Character.isLetter(c);
+        if (c != '\'' && ! is_letter && type != Character.NON_SPACING_MARK
+            && Character.isLetter(n))
+          break;
 
-	// Always break after certain symbols, such as punctuation.
-	// This heuristic is derived from hints in the JCL book and is
-	// not part of Unicode.  It seems to be right, however.
-	// FIXME: we treat apostrophe as part of a word.  This
-	// is an English-ism.
-	if (c != '\''
-	    && (type == Character.DASH_PUNCTUATION
-		|| type == Character.START_PUNCTUATION
-		|| type == Character.END_PUNCTUATION
-		|| type == Character.CONNECTOR_PUNCTUATION
-		|| type == Character.OTHER_PUNCTUATION
-		|| type == Character.MATH_SYMBOL
-		|| type == Character.CURRENCY_SYMBOL
-		|| type == Character.MODIFIER_SYMBOL
-		|| type == Character.OTHER_SYMBOL
-		|| type == Character.FORMAT
-		|| type == Character.CONTROL))
-	  break;
+        // Always break after certain symbols, such as punctuation.
+        // This heuristic is derived from hints in the JCL book and is
+        // not part of Unicode.  It seems to be right, however.
+        // FIXME: we treat apostrophe as part of a word.  This
+        // is an English-ism.
+        if (c != '\''
+            && (type == Character.DASH_PUNCTUATION
+                || type == Character.START_PUNCTUATION
+                || type == Character.END_PUNCTUATION
+                || type == Character.CONNECTOR_PUNCTUATION
+                || type == Character.OTHER_PUNCTUATION
+                || type == Character.MATH_SYMBOL
+                || type == Character.CURRENCY_SYMBOL
+                || type == Character.MODIFIER_SYMBOL
+                || type == Character.OTHER_SYMBOL
+                || type == Character.FORMAT
+                || type == Character.CONTROL))
+          break;
 
-	boolean is_hira = isHira (c);
-	boolean is_kata = isKata (c);
-	boolean is_han = isHan (c);
+        boolean is_hira = isHira (c);
+        boolean is_kata = isKata (c);
+        boolean is_han = isHan (c);
 
-	// Special case Japanese.
-	if (! is_hira && ! is_kata && ! is_han
-	    && type != Character.NON_SPACING_MARK
-	    && (isHira (n) || isKata (n) || isHan (n)))
-	  break;
+        // Special case Japanese.
+        if (! is_hira && ! is_kata && ! is_han
+            && type != Character.NON_SPACING_MARK
+            && (isHira (n) || isKata (n) || isHan (n)))
+          break;
 
-	if (is_hira || is_kata || is_han || is_letter)
-	  {
-	    // Now we need to do some lookahead.  We might need to do
-	    // quite a bit of lookahead, so we save our position and
-	    // restore it later.
-	    int save = iter.getIndex();
-	    // Skip string of non spacing marks.
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.NON_SPACING_MARK)
-	      n = iter.next();
-	    if (n == CharacterIterator.DONE)
-	      break;
-	    if ((is_hira && ! isHira (n))
-		|| (is_kata && ! isHira (n) && ! isKata (n))
-		|| (is_han && ! isHira (n) && ! isHan (n))
-		// FIXME: we treat apostrophe as part of a word.  This
-		// is an English-ism.
-		|| (is_letter && ! Character.isLetter(n) && n != '\''))
-	      break;
-	    iter.setIndex(save);
-	  }
+        if (is_hira || is_kata || is_han || is_letter)
+          {
+            // Now we need to do some lookahead.  We might need to do
+            // quite a bit of lookahead, so we save our position and
+            // restore it later.
+            int save = iter.getIndex();
+            // Skip string of non spacing marks.
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.NON_SPACING_MARK)
+              n = iter.next();
+            if (n == CharacterIterator.DONE)
+              break;
+            if ((is_hira && ! isHira (n))
+                || (is_kata && ! isHira (n) && ! isKata (n))
+                || (is_han && ! isHira (n) && ! isHan (n))
+                // FIXME: we treat apostrophe as part of a word.  This
+                // is an English-ism.
+                || (is_letter && ! Character.isLetter(n) && n != '\''))
+              break;
+            iter.setIndex(save);
+          }
       }
 
     return iter.getIndex();
@@ -169,80 +169,80 @@ public class WordBreakIterator extends BaseBreakIterator
 
     while (iter.getIndex() >= start)
       {
-	char c = iter.previous();
-	if (c == CharacterIterator.DONE)
-	  break;
+        char c = iter.previous();
+        if (c == CharacterIterator.DONE)
+          break;
 
-	boolean is_hira = isHira (c);
-	boolean is_kata = isKata (c);
-	boolean is_han = isHan (c);
-	boolean is_letter = Character.isLetter(c);
+        boolean is_hira = isHira (c);
+        boolean is_kata = isKata (c);
+        boolean is_han = isHan (c);
+        boolean is_letter = Character.isLetter(c);
 
-	char n = iter.previous();
-	if (n == CharacterIterator.DONE)
-	  break;
-	iter.next();
-	int type = Character.getType(n);
-	// Break after paragraph separators.
-	if (type == Character.PARAGRAPH_SEPARATOR
-	    || type == Character.LINE_SEPARATOR)
-	  break;
+        char n = iter.previous();
+        if (n == CharacterIterator.DONE)
+          break;
+        iter.next();
+        int type = Character.getType(n);
+        // Break after paragraph separators.
+        if (type == Character.PARAGRAPH_SEPARATOR
+            || type == Character.LINE_SEPARATOR)
+          break;
 
-	// Break between letters and non-letters.
-	// FIXME: we treat apostrophe as part of a word.  This
-	// is an English-ism.
-	if (n != '\'' && ! Character.isLetter(n)
-	    && type != Character.NON_SPACING_MARK
-	    && is_letter)
-	  break;
+        // Break between letters and non-letters.
+        // FIXME: we treat apostrophe as part of a word.  This
+        // is an English-ism.
+        if (n != '\'' && ! Character.isLetter(n)
+            && type != Character.NON_SPACING_MARK
+            && is_letter)
+          break;
 
-	// Always break after certain symbols, such as punctuation.
-	// This heuristic is derived from hints in the JCL book and is
-	// not part of Unicode.  It seems to be right, however.
-	// FIXME: we treat apostrophe as part of a word.  This
-	// is an English-ism.
-	if (n != '\''
-	    && (type == Character.DASH_PUNCTUATION
-		|| type == Character.START_PUNCTUATION
-		|| type == Character.END_PUNCTUATION
-		|| type == Character.CONNECTOR_PUNCTUATION
-		|| type == Character.OTHER_PUNCTUATION
-		|| type == Character.MATH_SYMBOL
-		|| type == Character.CURRENCY_SYMBOL
-		|| type == Character.MODIFIER_SYMBOL
-		|| type == Character.OTHER_SYMBOL
-		|| type == Character.FORMAT
-		|| type == Character.CONTROL))
-	  break;
+        // Always break after certain symbols, such as punctuation.
+        // This heuristic is derived from hints in the JCL book and is
+        // not part of Unicode.  It seems to be right, however.
+        // FIXME: we treat apostrophe as part of a word.  This
+        // is an English-ism.
+        if (n != '\''
+            && (type == Character.DASH_PUNCTUATION
+                || type == Character.START_PUNCTUATION
+                || type == Character.END_PUNCTUATION
+                || type == Character.CONNECTOR_PUNCTUATION
+                || type == Character.OTHER_PUNCTUATION
+                || type == Character.MATH_SYMBOL
+                || type == Character.CURRENCY_SYMBOL
+                || type == Character.MODIFIER_SYMBOL
+                || type == Character.OTHER_SYMBOL
+                || type == Character.FORMAT
+                || type == Character.CONTROL))
+          break;
 
-	// Special case Japanese.
-	if ((is_hira || is_kata || is_han)
-	    && ! isHira (n) && ! isKata (n) && ! isHan (n)
-	    && type != Character.NON_SPACING_MARK)
-	  break;
+        // Special case Japanese.
+        if ((is_hira || is_kata || is_han)
+            && ! isHira (n) && ! isKata (n) && ! isHan (n)
+            && type != Character.NON_SPACING_MARK)
+          break;
 
-	// We might have to skip over non spacing marks to see what's
-	// on the other side.
-	if (! is_hira || (! is_letter && c != '\''))
-	  {
-	    int save = iter.getIndex();
-	    while (n != CharacterIterator.DONE
-		   && Character.getType(n) == Character.NON_SPACING_MARK)
-	      n = iter.previous();
-	    iter.setIndex(save);
-	    // This is a strange case: a bunch of non-spacing marks at
-	    // the beginning.  We treat the current location as a word
-	    // break.
-	    if (n == CharacterIterator.DONE)
-	      break;
-	    if ((isHira (n) && ! is_hira)
-		|| (isKata (n) && ! is_hira && ! is_kata)
-		|| (isHan (n) && ! is_hira && ! is_han)
-		// FIXME: we treat apostrophe as part of a word.  This
-		// is an English-ism.
-		|| (! is_letter && c != '\'' && Character.isLetter(n)))
-	      break;
-	  }
+        // We might have to skip over non spacing marks to see what's
+        // on the other side.
+        if (! is_hira || (! is_letter && c != '\''))
+          {
+            int save = iter.getIndex();
+            while (n != CharacterIterator.DONE
+                   && Character.getType(n) == Character.NON_SPACING_MARK)
+              n = iter.previous();
+            iter.setIndex(save);
+            // This is a strange case: a bunch of non-spacing marks at
+            // the beginning.  We treat the current location as a word
+            // break.
+            if (n == CharacterIterator.DONE)
+              break;
+            if ((isHira (n) && ! is_hira)
+                || (isKata (n) && ! is_hira && ! is_kata)
+                || (isHan (n) && ! is_hira && ! is_han)
+                // FIXME: we treat apostrophe as part of a word.  This
+                // is an English-ism.
+                || (! is_letter && c != '\'' && Character.isLetter(n)))
+              break;
+          }
       }
 
     return iter.getIndex();
diff --git a/libjava/classpath/gnu/java/util/Base64.java b/libjava/classpath/gnu/java/util/Base64.java
index 4401a151a36..80b1fcc025c 100644
--- a/libjava/classpath/gnu/java/util/Base64.java
+++ b/libjava/classpath/gnu/java/util/Base64.java
@@ -114,7 +114,7 @@ public final class Base64
   {
     return encode(buf, 0);
   }
-  
+
   /**
    * Base64 encode a byte array, returning the returning string.
    *
@@ -129,7 +129,7 @@ public final class Base64
 
   /**
    * Base64 encode a byte array, returning the returning string.
-   * 
+   *
    * @param buf The byte array to encode.
    * @param offset The offset in the byte array to start.
    * @param length The number of bytes to encode.
diff --git a/libjava/classpath/gnu/java/util/DoubleEnumeration.java b/libjava/classpath/gnu/java/util/DoubleEnumeration.java
index 94efb923d2a..852644bc619 100644
--- a/libjava/classpath/gnu/java/util/DoubleEnumeration.java
+++ b/libjava/classpath/gnu/java/util/DoubleEnumeration.java
@@ -46,7 +46,7 @@ import java.util.NoSuchElementException;
  * It returns the elements of the first Enumeration until it has
  * no more elements and then returns the elements of the second
  * Enumeration.
      
- * 
+ *
  * In the default case:
  * 
        * doubleEnum = new DoubleEnumeration(enum1, enum2);
@@ -67,7 +67,7 @@ public class DoubleEnumeration implements Enumeration
 {
   /**
    * This is true as long as one of the enumerations has more
-   * elements.  
+   * elements.
    * Only valid when hasChecked is true.
    * Set in hasMoreElements()
    */
diff --git a/libjava/classpath/gnu/java/util/EmptyEnumeration.java b/libjava/classpath/gnu/java/util/EmptyEnumeration.java
index ca2c56d7335..30c50d81dd1 100644
--- a/libjava/classpath/gnu/java/util/EmptyEnumeration.java
+++ b/libjava/classpath/gnu/java/util/EmptyEnumeration.java
@@ -54,7 +54,7 @@ import java.util.NoSuchElementException;
 public final class EmptyEnumeration implements Enumeration, Serializable
 {
   /** The only instance of this class */
-  private static final EmptyEnumeration instance = 
+  private static final EmptyEnumeration instance =
     new EmptyEnumeration();
 
   /**
diff --git a/libjava/classpath/gnu/java/util/WeakIdentityHashMap.java b/libjava/classpath/gnu/java/util/WeakIdentityHashMap.java
index 210a3d8c58b..4d9014969bf 100644
--- a/libjava/classpath/gnu/java/util/WeakIdentityHashMap.java
+++ b/libjava/classpath/gnu/java/util/WeakIdentityHashMap.java
@@ -686,12 +686,12 @@ public class WeakIdentityHashMap extends AbstractMap implements Map
       {
          if (next == null)
             throw new InternalError("WeakIdentityHashMap in inconsistent state");
-         prev = next; 
+         prev = next;
          next = prev.next;
       }
     if (prev == null)
       buckets[slot] = bucket.next;
-    else 
+    else
       prev.next = bucket.next;
 
     size--;
diff --git a/libjava/classpath/gnu/java/util/ZoneInfo.java b/libjava/classpath/gnu/java/util/ZoneInfo.java
index 2146a321f40..117ef3cf25b 100644
--- a/libjava/classpath/gnu/java/util/ZoneInfo.java
+++ b/libjava/classpath/gnu/java/util/ZoneInfo.java
@@ -134,7 +134,7 @@ public class ZoneInfo extends TimeZone
    * rules after the last transition.
    */
   public ZoneInfo(int rawOffset, String id, long[] transitions,
-		  SimpleTimeZone lastRule)
+                  SimpleTimeZone lastRule)
   {
     if (transitions == null || transitions.length < 1)
       throw new IllegalArgumentException("transitions must not be null");
@@ -166,7 +166,7 @@ public class ZoneInfo extends TimeZone
    * @throws IllegalArgumentException if arguments are incorrect.
    */
   public int getOffset(int era, int year, int month, int day, int dayOfWeek,
-		       int millis)
+                       int millis)
   {
     if (gmtZone == null)
       gmtZone = new SimpleTimeZone(0, "GMT");
@@ -201,15 +201,15 @@ public class ZoneInfo extends TimeZone
     int mid = 1;
     while (lo < hi)
       {
-	mid = (lo + hi) / 2;
-	// secs < (transitions[mid-1] >> SECS_SHIFT)
-	if (val <= transitions[mid-1])
-	  hi = mid;
-	// secs >= (transitions[mid] >> SECS_SHIFT)
-	else if (val > transitions[mid])
-	  lo = mid + 1;
-	else
-	  break;
+        mid = (lo + hi) / 2;
+        // secs < (transitions[mid-1] >> SECS_SHIFT)
+        if (val <= transitions[mid-1])
+          hi = mid;
+        // secs >= (transitions[mid] >> SECS_SHIFT)
+        else if (val > transitions[mid])
+          lo = mid + 1;
+        else
+          break;
       }
     return transitions[mid];
   }
@@ -257,30 +257,30 @@ public class ZoneInfo extends TimeZone
   {
     if (lastRule.useDaylightTime())
       {
-	dstSavings = lastRule.getDSTSavings();
-	useDaylight = true;
+        dstSavings = lastRule.getDSTSavings();
+        useDaylight = true;
       }
     else
       {
-	dstSavings = 0;
-	useDaylight = false;
-	// lastRule might say no DST is in effect simply because
-	// the DST rules are too complex for SimpleTimeZone, say
-	// for Asia/Jerusalem.
-	// Look at the last DST offset if it is newer than current time.
-	long currentSecs = System.currentTimeMillis() / 1000;
-	int i;
-	for (i = transitions.length - 1;
-	     i >= 0 && currentSecs < (transitions[i] >> SECS_SHIFT);
-	     i--)
-	  if ((transitions[i] & IS_DST) != 0)
-	    {
-	      dstSavings = (int) (((transitions[i] << OFFSET_SHIFT)
-				   >> OFFSET_SHIFT) * 1000)
-			   - rawOffset;
-	      useDaylight = true;
-	      break;
-	    }
+        dstSavings = 0;
+        useDaylight = false;
+        // lastRule might say no DST is in effect simply because
+        // the DST rules are too complex for SimpleTimeZone, say
+        // for Asia/Jerusalem.
+        // Look at the last DST offset if it is newer than current time.
+        long currentSecs = System.currentTimeMillis() / 1000;
+        int i;
+        for (i = transitions.length - 1;
+             i >= 0 && currentSecs < (transitions[i] >> SECS_SHIFT);
+             i--)
+          if ((transitions[i] & IS_DST) != 0)
+            {
+              dstSavings = (int) (((transitions[i] << OFFSET_SHIFT)
+                                   >> OFFSET_SHIFT) * 1000)
+                           - rawOffset;
+              useDaylight = true;
+              break;
+            }
       }
   }
 
@@ -372,10 +372,10 @@ public class ZoneInfo extends TimeZone
   public String toString()
   {
     return getClass().getName() + "[" + "id=" + getID() + ",offset="
-	   + rawOffset + ",transitions=" + transitions.length
-	   + ",useDaylight=" + useDaylight
-	   + (useDaylight ? (",dstSavings=" + dstSavings) : "")
-	   + ",lastRule=" + lastRule.toString() + "]";
+           + rawOffset + ",transitions=" + transitions.length
+           + ",useDaylight=" + useDaylight
+           + (useDaylight ? (",dstSavings=" + dstSavings) : "")
+           + ",lastRule=" + lastRule.toString() + "]";
   }
 
   /**
@@ -389,470 +389,470 @@ public class ZoneInfo extends TimeZone
     DataInputStream dis = null;
     try
       {
-	FileInputStream fis = new FileInputStream(file);
-	BufferedInputStream bis = new BufferedInputStream(fis);
-	dis = new DataInputStream(bis);
+        FileInputStream fis = new FileInputStream(file);
+        BufferedInputStream bis = new BufferedInputStream(fis);
+        dis = new DataInputStream(bis);
 
-	// Make sure we are reading a tzfile.
-	byte[] tzif = new byte[5];
-	dis.readFully(tzif);
-	int tzif2 = 4;
-	if (tzif[0] == 'T' && tzif[1] == 'Z'
-	    && tzif[2] == 'i' && tzif[3] == 'f')
-	  {
-	    if (tzif[4] >= '2')
-	      tzif2 = 8;
-	    // Reserved bytes
-	    skipFully(dis, 16 - 1);
-	  }
-	else
-	  // Darwin has tzdata files that don't start with the TZif marker
-	  skipFully(dis, 16 - 5);
+        // Make sure we are reading a tzfile.
+        byte[] tzif = new byte[5];
+        dis.readFully(tzif);
+        int tzif2 = 4;
+        if (tzif[0] == 'T' && tzif[1] == 'Z'
+            && tzif[2] == 'i' && tzif[3] == 'f')
+          {
+            if (tzif[4] >= '2')
+              tzif2 = 8;
+            // Reserved bytes
+            skipFully(dis, 16 - 1);
+          }
+        else
+          // Darwin has tzdata files that don't start with the TZif marker
+          skipFully(dis, 16 - 5);
 
-	int ttisgmtcnt = dis.readInt();
-	int ttisstdcnt = dis.readInt();
-	int leapcnt = dis.readInt();
-	int timecnt = dis.readInt();
-	int typecnt = dis.readInt();
-	int charcnt = dis.readInt();
-	if (tzif2 == 8)
-	  {
-	    skipFully(dis, timecnt * (4 + 1) + typecnt * (4 + 1 + 1) + charcnt
-			   + leapcnt * (4 + 4) + ttisgmtcnt + ttisstdcnt);
+        int ttisgmtcnt = dis.readInt();
+        int ttisstdcnt = dis.readInt();
+        int leapcnt = dis.readInt();
+        int timecnt = dis.readInt();
+        int typecnt = dis.readInt();
+        int charcnt = dis.readInt();
+        if (tzif2 == 8)
+          {
+            skipFully(dis, timecnt * (4 + 1) + typecnt * (4 + 1 + 1) + charcnt
+                           + leapcnt * (4 + 4) + ttisgmtcnt + ttisstdcnt);
 
-	    dis.readFully(tzif);
-	    if (tzif[0] != 'T' || tzif[1] != 'Z' || tzif[2] != 'i'
-		|| tzif[3] != 'f' || tzif[4] < '2')
-	      return null;
+            dis.readFully(tzif);
+            if (tzif[0] != 'T' || tzif[1] != 'Z' || tzif[2] != 'i'
+                || tzif[3] != 'f' || tzif[4] < '2')
+              return null;
 
-	    // Reserved bytes
-	    skipFully(dis, 16 - 1);
-	    ttisgmtcnt = dis.readInt();
-	    ttisstdcnt = dis.readInt();
-	    leapcnt = dis.readInt();
-	    timecnt = dis.readInt();
-	    typecnt = dis.readInt();
-	    charcnt = dis.readInt();
-	  }
+            // Reserved bytes
+            skipFully(dis, 16 - 1);
+            ttisgmtcnt = dis.readInt();
+            ttisstdcnt = dis.readInt();
+            leapcnt = dis.readInt();
+            timecnt = dis.readInt();
+            typecnt = dis.readInt();
+            charcnt = dis.readInt();
+          }
 
-	// Sanity checks
-	if (typecnt <= 0 || timecnt < 0 || charcnt < 0
-	    || leapcnt < 0 || ttisgmtcnt < 0 || ttisstdcnt < 0
-	    || ttisgmtcnt > typecnt || ttisstdcnt > typecnt)
-	  return null;
+        // Sanity checks
+        if (typecnt <= 0 || timecnt < 0 || charcnt < 0
+            || leapcnt < 0 || ttisgmtcnt < 0 || ttisstdcnt < 0
+            || ttisgmtcnt > typecnt || ttisstdcnt > typecnt)
+          return null;
 
-	// Transition times
-	long[] times = new long[timecnt];
-	for (int i = 0; i < timecnt; i++)
-	  if (tzif2 == 8)
-	    times[i] = dis.readLong();
-	  else
-	    times[i] = (long) dis.readInt();
+        // Transition times
+        long[] times = new long[timecnt];
+        for (int i = 0; i < timecnt; i++)
+          if (tzif2 == 8)
+            times[i] = dis.readLong();
+          else
+            times[i] = (long) dis.readInt();
 
-	// Transition types
-	int[] types = new int[timecnt];
-	for (int i = 0; i < timecnt; i++)
-	  {
-	    types[i] = dis.readByte();
-	    if (types[i] < 0)
-	      types[i] += 256;
-	    if (types[i] >= typecnt)
-	      return null;
-	  }
+        // Transition types
+        int[] types = new int[timecnt];
+        for (int i = 0; i < timecnt; i++)
+          {
+            types[i] = dis.readByte();
+            if (types[i] < 0)
+              types[i] += 256;
+            if (types[i] >= typecnt)
+              return null;
+          }
 
-	// Types
-	int[] offsets = new int[typecnt];
-	int[] typeflags = new int[typecnt];
-	for (int i = 0; i < typecnt; i++)
-	  {
-	    offsets[i] = dis.readInt();
-	    if (offsets[i] >= IS_DST / 2 || offsets[i] <= -IS_DST / 2)
-	      return null;
-	    int dst = dis.readByte();
-	    int abbrind = dis.readByte();
-	    if (abbrind < 0)
-	      abbrind += 256;
-	    if (abbrind >= charcnt)
-	      return null;
-	    typeflags[i] = (dst != 0 ? (1 << 8) : 0) + abbrind;
-	  }
+        // Types
+        int[] offsets = new int[typecnt];
+        int[] typeflags = new int[typecnt];
+        for (int i = 0; i < typecnt; i++)
+          {
+            offsets[i] = dis.readInt();
+            if (offsets[i] >= IS_DST / 2 || offsets[i] <= -IS_DST / 2)
+              return null;
+            int dst = dis.readByte();
+            int abbrind = dis.readByte();
+            if (abbrind < 0)
+              abbrind += 256;
+            if (abbrind >= charcnt)
+              return null;
+            typeflags[i] = (dst != 0 ? (1 << 8) : 0) + abbrind;
+          }
 
-	// Abbrev names
-	byte[] names = new byte[charcnt];
-	dis.readFully(names);
+        // Abbrev names
+        byte[] names = new byte[charcnt];
+        dis.readFully(names);
 
-	// Leap transitions, for now ignore
-	skipFully(dis, leapcnt * (tzif2 + 4) + ttisstdcnt + ttisgmtcnt);
+        // Leap transitions, for now ignore
+        skipFully(dis, leapcnt * (tzif2 + 4) + ttisstdcnt + ttisgmtcnt);
 
-	// tzIf2 format has optional POSIX TZ env string
-	String tzstr = null;
-	if (tzif2 == 8 && dis.readByte() == '\n')
-	  {
-	    tzstr = dis.readLine();
-	    if (tzstr.length() <= 0)
-	      tzstr = null;
-	  }
+        // tzIf2 format has optional POSIX TZ env string
+        String tzstr = null;
+        if (tzif2 == 8 && dis.readByte() == '\n')
+          {
+            tzstr = dis.readLine();
+            if (tzstr.length() <= 0)
+              tzstr = null;
+          }
 
-	// Get std/dst_offset and dst/non-dst time zone names.
-	int std_ind = -1;
-	int dst_ind = -1;
-	if (timecnt == 0)
-	  std_ind = 0;
-	else
-	  for (int i = timecnt - 1; i >= 0; i--)
-	    {
-	      if (std_ind == -1 && (typeflags[types[i]] & (1 << 8)) == 0)
-		std_ind = types[i];
-	      else if (dst_ind == -1 && (typeflags[types[i]] & (1 << 8)) != 0)
-		dst_ind = types[i];
-	      if (dst_ind != -1 && std_ind != -1)
-		break;
-	    }
+        // Get std/dst_offset and dst/non-dst time zone names.
+        int std_ind = -1;
+        int dst_ind = -1;
+        if (timecnt == 0)
+          std_ind = 0;
+        else
+          for (int i = timecnt - 1; i >= 0; i--)
+            {
+              if (std_ind == -1 && (typeflags[types[i]] & (1 << 8)) == 0)
+                std_ind = types[i];
+              else if (dst_ind == -1 && (typeflags[types[i]] & (1 << 8)) != 0)
+                dst_ind = types[i];
+              if (dst_ind != -1 && std_ind != -1)
+                break;
+            }
 
-	if (std_ind == -1)
-	  return null;
+        if (std_ind == -1)
+          return null;
 
-	int j = typeflags[std_ind] & 255;
-	while (j < charcnt && names[j] != 0)
-	  j++;
-	String std_zonename = new String(names, typeflags[std_ind] & 255,
-					 j - (typeflags[std_ind] & 255),
-					 "ASCII");
+        int j = typeflags[std_ind] & 255;
+        while (j < charcnt && names[j] != 0)
+          j++;
+        String std_zonename = new String(names, typeflags[std_ind] & 255,
+                                         j - (typeflags[std_ind] & 255),
+                                         "ASCII");
 
-	String dst_zonename = "";
-	if (dst_ind != -1)
-	  {
-	    j = typeflags[dst_ind] & 255;
-	    while (j < charcnt && names[j] != 0)
-	      j++;
-	    dst_zonename = new String(names, typeflags[dst_ind] & 255,
-				      j - (typeflags[dst_ind] & 255), "ASCII");
-	  }
+        String dst_zonename = "";
+        if (dst_ind != -1)
+          {
+            j = typeflags[dst_ind] & 255;
+            while (j < charcnt && names[j] != 0)
+              j++;
+            dst_zonename = new String(names, typeflags[dst_ind] & 255,
+                                      j - (typeflags[dst_ind] & 255), "ASCII");
+          }
 
-	// Only use gmt offset when necessary.
-	// Also special case GMT+/- timezones.
-	String std_offset_string = "";
-	String dst_offset_string = "";
-	if (tzstr == null
-	    && (dst_ind != -1
-		|| (offsets[std_ind] != 0
-		    && !std_zonename.startsWith("GMT+")
-		    && !std_zonename.startsWith("GMT-"))))
-	  {
-	    std_offset_string = Integer.toString(-offsets[std_ind] / 3600);
-	    int seconds = -offsets[std_ind] % 3600;
-	    if (seconds != 0)
-	      {
-		if (seconds < 0)
-		  seconds *= -1;
-		if (seconds < 600)
-		  std_offset_string += ":0" + Integer.toString(seconds / 60);
-		else
-		  std_offset_string += ":" + Integer.toString(seconds / 60);
-		seconds = seconds % 60;
-		if (seconds >= 10)
-		  std_offset_string += ":" + Integer.toString(seconds);
-		else if (seconds > 0)
-		  std_offset_string += ":0" + Integer.toString(seconds);
-	      }
+        // Only use gmt offset when necessary.
+        // Also special case GMT+/- timezones.
+        String std_offset_string = "";
+        String dst_offset_string = "";
+        if (tzstr == null
+            && (dst_ind != -1
+                || (offsets[std_ind] != 0
+                    && !std_zonename.startsWith("GMT+")
+                    && !std_zonename.startsWith("GMT-"))))
+          {
+            std_offset_string = Integer.toString(-offsets[std_ind] / 3600);
+            int seconds = -offsets[std_ind] % 3600;
+            if (seconds != 0)
+              {
+                if (seconds < 0)
+                  seconds *= -1;
+                if (seconds < 600)
+                  std_offset_string += ":0" + Integer.toString(seconds / 60);
+                else
+                  std_offset_string += ":" + Integer.toString(seconds / 60);
+                seconds = seconds % 60;
+                if (seconds >= 10)
+                  std_offset_string += ":" + Integer.toString(seconds);
+                else if (seconds > 0)
+                  std_offset_string += ":0" + Integer.toString(seconds);
+              }
 
-	    if (dst_ind != -1 && offsets[dst_ind] != offsets[std_ind] + 3600)
-	      {
-		dst_offset_string = Integer.toString(-offsets[dst_ind] / 3600);
-		seconds = -offsets[dst_ind] % 3600;
-		if (seconds != 0)
-		  {
-		    if (seconds < 0)
-		      seconds *= -1;
-		    if (seconds < 600)
-		      dst_offset_string
-			+= ":0" + Integer.toString(seconds / 60);
-		    else
-		      dst_offset_string
-			+= ":" + Integer.toString(seconds / 60);
-		    seconds = seconds % 60;
-		    if (seconds >= 10)
-		      dst_offset_string += ":" + Integer.toString(seconds);
-		    else if (seconds > 0)
-		      dst_offset_string += ":0" + Integer.toString(seconds);
-		  }
-	      }
-	  }
+            if (dst_ind != -1 && offsets[dst_ind] != offsets[std_ind] + 3600)
+              {
+                dst_offset_string = Integer.toString(-offsets[dst_ind] / 3600);
+                seconds = -offsets[dst_ind] % 3600;
+                if (seconds != 0)
+                  {
+                    if (seconds < 0)
+                      seconds *= -1;
+                    if (seconds < 600)
+                      dst_offset_string
+                        += ":0" + Integer.toString(seconds / 60);
+                    else
+                      dst_offset_string
+                        += ":" + Integer.toString(seconds / 60);
+                    seconds = seconds % 60;
+                    if (seconds >= 10)
+                      dst_offset_string += ":" + Integer.toString(seconds);
+                    else if (seconds > 0)
+                      dst_offset_string += ":0" + Integer.toString(seconds);
+                  }
+              }
+          }
 
-	/*
-	 * If no tzIf2 POSIX TZ string is available and the timezone
-	 * uses DST, try to guess the last rule by trying to make
-	 * sense from transitions at 5 years in the future and onwards.
-	 * tzdata actually uses only 3 forms of rules:
-	 * fixed date within a month, e.g. change on April, 5th
-	 * 1st weekday on or after Nth: change on Sun>=15 in April
-	 * last weekday in a month: change on lastSun in April
-	 */
-	String[] change_spec = { null, null };
-	if (tzstr == null && dst_ind != -1 && timecnt > 10)
-	  {
-	    long nowPlus5y = System.currentTimeMillis() / 1000
-			     + 5 * 365 * 86400;
-	    int first;
+        /*
+         * If no tzIf2 POSIX TZ string is available and the timezone
+         * uses DST, try to guess the last rule by trying to make
+         * sense from transitions at 5 years in the future and onwards.
+         * tzdata actually uses only 3 forms of rules:
+         * fixed date within a month, e.g. change on April, 5th
+         * 1st weekday on or after Nth: change on Sun>=15 in April
+         * last weekday in a month: change on lastSun in April
+         */
+        String[] change_spec = { null, null };
+        if (tzstr == null && dst_ind != -1 && timecnt > 10)
+          {
+            long nowPlus5y = System.currentTimeMillis() / 1000
+                             + 5 * 365 * 86400;
+            int first;
 
-	    for (first = timecnt - 1; first >= 0; first--)
-	      if (times[first] < nowPlus5y
-		  || (types[first] != std_ind && types[first] != dst_ind)
-		  || types[first] != types[timecnt - 2 + ((first ^ timecnt) & 1)])
-		break;
-	    first++;
+            for (first = timecnt - 1; first >= 0; first--)
+              if (times[first] < nowPlus5y
+                  || (types[first] != std_ind && types[first] != dst_ind)
+                  || types[first] != types[timecnt - 2 + ((first ^ timecnt) & 1)])
+                break;
+            first++;
 
-	    if (timecnt - first >= 10 && types[timecnt - 1] != types[timecnt - 2])
-	      {
-		GregorianCalendar cal
-		  = new GregorianCalendar(new SimpleTimeZone(0, "GMT"));
+            if (timecnt - first >= 10 && types[timecnt - 1] != types[timecnt - 2])
+              {
+                GregorianCalendar cal
+                  = new GregorianCalendar(new SimpleTimeZone(0, "GMT"));
 
-		int[] values = new int[2 * 11];
-		int i;
-		for (i = timecnt - 1; i >= first; i--)
-		  {
-		    int base = (i % 2) * 11;
-		    int offset = offsets[types[i > first ? i - 1 : i + 1]];
-		    cal.setTimeInMillis((times[i] + offset) * 1000);
-		    if (i >= timecnt - 2)
-		      {
-			values[base + 0] = cal.get(Calendar.YEAR);
-			values[base + 1] = cal.get(Calendar.MONTH);
-			values[base + 2] = cal.get(Calendar.DAY_OF_MONTH);
-			values[base + 3]
-			  = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
-			values[base + 4] = cal.get(Calendar.DAY_OF_WEEK);
-			values[base + 5] = cal.get(Calendar.HOUR_OF_DAY);
-			values[base + 6] = cal.get(Calendar.MINUTE);
-			values[base + 7] = cal.get(Calendar.SECOND);
-			values[base + 8] = values[base + 2]; // Range start
-			values[base + 9] = values[base + 2]; // Range end
-			values[base + 10] = 0; // Determined type
-		      }
-		    else
-		      {
-			int year = cal.get(Calendar.YEAR);
-			int month = cal.get(Calendar.MONTH);
-			int day_of_month = cal.get(Calendar.DAY_OF_MONTH);
-			int month_days
-			  = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
-			int day_of_week = cal.get(Calendar.DAY_OF_WEEK);
-			int hour = cal.get(Calendar.HOUR_OF_DAY);
-			int minute = cal.get(Calendar.MINUTE);
-			int second = cal.get(Calendar.SECOND);
-			if (year != values[base + 0] - 1
-			    || month != values[base + 1]
-			    || hour != values[base + 5]
-			    || minute != values[base + 6]
-			    || second != values[base + 7])
-			  break;
-			if (day_of_week == values[base + 4])
-			  {
-			    // Either a Sun>=8 or lastSun rule.
-			    if (day_of_month < values[base + 8])
-			      values[base + 8] = day_of_month;
-			    if (day_of_month > values[base + 9])
-			      values[base + 9] = day_of_month;
-			    if (values[base + 10] < 0)
-			      break;
-			    if (values[base + 10] == 0)
-			      {
-				values[base + 10] = 1;
-				// If day of month > 28, this is
-				// certainly lastSun rule.
-				if (values[base + 2] > 28)
-				  values[base + 2] = 3;
-				// If day of month isn't in the last
-				// week, it can't be lastSun rule.
-				else if (values[base + 2]
-					 <= values[base + 3] - 7)
-				  values[base + 3] = 2;
-			      }
-			    if (values[base + 10] == 1)
-			      {
-				// If day of month is > 28, this is
-				// certainly lastSun rule.
-				if (day_of_month > 28)
-				  values[base + 10] = 3;
-				// If day of month isn't in the last
-				// week, it can't be lastSun rule.
-				else if (day_of_month <= month_days - 7)
-				  values[base + 10] = 2;
-			      }
-			    else if ((values[base + 10] == 2
-				      && day_of_month > 28)
-				     || (values[base + 10] == 3
-					 && day_of_month <= month_days - 7))
-			      break;
-			  }
-			else
-			  {
-			    // Must be fixed day in month rule.
-			    if (day_of_month != values[base + 2]
-				|| values[base + 10] > 0)
-			      break;
-			    values[base + 4] = day_of_week;
-			    values[base + 10] = -1;
-			  }
-			values[base + 0] -= 1;
-		      }
-		  }
+                int[] values = new int[2 * 11];
+                int i;
+                for (i = timecnt - 1; i >= first; i--)
+                  {
+                    int base = (i % 2) * 11;
+                    int offset = offsets[types[i > first ? i - 1 : i + 1]];
+                    cal.setTimeInMillis((times[i] + offset) * 1000);
+                    if (i >= timecnt - 2)
+                      {
+                        values[base + 0] = cal.get(Calendar.YEAR);
+                        values[base + 1] = cal.get(Calendar.MONTH);
+                        values[base + 2] = cal.get(Calendar.DAY_OF_MONTH);
+                        values[base + 3]
+                          = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+                        values[base + 4] = cal.get(Calendar.DAY_OF_WEEK);
+                        values[base + 5] = cal.get(Calendar.HOUR_OF_DAY);
+                        values[base + 6] = cal.get(Calendar.MINUTE);
+                        values[base + 7] = cal.get(Calendar.SECOND);
+                        values[base + 8] = values[base + 2]; // Range start
+                        values[base + 9] = values[base + 2]; // Range end
+                        values[base + 10] = 0; // Determined type
+                      }
+                    else
+                      {
+                        int year = cal.get(Calendar.YEAR);
+                        int month = cal.get(Calendar.MONTH);
+                        int day_of_month = cal.get(Calendar.DAY_OF_MONTH);
+                        int month_days
+                          = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
+                        int day_of_week = cal.get(Calendar.DAY_OF_WEEK);
+                        int hour = cal.get(Calendar.HOUR_OF_DAY);
+                        int minute = cal.get(Calendar.MINUTE);
+                        int second = cal.get(Calendar.SECOND);
+                        if (year != values[base + 0] - 1
+                            || month != values[base + 1]
+                            || hour != values[base + 5]
+                            || minute != values[base + 6]
+                            || second != values[base + 7])
+                          break;
+                        if (day_of_week == values[base + 4])
+                          {
+                            // Either a Sun>=8 or lastSun rule.
+                            if (day_of_month < values[base + 8])
+                              values[base + 8] = day_of_month;
+                            if (day_of_month > values[base + 9])
+                              values[base + 9] = day_of_month;
+                            if (values[base + 10] < 0)
+                              break;
+                            if (values[base + 10] == 0)
+                              {
+                                values[base + 10] = 1;
+                                // If day of month > 28, this is
+                                // certainly lastSun rule.
+                                if (values[base + 2] > 28)
+                                  values[base + 2] = 3;
+                                // If day of month isn't in the last
+                                // week, it can't be lastSun rule.
+                                else if (values[base + 2]
+                                         <= values[base + 3] - 7)
+                                  values[base + 3] = 2;
+                              }
+                            if (values[base + 10] == 1)
+                              {
+                                // If day of month is > 28, this is
+                                // certainly lastSun rule.
+                                if (day_of_month > 28)
+                                  values[base + 10] = 3;
+                                // If day of month isn't in the last
+                                // week, it can't be lastSun rule.
+                                else if (day_of_month <= month_days - 7)
+                                  values[base + 10] = 2;
+                              }
+                            else if ((values[base + 10] == 2
+                                      && day_of_month > 28)
+                                     || (values[base + 10] == 3
+                                         && day_of_month <= month_days - 7))
+                              break;
+                          }
+                        else
+                          {
+                            // Must be fixed day in month rule.
+                            if (day_of_month != values[base + 2]
+                                || values[base + 10] > 0)
+                              break;
+                            values[base + 4] = day_of_week;
+                            values[base + 10] = -1;
+                          }
+                        values[base + 0] -= 1;
+                      }
+                  }
 
-		if (i < first)
-		  {
-		    for (i = 0; i < 2; i++)
-		      {
-			int base = 11 * i;
-			if (values[base + 10] == 0)
-			  continue;
-			if (values[base + 10] == -1)
-			  {
-			    int[] dayCount
-			      = { 0, 31, 59, 90, 120, 151,
-				  181, 212, 243, 273, 304, 334 };
-			    int d = dayCount[values[base + 1]
-					     - Calendar.JANUARY];
-			    d += values[base + 2];
-			    change_spec[i] = ",J" + Integer.toString(d);
-			  }
-			else if (values[base + 10] == 2)
-			  {
-			    // If we haven't seen all days of the week,
-			    // we can't be sure what the rule really is.
-			    if (values[base + 8] + 6 != values[base + 9])
-			      continue;
+                if (i < first)
+                  {
+                    for (i = 0; i < 2; i++)
+                      {
+                        int base = 11 * i;
+                        if (values[base + 10] == 0)
+                          continue;
+                        if (values[base + 10] == -1)
+                          {
+                            int[] dayCount
+                              = { 0, 31, 59, 90, 120, 151,
+                                  181, 212, 243, 273, 304, 334 };
+                            int d = dayCount[values[base + 1]
+                                             - Calendar.JANUARY];
+                            d += values[base + 2];
+                            change_spec[i] = ",J" + Integer.toString(d);
+                          }
+                        else if (values[base + 10] == 2)
+                          {
+                            // If we haven't seen all days of the week,
+                            // we can't be sure what the rule really is.
+                            if (values[base + 8] + 6 != values[base + 9])
+                              continue;
 
-			    int d;
-			    d = values[base + 1] - Calendar.JANUARY + 1;
-			    // E.g. Sun >= 5 is not representable in POSIX
-			    // TZ env string, use ",Am.n.d" extension
-			    // where m is month 1 .. 12, n is the date on
-			    // or after which it happens and d is day
-			    // of the week, 0 .. 6.  So Sun >= 5 in April
-			    // is ",A4.5.0".
-			    if ((values[base + 8] % 7) == 1)
-			      {
-				change_spec[i] = ",M" + Integer.toString(d);
-				d = (values[base + 8] + 6) / 7;
-			      }
-			    else
-			      {
-				change_spec[i] = ",A" + Integer.toString(d);
-				d = values[base + 8];
-			      }
-			    change_spec[i] += "." + Integer.toString(d);
-			    d = values[base + 4] - Calendar.SUNDAY;
-			    change_spec[i] += "." + Integer.toString(d);
-			  }
-			else
-			  {
-			    // If we don't know whether this is lastSun or
-			    // Sun >= 22 rule.  That can be either because
-			    // there was insufficient number of
-			    // transitions, or February, where it is quite
-			    // probable we haven't seen any 29th dates.
-			    // For February, assume lastSun rule, otherwise
-			    // punt.
-			    if (values[base + 10] == 1
-				&& values[base + 1] != Calendar.FEBRUARY)
-			      continue;
+                            int d;
+                            d = values[base + 1] - Calendar.JANUARY + 1;
+                            // E.g. Sun >= 5 is not representable in POSIX
+                            // TZ env string, use ",Am.n.d" extension
+                            // where m is month 1 .. 12, n is the date on
+                            // or after which it happens and d is day
+                            // of the week, 0 .. 6.  So Sun >= 5 in April
+                            // is ",A4.5.0".
+                            if ((values[base + 8] % 7) == 1)
+                              {
+                                change_spec[i] = ",M" + Integer.toString(d);
+                                d = (values[base + 8] + 6) / 7;
+                              }
+                            else
+                              {
+                                change_spec[i] = ",A" + Integer.toString(d);
+                                d = values[base + 8];
+                              }
+                            change_spec[i] += "." + Integer.toString(d);
+                            d = values[base + 4] - Calendar.SUNDAY;
+                            change_spec[i] += "." + Integer.toString(d);
+                          }
+                        else
+                          {
+                            // If we don't know whether this is lastSun or
+                            // Sun >= 22 rule.  That can be either because
+                            // there was insufficient number of
+                            // transitions, or February, where it is quite
+                            // probable we haven't seen any 29th dates.
+                            // For February, assume lastSun rule, otherwise
+                            // punt.
+                            if (values[base + 10] == 1
+                                && values[base + 1] != Calendar.FEBRUARY)
+                              continue;
 
-			    int d;
-			    d = values[base + 1] - Calendar.JANUARY + 1;
-			    change_spec[i] = ",M" + Integer.toString(d);
-			    d = values[base + 4] - Calendar.SUNDAY;
-			    change_spec[i] += ".5." + Integer.toString(d);
-			  }
+                            int d;
+                            d = values[base + 1] - Calendar.JANUARY + 1;
+                            change_spec[i] = ",M" + Integer.toString(d);
+                            d = values[base + 4] - Calendar.SUNDAY;
+                            change_spec[i] += ".5." + Integer.toString(d);
+                          }
 
-			// Don't add time specification if time is
-			// 02:00:00.
-			if (values[base + 5] != 2
-			    || values[base + 6] != 0
-			    || values[base + 7] != 0)
-			  {
-			    int d = values[base + 5];
-			    change_spec[i] += "/" + Integer.toString(d);
-			    if (values[base + 6] != 0 || values[base + 7] != 0)
-			      {
-				d = values[base + 6];
-				if (d < 10)
-				  change_spec[i]
-				    += ":0" + Integer.toString(d);
-				else
-				  change_spec[i] += ":" + Integer.toString(d);
-				d = values[base + 7];
-				if (d >= 10)
-				   change_spec[i]
-				     += ":" + Integer.toString(d);
-				else if (d > 0)
-				  change_spec[i]
-				    += ":0" + Integer.toString(d);
-			      }
-			  }
-		      }
-		    if (types[(timecnt - 1) & -2] == std_ind)
-		      {
-			String tmp = change_spec[0];
-			change_spec[0] = change_spec[1];
-			change_spec[1] = tmp;
-		      }
-		  }
-	      }
-	  }
+                        // Don't add time specification if time is
+                        // 02:00:00.
+                        if (values[base + 5] != 2
+                            || values[base + 6] != 0
+                            || values[base + 7] != 0)
+                          {
+                            int d = values[base + 5];
+                            change_spec[i] += "/" + Integer.toString(d);
+                            if (values[base + 6] != 0 || values[base + 7] != 0)
+                              {
+                                d = values[base + 6];
+                                if (d < 10)
+                                  change_spec[i]
+                                    += ":0" + Integer.toString(d);
+                                else
+                                  change_spec[i] += ":" + Integer.toString(d);
+                                d = values[base + 7];
+                                if (d >= 10)
+                                   change_spec[i]
+                                     += ":" + Integer.toString(d);
+                                else if (d > 0)
+                                  change_spec[i]
+                                    += ":0" + Integer.toString(d);
+                              }
+                          }
+                      }
+                    if (types[(timecnt - 1) & -2] == std_ind)
+                      {
+                        String tmp = change_spec[0];
+                        change_spec[0] = change_spec[1];
+                        change_spec[1] = tmp;
+                      }
+                  }
+              }
+          }
 
-	if (tzstr == null)
-	  {
-	    tzstr = std_zonename + std_offset_string;
-	    if (change_spec[0] != null && change_spec[1] != null)
-	      tzstr += dst_zonename + dst_offset_string
-		       + change_spec[0] + change_spec[1];
-	  }
+        if (tzstr == null)
+          {
+            tzstr = std_zonename + std_offset_string;
+            if (change_spec[0] != null && change_spec[1] != null)
+              tzstr += dst_zonename + dst_offset_string
+                       + change_spec[0] + change_spec[1];
+          }
 
-	if (timecnt == 0)
-	  return new SimpleTimeZone(offsets[std_ind] * 1000,
-				    id != null ? id : tzstr);
+        if (timecnt == 0)
+          return new SimpleTimeZone(offsets[std_ind] * 1000,
+                                    id != null ? id : tzstr);
 
-	SimpleTimeZone endRule = createLastRule(tzstr);
-	if (endRule == null)
-	  return null;
+        SimpleTimeZone endRule = createLastRule(tzstr);
+        if (endRule == null)
+          return null;
 
-	/* Finally adjust the times array into the form the constructor
-	 * expects.  times[0] is special, the offset and DST flag there
-	 * are for all times before that transition.  Use the first non-DST
-	 * type.  For all other transitions, the data file has the type
-	 * () for the time interval starting
-	 */
-	for (int i = 0; i < typecnt; i++)
-	  if ((typeflags[i] & (1 << 8)) == 0)
-	    {
-	      times[0] = (times[0] << SECS_SHIFT) | (offsets[i] & OFFSET_MASK);
-	      break;
-	    }
+        /* Finally adjust the times array into the form the constructor
+         * expects.  times[0] is special, the offset and DST flag there
+         * are for all times before that transition.  Use the first non-DST
+         * type.  For all other transitions, the data file has the type
+         * () for the time interval starting
+         */
+        for (int i = 0; i < typecnt; i++)
+          if ((typeflags[i] & (1 << 8)) == 0)
+            {
+              times[0] = (times[0] << SECS_SHIFT) | (offsets[i] & OFFSET_MASK);
+              break;
+            }
 
-	for (int i = 1; i < timecnt; i++)
-	  times[i] = (times[i] << SECS_SHIFT)
-		     | (offsets[types[i - 1]] & OFFSET_MASK)
-		     | ((typeflags[types[i - 1]] & (1 << 8)) != 0 ? IS_DST : 0);
+        for (int i = 1; i < timecnt; i++)
+          times[i] = (times[i] << SECS_SHIFT)
+                     | (offsets[types[i - 1]] & OFFSET_MASK)
+                     | ((typeflags[types[i - 1]] & (1 << 8)) != 0 ? IS_DST : 0);
 
-	return new ZoneInfo(offsets[std_ind] * 1000, id != null ? id : tzstr,
-			    times, endRule);
+        return new ZoneInfo(offsets[std_ind] * 1000, id != null ? id : tzstr,
+                            times, endRule);
       }
     catch (IOException ioe)
       {
-	// Parse error, not a proper tzfile.
-	return null;
+        // Parse error, not a proper tzfile.
+        return null;
       }
     finally
       {
-	try
-	  {
-	    if (dis != null)
-	      dis.close();
-	  }
-	catch(IOException ioe)
-	  {
-	    // Error while close, nothing we can do.
-	  }
+        try
+          {
+            if (dis != null)
+              dis.close();
+          }
+        catch(IOException ioe)
+          {
+            // Error while close, nothing we can do.
+          }
       }
   }
 
@@ -865,10 +865,10 @@ public class ZoneInfo extends TimeZone
   {
     while (l > 0)
       {
-	long k = is.skip(l);
-	if (k <= 0)
-	  throw new EOFException();
-	l -= k;
+        long k = is.skip(l);
+        if (k <= 0)
+          throw new EOFException();
+        l -= k;
       }
   }
 
@@ -887,146 +887,146 @@ public class ZoneInfo extends TimeZone
     int dstOffs;
     try
       {
-	int idLength = tzstr.length();
+        int idLength = tzstr.length();
 
-	int index = 0;
-	int prevIndex;
-	char c;
+        int index = 0;
+        int prevIndex;
+        char c;
 
-	// get std
-	do
-	  c = tzstr.charAt(index);
-	while (c != '+' && c != '-' && c != ',' && c != ':'
-	       && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
+        // get std
+        do
+          c = tzstr.charAt(index);
+        while (c != '+' && c != '-' && c != ',' && c != ':'
+               && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
 
-	if (index >= idLength)
-	  return new SimpleTimeZone(0, tzstr);
+        if (index >= idLength)
+          return new SimpleTimeZone(0, tzstr);
 
-	stdName = tzstr.substring(0, index);
-	prevIndex = index;
+        stdName = tzstr.substring(0, index);
+        prevIndex = index;
 
-	// get the std offset
-	do
-	  c = tzstr.charAt(index++);
-	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
-	       && index < idLength);
-	if (index < idLength)
-	  index--;
+        // get the std offset
+        do
+          c = tzstr.charAt(index++);
+        while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+               && index < idLength);
+        if (index < idLength)
+          index--;
 
-	{ // convert the dst string to a millis number
-	    String offset = tzstr.substring(prevIndex, index);
-	    prevIndex = index;
+        { // convert the dst string to a millis number
+            String offset = tzstr.substring(prevIndex, index);
+            prevIndex = index;
 
-	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
-	      stdOffs = parseTime(offset.substring(1));
-	    else
-	      stdOffs = parseTime(offset);
+            if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+              stdOffs = parseTime(offset.substring(1));
+            else
+              stdOffs = parseTime(offset);
 
-	    if (offset.charAt(0) == '-')
-	      stdOffs = -stdOffs;
+            if (offset.charAt(0) == '-')
+              stdOffs = -stdOffs;
 
-	    // TZ timezone offsets are positive when WEST of the meridian.
-	    stdOffs = -stdOffs;
-	}
+            // TZ timezone offsets are positive when WEST of the meridian.
+            stdOffs = -stdOffs;
+        }
 
-	// Done yet? (Format: std offset)
-	if (index >= idLength)
-	  return new SimpleTimeZone(stdOffs, stdName);
+        // Done yet? (Format: std offset)
+        if (index >= idLength)
+          return new SimpleTimeZone(stdOffs, stdName);
 
-	// get dst
-	do
-	  c = tzstr.charAt(index);
-	while (c != '+' && c != '-' && c != ',' && c != ':'
-	       && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
+        // get dst
+        do
+          c = tzstr.charAt(index);
+        while (c != '+' && c != '-' && c != ',' && c != ':'
+               && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
 
-	// Done yet? (Format: std offset dst)
-	if (index >= idLength)
-	  return new SimpleTimeZone(stdOffs, stdName);
+        // Done yet? (Format: std offset dst)
+        if (index >= idLength)
+          return new SimpleTimeZone(stdOffs, stdName);
 
-	// get the dst offset
-	prevIndex = index;
-	do
-	  c = tzstr.charAt(index++);
-	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
-	       && index < idLength);
-	if (index < idLength)
-	  index--;
+        // get the dst offset
+        prevIndex = index;
+        do
+          c = tzstr.charAt(index++);
+        while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+               && index < idLength);
+        if (index < idLength)
+          index--;
 
-	if (index == prevIndex && (c == ',' || c == ';'))
-	  {
-	    // Missing dst offset defaults to one hour ahead of standard
-	    // time.
-	    dstOffs = stdOffs + 60 * 60 * 1000;
-	  }
-	else
-	  { // convert the dst string to a millis number
-	    String offset = tzstr.substring(prevIndex, index);
-	    prevIndex = index;
+        if (index == prevIndex && (c == ',' || c == ';'))
+          {
+            // Missing dst offset defaults to one hour ahead of standard
+            // time.
+            dstOffs = stdOffs + 60 * 60 * 1000;
+          }
+        else
+          { // convert the dst string to a millis number
+            String offset = tzstr.substring(prevIndex, index);
+            prevIndex = index;
 
-	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
-	      dstOffs = parseTime(offset.substring(1));
-	    else
-	      dstOffs = parseTime(offset);
+            if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+              dstOffs = parseTime(offset.substring(1));
+            else
+              dstOffs = parseTime(offset);
 
-	    if (offset.charAt(0) == '-')
-	      dstOffs = -dstOffs;
+            if (offset.charAt(0) == '-')
+              dstOffs = -dstOffs;
 
-	    // TZ timezone offsets are positive when WEST of the meridian.
-	    dstOffs = -dstOffs;
-	  }
+            // TZ timezone offsets are positive when WEST of the meridian.
+            dstOffs = -dstOffs;
+          }
 
-	// Done yet? (Format: std offset dst offset)
-	if (index >= idLength)
-	  return new SimpleTimeZone(stdOffs, stdName);
+        // Done yet? (Format: std offset dst offset)
+        if (index >= idLength)
+          return new SimpleTimeZone(stdOffs, stdName);
 
-	// get the DST rule
-	if (tzstr.charAt(index) == ','
-	    || tzstr.charAt(index) == ';')
-	  {
-	    index++;
-	    int offs = index;
-	    while (tzstr.charAt(index) != ','
-		   && tzstr.charAt(index) != ';')
-	      index++;
-	    String startTime = tzstr.substring(offs, index);
-	    index++;
-	    String endTime = tzstr.substring(index);
+        // get the DST rule
+        if (tzstr.charAt(index) == ','
+            || tzstr.charAt(index) == ';')
+          {
+            index++;
+            int offs = index;
+            while (tzstr.charAt(index) != ','
+                   && tzstr.charAt(index) != ';')
+              index++;
+            String startTime = tzstr.substring(offs, index);
+            index++;
+            String endTime = tzstr.substring(index);
 
-	    index = startTime.indexOf('/');
-	    int startMillis;
-	    int endMillis;
-	    String startDate;
-	    String endDate;
-	    if (index != -1)
-	      {
-		startDate = startTime.substring(0, index);
-		startMillis = parseTime(startTime.substring(index + 1));
-	      }
-	    else
-	      {
-		startDate = startTime;
-		// if time isn't given, default to 2:00:00 AM.
-		startMillis = 2 * 60 * 60 * 1000;
-	      }
-	    index = endTime.indexOf('/');
-	    if (index != -1)
-	      {
-		endDate = endTime.substring(0, index);
-		endMillis = parseTime(endTime.substring(index + 1));
-	      }
-	    else
-	      {
-		endDate = endTime;
-		// if time isn't given, default to 2:00:00 AM.
-		endMillis = 2 * 60 * 60 * 1000;
-	      }
+            index = startTime.indexOf('/');
+            int startMillis;
+            int endMillis;
+            String startDate;
+            String endDate;
+            if (index != -1)
+              {
+                startDate = startTime.substring(0, index);
+                startMillis = parseTime(startTime.substring(index + 1));
+              }
+            else
+              {
+                startDate = startTime;
+                // if time isn't given, default to 2:00:00 AM.
+                startMillis = 2 * 60 * 60 * 1000;
+              }
+            index = endTime.indexOf('/');
+            if (index != -1)
+              {
+                endDate = endTime.substring(0, index);
+                endMillis = parseTime(endTime.substring(index + 1));
+              }
+            else
+              {
+                endDate = endTime;
+                // if time isn't given, default to 2:00:00 AM.
+                endMillis = 2 * 60 * 60 * 1000;
+              }
 
-	    int[] start = getDateParams(startDate);
-	    int[] end = getDateParams(endDate);
-	    return new SimpleTimeZone(stdOffs, tzstr, start[0], start[1],
-				      start[2], startMillis, end[0], end[1],
-				      end[2], endMillis, (dstOffs - stdOffs));
-	  }
+            int[] start = getDateParams(startDate);
+            int[] end = getDateParams(endDate);
+            return new SimpleTimeZone(stdOffs, tzstr, start[0], start[1],
+                                      start[2], startMillis, end[0], end[1],
+                                      end[2], endMillis, (dstOffs - stdOffs));
+          }
       }
 
     catch (IndexOutOfBoundsException _)
@@ -1057,44 +1057,44 @@ public class ZoneInfo extends TimeZone
 
     if (type > 0)
       {
-	int day;
+        int day;
 
-	// Month, week of month, day of week
-	// "Mm.w.d".  d is between 0 (Sunday) and 6.  Week w is
-	// between 1 and 5; Week 1 is the first week in which day d
-	// occurs and Week 5 specifies the last d day in the month.
-	// Month m is between 1 and 12.
+        // Month, week of month, day of week
+        // "Mm.w.d".  d is between 0 (Sunday) and 6.  Week w is
+        // between 1 and 5; Week 1 is the first week in which day d
+        // occurs and Week 5 specifies the last d day in the month.
+        // Month m is between 1 and 12.
 
-	// Month, day of month, day of week
-	// ZoneInfo extension, not in POSIX
-	// "Am.n.d".  d is between 0 (Sunday) and 6.  Day of month n is
-	// between 1 and 25.  Month m is between 1 and 12.
+        // Month, day of month, day of week
+        // ZoneInfo extension, not in POSIX
+        // "Am.n.d".  d is between 0 (Sunday) and 6.  Day of month n is
+        // between 1 and 25.  Month m is between 1 and 12.
 
-	month = Integer.parseInt(date.substring(1, date.indexOf('.')));
-	int week = Integer.parseInt(date.substring(date.indexOf('.') + 1,
-						   date.lastIndexOf('.')));
-	int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.')
-							+ 1));
-	dayOfWeek++; // Java day of week is one-based, Sunday is first day.
+        month = Integer.parseInt(date.substring(1, date.indexOf('.')));
+        int week = Integer.parseInt(date.substring(date.indexOf('.') + 1,
+                                                   date.lastIndexOf('.')));
+        int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.')
+                                                        + 1));
+        dayOfWeek++; // Java day of week is one-based, Sunday is first day.
 
-	if (type == 2)
-	  {
-	    day = week;
-	    dayOfWeek = -dayOfWeek;
-	  }
- 	else if (week == 5)
- 	  day = -1; // last day of month is -1 in java, 5 in TZ
- 	else
-	  {
-	    // First day of week starting on or after.  For example,
-	    // to specify the second Sunday of April, set month to
-	    // APRIL, day-of-month to 8, and day-of-week to -SUNDAY.
-	    day = (week - 1) * 7 + 1;
-	    dayOfWeek = -dayOfWeek;
-	  }
+        if (type == 2)
+          {
+            day = week;
+            dayOfWeek = -dayOfWeek;
+          }
+        else if (week == 5)
+          day = -1; // last day of month is -1 in java, 5 in TZ
+        else
+          {
+            // First day of week starting on or after.  For example,
+            // to specify the second Sunday of April, set month to
+            // APRIL, day-of-month to 8, and day-of-week to -SUNDAY.
+            day = (week - 1) * 7 + 1;
+            dayOfWeek = -dayOfWeek;
+          }
 
-	month--; // Java month is zero-based.
-	return new int[] { month, day, dayOfWeek };
+        month--; // Java month is zero-based.
+        return new int[] { month, day, dayOfWeek };
       }
 
     // julian day, either zero-based 0<=n<=365 (incl feb 29)
@@ -1103,13 +1103,13 @@ public class ZoneInfo extends TimeZone
 
     if (date.charAt(0) != 'J' || date.charAt(0) != 'j')
       {
-	julianDay = Integer.parseInt(date.substring(1));
-	julianDay++; // make 1-based
-	// Adjust day count to include feb 29.
-	dayCount = new int[]
-		   {
-		     0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335
-		   };
+        julianDay = Integer.parseInt(date.substring(1));
+        julianDay++; // make 1-based
+        // Adjust day count to include feb 29.
+        dayCount = new int[]
+                   {
+                     0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335
+                   };
       }
     else
       // 1-based julian day
@@ -1118,9 +1118,9 @@ public class ZoneInfo extends TimeZone
     int i = 11;
     while (i > 0)
       if (dayCount[i] < julianDay)
-	break;
+        break;
       else
-	i--;
+        i--;
     julianDay -= dayCount[i];
     month = i;
     return new int[] { month, julianDay, 0 };
@@ -1137,9 +1137,9 @@ public class ZoneInfo extends TimeZone
 
     while (i < time.length())
       if (time.charAt(i) == ':')
-	break;
+        break;
       else
-	i++;
+        i++;
     millis = 60 * 60 * 1000 * Integer.parseInt(time.substring(0, i));
     if (i >= time.length())
       return millis;
@@ -1147,9 +1147,9 @@ public class ZoneInfo extends TimeZone
     int iprev = ++i;
     while (i < time.length())
       if (time.charAt(i) == ':')
-	break;
+        break;
       else
-	i++;
+        i++;
     millis += 60 * 1000 * Integer.parseInt(time.substring(iprev, i));
     if (i >= time.length())
       return millis;
diff --git a/libjava/classpath/gnu/java/util/jar/JarUtils.java b/libjava/classpath/gnu/java/util/jar/JarUtils.java
index 9debf647b66..aa2bc2ea877 100644
--- a/libjava/classpath/gnu/java/util/jar/JarUtils.java
+++ b/libjava/classpath/gnu/java/util/jar/JarUtils.java
@@ -73,7 +73,7 @@ public abstract class JarUtils
 
   /**
    * The original string representation of the manifest version attribute name.
-   */ 
+   */
   public static final String MANIFEST_VERSION = "Manifest-Version";
 
   /**
@@ -115,7 +115,7 @@ public abstract class JarUtils
       {
         String version = expectHeader(version_header, br);
         attr.putValue(SIGNATURE_VERSION, version);
-	// This may cause problems during VM bootstrap.
+        // This may cause problems during VM bootstrap.
         // if (! DEFAULT_SF_VERSION.equals(version))
         //  log.warning("Unexpected version number: " + version
         //              + ". Continue (but may fail later)");
@@ -382,20 +382,20 @@ public abstract class JarUtils
    * The basic method for writing Mainfest attributes. This
    * implementation respects the rule stated in the Jar Specification concerning
    * the maximum allowed line length; i.e.
-   * 
+   *
    * 
          * No line may be longer than 72 bytes (not characters), in its UTF8-encoded
    * form. If a value would make the initial line longer than this, it should
    * be continued on extra lines (each starting with a single SPACE).
    * 
      
-   * 
+   *
    * and
-   * 
+   *
    * 
          * Because header names cannot be continued, the maximum length of a header
    * name is 70 bytes (there must be a colon and a SPACE after the name).
    * 
      
-   * 
+   *
    * @param name the name of the attribute.
    * @param value the value of the attribute.
    * @param out the output stream to write the attribute's name/value pair to.
diff --git a/libjava/classpath/gnu/java/util/prefs/FileBasedFactory.java b/libjava/classpath/gnu/java/util/prefs/FileBasedFactory.java
index e5f24efa3a0..91ea861c40e 100644
--- a/libjava/classpath/gnu/java/util/prefs/FileBasedFactory.java
+++ b/libjava/classpath/gnu/java/util/prefs/FileBasedFactory.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/gnu/java/util/prefs/FileBasedPreferences.java b/libjava/classpath/gnu/java/util/prefs/FileBasedPreferences.java
index f7566dddddf..f89ed6be21e 100644
--- a/libjava/classpath/gnu/java/util/prefs/FileBasedPreferences.java
+++ b/libjava/classpath/gnu/java/util/prefs/FileBasedPreferences.java
@@ -57,7 +57,7 @@ import java.util.prefs.BackingStoreException;
  * beneath the user's home directory.  The preferences for the node are
  * stored in a single properties file in that directory.  Sub-nodes are
  * stored in subdirectories.  This implementation uses file locking to
- * mediate access to the properties files. 
+ * mediate access to the properties files.
  */
 public class FileBasedPreferences
     extends AbstractPreferences
@@ -217,7 +217,7 @@ public class FileBasedPreferences
           {
             // Write the underlying file.
             directory.mkdirs();
-            
+
             FileOutputStream fos = null;
             FileLock lock = null;
             try
diff --git a/libjava/classpath/gnu/java/util/prefs/GConfBasedFactory.java b/libjava/classpath/gnu/java/util/prefs/GConfBasedFactory.java
index ae734b60985..f5a189471de 100644
--- a/libjava/classpath/gnu/java/util/prefs/GConfBasedFactory.java
+++ b/libjava/classpath/gnu/java/util/prefs/GConfBasedFactory.java
@@ -43,7 +43,7 @@ import java.util.prefs.PreferencesFactory;
 /**
  * Factory object that generates a Preferences nodes that are read from a GConf
  * daemon.
- * 
+ *
  * @author Mario Torre 
  */
 public class GConfBasedFactory implements PreferencesFactory
@@ -58,7 +58,7 @@ public class GConfBasedFactory implements PreferencesFactory
 
   /**
    * Returns the system root preference node.
-   * 
+   *
    * @see java.util.prefs.PreferencesFactory#systemRoot()
    */
   public Preferences systemRoot()
@@ -68,7 +68,7 @@ public class GConfBasedFactory implements PreferencesFactory
 
   /**
    * Returns the user root preference node corresponding to the calling user.
-   * 
+   *
    * @see java.util.prefs.PreferencesFactory#userRoot()
    */
   public Preferences userRoot()
diff --git a/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java b/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java
index c26fe63c9b6..e3374eee984 100644
--- a/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java
+++ b/libjava/classpath/gnu/java/util/prefs/GConfBasedPreferences.java
@@ -54,22 +54,22 @@ import java.util.prefs.BackingStoreException;
  * 
      
  * User Root:
      
  * 
      
- * 
+ *
  * 
        * gnu.java.util.prefs.gconf.user_root
  * 
      
- * 
+ *
  * 
      
  * 
      
  * and System Root:
      
  * 
      
- * 
+ *
  * 
        * gnu.java.util.prefs.gconf.system_root
  * 
      
- * 
+ *
  * 
      
- * 
+ *
  * @author Mario Torre 
  */
 public class GConfBasedPreferences
@@ -115,7 +115,7 @@ public class GConfBasedPreferences
    * Creates a new preference node given a parent node and a name, which has to
    * be relative to its parent. When isUser is true it will be user
    * node otherwise it will be a system node.
-   * 
+   *
    * @param parent The parent node of this newly created node.
    * @param name A name relative to the parent node.
    * @param isUser Set to true initializes this node to be
@@ -142,7 +142,7 @@ public class GConfBasedPreferences
         absolutePath = absolutePath.substring(0, index + 1);
         absolutePath = absolutePath + GConfNativePeer.escapeString(name);
       }
-    
+
     this.node = this.getRealRoot(isUser) + absolutePath;
 
     boolean nodeExist = backend.nodeExist(this.node);
@@ -153,7 +153,7 @@ public class GConfBasedPreferences
   /**
    * Returns a child node with the given name.
    * If the child node does not exists, it will be created.
-   * 
+   *
    * @param name The name of the requested node.
    * @return A new reference to the node, creating the node if it is necessary.
    */
@@ -162,10 +162,10 @@ public class GConfBasedPreferences
     // we don't check anything here, if the node is a new node this will be
     // detected in the constructor, so we simply return a new reference to
     // the requested node.
-    
+
     GConfBasedPreferences preferenceNode
       = new GConfBasedPreferences(this, name, this.isUser);
-        
+
     return preferenceNode;
   }
 
@@ -173,7 +173,7 @@ public class GConfBasedPreferences
    * Returns an array of names of the children of this preference node.
    * If the current node does not have children, the returned array will be
    * of size 0 (that is, not null).
-   * 
+   *
    * @return A String array of names of children of the current
    * node.
    * @throws BackingStoreException if this operation cannot be completed.
@@ -192,7 +192,7 @@ public class GConfBasedPreferences
    * GConf handles this for us asynchronously. More over, both sync and flush
    * have the same meaning in this class, so calling sync has exactly the same
    * effect.
-   * 
+   *
    * @see #sync
    * @throws BackingStoreException if this operation cannot be completed.
    */
@@ -203,7 +203,7 @@ public class GConfBasedPreferences
 
   /**
    * Request a flush.
-   * 
+   *
    * @see #flush
    * @throws BackingStoreException if this operation cannot be completed.
    */
@@ -216,7 +216,7 @@ public class GConfBasedPreferences
    * Returns all of the key in this preference node.
    * If the current node does not have preferences, the returned array will be
    * of size zero.
-   * 
+   *
    * @return A String array of keys stored under the current
    * node.
    * @throws BackingStoreException if this operation cannot be completed.
@@ -233,7 +233,7 @@ public class GConfBasedPreferences
   /**
    * Does a recursive postorder traversal of the preference tree, starting from
    * the given directory invalidating every preference found in the node.
-   * 
+   *
    * @param directory The name of the starting directory (node)
    */
   private void postorderRemove(String directory)
@@ -271,7 +271,7 @@ public class GConfBasedPreferences
 
   /**
    * Stores the given key-value pair into this preference node.
-   * 
+   *
    * @param key The key of this preference.
    * @param value The value of this preference.
    */
@@ -293,7 +293,7 @@ public class GConfBasedPreferences
   /**
    * Removes the given key from this preference node.
    * If the key does not exist, no operation is performed.
-   * 
+   *
    * @param key The key to remove.
    */
   protected void removeSpi(String key)
@@ -305,7 +305,7 @@ public class GConfBasedPreferences
    * Suggest a sync to the backend. Actually, this is only a suggestion as GConf
    * handles this for us asynchronously. More over, both sync and flush have the
    * same meaning in this class, so calling flush has exactly the same effect.
-   * 
+   *
    * @see #flush
    * @throws BackingStoreException if this operation cannot be completed due to
    *           a failure in the backing store, or inability to communicate with
@@ -318,7 +318,7 @@ public class GConfBasedPreferences
 
   /**
    * Request a sync.
-   * 
+   *
    * @see #sync
    * @throws BackingStoreException if this operation cannot be completed due to
    *           a failure in the backing store, or inability to communicate with
@@ -333,7 +333,7 @@ public class GConfBasedPreferences
    * Returns the value of the given key.
    * If the keys does not have a value, or there is an error in the backing
    * store, null is returned instead.
-   * 
+   *
    * @param key The key to retrieve.
    * @return The value associated with the given key.
    */
@@ -345,7 +345,7 @@ public class GConfBasedPreferences
   /**
    * Returns true if this preference node is a user node,
    * false if is a system preference node.
-   * 
+   *
    * @return true if this preference node is a user node,
    * false if is a system preference node.
    */
@@ -360,18 +360,18 @@ public class GConfBasedPreferences
 
   /**
    * Builds a GConf key string suitable for operations on the backend.
-   * 
+   *
    * @param key The key to convert into a valid GConf key.
    * @return A valid Gconf key.
    */
   private String getGConfKey(String key)
   {
     String nodeName = "";
-    
+
     // strip key
     // please, note that all names are unescaped into the native peer
     key = GConfNativePeer.escapeString(key);
-    
+
     if (this.node.endsWith("/"))
       {
         nodeName = this.node + key;
@@ -380,13 +380,13 @@ public class GConfBasedPreferences
       {
         nodeName = this.node + "/" + key;
       }
-    
+
     return nodeName;
   }
 
   /**
    * Builds the root node to use for this preference.
-   * 
+   *
    * @param isUser Defines if this node is a user (true) or system
    * (false) node.
    * @return The real root of this preference tree.
diff --git a/libjava/classpath/gnu/java/util/prefs/MemoryBasedFactory.java b/libjava/classpath/gnu/java/util/prefs/MemoryBasedFactory.java
index 275b8796ec6..32ed12fc795 100644
--- a/libjava/classpath/gnu/java/util/prefs/MemoryBasedFactory.java
+++ b/libjava/classpath/gnu/java/util/prefs/MemoryBasedFactory.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/gnu/java/util/prefs/MemoryBasedPreferences.java b/libjava/classpath/gnu/java/util/prefs/MemoryBasedPreferences.java
index dc82379160b..ee184d182d3 100644
--- a/libjava/classpath/gnu/java/util/prefs/MemoryBasedPreferences.java
+++ b/libjava/classpath/gnu/java/util/prefs/MemoryBasedPreferences.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/gnu/java/util/prefs/NodeReader.java b/libjava/classpath/gnu/java/util/prefs/NodeReader.java
index ae5510e1c13..0a49fc777d7 100644
--- a/libjava/classpath/gnu/java/util/prefs/NodeReader.java
+++ b/libjava/classpath/gnu/java/util/prefs/NodeReader.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -128,7 +128,7 @@ public class NodeReader {
             readNodes(subnode);
             skipTill("");
         }
-        
+
     }
 
     private void readMap(Preferences node)
@@ -169,7 +169,7 @@ public class NodeReader {
         while(true) {
             if (line == null)
                 throw new InvalidPreferencesFormatException(s + " not found");
-            
+
             int index = line.indexOf(s);
             if (index == -1)  {
                 line = br.readLine();
@@ -199,7 +199,7 @@ public class NodeReader {
         while(true) {
             if (line == null)
                 throw new InvalidPreferencesFormatException("unexpected EOF");
-            
+
             int start = line.indexOf("<");
             if (start == -1)  {
                 line = br.readLine();
diff --git a/libjava/classpath/gnu/java/util/prefs/NodeWriter.java b/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
index d3c09535147..3e4f972edc6 100644
--- a/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
+++ b/libjava/classpath/gnu/java/util/prefs/NodeWriter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -271,7 +271,7 @@ public class NodeWriter {
         }
     }
 
-    private void writeMap(Preferences node, int indent) 
+    private void writeMap(Preferences node, int indent)
                                     throws BackingStoreException, IOException
     {
         // construct String used for indentation
diff --git a/libjava/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java b/libjava/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java
index 3c029195989..64fc0498aaf 100644
--- a/libjava/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java
+++ b/libjava/classpath/gnu/java/util/prefs/gconf/GConfNativePeer.java
@@ -43,7 +43,7 @@ import java.util.prefs.BackingStoreException;
 
 /**
  * Native peer for GConf based preference backend.
- * 
+ *
  * @author Mario Torre 
  */
 public final class GConfNativePeer
@@ -59,7 +59,7 @@ public final class GConfNativePeer
   /**
    * Queries whether the node node exists in theGConf database.
    * Returns true or false.
-   * 
+   *
    * @param node the node to check.
    */
   public boolean nodeExist(String node)
@@ -72,7 +72,7 @@ public final class GConfNativePeer
    * exist before (ie it was unset or it only had a default value).
    * Key names must be valid GConf key names, that is, there can be more
    * restrictions than for normal Preference Backend.
-   * 
+   *
    * @param key the key to alter (or add).
    * @param value the new value for this key.
    * @return true if the key was updated, false otherwise.
@@ -86,7 +86,7 @@ public final class GConfNativePeer
    * Unsets the value of key; if key is already unset, has no effect. Depending
    * on the GConf daemon, unsetting a key may have the side effect to remove it
    * completely form the database.
-   * 
+   *
    * @param key the key to unset.
    * @return true on success, false if the key was not updated.
    */
@@ -97,7 +97,7 @@ public final class GConfNativePeer
 
   /**
    * Gets the value of a configuration key.
-   * 
+   *
    * @param key the configuration key.
    * @return the values of this key, null if the key is not valid.
    */
@@ -110,7 +110,7 @@ public final class GConfNativePeer
    * Lists the key in the given node. Does not list subnodes. Keys names are the
    * stripped names (name relative to the current node) of the keys stored in
    * this node.
-   * 
+   *
    * @param node the node where keys are stored.
    * @return a java.util.List of keys. If there are no keys in the given node, a
    *         list of size 0 is returned.
@@ -123,7 +123,7 @@ public final class GConfNativePeer
   /**
    * Lists the subnodes in node. The returned list contains
    * allocated strings. Each string is the name relative tho the given node.
-   * 
+   *
    * @param node the node to get subnodes from. If there are no subnodes in the
    *          given node, a list of size 0 is returned.
    */
@@ -139,7 +139,7 @@ public final class GConfNativePeer
   {
     return gconf_escape_key(plain);
   }
-  
+
   /**
    * Unescape a string escaped with {@link #escapeString}.
    */
@@ -147,7 +147,7 @@ public final class GConfNativePeer
   {
     return gconf_unescape_key(escaped);
   }
-  
+
   /**
    * Suggest to the backend GConf daemon to synch with the database.
    */
@@ -155,7 +155,7 @@ public final class GConfNativePeer
   {
     gconf_suggest_sync();
   }
-  
+
   protected void finalize() throws Throwable
   {
     try
@@ -181,7 +181,7 @@ public final class GConfNativePeer
    * It is meant to be used by the static initializer.
    */
   native synchronized static final private void init_id_cache();
-  
+
   /**
    * Initialize the GConf native peer. This is meant to be used by the
    * class constructor.
@@ -196,7 +196,7 @@ public final class GConfNativePeer
   /**
    * Queries the GConf database to see if the given node exists, returning
    * true if the node exist, false otherwise.
-   * 
+   *
    * @param node the node to query for existence.
    * @return true if the node exist, false otherwise.
    */
@@ -206,7 +206,7 @@ public final class GConfNativePeer
   /**
    * Sets the given key/value pair into the GConf database.
    * The key must be a valid GConf key.
-   * 
+   *
    * @param key the key to store in the GConf database
    * @param value the value to associate to the given key.
    * @return true if the change has effect, false otherwise.
@@ -217,7 +217,7 @@ public final class GConfNativePeer
   /**
    * Returns the key associated to the given key. Null is returned if the
    * key is not valid.
-   * 
+   *
    * @param key the key to return the value of.
    * @return The value associated to the given key, or null.
    */
@@ -226,7 +226,7 @@ public final class GConfNativePeer
 
   /**
    * Usets the given key, removing the key from the database.
-   * 
+   *
    * @param key the key to remove.
    * @return true if the operation success, false otherwise.
    */
@@ -238,46 +238,46 @@ public final class GConfNativePeer
    */
   native synchronized static final protected void gconf_suggest_sync()
     throws BackingStoreException;
-  
+
   /**
    * Returns a list of all nodes under the given node.
-   * 
+   *
    * @param node the source node.
    * @return A list of nodes under the given source node.
    */
   native
   static synchronized final protected List gconf_all_nodes(String node)
     throws BackingStoreException;
-  
+
   /**
    * Returns a list of all keys stored in the given node.
-   * 
+   *
    * @param node the source node.
    * @return A list of all keys stored in the given node.
    */
-  native synchronized 
+  native synchronized
   static final protected List gconf_all_keys(String node)
     throws BackingStoreException;
 
   /**
    * Escape the input String so that it's a valid element for GConf.
-   * 
+   *
    * @param plain the String to escape.
    * @return An escaped String for use with GConf.
    */
-  native synchronized 
+  native synchronized
   static final protected String gconf_escape_key(String plain);
-  
+
   /**
    * Converts a string escaped with gconf_escape_key back into its
    * original form.
-   * 
-   * @param escaped key as returned by gconf_escape_key 
+   *
+   * @param escaped key as returned by gconf_escape_key
    * @return An unescaped key.
    */
-  native synchronized 
+  native synchronized
   static final protected String gconf_unescape_key(String escaped);
-  
+
   static
     {
       System.loadLibrary("gconfpeer");
diff --git a/libjava/classpath/gnu/java/util/regex/BacktrackStack.java b/libjava/classpath/gnu/java/util/regex/BacktrackStack.java
index 68472615e6a..b03fb87072f 100644
--- a/libjava/classpath/gnu/java/util/regex/BacktrackStack.java
+++ b/libjava/classpath/gnu/java/util/regex/BacktrackStack.java
@@ -50,16 +50,16 @@ final class BacktrackStack
     /** A set of data to be used for backtracking. */
   static class Backtrack
   {
-	/** REToken to which to go back */
+        /** REToken to which to go back */
     REToken token;
-	/** CharIndexed on which matches are being searched for. */
+        /** CharIndexed on which matches are being searched for. */
     CharIndexed input;
-	/** REMatch to be used by the REToken token. */
+        /** REMatch to be used by the REToken token. */
     REMatch match;
-	/** Some parameter used by the token's backtrack method. */
+        /** Some parameter used by the token's backtrack method. */
     Object param;
       Backtrack (REToken token, CharIndexed input, REMatch match,
-		 Object param)
+                 Object param)
     {
       this.token = token;
       this.input = input;
@@ -104,7 +104,7 @@ final class BacktrackStack
   {
     for (int i = 0; i < size; i++)
       {
-	stack[i] = null;
+        stack[i] = null;
       }
     size = 0;
   }
@@ -113,10 +113,10 @@ final class BacktrackStack
   {
     if (size >= capacity)
       {
-	capacity += CAPACITY_INCREMENT;
-	Backtrack[]newStack = new Backtrack[capacity];
-	System.arraycopy (stack, 0, newStack, 0, size);
-	stack = newStack;
+        capacity += CAPACITY_INCREMENT;
+        Backtrack[]newStack = new Backtrack[capacity];
+        System.arraycopy (stack, 0, newStack, 0, size);
+        stack = newStack;
       }
     stack[size++] = bt;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/CharIndexed.java b/libjava/classpath/gnu/java/util/regex/CharIndexed.java
index 070547d7feb..de4b1667f24 100644
--- a/libjava/classpath/gnu/java/util/regex/CharIndexed.java
+++ b/libjava/classpath/gnu/java/util/regex/CharIndexed.java
@@ -82,7 +82,7 @@ public interface CharIndexed
      * true if the new cursor position is valid or cursor position is at
      * the end of input.
      */
-  boolean move1 (int index);	// I cannot think of a better name for this.
+  boolean move1 (int index);    // I cannot think of a better name for this.
 
     /**
      * Returns true if the most recent move() operation placed the cursor
diff --git a/libjava/classpath/gnu/java/util/regex/CharIndexedInputStream.java b/libjava/classpath/gnu/java/util/regex/CharIndexedInputStream.java
index e42710b5de1..d6340298a3e 100644
--- a/libjava/classpath/gnu/java/util/regex/CharIndexedInputStream.java
+++ b/libjava/classpath/gnu/java/util/regex/CharIndexedInputStream.java
@@ -45,7 +45,7 @@ import java.io.InputStream;
 class CharIndexedInputStream implements CharIndexed
 {
   private static final int BUFFER_INCREMENT = 1024;
-  private static final int UNKNOWN = Integer.MAX_VALUE;	// value for end
+  private static final int UNKNOWN = Integer.MAX_VALUE; // value for end
 
   private BufferedInputStream br;
 
@@ -78,22 +78,22 @@ class CharIndexedInputStream implements CharIndexed
   {
     if (end == 1)
       return false;
-    end--;			// closer to end
+    end--;                      // closer to end
 
     try
     {
       if (index != -1)
-	{
-	  br.reset ();
-	}
+        {
+          br.reset ();
+        }
       int i = br.read ();
       br.mark (bufsize);
       if (i == -1)
-	{
-	  end = 1;
-	  cached = OUT_OF_BOUNDS;
-	  return false;
-	}
+        {
+          end = 1;
+          cached = OUT_OF_BOUNDS;
+          return false;
+        }
       cached = (char) i;
       index = 1;
     } catch (IOException e)
@@ -109,62 +109,62 @@ class CharIndexedInputStream implements CharIndexed
   {
     if (index == 0)
       {
-	return cached;
+        return cached;
       }
     else if (index >= end)
       {
-	return OUT_OF_BOUNDS;
+        return OUT_OF_BOUNDS;
       }
     else if (index == -1)
       {
-	return lookBehind[0];
+        return lookBehind[0];
       }
     else if (index == -2)
       {
-	return lookBehind[1];
+        return lookBehind[1];
       }
     else if (index < -2)
       {
-	return OUT_OF_BOUNDS;
+        return OUT_OF_BOUNDS;
       }
     else if (index >= bufsize)
       {
-	// Allocate more space in the buffer.
-	try
-	{
-	  while (bufsize <= index)
-	    bufsize += BUFFER_INCREMENT;
-	  br.reset ();
-	  br.mark (bufsize);
-	  br.skip (index - 1);
-	}
-	catch (IOException e)
-	{
-	}
+        // Allocate more space in the buffer.
+        try
+        {
+          while (bufsize <= index)
+            bufsize += BUFFER_INCREMENT;
+          br.reset ();
+          br.mark (bufsize);
+          br.skip (index - 1);
+        }
+        catch (IOException e)
+        {
+        }
       }
     else if (this.index != index)
       {
-	try
-	{
-	  br.reset ();
-	  br.skip (index - 1);
-	}
-	catch (IOException e)
-	{
-	}
+        try
+        {
+          br.reset ();
+          br.skip (index - 1);
+        }
+        catch (IOException e)
+        {
+        }
       }
     char ch = OUT_OF_BOUNDS;
 
     try
     {
       int i = br.read ();
-      this.index = index + 1;	// this.index is index of next pos relative to charAt(0)
+      this.index = index + 1;   // this.index is index of next pos relative to charAt(0)
       if (i == -1)
-	{
-	  // set flag that next should fail next time?
-	  end = index;
-	  return ch;
-	}
+        {
+          // set flag that next should fail next time?
+          end = index;
+          return ch;
+        }
       ch = (char) i;
     } catch (IOException ie)
     {
diff --git a/libjava/classpath/gnu/java/util/regex/RE.java b/libjava/classpath/gnu/java/util/regex/RE.java
index d064f7a3579..5e9974a4928 100644
--- a/libjava/classpath/gnu/java/util/regex/RE.java
+++ b/libjava/classpath/gnu/java/util/regex/RE.java
@@ -53,7 +53,7 @@ import java.util.ResourceBundle;
  * expressions.
  * 
      
  * A regular expression object (class RE) is compiled by constructing it
- * from a String, StringBuffer or character array, with optional 
+ * from a String, StringBuffer or character array, with optional
  * compilation flags (below)
  * and an optional syntax specification (see RESyntax; if not specified,
  * RESyntax.RE_SYNTAX_PERL5 is used).
@@ -110,7 +110,7 @@ import java.util.ResourceBundle;
  * 
      
  * You can optionally affect the execution environment by using a
  * combination of execution flags (constants listed below).
- * 
+ *
  * 
      
  * All operations on a regular expression are performed in a
  * thread-safe manner.
@@ -281,7 +281,7 @@ public class RE extends REToken
   {
     if (messages == null)
       messages =
-	PropertyResourceBundle.getBundle (bundle, Locale.getDefault ());
+        PropertyResourceBundle.getBundle (bundle, Locale.getDefault ());
     return messages.getString (key);
   }
 
@@ -335,7 +335,7 @@ public class RE extends REToken
 
   // internal constructor used for alternation
   private RE (REToken first, REToken last, int subs, int subIndex,
-	      int minLength, int maxLength)
+              int minLength, int maxLength)
   {
     super (subIndex);
     firstToken = first;
@@ -347,9 +347,9 @@ public class RE extends REToken
   }
 
   private RE (Object patternObj, int cflags, RESyntax syntax, int myIndex,
-	      int nextSub) throws REException
+              int nextSub) throws REException
   {
-    super (myIndex);		// Subexpression index of this token.
+    super (myIndex);            // Subexpression index of this token.
     initialize (patternObj, cflags, syntax, myIndex, nextSub);
   }
 
@@ -361,41 +361,41 @@ public class RE extends REToken
 
   // The meat of construction
   protected void initialize (Object patternObj, int cflags, RESyntax syntax,
-			     int myIndex, int nextSub) throws REException
+                             int myIndex, int nextSub) throws REException
   {
     char[] pattern;
     if (patternObj instanceof String)
       {
-	pattern = ((String) patternObj).toCharArray ();
+        pattern = ((String) patternObj).toCharArray ();
       }
     else if (patternObj instanceof char[])
       {
-	pattern = (char[]) patternObj;
+        pattern = (char[]) patternObj;
       }
     else if (patternObj instanceof StringBuffer)
       {
-	pattern = new char[((StringBuffer) patternObj).length ()];
-	((StringBuffer) patternObj).getChars (0, pattern.length, pattern, 0);
+        pattern = new char[((StringBuffer) patternObj).length ()];
+        ((StringBuffer) patternObj).getChars (0, pattern.length, pattern, 0);
       }
     else if (patternObj instanceof StringBuilder)
       {
-	pattern = new char[((StringBuilder) patternObj).length ()];
-	((StringBuilder) patternObj).getChars (0, pattern.length, pattern, 0);
+        pattern = new char[((StringBuilder) patternObj).length ()];
+        ((StringBuilder) patternObj).getChars (0, pattern.length, pattern, 0);
       }
     else if (patternObj instanceof CPStringBuilder)
       {
-	pattern = new char[((CPStringBuilder) patternObj).length ()];
-	((CPStringBuilder) patternObj).getChars (0, pattern.length, pattern,
-						 0);
+        pattern = new char[((CPStringBuilder) patternObj).length ()];
+        ((CPStringBuilder) patternObj).getChars (0, pattern.length, pattern,
+                                                 0);
       }
     else
       {
-	pattern = patternObj.toString ().toCharArray ();
+        pattern = patternObj.toString ().toCharArray ();
       }
 
     int pLength = pattern.length;
 
-    numSubs = 0;		// Number of subexpressions in this token.
+    numSubs = 0;                // Number of subexpressions in this token.
     ArrayList < REToken > branches = null;
 
     // linked list of tokens (sort of -- some closed loops can exist)
@@ -429,956 +429,956 @@ public class RE extends REToken
 
     while (index < pLength)
       {
-	// read the next character unit (including backslash escapes)
-	index = getCharUnit (pattern, index, unit, quot);
-
-	if (unit.bk)
-	  if (unit.ch == 'Q')
-	    {
-	      quot = true;
-	      continue;
-	    }
-	  else if (unit.ch == 'E')
-	    {
-	      quot = false;
-	      continue;
-	    }
-	if (quot)
-	  unit.bk = false;
-
-	if (((cflags & REG_X_COMMENTS) > 0) && (!unit.bk) && (!quot))
-	  {
-	    if (Character.isWhitespace (unit.ch))
-	      {
-		continue;
-	      }
-	    if (unit.ch == '#')
-	      {
-		for (int i = index; i < pLength; i++)
-		  {
-		    if (pattern[i] == '\n')
-		      {
-			index = i + 1;
-			continue;
-		      }
-		    else if (pattern[i] == '\r')
-		      {
-			if (i + 1 < pLength && pattern[i + 1] == '\n')
-			  {
-			    index = i + 2;
-			  }
-			else
-			  {
-			    index = i + 1;
-			  }
-			continue;
-		      }
-		  }
-		index = pLength;
-		continue;
-	      }
-	  }
-
-	// ALTERNATION OPERATOR
-	//  \| or | (if RE_NO_BK_VBAR) or newline (if RE_NEWLINE_ALT)
-	//  not available if RE_LIMITED_OPS is set
-
-	// TODO: the '\n' literal here should be a test against REToken.newline,
-	// which unfortunately may be more than a single character.
-	if (((unit.ch == '|'
-	      && (syntax.get (RESyntax.RE_NO_BK_VBAR) ^ (unit.bk || quot)))
-	     || (syntax.get (RESyntax.RE_NEWLINE_ALT) && (unit.ch == '\n')
-		 && !(unit.bk || quot)))
-	    && !syntax.get (RESyntax.RE_LIMITED_OPS))
-	  {
-	    // make everything up to here be a branch. create vector if nec.
-	    addToken (currentToken);
-	    RE theBranch =
-	      new RE (firstToken, lastToken, numSubs, subIndex, minimumLength,
-		      maximumLength);
-	    minimumLength = 0;
-	    maximumLength = 0;
-	    if (branches == null)
-	      {
-		branches = new ArrayList < REToken > ();
-	      }
-	    branches.add (theBranch);
-	    firstToken = lastToken = currentToken = null;
-	  }
-
-	// INTERVAL OPERATOR:
-	//  {x} | {x,} | {x,y}  (RE_INTERVALS && RE_NO_BK_BRACES)
-	//  \{x\} | \{x,\} | \{x,y\} (RE_INTERVALS && !RE_NO_BK_BRACES)
-	//
-	// OPEN QUESTION: 
-	//  what is proper interpretation of '{' at start of string?
-	//
-	// This method used to check "repeat.empty.token" to avoid such regexp
-	// as "(a*){2,}", but now "repeat.empty.token" is allowed.
-
-	else if ((unit.ch == '{') && syntax.get (RESyntax.RE_INTERVALS)
-		 && (syntax.
-		     get (RESyntax.RE_NO_BK_BRACES) ^ (unit.bk || quot)))
-	  {
-	    int newIndex = getMinMax (pattern, index, minMax, syntax);
-	    if (newIndex > index)
-	      {
-		if (minMax.first > minMax.second)
-		  throw new
-		    REException (getLocalizedMessage ("interval.order"),
-				 REException.REG_BADRPT, newIndex);
-		if (currentToken == null)
-		  throw new
-		    REException (getLocalizedMessage ("repeat.no.token"),
-				 REException.REG_BADRPT, newIndex);
-		if (currentToken instanceof RETokenRepeated)
-		  throw new
-		    REException (getLocalizedMessage ("repeat.chained"),
-				 REException.REG_BADRPT, newIndex);
-		if (currentToken instanceof RETokenWordBoundary
-		    || currentToken instanceof RETokenWordBoundary)
-		  throw new
-		    REException (getLocalizedMessage ("repeat.assertion"),
-				 REException.REG_BADRPT, newIndex);
-		index = newIndex;
-		currentToken =
-		  setRepeated (currentToken, minMax.first, minMax.second,
-			       index);
-	      }
-	    else
-	      {
-		addToken (currentToken);
-		currentToken = new RETokenChar (subIndex, unit.ch, insens);
-		if (insensUSASCII)
-		  currentToken.unicodeAware = false;
-	      }
-	  }
-
-	// LIST OPERATOR:
-	//  [...] | [^...]
-
-	else if ((unit.ch == '[') && !(unit.bk || quot))
-	  {
-	    // Create a new RETokenOneOf
-	    ParseCharClassResult result =
-	      parseCharClass (subIndex, pattern, index, pLength, cflags,
-			      syntax, 0);
-	    addToken (currentToken);
-	    currentToken = result.token;
-	    index = result.index;
-	  }
-
-	// SUBEXPRESSIONS
-	//  (...) | \(...\) depending on RE_NO_BK_PARENS
-
-	else if ((unit.ch == '(')
-		 && (syntax.
-		     get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk || quot)))
-	  {
-	    boolean pure = false;
-	    boolean comment = false;
-	    boolean lookAhead = false;
-	    boolean lookBehind = false;
-	    boolean independent = false;
-	    boolean negativelh = false;
-	    boolean negativelb = false;
-	    if ((index + 1 < pLength) && (pattern[index] == '?'))
-	      {
-		switch (pattern[index + 1])
-		  {
-		  case '!':
-		    if (syntax.get (RESyntax.RE_LOOKAHEAD))
-		      {
-			pure = true;
-			negativelh = true;
-			lookAhead = true;
-			index += 2;
-		      }
-		    break;
-		  case '=':
-		    if (syntax.get (RESyntax.RE_LOOKAHEAD))
-		      {
-			pure = true;
-			lookAhead = true;
-			index += 2;
-		      }
-		    break;
-		  case '<':
-		    // We assume that if the syntax supports look-ahead,
-		    // it also supports look-behind.
-		    if (syntax.get (RESyntax.RE_LOOKAHEAD))
-		      {
-			index++;
-			switch (pattern[index + 1])
-			  {
-			  case '!':
-			    pure = true;
-			    negativelb = true;
-			    lookBehind = true;
-			    index += 2;
-			    break;
-			  case '=':
-			    pure = true;
-			    lookBehind = true;
-			    index += 2;
-			  }
-		      }
-		    break;
-		  case '>':
-		    // We assume that if the syntax supports look-ahead,
-		    // it also supports independent group.
-		    if (syntax.get (RESyntax.RE_LOOKAHEAD))
-		      {
-			pure = true;
-			independent = true;
-			index += 2;
-		      }
-		    break;
-		  case 'i':
-		  case 'd':
-		  case 'm':
-		  case 's':
-		  case 'u':
-		  case 'x':
-		  case '-':
-		    if (!syntax.get (RESyntax.RE_EMBEDDED_FLAGS))
-		      break;
-		    // Set or reset syntax flags.
-		    int flagIndex = index + 1;
-		    int endFlag = -1;
-		    RESyntax newSyntax = new RESyntax (syntax);
-		    int newCflags = cflags;
-		    boolean negate = false;
-		    while (flagIndex < pLength && endFlag < 0)
-		      {
-			switch (pattern[flagIndex])
-			  {
-			  case 'i':
-			    if (negate)
-			      newCflags &= ~REG_ICASE;
-			    else
-			      newCflags |= REG_ICASE;
-			    flagIndex++;
-			    break;
-			  case 'd':
-			    if (negate)
-			      newSyntax.setLineSeparator (RESyntax.
-							  DEFAULT_LINE_SEPARATOR);
-			    else
-			      newSyntax.setLineSeparator ("\n");
-			    flagIndex++;
-			    break;
-			  case 'm':
-			    if (negate)
-			      newCflags &= ~REG_MULTILINE;
-			    else
-			      newCflags |= REG_MULTILINE;
-			    flagIndex++;
-			    break;
-			  case 's':
-			    if (negate)
-			      newCflags &= ~REG_DOT_NEWLINE;
-			    else
-			      newCflags |= REG_DOT_NEWLINE;
-			    flagIndex++;
-			    break;
-			  case 'u':
-			    if (negate)
-			      newCflags |= REG_ICASE_USASCII;
-			    else
-			      newCflags &= ~REG_ICASE_USASCII;
-			    flagIndex++;
-			    break;
-			  case 'x':
-			    if (negate)
-			      newCflags &= ~REG_X_COMMENTS;
-			    else
-			      newCflags |= REG_X_COMMENTS;
-			    flagIndex++;
-			    break;
-			  case '-':
-			    negate = true;
-			    flagIndex++;
-			    break;
-			  case ':':
-			  case ')':
-			    endFlag = pattern[flagIndex];
-			    break;
-			  default:
-			    throw new
-			      REException (getLocalizedMessage
-					   ("repeat.no.token"),
-					   REException.REG_BADRPT, index);
-			  }
-		      }
-		    if (endFlag == ')')
-		      {
-			syntax = newSyntax;
-			cflags = newCflags;
-			insens = ((cflags & REG_ICASE) > 0);
-			insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
-			// This can be treated as though it were a comment.
-			comment = true;
-			index = flagIndex - 1;
-			break;
-		      }
-		    if (endFlag == ':')
-		      {
-			savedSyntax = syntax;
-			savedCflags = cflags;
-			flagsSaved = true;
-			syntax = newSyntax;
-			cflags = newCflags;
-			insens = ((cflags & REG_ICASE) > 0);
-			insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
-			index = flagIndex - 1;
-			// Fall through to the next case.
-		      }
-		    else
-		      {
-			throw new
-			  REException (getLocalizedMessage
-				       ("unmatched.paren"),
-				       REException.REG_ESUBREG, index);
-		      }
-		  case ':':
-		    if (syntax.get (RESyntax.RE_PURE_GROUPING))
-		      {
-			pure = true;
-			index += 2;
-		      }
-		    break;
-		  case '#':
-		    if (syntax.get (RESyntax.RE_COMMENTS))
-		      {
-			comment = true;
-		      }
-		    break;
-		  default:
-		    throw new
-		      REException (getLocalizedMessage ("repeat.no.token"),
-				   REException.REG_BADRPT, index);
-		  }
-	      }
-
-	    if (index >= pLength)
-	      {
-		throw new
-		  REException (getLocalizedMessage ("unmatched.paren"),
-			       REException.REG_ESUBREG, index);
-	      }
-
-	    // find end of subexpression
-	    int endIndex = index;
-	    int nextIndex = index;
-	    int nested = 0;
-
-	    while (((nextIndex =
-		     getCharUnit (pattern, endIndex, unit, false)) > 0)
-		   && !(nested == 0 && (unit.ch == ')')
-			&& (syntax.
-			    get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
-							      || quot))))
-	      {
-		if ((endIndex = nextIndex) >= pLength)
-		  throw new
-		    REException (getLocalizedMessage ("subexpr.no.end"),
-				 REException.REG_ESUBREG, nextIndex);
-		else
-	      if ((unit.ch == '[') && !(unit.bk || quot))
-		{
-		  // I hate to do something similar to the LIST OPERATOR matters
-		  // above, but ...
-		  int listIndex = nextIndex;
-		  if (listIndex < pLength && pattern[listIndex] == '^')
-		    listIndex++;
-		  if (listIndex < pLength && pattern[listIndex] == ']')
-		    listIndex++;
-		  int listEndIndex = -1;
-		  int listNest = 0;
-		  while (listIndex < pLength && listEndIndex < 0)
-		    {
-		      switch (pattern[listIndex++])
-			{
-			case '\\':
-			  listIndex++;
-			  break;
-			case '[':
-			  // Sun's API document says that regexp like "[a-d[m-p]]"
-			  // is legal. Even something like "[[[^]]]]" is accepted.
-			  listNest++;
-			  if (listIndex < pLength
-			      && pattern[listIndex] == '^')
-			    listIndex++;
-			  if (listIndex < pLength
-			      && pattern[listIndex] == ']')
-			    listIndex++;
-			  break;
-			case ']':
-			  if (listNest == 0)
-			    listEndIndex = listIndex;
-			  listNest--;
-			  break;
-			}
-		    }
-		  if (listEndIndex >= 0)
-		    {
-		      nextIndex = listEndIndex;
-		      if ((endIndex = nextIndex) >= pLength)
-			throw new
-			  REException (getLocalizedMessage ("subexpr.no.end"),
-				       REException.REG_ESUBREG, nextIndex);
-		      else
-		      continue;
-		    }
-		  throw new
-		    REException (getLocalizedMessage ("subexpr.no.end"),
-				 REException.REG_ESUBREG, nextIndex);
-		}
-	      else if (unit.ch == '('
-		       && (syntax.
-			   get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
-							     || quot)))
-		nested++;
-	      else if (unit.ch == ')'
-		       && (syntax.
-			   get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
-							     || quot)))
-		nested--;
-	      }
-
-	    // endIndex is now position at a ')','\)' 
-	    // nextIndex is end of string or position after ')' or '\)'
-
-	    if (comment)
-	      index = nextIndex;
-	    else
-	      {			// not a comment
-		// create RE subexpression as token.
-		addToken (currentToken);
-		if (!pure)
-		  {
-		    numSubs++;
-		  }
-
-		int useIndex = (pure || lookAhead || lookBehind
-				|| independent) ? 0 : nextSub + numSubs;
-		currentToken =
-		  new RE (String.valueOf (pattern, index, endIndex - index).
-			  toCharArray (), cflags, syntax, useIndex,
-			  nextSub + numSubs);
-		numSubs += ((RE) currentToken).getNumSubs ();
-
-		if (lookAhead)
-		  {
-		    currentToken =
-		      new RETokenLookAhead (currentToken, negativelh);
-		  }
-		else if (lookBehind)
-		  {
-		    currentToken =
-		      new RETokenLookBehind (currentToken, negativelb);
-		  }
-		else if (independent)
-		  {
-		    currentToken = new RETokenIndependent (currentToken);
-		  }
-
-		index = nextIndex;
-		if (flagsSaved)
-		  {
-		    syntax = savedSyntax;
-		    cflags = savedCflags;
-		    insens = ((cflags & REG_ICASE) > 0);
-		    insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
-		    flagsSaved = false;
-		  }
-	      }			// not a comment
-	  }			// subexpression
-
-	// UNMATCHED RIGHT PAREN
-	// ) or \) throw exception if
-	// !syntax.get(RESyntax.RE_UNMATCHED_RIGHT_PAREN_ORD)
-	else if (!syntax.get (RESyntax.RE_UNMATCHED_RIGHT_PAREN_ORD)
-		 && ((unit.ch == ')')
-		     && (syntax.
-			 get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk || quot))))
-	  {
-	    throw new REException (getLocalizedMessage ("unmatched.paren"),
-				   REException.REG_EPAREN, index);
-	  }
-
-	// START OF LINE OPERATOR
-	//  ^
-
-	else if ((unit.ch == '^') && !(unit.bk || quot))
-	  {
-	    addToken (currentToken);
-	    currentToken = null;
-	    RETokenStart token = null;
-	    if ((cflags & REG_MULTILINE) > 0)
-	      {
-		String sep = syntax.getLineSeparator ();
-		if (sep == null)
-		  {
-		    token = new RETokenStart (subIndex, null, true);
-		  }
-		else
-		  {
-		    token = new RETokenStart (subIndex, sep);
-		  }
-	      }
-	    else
-	      {
-		token = new RETokenStart (subIndex, null);
-	      }
-	    addToken (token);
-	  }
-
-	// END OF LINE OPERATOR
-	//  $
-
-	else if ((unit.ch == '$') && !(unit.bk || quot))
-	  {
-	    addToken (currentToken);
-	    currentToken = null;
-	    RETokenEnd token = null;
-	    if ((cflags & REG_MULTILINE) > 0)
-	      {
-		String sep = syntax.getLineSeparator ();
-		if (sep == null)
-		  {
-		    token = new RETokenEnd (subIndex, null, true);
-		  }
-		else
-		  {
-		    token = new RETokenEnd (subIndex, sep);
-		  }
-	      }
-	    else
-	      {
-		token = new RETokenEnd (subIndex, null);
-	      }
-	    addToken (token);
-	  }
-
-	// MATCH-ANY-CHARACTER OPERATOR (except possibly newline and null)
-	//  .
-
-	else if ((unit.ch == '.') && !(unit.bk || quot))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenAny (subIndex, syntax.get (RESyntax.RE_DOT_NEWLINE)
-			      || ((cflags & REG_DOT_NEWLINE) > 0),
-			      syntax.get (RESyntax.RE_DOT_NOT_NULL));
-	  }
-
-	// ZERO-OR-MORE REPEAT OPERATOR
-	//  *
-	//
-	// This method used to check "repeat.empty.token" to avoid such regexp
-	// as "(a*)*", but now "repeat.empty.token" is allowed.
-
-	else if ((unit.ch == '*') && !(unit.bk || quot))
-	  {
-	    if (currentToken == null)
-	      throw new REException (getLocalizedMessage ("repeat.no.token"),
-				     REException.REG_BADRPT, index);
-	    if (currentToken instanceof RETokenRepeated)
-	      throw new REException (getLocalizedMessage ("repeat.chained"),
-				     REException.REG_BADRPT, index);
-	    if (currentToken instanceof RETokenWordBoundary
-		|| currentToken instanceof RETokenWordBoundary)
-	      throw new REException (getLocalizedMessage ("repeat.assertion"),
-				     REException.REG_BADRPT, index);
-	    currentToken =
-	      setRepeated (currentToken, 0, Integer.MAX_VALUE, index);
-	  }
-
-	// ONE-OR-MORE REPEAT OPERATOR / POSSESSIVE MATCHING OPERATOR
-	//  + | \+ depending on RE_BK_PLUS_QM
-	//  not available if RE_LIMITED_OPS is set
-	//
-	// This method used to check "repeat.empty.token" to avoid such regexp
-	// as "(a*)+", but now "repeat.empty.token" is allowed.
-
-	else if ((unit.ch == '+') && !syntax.get (RESyntax.RE_LIMITED_OPS)
-		 && (!syntax.
-		     get (RESyntax.RE_BK_PLUS_QM) ^ (unit.bk || quot)))
-	  {
-	    if (currentToken == null)
-	      throw new REException (getLocalizedMessage ("repeat.no.token"),
-				     REException.REG_BADRPT, index);
-
-	    // Check for possessive matching on RETokenRepeated
-	    if (currentToken instanceof RETokenRepeated)
-	      {
-		RETokenRepeated tokenRep = (RETokenRepeated) currentToken;
-		if (syntax.get (RESyntax.RE_POSSESSIVE_OPS)
-		    && !tokenRep.isPossessive () && !tokenRep.isStingy ())
-		  tokenRep.makePossessive ();
-		else
-		  throw new
-		    REException (getLocalizedMessage ("repeat.chained"),
-				 REException.REG_BADRPT, index);
-
-	      }
-	    else if (currentToken instanceof RETokenWordBoundary
-		     || currentToken instanceof RETokenWordBoundary)
-	      throw new REException (getLocalizedMessage ("repeat.assertion"),
-				     REException.REG_BADRPT, index);
-	    else
-	    currentToken =
-	      setRepeated (currentToken, 1, Integer.MAX_VALUE, index);
-	  }
-
-	// ZERO-OR-ONE REPEAT OPERATOR / STINGY MATCHING OPERATOR
-	//  ? | \? depending on RE_BK_PLUS_QM
-	//  not available if RE_LIMITED_OPS is set
-	//  stingy matching if RE_STINGY_OPS is set and it follows a quantifier
-
-	else if ((unit.ch == '?') && !syntax.get (RESyntax.RE_LIMITED_OPS)
-		 && (!syntax.
-		     get (RESyntax.RE_BK_PLUS_QM) ^ (unit.bk || quot)))
-	  {
-	    if (currentToken == null)
-	      throw new REException (getLocalizedMessage ("repeat.no.token"),
-				     REException.REG_BADRPT, index);
-
-	    // Check for stingy matching on RETokenRepeated
-	    if (currentToken instanceof RETokenRepeated)
-	      {
-		RETokenRepeated tokenRep = (RETokenRepeated) currentToken;
-		if (syntax.get (RESyntax.RE_STINGY_OPS)
-		    && !tokenRep.isStingy () && !tokenRep.isPossessive ())
-		  tokenRep.makeStingy ();
-		else
-		  throw new
-		    REException (getLocalizedMessage ("repeat.chained"),
-				 REException.REG_BADRPT, index);
-	      }
-	    else if (currentToken instanceof RETokenWordBoundary
-		     || currentToken instanceof RETokenWordBoundary)
-	      throw new REException (getLocalizedMessage ("repeat.assertion"),
-				     REException.REG_BADRPT, index);
-	    else
-	    currentToken = setRepeated (currentToken, 0, 1, index);
-	  }
-
-	// OCTAL CHARACTER
-	//  \0377
-
-	else if (unit.bk && (unit.ch == '0')
-		 && syntax.get (RESyntax.RE_OCTAL_CHAR))
-	  {
-	    CharExpression ce =
-	      getCharExpression (pattern, index - 2, pLength, syntax);
-	    if (ce == null)
-	      throw new REException ("invalid octal character",
-				     REException.REG_ESCAPE, index);
-	    index = index - 2 + ce.len;
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, ce.ch, insens);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// BACKREFERENCE OPERATOR
-	//  \1 \2 ... \9 and \10 \11 \12 ...
-	// not available if RE_NO_BK_REFS is set
-	// Perl recognizes \10, \11, and so on only if enough number of
-	// parentheses have opened before it, otherwise they are treated
-	// as aliases of \010, \011, ... (octal characters).  In case of
-	// Sun's JDK, octal character expression must always begin with \0.
-	// We will do as JDK does. But FIXME, take a look at "(a)(b)\29".
-	// JDK treats \2 as a back reference to the 2nd group because
-	// there are only two groups. But in our poor implementation,
-	// we cannot help but treat \29 as a back reference to the 29th group.
-
-	else if (unit.bk && Character.isDigit (unit.ch)
-		 && !syntax.get (RESyntax.RE_NO_BK_REFS))
-	  {
-	    addToken (currentToken);
-	    int numBegin = index - 1;
-	    int numEnd = pLength;
-	    for (int i = index; i < pLength; i++)
-	      {
-		if (!Character.isDigit (pattern[i]))
-		  {
-		    numEnd = i;
-		    break;
-		  }
-	      }
-	    int num = parseInt (pattern, numBegin, numEnd - numBegin, 10);
-
-	    currentToken = new RETokenBackRef (subIndex, num, insens);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	    index = numEnd;
-	  }
-
-	// START OF STRING OPERATOR
-	//  \A if RE_STRING_ANCHORS is set
-
-	else if (unit.bk && (unit.ch == 'A')
-		 && syntax.get (RESyntax.RE_STRING_ANCHORS))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenStart (subIndex, null);
-	  }
-
-	// WORD BREAK OPERATOR
-	//  \b if ????
-
-	else if (unit.bk && (unit.ch == 'b')
-		 && syntax.get (RESyntax.RE_STRING_ANCHORS))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenWordBoundary (subIndex,
-				       RETokenWordBoundary.
-				       BEGIN | RETokenWordBoundary.END,
-				       false);
-	  }
-
-	// WORD BEGIN OPERATOR 
-	//  \< if ????
-	else if (unit.bk && (unit.ch == '<'))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenWordBoundary (subIndex, RETokenWordBoundary.BEGIN,
-				       false);
-	  }
-
-	// WORD END OPERATOR 
-	//  \> if ????
-	else if (unit.bk && (unit.ch == '>'))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenWordBoundary (subIndex, RETokenWordBoundary.END,
-				       false);
-	  }
-
-	// NON-WORD BREAK OPERATOR
-	// \B if ????
-
-	else if (unit.bk && (unit.ch == 'B')
-		 && syntax.get (RESyntax.RE_STRING_ANCHORS))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenWordBoundary (subIndex,
-				       RETokenWordBoundary.
-				       BEGIN | RETokenWordBoundary.END, true);
-	  }
-
-
-	// DIGIT OPERATOR
-	//  \d if RE_CHAR_CLASS_ESCAPES is set
-
-	else if (unit.bk && (unit.ch == 'd')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.DIGIT, insens, false);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// NON-DIGIT OPERATOR
-	//  \D
-
-	else if (unit.bk && (unit.ch == 'D')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.DIGIT, insens, true);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// NEWLINE ESCAPE
-	//  \n
-
-	else if (unit.bk && (unit.ch == 'n'))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, '\n', false);
-	  }
-
-	// RETURN ESCAPE
-	//  \r
-
-	else if (unit.bk && (unit.ch == 'r'))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, '\r', false);
-	  }
-
-	// WHITESPACE OPERATOR
-	//  \s if RE_CHAR_CLASS_ESCAPES is set
-
-	else if (unit.bk && (unit.ch == 's')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.SPACE, insens, false);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// NON-WHITESPACE OPERATOR
-	//  \S
-
-	else if (unit.bk && (unit.ch == 'S')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.SPACE, insens, true);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// TAB ESCAPE
-	//  \t
-
-	else if (unit.bk && (unit.ch == 't'))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, '\t', false);
-	  }
-
-	// ALPHANUMERIC OPERATOR
-	//  \w
-
-	else if (unit.bk && (unit.ch == 'w')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.ALNUM, insens, false);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// NON-ALPHANUMERIC OPERATOR
-	//  \W
-
-	else if (unit.bk && (unit.ch == 'W')
-		 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
-	  {
-	    addToken (currentToken);
-	    currentToken =
-	      new RETokenPOSIX (subIndex, RETokenPOSIX.ALNUM, insens, true);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// END OF STRING OPERATOR
-	//  \Z, \z
-
-	// FIXME: \Z and \z are different in that if the input string
-	// ends with a line terminator, \Z matches the position before
-	// the final terminator.  This special behavior of \Z is yet
-	// to be implemented.
-
-	else if (unit.bk && (unit.ch == 'Z' || unit.ch == 'z') &&
-		 syntax.get (RESyntax.RE_STRING_ANCHORS))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenEnd (subIndex, null);
-	  }
-
-	// HEX CHARACTER, UNICODE CHARACTER
-	//  \x1B, \u1234
-
-	else
-	  if ((unit.bk && (unit.ch == 'x')
-	       && syntax.get (RESyntax.RE_HEX_CHAR)) || (unit.bk
-							 && (unit.ch == 'u')
-							 && syntax.
-							 get (RESyntax.
-							      RE_UNICODE_CHAR)))
-	  {
-	    CharExpression ce =
-	      getCharExpression (pattern, index - 2, pLength, syntax);
-	    if (ce == null)
-	      throw new REException ("invalid hex character",
-				     REException.REG_ESCAPE, index);
-	    index = index - 2 + ce.len;
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, ce.ch, insens);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// NAMED PROPERTY
-	// \p{prop}, \P{prop}
-
-	else
-	  if ((unit.bk && (unit.ch == 'p')
-	       && syntax.get (RESyntax.RE_NAMED_PROPERTY)) || (unit.bk
-							       && (unit.ch ==
-								   'P')
-							       && syntax.
-							       get (RESyntax.
-								    RE_NAMED_PROPERTY)))
-	  {
-	    NamedProperty np = getNamedProperty (pattern, index - 2, pLength);
-	    if (np == null)
-	      throw new REException ("invalid escape sequence",
-				     REException.REG_ESCAPE, index);
-	    index = index - 2 + np.len;
-	    addToken (currentToken);
-	    currentToken =
-	      getRETokenNamedProperty (subIndex, np, insens, index);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-
-	// END OF PREVIOUS MATCH
-	//  \G
-
-	else if (unit.bk && (unit.ch == 'G') &&
-		 syntax.get (RESyntax.RE_STRING_ANCHORS))
-	  {
-	    addToken (currentToken);
-	    currentToken = new RETokenEndOfPreviousMatch (subIndex);
-	  }
-
-	// NON-SPECIAL CHARACTER (or escape to make literal)
-	//  c | \* for example
-
-	else
-	  {			// not a special character
-	    addToken (currentToken);
-	    currentToken = new RETokenChar (subIndex, unit.ch, insens);
-	    if (insensUSASCII)
-	      currentToken.unicodeAware = false;
-	  }
-      }				// end while
+        // read the next character unit (including backslash escapes)
+        index = getCharUnit (pattern, index, unit, quot);
+
+        if (unit.bk)
+          if (unit.ch == 'Q')
+            {
+              quot = true;
+              continue;
+            }
+          else if (unit.ch == 'E')
+            {
+              quot = false;
+              continue;
+            }
+        if (quot)
+          unit.bk = false;
+
+        if (((cflags & REG_X_COMMENTS) > 0) && (!unit.bk) && (!quot))
+          {
+            if (Character.isWhitespace (unit.ch))
+              {
+                continue;
+              }
+            if (unit.ch == '#')
+              {
+                for (int i = index; i < pLength; i++)
+                  {
+                    if (pattern[i] == '\n')
+                      {
+                        index = i + 1;
+                        continue;
+                      }
+                    else if (pattern[i] == '\r')
+                      {
+                        if (i + 1 < pLength && pattern[i + 1] == '\n')
+                          {
+                            index = i + 2;
+                          }
+                        else
+                          {
+                            index = i + 1;
+                          }
+                        continue;
+                      }
+                  }
+                index = pLength;
+                continue;
+              }
+          }
+
+        // ALTERNATION OPERATOR
+        //  \| or | (if RE_NO_BK_VBAR) or newline (if RE_NEWLINE_ALT)
+        //  not available if RE_LIMITED_OPS is set
+
+        // TODO: the '\n' literal here should be a test against REToken.newline,
+        // which unfortunately may be more than a single character.
+        if (((unit.ch == '|'
+              && (syntax.get (RESyntax.RE_NO_BK_VBAR) ^ (unit.bk || quot)))
+             || (syntax.get (RESyntax.RE_NEWLINE_ALT) && (unit.ch == '\n')
+                 && !(unit.bk || quot)))
+            && !syntax.get (RESyntax.RE_LIMITED_OPS))
+          {
+            // make everything up to here be a branch. create vector if nec.
+            addToken (currentToken);
+            RE theBranch =
+              new RE (firstToken, lastToken, numSubs, subIndex, minimumLength,
+                      maximumLength);
+            minimumLength = 0;
+            maximumLength = 0;
+            if (branches == null)
+              {
+                branches = new ArrayList < REToken > ();
+              }
+            branches.add (theBranch);
+            firstToken = lastToken = currentToken = null;
+          }
+
+        // INTERVAL OPERATOR:
+        //  {x} | {x,} | {x,y}  (RE_INTERVALS && RE_NO_BK_BRACES)
+        //  \{x\} | \{x,\} | \{x,y\} (RE_INTERVALS && !RE_NO_BK_BRACES)
+        //
+        // OPEN QUESTION:
+        //  what is proper interpretation of '{' at start of string?
+        //
+        // This method used to check "repeat.empty.token" to avoid such regexp
+        // as "(a*){2,}", but now "repeat.empty.token" is allowed.
+
+        else if ((unit.ch == '{') && syntax.get (RESyntax.RE_INTERVALS)
+                 && (syntax.
+                     get (RESyntax.RE_NO_BK_BRACES) ^ (unit.bk || quot)))
+          {
+            int newIndex = getMinMax (pattern, index, minMax, syntax);
+            if (newIndex > index)
+              {
+                if (minMax.first > minMax.second)
+                  throw new
+                    REException (getLocalizedMessage ("interval.order"),
+                                 REException.REG_BADRPT, newIndex);
+                if (currentToken == null)
+                  throw new
+                    REException (getLocalizedMessage ("repeat.no.token"),
+                                 REException.REG_BADRPT, newIndex);
+                if (currentToken instanceof RETokenRepeated)
+                  throw new
+                    REException (getLocalizedMessage ("repeat.chained"),
+                                 REException.REG_BADRPT, newIndex);
+                if (currentToken instanceof RETokenWordBoundary
+                    || currentToken instanceof RETokenWordBoundary)
+                  throw new
+                    REException (getLocalizedMessage ("repeat.assertion"),
+                                 REException.REG_BADRPT, newIndex);
+                index = newIndex;
+                currentToken =
+                  setRepeated (currentToken, minMax.first, minMax.second,
+                               index);
+              }
+            else
+              {
+                addToken (currentToken);
+                currentToken = new RETokenChar (subIndex, unit.ch, insens);
+                if (insensUSASCII)
+                  currentToken.unicodeAware = false;
+              }
+          }
+
+        // LIST OPERATOR:
+        //  [...] | [^...]
+
+        else if ((unit.ch == '[') && !(unit.bk || quot))
+          {
+            // Create a new RETokenOneOf
+            ParseCharClassResult result =
+              parseCharClass (subIndex, pattern, index, pLength, cflags,
+                              syntax, 0);
+            addToken (currentToken);
+            currentToken = result.token;
+            index = result.index;
+          }
+
+        // SUBEXPRESSIONS
+        //  (...) | \(...\) depending on RE_NO_BK_PARENS
+
+        else if ((unit.ch == '(')
+                 && (syntax.
+                     get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk || quot)))
+          {
+            boolean pure = false;
+            boolean comment = false;
+            boolean lookAhead = false;
+            boolean lookBehind = false;
+            boolean independent = false;
+            boolean negativelh = false;
+            boolean negativelb = false;
+            if ((index + 1 < pLength) && (pattern[index] == '?'))
+              {
+                switch (pattern[index + 1])
+                  {
+                  case '!':
+                    if (syntax.get (RESyntax.RE_LOOKAHEAD))
+                      {
+                        pure = true;
+                        negativelh = true;
+                        lookAhead = true;
+                        index += 2;
+                      }
+                    break;
+                  case '=':
+                    if (syntax.get (RESyntax.RE_LOOKAHEAD))
+                      {
+                        pure = true;
+                        lookAhead = true;
+                        index += 2;
+                      }
+                    break;
+                  case '<':
+                    // We assume that if the syntax supports look-ahead,
+                    // it also supports look-behind.
+                    if (syntax.get (RESyntax.RE_LOOKAHEAD))
+                      {
+                        index++;
+                        switch (pattern[index + 1])
+                          {
+                          case '!':
+                            pure = true;
+                            negativelb = true;
+                            lookBehind = true;
+                            index += 2;
+                            break;
+                          case '=':
+                            pure = true;
+                            lookBehind = true;
+                            index += 2;
+                          }
+                      }
+                    break;
+                  case '>':
+                    // We assume that if the syntax supports look-ahead,
+                    // it also supports independent group.
+                    if (syntax.get (RESyntax.RE_LOOKAHEAD))
+                      {
+                        pure = true;
+                        independent = true;
+                        index += 2;
+                      }
+                    break;
+                  case 'i':
+                  case 'd':
+                  case 'm':
+                  case 's':
+                  case 'u':
+                  case 'x':
+                  case '-':
+                    if (!syntax.get (RESyntax.RE_EMBEDDED_FLAGS))
+                      break;
+                    // Set or reset syntax flags.
+                    int flagIndex = index + 1;
+                    int endFlag = -1;
+                    RESyntax newSyntax = new RESyntax (syntax);
+                    int newCflags = cflags;
+                    boolean negate = false;
+                    while (flagIndex < pLength && endFlag < 0)
+                      {
+                        switch (pattern[flagIndex])
+                          {
+                          case 'i':
+                            if (negate)
+                              newCflags &= ~REG_ICASE;
+                            else
+                              newCflags |= REG_ICASE;
+                            flagIndex++;
+                            break;
+                          case 'd':
+                            if (negate)
+                              newSyntax.setLineSeparator (RESyntax.
+                                                          DEFAULT_LINE_SEPARATOR);
+                            else
+                              newSyntax.setLineSeparator ("\n");
+                            flagIndex++;
+                            break;
+                          case 'm':
+                            if (negate)
+                              newCflags &= ~REG_MULTILINE;
+                            else
+                              newCflags |= REG_MULTILINE;
+                            flagIndex++;
+                            break;
+                          case 's':
+                            if (negate)
+                              newCflags &= ~REG_DOT_NEWLINE;
+                            else
+                              newCflags |= REG_DOT_NEWLINE;
+                            flagIndex++;
+                            break;
+                          case 'u':
+                            if (negate)
+                              newCflags |= REG_ICASE_USASCII;
+                            else
+                              newCflags &= ~REG_ICASE_USASCII;
+                            flagIndex++;
+                            break;
+                          case 'x':
+                            if (negate)
+                              newCflags &= ~REG_X_COMMENTS;
+                            else
+                              newCflags |= REG_X_COMMENTS;
+                            flagIndex++;
+                            break;
+                          case '-':
+                            negate = true;
+                            flagIndex++;
+                            break;
+                          case ':':
+                          case ')':
+                            endFlag = pattern[flagIndex];
+                            break;
+                          default:
+                            throw new
+                              REException (getLocalizedMessage
+                                           ("repeat.no.token"),
+                                           REException.REG_BADRPT, index);
+                          }
+                      }
+                    if (endFlag == ')')
+                      {
+                        syntax = newSyntax;
+                        cflags = newCflags;
+                        insens = ((cflags & REG_ICASE) > 0);
+                        insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
+                        // This can be treated as though it were a comment.
+                        comment = true;
+                        index = flagIndex - 1;
+                        break;
+                      }
+                    if (endFlag == ':')
+                      {
+                        savedSyntax = syntax;
+                        savedCflags = cflags;
+                        flagsSaved = true;
+                        syntax = newSyntax;
+                        cflags = newCflags;
+                        insens = ((cflags & REG_ICASE) > 0);
+                        insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
+                        index = flagIndex - 1;
+                        // Fall through to the next case.
+                      }
+                    else
+                      {
+                        throw new
+                          REException (getLocalizedMessage
+                                       ("unmatched.paren"),
+                                       REException.REG_ESUBREG, index);
+                      }
+                  case ':':
+                    if (syntax.get (RESyntax.RE_PURE_GROUPING))
+                      {
+                        pure = true;
+                        index += 2;
+                      }
+                    break;
+                  case '#':
+                    if (syntax.get (RESyntax.RE_COMMENTS))
+                      {
+                        comment = true;
+                      }
+                    break;
+                  default:
+                    throw new
+                      REException (getLocalizedMessage ("repeat.no.token"),
+                                   REException.REG_BADRPT, index);
+                  }
+              }
+
+            if (index >= pLength)
+              {
+                throw new
+                  REException (getLocalizedMessage ("unmatched.paren"),
+                               REException.REG_ESUBREG, index);
+              }
+
+            // find end of subexpression
+            int endIndex = index;
+            int nextIndex = index;
+            int nested = 0;
+
+            while (((nextIndex =
+                     getCharUnit (pattern, endIndex, unit, false)) > 0)
+                   && !(nested == 0 && (unit.ch == ')')
+                        && (syntax.
+                            get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
+                                                              || quot))))
+              {
+                if ((endIndex = nextIndex) >= pLength)
+                  throw new
+                    REException (getLocalizedMessage ("subexpr.no.end"),
+                                 REException.REG_ESUBREG, nextIndex);
+                else
+              if ((unit.ch == '[') && !(unit.bk || quot))
+                {
+                  // I hate to do something similar to the LIST OPERATOR matters
+                  // above, but ...
+                  int listIndex = nextIndex;
+                  if (listIndex < pLength && pattern[listIndex] == '^')
+                    listIndex++;
+                  if (listIndex < pLength && pattern[listIndex] == ']')
+                    listIndex++;
+                  int listEndIndex = -1;
+                  int listNest = 0;
+                  while (listIndex < pLength && listEndIndex < 0)
+                    {
+                      switch (pattern[listIndex++])
+                        {
+                        case '\\':
+                          listIndex++;
+                          break;
+                        case '[':
+                          // Sun's API document says that regexp like "[a-d[m-p]]"
+                          // is legal. Even something like "[[[^]]]]" is accepted.
+                          listNest++;
+                          if (listIndex < pLength
+                              && pattern[listIndex] == '^')
+                            listIndex++;
+                          if (listIndex < pLength
+                              && pattern[listIndex] == ']')
+                            listIndex++;
+                          break;
+                        case ']':
+                          if (listNest == 0)
+                            listEndIndex = listIndex;
+                          listNest--;
+                          break;
+                        }
+                    }
+                  if (listEndIndex >= 0)
+                    {
+                      nextIndex = listEndIndex;
+                      if ((endIndex = nextIndex) >= pLength)
+                        throw new
+                          REException (getLocalizedMessage ("subexpr.no.end"),
+                                       REException.REG_ESUBREG, nextIndex);
+                      else
+                      continue;
+                    }
+                  throw new
+                    REException (getLocalizedMessage ("subexpr.no.end"),
+                                 REException.REG_ESUBREG, nextIndex);
+                }
+              else if (unit.ch == '('
+                       && (syntax.
+                           get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
+                                                             || quot)))
+                nested++;
+              else if (unit.ch == ')'
+                       && (syntax.
+                           get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk
+                                                             || quot)))
+                nested--;
+              }
+
+            // endIndex is now position at a ')','\)'
+            // nextIndex is end of string or position after ')' or '\)'
+
+            if (comment)
+              index = nextIndex;
+            else
+              {                 // not a comment
+                // create RE subexpression as token.
+                addToken (currentToken);
+                if (!pure)
+                  {
+                    numSubs++;
+                  }
+
+                int useIndex = (pure || lookAhead || lookBehind
+                                || independent) ? 0 : nextSub + numSubs;
+                currentToken =
+                  new RE (String.valueOf (pattern, index, endIndex - index).
+                          toCharArray (), cflags, syntax, useIndex,
+                          nextSub + numSubs);
+                numSubs += ((RE) currentToken).getNumSubs ();
+
+                if (lookAhead)
+                  {
+                    currentToken =
+                      new RETokenLookAhead (currentToken, negativelh);
+                  }
+                else if (lookBehind)
+                  {
+                    currentToken =
+                      new RETokenLookBehind (currentToken, negativelb);
+                  }
+                else if (independent)
+                  {
+                    currentToken = new RETokenIndependent (currentToken);
+                  }
+
+                index = nextIndex;
+                if (flagsSaved)
+                  {
+                    syntax = savedSyntax;
+                    cflags = savedCflags;
+                    insens = ((cflags & REG_ICASE) > 0);
+                    insensUSASCII = ((cflags & REG_ICASE_USASCII) > 0);
+                    flagsSaved = false;
+                  }
+              }                 // not a comment
+          }                     // subexpression
+
+        // UNMATCHED RIGHT PAREN
+        // ) or \) throw exception if
+        // !syntax.get(RESyntax.RE_UNMATCHED_RIGHT_PAREN_ORD)
+        else if (!syntax.get (RESyntax.RE_UNMATCHED_RIGHT_PAREN_ORD)
+                 && ((unit.ch == ')')
+                     && (syntax.
+                         get (RESyntax.RE_NO_BK_PARENS) ^ (unit.bk || quot))))
+          {
+            throw new REException (getLocalizedMessage ("unmatched.paren"),
+                                   REException.REG_EPAREN, index);
+          }
+
+        // START OF LINE OPERATOR
+        //  ^
+
+        else if ((unit.ch == '^') && !(unit.bk || quot))
+          {
+            addToken (currentToken);
+            currentToken = null;
+            RETokenStart token = null;
+            if ((cflags & REG_MULTILINE) > 0)
+              {
+                String sep = syntax.getLineSeparator ();
+                if (sep == null)
+                  {
+                    token = new RETokenStart (subIndex, null, true);
+                  }
+                else
+                  {
+                    token = new RETokenStart (subIndex, sep);
+                  }
+              }
+            else
+              {
+                token = new RETokenStart (subIndex, null);
+              }
+            addToken (token);
+          }
+
+        // END OF LINE OPERATOR
+        //  $
+
+        else if ((unit.ch == '$') && !(unit.bk || quot))
+          {
+            addToken (currentToken);
+            currentToken = null;
+            RETokenEnd token = null;
+            if ((cflags & REG_MULTILINE) > 0)
+              {
+                String sep = syntax.getLineSeparator ();
+                if (sep == null)
+                  {
+                    token = new RETokenEnd (subIndex, null, true);
+                  }
+                else
+                  {
+                    token = new RETokenEnd (subIndex, sep);
+                  }
+              }
+            else
+              {
+                token = new RETokenEnd (subIndex, null);
+              }
+            addToken (token);
+          }
+
+        // MATCH-ANY-CHARACTER OPERATOR (except possibly newline and null)
+        //  .
+
+        else if ((unit.ch == '.') && !(unit.bk || quot))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenAny (subIndex, syntax.get (RESyntax.RE_DOT_NEWLINE)
+                              || ((cflags & REG_DOT_NEWLINE) > 0),
+                              syntax.get (RESyntax.RE_DOT_NOT_NULL));
+          }
+
+        // ZERO-OR-MORE REPEAT OPERATOR
+        //  *
+        //
+        // This method used to check "repeat.empty.token" to avoid such regexp
+        // as "(a*)*", but now "repeat.empty.token" is allowed.
+
+        else if ((unit.ch == '*') && !(unit.bk || quot))
+          {
+            if (currentToken == null)
+              throw new REException (getLocalizedMessage ("repeat.no.token"),
+                                     REException.REG_BADRPT, index);
+            if (currentToken instanceof RETokenRepeated)
+              throw new REException (getLocalizedMessage ("repeat.chained"),
+                                     REException.REG_BADRPT, index);
+            if (currentToken instanceof RETokenWordBoundary
+                || currentToken instanceof RETokenWordBoundary)
+              throw new REException (getLocalizedMessage ("repeat.assertion"),
+                                     REException.REG_BADRPT, index);
+            currentToken =
+              setRepeated (currentToken, 0, Integer.MAX_VALUE, index);
+          }
+
+        // ONE-OR-MORE REPEAT OPERATOR / POSSESSIVE MATCHING OPERATOR
+        //  + | \+ depending on RE_BK_PLUS_QM
+        //  not available if RE_LIMITED_OPS is set
+        //
+        // This method used to check "repeat.empty.token" to avoid such regexp
+        // as "(a*)+", but now "repeat.empty.token" is allowed.
+
+        else if ((unit.ch == '+') && !syntax.get (RESyntax.RE_LIMITED_OPS)
+                 && (!syntax.
+                     get (RESyntax.RE_BK_PLUS_QM) ^ (unit.bk || quot)))
+          {
+            if (currentToken == null)
+              throw new REException (getLocalizedMessage ("repeat.no.token"),
+                                     REException.REG_BADRPT, index);
+
+            // Check for possessive matching on RETokenRepeated
+            if (currentToken instanceof RETokenRepeated)
+              {
+                RETokenRepeated tokenRep = (RETokenRepeated) currentToken;
+                if (syntax.get (RESyntax.RE_POSSESSIVE_OPS)
+                    && !tokenRep.isPossessive () && !tokenRep.isStingy ())
+                  tokenRep.makePossessive ();
+                else
+                  throw new
+                    REException (getLocalizedMessage ("repeat.chained"),
+                                 REException.REG_BADRPT, index);
+
+              }
+            else if (currentToken instanceof RETokenWordBoundary
+                     || currentToken instanceof RETokenWordBoundary)
+              throw new REException (getLocalizedMessage ("repeat.assertion"),
+                                     REException.REG_BADRPT, index);
+            else
+            currentToken =
+              setRepeated (currentToken, 1, Integer.MAX_VALUE, index);
+          }
+
+        // ZERO-OR-ONE REPEAT OPERATOR / STINGY MATCHING OPERATOR
+        //  ? | \? depending on RE_BK_PLUS_QM
+        //  not available if RE_LIMITED_OPS is set
+        //  stingy matching if RE_STINGY_OPS is set and it follows a quantifier
+
+        else if ((unit.ch == '?') && !syntax.get (RESyntax.RE_LIMITED_OPS)
+                 && (!syntax.
+                     get (RESyntax.RE_BK_PLUS_QM) ^ (unit.bk || quot)))
+          {
+            if (currentToken == null)
+              throw new REException (getLocalizedMessage ("repeat.no.token"),
+                                     REException.REG_BADRPT, index);
+
+            // Check for stingy matching on RETokenRepeated
+            if (currentToken instanceof RETokenRepeated)
+              {
+                RETokenRepeated tokenRep = (RETokenRepeated) currentToken;
+                if (syntax.get (RESyntax.RE_STINGY_OPS)
+                    && !tokenRep.isStingy () && !tokenRep.isPossessive ())
+                  tokenRep.makeStingy ();
+                else
+                  throw new
+                    REException (getLocalizedMessage ("repeat.chained"),
+                                 REException.REG_BADRPT, index);
+              }
+            else if (currentToken instanceof RETokenWordBoundary
+                     || currentToken instanceof RETokenWordBoundary)
+              throw new REException (getLocalizedMessage ("repeat.assertion"),
+                                     REException.REG_BADRPT, index);
+            else
+            currentToken = setRepeated (currentToken, 0, 1, index);
+          }
+
+        // OCTAL CHARACTER
+        //  \0377
+
+        else if (unit.bk && (unit.ch == '0')
+                 && syntax.get (RESyntax.RE_OCTAL_CHAR))
+          {
+            CharExpression ce =
+              getCharExpression (pattern, index - 2, pLength, syntax);
+            if (ce == null)
+              throw new REException ("invalid octal character",
+                                     REException.REG_ESCAPE, index);
+            index = index - 2 + ce.len;
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, ce.ch, insens);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // BACKREFERENCE OPERATOR
+        //  \1 \2 ... \9 and \10 \11 \12 ...
+        // not available if RE_NO_BK_REFS is set
+        // Perl recognizes \10, \11, and so on only if enough number of
+        // parentheses have opened before it, otherwise they are treated
+        // as aliases of \010, \011, ... (octal characters).  In case of
+        // Sun's JDK, octal character expression must always begin with \0.
+        // We will do as JDK does. But FIXME, take a look at "(a)(b)\29".
+        // JDK treats \2 as a back reference to the 2nd group because
+        // there are only two groups. But in our poor implementation,
+        // we cannot help but treat \29 as a back reference to the 29th group.
+
+        else if (unit.bk && Character.isDigit (unit.ch)
+                 && !syntax.get (RESyntax.RE_NO_BK_REFS))
+          {
+            addToken (currentToken);
+            int numBegin = index - 1;
+            int numEnd = pLength;
+            for (int i = index; i < pLength; i++)
+              {
+                if (!Character.isDigit (pattern[i]))
+                  {
+                    numEnd = i;
+                    break;
+                  }
+              }
+            int num = parseInt (pattern, numBegin, numEnd - numBegin, 10);
+
+            currentToken = new RETokenBackRef (subIndex, num, insens);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+            index = numEnd;
+          }
+
+        // START OF STRING OPERATOR
+        //  \A if RE_STRING_ANCHORS is set
+
+        else if (unit.bk && (unit.ch == 'A')
+                 && syntax.get (RESyntax.RE_STRING_ANCHORS))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenStart (subIndex, null);
+          }
+
+        // WORD BREAK OPERATOR
+        //  \b if ????
+
+        else if (unit.bk && (unit.ch == 'b')
+                 && syntax.get (RESyntax.RE_STRING_ANCHORS))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenWordBoundary (subIndex,
+                                       RETokenWordBoundary.
+                                       BEGIN | RETokenWordBoundary.END,
+                                       false);
+          }
+
+        // WORD BEGIN OPERATOR
+        //  \< if ????
+        else if (unit.bk && (unit.ch == '<'))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenWordBoundary (subIndex, RETokenWordBoundary.BEGIN,
+                                       false);
+          }
+
+        // WORD END OPERATOR
+        //  \> if ????
+        else if (unit.bk && (unit.ch == '>'))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenWordBoundary (subIndex, RETokenWordBoundary.END,
+                                       false);
+          }
+
+        // NON-WORD BREAK OPERATOR
+        // \B if ????
+
+        else if (unit.bk && (unit.ch == 'B')
+                 && syntax.get (RESyntax.RE_STRING_ANCHORS))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenWordBoundary (subIndex,
+                                       RETokenWordBoundary.
+                                       BEGIN | RETokenWordBoundary.END, true);
+          }
+
+
+        // DIGIT OPERATOR
+        //  \d if RE_CHAR_CLASS_ESCAPES is set
+
+        else if (unit.bk && (unit.ch == 'd')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.DIGIT, insens, false);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // NON-DIGIT OPERATOR
+        //  \D
+
+        else if (unit.bk && (unit.ch == 'D')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.DIGIT, insens, true);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // NEWLINE ESCAPE
+        //  \n
+
+        else if (unit.bk && (unit.ch == 'n'))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, '\n', false);
+          }
+
+        // RETURN ESCAPE
+        //  \r
+
+        else if (unit.bk && (unit.ch == 'r'))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, '\r', false);
+          }
+
+        // WHITESPACE OPERATOR
+        //  \s if RE_CHAR_CLASS_ESCAPES is set
+
+        else if (unit.bk && (unit.ch == 's')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.SPACE, insens, false);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // NON-WHITESPACE OPERATOR
+        //  \S
+
+        else if (unit.bk && (unit.ch == 'S')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.SPACE, insens, true);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // TAB ESCAPE
+        //  \t
+
+        else if (unit.bk && (unit.ch == 't'))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, '\t', false);
+          }
+
+        // ALPHANUMERIC OPERATOR
+        //  \w
+
+        else if (unit.bk && (unit.ch == 'w')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.ALNUM, insens, false);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // NON-ALPHANUMERIC OPERATOR
+        //  \W
+
+        else if (unit.bk && (unit.ch == 'W')
+                 && syntax.get (RESyntax.RE_CHAR_CLASS_ESCAPES))
+          {
+            addToken (currentToken);
+            currentToken =
+              new RETokenPOSIX (subIndex, RETokenPOSIX.ALNUM, insens, true);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // END OF STRING OPERATOR
+        //  \Z, \z
+
+        // FIXME: \Z and \z are different in that if the input string
+        // ends with a line terminator, \Z matches the position before
+        // the final terminator.  This special behavior of \Z is yet
+        // to be implemented.
+
+        else if (unit.bk && (unit.ch == 'Z' || unit.ch == 'z') &&
+                 syntax.get (RESyntax.RE_STRING_ANCHORS))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenEnd (subIndex, null);
+          }
+
+        // HEX CHARACTER, UNICODE CHARACTER
+        //  \x1B, \u1234
+
+        else
+          if ((unit.bk && (unit.ch == 'x')
+               && syntax.get (RESyntax.RE_HEX_CHAR)) || (unit.bk
+                                                         && (unit.ch == 'u')
+                                                         && syntax.
+                                                         get (RESyntax.
+                                                              RE_UNICODE_CHAR)))
+          {
+            CharExpression ce =
+              getCharExpression (pattern, index - 2, pLength, syntax);
+            if (ce == null)
+              throw new REException ("invalid hex character",
+                                     REException.REG_ESCAPE, index);
+            index = index - 2 + ce.len;
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, ce.ch, insens);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // NAMED PROPERTY
+        // \p{prop}, \P{prop}
+
+        else
+          if ((unit.bk && (unit.ch == 'p')
+               && syntax.get (RESyntax.RE_NAMED_PROPERTY)) || (unit.bk
+                                                               && (unit.ch ==
+                                                                   'P')
+                                                               && syntax.
+                                                               get (RESyntax.
+                                                                    RE_NAMED_PROPERTY)))
+          {
+            NamedProperty np = getNamedProperty (pattern, index - 2, pLength);
+            if (np == null)
+              throw new REException ("invalid escape sequence",
+                                     REException.REG_ESCAPE, index);
+            index = index - 2 + np.len;
+            addToken (currentToken);
+            currentToken =
+              getRETokenNamedProperty (subIndex, np, insens, index);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+
+        // END OF PREVIOUS MATCH
+        //  \G
+
+        else if (unit.bk && (unit.ch == 'G') &&
+                 syntax.get (RESyntax.RE_STRING_ANCHORS))
+          {
+            addToken (currentToken);
+            currentToken = new RETokenEndOfPreviousMatch (subIndex);
+          }
+
+        // NON-SPECIAL CHARACTER (or escape to make literal)
+        //  c | \* for example
+
+        else
+          {                     // not a special character
+            addToken (currentToken);
+            currentToken = new RETokenChar (subIndex, unit.ch, insens);
+            if (insensUSASCII)
+              currentToken.unicodeAware = false;
+          }
+      }                         // end while
 
     // Add final buffered token and an EndSub marker
     addToken (currentToken);
 
     if (branches != null)
       {
-	branches.
-	  add (new
-	       RE (firstToken, lastToken, numSubs, subIndex, minimumLength,
-		   maximumLength));
-	branches.trimToSize ();	// compact the Vector
-	minimumLength = 0;
-	maximumLength = 0;
-	firstToken = lastToken = null;
-	addToken (new RETokenOneOf (subIndex, branches, false));
+        branches.
+          add (new
+               RE (firstToken, lastToken, numSubs, subIndex, minimumLength,
+                   maximumLength));
+        branches.trimToSize (); // compact the Vector
+        minimumLength = 0;
+        maximumLength = 0;
+        firstToken = lastToken = null;
+        addToken (new RETokenOneOf (subIndex, branches, false));
       }
     else
       addToken (new RETokenEndSub (subIndex));
@@ -1403,11 +1403,11 @@ public class RE extends REToken
    * @param syntax Syntax used to parse the pattern.
    */
   private static ParseCharClassResult parseCharClass (int subIndex,
-						      char[]pattern,
-						      int index, int pLength,
-						      int cflags,
-						      RESyntax syntax,
-						      int pflags) throws
+                                                      char[]pattern,
+                                                      int index, int pLength,
+                                                      int cflags,
+                                                      RESyntax syntax,
+                                                      int pflags) throws
     REException
   {
 
@@ -1425,256 +1425,256 @@ public class RE extends REToken
     boolean lastCharIsSet = false;
     if (index == pLength)
       throw new REException (getLocalizedMessage ("unmatched.bracket"),
-			     REException.REG_EBRACK, index);
+                             REException.REG_EBRACK, index);
 
     // Check for initial caret, negation
     if ((ch = pattern[index]) == '^')
       {
-	negative = true;
-	if (++index == pLength)
-	  throw new REException (getLocalizedMessage ("class.no.end"),
-				 REException.REG_EBRACK, index);
-	  ch = pattern[index];
+        negative = true;
+        if (++index == pLength)
+          throw new REException (getLocalizedMessage ("class.no.end"),
+                                 REException.REG_EBRACK, index);
+          ch = pattern[index];
       }
 
     // Check for leading right bracket literal
     if (ch == ']')
       {
-	lastChar = ch;
-	lastCharIsSet = true;
-	if (++index == pLength)
-	  throw new REException (getLocalizedMessage ("class.no.end"),
-				 REException.REG_EBRACK, index);
+        lastChar = ch;
+        lastCharIsSet = true;
+        if (++index == pLength)
+          throw new REException (getLocalizedMessage ("class.no.end"),
+                                 REException.REG_EBRACK, index);
       }
 
     while ((ch = pattern[index++]) != ']')
       {
-	if ((ch == '-') && (lastCharIsSet))
-	  {
-	    if (index == pLength)
-	      throw new REException (getLocalizedMessage ("class.no.end"),
-				     REException.REG_EBRACK, index);
-	    if ((ch = pattern[index]) == ']')
-	      {
-		RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-		lastChar = '-';
-	      }
-	    else
-	      {
-		if ((ch == '\\')
-		    && syntax.get (RESyntax.RE_BACKSLASH_ESCAPE_IN_LISTS))
-		  {
-		    CharExpression ce =
-		      getCharExpression (pattern, index, pLength, syntax);
-		    if (ce == null)
-		      throw new REException ("invalid escape sequence",
-					     REException.REG_ESCAPE, index);
-		    ch = ce.ch;
-		    index = index + ce.len - 1;
-		  }
-		RETokenRange t =
-		  new RETokenRange (subIndex, lastChar, ch, insens);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-		lastChar = 0;
-		lastCharIsSet = false;
-		index++;
-	      }
-	  }
-	else if ((ch == '\\')
-		 && syntax.get (RESyntax.RE_BACKSLASH_ESCAPE_IN_LISTS))
-	  {
-	    if (index == pLength)
-	      throw new REException (getLocalizedMessage ("class.no.end"),
-				     REException.REG_EBRACK, index);
-	    int posixID = -1;
-	    boolean negate = false;
-	    char asciiEsc = 0;
-	    boolean asciiEscIsSet = false;
-	    NamedProperty np = null;
-	    if (("dswDSW".indexOf (pattern[index]) != -1)
-		&& syntax.get (RESyntax.RE_CHAR_CLASS_ESC_IN_LISTS))
-	      {
-		switch (pattern[index])
-		  {
-		  case 'D':
-		    negate = true;
-		  case 'd':
-		    posixID = RETokenPOSIX.DIGIT;
-		    break;
-		  case 'S':
-		    negate = true;
-		  case 's':
-		    posixID = RETokenPOSIX.SPACE;
-		    break;
-		  case 'W':
-		    negate = true;
-		  case 'w':
-		    posixID = RETokenPOSIX.ALNUM;
-		    break;
-		  }
-	      }
-	    if (("pP".indexOf (pattern[index]) != -1)
-		&& syntax.get (RESyntax.RE_NAMED_PROPERTY))
-	      {
-		np = getNamedProperty (pattern, index - 1, pLength);
-		if (np == null)
-		  throw new REException ("invalid escape sequence",
-					 REException.REG_ESCAPE, index);
-		index = index - 1 + np.len - 1;
-	      }
-	    else
-	      {
-		CharExpression ce =
-		  getCharExpression (pattern, index - 1, pLength, syntax);
-		if (ce == null)
-		  throw new REException ("invalid escape sequence",
-					 REException.REG_ESCAPE, index);
-		asciiEsc = ce.ch;
-		asciiEscIsSet = true;
-		index = index - 1 + ce.len - 1;
-	      }
-	    if (lastCharIsSet)
-	      {
-		RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-	      }
+        if ((ch == '-') && (lastCharIsSet))
+          {
+            if (index == pLength)
+              throw new REException (getLocalizedMessage ("class.no.end"),
+                                     REException.REG_EBRACK, index);
+            if ((ch = pattern[index]) == ']')
+              {
+                RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+                lastChar = '-';
+              }
+            else
+              {
+                if ((ch == '\\')
+                    && syntax.get (RESyntax.RE_BACKSLASH_ESCAPE_IN_LISTS))
+                  {
+                    CharExpression ce =
+                      getCharExpression (pattern, index, pLength, syntax);
+                    if (ce == null)
+                      throw new REException ("invalid escape sequence",
+                                             REException.REG_ESCAPE, index);
+                    ch = ce.ch;
+                    index = index + ce.len - 1;
+                  }
+                RETokenRange t =
+                  new RETokenRange (subIndex, lastChar, ch, insens);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+                lastChar = 0;
+                lastCharIsSet = false;
+                index++;
+              }
+          }
+        else if ((ch == '\\')
+                 && syntax.get (RESyntax.RE_BACKSLASH_ESCAPE_IN_LISTS))
+          {
+            if (index == pLength)
+              throw new REException (getLocalizedMessage ("class.no.end"),
+                                     REException.REG_EBRACK, index);
+            int posixID = -1;
+            boolean negate = false;
+            char asciiEsc = 0;
+            boolean asciiEscIsSet = false;
+            NamedProperty np = null;
+            if (("dswDSW".indexOf (pattern[index]) != -1)
+                && syntax.get (RESyntax.RE_CHAR_CLASS_ESC_IN_LISTS))
+              {
+                switch (pattern[index])
+                  {
+                  case 'D':
+                    negate = true;
+                  case 'd':
+                    posixID = RETokenPOSIX.DIGIT;
+                    break;
+                  case 'S':
+                    negate = true;
+                  case 's':
+                    posixID = RETokenPOSIX.SPACE;
+                    break;
+                  case 'W':
+                    negate = true;
+                  case 'w':
+                    posixID = RETokenPOSIX.ALNUM;
+                    break;
+                  }
+              }
+            if (("pP".indexOf (pattern[index]) != -1)
+                && syntax.get (RESyntax.RE_NAMED_PROPERTY))
+              {
+                np = getNamedProperty (pattern, index - 1, pLength);
+                if (np == null)
+                  throw new REException ("invalid escape sequence",
+                                         REException.REG_ESCAPE, index);
+                index = index - 1 + np.len - 1;
+              }
+            else
+              {
+                CharExpression ce =
+                  getCharExpression (pattern, index - 1, pLength, syntax);
+                if (ce == null)
+                  throw new REException ("invalid escape sequence",
+                                         REException.REG_ESCAPE, index);
+                asciiEsc = ce.ch;
+                asciiEscIsSet = true;
+                index = index - 1 + ce.len - 1;
+              }
+            if (lastCharIsSet)
+              {
+                RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+              }
 
-	    if (posixID != -1)
-	      {
-		RETokenPOSIX t =
-		  new RETokenPOSIX (subIndex, posixID, insens, negate);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-	      }
-	    else if (np != null)
-	      {
-		RETokenNamedProperty t =
-		  getRETokenNamedProperty (subIndex, np, insens, index);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-	      }
-	    else if (asciiEscIsSet)
-	      {
-		lastChar = asciiEsc;
-		lastCharIsSet = true;
-	      }
-	    else
-	      {
-		lastChar = pattern[index];
-		lastCharIsSet = true;
-	      }
-	    ++index;
-	  }
-	else if ((ch == '[') && (syntax.get (RESyntax.RE_CHAR_CLASSES))
-		 && (index < pLength) && (pattern[index] == ':'))
-	  {
-	    CPStringBuilder posixSet = new CPStringBuilder ();
-	    index = getPosixSet (pattern, index + 1, posixSet);
-	    int posixId = RETokenPOSIX.intValue (posixSet.toString ());
-	    if (posixId != -1)
-	      {
-		RETokenPOSIX t =
-		  new RETokenPOSIX (subIndex, posixId, insens, false);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-	      }
-	  }
-	else if ((ch == '[') && (syntax.get (RESyntax.RE_NESTED_CHARCLASS)))
-	  {
-	    ParseCharClassResult result =
-	      parseCharClass (subIndex, pattern, index, pLength, cflags,
-			      syntax, 0);
-	    addition.add (result.token);
-	    addition.add ("|");
-	    index = result.index;
-	  }
-	else if ((ch == '&') &&
-		 (syntax.get (RESyntax.RE_NESTED_CHARCLASS)) &&
-		 (index < pLength) && (pattern[index] == '&'))
-	  {
-	    if (returnAtAndOperator)
-	      {
-		ParseCharClassResult result = new ParseCharClassResult ();
-		options.trimToSize ();
-		if (additionAndAppeared)
-		  addition.add ("&");
-		if (addition.size () == 0)
-		  addition = null;
-		result.token = new RETokenOneOf (subIndex,
-						 options, addition, negative);
-		result.index = index - 1;
-		result.returnAtAndOperator = true;
-		return result;
-	      }
-	    // The precedence of the operator "&&" is the lowest.
-	    // So we postpone adding "&" until other elements
-	    // are added. And we insert Boolean.FALSE at the
-	    // beginning of the list of tokens following "&&".
-	    // So, "&&[a-b][k-m]" will be stored in the Vecter
-	    // addition in this order:
-	    //     Boolean.FALSE, [a-b], "|", [k-m], "|", "&"
-	    if (additionAndAppeared)
-	      addition.add ("&");
-	    addition.add (Boolean.FALSE);
-	    additionAndAppeared = true;
+            if (posixID != -1)
+              {
+                RETokenPOSIX t =
+                  new RETokenPOSIX (subIndex, posixID, insens, negate);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+              }
+            else if (np != null)
+              {
+                RETokenNamedProperty t =
+                  getRETokenNamedProperty (subIndex, np, insens, index);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+              }
+            else if (asciiEscIsSet)
+              {
+                lastChar = asciiEsc;
+                lastCharIsSet = true;
+              }
+            else
+              {
+                lastChar = pattern[index];
+                lastCharIsSet = true;
+              }
+            ++index;
+          }
+        else if ((ch == '[') && (syntax.get (RESyntax.RE_CHAR_CLASSES))
+                 && (index < pLength) && (pattern[index] == ':'))
+          {
+            CPStringBuilder posixSet = new CPStringBuilder ();
+            index = getPosixSet (pattern, index + 1, posixSet);
+            int posixId = RETokenPOSIX.intValue (posixSet.toString ());
+            if (posixId != -1)
+              {
+                RETokenPOSIX t =
+                  new RETokenPOSIX (subIndex, posixId, insens, false);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+              }
+          }
+        else if ((ch == '[') && (syntax.get (RESyntax.RE_NESTED_CHARCLASS)))
+          {
+            ParseCharClassResult result =
+              parseCharClass (subIndex, pattern, index, pLength, cflags,
+                              syntax, 0);
+            addition.add (result.token);
+            addition.add ("|");
+            index = result.index;
+          }
+        else if ((ch == '&') &&
+                 (syntax.get (RESyntax.RE_NESTED_CHARCLASS)) &&
+                 (index < pLength) && (pattern[index] == '&'))
+          {
+            if (returnAtAndOperator)
+              {
+                ParseCharClassResult result = new ParseCharClassResult ();
+                options.trimToSize ();
+                if (additionAndAppeared)
+                  addition.add ("&");
+                if (addition.size () == 0)
+                  addition = null;
+                result.token = new RETokenOneOf (subIndex,
+                                                 options, addition, negative);
+                result.index = index - 1;
+                result.returnAtAndOperator = true;
+                return result;
+              }
+            // The precedence of the operator "&&" is the lowest.
+            // So we postpone adding "&" until other elements
+            // are added. And we insert Boolean.FALSE at the
+            // beginning of the list of tokens following "&&".
+            // So, "&&[a-b][k-m]" will be stored in the Vecter
+            // addition in this order:
+            //     Boolean.FALSE, [a-b], "|", [k-m], "|", "&"
+            if (additionAndAppeared)
+              addition.add ("&");
+            addition.add (Boolean.FALSE);
+            additionAndAppeared = true;
 
-	    // The part on which "&&" operates may be either
-	    //   (1) explicitly enclosed by []
-	    //   or
-	    //   (2) not enclosed by [] and terminated by the
-	    //       next "&&" or the end of the character list.
-	    //  Let the preceding else if block do the case (1).
-	    //  We must do something in case of (2).
-	    if ((index + 1 < pLength) && (pattern[index + 1] != '['))
-	      {
-		ParseCharClassResult result =
-		  parseCharClass (subIndex, pattern, index + 1, pLength,
-				  cflags, syntax,
-				  RETURN_AT_AND);
-		addition.add (result.token);
-		addition.add ("|");
-		// If the method returned at the next "&&", it is OK.
-		// Otherwise we have eaten the mark of the end of this
-		// character list "]".  In this case we must give back
-		// the end mark.
-		index = (result.returnAtAndOperator ?
-			 result.index : result.index - 1);
-	      }
-	  }
-	else
-	  {
-	    if (lastCharIsSet)
-	      {
-		RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
-		if (insensUSASCII)
-		  t.unicodeAware = false;
-		options.add (t);
-	      }
-	    lastChar = ch;
-	    lastCharIsSet = true;
-	  }
-	if (index == pLength)
-	  throw new REException (getLocalizedMessage ("class.no.end"),
-				 REException.REG_EBRACK, index);
-      }				// while in list
+            // The part on which "&&" operates may be either
+            //   (1) explicitly enclosed by []
+            //   or
+            //   (2) not enclosed by [] and terminated by the
+            //       next "&&" or the end of the character list.
+            //  Let the preceding else if block do the case (1).
+            //  We must do something in case of (2).
+            if ((index + 1 < pLength) && (pattern[index + 1] != '['))
+              {
+                ParseCharClassResult result =
+                  parseCharClass (subIndex, pattern, index + 1, pLength,
+                                  cflags, syntax,
+                                  RETURN_AT_AND);
+                addition.add (result.token);
+                addition.add ("|");
+                // If the method returned at the next "&&", it is OK.
+                // Otherwise we have eaten the mark of the end of this
+                // character list "]".  In this case we must give back
+                // the end mark.
+                index = (result.returnAtAndOperator ?
+                         result.index : result.index - 1);
+              }
+          }
+        else
+          {
+            if (lastCharIsSet)
+              {
+                RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
+                if (insensUSASCII)
+                  t.unicodeAware = false;
+                options.add (t);
+              }
+            lastChar = ch;
+            lastCharIsSet = true;
+          }
+        if (index == pLength)
+          throw new REException (getLocalizedMessage ("class.no.end"),
+                                 REException.REG_EBRACK, index);
+      }                         // while in list
     // Out of list, index is one past ']'
 
     if (lastCharIsSet)
       {
-	RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
-	if (insensUSASCII)
-	  t.unicodeAware = false;
-	options.add (t);
+        RETokenChar t = new RETokenChar (subIndex, lastChar, insens);
+        if (insensUSASCII)
+          t.unicodeAware = false;
+        options.add (t);
       }
 
     ParseCharClassResult result = new ParseCharClassResult ();
@@ -1690,17 +1690,17 @@ public class RE extends REToken
   }
 
   private static int getCharUnit (char[]input, int index, CharUnit unit,
-				  boolean quot) throws REException
+                                  boolean quot) throws REException
   {
     unit.ch = input[index++];
     unit.bk = (unit.ch == '\\'
-	       && (!quot || index >= input.length || input[index] == 'E'));
+               && (!quot || index >= input.length || input[index] == 'E'));
     if (unit.bk)
       if (index < input.length)
-	unit.ch = input[index++];
+        unit.ch = input[index++];
       else
-	throw new REException (getLocalizedMessage ("ends.with.backslash"),
-			       REException.REG_ESCAPE, index);
+        throw new REException (getLocalizedMessage ("ends.with.backslash"),
+                               REException.REG_ESCAPE, index);
     return index;
   }
 
@@ -1709,7 +1709,7 @@ public class RE extends REToken
     int ret = 0;
     for (int i = pos; i < pos + len; i++)
       {
-	ret = ret * radix + Character.digit (input[i], radix);
+        ret = ret * radix + Character.digit (input[i], radix);
       }
     return ret;
   }
@@ -1736,92 +1736,92 @@ public class RE extends REToken
   }
 
   private static CharExpression getCharExpression (char[]input, int pos,
-						   int lim, RESyntax syntax)
+                                                   int lim, RESyntax syntax)
   {
     CharExpression ce = new CharExpression ();
     char c = input[pos];
     if (c == '\\')
       {
-	if (pos + 1 >= lim)
-	  return null;
-	c = input[pos + 1];
-	switch (c)
-	  {
-	  case 't':
-	    ce.ch = '\t';
-	    ce.len = 2;
-	    break;
-	  case 'n':
-	    ce.ch = '\n';
-	    ce.len = 2;
-	    break;
-	  case 'r':
-	    ce.ch = '\r';
-	    ce.len = 2;
-	    break;
-	  case 'x':
-	  case 'u':
-	    if ((c == 'x' && syntax.get (RESyntax.RE_HEX_CHAR)) ||
-		(c == 'u' && syntax.get (RESyntax.RE_UNICODE_CHAR)))
-	      {
-		int l = 0;
-		int expectedLength = (c == 'x' ? 2 : 4);
-		for (int i = pos + 2; i < pos + 2 + expectedLength; i++)
-		  {
-		    if (i >= lim)
-		      break;
-		    if (!((input[i] >= '0' && input[i] <= '9') ||
-			  (input[i] >= 'A' && input[i] <= 'F') ||
-			  (input[i] >= 'a' && input[i] <= 'f')))
-		      break;
-		    l++;
-		  }
-		if (l != expectedLength)
-		  return null;
-		ce.ch = (char) (parseInt (input, pos + 2, l, 16));
-		ce.len = l + 2;
-	      }
-	    else
-	      {
-		ce.ch = c;
-		ce.len = 2;
-	      }
-	    break;
-	  case '0':
-	    if (syntax.get (RESyntax.RE_OCTAL_CHAR))
-	      {
-		int l = 0;
-		for (int i = pos + 2; i < pos + 2 + 3; i++)
-		  {
-		    if (i >= lim)
-		      break;
-		    if (input[i] < '0' || input[i] > '7')
-		      break;
-		    l++;
-		  }
-		if (l == 3 && input[pos + 2] > '3')
-		  l--;
-		if (l <= 0)
-		  return null;
-		ce.ch = (char) (parseInt (input, pos + 2, l, 8));
-		ce.len = l + 2;
-	      }
-	    else
-	      {
-		ce.ch = c;
-		ce.len = 2;
-	      }
-	    break;
-	  default:
-	    ce.ch = c;
-	    ce.len = 2;
-	    break;
-	  }
+        if (pos + 1 >= lim)
+          return null;
+        c = input[pos + 1];
+        switch (c)
+          {
+          case 't':
+            ce.ch = '\t';
+            ce.len = 2;
+            break;
+          case 'n':
+            ce.ch = '\n';
+            ce.len = 2;
+            break;
+          case 'r':
+            ce.ch = '\r';
+            ce.len = 2;
+            break;
+          case 'x':
+          case 'u':
+            if ((c == 'x' && syntax.get (RESyntax.RE_HEX_CHAR)) ||
+                (c == 'u' && syntax.get (RESyntax.RE_UNICODE_CHAR)))
+              {
+                int l = 0;
+                int expectedLength = (c == 'x' ? 2 : 4);
+                for (int i = pos + 2; i < pos + 2 + expectedLength; i++)
+                  {
+                    if (i >= lim)
+                      break;
+                    if (!((input[i] >= '0' && input[i] <= '9') ||
+                          (input[i] >= 'A' && input[i] <= 'F') ||
+                          (input[i] >= 'a' && input[i] <= 'f')))
+                      break;
+                    l++;
+                  }
+                if (l != expectedLength)
+                  return null;
+                ce.ch = (char) (parseInt (input, pos + 2, l, 16));
+                ce.len = l + 2;
+              }
+            else
+              {
+                ce.ch = c;
+                ce.len = 2;
+              }
+            break;
+          case '0':
+            if (syntax.get (RESyntax.RE_OCTAL_CHAR))
+              {
+                int l = 0;
+                for (int i = pos + 2; i < pos + 2 + 3; i++)
+                  {
+                    if (i >= lim)
+                      break;
+                    if (input[i] < '0' || input[i] > '7')
+                      break;
+                    l++;
+                  }
+                if (l == 3 && input[pos + 2] > '3')
+                  l--;
+                if (l <= 0)
+                  return null;
+                ce.ch = (char) (parseInt (input, pos + 2, l, 8));
+                ce.len = l + 2;
+              }
+            else
+              {
+                ce.ch = c;
+                ce.len = 2;
+              }
+            break;
+          default:
+            ce.ch = c;
+            ce.len = 2;
+            break;
+          }
       }
     else
       {
-	ce.ch = input[pos];
-	ce.len = 1;
+        ce.ch = input[pos];
+        ce.len = 1;
       }
     ce.expr = new String (input, pos, ce.len);
     return ce;
@@ -1846,60 +1846,60 @@ public class RE extends REToken
   }
 
   private static NamedProperty getNamedProperty (char[]input, int pos,
-						 int lim)
+                                                 int lim)
   {
     NamedProperty np = new NamedProperty ();
     char c = input[pos];
     if (c == '\\')
       {
-	if (++pos >= lim)
-	  return null;
-	c = input[pos++];
-	switch (c)
-	  {
-	  case 'p':
-	    np.negate = false;
-	    break;
-	  case 'P':
-	    np.negate = true;
-	    break;
-	  default:
-	    return null;
-	  }
-	c = input[pos++];
-	if (c == '{')
-	  {
-	    int p = -1;
-	    for (int i = pos; i < lim; i++)
-	      {
-		if (input[i] == '}')
-		  {
-		    p = i;
-		    break;
-		  }
-	      }
-	    if (p < 0)
-	      return null;
-	    int len = p - pos;
-	    np.name = new String (input, pos, len);
-	    np.len = len + 4;
-	  }
-	else
-	  {
-	    np.name = new String (input, pos - 1, 1);
-	    np.len = 3;
-	  }
-	return np;
+        if (++pos >= lim)
+          return null;
+        c = input[pos++];
+        switch (c)
+          {
+          case 'p':
+            np.negate = false;
+            break;
+          case 'P':
+            np.negate = true;
+            break;
+          default:
+            return null;
+          }
+        c = input[pos++];
+        if (c == '{')
+          {
+            int p = -1;
+            for (int i = pos; i < lim; i++)
+              {
+                if (input[i] == '}')
+                  {
+                    p = i;
+                    break;
+                  }
+              }
+            if (p < 0)
+              return null;
+            int len = p - pos;
+            np.name = new String (input, pos, len);
+            np.len = len + 4;
+          }
+        else
+          {
+            np.name = new String (input, pos - 1, 1);
+            np.len = 3;
+          }
+        return np;
       }
     else
       return null;
   }
 
   private static RETokenNamedProperty getRETokenNamedProperty (int subIndex,
-							       NamedProperty
-							       np,
-							       boolean insens,
-							       int index)
+                                                               NamedProperty
+                                                               np,
+                                                               boolean insens,
+                                                               int index)
     throws REException
   {
     try
@@ -1953,18 +1953,18 @@ public class RE extends REToken
 
   private boolean isMatchImpl (CharIndexed input, int index, int eflags)
   {
-    if (firstToken == null)	// Trivial case
+    if (firstToken == null)     // Trivial case
       return (input.charAt (0) == CharIndexed.OUT_OF_BOUNDS);
     REMatch m = new REMatch (numSubs, index, eflags);
     if (firstToken.match (input, m))
       {
-	if (m != null)
-	  {
-	    if (input.charAt (m.index) == CharIndexed.OUT_OF_BOUNDS)
-	      {
-		return true;
-	      }
-	  }
+        if (m != null)
+          {
+            if (input.charAt (m.index) == CharIndexed.OUT_OF_BOUNDS)
+              {
+                return true;
+              }
+          }
       }
     return false;
   }
@@ -1984,10 +1984,10 @@ public class RE extends REToken
   {
     if (lastToken != null)
       {
-	lastToken.setUncle (uncle);
+        lastToken.setUncle (uncle);
       }
     else
-      super.setUncle (uncle);	// to deal with empty subexpressions
+      super.setUncle (uncle);   // to deal with empty subexpressions
   }
 
   // Overrides REToken.chain
@@ -2063,25 +2063,25 @@ public class RE extends REToken
 
   // this has been changed since 1.03 to be non-overlapping matches
   private REMatch[] getAllMatchesImpl (CharIndexed input, int index,
-				       int eflags)
+                                       int eflags)
   {
     List < REMatch > all = new ArrayList < REMatch > ();
     REMatch m = null;
     while ((m = getMatchImpl (input, index, eflags, null)) != null)
       {
-	all.add (m);
-	index = m.getEndIndex ();
-	if (m.end[0] == 0)
-	  {			// handle pathological case of zero-length match
-	    index++;
-	    input.move (1);
-	  }
-	else
-	  {
-	    input.move (m.end[0]);
-	  }
-	if (!input.isValid ())
-	  break;
+        all.add (m);
+        index = m.getEndIndex ();
+        if (m.end[0] == 0)
+          {                     // handle pathological case of zero-length match
+            index++;
+            input.move (1);
+          }
+        else
+          {
+            input.move (m.end[0]);
+          }
+        if (!input.isValid ())
+          break;
       }
     return all.toArray (new REMatch[all.size ()]);
   }
@@ -2092,7 +2092,7 @@ public class RE extends REToken
     input.setHitEnd (mymatch);
     if (firstToken == null)
       {
-	return next (input, mymatch);
+        return next (input, mymatch);
       }
 
     // Note the start of this subexpression
@@ -2108,7 +2108,7 @@ public class RE extends REToken
     boolean b = match (input, mymatch);
     if (b)
       {
-	return mymatch;
+        return mymatch;
       }
     return null;
   }
@@ -2168,78 +2168,78 @@ public class RE extends REToken
    * @param buffer The StringBuffer to save pre-match text in.
    * @return An REMatch instance referencing the match, or null if none.  */
   public REMatch getMatch (Object input, int index, int eflags,
-			   CPStringBuilder buffer)
+                           CPStringBuilder buffer)
   {
     return getMatchImpl (makeCharIndexed (input, index), index, eflags,
-			 buffer);
+                         buffer);
   }
 
   REMatch getMatchImpl (CharIndexed input, int anchor, int eflags,
-			CPStringBuilder buffer)
+                        CPStringBuilder buffer)
   {
     boolean tryEntireMatch = ((eflags & REG_TRY_ENTIRE_MATCH) != 0);
     boolean doMove = ((eflags & REG_FIX_STARTING_POSITION) == 0);
     RE re = (tryEntireMatch ? (RE) this.clone () : this);
     if (tryEntireMatch)
       {
-	RETokenEnd reEnd = new RETokenEnd (0, null);
-	reEnd.setFake (true);
-	re.chain (reEnd);
+        RETokenEnd reEnd = new RETokenEnd (0, null);
+        reEnd.setFake (true);
+        re.chain (reEnd);
       }
     // Create a new REMatch to hold results
     REMatch mymatch = new REMatch (numSubs, anchor, eflags);
     do
       {
-	/* The following potimization is commented out because
-	   the matching should be tried even if the length of
-	   input is obviously too short in order that
-	   java.util.regex.Matcher#hitEnd() may work correctly.
-	   // Optimization: check if anchor + minimumLength > length
-	   if (minimumLength == 0 || input.charAt(minimumLength-1) != CharIndexed.OUT_OF_BOUNDS) {
-	 */
-	if (re.match (input, mymatch))
-	  {
-	    REMatch best = mymatch;
-	    // We assume that the match that coms first is the best.
-	    // And the following "The longer, the better" rule has
-	    // been commented out. The longest is not neccesarily
-	    // the best. For example, "a" out of "aaa" is the best
-	    // match for /a+?/.
-	    /*
-	       // Find best match of them all to observe leftmost longest
-	       while ((mymatch = mymatch.next) != null) {
-	       if (mymatch.index > best.index) {
-	       best = mymatch;
-	       }
-	       }
-	     */
-	    best.end[0] = best.index;
-	    best.finish (input);
-	    input.setLastMatch (best);
-	    return best;
-	  }
-	/* End of the optimization commented out
-	   }
-	 */
-	mymatch.clear (++anchor);
-	// Append character to buffer if needed
-	if (buffer != null && input.charAt (0) != CharIndexed.OUT_OF_BOUNDS)
-	  {
-	    buffer.append (input.charAt (0));
-	  }
-	// java.util.regex.Matcher#hitEnd() requires that the search should
-	// be tried at the end of input, so we use move1(1) instead of move(1) 
+        /* The following potimization is commented out because
+           the matching should be tried even if the length of
+           input is obviously too short in order that
+           java.util.regex.Matcher#hitEnd() may work correctly.
+           // Optimization: check if anchor + minimumLength > length
+           if (minimumLength == 0 || input.charAt(minimumLength-1) != CharIndexed.OUT_OF_BOUNDS) {
+         */
+        if (re.match (input, mymatch))
+          {
+            REMatch best = mymatch;
+            // We assume that the match that coms first is the best.
+            // And the following "The longer, the better" rule has
+            // been commented out. The longest is not neccesarily
+            // the best. For example, "a" out of "aaa" is the best
+            // match for /a+?/.
+            /*
+               // Find best match of them all to observe leftmost longest
+               while ((mymatch = mymatch.next) != null) {
+               if (mymatch.index > best.index) {
+               best = mymatch;
+               }
+               }
+             */
+            best.end[0] = best.index;
+            best.finish (input);
+            input.setLastMatch (best);
+            return best;
+          }
+        /* End of the optimization commented out
+           }
+         */
+        mymatch.clear (++anchor);
+        // Append character to buffer if needed
+        if (buffer != null && input.charAt (0) != CharIndexed.OUT_OF_BOUNDS)
+          {
+            buffer.append (input.charAt (0));
+          }
+        // java.util.regex.Matcher#hitEnd() requires that the search should
+        // be tried at the end of input, so we use move1(1) instead of move(1)
       }
     while (doMove && input.move1 (1));
 
     // Special handling at end of input for e.g. "$"
     if (minimumLength == 0)
       {
-	if (match (input, mymatch))
-	  {
-	    mymatch.finish (input);
-	    return mymatch;
-	  }
+        if (match (input, mymatch))
+          {
+            mymatch.finish (input);
+            return mymatch;
+          }
       }
 
     return null;
@@ -2283,10 +2283,10 @@ public class RE extends REToken
    *  set to the index position specified.
    */
   public REMatchEnumeration getMatchEnumeration (Object input, int index,
-						 int eflags)
+                                                 int eflags)
   {
     return new REMatchEnumeration (this, makeCharIndexed (input, index),
-				   index, eflags);
+                                   index, eflags);
   }
 
 
@@ -2307,7 +2307,7 @@ public class RE extends REToken
    * Substitutes the replacement text for the first match found in the input
    * beginning at the specified index position.  Specifying an index
    * effectively causes the regular expression engine to throw away the
-   * specified number of characters. 
+   * specified number of characters.
    *
    * @param input The input text.
    * @param replace The replacement text, which may contain $x metacharacters (see REMatch.substituteInto).
@@ -2335,14 +2335,14 @@ public class RE extends REToken
    * @see REMatch#substituteInto
    */
   public String substitute (Object input, String replace, int index,
-			    int eflags)
+                            int eflags)
   {
     return substituteImpl (makeCharIndexed (input, index), replace, index,
-			   eflags);
+                           eflags);
   }
 
   private String substituteImpl (CharIndexed input, String replace, int index,
-				 int eflags)
+                                 int eflags)
   {
     CPStringBuilder buffer = new CPStringBuilder ();
     REMatch m = getMatchImpl (input, index, eflags, buffer);
@@ -2351,17 +2351,17 @@ public class RE extends REToken
     buffer.append (getReplacement (replace, m, eflags));
     if (input.move (m.end[0]))
       {
-	do
-	  {
-	    buffer.append (input.charAt (0));
-	  }
-	while (input.move (1));
+        do
+          {
+            buffer.append (input.charAt (0));
+          }
+        while (input.move (1));
       }
     return buffer.toString ();
   }
 
   /**
-   * Substitutes the replacement text for each non-overlapping match found 
+   * Substitutes the replacement text for each non-overlapping match found
    * in the input text.
    *
    * @param input The input text.
@@ -2375,7 +2375,7 @@ public class RE extends REToken
   }
 
   /**
-   * Substitutes the replacement text for each non-overlapping match found 
+   * Substitutes the replacement text for each non-overlapping match found
    * in the input text, starting at the specified index.
    *
    * If the regular expression allows the empty string to match, it will
@@ -2394,7 +2394,7 @@ public class RE extends REToken
   }
 
   /**
-   * Substitutes the replacement text for each non-overlapping match found 
+   * Substitutes the replacement text for each non-overlapping match found
    * in the input text, starting at the specified index and using the
    * specified execution flags.
    *
@@ -2407,35 +2407,35 @@ public class RE extends REToken
    * @see REMatch#substituteInto
    */
   public String substituteAll (Object input, String replace, int index,
-			       int eflags)
+                               int eflags)
   {
     return substituteAllImpl (makeCharIndexed (input, index), replace, index,
-			      eflags);
+                              eflags);
   }
 
   private String substituteAllImpl (CharIndexed input, String replace,
-				    int index, int eflags)
+                                    int index, int eflags)
   {
     CPStringBuilder buffer = new CPStringBuilder ();
     REMatch m;
     while ((m = getMatchImpl (input, index, eflags, buffer)) != null)
       {
-	buffer.append (getReplacement (replace, m, eflags));
-	index = m.getEndIndex ();
-	if (m.end[0] == 0)
-	  {
-	    char ch = input.charAt (0);
-	    if (ch != CharIndexed.OUT_OF_BOUNDS)
-	      buffer.append (ch);
-	    input.move (1);
-	  }
-	else
-	  {
-	    input.move (m.end[0]);
-	  }
+        buffer.append (getReplacement (replace, m, eflags));
+        index = m.getEndIndex ();
+        if (m.end[0] == 0)
+          {
+            char ch = input.charAt (0);
+            if (ch != CharIndexed.OUT_OF_BOUNDS)
+              buffer.append (ch);
+            input.move (1);
+          }
+        else
+          {
+            input.move (m.end[0]);
+          }
 
-	if (!input.isValid ())
-	  break;
+        if (!input.isValid ())
+          break;
       }
     return buffer.toString ();
   }
@@ -2446,36 +2446,36 @@ public class RE extends REToken
       return replace;
     else
       {
-	if ((eflags & REG_REPLACE_USE_BACKSLASHESCAPE) > 0)
-	  {
-	    CPStringBuilder sb = new CPStringBuilder ();
-	    int l = replace.length ();
-	    for (int i = 0; i < l; i++)
-	      {
-		char c = replace.charAt (i);
-		switch (c)
-		  {
-		  case '\\':
-		    i++;
-		    // Let StringIndexOutOfBoundsException be thrown.
-		    sb.append (replace.charAt (i));
-		    break;
-		  case '$':
-		    int i1 = i + 1;
-		    while (i1 < replace.length () &&
-			   Character.isDigit (replace.charAt (i1)))
-		      i1++;
-		    sb.append (m.substituteInto (replace.substring (i, i1)));
-		    i = i1 - 1;
-		    break;
-		  default:
-		    sb.append (c);
-		  }
-	      }
-	    return sb.toString ();
-	  }
-	else
-	  return m.substituteInto (replace);
+        if ((eflags & REG_REPLACE_USE_BACKSLASHESCAPE) > 0)
+          {
+            CPStringBuilder sb = new CPStringBuilder ();
+            int l = replace.length ();
+            for (int i = 0; i < l; i++)
+              {
+                char c = replace.charAt (i);
+                switch (c)
+                  {
+                  case '\\':
+                    i++;
+                    // Let StringIndexOutOfBoundsException be thrown.
+                    sb.append (replace.charAt (i));
+                    break;
+                  case '$':
+                    int i1 = i + 1;
+                    while (i1 < replace.length () &&
+                           Character.isDigit (replace.charAt (i1)))
+                      i1++;
+                    sb.append (m.substituteInto (replace.substring (i, i1)));
+                    i = i1 - 1;
+                    break;
+                  default:
+                    sb.append (c);
+                  }
+              }
+            return sb.toString ();
+          }
+        else
+          return m.substituteInto (replace);
       }
   }
 
@@ -2493,45 +2493,45 @@ public class RE extends REToken
 
     if (firstToken == null)
       {
-	lastToken = firstToken = next;
+        lastToken = firstToken = next;
       }
     else
       {
-	// if chain returns false, it "rejected" the token due to
-	// an optimization, and next was combined with lastToken
-	if (lastToken.chain (next))
-	  {
-	    lastToken = next;
-	  }
+        // if chain returns false, it "rejected" the token due to
+        // an optimization, and next was combined with lastToken
+        if (lastToken.chain (next))
+          {
+            lastToken = next;
+          }
       }
   }
 
   private static REToken setRepeated (REToken current, int min, int max,
-				      int index) throws REException
+                                      int index) throws REException
   {
     if (current == null)
       throw new REException (getLocalizedMessage ("repeat.no.token"),
-			     REException.REG_BADRPT, index);
+                             REException.REG_BADRPT, index);
       return new RETokenRepeated (current.subIndex, current, min, max);
   }
 
   private static int getPosixSet (char[]pattern, int index,
-				  CPStringBuilder buf)
+                                  CPStringBuilder buf)
   {
     // Precondition: pattern[index-1] == ':'
     // we will return pos of closing ']'.
     int i;
     for (i = index; i < (pattern.length - 1); i++)
       {
-	if ((pattern[i] == ':') && (pattern[i + 1] == ']'))
-	  return i + 2;
-	buf.append (pattern[i]);
+        if ((pattern[i] == ':') && (pattern[i + 1] == ']'))
+          return i + 2;
+        buf.append (pattern[i]);
       }
-    return index;		// didn't match up
+    return index;               // didn't match up
   }
 
   private int getMinMax (char[]input, int index, IntPair minMax,
-			 RESyntax syntax) throws REException
+                         RESyntax syntax) throws REException
   {
     // Precondition: input[index-1] == '{', minMax != null
 
@@ -2539,11 +2539,11 @@ public class RE extends REToken
     int startIndex = index;
     if (index == input.length)
       {
-	if (mustMatch)
-	  throw new REException (getLocalizedMessage ("unmatched.brace"),
-				 REException.REG_EBRACE, index);
-	else
-	  return startIndex;
+        if (mustMatch)
+          throw new REException (getLocalizedMessage ("unmatched.brace"),
+                                 REException.REG_EBRACE, index);
+        else
+          return startIndex;
       }
 
     int min, max = 0;
@@ -2553,20 +2553,20 @@ public class RE extends REToken
     // Read string of digits
     do
       {
-	index = getCharUnit (input, index, unit, false);
-	if (Character.isDigit (unit.ch))
-	  buf.append (unit.ch);
+        index = getCharUnit (input, index, unit, false);
+        if (Character.isDigit (unit.ch))
+          buf.append (unit.ch);
       }
     while ((index != input.length) && Character.isDigit (unit.ch));
 
     // Check for {} tomfoolery
     if (buf.length () == 0)
       {
-	if (mustMatch)
-	  throw new REException (getLocalizedMessage ("interval.error"),
-				 REException.REG_EBRACE, index);
-	else
-	return startIndex;
+        if (mustMatch)
+          throw new REException (getLocalizedMessage ("interval.error"),
+                                 REException.REG_EBRACE, index);
+        else
+        return startIndex;
       }
 
     min = Integer.parseInt (buf.toString ());
@@ -2575,8 +2575,8 @@ public class RE extends REToken
       max = min;
     else if (index == input.length)
       if (mustMatch)
-	throw new REException (getLocalizedMessage ("interval.no.end"),
-			       REException.REG_EBRACE, index);
+        throw new REException (getLocalizedMessage ("interval.no.end"),
+                               REException.REG_EBRACE, index);
     else
     return startIndex;
     else
@@ -2585,28 +2585,28 @@ public class RE extends REToken
       buf = new CPStringBuilder ();
       // Read string of digits
       while (((index =
-	       getCharUnit (input, index, unit, false)) != input.length)
-	     && Character.isDigit (unit.ch))
-	buf.append (unit.ch);
+               getCharUnit (input, index, unit, false)) != input.length)
+             && Character.isDigit (unit.ch))
+        buf.append (unit.ch);
 
       if (!
-	  ((unit.ch == '}')
-	   && (syntax.get (RESyntax.RE_NO_BK_BRACES) ^ unit.bk)))
-	if (mustMatch)
-	  throw new REException (getLocalizedMessage ("interval.error"),
-				 REException.REG_EBRACE, index);
+          ((unit.ch == '}')
+           && (syntax.get (RESyntax.RE_NO_BK_BRACES) ^ unit.bk)))
+        if (mustMatch)
+          throw new REException (getLocalizedMessage ("interval.error"),
+                                 REException.REG_EBRACE, index);
       else
       return startIndex;
 
       // This is the case of {x,}
       if (buf.length () == 0)
-	max = Integer.MAX_VALUE;
+        max = Integer.MAX_VALUE;
       else
-	max = Integer.parseInt (buf.toString ());
+        max = Integer.parseInt (buf.toString ());
     }
   else if (mustMatch)
     throw new REException (getLocalizedMessage ("interval.error"),
-			   REException.REG_EBRACE, index);
+                           REException.REG_EBRACE, index);
   else
   return startIndex;
 
@@ -2651,13 +2651,13 @@ public class RE extends REToken
     // be the most likely because this is the case with
     // java.util.regex.Matcher.
     // We could let a String or a CharSequence fall through
-    // to final input, but since it'a very likely input type, 
+    // to final input, but since it'a very likely input type,
     // we check it first.
     if (input instanceof CharIndexed)
       {
-	CharIndexed ci = (CharIndexed) input;
-	ci.setAnchor (index);
-	return ci;
+        CharIndexed ci = (CharIndexed) input;
+        ci.setAnchor (index);
+        return ci;
       }
     else if (input instanceof CharSequence)
       return new CharIndexedCharSequence ((CharSequence) input, index);
diff --git a/libjava/classpath/gnu/java/util/regex/REFilterInputStream.java b/libjava/classpath/gnu/java/util/regex/REFilterInputStream.java
index c7acb714a27..c9fb346bafa 100644
--- a/libjava/classpath/gnu/java/util/regex/REFilterInputStream.java
+++ b/libjava/classpath/gnu/java/util/regex/REFilterInputStream.java
@@ -70,7 +70,7 @@ public class REFilterInputStream extends FilterInputStream
    *
    * @param stream The InputStream to be filtered.
    * @param expr The regular expression to search for.
-   * @param replace The text pattern to replace matches with.  
+   * @param replace The text pattern to replace matches with.
    */
   public REFilterInputStream (InputStream stream, RE expr, String replace)
   {
@@ -89,7 +89,7 @@ public class REFilterInputStream extends FilterInputStream
     // If we have buffered replace data, use it.
     if ((buffer != null) && (bufpos < buffer.length ()))
       {
-	return (int) buffer.charAt (bufpos++);
+        return (int) buffer.charAt (bufpos++);
       }
 
     // check if input is at a valid position
@@ -99,18 +99,18 @@ public class REFilterInputStream extends FilterInputStream
     REMatch mymatch = new REMatch (expr.getNumSubs (), offset, 0);
     if (expr.match (stream, mymatch))
       {
-	mymatch.end[0] = mymatch.index;
-	mymatch.finish (stream);
-	stream.move (mymatch.toString ().length ());
-	offset += mymatch.toString ().length ();
-	buffer = mymatch.substituteInto (replace);
-	bufpos = 1;
+        mymatch.end[0] = mymatch.index;
+        mymatch.finish (stream);
+        stream.move (mymatch.toString ().length ());
+        offset += mymatch.toString ().length ();
+        buffer = mymatch.substituteInto (replace);
+        bufpos = 1;
 
-	// This is prone to infinite loops if replace string turns out empty.
-	if (buffer.length () > 0)
-	  {
-	    return buffer.charAt (0);
-	  }
+        // This is prone to infinite loops if replace string turns out empty.
+        if (buffer.length () > 0)
+          {
+            return buffer.charAt (0);
+          }
       }
     char ch = stream.charAt (0);
     if (ch == CharIndexed.OUT_OF_BOUNDS)
@@ -120,9 +120,9 @@ public class REFilterInputStream extends FilterInputStream
     return ch;
   }
 
-  /** 
+  /**
    * Returns false.  REFilterInputStream does not support mark() and
-   * reset() methods. 
+   * reset() methods.
    */
   public boolean markSupported ()
   {
@@ -136,11 +136,11 @@ public class REFilterInputStream extends FilterInputStream
     int ok = 0;
     while (len-- > 0)
       {
-	i = read ();
-	if (i == -1)
-	  return (ok == 0) ? -1 : ok;
-	b[off++] = (byte) i;
-	ok++;
+        i = read ();
+        if (i == -1)
+          return (ok == 0) ? -1 : ok;
+        b[off++] = (byte) i;
+        ok++;
       }
     return ok;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/REMatch.java b/libjava/classpath/gnu/java/util/regex/REMatch.java
index d29972e1dd8..5940094ba80 100644
--- a/libjava/classpath/gnu/java/util/regex/REMatch.java
+++ b/libjava/classpath/gnu/java/util/regex/REMatch.java
@@ -56,7 +56,7 @@ public final class REMatch implements Serializable, Cloneable
   private CharIndexed matchedCharIndexed;
 
   // These variables are package scope for fast access within the engine
-  int eflags;			// execution flags this match was made using
+  int eflags;                   // execution flags this match was made using
 
   // Offset in source text where match was tried.  This is zero-based;
   // the actual position in the source text is given by (offset + anchor).
@@ -68,19 +68,19 @@ public final class REMatch implements Serializable, Cloneable
   int anchor;
 
   // Package scope; used by RE.
-  int index;			// used while matching to mark current match position in input
+  int index;                    // used while matching to mark current match position in input
   // start1[i] is set when the i-th subexp starts. And start1[i] is copied
   // to start[i] when the i-th subexp ends.  So start[i] keeps the previously
   // assigned value while the i-th subexp is being processed. This makes
   // backreference to the i-th subexp within the i-th subexp possible.
-  int[] start;			// start positions (relative to offset) for each (sub)exp.
-  int[] start1;			// start positions (relative to offset) for each (sub)exp.
-  int[] end;			// end positions for the same
+  int[] start;                  // start positions (relative to offset) for each (sub)exp.
+  int[] start1;                 // start positions (relative to offset) for each (sub)exp.
+  int[] end;                    // end positions for the same
   // start[i] == -1 or end[i] == -1 means that the start/end position is void.
   // start[i] == p or end[i] == p where p < 0 and p != -1 means that
   // the actual start/end position is (p+1). Start/end positions may
   // become negative when the subexpression is in a RETokenLookBehind.
-  boolean empty;		// empty string matched. This flag is used only within
+  boolean empty;                // empty string matched. This flag is used only within
   // RETokenRepeated.
 
   BacktrackStack backtrackStack;
@@ -99,7 +99,7 @@ public final class REMatch implements Serializable, Cloneable
     }
     catch (CloneNotSupportedException e)
     {
-      throw new Error ();	// doesn't happen
+      throw new Error ();       // doesn't happen
     }
   }
 
@@ -133,13 +133,13 @@ public final class REMatch implements Serializable, Cloneable
     matchedCharIndexed = text;
     for (i = 0; i < start.length; i++)
       {
-	// If any subexpressions didn't terminate, they don't count
-	// TODO check if this code ever gets hit
-	if ((start[i] == -1) ^ (end[i] == -1))
-	  {
-	    start[i] = -1;
-	    end[i] = -1;
-	  }
+        // If any subexpressions didn't terminate, they don't count
+        // TODO check if this code ever gets hit
+        if ((start[i] == -1) ^ (end[i] == -1))
+          {
+            start[i] = -1;
+            end[i] = -1;
+          }
       }
     backtrackStack = null;
   }
@@ -151,7 +151,7 @@ public final class REMatch implements Serializable, Cloneable
     this.index = 0;
     for (int i = 0; i < start.length; i++)
       {
-	start[i] = start1[i] = end[i] = -1;
+        start[i] = start1[i] = end[i] = -1;
       }
     backtrackStack = null;
   }
@@ -160,7 +160,7 @@ public final class REMatch implements Serializable, Cloneable
      * Returns the string matching the pattern.  This makes it convenient
      * to write code like the following:
      * 
      
-     *  
+     * 
      * REMatch myMatch = myExpression.getMatch(myString);
      
      * if (myMatch != null) System.out.println("Regexp found: "+myMatch);
      *       
@@ -194,7 +194,7 @@ public final class REMatch implements Serializable, Cloneable
      * myMatch.getEndIndex());      
      * 
      
      * But you can save yourself that work, since the toString()
-     * method (above) does exactly that for you.  
+     * method (above) does exactly that for you.
      */
   public int getEndIndex ()
   {
@@ -219,21 +219,21 @@ public final class REMatch implements Serializable, Cloneable
       return (matchedText.substring (start[sub], end[sub]));
     else
       {
-	// This case occurs with RETokenLookAhead or RETokenLookBehind.
-	CPStringBuilder sb = new CPStringBuilder ();
-	int s = start[sub];
-	int e = end[sub];
-	if (s < 0)
-	  s += 1;
-	if (e < 0)
-	  e += 1;
-	for (int i = start[0] + s; i < start[0] + e; i++)
-	  sb.append (matchedCharIndexed.charAt (i));
-	return sb.toString ();
+        // This case occurs with RETokenLookAhead or RETokenLookBehind.
+        CPStringBuilder sb = new CPStringBuilder ();
+        int s = start[sub];
+        int e = end[sub];
+        if (s < 0)
+          s += 1;
+        if (e < 0)
+          e += 1;
+        for (int i = start[0] + s; i < start[0] + e; i++)
+          sb.append (matchedCharIndexed.charAt (i));
+        return sb.toString ();
       }
   }
 
-    /** 
+    /**
      * Returns the index within the input string used to generate this match
      * where subexpression number sub begins, or -1 if
      * the subexpression does not exist.  The initial position is zero.
@@ -249,7 +249,7 @@ public final class REMatch implements Serializable, Cloneable
     return (x == -1) ? x : (x >= 0) ? offset + x : offset + x + 1;
   }
 
-    /** 
+    /**
      * Returns the index within the input string used to generate this match
      * where subexpression number sub begins, or -1 if
      * the subexpression does not exist.  The initial position is zero.
@@ -265,7 +265,7 @@ public final class REMatch implements Serializable, Cloneable
     return (x == -1) ? x : (x >= 0) ? offset + x : offset + x + 1;
   }
 
-    /** 
+    /**
      * Returns the index within the input string used to generate this match
      * where subexpression number sub ends, or -1 if
      * the subexpression does not exist.  The initial position is zero.
@@ -281,7 +281,7 @@ public final class REMatch implements Serializable, Cloneable
     return (x == -1) ? x : (x >= 0) ? offset + x : offset + x + 1;
   }
 
-    /** 
+    /**
      * Returns the index within the input string used to generate this match
      * where subexpression number sub ends, or -1 if
      * the subexpression does not exist.  The initial position is zero.
@@ -314,30 +314,30 @@ public final class REMatch implements Serializable, Cloneable
     int pos;
     for (pos = 0; pos < input.length () - 1; pos++)
       {
-	if ((input.charAt (pos) == '$')
-	    && (Character.isDigit (input.charAt (pos + 1))))
-	  {
-	    int val = Character.digit (input.charAt (++pos), 10);
-	    int pos1 = pos + 1;
-	    while (pos1 < input.length () &&
-		   Character.isDigit (input.charAt (pos1)))
-	      {
-		int val1 =
-		  val * 10 + Character.digit (input.charAt (pos1), 10);
-		if (val1 >= start.length)
-		  break;
-		pos1++;
-		val = val1;
-	      }
-	    pos = pos1 - 1;
+        if ((input.charAt (pos) == '$')
+            && (Character.isDigit (input.charAt (pos + 1))))
+          {
+            int val = Character.digit (input.charAt (++pos), 10);
+            int pos1 = pos + 1;
+            while (pos1 < input.length () &&
+                   Character.isDigit (input.charAt (pos1)))
+              {
+                int val1 =
+                  val * 10 + Character.digit (input.charAt (pos1), 10);
+                if (val1 >= start.length)
+                  break;
+                pos1++;
+                val = val1;
+              }
+            pos = pos1 - 1;
 
-	    if (val < start.length)
-	      {
-		output.append (toString (val));
-	      }
-	  }
-	else
-	  output.append (input.charAt (pos));
+            if (val < start.length)
+              {
+                output.append (toString (val));
+              }
+          }
+        else
+          output.append (input.charAt (pos));
       }
     if (pos < input.length ())
       output.append (input.charAt (pos));
@@ -346,16 +346,16 @@ public final class REMatch implements Serializable, Cloneable
 
 /*  The following are used for debugging purpose
     public static String d(REMatch m) {
-	if (m == null) return "null";
+        if (m == null) return "null";
         else return "[" + m.index + "]";
     }
 
     public String substringUptoIndex(CharIndexed input) {
-	StringBuffer sb = new StringBuffer();
-	for (int i = 0; i < index; i++) {
-	    sb.append(input.charAt(i));
-	}
-	return sb.toString();
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < index; i++) {
+            sb.append(input.charAt(i));
+        }
+        return sb.toString();
     }
 */
 
diff --git a/libjava/classpath/gnu/java/util/regex/REMatchEnumeration.java b/libjava/classpath/gnu/java/util/regex/REMatchEnumeration.java
index f0c78be925c..04432d07caf 100644
--- a/libjava/classpath/gnu/java/util/regex/REMatchEnumeration.java
+++ b/libjava/classpath/gnu/java/util/regex/REMatchEnumeration.java
@@ -47,7 +47,7 @@ import java.util.NoSuchElementException;
  * An REMatchEnumeration enumerates regular expression matches over a
  * given input text.  You obtain a reference to an enumeration using
  * the getMatchEnumeration() methods on an instance of
- * RE. 
+ * RE.
  *
  * 
      
  *
@@ -59,15 +59,15 @@ import java.util.NoSuchElementException;
  * not need to be searched immediately.
  *
  * 
      
- * 
+ *
  * The enumerated type is especially useful when searching on a Reader
  * or InputStream, because the InputStream read position cannot be
  * guaranteed after calling getMatch() (see the
  * description of that method for an explanation of why).  Enumeration
  * also saves a lot of overhead required when calling
  * getMatch() multiple times.
- * 
- * @author Wes Biggs 
+ *
+ * @author Wes Biggs
  */
 public class REMatchEnumeration
   implements Enumeration < REMatch >, Serializable
@@ -113,17 +113,17 @@ public class REMatchEnumeration
   {
     if (more == MAYBE)
       {
-	match = expr.getMatchImpl (input, index, eflags, buffer);
-	if (match != null)
-	  {
-	    input.move ((match.end[0] > 0) ? match.end[0] : 1);
+        match = expr.getMatchImpl (input, index, eflags, buffer);
+        if (match != null)
+          {
+            input.move ((match.end[0] > 0) ? match.end[0] : 1);
 
-	    index =
-	      (match.end[0] > 0) ? match.end[0] + match.offset : index + 1;
-	    more = YES;
-	  }
-	else
-	  more = NO;
+            index =
+              (match.end[0] > 0) ? match.end[0] + match.offset : index + 1;
+            more = YES;
+          }
+        else
+          more = NO;
       }
     return (more == YES);
   }
@@ -133,8 +133,8 @@ public class REMatchEnumeration
   {
     if (hasMoreElements ())
       {
-	more = (input.isValid ())? MAYBE : NO;
-	return match;
+        more = (input.isValid ())? MAYBE : NO;
+        return match;
       }
     throw new NoSuchElementException ();
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RESyntax.java b/libjava/classpath/gnu/java/util/regex/RESyntax.java
index 38d70564d4a..2080cb7631e 100644
--- a/libjava/classpath/gnu/java/util/regex/RESyntax.java
+++ b/libjava/classpath/gnu/java/util/regex/RESyntax.java
@@ -94,7 +94,7 @@ public final class RESyntax implements Serializable
 
   /**
    * Syntax bit. Repetition and alternation operators are invalid
-   * at start and end of pattern and other places. 
+   * at start and end of pattern and other places.
    * Not implemented.
    */
   public static final int RE_CONTEXT_INVALID_OPS = 5;
@@ -115,7 +115,7 @@ public final class RESyntax implements Serializable
   public static final int RE_INTERVALS = 8;
 
   /**
-   * Syntax bit. No alternation (|), match one-or-more (+), or 
+   * Syntax bit. No alternation (|), match one-or-more (+), or
    * match zero-or-one (?) operators.
    */
   public static final int RE_LIMITED_OPS = 9;
@@ -123,7 +123,7 @@ public final class RESyntax implements Serializable
   /**
    * Syntax bit. Newline is an alternation operator.
    */
-  public static final int RE_NEWLINE_ALT = 10;	// impl.
+  public static final int RE_NEWLINE_ALT = 10;  // impl.
 
   /**
    * Syntax bit. Intervals use { } instead of \{ \}
@@ -317,7 +317,7 @@ public final class RESyntax implements Serializable
    * Emulates regular expression support in Larry Wall's perl, version 4,
    * using single line mode (/s modifier).
    */
-  public static final RESyntax RE_SYNTAX_PERL4_S;	// single line mode (/s)
+  public static final RESyntax RE_SYNTAX_PERL4_S;       // single line mode (/s)
 
   /**
    * Predefined syntax.
@@ -403,23 +403,23 @@ public final class RESyntax implements Serializable
 
     /* There is no official Perl spec, but here's a "best guess" */
 
-      RE_SYNTAX_PERL4 = new RESyntax ().set (RE_BACKSLASH_ESCAPE_IN_LISTS).set (RE_CONTEXT_INDEP_ANCHORS).set (RE_CONTEXT_INDEP_OPS)	// except for '{', apparently
-      .set (RE_INTERVALS).set (RE_NO_BK_BRACES).set (RE_NO_BK_PARENS).set (RE_NO_BK_VBAR).set (RE_NO_EMPTY_RANGES).set (RE_CHAR_CLASS_ESCAPES)	// \d,\D,\w,\W,\s,\S
+      RE_SYNTAX_PERL4 = new RESyntax ().set (RE_BACKSLASH_ESCAPE_IN_LISTS).set (RE_CONTEXT_INDEP_ANCHORS).set (RE_CONTEXT_INDEP_OPS)    // except for '{', apparently
+      .set (RE_INTERVALS).set (RE_NO_BK_BRACES).set (RE_NO_BK_PARENS).set (RE_NO_BK_VBAR).set (RE_NO_EMPTY_RANGES).set (RE_CHAR_CLASS_ESCAPES)  // \d,\D,\w,\W,\s,\S
       .makeFinal ();
 
       RE_SYNTAX_PERL4_S =
       new RESyntax (RE_SYNTAX_PERL4).set (RE_DOT_NEWLINE).makeFinal ();
 
-      RE_SYNTAX_PERL5 = new RESyntax (RE_SYNTAX_PERL4).set (RE_PURE_GROUPING)	// (?:)
-      .set (RE_STINGY_OPS)	// *?,??,+?,{}?
-      .set (RE_LOOKAHEAD)	// (?=)(?!)
-      .set (RE_STRING_ANCHORS)	// \A,\Z
-      .set (RE_CHAR_CLASS_ESC_IN_LISTS)	// \d,\D,\w,\W,\s,\S within []
-      .set (RE_COMMENTS)	// (?#)
-      .set (RE_EMBEDDED_FLAGS)	// (?imsx-imsx)
-      .set (RE_OCTAL_CHAR)	// \0377
-      .set (RE_HEX_CHAR)	// \x1b
-      .set (RE_NAMED_PROPERTY)	// \p{prop}, \P{prop}
+      RE_SYNTAX_PERL5 = new RESyntax (RE_SYNTAX_PERL4).set (RE_PURE_GROUPING)   // (?:)
+      .set (RE_STINGY_OPS)      // *?,??,+?,{}?
+      .set (RE_LOOKAHEAD)       // (?=)(?!)
+      .set (RE_STRING_ANCHORS)  // \A,\Z
+      .set (RE_CHAR_CLASS_ESC_IN_LISTS) // \d,\D,\w,\W,\s,\S within []
+      .set (RE_COMMENTS)        // (?#)
+      .set (RE_EMBEDDED_FLAGS)  // (?imsx-imsx)
+      .set (RE_OCTAL_CHAR)      // \0377
+      .set (RE_HEX_CHAR)        // \x1b
+      .set (RE_NAMED_PROPERTY)  // \p{prop}, \P{prop}
       .makeFinal ();
 
       RE_SYNTAX_PERL5_S =
@@ -427,9 +427,9 @@ public final class RESyntax implements Serializable
 
       RE_SYNTAX_JAVA_1_4 = new RESyntax (RE_SYNTAX_PERL5)
       // XXX
-      .set (RE_POSSESSIVE_OPS)	// *+,?+,++,{}+
-      .set (RE_UNICODE_CHAR)	// \u1234
-      .set (RE_NESTED_CHARCLASS)	// [a-z&&[^p-r]]
+      .set (RE_POSSESSIVE_OPS)  // *+,?+,++,{}+
+      .set (RE_UNICODE_CHAR)    // \u1234
+      .set (RE_NESTED_CHARCLASS)        // [a-z&&[^p-r]]
       .makeFinal ();
   }
 
@@ -457,7 +457,7 @@ public final class RESyntax implements Serializable
   }
 
   /**
-   * Construct a new syntax object with all bits set the same 
+   * Construct a new syntax object with all bits set the same
    * as the other syntax.
    */
   public RESyntax (RESyntax other)
@@ -474,7 +474,7 @@ public final class RESyntax implements Serializable
   }
 
   /**
-   * Set a given bit in this syntax. 
+   * Set a given bit in this syntax.
    *
    * @param index the constant (RESyntax.RE_xxx) bit to set.
    * @return a reference to this object for easy chaining.
@@ -488,7 +488,7 @@ public final class RESyntax implements Serializable
   }
 
   /**
-   * Clear a given bit in this syntax. 
+   * Clear a given bit in this syntax.
    *
    * @param index the constant (RESyntax.RE_xxx) bit to clear.
    * @return a reference to this object for easy chaining.
@@ -516,7 +516,7 @@ public final class RESyntax implements Serializable
      * characters that have specific meaning within the current syntax
      * can cause unexpected chronosynclastic infundibula.
      *
-     * @return this object for convenient chaining 
+     * @return this object for convenient chaining
      */
   public RESyntax setLineSeparator (String aSeparator)
   {
diff --git a/libjava/classpath/gnu/java/util/regex/REToken.java b/libjava/classpath/gnu/java/util/regex/REToken.java
index 681ac517f04..ed9b3174701 100644
--- a/libjava/classpath/gnu/java/util/regex/REToken.java
+++ b/libjava/classpath/gnu/java/util/regex/REToken.java
@@ -58,7 +58,7 @@ abstract class REToken implements Serializable, Cloneable
     }
     catch (CloneNotSupportedException e)
     {
-      throw new Error ();	// doesn't happen
+      throw new Error ();       // doesn't happen
     }
   }
 
@@ -96,15 +96,15 @@ abstract class REToken implements Serializable, Cloneable
   {
     if (!fake)
       {
-	setHitEnd (input, mymatch);
+        setHitEnd (input, mymatch);
       }
     REMatch m = matchThis (input, mymatch);
     if (m == null)
       return false;
     if (next (input, m))
       {
-	mymatch.assignFrom (m);
-	return true;
+        mymatch.assignFrom (m);
+        return true;
       }
     return false;
   }
@@ -188,7 +188,7 @@ abstract class REToken implements Serializable, Cloneable
   boolean chain (REToken token)
   {
     next = token;
-    return true;		// Token was accepted
+    return true;                // Token was accepted
   }
 
   abstract void dump (CPStringBuilder os);
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenAny.java b/libjava/classpath/gnu/java/util/regex/RETokenAny.java
index c002d050423..f5039682dd2 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenAny.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenAny.java
@@ -71,8 +71,8 @@ final class RETokenAny extends REToken
     boolean retval = matchOneChar (ch);
     if (retval)
       {
-	++mymatch.index;
-	return mymatch;
+        ++mymatch.index;
+        return mymatch;
       }
     return null;
   }
@@ -80,9 +80,9 @@ final class RETokenAny extends REToken
   boolean matchOneChar (char ch)
   {
     if ((ch == CharIndexed.OUT_OF_BOUNDS)
-	|| (!newline && (ch == '\n')) || (matchNull && (ch == 0)))
+        || (!newline && (ch == '\n')) || (matchNull && (ch == 0)))
       {
-	return false;
+        return false;
       }
     return true;
   }
@@ -98,12 +98,12 @@ final class RETokenAny extends REToken
     int numRepeats = 0;
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	char ch = input.charAt (index++);
-	if (!matchOneChar (ch))
-	  break;
-	numRepeats++;
+        if (numRepeats >= max)
+          break;
+        char ch = input.charAt (index++);
+        if (!matchOneChar (ch))
+          break;
+        numRepeats++;
       }
     return numRepeats;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenBackRef.java b/libjava/classpath/gnu/java/util/regex/RETokenBackRef.java
index 8f146222d95..52061ca2ed2 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenBackRef.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenBackRef.java
@@ -64,30 +64,30 @@ final class RETokenBackRef extends REToken
     b = mymatch.start[num];
     e = mymatch.end[num];
     if ((b == -1) || (e == -1))
-      return null;		// this shouldn't happen, but...
+      return null;              // this shouldn't happen, but...
     if (b < 0)
       b += 1;
     if (e < 0)
       e += 1;
     for (int i = b; i < e; i++)
       {
-	char c1 = input.charAt (mymatch.index + i - b);
-	char c2 = input.charAt (i);
-	if (c1 != c2)
-	  {
-	    if (insens)
-	      {
-		if (c1 != toLowerCase (c2, unicodeAware) &&
-		    c1 != toUpperCase (c2, unicodeAware))
-		  {
-		    return null;
-		  }
-	      }
-	    else
-	      {
-		return null;
-	      }
-	  }
+        char c1 = input.charAt (mymatch.index + i - b);
+        char c2 = input.charAt (i);
+        if (c1 != c2)
+          {
+            if (insens)
+              {
+                if (c1 != toLowerCase (c2, unicodeAware) &&
+                    c1 != toUpperCase (c2, unicodeAware))
+                  {
+                    return null;
+                  }
+              }
+            else
+              {
+                return null;
+              }
+          }
       }
     mymatch.index += e - b;
     return mymatch;
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenChar.java b/libjava/classpath/gnu/java/util/regex/RETokenChar.java
index babcf3e4e93..3469ecfa86c 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenChar.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenChar.java
@@ -67,8 +67,8 @@ final class RETokenChar extends REToken
   {
     if (matchOneString (input, mymatch.index))
       {
-	mymatch.index += matchedLength;
-	return mymatch;
+        mymatch.index += matchedLength;
+        return mymatch;
       }
     // java.util.regex.Matcher#hitEnd() requires that the length of
     // partial match be counted.
@@ -85,12 +85,12 @@ final class RETokenChar extends REToken
     char c;
     for (int i = 0; i < z; i++)
       {
-	c = input.charAt (index + i);
-	if (!charEquals (c, ch[i]))
-	  {
-	    return false;
-	  }
-	++matchedLength;
+        c = input.charAt (index + i);
+        if (!charEquals (c, ch[i]))
+          {
+            return false;
+          }
+        ++matchedLength;
       }
     return true;
   }
@@ -120,15 +120,15 @@ final class RETokenChar extends REToken
     int z = ch.length;
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	if (matchOneString (input, index))
-	  {
-	    index += z;
-	    numRepeats++;
-	  }
-	else
-	  break;
+        if (numRepeats >= max)
+          break;
+        if (matchOneString (input, index))
+          {
+            index += z;
+            numRepeats++;
+          }
+        else
+          break;
       }
     return numRepeats;
   }
@@ -138,18 +138,18 @@ final class RETokenChar extends REToken
   {
     if (next instanceof RETokenChar && ((RETokenChar) next).insens == insens)
       {
-	RETokenChar cnext = (RETokenChar) next;
-	int newsize = ch.length + cnext.ch.length;
+        RETokenChar cnext = (RETokenChar) next;
+        int newsize = ch.length + cnext.ch.length;
 
-	char[] chTemp = new char[newsize];
+        char[] chTemp = new char[newsize];
 
-	System.arraycopy (ch, 0, chTemp, 0, ch.length);
-	System.arraycopy (cnext.ch, 0, chTemp, ch.length, cnext.ch.length);
+        System.arraycopy (ch, 0, chTemp, 0, ch.length);
+        System.arraycopy (cnext.ch, 0, chTemp, ch.length, cnext.ch.length);
 
-	ch = chTemp;
-	if (cnext.next == null)
-	  return false;
-	return chain (cnext.next);
+        ch = chTemp;
+        if (cnext.next == null)
+          return false;
+        return chain (cnext.next);
       }
     else
       return super.chain (next);
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenEnd.java b/libjava/classpath/gnu/java/util/regex/RETokenEnd.java
index 33e0febb7b2..28d78231a94 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenEnd.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenEnd.java
@@ -92,38 +92,38 @@ final class RETokenEnd extends REToken
       return ((mymatch.eflags & RE.REG_NOTEOL) > 0) ? null : mymatch;
     if (check_java_line_terminators)
       {
-	if (ch == '\n')
-	  {
-	    char ch1 = input.charAt (mymatch.index - 1);
-	    if (ch1 == '\r')
-	      return null;
-	    return mymatch;
-	  }
-	if (ch == '\r')
-	  return mymatch;
-	if (ch == '\u0085')
-	  return mymatch;	// A next-line character
-	if (ch == '\u2028')
-	  return mymatch;	// A line-separator character
-	if (ch == '\u2029')
-	  return mymatch;	// A paragraph-separator character
-	return null;
+        if (ch == '\n')
+          {
+            char ch1 = input.charAt (mymatch.index - 1);
+            if (ch1 == '\r')
+              return null;
+            return mymatch;
+          }
+        if (ch == '\r')
+          return mymatch;
+        if (ch == '\u0085')
+          return mymatch;       // A next-line character
+        if (ch == '\u2028')
+          return mymatch;       // A line-separator character
+        if (ch == '\u2029')
+          return mymatch;       // A paragraph-separator character
+        return null;
       }
     if (newline != null)
       {
-	char z;
-	int i = 0;		// position in newline
-	do
-	  {
-	    z = newline.charAt (i);
-	    if (ch != z)
-	      return null;
-	    ++i;
-	    ch = input.charAt (mymatch.index + i);
-	  }
-	while (i < newline.length ());
+        char z;
+        int i = 0;              // position in newline
+        do
+          {
+            z = newline.charAt (i);
+            if (ch != z)
+              return null;
+            ++i;
+            ch = input.charAt (mymatch.index + i);
+          }
+        while (i < newline.length ());
 
-	return mymatch;
+        return mymatch;
       }
     return null;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java b/libjava/classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
index e4ad6194168..67a1b852e3a 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenEndOfPreviousMatch.java
@@ -58,13 +58,13 @@ class RETokenEndOfPreviousMatch extends RETokenStart
     if (lastMatch == null)
       return super.matchThis (input, mymatch);
     if (input.getAnchor () + mymatch.index ==
-	lastMatch.anchor + lastMatch.index)
+        lastMatch.anchor + lastMatch.index)
       {
-	return mymatch;
+        return mymatch;
       }
     else
       {
-	return null;
+        return null;
       }
   }
 
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenIndependent.java b/libjava/classpath/gnu/java/util/regex/RETokenIndependent.java
index 8ad728df837..089aa18aff8 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenIndependent.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenIndependent.java
@@ -67,10 +67,10 @@ final class RETokenIndependent extends REToken
     boolean b = re.match (input, mymatch);
     if (b)
       {
-	// Once we have found a match, we do not see other possible matches.
-	if (mymatch.backtrackStack != null)
-	  mymatch.backtrackStack.clear ();
-	return mymatch;
+        // Once we have found a match, we do not see other possible matches.
+        if (mymatch.backtrackStack != null)
+          mymatch.backtrackStack.clear ();
+        return mymatch;
 
       }
     return null;
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenLookAhead.java b/libjava/classpath/gnu/java/util/regex/RETokenLookAhead.java
index 1dc6019380f..34625aac6d5 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenLookAhead.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenLookAhead.java
@@ -65,16 +65,16 @@ final class RETokenLookAhead extends REToken
     REMatch trymatch = (REMatch) mymatch.clone ();
     if (re.match (input, trymatch))
       {
-	if (negative)
-	  return null;
-	trymatch.index = mymatch.index;
-	return trymatch;
+        if (negative)
+          return null;
+        trymatch.index = mymatch.index;
+        return trymatch;
       }
     else
       {
-	if (negative)
-	  return mymatch;
-	return null;
+        if (negative)
+          return mymatch;
+        return null;
       }
   }
 
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenLookBehind.java b/libjava/classpath/gnu/java/util/regex/RETokenLookBehind.java
index f61c93c0abb..c85e37f693a 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenLookBehind.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenLookBehind.java
@@ -73,29 +73,29 @@ final class RETokenLookBehind extends REToken
     re1.chain (stopper);
     if (re1.match (behind, trymatch))
       {
-	if (negative)
-	  return null;
-	for (int i = 0; i < trymatch.start.length; i++)
-	  {
-	    if (trymatch.start[i] != -1 && trymatch.end[i] != -1)
-	      {
-		trymatch.start[i] -= diff;
-		if (trymatch.start[i] < 0)
-		  trymatch.start[i] -= 1;
-		trymatch.end[i] -= diff;
-		if (trymatch.end[i] < 0)
-		  trymatch.end[i] -= 1;
-	      }
-	  }
-	trymatch.index = mymatch.index;
-	trymatch.offset = mymatch.offset;
-	return trymatch;
+        if (negative)
+          return null;
+        for (int i = 0; i < trymatch.start.length; i++)
+          {
+            if (trymatch.start[i] != -1 && trymatch.end[i] != -1)
+              {
+                trymatch.start[i] -= diff;
+                if (trymatch.start[i] < 0)
+                  trymatch.start[i] -= 1;
+                trymatch.end[i] -= diff;
+                if (trymatch.end[i] < 0)
+                  trymatch.end[i] -= 1;
+              }
+          }
+        trymatch.index = mymatch.index;
+        trymatch.offset = mymatch.offset;
+        return trymatch;
       }
     else
       {
-	if (negative)
-	  return mymatch;
-	return null;
+        if (negative)
+          return mymatch;
+        return null;
       }
   }
 
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java b/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
index 1683cb1bf67..340da03fb4d 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenNamedProperty.java
@@ -96,7 +96,7 @@ final class RETokenNamedProperty extends REToken
   };
 
   RETokenNamedProperty (int subIndex, String name, boolean insens,
-			boolean negate) throws REException
+                        boolean negate) throws REException
   {
     super (subIndex);
     this.name = name;
@@ -121,8 +121,8 @@ final class RETokenNamedProperty extends REToken
     boolean retval = matchOneChar (ch);
     if (retval)
       {
-	++mymatch.index;
-	return mymatch;
+        ++mymatch.index;
+        return mymatch;
       }
     return null;
   }
@@ -135,9 +135,9 @@ final class RETokenNamedProperty extends REToken
     boolean retval = handler.includes (ch);
     if (insens)
       {
-	retval = retval ||
-	  handler.includes (toUpperCase (ch, unicodeAware)) ||
-	  handler.includes (toLowerCase (ch, unicodeAware));
+        retval = retval ||
+          handler.includes (toUpperCase (ch, unicodeAware)) ||
+          handler.includes (toLowerCase (ch, unicodeAware));
       }
 
     if (negate)
@@ -156,12 +156,12 @@ final class RETokenNamedProperty extends REToken
     int numRepeats = 0;
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	char ch = input.charAt (index++);
-	if (!matchOneChar (ch))
-	  break;
-	numRepeats++;
+        if (numRepeats >= max)
+          break;
+        char ch = input.charAt (index++);
+        if (!matchOneChar (ch))
+          break;
+        numRepeats++;
       }
     return numRepeats;
   }
@@ -179,37 +179,37 @@ final class RETokenNamedProperty extends REToken
   private Handler getHandler (String name) throws REException
   {
     if (name.equals ("Lower") || name.equals ("Upper") ||
-	// name.equals("ASCII") ||
-	name.equals ("Alpha") ||
-	name.equals ("Digit") ||
-	name.equals ("Alnum") ||
-	name.equals ("Punct") ||
-	name.equals ("Graph") ||
-	name.equals ("Print") ||
-	name.equals ("Blank") ||
-	name.equals ("Cntrl") ||
-	name.equals ("XDigit") || name.equals ("Space"))
+        // name.equals("ASCII") ||
+        name.equals ("Alpha") ||
+        name.equals ("Digit") ||
+        name.equals ("Alnum") ||
+        name.equals ("Punct") ||
+        name.equals ("Graph") ||
+        name.equals ("Print") ||
+        name.equals ("Blank") ||
+        name.equals ("Cntrl") ||
+        name.equals ("XDigit") || name.equals ("Space"))
       {
-	return new POSIXHandler (name);
+        return new POSIXHandler (name);
       }
     if (name.startsWith ("In"))
       {
-	try
-	{
-	  name = name.substring (2);
-	  Character.UnicodeBlock block =
-	    Character.UnicodeBlock.forName (name);
-	  return new UnicodeBlockHandler (block);
-	}
-	catch (IllegalArgumentException e)
-	{
-	  throw new REException ("Invalid Unicode block name: " + name,
-				 REException.REG_ESCAPE, 0);
-	}
+        try
+        {
+          name = name.substring (2);
+          Character.UnicodeBlock block =
+            Character.UnicodeBlock.forName (name);
+          return new UnicodeBlockHandler (block);
+        }
+        catch (IllegalArgumentException e)
+        {
+          throw new REException ("Invalid Unicode block name: " + name,
+                                 REException.REG_ESCAPE, 0);
+        }
       }
     if (name.startsWith ("Is"))
       {
-	name = name.substring (2);
+        name = name.substring (2);
       }
 
     // "grouped properties"
@@ -291,27 +291,27 @@ final class RETokenNamedProperty extends REToken
     if (name.equals ("all"))
       return new Handler ()
       {
-	public boolean includes (char c)
-	{
-	  return true;
-	}
+        public boolean includes (char c)
+        {
+          return true;
+        }
       };
     if (name.startsWith ("java"))
       {
-	try
-	{
-	  Method m = Character.class.getMethod ("is" + name.substring (4),
-						Character.TYPE);
-	  return new JavaCategoryHandler (m);
-	}
-	catch (NoSuchMethodException e)
-	{
-	  throw new REException ("Unsupported Java handler: " + name, e,
-				 REException.REG_ESCAPE, 0);
-	}
+        try
+        {
+          Method m = Character.class.getMethod ("is" + name.substring (4),
+                                                Character.TYPE);
+          return new JavaCategoryHandler (m);
+        }
+        catch (NoSuchMethodException e)
+        {
+          throw new REException ("Unsupported Java handler: " + name, e,
+                                 REException.REG_ESCAPE, 0);
+        }
       }
     throw new REException ("unsupported name " + name, REException.REG_ESCAPE,
-			   0);
+                           0);
   }
 
   private static class POSIXHandler extends Handler
@@ -321,9 +321,9 @@ final class RETokenNamedProperty extends REToken
     {
       int posixId = RETokenPOSIX.intValue (name.toLowerCase ());
       if (posixId != -1)
-	  retoken = new RETokenPOSIX (0, posixId, false, false);
+          retoken = new RETokenPOSIX (0, posixId, false, false);
       else
-	  throw new RuntimeException ("Unknown posix ID: " + name);
+          throw new RuntimeException ("Unknown posix ID: " + name);
     }
     public boolean includes (char c)
     {
@@ -355,8 +355,8 @@ final class RETokenNamedProperty extends REToken
     {
       int category = Character.getType (c);
       for (int i = 0; i < categories.length; i++)
-	if (category == categories[i])
-	  return true;
+        if (category == categories[i])
+          return true;
       return false;
     }
   }
@@ -394,15 +394,15 @@ final class RETokenNamedProperty extends REToken
     {
       try
       {
-	return (Boolean) method.invoke (null, c);
+        return (Boolean) method.invoke (null, c);
       }
       catch (IllegalAccessException e)
       {
-	throw new InternalError ("Unable to access method " + method);
+        throw new InternalError ("Unable to access method " + method);
       }
       catch (InvocationTargetException e)
       {
-	throw new InternalError ("Error invoking " + method);
+        throw new InternalError ("Error invoking " + method);
       }
     }
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenOneOf.java b/libjava/classpath/gnu/java/util/regex/RETokenOneOf.java
index fcae3c2d1d9..3bea889ec91 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenOneOf.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenOneOf.java
@@ -59,7 +59,7 @@ final class RETokenOneOf extends REToken
   // the basic part /2-7a-c/ is stored in the ArrayList options, and
   // the additional part /[f-k][m-z]&&[^p-v][st]/ is stored in the
   // ArrayList addition in the following order (Reverse Polish Notation):
-  //           -- The matching result of the basic part is assumed here. 
+  //           -- The matching result of the basic part is assumed here.
   //    [f-k]  -- REToken
   //    "|"    -- or
   //    [m-z]  -- REToken
@@ -80,7 +80,7 @@ final class RETokenOneOf extends REToken
   //      \D --> new RETokenOneOf("0123456789",true, ..)
 
     RETokenOneOf (int subIndex, String optionsStr, boolean negative,
-		  boolean insens)
+                  boolean insens)
   {
     super (subIndex);
     options = new ArrayList < REToken > ();
@@ -97,7 +97,7 @@ final class RETokenOneOf extends REToken
   }
 
   RETokenOneOf (int subIndex, List < REToken > options,
-		List < Object > addition, boolean negative)
+                List < Object > addition, boolean negative)
   {
     super (subIndex);
     this.options = options;
@@ -114,8 +114,8 @@ final class RETokenOneOf extends REToken
     int x;
   for (REToken t:options)
       {
-	if ((x = t.getMinimumLength ()) < min)
-	  min = x;
+        if ((x = t.getMinimumLength ()) < min)
+          min = x;
       }
     return min;
   }
@@ -128,8 +128,8 @@ final class RETokenOneOf extends REToken
     int x;
   for (REToken t:options)
       {
-	if ((x = t.getMaximumLength ()) > max)
-	  max = x;
+        if ((x = t.getMaximumLength ()) > max)
+          max = x;
       }
     return max;
   }
@@ -149,13 +149,13 @@ final class RETokenOneOf extends REToken
     boolean tryOnly;
     if (addition == null)
       {
-	tryMatch = mymatch;
-	tryOnly = false;
+        tryMatch = mymatch;
+        tryOnly = false;
       }
     else
       {
-	tryMatch = (REMatch) mymatch.clone ();
-	tryOnly = true;
+        tryMatch = (REMatch) mymatch.clone ();
+        tryOnly = true;
       }
     boolean b = negative ?
       matchN (input, tryMatch, tryOnly) : matchP (input, tryMatch, tryOnly);
@@ -166,36 +166,36 @@ final class RETokenOneOf extends REToken
     stack.push (new Boolean (b));
   for (Object obj:addition)
       {
-	if (obj instanceof REToken)
-	  {
-	    b = ((REToken) obj).match (input, (REMatch) mymatch.clone ());
-	    stack.push (new Boolean (b));
-	  }
-	else if (obj instanceof Boolean)
-	  {
-	    stack.push ((Boolean) obj);
-	  }
-	else if (obj.equals ("|"))
-	  {
-	    b = stack.pop ();
-	    b = stack.pop () || b;
-	    stack.push (new Boolean (b));
-	  }
-	else if (obj.equals ("&"))
-	  {
-	    b = stack.pop ();
-	    b = stack.pop () && b;
-	    stack.push (new Boolean (b));
-	  }
-	else
-	  {
-	    throw new RuntimeException ("Invalid object found");
-	  }
+        if (obj instanceof REToken)
+          {
+            b = ((REToken) obj).match (input, (REMatch) mymatch.clone ());
+            stack.push (new Boolean (b));
+          }
+        else if (obj instanceof Boolean)
+          {
+            stack.push ((Boolean) obj);
+          }
+        else if (obj.equals ("|"))
+          {
+            b = stack.pop ();
+            b = stack.pop () || b;
+            stack.push (new Boolean (b));
+          }
+        else if (obj.equals ("&"))
+          {
+            b = stack.pop ();
+            b = stack.pop () && b;
+            stack.push (new Boolean (b));
+          }
+        else
+          {
+            throw new RuntimeException ("Invalid object found");
+          }
       }
     if (stack.pop ())
       {
-	++mymatch.index;
-	return next (input, mymatch);
+        ++mymatch.index;
+        return next (input, mymatch);
       }
     return false;
   }
@@ -207,12 +207,12 @@ final class RETokenOneOf extends REToken
 
   for (REToken tk:options)
       {
-	REMatch tryMatch = (REMatch) mymatch.clone ();
-	if (tk.match (input, tryMatch))
-	  {			// match was successful
-	    return false;
-	  }			// is a match
-      }				// try next option
+        REMatch tryMatch = (REMatch) mymatch.clone ();
+        if (tk.match (input, tryMatch))
+          {                     // match was successful
+            return false;
+          }                     // is a match
+      }                         // try next option
 
     if (tryOnly)
       return true;
@@ -224,17 +224,17 @@ final class RETokenOneOf extends REToken
   {
   for (REToken tk:options)
       {
-	REMatch tryMatch = (REMatch) mymatch.clone ();
-	if (tk.match (input, tryMatch))
-	  {			// match was successful
-	    if (tryOnly)
-	      return true;
-	    if (next (input, tryMatch))
-	      {
-		mymatch.assignFrom (tryMatch);
-		return true;
-	      }
-	  }
+        REMatch tryMatch = (REMatch) mymatch.clone ();
+        if (tk.match (input, tryMatch))
+          {                     // match was successful
+            if (tryOnly)
+              return true;
+            if (next (input, tryMatch))
+              {
+                mymatch.assignFrom (tryMatch);
+                return true;
+              }
+          }
       }
     return false;
   }
@@ -244,8 +244,8 @@ final class RETokenOneOf extends REToken
     REMatch newMatch = findMatch (input, mymatch);
     if (newMatch != null)
       {
-	mymatch.assignFrom (newMatch);
-	return true;
+        mymatch.assignFrom (newMatch);
+        return true;
       }
     return false;
   }
@@ -263,32 +263,32 @@ final class RETokenOneOf extends REToken
   }
 
   private REMatch findMatch (CharIndexed input, REMatch mymatch,
-			     int optionIndex)
+                             int optionIndex)
   {
     for (int i = optionIndex; i < options.size (); i++)
       {
-	REToken tk = options.get (i);
-	tk = (REToken) tk.clone ();
-	tk.chain (getNext ());
-	REMatch tryMatch = (REMatch) mymatch.clone ();
-	if (tryMatch.backtrackStack == null)
-	  {
-	    tryMatch.backtrackStack = new BacktrackStack ();
-	  }
-	boolean stackPushed = false;
-	if (i + 1 < options.size ())
-	  {
-	    tryMatch.backtrackStack.push (new BacktrackStack.
-					  Backtrack (this, input, mymatch,
-						     i + 1));
-	    stackPushed = true;
-	  }
-	if (tk.match (input, tryMatch))
-	  {
-	    return tryMatch;
-	  }
-	if (stackPushed)
-	  tryMatch.backtrackStack.pop ();
+        REToken tk = options.get (i);
+        tk = (REToken) tk.clone ();
+        tk.chain (getNext ());
+        REMatch tryMatch = (REMatch) mymatch.clone ();
+        if (tryMatch.backtrackStack == null)
+          {
+            tryMatch.backtrackStack = new BacktrackStack ();
+          }
+        boolean stackPushed = false;
+        if (i + 1 < options.size ())
+          {
+            tryMatch.backtrackStack.push (new BacktrackStack.
+                                          Backtrack (this, input, mymatch,
+                                                     i + 1));
+            stackPushed = true;
+          }
+        if (tk.match (input, tryMatch))
+          {
+            return tryMatch;
+          }
+        if (stackPushed)
+          tryMatch.backtrackStack.pop ();
       }
     return null;
   }
@@ -308,12 +308,12 @@ final class RETokenOneOf extends REToken
     tk.chain (null);
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	m = tk.findMatch (input, m);
-	if (m == null)
-	  break;
-	numRepeats++;
+        if (numRepeats >= max)
+          break;
+        m = tk.findMatch (input, m);
+        if (m == null)
+          break;
+        numRepeats++;
       }
     return numRepeats;
   }
@@ -323,9 +323,9 @@ final class RETokenOneOf extends REToken
     os.append (negative ? "[^" : "(?:");
     for (int i = 0; i < options.size (); i++)
       {
-	if (!negative && (i > 0))
-	  os.append ('|');
-	options.get (i).dumpAll (os);
+        if (!negative && (i > 0))
+          os.append ('|');
+        options.get (i).dumpAll (os);
       }
     os.append (negative ? ']' : ')');
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenPOSIX.java b/libjava/classpath/gnu/java/util/regex/RETokenPOSIX.java
index 2c809570bbf..f0fd04bd3b9 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenPOSIX.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenPOSIX.java
@@ -70,8 +70,8 @@ final class RETokenPOSIX extends REToken
   {
     for (int i = 0; i < s_nameTable.length; i++)
       {
-	if (s_nameTable[i].equals (key))
-	  return i;
+        if (s_nameTable[i].equals (key))
+          return i;
       }
     return -1;
   }
@@ -100,8 +100,8 @@ final class RETokenPOSIX extends REToken
     boolean retval = matchOneChar (ch);
     if (retval)
       {
-	++mymatch.index;
-	return mymatch;
+        ++mymatch.index;
+        return mymatch;
       }
     return null;
   }
@@ -115,49 +115,49 @@ final class RETokenPOSIX extends REToken
     switch (type)
       {
       case ALNUM:
-	// Note that there is some debate over whether '_' should be included
-	retval = Character.isLetterOrDigit (ch) || (ch == '_');
-	break;
+        // Note that there is some debate over whether '_' should be included
+        retval = Character.isLetterOrDigit (ch) || (ch == '_');
+        break;
       case ALPHA:
-	retval = Character.isLetter (ch);
-	break;
+        retval = Character.isLetter (ch);
+        break;
       case BLANK:
-	retval = ((ch == ' ') || (ch == '\t'));
-	break;
+        retval = ((ch == ' ') || (ch == '\t'));
+        break;
       case CNTRL:
-	retval = Character.isISOControl (ch);
-	break;
+        retval = Character.isISOControl (ch);
+        break;
       case DIGIT:
-	retval = Character.isDigit (ch);
-	break;
+        retval = Character.isDigit (ch);
+        break;
       case GRAPH:
-	retval =
-	  (!(Character.isWhitespace (ch) || Character.isISOControl (ch)));
-	break;
+        retval =
+          (!(Character.isWhitespace (ch) || Character.isISOControl (ch)));
+        break;
       case LOWER:
-	retval = ((insens && Character.isLetter (ch))
-		  || Character.isLowerCase (ch));
-	break;
+        retval = ((insens && Character.isLetter (ch))
+                  || Character.isLowerCase (ch));
+        break;
       case PRINT:
-	retval =
-	  (!(Character.isWhitespace (ch) || Character.isISOControl (ch)))
-	  || (ch == ' ');
-	break;
+        retval =
+          (!(Character.isWhitespace (ch) || Character.isISOControl (ch)))
+          || (ch == ' ');
+        break;
       case PUNCT:
-	// This feels sloppy, especially for non-U.S. locales.
-	retval = ("`~!@#$%^&*()-_=+[]{}\\|;:'\"/?,.<>".indexOf (ch) != -1);
-	break;
+        // This feels sloppy, especially for non-U.S. locales.
+        retval = ("`~!@#$%^&*()-_=+[]{}\\|;:'\"/?,.<>".indexOf (ch) != -1);
+        break;
       case SPACE:
-	retval = Character.isWhitespace (ch);
-	break;
+        retval = Character.isWhitespace (ch);
+        break;
       case UPPER:
-	retval = ((insens && Character.isLetter (ch))
-		  || Character.isUpperCase (ch));
-	break;
+        retval = ((insens && Character.isLetter (ch))
+                  || Character.isUpperCase (ch));
+        break;
       case XDIGIT:
-	retval = (Character.isDigit (ch)
-		  || ("abcdefABCDEF".indexOf (ch) != -1));
-	break;
+        retval = (Character.isDigit (ch)
+                  || ("abcdefABCDEF".indexOf (ch) != -1));
+        break;
       }
 
     if (negated)
@@ -176,12 +176,12 @@ final class RETokenPOSIX extends REToken
     int numRepeats = 0;
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	char ch = input.charAt (index++);
-	if (!matchOneChar (ch))
-	  break;
-	numRepeats++;
+        if (numRepeats >= max)
+          break;
+        char ch = input.charAt (index++);
+        if (!matchOneChar (ch))
+          break;
+        numRepeats++;
       }
     return numRepeats;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenRange.java b/libjava/classpath/gnu/java/util/regex/RETokenRange.java
index 2597d4d07cb..8898ef502e7 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenRange.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenRange.java
@@ -67,8 +67,8 @@ final class RETokenRange extends REToken
     char c = input.charAt (mymatch.index);
     if (matchOneChar (c))
       {
-	++mymatch.index;
-	return mymatch;
+        ++mymatch.index;
+        return mymatch;
       }
     return null;
   }
@@ -80,13 +80,13 @@ final class RETokenRange extends REToken
     boolean matches = (c >= lo) && (c <= hi);
     if (!matches && insens)
       {
-	char c1 = toLowerCase (c, unicodeAware);
-	matches = (c1 >= lo) && (c1 <= hi);
-	if (!matches)
-	  {
-	    c1 = toUpperCase (c, unicodeAware);
-	    matches = (c1 >= lo) && (c1 <= hi);
-	  }
+        char c1 = toLowerCase (c, unicodeAware);
+        matches = (c1 >= lo) && (c1 <= hi);
+        if (!matches)
+          {
+            c1 = toUpperCase (c, unicodeAware);
+            matches = (c1 >= lo) && (c1 <= hi);
+          }
       }
     return matches;
   }
@@ -102,12 +102,12 @@ final class RETokenRange extends REToken
     int numRepeats = 0;
     while (true)
       {
-	if (numRepeats >= max)
-	  break;
-	char ch = input.charAt (index++);
-	if (!matchOneChar (ch))
-	  break;
-	numRepeats++;
+        if (numRepeats >= max)
+          break;
+        char ch = input.charAt (index++);
+        if (!matchOneChar (ch))
+          break;
+        numRepeats++;
       }
     return numRepeats;
   }
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenRepeated.java b/libjava/classpath/gnu/java/util/regex/RETokenRepeated.java
index 0ba880d3987..cd8635396a3 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenRepeated.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenRepeated.java
@@ -59,11 +59,11 @@ final class RETokenRepeated extends REToken
     this.max = max;
     if (token.returnsFixedLengthMatches ())
       {
-	tokenFixedLength = token.getMaximumLength ();
+        tokenFixedLength = token.getMaximumLength ();
       }
     else
       {
-	tokenFixedLength = -1;
+        tokenFixedLength = -1;
       }
   }
 
@@ -125,7 +125,7 @@ final class RETokenRepeated extends REToken
     {
       this.tk = tk;
       this.input = input;
-      this.rematch = (REMatch) mymatch.clone ();	// MUST make a clone
+      this.rematch = (REMatch) mymatch.clone ();        // MUST make a clone
       this.rematch.backtrackStack = new BacktrackStack ();
       findFirst = true;
     }
@@ -135,31 +135,31 @@ final class RETokenRepeated extends REToken
       int origin = rematch.index;
       REMatch rem;
       if (findFirst)
-	{
-	  rem = tk.findMatch (input, rematch);
-	  findFirst = false;
-	}
+        {
+          rem = tk.findMatch (input, rematch);
+          findFirst = false;
+        }
       else
-	{
-	  while (true)
-	    {
-	      if (rematch.backtrackStack.empty ())
-		{
-		  rem = null;
-		  break;
-		}
-	      BacktrackStack.Backtrack bt = rematch.backtrackStack.pop ();
-	      rem = bt.token.backtrack (bt.input, bt.match, bt.param);
-	      if (rem != null)
-		break;
-	    }
-	}
+        {
+          while (true)
+            {
+              if (rematch.backtrackStack.empty ())
+                {
+                  rem = null;
+                  break;
+                }
+              BacktrackStack.Backtrack bt = rematch.backtrackStack.pop ();
+              rem = bt.token.backtrack (bt.input, bt.match, bt.param);
+              if (rem != null)
+                break;
+            }
+        }
       if (rem == null)
-	return null;
+        return null;
       if (rem.index == origin)
-	rem.empty = true;
+        rem.empty = true;
       rematch = rem;
-      return (REMatch) rem.clone ();	// MUST make a clone.
+      return (REMatch) rem.clone ();    // MUST make a clone.
     }
 
     boolean noMore ()
@@ -190,7 +190,7 @@ final class RETokenRepeated extends REToken
     int[] visited;
     DoablesFinder finder;
       StackedInfo (CharIndexed input, int numRepeats, REMatch match,
-		   int[]visited, DoablesFinder finder)
+                   int[]visited, DoablesFinder finder)
     {
       super (null, input, match, null);
       this.numRepeats = numRepeats;
@@ -214,7 +214,7 @@ final class RETokenRepeated extends REToken
   }
 
   private REMatch findMatch (BacktrackStack stack,
-			     Deque < FindMatchControl > controlStack)
+                             Deque < FindMatchControl > controlStack)
   {
     REMatch result = null;
     StackedInfo si = null;
@@ -235,180 +235,180 @@ final class RETokenRepeated extends REToken
     while (true)
       {
 
-	// This is the second entry point of this method.
-	// If you want to call this method recursively but you do not need the
-	// result returned, just continue from this point.
+        // This is the second entry point of this method.
+        // If you want to call this method recursively but you do not need the
+        // result returned, just continue from this point.
       MAIN_LOOP:
-	while (true)
-	  {
+        while (true)
+          {
 
-	    if (stack.empty ())
-	      break MAIN_LOOP;
-	    si = (StackedInfo) (stack.peek ());
-	    input = si.input;
-	    numRepeats = si.numRepeats;
-	    mymatch = si.match;
-	    visited = si.visited;
-	    finder = si.finder;
+            if (stack.empty ())
+              break MAIN_LOOP;
+            si = (StackedInfo) (stack.peek ());
+            input = si.input;
+            numRepeats = si.numRepeats;
+            mymatch = si.match;
+            visited = si.visited;
+            finder = si.finder;
 
-	    if (mymatch.backtrackStack == null)
-	      mymatch.backtrackStack = new BacktrackStack ();
+            if (mymatch.backtrackStack == null)
+              mymatch.backtrackStack = new BacktrackStack ();
 
-	    if (numRepeats >= max)
-	      {
-		stack.pop ();
-		REMatch m1 = matchRest (input, mymatch);
-		if (m1 != null)
-		  {
-		    if (!stack.empty ())
-		      {
-			m1.backtrackStack.push (new BacktrackStack.
-						Backtrack (this, input,
-							   mymatch, stack));
-		      }
-		    result = m1;
-		    break MAIN_LOOP;
-		  }
-		if (stingy)
-		  {
-		    continue MAIN_LOOP;
-		  }
-		break MAIN_LOOP;
-	      }
+            if (numRepeats >= max)
+              {
+                stack.pop ();
+                REMatch m1 = matchRest (input, mymatch);
+                if (m1 != null)
+                  {
+                    if (!stack.empty ())
+                      {
+                        m1.backtrackStack.push (new BacktrackStack.
+                                                Backtrack (this, input,
+                                                           mymatch, stack));
+                      }
+                    result = m1;
+                    break MAIN_LOOP;
+                  }
+                if (stingy)
+                  {
+                    continue MAIN_LOOP;
+                  }
+                break MAIN_LOOP;
+              }
 
-	    if (finder == null)
-	      {
-		finder = new DoablesFinder (token, input, mymatch);
-		si.finder = finder;
-	      }
+            if (finder == null)
+              {
+                finder = new DoablesFinder (token, input, mymatch);
+                si.finder = finder;
+              }
 
-	    if (numRepeats < min)
-	      {
-		while (true)
-		  {
-		    REMatch doable = finder.find ();
-		    if (doable == null)
-		      {
-			if (stack.empty ())
-			  return null;
-			stack.pop ();
-			continue MAIN_LOOP;
-		      }
-		    if (finder.noMore ())
-		      stack.pop ();
-		    int newNumRepeats = (doable.empty ? min : numRepeats + 1);
-		    stack.
-		      push (new
-			    StackedInfo (input, newNumRepeats, doable,
-					 visited, null));
-		    continue MAIN_LOOP;
-		  }
-	      }
+            if (numRepeats < min)
+              {
+                while (true)
+                  {
+                    REMatch doable = finder.find ();
+                    if (doable == null)
+                      {
+                        if (stack.empty ())
+                          return null;
+                        stack.pop ();
+                        continue MAIN_LOOP;
+                      }
+                    if (finder.noMore ())
+                      stack.pop ();
+                    int newNumRepeats = (doable.empty ? min : numRepeats + 1);
+                    stack.
+                      push (new
+                            StackedInfo (input, newNumRepeats, doable,
+                                         visited, null));
+                    continue MAIN_LOOP;
+                  }
+              }
 
-	    if (visited == null)
-	      visited = initVisited ();
+            if (visited == null)
+              visited = initVisited ();
 
-	    if (stingy)
-	      {
-		REMatch nextMatch = finder.find ();
-		if (nextMatch != null && !nextMatch.empty)
-		  {
-		    stack.
-		      push (new
-			    StackedInfo (input, numRepeats + 1, nextMatch,
-					 visited, null));
-		  }
-		else
-		  {
-		    stack.pop ();
-		  }
-		REMatch m1 = matchRest (input, mymatch);
-		if (m1 != null)
-		  {
-		    if (!stack.empty ())
-		      {
-			m1.backtrackStack.push (new BacktrackStack.
-						Backtrack (this, input,
-							   mymatch, stack));
-		      }
-		    result = m1;
-		    break MAIN_LOOP;
-		  }
-		else
-		  {
-		    continue MAIN_LOOP;
-		  }
-	      }
+            if (stingy)
+              {
+                REMatch nextMatch = finder.find ();
+                if (nextMatch != null && !nextMatch.empty)
+                  {
+                    stack.
+                      push (new
+                            StackedInfo (input, numRepeats + 1, nextMatch,
+                                         visited, null));
+                  }
+                else
+                  {
+                    stack.pop ();
+                  }
+                REMatch m1 = matchRest (input, mymatch);
+                if (m1 != null)
+                  {
+                    if (!stack.empty ())
+                      {
+                        m1.backtrackStack.push (new BacktrackStack.
+                                                Backtrack (this, input,
+                                                           mymatch, stack));
+                      }
+                    result = m1;
+                    break MAIN_LOOP;
+                  }
+                else
+                  {
+                    continue MAIN_LOOP;
+                  }
+              }
 
-	    visited = addVisited (mymatch.index, visited);
+            visited = addVisited (mymatch.index, visited);
 
-	    TryAnotherResult taresult =
-	      tryAnother (stack, input, mymatch, numRepeats, finder, visited);
-	    visited = taresult.visited;
-	    switch (taresult.status)
-	      {
-	      case TryAnotherResult.TRY_FURTHER:
-		controlStack.push (new FindMatchControl (finder));
-		continue MAIN_LOOP0;
-	      case TryAnotherResult.RESULT_FOUND:
-		result = taresult.result;
-		break MAIN_LOOP;
-	      }
+            TryAnotherResult taresult =
+              tryAnother (stack, input, mymatch, numRepeats, finder, visited);
+            visited = taresult.visited;
+            switch (taresult.status)
+              {
+              case TryAnotherResult.TRY_FURTHER:
+                controlStack.push (new FindMatchControl (finder));
+                continue MAIN_LOOP0;
+              case TryAnotherResult.RESULT_FOUND:
+                result = taresult.result;
+                break MAIN_LOOP;
+              }
 
-	    if (!stack.empty ())
-	      {
-		stack.pop ();
-	      }
-	    if (possessive)
-	      {
-		stack.clear ();
-	      }
-	    REMatch m1 = matchRest (input, mymatch);
-	    if (m1 != null)
-	      {
-		if (!stack.empty ())
-		  {
-		    m1.backtrackStack.push (new BacktrackStack.
-					    Backtrack (this, input, mymatch,
-						       stack));
-		  }
-		result = m1;
-		break MAIN_LOOP;
-	      }
+            if (!stack.empty ())
+              {
+                stack.pop ();
+              }
+            if (possessive)
+              {
+                stack.clear ();
+              }
+            REMatch m1 = matchRest (input, mymatch);
+            if (m1 != null)
+              {
+                if (!stack.empty ())
+                  {
+                    m1.backtrackStack.push (new BacktrackStack.
+                                            Backtrack (this, input, mymatch,
+                                                       stack));
+                  }
+                result = m1;
+                break MAIN_LOOP;
+              }
 
-	  }			// MAIN_LOOP
+          }                     // MAIN_LOOP
 
-	if (controlStack.isEmpty ())
-	  return result;
-	FindMatchControl control = controlStack.pop ();
-	if (possessive)
-	  {
-	    return result;
-	  }
-	if (result != null)
-	  {
-	    result.backtrackStack.push (new BacktrackStack.
-					Backtrack (this, input, mymatch,
-						   stack));
-	    return result;
-	  }
+        if (controlStack.isEmpty ())
+          return result;
+        FindMatchControl control = controlStack.pop ();
+        if (possessive)
+          {
+            return result;
+          }
+        if (result != null)
+          {
+            result.backtrackStack.push (new BacktrackStack.
+                                        Backtrack (this, input, mymatch,
+                                                   stack));
+            return result;
+          }
 
-	finder = control.finder;
+        finder = control.finder;
 
-	TryAnotherResult taresult =
-	  tryAnother (stack, input, mymatch, numRepeats, finder, visited);
-	visited = taresult.visited;
-	switch (taresult.status)
-	  {
-	  case TryAnotherResult.TRY_FURTHER:
-	    controlStack.push (new FindMatchControl (finder));
-	    continue MAIN_LOOP0;
-	  case TryAnotherResult.RESULT_FOUND:
-	    return taresult.result;
-	  }
-	continue MAIN_LOOP0;
+        TryAnotherResult taresult =
+          tryAnother (stack, input, mymatch, numRepeats, finder, visited);
+        visited = taresult.visited;
+        switch (taresult.status)
+          {
+          case TryAnotherResult.TRY_FURTHER:
+            controlStack.push (new FindMatchControl (finder));
+            continue MAIN_LOOP0;
+          case TryAnotherResult.RESULT_FOUND:
+            return taresult.result;
+          }
+        continue MAIN_LOOP0;
 
-      }				// MAIN_LOOP0
+      }                         // MAIN_LOOP0
   }
 
   private static class TryAnotherResult
@@ -422,9 +422,9 @@ final class RETokenRepeated extends REToken
   }
 
   private TryAnotherResult tryAnother (BacktrackStack stack,
-				       CharIndexed input, REMatch mymatch,
-				       int numRepeats, DoablesFinder finder,
-				       int[]visited)
+                                       CharIndexed input, REMatch mymatch,
+                                       int numRepeats, DoablesFinder finder,
+                                       int[]visited)
   {
 
     TryAnotherResult taresult = new TryAnotherResult ();
@@ -437,58 +437,58 @@ final class RETokenRepeated extends REToken
 
     DO_ONE_DOABLE:
       while (true)
-	{
+        {
 
-	  REMatch doable = finder.find ();
-	  if (doable == null)
-	    {
-	      break DO_THIS;
-	    }
-	  if (doable.empty)
-	    emptyMatchFound = true;
+          REMatch doable = finder.find ();
+          if (doable == null)
+            {
+              break DO_THIS;
+            }
+          if (doable.empty)
+            emptyMatchFound = true;
 
-	  if (!emptyMatchFound)
-	    {
-	      int n = doable.index;
-	      if (visitedContains (n, visited))
-		{
-		  continue DO_ONE_DOABLE;
-		}
-	      visited = addVisited (n, visited);
-	      stack.
-		push (new
-		      StackedInfo (input, numRepeats + 1, doable, visited,
-				   null));
-	      taresult.visited = visited;
-	      taresult.status = TryAnotherResult.TRY_FURTHER;
-	      return taresult;
-	    }
-	  else
-	    {
-	      REMatch m1 = matchRest (input, doable);
-	      if (possessive)
-		{
-		  taresult.result = m1;
-		  taresult.status = TryAnotherResult.RESULT_FOUND;
-		  return taresult;
-		}
-	      if (m1 != null)
-		{
-		  if (!stack.empty ())
-		    {
-		      m1.backtrackStack.push (new BacktrackStack.
-					      Backtrack (this, input, mymatch,
-							 stack));
-		    }
-		  taresult.result = m1;
-		  taresult.status = TryAnotherResult.RESULT_FOUND;
-		  return taresult;
-		}
-	    }
+          if (!emptyMatchFound)
+            {
+              int n = doable.index;
+              if (visitedContains (n, visited))
+                {
+                  continue DO_ONE_DOABLE;
+                }
+              visited = addVisited (n, visited);
+              stack.
+                push (new
+                      StackedInfo (input, numRepeats + 1, doable, visited,
+                                   null));
+              taresult.visited = visited;
+              taresult.status = TryAnotherResult.TRY_FURTHER;
+              return taresult;
+            }
+          else
+            {
+              REMatch m1 = matchRest (input, doable);
+              if (possessive)
+                {
+                  taresult.result = m1;
+                  taresult.status = TryAnotherResult.RESULT_FOUND;
+                  return taresult;
+                }
+              if (m1 != null)
+                {
+                  if (!stack.empty ())
+                    {
+                      m1.backtrackStack.push (new BacktrackStack.
+                                              Backtrack (this, input, mymatch,
+                                                         stack));
+                    }
+                  taresult.result = m1;
+                  taresult.status = TryAnotherResult.RESULT_FOUND;
+                  return taresult;
+                }
+            }
 
-	}			// DO_ONE_DOABLE
+        }                       // DO_ONE_DOABLE
 
-    }				// DO_THIS
+    }                           // DO_THIS
 
     taresult.status = TryAnotherResult.NOTHING_FOUND;
     return taresult;
@@ -501,8 +501,8 @@ final class RETokenRepeated extends REToken
     REMatch m1 = findMatch (input, mymatch);
     if (m1 != null)
       {
-	mymatch.assignFrom (m1);
-	return true;
+        mymatch.assignFrom (m1);
+        return true;
       }
     return false;
   }
@@ -523,8 +523,8 @@ final class RETokenRepeated extends REToken
     // simple linear search is faster than binary search.
     for (int i = 1; i < visited[0]; i++)
       {
-	if (n == visited[i])
-	  return true;
+        if (n == visited[i])
+          return true;
       }
     return false;
   }
@@ -535,9 +535,9 @@ final class RETokenRepeated extends REToken
       return visited;
     if (visited[0] >= visited.length - 1)
       {
-	int[] newvisited = new int[visited.length + 32];
-	System.arraycopy (visited, 0, newvisited, 0, visited.length);
-	visited = newvisited;
+        int[] newvisited = new int[visited.length + 32];
+        System.arraycopy (visited, 0, newvisited, 0, visited.length);
+        visited = newvisited;
       }
     visited[0]++;
     visited[visited[0]] = n;
@@ -548,7 +548,7 @@ final class RETokenRepeated extends REToken
   {
     if (next (input, newMatch))
       {
-	return newMatch;
+        return newMatch;
       }
     return null;
   }
@@ -573,7 +573,7 @@ final class RETokenRepeated extends REToken
   }
 
   private REMatch backtrackFixedLength (CharIndexed input, REMatch mymatch,
-					Object param)
+                                        Object param)
   {
     int[] params = (int[]) param;
     int index = params[0];
@@ -582,34 +582,34 @@ final class RETokenRepeated extends REToken
   }
 
   private REMatch findMatchFixedLength (CharIndexed input, REMatch mymatch,
-					int index, int count)
+                                        int index, int count)
   {
     REMatch tryMatch = (REMatch) mymatch.clone ();
     while (true)
       {
-	tryMatch.index = index;
-	REMatch m = matchRest (input, tryMatch);
-	count--;
-	if (stingy)
-	  index += tokenFixedLength;
-	else
-	  index -= tokenFixedLength;
-	if (possessive)
-	  return m;
-	if (m != null)
-	  {
-	    if (count > 0)
-	      {
-		m.backtrackStack.push (new BacktrackStack.
-				       Backtrack (this, input, mymatch,
-						  new int[]
-						  {
-						  index, count}));
-	      }
-	    return m;
-	  }
-	if (count <= 0)
-	  return null;
+        tryMatch.index = index;
+        REMatch m = matchRest (input, tryMatch);
+        count--;
+        if (stingy)
+          index += tokenFixedLength;
+        else
+          index -= tokenFixedLength;
+        if (possessive)
+          return m;
+        if (m != null)
+          {
+            if (count > 0)
+              {
+                m.backtrackStack.push (new BacktrackStack.
+                                       Backtrack (this, input, mymatch,
+                                                  new int[]
+                                                  {
+                                                  index, count}));
+              }
+            return m;
+          }
+        if (count <= 0)
+          return null;
       }
   }
 
@@ -624,14 +624,14 @@ final class RETokenRepeated extends REToken
       os.append ('?');
     else
       {
-	os.append ('{').append (min);
-	if (max > min)
-	  {
-	    os.append (',');
-	    if (max != Integer.MAX_VALUE)
-	      os.append (max);
-	  }
-	os.append ('}');
+        os.append ('{').append (min);
+        if (max > min)
+          {
+            os.append (',');
+            if (max != Integer.MAX_VALUE)
+              os.append (max);
+          }
+        os.append ('}');
       }
     if (stingy)
       os.append ('?');
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenStart.java b/libjava/classpath/gnu/java/util/regex/RETokenStart.java
index 6a8d247c9d0..c57ba9c75d1 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenStart.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenStart.java
@@ -41,7 +41,7 @@ import gnu.java.lang.CPStringBuilder;
 
 class RETokenStart extends REToken
 {
-  private String newline;	// matches after a newline
+  private String newline;       // matches after a newline
   private boolean check_java_line_terminators;
 
   RETokenStart (int subIndex, String newline)
@@ -58,13 +58,13 @@ class RETokenStart extends REToken
     this.check_java_line_terminators = b;
   }
 
-  @Override 
+  @Override
     int getMaximumLength ()
   {
     return 0;
   }
 
-  @Override 
+  @Override
     REMatch matchThis (CharIndexed input, REMatch mymatch)
   {
     // charAt(index-n) may be unknown on a Reader/InputStream. FIXME
@@ -72,52 +72,52 @@ class RETokenStart extends REToken
 
     if (check_java_line_terminators)
       {
-	char ch = input.charAt (mymatch.index - 1);
-	if (ch != CharIndexed.OUT_OF_BOUNDS)
-	  {
-	    if (ch == '\n')
-	      return mymatch;
-	    if (ch == '\r')
-	      {
-		char ch1 = input.charAt (mymatch.index);
-		if (ch1 != '\n')
-		  return mymatch;
-		return null;
-	      }
-	    if (ch == '\u0085')
-	      return mymatch;	// A next-line character
-	    if (ch == '\u2028')
-	      return mymatch;	// A line-separator character
-	    if (ch == '\u2029')
-	      return mymatch;	// A paragraph-separator character
-	  }
+        char ch = input.charAt (mymatch.index - 1);
+        if (ch != CharIndexed.OUT_OF_BOUNDS)
+          {
+            if (ch == '\n')
+              return mymatch;
+            if (ch == '\r')
+              {
+                char ch1 = input.charAt (mymatch.index);
+                if (ch1 != '\n')
+                  return mymatch;
+                return null;
+              }
+            if (ch == '\u0085')
+              return mymatch;   // A next-line character
+            if (ch == '\u2028')
+              return mymatch;   // A line-separator character
+            if (ch == '\u2029')
+              return mymatch;   // A paragraph-separator character
+          }
       }
 
     if (newline != null)
       {
-	int len = newline.length ();
-	if (mymatch.offset >= len)
-	  {
-	    boolean found = true;
-	    char z;
-	    int i = 0;		// position in REToken.newline
-	    char ch = input.charAt (mymatch.index - len);
-	    do
-	      {
-		z = newline.charAt (i);
-		if (ch != z)
-		  {
-		    found = false;
-		    break;
-		  }
-		++i;
-		ch = input.charAt (mymatch.index - len + i);
-	      }
-	    while (i < len);
+        int len = newline.length ();
+        if (mymatch.offset >= len)
+          {
+            boolean found = true;
+            char z;
+            int i = 0;          // position in REToken.newline
+            char ch = input.charAt (mymatch.index - len);
+            do
+              {
+                z = newline.charAt (i);
+                if (ch != z)
+                  {
+                    found = false;
+                    break;
+                  }
+                ++i;
+                ch = input.charAt (mymatch.index - len + i);
+              }
+            while (i < len);
 
-	    if (found)
-	      return mymatch;
-	  }
+            if (found)
+              return mymatch;
+          }
       }
 
     // Don't match at all if REG_NOTBOL is set.
@@ -130,7 +130,7 @@ class RETokenStart extends REToken
       return ((mymatch.index == 0) && (mymatch.offset == 0)) ? mymatch : null;
   }
 
-  @Override 
+  @Override
     boolean returnsFixedLengthMatches ()
   {
     return true;
diff --git a/libjava/classpath/gnu/java/util/regex/RETokenWordBoundary.java b/libjava/classpath/gnu/java/util/regex/RETokenWordBoundary.java
index 9f758b63588..04fd8391fd3 100644
--- a/libjava/classpath/gnu/java/util/regex/RETokenWordBoundary.java
+++ b/libjava/classpath/gnu/java/util/regex/RETokenWordBoundary.java
@@ -71,24 +71,24 @@ final class RETokenWordBoundary extends REToken
     //  In the string "one two three", these positions match:
     //  |o|n|e| |t|w|o| |t|h|r|e|e|
     //  ^     ^ ^     ^ ^         ^
-    boolean after = false;	// is current character a letter or digit?
-    boolean before = false;	// is previous character a letter or digit?
+    boolean after = false;      // is current character a letter or digit?
+    boolean before = false;     // is previous character a letter or digit?
     char ch;
 
     // TODO: Also check REG_ANCHORINDEX vs. anchor
     if (((mymatch.eflags & RE.REG_ANCHORINDEX) != RE.REG_ANCHORINDEX)
-	|| (mymatch.offset + mymatch.index > mymatch.anchor))
+        || (mymatch.offset + mymatch.index > mymatch.anchor))
       {
-	if ((ch =
-	     input.charAt (mymatch.index - 1)) != CharIndexed.OUT_OF_BOUNDS)
-	  {
-	    before = Character.isLetterOrDigit (ch) || (ch == '_');
-	  }
+        if ((ch =
+             input.charAt (mymatch.index - 1)) != CharIndexed.OUT_OF_BOUNDS)
+          {
+            before = Character.isLetterOrDigit (ch) || (ch == '_');
+          }
       }
 
     if ((ch = input.charAt (mymatch.index)) != CharIndexed.OUT_OF_BOUNDS)
       {
-	after = Character.isLetterOrDigit (ch) || (ch == '_');
+        after = Character.isLetterOrDigit (ch) || (ch == '_');
       }
 
     // if (before) and (!after), we're at end (\>)
@@ -97,11 +97,11 @@ final class RETokenWordBoundary extends REToken
 
     if ((where & BEGIN) == BEGIN)
       {
-	doNext = after && !before;
+        doNext = after && !before;
       }
     if ((where & END) == END)
       {
-	doNext ^= before && !after;
+        doNext ^= before && !after;
       }
 
     if (negated)
@@ -127,15 +127,15 @@ final class RETokenWordBoundary extends REToken
   {
     if (where == (BEGIN | END))
       {
-	os.append (negated ? "\\B" : "\\b");
+        os.append (negated ? "\\B" : "\\b");
       }
     else if (where == BEGIN)
       {
-	os.append ("\\<");
+        os.append ("\\<");
       }
     else
       {
-	os.append ("\\>");
+        os.append ("\\>");
       }
   }
 }
diff --git a/libjava/classpath/gnu/java/util/regex/UncheckedRE.java b/libjava/classpath/gnu/java/util/regex/UncheckedRE.java
index 5f8c7490232..7d215a6c194 100644
--- a/libjava/classpath/gnu/java/util/regex/UncheckedRE.java
+++ b/libjava/classpath/gnu/java/util/regex/UncheckedRE.java
@@ -47,11 +47,11 @@ package gnu.java.util.regex;
  * 
      
  * Note that this makes UncheckedRE dangerous if constructed with
  * dynamic data.  Do not use UncheckedRE unless you are completely sure
- * that all input being passed to it contains valid, well-formed 
+ * that all input being passed to it contains valid, well-formed
  * regular expressions for the syntax specified.
  *
  * @author Wes Biggs
- * @see gnu.java.util.regex.RE 
+ * @see gnu.java.util.regex.RE
  * @since gnu.regexp 1.1.4
  */
 
@@ -105,7 +105,7 @@ public final class UncheckedRE extends RE
     try
     {
       initialize (pattern, cflags, syntax, 0, 0);
-    } 
+    }
     catch (REException e)
     {
       throw new RuntimeException (e.getMessage ());
diff --git a/libjava/classpath/gnu/javax/activation/viewers/ImageViewer.java b/libjava/classpath/gnu/javax/activation/viewers/ImageViewer.java
index 829f40cbf84..5bddf731118 100644
--- a/libjava/classpath/gnu/javax/activation/viewers/ImageViewer.java
+++ b/libjava/classpath/gnu/javax/activation/viewers/ImageViewer.java
@@ -129,7 +129,7 @@ public class ImageViewer extends Component
         if (is.width > -1 && is.height > -1)
           {
             Dimension cs = getSize();
-            g.drawImage(image, 0, 0, cs.width, cs.height, 
+            g.drawImage(image, 0, 0, cs.width, cs.height,
                         0, 0, is.width, is.height, this);
           }
       }
diff --git a/libjava/classpath/gnu/javax/activation/viewers/TextEditor.java b/libjava/classpath/gnu/javax/activation/viewers/TextEditor.java
index 1995ae12282..0eedc85db68 100644
--- a/libjava/classpath/gnu/javax/activation/viewers/TextEditor.java
+++ b/libjava/classpath/gnu/javax/activation/viewers/TextEditor.java
@@ -104,7 +104,7 @@ public class TextEditor extends TextArea
                 {
                     try
                     {
-                        
+
                         out.close();
                     }
                     catch (IOException e)
@@ -115,5 +115,5 @@ public class TextEditor extends TextArea
             }
         }
     }
-    
+
 }
diff --git a/libjava/classpath/gnu/javax/activation/viewers/TextViewer.java b/libjava/classpath/gnu/javax/activation/viewers/TextViewer.java
index 2b4aa90c58f..deac80d5e47 100644
--- a/libjava/classpath/gnu/javax/activation/viewers/TextViewer.java
+++ b/libjava/classpath/gnu/javax/activation/viewers/TextViewer.java
@@ -77,5 +77,5 @@ public class TextViewer extends TextArea
         in.close();
         setText(bytes.toString());
     }
-    
+
 }
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Assembly.java b/libjava/classpath/gnu/javax/crypto/assembly/Assembly.java
index 49770675bbd..f570d2012f0 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Assembly.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Assembly.java
@@ -1,4 +1,4 @@
-/* Assembly.java -- 
+/* Assembly.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -49,7 +49,7 @@ import java.util.Map;
  * Once constructed, and correctly initialised, the bulk of the methods
  * available on the Assembly are delegated to the head of
  * the {@link Transformer} chain of the Assembly.
- * 
+ *
  * @see Transformer
  */
 public class Assembly
@@ -79,7 +79,7 @@ public class Assembly
    * in pre-processing mode; i.e. it should apply its internal transformation
    * algorithm on the input data stream, before it passes that stream to
    * the next element in the chain.
-   * 
+   *
    * @param t the {@link Transformer} to add at the head of the current chain.
    * @throws IllegalArgumentException if the designated {@link Transformer} has
    *           a non-null tail; i.e. it is already an element of a chain.
@@ -94,7 +94,7 @@ public class Assembly
    * in post-processing mode; i.e. it should apply its internal transformation
    * algorithm on the input data stream, after it passes that stream to
    * the next element in the chain.
-   * 
+   *
    * @param t the {@link Transformer} to add at the head of the current chain.
    * @throws IllegalArgumentException if the designated {@link Transformer} has
    *           a non-null tail; i.e. it is already an element of a chain.
@@ -107,7 +107,7 @@ public class Assembly
   /**
    * Initialises the Assembly for operation with specific
    * characteristics.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalStateException if the instance is already initialised.
@@ -138,7 +138,7 @@ public class Assembly
    * Convenience method that calls the method with same name and three
    * arguments, using a byte array of length 1 whose contents are
    * the designated byte.
-   * 
+   *
    * @param b the byte to process.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -155,7 +155,7 @@ public class Assembly
    * Convenience method that calls the method with same name and three
    * arguments. All bytes in in, starting from index position
    * 0 are considered.
-   * 
+   *
    * @param in the input data bytes.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -170,7 +170,7 @@ public class Assembly
 
   /**
    * Processes a designated number of bytes from a given byte array.
-   * 
+   *
    * @param in the input data bytes.
    * @param offset index of in from which to start considering
    *          data.
@@ -191,7 +191,7 @@ public class Assembly
   /**
    * Convenience method that calls the method with same name and three arguments
    * using a 0-long byte array.
-   * 
+   *
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
    * @throws TransformerException if a transformation-related exception occurs
@@ -207,7 +207,7 @@ public class Assembly
    * Convenience method that calls the method with same name and three
    * arguments, using a byte array of length 1 whose contents are
    * the designated byte.
-   * 
+   *
    * @param b the byte to process.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -224,7 +224,7 @@ public class Assembly
    * Convenience method that calls the method with same name and three
    * arguments. All bytes in in, starting from index position
    * 0 are considered.
-   * 
+   *
    * @param in the input data bytes.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -241,7 +241,7 @@ public class Assembly
    * Processes a designated number of bytes from a given byte array and signals,
    * at the same time, that this is the last push operation for this
    * Assembly.
-   * 
+   *
    * @param in the input data bytes.
    * @param offset index of in from which to start considering
    *          data.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Cascade.java b/libjava/classpath/gnu/javax/crypto/assembly/Cascade.java
index f790956a472..685cef5b266 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Cascade.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Cascade.java
@@ -1,4 +1,4 @@
-/* Cascade.java -- 
+/* Cascade.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -100,7 +100,7 @@ public class Cascade
 
   /**
    * Returns the Least Common Multiple of two integers.
-   * 
+   *
    * @param a the first integer.
    * @param b the second integer.
    * @return the LCM of abs(a) and abs(b).
@@ -114,7 +114,7 @@ public class Cascade
 
   /**
    * Adds to the end of the current chain, a designated {@link Stage}.
-   * 
+   *
    * @param stage the {@link Stage} to append to the chain.
    * @return a unique identifier for this stage, within this cascade.
    * @throws IllegalStateException if the instance is already initialised.
@@ -129,7 +129,7 @@ public class Cascade
 
   /**
    * Adds to the begining of the current chain, a designated {@link Stage}.
-   * 
+   *
    * @param stage the {@link Stage} to prepend to the chain.
    * @return a unique identifier for this stage, within this cascade.
    * @throws IllegalStateException if the instance is already initialised.
@@ -145,7 +145,7 @@ public class Cascade
   /**
    * Inserts a {@link Stage} into the current chain, at the specified index
    * (zero-based) position.
-   * 
+   *
    * @param stage the {@link Stage} to insert into the chain.
    * @return a unique identifier for this stage, within this cascade.
    * @throws IllegalArgumentException if the designated stage is already in the
@@ -187,7 +187,7 @@ public class Cascade
 
   /**
    * Returns the current number of stages in this chain.
-   * 
+   *
    * @return the current count of stages in this chain.
    */
   public int size()
@@ -199,7 +199,7 @@ public class Cascade
    * Returns an {@link Iterator} over the stages contained in this instance.
    * Each element of this iterator is a concrete implementation of a {@link
    * Stage}.
-   * 
+   *
    * @return an {@link Iterator} over the stages contained in this instance.
    *         Each element of the returned iterator is a concrete instance of a
    *         {@link Stage}.
@@ -216,7 +216,7 @@ public class Cascade
    * Returns the {@link Set} of supported block sizes for this
    * Cascade that are common to all of its chained stages. Each
    * element in the returned {@link Set} is an instance of {@link Integer}.
-   * 
+   *
    * @return a {@link Set} of supported block sizes common to all the stages of
    *         the chain.
    */
@@ -236,7 +236,7 @@ public class Cascade
 
   /**
    * Initialises the chain for operation with specific characteristics.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalStateException if the chain, or any of its stages, is
@@ -273,7 +273,7 @@ public class Cascade
 
   /**
    * Returns the currently set block size for the chain.
-   * 
+   *
    * @return the current block size for the chain.
    * @throws IllegalStateException if the instance is not initialised.
    */
@@ -302,7 +302,7 @@ public class Cascade
    * Processes exactly one block of plaintext (if initialised in the
    * {@link Direction#FORWARD} state) or ciphertext (if initialised in
    * the {@link Direction#REVERSED} state).
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -332,7 +332,7 @@ public class Cascade
    * encryption / decryption test(s) for all supported block and key sizes of
    * underlying block cipher(s) wrapped by Mode leafs. The test also includes
    * one (1) variable key Known Answer Test (KAT) for each block cipher.
-   * 
+   *
    * @return true if the implementation passes simple
    *         correctness tests. Returns false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/CascadeStage.java b/libjava/classpath/gnu/javax/crypto/assembly/CascadeStage.java
index b86f42e2aec..196edafdf61 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/CascadeStage.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/CascadeStage.java
@@ -1,4 +1,4 @@
-/* CascadeStage.java -- 
+/* CascadeStage.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java b/libjava/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java
index 5fce51a15eb..8e3a9a5a191 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/CascadeTransformer.java
@@ -1,4 +1,4 @@
-/* CascadeTransformer.java -- 
+/* CascadeTransformer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java b/libjava/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java
index e5c0b7a5724..97f9f036517 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/DeflateTransformer.java
@@ -1,4 +1,4 @@
-/* DeflateTransformer.java -- 
+/* DeflateTransformer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Direction.java b/libjava/classpath/gnu/javax/crypto/assembly/Direction.java
index 48c74ed1ba0..40ddfc429a5 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Direction.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Direction.java
@@ -1,4 +1,4 @@
-/* Direction.java -- 
+/* Direction.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java b/libjava/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java
index bba1da77843..5bcfe5ffcf6 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/LoopbackTransformer.java
@@ -1,4 +1,4 @@
-/* LoopbackTransformer.java -- 
+/* LoopbackTransformer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/ModeStage.java b/libjava/classpath/gnu/javax/crypto/assembly/ModeStage.java
index 253ab4ae60a..8bdbef7c4ef 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/ModeStage.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/ModeStage.java
@@ -1,4 +1,4 @@
-/* ModeStage.java -- 
+/* ModeStage.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Operation.java b/libjava/classpath/gnu/javax/crypto/assembly/Operation.java
index 28fdf941298..6861a137793 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Operation.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Operation.java
@@ -1,4 +1,4 @@
-/* Operation.java -- 
+/* Operation.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java b/libjava/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java
index c11f4fe88da..494ca34caef 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/PaddingTransformer.java
@@ -1,4 +1,4 @@
-/* PaddingTransformer.java -- 
+/* PaddingTransformer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Stage.java b/libjava/classpath/gnu/javax/crypto/assembly/Stage.java
index d023f62830a..5d0ab5353de 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Stage.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Stage.java
@@ -1,4 +1,4 @@
-/* Stage.java -- 
+/* Stage.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -56,7 +56,7 @@ import java.util.Set;
  * the specification of how to wire the stage into the chain. The following
  * diagrams may help understand the paradigme. The first shows two stages
  * chained each with a {@link Direction#FORWARD} direction.
- * 
+ *
  * 
        *            FORWARD         FORWARD
  *        +------+       +-------+
@@ -67,12 +67,12 @@ import java.util.Set;
  *               |       |       |      |
  *               +-------+       +------+
  * 
      
- * 
+ *
  * 
      
  * The second diagram shows two stages, one in a {@link Direction#FORWARD}
  * direction, while the other is wired in a {@link Direction#REVERSED}
  * direction.
- * 
+ *
  * 
        *            FORWARD         REVERSED
  *        +------+               +------+
@@ -83,7 +83,7 @@ import java.util.Set;
  *               |               |
  *               +---------------+
  * 
      
- * 
+ *
  * @see ModeStage
  * @see CascadeStage
  */
@@ -118,14 +118,14 @@ public abstract class Stage
    * Returns the {@link Set} of supported block sizes for this
    * Stage. Each element in the returned {@link Set} is an
    * instance of {@link Integer}.
-   * 
+   *
    * @return a {@link Set} of supported block sizes.
    */
   public abstract Set blockSizes();
 
   /**
    * Initialises the stage for operation with specific characteristics.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalStateException if the instance is already initialised.
@@ -147,7 +147,7 @@ public abstract class Stage
 
   /**
    * Returns the currently set block size for the stage.
-   * 
+   *
    * @return the current block size for this stage.
    * @throws IllegalStateException if the instance is not initialised.
    */
@@ -167,7 +167,7 @@ public abstract class Stage
    * Processes exactly one block of plaintext (if initialised in the
    * {@link Direction#FORWARD} state) or ciphertext (if initialised in
    * the {@link Direction#REVERSED} state).
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -187,7 +187,7 @@ public abstract class Stage
    * encryption / decryption test(s) for all supported block and key sizes of
    * underlying block cipher(s) wrapped by Mode leafs. The test also includes
    * one (1) variable key Known Answer Test (KAT) for each block cipher.
-   * 
+   *
    * @return true if the implementation passes simple
    *         correctness tests. Returns false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/Transformer.java b/libjava/classpath/gnu/javax/crypto/assembly/Transformer.java
index 58a991b93b9..1937f9950af 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/Transformer.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/Transformer.java
@@ -1,4 +1,4 @@
-/* Transformer.java -- 
+/* Transformer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -73,7 +73,7 @@ import java.util.Map;
  * buffering, from the previous element, is needed --which is independant of
  * buffering the input if the Transformer implementation itself
  * is block-based.
- * 
+ *
  * @see CascadeTransformer
  * @see PaddingTransformer
  * @see DeflateTransformer
@@ -117,7 +117,7 @@ public abstract class Transformer
 
   /**
    * Sets the operational mode of this Transformer.
-   * 
+   *
    * @param mode the processing mode this Transformer is required
    *          to operate in.
    * @throws IllegalStateException if this instance has already been assigned an
@@ -133,7 +133,7 @@ public abstract class Transformer
   /**
    * Returns true if this Transformer was wired in
    * pre-processing mode; false otherwise.
-   * 
+   *
    * @return true if this Transformer has been
    *         wired in pre-processing mode; false otherwise.
    * @throws IllegalStateException if this instance has not yet been assigned an
@@ -149,7 +149,7 @@ public abstract class Transformer
   /**
    * Returns true if this Transformer was wired in
    * post-processing mode; false otherwise.
-   * 
+   *
    * @return true if this Transformer has been
    *         wired in post-processing mode; false otherwise.
    * @throws IllegalStateException if this instance has not yet been assigned an
@@ -163,7 +163,7 @@ public abstract class Transformer
   /**
    * Initialises the Transformer for operation with specific
    * characteristics.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalStateException if the instance is already initialised.
@@ -185,7 +185,7 @@ public abstract class Transformer
   /**
    * Returns the block-size of this Transformer. A value of
    * 1 indicates that this instance is block-agnostic.
-   * 
+   *
    * @return the current minimal required block size.
    */
   public int currentBlockSize()
@@ -212,7 +212,7 @@ public abstract class Transformer
    * Convenience method that calls the method with same name and three
    * arguments, using a byte array of length 1 whose contents are
    * the designated byte.
-   * 
+   *
    * @param b the byte to process.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -229,7 +229,7 @@ public abstract class Transformer
    * Convenience method that calls the same method with three arguments. All
    * bytes in in, starting from index position 0
    * are considered.
-   * 
+   *
    * @param in the input data bytes.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -244,7 +244,7 @@ public abstract class Transformer
 
   /**
    * Processes a designated number of bytes from a given byte array.
-   * 
+   *
    * @param in the input data bytes.
    * @param offset index of in from which to start considering
    *          data.
@@ -267,7 +267,7 @@ public abstract class Transformer
   /**
    * Convenience method that calls the same method with three arguments. A
    * zero-long byte array is used.
-   * 
+   *
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
    * @throws TransformerException if a transformation-related exception occurs
@@ -287,7 +287,7 @@ public abstract class Transformer
    * Convenience method that calls the method with same name and three
    * arguments, using a byte array of length 1 whose contents are
    * the designated byte.
-   * 
+   *
    * @param b the byte to process.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -304,7 +304,7 @@ public abstract class Transformer
    * Convenience method that calls the same method with three arguments. All
    * bytes in in, starting from index position 0
    * are considered.
-   * 
+   *
    * @param in the input data bytes.
    * @return the result of transformation.
    * @throws IllegalStateException if the instance is not initialised.
@@ -321,7 +321,7 @@ public abstract class Transformer
    * Processes a designated number of bytes from a given byte array and signals,
    * at the same time, that this is the last push operation on this
    * Transformer.
-   * 
+   *
    * @param in the input data bytes.
    * @param offset index of in from which to start considering
    *          data.
diff --git a/libjava/classpath/gnu/javax/crypto/assembly/TransformerException.java b/libjava/classpath/gnu/javax/crypto/assembly/TransformerException.java
index 4e93322efb9..295fded7b3a 100644
--- a/libjava/classpath/gnu/javax/crypto/assembly/TransformerException.java
+++ b/libjava/classpath/gnu/javax/crypto/assembly/TransformerException.java
@@ -1,4 +1,4 @@
-/* TransformerException.java -- 
+/* TransformerException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -95,7 +95,7 @@ public class TransformerException
    * Prints this exception's stack trace to a print stream. If this exception
    * has a root exception; the stack trace of the root exception is also printed
    * to the print stream.
-   * 
+   *
    * @param ps the non-null print stream to which to print.
    */
   public void printStackTrace(PrintStream ps)
@@ -109,7 +109,7 @@ public class TransformerException
    * Prints this exception's stack trace to a print writer. If this exception
    * has a root exception; the stack trace of the root exception is also printed
    * to the print writer.
-   * 
+   *
    * @param pw the non-null print writer to use for output.
    */
   public void printStackTrace(PrintWriter pw)
@@ -125,7 +125,7 @@ public class TransformerException
    * and if it has a root exception, the string representation of the root
    * exception. This string representation is meant for debugging and not meant
    * to be interpreted programmatically.
-   * 
+   *
    * @return the non-null string representation of this exception.
    * @see Throwable#getMessage()
    */
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java b/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
index 653957ec619..3526ad612c2 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Anubis.java
@@ -1,4 +1,4 @@
-/* Anubis.java -- 
+/* Anubis.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -315,7 +315,7 @@ public final class Anubis
   /**
    * Expands a user-supplied key material into a session key for a designated
    * block size.
-   * 
+   *
    * @param uk the 32N-bit user-supplied key material; 4 <= N <= 10.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
index bae142a638d..45aa2d6fd25 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/BaseCipher.java
@@ -1,4 +1,4 @@
-/* BaseCipher.java -- 
+/* BaseCipher.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,7 +72,7 @@ public abstract class BaseCipher
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name prefix of this instance.
    * @param defaultBlockSize the default block size in bytes.
    * @param defaultKeySize the default key size in bytes.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java b/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
index 68722e913c4..0c6d9b12b41 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Blowfish.java
@@ -1,4 +1,4 @@
-/* Blowfish.java -- 
+/* Blowfish.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java b/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
index a7521530ce0..47b29226f7a 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Cast5.java
@@ -1,4 +1,4 @@
-/* Cast5.java -- 
+/* Cast5.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java b/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
index d6bb42253b8..fc902362674 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/CipherFactory.java
@@ -1,4 +1,4 @@
-/* CipherFactory.java -- 
+/* CipherFactory.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,7 +58,7 @@ public class CipherFactory
 
   /**
    * Returns an instance of a block cipher given its name.
-   * 
+   *
    * @param name the case-insensitive name of the symmetric-key block cipher
    *          algorithm.
    * @return an instance of the designated cipher algorithm, or
@@ -107,7 +107,7 @@ public class CipherFactory
   /**
    * Returns a {@link Set} of symmetric key block cipher implementation names
    * supported by this Factory.
-   * 
+   *
    * @return a {@link Set} of block cipher names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/DES.java b/libjava/classpath/gnu/javax/crypto/cipher/DES.java
index 3ced62c3f40..ce538b75a9e 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/DES.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/DES.java
@@ -1,4 +1,4 @@
-/* DES.java -- 
+/* DES.java --
    Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -204,7 +204,7 @@ public class DES
   /**
    * Weak keys (parity adjusted): If all the bits in each half are either 0
    * or 1, then the key used for any cycle of the algorithm is the same as
-   * all other cycles. 
+   * all other cycles.
    */
   public static final byte[][] WEAK_KEYS = {
       Util.toBytesFromString("0101010101010101"),
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
index d1e32ef6599..86f8b34e05d 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipher.java
@@ -1,4 +1,4 @@
-/* IBlockCipher.java -- 
+/* IBlockCipher.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -88,21 +88,21 @@ public interface IBlockCipher
 
   /**
    * Returns the canonical name of this instance.
-   * 
+   *
    * @return the canonical name of this instance.
    */
   String name();
 
   /**
    * Returns the default value, in bytes, of the algorithm's block size.
-   * 
+   *
    * @return the default value, in bytes, of the algorithm's block size.
    */
   int defaultBlockSize();
 
   /**
    * Returns the default value, in bytes, of the algorithm's key size.
-   * 
+   *
    * @return the default value, in bytes, of the algorithm's key size.
    */
   int defaultKeySize();
@@ -110,7 +110,7 @@ public interface IBlockCipher
   /**
    * Returns an {@link Iterator} over the supported block sizes. Each element
    * returned by this object is an {@link Integer}.
-   * 
+   *
    * @return an {@link Iterator} over the supported block sizes.
    */
   Iterator blockSizes();
@@ -118,14 +118,14 @@ public interface IBlockCipher
   /**
    * Returns an {@link Iterator} over the supported key sizes. Each element
    * returned by this object is an {@link Integer}.
-   * 
+   *
    * @return an {@link Iterator} over the supported key sizes.
    */
   Iterator keySizes();
 
   /**
    * Returns a clone of this instance.
-   * 
+   *
    * @return a clone copy of this instance.
    */
   Object clone();
@@ -133,7 +133,7 @@ public interface IBlockCipher
   /**
    * Initialises the algorithm with designated attributes. Permissible names and
    * values are described in the class documentation above.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @exception InvalidKeyException if the key data is invalid.
@@ -145,7 +145,7 @@ public interface IBlockCipher
 
   /**
    * Returns the currently set block size for this instance.
-   * 
+   *
    * @return the current block size for this instance.
    * @exception IllegalStateException if the instance is not initialised.
    */
@@ -159,7 +159,7 @@ public interface IBlockCipher
 
   /**
    * Encrypts exactly one block of plaintext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -172,7 +172,7 @@ public interface IBlockCipher
 
   /**
    * Decrypts exactly one block of ciphertext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -187,7 +187,7 @@ public interface IBlockCipher
    * A correctness test that consists of basic symmetric encryption /
    * decryption test(s) for all supported block and key sizes, as well as one
    * (1) variable key Known Answer Test (KAT).
-   * 
+   *
    * @return true if the implementation passes simple
    *         correctness tests. Returns false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
index 1023b12d812..9b217215868 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/IBlockCipherSpi.java
@@ -1,4 +1,4 @@
-/* IBlockCipherSpi.java -- 
+/* IBlockCipherSpi.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ interface IBlockCipherSpi
   /**
    * Returns an {@link Iterator} over the supported block sizes. Each element
    * returned by this object is a {@link java.lang.Integer}.
-   * 
+   *
    * @return an Iterator over the supported block sizes.
    */
   Iterator blockSizes();
@@ -59,7 +59,7 @@ interface IBlockCipherSpi
   /**
    * Returns an {@link Iterator} over the supported key sizes. Each element
    * returned by this object is a {@link java.lang.Integer}.
-   * 
+   *
    * @return an Iterator over the supported key sizes.
    */
   Iterator keySizes();
@@ -67,7 +67,7 @@ interface IBlockCipherSpi
   /**
    * Expands a user-supplied key material into a session key for a designated
    * block size.
-   * 
+   *
    * @param k the user-supplied key material.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
@@ -78,7 +78,7 @@ interface IBlockCipherSpi
 
   /**
    * Encrypts exactly one block of plaintext.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -96,7 +96,7 @@ interface IBlockCipherSpi
 
   /**
    * Decrypts exactly one block of ciphertext.
-   * 
+   *
    * @param in the ciphertext.
    * @param inOffset index of in from which to start considering
    *          data.
@@ -116,7 +116,7 @@ interface IBlockCipherSpi
    * A correctness test that consists of basic symmetric encryption /
    * decryption test(s) for all supported block and key sizes, as well as one
    * (1) variable key Known Answer Test (KAT).
-   * 
+   *
    * @return true if the implementation passes simple
    *         correctness tests. Returns false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java b/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
index 491301f5aad..55e42628bac 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Khazad.java
@@ -1,4 +1,4 @@
-/* Khazad.java -- 
+/* Khazad.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -317,7 +317,7 @@ public final class Khazad
   /**
    * Expands a user-supplied key material into a session key for a designated
    * block size.
-   * 
+   *
    * @param uk the 128-bit user-supplied key material.
    * @param bs the desired block size in bytes.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java b/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
index 4515559549b..f23ea489f3f 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/NullCipher.java
@@ -1,4 +1,4 @@
-/* NullCipher.java -- 
+/* NullCipher.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java b/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
index d1bc958c323..0463fe51de9 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Rijndael.java
@@ -1,4 +1,4 @@
-/* Rijndael.java -- 
+/* Rijndael.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -305,7 +305,7 @@ public final class Rijndael
 
   /**
    * Returns the number of rounds for a given Rijndael's key and block sizes.
-   * 
+   *
    * @param ks the size of the user key material in bytes.
    * @param bs the desired block size in bytes.
    * @return the number of rounds for a given Rijndael's key and block sizes.
@@ -591,7 +591,7 @@ public final class Rijndael
   /**
    * Expands a user-supplied key material into a session key for a designated
    * block size.
-   * 
+   *
    * @param k the 128/192/256-bit user-key to use.
    * @param bs the block size in bytes of this Rijndael.
    * @return an Object encapsulating the session key.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java b/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
index 636e311e7ee..1175fcfd2c4 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Serpent.java
@@ -1,4 +1,4 @@
-/* Serpent.java -- 
+/* Serpent.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Square.java b/libjava/classpath/gnu/javax/crypto/cipher/Square.java
index af738da043a..231df0a47e1 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Square.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Square.java
@@ -1,4 +1,4 @@
-/* Square.java -- 
+/* Square.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -271,7 +271,7 @@ public final class Square
 
   /**
    * Left rotate a 32-bit chunk.
-   * 
+   *
    * @param x the 32-bit data to rotate
    * @param s number of places to left-rotate by
    * @return the newly permutated value.
@@ -283,7 +283,7 @@ public final class Square
 
   /**
    * Right rotate a 32-bit chunk.
-   * 
+   *
    * @param x the 32-bit data to rotate
    * @param s number of places to right-rotate by
    * @return the newly permutated value.
@@ -299,7 +299,7 @@ public final class Square
    * Field in GF(2**8).
    * 
      
    * For best performance call it with abs(b) < abs(a).
-   * 
+   *
    * @param a operand for multiply.
    * @param b operand for multiply.
    * @return the result of (a * b) % ROOT.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java b/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
index 1e98bfc8342..1d684c20a45 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/TripleDES.java
@@ -1,4 +1,4 @@
-/* TripleDES.java -- 
+/* TripleDES.java --
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -96,7 +96,7 @@ public class TripleDES
   /**
    * Convenience method which calls the method with same name and three
    * arguments, passing 3 as the value of the first parameter.
-   * 
+   *
    * @param kb The key bytes to adjust.
    * @param offset The starting offset into the key bytes.
    */
@@ -108,7 +108,7 @@ public class TripleDES
   /**
    * Adjusts, in-situ, the parity of the designated bytes, so they can be used
    * as DES keys for a 3-DES 1-, 2- or 3-key cipher.
-   * 
+   *
    * @param keyCount the number of independent DES keys. Can be either
    *          1, 2 or 3. Any other value
    *          will cause an {@link IllegalArgumentException} to be raised.
@@ -133,7 +133,7 @@ public class TripleDES
   /**
    * Convenience method which calls the method with same name and three
    * arguments, passing 3 as the value of the first parameter.
-   * 
+   *
    * @param kb The key bytes to test.
    * @param offset The starting offset into the key bytes.
    * @return true if the bytes in kb starting at
@@ -150,7 +150,7 @@ public class TripleDES
    * Tests if enough bytes, expected to be used as DES keys for a 3-DES 1-, 2-
    * or 3-key cipher, located in a designated byte array, has already been
    * parity adjusted.
-   * 
+   *
    * @param keyCount the number of independent DES keys. Can be either
    *          1, 2 or 3. Any other value
    *          will cause an {@link IllegalArgumentException} to be raised.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java b/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
index b6932442897..c9789a69935 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/Twofish.java
@@ -1,4 +1,4 @@
-/* Twofish.java -- 
+/* Twofish.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java b/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
index f89ff54d1ca..e12f899e403 100644
--- a/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
+++ b/libjava/classpath/gnu/javax/crypto/cipher/WeakKeyException.java
@@ -1,4 +1,4 @@
-/* WeakKeyException.java -- 
+/* WeakKeyException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java b/libjava/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java
index 6a65437d644..205b5ed57ab 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/DiffieHellmanImpl.java
@@ -54,7 +54,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 /**
  * The JCE implementation of a 2-party Diffie-Hellman key agreement.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public final class DiffieHellmanImpl
diff --git a/libjava/classpath/gnu/javax/crypto/jce/GnuCrypto.java b/libjava/classpath/gnu/javax/crypto/jce/GnuCrypto.java
index 8099fd13da9..ec335b7354f 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/GnuCrypto.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/GnuCrypto.java
@@ -1,4 +1,4 @@
-/* GnuCrypto.java -- 
+/* GnuCrypto.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ import java.util.Set;
 /**
  * The additional GNU algorithm implementation as a Java Cryptographic Extension
  * (JCE) Provider.
- * 
+ *
  * @see java.security.Provider
  */
 public final class GnuCrypto
@@ -574,7 +574,7 @@ public final class GnuCrypto
   /**
    * Returns a {@link Set} of names of symmetric key block cipher algorithms
    * available from this {@link Provider}.
-   * 
+   *
    * @return a {@link Set} of cipher names (Strings).
    */
   public static final Set getCipherNames()
@@ -588,7 +588,7 @@ public final class GnuCrypto
   /**
    * Returns a {@link Set} of names of MAC algorithms available from this
    * {@link Provider}.
-   * 
+   *
    * @return a {@link Set} of MAC names (Strings).
    */
   public static final Set getMacNames()
diff --git a/libjava/classpath/gnu/javax/crypto/jce/GnuSasl.java b/libjava/classpath/gnu/javax/crypto/jce/GnuSasl.java
index 923b40a5f92..6ab89e2fa8d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/GnuSasl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/GnuSasl.java
@@ -103,7 +103,7 @@ public final class GnuSasl
   /**
    * Returns a {@link Set} of names of SASL Client mechanisms available from
    * this {@link Provider}.
-   * 
+   *
    * @return a {@link Set} of SASL Client mechanisms (Strings).
    */
   public static final Set getSaslClientMechanismNames()
@@ -114,7 +114,7 @@ public final class GnuSasl
   /**
    * Returns a {@link Set} of names of SASL Server mechanisms available from
    * this {@link Provider}.
-   * 
+   *
    * @return a {@link Set} of SASL Server mechanisms (Strings).
    */
   public static final Set getSaslServerMechanismNames()
diff --git a/libjava/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java b/libjava/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
index be7fb18b0d5..cda8f34e8a8 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.java
@@ -1,4 +1,4 @@
-/* PBKDF2SecretKeyFactory.java -- 
+/* PBKDF2SecretKeyFactory.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java
index 973f5890bb4..08f4e78206a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.java
@@ -56,7 +56,7 @@ abstract class AESKeyWrapSpi
    * 
      
    * In wrapping, the number of 8-byte output blocks is ALWAYS one block longer
    * than the input.
-   * 
+   *
    * @param inputLength the size of the plain text.
    * @return the size in bytes of n + 1 8-byte blocks where
    * n is the smallest number of 8-byte blocks that contain the
@@ -74,7 +74,7 @@ abstract class AESKeyWrapSpi
    * 
      
    * In unwrapping, the number of 8-byte output blocks is ALWAYS one block
    * shorter than the input.
-   * 
+   *
    * @param inputLength the size of the cipher text.
    * @return the size in bytes of n - 1 8-byte blocks where
    * n is the smallest number of 8-byte blocks that contain the
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java
index 1322e5e8a1a..4c3e1aecc8c 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/AESSpi.java
@@ -1,4 +1,4 @@
-/* AESSpi.java -- 
+/* AESSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java
index abcb486b59b..2e1422e6bf9 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/ARCFourSpi.java
@@ -1,4 +1,4 @@
-/* ARCFourSpi.java -- 
+/* ARCFourSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java
index e35e4e724ac..ab0c64867f2 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/AnubisSpi.java
@@ -1,4 +1,4 @@
-/* AnubisSpi.java -- 
+/* AnubisSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java
index fec200ca6c9..55d71dbf5a1 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/BlowfishSpi.java
@@ -1,4 +1,4 @@
-/* BlowfishSpi.java -- 
+/* BlowfishSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java
index bf080340001..95a663e2f6e 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/Cast5Spi.java
@@ -1,4 +1,4 @@
-/* Cast5Spi.java -- 
+/* Cast5Spi.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java
index 0863b1f1c88..0871c54027d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/CipherAdapter.java
@@ -1,4 +1,4 @@
-/* CipherAdapter.java -- 
+/* CipherAdapter.java --
    Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -110,7 +110,7 @@ class CipherAdapter
    * should be the appropriate one listed in {@link Registry}. The basic cipher
    * instance is created, along with an instance of the
    * {@link gnu.javax.crypto.mode.ECB} mode and no padding.
-   * 
+   *
    * @param cipherName The cipher to instantiate.
    * @param blockLen The block length to use.
    */
@@ -125,7 +125,7 @@ class CipherAdapter
 
   /**
    * Creates a new cipher adapter with the default block size.
-   * 
+   *
    * @param cipherName The cipher to instantiate.
    */
   protected CipherAdapter(String cipherName)
@@ -236,7 +236,7 @@ class CipherAdapter
   /**
    * Executes initialization logic after all parameters have been handled by the
    * engineInit()s.
-   * 
+   *
    * @param opmode the desired mode of operation for this instance.
    * @param key the key material to use for initialization.
    * @param random a source of randmoness to use if/when needed.
@@ -288,7 +288,7 @@ class CipherAdapter
         // cipher, that is less than or equal to the length of the kb array.
         // set keyLen to kbLength.  either the cipher implementation will throw
         // an InvalidKeyException, or it is implemented in a way which can deal
-        // with an unsupported key-size. 
+        // with an unsupported key-size.
         keyLen = kbLength;
       }
     if (keyLen < kbLength)
@@ -348,7 +348,7 @@ class CipherAdapter
           {
             throw new InvalidAlgorithmParameterException();
           }
-        
+
         attributes.put(IMode.IV, ((IvParameterSpec) params).getIV());
         blockLen = cipher.defaultBlockSize();
         attributes.put(IBlockCipher.CIPHER_BLOCK_SIZE, Integer.valueOf(blockLen));
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java
index 21f62b4f046..0da913a4445 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/DESSpi.java
@@ -1,4 +1,4 @@
-/* DESSpi.java -- 
+/* DESSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java
index 03356a236f7..97fdd5331eb 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.java
@@ -94,7 +94,7 @@ abstract class KeyWrappingAlgorithmAdapter
 
   /**
    * Creates a new JCE Adapter for the designated Key Wrapping Algorithm name.
-   * 
+   *
    * @param name the canonical name of the key-wrapping algorithm.
    * @param blockSize the block size in bytes of the underlying symmetric-key
    *          block cipher algorithm.
@@ -116,7 +116,7 @@ abstract class KeyWrappingAlgorithmAdapter
 
   /**
    * Wraps the encoded form of a designated {@link Key}.
-   * 
+   *
    * @param key the key-material to wrap.
    * @return the wrapped key.
    * @throws InvalidKeyException If the key cannot be wrapped.
@@ -131,7 +131,7 @@ abstract class KeyWrappingAlgorithmAdapter
 
   /**
    * Unwraps a previously-wrapped key-material.
-   * 
+   *
    * @param wrappedKey the wrapped key-material to unwrap.
    * @param wrappedKeyAlgorithm the canonical name of the algorithm, which the
    *          unwrapped key-material represents. This name is used to
@@ -286,7 +286,7 @@ abstract class KeyWrappingAlgorithmAdapter
       ivBytes = ((BlockCipherParameterSpec) params).getIV();
     else if (params instanceof IvParameterSpec)
       ivBytes = ((IvParameterSpec) params).getIV();
-    
+
     initAlgorithm(opmode, kekBytes, ivBytes, random);
   }
 
@@ -341,7 +341,7 @@ abstract class KeyWrappingAlgorithmAdapter
    * kwaBlockSize --passed to this method through its
    * constructor-- greater than or equal to the designated
    * inputLength.
-   * 
+   *
    * @param inputLength the size of a plain text.
    * @return an estimate of the size, in bytes, of the place holder to receive
    * the resulting bytes of a wrap method.
@@ -360,7 +360,7 @@ abstract class KeyWrappingAlgorithmAdapter
    * paddingBlockSize --passed to this method through its
    * constructor-- greater than or equal to the designated
    * inputLength.
-   * 
+   *
    * @param inputLength the size of a cipher text.
    * @return an estimate of the size, in bytes, of the place holder to receive
    *         the resulting bytes of an uwrap method.
@@ -383,7 +383,7 @@ abstract class KeyWrappingAlgorithmAdapter
 
   /**
    * Returns the key bytes, iff it was in RAW format.
-   * 
+   *
    * @param key the opaque JCE secret key to use as the KEK.
    * @return the bytes of the encoded form of the designated kek, iff it was in
    *         RAW format.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java
index 6e744a2f2d9..df0833fb5b4 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/KhazadSpi.java
@@ -1,4 +1,4 @@
-/* KhazadSpi.java -- 
+/* KhazadSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java
index e50e00c8eae..70ff575dab7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/NullCipherSpi.java
@@ -1,4 +1,4 @@
-/* NullCipherSpi.java -- 
+/* NullCipherSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/PBES2.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/PBES2.java
index 26a6a2c2db9..9961c15b1a4 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/PBES2.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/PBES2.java
@@ -1,4 +1,4 @@
-/* PBES2.java -- 
+/* PBES2.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java
index ad61bca599d..f25aca02896 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/RijndaelSpi.java
@@ -1,4 +1,4 @@
-/* RijndaelSpi.java -- 
+/* RijndaelSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java
index fa65d34a9be..1f17b18c80d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/SerpentSpi.java
@@ -1,4 +1,4 @@
-/* SerpentSpi.java -- 
+/* SerpentSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java
index bdc656eaedb..d08aa2cd384 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/SquareSpi.java
@@ -1,4 +1,4 @@
-/* SquareSpi.java -- 
+/* SquareSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java
index b9ec12b5110..c22409020a5 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/TripleDESSpi.java
@@ -1,4 +1,4 @@
-/* TripleDESSpi.java -- 
+/* TripleDESSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java b/libjava/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
index 206e0d9f877..a1bbe4b7169 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/cipher/TwofishSpi.java
@@ -1,4 +1,4 @@
-/* TwofishSpi.java -- 
+/* TwofishSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java b/libjava/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
index bea65a6c63e..dc99b332bf4 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.java
@@ -1,4 +1,4 @@
-/* AnubisSecretKeyFactoryImpl.java -- 
+/* AnubisSecretKeyFactoryImpl.java --
    Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java b/libjava/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
index 53fe8b0b49b..8d964bb96c4 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.java
@@ -1,4 +1,4 @@
-/* BlowfishSecretKeyFactoryImpl.java -- 
+/* BlowfishSecretKeyFactoryImpl.java --
    Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java b/libjava/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
index fcebb528e70..f2681eda1ed 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.java
@@ -1,4 +1,4 @@
-/* Cast5SecretKeyFactoryImpl.java -- 
+/* Cast5SecretKeyFactoryImpl.java --
    Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java b/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
index 257c0a243f2..d2acf8716e7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.java
@@ -97,8 +97,8 @@ public class SecretKeyGeneratorImpl
   {
     keySize >>>= 3; // Use bytes.
     if (! keySizes.contains(Integer.valueOf(keySize)))
-      throw new InvalidParameterException("unsupported key size: " + keySize 
-					  + ", valid sizes are: " + keySizes);
+      throw new InvalidParameterException("unsupported key size: " + keySize
+                                          + ", valid sizes are: " + keySizes);
     currentKeySize = keySize;
     this.random = random;
     init = true;
diff --git a/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java b/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
index 4fcf2fde78b..c30da69a2bf 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/keyring/GnuKeyring.java
@@ -263,7 +263,7 @@ public class GnuKeyring
           result = privateKR.getPublicKey(alias);
       }
     else if (privateKR.containsPrivateKey(alias))
-      result = privateKR.getPrivateKey(alias, password); 
+      result = privateKR.getPrivateKey(alias, password);
 
     if (Configuration.DEBUG)
       log.exiting(this.getClass().getName(), "engineGetKey",
@@ -400,7 +400,7 @@ public class GnuKeyring
 
   /**
    * Load the private keyring from the designated input stream.
-   * 
+   *
    * @param in the input stream to process.
    * @param password the password protecting the keyring.
    * @throws MalformedKeyringException if the keyring is not a private one.
@@ -433,7 +433,7 @@ public class GnuKeyring
 
   /**
    * Load the public keyring from the designated input stream.
-   * 
+   *
    * @param in the input stream to process.
    * @param password the password protecting the keyring.
    * @throws MalformedKeyringException if the keyring is not a public one.
@@ -466,7 +466,7 @@ public class GnuKeyring
 
   /**
    * Return the creation date of a named alias in a designated keyring.
-   * 
+   *
    * @param alias the alias to look for.
    * @param keyring the keyring to search.
    * @return the creattion date of the entry named alias. Return
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
index 2967ee900ce..fc5f3b578d4 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacHavalSpi.java
@@ -1,4 +1,4 @@
-/* HMacHavalSpi.java -- 
+/* HMacHavalSpi.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
index dd648586657..c50feb8cf5c 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD2Spi.java
@@ -1,4 +1,4 @@
-/* HMacMD2Spi.java -- 
+/* HMacMD2Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
index 939851ff537..c0eae5b2290 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD4Spi.java
@@ -1,4 +1,4 @@
-/* HMacMD4Spi.java -- 
+/* HMacMD4Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
index e89fbfdbac9..78e884761fd 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacMD5Spi.java
@@ -1,4 +1,4 @@
-/* HMacMD5Spi.java -- 
+/* HMacMD5Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
index 834ec849a71..b5835177ce7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.java
@@ -1,4 +1,4 @@
-/* HMacRipeMD128Spi.java -- 
+/* HMacRipeMD128Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
index b973ea18678..4d7c6caecd8 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.java
@@ -1,4 +1,4 @@
-/* HMacRipeMD160Spi.java -- 
+/* HMacRipeMD160Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
index 524aa823386..1c7c9443d64 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA160Spi.java
@@ -1,4 +1,4 @@
-/* HMacSHA160Spi.java -- 
+/* HMacSHA160Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
index 4b0493bc63b..7d7c91de621 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA256Spi.java
@@ -1,4 +1,4 @@
-/* HMacSHA256Spi.java -- 
+/* HMacSHA256Spi.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
index 92a5c9d2c69..b66b0f0f3b1 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA384Spi.java
@@ -1,4 +1,4 @@
-/* HMacSHA384Spi.java -- 
+/* HMacSHA384Spi.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
index f1ecd02e5a7..c825a14e90e 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacSHA512Spi.java
@@ -1,4 +1,4 @@
-/* HMacSHA512Spi.java -- 
+/* HMacSHA512Spi.java --
    Copyright (C) 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
index 2d417ef4c58..0d979f08f2d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacTigerSpi.java
@@ -1,4 +1,4 @@
-/* HMacTigerSpi.java -- 
+/* HMacTigerSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
index 1b936d71a2e..6dde69b7e2f 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.java
@@ -1,4 +1,4 @@
-/* HMacWhirlpoolSpi.java -- 
+/* HMacWhirlpoolSpi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java b/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
index d8c800ac728..cb3d934faac 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/MacAdapter.java
@@ -1,4 +1,4 @@
-/* MacAdapter.java -- 
+/* MacAdapter.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -69,7 +69,7 @@ class MacAdapter
 
   /**
    * Creates a new Mac instance for the given name.
-   * 
+   *
    * @param name The name of the mac to create.
    */
   protected MacAdapter(String name)
@@ -80,7 +80,7 @@ class MacAdapter
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param mac a clone of the internal {@link IMac} instance.
    * @param attributes a clone of the current {@link Map} of attributes.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
index 8a40f6e7082..d610cc0c2c1 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/TMMH16Spi.java
@@ -1,4 +1,4 @@
-/* TMMH16Spi.java -- 
+/* TMMH16Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
index 825edc1739c..c6784d6330a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/UHash32Spi.java
@@ -1,4 +1,4 @@
-/* UHash32Spi.java -- 
+/* UHash32Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java b/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
index fc05e532106..85c859c388d 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/mac/UMac32Spi.java
@@ -1,4 +1,4 @@
-/* UMac32Spi.java -- 
+/* UMac32Spi.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java b/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java
index a85c962235e..fde83b1f305 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/BlockCipherParameters.java
@@ -1,4 +1,4 @@
-/* BlockCipherParameters.java -- 
+/* BlockCipherParameters.java --
    Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -74,7 +74,7 @@ public class BlockCipherParameters
    *    keySize              INTEGER,
    *    initializationVector OCTET STRING OPTIONAL }
    * 
-   * 
+   *
    * @return The parameters, encoded an an ASN.1 DER sequence.
    * @throws java.io.IOException If encoding these parameters fails.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java b/libjava/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java
index b89ceda9fa2..436f5d4cda7 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/DEREncodingException.java
@@ -1,4 +1,4 @@
-/* DEREncodingException.java -- 
+/* DEREncodingException.java --
    Copyright (C) 1999, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java b/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
index 68c68027966..9fc1e2cd77a 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/DERReader.java
@@ -1,4 +1,4 @@
-/* DERReader.java -- 
+/* DERReader.java --
    Copyright (C) 1999, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/params/DERWriter.java b/libjava/classpath/gnu/javax/crypto/jce/params/DERWriter.java
index 7bdea10c5f4..7553e20d294 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/params/DERWriter.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/params/DERWriter.java
@@ -1,4 +1,4 @@
-/* DERWriter.java -- 
+/* DERWriter.java --
    Copyright (C) 1999, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java
index 1129d5dfb1b..3816fb64819 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java
@@ -1,4 +1,4 @@
-/* ARCFourRandomSpi.java -- 
+/* ARCFourRandomSpi.java --
    Copyright (C) 2002, 2003, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
index 96d66f05200..9a893af9dcf 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java
@@ -1,4 +1,4 @@
-/* CSPRNGSpi.java -- 
+/* CSPRNGSpi.java --
    Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java b/libjava/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java
index b18410c09f0..d2073b98da9 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java
@@ -62,8 +62,8 @@ public final class FortunaImpl
   {
     synchronized (adaptee)
       {
-	if (virgin)
-	  {
+        if (virgin)
+          {
             adaptee.init (Collections.singletonMap (Fortuna.SEED, seed));
             virgin = false;
           }
diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
index a02fd147e89..bbd5d476864 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java
@@ -1,4 +1,4 @@
-/* ICMRandomSpi.java -- 
+/* ICMRandomSpi.java --
    Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java b/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
index 2faebe8eb04..910e65c7033 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java
@@ -1,4 +1,4 @@
-/* UMacRandomSpi.java -- 
+/* UMacRandomSpi.java --
    Copyright (C) 2001, 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/jce/sig/DHParameters.java b/libjava/classpath/gnu/javax/crypto/jce/sig/DHParameters.java
index a917e223088..cc656d2c885 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/sig/DHParameters.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/sig/DHParameters.java
@@ -92,8 +92,8 @@ public class DHParameters
 
   /**
    * Decodes the set of DH parameters as per RFC-2459; i.e. the DER-encoded
-   * form of the following ASN.1 construct: 
-   * 
+   * form of the following ASN.1 construct:
+   *
    * 
          *   DhParams ::= SEQUENCE {
    *     p  INTEGER, -- odd prime, p=jq +1
@@ -151,8 +151,8 @@ public class DHParameters
 
   /**
    * Encodes the set of DH parameters as per RFC-2459; i.e. as the DER-encoded
-   * form of the following ASN.1 construct: 
-   * 
+   * form of the following ASN.1 construct:
+   *
    * 
          *   DhParams ::= SEQUENCE {
    *     p  INTEGER, -- odd prime, p=jq +1
diff --git a/libjava/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java b/libjava/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java
index 321b4779597..b17fa3497ad 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.java
@@ -1,4 +1,4 @@
-/* BlockCipherParameterSpec.java -- 
+/* BlockCipherParameterSpec.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,7 +58,7 @@ public class BlockCipherParameterSpec
 
   /**
    * Create a new parameter specification.
-   * 
+   *
    * @param iv The initialization vector, or null if there is no
    *          IV.
    * @param blockSize The cipher's block size, in bytes.
@@ -73,7 +73,7 @@ public class BlockCipherParameterSpec
 
   /**
    * Create a new parameter specification with no IV.
-   * 
+   *
    * @param blockSize The cipher's block size, in bytes.
    * @param keySize The cipher's key size, in bytes.
    */
@@ -85,7 +85,7 @@ public class BlockCipherParameterSpec
   /**
    * Get the initialization vector for the cipher, or null if
    * there is no IV.
-   * 
+   *
    * @return The IV.
    */
   public byte[] getIV()
@@ -95,7 +95,7 @@ public class BlockCipherParameterSpec
 
   /**
    * Get the block size of the cipher these parameters are for.
-   * 
+   *
    * @return The block size.
    */
   public int getBlockSize()
@@ -105,7 +105,7 @@ public class BlockCipherParameterSpec
 
   /**
    * Get the key size of the cipher these parameters are for.
-   * 
+   *
    * @return The block size.
    */
   public int getKeySize()
diff --git a/libjava/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java b/libjava/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
index 35643728873..31199538c31 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/spec/TMMHParameterSpec.java
@@ -1,4 +1,4 @@
-/* TMMHParameterSpec.java -- 
+/* TMMHParameterSpec.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -62,7 +62,7 @@ public class TMMHParameterSpec
 
   /**
    * Create a new parameter specification.
-   * 
+   *
    * @param keystream The (PRNG) key stream.
    * @param tagLength The tag length.
    * @param prefix The prefix.
@@ -76,7 +76,7 @@ public class TMMHParameterSpec
 
   /**
    * Create a new parameter specification with no prefix.
-   * 
+   *
    * @param keystream The (PRNG) key stream.
    * @param tagLength The tag length.
    */
@@ -87,7 +87,7 @@ public class TMMHParameterSpec
 
   /**
    * Return the key stream this specification was initialized with.
-   * 
+   *
    * @return The key stream.
    */
   public IRandom getKeystream()
@@ -97,7 +97,7 @@ public class TMMHParameterSpec
 
   /**
    * Return the tag length this specification was initialized with.
-   * 
+   *
    * @return The tag length.
    */
   public Integer getTagLength()
@@ -107,7 +107,7 @@ public class TMMHParameterSpec
 
   /**
    * Return the prefix, or null if no prefix was specified.
-   * 
+   *
    * @return The prefix.
    */
   public byte[] getPrefix()
diff --git a/libjava/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java b/libjava/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java
index 0990cc6d477..3c13faf046e 100644
--- a/libjava/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java
+++ b/libjava/classpath/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.java
@@ -1,4 +1,4 @@
-/* UMac32ParameterSpec.java -- 
+/* UMac32ParameterSpec.java --
    Copyright (C) 2002, 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -53,7 +53,7 @@ public class UMac32ParameterSpec
 
   /**
    * Create a new parameter instance.
-   * 
+   *
    * @param nonce The nonce material.
    */
   public UMac32ParameterSpec(byte[] nonce)
@@ -63,7 +63,7 @@ public class UMac32ParameterSpec
 
   /**
    * Return the nonce material.
-   * 
+   *
    * @return The nonce material.
    */
   public byte[] getNonce()
diff --git a/libjava/classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java b/libjava/classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java
index fc5ddb7145f..3f4e0a22cf6 100644
--- a/libjava/classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java
+++ b/libjava/classpath/gnu/javax/crypto/key/BaseKeyAgreementParty.java
@@ -1,4 +1,4 @@
-/* BaseKeyAgreementParty.java -- 
+/* BaseKeyAgreementParty.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -137,7 +137,7 @@ public abstract class BaseKeyAgreementParty
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   protected void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/javax/crypto/key/GnuPBEKey.java b/libjava/classpath/gnu/javax/crypto/key/GnuPBEKey.java
index 6f4bcb1b37e..5642e59edca 100644
--- a/libjava/classpath/gnu/javax/crypto/key/GnuPBEKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/GnuPBEKey.java
@@ -43,7 +43,7 @@ import javax.crypto.spec.PBEKeySpec;
 
 /**
  * An implementation of a password-based encryption key.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class GnuPBEKey
diff --git a/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java b/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
index 3063fe406d1..c8ca1edabc2 100644
--- a/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
@@ -1,4 +1,4 @@
-/* GnuSecretKey.java -- 
+/* GnuSecretKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -55,7 +55,7 @@ public class GnuSecretKey
   /**
    * Creates a new secret key. The supplied byte array is copied by this
    * constructor.
-   * 
+   *
    * @param key The raw, secret key.
    * @param algorithm The algorithm name, which can be null or empty.
    */
@@ -66,7 +66,7 @@ public class GnuSecretKey
 
   /**
    * Creates a new secret key from a portion of a byte array.
-   * 
+   *
    * @param key The raw, secret key.
    * @param offset The offset at which the key begins.
    * @param length The number of bytes that comprise the key.
@@ -81,7 +81,7 @@ public class GnuSecretKey
 
   /**
    * Returns the algorithm name, if any.
-   * 
+   *
    * @return The algorithm name.
    */
   public String getAlgorithm()
@@ -93,7 +93,7 @@ public class GnuSecretKey
    * Returns the encoded key, which is merely the byte array this class was
    * created with. A reference to the internal byte array is returned, so the
    * caller can delete this key from memory by modifying the returned array.
-   * 
+   *
    * @return The raw key.
    */
   public byte[] getEncoded()
@@ -103,7 +103,7 @@ public class GnuSecretKey
 
   /**
    * Returns the string "RAW".
-   * 
+   *
    * @return The string "RAW".
    */
   public String getFormat()
diff --git a/libjava/classpath/gnu/javax/crypto/key/IKeyAgreementParty.java b/libjava/classpath/gnu/javax/crypto/key/IKeyAgreementParty.java
index 280f3f33d97..64434212fc4 100644
--- a/libjava/classpath/gnu/javax/crypto/key/IKeyAgreementParty.java
+++ b/libjava/classpath/gnu/javax/crypto/key/IKeyAgreementParty.java
@@ -1,4 +1,4 @@
-/* IKeyAgreementParty.java -- 
+/* IKeyAgreementParty.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -47,14 +47,14 @@ public interface IKeyAgreementParty
 {
   /**
    * Returns the canonical name of the key agreement protocol.
-   * 
+   *
    * @return the canonical name of the key agreement protocol.
    */
   String name();
 
   /**
    * Sets up the instance to operate with specific attributes.
-   * 
+   *
    * @param attributes a map of name-values used by concrete implementations.
    * @throws KeyAgreementException if an exception occurs during the setup.
    */
@@ -63,7 +63,7 @@ public interface IKeyAgreementParty
   /**
    * Processes an incoming message at one end, generating a message that will be
    * processed by the other party(ies).
-   * 
+   *
    * @param in the incoming message.
    * @return an outgoing message, or null if this is an
    *         intermediary step that does not cause any output.
@@ -79,7 +79,7 @@ public interface IKeyAgreementParty
    * exchange has completed its part of the exchange. If this is the case an
    * {@link IllegalStateException} is thrown for any method invocation except
    * init() or reset().
-   * 
+   *
    * @return true if this party has completed its part of the key
    *         agreement protocol exchange; false otherwise.
    */
@@ -88,7 +88,7 @@ public interface IKeyAgreementParty
   /**
    * Returns the byte array containing the shared secret as generated by this
    * party.
-   * 
+   *
    * @return the generated shared secret.
    * @throws KeyAgreementException if the key agreement is not yet initialised,
    *           or is initialised but the exchange is still in progress.
diff --git a/libjava/classpath/gnu/javax/crypto/key/IncomingMessage.java b/libjava/classpath/gnu/javax/crypto/key/IncomingMessage.java
index 9701d80a79d..3b68392d690 100644
--- a/libjava/classpath/gnu/javax/crypto/key/IncomingMessage.java
+++ b/libjava/classpath/gnu/javax/crypto/key/IncomingMessage.java
@@ -1,4 +1,4 @@
-/* IncomingMessage.java -- 
+/* IncomingMessage.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -71,7 +71,7 @@ public class IncomingMessage
   /**
    * Constructs an incoming message given the message's encoded form, including
    * its header bytes.
-   * 
+   *
    * @param b the encoded form, including the header bytes, of an incoming
    *          message.
    * @throws KeyAgreementException if the buffer is malformed.
@@ -103,7 +103,7 @@ public class IncomingMessage
    * 
      
    * Calls the method with the same name and three arguments as:
    * getInstance(raw, 0, raw.length).
-   * 
+   *
    * @param raw the encoded form, excluding the header bytes.
    * @return a new instance of IncomingMessage.
    */
@@ -115,7 +115,7 @@ public class IncomingMessage
   /**
    * Returns an instance of a message given its encoded contents, excluding the
    * message's header bytes.
-   * 
+   *
    * @param raw the encoded form, excluding the header bytes.
    * @param offset offset where to start using raw bytes from.
    * @param len number of bytes to use.
@@ -130,7 +130,7 @@ public class IncomingMessage
 
   /**
    * Converts two octets into the number that they represent.
-   * 
+   *
    * @param b the two octets.
    * @return the length.
    */
@@ -144,7 +144,7 @@ public class IncomingMessage
 
   /**
    * Converts four octets into the number that they represent.
-   * 
+   *
    * @param b the four octets.
    * @return the length.
    */
@@ -169,7 +169,7 @@ public class IncomingMessage
    * 
      
    * See {@link OutgoingMessage#writePublicKey(java.security.PublicKey)} for
    * more details on the internal format.
-   * 
+   *
    * @throws KeyAgreementException if an encoding size constraint is violated or
    *           a mismatch was detected in the encoding.
    */
@@ -196,7 +196,7 @@ public class IncomingMessage
    * 
      
    * See {@link OutgoingMessage#writePrivateKey(java.security.PrivateKey)} for
    * more details.
-   * 
+   *
    * @throws KeyAgreementException if an encoding size constraint is violated or
    *           a mismatch was detected in the encoding.
    */
@@ -220,7 +220,7 @@ public class IncomingMessage
 
   /**
    * Decodes an MPI from the current message's contents.
-   * 
+   *
    * @return a native representation of an MPI.
    * @throws KeyAgreementException if an encoding exception occurs during the
    *           operation.
diff --git a/libjava/classpath/gnu/javax/crypto/key/KeyAgreementException.java b/libjava/classpath/gnu/javax/crypto/key/KeyAgreementException.java
index 405f011adde..06a7db70ba1 100644
--- a/libjava/classpath/gnu/javax/crypto/key/KeyAgreementException.java
+++ b/libjava/classpath/gnu/javax/crypto/key/KeyAgreementException.java
@@ -1,4 +1,4 @@
-/* KeyAgreementException.java -- 
+/* KeyAgreementException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -68,7 +68,7 @@ public class KeyAgreementException
   /**
    * Constructs a new instance of KeyAgreementException with a
    * detailed message. The root exception is null.
-   * 
+   *
    * @param detail a possibly null string containing details of
    *          the exception.
    * @see Throwable#getMessage()
@@ -81,7 +81,7 @@ public class KeyAgreementException
   /**
    * Constructs a new instance of KeyAgreementException with a
    * detailed message and a root exception.
-   * 
+   *
    * @param detail a possibly null string containing details of
    *          the exception.
    * @param cause a possibly null root exception that caused this
@@ -99,7 +99,7 @@ public class KeyAgreementException
    * Returns the cause of this throwable or null if the cause is
    * nonexistent or unknown. The cause is the throwable that caused this
    * exception to be thrown.
-   * 
+   *
    * @return the possibly null exception that caused this one.
    */
   public Throwable getCause()
@@ -123,7 +123,7 @@ public class KeyAgreementException
    * Prints this exception's stack trace to a print stream. If this exception
    * has a root exception; the stack trace of the root exception
    * is also printed to the print stream.
-   * 
+   *
    * @param ps the non-null print stream to which to print.
    */
   public void printStackTrace(PrintStream ps)
@@ -137,7 +137,7 @@ public class KeyAgreementException
    * Prints this exception's stack trace to a print writer. If this exception
    * has a root exception; the stack trace of the root exception
    * is also printed to the print writer.
-   * 
+   *
    * @param pw the non-null print writer to use for output.
    */
   public void printStackTrace(PrintWriter pw)
@@ -153,7 +153,7 @@ public class KeyAgreementException
    * and if it has a root exception, the string representation of the
    * root exception. This string representation is meant for debugging and is
    * not meant to be interpreted programmatically.
-   * 
+   *
    * @return the non-null string representation of this exception.
    * @see Throwable#getMessage()
    */
diff --git a/libjava/classpath/gnu/javax/crypto/key/KeyAgreementFactory.java b/libjava/classpath/gnu/javax/crypto/key/KeyAgreementFactory.java
index ae9bf36ff3a..a4e14bc6942 100644
--- a/libjava/classpath/gnu/javax/crypto/key/KeyAgreementFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/key/KeyAgreementFactory.java
@@ -1,4 +1,4 @@
-/* KeyAgreementFactory.java -- 
+/* KeyAgreementFactory.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -71,7 +71,7 @@ public class KeyAgreementFactory
    * A in a two-party A..B exchange, given the
    * canonical name of this protocol. Party A is usually the
    * initiator of the exchange.
-   * 
+   *
    * @param name the case-insensitive key agreement protocol name.
    * @return an instance of the key agreement protocol handler for party
    *         A, or null if none found.
@@ -99,7 +99,7 @@ public class KeyAgreementFactory
    * Returns an instance of a key agreeent protocol handler, for party
    * B in a two-party A..B exchange, given the
    * canonical name of this protocol.
-   * 
+   *
    * @param name the case-insensitive key agreement protocol name.
    * @return an instance of the key agreement protocol handler for party
    *         B, or null if none found.
@@ -126,7 +126,7 @@ public class KeyAgreementFactory
   /**
    * Returns a {@link Set} of key agreement protocol names supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of key agreement protocol names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/key/OutgoingMessage.java b/libjava/classpath/gnu/javax/crypto/key/OutgoingMessage.java
index 563b3ef5ae6..e011330fe52 100644
--- a/libjava/classpath/gnu/javax/crypto/key/OutgoingMessage.java
+++ b/libjava/classpath/gnu/javax/crypto/key/OutgoingMessage.java
@@ -1,4 +1,4 @@
-/* OutgoingMessage.java -- 
+/* OutgoingMessage.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -70,7 +70,7 @@ public class OutgoingMessage
   /**
    * Returns the encoded form of the current message including the 4-byte length
    * header.
-   * 
+   *
    * @throws KeyAgreementException if an encoding size constraint is violated.
    */
   public byte[] toByteArray() throws KeyAgreementException
@@ -89,7 +89,7 @@ public class OutgoingMessage
   /**
    * Returns the encoded form of the current message excluding the 4-byte length
    * header.
-   * 
+   *
    * @throws KeyAgreementException if an encoding size constraint is violated.
    */
   public byte[] wrap() throws KeyAgreementException
@@ -114,7 +114,7 @@ public class OutgoingMessage
    * 
          * key --> 4-byte-length || 1-byte-type-and-format || encoded-key-bytes
    * 
      
-   * 
+   *
    * @param k the public key to encode.
    * @throws KeyAgreementException if an encoding size constraint is violated.
    */
@@ -137,7 +137,7 @@ public class OutgoingMessage
    * 
          * key --> 4-byte-length || 1-byte-type-and-format || encoded-key-bytes
    * 
      
-   * 
+   *
    * @param k the private key to encode.
    * @throws KeyAgreementException if an encoding size constraint is violated.
    */
@@ -148,7 +148,7 @@ public class OutgoingMessage
 
   /**
    * Encodes an MPI into the message.
-   * 
+   *
    * @param val the MPI to encode.
    * @throws KeyAgreementException if an encoding size constraint is violated.
    */
@@ -165,7 +165,7 @@ public class OutgoingMessage
 
   /**
    * Encodes a string into the message.
-   * 
+   *
    * @param s the string to encode.
    * @throws KeyAgreementException if the UTF8 encoding is not supported on this
    *           platform, or if an encoding size constraint is violated.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java
index 98ea4765375..8c03cbb006d 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.java
@@ -79,7 +79,7 @@ public class DHKeyPairPKCS8Codec
   /**
    * Returns the DER-encoded form of the PKCS#8 ASN.1 PrivateKeyInfo
    * representation of a DH private key. The ASN.1 specification is as follows:
-   * 
+   *
    * 
          *   PrivateKeyInfo ::= SEQUENCE {
    *     version              INTEGER, -- MUST be 0
@@ -105,7 +105,7 @@ public class DHKeyPairPKCS8Codec
    * parameter. RFC-2631 DOES NOT allow for an optional value for that
    * parameter, hence we replace such null values with 0, and do
    * the reverse in the corresponding decode method.
-   * 
+   *
    * @return the DER encoded form of the ASN.1 representation of the
    *         PrivateKeyInfo field in an X.509 certificate.
    * @throw InvalidParameterException if an error occurs during the marshalling
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java
index aefcd5ff4fb..4275389cef2 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.java
@@ -1,4 +1,4 @@
-/* DHKeyPairRawCodec.java -- 
+/* DHKeyPairRawCodec.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -89,7 +89,7 @@ public class DHKeyPairRawCodec
    * the toByteArray() method on the DH parameter y,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not a DH one.
@@ -227,7 +227,7 @@ public class DHKeyPairRawCodec
    * the toByteArray() method on the DH parameter x,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not a DH one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java
index 5da396a1da6..893716eefe2 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.java
@@ -90,10 +90,10 @@ public class DHKeyPairX509Codec
    *     q  INTEGER  -- factor of p-1
    *   }
    * 
      
-   * 
+   *
    * 
      The subjectPublicKey field, which is a BIT STRING, contains the
    * DER-encoded form of the DH public key as an INTEGER.
      
-   * 
+   *
    * 
          *       DHPublicKey ::= INTEGER -- public key, y = g^x mod p
    * 
      
@@ -104,7 +104,7 @@ public class DHKeyPairX509Codec
    * parameter. RFC-2631 DOES NOT allow for an optional value for that
    * parameter, hence we replace such null values with 0, and do
    * the reverse in the corresponding decode method.
-   * 
+   *
    * @param key the {@link PublicKey} instance to encode. MUST be an instance of
    *          {@link GnuDHPublicKey}.
    * @return the DER-encoded form of the ASN.1 representation of the
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java
index 2443950549a..893d84d329a 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.java
@@ -1,4 +1,4 @@
-/* DiffieHellmanKeyAgreement.java -- 
+/* DiffieHellmanKeyAgreement.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -77,7 +77,7 @@ import javax.crypto.interfaces.DHPrivateKey;
  *  message) in order to ensure that different messages use different
  *  KEKs. Implementations MAY implement Static-Static mode."
  * 
      
- * 
+ *
  * 
      
  * Reference:
  * 
        
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java
index ab1023ad3b5..3194f682d44 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.java
@@ -1,4 +1,4 @@
-/* DiffieHellmanReceiver.java -- 
+/* DiffieHellmanReceiver.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -53,7 +53,7 @@ import javax.crypto.interfaces.DHPrivateKey;
 /**
  * This implementation is the receiver's part of the basic version of the
  * Diffie-Hellman key agreement exchange (B in [HAC]).
- * 
+ *
  * @see DiffieHellmanKeyAgreement
  */
 public class DiffieHellmanReceiver
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanSender.java b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanSender.java
index 52a030d678c..7fc997354f8 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanSender.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/DiffieHellmanSender.java
@@ -1,4 +1,4 @@
-/* DiffieHellmanSender.java -- 
+/* DiffieHellmanSender.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -53,7 +53,7 @@ import javax.crypto.interfaces.DHPrivateKey;
 /**
  * This implementation is the sender's part of the basic version of the
  * Diffie-Hellman key agreement exchange (A in [HAC]).
- * 
+ *
  * @see DiffieHellmanKeyAgreement
  */
 public class DiffieHellmanSender
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java
index 967eda3f508..4283dc59be1 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.java
@@ -1,4 +1,4 @@
-/* ElGamalKeyAgreement.java -- 
+/* ElGamalKeyAgreement.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalReceiver.java b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalReceiver.java
index bf9b4fb1f0f..ad606f6c9d2 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalReceiver.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalReceiver.java
@@ -1,4 +1,4 @@
-/* ElGamalReceiver.java -- 
+/* ElGamalReceiver.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ import javax.crypto.interfaces.DHPrivateKey;
 /**
  * This implementation is the receiver's part of the ElGamal key agreement
  * exchange (B in [HAC]).
- * 
+ *
  * @see ElGamalKeyAgreement
  */
 public class ElGamalReceiver
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalSender.java b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalSender.java
index cdd1ef0dac0..bc9643500c9 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalSender.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/ElGamalSender.java
@@ -1,4 +1,4 @@
-/* ElGamalSender.java -- 
+/* ElGamalSender.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ import javax.crypto.interfaces.DHPublicKey;
 /**
  * This implementation is the sender's part of the ElGamal key agreement
  * exchange (A in [HAC]).
- * 
+ *
  * @see ElGamalKeyAgreement
  */
 public class ElGamalSender
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKey.java b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKey.java
index 1066830c322..03a18c310f1 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKey.java
@@ -1,4 +1,4 @@
-/* GnuDHKey.java -- 
+/* GnuDHKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -86,7 +86,7 @@ public abstract class GnuDHKey
 
   /**
    * Trivial protected constructor.
-   * 
+   *
    * @param defaultFormat the identifier of the encoding format to use by
    *          default when externalizing the key.
    * @param q a prime divisor of p-1.
@@ -135,7 +135,7 @@ public abstract class GnuDHKey
   /**
    * Returns true if the designated object is an instance of
    * {@link DHKey} and has the same Diffie-Hellman parameter values as this one.
-   * 
+   *
    * @param obj the other non-null DH key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
index 13cfd9014a9..89e9c4c80ec 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.java
@@ -1,4 +1,4 @@
-/* GnuDHKeyPairGenerator.java -- 
+/* GnuDHKeyPairGenerator.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -214,7 +214,7 @@ public class GnuDHKeyPairGenerator
 
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
index d8150dcdf02..881421a7474 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPrivateKey.java
@@ -1,4 +1,4 @@
-/* GnuDHPrivateKey.java -- 
+/* GnuDHPrivateKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -70,7 +70,7 @@ public class GnuDHPrivateKey
   /**
    * Convenience constructor. Calls the constructor with five arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the value of its first argument.
-   * 
+   *
    * @param q a prime divisor of p-1.
    * @param p the public prime.
    * @param g the generator of the group.
@@ -84,7 +84,7 @@ public class GnuDHPrivateKey
   /**
    * Constructs a new instance of GnuDHPrivateKey given the
    * designated parameters.
-   * 
+   *
    * @param preferredFormat the identifier of the encoding format to use by
    *          default when externalizing the key.
    * @param q a prime divisor of p-1.
@@ -106,7 +106,7 @@ public class GnuDHPrivateKey
    * method of a DH keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for DH keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @exception ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *              k, to represent a valid encoding of an
@@ -137,7 +137,7 @@ public class GnuDHPrivateKey
   /**
    * Returns the encoded form of this private key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -165,7 +165,7 @@ public class GnuDHPrivateKey
   /**
    * Returns true if the designated object is an instance of
    * {@link DHPrivateKey} and has the same parameter values as this one.
-   * 
+   *
    * @param obj the other non-null DH key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java
index 5fb31f38364..5f1771bb0e1 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/GnuDHPublicKey.java
@@ -1,4 +1,4 @@
-/* GnuDHPublicKey.java -- 
+/* GnuDHPublicKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -68,7 +68,7 @@ public class GnuDHPublicKey
   /**
    * Convenience constructor. Calls the constructor with five arguments passing
    * {@link Registry#RAW_ENCODING_ID} as the value of its first argument.
-   * 
+   *
    * @param q a prime divisor of p-1.
    * @param p the public prime.
    * @param g the generator of the group.
@@ -82,7 +82,7 @@ public class GnuDHPublicKey
   /**
    * Constructs a new instance of GnuDHPublicKey given the
    * designated parameters.
-   * 
+   *
    * @param preferredFormat the identifier of the encoding format to use by
    *          default when externalizing the key.
    * @param q a prime divisor of p-1.
@@ -104,7 +104,7 @@ public class GnuDHPublicKey
    * method of a DH keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for DSS keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @exception ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *              k, to represent a valid encoding of an
@@ -135,7 +135,7 @@ public class GnuDHPublicKey
   /**
    * Returns the encoded form of this public key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -162,7 +162,7 @@ public class GnuDHPublicKey
   /**
    * Returns true if the designated object is an instance of
    * {@link DHPublicKey} and has the same parameter values as this one.
-   * 
+   *
    * @param obj the other non-null DH key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/dh/RFC2631.java b/libjava/classpath/gnu/javax/crypto/key/dh/RFC2631.java
index a814d2c0bbf..60ef494097c 100644
--- a/libjava/classpath/gnu/javax/crypto/key/dh/RFC2631.java
+++ b/libjava/classpath/gnu/javax/crypto/key/dh/RFC2631.java
@@ -1,4 +1,4 @@
-/* RFC2631.java -- 
+/* RFC2631.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6Host.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6Host.java
index 44f99467319..2c8e66fa207 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6Host.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6Host.java
@@ -1,4 +1,4 @@
-/* SRP6Host.java -- 
+/* SRP6Host.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java
index b4264184e5e..d3d27b3810a 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.java
@@ -1,4 +1,4 @@
-/* SRP6KeyAgreement.java -- 
+/* SRP6KeyAgreement.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -66,23 +66,23 @@ import java.math.BigInteger;
  *  A,B  Public ephemeral values
  *  x    Private key (derived from p and s)
  *  v    Password verifier
- * 
+ *
  *  The host stores passwords using the following formula:
  *  x = H(s | H(I ":" p))           (s is chosen randomly)
  *  v = gˆx                         (computes password verifier)
- * 
+ *
  *  The host then keeps {I, s, v} in its password database.
- * 
+ *
  *  The authentication protocol itself goes as follows:
  *  User -> Host:  I, A = gˆa         (identifies self, a = random number)
  *  Host -> User:  s, B = 3v + gˆb    (sends salt, b = random number)
- * 
+ *
  *  Both:  u = H(A, B)
- * 
+ *
  *  User:  x = H(s, p)               (user enters password)
  *  User:  S = (B - 3gˆx) ˆ (a + ux) (computes session key)
  *  User:  K = H(S)
- * 
+ *
  *  Host:  S = (Avˆu) ˆ b            (computes session key)
  *  Host:  K = H(S)
  * 
      
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslClient.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslClient.java
index f5969f0c195..ec5cd7f171d 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslClient.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslClient.java
@@ -1,4 +1,4 @@
-/* SRP6SaslClient.java -- 
+/* SRP6SaslClient.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -52,13 +52,13 @@ import java.math.BigInteger;
  * User (client side).
  * 
      
  * In this alternative, the exchange goes as follows:
- * 
+ *
  * 
        *     C -> S:  I                      (identifies self)
  *     S -> C:  N, g, s, B = 3v + gˆb  (sends salt, b = random number)
  *     C -> S:  A = gˆa                (a = random number)
  * 
      
- * 
+ *
  * 
      
  * All elements are computed the same way as in the standard version.
  * 
      
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslServer.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslServer.java
index 7e68c99c437..a4313f4d3f8 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslServer.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6SaslServer.java
@@ -1,4 +1,4 @@
-/* SRP6SaslServer.java -- 
+/* SRP6SaslServer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -52,13 +52,13 @@ import java.math.BigInteger;
  * Host (server side).
  * 
      
  * In this alternative, the exchange goes as follows:
- * 
+ *
  * 
        *     C -> S:  I                      (identifies self)
  *     S -> C:  N, g, s, B = 3v + gˆb  (sends salt, b = random number)
  *     C -> S:  A = gˆa                (a = random number)
  * 
      
- * 
+ *
  * 
      
  * All elements are computed the same way as in the standard version.
  * 
      
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSClient.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSClient.java
index af0be02dfe0..c2459f620fd 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSClient.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSClient.java
@@ -1,4 +1,4 @@
-/* SRP6TLSClient.java -- 
+/* SRP6TLSClient.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSServer.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSServer.java
index f91cffd00f6..42e3d9cb110 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSServer.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6TLSServer.java
@@ -1,4 +1,4 @@
-/* SRP6TLSServer.java -- 
+/* SRP6TLSServer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6User.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6User.java
index 7c97e76976e..4a1e8dda940 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6User.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRP6User.java
@@ -1,4 +1,4 @@
-/* SRP6User.java -- 
+/* SRP6User.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java
index 85b3b1139dc..fb8249e058a 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPAlgorithm.java
@@ -1,4 +1,4 @@
-/* SRPAlgorithm.java -- 
+/* SRPAlgorithm.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKey.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKey.java
index 06ba47a9fb3..72ce8d2cf5b 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKey.java
@@ -1,4 +1,4 @@
-/* SRPKey.java -- 
+/* SRPKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -80,7 +80,7 @@ public abstract class SRPKey
 
   /**
    * Returns the standard algorithm name for this key.
-   * 
+   *
    * @return the standard algorithm name for this key.
    */
   public String getAlgorithm()
@@ -97,7 +97,7 @@ public abstract class SRPKey
   /**
    * Returns {@link Registry#RAW_ENCODING_SHORT_NAME} which is the sole format
    * supported for this type of keys.
-   * 
+   *
    * @return {@link Registry#RAW_ENCODING_SHORT_NAME} ALWAYS.
    */
   public String getFormat()
@@ -107,7 +107,7 @@ public abstract class SRPKey
 
   /**
    * Returns the public shared modulus.
-   * 
+   *
    * @return N.
    */
   public BigInteger getN()
@@ -117,7 +117,7 @@ public abstract class SRPKey
 
   /**
    * Returns the generator.
-   * 
+   *
    * @return g.
    */
   public BigInteger getG()
@@ -128,7 +128,7 @@ public abstract class SRPKey
   /**
    * Returns true if the designated object is an instance of
    * SRPKey and has the same SRP parameter values as this one.
-   * 
+   *
    * @param obj the other non-null SRP key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
index 8d50c9b71cb..59e5bc94364 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.java
@@ -1,4 +1,4 @@
-/* SRPKeyPairGenerator.java -- 
+/* SRPKeyPairGenerator.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java
index 555dc23cf1a..b7cc53693d6 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.java
@@ -1,4 +1,4 @@
-/* SRPKeyPairRawCodec.java -- 
+/* SRPKeyPairRawCodec.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -92,7 +92,7 @@ public class SRPKeyPairRawCodec
    * the toByteArray() method on the SRP parameter y,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not an SRP one.
@@ -215,7 +215,7 @@ public class SRPKeyPairRawCodec
    * the toByteArray() method on the SRP parameter v,
    * 
    * 
-   * 
+   *
    * @param key the key to encode.
    * @return the Raw format encoding of the designated key.
    * @throws IllegalArgumentException if the designated key is not an SRP one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPrivateKey.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPrivateKey.java
index d5ade07d765..c2e13be82f3 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPrivateKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPrivateKey.java
@@ -1,4 +1,4 @@
-/* SRPPrivateKey.java -- 
+/* SRPPrivateKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -71,7 +71,7 @@ public class SRPPrivateKey
 
   /**
    * Public constructor for use from outside this package.
-   * 
+   *
    * @param N the public shared modulus.
    * @param g the generator.
    * @param x the private exponent of the ephemeral key.
@@ -83,7 +83,7 @@ public class SRPPrivateKey
 
   /**
    * Public constructor for use from outside this package.
-   * 
+   *
    * @param N the public shared modulus.
    * @param g the generator.
    * @param x the private exponent of the ephemeral key.
@@ -100,7 +100,7 @@ public class SRPPrivateKey
 
   /**
    * Default constructor. Assumes N and g are already validated.
-   * 
+   *
    * @param params an array of either 3 or 4 values representing N, g, and
    *          either v and X for the server, or just X for the client. Those
    *          values represent the following:
@@ -133,7 +133,7 @@ public class SRPPrivateKey
    * method of an SRP keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for DSS keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @throws ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *           k, to represent a valid encoding of an instance
@@ -160,7 +160,7 @@ public class SRPPrivateKey
 
   /**
    * Returns the private exponent of the key as a {@link BigInteger}.
-   * 
+   *
    * @return the private exponent of the key as a {@link BigInteger}.
    */
   public BigInteger getX()
@@ -170,7 +170,7 @@ public class SRPPrivateKey
 
   /**
    * Returns the user's verifier as a {@link BigInteger}.
-   * 
+   *
    * @return the user's verifier as a {@link BigInteger} if this is an SRP
    *         private key of a Host, or null if this is a private
    *         SRP key for a User.
@@ -183,7 +183,7 @@ public class SRPPrivateKey
   /**
    * Returns the encoded form of this private key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -207,7 +207,7 @@ public class SRPPrivateKey
    * Returns true if the designated object is an instance of
    * SRPPrivateKey and has the same SRP parameter values as this
    * one.
-   * 
+   *
    * @param obj the other non-null SRP key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPublicKey.java b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPublicKey.java
index 04a949211b9..2db13ff4c33 100644
--- a/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPublicKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/srp6/SRPPublicKey.java
@@ -1,4 +1,4 @@
-/* SRPPublicKey.java -- 
+/* SRPPublicKey.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -65,7 +65,7 @@ public class SRPPublicKey
 
   /**
    * Public constructor for use from outside this package.
-   * 
+   *
    * @param N the public shared modulus.
    * @param g the generator.
    * @param Y the public exponent of the ephemeral key.
@@ -80,7 +80,7 @@ public class SRPPublicKey
 
   /**
    * Default constructor. Assumes that N and g are already validated.
-   * 
+   *
    * @param params an array of 3 values representing N, g and Y; the latter
    *          being the client's or server's public exponent.
    */
@@ -96,7 +96,7 @@ public class SRPPublicKey
    * method of an SRP keypair codec object (an instance implementing
    * {@link IKeyPairCodec} for SRP keys, and re-constructs an instance of this
    * object.
-   * 
+   *
    * @param k the contents of a previously encoded instance of this object.
    * @throws ArrayIndexOutOfBoundsException if there is not enough bytes, in
    *           k, to represent a valid encoding of an instance
@@ -123,7 +123,7 @@ public class SRPPublicKey
 
   /**
    * Returns the public exponent of the key as a {@link BigInteger}.
-   * 
+   *
    * @return the public exponent of the key as a {@link BigInteger}.
    */
   public BigInteger getY()
@@ -134,7 +134,7 @@ public class SRPPublicKey
   /**
    * Returns the encoded form of this public key according to the designated
    * format.
-   * 
+   *
    * @param format the desired format identifier of the resulting encoding.
    * @return the byte sequence encoding this key according to the designated
    *         format.
@@ -158,7 +158,7 @@ public class SRPPublicKey
    * Returns true if the designated object is an instance of
    * SRPPublicKeyand has the same SRP parameter values as this
    * one.
-   * 
+   *
    * @param obj the other non-null SRP key to compare to.
    * @return true if the designated object is of the same type
    *         and value as this one.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java
index cd2e5868db9..91c3bc6e2ff 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java
@@ -1,4 +1,4 @@
-/* AuthenticatedEntry.java -- 
+/* AuthenticatedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -90,7 +90,7 @@ public final class AuthenticatedEntry
   /**
    * Computes the mac over this envelope's data. This method must be
    * called before this entry in encoded.
-   * 
+   *
    * @param key The key to authenticate with.
    * @throws IOException If encoding fails.
    * @throws InvalidKeyException If the supplied key is bad.
@@ -115,7 +115,7 @@ public final class AuthenticatedEntry
   /**
    * Verifies this entry's payload. This method will unmask this entry, thus it
    * must be called before accessing its contents.
-   * 
+   *
    * @param key The key to use to authenticate.
    * @throws InvalidKeyException If the given key is improper.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/BaseKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/BaseKeyring.java
index 369507d4c73..e93ca8fa366 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/BaseKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/BaseKeyring.java
@@ -1,4 +1,4 @@
-/* BaseKeyring.java -- 
+/* BaseKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/BinaryDataEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/BinaryDataEntry.java
index e694487e141..8fb1e0f39fd 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/BinaryDataEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/BinaryDataEntry.java
@@ -1,4 +1,4 @@
-/* BinaryDataEntry.java -- 
+/* BinaryDataEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -53,7 +53,7 @@ public class BinaryDataEntry
 
   /**
    * Creates a new binary data entry.
-   * 
+   *
    * @param contentType The content type of this entry. This parameter can be
    *          null if no content type is needed.
    * @param data The data.
@@ -86,7 +86,7 @@ public class BinaryDataEntry
   /**
    * Returns the content type of this entry, or null if this
    * property is not set.
-   * 
+   *
    * @return The content type.
    */
   public String getContentType()
@@ -96,7 +96,7 @@ public class BinaryDataEntry
 
   /**
    * Returns this object's data field.
-   * 
+   *
    * @return The data.
    */
   public byte[] getData()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
index 32b86084f31..e798a93ce20 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
@@ -1,4 +1,4 @@
-/* CertPathEntry.java -- 
+/* CertPathEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/CertificateEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/CertificateEntry.java
index 661758442cc..f574a4fe47f 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/CertificateEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/CertificateEntry.java
@@ -1,4 +1,4 @@
-/* CertificateEntry.java -- 
+/* CertificateEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,7 +58,7 @@ public final class CertificateEntry
 
   /**
    * Creates a new certificate entry.
-   * 
+   *
    * @param certificate The certificate.
    * @param creationDate The creation date.
    * @param properties The alias.
@@ -106,7 +106,7 @@ public final class CertificateEntry
 
   /**
    * Returns this entry's certificate.
-   * 
+   *
    * @return The certificate.
    */
   public Certificate getCertificate()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/CompressedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/CompressedEntry.java
index b24c6715ab7..8949a41e9ca 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/CompressedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/CompressedEntry.java
@@ -1,4 +1,4 @@
-/* CompressedEntry.java -- 
+/* CompressedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java
index f0693cc91d2..68a6c2c8af7 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/EncryptedEntry.java
@@ -1,4 +1,4 @@
-/* EncryptedEntry.java -- 
+/* EncryptedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/Entry.java b/libjava/classpath/gnu/javax/crypto/keyring/Entry.java
index ef225db95e6..d4592494040 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/Entry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/Entry.java
@@ -1,4 +1,4 @@
-/* Entry.java -- 
+/* Entry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -71,7 +71,7 @@ public abstract class Entry
 
   /**
    * Creates a new Entry.
-   * 
+   *
    * @param type This entry's type.
    * @param properties This entry's properties.
    * @throws IllegalArgumentException If the properties argument is null, or if
@@ -101,7 +101,7 @@ public abstract class Entry
   /**
    * Returns this entry's properties object. The properties are cloned before
    * being returned.
-   * 
+   *
    * @return The properties.
    */
   public Properties getProperties()
@@ -122,7 +122,7 @@ public abstract class Entry
   /**
    * This method is called when this entry needs to be written to an output
    * stream.
-   * 
+   *
    * @param out The stream to write to.
    * @throws IOException If an I/O exception occurs.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
index fe39091b05c..76aba7d7b10 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/EnvelopeEntry.java
@@ -1,4 +1,4 @@
-/* EnvelopeEntry.java -- 
+/* EnvelopeEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -80,7 +80,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Adds an entry to this envelope.
-   * 
+   *
    * @param entry The entry to add.
    */
   public void add(Entry entry)
@@ -102,7 +102,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Tests if this envelope contains a primitive entry with the given alias.
-   * 
+   *
    * @param alias The alias to test.
    * @return True if this envelope (or one of the contained envelopes) contains
    *         a primitive entry with the given alias.
@@ -133,7 +133,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Tests if this envelope contains the given entry.
-   * 
+   *
    * @param entry The entry to test.
    * @return True if this envelope contains the given entry.
    */
@@ -156,7 +156,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Returns a copy of all entries this envelope contains.
-   * 
+   *
    * @return All contained entries.
    */
   public List getEntries()
@@ -167,7 +167,7 @@ public abstract class EnvelopeEntry
   /**
    * Gets all primitive entries that have the given alias. If there are any
    * masked entries that contain the given alias, they will be returned as well.
-   * 
+   *
    * @param alias The alias of the entries to get.
    * @return A list of all primitive entries that have the given alias.
    */
@@ -214,7 +214,7 @@ public abstract class EnvelopeEntry
   /**
    * Returns the list of all aliases contained by this envelope, separated by a
    * semicolon (';').
-   * 
+   *
    * @return The list of aliases.
    */
   public String getAliasList()
@@ -228,7 +228,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Removes the specified entry.
-   * 
+   *
    * @param entry The entry.
    * @return True if an entry was removed.
    */
@@ -280,7 +280,7 @@ public abstract class EnvelopeEntry
 
   /**
    * Removes all primitive entries that have the specified alias.
-   * 
+   *
    * @param alias The alias of the entries to remove.
    * @return true if alias was present and was
    *         successfully trmoved. Returns false if
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
index 2ccdad6b3e3..ab393397298 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/GnuPrivateKeyring.java
@@ -1,4 +1,4 @@
-/* GnuPrivateKeyring.java -- 
+/* GnuPrivateKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -56,7 +56,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
- * 
+ *
  */
 public class GnuPrivateKeyring
     extends BaseKeyring
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java
index 5243919c3c9..d7387f892b0 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/GnuPublicKeyring.java
@@ -1,4 +1,4 @@
-/* GnuPublicKeyring.java -- 
+/* GnuPublicKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/IKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/IKeyring.java
index 44d5377008a..141f2dcd4f3 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/IKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/IKeyring.java
@@ -1,4 +1,4 @@
-/* IKeyring.java -- 
+/* IKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -79,7 +79,7 @@ public interface IKeyring
    * 
      
    * What happens to the current contents of this keyring? are the new ones
    * merged with the current ones or do they simply replace them?
-   * 
+   *
    * @param attributes The attributes that designate the source where the store
    *          is to be loaded from. What happens
    * @throws IllegalArgumentException If the attributes are inappropriate.
@@ -92,7 +92,7 @@ public interface IKeyring
   /**
    * Stores the contents of this keyring to persistent storage as specified by
    * the designated attributes.
-   * 
+   *
    * @param attributes the attributes that define where the contents of this
    *          keyring will be stored.
    * @throws IOException if an exception occurs during the process.
@@ -107,7 +107,7 @@ public interface IKeyring
 
   /**
    * Returns the number of entries in this keyring.
-   * 
+   *
    * @return The number of current entries in this keyring.
    */
   int size();
@@ -115,7 +115,7 @@ public interface IKeyring
   /**
    * Returns an {@link Enumeration} of all aliases (instances of {@link String})
    * in this keyring.
-   * 
+   *
    * @return The enumeration of {@link String}s each representing an alias
    *         found in this keyring.
    */
@@ -123,7 +123,7 @@ public interface IKeyring
 
   /**
    * Tests whether or not this keyring contains the given alias.
-   * 
+   *
    * @param alias The alias to check.
    * @return true if this keyring contains the alias.
    */
@@ -133,7 +133,7 @@ public interface IKeyring
    * Returns a {@link List} of entries (instances of {@link Entry}) for the
    * given alias, or null if there no such entry
    * exists.
-   * 
+   *
    * @param alias The alias of the entry(ies) to return.
    * @return A list of all entries (instances of {@link Entry} that have the
    *         given alias, or null if no one
@@ -145,7 +145,7 @@ public interface IKeyring
    * Adds a designated {@link Entry} to this keyring.
    * 
      
    * What happens if there is already an entry with the same alias?
-   * 
+   *
    * @param entry The entry to put in this keyring.
    */
   void add(Entry entry);
@@ -155,7 +155,7 @@ public interface IKeyring
    * keyring. Does nothing if there was no such entry.
    * 
      
    * What happens if there are more than one?
-   * 
+   *
    * @param alias The alias of the entry to remove.
    */
   void remove(String alias);
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/IPrivateKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/IPrivateKeyring.java
index 9e2ceab9b95..3bfa10098e3 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/IPrivateKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/IPrivateKeyring.java
@@ -1,4 +1,4 @@
-/* IPrivateKeyring.java -- 
+/* IPrivateKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -56,7 +56,7 @@ public interface IPrivateKeyring
   /**
    * Tests if this keyring contains a private key entry with the given
    * alias.
-   * 
+   *
    * @param alias The alias to check.
    * @return true if this keyring contains a private key with the
    *         given alias; false otherwise.
@@ -65,7 +65,7 @@ public interface IPrivateKeyring
 
   /**
    * Returns the private key with the given alias.
-   * 
+   *
    * @param alias The alias of the private key to find.
    * @param password The password of the private key.
    * @return The private, or secret, key if one is found; null if
@@ -78,7 +78,7 @@ public interface IPrivateKeyring
 
   /**
    * Adds a private key to this keyring.
-   * 
+   *
    * @param alias The alias of the private key.
    * @param key The private key.
    * @param password The password used to protect this private key.
@@ -88,7 +88,7 @@ public interface IPrivateKeyring
   /**
    * Checks if this keyring contains a public key with the given
    * alias.
-   * 
+   *
    * @param alias The alias to test.
    * @return true if this keyring contains a public key entry
    *         with the given alias; false
@@ -99,7 +99,7 @@ public interface IPrivateKeyring
   /**
    * Returns the public key with the given alias, or
    * null if there is no such entry.
-   * 
+   *
    * @param alias The alias of the public key to find.
    * @return The public key; or null if none were found.
    */
@@ -107,7 +107,7 @@ public interface IPrivateKeyring
 
   /**
    * Sets a public key entry.
-   * 
+   *
    * @param alias The alias for this public key.
    * @param key The public key.
    */
@@ -116,7 +116,7 @@ public interface IPrivateKeyring
   /**
    * Checks if this keyring contains a certificate path with the given
    * alias.
-   * 
+   *
    * @param alias The alias to check.
    * @return true if this keyring contains a certificate path
    *         with the given alias; false
@@ -127,7 +127,7 @@ public interface IPrivateKeyring
   /**
    * Returns the certificate path with the given alias, or
    * null if there is no such entry.
-   * 
+   *
    * @param alias The alias of the certificate path to find.
    * @return The certificate path for the designated alias; or
    *         null if none were found.
@@ -136,7 +136,7 @@ public interface IPrivateKeyring
 
   /**
    * Sets a certificate path entry.
-   * 
+   *
    * @param alias The alias for this certificate path.
    * @param path The certificate path.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/IPublicKeyring.java b/libjava/classpath/gnu/javax/crypto/keyring/IPublicKeyring.java
index efe568f185b..d723f5ae9c6 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/IPublicKeyring.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/IPublicKeyring.java
@@ -1,4 +1,4 @@
-/* IPublicKeyring.java -- 
+/* IPublicKeyring.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -43,7 +43,7 @@ import java.security.cert.Certificate;
 /**
  * An interface for keyrings that contain trusted (by the owner) public
  * credentials (incl. certificates).
- * 
+ *
  * @see IKeyring
  */
 public interface IPublicKeyring
@@ -52,7 +52,7 @@ public interface IPublicKeyring
   /**
    * Tests if this keyring contains a certificate entry with the specified
    * alias.
-   * 
+   *
    * @param alias The alias of the certificate to check.
    * @return true if this keyring contains a certificate entry
    *         that has the given alias; false
@@ -63,7 +63,7 @@ public interface IPublicKeyring
   /**
    * Returns a certificate that has the given alias, or
    * null if this keyring has no such entry.
-   * 
+   *
    * @param alias The alias of the certificate to find.
    * @return The certificate with the designated alias, or
    *         null if none found.
@@ -74,7 +74,7 @@ public interface IPublicKeyring
    * Adds a certificate in this keyring, with the given alias.
    * 
      
    * What happens if there is already a certificate entry with this alias?
-   * 
+   *
    * @param alias The alias of this certificate entry.
    * @param cert The certificate.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/MalformedKeyringException.java b/libjava/classpath/gnu/javax/crypto/keyring/MalformedKeyringException.java
index 0dab3a764c6..f6b9d189b41 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/MalformedKeyringException.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/MalformedKeyringException.java
@@ -1,4 +1,4 @@
-/* MalformedKeyringException.java -- 
+/* MalformedKeyringException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java
index 5206a5e071e..58254a437c6 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.java
@@ -1,4 +1,4 @@
-/* MaskableEnvelopeEntry.java -- 
+/* MaskableEnvelopeEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -64,7 +64,7 @@ public abstract class MaskableEnvelopeEntry
 
   /**
    * Sets the masked state to the specified value.
-   * 
+   *
    * @param masked The new masked state.
    */
   protected final void setMasked(boolean masked)
@@ -75,7 +75,7 @@ public abstract class MaskableEnvelopeEntry
   /**
    * Gets the masked state of this object. Certain operations on this object
    * will fail if it is masked.
-   * 
+   *
    * @return The current masked state.
    */
   public boolean isMasked()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/MeteredInputStream.java b/libjava/classpath/gnu/javax/crypto/keyring/MeteredInputStream.java
index 330e4b20fb5..65f263359e0 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/MeteredInputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/MeteredInputStream.java
@@ -1,4 +1,4 @@
-/* MeteredInputStream.java -- 
+/* MeteredInputStream.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -59,7 +59,7 @@ final class MeteredInputStream
 
   /**
    * Tests if the number of bytes read has reached the limit.
-   * 
+   *
    * @return True if the limit has been reached.
    */
   public boolean limitReached()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
index be10029c8bc..d6730044226 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.java
@@ -1,4 +1,4 @@
-/* PasswordAuthenticatedEntry.java -- 
+/* PasswordAuthenticatedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
index 00031cbf1bb..0fa7431a85d 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PasswordEncryptedEntry.java
@@ -1,4 +1,4 @@
-/* PasswordEncryptedEntry.java -- 
+/* PasswordEncryptedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java
index 5eff637927a..a95f2e4a428 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PasswordProtectedEntry.java
@@ -1,4 +1,4 @@
-/* PasswordProtectedEntry.java -- 
+/* PasswordProtectedEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -48,7 +48,7 @@ public interface PasswordProtectedEntry
 
   /**
    * Encodes this entry, protected by a password.
-   * 
+   *
    * @param out The output stream to encode to.
    * @param password The password.
    * @throws IOException If an I/O error occurs.
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PrimitiveEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PrimitiveEntry.java
index 194fe9eeec1..8993de716fb 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PrimitiveEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PrimitiveEntry.java
@@ -1,4 +1,4 @@
-/* PrimitiveEntry.java -- 
+/* PrimitiveEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -70,7 +70,7 @@ public abstract class PrimitiveEntry
 
   /**
    * Returns the alias of this primitive entry.
-   * 
+   *
    * @return The alias.
    */
   public String getAlias()
@@ -80,7 +80,7 @@ public abstract class PrimitiveEntry
 
   /**
    * Returns the creation date of this primitive entry.
-   * 
+   *
    * @return The creation date.
    */
   public Date getCreationDate()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PrivateKeyEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PrivateKeyEntry.java
index 23244afee8d..b2637316e66 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PrivateKeyEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PrivateKeyEntry.java
@@ -1,4 +1,4 @@
-/* PrivateKeyEntry.java -- 
+/* PrivateKeyEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -65,7 +65,7 @@ public final class PrivateKeyEntry
 
   /**
    * Creates a new key entry.
-   * 
+   *
    * @param key The key.
    * @param creationDate The entry creation date.
    * @param properties The entry properties.
@@ -143,7 +143,7 @@ public final class PrivateKeyEntry
 
   /**
    * Returns this entry's key.
-   * 
+   *
    * @return The key.
    */
   public Key getKey()
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/Properties.java b/libjava/classpath/gnu/javax/crypto/keyring/Properties.java
index b833a74aeab..f25c82e3604 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/Properties.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/Properties.java
@@ -1,4 +1,4 @@
-/* Properties.java -- 
+/* Properties.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -74,7 +74,7 @@ public class Properties
 
   /**
    * Creates a copy of this properties object.
-   * 
+   *
    * @return The copy.
    */
   public Object clone()
@@ -86,7 +86,7 @@ public class Properties
 
   /**
    * Tests if this object contains a given property name.
-   * 
+   *
    * @param key The key to test.
    * @return True if this object contains the given key.
    */
@@ -99,7 +99,7 @@ public class Properties
 
   /**
    * Tests if this object contains a given property value.
-   * 
+   *
    * @param value The value to test.
    * @return True if this object contains the given value.
    */
@@ -112,7 +112,7 @@ public class Properties
 
   /**
    * Adds a new property to this object.
-   * 
+   *
    * @param key The key, which can neither be null nor empty.
    * @param value The value, which cannot be null.
    * @return The old value mapped by the key, if any.
@@ -129,7 +129,7 @@ public class Properties
   /**
    * Returns the value mapped by the given key, or null if there is no such
    * mapping.
-   * 
+   *
    * @param key
    */
   public String get(String key)
@@ -141,7 +141,7 @@ public class Properties
 
   /**
    * Removes a key and its value from this object.
-   * 
+   *
    * @param key The key of the property to remove.
    * @return The old value mapped by the key, if any.
    */
@@ -154,7 +154,7 @@ public class Properties
 
   /**
    * Decodes a set of properties from the given input stream.
-   * 
+   *
    * @param in The input stream.
    * @throws IOException If an I/O error occurs.
    */
@@ -173,7 +173,7 @@ public class Properties
 
   /**
    * Encodes this set of properties to the given output stream.
-   * 
+   *
    * @param out The output stream to encode to.
    * @throws IOException If an I/O error occurs.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java
index 3e7f54d3e20..837706d1968 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/PublicKeyEntry.java
@@ -1,4 +1,4 @@
-/* PublicKeyEntry.java -- 
+/* PublicKeyEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -123,7 +123,7 @@ public final class PublicKeyEntry
 
   /**
    * Returns the public key.
-   * 
+   *
    * @return The public key.
    */
   public PublicKey getKey()
diff --git a/libjava/classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java b/libjava/classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java
index 206e01d13da..80b114a0254 100644
--- a/libjava/classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java
+++ b/libjava/classpath/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.java
@@ -60,7 +60,7 @@ public abstract class BaseKeyWrappingAlgorithm
 
   /**
    * Protected constructor.
-   * 
+   *
    * @param name the key wrapping algorithm canonical name.
    */
   protected BaseKeyWrappingAlgorithm(String name)
diff --git a/libjava/classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java b/libjava/classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java
index d9c2bed14d5..271ec5c1bbe 100644
--- a/libjava/classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java
+++ b/libjava/classpath/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.java
@@ -71,7 +71,7 @@ public interface IKeyWrappingAlgorithm
 
   /**
    * Returns the canonical name of this Key Wrapping Algorithm.
-   * 
+   *
    * @return the canonical name of this Key Wrapping Algorithm.
    */
   String name();
@@ -79,7 +79,7 @@ public interface IKeyWrappingAlgorithm
   /**
    * Initializes this instance with the designated algorithm specific
    * attributes.
-   * 
+   *
    * @param attributes a map of name-to-value pairs the Key Wrapping Algorithm
    *          must use for its setup.
    * @throws InvalidKeyException if an exception is encountered while seting up
@@ -89,7 +89,7 @@ public interface IKeyWrappingAlgorithm
 
   /**
    * Wraps the designated plain text bytes.
-   * 
+   *
    * @param in the input byte array containing the plain text.
    * @param inOffset the offset into in where the first byte of
    *          the plain text (key material) to wrap is located.
@@ -110,7 +110,7 @@ public interface IKeyWrappingAlgorithm
 
   /**
    * Wraps the designated plain text bytes.
-   * 
+   *
    * @param in the input byte array containing the plain text.
    * @param inOffset the offset into in where the first byte of
    *          the plain text (key material) to wrap is located.
@@ -121,7 +121,7 @@ public interface IKeyWrappingAlgorithm
 
   /**
    * Unwraps the designated cipher text bytes.
-   * 
+   *
    * @param in the input byte array containing the cipher text.
    * @param inOffset the offset into in where the first byte of
    *          the cipher text (already wrapped key material) to unwrap is
@@ -145,7 +145,7 @@ public interface IKeyWrappingAlgorithm
 
   /**
    * Unwraps the designated cipher text bytes.
-   * 
+   *
    * @param in the input byte array containing the cipher text.
    * @param inOffset the offset into in where the first byte of
    *          the cipher text (already wrapped key material) to unwrap is
diff --git a/libjava/classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java b/libjava/classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java
index 6f6cd121944..abd208c07b4 100644
--- a/libjava/classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.java
@@ -51,7 +51,7 @@ public class KeyWrappingAlgorithmFactory
 {
   /** Names of Key Wrapping Algorihms cached for speed. */
   private static Set names;
-  
+
   /** Trivial constructor to enforce Singleton pattern. */
   private KeyWrappingAlgorithmFactory()
   {
@@ -60,7 +60,7 @@ public class KeyWrappingAlgorithmFactory
 
   /**
    * Returns an instance of a key-wrapping algorithm given its name.
-   * 
+   *
    * @param name the case-insensitive name of the key-wrapping algorithm.
    * @return an instance of the designated key-wrapping algorithm, or
    *         null if none was found.
@@ -88,7 +88,7 @@ public class KeyWrappingAlgorithmFactory
   /**
    * Returns a {@link Set} of key wrapping algorithm names supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of key wrapping algorithm names (Strings).
    */
   public static synchronized final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java b/libjava/classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java
index 71562bd752b..28b16cf3193 100644
--- a/libjava/classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java
+++ b/libjava/classpath/gnu/javax/crypto/kwa/TripleDESKeyWrap.java
@@ -124,7 +124,7 @@ public class TripleDESKeyWrap
       }
     else
       System.arraycopy(in, inOffset, CEK, 0, 24);
-    
+
     // TODO: check for the following:
     // However, a Two-key Triple-DES key MUST NOT be used to wrap a Three-
     // key Triple-DES key that is comprised of three unique DES keys.
@@ -276,10 +276,10 @@ public class TripleDESKeyWrap
     // 9. Use CEK as a Triple-DES key.
     return CEK;
   }
-  
+
   /**
    * Fills the designated byte array with random data.
-   * 
+   *
    * @param buffer the byte array to fill with random data.
    */
   private void nextRandomBytes(byte[] buffer)
diff --git a/libjava/classpath/gnu/javax/crypto/mac/BaseMac.java b/libjava/classpath/gnu/javax/crypto/mac/BaseMac.java
index 16922130fb6..4c524e9054d 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/BaseMac.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/BaseMac.java
@@ -1,4 +1,4 @@
-/* BaseMac.java -- 
+/* BaseMac.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -59,7 +59,7 @@ public abstract class BaseMac
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name of this instance.
    */
   protected BaseMac(String name)
@@ -71,7 +71,7 @@ public abstract class BaseMac
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name of this instance.
    * @param underlyingHash the underlying message digest algorithm instance.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/mac/HMac.java b/libjava/classpath/gnu/javax/crypto/mac/HMac.java
index f0e588d1831..ae2cd3ce22d 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/HMac.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/HMac.java
@@ -1,4 +1,4 @@
-/* HMac.java -- 
+/* HMac.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/mac/HMacFactory.java b/libjava/classpath/gnu/javax/crypto/mac/HMacFactory.java
index bc70e8b66ed..0afd8c6ac4a 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/HMacFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/HMacFactory.java
@@ -1,4 +1,4 @@
-/* HMacFactory.java -- 
+/* HMacFactory.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -63,7 +63,7 @@ public class HMacFactory
    * Return an instance of a HMAC algorithm given the name of its
    * underlying hash function, prefixed with the literal defined in
    * {@link Registry#HMAC_NAME_PREFIX}.
-   * 
+   *
    * @param name the fully qualified name of the underlying algorithm: composed
    *          as the concatenation of a literal prefix (see
    *          {@link Registry#HMAC_NAME_PREFIX}) and the name of the underlying
@@ -96,7 +96,7 @@ public class HMacFactory
    * Returns a {@link java.util.Set} of names of HMAC algorithms
    * supported by this Factory.
    * 
      
-   * 
+   *
    * @return a {@link java.util.Set} of HMAC algorithm names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/mac/IMac.java b/libjava/classpath/gnu/javax/crypto/mac/IMac.java
index a9da9eefb63..a9582564dbe 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/IMac.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/IMac.java
@@ -1,4 +1,4 @@
-/* IMac.java -- 
+/* IMac.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -107,14 +107,14 @@ public interface IMac
 
   /**
    * Returns the canonical name of this algorithm.
-   * 
+   *
    * @return the canonical name of this algorithm.
    */
   String name();
 
   /**
    * Returns the output length in bytes of this MAC algorithm.
-   * 
+   *
    * @return the output length in bytes of this MAC algorithm.
    */
   int macSize();
@@ -122,7 +122,7 @@ public interface IMac
   /**
    * Initialises the algorithm with designated attributes. Permissible names and
    * values are described in the class documentation above.
-   * 
+   *
    * @param attributes a set of name-value pairs that describe the desired
    *          future instance behaviour.
    * @exception InvalidKeyException if the key data is invalid.
@@ -133,7 +133,7 @@ public interface IMac
 
   /**
    * Continues a MAC operation using the input byte.
-   * 
+   *
    * @param b the input byte to digest.
    */
   void update(byte b);
@@ -142,7 +142,7 @@ public interface IMac
    * Continues a MAC operation, by filling the buffer, processing data
    * in the algorithm's MAC_SIZE-bit block(s), updating the context and count,
    * and buffering the remaining bytes in buffer for the next operation.
-   * 
+   *
    * @param in the input block.
    * @param offset start of meaningful bytes in input block.
    * @param length number of bytes, in input block, to consider.
@@ -152,7 +152,7 @@ public interface IMac
   /**
    * Completes the MAC by performing final operations such as padding
    * and resetting the instance.
-   * 
+   *
    * @return the array of bytes representing the MAC value.
    */
   byte[] digest();
@@ -166,7 +166,7 @@ public interface IMac
   /**
    * A basic test. Ensures that the MAC of a pre-determined message is equal to
    * a known pre-computed value.
-   * 
+   *
    * @return true if the implementation passes a basic self-test.
    *         Returns false otherwise.
    */
@@ -174,7 +174,7 @@ public interface IMac
 
   /**
    * Returns a clone copy of this instance.
-   * 
+   *
    * @return a clone copy of this instance.
    */
   Object clone() throws CloneNotSupportedException;
diff --git a/libjava/classpath/gnu/javax/crypto/mac/MacFactory.java b/libjava/classpath/gnu/javax/crypto/mac/MacFactory.java
index 5d4a561824e..5e3b50f7fdf 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/MacFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/MacFactory.java
@@ -1,4 +1,4 @@
-/* MacFactory.java -- 
+/* MacFactory.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -64,7 +64,7 @@ public class MacFactory
 
   /**
    * Returns an instance of a MAC algorithm given its name.
-   * 
+   *
    * @param name the name of the MAC algorithm.
    * @return an instance of the MAC algorithm, or null if
    *         none can be constructed.
@@ -105,7 +105,7 @@ public class MacFactory
   /**
    * Returns a {@link Set} of names of MAC algorithms supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of MAC names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/mac/MacInputStream.java b/libjava/classpath/gnu/javax/crypto/mac/MacInputStream.java
index e734b1bbb4b..7ea808aa93a 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/MacInputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/MacInputStream.java
@@ -1,4 +1,4 @@
-/* MacInputStream.java -- 
+/* MacInputStream.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -58,7 +58,7 @@ public class MacInputStream
    * Creates a new MacInputStream. The stream is initially set to digest data
    * written, the mac argument must have already been initialized, and
    * the mac argument is not cloned.
-   * 
+   *
    * @param in The underlying input stream.
    * @param mac The mac instance to use.
    */
@@ -73,7 +73,7 @@ public class MacInputStream
 
   /**
    * Returns the MAC this stream is updating.
-   * 
+   *
    * @return The MAC.
    */
   public IMac getMac()
@@ -84,7 +84,7 @@ public class MacInputStream
   /**
    * Sets the MAC this stream is updating, which must have already been
    * initialized. The argument is not cloned by this method.
-   * 
+   *
    * @param mac The new MAC.
    * @throws NullPointerException If the argument is null.
    */
@@ -98,7 +98,7 @@ public class MacInputStream
   /**
    * Turns the digesting state on or off. When off, the MAC will not be updated
    * when data is written to the stream.
-   * 
+   *
    * @param flag The new digesting state.
    */
   public void on(boolean flag)
diff --git a/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java b/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
index 739a78497a7..2aa352d7541 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/MacOutputStream.java
@@ -1,4 +1,4 @@
-/* MacOutputStream.java -- 
+/* MacOutputStream.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -59,7 +59,7 @@ public class MacOutputStream
    * to digest data written, the mac argument must have already
    * been initialized, and the mac argument is not
    * cloned.
-   * 
+   *
    * @param out The underlying output stream.
    * @param mac The mac instance to use.
    */
@@ -74,7 +74,7 @@ public class MacOutputStream
 
   /**
    * Returns the MAC this stream is updating.
-   * 
+   *
    * @return The MAC.
    */
   public IMac getMac()
@@ -85,7 +85,7 @@ public class MacOutputStream
   /**
    * Sets the MAC this stream is updating, which must have already been
    * initialized. The argument is not cloned by this method.
-   * 
+   *
    * @param mac The non-null new MAC.
    * @throws NullPointerException If the argument is null.
    */
@@ -99,7 +99,7 @@ public class MacOutputStream
   /**
    * Turns the digesting state on or off. When off, the MAC will not be updated
    * when data is written to the stream.
-   * 
+   *
    * @param flag The new digesting state.
    */
   public void on(boolean flag)
diff --git a/libjava/classpath/gnu/javax/crypto/mac/OMAC.java b/libjava/classpath/gnu/javax/crypto/mac/OMAC.java
index cd753acafbc..6758b314fa7 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/OMAC.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/OMAC.java
@@ -1,4 +1,4 @@
-/* OMAC.java -- 
+/* OMAC.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/mac/TMMH16.java b/libjava/classpath/gnu/javax/crypto/mac/TMMH16.java
index 0a7b4a6caeb..3427317ab5e 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/TMMH16.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/TMMH16.java
@@ -1,4 +1,4 @@
-/* TMMH16.java -- 
+/* TMMH16.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -243,7 +243,7 @@ public class TMMH16
   /**
    * Similar to the same method with one argument, but uses the designated
    * random number generator to compute needed keying material.
-   * 
+   *
    * @param b the byte to process.
    * @param prng the source of randomness to use.
    */
@@ -271,7 +271,7 @@ public class TMMH16
   /**
    * Similar to the same method with three arguments, but uses the designated
    * random number generator to compute needed keying material.
-   * 
+   *
    * @param b the byte array to process.
    * @param offset the starting offset in b to start considering
    *          the bytes to process.
@@ -288,7 +288,7 @@ public class TMMH16
   /**
    * Similar to the same method with no arguments, but uses the designated
    * random number generator to compute needed keying material.
-   * 
+   *
    * @param prng the source of randomness to use.
    * @return the final result of the algorithm.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/mac/UHash32.java b/libjava/classpath/gnu/javax/crypto/mac/UHash32.java
index 737e9ce24ec..53513eda914 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/UHash32.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/UHash32.java
@@ -1,4 +1,4 @@
-/* UHash32.java -- 
+/* UHash32.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -632,7 +632,7 @@ public class UHash32
 
     /**
      * 5.3 POLY: Polynomial hash Function Name: POLY
-     * 
+     *
      * @param wordbits positive integer divisible by 8: called with 64 or 128.
      * @param maxwordrange positive integer less than 2**wordbits.
      * @param k integer in the range 0 .. prime(wordbits) - 1.
diff --git a/libjava/classpath/gnu/javax/crypto/mac/UMac32.java b/libjava/classpath/gnu/javax/crypto/mac/UMac32.java
index 8e913db714a..6f53424eaa6 100644
--- a/libjava/classpath/gnu/javax/crypto/mac/UMac32.java
+++ b/libjava/classpath/gnu/javax/crypto/mac/UMac32.java
@@ -1,4 +1,4 @@
-/* UMac32.java -- 
+/* UMac32.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -160,7 +160,7 @@ public class UMac32
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param that the instance to clone.
    */
   private UMac32(UMac32 that)
@@ -218,7 +218,7 @@ public class UMac32
    * (from an earlier invocation of this method). If a Key Material can
    * be used, but no Nonce Material is defined or previously
    * set/defined, then a default value of all-zeroes shall be used.
-   * 
+   *
    * @param attributes one or both of required parameters.
    * @throws InvalidKeyException the key material specified is not of the
    *           correct length.
diff --git a/libjava/classpath/gnu/javax/crypto/mode/BaseMode.java b/libjava/classpath/gnu/javax/crypto/mode/BaseMode.java
index 02e43229044..831dd96643e 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/BaseMode.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/BaseMode.java
@@ -1,4 +1,4 @@
-/* BaseMode.java -- 
+/* BaseMode.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -74,7 +74,7 @@ public abstract class BaseMode
 
   /**
    * Trivial constructor for use by concrete subclasses.
-   * 
+   *
    * @param name the canonical name prefix of this mode.
    * @param underlyingCipher the implementation of the underlying cipher.
    * @param cipherBlockSize the block size, in bytes, in which to operate the
@@ -124,7 +124,7 @@ public abstract class BaseMode
    * the same block size as its underlying block cipher. As mentioned earlier,
    * the block size of the underlying block cipher itself is specified in one of
    * the method(s) available in the factory class.
-   * 
+   *
    * @return the default value, in bytes, of the mode's block size.
    * @see ModeFactory
    */
@@ -136,7 +136,7 @@ public abstract class BaseMode
   /**
    * Returns the default value, in bytes, of the underlying block cipher key
    * size.
-   * 
+   *
    * @return the default value, in bytes, of the underlying cipher's key size.
    */
   public int defaultKeySize()
@@ -152,7 +152,7 @@ public abstract class BaseMode
    * is that currently configured for the underlying block cipher. Concrete
    * implementations may override this behaviour to signal their ability to
    * support other values.
-   * 
+   *
    * @return an {@link Iterator} over the supported block sizes.
    */
   public Iterator blockSizes()
@@ -166,7 +166,7 @@ public abstract class BaseMode
    * Returns an {@link Iterator} over the supported underlying block cipher key
    * sizes. Each element returned by this object is an instance of
    * {@link Integer}.
-   * 
+   *
    * @return an {@link Iterator} over the supported key sizes.
    */
   public Iterator keySizes()
diff --git a/libjava/classpath/gnu/javax/crypto/mode/CBC.java b/libjava/classpath/gnu/javax/crypto/mode/CBC.java
index f3b3fb3312f..31c445f4e72 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/CBC.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/CBC.java
@@ -1,4 +1,4 @@
-/* CBC.java -- 
+/* CBC.java --
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -45,7 +45,7 @@ import gnu.javax.crypto.cipher.IBlockCipher;
  * The Cipher Block Chaining mode. This mode introduces feedback into the cipher
  * by XORing the previous ciphertext block with the plaintext block before
  * encipherment. That is, encrypting looks like this:
- * 
+ *
  * 
        *  Ci = EK(Piˆ Ci-1)
  * 
      
@@ -66,7 +66,7 @@ public class CBC
 
   /**
    * Package-private constructor for the factory class.
-   * 
+   *
    * @param underlyingCipher The cipher implementation.
    * @param cipherBlockSize The cipher's block size.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/mode/CFB.java b/libjava/classpath/gnu/javax/crypto/mode/CFB.java
index 6fc00637323..c5f06e11c2f 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/CFB.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/CFB.java
@@ -1,4 +1,4 @@
-/* CFB.java -- 
+/* CFB.java --
    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -83,7 +83,7 @@ public class CFB
 
   /**
    * Package-private constructor for the factory class.
-   * 
+   *
    * @param underlyingCipher The cipher implementation.
    * @param cipherBlockSize The cipher's block size.
    */
@@ -94,7 +94,7 @@ public class CFB
 
   /**
    * Cloneing constructor.
-   * 
+   *
    * @param that The instance being cloned.
    */
   private CFB(CFB that)
diff --git a/libjava/classpath/gnu/javax/crypto/mode/CTR.java b/libjava/classpath/gnu/javax/crypto/mode/CTR.java
index 0c856b483ee..56ea58c2530 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/CTR.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/CTR.java
@@ -1,4 +1,4 @@
-/* CTR.java -- 
+/* CTR.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -49,14 +49,14 @@ import java.util.Iterator;
  * The implementation of the Counter Mode.
  * 
      
  * The algorithm steps are formally described as follows:
- * 
+ *
  * 
        *     CTR Encryption: O[j] = E(K)(T[j]); for j = 1, 2...n;
  *                     C[j] = P[j] ˆ O[j]; for j = 1, 2...n.
  *     CTR Decryption: O[j] = E(K)(T[j]); for j = 1, 2...n;
  *                     P[j] = C[j] ˆ O[j]; for j = 1, 2...n.
  * 
      
- * 
+ *
  * 
      
  * where P is the plaintext, C is the ciphertext,
  * E(K) is the underlying block cipher encryption function
@@ -83,7 +83,7 @@ public class CTR
 
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @param underlyingCipher the underlying cipher implementation.
    * @param cipherBlockSize the underlying cipher block size to use.
    */
@@ -94,7 +94,7 @@ public class CTR
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param that the instance to clone.
    */
   private CTR(CTR that)
diff --git a/libjava/classpath/gnu/javax/crypto/mode/EAX.java b/libjava/classpath/gnu/javax/crypto/mode/EAX.java
index 401616b9f1f..b3e4a6a4ee5 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/EAX.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/EAX.java
@@ -1,4 +1,4 @@
-/* EAX.java -- 
+/* EAX.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/mode/ECB.java b/libjava/classpath/gnu/javax/crypto/mode/ECB.java
index 665e526ca11..7e02b0187f4 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/ECB.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/ECB.java
@@ -1,4 +1,4 @@
-/* ECB.java -- 
+/* ECB.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -75,7 +75,7 @@ public class ECB
 {
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @param underlyingCipher the underlying cipher implementation.
    * @param cipherBlockSize the underlying cipher block size to use.
    */
@@ -86,7 +86,7 @@ public class ECB
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param that the mode to clone.
    */
   private ECB(ECB that)
diff --git a/libjava/classpath/gnu/javax/crypto/mode/IAuthenticatedMode.java b/libjava/classpath/gnu/javax/crypto/mode/IAuthenticatedMode.java
index 703679dc0a6..51a5547f2d8 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/IAuthenticatedMode.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/IAuthenticatedMode.java
@@ -1,4 +1,4 @@
-/* IAuthenticatedMode.java -- 
+/* IAuthenticatedMode.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/mode/ICM.java b/libjava/classpath/gnu/javax/crypto/mode/ICM.java
index 833ddb18f7f..a4737bcdf9d 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/ICM.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/ICM.java
@@ -1,4 +1,4 @@
-/* ICM.java -- 
+/* ICM.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -103,7 +103,7 @@ public class ICM
 
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @param underlyingCipher the underlying cipher implementation.
    * @param cipherBlockSize the underlying cipher block size to use.
    */
@@ -114,7 +114,7 @@ public class ICM
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param that the instance to clone.
    */
   private ICM(ICM that)
diff --git a/libjava/classpath/gnu/javax/crypto/mode/IMode.java b/libjava/classpath/gnu/javax/crypto/mode/IMode.java
index 30485117d45..72c99ba73c3 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/IMode.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/IMode.java
@@ -1,4 +1,4 @@
-/* IMode.java -- 
+/* IMode.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -110,7 +110,7 @@ public interface IMode
    * A convenience method. Effectively invokes the encryptBlock()
    * or decryptBlock() method depending on the operational state
    * of the instance.
-   * 
+   *
    * @param in the plaintext.
    * @param inOffset index of in from which to start considering
    *          data.
diff --git a/libjava/classpath/gnu/javax/crypto/mode/ModeFactory.java b/libjava/classpath/gnu/javax/crypto/mode/ModeFactory.java
index d1acdf4e599..c1108ea112e 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/ModeFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/ModeFactory.java
@@ -1,4 +1,4 @@
-/* ModeFactory.java -- 
+/* ModeFactory.java --
    Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -65,7 +65,7 @@ public class ModeFactory
   /**
    * Returns an instance of a block cipher mode of operations given its name and
    * characteristics of the underlying block cipher.
-   * 
+   *
    * @param mode the case-insensitive name of the mode of operations.
    * @param cipher the case-insensitive name of the block cipher.
    * @param cipherBlockSize the block size, in bytes, of the underlying cipher.
@@ -126,7 +126,7 @@ public class ModeFactory
 
   /**
    * Returns a {@link Set} of names of mode supported by this Factory.
-   * 
+   *
    * @return a {@link Set} of mode names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/mode/OFB.java b/libjava/classpath/gnu/javax/crypto/mode/OFB.java
index c8b6d7e97e7..087f9913213 100644
--- a/libjava/classpath/gnu/javax/crypto/mode/OFB.java
+++ b/libjava/classpath/gnu/javax/crypto/mode/OFB.java
@@ -1,4 +1,4 @@
-/* OFB.java -- 
+/* OFB.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -125,7 +125,7 @@ public class OFB
 
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @param underlyingCipher the underlying cipher implementation.
    * @param cipherBlockSize the underlying cipher block size to use.
    */
@@ -136,7 +136,7 @@ public class OFB
 
   /**
    * Private constructor for cloning purposes.
-   * 
+   *
    * @param that the mode to clone.
    */
   private OFB(OFB that)
diff --git a/libjava/classpath/gnu/javax/crypto/pad/BasePad.java b/libjava/classpath/gnu/javax/crypto/pad/BasePad.java
index adc2c9bbc02..feeaca2f07d 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/BasePad.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/BasePad.java
@@ -1,4 +1,4 @@
-/* BasePad.java -- 
+/* BasePad.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -94,7 +94,7 @@ public abstract class BasePad
    * an {@link UnsupportedOperationException}. Concrete padding algorithms MUST
    * override this method if they wish to offer an initialisation method that
    * allows for other than the padding block size parameter to be specified.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @exception IllegalStateException if the instance is already initialised.
@@ -113,7 +113,7 @@ public abstract class BasePad
   /**
    * A default implementation of a correctness test that exercises the padder
    * implementation, using block sizes varying from 2 to 256 bytes.
-   * 
+   *
    * @return true if the concrete implementation correctly unpads
    *         what it pads for all tested block sizes. Returns false
    *         if the test fails for any block size.
@@ -132,7 +132,7 @@ public abstract class BasePad
    * 
      
    * The code ensures that the implementation is capable of unpadding what it
    * pads.
-   * 
+   *
    * @param size the block size to test.
    * @param buffer a work buffer. It is exposed as an argument for this method
    *          to reduce un-necessary object allocations.
diff --git a/libjava/classpath/gnu/javax/crypto/pad/IPad.java b/libjava/classpath/gnu/javax/crypto/pad/IPad.java
index 0e3db7db19e..f5160e07827 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/IPad.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/IPad.java
@@ -1,4 +1,4 @@
-/* IPad.java -- 
+/* IPad.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -53,7 +53,7 @@ public interface IPad
 {
   /**
    * Property name of the block size in which to operate the padding algorithm.
-   * The value associated with this property name is taken to be a positive 
+   * The value associated with this property name is taken to be a positive
    * {@link Integer} greater than zero.
    */
   String PADDING_BLOCK_SIZE = "gnu.crypto.pad.block.size";
@@ -63,7 +63,7 @@ public interface IPad
 
   /**
    * Initialises the padding scheme with a designated block size.
-   * 
+   *
    * @param bs the designated block size.
    * @exception IllegalStateException if the instance is already initialised.
    * @exception IllegalArgumentException if the block size value is invalid.
@@ -75,7 +75,7 @@ public interface IPad
    * recognisable by all concrete implementations are described in the class
    * documentation above. Other algorithm-specific attributes MUST be documented
    * in the implementation class of that padding algorithm.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @exception IllegalStateException if the instance is already initialised.
@@ -85,7 +85,7 @@ public interface IPad
 
   /**
    * Returns the byte sequence that should be appended to the designated input.
-   * 
+   *
    * @param in the input buffer containing the bytes to pad.
    * @param offset the starting index of meaningful data in in.
    * @param length the number of meaningful bytes in in.
@@ -96,7 +96,7 @@ public interface IPad
 
   /**
    * Returns the number of bytes to discard from a designated input buffer.
-   * 
+   *
    * @param in the input buffer containing the bytes to unpad.
    * @param offset the starting index of meaningful data in in.
    * @param length the number of meaningful bytes in in.
@@ -119,7 +119,7 @@ public interface IPad
 
   /**
    * A basic symmetric pad/unpad test.
-   * 
+   *
    * @return true if the implementation passes a basic symmetric
    *         self-test. Returns false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java b/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java
index 9ddc6098949..e303264aed6 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PKCS1_V1_5.java
@@ -1,4 +1,4 @@
-/* PKCS1_V1_5.java -- 
+/* PKCS1_V1_5.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,7 +60,7 @@ import java.util.logging.Logger;
  * RSA Cryptography Specifications Version 2.1.
      
  * Jakob Jonsson and Burt Kaliski.
  * 
- * 
+ *
  * @see EME_PKCS1_V1_5
  */
 public class PKCS1_V1_5
diff --git a/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java b/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java
index 8fce5b8b0c6..9dd67fc81a0 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PKCS7.java
@@ -1,4 +1,4 @@
-/* PKCS7.java -- 
+/* PKCS7.java --
  Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
  This file is a part of GNU Classpath.
@@ -69,7 +69,7 @@ public final class PKCS7
 
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @see PadFactory
    */
   PKCS7()
diff --git a/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java b/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
index eaa78112e09..2df2029fa9b 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/PadFactory.java
@@ -1,4 +1,4 @@
-/* PadFactory.java -- 
+/* PadFactory.java --
    Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -61,7 +61,7 @@ public class PadFactory
 
   /**
    * Returns an instance of a padding algorithm given its name.
-   * 
+   *
    * @param pad the case-insensitive name of the padding algorithm.
    * @return an instance of the padding algorithm, operating with a given block
    *         size, or null if none found.
@@ -98,7 +98,7 @@ public class PadFactory
   /**
    * Returns a {@link Set} of names of padding algorithms supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of padding algorithm names (Strings).
    */
   public static final Set getNames()
diff --git a/libjava/classpath/gnu/javax/crypto/pad/TBC.java b/libjava/classpath/gnu/javax/crypto/pad/TBC.java
index e5ff4b5dcb6..5cd177058f3 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/TBC.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/TBC.java
@@ -1,4 +1,4 @@
-/* TBC.java -- 
+/* TBC.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -68,7 +68,7 @@ public final class TBC
 
   /**
    * Trivial package-private constructor for use by the Factory class.
-   * 
+   *
    * @see PadFactory
    */
   TBC()
diff --git a/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java b/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
index 090d021ebfd..d15723fafd3 100644
--- a/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
+++ b/libjava/classpath/gnu/javax/crypto/pad/WrongPaddingException.java
@@ -1,4 +1,4 @@
-/* WrongPaddingException.java -- 
+/* WrongPaddingException.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/prng/ARCFour.java b/libjava/classpath/gnu/javax/crypto/prng/ARCFour.java
index b7265294268..60464d5ba1d 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/ARCFour.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/ARCFour.java
@@ -1,4 +1,4 @@
-/* ARCFour.java -- 
+/* ARCFour.java --
    Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java b/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java
index 2cf75a96644..ecea2f46919 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/CSPRNG.java
@@ -99,7 +99,7 @@ public class CSPRNG
    * 
    9. An {@link Integer}, indicating the number of bytes to read.
      10. 
    * 
    10. A {@link String}, indicating the path to the file.
      11. 
    * 
-   * 
+   *
    * @see gnu.java.security.util.SimpleList
    */
   public static final String FILE_SOURCES = "gnu.crypto.prng.pool.files";
@@ -268,16 +268,16 @@ public class CSPRNG
    * An example of valid properties would be:
    * 
          *  gnu.crypto.csprng.blocking=true
-   * 
+   *
    *  gnu.crypto.csprng.file.1=75.0;0;256;/dev/random
    *  gnu.crypto.csprng.file.2=10.0;0;100;/home/user/file
-   * 
+   *
    *  gnu.crypto.csprng.url.1=5.0;0;256;http://www.random.org/cgi-bin/randbyte?nbytes=256
    *  gnu.crypto.csprng.url.2=0;256;256;http://slashdot.org/
-   * 
+   *
    *  gnu.crypto.csprng.program.1=0.5;0;10;last -n 50
    *  gnu.crypto.csprng.program.2=0.5;0;10;tcpdump -c 5
-   * 
+   *
    *  gnu.crypto.csprng.other.1=foo.bar.MyEntropySource
    *  gnu.crypto.csprng.other.2=com.company.OtherEntropySource
    * 
      
@@ -592,7 +592,7 @@ public class CSPRNG
    * Add an array of bytes into the randomness pool. Note that this method will
    * not increment the pool's quality counter (this can only be done via
    * a source provided to the setup method).
-   * 
+   *
    * @param buf The byte array.
    * @param off The offset from whence to start reading bytes.
    * @param len The number of bytes to add.
@@ -624,7 +624,7 @@ public class CSPRNG
    * Add a single random byte to the randomness pool. Note that this method will
    * not increment the pool's quality counter (this can only be done via
    * a source provided to the setup method).
-   * 
+   *
    * @param b The byte to add.
    */
   public synchronized void addRandomByte(byte b)
diff --git a/libjava/classpath/gnu/javax/crypto/prng/ICMGenerator.java b/libjava/classpath/gnu/javax/crypto/prng/ICMGenerator.java
index d8205cfb4ad..a4df5b96473 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/ICMGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/ICMGenerator.java
@@ -1,4 +1,4 @@
-/* ICMGenerator.java -- 
+/* ICMGenerator.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -269,8 +269,8 @@ public class ICMGenerator
       }
     catch (LimitReachedException impossible)
       {
-	throw (InternalError)
-	  new InternalError().initCause(impossible);
+        throw (InternalError)
+          new InternalError().initCause(impossible);
       }
   }
 
diff --git a/libjava/classpath/gnu/javax/crypto/prng/IPBE.java b/libjava/classpath/gnu/javax/crypto/prng/IPBE.java
index 66921d635d5..8138b7b9a77 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/IPBE.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/IPBE.java
@@ -1,4 +1,4 @@
-/* IPBE.java -- 
+/* IPBE.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/prng/PBKDF2.java b/libjava/classpath/gnu/javax/crypto/prng/PBKDF2.java
index 0f91d4add72..22fcd550435 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/PBKDF2.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/PBKDF2.java
@@ -1,4 +1,4 @@
-/* PBKDF2.java -- 
+/* PBKDF2.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -84,7 +84,7 @@ public class PBKDF2
   /**
    * Creates a new PBKDF2 object. The argument is the MAC that will serve as the
    * pseudo-random function. The MAC does not need to be initialized.
-   * 
+   *
    * @param mac The pseudo-random function.
    */
   public PBKDF2(IMac mac)
diff --git a/libjava/classpath/gnu/javax/crypto/prng/PRNGFactory.java b/libjava/classpath/gnu/javax/crypto/prng/PRNGFactory.java
index ee75f8d8a1e..0a7c5e3775d 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/PRNGFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/PRNGFactory.java
@@ -1,4 +1,4 @@
-/* PRNGFactory.java -- 
+/* PRNGFactory.java --
    Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -62,7 +62,7 @@ public class PRNGFactory
 
   /**
    * Returns an instance of a padding algorithm given its name.
-   * 
+   *
    * @param prng the case-insensitive name of the PRNG.
    * @return an instance of the pseudo-random number generator.
    * @exception InternalError if the implementation does not pass its self-
@@ -98,7 +98,7 @@ public class PRNGFactory
   /**
    * Returns a {@link Set} of names of padding algorithms supported by this
    * Factory.
-   * 
+   *
    * @return a {@link Set} of pseudo-random number generator algorithm names
    *         (Strings).
    */
diff --git a/libjava/classpath/gnu/javax/crypto/prng/UMacGenerator.java b/libjava/classpath/gnu/javax/crypto/prng/UMacGenerator.java
index 39c99f73af6..1ee4492232c 100644
--- a/libjava/classpath/gnu/javax/crypto/prng/UMacGenerator.java
+++ b/libjava/classpath/gnu/javax/crypto/prng/UMacGenerator.java
@@ -1,4 +1,4 @@
-/* UMacGenerator.java -- 
+/* UMacGenerator.java --
    Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/AuthInfo.java b/libjava/classpath/gnu/javax/crypto/sasl/AuthInfo.java
index 733d2f0bf47..37c1e085297 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/AuthInfo.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/AuthInfo.java
@@ -1,4 +1,4 @@
-/* AuthInfo.java -- 
+/* AuthInfo.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -110,7 +110,7 @@ public class AuthInfo
    * factories, one at a time, and attempts to return a new instance of the
    * provider for the designated mechanism. It stops at the first factory
    * returning a non-null provider.
-   * 
+   *
    * @param mechanism the name of a SASL mechanism.
    * @return an implementation that provides {@link IAuthInfoProvider} for that
    *         mechanism; or null if none found.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java b/libjava/classpath/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java
index c4fc816dc3e..f881e6e113c 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/AuthInfoProviderFactory.java
@@ -1,4 +1,4 @@
-/* AuthInfoProviderFactory.java -- 
+/* AuthInfoProviderFactory.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/ClientFactory.java b/libjava/classpath/gnu/javax/crypto/sasl/ClientFactory.java
index 84acfcd1455..30309d2c71e 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/ClientFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/ClientFactory.java
@@ -1,4 +1,4 @@
-/* ClientFactory.java -- 
+/* ClientFactory.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/ClientMechanism.java b/libjava/classpath/gnu/javax/crypto/sasl/ClientMechanism.java
index 7f8e9c120b4..5e0dcd09603 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/ClientMechanism.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/ClientMechanism.java
@@ -1,4 +1,4 @@
-/* ClientMechanism.java -- 
+/* ClientMechanism.java --
    Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -235,7 +235,7 @@ public abstract class ClientMechanism
   /**
    * Initialises the mechanism with designated attributes. Permissible names and
    * values are mechanism specific.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalMechanismStateException if the instance is already
@@ -278,7 +278,7 @@ public abstract class ClientMechanism
   /**
    * Resets the mechanism instance for re-initialisation and use with other
    * characteristics.
-   * 
+   *
    * @throws SaslException if an exception occurs during the process.
    */
   public void reset() throws SaslException
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/ConfidentialityException.java b/libjava/classpath/gnu/javax/crypto/sasl/ConfidentialityException.java
index 62b68572552..85bd2ae188c 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/ConfidentialityException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/ConfidentialityException.java
@@ -1,4 +1,4 @@
-/* ConfidentialityException.java -- 
+/* ConfidentialityException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,7 +60,7 @@ public class ConfidentialityException
   /**
    * Constructs a new instance of ConfidentialityException with
    * the specified detail message.
-   * 
+   *
    * @param s the detail message.
    */
   public ConfidentialityException(String s)
@@ -71,7 +71,7 @@ public class ConfidentialityException
   /**
    * Constructs a new instance of ConfidentialityException with a
    * detailed message and a root exception.
-   * 
+   *
    * @param s possibly null additional detail about the exception.
    * @param x a possibly null root exception that caused this one.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProvider.java b/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProvider.java
index 60c50d5d4df..88acc2d0aff 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProvider.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProvider.java
@@ -1,4 +1,4 @@
-/* IAuthInfoProvider.java -- 
+/* IAuthInfoProvider.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -50,7 +50,7 @@ public interface IAuthInfoProvider
   /**
    * Activates (initialises) this provider instance. SHOULD be the first method
    * invoked on the provider.
-   * 
+   *
    * @param context a collection of name-value bindings describing the
    *          activation context.
    * @throws AuthenticationException if an exception occurs during the
@@ -62,7 +62,7 @@ public interface IAuthInfoProvider
    * Passivates (releases) this provider instance. SHOULD be the last method
    * invoked on the provider. Once it is done, no other method may be invoked on
    * the same instance before it is activated agains.
-   * 
+   *
    * @throws AuthenticationException if an exception occurs during the
    *           operation.
    */
@@ -70,7 +70,7 @@ public interface IAuthInfoProvider
 
   /**
    * Checks if a user with a designated name is known to this provider.
-   * 
+   *
    * @param userName the name of a user to check.
    * @return true if the user with the designated name is known
    *         to this provider; false otherwise.
@@ -82,7 +82,7 @@ public interface IAuthInfoProvider
   /**
    * Returns a collection of information about a designated user. The contents
    * of the returned map is provider-specific of name-to-value mappings.
-   * 
+   *
    * @param userID a map of name-to-value bindings that fully describe a user.
    * @return a collection of information about the designated user.
    * @throws AuthenticationException if an exception occurs during the
@@ -92,7 +92,7 @@ public interface IAuthInfoProvider
 
   /**
    * Updates the credentials of a designated user.
-   * 
+   *
    * @param userCredentials a map of name-to-value bindings that fully describe
    *          a user, including per new credentials.
    * @throws AuthenticationException if an exception occurs during the
@@ -105,7 +105,7 @@ public interface IAuthInfoProvider
    * credentials computed in more than one message digest algorithm. This method
    * returns the set of name-to-value bindings describing the mode of the
    * provider.
-   * 
+   *
    * @param mode a unique identifier describing the operational mode.
    * @return a collection of name-to-value bindings describing the designated
    *         mode.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java b/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java
index b6dc775d8a8..2a0b5bfec20 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.java
@@ -1,4 +1,4 @@
-/* IAuthInfoProviderFactory.java -- 
+/* IAuthInfoProviderFactory.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -46,7 +46,7 @@ public interface IAuthInfoProviderFactory
   /**
    * Returns an implementation of a provider for a designated mechanism capable
    * of honouring {@link IAuthInfoProvider} requests.
-   * 
+   *
    * @param mechanism the unique name of a mechanism.
    * @return an implementation of {@link IAuthInfoProvider} for that mechanism
    *         or null if none found.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/IllegalMechanismStateException.java b/libjava/classpath/gnu/javax/crypto/sasl/IllegalMechanismStateException.java
index 547ac41030d..fade7792cef 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/IllegalMechanismStateException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/IllegalMechanismStateException.java
@@ -1,4 +1,4 @@
-/* IllegalMechanismStateException.java -- 
+/* IllegalMechanismStateException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -62,7 +62,7 @@ public class IllegalMechanismStateException
   /**
    * Constructs a new instance of IllegalMechanismStateException
    * with the specified detail message.
-   * 
+   *
    * @param detail the detail message.
    */
   public IllegalMechanismStateException(String detail)
@@ -73,7 +73,7 @@ public class IllegalMechanismStateException
   /**
    * Constructs a new instance of IllegalMechanismStateException
    * with the specified detail message, and cause.
-   * 
+   *
    * @param detail the detail message.
    * @param ex the original cause.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/InputBuffer.java b/libjava/classpath/gnu/javax/crypto/sasl/InputBuffer.java
index d676a595dc5..f1520576550 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/InputBuffer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/InputBuffer.java
@@ -1,4 +1,4 @@
-/* InputBuffer.java -- 
+/* InputBuffer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -69,7 +69,7 @@ public class InputBuffer
   /**
    * Constructs a SASL buffer given the buffer's encoded form, including its
    * header bytes.
-   * 
+   *
    * @param frame the encoded form, including the header bytes, of a SASL
    *          buffer.
    * @throws SaslEncodingException if the buffer is malformed.
@@ -101,7 +101,7 @@ public class InputBuffer
    * 
      
    * Calls the method with the same name and three arguments as:
    * getInstance(raw, 0, raw.length).
-   * 
+   *
    * @param raw the encoded form, excluding the header bytes, of a SASL buffer.
    * @return a new instance of {@link InputBuffer}.
    */
@@ -113,7 +113,7 @@ public class InputBuffer
   /**
    * Returns an instance of a SASL buffer given the buffer's encoded contents,
    * excluding the buffer's header bytes.
-   * 
+   *
    * @param raw the encoded form, excluding the header bytes, of a SASL buffer.
    * @param offset offset where to start using raw bytes from.
    * @param len number of bytes to use.
@@ -128,7 +128,7 @@ public class InputBuffer
 
   /**
    * Converts two octets into the number that they represent.
-   * 
+   *
    * @param b the two octets.
    * @return the length.
    */
@@ -148,7 +148,7 @@ public class InputBuffer
   /**
    * Decodes a SASL scalar quantity, count-octet long, from the
    * current buffer.
-   * 
+   *
    * @param count the number of octets of this scalar quantity.
    * @return a native representation of a SASL scalar (unsigned integer)
    *         quantity.
@@ -178,7 +178,7 @@ public class InputBuffer
 
   /**
    * Decodes a SASL OS from the current buffer.
-   * 
+   *
    * @return a native representation of a SASL OS.
    * @throws SaslEncodingException if an encoding exception occurs during the
    *           operation.
@@ -201,7 +201,7 @@ public class InputBuffer
 
   /**
    * Decodes a SASL EOS from the current buffer.
-   * 
+   *
    * @return a native representation of a SASL EOS.
    * @throws SaslEncodingException if an encoding exception occurs during the
    *           operation.
@@ -225,7 +225,7 @@ public class InputBuffer
 
   /**
    * Decodes a SASL MPI from the current buffer.
-   * 
+   *
    * @return a native representation of a SASL MPI.
    * @throws SaslEncodingException if an encoding exception occurs during the
    *           operation.
@@ -248,7 +248,7 @@ public class InputBuffer
 
   /**
    * Decodes a SASL Text from the current buffer.
-   * 
+   *
    * @return a native representation of a SASL Text.
    * @throws SaslEncodingException if an encoding exception occurs during the
    *           operation.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/IntegrityException.java b/libjava/classpath/gnu/javax/crypto/sasl/IntegrityException.java
index 9b793ce3e5e..ce1b359de1a 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/IntegrityException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/IntegrityException.java
@@ -1,4 +1,4 @@
-/* IntegrityException.java -- 
+/* IntegrityException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -61,7 +61,7 @@ public class IntegrityException
   /**
    * Constructs a new instance of IntegrityException with the
    * specified detail message.
-   * 
+   *
    * @param s the detail message.
    */
   public IntegrityException(String s)
@@ -72,7 +72,7 @@ public class IntegrityException
   /**
    * Constructs a new instance of IntegrityException with a
    * detailed message and a root exception.
-   * 
+   *
    * @param s possibly null additional detail about the exception.
    * @param x a possibly null root exception that caused this one.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/NoSuchMechanismException.java b/libjava/classpath/gnu/javax/crypto/sasl/NoSuchMechanismException.java
index 5b16a788ccb..d22bff89419 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/NoSuchMechanismException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/NoSuchMechanismException.java
@@ -1,4 +1,4 @@
-/* NoSuchMechanismException.java -- 
+/* NoSuchMechanismException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ public class NoSuchMechanismException
    * Constructs a NoSuchMechanismException with the specified
    * detail message. In the case of this exception, the detail message
    * designates the offending mechanism name.
-   * 
+   *
    * @param arg the detail message, which in this case is the offending
    *          mechanism name.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/NoSuchUserException.java b/libjava/classpath/gnu/javax/crypto/sasl/NoSuchUserException.java
index 387339f6009..447c7b91981 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/NoSuchUserException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/NoSuchUserException.java
@@ -1,4 +1,4 @@
-/* NoSuchUserException.java -- 
+/* NoSuchUserException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -57,7 +57,7 @@ public class NoSuchUserException
    * Constructs a NoSuchUserException with the specified detail
    * message. In the case of this exception, the detail message designates the
    * offending username.
-   * 
+   *
    * @param arg the detail message, which in this case is the username.
    */
   public NoSuchUserException(String arg)
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java b/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
index 92e34dfbfe7..4bb3b0ec289 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/OutputBuffer.java
@@ -1,4 +1,4 @@
-/* OutputBuffer.java -- 
+/* OutputBuffer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -75,7 +75,7 @@ public class OutputBuffer
   /**
    * Encodes a SASL scalar quantity, count-octet long, to the
    * current buffer.
-   * 
+   *
    * @param count number of octets to encode b with.
    * @param b the scalar quantity.
    * @throws SaslEncodingException if an encoding size constraint is violated.
@@ -94,7 +94,7 @@ public class OutputBuffer
 
   /**
    * Encodes a SASL OS to the current buffer.
-   * 
+   *
    * @param b the OS element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -110,7 +110,7 @@ public class OutputBuffer
 
   /**
    * Encodes a SASL EOS to the current buffer.
-   * 
+   *
    * @param b the EOS element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -127,7 +127,7 @@ public class OutputBuffer
 
   /**
    * Encodes a SASL MPI to the current buffer.
-   * 
+   *
    * @param val the MPI element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws IOException if any other I/O exception occurs during the operation.
@@ -145,7 +145,7 @@ public class OutputBuffer
 
   /**
    * Encodes a SASL Text to the current buffer.
-   * 
+   *
    * @param str the Text element.
    * @throws SaslEncodingException if an encoding size constraint is violated.
    * @throws SaslEncodingException if the UTF-8 encoding is not supported on
@@ -166,7 +166,7 @@ public class OutputBuffer
   /**
    * Returns the encoded form of the current buffer including the 4-byte length
    * header.
-   * 
+   *
    * @throws SaslEncodingException if an encoding size constraint is violated.
    */
   public byte[] encode() throws SaslEncodingException
@@ -185,7 +185,7 @@ public class OutputBuffer
   /**
    * Returns the encoded form of the current buffer excluding the 4-byte length
    * header.
-   * 
+   *
    * @throws SaslEncodingException if an encoding size constraint is violated.
    */
   public byte[] wrap() throws SaslEncodingException
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslEncodingException.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslEncodingException.java
index f6a74641dd2..5836270ac72 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslEncodingException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslEncodingException.java
@@ -1,4 +1,4 @@
-/* SaslEncodingException.java -- 
+/* SaslEncodingException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -56,7 +56,7 @@ public class SaslEncodingException
   /**
    * Constructs a SaslEncodingException with the specified detail
    * message.
-   * 
+   *
    * @param s the detail message.
    */
   public SaslEncodingException(String s)
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
index d127bf5ba22..6a6c8575115 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslInputStream.java
@@ -1,4 +1,4 @@
-/* SaslInputStream.java -- 
+/* SaslInputStream.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -115,7 +115,7 @@ public class SaslInputStream
    * the protocol driver's request for a single octet from the stream might;
    * i.e. an invocation of this method, may result in an entire SASL buffer
    * being read and processed before that single octet can be returned.
-   * 
+   *
    * @return the next byte of data, or -1 if the end of the
    *         stream is reached.
    * @throws IOException if an I/O error occurs.
@@ -190,7 +190,7 @@ public class SaslInputStream
    * driver's request for a single octet from the stream might result in an
    * entire SASL buffer being read and processed before that single octet can be
    * returned.
-   * 
+   *
    * @param b the buffer into which the data is read.
    * @param off the start offset in array b at which the data is
    *          wricodeen.
@@ -317,7 +317,7 @@ public class SaslInputStream
   /**
    * Reads a SASL buffer from the underlying source if at least 4 bytes are
    * available.
-   * 
+   *
    * @return the byte[] of decoded buffer contents, or null if the underlying
    *         source was exhausted.
    * @throws IOException if an I/O exception occurs during the operation.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java
index d21f1f37ae2..0de1ce85068 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslOutputStream.java
@@ -1,4 +1,4 @@
-/* SaslOutputStream.java -- 
+/* SaslOutputStream.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/SaslUtil.java b/libjava/classpath/gnu/javax/crypto/sasl/SaslUtil.java
index 4b0b697fe79..b17d9536e99 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/SaslUtil.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/SaslUtil.java
@@ -1,4 +1,4 @@
-/* SaslUtil.java -- 
+/* SaslUtil.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/ServerFactory.java b/libjava/classpath/gnu/javax/crypto/sasl/ServerFactory.java
index 7aa37962845..6df44c08c7c 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/ServerFactory.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/ServerFactory.java
@@ -1,4 +1,4 @@
-/* ServerFactory.java -- 
+/* ServerFactory.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/ServerMechanism.java b/libjava/classpath/gnu/javax/crypto/sasl/ServerMechanism.java
index 75603a14aec..71dfdd4e0d5 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/ServerMechanism.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/ServerMechanism.java
@@ -1,4 +1,4 @@
-/* ServerMechanism.java -- 
+/* ServerMechanism.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -236,7 +236,7 @@ public abstract class ServerMechanism
   /**
    * Initialises the mechanism with designated attributes. Permissible names and
    * values are mechanism specific.
-   * 
+   *
    * @param attributes a set of name-value pairs that describes the desired
    *          future behaviour of this instance.
    * @throws IllegalMechanismStateException if the instance is already
@@ -277,7 +277,7 @@ public abstract class ServerMechanism
   /**
    * Resets the mechanism instance for re-initialisation and use with other
    * characteristics.
-   * 
+   *
    * @throws SaslException if an exception occurs during the process.
    */
   public void reset() throws SaslException
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/UserAlreadyExistsException.java b/libjava/classpath/gnu/javax/crypto/sasl/UserAlreadyExistsException.java
index 1563be9173d..615fabb5787 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/UserAlreadyExistsException.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/UserAlreadyExistsException.java
@@ -1,4 +1,4 @@
-/* UserAlreadyExistsException.java -- 
+/* UserAlreadyExistsException.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,7 +60,7 @@ public class UserAlreadyExistsException
    * Constructs a UserAlreadyExistsException with the specified
    * detail message. In the case of this exception, the detail message
    * designates the offending username.
-   * 
+   *
    * @param userName the detail message, which in this case is the username.
    */
   public UserAlreadyExistsException(String userName)
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java
index 87f5e5fb54e..860efb4f920 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousClient.java
@@ -1,4 +1,4 @@
-/* AnonymousClient.java -- 
+/* AnonymousClient.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java
index 76456044c8f..675194caa77 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousServer.java
@@ -1,4 +1,4 @@
-/* AnonymousServer.java -- 
+/* AnonymousServer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
index 9047ebd5c6e..bb59779d629 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.java
@@ -1,4 +1,4 @@
-/* AnonymousUtil.java -- 
+/* AnonymousUtil.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java
index dec0366c04c..e3d8b8f08c4 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.java
@@ -1,4 +1,4 @@
-/* CramMD5AuthInfoProvider.java -- 
+/* CramMD5AuthInfoProvider.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java
index c90cbe986a4..44f694e5c5b 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Client.java
@@ -1,4 +1,4 @@
-/* CramMD5Client.java -- 
+/* CramMD5Client.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java
index bbd46a3f281..560eb854ea9 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.java
@@ -1,4 +1,4 @@
-/* CramMD5Registry.java -- 
+/* CramMD5Registry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java
index 9be03414b66..1522f6b358c 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Server.java
@@ -1,4 +1,4 @@
-/* CramMD5Server.java -- 
+/* CramMD5Server.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java
index a6a06b6b849..a85c4c72143 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java
@@ -1,4 +1,4 @@
-/* CramMD5Util.java -- 
+/* CramMD5Util.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java
index 4900842a737..65da4afddb6 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java
@@ -1,4 +1,4 @@
-/* PasswordFile.java -- 
+/* PasswordFile.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java b/libjava/classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java
index 4888214d821..51542d2b286 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java
@@ -1,4 +1,4 @@
-/* PasswordFile.java -- 
+/* PasswordFile.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java
index e0cf82fb60c..5f35c455baa 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.java
@@ -1,4 +1,4 @@
-/* PlainAuthInfoProvider.java -- 
+/* PlainAuthInfoProvider.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainClient.java b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainClient.java
index 87fffa01ee1..f984ed13ff8 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainClient.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainClient.java
@@ -1,4 +1,4 @@
-/* PlainClient.java -- 
+/* PlainClient.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainRegistry.java b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainRegistry.java
index 84e17605345..68b121d96d3 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainRegistry.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainRegistry.java
@@ -1,4 +1,4 @@
-/* PlainRegistry.java -- 
+/* PlainRegistry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainServer.java b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainServer.java
index 52deef51ee9..9d97bc0291d 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainServer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/plain/PlainServer.java
@@ -1,4 +1,4 @@
-/* PlainServer.java -- 
+/* PlainServer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/CALG.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/CALG.java
index 308543230b5..22f9c975144 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/CALG.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/CALG.java
@@ -1,4 +1,4 @@
-/* CALG.java -- 
+/* CALG.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -86,7 +86,7 @@ import javax.security.sasl.SaslException;
  * other words, the input is padded at the trailing end with one of the
  * following sequences:
  * 
      - * 
+ *
  *                     01 -- if l mod k = k-1
  *                    02 02 -- if l mod k = k-2
  *                              ...
@@ -121,7 +121,7 @@ public final class CALG
 
   /**
    * Returns an instance of a SASL-SRP CALG implementation.
-   * 
+   *
    * @param algorithm the name of the symmetric cipher algorithm.
    * @return an instance of this object.
    */
@@ -145,7 +145,7 @@ public final class CALG
 
   /**
    * Initialises a SASL-SRP CALG implementation.
-   * 
+   *
    * @param kdf the key derivation function.
    * @param iv the initial vector value to use.
    * @param dir whether this CALG is used for encryption or decryption.
@@ -184,7 +184,7 @@ public final class CALG
   /**
    * Encrypts or decrypts, depending on the mode already set, a designated array
    * of bytes and returns the result.
-   * 
+   *
    * @param data the data to encrypt/decrypt.
    * @return the decrypted/encrypted result.
    * @throws ConfidentialityException if an exception occurs duirng the process.
@@ -197,7 +197,7 @@ public final class CALG
   /**
    * Encrypts or decrypts, depending on the mode already set, a designated array
    * of bytes and returns the result.
-   * 
+   *
    * @param data the data to encrypt/decrypt.
    * @param offset where to start in data.
    * @param length how many bytes to consider in data.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/ClientStore.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/ClientStore.java
index 866e610d83d..1d27137d11e 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/ClientStore.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/ClientStore.java
@@ -1,4 +1,4 @@
-/* ClientStore.java -- 
+/* ClientStore.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -64,7 +64,7 @@ public class ClientStore
 
   /**
    * Returns the classloader Singleton.
-   * 
+   *
    * @return the classloader Singleton instance.
    */
   static synchronized final ClientStore instance()
@@ -77,7 +77,7 @@ public class ClientStore
   /**
    * Returns a boolean flag indicating if the designated client's session is
    * still alive or not.
-   * 
+   *
    * @param uid the identifier of the client whose session to check.
    * @return true if the designated client's session is still
    *         alive. false otherwise.
@@ -105,7 +105,7 @@ public class ClientStore
   /**
    * Records a mapping between a client's unique identifier and its security
    * context.
-   * 
+   *
    * @param uid the unique identifier of the SRP client for which the session is
    *          to be cached.
    * @param ttl the session's Time-To-Live indicator (in seconds).
@@ -123,7 +123,7 @@ public class ClientStore
   /**
    * Removes the mapping between the designated SRP client unique identifier and
    * the its session security context (and other timing information).
-   * 
+   *
    * @param uid the identifier of the client whose session is to invalidate.
    */
   void invalidateSession(final String uid)
@@ -138,7 +138,7 @@ public class ClientStore
   /**
    * Returns an SRP client's security context record mapped by that client's
    * unique identifier.
-   * 
+   *
    * @param uid the identifier of the client whose session is to restore.
    * @return the SRP client's security context.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/IALG.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/IALG.java
index 85c93700fbf..d0c92ea689b 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/IALG.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/IALG.java
@@ -1,4 +1,4 @@
-/* IALG.java -- 
+/* IALG.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -66,7 +66,7 @@ public final class IALG
 
   /**
    * Returns an instance of a SASL-SRP IALG implementation.
-   * 
+   *
    * @param algorithm the name of the HMAC algorithm.
    * @return an instance of this object.
    */
@@ -118,7 +118,7 @@ public final class IALG
 
   /**
    * Returns the length (in bytes) of this SASL SRP Integrity Algorithm.
-   * 
+   *
    * @return the length, in bytes, of this integrity protection algorithm.
    */
   public int length()
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/KDF.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/KDF.java
index aa3edac0c3b..513aafb948f 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/KDF.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/KDF.java
@@ -1,4 +1,4 @@
-/* KDF.java -- 
+/* KDF.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -63,7 +63,7 @@ public class KDF
   /**
    * Constructs an instance of the KDF initialised with the
    * designated shared secret bytes.
-   * 
+   *
    * @param keyMaterial the SASL SRP shared secret (K) bytes.
    */
   private KDF(final byte[] keyMaterial, final int ndx)
@@ -84,7 +84,7 @@ public class KDF
   /**
    * A Factory mehod that returns an instance of a KDF based on
    * supplied seed data.
-   * 
+   *
    * @param K the SASL SRP shared secret for a KDF to be used for
    *          CALG and IALG setup. null otherwise.
    * @return an instance of a KDF.
@@ -116,7 +116,7 @@ public class KDF
   /**
    * Returns a designated number of bytes suitable for use in the SASL SRP
    * mechanism.
-   * 
+   *
    * @param length the number of bytes needed.
    * @return a byte array containing the generated/selected bytes.
    */
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java
index 7946e84fbcc..c13c2fa71c6 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java
@@ -1,4 +1,4 @@
-/* PasswordFile.java -- 
+/* PasswordFile.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -190,7 +190,7 @@ public class PasswordFile
   /**
    * Returns a string representing the decimal value of an integer identifying
    * the message digest algorithm to use for the SRP computations.
-   * 
+   *
    * @param mdName the canonical name of a message digest algorithm.
    * @return a string representing the decimal value of an ID for that
    *         algorithm.
@@ -219,7 +219,7 @@ public class PasswordFile
   /**
    * Checks if the current configuration file contains the <N, g> pair for
    * the designated index.
-   * 
+   *
    * @param index a string representing 1-digit identification of an <N, g>
    *          pair used.
    * @return true if the designated index is that
@@ -243,7 +243,7 @@ public class PasswordFile
   /**
    * Returns a pair of strings representing the pair of N and
    * g MPIs for the designated index.
-   * 
+   *
    * @param index a string representing 1-digit identification of an <N, g>
    *          pair to look up.
    * @return a pair of strings, arranged in an array, where the first (at index
@@ -362,7 +362,7 @@ public class PasswordFile
    * Returns the triplet: verifier, salt and configuration file index, of a
    * designated user, and a designated message digest algorithm name, as an
    * array of strings.
-   * 
+   *
    * @param user the username.
    * @param mdName the canonical name of the SRP's message digest algorithm.
    * @return a string array containing, in this order, the BASE-64 encodings of
@@ -465,7 +465,7 @@ public class PasswordFile
    * IMPORTANT: This method computes the verifiers as described in
    * RFC-2945, which differs from the description given on the web page for
    * SRP-6.
-   * 
+   *
    * @param user the user's name.
    * @param s the user's salt.
    * @param password the user's password
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRP.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRP.java
index 437e42a5a83..569855dd718 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRP.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRP.java
@@ -1,4 +1,4 @@
-/* SRP.java -- 
+/* SRP.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -70,7 +70,7 @@ public final class SRP
   /**
    * Returns an instance of this object that uses the designated message digest
    * algorithm as its digest function.
-   * 
+   *
    * @return an instance of this object for the designated digest name.
    */
   public static synchronized SRP instance(String mdName)
@@ -108,7 +108,7 @@ public final class SRP
    * Returns a new instance of the SRP message digest algorithm --which is
    * SHA-160 by default, but could be anything else provided the proper
    * conditions as specified in the SRP specifications.
-   * 
+   *
    * @return a new instance of the underlying SRP message digest algorithm.
    * @throws RuntimeException if the implementation of the message digest
    *           algorithm does not support cloning.
@@ -121,7 +121,7 @@ public final class SRP
   /**
    * Convenience method to return the result of digesting the designated input
    * with a new instance of the SRP message digest algorithm.
-   * 
+   *
    * @param src some bytes to digest.
    * @return the bytes constituting the result of digesting the designated input
    *         with a new instance of the SRP message digest algorithm.
@@ -136,7 +136,7 @@ public final class SRP
   /**
    * Convenience method to return the result of digesting the designated input
    * with a new instance of the SRP message digest algorithm.
-   * 
+   *
    * @param src a String whose bytes (using US-ASCII encoding) are to be
    *          digested.
    * @return the bytes constituting the result of digesting the designated input
@@ -151,7 +151,7 @@ public final class SRP
   /**
    * Convenience method to XOR N bytes from two arrays; N being the output size
    * of the SRP message digest algorithm.
-   * 
+   *
    * @param a the first byte array.
    * @param b the second one.
    * @return N bytes which are the result of the XOR operations on the first N
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java
index 3a43a94a0b5..e42cfffa994 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.java
@@ -1,4 +1,4 @@
-/* SRPAuthInfoProvider.java -- 
+/* SRPAuthInfoProvider.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java
index 3406c14cec4..8e44e4ead6e 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java
@@ -1,4 +1,4 @@
-/* SRPClient.java -- 
+/* SRPClient.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java
index d474cb6f8c2..b6d24cf1459 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPRegistry.java
@@ -1,4 +1,4 @@
-/* SRPRegistry.java -- 
+/* SRPRegistry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java
index 3f000deefbf..fca5c3bf338 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java
@@ -1,4 +1,4 @@
-/* SRPServer.java -- 
+/* SRPServer.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/SecurityContext.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/SecurityContext.java
index 1111d95b4f0..41ec57c817b 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/SecurityContext.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/SecurityContext.java
@@ -1,4 +1,4 @@
-/* SecurityContext.java -- 
+/* SecurityContext.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/ServerStore.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/ServerStore.java
index 9fa83295a0f..d98747324cf 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/ServerStore.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/ServerStore.java
@@ -1,4 +1,4 @@
-/* ServerStore.java -- 
+/* ServerStore.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -68,7 +68,7 @@ public class ServerStore
 
   /**
    * Returns the classloader Singleton.
-   * 
+   *
    * @return the classloader Singleton instance.
    */
   static synchronized final ServerStore instance()
@@ -80,7 +80,7 @@ public class ServerStore
 
   /**
    * Returns a legible new session identifier.
-   * 
+   *
    * @return a new session identifier.
    */
   static synchronized final byte[] getNewSessionID()
@@ -94,7 +94,7 @@ public class ServerStore
   /**
    * Returns a boolean flag indicating if the designated session is still alive
    * or not.
-   * 
+   *
    * @param sid the identifier of the session to check.
    * @return true if the designated session is still alive.
    *         false otherwise.
@@ -125,7 +125,7 @@ public class ServerStore
   /**
    * Records a mapping between a session identifier and the Security Context of
    * the designated SRP server mechanism instance.
-   * 
+   *
    * @param ttl the session's Time-To-Live indicator (in seconds).
    * @param ctx the server's security context.
    */
@@ -144,7 +144,7 @@ public class ServerStore
    * designated server's SASL Security Context. In the process, computes and
    * return the underlying mechanism server's evidence that shall be returned to
    * the client in a session re-use exchange.
-   * 
+   *
    * @param sid the identifier of the session to restore.
    * @return an SRP server's security context.
    */
@@ -162,7 +162,7 @@ public class ServerStore
 
   /**
    * Removes all information related to the designated session ID.
-   * 
+   *
    * @param sid the identifier of the seesion to invalidate.
    */
   void invalidateSession(final byte[] sid)
diff --git a/libjava/classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java b/libjava/classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java
index 130678ebd7a..ae64fa7746c 100644
--- a/libjava/classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/sasl/srp/StoreEntry.java
@@ -1,4 +1,4 @@
-/* StoreEntry.java -- 
+/* StoreEntry.java --
    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -64,7 +64,7 @@ class StoreEntry
 
   /**
    * Returns true if the Time-To_live period has not elapsed.
-   * 
+   *
    * @return true if the Time-To-Live period (in seconds) has not
    *         elapsed yet; false otherwise.
    */
diff --git a/libjava/classpath/gnu/javax/imageio/IIOInputStream.java b/libjava/classpath/gnu/javax/imageio/IIOInputStream.java
index 2638e2fe240..1ede75f7810 100644
--- a/libjava/classpath/gnu/javax/imageio/IIOInputStream.java
+++ b/libjava/classpath/gnu/javax/imageio/IIOInputStream.java
@@ -77,7 +77,7 @@ public class IIOInputStream extends InputStream
 
   public int read() throws IOException
   {
-    return is.read();    
+    return is.read();
   }
 
   public int read(byte[] b) throws IOException
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/BMPDecoder.java b/libjava/classpath/gnu/javax/imageio/bmp/BMPDecoder.java
index df53f2e3dee..10846193189 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/BMPDecoder.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/BMPDecoder.java
@@ -49,11 +49,11 @@ public abstract class BMPDecoder {
     protected BMPInfoHeader infoHeader;
     protected BMPFileHeader fileHeader;
     protected long offset;
-    
+
     public BMPDecoder(BMPFileHeader fh, BMPInfoHeader ih){
-	fileHeader = fh;
-	infoHeader = ih;
-	offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
+        fileHeader = fh;
+        infoHeader = ih;
+        offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
     }
 
     /**
@@ -61,108 +61,108 @@ public abstract class BMPDecoder {
      * decoder.
      */
     public static BMPDecoder getDecoder(BMPFileHeader fh, BMPInfoHeader ih){
-	switch(ih.getCompression()){
-	case BMPInfoHeader.BI_RGB: // uncompressed RGB
-	    switch(ih.getBitCount()){
-	    case 32:
-		return new DecodeBF32(fh, ih, true);
+        switch(ih.getCompression()){
+        case BMPInfoHeader.BI_RGB: // uncompressed RGB
+            switch(ih.getBitCount()){
+            case 32:
+                return new DecodeBF32(fh, ih, true);
 
-	    case 24:
-		return new DecodeRGB24(fh, ih);
+            case 24:
+                return new DecodeRGB24(fh, ih);
 
-	    case 16:
-		return new DecodeBF16(fh, ih, true);
+            case 16:
+                return new DecodeBF16(fh, ih, true);
 
-	    case 8:
-		return new DecodeRGB8(fh, ih);
+            case 8:
+                return new DecodeRGB8(fh, ih);
 
-	    case 4:
-		return new DecodeRGB4(fh, ih);
+            case 4:
+                return new DecodeRGB4(fh, ih);
 
-	    case 1:
-		return new DecodeRGB1(fh, ih);
+            case 1:
+                return new DecodeRGB1(fh, ih);
 
-	    default:
-		return null;
-	    }
+            default:
+                return null;
+            }
 
-	case BMPInfoHeader.BI_RLE8:
-	    return new DecodeRLE8(fh, ih);
+        case BMPInfoHeader.BI_RLE8:
+            return new DecodeRLE8(fh, ih);
 
-	case BMPInfoHeader.BI_RLE4:
-	    return new DecodeRLE4(fh, ih);
+        case BMPInfoHeader.BI_RLE4:
+            return new DecodeRLE4(fh, ih);
 
-	case BMPInfoHeader.BI_BITFIELDS:
-	    switch(ih.getBitCount()){
-	    case 16:
-		return new DecodeBF16(fh, ih, false);
+        case BMPInfoHeader.BI_BITFIELDS:
+            switch(ih.getBitCount()){
+            case 16:
+                return new DecodeBF16(fh, ih, false);
 
-	    case 32:
-		return new DecodeBF32(fh, ih, false);
+            case 32:
+                return new DecodeBF32(fh, ih, false);
 
-	    default:
-		return null;
-	    }
-		
-	default:
-	    return null;
-	}
+            default:
+                return null;
+            }
+
+        default:
+            return null;
+        }
     }
 
     /**
      * The image decoder.
      */
-    public abstract BufferedImage decode(ImageInputStream in) 
-	throws IOException, BMPException;
+    public abstract BufferedImage decode(ImageInputStream in)
+        throws IOException, BMPException;
 
     /**
      * Reads r,g,b bit masks from an inputstream
      */
     protected int[] readBitMasks(ImageInputStream in) throws IOException {
-	int[] bitmasks = new int[3];
-	byte[] temp = new byte[12];
-	if(in.read(temp) != 12)
-	    throw new IOException("Couldn't read bit masks.");
-	offset += 12;
+        int[] bitmasks = new int[3];
+        byte[] temp = new byte[12];
+        if(in.read(temp) != 12)
+            throw new IOException("Couldn't read bit masks.");
+        offset += 12;
 
-	ByteBuffer buf = ByteBuffer.wrap(temp);
-	buf.order(ByteOrder.LITTLE_ENDIAN);
-	bitmasks[0] = buf.getInt();
-	bitmasks[1] = buf.getInt();
-	bitmasks[2] = buf.getInt();
-	return bitmasks;
+        ByteBuffer buf = ByteBuffer.wrap(temp);
+        buf.order(ByteOrder.LITTLE_ENDIAN);
+        bitmasks[0] = buf.getInt();
+        bitmasks[1] = buf.getInt();
+        bitmasks[2] = buf.getInt();
+        return bitmasks;
     }
 
     /**
-     * Reads an N-color palette from an inputstream in RGBQUAD format and 
+     * Reads an N-color palette from an inputstream in RGBQUAD format and
      * returns an equivalent ColorModel object
      */
     protected IndexColorModel readPalette(ImageInputStream in) throws IOException {
-	int N = infoHeader.getNumberOfPaletteEntries();
-	byte[] r = new byte[N];
-	byte[] g = new byte[N];
-	byte[] b = new byte[N];
-	for(int i=0;i=0;y--){
-	    byte[] scanline = new byte[scansize];
-	    if(in.read(scanline) != scansize)
-		throw new IOException("Couldn't read image data.");
+        for(int y=h-1;y>=0;y--){
+            byte[] scanline = new byte[scansize];
+            if(in.read(scanline) != scansize)
+                throw new IOException("Couldn't read image data.");
 
-	    for(int x=0;x=0;y--){
-	    byte[] scanline = new byte[scansize];
-	    if(in.read(scanline) != scansize)
-		throw new IOException("Couldn't read image data.");
 
-	    for(int x=0;x=0;y--){
+            byte[] scanline = new byte[scansize];
+            if(in.read(scanline) != scansize)
+                throw new IOException("Couldn't read image data.");
 
-	ColorModel cm = new DirectColorModel(32,
-					     bitmasks[0], bitmasks[1], bitmasks[2]);
-	SampleModel sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT, 
-							  w, h, 
-							  bitmasks);
-	DataBuffer db = new DataBufferInt(data, w*h);
-	WritableRaster raster = Raster.createWritableRaster(sm, db, null);
-    
-	return new BufferedImage(cm, raster, false, null);
+            for(int x=0;x>3;
+        Dimension d = infoHeader.getSize();
+        int h = (int)d.getHeight();
+        int w = (int)d.getWidth();
+        int size = (w*h)>>3;
 
-	int scansize = w>>3;
-	byte[] data = new byte[size];
+        int scansize = w>>3;
+        byte[] data = new byte[size];
 
-	for(int y=h-1;y>=0;y--){
-	    // Scanlines are padded to dword boundries
-	    int readsize = scansize;
-	    if((readsize & 3) != 0) readsize += (4 - (scansize & 3));
+        for(int y=h-1;y>=0;y--){
+            // Scanlines are padded to dword boundries
+            int readsize = scansize;
+            if((readsize & 3) != 0) readsize += (4 - (scansize & 3));
 
-	    byte[] scanline = new byte[readsize];
-	    if(in.read(scanline) != readsize)
-		throw new IOException("Couldn't read image data.");
+            byte[] scanline = new byte[readsize];
+            if(in.read(scanline) != readsize)
+                throw new IOException("Couldn't read image data.");
 
-	    for(int x=0;x=0;y--){
-	    byte[] scanline = new byte[scansize];
-	    if(in.read(scanline) != scansize)
-		throw new IOException("Couldn't read image data.");
+        Dimension d = infoHeader.getSize();
+        int h = (int)d.getHeight();
+        int w = (int)d.getWidth();
+        BufferedImage image = new BufferedImage(w, h,
+                                                BufferedImage.TYPE_INT_RGB);
+        // BMP scanlines are padded to dword offsets
+        int scansize = ((w*3 & 3) != 0)? w*3 + 4 - (w*3 & 3): w*3;
+        int[] data = new int[w*h];
 
-	    for(int x=0;x=0;y--){
+            byte[] scanline = new byte[scansize];
+            if(in.read(scanline) != scansize)
+                throw new IOException("Couldn't read image data.");
+
+            for(int x=0;x> 1;
+        IndexColorModel palette = readPalette(in);
+        skipToImage(in);
 
-	// Scanline padded to dword offsets
-	int wbytes = (w + (w & 1)) >> 1;
-	int scansize = ((wbytes & 3) != 0)? (wbytes + 4 - (wbytes&3)) : wbytes;
+        Dimension d = infoHeader.getSize();
+        int h = (int)d.getHeight();
+        int w = (int)d.getWidth();
+        int size = (w*h) >> 1;
 
-	byte[] data = new byte[wbytes*h];
+        // Scanline padded to dword offsets
+        int wbytes = (w + (w & 1)) >> 1;
+        int scansize = ((wbytes & 3) != 0)? (wbytes + 4 - (wbytes&3)) : wbytes;
 
-	for(int y=h-1;y>=0;y--){
-	    byte[] scanline = new byte[scansize];
-	    if(in.read(scanline) != scansize)
-		throw new IOException("Couldn't read image data.");
+        byte[] data = new byte[wbytes*h];
 
-	    for(int x=0;x=0;y--){
+            byte[] scanline = new byte[scansize];
+            if(in.read(scanline) != scansize)
+                throw new IOException("Couldn't read image data.");
 
-	DataBuffer db = new DataBufferByte(data, w*h, 0);
-	WritableRaster raster = Raster.createWritableRaster(sm, db, null);
-    
-	return new BufferedImage(palette, raster, false, null);
+            for(int x=0;x=0;y--){
-	    byte[] scanline = new byte[scansize];
-	    if(in.read(scanline) != scansize)
-		throw new IOException("Couldn't read image data.");
+        for(int y=h-1;y>=0;y--){
+            byte[] scanline = new byte[scansize];
+            if(in.read(scanline) != scansize)
+                throw new IOException("Couldn't read image data.");
 
-	    for(int x=0;x>1];
-	int offIn = 0;
-	int x=0,y=0;
-	
-	// width in bytes
-	w += (w&1);
-	w = w >> 1;
 
-	try {
-	    while(((x>>1) + y*w) < w*h){
-		if(in.read(cmd) != 2)
-		    throw new IOException("Error reading compressed data.");
+    private byte[] uncompress(int w, int h, ImageInputStream in)
+        throws BMPException, IOException {
+        byte[] cmd = new byte[2];
+        byte[] data = new byte[w*h>>1];
+        int offIn = 0;
+        int x=0,y=0;
 
-		if(cmd[0] == ESCAPE){
-		    switch(cmd[1]){
-		    case EOB: // end of bitmap
-			return data;
-		    case EOL: // end of line
-			x = 0;
-			y++;
-			break;
-		    case DELTA: // delta
-			if(in.read(cmd) != 2)
-			    throw new IOException("Error reading compressed data.");
-			int dx = cmd[0] & (0xFF);
-			int dy = cmd[1] & (0xFF);
-			x += dx;
-			y += dy;
-			break;
-			
-		    default:
-			// decode a literal run
-			int length = cmd[1] & (0xFF);
+        // width in bytes
+        w += (w&1);
+        w = w >> 1;
 
-			// size of run, which is word aligned.
-			int bytesize = length;
-			bytesize += (bytesize & 1);
-			bytesize >>= 1;
-			bytesize += (bytesize & 1);
+        try {
+            while(((x>>1) + y*w) < w*h){
+                if(in.read(cmd) != 2)
+                    throw new IOException("Error reading compressed data.");
 
-			byte[] run = new byte[bytesize];
-			if(in.read(run) != bytesize)
-			    throw new IOException("Error reading compressed data.");
+                if(cmd[0] == ESCAPE){
+                    switch(cmd[1]){
+                    case EOB: // end of bitmap
+                        return data;
+                    case EOL: // end of line
+                        x = 0;
+                        y++;
+                        break;
+                    case DELTA: // delta
+                        if(in.read(cmd) != 2)
+                            throw new IOException("Error reading compressed data.");
+                        int dx = cmd[0] & (0xFF);
+                        int dy = cmd[1] & (0xFF);
+                        x += dx;
+                        y += dy;
+                        break;
 
-			if((x&1) == 0){
-			    length += (length&1);
-			    length >>= 1;
-			    System.arraycopy(run, 0, data, ((x>>1) + w*(h-y-1)), 
-					     length);
-			} else {
-			    for(int i=0;i>1) + w*(h-y-1)] 
-					|= ((run[i>>1]&0xF0) >> 4);
-				else  // copy low to high
-				    data[((x+i)>>1) + w*(h-y-1)] 
-					|= ((run[i>>1]&0x0F) << 4);
-			    }
-			}
-			x += cmd[1] & (0xFF);
-			break;
-		    }
-		} else {
-		    // decode a byte run
-		    int length = cmd[0] & (0xFF);
-		    if((x&1) == 0){
-			length += (length&1);
-			length >>= 1;
-			for(int i=0;i> 1)] = cmd[1];
-		    } else {
-			for(int i=0;i>1) + w*(h-y-1)] 
-				    |= ((cmd[1]&0xF0) >> 4);
-			    else  // copy low to high
-				data[((x+i)>>1) + w*(h-y-1)] 
-				    |= ((cmd[1]&0x0F) << 4);
-			}
-		    }
-		    x += cmd[0] & (0xFF);
-		}
-	    }
-	    return data;
- 	} catch(ArrayIndexOutOfBoundsException e){
- 	    throw new BMPException("Invalid RLE data.");
- 	}
+                    default:
+                        // decode a literal run
+                        int length = cmd[1] & (0xFF);
+
+                        // size of run, which is word aligned.
+                        int bytesize = length;
+                        bytesize += (bytesize & 1);
+                        bytesize >>= 1;
+                        bytesize += (bytesize & 1);
+
+                        byte[] run = new byte[bytesize];
+                        if(in.read(run) != bytesize)
+                            throw new IOException("Error reading compressed data.");
+
+                        if((x&1) == 0){
+                            length += (length&1);
+                            length >>= 1;
+                            System.arraycopy(run, 0, data, ((x>>1) + w*(h-y-1)),
+                                             length);
+                        } else {
+                            for(int i=0;i>1) + w*(h-y-1)]
+                                        |= ((run[i>>1]&0xF0) >> 4);
+                                else  // copy low to high
+                                    data[((x+i)>>1) + w*(h-y-1)]
+                                        |= ((run[i>>1]&0x0F) << 4);
+                            }
+                        }
+                        x += cmd[1] & (0xFF);
+                        break;
+                    }
+                } else {
+                    // decode a byte run
+                    int length = cmd[0] & (0xFF);
+                    if((x&1) == 0){
+                        length += (length&1);
+                        length >>= 1;
+                        for(int i=0;i> 1)] = cmd[1];
+                    } else {
+                        for(int i=0;i>1) + w*(h-y-1)]
+                                    |= ((cmd[1]&0xF0) >> 4);
+                            else  // copy low to high
+                                data[((x+i)>>1) + w*(h-y-1)]
+                                    |= ((cmd[1]&0x0F) << 4);
+                        }
+                    }
+                    x += cmd[0] & (0xFF);
+                }
+            }
+            return data;
+        } catch(ArrayIndexOutOfBoundsException e){
+            throw new BMPException("Invalid RLE data.");
+        }
     }
 }
-
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java b/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
index 1d00e6751d0..afc3da89efc 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/DecodeRLE8.java
@@ -52,7 +52,7 @@ import java.awt.Dimension;
 public class DecodeRLE8 extends BMPDecoder {
 
     public DecodeRLE8(BMPFileHeader fh, BMPInfoHeader ih){
-	super(fh, ih);
+        super(fh, ih);
     }
 
     /**
@@ -62,82 +62,81 @@ public class DecodeRLE8 extends BMPDecoder {
     private static final byte EOL = (byte)0; // end of line
     private static final byte EOB = (byte)1; // end of bitmap
     private static final byte DELTA = (byte)2; // delta
-    
+
     public BufferedImage decode(ImageInputStream in) throws IOException, BMPException {
-	IndexColorModel palette = readPalette(in);
-	skipToImage(in);
+        IndexColorModel palette = readPalette(in);
+        skipToImage(in);
 
-	Dimension d = infoHeader.getSize();
-	int h = (int)d.getHeight();
-	int w = (int)d.getWidth();
+        Dimension d = infoHeader.getSize();
+        int h = (int)d.getHeight();
+        int w = (int)d.getWidth();
 
-	byte[] data = uncompress(w, h, in);
-	SampleModel sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-							  w, h, 
-							  new int[] {0xFF});
-	DataBuffer db = new DataBufferByte(data, w*h, 0);
-	WritableRaster raster = Raster.createWritableRaster(sm, db, null);
-    
-	return new BufferedImage(palette, raster, false, null);
+        byte[] data = uncompress(w, h, in);
+        SampleModel sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                                          w, h,
+                                                          new int[] {0xFF});
+        DataBuffer db = new DataBufferByte(data, w*h, 0);
+        WritableRaster raster = Raster.createWritableRaster(sm, db, null);
+
+        return new BufferedImage(palette, raster, false, null);
     }
-    
-    private byte[] uncompress(int w, int h, ImageInputStream in) 
-	throws BMPException, IOException {
-	byte[] cmd = new byte[2];
-	byte[] data = new byte[w*h];
-	int offIn = 0;
-	int x=0,y=0;
 
-	try {
-	    while((x + y*w) < w*h){
-		if(in.read(cmd) != 2)
-		    throw new IOException("Error reading compressed data.");
+    private byte[] uncompress(int w, int h, ImageInputStream in)
+        throws BMPException, IOException {
+        byte[] cmd = new byte[2];
+        byte[] data = new byte[w*h];
+        int offIn = 0;
+        int x=0,y=0;
 
-		if(cmd[0] == ESCAPE){
-		    switch(cmd[1]){
-		    case EOB: // end of bitmap
-			return data;
-		    case EOL: // end of line
-			x = 0;
-			y++;
-			break;
-		    case DELTA: // delta
-			if(in.read(cmd) != 2)
-			    throw new IOException("Error reading compressed data.");
-			int dx = cmd[0] & (0xFF);
-			int dy = cmd[1] & (0xFF);
-			x += dx;
-			y += dy;
-			break;
-			
-		    default:
-			// decode a literal run
-			int length = cmd[1] & (0xFF);
-			int copylength = length;
+        try {
+            while((x + y*w) < w*h){
+                if(in.read(cmd) != 2)
+                    throw new IOException("Error reading compressed data.");
 
-			// absolute mode must be word-aligned
-			length += (length & 1);
+                if(cmd[0] == ESCAPE){
+                    switch(cmd[1]){
+                    case EOB: // end of bitmap
+                        return data;
+                    case EOL: // end of line
+                        x = 0;
+                        y++;
+                        break;
+                    case DELTA: // delta
+                        if(in.read(cmd) != 2)
+                            throw new IOException("Error reading compressed data.");
+                        int dx = cmd[0] & (0xFF);
+                        int dy = cmd[1] & (0xFF);
+                        x += dx;
+                        y += dy;
+                        break;
 
-			byte[] run = new byte[length];
-			if(in.read(run) != length)
-			    throw new IOException("Error reading compressed data.");
+                    default:
+                        // decode a literal run
+                        int length = cmd[1] & (0xFF);
+                        int copylength = length;
 
-			System.arraycopy(run, 0, data, (x+w*(h-y-1)), 
-					 copylength);
-			x += copylength;
-			break;
-		    }
-		} else {
-		    // decode a byte run
-		    int length = cmd[0] & (0xFF);
-		    for(int i=0;i> 8 & 0xFF);
-            
+
             o.write(rgb);
             if (rowCount == infoHeader.biWidth)
               {
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB24.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB24.java
index 10c1abee8a3..7fbc83e2e26 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB24.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB24.java
@@ -56,7 +56,7 @@ public class EncodeRGB24
 
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -67,10 +67,10 @@ public class EncodeRGB24
     infoHeader = ih;
     offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
   }
-  
+
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or
    * null
@@ -101,7 +101,7 @@ public class EncodeRGB24
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB32.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB32.java
index 4aa1cd5d2fb..7deca30491e 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB32.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB32.java
@@ -1,4 +1,4 @@
-/* EncodeRGB32.java -- 
+/* EncodeRGB32.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ public class EncodeRGB32
 
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -67,10 +67,10 @@ public class EncodeRGB32
     infoHeader = ih;
     offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
   }
-  
+
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or null
    * @param image - an IIOImage containing image data.
@@ -100,7 +100,7 @@ public class EncodeRGB32
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB4.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB4.java
index f1903541f7c..b62283a7d42 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB4.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB4.java
@@ -56,7 +56,7 @@ public class EncodeRGB4
 
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -70,7 +70,7 @@ public class EncodeRGB4
 
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or
    * null
@@ -101,13 +101,13 @@ public class EncodeRGB4
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
 
             rgb[0] = (byte) (value & 0xFF);
-            
+
             o.write(rgb);
             if (rowCount == infoHeader.biWidth)
               {
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB8.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB8.java
index dd7387a9a17..ef0594a5f56 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB8.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRGB8.java
@@ -56,7 +56,7 @@ public class EncodeRGB8
 
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -70,7 +70,7 @@ public class EncodeRGB8
 
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or
    * null
@@ -101,7 +101,7 @@ public class EncodeRGB8
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE4.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE4.java
index 3674c4d7877..c54c3ca8710 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE4.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE4.java
@@ -1,4 +1,4 @@
-/* EncodeRLE4.java -- 
+/* EncodeRLE4.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,10 +63,10 @@ public class EncodeRLE4
   private static final byte EOL = (byte)0; // end of line
   private static final byte EOB = (byte)1; // end of bitmap
   private static final byte DELTA = (byte)2; // delta
-  
+
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -77,10 +77,10 @@ public class EncodeRLE4
     infoHeader = ih;
     offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
   }
-  
+
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or
    * null
@@ -111,12 +111,12 @@ public class EncodeRLE4
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
             buf.put((byte) (value & 0xFF));
-            
+
             if (rowCount == infoHeader.biWidth)
               {
                 rowCount = 1;
@@ -127,7 +127,7 @@ public class EncodeRLE4
               rowCount++;
             rowIndex++;
           }
-        
+
         buf.flip();
         o.write(uncompress(infoHeader.biWidth, infoHeader.biHeight, buf));
       }
@@ -136,10 +136,10 @@ public class EncodeRLE4
         wb.printStackTrace();
       }
   }
-  
+
   /**
    * Uncompresses the image stored in the buffer.
-   * 
+   *
    * @param w - the width of the image
    * @param h - the height of the image
    * @param buf - the ByteBuffer containing the pixel values.
@@ -190,7 +190,7 @@ public class EncodeRLE4
                     {
                       throw new IOException("Error reading compressed data.");
                     }
-                    
+
                     int dx = cmd[0] & (0xFF);
                     int dy = cmd[1] & (0xFF);
                     x += dx;
diff --git a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE8.java b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
index dbbaeb26996..62277ef90d2 100644
--- a/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
+++ b/libjava/classpath/gnu/javax/imageio/bmp/EncodeRLE8.java
@@ -1,4 +1,4 @@
-/* EncodeRGB32.java -- 
+/* EncodeRGB32.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,7 +55,7 @@ public class EncodeRLE8
   protected BMPInfoHeader infoHeader;
   protected BMPFileHeader fileHeader;
   protected long offset;
-  
+
   /**
    * RLE control codes
    */
@@ -66,7 +66,7 @@ public class EncodeRLE8
 
   /**
    * Constructs an instance of this class.
-   * 
+   *
    * @param fh - the file header to use.
    * @param ih - the info header to use.
    */
@@ -77,10 +77,10 @@ public class EncodeRLE8
     infoHeader = ih;
     offset = BMPFileHeader.SIZE + BMPInfoHeader.SIZE;
   }
-  
+
   /**
    * The image encoder.
-   * 
+   *
    * @param o - the image output stream
    * @param streamMetadata - metadata associated with this stream, or
    * null
@@ -111,12 +111,12 @@ public class EncodeRLE8
                                            infoHeader.biHeight, bitmap, 0,
                                            infoHeader.biWidth);
         pg.grabPixels();
-        
+
         for (j = 0; j < size; j++)
           {
             value = bitmap[rowIndex];
             buf.put((byte) (value & 0xFF));
-            
+
             if (rowCount == infoHeader.biWidth)
               {
                 rowCount = 1;
@@ -127,7 +127,7 @@ public class EncodeRLE8
               rowCount++;
             rowIndex++;
           }
-        
+
         buf.flip();
         o.write(uncompress(infoHeader.biWidth, infoHeader.biHeight, buf));
       }
@@ -136,11 +136,11 @@ public class EncodeRLE8
         wb.printStackTrace();
       }
     }
-  
+
 
   /**
    * Uncompresses the image stored in the buffer.
-   * 
+   *
    * @param w - the width of the image
    * @param h - the height of the image
    * @param buf - the ByteBuffer containing the pixel values.
@@ -187,7 +187,7 @@ public class EncodeRLE8
                     {
                       throw new IOException("Error reading compressed data.");
                     }
-                    
+
                     int dx = cmd[0] & (0xFF);
                     int dy = cmd[1] & (0xFF);
                     x += dx;
diff --git a/libjava/classpath/gnu/javax/imageio/gif/GIFFile.java b/libjava/classpath/gnu/javax/imageio/gif/GIFFile.java
index ec0a3103d30..941397a0e7b 100644
--- a/libjava/classpath/gnu/javax/imageio/gif/GIFFile.java
+++ b/libjava/classpath/gnu/javax/imageio/gif/GIFFile.java
@@ -43,14 +43,14 @@ import java.util.Vector;
 
 /**
  * GIFFile - reads a GIF file.
- * 
+ *
  * This class only does the bare minimum work, and returns the data in raw
  * formats (described below). The class is J2ME compatible, and hopefully
  * we can keep it that way without any significant overhead.
  *
- * @author Sven de Marothy. 
+ * @author Sven de Marothy.
  */
-public class GIFFile 
+public class GIFFile
 {
   // "NETSCAPE2.0" - identifier
   private final static byte[] nsBlock = new byte[]
@@ -67,7 +67,7 @@ public class GIFFile
    * Extension block types
    */
   private final static int EXTENSION_COMMENT = 254;
-  private final static int EXTENSION_GCONTROL = 249; 
+  private final static int EXTENSION_GCONTROL = 249;
   private final static int EXTENSION_APPLICATION = 255;
 
   /**
@@ -75,7 +75,7 @@ public class GIFFile
    */
   private final static int UNDRAW_OVERWRITE = 1;
   private final static int UNDRAW_RESTORE_BACKGROUND = 2;
-  private final static int UNDRAW_RESTORE_PREVIOUS = 3; 
+  private final static int UNDRAW_RESTORE_PREVIOUS = 3;
 
   /**
    * Image position and dimensions (images may be partial)
@@ -121,7 +121,7 @@ public class GIFFile
    * Has transparency?
    */
   private boolean hasTransparency;
-  
+
   /**
    * Undraw mode (animations)
    */
@@ -181,7 +181,7 @@ public class GIFFile
    * @throws IOException if an I/O error occured.
    * @throws GIFException if some file parsing error occured
    */
-  public GIFFile(InputStream in) throws IOException, GIFException 
+  public GIFFile(InputStream in) throws IOException, GIFException
   {
     // Validate the signature
     if( !readSignature( in ) )
@@ -190,7 +190,7 @@ public class GIFFile
     {
       byte[] data = new byte[7];
       if (in.read(data) != 7)
-	throw new IOException("Couldn't read global descriptor.");
+        throw new IOException("Couldn't read global descriptor.");
 
       globalWidth = ((data[1] & 0xFF) << 8) | (data[0] & 0xFF);
       globalHeight = ((data[3] & 0xFF) << 8) | (data[2] & 0xFF);
@@ -202,37 +202,37 @@ public class GIFFile
 
     if( hasGlobalColorMap )
       {
-	globalPalette = new byte[ nColors * 3 ];
-	if( in.read( globalPalette ) != nColors * 3 )
-	  throw new IOException("Couldn't read color map.");
+        globalPalette = new byte[ nColors * 3 ];
+        if( in.read( globalPalette ) != nColors * 3 )
+          throw new IOException("Couldn't read color map.");
       }
-    
+
     int c = in.read();
     while( c == EXTENSION )
       {
-	readExtension( in );
-	c = in.read();
+        readExtension( in );
+        c = in.read();
       }
-      
+
     if( c != LOCAL )
       throw new GIFException("Extension blocks not followed by a local descriptor ("+c+")");
 
     loadImage( in );
-    c = in.read(); 
+    c = in.read();
 
     if( c == TERMINATOR ) // Not an animated GIF.
       return;
 
-    // Load animation frames. Just quit if an error occurs instead 
+    // Load animation frames. Just quit if an error occurs instead
     // of throwing an exception.
     animationFrames = new Vector();
-    try 
+    try
       {
-	while( c != TERMINATOR )
-	  {
-	    animationFrames.add( new GIFFile( this, in, c ) );
-	    c = in.read(); 
-	  }
+        while( c != TERMINATOR )
+          {
+            animationFrames.add( new GIFFile( this, in, c ) );
+            c = in.read();
+          }
       }
     catch(IOException ioe)
       {
@@ -245,8 +245,8 @@ public class GIFFile
   /**
    * Constructor for additional animation frames.
    */
-  private GIFFile(GIFFile parent, InputStream in, int c) 
-    throws IOException, GIFException 
+  private GIFFile(GIFFile parent, InputStream in, int c)
+    throws IOException, GIFException
   {
     // Copy global properties.
     globalWidth = parent.globalWidth;
@@ -261,10 +261,10 @@ public class GIFFile
 
     while( c == EXTENSION )
     {
-      readExtension( in );      
+      readExtension( in );
       c = in.read();
     }
-      
+
     if( c != LOCAL )
       throw new GIFException("Extension blocks not followed by a local descriptor ("+c+")");
 
@@ -279,21 +279,21 @@ public class GIFFile
    * @throws IOException if the signature could not be read.
    */
   public static boolean readSignature( InputStream in ) throws IOException
-  { 
+  {
     byte[] data = new byte[6];
     if (in.read(data) != 6)
       throw new IOException("Couldn't read signature.");
 
     if( data[0] != 0x47 || data[1] != 0x49 || data[2] != 0x46 ||
-	data[3] != 0x38 ) // GIF8
+        data[3] != 0x38 ) // GIF8
       return false;
 
     if( (data[4] != 0x39 && data[4] != 0x37) || // 7 | 9
-	(data[5] != 0x61 && data[5] != 0x62) ) // 'a' or 'b'
+        (data[5] != 0x61 && data[5] != 0x62) ) // 'a' or 'b'
       return false;
     return true;
   }
-  
+
 
   /**
    * Loads the image local descriptor and then loads/decodes the image raster,
@@ -306,13 +306,13 @@ public class GIFFile
 
     try
       {
-	decodeRaster( in );
+        decodeRaster( in );
       }
     catch(ArrayIndexOutOfBoundsException aioobe)
       {
-	throw new GIFException("Error decompressing image.");
+        throw new GIFException("Error decompressing image.");
       }
-    
+
     if( interlaced )  // Clean up
       deinterlace();
     packPixels();
@@ -330,31 +330,31 @@ public class GIFFile
       return;
 
     int nbits = 1;
-    int ppbyte = 8; 
+    int ppbyte = 8;
     if( nColors == 4 )
       {
-	nbits = 2;
-	ppbyte = 4;
+        nbits = 2;
+        ppbyte = 4;
       }
     else if( nColors == 16 )
       {
-	nbits = 4;
-	ppbyte = 2;
+        nbits = 4;
+        ppbyte = 2;
       }
 
     int rem = (width & (ppbyte - 1));
-    int w = ( rem == 0 ) ? (width / ppbyte) : 
-      ((width + ppbyte - rem) / ppbyte); 
+    int w = ( rem == 0 ) ? (width / ppbyte) :
+      ((width + ppbyte - rem) / ppbyte);
     byte[] nr = new byte[ w * height ];
     for(int j = 0; j < height; j++)
       {
-	for(int i = 0; i < width - ppbyte; i += ppbyte)
-	  for(int k = 0; k < ppbyte; k++)
-	    nr[ j * w + (i / ppbyte) ] |= (byte)((raster[ width * j + i + k ]
-						  << (8 - nbits * (1 + k))));
- 	for(int i = 0; i < rem; i++)
- 	  nr[ j * w + w - 1 ] |= (byte)((raster[ width * j + width - rem + i ]
-					 << (nbits * (rem - i))));
+        for(int i = 0; i < width - ppbyte; i += ppbyte)
+          for(int k = 0; k < ppbyte; k++)
+            nr[ j * w + (i / ppbyte) ] |= (byte)((raster[ width * j + i + k ]
+                                                  << (8 - nbits * (1 + k))));
+        for(int i = 0; i < rem; i++)
+          nr[ j * w + w - 1 ] |= (byte)((raster[ width * j + width - rem + i ]
+                                         << (nbits * (rem - i))));
       }
     raster = nr;
   }
@@ -424,23 +424,23 @@ public class GIFFile
     int n = 0;
     for(int i = 0; i < ((height + 7) >> 3); i++)
       {
-	System.arraycopy( raster, n, nr, width * i * 8, width );
-	n += width;
+        System.arraycopy( raster, n, nr, width * i * 8, width );
+        n += width;
       }
     for(int i = 0; i < ((height + 3) >> 3); i++)
       {
-	System.arraycopy( raster, n, nr, width * ( 8 * i + 4 ), width );
-	n += width;
+        System.arraycopy( raster, n, nr, width * ( 8 * i + 4 ), width );
+        n += width;
       }
     for(int i = 0; i < (height >> 2); i++)
       {
-	System.arraycopy( raster, n, nr, width * (4 * i + 2), width );
-	n += width;
+        System.arraycopy( raster, n, nr, width * (4 * i + 2), width );
+        n += width;
       }
     for(int i = 0; i < (height >> 1); i++)
       {
-	System.arraycopy( raster, n, nr, width * (2 * i + 1), width );
-	n += width;
+        System.arraycopy( raster, n, nr, width * (2 * i + 1), width );
+        n += width;
       }
     raster = nr;
   }
@@ -461,17 +461,17 @@ public class GIFFile
     interlaced = (( flags & 0x40 ) != 0);
     if( (flags & 0x80) != 0 )
       { // has a local color map
-	int nLocalColors = (1 << (( flags & 0x07) + 1));
-	if( !hasGlobalColorMap )
-	  nColors = nLocalColors;
-	localPalette = new byte[ nLocalColors * 3 ];
-	if( in.read( localPalette ) != nLocalColors * 3 )
-	  throw new IOException("Couldn't read color map.");
+        int nLocalColors = (1 << (( flags & 0x07) + 1));
+        if( !hasGlobalColorMap )
+          nColors = nLocalColors;
+        localPalette = new byte[ nLocalColors * 3 ];
+        if( in.read( localPalette ) != nLocalColors * 3 )
+          throw new IOException("Couldn't read color map.");
       }
-  }   
+  }
 
   /**
-   * Returns the image's palette in raw format 
+   * Returns the image's palette in raw format
    * (r0,g0,b0,r1,g1,b2..r(Ncolors-1),g(Ncolors-1),b(Ncolors-1))
    */
   public byte[] getRawPalette()
@@ -514,41 +514,41 @@ public class GIFFile
   /**
    * Handles extension blocks.
    */
-  private void readExtension(InputStream in) throws IOException, GIFException 
+  private void readExtension(InputStream in) throws IOException, GIFException
   {
     int functionCode = in.read();
     byte[] data = readData(in);
     switch( functionCode )
       {
       case EXTENSION_COMMENT: // comment block
-	comment = new String(data, "8859_1");
-	break;
+        comment = new String(data, "8859_1");
+        break;
 
       case EXTENSION_GCONTROL: // Graphics control extension
-	undraw = (data[0] & 0x1C) >> 2;
-	// allegedly there can be bad values of this.
-	if( undraw < 1 && undraw > 3 ) undraw = 1; 
-	hasTransparency = ((data[0] & 0x01) == 1);
-	transparentIndex = (data[3] & 0xFF);
-	duration = ((data[2] & 0xFF) << 8) | (data[1] & 0xFF);
-	break;
+        undraw = (data[0] & 0x1C) >> 2;
+        // allegedly there can be bad values of this.
+        if( undraw < 1 && undraw > 3 ) undraw = 1;
+        hasTransparency = ((data[0] & 0x01) == 1);
+        transparentIndex = (data[3] & 0xFF);
+        duration = ((data[2] & 0xFF) << 8) | (data[1] & 0xFF);
+        break;
 
-	// Application extension. We only parse the Netscape animation
-	// extension here. Which is the only one most use anyway.
+        // Application extension. We only parse the Netscape animation
+        // extension here. Which is the only one most use anyway.
       case EXTENSION_APPLICATION:
-	boolean isNS = true;
-	for(int i = 0; i < nsBlock.length; i++ )
-	  if( nsBlock[i] != data[i] )
-	    isNS = false;
-	if( isNS )
-	  {
-	    isLooped = true;
-	    loops = ((data[12] & 0xFF) << 8) | (data[13] & 0xFF);
-	  }
-	break;
+        boolean isNS = true;
+        for(int i = 0; i < nsBlock.length; i++ )
+          if( nsBlock[i] != data[i] )
+            isNS = false;
+        if( isNS )
+          {
+            isLooped = true;
+            loops = ((data[12] & 0xFF) << 8) | (data[13] & 0xFF);
+          }
+        break;
 
       default:
-	break;
+        break;
       }
   }
 
@@ -563,11 +563,11 @@ public class GIFFile
     int n = in.read();
     do
       {
-	totalBytes += n;
-	byte[] block = new byte[ n ];
-	in.read(block);
-	v.add(block);
-	n = in.read();
+        totalBytes += n;
+        byte[] block = new byte[ n ];
+        in.read(block);
+        v.add(block);
+        n = in.read();
       }
     while( n > 0 );
 
@@ -575,9 +575,9 @@ public class GIFFile
     byte[] bigBuffer = new byte[ totalBytes ];
     for( int i = 0; i < v.size(); i++ )
       {
-	byte[] block = (byte[])v.elementAt(i);
-	System.arraycopy(block, 0, bigBuffer, n, block.length);
-	n += block.length;
+        byte[] block = (byte[])v.elementAt(i);
+        System.arraycopy(block, 0, bigBuffer, n, block.length);
+        n += block.length;
       }
     return bigBuffer;
   }
@@ -617,65 +617,65 @@ public class GIFFile
 
     for(short i = 0; i < nColors; i ++ )
       {
-	dictionary[i][0] = i;  // color index	
-	dictionary[i][1] = -1; // parent
-	dictionary[i][2] = i;  // first	
-	dictionary[i][3] = 1;  // depth
+        dictionary[i][0] = i;  // color index
+        dictionary[i][1] = -1; // parent
+        dictionary[i][2] = i;  // first
+        dictionary[i][3] = 1;  // depth
       }
 
     code = getBits( codeSize ); // get second code
     raster[ rasterIndex++ ] = (byte)dictionary[code][0];
-    int old = code;    
+    int old = code;
     code = getBits( codeSize ); // start at the third code
     int c;
 
     do
       {
-	if( code == clearCode )
-	  {
-	    codeSize = initialCodeSize + 1;
- 	    nextCode = endCode + 1; 
-	    // get and output second code
-	    code = getBits( codeSize ); 
-	    raster[ rasterIndex++ ] = (byte)dictionary[code][0];
-	    old = code;
-	  }
-	else
-	  {
-	    dictionary[nextCode][1] = (short)old; // parent = old
-	    dictionary[nextCode][2] = dictionary[old][2]; // first pixel
-	    dictionary[nextCode][3] = (short)(dictionary[old][3] + 1); // depth
-	
-	    // appended pixel  = first pixel of c
-	    if( code < nextCode )
-	      {
-		dictionary[nextCode][0] = dictionary[code][2]; 
-		old = code;
-	      }
-	    else // first of old
-	      {
-		dictionary[nextCode][0] = dictionary[old][2]; 
-		old = nextCode;
-	      }
+        if( code == clearCode )
+          {
+            codeSize = initialCodeSize + 1;
+            nextCode = endCode + 1;
+            // get and output second code
+            code = getBits( codeSize );
+            raster[ rasterIndex++ ] = (byte)dictionary[code][0];
+            old = code;
+          }
+        else
+          {
+            dictionary[nextCode][1] = (short)old; // parent = old
+            dictionary[nextCode][2] = dictionary[old][2]; // first pixel
+            dictionary[nextCode][3] = (short)(dictionary[old][3] + 1); // depth
 
-	    c = old;
-	    // output the code c
-	    int depth = dictionary[c][3];
-	    for( int i = depth - 1; i >= 0; i-- )
-	      {
-		raster[ rasterIndex + i ] = (byte)dictionary[c][0];
-		c = dictionary[c][1]; // go to parent.
-	      }
-	    rasterIndex += depth;
-	    nextCode ++;
+            // appended pixel  = first pixel of c
+            if( code < nextCode )
+              {
+                dictionary[nextCode][0] = dictionary[code][2];
+                old = code;
+              }
+            else // first of old
+              {
+                dictionary[nextCode][0] = dictionary[old][2];
+                old = nextCode;
+              }
 
-	    if( codeSize < 12 && nextCode >= (1 << codeSize) )
-	      codeSize++;
-	  }
-	code = getBits( codeSize );
+            c = old;
+            // output the code c
+            int depth = dictionary[c][3];
+            for( int i = depth - 1; i >= 0; i-- )
+              {
+                raster[ rasterIndex + i ] = (byte)dictionary[c][0];
+                c = dictionary[c][1]; // go to parent.
+              }
+            rasterIndex += depth;
+            nextCode ++;
+
+            if( codeSize < 12 && nextCode >= (1 << codeSize) )
+              codeSize++;
+          }
+        code = getBits( codeSize );
       }
     while( code != endCode && dataBlockIndex < compressedData.length );
-    
+
     compressedData = null; // throw away compressed data.
   }
 
@@ -686,9 +686,9 @@ public class GIFFile
   {
     while( nbits > remainingBits )
       {
-	int c = (compressedData[ dataBlockIndex++ ] & 0xFF) << remainingBits;
-	currentBits |= c;
-	remainingBits += 8;
+        int c = (compressedData[ dataBlockIndex++ ] & 0xFF) << remainingBits;
+        currentBits |= c;
+        remainingBits += 8;
       }
     int rval = (currentBits & ((1 << nbits) - 1));
     currentBits = (currentBits >> nbits);
@@ -699,7 +699,7 @@ public class GIFFile
   /**
    * Generic exception used by GIFFile to report decoding errors.
    */
-  public static class GIFException extends Exception 
+  public static class GIFException extends Exception
   {
     public GIFException(String message)
     {
diff --git a/libjava/classpath/gnu/javax/imageio/gif/GIFImageReader.java b/libjava/classpath/gnu/javax/imageio/gif/GIFImageReader.java
index 47108dd0c17..2cb59226b11 100644
--- a/libjava/classpath/gnu/javax/imageio/gif/GIFImageReader.java
+++ b/libjava/classpath/gnu/javax/imageio/gif/GIFImageReader.java
@@ -56,7 +56,7 @@ import java.awt.image.DataBufferByte;
 import java.awt.image.Raster;
 import java.awt.image.WritableRaster;
 
-public class GIFImageReader extends ImageReader 
+public class GIFImageReader extends ImageReader
 {
   private GIFFile file;
 
@@ -65,7 +65,7 @@ public class GIFImageReader extends ImageReader
     super( originatingProvider );
     file = null;
   }
-  
+
   private void readImage() throws IOException
   {
     if( file != null )
@@ -73,14 +73,14 @@ public class GIFImageReader extends ImageReader
 
     try
       {
-	if( input instanceof InputStream )
-	  file = new GIFFile( (InputStream)input );
-	else
-	  file = new GIFFile( new IIOInputStream((ImageInputStream)input) );
+        if( input instanceof InputStream )
+          file = new GIFFile( (InputStream)input );
+        else
+          file = new GIFFile( new IIOInputStream((ImageInputStream)input) );
       }
     catch(GIFFile.GIFException ge)
       {
-	throw new IIOException(ge.getMessage());
+        throw new IIOException(ge.getMessage());
       }
   }
 
@@ -98,68 +98,68 @@ public class GIFImageReader extends ImageReader
 
     for(int i = 0; i < nc; i ++ )
       {
-	r[i] = data[ i * 3 ];
-	g[i] = data[ i * 3 + 1 ];
-	b[i] = data[ i * 3 + 2 ];
+        r[i] = data[ i * 3 ];
+        g[i] = data[ i * 3 + 1 ];
+        b[i] = data[ i * 3 + 2 ];
       }
 
     if( f.hasTransparency() )
       {
-	byte[] a = new byte[nc];
-	for(int i = 0; i < nc; i ++ )
-	  a[i] = (byte)0xFF;
-	a[f.getTransparentIndex()] = 0;
-	return new IndexColorModel(8, nc, r, g, b, a);
+        byte[] a = new byte[nc];
+        for(int i = 0; i < nc; i ++ )
+          a[i] = (byte)0xFF;
+        a[f.getTransparentIndex()] = 0;
+        return new IndexColorModel(8, nc, r, g, b, a);
       }
-    
+
     return new IndexColorModel(8, nc, r, g, b);
   }
 
-  private void validateIndex(int imageIndex) 
-    throws IndexOutOfBoundsException 
+  private void validateIndex(int imageIndex)
+    throws IndexOutOfBoundsException
   {
     if( imageIndex < 0 || imageIndex >= getNumImages(false) )
       throw new IndexOutOfBoundsException("Invalid image index.");
   }
 
-  public void setInput(Object input) 
+  public void setInput(Object input)
   {
     super.setInput(input);
   }
 
-  public void setInput(Object input, 
-		       boolean seekForwardOnly, 
-		       boolean ignoreMetadata) 
+  public void setInput(Object input,
+                       boolean seekForwardOnly,
+                       boolean ignoreMetadata)
   {
     super.setInput(input, seekForwardOnly, ignoreMetadata);
   }
-	
-  public void setInput(Object input, boolean isStreamable) 
+
+  public void setInput(Object input, boolean isStreamable)
   {
     super.setInput(input, isStreamable);
-	
-    if (!(input instanceof ImageInputStream) && 
-	!(input instanceof InputStream))
+
+    if (!(input instanceof ImageInputStream) &&
+        !(input instanceof InputStream))
       throw new IllegalArgumentException("Input not an ImageInputStream.");
   }
 
-  private void checkStream() throws IOException 
+  private void checkStream() throws IOException
   {
     if (!(input instanceof ImageInputStream) &&
-	!(input instanceof InputStream))
+        !(input instanceof InputStream))
       throw new IllegalStateException("Input not an ImageInputStream or InputStream.");
 
     if(input == null)
       throw new IllegalStateException("No input stream.");
   }
 
-  public int getWidth(int imageIndex) throws IOException 
+  public int getWidth(int imageIndex) throws IOException
   {
     validateIndex( imageIndex );
     return file.getImage( imageIndex ).getWidth();
   }
 
-  public int getHeight(int imageIndex) throws IOException 
+  public int getHeight(int imageIndex) throws IOException
   {
     validateIndex( imageIndex );
     return file.getImage( imageIndex ).getHeight();
@@ -172,17 +172,17 @@ public class GIFImageReader extends ImageReader
   }
 
   /**
-   * Returns the number of images. 
+   * Returns the number of images.
    */
   public int getNumImages(boolean allowSearch)
   {
     try // Image should be loaded here already. But just in case:
       {
-	readImage();
+        readImage();
       }
     catch(IOException ioe)
       {
-	return 0; // Well, now we're in trouble. But return something anyway.
+        return 0; // Well, now we're in trouble. But return something anyway.
       }
     return file.nImages();
   }
@@ -202,11 +202,11 @@ public class GIFImageReader extends ImageReader
   }
 
   /**
-   * Reads the image indexed by imageIndex and returns it as 
+   * Reads the image indexed by imageIndex and returns it as
    * a complete BufferedImage, using a supplied ImageReadParam.
-   */	      
-  public BufferedImage read(int imageIndex, ImageReadParam param) 
-    throws IOException, IIOException 
+   */
+  public BufferedImage read(int imageIndex, ImageReadParam param)
+    throws IOException, IIOException
   {
     validateIndex( imageIndex );
     GIFFile f = file.getImage( imageIndex );
@@ -216,26 +216,26 @@ public class GIFImageReader extends ImageReader
     switch( f.getNColors() )
       {
       case 16:
-	sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-					     width, height, 4);
-	break;
+        sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                             width, height, 4);
+        break;
       case 4:
-	sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-					     width, height, 2);
-	break;
+        sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                             width, height, 2);
+        break;
       case 2:
-	sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-					     width, height, 1);
-	break;
+        sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                             width, height, 1);
+        break;
       default:
-	sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-					      width, height, 
-					      new int[] {0xFF});
-	break;
+        sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                              width, height,
+                                              new int[] {0xFF});
+        break;
       }
     DataBuffer db = new DataBufferByte(f.getRawImage(), width * height, 0);
     WritableRaster raster = Raster.createWritableRaster(sm, db, null);
-    
+
     return new BufferedImage(getPalette( imageIndex ), raster, false, null);
   }
 }
diff --git a/libjava/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java b/libjava/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java
index a3184862353..285ca42e4b3 100644
--- a/libjava/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java
+++ b/libjava/classpath/gnu/javax/imageio/gif/GIFImageReaderSpi.java
@@ -46,7 +46,7 @@ import javax.imageio.ImageReader;
 import javax.imageio.spi.ImageReaderSpi;
 import javax.imageio.stream.ImageInputStream;
 
-public class GIFImageReaderSpi extends ImageReaderSpi 
+public class GIFImageReaderSpi extends ImageReaderSpi
 {
   static final String vendorName = "GNU";
   static final String version = "0.1";
@@ -68,39 +68,39 @@ public class GIFImageReaderSpi extends ImageReaderSpi
   static final String nativeImageMetadataFormatClassName = null;
   static final String[] extraImageMetadataFormatNames = null;
   static final String[] extraImageMetadataFormatClassNames = null;
-    
-  public GIFImageReaderSpi() 
+
+  public GIFImageReaderSpi()
   {
     super(vendorName, version,
-	  names, suffixes, MIMETypes,
-	  readerClassName,
-	  new Class[]{ ImageInputStream.class, InputStream.class },
-	  writerSpiNames,
-	  supportsStandardStreamMetadataFormat,
-	  nativeStreamMetadataFormatName,
-	  nativeStreamMetadataFormatClassName,
-	  extraStreamMetadataFormatNames,
-	  extraStreamMetadataFormatClassNames,
-	  supportsStandardImageMetadataFormat,
-	  nativeImageMetadataFormatName,
-	  nativeImageMetadataFormatClassName,
-	  extraImageMetadataFormatNames,
-	  extraImageMetadataFormatClassNames);
+          names, suffixes, MIMETypes,
+          readerClassName,
+          new Class[]{ ImageInputStream.class, InputStream.class },
+          writerSpiNames,
+          supportsStandardStreamMetadataFormat,
+          nativeStreamMetadataFormatName,
+          nativeStreamMetadataFormatClassName,
+          extraStreamMetadataFormatNames,
+          extraStreamMetadataFormatClassNames,
+          supportsStandardImageMetadataFormat,
+          nativeImageMetadataFormatName,
+          nativeImageMetadataFormatClassName,
+          extraImageMetadataFormatNames,
+          extraImageMetadataFormatClassNames);
   }
-    
-  public String getDescription(Locale locale) 
+
+  public String getDescription(Locale locale)
   {
     return "Compuserve GIF";
   }
-    
+
   public boolean canDecodeInput(Object input)
-    throws IOException 
+    throws IOException
   {
     if( input == null )
       throw new IllegalArgumentException("Input object cannot be null.");
 
-    if( !(input instanceof ImageInputStream) && 
-	!(input instanceof InputStream)) 
+    if( !(input instanceof ImageInputStream) &&
+        !(input instanceof InputStream))
       return false;
 
     boolean retval;
@@ -116,8 +116,8 @@ public class GIFImageReaderSpi extends ImageReaderSpi
 
     return retval;
   }
-    
-  public ImageReader createReaderInstance(Object extension) 
+
+  public ImageReader createReaderInstance(Object extension)
   {
     return new GIFImageReader(this);
   }
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/DCT.java b/libjava/classpath/gnu/javax/imageio/jpeg/DCT.java
index 91b6eb88f25..fda52e5f506 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/DCT.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/DCT.java
@@ -61,7 +61,7 @@ public class DCT
   /**
    * Figure A.3.3 IDCT, Cu Cv on A-5 of the ISO DIS 10918-1. Requirements and
    * Guidelines.
-   * 
+   *
    * @param u
    * @return
    */
@@ -100,7 +100,7 @@ public class DCT
    * slow_idct - Figure A.3.3 IDCT (informative) on A-5 of the ISO DIS
    * 10918-1. Requirements and Guidelines. This is a slow IDCT, there are
    * better algorithms to use, it's fairly expensive with processor speed.
-   * 
+   *
    * @param matrix
    * @return
    */
@@ -199,7 +199,7 @@ public class DCT
    * effecient and only inaccurate at about 1/1000th of a percent of values
    * analyzed. Cannot be static because initMatrix must run before any
    * fast_idct values can be computed.
-   * 
+   *
    * @param input
    * @return
    */
@@ -255,7 +255,7 @@ public class DCT
           {
             output[i][j] = ((double) input[i][j] - (double) 128.0);
             //                        input[i][j] -= 128;
-            
+
           }
       }
 
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
index d07bb34e939..7be67a02ac1 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGComponent.java
@@ -59,7 +59,7 @@ public class JPEGComponent
 
   /**
    * Initializes the component
-   * 
+   *
    * @param id
    * @param factorHorizontal
    * @param factorVertical
@@ -78,7 +78,7 @@ public class JPEGComponent
    * If a restart marker is found with too little of an MCU count (i.e. our
    * Restart Interval is 63 and we have 61 we copy the last MCU until it's
    * full)
-   * 
+   *
    * @param index
    * @param length
    */
@@ -180,7 +180,7 @@ public class JPEGComponent
   /**
    * This write the block of data to the raster throwing out anything that
    * spills over the raster width or height.
-   * 
+   *
    * @param raster
    * @param data
    * @param compIndex
@@ -210,7 +210,7 @@ public class JPEGComponent
    * but it writes the data to the raster block by factor size in a zig zag
    * fashion. This has the helper function writeBlock which does the actual
    * writing.
-   * 
+   *
    * @param raster
    * @param componentIndex
    */
@@ -263,7 +263,7 @@ public class JPEGComponent
 
   /**
    * Set the quantization table for this component.
-   * 
+   *
    * @param quanttable
    */
   public void setQuantizationTable(int[] quanttable)
@@ -273,7 +273,7 @@ public class JPEGComponent
 
   /**
    * Read in a partial MCU for this component
-   * 
+   *
    * @param stream TODO
    * @throws JPEGException TODO
    * @throws IOException TODO
@@ -293,7 +293,7 @@ public class JPEGComponent
   /**
    * Generated from text on F-22, F.2.2.1 - Huffman decoding of DC
    * coefficients on ISO DIS 10918-1. Requirements and Guidelines.
-   * 
+   *
    * @param JPEGStream TODO
    *
    * @return TODO
@@ -301,7 +301,7 @@ public class JPEGComponent
    * @throws IOException TODO
    */
   public double decode_dc_coefficient(JPEGImageInputStream JPEGStream)
-	throws JPEGException, IOException
+        throws JPEGException, IOException
   {
     int t = DCTable.decode(JPEGStream);
     double diff = JPEGStream.readBits(t);
@@ -314,7 +314,7 @@ public class JPEGComponent
   /**
    * Generated from text on F-23, F.13 - Huffman decoded of AC coefficients
    * on ISO DIS 10918-1. Requirements and Guidelines.
-   * 
+   *
    * @param JPEGStream TODO
    * @return TODO
    *
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
index 0f2a3f2b949..11d547f4d2f 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGDecoder.java
@@ -68,7 +68,7 @@ public class JPEGDecoder
   BufferedImage image;
   int width;
   int height;
-  
+
   byte marker;
 
   /**
@@ -100,7 +100,7 @@ public class JPEGDecoder
     {
       return height;
     }
-    
+
     public int getWidth()
     {
         return width;
@@ -333,7 +333,7 @@ public class JPEGDecoder
                   {
                     for (int i = 0; i < 64; i++)
                       quantData[i] = jpegStream.readByte();
-                  
+
                   }
                 else if ((byte) (quantSpecs >> 4) == 1)
                   // Precision 16 bit.
@@ -370,7 +370,7 @@ public class JPEGDecoder
             byte endSpectralSelection = jpegStream.readByte();
             byte successiveApproximation = jpegStream.readByte();
 
-            int mcuIndex = 0; 
+            int mcuIndex = 0;
             int mcuTotalIndex = 0;
             // This loops through until a MarkerTagFound exception is
             // found, if the marker tag is a RST (Restart Marker) it
@@ -541,7 +541,7 @@ public class JPEGDecoder
             throw new JPEGException("Unsupported Codec Type: Extended "
                                     + "Sequential DCT JPEG's Not-Supported");
             //case JPEGMarker.SOF2:
-            //	throw new JPEGException("Unsupported Codec Type: Progressive DCT JPEG's Not-Supported");
+            //  throw new JPEGException("Unsupported Codec Type: Progressive DCT JPEG's Not-Supported");
           case JPEGMarker.SOF3:
             throw new JPEGException("Unsupported Codec Type:"
                                     + " Lossless (sequential)");
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
index 29a12f346cf..f2c26d9d5d8 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageInputStream.java
@@ -47,7 +47,7 @@ public class JPEGImageInputStream
   private ImageInputStream in;
 
   byte marker;
-  
+
   public JPEGImageInputStream(ImageInputStream in)
   {
     super();
@@ -68,7 +68,7 @@ public class JPEGImageInputStream
     setBitOffset(0);
     return in.read(data, offset, len);
   }
-  
+
   /**
    * Pull a byte from the stream, this checks to see if the byte is 0xff
    * and if the next byte isn't 0x00 (stuffed byte) it errors out. If it's
@@ -117,7 +117,7 @@ public class JPEGImageInputStream
    * @return the amount of bits specified by l as an integer
    *
    * @throws IOException TODO
-   * @throws JPEGMarkerFoundException 
+   * @throws JPEGMarkerFoundException
    * @throws BitStreamException TODO
    */
   public int readBit()
@@ -129,7 +129,7 @@ public class JPEGImageInputStream
   int newOffset = (bitOffset + 1) & 0x7;
 
   byte data = pullByte();
-  
+
   if (bitOffset != 0)
     {
         seek(getStreamPosition() - 1);
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java
index 51bc0ce3760..5ecbe0f8c30 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReader.java
@@ -117,7 +117,7 @@ public class JPEGImageReader extends ImageReader
 
   private void checkStream() throws IOException
   {
-    if (!(input instanceof ImageInputStream)) 
+    if (!(input instanceof ImageInputStream))
       throw new IllegalStateException("Input not an ImageInputStream.");
     if(input == null)
       throw new IllegalStateException("No input stream.");
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java
index c1e9adf6027..c45b818c78c 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGImageReaderSpi.java
@@ -88,16 +88,16 @@ public class JPEGImageReaderSpi extends ImageReaderSpi
           extraImageMetadataFormatClassNames);
     System.out.println ("JPEGImageReaderSPI!!!");
   }
-    
+
   public String getDescription(Locale locale)
   {
     return "JPEG ISO 10918-1, JFIF V1.02";
   }
-    
+
   public boolean canDecodeInput(Object input)
     throws IOException
   {
-    if (!(input instanceof ImageInputStream)) 
+    if (!(input instanceof ImageInputStream))
       return false;
 
     ImageInputStream in = (ImageInputStream) input;
@@ -117,7 +117,7 @@ public class JPEGImageReaderSpi extends ImageReaderSpi
 
     return retval;
   }
-    
+
   public ImageReader createReaderInstance(Object extension)
   {
     return new JPEGImageReader(this);
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGMarker.java b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGMarker.java
index c80a0ca78fe..bc6350fbc1a 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/JPEGMarker.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/JPEGMarker.java
@@ -172,7 +172,7 @@ public class JPEGMarker
    * Quantization Table.
    */
   public final static byte DQT = (byte) 0xdb;
- 
+
   /**
    * Start of Scan.
    */
diff --git a/libjava/classpath/gnu/javax/imageio/jpeg/ZigZag.java b/libjava/classpath/gnu/javax/imageio/jpeg/ZigZag.java
index 0c19d74ff26..9aac0df40b7 100644
--- a/libjava/classpath/gnu/javax/imageio/jpeg/ZigZag.java
+++ b/libjava/classpath/gnu/javax/imageio/jpeg/ZigZag.java
@@ -63,7 +63,7 @@ public class ZigZag
 
   /**
    * Encodes a matrix of equal width and height to a byte array.
-   * 
+   *
    * @param matrix
    *
    * @return
@@ -114,7 +114,7 @@ public class ZigZag
 
   /**
    * Encodes a matrix of equal width and height to a double array
-   * 
+   *
    * @param matrix
    *
    * @return
@@ -165,7 +165,7 @@ public class ZigZag
 
   /**
    * Encodes a matrix of equal width and height to a float array
-   * 
+   *
    * @param matrix
    *
    * @return
@@ -216,7 +216,7 @@ public class ZigZag
 
   /**
    * Encodes a matrix of equal width and height to a float array
-   * 
+   *
    * @param matrix
    *
    * @return
@@ -268,7 +268,7 @@ public class ZigZag
   /**
    * Convert a double array into a matrix with the same amount of columns and
    * rows with length sqrt(double array length)
-   * 
+   *
    * @param data
    *
    * @return
@@ -282,7 +282,7 @@ public class ZigZag
   /**
    * Convert a byte array into a matrix with the same amount of columns and
    * rows with length sqrt(double array length)
-   * 
+   *
    * @param data
    *
    * @return
@@ -314,7 +314,7 @@ public class ZigZag
       {
         buffer[yindex][xindex] = data[dataindex];
         dataindex++;
-        
+
         if (dir == ZigZag.ZIGZAG_FORWARD)
           {
             if (yindex == 0 || xindex == (width - 1))
@@ -408,19 +408,19 @@ public class ZigZag
   public static float[][] decode(float[] data, int width, int height)
   {
     float[][] buffer = new float[height][width];
-    
+
     for (int v = 0; v < height; v++)
       for (int z = 0; z < width; z++)
         buffer[v][z] = 11;
-    
+
     boolean dir = ZigZag.ZIGZAG_FORWARD;
     int xindex = 0, yindex = 0, dataindex = 0;
-    
+
     while (xindex < width && yindex < height && dataindex < data.length)
       {
         buffer[yindex][xindex] = data[dataindex];
         dataindex++;
-        
+
         if (dir == ZigZag.ZIGZAG_FORWARD)
           {
             if (yindex == 0 || xindex == (width - 1))
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java b/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
index 8efbeea7259..ade0999fed2 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGChunk.java
@@ -52,20 +52,20 @@ public class PNGChunk
    */
   private static long[] crcTable;
 
-  static 
+  static
    {
      long c;
      crcTable = new long[256];
-   
+
      for(int i = 0; i < 256; i++)
        {
-	 c = i;
-	 for(int j = 0; j < 8; j++) 
-	   if( (c & 1) == 1 )
-	     c = 0xEDB88320L ^ (c >> 1);
-	   else
-	     c = c >> 1;
-	 crcTable[i] = c;
+         c = i;
+         for(int j = 0; j < 8; j++)
+           if( (c & 1) == 1 )
+             c = 0xEDB88320L ^ (c >> 1);
+           else
+             c = c >> 1;
+         crcTable[i] = c;
        }
    }
 
@@ -90,7 +90,7 @@ public class PNGChunk
    * The chunk data
    */
   protected byte[] data;
-  
+
   /**
    * The chunk's crc
    */
@@ -107,7 +107,7 @@ public class PNGChunk
   }
 
   /**
-   * Constructor for creating new chunks. 
+   * Constructor for creating new chunks.
    * (only used by subclasses - creating a generic chunk is rather useless)
    */
   protected PNGChunk( int type )
@@ -122,44 +122,44 @@ public class PNGChunk
    * @param strict - if true, a PNGException is thrown on all invalid chunks,
    * if false, only critical chunks will throw PNGExceptions.
    */
-  public static PNGChunk readChunk(InputStream in, boolean strict) 
+  public static PNGChunk readChunk(InputStream in, boolean strict)
     throws IOException, PNGException
   {
     byte data[] = new byte[4];
     if( in.read( data ) != 4 )
       throw new IOException("Could not read chunk length.");
-    int length = ((data[0] & 0xFF) << 24) | ((data[1] & 0xFF) << 16 ) | 
+    int length = ((data[0] & 0xFF) << 24) | ((data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
 
     if( in.read( data ) != 4 )
       throw new IOException("Could not read chunk type.");
-    int type = ((data[0] & 0xFF) << 24) | ((data[1] & 0xFF) << 16 ) | 
+    int type = ((data[0] & 0xFF) << 24) | ((data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
 
     byte[] chkdata = new byte[ length ];
     if( in.read( chkdata ) != length )
       throw new IOException("Could not read chunk data.");
-    
+
     if( in.read( data ) != 4 )
       throw new IOException("Could not read chunk CRC.");
-    
-    int crc = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) | 
+
+    int crc = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
 
     if( strict )
       return getChunk( type, chkdata, crc );
     else
       {
-	try
-	  {
-	    return getChunk( type, chkdata, crc );
-	  }
-	catch(PNGException pnge)
-	  {
-	    if( isEssentialChunk( type ) )
-	      throw pnge;
-	    return null;
-	  }
+        try
+          {
+            return getChunk( type, chkdata, crc );
+          }
+        catch(PNGException pnge)
+          {
+            if( isEssentialChunk( type ) )
+              throw pnge;
+            return null;
+          }
       }
   }
 
@@ -172,21 +172,21 @@ public class PNGChunk
     switch( type )
       {
       case TYPE_HEADER:
-	return new PNGHeader( type, data, crc );
+        return new PNGHeader( type, data, crc );
       case TYPE_DATA:
-	return new PNGData( type, data, crc );
+        return new PNGData( type, data, crc );
       case TYPE_PALETTE:
-	return new PNGPalette( type, data, crc );
+        return new PNGPalette( type, data, crc );
       case TYPE_TIME:
-	return new PNGTime( type, data, crc );
+        return new PNGTime( type, data, crc );
       case TYPE_PHYS:
-	return new PNGPhys( type, data, crc );
+        return new PNGPhys( type, data, crc );
       case TYPE_GAMMA:
-	return new PNGGamma( type, data, crc );
+        return new PNGGamma( type, data, crc );
       case TYPE_PROFILE:
-	return new PNGICCProfile( type, data, crc );
+        return new PNGICCProfile( type, data, crc );
       default:
-	return new PNGChunk( type, data, crc );
+        return new PNGChunk( type, data, crc );
       }
   }
 
@@ -201,9 +201,9 @@ public class PNGChunk
       case TYPE_DATA:
       case TYPE_PALETTE:
       case TYPE_END:
-	return true;
+        return true;
       default:
-	return false;
+        return false;
       }
   }
 
@@ -224,7 +224,7 @@ public class PNGChunk
   }
 
   /**
-   * Writes a PNG chunk to an output stream, 
+   * Writes a PNG chunk to an output stream,
    * performing the CRC calculation as well.
    */
   public void writeChunk(OutputStream out) throws IOException
@@ -267,7 +267,7 @@ public class PNGChunk
     byte[] t = getInt( type );
     for(int i = 0; i < 4; i++)
       c = crcTable[ (int)((c ^ t[i]) & 0xFF) ] ^ (c >> 8);
-      
+
     for(int i = 0; i < data.length; i++)
       c = crcTable[ (int)((c ^ data[i]) & 0xFF) ] ^ (c >> 8);
 
@@ -276,8 +276,8 @@ public class PNGChunk
 
   public String toString()
   {
-    return "PNG Chunk. Type: " + new String( getInt(type) ) + " , CRC: " + 
+    return "PNG Chunk. Type: " + new String( getInt(type) ) + " , CRC: " +
       crc + " , calculated CRC: "+calcCRC();
   }
-   
+
 }
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGData.java b/libjava/classpath/gnu/javax/imageio/png/PNGData.java
index 2a8f8aa2d55..08d765f66f0 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGData.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGData.java
@@ -43,8 +43,8 @@ import java.util.zip.Deflater;
 /**
  * A PNG IDAT (data) chunk.
  */
-public class PNGData extends PNGChunk 
-{ 
+public class PNGData extends PNGChunk
+{
   private int offset;
 
   protected PNGData( int type, byte[] data, int crc )
@@ -65,7 +65,7 @@ public class PNGData extends PNGChunk
    * @return true if the chunk is filled and no more data can be written,
    * false otherwise.
    */
-  public void deflateToChunk( Deflater def ) 
+  public void deflateToChunk( Deflater def )
   {
     offset += def.deflate( data, offset, data.length - offset );
   }
@@ -80,7 +80,7 @@ public class PNGData extends PNGChunk
 
   /**
    * Shrink the chunk to offset size, used for the last chunk in a stream
-   * (no trailing data!) 
+   * (no trailing data!)
    */
   public void shrink()
   {
@@ -92,7 +92,7 @@ public class PNGData extends PNGChunk
   /**
    * Feeds the data in the chunk to a ZIP inflater object.
    */
-  public void feedToInflater( Inflater inf ) 
+  public void feedToInflater( Inflater inf )
   {
     inf.setInput( data );
   }
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java b/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
index 652f59d35b5..4481107c4fd 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGDecoder.java
@@ -92,11 +92,11 @@ public class PNGDecoder
   {
     try
       {
-	return inflater.inflate( buf, offset, buf.length - offset);
+        return inflater.inflate( buf, offset, buf.length - offset);
       }
     catch(DataFormatException dfe)
       {
-	throw new PNGException("Error inflating data.");
+        throw new PNGException("Error inflating data.");
       }
   }
 
@@ -111,29 +111,29 @@ public class PNGDecoder
     chunk.feedToInflater( inflater );
     do
       {
-	if( readFilter )
-	  if( getBytes( filterType, 0 ) < 1 )
-	    return;
+        if( readFilter )
+          if( getBytes( filterType, 0 ) < 1 )
+            return;
 
-	n = getBytes( scanline, offset );
+        n = getBytes( scanline, offset );
 
-	if( offset + n < stride )
-	  {
-	    offset += n;
-	    readFilter = false;
-	  }
-	else
-	  {
-	    scanline = PNGFilter.unFilterScanline( filterType[0], scanline,
-						   lastScanline, bpp );
-	    System.arraycopy( scanline, 0,
-			      raster, currentScanline * stride, stride );
-	    lastScanline = scanline;
-	    scanline = new byte[scanline.length];
-	    currentScanline++;
-	    readFilter = true;
-	    offset = 0;
-	  }
+        if( offset + n < stride )
+          {
+            offset += n;
+            readFilter = false;
+          }
+        else
+          {
+            scanline = PNGFilter.unFilterScanline( filterType[0], scanline,
+                                                   lastScanline, bpp );
+            System.arraycopy( scanline, 0,
+                              raster, currentScanline * stride, stride );
+            lastScanline = scanline;
+            scanline = new byte[scanline.length];
+            currentScanline++;
+            readFilter = true;
+            offset = 0;
+          }
       }
     while( n > 0 && currentScanline < header.getHeight() );
   }
@@ -154,86 +154,86 @@ public class PNGDecoder
     switch( header.getColorType() )
       {
       case PNGHeader.GRAYSCALE_WITH_ALPHA:
-	if( depth == 8 )
-	  {
-	    t = DataBuffer.TYPE_BYTE;
-	    db = getByteBuffer();
-	  }
-	else
-	  { 
-	    t = DataBuffer.TYPE_USHORT;
-	    db = getShortBuffer();
-	  }
-	sm = new ComponentSampleModel(t, width, height, 2, width * 2,
-				      new int[]{0, 1});
-	break;
+        if( depth == 8 )
+          {
+            t = DataBuffer.TYPE_BYTE;
+            db = getByteBuffer();
+          }
+        else
+          {
+            t = DataBuffer.TYPE_USHORT;
+            db = getShortBuffer();
+          }
+        sm = new ComponentSampleModel(t, width, height, 2, width * 2,
+                                      new int[]{0, 1});
+        break;
 
       case PNGHeader.GRAYSCALE:
-	switch( depth )
-	  {
-	  case 16:
-	    sm = new ComponentSampleModel(DataBuffer.TYPE_USHORT, 
-					  width, height, 1, width,
-					  new int[]{ 0 });
-	    db = getShortBuffer();
-	    break;
-	    
-	  case 8:
-	    sm = new ComponentSampleModel(DataBuffer.TYPE_BYTE, 
-					  width, height, 1, width,
-					  new int[]{ 0 });
-	    db = getByteBuffer();
-	    break;
-	    
-	  default:
-	    sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-						 width, height, depth);
-	    db = getByteBuffer();
-	    break;
-	  }
-	break;
+        switch( depth )
+          {
+          case 16:
+            sm = new ComponentSampleModel(DataBuffer.TYPE_USHORT,
+                                          width, height, 1, width,
+                                          new int[]{ 0 });
+            db = getShortBuffer();
+            break;
+
+          case 8:
+            sm = new ComponentSampleModel(DataBuffer.TYPE_BYTE,
+                                          width, height, 1, width,
+                                          new int[]{ 0 });
+            db = getByteBuffer();
+            break;
+
+          default:
+            sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                                 width, height, depth);
+            db = getByteBuffer();
+            break;
+          }
+        break;
 
       case PNGHeader.RGB:
-	if( depth == 8 )
-	  {
-	    t = DataBuffer.TYPE_BYTE;
-	    db = getByteBuffer();
-	  }
-	else
-	  { 
-	    t = DataBuffer.TYPE_USHORT;
-	    db = getShortBuffer();
-	  }
-	sm = new ComponentSampleModel(t, width, height, 3, 3 * width,
-				      new int[]{0, 1, 2});
-	break;
+        if( depth == 8 )
+          {
+            t = DataBuffer.TYPE_BYTE;
+            db = getByteBuffer();
+          }
+        else
+          {
+            t = DataBuffer.TYPE_USHORT;
+            db = getShortBuffer();
+          }
+        sm = new ComponentSampleModel(t, width, height, 3, 3 * width,
+                                      new int[]{0, 1, 2});
+        break;
 
       case PNGHeader.RGB_WITH_ALPHA:
-	if( depth == 8 )
-	  {
-	    t = DataBuffer.TYPE_BYTE;
-	    db = getByteBuffer();
-	  }
-	else
-	  { 
-	    t = DataBuffer.TYPE_USHORT;
-	    db = getShortBuffer();
-	  }
-	
-	sm = new ComponentSampleModel(t, width, height, 4, width * 4,
-				      new int[]{0, 1, 2, 3});
-	break;
-	
+        if( depth == 8 )
+          {
+            t = DataBuffer.TYPE_BYTE;
+            db = getByteBuffer();
+          }
+        else
+          {
+            t = DataBuffer.TYPE_USHORT;
+            db = getShortBuffer();
+          }
+
+        sm = new ComponentSampleModel(t, width, height, 4, width * 4,
+                                      new int[]{0, 1, 2, 3});
+        break;
+
       case PNGHeader.INDEXED:
-	if( depth == 8 )
-	  sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-						width, height, 
-						new int[] {0xFF});
-	else
-	  sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE, 
-					       width, height, depth);
-	db = getByteBuffer();
-	break;
+        if( depth == 8 )
+          sm = new SinglePixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                                width, height,
+                                                new int[] {0xFF});
+        else
+          sm = new MultiPixelPackedSampleModel(DataBuffer.TYPE_BYTE,
+                                               width, height, depth);
+        db = getByteBuffer();
+        break;
       }
 
     return Raster.createWritableRaster(sm, db, null);
@@ -247,8 +247,8 @@ public class PNGDecoder
   {
     short[] data = new short[(raster.length >> 1)];
     for( int i = 0; i < data.length; i++ )
-      data[i] = (short)(((raster[i * 2] & 0xFF) << 8) | 
-			(raster[i * 2 + 1] & 0xFF));
+      data[i] = (short)(((raster[i * 2] & 0xFF) << 8) |
+                        (raster[i * 2 + 1] & 0xFF));
     return new DataBufferUShort( data, data.length );
   }
 
@@ -260,8 +260,8 @@ public class PNGDecoder
     return new DataBufferByte( raster, raster.length );
   }
 
-  public ColorModel getColorModel( ColorSpace cs, 
-				   int colorType, int depth )
+  public ColorModel getColorModel( ColorSpace cs,
+                                   int colorType, int depth )
   {
     int[] bits;
     boolean hasAlpha = false;
@@ -270,49 +270,49 @@ public class PNGDecoder
     switch( colorType )
       {
       case PNGHeader.GRAYSCALE_WITH_ALPHA:
-	if( cs == null )
-	  cs = ColorSpace.getInstance( ColorSpace.CS_GRAY );
-	hasAlpha = true;
-	bits = new int[]{ depth, depth };
-	break;
-	
+        if( cs == null )
+          cs = ColorSpace.getInstance( ColorSpace.CS_GRAY );
+        hasAlpha = true;
+        bits = new int[]{ depth, depth };
+        break;
+
       case PNGHeader.RGB:
-	bits = new int[]{ depth, depth, depth };
-	break;
+        bits = new int[]{ depth, depth, depth };
+        break;
 
       case PNGHeader.RGB_WITH_ALPHA:
-	hasAlpha = true;
-	bits = new int[]{ depth, depth, depth, depth };
-	break;
+        hasAlpha = true;
+        bits = new int[]{ depth, depth, depth, depth };
+        break;
 
       case PNGHeader.GRAYSCALE:
-	if( depth < 8 )
-	  return grayPalette( depth );
+        if( depth < 8 )
+          return grayPalette( depth );
 
-	if( cs == null )
-	  cs = ColorSpace.getInstance( ColorSpace.CS_GRAY );
-	bits = new int[]{ depth };
-	break;
+        if( cs == null )
+          cs = ColorSpace.getInstance( ColorSpace.CS_GRAY );
+        bits = new int[]{ depth };
+        break;
 
       default:
       case PNGHeader.INDEXED:
-	return null; // Handled by the palette chunk.
+        return null; // Handled by the palette chunk.
       }
 
     if( cs == null )
       cs = ColorSpace.getInstance( ColorSpace.CS_sRGB );
 
 
-    return new ComponentColorModel(cs, bits, hasAlpha, false, 
-				   (hasAlpha ? 
-				    ComponentColorModel.TRANSLUCENT : 
-				    ComponentColorModel.OPAQUE), 
-				   ((depth == 16) ? DataBuffer.TYPE_USHORT : 
-				    DataBuffer.TYPE_BYTE));
+    return new ComponentColorModel(cs, bits, hasAlpha, false,
+                                   (hasAlpha ?
+                                    ComponentColorModel.TRANSLUCENT :
+                                    ComponentColorModel.OPAQUE),
+                                   ((depth == 16) ? DataBuffer.TYPE_USHORT :
+                                    DataBuffer.TYPE_BYTE));
   }
 
   private IndexColorModel grayPalette(int depth)
-  { 
+  {
     byte[] c = new byte[ (1 << depth) ];
     for(int i = 0; i < c.length; i++)
       c[i] = (byte)(255.0 * (((double)i) / ((double)c.length - 1.0)));
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java b/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
index b8441c4e3f0..b317876355c 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGEncoder.java
@@ -49,7 +49,7 @@ import java.awt.image.DataBufferUShort;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 
-public class PNGEncoder 
+public class PNGEncoder
 {
   /**
    * The default data chunk size. 8 kb.
@@ -65,7 +65,7 @@ public class PNGEncoder
   public PNGEncoder( BufferedImage bi ) throws PNGException
   {
     ColorModel c = bi.getColorModel();
-    int width = bi.getWidth(); 
+    int width = bi.getWidth();
     int height = bi.getHeight();
     int depth = 0;
     int colorType;
@@ -73,49 +73,49 @@ public class PNGEncoder
 
     if( c instanceof IndexColorModel )
       {
-	colorType = PNGHeader.INDEXED;
-	int n = ((IndexColorModel)c).getMapSize();
-	if( n <= 2 )
-	  depth = 1;
-	else if( n <= 4 )
-	  depth = 2;
-	else if( n <= 16 )
-	  depth = 4;
-	else if( n <= 256 )
-	  depth = 8;
-	else
-	  throw new PNGException("Depth must be <= 8 bits for indexed color.");
-	palette = new PNGPalette( ((IndexColorModel)c) );
+        colorType = PNGHeader.INDEXED;
+        int n = ((IndexColorModel)c).getMapSize();
+        if( n <= 2 )
+          depth = 1;
+        else if( n <= 4 )
+          depth = 2;
+        else if( n <= 16 )
+          depth = 4;
+        else if( n <= 256 )
+          depth = 8;
+        else
+          throw new PNGException("Depth must be <= 8 bits for indexed color.");
+        palette = new PNGPalette( ((IndexColorModel)c) );
       }
     else
-      { 
-	ColorSpace cs = c.getColorSpace();
-	ColorSpace grayCS = ColorSpace.getInstance( ColorSpace.CS_GRAY );
-	if( cs == grayCS || bi.getType() == BufferedImage.TYPE_BYTE_GRAY 
-	    || bi.getType() == BufferedImage.TYPE_USHORT_GRAY )
-	  colorType = c.hasAlpha() ? PNGHeader.GRAYSCALE_WITH_ALPHA : 
-	    PNGHeader.GRAYSCALE;
-	else
-	  colorType = c.hasAlpha() ? PNGHeader.RGB_WITH_ALPHA : PNGHeader.RGB;
-	// Figure out the depth
-	int[] bits = c.getComponentSize();
-	depth = bits[0];
-	for(int i = 1; i < bits.length; i++ )
-	  if( bits[i] > depth ) depth = bits[i];
-	if( (cs != grayCS && !cs.isCS_sRGB()) && cs instanceof ICC_ColorSpace )
-	  profile = new PNGICCProfile( ((ICC_ColorSpace)cs).getProfile() );
+      {
+        ColorSpace cs = c.getColorSpace();
+        ColorSpace grayCS = ColorSpace.getInstance( ColorSpace.CS_GRAY );
+        if( cs == grayCS || bi.getType() == BufferedImage.TYPE_BYTE_GRAY
+            || bi.getType() == BufferedImage.TYPE_USHORT_GRAY )
+          colorType = c.hasAlpha() ? PNGHeader.GRAYSCALE_WITH_ALPHA :
+            PNGHeader.GRAYSCALE;
+        else
+          colorType = c.hasAlpha() ? PNGHeader.RGB_WITH_ALPHA : PNGHeader.RGB;
+        // Figure out the depth
+        int[] bits = c.getComponentSize();
+        depth = bits[0];
+        for(int i = 1; i < bits.length; i++ )
+          if( bits[i] > depth ) depth = bits[i];
+        if( (cs != grayCS && !cs.isCS_sRGB()) && cs instanceof ICC_ColorSpace )
+          profile = new PNGICCProfile( ((ICC_ColorSpace)cs).getProfile() );
       }
 
     header = new PNGHeader(width, height, depth, colorType, interlace);
 
-    stride = header.getScanlineStride(); // scanline stride 
+    stride = header.getScanlineStride(); // scanline stride
     bpp = header.bytesPerPixel(); // bytes per pixel
     getRawData( bi );
   }
 
   /**
    * Returns the generated header.
-   */ 
+   */
   public PNGHeader getHeader()
   {
     return header;
@@ -123,7 +123,7 @@ public class PNGEncoder
 
   /**
    * Returns the generated palette.
-   */ 
+   */
   public PNGPalette getPalette()
   {
     return palette;
@@ -131,7 +131,7 @@ public class PNGEncoder
 
   /**
    * Returns the associated ICC profile, if any.
-   */ 
+   */
   public PNGICCProfile getProfile()
   {
     return profile;
@@ -151,29 +151,29 @@ public class PNGEncoder
     byte filterByte = PNGFilter.FILTER_NONE;
     for( int i = 0; i < header.getHeight(); i++)
       {
-	byte[] scanline = new byte[ stride ]; 
-	System.arraycopy(rawData, (i * stride), scanline, 0, stride);
-	if( useFilter && i > 0)
-	  filterByte = PNGFilter.chooseFilter( scanline, lastScanline, bpp);
-	
-	byte[] filtered = PNGFilter.filterScanline( filterByte, scanline, 
-						    lastScanline, bpp );
-	data[i * (stride + 1)] = filterByte;
-	System.arraycopy(filtered, 0, data, 1 + (i * (stride + 1)), stride);
+        byte[] scanline = new byte[ stride ];
+        System.arraycopy(rawData, (i * stride), scanline, 0, stride);
+        if( useFilter && i > 0)
+          filterByte = PNGFilter.chooseFilter( scanline, lastScanline, bpp);
 
-	lastScanline = scanline;
+        byte[] filtered = PNGFilter.filterScanline( filterByte, scanline,
+                                                    lastScanline, bpp );
+        data[i * (stride + 1)] = filterByte;
+        System.arraycopy(filtered, 0, data, 1 + (i * (stride + 1)), stride);
+
+        lastScanline = scanline;
       }
 
-    deflater.setInput( data ); 
+    deflater.setInput( data );
     deflater.finish();
 
     PNGData chunk;
     Vector chunks = new Vector();
     do
       {
-	chunk = new PNGData( defaultChunkSize );
-	chunk.deflateToChunk( deflater );
-	chunks.add( chunk );
+        chunk = new PNGData( defaultChunkSize );
+        chunk.deflateToChunk( deflater );
+        chunks.add( chunk );
       }
     while( chunk.chunkFull() );
     chunk.shrink(); // Shrink the last chunk.
@@ -190,28 +190,28 @@ public class PNGEncoder
     rawData = new byte[ stride * header.getHeight() ];
     if( header.isIndexed() )
       {
-	DataBuffer db = raster.getDataBuffer();
-	if( !( db instanceof DataBufferByte ) )
-	  throw new PNGException("Unexpected DataBuffer for an IndexColorModel.");
-	byte[] data = ((DataBufferByte)db).getData();
-	for(int i = 0; i < header.getHeight(); i++ )
-	  System.arraycopy( data, i * stride, rawData, i * stride, stride );
-	return;
+        DataBuffer db = raster.getDataBuffer();
+        if( !( db instanceof DataBufferByte ) )
+          throw new PNGException("Unexpected DataBuffer for an IndexColorModel.");
+        byte[] data = ((DataBufferByte)db).getData();
+        for(int i = 0; i < header.getHeight(); i++ )
+          System.arraycopy( data, i * stride, rawData, i * stride, stride );
+        return;
       }
 
     if( header.getDepth() == 16 )
       {
-	DataBuffer db = raster.getDataBuffer();
-	if( !( db instanceof DataBufferUShort ) )
-	  throw new PNGException("Unexpected DataBuffer for 16-bit.");
-	short[] data = ((DataBufferUShort)db).getData();
-	for(int i = 0; i < header.getHeight(); i++ )
-	  for(int j = 0; j < ( stride >> 1); j++)
-	    {
-	      rawData[ j * 2 + i * stride ] = (byte)((data[j + i * (stride >> 1 )] & 0xFF00) >> 8);
-	      rawData[ j * 2 + i * stride + 1 ] = (byte)(data[j + i * (stride >> 1 )] & 0xFF);
-	    }
-	return;
+        DataBuffer db = raster.getDataBuffer();
+        if( !( db instanceof DataBufferUShort ) )
+          throw new PNGException("Unexpected DataBuffer for 16-bit.");
+        short[] data = ((DataBufferUShort)db).getData();
+        for(int i = 0; i < header.getHeight(); i++ )
+          for(int j = 0; j < ( stride >> 1); j++)
+            {
+              rawData[ j * 2 + i * stride ] = (byte)((data[j + i * (stride >> 1 )] & 0xFF00) >> 8);
+              rawData[ j * 2 + i * stride + 1 ] = (byte)(data[j + i * (stride >> 1 )] & 0xFF);
+            }
+        return;
       }
 
     int size = ( header.getColorType() == PNGHeader.RGB_WITH_ALPHA ) ? 4 : 3;
@@ -221,13 +221,13 @@ public class PNGEncoder
 
     for( int i = 0; i < width * height; i++ )
       {
-	rawData[ i * size ] = (byte)((pixels[i] & 0xFF0000) >> 16);
-	rawData[ i * size + 1 ] = (byte)((pixels[i] & 0xFF00) >> 8);
-	rawData[ i * size + 2 ] = (byte)(pixels[i] & 0xFF);
+        rawData[ i * size ] = (byte)((pixels[i] & 0xFF0000) >> 16);
+        rawData[ i * size + 1 ] = (byte)((pixels[i] & 0xFF00) >> 8);
+        rawData[ i * size + 2 ] = (byte)(pixels[i] & 0xFF);
       }
 
     if( size == 4 )
       for( int i = 0; i < width * height; i++ )
-	rawData[ i * size + 3 ] = (byte)((pixels[i] & 0xFF000000) >> 24);
+        rawData[ i * size + 3 ] = (byte)((pixels[i] & 0xFF000000) >> 24);
   }
 }
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGException.java b/libjava/classpath/gnu/javax/imageio/png/PNGException.java
index 67486e57971..ef5342cf8f7 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGException.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGException.java
@@ -1,4 +1,4 @@
-/* PNGException.java -- 
+/* PNGException.java --
    Copyright (C) 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package gnu.javax.imageio.png;
 
 import java.io.IOException;
 
-public class PNGException extends IOException 
+public class PNGException extends IOException
 {
   public PNGException(String msg)
   {
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGFile.java b/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
index 96e8f9ce78f..76154cc6633 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGFile.java
@@ -46,7 +46,7 @@ import java.awt.image.WritableRaster;
 import java.awt.image.ColorModel;
 import java.awt.color.ColorSpace;
 
-public class PNGFile 
+public class PNGFile
 {
   /**
    * The PNG file signature.
@@ -59,7 +59,7 @@ public class PNGFile
    * 0 bytes of length, the "IEND" tag and its CRC.
    */
   private static final byte[] endChunk = new byte[]
-  { 0, 0, 0, 0, (byte)0x49, (byte)0x45, (byte)0x4E, (byte)0x44, 
+  { 0, 0, 0, 0, (byte)0x49, (byte)0x45, (byte)0x4E, (byte)0x44,
     (byte)0xAE, (byte)0x42, (byte)0x60, (byte)0x82 };
 
   /**
@@ -91,7 +91,7 @@ public class PNGFile
    * The encoder, if any. (Either this or the above must exist).
    */
   private PNGEncoder encoder;
-  
+
   /**
    * The source of this PNG (if encoding)
    */
@@ -104,7 +104,7 @@ public class PNGFile
   {
     PNGChunk chunk;
     byte[] fileHdr = new byte[8];
-    chunks = new Vector(); 
+    chunks = new Vector();
     hasPalette = false;
 
     if( in.read( fileHdr ) != 8 )
@@ -124,24 +124,24 @@ public class PNGFile
     // Read chunks.
     do
       {
-	chunk = PNGChunk.readChunk( in, false );
-	/*
-	 * We could exit here or output some kind of warning.
-	 * But in the meantime, we'll just silently drop invalid chunks.
-	 */
-	if( chunk.isValidChunk() )
-	  {
-	    if( chunk instanceof PNGData )
-	      decoder.addData( (PNGData)chunk );
-	    else // Silently ignore multiple headers, and use only the first.
-	      if( chunk.getType() != PNGChunk.TYPE_END )
-		{
-		  chunks.add( chunk ); 
-		  hasPalette |= ( chunk instanceof PNGPalette );
-		}
-	  }
-	else
-	  System.out.println("WARNING: Invalid chunk!");
+        chunk = PNGChunk.readChunk( in, false );
+        /*
+         * We could exit here or output some kind of warning.
+         * But in the meantime, we'll just silently drop invalid chunks.
+         */
+        if( chunk.isValidChunk() )
+          {
+            if( chunk instanceof PNGData )
+              decoder.addData( (PNGData)chunk );
+            else // Silently ignore multiple headers, and use only the first.
+              if( chunk.getType() != PNGChunk.TYPE_END )
+                {
+                  chunks.add( chunk );
+                  hasPalette |= ( chunk instanceof PNGPalette );
+                }
+          }
+        else
+          System.out.println("WARNING: Invalid chunk!");
       }
     while( chunk.getType() != PNGChunk.TYPE_END );
 
@@ -163,7 +163,7 @@ public class PNGFile
     chunks = new Vector();
     encoder = new PNGEncoder( bi );
     header = encoder.getHeader();
-    if( header.isIndexed() ) 
+    if( header.isIndexed() )
       chunks.add( encoder.getPalette() );
 
     // Do the compression and put the data chunks in the list.
@@ -179,8 +179,8 @@ public class PNGFile
     header.writeChunk( out );
     for( int i = 0; i < chunks.size(); i++ )
       {
-	PNGChunk chunk = ((PNGChunk)chunks.elementAt(i));
-	chunk.writeChunk( out );
+        PNGChunk chunk = ((PNGChunk)chunks.elementAt(i));
+        chunk.writeChunk( out );
       }
     out.write( endChunk );
   }
@@ -194,7 +194,7 @@ public class PNGFile
       return false;
     for( int i = 0; i < 8; i++ )
       if( signature[i] != hdr[i] )
-	return false;
+        return false;
     return true;
   }
 
@@ -210,16 +210,16 @@ public class PNGFile
     ColorModel cm;
     if( header.isIndexed() )
       {
-	PNGPalette pngp = getPalette();
-	cm = pngp.getPalette( getColorSpace() );
+        PNGPalette pngp = getPalette();
+        cm = pngp.getPalette( getColorSpace() );
       }
     else
-      cm = decoder.getColorModel( getColorSpace(), 
-				  header.getColorType(), 
-				  header.getDepth() );
-    
+      cm = decoder.getColorModel( getColorSpace(),
+                                  header.getColorType(),
+                                  header.getDepth() );
+
     return new BufferedImage(cm, r, false, null);
-  } 
+  }
 
   /**
    * Find the palette chunk and return it
@@ -228,7 +228,7 @@ public class PNGFile
   {
     for(int i = 0; i < chunks.size(); i++ )
       if( chunks.elementAt(i) instanceof PNGPalette )
-	return ((PNGPalette)chunks.elementAt(i));
+        return ((PNGPalette)chunks.elementAt(i));
     return null;
   }
 
@@ -242,10 +242,10 @@ public class PNGFile
     PNGGamma gamma = null;
     for(int i = 0; i < chunks.size(); i++ )
       {
-	if( chunks.elementAt(i) instanceof PNGICCProfile )
-	  icc = ((PNGICCProfile)chunks.elementAt(i));
-	else if(chunks.elementAt(i) instanceof PNGGamma )
-	  gamma = ((PNGGamma)chunks.elementAt(i));
+        if( chunks.elementAt(i) instanceof PNGICCProfile )
+          icc = ((PNGICCProfile)chunks.elementAt(i));
+        else if(chunks.elementAt(i) instanceof PNGGamma )
+          gamma = ((PNGGamma)chunks.elementAt(i));
       }
 
     if( icc != null )
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGFilter.java b/libjava/classpath/gnu/javax/imageio/png/PNGFilter.java
index 63af1992932..9be7b9127cb 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGFilter.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGFilter.java
@@ -58,16 +58,16 @@ public class PNGFilter
     switch( header.getColorType() )
       {
       case PNGHeader.INDEXED:
-	return false;
-	
+        return false;
+
       case PNGHeader.GRAYSCALE:
       case PNGHeader.RGB:
-	if( header.bytesPerPixel() <= 1 )
-	  return false;
+        if( header.bytesPerPixel() <= 1 )
+          return false;
       case PNGHeader.GRAYSCALE_WITH_ALPHA:
       case PNGHeader.RGB_WITH_ALPHA:
       default:
-	return true;
+        return true;
       }
   }
 
@@ -76,20 +76,20 @@ public class PNGFilter
    * suggested in the PNG spec.
    * @return a fiter type.
    */
-  public static byte chooseFilter( byte[] scanline, byte[] lastScanline, 
-				  int bpp)
-    
+  public static byte chooseFilter( byte[] scanline, byte[] lastScanline,
+                                  int bpp)
+
   {
     long[] values = new long[5];
     int idx = 0;
     for( int i = 0; i < 5; i++ )
       {
-	byte[] filtered = filterScanline((byte)i, scanline, lastScanline, bpp);
-	values[i] = 0;
-	for(int j = 0; j < filtered.length; j++ )
-	  values[i] += (int)(filtered[j] & 0xFF);
-	if( values[ idx ] > values[i] )
-	  idx = i;
+        byte[] filtered = filterScanline((byte)i, scanline, lastScanline, bpp);
+        values[i] = 0;
+        for(int j = 0; j < filtered.length; j++ )
+          values[i] += (int)(filtered[j] & 0xFF);
+        if( values[ idx ] > values[i] )
+          idx = i;
       }
     return (byte)idx;
   }
@@ -97,69 +97,69 @@ public class PNGFilter
   /**
    * Filter a scanline.
    */
-  public static byte[] filterScanline( byte filtertype, byte[] scanline, 
-				       byte[] lastScanline, int bpp)
+  public static byte[] filterScanline( byte filtertype, byte[] scanline,
+                                       byte[] lastScanline, int bpp)
   {
     int stride = scanline.length;
     byte[] out = new byte[ stride ];
     switch( filtertype )
       {
       case FILTER_SUB:
-	for( int i = 0; i < bpp; i++)
-	  out[ i ] = scanline[ i ];
-	
-	for( int i = bpp; i < stride; i++ )
-	  out[i] = (byte)(scanline[ i ] - 
-			  scanline[ i - bpp ]);
-	break;
+        for( int i = 0; i < bpp; i++)
+          out[ i ] = scanline[ i ];
+
+        for( int i = bpp; i < stride; i++ )
+          out[i] = (byte)(scanline[ i ] -
+                          scanline[ i - bpp ]);
+        break;
 
       case FILTER_UP:
-	for( int i = 0; i < stride; i++ )
-	  out[ i ] = (byte)(scanline[ i ] - lastScanline[ i ]);
-	break;
+        for( int i = 0; i < stride; i++ )
+          out[ i ] = (byte)(scanline[ i ] - lastScanline[ i ]);
+        break;
 
       case FILTER_AVERAGE:
-	for( int i = 0; i < bpp; i++)
-	  out[ i ] = (byte)((scanline[ i ] & 0xFF) - ((lastScanline[ i ] & 0xFF) >> 1));
-	for( int i = bpp; i < stride; i++ )
-	  out[ i ] = (byte)((scanline[ i ] & 0xFF) - 
-			    (((scanline[ i - bpp ] & 0xFF) + 
-			      (lastScanline[ i ] & 0xFF)) >> 1));
-	break;
+        for( int i = 0; i < bpp; i++)
+          out[ i ] = (byte)((scanline[ i ] & 0xFF) - ((lastScanline[ i ] & 0xFF) >> 1));
+        for( int i = bpp; i < stride; i++ )
+          out[ i ] = (byte)((scanline[ i ] & 0xFF) -
+                            (((scanline[ i - bpp ] & 0xFF) +
+                              (lastScanline[ i ] & 0xFF)) >> 1));
+        break;
 
       case FILTER_PAETH:
-	for( int i = 0; i < stride; i++ )
-	  {
-	    int x;
-	    {
-	      int a, b, c;
-	      if( i >= bpp )
-		{
-		  a = (scanline[ i - bpp ] & 0xFF); // left
-		  c = (lastScanline[ i - bpp ] & 0xFF); // upper-left
-		}
-	      else
-		a = c = 0;
-	      b = (lastScanline[ i ] & 0xFF); // up
-	      
-	      int p = (a + b - c);        // initial estimate
-	      // distances to a, b, c
-	      int pa = (p > a) ? p - a : a - p; 
-	      int pb = (p > b) ? p - b : b - p; 
-	      int pc = (p > c) ? p - c : c - p; 
-	      // return nearest of a,b,c,
-	      // breaking ties in order a,b,c.
-	      if( pa <= pb && pa <= pc ) x = a;
-	      else { if( pb <= pc ) x = b;
-		else x = c;
-	      }
-	    }
-	    out[ i ] = (byte)(scanline[ i ] - x);
-	  }
-	break;
+        for( int i = 0; i < stride; i++ )
+          {
+            int x;
+            {
+              int a, b, c;
+              if( i >= bpp )
+                {
+                  a = (scanline[ i - bpp ] & 0xFF); // left
+                  c = (lastScanline[ i - bpp ] & 0xFF); // upper-left
+                }
+              else
+                a = c = 0;
+              b = (lastScanline[ i ] & 0xFF); // up
+
+              int p = (a + b - c);        // initial estimate
+              // distances to a, b, c
+              int pa = (p > a) ? p - a : a - p;
+              int pb = (p > b) ? p - b : b - p;
+              int pc = (p > c) ? p - c : c - p;
+              // return nearest of a,b,c,
+              // breaking ties in order a,b,c.
+              if( pa <= pb && pa <= pc ) x = a;
+              else { if( pb <= pc ) x = b;
+                else x = c;
+              }
+            }
+            out[ i ] = (byte)(scanline[ i ] - x);
+          }
+        break;
       default:
       case FILTER_NONE:
-	return scanline;
+        return scanline;
       }
     return out;
   }
@@ -167,8 +167,8 @@ public class PNGFilter
   /**
    * Unfilter a scanline.
    */
-  public static byte[] unFilterScanline( int filtertype, byte[] scanline, 
-					 byte[] lastScanline, int bpp)
+  public static byte[] unFilterScanline( int filtertype, byte[] scanline,
+                                         byte[] lastScanline, int bpp)
   {
     int stride = scanline.length;
     byte[] out = new byte[ stride ];
@@ -176,62 +176,62 @@ public class PNGFilter
       {
 
       case FILTER_NONE:
-	System.arraycopy( scanline, 0, out, 0, stride );
-	break;
-	
+        System.arraycopy( scanline, 0, out, 0, stride );
+        break;
+
       case FILTER_SUB:
-	for( int i = 0; i < bpp; i++)
-	  out[ i ] = scanline[ i ];
-	
-	for( int i = bpp; i < stride; i++ )
-	  out[ i ] = (byte)(scanline[ i ] + 
-			    out[ i - bpp ]);
-	break;
+        for( int i = 0; i < bpp; i++)
+          out[ i ] = scanline[ i ];
+
+        for( int i = bpp; i < stride; i++ )
+          out[ i ] = (byte)(scanline[ i ] +
+                            out[ i - bpp ]);
+        break;
 
       case FILTER_UP:
-	for( int i = 0; i < stride; i++ )
-	  out[ i ] = (byte)(scanline[ i ] + lastScanline[ i ]);
-	break;
+        for( int i = 0; i < stride; i++ )
+          out[ i ] = (byte)(scanline[ i ] + lastScanline[ i ]);
+        break;
 
       case FILTER_AVERAGE:
-	for( int i = 0; i < bpp; i++)
-	  out[ i ] = (byte)((scanline[ i ] & 0xFF) + ((lastScanline[ i ] & 0xFF) >> 1));
-	for( int i = bpp; i < stride; i++ )
-	  out[ i ] = (byte)((scanline[ i ] & 0xFF) + 
-			    (((out[ i - bpp ] & 0xFF) + (lastScanline[ i ] & 0xFF)) >> 1));
-	break;
+        for( int i = 0; i < bpp; i++)
+          out[ i ] = (byte)((scanline[ i ] & 0xFF) + ((lastScanline[ i ] & 0xFF) >> 1));
+        for( int i = bpp; i < stride; i++ )
+          out[ i ] = (byte)((scanline[ i ] & 0xFF) +
+                            (((out[ i - bpp ] & 0xFF) + (lastScanline[ i ] & 0xFF)) >> 1));
+        break;
 
       case FILTER_PAETH:
-	for( int i = 0; i < stride; i++ )
-	  {
-	    int x;
-	    {
-	      int a, b, c;
-	      if( i >= bpp )
-		{
-		  a = (out[ i - bpp ] & 0xFF); // left
-		  c = (lastScanline[ i - bpp ] & 0xFF); // upper-left
-		}
-	      else
-		a = c = 0;
-	      b = (lastScanline[ i ] & 0xFF); // up
-	      
-	      int p = (a + b - c);        // initial estimate
-	      // distances to a, b, c
-	      int pa = (p > a) ? p - a : a - p; 
-	      int pb = (p > b) ? p - b : b - p; 
-	      int pc = (p > c) ? p - c : c - p; 
-	      // return nearest of a,b,c,
-	      // breaking ties in order a,b,c.
-	      if( pa <= pb && pa <= pc ) x = a;
-	      else { if( pb <= pc ) x = b;
-		else x = c;
-	      }
-	    }
-	    out[ i ] = (byte)(scanline[ i ] + x);
-	  }
-	break;
+        for( int i = 0; i < stride; i++ )
+          {
+            int x;
+            {
+              int a, b, c;
+              if( i >= bpp )
+                {
+                  a = (out[ i - bpp ] & 0xFF); // left
+                  c = (lastScanline[ i - bpp ] & 0xFF); // upper-left
+                }
+              else
+                a = c = 0;
+              b = (lastScanline[ i ] & 0xFF); // up
+
+              int p = (a + b - c);        // initial estimate
+              // distances to a, b, c
+              int pa = (p > a) ? p - a : a - p;
+              int pb = (p > b) ? p - b : b - p;
+              int pc = (p > c) ? p - c : c - p;
+              // return nearest of a,b,c,
+              // breaking ties in order a,b,c.
+              if( pa <= pb && pa <= pc ) x = a;
+              else { if( pb <= pc ) x = b;
+                else x = c;
+              }
+            }
+            out[ i ] = (byte)(scanline[ i ] + x);
+          }
+        break;
       }
     return out;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java b/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
index d9cacea4609..b9c3f21c390 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGGamma.java
@@ -42,8 +42,8 @@ import java.awt.color.ColorSpace;
 /**
  * A PNG gAMA (gamma) chunk.
  */
-public class PNGGamma extends PNGChunk 
-{ 
+public class PNGGamma extends PNGChunk
+{
   private double gamma;
 
   protected PNGGamma( int type, byte[] data, int crc ) throws PNGException
@@ -51,10 +51,10 @@ public class PNGGamma extends PNGChunk
     super( type, data, crc );
     if( data.length < 4 )
       throw new PNGException("Unexpectedly short time chunk. ("+data.length+" bytes)");
-    long g = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) | 
+    long g = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
     gamma = (double)g;
-    gamma = 100000.0/gamma; 
+    gamma = 100000.0/gamma;
   }
 
   public PNGGamma( double g )
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGHeader.java b/libjava/classpath/gnu/javax/imageio/png/PNGHeader.java
index c9ef2dc37fe..115e503110a 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGHeader.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGHeader.java
@@ -40,8 +40,8 @@ package gnu.javax.imageio.png;
 /**
  * A PNG Header chunk.
  */
-public class PNGHeader extends PNGChunk 
-{ 
+public class PNGHeader extends PNGChunk
+{
   private int width, height, depth;
   private int colorType, compression, filter, interlace;
 
@@ -68,11 +68,11 @@ public class PNGHeader extends PNGChunk
     super( type, data, crc );
     if( data.length < 13 )
       throw new PNGException("Unexpectedly short header chunk. (" + data.length
-			     + " bytes)");
+                             + " bytes)");
 
-    width = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) | 
+    width = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
-    height = ((data[4] & 0xFF) << 24) | ( (data[5] & 0xFF) << 16 ) | 
+    height = ((data[4] & 0xFF) << 24) | ( (data[5] & 0xFF) << 16 ) |
       ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
     depth = (data[8] & 0xFF);
     colorType = (data[9] & 0xFF);
@@ -85,8 +85,8 @@ public class PNGHeader extends PNGChunk
    * Create a PNG header chunk.
    * Warning: This trusts that the parameters are valid.
    */
-  public PNGHeader(int width, int height, int depth, 
-		   int colorType, boolean interlace)
+  public PNGHeader(int width, int height, int depth,
+                   int colorType, boolean interlace)
   {
     super( TYPE_HEADER );
     data = new byte[ 13 ];
@@ -101,8 +101,8 @@ public class PNGHeader extends PNGChunk
     // Build the data chunk.
     byte[] a = getInt( width );
     byte[] b = getInt( height );
-    data[0] = a[0]; data[1] = a[1]; data[2] = a[2]; data[3] = a[3]; 
-    data[4] = b[0]; data[5] = b[1]; data[6] = b[2]; data[7] = b[3]; 
+    data[0] = a[0]; data[1] = a[1]; data[2] = a[2]; data[3] = a[3];
+    data[4] = b[0]; data[5] = b[1]; data[6] = b[2]; data[7] = b[3];
     data[8] = (byte)depth;
     data[9] = (byte)colorType;
     data[10] = (byte)compression;
@@ -125,14 +125,14 @@ public class PNGHeader extends PNGChunk
     if( (colorType & 0xFFFFFFF8) != 0 || colorType == 5 || colorType == 1)
       return false;
     // Possible valid depths are 1,2,4,8,16
-    if( !((depth == 1) || (depth == 2) || (depth == 4) || 
-	(depth == 8) || (depth == 16)) )
+    if( !((depth == 1) || (depth == 2) || (depth == 4) ||
+        (depth == 8) || (depth == 16)) )
       return false;
     if( colorType == INDEXED && depth == 16 )
       return false;
-    if( ( colorType == RGB || colorType == GRAYSCALE_WITH_ALPHA || 
-	  colorType == RGB_WITH_ALPHA ) &&
-	depth < 8 )
+    if( ( colorType == RGB || colorType == GRAYSCALE_WITH_ALPHA ||
+          colorType == RGB_WITH_ALPHA ) &&
+        depth < 8 )
       return false;
     // Only compression and filter methods zero are defined
     if( compression != 0 || filter != 0 )
@@ -153,7 +153,7 @@ public class PNGHeader extends PNGChunk
   }
 
   /**
-   * Returns true if this PNG is grayscale 
+   * Returns true if this PNG is grayscale
    */
   public boolean isGrayscale()
   {
@@ -176,7 +176,7 @@ public class PNGHeader extends PNGChunk
     return (interlace != 0);
   }
 
-  /** 
+  /**
    * Returns the number of bytes per pixel.
    */
   public int bytesPerPixel()
@@ -184,18 +184,18 @@ public class PNGHeader extends PNGChunk
     switch( colorType )
       {
       case GRAYSCALE_WITH_ALPHA:
-	return ((depth * 2) >> 3);
+        return ((depth * 2) >> 3);
       case RGB:
-	return ((depth * 3) >> 3);
+        return ((depth * 3) >> 3);
       case RGB_WITH_ALPHA:
-	return ((depth * 4) >> 3);
+        return ((depth * 4) >> 3);
 
       default:
       case GRAYSCALE:
       case INDEXED:
-	int i = (depth >> 3);
-	if( i > 0 ) return i;
-	return 1; // if bytes per pixel < 1, return 1 anyway.
+        int i = (depth >> 3);
+        if( i > 0 ) return i;
+        return 1; // if bytes per pixel < 1, return 1 anyway.
       }
   }
 
@@ -208,20 +208,20 @@ public class PNGHeader extends PNGChunk
     switch( colorType )
       {
       case GRAYSCALE:
-	nBits = width * depth;
-	break;
+        nBits = width * depth;
+        break;
       case RGB:
-	nBits = width * depth * 3;
-	break;
+        nBits = width * depth * 3;
+        break;
       case INDEXED:
-	nBits = depth * width;
-	break;
+        nBits = depth * width;
+        break;
       case GRAYSCALE_WITH_ALPHA:
-	nBits = depth * width * 2;
-	break;
+        nBits = depth * width * 2;
+        break;
       case RGB_WITH_ALPHA:
-	nBits = depth * width * 4;
-	break;
+        nBits = depth * width * 4;
+        break;
       }
     // Round up number of bits to the nearest byte
     if( (nBits & 0x07) != 0 )
@@ -232,17 +232,17 @@ public class PNGHeader extends PNGChunk
 
   public int getWidth()
   {
-    return width; 
+    return width;
   }
-  
+
   public int getHeight()
-  { 
-    return height; 
+  {
+    return height;
   }
 
   public int getDepth()
-  { 
-    return depth; 
+  {
+    return depth;
   }
 
   /**
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGICCProfile.java b/libjava/classpath/gnu/javax/imageio/png/PNGICCProfile.java
index b6dc21e19cd..9ecea716608 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGICCProfile.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGICCProfile.java
@@ -49,14 +49,14 @@ import java.util.zip.Deflater;
 /**
  * A PNG iCCP (ICC Profile) chunk.
  */
-public class PNGICCProfile extends PNGChunk 
-{ 
+public class PNGICCProfile extends PNGChunk
+{
   private String name;
   private ICC_Profile profile;
   // A generic profile name to use "ICC Profile"
   private static final byte[] genericName = new byte[]
   { 0x49, 0x43, 0x43, 0x20, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65 };
-  
+
   protected PNGICCProfile( int type, byte[] data, int crc ) throws PNGException
   {
     super( type, data, crc );
@@ -66,23 +66,23 @@ public class PNGICCProfile extends PNGChunk
 
     try
       {
-	name = new String(data, 0, i, "8859_1");
+        name = new String(data, 0, i, "8859_1");
       }
     catch(UnsupportedEncodingException e)
       {
-	name = ""; // shouldn't really happen.
+        name = ""; // shouldn't really happen.
       }
     if( data[i++] != 0 )
       throw new PNGException("Can't handle nonzero compression types with iCCP chunks.");
     try
       {
-	ByteArrayInputStream bos = new ByteArrayInputStream( data, i, 
-							     data.length - i );
-	profile = ICC_Profile.getInstance( new InflaterInputStream( bos ) );
+        ByteArrayInputStream bos = new ByteArrayInputStream( data, i,
+                                                             data.length - i );
+        profile = ICC_Profile.getInstance( new InflaterInputStream( bos ) );
       }
     catch(IOException ioe)
       {
-	throw new PNGException("Couldn't read iCCP profile chunk.");
+        throw new PNGException("Couldn't read iCCP profile chunk.");
       }
     System.out.println("Got profile:"+profile);
   }
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGImageReader.java b/libjava/classpath/gnu/javax/imageio/png/PNGImageReader.java
index 64aa3fea5af..3209baa2688 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGImageReader.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGImageReader.java
@@ -162,9 +162,9 @@ public class PNGImageReader
    *
    * @see ImageReader#setInput(Object, boolean, boolean)
    */
-  public void setInput(Object input, 
-                       boolean seekForwardOnly, 
-                       boolean ignoreMetadata) 
+  public void setInput(Object input,
+                       boolean seekForwardOnly,
+                       boolean ignoreMetadata)
   {
     super.setInput(input, seekForwardOnly, ignoreMetadata);
     if (! (input instanceof InputStream || input instanceof ImageInputStream))
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGPalette.java b/libjava/classpath/gnu/javax/imageio/png/PNGPalette.java
index 478129df54e..197cad8461a 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGPalette.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGPalette.java
@@ -43,8 +43,8 @@ import java.awt.image.IndexColorModel;
 /**
  * A PNG Palette chunk.
  */
-public class PNGPalette extends PNGChunk 
-{ 
+public class PNGPalette extends PNGChunk
+{
   private int[] red,green,blue;
 
   protected PNGPalette( int type, byte[] data, int crc ) throws PNGException
@@ -62,9 +62,9 @@ public class PNGPalette extends PNGChunk
     blue = new int[ nEntries ];
     for( int i = 0; i < nEntries; i++ )
       {
-	red[i] = (data[ i * 3 ] & 0xFF);
-	green[i] = (data[ i * 3 + 1 ] & 0xFF);
-	blue[i] = (data[ i * 3 + 2] & 0xFF);
+        red[i] = (data[ i * 3 ] & 0xFF);
+        green[i] = (data[ i * 3 + 1 ] & 0xFF);
+        blue[i] = (data[ i * 3 + 2] & 0xFF);
       }
   }
 
@@ -78,9 +78,9 @@ public class PNGPalette extends PNGChunk
     blue = new int[ n ];
     for(int i = 0; i < n; i++ )
       {
-	red[i] = data[i * 3] = (byte)cm.getRed(i);
-	green[i] = data[i * 3 + 1] = (byte)cm.getGreen(i);
-	blue[i] = data[i * 3 + 2] = (byte)cm.getBlue(i);
+        red[i] = data[i * 3] = (byte)cm.getRed(i);
+        green[i] = data[i * 3 + 1] = (byte)cm.getGreen(i);
+        blue[i] = data[i * 3 + 2] = (byte)cm.getBlue(i);
       }
   }
 
@@ -93,27 +93,27 @@ public class PNGPalette extends PNGChunk
 
     if( cs == null )
       {
-	for(int i = 0; i < nc; i ++ )
-	  {
-	    r[i] = (byte)red[i];
-	    g[i] = (byte)green[i];
-	    b[i] = (byte)blue[i];
-	  }
+        for(int i = 0; i < nc; i ++ )
+          {
+            r[i] = (byte)red[i];
+            g[i] = (byte)green[i];
+            b[i] = (byte)blue[i];
+          }
       }
     else
       {
-	for(int i = 0; i < nc; i ++ )
-	  {
-	    float[] in = new float[3];
-	    in[0] = (((float)red[i]) / 255f);
-	    in[1] = (((float)green[i]) / 255f);
-	    in[2] = (((float)blue[i]) / 255f);
-	    float[] out = cs.toRGB( in );
-	    r[i] = (byte)( Math.round(out[0] * 255.0) );
-	    g[i] = (byte)( Math.round(out[1] * 255.0) );
-	    b[i] = (byte)( Math.round(out[2] * 255.0) );
-	  }
-      }	
+        for(int i = 0; i < nc; i ++ )
+          {
+            float[] in = new float[3];
+            in[0] = (((float)red[i]) / 255f);
+            in[1] = (((float)green[i]) / 255f);
+            in[2] = (((float)blue[i]) / 255f);
+            float[] out = cs.toRGB( in );
+            r[i] = (byte)( Math.round(out[0] * 255.0) );
+            g[i] = (byte)( Math.round(out[1] * 255.0) );
+            b[i] = (byte)( Math.round(out[2] * 255.0) );
+          }
+      }
     return new IndexColorModel(8, nc, r, g, b);
   }
 
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGPhys.java b/libjava/classpath/gnu/javax/imageio/png/PNGPhys.java
index 0a82d6acbff..d15f09e882e 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGPhys.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGPhys.java
@@ -40,8 +40,8 @@ package gnu.javax.imageio.png;
 /**
  * A PNG "pHYS" chunk - pixel physical dimensions
  */
-public class PNGPhys extends PNGChunk 
-{ 
+public class PNGPhys extends PNGChunk
+{
   long x, y;
   double ratio;
   boolean usesRatio;
@@ -51,14 +51,14 @@ public class PNGPhys extends PNGChunk
     super( type, data, crc );
     if( data.length < 9 )
       throw new PNGException("Unexpected size of pHYS chunk.");
-    x = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) | 
+    x = ((data[0] & 0xFF) << 24) | ( (data[1] & 0xFF) << 16 ) |
       ((data[2] & 0xFF) << 8) | (data[3] & 0xFF);
-    y = ((data[4] & 0xFF) << 24) | ( (data[5] & 0xFF) << 16 ) | 
+    y = ((data[4] & 0xFF) << 24) | ( (data[5] & 0xFF) << 16 ) |
       ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
     if(data[8] == 0)
       {
-	ratio = ((double)x)/((double)y);
-	usesRatio = true;
+        ratio = ((double)x)/((double)y);
+        usesRatio = true;
       }
   }
 
@@ -71,13 +71,13 @@ public class PNGPhys extends PNGChunk
 
     if( ratio < 1.0 )
       {
-	y = 0xFFFFFFFF;
-	x = (long)(0xFFFFFFFFL * ratio);
+        y = 0xFFFFFFFF;
+        x = (long)(0xFFFFFFFFL * ratio);
       }
     else
       {
-	x = 0xFFFFFFFF;
-	y = (long)(0xFFFFFFFFL * ratio);
+        x = 0xFFFFFFFF;
+        y = (long)(0xFFFFFFFFL * ratio);
       }
     makeData();
   }
@@ -96,8 +96,8 @@ public class PNGPhys extends PNGChunk
     data = new byte[ 9 ];
     byte[] a = getInt( (int)x );
     byte[] b = getInt( (int)y );
-    data[0] = a[0]; data[1] = a[1]; data[2] = a[2]; data[3] = a[3]; 
-    data[4] = b[0]; data[5] = b[1]; data[6] = b[2]; data[7] = b[3]; 
+    data[0] = a[0]; data[1] = a[1]; data[2] = a[2]; data[3] = a[3];
+    data[4] = b[0]; data[5] = b[1]; data[6] = b[2]; data[7] = b[3];
     data[7] = (usesRatio) ? 0 : (byte)0xFF;
   }
 
diff --git a/libjava/classpath/gnu/javax/imageio/png/PNGTime.java b/libjava/classpath/gnu/javax/imageio/png/PNGTime.java
index 9b5c0332a27..824f06f83ab 100644
--- a/libjava/classpath/gnu/javax/imageio/png/PNGTime.java
+++ b/libjava/classpath/gnu/javax/imageio/png/PNGTime.java
@@ -42,8 +42,8 @@ import java.util.Date;
 /**
  * A PNG tIME chunk.
  */
-public class PNGTime extends PNGChunk 
-{ 
+public class PNGTime extends PNGChunk
+{
   private Date date;
 
   protected PNGTime( int type, byte[] data, int crc ) throws PNGException
@@ -55,7 +55,7 @@ public class PNGTime extends PNGChunk
     // PNG value is absolute (2006, not 106 or 06), java is from 1900.
     int year = ( (data[0] & 0xFF) << 8 ) | (data[1] & 0xFF);
     int month = (data[2] & 0xFF); // java counts from 0. PNG from 1.
-    int day = (data[3] & 0xFF); 
+    int day = (data[3] & 0xFF);
     int hour = (data[4] & 0xFF);
     int minute = (data[5] & 0xFF);
     int second = (data[6] & 0xFF);
diff --git a/libjava/classpath/gnu/javax/management/ListenerData.java b/libjava/classpath/gnu/javax/management/ListenerData.java
index 719daa086c5..31fdeccf0bc 100644
--- a/libjava/classpath/gnu/javax/management/ListenerData.java
+++ b/libjava/classpath/gnu/javax/management/ListenerData.java
@@ -66,7 +66,7 @@ public class ListenerData
    * event occurring.
    */
   private Object passback;
-  
+
   /**
    * Constructs a new {@link ListenerData} with the specified
    * listener, filter and passback object.
@@ -76,13 +76,13 @@ public class ListenerData
    * @param passback the object to passback on an incoming event.
    */
   public ListenerData(NotificationListener listener,
-		      NotificationFilter filter, Object passback)
+                      NotificationFilter filter, Object passback)
   {
     this.listener = listener;
     this.filter = filter;
     this.passback = passback;
   }
-  
+
   /**
    * Returns the listener.
    *
@@ -92,7 +92,7 @@ public class ListenerData
   {
     return listener;
   }
-  
+
   /**
    * Returns the filter.
    *
@@ -102,7 +102,7 @@ public class ListenerData
   {
     return filter;
   }
-  
+
   /**
    * Returns the passback object.
    *
@@ -112,7 +112,7 @@ public class ListenerData
   {
     return passback;
   }
-  
+
   /**
    * Returns true if the supplied object is an instance of
    * {@link ListenerData} and has the same listener, filter
@@ -125,12 +125,12 @@ public class ListenerData
   {
     if (obj instanceof ListenerData)
       {
-	ListenerData data = (ListenerData) obj;
-	return (data.getListener() == listener &&
-		data.getFilter() == filter &&
-		data.getPassback() == passback);
+        ListenerData data = (ListenerData) obj;
+        return (data.getListener() == listener &&
+                data.getFilter() == filter &&
+                data.getPassback() == passback);
       }
     return false;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/javax/management/Server.java b/libjava/classpath/gnu/javax/management/Server.java
index e35c3b11745..50252d4ddab 100644
--- a/libjava/classpath/gnu/javax/management/Server.java
+++ b/libjava/classpath/gnu/javax/management/Server.java
@@ -165,14 +165,14 @@ public class Server
   {
     try
       {
-	DELEGATE_NAME = 
-	  new ObjectName("JMImplementation:type=MBeanServerDelegate");
+        DELEGATE_NAME =
+          new ObjectName("JMImplementation:type=MBeanServerDelegate");
       }
     catch (MalformedObjectNameException e)
       {
-	throw (Error) 
-	  (new InternalError("Failed to construct " +
-			     "the delegate's object name.").initCause(e));
+        throw (Error)
+          (new InternalError("Failed to construct " +
+                             "the delegate's object name.").initCause(e));
       }
   }
 
@@ -189,32 +189,32 @@ public class Server
    * @param delegate the delegate bean for this server.
    */
   public Server(String defaultDomain, MBeanServer outer,
-		MBeanServerDelegate delegate)
+                MBeanServerDelegate delegate)
   {
     this.defaultDomain = defaultDomain;
     this.outer = outer;
     this.delegate = delegate;
     try
       {
-	registerMBean(delegate, DELEGATE_NAME);
+        registerMBean(delegate, DELEGATE_NAME);
       }
     catch (InstanceAlreadyExistsException e)
       {
-	throw (Error) 
-	  (new InternalError("The delegate bean is " +
-			     "already registered.").initCause(e));
+        throw (Error)
+          (new InternalError("The delegate bean is " +
+                             "already registered.").initCause(e));
       }
     catch (MBeanRegistrationException e)
       {
-	throw (Error) 
-	  (new InternalError("The delegate bean's preRegister " +
-			     "methods threw an exception.").initCause(e));
+        throw (Error)
+          (new InternalError("The delegate bean's preRegister " +
+                             "methods threw an exception.").initCause(e));
       }
     catch (NotCompliantMBeanException e)
       {
-	throw (Error) 
-	  (new InternalError("The delegate bean is " +
-			     "not compliant.").initCause(e));
+        throw (Error)
+          (new InternalError("The delegate bean is " +
+                             "not compliant.").initCause(e));
       }
   }
 
@@ -230,48 +230,48 @@ public class Server
    * @throws SecurityException if the action is denied.
    */
   private void checkSecurity(ObjectName name, String member,
-			     String action)
+                             String action)
   {
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
       try
-	{
-	  MBeanInfo info = null;
-	  if (name != null)
-	    {
-	      Object bean = getBean(name);
-	      Method method = bean.getClass().getMethod("getMBeanInfo");
-	      info = (MBeanInfo) method.invoke(bean);
-	    }
-	  sm.checkPermission(new MBeanPermission((info == null) ? 
-						 null : info.getClassName(),
-						 member, name, action));
-	}
+        {
+          MBeanInfo info = null;
+          if (name != null)
+            {
+              Object bean = getBean(name);
+              Method method = bean.getClass().getMethod("getMBeanInfo");
+              info = (MBeanInfo) method.invoke(bean);
+            }
+          sm.checkPermission(new MBeanPermission((info == null) ?
+                                                 null : info.getClassName(),
+                                                 member, name, action));
+        }
       catch (InstanceNotFoundException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to get bean.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to get bean.").initCause(e));
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to get bean info.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to get bean info.").initCause(e));
+        }
       catch (IllegalAccessException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to get bean info.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to get bean info.").initCause(e));
+        }
       catch (IllegalArgumentException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to get bean info.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to get bean info.").initCause(e));
+        }
       catch (InvocationTargetException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to get bean info.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to get bean info.").initCause(e));
+        }
   }
 
   /**
@@ -288,7 +288,7 @@ public class Server
     ServerInfo bean = beans.get(name);
     if (bean == null)
       throw new InstanceNotFoundException("The bean, " + name +
-					  ", was not found.");
+                                          ", was not found.");
     return bean.getObject();
   }
 
@@ -322,18 +322,18 @@ public class Server
    *                                                      Object)
    */
   public void addNotificationListener(ObjectName name, NotificationListener listener,
-				      NotificationFilter filter, Object passback)
+                                      NotificationFilter filter, Object passback)
     throws InstanceNotFoundException
   {
     Object bean = getBean(name);
     checkSecurity(name, null, "addNotificationListener");
     if (bean instanceof NotificationBroadcaster)
       {
-	NotificationBroadcaster bbean = (NotificationBroadcaster) bean;
-	NotificationListener indirection = new ServerNotificationListener(bean, name,
-									  listener);
-	bbean.addNotificationListener(indirection, filter, passback);
-	LazyListenersHolder.listeners.put(listener, indirection);
+        NotificationBroadcaster bbean = (NotificationBroadcaster) bean;
+        NotificationListener indirection = new ServerNotificationListener(bean, name,
+                                                                          listener);
+        bbean.addNotificationListener(indirection, filter, passback);
+        LazyListenersHolder.listeners.put(listener, indirection);
       }
   }
 
@@ -343,7 +343,7 @@ public class Server
    * bean.  Notifications emitted by the management bean are forwarded
    * to the listener via the server, which will convert any MBean
    * references in the source to portable {@link ObjectName}
-   * instances.  The notification is otherwise unchanged.  
+   * instances.  The notification is otherwise unchanged.
    * 
      
    * 
      
    * The listener that receives notifications will be the one that is
@@ -380,16 +380,16 @@ public class Server
    *                                                      Object)
    */
   public void addNotificationListener(ObjectName name, ObjectName listener,
-				      NotificationFilter filter, Object passback)
+                                      NotificationFilter filter, Object passback)
     throws InstanceNotFoundException
   {
     Object lbean = getBean(listener);
     if (!(lbean instanceof NotificationListener))
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The supplied listener name does not " +
-				       "correspond to a notification listener.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The supplied listener name does not " +
+                                       "correspond to a notification listener.");
+        throw new RuntimeOperationsException(e);
       }
     addNotificationListener(name, ((NotificationListener) lbean), filter, passback);
   }
@@ -400,7 +400,7 @@ public class Server
    * using the default constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
      
    * 
      
    * If the name supplied is null, then the bean is
@@ -409,7 +409,7 @@ public class Server
    * of this interface will be used to obtain the name in this case.
    * 
      
    * 
      
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, Object[], String[])
    * createMBean(className, name, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -443,19 +443,19 @@ public class Server
    */
   public ObjectInstance createMBean(String className, ObjectName name)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException
   {
     return createMBean(className, name, (Object[]) null, (String[]) null);
   }
-  
+
   /**
    * 
      
    * Instantiates a new instance of the specified management bean
    * using the given constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
      
    * 
      
    * If the name supplied is null, then the bean is
@@ -463,7 +463,7 @@ public class Server
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
      
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -491,13 +491,13 @@ public class Server
    *                           and registerMBean methods.
    */
   public ObjectInstance createMBean(String className, ObjectName name,
-				    Object[] params, String[] sig)
+                                    Object[] params, String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException
   {
     return registerMBean(instantiate(className, params, sig), name);
-  } 
+  }
 
   /**
    * 
      
@@ -515,7 +515,7 @@ public class Server
    * of this interface will be used to obtain the name in this case.
    * 
      
    * 
      
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, ObjectName, Object[], String)
    * createMBean(className, name, loaderName, (Object[]) null,
    * (String) null)} with null parameters
@@ -550,14 +550,14 @@ public class Server
    *                           and registerMBean methods.
    * @see #createMBean(String, ObjectName, ObjectName, Object[], String[])
    */
-  public ObjectInstance createMBean(String className, ObjectName name, 
-				    ObjectName loaderName)
+  public ObjectInstance createMBean(String className, ObjectName name,
+                                    ObjectName loaderName)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException
   {
     return createMBean(className, name, loaderName, (Object[]) null,
-		       (String[]) null);
+                       (String[]) null);
   }
 
   /**
@@ -567,7 +567,7 @@ public class Server
    * under the supplied name.  The class is loaded using the
    * given class loader.  If this argument is null,
    * then the same class loader as was used to load the server
-   * is used. 
+   * is used.
    * 
      
    * 
      
    * If the name supplied is null, then the bean is
@@ -575,7 +575,7 @@ public class Server
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
      
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -606,14 +606,14 @@ public class Server
    *                           and registerMBean methods.
    */
   public ObjectInstance createMBean(String className, ObjectName name,
-				    ObjectName loaderName, Object[] params,
-				    String[] sig)
+                                    ObjectName loaderName, Object[] params,
+                                    String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException
   {
     return registerMBean(instantiate(className, loaderName, params, sig),
-			 name);
+                         name);
   }
 
   /**
@@ -641,12 +641,12 @@ public class Server
   {
     try
       {
-	return new ServerInputStream(new ByteArrayInputStream(data),
-				     getClassLoaderFor(name));
+        return new ServerInputStream(new ByteArrayInputStream(data),
+                                     getClassLoaderFor(name));
       }
     catch (IOException e)
       {
-	throw new OperationsException("An I/O error occurred: " + e);
+        throw new OperationsException("An I/O error occurred: " + e);
       }
   }
 
@@ -680,17 +680,17 @@ public class Server
   {
     try
       {
-	Class c = getClassLoaderRepository().loadClass(name);
-	return new ServerInputStream(new ByteArrayInputStream(data),
-					   c.getClassLoader());
+        Class c = getClassLoaderRepository().loadClass(name);
+        return new ServerInputStream(new ByteArrayInputStream(data),
+                                           c.getClassLoader());
       }
     catch (IOException e)
       {
-	throw new OperationsException("An I/O error occurred: " + e);
+        throw new OperationsException("An I/O error occurred: " + e);
       }
     catch (ClassNotFoundException e)
       {
-	throw new ReflectionException(e, "The class could not be found.");
+        throw new ReflectionException(e, "The class could not be found.");
       }
   }
 
@@ -722,21 +722,21 @@ public class Server
    */
   public ObjectInputStream deserialize(String name, ObjectName loader, byte[] data)
     throws InstanceNotFoundException, ReflectionException,
-	   OperationsException
+           OperationsException
   {
     try
       {
-	Class c = getClassLoader(loader).loadClass(name);
-	return new ServerInputStream(new ByteArrayInputStream(data),
-					   c.getClassLoader());
+        Class c = getClassLoader(loader).loadClass(name);
+        return new ServerInputStream(new ByteArrayInputStream(data),
+                                           c.getClassLoader());
       }
     catch (IOException e)
       {
-	throw new OperationsException("An I/O error occurred: " + e);
+        throw new OperationsException("An I/O error occurred: " + e);
       }
     catch (ClassNotFoundException e)
       {
-	throw new ReflectionException(e, "The class could not be found.");
+        throw new ReflectionException(e, "The class could not be found.");
       }
   }
 
@@ -767,13 +767,13 @@ public class Server
    */
   public Object getAttribute(ObjectName bean, String name)
     throws MBeanException, AttributeNotFoundException,
-	   InstanceNotFoundException, ReflectionException
+           InstanceNotFoundException, ReflectionException
   {
     if (bean == null || name == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("One of the supplied arguments was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("One of the supplied arguments was null.");
+        throw new RuntimeOperationsException(e);
       }
     Object abean = getBean(bean);
     checkSecurity(bean, name, "getAttribute");
@@ -781,14 +781,14 @@ public class Server
       return ((DynamicMBean) abean).getAttribute(name);
     else
       try
-	{
-	  return new StandardMBean(abean, null).getAttribute(name);
-	}
+        {
+          return new StandardMBean(abean, null).getAttribute(name);
+        }
       catch (NotCompliantMBeanException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to create dynamic bean.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to create dynamic bean.").initCause(e));
+        }
   }
 
 
@@ -817,7 +817,7 @@ public class Server
    *                           MBeanPermission(className, n, bean,
    *                           "getAttribute")} or that attribute will
    *                           not be included.
-   *                           
+   *
    * @see DynamicMBean#getAttributes(String[])
    */
   public AttributeList getAttributes(ObjectName bean, String[] names)
@@ -825,47 +825,47 @@ public class Server
   {
     if (bean == null || names == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("One of the supplied arguments was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("One of the supplied arguments was null.");
+        throw new RuntimeOperationsException(e);
       }
     Object abean = getBean(bean);
     checkSecurity(bean, null, "getAttribute");
     AttributeList list = new AttributeList(names.length);
     for (int a = 0; a < names.length; ++a)
       {
-	if (names[a] == null)
-	  {
-	    RuntimeException e =
-	      new IllegalArgumentException("Argument " + a + " was null.");
-	    throw new RuntimeOperationsException(e);
-	  }
-	checkSecurity(bean, names[a], "getAttribute");
-	try
-	  {
-	    Object value;
-	    if (abean instanceof DynamicMBean)
-	      value = ((DynamicMBean) abean).getAttribute(names[a]);
-	    else
-	      try
-		{
-		  value = new StandardMBean(abean, null).getAttribute(names[a]);
-		}
-	      catch (NotCompliantMBeanException e)
-		{
-		  throw (Error) 
-		    (new InternalError("Failed to create dynamic bean.").initCause(e));
-		}
-	    list.add(new Attribute(names[a], value));
-	  }
-	catch (AttributeNotFoundException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (MBeanException e)
-	  {
-	    /* Ignored */
-	  }
+        if (names[a] == null)
+          {
+            RuntimeException e =
+              new IllegalArgumentException("Argument " + a + " was null.");
+            throw new RuntimeOperationsException(e);
+          }
+        checkSecurity(bean, names[a], "getAttribute");
+        try
+          {
+            Object value;
+            if (abean instanceof DynamicMBean)
+              value = ((DynamicMBean) abean).getAttribute(names[a]);
+            else
+              try
+                {
+                  value = new StandardMBean(abean, null).getAttribute(names[a]);
+                }
+              catch (NotCompliantMBeanException e)
+                {
+                  throw (Error)
+                    (new InternalError("Failed to create dynamic bean.").initCause(e));
+                }
+            list.add(new Attribute(names[a], value));
+          }
+        catch (AttributeNotFoundException e)
+          {
+            /* Ignored */
+          }
+        catch (MBeanException e)
+          {
+            /* Ignored */
+          }
       }
     return list;
   }
@@ -897,14 +897,14 @@ public class Server
   {
     if (name == null)
       {
-	checkSecurity(null, null, "getClassLoader");
-	return getClass().getClassLoader();
+        checkSecurity(null, null, "getClassLoader");
+        return getClass().getClassLoader();
       }
     Object bean = getBean(name);
     checkSecurity(name, null, "getClassLoader");
     return (ClassLoader) bean;
   }
- 
+
   /**
    * Returns the class loader of the specified management bean.  If
    * l is the requested class loader, and r
@@ -932,7 +932,7 @@ public class Server
     Object bean = getBean(name);
     checkSecurity(name, null, "getClassLoaderFor");
     return bean.getClass().getClassLoader();
-  }    
+  }
 
   /**
    * Returns the class loader repository used by this server.
@@ -987,16 +987,16 @@ public class Server
     Iterator iterator = beans.keySet().iterator();
     while (iterator.hasNext())
       {
-	String d = iterator.next().getDomain();
-	try
-	  {
-	    checkSecurity(new ObjectName(d + ":x=x"), null, "getDomains");
-	    domains.add(d);
-	  }
-	catch (MalformedObjectNameException e)
-	  {
-	    /* Ignored */
-	  }
+        String d = iterator.next().getDomain();
+        try
+          {
+            checkSecurity(new ObjectName(d + ":x=x"), null, "getDomains");
+            domains.add(d);
+          }
+        catch (MalformedObjectNameException e)
+          {
+            /* Ignored */
+          }
       }
     return domains.toArray(new String[domains.size()]);
   }
@@ -1033,38 +1033,38 @@ public class Server
    */
   public MBeanInfo getMBeanInfo(ObjectName name)
     throws InstanceNotFoundException, IntrospectionException,
-	   ReflectionException
+           ReflectionException
   {
     Object bean = getBean(name);
     checkSecurity(name, null, "getMBeanInfo");
     try
       {
-	Method method = bean.getClass().getMethod("getMBeanInfo");
-	return (MBeanInfo) method.invoke(bean);
+        Method method = bean.getClass().getMethod("getMBeanInfo");
+        return (MBeanInfo) method.invoke(bean);
       }
     catch (NoSuchMethodException e)
       {
-	try
-	  {
-	    return new StandardMBean(bean, null).getMBeanInfo();
-	  }
-	catch (NotCompliantMBeanException ex)
-	  {
-	    throw new IntrospectionException("An error occurred in executing " +
-					     "getMBeanInfo on the bean: " + ex + ".");
-	  }
+        try
+          {
+            return new StandardMBean(bean, null).getMBeanInfo();
+          }
+        catch (NotCompliantMBeanException ex)
+          {
+            throw new IntrospectionException("An error occurred in executing " +
+                                             "getMBeanInfo on the bean: " + ex + ".");
+          }
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to call getMBeanInfo");
+        throw new ReflectionException(e, "Failed to call getMBeanInfo");
       }
     catch (IllegalArgumentException e)
       {
-	throw new ReflectionException(e, "Failed to call getMBeanInfo");
+        throw new ReflectionException(e, "Failed to call getMBeanInfo");
       }
     catch (InvocationTargetException e)
       {
-	throw new ReflectionException(e, "The method threw an exception");
+        throw new ReflectionException(e, "The method threw an exception");
       }
   }
 
@@ -1088,7 +1088,7 @@ public class Server
     ServerInfo bean = beans.get(name);
     if (bean == null)
       throw new InstanceNotFoundException("The bean, " + name +
-					  ", was not found.");
+                                          ", was not found.");
     return bean.getInstance();
   }
 
@@ -1102,7 +1102,7 @@ public class Server
    * but the instance is not yet registered with the server.
    * 
      
    * 
      
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #instantiate(String, Object[], String[])
    * instantiate(name, (Object[]) null, (String[]) null)}
    * with null parameters and signature.
@@ -1162,53 +1162,53 @@ public class Server
     checkSecurity(null, null, "instantiate");
     if (name == null)
       {
-	RuntimeException e = 
-	  new IllegalArgumentException("The name was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The name was null.");
+        throw new RuntimeOperationsException(e);
       }
     Class[] sigTypes = new Class[sig.length];
     for (int a = 0; a < sigTypes.length; ++a)
       {
-	try 
-	  {
-	    sigTypes[a] = repository.loadClass(sig[a]);
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    throw new ReflectionException(e, "The class, " + sigTypes[a] + 
-					  ", in the method signature " +
-					  "could not be loaded.");
-	  }
+        try
+          {
+            sigTypes[a] = repository.loadClass(sig[a]);
+          }
+        catch (ClassNotFoundException e)
+          {
+            throw new ReflectionException(e, "The class, " + sigTypes[a] +
+                                          ", in the method signature " +
+                                          "could not be loaded.");
+          }
       }
     try
       {
-	Constructor cons =
-	  repository.loadClass(name).getConstructor(sigTypes);
-	return cons.newInstance(params);
+        Constructor cons =
+          repository.loadClass(name).getConstructor(sigTypes);
+        return cons.newInstance(params);
       }
     catch (ClassNotFoundException e)
       {
-	throw new ReflectionException(e, "The class, " + name + 
-				      ", of the constructor " +
-				      "could not be loaded.");
+        throw new ReflectionException(e, "The class, " + name +
+                                      ", of the constructor " +
+                                      "could not be loaded.");
       }
     catch (NoSuchMethodException e)
       {
-	throw new ReflectionException(e, "The method, " + name +
-				      ", could not be found.");
+        throw new ReflectionException(e, "The method, " + name +
+                                      ", could not be found.");
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to instantiate the object");
+        throw new ReflectionException(e, "Failed to instantiate the object");
       }
     catch (InstantiationException e)
       {
-	throw new ReflectionException(e, "Failed to instantiate the object");
+        throw new ReflectionException(e, "Failed to instantiate the object");
       }
     catch (InvocationTargetException e)
       {
-	throw new MBeanException((Exception) e.getCause(), "The constructor "
-				 + name + " threw an exception");
+        throw new MBeanException((Exception) e.getCause(), "The constructor "
+                                 + name + " threw an exception");
       }
   }
 
@@ -1222,7 +1222,7 @@ public class Server
    * registered with the server.
    * 
      
    * 
      
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #instantiate(String, ObjectName, Object[], String[])
    * instantiate(name, loaderName, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -1250,7 +1250,7 @@ public class Server
    */
   public Object instantiate(String name, ObjectName loaderName)
     throws InstanceNotFoundException, ReflectionException,
-	   MBeanException
+           MBeanException
   {
     return instantiate(name, loaderName);
   }
@@ -1284,61 +1284,61 @@ public class Server
    *                           "instantiate")}.
    */
   public Object instantiate(String name, ObjectName loaderName,
-			    Object[] params, String[] sig)
+                            Object[] params, String[] sig)
     throws InstanceNotFoundException, ReflectionException,
-	   MBeanException
+           MBeanException
   {
     checkSecurity(null, null, "instantiate");
     if (name == null)
       {
-	RuntimeException e = 
-	  new IllegalArgumentException("The name was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The name was null.");
+        throw new RuntimeOperationsException(e);
       }
     ClassLoader loader = getClassLoader(loaderName);
     Class[] sigTypes = new Class[sig.length];
     for (int a = 0; a < sig.length; ++a)
       {
-	try 
-	  {
-	    sigTypes[a] = Class.forName(sig[a], true, loader);
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    throw new ReflectionException(e, "The class, " + sig[a] + 
-					  ", in the method signature " +
-					  "could not be loaded.");
-	  }
+        try
+          {
+            sigTypes[a] = Class.forName(sig[a], true, loader);
+          }
+        catch (ClassNotFoundException e)
+          {
+            throw new ReflectionException(e, "The class, " + sig[a] +
+                                          ", in the method signature " +
+                                          "could not be loaded.");
+          }
       }
     try
       {
-	Constructor cons =
-	  Class.forName(name, true, loader).getConstructor(sigTypes);
-	return cons.newInstance(params);
+        Constructor cons =
+          Class.forName(name, true, loader).getConstructor(sigTypes);
+        return cons.newInstance(params);
       }
     catch (ClassNotFoundException e)
       {
-	throw new ReflectionException(e, "The class, " + name + 
-				      ", of the constructor " +
-				      "could not be loaded.");
+        throw new ReflectionException(e, "The class, " + name +
+                                      ", of the constructor " +
+                                      "could not be loaded.");
       }
     catch (NoSuchMethodException e)
       {
-	throw new ReflectionException(e, "The method, " + name +
-				      ", could not be found.");
+        throw new ReflectionException(e, "The method, " + name +
+                                      ", could not be found.");
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to instantiate the object");
+        throw new ReflectionException(e, "Failed to instantiate the object");
       }
     catch (InstantiationException e)
       {
-	throw new ReflectionException(e, "Failed to instantiate the object");
+        throw new ReflectionException(e, "Failed to instantiate the object");
       }
     catch (InvocationTargetException e)
       {
-	throw new MBeanException((Exception) e.getCause(), "The constructor "
-				 + name + " threw an exception");
+        throw new MBeanException((Exception) e.getCause(), "The constructor "
+                                 + name + " threw an exception");
       }
   }
 
@@ -1368,13 +1368,13 @@ public class Server
    */
   public Object invoke(ObjectName bean, String name, Object[] params, String[] sig)
     throws InstanceNotFoundException, MBeanException,
-	   ReflectionException
+           ReflectionException
   {
     if (bean == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The bean was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The bean was null.");
+        throw new RuntimeOperationsException(e);
       }
     Object abean = getBean(bean);
     checkSecurity(bean, name, "invoke");
@@ -1382,14 +1382,14 @@ public class Server
       return ((DynamicMBean) abean).invoke(name, params, sig);
     else
       try
-	{
-	  return new StandardMBean(abean, null).invoke(name, params, sig);
-	}
+        {
+          return new StandardMBean(abean, null).invoke(name, params, sig);
+        }
       catch (NotCompliantMBeanException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to create dynamic bean.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to create dynamic bean.").initCause(e));
+        }
   }
 
   /**
@@ -1407,7 +1407,7 @@ public class Server
    * 
    11. Both the class of B and C were loaded by the same class loader,
    * and B is assignable to C.
      12. 
    * 
-   * 
+   *
    * @param name the name of the management bean.
    * @param className the name of the class to test if name is
    *                  an instance of.
@@ -1431,26 +1431,26 @@ public class Server
       info = ((DynamicMBean) bean).getMBeanInfo();
     else
       try
-	{
-	  info = new StandardMBean(bean, null).getMBeanInfo();
-	}
+        {
+          info = new StandardMBean(bean, null).getMBeanInfo();
+        }
       catch (NotCompliantMBeanException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to create dynamic bean.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to create dynamic bean.").initCause(e));
+        }
     if (info.getClassName().equals(className))
       return true;
     Class bclass = bean.getClass();
     try
       {
-	Class oclass = Class.forName(className);
-	return (bclass.getClassLoader().equals(oclass.getClassLoader()) &&
-		oclass.isAssignableFrom(bclass));  
+        Class oclass = Class.forName(className);
+        return (bclass.getClassLoader().equals(oclass.getClassLoader()) &&
+                oclass.isAssignableFrom(bclass));
       }
     catch (ClassNotFoundException e)
       {
-	return false;
+        return false;
       }
   }
 
@@ -1468,9 +1468,9 @@ public class Server
   {
     if (name == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The name was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The name was null.");
+        throw new RuntimeOperationsException(e);
       }
     return beans.containsKey(name);
   }
@@ -1489,7 +1489,7 @@ public class Server
    * 
      
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
      
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -1516,34 +1516,34 @@ public class Server
     Set results = new HashSet();
     for (Map.Entry entry : beans.entrySet())
       {
-	ObjectName nextName = entry.getKey();
-	checkSecurity(name, nextName.toString(), "queryMBeans");
-	try
-	  {
-	    if ((name == null || name.apply(nextName)) &&
-		(query == null || query.apply(nextName)))
-	      results.add(entry.getValue().getInstance());
-	  }
-	catch (BadStringOperationException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (BadBinaryOpValueExpException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (BadAttributeValueExpException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (InvalidApplicationException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
+        ObjectName nextName = entry.getKey();
+        checkSecurity(name, nextName.toString(), "queryMBeans");
+        try
+          {
+            if ((name == null || name.apply(nextName)) &&
+                (query == null || query.apply(nextName)))
+              results.add(entry.getValue().getInstance());
+          }
+        catch (BadStringOperationException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (BadBinaryOpValueExpException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (BadAttributeValueExpException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (InvalidApplicationException e)
+          {
+            /* Ignored -- assume false result */
+          }
       }
     return results;
   }
- 
+
   /**
    * 
      
    * Returns a set of {@link ObjectName}s matching the specified
@@ -1558,7 +1558,7 @@ public class Server
    * 
      
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
      
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -1587,29 +1587,29 @@ public class Server
     Set results = new HashSet();
     for (ObjectName nextName : beans.keySet())
       {
-	checkSecurity(name, nextName.toString(), "queryNames");
-	try
-	  {
-	    if ((name == null || name.apply(nextName)) &&
-		(query == null || query.apply(nextName)))
-	      results.add(nextName);
-	  }
-	catch (BadStringOperationException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (BadBinaryOpValueExpException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (BadAttributeValueExpException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
-	catch (InvalidApplicationException e)
-	  {
-	    /* Ignored -- assume false result */
-	  }
+        checkSecurity(name, nextName.toString(), "queryNames");
+        try
+          {
+            if ((name == null || name.apply(nextName)) &&
+                (query == null || query.apply(nextName)))
+              results.add(nextName);
+          }
+        catch (BadStringOperationException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (BadBinaryOpValueExpException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (BadAttributeValueExpException e)
+          {
+            /* Ignored -- assume false result */
+          }
+        catch (InvalidApplicationException e)
+          {
+            /* Ignored -- assume false result */
+          }
       }
     return results;
   }
@@ -1618,7 +1618,7 @@ public class Server
    * Registers the supplied instance with the server, using the specified
    * {@link ObjectName}.  If the name given is null, then
    * the bean supplied is expected to implement the {@link MBeanRegistration}
-   * interface and provide the name via the 
+   * interface and provide the name via the
    * {@link MBeanRegistration#preRegister preRegister} method
    * of this interface.
    *
@@ -1656,71 +1656,71 @@ public class Server
    */
   public ObjectInstance registerMBean(Object obj, ObjectName name)
     throws InstanceAlreadyExistsException, MBeanRegistrationException,
-	   NotCompliantMBeanException
-  {  
+           NotCompliantMBeanException
+  {
     SecurityManager sm = System.getSecurityManager();
     Class cl = obj.getClass();
     String className = cl.getName();
     if (sm != null)
       {
-	sm.checkPermission(new MBeanPermission(className, null, name,
-					       "registerMBean"));
-	if (!(cl.getProtectionDomain().implies(new MBeanTrustPermission("register"))))
-	  throw new SecurityException("The protection domain of the object's class" +
-				      "does not imply the trust permission," +
-				      "register");
+        sm.checkPermission(new MBeanPermission(className, null, name,
+                                               "registerMBean"));
+        if (!(cl.getProtectionDomain().implies(new MBeanTrustPermission("register"))))
+          throw new SecurityException("The protection domain of the object's class" +
+                                      "does not imply the trust permission," +
+                                      "register");
       }
     if (obj == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The object was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The object was null.");
+        throw new RuntimeOperationsException(e);
       }
     MBeanRegistration register = null;
     if (obj instanceof MBeanRegistration)
       register = (MBeanRegistration) obj;
     if (name == null && register == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The name was null and " +
-				       "the bean does not implement " +
-				       "MBeanRegistration.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The name was null and " +
+                                       "the bean does not implement " +
+                                       "MBeanRegistration.");
+        throw new RuntimeOperationsException(e);
       }
     if (register != null)
       {
-	try
-	  {
-	    name = register.preRegister(this, name);
-	    if (name == null)
-	      {
-		RuntimeException e =
-		  new NullPointerException("The name returned by " +
-					   "MBeanRegistration.preRegister() " +
-					   "was null");
-		throw e;
-	      }
-	    if (sm != null)
-	      sm.checkPermission(new MBeanPermission(className, null, name,
-						     "registerMBean"));
-	  }
-	catch (SecurityException e)
-	  {
-	    register.postRegister(Boolean.FALSE);
-	    throw e;
-	  }
-	catch (Exception e)
-	  {
-	    register.postRegister(Boolean.FALSE);
-	    throw new MBeanRegistrationException(e, "Pre-registration failed.");
-	  }
+        try
+          {
+            name = register.preRegister(this, name);
+            if (name == null)
+              {
+                RuntimeException e =
+                  new NullPointerException("The name returned by " +
+                                           "MBeanRegistration.preRegister() " +
+                                           "was null");
+                throw e;
+              }
+            if (sm != null)
+              sm.checkPermission(new MBeanPermission(className, null, name,
+                                                     "registerMBean"));
+          }
+        catch (SecurityException e)
+          {
+            register.postRegister(Boolean.FALSE);
+            throw e;
+          }
+        catch (Exception e)
+          {
+            register.postRegister(Boolean.FALSE);
+            throw new MBeanRegistrationException(e, "Pre-registration failed.");
+          }
       }
     ObjectInstance obji = new ObjectInstance(name, className);
     if (beans.putIfAbsent(name, new ServerInfo(obji, obj)) != null)
       {
-	if (register != null)
-	  register.postRegister(Boolean.FALSE);
-	throw new InstanceAlreadyExistsException(name + "is already registered.");
+        if (register != null)
+          register.postRegister(Boolean.FALSE);
+        throw new InstanceAlreadyExistsException(name + "is already registered.");
       }
     if (register != null)
       register.postRegister(Boolean.TRUE);
@@ -1752,16 +1752,16 @@ public class Server
    * @see NotificationBroadcaster#removeNotificationListener(NotificationListener)
    */
   public void removeNotificationListener(ObjectName name,
-					 NotificationListener listener)
+                                         NotificationListener listener)
     throws InstanceNotFoundException, ListenerNotFoundException
   {
     Object bean = getBean(name);
     checkSecurity(name, null, "removeNotificationListener");
     if (bean instanceof NotificationBroadcaster)
       {
-	NotificationBroadcaster bbean = (NotificationBroadcaster) bean;
-	bbean.removeNotificationListener(listener);
-	LazyListenersHolder.listeners.remove(listener);
+        NotificationBroadcaster bbean = (NotificationBroadcaster) bean;
+        bbean.removeNotificationListener(listener);
+        LazyListenersHolder.listeners.remove(listener);
       }
   }
 
@@ -1794,18 +1794,18 @@ public class Server
    *                                                     Object)
    */
   public void removeNotificationListener(ObjectName name,
-					 NotificationListener listener,
-					 NotificationFilter filter,
-					 Object passback)
+                                         NotificationListener listener,
+                                         NotificationFilter filter,
+                                         Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException
   {
     Object bean = getBean(name);
     checkSecurity(name, null, "removeNotificationListener");
     if (bean instanceof NotificationEmitter)
       {
-	NotificationEmitter bbean = (NotificationEmitter) bean;
-	bbean.removeNotificationListener(listener, filter, passback);
-	LazyListenersHolder.listeners.remove(listener);
+        NotificationEmitter bbean = (NotificationEmitter) bean;
+        bbean.removeNotificationListener(listener, filter, passback);
+        LazyListenersHolder.listeners.remove(listener);
       }
   }
 
@@ -1839,10 +1839,10 @@ public class Server
     Object lbean = getBean(listener);
     if (!(lbean instanceof NotificationListener))
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The supplied listener name does not " +
-				       "correspond to a notification listener.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The supplied listener name does not " +
+                                       "correspond to a notification listener.");
+        throw new RuntimeOperationsException(e);
       }
     removeNotificationListener(name, ((NotificationListener) lbean));
   }
@@ -1877,26 +1877,26 @@ public class Server
    *                                                     Object)
    */
   public void removeNotificationListener(ObjectName name,
-				  ObjectName listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  ObjectName listener,
+                                  NotificationFilter filter,
+                                  Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException
   {
     Object lbean = getBean(listener);
     if (!(lbean instanceof NotificationListener))
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The supplied listener name does not " +
-				       "correspond to a notification listener.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The supplied listener name does not " +
+                                       "correspond to a notification listener.");
+        throw new RuntimeOperationsException(e);
       }
     removeNotificationListener(name, ((NotificationListener) lbean), filter,
-			       passback);
+                               passback);
   }
 
   /**
    * Sets the value of the specified attribute of the supplied
-   * management bean.  
+   * management bean.
    *
    * @param name the name of the management bean.
    * @param attribute the attribute to set.
@@ -1929,14 +1929,14 @@ public class Server
    */
   public void setAttribute(ObjectName name, Attribute attribute)
     throws InstanceNotFoundException, AttributeNotFoundException,
-	   InvalidAttributeValueException, MBeanException,
-	   ReflectionException
+           InvalidAttributeValueException, MBeanException,
+           ReflectionException
   {
     if (attribute == null || name == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("One of the supplied arguments was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("One of the supplied arguments was null.");
+        throw new RuntimeOperationsException(e);
       }
     Object bean = getBean(name);
     checkSecurity(name, attribute.getName(), "setAttribute");
@@ -1944,14 +1944,14 @@ public class Server
       ((DynamicMBean) bean).setAttribute(attribute);
     else
       try
-	{
-	  new StandardMBean(bean, null).setAttribute(attribute);
-	}
+        {
+          new StandardMBean(bean, null).setAttribute(attribute);
+        }
       catch (NotCompliantMBeanException e)
-	{
-	  throw (Error) 
-	    (new InternalError("Failed to create dynamic bean.").initCause(e));
-	}
+        {
+          throw (Error)
+            (new InternalError("Failed to create dynamic bean.").initCause(e));
+        }
   }
 
   /**
@@ -1992,9 +1992,9 @@ public class Server
   {
     if (name == null || attributes == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("One of the supplied arguments was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("One of the supplied arguments was null.");
+        throw new RuntimeOperationsException(e);
       }
     Object abean = getBean(name);
     checkSecurity(name, null, "setAttribute");
@@ -2002,42 +2002,42 @@ public class Server
     Iterator it = attributes.iterator();
     while (it.hasNext())
       {
-	try
-	  {
-	    Attribute attrib = (Attribute) it.next();
-	    if (attrib == null)
-	      {
-		RuntimeException e =
-		  new IllegalArgumentException("An attribute was null.");
-		throw new RuntimeOperationsException(e);
-	      }
-	    checkSecurity(name, attrib.getName(), "setAttribute");
-	    if (abean instanceof DynamicMBean)
-	      ((DynamicMBean) abean).setAttribute(attrib);
-	    else
-	      try
-		{
-		  new StandardMBean(abean, null).setAttribute(attrib);
-		}
-	      catch (NotCompliantMBeanException e)
-		{
-		  throw (Error) 
-		    (new InternalError("Failed to create dynamic bean.").initCause(e));
-		}
-	    list.add(attrib);
-	  }
-	catch (AttributeNotFoundException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (InvalidAttributeValueException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (MBeanException e)
-	  {
-	    /* Ignored */
-	  }
+        try
+          {
+            Attribute attrib = (Attribute) it.next();
+            if (attrib == null)
+              {
+                RuntimeException e =
+                  new IllegalArgumentException("An attribute was null.");
+                throw new RuntimeOperationsException(e);
+              }
+            checkSecurity(name, attrib.getName(), "setAttribute");
+            if (abean instanceof DynamicMBean)
+              ((DynamicMBean) abean).setAttribute(attrib);
+            else
+              try
+                {
+                  new StandardMBean(abean, null).setAttribute(attrib);
+                }
+              catch (NotCompliantMBeanException e)
+                {
+                  throw (Error)
+                    (new InternalError("Failed to create dynamic bean.").initCause(e));
+                }
+            list.add(attrib);
+          }
+        catch (AttributeNotFoundException e)
+          {
+            /* Ignored */
+          }
+        catch (InvalidAttributeValueException e)
+          {
+            /* Ignored */
+          }
+        catch (MBeanException e)
+          {
+            /* Ignored */
+          }
       }
     return list;
   }
@@ -2064,36 +2064,36 @@ public class Server
    *                           MBeanPermission(String,String,ObjectName,String)
    *                           MBeanPermission(className, null, name,
    *                           "unregisterMBean")}.
-   */ 
+   */
   public void unregisterMBean(ObjectName name)
     throws InstanceNotFoundException, MBeanRegistrationException
   {
     if (name == null)
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The name was null.");
-	throw new RuntimeOperationsException(e);
+        RuntimeException e =
+          new IllegalArgumentException("The name was null.");
+        throw new RuntimeOperationsException(e);
       }
     if (name.equals(DELEGATE_NAME))
       {
-	RuntimeException e =
-	  new IllegalArgumentException("The delegate can not be unregistered.");
-	throw new RuntimeOperationsException(e);
-      }	
-    Object bean = getBean(name);    
+        RuntimeException e =
+          new IllegalArgumentException("The delegate can not be unregistered.");
+        throw new RuntimeOperationsException(e);
+      }
+    Object bean = getBean(name);
     checkSecurity(name, null, "unregisterMBean");
     MBeanRegistration register = null;
     if (bean instanceof MBeanRegistration)
       {
-	register = (MBeanRegistration) bean;
-	try
-	  {
-	    register.preDeregister();
-	  }
-	catch (Exception e)
-	  {
-	    throw new MBeanRegistrationException(e, "Pre-deregistration failed.");
-	  }
+        register = (MBeanRegistration) bean;
+        try
+          {
+            register.preDeregister();
+          }
+        catch (Exception e)
+          {
+            throw new MBeanRegistrationException(e, "Pre-deregistration failed.");
+          }
       }
     beans.remove(name);
     notify(name, MBeanServerNotification.UNREGISTRATION_NOTIFICATION);
@@ -2113,8 +2113,8 @@ public class Server
    private void notify(ObjectName name, String type)
    {
       delegate.sendNotification
-	(new MBeanServerNotification
-	 (type, DELEGATE_NAME, sequenceNumber.getAndIncrement(), name));
+        (new MBeanServerNotification
+         (type, DELEGATE_NAME, sequenceNumber.getAndIncrement(), name));
    }
 
   /**
@@ -2137,13 +2137,13 @@ public class Server
       throws ClassNotFoundException, IOException
     {
       try
-	{
-	  return Class.forName(osc.getName(), true, cl);
-	}
+        {
+          return Class.forName(osc.getName(), true, cl);
+        }
       catch (ClassNotFoundException e)
-	{
-	  return super.resolveClass(osc);
-	}
+        {
+          return super.resolveClass(osc);
+        }
     }
 
   }
@@ -2152,7 +2152,7 @@ public class Server
    * Holder for information on registered beans.
    */
   private class ServerInfo
-  {  
+  {
     private ObjectInstance instance;
 
     private Object object;
@@ -2206,7 +2206,7 @@ public class Server
      * @param listener the listener events eventually reach.
      */
     public ServerNotificationListener(Object bean, ObjectName name,
-				      NotificationListener listener)
+                                      NotificationListener listener)
     {
       this.bean = bean;
       this.name = name;
@@ -2224,7 +2224,7 @@ public class Server
     public void handleNotification(Notification notif, Object handback)
     {
       if (notif.getSource() == bean)
-	notif.setSource(name);
+        notif.setSource(name);
       listener.handleNotification(notif, handback);
     }
 
diff --git a/libjava/classpath/gnu/javax/management/Translator.java b/libjava/classpath/gnu/javax/management/Translator.java
index a15994429a3..38d575aca11 100644
--- a/libjava/classpath/gnu/javax/management/Translator.java
+++ b/libjava/classpath/gnu/javax/management/Translator.java
@@ -120,125 +120,125 @@ public final class Translator
       return jtype;
     if (jclass.isArray())
       {
-	Class ctype = jclass.getComponentType();
-	if (ctype.isPrimitive())
-	  return jtype;
-	if (OpenType.ALLOWED_CLASSNAMES_LIST.contains(ctype.getName()))
-	  return jtype;
-	Object[] elems = (Object[]) jtype;
-	Object[] celems = new Object[elems.length];
-	for (int a = 0; a < elems.length; ++a)
-	  celems[a] = fromJava(elems[a], elems[a].getClass());
-	return makeArraySpecific(celems);
+        Class ctype = jclass.getComponentType();
+        if (ctype.isPrimitive())
+          return jtype;
+        if (OpenType.ALLOWED_CLASSNAMES_LIST.contains(ctype.getName()))
+          return jtype;
+        Object[] elems = (Object[]) jtype;
+        Object[] celems = new Object[elems.length];
+        for (int a = 0; a < elems.length; ++a)
+          celems[a] = fromJava(elems[a], elems[a].getClass());
+        return makeArraySpecific(celems);
       }
     String tName = getTypeName(type);
     if (jtype instanceof List || jtype instanceof Set ||
-	jtype instanceof SortedSet)
+        jtype instanceof SortedSet)
       {
-	if (jtype instanceof SortedSet)
-	  {
-	    ParameterizedType ptype = (ParameterizedType) type;
-	    Class elemClass = (Class) ptype.getActualTypeArguments()[0];
-	    if (!Comparable.class.isAssignableFrom(elemClass))
-	      throw new IllegalArgumentException(jtype + " has a " +
-						 "non-comparable element " +
-						 "type, " + elemClass);
-	    if (((SortedSet) jtype).comparator() != null)
-	      throw new IllegalArgumentException(jtype + " does not " +
-						 "use natural ordering.");
-	  }
-	Collection elems = (Collection) jtype;
-	int numElems = elems.size();
-	Object[] celems = new Object[numElems];
-	Iterator i = elems.iterator();
-	for (int a = 0; a < numElems; ++a)
-	  {
-	    Object elem = i.next();
-	    celems[a] = fromJava(elem, elem.getClass());
-	  }
-	return makeArraySpecific(celems);
+        if (jtype instanceof SortedSet)
+          {
+            ParameterizedType ptype = (ParameterizedType) type;
+            Class elemClass = (Class) ptype.getActualTypeArguments()[0];
+            if (!Comparable.class.isAssignableFrom(elemClass))
+              throw new IllegalArgumentException(jtype + " has a " +
+                                                 "non-comparable element " +
+                                                 "type, " + elemClass);
+            if (((SortedSet) jtype).comparator() != null)
+              throw new IllegalArgumentException(jtype + " does not " +
+                                                 "use natural ordering.");
+          }
+        Collection elems = (Collection) jtype;
+        int numElems = elems.size();
+        Object[] celems = new Object[numElems];
+        Iterator i = elems.iterator();
+        for (int a = 0; a < numElems; ++a)
+          {
+            Object elem = i.next();
+            celems[a] = fromJava(elem, elem.getClass());
+          }
+        return makeArraySpecific(celems);
       }
     if (jtype instanceof Enum)
       return ((Enum) jtype).name();
     if (jtype instanceof Map || jtype instanceof SortedMap)
       {
-	int lparam = tName.indexOf("<");
-	int comma = tName.indexOf(",", lparam);
-	int rparam = tName.indexOf(">", comma);
-	String key = tName.substring(lparam + 1, comma).trim();
-	String value = tName.substring(comma + 1, rparam).trim();
-	String typeName = null;
-	if (jtype instanceof Map)
-	  typeName = "java.util.Map" + tName.substring(lparam);
-	else
-	  {
-	    Class keyClass = Class.forName(key);
-	    if (!Comparable.class.isAssignableFrom(keyClass))
-	      throw new IllegalArgumentException(jtype + " has a " +
-						 "non-comparable element " +
-						 "type, " + keyClass);
-	    if (((SortedMap) jtype).comparator() != null)
-	      throw new IllegalArgumentException(jtype + " does not " +
-						 "use natural ordering.");
-	    typeName = "java.util.SortedMap" + tName.substring(lparam);
-	  }
-	OpenType k = translate(key).getOpenType();
-	OpenType v = translate(value).getOpenType(); 
-	CompositeType rowType = new CompositeType(typeName, typeName,
-						  new String[] { "key", "value" },
-						  new String[] { "Map key", "Map value"},
-						  new OpenType[] {k,v});
-	TabularType tabType = new TabularType(typeName, typeName, rowType,
-					      new String[]{"key"});
-	TabularData data = new TabularDataSupport(tabType);
-	for (Map.Entry entry : ((Map) jtype).entrySet())
-	  {
-	    try 
-	      {
-		data.put(new CompositeDataSupport(rowType,
-						  new String[] { 
-						    "key", 
-						    "value" 
-						  },
-						  new Object[] { 
-						    entry.getKey(),
-						    entry.getValue()
-						  }));
-	      }
-	    catch (OpenDataException e)
-	      {
-		throw (InternalError) (new InternalError("A problem occurred " +
-							 "converting the map " +
-							 "to a composite data " +
-							 "structure.").initCause(e));
-	      }
-	  }
-	return data;
-      }	
+        int lparam = tName.indexOf("<");
+        int comma = tName.indexOf(",", lparam);
+        int rparam = tName.indexOf(">", comma);
+        String key = tName.substring(lparam + 1, comma).trim();
+        String value = tName.substring(comma + 1, rparam).trim();
+        String typeName = null;
+        if (jtype instanceof Map)
+          typeName = "java.util.Map" + tName.substring(lparam);
+        else
+          {
+            Class keyClass = Class.forName(key);
+            if (!Comparable.class.isAssignableFrom(keyClass))
+              throw new IllegalArgumentException(jtype + " has a " +
+                                                 "non-comparable element " +
+                                                 "type, " + keyClass);
+            if (((SortedMap) jtype).comparator() != null)
+              throw new IllegalArgumentException(jtype + " does not " +
+                                                 "use natural ordering.");
+            typeName = "java.util.SortedMap" + tName.substring(lparam);
+          }
+        OpenType k = translate(key).getOpenType();
+        OpenType v = translate(value).getOpenType();
+        CompositeType rowType = new CompositeType(typeName, typeName,
+                                                  new String[] { "key", "value" },
+                                                  new String[] { "Map key", "Map value"},
+                                                  new OpenType[] {k,v});
+        TabularType tabType = new TabularType(typeName, typeName, rowType,
+                                              new String[]{"key"});
+        TabularData data = new TabularDataSupport(tabType);
+        for (Map.Entry entry : ((Map) jtype).entrySet())
+          {
+            try
+              {
+                data.put(new CompositeDataSupport(rowType,
+                                                  new String[] {
+                                                    "key",
+                                                    "value"
+                                                  },
+                                                  new Object[] {
+                                                    entry.getKey(),
+                                                    entry.getValue()
+                                                  }));
+              }
+            catch (OpenDataException e)
+              {
+                throw (InternalError) (new InternalError("A problem occurred " +
+                                                         "converting the map " +
+                                                         "to a composite data " +
+                                                         "structure.").initCause(e));
+              }
+          }
+        return data;
+      }
     if (JMX.isMXBeanInterface(jclass))
       {
-	try
-	  {
-	    MBeanServerInvocationHandler ih = (MBeanServerInvocationHandler)
-	      Proxy.getInvocationHandler(jtype);
-	    return ih.getObjectName();
-	  }
-	catch (IllegalArgumentException e)
-	  {
-	    throw new IllegalArgumentException("For a MXBean to be translated " +
-					       "to an open type, it must be a " +
-					       "proxy.", e);
-	  }
-	catch (ClassCastException e)
-	  {
-	    throw new IllegalArgumentException("For a MXBean to be translated " +
-					       "to an open type, it must have a " +
-					       "MBeanServerInvocationHandler.", e);
-	  }
+        try
+          {
+            MBeanServerInvocationHandler ih = (MBeanServerInvocationHandler)
+              Proxy.getInvocationHandler(jtype);
+            return ih.getObjectName();
+          }
+        catch (IllegalArgumentException e)
+          {
+            throw new IllegalArgumentException("For a MXBean to be translated " +
+                                               "to an open type, it must be a " +
+                                               "proxy.", e);
+          }
+        catch (ClassCastException e)
+          {
+            throw new IllegalArgumentException("For a MXBean to be translated " +
+                                               "to an open type, it must have a " +
+                                               "MBeanServerInvocationHandler.", e);
+          }
       }
     /* FIXME: Handle other types */
     throw new IllegalArgumentException("The type, " + jtype +
-				       ", is not convertible.");
+                                       ", is not convertible.");
   }
 
   /**
@@ -257,42 +257,42 @@ public final class Translator
     Class returnType = method.getReturnType();
     if (returnType.isEnum())
       {
-	String ename = (String) otype;
-	Enum[] constants = (Enum[]) returnType.getEnumConstants();
-	for (Enum c : constants)
-	  if (c.name().equals(ename))
-	    return c;
+        String ename = (String) otype;
+        Enum[] constants = (Enum[]) returnType.getEnumConstants();
+        for (Enum c : constants)
+          if (c.name().equals(ename))
+            return c;
       }
     if (List.class.isAssignableFrom(returnType))
       {
-	Object[] elems = (Object[]) otype;
-	List l = new ArrayList(elems.length);
-	for (Object elem : elems)
-	  l.add(elem);
-	return l;
+        Object[] elems = (Object[]) otype;
+        List l = new ArrayList(elems.length);
+        for (Object elem : elems)
+          l.add(elem);
+        return l;
       }
     if (Map.class.isAssignableFrom(returnType))
       {
-	TabularData data = (TabularData) otype;
-	Map m = new HashMap(data.size());
-	for (Object val : data.values())
-	  {
-	    CompositeData vals = (CompositeData) val;
-	    m.put(vals.get("key"), vals.get("value"));
-	  }
-	return m;
+        TabularData data = (TabularData) otype;
+        Map m = new HashMap(data.size());
+        for (Object val : data.values())
+          {
+            CompositeData vals = (CompositeData) val;
+            m.put(vals.get("key"), vals.get("value"));
+          }
+        return m;
       }
     try
       {
-	Method m = returnType.getMethod("from",
-					new Class[]
-	  { CompositeData.class });
-	return m.invoke(null, (CompositeData) otype);
+        Method m = returnType.getMethod("from",
+                                        new Class[]
+          { CompositeData.class });
+        return m.invoke(null, (CompositeData) otype);
       }
     catch (NoSuchMethodException e)
       {
-	/* Ignored; we expect this if this
-	   isn't a from(CompositeData) class */
+        /* Ignored; we expect this if this
+           isn't a from(CompositeData) class */
       }
     return otype;
   }
@@ -301,7 +301,7 @@ public final class Translator
    * Creates a new array which has the specific type
    * used by the elements of the original {@link Object}
    * array supplied.
-   * 
+   *
    * @param arr a series of elements in an {@link Object}
    *            array.
    * @return the same elements in a new array of the specific
@@ -310,7 +310,7 @@ public final class Translator
   private static final Object[] makeArraySpecific(Object[] arr)
   {
     Object[] rcelems = (Object[]) Array.newInstance(arr[0].getClass(),
-						    arr.length);
+                                                    arr.length);
     System.arraycopy(arr, 0, rcelems, 0, arr.length);
     return rcelems;
   }
@@ -331,160 +331,160 @@ public final class Translator
   {
     if (type.equals("boolean") || type.equals(Boolean.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.BOOLEAN,
-					       null,
-					       new Boolean[] {
-						 Boolean.TRUE,
-						 Boolean.FALSE
-					       });
+                                               "Translated parameter",
+                                               SimpleType.BOOLEAN,
+                                               null,
+                                               new Boolean[] {
+                                                 Boolean.TRUE,
+                                                 Boolean.FALSE
+                                               });
     if (type.equals("byte") || type.equals(Byte.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.BYTE,
-					       null,
-					       Byte.valueOf(Byte.MIN_VALUE),
-					       Byte.valueOf(Byte.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.BYTE,
+                                               null,
+                                               Byte.valueOf(Byte.MIN_VALUE),
+                                               Byte.valueOf(Byte.MAX_VALUE));
     if (type.equals("char") || type.equals(Character.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.CHARACTER,
-					       null,
-					       Character.valueOf(Character.MIN_VALUE),
-					       Character.valueOf(Character.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.CHARACTER,
+                                               null,
+                                               Character.valueOf(Character.MIN_VALUE),
+                                               Character.valueOf(Character.MAX_VALUE));
     if (type.equals("double") || type.equals(Double.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.DOUBLE,
-					       null,
-					       Double.valueOf(Double.MIN_VALUE),
-					       Double.valueOf(Double.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.DOUBLE,
+                                               null,
+                                               Double.valueOf(Double.MIN_VALUE),
+                                               Double.valueOf(Double.MAX_VALUE));
     if (type.equals("float") || type.equals(Float.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.FLOAT,
-					       null,
-					       Float.valueOf(Float.MIN_VALUE),
-					       Float.valueOf(Float.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.FLOAT,
+                                               null,
+                                               Float.valueOf(Float.MIN_VALUE),
+                                               Float.valueOf(Float.MAX_VALUE));
     if (type.equals("int") || type.equals(Integer.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.INTEGER,
-					       null,
-					       Integer.valueOf(Integer.MIN_VALUE),
-					       Integer.valueOf(Integer.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.INTEGER,
+                                               null,
+                                               Integer.valueOf(Integer.MIN_VALUE),
+                                               Integer.valueOf(Integer.MAX_VALUE));
     if (type.equals("long") || type.equals(Long.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.LONG,
-					       null,
-					       Long.valueOf(Long.MIN_VALUE),
-					       Long.valueOf(Long.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.LONG,
+                                               null,
+                                               Long.valueOf(Long.MIN_VALUE),
+                                               Long.valueOf(Long.MAX_VALUE));
     if (type.equals("short") || type.equals(Short.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.SHORT,
-					       null,
-					       Short.valueOf(Short.MIN_VALUE),
-					       Short.valueOf(Short.MAX_VALUE));
+                                               "Translated parameter",
+                                               SimpleType.SHORT,
+                                               null,
+                                               Short.valueOf(Short.MIN_VALUE),
+                                               Short.valueOf(Short.MAX_VALUE));
     if (type.equals(String.class.getName()))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.STRING);
+                                               "Translated parameter",
+                                               SimpleType.STRING);
     if (type.equals("void"))
       return new OpenMBeanParameterInfoSupport("TransParam",
-					       "Translated parameter",
-					       SimpleType.VOID);
+                                               "Translated parameter",
+                                               SimpleType.VOID);
     if (type.startsWith("java.util.Map"))
       {
-	int lparam = type.indexOf("<");
-	int comma = type.indexOf(",", lparam);
-	int rparam = type.indexOf(">", comma);
-	String key = type.substring(lparam + 1, comma).trim();
-	OpenType k = translate(key).getOpenType();
-	OpenType v = translate(type.substring(comma + 1, rparam).trim()).getOpenType(); 
- 	CompositeType ctype = new CompositeType(Map.class.getName(), Map.class.getName(),
-						new String[] { "key", "value" },
-						new String[] { "Map key", "Map value"},
-						new OpenType[] { k, v});
-	TabularType ttype = new TabularType(key, key, ctype,
-					    new String[] { "key" });
-	return new OpenMBeanParameterInfoSupport("TransParam",
-						 "Translated parameter",
-						 ttype);
+        int lparam = type.indexOf("<");
+        int comma = type.indexOf(",", lparam);
+        int rparam = type.indexOf(">", comma);
+        String key = type.substring(lparam + 1, comma).trim();
+        OpenType k = translate(key).getOpenType();
+        OpenType v = translate(type.substring(comma + 1, rparam).trim()).getOpenType();
+        CompositeType ctype = new CompositeType(Map.class.getName(), Map.class.getName(),
+                                                new String[] { "key", "value" },
+                                                new String[] { "Map key", "Map value"},
+                                                new OpenType[] { k, v});
+        TabularType ttype = new TabularType(key, key, ctype,
+                                            new String[] { "key" });
+        return new OpenMBeanParameterInfoSupport("TransParam",
+                                                 "Translated parameter",
+                                                 ttype);
       }
     if (type.startsWith("java.util.List"))
       {
-	int lparam = type.indexOf("<");
-	int rparam = type.indexOf(">");
-       	OpenType e = translate(type.substring(lparam + 1, rparam).trim()).getOpenType();
-	return new OpenMBeanParameterInfoSupport("TransParam",
-						 "Translated parameter",
-						 new ArrayType>(1, e)
-						 );
-      }	
+        int lparam = type.indexOf("<");
+        int rparam = type.indexOf(">");
+        OpenType e = translate(type.substring(lparam + 1, rparam).trim()).getOpenType();
+        return new OpenMBeanParameterInfoSupport("TransParam",
+                                                 "Translated parameter",
+                                                 new ArrayType>(1, e)
+                                                 );
+      }
     Class c;
     try
       {
-	c = Class.forName(type);
+        c = Class.forName(type);
       }
     catch (ClassNotFoundException e)
       {
-	throw (InternalError)
-	  (new InternalError("The class for a type used in a management bean " +
-			     "could not be loaded.").initCause(e));
+        throw (InternalError)
+          (new InternalError("The class for a type used in a management bean " +
+                             "could not be loaded.").initCause(e));
       }
     if (c.isEnum())
       {
-	Object[] values = c.getEnumConstants();
-	String[] names = new String[values.length];
-	for (int a = 0; a < values.length; ++a)
-	  names[a] = values[a].toString();
-	return new OpenMBeanParameterInfoSupport("TransParam",
-						 "Translated parameter",
-						 SimpleType.STRING,
-						 null, names);
+        Object[] values = c.getEnumConstants();
+        String[] names = new String[values.length];
+        for (int a = 0; a < values.length; ++a)
+          names[a] = values[a].toString();
+        return new OpenMBeanParameterInfoSupport("TransParam",
+                                                 "Translated parameter",
+                                                 SimpleType.STRING,
+                                                 null, names);
       }
     if (c.isArray())
       {
-	int depth;
-	for (depth = 0; c.getName().charAt(depth) == '['; ++depth)
+        int depth;
+        for (depth = 0; c.getName().charAt(depth) == '['; ++depth)
           ;
-	OpenType ot = getTypeFromClass(c.getComponentType());
-	return new OpenMBeanParameterInfoSupport("TransParam",
-						 "Translated parameter",
-						 new ArrayType>(depth, ot)
-						 );
+        OpenType ot = getTypeFromClass(c.getComponentType());
+        return new OpenMBeanParameterInfoSupport("TransParam",
+                                                 "Translated parameter",
+                                                 new ArrayType>(depth, ot)
+                                                 );
       }
     Method[] methods = c.getDeclaredMethods();
     List names = new ArrayList();
     List> types = new ArrayList>();
     for (int a = 0; a < methods.length; ++a)
       {
-	String name = methods[a].getName();
-	if (Modifier.isPublic(methods[a].getModifiers()))
-	  {
-	    if (name.startsWith("get"))
-	      {
-		names.add(name.substring(3));
-		types.add(getTypeFromClass(methods[a].getReturnType()));
-	      }
-	    else if (name.startsWith("is"))
-	      {
-		names.add(name.substring(2));
-		types.add(getTypeFromClass(methods[a].getReturnType()));
-	      }
-	  }
+        String name = methods[a].getName();
+        if (Modifier.isPublic(methods[a].getModifiers()))
+          {
+            if (name.startsWith("get"))
+              {
+                names.add(name.substring(3));
+                types.add(getTypeFromClass(methods[a].getReturnType()));
+              }
+            else if (name.startsWith("is"))
+              {
+                names.add(name.substring(2));
+                types.add(getTypeFromClass(methods[a].getReturnType()));
+              }
+          }
       }
     if (names.isEmpty())
       throw new OpenDataException("The type used does not have an open type translation.");
     String[] fields = names.toArray(new String[names.size()]);
     CompositeType ctype = new CompositeType(c.getName(), c.getName(),
-					    fields, fields,
-					    types.toArray(new OpenType[types.size()]));
+                                            fields, fields,
+                                            types.toArray(new OpenType[types.size()]));
     return new OpenMBeanParameterInfoSupport("TransParam",
-					     "Translated parameter",
-					     ctype);
+                                             "Translated parameter",
+                                             ctype);
   }
 
   /**
@@ -524,25 +524,25 @@ public final class Translator
    * @return the type name computed according to the rules above.
    */
   private static final String getTypeName(Type type)
-  { 
+  {
     if (type instanceof Class)
       {
-	Class c = (Class) type;
-	if (c.isArray())
-	  {
-	    StringBuilder b =
-	      new StringBuilder(c.getComponentType().getName());
-	    String normName = c.getName();
-	    for (int a = 0; a < normName.length(); ++a)
-	      {
-		if (normName.charAt(a) == '[')
-		  b.append("[]");
-		else
-		  break;
-	      }
-	    return b.toString();
-	  }
-	return c.getName();
+        Class c = (Class) type;
+        if (c.isArray())
+          {
+            StringBuilder b =
+              new StringBuilder(c.getComponentType().getName());
+            String normName = c.getName();
+            for (int a = 0; a < normName.length(); ++a)
+              {
+                if (normName.charAt(a) == '[')
+                  b.append("[]");
+                else
+                  break;
+              }
+            return b.toString();
+          }
+        return c.getName();
       }
     return type.toString();
   }
diff --git a/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java b/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
index 05023840ba3..e952393cc92 100644
--- a/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
+++ b/libjava/classpath/gnu/javax/naming/giop/ContextContinuation.java
@@ -79,7 +79,7 @@ import org.omg.CosNaming.NamingContextPackage.NotFound;
  * to the existing naming service. When listing bindings, it uses the
  * {@link Context#BATCHSIZE} property to determine, how many bindings should
  * be returned at once (the process is transparend)
- * 
+ *
  * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
  */
 public class ContextContinuation implements Context
@@ -90,28 +90,28 @@ public class ContextContinuation implements Context
    * one. Use {@link Context#BATCHSIZE} to override the value of this constant.
    */
   public int DEFAULT_BATCH_SIZE = 20;
-  
+
   /**
    * The actual CORBA naming service.
    */
   NamingContextExt service;
-  
+
   /**
    * The object request broker, used to access the naming service. This field
-   * is only initialised when the context is constructed from the URL. 
+   * is only initialised when the context is constructed from the URL.
    */
   ORB orb;
-  
+
   /**
    * The properties.
    */
   Hashtable properties;
-  
+
   /**
    * The parent factory.
    */
   GiopNamingServiceFactory factory;
-  
+
   /**
    * The name transformer to obtain the name from its string representation. The
    * to_name method of the naming service is avoided as it may be remote and
@@ -119,16 +119,16 @@ public class ContextContinuation implements Context
    * specific.
    */
   static NameTransformer transformer = new NameTransformer();
-  
+
   /**
    * The batch size for list operations - how many to return at once.
    */
   public final int howMany;
-  
+
   /**
    * Creates a new naming context that uses naming service, represented by the
    * given CORBA object.
-   * 
+   *
    * @param nsObject
    *          the naming service object. It must be possible to narrow it into
    *          the NamingContextExt.
@@ -177,7 +177,7 @@ public class ContextContinuation implements Context
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object. The components of the name are
    * mapped into the components of the CORBA name.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -218,7 +218,7 @@ public class ContextContinuation implements Context
   /**
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -261,7 +261,7 @@ public class ContextContinuation implements Context
    * can be called several times, but after it has been once invoked, it is not
    * allowed to call any other method of this context. This method destroys
    * the ORB, if we have one.
-   * 
+   *
    * @throws NamingException
    */
   public void close() throws NamingException
@@ -292,7 +292,7 @@ public class ContextContinuation implements Context
    * Creates the new naming subcontext and binds it to the current (this)
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
-   * 
+   *
    * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
@@ -312,7 +312,7 @@ public class ContextContinuation implements Context
           toGiop(subContext));
         Hashtable clonedProps = new Hashtable();
         clonedProps.putAll(properties);
-        
+
         // Nulls are passed both for orb and factory, as the child contexts
         // need not to do any cleanup.
         return new ContextContinuation(subcontext, clonedProps, null, null);
@@ -335,7 +335,7 @@ public class ContextContinuation implements Context
    * Creates the new naming subcontext and binds it to the current (this)
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
-   * 
+   *
    * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
@@ -351,7 +351,7 @@ public class ContextContinuation implements Context
   {
     try
       {
-        org.omg.CORBA.Object subcontext = 
+        org.omg.CORBA.Object subcontext =
           service.bind_new_context(transformer.toName(subContext));
         Hashtable clonedProps = new Hashtable();
         clonedProps.putAll(properties);
@@ -379,7 +379,7 @@ public class ContextContinuation implements Context
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
@@ -395,7 +395,7 @@ public class ContextContinuation implements Context
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
@@ -411,7 +411,7 @@ public class ContextContinuation implements Context
    * Returs the full name of this naming context. The returned string is not a
    * JNDI composite name and should not be passed directly to the methods of the
    * naming context. This implementation returns the IOR.
-   * 
+   *
    * @return the full name of this naming context, in its own namespace.
    * @throws OperationNotSupportedException
    *           if the naming system, represented by this context, does not
@@ -459,7 +459,7 @@ public class ContextContinuation implements Context
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -499,7 +499,7 @@ public class ContextContinuation implements Context
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -538,7 +538,7 @@ public class ContextContinuation implements Context
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -576,7 +576,7 @@ public class ContextContinuation implements Context
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -612,7 +612,7 @@ public class ContextContinuation implements Context
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name
    *          the name of the object being searched in this context
    * @return the named object
@@ -642,7 +642,7 @@ public class ContextContinuation implements Context
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name
    *          the name of the object being searched in this context
    * @return the named object
@@ -688,7 +688,7 @@ public class ContextContinuation implements Context
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -723,7 +723,7 @@ public class ContextContinuation implements Context
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -758,7 +758,7 @@ public class ContextContinuation implements Context
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName
    *          the existing name of the known object
    * @param newName
@@ -778,7 +778,7 @@ public class ContextContinuation implements Context
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName
    *          the existing name of the known object
    * @param newName
@@ -800,7 +800,7 @@ public class ContextContinuation implements Context
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name
    *          the name to be removed
    * @throws NameNotFoundException
@@ -834,7 +834,7 @@ public class ContextContinuation implements Context
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name
    *          the name to be removed
    * @throws NameNotFoundException
@@ -862,12 +862,12 @@ public class ContextContinuation implements Context
         throw new InvalidNameException(name);
       }
   }
-  
+
  /**
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal.
-   * 
+   *
    * @param key
    *          the name of the new property
    * @param value
@@ -888,7 +888,7 @@ public class ContextContinuation implements Context
    * Returns the environment, associated with this naming context. The returned
    * table should never be modified by the caller. Use {@link #addToEnvironment}
    * and {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
@@ -900,7 +900,7 @@ public class ContextContinuation implements Context
   /**
    * Removes the property with the given name from the environment. Returns
    * without action if this property is not defined.
-   * 
+   *
    * @param propName
    *          the name of the property being removed.
    * @return the value of the property that has been removed or null if the
@@ -911,12 +911,12 @@ public class ContextContinuation implements Context
   {
     return properties.remove(propName);
   }
-  
+
   /**
    * Convert the {@link Name} into array of the name components, required to the
    * CORBA naming service. First the string representation is obtained, then
    * it is converted using parsing rules of the CORBA name.
-   * 
+   *
    * @param name
    *          then name to convert
    * @return the converted array of components.
@@ -925,11 +925,11 @@ public class ContextContinuation implements Context
   {
     return transformer.toName(name.toString());
   }
-  
+
   /**
    * Get the batch size from the environment properties. The batch size is used
    * for listing operations.
-   * 
+   *
    * @return the batch size, or some default value if not specified.
    */
   public int getBatchSize()
@@ -951,6 +951,6 @@ public class ContextContinuation implements Context
       }
     return batchSize;
   }
-  
-  
+
+
 }
diff --git a/libjava/classpath/gnu/javax/naming/giop/CorbalocParser.java b/libjava/classpath/gnu/javax/naming/giop/CorbalocParser.java
index 95ebb8a0689..4b7883969e4 100644
--- a/libjava/classpath/gnu/javax/naming/giop/CorbalocParser.java
+++ b/libjava/classpath/gnu/javax/naming/giop/CorbalocParser.java
@@ -65,15 +65,15 @@ import org.omg.CORBA.ORBPackage.InvalidName;
 
 /**
  * Parses the alternative IOR representations into our IOR structure.
- * 
+ *
  * TODO This parser currently supports only one address per target string. A
  * string with the multiple addresses will be accepted, but only the last
  * address will be taken into consideration. The fault tolerance is not yet
  * implemented.
- * 
+ *
  * The key string is filtered using {@link java.net.URLDecoder} that replaces
  * the agreed escape sequences by the corresponding non alphanumeric characters.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class CorbalocParser
@@ -93,17 +93,17 @@ public class CorbalocParser
    * The IOR prefix.
    */
   public static final String pxIOR = "ior";
-  
+
   /**
    * The file:// prefix.
    */
   public static final String pxFILE = "file://";
-  
+
   /**
    * The ftp:// prefix.
    */
   public static final String pxFTP = "ftp://";
-  
+
   /**
    * The http:// prefix.
    */
@@ -146,7 +146,7 @@ public class CorbalocParser
 
   /**
    * Parse CORBALOC.
-   * 
+   *
    * The expected format is: 
      
    * 1. corbaloc:[iiop][version.subversion@]:host[:port]/key 
      
    * 2. corbaloc:rir:[/key] 
      
@@ -155,14 +155,14 @@ public class CorbalocParser
    * 5. file://[file name]
      
    * 6. http://[url]
      
    * 7. ftp://[url]
      
-   * 
+   *
    * Protocol defaults to IOP, the object key defaults to the NameService.
-   * 
+   *
    * @param corbaloc the string to parse.
    * @param orb the ORB, needed to create IORs and resolve rir references.
-   * 
+   *
    * @return the arrey of strings, first member being the IOR of the
-   * naming service, second member the name in the naming service. 
+   * naming service, second member the name in the naming service.
    */
   public synchronized String[] corbaloc(String corbaloc,
     ORB orb)
@@ -170,7 +170,7 @@ public class CorbalocParser
   {
     return corbaloc(corbaloc, orb, 0);
   }
-  
+
   /**
    * Parse controlling against the infinite recursion loop.
    */
@@ -182,7 +182,7 @@ public class CorbalocParser
     // by malicious attempt.
     if (recursion > 10)
       throw new DATA_CONVERSION("More than 10 redirections");
-    
+
     if (corbaloc.startsWith(pxFILE))
       return corbaloc(readFile(corbaloc.substring(pxFILE.length())), orb, recursion+1);
     else if (corbaloc.startsWith(pxHTTP))
@@ -334,7 +334,7 @@ public class CorbalocParser
       throw new InvalidNameException("Unsupported protocol '" + t[p] +
                                      "' (iiop expected)");
   }
-  
+
   /**
    * Read IOR from the file in the local file system.
    */
@@ -363,7 +363,7 @@ public class CorbalocParser
         throw (d);
       }
   }
-  
+
   /**
    * Read IOR from the remote URL.
    */
diff --git a/libjava/classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java b/libjava/classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java
index 9b93f8bb6a8..c2de75b3816 100644
--- a/libjava/classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/giop/GiopNamingEnumeration.java
@@ -51,7 +51,7 @@ import org.omg.CosNaming.BindingListHolder;
 /**
  * Iterates over name class pairs, obtaining values first from the binding list
  * and then from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public abstract class GiopNamingEnumeration implements NamingEnumeration
@@ -60,18 +60,18 @@ public abstract class GiopNamingEnumeration implements NamingEnumeration
    * The array of bindings, returned at once.
    */
   Binding[] list;
-  
+
   /**
    * The binding iterator to obtain the subsequent bindings. May be null,
    * if all values are stored in the list.
    */
   BindingIterator iterator;
-  
+
   /**
    * The batch size.
    */
   int batch;
-  
+
   /**
    * The position of the element in the binding list, that must be returned
    * during the subsequent call of the next(). If this field is grater or equal
@@ -79,17 +79,17 @@ public abstract class GiopNamingEnumeration implements NamingEnumeration
    * iterator.
    */
   int p;
-  
+
   GiopNamingEnumeration(BindingListHolder bh, BindingIteratorHolder bih, int batchSize)
   {
     list = bh.value;
     iterator = bih.value;
     batch = batchSize;
   }
-  
+
   /**
    * Convert from the CORBA binding into that this enumeration should return.
-   * 
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
@@ -104,10 +104,10 @@ public abstract class GiopNamingEnumeration implements NamingEnumeration
         iterator = null;
       }
   }
-  
+
   /**
    * Checks if there are more elements to return.
-   * 
+   *
    * @throws NamingException
    *           never
    */
@@ -118,7 +118,7 @@ public abstract class GiopNamingEnumeration implements NamingEnumeration
 
   /**
    * Returns the next element.
-   * 
+   *
    * @throws NamingException
    *           never
    */
@@ -155,7 +155,7 @@ public abstract class GiopNamingEnumeration implements NamingEnumeration
     else
       throw new NoSuchElementException();
   }
-  
+
   /**
    * Tries to obtain more elements, return true on success. Updates the fields
    * accordingly.
diff --git a/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java b/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java
index 6c221548f47..e8aac3b6584 100644
--- a/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java
+++ b/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceFactory.java
@@ -61,7 +61,7 @@ import org.omg.CORBA.ORB;
  * parsed using the specification of the corbaname urls. Being the naming
  * service, the returned context supports creating the subcontexts, forwarding
  * this task to the existing naming service.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
  */
 public class GiopNamingServiceFactory
@@ -70,17 +70,17 @@ public class GiopNamingServiceFactory
    * The default naming service provider. It is assumed, that the naming service
    * is running on the port 900 of the local host, using the GIOP version 1.2
    */
-  public static final String DEFAULT_PROVIDER = 
+  public static final String DEFAULT_PROVIDER =
     "corbaloc:iiop:1.2@127.0.0.1:900/NameService";
-  
+
   /**
-   * The table of all instantiated ORB's that are found by they ORB 
+   * The table of all instantiated ORB's that are found by they ORB
    * properties signatures. If all ORB related properties are the same,
    * the ORB's are shared.
    */
   public static Hashtable orbs = new Hashtable();
-  
-  
+
+
   /**
    * Create a new instance of the corbaname URL context.
    */
@@ -116,13 +116,13 @@ public class GiopNamingServiceFactory
 
     return new GiopNamingServiceURLContext(environment, this, orb);
   }
-  
+
   /**
    * Check if this ORB is still in use (maybe it is time to shutdown it). This
    * method only works when the Classpath CORBA implementation is used
    * (otherwise it return without action). The method is called from the close()
    * method of the created context.
-   * 
+   *
    * @param orb
    *          the ORB that maybe is no longer referenced.
    */
@@ -139,7 +139,7 @@ public class GiopNamingServiceFactory
               {
                 cOrb.shutdown(false);
                 cOrb.destroy();
-                
+
                 Enumeration keys = orbs.keys();
                 Object key;
                 Remove: while (keys.hasMoreElements())
@@ -155,7 +155,7 @@ public class GiopNamingServiceFactory
           }
       }
   }
-  
+
   /**
    * Get all properties.
    */
@@ -164,7 +164,7 @@ public class GiopNamingServiceFactory
      TreeMap map = new TreeMap();
      map.putAll(props);
      CPStringBuilder b = new CPStringBuilder(50*props.size());
-     
+
      Iterator iter = map.entrySet().iterator();
      Map.Entry m;
      while (iter.hasNext())
diff --git a/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java b/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java
index 50446ac7edd..0d2e290b47d 100644
--- a/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java
+++ b/libjava/classpath/gnu/javax/naming/giop/GiopNamingServiceURLContext.java
@@ -80,7 +80,7 @@ import org.omg.CosNaming.NamingContextPackage.NotFound;
  * to the existing naming service. When listing bindings, it uses the
  * {@link Context#BATCHSIZE} property to determine, how many bindings should
  * be returned at once (the process is transparend)
- * 
+ *
  * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
  */
 public class GiopNamingServiceURLContext extends CorbalocParser implements
@@ -95,7 +95,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
 
   /**
    * The object request broker, used to access the naming service. This field
-   * is only initialised when the context is constructed from the URL. 
+   * is only initialised when the context is constructed from the URL.
    */
   ORB orb;
 
@@ -125,7 +125,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Creates a new naming context that uses naming service, represented by the
    * given CORBA object.
-   * 
+   *
    * @param props
    *          the environment table.
    * @param aFactory
@@ -143,7 +143,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
     properties = props;
     howMany = getBatchSize();
   }
-  
+
   public NamingContextExt getService(String address)
   {
     org.omg.CORBA.Object nsObject = orb.string_to_object(address);
@@ -199,7 +199,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object. The components of the name are
    * mapped into the components of the CORBA name.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -220,7 +220,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -237,7 +237,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   {
     try
       {
-        String[] n = split(name); 
+        String[] n = split(name);
         org.omg.CORBA.Object object = (org.omg.CORBA.Object) obj;
         getService(n[0]).bind(transformer.toName(n[1]), object);
       }
@@ -264,7 +264,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * can be called several times, but after it has been once invoked, it is not
    * allowed to call any other method of this context. This method destroys
    * the ORB, if we have one.
-   * 
+   *
    * @throws NamingException
    */
   public void close() throws NamingException
@@ -295,7 +295,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Creates the new naming subcontext and binds it to the current (this)
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
-   * 
+   *
    * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
@@ -316,7 +316,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Creates the new naming subcontext and binds it to the current (this)
    * context. The returned object will wrap around the newly created CORBA
    * subcontext
-   * 
+   *
    * @param subContext
    *          the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
@@ -360,7 +360,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
@@ -376,7 +376,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param subContext
    *          the name of the subcontext beig removed.
    * @throws ContextNotEmptyException
@@ -419,7 +419,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -437,7 +437,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -449,7 +449,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
     BindingListHolder bl = new BindingListHolder();
 
     NamingContext subcontext;
-    
+
     String [] n = split(name);
     NamingContextExt service = getService(n[0]);
 
@@ -479,7 +479,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -496,7 +496,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name
    *          the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
@@ -508,7 +508,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
     BindingListHolder bl = new BindingListHolder();
 
     NamingContext subcontext;
-    
+
     String [] n = split(name);
     NamingContextExt service = getService(n[0]);
 
@@ -535,7 +535,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name
    *          the name of the object being searched in this context
    * @return the named object
@@ -550,7 +550,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name
    *          the name of the object being searched in this context
    * @return the named object
@@ -598,7 +598,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -617,7 +617,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name
    *          the name that will be given to the object (in the scope of this
    *          context).
@@ -655,7 +655,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName
    *          the existing name of the known object
    * @param newName
@@ -675,7 +675,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName
    *          the existing name of the known object
    * @param newName
@@ -697,7 +697,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name
    *          the name to be removed
    * @throws NameNotFoundException
@@ -716,7 +716,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name
    *          the name to be removed
    * @throws NameNotFoundException
@@ -752,7 +752,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal.
-   * 
+   *
    * @param key
    *          the name of the new property
    * @param value
@@ -773,7 +773,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Returns the environment, associated with this naming context. The returned
    * table should never be modified by the caller. Use {@link #addToEnvironment}
    * and {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
@@ -785,7 +785,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Removes the property with the given name from the environment. Returns
    * without action if this property is not defined.
-   * 
+   *
    * @param propName
    *          the name of the property being removed.
    * @return the value of the property that has been removed or null if the
@@ -801,7 +801,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
    * Convert the {@link Name} into array of the name components, required to the
    * CORBA naming service. First the string representation is obtained, then
    * it is converted using parsing rules of the CORBA name.
-   * 
+   *
    * @param name
    *          then name to convert
    * @return the converted array of components.
@@ -814,7 +814,7 @@ public class GiopNamingServiceURLContext extends CorbalocParser implements
   /**
    * Get the batch size from the environment properties. The batch size is used
    * for listing operations.
-   * 
+   *
    * @return the batch size, or some default value if not specified.
    */
   public int getBatchSize()
diff --git a/libjava/classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java b/libjava/classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java
index 68ba49b3fed..dd9ed02656c 100644
--- a/libjava/classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/giop/ListBindingsEnumeration.java
@@ -50,7 +50,7 @@ import org.omg.CosNaming.NamingContext;
 /**
  * Iterates over bindings, obtaining values first from the binding list and then
  * from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class ListBindingsEnumeration extends GiopNamingEnumeration implements
@@ -60,10 +60,10 @@ public class ListBindingsEnumeration extends GiopNamingEnumeration implements
    * The naming service, to resolve the objects.
    */
   NamingContext service;
-  
+
   /**
    * Create the new enumeration
-   * 
+   *
    * @param bh
    *          holder, containing the first portion of the bindings
    * @param bih
@@ -75,19 +75,19 @@ public class ListBindingsEnumeration extends GiopNamingEnumeration implements
    *          the naming service, used to obtain the objects, bound to the
    *          names.
    */
-  public ListBindingsEnumeration(BindingListHolder bh, 
-                                 BindingIteratorHolder bih, int batchSize, 
+  public ListBindingsEnumeration(BindingListHolder bh,
+                                 BindingIteratorHolder bih, int batchSize,
                                  NamingContext aService)
   {
     super(bh, bih, batchSize);
     service = aService;
   }
-  
+
   /**
    * Convert from the CORBA binding into the javax.naming binding. As the CORBA
    * naming service binding does not contain the object itself, this method
    * makes the additional calls to the naming service.
-   * 
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
@@ -102,7 +102,7 @@ public class ListBindingsEnumeration extends GiopNamingEnumeration implements
         if (i < binding.binding_name.length - 1)
           name.append('/');
       }
-    
+
     try
       {
         Object object = service.resolve(binding.binding_name);
diff --git a/libjava/classpath/gnu/javax/naming/giop/ListEnumeration.java b/libjava/classpath/gnu/javax/naming/giop/ListEnumeration.java
index 3fca1e0abc8..68a40fcf017 100644
--- a/libjava/classpath/gnu/javax/naming/giop/ListEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/giop/ListEnumeration.java
@@ -52,7 +52,7 @@ import org.omg.CosNaming.NamingContext;
 /**
  * Iterates over name class pairs, obtaining values first from the binding list
  * and then from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class ListEnumeration extends GiopNamingEnumeration implements
@@ -60,7 +60,7 @@ public class ListEnumeration extends GiopNamingEnumeration implements
 {
   /**
    * Create the new enumeration
-   * 
+   *
    * @param bh
    *          holder, containing the first portion of the bindings
    * @param bih
@@ -69,18 +69,18 @@ public class ListEnumeration extends GiopNamingEnumeration implements
    *          the number of bindings the the iterator will be requested to
    *          return as a single pack
    */
-  public ListEnumeration(BindingListHolder bh, 
+  public ListEnumeration(BindingListHolder bh,
                                  BindingIteratorHolder bih, int batchSize)
   {
     super(bh, bih, batchSize);
   }
-  
+
   /**
    * Convert from the CORBA binding into the {@link NameClassPair} that this
    * enumeration should return. This method converts into NameClassPair,
    * connecting the name components with slashes and setting the class name
    * to either NamingContext or GIOP Object.
-   * 
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
@@ -113,6 +113,6 @@ public class ListEnumeration extends GiopNamingEnumeration implements
 
     NameClassPair pair = new NameClassPair(name.toString(), className);
     return pair;
-  }  
-  
+  }
+
 }
diff --git a/libjava/classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java b/libjava/classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java
index b423c721bc0..f37f8022dc4 100644
--- a/libjava/classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java
+++ b/libjava/classpath/gnu/javax/naming/ictxImpl/trans/GnuName.java
@@ -47,7 +47,7 @@ import javax.naming.Name;
 
 /**
  * The implementation of the {@link Name}.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class GnuName
@@ -61,7 +61,7 @@ public class GnuName
   {
     /**
      * Get the new enumeration that enumerates from the given position forward
-     * 
+     *
      * @param position the position of the first name component to enumerate (0
      *          means first element)
      */
@@ -134,7 +134,7 @@ public class GnuName
 
   /**
    * Creates the name, containing from the given chain of the atomic components.
-   * 
+   *
    * @param name the array, containing the name components.
    */
   public GnuName(String[] name)
@@ -157,7 +157,7 @@ public class GnuName
    * Inserts the given String component to this Name
    * at the given index. The method modifies the current Name and
    * then returns it.
-   * 
+   *
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *              then zero or greater then or equal to size().
    * @exception InvalidNameException if the given String is not a
@@ -181,7 +181,7 @@ public class GnuName
    * Adds the given String component to the end of this
    * Name. The method modifies the current Name
    * and then returns it.
-   * 
+   *
    * @exception InvalidNameException if the given String is not a
    *              valid component for this Name.
    */
@@ -203,7 +203,7 @@ public class GnuName
    * Name at the given index. Components after this index (if
    * any) are shifted up. The method modifies the current Name
    * and then returns it.
-   * 
+   *
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *              then zero or greater then or equal to size().
    * @exception InvalidNameException if any of the given components is not a
@@ -230,7 +230,7 @@ public class GnuName
    * Adds all the components of the given Name to the end of this
    * Name. The method modifies the current Name
    * and then returns it.
-   * 
+   *
    * @exception InvalidNameException if any of the given components is not a
    *              valid component for this Name.
    */
@@ -296,7 +296,7 @@ public class GnuName
 
   /**
    * Gets the component at the given index.
-   * 
+   *
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *              then zero or greater then or equal to size().
    */
@@ -317,7 +317,7 @@ public class GnuName
   /**
    * Returns the components till the given index as a Name. The
    * returned Name can be modified without changing the original.
-   * 
+   *
    * @param posn the ending position, exclusive
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
    *              then zero or greater then or equal to size().
@@ -331,7 +331,7 @@ public class GnuName
    * Returns the components from the given index till the end as a
    * Name. The returned Name can be modified
    * without changing the original.
-   * 
+   *
    * @param posn the starting position, inclusive. If it is equal to the size of
    *          the name, the empty name is returned.
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
@@ -354,7 +354,7 @@ public class GnuName
   /**
    * Removes the component at the given index from this Name.
    * The method modifies the current Name and then returns it.
-   * 
+   *
    * @exception InvalidNameException if the name size reduces below zero.
    */
   public Object remove(int posn) throws InvalidNameException
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java b/libjava/classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java
index 7fe2e5c8cad..c6fb8481f02 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/corbaname/corbanameURLContextFactory.java
@@ -43,8 +43,8 @@ import javax.naming.spi.ObjectFactory;
 
 /**
  * The GIOP URL context factory.
- * 
- * @author Audrius Meskauskas (audriusa@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
  */
 public class corbanameURLContextFactory extends GiopNamingServiceFactory
     implements ObjectFactory
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
index ee8c7791419..a94ae6d65c9 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ContextContinuation.java
@@ -60,8 +60,8 @@ import javax.naming.NamingException;
 import javax.naming.OperationNotSupportedException;
 
 /**
- * The implementation of the RMI URL context. This context connects 
- * 
+ * The implementation of the RMI URL context. This context connects
+ *
  * @author Audrius Meskauskas
  */
 public class ContextContinuation implements Context
@@ -70,18 +70,18 @@ public class ContextContinuation implements Context
    * The default registry location.
    */
   public static final String DEFAULT_REGISTRY_LOCATION = "rmi://localhost:1099";
-  
+
   /**
    * The local or remote RMI registry, performing the actual work for this
    * context.
    */
   Registry registry;
-  
+
  /**
    * The properties.
    */
   Properties properties;
-  
+
   /**
    * The flag, indicating, that the lookup methods were called before.
    * If the lookup methods were called before, the existing ORB cannot be
@@ -89,14 +89,14 @@ public class ContextContinuation implements Context
    * unfunctional.
    */
   boolean lookupCalled;
-  
+
   /**
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal. This method replaces
    * the registry. The new registry will be lazily instantiated on the first
    * call.
-   * 
+   *
    * @param key
    *          the name of the new property
    * @param value
@@ -117,7 +117,7 @@ public class ContextContinuation implements Context
    * table should never be modified by the caller (the registry would not be updated
    * in such case). Use {@link #addToEnvironment} and
    * {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
@@ -132,7 +132,7 @@ public class ContextContinuation implements Context
    * constructing the new ORB with the changes set of properties (you can
    * replace the CORBA implementation provider, for instance). The new ORB will
    * be lazily instantiated on the first call.
-   * 
+   *
    * @param propName
    *          the name of the property being removed.
    * @return the value of the property that has been removed or null if the
@@ -144,18 +144,18 @@ public class ContextContinuation implements Context
     removeRegistry();
     return properties.remove(propName);
   }
-  
+
   /**
    * Remove the current registry reference.
    */
   public void removeRegistry()
   {
-    registry = null;    
+    registry = null;
   }
-  
+
   /**
    * Get the cached or new registry reference.
-   * 
+   *
    * @return the registry reference, either cached or new.
    */
   public Registry getRegistry() throws NamingException
@@ -164,17 +164,17 @@ public class ContextContinuation implements Context
       {
         String address = properties.getProperty(Context.PROVIDER_URL,
                                                 DEFAULT_REGISTRY_LOCATION);
-        
+
         // The format like rmi://localhost:1099 is expected. Parse.
         if (!address.startsWith("rmi://"))
           throw new InvalidNameException(address);
-        
+
         String a = address.substring("rmi://".length());
-        
+
         // The colon, if present, indicates the start of the port number.
         int colon = a.lastIndexOf(':');
         int port;
-        
+
         try
           {
             if (colon >=0)
@@ -188,8 +188,8 @@ public class ContextContinuation implements Context
         catch (NumberFormatException e1)
           {
             throw new InvalidNameException(address);
-          } 
-            
+          }
+
         try
           {
             registry = LocateRegistry.getRegistry(a, port);
@@ -204,7 +204,7 @@ public class ContextContinuation implements Context
 
   /**
    * Create the rmi url context that works, talking with the given RMI registry.
-   * 
+   *
    * @param props
    *          the properties for this context
    * @param initialRegistry
@@ -217,11 +217,11 @@ public class ContextContinuation implements Context
       properties.putAll(props);
     registry = initialRegistry;
   }
-  
+
   /**
    * Bind the given name into this context. The .toString() is called to
    * convert into the string representation, required by RMI registry.
-   * 
+   *
    * @throws NamingException if the object is not an instance of Remote
    */
   public void bind(Name name, Object obj) throws NamingException
@@ -362,7 +362,7 @@ public class ContextContinuation implements Context
   {
     if (name.length() > 0)
       throw new OperationNotSupportedException("Only empty name is accepted");
-    
+
     try
       {
         return new ListEnumeration(getRegistry().list());
@@ -375,7 +375,7 @@ public class ContextContinuation implements Context
 
   /**
    * List existing bindings of this context (the parameter must be empty name,
-   * indicating the root context). 
+   * indicating the root context).
    */
   public NamingEnumeration listBindings(Name name) throws NamingException
   {
@@ -386,13 +386,13 @@ public class ContextContinuation implements Context
 
   /**
    * List existing bindings of this context (the parameter must be empty name,
-   * indicating the root context). 
+   * indicating the root context).
    */
   public NamingEnumeration listBindings(String name) throws NamingException
   {
     if (name.length() > 0)
       throw new OperationNotSupportedException("Only empty name is accepted");
-    
+
     try
       {
         Registry r = getRegistry();
@@ -422,7 +422,7 @@ public class ContextContinuation implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name (.toString()) is used to convert into string
    *          representation.
@@ -436,7 +436,7 @@ public class ContextContinuation implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name.
    * @param obj
@@ -462,7 +462,7 @@ public class ContextContinuation implements Context
                                   + obj.getClass().getName());
       }
   }
-  
+
   /**
    * Renames the object. If the new name is already bound in the given context,
    * the {@link AlreadyBoundException} is thrown and the oldName binding is
@@ -549,7 +549,7 @@ public class ContextContinuation implements Context
         throw new CommunicationException(e.toString());
       }
   }
-  
+
   /**
    * Release the associated resources.
    */
@@ -557,10 +557,10 @@ public class ContextContinuation implements Context
   {
     removeRegistry();
   }
-  
+
   /**
    * Resolve the object by name.
-   * 
+   *
    * @param name
    *          the object name, .toString() is used to get the string
    *          representation.
@@ -569,10 +569,10 @@ public class ContextContinuation implements Context
   {
     return lookup(name.toString());
   }
-  
+
   /**
    * Resolve the object by name
-   * 
+   *
    * @param name the object name.
    */
   public Object lookup(String name) throws NamingException
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java
index 757e8bf59c1..6ac4788d0f7 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListBindingsEnumeration.java
@@ -45,7 +45,7 @@ import javax.naming.NamingEnumeration;
 /**
  * Iterates over bindings, obtaining values first from the binding list and then
  * from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class ListBindingsEnumeration extends RmiNamingEnumeration implements
@@ -55,10 +55,10 @@ public class ListBindingsEnumeration extends RmiNamingEnumeration implements
    * The naming service, to resolve the objects.
    */
   Registry service;
-  
+
   /**
    * Create the new enumeration
-   * 
+   *
    * @param bindings
    *          the list of the bound names
    * @param aService
@@ -70,12 +70,12 @@ public class ListBindingsEnumeration extends RmiNamingEnumeration implements
     super(bindings);
     service = aService;
   }
-  
+
   /**
    * Convert from the CORBA binding into the javax.naming binding. As the CORBA
    * naming service binding does not contain the object itself, this method
    * makes the additional calls to the naming service.
-   * 
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java
index b4142c5e37d..b64ca87ea33 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/ListEnumeration.java
@@ -46,7 +46,7 @@ import javax.naming.NamingEnumeration;
 /**
  * Iterates over name class pairs, obtaining values first from the binding list
  * and then from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class ListEnumeration extends RmiNamingEnumeration implements
@@ -54,7 +54,7 @@ public class ListEnumeration extends RmiNamingEnumeration implements
 {
   /**
    * Create the new enumeration
-   * 
+   *
    * @param bindings
    *          the array of the binding names, returned by the RMI registry.
    */
@@ -62,11 +62,11 @@ public class ListEnumeration extends RmiNamingEnumeration implements
   {
     super(bindings);
   }
-  
+
   /**
    * Convert from the binding name into the {@link NameClassPair} that this
-   * enumeration should return. 
-   * 
+   * enumeration should return.
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
@@ -75,6 +75,6 @@ public class ListEnumeration extends RmiNamingEnumeration implements
   {
     NameClassPair pair = new NameClassPair(binding, Remote.class.getName());
     return pair;
-  }  
-  
+  }
+
 }
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java
index 29eb61b4be5..c8e6a158a72 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiContinuation.java
@@ -60,8 +60,8 @@ import javax.naming.NamingException;
 import javax.naming.OperationNotSupportedException;
 
 /**
- * The implementation of the RMI URL context. This context connects 
- * 
+ * The implementation of the RMI URL context. This context connects
+ *
  * @author Audrius Meskauskas
  */
 public class RmiContinuation implements Context
@@ -70,18 +70,18 @@ public class RmiContinuation implements Context
    * The default registry location.
    */
   public static final String DEFAULT_REGISTRY_LOCATION = "rmi://localhost:1099";
-  
+
   /**
    * The local or remote RMI registry, performing the actual work for this
    * context.
    */
   Registry registry;
-  
+
  /**
    * The properties.
    */
   Properties properties;
-  
+
   /**
    * The flag, indicating, that the lookup methods were called before.
    * If the lookup methods were called before, the existing ORB cannot be
@@ -89,14 +89,14 @@ public class RmiContinuation implements Context
    * unfunctional.
    */
   boolean lookupCalled;
-  
+
   /**
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal. This method replaces
    * the registry. The new registry will be lazily instantiated on the first
    * call.
-   * 
+   *
    * @param key
    *          the name of the new property
    * @param value
@@ -117,7 +117,7 @@ public class RmiContinuation implements Context
    * table should never be modified by the caller (the registry would not be updated
    * in such case). Use {@link #addToEnvironment} and
    * {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
@@ -132,7 +132,7 @@ public class RmiContinuation implements Context
    * constructing the new ORB with the changes set of properties (you can
    * replace the CORBA implementation provider, for instance). The new ORB will
    * be lazily instantiated on the first call.
-   * 
+   *
    * @param propName
    *          the name of the property being removed.
    * @return the value of the property that has been removed or null if the
@@ -144,18 +144,18 @@ public class RmiContinuation implements Context
     removeRegistry();
     return properties.remove(propName);
   }
-  
+
   /**
    * Remove the current registry reference.
    */
   public void removeRegistry()
   {
-    registry = null;    
+    registry = null;
   }
-  
+
   /**
    * Get the cached or new registry reference.
-   * 
+   *
    * @return the registry reference, either cached or new.
    */
   public Registry getRegistry() throws NamingException
@@ -164,17 +164,17 @@ public class RmiContinuation implements Context
       {
         String address = properties.getProperty(Context.PROVIDER_URL,
                                                 DEFAULT_REGISTRY_LOCATION);
-        
+
         // The format like rmi://localhost:1099 is expected. Parse.
         if (!address.startsWith("rmi://"))
           throw new InvalidNameException(address);
-        
+
         String a = address.substring("rmi://".length());
-        
+
         // The colon, if present, indicates the start of the port number.
         int colon = a.lastIndexOf(':');
         int port;
-        
+
         try
           {
             if (colon >=0)
@@ -188,8 +188,8 @@ public class RmiContinuation implements Context
         catch (NumberFormatException e1)
           {
             throw new InvalidNameException(address);
-          } 
-            
+          }
+
         try
           {
             registry = LocateRegistry.getRegistry(a, port);
@@ -204,7 +204,7 @@ public class RmiContinuation implements Context
 
   /**
    * Create the rmi url context that works, talking with the given RMI registry.
-   * 
+   *
    * @param props
    *          the properties for this context
    */
@@ -214,11 +214,11 @@ public class RmiContinuation implements Context
     if (props != null)
       properties.putAll(props);
   }
-  
+
   /**
    * Bind the given name into this context. The .toString() is called to
    * convert into the string representation, required by RMI registry.
-   * 
+   *
    * @throws NamingException if the object is not an instance of Remote
    */
   public void bind(Name name, Object obj) throws NamingException
@@ -359,7 +359,7 @@ public class RmiContinuation implements Context
   {
     if (name.length() > 0)
       throw new OperationNotSupportedException("Only empty name is accepted");
-    
+
     try
       {
         return new ListEnumeration(getRegistry().list());
@@ -372,7 +372,7 @@ public class RmiContinuation implements Context
 
   /**
    * List existing bindings of this context (the parameter must be empty name,
-   * indicating the root context). 
+   * indicating the root context).
    */
   public NamingEnumeration listBindings(Name name) throws NamingException
   {
@@ -383,13 +383,13 @@ public class RmiContinuation implements Context
 
   /**
    * List existing bindings of this context (the parameter must be empty name,
-   * indicating the root context). 
+   * indicating the root context).
    */
   public NamingEnumeration listBindings(String name) throws NamingException
   {
     if (name.length() > 0)
       throw new OperationNotSupportedException("Only empty name is accepted");
-    
+
     try
       {
         Registry r = getRegistry();
@@ -419,7 +419,7 @@ public class RmiContinuation implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name (.toString()) is used to convert into string
    *          representation.
@@ -433,7 +433,7 @@ public class RmiContinuation implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name.
    * @param obj
@@ -459,7 +459,7 @@ public class RmiContinuation implements Context
                                   + obj.getClass().getName());
       }
   }
-  
+
   /**
    * Renames the object. If the new name is already bound in the given context,
    * the {@link AlreadyBoundException} is thrown and the oldName binding is
@@ -546,7 +546,7 @@ public class RmiContinuation implements Context
         throw new CommunicationException(e.toString());
       }
   }
-  
+
   /**
    * Release the associated resources.
    */
@@ -554,10 +554,10 @@ public class RmiContinuation implements Context
   {
     removeRegistry();
   }
-  
+
   /**
    * Resolve the object by name.
-   * 
+   *
    * @param name
    *          the object name, .toString() is used to get the string
    *          representation.
@@ -566,10 +566,10 @@ public class RmiContinuation implements Context
   {
     return lookup(name.toString());
   }
-  
+
   /**
    * Resolve the object by name
-   * 
+   *
    * @param name the object name.
    */
   public Object lookup(String name) throws NamingException
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java
index 6d88cccefe3..a75896272ad 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/RmiNamingEnumeration.java
@@ -46,7 +46,7 @@ import javax.naming.NamingException;
 /**
  * Iterates over name class pairs, obtaining values first from the binding list
  * and then from the binding iterator.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public abstract class RmiNamingEnumeration implements NamingEnumeration
@@ -55,7 +55,7 @@ public abstract class RmiNamingEnumeration implements NamingEnumeration
    * The array of bindings, returned at once.
    */
   String[] list;
-  
+
   /**
    * The position of the element in the binding list, that must be returned
    * during the subsequent call of the next(). If this field is grater or equal
@@ -63,15 +63,15 @@ public abstract class RmiNamingEnumeration implements NamingEnumeration
    * iterator.
    */
   int p;
-  
+
   RmiNamingEnumeration(String[] bindingList)
   {
     list = bindingList;
   }
-  
+
   /**
    * Convert from the CORBA binding into that this enumeration should return.
-   * 
+   *
    * @param binding
    *          the binding to convert
    * @return the value, that must be returned by the {@link #next()}.
@@ -80,7 +80,7 @@ public abstract class RmiNamingEnumeration implements NamingEnumeration
 
   /**
    * Checks if there are more elements to return.
-   * 
+   *
    * @throws NamingException
    *           never
    */
@@ -91,7 +91,7 @@ public abstract class RmiNamingEnumeration implements NamingEnumeration
 
   /**
    * Returns the next element.
-   * 
+   *
    * @throws NamingException
    *           never
    */
@@ -118,7 +118,7 @@ public abstract class RmiNamingEnumeration implements NamingEnumeration
     else
       throw new NoSuchElementException();
   }
-  
+
   /**
    * Nothing to do in this method.
    */
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java
index a17ce026b16..11f7265a62d 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContext.java
@@ -61,8 +61,8 @@ import javax.naming.NamingException;
 import javax.naming.OperationNotSupportedException;
 
 /**
- * The implementation of the RMI URL context. This context connects 
- * 
+ * The implementation of the RMI URL context. This context connects
+ *
  * @author Audrius Meskauskas
  */
 public class rmiURLContext implements Context
@@ -71,19 +71,19 @@ public class rmiURLContext implements Context
    * The default registry location.
    */
   public static final String DEFAULT_REGISTRY_LOCATION = "rmi://localhost:1099";
-  
+
   /**
    * The registry cache, maps the registry URL's to they instances. The
    * obtained registries are reused, as newly obtaining them may cause the
    * resource leak.
    */
   static WeakHashMap registryCache = new WeakHashMap();
-  
+
   /**
    * The properties.
    */
   Properties properties;
-  
+
   /**
    * The flag, indicating, that the lookup methods were called before.
    * If the lookup methods were called before, the existing ORB cannot be
@@ -91,14 +91,14 @@ public class rmiURLContext implements Context
    * unfunctional.
    */
   boolean lookupCalled;
-  
+
   /**
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal. This method replaces
    * the registry. The new registry will be lazily instantiated on the first
    * call.
-   * 
+   *
    * @param key
    *          the name of the new property
    * @param value
@@ -118,7 +118,7 @@ public class rmiURLContext implements Context
    * table should never be modified by the caller (the registry would not be updated
    * in such case). Use {@link #addToEnvironment} and
    * {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
@@ -133,7 +133,7 @@ public class rmiURLContext implements Context
    * constructing the new ORB with the changes set of properties (you can
    * replace the CORBA implementation provider, for instance). The new ORB will
    * be lazily instantiated on the first call.
-   * 
+   *
    * @param propName
    *          the name of the property being removed.
    * @return the value of the property that has been removed or null if the
@@ -144,10 +144,10 @@ public class rmiURLContext implements Context
   {
     return properties.remove(propName);
   }
-  
+
   /**
    * Get the cached or new registry reference.
-   * 
+   *
    * @return the registry reference, either cached or new.
    */
   public Registry getRegistry(String netAddress) throws NamingException
@@ -157,8 +157,8 @@ public class rmiURLContext implements Context
     synchronized (registryCache)
       {
         registry = (Registry) registryCache.get(netAddress);
-      }    
-    
+      }
+
     if (registry == null)
       {
         // The colon, if present, indicates the start of the port number.
@@ -188,18 +188,18 @@ public class rmiURLContext implements Context
           {
             throw new CommunicationException(e.toString());
           }
-        
+
         synchronized (registryCache)
           {
             registryCache.put(netAddress, registry);
-          }        
+          }
       }
     return registry;
   }
 
   /**
    * Create the rmi url context that works, talking with the given RMI registry.
-   * 
+   *
    * @param props
    *          the properties for this context
    */
@@ -209,11 +209,11 @@ public class rmiURLContext implements Context
     if (props != null)
       properties.putAll(props);
   }
-  
+
   /**
    * Bind the given name into this context. The .toString() is called to
    * convert into the string representation, required by RMI registry.
-   * 
+   *
    * @throws NamingException if the object is not an instance of Remote
    */
   public void bind(Name name, Object obj) throws NamingException
@@ -366,7 +366,7 @@ public class rmiURLContext implements Context
 
   /**
    * List existing bindings of this context (the parameter must be empty name,
-   * indicating the root context). 
+   * indicating the root context).
    */
   public NamingEnumeration listBindings(Name name) throws NamingException
   {
@@ -383,7 +383,7 @@ public class rmiURLContext implements Context
         String [] n = split(name);
         if (n[1].length() > 0)
           throw new InvalidNameException(name+", the name part must be empty");
-        
+
         Registry r = getRegistry(n[0]);
         return new ListBindingsEnumeration(r.list(), r);
       }
@@ -413,7 +413,7 @@ public class rmiURLContext implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name (.toString()) is used to convert into string
    *          representation.
@@ -427,7 +427,7 @@ public class rmiURLContext implements Context
 
   /**
    * Rebinds this object.
-   * 
+   *
    * @param name
    *          the object name.
    * @param obj
@@ -437,7 +437,7 @@ public class rmiURLContext implements Context
   {
     try
       {
-        String [] n = split(name);        
+        String [] n = split(name);
         getRegistry(n[0]).rebind(n[1], (Remote) obj);
       }
     catch (AccessException e)
@@ -454,7 +454,7 @@ public class rmiURLContext implements Context
                                   + obj.getClass().getName());
       }
   }
-  
+
   /**
    * Renames the object. If the new name is already bound in the given context,
    * the {@link AlreadyBoundException} is thrown and the oldName binding is
@@ -476,12 +476,12 @@ public class rmiURLContext implements Context
     try
       {
         String [] n = split(oldName);
-        Registry r = getRegistry(n[0]);        
+        Registry r = getRegistry(n[0]);
         Remote object = r.lookup(n[1]);
         r.unbind(oldName);
         try
           {
-            String [] n2 = split(newName);            
+            String [] n2 = split(newName);
             Registry r2 = getRegistry(n2[0]);
             r2.bind(n2[1], object);
           }
@@ -529,7 +529,7 @@ public class rmiURLContext implements Context
   {
     try
       {
-        String [] n = split(name);        
+        String [] n = split(name);
         getRegistry(n[0]).unbind(n[1]);
       }
     catch (AccessException e)
@@ -545,17 +545,17 @@ public class rmiURLContext implements Context
         throw new CommunicationException(e.toString());
       }
   }
-  
+
   /**
    * Release the associated resources.
    */
   public void close() throws NamingException
   {
   }
-  
+
   /**
    * Resolve the object by name.
-   * 
+   *
    * @param name
    *          the object name, .toString() is used to get the string
    *          representation.
@@ -564,10 +564,10 @@ public class rmiURLContext implements Context
   {
     return lookup(name.toString());
   }
-  
+
   /**
    * Resolve the object by name
-   * 
+   *
    * @param name the object name.
    */
   public Object lookup(String name) throws NamingException
@@ -590,11 +590,11 @@ public class rmiURLContext implements Context
         throw new NameNotFoundException(name);
       }
   }
-  
+
   /**
    * Split the given rmi address into the network address and naming service
    * name.
-   * 
+   *
    * @param address
    *          the address to split
    * @return the two member array, lower being the network address of the naming
diff --git a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java
index 59384532736..ce0471d364a 100644
--- a/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java
+++ b/libjava/classpath/gnu/javax/naming/jndi/url/rmi/rmiURLContextFactory.java
@@ -45,22 +45,22 @@ import javax.naming.spi.ObjectFactory;
 
 /**
  * Find the RMI URL context. This factory checks the Context.PROVIDER_URL
- * property for the address of the RMI naming service and creates the 
+ * property for the address of the RMI naming service and creates the
  * context that operates talking with this naming service. If such property
  * is missing, "rmi://localhost:1099" is assumed.
- * 
- * @author Audrius Meskauskas (audriusa@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
  */
 public class rmiURLContextFactory implements ObjectFactory
 {
 
   /**
-   * Create a new instance of the context. 
+   * Create a new instance of the context.
    */
   public Object getObjectInstance(Object refObj, Name name, Context nameCtx,
                                   Hashtable environment)
   {
     return new rmiURLContext(environment);
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/javax/net/ssl/AbstractSessionContext.java b/libjava/classpath/gnu/javax/net/ssl/AbstractSessionContext.java
index bdd7f274e06..96a4e6dd090 100644
--- a/libjava/classpath/gnu/javax/net/ssl/AbstractSessionContext.java
+++ b/libjava/classpath/gnu/javax/net/ssl/AbstractSessionContext.java
@@ -54,7 +54,7 @@ import javax.net.ssl.SSLSessionContext;
  * be subclassed to add extended functionality to session contexts, such
  * as by storing sessions in files on disk, or by sharing contexts
  * across different JVM instances.
- * 
+ *
  * 
      In order to securely store sessions, along with private key data,
  * the abstract methods {@lnk {@link #load(char[])} and {@link #store(char[])}
  * come into play. When storing sessions, a session context implementation
@@ -62,10 +62,10 @@ import javax.net.ssl.SSLSessionContext;
  * before either writing the {@link java.io.Serializable} session to the
  * underlying store, or getting the opaque {@link Session#privateData()}
  * class from the session, and storing that.
- * 
+ *
  * 
      As a simple example, that writes sessions to some object output
  * stream:
- * 
+ *
  * 
         char[] password = ...;
   ObjectOutputStream out = ...;
@@ -75,12 +75,12 @@ import javax.net.ssl.SSLSessionContext;
       s.prepare(password);
       out.writeObject(s);
     }
      
- * 
+ *
  * 
      The reverse must be done when deserializing sessions, by using the
  * {@link Session#repair(char[])} method, possibly by first calling
  * {@link Session#setPrivateData(java.io.Serializable)} with the read,
  * opaque private data type. Thus an example of reading may be:
- * 
+ *
  * 
         char[] password = ...;
   ObjectInputStream in = ...;
@@ -91,19 +91,19 @@ import javax.net.ssl.SSLSessionContext;
       s.repair(password);
       addToThisStore(s);
     }
      
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public abstract class AbstractSessionContext implements SSLSessionContext
 {
   protected long timeout;
-  private static Class 
+  private static Class
     implClass = SimpleSessionContext.class;
 
   /**
    * Create a new instance of a session context, according to the configured
    * implementation class.
-   * 
+   *
    * @return The new session context.
    * @throws SSLException If an error occurs in creating the instance.
    */
@@ -126,12 +126,12 @@ public abstract class AbstractSessionContext implements SSLSessionContext
   /**
    * Reconfigure this instance to use a different session context
    * implementation.
-   * 
+   *
    * 
      Note: this method requires that the caller have
    * {@link SSLPermission} with target
    * gnu.javax.net.ssl.AbstractSessionContext and action
    * setImplClass.
-   * 
+   *
    * @param clazz The new implementation class.
    * @throws SecurityException If the caller does not have permission to
    *  change the session context.
@@ -183,7 +183,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
       }
     return s;
   }
-  
+
   public final SSLSession getSession(String host, int port)
   {
     for (Enumeration e = getIds(); e.hasMoreElements(); )
@@ -203,18 +203,18 @@ public abstract class AbstractSessionContext implements SSLSessionContext
         int port2 = s.getPeerPort();
         if (port != port2)
           continue;
-        
+
         // Else, a match.
         return s;
       }
-    
+
     return null;
   }
-  
+
   /**
    * To be implemented by subclasses. Subclasses do not need to check
    * timeouts in this method.
-   * 
+   *
    * @param sessionId The session ID.
    * @return The session, or null if the requested session
    *  was not found.
@@ -225,7 +225,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
   {
     return (int) (timeout / 1000);
   }
-  
+
   /**
    * Load this session store from the underlying media, if supported
    * by the implementation.
@@ -265,7 +265,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
   public abstract void remove (byte[] sessionId);
 
   /**
-   * 
+   *
    */
   public final void setSessionTimeout(int seconds)
   {
@@ -273,7 +273,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
       throw new IllegalArgumentException("timeout may not be negative");
     this.timeout = (long) seconds * 1000;
   }
-  
+
   /**
    * Commit this session store to the underlying media. For session
    * store implementations that support saving sessions across
@@ -285,4 +285,4 @@ public abstract class AbstractSessionContext implements SSLSessionContext
    * in this store.
    */
   public abstract void store (char[] password) throws SessionStoreException;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManager.java b/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManager.java
index ba6500a27d4..2c9fd2aeae7 100644
--- a/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManager.java
+++ b/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManager.java
@@ -1,4 +1,4 @@
-/* PreSharedKeyManager.java -- 
+/* PreSharedKeyManager.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -49,6 +49,6 @@ import javax.net.ssl.KeyManager;
 public interface PreSharedKeyManager extends KeyManager
 {
   SecretKey getKey(String name) throws KeyManagementException;
-  
+
   String chooseIdentityHint();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.java b/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.java
index 1b1d492b1ae..fe3c9e89b7a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/PreSharedKeyManagerParameters.java
@@ -1,4 +1,4 @@
-/* PreSharedKeyManagerParameters.java -- 
+/* PreSharedKeyManagerParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -51,7 +51,7 @@ public class PreSharedKeyManagerParameters
   implements ManagerFactoryParameters
 {
   private final LinkedHashMap keys;
-  
+
   public PreSharedKeyManagerParameters()
   {
     keys = new LinkedHashMap();
@@ -62,20 +62,20 @@ public class PreSharedKeyManagerParameters
     name.getClass();
     return keys.get(name);
   }
-  
+
   public void putKey(String name, SecretKey key)
   {
     name.getClass();
     key.getClass();
     keys.put(name, key);
   }
-  
+
   public boolean removeKey(String name)
   {
     name.getClass();
     return keys.remove(name) != null;
   }
-  
+
   public Iterator identities()
   {
     return keys.keySet().iterator();
diff --git a/libjava/classpath/gnu/javax/net/ssl/SSLCipherSuite.java b/libjava/classpath/gnu/javax/net/ssl/SSLCipherSuite.java
index a3ab8771389..80068e5cbba 100644
--- a/libjava/classpath/gnu/javax/net/ssl/SSLCipherSuite.java
+++ b/libjava/classpath/gnu/javax/net/ssl/SSLCipherSuite.java
@@ -56,7 +56,7 @@ public abstract class SSLCipherSuite
   private final byte[] id;
   private final SSLProtocolVersion version;
   private Provider provider;
-  
+
   protected SSLCipherSuite (final String algorithm, final byte[] id,
                             final SSLProtocolVersion version)
   {
@@ -66,20 +66,20 @@ public abstract class SSLCipherSuite
     this.id = (byte[]) id.clone ();
     this.version = version;
   }
-  
+
   public static final SSLCipherSuite getInstance (SSLProtocolVersion version, byte[] id)
     throws NoSuchAlgorithmException
   {
     return getInstance (version + "-" + ((id[0] & 0xFF) + "/" + (id[1] & 0xFF)));
   }
-  
+
   public static final SSLCipherSuite getInstance (SSLProtocolVersion version,
                                                   byte[] id, Provider provider)
     throws NoSuchAlgorithmException
   {
     return getInstance (version + "-" + (id[0] & 0xFF) + "/" + (id[1] & 0xFF), provider);
   }
-  
+
   public static final SSLCipherSuite getInstance (String name)
     throws NoSuchAlgorithmException
   {
@@ -95,10 +95,10 @@ public abstract class SSLCipherSuite
             // Ignore.
           }
       }
-      
+
     throw new NoSuchAlgorithmException (SERVICE + ": " + name);
   }
-  
+
   public static final SSLCipherSuite getInstance (String name, Provider provider)
     throws NoSuchAlgorithmException
   {
@@ -117,26 +117,26 @@ public abstract class SSLCipherSuite
       }
     return suite;
   }
-  
+
   public final String getAlgorithm ()
   {
     return algorithm;
   }
-  
+
   public final byte[] getId ()
   {
     return (byte[]) id.clone ();
   }
-  
+
   public final Provider getProvider ()
   {
     return provider;
   }
-  
+
   public final SSLProtocolVersion getProtocolVersion ()
   {
     return version;
   }
-  
+
   public abstract void encipher (ByteBuffer in, ByteBuffer out);
 }
diff --git a/libjava/classpath/gnu/javax/net/ssl/SSLRecordHandler.java b/libjava/classpath/gnu/javax/net/ssl/SSLRecordHandler.java
index 3ce56eab5fe..8a44245ce28 100644
--- a/libjava/classpath/gnu/javax/net/ssl/SSLRecordHandler.java
+++ b/libjava/classpath/gnu/javax/net/ssl/SSLRecordHandler.java
@@ -97,4 +97,4 @@ public abstract class SSLRecordHandler
   {
     return contentType & 0xFF;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/Session.java b/libjava/classpath/gnu/javax/net/ssl/Session.java
index 09b50eef069..3acf9932d48 100644
--- a/libjava/classpath/gnu/javax/net/ssl/Session.java
+++ b/libjava/classpath/gnu/javax/net/ssl/Session.java
@@ -69,7 +69,7 @@ public abstract class Session implements SSLSession, Serializable
   protected final long creationTime;
   protected long lastAccessedTime;
   protected int applicationBufferSize;
-  
+
   protected ID sessionId;
   protected Certificate[] localCerts;
   protected Certificate[] peerCerts;
@@ -141,12 +141,12 @@ public abstract class Session implements SSLSession, Serializable
       }
     return null;
   }
-  
+
   public int getPacketBufferSize()
   {
     return applicationBufferSize + 2048;
   }
-  
+
   public Certificate[] getPeerCertificates() throws SSLPeerUnverifiedException
   {
     if (!peerVerified)
@@ -165,17 +165,17 @@ public abstract class Session implements SSLSession, Serializable
       return null;
     return (X509Certificate[]) peerCertChain.clone();
   }
-  
+
   public String getPeerHost()
   {
     return peerHost;
   }
-  
+
   public int getPeerPort()
   {
     return peerPort;
   }
-  
+
   public Principal getPeerPrincipal() throws SSLPeerUnverifiedException
   {
     if (!peerVerified)
@@ -184,33 +184,33 @@ public abstract class Session implements SSLSession, Serializable
       return null;
     return peerCertChain[0].getSubjectDN();
   }
-  
+
   public SSLSessionContext getSessionContext()
   {
     return context;
   }
-  
+
   public String[] getValueNames()
   {
     Set keys = this.values.keySet();
     return keys.toArray(new String[keys.size()]);
   }
-  
+
   public Object getValue(String name)
   {
     return values.get(name);
   }
-  
+
   public void invalidate()
   {
     valid = false;
   }
-  
+
   public boolean isValid()
   {
     return valid;
   }
-  
+
   public void putValue(String name, Object value)
   {
     values.put(name, value);
@@ -224,7 +224,7 @@ public abstract class Session implements SSLSession, Serializable
       {
       }
   }
-  
+
   public void removeValue(String name)
   {
     Object value = values.remove(name);
@@ -236,9 +236,9 @@ public abstract class Session implements SSLSession, Serializable
       }
     catch (Exception x)
       {
-      }   
+      }
   }
-  
+
   public final boolean isTruncatedMac()
   {
     return truncatedMac;
@@ -248,31 +248,31 @@ public abstract class Session implements SSLSession, Serializable
    * Prepare this session for serialization. Private data will be encrypted
    * with the given password, and this object will then be ready to be
    * serialized.
-   * 
+   *
    * @param password The password to protect this session with.
    * @throws SSLException If encrypting this session's private data fails.
    */
   public abstract void prepare (char[] password) throws SSLException;
-  
+
   /**
    * Repair this session's private data after deserialization. This method
    * will decrypt this session's private data, and prepare the session for
    * use in new SSL connections.
-   * 
+   *
    * @param password The password to decrypt the private data with.
    * @throws SSLException
    */
   public abstract void repair(char[] password) throws SSLException;
-  
+
   /**
    * Get the private data of this session. This method may only be called
    * after first calling {@link #prepare(char[])}.
-   * 
+   *
    * @return The sealed private data.
    * @throws SSLException If the private data have not been sealed.
    */
   public abstract SealedObject privateData() throws SSLException;
-  
+
   /**
    * Set the private data of this session.
    * @param data
diff --git a/libjava/classpath/gnu/javax/net/ssl/SessionStoreException.java b/libjava/classpath/gnu/javax/net/ssl/SessionStoreException.java
index 5dcf3d02887..4d8ef97d08d 100644
--- a/libjava/classpath/gnu/javax/net/ssl/SessionStoreException.java
+++ b/libjava/classpath/gnu/javax/net/ssl/SessionStoreException.java
@@ -46,12 +46,12 @@ public class SessionStoreException extends SSLException
   {
     super (message);
   }
-  
+
   public SessionStoreException (final String message, final Throwable cause)
   {
     super (message, cause);
   }
-  
+
   public SessionStoreException (final Throwable cause)
   {
     super (cause);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java
index d80a5bb789b..bf03ed77fe4 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/AbstractHandshake.java
@@ -97,9 +97,9 @@ public abstract class AbstractHandshake
   protected static final byte[] SERVER_FINISHED
     = new byte[] {
       115, 101, 114, 118, 101, 114,  32, 102, 105, 110, 105, 115,
-      104, 101, 100   
+      104, 101, 100
     };
-  
+
   /**
    * "client finished" -- TLS 1.0 and later
    */
@@ -108,14 +108,14 @@ public abstract class AbstractHandshake
        99, 108, 105, 101, 110, 116,  32, 102, 105, 110, 105, 115,
       104, 101, 100
     };
-  
+
   /**
    * "key expansion" -- TLS 1.0 and later
    */
   private static final byte[] KEY_EXPANSION =
     new byte[] { 107, 101, 121,  32, 101, 120, 112,
                   97, 110, 115, 105, 111, 110 };
-  
+
   /**
    * "master secret" -- TLS 1.0 and later
    */
@@ -123,7 +123,7 @@ public abstract class AbstractHandshake
     = new byte[] {
       109,  97, 115, 116, 101, 114,  32, 115, 101,  99, 114, 101, 116
     };
-  
+
   /**
    * "client write key" -- TLS 1.0 exportable whitener.
    */
@@ -132,7 +132,7 @@ public abstract class AbstractHandshake
        99, 108, 105, 101, 110, 116,  32, 119, 114, 105, 116, 101,  32, 107,
       101, 121
     };
-  
+
   /**
    * "server write key" -- TLS 1.0 exportable whitener.
    */
@@ -141,30 +141,30 @@ public abstract class AbstractHandshake
       115, 101, 114, 118, 101, 114,  32, 119, 114, 105, 116, 101,  32, 107,
       101, 121
     };
-  
+
   private static final byte[] IV_BLOCK
     = new byte[] {
        73,  86,  32,  98, 108, 111,  99, 107
     };
-  
+
   /**
    * SSL 3.0; the string "CLNT"
    */
   private static final byte[] SENDER_CLIENT
     = new byte[] { 0x43, 0x4C, 0x4E, 0x54 };
-  
+
   /**
    * SSL 3.0; the string "SRVR"
    */
   private static final byte[] SENDER_SERVER
     = new byte[] { 0x53, 0x52, 0x56, 0x52 };
-  
+
   /**
    * SSL 3.0; the value 0x36 40 (for SHA-1 hashes) or 48 (for MD5 hashes)
    * times.
    */
   protected static final byte[] PAD1 = new byte[48];
-  
+
   /**
    * SSL 3.0; the value 0x5c 40 (for SHA-1 hashes) or 48 (for MD5 hashes)
    * times.
@@ -176,7 +176,7 @@ public abstract class AbstractHandshake
     Arrays.fill(PAD1, SSLHMac.PAD1);
     Arrays.fill(PAD2, SSLHMac.PAD2);
   }
-  
+
   /**
    * The currently-read handshake messages. There may be zero, or
    * multiple, handshake messages in this buffer.
@@ -191,7 +191,7 @@ public abstract class AbstractHandshake
 
   protected MessageDigest sha;
   protected MessageDigest md5;
-  
+
   protected final SSLEngineImpl engine;
   protected KeyAgreement keyAgreement;
   protected byte[] preMasterSecret;
@@ -210,7 +210,7 @@ public abstract class AbstractHandshake
     md5 = MessageDigest.getInstance("MD5");
     tasks = new LinkedList();
   }
-  
+
   /**
    * Handles the next input message in the handshake. This is called
    * in response to a call to {@link javax.net.ssl.SSLEngine#unwrap}
@@ -265,13 +265,13 @@ public abstract class AbstractHandshake
   /**
    * Called to process more handshake data. This method will be called
    * repeatedly while there is remaining handshake data, and while the
-   * status is 
+   * status is
    * @return
    * @throws SSLException
    */
   protected abstract HandshakeStatus implHandleInput()
     throws SSLException;
-  
+
   /**
    * Produce more handshake output. This is called in response to a
    * call to {@link javax.net.ssl.SSLEngine#wrap}, when the handshake
@@ -301,27 +301,27 @@ public abstract class AbstractHandshake
       }
     return status;
   }
-  
+
   /**
    * Called to implement the underlying output handling. The callee should
    * attempt to fill the given buffer as much as it can; this can include
    * multiple, and even partial, handshake messages.
-   * 
+   *
    * @param fragment The buffer the callee should write handshake messages to.
    * @return The new status of the handshake.
    * @throws SSLException If an error occurs processing the output message.
    */
   protected abstract SSLEngineResult.HandshakeStatus implHandleOutput (ByteBuffer fragment)
     throws SSLException;
-  
+
   /**
    * Return a new instance of input security parameters, initialized with
    * the session key. It is, of course, only valid to invoke this method
    * once the handshake is complete, and the session keys established.
-   * 
+   *
    * 
      In the presence of a well-behaving peer, this should be called once
    * the ChangeCipherSpec message is recieved.
-   * 
+   *
    * @return The input parameters for the newly established session.
    * @throws SSLException If the handshake is not complete.
    */
@@ -335,7 +335,7 @@ public abstract class AbstractHandshake
    * Return a new instance of output security parameters, initialized with
    * the session key. This should be called after the
    * ChangeCipherSpec message is sent to the peer.
-   * 
+   *
    * @return The output parameters for the newly established session.
    * @throws SSLException If the handshake is not complete.
    */
@@ -344,7 +344,7 @@ public abstract class AbstractHandshake
     checkKeyExchange();
     return outParams;
   }
-  
+
   /**
    * Fetch a delegated task waiting to run, if any.
    *
@@ -356,21 +356,21 @@ public abstract class AbstractHandshake
       return null;
     return tasks.removeFirst();
   }
-  
+
   /**
    * Used by the skeletal code to query the current status of the handshake.
    * This should be the same value as returned by the previous call
    * to {@link #implHandleOutput(ByteBuffer)} or {@link
    *  #implHandleInput(ByteBuffer)}.
-   * 
+   *
    * @return The current handshake status.
    */
   abstract HandshakeStatus status();
-  
+
   /**
    * Check if the key exchange completed successfully, throwing an exception
    * if not.
-   * 
+   *
    * 
      Note that we assume that the caller of our SSLEngine is correct, and
    * that they did run the delegated tasks that encapsulate the key exchange.
    * What we are primarily checking, therefore, is that no error occurred in the
@@ -379,14 +379,14 @@ public abstract class AbstractHandshake
    * @throws SSLException If the key exchange did not complete successfully.
    */
   abstract void checkKeyExchange() throws SSLException;
-  
+
   /**
    * Handle an SSLv2 client hello. This is only used by SSL servers.
-   * 
+   *
    * @param hello The hello message.
    */
   abstract void handleV2Hello(ByteBuffer hello) throws SSLException;
-  
+
   /**
    * Attempt to read the next handshake message from the given
    * record. If only a partial handshake message is available, then
@@ -418,13 +418,13 @@ public abstract class AbstractHandshake
     if (Debug.DEBUG)
       logger.logv(Component.SSL_HANDSHAKE, "inserting {0} into {1}",
                   fragment, handshakeBuffer);
-    
+
     // Put the fragment into the buffer.
     handshakeBuffer.put(fragment);
 
     return hasMessage();
   }
-  
+
   protected boolean doHash()
   {
     return true;
@@ -501,9 +501,9 @@ public abstract class AbstractHandshake
    * algorithm was used to generate this value was subtly different than
    * that used in TLSv1.0 and later. In TLSv1.0 and later, this value is
    * just the digest over the handshake messages.
-   * 
+   *
    * 
      SSLv3 uses the algorithm:
-   * 
+   *
    * 
       CertificateVerify.signature.md5_hash
   MD5(master_secret + pad_2 +
@@ -511,7 +511,7 @@ CertificateVerify.signature.md5_hash
 Certificate.signature.sha_hash
   SHA(master_secret + pad_2 +
       SHA(handshake_messages + master_secret + pad_1));
      
-   * 
+   *
    * @param md5 The running MD5 hash of the handshake.
    * @param sha The running SHA-1 hash of the handshake.
    * @param session The current session being negotiated.
@@ -533,7 +533,7 @@ Certificate.signature.sha_hash
         md5.update(tmp);
         md5value = md5.digest();
       }
-    
+
     sha.update(session.privateData.masterSecret);
     sha.update(PAD1, 0, 40);
     byte[] tmp = sha.digest();
@@ -542,16 +542,16 @@ Certificate.signature.sha_hash
     sha.update(PAD2, 0, 40);
     sha.update(tmp);
     byte[] shavalue = sha.digest();
-    
+
     if (md5value != null)
       return Util.concat(md5value, shavalue);
-    
+
     return shavalue;
   }
-  
+
   /**
    * Generate the session keys from the computed master secret.
-   * 
+   *
    * @param clientRandom The client's nonce.
    * @param serverRandom The server's nonce.
    * @param session The session being established.
@@ -570,7 +570,7 @@ Certificate.signature.sha_hash
     if (session.suite.cipherAlgorithm() == CipherAlgorithm.AES)
       ivlen = 16;
     int keylen = session.suite.keyLength();
-    
+
     byte[][] keys = new byte[6][];
     keys[0] = new byte[maclen]; // client_write_MAC_secret
     keys[1] = new byte[maclen]; // server_write_MAC_secret
@@ -578,7 +578,7 @@ Certificate.signature.sha_hash
     keys[3] = new byte[keylen]; // server_write_key
     keys[4] = new byte[ivlen];  // client_write_iv
     keys[5] = new byte[ivlen];  // server_write_iv
-    
+
     IRandom prf = null;
     if (session.version == ProtocolVersion.SSL_3)
       {
@@ -604,14 +604,14 @@ Certificate.signature.sha_hash
         clientRandom.buffer().get(seed, (KEY_EXPANSION.length
                                          + serverRandom.length()),
                                   clientRandom.length());
-        
+
         prf = new TLSRandom();
         HashMap attr = new HashMap(2);
         attr.put(TLSRandom.SECRET, session.privateData.masterSecret);
         attr.put(TLSRandom.SEED, seed);
         prf.init(attr);
       }
-    
+
     try
       {
         prf.nextBytes(keys[0], 0, keys[0].length);
@@ -666,7 +666,7 @@ Certificate.signature.sha_hash
                 prf2.init(attr);
                 keys[2] = new byte[8];
                 prf2.nextBytes(keys[2], 0, keys[2].length);
-                
+
                 attr.put(TLSRandom.SECRET, keys[3]);
                 seed = new byte[SERVER_WRITE_KEY.length +
                                 serverRandom.length() +
@@ -682,7 +682,7 @@ Certificate.signature.sha_hash
                 prf2.init(attr);
                 keys[3] = new byte[8];
                 prf2.nextBytes(keys[3], 0, keys[3].length);
-                
+
                 attr.put(TLSRandom.SECRET, new byte[0]);
                 seed = new byte[IV_BLOCK.length +
                                 clientRandom.length() +
@@ -714,7 +714,7 @@ Certificate.signature.sha_hash
       {
         throw new Error(nsae);
       }
-    
+
     if (Debug.DEBUG_KEY_EXCHANGE)
       logger.logv(Component.SSL_KEY_EXCHANGE,
                   "keys generated;\n  [0]: {0}\n  [1]: {1}\n  [2]: {2}\n" +
@@ -727,12 +727,12 @@ Certificate.signature.sha_hash
                   Util.toHexString(keys[5], ':'));
     return keys;
   }
-  
+
   /**
    * Generate a "finished" message. The hashes passed in are modified
    * by this function, so they should be clone copies of the digest if
    * the hash function needs to be used more.
-   * 
+   *
    * @param md5 The MD5 computation.
    * @param sha The SHA-1 computation.
    * @param isClient Whether or not the client-side finished message is
@@ -797,22 +797,22 @@ Certificate.signature.sha_hash
         //
 
         finishedBuffer = ByteBuffer.allocate(36);
-        
+
         md5.update(isClient ? SENDER_CLIENT : SENDER_SERVER);
         md5.update(session.privateData.masterSecret);
         md5.update(PAD1);
-        
+
         byte[] tmp = md5.digest();
         md5.reset();
         md5.update(session.privateData.masterSecret);
         md5.update(PAD2);
         md5.update(tmp);
         finishedBuffer.put(md5.digest());
-        
+
         sha.update(isClient ? SENDER_CLIENT : SENDER_SERVER);
         sha.update(session.privateData.masterSecret);
         sha.update(PAD1, 0, 40);
-        
+
         tmp = sha.digest();
         sha.reset();
         sha.update(session.privateData.masterSecret);
@@ -822,7 +822,7 @@ Certificate.signature.sha_hash
       }
     return finishedBuffer;
   }
-  
+
   protected void initDiffieHellman(DHPrivateKey dhKey, SecureRandom random)
     throws SSLException
   {
@@ -840,7 +840,7 @@ Certificate.signature.sha_hash
         throw new SSLException(nsae);
       }
   }
-  
+
   protected void generateMasterSecret(Random clientRandom,
                                       Random serverRandom,
                                       SessionImpl session)
@@ -849,11 +849,11 @@ Certificate.signature.sha_hash
     assert(clientRandom != null);
     assert(serverRandom != null);
     assert(session != null);
-    
+
     if (Debug.DEBUG_KEY_EXCHANGE)
       logger.logv(Component.SSL_KEY_EXCHANGE, "preMasterSecret:\n{0}",
                   new ByteArray(preMasterSecret));
-    
+
     if (session.version == ProtocolVersion.SSL_3)
       {
         try
@@ -861,7 +861,7 @@ Certificate.signature.sha_hash
             MessageDigest _md5 = MessageDigest.getInstance("MD5");
             MessageDigest _sha = MessageDigest.getInstance("SHA");
             session.privateData.masterSecret = new byte[48];
-            
+
             _sha.update((byte) 'A');
             _sha.update(preMasterSecret);
             _sha.update(clientRandom.buffer());
@@ -869,7 +869,7 @@ Certificate.signature.sha_hash
             _md5.update(preMasterSecret);
             _md5.update(_sha.digest());
             _md5.digest(session.privateData.masterSecret, 0, 16);
-            
+
             _sha.update((byte) 'B');
             _sha.update((byte) 'B');
             _sha.update(preMasterSecret);
@@ -914,20 +914,20 @@ Certificate.signature.sha_hash
         attr.put(TLSRandom.SECRET, preMasterSecret);
         attr.put(TLSRandom.SEED, seed);
         prf.init(attr);
-        
+
         session.privateData.masterSecret = new byte[48];
         prf.nextBytes(session.privateData.masterSecret, 0, 48);
       }
-    
+
     if (Debug.DEBUG_KEY_EXCHANGE)
       logger.log(Component.SSL_KEY_EXCHANGE, "master_secret: {0}",
                  new ByteArray(session.privateData.masterSecret));
-    
+
     // Wipe out the preMasterSecret.
     for (int i = 0; i < preMasterSecret.length; i++)
       preMasterSecret[i] = 0;
   }
-  
+
   protected void setupSecurityParameters(byte[][] keys, boolean isClient,
                                          SSLEngineImpl engine,
                                          CompressionMethod compression)
@@ -943,7 +943,7 @@ Certificate.signature.sha_hash
         Cipher inCipher = s.cipher();
         Mac inMac = s.mac(engine.session().version);
         Inflater inflater = (compression == CompressionMethod.ZLIB
-                             ? new Inflater() : null); 
+                             ? new Inflater() : null);
         inCipher.init(Cipher.DECRYPT_MODE,
                       new SecretKeySpec(keys[isClient ? 3 : 2],
                                         s.cipherAlgorithm().toString()),
@@ -953,7 +953,7 @@ Certificate.signature.sha_hash
         inParams = new InputSecurityParameters(inCipher, inMac,
                                                inflater,
                                                engine.session(), s);
-                
+
         Cipher outCipher = s.cipher();
         Mac outMac = s.mac(engine.session().version);
         Deflater deflater = (compression == CompressionMethod.ZLIB
@@ -1025,23 +1025,23 @@ Certificate.signature.sha_hash
         preMasterSecret[6] = (byte) engine.session().random().nextInt();
         preMasterSecret[7] = (byte) engine.session().random().nextInt();
       }
-    
+
     if (Debug.DEBUG_KEY_EXCHANGE)
       logger.logv(Component.SSL_KEY_EXCHANGE, "PSK identity {0} key {1}",
                   identity, key);
-                    
+
     generateMasterSecret(clientRandom, serverRandom,
                          engine.session());
     byte[][] keys = generateKeys(clientRandom, serverRandom,
                                  engine.session());
     setupSecurityParameters(keys, isClient, engine, compression);
   }
-  
+
   protected class DHPhase extends DelegatedTask
   {
     private final DHPublicKey key;
     private final boolean full;
-    
+
     protected DHPhase(DHPublicKey key)
     {
       this(key, true);
@@ -1065,7 +1065,7 @@ Certificate.signature.sha_hash
         }
     }
   }
-  
+
   protected class CertVerifier extends DelegatedTask
   {
     private final boolean clientSide;
@@ -1077,12 +1077,12 @@ Certificate.signature.sha_hash
       this.clientSide = clientSide;
       this.chain = chain;
     }
-    
+
     boolean verified()
     {
       return verified;
     }
-    
+
     protected void implRun()
     {
       X509TrustManager tm = engine.contextImpl.trustManager;
@@ -1153,18 +1153,18 @@ Certificate.signature.sha_hash
               verified = false;
             }
         }
-      
+
       if (verified)
         engine.session().setPeerVerified(true);
     }
   }
-  
+
   protected class DHE_PSKGen extends DelegatedTask
   {
     private final DHPublicKey dhKey;
     private final SecretKey psKey;
     private final boolean isClient;
-    
+
     protected DHE_PSKGen(DHPublicKey dhKey, SecretKey psKey, boolean isClient)
     {
       this.dhKey = dhKey;
@@ -1187,7 +1187,7 @@ Certificate.signature.sha_hash
           psSecret = new byte[8];
           engine.session().random().nextBytes(psSecret);
         }
-      
+
       preMasterSecret = new byte[dhSecret.length + psSecret.length + 4];
       preMasterSecret[0] = (byte) (dhSecret.length >>> 8);
       preMasterSecret[1] = (byte)  dhSecret.length;
@@ -1196,10 +1196,10 @@ Certificate.signature.sha_hash
       preMasterSecret[dhSecret.length + 3] = (byte)  psSecret.length;
       System.arraycopy(psSecret, 0, preMasterSecret, dhSecret.length + 4,
                        psSecret.length);
-      
+
       generateMasterSecret(clientRandom, serverRandom, engine.session());
       byte[][] keys = generateKeys(clientRandom, serverRandom, engine.session());
       setupSecurityParameters(keys, isClient, engine, compression);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Alert.java b/libjava/classpath/gnu/javax/net/ssl/provider/Alert.java
index 12c86b0a402..0ceb96bbb85 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Alert.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Alert.java
@@ -73,7 +73,7 @@ public final class Alert implements Constructed
   {
     this.buffer = buffer;
   }
-  
+
   public Alert (final Level level, final Description description)
   {
     level.getClass ();
@@ -171,7 +171,7 @@ public final class Alert implements Constructed
   {
 
     WARNING (1), FATAL (2);
-    
+
     private final int value;
 
     private Level(int value)
@@ -231,7 +231,7 @@ public final class Alert implements Constructed
     BAD_CERTIFICATE_HASH_VALUE      (114),
     UNKNOWN_SRP_USERNAME            (120),
     MISSING_SRP_USERNAME            (121);
-    
+
     private final int value;
 
     private Description(int value)
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/AlertException.java b/libjava/classpath/gnu/javax/net/ssl/provider/AlertException.java
index 291de2700c9..90eaaf4306c 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/AlertException.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/AlertException.java
@@ -66,14 +66,14 @@ public class AlertException extends SSLException
   {
     this(alert, true);
   }
-  
+
   public AlertException(Alert alert, boolean isLocal, Throwable cause)
   {
     super(alert.description().toString(), cause);
     this.alert = alert;
     this.isLocal = isLocal;
   }
-  
+
   public AlertException(Alert alert, Throwable cause)
   {
     this(alert, true, cause);
@@ -93,7 +93,7 @@ public class AlertException extends SSLException
   {
     return alert;
   }
-  
+
   public boolean isLocal()
   {
     return isLocal;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Builder.java b/libjava/classpath/gnu/javax/net/ssl/provider/Builder.java
index baaba8aecf6..070c51b7614 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Builder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Builder.java
@@ -46,11 +46,11 @@ import java.nio.ByteBuffer;
  * buffer that grows to fit the object being built; the allocated size of
  * this buffer may be larger than the built object needs, but the general
  * effort will be not to allocate too large a buffer.
- * 
+ *
  * 
      Once the object is built, through various setters for
  * the object's attributes, the final buffer may be retrieved with the
  * {@link #buffer()} method.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public interface Builder extends Constructed
@@ -59,7 +59,7 @@ public interface Builder extends Constructed
    * Returns the final buffer, possibly containing the built object. The
    * returned buffer will be "trimmed" to size: its position will be zero,
    * and its limit and capacity set to the length of the built object.
-   * 
+   *
    * @return The underlying buffer.
    */
   ByteBuffer buffer();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Certificate.java b/libjava/classpath/gnu/javax/net/ssl/provider/Certificate.java
index 8ff91e5579e..68de1304dfd 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Certificate.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Certificate.java
@@ -57,7 +57,7 @@ import java.util.List;
 /**
  * The certificate object. This is used by both the client and the server
  * to send their certificates (if any) to one another.
- * 
+ *
  * 
      opaque ASN.1Cert<1..2^24-1>;
 
 struct {
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java
index b60ad556ac9..1126e6fcc79 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateBuilder.java
@@ -1,4 +1,4 @@
-/* CertificateBuilder.java -- 
+/* CertificateBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -46,7 +46,7 @@ import java.security.cert.CertificateException;
 
 /**
  * Builder for {@link Certificate} objects.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class CertificateBuilder extends Certificate implements Builder
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
index b7a22b20400..fd9d65be5db 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequest.java
@@ -62,7 +62,7 @@ public class CertificateRequest implements Handshake.Body
   // -------------------------------------------------------------------------
 
   protected ByteBuffer buffer;
-  
+
   // Constructor.
   // -------------------------------------------------------------------------
 
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
index 8c059854e4a..f32c52acfa3 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateRequestBuilder.java
@@ -1,4 +1,4 @@
-/* CertificateRequestBuilder.java -- 
+/* CertificateRequestBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -47,7 +47,7 @@ import javax.security.auth.x500.X500Principal;
 
 /**
  * Builder for {@link CertificateRequest} objects.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class CertificateRequestBuilder extends CertificateRequest
@@ -74,7 +74,7 @@ public class CertificateRequestBuilder extends CertificateRequest
     for (ClientCertificateType type : types)
       b.put((byte) type.getValue());
   }
-  
+
   public void setAuthorities(List authorities)
   {
     ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
@@ -99,7 +99,7 @@ public class CertificateRequestBuilder extends CertificateRequest
     buffer.putShort(typesLen, (short) auths.length);
     ((ByteBuffer) buffer.duplicate().position(typesLen + 2)).put(auths);
   }
-  
+
   public void ensureCapacity(final int capacity)
   {
     if (buffer.capacity() >= capacity)
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java
index 059c6ec47ba..e66373620ec 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusRequest.java
@@ -71,12 +71,12 @@ opaque Extensions<0..2^16-1>;
      
 public class CertificateStatusRequest extends Value implements Iterable
 {
   private ByteBuffer buffer;
-  
+
   public CertificateStatusRequest(final ByteBuffer buffer)
   {
     this.buffer = buffer;
   }
-  
+
   public CertificateStatusRequest(CertificateStatusType type,
                                   List responderIdList,
                                   byte[] requestExtensions)
@@ -106,12 +106,12 @@ public class CertificateStatusRequest extends Value implements Iterable
     int l = 3 + (buffer.getShort(1) & 0xFFFF);
     return l + (buffer.getShort(l) & 0xFFFF) + 2;
   }
-  
+
   public ByteBuffer buffer()
   {
     return (ByteBuffer) buffer.duplicate().limit(length());
   }
-  
+
   public CertificateStatusType statusType()
   {
     int x = buffer.get(0) & 0xFF;
@@ -132,7 +132,7 @@ public class CertificateStatusRequest extends Value implements Iterable
       }
     return n;
   }
-  
+
   public byte[] responderId(int index)
   {
     int len = buffer.getShort(1) & 0xFFFF;
@@ -152,7 +152,7 @@ public class CertificateStatusRequest extends Value implements Iterable
       }
     throw new IndexOutOfBoundsException();
   }
-  
+
   public byte[] requestExtensions()
   {
     int l = 2 + (buffer.getShort(0) & 0xFFFF);
@@ -161,19 +161,19 @@ public class CertificateStatusRequest extends Value implements Iterable
     ((ByteBuffer) buffer.duplicate().position(ll+2)).get(b);
     return b;
   }
-  
+
   public void setStatusType(CertificateStatusType type)
   {
     buffer.put(0, (byte) type.value);
   }
-  
+
   public void setRequestIdListLength(int newLength)
   {
     if (newLength < 0 || newLength > 0xFFFF)
       throw new IllegalArgumentException("length out of range");
     buffer.putShort(1, (short) newLength);
   }
-  
+
   public void putRequestId(int index, byte[] id)
   {
     if (id.length > 0xFFFF)
@@ -192,7 +192,7 @@ public class CertificateStatusRequest extends Value implements Iterable
     buffer.putShort(i, (short) id.length);
     ((ByteBuffer) buffer.duplicate().position(i)).put(id);
   }
-  
+
   public void setRequestExtensions(int index, byte[] ext)
   {
     if (ext.length > 0xFFFF)
@@ -201,17 +201,17 @@ public class CertificateStatusRequest extends Value implements Iterable
     buffer.putShort(off, (short) ext.length);
     ((ByteBuffer) buffer.duplicate().position(off+2)).put(ext);
   }
-  
+
   public Iterator iterator()
   {
     return new ResponderIdIterator();
   }
-  
+
   public String toString()
   {
     return toString(null);
   }
-  
+
   public String toString(String prefix)
   {
     StringWriter str = new StringWriter();
@@ -237,16 +237,16 @@ public class CertificateStatusRequest extends Value implements Iterable
     out.print("} CertificateStatus;");
     return str.toString();
   }
-  
+
   public class ResponderIdIterator implements Iterator
   {
     private int index;
-    
+
     public ResponderIdIterator()
     {
       index = 0;
     }
-    
+
     public byte[] next() throws NoSuchElementException
     {
       try
@@ -258,12 +258,12 @@ public class CertificateStatusRequest extends Value implements Iterable
           throw new NoSuchElementException();
         }
     }
-    
+
     public boolean hasNext()
     {
       return index < size();
     }
-    
+
     public void remove()
     {
       throw new UnsupportedOperationException();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java
index 7cddf168f94..0d52b27781c 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateStatusType.java
@@ -3,9 +3,9 @@ package gnu.javax.net.ssl.provider;
 public enum CertificateStatusType
 {
   OCSP (1);
-  
+
   public final int value;
-  
+
   private CertificateStatusType (final int value)
   {
     this.value = value;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateURL.java b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateURL.java
index 0bc1c428b48..737efcacdb7 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CertificateURL.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CertificateURL.java
@@ -52,7 +52,7 @@ import java.util.NoSuchElementException;
 
 /**
  * The CertificateURL extension value.
- * 
+ *
  * 
       enum {
   individual_certs(0), pkipath(1), (255)
@@ -84,12 +84,12 @@ opaque SHA1Hash[20];
      
 public class CertificateURL extends Value implements Iterable
 {
   private ByteBuffer buffer;
-  
+
   public CertificateURL(final ByteBuffer buffer)
   {
     this.buffer = buffer;
   }
-  
+
   public CertificateURL(CertChainType type, List urls)
   {
     int length = 3;
@@ -102,12 +102,12 @@ public class CertificateURL extends Value implements Iterable 65535)
       throw new IllegalArgumentException("length must be between 0 and 65535");
     buffer.putShort(1, (short) length);
   }
-  
+
   public String toString()
   {
     return toString(null);
   }
-  
+
   public String toString(String prefix)
   {
     StringWriter str = new StringWriter();
@@ -221,16 +221,16 @@ public class CertificateURL extends Value implements Iterable
   {
     private int index;
-    
+
     public Iterator()
     {
       index = 0;
     }
-    
+
     public URLAndOptionalHash next() throws NoSuchElementException
     {
       try
@@ -242,49 +242,49 @@ public class CertificateURL extends Value implements Iterable
   {
     return new Iterator ();
   }
-  
+
   /**
    * An iterator for the elements in this list. The iterator supports
    * only the set method out of the optional methods,
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java
index 1a1886b888c..4dd64f09f54 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientCertificateTypeList.java
@@ -74,7 +74,7 @@ public class ClientCertificateTypeList implements Iterable iterator()
   {
     return new Iterator();
@@ -224,4 +224,4 @@ public class ClientCertificateTypeList implements Iterable 
+} ClientDiffieHellmanPublic;
  */
 public class ClientDiffieHellmanPublic extends ExchangeKeys implements Builder
 {
@@ -62,12 +62,12 @@ public class ClientDiffieHellmanPublic extends ExchangeKeys implements Builder
   {
     super(buffer);
   }
-  
+
   public ClientDiffieHellmanPublic(final BigInteger Yc)
   {
     super(wrap(Yc));
   }
-  
+
   private static ByteBuffer wrap(BigInteger Yc)
   {
     byte[] b = Util.trim(Yc);
@@ -81,7 +81,7 @@ public class ClientDiffieHellmanPublic extends ExchangeKeys implements Builder
   {
     return (ByteBuffer) buffer.duplicate().rewind().limit(length());
   }
-  
+
   public BigInteger publicValue()
   {
     int len = length() - 2;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
index fdbf262122b..c938e284af6 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHandshake.java
@@ -1,4 +1,4 @@
-/* ClientHandshake.java -- 
+/* ClientHandshake.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -103,27 +103,27 @@ public class ClientHandshake extends AbstractHandshake
     WRITE_FINISHED (false, true),
     READ_FINISHED (true, false),
     DONE (false, false);
-    
+
     private final boolean isWriteState;
     private final boolean isReadState;
-    
+
     private State(boolean isReadState, boolean isWriteState)
     {
       this.isReadState = isReadState;
       this.isWriteState = isWriteState;
     }
-    
+
     boolean isReadState()
     {
       return isReadState;
     }
-    
+
     boolean isWriteState()
     {
       return isWriteState;
     }
   }
-  
+
   private State state;
   private ByteBuffer outBuffer;
   private boolean continuedSession;
@@ -134,14 +134,14 @@ public class ClientHandshake extends AbstractHandshake
   private MaxFragmentLength maxFragmentLengthSent;
   private boolean truncatedHMacSent;
   private ProtocolVersion sentVersion;
-  
+
   // Delegated tasks.
   private CertVerifier certVerifier;
   private ParamsVerifier paramsVerifier;
   private DelegatedTask keyExchange;
   private CertLoader certLoader;
   private GenCertVerify genCertVerify;
-  
+
   public ClientHandshake(SSLEngineImpl engine) throws NoSuchAlgorithmException
   {
     super(engine);
@@ -160,7 +160,7 @@ public class ClientHandshake extends AbstractHandshake
     if (state.isWriteState()
         || (outBuffer != null && outBuffer.hasRemaining()))
       return HandshakeStatus.NEED_WRAP;
-    
+
     // Copy the current buffer, and prepare it for reading.
     ByteBuffer buffer = handshakeBuffer.duplicate ();
     buffer.flip();
@@ -169,7 +169,7 @@ public class ClientHandshake extends AbstractHandshake
     Handshake handshake = new Handshake(buffer.slice(),
                                         engine.session().suite,
                                         engine.session().version);
-        
+
     if (Debug.DEBUG)
       logger.logv(Component.SSL_HANDSHAKE, "processing in state {0}:\n{1}",
                   state, handshake);
@@ -241,7 +241,7 @@ public class ClientHandshake extends AbstractHandshake
             state = READ_CERTIFICATE_REQUEST;
         }
         break;
-        
+
         // Server Certificate.
         case READ_CERTIFICATE:
         {
@@ -274,7 +274,7 @@ public class ClientHandshake extends AbstractHandshake
           engine.session().setPeerCertificates(chain);
           certVerifier = new CertVerifier(true, chain);
           tasks.add(certVerifier);
-          
+
           // If we are doing an RSA key exchange, generate our parameters.
           KeyExchangeAlgorithm kea = engine.session().suite.keyExchangeAlgorithm();
           if (kea == RSA || kea == RSA_PSK)
@@ -290,7 +290,7 @@ public class ClientHandshake extends AbstractHandshake
             state = READ_SERVER_KEY_EXCHANGE;
         }
         break;
-        
+
         // Server Key Exchange.
         case READ_SERVER_KEY_EXCHANGE:
         {
@@ -301,7 +301,7 @@ public class ClientHandshake extends AbstractHandshake
               && kexalg != DHE_PSK && kexalg != PSK && kexalg != RSA_PSK)
             throw new AlertException(new Alert(Level.FATAL,
                                                Description.UNEXPECTED_MESSAGE));
-          
+
           if (handshake.type() != Handshake.Type.SERVER_KEY_EXCHANGE)
             {
               if (kexalg != RSA_PSK && kexalg != PSK)
@@ -320,14 +320,14 @@ public class ClientHandshake extends AbstractHandshake
               paramsBuffer = ByteBuffer.allocate(b.remaining());
               paramsBuffer.put(b);
             }
-          
+
           if (s.signatureAlgorithm() != SignatureAlgorithm.ANONYMOUS)
             {
               byte[] signature = skex.signature().signature();
               paramsVerifier = new ParamsVerifier(paramsBuffer, signature);
               tasks.add(paramsVerifier);
             }
-          
+
           if (kexalg == DHE_DSS || kexalg == DHE_RSA || kexalg == DH_anon)
             {
               ServerDHParams dhParams = (ServerDHParams) skex.params();
@@ -357,7 +357,7 @@ public class ClientHandshake extends AbstractHandshake
           state = READ_CERTIFICATE_REQUEST;
         }
         break;
-        
+
         // Certificate Request.
         case READ_CERTIFICATE_REQUEST:
         {
@@ -366,23 +366,23 @@ public class ClientHandshake extends AbstractHandshake
               state = READ_SERVER_HELLO_DONE;
               return HandshakeStatus.NEED_UNWRAP;
             }
-          
+
           CertificateRequest req = (CertificateRequest) handshake.body();
           ClientCertificateTypeList types = req.types();
           LinkedList typeList = new LinkedList();
           for (ClientCertificateType t : types)
             typeList.add(t.name());
-          
+
           X500PrincipalList issuers = req.authorities();
           LinkedList issuerList = new LinkedList();
           for (X500Principal p : issuers)
             issuerList.add(p);
-          
+
           certLoader = new CertLoader(typeList, issuerList);
           tasks.add(certLoader);
         }
         break;
-        
+
         // Server Hello Done.
         case READ_SERVER_HELLO_DONE:
         {
@@ -392,7 +392,7 @@ public class ClientHandshake extends AbstractHandshake
           state = WRITE_CERTIFICATE;
         }
         break;
-        
+
         // Finished.
         case READ_FINISHED:
         {
@@ -422,7 +422,7 @@ public class ClientHandshake extends AbstractHandshake
           if (Debug.DEBUG)
             logger.logv(Component.SSL_HANDSHAKE, "clientFinished: {0}",
                         clientFinished);
-          
+
           if (engine.session().version == ProtocolVersion.SSL_3)
             {
               if (!Arrays.equals(clientFinished.md5Hash(),
@@ -453,13 +453,13 @@ public class ClientHandshake extends AbstractHandshake
             state = DONE;
         }
         break;
-        
+
         default:
           throw new IllegalStateException("invalid state: " + state);
       }
-    
+
     handshakeOffset += handshake.length() + 4;
-    
+
     if (!tasks.isEmpty())
       return HandshakeStatus.NEED_TASK;
     if (state.isWriteState()
@@ -488,7 +488,7 @@ public class ClientHandshake extends AbstractHandshake
         fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
         outBuffer.position(outBuffer.position() + l);
       }
-    
+
     if (!fragment.hasRemaining())
       {
         if (state.isWriteState() || outBuffer.hasRemaining())
@@ -518,7 +518,7 @@ outer_loop:
               // that ID.
               if (continued != null)
                 sid = continued.id();
-              
+
               hello.setSessionId(sid.id());
               sentVersion = chooseVersion();
               hello.setVersion(sentVersion);
@@ -551,7 +551,7 @@ outer_loop:
                       extensions.add(new Extension(Extension.Type.SERVER_NAME,
                                                    names));
                     }
-                  
+
                   if (truncatedHMac())
                     {
                       extensions.add(new Extension(Extension.Type.TRUNCATED_HMAC,
@@ -564,7 +564,7 @@ outer_loop:
                 }
               else
                 hello.setDisableExtensions(true);
-              
+
               if (Debug.DEBUG)
                 logger.logv(Component.SSL_HANDSHAKE, "{0}", hello);
 
@@ -579,7 +579,7 @@ outer_loop:
               state = READ_SERVER_HELLO;
             }
             break;
-            
+
             case WRITE_CERTIFICATE:
             {
               java.security.cert.Certificate[] chain
@@ -598,12 +598,12 @@ outer_loop:
                                                          Description.INTERNAL_ERROR),
                                                ce);
                     }
-                  
+
                   outBuffer = cert.buffer();
-                  
+
                   fragment.putInt((Handshake.Type.CERTIFICATE.getValue() << 24)
                                   | (cert.length() & 0xFFFFFF));
-                  
+
                   int l = Math.min(fragment.remaining(), outBuffer.remaining());
                   fragment.put((ByteBuffer) outBuffer.duplicate()
                                .limit(outBuffer.position() + l));
@@ -612,7 +612,7 @@ outer_loop:
               state = WRITE_CLIENT_KEY_EXCHANGE;
             }
             break;
-            
+
             case WRITE_CLIENT_KEY_EXCHANGE:
             {
               KeyExchangeAlgorithm kea = engine.session().suite.keyExchangeAlgorithm();
@@ -698,10 +698,10 @@ outer_loop:
                                                            engine.session().suite);
                   engine.session().privateData.masterSecret = new byte[0];
                 }
-              
+
               if (Debug.DEBUG)
                 logger.logv(Component.SSL_HANDSHAKE, "{0}", ckex);
-              
+
               outBuffer = ckex.buffer();
               if (Debug.DEBUG)
                 logger.logv(Component.SSL_HANDSHAKE, "client kex buffer {0}", outBuffer);
@@ -726,28 +726,28 @@ outer_loop:
             // Both states terminate in a NEED_TASK, or a need to change cipher
             // specs; so we can't write any more messages here.
             break outer_loop;
-            
+
             case WRITE_CERTIFICATE_VERIFY:
             {
               assert(genCertVerify != null);
               assert(genCertVerify.hasRun());
               CertificateVerify verify = new CertificateVerify(genCertVerify.signed(),
                                                                engine.session().suite.signatureAlgorithm());
-              
+
               outBuffer = verify.buffer();
               fragment.putInt((Handshake.Type.CERTIFICATE_VERIFY.getValue() << 24)
                               | (verify.length() & 0xFFFFFF));
               int l = Math.min(fragment.remaining(), outBuffer.remaining());
               fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
               outBuffer.position(outBuffer.position() + l);
-              
+
               // XXX This is a potential problem: we may not have drained
               // outBuffer, but set the changeCipherSpec toggle.
               engine.changeCipherSpec();
               state = WRITE_FINISHED;
             }
             break outer_loop;
-            
+
             case WRITE_FINISHED:
             {
               MessageDigest md5copy = null;
@@ -766,10 +766,10 @@ outer_loop:
               outBuffer
                 = generateFinished(md5copy, shacopy, true,
                                    engine.session());
-              
+
               fragment.putInt((Handshake.Type.FINISHED.getValue() << 24)
                               | outBuffer.remaining() & 0xFFFFFF);
-              
+
               int l = Math.min(outBuffer.remaining(), fragment.remaining());
               fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
               outBuffer.position(outBuffer.position() + l);
@@ -777,10 +777,10 @@ outer_loop:
               if (continuedSession)
                 state = DONE;
               else
-                state = READ_FINISHED;              
+                state = READ_FINISHED;
             }
             break;
-            
+
             default:
               throw new IllegalStateException("invalid state: " + state);
           }
@@ -808,7 +808,7 @@ outer_loop:
       return HandshakeStatus.NEED_WRAP;
     return HandshakeStatus.FINISHED;
   }
-  
+
   @Override void checkKeyExchange() throws SSLException
   {
     // XXX implement.
@@ -821,7 +821,7 @@ outer_loop:
   {
     throw new SSLException("this should be impossible");
   }
-  
+
   private ProtocolVersion chooseVersion() throws SSLException
   {
     // Select the highest enabled version, for our initial key exchange.
@@ -839,13 +839,13 @@ outer_loop:
             continue;
           }
       }
-    
+
     if (version == null)
       throw new SSLException("no suitable enabled versions");
-    
+
     return version;
   }
-  
+
   private List getSuites() throws SSLException
   {
     List suites = new LinkedList();
@@ -859,7 +859,7 @@ outer_loop:
       throw new SSLException("no cipher suites enabled");
     return suites;
   }
-  
+
   private List getCompressionMethods()
   {
     List methods = new LinkedList();
@@ -869,14 +869,14 @@ outer_loop:
     methods.add(CompressionMethod.NULL);
     return methods;
   }
-  
+
   private boolean enableExtensions()
   {
     GetSecurityPropertyAction action
       = new GetSecurityPropertyAction("jessie.client.enable.extensions");
     return Boolean.valueOf(AccessController.doPrivileged(action));
   }
-  
+
   private MaxFragmentLength maxFragmentLength()
   {
     GetSecurityPropertyAction action
@@ -905,35 +905,35 @@ outer_loop:
       }
     return null;
   }
-  
+
   private boolean truncatedHMac()
   {
     GetSecurityPropertyAction action
       = new GetSecurityPropertyAction("jessie.client.truncatedHMac");
     return Boolean.valueOf(AccessController.doPrivileged(action));
   }
-  
+
   private String getPSKIdentity()
   {
     GetSecurityPropertyAction action
       = new GetSecurityPropertyAction("jessie.client.psk.identity");
     return AccessController.doPrivileged(action);
   }
-  
+
   // Delegated tasks.
-  
+
   class ParamsVerifier extends DelegatedTask
   {
     private final ByteBuffer paramsBuffer;
     private final byte[] signature;
     private boolean verified;
-    
+
     ParamsVerifier(ByteBuffer paramsBuffer, byte[] signature)
     {
       this.paramsBuffer = paramsBuffer;
       this.signature = signature;
     }
-    
+
     public void implRun()
       throws InvalidKeyException, NoSuchAlgorithmException,
              SSLPeerUnverifiedException, SignatureException
@@ -949,26 +949,26 @@ outer_loop:
           notifyAll();
         }
     }
-    
+
     boolean verified()
     {
       return verified;
     }
   }
-  
+
   class ClientDHGen extends DelegatedTask
   {
     private final DHPublicKey serverKey;
     private final DHParameterSpec params;
     private final boolean full;
-    
+
     ClientDHGen(DHPublicKey serverKey, DHParameterSpec params, boolean full)
     {
       this.serverKey = serverKey;
       this.params = params;
       this.full = full;
     }
-    
+
     public void implRun()
       throws InvalidAlgorithmParameterException, NoSuchAlgorithmException,
              SSLException
@@ -1006,24 +1006,24 @@ outer_loop:
       if (phase.thrown() != null)
         throw new SSLException(phase.thrown());
     }
-    
+
     DHPublicKey serverKey()
     {
       return serverKey;
     }
   }
-  
+
   class CertLoader extends DelegatedTask
   {
     private final List keyTypes;
     private final List issuers;
-    
+
     CertLoader(List keyTypes, List issuers)
     {
       this.keyTypes = keyTypes;
       this.issuers = issuers;
     }
-    
+
     public void implRun()
     {
       X509ExtendedKeyManager km = engine.contextImpl.keyManager;
@@ -1041,17 +1041,17 @@ outer_loop:
   {
     private byte[] encryptedPreMasterSecret;
     private final boolean full;
-    
+
     RSAGen()
     {
       this(true);
     }
-    
+
     RSAGen(boolean full)
     {
       this.full = full;
     }
-    
+
     public void implRun()
       throws BadPaddingException, IllegalBlockSizeException, InvalidKeyException,
              NoSuchAlgorithmException, NoSuchPaddingException,
@@ -1087,7 +1087,7 @@ outer_loop:
         }
       rsa.init(Cipher.ENCRYPT_MODE, cert.getPublicKey());
       encryptedPreMasterSecret = rsa.doFinal(preMasterSecret);
-      
+
       // Generate our session keys, because we can.
       if (full)
         {
@@ -1096,18 +1096,18 @@ outer_loop:
           setupSecurityParameters(keys, true, engine, compression);
         }
     }
-    
+
     byte[] encryptedSecret()
     {
       return encryptedPreMasterSecret;
     }
   }
-  
+
   class GenCertVerify extends DelegatedTask
   {
     private final MessageDigest md5, sha;
     private byte[] signed;
-    
+
     GenCertVerify(MessageDigest md5, MessageDigest sha)
     {
       try
@@ -1137,14 +1137,14 @@ outer_loop:
           else
             toSign = sha.digest();
         }
-      
+
       java.security.Signature sig =
         java.security.Signature.getInstance(engine.session().suite.signatureAlgorithm().name());
       sig.initSign(privateKey);
       sig.update(toSign);
       signed = sig.sign();
     }
-    
+
     byte[] signed()
     {
       return signed;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHello.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHello.java
index 54d7f8b4d74..a58dc5d7a3c 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHello.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHello.java
@@ -149,7 +149,7 @@ public class ClientHello implements Handshake.Body
                           .limit (buffer.capacity ())).slice ();
     return new CompressionMethodList (listBuf);
   }
-  
+
   public boolean hasExtensions()
   {
     int offset = getExtensionsOffset();
@@ -168,7 +168,7 @@ public class ClientHello implements Handshake.Body
                        .limit(offset + len + 2)).slice ();
     return new ExtensionList(ebuf);
   }
-  
+
   public int extensionsLength()
   {
     if (hasExtensions())
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java
index 81e3dd72f71..90405c45b42 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloBuilder.java
@@ -1,4 +1,4 @@
-/* ClientHelloBuilder.java -- 
+/* ClientHelloBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -43,7 +43,7 @@ import java.util.List;
 
 /**
  * Builder for {@link ClientHello} objects.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class ClientHelloBuilder extends ClientHello implements Builder
@@ -80,7 +80,7 @@ public class ClientHelloBuilder extends ClientHello implements Builder
     this.buffer.position (SESSID_OFFSET2);
     this.buffer.put (buffer, offset, len);
   }
-  
+
   public void setCipherSuites(List suites)
   {
     int off = getCipherSuitesOffset();
@@ -93,7 +93,7 @@ public class ClientHelloBuilder extends ClientHello implements Builder
         i += 2;
       }
   }
-  
+
   public void setCompressionMethods(List methods)
   {
     int off = getCompressionMethodsOffset();
@@ -112,19 +112,19 @@ public class ClientHelloBuilder extends ClientHello implements Builder
       ensureCapacity(needed);
     buffer.putShort(getExtensionsOffset(), (short) length);
   }
-  
+
   public void setExtensions(ByteBuffer extensions)
   {
     int elen = extensions.getShort(0) & 0xFFFF;
     setExtensionsLength(elen);
     ((ByteBuffer) buffer.duplicate().position(getExtensionsOffset())).put(extensions);
   }
-  
+
   public void setDisableExtensions(boolean disableExtensions)
   {
     this.disableExtensions = disableExtensions;
   }
-  
+
   public void ensureCapacity(final int length)
   {
     if (buffer.capacity() >= length)
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java
index a514d9ad37c..6009d52a3f2 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientHelloV2.java
@@ -155,4 +155,4 @@ class ClientHelloV2 implements Constructed
     out.println (Util.toHexString (challenge (), ':'));
     return str.toString ();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java
index ebebdcc0e03..a4387351085 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientKeyExchangeBuilder.java
@@ -1,4 +1,4 @@
-/* ClientKeyExchangeBuilder.java -- 
+/* ClientKeyExchangeBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -42,7 +42,7 @@ import java.nio.ByteBuffer;
 
 /**
  * Builder for {@link ClientKeyExchange} objects.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class ClientKeyExchangeBuilder extends ClientKeyExchange
@@ -60,11 +60,11 @@ public class ClientKeyExchangeBuilder extends ClientKeyExchange
   {
     return ((ByteBuffer) buffer.duplicate().position(0).limit(length())).slice();
   }
-  
+
   public void setExchangeKeys(ByteBuffer exchangeKeys)
   {
     // For SSLv3 and RSA key exchange, the message is sent without length.
-    // So we use the precise capacity of the buffer to signal the size of 
+    // So we use the precise capacity of the buffer to signal the size of
     // the message.
     if (buffer.capacity() < exchangeKeys.remaining()
         || (suite.keyExchangeAlgorithm() == KeyExchangeAlgorithm.RSA
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
index f08ec7f9062..22c6333e913 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientPSKParameters.java
@@ -1,4 +1,4 @@
-/* ClientPSKParameters.java -- 
+/* ClientPSKParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -73,7 +73,7 @@ public class ClientPSKParameters extends ExchangeKeys implements Builder, Constr
     buffer.put(idBuf);
     buffer.rewind();
   }
-  
+
   /* (non-Javadoc)
    * @see gnu.javax.net.ssl.provider.Builder#buffer()
    */
@@ -89,13 +89,13 @@ public class ClientPSKParameters extends ExchangeKeys implements Builder, Constr
   {
     return (buffer.getShort(0) & 0xFFFF) + 2;
   }
-  
+
   public String identity()
   {
     Charset utf8 = Charset.forName("UTF-8");
     return utf8.decode((ByteBuffer) buffer.duplicate().position(2).limit(length())).toString();
   }
-  
+
   public @Override String toString()
   {
     return toString(null);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
index 860cc731f7a..842e911d075 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ClientRSA_PSKParameters.java
@@ -1,4 +1,4 @@
-/* ClientRSA_PSKParameters.java -- 
+/* ClientRSA_PSKParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -72,14 +72,14 @@ public class ClientRSA_PSKParameters extends ExchangeKeys implements Builder, Co
   {
     return (ByteBuffer) buffer.duplicate().rewind().limit(length());
   }
-  
+
   public String identity()
   {
     Charset utf8 = Charset.forName("UTF-8");
     return utf8.decode((ByteBuffer) buffer.duplicate().position(2).limit
                        (identityLength())).toString();
   }
-  
+
   private int identityLength()
   {
     return (buffer.getShort(0) & 0xFFFF) + 2;
@@ -92,7 +92,7 @@ public class ClientRSA_PSKParameters extends ExchangeKeys implements Builder, Co
   {
     return identityLength() + secret().length();
   }
-  
+
   public EncryptedPreMasterSecret secret()
   {
     return new EncryptedPreMasterSecret
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethod.java b/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethod.java
index 6c57e840c65..3005dd9fc1a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethod.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethod.java
@@ -55,10 +55,10 @@ public enum CompressionMethod
       {
       case 0: return NULL;
       case 1: return ZLIB;
-      
+
       // Note: we can't throw an exception here, because we get these values
       // over the wire, and need to just ignore ones we don't recognize.
-      default: return null; 
+      default: return null;
       }
   }
 
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java b/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java
index 47ba5484c3f..b57e0c6a6d0 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/CompressionMethodList.java
@@ -192,7 +192,7 @@ public final class CompressionMethodList implements Iterable
   {
     return new Iterator ();
   }
-  
+
   /**
    * An iterator for the elements in this list. The iterator supports
    * only the set method out of the optional methods,
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Constructed.java b/libjava/classpath/gnu/javax/net/ssl/provider/Constructed.java
index 3a3545b226e..23ff68812e6 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Constructed.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Constructed.java
@@ -40,9 +40,9 @@ package gnu.javax.net.ssl.provider;
 
 /**
  * The base interface to SSL constructed types.
- * 
+ *
  * 
      Contract for ByteBuffer-based constructed types:
- * 
+ *
  * 
      Most implementations of this interface supported by this library
  * take a "view" of an underlying ByteBuffer. The general contract of
  * such classes is that they will not modify the position or
@@ -54,12 +54,12 @@ package gnu.javax.net.ssl.provider;
  * the object, so the limit isn't useful in such cases. Of course, if the
  * limit is set to something other than the object's length, it must be
  * larger than the object length).
- * 
+ *
  * 
      Setter methods (usually in a class that implements the {@link Builder}
  * interface) may modify the limit, but the general contract remains that
  * the position remain at zero, and that the limit be at least as large as
  * the object length.
- * 
+ *
  * 
      Thus, very often the code will use absolute getters and setters
  * for primitive types, or it will use the {@link java.nio.ByteBuffer#duplicate()}
  * method, and sometimes the {@link java.nio.ByteBuffer#slice()} method, and
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Debug.java b/libjava/classpath/gnu/javax/net/ssl/provider/Debug.java
index 6d0f7c3a519..308ef67a003 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Debug.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Debug.java
@@ -40,7 +40,7 @@ package gnu.javax.net.ssl.provider;
 
 /**
  * Debug constants for Jessie.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public final class Debug
@@ -50,13 +50,13 @@ public final class Debug
    * logger.
    */
   public static final boolean DEBUG = true;
-  
+
   /**
    * Set to true to dump out info about the SSL key exchange. Since this
    * MAY contain sensitive data, it is a separate value.
    */
   public static final boolean DEBUG_KEY_EXCHANGE = true;
-  
+
   /**
    * Set to true to turn on dumping of decrypted packets. Since this will
    * log potentially-sensitive information (i.e., decrypted messages), only
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/DelegatedTask.java b/libjava/classpath/gnu/javax/net/ssl/provider/DelegatedTask.java
index 200d4d457cf..34fd39d1987 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/DelegatedTask.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/DelegatedTask.java
@@ -1,4 +1,4 @@
-/* DelegatedTask.java -- 
+/* DelegatedTask.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -49,12 +49,12 @@ public abstract class DelegatedTask implements Runnable
   private static final SystemLogger logger = SystemLogger.SYSTEM;
   private boolean hasRun;
   protected Throwable thrown;
-  
+
   protected DelegatedTask()
   {
     hasRun = false;
   }
-  
+
   public final void run()
   {
     if (hasRun)
@@ -79,15 +79,15 @@ public abstract class DelegatedTask implements Runnable
       }
   }
 
-  public final boolean hasRun() 
+  public final boolean hasRun()
   {
     return hasRun;
   }
-  
+
   public final Throwable thrown()
   {
     return thrown;
   }
-  
+
   protected abstract void implRun() throws Throwable;
 }
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java b/libjava/classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java
index acf4cfa03a9..55b59998df0 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/EmptyExchangeKeys.java
@@ -1,4 +1,4 @@
-/* EmptyExchangeKeys.java -- 
+/* EmptyExchangeKeys.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -64,7 +64,7 @@ public class EmptyExchangeKeys
   {
     return toString(null);
   }
-  
+
   /* (non-Javadoc)
    * @see gnu.javax.net.ssl.provider.Constructed#toString(java.lang.String)
    */
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java b/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
index 85769cffcf2..a40223dd0d9 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/EncryptedPreMasterSecret.java
@@ -61,7 +61,7 @@ public final class EncryptedPreMasterSecret extends ExchangeKeys implements Buil
     version.getClass();
     this.version = version;
   }
-  
+
   public EncryptedPreMasterSecret(byte[] encryptedSecret, ProtocolVersion version)
   {
     this(ByteBuffer.allocate(version == ProtocolVersion.SSL_3
@@ -72,7 +72,7 @@ public final class EncryptedPreMasterSecret extends ExchangeKeys implements Buil
       b.putShort((short) encryptedSecret.length);
     b.put(encryptedSecret);
   }
-  
+
   public ByteBuffer buffer()
   {
     return (ByteBuffer) buffer.duplicate().rewind();
@@ -145,4 +145,4 @@ public final class EncryptedPreMasterSecret extends ExchangeKeys implements Buil
     out.print("} EncryptedPreMasterSecret;");
     return str.toString();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java b/libjava/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java
index f161f484a57..a6664b85683 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ExchangeKeys.java
@@ -51,4 +51,4 @@ public abstract class ExchangeKeys implements Constructed
     if (buffer != null)
       this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Extension.java b/libjava/classpath/gnu/javax/net/ssl/provider/Extension.java
index c79e58832b8..5cbcd579056 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Extension.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Extension.java
@@ -46,13 +46,13 @@ import java.nio.ByteOrder;
 
 /**
  * An SSL hello extension.
- * 
+ *
  * 
        * struct {
  *   ExtensionType extension_type;
  *   opaque extension_data<0..2^16-1>;
  * } Extension;
      
- * 
+ *
  * @author csm@gnu.org
  */
 public final class Extension implements Builder, Constructed
@@ -70,7 +70,7 @@ public final class Extension implements Builder, Constructed
   {
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-  
+
   public Extension(final Type type, final Value value)
   {
     ByteBuffer valueBuffer = value.buffer();
@@ -89,7 +89,7 @@ public final class Extension implements Builder, Constructed
   {
     return (buffer.getShort (2) & 0xFFFF) + 4;
   }
-  
+
   public ByteBuffer buffer()
   {
     return (ByteBuffer) buffer.duplicate().limit(length());
@@ -107,20 +107,20 @@ public final class Extension implements Builder, Constructed
     ((ByteBuffer) buffer.duplicate ().position (4)).get (value);
     return value;
   }
-  
+
   public ByteBuffer valueBuffer()
   {
     int len = buffer.getShort(2) & 0xFFFF;
     return ((ByteBuffer) buffer.duplicate().position(4).limit(len+4)).slice();
   }
-  
+
   public Value value()
   {
     switch (type ())
       {
         case SERVER_NAME:
           return new ServerNameList(valueBuffer());
-          
+
         case MAX_FRAGMENT_LENGTH:
           switch (valueBuffer().get() & 0xFF)
             {
@@ -131,32 +131,32 @@ public final class Extension implements Builder, Constructed
               default:
                 throw new IllegalArgumentException("invalid max_fragment_len");
             }
-          
+
         case TRUNCATED_HMAC:
           return new TruncatedHMAC();
 
         case CLIENT_CERTIFICATE_URL:
           return new CertificateURL(valueBuffer());
-          
+
         case TRUSTED_CA_KEYS:
           return new TrustedAuthorities(valueBuffer());
-          
+
         case STATUS_REQUEST:
           return new CertificateStatusRequest(valueBuffer());
-          
+
         case SRP:
         case CERT_TYPE:
       }
     return new UnresolvedExtensionValue(valueBuffer());
   }
-  
+
   public void setLength (final int newLength)
   {
     if (newLength < 0 || newLength > 65535)
       throw new IllegalArgumentException ("length is out of bounds");
     buffer.putShort (2, (short) newLength);
   }
-  
+
   public void setType (final Type type)
   {
     buffer.putShort(0, (short) type.getValue());
@@ -166,14 +166,14 @@ public final class Extension implements Builder, Constructed
   {
     setValue (value, 0, value.length);
   }
-  
+
   public void setValue (final byte[] value, final int offset, final int length)
   {
     if (length != length ())
       throw new IllegalArgumentException ("length is different than claimed length");
     ((ByteBuffer) buffer.duplicate().position(4)).put(value, offset, length);
   }
-  
+
   public String toString()
   {
     return toString(null);
@@ -233,13 +233,13 @@ public final class Extension implements Builder, Constructed
           default: return null;
         }
     }
-    
+
     public int getValue()
     {
       return value;
     }
   }
-  
+
   public static abstract class Value implements Builder, Constructed
   {
   }
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ExtensionList.java b/libjava/classpath/gnu/javax/net/ssl/provider/ExtensionList.java
index d5aaad62155..fb7b12d9ec9 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ExtensionList.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ExtensionList.java
@@ -13,9 +13,9 @@ import java.util.NoSuchElementException;
 /**
  * A list of extensions, that may appear in either the {@link ClientHello} or
  * {@link ServerHello}. The form of the extensions list is:
- * 
+ *
  *    Extension extensions_list<1..2^16-1>
- * 
+ *
  * @author csm
  */
 public class ExtensionList implements Builder, Iterable
@@ -28,7 +28,7 @@ public class ExtensionList implements Builder, Iterable
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
     modCount = 0;
   }
-  
+
   public ExtensionList(List extensions)
   {
     int length = 2;
@@ -40,7 +40,7 @@ public class ExtensionList implements Builder, Iterable
       buffer.put(extension.buffer());
     buffer.rewind();
   }
-  
+
   public ByteBuffer buffer()
   {
     return (ByteBuffer) buffer.duplicate().limit(length());
@@ -63,10 +63,10 @@ public class ExtensionList implements Builder, Iterable
     ByteBuffer b = (ByteBuffer) buffer.duplicate().position(i).limit(i+el+4);
     return new Extension(b.slice());
   }
-  
+
   /**
    * Returns the number of extensions this list contains.
-   * 
+   *
    * @return The number of extensions.
    */
   public int size ()
@@ -86,14 +86,14 @@ public class ExtensionList implements Builder, Iterable
 
   /**
    * Returns the length of this extension list, in bytes.
-   * 
+   *
    * @return The length of this extension list, in bytes.
    */
   public int length ()
   {
     return (buffer.getShort (0) & 0xFFFF) + 2;
   }
-  
+
   /**
    * Sets the extension at index i to e. Note that setting an
    * element at an index may invalidate any other elements that come
@@ -101,10 +101,10 @@ public class ExtensionList implements Builder, Iterable
    * move existing elements in this list, and since extensions are variable
    * length, you can not guarantee that extensions later in the list
    * will still be valid.
-   * 
+   *
    * 
      Thus, elements of this list must be set in order of increasing
    * index.
-   * 
+   *
    * @param index The index to set the extension at.
    * @param e The extension.
    * @throws java.nio.BufferOverflowException If setting the extension overflows
@@ -136,12 +136,12 @@ public class ExtensionList implements Builder, Iterable
     ((ByteBuffer) buffer.duplicate().position(i+4)).put (e.valueBuffer());
     modCount++;
   }
-  
+
   /**
    * Reserve space for an extension at index i in the list. In other
    * words, this does the job of {@link #set(int, Extension)}, but does not
    * copy the extension value to the underlying buffer.
-   * 
+   *
    * @param index The index of the extension to reserve space for.
    * @param t The type of the extension.
    * @param eLength The number of bytes to reserve for this extension. The total
@@ -168,10 +168,10 @@ public class ExtensionList implements Builder, Iterable
     buffer.putShort(i+2, (short) eLength);
     modCount++;
   }
-  
+
   /**
    * Set the total length of this list, in bytes.
-   * 
+   *
    * @param newLength The new list length.
    */
   public void setLength (final int newLength)
@@ -181,7 +181,7 @@ public class ExtensionList implements Builder, Iterable
     buffer.putShort (0, (short) newLength);
     modCount++;
   }
-  
+
   public Iterator iterator()
   {
     return new ExtensionsIterator();
@@ -191,7 +191,7 @@ public class ExtensionList implements Builder, Iterable
   {
     return toString (null);
   }
-  
+
   public String toString(final String prefix)
   {
     StringWriter str = new StringWriter();
@@ -214,7 +214,7 @@ public class ExtensionList implements Builder, Iterable
 
   /**
    * List iterator interface to an extensions list.
-   * 
+   *
    * @author csm@gnu.org
    */
   public final class ExtensionsIterator implements ListIterator
@@ -222,7 +222,7 @@ public class ExtensionList implements Builder, Iterable
     private final int modCount;
     private int index;
     private final int size;
-    
+
     public ExtensionsIterator ()
     {
       this.modCount = ExtensionList.this.modCount;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
index dd36f2b3fc5..31f142d3e24 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Handshake.java
@@ -266,7 +266,7 @@ public final class Handshake implements Constructed
 
     /**
      * Convert a raw handshake type value to a type enum value.
-     * 
+     *
      * @return The corresponding enum value for the raw integer value.
      * @throws IllegalArgumentException If the value is not a known handshake
      *  type.
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
index cf5ca6099ff..1d3da833a8f 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/InputSecurityParameters.java
@@ -83,7 +83,7 @@ public class InputSecurityParameters
   /**
    * Decrypt a record, storing the decrypted fragment into the given array
    * of byte buffers.
-   * 
+   *
    * @param record The input record.
    * @param output The output buffers.
    * @param offset The offset of the first buffer to use.
@@ -94,7 +94,7 @@ public class InputSecurityParameters
    *  and the input fragment is not a multiple of the block size.
    * @throws MacException If verifying the MAC fails.
    * @throws SSLException ???
-   * @throws ShortBufferException 
+   * @throws ShortBufferException
    */
   public int decrypt(Record record, ByteBuffer[] output, int offset, int length)
     throws DataFormatException, IllegalBlockSizeException,
@@ -102,11 +102,11 @@ public class InputSecurityParameters
   {
     return decrypt(record, output, offset, length, null);
   }
-  
+
   /**
    * Decrypt a record, storing the decrypted fragment into the given growable
    * buffer.
-   * 
+   *
    * @param record The input record.
    * @param outputStream The output buffer.
    * @return The number of bytes put into the output buffer.
@@ -122,7 +122,7 @@ public class InputSecurityParameters
   {
     return decrypt(record, null, 0, 0, outputStream);
   }
-  
+
   private int decrypt(Record record, ByteBuffer[] output, int offset, int length,
                       ByteBufferOutputStream outputStream)
     throws DataFormatException, IllegalBlockSizeException,
@@ -142,7 +142,7 @@ public class InputSecurityParameters
     if (Debug.DEBUG_DECRYPTION)
       logger.logv(Component.SSL_RECORD_LAYER, "decrypted fragment:\n{0}",
                   Util.hexDump((ByteBuffer) fragment.duplicate().position(0), " >> "));
-    
+
     int fragmentLength = record.length();
     int maclen = 0;
     if (mac != null)
@@ -178,14 +178,14 @@ public class InputSecurityParameters
               logger.logv(Component.SSL_RECORD_LAYER, "TLSv1.x padding\n{0}",
                           new ByteArray(pad));
           }
-        
+
         if (Debug.DEBUG)
           logger.logv(Component.SSL_RECORD_LAYER, "padding bad? {0}",
                       badPadding);
         if (!badPadding)
           fragmentLength = fragmentLength - padRemoveLen;
       }
-    
+
     int ivlen = 0;
     if (session.version.compareTo(ProtocolVersion.TLS_1_1) >= 0
         && !suite.isStreamCipher())
@@ -244,7 +244,7 @@ public class InputSecurityParameters
         else
           fragment.position(0);
         fragment.limit(fragmentLength);
-        
+
         while (!done)
           {
             int l;
@@ -259,7 +259,7 @@ public class InputSecurityParameters
             out.write(outbuffer, 0, l);
             done = !fragment.hasRemaining() && inflater.finished();
           }
-        
+
         ByteBuffer outbuf = out.buffer();
         if (outputStream != null)
           {
@@ -323,10 +323,10 @@ public class InputSecurityParameters
       }
 
     sequence++;
-    
+
     return produced;
   }
-  
+
   CipherSuite cipherSuite ()
   {
     return suite;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Jessie.java b/libjava/classpath/gnu/javax/net/ssl/provider/Jessie.java
index 6bd68b3850f..d3fb3a65888 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Jessie.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Jessie.java
@@ -90,11 +90,11 @@ public class Jessie extends Provider
 
           put("Mac.SSLv3HMac-MD5", SSLv3HMacMD5Impl.class.getName());
           put("Mac.SSLv3HMac-SHA", SSLv3HMacSHAImpl.class.getName());
-          
+
           put("Signature.TLSv1.1-RSA", SSLRSASignatureImpl.class.getName());
           put("Alg.Alias.Signature.TLSv1-RSA", "TLSv1.1-RSA");
           put("Alg.Alias.Signature.SSLv3-RSA", "TLSv1.1-RSA");
-          
+
           return null;
         }
       });
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java b/libjava/classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java
index eb63958b839..acbfedff178 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/MaxFragmentLength.java
@@ -5,7 +5,7 @@ import gnu.javax.net.ssl.provider.Extension.Value;
 import java.nio.ByteBuffer;
 
 /**
- * Extension value 
+ * Extension value
  * @author csm
  */
 public class MaxFragmentLength extends Value
@@ -14,21 +14,21 @@ public class MaxFragmentLength extends Value
   public static final MaxFragmentLength LEN_2_10 = new MaxFragmentLength(2, 1 << 10);
   public static final MaxFragmentLength LEN_2_11 = new MaxFragmentLength(3, 1 << 11);
   public static final MaxFragmentLength LEN_2_12 = new MaxFragmentLength(4, 1 << 12);
-  
+
   private final int value;
   private final int length;
-  
+
   private MaxFragmentLength(int value, int length)
   {
     this.value = value;
     this.length = length;
   }
-  
+
   public ByteBuffer buffer()
   {
     return ByteBuffer.allocate(1).put(0, (byte) value);
   }
-  
+
   public int length()
   {
     return 1;
@@ -38,17 +38,17 @@ public class MaxFragmentLength extends Value
   {
     return value;
   }
-  
+
   public int maxLength()
   {
     return length;
   }
-  
+
   public String toString()
   {
     return toString(null);
   }
-  
+
   public String toString(String prefix)
   {
     String s = "max_fragment_length = ";
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
index 228071a393d..c6ed7d5876a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/OutputSecurityParameters.java
@@ -1,4 +1,4 @@
-/* OutputSecurityParameters.java -- 
+/* OutputSecurityParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -88,12 +88,12 @@ public class OutputSecurityParameters
     if (offset < 0 || offset >= input.length
         || length <= 0 || offset + length > input.length)
       throw new IndexOutOfBoundsException();
-    
+
     if (Debug.DEBUG)
       for (int i = offset; i < offset+length; i++)
         logger.logv(Component.SSL_RECORD_LAYER, "encrypting record [{0}]: {1}",
                     i-offset, input[i]);
-    
+
     int maclen = 0;
     if (mac != null)
       maclen = session.isTruncatedMac() ? 10 : mac.getMacLength ();
@@ -107,7 +107,7 @@ public class OutputSecurityParameters
         iv = new byte[ivlen];
         session.random().nextBytes(iv);
       }
-        
+
     int padaddlen = 0;
     if (!suite.isStreamCipher()
         && session.version.compareTo(ProtocolVersion.TLS_1) >= 0)
@@ -115,7 +115,7 @@ public class OutputSecurityParameters
         padaddlen = (session.random().nextInt(255 / cipher.getBlockSize())
                      * cipher.getBlockSize());
       }
-    
+
     int fragmentLength = 0;
     ByteBuffer[] fragments = null;
     // Compress the content, if needed.
@@ -126,10 +126,10 @@ public class OutputSecurityParameters
         byte[] inbuf = new byte[1024];
         byte[] outbuf = new byte[1024];
         int written = 0;
-        
+
         // Here we use the guarantee that the deflater won't increase the
         // output size by more than 1K -- we resign ourselves to only deflate
-        // as much data as we have space for *uncompressed*, 
+        // as much data as we have space for *uncompressed*,
         int limit = output.remaining() - (maclen + ivlen + padaddlen) - 1024;
 
         for (int i = offset; i < length && written < limit; i++)
@@ -241,7 +241,7 @@ public class OutputSecurityParameters
     outrecord.setContentType(contentType);
     outrecord.setVersion(session.version);
     outrecord.setLength(fragmentLength);
-    
+
     int consumed = 0;
     ByteBuffer outfragment = outrecord.fragment();
 
@@ -279,16 +279,16 @@ public class OutputSecurityParameters
         if (macValue != null)
           outfragment.put(macValue);
       }
-      
+
     // Advance the output buffer's position.
     output.position(output.position() + outrecord.length() + 5);
     sequence++;
 
     return new int[] { consumed, fragmentLength + 5 };
   }
-  
+
   CipherSuite suite()
   {
     return suite;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java
index aa1f97853cf..16263fb3740 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/PreSharedKeyManagerFactoryImpl.java
@@ -1,4 +1,4 @@
-/* PreSharedKeyManagerFactory.java -- 
+/* PreSharedKeyManagerFactory.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -106,7 +106,7 @@ public class PreSharedKeyManagerFactoryImpl
     {
       return params.getKey(name);
     }
-    
+
     public String chooseIdentityHint()
     {
       Iterator it = params.identities();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Random.java b/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
index f89acc1f8f5..bd5c037f57b 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Random.java
@@ -83,7 +83,7 @@ public class Random implements Builder, Constructed
   {
     return RANDOM_LENGTH + 4;
   }
-  
+
   public ByteBuffer buffer()
   {
     return ((ByteBuffer) buffer.duplicate().position(0).limit(length())).slice();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java
index cf7c8e4e3d6..50bbdb61b18 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLContextImpl.java
@@ -1,4 +1,4 @@
-/* SSLContextImpl.java -- 
+/* SSLContextImpl.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -68,14 +68,14 @@ import javax.net.ssl.X509TrustManager;
 
 /**
  * Our implementation of {@link SSLContextSpi}.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public final class SSLContextImpl extends SSLContextSpi
 {
   AbstractSessionContext serverContext;
   AbstractSessionContext clientContext;
-  
+
   PreSharedKeyManager pskManager;
   X509ExtendedKeyManager keyManager;
   X509TrustManager trustManager;
@@ -85,7 +85,7 @@ public final class SSLContextImpl extends SSLContextSpi
   public SSLContextImpl()
   {
   }
-  
+
   /* (non-Javadoc)
    * @see javax.net.ssl.SSLContextSpi#engineCreateSSLEngine()
    */
@@ -210,11 +210,11 @@ public final class SSLContextImpl extends SSLContextSpi
         this.random = defaultRandom();
       }
   }
-  
+
   /**
    * Create and return a default key manager. The default is the JessieX509
    * algorithm, loaded from either the jssecerts file, or the cacerts file.
-   * 
+   *
    * @return The default key manager instance.
    * @throws KeyManagementException If the instance cannot be created.
    */
@@ -257,7 +257,7 @@ public final class SSLContextImpl extends SSLContextSpi
   /**
    * Create and return a default trust manager. The default is the JessieX509
    * algorithm, loaded from either the jssecerts file, or the cacerts file.
-   * 
+   *
    * @return The default trust manager instance.
    * @throws KeyManagementException If the instance cannot be created.
    */
@@ -290,7 +290,7 @@ public final class SSLContextImpl extends SSLContextSpi
    * property, or Fortuna if that property is not set. If none of these
    * algorithms can be found, and instance created with the SecureRandom
    * constructor is returned.
-   * 
+   *
    * @return The default secure PRNG instance.
    */
   private SecureRandom defaultRandom()
@@ -312,4 +312,4 @@ public final class SSLContextImpl extends SSLContextSpi
 
     return rand;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java
index 4a7f924e87d..b63fb2f20f2 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLEngineImpl.java
@@ -84,7 +84,7 @@ public final class SSLEngineImpl extends SSLEngine
 
   private String[] enabledSuites;
   private String[] enabledProtocols;
-  
+
   /**
    * We can receive any message chunked across multiple records,
    * including alerts, even though all alert messages are only two
@@ -100,7 +100,7 @@ public final class SSLEngineImpl extends SSLEngine
   private Mode mode;
 
   private enum Mode { SERVER, CLIENT }
-  
+
   SSLEngineImpl (SSLContextImpl contextImpl, String host, int port)
   {
     super(host, port);
@@ -113,11 +113,11 @@ public final class SSLEngineImpl extends SSLEngine
     contextImpl.random.nextBytes(sid);
     session.setId(new Session.ID(sid));
     session.setRandom(contextImpl.random);
-    
+
     if (Debug.DEBUG)
       logger.logv(Component.SSL_RECORD_LAYER, "generated session ID {0} with random {1}",
                   session.id(), contextImpl.random);
-    
+
     // Begin with no encryption.
     insec = new InputSecurityParameters (null, null, null, session,
                                          CipherSuite.TLS_NULL_WITH_NULL_NULL);
@@ -134,7 +134,7 @@ public final class SSLEngineImpl extends SSLEngine
     lastAlert = null;
     handshakeStatus = SSLEngineResult.HandshakeStatus.NOT_HANDSHAKING;
     changeCipherSpec = false;
-    
+
     // Set up default protocols and suites.
     enabledProtocols = new String[] {
       ProtocolVersion.TLS_1_1.toString(),
@@ -143,7 +143,7 @@ public final class SSLEngineImpl extends SSLEngine
     };
     enabledSuites = defaultSuites();
   }
-  
+
   static String[] defaultSuites()
   {
     return new String[] {
@@ -204,7 +204,7 @@ public final class SSLEngineImpl extends SSLEngine
 
     if (mode == null)
       throw new IllegalStateException("setUseClientMode was never used");
-    
+
     switch (mode)
       {
       case SERVER:
@@ -219,7 +219,7 @@ public final class SSLEngineImpl extends SSLEngine
             throw new SSLException(nsae);
           }
         break;
-        
+
       case CLIENT:
         try
           {
@@ -244,7 +244,7 @@ public final class SSLEngineImpl extends SSLEngine
   {
     lastAlert = new Alert(Alert.Level.WARNING, Alert.Description.CLOSE_NOTIFY);
   }
-  
+
   @Override
   public Runnable getDelegatedTask()
   {
@@ -252,13 +252,13 @@ public final class SSLEngineImpl extends SSLEngine
       return null;
     return handshake.getTask();
   }
-  
+
   @Override
   public String[] getEnabledCipherSuites()
   {
     return (String[]) enabledSuites.clone();
   }
-  
+
   @Override
   public String[] getEnabledProtocols()
   {
@@ -270,7 +270,7 @@ public final class SSLEngineImpl extends SSLEngine
   {
     return createSessions;
   }
-  
+
   @Override
   public HandshakeStatus getHandshakeStatus()
   {
@@ -278,43 +278,43 @@ public final class SSLEngineImpl extends SSLEngine
       return HandshakeStatus.NOT_HANDSHAKING;
     return handshake.status();
   }
-  
+
   @Override
   public boolean getNeedClientAuth()
   {
     return needClientAuth;
   }
-  
+
   @Override
   public SSLSession getSession()
   {
     return session;
   }
-  
+
   @Override
   public boolean getUseClientMode ()
   {
     return (mode == Mode.CLIENT);
   }
-  
+
   @Override
   public boolean getWantClientAuth()
   {
     return wantClientAuth;
   }
-  
+
   @Override
   public boolean isInboundDone()
   {
     return inClosed;
   }
-  
+
   @Override
   public boolean isOutboundDone()
   {
     return outClosed;
   }
-  
+
   @Override
   public void setEnableSessionCreation(final boolean createSessions)
   {
@@ -336,16 +336,16 @@ public final class SSLEngineImpl extends SSLEngine
       throw new IllegalArgumentException("need at least one protocol");
     enabledProtocols = (String[]) protocols.clone();
   }
-  
+
   @Override
   public String[] getSupportedCipherSuites()
   {
     // XXX if we ever want to support "pluggable" cipher suites, we'll need
     // to figure this out.
-    
+
     return CipherSuite.availableSuiteNames().toArray(new String[0]);
   }
-  
+
   @Override
   public String[] getSupportedProtocols()
   {
@@ -359,7 +359,7 @@ public final class SSLEngineImpl extends SSLEngine
   {
     this.needClientAuth = needClientAuth;
   }
-  
+
   @Override
   public void setUseClientMode (final boolean clientMode)
   {
@@ -368,7 +368,7 @@ public final class SSLEngineImpl extends SSLEngine
     else
       mode = Mode.SERVER;
   }
-  
+
   public @Override void setWantClientAuth(final boolean wantClientAuth)
   {
     this.wantClientAuth = wantClientAuth;
@@ -385,13 +385,13 @@ public final class SSLEngineImpl extends SSLEngine
     if (inClosed)
       return new SSLEngineResult(SSLEngineResult.Status.CLOSED,
                                  handshakeStatus, 0, 0);
-    
+
     if (source.remaining() < 5)
       {
         return new SSLEngineResult(SSLEngineResult.Status.BUFFER_UNDERFLOW,
                                    handshakeStatus, 0, 0);
       }
-    
+
     Record record = null;
     boolean helloV2 = false;
 
@@ -410,15 +410,15 @@ public final class SSLEngineImpl extends SSLEngine
         if (Debug.DEBUG)
           logger.log (Component.SSL_RECORD_LAYER,
                       "converting SSLv2 client hello to version 3 hello");
-        
+
         source.getShort(); // skip length
         ClientHelloV2 v2 = new ClientHelloV2(source.slice());
-        
+
         if (Debug.DEBUG)
           logger.log(Component.SSL_RECORD_LAYER, "v2 hello: {0}", v2);
-        
+
         List suites = v2.cipherSpecs();
-        
+
         ClientHelloBuilder hello = new ClientHelloBuilder();
         hello.setVersion(v2.version ());
 
@@ -448,31 +448,31 @@ public final class SSLEngineImpl extends SSLEngine
         record.setContentType(ContentType.HANDSHAKE);
         record.setVersion(v2.version());
         record.setLength(hello.length() + 4);
-        
+
         Handshake handshake = new Handshake(record.fragment());
         handshake.setLength(hello.length());
         handshake.setType(Handshake.Type.CLIENT_HELLO);
-        
+
         handshake.bodyBuffer().put(hello.buffer());
         source.position(source.position() + hellolen);
         helloV2 = true;
       }
     else
       record = new Record(source);
-    
+
     ContentType type = record.contentType ();
-    
+
     if (Debug.DEBUG)
       logger.log(Component.SSL_RECORD_LAYER, "input record:\n{0}", record);
-    
+
     if (record.length() > session.getPacketBufferSize() - 5)
       {
         lastAlert = new Alert(Alert.Level.FATAL,
                               Alert.Description.RECORD_OVERFLOW);
         throw new AlertException(lastAlert);
       }
-    
-    ByteBufferOutputStream sysMsg = null;    
+
+    ByteBufferOutputStream sysMsg = null;
     ByteBuffer msg = null;
 
     int produced = 0;
@@ -492,7 +492,7 @@ public final class SSLEngineImpl extends SSLEngine
                 insec.decrypt(record, sysMsg);
               }
           }
-        
+
         // Advance the input buffer past the record we just read.
         if (!helloV2)
           source.position(source.position() + record.length() + 5);
@@ -532,7 +532,7 @@ public final class SSLEngineImpl extends SSLEngine
       }
 
     SSLEngineResult result = null;
-    
+
     // If we need to handle the output here, do it. Otherwise, the output
     // has been stored in the supplied output buffers.
     if (sysMsg != null)
@@ -541,7 +541,7 @@ public final class SSLEngineImpl extends SSLEngine
           logger.logv(Component.SSL_RECORD_LAYER, "sysmessage {0}", sysMsg);
         msg = sysMsg.buffer();
       }
-    
+
     if (type == ContentType.CHANGE_CIPHER_SPEC)
       {
         // We *may* get a partial message, even though the message is only
@@ -665,7 +665,7 @@ public final class SSLEngineImpl extends SSLEngine
 
     if (Debug.DEBUG)
       logger.logv(Component.SSL_RECORD_LAYER, "return result: {0}", result);
-    
+
     return result;
   }
 
@@ -679,7 +679,7 @@ public final class SSLEngineImpl extends SSLEngine
     if (outClosed)
       return new SSLEngineResult(SSLEngineResult.Status.CLOSED,
                                  handshakeStatus, 0, 0);
-    
+
     ContentType type = null;
     ByteBuffer sysMessage = null;
     if (Debug.DEBUG)
@@ -720,7 +720,7 @@ public final class SSLEngineImpl extends SSLEngine
                           new Record((ByteBuffer) sink.duplicate().position(orig)));
             SSLEngineResult result = new SSLEngineResult(SSLEngineResult.Status.OK,
                                                          handshakeStatus, 0, produced);
-            
+
             // Note, this will only happen if we transition from
             // TLS_NULL_WITH_NULL_NULL *to* TLS_NULL_WITH_NULL_NULL, which
             // doesn't make a lot of sense, but we support it anyway.
@@ -731,7 +731,7 @@ public final class SSLEngineImpl extends SSLEngine
               }
             return result;
           }
-       
+
         // Rough guideline; XXX.
         sysMessage = ByteBuffer.allocate(sink.remaining() - 2048);
         type = ContentType.HANDSHAKE;
@@ -753,7 +753,7 @@ public final class SSLEngineImpl extends SSLEngine
 
     int produced = 0;
     int consumed = 0;
-    
+
     try
       {
         int orig = sink.position();
@@ -773,7 +773,7 @@ public final class SSLEngineImpl extends SSLEngine
             consumed = inout[0];
             produced = inout[1];
           }
-        
+
         if (Debug.DEBUG)
           logger.logv(Component.SSL_RECORD_LAYER, "emitting record:\n{0}",
                       new Record((ByteBuffer) sink.duplicate().position(orig).limit(produced)));
@@ -798,14 +798,14 @@ public final class SSLEngineImpl extends SSLEngine
         lastAlert = new Alert(Alert.Level.FATAL, Alert.Description.INTERNAL_ERROR);
         return new SSLEngineResult(SSLEngineResult.Status.OK, handshakeStatus, 0, 0);
       }
-    
+
     if (lastAlert != null && lastAlert.level() == Alert.Level.FATAL)
       {
         AlertException ae = new AlertException(lastAlert);
         lastAlert = null;
         throw ae;
       }
-    
+
     if (changeCipherSpec)
       {
         outsec = handshake.getOutputParams();
@@ -829,14 +829,14 @@ public final class SSLEngineImpl extends SSLEngine
   {
     return session;
   }
-  
+
   void setSession(SessionImpl session)
   {
     this.session = session;
   }
-  
+
   void changeCipherSpec()
   {
     changeCipherSpec = true;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
index e6981c9c79d..105b4d5d74b 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLRSASignatureImpl.java
@@ -58,7 +58,7 @@ import java.util.Arrays;
 /**
  * An implementation of of the RSA signature algorithm; this is an RSA
  * encrypted MD5 hash followed by a SHA-1 hash.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class SSLRSASignatureImpl extends SignatureSpi
@@ -69,7 +69,7 @@ public class SSLRSASignatureImpl extends SignatureSpi
   private final MessageDigest md5, sha;
   private boolean initSign = false;
   private boolean initVerify = false;
-  
+
   public SSLRSASignatureImpl() throws NoSuchAlgorithmException
   {
     md5 = MessageDigest.getInstance("MD5");
@@ -149,7 +149,7 @@ public class SSLRSASignatureImpl extends SignatureSpi
   @Override protected byte[] engineSign() throws SignatureException
   {
     // FIXME we need to add RSA blinding to this, somehow.
-    
+
     if (!initSign)
       throw new SignatureException("not initialized for signing");
     // Pad the hash results with RSA block type 1.
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java
index dc80dc78248..67620d173a6 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.java
@@ -1,4 +1,4 @@
-/* SSLServerSocketFactoryImpl.java -- 
+/* SSLServerSocketFactoryImpl.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -50,7 +50,7 @@ import javax.net.ssl.SSLServerSocketFactory;
 public class SSLServerSocketFactoryImpl extends SSLServerSocketFactory
 {
   private final SSLContextImpl contextImpl;
-  
+
   public SSLServerSocketFactoryImpl(SSLContextImpl contextImpl)
   {
     this.contextImpl = contextImpl;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java
index 41ef5f1cf46..5b07017f0a8 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLServerSocketImpl.java
@@ -1,4 +1,4 @@
-/* SSLServerSocketImpl.java -- 
+/* SSLServerSocketImpl.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -48,7 +48,7 @@ import javax.net.ssl.SSLServerSocket;
 public class SSLServerSocketImpl extends SSLServerSocket
 {
   private final SSLContextImpl contextImpl;
-  
+
   private boolean enableSessionCreation;
   private String[] enabledCipherSuites;
   private String[] enabledProtocols;
@@ -183,7 +183,7 @@ public class SSLServerSocketImpl extends SSLServerSocket
   {
     wantClientAuth = wantAuth;
   }
-  
+
   @Override public SSLSocketImpl accept() throws IOException
   {
     SSLSocketImpl socketImpl = new SSLSocketImpl(contextImpl, null, -1);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
index 2915941db6e..d5dd54bce31 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.java
@@ -1,4 +1,4 @@
-/* SSLSocketFactoryImpl.java -- 
+/* SSLSocketFactoryImpl.java --
    Copyright (C) 2006, 2007  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -55,7 +55,7 @@ public class SSLSocketFactoryImpl extends SSLSocketFactory
    * The SSLContextImpl that created us.
    */
   private final SSLContextImpl contextImpl;
-  
+
   public SSLSocketFactoryImpl(SSLContextImpl contextImpl)
   {
     this.contextImpl = contextImpl;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java
index eead7258bbc..9072c288666 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLSocketImpl.java
@@ -73,7 +73,7 @@ public class SSLSocketImpl extends SSLSocket
   {
     private final ByteBuffer buffer;
     private final OutputStream out;
-    
+
     SocketOutputStream() throws IOException
     {
       buffer = ByteBuffer.wrap(new byte[getSession().getPacketBufferSize()]);
@@ -112,12 +112,12 @@ public class SSLSocketImpl extends SSLSocket
             }
         }
     }
-    
+
     @Override public void write(int b) throws IOException
     {
       write(new byte[] { (byte) b });
     }
-    
+
     @Override public void close() throws IOException
     {
       SSLSocketImpl.this.close();
@@ -197,12 +197,12 @@ public class SSLSocketImpl extends SSLSocket
   private IOException handshakeException;
   private boolean initialHandshakeDone = false;
   private final boolean autoClose;
-  
+
   public SSLSocketImpl(SSLContextImpl contextImpl, String host, int port)
   {
     this(contextImpl, host, port, new Socket(), true);
   }
-  
+
   public SSLSocketImpl(SSLContextImpl contextImpl, String host, int port,
                        Socket underlyingSocket, boolean autoClose)
   {
@@ -361,7 +361,7 @@ public class SSLSocketImpl extends SSLSocket
 
     if (handshakeException != null)
       throw handshakeException;
-    
+
     Thread t = new Thread(new Runnable()
     {
       public void run()
@@ -378,7 +378,7 @@ public class SSLSocketImpl extends SSLSocket
     }, "HandshakeThread@" + System.identityHashCode(this));
     t.start();
   }
-  
+
   void doHandshake() throws IOException
   {
     synchronized (engine)
@@ -396,13 +396,13 @@ public class SSLSocketImpl extends SSLSocket
           }
         isHandshaking = true;
       }
-    
+
     if (initialHandshakeDone)
       throw new SSLException("rehandshaking not yet implemented");
 
     long now = -System.currentTimeMillis();
     engine.beginHandshake();
-    
+
     HandshakeStatus status = engine.getHandshakeStatus();
     assert(status != HandshakeStatus.NOT_HANDSHAKING);
 
@@ -411,10 +411,10 @@ public class SSLSocketImpl extends SSLSocket
     ByteBuffer outBuffer = ByteBuffer.wrap(new byte[getSession().getPacketBufferSize()]);
     ByteBuffer emptyBuffer = ByteBuffer.allocate(0);
     SSLEngineResult result = null;
-    
+
     DataInputStream sockIn = new DataInputStream(underlyingSocket.getInputStream());
     OutputStream sockOut = underlyingSocket.getOutputStream();
-    
+
     try
       {
         while (status != HandshakeStatus.NOT_HANDSHAKING
@@ -477,7 +477,7 @@ public class SSLSocketImpl extends SSLSocket
                     throw new SSLException("unexpected SSL status "
                                            + result.getStatus());
                   outBuffer.flip();
-                  sockOut.write(outBuffer.array(), outBuffer.position(), 
+                  sockOut.write(outBuffer.array(), outBuffer.position(),
                                 outBuffer.limit());
                 }
                 break;
@@ -536,14 +536,14 @@ public class SSLSocketImpl extends SSLSocket
           }
       }
   }
-  
+
   // Methods overriding Socket.
 
   @Override public void bind(SocketAddress bindpoint) throws IOException
   {
     underlyingSocket.bind(bindpoint);
   }
-  
+
   @Override public void connect(SocketAddress endpoint) throws IOException
   {
     underlyingSocket.connect(endpoint);
@@ -559,12 +559,12 @@ public class SSLSocketImpl extends SSLSocket
   {
     return underlyingSocket.getInetAddress();
   }
-  
+
   @Override public InetAddress getLocalAddress()
   {
     return underlyingSocket.getLocalAddress();
   }
-  
+
   @Override public int getPort()
   {
     return underlyingSocket.getPort();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java
index 763bbaf3b77..5ef84ca1cc8 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacMD5Impl.java
@@ -1,4 +1,4 @@
-/* SSLv3HMacMD5.java -- 
+/* SSLv3HMacMD5.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -59,7 +59,7 @@ public class SSLv3HMacMD5Impl extends MacSpi
   {
     adaptee = new SSLHMac("MD5");
   }
-  
+
   /* (non-Javadoc)
    * @see javax.crypto.MacSpi#engineDoFinal()
    */
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java b/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java
index 008a21c049d..6b9c9e9ccef 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/SSLv3HMacSHAImpl.java
@@ -1,4 +1,4 @@
-/* SSLv3HMacSHA.java -- 
+/* SSLv3HMacSHA.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -59,7 +59,7 @@ public class SSLv3HMacSHAImpl extends MacSpi
   {
     adaptee = new SSLHMac("SHA-160");
   }
-  
+
   /* (non-Javadoc)
    * @see javax.crypto.MacSpi#engineDoFinal()
    */
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
index 2d21d9d4554..1de3f81245a 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java
@@ -1,4 +1,4 @@
-/* ServerDHE_PSKParameters.java -- 
+/* ServerDHE_PSKParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -60,12 +60,12 @@ import java.nio.charset.Charset;
 public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyExchangeParams
 {
   private ByteBuffer buffer;
-  
+
   public ServerDHE_PSKParameters(ByteBuffer buffer)
   {
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-  
+
   public ServerDHE_PSKParameters(String identityHint, ServerDHParams dhParams)
   {
     this(identityHint, dhParams.buffer());
@@ -78,7 +78,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE
     buffer = ByteBuffer.allocate(2 + hintBuf.remaining() + dhParams.remaining());
     buffer.putShort((short) hintBuf.remaining());
     buffer.put(hintBuf);
-    buffer.put(dhParams);    
+    buffer.put(dhParams);
   }
 
   public KeyExchangeAlgorithm algorithm()
@@ -93,19 +93,19 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE
   {
     return (buffer.getShort(0) & 0xFFFF) + 2 + params().length();
   }
-  
+
   private int hintLength()
   {
     return (buffer.getShort(0) & 0xFFFF) + 2;
   }
-  
+
   public String identityHint()
   {
     Charset utf8 = Charset.forName("UTF-8");
     return utf8.decode((ByteBuffer) buffer.duplicate().position(2).limit
                        (hintLength())).toString();
   }
-  
+
   public ServerDHParams params()
   {
     return new ServerDHParams(((ByteBuffer) buffer.duplicate().position
@@ -119,7 +119,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE
   {
     return (ByteBuffer) buffer.duplicate().rewind().limit(length());
   }
-  
+
   public @Override String toString()
   {
     return toString(null);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java
index 55d4a41da94..0e2c3488131 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerDHParams.java
@@ -64,7 +64,7 @@ public class ServerDHParams implements Builder, ServerKeyExchangeParams
   {
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-  
+
   public ServerDHParams (final BigInteger p, final BigInteger g,
                          final BigInteger y)
   {
@@ -72,7 +72,7 @@ public class ServerDHParams implements Builder, ServerKeyExchangeParams
     byte[] g_bytes = g.toByteArray();
     byte[] y_bytes = y.toByteArray();
     int len = p_bytes.length + g_bytes.length + y_bytes.length + 6;
-    
+
     int p_off = 0;
     if (p_bytes[0] == 0x00)
       {
@@ -94,7 +94,7 @@ public class ServerDHParams implements Builder, ServerKeyExchangeParams
     int p_len = p_bytes.length - p_off;
     int g_len = g_bytes.length - g_off;
     int y_len = y_bytes.length - y_off;
-    
+
     buffer = ByteBuffer.allocate(len);
     buffer.putShort((short) p_len);
     buffer.put(p_bytes, p_off, p_len);
@@ -121,7 +121,7 @@ public class ServerDHParams implements Builder, ServerKeyExchangeParams
   {
     return (ByteBuffer) buffer.duplicate().position(0).limit(length());
   }
-  
+
   /**
    * Returns the server's prime modulus.
    *
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
index e30f04241a0..d69fa120d10 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHandshake.java
@@ -90,7 +90,7 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.security.auth.x500.X500Principal;
 
 class ServerHandshake extends AbstractHandshake
-{  
+{
   /**
    * Handshake state enumeration.
    */
@@ -109,21 +109,21 @@ class ServerHandshake extends AbstractHandshake
     READ_CERTIFICATE_VERIFY (false, true),
     READ_FINISHED (false, true),
     DONE (false, false);
-    
+
     private final boolean isWriteState;
     private final boolean isReadState;
-    
+
     private State(final boolean isWriteState, final boolean isReadState)
     {
       this.isWriteState = isWriteState;
       this.isReadState = isReadState;
     }
-    
+
     boolean isReadState()
     {
       return isReadState;
     }
-    
+
     boolean isWriteState()
     {
       return isWriteState;
@@ -143,7 +143,7 @@ class ServerHandshake extends AbstractHandshake
   private boolean helloV2 = false;
   private KeyPair dhPair;
   private PrivateKey serverKey;
-  
+
   // Delegated tasks we use.
   private GenDH genDH;
   private CertVerifier certVerifier;
@@ -224,11 +224,11 @@ class ServerHandshake extends AbstractHandshake
         kexes.add(DHE_PSK);
         kexes.add(PSK);
       }
-    
+
     if (Debug.DEBUG)
       logger.logv(Component.SSL_HANDSHAKE,
                   "we have certs for key exchange algorithms {0}", kexes);
-    
+
     HashSet suites = new HashSet();
     for (String s : enabledSuites)
       {
@@ -247,7 +247,7 @@ class ServerHandshake extends AbstractHandshake
         if (suites.contains(resolved))
           return resolved;
       }
-    
+
     // We didn't find a match?
     throw new AlertException(new Alert(Alert.Level.FATAL,
                                        Alert.Description.INSUFFICIENT_SECURITY));
@@ -283,7 +283,7 @@ class ServerHandshake extends AbstractHandshake
 
     throw new SSLException ("no supported compression method");
   }
-  
+
   protected @Override boolean doHash()
   {
     boolean b = helloV2;
@@ -308,7 +308,7 @@ class ServerHandshake extends AbstractHandshake
     Handshake handshake = new Handshake(buffer.slice(),
                                         engine.session().suite,
                                         engine.session().version);
-        
+
     if (Debug.DEBUG)
       logger.logv(Component.SSL_HANDSHAKE, "processing in state {0}:\n{1}",
                   state, handshake);
@@ -328,7 +328,7 @@ class ServerHandshake extends AbstractHandshake
           if (handshake.type () != CLIENT_HELLO)
             throw new AlertException(new Alert(Alert.Level.FATAL,
                                                Alert.Description.UNEXPECTED_MESSAGE));
-            
+
           {
             ClientHello hello = (ClientHello) handshake.body ();
             engine.session().version
@@ -366,7 +366,7 @@ class ServerHandshake extends AbstractHandshake
                       engine.session().maxLength = len;
                       engine.session().setApplicationBufferSize(len.maxLength());
                       break;
-                      
+
                     case SERVER_NAME:
                       requestedNames = (ServerNameList) e.value();
                       List names
@@ -426,7 +426,7 @@ class ServerHandshake extends AbstractHandshake
                 state = READ_CLIENT_KEY_EXCHANGE;
                 return HandshakeStatus.NEED_UNWRAP;
               }
-            
+
             Certificate cert = (Certificate) handshake.body();
             try
               {
@@ -472,7 +472,7 @@ class ServerHandshake extends AbstractHandshake
             if (handshake.type() != CLIENT_KEY_EXCHANGE)
               throw new SSLException("expecting client key exchange");
             ClientKeyExchange kex = (ClientKeyExchange) handshake.body();
-            
+
             KeyExchangeAlgorithm alg = engine.session().suite.keyExchangeAlgorithm();
             switch (alg)
               {
@@ -500,7 +500,7 @@ class ServerHandshake extends AbstractHandshake
                     tasks.add(keyExchangeTask);
                   }
                   break;
-            
+
                 case PSK:
                   {
                     ClientPSKParameters params = (ClientPSKParameters)
@@ -508,7 +508,7 @@ class ServerHandshake extends AbstractHandshake
                     generatePSKSecret(params.identity(), null, false);
                   }
                   break;
-                  
+
                 case DHE_PSK:
                   {
                     ClientDHE_PSKParameters params = (ClientDHE_PSKParameters)
@@ -530,7 +530,7 @@ class ServerHandshake extends AbstractHandshake
                     tasks.add(keyExchangeTask);
                   }
                   break;
-                  
+
                 case RSA_PSK:
                   {
                     ClientRSA_PSKParameters params = (ClientRSA_PSKParameters)
@@ -554,7 +554,7 @@ class ServerHandshake extends AbstractHandshake
                     tasks.add(keyExchangeTask);
                   }
                   break;
-                  
+
                 case NONE:
                   {
                     Inflater inflater = null;
@@ -575,7 +575,7 @@ class ServerHandshake extends AbstractHandshake
                   break;
               }
             // XXX SRP
-            
+
             if (clientCert != null)
               state = READ_CERTIFICATE_VERIFY;
             else
@@ -595,7 +595,7 @@ class ServerHandshake extends AbstractHandshake
           {
             if (handshake.type() != CERTIFICATE_VERIFY)
               throw new SSLException("expecting certificate verify message");
-            
+
             CertificateVerify verify = (CertificateVerify) handshake.body();
             try
               {
@@ -617,7 +617,7 @@ class ServerHandshake extends AbstractHandshake
               state = READ_FINISHED;
           }
           break;
-          
+
         // Finished.
         //
         // This message is sent immediately following the change cipher
@@ -637,7 +637,7 @@ class ServerHandshake extends AbstractHandshake
                                                  Description.UNEXPECTED_MESSAGE));
 
             Finished clientFinished = (Finished) handshake.body();
-            
+
             MessageDigest md5copy = null;
             MessageDigest shacopy = null;
             try
@@ -659,7 +659,7 @@ class ServerHandshake extends AbstractHandshake
             if (Debug.DEBUG)
               logger.log(Component.SSL_HANDSHAKE, "server finished: {0}",
                          serverFinished);
-            
+
             if (engine.session().version == ProtocolVersion.SSL_3)
               {
                 if (!Arrays.equals(clientFinished.md5Hash(),
@@ -680,7 +680,7 @@ class ServerHandshake extends AbstractHandshake
                     throw new SSLException("session verify failed");
                   }
               }
-            
+
             if (continuedSession)
               state = DONE;
             else
@@ -711,7 +711,7 @@ class ServerHandshake extends AbstractHandshake
       logger.logv(Component.SSL_HANDSHAKE,
                   "handle output state: {0}; output fragment: {1}",
                   state, fragment);
-    
+
     // Drain the output buffer, if it needs it.
     if (outBuffer != null && outBuffer.hasRemaining())
       {
@@ -719,7 +719,7 @@ class ServerHandshake extends AbstractHandshake
         fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
         outBuffer.position(outBuffer.position() + l);
       }
-    
+
     if (!fragment.hasRemaining())
       {
         if (state.isWriteState() || outBuffer.hasRemaining())
@@ -727,7 +727,7 @@ class ServerHandshake extends AbstractHandshake
         else
           return HandshakeStatus.NEED_UNWRAP;
       }
-    
+
     // XXX what we need to do here is generate a "stream" of handshake
     // messages, and insert them into fragment amounts that we have available.
     // A handshake message can span multiple records, and we can put
@@ -808,7 +808,7 @@ output_loop:
               state = READ_CLIENT_HELLO;
             }
             break output_loop; // XXX temporary
-            
+
             // Server Hello.
             //
             // This message is sent immediately following the client hello.
@@ -834,7 +834,7 @@ output_loop:
                 }
               else // Don't send any extensions.
                 hello.setDisableExtensions(true);
-              
+
               if (Debug.DEBUG)
                 logger.log(Component.SSL_HANDSHAKE, "{0}", hello);
 
@@ -921,7 +921,7 @@ output_loop:
                   logger.logv(Component.SSL_HANDSHAKE, "my cert:\n{0}", localCert);
                   logger.logv(Component.SSL_HANDSHAKE, "{0}", cert);
                 }
-              
+
               int typeLen = ((CERTIFICATE.getValue() << 24)
                              | (cert.length() & 0xFFFFFF));
               fragment.putInt(typeLen);
@@ -961,7 +961,7 @@ output_loop:
             case WRITE_SERVER_KEY_EXCHANGE:
             {
               KeyExchangeAlgorithm kex = engine.session().suite.keyExchangeAlgorithm();
-              
+
               ByteBuffer paramBuffer = null;
               ByteBuffer sigBuffer = null;
               if (kex == DHE_DSS || kex == DHE_RSA || kex == DH_anon
@@ -978,7 +978,7 @@ output_loop:
                                     engine.session().random());
                   paramBuffer = genDH.paramsBuffer;
                   sigBuffer = genDH.sigBuffer;
-                  
+
                   if (kex == DHE_PSK)
                     {
                       String identityHint
@@ -1009,7 +1009,7 @@ output_loop:
                     }
                 }
               // XXX handle SRP
-              
+
               if (paramBuffer != null)
                 {
                   ServerKeyExchangeBuilder ske
@@ -1017,10 +1017,10 @@ output_loop:
                   ske.setParams(paramBuffer);
                   if (sigBuffer != null)
                     ske.setSignature(sigBuffer);
-                  
+
                   if (Debug.DEBUG)
                     logger.log(Component.SSL_HANDSHAKE, "{0}", ske);
-                  
+
                   outBuffer = ske.buffer();
                   int l = Math.min(fragment.remaining(), outBuffer.remaining());
                   fragment.putInt((SERVER_KEY_EXCHANGE.getValue() << 24)
@@ -1029,7 +1029,7 @@ output_loop:
                                (outBuffer.position() + l));
                   outBuffer.position(outBuffer.position() + l);
                 }
-              
+
               if (engine.getWantClientAuth() || engine.getNeedClientAuth())
                 state = WRITE_CERTIFICATE_REQUEST;
               else
@@ -1048,7 +1048,7 @@ output_loop:
             case WRITE_CERTIFICATE_REQUEST:
             {
               CertificateRequestBuilder req = new CertificateRequestBuilder();
-              
+
               List types
                 = new ArrayList(4);
               types.add(ClientCertificateType.RSA_SIGN);
@@ -1056,7 +1056,7 @@ output_loop:
               types.add(ClientCertificateType.DSS_SIGN);
               types.add(ClientCertificateType.DSS_FIXED_DH);
               req.setTypes(types);
-              
+
               X509Certificate[] anchors
                 = engine.contextImpl.trustManager.getAcceptedIssuers();
               List issuers
@@ -1064,18 +1064,18 @@ output_loop:
               for (X509Certificate cert : anchors)
                 issuers.add(cert.getIssuerX500Principal());
               req.setAuthorities(issuers);
-              
+
               if (Debug.DEBUG)
                 logger.log(Component.SSL_HANDSHAKE, "{0}", req);
-              
+
               fragment.putInt((CERTIFICATE_REQUEST.getValue() << 24)
                               | (req.length() & 0xFFFFFF));
-              
+
               outBuffer = req.buffer();
               int l = Math.min(outBuffer.remaining(), fragment.remaining());
               fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
               outBuffer.position(outBuffer.position() + l);
-              
+
               state = WRITE_SERVER_HELLO_DONE;
             }
             break;
@@ -1097,7 +1097,7 @@ output_loop:
               state = READ_CERTIFICATE;
             }
             break output_loop; // XXX temporary
-            
+
             // Finished.
             //
             // This is always sent by the server to verify the keys that the
@@ -1129,10 +1129,10 @@ output_loop:
               outBuffer
                 = generateFinished(md5copy, shacopy, false,
                                    engine.session());
-              
+
               fragment.putInt((FINISHED.getValue() << 24)
                               | outBuffer.remaining() & 0xFFFFFF);
-              
+
               int l = Math.min(outBuffer.remaining(), fragment.remaining());
               fragment.put((ByteBuffer) outBuffer.duplicate().limit(outBuffer.position() + l));
               outBuffer.position(outBuffer.position() + l);
@@ -1151,10 +1151,10 @@ output_loop:
       return HandshakeStatus.NEED_WRAP;
     if (state.isReadState())
       return HandshakeStatus.NEED_UNWRAP;
-    
+
     return HandshakeStatus.FINISHED;
   }
-  
+
   @Override HandshakeStatus status()
   {
     if (!tasks.isEmpty())
@@ -1163,7 +1163,7 @@ output_loop:
       return HandshakeStatus.NEED_UNWRAP;
     if (state.isWriteState())
       return HandshakeStatus.NEED_WRAP;
-    
+
     return HandshakeStatus.FINISHED;
   }
 
@@ -1185,7 +1185,7 @@ output_loop:
                                          Alert.Description.HANDSHAKE_FAILURE),
                                keyExchangeTask.thrown());
   }
-  
+
   @Override void handleV2Hello(ByteBuffer hello)
   {
     int len = hello.getShort(0) & 0x7FFF;
@@ -1211,7 +1211,7 @@ output_loop:
     Signature signature = new Signature(sigVal, engine.session().suite.signatureAlgorithm());
     return signature.buffer();
   }
-  
+
   private void verifyClient(byte[] sigValue) throws SSLException, SignatureException
   {
     MessageDigest md5copy = null;
@@ -1236,7 +1236,7 @@ output_loop:
         else
           toSign = shacopy.digest();
       }
-    
+
     try
       {
         java.security.Signature sig = java.security.Signature.getInstance(engine.session().suite.signatureAlgorithm().toString());
@@ -1253,7 +1253,7 @@ output_loop:
         throw new SSLException(nsae);
       }
   }
-  
+
   // Delegated tasks.
 
   class CertLoader extends DelegatedTask
@@ -1261,7 +1261,7 @@ output_loop:
     CertLoader()
     {
     }
-    
+
     public void implRun() throws SSLException
     {
       KeyExchangeAlgorithm kexalg = engine.session().suite.keyExchangeAlgorithm();
@@ -1279,7 +1279,7 @@ output_loop:
                              km.getPrivateKey(keyAlias));
     }
   }
-  
+
   /**
    * Delegated task for generating Diffie-Hellman parameters.
    */
@@ -1297,13 +1297,13 @@ output_loop:
       dhGen.initialize(dhparams, engine.session().random());
       dhPair = dhGen.generateKeyPair();
       DHPublicKey pub = (DHPublicKey) dhPair.getPublic();
-      
+
       // Generate the parameters message.
       ServerDHParams params = new ServerDHParams(pub.getParams().getP(),
                                                  pub.getParams().getG(),
                                                  pub.getY());
       paramsBuffer = params.buffer();
-      
+
       // Sign the parameters, if needed.
       if (engine.session().suite.signatureAlgorithm() != SignatureAlgorithm.ANONYMOUS)
         {
@@ -1316,7 +1316,7 @@ output_loop:
                     dhPair.getPublic(), dhPair.getPrivate());
     }
   }
-  
+
   class RSAKeyExchange extends DelegatedTask
   {
     private final byte[] encryptedPreMasterSecret;
@@ -1325,7 +1325,7 @@ output_loop:
     {
       this.encryptedPreMasterSecret = encryptedPreMasterSecret;
     }
-    
+
     public void implRun()
       throws BadPaddingException, IllegalBlockSizeException, InvalidKeyException,
              NoSuchAlgorithmException, NoSuchPaddingException, SSLException
@@ -1339,18 +1339,18 @@ output_loop:
       setupSecurityParameters(keys, false, engine, compression);
     }
   }
-  
+
   class RSA_PSKExchange extends DelegatedTask
   {
     private final byte[] encryptedPreMasterSecret;
     private final SecretKey psKey;
-    
+
     RSA_PSKExchange(byte[] encryptedPreMasterSecret, SecretKey psKey)
     {
       this.encryptedPreMasterSecret = encryptedPreMasterSecret;
       this.psKey = psKey;
     }
-    
+
     public @Override void implRun()
       throws BadPaddingException, IllegalBlockSizeException, InvalidKeyException,
              NoSuchAlgorithmException, NoSuchPaddingException, SSLException
@@ -1368,7 +1368,7 @@ output_loop:
       preMasterSecret[rsaSecret.length + 3] = (byte)  psSecret.length;
       System.arraycopy(psSecret, 0, preMasterSecret, rsaSecret.length+4,
                        psSecret.length);
-      
+
       generateMasterSecret(clientRandom, serverRandom, engine.session());
       byte[][] keys = generateKeys(clientRandom, serverRandom, engine.session());
       setupSecurityParameters(keys, false, engine, compression);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHello.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHello.java
index 2bbce37fb3d..944194b3e86 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHello.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHello.java
@@ -74,7 +74,7 @@ public class ServerHello implements Handshake.Body
 
   protected ByteBuffer buffer;
   protected boolean disableExtensions;
-  
+
   // Constructor.
   // -------------------------------------------------------------------------
 
@@ -170,7 +170,7 @@ public class ServerHello implements Handshake.Body
       return 0;
     return buffer.getShort(offset) & 0xFFFF;
   }
-  
+
   public ExtensionList extensions ()
   {
     int offset = SESSID_OFFSET2 + (buffer.get (SESSID_OFFSET) & 0xFF) + 3;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java
index 09ad1d9e8a9..47bce29ee63 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloBuilder.java
@@ -1,4 +1,4 @@
-/* ServerHelloBuilder.java -- 
+/* ServerHelloBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -57,11 +57,11 @@ public class ServerHelloBuilder extends ServerHello implements Builder
   {
     return ((ByteBuffer) buffer.duplicate().position(0).limit(length())).slice();
   }
-  
+
   // We don't reallocate the buffer in any of the following methods,
   // because we always allocate a large enough buffer for the base
   // object in the constructor.
-  
+
   public void setVersion (final ProtocolVersion version)
   {
     buffer.putShort (0, (short) version.rawValue ());
@@ -95,12 +95,12 @@ public class ServerHelloBuilder extends ServerHello implements Builder
   }
 
   // For extensions, we do reallocate the buffer.
-  
+
   public void setDisableExtensions(boolean disable)
   {
     disableExtensions = disable;
   }
-  
+
   public void setExtensionsLength (final int length)
   {
     if (length < 0 || length > 16384)
@@ -111,7 +111,7 @@ public class ServerHelloBuilder extends ServerHello implements Builder
     buffer.putShort (SESSID_OFFSET2 + (buffer.get (SESSID_OFFSET) & 0xFF) + 3,
                      (short) length);
   }
-  
+
   public void setExtensions(ByteBuffer extensions)
   {
     extensions = (ByteBuffer)
@@ -120,7 +120,7 @@ public class ServerHelloBuilder extends ServerHello implements Builder
                                               + (buffer.get(SESSID_OFFSET) & 0xFF)
                                               )).put(extensions);
   }
-  
+
   public void ensureCapacity(int newCapacity)
   {
     ByteBuffer newBuffer = ByteBuffer.allocate(newCapacity);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java
index e09772250a5..987b51c56c2 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerHelloDone.java
@@ -63,4 +63,4 @@ public class ServerHelloDone implements Handshake.Body
     return ((prefix != null ? prefix : "")
             + "struct { } ServerHelloDone;");
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java
index d4b6fa39736..658ae228a59 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerKeyExchangeBuilder.java
@@ -1,4 +1,4 @@
-/* ServerKeyExchangeBuilder.java -- 
+/* ServerKeyExchangeBuilder.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
@@ -42,7 +42,7 @@ import java.nio.ByteBuffer;
 
 /**
  * Builder for {@link ServerKeyExchange} objects.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class ServerKeyExchangeBuilder extends ServerKeyExchange
@@ -68,7 +68,7 @@ public class ServerKeyExchangeBuilder extends ServerKeyExchange
     ensureCapacity(params.remaining());
     buffer.duplicate().put(params);
   }
-  
+
   public void setSignature(ByteBuffer signature)
   {
     if (suite.keyExchangeAlgorithm() == KeyExchangeAlgorithm.NONE)
@@ -77,7 +77,7 @@ public class ServerKeyExchangeBuilder extends ServerKeyExchange
     ensureCapacity(paramsLen + signature.remaining());
     ((ByteBuffer) buffer.duplicate().position(paramsLen)).put(signature);
   }
-  
+
   public void ensureCapacity(int capacity)
   {
     if (buffer.capacity() >= capacity)
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/ServerNameList.java b/libjava/classpath/gnu/javax/net/ssl/provider/ServerNameList.java
index 5a268f542ab..38f092476cc 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/ServerNameList.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/ServerNameList.java
@@ -54,7 +54,7 @@ import java.util.NoSuchElementException;
 
 /**
  * The ServerName extension.
- * 
+ *
  * 
        struct {
    NameType name_type;
@@ -82,12 +82,12 @@ struct {
 public class ServerNameList extends Value implements Iterable
 {
   private ByteBuffer buffer;
-  
+
   public ServerNameList (final ByteBuffer buffer)
   {
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-  
+
   public ServerNameList(List names)
   {
     int length = 2;
@@ -104,12 +104,12 @@ public class ServerNameList extends Value implements Iterable 65535)
       throw new IllegalArgumentException("length must be between 0 and 65535");
     buffer.putShort(0, (short) newLength);
   }
-  
+
   public String toString()
   {
     return toString(null);
@@ -172,7 +172,7 @@ public class ServerNameList extends Value implements Iterable iterator()
   {
     return new Iterator();
@@ -181,17 +181,17 @@ public class ServerNameList extends Value implements Iterable
   {
     private int index;
-    
+
     public Iterator()
     {
       index = 0;
     }
-    
+
     public boolean hasNext()
     {
       return index < size();
     }
-    
+
     public ServerName next() throws NoSuchElementException
     {
       try
@@ -203,7 +203,7 @@ public class ServerNameList extends Value implements Iterable store;
   private int storeLimit;
-  
+
   public SimpleSessionContext()
   {
     super(DEFAULT_TIMEOUT);
     storeLimit = 0;
     store = new HashMap();
   }
-  
+
   @Override
   protected Session implGet(byte[] sessionId)
   {
@@ -116,12 +116,12 @@ public final class SimpleSessionContext
     return new Enumeration()
     {
       Iterator it = store.keySet().iterator();
-      
+
       public boolean hasMoreElements()
       {
         return it.hasNext();
       }
-      
+
       public Object nextElement()
       {
         return it.next().id();
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java b/libjava/classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java
index 0595f87a7a6..97fff98dce2 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/TruncatedHMAC.java
@@ -45,7 +45,7 @@ import java.nio.ByteBuffer;
 /**
  * The value type for the {@link Extension.Type#TRUNCATED_HMAC} extension.
  * This extension has an empty value; this class is thusly empty.
- * 
+ *
  * @author csm
  */
 public class TruncatedHMAC extends Value
@@ -55,12 +55,12 @@ public class TruncatedHMAC extends Value
   {
     return 0;
   }
-  
+
   public ByteBuffer buffer()
   {
     return ByteBuffer.wrap(new byte[0]);
   }
-  
+
   public String toString()
   {
     return toString(null);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java b/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
index 85e359675a7..72d07273951 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/TrustedAuthorities.java
@@ -51,7 +51,7 @@ import javax.security.auth.x500.X500Principal;
 
 /**
  * The trusted authorities hello extension.
- * 
+ *
  * 
       struct {
   TrustedAuthority trusted_authorities_list<0..2^16-1>;
@@ -73,7 +73,7 @@ enum {
 } IdentifierType;
 
 opaque DistinguishedName<1..2^16-1>;
      
- * 
+ *
  * @author csm
  */
 public class TrustedAuthorities extends Value
@@ -85,19 +85,19 @@ public class TrustedAuthorities extends Value
   {
     this.buffer = buffer.duplicate().order(ByteOrder.BIG_ENDIAN);
   }
-  
+
   // XXX really implement Builder.
-  
+
   public int length()
   {
     return 2 + (buffer.getShort(0) & 0xFFFF);
   }
-  
+
   public ByteBuffer buffer()
   {
     return (ByteBuffer) buffer.duplicate().limit(length());
   }
-  
+
   public int size()
   {
     int len = buffer.getShort(0) & 0xFFFF;
@@ -128,12 +128,12 @@ public class TrustedAuthorities extends Value
       }
     throw new IndexOutOfBoundsException();
   }
-  
+
   public String toString()
   {
     return toString(null);
   }
-  
+
   public String toString(String prefix)
   {
     StringWriter str = new StringWriter();
@@ -149,21 +149,21 @@ public class TrustedAuthorities extends Value
     out.print("} TrustedAuthorities;");
     return str.toString();
   }
-  
+
   public Iterator iterator()
   {
     return new AuthoritiesIterator();
   }
-  
+
   public class AuthoritiesIterator implements Iterator
   {
     private int index;
-    
+
     public AuthoritiesIterator()
     {
       index = 0;
     }
-    
+
     public TrustedAuthority next() throws NoSuchElementException
     {
       try
@@ -175,12 +175,12 @@ public class TrustedAuthorities extends Value
           throw new NoSuchElementException();
         }
     }
-    
+
     public boolean hasNext()
     {
       return index < size();
     }
-    
+
     public void remove()
     {
       throw new UnsupportedOperationException();
@@ -190,12 +190,12 @@ public class TrustedAuthorities extends Value
   public static class TrustedAuthority implements Constructed
   {
     private final ByteBuffer buffer;
-    
+
     public TrustedAuthority(final ByteBuffer buffer)
     {
       this.buffer = buffer;
     }
-    
+
     public int length()
     {
       switch (type().getValue())
@@ -207,7 +207,7 @@ public class TrustedAuthorities extends Value
       }
       throw new IllegalArgumentException("unknown authority type");
     }
-    
+
     public byte[] sha1Hash()
     {
       IdentifierType t = type();
@@ -218,7 +218,7 @@ public class TrustedAuthorities extends Value
       ((ByteBuffer) buffer.duplicate().position(1)).get(b);
       return b;
     }
-    
+
     public X500Principal name()
     {
       int len = buffer.getShort(1) & 0xFFFF;
@@ -226,7 +226,7 @@ public class TrustedAuthorities extends Value
       ((ByteBuffer) buffer.duplicate().position(3)).get(b);
       return new X500Principal(b);
     }
-    
+
     public IdentifierType type()
     {
       switch (buffer.get(0))
@@ -236,15 +236,15 @@ public class TrustedAuthorities extends Value
         case 2: return IdentifierType.X509_NAME;
         case 3: return IdentifierType.CERT_SHA1_HASH;
       }
-      
+
       throw new IllegalArgumentException("invalid IdentifierType");
     }
-    
+
     public String toString()
     {
       return toString(null);
     }
-    
+
     public String toString(String prefix)
     {
       StringWriter str = new StringWriter();
@@ -265,7 +265,7 @@ public class TrustedAuthorities extends Value
           out.print(Util.toHexString(sha1Hash(), ':'));
           out.println(";");
           break;
-          
+
         case 2:
           if (prefix != null) out.print(prefix);
           out.print("  name = ");
@@ -277,18 +277,18 @@ public class TrustedAuthorities extends Value
       return str.toString();
     }
   }
-  
+
   public static enum IdentifierType
   {
     PRE_AGREED (0), KEY_SHA1_HASH (1), X509_NAME (2), CERT_SHA1_HASH (3);
-    
+
     private final int value;
-    
+
     private IdentifierType(final int value)
     {
       this.value = value;
     }
-    
+
     public int getValue()
     {
       return value;
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java b/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
index f54dda5bc6d..94cd091c5ed 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/UnresolvedExtensionValue.java
@@ -45,32 +45,32 @@ import java.nio.ByteBuffer;
 public class UnresolvedExtensionValue extends Value
 {
   private final ByteBuffer buffer;
-  
+
   public UnresolvedExtensionValue (final ByteBuffer buffer)
   {
     this.buffer = buffer;
   }
-  
+
   public int length()
   {
     return buffer.limit();
   }
-  
+
   public ByteBuffer buffer()
   {
     return value();
   }
-  
+
   public ByteBuffer value()
   {
     return buffer.slice();
   }
-  
+
   public String toString()
   {
     return toString(null);
   }
-  
+
   public String toString(final String prefix)
   {
     String s = Util.hexDump(buffer);
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/Util.java b/libjava/classpath/gnu/javax/net/ssl/provider/Util.java
index 57f637c1849..a2004b7aa63 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/Util.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/Util.java
@@ -77,29 +77,29 @@ public final class Util
   {
     return wrapBuffer(buffer, "");
   }
-  
+
   public static Object wrapBuffer(ByteBuffer buffer, String prefix)
   {
     return new WrappedBuffer(buffer, prefix);
   }
-  
+
   private static class WrappedBuffer
   {
     private final ByteBuffer buffer;
     private final String prefix;
-    
+
     WrappedBuffer(ByteBuffer buffer, String prefix)
     {
       this.buffer = buffer;
       this.prefix = prefix;
     }
-    
+
     public String toString()
     {
       return hexDump(buffer, prefix);
     }
   }
-  
+
   /**
    * Convert a hexadecimal string into its byte representation.
    *
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java b/libjava/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java
index 1c88479cbbc..ffdcbbad2ec 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/X500PrincipalList.java
@@ -188,7 +188,7 @@ public final class X500PrincipalList implements Iterable
   {
     return new Iterator();
   }
-  
+
   public class Iterator implements ListIterator
   {
     private final int modCount;
@@ -269,4 +269,4 @@ public final class X500PrincipalList implements Iterable
       throw new UnsupportedOperationException ();
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java b/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
index c3b7e5f4b8f..a63cb2cbeb5 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/X509KeyManagerFactory.java
@@ -270,7 +270,7 @@ public class X509KeyManagerFactory extends KeyManagerFactorySpi
         }
       return null;
     }
-    
+
     public @Override String chooseEngineClientAlias(String[] keyTypes,
                                                     Principal[] issuers,
                                                     SSLEngine engine)
@@ -297,7 +297,7 @@ public class X509KeyManagerFactory extends KeyManagerFactorySpi
         return s[0];
       return null;
     }
-    
+
     public @Override String chooseEngineServerAlias(String keyType,
                                                     Principal[] issuers,
                                                     SSLEngine engine)
diff --git a/libjava/classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java b/libjava/classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
index 1a0591284a4..ddd2f9c8b52 100644
--- a/libjava/classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
+++ b/libjava/classpath/gnu/javax/net/ssl/provider/X509TrustManagerFactory.java
@@ -83,7 +83,7 @@ public class X509TrustManagerFactory extends TrustManagerFactorySpi
 
   private static final String sep
     = AccessController.doPrivileged(new GetPropertyAction("file.separator"));
-  
+
   /**
    * The location of the JSSE key store.
    */
@@ -253,7 +253,7 @@ public class X509TrustManagerFactory extends TrustManagerFactorySpi
       throws CertificateException
     {
       CertPathValidator validator = null;
-      
+
       try
         {
           validator = CertPathValidator.getInstance("PKIX");
@@ -262,9 +262,9 @@ public class X509TrustManagerFactory extends TrustManagerFactorySpi
         {
           throw new CertificateException(nsae);
         }
-      
+
       CertPath path = new X509CertPath(Arrays.asList(chain));
-      
+
       PKIXParameters params = null;
       try
         {
@@ -277,7 +277,7 @@ public class X509TrustManagerFactory extends TrustManagerFactorySpi
         {
           throw new CertificateException(iape);
         }
-      
+
       try
         {
           validator.validate(path, params);
diff --git a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java
index a0de6592fea..ae1f2c409b2 100644
--- a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java
+++ b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java
@@ -434,8 +434,8 @@ public class IppRequest
       PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class);
       JobUri jobUri = (JobUri) attributes.get(JobUri.class);
       JobId jobId = (JobId) attributes.get(JobId.class);
-      RequestedAttributes reqAttrs 
-	= (RequestedAttributes)attributes.get(RequestedAttributes.class);
+      RequestedAttributes reqAttrs
+        = (RequestedAttributes)attributes.get(RequestedAttributes.class);
       if (printerUri != null && jobId == null && jobUri == null)
         {
           write(printerUri);
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/CorbaInput.java b/libjava/classpath/gnu/javax/rmi/CORBA/CorbaInput.java
index e80cabf6b2b..5880c85c567 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/CorbaInput.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/CorbaInput.java
@@ -51,7 +51,7 @@ import java.io.Serializable;
 /**
  * Converts calls on java ObjectOutputStream to calls on CORBA OutputStream. A
  * class to substitute for objects using readObject method.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class CorbaInput
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/CorbaOutput.java b/libjava/classpath/gnu/javax/rmi/CORBA/CorbaOutput.java
index 1c723407980..1d148051148 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/CorbaOutput.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/CorbaOutput.java
@@ -48,7 +48,7 @@ import java.io.Serializable;
 /**
  * A class to substitute as an ObjectOutputStream for objects using writeObject
  * method.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class CorbaOutput
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java b/libjava/classpath/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java
index 5bdf7dac933..b925428b085 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/DefaultWriteObjectTester.java
@@ -43,7 +43,7 @@ import gnu.CORBA.CDR.BufferedCdrOutput;
 import java.io.IOException;
 
 /**
- * Tests if the defaultWriteObject method has been called. 
+ * Tests if the defaultWriteObject method has been called.
  * This information is required by RMI-IIOP header.
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
@@ -55,7 +55,7 @@ public class DefaultWriteObjectTester
    * The flag, indicating, that the defaultWriteObject method was called.
    */
   public boolean dwo_called;
-  
+
   /**
    * Create an instance, delegating calls to the given CORBA stream.
    */
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/DelegateFactory.java b/libjava/classpath/gnu/javax/rmi/CORBA/DelegateFactory.java
index 0607c9f9626..a12afd51e7a 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/DelegateFactory.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/DelegateFactory.java
@@ -1,4 +1,4 @@
-/* DelegateFactory.java -- 
+/* DelegateFactory.java --
    Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,7 +44,7 @@ import gnu.CORBA.ObjectCreator;
 /**
  * This class produces delegates, using the system properties. If not
  * corresponding property is specified, returns default implementations.
- * 
+ *
  * @author Wu Gansha (gansha.wu@intel.com)
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
@@ -73,11 +73,11 @@ public class DelegateFactory
   /**
    * Get an instance of the given delegate. As in all cases the singleton
    * instance is used, the caching here would be redundant.
-   * 
+   *
    * @param type a delegate type.
-   * 
+   *
    * @return the associated delegate.
-   * 
+   *
    * @throws InternalError if the delegate class, indicated in the system
    * properties, cannot be instantiated.
    */
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java b/libjava/classpath/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java
index 7d98bb57bf5..f8aca0d4789 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/GetDelegateInstanceException.java
@@ -1,4 +1,4 @@
-/* GetDelegateInstanceException.java -- 
+/* GetDelegateInstanceException.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,12 +42,12 @@ public class GetDelegateInstanceException
   extends Exception
 {
   private Throwable next;
-  
+
   public GetDelegateInstanceException(String msg)
   {
     super(msg);
   }
-  
+
   public GetDelegateInstanceException(String msg, Throwable next)
   {
     super(msg, next);
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java b/libjava/classpath/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
index ea4f73811f0..f430ac123d3 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/PortableRemoteObjectDelegateImpl.java
@@ -1,4 +1,4 @@
-/* PortableRemoteObjectDelegateImpl.java -- 
+/* PortableRemoteObjectDelegateImpl.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,7 +65,7 @@ import org.omg.PortableServer.POAManagerPackage.State;
 
 /**
  * Implements PortableRemoteObjectDelegate.
- * 
+ *
  * @author Wu Gansha (gansha.wu@intel.com) (stub)
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) (implementation)
  */
@@ -78,15 +78,15 @@ public class PortableRemoteObjectDelegateImpl
    * communication using the same communications runtime as for the passed
    * a_source parameter. The a_target is connected to the same
    * ORB (and, if applicable, to the same POA) as the a_source.
-   * 
+   *
    * @param a_target the target to connect to ORB, must be an instance of either
    * {@link ObjectImpl} (Stubs and old-style ties) or {@link Servant} (POA-bases
    * ties).
-   * 
+   *
    * @param a_source the object, providing the connection information, must be
    * an instance of either {@link ObjectImpl} (Stubs and old-style ties) or
    * {@link Servant} (POA-bases ties).
-   * 
+   *
    * @throws RemoteException if the target is already connected to another ORB.
    */
   public void connect(Remote a_target, Remote a_source)
@@ -196,13 +196,13 @@ public class PortableRemoteObjectDelegateImpl
   /**
    * Narrow the given object to the instance of the given class. The currently
    * supported narrowing types are:
-   * 
+   *
    * 1. Simple widening conversion.
      
    * 2. ObjectImpl -> RMI interface.
      
    * 3. ObjectImpl -> ObjectImpl.
      
    * 4. Tie -> Remote (implementation)
      
    * 5. Remote (implementation) -> Tie.
      
-   * 
+   *
    * The narrowing has sense only for derived classes.
    */
   public Object narrow(Object narrowFrom, Class narrowTo)
@@ -278,7 +278,7 @@ public class PortableRemoteObjectDelegateImpl
 
     return narrowed;
   }
-  
+
   /**
    * Get the Stub class name for the name, representing the given interface.
    */
@@ -295,7 +295,7 @@ public class PortableRemoteObjectDelegateImpl
         + interf.substring(p + 1) + "_Stub";
     return stubClassName;
   }
-  
+
   /**
    * Get stub for the given implementation, searching by class name pattern. The
    * found stub must implement Remote for this method to succeed.
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/RmiUtilities.java b/libjava/classpath/gnu/javax/rmi/CORBA/RmiUtilities.java
index 5fa78b1e915..ac6b9070570 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/RmiUtilities.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/RmiUtilities.java
@@ -1,6 +1,6 @@
 /* RmiUtilities.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
-   
+
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -87,7 +87,7 @@ import javax.rmi.CORBA.Util;
 
 /**
  * Defines methods that must be accessible in several derived classes.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class RmiUtilities
@@ -538,7 +538,7 @@ public class RmiUtilities
    * Write data to the CORBA output stream. Writes the object contents only; the
    * header must be already written. For object, containing objects, may be
    * called recursively.
-   * 
+   *
    * @param an_output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param object an object to write.
@@ -567,7 +567,7 @@ public class RmiUtilities
    * Write data to the CORBA output stream. Writes the object contents only; the
    * header must be already written. For object, containing objects, may be
    * called recursively.
-   * 
+   *
    * @param an_output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param object an object to write.
@@ -679,7 +679,7 @@ public class RmiUtilities
    * Read data from the CDR input stream. Reads the object contents only; the
    * header must be already read (the repository id or ids ara passed). For
    * object, containing objects, may be called recursively.
-   * 
+   *
    * @param an_input the stream to read from, must be
    * org.omg.CORBA_2_3.portable.InputStream
    * @param object the instance of the object being read.
@@ -689,7 +689,7 @@ public class RmiUtilities
    * were specified.
    * @param codebase the codebase, if it was included in the header of the value
    * type. Null if not codebase was included.
-   * 
+   *
    * @return the object, extracted from the stream.
    */
   /**
@@ -760,7 +760,7 @@ public class RmiUtilities
 
     if (object == null)
       object = instantiate(offset, clz, g);
-    
+
     // The sentence below prevents attempt to read the internal fields of the
     // ObjectImpl (or RMI Stub) that might follow the object definition.
     // Sun's jre 1.5 does not write this information. The stubs, generated
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/StubDelegateImpl.java b/libjava/classpath/gnu/javax/rmi/CORBA/StubDelegateImpl.java
index afc254ddb49..05c73a70976 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/StubDelegateImpl.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/StubDelegateImpl.java
@@ -66,7 +66,7 @@ import org.omg.PortableServer.POAManagerPackage.State;
 
 /**
  * The default stub delegate.
- * 
+ *
  * @author Wu Gansha (gansha.wu@intel.com) (stub)
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) (implementation)
  */
@@ -90,13 +90,13 @@ public class StubDelegateImpl
    * obtained CORBA object can be narrowed into stub using
    * {@link PortableRemoteObject#narrow}.
    * 
      
-   * 
+   *
    * @param orb the ORB where the Stub must be connected.
-   * 
+   *
    * @throws RemoteException if the stub is already connected to some other ORB.
    * If the stub is already connected to the ORB that was passed as parameter,
    * the method returns without action.
-   * 
+   *
    * @throws BAD_PARAM if the name of this stub does not match the stub name
    * pattern, "_*_Stub" or if the Tie class, "_*Impl_Tie", does not exists or an
    * instance of this class cannot be instantiated.
@@ -237,7 +237,7 @@ public class StubDelegateImpl
 
   /**
    * Returns the IOR reference of the connected ORB.
-   * 
+   *
    * @see ORB#object_to_string(org.omg.CORBA.Object);
    */
   public String toString(Stub self)
@@ -254,7 +254,7 @@ public class StubDelegateImpl
 
   /**
    * This should never be called. The ORB must be supplied.
-   * 
+   *
    * @see #connect
    */
   public void readObject(Stub self, ObjectInputStream input)
@@ -307,4 +307,4 @@ public class StubDelegateImpl
 
     output.writeObject(out.buffer.toByteArray());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/TieTargetRecord.java b/libjava/classpath/gnu/javax/rmi/CORBA/TieTargetRecord.java
index 70e751a6f2c..f39441e38ef 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/TieTargetRecord.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/TieTargetRecord.java
@@ -44,7 +44,7 @@ import javax.rmi.CORBA.Tie;
 
 /**
  * Represents a Tie, connected to possibly multiple invocation targets.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class TieTargetRecord
diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/UtilDelegateImpl.java b/libjava/classpath/gnu/javax/rmi/CORBA/UtilDelegateImpl.java
index b9dc7a3d2a5..dd4e347f231 100644
--- a/libjava/classpath/gnu/javax/rmi/CORBA/UtilDelegateImpl.java
+++ b/libjava/classpath/gnu/javax/rmi/CORBA/UtilDelegateImpl.java
@@ -95,7 +95,7 @@ import javax.transaction.TransactionRolledbackException;
 
 /**
  * The implementation of UtilDelegate.
- * 
+ *
  * @author Wu Gansha (gansha.wu@intel.com) (stub)
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) (implementation)
  */
@@ -191,7 +191,7 @@ public class UtilDelegateImpl
    * pair has not been previously registered using {@link #registerTarget},
    * this method tries to locate a tie class by the name pattern. If this
    * succeeds, the tie-target pair is also registered.
-   * 
+   *
    * @return the Tie.
    */
   public Tie getTie(Remote target)
@@ -331,7 +331,7 @@ public class UtilDelegateImpl
 
   /**
    * Checks if the given stub is local.
-   * 
+   *
    * @param stub a stub to check.
    * @return true if the stub is local, false otherwise.
    */
@@ -354,7 +354,7 @@ public class UtilDelegateImpl
    * Load the class. The method uses class loaders from the call stact first. If
    * this fails, the further behaviour depends on the System Property
    * "java.rmi.server.useCodebaseOnly" with default value "false".
-   * 
+   *
    * 
        
    * 
      • Try the current thread context class loader first.
        • 
    * 
      • If remoteCodebase is non-null and useCodebaseOnly is "false" then call
@@ -364,12 +364,12 @@ public class UtilDelegateImpl
    * 
      • If a class is still not successfully loaded and the loader != null
    * then try Class.forName(className, false, loader). 
        • 
    * 
      
-   * 
+   *
    * @param className the name of the class.
    * @param remoteCodebase the codebase.
    * @param loader the class loader.
    * @return the loaded class.
-   * 
+   *
    * @throws ClassNotFoundException of the class cannot be loaded.
    */
   public Class loadClass(String className, String remoteCodebase,
@@ -574,14 +574,14 @@ public class UtilDelegateImpl
    *

    * *
    Node type
    - * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, + * ELEMENT_NODE, ATTRIBUTE_NODE, ENTITY_NODE, ENTITY_REFERENCE_NODE, * DOCUMENT_FRAGMENT_NODEconcatenation of the textContent - * attribute value of every child node, excluding COMMENT_NODE and - * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the + * concatenation of the textContent + * attribute value of every child node, excluding COMMENT_NODE and + * PROCESSING_INSTRUCTION_NODE nodes. This is the empty string if the * node has no children.
    TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, + * TEXT_NODE, CDATA_SECTION_NODE, COMMENT_NODE, * PROCESSING_INSTRUCTION_NODEnodeValue
    DOCUMENT_NODE, + * DOCUMENT_NODE, * DOCUMENT_TYPE_NODE, NOTATION_NODEnull
    {@link UnexpectedException}
    - * + * * @param ex an exception that was thrown on a server side implementation. - * + * * @return the corresponding RemoteException unless it is a RuntimeException. - * + * * @throws RuntimeException the passed exception if it is an instance of * RuntimeException. - * + * * @specnote It is the same behavior, as in Suns implementations 1.4.0-1.5.0. */ public RemoteException wrapException(Throwable ex) @@ -607,10 +607,10 @@ public class UtilDelegateImpl * {@link #writeRemoteObject}. The written data contains discriminator, * defining, that was written. Another method that writes the same content is * {@link org.omg.CORBA_2_3.portable.OutputStream#write_abstract_interface(java.lang.Object)}. - * + * * @param output a stream to write to, must be * {@link org.omg.CORBA_2_3.portable.OutputStream}. - * + * * @param object an object to write, must be CORBA object, Remote */ public void writeAbstractObject(OutputStream output, Object object) @@ -627,7 +627,7 @@ public class UtilDelegateImpl * method writes CORBA object, value type or value box. For value types Null * is written with the abstract interface, its typecode having repository id * "IDL:omg.org/CORBA/AbstractBase:1.0" and the empty string name. - * + * * @param output the object to write. * @param object the java object that must be written in the form of the CORBA * {@link Any}. @@ -715,7 +715,7 @@ public class UtilDelegateImpl * possible. This method is used in write_value(..) method group in * {@link org.omg.CORBA_2_3.portable.OutputStream} and also may be called * directly from generated Stubs and Ties. - * + * * @param output a stream to write to, must be * org.omg.CORBA_2_3.portable.OutputStream * @param object an object to write. @@ -741,4 +741,4 @@ public class UtilDelegateImpl writeFields(an_output, (Serializable) object); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java b/libjava/classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java index dc3b3cd6ee8..33fff16e56b 100644 --- a/libjava/classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java +++ b/libjava/classpath/gnu/javax/rmi/CORBA/ValueHandlerDelegateImpl.java @@ -56,17 +56,17 @@ import javax.rmi.CORBA.ValueHandlerMultiFormat; /** * Implementation of the ValueHandler. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) (implementation) */ public class ValueHandlerDelegateImpl extends RmiUtilities implements ValueHandler, ValueHandlerMultiFormat { - /** + /** * Return the maximal supported stream format version. We currently * support the version 1. - * + * * TODO Support the version 2. */ public byte getMaximumStreamFormatVersion() @@ -81,14 +81,14 @@ public class ValueHandlerDelegateImpl { if (version!=1) throw new BAD_PARAM("Unsupported stream format version "+version); - else + else writeValue(output, value); } /** * This implementation associates RunTime with stream rather than with the * value handler and this method is not used in the implementation. It is - * implemented just for the sake of compatibility. + * implemented just for the sake of compatibility. */ public RunTime getRunTimeCodeBase() { @@ -160,4 +160,4 @@ public class ValueHandlerDelegateImpl ObjectStreamClass osc = ObjectStreamClass.lookup(cx); return osc.getSerialVersionUID(); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java b/libjava/classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java index d75ce4104fa..f241157eec7 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/AWTCallbackHandler.java @@ -1,4 +1,4 @@ -/* AWTCallbackHandler.java -- +/* AWTCallbackHandler.java -- Copyright (C) 2004, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java b/libjava/classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java index 5144f58ea4c..31a7f5acab6 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/AbstractCallbackHandler.java @@ -1,4 +1,4 @@ -/* AbstractCallbackHandler.java -- +/* AbstractCallbackHandler.java -- Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -86,7 +86,7 @@ public abstract class AbstractCallbackHandler implements CallbackHandler /** * Create an instance of CallbackHandler of the designated * type from the first Security Provider which offers it. - * + * * @param type the type of callback handler to create. * @return a newly created instance of ClassbackHandler. * @throws NoSuchAlgorithmException if no security provider is found to offer @@ -115,7 +115,7 @@ public abstract class AbstractCallbackHandler implements CallbackHandler /** * Create an instance of CallbackHandler of the designated * type from the named security provider. - * + * * @param type the type of callback handler to create. * @param provider a named security provider to use. * @return a newly created instance of ClassbackHandler. @@ -140,7 +140,7 @@ public abstract class AbstractCallbackHandler implements CallbackHandler /** * Create an instance of CallbackHandler of the designated * type from the designated security provider. - * + * * @param type the type of callback handler to create. * @param provider a security provider to use. * @return a newly created instance of ClassbackHandler. diff --git a/libjava/classpath/gnu/javax/security/auth/callback/CertificateCallback.java b/libjava/classpath/gnu/javax/security/auth/callback/CertificateCallback.java index fcec1196235..74885ed2188 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/CertificateCallback.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/CertificateCallback.java @@ -1,4 +1,4 @@ -/* CertificateCallback.java -- +/* CertificateCallback.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -55,7 +55,7 @@ public class CertificateCallback extends ConfirmationCallback { static final long serialVersionUID = 8343869651419225634L; public final Certificate certificate; - + public CertificateCallback(Certificate cert, String prompt) { super(prompt, ERROR, YES_NO_OPTION, NO); diff --git a/libjava/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java b/libjava/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java index d4bd9ed267a..4c24ab80889 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/ConsoleCallbackHandler.java @@ -1,4 +1,4 @@ -/* ConsoleCallbackHandler.java -- +/* ConsoleCallbackHandler.java -- Copyright (C) 2005, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java b/libjava/classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java index fc48782fe47..df0360b2e00 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/DefaultCallbackHandler.java @@ -1,4 +1,4 @@ -/* DefaultCallbackHandler.java -- +/* DefaultCallbackHandler.java -- Copyright (C) 2004, 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. diff --git a/libjava/classpath/gnu/javax/security/auth/callback/SwingCallbackHandler.java b/libjava/classpath/gnu/javax/security/auth/callback/SwingCallbackHandler.java index 8e3e46eff73..c9d5b3eb597 100644 --- a/libjava/classpath/gnu/javax/security/auth/callback/SwingCallbackHandler.java +++ b/libjava/classpath/gnu/javax/security/auth/callback/SwingCallbackHandler.java @@ -1,4 +1,4 @@ - /* SwingCallbackHandler.java -- + /* SwingCallbackHandler.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -455,7 +455,7 @@ public class SwingCallbackHandler extends AbstractCallbackHandler GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets (10, 10, 15, 5), 0, 0)); - + final JTextArea text = new JTextArea (24, 80); text.setEditable (true); String _text; @@ -584,4 +584,4 @@ public class SwingCallbackHandler extends AbstractCallbackHandler } dialog.dispose (); } -} \ No newline at end of file +} diff --git a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java index 40adb783ee1..5c4c4261f5f 100644 --- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java +++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileParser.java @@ -81,7 +81,7 @@ import javax.security.auth.login.AppConfigurationEntry; * *

    In the above context, a JAVA_IDENTIFIER is a sequence of tokens, * separated by the character '.'. Each of these tokens obeys the following:

    - * + * *
      *
    1. its first character yields true when used as an input to * the {@link java.lang.Character#isJavaIdentifierStart(char)}, and
      2. @@ -183,7 +183,7 @@ public final class ConfigFileParser /** * @return true if a LOGIN_MODULE_ENTRY was correctly parsed. - * Returns false otherwise. + * Returns false otherwise. * @throws IOException if an exception occurs while parsing the input. */ private boolean parseACE(List listOfACEs) throws IOException @@ -278,7 +278,7 @@ public final class ConfigFileParser // we dont check the rest of the characters for isJavaIdentifierPart() // because that's what the tokenizer does. } - + return cn; } diff --git a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java index 0235c6971c3..fc35bf77213 100644 --- a/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java +++ b/libjava/classpath/gnu/javax/security/auth/login/ConfigFileTokenizer.java @@ -52,7 +52,7 @@ import java.util.logging.Logger; * the deault syntax. This class emulates, to a certain extent, the behavior of * a {@link java.io.StreamTokenizer} instance st, when set as * follows: - * + * * 
        *  st.resetSyntax();
  *  st.lowerCaseMode(false);
@@ -77,7 +77,7 @@ import java.util.logging.Logger;
  * 
      The most important (negative) difference with a
  * {@link java.io.StreamTokenizer} is that this tokenizer does not properly
  * handle C++ and Java // style comments in the middle of the line. It only
- * ignores them if/when found at the start of the line.
        
+ * ignores them if/when found at the start of the line.
      
  */
 public class ConfigFileTokenizer
 {
diff --git a/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java b/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
index 8cd61c9544c..20d8f3afd0d 100644
--- a/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
+++ b/libjava/classpath/gnu/javax/security/auth/login/GnuConfiguration.java
@@ -61,7 +61,7 @@ import javax.security.auth.login.Configuration;
  * Login Configuration files written in the default syntax described in
  * the publicly available documentation of that class. A more formal definition
  * of this syntax is as follows:
- * 
+ *
  * 
        *   CONFIG              ::= APP_OR_OTHER_ENTRY+
  *   APP_OR_OTHER_ENTRY  ::= APP_NAME_OR_OTHER JAAS_CONFIG_BLOCK
@@ -80,12 +80,12 @@ import javax.security.auth.login.Configuration;
  *   PARAM_NAME   ::= STRING
  *   PARAM_VALUE  ::= '"' STRING '"' | ''' STRING ''' | STRING
  * 
      
- * 
+ *
  * 
      This implementation will specifically attempt to process one or more
  * Login Configuration files in the following locations, and when found parse
  * them and merge their contents. The locations, and the order in which they are
  * investigated, follows:
      
- * 
+ *
  * 
        
  *   
      1. If the following Security properties:
  *   java.security.auth.login.config.url.N, where N
@@ -99,7 +99,7 @@ import javax.security.auth.login.Configuration;
  *       
      2. The GNU Classpath security file, named classpath.security,
  *       where all Security properties are encoded, is usually located in
  *       /usr/local/classpath/lib/security folder.
        3. 
- *       
+ *
  *       
      3. The numbers used in the properties
  *       java.security.auth.login.config.url.N MUST be sequential,
  *       with no breaks in-between.
        4. 
@@ -120,7 +120,7 @@ import javax.security.auth.login.Configuration;
  *   (in that order) is found in the location referenced by the value of the
  *   System property user.home, then that file is parsed as a JAAS Login
  *   Configuration written in the default syntax.
- *   
+ *
  *   
      4. If none of the above resulted in a correctly parsed JAAS Login
  *   Configuration file, then this implementation will install a Null
  *   Configuration which basically does not recognize any Application.
        5. 
@@ -182,11 +182,11 @@ public final class GnuConfiguration extends Configuration
 
   /**
    * Refreshes and reloads this Configuration.
-   * 
+   *
    * 
        This method causes this Configuration object to refresh /
    * reload its contents following the locations and logic described above in
    * the class documentation section.
        
-   * 
+   *
    * @throws SecurityException if the caller does not have an
    * {@link AuthPermission} for the action named
    * refreshLoginConfiguration.
@@ -237,7 +237,7 @@ public final class GnuConfiguration extends Configuration
    * Attempts to locate and parse one or more JAAS Login Configuration files
    * defined as the values of the Security properties
    * java.security.auth.login.config.url.N.
-   * 
+   *
    * @return true if it succeeds, and false
    *         otherwsie.
    */
@@ -279,7 +279,7 @@ public final class GnuConfiguration extends Configuration
    * {@link MalformedURLException} occurs, this method then tries to open that
    * string as a {@link File} (with the same name). If it succeeds, an
    * {@link InputStream} is constructed and returned.
-   * 
+   *
    * @param s
    *          the designated name of either a {@link URL} or a {@link File}
    *          assumed to contain a JAAS Login Configuration in the default
@@ -308,7 +308,7 @@ public final class GnuConfiguration extends Configuration
   /**
    * Attempts to locate and parse a JAAS Login Configuration file defined as the
    * value of the System property java.security.auth.login.config.
-   * 
+   *
    * @return true if it succeeds, and false
    *         otherwsie.
    */
@@ -343,7 +343,7 @@ public final class GnuConfiguration extends Configuration
    * as .java.login.config or java.login.config (without the
    * leading dot) in the folder referenced by the System property
    * user.home.
-   * 
+   *
    * @return true if it succeeds, and false
    *         otherwsie.
    */
diff --git a/libjava/classpath/gnu/javax/sound/AudioSecurityManager.java b/libjava/classpath/gnu/javax/sound/AudioSecurityManager.java
index a6dce60b394..1daea2db538 100644
--- a/libjava/classpath/gnu/javax/sound/AudioSecurityManager.java
+++ b/libjava/classpath/gnu/javax/sound/AudioSecurityManager.java
@@ -1,5 +1,5 @@
 /* AudioSecurityManager.java -- Manages Security requests for Sound classes.
- 
+
  Copyright (C) 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,10 +42,10 @@ import javax.sound.sampled.AudioPermission;
 
 /**
  * This class handles security requests for classes in the Sound API.
- * 
+ *
  * A class that needs to check against a particular permission type may use this
  * class to query the SecurityManager.
- * 
+ *
  * For example, to check for a read permission, a class can simply pass the
  * Permission.READ constant to
  * {@link #checkPermissions(gnu.javax.sound.AudioSecurityManager.Permission))},
@@ -54,11 +54,11 @@ import javax.sound.sampled.AudioPermission;
  * 
          * AudioSecurityManager.checkPermissions(Permission.PLAY);
  * 
        
- * 
+ *
  * If there is need to query for all the defined permissions type, the constant
  * Permission.ALL can be used. In alternative, the
- * {@link #checkPermissions()} is presented as a shorthand. 
- * 
+ * {@link #checkPermissions()} is presented as a shorthand.
+ *
  * @author Mario Torre 
  */
 public class AudioSecurityManager
@@ -70,19 +70,19 @@ public class AudioSecurityManager
   {
     PLAY, RECORD, ALL
   }
-  
+
   /**
-   * Shorthand to checkPermissions(Permission.ALL). 
+   * Shorthand to checkPermissions(Permission.ALL).
    */
   public static final void checkPermissions()
   {
     checkPermissions(Permission.ALL);
   }
-  
+
   /**
-   * Query the SecurityManager agains the given 
+   * Query the SecurityManager agains the given
    * Permission.
-   * 
+   *
    * @param permission
    */
   public static final void checkPermissions(Permission permission)
@@ -96,16 +96,16 @@ public class AudioSecurityManager
           case PLAY:
             perm = "play";
             break;
-            
+
           case RECORD:
             perm = "record";
             break;
-            
+
           case ALL: default:
             perm = "*";
             break;
           }
-        
+
         sm.checkPermission(new AudioPermission(perm));
       }
   }
diff --git a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java
index fb9e684d096..d37a8fd6b58 100644
--- a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java
+++ b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaInputPortDevice.java
@@ -45,18 +45,18 @@ import gnu.javax.sound.midi.alsa.AlsaMidiDeviceProvider.AlsaPortInfo;
 
 /**
  * ALSA MIDI In Port.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
 public class AlsaInputPortDevice extends AlsaPortDevice
-{   
+{
 
   AlsaInputPortDevice (AlsaPortInfo info)
   {
     super(info);
   }
-    
+
   /* (non-Javadoc)
    * @see javax.sound.midi.MidiDevice#open()
    */
diff --git a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java
index 4951be6059c..33181b6d54c 100644
--- a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java
+++ b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiDeviceProvider.java
@@ -46,7 +46,7 @@ import javax.sound.midi.spi.MidiDeviceProvider;
 
 /**
  * Provide ALSA MIDI devices.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
@@ -54,7 +54,7 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
 {
   /**
    * Abstract base for ALSA specific MIDI device info.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -62,7 +62,7 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
   {
     /**
      * Create an ALSA specific MIDI device info object.
-     * 
+     *
      * @param name the device name
      * @param description the device description
      */
@@ -70,13 +70,13 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
     {
       super(name, "Alsa", description, "0.0");
     }
-    
+
     abstract MidiDevice getDevice ();
-  } 
+  }
 
   /**
    * ALSA MIDI Port.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -84,10 +84,10 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
   {
     long client;
     long port;
-    
+
     /**
      * Create ALSA MIDI In Port.
-     * 
+     *
      * @param name the device name
      * @param description the device description
      * @param client the client ID
@@ -99,11 +99,11 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
       this.client = client;
       this.port = port;
     }
-  } 
-  
+  }
+
   /**
    * ALSA Sequencer specific info.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -113,16 +113,16 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
     {
       super(name, description);
     }
-    
+
     MidiDevice getDevice()
     {
       return AlsaMidiSequencerDevice.getInstance();
     }
   }
-  
+
   /**
    * ALSA MIDI In Port.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -132,7 +132,7 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
     {
       super(name, description, client, port);
     }
-    
+
     MidiDevice getDevice()
     {
       return new AlsaInputPortDevice(this);
@@ -141,7 +141,7 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
 
   /**
    * ALSA MIDI Out Port.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -151,46 +151,46 @@ public class AlsaMidiDeviceProvider extends MidiDeviceProvider
     {
       super(name, description, client, port);
     }
-    
+
     MidiDevice getDevice()
     {
       return new AlsaOutputPortDevice(this);
     }
   }
-  
+
   private static AlsaInfo[] infos;
-  
+
   private static native AlsaInfo[] getInputDeviceInfo_();
   private static native AlsaInfo[] getOutputDeviceInfo_();
-  
+
   /**
    * Initialize the ALSA system
    */
   private static native void init_();
-  
+
   static
-  {    
+  {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
         System.loadLibrary("gjsmalsa");
-      }  
-       
+      }
+
     init_();
-    
+
     AlsaInfo inputs[] = getInputDeviceInfo_();
     AlsaInfo outputs[] = getOutputDeviceInfo_();
-    
+
     infos = new AlsaInfo[inputs.length + outputs.length + 1];
     infos[0] = new AlsaSequencerInfo ("/dev/snd/seq", "ALSA Sequencer");
     System.arraycopy(inputs, 0, infos, 1, inputs.length);
     System.arraycopy(outputs, 0, infos, 1 + inputs.length, outputs.length);
   }
-  
+
   public AlsaMidiDeviceProvider()
   {
     // Nothing.
   }
-  
+
   /* (non-Javadoc)
    * @see javax.sound.midi.spi.MidiDeviceProvider#getDeviceInfo()
    */
diff --git a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java
index 3810dff4736..3603bb5a7d1 100644
--- a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java
+++ b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java
@@ -53,7 +53,7 @@ import javax.sound.midi.Transmitter;
 
 /**
  * The ALSA MIDI sequencer device.  This is a singleton device.
- * 
+ *
  * @author green@redhat.com
  *
  */
@@ -61,16 +61,16 @@ public class AlsaMidiSequencerDevice implements Sequencer
 {
   // The singleton instance.
   public final static AlsaMidiSequencerDevice instance = new AlsaMidiSequencerDevice();
-  
+
   // A pointer to a native chunk of memory
   private long nativeState;
-  
+
   // The sequence to process
   private Sequence sequence;
-  
+
   /**
    * A private constructor.  There should only be one instance of this
-   * device. 
+   * device.
    */
   private AlsaMidiSequencerDevice()
   {
@@ -79,14 +79,14 @@ public class AlsaMidiSequencerDevice implements Sequencer
 
   /**
    * Return the sequencer singleton.
-   * 
+   *
    * @return the sequencer singleton
    */
   public static AlsaMidiSequencerDevice getInstance()
   {
     return instance;
   }
-  
+
   /* (non-Javadoc)
    * @see javax.sound.midi.Sequencer#setSequence(javax.sound.midi.Sequence)
    */
@@ -438,23 +438,23 @@ public class AlsaMidiSequencerDevice implements Sequencer
       // Check to see if we're open already.
       if (nativeState != 0)
         return;
-     
+
       nativeState = open_();
     }
   }
 
   /**
    * Allocate the native state object, and open the sequencer.
-   * 
+   *
    * @return a long representation of a pointer to the nativeState.
    */
   private native long open_();
-  
+
   /**
    * Close the sequencer and free the native state object.
    */
   private native void close_(long nativeState);
-  
+
   /* (non-Javadoc)
    * @see javax.sound.midi.MidiDevice#close()
    */
diff --git a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java
index bc5a5593967..9140d59ad78 100644
--- a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java
+++ b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaOutputPortDevice.java
@@ -46,7 +46,7 @@ import javax.sound.midi.Transmitter;
 
 /**
  * ALSA MIDI Out Device
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
diff --git a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java
index 0e59bc8d669..f55941ba539 100644
--- a/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java
+++ b/libjava/classpath/gnu/javax/sound/midi/alsa/AlsaPortDevice.java
@@ -47,7 +47,7 @@ import gnu.javax.sound.midi.alsa.AlsaMidiDeviceProvider.AlsaPortInfo;
 
 /**
  * ALSA Port Device
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
@@ -55,7 +55,7 @@ public abstract class AlsaPortDevice implements MidiDevice
 {
   /**
    * The ALSA Receiver class.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -82,22 +82,22 @@ public abstract class AlsaPortDevice implements MidiDevice
   }
 
   AlsaMidiDeviceProvider.AlsaPortInfo info;
-    
+
   public AlsaPortDevice (AlsaPortInfo info)
   {
     this.info = info;
   }
-    
+
   public Info getDeviceInfo()
   {
     return info;
   }
 
   native void run_receiver_thread_ (long client, long port, Receiver receiver);
-  
+
   /**
    * The ALSA Transmitter class.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -109,7 +109,7 @@ public abstract class AlsaPortDevice implements MidiDevice
     {
       run_receiver_thread_ (info.client, info.port, receiver);
     }
-    
+
     /* (non-Javadoc)
      * @see javax.sound.midi.Transmitter#setReceiver(javax.sound.midi.Receiver)
      */
@@ -119,7 +119,7 @@ public abstract class AlsaPortDevice implements MidiDevice
       {
         this.receiver = receiver;
       }
-      
+
       // Create the processing thread
       new Thread(this).start();
     }
diff --git a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
index 740b124eb65..605c6dfb791 100644
--- a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
+++ b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
@@ -50,12 +50,12 @@ import javax.sound.midi.spi.MidiDeviceProvider;
 
 /**
  * A DSSI MIDI device provider.
- * 
- * DSSI (pronounced "dizzy") is an API for audio plugins, with particular 
+ *
+ * DSSI (pronounced "dizzy") is an API for audio plugins, with particular
  * application for software synthesis plugins with native user interfaces.
- * 
+ *
  * Read about DSSI at http://dssi.sourceforge.net
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
@@ -63,7 +63,7 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
 {
   /**
    * The MidiDevice.Info specialized for DSSI synthesizers.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -71,7 +71,7 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
   {
     String soname;
     long index;
-    
+
     public DSSIInfo(String name, String vendor, String description,
                     String version, String soname, long index)
     {
@@ -88,13 +88,13 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
   static native String getDSSICopyright_(long handle);
   static native String getDSSIVendor_(long handle);
   static native String getDSSILabel_(long handle);
-  
+
   private static List examineLibrary(String soname)
   {
      List list = new ArrayList();
      long index = 0;
      long handle;
-     
+
      long sohandle = dlopen_(soname);
      if (sohandle == 0)
        return list;
@@ -107,19 +107,19 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
        String copyright = getDSSICopyright_(handle);
        String label = getDSSIName_(handle);
        String vendor = getDSSIVendor_(handle);
-       list.add(new DSSIInfo(name, vendor, label, 
+       list.add(new DSSIInfo(name, vendor, label,
                              "DSSI-1", soname, index));
        index++;
      } while (true);
-     
+
      // Close the library and free memory
      dlclose_(sohandle);
-     
+
      return list;
   }
-  
+
   private static DSSIInfo[] infos;
-  
+
   static
   {
     if (Configuration.INIT_LOAD_LIBRARY)
@@ -131,19 +131,19 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
                                       public boolean accept(File dir, String n)
                                       {
                                         return n.endsWith(".so");
-                                      }   
+                                      }
                                     });
     List ilist = new ArrayList();
     for (int i = 0; i < sofiles.length; i++)
       ilist.addAll(examineLibrary(new File(dssidir, sofiles[i]).getAbsolutePath()));
     infos = (DSSIInfo[]) ilist.toArray(new DSSIInfo[ilist.size()]);
   }
-  
+
   public DSSIMidiDeviceProvider()
   {
     // Empty.
   }
-  
+
   /* Return the Info array.
    * @see javax.sound.midi.spi.MidiDeviceProvider#getDeviceInfo()
    */
@@ -162,7 +162,7 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
       if (info.equals(infos[i]))
       {
           return new DSSISynthesizer(infos[i],
-                                     infos[i].soname, 
+                                     infos[i].soname,
                                      infos[i].index);
       }
     }
diff --git a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
index 26821862691..9472ee4adcc 100644
--- a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
+++ b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
@@ -57,9 +57,9 @@ import javax.sound.midi.VoiceStatus;
 
 /**
  * DSSI soft-synth support.
- * 
+ *
  * All DSSI soft-synths are expected to be installed in /usr/lib/dssi.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  *
  */
@@ -67,7 +67,7 @@ public class DSSISynthesizer implements Synthesizer
 {
   /**
    * The DSSI Instrument class.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -77,7 +77,7 @@ public class DSSISynthesizer implements Synthesizer
     {
       super (soundbank, patch, name, null);
     }
-    
+
     /* @see javax.sound.midi.SoundbankResource#getData()
      */
     public Object getData()
@@ -89,7 +89,7 @@ public class DSSISynthesizer implements Synthesizer
 
 /**
    * DSSISoundbank holds all instruments.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -101,7 +101,7 @@ public class DSSISynthesizer implements Synthesizer
     private List resources = new ArrayList();
     private String vendor;
     private String version;
-    
+
     public DSSISoundbank(String name, String description, String vendor, String version)
     {
       this.name = name;
@@ -109,12 +109,12 @@ public class DSSISynthesizer implements Synthesizer
       this.vendor = vendor;
       this.version = version;
     }
-    
+
     void add(Instrument instrument)
     {
       instruments.add(instrument);
     }
-    
+
     /* @see javax.sound.midi.Soundbank#getName()
      */
     public String getName()
@@ -164,14 +164,14 @@ public class DSSISynthesizer implements Synthesizer
     public Instrument getInstrument(Patch patch)
     {
       Iterator itr = instruments.iterator();
-      
+
       while (itr.hasNext())
       {
         Instrument i = (Instrument) itr.next();
         if (i.getPatch().equals(patch))
           return i;
       }
-      
+
       return null;
     }
   }
@@ -179,7 +179,7 @@ public class DSSISynthesizer implements Synthesizer
 /**
    * The Receiver class receives all MIDI messages from a connected
    * Transmitter.
-   * 
+   *
    * @author Anthony Green (green@redhat.com)
    *
    */
@@ -194,13 +194,13 @@ public class DSSISynthesizer implements Synthesizer
       if (message instanceof ShortMessage)
       {
         ShortMessage smessage = (ShortMessage) message;
-      
+
         switch (message.getStatus())
         {
         case ShortMessage.NOTE_ON:
           int velocity = smessage.getData2();
           if (velocity > 0)
-            channels[smessage.getChannel()].noteOn(smessage.getData1(), 
+            channels[smessage.getChannel()].noteOn(smessage.getData1(),
                                                    smessage.getData2());
           else
             channels[smessage.getChannel()].noteOff(smessage.getData1());
@@ -226,8 +226,8 @@ public class DSSISynthesizer implements Synthesizer
 
   }
 
-  static native void noteOn_(long handle, int channel, int noteNumber, int velocity);  
-  static native void noteOff_(long handle, int channel, int noteNumber, int velocity);  
+  static native void noteOn_(long handle, int channel, int noteNumber, int velocity);
+  static native void noteOff_(long handle, int channel, int noteNumber, int velocity);
   static native void setPolyPressure_(long handle, int channel, int noteNumber, int pressure);
   static native int getPolyPressure_(long handle, int channel, int noteNumber);
   static native void controlChange_(long handle, int channel, int control, int value);
@@ -237,7 +237,7 @@ public class DSSISynthesizer implements Synthesizer
   static native int getProgramBank_(long handle, int index);
   static native int getProgramProgram_(long handle, int index);
   static native void selectProgram_(long handle, int bank, int program);
-      
+
   /**
    * @author Anthony Green (green@redhat.com)
    *
@@ -245,7 +245,7 @@ public class DSSISynthesizer implements Synthesizer
   public class DSSIMidiChannel implements MidiChannel
   {
     int channel = 0;
-    
+
     /**
      * Default contructor.
      */
@@ -484,18 +484,18 @@ public class DSSISynthesizer implements Synthesizer
   }
 
   long sohandle;
-  long handle; 
+  long handle;
   private Info info;
-  
+
   MidiChannel channels[] = new MidiChannel[16];
-  
+
   // The list of known soundbanks, and the default one.
   List soundbanks = new ArrayList();
   DSSISoundbank defaultSoundbank;
-  
+
   /**
    * Create a DSSI Synthesizer.
-   * 
+   *
    * @param info the DSSIInfo for this soft-synth
    * @param soname the name of the .so file for this DSSI synth
    * @param index the DSSI index for this soft-synth
@@ -507,10 +507,10 @@ public class DSSISynthesizer implements Synthesizer
     sohandle = DSSIMidiDeviceProvider.dlopen_(soname);
     handle = DSSIMidiDeviceProvider.getDSSIHandle_(sohandle, index);
     channels[0] = new DSSIMidiChannel(0);
-    defaultSoundbank = new DSSISoundbank("name", "description", 
+    defaultSoundbank = new DSSISoundbank("name", "description",
                                          "vendor", "version");
     soundbanks.add(defaultSoundbank);
-    
+
     int i = 0;
     String name;
     do
@@ -519,7 +519,7 @@ public class DSSISynthesizer implements Synthesizer
       if (name != null)
       {
         defaultSoundbank.
-          add(new DSSIInstrument(defaultSoundbank, 
+          add(new DSSIInstrument(defaultSoundbank,
                                  new Patch(getProgramBank_(sohandle, i),
                                            getProgramProgram_(sohandle, i)),
                                  name));
@@ -581,7 +581,7 @@ public class DSSISynthesizer implements Synthesizer
     // be in any soundbank.
     if (instrument.getSoundbank() != defaultSoundbank)
       throw new IllegalArgumentException ("Synthesizer doesn't support this instrument's soundbank");
-      
+
     Patch patch = instrument.getPatch();
     selectProgram_(sohandle, patch.getBank(), patch.getProgram());
     return true;
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java b/libjava/classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java
index cb5a8e82dfa..4b065f3dcba 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/ExtendedMidiFileFormat.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 package gnu.javax.sound.midi.file;
 
 /**
- * ExtendedMidiFileFormat is a package private class that simply 
+ * ExtendedMidiFileFormat is a package private class that simply
  * adds the number of MIDI tracks for the MidiFileFormat class.
  *
  * @author Anthony Green (green@redhat.com)
@@ -47,17 +47,17 @@ class ExtendedMidiFileFormat
     extends javax.sound.midi.MidiFileFormat
 {
   private int ntracks;
-  
+
   /**
    * Get the number of tracks for this MIDI file.
-   * 
+   *
    * @return the number of tracks for this MIDI file
    */
   public int getNumberTracks()
   {
     return ntracks;
   }
-  
+
   /**
    * Create an ExtendedMidiFileFormat object from the given parameters.
    *
@@ -68,7 +68,7 @@ class ExtendedMidiFileFormat
    * @param microseconds the MIDI file length in microseconds
    * @param ntracks the number of tracks
    */
-  public ExtendedMidiFileFormat(int type, float divisionType, int resolution, 
+  public ExtendedMidiFileFormat(int type, float divisionType, int resolution,
                                 int bytes, long microseconds, int ntracks)
   {
     super(type, divisionType, resolution, bytes, microseconds);
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java
index 010d17093c1..d91970b9fd8 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiDataInputStream.java
@@ -57,7 +57,7 @@ public class MidiDataInputStream
   {
     super(is);
   }
-  
+
   /**
    * Read an int encoded in the MIDI-style variable length
    * encoding format.
@@ -68,7 +68,7 @@ public class MidiDataInputStream
     throws IOException
   {
     int c, value = readByte();
-    
+
     if ((value & 0x80) != 0)
       {
          value &= 0x7F;
@@ -77,7 +77,7 @@ public class MidiDataInputStream
            value = (value << 7) + ((c = readByte()) & 0x7F);
          } while ((c & 0x80) != 0);
       }
-    
-    return value;   
+
+    return value;
   }
 }
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java
index f9a3dac8e87..79c66e8a248 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiDataOutputStream.java
@@ -71,44 +71,44 @@ public class MidiDataOutputStream
 
     while ((value >>= 7) != 0)
       {
-	buffer <<= 8;
-	buffer |= ((value & 0x7F) | 0x80);
+        buffer <<= 8;
+        buffer |= ((value & 0x7F) | 0x80);
       }
-      
+
     while (true)
       {
-	length++;
-	if ((buffer & 0x80) != 0)
-	  buffer >>>= 8;
-	else
-	  break;
+        length++;
+        if ((buffer & 0x80) != 0)
+          buffer >>>= 8;
+        else
+          break;
       }
 
     return length;
   }
-  
+
   /**
    * Write an int encoded in the MIDI-style variable length
    * encoding format.
    */
-  public synchronized void writeVariableLengthInt (int value) 
+  public synchronized void writeVariableLengthInt (int value)
     throws IOException
   {
     int buffer = value & 0x7F;
 
     while ((value >>= 7) != 0)
       {
-	buffer <<= 8;
-	buffer |= ((value & 0x7F) | 0x80);
+        buffer <<= 8;
+        buffer |= ((value & 0x7F) | 0x80);
       }
-      
+
     while (true)
       {
-	writeByte(buffer & 0xff);
-	if ((buffer & 0x80) != 0)
-	  buffer >>>= 8;
-	else
-	  break;
+        writeByte(buffer & 0xff);
+        if ((buffer & 0x80) != 0)
+          buffer >>>= 8;
+        else
+          break;
       }
   }
 }
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
index cb640e14a6a..fb2a472fa24 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
@@ -56,8 +56,8 @@ import javax.sound.midi.Track;
 
 /**
  * A MIDI file reader.
- * 
- * This code reads MIDI file types 0 and 1.  
+ *
+ * This code reads MIDI file types 0 and 1.
  *
  * There are many decent documents on the web describing the MIDI file
  * format.  I didn't bother looking for the official document.  If it
@@ -67,7 +67,7 @@ import javax.sound.midi.Track;
  * @author Anthony Green (green@redhat.com)
  *
  */
-public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader 
+public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
 {
   /* Get the MidiFileFormat for the given input stream.
    * @see javax.sound.midi.spi.MidiFileReader#getMidiFileFormat(java.io.InputStream)
@@ -80,28 +80,28 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
       din = (DataInputStream) in;
     else
       din = new DataInputStream(in);
-    
+
     int type, ntracks, division, resolution, bytes;
     float divisionType;
-    
+
     if (din.readInt() != 0x4d546864) // "MThd"
       throw new InvalidMidiDataException("Invalid MIDI chunk header.");
 
     bytes = din.readInt();
     if (bytes < 6)
-      throw new 
-	InvalidMidiDataException("Invalid MIDI chunk header length: " + bytes);
+      throw new
+        InvalidMidiDataException("Invalid MIDI chunk header length: " + bytes);
 
     type = din.readShort();
     if (type < 0 || type > 2)
-      throw new 
-	InvalidMidiDataException("Invalid MIDI file type value: " + type);
-    
+      throw new
+        InvalidMidiDataException("Invalid MIDI file type value: " + type);
+
     ntracks = din.readShort();
     if (ntracks <= 0)
-      throw new 
-	InvalidMidiDataException("Invalid number of MIDI tracks: " + ntracks);
-    
+      throw new
+        InvalidMidiDataException("Invalid number of MIDI tracks: " + ntracks);
+
     division = din.readShort();
     if ((division & 0x8000) != 0)
       {
@@ -125,9 +125,9 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
             break;
 
           default:
-            throw new 
-	      InvalidMidiDataException("Invalid MIDI frame division type: "
-				       + division);
+            throw new
+              InvalidMidiDataException("Invalid MIDI frame division type: "
+                                       + division);
           }
         resolution = division & 0xff;
       }
@@ -136,10 +136,10 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
         divisionType = Sequence.PPQ;
         resolution = division & 0x7fff;
       }
-    
+
     // If we haven't read every byte in the header now, just skip the rest.
     din.skip(bytes - 6);
-    
+
     return new ExtendedMidiFileFormat(type, divisionType, resolution,
                                       MidiFileFormat.UNKNOWN_LENGTH,
                                       MidiFileFormat.UNKNOWN_LENGTH, ntracks);
@@ -150,7 +150,7 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
    */
   public MidiFileFormat getMidiFileFormat(URL url)
     throws InvalidMidiDataException, IOException
-  {		  
+  {
     InputStream is = url.openStream();
     try
       {
@@ -178,7 +178,7 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
         is.close();
       }
   }
-  
+
   /* Get the MIDI Sequence found in this input stream.
    * @see javax.sound.midi.spi.MidiFileReader#getSequence(java.io.InputStream)
    */
@@ -272,7 +272,7 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
                           case ShortMessage.CHANNEL_PRESSURE:
                           case ShortMessage.SONG_SELECT:
                           case 0xF5: // FIXME: unofficial bus select. Not in
-			             // spec??
+                                     // spec??
                             sm = new ShortMessage();
                             sm.setMessage(runningStatus, sbyte, 0);
                             continue;
@@ -290,15 +290,15 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
                             continue;
 
                           default:
-                            throw new 
-			      InvalidMidiDataException("Invalid Short MIDI Event: "
-						       + sbyte);
+                            throw new
+                              InvalidMidiDataException("Invalid Short MIDI Event: "
+                                                       + sbyte);
                           }
                       }
                     else
-                      throw new 
-			InvalidMidiDataException("Invalid Short MIDI Event: "
-						 + sbyte);
+                      throw new
+                        InvalidMidiDataException("Invalid Short MIDI Event: "
+                                                 + sbyte);
                   }
                 mm = sm;
               }
@@ -346,16 +346,16 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
    * @see javax.sound.midi.spi.MidiFileReader#getSequence(java.net.URL)
    */
   public Sequence getSequence(URL url) throws InvalidMidiDataException,
-    IOException 
+    IOException
   {
     InputStream is = url.openStream();
     try
       {
-	return getSequence(is);
+        return getSequence(is);
       }
     finally
       {
-	is.close();
+        is.close();
       }
   }
 
@@ -363,16 +363,16 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
    * @see javax.sound.midi.spi.MidiFileReader#getSequence(java.io.File)
    */
   public Sequence getSequence(File file) throws InvalidMidiDataException,
-    IOException 
+    IOException
   {
     InputStream is = new FileInputStream(file);
     try
       {
-	return getSequence(is);
+        return getSequence(is);
       }
     finally
       {
-	is.close();
+        is.close();
       }
   }
 }
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
index b9b6fe87a10..5170fc1e7df 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
@@ -49,8 +49,8 @@ import javax.sound.midi.Track;
 
 /**
  * A MIDI file writer.
- * 
- * This code writes MIDI file types 0 and 1.  
+ *
+ * This code writes MIDI file types 0 and 1.
  *
  * There are many decent documents on the web describing the MIDI file
  * format.  I didn't bother looking for the official document.  If it
@@ -92,7 +92,7 @@ public class MidiFileWriter
     MidiDataOutputStream dos = new MidiDataOutputStream (out);
     Track[] tracks = in.getTracks();
     dos.writeInt(0x4d546864); // MThd
-    dos.writeInt(6);  
+    dos.writeInt(6);
     dos.writeShort(fileType);
     dos.writeShort(tracks.length);
     float divisionType = in.getDivisionType();
@@ -101,7 +101,7 @@ public class MidiFileWriter
     int division = 0;
     if (divisionType == Sequence.PPQ)
       division = resolution & 0x7fff;
-    dos.writeShort(division); 
+    dos.writeShort(division);
     int length = 14;
     for (int i = 0; i < tracks.length; i++)
       length += writeTrack(tracks[i], dos);
@@ -122,13 +122,13 @@ public class MidiFileWriter
     long ptick = 0;
     while (i < eventCount)
       {
-	MidiEvent me = track.get(i);
-	long tick = me.getTick();
-	length += dos.variableLengthIntLength((int) (tick - ptick));
-	ptick = tick;
-	length += me.getMessage().getLength();
-	i++;
-      } 
+        MidiEvent me = track.get(i);
+        long tick = me.getTick();
+        length += dos.variableLengthIntLength((int) (tick - ptick));
+        ptick = tick;
+        length += me.getMessage().getLength();
+        i++;
+      }
     return length;
   }
 
@@ -149,24 +149,24 @@ public class MidiFileWriter
     dos.writeInt(trackLength);
     while (i < elength)
       {
-	MidiEvent me = track.get(i);
-	int dtime = 0;
-	if (pme != null)
-	  dtime = (int) (me.getTick() - pme.getTick());
-	dos.writeVariableLengthInt(dtime); 
-	// FIXME: use running status byte
-	byte msg[] = me.getMessage().getMessage();
-	dos.write(msg);
-	pme = me;
-	i++;
-      } 
+        MidiEvent me = track.get(i);
+        int dtime = 0;
+        if (pme != null)
+          dtime = (int) (me.getTick() - pme.getTick());
+        dos.writeVariableLengthInt(dtime);
+        // FIXME: use running status byte
+        byte msg[] = me.getMessage().getMessage();
+        dos.write(msg);
+        pme = me;
+        i++;
+      }
 
     // We're done if the last event was an End of Track meta message.
     if (pme != null && (pme.getMessage() instanceof MetaMessage))
       {
-	MetaMessage mm = (MetaMessage) pme.getMessage();
-	if (mm.getType() == 0x2f) // End of Track message
-	  return trackLength + 8;
+        MetaMessage mm = (MetaMessage) pme.getMessage();
+        if (mm.getType() == 0x2f) // End of Track message
+          return trackLength + 8;
       }
 
     // Write End of Track meta message
@@ -186,12 +186,12 @@ public class MidiFileWriter
     OutputStream os = new FileOutputStream(out);
     try
       {
-	return write(in, fileType, os);
+        return write(in, fileType, os);
       }
     finally
       {
-	os.close();
-      } 
+        os.close();
+      }
   }
 
 }
diff --git a/libjava/classpath/gnu/javax/sound/sampled/AU/AUReader.java b/libjava/classpath/gnu/javax/sound/sampled/AU/AUReader.java
index ed5852e6c9a..fe0df6eb1f8 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/AU/AUReader.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/AU/AUReader.java
@@ -55,11 +55,11 @@ public class AUReader extends AudioFileReader
 {
   private static class AUHeader
   {
-    // Magic number identifying the file. '.snd' 
+    // Magic number identifying the file. '.snd'
     private static final int MAGIC = 0x2e736e64;
-    
+
     public static final int SIZE = 24; // size of the header
-    
+
     // Encoding types
     public static final int ULAW = 1; // 8-bit u-law
     public static final int PCM8 = 2; // 8-bit PCM
@@ -68,10 +68,10 @@ public class AUReader extends AudioFileReader
     public static final int PCM32 = 5; // 32-bit PCM
     public static final int IEEE32 = 6; // 32-bit IEEE f.p.
     public static final int IEEE64 = 7; // 64-bit IEEE f.p.
-    public static final int G721 = 23; 
-    public static final int G722 = 24; 
-    public static final int G723 = 25; 
-    public static final int G723_5BIT = 26; 
+    public static final int G721 = 23;
+    public static final int G722 = 24;
+    public static final int G723 = 25;
+    public static final int G723_5BIT = 26;
     public static final int ALAW = 27; // 8-bit a-law
 
     // Header data.
@@ -90,56 +90,56 @@ public class AUReader extends AudioFileReader
       ByteBuffer buf = ByteBuffer.wrap(hdr);
 
       if( buf.getInt() != MAGIC )
-	throw new UnsupportedAudioFileException("Not an AU format audio file.");
-      headerSize = buf.getInt(); 
-      fileSize = buf.getInt(); 
-      encoding = buf.getInt(); 
+        throw new UnsupportedAudioFileException("Not an AU format audio file.");
+      headerSize = buf.getInt();
+      fileSize = buf.getInt();
+      encoding = buf.getInt();
       sampleRate = buf.getInt();
-      channels = buf.getInt(); 
+      channels = buf.getInt();
 
       switch(encoding)
-	{
-	case ULAW: 
-	case PCM8: 
-	case ALAW: 
-	  sampleSizeInBits = 8;
-	  break;
-	case PCM16:
-	  sampleSizeInBits = 16;
-	  break;
-	case PCM24:
-	  sampleSizeInBits = 24;
-	  break;
-	case PCM32:
-	  sampleSizeInBits = 32;
-	  break;
-	default:   // other types exist but are not supported. Yet.
-	  throw new UnsupportedAudioFileException("Unsupported encoding.");
-	}
+        {
+        case ULAW:
+        case PCM8:
+        case ALAW:
+          sampleSizeInBits = 8;
+          break;
+        case PCM16:
+          sampleSizeInBits = 16;
+          break;
+        case PCM24:
+          sampleSizeInBits = 24;
+          break;
+        case PCM32:
+          sampleSizeInBits = 32;
+          break;
+        default:   // other types exist but are not supported. Yet.
+          throw new UnsupportedAudioFileException("Unsupported encoding.");
+        }
     }
 
   public AudioFormat getAudioFormat()
     {
       AudioFormat.Encoding encType = AudioFormat.Encoding.PCM_SIGNED;
       if(encoding == 1)
-	encType = AudioFormat.Encoding.ULAW;
+        encType = AudioFormat.Encoding.ULAW;
       if(encoding == 27)
-	encType = AudioFormat.Encoding.ALAW;
-      
-      return new AudioFormat(encType, 
-			     (float)sampleRate, 
-			     sampleSizeInBits, 
-			     channels, 
-			     (sampleSizeInBits >> 3) * channels, 
-			     (float)sampleRate, 
-			     true);
+        encType = AudioFormat.Encoding.ALAW;
+
+      return new AudioFormat(encType,
+                             (float)sampleRate,
+                             sampleSizeInBits,
+                             channels,
+                             (sampleSizeInBits >> 3) * channels,
+                             (float)sampleRate,
+                             true);
     }
 
   public AudioFileFormat getAudioFileFormat()
     {
-      return new AudioFileFormat(new AUFormatType(), 
-				 getAudioFormat(), 
-				 AudioSystem.NOT_SPECIFIED);
+      return new AudioFileFormat(new AUFormatType(),
+                                 getAudioFormat(),
+                                 AudioSystem.NOT_SPECIFIED);
     }
   }
 
@@ -160,8 +160,8 @@ public class AUReader extends AudioFileReader
   public AudioFileFormat getAudioFileFormat(InputStream stream)
     throws IOException, UnsupportedAudioFileException
   {
-    if(!stream.markSupported()) 
-      throw new IOException("Stream must support marking.");    
+    if(!stream.markSupported())
+      throw new IOException("Stream must support marking.");
 
     stream.mark(25);
     AUHeader header = new AUHeader(stream);
@@ -169,10 +169,10 @@ public class AUReader extends AudioFileReader
 
     return header.getAudioFileFormat();
   }
-  
+
   public AudioFileFormat getAudioFileFormat(URL url)
     throws IOException, UnsupportedAudioFileException
-  {        
+  {
     return getAudioFileFormat(new BufferedInputStream(url.openStream()));
   }
 
@@ -198,8 +198,8 @@ public class AUReader extends AudioFileReader
     if( header.headerSize > AUHeader.SIZE )
       stream.skip(header.headerSize - AUHeader.SIZE);
 
-    return new AudioInputStream(stream, header.getAudioFormat(), 
-				AudioSystem.NOT_SPECIFIED);
+    return new AudioInputStream(stream, header.getAudioFormat(),
+                                AudioSystem.NOT_SPECIFIED);
   }
 
   public AudioInputStream getAudioInputStream(URL url)
@@ -208,4 +208,3 @@ public class AUReader extends AudioFileReader
     return getAudioInputStream(new BufferedInputStream(url.openStream()));
   }
 }
-
diff --git a/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java b/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
index 0cf3c137797..5cd6efe5e02 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
@@ -52,7 +52,7 @@ import javax.sound.sampled.spi.AudioFileReader;
 
 /**
  * A WAV file reader.
- * 
+ *
  * This code reads WAV files.
  *
  * There are many decent documents on the web describing the WAV file
@@ -66,24 +66,24 @@ import javax.sound.sampled.spi.AudioFileReader;
  */
 public class WAVReader extends AudioFileReader
 {
-  private static long readUnsignedIntLE (DataInputStream is) 
+  private static long readUnsignedIntLE (DataInputStream is)
     throws IOException
   {
     byte[] buf = new byte[4];
     is.readFully(buf);
-    return (buf[0] & 0xFF 
-	    | ((buf[1] & 0xFF) << 8)
-	    | ((buf[2] & 0xFF) << 16)
-	    | ((buf[3] & 0xFF) << 24));
+    return (buf[0] & 0xFF
+            | ((buf[1] & 0xFF) << 8)
+            | ((buf[2] & 0xFF) << 16)
+            | ((buf[3] & 0xFF) << 24));
   }
 
-  private static short readUnsignedShortLE (DataInputStream is) 
+  private static short readUnsignedShortLE (DataInputStream is)
     throws IOException
   {
     byte[] buf = new byte[2];
     is.readFully(buf);
-    return (short) (buf[0] & 0xFF 
-		    | ((buf[1] & 0xFF) << 8));
+    return (short) (buf[0] & 0xFF
+                    | ((buf[1] & 0xFF) << 8));
   }
 
   /* Get an AudioFileFormat from the given File.
@@ -115,7 +115,7 @@ public class WAVReader extends AudioFileReader
       din = (DataInputStream) in;
     else
       din = new DataInputStream(in);
-    
+
     if (din.readInt() != 0x52494646) // "RIFF"
       throw new UnsupportedAudioFileException("Invalid WAV chunk header.");
 
@@ -134,33 +134,33 @@ public class WAVReader extends AudioFileReader
 
     while (! foundData)
       {
-	int chunkId = din.readInt();
-	chunkLength = readUnsignedIntLE(din);
-	switch (chunkId)
-	  {
-	  case 0x666D7420: // "fmt "
-	    foundFmt = true;
-	    compressionCode = readUnsignedShortLE(din);
-	    numberChannels = readUnsignedShortLE(din);
-	    sampleRate = readUnsignedIntLE(din);
-	    bytesPerSecond = readUnsignedIntLE(din);
-	    blockAlign = readUnsignedShortLE(din);
-	    bitsPerSample = readUnsignedShortLE(din);
-	    din.skip(chunkLength - 16);
-	    break;
-	  case 0x66616374: // "fact"
-	    // FIXME: hold compression format dependent data.
-	    din.skip(chunkLength);
-	    break;
-	  case 0x64617461: // "data"
-	    if (! foundFmt)
-	      throw new UnsupportedAudioFileException("This implementation requires WAV fmt chunks precede data chunks.");
-	    foundData = true;
-	    break;
-	  default:
-	    // Unrecognized chunk.  Skip it.
-	    din.skip(chunkLength);
-	  }
+        int chunkId = din.readInt();
+        chunkLength = readUnsignedIntLE(din);
+        switch (chunkId)
+          {
+          case 0x666D7420: // "fmt "
+            foundFmt = true;
+            compressionCode = readUnsignedShortLE(din);
+            numberChannels = readUnsignedShortLE(din);
+            sampleRate = readUnsignedIntLE(din);
+            bytesPerSecond = readUnsignedIntLE(din);
+            blockAlign = readUnsignedShortLE(din);
+            bitsPerSample = readUnsignedShortLE(din);
+            din.skip(chunkLength - 16);
+            break;
+          case 0x66616374: // "fact"
+            // FIXME: hold compression format dependent data.
+            din.skip(chunkLength);
+            break;
+          case 0x64617461: // "data"
+            if (! foundFmt)
+              throw new UnsupportedAudioFileException("This implementation requires WAV fmt chunks precede data chunks.");
+            foundData = true;
+            break;
+          default:
+            // Unrecognized chunk.  Skip it.
+            din.skip(chunkLength);
+          }
       }
 
     AudioFormat.Encoding encoding;
@@ -168,25 +168,25 @@ public class WAVReader extends AudioFileReader
     switch (compressionCode)
       {
       case 1: // PCM/uncompressed
-	if (bitsPerSample <= 8)
-	  encoding = AudioFormat.Encoding.PCM_UNSIGNED;
-	else
-	  encoding = AudioFormat.Encoding.PCM_SIGNED;
-	break;
+        if (bitsPerSample <= 8)
+          encoding = AudioFormat.Encoding.PCM_UNSIGNED;
+        else
+          encoding = AudioFormat.Encoding.PCM_SIGNED;
+        break;
 
       default:
-	throw new UnsupportedAudioFileException("Unrecognized WAV compression code: 0x" 
-						+ Integer.toHexString(compressionCode));
+        throw new UnsupportedAudioFileException("Unrecognized WAV compression code: 0x"
+                                                + Integer.toHexString(compressionCode));
       }
 
     return new AudioFileFormat (AudioFileFormat.Type.WAVE,
-				new AudioFormat(encoding,
-						(float) sampleRate, 
-						bitsPerSample,
-						numberChannels, 
-						((bitsPerSample + 7) / 8) * numberChannels,
-						(float) bytesPerSecond, false),
-				(int) chunkLength);
+                                new AudioFormat(encoding,
+                                                (float) sampleRate,
+                                                bitsPerSample,
+                                                numberChannels,
+                                                ((bitsPerSample + 7) / 8) * numberChannels,
+                                                (float) bytesPerSecond, false),
+                                (int) chunkLength);
   }
 
   /* Get an AudioFileFormat from the given URL.
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
index aa42a4c3da8..1910ea655dd 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
@@ -58,43 +58,43 @@ public class GStreamerMixer
   public static class GstInfo extends Info
   {
     /* Mixer Properties */
-    
+
     /** Name */
     private static final String name = "Classpath GStreamer Sound Audio Engine";
-    
+
     /** Vendor */
     private static final String vendor = "GNU Classpath";
-    
+
     /** Description */
     private static final String desc = "GStreamer-based software mixer";
-    
+
     /** Version */
     private static final String vers = "0.0.1";
-    
+
     protected GstInfo()
     {
       super(name, vendor, desc, vers);
     }
   }
-    
+
   public static final String GST_BACKEND = GstInfo.name;
   public static final String GST_DECODER = "decoder";
   public static final String GST_TYPE_NAME = "type";
   public static final String GST_FILE_EXTENSION = "ext";
-  
+
   /** Mixer Info */
   private static final Mixer.Info INFO = new GStreamerMixer.GstInfo();
-  
+
   public Line getLine(Line.Info info)
       throws LineUnavailableException
   {
     // get all the lines formats supported by this mixer and
     // and see if there is one matching the given line
-    // if the format comes from the gstreamer backend 
+    // if the format comes from the gstreamer backend
     // gstreamer will be able to deal with it
     Class clazz = info.getLineClass();
     DataLine.Info _info = (DataLine.Info) info;
-    
+
     if (clazz == SourceDataLine.class)
       {
         for (AudioFormat format : _info.getFormats())
@@ -107,9 +107,9 @@ public class GStreamerMixer
               }
           }
       }
-   
+
     // TODO: we also support basic PCM
-    
+
     throw new LineUnavailableException("Cannot open a line");
   }
 
@@ -162,7 +162,7 @@ public class GStreamerMixer
 
   public boolean isLineSupported(Line.Info info)
   {
-    // We support any kind of mixer that comes 
+    // We support any kind of mixer that comes
     // from our gstreamer backend.
     // In addition, we support PCM based audio streams for
     // direct playback.
@@ -171,7 +171,7 @@ public class GStreamerMixer
         DataLine.Info _dinfo = (DataLine.Info) info;
         _dinfo.getFormats();
       }
-    
+
     return true;
   }
 
@@ -228,7 +228,7 @@ public class GStreamerMixer
     // TODO Auto-generated method stub
     return false;
   }
- 
+
   public boolean isOpen()
   {
     // TODO Auto-generated method stub
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java
index 61a8940e2da..6a0d7faa74d 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixerProvider.java
@@ -43,20 +43,20 @@ import javax.sound.sampled.spi.MixerProvider;
 
 /**
  * Concrete provider class for GStreamerMixer.
- * 
+ *
  * @author Mario Torre
  */
 public class GStreamerMixerProvider
     extends MixerProvider
 {
-  private static final GStreamerMixer mixer = new GStreamerMixer(); 
-  
+  private static final GStreamerMixer mixer = new GStreamerMixer();
+
   @Override
   public Mixer getMixer(Info info)
   {
-    if (info.equals(mixer.getMixerInfo())) 
+    if (info.equals(mixer.getMixerInfo()))
       return mixer;
-    
+
     throw new
       IllegalArgumentException("This provider cannot handle a mixer or type: "
                                + info.getName());
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
index 0514c937a9f..26fb12b09e1 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
@@ -56,20 +56,20 @@ import javax.sound.sampled.spi.AudioFileReader;
 
 /**
  * An implementation of a general AudioFileReader. Uses GStreamer to
- * parse and retrieve informations about the file passed as input. 
- * 
+ * parse and retrieve informations about the file passed as input.
+ *
  * @author Mario Torre 
  */
 public class GstAudioFileReader
     extends AudioFileReader
-{ 
+{
   @Override
   public AudioFileFormat getAudioFileFormat(File file)
       throws UnsupportedAudioFileException, IOException
   {
     CPStringBuilder name = new CPStringBuilder(file.getName());
     String _name = name.substring(name.lastIndexOf(".") + 1);
-    
+
     return getAudioFileFormat(
                new BufferedInputStream(new FileInputStream(file)), _name);
   }
@@ -93,30 +93,30 @@ public class GstAudioFileReader
         {
           UnsupportedAudioFileException ex =
             new UnsupportedAudioFileException("Unsupported encoding.");
-         
+
           ex.initCause(ex.getCause());
           throw ex;
         }
-      
+
       if (format == null)
         throw new UnsupportedAudioFileException("Unsupported encoding.");
-      
+
       String name = format.getProperty(GStreamerMixer.GST_DECODER).toString();
-      
+
       if (extension == null)
         {
           extension =
             format.getProperty(GStreamerMixer.GST_FILE_EXTENSION).toString();
         }
-      
+
       AudioFileFormat.Type type =
         new AudioFileFormat.Type(name, extension);
-      
+
       // TODO: we should calculate this in some way. We don't need it, but
       // application may want to use this data.
       return new AudioFileFormat(type, format, AudioSystem.NOT_SPECIFIED);
     }
-  
+
   @Override
   public AudioFileFormat getAudioFileFormat(URL url)
       throws UnsupportedAudioFileException, IOException
@@ -127,12 +127,12 @@ public class GstAudioFileReader
   @Override
   public AudioInputStream getAudioInputStream(File file)
       throws UnsupportedAudioFileException, IOException
-  { 
+  {
     InputStream stream = new FileInputStream(file);
     long length = file.length();
-    
+
     AudioFormat format = null;
-    
+
     try
       {
         format = GstAudioFileReaderNativePeer.getAudioFormat(file);
@@ -141,11 +141,11 @@ public class GstAudioFileReader
       {
         UnsupportedAudioFileException ex =
           new UnsupportedAudioFileException("Unsupported encoding.");
-       
+
         ex.initCause(ex.getCause());
         throw ex;
       }
-    
+
     // get the header size
     if (format == null)
       throw new UnsupportedAudioFileException("Unsupported encoding.");
@@ -158,7 +158,7 @@ public class GstAudioFileReader
       throws UnsupportedAudioFileException, IOException
   {
     AudioFormat format = null;
-    
+
     try
       {
         format = GstAudioFileReaderNativePeer.getAudioFormat(is);
@@ -168,7 +168,7 @@ public class GstAudioFileReader
         // TODO Auto-generated catch block
         e.printStackTrace();
       }
-    
+
     // get the header size
     if (format == null)
       throw new UnsupportedAudioFileException("Unsupported encoding.");
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
index 761720fee5d..6345d765479 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
@@ -54,30 +54,30 @@ import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.AudioFormat.Encoding;
 
 /**
- * GStreamer native peer for GstAudioFileReader. 
- * 
+ * GStreamer native peer for GstAudioFileReader.
+ *
  * @author Mario Torre 
  */
 final class GstAudioFileReaderNativePeer
 {
   private static final String GST_ENCODING = "GStreamer Generic Audio Reader";
-  
+
   private static class GstHeader
   {
-    /* 
+    /*
      * NOTE: these properties are accessed by the native code, be careful
      * if you change them.
      * Not all the fields are necessarily set.
-     * 
+     *
      */
     public String file = null;
-    
+
     public String suffix = null;
-    
+
     public String name = null;
-    
+
     public String mimetype = null;
-    
+
     public String endianness = null;
 
     public String channels = null;
@@ -87,62 +87,62 @@ final class GstAudioFileReaderNativePeer
     public String width = null;
 
     public String depth = null;
-    
+
     public String isSigned = null;
-    
+
     public String layer = null;
-    
+
     public String bitrate = null;
-    
+
     public String framed = null;
-    
+
     public String type = null;
   }
-  
+
   public static AudioFormat getAudioFormat(File file) throws Exception
   {
     GstHeader header = new GstHeader();
     header.file = file.getAbsolutePath();
-    
+
     if (!gstreamer_get_audio_format_file(header))
       return null;
-    
+
     return getAudioFormat(header);
   }
-  
+
   public static AudioFormat getAudioFormat(InputStream is) throws Exception
   {
     return getAudioFormat(is, new GstHeader());
   }
-  
+
   public static AudioFormat getAudioFormat(URL url) throws Exception
   {
     GstHeader header = new GstHeader();
     header.file = url.toExternalForm();
-    
+
     return getAudioFormat(url.openStream(), header);
   }
-  
+
   private static AudioFormat getAudioFormat(InputStream is, GstHeader header)
       throws Exception
   {
     BufferedInputStream stream = new BufferedInputStream(is);
-    if(!stream.markSupported()) 
-      throw new IOException("Stream must support marking."); 
-    
+    if(!stream.markSupported())
+      throw new IOException("Stream must support marking.");
+
     stream.mark(0);
-    
+
     if (!gstreamer_get_audio_format_stream(header, new GstInputStream(stream).
                                            getNativeClass()))
       return null;
-    
+
     return getAudioFormat(header);
   }
-  
+
   private static Encoding getEncoding(GstHeader header)
   {
     StringBuilder buffer = new StringBuilder();
-    
+
     if (header.name == null)
       {
         buffer.append(GST_ENCODING);
@@ -151,7 +151,7 @@ final class GstAudioFileReaderNativePeer
             buffer.append(" ");
             buffer.append(header.mimetype);
           }
-       
+
         header.name = buffer.toString();
       }
     else
@@ -165,47 +165,47 @@ final class GstAudioFileReaderNativePeer
           {
             index = lowerCase.indexOf("demuxer");
           }
-        
+
         if (index == -1)
           index = lowerCase.length();
 
         buffer.append(header.name.substring(0, index));
-          
+
       }
-    
+
     return new Encoding(buffer.toString().trim());
   }
-  
+
   private static AudioFormat getAudioFormat(GstHeader header)
     throws Exception
   {
     int na = AudioSystem.NOT_SPECIFIED;
-    
+
     /* we use mimetype as an header, but this could have some side effects */
     Encoding encoding = getEncoding(header);
-    
+
     float sampleRate = ((header.rate != null) ?
                          new Float(header.rate).floatValue() : na);
-                        
+
     int sampleSizeInBits = ((header.depth != null) ?
                              new Integer(header.depth).intValue() : na);
-    
+
     int channels = ((header.channels != null) ?
                      new Integer(header.channels).intValue() : na);
-    
+
     boolean bigEndian = false;
     if (header.endianness != null)
       {
         if (header.endianness.compareTo("4321") == 0)
           bigEndian = true;
       }
-    
+
     String ext = null;
-    
+
     int frameSize = na;
     float frameRate = na;
     String lowerCase = header.name.toLowerCase();
-    
+
     // FIXME: frameRate = sampleRate in these cases under all the tests so far
     // but I'm not sure if this is always correct...
     if (lowerCase.contains("law") || lowerCase.contains("au"))
@@ -226,7 +226,7 @@ final class GstAudioFileReaderNativePeer
         frameRate = sampleRate;
         ext = "aiff";
       }
-    
+
     // write all the additional properties we got to identify
     // the gstreamer plugin actually used to deal with this stream
     Map properties = new HashMap();
@@ -235,7 +235,7 @@ final class GstAudioFileReaderNativePeer
     properties.put(GStreamerMixer.GST_TYPE_NAME, encoding.toString());
     if (ext != null)
       properties.put(GStreamerMixer.GST_FILE_EXTENSION, ext);
-    
+
     /* now we put in some of the additional properties if we have them */
     if (header.type != null) properties.put("type", header.type);
     if (header.framed != null) properties.put("framed", header.framed);
@@ -243,7 +243,7 @@ final class GstAudioFileReaderNativePeer
     if (header.isSigned != null) properties.put("isSigned", header.isSigned);
     if (header.depth != null) properties.put("depth", header.depth);
     if (header.mimetype != null) properties.put("mimetype", header.mimetype);
-    
+
     AudioFormat format = new AudioFormat(encoding,
                                          sampleRate,
                                          sampleSizeInBits,
@@ -254,28 +254,28 @@ final class GstAudioFileReaderNativePeer
                                          properties);
     return format;
   }
-  
+
   /* ***** native methods ***** */
-  
+
   /**
    * Retrieve header information about the stream being played.
    */
   native static final
   protected boolean gstreamer_get_audio_format_stream(GstHeader info,
                                                       Pointer pointer);
-  
+
   /**
    * Retrieve header information about the file being played.
    */
   native static final
   protected boolean gstreamer_get_audio_format_file(GstHeader info);
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the static initializer.
    */
   native private static final void init_id_cache();
-  
+
   static
   {
     System.loadLibrary("gstreamerpeer"); //$NON-NLS-1$
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
index 0702eded7e8..56bddcaad80 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
@@ -45,66 +45,66 @@ import java.io.InputStream;
 
 /**
  * Encapsulates the functionality of an InputStream Object.
- * 
+ *
  * This class is only meant to be used by the native code, to allow reading
  * of the given InputStream as part of a the GStreamer InputStream Source
  * Plugin.
- * 
+ *
  * Note: this class will be not garbage collected as the
  * native code contains strong references to internal fields.
  * The native layer provides a method that can be called by the C code to
  * free the resources and to let the garbage collected to handle this class
  * when not needed anymore.
- * 
+ *
  * @author Mario Torre 
  */
 public class GstInputStream
 {
   /** The real InputStream on which to perform reading operations. */
   private InputStream istream;
-  
+
   /**
-   * Initialized in the native code, don't change without changes 
+   * Initialized in the native code, don't change without changes
    * in the native layer.
    */
   private Pointer gstInputStream = null;
-  
+
   public GstInputStream(InputStream istream)
   {
     this.istream = istream;
     init_instance();
   }
-  
+
   public int read(byte[] buf, int off, int len) throws IOException
   {
     return this.istream.read(buf, off, len);
   }
-  
+
   public int available() throws IOException
   {
     return this.istream.available();
   }
-  
+
   /**
    * Return a reference to the GstInputStream native class as a Pointer object.
    * This method is intended as an helper accessor and the returned pointer
-   * needs to be casted and used in the native code only. 
-   *  
+   * needs to be casted and used in the native code only.
+   *
    * @return Pointer to the native GstInputStream class.
    */
   public Pointer getNativeClass()
   {
     return this.gstInputStream;
   }
-  
+
   /* native methods */
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the class constructor.
    */
   native private final void init_instance();
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the static initializer.
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java
index 33be15c58b8..4e8cb1bb213 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstDataLine.java
@@ -47,19 +47,19 @@ public abstract class GstDataLine
     implements DataLine
 {
   public static final int DEFAULT_BUFFER_SIZE = 1024;
-  
+
   /** Represents if this Line is opened or not.  */
-  protected Boolean open = false; 
-  
+  protected Boolean open = false;
+
   private AudioFormat format = null;
   private int bufferSize = 0;
-  
+
   public GstDataLine(AudioFormat format)
   {
     this.format = format;
     this.bufferSize = DEFAULT_BUFFER_SIZE;
   }
-  
+
   public GstDataLine(AudioFormat format, int bufferSize)
   {
     this.format = format;
@@ -81,7 +81,7 @@ public abstract class GstDataLine
     // TODO Auto-generated method stub
     return 0;
   }
-  
+
   public void addLineListener(LineListener listener)
   {
     // TODO Auto-generated method stub
@@ -124,7 +124,7 @@ public abstract class GstDataLine
   }
 
   /* protected methods for subclasses */
-  
+
   /**
    * @param open the open to set
    */
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java
index 84007ac97e7..896f0cb8533 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstNativeDataLine.java
@@ -42,22 +42,22 @@ import gnu.classpath.Pointer;
 import javax.sound.sampled.LineUnavailableException;
 
 public class GstNativeDataLine
-{ 
+{
   public static final GstPipeline createSourcePipeline(int bufferSize)
     throws LineUnavailableException
   {
     GstPipeline pipeline = new GstPipeline(bufferSize);
- 
+
     pipeline.createForWrite();
-    
+
     if (!setup_sink_pipeline(pipeline.getNativeClass()))
       throw new LineUnavailableException("Line unavailable");
-    
+
     return pipeline;
   }
-  
+
   /* native methods */
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the static initializer.
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java
index f561f71c2fa..9280e9f153e 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstPipeline.java
@@ -48,7 +48,7 @@ import gnu.classpath.Pointer;
 /**
  * This class represent a GStreamer pipeline and is resposible to handle the
  * flow of data to and from the GStreamer native backend.
- * 
+ *
  * @author Mario Torre 
  */
 public class GstPipeline
@@ -69,52 +69,52 @@ public class GstPipeline
    * Opening the pipe to record audio data from the sound card works the same
    * except that all the operation are inverted.
    */
-  
+
   // These enums are used in the native code also, changes here must reflect
   // changes in the native code.
   public static enum State
   {
     PLAY, PAUSE, STOP, CLOSE
   }
-  
+
   private static final int READ = 0;
   private static final int WRITE = 1;
   private static final int QUEUED = 1;
-  
-  private static final String CAPACITY_KEY = "Capacity"; 
-  
+
+  private static final String CAPACITY_KEY = "Capacity";
+
   private static final Object [] lock = new Object[0];
-  
+
   /*
    * Preference subsystem. We use this to store some system specific settings.
    */
   protected Preferences prefs =
     Preferences.userNodeForPackage(GstPipeline.class).node("GStreamer");
-  
+
   // used by the native code, stores the size of the named pipeline
   // created by the operating system.
   private long capacity = -1;
-  
+
   /** Represents the playing state of this Line. */
   private State state = State.STOP;
-  
+
   /** The name of the named pipe. */
   // Will be setup and filled in the native code. See the native library
   // for details.
   private String name = null;
-  
+
   /** This is the named pipe that will be read by the gstreamer backend. */
   private FileOutputStream output = null;
-  
+
   /**
    * Defines if we are getting data from a sink pipe
    * or writing to a source pipe.
    */
   private boolean source = true;
-  
+
   /** Indicate that we are ready to process audio data to/from the pipe. */
   private boolean ready = false;
-  
+
   /**
    * This is the native GStreamer Pipeline.
    */
@@ -125,20 +125,20 @@ public class GstPipeline
   /**
    * Creates a new GstPipeline with a capacity of
    * {@link GstDataLine#DEFAULT_BUFFER_SIZE}.
-   * 
+   *
    * @see GstDataLine#DEFAULT_BUFFER_SIZE
    */
   public GstPipeline()
   {
     this(GstDataLine.DEFAULT_BUFFER_SIZE);
   }
-  
+
   /**
    * Creates a new GstPipeline with a capacity of bufferSize.
    * @see GstDataLine#DEFAULT_BUFFER_SIZE
    */
   public GstPipeline(int bufferSize)
-  { 
+  {
     // see if we need to detect the size of the named pipe or we can use
     // an already computet default for this system.
     // Note that this is very different from the bufferSize parameter,
@@ -150,35 +150,35 @@ public class GstPipeline
           {
             capacity = detect_pipe_size();
           }
-        
+
         prefs.putLong(CAPACITY_KEY, capacity);
       }
-    
+
     // FIXME: bufferSize actually not used nor needed by the backend.
     // Applications that expects a buffer of different size will be a
     // bit disappointed by that..
     init_instance();
-    
+
     // need to remove the named pipe in case of abnormal termination
     Runtime.getRuntime().addShutdownHook(new CleanPipeline());
   }
-  
+
   /**
    * Creates a source pipeline. A source pipeline is a pipe you send data for
    * processing using the write method.
    */
   public void createForWrite() throws LineUnavailableException
-  { 
+  {
     // create the named pipe
     if (!create_named_pipe(this.pipeline))
       throw new LineUnavailableException("Unable to create filesystem pipe");
-   
+
     open_native_pipe(this.pipeline, READ);
     prepareWrite();
-    
+
     this.source = true;
   }
-  
+
   /**
    * @return the state
    */
@@ -195,7 +195,7 @@ public class GstPipeline
   {
     setState(State.STOP);
   }
-  
+
   /**
    * @param state the state to set
    */
@@ -211,7 +211,7 @@ public class GstPipeline
         case PAUSE:
           _state = 1;
           break;
-        
+
         case STOP: case CLOSE:
           _state = 2;
           closePipe();
@@ -221,38 +221,38 @@ public class GstPipeline
     if (set_state(pipeline, _state))
       GstPipeline.this.state = state;
   }
-   
+
   /**
    * Return a reference to the GstPipeline native class as a Pointer object.
    * This method is intended as an helper accessor and the returned pointer
-   * needs to be casted and used in the native code only. 
-   *  
+   * needs to be casted and used in the native code only.
+   *
    * @return Pointer to the native GstPipeline class.
    */
   public Pointer getNativeClass()
   {
     return this.pipeline;
   }
-  
+
   /**
    * Write length bytes from the given buffer into this pipeline,
    * starting at offset.
-   * This method block if the pipeline can't accept more data. 
-   * 
+   * This method block if the pipeline can't accept more data.
+   *
    * @param buffer
    * @param offset
    * @param length
    * @return
    */
   public int write(byte[] buffer, int offset, int length)
-  { 
+  {
     if (this.state == State.STOP)
       return -1;
     else if (this.state == State.PAUSE)
       return 0;
     else if (!ready)
       return -1;
-    
+
     try
       {
         if (output != null)
@@ -266,15 +266,15 @@ public class GstPipeline
       {
         /* nothing to do */
       }
-    
+
     return -1;
   }
-  
+
   public int read(byte[] buffer, int offset, int length)
   {
     return 0;
   }
-  
+
   public int available()
   {
     if (this.source)
@@ -282,7 +282,7 @@ public class GstPipeline
     else
       return available(this.pipeline, WRITE);
   }
-  
+
   /**
    * Wait for remaining data to be enqueued in the pipeline.
    */
@@ -290,13 +290,13 @@ public class GstPipeline
   {
     if (this.state == State.STOP)
       return;
-    
+
     try
       {
         // wait untill there is anymore data in the pipe
         while (available(this.pipeline, QUEUED) > 0)
           Thread.sleep(3000);
-        
+
         // plus a bit to allow data to be processed
         Thread.sleep(1000);
       }
@@ -305,7 +305,7 @@ public class GstPipeline
         /* nothing to do*/
       }
   }
-  
+
   /**
    * Flush all the data currently waiting to be processed.
    */
@@ -321,7 +321,7 @@ public class GstPipeline
         /* nothing */
       }
   }
-  
+
   private void closePipe()
   {
     try
@@ -335,7 +335,7 @@ public class GstPipeline
         /* nothing to do */
       }
   }
-  
+
   private void prepareWrite()
   {
     try
@@ -351,54 +351,54 @@ public class GstPipeline
         GstPipeline.this.ready = false;
       }
   }
-  
+
   /* ***** native ***** */
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the static initializer.
    */
   native private static final void init_id_cache();
-  
+
   /**
    * Set the playing state of this pipeline.
    */
   native private static final boolean set_state(Pointer pipeline, int state);
-  
+
   /**
    * Get the number of bytes currently available for reading or writing
    * from the pipeline.
    */
   native private static final int available(Pointer pipeline, int mode);
-  
+
   /**
    * Open the native pipeline with the given mode.
    */
   native private static final void open_native_pipe(Pointer jpipeline,
                                                     int mode);
-  
+
   /**
    * Close the native pipeline.
    */
   native private static final void close_native_pipe(Pointer jpipeline);
-  
+
   /**
    * Initialize the native peer and enables the object cache.
    * It is meant to be used by the class constructor.
    */
   native private final void init_instance();
-  
+
   /**
    * Crates the named pipe used to pass data between the application code
    * and gstreamer.
    */
   native private final boolean create_named_pipe(Pointer jpipeline);
-  
+
   /**
    * Detect and return the size of the filesystem named pipe.
    */
   native private final long detect_pipe_size();
-  
+
   private class CleanPipeline extends Thread
   {
     public void run()
@@ -406,7 +406,7 @@ public class GstPipeline
       GstPipeline.close_native_pipe(GstPipeline.this.pipeline);
     }
   }
-  
+
   static
   {
     System.loadLibrary("gstreamerpeer"); //$NON-NLS-1$
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java
index f149ab39df2..2bc2de454f7 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/lines/GstSourceDataLine.java
@@ -51,7 +51,7 @@ public class GstSourceDataLine
 {
   private GstPipeline pipeline = null;
   private boolean open = false;
-  
+
   public GstSourceDataLine(AudioFormat format)
   {
     super(format);
@@ -60,20 +60,20 @@ public class GstSourceDataLine
   public void open() throws LineUnavailableException
   {
     AudioSecurityManager.checkPermissions(Permission.PLAY);
-    
+
     if (open)
       throw new IllegalStateException("Line already opened");
-    
+
     // create the pipeline
     pipeline = GstNativeDataLine.createSourcePipeline(getBufferSize());
-    
+
     this.open = true;
   }
-  
+
   public void open(AudioFormat fmt) throws LineUnavailableException
   {
     AudioSecurityManager.checkPermissions(Permission.PLAY);
-    
+
     setFormat(fmt);
     this.open();
   }
@@ -81,13 +81,13 @@ public class GstSourceDataLine
   public void open(AudioFormat fmt, int size) throws LineUnavailableException
   {
     AudioSecurityManager.checkPermissions(Permission.PLAY);
-    
+
     setBufferSize(size);
     this.open(fmt);
   }
 
   public int write(byte[] buf, int offset, int length)
-  { 
+  {
     return this.pipeline.write(buf, offset, length);
   }
 
@@ -145,7 +145,7 @@ public class GstSourceDataLine
     pipeline.close();
     this.open = false;
   }
-  
+
   public boolean isRunning()
   {
     return (pipeline.getState() == State.PLAY);
diff --git a/libjava/classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java b/libjava/classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
index a9b504a387e..75ba4550658 100644
--- a/libjava/classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
+++ b/libjava/classpath/gnu/javax/swing/plaf/gnu/GNULookAndFeel.java
@@ -72,25 +72,25 @@ public class GNULookAndFeel extends BasicLookAndFeel
           "CheckBox.icon", new CheckBoxIcon(),
           "RadioButton.icon", new RadioButtonIcon(),
           "Tree.hash", new ColorUIResource(Color.black),
-	  
-	"Tree.closedIcon",
-	  new IconUIResource(new ImageIcon
-			     (getClass().getResource
-			      (iconspath + "TreeClosed.png"))),
-	  "Tree.leafIcon",
-	  new IconUIResource(new ImageIcon
-			     (getClass().getResource
-			      (iconspath + "TreeLeaf.png"))),
-	  "Tree.openIcon",
-	  new IconUIResource(new ImageIcon
-			     (getClass().getResource
-			      (iconspath + "TreeOpen.png"))),
+
+        "Tree.closedIcon",
+          new IconUIResource(new ImageIcon
+                             (getClass().getResource
+                              (iconspath + "TreeClosed.png"))),
+          "Tree.leafIcon",
+          new IconUIResource(new ImageIcon
+                             (getClass().getResource
+                              (iconspath + "TreeLeaf.png"))),
+          "Tree.openIcon",
+          new IconUIResource(new ImageIcon
+                             (getClass().getResource
+                              (iconspath + "TreeOpen.png"))),
         };
         LAF_defaults.putDefaults(myDefaults);
       }
     return LAF_defaults;
   }
-  
+
   /**
    * The icon used for CheckBoxes in the BasicLookAndFeel. This is an empty
    * icon with a size of 13x13 pixels.
@@ -133,21 +133,21 @@ public class GNULookAndFeel extends BasicLookAndFeel
     {
       Color save = g.getColor();
       g.setColor(c.getForeground());
-      g.drawRect(x, y, getIconWidth(), getIconHeight());    
-      
+      g.drawRect(x, y, getIconWidth(), getIconHeight());
+
       JCheckBox item = (JCheckBox) c;
-      if (item.isSelected()) 
+      if (item.isSelected())
         {
           g.drawLine(3 + x, 5 + y, 3 + x, 9 + y);
           g.drawLine(4 + x, 5 + y, 4 + x, 9 + y);
           g.drawLine(5 + x, 7 + y, 9 + x, 3 + y);
           g.drawLine(5 + x, 8 + y, 9 + x, 4 + y);
         }
-      
+
       g.setColor(save);
     }
   }
-  
+
   /**
    * The icon used for RadioButtons in the GNULookAndFeel. This is an empty
    * icon with a size of 13x13 pixels.
@@ -190,7 +190,7 @@ public class GNULookAndFeel extends BasicLookAndFeel
     {
       Color savedColor = g.getColor();
       JRadioButton b = (JRadioButton) c;
-      
+
       // draw outer circle
       if (b.isEnabled())
         g.setColor(Color.GRAY);
@@ -218,13 +218,13 @@ public class GNULookAndFeel extends BasicLookAndFeel
           g.drawLine(x + 10, y + 4, x + 10, y + 7);
           g.fillRect(x + 2, y + 2, 8, 8);
         }
-      else 
+      else
         {
           // only draw inner highlight if not filled
           if (b.isEnabled())
             {
               g.setColor(Color.WHITE);
-          
+
               g.drawLine(x + 2, y + 8, x + 2, y + 9);
               g.drawLine(x + 1, y + 4, x + 1, y + 7);
               g.drawLine(x + 2, y + 2, x + 2, y + 3);
@@ -238,7 +238,7 @@ public class GNULookAndFeel extends BasicLookAndFeel
       if (b.isEnabled())
         {
           g.setColor(Color.WHITE);
-          
+
           // outer
           g.drawLine(x + 10, y + 1, x + 10, y + 1);
           g.drawLine(x + 11, y + 2, x + 11, y + 3);
@@ -249,7 +249,7 @@ public class GNULookAndFeel extends BasicLookAndFeel
           g.drawLine(x + 4, y + 12, x + 7, y + 12);
           g.drawLine(x + 2, y + 11, x + 3, y + 11);
         }
-      
+
       if (b.isSelected())
         {
           if (b.isEnabled())
@@ -261,6 +261,6 @@ public class GNULookAndFeel extends BasicLookAndFeel
           g.drawLine(x + 4, y + 8, x + 7, y + 8);
         }
       g.setColor(savedColor);
-    }  
+    }
   }
 }
diff --git a/libjava/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java b/libjava/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java
index 77bac127dce..d4e58eb5d5e 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/CharacterAttributeTranslator.java
@@ -1,4 +1,4 @@
-/* CharacterAttributeTranslator.java -- 
+/* CharacterAttributeTranslator.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ public class CharacterAttributeTranslator
    * Maps color name to its hex encoding.
    */
   private static final HashMap colorMap = new HashMap();
-  static 
+  static
   {
     colorMap.put("aqua" , "#00FFFF");
     colorMap.put("blue" , "#0000FF");
@@ -75,11 +75,11 @@ public class CharacterAttributeTranslator
     colorMap.put("white" , "#FFFFFF");
     colorMap.put("yellow" , "#FFFF00");
   }
-  
+
   /**
    * Convert the color string represenation into java.awt.Color. The valid
    * values are like "aqua" , "#00FFFF" or "rgb(1,6,44)".
-   * 
+   *
    * @param colorName the color to convert.
    * @return the matching java.awt.color
    */
@@ -118,74 +118,74 @@ public class CharacterAttributeTranslator
         return null;
       }
   }
-  
+
   /**
    * Translate the HTML character attribute to the Swing style constant.
-   * 
+   *
    * @param charAttr the character attributes of the html tag
    * @param t the html tag itself
    * @param a the attribute set where the translated attributes will be stored
-   * 
+   *
    * @return true if some attributes were translated, false otherwise.
    */
-  public static boolean translateTag(MutableAttributeSet charAttr, 
-				     Tag t, MutableAttributeSet a)
+  public static boolean translateTag(MutableAttributeSet charAttr,
+                                     Tag t, MutableAttributeSet a)
   {
     if(t == Tag.FONT)
       {
-        Object color = a.getAttribute(Attribute.COLOR); 
-	if(color != null)
-	  {
-	    Color c = getColor(color.toString());
-	    if( c == null )
-	      return false;
-	    charAttr.addAttribute(StyleConstants.Foreground, c);
-	    return true;
-	  }
+        Object color = a.getAttribute(Attribute.COLOR);
+        if(color != null)
+          {
+            Color c = getColor(color.toString());
+            if( c == null )
+              return false;
+            charAttr.addAttribute(StyleConstants.Foreground, c);
+            return true;
+          }
 
-	if(a.getAttribute(Attribute.SIZE) != null)
-	  {
-	    // FIXME
-	    //	    charAttr.addAttribute(StyleConstants.FontSize, 
-	    //				  new java.lang.Integer(72));
-	    return true;
-	  }
+        if(a.getAttribute(Attribute.SIZE) != null)
+          {
+            // FIXME
+            //      charAttr.addAttribute(StyleConstants.FontSize,
+            //                            new java.lang.Integer(72));
+            return true;
+          }
       }
 
     if( t == Tag.B )
       {
-	charAttr.addAttribute(StyleConstants.Bold, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.Bold, Boolean.TRUE);
+        return true;
       }
 
     if( t == Tag.I )
       {
-	charAttr.addAttribute(StyleConstants.Italic, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.Italic, Boolean.TRUE);
+        return true;
       }
 
     if( t == Tag.U )
       {
-	charAttr.addAttribute(StyleConstants.Underline, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.Underline, Boolean.TRUE);
+        return true;
       }
 
     if( t == Tag.STRIKE )
       {
-	charAttr.addAttribute(StyleConstants.StrikeThrough, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.StrikeThrough, Boolean.TRUE);
+        return true;
       }
 
     if( t == Tag.SUP )
       {
-	charAttr.addAttribute(StyleConstants.Superscript, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.Superscript, Boolean.TRUE);
+        return true;
       }
 
     if( t == Tag.SUB )
       {
-	charAttr.addAttribute(StyleConstants.Subscript, Boolean.TRUE);
-	return true;
+        charAttr.addAttribute(StyleConstants.Subscript, Boolean.TRUE);
+        return true;
       }
     return false;
   }
diff --git a/libjava/classpath/gnu/javax/swing/text/html/CombinedAttributes.java b/libjava/classpath/gnu/javax/swing/text/html/CombinedAttributes.java
index b1e3de60425..c3fe6681600 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/CombinedAttributes.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/CombinedAttributes.java
@@ -48,8 +48,8 @@ import javax.swing.text.SimpleAttributeSet;
  * Contains the two combined attribute sets what are searched subsequently.
  * This is used to combine style sheet attributes with the HTML view attributes.
  * The parent cannot be used as the view may have its own attribute hierarchy.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)  
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class CombinedAttributes implements AttributeSet, Serializable
 {
@@ -60,7 +60,7 @@ public class CombinedAttributes implements AttributeSet, Serializable
   {
     /**
      * Create a combined enumeration that enumerates over two enumerations.
-     * 
+     *
      * @param first the first enumeration to enumerate
      * @param second the second enumeration to enumerate
      */
@@ -69,46 +69,46 @@ public class CombinedAttributes implements AttributeSet, Serializable
       a = first;
       b = second;
     }
-    
+
     /**
      * The first enumeration (elements returned first)
      */
     final Enumeration a;
-    
+
     /**
      * The second enumeration (elements returned later)
      */
     final Enumeration b;
-    
+
     /** @inheritDoc */
     public boolean hasMoreElements()
     {
       return a.hasMoreElements() || b.hasMoreElements();
     }
-    
+
     /** @inheritDoc */
     public Object nextElement()
     {
       return a.hasMoreElements() ? a.nextElement():b.nextElement();
     }
   }
-  
-  
+
+
   /**
    * The first attribute set.
    */
   final AttributeSet a;
-  
+
   /**
    * The second attribute set.
    */
   final AttributeSet b;
-  
+
   /**
    * Create the CombinedAttributes what search in the two sets. If any of the
    * two passed sets is null, another set is returned. Otherwise, the combined
    * attribute set is returned.
-   * 
+   *
    * @param primary the first set (searched first)
    * @param secondary the second set (searched later).
    */
@@ -122,10 +122,10 @@ public class CombinedAttributes implements AttributeSet, Serializable
     else
       return new CombinedAttributes(primary, secondary);
   }
-  
+
   /**
    * Create the CombinedAttributes what search in the two sets.
-   * 
+   *
    * @param primary the first set (searched first)
    * @param secondary the second set (searched later).
    */
@@ -170,7 +170,7 @@ public class CombinedAttributes implements AttributeSet, Serializable
     Object value = a.getAttribute(key);
     if (value == null)
       value = b.getAttribute(key);
-    
+
     return value;
   }
 
@@ -188,7 +188,7 @@ public class CombinedAttributes implements AttributeSet, Serializable
 
   /**
    * There is no one.
-   * 
+   *
    * @return null, always.
    */
   public AttributeSet getResolveParent()
diff --git a/libjava/classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java b/libjava/classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
index 862e690c928..ef3a1c6d1d5 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/ImageViewIconFactory.java
@@ -14,7 +14,7 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
  * icons as they would be described in the text (sheet of paper with image and
  * broken sheet of paper with image). They are not pixel to pixel identical and
  * contain elements from the metal icon factory.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class ImageViewIconFactory
@@ -22,10 +22,10 @@ public class ImageViewIconFactory
   private static Icon noImageIcon;
 
   private static Icon loadingImageIcon;
-  
+
   /**
    * This icon reflects the general concept (broken sheet of paper with
-   * image), but is currently not pixel to pixel identical with the Sun's 
+   * image), but is currently not pixel to pixel identical with the Sun's
    * implementation.
    */
   public static class NoImageIcon implements Icon, Serializable
@@ -40,7 +40,7 @@ public class ImageViewIconFactory
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
     public int getIconWidth()
@@ -50,7 +50,7 @@ public class ImageViewIconFactory
 
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
     public int getIconHeight()
@@ -60,7 +60,7 @@ public class ImageViewIconFactory
 
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c
      *          the component (ignored).
      * @param g
@@ -166,7 +166,7 @@ public class ImageViewIconFactory
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
     public int getIconWidth()
@@ -176,7 +176,7 @@ public class ImageViewIconFactory
 
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
     public int getIconHeight()
@@ -186,7 +186,7 @@ public class ImageViewIconFactory
 
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c
      *          the component (ignored).
      * @param g
@@ -219,7 +219,7 @@ public class ImageViewIconFactory
       g.drawLine(x + 21, y + 24, x + 21, y + 7);
       g.drawLine(x + 18, y + 2, x + 20, y + 4);
 
-      // Picture (house) 
+      // Picture (house)
 
       y += 3;
       x += 3;
diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/BorderStyle.java b/libjava/classpath/gnu/javax/swing/text/html/css/BorderStyle.java
index d75beea5247..3ccd3849136 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/BorderStyle.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/BorderStyle.java
@@ -59,6 +59,6 @@ public class BorderStyle
            || value.equals("solid") || value.equals("double")
            || value.equals("groove") || value.equals("ridge")
            || value.equals("inset") || value.equals("outset");
-           
+
   }
 }
diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/CSSParser.java b/libjava/classpath/gnu/javax/swing/text/html/css/CSSParser.java
index 1f8fdfa2258..4be315e3727 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/CSSParser.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/CSSParser.java
@@ -113,7 +113,7 @@ public class CSSParser
    *
    * @return true if the stylesheet could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseStylesheet()
@@ -137,7 +137,7 @@ public class CSSParser
    * Parses a CSS statement.
    * @return true if the stylesheet could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseStatement()
@@ -151,7 +151,7 @@ public class CSSParser
    *
    * @return true if the ruleset could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseRuleset()
@@ -232,7 +232,7 @@ public class CSSParser
    *
    * @return true if the ruleset could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseDeclaration()
@@ -282,7 +282,7 @@ public class CSSParser
             ret = false;
             error = "Expected colon to separate property and value";
           }
-          
+
       }
     else
       {
@@ -300,7 +300,7 @@ public class CSSParser
    *
    * @return true if the ruleset could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseValue(StringBuilder s)
@@ -321,7 +321,7 @@ public class CSSParser
    *
    * @return true if the ruleset could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseSelector(StringBuilder sel)
@@ -345,7 +345,7 @@ public class CSSParser
    *
    * @return true if the ruleset could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseAny(StringBuilder s)
@@ -389,7 +389,7 @@ public class CSSParser
    *
    * @return true if the at-rule could be parsed successfully,
    *         false otherwise
-   * 
+   *
    * @throws IOException if an IO or parse error occurs
    */
   private boolean parseAtRule()
diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/CSSScanner.java b/libjava/classpath/gnu/javax/swing/text/html/css/CSSScanner.java
index 9cc6209a549..37d54464189 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/CSSScanner.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/CSSScanner.java
@@ -485,7 +485,7 @@ class CSSScanner
       }
     else
       throw new CSSLexicalException("Escape must start with '\\'");
-    
+
   }
 
   private void readName()
@@ -595,7 +595,7 @@ class CSSScanner
       }
     // Push back last character read.
     lookahead[0] = ch;
-    
+
   }
 
   private void readURI()
@@ -642,7 +642,7 @@ class CSSScanner
       }
     if (ch == -1)
       throw new CSSLexicalException("Unterminated comment");
-    
+
     // Push back last character read.
     lookahead[0] = ch;
   }
@@ -675,7 +675,7 @@ class CSSScanner
             parseBuffer[tokenEnd] = (char) ch;
             tokenEnd++;
             ch = read();
-          }                            
+          }
       }
     else
       throw new CSSLexicalException("Invalid number");
diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
index 06d515c620f..97e5821945d 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
@@ -46,7 +46,7 @@ import java.util.StringTokenizer;
 
 /**
  * A CSS selector. This provides methods to interpret a selector and
- * query matches with an actual HTML element tree. 
+ * query matches with an actual HTML element tree.
  */
 public class Selector
 {
@@ -107,7 +107,7 @@ public class Selector
     // However, the CSS spec defines a couple of more sophisticated matches
     // which should be implemented.
     // http://www.w3.org/TR/CSS21/selector.html
-    
+
     // All parts of the selector must match at some point.
     boolean match = false;
     int numTags = tags.length;
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java b/libjava/classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java
index 273461a721e..9f3666d3a7e 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/GnuParserDelegator.java
@@ -53,8 +53,8 @@ import javax.swing.text.html.parser.TagElement;
 /**
  * This parser delegator uses the different DTD ({@link HTML_401Swing}).
  * It is derived from the ParserDelegator for the compatibility reasons.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class GnuParserDelegator extends ParserDelegator implements Serializable
 {
@@ -121,7 +121,7 @@ public class GnuParserDelegator extends ParserDelegator implements Serializable
    */
   private static final long serialVersionUID = -1276686502624777206L;
 
-  private DTD theDtd; 
+  private DTD theDtd;
 
   /**
    * The callback.
@@ -135,10 +135,10 @@ public class GnuParserDelegator extends ParserDelegator implements Serializable
    * This is package-private to avoid an accessor method.
    */
   gnuParser gnu;
-  
+
   /**
    * Create the parser that uses the given DTD to parse the document.
-   * 
+   *
    * @param theDtd the DTD
    */
   public GnuParserDelegator(DTD theDtd)
@@ -150,7 +150,7 @@ public class GnuParserDelegator extends ParserDelegator implements Serializable
   /**
    * Parses the HTML document, calling methods of the provided callback. This
    * method must be multithread - safe.
-   * 
+   *
    * @param reader The reader to read the HTML document from
    * @param a_callback The callback that is notifyed about the presence of HTML
    *          elements in the document.
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/HTML_401F.java b/libjava/classpath/gnu/javax/swing/text/html/parser/HTML_401F.java
index 5555412d01a..d4b061465ec 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/HTML_401F.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/HTML_401F.java
@@ -2499,7 +2499,7 @@ public class HTML_401F
         attr(VALUE, null, null, 0, IMPLIED)
       }
     );
-      
+
       // Headers in the paragraph are not allowed.
       defElement(P, 0, false, true, new ContentModel( 0,
        new noTagModel(new String[] { P, H1, H2, H3, H4, H5, H6 }), null),
@@ -3775,7 +3775,7 @@ public class HTML_401F
     li.type = ul.type = ol.type = '|';
     return li;
   }
-  
+
   /**
    * Get elements that are allowed in the document body, at the zero level.
    */
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java b/libjava/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
index 930a324f9b7..8739ad45307 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/SmallHtmlAttributeSet.java
@@ -50,18 +50,18 @@ import javax.swing.text.html.HTML.Tag;
  * Small fixed HTML attribute set. The most of the HTML elements contain only
  * several attributes. With four attributes, the number of operations in more
  * complex algorithms is not larger than using the naive algorithm.
- * 
+ *
  * Same as HtmlAttributeSet, this set allows both strings and non-string as
  * keys. The strings are case insensitive, the non strings are compared with
  * .equals.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class SmallHtmlAttributeSet
     implements AttributeSet, Cloneable, Serializable
 {
   private static final long serialVersionUID = 1;
-  
+
   /**
    * The keys, stored in this attribute set.
    */
@@ -80,7 +80,7 @@ public class SmallHtmlAttributeSet
   /**
    * Create a new small fixed attribute set that contains the unchangeable copy
    * of the passed attribute set and inherits its parent.
-   * 
+   *
    * @param copyFrom the attribute set, containing the attribute values to copy.
    */
   public SmallHtmlAttributeSet(AttributeSet copyFrom)
@@ -143,7 +143,7 @@ public class SmallHtmlAttributeSet
   /**
    * Get the attribute value, matching this key. If not found in this set, the
    * call is delegated to parent.
-   * 
+   *
    * @return the value, matching key (or null if none).
    */
   public Object getAttribute(Object key)
@@ -218,7 +218,7 @@ public class SmallHtmlAttributeSet
       }
     };
   }
-  
+
   /**
    * Get the parent that this set uses to resolve the not found attributes.
    */
@@ -226,7 +226,7 @@ public class SmallHtmlAttributeSet
   {
     return parent;
   }
-  
+
   /**
    * Check if the given attribute is defined in this set (not in the parent).
    */
@@ -242,7 +242,7 @@ public class SmallHtmlAttributeSet
       }
     return false;
   }
-  
+
   /**
    * Check this set and another set for equality by content.
    */
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java b/libjava/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java
index b89eec619bb..7eb0f616e4a 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/htmlAttributeSet.java
@@ -46,7 +46,7 @@ import javax.swing.text.html.HTML;
 
 /**
  * A set, adapted to store HTML attributes.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class htmlAttributeSet
@@ -54,13 +54,13 @@ public class htmlAttributeSet
 {
   public static final htmlAttributeSet EMPTY_HTML_ATTRIBUTE_SET =
     new htmlAttributeSet();
-  
+
   AttributeSet parent;
 
   /**
    * Looks in this set and, if not found, later looks in the parent set. Calls
    * toString(), allowing to pass as HTML.Attribute, as String to this method.
-   * 
+   *
    * @param _key A key to search for a value.
    * @return The value, if one is defined.
    */
@@ -119,7 +119,7 @@ public class htmlAttributeSet
 
   /**
    * Set the parent set, containing the default values.
-   * 
+   *
    * @param a_parent
    */
   public void setResolveParent(AttributeSet a_parent)
@@ -129,7 +129,7 @@ public class htmlAttributeSet
 
   /**
    * Get the parent set, containing the default values.
-   * 
+   *
    * @return the parent, used to resolve the attributes.
    */
   public AttributeSet getResolveParent()
@@ -139,7 +139,7 @@ public class htmlAttributeSet
 
   /**
    * Add the attribute to this attribute set.
-   * 
+   *
    * @param key Attribute key (if string, it will be case insensitive)
    * @param value Attribute value
    */
@@ -164,11 +164,11 @@ public class htmlAttributeSet
       return new SmallHtmlAttributeSet(this);
     else
       return (AttributeSet) clone();
-  }   
-  
+  }
+
   /**
    * Returns a clone of the attribute set.
-   * 
+   *
    * @return A clone of the attribute set.
    */
   public Object clone()
@@ -179,5 +179,5 @@ public class htmlAttributeSet
     if (parent != null)
       set.setResolveParent(parent);
     return set;
-  }  
+  }
 }
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java b/libjava/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
index 7f16f1f2dba..2b624cc3c02 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java
@@ -178,7 +178,7 @@ public abstract class htmlValidator
 
                 // If the tag has a content model defined, forcibly close all
                 // tags that were opened after the tag being currently closed.
-                closing: 
+                closing:
                 if (x.element.content != null)
                   {
                     iter = stack.listIterator(stack.size());
@@ -272,7 +272,7 @@ public abstract class htmlValidator
           {
             if (!stack.isEmpty())
               {
-                closing: 
+                closing:
                 do
                   {
                     hTag last = (hTag) stack.getLast();
@@ -311,7 +311,7 @@ public abstract class htmlValidator
    * content model recommends to insert making the situation ok. If Boolean.True
    * is returned, the content model current position is moved forward. Otherwise
    * this position remains the same.
-   * 
+   *
    * @param tElement
    * @return
    */
@@ -503,9 +503,9 @@ public abstract class htmlValidator
       {
         CPStringBuilder valid =
           new CPStringBuilder("The tag <" + tag.getHTMLTag() +
-			      "> cannot contain the attribute '" + foundAttribute +
-			      "'. The valid attributes for this tag are: "
-			      );
+                              "> cannot contain the attribute '" + foundAttribute +
+                              "'. The valid attributes for this tag are: "
+                              );
 
         AttributeList a = tag.getElement().getAttributes();
 
@@ -551,18 +551,18 @@ public abstract class htmlValidator
         if (dtdAttribute.values.size() == 1)
           valid =
             new CPStringBuilder("The attribute '" + foundAttribute +
-				"' of the tag <" + tag.getHTMLTag() +
-				"> cannot have the value '" + value +
-				"'. The only valid value is "
-				);
+                                "' of the tag <" + tag.getHTMLTag() +
+                                "> cannot have the value '" + value +
+                                "'. The only valid value is "
+                                );
         else
           valid =
             new CPStringBuilder("The attribute '" + foundAttribute +
-				"' of the tag <" + tag.getHTMLTag() +
-				"> cannot have the value '" + value + "'. The " +
-				dtdAttribute.values.size() +
-				" valid values are: "
-				);
+                                "' of the tag <" + tag.getHTMLTag() +
+                                "> cannot have the value '" + value + "'. The " +
+                                dtdAttribute.values.size() +
+                                " valid values are: "
+                                );
 
         Enumeration vv = dtdAttribute.values.elements();
         while (vv.hasMoreElements())
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/models/list.java b/libjava/classpath/gnu/javax/swing/text/html/parser/models/list.java
index c303ae8571d..1ff22f8cd27 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/models/list.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/models/list.java
@@ -156,7 +156,7 @@ public class list
         matched = false;
         x = tokens [ i ];
 
-        nodescan: 
+        nodescan:
         for (int j = 0; j < nodes.length; j++)
           {
             if (!nodes [ j ].isClosed())
@@ -204,7 +204,7 @@ public class list
   public boolean performMatch(Object token)
   {
     boolean ok = false;
-    Matching: 
+    Matching:
     for (int i = 0; i < nodes.length; i++)
       {
         ok = nodes [ i ].performMatch(token);
@@ -248,7 +248,7 @@ public class list
     boolean m;
     boolean matched = false;
 
-    nodescan: 
+    nodescan:
     for (int j = 0; j < nodes.length; j++)
       {
         if (!nodes [ j ].isClosed())
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
index b087c3c003c..cdefb75c882 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
@@ -400,7 +400,7 @@ public class Parser
     if (start.kind == EOF)
       return;
 
-    read: 
+    read:
     while (true)
       {
         t = getTokenAhead();
@@ -446,7 +446,7 @@ public class Parser
     Token t;
     Token last;
 
-    comment: 
+    comment:
     while (true)
       {
         t = getTokenAhead();
@@ -525,7 +525,7 @@ public class Parser
     restOfTag(false, name, start);
 
     buffer.setLength(0);
- 
+
     while (!SCRIPT_CLOSE.matches(this))
       {
         append(getNextToken());
@@ -554,7 +554,7 @@ public class Parser
         mustBe(EXCLAMATION);
 
         buffer.setLength(0);
-        read: 
+        read:
         while (true)
           {
             t = getNextToken();
@@ -607,7 +607,7 @@ public class Parser
     restOfTag(false, name, start);
 
     buffer.setLength(0);
- 
+
     while (!STYLE_CLOSE.matches(this))
       {
         append(getNextToken());
@@ -944,7 +944,7 @@ public class Parser
 
     optional(WS);
 
-    attributeReading: 
+    attributeReading:
       while (getTokenAhead().kind == NUMTOKEN)
       {
         name = getNextToken();
@@ -1012,7 +1012,7 @@ public class Parser
               case SLASH:
                 value = next;
                 optional(WS);
-                
+
                 // Check maybe the opening quote is missing.
                 next = getTokenAhead();
                 if (bQUOTING.get(next.kind))
@@ -1289,7 +1289,7 @@ public class Parser
     int closeAt = 0;
     buffer.setLength(0);
 
-    ahead: 
+    ahead:
     for (int i = 1; i < 100; i++)
       {
         t = getTokenAhead(i - 1);
@@ -1356,7 +1356,7 @@ public class Parser
                        throws ParseException
   {
     buffer.setLength(0);
-    read: 
+    read:
     while (true)
       {
         t = getNextToken();
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
index 80bb333a528..45ac181b3d4 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
@@ -247,7 +247,7 @@ public class ReaderTokenizer
   {
     if (numberOfTokens <= 0)
       return;
- 
+
     for (int i = 0; i < numberOfTokens; i++)
       readToken();
   }
@@ -261,7 +261,7 @@ public class ReaderTokenizer
     Token t;
     int ch;
 
-    enlarging: 
+    enlarging:
     while (true)
       {
         t = tokenMatches();
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
index 0cb6d7a59f3..22c44be4f3b 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
@@ -51,7 +51,7 @@ public class textPreProcessor
    * Pre - process non-preformatted text. \t, \r and \n mutate into spaces, then
    * multiple spaces mutate into single one, all whitespace around tags is
    * consumed. The content of the passed buffer is destroyed.
-   * 
+   *
    * @param a_text A text to pre-process.
    */
   public char[] preprocess(StringBuffer a_text)
diff --git a/libjava/classpath/gnu/javax/swing/tree/GnuPath.java b/libjava/classpath/gnu/javax/swing/tree/GnuPath.java
index dd576e8d3e9..568ffd10288 100644
--- a/libjava/classpath/gnu/javax/swing/tree/GnuPath.java
+++ b/libjava/classpath/gnu/javax/swing/tree/GnuPath.java
@@ -43,7 +43,7 @@ import javax.swing.tree.TreePath;
 /**
  * The tree path with additional data. Needed for the optimized tree drawing.
  * Returned by layout caches.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class GnuPath extends TreePath
@@ -52,10 +52,10 @@ public class GnuPath extends TreePath
    * The flag, marking the last visible child.
    */
   public boolean isLastChild;
-  
+
   /**
    * Create a new path, specifying flag if this path is the path to the
-   * last visible child (needed for optimized tree drawing). 
+   * last visible child (needed for optimized tree drawing).
    */
   public GnuPath(Object[] path, boolean lastChild)
   {
diff --git a/libjava/classpath/gnu/test/Fail.java b/libjava/classpath/gnu/test/Fail.java
index f1c4a0cd2de..b3a032077ad 100644
--- a/libjava/classpath/gnu/test/Fail.java
+++ b/libjava/classpath/gnu/test/Fail.java
@@ -1,4 +1,4 @@
-/* Fail.java -- Result code returned when test failed but was expected to 
+/* Fail.java -- Result code returned when test failed but was expected to
    Copyright (c) 1998 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/test/Pass.java b/libjava/classpath/gnu/test/Pass.java
index abec54ef602..fbbd3b29f23 100644
--- a/libjava/classpath/gnu/test/Pass.java
+++ b/libjava/classpath/gnu/test/Pass.java
@@ -1,4 +1,4 @@
-/* Pass.java -- Result code returned when test passed and was excepted to 
+/* Pass.java -- Result code returned when test passed and was excepted to
    Copyright (c) 1998 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/test/Test.java b/libjava/classpath/gnu/test/Test.java
index 6b2e18df1a0..f60c6dffc25 100644
--- a/libjava/classpath/gnu/test/Test.java
+++ b/libjava/classpath/gnu/test/Test.java
@@ -41,7 +41,7 @@ package gnu.test;
  * Interface which all GNU Classpath tests must implement.
  * The method test is invoked once for each test.
  */
-public interface Test 
+public interface Test
 {
   /**
    * Returns the name of the test.
diff --git a/libjava/classpath/gnu/test/Unsupported.java b/libjava/classpath/gnu/test/Unsupported.java
index c6dabb09af7..a1ad03290f9 100644
--- a/libjava/classpath/gnu/test/Unsupported.java
+++ b/libjava/classpath/gnu/test/Unsupported.java
@@ -40,7 +40,7 @@ package gnu.test;
 /**
  * Test does not have the required support to run.  For example,
  * Unsupported could be returned when a needed resource
- * (ie. multicasting) is not available.  
+ * (ie. multicasting) is not available.
  */
 public class Unsupported extends Result
 {
diff --git a/libjava/classpath/gnu/xml/aelfred2/JAXPFactory.java b/libjava/classpath/gnu/xml/aelfred2/JAXPFactory.java
index 011ca3c6a3d..0944427657f 100644
--- a/libjava/classpath/gnu/xml/aelfred2/JAXPFactory.java
+++ b/libjava/classpath/gnu/xml/aelfred2/JAXPFactory.java
@@ -1,4 +1,4 @@
-/* JAXPFactory.java -- 
+/* JAXPFactory.java --
    Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,7 +63,7 @@ import javax.xml.parsers.SAXParserFactory;
 public final class JAXPFactory
   extends SAXParserFactory
 {
-  
+
   private Hashtable flags = new Hashtable();
 
   /**
@@ -86,7 +86,7 @@ public final class JAXPFactory
     parser.setFeature(SAXDriver.FEATURE + "validation",
                       isValidating());
     // that makes SAX2 feature flags trump JAXP
-    
+
     while (e.hasMoreElements())
       {
         String uri = (String) e.nextElement();
@@ -98,8 +98,8 @@ public final class JAXPFactory
   }
 
   // yes, this "feature transfer" mechanism doesn't play well
-  
-  public void setFeature(String name, boolean value) 
+
+  public void setFeature(String name, boolean value)
     throws ParserConfigurationException, SAXNotRecognizedException,
            SAXNotSupportedException
   {
@@ -108,7 +108,7 @@ public final class JAXPFactory
         // force "early" detection of errors where possible
         // (flags can't necessarily be set before parsing)
         new JaxpParser().getXMLReader().setFeature(name, value);
-        
+
         flags.put(name, Boolean.valueOf(value));
       }
     catch (SAXNotRecognizedException e)
@@ -127,12 +127,12 @@ public final class JAXPFactory
       }
   }
 
-  public boolean getFeature(String name) 
+  public boolean getFeature(String name)
     throws ParserConfigurationException, SAXNotRecognizedException,
            SAXNotSupportedException
   {
     Boolean value = (Boolean) flags.get(name);
-    
+
     if (value != null)
       {
         return value.booleanValue();
@@ -159,25 +159,25 @@ public final class JAXPFactory
           }
       }
   }
-           
+
   private static class JaxpParser
     extends SAXParser
   {
-    
+
     private XmlReader ae2 = new XmlReader();
     private XMLReaderAdapter parser = null;
-    
+
     JaxpParser()
     {
     }
 
-    public void setProperty(String id, Object value) 
+    public void setProperty(String id, Object value)
       throws SAXNotRecognizedException, SAXNotSupportedException
     {
       ae2.setProperty(id, value);
     }
 
-    public Object getProperty(String id) 
+    public Object getProperty(String id)
       throws SAXNotRecognizedException, SAXNotSupportedException
     {
       return ae2.getProperty(id);
@@ -210,7 +210,7 @@ public final class JAXPFactory
           throw new Error();
         }
     }
-    
+
     public boolean isValidating()
     {
       try
@@ -222,10 +222,9 @@ public final class JAXPFactory
           throw new Error();
         }
     }
-    
-    // TODO isXIncludeAware()
-    
-  }
-  
-}
 
+    // TODO isXIncludeAware()
+
+  }
+
+}
diff --git a/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java b/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java
index e7c4d5a3f64..6ce14707bf7 100644
--- a/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java
+++ b/libjava/classpath/gnu/xml/aelfred2/SAXDriver.java
@@ -1,4 +1,4 @@
-/* SAXDriver.java -- 
+/* SAXDriver.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -80,45 +80,45 @@ import org.xml.sax.helpers.NamespaceSupport;
  *
  * 
  * 
- *	
- *	
+ *      
+ *      
  *
  * 
  *
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
- *	
+ *      
  *
  * 
  *
  * 
- *	
+ *      
  * 
- *	
+ *      
  * 
        NameNotes
        NameNotes
        Features ... URL prefix is
  * http://xml.org/sax/features/
        (URL)/external-general-entitiesValue defaults to true
        Value defaults to true
        (URL)/external-parameter-entitiesValue defaults to true
        Value defaults to true
        (URL)/is-standalone(PRELIMINARY) Returns true iff the document's parsing
- *	has started (some non-error event after startDocument()
- *	was reported) and the document's standalone flag is set.
        (PRELIMINARY) Returns true iff the document's parsing
+ *      has started (some non-error event after startDocument()
+ *      was reported) and the document's standalone flag is set.
        (URL)/namespace-prefixesValue defaults to false (but XML 1.0 names are
- *		always reported)
        Value defaults to false (but XML 1.0 names are
+ *              always reported)
        (URL)/lexical-handler/parameter-entitiesValue is fixed at true
        Value is fixed at true
        (URL)/namespacesValue defaults to true
        Value defaults to true
        (URL)/resolve-dtd-uris(PRELIMINARY) Value defaults to true
        (PRELIMINARY) Value defaults to true
        (URL)/string-interningValue is fixed at true
        Value is fixed at true
        (URL)/use-attributes2(PRELIMINARY) Value is fixed at true
        (PRELIMINARY) Value is fixed at true
        (URL)/use-entity-resolver2(PRELIMINARY) Value defaults to true
        (PRELIMINARY) Value defaults to true
        (URL)/validationValue is fixed at false
        Value is fixed at false
        Handler Properties ... URL prefix is
  * http://xml.org/sax/properties/
        (URL)/declaration-handlerA declaration handler may be provided.  
        A declaration handler may be provided.  
        (URL)/lexical-handlerA lexical handler may be provided.  
        A lexical handler may be provided.  
        
  *
  * 
        This parser currently implements the SAX1 Parser API, but
@@ -131,10 +131,10 @@ import org.xml.sax.helpers.NamespaceSupport;
 final public class SAXDriver
   implements Locator, Attributes2, XMLReader, Parser, AttributeList
 {
-  
+
   private final DefaultHandler2 base = new DefaultHandler2();
   private XmlParser parser;
-  
+
   private EntityResolver entityResolver = base;
   private EntityResolver2 resolver2 = null;
   private ContentHandler contentHandler = base;
@@ -142,28 +142,28 @@ final public class SAXDriver
   private ErrorHandler errorHandler = base;
   private DeclHandler declHandler = base;
   private LexicalHandler lexicalHandler = base;
-  
+
   private String elementName;
   private Stack entityStack;
-  
+
   // one vector (of object/struct): faster, smaller
   private List attributesList;
-  
+
   private boolean namespaces = true;
   private boolean xmlNames = false;
   private boolean extGE = true;
   private boolean extPE = true;
   private boolean resolveAll = true;
   private boolean useResolver2 = true;
-  
+
   // package private to allow (read-only) access in XmlParser
   boolean stringInterning = true;
-  
+
   private int attributeCount;
   private boolean attributes;
   private String[] nsTemp;
   private NamespaceSupport prefixStack;
-  
+
   //
   // Constructor.
   //
@@ -355,12 +355,12 @@ final public class SAXDriver
             throw new IllegalStateException();
           }
         parser.setHandler(this);
-        
+
         try
           {
             Reader r = source.getCharacterStream();
             InputStream in = source.getByteStream();
-                        
+
             parser.doParse(source.getSystemId(),
                            source.getPublicId(),
                            r,
@@ -430,7 +430,7 @@ final public class SAXDriver
       {
         return extPE;
       }
-    
+
     // element/attribute names are as written in document; no mangling
     if ((FEATURE + "namespace-prefixes").equals(featureId))
       {
@@ -454,15 +454,15 @@ final public class SAXDriver
       {
         return stringInterning;
       }
-  
+
     // EXTENSIONS 1.1
-    
+
     // always returns isSpecified info
     if ((FEATURE + "use-attributes2").equals(featureId))
       {
         return true;
       }
-  
+
     // meaningful between startDocument/endDocument
     if ((FEATURE + "is-standalone").equals(featureId))
       {
@@ -484,7 +484,7 @@ final public class SAXDriver
       {
         return useResolver2;
       }
-  
+
     throw new SAXNotRecognizedException(featureId);
   }
 
@@ -518,7 +518,7 @@ final public class SAXDriver
       {
         return (lexicalHandler == base) ? null : lexicalHandler;
       }
-    
+
     // unknown properties
     throw new SAXNotRecognizedException(propertyId);
   }
@@ -531,10 +531,10 @@ final public class SAXDriver
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     boolean state;
-  
+
     // Features with a defined value, we just change it if we can.
     state = getFeature (featureId);
-    
+
     if (state == value)
       {
         return;
@@ -601,9 +601,9 @@ final public class SAXDriver
   {
     // see if the property is recognized
     getProperty(propertyId);
-    
+
     // Properties with a defined value, we just change it if we can.
-    
+
     if ((PROPERTY + "declaration-handler").equals(propertyId))
       {
         if (value == null)
@@ -620,7 +620,7 @@ final public class SAXDriver
           }
         return ;
       }
-    
+
     if ((PROPERTY + "lexical-handler").equals(propertyId))
       {
         if (value == null)
@@ -637,7 +637,7 @@ final public class SAXDriver
           }
         return;
       }
-    
+
     throw new SAXNotSupportedException(propertyId);
   }
 
@@ -676,7 +676,7 @@ final public class SAXDriver
     throws SAXException, IOException
   {
     InputSource  source;
-    
+
     // external entities might be skipped
     if (isPE && !extPE)
       {
@@ -724,7 +724,7 @@ final public class SAXDriver
     // FIXME normalize system IDs -- when?
     // - Convert to UTF-8
     // - Map reserved and non-ASCII characters to %HH
-    
+
     try
       {
         if (baseURI == null)
@@ -749,7 +749,7 @@ final public class SAXDriver
           {
             throw e;
           }
-        
+
         // sometimes sysids for notations or unparsed entities
         // aren't really URIs...
         warn("Can't absolutize SYSTEM id: " + e.getMessage());
@@ -800,15 +800,15 @@ final public class SAXDriver
     throws SAXException
   {
     lexicalHandler.startDTD(name, publicId, systemId);
-  
+
     // ... the "name" is a declaration and should be given
     // to the DeclHandler (but sax2 doesn't).
-    
+
     // the IDs for the external subset are lexical details,
     // as are the contents of the internal subset; but sax2
     // doesn't provide the internal subset "pre-parse"
   }
-  
+
   void notationDecl(String name, String publicId, String systemId,
                     String baseUri)
     throws SAXException
@@ -857,7 +857,7 @@ final public class SAXDriver
   {
     int index = uri.indexOf(':');
 
-    // many versions of nwalsh docbook stylesheets 
+    // many versions of nwalsh docbook stylesheets
     // have bogus URLs; so this can't be an error...
     if (index < 1 && uri.length() != 0)
       {
@@ -866,7 +866,7 @@ final public class SAXDriver
 
     // FIXME:  char [0] must be ascii alpha; chars [1..index]
     // must be ascii alphanumeric or in "+-." [RFC 2396]
-    
+
     //Namespace Constraints
     //name for xml prefix must be http://www.w3.org/XML/1998/namespace
     boolean prefixEquality = prefix.equals("xml");
@@ -876,13 +876,13 @@ final public class SAXDriver
         fatal("xml is by definition bound to the namespace name " +
               "http://www.w3.org/XML/1998/namespace");
       }
-  
+
     //xmlns prefix declaration is illegal but xml prefix declaration is llegal...
     if (prefixEquality && uriEquality)
       {
         return;
       }
-  
+
     //name for xmlns prefix must be http://www.w3.org/2000/xmlns/
     prefixEquality = prefix.equals("xmlns");
     uriEquality = uri.equals("http://www.w3.org/2000/xmlns/");
@@ -891,14 +891,14 @@ final public class SAXDriver
         fatal("http://www.w3.org/2000/xmlns/ is by definition bound" +
               " to prefix xmlns");
       }
-  
+
     //even if the uri is http://www.w3.org/2000/xmlns/
     // it is illegal to declare it
     if (prefixEquality && uriEquality)
       {
         fatal ("declaring the xmlns prefix is illegal");
       }
-  
+
     uri = uri.intern();
     prefixStack.declarePrefix(prefix, uri);
     contentHandler.startPrefixMapping(prefix, uri);
@@ -915,13 +915,13 @@ final public class SAXDriver
             prefixStack.pushContext();
           }
       }
-    
+
     // process namespace decls immediately;
     // then maybe forget this as an attribute
     if (namespaces)
       {
         int index;
-        
+
         // default NS declaration?
         if (stringInterning)
           {
@@ -938,11 +938,11 @@ final public class SAXDriver
                      && qname.startsWith("xmlns"))
               {
                 String prefix = qname.substring(6);
-              
+
                 if (prefix.equals(""))
                   {
                     fatal("missing prefix " +
-                          "in namespace declaration attribute");  
+                          "in namespace declaration attribute");
                   }
                 if (value.length() == 0)
                   {
@@ -974,7 +974,7 @@ final public class SAXDriver
                      && qname.startsWith("xmlns"))
               {
                 String prefix = qname.substring(6);
-                
+
                 if (value.length() == 0)
                   {
                     verror("missing URI in namespace decl attribute: "
@@ -993,12 +993,12 @@ final public class SAXDriver
       }
     // remember this attribute ...
     attributeCount++;
-    
+
     // attribute type comes from querying parser's DTD records
     attributesList.add(new Attribute(qname, value, isSpecified));
-    
+
   }
-  
+
   void startElement(String elname)
     throws SAXException
   {
@@ -1016,7 +1016,7 @@ final public class SAXDriver
     // String.hashCode() (1.5%) and about 1.3% each for pushing
     // the context, and two chunks of name processing.
     //
-    
+
     if (!attributes)
       {
         if (namespaces)
@@ -1026,7 +1026,7 @@ final public class SAXDriver
       }
     else if (namespaces)
       {
-      
+
         // now we can patch up namespace refs; we saw all the
         // declarations, so now we'll do the Right Thing
         Iterator itt = attributesList.iterator();
@@ -1035,7 +1035,7 @@ final public class SAXDriver
             Attribute attribute = (Attribute) itt.next();
             String qname = attribute.name;
             int index;
-            
+
             // default NS declaration?
             if (stringInterning)
               {
@@ -1059,13 +1059,13 @@ final public class SAXDriver
                       "character are invalid");
               }
             index = qname.indexOf(':');
-            
+
             // NS prefix declaration?
             if (index == 5 && qname.startsWith("xmlns"))
               {
                 continue;
               }
-            
+
             // it's not a NS decl; patch namespace info items
             if (prefixStack.processName(qname, nsTemp, true) == null)
               {
@@ -1078,7 +1078,7 @@ final public class SAXDriver
               }
           }
       }
-    
+
     // save element name so attribute callbacks work
     elementName = elname;
     if (namespaces)
@@ -1095,7 +1095,7 @@ final public class SAXDriver
         handler.startElement("", "", elname, this);
       }
     // elementName = null;
-    
+
     // elements with no attributes are pretty common!
     if (attributes)
       {
@@ -1104,7 +1104,7 @@ final public class SAXDriver
         attributes = false;
       }
   }
-  
+
   void endElement(String elname)
     throws SAXException
   {
@@ -1117,9 +1117,9 @@ final public class SAXDriver
       }
     prefixStack.processName(elname, nsTemp, false);
     handler.endElement(nsTemp[0], nsTemp[1], elname);
-    
+
     Enumeration prefixes = prefixStack.getDeclaredPrefixes();
-    
+
     while (prefixes.hasMoreElements())
       {
         handler.endPrefixMapping((String) prefixes.nextElement());
@@ -1170,7 +1170,7 @@ final public class SAXDriver
     throws SAXException
   {
     SAXParseException fatal;
-  
+
     fatal = new SAXParseException(message, this);
     errorHandler.fatalError(fatal);
 
@@ -1184,16 +1184,16 @@ final public class SAXDriver
     throws SAXException
   {
     SAXParseException err;
-    
+
     err = new SAXParseException(message, this);
     errorHandler.error(err);
   }
-  
+
   void warn(String message)
     throws SAXException
   {
     SAXParseException err;
-  
+
     err = new SAXParseException(message, this);
     errorHandler.warning(err);
   }
@@ -1307,7 +1307,7 @@ final public class SAXDriver
   public int getIndex(String uri, String local)
     {
       int length = getLength();
-      
+
       for (int i = 0; i < length; i++)
         {
           if (!getURI(i).equals(uri))
@@ -1328,7 +1328,7 @@ final public class SAXDriver
   public int getIndex(String xmlName)
   {
     int length = getLength();
-    
+
     for (int i = 0; i < length; i++)
       {
         if (getQName(i).equals(xmlName))
@@ -1345,7 +1345,7 @@ final public class SAXDriver
   public String getType(String uri, String local)
   {
     int index = getIndex(uri, local);
-    
+
     if (index < 0)
       {
         return null;
@@ -1360,7 +1360,7 @@ final public class SAXDriver
   public String getType(String xmlName)
   {
     int index = getIndex(xmlName);
-    
+
     if (index < 0)
       {
         return null;
@@ -1374,7 +1374,7 @@ final public class SAXDriver
   public String getValue(String uri, String local)
   {
     int index = getIndex(uri, local);
-    
+
     if (index < 0)
       {
         return null;
@@ -1389,7 +1389,7 @@ final public class SAXDriver
   public String getValue(String xmlName)
   {
     int index = getIndex(xmlName);
-    
+
     if (index < 0)
       {
         return null;
@@ -1404,7 +1404,7 @@ final public class SAXDriver
   /** @return false unless the attribute was declared in the DTD.
    * @throws java.lang.ArrayIndexOutOfBoundsException
    *   When the supplied index does not identify an attribute.
-   */  
+   */
   public boolean isDeclared(int index)
   {
     if (index < 0 || index >= attributeCount)
@@ -1513,7 +1513,7 @@ final public class SAXDriver
   private static class Adapter
     implements ContentHandler
   {
-    
+
     private DocumentHandler docHandler;
 
     Adapter(DocumentHandler dh)
@@ -1525,19 +1525,19 @@ final public class SAXDriver
     {
       docHandler.setDocumentLocator(l);
     }
-  
+
     public void startDocument()
       throws SAXException
     {
       docHandler.startDocument();
     }
-  
+
     public void processingInstruction(String target, String data)
       throws SAXException
     {
       docHandler.processingInstruction(target, data);
     }
-  
+
     public void startPrefixMapping(String prefix, String uri)
     {
       /* ignored */
@@ -1589,13 +1589,13 @@ final public class SAXDriver
 
   private static class Attribute
   {
-    
+
     String name;
     String value;
     String nameSpace;
     String localName;
     boolean specified;
-    
+
     Attribute(String name, String value, boolean specified)
     {
       this.name = name;
@@ -1603,7 +1603,7 @@ final public class SAXDriver
       this.nameSpace = "";
       this.specified = specified;
     }
-    
+
   }
 
 }
diff --git a/libjava/classpath/gnu/xml/aelfred2/XmlParser.java b/libjava/classpath/gnu/xml/aelfred2/XmlParser.java
index c0fd8027c21..813593d93d4 100644
--- a/libjava/classpath/gnu/xml/aelfred2/XmlParser.java
+++ b/libjava/classpath/gnu/xml/aelfred2/XmlParser.java
@@ -1,4 +1,4 @@
-/* XmlParser.java -- 
+/* XmlParser.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -81,7 +81,7 @@ import org.xml.sax.SAXException;
  * internal parser interfaces are subject to change.
  *
  * @author Written by David Megginson <dmeggins@microstar.com>
- *	(version 1.2a with bugfixes)
+ *      (version 1.2a with bugfixes)
  * @author Updated by David Brownell <dbrownell@users.sourceforge.net>
  * @see SAXDriver
  */
@@ -94,74 +94,74 @@ final class XmlParser
   ////////////////////////////////////////////////////////////////////////
   // Constants.
   ////////////////////////////////////////////////////////////////////////
-  
+
   //
   // Constants for element content type.
   //
-  
+
   /**
    * Constant: an element has not been declared.
    * @see #getElementContentType
    */
   public final static int CONTENT_UNDECLARED = 0;
-  
+
   /**
    * Constant: the element has a content model of ANY.
    * @see #getElementContentType
    */
   public final static int CONTENT_ANY = 1;
-  
+
   /**
    * Constant: the element has declared content of EMPTY.
    * @see #getElementContentType
    */
   public final static int CONTENT_EMPTY = 2;
-  
+
   /**
    * Constant: the element has mixed content.
    * @see #getElementContentType
    */
   public final static int CONTENT_MIXED = 3;
-  
+
   /**
    * Constant: the element has element content.
    * @see #getElementContentType
    */
   public final static int CONTENT_ELEMENTS = 4;
-  
-  
+
+
   //
   // Constants for the entity type.
   //
-  
+
   /**
    * Constant: the entity has not been declared.
    * @see #getEntityType
    */
   public final static int ENTITY_UNDECLARED = 0;
-  
+
   /**
    * Constant: the entity is internal.
    * @see #getEntityType
    */
   public final static int ENTITY_INTERNAL = 1;
-  
+
   /**
    * Constant: the entity is external, non-parsable data.
    * @see #getEntityType
    */
   public final static int ENTITY_NDATA = 2;
-  
+
   /**
    * Constant: the entity is external XML data.
    * @see #getEntityType
    */
   public final static int ENTITY_TEXT = 3;
-    
+
   //
   // Attribute type constants are interned literal strings.
   //
-  
+
   //
   // Constants for supported encodings.  "external" is just a flag.
   //
@@ -175,43 +175,43 @@ final class XmlParser
   private final static int ENCODING_UCS_4_2143 = 7;
   private final static int ENCODING_UCS_4_3412 = 8;
   private final static int ENCODING_ASCII = 9;
-  
+
   //
   // Constants for attribute default value.
   //
-  
+
   /**
    * Constant: the attribute is not declared.
    * @see #getAttributeDefaultValueType
    */
   public final static int ATTRIBUTE_DEFAULT_UNDECLARED = 30;
-  
+
   /**
    * Constant: the attribute has a literal default value specified.
    * @see #getAttributeDefaultValueType
    * @see #getAttributeDefaultValue
    */
   public final static int ATTRIBUTE_DEFAULT_SPECIFIED = 31;
-  
+
   /**
    * Constant: the attribute was declared #IMPLIED.
    * @see #getAttributeDefaultValueType
    */
   public final static int ATTRIBUTE_DEFAULT_IMPLIED = 32;
-  
+
   /**
    * Constant: the attribute was declared #REQUIRED.
    * @see #getAttributeDefaultValueType
    */
   public final static int ATTRIBUTE_DEFAULT_REQUIRED = 33;
-  
+
   /**
    * Constant: the attribute was declared #FIXED.
    * @see #getAttributeDefaultValueType
    * @see #getAttributeDefaultValue
    */
   public final static int ATTRIBUTE_DEFAULT_FIXED = 34;
-    
+
   //
   // Constants for input.
   //
@@ -219,7 +219,7 @@ final class XmlParser
   private final static int INPUT_INTERNAL = 1;
   private final static int INPUT_STREAM = 3;
   private final static int INPUT_READER = 5;
-  
+
   //
   // Flags for reading literals.
   //
@@ -227,7 +227,7 @@ final class XmlParser
   private final static int LIT_ENTITY_REF = 2;
   // normalize this value (space chars) (attributes, public ids)
   private final static int LIT_NORMALIZE = 4;
-  // literal is an attribute value 
+  // literal is an attribute value
   private final static int LIT_ATTRIBUTE = 8;
   // don't expand parameter entities
   private final static int LIT_DISABLE_PE = 16;
@@ -235,30 +235,30 @@ final class XmlParser
   private final static int LIT_DISABLE_CREF = 32;
   // don't parse general entity refs
   private final static int LIT_DISABLE_EREF = 64;
-  // literal is a public ID value 
+  // literal is a public ID value
   private final static int LIT_PUBID = 256;
-    
+
   //
   // Flags affecting PE handling in DTDs (if expandPE is true).
   // PEs expand with space padding, except inside literals.
   //
   private final static int CONTEXT_NORMAL = 0;
   private final static int CONTEXT_LITERAL = 1;
-  
+
   // Emit warnings for relative URIs with no base URI.
   static boolean uriWarnings;
   static
   {
     String key = "gnu.xml.aelfred2.XmlParser.uriWarnings";
     GetPropertyAction a = new GetPropertyAction(key);
-    uriWarnings = "true".equals(AccessController.doPrivileged(a));      
+    uriWarnings = "true".equals(AccessController.doPrivileged(a));
   }
-    
+
   //
   // The current XML handler interface.
   //
   private SAXDriver handler;
-  
+
   //
   // I/O information.
   //
@@ -272,7 +272,7 @@ final class XmlParser
   private int encoding;   // current character encoding
   private int currentByteCount; // bytes read from current source
   private InputSource scratch;  // temporary
-  
+
   //
   // Buffers for decoded but unparsed character input.
   //
@@ -280,33 +280,33 @@ final class XmlParser
   private int readBufferPos;
   private int readBufferLength;
   private int readBufferOverflow;  // overflow from last data chunk.
-  
+
   //
   // Buffer for undecoded raw byte input.
   //
   private final static int READ_BUFFER_MAX = 16384;
   private byte[] rawReadBuffer;
-  
-  
+
+
   //
   // Buffer for attribute values, char refs, DTD stuff.
   //
   private static int DATA_BUFFER_INITIAL = 4096;
   private char[] dataBuffer;
   private int dataBufferPos;
-  
+
   //
   // Buffer for parsed names.
   //
   private static int NAME_BUFFER_INITIAL = 1024;
   private char[] nameBuffer;
   private int nameBufferPos;
-  
+
   //
   // Save any standalone flag
   //
   private boolean docIsStandalone;
-  
+
   //
   // Hashtables for DTD information on elements, entities, and notations.
   // Populated until we start ignoring decls (because of skipping a PE)
@@ -315,18 +315,18 @@ final class XmlParser
   private HashMap entityInfo;
   private HashMap notationInfo;
   private boolean skippedPE;
-  
+
   //
   // Element type currently in force.
   //
   private String currentElement;
   private int currentElementContent;
-  
+
   //
   // Stack of entity names, to detect recursion.
   //
   private LinkedList entityStack;
-  
+
   //
   // PE expansion is enabled in most chunks of the DTD, not all.
   // When it's enabled, literals are treated differently.
@@ -334,14 +334,14 @@ final class XmlParser
   private boolean inLiteral;
   private boolean expandPE;
   private boolean peIsError;
-  
+
   //
   // can't report entity expansion inside two constructs:
   // - attribute expansions (internal entities only)
   // - markup declarations (parameter entities only)
   //
   private boolean doReport;
-  
+
   //
   // Symbol table, for caching interned names.
   //
@@ -358,38 +358,38 @@ final class XmlParser
   // 32 bit hardware.
   //
   private final static int SYMBOL_TABLE_LENGTH = 2039;
-  
+
   private Object[][] symbolTable;
-  
+
   //
   // Hash table of attributes found in current start tag.
   //
   private String[] tagAttributes;
   private int tagAttributePos;
-  
+
   //
   // Utility flag: have we noticed a CR while reading the last
   // data chunk?  If so, we will have to go back and normalise
   // CR or CR/LF line ends.
   //
   private boolean sawCR;
-  
+
   //
   // Utility flag: are we in CDATA?  If so, whitespace isn't ignorable.
-  // 
+  //
   private boolean inCDATA;
-  
+
   //
   // Xml version.
-  //  
-  private static final int XML_10 = 0; 
-  private static final int XML_11 = 1; 
+  //
+  private static final int XML_10 = 0;
+  private static final int XML_11 = 1;
   private int xmlVersion = XML_10;
 
   //////////////////////////////////////////////////////////////////////
   // Constructors.
   ////////////////////////////////////////////////////////////////////////
-  
+
   /**
    * Construct a new parser with no associated handler.
    * @see #setHandler
@@ -422,14 +422,14 @@ final class XmlParser
    * which MUST NOT REUSE the parser (just null it).
    *
    * @param systemId Absolute URI of the document; should never be null,
-   *	but may be so iff a reader or a stream is provided.
+   *    but may be so iff a reader or a stream is provided.
    * @param publicId The public identifier of the document, or null.
    * @param reader A character stream; must be null if stream isn't.
    * @param stream A byte input stream; must be null if reader isn't.
    * @param encoding The suggested encoding, or null if unknown.
    * @exception java.lang.Exception Basically SAXException or IOException
    */
-  // package private 
+  // package private
   void doParse(String systemId, String publicId, Reader reader,
                InputStream stream, String encoding)
     throws Exception
@@ -459,7 +459,7 @@ final class XmlParser
                 // default baseURI: null
                 new ExternalIdentifiers(publicId, systemId, null),
                 reader, stream, encoding, false);
-        
+
         parseDocument();
       }
     catch (EOFException e)
@@ -509,7 +509,7 @@ final class XmlParser
   //////////////////////////////////////////////////////////////////////
   // Error reporting.
   //////////////////////////////////////////////////////////////////////
-    
+
   /**
    * Report an error.
    * @param message The error message.
@@ -529,7 +529,7 @@ final class XmlParser
         message = message + " (expected \"" + textExpected + "\")";
       }
     handler.fatal(message);
-    
+
     // "can't happen"
     throw new SAXException(message);
   }
@@ -581,7 +581,7 @@ final class XmlParser
       {                 // added by MHK
         error("premature end of file", "[EOF]", null);
       }
-    
+
     try
       {
         parseMisc();   //skip all white, PIs, and comments
@@ -593,7 +593,7 @@ final class XmlParser
         return;
       }
   }
-  
+
   static final char[] startDelimComment = { '<', '!', '-', '-' };
   static final char[] endDelimComment = { '-', '-' };
 
@@ -609,7 +609,7 @@ final class XmlParser
   {
     char c;
     boolean saved = expandPE;
-    
+
     expandPE = false;
     parseUntil(endDelimComment);
     require('>');
@@ -617,7 +617,7 @@ final class XmlParser
     handler.comment(dataBuffer, 0, dataBufferPos);
     dataBufferPos = 0;
   }
-  
+
   static final char[] startDelimPI = { '<', '?' };
   static final char[] endDelimPI = { '?', '>' };
 
@@ -636,7 +636,7 @@ final class XmlParser
   {
     String name;
     boolean saved = expandPE;
-    
+
     expandPE = false;
     name = readNmtoken(true);
     //NE08
@@ -657,7 +657,7 @@ final class XmlParser
     expandPE = saved;
     handler.processingInstruction(name, dataBufferToString());
   }
-  
+
   static final char[] endDelimCDATA = { ']', ']', '>' };
 
   private boolean isDirtyCurrentElement;
@@ -756,7 +756,7 @@ final class XmlParser
     String standalone = null;
     int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF;
     String inputEncoding = null;
-        
+
     switch (this.encoding)
       {
       case ENCODING_EXTERNAL:
@@ -773,7 +773,7 @@ final class XmlParser
         inputEncoding = "UTF-16LE";
         break;
       }
-    
+
     // Read the version.
     require("version");
     parseEq();
@@ -796,7 +796,7 @@ final class XmlParser
       }
     // Try reading an encoding declaration.
     boolean white = tryWhitespace();
-    
+
     if (tryRead("encoding"))
       {
         if (!white)
@@ -810,7 +810,7 @@ final class XmlParser
             setupDecoding(encodingName);
           }
       }
-    
+
     // Try reading a standalone declaration
     if (encodingName != null)
       {
@@ -869,13 +869,13 @@ final class XmlParser
         String version;
         parseEq();
         checkLegalVersion(version = readLiteral(flags));
-        
+
         if (version.equals("1.1"))
           {
             if (xmlVersion == XML_10)
               {
                 error("external subset has later version number.", "1.0",
-                      version);    
+                      version);
               }
             handler.warn("expected XML version 1.0, not: " + version);
             xmlVersion = XML_11;
@@ -886,7 +886,7 @@ final class XmlParser
           }
         requireWhitespace();
       }
-    
+
     // Read the encoding.
     require("encoding");
     parseEq();
@@ -897,7 +897,7 @@ final class XmlParser
       }
     skipWhitespace();
     require("?>");
-    
+
     return encodingName;
   }
 
@@ -921,14 +921,14 @@ final class XmlParser
     throws SAXException, IOException
   {
     encodingName = encodingName.toUpperCase();
-    
+
     // ENCODING_EXTERNAL indicates an encoding that wasn't
     // autodetected ... we can use builtin decoders, or
     // ones from the JVM (InputStreamReader).
-    
+
     // Otherwise we can only tweak what was autodetected, and
     // only for single byte (ASCII derived) builtin encodings.
-    
+
     // ASCII-derived encodings
     if (encoding == ENCODING_UTF_8 || encoding == ENCODING_EXTERNAL)
       {
@@ -959,7 +959,7 @@ final class XmlParser
         // else fallthrough ...
         // it's ASCII-ish and something other than a builtin
       }
-    
+
     // Unicode and such
     if (encoding == ENCODING_UCS_2_12 || encoding == ENCODING_UCS_2_21)
       {
@@ -972,7 +972,7 @@ final class XmlParser
           }
         return;
       }
-    
+
     // four byte encodings
     if (encoding == ENCODING_UCS_4_1234
         || encoding == ENCODING_UCS_4_4321
@@ -987,11 +987,11 @@ final class XmlParser
           }
         return;
       }
-    
+
     // assert encoding == ENCODING_EXTERNAL
     // if (encoding != ENCODING_EXTERNAL)
     //     throw new RuntimeException ("encoding = " + encoding);
-    
+
     if (encodingName.equals("UTF-16BE"))
       {
         encoding = ENCODING_UCS_2_12;
@@ -1002,22 +1002,22 @@ final class XmlParser
         encoding = ENCODING_UCS_2_21;
         return;
       }
-    
+
     // We couldn't use the builtin decoders at all.  But we can try to
     // create a reader, since we haven't messed up buffering.  Tweak
     // the encoding name if necessary.
-    
+
     if (encodingName.equals("UTF-16")
         || encodingName.equals("ISO-10646-UCS-2"))
       {
         encodingName = "Unicode";
       }
     // Ignoring all the EBCDIC aliases here
-    
+
     reader = new InputStreamReader(is, encodingName);
     sourceType = INPUT_READER;
   }
-  
+
   /**
    * Parse miscellaneous markup outside the document element and DOCTYPE
    * declaration.
@@ -1070,12 +1070,12 @@ final class XmlParser
 
     // report (a) declaration of name, (b) lexical info (ids)
     handler.doctypeDecl(rootName, ids.publicId, ids.systemId);
-    
+
     // Internal subset is parsed first, if present
     skipWhitespace();
     if (tryRead('['))
       {
-        
+
         // loop until the subset ends
         while (true)
           {
@@ -1097,10 +1097,10 @@ final class XmlParser
       }
     skipWhitespace();
     require('>');
-    
+
     // Read the external subset, if any
     InputSource subset;
-    
+
     if (ids.systemId == null)
       {
         subset = handler.getExternalSubset(rootName,
@@ -1113,7 +1113,7 @@ final class XmlParser
     if (ids.systemId != null || subset != null)
       {
         pushString(null, ">");
-      
+
         // NOTE:  [dtd] is so we say what SAX2 expects,
         // though it's misleading (subset, not entire dtd)
         if (ids.systemId != null)
@@ -1132,7 +1132,7 @@ final class XmlParser
                     subset.getEncoding(),
                     false);
           }
-        
+
         // Loop until we end up back at '>'
         while (true)
           {
@@ -1150,20 +1150,20 @@ final class XmlParser
                 expandPE = false;
               }
           }
-        
+
         // the ">" string isn't popped yet
         if (inputStack.size() != 1)
           {
             error("external subset has unmatched '>'");
           }
       }
-    
+
     // done dtd
     handler.endDoctype();
     expandPE = false;
     doReport = true;
   }
-  
+
   /**
    * Parse a markup declaration in the internal or external DTD subset.
    * 
        @@ -1185,7 +1185,7 @@ final class XmlParser
     require('<');
     unread('<');
     expandPE = false;
-    
+
     if (tryRead("
@@ -1270,10 +1270,10 @@ final class XmlParser
     // This is the (global) counter for the
     // array of specified attributes.
     tagAttributePos = 0;
-    
+
     // Read the element type name.
     gi = readNmtoken(true);
-    
+
     // If we saw no DTD, and this is the document root element,
     // let the application modify the input stream by providing one.
     if (maybeGetSubset)
@@ -1284,11 +1284,11 @@ final class XmlParser
           {
             String publicId = subset.getPublicId();
             String systemId = subset.getSystemId();
-            
+
             handler.warn("modifying document by adding DTD");
             handler.doctypeDecl(gi, publicId, systemId);
             pushString(null, ">");
-            
+
             // NOTE:  [dtd] is so we say what SAX2 expects,
             // though it's misleading (subset, not entire dtd)
             pushURL(true, "[dtd]",
@@ -1297,7 +1297,7 @@ final class XmlParser
                     subset.getByteStream(),
                     subset.getEncoding(),
                     false);
-            
+
             // Loop until we end up back at '>'
             while (true)
               {
@@ -1315,17 +1315,17 @@ final class XmlParser
                     expandPE = false;
                   }
               }
-            
+
             // the ">" string isn't popped yet
             if (inputStack.size() != 1)
               {
                 error("external subset has unmatched '>'");
               }
-            
+
             handler.endDoctype();
           }
       }
-    
+
     // Determine the current content type.
     currentElement = gi;
     element = (ElementDecl) elementInfo.get(gi);
@@ -1346,7 +1346,7 @@ final class XmlParser
         white = tryWhitespace();
         c = readCh();
       }
-    
+
     // Supply any defaulted attributes.
     Iterator atts = declaredAttributes(element);
     if (atts != null)
@@ -1366,7 +1366,7 @@ loop:
               }
             // ... or has a default
             String value = getAttributeDefaultValue(gi, aname);
-            
+
             if (value == null)
               {
                 continue;
@@ -1395,7 +1395,7 @@ loop:
     currentElement = oldElement;
     currentElementContent = oldElementContent;
   }
-    
+
   /**
    * Parse an attribute assignment.
    * 
        @@ -1411,11 +1411,11 @@ loop:
     String type;
     String value;
     int flags = LIT_ATTRIBUTE |  LIT_ENTITY_REF;
-    
+
     // Read the attribute name.
     aname = readNmtoken(true);
     type = getAttributeType(name, aname);
-    
+
     // Parse '='
     parseEq();
 
@@ -1457,7 +1457,7 @@ loop:
     // attribute.
     handler.attribute(aname, value, true);
     dataBufferPos = 0;
-    
+
     // Note that the attribute has been
     // specified.
     if (tagAttributePos == tagAttributes.length)
@@ -1501,7 +1501,7 @@ loop:
     // not re-reporting any SAXException re bogus end tags,
     // even though that diagnostic might be clearer ...
   }
-  
+
   /**
    * Parse the content of an element.
    * 
        @@ -1515,7 +1515,7 @@ loop:
     throws Exception
   {
     char c;
-    
+
     while (true)
       {
         // consume characters (or ignorable whitspace) until delimiter
@@ -1538,7 +1538,7 @@ loop:
               }
             isDirtyCurrentElement = true;
             break;
-            
+
           case '<':       // Found "<"
             dataBufferFlush();
             c = readCh();
@@ -1567,17 +1567,17 @@ loop:
                     break;
                   }
                 break;
-              
+
               case '?':     // Found "
@@ -1599,7 +1599,7 @@ loop:
     throws Exception
   {
     String name;
-    
+
     requireWhitespace();
     // Read the element type name.
     name = readNmtoken(true);
@@ -1607,7 +1607,7 @@ loop:
     requireWhitespace();
     // Read the content model.
     parseContentspec(name);
-    
+
     skipWhitespace();
     require('>');
   }
@@ -1643,8 +1643,8 @@ loop:
     else
       {
         String model;
-        char[] saved; 
-        
+        char[] saved;
+
         require('(');
         saved = readBuffer;
         dataBufferAppend('(');
@@ -1668,7 +1668,7 @@ loop:
           }
       }
   }
-  
+
   /**
    * Parse an element-content model.
    * 
        @@ -1686,11 +1686,11 @@ loop:
   {
     char c;
     char sep;
-    
+
     // Parse the first content particle
     skipWhitespace();
     parseCp();
-    
+
     // Check for end or for a separator.
     skipWhitespace();
     c = readCh();
@@ -1702,7 +1702,7 @@ loop:
           {
             handler.verror("Illegal Group/PE nesting");
           }
-        
+
         dataBufferAppend(')');
         c = readCh();
         switch (c)
@@ -1725,7 +1725,7 @@ loop:
         error("bad separator in content model", c, null);
         return;
       }
-    
+
     // Parse the rest of the content model.
     while (true)
       {
@@ -1740,7 +1740,7 @@ loop:
               {
                 handler.verror("Illegal Group/PE nesting");
               }
-            
+
             dataBufferAppend(')');
             break;
           }
@@ -1754,7 +1754,7 @@ loop:
             dataBufferAppend(c);
           }
       }
-    
+
     // Check for the occurrence indicator.
     c = readCh();
     switch (c)
@@ -1769,7 +1769,7 @@ loop:
         return;
       }
   }
-   
+
   /**
    * Parse a content particle.
    * 
        @@ -1823,12 +1823,12 @@ loop:
           {
             handler.verror("Illegal Group/PE nesting");
           }
-        
+
         dataBufferAppend(")*");
         tryRead('*');
         return;
       }
-    
+
     // Parse mixed content.
     skipWhitespace();
     while (!tryRead(")"))
@@ -1839,17 +1839,17 @@ loop:
         dataBufferAppend(readNmtoken(true));
         skipWhitespace();
       }
-    
+
     // VC: Proper Group/PE Nesting
     if (readBuffer != saved)
       {
         handler.verror("Illegal Group/PE nesting");
       }
-    
+
     require('*');
     dataBufferAppend(")*");
   }
-  
+
   /**
    * Parse an attribute list declaration.
    * 
        @@ -1861,7 +1861,7 @@ loop:
     throws Exception
   {
     String elementName;
-    
+
     requireWhitespace();
     elementName = readNmtoken(true);
     boolean white = tryWhitespace();
@@ -1875,7 +1875,7 @@ loop:
         white = tryWhitespace();
       }
   }
-  
+
   /**
    * Parse a single attribute definition.
    * 
        @@ -1888,7 +1888,7 @@ loop:
     String name;
     String type;
     String enumer = null;
-    
+
     // Read the attribute name.
     name = readNmtoken(true);
 
@@ -1911,7 +1911,7 @@ loop:
             enumer = dataBufferToString();
           }
       }
-    
+
     // Read the default value.
     requireWhitespace();
     parseDefault(elementName, name, type, enumer);
@@ -1980,7 +1980,7 @@ loop:
         return null;
       }
   }
-  
+
   /**
    * Parse an enumeration.
    * 
        @@ -2022,7 +2022,7 @@ loop:
   {
     requireWhitespace();
     require('(');
-    
+
     parseEnumeration(true);
   }
 
@@ -2042,11 +2042,11 @@ loop:
     int flags = LIT_ATTRIBUTE;
     boolean saved = expandPE;
     String defaultType = null;
-    
+
     // LIT_ATTRIBUTE forces '<' checks now (ASAP) and turns whitespace
     // chars to spaces (doesn't matter when that's done if it doesn't
     // interfere with char refs expanding to whitespace).
-    
+
     if (!skippedPE)
       {
         flags |= LIT_ENTITY_REF;
@@ -2065,7 +2065,7 @@ loop:
               }
           }
       }
-    
+
     expandPE = false;
     if (tryRead('#'))
       {
@@ -2125,7 +2125,7 @@ loop:
                                                defaultType, value);
       }
   }
-  
+
   /**
    * Parse a conditional section.
    * 
        @@ -2197,7 +2197,7 @@ loop:
         error("conditional section must begin with INCLUDE or IGNORE");
       }
   }
-  
+
   private void parseCharRef()
     throws SAXException, IOException
   {
@@ -2216,7 +2216,7 @@ loop:
   {
     int value = 0;
     char c;
-    
+
     if (tryRead('x'))
       {
 loop1:
@@ -2263,7 +2263,7 @@ loop2:
               }
           }
       }
-    
+
     // check for character refs being legal XML
     if ((value < 0x0020
          && ! (value == '\n' || value == '\t' || value == '\r'))
@@ -2274,7 +2274,7 @@ loop2:
         error("illegal XML character reference U+"
               + Integer.toHexString(value));
       }
-    
+
     // Check for surrogates: 00000000 0000xxxx yyyyyyyy zzzzzzzz
     //  (1101|10xx|xxyy|yyyy + 1101|11yy|zzzz|zzzz:
     if (value > 0x0010ffff)
@@ -2283,9 +2283,9 @@ loop2:
         error("character reference " + value + " is too large for UTF-16",
               Integer.toString(value), null);
       }
-    
+
   }
-  
+
   /**
    * Read and interpret a character reference.
    * 
        @@ -2298,7 +2298,7 @@ loop2:
   {
     int value = 0;
     char c;
-    
+
     if (tryRead('x'))
       {
 loop1:
@@ -2345,7 +2345,7 @@ loop2:
               }
           }
       }
-    
+
     // check for character refs being legal XML
     if ((value < 0x0020
          && ! (value == '\n' || value == '\t' || value == '\r'))
@@ -2356,7 +2356,7 @@ loop2:
         error("illegal XML character reference U+"
               + Integer.toHexString(value));
       }
-    
+
     // Check for surrogates: 00000000 0000xxxx yyyyyyyy zzzzzzzz
     //  (1101|10xx|xxyy|yyyy + 1101|11yy|zzzz|zzzz:
     if (value <= 0x0000ffff)
@@ -2382,7 +2382,7 @@ loop2:
         dataBufferFlush();
       }
   }
-  
+
   /**
    * Parse and expand an entity reference.
    * 
        @@ -2395,7 +2395,7 @@ loop2:
     throws SAXException, IOException
   {
     String name;
-    
+
     name = readNmtoken(true);
     require(';');
     switch (getEntityType(name))
@@ -2406,7 +2406,7 @@ loop2:
         // unless the processor might _legitimately_ not have seen a
         // declaration ... which is what this implements.
         String message;
-        
+
         message = "reference to undeclared general entity " + name;
         if (skippedPE && !docIsStandalone)
           {
@@ -2424,25 +2424,25 @@ loop2:
         break;
       case ENTITY_INTERNAL:
           pushString(name, getEntityValue(name));
-          
+
           //workaround for possible input pop before marking
-          //the buffer reading position  
+          //the buffer reading position
           char t = readCh();
           unread(t);
           int bufferPosMark = readBufferPos;
-          
+
           int end = readBufferPos + getEntityValue(name).length();
           for (int k = readBufferPos; k < end; k++)
             {
               t = readCh();
               if (t == '&')
                 {
-                  t = readCh();   
+                  t = readCh();
                   if (t  == '#')
-                    { 
+                    {
                       //try to match a character ref
                       tryReadCharRef();
-                
+
                       //everything has been read
                       if (readBufferPos >= end)
                         {
@@ -2457,7 +2457,7 @@ loop2:
                       unread(t);
                       readNmtoken(true);
                       require(';');
-                      
+
                       //everything has been read
                       if (readBufferPos >= end)
                         {
@@ -2468,7 +2468,7 @@ loop2:
                     }
                   error(" malformed entity reference");
                 }
-              
+
             }
           readBufferPos = bufferPosMark;
           break;
@@ -2499,7 +2499,7 @@ loop2:
           throw new RuntimeException();
       }
   }
-    
+
   /**
    * Parse and expand a parameter entity reference.
    * 
        @@ -2511,7 +2511,7 @@ loop2:
     throws SAXException, IOException
   {
     String name;
-    
+
     name = "%" + readNmtoken(true);
     require(';');
     switch (getEntityType(name))
@@ -2519,7 +2519,7 @@ loop2:
       case ENTITY_UNDECLARED:
         // VC: Entity Declared
         handler.verror("reference to undeclared parameter entity " + name);
-        
+
         // we should disable handling of all subsequent declarations
         // unless this is a standalone document (info discarded)
         break;
@@ -2546,7 +2546,7 @@ loop2:
         break;
       }
   }
-  
+
   /**
    * Parse an entity declaration.
    * 
        @@ -2566,7 +2566,7 @@ loop2:
   {
     boolean peFlag = false;
     int flags = 0;
-    
+
     // Check for a parameter entity.
     expandPE = false;
     requireWhitespace();
@@ -2576,7 +2576,7 @@ loop2:
         requireWhitespace();
       }
     expandPE = true;
-    
+
     // Read the entity name, and prepend
     // '%' if necessary.
     String name = readNmtoken(true);
@@ -2605,7 +2605,7 @@ loop2:
       {
         // Read the external IDs
         ExternalIdentifiers ids = readExternalIds(false, false);
-        
+
         // Check for NDATA declaration.
         boolean white = tryWhitespace();
         if (!peFlag && tryRead("NDATA"))
@@ -2637,7 +2637,7 @@ loop2:
                                    : ids.systemId);
           }
       }
-    
+
     // Finish the declaration.
     skipWhitespace();
     require('>');
@@ -2672,11 +2672,11 @@ loop2:
 
     // Register the notation.
     setNotation(nname, ids);
-    
+
     skipWhitespace();
     require('>');
   }
-  
+
   /**
    * Parse character data.
    * 
        @@ -2691,7 +2691,7 @@ loop2:
     boolean pureWhite = false;
 
     // assert (dataBufferPos == 0);
-    
+
     // are we expecting pure whitespace?  it might be dirty...
     if ((currentElementContent == CONTENT_ELEMENTS) && !isDirtyCurrentElement)
       {
@@ -2705,7 +2705,7 @@ loop2:
         int lineAugment = 0;
         int columnAugment = 0;
         int i;
-        
+
 loop:
         for (i = readBufferPos; i < readBufferLength; i++)
           {
@@ -2751,8 +2751,8 @@ loop:
                 break;
               default:
                 if ((c < 0x0020 || c > 0xFFFD)
-                    || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085) 
-                        && xmlVersion == XML_11)) 
+                    || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085)
+                        && xmlVersion == XML_11))
                   {
                     error("illegal XML character U+"
                           + Integer.toHexString(c));
@@ -2762,7 +2762,7 @@ loop:
                 columnAugment++;
               }
           }
-        
+
         // report text thus far
         if (lineAugment > 0)
           {
@@ -2773,10 +2773,10 @@ loop:
           {
             column += columnAugment;
           }
-        
+
         // report characters/whitspace
         int length = i - readBufferPos;
-        
+
         if (length != 0)
           {
             if (pureWhite)
@@ -2790,12 +2790,12 @@ loop:
               }
             readBufferPos = i;
           }
-        
+
         if (state != 0)
           {
             break;
           }
-        
+
         // fill next buffer from this entity, or
         // pop stack and continue with previous entity
         unread(readCh());
@@ -2810,11 +2810,11 @@ loop:
         error("character data may not contain ']]>'");
       }
   }
-  
+
   //////////////////////////////////////////////////////////////////////
   // High-level reading and scanning methods.
   //////////////////////////////////////////////////////////////////////
-  
+
   /**
    * Require whitespace characters.
    */
@@ -2849,7 +2849,7 @@ loop:
       {
         int lineAugment = 0;
         int columnAugment = 0;
-        
+
 loop:
         for (int i = readBufferPos; i < readBufferLength; i++)
           {
@@ -2885,7 +2885,7 @@ loop:
               }
           }
       }
-    
+
     // OK, do it the slow way.
     char c = readCh ();
     while (isWhitespace(c))
@@ -2894,7 +2894,7 @@ loop:
       }
     unread(c);
   }
-  
+
   /**
    * Read a name or (when parsing an enumeration) name token.
    * 
        @@ -2906,7 +2906,7 @@ loop:
     throws SAXException, IOException
   {
     char c;
-    
+
     if (USE_CHEATS)
       {
 loop:
@@ -2921,7 +2921,7 @@ loop:
                     break loop;
                   }
                 // else fall through...
-                
+
                 // What may legitimately come AFTER a name/nmtoken?
               case '<': case '>': case '&':
               case ',': case '|': case '*': case '+': case '?':
@@ -2939,10 +2939,10 @@ loop:
                   }
                 readBufferPos = i;
                 return intern(readBuffer, start, i - start);
-                
+
               default:
                 // FIXME ... per IBM's OASIS test submission, these:
-                //   ?    U+06dd 
+                //   ?    U+06dd
                 //   Combining  U+309B
                 //these switches are kind of ugly but at least we won't
                 //have to go over the whole lits for each char
@@ -2997,7 +2997,7 @@ loop:
                                       + Integer.toHexString(c));
                               }
                           }
-                        
+
                         break;
                         //starting with 11
                       case 0x1100:
@@ -3061,7 +3061,7 @@ loop:
                           }
                         break;
                       default:
-                        if (c == 0x0e46 || c == 0x1011 
+                        if (c == 0x0e46 || c == 0x1011
                             || c == 0x212f || c == 0x0587
                             || c == 0x0230 )
                           {
@@ -3091,7 +3091,7 @@ loop:
               }
           }
       }
-    
+
     nameBufferPos = 0;
 
     // Read the first character.
@@ -3128,7 +3128,7 @@ loop:
             return s;
           default:
             // punt on exact tests from Appendix A, but approximate them
-            
+
             if ((nameBufferPos != 0 || !isName)
                 && !Character.isUnicodeIdentifierPart(c)
                 && ":-_.".indexOf(c) == -1
@@ -3147,7 +3147,7 @@ loop:
           }
       }
   }
-  
+
   private static boolean isExtender(char c)
   {
     // [88] Extender ::= ...
@@ -3178,7 +3178,7 @@ loop:
     int startLine = line;
     boolean saved = expandPE;
     boolean savedReport = doReport;
-    
+
     // Find the first delimiter.
     delim = readCh();
     if (delim != '"' && delim != '\'')
@@ -3192,7 +3192,7 @@ loop:
         expandPE = false;
       }
     doReport = false;
-    
+
     // Each level of input source has its own buffer; remember
     // ours, so we won't read the ending delimiter from any
     // other input source, regardless of entity processing.
@@ -3235,11 +3235,11 @@ loop:
                         break;
                       }
                     parseCharRef(false /* Do not do flushDataBuffer */);
-                    
+
                     // exotic WFness risk: this is an entity literal,
                     // dataBuffer [dataBufferPos - 1] == '&', and
                     // following chars are a _partial_ entity/char ref
-                    
+
                     // It looks like an entity ref ...
                   }
                 else
@@ -3258,7 +3258,7 @@ loop:
                     else if ((flags & LIT_DISABLE_EREF) != 0)
                       {
                         dataBufferAppend('&');
-                        
+
                         // OK, it will be an entity ref -- expanded later.
                       }
                     else
@@ -3272,7 +3272,7 @@ loop:
                   }
                 c = readCh();
                 continue loop;
-                
+
               case '<':
                 // and why?  Perhaps so "&foo;" expands the same
                 // inside and outside an attribute?
@@ -3283,7 +3283,7 @@ loop:
                 break;
 
                 // We don't worry about case '%' and PE refs, readCh does.
-                
+
               default:
                 break;
               }
@@ -3299,17 +3299,17 @@ loop:
     inLiteral = false;
     expandPE = saved;
     doReport = savedReport;
-    
+
     // Normalise whitespace if necessary.
     if ((flags & LIT_NORMALIZE) > 0)
       {
         dataBufferNormalize();
       }
-    
+
     // Return the value.
     return dataBufferToString();
   }
-  
+
   /**
    * Try reading external identifiers.
    * A system identifier is not required for notations.
@@ -3325,7 +3325,7 @@ loop:
     char c;
     ExternalIdentifiers ids = new ExternalIdentifiers();
     int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF;
-    
+
     if (tryRead("PUBLIC"))
       {
         requireWhitespace();
@@ -3345,7 +3345,7 @@ loop:
             requireWhitespace();
             ids.systemId = readLiteral(flags);
           }
-        
+
         for (int i = 0; i < ids.publicId.length(); i++)
           {
             c = ids.publicId.charAt(i);
@@ -3374,7 +3374,7 @@ loop:
       {
         error("missing SYSTEM or PUBLIC keyword");
       }
-      
+
     if (ids.systemId != null)
       {
         if (ids.systemId.indexOf('#') != -1)
@@ -3388,7 +3388,7 @@ loop:
                          + ids.systemId);
           }
       }
-    
+
     return ids;
   }
 
@@ -3416,7 +3416,7 @@ loop:
   //////////////////////////////////////////////////////////////////////
   // Utility routines.
   //////////////////////////////////////////////////////////////////////
-    
+
   /**
    * Add a character to the data buffer.
    */
@@ -3446,7 +3446,7 @@ loop:
   {
     dataBuffer = (char[]) extendArray(dataBuffer, dataBuffer.length,
                                       dataBufferPos + length);
-    
+
     System.arraycopy(ch, start, dataBuffer, dataBufferPos, length);
     dataBufferPos += length;
   }
@@ -3459,13 +3459,13 @@ loop:
     int i = 0;
     int j = 0;
     int end = dataBufferPos;
-    
+
     // Skip spaces at the start.
     while (j < end && dataBuffer[j] == ' ')
       {
         j++;
       }
-    
+
     // Skip whitespace at the end.
     while (end > j && dataBuffer[end - 1] == ' ')
       {
@@ -3475,9 +3475,9 @@ loop:
     // Start copying to the left.
     while (j < end)
       {
-        
+
         char c = dataBuffer[j++];
-        
+
         // Normalise all other spaces to
         // a single space.
         if (c == ' ')
@@ -3494,7 +3494,7 @@ loop:
             dataBuffer[i++] = c;
           }
       }
-    
+
     // The new length is <= the old one.
     dataBufferPos = i;
   }
@@ -3554,7 +3554,7 @@ loop:
   {
     int length = delim.length();
     char[] ch;
-    
+
     if (length < dataBuffer.length)
       {
         ch = dataBuffer;
@@ -3564,11 +3564,11 @@ loop:
       {
         ch = delim.toCharArray();
       }
-      
+
     if (USE_CHEATS && length <= (readBufferLength - readBufferPos))
       {
         int offset = readBufferPos;
-        
+
         for (int i = 0; i < length; i++, offset++)
           {
             if (ch[i] != readBuffer[offset])
@@ -3577,7 +3577,7 @@ loop:
               }
           }
         readBufferPos = offset;
-        
+
       }
     else
       {
@@ -3595,13 +3595,13 @@ loop:
     throws SAXException, IOException
   {
     char c = readCh();
-    
+
     if (c != delim)
       {
         error("required character", c, Character.toString(delim));
       }
   }
-  
+
   /**
    * Create an interned string from a character array.
    * Ælfred uses this method to create an interned version
@@ -3631,13 +3631,13 @@ loop:
         hash = 31 * hash + ch[i];
       }
     hash = (hash & 0x7fffffff) % SYMBOL_TABLE_LENGTH;
-    
+
     // Get the bucket -- consists of {array,String} pairs
     if ((bucket = symbolTable[hash]) == null)
       {
         // first string in this bucket
         bucket = new Object[8];
-        
+
         // Search for a matching tuple, and
         // return the string if we find one.
       }
@@ -3646,13 +3646,13 @@ loop:
         while (index < bucket.length)
           {
             char[] chFound = (char[]) bucket[index];
-        
+
             // Stop when we hit an empty entry.
             if (chFound == null)
               {
                 break;
               }
-            
+
             // If they're the same length, check for a match.
             if (chFound.length == length)
               {
@@ -3673,12 +3673,12 @@ loop:
             index += 2;
           }
         // Not found -- we'll have to add it.
-        
+
         // Do we have to grow the bucket?
         bucket = (Object[]) extendArray(bucket, bucket.length, index);
       }
     symbolTable[hash] = bucket;
-    
+
     // OK, add it to the end of the bucket -- "local" interning.
     // Intern "globally" to let applications share interning benefits.
     // That is, "!=" and "==" work on our strings, not just equals().
@@ -3690,7 +3690,7 @@ loop:
 
   /**
    * Ensure the capacity of an array, allocating a new one if
-   * necessary.  Usually extends only for name hash collisions. 
+   * necessary.  Usually extends only for name hash collisions.
    */
   private Object extendArray(Object array, int currentSize, int requiredSize)
   {
@@ -3702,12 +3702,12 @@ loop:
       {
         Object newArray = null;
         int newSize = currentSize * 2;
-        
+
         if (newSize <= requiredSize)
           {
             newSize = requiredSize + 1;
           }
-        
+
         if (array instanceof char[])
           {
             newArray = new char[newSize];
@@ -3720,7 +3720,7 @@ loop:
           {
             throw new RuntimeException();
           }
-        
+
         System.arraycopy(array, 0, newArray, 0, currentSize);
         return newArray;
       }
@@ -3729,20 +3729,20 @@ loop:
   //////////////////////////////////////////////////////////////////////
   // XML query routines.
   //////////////////////////////////////////////////////////////////////
-  
+
   boolean isStandalone()
   {
     return docIsStandalone;
   }
-    
+
   //
   // Elements
   //
-  
+
   private int getContentType(ElementDecl element, int defaultType)
   {
     int retval;
-    
+
     if (element == null)
       {
         return defaultType;
@@ -3770,7 +3770,7 @@ loop:
     ElementDecl element = (ElementDecl) elementInfo.get(name);
     return getContentType(element, CONTENT_UNDECLARED);
   }
-  
+
   /**
    * Register an element.
    * Array format:
@@ -3788,7 +3788,7 @@ loop:
       }
 
     ElementDecl element = (ElementDecl) elementInfo.get(name);
-    
+
     // first  or  for this type?
     if (element == null)
       {
@@ -3799,7 +3799,7 @@ loop:
         elementInfo.put(name, element);
         return;
       }
-    
+
     //  declaration?
     if (contentType != CONTENT_UNDECLARED)
       {
@@ -3816,14 +3816,14 @@ loop:
                            + name);
           }
       }
-    
+
     // first , before  ?
     else if (attributes != null)
       {
         element.attributes = attributes;
       }
   }
-  
+
   /**
    * Look up the attribute hash table for an element.
    * The hash table is the second item in the element array.
@@ -3837,7 +3837,7 @@ loop:
   //
   // Attributes
   //
-  
+
   /**
    * Get the declared attributes for an element type.
    * @param elname The name of the element type.
@@ -3853,7 +3853,7 @@ loop:
   private Iterator declaredAttributes(ElementDecl element)
   {
     HashMap attlist;
-    
+
     if (element == null)
       {
         return null;
@@ -3977,8 +3977,8 @@ loop:
     AttributeDecl attribute = getAttribute(name, aname);
     return (attribute == null) ? ATTRIBUTE_DEFAULT_UNDECLARED :
       attribute.valueType;
-  }  
-  
+  }
+
   /**
    * Register an attribute declaration for later retrieval.
    * Format:
@@ -3993,19 +3993,19 @@ loop:
     throws Exception
   {
     HashMap attlist;
-    
+
     if (skippedPE)
       {
         return;
       }
-    
+
     // Create a new hashtable if necessary.
     attlist = getElementAttributes(elName);
     if (attlist == null)
       {
         attlist = new HashMap();
       }
-    
+
     // ignore multiple attribute declarations!
     if (attlist.get(name) != null)
       {
@@ -4020,7 +4020,7 @@ loop:
         attribute.valueType = valueType;
         attribute.enumeration = enumeration;
         attlist.put(name, attribute);
-      
+
         // save; but don't overwrite any existing 
         setElement(elName, CONTENT_UNDECLARED, null, attlist);
       }
@@ -4038,7 +4038,7 @@ loop:
   //
   // Entities
   //
-  
+
   /**
    * Find the type of an entity.
    * @returns An integer constant representing the entity type.
@@ -4135,7 +4135,7 @@ loop:
   //
   // Notations.
   //
-  
+
   /**
    * Report a notation declaration, checking for duplicates.
    */
@@ -4146,7 +4146,7 @@ loop:
       {
         return;
       }
-    
+
     handler.notationDecl(nname, ids.publicId, ids.systemId, ids.baseUri);
     if (notationInfo.get(nname) == null)
       {
@@ -4158,11 +4158,11 @@ loop:
         handler.verror("Duplicate notation name decl: " + nname);
       }
   }
-  
+
   //
   // Location.
   //
-  
+
   /**
    * Return the current line number.
    */
@@ -4182,7 +4182,7 @@ loop:
   //////////////////////////////////////////////////////////////////////
   // High-level I/O.
   //////////////////////////////////////////////////////////////////////
-  
+
   /**
    * Read a single character from the readBuffer.
    * 
        The readDataChunk () method maintains the buffer.
@@ -4223,16 +4223,16 @@ loop:
                   }
               }
             break;
-            
+
           default:
-            
+
             popInput();
             break;
           }
       }
-    
+
     char c = readBuffer[readBufferPos++];
-    
+
     if (c == '\n')
       {
         line++;
@@ -4245,7 +4245,7 @@ loop:
             /* the most common return to parseContent () ... NOP */
           }
         else if (((c < 0x0020 && (c != '\t') && (c != '\r')) || c > 0xFFFD)
-                 || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085) 
+                 || ((c >= 0x007f) && (c <= 0x009f) && (c != 0x0085)
                      && xmlVersion == XML_11))
           {
             error("illegal XML character U+" + Integer.toHexString(c));
@@ -4274,7 +4274,7 @@ loop:
    * Push a single character back onto the current input stream.
    * 
        This method usually pushes the character back onto
    * the readBuffer.
-   * 
        I don't think that this would ever be called with 
+   * 
        I don't think that this would ever be called with
    * readBufferPos = 0, because the methods always reads a character
    * before unreading it, but just in case, I've added a boundary
    * condition.
@@ -4451,7 +4451,7 @@ loop:
     scratch.setCharacterStream(null);
     scratch.setByteStream(null);
     scratch.setEncoding(null);
-    
+
     // Push the existing status.
     pushInput(ename);
 
@@ -4475,7 +4475,7 @@ loop:
         tryEncodingDecl(true);
         return;
       }
-  
+
     // Else we handle the conversion, and need to ensure
     // it's done right.
     sourceType = INPUT_STREAM;
@@ -4487,12 +4487,12 @@ loop:
       {
         // We have to open our own stream to the URL.
         URL url = new URL(systemId);
-        
+
         externalEntity = url.openConnection();
         externalEntity.connect();
         is = externalEntity.getInputStream();
       }
-    
+
     // If we get to here, there must be
     // an InputStream available.
     if (!is.markSupported())
@@ -4509,11 +4509,11 @@ loop:
         if (!"file".equals(externalEntity.getURL().getProtocol()))
           {
             int temp;
-          
+
             // application/xml;charset=something;otherAttr=...
             // ... with many variants on 'something'
             encoding = externalEntity.getContentType();
-          
+
             // MHK code (fix for Saxon 5.5.1/007):
             // protect against encoding==null
             if (encoding == null)
@@ -4524,7 +4524,7 @@ loop:
               {
                 temp = encoding.indexOf("charset");
               }
-          
+
             // RFC 2376 sez MIME text defaults to ASCII, but since the
             // JDK will create a MIME type out of thin air, we always
             // autodetect when there's no explicit charset attribute.
@@ -4539,11 +4539,11 @@ loop:
                   {
                     encoding = encoding.substring(0, temp);
                   }
-                
+
                 if ((temp = encoding.indexOf('=', temp + 7)) > 0)
                   {
                     encoding = encoding.substring(temp + 1);
-                    
+
                     // attributes can have comment fields (RFC 822)
                     if ((temp = encoding.indexOf('(')) > 0)
                       {
@@ -4567,14 +4567,14 @@ loop:
               }
           }
       }
-    
+
     // if we got an external encoding label, use it ...
     if (encoding != null)
       {
         this.encoding = ENCODING_EXTERNAL;
         setupDecoding(encoding);
         ignoreEncoding = true;
-        
+
         // ... else autodetect from first bytes.
       }
     else
@@ -4608,13 +4608,13 @@ loop:
             readBufferOverflow = -1;
             line = 1;
             currentByteCount = column = 0;
-            
+
             sourceType = INPUT_READER;
             this.reader = new InputStreamReader(is, encoding);
             is = null;
-            
+
             tryEncodingDecl(true);
-            
+
           }
         catch (IOException e)
           {
@@ -4672,7 +4672,7 @@ loop:
   /**
    * Attempt to detect the encoding of an entity.
    * 
        The trick here (as suggested in the XML standard) is that
-   * any entity not in UTF-8, or in UCS-2 with a byte-order mark, 
+   * any entity not in UTF-8, or in UCS-2 with a byte-order mark,
    * must begin with an XML declaration or an encoding
    * declaration; we simply have to look for "<?xml" in various
    * encodings.
@@ -4792,7 +4792,7 @@ loop:
       {
         // 4c 6f a7 94 ... we don't understand EBCDIC flavors
         // ... but we COULD at least kick in some fixed code page
-        
+
         // (default) UTF-8 without encoding/XML declaration
         encoding = ENCODING_UTF_8;
       }
@@ -4832,7 +4832,7 @@ loop:
 
   /**
    * This method pushes a string back onto input.
-   * 
        It is useful either as the expansion of an internal entity, 
+   * 
        It is useful either as the expansion of an internal entity,
    * or for backtracking during the parse.
    * 
        Call pushCharArray () to do the actual work.
    * @param s The string to push back onto input.
@@ -4918,13 +4918,13 @@ loop:
           }
       }
     entityStack.addLast(ename);
-    
+
     // Don't bother if there is no current input.
     if (sourceType == INPUT_NONE)
       {
         return;
       }
-    
+
     // Set up a snapshot of the current
     // input source.
     Input input = new Input();
@@ -4941,7 +4941,7 @@ loop:
     input.currentByteCount = currentByteCount;
     input.column = column;
     input.reader = reader;
-    
+
     // Push it onto the stack.
     inputStack.addLast(input);
   }
@@ -5010,7 +5010,7 @@ loop:
     column = input.column;
     reader = input.reader;
   }
-  
+
   /**
    * Return true if we can read the expected character.
    * 
        Note that the character will be removed from the input stream
@@ -5026,7 +5026,7 @@ loop:
     throws SAXException, IOException
   {
     char c;
-    
+
     // Read the character
     c = readCh();
 
@@ -5069,7 +5069,7 @@ loop:
 
     // Compare the input, character-
     // by character.
-    
+
     for (int i = 0; i < ch.length; i++)
       {
         c = readCh();
@@ -5109,7 +5109,7 @@ loop:
         return false;
       }
   }
-  
+
   /**
    * Read all data until we find the specified string.
    * This is useful for scanning CDATA sections and PIs.
@@ -5130,7 +5130,7 @@ loop:
   {
     char c;
     int startLine = line;
-    
+
     try
       {
         while (!tryRead(delim))
@@ -5150,7 +5150,7 @@ loop:
   //////////////////////////////////////////////////////////////////////
   // Low-level I/O.
   //////////////////////////////////////////////////////////////////////
-  
+
   /**
    * Prefetch US-ASCII XML/text decl from input stream into read buffer.
    * Doesn't buffer more than absolutely needed, so that when an encoding
@@ -5163,7 +5163,7 @@ loop:
   {
     int ch;
     readBufferPos = readBufferLength = 0;
-    
+
     is.mark(readBuffer.length);
     while (true)
       {
@@ -5201,7 +5201,7 @@ loop:
     throws SAXException, IOException
   {
     int count;
-    
+
     // See if we have any overflow (filterCR sets for CR at end)
     if (readBufferOverflow > -1)
       {
@@ -5236,7 +5236,7 @@ loop:
         sawCR = false;
         return;
       }
-    
+
     // Read as many bytes as possible into the raw buffer.
     count = is.read(rawReadBuffer, 0, READ_BUFFER_MAX);
 
@@ -5265,7 +5265,7 @@ loop:
           case ENCODING_UCS_2_21:
             copyUcs2ReadBuffer(count, 0, 8);
             break;
-            
+
             // four byte builtins
           case ENCODING_UCS_4_1234:
             copyUcs4ReadBuffer(count, 24, 16, 8, 0);
@@ -5287,27 +5287,27 @@ loop:
       }
 
     readBufferPos = 0;
-    
+
     // Filter out all carriage returns if we've seen any
     // (including any saved from a previous read)
     if (sawCR)
       {
         filterCR(count >= 0);
         sawCR = false;
-        
+
         // must actively report EOF, lest some CRs get lost.
         if (readBufferLength == 0 && count >= 0)
           {
             readDataChunk();
           }
       }
-    
+
     if (count > 0)
       {
         currentByteCount += count;
       }
   }
-  
+
   /**
    * Filter carriage returns in the read buffer.
    * CRLF becomes LF; CR becomes LF.
@@ -5321,7 +5321,7 @@ loop:
     int i, j;
 
     readBufferOverflow = -1;
-    
+
 loop:
     for (i = j = readBufferPos; j < readBufferLength; i++, j++)
       {
@@ -5359,8 +5359,8 @@ loop:
 
   /**
    * Convert a buffer of UTF-8-encoded bytes into UTF-16 characters.
-   * 
        When readDataChunk () calls this method, the raw bytes are in 
-   * rawReadBuffer, and the final characters will appear in 
+   * 
        When readDataChunk () calls this method, the raw bytes are in
+   * rawReadBuffer, and the final characters will appear in
    * readBuffer.
    * 
        Note that as of Unicode 3.1, good practice became a requirement,
    * so that each Unicode character has exactly one UTF-8 representation.
@@ -5377,7 +5377,7 @@ loop:
     int j = readBufferPos;
     int b1;
     char c = 0;
-    
+
     /*
     // check once, so the runtime won't (if it's smart enough)
     if (count < 0 || count > rawReadBuffer.length)
@@ -5403,7 +5403,7 @@ loop:
                     encodingError("Illegal two byte UTF-8 sequence",
                                   c, 0);
                   }
-                
+
                 //Sec 2.11
                 // [1] the two-character sequence #xD #xA
                 // [2] the two-character sequence #xD #x85
@@ -5411,10 +5411,10 @@ loop:
                   {
                     continue;
                   }
-                
+
                 // Sec 2.11
                 // [3] the single character #x85
-                
+
                 if (c == 0x0085 && xmlVersion == XML_11)
                   {
                     readBuffer[j++] = '\r';
@@ -5453,7 +5453,7 @@ loop:
                 iso646 = (iso646 << 6) + getNextUtf8Byte(i++, count);
                 iso646 = (iso646 << 6) + getNextUtf8Byte(i++, count);
                 iso646 = (iso646 << 6) + getNextUtf8Byte(i++, count);
-                
+
                 if (iso646 <= 0xffff)
                   {
                     encodingError("Illegal four byte UTF-8 sequence",
@@ -5497,7 +5497,7 @@ loop:
     // How many characters have we read?
     readBufferLength = j;
   }
-   
+
   /**
    * Return the next byte value in a UTF-8 sequence.
    * If it is not possible to get a byte from the current
@@ -5512,7 +5512,7 @@ loop:
     throws SAXException, IOException
   {
     int val;
-    
+
     // Take a character from the buffer
     // or from the actual input stream.
     if (pos < count)
@@ -5544,8 +5544,8 @@ loop:
    * Convert a buffer of US-ASCII or ISO-8859-1-encoded bytes into
    * UTF-16 characters.
    *
-   * 
        When readDataChunk () calls this method, the raw bytes are in 
-   * rawReadBuffer, and the final characters will appear in 
+   * 
        When readDataChunk () calls this method, the raw bytes are in
+   * rawReadBuffer, and the final characters will appear in
    * readBuffer.
    *
    * @param count The number of bytes to convert.
@@ -5583,8 +5583,8 @@ loop:
    * Convert a buffer of UCS-2-encoded bytes into UTF-16 characters
    * (as used in Java string manipulation).
    *
-   * 
        When readDataChunk () calls this method, the raw bytes are in 
-   * rawReadBuffer, and the final characters will appear in 
+   * 
        When readDataChunk () calls this method, the raw bytes are in
+   * rawReadBuffer, and the final characters will appear in
    * readBuffer.
    * @param count The number of bytes to convert.
    * @param shift1 The number of bits to shift byte 1.
@@ -5597,7 +5597,7 @@ loop:
     throws SAXException
   {
     int j = readBufferPos;
-    
+
     if (count > 0 && (count % 2) != 0)
       {
         encodingError("odd number of bytes in UCS-2 encoding", -1, count);
@@ -5635,8 +5635,8 @@ loop:
   /**
    * Convert a buffer of UCS-4-encoded bytes into UTF-16 characters.
    *
-   * 
        When readDataChunk () calls this method, the raw bytes are in 
-   * rawReadBuffer, and the final characters will appear in 
+   * 
        When readDataChunk () calls this method, the raw bytes are in
+   * rawReadBuffer, and the final characters will appear in
    * readBuffer.
    * 
        Java has Unicode chars, and this routine uses surrogate pairs
    * for ISO-10646 values between 0x00010000 and 0x000fffff.  An
@@ -5657,7 +5657,7 @@ loop:
     throws SAXException
   {
     int j = readBufferPos;
-    
+
     if (count > 0 && (count % 4) != 0)
       {
         encodingError("number of bytes in UCS-4 encoding " +
@@ -5706,11 +5706,11 @@ loop:
         error(message);
       }
   }
-  
+
   //////////////////////////////////////////////////////////////////////
   // Local Variables.
   //////////////////////////////////////////////////////////////////////
-  
+
   /**
    * Re-initialize the variables for each parse.
    */
@@ -5719,7 +5719,7 @@ loop:
     // First line
     line = 1;
     column = 0;
-    
+
     // Set up the buffers for data and names
     dataBufferPos = 0;
     dataBuffer = new char[DATA_BUFFER_INITIAL];
@@ -5736,7 +5736,7 @@ loop:
     // element context.
     currentElement = null;
     currentElementContent = CONTENT_UNDECLARED;
-    
+
     // Set up the input variables
     sourceType = INPUT_NONE;
     inputStack = new LinkedList();
@@ -5752,11 +5752,11 @@ loop:
     inLiteral = false;
     expandPE = false;
     peIsError = false;
-    
+
     doReport = false;
-    
+
     inCDATA = false;
-    
+
     symbolTable = new Object[SYMBOL_TABLE_LENGTH][];
   }
 
@@ -5777,7 +5777,7 @@ loop:
       this.systemId = systemId;
       this.baseUri = baseUri;
     }
-    
+
   }
 
   static class EntityInfo
@@ -5787,12 +5787,12 @@ loop:
     ExternalIdentifiers ids;
     String value;
     String notationName;
-    
+
   }
 
   static class AttributeDecl
   {
-    
+
     String type;
     String value;
     int valueType;
@@ -5803,16 +5803,16 @@ loop:
 
   static class ElementDecl
   {
-    
+
     int contentType;
     String contentModel;
     HashMap attributes;
-  
+
   }
- 
+
   static class Input
   {
-    
+
     int sourceType;
     URLConnection externalEntity;
     char[] readBuffer;
@@ -5825,8 +5825,7 @@ loop:
     int currentByteCount;
     int column;
     Reader reader;
-    
-  }
-  
-}
 
+  }
+
+}
diff --git a/libjava/classpath/gnu/xml/aelfred2/XmlReader.java b/libjava/classpath/gnu/xml/aelfred2/XmlReader.java
index a3bd03a8644..e0a047612bd 100644
--- a/libjava/classpath/gnu/xml/aelfred2/XmlReader.java
+++ b/libjava/classpath/gnu/xml/aelfred2/XmlReader.java
@@ -1,4 +1,4 @@
-/* XmlReader.java -- 
+/* XmlReader.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -77,15 +77,15 @@ public final class XmlReader
   static class FatalErrorHandler
     extends DefaultHandler2
   {
-    
+
     public void error(SAXParseException e)
       throws SAXException
     {
       throw e;
     }
-    
+
   }
-  
+
   private SAXDriver aelfred2 = new SAXDriver();
   private EventFilter filter = new EventFilter();
   private boolean isValidating;
@@ -109,7 +109,7 @@ public final class XmlReader
         setErrorHandler(new FatalErrorHandler());
       }
   }
-  
+
   /**
    * SAX2: Returns the object used to report the logical
    * content of an XML document.
@@ -154,7 +154,7 @@ public final class XmlReader
       }
     filter.setDTDHandler(handler);
   }
-  
+
   /**
    * SAX2: Returns the object used when resolving external
    * entities during parsing (both general and parameter entities).
@@ -224,7 +224,7 @@ public final class XmlReader
       }
     throw new SAXNotRecognizedException(propertyId);
   }
-  
+
   private void forceValidating()
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
@@ -371,4 +371,3 @@ public final class XmlReader
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/Consumer.java b/libjava/classpath/gnu/xml/dom/Consumer.java
index 026e2754ef9..836c8d25728 100644
--- a/libjava/classpath/gnu/xml/dom/Consumer.java
+++ b/libjava/classpath/gnu/xml/dom/Consumer.java
@@ -1,4 +1,4 @@
-/* Consumer.java -- 
+/* Consumer.java --
    Copyright (C) 2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -81,8 +81,8 @@ public class Consumer extends DomConsumer
     public Consumer ()
     throws SAXException
     {
-	super (DomDocument.class);
-	setHandler (new Backdoor (this));
+        super (DomDocument.class);
+        setHandler (new Backdoor (this));
     }
 
     /**
@@ -93,8 +93,8 @@ public class Consumer extends DomConsumer
     public Consumer (EventConsumer next)
     throws SAXException
     {
-	super (DomDocument.class, next);
-	setHandler (new Backdoor (this));
+        super (DomDocument.class, next);
+        setHandler (new Backdoor (this));
     }
 
     /**
@@ -105,160 +105,160 @@ public class Consumer extends DomConsumer
      */
     public static class Backdoor extends DomConsumer.Handler
     {
-	/**
-	 * Constructor.
-	 * @param consumer must have been initialized to use the
-	 *	{@link DomDocument} class (or a subclass) for
-	 *	constructing DOM trees
-	 */
-	protected Backdoor (DomConsumer consumer)
-	throws SAXException
-	    { super (consumer); }
+        /**
+         * Constructor.
+         * @param consumer must have been initialized to use the
+         *      {@link DomDocument} class (or a subclass) for
+         *      constructing DOM trees
+         */
+        protected Backdoor (DomConsumer consumer)
+        throws SAXException
+            { super (consumer); }
 
-	// helper routine
-	private DomDoctype getDoctype ()
-	throws SAXException
-	{
-	    DomDocument		doc = (DomDocument) getDocument ();
-	    DocumentType	dt = doc.getDoctype ();
+        // helper routine
+        private DomDoctype getDoctype ()
+        throws SAXException
+        {
+            DomDocument         doc = (DomDocument) getDocument ();
+            DocumentType        dt = doc.getDoctype ();
 
-	    if (dt == null)
-		throw new SAXException ("doctype missing!");
-	    return (DomDoctype) dt;
-	}
+            if (dt == null)
+                throw new SAXException ("doctype missing!");
+            return (DomDoctype) dt;
+        }
 
-	// SAX2 "lexical" event
-	public void startDTD (String name, String publicId, String systemId)
-	throws SAXException
-	{
-	    DomDocument		doc = (DomDocument) getDocument ();
+        // SAX2 "lexical" event
+        public void startDTD (String name, String publicId, String systemId)
+        throws SAXException
+        {
+            DomDocument         doc = (DomDocument) getDocument ();
 
-	    super.startDTD (name, publicId, systemId);
-	    // DOM L2 doctype creation model is bizarre
-	    DomDoctype dt = new DomDoctype (doc, name, publicId, systemId);
-	    doc.appendChild (dt);
-	}
+            super.startDTD (name, publicId, systemId);
+            // DOM L2 doctype creation model is bizarre
+            DomDoctype dt = new DomDoctype (doc, name, publicId, systemId);
+            doc.appendChild (dt);
+        }
 
-	// SAX2 "lexical" event
-	public void endDTD ()
-	throws SAXException
-	{
-	    super.endDTD ();
-	    // DOM L2 has no way to make things readonly
-	    getDoctype ().makeReadonly ();
-	}
+        // SAX2 "lexical" event
+        public void endDTD ()
+        throws SAXException
+        {
+            super.endDTD ();
+            // DOM L2 has no way to make things readonly
+            getDoctype ().makeReadonly ();
+        }
 
-	// SAX1 DTD event
-	public void notationDecl (
-	    String name,
-	    String publicId, String systemId
-	) throws SAXException
-	{
-	    // DOM L2 can't create/save notation nodes
-	    getDoctype ().declareNotation (name, publicId, systemId);
-	}
+        // SAX1 DTD event
+        public void notationDecl (
+            String name,
+            String publicId, String systemId
+        ) throws SAXException
+        {
+            // DOM L2 can't create/save notation nodes
+            getDoctype ().declareNotation (name, publicId, systemId);
+        }
 
-	// SAX1 DTD event
-	public void unparsedEntityDecl (
-	    String name,
-	    String publicId, String systemId,
-	    String notationName
-	) throws SAXException
-	{
-	    // DOM L2 can't create/save entity nodes
-	    getDoctype ().declareEntity (name, publicId, systemId,
-	    	notationName);
-	}
+        // SAX1 DTD event
+        public void unparsedEntityDecl (
+            String name,
+            String publicId, String systemId,
+            String notationName
+        ) throws SAXException
+        {
+            // DOM L2 can't create/save entity nodes
+            getDoctype ().declareEntity (name, publicId, systemId,
+                notationName);
+        }
 
-	// SAX2 declaration event
-	public void internalEntityDecl (String name, String value)
-	throws SAXException
-	{
-	    // DOM L2 can't create/save entity nodes
-	    // NOTE:  this doesn't save the value as a child of this
-	    // node, though it could realistically do so.
-	    getDoctype ().declareEntity (name, null, null, null);
-	}
+        // SAX2 declaration event
+        public void internalEntityDecl (String name, String value)
+        throws SAXException
+        {
+            // DOM L2 can't create/save entity nodes
+            // NOTE:  this doesn't save the value as a child of this
+            // node, though it could realistically do so.
+            getDoctype ().declareEntity (name, null, null, null);
+        }
 
-	// SAX2 declaration event
-	public void externalEntityDecl (
-	    String name,
-	    String publicId,
-	    String systemId
-	) throws SAXException
-	{
-	    // DOM L2 can't create/save entity nodes
-	    // NOTE:  DOM allows for these to have children, if
-	    // they don't have unbound namespace references.
-	    getDoctype ().declareEntity (name, publicId, systemId, null);
-	}
+        // SAX2 declaration event
+        public void externalEntityDecl (
+            String name,
+            String publicId,
+            String systemId
+        ) throws SAXException
+        {
+            // DOM L2 can't create/save entity nodes
+            // NOTE:  DOM allows for these to have children, if
+            // they don't have unbound namespace references.
+            getDoctype ().declareEntity (name, publicId, systemId, null);
+        }
 
-	// SAX2 element
-	public void startElement (
-	    String uri,
-	    String localName,
-	    String qName,
-	    Attributes atts
-	) throws SAXException
-	{
-	    Node		top;
+        // SAX2 element
+        public void startElement (
+            String uri,
+            String localName,
+            String qName,
+            Attributes atts
+        ) throws SAXException
+        {
+            Node                top;
 
-	    super.startElement (uri, localName, qName, atts);
+            super.startElement (uri, localName, qName, atts);
 
-	    // might there be more work?
-	    top = getTop ();
-	    if (!top.hasAttributes () || !(atts instanceof Attributes2))
-		return;
+            // might there be more work?
+            top = getTop ();
+            if (!top.hasAttributes () || !(atts instanceof Attributes2))
+                return;
 
-	    // remember any attributes that got defaulted
-	    DomNamedNodeMap	map = (DomNamedNodeMap) top.getAttributes ();
-	    Attributes2		attrs = (Attributes2) atts;
-	    int			length = atts.getLength ();
+            // remember any attributes that got defaulted
+            DomNamedNodeMap     map = (DomNamedNodeMap) top.getAttributes ();
+            Attributes2         attrs = (Attributes2) atts;
+            int                 length = atts.getLength ();
 
-	    //map.compact ();
-	    for (int i = 0; i < length; i++) {
-		if (attrs.isSpecified (i))
-		    continue;
+            //map.compact ();
+            for (int i = 0; i < length; i++) {
+                if (attrs.isSpecified (i))
+                    continue;
 
-		// value was defaulted.
-		String		temp = attrs.getQName (i);
-		DomAttr		attr;
+                // value was defaulted.
+                String          temp = attrs.getQName (i);
+                DomAttr         attr;
 
-		if ("".equals (temp))
-		    attr = (DomAttr) map.getNamedItemNS (attrs.getURI (i),
-			    atts.getLocalName (i));
-		else
-		    attr = (DomAttr) map.getNamedItem (temp);
+                if ("".equals (temp))
+                    attr = (DomAttr) map.getNamedItemNS (attrs.getURI (i),
+                            atts.getLocalName (i));
+                else
+                    attr = (DomAttr) map.getNamedItem (temp);
 
-		// DOM L2 can't write this flag, only read it
-		attr.setSpecified (false);
-	    }
-	}
+                // DOM L2 can't write this flag, only read it
+                attr.setSpecified (false);
+            }
+        }
 
-	public void endElement (
-	    String uri,
-	    String localName,
-	    String qName
-	) throws SAXException
-	{
-	    DomNode	top = (DomNode) getTop ();
-	    top.compact ();
-	    super.endElement (uri, localName, qName);
-	}
+        public void endElement (
+            String uri,
+            String localName,
+            String qName
+        ) throws SAXException
+        {
+            DomNode     top = (DomNode) getTop ();
+            top.compact ();
+            super.endElement (uri, localName, qName);
+        }
 
-	protected Text createText (
-	    boolean	isCDATA,
-	    char	buf [],
-	    int		off,
-	    int		len
-	) {
-	    DomDocument	doc = (DomDocument) getDocument ();
+        protected Text createText (
+            boolean     isCDATA,
+            char        buf [],
+            int         off,
+            int         len
+        ) {
+            DomDocument doc = (DomDocument) getDocument ();
 
-	    if (isCDATA)
-		return doc.createCDATASection (buf, off, len);
-	    else
-		return doc.createTextNode (buf, off, len);
-	}
+            if (isCDATA)
+                return doc.createCDATASection (buf, off, len);
+            else
+                return doc.createTextNode (buf, off, len);
+        }
 
         public void elementDecl(String name, String model)
           throws SAXException
@@ -266,87 +266,87 @@ public class Consumer extends DomConsumer
           getDoctype().elementDecl(name, model);
         }
 
-	public void attributeDecl (
-	    String	ename,
-	    String	aname,
-	    String	type,
-	    String	mode,
-	    String	value
-	) throws SAXException
-	{
+        public void attributeDecl (
+            String      ename,
+            String      aname,
+            String      type,
+            String      mode,
+            String      value
+        ) throws SAXException
+        {
           getDoctype().attributeDecl(ename, aname, type, mode, value);
             /*
-	    if (value == null && !"ID".equals (type))
-		return;
-	    
-	    DomDoctype.ElementInfo	info;
+            if (value == null && !"ID".equals (type))
+                return;
 
-	    info = getDoctype ().getElementInfo (ename);
-	    if (value != null)
-		info.setAttrDefault (aname, value);
-	    if ("ID".equals (type))
-		info.setIdAttr (aname);
+            DomDoctype.ElementInfo      info;
+
+            info = getDoctype ().getElementInfo (ename);
+            if (value != null)
+                info.setAttrDefault (aname, value);
+            if ("ID".equals (type))
+                info.setIdAttr (aname);
                 */
-            
-	}
 
-	// force duplicate name checking off while we're
-	// using parser output (don't duplicate the work)
-	public void startDocument () throws SAXException
-	{
-	    super.startDocument ();
-	    
+        }
+
+        // force duplicate name checking off while we're
+        // using parser output (don't duplicate the work)
+        public void startDocument () throws SAXException
+        {
+            super.startDocument ();
+
             DomDocument doc = (DomDocument) getDocument ();
             doc.setStrictErrorChecking(false);
             doc.setBuilding(true);
-	}
+        }
 
-	public void endDocument ()
-	throws SAXException
-	{
-	    DomDocument doc = (DomDocument) getDocument ();
-	    doc.setStrictErrorChecking(true);
+        public void endDocument ()
+        throws SAXException
+        {
+            DomDocument doc = (DomDocument) getDocument ();
+            doc.setStrictErrorChecking(true);
             doc.setBuilding(false);
-	    doc.compact ();
+            doc.compact ();
             DomDoctype doctype = (DomDoctype) doc.getDoctype();
             if (doctype != null)
               {
                 doctype.makeReadonly();
               }
-	    super.endDocument ();
-	}
+            super.endDocument ();
+        }
 
-	// these three methods collaborate to populate entity
-	// refs, marking contents readonly on end-of-entity
+        // these three methods collaborate to populate entity
+        // refs, marking contents readonly on end-of-entity
 
-	public boolean canPopulateEntityRefs ()
-	    { return true; }
+        public boolean canPopulateEntityRefs ()
+            { return true; }
 
-	public void startEntity (String name)
-	throws SAXException
-	{
-	    if (name.charAt (0) == '%' || "[dtd]".equals (name))
-		return;
-	    super.startEntity (name);
+        public void startEntity (String name)
+        throws SAXException
+        {
+            if (name.charAt (0) == '%' || "[dtd]".equals (name))
+                return;
+            super.startEntity (name);
 
-	    DomNode	top = (DomNode) getTop ();
+            DomNode     top = (DomNode) getTop ();
 
-	    if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE)
-		top.readonly = false;
-	}
+            if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE)
+                top.readonly = false;
+        }
 
-	public void endEntity (String name)
-	throws SAXException
-	{
-	    if (name.charAt (0) == '%' || "[dtd]".equals (name))
-		return;
-	    DomNode	top = (DomNode) getTop ();
+        public void endEntity (String name)
+        throws SAXException
+        {
+            if (name.charAt (0) == '%' || "[dtd]".equals (name))
+                return;
+            DomNode     top = (DomNode) getTop ();
 
-	    if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) {
-		top.compact ();
-		top.makeReadonly ();
-	    }
-	    super.endEntity (name);
-	}
+            if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) {
+                top.compact ();
+                top.makeReadonly ();
+            }
+            super.endEntity (name);
+        }
     }
 }
diff --git a/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java b/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java
index e3c69c43ecb..d6e25529d7e 100644
--- a/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java
+++ b/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java
@@ -1,4 +1,4 @@
-/* DTDAttributeTypeInfo.java -- 
+/* DTDAttributeTypeInfo.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -81,4 +81,3 @@ class DTDAttributeTypeInfo
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java b/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java
index c5553e20e62..9063d4c7957 100644
--- a/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java
+++ b/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java
@@ -1,4 +1,4 @@
-/* DTDElementTypeInfo.java -- 
+/* DTDElementTypeInfo.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -107,6 +107,5 @@ class DTDElementTypeInfo
       }
     return attributes.values().iterator();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomAttr.java b/libjava/classpath/gnu/xml/dom/DomAttr.java
index 6a8da837154..421baf76a48 100644
--- a/libjava/classpath/gnu/xml/dom/DomAttr.java
+++ b/libjava/classpath/gnu/xml/dom/DomAttr.java
@@ -1,4 +1,4 @@
-/* DomAttr.java -- 
+/* DomAttr.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,7 +65,7 @@ import org.w3c.dom.events.MutationEvent;
  * methods (setNodeValue, setValue, and Element.setAttribute) to modify
  * those values.  That is, if you manipulate those children directly,
  * elements won't get notified that attribute values have changed.
- * The natural fix for that will report other modifications, but won't 
+ * The natural fix for that will report other modifications, but won't
  * be able to expose "previous" attribute value; it'll need to be cached
  * or something (at which point why bother using child nodes). 
        
  *
@@ -79,10 +79,10 @@ public class DomAttr
   extends DomNsNode
   implements Attr
 {
-  
+
   private boolean specified;
   private String value; // string value cache
-  
+
   /**
    * Constructs an Attr node associated with the specified document.
    * The "specified" flag is initialized to true, since this DOM has
@@ -95,7 +95,7 @@ public class DomAttr
    *
    * @param owner The document with which this node is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this is used to uniquely identify a type of attribute
+   *    this is used to uniquely identify a type of attribute
    * @param name Name of this attribute, which may include a prefix
    */
   protected DomAttr(DomDocument owner, String namespaceURI, String name)
@@ -103,7 +103,7 @@ public class DomAttr
     super(ATTRIBUTE_NODE, owner, namespaceURI, name);
     specified = true;
     length = 1;
-    
+
     // XXX register self to get insertion/removal events
     // and character data change events and when they happen,
     // report self-mutation
@@ -121,18 +121,18 @@ public class DomAttr
    * 
        
    * With this constructor, the prefix and local part are given explicitly
    * rather than being computed.  This allows them to be explicitly set to
-   * {@code null} as required by {@link Document#createAttribute(String)}.   
+   * {@code null} as required by {@link Document#createAttribute(String)}.
    * 
        
    *
    * @param owner The document with which this node is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this is used to uniquely identify a type of attribute
+   *    this is used to uniquely identify a type of attribute
    * @param name Name of this attribute, which may include a prefix
    * @param prefix the namespace prefix of the name.  May be {@code null}.
    * @param localName the local part of the name.  May be {@code null}.
    */
   protected DomAttr(DomDocument owner, String namespaceURI, String name,
-		    String prefix, String localName)
+                    String prefix, String localName)
   {
     super(ATTRIBUTE_NODE, owner, namespaceURI, name, prefix, localName);
     specified = true;
@@ -147,7 +147,7 @@ public class DomAttr
   {
     return getNodeName();
   }
-  
+
   /**
    * DOM L1
    * Returns true if a parser reported this was in the source text.
@@ -156,7 +156,7 @@ public class DomAttr
   {
     return specified;
   }
-  
+
   /**
    * Records whether this attribute was in the source text.
    */
@@ -194,7 +194,7 @@ public class DomAttr
       }
     return buf.toString();
   }
-  
+
   /**
    * DOM L1
    * Assigns the value of the attribute; it will have one child,
@@ -205,7 +205,7 @@ public class DomAttr
   {
     setNodeValue(value);
   }
-  
+
   /**
    * DOM L1
    * Returns the value of the attribute as a non-null string; same
@@ -216,7 +216,7 @@ public class DomAttr
   {
     return getNodeValue();
   }
-  
+
   /**
    * DOM L1
    * Assigns the attribute value; using this API, no entity or
@@ -246,7 +246,7 @@ public class DomAttr
     this.value = value;
     length = 1;
     specified = true;
-    
+
     mutating(oldValue, value, MutationEvent.MODIFICATION);
   }
 
@@ -334,7 +334,7 @@ public class DomAttr
   {
     return null;
   }
-    
+
   /**
    * Shallow clone of the attribute, breaking all ties with any
    * elements.
@@ -345,18 +345,18 @@ public class DomAttr
     retval.specified = true;
     return retval;
   }
-    
+
   private void mutating(String oldValue, String newValue, short why)
   {
     if (!reportMutations || parent == null || equal(newValue, oldValue))
       {
         return;
       }
-    
+
     // EVENT:  DOMAttrModified, target = parent,
-    //	prev/new values provided, also attr name
-    MutationEvent	event;
-    
+    //  prev/new values provided, also attr name
+    MutationEvent       event;
+
     event = (MutationEvent) createEvent ("MutationEvents");
     event.initMutationEvent ("DOMAttrModified",
                              true /* bubbles */, false /* nocancel */,
@@ -365,7 +365,7 @@ public class DomAttr
   }
 
   // DOM Level 3 methods
-  
+
   public TypeInfo getSchemaTypeInfo()
   {
     if (parent != null)
@@ -409,4 +409,3 @@ public class DomAttr
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomCDATASection.java b/libjava/classpath/gnu/xml/dom/DomCDATASection.java
index e34359e71bf..770f7d5dd29 100644
--- a/libjava/classpath/gnu/xml/dom/DomCDATASection.java
+++ b/libjava/classpath/gnu/xml/dom/DomCDATASection.java
@@ -1,4 +1,4 @@
-/* DomCDATASection.java -- 
+/* DomCDATASection.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,7 +58,7 @@ public class DomCDATASection
   extends DomText
   implements CDATASection
 {
-  
+
   /**
    * Constructs a CDATA section node associated with the specified
    * document and holding the specified data.
@@ -86,6 +86,5 @@ public class DomCDATASection
   {
     return "#cdata-section";
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomCharacterData.java b/libjava/classpath/gnu/xml/dom/DomCharacterData.java
index 1eec5bea734..396c5f7a720 100644
--- a/libjava/classpath/gnu/xml/dom/DomCharacterData.java
+++ b/libjava/classpath/gnu/xml/dom/DomCharacterData.java
@@ -1,4 +1,4 @@
-/* DomCharacterData.java -- 
+/* DomCharacterData.java --
    Copyright (C) 1999,2000,2001,2004,2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -73,7 +73,7 @@ public abstract class DomCharacterData
     {
       return null;
     }
-    
+
   }
 
   /**
@@ -82,7 +82,7 @@ public abstract class DomCharacterData
   static final NodeList CHILD_NODES = new EmptyNodeList();
 
   private String text;
-  
+
   // package private
   DomCharacterData(short nodeType, DomDocument doc, String value)
   {
@@ -113,7 +113,7 @@ public abstract class DomCharacterData
     mutating(value);
     text = value;
   }
-  
+
   /**
    * DOM L1
    * Modifies the value of this node.
@@ -153,7 +153,7 @@ public abstract class DomCharacterData
         throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
       }
   }
-    
+
   /**
    * DOM L1
    * Returns the value of this node.
@@ -162,7 +162,7 @@ public abstract class DomCharacterData
   {
     return text;
   }
-    
+
   /**
    * DOM L1
    * Returns the value of this node; same as getNodeValue.
@@ -180,7 +180,7 @@ public abstract class DomCharacterData
   {
     return text.length();
   }
-  
+
   /**
    * DOM L1
    * Modifies the value of this node.
@@ -194,7 +194,7 @@ public abstract class DomCharacterData
     char[] raw = text.toCharArray();
     char[] tmp = arg.toCharArray ();
     char[] buf = new char[raw.length + tmp.length];
-    
+
     try
       {
         System.arraycopy(raw, 0, buf, 0, offset);
@@ -210,7 +210,7 @@ public abstract class DomCharacterData
         throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
       }
   }
-    
+
   /**
    * DOM L1
    * Modifies the value of this node.  Causes DOMCharacterDataModified
@@ -223,7 +223,7 @@ public abstract class DomCharacterData
         throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
       }
     char[] raw = text.toCharArray();
-    
+
     // deleteData
     if (offset < 0 || count < 0 || offset > raw.length)
       {
@@ -239,7 +239,7 @@ public abstract class DomCharacterData
         System.arraycopy(raw, 0, buf, 0, offset);
         System.arraycopy(raw, offset + count, buf, offset,
                          raw.length - (offset + count));
-        
+
         // insertData
         char[] tmp = arg.toCharArray ();
         char[] buf2 = new char[buf.length + tmp.length];
@@ -256,7 +256,7 @@ public abstract class DomCharacterData
         throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
       }
   }
-    
+
   /**
    * DOM L1
    * Assigns the value of this node.
@@ -275,7 +275,7 @@ public abstract class DomCharacterData
     mutating(value);
     text = value;
   }
- 
+
   /**
    * DOM L1
    * Assigns the value of this node; same as setNodeValue.
@@ -329,17 +329,16 @@ public abstract class DomCharacterData
       {
         return;
       }
-    
+
     // EVENT:  DOMCharacterDataModified, target = this,
     //  prev/new values provided
     MutationEvent  event;
-    
+
     event = (MutationEvent) createEvent("MutationEvents");
     event.initMutationEvent("DOMCharacterDataModified",
                             true /* bubbles */, false /* nocancel */,
                             null, text, newValue, null, (short) 0);
     dispatchEvent(event);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomComment.java b/libjava/classpath/gnu/xml/dom/DomComment.java
index 71c8160485f..5be6bd5181c 100644
--- a/libjava/classpath/gnu/xml/dom/DomComment.java
+++ b/libjava/classpath/gnu/xml/dom/DomComment.java
@@ -1,4 +1,4 @@
-/* DomComment.java -- 
+/* DomComment.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -54,7 +54,7 @@ public class DomComment
   extends DomCharacterData
   implements Comment
 {
- 
+
   /**
    * Constructs a comment node associated with the specified
    * document and holding the specified data.
@@ -67,7 +67,7 @@ public class DomComment
   {
     super(COMMENT_NODE, owner, value);
   }
-  
+
   /**
    * DOM L1
    * Returns the string "#comment".
@@ -78,4 +78,3 @@ public class DomComment
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomDOMException.java b/libjava/classpath/gnu/xml/dom/DomDOMException.java
index cf93fcf9749..4a3ba7a8c82 100644
--- a/libjava/classpath/gnu/xml/dom/DomDOMException.java
+++ b/libjava/classpath/gnu/xml/dom/DomDOMException.java
@@ -1,4 +1,4 @@
-/* DomDOMException.java -- 
+/* DomDOMException.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ import org.w3c.dom.Node;
  * that is being reported, in terms of the relevant DOM structures
  * and data.
  *
- * @author David Brownell 
+ * @author David Brownell
  */
 public class DomDOMException
   extends DOMException
@@ -56,13 +56,13 @@ public class DomDOMException
 
   /** @serial Data that caused an error to be reported */
   private String data;
-  
+
   /** @serial Node associated with the error. */
   private Node node;
-  
+
   /** @serial Data associated with the error. */
   private int value;
-  
+
   /**
    * Constructs an exception, with the diagnostic message
    * corresponding to the specified code.
@@ -71,7 +71,7 @@ public class DomDOMException
   {
     super(code, diagnostic(code));
   }
-  
+
   /**
    * Constructs an exception, with the diagnostic message
    * corresponding to the specified code and additional
@@ -110,7 +110,7 @@ public class DomDOMException
   public String getMessage()
   {
     String retval = super.getMessage();
-    
+
     if (data != null)
       {
         retval += "\nMore Information: " + data;
@@ -127,11 +127,11 @@ public class DomDOMException
   }
 
   // these strings should be localizable.
-  
+
   private static String diagnostic(short code)
   {
     switch (code)
-      {        
+      {
         // DOM L1:
       case INDEX_SIZE_ERR:
         return "An index or size is out of range.";
@@ -153,7 +153,7 @@ public class DomDOMException
         return "That object is not supported.";
       case INUSE_ATTRIBUTE_ERR:
         return "The attribute belongs to a different element.";
-        
+
         // DOM L2:
       case INVALID_STATE_ERR:
         return "The object is not usable.";
@@ -172,4 +172,3 @@ public class DomDOMException
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomDoctype.java b/libjava/classpath/gnu/xml/dom/DomDoctype.java
index d35eedc7f75..ecf7a9588d2 100644
--- a/libjava/classpath/gnu/xml/dom/DomDoctype.java
+++ b/libjava/classpath/gnu/xml/dom/DomDoctype.java
@@ -1,4 +1,4 @@
-/* DomDoctype.java -- 
+/* DomDoctype.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -72,22 +72,22 @@ import org.w3c.dom.Notation;
  * @see DomEntityReference
  * @see DomNotation
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomDoctype
   extends DomExtern
   implements DocumentType
 {
-  
+
   private DomNamedNodeMap notations;
   private DomNamedNodeMap entities;
   private final DOMImplementation implementation;
   private String subset;
-  
+
   private HashMap elements = new HashMap();
   private boolean ids;
-  
+
   /**
    * Constructs a DocumentType node associated with the specified
    * implementation, with the specified name.
@@ -103,11 +103,11 @@ public class DomDoctype
    * @param impl The implementation with which this object is associated
    * @param name Name of this root element
    * @param publicId If non-null, provides the external subset's
-   *	PUBLIC identifier
+   *    PUBLIC identifier
    * @param systemId If non-null, provides the external subset's
-   *	SYSTEM identifier
+   *    SYSTEM identifier
    * @param internalSubset Provides the literal value (unparsed, no
-   *	entities expanded) of the DTD's internal subset.
+   *    entities expanded) of the DTD's internal subset.
    */
   protected DomDoctype(DOMImplementation impl,
                        String name,
@@ -154,7 +154,7 @@ public class DomDoctype
    * then it doesn't have the strange construction rules of L2.
    *
    * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
-   *	is not associated with a document.
+   *    is not associated with a document.
    */
   public NamedNodeMap getEntities()
   {
@@ -172,15 +172,15 @@ public class DomDoctype
    * @param publicId If non-null, provides the entity's PUBLIC identifier
    * @param systemId Provides the entity's SYSTEM identifier
    * @param notation If non-null, provides the entity's notation
-   *	(indicating an unparsed entity)
+   *    (indicating an unparsed entity)
    * @return The Entity that was declared, or null if the entity wasn't
-   *	recorded (because it's a parameter entity or because an entity with
-   *	this name was already declared).
+   *    recorded (because it's a parameter entity or because an entity with
+   *    this name was already declared).
    *
    * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the
-   *	DocumentType is no longer writable.
+   *    DocumentType is no longer writable.
    * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
-   *	is not associated with a document.
+   *    is not associated with a document.
    */
   public Entity declareEntity(String name,
                               String publicId,
@@ -188,7 +188,7 @@ public class DomDoctype
                               String notation)
   {
     DomEntity entity;
-    
+
     if (name.charAt(0) == '%' || "[dtd]".equals(name))
       {
         return null;
@@ -198,19 +198,19 @@ public class DomDoctype
         throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
       }
     getEntities();
-    
+
     DomDocument.checkName(name, (owner != null) ?
                           "1.1".equals(owner.getXmlVersion()) : false);
     if (entities.getNamedItem(name) != null)
       {
         return null;
       }
-    
+
     entity = new DomEntity(owner, name, publicId, systemId, notation);
     entities.setNamedItem(entity);
     return entity;
   }
-  
+
   /**
    * DOM L1
    * Returns information about any notations declared in the DTD.
@@ -219,7 +219,7 @@ public class DomDoctype
    * then it doesn't have the strange construction rules of L2.
    *
    * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
-   *	is not associated with a document.
+   *    is not associated with a document.
    */
   public NamedNodeMap getNotations()
   {
@@ -239,25 +239,25 @@ public class DomDoctype
    * @return The notation that was declared.
    *
    * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the
-   *	DocumentType is no longer writable.
+   *    DocumentType is no longer writable.
    * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType
-   *	is not associated with a document.
+   *    is not associated with a document.
    */
   public Notation declareNotation(String name,
                                   String publicId,
                                   String systemId)
   {
     DomNotation notation;
-    
+
     if (isReadonly())
       {
         throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR);
       }
     getNotations();
-    
+
     DomDocument.checkName(name, (owner != null) ?
                           "1.1".equals(owner.getXmlVersion()) : false);
-    
+
     notation = new DomNotation(owner, name, publicId, systemId);
     notations.setNamedItem(notation);
     return notation;
@@ -290,7 +290,7 @@ public class DomDoctype
   {
     return null;
   }
-    
+
   /**
    * Sets the internal "readonly" flag so the node and its associated
    * data (only lists of entities and notations, no type information
@@ -337,7 +337,7 @@ public class DomDoctype
   {
     return implementation.hasFeature(feature, version);
   }
-    
+
   /**
    * Returns the implementation associated with this document type.
    */
@@ -395,7 +395,7 @@ public class DomDoctype
   {
     return ids;
   }
-  
+
   public boolean isSameNode(Node arg)
   {
     if (equals(arg))
@@ -423,7 +423,7 @@ public class DomDoctype
     // TODO notations
     return true;
   }
-  
+
   /**
    * Shallow clone of the doctype, except that associated
    * entities and notations are (deep) cloned.
diff --git a/libjava/classpath/gnu/xml/dom/DomDocument.java b/libjava/classpath/gnu/xml/dom/DomDocument.java
index b32c6b82dfc..b1e99f46d69 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocument.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocument.java
@@ -1,4 +1,4 @@
-/* DomDocument.java -- 
+/* DomDocument.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -76,7 +76,7 @@ import org.w3c.dom.xpath.XPathNSResolver;
  * of basic XML conformance tests.  (The huge XML character tables are
  * hairy to implement.)
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomDocument
@@ -90,7 +90,7 @@ public class DomDocument
   private boolean defaultAttributes = true;
 
   boolean building; // if true, skip mutation events in the tree
-  
+
   DomDocumentConfiguration config;
 
   String inputEncoding;
@@ -98,7 +98,7 @@ public class DomDocument
   String version = "1.0";
   boolean standalone;
   String systemId;
-  
+
   /**
    * Constructs a Document node, associating it with an instance
    * of the DomImpl class.
@@ -115,7 +115,7 @@ public class DomDocument
   {
     this(new DomImpl());
   }
-  
+
   /**
    * Constructs a Document node, associating it with the specified
    * implementation.  This should only be used in conjunction with
@@ -165,7 +165,7 @@ public class DomDocument
   {
     defaultAttributes = flag;
   }
-  
+
   /**
    * DOM L1
    * Returns the constant "#document".
@@ -236,12 +236,12 @@ public class DomDocument
       {
         doctype = null;
       }
-    
+
     // yes, this is linear in size of document.
     // it'd be easy enough to maintain a hashtable.
     Node current = getDocumentElement();
     Node temp;
-    
+
     if (current == null)
       {
         return null;
@@ -286,14 +286,14 @@ public class DomDocument
                 return element;
               }
           }
-        
+
         // descend?
         if (current.hasChildNodes())
           {
             current = current.getFirstChild();
             continue;
           }
-        
+
         // lateral?
         temp = current.getNextSibling();
         if (temp != null)
@@ -301,8 +301,8 @@ public class DomDocument
             current = temp;
             continue;
           }
-        
-        // back up ... 
+
+        // back up ...
         do
           {
             temp = current.getParentNode();
@@ -385,13 +385,13 @@ public class DomDocument
       }
     return super.replaceChild(newChild, refChild);
   }
- 
+
   // NOTE:  DOM can't really tell when the name of an entity,
   // notation, or PI must follow the namespace rules (excluding
   // colons) instead of the XML rules (which allow them without
   // much restriction).  That's an API issue.  verifyXmlName
   // aims to enforce the XML rules, not the namespace rules.
-  
+
   /**
    * Throws a DOM exception if the specified name is not a legal XML 1.0
    * Name.
@@ -417,7 +417,7 @@ public class DomDocument
       }
 
     // dog: rewritten to use the rules for XML 1.0 and 1.1
-    
+
     // Name start character
     char c = name.charAt(0);
     if (xml11)
@@ -565,13 +565,13 @@ public class DomDocument
     char[] chars = value.toCharArray();
     checkChar(chars, 0, chars.length, xml11);
   }
-  
+
   static void checkChar(char[] buf, int off, int len, boolean xml11)
   {
     for (int i = 0; i < len; i++)
       {
         char c = buf[i];
-        
+
         // assume surrogate pairing checks out OK, for simplicity
         if ((c >= 0x0020 && c <= 0xd7ff) ||
             (c == 0x000a || c == 0x000d || c == 0x0009) ||
@@ -603,7 +603,7 @@ public class DomDocument
   public Element createElement(String name)
   {
     Element element;
-    
+
     if (checkingCharacters)
       {
         checkName(name, "1.1".equals(version));
@@ -633,7 +633,7 @@ public class DomDocument
       {
         checkNCName(name, "1.1".equals(version));
       }
-    
+
     if ("".equals(namespaceURI))
       {
         namespaceURI = null;
@@ -661,13 +661,13 @@ public class DomDocument
                                   "prefixed name '" + name +
                                   "' needs a URI", this, 0);
       }
-    
+
     Element  element = new DomElement(this, namespaceURI, name);
     if (defaultAttributes)
       setDefaultAttributes(element, name);
     return element;
   }
-  
+
   private void setDefaultAttributes(Element element, String name)
   {
     DomDoctype doctype = (DomDoctype) getDoctype();
@@ -687,7 +687,7 @@ public class DomDocument
             if ("#IMPLIED".equals(attr.mode) && value == null)
               continue;
             DomAttr node = (DomAttr) createAttribute(attr.name);
-            
+
             if (value == null)
               {
                 value = "";
@@ -830,7 +830,7 @@ public class DomDocument
       {
         checkNCName(name, "1.1".equals(version));
       }
-    
+
     if ("".equals(namespaceURI))
       {
         namespaceURI = null;
@@ -871,7 +871,7 @@ public class DomDocument
       }
     return new DomAttr(this, namespaceURI, name);
   }
-  
+
   /**
    * DOM L1
    * Returns a newly created reference to the specified entity.
@@ -1006,7 +1006,7 @@ public class DomDocument
           {
             Attr a = (Attr) srcAttrs.item(i);
             Attr dflt;
-            
+
             // maybe update defaulted attributes
             dflt = (Attr) dstAttrs.getNamedItem(a.getNodeName());
             if (dflt != null)
@@ -1019,7 +1019,7 @@ public class DomDocument
                   }
                 continue;
               }
-            
+
             dstAttrs.setNamedItem((Attr) importNode(a, false));
           }
         if (deep)
@@ -1039,7 +1039,7 @@ public class DomDocument
       default:
         throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, src, 0);
       }
-    
+
     // FIXME cleanup a bit -- for deep copies, copy those
     // children in one place, here (code sharing is healthy)
 
@@ -1077,7 +1077,7 @@ public class DomDocument
   }
 
   // DOM Level 3 methods
-  
+
   /**
    * DOM L3
    */
@@ -1090,7 +1090,7 @@ public class DomDocument
   {
     this.inputEncoding = inputEncoding;
   }
-  
+
   /**
    * DOM L3
    */
@@ -1098,12 +1098,12 @@ public class DomDocument
   {
     return encoding;
   }
-  
+
   public void setXmlEncoding(String encoding)
   {
     this.encoding = encoding;
   }
-  
+
   public boolean getXmlStandalone()
   {
     return standalone;
@@ -1181,7 +1181,7 @@ public class DomDocument
     return systemId;
     */
   }
-  
+
   public String getDocumentURI()
   {
     return systemId;
@@ -1454,7 +1454,7 @@ public class DomDocument
         ctx = ctxNext;
       }
   }
-  
+
   public Node renameNode(Node n, String namespaceURI, String qualifiedName)
     throws DOMException
   {
@@ -1514,7 +1514,7 @@ public class DomDocument
                                 "xmlns namespace must be " +
                                 XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0);
               }
-                
+
           }
         src.setNodeName(qualifiedName);
         src.setNamespaceURI(namespaceURI);
@@ -1527,19 +1527,19 @@ public class DomDocument
   }
 
   // -- XPathEvaluator --
-  
+
   public XPathExpression createExpression(String expression,
                                           XPathNSResolver resolver)
     throws XPathException, DOMException
   {
     return new DomXPathExpression(this, expression, resolver);
   }
-  
+
   public XPathNSResolver createNSResolver(Node nodeResolver)
   {
     return new DomXPathNSResolver(nodeResolver);
   }
-    
+
   public Object evaluate(String expression,
                          Node contextNode,
                          XPathNSResolver resolver,
@@ -1553,4 +1553,3 @@ public class DomDocument
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
index e62ce207639..99c254481b4 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java
@@ -1,4 +1,4 @@
-/* DomDocumentBuilder.java -- 
+/* DomDocumentBuilder.java --
    Copyright (C) 2004,2006,2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -68,7 +68,7 @@ class DomDocumentBuilder
   final DOMImplementation impl;
   final DOMImplementationLS ls;
   final LSParser parser;
-  
+
   DomDocumentBuilder(DOMImplementation impl,
                      DOMImplementationLS ls,
                      LSParser parser)
@@ -83,7 +83,7 @@ class DomDocumentBuilder
     DOMConfiguration config = parser.getDomConfig();
     return ((Boolean) config.getParameter("namespaces")).booleanValue();
   }
-  
+
   public boolean isValidating()
   {
     DOMConfiguration config = parser.getDomConfig();
@@ -112,7 +112,7 @@ class DomDocumentBuilder
   {
     return impl;
   }
-  
+
   public Document newDocument()
   {
     return impl.createDocument(null, null, null);
@@ -225,4 +225,3 @@ class DomDocumentBuilder
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java b/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java
index 4d2828af84e..1e3eaa58274 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java
@@ -1,4 +1,4 @@
-/* DomDocumentBuilderFactory.java -- 
+/* DomDocumentBuilderFactory.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -156,7 +156,7 @@ public class DomDocumentBuilderFactory
   {
     // TODO
   }
-  
+
   public void setFeature(String name, boolean value)
     throws ParserConfigurationException
   {
@@ -177,6 +177,5 @@ public class DomDocumentBuilderFactory
       return secureProcessing;
     throw new ParserConfigurationException(name);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java b/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java
index 5c589f82fe2..9aab44532e9 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java
@@ -1,4 +1,4 @@
-/* DomDocumentConfiguration.java -- 
+/* DomDocumentConfiguration.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -245,12 +245,12 @@ class DomDocumentConfiguration
         return null;
       }
   }
-  
+
   public int getLength()
   {
     return SUPPORTED_PARAMETERS.size();
   }
-  
+
   public boolean contains(String str)
   {
     str = str.toLowerCase();
diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java b/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java
index 8d260377821..8c4e0db3b62 100644
--- a/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java
+++ b/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java
@@ -1,4 +1,4 @@
-/* DomDocumentFragment.java -- 
+/* DomDocumentFragment.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,14 +42,14 @@ import org.w3c.dom.DocumentFragment;
 /**
  * 
         "DocumentFragment" implementation.  
        
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomDocumentFragment
   extends DomNode
   implements DocumentFragment
 {
-  
+
   /**
    * Constructs a DocumentFragment node associated with the
    * specified document.
@@ -71,6 +71,5 @@ public class DomDocumentFragment
   {
     return "#document-fragment";
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomElement.java b/libjava/classpath/gnu/xml/dom/DomElement.java
index 462cb9178a6..429749978a3 100644
--- a/libjava/classpath/gnu/xml/dom/DomElement.java
+++ b/libjava/classpath/gnu/xml/dom/DomElement.java
@@ -1,4 +1,4 @@
-/* DomElement.java -- 
+/* DomElement.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ import org.w3c.dom.TypeInfo;
 /**
  * 
         "Element" implementation.
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomElement
@@ -81,7 +81,7 @@ public class DomElement
    *
    * @param owner The document with which this node is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this is used to uniquely identify a type of element
+   *    this is used to uniquely identify a type of element
    * @param name Name of this element, which may include a prefix
    */
   protected DomElement(DomDocument owner, String namespaceURI, String name)
@@ -99,18 +99,18 @@ public class DomElement
    * 
        
    * With this constructor, the prefix and local part are given explicitly
    * rather than being computed.  This allows them to be explicitly set to
-   * {@code null} as required by {@link Document#createElement(String)}.   
+   * {@code null} as required by {@link Document#createElement(String)}.
    * 
        
    *
    * @param owner The document with which this node is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this is used to uniquely identify a type of element
+   *    this is used to uniquely identify a type of element
    * @param name Name of this element, which may include a prefix
    * @param prefix the namespace prefix of the name.  May be {@code null}.
    * @param localName the local part of the name.  May be {@code null}.
    */
   protected DomElement(DomDocument owner, String namespaceURI, String name,
-		       String prefix, String localName)
+                       String prefix, String localName)
   {
     super(ELEMENT_NODE, owner, namespaceURI, name, prefix, localName);
   }
@@ -263,7 +263,7 @@ public class DomElement
    * DOM L1
    * Modifies an existing attribute to have the specified value,
    * or creates a new one with that value.  The name used is the
-   * nodeName value. 
+   * nodeName value.
    */
   public void setAttribute(String name, String value)
   {
@@ -476,7 +476,7 @@ public class DomElement
       }
     return super.lookupNamespaceURI(prefix);
   }
-  
+
   public String getBaseURI()
   {
     if (attributes != null)
@@ -490,7 +490,7 @@ public class DomElement
       }
     return super.getBaseURI();
   }
-  
+
   public TypeInfo getSchemaTypeInfo()
   {
     // DTD implementation
@@ -509,7 +509,7 @@ public class DomElement
     Attr attr = (Attr) attrs.getNamedItem(name);
     setIdAttributeNode(attr, isId);
   }
-  
+
   public void setIdAttributeNode(Attr attr, boolean isId)
   {
     if (readonly)
@@ -578,5 +578,5 @@ public class DomElement
       }
     return true;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomEntity.java b/libjava/classpath/gnu/xml/dom/DomEntity.java
index 3a76479a389..be44d735992 100644
--- a/libjava/classpath/gnu/xml/dom/DomEntity.java
+++ b/libjava/classpath/gnu/xml/dom/DomEntity.java
@@ -1,4 +1,4 @@
-/* DomEntity.java -- 
+/* DomEntity.java --
    Copyright (C) 1999,2000,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,17 +45,17 @@ import org.w3c.dom.Entity;
  * particularly well in this API:
        
  *
  * 
        Unparsed Entities
        
- *	
        Since ENTITY/ENTITIES attributes, the only legal use of unparsed
- *	entities in XML, can't be detected with DOM, there isn't much point in
- *	trying to use unparsed entities in DOM applications.  (XML Linking is
- *	working to provide a better version of this functionality.) 
        
+ *      
        Since ENTITY/ENTITIES attributes, the only legal use of unparsed
+ *      entities in XML, can't be detected with DOM, there isn't much point in
+ *      trying to use unparsed entities in DOM applications.  (XML Linking is
+ *      working to provide a better version of this functionality.) 
        
  *
  * 
        Parsed Entities
        
- *	
         While the DOM specification permits nodes for parsed entities
- *	to have a readonly set of children, this is not required and there
- *	is no portable way to provide such children.  This implementation
- *	currently does not permit children to be added to Entities.
- *	There are related issues with the use of EntityReference nodes.  
        
+ *      
         While the DOM specification permits nodes for parsed entities
+ *      to have a readonly set of children, this is not required and there
+ *      is no portable way to provide such children.  This implementation
+ *      currently does not permit children to be added to Entities.
+ *      There are related issues with the use of EntityReference nodes.  
        
  *
  * 
        
  *
@@ -65,14 +65,14 @@ import org.w3c.dom.Entity;
  * @see DomEntityReference
  * @see DomNotation
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomEntity
   extends DomExtern
   implements Entity
 {
-  
+
   private String notation;
 
   /**
@@ -113,13 +113,13 @@ public class DomEntity
   }
 
   // DOM Level 3 methods
-  
+
   public String getInputEncoding()
   {
     // TODO
-    return null;    
+    return null;
   }
-  
+
   public String getXmlEncoding()
   {
     // TODO
@@ -142,6 +142,5 @@ public class DomEntity
     String systemId = getSystemId();
     return (systemId == null) ? owner.getBaseURI() : systemId;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomEntityReference.java b/libjava/classpath/gnu/xml/dom/DomEntityReference.java
index d4596b405d4..1fa2ea628eb 100644
--- a/libjava/classpath/gnu/xml/dom/DomEntityReference.java
+++ b/libjava/classpath/gnu/xml/dom/DomEntityReference.java
@@ -1,4 +1,4 @@
-/* DomEntityReference.java -- 
+/* DomEntityReference.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -71,7 +71,7 @@ import org.w3c.dom.EntityReference;
  * @see DomDoctype
  * @see DomEntity
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomEntityReference
@@ -80,7 +80,7 @@ public class DomEntityReference
 {
 
   private String name;
-  
+
   /**
    * Constructs an EntityReference node associated with the specified
    * document.  The creator should populate this with whatever contents
@@ -97,7 +97,7 @@ public class DomEntityReference
     super(ENTITY_REFERENCE_NODE, owner);
     this.name = name;
   }
-  
+
   /**
    * Returns the name of the referenced entity.
    * @since DOM Level 1 Core
diff --git a/libjava/classpath/gnu/xml/dom/DomEvent.java b/libjava/classpath/gnu/xml/dom/DomEvent.java
index 9190ed8eb0e..3e9a6550a64 100644
--- a/libjava/classpath/gnu/xml/dom/DomEvent.java
+++ b/libjava/classpath/gnu/xml/dom/DomEvent.java
@@ -1,4 +1,4 @@
-/* DomEvent.java -- 
+/* DomEvent.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ import org.w3c.dom.events.EventTarget;
 import org.w3c.dom.events.MutationEvent;
 import org.w3c.dom.events.UIEvent;
 
-import org.w3c.dom.views.AbstractView;		// used by UIEvent
+import org.w3c.dom.views.AbstractView;          // used by UIEvent
 
 /**
  * "Event" implementation.  Events are
@@ -62,7 +62,7 @@ import org.w3c.dom.views.AbstractView;		// used by UIEvent
 public class DomEvent
   implements Event
 {
-  
+
   String  type;  // init
   EventTarget  target;
   EventTarget  currentNode;
@@ -130,10 +130,10 @@ public class DomEvent
   {
     return timeStamp;
   }
-  
+
   boolean stop;
   boolean doDefault;
-  
+
   /**
    * Requests the event no longer be captured or bubbled; only
    * listeners on the event target will see the event, if they
@@ -174,7 +174,7 @@ public class DomEvent
     cancelable = cancelableArg;
     timeStamp = System.currentTimeMillis();
   }
-  
+
   /** Constructs, but does not initialize, an event. */
   public DomEvent(String type)
   {
@@ -216,7 +216,7 @@ public class DomEvent
     buf.append("]");
     return buf.toString();
   }
-  
+
   /**
    * "MutationEvent" implementation.
    */
@@ -224,46 +224,46 @@ public class DomEvent
     extends DomEvent
     implements MutationEvent
   {
-    
+
     // package private
     Node   relatedNode; // init
-    
+
     private String  prevValue; // init
     private String  newValue; // init
-    
+
     private String  attrName; // init
     private short  attrChange; // init
-    
+
     /** Returns any "related" node provided by this type of event */
     public final Node getRelatedNode()
     {
       return relatedNode;
     }
-    
+
     /** Returns any "previous value" provided by this type of event */
     public final String getPrevValue()
     {
       return prevValue;
     }
-    
+
     /** Returns any "new value" provided by this type of event */
     public final String getNewValue()
     {
       return newValue;
     }
-    
+
     /** For attribute change events, returns the attribute's name */
     public final String getAttrName()
     {
       return attrName;
     }
-    
+
     /** For attribute change events, returns how the attribuet changed */
     public final short getAttrChange()
     {
       return attrChange;
     }
-    
+
     /** Initializes a mutation event */
     public final void initMutationEvent(String typeArg,
                                         boolean canBubbleArg,
@@ -281,7 +281,7 @@ public class DomEvent
       bubbles = canBubbleArg;
       cancelable = cancelableArg;
       timeStamp = System.currentTimeMillis();
-      
+
       relatedNode = relatedNodeArg;
       prevValue = prevValueArg;
       newValue = newValueArg;
@@ -304,7 +304,7 @@ public class DomEvent
     {
       super(type);
     }
-  
+
   }
 
   /**
@@ -314,16 +314,16 @@ public class DomEvent
     extends DomEvent
     implements UIEvent
   {
-    
+
     private AbstractView view;  // init
     private int  detail;  // init
-    
+
     /** Constructs an uninitialized User Interface (UI) event */
     public DomUIEvent (String type) { super (type); }
-    
+
     public final AbstractView getView () { return view; }
     public final int getDetail () { return detail; }
-    
+
     /** Initializes a UI event */
     public final void initUIEvent(String typeArg,
                                   boolean canBubbleArg,
@@ -335,7 +335,7 @@ public class DomEvent
       view = viewArg;
       detail = detailArg;
     }
-  
+
   }
 
     /*
@@ -349,4 +349,3 @@ public class DomEvent
     */
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomExtern.java b/libjava/classpath/gnu/xml/dom/DomExtern.java
index 87a6909f758..7f2e55afc6a 100644
--- a/libjava/classpath/gnu/xml/dom/DomExtern.java
+++ b/libjava/classpath/gnu/xml/dom/DomExtern.java
@@ -1,4 +1,4 @@
-/* DomExtern.java -- 
+/* DomExtern.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,17 +48,17 @@ package gnu.xml.dom;
  * of them is defined fully enough to permit full use of the
  * XML feature they partially expose. 
        
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public abstract class DomExtern
   extends DomNode
 {
- 
+
   private final String name;
   private final String publicId;
   private final String systemId;
-  
+
   /**
    * Constructs a node associated with the specified document,
    * with the specified descriptive data.
@@ -98,7 +98,7 @@ public abstract class DomExtern
   {
     return publicId;
   }
-  
+
   /**
    * DOM L1
    * Returns the object's name.
@@ -112,6 +112,5 @@ public abstract class DomExtern
   {
     return name;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomImpl.java b/libjava/classpath/gnu/xml/dom/DomImpl.java
index cabe741c931..76a63caf60c 100644
--- a/libjava/classpath/gnu/xml/dom/DomImpl.java
+++ b/libjava/classpath/gnu/xml/dom/DomImpl.java
@@ -1,4 +1,4 @@
-/* DomImpl.java -- 
+/* DomImpl.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,13 +64,13 @@ import gnu.xml.dom.ls.DomLSSerializer;
  * It is possible to compile the package so it doesn't support some of these
  * features (notably, Traversal).
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomImpl
   implements DOMImplementation, DOMImplementationLS
 {
-  
+
   /**
    * Constructs a DOMImplementation object which supports
    * "XML" and other DOM Level 2 features.
@@ -95,7 +95,7 @@ public class DomImpl
       {
         name = name.substring(1);
       }
-    
+
     if ("xml".equals(name) || "core".equals(name))
       {
         return (version == null ||
@@ -103,7 +103,7 @@ public class DomImpl
                 "1.0".equals(version) ||
                 "2.0".equals(version) ||
                 "3.0".equals(version));
-      
+
       }
     else if ("ls".equals(name) || "ls-async".equals(name))
       {
@@ -120,7 +120,7 @@ public class DomImpl
         return (version == null ||
                 "".equals(version) ||
                 "2.0".equals(version));
-	
+
         // Extension:  "USER-" prefix event types can
         // be created and passed through the DOM.
 
@@ -131,11 +131,11 @@ public class DomImpl
                 "".equals(version) ||
                 "0.1".equals(version));
 
-	// NOTE:  "hasFeature" for events is here interpreted to
-	// mean the DOM can manufacture those sorts of events,
-	// since actually choosing to report the events is more
-	// often part of the environment or application.  It's
-	// only really an issue for mutation events.
+        // NOTE:  "hasFeature" for events is here interpreted to
+        // mean the DOM can manufacture those sorts of events,
+        // since actually choosing to report the events is more
+        // often part of the environment or application.  It's
+        // only really an issue for mutation events.
 
       }
     else if (DomNode.reportMutations
@@ -143,7 +143,7 @@ public class DomImpl
       {
         return (version == null ||
                 "".equals(version) ||
-		"2.0".equals(version));
+                "2.0".equals(version));
       }
     else if ("xpath".equals(name))
       {
@@ -162,7 +162,7 @@ public class DomImpl
     // stylesheets
     // css, css2
     // range
-    
+
     return false;
   }
 
@@ -208,7 +208,7 @@ public class DomImpl
   {
     Document doc = createDocument();
     Element root = null;
-    
+
     if (rootName != null)
       {
         root = doc.createElementNS(namespaceURI, rootName);
@@ -221,7 +221,7 @@ public class DomImpl
     // Bleech -- L2 seemingly _requires_ omission of xmlns attributes.
     if (doctype != null)
       {
-        doc.appendChild(doctype);		// handles WRONG_DOCUMENT error
+        doc.appendChild(doctype);               // handles WRONG_DOCUMENT error
       }
     if (root != null)
       {
@@ -236,7 +236,7 @@ public class DomImpl
   }
 
   // DOM Level 3
-  
+
   public Object getFeature(String feature, String version)
   {
     if (hasFeature(feature, version))
@@ -273,6 +273,5 @@ public class DomImpl
   {
     return new DomLSOutput();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomIterator.java b/libjava/classpath/gnu/xml/dom/DomIterator.java
index 31f9982467b..d5f305cd845 100644
--- a/libjava/classpath/gnu/xml/dom/DomIterator.java
+++ b/libjava/classpath/gnu/xml/dom/DomIterator.java
@@ -1,4 +1,4 @@
-/* DomIterator.java -- 
+/* DomIterator.java --
    Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,21 +50,21 @@ import org.w3c.dom.traversal.NodeIterator;
  * 
         "NodeIterator" implementation, usable with any L2 DOM which
  * supports MutationEvents. 
        
  *
- * @author David Brownell 
+ * @author David Brownell
  */
 public final class DomIterator
   implements NodeIterator, EventListener
 {
-  
+
   private Node reference;
   private boolean right;
   private boolean done;
-  
+
   private final Node root;
   private final int whatToShow;
   private final NodeFilter filter;
   private final boolean expandEntityReferences;
-  
+
   /**
    * Constructs and initializes an iterator.
    */
@@ -73,22 +73,22 @@ public final class DomIterator
                         NodeFilter filter,
                         boolean entityReferenceExpansion)
   {
-    if (!root.isSupported("MutationEvents", "2.0")) 
+    if (!root.isSupported("MutationEvents", "2.0"))
       {
         throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR,
                         "Iterator needs mutation events", root, 0);
       }
-	
+
     this.root = root;
     this.whatToShow = whatToShow;
     this.filter = filter;
     this.expandEntityReferences = entityReferenceExpansion;
-    
+
     // start condition:  going right, seen nothing yet.
     reference = null;
     right = true;
-    
-    EventTarget	target = (EventTarget) root;
+
+    EventTarget target = (EventTarget) root;
     target.addEventListener("DOMNodeRemoved", this, false);
   }
 
@@ -100,7 +100,7 @@ public final class DomIterator
    */
   public void detach()
   {
-    EventTarget	target = (EventTarget) root;
+    EventTarget target = (EventTarget) root;
     target.removeEventListener("DOMNodeRemoved", this, false);
     done = true;
   }
@@ -114,7 +114,7 @@ public final class DomIterator
   {
     return expandEntityReferences;
   }
-    
+
   /**
    * DOM L2
    * Returns the filter provided during construction.
@@ -123,7 +123,7 @@ public final class DomIterator
   {
     return filter;
   }
-    
+
   /**
    * DOM L2
    * Returns the root of the tree this is iterating through.
@@ -132,7 +132,7 @@ public final class DomIterator
   {
     return root;
   }
-    
+
   /**
    * DOM L2
    * Returns the mask of flags provided during construction.
@@ -141,7 +141,7 @@ public final class DomIterator
   {
     return whatToShow;
   }
-    
+
   /**
    * DOM L2
    * Returns the next node in a forward iteration, masked and filtered.
@@ -228,7 +228,7 @@ public final class DomIterator
       }
     return leaf;
   }
-    
+
   //
   // Returns the immediate successor in a forward (or backward)
   // document order walk, sans filtering ... except that it knows
@@ -253,13 +253,13 @@ public final class DomIterator
       {
         return here.getFirstChild();
       }
-    
+
     // There's no way up or sideways from the root, so if we
     // couldn't move down to a child, there's nowhere to go.
     //
     if (here == root)
       return null;
-    
+
     //
     // Siblings ... if forward, we visit them, if backwards
     // we visit their children first.
@@ -284,7 +284,7 @@ public final class DomIterator
           }
         return next;
       }
-	
+
     //
     // We can't go down or lateral -- it's up, then.  The logic is
     // the converse of what's above:  backwards is easy (the parent
@@ -295,7 +295,7 @@ public final class DomIterator
       {
         return next;
       }
-    
+
     Node temp = null;
     while (next != null
            && next != root
@@ -303,7 +303,7 @@ public final class DomIterator
       {
         next = next.getParentNode();
       }
-    
+
     // If we have exceeded the root node then stop traversing.
     if (next == root.getParentNode())
       {
@@ -324,7 +324,7 @@ public final class DomIterator
   {
     MutationEvent event;
     Node ancestor, removed;
-    
+
     if (reference == null
         || !"DOMNodeRemoved".equals(e.getType())
         || e.getEventPhase() != Event.BUBBLING_PHASE)
@@ -372,10 +372,9 @@ search:
           }
         return;
       }
-	
+
     // The current DOM WD talks about a special case here;
     // I've not yet seen it.
     }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java b/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java
index 4cf57772e9b..3dd9575605c 100644
--- a/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java
+++ b/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java
@@ -1,4 +1,4 @@
-/* DomNSResolverContext.java -- 
+/* DomNSResolverContext.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,41 +50,41 @@ class DomNSResolverContext
   implements NamespaceContext, Iterator
 {
 
-	final XPathNSResolver resolver;
+        final XPathNSResolver resolver;
 
-	DomNSResolverContext(XPathNSResolver resolver)
-	{
-		this.resolver = resolver;
-	}
+        DomNSResolverContext(XPathNSResolver resolver)
+        {
+                this.resolver = resolver;
+        }
 
-	public String getNamespaceURI(String prefix)
-	{
-		return resolver.lookupNamespaceURI(prefix);
-	}
+        public String getNamespaceURI(String prefix)
+        {
+                return resolver.lookupNamespaceURI(prefix);
+        }
 
-	public String getPrefix(String namespaceURI)
-	{
-		return null;
-	}
+        public String getPrefix(String namespaceURI)
+        {
+                return null;
+        }
 
-	public Iterator getPrefixes(String namespaceURI)
-	{
-		return this;
-	}
+        public Iterator getPrefixes(String namespaceURI)
+        {
+                return this;
+        }
 
-	public boolean hasNext()
-	{
-		return false;
-	}
+        public boolean hasNext()
+        {
+                return false;
+        }
 
-	public Object next()
-	{
-		return null;
-	}
+        public Object next()
+        {
+                return null;
+        }
 
-	public void remove()
-	{
-		throw new UnsupportedOperationException();
-	}
+        public void remove()
+        {
+                throw new UnsupportedOperationException();
+        }
 
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java b/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java
index e37cc3dceb5..7a767355a31 100644
--- a/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java
+++ b/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java
@@ -1,4 +1,4 @@
-/* DomNamedNodeMap.java -- 
+/* DomNamedNodeMap.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ import org.w3c.dom.Node;
  * Used mostly to hold element attributes, but sometimes also
  * to list notations or entities.
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomNamedNodeMap
@@ -55,11 +55,11 @@ public class DomNamedNodeMap
 
   final DomNode owner;
   final short type;
-  
+
   DomNode first;
   int length;
   boolean readonly;
-  
+
   // package private
   DomNamedNodeMap(DomNode owner, short type)
   {
@@ -76,8 +76,8 @@ public class DomNamedNodeMap
   public final boolean isReadonly()
   {
     return readonly;
-  }  
-    
+  }
+
   /**
    * Sets the internal "readonly" flag so the node and its
    * children can't be changed.
@@ -90,7 +90,7 @@ public class DomNamedNodeMap
         ctx.makeReadonly();
       }
   }
-  
+
   /**
    * DOM L1
    * Returns the named item from the map, or null; names are just
@@ -189,7 +189,7 @@ public class DomNamedNodeMap
         node.parent = owner;
         node.depth = owner.depth + 1;
       }
-    
+
     String nodeName = node.getNodeName();
     String localName = ns ? node.getLocalName() : null;
     String namespaceURI = ns ? node.getNamespaceURI() : null;
@@ -197,7 +197,7 @@ public class DomNamedNodeMap
       {
         namespaceURI = null;
       }
-    
+
     // maybe attribute ADDITION events (?)
     DomNode last = null;
     for (DomNode ctx = first; ctx != null; ctx = ctx.next)
@@ -373,10 +373,10 @@ public class DomNamedNodeMap
             ctx.index = 0;
             return ctx;
           }
-      }    
+      }
     throw new DomDOMException(DOMException.NOT_FOUND_ERR);
   }
-  
+
   String getDefaultValue(String name)
   {
     DomDoctype doctype = (DomDoctype) owner.owner.getDoctype();
@@ -417,5 +417,5 @@ public class DomNamedNodeMap
   {
     return length;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomNode.java b/libjava/classpath/gnu/xml/dom/DomNode.java
index 78e1ab85c85..879baaa8d4c 100644
--- a/libjava/classpath/gnu/xml/dom/DomNode.java
+++ b/libjava/classpath/gnu/xml/dom/DomNode.java
@@ -1,4 +1,4 @@
-/* DomNode.java -- 
+/* DomNode.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -102,10 +102,10 @@ public abstract class DomNode
   //final static String xmlnsURI = "http://www.w3.org/2000/xmlns/";
 
   // tunable
-  //	NKIDS_* affects arrays of children (which grow)
+  //    NKIDS_* affects arrays of children (which grow)
   // (currently) fixed size:
-  //	ANCESTORS_* is for event capture/bubbling, # ancestors
-  //	NOTIFICATIONS_* is for per-node event delivery, # events
+  //    ANCESTORS_* is for event capture/bubbling, # ancestors
+  //    NOTIFICATIONS_* is for per-node event delivery, # events
   private static final int NKIDS_DELTA = 8;
   private static final int ANCESTORS_INIT = 20;
   private static final int NOTIFICATIONS_INIT = 10;
@@ -193,7 +193,7 @@ public abstract class DomNode
     this.owner = owner;
     this.listeners = new HashSet();
   }
-  
+
 
   /**
    * DOM L1
@@ -314,7 +314,7 @@ public abstract class DomNode
       this.owner;
     DomDocument childOwner = child.owner;
     short childNodeType = child.nodeType;
-    
+
     if (childOwner != owner)
       {
         // new in DOM L2, this case -- patch it up later, in reparent()
@@ -338,7 +338,7 @@ public abstract class DomNode
             return;
           }
         break;
-        
+
       case ATTRIBUTE_NODE:
         switch (childNodeType)
           {
@@ -347,7 +347,7 @@ public abstract class DomNode
             return;
           }
         break;
-        
+
       case DOCUMENT_FRAGMENT_NODE:
       case ENTITY_REFERENCE_NODE:
       case ELEMENT_NODE:
@@ -384,7 +384,7 @@ public abstract class DomNode
                                   this, 0);
       }
   }
-  
+
   // Here's hoping a good optimizer will detect the case when the
   // next several methods are never called, and won't allocate
   // object code space of any kind.  (Case:  not reporting any
@@ -399,7 +399,7 @@ public abstract class DomNode
         return;
       }
     boolean doFree = false;
-    
+
     if (event == null)
       {
         event = getMutationEvent();
@@ -531,7 +531,7 @@ public abstract class DomNode
   {
     try
       {
-        DomNode	child = (DomNode) newChild;
+        DomNode child = (DomNode) newChild;
 
         if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
           {
@@ -610,9 +610,9 @@ public abstract class DomNode
 
     try
       {
-        DomNode	child = (DomNode) newChild;
+        DomNode child = (DomNode) newChild;
         DomNode ref = (DomNode) refChild;
-        
+
         if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
           {
             // Append all nodes in the fragment to this node
@@ -641,7 +641,7 @@ public abstract class DomNode
                                           "can't insert node before itself",
                                           ref, 0);
               }
-        
+
             if (child.parent != null)
               {
                 child.parent.removeChild(child);
@@ -672,7 +672,7 @@ public abstract class DomNode
               }
             length++;
           }
-        
+
         return child;
       }
     catch (ClassCastException e)
@@ -713,10 +713,10 @@ public abstract class DomNode
       {
         DomNode child = (DomNode) newChild;
         DomNode ref = (DomNode) refChild;
-        
+
         DomEvent.DomMutationEvent event = getMutationEvent();
         boolean doFree = (event != null);
-            
+
         if (child.nodeType == DOCUMENT_FRAGMENT_NODE)
           {
             // Append all nodes in the fragment to this node
@@ -729,14 +729,14 @@ public abstract class DomNode
                 throw new DomDOMException(DOMException.NOT_FOUND_ERR,
                                           null, ref, 0);
               }
-            
+
             if (reportMutations)
               {
                 removalEvent(event, ref);
               }
             length--;
             length += child.length;
-            
+
             if (child.length == 0)
               {
                 // Removal
@@ -793,12 +793,12 @@ public abstract class DomNode
                 throw new DomDOMException(DOMException.NOT_FOUND_ERR,
                                           null, ref, 0);
               }
-        
+
             if (reportMutations)
               {
                 removalEvent(event, ref);
               }
-            
+
             if (child.parent != null)
               {
                 child.parent.removeChild(child);
@@ -839,7 +839,7 @@ public abstract class DomNode
         ref.setDepth(0);
         ref.previous = null;
         ref.next = null;
-        
+
         return ref;
       }
     catch (ClassCastException e)
@@ -875,7 +875,7 @@ public abstract class DomNode
             throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR,
                                       null, this, 0);
           }
-        
+
         for (DomNode child = first; child != null; child = child.next)
           {
             if (child == ref)
@@ -913,7 +913,7 @@ public abstract class DomNode
                 ref.index = 0;
                 ref.previous = null;
                 ref.next = null;
-                
+
                 return ref;
               }
           }
@@ -1002,9 +1002,9 @@ public abstract class DomNode
    */
   public boolean isSupported(String feature, String version)
   {
-    Document		doc = owner;
-    DOMImplementation	impl = null;
-    
+    Document            doc = owner;
+    DOMImplementation   impl = null;
+
     if (doc == null && nodeType == DOCUMENT_NODE)
       {
         doc = (Document) this;
@@ -1183,7 +1183,7 @@ public abstract class DomNode
     try
       {
         DomNode node = (DomNode) super.clone();
-        
+
         node.parent = null;
         node.depth = 0;
         node.index = 0;
@@ -1192,7 +1192,7 @@ public abstract class DomNode
         node.last = null;
         node.previous = null;
         node.next = null;
-        
+
         node.readonly = false;
         node.listeners = new HashSet();
         node.nListeners = 0;
@@ -1242,7 +1242,7 @@ public abstract class DomNode
   {
 
     private LiveNodeList liveList;
-    
+
     ShadowList(String ns, String local)
     {
       liveList = new LiveNodeList(ns, local);
@@ -1268,15 +1268,15 @@ public abstract class DomNode
   final class LiveNodeList
     implements NodeList, EventListener, NodeFilter
   {
- 
+
     private final boolean matchAnyURI;
-    private final boolean matchAnyName; 
+    private final boolean matchAnyName;
     private final String elementURI;
     private final String elementName;
-    
+
     private DomIterator current;
     private int lastIndex;
-    
+
     LiveNodeList(String uri, String name)
     {
       elementURI = uri;
@@ -1336,28 +1336,28 @@ public abstract class DomNode
     {
       return new DomIterator(DomNode.this,
                              NodeFilter.SHOW_ELEMENT,
-                             this,	/* filter */
-                             true	/* expand entity refs */
+                             this,      /* filter */
+                             true       /* expand entity refs */
                             );
     }
 
     public void handleEvent(Event e)
     {
-      MutationEvent	mutation = (MutationEvent) e;
-      Node		related = mutation.getRelatedNode();
-      
+      MutationEvent     mutation = (MutationEvent) e;
+      Node              related = mutation.getRelatedNode();
+
       // XXX if it's got children ... check all kids too, they
       // will invalidate our saved index
-      
+
       if (related.getNodeType() != Node.ELEMENT_NODE ||
           related.getNodeName() != elementName ||
           related.getNamespaceURI() != elementURI)
         {
           return;
         }
-      
+
       if (current != null)
-	current.detach();
+        current.detach();
       current = null;
     }
 
@@ -1368,7 +1368,7 @@ public abstract class DomNode
           current = createIterator();
           lastIndex = -1;
         }
-      
+
       // last node or before?  go backwards
       if (index <= lastIndex) {
         while (index != lastIndex) {
@@ -1376,11 +1376,11 @@ public abstract class DomNode
           lastIndex--;
         }
         Node ret = current.previousNode ();
-	current.detach();
+        current.detach();
         current = null;
         return ret;
-      } 
-      
+      }
+
       // somewhere after last node
       while (++lastIndex != index)
         current.nextNode ();
@@ -1390,12 +1390,12 @@ public abstract class DomNode
       current = null;
       return ret;
     }
-    
+
     public int getLength()
     {
       int retval = 0;
       NodeIterator iter = createIterator();
-      
+
       while (iter.nextNode() != null)
         {
           retval++;
@@ -1403,7 +1403,7 @@ public abstract class DomNode
       iter.detach();
       return retval;
     }
-    
+
   }
 
   //
@@ -1411,7 +1411,7 @@ public abstract class DomNode
   //
   static final class ListenerRecord
   {
-  
+
     String type;
     EventListener listener;
     boolean useCapture;
@@ -1435,10 +1435,10 @@ public abstract class DomNode
         && useCapture == rec.useCapture
         && type == rec.type;
     }
-    
+
     public int hashCode()
     {
-	return listener.hashCode() ^ type.hashCode();
+        return listener.hashCode() ^ type.hashCode();
     }
   }
 
@@ -1456,32 +1456,32 @@ public abstract class DomNode
    * of DomEvent and pass that to dispatchEvent().
    *
    * @param eventType Identifies the particular DOM feature module
-   *	defining the type of event, such as "MutationEvents".
-   *	The event "name" is a different kind of "type".
+   *    defining the type of event, such as "MutationEvents".
+   *    The event "name" is a different kind of "type".
    */
   public Event createEvent(String eventType)
   {
     eventType = eventType.toLowerCase();
-    
+
     if ("mutationevents".equals(eventType))
       {
         return new DomEvent.DomMutationEvent(null);
       }
-    
+
     if ("htmlevents".equals(eventType)
         || "events".equals(eventType)
         || "user-events".equals(eventType))
       {
         return new DomEvent(null);
       }
-    
+
     if ("uievents".equals(eventType))
       {
         return new DomEvent.DomUIEvent(null);
       }
 
-    // mouse events 
-    
+    // mouse events
+
     throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR,
                               eventType, null, 0);
   }
@@ -1508,12 +1508,12 @@ public abstract class DomNode
   static final class DomEventException
     extends EventException
   {
-   
+
     DomEventException()
     {
       super(UNSPECIFIED_EVENT_TYPE_ERR, "unspecified event type");
     }
-    
+
   }
 
   /**
@@ -1527,7 +1527,7 @@ public abstract class DomNode
    *
    * @exception NullPointerException When a null event is passed.
    * @exception ClassCastException When the event wasn't provided by
-   *	the createEvent method, or otherwise isn't a DomEvent.
+   *    the createEvent method, or otherwise isn't a DomEvent.
    * @exception EventException If the event type wasn't specified
    */
   public final boolean dispatchEvent(Event event)
@@ -1537,7 +1537,7 @@ public abstract class DomNode
     DomNode[] ancestors = null;
     int ancestorMax = 0;
     boolean haveDispatchDataLock = false;
-    
+
     if (e.type == null)
       {
         throw new DomEventException();
@@ -1545,7 +1545,7 @@ public abstract class DomNode
 
     e.doDefault = true;
     e.target = this;
-    
+
     //
     // Typical case:  one nonrecursive dispatchEvent call at a time
     // for this class.  If that's our case, we can avoid allocating
@@ -1565,7 +1565,7 @@ public abstract class DomNode
         boolean haveAncestorRegistrations = false;
         ListenerRecord[] notificationSet;
         int ancestorLen;
-        
+
         synchronized (lockNode)
           {
             if (!dispatchDataLock)
@@ -1581,7 +1581,7 @@ public abstract class DomNode
               }
             ancestorLen = ancestors.length;
           }
-        
+
         // Climb to the top of this subtree and handle capture, letting
         // each node (from the top down) capture until one stops it or
         // until we get to this one.
@@ -1597,7 +1597,7 @@ public abstract class DomNode
           {
             if (current == null || current.depth == 0)
               break;
-            
+
             if (current.nListeners != 0)
               {
                 haveAncestorRegistrations = true;
@@ -1609,10 +1609,10 @@ public abstract class DomNode
           {
             throw new RuntimeException("dispatchEvent capture stack size");
           }
-        
+
         ancestorMax = index;
         e.stop = false;
-        
+
         if (haveAncestorRegistrations)
           {
             e.eventPhase = Event.CAPTURING_PHASE;
@@ -1625,7 +1625,7 @@ public abstract class DomNode
                   }
               }
           }
-        
+
         // Always deliver events to the target node (this)
         // unless stopPropagation was called.  If we saw
         // no registrations yet (typical!), we never will.
@@ -1638,11 +1638,11 @@ public abstract class DomNode
           {
             e.stop = true;
           }
-        
+
         // If the event bubbles and propagation wasn't halted,
         // walk back up the ancestor list.  Stop bubbling when
         // any bubbled event handler stops it.
-        
+
         if (!e.stop && e.bubbles)
           {
             e.eventPhase = Event.BUBBLING_PHASE;
@@ -1659,11 +1659,11 @@ public abstract class DomNode
               }
           }
         e.eventPhase = 0;
-        
+
         // Caller chooses whether to perform the default
         // action based on return from this method.
         return e.doDefault;
-        
+
       }
     finally
       {
@@ -1678,13 +1678,13 @@ public abstract class DomNode
                     ancestors [i] = null;
                   }
                 // notificationSet handled by notifyNode
-                
+
                 dispatchDataLock = false;
               }
           }
       }
   }
-  
+
   private void notifyNode(DomEvent e,
                           DomNode current,
                           boolean capture,
@@ -1704,7 +1704,7 @@ public abstract class DomNode
           {
             continue;
           }
-        if (!e.type.equals (rec.type)) 
+        if (!e.type.equals (rec.type))
           {
             continue;
           }
@@ -1722,18 +1722,18 @@ public abstract class DomNode
     iter = null;
 
     // Notify just those listeners
-    e.currentNode = current; 
+    e.currentNode = current;
     for (int i = 0; i < count; i++)
       {
         try
           {
-	    iter = current.listeners.iterator();
+            iter = current.listeners.iterator();
             // Late in the DOM CR process (3rd or 4th CR?) the
             // removeEventListener spec became asymmetric with respect
             // to addEventListener ... effect is now immediate.
-	    while (iter.hasNext())
+            while (iter.hasNext())
               {
-		ListenerRecord rec = (ListenerRecord)iter.next();
+                ListenerRecord rec = (ListenerRecord)iter.next();
 
                 if (rec.equals(notificationSet[i]))
                   {
@@ -1747,7 +1747,7 @@ public abstract class DomNode
           {
             // ignore all exceptions
           }
-        notificationSet[i] = null;		// free for GC
+        notificationSet[i] = null;              // free for GC
       }
   }
 
@@ -2074,7 +2074,7 @@ public abstract class DomNode
       }
     if (ctx != null || argCtx != null)
       return false;
-    
+
     // TODO DocumentType
     return true;
   }
@@ -2082,9 +2082,9 @@ public abstract class DomNode
   boolean equal(String arg1, String arg2)
   {
     return ((arg1 == null && arg2 == null) ||
-            (arg1 != null && arg1.equals(arg2))); 
+            (arg1 != null && arg1.equals(arg2)));
   }
-  
+
   public Object getFeature(String feature, String version)
   {
     DOMImplementation impl = (nodeType == DOCUMENT_NODE) ?
@@ -2145,7 +2145,7 @@ public abstract class DomNode
     buf.append(']');
     return buf.toString();
   }
-  
+
   String encode(String value)
   {
     CPStringBuilder buf = null;
@@ -2220,4 +2220,3 @@ public abstract class DomNode
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/DomNodeIterator.java b/libjava/classpath/gnu/xml/dom/DomNodeIterator.java
index 8001556e580..9f9ec7e3937 100644
--- a/libjava/classpath/gnu/xml/dom/DomNodeIterator.java
+++ b/libjava/classpath/gnu/xml/dom/DomNodeIterator.java
@@ -1,4 +1,4 @@
-/* DomNodeIterator.java -- 
+/* DomNodeIterator.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -140,7 +140,7 @@ public class DomNodeIterator
         current = (ret == null) ? current : ret;
       }
     while (!accept(ret));
-    
+
     return ret;
   }
 
diff --git a/libjava/classpath/gnu/xml/dom/DomNotation.java b/libjava/classpath/gnu/xml/dom/DomNotation.java
index 26e78724f27..abb0e9da97e 100644
--- a/libjava/classpath/gnu/xml/dom/DomNotation.java
+++ b/libjava/classpath/gnu/xml/dom/DomNotation.java
@@ -1,4 +1,4 @@
-/* DomNotation.java -- 
+/* DomNotation.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,14 +56,14 @@ import org.w3c.dom.Notation;
  * @see DomEntity
  * @see DomPI
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomNotation
   extends DomExtern
   implements Notation
 {
-    
+
   /**
    * Constructs a Notation node associated with the specified document,
    * with the specified descriptive data.  Note that at least one of
@@ -72,7 +72,7 @@ public class DomNotation
    *
    * 
        This constructor should only be invoked by a DomDoctype object
    * as part of its declareNotation functionality, or through a subclass
-   * which is similarly used in a "Sub-DOM" style layer. 
+   * which is similarly used in a "Sub-DOM" style layer.
    *
    * @param owner The document with which this notation is associated
    * @param name Name of this notation
@@ -87,7 +87,7 @@ public class DomNotation
     super(NOTATION_NODE, owner, name, publicId, systemId);
     makeReadonly();
   }
-  
+
   /**
    * The base URI of an external entity is its system ID.
    * The base URI of an internal entity is the parent document's base URI.
@@ -98,6 +98,5 @@ public class DomNotation
     String systemId = getSystemId();
     return (systemId == null) ? owner.getBaseURI() : systemId;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomNsNode.java b/libjava/classpath/gnu/xml/dom/DomNsNode.java
index d3361515b70..55e351185e3 100644
--- a/libjava/classpath/gnu/xml/dom/DomNsNode.java
+++ b/libjava/classpath/gnu/xml/dom/DomNsNode.java
@@ -1,4 +1,4 @@
-/* DomNsNode.java -- 
+/* DomNsNode.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,25 +44,25 @@ import org.w3c.dom.DOMException;
  * 
         Abstract implemention of namespace support.  This facilitates
  * sharing code for attribute and element nodes.
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public abstract class DomNsNode
   extends DomNode
 {
-  
+
   private String name;
   private String namespace;
   private String prefix;
   private String localName;
-  
+
   /**
    * Constructs a node associated with the specified document, and
    * with the specified namespace information.
    *
    * @param owner The document with which this entity is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this identifies a type of element or attribute; may be null.
+   *    this identifies a type of element or attribute; may be null.
    *  If this is the empty string, it is reassigned as null so that
    *  applications only need to test that case.
    * @param name Name of this node, which may include a prefix
@@ -84,7 +84,7 @@ public abstract class DomNsNode
    *
    * @param owner The document with which this entity is associated
    * @param namespaceURI Combined with the local part of the name,
-   *	this identifies a type of element or attribute; may be null.
+   *    this identifies a type of element or attribute; may be null.
    *  If this is the empty string, it is reassigned as null so that
    *  applications only need to test that case.
    * @param name Name of this node, which may include a prefix
@@ -93,7 +93,7 @@ public abstract class DomNsNode
    */
   // package private
   DomNsNode(short nodeType, DomDocument owner, String namespaceURI, String name,
-	    String prefix, String localName)
+            String prefix, String localName)
   {
     super(nodeType, owner);
     this.name = name.intern();
@@ -126,7 +126,7 @@ public abstract class DomNsNode
         localName = name.substring(index + 1).intern();
       }
   }
-  
+
   /**
    * DOM L2
    * Returns the node's namespace URI
@@ -145,7 +145,7 @@ public abstract class DomNsNode
       }
     namespace = (namespaceURI == null) ? null : namespaceURI.intern();
   }
-  
+
   /**
    * DOM L2
    * Returns any prefix part of the node's name (before any colon).
@@ -222,6 +222,5 @@ public abstract class DomNsNode
   {
     return localName;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java b/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java
index 2c90967d00f..6d443a29373 100644
--- a/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java
+++ b/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java
@@ -1,4 +1,4 @@
-/* DomProcessingInstruction.java -- 
+/* DomProcessingInstruction.java --
    Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,24 +55,24 @@ import org.w3c.dom.ProcessingInstruction;
  *
  * @see DomNotation
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomProcessingInstruction
   extends DomNode
   implements ProcessingInstruction
 {
-  
+
   private String target;
   private String data;
-  
+
   /**
    * Constructs a ProcessingInstruction node associated with the
    * specified document, with the specified data.
    *
    * 
        This constructor should only be invoked by a Document object as
    * part of its createProcessingInstruction functionality, or through
-   * a subclass which is similarly used in a "Sub-DOM" style layer. 
+   * a subclass which is similarly used in a "Sub-DOM" style layer.
    */
   protected DomProcessingInstruction(DomDocument owner,
                                      String target, String data)
@@ -129,7 +129,7 @@ public class DomProcessingInstruction
   {
     setNodeValue(data);
   }
-  
+
   /**
    * DOM L1
    * Assigns the data associated with the processing instruction.
@@ -142,6 +142,5 @@ public class DomProcessingInstruction
       }
     this.data = data;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/DomText.java b/libjava/classpath/gnu/xml/dom/DomText.java
index 167eba3c1d2..b74c5b4c2a9 100644
--- a/libjava/classpath/gnu/xml/dom/DomText.java
+++ b/libjava/classpath/gnu/xml/dom/DomText.java
@@ -1,4 +1,4 @@
-/* DomText.java -- 
+/* DomText.java --
    Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,24 +45,24 @@ import org.w3c.dom.Text;
 /**
  * 
         "Text" implementation.  
        
  *
- * @author David Brownell 
+ * @author David Brownell
  * @author Chris Burdess
  */
 public class DomText
   extends DomCharacterData
   implements Text
 {
-  
+
   // NOTE:  deleted unused per-instance "isIgnorable"
   // support to reclaim its space.
-  
+
   /**
    * Constructs a text node associated with the specified
    * document and holding the specified data.
    *
    * 
        This constructor should only be invoked by a Document object
    * as part of its createTextNode functionality, or through a subclass
-   * which is similarly used in a "Sub-DOM" style layer. 
+   * which is similarly used in a "Sub-DOM" style layer.
    */
   protected DomText(DomDocument owner, String value)
   {
@@ -112,7 +112,7 @@ public class DomText
         String before = text.substring(0, offset);
         String after = text.substring(offset);
         Text next;
-        
+
         if (getNodeType() == TEXT_NODE)
           {
             next = owner.createTextNode(after);
@@ -121,7 +121,7 @@ public class DomText
           {
             next = owner.createCDATASection(after);
           }
-        
+
         if (this.next != null)
           {
             parent.insertBefore(next, this.next);
@@ -132,16 +132,16 @@ public class DomText
           }
         setNodeValue(before);
         return next;
-        
+
       }
     catch (IndexOutOfBoundsException x)
       {
         throw new DomDOMException(DOMException.INDEX_SIZE_ERR);
       }
   }
-    
+
   // DOM Level 3
-  
+
   public boolean isElementContentWhitespace()
   {
     if (parent != null)
@@ -192,7 +192,7 @@ public class DomText
       {
         setNodeValue(content);
       }
-    
+
     DomNode ref = this;
     DomNode ctx;
     for (ctx = previous; ctx != null &&
@@ -218,5 +218,5 @@ public class DomText
       }
     return (isEmpty) ? null : this;
   }
-    
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomXPathExpression.java b/libjava/classpath/gnu/xml/dom/DomXPathExpression.java
index 25187520c0f..0b69629300b 100644
--- a/libjava/classpath/gnu/xml/dom/DomXPathExpression.java
+++ b/libjava/classpath/gnu/xml/dom/DomXPathExpression.java
@@ -1,4 +1,4 @@
-/* DomXPathExpression.java -- 
+/* DomXPathExpression.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -73,13 +73,13 @@ implements org.w3c.dom.xpath.XPathExpression
   {
     this.doc = doc;
     this.resolver = resolver;
-    
-		XPathFactory factory = XPathFactory.newInstance();
-		XPath xpath = factory.newXPath();
-		if (resolver != null)
-		  {
-				xpath.setNamespaceContext(new DomNSResolverContext(resolver));
-	 	  }
+
+                XPathFactory factory = XPathFactory.newInstance();
+                XPath xpath = factory.newXPath();
+                if (resolver != null)
+                  {
+                                xpath.setNamespaceContext(new DomNSResolverContext(resolver));
+                  }
     try
       {
         this.expression = xpath.compile(expression);
@@ -87,61 +87,61 @@ implements org.w3c.dom.xpath.XPathExpression
     catch (XPathExpressionException e)
       {
         throw new XPathException(XPathException.INVALID_EXPRESSION_ERR,
-						                     e.getMessage ());
+                                                                     e.getMessage ());
       }
   }
 
   public Object evaluate(Node contextNode, short type, Object result)
     throws XPathException, DOMException
   {
-		try
-		  {
-				QName typeName = null;
-				switch (type)
-				  {
-						case XPathResult.BOOLEAN_TYPE:
-							typeName = XPathConstants.BOOLEAN;
-							break;
-						case XPathResult.NUMBER_TYPE:
-							typeName = XPathConstants.NUMBER;
-							break;
-						case XPathResult.STRING_TYPE:
-							typeName = XPathConstants.STRING;
-							break;
-						case XPathResult.ANY_UNORDERED_NODE_TYPE:
-						case XPathResult.FIRST_ORDERED_NODE_TYPE:
-							typeName = XPathConstants.NODE;
-							break;
-						case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
-						case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
-						case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
-						case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
-							typeName = XPathConstants.NODESET;
-							break;
-						default:
-							throw new XPathException(XPathException.TYPE_ERR, null);
-					}
-				Object val = expression.evaluate(contextNode, typeName);
-				switch (type)
-				  {
-						case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
-						case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
-							// Sort the nodes
-							List ns = new ArrayList((Collection) val);
-							Collections.sort(ns, new DocumentOrderComparator());
-							val = ns;
-					}
-				return new DomXPathResult(val, type);
-			}
-		catch (javax.xml.xpath.XPathException e)
-		  {
-				throw new XPathException(XPathException.TYPE_ERR, e.getMessage());
-			}
+                try
+                  {
+                                QName typeName = null;
+                                switch (type)
+                                  {
+                                                case XPathResult.BOOLEAN_TYPE:
+                                                        typeName = XPathConstants.BOOLEAN;
+                                                        break;
+                                                case XPathResult.NUMBER_TYPE:
+                                                        typeName = XPathConstants.NUMBER;
+                                                        break;
+                                                case XPathResult.STRING_TYPE:
+                                                        typeName = XPathConstants.STRING;
+                                                        break;
+                                                case XPathResult.ANY_UNORDERED_NODE_TYPE:
+                                                case XPathResult.FIRST_ORDERED_NODE_TYPE:
+                                                        typeName = XPathConstants.NODE;
+                                                        break;
+                                                case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
+                                                case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
+                                                case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+                                                case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+                                                        typeName = XPathConstants.NODESET;
+                                                        break;
+                                                default:
+                                                        throw new XPathException(XPathException.TYPE_ERR, null);
+                                        }
+                                Object val = expression.evaluate(contextNode, typeName);
+                                switch (type)
+                                  {
+                                                case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
+                                                case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
+                                                        // Sort the nodes
+                                                        List ns = new ArrayList((Collection) val);
+                                                        Collections.sort(ns, new DocumentOrderComparator());
+                                                        val = ns;
+                                        }
+                                return new DomXPathResult(val, type);
+                        }
+                catch (javax.xml.xpath.XPathException e)
+                  {
+                                throw new XPathException(XPathException.TYPE_ERR, e.getMessage());
+                        }
   }
 
   public String toString ()
   {
     return getClass ().getName () + "[expression=" + expression + "]";
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java b/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java
index 96dfd97d46a..fb0719a4e87 100644
--- a/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java
+++ b/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java
@@ -1,4 +1,4 @@
-/* DomXPathNSResolver.java -- 
+/* DomXPathNSResolver.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -60,5 +60,5 @@ implements XPathNSResolver
   {
     return node.lookupNamespaceURI (prefix);
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/DomXPathResult.java b/libjava/classpath/gnu/xml/dom/DomXPathResult.java
index bed249624f9..da8fcf5130c 100644
--- a/libjava/classpath/gnu/xml/dom/DomXPathResult.java
+++ b/libjava/classpath/gnu/xml/dom/DomXPathResult.java
@@ -1,4 +1,4 @@
-/* DomXPathResult.java -- 
+/* DomXPathResult.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/dom/ImplementationList.java b/libjava/classpath/gnu/xml/dom/ImplementationList.java
index 8c0f4491610..c99f55d0da4 100644
--- a/libjava/classpath/gnu/xml/dom/ImplementationList.java
+++ b/libjava/classpath/gnu/xml/dom/ImplementationList.java
@@ -1,4 +1,4 @@
-/* ImplementationList.java -- 
+/* ImplementationList.java --
    Copyright (C) 2004 Free Software Foundation, Inc..
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/dom/ImplementationSource.java b/libjava/classpath/gnu/xml/dom/ImplementationSource.java
index 913079cd0c3..5f404423ad1 100644
--- a/libjava/classpath/gnu/xml/dom/ImplementationSource.java
+++ b/libjava/classpath/gnu/xml/dom/ImplementationSource.java
@@ -1,4 +1,4 @@
-/* ImplementationSource.java -- 
+/* ImplementationSource.java --
    Copyright (C) 2004 Free Software Foundation, Inc..
 
 This file is part of GNU Classpath.
@@ -72,7 +72,7 @@ public class ImplementationSource
       }
     catch (Exception e)
       {
-        // libxmlj not available        
+        // libxmlj not available
       }
     catch (UnsatisfiedLinkError e)
       {
diff --git a/libjava/classpath/gnu/xml/dom/JAXPFactory.java b/libjava/classpath/gnu/xml/dom/JAXPFactory.java
index ca14a8e9daf..d7d399b5bf3 100644
--- a/libjava/classpath/gnu/xml/dom/JAXPFactory.java
+++ b/libjava/classpath/gnu/xml/dom/JAXPFactory.java
@@ -1,4 +1,4 @@
-/* JAXPFactory.java -- 
+/* JAXPFactory.java --
    Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -66,20 +66,20 @@ import javax.xml.parsers.SAXParserFactory;
 public final class JAXPFactory
   extends DocumentBuilderFactory
 {
-  
-  private static final String	PROPERTY = "http://xml.org/sax/properties/";
-  private static final String	FEATURE = "http://xml.org/sax/features/";
-  
-  private SAXParserFactory	pf;
+
+  private static final String   PROPERTY = "http://xml.org/sax/properties/";
+  private static final String   FEATURE = "http://xml.org/sax/features/";
+
+  private SAXParserFactory      pf;
   private boolean secureProcessing;
-  
+
   /**
    * Default constructor.
    */
   public JAXPFactory()
   {
   }
-  
+
   /**
    * Constructs a JAXP document builder which uses the default
    * JAXP SAX2 parser and the DOM implementation in this package.
@@ -94,14 +94,14 @@ public final class JAXPFactory
         pf = new gnu.xml.aelfred2.JAXPFactory();
         // pf = SAXParserFactory.newInstance ();
       }
-    
+
     // JAXP default: false
     pf.setValidating(isValidating());
 
     // FIXME:  this namespace setup may cause errors in some
     // conformant SAX2 parsers, which we CAN patch up by
     // splicing a "NSFilter" stage up front ...
-    
+
     // JAXP default: false
     pf.setNamespaceAware(isNamespaceAware());
 
@@ -118,7 +118,7 @@ public final class JAXPFactory
         throw new ParserConfigurationException(msg);
       }
   }
-  
+
   /** There seems to be no useful specification for attribute names */
   public void setAttribute(String name, Object value)
     throws IllegalArgumentException
@@ -160,21 +160,21 @@ public final class JAXPFactory
       return secureProcessing;
     throw new ParserConfigurationException(name);
   }
-  
+
   static final class JAXPBuilder
     extends DocumentBuilder
     implements ErrorHandler
   {
 
-    private Consumer	consumer;
-    private XMLReader	producer;
-    private DomImpl		impl;
-    
+    private Consumer    consumer;
+    private XMLReader   producer;
+    private DomImpl             impl;
+
     JAXPBuilder(XMLReader parser, JAXPFactory factory)
       throws ParserConfigurationException
     {
       impl = new DomImpl();
-      
+
       // set up consumer side
       try
         {
@@ -198,8 +198,8 @@ public final class JAXPFactory
 
       try
         {
-          String	id;
-          
+          String        id;
+
           // if validating, report validity errors, and default
           // to treating them as fatal
           if (factory.isValidating ())
@@ -207,7 +207,7 @@ public final class JAXPFactory
               producer.setFeature(FEATURE + "validation", true);
               producer.setErrorHandler(this);
             }
-          
+
           // always save prefix info, maybe do namespace processing
           producer.setFeature(FEATURE + "namespace-prefixes", true);
           producer.setFeature(FEATURE + "namespaces",
@@ -219,15 +219,15 @@ public final class JAXPFactory
 
           id = PROPERTY + "declaration-handler";
           producer.setProperty(id, consumer.getProperty(id));
-          
+
         }
       catch (SAXException e)
         {
           throw new ParserConfigurationException(e.getMessage());
         }
     }
-    
-    public Document parse(InputSource source) 
+
+    public Document parse(InputSource source)
       throws SAXException, IOException
     {
       producer.parse(source);
@@ -283,27 +283,26 @@ public final class JAXPFactory
     {
       return new DomDocument();
     }
-	
+
     // implementation of error handler that's used when validating
     public void fatalError(SAXParseException e)
       throws SAXException
     {
       throw e;
     }
-    
+
     public void error(SAXParseException e)
       throws SAXException
     {
       throw e;
     }
-    
+
     public void warning(SAXParseException e)
       throws SAXException
     {
       /* ignore */
     }
- 
+
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java
index 5da91330604..4448dd58021 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLAnchorElement.java -- 
+/* DomHTMLAnchorElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public String getCharset()
   {
     return getHTMLAttribute("charset");
@@ -74,7 +74,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("charset", charset);
   }
-  
+
   public String getCoords()
   {
     return getHTMLAttribute("coords");
@@ -84,7 +84,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("coords", coords);
   }
-  
+
   public String getHref()
   {
     return getHTMLAttribute("href");
@@ -94,7 +94,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("href", href);
   }
-  
+
   public String getHreflang()
   {
     return getHTMLAttribute("hreflang");
@@ -104,7 +104,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("hreflang", hreflang);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -114,7 +114,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getRel()
   {
     return getHTMLAttribute("rel");
@@ -124,7 +124,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("rel", rel);
   }
-  
+
   public String getRev()
   {
     return getHTMLAttribute("rev");
@@ -134,7 +134,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("rev", rev);
   }
-  
+
   public String getShape()
   {
     return getHTMLAttribute("shape");
@@ -144,7 +144,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("shape", shape);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -154,7 +154,7 @@ public class DomHTMLAnchorElement
   {
     setIntHTMLAttribute("tabindex", tabIndex);
   }
-  
+
   public String getTarget()
   {
     return getHTMLAttribute("target");
@@ -164,7 +164,7 @@ public class DomHTMLAnchorElement
   {
     setHTMLAttribute("target", target);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -184,6 +184,5 @@ public class DomHTMLAnchorElement
   {
     dispatchUIEvent("focus");
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java
index 918cf0d92f0..429fb0038bc 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLAppletElement.java -- 
+/* DomHTMLAppletElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getCls()
   {
     return getHTMLAttribute("class");
@@ -74,7 +74,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("class", cls);
   }
-  
+
   public String getSrc()
   {
     return getHTMLAttribute("src");
@@ -84,7 +84,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("src", src);
   }
-  
+
   public String getAlt()
   {
     return getHTMLAttribute("alt");
@@ -94,7 +94,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("alt", alt);
   }
-  
+
   public String getArchive()
   {
     return getHTMLAttribute("archive");
@@ -104,7 +104,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("archive", archive);
   }
-  
+
   public String getCode()
   {
     return getHTMLAttribute("code");
@@ -114,7 +114,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("code", code);
   }
-  
+
   public String getCodeBase()
   {
     return getHTMLAttribute("codebase");
@@ -124,7 +124,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("codebase", codeBase);
   }
-  
+
   public String getHeight()
   {
     return getHTMLAttribute("height");
@@ -134,7 +134,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("height", height);
   }
-  
+
   public int getHspace()
   {
     return getIntHTMLAttribute("hspace");
@@ -144,7 +144,7 @@ public class DomHTMLAppletElement
   {
     setIntHTMLAttribute("hspace", hspace);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -154,7 +154,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getObject()
   {
     return getHTMLAttribute("object");
@@ -164,7 +164,7 @@ public class DomHTMLAppletElement
   {
     setHTMLAttribute("object", object);
   }
-  
+
   public int getVspace()
   {
     return getIntHTMLAttribute("vspace");
@@ -174,7 +174,7 @@ public class DomHTMLAppletElement
   {
     setIntHTMLAttribute("vspace", vspace);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -185,4 +185,3 @@ public class DomHTMLAppletElement
     setHTMLAttribute("width", width);
   }
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java
index d7eed07dd1f..728b3fdfc80 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLAreaElement.java -- 
+/* DomHTMLAreaElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public String getAlt()
   {
     return getHTMLAttribute("alt");
@@ -74,7 +74,7 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("alt", alt);
   }
-  
+
   public String getCoords()
   {
     return getHTMLAttribute("coords");
@@ -84,7 +84,7 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("coords", coords);
   }
-  
+
   public String getHref()
   {
     return getHTMLAttribute("href");
@@ -94,7 +94,7 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("href", href);
   }
-  
+
   public boolean getNoHref()
   {
     return getBooleanHTMLAttribute("nohref");
@@ -104,7 +104,7 @@ public class DomHTMLAreaElement
   {
     setBooleanHTMLAttribute("nohref", nohref);
   }
-  
+
   public String getShape()
   {
     return getHTMLAttribute("shape");
@@ -114,7 +114,7 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("shape", shape);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -124,7 +124,7 @@ public class DomHTMLAreaElement
   {
     setIntHTMLAttribute("tabindex", tabIndex);
   }
-  
+
   public String getTarget()
   {
     return getHTMLAttribute("target");
@@ -134,6 +134,5 @@ public class DomHTMLAreaElement
   {
     setHTMLAttribute("target", target);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java
index 673699d527a..5ad49c54911 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLBRElement.java -- 
+/* DomHTMLBRElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLBRElement
   {
     setHTMLAttribute("clear", clear);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java
index ddc8053079f..99a0993babc 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLBaseElement.java -- 
+/* DomHTMLBaseElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLBaseElement
   {
     setHTMLAttribute("href", href);
   }
-  
+
   public String getTarget()
   {
     return getHTMLAttribute("target");
@@ -74,6 +74,5 @@ public class DomHTMLBaseElement
   {
     setHTMLAttribute("target", target);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java
index 73172d3bf11..73ec96dbd9b 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLBaseFontElement.java -- 
+/* DomHTMLBaseFontElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLBaseFontElement
   {
     setHTMLAttribute("color", color);
   }
-  
+
   public String getFace()
   {
     return getHTMLAttribute("face");
@@ -74,7 +74,7 @@ public class DomHTMLBaseFontElement
   {
     setHTMLAttribute("face", face);
   }
-  
+
   public int getSize()
   {
     return getIntHTMLAttribute("size");
@@ -84,6 +84,5 @@ public class DomHTMLBaseFontElement
   {
     setIntHTMLAttribute("size", size);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java
index 44fbcf23cc5..d4528625b6a 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLBodyElement.java -- 
+/* DomHTMLBodyElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("alink", alink);
   }
-  
+
   public String getBackground()
   {
     return getHTMLAttribute("background");
@@ -74,7 +74,7 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("background", background);
   }
-  
+
   public String getBgColor()
   {
     return getHTMLAttribute("bgcolor");
@@ -84,7 +84,7 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("bgcolor", bgcolor);
   }
-  
+
   public String getLink()
   {
     return getHTMLAttribute("link");
@@ -94,7 +94,7 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("link", link);
   }
-  
+
   public String getText()
   {
     return getHTMLAttribute("text");
@@ -104,7 +104,7 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("text", text);
   }
-  
+
   public String getVLink()
   {
     return getHTMLAttribute("vlink");
@@ -114,6 +114,5 @@ public class DomHTMLBodyElement
   {
     setHTMLAttribute("vlink", vlink);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java
index 3bca44c0992..696169ac214 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLButtonElement.java -- 
+/* DomHTMLButtonElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public class DomHTMLButtonElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public boolean getDisabled()
   {
     return getBooleanHTMLAttribute("disabled");
@@ -80,7 +80,7 @@ public class DomHTMLButtonElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -90,7 +90,7 @@ public class DomHTMLButtonElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -105,7 +105,7 @@ public class DomHTMLButtonElement
   {
     return getHTMLAttribute("type");
   }
-  
+
   public String getValue()
   {
     return getHTMLAttribute("value");
@@ -115,6 +115,5 @@ public class DomHTMLButtonElement
   {
     setHTMLAttribute("value", value);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java
index c63620087e3..830028753be 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java
@@ -1,4 +1,4 @@
-/* DomHTMLCollection.java -- 
+/* DomHTMLCollection.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -221,6 +221,5 @@ class DomHTMLCollection
       }
     return null;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java
index 2b9dbf23623..9acce856a04 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLDListElement.java -- 
+/* DomHTMLDListElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLDListElement
   {
     setBooleanHTMLAttribute("compact", compact);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java
index 26af97e781b..e0f94a1ed4d 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLDirectoryElement.java -- 
+/* DomHTMLDirectoryElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLDirectoryElement
   {
     setBooleanHTMLAttribute("compact", compact);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java
index 462069dcf1a..66b3ac743e0 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLDivElement.java -- 
+/* DomHTMLDivElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLDivElement
   {
     setHTMLAttribute("align", align);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java
index d45c1b2230b..1afed7bebf0 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java
@@ -1,4 +1,4 @@
-/* DomHTMLDocument.java -- 
+/* DomHTMLDocument.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -424,4 +424,3 @@ public class DomHTMLDocument
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java
index b957083d680..deeefec608f 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLElement.java -- 
+/* DomHTMLElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -242,7 +242,7 @@ public abstract class DomHTMLElement
   {
     setHTMLAttribute("id", id);
   }
-  
+
   public String getTitle()
   {
     return getHTMLAttribute("title");
@@ -252,7 +252,7 @@ public abstract class DomHTMLElement
   {
     setHTMLAttribute("title", title);
   }
-  
+
   public String getLang()
   {
     return getHTMLAttribute("lang");
@@ -262,7 +262,7 @@ public abstract class DomHTMLElement
   {
     setHTMLAttribute("lang", lang);
   }
-  
+
   public String getDir()
   {
     return getHTMLAttribute("dir");
@@ -272,7 +272,7 @@ public abstract class DomHTMLElement
   {
     setHTMLAttribute("dir", dir);
   }
-  
+
   public String getClassName()
   {
     return getHTMLAttribute("class");
@@ -282,6 +282,5 @@ public abstract class DomHTMLElement
   {
     setHTMLAttribute("class", className);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java
index 1ae081c2827..22113153382 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLEmbedElement.java -- 
+/* DomHTMLEmbedElement.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ public class DomHTMLEmbedElement
   {
     super(owner, namespaceURI, name);
   }
-  
+
   public String getJavaObject()
   {
     return getHTMLAttribute("java_object");
@@ -56,7 +56,7 @@ public class DomHTMLEmbedElement
   {
     setHTMLAttribute("java_object", object);
   }
-  
+
   public String getJavaCodeBase()
   {
     return getHTMLAttribute("java_codebase");
@@ -66,7 +66,7 @@ public class DomHTMLEmbedElement
   {
     setHTMLAttribute("java_codebase", codeBase);
   }
-  
+
   public String getJavaArchive()
   {
     return getHTMLAttribute("java_archive");
@@ -81,42 +81,42 @@ public class DomHTMLEmbedElement
   {
     setHTMLAttribute("java_code", code);
   }
-  
+
   public String getJavaCode()
   {
     return getHTMLAttribute("java_code");
   }
-  
+
   public void setJavaType(String type)
   {
     setHTMLAttribute("java_type", type);
   }
-  
+
   public String getJavaType()
   {
     return getHTMLAttribute("java_type");
   }
-  
+
   public void setType(String type)
   {
     setHTMLAttribute("type", type);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
   }
-  
+
   public String getPluginsPage()
   {
     return getHTMLAttribute("pluginspage");
   }
-  
+
   public void setPluginsPage(String pluginspage)
   {
     setHTMLAttribute("pluginspage", pluginspage);
   }
-  
+
   public String getMayscript()
   {
     return getHTMLAttribute("mayscript");
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java
index 2c857721947..252cd3d2beb 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLFieldSetElement.java -- 
+/* DomHTMLFieldSetElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -62,4 +62,3 @@ public class DomHTMLFieldSetElement
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java
index 08bd349fa62..5bfbb6f36c9 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLFontElement.java -- 
+/* DomHTMLFontElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLFontElement
   {
     setHTMLAttribute("color", color);
   }
-  
+
   public String getFace()
   {
     return getHTMLAttribute("face");
@@ -74,7 +74,7 @@ public class DomHTMLFontElement
   {
     setHTMLAttribute("face", face);
   }
-  
+
   public String getSize()
   {
     return getHTMLAttribute("size");
@@ -84,6 +84,5 @@ public class DomHTMLFontElement
   {
     setHTMLAttribute("size", size);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java
index 119d97eb885..9fe2ae80205 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLFormElement.java -- 
+/* DomHTMLFormElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -85,7 +85,7 @@ public class DomHTMLFormElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getAcceptCharset()
   {
     return getHTMLAttribute("accept-charset");
@@ -95,7 +95,7 @@ public class DomHTMLFormElement
   {
     setHTMLAttribute("accept-charset", acceptCharset);
   }
-  
+
   public String getAction()
   {
     return getHTMLAttribute("action");
@@ -105,7 +105,7 @@ public class DomHTMLFormElement
   {
     setHTMLAttribute("action", action);
   }
-  
+
   public String getEnctype()
   {
     return getHTMLAttribute("enctype");
@@ -115,7 +115,7 @@ public class DomHTMLFormElement
   {
     setHTMLAttribute("enctype", enctype);
   }
-  
+
   public String getMethod()
   {
     return getHTMLAttribute("method");
@@ -125,7 +125,7 @@ public class DomHTMLFormElement
   {
     setHTMLAttribute("method", method);
   }
-  
+
   public String getTarget()
   {
     return getHTMLAttribute("target");
@@ -145,6 +145,5 @@ public class DomHTMLFormElement
   {
     dispatchUIEvent("reset");
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java
index 124f35268e8..2465c4b8901 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLFrameElement.java -- 
+/* DomHTMLFrameElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,7 +65,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("frameborder", frameBorder);
   }
-  
+
   public String getLongDesc()
   {
     return getHTMLAttribute("longdesc");
@@ -75,7 +75,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("longdesc", longDesc);
   }
-  
+
   public String getMarginHeight()
   {
     return getHTMLAttribute("marginheight");
@@ -85,7 +85,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("marginheight", marginHeight);
   }
-  
+
   public String getMarginWidth()
   {
     return getHTMLAttribute("marginwidth");
@@ -95,7 +95,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("marginwidth", marginWidth);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -105,7 +105,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public boolean getNoResize()
   {
     return getBooleanHTMLAttribute("noresize");
@@ -115,7 +115,7 @@ public class DomHTMLFrameElement
   {
     setBooleanHTMLAttribute("noresize", noResize);
   }
-  
+
   public String getScrolling()
   {
     return getHTMLAttribute("scrolling");
@@ -125,7 +125,7 @@ public class DomHTMLFrameElement
   {
     setHTMLAttribute("scrolling", scrolling);
   }
-  
+
   public String getSrc()
   {
     return getHTMLAttribute("src");
@@ -141,6 +141,5 @@ public class DomHTMLFrameElement
     // TODO getContentDocument
     return null;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java
index 44d317f64a3..dae9430fb84 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLFrameSetElement.java -- 
+/* DomHTMLFrameSetElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLFrameSetElement
   {
     setHTMLAttribute("cols", cols);
   }
-  
+
   public String getRows()
   {
     return getHTMLAttribute("rows");
@@ -74,6 +74,5 @@ public class DomHTMLFrameSetElement
   {
     setHTMLAttribute("rows", rows);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java
index d1b48012175..e27ef55957f 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLHRElement.java -- 
+/* DomHTMLHRElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLHRElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public boolean getNoShade()
   {
     return getBooleanHTMLAttribute("noshade");
@@ -74,7 +74,7 @@ public class DomHTMLHRElement
   {
     setBooleanHTMLAttribute("noshade", noShade);
   }
-  
+
   public String getSize()
   {
     return getHTMLAttribute("size");
@@ -84,7 +84,7 @@ public class DomHTMLHRElement
   {
     setHTMLAttribute("size", size);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -94,6 +94,5 @@ public class DomHTMLHRElement
   {
     setHTMLAttribute("width", width);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java
index f68e8c7fad3..4a8ef995b07 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLHeadElement.java -- 
+/* DomHTMLHeadElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLHeadElement
   {
     setHTMLAttribute("profile", profile);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java
index f1427ad89e6..6e78e900431 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLHeadingElement.java -- 
+/* DomHTMLHeadingElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLHeadingElement
   {
     setHTMLAttribute("align", align);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java
index 95d45264eee..73f7243ed3d 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLHtmlElement.java -- 
+/* DomHTMLHtmlElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLHtmlElement
   {
     setHTMLAttribute("version", version);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java
index c5ca75d8c21..1a58fb73e9c 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLIFrameElement.java -- 
+/* DomHTMLIFrameElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,7 +65,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getFrameBorder()
   {
     return getHTMLAttribute("frameborder");
@@ -75,7 +75,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("frameborder", frameBorder);
   }
-  
+
   public String getHeight()
   {
     return getHTMLAttribute("height");
@@ -85,7 +85,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("height", height);
   }
-  
+
   public String getLongDesc()
   {
     return getHTMLAttribute("longdesc");
@@ -95,7 +95,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("longdesc", longDesc);
   }
-  
+
   public String getMarginHeight()
   {
     return getHTMLAttribute("marginheight");
@@ -105,7 +105,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("marginheight", marginHeight);
   }
-  
+
   public String getMarginWidth()
   {
     return getHTMLAttribute("marginwidth");
@@ -115,7 +115,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("marginwidth", marginWidth);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -125,7 +125,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getScrolling()
   {
     return getHTMLAttribute("scrolling");
@@ -135,7 +135,7 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("scrolling", scrolling);
   }
-  
+
   public String getSrc()
   {
     return getHTMLAttribute("src");
@@ -155,12 +155,11 @@ public class DomHTMLIFrameElement
   {
     setHTMLAttribute("width", width);
   }
-  
+
   public Document getContentDocument()
   {
     // TODO getContentDocument
     return null;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java
index c96e5fede4d..c5d294c6f73 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLImageElement.java -- 
+/* DomHTMLImageElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -74,7 +74,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getAlt()
   {
     return getHTMLAttribute("alt");
@@ -84,7 +84,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("alt", alt);
   }
-  
+
   public String getBorder()
   {
     return getHTMLAttribute("border");
@@ -94,7 +94,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("border", border);
   }
-  
+
   public int getHeight()
   {
     return getIntHTMLAttribute("height");
@@ -104,7 +104,7 @@ public class DomHTMLImageElement
   {
     setIntHTMLAttribute("height", height);
   }
-  
+
   public int getHspace()
   {
     return getIntHTMLAttribute("hspace");
@@ -114,7 +114,7 @@ public class DomHTMLImageElement
   {
     setIntHTMLAttribute("hspace", hspace);
   }
-  
+
   public boolean getIsMap()
   {
     return getBooleanHTMLAttribute("ismap");
@@ -124,7 +124,7 @@ public class DomHTMLImageElement
   {
     setBooleanHTMLAttribute("ismap", isMap);
   }
-  
+
   public String getLongDesc()
   {
     return getHTMLAttribute("longdesc");
@@ -134,7 +134,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("longdesc", longDesc);
   }
-  
+
   public String getSrc()
   {
     return getHTMLAttribute("src");
@@ -154,7 +154,7 @@ public class DomHTMLImageElement
   {
     setHTMLAttribute("usemap", useMap);
   }
-  
+
   public int getVspace()
   {
     return getIntHTMLAttribute("vspace");
@@ -164,7 +164,7 @@ public class DomHTMLImageElement
   {
     setIntHTMLAttribute("vspace", vspace);
   }
-  
+
   public int getWidth()
   {
     return getIntHTMLAttribute("width");
@@ -174,6 +174,5 @@ public class DomHTMLImageElement
   {
     setIntHTMLAttribute("width", width);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java
index 9f0db085040..a5faee5ce9e 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java
@@ -1,4 +1,4 @@
-/* DomHTMLImpl.java -- 
+/* DomHTMLImpl.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ import org.w3c.dom.Document;
 public class DomHTMLImpl
   extends DomImpl
 {
-  
+
   protected Document createDocument()
   {
     return new DomHTMLDocument(this);
@@ -64,4 +64,3 @@ public class DomHTMLImpl
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java
index 1dbc9c28de0..21201889d2c 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLInputElement.java -- 
+/* DomHTMLInputElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -68,7 +68,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("value", defaultValue);
   }
-  
+
   public boolean getDefaultChecked()
   {
     return getBooleanHTMLAttribute("checked");
@@ -83,7 +83,7 @@ public class DomHTMLInputElement
   {
     return (HTMLFormElement) getParentElement("form");
   }
-  
+
   public String getAccept()
   {
     return getHTMLAttribute("accept");
@@ -93,7 +93,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("accept", accept);
   }
-  
+
   public String getAccessKey()
   {
     return getHTMLAttribute("accesskey");
@@ -103,7 +103,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -113,7 +113,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getAlt()
   {
     return getHTMLAttribute("alt");
@@ -123,7 +123,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("alt", alt);
   }
-  
+
   public boolean getChecked()
   {
     if (checked == null)
@@ -137,7 +137,7 @@ public class DomHTMLInputElement
   {
     this.checked = Boolean.valueOf(checked);
   }
-  
+
   public boolean getDisabled()
   {
     return getBooleanHTMLAttribute("disabled");
@@ -147,7 +147,7 @@ public class DomHTMLInputElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public int getMaxLength()
   {
     return getIntHTMLAttribute("maxLength");
@@ -157,7 +157,7 @@ public class DomHTMLInputElement
   {
     setIntHTMLAttribute("maxLength", maxLength);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -167,7 +167,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public boolean getReadOnly()
   {
     return getBooleanHTMLAttribute("readonly");
@@ -177,7 +177,7 @@ public class DomHTMLInputElement
   {
     setBooleanHTMLAttribute("readonly", readOnly);
   }
-  
+
   public int getSize()
   {
     return getIntHTMLAttribute("size");
@@ -187,7 +187,7 @@ public class DomHTMLInputElement
   {
     setIntHTMLAttribute("size", size);
   }
-  
+
   public String getSrc()
   {
     return getHTMLAttribute("src");
@@ -197,7 +197,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("src", src);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -207,7 +207,7 @@ public class DomHTMLInputElement
   {
     setIntHTMLAttribute("tabindex", tabIndex);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -217,7 +217,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("type", type);
   }
-  
+
   public String getUseMap()
   {
     return getHTMLAttribute("usemap");
@@ -227,7 +227,7 @@ public class DomHTMLInputElement
   {
     setHTMLAttribute("usemap", useMap);
   }
-  
+
   public String getValue()
   {
     if (value == null)
@@ -261,6 +261,5 @@ public class DomHTMLInputElement
   {
     dispatchUIEvent("click");
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java
index 087f4a0cd79..8578cb6c0b3 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLIsIndexElement.java -- 
+/* DomHTMLIsIndexElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,6 +70,5 @@ public class DomHTMLIsIndexElement
   {
     setHTMLAttribute("prompt", prompt);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java
index 11eccdf5df3..cab1412ddc5 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLLIElement.java -- 
+/* DomHTMLLIElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLLIElement
   {
     setHTMLAttribute("type", type);
   }
-  
+
   public int getValue()
   {
     return getIntHTMLAttribute("value");
@@ -74,6 +74,5 @@ public class DomHTMLLIElement
   {
     setIntHTMLAttribute("value", value);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java
index c0cc39f8e96..96cfbaab5c6 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLLabelElement.java -- 
+/* DomHTMLLabelElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public class DomHTMLLabelElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public String getHtmlFor()
   {
     return getHTMLAttribute("for");
@@ -80,6 +80,5 @@ public class DomHTMLLabelElement
   {
     setHTMLAttribute("for", htmlFor);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java
index a500f8fa14c..045861cae53 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLLegendElement.java -- 
+/* DomHTMLLegendElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public class DomHTMLLegendElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -80,6 +80,5 @@ public class DomHTMLLegendElement
   {
     setHTMLAttribute("align", align);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java
index 127726ef7e3..292ec930551 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLLinkElement.java -- 
+/* DomHTMLLinkElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLLinkElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public String getCharset()
   {
     return getHTMLAttribute("charset");
@@ -74,7 +74,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("charset", charset);
   }
-  
+
   public String getHref()
   {
     return getHTMLAttribute("href");
@@ -84,7 +84,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("href", href);
   }
-  
+
   public String getHreflang()
   {
     return getHTMLAttribute("hreflang");
@@ -94,7 +94,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("hreflang", hreflang);
   }
-  
+
   public String getMedia()
   {
     return getHTMLAttribute("media");
@@ -104,7 +104,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("media", media);
   }
-  
+
   public String getRel()
   {
     return getHTMLAttribute("rel");
@@ -114,7 +114,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("rel", rel);
   }
-  
+
   public String getRev()
   {
     return getHTMLAttribute("rev");
@@ -124,7 +124,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("rev", rev);
   }
-  
+
   public String getTarget()
   {
     return getHTMLAttribute("target");
@@ -134,7 +134,7 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("target", target);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -144,6 +144,5 @@ public class DomHTMLLinkElement
   {
     setHTMLAttribute("type", type);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java
index 1f7182f4f29..4497b00e235 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLMapElement.java -- 
+/* DomHTMLMapElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLMapElement
     ret.evaluate();
     return ret;
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -74,6 +74,5 @@ public class DomHTMLMapElement
   {
     setHTMLAttribute("name", name);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java
index 17f6f589f9a..2a6ff08f1ba 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLMenuElement.java -- 
+/* DomHTMLMenuElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLMenuElement
   {
     setBooleanHTMLAttribute("compact", compact);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java
index 1a0440504de..e555a427382 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLMetaElement.java -- 
+/* DomHTMLMetaElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLMetaElement
   {
     setHTMLAttribute("content", content);
   }
-  
+
   public String getHttpEquiv()
   {
     return getHTMLAttribute("http-equiv");
@@ -74,7 +74,7 @@ public class DomHTMLMetaElement
   {
     setHTMLAttribute("http-equiv", httpEquiv);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -84,7 +84,7 @@ public class DomHTMLMetaElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getScheme()
   {
     return getHTMLAttribute("scheme");
@@ -94,6 +94,5 @@ public class DomHTMLMetaElement
   {
     setHTMLAttribute("scheme", scheme);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java
index 493f7242ba1..8c158f48aa4 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLModElement.java -- 
+/* DomHTMLModElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLModElement
   {
     setHTMLAttribute("cite", cite);
   }
-  
+
   public String getDateTime()
   {
     return getHTMLAttribute("datetime");
@@ -74,6 +74,5 @@ public class DomHTMLModElement
   {
     setHTMLAttribute("datetime", dateTime);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java
index fb98cf40d79..54f7fd46be4 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLOListElement.java -- 
+/* DomHTMLOListElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLOListElement
   {
     setBooleanHTMLAttribute("compact", compact);
   }
-  
+
   public int getStart()
   {
     return getIntHTMLAttribute("start");
@@ -74,7 +74,7 @@ public class DomHTMLOListElement
   {
     setIntHTMLAttribute("start", start);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -84,6 +84,5 @@ public class DomHTMLOListElement
   {
     setHTMLAttribute("type", type);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java
index 9bb621122a4..2ce5f45c36b 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLObjectElement.java -- 
+/* DomHTMLObjectElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -71,7 +71,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("code", code);
   }
-  
+
   public String getJavaCode()
   {
     return getHTMLAttribute("java_code");
@@ -81,7 +81,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("java_code", code);
   }
-  
+
   public String getObject()
   {
     return getHTMLAttribute("object");
@@ -91,7 +91,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("object", obj);
   }
-  
+
   public String getJavaObject()
   {
     return getHTMLAttribute("java_object");
@@ -101,7 +101,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("java_object", obj);
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -111,7 +111,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getArchive()
   {
     return getHTMLAttribute("archive");
@@ -121,7 +121,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("archive", archive);
   }
-  
+
   public String getJavaArchive()
   {
     return getHTMLAttribute("java_archive");
@@ -131,7 +131,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("java_archive", archive);
   }
-  
+
   public String getBorder()
   {
     return getHTMLAttribute("border");
@@ -141,7 +141,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("border", border);
   }
-  
+
   public String getCodeBase()
   {
     return getHTMLAttribute("codebase");
@@ -151,7 +151,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("codebase", codeBase);
   }
-  
+
   public String getJavaCodeBase()
   {
     return getHTMLAttribute("java_codebase");
@@ -161,7 +161,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("java_codebase", codeBase);
   }
-  
+
   public String getCodeType()
   {
     return getHTMLAttribute("codetype");
@@ -171,7 +171,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("codetype", codeType);
   }
-  
+
   public String getData()
   {
     return getHTMLAttribute("data");
@@ -181,7 +181,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("data", data);
   }
-  
+
   public boolean getDeclare()
   {
     return getBooleanHTMLAttribute("declare");
@@ -191,7 +191,7 @@ public class DomHTMLObjectElement
   {
     setBooleanHTMLAttribute("declare", declare);
   }
-  
+
   public String getHeight()
   {
     return getHTMLAttribute("height");
@@ -201,7 +201,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("height", height);
   }
-  
+
   public int getHspace()
   {
     return getIntHTMLAttribute("hspace");
@@ -211,7 +211,7 @@ public class DomHTMLObjectElement
   {
     setIntHTMLAttribute("hspace", hspace);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -221,7 +221,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getStandby()
   {
     return getHTMLAttribute("standby");
@@ -231,7 +231,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("standby", standby);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -241,7 +241,7 @@ public class DomHTMLObjectElement
   {
     setIntHTMLAttribute("tabindex", tabIndex);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -251,7 +251,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("type", type);
   }
-  
+
   public String getJavaType()
   {
     return getHTMLAttribute("java_type");
@@ -261,7 +261,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("java_type", type);
   }
-  
+
   public String getUseMap()
   {
     return getHTMLAttribute("usemap");
@@ -271,7 +271,7 @@ public class DomHTMLObjectElement
   {
     setHTMLAttribute("usemap", useMap);
   }
-  
+
   public int getVspace()
   {
     return getIntHTMLAttribute("vspace");
@@ -281,7 +281,7 @@ public class DomHTMLObjectElement
   {
     setIntHTMLAttribute("vspace", vspace);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -297,25 +297,24 @@ public class DomHTMLObjectElement
     // TODO getContentDocument
     return null;
   }
-  
+
   public void setMayscript(String may)
   {
     setHTMLAttribute("mayscript", may);
   }
-  
+
   public String getMayscript()
   {
     return getHTMLAttribute("mayscript");
   }
-  
+
   public void setScriptable(String scr)
   {
     setHTMLAttribute("scriptable", scr);
   }
-  
+
   public String getScriptable()
   {
     return getHTMLAttribute("scriptable");
   }
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java
index 76545e130cb..acb94848482 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLOptGroupElement.java -- 
+/* DomHTMLOptGroupElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -74,6 +74,5 @@ public class DomHTMLOptGroupElement
   {
     setHTMLAttribute("label", label);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java
index 69c059d9d43..f775c138a7b 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLOptionElement.java -- 
+/* DomHTMLOptionElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -82,7 +82,7 @@ public class DomHTMLOptionElement
   {
     return super.getIndex();
   }
-  
+
   public boolean getDisabled()
   {
     return getBooleanHTMLAttribute("disabled");
@@ -92,7 +92,7 @@ public class DomHTMLOptionElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public String getLabel()
   {
     return getHTMLAttribute("label");
@@ -102,7 +102,7 @@ public class DomHTMLOptionElement
   {
     setHTMLAttribute("label", label);
   }
-  
+
   public boolean getSelected()
   {
     if (selected == null)
@@ -116,7 +116,7 @@ public class DomHTMLOptionElement
   {
     this.selected = Boolean.valueOf(selected);
   }
-  
+
   public String getValue()
   {
     return getHTMLAttribute("value");
@@ -126,6 +126,5 @@ public class DomHTMLOptionElement
   {
     setHTMLAttribute("value", value);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java
index 2a8c4f6fb11..4c867fdc129 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLParagraphElement.java -- 
+/* DomHTMLParagraphElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLParagraphElement
   {
     setHTMLAttribute("align", align);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java
index 81c6559529e..cdd74ad4a46 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLParamElement.java -- 
+/* DomHTMLParamElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLParamElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -74,7 +74,7 @@ public class DomHTMLParamElement
   {
     setHTMLAttribute("type", type);
   }
-  
+
   public String getValue()
   {
     return getHTMLAttribute("value");
@@ -84,7 +84,7 @@ public class DomHTMLParamElement
   {
     setHTMLAttribute("value", value);
   }
-  
+
   public String getValueType()
   {
     return getHTMLAttribute("valuetype");
@@ -94,6 +94,5 @@ public class DomHTMLParamElement
   {
     setHTMLAttribute("valuetype", valueType);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java
index c6d8c4c5ca6..88656d2d35d 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java
@@ -60,11 +60,11 @@ import org.w3c.dom.html2.HTMLDocument;
  * The tag attributes become the node attributes. The text inside
  * HTML tag is inserted as one or several text nodes. The nested
  * HTML tags are inserted as child nodes.
- * 
+ *
  * If the strict tree structure, closing the tag means closing all
  * nested tags. To work around this, this parser closes the nested
  * tags and immediately reopens them after the closed tag.
- * In this way, <b><i>c</b>d 
+ * In this way, <b><i>c</b>d
  * is parsed as <b><i>c</i></b><i>d .
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
@@ -124,9 +124,9 @@ public class DomHTMLParser
         document = new DomHTMLDocument();
         document.setCheckWellformedness(false);
         document.setCheckingCharacters(false);
-        
+
         cursor = document;
-        
+
         parse(input);
 
         DomHTMLDocument h = document;
@@ -139,7 +139,7 @@ public class DomHTMLParser
         throw new IOException("Exception: " + ex.getMessage());
       }
   }
-  
+
   /**
    * Create a new node.
    * @param name the name of node, case insensitive.
@@ -165,13 +165,13 @@ public class DomHTMLParser
             natts.setNamedItem(attribute);
           }
 
-        // The default values are stored in a parent node. 
+        // The default values are stored in a parent node.
         hatts = hatts.getResolveParent();
       }
 
     return new_node;
   }
-  
+
   /**
    * Handle comment by inserting the comment node.
    * @param text the comment text.
@@ -181,7 +181,7 @@ public class DomHTMLParser
     Node c = document.createComment(new String(text));
     cursor.appendChild(c);
   }
-  
+
   /**
    * Handle the tag with no content.
    * @param tag the tag to handle.
@@ -196,7 +196,7 @@ public class DomHTMLParser
     Node c = createNode(name);
     cursor.appendChild(c);
   }
-  
+
   /**
    * Close the given tag. Close and reopen all nested tags.
    * @param tag the tag to close.
@@ -229,7 +229,7 @@ public class DomHTMLParser
         else
           cursor = close.getParentNode();
 
-        // Insert the copies of the opened nodes.   
+        // Insert the copies of the opened nodes.
         Iterator iter = open.iterator();
         while (iter.hasNext())
           {
@@ -251,7 +251,7 @@ public class DomHTMLParser
     cursor.appendChild(c);
     cursor = c;
   }
-  
+
   /**
    * Handle text by inserting the text node.
    * @param text the text to insert.
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java
index 9b36a288700..9a51aaeebad 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLPreElement.java -- 
+/* DomHTMLPreElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLPreElement
   {
     setIntHTMLAttribute("width", width);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java
index 678a5ada697..811aed58bc4 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLQuoteElement.java -- 
+/* DomHTMLQuoteElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLQuoteElement
   {
     setHTMLAttribute("cite", cite);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java
index 8f8fff58a82..1bd7b341790 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLScriptElement.java -- 
+/* DomHTMLScriptElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -124,6 +124,5 @@ public class DomHTMLScriptElement
   {
     setHTMLAttribute("type", type);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java
index 09752e1ffe4..fc1debbd60d 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLSelectElement.java -- 
+/* DomHTMLSelectElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -60,7 +60,7 @@ public class DomHTMLSelectElement
   {
     super(owner, namespaceURI, name);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -95,7 +95,7 @@ public class DomHTMLSelectElement
         option.setSelected(i == selectedIndex);
       }
   }
-  
+
   public String getValue()
   {
     return getHTMLAttribute("value");
@@ -105,7 +105,7 @@ public class DomHTMLSelectElement
   {
     setHTMLAttribute("value", value);
   }
-  
+
   public int getLength()
   {
     return getIntHTMLAttribute("length");
@@ -129,7 +129,7 @@ public class DomHTMLSelectElement
     ret.evaluate();
     return ret;
   }
-  
+
   public boolean getDisabled()
   {
     return getBooleanHTMLAttribute("disabled");
@@ -139,7 +139,7 @@ public class DomHTMLSelectElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public boolean getMultiple()
   {
     return getBooleanHTMLAttribute("multiple");
@@ -149,7 +149,7 @@ public class DomHTMLSelectElement
   {
     setBooleanHTMLAttribute("multiple", multiple);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -159,7 +159,7 @@ public class DomHTMLSelectElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public int getSize()
   {
     return getIntHTMLAttribute("size");
@@ -169,7 +169,7 @@ public class DomHTMLSelectElement
   {
     setIntHTMLAttribute("size", size);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -206,6 +206,5 @@ public class DomHTMLSelectElement
   {
     dispatchUIEvent("focus");
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java
index f6f1fcc6844..78cef3b1826 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLStyleElement.java -- 
+/* DomHTMLStyleElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLStyleElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public String getMedia()
   {
     return getHTMLAttribute("media");
@@ -74,7 +74,7 @@ public class DomHTMLStyleElement
   {
     setHTMLAttribute("media", media);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -84,6 +84,5 @@ public class DomHTMLStyleElement
   {
     setHTMLAttribute("type", type);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java
index 28ea3418895..2133b14124b 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableCaptionElement.java -- 
+/* DomHTMLTableCaptionElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,6 +65,5 @@ public class DomHTMLTableCaptionElement
   {
     setHTMLAttribute("align", align);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java
index 41d33af26f8..350f0bf427f 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableCellElement.java -- 
+/* DomHTMLTableCellElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("abbr", abbr);
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -80,7 +80,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getAxis()
   {
     return getHTMLAttribute("axis");
@@ -90,7 +90,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("axis", axis);
   }
-  
+
   public String getBgColor()
   {
     return getHTMLAttribute("bgcolor");
@@ -100,7 +100,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("bgcolor", bgColor);
   }
-  
+
   public String getCh()
   {
     return getHTMLAttribute("char");
@@ -110,7 +110,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("char", ch);
   }
-  
+
   public String getChOff()
   {
     return getHTMLAttribute("charoff");
@@ -120,7 +120,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("charoff", chOff);
   }
-  
+
   public int getColSpan()
   {
     return getIntHTMLAttribute("colspan");
@@ -130,7 +130,7 @@ public class DomHTMLTableCellElement
   {
     setIntHTMLAttribute("colspan", colSpan);
   }
-  
+
   public String getHeaders()
   {
     return getHTMLAttribute("headers");
@@ -140,7 +140,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("headers", headers);
   }
-  
+
   public String getHeight()
   {
     return getHTMLAttribute("height");
@@ -150,7 +150,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("height", height);
   }
-  
+
   public boolean getNoWrap()
   {
     return getBooleanHTMLAttribute("nowrap");
@@ -160,7 +160,7 @@ public class DomHTMLTableCellElement
   {
     setBooleanHTMLAttribute("nowrap", noWrap);
   }
-  
+
   public int getRowSpan()
   {
     return getIntHTMLAttribute("rowspan");
@@ -170,7 +170,7 @@ public class DomHTMLTableCellElement
   {
     setIntHTMLAttribute("rowspan", rowSpan);
   }
-  
+
   public String getScope()
   {
     return getHTMLAttribute("scope");
@@ -180,7 +180,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("scope", scope);
   }
-  
+
   public String getVAlign()
   {
     return getHTMLAttribute("valign");
@@ -190,7 +190,7 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("valign", vAlign);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -200,6 +200,5 @@ public class DomHTMLTableCellElement
   {
     setHTMLAttribute("width", width);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java
index 799447dc81e..c7cef31ebe4 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableColElement.java -- 
+/* DomHTMLTableColElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,7 +65,7 @@ public class DomHTMLTableColElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getCh()
   {
     return getHTMLAttribute("char");
@@ -75,7 +75,7 @@ public class DomHTMLTableColElement
   {
     setHTMLAttribute("char", ch);
   }
-  
+
   public String getChOff()
   {
     return getHTMLAttribute("charoff");
@@ -85,7 +85,7 @@ public class DomHTMLTableColElement
   {
     setHTMLAttribute("charoff", chOff);
   }
-  
+
   public int getSpan()
   {
     return getIntHTMLAttribute("span");
@@ -95,7 +95,7 @@ public class DomHTMLTableColElement
   {
     setIntHTMLAttribute("span", span);
   }
-  
+
   public String getVAlign()
   {
     return getHTMLAttribute("valign");
@@ -105,7 +105,7 @@ public class DomHTMLTableColElement
   {
     setHTMLAttribute("valign", vAlign);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -115,6 +115,5 @@ public class DomHTMLTableColElement
   {
     setHTMLAttribute("width", width);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java
index ea925400e56..ade463ef7ab 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableElement.java -- 
+/* DomHTMLTableElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,7 +79,7 @@ public class DomHTMLTableElement
         replaceChild(caption, ref);
       }
   }
-  
+
   public HTMLTableSectionElement getTHead()
   {
     return (HTMLTableSectionElement) getChildElement("thead");
@@ -133,7 +133,7 @@ public class DomHTMLTableElement
     ret.evaluate();
     return ret;
   }
-  
+
   public String getAlign()
   {
     return getHTMLAttribute("align");
@@ -143,7 +143,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getBgColor()
   {
     return getHTMLAttribute("bgcolor");
@@ -153,7 +153,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("bgcolor", bgColor);
   }
-  
+
   public String getBorder()
   {
     return getHTMLAttribute("border");
@@ -163,7 +163,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("border", border);
   }
-  
+
   public String getCellPadding()
   {
     return getHTMLAttribute("cellpadding");
@@ -173,7 +173,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("cellpadding", cellPadding);
   }
-  
+
   public String getCellSpacing()
   {
     return getHTMLAttribute("cellspacing");
@@ -183,7 +183,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("cellspacing", cellSpacing);
   }
-  
+
   public String getFrame()
   {
     return getHTMLAttribute("frame");
@@ -193,7 +193,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("frame", frame);
   }
-  
+
   public String getRules()
   {
     return getHTMLAttribute("rules");
@@ -203,7 +203,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("rules", rules);
   }
-  
+
   public String getSummary()
   {
     return getHTMLAttribute("summary");
@@ -213,7 +213,7 @@ public class DomHTMLTableElement
   {
     setHTMLAttribute("summary", summary);
   }
-  
+
   public String getWidth()
   {
     return getHTMLAttribute("width");
@@ -320,9 +320,9 @@ public class DomHTMLTableElement
       }
     ref.getParentNode().removeChild(ref);
   }
- 
+
   Node getRow(final int index)
-  { 
+  {
     int i = 0;
     Node thead = getChildElement("thead");
     if (thead != null)
@@ -395,4 +395,3 @@ public class DomHTMLTableElement
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java
index ecd07a743b4..9943585f4ec 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableRowElement.java -- 
+/* DomHTMLTableRowElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -134,7 +134,7 @@ public class DomHTMLTableRowElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getBgColor()
   {
     return getHTMLAttribute("bgcolor");
@@ -144,7 +144,7 @@ public class DomHTMLTableRowElement
   {
     setHTMLAttribute("bgcolor", bgColor);
   }
-  
+
   public String getCh()
   {
     return getHTMLAttribute("char");
@@ -154,7 +154,7 @@ public class DomHTMLTableRowElement
   {
     setHTMLAttribute("char", ch);
   }
-  
+
   public String getChOff()
   {
     return getHTMLAttribute("charoff");
@@ -164,7 +164,7 @@ public class DomHTMLTableRowElement
   {
     setHTMLAttribute("charoff", chOff);
   }
-  
+
   public String getVAlign()
   {
     return getHTMLAttribute("valign");
@@ -199,9 +199,9 @@ public class DomHTMLTableRowElement
       }
     removeChild(ref);
   }
-  
+
   Node getCell(final int index)
-  { 
+  {
     int i = 0;
     for (Node ctx = getFirstChild(); ctx != null;
          ctx = ctx.getNextSibling())
@@ -224,6 +224,5 @@ public class DomHTMLTableRowElement
       }
     return null;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java
index da015f1f67a..389eb591b53 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTableSectionElement.java -- 
+/* DomHTMLTableSectionElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public class DomHTMLTableSectionElement
   {
     setHTMLAttribute("align", align);
   }
-  
+
   public String getCh()
   {
     return getHTMLAttribute("char");
@@ -80,7 +80,7 @@ public class DomHTMLTableSectionElement
   {
     setHTMLAttribute("char", ch);
   }
-  
+
   public String getChOff()
   {
     return getHTMLAttribute("charoff");
@@ -90,7 +90,7 @@ public class DomHTMLTableSectionElement
   {
     setHTMLAttribute("charoff", chOff);
   }
-  
+
   public String getVAlign()
   {
     return getHTMLAttribute("valign");
@@ -134,9 +134,9 @@ public class DomHTMLTableSectionElement
       }
     removeChild(ref);
   }
-  
+
   Node getRow(final int index)
-  { 
+  {
     int i = 0;
     for (Node ctx = getFirstChild(); ctx != null;
          ctx = ctx.getNextSibling())
@@ -158,6 +158,5 @@ public class DomHTMLTableSectionElement
       }
     return null;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java
index 22d6105696f..9acfab13438 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTextAreaElement.java -- 
+/* DomHTMLTextAreaElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -73,7 +73,7 @@ public class DomHTMLTextAreaElement
   {
     return (HTMLFormElement) getParentElement("form");
   }
-  
+
   public String getAccessKey()
   {
     return getHTMLAttribute("accesskey");
@@ -83,7 +83,7 @@ public class DomHTMLTextAreaElement
   {
     setHTMLAttribute("accesskey", accessKey);
   }
-  
+
   public int getCols()
   {
     return getIntHTMLAttribute("cols");
@@ -93,7 +93,7 @@ public class DomHTMLTextAreaElement
   {
     setIntHTMLAttribute("cols", cols);
   }
-  
+
   public boolean getDisabled()
   {
     return getBooleanHTMLAttribute("disabled");
@@ -103,7 +103,7 @@ public class DomHTMLTextAreaElement
   {
     setBooleanHTMLAttribute("disabled", disabled);
   }
-  
+
   public String getName()
   {
     return getHTMLAttribute("name");
@@ -113,7 +113,7 @@ public class DomHTMLTextAreaElement
   {
     setHTMLAttribute("name", name);
   }
-  
+
   public boolean getReadOnly()
   {
     return getBooleanHTMLAttribute("readOnly");
@@ -123,7 +123,7 @@ public class DomHTMLTextAreaElement
   {
     setBooleanHTMLAttribute("readonly", readOnly);
   }
-  
+
   public int getRows()
   {
     return getIntHTMLAttribute("rows");
@@ -133,7 +133,7 @@ public class DomHTMLTextAreaElement
   {
     setIntHTMLAttribute("rows", rows);
   }
-  
+
   public int getTabIndex()
   {
     return getIntHTMLAttribute("tabindex");
@@ -143,7 +143,7 @@ public class DomHTMLTextAreaElement
   {
     setIntHTMLAttribute("tabindex", tabIndex);
   }
-  
+
   public String getType()
   {
     return "textarea";
@@ -172,11 +172,10 @@ public class DomHTMLTextAreaElement
   {
     dispatchUIEvent("focus");
   }
-  
+
   public void select()
   {
     dispatchUIEvent("select");
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java
index f62342d6ff5..4f581061b8b 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLTitleElement.java -- 
+/* DomHTMLTitleElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,6 +64,5 @@ public class DomHTMLTitleElement
   {
     setTextContent(text);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java
index c07adeabf20..39cdce7d3a0 100644
--- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java
+++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java
@@ -1,4 +1,4 @@
-/* DomHTMLUListElement.java -- 
+/* DomHTMLUListElement.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class DomHTMLUListElement
   {
     setBooleanHTMLAttribute("compact", compact);
   }
-  
+
   public String getType()
   {
     return getHTMLAttribute("type");
@@ -74,6 +74,5 @@ public class DomHTMLUListElement
   {
     setHTMLAttribute("type", type);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSException.java b/libjava/classpath/gnu/xml/dom/ls/DomLSException.java
index 6ac49e66934..31efc845fbc 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSException.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSException.java
@@ -1,4 +1,4 @@
-/* DomLSException.java -- 
+/* DomLSException.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java b/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java
index 68705fdee92..39b17694ff2 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java
@@ -1,4 +1,4 @@
-/* DomLSInput.java -- 
+/* DomLSInput.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -155,6 +155,5 @@ public class DomLSInput
   {
     this.certifiedText = certifiedText;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java b/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java
index c2f4d4132ce..e8bec2ec137 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java
@@ -1,4 +1,4 @@
-/* DomLSOutput.java -- 
+/* DomLSOutput.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -94,5 +94,5 @@ public class DomLSOutput
   {
     this.encoding = encoding;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
index f4f555e8c39..99db79d6422 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java
@@ -1,4 +1,4 @@
-/* DomLSParser.java -- 
+/* DomLSParser.java --
    Copyright (C) 1999,2000,2001,2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -125,12 +125,12 @@ public class DomLSParser
   }
 
   // -- LSParser --
-  
+
   public DOMConfiguration getDomConfig()
   {
     return this;
   }
-  
+
   public LSParserFilter getFilter()
   {
     return filter;
@@ -283,7 +283,7 @@ public class DomLSParser
         catch (SAXNotRecognizedException e)
           {
             // ignore
-          } 
+          }
         try
           {
             reader.setFeature("http://xml.org/sax/features/use-attributes2",
@@ -563,6 +563,5 @@ public class DomLSParser
       }
     abort();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java b/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java
index cedaf151e70..c282b0b9f68 100644
--- a/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java
+++ b/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java
@@ -1,4 +1,4 @@
-/* DomLSSerializer.java -- 
+/* DomLSSerializer.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -85,7 +85,7 @@ public class DomLSSerializer
   }
 
   // -- LSSerializer --
-  
+
   public DOMConfiguration getDomConfig()
   {
     return this;
@@ -349,6 +349,5 @@ public class DomLSSerializer
   {
     return SUPPORTED_PARAMETERS.contains(str);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java
index 1c99ee524fa..65c1d37a417 100644
--- a/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java
+++ b/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java
@@ -1,4 +1,4 @@
-/* FilteredSAXEventSink.java -- 
+/* FilteredSAXEventSink.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ class FilteredSAXEventSink
    * Stack of elements to insert.
    */
   LinkedList nodes;
-  
+
   /**
    * Corresponding stack of filter decisions about the nodes.
    */
@@ -90,7 +90,7 @@ class FilteredSAXEventSink
       }
     nodes = new LinkedList();
     decisions = new LinkedList();
-    
+
     super.startDocument();
   }
 
@@ -110,7 +110,7 @@ class FilteredSAXEventSink
         doc = null;
         break;
       }
-    
+
     nodes = null;
     decisions = null;
   }
@@ -125,7 +125,7 @@ class FilteredSAXEventSink
       }
     Element element = createElement(uri, localName, qName, atts);
     ctx = element;
-    
+
     short decision = getDecision(element, true);
     nodes.addLast(element);
     decisions.addLast(new Short(decision));
@@ -164,7 +164,7 @@ class FilteredSAXEventSink
         return;
       }
     super.endElement(uri, localName, qName);
-    
+
     Element element = (Element) nodes.removeLast();
     Node parent = nodes.isEmpty() ? doc : (Node) nodes.getLast();
     ctx = parent;
@@ -303,40 +303,40 @@ class FilteredSAXEventSink
           {
           case Node.ATTRIBUTE_NODE:
             show = ((whatToShow & NodeFilter.SHOW_ATTRIBUTE) != 0);
-            break;     
+            break;
           case Node.TEXT_NODE:
             show = ((whatToShow & NodeFilter.SHOW_TEXT) != 0);
-            break;     
+            break;
           case Node.CDATA_SECTION_NODE:
             show = ((whatToShow & NodeFilter.SHOW_CDATA_SECTION) != 0);
-            break;     
+            break;
           case Node.ELEMENT_NODE:
             show = ((whatToShow & NodeFilter.SHOW_ELEMENT) != 0);
-            break;     
+            break;
           case Node.COMMENT_NODE:
             show = ((whatToShow & NodeFilter.SHOW_COMMENT) != 0);
-            break;     
+            break;
           case Node.DOCUMENT_NODE:
             show = ((whatToShow & NodeFilter.SHOW_DOCUMENT) != 0);
-            break;     
+            break;
           case Node.PROCESSING_INSTRUCTION_NODE:
             show = ((whatToShow & NodeFilter.SHOW_PROCESSING_INSTRUCTION) != 0);
-            break;     
+            break;
           case Node.DOCUMENT_FRAGMENT_NODE:
             show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_FRAGMENT) != 0);
-            break;     
+            break;
           case Node.DOCUMENT_TYPE_NODE:
             show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_TYPE) != 0);
-            break;     
+            break;
           case Node.ENTITY_REFERENCE_NODE:
             show = ((whatToShow & NodeFilter.SHOW_ENTITY_REFERENCE) != 0);
-            break;     
+            break;
           case Node.ENTITY_NODE:
             show = ((whatToShow & NodeFilter.SHOW_ENTITY) != 0);
-            break;     
+            break;
           case Node.NOTATION_NODE:
             show = ((whatToShow & NodeFilter.SHOW_NOTATION) != 0);
-            break;     
+            break;
           }
       }
     if (!show)
@@ -351,4 +351,3 @@ class FilteredSAXEventSink
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java b/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java
index 5b41abd3d74..cf279ab396b 100644
--- a/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java
+++ b/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java
@@ -1,4 +1,4 @@
-/* ReaderInputStream.java -- 
+/* ReaderInputStream.java --
    Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -124,7 +124,7 @@ public class ReaderInputStream
 
     String s = new String(c, 0, l);
     byte[] d = s.getBytes(encoding);
-    
+
     int available = d.length;
     int more = d.length - len;
     if (more > 0)
@@ -134,7 +134,7 @@ public class ReaderInputStream
         System.arraycopy(d, len, extra, 0, more);
         available -= more;
       }
-       
+
     System.arraycopy(d, 0, b, off, available);
     return available;
   }
@@ -232,6 +232,5 @@ public class ReaderInputStream
   {
     return getClass().getName() + "[" + reader + ", " + encoding + "]";
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
index 1f8de046d42..06333dd7e91 100644
--- a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
+++ b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java
@@ -1,4 +1,4 @@
-/* SAXEventSink.java -- 
+/* SAXEventSink.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -96,7 +96,7 @@ public class SAXEventSink
   boolean coalescing;
 
   XMLReader reader; // reference back to the parser to get features
-  
+
   DomDocument doc; // document being constructed
   Node ctx; // current context (parent node)
   LinkedList entityCtx; // entity context
@@ -122,7 +122,7 @@ public class SAXEventSink
   }
 
   // -- ContentHandler2 --
-  
+
   public void setDocumentLocator(Locator locator)
   {
     this.locator = locator;
@@ -378,7 +378,7 @@ public class SAXEventSink
   }
 
   // -- LexicalHandler --
-  
+
   public void startDTD(String name, String publicId, String systemId)
     throws SAXException
   {
@@ -534,7 +534,7 @@ public class SAXEventSink
   }
 
   // -- DeclHandler --
-  
+
   public void elementDecl(String name, String model)
     throws SAXException
   {
@@ -599,6 +599,5 @@ public class SAXEventSink
     DomDoctype doctype = (DomDoctype) ctx;
     Entity entity = doctype.declareEntity(name, publicId, systemId, null);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java b/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java
index 2fb20614722..f1ae344f47e 100644
--- a/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java
+++ b/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java
@@ -1,4 +1,4 @@
-/* WriterOutputStream.java -- 
+/* WriterOutputStream.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -93,6 +93,5 @@ public class WriterOutputStream
   {
     writer.flush();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeAttr.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeAttr.java
index 144aaf82862..da9c62c9d93 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeAttr.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeAttr.java
@@ -1,4 +1,4 @@
-/* GnomeAttr.java - 
+/* GnomeAttr.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59,31 +59,31 @@ class GnomeAttr
   {
     super(id);
   }
-  
+
   public String getName()
   {
     return getNodeName();
   }
-  
+
   public native boolean getSpecified();
-  
+
   public native String getValue();
-  
+
   public native void setValue(String value)
     throws DOMException;
-  
+
   public Node getParentNode()
   {
     return null;
   }
-  
+
   public Element getOwnerElement()
   {
     return (Element) super.getParentNode();
   }
-  
+
   // DOM Level 3 methods
-  
+
   public TypeInfo getSchemaTypeInfo()
   {
     return new GnomeTypeInfo(id);
@@ -100,7 +100,7 @@ class GnomeAttr
             element.userIdAttrs != null &&
             element.userIdAttrs.contains(this));
   }
-  
+
   private native boolean xmljIsId();
 
   public String toString()
@@ -113,6 +113,5 @@ class GnomeAttr
     buffer.append("]");
     return buffer.toString();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCDATASection.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCDATASection.java
index 8fb89ff4dea..3e408e65396 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCDATASection.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCDATASection.java
@@ -1,4 +1,4 @@
-/* GnomeCDATASection.java - 
+/* GnomeCDATASection.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCharacterData.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCharacterData.java
index aa98652ba83..3f3d6ecb5de 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCharacterData.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeCharacterData.java
@@ -1,4 +1,4 @@
-/* GnomeCharacterData.java - 
+/* GnomeCharacterData.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeComment.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeComment.java
index a0cad5b3ea1..b6985c4a4d0 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeComment.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeComment.java
@@ -1,4 +1,4 @@
-/* GnomeComment.java - 
+/* GnomeComment.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMException.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMException.java
index eae07876f3c..a1af8233530 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMException.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMException.java
@@ -1,4 +1,4 @@
-/* GnomeDOMException.java - 
+/* GnomeDOMException.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -94,5 +94,5 @@ class GnomeDOMException
         return null;
       }
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMStringList.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMStringList.java
index 3456acd993c..c415ec7825c 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMStringList.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDOMStringList.java
@@ -1,4 +1,4 @@
-/* GnomeDOMStringList.java - 
+/* GnomeDOMStringList.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -80,5 +80,5 @@ class GnomeDOMStringList
       }
     return false;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocument.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocument.java
index a5333550e16..0d1b487d8ba 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocument.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocument.java
@@ -1,4 +1,4 @@
-/* GnomeDocument.java - 
+/* GnomeDocument.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -102,18 +102,18 @@ public class GnomeDocument
   boolean validate = false;
   boolean validateIfSchema = false;
   boolean wellFormed = true;
-  
+
   GnomeDocument(Object id)
   {
     super(id);
     strictErrorChecking = true;
   }
-  
+
   protected void finalize()
   {
     free(id);
   }
-  
+
   private native void free(Object id);
 
   public native DocumentType getDoctype();
@@ -177,7 +177,7 @@ public class GnomeDocument
   public native Element createElementNS(String namespaceURI, String
                                         qualifiedName)
     throws DOMException;
-  
+
   public native Attr createAttributeNS(String namespaceURI, String
                                        qualifiedName)
     throws DOMException;
@@ -211,7 +211,7 @@ public class GnomeDocument
       }
     return element;
   }
-  
+
   private native Element xmljGetElementById(String elementId);
 
   // DOM Level 3 methods
@@ -237,7 +237,7 @@ public class GnomeDocument
   {
     this.strictErrorChecking = strictErrorChecking;
   }
-  
+
   public native String getDocumentURI();
 
   public native void setDocumentURI(String documentURI);
@@ -410,14 +410,14 @@ public class GnomeDocument
     else if ("infoset".equals(name))
       {
         return Boolean.valueOf(!validateIfSchema &&
-			       !entities &&
-			       !datatypeNormalization &&
-			       !cdataSections &&
-			       namespaceDeclarations &&
-			       wellFormed &&
-			       elementContentWhitespace &&
-			       comments &&
-			       namespaces);
+                               !entities &&
+                               !datatypeNormalization &&
+                               !cdataSections &&
+                               namespaceDeclarations &&
+                               wellFormed &&
+                               elementContentWhitespace &&
+                               comments &&
+                               namespaces);
       }
     else if ("namespaces".equals(name))
       {
@@ -466,7 +466,7 @@ public class GnomeDocument
             "namespace-declarations".equals(name) ||
             "split-cdata-sections".equals(name));
   }
-  
+
   public DOMStringList getParameterNames()
   {
     String[] names = new String[] {
@@ -547,7 +547,7 @@ public class GnomeDocument
   }
 
   // -- Debugging --
-  
+
   public String toString()
   {
     CPStringBuilder buffer = new CPStringBuilder(getClass().getName());
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
index 4decee0d823..6dea87226e5 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilder.java
@@ -1,4 +1,4 @@
-/* GnomeDocumentBuilder.java - 
+/* GnomeDocumentBuilder.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -89,7 +89,7 @@ public class GnomeDocumentBuilder
   {
     this(true, false, false);
   }
-  
+
   /**
    * Constructs a new document builder.
    * @param validate whether to validate during parsing
@@ -151,7 +151,7 @@ public class GnomeDocumentBuilder
                        true, //entityResolver != null,
                        errorHandler != null);
   }
-  
+
   private native Document parseStream(InputStream in,
                                       byte[] detectBuffer,
                                       String publicId,
@@ -162,7 +162,7 @@ public class GnomeDocumentBuilder
                                       boolean expandEntities,
                                       boolean entityResolver,
                                       boolean errorHandler);
-  
+
   public void setEntityResolver(EntityResolver resolver)
   {
     entityResolver = resolver;
@@ -186,7 +186,7 @@ public class GnomeDocumentBuilder
       {
         name = name.substring(1);
       }
-    
+
     if ("xml".equals(name) || "core".equals(name))
       {
         return (version == null ||
@@ -194,7 +194,7 @@ public class GnomeDocumentBuilder
                 "1.0".equals(version) ||
                 "2.0".equals(version) ||
                 "3.0".equals(version));
-      
+
       }
     else if ("ls".equals(name) || "ls-async".equals(name))
       {
@@ -210,7 +210,7 @@ public class GnomeDocumentBuilder
       {
         return (version == null ||
                 "".equals(version) ||
-		"2.0".equals(version));
+                "2.0".equals(version));
       }
     else if ("xpath".equals(name))
       {
@@ -220,7 +220,7 @@ public class GnomeDocumentBuilder
       }
     return false;
   }
-  
+
   // DOM Level 3
 
   public Object getFeature(String feature, String version)
@@ -231,25 +231,25 @@ public class GnomeDocumentBuilder
       }
     return null;
   }
-  
+
   public native Document createDocument(String namespaceURI,
                                         String qualifiedName,
                                         DocumentType doctype);
-  
+
   public DocumentType createDocumentType(String qualifiedName,
                                          String publicId,
                                          String systemId)
   {
     return new StandaloneDocumentType(qualifiedName, publicId, systemId);
   }
-  
+
   // Callback hooks from JNI
-  
+
   private void setDocumentLocator(Object ctx, Object loc)
   {
     // ignore
   }
-  
+
   private InputStream resolveEntity(String publicId, String systemId,
                                     String base)
     throws SAXException, IOException
@@ -270,7 +270,7 @@ public class GnomeDocumentBuilder
       }
     return in;
   }
-  
+
   private void warning(String message,
                        int lineNumber,
                        int columnNumber,
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java
index c8918aa728b..448e123512f 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentBuilderFactory.java
@@ -1,4 +1,4 @@
-/* GnomeDocumentBuilderFactory.java - 
+/* GnomeDocumentBuilderFactory.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -93,7 +93,7 @@ public class GnomeDocumentBuilderFactory
   {
     // TODO
   }
-  
+
   public void setFeature(String name, boolean value)
     throws ParserConfigurationException
   {
@@ -114,5 +114,5 @@ public class GnomeDocumentBuilderFactory
       return secureProcessing;
     throw new ParserConfigurationException(name);
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java
index e5b355e428d..3623eb6cf84 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentFragment.java
@@ -1,4 +1,4 @@
-/* GnomeDocumentFragment.java - 
+/* GnomeDocumentFragment.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentType.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentType.java
index eb3a65f1d49..7649b73390a 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentType.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeDocumentType.java
@@ -1,4 +1,4 @@
-/* GnomeDocumentType.java - 
+/* GnomeDocumentType.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ implements DocumentType
   {
     super (id);
   }
-  
+
   public String getName ()
   {
     return getNodeName ();
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeElement.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeElement.java
index e87e3adfe1c..19889d663fe 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeElement.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeElement.java
@@ -1,4 +1,4 @@
-/* GnomeElement.java - 
+/* GnomeElement.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -67,7 +67,7 @@ class GnomeElement
   {
     super(id);
   }
-  
+
   public String getTagName()
   {
     return getNodeName();
@@ -77,7 +77,7 @@ class GnomeElement
 
   public native void setAttribute(String name, String value)
     throws DOMException;
-  
+
   public void removeAttribute(String name)
     throws DOMException
   {
@@ -89,7 +89,7 @@ class GnomeElement
   }
 
   public native Attr getAttributeNode(String name);
-  
+
   public native Attr setAttributeNode(Attr newAttr)
     throws DOMException;
 
@@ -97,9 +97,9 @@ class GnomeElement
     throws DOMException;
 
   public native NodeList getElementsByTagName(String name);
-  
+
   public native String getAttributeNS(String namespaceURI, String localName);
-  
+
   public native void setAttributeNS(String namespaceURI, String
                                     qualifiedName, String value)
     throws DOMException;
@@ -113,7 +113,7 @@ class GnomeElement
         removeAttributeNode(attr);
       }
   }
-  
+
   public native Attr getAttributeNodeNS(String namespaceURI,
                                         String localName);
 
@@ -122,7 +122,7 @@ class GnomeElement
 
   public native NodeList getElementsByTagNameNS(String namespaceURI,
                                                 String localName);
-  
+
   public native boolean hasAttribute(String name);
 
   public native boolean hasAttributeNS(String namespaceURI,
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntity.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntity.java
index 8d61a26c1ad..a05217473b3 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntity.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntity.java
@@ -1,4 +1,4 @@
-/* GnomeEntity.java - 
+/* GnomeEntity.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,25 +63,25 @@ implements Entity
   public native String getNotationName ();
 
   // DOM Level 3 methods
-  
+
   public String getInputEncoding ()
   {
     // TODO
-    return null;    
+    return null;
   }
-  
+
   public String getXmlEncoding ()
   {
     // TODO
     return null;
   }
-  
+
   public String getXmlVersion ()
   {
     // TODO
     return null;
   }
-  
+
   public String toString ()
   {
     String publicId = getPublicId ();
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntityReference.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntityReference.java
index 136b3a69dae..aa2fcf1e5a1 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntityReference.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeEntityReference.java
@@ -1,4 +1,4 @@
-/* GnomeEntityReference.java - 
+/* GnomeEntityReference.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java
index 8ca892128c0..b8df4fede6d 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNamedNodeMap.java
@@ -1,4 +1,4 @@
-/* GnomeNamedNodeMap.java - 
+/* GnomeNamedNodeMap.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -78,7 +78,7 @@ implements NamedNodeMap
     throws DOMException;
 
   public native Node item (int index);
-  
+
   public native int getLength ();
 
   public native Node getNamedItemNS (String namespaceURI, String localName);
@@ -88,5 +88,5 @@ implements NamedNodeMap
 
   public native Node removeNamedItemNS (String namespaceURI,
                                         String localName);
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNode.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNode.java
index 6f574ec29dd..5874916e594 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNode.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNode.java
@@ -1,4 +1,4 @@
-/* GnomeNode.java - 
+/* GnomeNode.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -145,7 +145,7 @@ class GnomeNode
     docNodes.put(node, nodeInstance);
     return nodeInstance;
   }
-  
+
   /**
    * Frees the specified document.
    * This removes all its nodes from the cache.
@@ -159,7 +159,7 @@ class GnomeNode
     instances.remove(doc);
     //System.out.println("Freed "+instances.remove(doc));
   }
-  
+
   /**
    * xmlNodePtr
    */
@@ -302,7 +302,7 @@ class GnomeNode
     notifyUserDataHandlers(UserDataHandler.NODE_CLONED, this, ret);
     return ret;
   }
-  
+
   private native Node xmljCloneNode(boolean deep);
 
   public native void normalize();
@@ -359,7 +359,7 @@ class GnomeNode
   }
 
   private native int xmljCompareTo(Object other);
-  
+
   public String getTextContent()
     throws DOMException
   {
@@ -392,7 +392,7 @@ class GnomeNode
         return null;
       }
   }
-  
+
   public void setTextContent(String textContent)
     throws DOMException
   {
@@ -427,20 +427,20 @@ class GnomeNode
         break;
       }
   }
-  
+
   public boolean isSameNode(Node other)
   {
     return equals(other);
   }
-  
+
   public native String lookupPrefix(String namespaceURI);
-  
+
   public native boolean isDefaultNamespace(String namespaceURI);
-  
+
   public native String lookupNamespaceURI(String prefix);
-  
+
   public native boolean isEqualNode(Node arg);
-  
+
   public Object getFeature(String feature, String version)
   {
     return getOwnerDocument().getImplementation()
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNodeList.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNodeList.java
index efd07acb0b0..51a6d0bfa89 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNodeList.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNodeList.java
@@ -1,4 +1,4 @@
-/* GnomeNodeList.java - 
+/* GnomeNodeList.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -62,5 +62,5 @@ implements NodeList
   public native Node item (int index);
 
   public native int getLength ();
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNotation.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNotation.java
index 7f6fdf44896..50e48e2a3ce 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNotation.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeNotation.java
@@ -1,4 +1,4 @@
-/* GnomeNotation.java - 
+/* GnomeNotation.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java
index d2ecd189004..fad6e108aad 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeProcessingInstruction.java
@@ -1,4 +1,4 @@
-/* GnomeProcessingInstruction.java - 
+/* GnomeProcessingInstruction.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeText.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeText.java
index 8b8e5e0c1a4..e00be18a977 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeText.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeText.java
@@ -1,4 +1,4 @@
-/* GnomeText.java - 
+/* GnomeText.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,7 +57,7 @@ implements Text
   {
     super (id);
   }
-  
+
   public Text splitText (int offset)
     throws DOMException
   {
@@ -69,14 +69,14 @@ implements Text
     setNodeValue (part2);
     return text;
   }
-  
+
   // DOM Level 3
 
   public boolean isElementContentWhitespace ()
   {
     return getTextContent ().trim ().length () == 0;
   }
-  
+
   public String getWholeText ()
   {
     Node first = this;
@@ -103,7 +103,7 @@ implements Text
       {
         setNodeValue (content);
       }
-    
+
     Node first = this;
     Node node = getPreviousSibling ();
     while (node != null && node instanceof Text)
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeTypeInfo.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeTypeInfo.java
index d365f0d9fc6..5517e8a99b6 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeTypeInfo.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeTypeInfo.java
@@ -1,4 +1,4 @@
-/* GnomeTypeInfo.java - 
+/* GnomeTypeInfo.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,5 +61,5 @@ class GnomeTypeInfo implements TypeInfo
   public native boolean isDerivedFrom (String typeNamespaceArg,
                                        String typeNameArg,
                                        int derivationMethod);
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathExpression.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathExpression.java
index 815804799d3..52f4daa21e1 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathExpression.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathExpression.java
@@ -1,4 +1,4 @@
-/* GnomeXPathExpression.java - 
+/* GnomeXPathExpression.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -78,9 +78,9 @@ implements XPathExpression
   {
     return doEvaluate (expr, contextNode, type, result);
   }
-  
+
   private native Object doEvaluate (Object expr, Node contextNode,
                                     short type, Object result)
     throws XPathException, DOMException;
-    
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java
index a9ba85509a4..039a79a03b4 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNSResolver.java
@@ -1,4 +1,4 @@
-/* GnomeXPathNSResolver.java - 
+/* GnomeXPathNSResolver.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -60,6 +60,5 @@ class GnomeXPathNSResolver
   {
     return node.lookupNamespaceURI(prefix);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
index dde3be2d903..b8d0a3d0aab 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathNodeList.java
@@ -1,4 +1,4 @@
-/* GnomeXPathNodeList.java - 
+/* GnomeXPathNodeList.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathResult.java b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathResult.java
index 850b5fae08f..b2c706f65d2 100644
--- a/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathResult.java
+++ b/libjava/classpath/gnu/xml/libxmlj/dom/GnomeXPathResult.java
@@ -1,4 +1,4 @@
-/* GnomeXPathResult.java - 
+/* GnomeXPathResult.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -69,7 +69,7 @@ implements XPathResult
   }
 
   private native void free (Object obj);
-  
+
   public native short getResultType ();
 
   public native double getNumberValue ()
@@ -130,5 +130,5 @@ implements XPathResult
           getSnapshotLength () + ']';
       }
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeLocator.java b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeLocator.java
index 0c812f683d8..dba0a72c0ca 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeLocator.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeLocator.java
@@ -1,4 +1,4 @@
-/* GnomeLocator.java - 
+/* GnomeLocator.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -67,7 +67,7 @@ implements Locator
         throw new NullPointerException ("loc");
       }
   }
-  
+
   public String getPublicId ()
   {
     return publicId (ctx, loc);
@@ -86,14 +86,14 @@ implements Locator
   {
     return lineNumber (ctx, loc);
   }
-  
+
   private native int lineNumber (Object ctx, Object loc);
 
   public int getColumnNumber ()
   {
     return columnNumber (ctx, loc);
   }
-  
+
   private native int columnNumber (Object ctx, Object loc);
 
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParser.java b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParser.java
index a5cdc42b74e..86d326b7c43 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParser.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParser.java
@@ -1,4 +1,4 @@
-/* GnomeSAXParser.java - 
+/* GnomeSAXParser.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -101,5 +101,5 @@ extends SAXParser
   {
     return validating;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java
index 5152d540f09..0c28812404f 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeSAXParserFactory.java
@@ -1,4 +1,4 @@
-/* GnomeSAXParserFactory.java - 
+/* GnomeSAXParserFactory.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -88,5 +88,5 @@ extends SAXParserFactory
     GnomeXMLReader.checkFeatureName (name);
     features.put (name, flag ? Boolean.TRUE : Boolean.FALSE);
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeXMLReader.java b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeXMLReader.java
index 846015a1c31..3a34bc934f1 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/GnomeXMLReader.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/GnomeXMLReader.java
@@ -1,4 +1,4 @@
-/* GnomeXMLReader.java - 
+/* GnomeXMLReader.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -83,7 +83,7 @@ implements XMLReader
 
   private static final String FEATURES_PREFIX =
     "http://xml.org/sax/features/";
-  
+
   private static final List RECOGNIZED_FEATURES =
     Arrays.asList (new String[]
                    {
@@ -100,10 +100,10 @@ implements XMLReader
                    "use-entity-resolver2",
                    "validation"
                    });
-  
+
   private static final String PROPERTIES_PREFIX =
     "http://xml.org/sax/properties/";
-  
+
   private static final List RECOGNIZED_PROPERTIES =
     Arrays.asList (new String[]
                    {
@@ -671,7 +671,7 @@ implements XMLReader
       {
       }
   }
-  
+
   private void startDocument (boolean standalone)
     throws SAXException
   {
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/Namespaces.java b/libjava/classpath/gnu/xml/libxmlj/sax/Namespaces.java
index 646d7b408cb..473d02028f7 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/Namespaces.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/Namespaces.java
@@ -1,4 +1,4 @@
-/* Namespaces.java - 
+/* Namespaces.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,14 +44,14 @@ import java.util.Iterator;
 
 /**
  * Helper class for managing namespaces.
- * 
+ *
  * @author Chris Burdess
  */
 class Namespaces
 {
 
   ArrayList stack = new ArrayList ();
-  
+
   /**
    * Increments the tree depth.
    * This allocates a new potential namespace entry.
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/StringArrayAttributes.java b/libjava/classpath/gnu/xml/libxmlj/sax/StringArrayAttributes.java
index f534efbcf95..f5a753c5677 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/StringArrayAttributes.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/StringArrayAttributes.java
@@ -1,4 +1,4 @@
-/* StringArrayAttributes.java - 
+/* StringArrayAttributes.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -168,4 +168,3 @@ implements Attributes
   }
 
 }
-
diff --git a/libjava/classpath/gnu/xml/libxmlj/sax/XMLName.java b/libjava/classpath/gnu/xml/libxmlj/sax/XMLName.java
index 5950a7996a0..b9bdf915927 100644
--- a/libjava/classpath/gnu/xml/libxmlj/sax/XMLName.java
+++ b/libjava/classpath/gnu/xml/libxmlj/sax/XMLName.java
@@ -1,4 +1,4 @@
-/* XMLName.java - 
+/* XMLName.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ class XMLName
 {
 
   private static final String XML_URI = "http://www.w3.org/XML/1998/namespace";
-  
+
   final String uri;
   final String localName;
   final String qName;
diff --git a/libjava/classpath/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java b/libjava/classpath/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java
index 0601e5e8987..398a0ba2e3e 100644
--- a/libjava/classpath/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java
+++ b/libjava/classpath/gnu/xml/libxmlj/transform/ErrorListenerErrorHandler.java
@@ -1,4 +1,4 @@
-/* ErrorListenerErrorHandler.java - 
+/* ErrorListenerErrorHandler.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -71,7 +71,7 @@ implements ErrorHandler
         throw getSAXException (te);
       }
   }
-  
+
   public void error (SAXParseException e)
     throws SAXException
   {
@@ -84,7 +84,7 @@ implements ErrorHandler
         throw getSAXException (te);
       }
   }
-  
+
   public void fatalError (SAXParseException e)
     throws SAXException
   {
@@ -107,5 +107,5 @@ implements ErrorHandler
       }
     return new SAXException (e);
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformer.java b/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformer.java
index 37aa05b9359..5f31cb898e7 100755
--- a/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformer.java
+++ b/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformer.java
@@ -1,4 +1,4 @@
-/* GnomeTransformer.java - 
+/* GnomeTransformer.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -120,19 +120,19 @@ public class GnomeTransformer
    * @param errorListener the error listener for transformation errors
    */
   GnomeTransformer (Source source,
-                    URIResolver resolver, 
-                    ErrorListener errorListener) 
+                    URIResolver resolver,
+                    ErrorListener errorListener)
     throws TransformerConfigurationException
   {
     this.resolver = resolver;
     this.errorListener = errorListener;
     parameters = new HashMap ();
     outputProperties = new Properties ();
-   
+
     if (source == null)
       {
         stylesheet = newStylesheet ();
-      } 
+      }
     else if (source instanceof StreamSource)
       {
         try
@@ -176,12 +176,12 @@ public class GnomeTransformer
         throw new TransformerConfigurationException (msg);
       }
   }
-  
+
   /**
    * Copy constructor.
    */
   private GnomeTransformer (Object stylesheet,
-                            URIResolver resolver, 
+                            URIResolver resolver,
                             ErrorListener errorListener,
                             Map parameters,
                             Properties outputProperties)
@@ -215,7 +215,7 @@ public class GnomeTransformer
   public synchronized void setParameter (String parameter, Object value)
   {
     parameters.put (parameter, value);
-  } 
+  }
 
   public synchronized Object getParameter (String name)
   {
@@ -232,7 +232,7 @@ public class GnomeTransformer
   public void setErrorListener (ErrorListener listener)
   {
     this.errorListener = listener;
-  } 
+  }
 
   public ErrorListener getErrorListener ()
   {
@@ -244,7 +244,7 @@ public class GnomeTransformer
   public void setURIResolver (URIResolver resolver)
   {
     this.resolver = resolver;
-  } 
+  }
 
   public URIResolver getURIResolver ()
   {
@@ -259,12 +259,12 @@ public class GnomeTransformer
   {
     // Note: defensive copying
     this.outputProperties = new Properties (outputProperties);
-  } 
+  }
 
   public void setOutputProperty (String name, String value)
   {
     outputProperties.setProperty (name, value);
-  } 
+  }
 
   public Properties getOutputProperties ()
   {
@@ -510,7 +510,7 @@ public class GnomeTransformer
         throw new TransformerException (e);
       }
   }
-  
+
   private void setDocumentLocator (Object ctx, Object loc)
   {
   }
@@ -550,7 +550,7 @@ public class GnomeTransformer
                                              systemId);
     errorListener.error (new TransformerException (message, l));
   }
-  
+
   private void fatalError (String message,
                            int lineNumber,
                            int columnNumber,
@@ -568,5 +568,5 @@ public class GnomeTransformer
                                              systemId);
     errorListener.fatalError (new TransformerException (message, l));
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java b/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
index 78dfe2148b6..4a0100a2110 100755
--- a/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
+++ b/libjava/classpath/gnu/xml/libxmlj/transform/GnomeTransformerFactory.java
@@ -1,4 +1,4 @@
-/* GnomeTransformerFactory.java - 
+/* GnomeTransformerFactory.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -86,7 +86,7 @@ public class GnomeTransformerFactory
   {
     XMLJ.init ();
   }
-  
+
   /**
    *  URIResolver set by user, or default implementation.
    */
@@ -104,7 +104,7 @@ public class GnomeTransformerFactory
 
   //--- Implementation of javax.xml.transform.TransformerFactory
   //--- follows.
-  
+
   // -- begin getAssociatedStylesheet implementation --
 
   /**
@@ -112,7 +112,7 @@ public class GnomeTransformerFactory
    * null if no associated stylesheet could be found.
    */
   public Source getAssociatedStylesheet(Source source, String media,
-                                        String title, String charset) 
+                                        String title, String charset)
     throws TransformerConfigurationException
   {
     String href= null;
@@ -225,7 +225,7 @@ public class GnomeTransformerFactory
   class AssociatedStylesheetHandler
     extends DefaultHandler
   {
-    
+
     String media;
     String title;
     String href;
@@ -246,7 +246,7 @@ public class GnomeTransformerFactory
           href = parseParameter(data, "href");
         }
     }
-    
+
   }
 
   String parseParameter(String data, String name)
@@ -270,33 +270,33 @@ public class GnomeTransformerFactory
   public synchronized void setAttribute (String name, Object value)
   {
     this.attributes.put (name, value);
-  } 
+  }
 
   public synchronized Object getAttribute (String name)
   {
     return attributes.get (name);
   }
-  
+
   public void setErrorListener (ErrorListener errorListener)
   {
     this.errorListener = errorListener;
-  } 
+  }
 
   public ErrorListener getErrorListener ()
   {
     return errorListener;
   }
-  
+
   public void setURIResolver (URIResolver uriResolver)
   {
     this.uriResolver = uriResolver;
-  } 
+  }
 
   public URIResolver getURIResolver ()
   {
     return uriResolver;
   }
-  
+
   public boolean getFeature (String name)
   {
     return (StreamSource.FEATURE.equals (name) ||
@@ -335,7 +335,7 @@ public class GnomeTransformerFactory
    *  Returns a new instance of class {@link Templates} for
    *  the given souce.
    */
-  public Templates newTemplates (Source source) 
+  public Templates newTemplates (Source source)
     throws TransformerConfigurationException
   {
     return new GnomeTransformer (source, uriResolver, errorListener);
diff --git a/libjava/classpath/gnu/xml/libxmlj/transform/URIResolverEntityResolver.java b/libjava/classpath/gnu/xml/libxmlj/transform/URIResolverEntityResolver.java
index 88a58e1a2fa..0ce71d0efc7 100644
--- a/libjava/classpath/gnu/xml/libxmlj/transform/URIResolverEntityResolver.java
+++ b/libjava/classpath/gnu/xml/libxmlj/transform/URIResolverEntityResolver.java
@@ -1,4 +1,4 @@
-/* URIResolverEntityResolver.java - 
+/* URIResolverEntityResolver.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/gnu/xml/libxmlj/util/EmptyNodeList.java b/libjava/classpath/gnu/xml/libxmlj/util/EmptyNodeList.java
index 24a08229ced..60019ddd4e5 100644
--- a/libjava/classpath/gnu/xml/libxmlj/util/EmptyNodeList.java
+++ b/libjava/classpath/gnu/xml/libxmlj/util/EmptyNodeList.java
@@ -1,4 +1,4 @@
-/* EmptyNodeList.java - 
+/* EmptyNodeList.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,5 +58,5 @@ implements NodeList
   {
     return 0;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/util/NamedInputStream.java b/libjava/classpath/gnu/xml/libxmlj/util/NamedInputStream.java
index 8d20ec4e57b..01b3af90dbd 100644
--- a/libjava/classpath/gnu/xml/libxmlj/util/NamedInputStream.java
+++ b/libjava/classpath/gnu/xml/libxmlj/util/NamedInputStream.java
@@ -1,4 +1,4 @@
-/* NamedInputStream.java - 
+/* NamedInputStream.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -54,7 +54,7 @@ extends FilterInputStream
 {
 
   private static int DETECT_BUFFER_SIZE = 50;
-  
+
   private String name;
 
   NamedInputStream (String name, InputStream in, int size)
@@ -95,5 +95,5 @@ extends FilterInputStream
         return ret;
       }
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/libxmlj/util/StandaloneDocumentType.java b/libjava/classpath/gnu/xml/libxmlj/util/StandaloneDocumentType.java
index d47cdb05d66..5c3316611f6 100644
--- a/libjava/classpath/gnu/xml/libxmlj/util/StandaloneDocumentType.java
+++ b/libjava/classpath/gnu/xml/libxmlj/util/StandaloneDocumentType.java
@@ -1,4 +1,4 @@
-/* StandaloneDocumentType.java - 
+/* StandaloneDocumentType.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,7 +75,7 @@ implements DocumentType
     // TODO
     return null;
   }
-  
+
   public NamedNodeMap getNotations ()
   {
     // TODO
@@ -96,7 +96,7 @@ implements DocumentType
   {
     return null;
   }
-  
+
   // -- Node --
 
   public String getNodeName ()
@@ -109,7 +109,7 @@ implements DocumentType
   {
     return null;
   }
-  
+
   public void setNodeValue (String nodeValue)
     throws DOMException
   {
@@ -254,12 +254,12 @@ implements DocumentType
   {
     return equals (other);
   }
-  
+
   public String lookupPrefix (String namespace)
   {
     return null;
   }
-  
+
   public boolean isDefaultNamespace (String namespace)
   {
     return false;
diff --git a/libjava/classpath/gnu/xml/libxmlj/util/StandaloneLocator.java b/libjava/classpath/gnu/xml/libxmlj/util/StandaloneLocator.java
index 5430330cc4e..75b40bdf169 100644
--- a/libjava/classpath/gnu/xml/libxmlj/util/StandaloneLocator.java
+++ b/libjava/classpath/gnu/xml/libxmlj/util/StandaloneLocator.java
@@ -1,4 +1,4 @@
-/* StandaloneLocator.java - 
+/* StandaloneLocator.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,12 +65,12 @@ implements Locator, SourceLocator
     this.publicId = publicId;
     this.systemId = systemId;
   }
-  
+
   public String getPublicId ()
   {
     return publicId;
   }
-  
+
   public String getSystemId ()
   {
     return systemId;
diff --git a/libjava/classpath/gnu/xml/libxmlj/util/XMLJ.java b/libjava/classpath/gnu/xml/libxmlj/util/XMLJ.java
index 0d5f9f689dc..8d954d0bec2 100644
--- a/libjava/classpath/gnu/xml/libxmlj/util/XMLJ.java
+++ b/libjava/classpath/gnu/xml/libxmlj/util/XMLJ.java
@@ -1,4 +1,4 @@
-/* XMLJ.java - 
+/* XMLJ.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,35 +70,35 @@ public final class XMLJ
   static class XMLJShutdownHook
     implements Runnable
   {
-    
+
     public void run ()
     {
       // Make sure finalizers are run
       System.gc ();
       Runtime.getRuntime ().runFinalization ();
-      
+
       // Perform global cleanup on the native level
       GnomeTransformerFactory.freeLibxsltGlobal ();
     }
-  
+
   }
 
   private static boolean initialised = false;
-  
+
   public static void init ()
   {
     if (!initialised)
       {
         System.loadLibrary ("xmlj");
-        
-        XMLJShutdownHook hook = new XMLJShutdownHook ();  
+
+        XMLJShutdownHook hook = new XMLJShutdownHook ();
         Runtime.getRuntime ().addShutdownHook (new Thread (hook));
       }
     initialised = true;
   }
 
   private static final int LOOKAHEAD = 50;
-  
+
   /**
    * Returns an input stream for the specified input source.
    * This returns a pushback stream that libxmlj can use to detect the
@@ -276,5 +276,5 @@ public final class XMLJ
       }
     return uri;
   }
-  
+
 }
diff --git a/libjava/classpath/gnu/xml/pipeline/CallFilter.java b/libjava/classpath/gnu/xml/pipeline/CallFilter.java
index 3b337517377..2398b868537 100644
--- a/libjava/classpath/gnu/xml/pipeline/CallFilter.java
+++ b/libjava/classpath/gnu/xml/pipeline/CallFilter.java
@@ -1,4 +1,4 @@
-/* CallFilter.java -- 
+/* CallFilter.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -99,11 +99,11 @@ import gnu.xml.util.XMLWriter;
  */
 final public class CallFilter implements EventConsumer
 {
-    private Requestor			req;
-    private EventConsumer		next;
-    private URL				target;
-    private URLConnection		conn;
-    private ErrorHandler		errHandler;
+    private Requestor                   req;
+    private EventConsumer               next;
+    private URL                         target;
+    private URLConnection               conn;
+    private ErrorHandler                errHandler;
 
 
     /**
@@ -113,13 +113,13 @@ final public class CallFilter implements EventConsumer
      *
      * @exception IOException if the URI isn't accepted as a URL
      */
-	// constructor used by PipelineFactory
+        // constructor used by PipelineFactory
     public CallFilter (String uri, EventConsumer next)
     throws IOException
     {
-	this.next = next;
-	req = new Requestor ();
-	setCallTarget (uri);
+        this.next = next;
+        req = new Requestor ();
+        setCallTarget (uri);
     }
 
     /**
@@ -129,7 +129,7 @@ final public class CallFilter implements EventConsumer
     final public void setCallTarget (String uri)
     throws IOException
     {
-	target = new URL (uri);
+        target = new URL (uri);
     }
 
     /**
@@ -138,7 +138,7 @@ final public class CallFilter implements EventConsumer
      */
     public void setErrorHandler (ErrorHandler handler)
     {
-	req.setErrorHandler (handler);
+        req.setErrorHandler (handler);
     }
 
 
@@ -147,19 +147,19 @@ final public class CallFilter implements EventConsumer
      */
     final public String getCallTarget ()
     {
-	return target.toString ();
+        return target.toString ();
     }
 
     /** Returns the content handler currently in use. */
     final public org.xml.sax.ContentHandler getContentHandler ()
     {
-	return req;
+        return req;
     }
 
     /** Returns the DTD handler currently in use. */
     final public DTDHandler getDTDHandler ()
     {
-	return req;
+        return req;
     }
 
 
@@ -170,11 +170,11 @@ final public class CallFilter implements EventConsumer
     final public Object getProperty (String id)
     throws SAXNotRecognizedException
     {
-	if (EventFilter.DECL_HANDLER.equals (id))
-	    return req;
-	if (EventFilter.LEXICAL_HANDLER.equals (id))
-	    return req;
-	throw new SAXNotRecognizedException (id);
+        if (EventFilter.DECL_HANDLER.equals (id))
+            return req;
+        if (EventFilter.LEXICAL_HANDLER.equals (id))
+            return req;
+        throw new SAXNotRecognizedException (id);
     }
 
 
@@ -187,71 +187,71 @@ final public class CallFilter implements EventConsumer
     //
     final class Requestor extends XMLWriter
     {
-	Requestor ()
-	{
-	    super ((Writer)null);
-	}
+        Requestor ()
+        {
+            super ((Writer)null);
+        }
 
-	public synchronized void startDocument () throws SAXException
-	{
-	    // Connect to remote object and set up to send it XML text
-	    try {
-		if (conn != null)
-		    throw new IllegalStateException ("call is being made");
+        public synchronized void startDocument () throws SAXException
+        {
+            // Connect to remote object and set up to send it XML text
+            try {
+                if (conn != null)
+                    throw new IllegalStateException ("call is being made");
 
-		conn = target.openConnection ();
-		conn.setDoOutput (true);
-		conn.setRequestProperty ("Content-Type",
-			    "application/xml;charset=UTF-8");
+                conn = target.openConnection ();
+                conn.setDoOutput (true);
+                conn.setRequestProperty ("Content-Type",
+                            "application/xml;charset=UTF-8");
 
-		setWriter (new OutputStreamWriter (
-			conn.getOutputStream (),
-			"UTF8"), "UTF-8");
+                setWriter (new OutputStreamWriter (
+                        conn.getOutputStream (),
+                        "UTF8"), "UTF-8");
 
-	    } catch (IOException e) {
-		fatal ("can't write (POST) to URI: " + target, e);
-	    }
+            } catch (IOException e) {
+                fatal ("can't write (POST) to URI: " + target, e);
+            }
 
-	    // NOW base class can safely write that text!
-	    super.startDocument ();
-	}
+            // NOW base class can safely write that text!
+            super.startDocument ();
+        }
 
-	public void endDocument () throws SAXException
-	{
-	    //
-	    // Finish writing the request (for HTTP, a POST);
-	    // this closes the output stream.
-	    //
-	    super.endDocument ();
+        public void endDocument () throws SAXException
+        {
+            //
+            // Finish writing the request (for HTTP, a POST);
+            // this closes the output stream.
+            //
+            super.endDocument ();
 
-	    //
-	    // Receive the response.
-	    // Produce events for the next stage.
-	    //
-	    InputSource	source;
-	    XMLReader	producer;
-	    String	encoding;
+            //
+            // Receive the response.
+            // Produce events for the next stage.
+            //
+            InputSource source;
+            XMLReader   producer;
+            String      encoding;
 
-	    try {
+            try {
 
-		source = new InputSource (conn.getInputStream ());
+                source = new InputSource (conn.getInputStream ());
 
 // FIXME if status is anything but success, report it!!  It'd be good to
 // save the request data just in case we need to deal with a forward.
 
-		encoding = Resolver.getEncoding (conn.getContentType ());
-		if (encoding != null)
-		    source.setEncoding (encoding);
+                encoding = Resolver.getEncoding (conn.getContentType ());
+                if (encoding != null)
+                    source.setEncoding (encoding);
 
-		producer = XMLReaderFactory.createXMLReader ();
-		producer.setErrorHandler (getErrorHandler ());
-		EventFilter.bind (producer, next);
-		producer.parse (source);
-		conn = null;
+                producer = XMLReaderFactory.createXMLReader ();
+                producer.setErrorHandler (getErrorHandler ());
+                EventFilter.bind (producer, next);
+                producer.parse (source);
+                conn = null;
 
-	    } catch (IOException e) {
-		fatal ("I/O Exception reading response, " + e.getMessage (), e);
-	    }
-	}
+            } catch (IOException e) {
+                fatal ("I/O Exception reading response, " + e.getMessage (), e);
+            }
+        }
     }
 }
diff --git a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
index 53f7f24a29f..141f36eca28 100644
--- a/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
+++ b/libjava/classpath/gnu/xml/pipeline/DomConsumer.java
@@ -1,4 +1,4 @@
-/* DomConsumer.java -- 
+/* DomConsumer.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -105,17 +105,17 @@ import org.w3c.dom.Text;
  */
 public class DomConsumer implements EventConsumer
 {
-    private Class		domImpl;
+    private Class               domImpl;
 
-    private boolean		hidingCDATA = true;
-    private boolean		hidingComments = true;
-    private boolean		hidingWhitespace = true;
-    private boolean		hidingReferences = true;
+    private boolean             hidingCDATA = true;
+    private boolean             hidingComments = true;
+    private boolean             hidingWhitespace = true;
+    private boolean             hidingReferences = true;
 
-    private Handler		handler;
-    private ErrorHandler	errHandler;
+    private Handler             handler;
+    private ErrorHandler        errHandler;
 
-    private EventConsumer	next;
+    private EventConsumer       next;
 
     // FIXME:  this can't be a generic pipeline stage just now,
     // since its input became a Class not a String (to be turned
@@ -127,16 +127,16 @@ public class DomConsumer implements EventConsumer
      * of DOM when constructing its result value.
      *
      * @param impl class implementing {@link org.w3c.dom.Document Document}
-     *	which publicly exposes a default constructor
+     *  which publicly exposes a default constructor
      *
      * @exception SAXException when there is a problem creating an
-     *	empty DOM document using the specified implementation
+     *  empty DOM document using the specified implementation
      */
     public DomConsumer (Class impl)
     throws SAXException
     {
-	domImpl = impl;
-	handler = new Handler (this);
+        domImpl = impl;
+        handler = new Handler (this);
     }
 
     /**
@@ -148,22 +148,22 @@ public class DomConsumer implements EventConsumer
      */
     protected void setHandler (Handler h)
     {
-	handler = h;
+        handler = h;
     }
 
 
     private Document emptyDocument ()
     throws SAXException
     {
-	try {
-	    return (Document) domImpl.newInstance ();
-	} catch (IllegalAccessException e) {
-	    throw new SAXException ("can't access constructor: "
-		    + e.getMessage ());
-	} catch (InstantiationException e) {
-	    throw new SAXException ("can't instantiate Document: "
-		    + e.getMessage ());
-	}
+        try {
+            return (Document) domImpl.newInstance ();
+        } catch (IllegalAccessException e) {
+            throw new SAXException ("can't access constructor: "
+                    + e.getMessage ());
+        } catch (InstantiationException e) {
+            throw new SAXException ("can't instantiate Document: "
+                    + e.getMessage ());
+        }
     }
 
 
@@ -178,18 +178,18 @@ public class DomConsumer implements EventConsumer
      * copy of the input event stream, use a {@link TeeConsumer}.
      *
      * @param impl class implementing {@link org.w3c.dom.Document Document}
-     *	which publicly exposes a default constructor
+     *  which publicly exposes a default constructor
      * @param next receives a "replayed" sequence of parse events when
-     *	the endDocument method is invoked.
+     *  the endDocument method is invoked.
      *
      * @exception SAXException when there is a problem creating an
-     *	empty DOM document using the specified DOM implementation
+     *  empty DOM document using the specified DOM implementation
      */
     public DomConsumer (Class impl, EventConsumer n)
     throws SAXException
     {
-	this (impl);
-	next = n;
+        this (impl);
+        next = n;
     }
 
 
@@ -197,16 +197,16 @@ public class DomConsumer implements EventConsumer
      * Returns the document constructed from the preceding
      * sequence of events.  This method should not be
      * used again until another sequence of events has been
-     * given to this EventConsumer.  
+     * given to this EventConsumer.
      */
     final public Document getDocument ()
     {
-	return handler.clearDocument ();
+        return handler.clearDocument ();
     }
 
     public void setErrorHandler (ErrorHandler handler)
     {
-	errHandler = handler;
+        errHandler = handler;
     }
 
 
@@ -219,8 +219,8 @@ public class DomConsumer implements EventConsumer
      *
      * @see #setHidingReferences
      */
-    final public boolean	isHidingReferences ()
-	{ return hidingReferences; }
+    final public boolean        isHidingReferences ()
+        { return hidingReferences; }
 
     /**
      * Controls whether the consumer will hide entity expansions,
@@ -229,9 +229,9 @@ public class DomConsumer implements EventConsumer
      * @see #isHidingReferences
      * @param flag False if entity reference nodes will appear
      */
-    final public void		setHidingReferences (boolean flag)
-	{ hidingReferences = flag; }
-    
+    final public void           setHidingReferences (boolean flag)
+        { hidingReferences = flag; }
+
 
     /**
      * Returns true if the consumer is hiding comments (the default),
@@ -240,7 +240,7 @@ public class DomConsumer implements EventConsumer
      * @see #setHidingComments
      */
     public final boolean isHidingComments ()
-	{ return hidingComments; }
+        { return hidingComments; }
 
     /**
      * Controls whether the consumer is hiding comments.
@@ -248,7 +248,7 @@ public class DomConsumer implements EventConsumer
      * @see #isHidingComments
      */
     public final void setHidingComments (boolean flag)
-	{ hidingComments = flag; }
+        { hidingComments = flag; }
 
 
     /**
@@ -259,7 +259,7 @@ public class DomConsumer implements EventConsumer
      * @see #setHidingWhitespace
      */
     public final boolean isHidingWhitespace ()
-	{ return hidingWhitespace; }
+        { return hidingWhitespace; }
 
     /**
      * Controls whether the consumer hides ignorable whitespace
@@ -267,7 +267,7 @@ public class DomConsumer implements EventConsumer
      * @see #isHidingComments
      */
     public final void setHidingWhitespace (boolean flag)
-	{ hidingWhitespace = flag; }
+        { hidingWhitespace = flag; }
 
 
     /**
@@ -276,28 +276,28 @@ public class DomConsumer implements EventConsumer
      *
      * @see #setHidingCDATA
      */
-    final public boolean	isHidingCDATA ()
-	{ return hidingCDATA; }
+    final public boolean        isHidingCDATA ()
+        { return hidingCDATA; }
 
     /**
      * Controls whether the consumer will save CDATA boundaries.
      *
      * @see #isHidingCDATA
      * @param flag True to treat CDATA text differently from other
-     *	text nodes
+     *  text nodes
      */
-    final public void		setHidingCDATA (boolean flag)
-	{ hidingCDATA = flag; }
-    
+    final public void           setHidingCDATA (boolean flag)
+        { hidingCDATA = flag; }
+
 
 
     /** Returns the document handler being used. */
     final public ContentHandler getContentHandler ()
-	{ return handler; }
+        { return handler; }
 
     /** Returns the DTD handler being used. */
     final public DTDHandler getDTDHandler ()
-	{ return handler; }
+        { return handler; }
 
     /**
      * Returns the lexical handler being used.
@@ -306,11 +306,11 @@ public class DomConsumer implements EventConsumer
     final public Object getProperty (String id)
     throws SAXNotRecognizedException
     {
-	if ("http://xml.org/sax/properties/lexical-handler".equals (id))
-	    return handler;
-	if ("http://xml.org/sax/properties/declaration-handler".equals (id))
-	    return handler;
-	throw new SAXNotRecognizedException (id);
+        if ("http://xml.org/sax/properties/lexical-handler".equals (id))
+            return handler;
+        if ("http://xml.org/sax/properties/declaration-handler".equals (id))
+            return handler;
+        throw new SAXNotRecognizedException (id);
     }
 
     EventConsumer getNext () { return next; }
@@ -320,7 +320,7 @@ public class DomConsumer implements EventConsumer
     /**
      * Class used to intercept various parsing events and use them to
      * populate a DOM document.  Subclasses would typically know and use
-     * backdoors into specific DOM implementations, used to implement 
+     * backdoors into specific DOM implementations, used to implement
      * DTD-related functionality.
      *
      * 
         Note that if this ever throws a DOMException (runtime exception)
@@ -329,639 +329,639 @@ public class DomConsumer implements EventConsumer
      * accepted illegal input data). 
        
      */
     public static class Handler
-	implements ContentHandler, LexicalHandler,
-	    DTDHandler, DeclHandler
+        implements ContentHandler, LexicalHandler,
+            DTDHandler, DeclHandler
     {
-	protected DomConsumer		consumer;
-
-	private DOMImplementation	impl;
-	private Document 		document;
-	private boolean		isL2;
-
-	private Locator		locator;
-	private Node		top;
-	private boolean		inCDATA;
-	private boolean		mergeCDATA;
-	private boolean		inDTD;
-	private String		currentEntity;
-
-	private boolean		recreatedAttrs;
-	private AttributesImpl	attributes = new AttributesImpl ();
-
-	/**
-	 * Subclasses may use SAX2 events to provide additional
-	 * behaviors in the resulting DOM.
-	 */
-	protected Handler (DomConsumer consumer)
-	throws SAXException
-	{
-	    this.consumer = consumer;
-	    document = consumer.emptyDocument ();
-	    impl = document.getImplementation ();
-	    isL2 = impl.hasFeature ("XML", "2.0");
-	}
-
-	private void fatal (String message, Exception x)
-	throws SAXException
-	{
-	    SAXParseException	e;
-	    ErrorHandler	errHandler = consumer.getErrorHandler ();
-
-	    if (locator == null)
-		e = new SAXParseException (message, null, null, -1, -1, x);
-	    else
-		e = new SAXParseException (message, locator, x);
-	    if (errHandler != null)
-		errHandler.fatalError (e);
-	    throw e;
-	}
-
-	/**
-	 * Returns and forgets the document produced.  If the handler is
-	 * reused, a new document may be created.
-	 */
-	Document clearDocument ()
-	{
-	    Document retval = document;
-	    document = null;
-	    locator = null;
-	    return retval;
-	}
-
-	/**
-	 * Returns the document under construction.
-	 */
-	protected Document getDocument ()
-	    { return document; }
-	
-	/**
-	 * Returns the current node being populated.  This is usually
-	 * an Element or Document, but it might be an EntityReference
-	 * node if some implementation-specific code knows how to put
-	 * those into the result tree and later mark them as readonly.
-	 */
-	protected Node getTop ()
-	    { return top; }
-
-
-	// SAX1
-	public void setDocumentLocator (Locator locator)
-	{
-	    this.locator = locator;
-	}
-
-	// SAX1
-	public void startDocument ()
-	throws SAXException
-	{
-	    if (document == null)
-		try {
-		    if (isL2) {
-			// couple to original implementation
-			document = impl.createDocument (null, "foo", null);
-			document.removeChild (document.getFirstChild ());
-		    } else {
-			document = consumer.emptyDocument ();
-		    }
-		} catch (Exception e) {
-		    fatal ("DOM create document", e);
-		}
-	    top = document;
-	}
-
-	// SAX1
-	public void endDocument ()
-	throws SAXException
-	{
-	    try {
-		if (consumer.getNext () != null && document != null) {
-		    DomParser	parser = new DomParser (document);
-
-		    EventFilter.bind (parser, consumer.getNext ());
-		    parser.parse ("ignored");
-		}
-	    } finally {
-		top = null;
-	    }
-	}
-
-	// SAX1
-	public void processingInstruction (String target, String data)
-	throws SAXException
-	{
-	    // we can't create populated entity ref nodes using
-	    // only public DOM APIs (they've got to be readonly)
-	    if (currentEntity != null)
-		return;
-
-	    ProcessingInstruction	pi;
-
-	    if (isL2
-		    // && consumer.isUsingNamespaces ()
-		    && target.indexOf (':') != -1)
-		namespaceError (
-		    "PI target name is namespace nonconformant: "
-			+ target);
-	    if (inDTD)
-		return;
-	    pi = document.createProcessingInstruction (target, data);
-	    top.appendChild (pi);
-	}
-
-	/**
-	 * Subclasses may overrride this method to provide a more efficient
-	 * way to construct text nodes.
-	 * Typically, copying the text into a single character array will
-	 * be more efficient than doing that as well as allocating other
-	 * needed for a String, including an internal StringBuffer.
-	 * Those additional memory and CPU costs can be incurred later,
-	 * if ever needed.
-	 * Unfortunately the standard DOM factory APIs encourage those costs
-	 * to be incurred early.
-	 */
-	protected Text createText (
-	    boolean	isCDATA,
-	    char	ch [],
-	    int		start,
-	    int		length
-	) {
-	    String	value = new String (ch, start, length);
-
-	    if (isCDATA)
-		return document.createCDATASection (value);
-	    else
-		return document.createTextNode (value);
-	}
-
-	// SAX1
-	public void characters (char ch [], int start, int length)
-	throws SAXException
-	{
-	    // we can't create populated entity ref nodes using
-	    // only public DOM APIs (they've got to be readonly
-	    // at creation time)
-	    if (currentEntity != null)
-		return;
-
-	    Node	lastChild = top.getLastChild ();
-
-	    // merge consecutive text or CDATA nodes if appropriate.
-	    if (lastChild instanceof Text) {
-		if (consumer.isHidingCDATA ()
-			// consecutive Text content ... always merge
-			|| (!inCDATA
-			    && !(lastChild instanceof CDATASection))
-			// consecutive CDATASection content ... don't
-			// merge between sections, only within them
-			|| (inCDATA && mergeCDATA
-			    && lastChild instanceof CDATASection)
-			    ) {
-		    CharacterData	last = (CharacterData) lastChild;
-		    String		value = new String (ch, start, length);
-		    
-		    last.appendData (value);
-		    return;
-		}
-	    }
-	    if (inCDATA && !consumer.isHidingCDATA ()) {
-		top.appendChild (createText (true, ch, start, length));
-		mergeCDATA = true;
-	    } else
-		top.appendChild (createText (false, ch, start, length));
-	}
-
-	// SAX2
-	public void skippedEntity (String name)
-	throws SAXException
-	{
-	    // this callback is useless except to report errors, since
-	    // we can't know if the ref was in content, within an
-	    // attribute, within a declaration ... only one of those
-	    // cases supports more intelligent action than a panic.
-	    fatal ("skipped entity: " + name, null);
-	}
-
-	// SAX2
-	public void startPrefixMapping (String prefix, String uri)
-	throws SAXException
-	{
-	    // reconstruct "xmlns" attributes deleted by all
-	    // SAX2 parsers without "namespace-prefixes" = true
-	    if ("".equals (prefix))
-		attributes.addAttribute ("", "", "xmlns",
-			"CDATA", uri);
-	    else
-		attributes.addAttribute ("", "", "xmlns:" + prefix,
-			"CDATA", uri);
-	    recreatedAttrs = true;
-	}
-
-	// SAX2
-	public void endPrefixMapping (String prefix)
-	throws SAXException
-	    { }
-
-	// SAX2
-	public void startElement (
-	    String uri,
-	    String localName,
-	    String qName,
-	    Attributes atts
-	) throws SAXException
-	{
-	    // we can't create populated entity ref nodes using
-	    // only public DOM APIs (they've got to be readonly)
-	    if (currentEntity != null)
-		return;
-
-	    // parser discarded basic information; DOM tree isn't writable
-	    // without massaging to assign prefixes to all nodes.
-	    // the "NSFilter" class does that massaging.
-	    if (qName.length () == 0)
-		qName = localName;
-
-
-	    Element	element;
-	    int		length = atts.getLength ();
-
-	    if (!isL2) {
-		element = document.createElement (qName);
-
-		// first the explicit attributes ...
-		length = atts.getLength ();
-		for (int i = 0; i < length; i++)
-		    element.setAttribute (atts.getQName (i),
-					    atts.getValue (i));
-		// ... then any recreated ones (DOM deletes duplicates)
-		if (recreatedAttrs) {
-		    recreatedAttrs = false;
-		    length = attributes.getLength ();
-		    for (int i = 0; i < length; i++)
-			element.setAttribute (attributes.getQName (i),
-						attributes.getValue (i));
-		    attributes.clear ();
-		}
-
-		top.appendChild (element);
-		top = element;
-		return;
-	    }
-
-	    // For an L2 DOM when namespace use is enabled, use
-	    // createElementNS/createAttributeNS except when
-	    // (a) it's an element in the default namespace, or
-	    // (b) it's an attribute with no prefix
-	    String	namespace;
-	    
-	    if (localName.length () != 0)
-		namespace = (uri.length () == 0) ? null : uri;
-	    else
-		namespace = getNamespace (getPrefix (qName), atts);
-
-	    if (namespace == null)
-		element = document.createElement (qName);
-	    else
-		element = document.createElementNS (namespace, qName);
-
-	    populateAttributes (element, atts);
-	    if (recreatedAttrs) {
-		recreatedAttrs = false;
-		// ... DOM deletes any duplicates
-		populateAttributes (element, attributes);
-		attributes.clear ();
-	    }
-
-	    top.appendChild (element);
-	    top = element;
-	}
-
-	final static String	xmlnsURI = "http://www.w3.org/2000/xmlns/";
-
-	private void populateAttributes (Element element, Attributes attrs)
-	throws SAXParseException
-	{
-	    int		length = attrs.getLength ();
-
-	    for (int i = 0; i < length; i++) {
-		String	type = attrs.getType (i);
-		String	value = attrs.getValue (i);
-		String	name = attrs.getQName (i);
-		String	local = attrs.getLocalName (i);
-		String	uri = attrs.getURI (i);
-
-		// parser discarded basic information, DOM tree isn't writable
-		if (name.length () == 0)
-		    name = local;
-
-		// all attribute types other than these three may not
-		// contain scoped names... enumerated attributes get
-		// reported as NMTOKEN, except for NOTATION values
-		if (!("CDATA".equals (type)
-			|| "NMTOKEN".equals (type)
-			|| "NMTOKENS".equals (type))) {
-		    if (value.indexOf (':') != -1) {
-			namespaceError (
-				"namespace nonconformant attribute value: "
-				    + "<" + element.getNodeName ()
-				    + " " + name + "='" + value + "' ...>");
-		    }
-		}
-
-		// xmlns="" is legal (undoes default NS)
-		// xmlns:foo="" is illegal
-		String prefix = getPrefix (name);
-		String namespace;
-
-		if ("xmlns".equals (prefix)) {
-		    if ("".equals (value))
-			namespaceError ("illegal null namespace decl, " + name);
-		    namespace = xmlnsURI;
-		} else if ("xmlns".equals (name))
-		    namespace = xmlnsURI;
-
-		else if (prefix == null)
-		    namespace = null;
-		else if (!"".equals(uri) && uri.length () != 0)
-		    namespace = uri;
-		else
-		    namespace = getNamespace (prefix, attrs);
-
-		if (namespace == null)
-		    element.setAttribute (name, value);
-		else
-		    element.setAttributeNS (namespace, name, value);
-	    }
-	}
-
-	private String getPrefix (String name)
-	{
-	    int		temp;
-
-	    if ((temp = name.indexOf (':')) > 0)
-		return name.substring (0, temp);
-	    return null;
-	}
-
-	// used with SAX1-level parser output 
-	private String getNamespace (String prefix, Attributes attrs)
-	throws SAXParseException
-	{
-	    String namespace;
-	    String decl;
-
-	    // defaulting 
-	    if (prefix == null) {
-		decl = "xmlns";
-		namespace = attrs.getValue (decl);
-		if ("".equals (namespace))
-		    return null;
-		else if (namespace != null)
-		    return namespace;
-
-	    // "xmlns" is like a keyword
-	    // ... according to the Namespace REC, but DOM L2 CR2+
-	    // and Infoset violate that by assigning a namespace.
-	    // that conflict is resolved elsewhere.
-	    } else if ("xmlns".equals (prefix))
-		return null;
-
-	    // "xml" prefix is fixed
-	    else if ("xml".equals (prefix))
-		return "http://www.w3.org/XML/1998/namespace";
-
-	    // otherwise, expect a declaration
-	    else {
-		decl = "xmlns:" + prefix;
-		namespace = attrs.getValue (decl);
-	    }
-	    
-	    // if we found a local declaration, great
-	    if (namespace != null)
-		return namespace;
-
-
-	    // ELSE ... search up the tree we've been building
-	    for (Node n = top;
-		    n != null && n.getNodeType () != Node.DOCUMENT_NODE;
-		    n = n.getParentNode ()) {
-		if (n.getNodeType () == Node.ENTITY_REFERENCE_NODE)
-		    continue;
-		Element e = (Element) n;
-		Attr attr = e.getAttributeNode (decl);
-		if (attr != null)
-		    return attr.getNodeValue ();
-	    }
-	    // see above re "xmlns" as keyword
-	    if ("xmlns".equals (decl))
-		return null;
-
-	    namespaceError ("Undeclared namespace prefix: " + prefix);
-	    return null;
-	}
-
-	// SAX2
-	public void endElement (String uri, String localName, String qName)
-	throws SAXException
-	{
-	    // we can't create populated entity ref nodes using
-	    // only public DOM APIs (they've got to be readonly)
-	    if (currentEntity != null)
-		return;
-
-	    top = top.getParentNode ();
-	}
-
-	// SAX1 (mandatory reporting if validating)
-	public void ignorableWhitespace (char ch [], int start, int length)
-	throws SAXException
-	{
-	    if (consumer.isHidingWhitespace ())
-		return;
-	    characters (ch, start, length);
-	}
-
-	// SAX2 lexical event
-	public void startCDATA ()
-	throws SAXException
-	{
-	    inCDATA = true;
-	    // true except for the first fragment of a cdata section
-	    mergeCDATA = false;
-	}
-	
-	// SAX2 lexical event
-	public void endCDATA ()
-	throws SAXException
-	{
-	    inCDATA = false;
-	}
-	
-	// SAX2 lexical event
-	//
-	// this SAX2 callback merges two unrelated things:
-	//	- Declaration of the root element type ... belongs with
-	//    the other DTD declaration methods, NOT HERE.
-	//	- IDs for the optional external subset ... belongs here
-	//    with other lexical information.
-	//
-	// ...and it doesn't include the internal DTD subset, desired
-	// both to support DOM L2 and to enable "pass through" processing
-	//
-	public void startDTD (String name, String publicId, String SystemId)
-	throws SAXException
-	{
-	    // need to filter out comments and PIs within the DTD
-	    inDTD = true;
-	}
-	
-	// SAX2 lexical event
-	public void endDTD ()
-	throws SAXException
-	{
-	    inDTD = false;
-	}
-	
-	// SAX2 lexical event
-	public void comment (char ch [], int start, int length)
-	throws SAXException
-	{
-	    Node	comment;
-
-	    // we can't create populated entity ref nodes using
-	    // only public DOM APIs (they've got to be readonly)
-	    if (consumer.isHidingComments ()
-		    || inDTD
-		    || currentEntity != null)
-		return;
-	    comment = document.createComment (new String (ch, start, length));
-	    top.appendChild (comment);
-	}
-
-	/**
-	 * May be overridden by subclasses to return true, indicating
-	 * that entity reference nodes can be populated and then made
-	 * read-only.
-	 */
-	public boolean canPopulateEntityRefs ()
-	    { return false; }
-
-	// SAX2 lexical event
-	public void startEntity (String name)
-	throws SAXException
-	{
-	    // are we ignoring what would be contents of an
-	    // entity ref, since we can't populate it?
-	    if (currentEntity != null)
-		return;
-
-	    // Are we hiding all entity boundaries?
-	    if (consumer.isHidingReferences ())
-		return;
-
-	    // SAX2 shows parameter entities; DOM hides them
-	    if (name.charAt (0) == '%' || "[dtd]".equals (name))
-		return;
-
-	    // Since we can't create a populated entity ref node in any
-	    // standard way, we create an unpopulated one.
-	    EntityReference ref = document.createEntityReference (name);
-	    top.appendChild (ref);
-	    top = ref;
-
-	    // ... allowing subclasses to populate them
-	    if (!canPopulateEntityRefs ())
-		currentEntity = name;
-	}
-
-	// SAX2 lexical event
-	public void endEntity (String name)
-	throws SAXException
-	{
-	    if (name.charAt (0) == '%' || "[dtd]".equals (name))
-		return;
-	    if (name.equals (currentEntity))
-		currentEntity = null;
-	    if (!consumer.isHidingReferences ())
-		top = top.getParentNode ();
-	}
-
-
-	// SAX1 DTD event
-	public void notationDecl (
-	    String name,
-	    String publicId, String SystemId
-	) throws SAXException
-	{
-	    /* IGNORE -- no public DOM API lets us store these
-	     * into the doctype node
-	     */
-	}
-
-	// SAX1 DTD event
-	public void unparsedEntityDecl (
-	    String name,
-	    String publicId, String SystemId,
-	    String notationName
-	) throws SAXException
-	{
-	    /* IGNORE -- no public DOM API lets us store these
-	     * into the doctype node
-	     */
-	}
-
-	// SAX2 declaration event
-	public void elementDecl (String name, String model)
-	throws SAXException
-	{
-	    /* IGNORE -- no content model support in DOM L2 */
-	}
-
-	// SAX2 declaration event
-	public void attributeDecl (
-	    String eName,
-	    String aName,
-	    String type,
-	    String mode,
-	    String value
-	) throws SAXException
-	{
-	    /* IGNORE -- no attribute model support in DOM L2 */
-	}
-
-	// SAX2 declaration event
-	public void internalEntityDecl (String name, String value)
-	throws SAXException
-	{
-	    /* IGNORE -- no public DOM API lets us store these
-	     * into the doctype node
-	     */
-	}
-
-	// SAX2 declaration event
-	public void externalEntityDecl (
-	    String name,
-	    String publicId,
-	    String SystemId
-	) throws SAXException
-	{
-	    /* IGNORE -- no public DOM API lets us store these
-	     * into the doctype node
-	     */
-	}
-
-	//
-	// These really should offer the option of nonfatal handling,
-	// like other validity errors, though that would cause major
-	// chaos in the DOM data structures.  DOM is already spec'd
-	// to treat many of these as fatal, so this is consistent.
-	//
-	private void namespaceError (String description)
-	throws SAXParseException
-	{
-	    SAXParseException err;
-	    
-	    err = new SAXParseException (description, locator);
-	    throw err;
-	}
+        protected DomConsumer           consumer;
+
+        private DOMImplementation       impl;
+        private Document                document;
+        private boolean         isL2;
+
+        private Locator         locator;
+        private Node            top;
+        private boolean         inCDATA;
+        private boolean         mergeCDATA;
+        private boolean         inDTD;
+        private String          currentEntity;
+
+        private boolean         recreatedAttrs;
+        private AttributesImpl  attributes = new AttributesImpl ();
+
+        /**
+         * Subclasses may use SAX2 events to provide additional
+         * behaviors in the resulting DOM.
+         */
+        protected Handler (DomConsumer consumer)
+        throws SAXException
+        {
+            this.consumer = consumer;
+            document = consumer.emptyDocument ();
+            impl = document.getImplementation ();
+            isL2 = impl.hasFeature ("XML", "2.0");
+        }
+
+        private void fatal (String message, Exception x)
+        throws SAXException
+        {
+            SAXParseException   e;
+            ErrorHandler        errHandler = consumer.getErrorHandler ();
+
+            if (locator == null)
+                e = new SAXParseException (message, null, null, -1, -1, x);
+            else
+                e = new SAXParseException (message, locator, x);
+            if (errHandler != null)
+                errHandler.fatalError (e);
+            throw e;
+        }
+
+        /**
+         * Returns and forgets the document produced.  If the handler is
+         * reused, a new document may be created.
+         */
+        Document clearDocument ()
+        {
+            Document retval = document;
+            document = null;
+            locator = null;
+            return retval;
+        }
+
+        /**
+         * Returns the document under construction.
+         */
+        protected Document getDocument ()
+            { return document; }
+
+        /**
+         * Returns the current node being populated.  This is usually
+         * an Element or Document, but it might be an EntityReference
+         * node if some implementation-specific code knows how to put
+         * those into the result tree and later mark them as readonly.
+         */
+        protected Node getTop ()
+            { return top; }
+
+
+        // SAX1
+        public void setDocumentLocator (Locator locator)
+        {
+            this.locator = locator;
+        }
+
+        // SAX1
+        public void startDocument ()
+        throws SAXException
+        {
+            if (document == null)
+                try {
+                    if (isL2) {
+                        // couple to original implementation
+                        document = impl.createDocument (null, "foo", null);
+                        document.removeChild (document.getFirstChild ());
+                    } else {
+                        document = consumer.emptyDocument ();
+                    }
+                } catch (Exception e) {
+                    fatal ("DOM create document", e);
+                }
+            top = document;
+        }
+
+        // SAX1
+        public void endDocument ()
+        throws SAXException
+        {
+            try {
+                if (consumer.getNext () != null && document != null) {
+                    DomParser   parser = new DomParser (document);
+
+                    EventFilter.bind (parser, consumer.getNext ());
+                    parser.parse ("ignored");
+                }
+            } finally {
+                top = null;
+            }
+        }
+
+        // SAX1
+        public void processingInstruction (String target, String data)
+        throws SAXException
+        {
+            // we can't create populated entity ref nodes using
+            // only public DOM APIs (they've got to be readonly)
+            if (currentEntity != null)
+                return;
+
+            ProcessingInstruction       pi;
+
+            if (isL2
+                    // && consumer.isUsingNamespaces ()
+                    && target.indexOf (':') != -1)
+                namespaceError (
+                    "PI target name is namespace nonconformant: "
+                        + target);
+            if (inDTD)
+                return;
+            pi = document.createProcessingInstruction (target, data);
+            top.appendChild (pi);
+        }
+
+        /**
+         * Subclasses may overrride this method to provide a more efficient
+         * way to construct text nodes.
+         * Typically, copying the text into a single character array will
+         * be more efficient than doing that as well as allocating other
+         * needed for a String, including an internal StringBuffer.
+         * Those additional memory and CPU costs can be incurred later,
+         * if ever needed.
+         * Unfortunately the standard DOM factory APIs encourage those costs
+         * to be incurred early.
+         */
+        protected Text createText (
+            boolean     isCDATA,
+            char        ch [],
+            int         start,
+            int         length
+        ) {
+            String      value = new String (ch, start, length);
+
+            if (isCDATA)
+                return document.createCDATASection (value);
+            else
+                return document.createTextNode (value);
+        }
+
+        // SAX1
+        public void characters (char ch [], int start, int length)
+        throws SAXException
+        {
+            // we can't create populated entity ref nodes using
+            // only public DOM APIs (they've got to be readonly
+            // at creation time)
+            if (currentEntity != null)
+                return;
+
+            Node        lastChild = top.getLastChild ();
+
+            // merge consecutive text or CDATA nodes if appropriate.
+            if (lastChild instanceof Text) {
+                if (consumer.isHidingCDATA ()
+                        // consecutive Text content ... always merge
+                        || (!inCDATA
+                            && !(lastChild instanceof CDATASection))
+                        // consecutive CDATASection content ... don't
+                        // merge between sections, only within them
+                        || (inCDATA && mergeCDATA
+                            && lastChild instanceof CDATASection)
+                            ) {
+                    CharacterData       last = (CharacterData) lastChild;
+                    String              value = new String (ch, start, length);
+
+                    last.appendData (value);
+                    return;
+                }
+            }
+            if (inCDATA && !consumer.isHidingCDATA ()) {
+                top.appendChild (createText (true, ch, start, length));
+                mergeCDATA = true;
+            } else
+                top.appendChild (createText (false, ch, start, length));
+        }
+
+        // SAX2
+        public void skippedEntity (String name)
+        throws SAXException
+        {
+            // this callback is useless except to report errors, since
+            // we can't know if the ref was in content, within an
+            // attribute, within a declaration ... only one of those
+            // cases supports more intelligent action than a panic.
+            fatal ("skipped entity: " + name, null);
+        }
+
+        // SAX2
+        public void startPrefixMapping (String prefix, String uri)
+        throws SAXException
+        {
+            // reconstruct "xmlns" attributes deleted by all
+            // SAX2 parsers without "namespace-prefixes" = true
+            if ("".equals (prefix))
+                attributes.addAttribute ("", "", "xmlns",
+                        "CDATA", uri);
+            else
+                attributes.addAttribute ("", "", "xmlns:" + prefix,
+                        "CDATA", uri);
+            recreatedAttrs = true;
+        }
+
+        // SAX2
+        public void endPrefixMapping (String prefix)
+        throws SAXException
+            { }
+
+        // SAX2
+        public void startElement (
+            String uri,
+            String localName,
+            String qName,
+            Attributes atts
+        ) throws SAXException
+        {
+            // we can't create populated entity ref nodes using
+            // only public DOM APIs (they've got to be readonly)
+            if (currentEntity != null)
+                return;
+
+            // parser discarded basic information; DOM tree isn't writable
+            // without massaging to assign prefixes to all nodes.
+            // the "NSFilter" class does that massaging.
+            if (qName.length () == 0)
+                qName = localName;
+
+
+            Element     element;
+            int         length = atts.getLength ();
+
+            if (!isL2) {
+                element = document.createElement (qName);
+
+                // first the explicit attributes ...
+                length = atts.getLength ();
+                for (int i = 0; i < length; i++)
+                    element.setAttribute (atts.getQName (i),
+                                            atts.getValue (i));
+                // ... then any recreated ones (DOM deletes duplicates)
+                if (recreatedAttrs) {
+                    recreatedAttrs = false;
+                    length = attributes.getLength ();
+                    for (int i = 0; i < length; i++)
+                        element.setAttribute (attributes.getQName (i),
+                                                attributes.getValue (i));
+                    attributes.clear ();
+                }
+
+                top.appendChild (element);
+                top = element;
+                return;
+            }
+
+            // For an L2 DOM when namespace use is enabled, use
+            // createElementNS/createAttributeNS except when
+            // (a) it's an element in the default namespace, or
+            // (b) it's an attribute with no prefix
+            String      namespace;
+
+            if (localName.length () != 0)
+                namespace = (uri.length () == 0) ? null : uri;
+            else
+                namespace = getNamespace (getPrefix (qName), atts);
+
+            if (namespace == null)
+                element = document.createElement (qName);
+            else
+                element = document.createElementNS (namespace, qName);
+
+            populateAttributes (element, atts);
+            if (recreatedAttrs) {
+                recreatedAttrs = false;
+                // ... DOM deletes any duplicates
+                populateAttributes (element, attributes);
+                attributes.clear ();
+            }
+
+            top.appendChild (element);
+            top = element;
+        }
+
+        final static String     xmlnsURI = "http://www.w3.org/2000/xmlns/";
+
+        private void populateAttributes (Element element, Attributes attrs)
+        throws SAXParseException
+        {
+            int         length = attrs.getLength ();
+
+            for (int i = 0; i < length; i++) {
+                String  type = attrs.getType (i);
+                String  value = attrs.getValue (i);
+                String  name = attrs.getQName (i);
+                String  local = attrs.getLocalName (i);
+                String  uri = attrs.getURI (i);
+
+                // parser discarded basic information, DOM tree isn't writable
+                if (name.length () == 0)
+                    name = local;
+
+                // all attribute types other than these three may not
+                // contain scoped names... enumerated attributes get
+                // reported as NMTOKEN, except for NOTATION values
+                if (!("CDATA".equals (type)
+                        || "NMTOKEN".equals (type)
+                        || "NMTOKENS".equals (type))) {
+                    if (value.indexOf (':') != -1) {
+                        namespaceError (
+                                "namespace nonconformant attribute value: "
+                                    + "<" + element.getNodeName ()
+                                    + " " + name + "='" + value + "' ...>");
+                    }
+                }
+
+                // xmlns="" is legal (undoes default NS)
+                // xmlns:foo="" is illegal
+                String prefix = getPrefix (name);
+                String namespace;
+
+                if ("xmlns".equals (prefix)) {
+                    if ("".equals (value))
+                        namespaceError ("illegal null namespace decl, " + name);
+                    namespace = xmlnsURI;
+                } else if ("xmlns".equals (name))
+                    namespace = xmlnsURI;
+
+                else if (prefix == null)
+                    namespace = null;
+                else if (!"".equals(uri) && uri.length () != 0)
+                    namespace = uri;
+                else
+                    namespace = getNamespace (prefix, attrs);
+
+                if (namespace == null)
+                    element.setAttribute (name, value);
+                else
+                    element.setAttributeNS (namespace, name, value);
+            }
+        }
+
+        private String getPrefix (String name)
+        {
+            int         temp;
+
+            if ((temp = name.indexOf (':')) > 0)
+                return name.substring (0, temp);
+            return null;
+        }
+
+        // used with SAX1-level parser output
+        private String getNamespace (String prefix, Attributes attrs)
+        throws SAXParseException
+        {
+            String namespace;
+            String decl;
+
+            // defaulting
+            if (prefix == null) {
+                decl = "xmlns";
+                namespace = attrs.getValue (decl);
+                if ("".equals (namespace))
+                    return null;
+                else if (namespace != null)
+                    return namespace;
+
+            // "xmlns" is like a keyword
+            // ... according to the Namespace REC, but DOM L2 CR2+
+            // and Infoset violate that by assigning a namespace.
+            // that conflict is resolved elsewhere.
+            } else if ("xmlns".equals (prefix))
+                return null;
+
+            // "xml" prefix is fixed
+            else if ("xml".equals (prefix))
+                return "http://www.w3.org/XML/1998/namespace";
+
+            // otherwise, expect a declaration
+            else {
+                decl = "xmlns:" + prefix;
+                namespace = attrs.getValue (decl);
+            }
+
+            // if we found a local declaration, great
+            if (namespace != null)
+                return namespace;
+
+
+            // ELSE ... search up the tree we've been building
+            for (Node n = top;
+                    n != null && n.getNodeType () != Node.DOCUMENT_NODE;
+                    n = n.getParentNode ()) {
+                if (n.getNodeType () == Node.ENTITY_REFERENCE_NODE)
+                    continue;
+                Element e = (Element) n;
+                Attr attr = e.getAttributeNode (decl);
+                if (attr != null)
+                    return attr.getNodeValue ();
+            }
+            // see above re "xmlns" as keyword
+            if ("xmlns".equals (decl))
+                return null;
+
+            namespaceError ("Undeclared namespace prefix: " + prefix);
+            return null;
+        }
+
+        // SAX2
+        public void endElement (String uri, String localName, String qName)
+        throws SAXException
+        {
+            // we can't create populated entity ref nodes using
+            // only public DOM APIs (they've got to be readonly)
+            if (currentEntity != null)
+                return;
+
+            top = top.getParentNode ();
+        }
+
+        // SAX1 (mandatory reporting if validating)
+        public void ignorableWhitespace (char ch [], int start, int length)
+        throws SAXException
+        {
+            if (consumer.isHidingWhitespace ())
+                return;
+            characters (ch, start, length);
+        }
+
+        // SAX2 lexical event
+        public void startCDATA ()
+        throws SAXException
+        {
+            inCDATA = true;
+            // true except for the first fragment of a cdata section
+            mergeCDATA = false;
+        }
+
+        // SAX2 lexical event
+        public void endCDATA ()
+        throws SAXException
+        {
+            inCDATA = false;
+        }
+
+        // SAX2 lexical event
+        //
+        // this SAX2 callback merges two unrelated things:
+        //      - Declaration of the root element type ... belongs with
+        //    the other DTD declaration methods, NOT HERE.
+        //      - IDs for the optional external subset ... belongs here
+        //    with other lexical information.
+        //
+        // ...and it doesn't include the internal DTD subset, desired
+        // both to support DOM L2 and to enable "pass through" processing
+        //
+        public void startDTD (String name, String publicId, String SystemId)
+        throws SAXException
+        {
+            // need to filter out comments and PIs within the DTD
+            inDTD = true;
+        }
+
+        // SAX2 lexical event
+        public void endDTD ()
+        throws SAXException
+        {
+            inDTD = false;
+        }
+
+        // SAX2 lexical event
+        public void comment (char ch [], int start, int length)
+        throws SAXException
+        {
+            Node        comment;
+
+            // we can't create populated entity ref nodes using
+            // only public DOM APIs (they've got to be readonly)
+            if (consumer.isHidingComments ()
+                    || inDTD
+                    || currentEntity != null)
+                return;
+            comment = document.createComment (new String (ch, start, length));
+            top.appendChild (comment);
+        }
+
+        /**
+         * May be overridden by subclasses to return true, indicating
+         * that entity reference nodes can be populated and then made
+         * read-only.
+         */
+        public boolean canPopulateEntityRefs ()
+            { return false; }
+
+        // SAX2 lexical event
+        public void startEntity (String name)
+        throws SAXException
+        {
+            // are we ignoring what would be contents of an
+            // entity ref, since we can't populate it?
+            if (currentEntity != null)
+                return;
+
+            // Are we hiding all entity boundaries?
+            if (consumer.isHidingReferences ())
+                return;
+
+            // SAX2 shows parameter entities; DOM hides them
+            if (name.charAt (0) == '%' || "[dtd]".equals (name))
+                return;
+
+            // Since we can't create a populated entity ref node in any
+            // standard way, we create an unpopulated one.
+            EntityReference ref = document.createEntityReference (name);
+            top.appendChild (ref);
+            top = ref;
+
+            // ... allowing subclasses to populate them
+            if (!canPopulateEntityRefs ())
+                currentEntity = name;
+        }
+
+        // SAX2 lexical event
+        public void endEntity (String name)
+        throws SAXException
+        {
+            if (name.charAt (0) == '%' || "[dtd]".equals (name))
+                return;
+            if (name.equals (currentEntity))
+                currentEntity = null;
+            if (!consumer.isHidingReferences ())
+                top = top.getParentNode ();
+        }
+
+
+        // SAX1 DTD event
+        public void notationDecl (
+            String name,
+            String publicId, String SystemId
+        ) throws SAXException
+        {
+            /* IGNORE -- no public DOM API lets us store these
+             * into the doctype node
+             */
+        }
+
+        // SAX1 DTD event
+        public void unparsedEntityDecl (
+            String name,
+            String publicId, String SystemId,
+            String notationName
+        ) throws SAXException
+        {
+            /* IGNORE -- no public DOM API lets us store these
+             * into the doctype node
+             */
+        }
+
+        // SAX2 declaration event
+        public void elementDecl (String name, String model)
+        throws SAXException
+        {
+            /* IGNORE -- no content model support in DOM L2 */
+        }
+
+        // SAX2 declaration event
+        public void attributeDecl (
+            String eName,
+            String aName,
+            String type,
+            String mode,
+            String value
+        ) throws SAXException
+        {
+            /* IGNORE -- no attribute model support in DOM L2 */
+        }
+
+        // SAX2 declaration event
+        public void internalEntityDecl (String name, String value)
+        throws SAXException
+        {
+            /* IGNORE -- no public DOM API lets us store these
+             * into the doctype node
+             */
+        }
+
+        // SAX2 declaration event
+        public void externalEntityDecl (
+            String name,
+            String publicId,
+            String SystemId
+        ) throws SAXException
+        {
+            /* IGNORE -- no public DOM API lets us store these
+             * into the doctype node
+             */
+        }
+
+        //
+        // These really should offer the option of nonfatal handling,
+        // like other validity errors, though that would cause major
+        // chaos in the DOM data structures.  DOM is already spec'd
+        // to treat many of these as fatal, so this is consistent.
+        //
+        private void namespaceError (String description)
+        throws SAXParseException
+        {
+            SAXParseException err;
+
+            err = new SAXParseException (description, locator);
+            throw err;
+        }
     }
 }
diff --git a/libjava/classpath/gnu/xml/pipeline/EventConsumer.java b/libjava/classpath/gnu/xml/pipeline/EventConsumer.java
index 017bc7f74f1..a0a8824f791 100644
--- a/libjava/classpath/gnu/xml/pipeline/EventConsumer.java
+++ b/libjava/classpath/gnu/xml/pipeline/EventConsumer.java
@@ -1,4 +1,4 @@
-/* EventConsumer.java -- 
+/* EventConsumer.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,7 +75,7 @@ public interface EventConsumer
      * @return The value of that property, if it is defined.
      *
      * @exception SAXNotRecognizedException Thrown if the particular
-     *	pipeline stage does not understand the specified identifier.
+     *  pipeline stage does not understand the specified identifier.
      */
     public Object getProperty (String id)
     throws SAXNotRecognizedException;
diff --git a/libjava/classpath/gnu/xml/pipeline/EventFilter.java b/libjava/classpath/gnu/xml/pipeline/EventFilter.java
index af2113f97ce..b3cc2d65417 100644
--- a/libjava/classpath/gnu/xml/pipeline/EventFilter.java
+++ b/libjava/classpath/gnu/xml/pipeline/EventFilter.java
@@ -1,4 +1,4 @@
-/* EventFilter.java -- 
+/* EventFilter.java --
    Copyright (C) 1999,2000,2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -89,35 +89,35 @@ import org.xml.sax.helpers.XMLFilterImpl;
  * {@link org.xml.sax.helpers.XMLFilterImpl XMLFilterImpl} class.
  * Key differences include: 
          
  *
- *	
        •  This fully separates consumer and producer roles:  it
- *	does not implement the producer side XMLReader or
- *	EntityResolver interfaces, so it can only be used
- *	in "push" mode (it has no parse() methods).
+ *      
        •  This fully separates consumer and producer roles:  it
+ *      does not implement the producer side XMLReader or
+ *      EntityResolver interfaces, so it can only be used
+ *      in "push" mode (it has no parse() methods).
  *
- *	
        •  "Extension" handlers are fully supported, enabling a
- *	richer set of application requirements.
- *	And it implements {@link EventConsumer}, which groups related
- *	consumer methods together, rather than leaving them separated.
+ *      
        •  "Extension" handlers are fully supported, enabling a
+ *      richer set of application requirements.
+ *      And it implements {@link EventConsumer}, which groups related
+ *      consumer methods together, rather than leaving them separated.
  *
- *	
        •  The chaining which is visible is "downstream" to the next
- *	consumer, not "upstream" to the preceding producer.
- *	It supports "fan-in", where
- *	a consumer can be fed by several producers.  (For "fan-out",
- *	see the {@link TeeConsumer} class.)
+ *      
        •  The chaining which is visible is "downstream" to the next
+ *      consumer, not "upstream" to the preceding producer.
+ *      It supports "fan-in", where
+ *      a consumer can be fed by several producers.  (For "fan-out",
+ *      see the {@link TeeConsumer} class.)
  *
- *	
        •  Event chaining is set up differently.  It is intended to
- *	work "upstream" from terminus towards producer, during filter
- *	construction, as described above.
- *	This is part of an early binding model:
- *	events don't need to pass through stages which ignore them.
+ *      
        •  Event chaining is set up differently.  It is intended to
+ *      work "upstream" from terminus towards producer, during filter
+ *      construction, as described above.
+ *      This is part of an early binding model:
+ *      events don't need to pass through stages which ignore them.
  *
- *	
        •  ErrorHandler support is separated, on the grounds that
- *	pipeline stages need to share the same error handling policy.
- *	For the same reason, error handler setup goes "downstream":
- *	when error handlers get set, they are passed to subsequent
- *	consumers.
+ *      
        •  ErrorHandler support is separated, on the grounds that
+ *      pipeline stages need to share the same error handling policy.
+ *      For the same reason, error handler setup goes "downstream":
+ *      when error handlers get set, they are passed to subsequent
+ *      consumers.
  *
- *	
        
+ *
* *

The {@link #chainTo chainTo()} convenience routine supports chaining to * an XMLFilterImpl, in its role as a limited functionality event @@ -137,34 +137,34 @@ import org.xml.sax.helpers.XMLFilterImpl; */ public class EventFilter implements EventConsumer, ContentHandler, DTDHandler, - LexicalHandler, DeclHandler + LexicalHandler, DeclHandler { // SAX handlers - private ContentHandler docHandler, docNext; - private DTDHandler dtdHandler, dtdNext; - private LexicalHandler lexHandler, lexNext; - private DeclHandler declHandler, declNext; + private ContentHandler docHandler, docNext; + private DTDHandler dtdHandler, dtdNext; + private LexicalHandler lexHandler, lexNext; + private DeclHandler declHandler, declNext; // and ideally, one more for the stuff SAX2 doesn't show - private Locator locator; - private EventConsumer next; - private ErrorHandler errHandler; + private Locator locator; + private EventConsumer next; + private ErrorHandler errHandler; + - /** SAX2 URI prefix for standard feature flags. */ - public static final String FEATURE_URI - = "http://xml.org/sax/features/"; + public static final String FEATURE_URI + = "http://xml.org/sax/features/"; /** SAX2 URI prefix for standard properties (mostly for handlers). */ - public static final String PROPERTY_URI - = "http://xml.org/sax/properties/"; + public static final String PROPERTY_URI + = "http://xml.org/sax/properties/"; /** SAX2 property identifier for {@link DeclHandler} events */ - public static final String DECL_HANDLER - = PROPERTY_URI + "declaration-handler"; + public static final String DECL_HANDLER + = PROPERTY_URI + "declaration-handler"; /** SAX2 property identifier for {@link LexicalHandler} events */ - public static final String LEXICAL_HANDLER - = PROPERTY_URI + "lexical-handler"; - + public static final String LEXICAL_HANDLER + = PROPERTY_URI + "lexical-handler"; + // // These class objects will be null if the relevant class isn't linked. // Small configurations (pJava and some kinds of embedded systems) need @@ -176,11 +176,11 @@ public class EventFilter // that's associated with "this" class loader. But that wouldn't be true // for classes in another package. // - private static boolean loaded; - private static Class nsClass; - private static Class validClass; - private static Class wfClass; - private static Class xincClass; + private static boolean loaded; + private static Class nsClass; + private static Class validClass; + private static Class wfClass; + private static Class xincClass; static ClassLoader getClassLoader () { @@ -206,25 +206,25 @@ public class EventFilter static Class loadClass (ClassLoader classLoader, String className) { - try { - if (classLoader == null) - return Class.forName(className); - else - return classLoader.loadClass(className); - } catch (Exception e) { - return null; - } + try { + if (classLoader == null) + return Class.forName(className); + else + return classLoader.loadClass(className); + } catch (Exception e) { + return null; + } } static private void loadClasses () { - ClassLoader loader = getClassLoader (); + ClassLoader loader = getClassLoader (); - nsClass = loadClass (loader, "gnu.xml.pipeline.NSFilter"); - validClass = loadClass (loader, "gnu.xml.pipeline.ValidationConsumer"); - wfClass = loadClass (loader, "gnu.xml.pipeline.WellFormednessFilter"); - xincClass = loadClass (loader, "gnu.xml.pipeline.XIncludeFilter"); - loaded = true; + nsClass = loadClass (loader, "gnu.xml.pipeline.NSFilter"); + validClass = loadClass (loader, "gnu.xml.pipeline.ValidationConsumer"); + wfClass = loadClass (loader, "gnu.xml.pipeline.WellFormednessFilter"); + xincClass = loadClass (loader, "gnu.xml.pipeline.XIncludeFilter"); + loaded = true; } @@ -246,146 +246,146 @@ public class EventFilter * of the XMLReader implementation in use; for example, it permits * validating output of a {@link gnu.xml.util.DomParser}.

    * - *
  • {@link NSFilter} will be removed if the producer can be - * told not to discard namespace data, using the "namespace-prefixes" - * feature flag. + *
  • {@link NSFilter} will be removed if the producer can be + * told not to discard namespace data, using the "namespace-prefixes" + * feature flag. * - *
  • {@link ValidationConsumer} will be removed if the producer - * can be told to validate, using the "validation" feature flag. + *
  • {@link ValidationConsumer} will be removed if the producer + * can be told to validate, using the "validation" feature flag. * - *
  • {@link WellFormednessFilter} is always removed, on the - * grounds that no XMLReader is permitted to producee malformed - * event streams and this would just be processing overhead. + *
  • {@link WellFormednessFilter} is always removed, on the + * grounds that no XMLReader is permitted to producee malformed + * event streams and this would just be processing overhead. * - *
  • {@link XIncludeFilter} stops the special handling, except - * that it's told about the "namespace-prefixes" feature of the - * event producer so that the event stream is internally consistent. + *
  • {@link XIncludeFilter} stops the special handling, except + * that it's told about the "namespace-prefixes" feature of the + * event producer so that the event stream is internally consistent. * - *
  • The first consumer which is not one of those classes stops - * such special handling. This means that if you want to force - * one of those filters to be used, you could just precede it with - * an instance of {@link EventFilter} configured as a pass-through. - * You might need to do that if you are using an {@link NSFilter} - * subclass to fix names found in attributes or character data. + *
  • The first consumer which is not one of those classes stops + * such special handling. This means that if you want to force + * one of those filters to be used, you could just precede it with + * an instance of {@link EventFilter} configured as a pass-through. + * You might need to do that if you are using an {@link NSFilter} + * subclass to fix names found in attributes or character data. * - *
+ * * *

Other than that, this method works with any kind of event consumer, * not just event filters. Note that in all cases, the standard handlers * are assigned; any previous handler assignments for the handler will * be overridden. * - * @param producer will deliver events to the specified consumer + * @param producer will deliver events to the specified consumer * @param consumer pipeline supplying event handlers to be associated - * with the producer (may not be null) + * with the producer (may not be null) */ public static void bind (XMLReader producer, EventConsumer consumer) { - Class klass = null; - boolean prefixes; + Class klass = null; + boolean prefixes; - if (!loaded) - loadClasses (); + if (!loaded) + loadClasses (); - // DOM building, printing, layered validation, and other - // things don't work well when prefix info is discarded. - // Include it by default, whenever possible. - try { - producer.setFeature (FEATURE_URI + "namespace-prefixes", - true); - prefixes = true; - } catch (SAXException e) { - prefixes = false; - } + // DOM building, printing, layered validation, and other + // things don't work well when prefix info is discarded. + // Include it by default, whenever possible. + try { + producer.setFeature (FEATURE_URI + "namespace-prefixes", + true); + prefixes = true; + } catch (SAXException e) { + prefixes = false; + } - // NOTE: This loop doesn't use "instanceof", since that - // would prevent compiling/linking without those classes - // being present. - while (consumer != null) { - klass = consumer.getClass (); + // NOTE: This loop doesn't use "instanceof", since that + // would prevent compiling/linking without those classes + // being present. + while (consumer != null) { + klass = consumer.getClass (); - // we might have already changed this problematic SAX2 default. - if (nsClass != null && nsClass.isAssignableFrom (klass)) { - if (!prefixes) - break; - consumer = ((EventFilter)consumer).getNext (); + // we might have already changed this problematic SAX2 default. + if (nsClass != null && nsClass.isAssignableFrom (klass)) { + if (!prefixes) + break; + consumer = ((EventFilter)consumer).getNext (); - // the parser _might_ do DTD validation by default ... - // if not, maybe we can change this setting. - } else if (validClass != null - && validClass.isAssignableFrom (klass)) { - try { - producer.setFeature (FEATURE_URI + "validation", - true); - consumer = ((ValidationConsumer)consumer).getNext (); - } catch (SAXException e) { - break; - } + // the parser _might_ do DTD validation by default ... + // if not, maybe we can change this setting. + } else if (validClass != null + && validClass.isAssignableFrom (klass)) { + try { + producer.setFeature (FEATURE_URI + "validation", + true); + consumer = ((ValidationConsumer)consumer).getNext (); + } catch (SAXException e) { + break; + } - // parsers are required not to have such bugs - } else if (wfClass != null && wfClass.isAssignableFrom (klass)) { - consumer = ((WellFormednessFilter)consumer).getNext (); + // parsers are required not to have such bugs + } else if (wfClass != null && wfClass.isAssignableFrom (klass)) { + consumer = ((WellFormednessFilter)consumer).getNext (); - // stop on the first pipeline stage we can't remove - } else - break; - - if (consumer == null) - klass = null; - } + // stop on the first pipeline stage we can't remove + } else + break; - // the actual setting here doesn't matter as much - // as that producer and consumer agree - if (xincClass != null && klass != null - && xincClass.isAssignableFrom (klass)) - ((XIncludeFilter)consumer).setSavingPrefixes (prefixes); + if (consumer == null) + klass = null; + } - // Some SAX parsers can't handle null handlers -- bleech - DefaultHandler2 h = new DefaultHandler2 (); + // the actual setting here doesn't matter as much + // as that producer and consumer agree + if (xincClass != null && klass != null + && xincClass.isAssignableFrom (klass)) + ((XIncludeFilter)consumer).setSavingPrefixes (prefixes); - if (consumer != null && consumer.getContentHandler () != null) - producer.setContentHandler (consumer.getContentHandler ()); - else - producer.setContentHandler (h); - if (consumer != null && consumer.getDTDHandler () != null) - producer.setDTDHandler (consumer.getDTDHandler ()); - else - producer.setDTDHandler (h); + // Some SAX parsers can't handle null handlers -- bleech + DefaultHandler2 h = new DefaultHandler2 (); - try { - Object dh; - - if (consumer != null) - dh = consumer.getProperty (DECL_HANDLER); - else - dh = null; - if (dh == null) - dh = h; - producer.setProperty (DECL_HANDLER, dh); - } catch (Exception e) { /* ignore */ } - try { - Object lh; - - if (consumer != null) - lh = consumer.getProperty (LEXICAL_HANDLER); - else - lh = null; - if (lh == null) - lh = h; - producer.setProperty (LEXICAL_HANDLER, lh); - } catch (Exception e) { /* ignore */ } + if (consumer != null && consumer.getContentHandler () != null) + producer.setContentHandler (consumer.getContentHandler ()); + else + producer.setContentHandler (h); + if (consumer != null && consumer.getDTDHandler () != null) + producer.setDTDHandler (consumer.getDTDHandler ()); + else + producer.setDTDHandler (h); - // this binding goes the other way around - if (producer.getErrorHandler () == null) - producer.setErrorHandler (h); - if (consumer != null) - consumer.setErrorHandler (producer.getErrorHandler ()); + try { + Object dh; + + if (consumer != null) + dh = consumer.getProperty (DECL_HANDLER); + else + dh = null; + if (dh == null) + dh = h; + producer.setProperty (DECL_HANDLER, dh); + } catch (Exception e) { /* ignore */ } + try { + Object lh; + + if (consumer != null) + lh = consumer.getProperty (LEXICAL_HANDLER); + else + lh = null; + if (lh == null) + lh = h; + producer.setProperty (LEXICAL_HANDLER, lh); + } catch (Exception e) { /* ignore */ } + + // this binding goes the other way around + if (producer.getErrorHandler () == null) + producer.setErrorHandler (h); + if (consumer != null) + consumer.setErrorHandler (producer.getErrorHandler ()); } - + /** * Initializes all handlers to null. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public EventFilter () { } @@ -394,30 +394,30 @@ public class EventFilter * the specified consumer, making it easy to pass events through. * If the consumer is null, all handlers are initialzed to null. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public EventFilter (EventConsumer consumer) { - if (consumer == null) - return; + if (consumer == null) + return; - next = consumer; + next = consumer; - // We delegate through the "xxNext" handlers, and - // report the "xxHandler" ones on our input side. + // We delegate through the "xxNext" handlers, and + // report the "xxHandler" ones on our input side. - // Normally a subclass would both override handler - // methods and register itself as the "xxHandler". + // Normally a subclass would both override handler + // methods and register itself as the "xxHandler". - docHandler = docNext = consumer.getContentHandler (); - dtdHandler = dtdNext = consumer.getDTDHandler (); - try { - declHandler = declNext = (DeclHandler) - consumer.getProperty (DECL_HANDLER); - } catch (SAXException e) { /* leave value null */ } - try { - lexHandler = lexNext = (LexicalHandler) - consumer.getProperty (LEXICAL_HANDLER); - } catch (SAXException e) { /* leave value null */ } + docHandler = docNext = consumer.getContentHandler (); + dtdHandler = dtdNext = consumer.getDTDHandler (); + try { + declHandler = declNext = (DeclHandler) + consumer.getProperty (DECL_HANDLER); + } catch (SAXException e) { /* leave value null */ } + try { + lexHandler = lexNext = (LexicalHandler) + consumer.getProperty (LEXICAL_HANDLER); + } catch (SAXException e) { /* leave value null */ } } /** @@ -442,33 +442,33 @@ public class EventFilter * * @param next the next downstream component of the pipeline. * @exception IllegalStateException if the "next" consumer has - * already been set through the constructor. + * already been set through the constructor. */ public void chainTo (XMLFilterImpl next) { - if (this.next != null) - throw new IllegalStateException (); + if (this.next != null) + throw new IllegalStateException (); - docNext = next.getContentHandler (); - if (docHandler == null) - docHandler = docNext; - dtdNext = next.getDTDHandler (); - if (dtdHandler == null) - dtdHandler = dtdNext; + docNext = next.getContentHandler (); + if (docHandler == null) + docHandler = docNext; + dtdNext = next.getDTDHandler (); + if (dtdHandler == null) + dtdHandler = dtdNext; - try { - declNext = (DeclHandler) next.getProperty (DECL_HANDLER); - if (declHandler == null) - declHandler = declNext; - } catch (SAXException e) { /* leave value null */ } - try { - lexNext = (LexicalHandler) next.getProperty (LEXICAL_HANDLER); - if (lexHandler == null) - lexHandler = lexNext; - } catch (SAXException e) { /* leave value null */ } + try { + declNext = (DeclHandler) next.getProperty (DECL_HANDLER); + if (declHandler == null) + declHandler = declNext; + } catch (SAXException e) { /* leave value null */ } + try { + lexNext = (LexicalHandler) next.getProperty (LEXICAL_HANDLER); + if (lexHandler == null) + lexHandler = lexNext; + } catch (SAXException e) { /* leave value null */ } - if (errHandler != null) - next.setErrorHandler (errHandler); + if (errHandler != null) + next.setErrorHandler (errHandler); } /** @@ -477,9 +477,9 @@ public class EventFilter */ final public void setErrorHandler (ErrorHandler handler) { - errHandler = handler; - if (next != null) - next.setErrorHandler (handler); + errHandler = handler; + if (next != null) + next.setErrorHandler (handler); } /** @@ -488,7 +488,7 @@ public class EventFilter */ final public ErrorHandler getErrorHandler () { - return errHandler; + return errHandler; } @@ -497,7 +497,7 @@ public class EventFilter * is no such handler. */ final public EventConsumer getNext () - { return next; } + { return next; } /** @@ -508,13 +508,13 @@ public class EventFilter */ final public void setContentHandler (ContentHandler h) { - docHandler = h; + docHandler = h; } /** Returns the content handler being used. */ final public ContentHandler getContentHandler () { - return docHandler; + return docHandler; } /** @@ -524,12 +524,12 @@ public class EventFilter * probably pointed to the next consumer by the base class constructor. */ final public void setDTDHandler (DTDHandler h) - { dtdHandler = h; } + { dtdHandler = h; } /** Returns the dtd handler being used. */ final public DTDHandler getDTDHandler () { - return dtdHandler; + return dtdHandler; } /** @@ -541,36 +541,36 @@ public class EventFilter final public void setProperty (String id, Object o) throws SAXNotRecognizedException, SAXNotSupportedException { - try { - Object value = getProperty (id); + try { + Object value = getProperty (id); - if (value == o) - return; - if (DECL_HANDLER.equals (id)) { - declHandler = (DeclHandler) o; - return; - } - if (LEXICAL_HANDLER.equals (id)) { - lexHandler = (LexicalHandler) o; - return; - } - throw new SAXNotSupportedException (id); + if (value == o) + return; + if (DECL_HANDLER.equals (id)) { + declHandler = (DeclHandler) o; + return; + } + if (LEXICAL_HANDLER.equals (id)) { + lexHandler = (LexicalHandler) o; + return; + } + throw new SAXNotSupportedException (id); - } catch (ClassCastException e) { - throw new SAXNotSupportedException (id); - } + } catch (ClassCastException e) { + throw new SAXNotSupportedException (id); + } } /** Retrieves a property of unknown intent (usually a handler) */ final public Object getProperty (String id) throws SAXNotRecognizedException { - if (DECL_HANDLER.equals (id)) - return declHandler; - if (LEXICAL_HANDLER.equals (id)) - return lexHandler; + if (DECL_HANDLER.equals (id)) + return declHandler; + if (LEXICAL_HANDLER.equals (id)) + return lexHandler; - throw new SAXNotRecognizedException (id); + throw new SAXNotRecognizedException (id); } /** @@ -578,7 +578,7 @@ public class EventFilter * (or a subclass) is handling {@link ContentHandler } events. */ public Locator getDocumentLocator () - { return locator; } + { return locator; } // CONTENT HANDLER DELEGATIONS @@ -586,113 +586,113 @@ public class EventFilter /** SAX2: passes this callback to the next consumer, if any */ public void setDocumentLocator (Locator locator) { - this.locator = locator; - if (docNext != null) - docNext.setDocumentLocator (locator); + this.locator = locator; + if (docNext != null) + docNext.setDocumentLocator (locator); } /** SAX2: passes this callback to the next consumer, if any */ public void startDocument () throws SAXException { - if (docNext != null) - docNext.startDocument (); + if (docNext != null) + docNext.startDocument (); } /** SAX2: passes this callback to the next consumer, if any */ public void skippedEntity (String name) throws SAXException { - if (docNext != null) - docNext.skippedEntity (name); + if (docNext != null) + docNext.skippedEntity (name); } /** SAX2: passes this callback to the next consumer, if any */ public void processingInstruction (String target, String data) throws SAXException { - if (docNext != null) - docNext.processingInstruction (target, data); + if (docNext != null) + docNext.processingInstruction (target, data); } /** SAX2: passes this callback to the next consumer, if any */ public void characters (char ch [], int start, int length) throws SAXException { - if (docNext != null) - docNext.characters (ch, start, length); + if (docNext != null) + docNext.characters (ch, start, length); } /** SAX2: passes this callback to the next consumer, if any */ public void ignorableWhitespace (char ch [], int start, int length) throws SAXException { - if (docNext != null) - docNext.ignorableWhitespace (ch, start, length); + if (docNext != null) + docNext.ignorableWhitespace (ch, start, length); } /** SAX2: passes this callback to the next consumer, if any */ public void startPrefixMapping (String prefix, String uri) throws SAXException { - if (docNext != null) - docNext.startPrefixMapping (prefix, uri); + if (docNext != null) + docNext.startPrefixMapping (prefix, uri); } /** SAX2: passes this callback to the next consumer, if any */ public void startElement ( - String uri, String localName, - String qName, Attributes atts + String uri, String localName, + String qName, Attributes atts ) throws SAXException { - if (docNext != null) - docNext.startElement (uri, localName, qName, atts); + if (docNext != null) + docNext.startElement (uri, localName, qName, atts); } /** SAX2: passes this callback to the next consumer, if any */ public void endElement (String uri, String localName, String qName) throws SAXException { - if (docNext != null) - docNext.endElement (uri, localName, qName); + if (docNext != null) + docNext.endElement (uri, localName, qName); } /** SAX2: passes this callback to the next consumer, if any */ public void endPrefixMapping (String prefix) throws SAXException { - if (docNext != null) - docNext.endPrefixMapping (prefix); + if (docNext != null) + docNext.endPrefixMapping (prefix); } /** SAX2: passes this callback to the next consumer, if any */ public void endDocument () throws SAXException { - if (docNext != null) - docNext.endDocument (); - locator = null; + if (docNext != null) + docNext.endDocument (); + locator = null; } // DTD HANDLER DELEGATIONS - + /** SAX1: passes this callback to the next consumer, if any */ public void unparsedEntityDecl ( - String name, - String publicId, - String systemId, - String notationName + String name, + String publicId, + String systemId, + String notationName ) throws SAXException { - if (dtdNext != null) - dtdNext.unparsedEntityDecl (name, publicId, systemId, notationName); + if (dtdNext != null) + dtdNext.unparsedEntityDecl (name, publicId, systemId, notationName); } - + /** SAX1: passes this callback to the next consumer, if any */ public void notationDecl (String name, String publicId, String systemId) throws SAXException { - if (dtdNext != null) - dtdNext.notationDecl (name, publicId, systemId); + if (dtdNext != null) + dtdNext.notationDecl (name, publicId, systemId); } - + // LEXICAL HANDLER DELEGATIONS @@ -700,40 +700,40 @@ public class EventFilter public void startDTD (String name, String publicId, String systemId) throws SAXException { - if (lexNext != null) - lexNext.startDTD (name, publicId, systemId); + if (lexNext != null) + lexNext.startDTD (name, publicId, systemId); } /** SAX2: passes this callback to the next consumer, if any */ public void endDTD () throws SAXException { - if (lexNext != null) - lexNext.endDTD (); + if (lexNext != null) + lexNext.endDTD (); } /** SAX2: passes this callback to the next consumer, if any */ public void comment (char ch [], int start, int length) throws SAXException { - if (lexNext != null) - lexNext.comment (ch, start, length); + if (lexNext != null) + lexNext.comment (ch, start, length); } /** SAX2: passes this callback to the next consumer, if any */ public void startCDATA () throws SAXException { - if (lexNext != null) - lexNext.startCDATA (); + if (lexNext != null) + lexNext.startCDATA (); } /** SAX2: passes this callback to the next consumer, if any */ public void endCDATA () throws SAXException { - if (lexNext != null) - lexNext.endCDATA (); + if (lexNext != null) + lexNext.endCDATA (); } /** @@ -742,8 +742,8 @@ public class EventFilter public void startEntity (String name) throws SAXException { - if (lexNext != null) - lexNext.startEntity (name); + if (lexNext != null) + lexNext.startEntity (name); } /** @@ -752,10 +752,10 @@ public class EventFilter public void endEntity (String name) throws SAXException { - if (lexNext != null) - lexNext.endEntity (name); + if (lexNext != null) + lexNext.endEntity (name); } - + // DECLARATION HANDLER DELEGATIONS @@ -764,33 +764,33 @@ public class EventFilter public void elementDecl (String name, String model) throws SAXException { - if (declNext != null) - declNext.elementDecl (name, model); + if (declNext != null) + declNext.elementDecl (name, model); } /** SAX2: passes this callback to the next consumer, if any */ public void attributeDecl (String eName, String aName, - String type, String mode, String value) + String type, String mode, String value) throws SAXException { - if (declNext != null) - declNext.attributeDecl (eName, aName, type, mode, value); + if (declNext != null) + declNext.attributeDecl (eName, aName, type, mode, value); } /** SAX2: passes this callback to the next consumer, if any */ public void externalEntityDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException { - if (declNext != null) - declNext.externalEntityDecl (name, publicId, systemId); + if (declNext != null) + declNext.externalEntityDecl (name, publicId, systemId); } /** SAX2: passes this callback to the next consumer, if any */ public void internalEntityDecl (String name, String value) throws SAXException { - if (declNext != null) - declNext.internalEntityDecl (name, value); + if (declNext != null) + declNext.internalEntityDecl (name, value); } } diff --git a/libjava/classpath/gnu/xml/pipeline/LinkFilter.java b/libjava/classpath/gnu/xml/pipeline/LinkFilter.java index ddb9fda2e75..e11a5eca637 100644 --- a/libjava/classpath/gnu/xml/pipeline/LinkFilter.java +++ b/libjava/classpath/gnu/xml/pipeline/LinkFilter.java @@ -1,4 +1,4 @@ -/* LinkFilter.java -- +/* LinkFilter.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,7 +38,7 @@ exception statement from your version. */ package gnu.xml.pipeline; import java.io.IOException; -import java.net.URL; +import java.net.URL; import java.util.Enumeration; import java.util.Vector; @@ -65,21 +65,21 @@ import org.xml.sax.SAXException; public class LinkFilter extends EventFilter { // for storing URIs - private Vector vector = new Vector (); + private Vector vector = new Vector (); - // struct for "full" link record (tbd) - // these for troubleshooting original source: - // original uri - // uri as resolved (base, relative, etc) - // URI of originating doc - // line # - // original element + attrs (img src, desc, etc) + // struct for "full" link record (tbd) + // these for troubleshooting original source: + // original uri + // uri as resolved (base, relative, etc) + // URI of originating doc + // line # + // original element + attrs (img src, desc, etc) - // XLink model of the link ... for inter-site pairups ? + // XLink model of the link ... for inter-site pairups ? - private String baseURI; + private String baseURI; - private boolean siteRestricted = false; + private boolean siteRestricted = false; // // XXX leverage blacklist info (like robots.txt) @@ -93,10 +93,10 @@ public class LinkFilter extends EventFilter * Constructs a new event filter, which collects links in private data * structure for later enumeration. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public LinkFilter () { - super.setContentHandler (this); + super.setContentHandler (this); } @@ -105,11 +105,11 @@ public class LinkFilter extends EventFilter * structure for later enumeration and passes all events, unmodified, * to the next consumer. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public LinkFilter (EventConsumer next) { - super (next); - super.setContentHandler (this); + super (next); + super.setContentHandler (this); } @@ -121,7 +121,7 @@ public class LinkFilter extends EventFilter */ public Enumeration getLinks () { - return vector.elements (); + return vector.elements (); } /** @@ -130,7 +130,7 @@ public class LinkFilter extends EventFilter */ public void removeAllLinks () { - vector = new Vector (); + vector = new Vector (); } @@ -138,84 +138,84 @@ public class LinkFilter extends EventFilter * Collects URIs for (X)HTML content from elements which hold them. */ public void startElement ( - String uri, - String localName, - String qName, - Attributes atts + String uri, + String localName, + String qName, + Attributes atts ) throws SAXException { - String link; + String link; - // Recognize XHTML links. - if ("http://www.w3.org/1999/xhtml".equals (uri)) { + // Recognize XHTML links. + if ("http://www.w3.org/1999/xhtml".equals (uri)) { - if ("a".equals (localName) || "base".equals (localName) - || "area".equals (localName)) - link = atts.getValue ("href"); - else if ("iframe".equals (localName) || "frame".equals (localName)) - link = atts.getValue ("src"); - else if ("blockquote".equals (localName) || "q".equals (localName) - || "ins".equals (localName) || "del".equals (localName)) - link = atts.getValue ("cite"); - else - link = null; - link = maybeAddLink (link); + if ("a".equals (localName) || "base".equals (localName) + || "area".equals (localName)) + link = atts.getValue ("href"); + else if ("iframe".equals (localName) || "frame".equals (localName)) + link = atts.getValue ("src"); + else if ("blockquote".equals (localName) || "q".equals (localName) + || "ins".equals (localName) || "del".equals (localName)) + link = atts.getValue ("cite"); + else + link = null; + link = maybeAddLink (link); - // "base" modifies designated baseURI - if ("base".equals (localName) && link != null) - baseURI = link; + // "base" modifies designated baseURI + if ("base".equals (localName) && link != null) + baseURI = link; - if ("iframe".equals (localName) || "img".equals (localName)) - maybeAddLink (atts.getValue ("longdesc")); - } - - super.startElement (uri, localName, qName, atts); + if ("iframe".equals (localName) || "img".equals (localName)) + maybeAddLink (atts.getValue ("longdesc")); + } + + super.startElement (uri, localName, qName, atts); } private String maybeAddLink (String link) { - int index; + int index; - // ignore empty links and fragments inside docs - if (link == null) - return null; - if ((index = link.indexOf ("#")) >= 0) - link = link.substring (0, index); - if (link.equals ("")) - return null; + // ignore empty links and fragments inside docs + if (link == null) + return null; + if ((index = link.indexOf ("#")) >= 0) + link = link.substring (0, index); + if (link.equals ("")) + return null; - try { - // get the real URI - URL base = new URL ((baseURI != null) - ? baseURI - : getDocumentLocator ().getSystemId ()); - URL url = new URL (base, link); + try { + // get the real URI + URL base = new URL ((baseURI != null) + ? baseURI + : getDocumentLocator ().getSystemId ()); + URL url = new URL (base, link); - link = url.toString (); + link = url.toString (); - // ignore duplicates - if (vector.contains (link)) - return link; + // ignore duplicates + if (vector.contains (link)) + return link; - // other than what "base" does, stick to original site: - if (siteRestricted) { - // don't switch protocols - if (!base.getProtocol ().equals (url.getProtocol ())) - return link; - // don't switch servers - if (base.getHost () != null - && !base.getHost ().equals (url.getHost ())) - return link; - } + // other than what "base" does, stick to original site: + if (siteRestricted) { + // don't switch protocols + if (!base.getProtocol ().equals (url.getProtocol ())) + return link; + // don't switch servers + if (base.getHost () != null + && !base.getHost ().equals (url.getHost ())) + return link; + } - vector.addElement (link); + vector.addElement (link); - return link; - - } catch (IOException e) { - // bad URLs we don't want - } - return null; + return link; + + } catch (IOException e) { + // bad URLs we don't want + } + return null; } /** @@ -224,8 +224,8 @@ public class LinkFilter extends EventFilter public void startDocument () throws SAXException { - if (getDocumentLocator () == null) - throw new SAXException ("no Locator!"); + if (getDocumentLocator () == null) + throw new SAXException ("no Locator!"); } /** @@ -236,7 +236,7 @@ public class LinkFilter extends EventFilter public void endDocument () throws SAXException { - baseURI = null; - super.endDocument (); + baseURI = null; + super.endDocument (); } } diff --git a/libjava/classpath/gnu/xml/pipeline/NSFilter.java b/libjava/classpath/gnu/xml/pipeline/NSFilter.java index db875e1debf..0fa4621d339 100644 --- a/libjava/classpath/gnu/xml/pipeline/NSFilter.java +++ b/libjava/classpath/gnu/xml/pipeline/NSFilter.java @@ -1,4 +1,4 @@ -/* NSFilter.java -- +/* NSFilter.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,23 +56,23 @@ import org.xml.sax.helpers.NamespaceSupport; * information using XML. There are various common ways that such data * gets discarded:

    * - *
  • By default, SAX2 parsers must discard the "xmlns*" - * attributes, and may also choose not to report properly prefixed - * names for elements or attributes. (Some parsers may support - * changing the namespace-prefixes value from the default - * to true, effectively eliminating the need to use this - * filter on their output.) + *
  • By default, SAX2 parsers must discard the "xmlns*" + * attributes, and may also choose not to report properly prefixed + * names for elements or attributes. (Some parsers may support + * changing the namespace-prefixes value from the default + * to true, effectively eliminating the need to use this + * filter on their output.) * - *
  • When event streams are generated from a DOM tree, they may - * have never have had prefixes or declarations for namespaces; or - * the existing prefixes or declarations may have been invalidated - * by structural modifications to that DOM tree. + *
  • When event streams are generated from a DOM tree, they may + * have never have had prefixes or declarations for namespaces; or + * the existing prefixes or declarations may have been invalidated + * by structural modifications to that DOM tree. * - *
  • Other software writing SAX event streams won't necessarily - * be worrying about prefix management, and so they will need to - * have a transparent solution for managing them. + *
  • Other software writing SAX event streams won't necessarily + * be worrying about prefix management, and so they will need to + * have a transparent solution for managing them. * - *
+ * * *

This filter uses a heuristic to choose the prefix to assign to any * particular name which wasn't already corectly prefixed. The associated @@ -91,55 +91,55 @@ import org.xml.sax.helpers.NamespaceSupport; */ public class NSFilter extends EventFilter { - private NamespaceSupport nsStack = new NamespaceSupport (); - private Stack elementStack = new Stack (); + private NamespaceSupport nsStack = new NamespaceSupport (); + private Stack elementStack = new Stack (); - private boolean pushedContext; - private String nsTemp [] = new String [3]; - private AttributesImpl attributes = new AttributesImpl (); - private boolean usedDefault; + private boolean pushedContext; + private String nsTemp [] = new String [3]; + private AttributesImpl attributes = new AttributesImpl (); + private boolean usedDefault; // gensymmed prefixes use this root name - private static final String prefixRoot = "prefix-"; + private static final String prefixRoot = "prefix-"; + - /** * Passes events through to the specified consumer, after first * processing them. * * @param next the next event consumer to receive events. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public NSFilter (EventConsumer next) { - super (next); + super (next); - setContentHandler (this); + setContentHandler (this); } private void fatalError (String message) throws SAXException { - SAXParseException e; - ErrorHandler handler = getErrorHandler (); - Locator locator = getDocumentLocator (); + SAXParseException e; + ErrorHandler handler = getErrorHandler (); + Locator locator = getDocumentLocator (); - if (locator == null) - e = new SAXParseException (message, null, null, -1, -1); - else - e = new SAXParseException (message, locator); - if (handler != null) - handler.fatalError (e); - throw e; + if (locator == null) + e = new SAXParseException (message, null, null, -1, -1); + else + e = new SAXParseException (message, locator); + if (handler != null) + handler.fatalError (e); + throw e; } public void startDocument () throws SAXException { - elementStack.removeAllElements (); - nsStack.reset (); - pushedContext = false; - super.startDocument (); + elementStack.removeAllElements (); + nsStack.reset (); + pushedContext = false; + super.startDocument (); } /** @@ -151,176 +151,176 @@ public class NSFilter extends EventFilter public void startPrefixMapping (String prefix, String uri) throws SAXException { - if (pushedContext == false) { - nsStack.pushContext (); - pushedContext = true; - } + if (pushedContext == false) { + nsStack.pushContext (); + pushedContext = true; + } - // this check is awkward, but the paranoia prevents big trouble - for (Enumeration e = nsStack.getDeclaredPrefixes (); - e.hasMoreElements (); - /* NOP */ ) { - String declared = (String) e.nextElement (); + // this check is awkward, but the paranoia prevents big trouble + for (Enumeration e = nsStack.getDeclaredPrefixes (); + e.hasMoreElements (); + /* NOP */ ) { + String declared = (String) e.nextElement (); - if (!declared.equals (prefix)) - continue; - if (uri.equals (nsStack.getURI (prefix))) - return; - fatalError ("inconsistent binding for prefix '" + prefix - + "' ... " + uri + " (was " + nsStack.getURI (prefix) + ")"); - } + if (!declared.equals (prefix)) + continue; + if (uri.equals (nsStack.getURI (prefix))) + return; + fatalError ("inconsistent binding for prefix '" + prefix + + "' ... " + uri + " (was " + nsStack.getURI (prefix) + ")"); + } - if (!nsStack.declarePrefix (prefix, uri)) - fatalError ("illegal prefix declared: " + prefix); + if (!nsStack.declarePrefix (prefix, uri)) + fatalError ("illegal prefix declared: " + prefix); } private String fixName (String ns, String l, String name, boolean isAttr) throws SAXException { - if ("".equals (name) || name == null) { - name = l; - if ("".equals (name) || name == null) - fatalError ("empty/null name"); - } + if ("".equals (name) || name == null) { + name = l; + if ("".equals (name) || name == null) + fatalError ("empty/null name"); + } - // can we correctly process the name as-is? - // handles "element scope" attribute names here. - if (nsStack.processName (name, nsTemp, isAttr) != null - && nsTemp [0].equals (ns) - ) { - return nsTemp [2]; - } + // can we correctly process the name as-is? + // handles "element scope" attribute names here. + if (nsStack.processName (name, nsTemp, isAttr) != null + && nsTemp [0].equals (ns) + ) { + return nsTemp [2]; + } - // nope, gotta modify the name or declare a default mapping - int temp; + // nope, gotta modify the name or declare a default mapping + int temp; - // get rid of any current prefix - if ((temp = name.indexOf (':')) >= 0) { - name = name.substring (temp + 1); + // get rid of any current prefix + if ((temp = name.indexOf (':')) >= 0) { + name = name.substring (temp + 1); - // ... maybe that's enough (use/prefer default namespace) ... - if (!isAttr && nsStack.processName (name, nsTemp, false) != null - && nsTemp [0].equals (ns) - ) { - return nsTemp [2]; - } - } + // ... maybe that's enough (use/prefer default namespace) ... + if (!isAttr && nsStack.processName (name, nsTemp, false) != null + && nsTemp [0].equals (ns) + ) { + return nsTemp [2]; + } + } - // must we define and use the default/undefined prefix? - if ("".equals (ns)) { - if (isAttr) - fatalError ("processName bug"); - if (attributes.getIndex ("xmlns") != -1) - fatalError ("need to undefine default NS, but it's bound: " - + attributes.getValue ("xmlns")); - - nsStack.declarePrefix ("", ""); - attributes.addAttribute ("", "", "xmlns", "CDATA", ""); - return name; - } + // must we define and use the default/undefined prefix? + if ("".equals (ns)) { + if (isAttr) + fatalError ("processName bug"); + if (attributes.getIndex ("xmlns") != -1) + fatalError ("need to undefine default NS, but it's bound: " + + attributes.getValue ("xmlns")); - // is there at least one non-null prefix we can use? - for (Enumeration e = nsStack.getDeclaredPrefixes (); - e.hasMoreElements (); - /* NOP */) { - String prefix = (String) e.nextElement (); - String uri = nsStack.getURI (prefix); + nsStack.declarePrefix ("", ""); + attributes.addAttribute ("", "", "xmlns", "CDATA", ""); + return name; + } - if (uri == null || !uri.equals (ns)) - continue; - return prefix + ":" + name; - } + // is there at least one non-null prefix we can use? + for (Enumeration e = nsStack.getDeclaredPrefixes (); + e.hasMoreElements (); + /* NOP */) { + String prefix = (String) e.nextElement (); + String uri = nsStack.getURI (prefix); - // no such luck. create a prefix name, declare it, use it. - for (temp = 0; temp >= 0; temp++) { - String prefix = prefixRoot + temp; + if (uri == null || !uri.equals (ns)) + continue; + return prefix + ":" + name; + } - if (nsStack.getURI (prefix) == null) { - nsStack.declarePrefix (prefix, ns); - attributes.addAttribute ("", "", "xmlns:" + prefix, - "CDATA", ns); - return prefix + ":" + name; - } - } - fatalError ("too many prefixes genned"); - // NOTREACHED - return null; + // no such luck. create a prefix name, declare it, use it. + for (temp = 0; temp >= 0; temp++) { + String prefix = prefixRoot + temp; + + if (nsStack.getURI (prefix) == null) { + nsStack.declarePrefix (prefix, ns); + attributes.addAttribute ("", "", "xmlns:" + prefix, + "CDATA", ns); + return prefix + ":" + name; + } + } + fatalError ("too many prefixes genned"); + // NOTREACHED + return null; } public void startElement ( - String uri, String localName, - String qName, Attributes atts + String uri, String localName, + String qName, Attributes atts ) throws SAXException { - if (!pushedContext) - nsStack.pushContext (); - pushedContext = false; + if (!pushedContext) + nsStack.pushContext (); + pushedContext = false; - // make sure we have all NS declarations handy before we start - int length = atts.getLength (); + // make sure we have all NS declarations handy before we start + int length = atts.getLength (); - for (int i = 0; i < length; i++) { - String aName = atts.getQName (i); + for (int i = 0; i < length; i++) { + String aName = atts.getQName (i); - if (!aName.startsWith ("xmlns")) - continue; + if (!aName.startsWith ("xmlns")) + continue; - String prefix; + String prefix; - if ("xmlns".equals (aName)) - prefix = ""; - else if (aName.indexOf (':') == 5) - prefix = aName.substring (6); - else // "xmlnsfoo" etc. - continue; - startPrefixMapping (prefix, atts.getValue (i)); - } + if ("xmlns".equals (aName)) + prefix = ""; + else if (aName.indexOf (':') == 5) + prefix = aName.substring (6); + else // "xmlnsfoo" etc. + continue; + startPrefixMapping (prefix, atts.getValue (i)); + } - // put namespace decls at the start of our regenned attlist - attributes.clear (); - for (Enumeration e = nsStack.getDeclaredPrefixes (); - e.hasMoreElements (); - /* NOP */) { - String prefix = (String) e.nextElement (); + // put namespace decls at the start of our regenned attlist + attributes.clear (); + for (Enumeration e = nsStack.getDeclaredPrefixes (); + e.hasMoreElements (); + /* NOP */) { + String prefix = (String) e.nextElement (); - attributes.addAttribute ("", "", - ("".equals (prefix) - ? "xmlns" - : "xmlns:" + prefix), - "CDATA", - nsStack.getURI (prefix)); - } + attributes.addAttribute ("", "", + ("".equals (prefix) + ? "xmlns" + : "xmlns:" + prefix), + "CDATA", + nsStack.getURI (prefix)); + } - // name fixups: element, then attributes. - // fixName may declare a new prefix or, for the element, - // redeclare the default (if element name needs it). - qName = fixName (uri, localName, qName, false); + // name fixups: element, then attributes. + // fixName may declare a new prefix or, for the element, + // redeclare the default (if element name needs it). + qName = fixName (uri, localName, qName, false); - for (int i = 0; i < length; i++) { - String aName = atts.getQName (i); - String aNS = atts.getURI (i); - String aLocal = atts.getLocalName (i); - String aType = atts.getType (i); - String aValue = atts.getValue (i); + for (int i = 0; i < length; i++) { + String aName = atts.getQName (i); + String aNS = atts.getURI (i); + String aLocal = atts.getLocalName (i); + String aType = atts.getType (i); + String aValue = atts.getValue (i); - if (aName.startsWith ("xmlns")) - continue; - aName = fixName (aNS, aLocal, aName, true); - attributes.addAttribute (aNS, aLocal, aName, aType, aValue); - } + if (aName.startsWith ("xmlns")) + continue; + aName = fixName (aNS, aLocal, aName, true); + attributes.addAttribute (aNS, aLocal, aName, aType, aValue); + } - elementStack.push (qName); + elementStack.push (qName); - // pass event along, with cleaned-up names and decls. - super.startElement (uri, localName, qName, attributes); + // pass event along, with cleaned-up names and decls. + super.startElement (uri, localName, qName, attributes); } public void endElement (String uri, String localName, String qName) throws SAXException { - nsStack.popContext (); - qName = (String) elementStack.pop (); - super.endElement (uri, localName, qName); + nsStack.popContext (); + qName = (String) elementStack.pop (); + super.endElement (uri, localName, qName); } /** @@ -330,12 +330,12 @@ public class NSFilter extends EventFilter */ public void endPrefixMapping (String prefix) throws SAXException - { } + { } public void endDocument () throws SAXException { - elementStack.removeAllElements (); - nsStack.reset (); - super.endDocument (); + elementStack.removeAllElements (); + nsStack.reset (); + super.endDocument (); } } diff --git a/libjava/classpath/gnu/xml/pipeline/PipelineFactory.java b/libjava/classpath/gnu/xml/pipeline/PipelineFactory.java index f88ab164311..c2adab0210e 100644 --- a/libjava/classpath/gnu/xml/pipeline/PipelineFactory.java +++ b/libjava/classpath/gnu/xml/pipeline/PipelineFactory.java @@ -1,4 +1,4 @@ -/* PipelineFactory.java -- +/* PipelineFactory.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -69,120 +69,120 @@ import org.xml.sax.ext.*; * The stage identifiers are either class names, or are one of the following * short identifiers built into this class. (Most of these identifiers are * no more than aliases for classes.) The built-in identifiers include:

- + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + +
StageParameterTerminusDescriptionStageParameterTerminusDescription
domnone yes Applications code can access a DOM Document built - from the input event stream. When used as a filter, this buffers - data up to an endDocument call, and then uses a DOM parser - to report everything that has been recorded (which can easily be - less than what was reported to it). domnone yes Applications code can access a DOM Document built + from the input event stream. When used as a filter, this buffers + data up to an endDocument call, and then uses a DOM parser + to report everything that has been recorded (which can easily be + less than what was reported to it).
nsfixnonenoThis stage ensures that the XML element and attribute - names in its output use namespace prefixes and declarations correctly. - That is, so that they match the "Namespace plus LocalName" naming data - with which each XML element and attribute is already associated. nsfixnonenoThis stage ensures that the XML element and attribute + names in its output use namespace prefixes and declarations correctly. + That is, so that they match the "Namespace plus LocalName" naming data + with which each XML element and attribute is already associated.
nullnoneyesThis stage ignores all input event data.nullnoneyesThis stage ignores all input event data.
serverrequired
server URL 		noSends its input as XML request to a remote server, - normally a web application server using the HTTP or HTTPS protocols. - The output of this stage is the parsed response from that server.serverrequired
server URL 		noSends its input as XML request to a remote server, + normally a web application server using the HTTP or HTTPS protocols. + The output of this stage is the parsed response from that server.
teerequired
first pipeline		noThis sends its events down two paths; its parameter - is a pipeline descriptor for the first path, and the second path - is the output of this stage.teerequired
first pipeline		noThis sends its events down two paths; its parameter + is a pipeline descriptor for the first path, and the second path + is the output of this stage.
validatenoneyesThis checks for validity errors, and reports them - through its error handler. The input must include declaration events - and some lexical events. validatenoneyesThis checks for validity errors, and reports them + through its error handler. The input must include declaration events + and some lexical events.
wfnoneyes This class provides some basic "well formedness" - tests on the input event stream, and reports a fatal error if any - of them fail. One example: start/end calls for elements must match. - No SAX parser is permitted to produce malformed output, but other - components can easily do so.wfnoneyes This class provides some basic "well formedness" + tests on the input event stream, and reports a fatal error if any + of them fail. One example: start/end calls for elements must match. + No SAX parser is permitted to produce malformed output, but other + components can easily do so.
writerequired
"stdout", "stderr", or filename		yes Writes its input to the specified output, as pretty - printed XML text encoded using UTF-8. Input events must be well - formed and "namespace fixed", else the output won't be XML (or possibly - namespace) conformant. The symbolic names represent - System.out and System.err respectively; names must - correspond to files which don't yet exist.writerequired
"stdout", "stderr", or filename		yes Writes its input to the specified output, as pretty + printed XML text encoded using UTF-8. Input events must be well + formed and "namespace fixed", else the output won't be XML (or possibly + namespace) conformant. The symbolic names represent + System.out and System.err respectively; names must + correspond to files which don't yet exist.
xhtmlrequired
"stdout", "stderr", or filename		yes Like write (above), except that XHTML rules - are followed. The XHTML 1.0 Transitional document type is declared, - and only ASCII characters are written (for interoperability). Other - characters are written as entity or character references; the text is - pretty printed.xhtmlrequired
"stdout", "stderr", or filename		yes Like write (above), except that XHTML rules + are followed. The XHTML 1.0 Transitional document type is declared, + and only ASCII characters are written (for interoperability). Other + characters are written as entity or character references; the text is + pretty printed.
xincludenonenoThis stage handles XInclude processing. - This is like entity inclusion, except that the included content - is declared in-line rather than in the DTD at the beginning of - a document. - xincludenonenoThis stage handles XInclude processing. + This is like entity inclusion, except that the included content + is declared in-line rather than in the DTD at the beginning of + a document. +
xsltrequired
XSLT stylesheet URI		noThis stage handles XSLT transformation - according to a stylesheet. - The implementation of the transformation may not actually - stream data, although if such an XSLT engine is in use - then that can happen. - xsltrequired
XSLT stylesheet URI		noThis stage handles XSLT transformation + according to a stylesheet. + The implementation of the transformation may not actually + stream data, although if such an XSLT engine is in use + then that can happen. +
- + *

Note that {@link EventFilter#bind} can automatically eliminate * some filters by setting SAX2 parser features appropriately. This means * that you can routinely put filters like "nsfix", "validate", or "wf" at the @@ -200,7 +200,7 @@ public class PipelineFactory public static EventConsumer createPipeline (String description) throws IOException { - return createPipeline (description, null); + return createPipeline (description, null); } /** @@ -211,25 +211,25 @@ public class PipelineFactory * segments with easily configured ones. */ public static EventConsumer createPipeline ( - String description, - EventConsumer next + String description, + EventConsumer next ) throws IOException { - // tokens are (for now) what's separated by whitespace; - // very easy to parse, but IDs never have spaces. + // tokens are (for now) what's separated by whitespace; + // very easy to parse, but IDs never have spaces. - StringTokenizer tokenizer; - String tokens []; + StringTokenizer tokenizer; + String tokens []; - tokenizer = new StringTokenizer (description); - tokens = new String [tokenizer.countTokens ()]; - for (int i = 0; i < tokens.length; i++) - tokens [i] = tokenizer.nextToken (); + tokenizer = new StringTokenizer (description); + tokens = new String [tokenizer.countTokens ()]; + for (int i = 0; i < tokens.length; i++) + tokens [i] = tokenizer.nextToken (); - PipelineFactory factory = new PipelineFactory (); - Pipeline pipeline = factory.parsePipeline (tokens, next); + PipelineFactory factory = new PipelineFactory (); + Pipeline pipeline = factory.parsePipeline (tokens, next); - return pipeline.createPipeline (); + return pipeline.createPipeline (); } @@ -242,70 +242,70 @@ public class PipelineFactory * predefined aliases) left and right parenthesis, and the vertical bar. */ public static EventConsumer createPipeline ( - String tokens [], - EventConsumer next + String tokens [], + EventConsumer next ) throws IOException { - PipelineFactory factory = new PipelineFactory (); - Pipeline pipeline = factory.parsePipeline (tokens, next); + PipelineFactory factory = new PipelineFactory (); + Pipeline pipeline = factory.parsePipeline (tokens, next); - return pipeline.createPipeline (); + return pipeline.createPipeline (); } - private String tokens []; - private int index; + private String tokens []; + private int index; private Pipeline parsePipeline (String toks [], EventConsumer next) { - tokens = toks; - index = 0; - - Pipeline retval = parsePipeline (next); + tokens = toks; + index = 0; - if (index != toks.length) - throw new ArrayIndexOutOfBoundsException ( - "extra token: " + tokens [index]); - return retval; + Pipeline retval = parsePipeline (next); + + if (index != toks.length) + throw new ArrayIndexOutOfBoundsException ( + "extra token: " + tokens [index]); + return retval; } // pipeline ::= stage | stage '|' pipeline private Pipeline parsePipeline (EventConsumer next) { - Pipeline retval = new Pipeline (parseStage ()); + Pipeline retval = new Pipeline (parseStage ()); - // minimal pipelines: "stage" and "... | id" - if (index > (tokens.length - 2) - || !"|".equals (tokens [index]) - ) { - retval.next = next; - return retval; - } - index++; - retval.rest = parsePipeline (next); - return retval; + // minimal pipelines: "stage" and "... | id" + if (index > (tokens.length - 2) + || !"|".equals (tokens [index]) + ) { + retval.next = next; + return retval; + } + index++; + retval.rest = parsePipeline (next); + return retval; } // stage ::= id | id '(' pipeline ')' private Stage parseStage () { - Stage retval = new Stage (tokens [index++]); + Stage retval = new Stage (tokens [index++]); - // minimal stages: "id" and "id ( id )" - if (index > (tokens.length - 2) - || !"(".equals (tokens [index]) /*)*/ - ) - return retval; - - index++; - retval.param = parsePipeline (null); - if (index >= tokens.length) - throw new ArrayIndexOutOfBoundsException ( - "missing right paren"); - if (/*(*/ !")".equals (tokens [index++])) - throw new ArrayIndexOutOfBoundsException ( - "required right paren, not: " + tokens [index - 1]); - return retval; + // minimal stages: "id" and "id ( id )" + if (index > (tokens.length - 2) + || !"(".equals (tokens [index]) /*)*/ + ) + return retval; + + index++; + retval.param = parsePipeline (null); + if (index >= tokens.length) + throw new ArrayIndexOutOfBoundsException ( + "missing right paren"); + if (/*(*/ !")".equals (tokens [index++])) + throw new ArrayIndexOutOfBoundsException ( + "required right paren, not: " + tokens [index - 1]); + return retval; } @@ -313,12 +313,12 @@ public class PipelineFactory // these classes obey the conventions for constructors, so they're // only built in to this table of shortnames // - // - filter (one or two types of arglist) - // * last constructor is 'next' element - // * optional (first) string parameter + // - filter (one or two types of arglist) + // * last constructor is 'next' element + // * optional (first) string parameter // - // - terminus (one or types of arglist) - // * optional (only) string parameter + // - terminus (one or types of arglist) + // * optional (only) string parameter // // terminus stages are transformed into filters if needed, by // creating a "tee". filter stages aren't turned to terminus @@ -326,397 +326,397 @@ public class PipelineFactory // terminus explicitly. // private static final String builtinStages [][] = { - { "dom", "gnu.xml.dom.Consumer" }, - { "nsfix", "gnu.xml.pipeline.NSFilter" }, - { "null", "gnu.xml.pipeline.EventFilter" }, - { "server", "gnu.xml.pipeline.CallFilter" }, - { "tee", "gnu.xml.pipeline.TeeConsumer" }, - { "validate", "gnu.xml.pipeline.ValidationConsumer" }, - { "wf", "gnu.xml.pipeline.WellFormednessFilter" }, - { "xinclude", "gnu.xml.pipeline.XIncludeFilter" }, - { "xslt", "gnu.xml.pipeline.XsltFilter" }, + { "dom", "gnu.xml.dom.Consumer" }, + { "nsfix", "gnu.xml.pipeline.NSFilter" }, + { "null", "gnu.xml.pipeline.EventFilter" }, + { "server", "gnu.xml.pipeline.CallFilter" }, + { "tee", "gnu.xml.pipeline.TeeConsumer" }, + { "validate", "gnu.xml.pipeline.ValidationConsumer" }, + { "wf", "gnu.xml.pipeline.WellFormednessFilter" }, + { "xinclude", "gnu.xml.pipeline.XIncludeFilter" }, + { "xslt", "gnu.xml.pipeline.XsltFilter" }, // XXX want: option for validate, to preload external part of a DTD - // xhtml, write ... nyet generic-ready + // xhtml, write ... nyet generic-ready }; private static class Stage { - String id; - Pipeline param; + String id; + Pipeline param; - Stage (String name) - { id = name; } + Stage (String name) + { id = name; } - public String toString () - { - if (param == null) - return id; - return id + " ( " + param + " )"; - } + public String toString () + { + if (param == null) + return id; + return id + " ( " + param + " )"; + } - private void fail (String message) - throws IOException - { - throw new IOException ("in '" + id - + "' stage of pipeline, " + message); - } + private void fail (String message) + throws IOException + { + throw new IOException ("in '" + id + + "' stage of pipeline, " + message); + } - EventConsumer createStage (EventConsumer next) - throws IOException - { - String name = id; + EventConsumer createStage (EventConsumer next) + throws IOException + { + String name = id; - // most builtins are just class aliases - for (int i = 0; i < builtinStages.length; i++) { - if (id.equals (builtinStages [i][0])) { - name = builtinStages [i][1]; - break; - } - } + // most builtins are just class aliases + for (int i = 0; i < builtinStages.length; i++) { + if (id.equals (builtinStages [i][0])) { + name = builtinStages [i][1]; + break; + } + } - // Save output as XML or XHTML text - if ("write".equals (name) || "xhtml".equals (name)) { - String filename; - boolean isXhtml = "xhtml".equals (name); - OutputStream out = null; - TextConsumer consumer; + // Save output as XML or XHTML text + if ("write".equals (name) || "xhtml".equals (name)) { + String filename; + boolean isXhtml = "xhtml".equals (name); + OutputStream out = null; + TextConsumer consumer; - if (param == null) - fail ("parameter is required"); + if (param == null) + fail ("parameter is required"); - filename = param.toString (); - if ("stdout".equals (filename)) - out = System.out; - else if ("stderr".equals (filename)) - out = System.err; - else { - File f = new File (filename); + filename = param.toString (); + if ("stdout".equals (filename)) + out = System.out; + else if ("stderr".equals (filename)) + out = System.err; + else { + File f = new File (filename); /* - if (!f.isAbsolute ()) - fail ("require absolute file paths"); + if (!f.isAbsolute ()) + fail ("require absolute file paths"); */ - if (f.exists ()) - fail ("file already exists: " + f.getName ()); + if (f.exists ()) + fail ("file already exists: " + f.getName ()); // XXX this races against the existence test - out = new FileOutputStream (f); - } - - if (!isXhtml) - consumer = new TextConsumer (out); - else - consumer = new TextConsumer ( - new OutputStreamWriter (out, "8859_1"), - true); - - consumer.setPrettyPrinting (true); - if (next == null) - return consumer; - return new TeeConsumer (consumer, next); + out = new FileOutputStream (f); + } - } else { - // - // Here go all the builtins that are just aliases for - // classes, and all stage IDs that started out as such - // class names. The following logic relies on several - // documented conventions for constructor invocation. - // - String msg = null; + if (!isXhtml) + consumer = new TextConsumer (out); + else + consumer = new TextConsumer ( + new OutputStreamWriter (out, "8859_1"), + true); - try { - Class klass = Class.forName (name); - Class argTypes [] = null; - Constructor constructor = null; - boolean filter = false; - Object params [] = null; - Object obj = null; + consumer.setPrettyPrinting (true); + if (next == null) + return consumer; + return new TeeConsumer (consumer, next); - // do we need a filter stage? - if (next != null) { - // "next" consumer is always passed, with - // or without the optional string param - if (param == null) { - argTypes = new Class [1]; - argTypes [0] = EventConsumer.class; + } else { + // + // Here go all the builtins that are just aliases for + // classes, and all stage IDs that started out as such + // class names. The following logic relies on several + // documented conventions for constructor invocation. + // + String msg = null; - params = new Object [1]; - params [0] = next; + try { + Class klass = Class.forName (name); + Class argTypes [] = null; + Constructor constructor = null; + boolean filter = false; + Object params [] = null; + Object obj = null; - msg = "no-param filter"; - } else { - argTypes = new Class [2]; - argTypes [0] = String.class; - argTypes [1] = EventConsumer.class; + // do we need a filter stage? + if (next != null) { + // "next" consumer is always passed, with + // or without the optional string param + if (param == null) { + argTypes = new Class [1]; + argTypes [0] = EventConsumer.class; - params = new Object [2]; - params [0] = param.toString (); - params [1] = next; + params = new Object [1]; + params [0] = next; - msg = "one-param filter"; - } + msg = "no-param filter"; + } else { + argTypes = new Class [2]; + argTypes [0] = String.class; + argTypes [1] = EventConsumer.class; + + params = new Object [2]; + params [0] = param.toString (); + params [1] = next; + + msg = "one-param filter"; + } - try { - constructor = klass.getConstructor (argTypes); - } catch (NoSuchMethodException e) { - // try creating a filter from a - // terminus and a tee - filter = true; - msg += " built from "; - } - } + try { + constructor = klass.getConstructor (argTypes); + } catch (NoSuchMethodException e) { + // try creating a filter from a + // terminus and a tee + filter = true; + msg += " built from "; + } + } - // build from a terminus stage, with or - // without the optional string param - if (constructor == null) { - String tmp; + // build from a terminus stage, with or + // without the optional string param + if (constructor == null) { + String tmp; - if (param == null) { - argTypes = new Class [0]; - params = new Object [0]; + if (param == null) { + argTypes = new Class [0]; + params = new Object [0]; - tmp = "no-param terminus"; - } else { - argTypes = new Class [1]; - argTypes [0] = String.class; + tmp = "no-param terminus"; + } else { + argTypes = new Class [1]; + argTypes [0] = String.class; - params = new Object [1]; - params [0] = param.toString (); + params = new Object [1]; + params [0] = param.toString (); - tmp = "one-param terminus"; - } - if (msg == null) - msg = tmp; - else - msg += tmp; - constructor = klass.getConstructor (argTypes); - // NOT creating terminus by dead-ending - // filters ... users should think about - // that one, something's likely wrong - } - - obj = constructor.newInstance (params); + tmp = "one-param terminus"; + } + if (msg == null) + msg = tmp; + else + msg += tmp; + constructor = klass.getConstructor (argTypes); + // NOT creating terminus by dead-ending + // filters ... users should think about + // that one, something's likely wrong + } - // return EventConsumers directly, perhaps after - // turning them into a filter - if (obj instanceof EventConsumer) { - if (filter) - return new TeeConsumer ((EventConsumer) obj, next); - return (EventConsumer) obj; - } - - // if it's not a handler, it's an error - // we can wrap handlers in a filter - EventFilter retval = new EventFilter (); - boolean updated = false; + obj = constructor.newInstance (params); - if (obj instanceof ContentHandler) { - retval.setContentHandler ((ContentHandler) obj); - updated = true; - } - if (obj instanceof DTDHandler) { - retval.setDTDHandler ((DTDHandler) obj); - updated = true; - } - if (obj instanceof LexicalHandler) { - retval.setProperty ( - EventFilter.PROPERTY_URI + "lexical-handler", - obj); - updated = true; - } - if (obj instanceof DeclHandler) { - retval.setProperty ( - EventFilter.PROPERTY_URI + "declaration-handler", - obj); - updated = true; - } + // return EventConsumers directly, perhaps after + // turning them into a filter + if (obj instanceof EventConsumer) { + if (filter) + return new TeeConsumer ((EventConsumer) obj, next); + return (EventConsumer) obj; + } - if (!updated) - fail ("class is neither Consumer nor Handler"); - - if (filter) - return new TeeConsumer (retval, next); - return retval; + // if it's not a handler, it's an error + // we can wrap handlers in a filter + EventFilter retval = new EventFilter (); + boolean updated = false; - } catch (IOException e) { - throw e; + if (obj instanceof ContentHandler) { + retval.setContentHandler ((ContentHandler) obj); + updated = true; + } + if (obj instanceof DTDHandler) { + retval.setDTDHandler ((DTDHandler) obj); + updated = true; + } + if (obj instanceof LexicalHandler) { + retval.setProperty ( + EventFilter.PROPERTY_URI + "lexical-handler", + obj); + updated = true; + } + if (obj instanceof DeclHandler) { + retval.setProperty ( + EventFilter.PROPERTY_URI + "declaration-handler", + obj); + updated = true; + } - } catch (NoSuchMethodException e) { - fail (name + " constructor missing -- " + msg); + if (!updated) + fail ("class is neither Consumer nor Handler"); - } catch (ClassNotFoundException e) { - fail (name + " class not found"); + if (filter) + return new TeeConsumer (retval, next); + return retval; - } catch (Exception e) { - // e.printStackTrace (); - fail ("stage not available: " + e.getMessage ()); - } - } - // NOTREACHED - return null; - } + } catch (IOException e) { + throw e; + + } catch (NoSuchMethodException e) { + fail (name + " constructor missing -- " + msg); + + } catch (ClassNotFoundException e) { + fail (name + " class not found"); + + } catch (Exception e) { + // e.printStackTrace (); + fail ("stage not available: " + e.getMessage ()); + } + } + // NOTREACHED + return null; + } } private static class Pipeline { - Stage stage; + Stage stage; - // rest may be null - Pipeline rest; - EventConsumer next; + // rest may be null + Pipeline rest; + EventConsumer next; - Pipeline (Stage s) - { stage = s; } + Pipeline (Stage s) + { stage = s; } - public String toString () - { - if (rest == null && next == null) - return stage.toString (); - if (rest != null) - return stage + " | " + rest; - throw new IllegalArgumentException ("next"); - } + public String toString () + { + if (rest == null && next == null) + return stage.toString (); + if (rest != null) + return stage + " | " + rest; + throw new IllegalArgumentException ("next"); + } - EventConsumer createPipeline () - throws IOException - { - if (next == null) { - if (rest == null) - next = stage.createStage (null); - else - next = stage.createStage (rest.createPipeline ()); - } - return next; - } + EventConsumer createPipeline () + throws IOException + { + if (next == null) { + if (rest == null) + next = stage.createStage (null); + else + next = stage.createStage (rest.createPipeline ()); + } + return next; + } } /* public static void main (String argv []) { - try { - // three basic terminus cases - createPipeline ("null"); - createPipeline ("validate"); - createPipeline ("write ( stdout )"); + try { + // three basic terminus cases + createPipeline ("null"); + createPipeline ("validate"); + createPipeline ("write ( stdout )"); - // four basic filters - createPipeline ("nsfix | write ( stderr )"); - createPipeline ("wf | null"); - createPipeline ("null | null"); - createPipeline ( + // four basic filters + createPipeline ("nsfix | write ( stderr )"); + createPipeline ("wf | null"); + createPipeline ("null | null"); + createPipeline ( "call ( http://www.example.com/services/xml-1a ) | xhtml ( stdout )"); - // tee junctions - createPipeline ("tee ( validate ) | write ( stdout )"); - createPipeline ("tee ( nsfix | write ( stdout ) ) | validate"); + // tee junctions + createPipeline ("tee ( validate ) | write ( stdout )"); + createPipeline ("tee ( nsfix | write ( stdout ) ) | validate"); - // longer pipeline - createPipeline ("nsfix | tee ( validate ) | write ( stdout )"); - createPipeline ( - "null | wf | nsfix | tee ( validate ) | write ( stdout )"); + // longer pipeline + createPipeline ("nsfix | tee ( validate ) | write ( stdout )"); + createPipeline ( + "null | wf | nsfix | tee ( validate ) | write ( stdout )"); - // try some parsing error cases - try { - createPipeline ("null ("); // extra token '(' - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + // try some parsing error cases + try { + createPipeline ("null ("); // extra token '(' + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("nsfix |"); // extra token '|' - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("nsfix |"); // extra token '|' + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("xhtml ( foo"); // missing right paren - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("xhtml ( foo"); // missing right paren + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("xhtml ( foo bar"); // required right paren - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("xhtml ( foo bar"); // required right paren + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("tee ( nsfix | validate");// missing right paren - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("tee ( nsfix | validate");// missing right paren + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - // try some construction error cases + // try some construction error cases - try { - createPipeline ("call"); // missing param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("call ( foobar )"); // broken param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("nsfix ( foobar )"); // illegal param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("null ( foobar )"); // illegal param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("wf ( foobar )"); // illegal param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("xhtml ( foobar.html )"); - new File ("foobar.html").delete (); - // now supported - } catch (Exception e) { - System.err.println ("** err: " + e.getMessage ()); } - try { - createPipeline ("xhtml"); // missing param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("write ( stdout ) | null"); // nonterminal - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("validate | null"); - // now supported - } catch (Exception e) { - System.err.println ("** err: " + e.getMessage ()); } - try { - createPipeline ("validate ( foo )"); // illegal param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - createPipeline ("tee"); // missing param - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } - try { - // only builtins so far - createPipeline ("com.example.xml.FilterClass"); - System.err.println ("** didn't report error"); - } catch (Exception e) { - System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("call"); // missing param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("call ( foobar )"); // broken param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("nsfix ( foobar )"); // illegal param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("null ( foobar )"); // illegal param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("wf ( foobar )"); // illegal param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("xhtml ( foobar.html )"); + new File ("foobar.html").delete (); + // now supported + } catch (Exception e) { + System.err.println ("** err: " + e.getMessage ()); } + try { + createPipeline ("xhtml"); // missing param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("write ( stdout ) | null"); // nonterminal + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("validate | null"); + // now supported + } catch (Exception e) { + System.err.println ("** err: " + e.getMessage ()); } + try { + createPipeline ("validate ( foo )"); // illegal param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + createPipeline ("tee"); // missing param + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } + try { + // only builtins so far + createPipeline ("com.example.xml.FilterClass"); + System.err.println ("** didn't report error"); + } catch (Exception e) { + System.err.println ("== err: " + e.getMessage ()); } - } catch (Exception e) { - e.printStackTrace (); - } + } catch (Exception e) { + e.printStackTrace (); + } } /**/ diff --git a/libjava/classpath/gnu/xml/pipeline/TeeConsumer.java b/libjava/classpath/gnu/xml/pipeline/TeeConsumer.java index 8186de4df66..3ac86057539 100644 --- a/libjava/classpath/gnu/xml/pipeline/TeeConsumer.java +++ b/libjava/classpath/gnu/xml/pipeline/TeeConsumer.java @@ -1,4 +1,4 @@ -/* TeeConsumer.java -- +/* TeeConsumer.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,16 +68,16 @@ import org.xml.sax.ext.LexicalHandler; * @author David Brownell */ final public class TeeConsumer - implements EventConsumer, - ContentHandler, DTDHandler, - LexicalHandler,DeclHandler + implements EventConsumer, + ContentHandler, DTDHandler, + LexicalHandler,DeclHandler { - private EventConsumer first, rest; + private EventConsumer first, rest; // cached to minimize time overhead - private ContentHandler docFirst, docRest; - private DeclHandler declFirst, declRest; - private LexicalHandler lexFirst, lexRest; + private ContentHandler docFirst, docRest; + private DeclHandler declFirst, declRest; + private LexicalHandler lexFirst, lexRest; /** @@ -91,39 +91,39 @@ final public class TeeConsumer */ public TeeConsumer (EventConsumer car, EventConsumer cdr) { - if (car == null || cdr == null) - throw new NullPointerException (); - first = car; - rest = cdr; + if (car == null || cdr == null) + throw new NullPointerException (); + first = car; + rest = cdr; - // - // Cache the handlers. - // - docFirst = first.getContentHandler (); - docRest = rest.getContentHandler (); - // DTD handler isn't cached (rarely needed) + // + // Cache the handlers. + // + docFirst = first.getContentHandler (); + docRest = rest.getContentHandler (); + // DTD handler isn't cached (rarely needed) - try { - declFirst = null; - declFirst = (DeclHandler) first.getProperty ( - EventFilter.DECL_HANDLER); - } catch (SAXException e) {} - try { - declRest = null; - declRest = (DeclHandler) rest.getProperty ( - EventFilter.DECL_HANDLER); - } catch (SAXException e) {} + try { + declFirst = null; + declFirst = (DeclHandler) first.getProperty ( + EventFilter.DECL_HANDLER); + } catch (SAXException e) {} + try { + declRest = null; + declRest = (DeclHandler) rest.getProperty ( + EventFilter.DECL_HANDLER); + } catch (SAXException e) {} - try { - lexFirst = null; - lexFirst = (LexicalHandler) first.getProperty ( - EventFilter.LEXICAL_HANDLER); - } catch (SAXException e) {} - try { - lexRest = null; - lexRest = (LexicalHandler) rest.getProperty ( - EventFilter.LEXICAL_HANDLER); - } catch (SAXException e) {} + try { + lexFirst = null; + lexFirst = (LexicalHandler) first.getProperty ( + EventFilter.LEXICAL_HANDLER); + } catch (SAXException e) {} + try { + lexRest = null; + lexRest = (LexicalHandler) rest.getProperty ( + EventFilter.LEXICAL_HANDLER); + } catch (SAXException e) {} } /* FIXME @@ -132,78 +132,78 @@ final public class TeeConsumer * two-consumer constructor for this class. * * @param first Description of the first pipeline to get events, - * which will be passed to {@link PipelineFactory#createPipeline} + * which will be passed to {@link PipelineFactory#createPipeline} * @param rest The second pipeline to get the events * / - // constructor used by PipelineFactory + // constructor used by PipelineFactory public TeeConsumer (String first, EventConsumer rest) throws IOException { - this (PipelineFactory.createPipeline (first), rest); + this (PipelineFactory.createPipeline (first), rest); } */ /** Returns the first pipeline to get event calls. */ public EventConsumer getFirst () - { return first; } + { return first; } /** Returns the second pipeline to get event calls. */ public EventConsumer getRest () - { return rest; } + { return rest; } /** Returns the content handler being used. */ final public ContentHandler getContentHandler () { - if (docRest == null) - return docFirst; - if (docFirst == null) - return docRest; - return this; + if (docRest == null) + return docFirst; + if (docFirst == null) + return docRest; + return this; } /** Returns the dtd handler being used. */ final public DTDHandler getDTDHandler () { - // not cached (hardly used) - if (rest.getDTDHandler () == null) - return first.getDTDHandler (); - if (first.getDTDHandler () == null) - return rest.getDTDHandler (); - return this; + // not cached (hardly used) + if (rest.getDTDHandler () == null) + return first.getDTDHandler (); + if (first.getDTDHandler () == null) + return rest.getDTDHandler (); + return this; } /** Returns the declaration or lexical handler being used. */ final public Object getProperty (String id) throws SAXNotRecognizedException { - // - // in degenerate cases, we have no work to do. - // - Object firstProp = null, restProp = null; + // + // in degenerate cases, we have no work to do. + // + Object firstProp = null, restProp = null; - try { firstProp = first.getProperty (id); } - catch (SAXNotRecognizedException e) { /* ignore */ } - try { restProp = rest.getProperty (id); } - catch (SAXNotRecognizedException e) { /* ignore */ } + try { firstProp = first.getProperty (id); } + catch (SAXNotRecognizedException e) { /* ignore */ } + try { restProp = rest.getProperty (id); } + catch (SAXNotRecognizedException e) { /* ignore */ } - if (restProp == null) - return firstProp; - if (firstProp == null) - return restProp; + if (restProp == null) + return firstProp; + if (firstProp == null) + return restProp; - // - // we've got work to do; handle two builtin cases. - // - if (EventFilter.DECL_HANDLER.equals (id)) - return this; - if (EventFilter.LEXICAL_HANDLER.equals (id)) - return this; + // + // we've got work to do; handle two builtin cases. + // + if (EventFilter.DECL_HANDLER.equals (id)) + return this; + if (EventFilter.LEXICAL_HANDLER.equals (id)) + return this; - // - // non-degenerate, handled by both consumers, but we don't know - // how to handle this. - // - throw new SAXNotRecognizedException ("can't tee: " + id); + // + // non-degenerate, handled by both consumers, but we don't know + // how to handle this. + // + throw new SAXNotRecognizedException ("can't tee: " + id); } /** @@ -212,8 +212,8 @@ final public class TeeConsumer */ public void setErrorHandler (ErrorHandler handler) { - first.setErrorHandler (handler); - rest.setErrorHandler (handler); + first.setErrorHandler (handler); + rest.setErrorHandler (handler); } @@ -222,83 +222,83 @@ final public class TeeConsumer // public void setDocumentLocator (Locator locator) { - // this call is not made by all parsers - docFirst.setDocumentLocator (locator); - docRest.setDocumentLocator (locator); + // this call is not made by all parsers + docFirst.setDocumentLocator (locator); + docRest.setDocumentLocator (locator); } public void startDocument () throws SAXException { - docFirst.startDocument (); - docRest.startDocument (); + docFirst.startDocument (); + docRest.startDocument (); } public void endDocument () throws SAXException { - try { - docFirst.endDocument (); - } finally { - docRest.endDocument (); - } + try { + docFirst.endDocument (); + } finally { + docRest.endDocument (); + } } public void startPrefixMapping (String prefix, String uri) throws SAXException { - docFirst.startPrefixMapping (prefix, uri); - docRest.startPrefixMapping (prefix, uri); + docFirst.startPrefixMapping (prefix, uri); + docRest.startPrefixMapping (prefix, uri); } public void endPrefixMapping (String prefix) throws SAXException { - docFirst.endPrefixMapping (prefix); - docRest.endPrefixMapping (prefix); + docFirst.endPrefixMapping (prefix); + docRest.endPrefixMapping (prefix); } public void skippedEntity (String name) throws SAXException { - docFirst.skippedEntity (name); - docRest.skippedEntity (name); + docFirst.skippedEntity (name); + docRest.skippedEntity (name); } public void startElement (String uri, String localName, - String qName, Attributes atts) + String qName, Attributes atts) throws SAXException { - docFirst.startElement (uri, localName, qName, atts); - docRest.startElement (uri, localName, qName, atts); + docFirst.startElement (uri, localName, qName, atts); + docRest.startElement (uri, localName, qName, atts); } public void endElement (String uri, String localName, String qName) throws SAXException { - docFirst.endElement (uri, localName, qName); - docRest.endElement (uri, localName, qName); + docFirst.endElement (uri, localName, qName); + docRest.endElement (uri, localName, qName); } public void processingInstruction (String target, String data) throws SAXException { - docFirst.processingInstruction (target, data); - docRest.processingInstruction (target, data); + docFirst.processingInstruction (target, data); + docRest.processingInstruction (target, data); } public void characters (char ch [], int start, int length) throws SAXException { - docFirst.characters (ch, start, length); - docRest.characters (ch, start, length); + docFirst.characters (ch, start, length); + docRest.characters (ch, start, length); } public void ignorableWhitespace (char ch [], int start, int length) throws SAXException { - docFirst.ignorableWhitespace (ch, start, length); - docRest.ignorableWhitespace (ch, start, length); + docFirst.ignorableWhitespace (ch, start, length); + docRest.ignorableWhitespace (ch, start, length); } @@ -308,23 +308,23 @@ final public class TeeConsumer public void notationDecl (String name, String publicId, String systemId) throws SAXException { - DTDHandler l1 = first.getDTDHandler (); - DTDHandler l2 = rest.getDTDHandler (); + DTDHandler l1 = first.getDTDHandler (); + DTDHandler l2 = rest.getDTDHandler (); - l1.notationDecl (name, publicId, systemId); - l2.notationDecl (name, publicId, systemId); + l1.notationDecl (name, publicId, systemId); + l2.notationDecl (name, publicId, systemId); } public void unparsedEntityDecl (String name, - String publicId, String systemId, - String notationName + String publicId, String systemId, + String notationName ) throws SAXException { - DTDHandler l1 = first.getDTDHandler (); - DTDHandler l2 = rest.getDTDHandler (); + DTDHandler l1 = first.getDTDHandler (); + DTDHandler l2 = rest.getDTDHandler (); - l1.unparsedEntityDecl (name, publicId, systemId, notationName); - l2.unparsedEntityDecl (name, publicId, systemId, notationName); + l1.unparsedEntityDecl (name, publicId, systemId, notationName); + l2.unparsedEntityDecl (name, publicId, systemId, notationName); } @@ -332,34 +332,34 @@ final public class TeeConsumer // DeclHandler // public void attributeDecl (String eName, String aName, - String type, - String mode, String value) + String type, + String mode, String value) throws SAXException { - declFirst.attributeDecl (eName, aName, type, mode, value); - declRest.attributeDecl (eName, aName, type, mode, value); + declFirst.attributeDecl (eName, aName, type, mode, value); + declRest.attributeDecl (eName, aName, type, mode, value); } public void elementDecl (String name, String model) throws SAXException { - declFirst.elementDecl (name, model); - declRest.elementDecl (name, model); + declFirst.elementDecl (name, model); + declRest.elementDecl (name, model); } public void externalEntityDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException { - declFirst.externalEntityDecl (name, publicId, systemId); - declRest.externalEntityDecl (name, publicId, systemId); + declFirst.externalEntityDecl (name, publicId, systemId); + declRest.externalEntityDecl (name, publicId, systemId); } public void internalEntityDecl (String name, String value) throws SAXException { - declFirst.internalEntityDecl (name, value); - declRest.internalEntityDecl (name, value); + declFirst.internalEntityDecl (name, value); + declRest.internalEntityDecl (name, value); } @@ -369,49 +369,49 @@ final public class TeeConsumer public void comment (char ch [], int start, int length) throws SAXException { - lexFirst.comment (ch, start, length); - lexRest.comment (ch, start, length); + lexFirst.comment (ch, start, length); + lexRest.comment (ch, start, length); } - + public void startCDATA () throws SAXException { - lexFirst.startCDATA (); - lexRest.startCDATA (); + lexFirst.startCDATA (); + lexRest.startCDATA (); } - + public void endCDATA () throws SAXException { - lexFirst.endCDATA (); - lexRest.endCDATA (); + lexFirst.endCDATA (); + lexRest.endCDATA (); } - + public void startEntity (String name) throws SAXException { - lexFirst.startEntity (name); - lexRest.startEntity (name); + lexFirst.startEntity (name); + lexRest.startEntity (name); } - + public void endEntity (String name) throws SAXException { - lexFirst.endEntity (name); - lexRest.endEntity (name); + lexFirst.endEntity (name); + lexRest.endEntity (name); } - + public void startDTD (String name, String publicId, String systemId) throws SAXException { - lexFirst.startDTD (name, publicId, systemId); - lexRest.startDTD (name, publicId, systemId); + lexFirst.startDTD (name, publicId, systemId); + lexRest.startDTD (name, publicId, systemId); } - + public void endDTD () throws SAXException { - lexFirst.endDTD (); - lexRest.endDTD (); + lexFirst.endDTD (); + lexRest.endDTD (); } } diff --git a/libjava/classpath/gnu/xml/pipeline/TextConsumer.java b/libjava/classpath/gnu/xml/pipeline/TextConsumer.java index 67bd23b00d6..13dcfa7f6ad 100644 --- a/libjava/classpath/gnu/xml/pipeline/TextConsumer.java +++ b/libjava/classpath/gnu/xml/pipeline/TextConsumer.java @@ -1,4 +1,4 @@ -/* TextConsumer.java -- +/* TextConsumer.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,8 +72,8 @@ public class TextConsumer extends XMLWriter implements EventConsumer public TextConsumer (Writer w, boolean isXhtml) throws IOException { - super (w, isXhtml ? "US-ASCII" : null); - setXhtml (isXhtml); + super (w, isXhtml ? "US-ASCII" : null); + setXhtml (isXhtml); } /** @@ -83,9 +83,9 @@ public class TextConsumer extends XMLWriter implements EventConsumer public TextConsumer (Writer w) throws IOException { - this (w, false); + this (w, false); } - + /** * Constructs a consumer that writes its input as XML text, * encoded in UTF-8. XHTML rules are not followed. @@ -93,25 +93,25 @@ public class TextConsumer extends XMLWriter implements EventConsumer public TextConsumer (OutputStream out) throws IOException { - this (new OutputStreamWriter (out, "UTF8"), false); + this (new OutputStreamWriter (out, "UTF8"), false); } /** EventConsumer Returns the document handler being used. */ public ContentHandler getContentHandler () - { return this; } + { return this; } /** EventConsumer Returns the dtd handler being used. */ public DTDHandler getDTDHandler () - { return this; } + { return this; } /** XMLReaderRetrieves a property (lexical and decl handlers) */ public Object getProperty (String propertyId) throws SAXNotRecognizedException { - if (EventFilter.LEXICAL_HANDLER.equals (propertyId)) - return this; - if (EventFilter.DECL_HANDLER.equals (propertyId)) - return this; - throw new SAXNotRecognizedException (propertyId); + if (EventFilter.LEXICAL_HANDLER.equals (propertyId)) + return this; + if (EventFilter.DECL_HANDLER.equals (propertyId)) + return this; + throw new SAXNotRecognizedException (propertyId); } } diff --git a/libjava/classpath/gnu/xml/pipeline/ValidationConsumer.java b/libjava/classpath/gnu/xml/pipeline/ValidationConsumer.java index 8391767490c..0346984d3b5 100644 --- a/libjava/classpath/gnu/xml/pipeline/ValidationConsumer.java +++ b/libjava/classpath/gnu/xml/pipeline/ValidationConsumer.java @@ -1,4 +1,4 @@ -/* ValidationConsumer.java -- +/* ValidationConsumer.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,24 +62,24 @@ import org.xml.sax.helpers.XMLReaderFactory; * both a filter and a terminus on an event pipeline. It relies on the * producer of SAX events to:

    * - *
  1. Conform to the specification of a non-validating XML parser that - * reads all external entities, reported using SAX2 events.
    2. + *
  2. Conform to the specification of a non-validating XML parser that + * reads all external entities, reported using SAX2 events.
    3. * - *
  3. Report ignorable whitespace as such (through the ContentHandler - * interface). This is, strictly speaking, optional for nonvalidating - * XML processors.
    4. + *
  4. Report ignorable whitespace as such (through the ContentHandler + * interface). This is, strictly speaking, optional for nonvalidating + * XML processors.
    5. * - *
  5. Make SAX2 DeclHandler callbacks, with default - * attribute values already normalized (and without "<").
    6. + *
  6. Make SAX2 DeclHandler callbacks, with default + * attribute values already normalized (and without "<").
    7. * - *
  7. Make SAX2 LexicalHandler startDTD() and endDTD () - * callbacks.
    8. + *
  8. Make SAX2 LexicalHandler startDTD() and endDTD () + * callbacks.
    9. * - *
  9. Act as if the (URI)/namespace-prefixes property were - * set to true, by providing XML 1.0 names and all xmlns* - * attributes (rather than omitting either or both).
    10. + *
  10. Act as if the (URI)/namespace-prefixes property were + * set to true, by providing XML 1.0 names and all xmlns* + * attributes (rather than omitting either or both).
    11. * - *
+ * * *

At this writing, the major SAX2 parsers (such as Ælfred2, * Crimson, and Xerces) meet these requirements, and this validation @@ -128,51 +128,51 @@ import org.xml.sax.helpers.XMLReaderFactory; * of them) or discarded (popular for the standalone declaration); in short, * that these are bugs in the XML specification (not all via SGML):

    * - *
  • The Proper Declaration/PE Nesting and - * Proper Group/PE Nesting VCs can't be tested because they - * require access to particularly low level lexical level information. - * In essence, the reason XML isn't a simple thing to parse is that - * it's not a context free grammar, and these constraints elevate that - * SGML-derived context sensitivity to the level of a semantic rule. + *
  • The Proper Declaration/PE Nesting and + * Proper Group/PE Nesting VCs can't be tested because they + * require access to particularly low level lexical level information. + * In essence, the reason XML isn't a simple thing to parse is that + * it's not a context free grammar, and these constraints elevate that + * SGML-derived context sensitivity to the level of a semantic rule. * - *
  • The Standalone Document Declaration VC can't be - * tested. This is for two reasons. First, this flag isn't made - * available through SAX2. Second, it also requires breaking that - * lexical layering boundary. (If you ever wondered why classes - * in compiler construction or language design barely mention the - * existence of context-sensitive grammars, it's because of messy - * issues like these.) + *
  • The Standalone Document Declaration VC can't be + * tested. This is for two reasons. First, this flag isn't made + * available through SAX2. Second, it also requires breaking that + * lexical layering boundary. (If you ever wondered why classes + * in compiler construction or language design barely mention the + * existence of context-sensitive grammars, it's because of messy + * issues like these.) * - *
  • The Entity Declared VC can't be tested, because it - * also requires breaking that lexical layering boundary! There's also - * another issue: the VC wording (and seemingly intent) is ambiguous. - * (This is still true in the "Second edition" XML spec.) - * Since there is a WFC of the same name, everyone's life would be - * easier if references to undeclared parsed entities were always well - * formedness errors, regardless of whether they're parameter entities - * or not. (Note that nonvalidating parsers are not required - * to report all such well formedness errors if they don't read external - * parameter entities, although currently most XML parsers read them - * in an attempt to avoid problems from inconsistent parser behavior.) + *
  • The Entity Declared VC can't be tested, because it + * also requires breaking that lexical layering boundary! There's also + * another issue: the VC wording (and seemingly intent) is ambiguous. + * (This is still true in the "Second edition" XML spec.) + * Since there is a WFC of the same name, everyone's life would be + * easier if references to undeclared parsed entities were always well + * formedness errors, regardless of whether they're parameter entities + * or not. (Note that nonvalidating parsers are not required + * to report all such well formedness errors if they don't read external + * parameter entities, although currently most XML parsers read them + * in an attempt to avoid problems from inconsistent parser behavior.) * - *
+ * * *

The second category of limitations on this validation represent * constraints associated with information that is not guaranteed to be * available (or in one case, is guaranteed not to be available, * through the SAX2 API:

    * - *
  • The Unique Element Type Declaration VC may not be - * reportable, if the underlying parser happens not to expose - * multiple declarations. (Ælfred2 reports these validity - * errors directly.)
    • + *
  • The Unique Element Type Declaration VC may not be + * reportable, if the underlying parser happens not to expose + * multiple declarations. (Ælfred2 reports these validity + * errors directly.)
    • * - *
  • Similarly, the Unique Notation Name VC, added in the - * 14-January-2000 XML spec errata to restrict typing models used by - * elements, may not be reportable. (Ælfred reports these - * validity errors directly.)
    • + *
  • Similarly, the Unique Notation Name VC, added in the + * 14-January-2000 XML spec errata to restrict typing models used by + * elements, may not be reportable. (Ælfred reports these + * validity errors directly.)
    • * - *
+ * * *

A third category relates to ease of implementation. (Think of this * as "bugs".) The most notable issue here is character handling. Rather @@ -199,15 +199,15 @@ public final class ValidationConsumer extends EventFilter { // report error if we happen to notice a non-deterministic choice? // we won't report buggy content models; just buggy instances - private static final boolean warnNonDeterministic = false; + private static final boolean warnNonDeterministic = false; // for tracking active content models - private String rootName; - private Stack contentStack = new Stack (); + private String rootName; + private Stack contentStack = new Stack (); // flags for "saved DTD" processing - private boolean disableDeclarations; - private boolean disableReset; + private boolean disableDeclarations; + private boolean disableReset; // // most VCs get tested when we see element start tags. the per-element @@ -217,25 +217,25 @@ public final class ValidationConsumer extends EventFilter // // key = element name; value = ElementInfo - private Hashtable elements = new Hashtable (); + private Hashtable elements = new Hashtable (); // some VCs relate to ID/IDREF/IDREFS attributes // key = id; value = boolean true (defd) or false (refd) - private Hashtable ids = new Hashtable (); + private Hashtable ids = new Hashtable (); // we just record declared notation and unparsed entity names. // the implementation here is simple/slow; these features // are seldom used, one hopes they'll wither away soon - private Vector notations = new Vector (5, 5); - private Vector nDeferred = new Vector (5, 5); - private Vector unparsed = new Vector (5, 5); - private Vector uDeferred = new Vector (5, 5); - - // note: DocBk 3.1.7 XML defines over 2 dozen notations, - // used when defining unparsed entities for graphics - // (and maybe in other places) + private Vector notations = new Vector (5, 5); + private Vector nDeferred = new Vector (5, 5); + private Vector unparsed = new Vector (5, 5); + private Vector uDeferred = new Vector (5, 5); + + // note: DocBk 3.1.7 XML defines over 2 dozen notations, + // used when defining unparsed entities for graphics + // (and maybe in other places) + - /** * Creates a pipeline terminus which consumes all events passed to @@ -244,11 +244,11 @@ public final class ValidationConsumer extends EventFilter * * @see #setErrorHandler */ - // constructor used by PipelineFactory - // ... and want one taking system ID of an external subset + // constructor used by PipelineFactory + // ... and want one taking system ID of an external subset public ValidationConsumer () { - this (null); + this (null); } /** @@ -257,25 +257,25 @@ public final class ValidationConsumer extends EventFilter * * @see #setErrorHandler */ - // constructor used by PipelineFactory - // ... and want one taking system ID of an external subset - // (which won't send declaration events) + // constructor used by PipelineFactory + // ... and want one taking system ID of an external subset + // (which won't send declaration events) public ValidationConsumer (EventConsumer next) { - super (next); + super (next); - setContentHandler (this); - setDTDHandler (this); - try { setProperty (DECL_HANDLER, this); } - catch (Exception e) { /* "can't happen" */ } - try { setProperty (LEXICAL_HANDLER, this); } - catch (Exception e) { /* "can't happen" */ } + setContentHandler (this); + setDTDHandler (this); + try { setProperty (DECL_HANDLER, this); } + catch (Exception e) { /* "can't happen" */ } + try { setProperty (LEXICAL_HANDLER, this); } + catch (Exception e) { /* "can't happen" */ } } - - private static final String fakeRootName - = ":Nobody:in:their_Right.Mind_would:use:this-name:1x:"; - + + private static final String fakeRootName + = ":Nobody:in:their_Right.Mind_would:use:this-name:1x:"; + /** * Creates a validation consumer which is preloaded with the DTD provided. * It does this by constructing a document with that DTD, then parsing @@ -287,182 +287,182 @@ public final class ValidationConsumer extends EventFilter * in a document being parsed. * * @param rootName The name of the required root element; if this is - * null, any root element name will be accepted. + * null, any root element name will be accepted. * @param publicId If non-null and there is a non-null systemId, this - * identifier provides an alternate access identifier for the DTD's - * external subset. + * identifier provides an alternate access identifier for the DTD's + * external subset. * @param systemId If non-null, this is a URI (normally URL) that - * may be used to access the DTD's external subset. + * may be used to access the DTD's external subset. * @param internalSubset If non-null, holds literal markup declarations - * comprising the DTD's internal subset. + * comprising the DTD's internal subset. * @param resolver If non-null, this will be provided to the parser for - * use when resolving parameter entities (including any external subset). + * use when resolving parameter entities (including any external subset). * @param resolver If non-null, this will be provided to the parser for - * use when resolving parameter entities (including any external subset). + * use when resolving parameter entities (including any external subset). * @param minimalElement If non-null, a minimal valid document. * * @exception SAXNotSupportedException If the default SAX parser does - * not support the standard lexical or declaration handlers. + * not support the standard lexical or declaration handlers. * @exception SAXParseException If the specified DTD has either - * well-formedness or validity errors + * well-formedness or validity errors * @exception IOException If the specified DTD can't be read for - * some reason + * some reason */ public ValidationConsumer ( - String rootName, - String publicId, - String systemId, - String internalSubset, - EntityResolver resolver, - String minimalDocument + String rootName, + String publicId, + String systemId, + String internalSubset, + EntityResolver resolver, + String minimalDocument ) throws SAXException, IOException { - this (null); + this (null); - disableReset = true; - if (rootName == null) - rootName = fakeRootName; + disableReset = true; + if (rootName == null) + rootName = fakeRootName; - // - // Synthesize document with that DTD; is it possible to do - // better for the declaration of the root element? - // - // NOTE: can't use SAX2 to write internal subsets. - // - StringWriter writer = new StringWriter (); + // + // Synthesize document with that DTD; is it possible to do + // better for the declaration of the root element? + // + // NOTE: can't use SAX2 to write internal subsets. + // + StringWriter writer = new StringWriter (); - writer.write (""); - } - if (internalSubset != null) - writer.write (internalSubset); - writer.write ("\n ]>"); + writer.write (""); + } + if (internalSubset != null) + writer.write (internalSubset); + writer.write ("\n ]>"); - if (minimalDocument != null) { - writer.write ("\n"); - writer.write (minimalDocument); - writer.write ("\n"); - } else { - writer.write (" <"); - writer.write (rootName); - writer.write ("/>\n"); - } - minimalDocument = writer.toString (); + if (minimalDocument != null) { + writer.write ("\n"); + writer.write (minimalDocument); + writer.write ("\n"); + } else { + writer.write (" <"); + writer.write (rootName); + writer.write ("/>\n"); + } + minimalDocument = writer.toString (); - // - // OK, load it - // - XMLReader producer; + // + // OK, load it + // + XMLReader producer; - producer = XMLReaderFactory.createXMLReader (); - bind (producer, this); + producer = XMLReaderFactory.createXMLReader (); + bind (producer, this); - if (resolver != null) - producer.setEntityResolver (resolver); + if (resolver != null) + producer.setEntityResolver (resolver); - InputSource in; - - in = new InputSource (new StringReader (minimalDocument)); - producer.parse (in); + InputSource in; - disableDeclarations = true; - if (rootName == fakeRootName) - this.rootName = null; + in = new InputSource (new StringReader (minimalDocument)); + producer.parse (in); + + disableDeclarations = true; + if (rootName == fakeRootName) + this.rootName = null; } private void resetState () { - if (!disableReset) { - rootName = null; - contentStack.removeAllElements (); - elements.clear (); - ids.clear (); + if (!disableReset) { + rootName = null; + contentStack.removeAllElements (); + elements.clear (); + ids.clear (); - notations.removeAllElements (); - nDeferred.removeAllElements (); - unparsed.removeAllElements (); - uDeferred.removeAllElements (); - } + notations.removeAllElements (); + nDeferred.removeAllElements (); + unparsed.removeAllElements (); + uDeferred.removeAllElements (); + } } private void warning (String description) throws SAXException { - ErrorHandler errHandler = getErrorHandler (); - Locator locator = getDocumentLocator (); - SAXParseException err; + ErrorHandler errHandler = getErrorHandler (); + Locator locator = getDocumentLocator (); + SAXParseException err; - if (errHandler == null) - return; + if (errHandler == null) + return; - if (locator == null) - err = new SAXParseException (description, null, null, -1, -1); - else - err = new SAXParseException (description, locator); - errHandler.warning (err); + if (locator == null) + err = new SAXParseException (description, null, null, -1, -1); + else + err = new SAXParseException (description, locator); + errHandler.warning (err); } // package private (for ChildrenRecognizer) private void error (String description) throws SAXException { - ErrorHandler errHandler = getErrorHandler (); - Locator locator = getDocumentLocator (); - SAXParseException err; + ErrorHandler errHandler = getErrorHandler (); + Locator locator = getDocumentLocator (); + SAXParseException err; - if (locator == null) - err = new SAXParseException (description, null, null, -1, -1); - else - err = new SAXParseException (description, locator); - if (errHandler != null) - errHandler.error (err); - else // else we always treat it as fatal! - throw err; + if (locator == null) + err = new SAXParseException (description, null, null, -1, -1); + else + err = new SAXParseException (description, locator); + if (errHandler != null) + errHandler.error (err); + else // else we always treat it as fatal! + throw err; } private void fatalError (String description) throws SAXException { - ErrorHandler errHandler = getErrorHandler (); - Locator locator = getDocumentLocator (); - SAXParseException err; + ErrorHandler errHandler = getErrorHandler (); + Locator locator = getDocumentLocator (); + SAXParseException err; - if (locator != null) - err = new SAXParseException (description, locator); - else - err = new SAXParseException (description, null, null, -1, -1); - if (errHandler != null) - errHandler.fatalError (err); - // we always treat this as fatal, regardless of the handler - throw err; + if (locator != null) + err = new SAXParseException (description, locator); + else + err = new SAXParseException (description, null, null, -1, -1); + if (errHandler != null) + errHandler.fatalError (err); + // we always treat this as fatal, regardless of the handler + throw err; } private static boolean isExtender (char c) { - // [88] Extender ::= ... - return c == 0x00b7 || c == 0x02d0 || c == 0x02d1 || c == 0x0387 - || c == 0x0640 || c == 0x0e46 || c == 0x0ec6 || c == 0x3005 - || (c >= 0x3031 && c <= 0x3035) - || (c >= 0x309d && c <= 0x309e) - || (c >= 0x30fc && c <= 0x30fe); + // [88] Extender ::= ... + return c == 0x00b7 || c == 0x02d0 || c == 0x02d1 || c == 0x0387 + || c == 0x0640 || c == 0x0e46 || c == 0x0ec6 || c == 0x3005 + || (c >= 0x3031 && c <= 0x3035) + || (c >= 0x309d && c <= 0x309e) + || (c >= 0x30fc && c <= 0x30fe); } @@ -470,86 +470,86 @@ public final class ValidationConsumer extends EventFilter private boolean isName (String name, String context, String id) throws SAXException { - char buf [] = name.toCharArray (); - boolean pass = true; + char buf [] = name.toCharArray (); + boolean pass = true; - if (!Character.isUnicodeIdentifierStart (buf [0]) - && ":_".indexOf (buf [0]) == -1) - pass = false; - else { - int max = buf.length; - for (int i = 1; pass && i < max; i++) { - char c = buf [i]; - if (!Character.isUnicodeIdentifierPart (c) - && ":-_.".indexOf (c) == -1 - && !isExtender (c)) - pass = false; - } - } + if (!Character.isUnicodeIdentifierStart (buf [0]) + && ":_".indexOf (buf [0]) == -1) + pass = false; + else { + int max = buf.length; + for (int i = 1; pass && i < max; i++) { + char c = buf [i]; + if (!Character.isUnicodeIdentifierPart (c) + && ":-_.".indexOf (c) == -1 + && !isExtender (c)) + pass = false; + } + } - if (!pass) - error ("In " + context + " for " + id - + ", '" + name + "' is not a name"); - return pass; // true == OK + if (!pass) + error ("In " + context + " for " + id + + ", '" + name + "' is not a name"); + return pass; // true == OK } // use augmented Unicode rules, not full XML rules private boolean isNmtoken (String nmtoken, String context, String id) throws SAXException { - char buf [] = nmtoken.toCharArray (); - boolean pass = true; - int max = buf.length; + char buf [] = nmtoken.toCharArray (); + boolean pass = true; + int max = buf.length; - // XXX make this share code with isName + // XXX make this share code with isName - for (int i = 0; pass && i < max; i++) { - char c = buf [i]; - if (!Character.isUnicodeIdentifierPart (c) - && ":-_.".indexOf (c) == -1 - && !isExtender (c)) - pass = false; - } + for (int i = 0; pass && i < max; i++) { + char c = buf [i]; + if (!Character.isUnicodeIdentifierPart (c) + && ":-_.".indexOf (c) == -1 + && !isExtender (c)) + pass = false; + } - if (!pass) - error ("In " + context + " for " + id - + ", '" + nmtoken + "' is not a name token"); - return pass; // true == OK + if (!pass) + error ("In " + context + " for " + id + + ", '" + nmtoken + "' is not a name token"); + return pass; // true == OK } private void checkEnumeration (String value, String type, String name) throws SAXException { - if (!hasMatch (value, type)) - // VC: Enumeration - error ("Value '" + value - + "' for attribute '" + name - + "' is not permitted: " + type); + if (!hasMatch (value, type)) + // VC: Enumeration + error ("Value '" + value + + "' for attribute '" + name + + "' is not permitted: " + type); } // used to test enumerated attributes and mixed content models // package private static boolean hasMatch (String value, String orList) { - int len = value.length (); - int max = orList.length () - len; + int len = value.length (); + int max = orList.length () - len; - for (int start = 0; - (start = orList.indexOf (value, start)) != -1; - start++) { - char c; + for (int start = 0; + (start = orList.indexOf (value, start)) != -1; + start++) { + char c; - if (start > max) - break; - c = orList.charAt (start - 1); - if (c != '|' && c != '('/*)*/) - continue; - c = orList.charAt (start + len); - if (c != '|' && /*(*/ c != ')') - continue; - return true; - } - return false; + if (start > max) + break; + c = orList.charAt (start - 1); + if (c != '|' && c != '('/*)*/) + continue; + c = orList.charAt (start + len); + if (c != '|' && /*(*/ c != ')') + continue; + return true; + } + return false; } /** @@ -561,11 +561,11 @@ public final class ValidationConsumer extends EventFilter public void startDTD (String name, String publicId, String systemId) throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - rootName = name; - super.startDTD (name, publicId, systemId); + rootName = name; + super.startDTD (name, publicId, systemId); } /** @@ -577,37 +577,37 @@ public final class ValidationConsumer extends EventFilter public void endDTD () throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - // this is a convenient hook for end-of-dtd checks, but we - // could also trigger it in the first startElement call. - // locator info is more appropriate here though. + // this is a convenient hook for end-of-dtd checks, but we + // could also trigger it in the first startElement call. + // locator info is more appropriate here though. - // VC: Notation Declared (NDATA can refer to them before decls, - // as can NOTATION attribute enumerations and defaults) - int length = nDeferred.size (); - for (int i = 0; i < length; i++) { - String notation = (String) nDeferred.elementAt (i); - if (!notations.contains (notation)) { - error ("A declaration referred to notation '" + notation - + "' which was never declared"); - } - } - nDeferred.removeAllElements (); + // VC: Notation Declared (NDATA can refer to them before decls, + // as can NOTATION attribute enumerations and defaults) + int length = nDeferred.size (); + for (int i = 0; i < length; i++) { + String notation = (String) nDeferred.elementAt (i); + if (!notations.contains (notation)) { + error ("A declaration referred to notation '" + notation + + "' which was never declared"); + } + } + nDeferred.removeAllElements (); - // VC: Entity Name (attribute values can refer to them - // before they're declared); VC Attribute Default Legal - length = uDeferred.size (); - for (int i = 0; i < length; i++) { - String entity = (String) uDeferred.elementAt (i); - if (!unparsed.contains (entity)) { - error ("An attribute default referred to entity '" + entity - + "' which was never declared"); - } - } - uDeferred.removeAllElements (); - super.endDTD (); + // VC: Entity Name (attribute values can refer to them + // before they're declared); VC Attribute Default Legal + length = uDeferred.size (); + for (int i = 0; i < length; i++) { + String entity = (String) uDeferred.elementAt (i); + if (!unparsed.contains (entity)) { + error ("An attribute default referred to entity '" + entity + + "' which was never declared"); + } + } + uDeferred.removeAllElements (); + super.endDTD (); } @@ -615,10 +615,10 @@ public final class ValidationConsumer extends EventFilter // all attributes except enumerations ... // "(this|or|that|...)" and "NOTATION (this|or|that|...)" static final String types [] = { - "CDATA", - "ID", "IDREF", "IDREFS", - "NMTOKEN", "NMTOKENS", - "ENTITY", "ENTITIES" + "CDATA", + "ID", "IDREF", "IDREFS", + "NMTOKEN", "NMTOKENS", + "ENTITY", "ENTITIES" }; @@ -630,172 +630,172 @@ public final class ValidationConsumer extends EventFilter * preloaded with a particular DTD. */ public void attributeDecl ( - String eName, - String aName, - String type, - String mode, - String value + String eName, + String aName, + String type, + String mode, + String value ) throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - ElementInfo info = (ElementInfo) elements.get (eName); - AttributeInfo ainfo = new AttributeInfo (); - boolean checkOne = false; - boolean interned = false; + ElementInfo info = (ElementInfo) elements.get (eName); + AttributeInfo ainfo = new AttributeInfo (); + boolean checkOne = false; + boolean interned = false; - // cheap interning of type names and #FIXED, #REQUIRED - // for faster startElement (we can use "==") - for (int i = 0; i < types.length; i++) { - if (types [i].equals (type)) { - type = types [i]; - interned = true; - break; - } - } - if ("#FIXED".equals (mode)) - mode = "#FIXED"; - else if ("#REQUIRED".equals (mode)) - mode = "#REQUIRED"; + // cheap interning of type names and #FIXED, #REQUIRED + // for faster startElement (we can use "==") + for (int i = 0; i < types.length; i++) { + if (types [i].equals (type)) { + type = types [i]; + interned = true; + break; + } + } + if ("#FIXED".equals (mode)) + mode = "#FIXED"; + else if ("#REQUIRED".equals (mode)) + mode = "#REQUIRED"; - ainfo.type = type; - ainfo.mode = mode; - ainfo.value = value; + ainfo.type = type; + ainfo.mode = mode; + ainfo.value = value; - // we might not have seen the content model yet - if (info == null) { - info = new ElementInfo (eName); - elements.put (eName, info); - } - if ("ID" == type) { - checkOne = true; - if (!("#REQUIRED" == mode || "#IMPLIED".equals (mode))) { - // VC: ID Attribute Default - error ("ID attribute '" + aName - + "' must be #IMPLIED or #REQUIRED"); - } + // we might not have seen the content model yet + if (info == null) { + info = new ElementInfo (eName); + elements.put (eName, info); + } + if ("ID" == type) { + checkOne = true; + if (!("#REQUIRED" == mode || "#IMPLIED".equals (mode))) { + // VC: ID Attribute Default + error ("ID attribute '" + aName + + "' must be #IMPLIED or #REQUIRED"); + } - } else if (!interned && type.startsWith ("NOTATION ")) { - checkOne = true; + } else if (!interned && type.startsWith ("NOTATION ")) { + checkOne = true; - // VC: Notation Attributes (notations must be declared) - StringTokenizer tokens = new StringTokenizer ( - type.substring (10, type.lastIndexOf (')')), - "|"); - while (tokens.hasMoreTokens ()) { - String token = tokens.nextToken (); - if (!notations.contains (token)) - nDeferred.addElement (token); - } - } - if (checkOne) { - for (Enumeration e = info.attributes.keys (); - e.hasMoreElements (); - /* NOP */) { - String name; - AttributeInfo ainfo2; + // VC: Notation Attributes (notations must be declared) + StringTokenizer tokens = new StringTokenizer ( + type.substring (10, type.lastIndexOf (')')), + "|"); + while (tokens.hasMoreTokens ()) { + String token = tokens.nextToken (); + if (!notations.contains (token)) + nDeferred.addElement (token); + } + } + if (checkOne) { + for (Enumeration e = info.attributes.keys (); + e.hasMoreElements (); + /* NOP */) { + String name; + AttributeInfo ainfo2; - name = (String) e.nextElement (); - ainfo2 = (AttributeInfo) info.attributes.get (name); - if (type == ainfo2.type || !interned /* NOTATION */) { - // VC: One ID per Element Type - // VC: One Notation per Element TYpe - error ("Element '" + eName - + "' already has an attribute of type " - + (interned ? "NOTATION" : type) - + " ('" + name - + "') so '" + aName - + "' is a validity error"); - } - } - } + name = (String) e.nextElement (); + ainfo2 = (AttributeInfo) info.attributes.get (name); + if (type == ainfo2.type || !interned /* NOTATION */) { + // VC: One ID per Element Type + // VC: One Notation per Element TYpe + error ("Element '" + eName + + "' already has an attribute of type " + + (interned ? "NOTATION" : type) + + " ('" + name + + "') so '" + aName + + "' is a validity error"); + } + } + } - // VC: Attribute Default Legal - if (value != null) { + // VC: Attribute Default Legal + if (value != null) { - if ("CDATA" == type) { - // event source rejected '<' + if ("CDATA" == type) { + // event source rejected '<' - } else if ("NMTOKEN" == type) { - // VC: Name Token (is a nmtoken) - isNmtoken (value, "attribute default", aName); + } else if ("NMTOKEN" == type) { + // VC: Name Token (is a nmtoken) + isNmtoken (value, "attribute default", aName); - } else if ("NMTOKENS" == type) { - // VC: Name Token (is a nmtoken; at least one value) - StringTokenizer tokens = new StringTokenizer (value); - if (!tokens.hasMoreTokens ()) - error ("Default for attribute '" + aName - + "' must have at least one name token."); - else do { - String token = tokens.nextToken (); - isNmtoken (token, "attribute default", aName); - } while (tokens.hasMoreTokens ()); + } else if ("NMTOKENS" == type) { + // VC: Name Token (is a nmtoken; at least one value) + StringTokenizer tokens = new StringTokenizer (value); + if (!tokens.hasMoreTokens ()) + error ("Default for attribute '" + aName + + "' must have at least one name token."); + else do { + String token = tokens.nextToken (); + isNmtoken (token, "attribute default", aName); + } while (tokens.hasMoreTokens ()); - } else if ("IDREF" == type || "ENTITY" == type) { - // VC: Entity Name (is a name) - // VC: IDREF (is a name) (is declared) - isName (value, "attribute default", aName); - if ("ENTITY" == type && !unparsed.contains (value)) - uDeferred.addElement (value); + } else if ("IDREF" == type || "ENTITY" == type) { + // VC: Entity Name (is a name) + // VC: IDREF (is a name) (is declared) + isName (value, "attribute default", aName); + if ("ENTITY" == type && !unparsed.contains (value)) + uDeferred.addElement (value); - } else if ("IDREFS" == type || "ENTITIES" == type) { - // VC: Entity Name (is a name; at least one value) - // VC: IDREF (is a name; at least one value) - StringTokenizer names = new StringTokenizer (value); - if (!names.hasMoreTokens ()) - error ("Default for attribute '" + aName - + "' must have at least one name."); - else do { - String name = names.nextToken (); - isName (name, "attribute default", aName); - if ("ENTITIES" == type && !unparsed.contains (name)) - uDeferred.addElement (value); - } while (names.hasMoreTokens ()); - - } else if (type.charAt (0) == '(' /*)*/ ) { - // VC: Enumeration (must match) - checkEnumeration (value, type, aName); + } else if ("IDREFS" == type || "ENTITIES" == type) { + // VC: Entity Name (is a name; at least one value) + // VC: IDREF (is a name; at least one value) + StringTokenizer names = new StringTokenizer (value); + if (!names.hasMoreTokens ()) + error ("Default for attribute '" + aName + + "' must have at least one name."); + else do { + String name = names.nextToken (); + isName (name, "attribute default", aName); + if ("ENTITIES" == type && !unparsed.contains (name)) + uDeferred.addElement (value); + } while (names.hasMoreTokens ()); - } else if (!interned && checkOne) { /* NOTATION */ - // VC: Notation attributes (must be names) - isName (value, "attribute default", aName); + } else if (type.charAt (0) == '(' /*)*/ ) { + // VC: Enumeration (must match) + checkEnumeration (value, type, aName); - // VC: Notation attributes (must be declared) - if (!notations.contains (value)) - nDeferred.addElement (value); - - // VC: Enumeration (must match) - checkEnumeration (value, type, aName); + } else if (!interned && checkOne) { /* NOTATION */ + // VC: Notation attributes (must be names) + isName (value, "attribute default", aName); - } else if ("ID" != type) - throw new RuntimeException ("illegal attribute type: " + type); - } + // VC: Notation attributes (must be declared) + if (!notations.contains (value)) + nDeferred.addElement (value); - if (info.attributes.get (aName) == null) - info.attributes.put (aName, ainfo); - /* - else - warning ("Element '" + eName - + "' already has an attribute named '" + aName + "'"); - */ + // VC: Enumeration (must match) + checkEnumeration (value, type, aName); - if ("xml:space".equals (aName)) { - if (!("(default|preserve)".equals (type) - || "(preserve|default)".equals (type) - // these next two are arguable; XHTML's DTD doesn't - // deserve errors. After all, it's not like any - // illegal _value_ could pass ... - || "(preserve)".equals (type) - || "(default)".equals (type) - )) - error ( - "xml:space attribute type must be like '(default|preserve)'" - + " not '" + type + "'" - ); + } else if ("ID" != type) + throw new RuntimeException ("illegal attribute type: " + type); + } - } - super.attributeDecl (eName, aName, type, mode, value); + if (info.attributes.get (aName) == null) + info.attributes.put (aName, ainfo); + /* + else + warning ("Element '" + eName + + "' already has an attribute named '" + aName + "'"); + */ + + if ("xml:space".equals (aName)) { + if (!("(default|preserve)".equals (type) + || "(preserve|default)".equals (type) + // these next two are arguable; XHTML's DTD doesn't + // deserve errors. After all, it's not like any + // illegal _value_ could pass ... + || "(preserve)".equals (type) + || "(default)".equals (type) + )) + error ( + "xml:space attribute type must be like '(default|preserve)'" + + " not '" + type + "'" + ); + + } + super.attributeDecl (eName, aName, type, mode, value); } /** @@ -807,29 +807,29 @@ public final class ValidationConsumer extends EventFilter public void elementDecl (String name, String model) throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - ElementInfo info = (ElementInfo) elements.get (name); + ElementInfo info = (ElementInfo) elements.get (name); - // we might have seen an attribute decl already - if (info == null) { - info = new ElementInfo (name); - elements.put (name, info); - } - if (info.model != null) { - // NOTE: not all parsers can report such duplicates. - // VC: Unique Element Type Declaration - error ("Element type '" + name - + "' was already declared."); - } else { - info.model = model; + // we might have seen an attribute decl already + if (info == null) { + info = new ElementInfo (name); + elements.put (name, info); + } + if (info.model != null) { + // NOTE: not all parsers can report such duplicates. + // VC: Unique Element Type Declaration + error ("Element type '" + name + + "' was already declared."); + } else { + info.model = model; - // VC: No Duplicate Types (in mixed content models) - if (model.charAt (1) == '#') // (#PCDATA... - info.getRecognizer (this); - } - super.elementDecl (name, model); + // VC: No Duplicate Types (in mixed content models) + if (model.charAt (1) == '#') // (#PCDATA... + info.getRecognizer (this); + } + super.elementDecl (name, model); } /** @@ -839,8 +839,8 @@ public final class ValidationConsumer extends EventFilter public void internalEntityDecl (String name, String value) throws SAXException { - if (!disableDeclarations) - super.internalEntityDecl (name, value); + if (!disableDeclarations) + super.internalEntityDecl (name, value); } /** @@ -848,11 +848,11 @@ public final class ValidationConsumer extends EventFilter * one was preloaded with a particular DTD */ public void externalEntityDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException { - if (!disableDeclarations) - super.externalEntityDecl (name, publicId, systemId); + if (!disableDeclarations) + super.externalEntityDecl (name, publicId, systemId); } @@ -865,11 +865,11 @@ public final class ValidationConsumer extends EventFilter public void notationDecl (String name, String publicId, String systemId) throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - notations.addElement (name); - super.notationDecl (name, publicId, systemId); + notations.addElement (name); + super.notationDecl (name, publicId, systemId); } /** @@ -879,22 +879,22 @@ public final class ValidationConsumer extends EventFilter * unless this one was preloaded with a particular DTD. */ public void unparsedEntityDecl ( - String name, - String publicId, - String systemId, - String notationName + String name, + String publicId, + String systemId, + String notationName ) throws SAXException { - if (disableDeclarations) - return; + if (disableDeclarations) + return; - unparsed.addElement (name); - if (!notations.contains (notationName)) - nDeferred.addElement (notationName); - super.unparsedEntityDecl (name, publicId, systemId, notationName); + unparsed.addElement (name); + if (!notations.contains (notationName)) + nDeferred.addElement (notationName); + super.unparsedEntityDecl (name, publicId, systemId, notationName); } - - + + /** * ContentHandler Ensures that state from any previous parse * has been deleted. @@ -903,14 +903,14 @@ public final class ValidationConsumer extends EventFilter public void startDocument () throws SAXException { - resetState (); - super.startDocument (); + resetState (); + super.startDocument (); } private static boolean isAsciiLetter (char c) { - return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); + return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } @@ -921,7 +921,7 @@ public final class ValidationConsumer extends EventFilter public void skippedEntity (String name) throws SAXException { - fatalError ("may not skip entities"); + fatalError ("may not skip entities"); } /* @@ -930,14 +930,14 @@ public final class ValidationConsumer extends EventFilter private String expandDefaultRefs (String s) throws SAXException { - if (s.indexOf ('&') < 0) - return s; - -// FIXME: handle &#nn; &#xnn; &name; - String message = "Can't expand refs in attribute default: " + s; - warning (message); + if (s.indexOf ('&') < 0) + return s; - return s; +// FIXME: handle &#nn; &#xnn; &name; + String message = "Can't expand refs in attribute default: " + s; + warning (message); + + return s; } /** @@ -946,248 +946,248 @@ public final class ValidationConsumer extends EventFilter * Passed to the next consumer. */ public void startElement ( - String uri, - String localName, - String qName, - Attributes atts + String uri, + String localName, + String qName, + Attributes atts ) throws SAXException { - // - // First check content model for the enclosing scope. - // - if (contentStack.isEmpty ()) { - // VC: Root Element Type - if (!qName.equals (rootName)) { - if (rootName == null) - warning ("This document has no DTD, can't be valid"); - else - error ("Root element type '" + qName - + "' was declared to be '" + rootName + "'"); - } - } else { - Recognizer state = (Recognizer) contentStack.peek (); + // + // First check content model for the enclosing scope. + // + if (contentStack.isEmpty ()) { + // VC: Root Element Type + if (!qName.equals (rootName)) { + if (rootName == null) + warning ("This document has no DTD, can't be valid"); + else + error ("Root element type '" + qName + + "' was declared to be '" + rootName + "'"); + } + } else { + Recognizer state = (Recognizer) contentStack.peek (); - if (state != null) { - Recognizer newstate = state.acceptElement (qName); + if (state != null) { + Recognizer newstate = state.acceptElement (qName); - if (newstate == null) - error ("Element type '" + qName - + "' in element '" + state.type.name - + "' violates content model " + state.type.model - ); - if (newstate != state) { - contentStack.pop (); - contentStack.push (newstate); - } - } - } + if (newstate == null) + error ("Element type '" + qName + + "' in element '" + state.type.name + + "' violates content model " + state.type.model + ); + if (newstate != state) { + contentStack.pop (); + contentStack.push (newstate); + } + } + } - // - // Then check that this element was declared, and push the - // object used to validate its content model onto our stack. - // - // This is where the recognizer gets created, if needed; if - // it's a "children" (elements) content model, an NDFA is - // created. (One recognizer is used per content type, no - // matter how complex that recognizer is.) - // - ElementInfo info; + // + // Then check that this element was declared, and push the + // object used to validate its content model onto our stack. + // + // This is where the recognizer gets created, if needed; if + // it's a "children" (elements) content model, an NDFA is + // created. (One recognizer is used per content type, no + // matter how complex that recognizer is.) + // + ElementInfo info; - info = (ElementInfo) elements.get (qName); - if (info == null || info.model == null) { - // VC: Element Valid (base clause) - error ("Element type '" + qName + "' was not declared"); - contentStack.push (null); + info = (ElementInfo) elements.get (qName); + if (info == null || info.model == null) { + // VC: Element Valid (base clause) + error ("Element type '" + qName + "' was not declared"); + contentStack.push (null); - // for less diagnostic noise, fake a declaration. - elementDecl (qName, "ANY"); - } else - contentStack.push (info.getRecognizer (this)); + // for less diagnostic noise, fake a declaration. + elementDecl (qName, "ANY"); + } else + contentStack.push (info.getRecognizer (this)); - // - // Then check each attribute present - // - int len; - String aname; - AttributeInfo ainfo; + // + // Then check each attribute present + // + int len; + String aname; + AttributeInfo ainfo; - if (atts != null) - len = atts.getLength (); - else - len = 0; - - for (int i = 0; i < len; i++) { - aname = atts.getQName (i); + if (atts != null) + len = atts.getLength (); + else + len = 0; - if (info == null - || (ainfo = (AttributeInfo) info.attributes.get (aname)) - == null) { - // VC: Attribute Value Type - error ("Attribute '" + aname - + "' was not declared for element type " + qName); - continue; - } + for (int i = 0; i < len; i++) { + aname = atts.getQName (i); - String value = atts.getValue (i); + if (info == null + || (ainfo = (AttributeInfo) info.attributes.get (aname)) + == null) { + // VC: Attribute Value Type + error ("Attribute '" + aname + + "' was not declared for element type " + qName); + continue; + } - // note that "==" for type names and "#FIXED" is correct - // (and fast) since we've interned those literals. + String value = atts.getValue (i); - if ("#FIXED" == ainfo.mode) { - String expanded = expandDefaultRefs (ainfo.value); + // note that "==" for type names and "#FIXED" is correct + // (and fast) since we've interned those literals. - // VC: Fixed Attribute Default - if (!value.equals (expanded)) { - error ("Attribute '" + aname - + "' must match " + expanded - ); - continue; - } - } + if ("#FIXED" == ainfo.mode) { + String expanded = expandDefaultRefs (ainfo.value); - if ("CDATA" == ainfo.type) - continue; - - // - // For all other attribute types, there are various - // rules to follow. - // - - if ("ID" == ainfo.type) { - // VC: ID (must be a name) - if (isName (value, "ID attribute", aname)) { - if (Boolean.TRUE == ids.get (value)) - // VC: ID (appears once) - error ("ID attribute " + aname - + " uses an ID value '" + value - + "' which was already declared."); - else - // any forward refs are no longer problems - ids.put (value, Boolean.TRUE); - } - continue; - } + // VC: Fixed Attribute Default + if (!value.equals (expanded)) { + error ("Attribute '" + aname + + "' must match " + expanded + ); + continue; + } + } - if ("IDREF" == ainfo.type) { - // VC: IDREF (value must be a name) - if (isName (value, "IDREF attribute", aname)) { - // VC: IDREF (must match some ID attribute) - if (ids.get (value) == null) - // new -- assume it's a forward ref - ids.put (value, Boolean.FALSE); - } - continue; - } + if ("CDATA" == ainfo.type) + continue; - if ("IDREFS" == ainfo.type) { - StringTokenizer tokens = new StringTokenizer (value, " "); + // + // For all other attribute types, there are various + // rules to follow. + // - if (!tokens.hasMoreTokens ()) { - // VC: IDREF (one or more values) - error ("IDREFS attribute " + aname - + " must have at least one ID ref"); - } else do { - String id = tokens.nextToken (); + if ("ID" == ainfo.type) { + // VC: ID (must be a name) + if (isName (value, "ID attribute", aname)) { + if (Boolean.TRUE == ids.get (value)) + // VC: ID (appears once) + error ("ID attribute " + aname + + " uses an ID value '" + value + + "' which was already declared."); + else + // any forward refs are no longer problems + ids.put (value, Boolean.TRUE); + } + continue; + } - // VC: IDREF (value must be a name) - if (isName (id, "IDREFS attribute", aname)) { - // VC: IDREF (must match some ID attribute) - if (ids.get (id) == null) - // new -- assume it's a forward ref - ids.put (id, Boolean.FALSE); - } - } while (tokens.hasMoreTokens ()); - continue; - } + if ("IDREF" == ainfo.type) { + // VC: IDREF (value must be a name) + if (isName (value, "IDREF attribute", aname)) { + // VC: IDREF (must match some ID attribute) + if (ids.get (value) == null) + // new -- assume it's a forward ref + ids.put (value, Boolean.FALSE); + } + continue; + } - if ("NMTOKEN" == ainfo.type) { - // VC: Name Token (is a name token) - isNmtoken (value, "NMTOKEN attribute", aname); - continue; - } + if ("IDREFS" == ainfo.type) { + StringTokenizer tokens = new StringTokenizer (value, " "); - if ("NMTOKENS" == ainfo.type) { - StringTokenizer tokens = new StringTokenizer (value, " "); + if (!tokens.hasMoreTokens ()) { + // VC: IDREF (one or more values) + error ("IDREFS attribute " + aname + + " must have at least one ID ref"); + } else do { + String id = tokens.nextToken (); - if (!tokens.hasMoreTokens ()) { - // VC: Name Token (one or more values) - error ("NMTOKENS attribute " + aname - + " must have at least one name token"); - } else do { - String token = tokens.nextToken (); + // VC: IDREF (value must be a name) + if (isName (id, "IDREFS attribute", aname)) { + // VC: IDREF (must match some ID attribute) + if (ids.get (id) == null) + // new -- assume it's a forward ref + ids.put (id, Boolean.FALSE); + } + } while (tokens.hasMoreTokens ()); + continue; + } - // VC: Name Token (is a name token) - isNmtoken (token, "NMTOKENS attribute", aname); - } while (tokens.hasMoreTokens ()); - continue; - } + if ("NMTOKEN" == ainfo.type) { + // VC: Name Token (is a name token) + isNmtoken (value, "NMTOKEN attribute", aname); + continue; + } - if ("ENTITY" == ainfo.type) { - if (!unparsed.contains (value)) - // VC: Entity Name - error ("Value of attribute '" + aname - + "' refers to unparsed entity '" + value - + "' which was not declared."); - continue; - } + if ("NMTOKENS" == ainfo.type) { + StringTokenizer tokens = new StringTokenizer (value, " "); - if ("ENTITIES" == ainfo.type) { - StringTokenizer tokens = new StringTokenizer (value, " "); + if (!tokens.hasMoreTokens ()) { + // VC: Name Token (one or more values) + error ("NMTOKENS attribute " + aname + + " must have at least one name token"); + } else do { + String token = tokens.nextToken (); - if (!tokens.hasMoreTokens ()) { - // VC: Entity Name (one or more values) - error ("ENTITIES attribute " + aname - + " must have at least one name token"); - } else do { - String entity = tokens.nextToken (); + // VC: Name Token (is a name token) + isNmtoken (token, "NMTOKENS attribute", aname); + } while (tokens.hasMoreTokens ()); + continue; + } - if (!unparsed.contains (entity)) - // VC: Entity Name - error ("Value of attribute '" + aname - + "' refers to unparsed entity '" + entity - + "' which was not declared."); - } while (tokens.hasMoreTokens ()); - continue; - } + if ("ENTITY" == ainfo.type) { + if (!unparsed.contains (value)) + // VC: Entity Name + error ("Value of attribute '" + aname + + "' refers to unparsed entity '" + value + + "' which was not declared."); + continue; + } - // - // check for enumerations last; more expensive - // - if (ainfo.type.charAt (0) == '(' /*)*/ - || ainfo.type.startsWith ("NOTATION ") - ) { - // VC: Enumeration (value must be defined) - checkEnumeration (value, ainfo.type, aname); - continue; - } - } + if ("ENTITIES" == ainfo.type) { + StringTokenizer tokens = new StringTokenizer (value, " "); - // - // Last, check that all #REQUIRED attributes were provided - // - if (info != null) { - Hashtable table = info.attributes; + if (!tokens.hasMoreTokens ()) { + // VC: Entity Name (one or more values) + error ("ENTITIES attribute " + aname + + " must have at least one name token"); + } else do { + String entity = tokens.nextToken (); - if (table.size () != 0) { - Enumeration e = table.keys (); + if (!unparsed.contains (entity)) + // VC: Entity Name + error ("Value of attribute '" + aname + + "' refers to unparsed entity '" + entity + + "' which was not declared."); + } while (tokens.hasMoreTokens ()); + continue; + } - // XXX table.keys uses the heap, bleech -- slows things + // + // check for enumerations last; more expensive + // + if (ainfo.type.charAt (0) == '(' /*)*/ + || ainfo.type.startsWith ("NOTATION ") + ) { + // VC: Enumeration (value must be defined) + checkEnumeration (value, ainfo.type, aname); + continue; + } + } - while (e.hasMoreElements ()) { - aname = (String) e.nextElement (); - ainfo = (AttributeInfo) table.get (aname); + // + // Last, check that all #REQUIRED attributes were provided + // + if (info != null) { + Hashtable table = info.attributes; - // "#REQUIRED" mode was interned in attributeDecl - if ("#REQUIRED" == ainfo.mode - && atts.getValue (aname) == null) { - // VC: Required Attribute - error ("Attribute '" + aname + "' must be specified " - + "for element type " + qName); - } - } - } - } - super.startElement (uri, localName, qName, atts); + if (table.size () != 0) { + Enumeration e = table.keys (); + + // XXX table.keys uses the heap, bleech -- slows things + + while (e.hasMoreElements ()) { + aname = (String) e.nextElement (); + ainfo = (AttributeInfo) table.get (aname); + + // "#REQUIRED" mode was interned in attributeDecl + if ("#REQUIRED" == ainfo.mode + && atts.getValue (aname) == null) { + // VC: Required Attribute + error ("Attribute '" + aname + "' must be specified " + + "for element type " + qName); + } + } + } + } + super.startElement (uri, localName, qName, atts); } /** @@ -1198,25 +1198,25 @@ public final class ValidationConsumer extends EventFilter public void characters (char ch [], int start, int length) throws SAXException { - Recognizer state; + Recognizer state; - if (contentStack.empty ()) - state = null; - else - state = (Recognizer) contentStack.peek (); + if (contentStack.empty ()) + state = null; + else + state = (Recognizer) contentStack.peek (); - // NOTE: if this ever supports with SAX parsers that don't - // report ignorable whitespace as such (only XP?), this class - // needs to morph it into ignorableWhitespace() as needed ... + // NOTE: if this ever supports with SAX parsers that don't + // report ignorable whitespace as such (only XP?), this class + // needs to morph it into ignorableWhitespace() as needed ... - if (state != null && !state.acceptCharacters ()) - // VC: Element Valid (clauses three, four -- see recognizer) - error ("Character content not allowed in element " - + state.type.name); - - super.characters (ch, start, length); + if (state != null && !state.acceptCharacters ()) + // VC: Element Valid (clauses three, four -- see recognizer) + error ("Character content not allowed in element " + + state.type.name); + + super.characters (ch, start, length); } - + /** * ContentHandler Reports a validity error if the element's content @@ -1227,95 +1227,95 @@ public final class ValidationConsumer extends EventFilter public void endElement (String uri, String localName, String qName) throws SAXException { - try { - Recognizer state = (Recognizer) contentStack.pop (); + try { + Recognizer state = (Recognizer) contentStack.pop (); - if (state != null && !state.completed ()) - // VC: Element valid (clauses two, three, four; see Recognizer) - error ("Premature end for element '" - + state.type.name - + "', content model " - + state.type.model); - - // could insist on match of start element, but that's - // something the input stream must to guarantee. + if (state != null && !state.completed ()) + // VC: Element valid (clauses two, three, four; see Recognizer) + error ("Premature end for element '" + + state.type.name + + "', content model " + + state.type.model); - } catch (EmptyStackException e) { - fatalError ("endElement without startElement: " + qName - + ((uri == null) - ? "" - : ( " { '" + uri + "', " + localName + " }"))); - } - super.endElement (uri, localName, qName); + // could insist on match of start element, but that's + // something the input stream must to guarantee. + + } catch (EmptyStackException e) { + fatalError ("endElement without startElement: " + qName + + ((uri == null) + ? "" + : ( " { '" + uri + "', " + localName + " }"))); + } + super.endElement (uri, localName, qName); } /** * ContentHandler Checks whether all ID values that were - * referenced have been declared, and releases all resources. + * referenced have been declared, and releases all resources. * Passed to the next consumer. - * + * * @see #setDocumentLocator */ public void endDocument () throws SAXException { - for (Enumeration idNames = ids.keys (); - idNames.hasMoreElements (); - /* NOP */) { - String id = (String) idNames.nextElement (); - - if (Boolean.FALSE == ids.get (id)) { - // VC: IDREF (must match ID) - error ("Undeclared ID value '" + id - + "' was referred to by an IDREF/IDREFS attribute"); - } - } + for (Enumeration idNames = ids.keys (); + idNames.hasMoreElements (); + /* NOP */) { + String id = (String) idNames.nextElement (); - resetState (); - super.endDocument (); + if (Boolean.FALSE == ids.get (id)) { + // VC: IDREF (must match ID) + error ("Undeclared ID value '" + id + + "' was referred to by an IDREF/IDREFS attribute"); + } + } + + resetState (); + super.endDocument (); } /** Holds per-element declarations */ static private final class ElementInfo { - String name; - String model; + String name; + String model; - // key = attribute name; value = AttributeInfo - Hashtable attributes = new Hashtable (11); + // key = attribute name; value = AttributeInfo + Hashtable attributes = new Hashtable (11); - ElementInfo (String n) { name = n; } + ElementInfo (String n) { name = n; } - private Recognizer recognizer; + private Recognizer recognizer; - // for validating content models: one per type, shared, - // and constructed only on demand ... so unused elements do - // not need to consume resources. - Recognizer getRecognizer (ValidationConsumer consumer) - throws SAXException - { - if (recognizer == null) { - if ("ANY".equals (model)) - recognizer = ANY; - else if ("EMPTY".equals (model)) - recognizer = new EmptyRecognizer (this); - else if ('#' == model.charAt (1)) - // n.b. this constructor does a validity check - recognizer = new MixedRecognizer (this, consumer); - else - recognizer = new ChildrenRecognizer (this, consumer); - } - return recognizer; - } + // for validating content models: one per type, shared, + // and constructed only on demand ... so unused elements do + // not need to consume resources. + Recognizer getRecognizer (ValidationConsumer consumer) + throws SAXException + { + if (recognizer == null) { + if ("ANY".equals (model)) + recognizer = ANY; + else if ("EMPTY".equals (model)) + recognizer = new EmptyRecognizer (this); + else if ('#' == model.charAt (1)) + // n.b. this constructor does a validity check + recognizer = new MixedRecognizer (this, consumer); + else + recognizer = new ChildrenRecognizer (this, consumer); + } + return recognizer; + } } /** Holds per-attribute declarations */ static private final class AttributeInfo { - String type; - String mode; // #REQUIRED, etc (or null) - String value; // or null + String type; + String mode; // #REQUIRED, etc (or null) + String value; // or null } @@ -1323,120 +1323,120 @@ public final class ValidationConsumer extends EventFilter // Content model validation // - static private final Recognizer ANY = new Recognizer (null); + static private final Recognizer ANY = new Recognizer (null); // Base class defines the calls used to validate content, // and supports the "ANY" content model static private class Recognizer { - final ElementInfo type; + final ElementInfo type; - Recognizer (ElementInfo t) { type = t; } + Recognizer (ElementInfo t) { type = t; } - // return true iff character data is legal here - boolean acceptCharacters () - throws SAXException - // VC: Element Valid (third and fourth clauses) - { return true; } + // return true iff character data is legal here + boolean acceptCharacters () + throws SAXException + // VC: Element Valid (third and fourth clauses) + { return true; } - // null return = failure - // otherwise, next state (like an FSM) - // prerequisite: tested that name was declared - Recognizer acceptElement (String name) - throws SAXException - // VC: Element Valid (fourth clause) - { return this; } + // null return = failure + // otherwise, next state (like an FSM) + // prerequisite: tested that name was declared + Recognizer acceptElement (String name) + throws SAXException + // VC: Element Valid (fourth clause) + { return this; } - // return true iff model is completed, can finish - boolean completed () - throws SAXException - // VC: Element Valid (fourth clause) - { return true; } - - public String toString () - // n.b. "children" is the interesting case! - { return (type == null) ? "ANY" : type.model; } + // return true iff model is completed, can finish + boolean completed () + throws SAXException + // VC: Element Valid (fourth clause) + { return true; } + + public String toString () + // n.b. "children" is the interesting case! + { return (type == null) ? "ANY" : type.model; } } // "EMPTY" content model -- no characters or elements private static final class EmptyRecognizer extends Recognizer { - public EmptyRecognizer (ElementInfo type) - { super (type); } + public EmptyRecognizer (ElementInfo type) + { super (type); } - // VC: Element Valid (first clause) - boolean acceptCharacters () - { return false; } + // VC: Element Valid (first clause) + boolean acceptCharacters () + { return false; } - // VC: Element Valid (first clause) - Recognizer acceptElement (String name) - { return null; } + // VC: Element Valid (first clause) + Recognizer acceptElement (String name) + { return null; } } // "Mixed" content model -- ANY, but restricts elements private static final class MixedRecognizer extends Recognizer { - private String permitted []; + private String permitted []; - // N.B. constructor tests for duplicated element names (VC) - public MixedRecognizer (ElementInfo t, ValidationConsumer v) - throws SAXException - { - super (t); + // N.B. constructor tests for duplicated element names (VC) + public MixedRecognizer (ElementInfo t, ValidationConsumer v) + throws SAXException + { + super (t); - // (#PCDATA...)* or (#PCDATA) ==> ... or empty - // with the "..." being "|elname|..." - StringTokenizer tokens = new StringTokenizer ( - t.model.substring (8, t.model.lastIndexOf (')')), - "|"); - Vector vec = new Vector (); + // (#PCDATA...)* or (#PCDATA) ==> ... or empty + // with the "..." being "|elname|..." + StringTokenizer tokens = new StringTokenizer ( + t.model.substring (8, t.model.lastIndexOf (')')), + "|"); + Vector vec = new Vector (); - while (tokens.hasMoreTokens ()) { - String token = tokens.nextToken (); + while (tokens.hasMoreTokens ()) { + String token = tokens.nextToken (); - if (vec.contains (token)) - v.error ("element " + token - + " is repeated in mixed content model: " - + t.model); - else - vec.addElement (token.intern ()); - } - permitted = new String [vec.size ()]; - for (int i = 0; i < permitted.length; i++) - permitted [i] = (String) vec.elementAt (i); - - // in one large machine-derived DTD sample, most of about - // 250 mixed content models were empty, and 25 had ten or - // more entries. 2 had over a hundred elements. Linear - // search isn't obviously wrong. - } + if (vec.contains (token)) + v.error ("element " + token + + " is repeated in mixed content model: " + + t.model); + else + vec.addElement (token.intern ()); + } + permitted = new String [vec.size ()]; + for (int i = 0; i < permitted.length; i++) + permitted [i] = (String) vec.elementAt (i); - // VC: Element Valid (third clause) - Recognizer acceptElement (String name) - { - int length = permitted.length; + // in one large machine-derived DTD sample, most of about + // 250 mixed content models were empty, and 25 had ten or + // more entries. 2 had over a hundred elements. Linear + // search isn't obviously wrong. + } - // first pass -- optimistic w.r.t. event source interning - // (and document validity) - for (int i = 0; i < length; i++) - if (permitted [i] == name) - return this; - // second pass -- pessimistic w.r.t. event source interning - for (int i = 0; i < length; i++) - if (permitted [i].equals (name)) - return this; - return null; - } + // VC: Element Valid (third clause) + Recognizer acceptElement (String name) + { + int length = permitted.length; + + // first pass -- optimistic w.r.t. event source interning + // (and document validity) + for (int i = 0; i < length; i++) + if (permitted [i] == name) + return this; + // second pass -- pessimistic w.r.t. event source interning + for (int i = 0; i < length; i++) + if (permitted [i].equals (name)) + return this; + return null; + } } // recognizer loop flags, see later - private static final int F_LOOPHEAD = 0x01; - private static final int F_LOOPNEXT = 0x02; + private static final int F_LOOPHEAD = 0x01; + private static final int F_LOOPNEXT = 0x02; // for debugging -- used to label/count nodes in toString() - private static int nodeCount; + private static int nodeCount; /** * "Children" content model -- these are nodes in NDFA state graphs. @@ -1463,466 +1463,466 @@ public final class ValidationConsumer extends EventFilter * graph to have one exit node (or more EMPTY nodes). */ private static final class ChildrenRecognizer extends Recognizer - implements Cloneable + implements Cloneable { - // for reporting non-deterministic content models - // ... a waste of space if we're not reporting those! - // ... along with the 'model' member (in base class) - private ValidationConsumer consumer; + // for reporting non-deterministic content models + // ... a waste of space if we're not reporting those! + // ... along with the 'model' member (in base class) + private ValidationConsumer consumer; - // for CHOICE nodes -- each component is an arc that - // accepts a different NAME (or is EMPTY indicating - // NDFA termination). - private Recognizer components []; + // for CHOICE nodes -- each component is an arc that + // accepts a different NAME (or is EMPTY indicating + // NDFA termination). + private Recognizer components []; - // for NAME/SEQUENCE nodes -- accepts that NAME and - // then goes to the next node (CHOICE, NAME, EMPTY). - private String name; - private Recognizer next; + // for NAME/SEQUENCE nodes -- accepts that NAME and + // then goes to the next node (CHOICE, NAME, EMPTY). + private String name; + private Recognizer next; - // loops always point back to a CHOICE node. we mark such choice - // nodes (F_LOOPHEAD) for diagnostics and faster deep cloning. - // We also mark nodes before back pointers (F_LOOPNEXT), to ensure - // termination when we patch sequences and loops. - private int flags; + // loops always point back to a CHOICE node. we mark such choice + // nodes (F_LOOPHEAD) for diagnostics and faster deep cloning. + // We also mark nodes before back pointers (F_LOOPNEXT), to ensure + // termination when we patch sequences and loops. + private int flags; - // prevent a needless indirection between 'this' and 'node' - private void copyIn (ChildrenRecognizer node) - { - // model & consumer are already set - components = node.components; - name = node.name; - next = node.next; - flags = node.flags; - } + // prevent a needless indirection between 'this' and 'node' + private void copyIn (ChildrenRecognizer node) + { + // model & consumer are already set + components = node.components; + name = node.name; + next = node.next; + flags = node.flags; + } - // used to construct top level "children" content models, - public ChildrenRecognizer (ElementInfo type, ValidationConsumer vc) - { - this (vc, type); - populate (type.model.toCharArray (), 0); - patchNext (new EmptyRecognizer (type), null); - } + // used to construct top level "children" content models, + public ChildrenRecognizer (ElementInfo type, ValidationConsumer vc) + { + this (vc, type); + populate (type.model.toCharArray (), 0); + patchNext (new EmptyRecognizer (type), null); + } - // used internally; populating is separate - private ChildrenRecognizer (ValidationConsumer vc, ElementInfo type) - { - super (type); - consumer = vc; - } + // used internally; populating is separate + private ChildrenRecognizer (ValidationConsumer vc, ElementInfo type) + { + super (type); + consumer = vc; + } - // - // When rewriting some graph nodes we need deep clones in one case; - // mostly shallow clones (what the JVM handles for us) are fine. - // - private ChildrenRecognizer shallowClone () - { - try { - return (ChildrenRecognizer) clone (); - } catch (CloneNotSupportedException e) { - throw new Error ("clone"); - } - } + // + // When rewriting some graph nodes we need deep clones in one case; + // mostly shallow clones (what the JVM handles for us) are fine. + // + private ChildrenRecognizer shallowClone () + { + try { + return (ChildrenRecognizer) clone (); + } catch (CloneNotSupportedException e) { + throw new Error ("clone"); + } + } - private ChildrenRecognizer deepClone () - { - return deepClone (new Hashtable (37)); - } + private ChildrenRecognizer deepClone () + { + return deepClone (new Hashtable (37)); + } - private ChildrenRecognizer deepClone (Hashtable table) - { - ChildrenRecognizer retval; + private ChildrenRecognizer deepClone (Hashtable table) + { + ChildrenRecognizer retval; - if ((flags & F_LOOPHEAD) != 0) { - retval = (ChildrenRecognizer) table.get (this); - if (retval != null) - return this; + if ((flags & F_LOOPHEAD) != 0) { + retval = (ChildrenRecognizer) table.get (this); + if (retval != null) + return this; - retval = shallowClone (); - table.put (this, retval); - } else - retval = shallowClone (); + retval = shallowClone (); + table.put (this, retval); + } else + retval = shallowClone (); - if (next != null) { - if (next instanceof ChildrenRecognizer) - retval.next = ((ChildrenRecognizer)next) - .deepClone (table); - else if (!(next instanceof EmptyRecognizer)) - throw new RuntimeException ("deepClone"); - } + if (next != null) { + if (next instanceof ChildrenRecognizer) + retval.next = ((ChildrenRecognizer)next) + .deepClone (table); + else if (!(next instanceof EmptyRecognizer)) + throw new RuntimeException ("deepClone"); + } - if (components != null) { - retval.components = new Recognizer [components.length]; - for (int i = 0; i < components.length; i++) { - Recognizer temp = components [i]; + if (components != null) { + retval.components = new Recognizer [components.length]; + for (int i = 0; i < components.length; i++) { + Recognizer temp = components [i]; - if (temp == null) - retval.components [i] = null; - else if (temp instanceof ChildrenRecognizer) - retval.components [i] = ((ChildrenRecognizer)temp) - .deepClone (table); - else if (!(temp instanceof EmptyRecognizer)) - throw new RuntimeException ("deepClone"); - } - } + if (temp == null) + retval.components [i] = null; + else if (temp instanceof ChildrenRecognizer) + retval.components [i] = ((ChildrenRecognizer)temp) + .deepClone (table); + else if (!(temp instanceof EmptyRecognizer)) + throw new RuntimeException ("deepClone"); + } + } - return retval; - } + return retval; + } - // connect subgraphs, first to next (sequencing) - private void patchNext (Recognizer theNext, Hashtable table) - { - // backpointers must not be repatched or followed - if ((flags & F_LOOPNEXT) != 0) - return; + // connect subgraphs, first to next (sequencing) + private void patchNext (Recognizer theNext, Hashtable table) + { + // backpointers must not be repatched or followed + if ((flags & F_LOOPNEXT) != 0) + return; - // XXX this table "shouldn't" be needed, right? - // but some choice nodes looped if it isn't there. - if (table != null && table.get (this) != null) - return; - if (table == null) - table = new Hashtable (); + // XXX this table "shouldn't" be needed, right? + // but some choice nodes looped if it isn't there. + if (table != null && table.get (this) != null) + return; + if (table == null) + table = new Hashtable (); - // NAME/SEQUENCE - if (name != null) { - if (next == null) - next = theNext; - else if (next instanceof ChildrenRecognizer) { - ((ChildrenRecognizer)next).patchNext (theNext, table); - } else if (!(next instanceof EmptyRecognizer)) - throw new RuntimeException ("patchNext"); - return; - } + // NAME/SEQUENCE + if (name != null) { + if (next == null) + next = theNext; + else if (next instanceof ChildrenRecognizer) { + ((ChildrenRecognizer)next).patchNext (theNext, table); + } else if (!(next instanceof EmptyRecognizer)) + throw new RuntimeException ("patchNext"); + return; + } - // CHOICE - for (int i = 0; i < components.length; i++) { - if (components [i] == null) - components [i] = theNext; - else if (components [i] instanceof ChildrenRecognizer) { - ((ChildrenRecognizer)components [i]) - .patchNext (theNext, table); - } else if (!(components [i] instanceof EmptyRecognizer)) - throw new RuntimeException ("patchNext"); - } + // CHOICE + for (int i = 0; i < components.length; i++) { + if (components [i] == null) + components [i] = theNext; + else if (components [i] instanceof ChildrenRecognizer) { + ((ChildrenRecognizer)components [i]) + .patchNext (theNext, table); + } else if (!(components [i] instanceof EmptyRecognizer)) + throw new RuntimeException ("patchNext"); + } - if (table != null && (flags & F_LOOPHEAD) != 0) - table.put (this, this); - } + if (table != null && (flags & F_LOOPHEAD) != 0) + table.put (this, this); + } - /** - * Parses a 'children' spec (or recursively 'cp') and makes this - * become a regular graph node. - * - * @return index after this particle - */ - private int populate (char parseBuf [], int startPos) - { - int nextPos = startPos + 1; - char c; + /** + * Parses a 'children' spec (or recursively 'cp') and makes this + * become a regular graph node. + * + * @return index after this particle + */ + private int populate (char parseBuf [], int startPos) + { + int nextPos = startPos + 1; + char c; - if (nextPos < 0 || nextPos >= parseBuf.length) - throw new IndexOutOfBoundsException (); + if (nextPos < 0 || nextPos >= parseBuf.length) + throw new IndexOutOfBoundsException (); - // Grammar of the string is from the XML spec, but - // with whitespace removed by the SAX parser. + // Grammar of the string is from the XML spec, but + // with whitespace removed by the SAX parser. - // children ::= (choice | seq) ('?' | '*' | '+')? - // cp ::= (Name | choice | seq) ('?' | '*' | '+')? - // choice ::= '(' cp ('|' choice)* ')' - // seq ::= '(' cp (',' choice)* ')' + // children ::= (choice | seq) ('?' | '*' | '+')? + // cp ::= (Name | choice | seq) ('?' | '*' | '+')? + // choice ::= '(' cp ('|' choice)* ')' + // seq ::= '(' cp (',' choice)* ')' - // interior nodes only - // cp ::= name ... - if (parseBuf [startPos] != '('/*)*/) { - boolean done = false; - do { - switch (c = parseBuf [nextPos]) { - case '?': case '*': case '+': - case '|': case ',': - case /*(*/ ')': - done = true; - continue; - default: - nextPos++; - continue; - } - } while (!done); - name = new String (parseBuf, startPos, nextPos - startPos); + // interior nodes only + // cp ::= name ... + if (parseBuf [startPos] != '('/*)*/) { + boolean done = false; + do { + switch (c = parseBuf [nextPos]) { + case '?': case '*': case '+': + case '|': case ',': + case /*(*/ ')': + done = true; + continue; + default: + nextPos++; + continue; + } + } while (!done); + name = new String (parseBuf, startPos, nextPos - startPos); - // interior OR toplevel nodes - // cp ::= choice .. - // cp ::= seq .. - } else { - // collect everything as a separate list, and merge it - // into "this" later if we can (SEQUENCE or singleton) - ChildrenRecognizer first; - - first = new ChildrenRecognizer (consumer, type); - nextPos = first.populate (parseBuf, nextPos); - c = parseBuf [nextPos++]; + // interior OR toplevel nodes + // cp ::= choice .. + // cp ::= seq .. + } else { + // collect everything as a separate list, and merge it + // into "this" later if we can (SEQUENCE or singleton) + ChildrenRecognizer first; - if (c == ',' || c == '|') { - ChildrenRecognizer current = first; - char separator = c; - Vector v = null; + first = new ChildrenRecognizer (consumer, type); + nextPos = first.populate (parseBuf, nextPos); + c = parseBuf [nextPos++]; - if (separator == '|') { - v = new Vector (); - v.addElement (first); - } + if (c == ',' || c == '|') { + ChildrenRecognizer current = first; + char separator = c; + Vector v = null; - do { - ChildrenRecognizer link; + if (separator == '|') { + v = new Vector (); + v.addElement (first); + } - link = new ChildrenRecognizer (consumer, type); - nextPos = link.populate (parseBuf, nextPos); + do { + ChildrenRecognizer link; - if (separator == ',') { - current.patchNext (link, null); - current = link; - } else - v.addElement (link); + link = new ChildrenRecognizer (consumer, type); + nextPos = link.populate (parseBuf, nextPos); - c = parseBuf [nextPos++]; - } while (c == separator); + if (separator == ',') { + current.patchNext (link, null); + current = link; + } else + v.addElement (link); - // choice ... collect everything into one array. - if (separator == '|') { - // assert v.size() > 1 - components = new Recognizer [v.size ()]; - for (int i = 0; i < components.length; i++) { - components [i] = (Recognizer) - v.elementAt (i); - } - // assert flags == 0 + c = parseBuf [nextPos++]; + } while (c == separator); - // sequence ... merge into "this" to be smaller. - } else - copyIn (first); + // choice ... collect everything into one array. + if (separator == '|') { + // assert v.size() > 1 + components = new Recognizer [v.size ()]; + for (int i = 0; i < components.length; i++) { + components [i] = (Recognizer) + v.elementAt (i); + } + // assert flags == 0 - // treat singletons like one-node sequences. - } else - copyIn (first); + // sequence ... merge into "this" to be smaller. + } else + copyIn (first); - if (c != /*(*/ ')') - throw new RuntimeException ("corrupt content model"); - } + // treat singletons like one-node sequences. + } else + copyIn (first); - // - // Arity is optional, and the root of all fun. We keep the - // FSM state graph simple by only having NAME/SEQUENCE and - // CHOICE nodes (or EMPTY to terminate a model), easily - // evaluated. So we rewrite each node that has arity, using - // those primitives. We create loops here, if needed. - // - if (nextPos < parseBuf.length) { - c = parseBuf [nextPos]; - if (c == '?' || c == '*' || c == '+') { - nextPos++; + if (c != /*(*/ ')') + throw new RuntimeException ("corrupt content model"); + } - // Rewrite 'zero-or-one' "?" arity to a CHOICE: - // - SEQUENCE (clone, what's next) - // - or, what's next - // Size cost: N --> N + 1 - if (c == '?') { - Recognizer once = shallowClone (); + // + // Arity is optional, and the root of all fun. We keep the + // FSM state graph simple by only having NAME/SEQUENCE and + // CHOICE nodes (or EMPTY to terminate a model), easily + // evaluated. So we rewrite each node that has arity, using + // those primitives. We create loops here, if needed. + // + if (nextPos < parseBuf.length) { + c = parseBuf [nextPos]; + if (c == '?' || c == '*' || c == '+') { + nextPos++; - components = new Recognizer [2]; - components [0] = once; - // components [1] initted to null - name = null; - next = null; - flags = 0; + // Rewrite 'zero-or-one' "?" arity to a CHOICE: + // - SEQUENCE (clone, what's next) + // - or, what's next + // Size cost: N --> N + 1 + if (c == '?') { + Recognizer once = shallowClone (); - - // Rewrite 'zero-or-more' "*" arity to a CHOICE. - // - LOOP (clone, back to this CHOICE) - // - or, what's next - // Size cost: N --> N + 1 - } else if (c == '*') { - ChildrenRecognizer loop = shallowClone (); - - loop.patchNext (this, null); - loop.flags |= F_LOOPNEXT; - flags = F_LOOPHEAD; - - components = new Recognizer [2]; - components [0] = loop; - // components [1] initted to null - name = null; - next = null; + components = new Recognizer [2]; + components [0] = once; + // components [1] initted to null + name = null; + next = null; + flags = 0; - // Rewrite 'one-or-more' "+" arity to a SEQUENCE. - // Basically (a)+ --> ((a),(a)*). - // - this - // - CHOICE - // * LOOP (clone, back to the CHOICE) - // * or, whatever's next - // Size cost: N --> 2N + 1 - } else if (c == '+') { - ChildrenRecognizer loop = deepClone (); - ChildrenRecognizer choice; + // Rewrite 'zero-or-more' "*" arity to a CHOICE. + // - LOOP (clone, back to this CHOICE) + // - or, what's next + // Size cost: N --> N + 1 + } else if (c == '*') { + ChildrenRecognizer loop = shallowClone (); - choice = new ChildrenRecognizer (consumer, type); - loop.patchNext (choice, null); - loop.flags |= F_LOOPNEXT; - choice.flags = F_LOOPHEAD; + loop.patchNext (this, null); + loop.flags |= F_LOOPNEXT; + flags = F_LOOPHEAD; - choice.components = new Recognizer [2]; - choice.components [0] = loop; - // choice.components [1] initted to null - // choice.name, choice.next initted to null + components = new Recognizer [2]; + components [0] = loop; + // components [1] initted to null + name = null; + next = null; - patchNext (choice, null); - } - } - } - return nextPos; - } + // Rewrite 'one-or-more' "+" arity to a SEQUENCE. + // Basically (a)+ --> ((a),(a)*). + // - this + // - CHOICE + // * LOOP (clone, back to the CHOICE) + // * or, whatever's next + // Size cost: N --> 2N + 1 + } else if (c == '+') { + ChildrenRecognizer loop = deepClone (); + ChildrenRecognizer choice; - // VC: Element Valid (second clause) - boolean acceptCharacters () - { return false; } + choice = new ChildrenRecognizer (consumer, type); + loop.patchNext (choice, null); + loop.flags |= F_LOOPNEXT; + choice.flags = F_LOOPHEAD; - // VC: Element Valid (second clause) - Recognizer acceptElement (String type) - throws SAXException - { - // NAME/SEQUENCE - if (name != null) { - if (name.equals (type)) - return next; - return null; - } + choice.components = new Recognizer [2]; + choice.components [0] = loop; + // choice.components [1] initted to null + // choice.name, choice.next initted to null - // CHOICE ... optionally reporting nondeterminism we - // run across. we won't check out every transition - // for nondeterminism; only the ones we follow. - Recognizer retval = null; + patchNext (choice, null); + } + } + } - for (int i = 0; i < components.length; i++) { - Recognizer temp = components [i].acceptElement (type); + return nextPos; + } - if (temp == null) - continue; - else if (!warnNonDeterministic) - return temp; - else if (retval == null) - retval = temp; - else if (retval != temp) - consumer.error ("Content model " + this.type.model - + " is non-deterministic for " + type); - } - return retval; - } + // VC: Element Valid (second clause) + boolean acceptCharacters () + { return false; } - // VC: Element Valid (second clause) - boolean completed () - throws SAXException - { - // expecting a specific element - if (name != null) - return false; - - // choice, some sequences - for (int i = 0; i < components.length; i++) { - if (components [i].completed ()) - return true; - } + // VC: Element Valid (second clause) + Recognizer acceptElement (String type) + throws SAXException + { + // NAME/SEQUENCE + if (name != null) { + if (name.equals (type)) + return next; + return null; + } - return false; - } + // CHOICE ... optionally reporting nondeterminism we + // run across. we won't check out every transition + // for nondeterminism; only the ones we follow. + Recognizer retval = null; + + for (int i = 0; i < components.length; i++) { + Recognizer temp = components [i].acceptElement (type); + + if (temp == null) + continue; + else if (!warnNonDeterministic) + return temp; + else if (retval == null) + retval = temp; + else if (retval != temp) + consumer.error ("Content model " + this.type.model + + " is non-deterministic for " + type); + } + return retval; + } + + // VC: Element Valid (second clause) + boolean completed () + throws SAXException + { + // expecting a specific element + if (name != null) + return false; + + // choice, some sequences + for (int i = 0; i < components.length; i++) { + if (components [i].completed ()) + return true; + } + + return false; + } /** / - // FOR DEBUGGING ... flattens the graph for printing. + // FOR DEBUGGING ... flattens the graph for printing. - public String toString () - { - StringBuffer buf = new StringBuffer (); + public String toString () + { + StringBuffer buf = new StringBuffer (); - // only one set of loop labels can be generated - // at a time... - synchronized (ANY) { - nodeCount = 0; + // only one set of loop labels can be generated + // at a time... + synchronized (ANY) { + nodeCount = 0; - toString (buf, new Hashtable ()); - return buf.toString (); - } - } + toString (buf, new Hashtable ()); + return buf.toString (); + } + } - private void toString (StringBuffer buf, Hashtable table) - { - // When we visit a node, label and count it. - // Nodes are never visited/counted more than once. - // For small models labels waste space, but if arity - // mappings were used the savings are substantial. - // (Plus, the output can be more readily understood.) - String temp = (String) table.get (this); + private void toString (StringBuffer buf, Hashtable table) + { + // When we visit a node, label and count it. + // Nodes are never visited/counted more than once. + // For small models labels waste space, but if arity + // mappings were used the savings are substantial. + // (Plus, the output can be more readily understood.) + String temp = (String) table.get (this); - if (temp != null) { - buf.append ('{'); - buf.append (temp); - buf.append ('}'); - return; - } else { - StringBuffer scratch = new StringBuffer (15); + if (temp != null) { + buf.append ('{'); + buf.append (temp); + buf.append ('}'); + return; + } else { + StringBuffer scratch = new StringBuffer (15); - if ((flags & F_LOOPHEAD) != 0) - scratch.append ("loop"); - else - scratch.append ("node"); - scratch.append ('-'); - scratch.append (++nodeCount); - temp = scratch.toString (); + if ((flags & F_LOOPHEAD) != 0) + scratch.append ("loop"); + else + scratch.append ("node"); + scratch.append ('-'); + scratch.append (++nodeCount); + temp = scratch.toString (); - table.put (this, temp); - buf.append ('['); - buf.append (temp); - buf.append (']'); - buf.append (':'); - } + table.put (this, temp); + buf.append ('['); + buf.append (temp); + buf.append (']'); + buf.append (':'); + } - // NAME/SEQUENCE - if (name != null) { - // n.b. some output encodings turn some name chars into '?' - // e.g. with Japanese names and ASCII output - buf.append (name); - if (components != null) // bug! - buf.append ('$'); - if (next == null) - buf.append (",*"); - else if (next instanceof EmptyRecognizer) // patch-to-next - buf.append (",{}"); - else if (next instanceof ChildrenRecognizer) { - buf.append (','); - ((ChildrenRecognizer)next).toString (buf, table); - } else // bug! - buf.append (",+"); - return; - } + // NAME/SEQUENCE + if (name != null) { + // n.b. some output encodings turn some name chars into '?' + // e.g. with Japanese names and ASCII output + buf.append (name); + if (components != null) // bug! + buf.append ('$'); + if (next == null) + buf.append (",*"); + else if (next instanceof EmptyRecognizer) // patch-to-next + buf.append (",{}"); + else if (next instanceof ChildrenRecognizer) { + buf.append (','); + ((ChildrenRecognizer)next).toString (buf, table); + } else // bug! + buf.append (",+"); + return; + } - // CHOICE - buf.append ("<"); - for (int i = 0; i < components.length; i++) { - if (i != 0) - buf.append ("|"); - if (components [i] instanceof EmptyRecognizer) { - buf.append ("{}"); - } else if (components [i] == null) { // patch-to-next - buf.append ('*'); - } else { - ChildrenRecognizer r; + // CHOICE + buf.append ("<"); + for (int i = 0; i < components.length; i++) { + if (i != 0) + buf.append ("|"); + if (components [i] instanceof EmptyRecognizer) { + buf.append ("{}"); + } else if (components [i] == null) { // patch-to-next + buf.append ('*'); + } else { + ChildrenRecognizer r; - r = (ChildrenRecognizer) components [i]; - r.toString (buf, table); - } - } - buf.append (">"); - } + r = (ChildrenRecognizer) components [i]; + r.toString (buf, table); + } + } + buf.append (">"); + } /**/ } } diff --git a/libjava/classpath/gnu/xml/pipeline/WellFormednessFilter.java b/libjava/classpath/gnu/xml/pipeline/WellFormednessFilter.java index ef430165203..7a3db6593fd 100644 --- a/libjava/classpath/gnu/xml/pipeline/WellFormednessFilter.java +++ b/libjava/classpath/gnu/xml/pipeline/WellFormednessFilter.java @@ -1,4 +1,4 @@ -/* WellFormednessFilter.java -- +/* WellFormednessFilter.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,27 +50,27 @@ import org.xml.sax.SAXParseException; * This filter reports fatal exceptions in the case of event streams that * are not well formed. The rules currently tested include:

    * - *
  • setDocumentLocator ... may be called only before startDocument + *
  • setDocumentLocator ... may be called only before startDocument * - *
  • startDocument/endDocument ... must be paired, and all other - * calls (except setDocumentLocator) must be nested within these. + *
  • startDocument/endDocument ... must be paired, and all other + * calls (except setDocumentLocator) must be nested within these. * - *
  • startElement/endElement ... must be correctly paired, and - * may never appear within CDATA sections. + *
  • startElement/endElement ... must be correctly paired, and + * may never appear within CDATA sections. * - *
  • comment ... can't contain "--" + *
  • comment ... can't contain "--" * - *
  • character data ... can't contain "]]>" + *
  • character data ... can't contain "]]>" * - *
  • whitespace ... can't contain CR + *
  • whitespace ... can't contain CR * - *
  • whitespace and character data must be within an element + *
  • whitespace and character data must be within an element * - *
  • processing instruction ... can't contain "?>" or CR + *
  • processing instruction ... can't contain "?>" or CR * - *
  • startCDATA/endCDATA ... must be correctly paired. + *
  • startCDATA/endCDATA ... must be correctly paired. * - *
+ * * *

Other checks for event stream correctness may be provided in * the future. For example, insisting that @@ -84,35 +84,35 @@ import org.xml.sax.SAXParseException; */ public final class WellFormednessFilter extends EventFilter { - private boolean startedDoc; - private Stack elementStack = new Stack (); - private boolean startedCDATA; - private String dtdState = "before"; + private boolean startedDoc; + private Stack elementStack = new Stack (); + private boolean startedCDATA; + private String dtdState = "before"; + - /** * Swallows all events after performing well formedness checks. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public WellFormednessFilter () - { this (null); } + { this (null); } /** * Passes events through to the specified consumer, after first * processing them. */ - // constructor used by PipelineFactory + // constructor used by PipelineFactory public WellFormednessFilter (EventConsumer consumer) { - super (consumer); + super (consumer); - setContentHandler (this); - setDTDHandler (this); - - try { - setProperty (LEXICAL_HANDLER, this); - } catch (SAXException e) { /* can't happen */ } + setContentHandler (this); + setDTDHandler (this); + + try { + setProperty (LEXICAL_HANDLER, this); + } catch (SAXException e) { /* can't happen */ } } /** @@ -122,123 +122,123 @@ public final class WellFormednessFilter extends EventFilter */ public void reset () { - startedDoc = false; - startedCDATA = false; - elementStack.removeAllElements (); + startedDoc = false; + startedCDATA = false; + elementStack.removeAllElements (); } private SAXParseException getException (String message) { - SAXParseException e; - Locator locator = getDocumentLocator (); + SAXParseException e; + Locator locator = getDocumentLocator (); - if (locator == null) - return new SAXParseException (message, null, null, -1, -1); - else - return new SAXParseException (message, locator); + if (locator == null) + return new SAXParseException (message, null, null, -1, -1); + else + return new SAXParseException (message, locator); } private void fatalError (String message) throws SAXException { - SAXParseException e = getException (message); - ErrorHandler handler = getErrorHandler (); + SAXParseException e = getException (message); + ErrorHandler handler = getErrorHandler (); - if (handler != null) - handler.fatalError (e); - throw e; + if (handler != null) + handler.fatalError (e); + throw e; } /** * Throws an exception when called after startDocument. * * @param locator the locator, to be used in error reporting or relative - * URI resolution. + * URI resolution. * * @exception IllegalStateException when called after the document - * has already been started + * has already been started */ public void setDocumentLocator (Locator locator) { - if (startedDoc) - throw new IllegalStateException ( - "setDocumentLocator called after startDocument"); - super.setDocumentLocator (locator); + if (startedDoc) + throw new IllegalStateException ( + "setDocumentLocator called after startDocument"); + super.setDocumentLocator (locator); } public void startDocument () throws SAXException { - if (startedDoc) - fatalError ("startDocument called more than once"); - startedDoc = true; - startedCDATA = false; - elementStack.removeAllElements (); - super.startDocument (); + if (startedDoc) + fatalError ("startDocument called more than once"); + startedDoc = true; + startedCDATA = false; + elementStack.removeAllElements (); + super.startDocument (); } public void startElement ( - String uri, String localName, - String qName, Attributes atts + String uri, String localName, + String qName, Attributes atts ) throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if ("inside".equals (dtdState)) - fatalError ("element inside DTD?"); - else - dtdState = "after"; - if (startedCDATA) - fatalError ("element inside CDATA section"); - if (qName == null || "".equals (qName)) - fatalError ("startElement name missing"); - elementStack.push (qName); - super.startElement (uri, localName, qName, atts); + if (!startedDoc) + fatalError ("callback outside of document?"); + if ("inside".equals (dtdState)) + fatalError ("element inside DTD?"); + else + dtdState = "after"; + if (startedCDATA) + fatalError ("element inside CDATA section"); + if (qName == null || "".equals (qName)) + fatalError ("startElement name missing"); + elementStack.push (qName); + super.startElement (uri, localName, qName, atts); } public void endElement (String uri, String localName, String qName) throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if (startedCDATA) - fatalError ("element inside CDATA section"); - if (qName == null || "".equals (qName)) - fatalError ("endElement name missing"); - - try { - String top = (String) elementStack.pop (); + if (!startedDoc) + fatalError ("callback outside of document?"); + if (startedCDATA) + fatalError ("element inside CDATA section"); + if (qName == null || "".equals (qName)) + fatalError ("endElement name missing"); - if (!qName.equals (top)) - fatalError ("<" + top + " ...>..."); - // XXX could record/test namespace info - } catch (EmptyStackException e) { - fatalError ("endElement without startElement: "); - } - super.endElement (uri, localName, qName); + try { + String top = (String) elementStack.pop (); + + if (!qName.equals (top)) + fatalError ("<" + top + " ...>..."); + // XXX could record/test namespace info + } catch (EmptyStackException e) { + fatalError ("endElement without startElement: "); + } + super.endElement (uri, localName, qName); } public void endDocument () throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - dtdState = "before"; - startedDoc = false; - super.endDocument (); + if (!startedDoc) + fatalError ("callback outside of document?"); + dtdState = "before"; + startedDoc = false; + super.endDocument (); } public void startDTD (String root, String publicId, String systemId) throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); + if (!startedDoc) + fatalError ("callback outside of document?"); if ("before" != dtdState) - fatalError ("two DTDs?"); - if (!elementStack.empty ()) - fatalError ("DTD must precede root element"); - dtdState = "inside"; - super.startDTD (root, publicId, systemId); + fatalError ("two DTDs?"); + if (!elementStack.empty ()) + fatalError ("DTD must precede root element"); + dtdState = "inside"; + super.startDTD (root, publicId, systemId); } public void notationDecl (String name, String publicId, String systemId) @@ -247,19 +247,19 @@ public final class WellFormednessFilter extends EventFilter // FIXME: not all parsers will report startDTD() ... // we'd rather insist we're "inside". if ("after" == dtdState) - fatalError ("not inside DTD"); - super.notationDecl (name, publicId, systemId); + fatalError ("not inside DTD"); + super.notationDecl (name, publicId, systemId); } public void unparsedEntityDecl (String name, - String publicId, String systemId, String notationName) + String publicId, String systemId, String notationName) throws SAXException { // FIXME: not all parsers will report startDTD() ... // we'd rather insist we're "inside". if ("after" == dtdState) - fatalError ("not inside DTD"); - super.unparsedEntityDecl (name, publicId, systemId, notationName); + fatalError ("not inside DTD"); + super.unparsedEntityDecl (name, publicId, systemId, notationName); } // FIXME: add the four DeclHandler calls too @@ -267,97 +267,97 @@ public final class WellFormednessFilter extends EventFilter public void endDTD () throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if ("inside" != dtdState) - fatalError ("DTD ends without start?"); - dtdState = "after"; - super.endDTD (); + if (!startedDoc) + fatalError ("callback outside of document?"); + if ("inside" != dtdState) + fatalError ("DTD ends without start?"); + dtdState = "after"; + super.endDTD (); } public void characters (char ch [], int start, int length) throws SAXException { - int here = start, end = start + length; - if (elementStack.empty ()) - fatalError ("characters must be in an element"); - while (here < end) { - if (ch [here++] != ']') - continue; - if (here == end) // potential problem ... - continue; - if (ch [here++] != ']') - continue; - if (here == end) // potential problem ... - continue; - if (ch [here++] == '>') - fatalError ("character data can't contain \"]]>\""); - } - super.characters (ch, start, length); + int here = start, end = start + length; + if (elementStack.empty ()) + fatalError ("characters must be in an element"); + while (here < end) { + if (ch [here++] != ']') + continue; + if (here == end) // potential problem ... + continue; + if (ch [here++] != ']') + continue; + if (here == end) // potential problem ... + continue; + if (ch [here++] == '>') + fatalError ("character data can't contain \"]]>\""); + } + super.characters (ch, start, length); } public void ignorableWhitespace (char ch [], int start, int length) throws SAXException { - int here = start, end = start + length; - if (elementStack.empty ()) - fatalError ("characters must be in an element"); - while (here < end) { - if (ch [here++] == '\r') - fatalError ("whitespace can't contain CR"); - } - super.ignorableWhitespace (ch, start, length); + int here = start, end = start + length; + if (elementStack.empty ()) + fatalError ("characters must be in an element"); + while (here < end) { + if (ch [here++] == '\r') + fatalError ("whitespace can't contain CR"); + } + super.ignorableWhitespace (ch, start, length); } public void processingInstruction (String target, String data) throws SAXException { - if (data.indexOf ('\r') > 0) - fatalError ("PIs can't contain CR"); - if (data.indexOf ("?>") > 0) - fatalError ("PIs can't contain \"?>\""); + if (data.indexOf ('\r') > 0) + fatalError ("PIs can't contain CR"); + if (data.indexOf ("?>") > 0) + fatalError ("PIs can't contain \"?>\""); } public void comment (char ch [], int start, int length) throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if (startedCDATA) - fatalError ("comments can't nest in CDATA"); - int here = start, end = start + length; - while (here < end) { - if (ch [here] == '\r') - fatalError ("comments can't contain CR"); - if (ch [here++] != '-') - continue; - if (here == end) - fatalError ("comments can't end with \"--->\""); - if (ch [here++] == '-') - fatalError ("comments can't contain \"--\""); - } - super.comment (ch, start, length); + if (!startedDoc) + fatalError ("callback outside of document?"); + if (startedCDATA) + fatalError ("comments can't nest in CDATA"); + int here = start, end = start + length; + while (here < end) { + if (ch [here] == '\r') + fatalError ("comments can't contain CR"); + if (ch [here++] != '-') + continue; + if (here == end) + fatalError ("comments can't end with \"--->\""); + if (ch [here++] == '-') + fatalError ("comments can't contain \"--\""); + } + super.comment (ch, start, length); } public void startCDATA () throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if (startedCDATA) - fatalError ("CDATA starts can't nest"); - startedCDATA = true; - super.startCDATA (); + if (!startedDoc) + fatalError ("callback outside of document?"); + if (startedCDATA) + fatalError ("CDATA starts can't nest"); + startedCDATA = true; + super.startCDATA (); } public void endCDATA () throws SAXException { - if (!startedDoc) - fatalError ("callback outside of document?"); - if (!startedCDATA) - fatalError ("CDATA end without start?"); - startedCDATA = false; - super.endCDATA (); + if (!startedDoc) + fatalError ("callback outside of document?"); + if (!startedCDATA) + fatalError ("CDATA end without start?"); + startedCDATA = false; + super.endCDATA (); } } diff --git a/libjava/classpath/gnu/xml/pipeline/XIncludeFilter.java b/libjava/classpath/gnu/xml/pipeline/XIncludeFilter.java index 02607a4e06d..a1445fa0cc7 100644 --- a/libjava/classpath/gnu/xml/pipeline/XIncludeFilter.java +++ b/libjava/classpath/gnu/xml/pipeline/XIncludeFilter.java @@ -1,4 +1,4 @@ -/* XIncludeFilter.java -- +/* XIncludeFilter.java -- Copyright (C) 2001,2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,8 +40,8 @@ package gnu.xml.pipeline; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; +import java.net.URL; +import java.net.URLConnection; import java.util.Hashtable; import java.util.Stack; import java.util.Vector; @@ -77,7 +77,7 @@ import gnu.xml.util.Resolver; * currently supported. * *

  • DTDs are not supported in included files, since the SAX DTD events - * must have completely preceded any included file. + * must have completely preceded any included file. * The CR explicitly allows the DTD related portions of the infoset to * grow as an effect of including XML documents. * @@ -101,33 +101,33 @@ import gnu.xml.util.Resolver; */ public class XIncludeFilter extends EventFilter implements Locator { - private Hashtable extEntities = new Hashtable (5, 5); - private int ignoreCount; - private Stack uris = new Stack (); - private Locator locator; - private Vector inclusions = new Vector (5, 5); - private boolean savingPrefixes; + private Hashtable extEntities = new Hashtable (5, 5); + private int ignoreCount; + private Stack uris = new Stack (); + private Locator locator; + private Vector inclusions = new Vector (5, 5); + private boolean savingPrefixes; /** */ public XIncludeFilter (EventConsumer next) throws SAXException { - super (next); - setContentHandler (this); - // DTDHandler callbacks pass straight through - setProperty (DECL_HANDLER, this); - setProperty (LEXICAL_HANDLER, this); + super (next); + setContentHandler (this); + // DTDHandler callbacks pass straight through + setProperty (DECL_HANDLER, this); + setProperty (LEXICAL_HANDLER, this); } private void fatal (SAXParseException e) throws SAXException { - ErrorHandler eh; - - eh = getErrorHandler (); - if (eh != null) - eh.fatalError (e); - throw e; + ErrorHandler eh; + + eh = getErrorHandler (); + if (eh != null) + eh.fatalError (e); + throw e; } /** @@ -135,29 +135,29 @@ public class XIncludeFilter extends EventFilter implements Locator */ public void setDocumentLocator (Locator locator) { - this.locator = locator; - super.setDocumentLocator (this); + this.locator = locator; + super.setDocumentLocator (this); } /** Used for proxy locator; do not call directly. */ public String getSystemId () - { return (locator == null) ? null : locator.getSystemId (); } + { return (locator == null) ? null : locator.getSystemId (); } /** Used for proxy locator; do not call directly. */ public String getPublicId () - { return (locator == null) ? null : locator.getPublicId (); } + { return (locator == null) ? null : locator.getPublicId (); } /** Used for proxy locator; do not call directly. */ public int getLineNumber () - { return (locator == null) ? -1 : locator.getLineNumber (); } + { return (locator == null) ? -1 : locator.getLineNumber (); } /** Used for proxy locator; do not call directly. */ public int getColumnNumber () - { return (locator == null) ? -1 : locator.getColumnNumber (); } + { return (locator == null) ? -1 : locator.getColumnNumber (); } /** * Assigns the flag controlling the setting of the SAX2 * namespace-prefixes flag. */ public void setSavingPrefixes (boolean flag) - { savingPrefixes = flag; } + { savingPrefixes = flag; } /** * Returns the flag controlling the setting of the SAX2 @@ -166,49 +166,49 @@ public class XIncludeFilter extends EventFilter implements Locator * information that can be useful. */ public boolean isSavingPrefixes () - { return savingPrefixes; } + { return savingPrefixes; } // // Two mechanisms are interacting here. - // - // - XML Base implies a stack of base URIs, updated both by - // "real entity" boundaries and element boundaries. // - // - Active "Real Entities" (for document and general entities, - // and by xincluded files) are tracked to prevent circular - // inclusions. + // - XML Base implies a stack of base URIs, updated both by + // "real entity" boundaries and element boundaries. + // + // - Active "Real Entities" (for document and general entities, + // and by xincluded files) are tracked to prevent circular + // inclusions. // private String addMarker (String uri) throws SAXException { - if (locator != null && locator.getSystemId () != null) - uri = locator.getSystemId (); + if (locator != null && locator.getSystemId () != null) + uri = locator.getSystemId (); - // guard against InputSource objects without system IDs - if (uri == null) - fatal (new SAXParseException ("Entity URI is unknown", locator)); + // guard against InputSource objects without system IDs + if (uri == null) + fatal (new SAXParseException ("Entity URI is unknown", locator)); - try { - URL url = new URL (uri); + try { + URL url = new URL (uri); - uri = url.toString (); - if (inclusions.contains (uri)) - fatal (new SAXParseException ( - "XInclude, circular inclusion", locator)); - inclusions.addElement (uri); - uris.push (url); - } catch (IOException e) { - // guard against illegal relative URIs (Xerces) - fatal (new SAXParseException ("parser bug: relative URI", - locator, e)); - } - return uri; + uri = url.toString (); + if (inclusions.contains (uri)) + fatal (new SAXParseException ( + "XInclude, circular inclusion", locator)); + inclusions.addElement (uri); + uris.push (url); + } catch (IOException e) { + // guard against illegal relative URIs (Xerces) + fatal (new SAXParseException ("parser bug: relative URI", + locator, e)); + } + return uri; } private void pop (String uri) { - inclusions.removeElement (uri); - uris.pop (); + inclusions.removeElement (uri); + uris.pop (); } // @@ -216,66 +216,66 @@ public class XIncludeFilter extends EventFilter implements Locator // public void startDocument () throws SAXException { - ignoreCount = 0; - addMarker (null); - super.startDocument (); + ignoreCount = 0; + addMarker (null); + super.startDocument (); } public void endDocument () throws SAXException { - inclusions.setSize (0); - extEntities.clear (); - uris.setSize (0); - super.endDocument (); + inclusions.setSize (0); + extEntities.clear (); + uris.setSize (0); + super.endDocument (); } // // External general entity boundaries get both treatments. // public void externalEntityDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException { - if (name.charAt (0) == '%') - return; - try { - URL url = new URL (locator.getSystemId ()); - systemId = new URL (url, systemId).toString (); - } catch (IOException e) { - // what could we do? - } - extEntities.put (name, systemId); + if (name.charAt (0) == '%') + return; + try { + URL url = new URL (locator.getSystemId ()); + systemId = new URL (url, systemId).toString (); + } catch (IOException e) { + // what could we do? + } + extEntities.put (name, systemId); } public void startEntity (String name) throws SAXException { - if (ignoreCount != 0) { - ignoreCount++; - return; - } + if (ignoreCount != 0) { + ignoreCount++; + return; + } - String uri = (String) extEntities.get (name); - if (uri != null) - addMarker (uri); - super.startEntity (name); + String uri = (String) extEntities.get (name); + if (uri != null) + addMarker (uri); + super.startEntity (name); } public void endEntity (String name) throws SAXException { - if (ignoreCount != 0) { - if (--ignoreCount != 0) - return; - } + if (ignoreCount != 0) { + if (--ignoreCount != 0) + return; + } - String uri = (String) extEntities.get (name); + String uri = (String) extEntities.get (name); - if (uri != null) - pop (uri); - super.endEntity (name); + if (uri != null) + pop (uri); + super.endEntity (name); } - + // // element boundaries only affect the base URI stack, // unless they're XInclude elements. @@ -284,103 +284,103 @@ public class XIncludeFilter extends EventFilter implements Locator startElement (String uri, String localName, String qName, Attributes atts) throws SAXException { - if (ignoreCount != 0) { - ignoreCount++; - return; - } + if (ignoreCount != 0) { + ignoreCount++; + return; + } - URL baseURI = (URL) uris.peek (); - String base; + URL baseURI = (URL) uris.peek (); + String base; - base = atts.getValue ("http://www.w3.org/XML/1998/namespace", "base"); - if (base == null) - uris.push (baseURI); - else { - URL url; + base = atts.getValue ("http://www.w3.org/XML/1998/namespace", "base"); + if (base == null) + uris.push (baseURI); + else { + URL url; - if (base.indexOf ('#') != -1) - fatal (new SAXParseException ( - "xml:base with fragment: " + base, - locator)); + if (base.indexOf ('#') != -1) + fatal (new SAXParseException ( + "xml:base with fragment: " + base, + locator)); - try { - baseURI = new URL (baseURI, base); - uris.push (baseURI); - } catch (Exception e) { - fatal (new SAXParseException ( - "xml:base with illegal uri: " + base, - locator, e)); - } - } + try { + baseURI = new URL (baseURI, base); + uris.push (baseURI); + } catch (Exception e) { + fatal (new SAXParseException ( + "xml:base with illegal uri: " + base, + locator, e)); + } + } - if (!"http://www.w3.org/2001/XInclude".equals (uri)) { - super.startElement (uri, localName, qName, atts); - return; - } + if (!"http://www.w3.org/2001/XInclude".equals (uri)) { + super.startElement (uri, localName, qName, atts); + return; + } - if ("include".equals (localName)) { - String href = atts.getValue ("href"); - String parse = atts.getValue ("parse"); - String encoding = atts.getValue ("encoding"); - URL url = (URL) uris.peek (); - SAXParseException x = null; + if ("include".equals (localName)) { + String href = atts.getValue ("href"); + String parse = atts.getValue ("parse"); + String encoding = atts.getValue ("encoding"); + URL url = (URL) uris.peek (); + SAXParseException x = null; - if (href == null) - fatal (new SAXParseException ( - "XInclude missing href", - locator)); - if (href.indexOf ('#') != -1) - fatal (new SAXParseException ( - "XInclude with fragment: " + href, - locator)); + if (href == null) + fatal (new SAXParseException ( + "XInclude missing href", + locator)); + if (href.indexOf ('#') != -1) + fatal (new SAXParseException ( + "XInclude with fragment: " + href, + locator)); - if (parse == null || "xml".equals (parse)) - x = xinclude (url, href); - else if ("text".equals (parse)) - x = readText (url, href, encoding); - else - fatal (new SAXParseException ( - "unknown XInclude parsing mode: " + parse, - locator)); - if (x == null) { - // strip out all child content - ignoreCount++; - return; - } + if (parse == null || "xml".equals (parse)) + x = xinclude (url, href); + else if ("text".equals (parse)) + x = readText (url, href, encoding); + else + fatal (new SAXParseException ( + "unknown XInclude parsing mode: " + parse, + locator)); + if (x == null) { + // strip out all child content + ignoreCount++; + return; + } - // FIXME the 17-Sept-2002 CR of XInclude says we "must" - // use xi:fallback elements to handle resource errors, - // if they exist. - fatal (x); + // FIXME the 17-Sept-2002 CR of XInclude says we "must" + // use xi:fallback elements to handle resource errors, + // if they exist. + fatal (x); - } else if ("fallback".equals (localName)) { - fatal (new SAXParseException ( - "illegal top level XInclude 'fallback' element", - locator)); - } else { - ErrorHandler eh = getErrorHandler (); + } else if ("fallback".equals (localName)) { + fatal (new SAXParseException ( + "illegal top level XInclude 'fallback' element", + locator)); + } else { + ErrorHandler eh = getErrorHandler (); - // CR doesn't say this is an error - if (eh != null) - eh.warning (new SAXParseException ( - "unrecognized toplevel XInclude element: " + localName, - locator)); - super.startElement (uri, localName, qName, atts); - } + // CR doesn't say this is an error + if (eh != null) + eh.warning (new SAXParseException ( + "unrecognized toplevel XInclude element: " + localName, + locator)); + super.startElement (uri, localName, qName, atts); + } } public void endElement (String uri, String localName, String qName) throws SAXException { - if (ignoreCount != 0) { - if (--ignoreCount != 0) - return; - } + if (ignoreCount != 0) { + if (--ignoreCount != 0) + return; + } - uris.pop (); - if (!("http://www.w3.org/2001/XInclude".equals (uri) - && "include".equals (localName))) - super.endElement (uri, localName, qName); + uris.pop (); + if (!("http://www.w3.org/2001/XInclude".equals (uri) + && "include".equals (localName))) + super.endElement (uri, localName, qName); } // @@ -389,66 +389,66 @@ public class XIncludeFilter extends EventFilter implements Locator public void characters (char ch [], int start, int length) throws SAXException { - if (ignoreCount == 0) - super.characters (ch, start, length); + if (ignoreCount == 0) + super.characters (ch, start, length); } public void processingInstruction (String target, String value) throws SAXException { - if (ignoreCount == 0) - super.processingInstruction (target, value); + if (ignoreCount == 0) + super.processingInstruction (target, value); } public void ignorableWhitespace (char ch [], int start, int length) throws SAXException { - if (ignoreCount == 0) - super.ignorableWhitespace (ch, start, length); + if (ignoreCount == 0) + super.ignorableWhitespace (ch, start, length); } public void comment (char ch [], int start, int length) throws SAXException { - if (ignoreCount == 0) - super.comment (ch, start, length); + if (ignoreCount == 0) + super.comment (ch, start, length); } public void startCDATA () throws SAXException { - if (ignoreCount == 0) - super.startCDATA (); + if (ignoreCount == 0) + super.startCDATA (); } public void endCDATA () throws SAXException { - if (ignoreCount == 0) - super.endCDATA (); + if (ignoreCount == 0) + super.endCDATA (); } public void startPrefixMapping (String prefix, String uri) throws SAXException { - if (ignoreCount == 0) - super.startPrefixMapping (prefix, uri); + if (ignoreCount == 0) + super.startPrefixMapping (prefix, uri); } public void endPrefixMapping (String prefix) throws SAXException { - if (ignoreCount == 0) - super.endPrefixMapping (prefix); + if (ignoreCount == 0) + super.endPrefixMapping (prefix); } public void skippedEntity (String name) throws SAXException { - if (ignoreCount == 0) - super.skippedEntity (name); + if (ignoreCount == 0) + super.skippedEntity (name); } // JDK 1.1 seems to need it to be done this way, sigh void setLocator (Locator l) { locator = l; } Locator getLocator () { return locator; } - + // // for XIncluded entities, manage the current locator and @@ -456,45 +456,45 @@ public class XIncludeFilter extends EventFilter implements Locator // private class Scrubber extends EventFilter { - Scrubber (EventFilter f) - throws SAXException - { - // delegation passes to next in chain - super (f); + Scrubber (EventFilter f) + throws SAXException + { + // delegation passes to next in chain + super (f); - // process all content events - super.setContentHandler (this); - super.setProperty (LEXICAL_HANDLER, this); + // process all content events + super.setContentHandler (this); + super.setProperty (LEXICAL_HANDLER, this); - // drop all DTD events - super.setDTDHandler (null); - super.setProperty (DECL_HANDLER, null); - } + // drop all DTD events + super.setDTDHandler (null); + super.setProperty (DECL_HANDLER, null); + } - // maintain proxy locator - // only one startDocument()/endDocument() pair per event stream - public void setDocumentLocator (Locator l) - { setLocator (l); } - public void startDocument () - { } - public void endDocument () - { } - - private void reject (String message) throws SAXException - { fatal (new SAXParseException (message, getLocator ())); } - - // only the DTD from the "base document" gets reported - public void startDTD (String root, String publicId, String systemId) - throws SAXException - { reject ("XIncluded DTD: " + systemId); } - public void endDTD () - throws SAXException - { reject ("XIncluded DTD"); } - // ... so this should never happen - public void skippedEntity (String name) throws SAXException - { reject ("XInclude skipped entity: " + name); } + // maintain proxy locator + // only one startDocument()/endDocument() pair per event stream + public void setDocumentLocator (Locator l) + { setLocator (l); } + public void startDocument () + { } + public void endDocument () + { } - // since we rejected DTDs, only builtin entities can be reported + private void reject (String message) throws SAXException + { fatal (new SAXParseException (message, getLocator ())); } + + // only the DTD from the "base document" gets reported + public void startDTD (String root, String publicId, String systemId) + throws SAXException + { reject ("XIncluded DTD: " + systemId); } + public void endDTD () + throws SAXException + { reject ("XIncluded DTD"); } + // ... so this should never happen + public void skippedEntity (String name) throws SAXException + { reject ("XInclude skipped entity: " + name); } + + // since we rejected DTDs, only builtin entities can be reported } // @@ -502,40 +502,40 @@ public class XIncludeFilter extends EventFilter implements Locator private SAXParseException xinclude (URL url, String href) throws SAXException { - XMLReader helper; - Scrubber scrubber; - Locator savedLocator = locator; + XMLReader helper; + Scrubber scrubber; + Locator savedLocator = locator; - // start with a parser acting just like our input - // modulo DTD-ish stuff (validation flag, entity resolver) - helper = XMLReaderFactory.createXMLReader (); - helper.setErrorHandler (getErrorHandler ()); - helper.setFeature (FEATURE_URI + "namespace-prefixes", true); + // start with a parser acting just like our input + // modulo DTD-ish stuff (validation flag, entity resolver) + helper = XMLReaderFactory.createXMLReader (); + helper.setErrorHandler (getErrorHandler ()); + helper.setFeature (FEATURE_URI + "namespace-prefixes", true); - // Set up the proxy locator and event filter. - scrubber = new Scrubber (this); - locator = null; - bind (helper, scrubber); + // Set up the proxy locator and event filter. + scrubber = new Scrubber (this); + locator = null; + bind (helper, scrubber); - // Merge the included document, except its DTD - try { - url = new URL (url, href); - href = url.toString (); + // Merge the included document, except its DTD + try { + url = new URL (url, href); + href = url.toString (); - if (inclusions.contains (href)) - fatal (new SAXParseException ( - "XInclude, circular inclusion", locator)); + if (inclusions.contains (href)) + fatal (new SAXParseException ( + "XInclude, circular inclusion", locator)); - inclusions.addElement (href); - uris.push (url); - helper.parse (new InputSource (href)); - return null; - } catch (java.io.IOException e) { - return new SAXParseException (href, locator, e); - } finally { - pop (href); - locator = savedLocator; - } + inclusions.addElement (href); + uris.push (url); + helper.parse (new InputSource (href)); + return null; + } catch (java.io.IOException e) { + return new SAXParseException (href, locator, e); + } finally { + pop (href); + locator = savedLocator; + } } // @@ -543,37 +543,37 @@ public class XIncludeFilter extends EventFilter implements Locator private SAXParseException readText (URL url, String href, String encoding) throws SAXException { - InputStream in = null; + InputStream in = null; - try { - URLConnection conn; - InputStreamReader reader; - char buf [] = new char [4096]; - int count; + try { + URLConnection conn; + InputStreamReader reader; + char buf [] = new char [4096]; + int count; - url = new URL (url, href); - conn = url.openConnection (); - in = conn.getInputStream (); - if (encoding == null) - encoding = Resolver.getEncoding (conn.getContentType ()); - if (encoding == null) { - ErrorHandler eh = getErrorHandler (); - if (eh != null) - eh.warning (new SAXParseException ( - "guessing text encoding for URL: " + url, - locator)); - reader = new InputStreamReader (in); - } else - reader = new InputStreamReader (in, encoding); + url = new URL (url, href); + conn = url.openConnection (); + in = conn.getInputStream (); + if (encoding == null) + encoding = Resolver.getEncoding (conn.getContentType ()); + if (encoding == null) { + ErrorHandler eh = getErrorHandler (); + if (eh != null) + eh.warning (new SAXParseException ( + "guessing text encoding for URL: " + url, + locator)); + reader = new InputStreamReader (in); + } else + reader = new InputStreamReader (in, encoding); - while ((count = reader.read (buf, 0, buf.length)) != -1) - super.characters (buf, 0, count); - in.close (); - return null; - } catch (IOException e) { - return new SAXParseException ( - "can't XInclude text", - locator, e); - } + while ((count = reader.read (buf, 0, buf.length)) != -1) + super.characters (buf, 0, count); + in.close (); + return null; + } catch (IOException e) { + return new SAXParseException ( + "can't XInclude text", + locator, e); + } } } diff --git a/libjava/classpath/gnu/xml/pipeline/XsltFilter.java b/libjava/classpath/gnu/xml/pipeline/XsltFilter.java index 0a1872c5a80..86b6190c5bc 100644 --- a/libjava/classpath/gnu/xml/pipeline/XsltFilter.java +++ b/libjava/classpath/gnu/xml/pipeline/XsltFilter.java @@ -1,4 +1,4 @@ -/* XsltFilter.java -- +/* XsltFilter.java -- Copyright (C) 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,8 +49,8 @@ import org.xml.sax.ext.LexicalHandler; /** - * Packages an XSLT transform as a pipeline component. - * Note that all DTD events (callbacks to DeclHandler and DTDHandler + * Packages an XSLT transform as a pipeline component. + * Note that all DTD events (callbacks to DeclHandler and DTDHandler * interfaces) are discarded, although XSLT transforms may be set up to * use the LexicalHandler to write DTDs with only an external subset. * Not every XSLT engine will necessarily be usable with this filter, @@ -72,59 +72,59 @@ final public class XsltFilter extends EventFilter * or ErrorHandler support. * * @param stylesheet URI for the stylesheet specifying the - * XSLT transform + * XSLT transform * @param next provides the ContentHandler and LexicalHandler - * to receive XSLT output. + * to receive XSLT output. * @exception SAXException if the stylesheet can't be parsed * @exception IOException if there are difficulties - * bootstrapping the XSLT engine, such as it not supporting - * SAX well enough to use this way. + * bootstrapping the XSLT engine, such as it not supporting + * SAX well enough to use this way. */ public XsltFilter (String stylesheet, EventConsumer next) throws SAXException, IOException { - // First, get a transformer with the stylesheet preloaded - TransformerFactory tf = null; - TransformerHandler th; + // First, get a transformer with the stylesheet preloaded + TransformerFactory tf = null; + TransformerHandler th; - try { - SAXTransformerFactory stf; + try { + SAXTransformerFactory stf; - tf = TransformerFactory.newInstance (); - if (!tf.getFeature (SAXTransformerFactory.FEATURE) // sax inputs - || !tf.getFeature (SAXResult.FEATURE) // sax outputs - || !tf.getFeature (StreamSource.FEATURE) // stylesheet - ) - throw new IOException ("XSLT factory (" - + tf.getClass ().getName () - + ") does not support SAX"); - stf = (SAXTransformerFactory) tf; - th = stf.newTransformerHandler (new StreamSource (stylesheet)); - } catch (TransformerConfigurationException e) { - throw new IOException ("XSLT factory (" - + (tf == null - ? "none available" - : tf.getClass ().getName ()) - + ") configuration error, " - + e.getMessage () - ); - } + tf = TransformerFactory.newInstance (); + if (!tf.getFeature (SAXTransformerFactory.FEATURE) // sax inputs + || !tf.getFeature (SAXResult.FEATURE) // sax outputs + || !tf.getFeature (StreamSource.FEATURE) // stylesheet + ) + throw new IOException ("XSLT factory (" + + tf.getClass ().getName () + + ") does not support SAX"); + stf = (SAXTransformerFactory) tf; + th = stf.newTransformerHandler (new StreamSource (stylesheet)); + } catch (TransformerConfigurationException e) { + throw new IOException ("XSLT factory (" + + (tf == null + ? "none available" + : tf.getClass ().getName ()) + + ") configuration error, " + + e.getMessage () + ); + } - // Hook its outputs up to the pipeline ... - SAXResult out = new SAXResult (); + // Hook its outputs up to the pipeline ... + SAXResult out = new SAXResult (); - out.setHandler (next.getContentHandler ()); - try { - LexicalHandler lh; - lh = (LexicalHandler) next.getProperty (LEXICAL_HANDLER); - out.setLexicalHandler (lh); - } catch (Exception e) { - // ignore - } - th.setResult (out); + out.setHandler (next.getContentHandler ()); + try { + LexicalHandler lh; + lh = (LexicalHandler) next.getProperty (LEXICAL_HANDLER); + out.setLexicalHandler (lh); + } catch (Exception e) { + // ignore + } + th.setResult (out); - // ... and make sure its inputs look like ours. - setContentHandler (th); - setProperty (LEXICAL_HANDLER, th); + // ... and make sure its inputs look like ours. + setContentHandler (th); + setProperty (LEXICAL_HANDLER, th); } } diff --git a/libjava/classpath/gnu/xml/stream/AttributeImpl.java b/libjava/classpath/gnu/xml/stream/AttributeImpl.java index f74aebd3526..58a0dbe2126 100644 --- a/libjava/classpath/gnu/xml/stream/AttributeImpl.java +++ b/libjava/classpath/gnu/xml/stream/AttributeImpl.java @@ -1,4 +1,4 @@ -/* AttributeImpl.java -- +/* AttributeImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,7 +94,7 @@ public class AttributeImpl { return specified; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -119,6 +119,5 @@ public class AttributeImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/BufferedReader.java b/libjava/classpath/gnu/xml/stream/BufferedReader.java index f8287e823fd..dc69fb34ba3 100644 --- a/libjava/classpath/gnu/xml/stream/BufferedReader.java +++ b/libjava/classpath/gnu/xml/stream/BufferedReader.java @@ -1,4 +1,4 @@ -/* BufferedReader.java -- +/* BufferedReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ class BufferedReader { this(in, DEFAULT_BUFFER_SIZE); } - + BufferedReader(Reader in, int bufferSize) { if (bufferSize < 1) @@ -110,19 +110,19 @@ class BufferedReader { if (off < 0 || len < 0 || b.length - off < len) throw new IndexOutOfBoundsException(); - + if (len == 0) return 0; - + if (pos >= count && !refill()) return -1; - + int ret = Math.min(count - pos, len); System.arraycopy(buf, pos, b, off, ret); pos += ret; off += ret; len -= ret; - + while (len > 0 && refill()) { int remain = Math.min(count - pos, len); @@ -132,7 +132,7 @@ class BufferedReader len -= remain; ret += remain; } - + return ret; } @@ -177,7 +177,7 @@ class BufferedReader { char[] newbuf = buf; if (markpos < bufferSize) - { + { newbuf = new char[count - markpos + bufferSize]; } System.arraycopy(buf, markpos, newbuf, 0, markcount); diff --git a/libjava/classpath/gnu/xml/stream/CRLFReader.java b/libjava/classpath/gnu/xml/stream/CRLFReader.java index dad02b94a1d..7f3cf4d7446 100644 --- a/libjava/classpath/gnu/xml/stream/CRLFReader.java +++ b/libjava/classpath/gnu/xml/stream/CRLFReader.java @@ -1,4 +1,4 @@ -/* CRLFReader.java -- +/* CRLFReader.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -115,7 +115,7 @@ class CRLFReader } else l = in.read(b, off, len); // CR(s) but no LF - } + } } return l; } @@ -178,4 +178,3 @@ class CRLFReader } } - diff --git a/libjava/classpath/gnu/xml/stream/CharactersImpl.java b/libjava/classpath/gnu/xml/stream/CharactersImpl.java index 6df06582b87..2107a5a6d59 100644 --- a/libjava/classpath/gnu/xml/stream/CharactersImpl.java +++ b/libjava/classpath/gnu/xml/stream/CharactersImpl.java @@ -1,4 +1,4 @@ -/* CharactersImpl.java -- +/* CharactersImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,12 +88,12 @@ public class CharactersImpl { return cdata; } - + public boolean isIgnorableWhiteSpace() { return ignorableWhitespace; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -105,7 +105,7 @@ public class CharactersImpl writer.write(data); writer.write("]]>"); } - else + else writer.write(encode(data, false)); } catch (IOException e) @@ -115,6 +115,5 @@ public class CharactersImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/CommentImpl.java b/libjava/classpath/gnu/xml/stream/CommentImpl.java index 5863fb05aec..118ac7a5767 100644 --- a/libjava/classpath/gnu/xml/stream/CommentImpl.java +++ b/libjava/classpath/gnu/xml/stream/CommentImpl.java @@ -1,4 +1,4 @@ -/* CommentImpl.java -- +/* CommentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class CommentImpl { return text; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -87,6 +87,5 @@ public class CommentImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/DTDImpl.java b/libjava/classpath/gnu/xml/stream/DTDImpl.java index 8e008aaede1..cf049d3620e 100644 --- a/libjava/classpath/gnu/xml/stream/DTDImpl.java +++ b/libjava/classpath/gnu/xml/stream/DTDImpl.java @@ -1,4 +1,4 @@ -/* DTDImpl.java -- +/* DTDImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,7 +93,7 @@ public class DTDImpl { return entities; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -110,6 +110,5 @@ public class DTDImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java index 0e3ed9630ad..13877c5c965 100644 --- a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java +++ b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java @@ -1,4 +1,4 @@ -/* EndDocumentImpl.java -- +/* EndDocumentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -61,11 +61,10 @@ public class EndDocumentImpl { return END_DOCUMENT; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EndElementImpl.java b/libjava/classpath/gnu/xml/stream/EndElementImpl.java index 7b5382ec5f3..71f6aa0bcac 100644 --- a/libjava/classpath/gnu/xml/stream/EndElementImpl.java +++ b/libjava/classpath/gnu/xml/stream/EndElementImpl.java @@ -1,4 +1,4 @@ -/* EndElementImpl.java -- +/* EndElementImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ public class EndElementImpl { return namespaces.iterator(); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -103,6 +103,5 @@ public class EndElementImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java b/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java index 41ec2fb9b0d..b6e33e8d2b0 100644 --- a/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java +++ b/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java @@ -1,4 +1,4 @@ -/* EntityDeclarationImpl.java -- +/* EntityDeclarationImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -159,6 +159,5 @@ public class EntityDeclarationImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java b/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java index 38e1f00b1af..6f8a11c80fd 100644 --- a/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java +++ b/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java @@ -1,4 +1,4 @@ -/* EntityReferenceImpl.java -- +/* EntityReferenceImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,4 +99,3 @@ public class EntityReferenceImpl } } - diff --git a/libjava/classpath/gnu/xml/stream/FilteredEventReader.java b/libjava/classpath/gnu/xml/stream/FilteredEventReader.java index fd6fe8b0721..1ddb469df0a 100644 --- a/libjava/classpath/gnu/xml/stream/FilteredEventReader.java +++ b/libjava/classpath/gnu/xml/stream/FilteredEventReader.java @@ -1,4 +1,4 @@ -/* FilteredEventReader.java -- +/* FilteredEventReader.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - + public Object next() { try @@ -86,7 +86,7 @@ class FilteredEventReader throw e2; } } - + public XMLEvent peek() throws XMLStreamException { @@ -98,7 +98,7 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - + public XMLEvent nextTag() throws XMLStreamException { @@ -110,6 +110,5 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java index 90ebb330d0b..62d96488eb0 100644 --- a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java +++ b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java @@ -1,4 +1,4 @@ -/* FilteredStreamReader.java -- +/* FilteredStreamReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -74,7 +74,7 @@ class FilteredStreamReader while (!filter.accept(reader)); return ret; } - + public int nextTag() throws XMLStreamException { @@ -86,6 +86,5 @@ class FilteredStreamReader while (!filter.accept(reader)); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java index 1a595ee83d4..241f980b600 100644 --- a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java +++ b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java @@ -1,4 +1,4 @@ -/* NamespaceImpl.java -- +/* NamespaceImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -109,7 +109,7 @@ public class NamespaceImpl { return (prefix == null || "".equals(prefix)); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -133,6 +133,5 @@ public class NamespaceImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java b/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java index 2d08599f577..a338237eec9 100644 --- a/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java +++ b/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java @@ -1,4 +1,4 @@ -/* NotationDeclarationImpl.java -- +/* NotationDeclarationImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ public class NotationDeclarationImpl { return systemId; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -121,6 +121,5 @@ public class NotationDeclarationImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java b/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java index 6a5028956ad..4ce0badc828 100644 --- a/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java +++ b/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java @@ -1,4 +1,4 @@ -/* ProcessingInstructionImpl.java -- +/* ProcessingInstructionImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -78,7 +78,7 @@ public class ProcessingInstructionImpl { return data; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -100,6 +100,5 @@ public class ProcessingInstructionImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/SAXParser.java b/libjava/classpath/gnu/xml/stream/SAXParser.java index ab1f86e49ed..b71d98ed30f 100644 --- a/libjava/classpath/gnu/xml/stream/SAXParser.java +++ b/libjava/classpath/gnu/xml/stream/SAXParser.java @@ -1,4 +1,4 @@ -/* SAXParser.java -- +/* SAXParser.java -- Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -131,13 +131,13 @@ public class SAXParser } // -- SAXParser -- - + public Parser getParser() throws SAXException { return null; } - + public XMLReader getXMLReader() throws SAXException { @@ -365,11 +365,11 @@ public class SAXParser } reader = parser; baseURI = systemId; - + if (xIncludeAware) reader = new XIncludeFilter(parser, systemId, namespaceAware, validating, true); - + if (contentHandler != null) contentHandler.setDocumentLocator(this); boolean startDocumentDone = false; @@ -864,7 +864,7 @@ public class SAXParser } // -- Locator2 -- - + public int getColumnNumber() { Location l = reader.getLocation(); @@ -888,7 +888,7 @@ public class SAXParser Location l = reader.getLocation(); return l.getSystemId(); } - + public String getEncoding() { return encoding; @@ -900,7 +900,7 @@ public class SAXParser } // -- XMLResolver -- - + public Object resolveEntity(String publicId, String systemId, String baseURI, String namespace) throws XMLStreamException @@ -1037,5 +1037,5 @@ public class SAXParser pos++; } } - + } diff --git a/libjava/classpath/gnu/xml/stream/SAXParserFactory.java b/libjava/classpath/gnu/xml/stream/SAXParserFactory.java index a2ccea1e694..ebaeb3cb2cc 100644 --- a/libjava/classpath/gnu/xml/stream/SAXParserFactory.java +++ b/libjava/classpath/gnu/xml/stream/SAXParserFactory.java @@ -1,4 +1,4 @@ -/* SAXParserFactory.java -- +/* SAXParserFactory.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -92,13 +92,13 @@ public class SAXParserFactory features.put(name, value ? Boolean.TRUE : Boolean.FALSE); } - public boolean getFeature(String name) - throws ParserConfigurationException, SAXNotRecognizedException, SAXNotSupportedException + public boolean getFeature(String name) + throws ParserConfigurationException, SAXNotRecognizedException, SAXNotSupportedException { if (!FEATURE_NAMES.contains(name)) throw new SAXNotSupportedException(name); Boolean value = (Boolean) features.get(name); return (value == null) ? false : value.booleanValue(); } - + } diff --git a/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java b/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java index dc4251dd9bf..d2e590cfc90 100644 --- a/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java +++ b/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java @@ -1,4 +1,4 @@ -/* StartDocumentImpl.java -- +/* StartDocumentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -109,7 +109,7 @@ public class StartDocumentImpl { return xmlVersion; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -139,6 +139,5 @@ public class StartDocumentImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/StartElementImpl.java b/libjava/classpath/gnu/xml/stream/StartElementImpl.java index 48f88656046..66e68d56071 100644 --- a/libjava/classpath/gnu/xml/stream/StartElementImpl.java +++ b/libjava/classpath/gnu/xml/stream/StartElementImpl.java @@ -1,4 +1,4 @@ -/* StartElementImpl.java -- +/* StartElementImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -115,7 +115,7 @@ public class StartElementImpl { return namespaceContext.getNamespaceURI(prefix); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -148,6 +148,5 @@ public class StartElementImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/UnicodeReader.java b/libjava/classpath/gnu/xml/stream/UnicodeReader.java index 9350cb2e0b6..aa2a95422b0 100644 --- a/libjava/classpath/gnu/xml/stream/UnicodeReader.java +++ b/libjava/classpath/gnu/xml/stream/UnicodeReader.java @@ -1,4 +1,4 @@ -/* UnicodeReader.java -- +/* UnicodeReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -201,5 +201,5 @@ public class UnicodeReader } return buf; } - + } diff --git a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java index aed9d9a0f00..6d955c492e7 100644 --- a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java +++ b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java @@ -1,4 +1,4 @@ -/* XIncludeFilter.java -- +/* XIncludeFilter.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -107,7 +107,7 @@ class XIncludeFilter HashSet seen = new HashSet(); boolean backtracking; boolean lookahead; - + Reader includedText; char[] buf; int len = -1; @@ -677,7 +677,7 @@ class XIncludeFilter String base = (String) getParent().getProperty("gnu.xml.stream.baseURI"); return (base == null) ? systemId : base; } - + boolean includeResource(String href, String parse, String xpointer, String encoding, String accept, String acceptLanguage) @@ -700,7 +700,7 @@ class XIncludeFilter walker = null; current = null; backtracking = false; - + URLConnection connection = getURLConnection(href, accept, acceptLanguage); InputStream in = connection.getInputStream(); @@ -927,5 +927,5 @@ class XIncludeFilter } return null; } - + } diff --git a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java index dd2b18c943f..a1824bfc54d 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java @@ -1,4 +1,4 @@ -/* XMLEventAllocatorImpl.java -- +/* XMLEventAllocatorImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -188,7 +188,7 @@ public class XMLEventAllocatorImpl { return new XMLEventAllocatorImpl(); } - + protected boolean isWhitespace(String text) { int len = text.length(); @@ -200,6 +200,5 @@ public class XMLEventAllocatorImpl } return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java index 5ca1aab7ce8..12f7f2c790b 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLEventFactoryImpl.java -- +/* XMLEventFactoryImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,7 +81,7 @@ public class XMLEventFactoryImpl new QName(namespaceURI, localName, prefix), value, "CDATA", true); } - + public Attribute createAttribute(String localName, String value) { return new AttributeImpl(location, @@ -117,7 +117,7 @@ public class XMLEventFactoryImpl createLinkedList(namespaces), null); } - + public StartElement createStartElement(String prefix, String namespaceUri, String localName) @@ -155,7 +155,7 @@ public class XMLEventFactoryImpl createLinkedList(namespaces), context); } - + public EndElement createEndElement(QName name, Iterator namespaces) { @@ -171,7 +171,7 @@ public class XMLEventFactoryImpl new QName(namespaceUri, localName, prefix), Collections.EMPTY_LIST); } - + public EndElement createEndElement(String prefix, String namespaceUri, String localName, @@ -215,7 +215,7 @@ public class XMLEventFactoryImpl return new StartDocumentImpl(location, null, encoding, version, standalone, true, true); } - + public StartDocument createStartDocument(String encoding, String version) { @@ -265,6 +265,5 @@ public class XMLEventFactoryImpl ret.add(i.next()); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java index 8d73b177427..2e650bf74f6 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java @@ -1,4 +1,4 @@ -/* XMLEventImpl.java -- +/* XMLEventImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -136,7 +136,7 @@ public abstract class XMLEventImpl { return null; } - + public abstract void writeAsEncodedUnicode(Writer writer) throws XMLStreamException; @@ -192,8 +192,7 @@ public abstract class XMLEventImpl buf.append(c); } } - return (buf == null) ? text : buf.toString(); + return (buf == null) ? text : buf.toString(); } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java index bb64b1e3f9d..bab6d9378b4 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java @@ -1,4 +1,4 @@ -/* XMLEventReaderImpl.java -- +/* XMLEventReaderImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -102,7 +102,7 @@ public class XMLEventReaderImpl return false; } } - + public XMLEvent peek() throws XMLStreamException { @@ -155,4 +155,3 @@ public class XMLEventReaderImpl } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java index 72b7adce24c..33b1dce31b0 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java @@ -1,4 +1,4 @@ -/* XMLEventWriterImpl.java -- +/* XMLEventWriterImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,7 +62,7 @@ import javax.xml.stream.events.XMLEvent; public class XMLEventWriterImpl implements XMLEventWriter { - + protected final XMLStreamWriter writer; protected XMLEventWriterImpl(XMLStreamWriter writer) @@ -181,11 +181,10 @@ public class XMLEventWriterImpl { writer.setNamespaceContext(context); } - + public NamespaceContext getNamespaceContext() { return writer.getNamespaceContext(); } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java index 5f72e361e52..87aa32107d3 100644 --- a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLInputFactoryImpl.java -- +/* XMLInputFactoryImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public class XMLInputFactoryImpl { return createXMLStreamReader(null, reader); } - + public XMLStreamReader createXMLStreamReader(Source source) throws XMLStreamException { @@ -114,13 +114,13 @@ public class XMLInputFactoryImpl replacingEntityReferences); return ret; } - + public XMLStreamReader createXMLStreamReader(InputStream in) throws XMLStreamException { return createXMLStreamReader(null, in); } - + public XMLStreamReader createXMLStreamReader(InputStream in, String encoding) throws XMLStreamException { @@ -175,34 +175,34 @@ public class XMLInputFactoryImpl XMLStreamReader sr = createXMLStreamReader(reader); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(String systemId, Reader reader) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(systemId, reader); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(XMLStreamReader reader) throws XMLStreamException { return new XMLEventReaderImpl(reader, allocator, null); } - + public XMLEventReader createXMLEventReader(Source source) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(source); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(InputStream in) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(in); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(InputStream in, String encoding) throws XMLStreamException { @@ -216,7 +216,7 @@ public class XMLInputFactoryImpl XMLStreamReader sr = createXMLStreamReader(systemId, in); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLStreamReader createFilteredReader(XMLStreamReader reader, StreamFilter filter) throws XMLStreamException @@ -240,7 +240,7 @@ public class XMLInputFactoryImpl { this.resolver = resolver; } - + public XMLReporter getXMLReporter() { return reporter; @@ -327,7 +327,7 @@ public class XMLInputFactoryImpl name.equals("gnu.xml.stream.baseAware") || name.equals("gnu.xml.stream.xIncludeAware"); } - + public void setEventAllocator(XMLEventAllocator allocator) { this.allocator = allocator; @@ -393,6 +393,5 @@ public class XMLInputFactoryImpl } return in; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java index c8c651fb1af..d849e8ba5ed 100644 --- a/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLOutputFactoryImpl.java -- +/* XMLOutputFactoryImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -149,7 +149,7 @@ public class XMLOutputFactoryImpl } throw new UnsupportedOperationException(); } - + public void setProperty(String name, Object value) throws IllegalArgumentException { @@ -183,6 +183,5 @@ public class XMLOutputFactoryImpl { prefixDefaulting = value; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLParser.java b/libjava/classpath/gnu/xml/stream/XMLParser.java index 6072a9c730f..71e8765695a 100644 --- a/libjava/classpath/gnu/xml/stream/XMLParser.java +++ b/libjava/classpath/gnu/xml/stream/XMLParser.java @@ -1,4 +1,4 @@ -/* XMLParser.java -- +/* XMLParser.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -113,7 +113,7 @@ import gnu.classpath.debug.TeeReader; * @see http://www.w3.org/TR/REC-xml-names * @see http://www.w3.org/TR/xml-names11 * @see http://www.w3.org/TR/xmlbase/ - * + * * @author Chris Burdess */ public class XMLParser @@ -168,7 +168,7 @@ public class XMLParser * Stack of end-entity events to be reported. */ private LinkedList endEntityStack = new LinkedList(); - + /** * Current parser state within the main state machine. */ @@ -224,7 +224,7 @@ public class XMLParser * Temporary Unicode character buffer used during character data reads. */ private int[] tmpBuf = new int[1024]; - + /** * The element content model for the current element. */ @@ -682,7 +682,7 @@ public class XMLParser String elementName = buf.toString(); return doctype.isAttributeDeclared(elementName, qn); } - + public String getCharacterEncodingScheme() { return xmlEncoding; @@ -1022,7 +1022,7 @@ public class XMLParser { return (event != XMLStreamConstants.END_DOCUMENT && event != -1); } - + public int next() throws XMLStreamException { @@ -1253,7 +1253,7 @@ public class XMLParser { return input.read(b, off, len); } - + /** * Parsed character read. */ @@ -1415,7 +1415,7 @@ public class XMLParser "U+" + Integer.toHexString(c)); } else if (!isChar(c)) - error("illegal XML character", + error("illegal XML character", "U+" + Integer.toHexString(c)); buf.append(Character.toChars(c)); } @@ -1635,7 +1635,7 @@ public class XMLParser // We can't use java.net.URL here to do the parsing, as it searches for // a protocol handler. A protocol handler may not be registered for the // URL scheme here. Do it manually. - // + // // Set aside scheme and host portion of base URL String basePrefix = null; ci = base.indexOf(':'); @@ -1780,7 +1780,7 @@ public class XMLParser throws IOException, XMLStreamException { final int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF; - + requireWhitespace(); require("version"); readEq(); @@ -1791,9 +1791,9 @@ public class XMLParser input.xml11 = true; else throw new XMLStreamException("illegal XML version: " + xmlVersion); - + boolean white = tryWhitespace(); - + if (tryRead("encoding")) { if (!white) @@ -1802,7 +1802,7 @@ public class XMLParser xmlEncoding = readLiteral(flags, false); white = tryWhitespace(); } - + if (tryRead("standalone")) { if (!white) @@ -1837,7 +1837,7 @@ public class XMLParser ExternalIds ids = readExternalIds(false, true); doctype = this.new Doctype(rootName, ids.publicId, ids.systemId); - + // Parse internal subset first skipWhitespace(); if (tryRead('[')) @@ -2075,7 +2075,7 @@ public class XMLParser { int separator; ElementContentModel model = new ElementContentModel(); - + // Parse first content particle skipWhitespace(); model.addContentParticle(readContentParticle(acc)); @@ -2375,7 +2375,7 @@ public class XMLParser int flags = LIT_ATTRIBUTE; String value = null, defaultType = null; boolean saved = expandPE; - + if (!"CDATA".equals(type)) flags |= LIT_NORMALIZE; @@ -2599,7 +2599,7 @@ public class XMLParser int c; int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF; ExternalIds ids = new ExternalIds(); - + if (tryRead("PUBLIC")) { requireWhitespace(); @@ -3300,7 +3300,7 @@ public class XMLParser */ private void readEq() throws IOException, XMLStreamException - { + { skipWhitespace(); require('='); skipWhitespace(); @@ -3569,7 +3569,7 @@ public class XMLParser { return readNmtoken(isName, nmtokenBuf); } - + /** * Parses an NMTOKEN or Name production using the specified buffer. * @param isName if a Name, otherwise an NMTOKEN @@ -4123,7 +4123,7 @@ public class XMLParser (c >= 0x10000 && c < 0x110000) || c == 0xa || c == 0x9 || c == 0xd; } - + /** * Interns the specified text or not, depending on the value of * stringInterning. @@ -4141,7 +4141,7 @@ public class XMLParser { error(message, null); } - + /** * Report a parsing error. */ @@ -4403,7 +4403,7 @@ public class XMLParser { event = reader.next(); Location loc = reader.getLocation(); - System.out.print(loc.getLineNumber() + ":" + + System.out.print(loc.getLineNumber() + ":" + loc.getColumnNumber() + " "); switch (event) { @@ -4579,7 +4579,7 @@ public class XMLParser String uri = getNamespaceURI(prefix); if (uri == null && (auri == null || (input.xml11 && "".equals(auri)))) - return true; + return true; if (uri != null) { if ("".equals(uri) && input.xml11 && "".equals(auri)) @@ -4615,7 +4615,7 @@ public class XMLParser buf.append(']'); return buf.toString(); } - + } /** @@ -4661,7 +4661,7 @@ public class XMLParser /** * Map of anonymous keys to comments. - */ + */ private final LinkedHashMap comments = new LinkedHashMap(); /** @@ -4753,7 +4753,7 @@ public class XMLParser if (inExternalSubset) externalEntities.add(name); } - + /** * Adds an entity declaration. * @param name the entity name @@ -4916,7 +4916,7 @@ public class XMLParser { return entries.iterator(); } - + } /** @@ -4950,7 +4950,7 @@ public class XMLParser static final int ANY = 1; static final int ELEMENT = 2; static final int MIXED = 3; - + int min; int max; final int type; @@ -4963,7 +4963,7 @@ public class XMLParser min = 1; max = 1; } - + } /** @@ -4972,14 +4972,14 @@ public class XMLParser class EmptyContentModel extends ContentModel { - + EmptyContentModel() { super(ContentModel.EMPTY); min = 0; max = 0; } - + } /** @@ -4988,14 +4988,14 @@ public class XMLParser class AnyContentModel extends ContentModel { - + AnyContentModel() { super(ContentModel.ANY); min = 0; max = -1; } - + } /** @@ -5008,7 +5008,7 @@ public class XMLParser LinkedList contentParticles; boolean or; String regex; // regular expression cache - + ElementContentModel() { super(ContentModel.ELEMENT); @@ -5019,7 +5019,7 @@ public class XMLParser { contentParticles.add(cp); } - + } class ContentParticle @@ -5028,7 +5028,7 @@ public class XMLParser int min = 1; int max = 1; Object content; // Name (String) or ElementContentModel - + } /** @@ -5039,7 +5039,7 @@ public class XMLParser { private HashSet names; - + MixedContentModel() { super(ContentModel.MIXED); @@ -5055,7 +5055,7 @@ public class XMLParser { return names.contains(name); } - + } /** @@ -5063,7 +5063,7 @@ public class XMLParser */ class AttributeDecl { - + /** * The attribute type (CDATA, ID, etc). */ @@ -5105,7 +5105,7 @@ public class XMLParser this.values = values; this.external = external; } - + } /** @@ -5114,14 +5114,14 @@ public class XMLParser static class Input implements Location { - + int line = 1, markLine; int column, markColumn; int offset, markOffset; final String publicId, systemId, name; final boolean report; // report start- and end-entity final boolean normalize; // normalize CR, etc to LF - + InputStream in; Reader reader; UnicodeReader unicodeReader; @@ -5161,12 +5161,12 @@ public class XMLParser } // -- Location -- - + public int getCharacterOffset() { return offset; } - + public int getColumnNumber() { return column; @@ -5295,7 +5295,7 @@ public class XMLParser } // Detection of input encoding - + private static final int[] SIGNATURE_UCS_4_1234 = new int[] { 0x00, 0x00, 0x00, 0x3c }; private static final int[] SIGNATURE_UCS_4_4321 = @@ -5316,7 +5316,7 @@ public class XMLParser new int[] { 0x3c, 0x3f, 0x78, 0x6d }; private static final int[] SIGNATURE_UTF_8_BOM = new int[] { 0xef, 0xbb, 0xbf }; - + /** * Detect the input encoding. */ @@ -5351,7 +5351,7 @@ public class XMLParser else if (equals(SIGNATURE_UCS_4_2143, signature) || equals(SIGNATURE_UCS_4_3412, signature)) throw new UnsupportedEncodingException("unsupported UCS-4 byte ordering"); - + // 2-byte encodings else if (equals(SIGNATURE_UCS_2_12, signature)) { @@ -5401,7 +5401,7 @@ public class XMLParser } return true; } - + void setInputEncoding(String encoding) throws IOException { @@ -5432,4 +5432,3 @@ public class XMLParser } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java index 1549420c9df..83b8f723986 100644 --- a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java @@ -1,4 +1,4 @@ -/* XMLStreamWriterImpl.java -- +/* XMLStreamWriterImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -84,7 +84,7 @@ public class XMLStreamWriterImpl * in scope. */ protected NamespaceContext namespaceContext; - + /** * The stack of elements in scope. * Used to close the remaining elements. @@ -100,7 +100,7 @@ public class XMLStreamWriterImpl * Whether we are in an empty element. */ private boolean emptyElement; - + private NamespaceSupport namespaces; private int count = 0; @@ -153,10 +153,10 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + writer.write('<'); writer.write(localName); - + elements.addLast(new String[] { null, localName }); inStartElement = true; } @@ -180,7 +180,7 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + String prefix = getPrefix(namespaceURI); boolean isDeclared = (prefix != null); if (!isDeclared) @@ -203,7 +203,7 @@ public class XMLStreamWriterImpl { writeNamespaceImpl(prefix, namespaceURI); } - + elements.addLast(new String[] { prefix, localName }); } catch (IOException e) @@ -249,7 +249,7 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + String currentPrefix = getPrefix(namespaceURI); boolean isCurrent = prefix.equals(currentPrefix); writer.write('<'); @@ -263,7 +263,7 @@ public class XMLStreamWriterImpl { writeNamespaceImpl(prefix, namespaceURI); } - + elements.addLast(new String[] { prefix, localName }); inStartElement = true; } @@ -451,7 +451,7 @@ public class XMLStreamWriterImpl throw new IllegalArgumentException("illegal Name: " + localName); if (!isChars(value)) throw new IllegalArgumentException("illegal character: " + value); - + String prefix = getPrefix(namespaceURI); if (prefix == null) { @@ -522,7 +522,7 @@ public class XMLStreamWriterImpl prefix = XMLConstants.DEFAULT_NS_PREFIX; setPrefix(prefix, namespaceURI); - + writer.write(' '); writer.write("xmlns"); if (!XMLConstants.DEFAULT_NS_PREFIX.equals(prefix)) @@ -566,7 +566,7 @@ public class XMLStreamWriterImpl throw new IllegalArgumentException("illegal comment: " + data); endStartElement(); - + writer.write(" next) so that subsystems @@ -191,48 +191,48 @@ public class Resolver implements EntityResolver, Cloneable * content typing. * * @param contentType the MIME content type that will be parsed; must - * not be null. + * not be null. * @return the appropriate encoding, or null if the content type is - * not text and there's no charset=... attribute + * not text and there's no charset=... attribute */ static public String getEncoding (String contentType) { - // currently a dumb parsing algorithm that works "mostly" and handles - // ..anything...charset=ABC - // ..anything...charset=ABC;otherAttr=DEF - // ..anything...charset=ABC (comment);otherAttr=DEF - // ..anything...charset= "ABC" (comment);otherAttr=DEF + // currently a dumb parsing algorithm that works "mostly" and handles + // ..anything...charset=ABC + // ..anything...charset=ABC;otherAttr=DEF + // ..anything...charset=ABC (comment);otherAttr=DEF + // ..anything...charset= "ABC" (comment);otherAttr=DEF - int temp; - String encoding; - String defValue = null; + int temp; + String encoding; + String defValue = null; - if (contentType.startsWith ("text/")) - defValue = contentType.startsWith ("text/html") - ? "ISO-8859-1" : "US-ASCII"; + if (contentType.startsWith ("text/")) + defValue = contentType.startsWith ("text/html") + ? "ISO-8859-1" : "US-ASCII"; - // Assumes 'charset' is only an attribute name, not part - // of a value, comment, or other attribute name - // ALSO assumes no escaped values like "\;" or "\)" - if ((temp = contentType.indexOf ("charset")) != -1) { - // strip out everything up to '=' ... - temp = contentType.indexOf ('=', temp); - if (temp == -1) - return defValue; - encoding = contentType.substring (temp + 1); - // ... and any subsequent attributes - if ((temp = encoding.indexOf (';')) != -1) - encoding = encoding.substring (0, temp); - // ... and any comments after value - if ((temp = encoding.indexOf ('(')) != -1) - encoding = encoding.substring (0, temp); - // ... then whitespace, and any (double) quotes - encoding = encoding.trim (); - if (encoding.charAt (0) == '"') - encoding = encoding.substring (1, encoding.length () - 1); - } else - encoding = defValue; - return encoding; + // Assumes 'charset' is only an attribute name, not part + // of a value, comment, or other attribute name + // ALSO assumes no escaped values like "\;" or "\)" + if ((temp = contentType.indexOf ("charset")) != -1) { + // strip out everything up to '=' ... + temp = contentType.indexOf ('=', temp); + if (temp == -1) + return defValue; + encoding = contentType.substring (temp + 1); + // ... and any subsequent attributes + if ((temp = encoding.indexOf (';')) != -1) + encoding = encoding.substring (0, temp); + // ... and any comments after value + if ((temp = encoding.indexOf ('(')) != -1) + encoding = encoding.substring (0, temp); + // ... then whitespace, and any (double) quotes + encoding = encoding.trim (); + if (encoding.charAt (0) == '"') + encoding = encoding.substring (1, encoding.length () - 1); + } else + encoding = defValue; + return encoding; } @@ -243,21 +243,21 @@ public class Resolver implements EntityResolver, Cloneable public InputSource resolveEntity (String publicId, String systemId) throws IOException, SAXException { - InputSource retval = null; - String uri; + InputSource retval = null; + String uri; - if (publicId != null - && ((uri = (String) pubidMapping.get (publicId)) != null)) { - retval = new InputSource (uri); - retval.setPublicId (publicId); - } + if (publicId != null + && ((uri = (String) pubidMapping.get (publicId)) != null)) { + retval = new InputSource (uri); + retval.setPublicId (publicId); + } - // Could do URN resolution here + // Could do URN resolution here - // URL resolution always done by parser + // URL resolution always done by parser - // FIXME: chain to "next" resolver + // FIXME: chain to "next" resolver - return retval; + return retval; } } diff --git a/libjava/classpath/gnu/xml/util/SAXNullTransformerFactory.java b/libjava/classpath/gnu/xml/util/SAXNullTransformerFactory.java index 81ad8231270..3a97678e093 100644 --- a/libjava/classpath/gnu/xml/util/SAXNullTransformerFactory.java +++ b/libjava/classpath/gnu/xml/util/SAXNullTransformerFactory.java @@ -1,4 +1,4 @@ -/* SAXNullTransformerFactory.java -- +/* SAXNullTransformerFactory.java -- Copyright (C) 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,17 +95,17 @@ import org.xml.sax.helpers.LocatorImpl; */ public class SAXNullTransformerFactory extends SAXTransformerFactory { - - private ErrorListener errListener; - private URIResolver uriResolver; - + + private ErrorListener errListener; + private URIResolver uriResolver; + /** Default constructor */ public SAXNullTransformerFactory () { } - + // // only has stuff that makes sense with null transforms // - + /** * Returns true if the requested feature is supported. * All three kinds of input and output are accepted: @@ -172,14 +172,14 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory public TransformerHandler newTransformerHandler () throws TransformerConfigurationException { - NullTransformer transformer = new NullTransformer (); + NullTransformer transformer = new NullTransformer (); return transformer.handler; } // // Stuff that depends on XSLT support, which we don't provide // - private static final String noXSLT = "No XSLT support"; + private static final String noXSLT = "No XSLT support"; /** Throws an exception (XSLT is not supported). */ public Transformer newTransformer (Source stylesheet) @@ -271,15 +271,15 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory super (DomDocument.class); setHandler (new DomHandler (this, result)); } - + } static class DomHandler extends Consumer.Backdoor { - - private DOMResult result; - + + private DOMResult result; + DomHandler (DomConsumer c, DOMResult r) throws SAXException { @@ -294,33 +294,33 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory super.endDocument (); result.setNode (getDocument ()); } - + } private static OutputStream getOutputStream (String uri) throws IOException { - // JDK stupidity: file "protocol does not support output" ... + // JDK stupidity: file "protocol does not support output" ... if (uri.startsWith ("file:")) return new FileOutputStream (uri.substring (5)); - + // Otherwise ... - URL url = new URL (uri); - URLConnection conn = url.openConnection (); - + URL url = new URL (uri); + URLConnection conn = url.openConnection (); + conn.setDoOutput (true); return conn.getOutputStream (); } - + static class NullHandler extends EventFilter implements TransformerHandler { - - private String systemId; - private Transformer transformer; - + + private String systemId; + private Transformer transformer; + NullHandler (Transformer t) { transformer = t; @@ -345,24 +345,24 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory { if (result.getSystemId () != null) systemId = result.getSystemId (); - + try { - + // output to partial SAX event stream? if (result instanceof SAXResult) { - SAXResult r = (SAXResult) result; - + SAXResult r = (SAXResult) result; + setContentHandler (r.getHandler ()); setProperty (LEXICAL_HANDLER, r.getLexicalHandler ()); // DTD info is filtered out by javax.transform - + // output to DOM tree? } else if (result instanceof DOMResult) { - DomTerminus out = new DomTerminus ((DOMResult) result); + DomTerminus out = new DomTerminus ((DOMResult) result); setContentHandler (out.getContentHandler ()); setProperty (LEXICAL_HANDLER, @@ -378,8 +378,8 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory } else if (result instanceof StreamResult) { - StreamResult r = (StreamResult) result; - XMLWriter out; + StreamResult r = (StreamResult) result; + XMLWriter out; // FIXME: when do output properties take effect? // encoding, standalone decl, xml/xhtml/... ... @@ -416,7 +416,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory setDTDHandler (out); setProperty (DECL_HANDLER, out); } - + } catch (SAXException e) { @@ -434,7 +434,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory extends LocatorImpl implements SourceLocator { - + LocatorAdapter (SAXParseException e) { setSystemId (e.getSystemId ()); @@ -442,21 +442,21 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory setLineNumber (e.getLineNumber ()); setColumnNumber (e.getColumnNumber ()); } - + } // another interface that adds no value static class ListenerAdapter implements ErrorHandler { - - NullTransformer transformer; - + + NullTransformer transformer; + ListenerAdapter (NullTransformer t) { transformer = t; } - + private TransformerException map (SAXParseException e) { return new TransformerException ( @@ -514,36 +514,36 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory static class NullTransformer extends Transformer { - - private URIResolver uriResolver; - private Properties props = new Properties (); - private Hashtable params = new Hashtable (7); - - ErrorListener errListener = null; - TransformerException ex = null; - NullHandler handler; - + + private URIResolver uriResolver; + private Properties props = new Properties (); + private Hashtable params = new Hashtable (7); + + ErrorListener errListener = null; + TransformerException ex = null; + NullHandler handler; + NullTransformer () { super (); handler = new NullHandler (this); } - + public ErrorListener getErrorListener () { return errListener; } - + public void setErrorListener (ErrorListener e) { errListener = e; } - + public URIResolver getURIResolver () { return uriResolver; } - + public void setURIResolver (URIResolver u) { uriResolver = u; @@ -553,7 +553,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory { props = (Properties) p.clone (); } - + public Properties getOutputProperties () { return (Properties) props.clone (); @@ -563,7 +563,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory { props.setProperty (name, value); } - + public String getOutputProperty (String name) { return props.getProperty (name); @@ -573,12 +573,12 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory { params.clear (); } - + public void setParameter (String name, Object value) { props.put (name, value); } - + public Object getParameter (String name) { return props.get (name); @@ -589,29 +589,29 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory { try { - XMLReader producer; - InputSource input; - + XMLReader producer; + InputSource input; + // Input from DOM? if (in instanceof DOMSource) { - DOMSource source = (DOMSource) in; - + DOMSource source = (DOMSource) in; + if (source.getNode () == null) throw new IllegalArgumentException ("no DOM node"); producer = new DomParser (source.getNode ()); input = null; - + // Input from SAX? } else if (in instanceof SAXSource) { - SAXSource source = (SAXSource) in; - + SAXSource source = (SAXSource) in; + producer = source.getXMLReader (); if (producer == null) producer = XMLReaderFactory.createXMLReader (); - + input = source.getInputSource (); if (input == null) { @@ -621,7 +621,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory throw new IllegalArgumentException ( "missing SAX input"); } - + // Input from a stream or something? } else @@ -631,7 +631,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory if (input == null) throw new IllegalArgumentException ("missing input"); } - + // preserve original namespace prefixes try { @@ -644,19 +644,19 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory /* ignore */ // FIXME if we couldn't, "NsFix" stage before the output .. } - + // arrange the output handler.setResult (out); EventFilter.bind (producer, handler); - + // then parse ... single element pipeline producer.parse (input); - + } catch (IOException e) { throw new TransformerException ("transform failed", e); - + } catch (SAXException e) { @@ -664,7 +664,7 @@ public class SAXNullTransformerFactory extends SAXTransformerFactory throw ex; else throw new TransformerException ("transform failed", e); - + } finally { diff --git a/libjava/classpath/gnu/xml/util/XCat.java b/libjava/classpath/gnu/xml/util/XCat.java index 93127f44211..ea23ad682fe 100644 --- a/libjava/classpath/gnu/xml/util/XCat.java +++ b/libjava/classpath/gnu/xml/util/XCat.java @@ -1,4 +1,4 @@ -/* XCat.java -- +/* XCat.java -- Copyright (C) 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,15 +76,15 @@ import org.xml.sax.helpers.XMLReaderFactory; *

    This has three main operational modes. The primary intended mode is * to create a resolver, then preloading it with one or more site-standard * catalogs before using it with one or more SAX parsers: 

    - *	XCat	catalog = new XCat ();
- *	catalog.setErrorHandler (diagnosticErrorHandler);
- *	catalog.loadCatalog ("file:/local/catalogs/catalog.cat");
- *	catalog.loadCatalog ("http://shared/catalog.cat");
- *	...
- *	catalog.disableLoading ();
- *	parser1.setEntityResolver (catalog);
- *	parser2.setEntityResolver (catalog);
- *	...
    + * XCat catalog = new XCat (); + * catalog.setErrorHandler (diagnosticErrorHandler); + * catalog.loadCatalog ("file:/local/catalogs/catalog.cat"); + * catalog.loadCatalog ("http://shared/catalog.cat"); + * ... + * catalog.disableLoading (); + * parser1.setEntityResolver (catalog); + * parser2.setEntityResolver (catalog); + * ... * *

    A second mode is to arrange that your application uses instances of * this class as its entity resolver, and automatically loads catalogs @@ -127,25 +127,25 @@ import org.xml.sax.helpers.XMLReaderFactory; */ public class XCat implements EntityResolver2 { - private Catalog catalogs []; - private boolean usingPublic = true; - private boolean loadingPermitted = true; - private boolean unified = true; - private String parserClass; - private ErrorHandler errorHandler; + private Catalog catalogs []; + private boolean usingPublic = true; + private boolean loadingPermitted = true; + private boolean unified = true; + private String parserClass; + private ErrorHandler errorHandler; - // private EntityResolver next; // chain to next if we fail... + // private EntityResolver next; // chain to next if we fail... // // NOTE: This is a straightforward implementation, and if // there are lots of "nextCatalog" or "delegate*" entries // in use, two tweaks would be worth considering: // - // - Centralize some sort of cache (key by URI) for individual - // resolvers. That'd avoid multiple copies of a given catalog. + // - Centralize some sort of cache (key by URI) for individual + // resolvers. That'd avoid multiple copies of a given catalog. // - // - Have resolution track what catalogs (+modes) have been - // searched. This would support loop detection. + // - Have resolution track what catalogs (+modes) have been + // searched. This would support loop detection. // @@ -170,7 +170,7 @@ public class XCat implements EntityResolver2 */ public XCat (String uri) throws SAXException, IOException - { loadCatalog (uri); } + { loadCatalog (uri); } /** @@ -188,7 +188,7 @@ public class XCat implements EntityResolver2 * *

    Note that catalogs referenced by this one will not be loaded * at this time. Catalogs referenced through nextCatalog - * or delegate* elements are normally loaded only if needed. + * or delegate* elements are normally loaded only if needed. * * @see #setErrorHandler * @see #setParserClass @@ -197,44 +197,44 @@ public class XCat implements EntityResolver2 * @param uri absolute URI for the catalog file. * * @exception IOException As thrown by the parser, typically to - * indicate problems reading data from that URI. + * indicate problems reading data from that URI. * @exception SAXException As thrown by the parser, typically to - * indicate problems parsing data from that URI. It may also - * be thrown if the parser doesn't support necessary handlers. + * indicate problems parsing data from that URI. It may also + * be thrown if the parser doesn't support necessary handlers. * @exception IllegalStateException When attempting to load a - * catalog after loading has been {@link #disableLoading disabled}, - * such as after any entity or URI lookup has been performed. + * catalog after loading has been {@link #disableLoading disabled}, + * such as after any entity or URI lookup has been performed. */ public synchronized void loadCatalog (String uri) throws SAXException, IOException { - Catalog catalog; - int index = -1; + Catalog catalog; + int index = -1; - if (!loadingPermitted) - throw new IllegalStateException (); - - uri = normalizeURI (uri); - if (catalogs != null) { - // maybe just reload - for (index = 0; index < catalogs.length; index++) - if (uri.equals (catalogs [index].catalogURI)) - break; - } - catalog = loadCatalog (parserClass, errorHandler, uri, unified); + if (!loadingPermitted) + throw new IllegalStateException (); - // add to list of catalogs - if (catalogs == null) { - index = 0; - catalogs = new Catalog [1]; - } else if (index == catalogs.length) { - Catalog tmp []; + uri = normalizeURI (uri); + if (catalogs != null) { + // maybe just reload + for (index = 0; index < catalogs.length; index++) + if (uri.equals (catalogs [index].catalogURI)) + break; + } + catalog = loadCatalog (parserClass, errorHandler, uri, unified); - tmp = new Catalog [index + 1]; - System.arraycopy (catalogs, 0, tmp, 0, index); - catalogs = tmp; - } - catalogs [index] = catalog; + // add to list of catalogs + if (catalogs == null) { + index = 0; + catalogs = new Catalog [1]; + } else if (index == catalogs.length) { + Catalog tmp []; + + tmp = new Catalog [index + 1]; + System.arraycopy (catalogs, 0, tmp, 0, index); + catalogs = tmp; + } + catalogs [index] = catalog; } @@ -251,38 +251,38 @@ public class XCat implements EntityResolver2 * @param publicId Either a normalized public ID, or null. * @param baseURI Absolute base URI associated with systemId. * @param systemId URI found in entity declaration (may be - * relative to baseURI). + * relative to baseURI). * * @return Input source for accessing the external entity, or null - * if no mapping was found. The input source may have opened - * the stream, and will have a fully resolved URI. + * if no mapping was found. The input source may have opened + * the stream, and will have a fully resolved URI. * * @see #getExternalSubset */ public InputSource resolveEntity ( - String name, // UNUSED ... systemId is always non-null - String publicId, - String baseURI, // UNUSED ... it just lets sysId be relative - String systemId + String name, // UNUSED ... systemId is always non-null + String publicId, + String baseURI, // UNUSED ... it just lets sysId be relative + String systemId ) throws SAXException, IOException { - if (loadingPermitted) - disableLoading (); + if (loadingPermitted) + disableLoading (); - try { - // steps as found in OASIS XML catalog spec 7.1.2 - // steps 1, 8 involve looping over the list of catalogs - for (int i = 0; i < catalogs.length; i++) { - InputSource retval; - retval = catalogs [i].resolve (usingPublic, publicId, systemId); - if (retval != null) - return retval; - } - } catch (DoneDelegation x) { - // done! - } - // step 9 involves returning "no match" - return null; + try { + // steps as found in OASIS XML catalog spec 7.1.2 + // steps 1, 8 involve looping over the list of catalogs + for (int i = 0; i < catalogs.length; i++) { + InputSource retval; + retval = catalogs [i].resolve (usingPublic, publicId, systemId); + if (retval != null) + return retval; + } + } catch (DoneDelegation x) { + // done! + } + // step 9 involves returning "no match" + return null; } @@ -302,28 +302,28 @@ public class XCat implements EntityResolver2 * certain well formedess errors. * * @param name Name of the document element, either as declared in - * a DOCTYPE declaration or as observed in the text. + * a DOCTYPE declaration or as observed in the text. * @param baseURI Document's base URI (absolute). * * @return Input source for accessing the external subset, or null - * if no mapping was found. The input source may have opened - * the stream, and will have a fully resolved URI. + * if no mapping was found. The input source may have opened + * the stream, and will have a fully resolved URI. */ public InputSource getExternalSubset (String name, String baseURI) throws SAXException, IOException { - if (loadingPermitted) - disableLoading (); - try { - for (int i = 0; i < catalogs.length; i++) { - InputSource retval = catalogs [i].getExternalSubset (name); - if (retval != null) - return retval; - } - } catch (DoneDelegation x) { - // done! - } - return null; + if (loadingPermitted) + disableLoading (); + try { + for (int i = 0; i < catalogs.length; i++) { + InputSource retval = catalogs [i].getExternalSubset (name); + if (retval != null) + return retval; + } + } catch (DoneDelegation x) { + // done! + } + return null; } @@ -335,23 +335,23 @@ public class XCat implements EntityResolver2 * *

    The functional limitations of this interface include:

      * - *
    • Since system IDs will be absolutized before the resolver - * sees them, matching against relative URIs won't work. - * This may affect system, rewriteSystem, - * and delegateSystem catalog entries. + *
    • Since system IDs will be absolutized before the resolver + * sees them, matching against relative URIs won't work. + * This may affect system, rewriteSystem, + * and delegateSystem catalog entries. * - *
    • Because of that absolutization, documents declaring entities - * with system IDs using URI schemes that the JVM does not recognize - * may be unparsable. URI schemes such as file:/, - * http://, https://, and ftp:// - * will usually work reliably. + *
    • Because of that absolutization, documents declaring entities + * with system IDs using URI schemes that the JVM does not recognize + * may be unparsable. URI schemes such as file:/, + * http://, https://, and ftp:// + * will usually work reliably. * - *
    • Because missing external subsets can't be provided, the - * doctype catalog entries will be ignored. - * (The {@link #getExternalSubset getExternalSubset()} method is - * a "New Style" resolution option.) + *
    • Because missing external subsets can't be provided, the + * doctype catalog entries will be ignored. + * (The {@link #getExternalSubset getExternalSubset()} method is + * a "New Style" resolution option.) * - *
    + * * *

    Applications can tell whether this limited functionality will be * used: if the feature flag associated with the {@link EntityResolver2} @@ -365,13 +365,13 @@ public class XCat implements EntityResolver2 * @param systemId Always an absolute URI. * * @return Input source for accessing the external entity, or null - * if no mapping was found. The input source may have opened - * the stream, and will have a fully resolved URI. + * if no mapping was found. The input source may have opened + * the stream, and will have a fully resolved URI. */ final public InputSource resolveEntity (String publicId, String systemId) throws SAXException, IOException { - return resolveEntity (null, publicId, null, systemId); + return resolveEntity (null, publicId, null, systemId); } @@ -398,40 +398,40 @@ public class XCat implements EntityResolver2 * @see #setUnified * * @param baseURI The relevant base URI as specified by the XML Base - * specification. This recognizes xml:base attributes - * as overriding the actual (physical) base URI. + * specification. This recognizes xml:base attributes + * as overriding the actual (physical) base URI. * @param uri Either an absolute URI, or one relative to baseURI * * @return Input source for accessing the mapped URI, or null - * if no mapping was found. The input source may have opened - * the stream, and will have a fully resolved URI. + * if no mapping was found. The input source may have opened + * the stream, and will have a fully resolved URI. */ public InputSource resolveURI (String baseURI, String uri) throws SAXException, IOException { - if (loadingPermitted) - disableLoading (); + if (loadingPermitted) + disableLoading (); - // NOTE: baseURI isn't used here, but caller MUST have it, - // and heuristics _might_ use it in the future ... plus, - // it's symmetric with resolveEntity (). + // NOTE: baseURI isn't used here, but caller MUST have it, + // and heuristics _might_ use it in the future ... plus, + // it's symmetric with resolveEntity (). - // steps 1, 6 involve looping - try { - for (int i = 0; i < catalogs.length; i++) { - InputSource tmp = catalogs [i].resolveURI (uri); - if (tmp != null) - return tmp; - } - } catch (DoneDelegation x) { - // done - } - // step 7 reports no match - return null; + // steps 1, 6 involve looping + try { + for (int i = 0; i < catalogs.length; i++) { + InputSource tmp = catalogs [i].resolveURI (uri); + if (tmp != null) + return tmp; + } + } catch (DoneDelegation x) { + // done + } + // step 7 reports no match + return null; } - /** + /** * Records that catalog loading is no longer permitted. * Loading is automatically disabled when lookups are performed, * and should be manually disabled when startDTD() (or @@ -440,12 +440,12 @@ public class XCat implements EntityResolver2 */ public synchronized void disableLoading () { - // NOTE: this method and loadCatalog() are synchronized - // so that it's impossible to load (top level) catalogs - // after lookups start. Likewise, deferred loading is also - // synchronized (for "next" and delegated catalogs) to - // ensure that parsers can share resolvers. - loadingPermitted = false; + // NOTE: this method and loadCatalog() are synchronized + // so that it's impossible to load (top level) catalogs + // after lookups start. Likewise, deferred loading is also + // synchronized (for "next" and delegated catalogs) to + // ensure that parsers can share resolvers. + loadingPermitted = false; } @@ -457,12 +457,12 @@ public class XCat implements EntityResolver2 * @see #setErrorHandler */ public ErrorHandler getErrorHandler () - { return errorHandler; } + { return errorHandler; } /** * Assigns the error handler used to report catalog errors. * These errors may come either from the SAX2 parser or - * from the catalog parsing code driven by the parser. + * from the catalog parsing code driven by the parser. * *

    If you're sharing the resolver between parsers, don't * change this once lookups have begun. @@ -470,10 +470,10 @@ public class XCat implements EntityResolver2 * @see #getErrorHandler * * @param parser The error handler, or null saying to use the default - * (no diagnostics, and only fatal errors terminate loading). + * (no diagnostics, and only fatal errors terminate loading). */ public void setErrorHandler (ErrorHandler handler) - { errorHandler = handler; } + { errorHandler = handler; } /** @@ -482,7 +482,7 @@ public class XCat implements EntityResolver2 * @see #setParserClass */ public String getParserClass () - { return parserClass; } + { return parserClass; } /** * Names the SAX2 parser class used to parse catalogs. @@ -498,10 +498,10 @@ public class XCat implements EntityResolver2 * @see #getParserClass * * @param parser The parser class name, or null saying to use the - * system default SAX2 parser. + * system default SAX2 parser. */ public void setParserClass (String parser) - { parserClass = parser; } + { parserClass = parser; } /** @@ -527,7 +527,7 @@ public class XCat implements EntityResolver2 * @see #setUnified */ public boolean isUnified () - { return unified; } + { return unified; } /** * Assigns the value of the flag returned by {@link #isUnified}. @@ -540,7 +540,7 @@ public class XCat implements EntityResolver2 * @param value new flag setting */ public void setUnified (boolean value) - { unified = value; } + { unified = value; } /** @@ -556,7 +556,7 @@ public class XCat implements EntityResolver2 * @see #setUsingPublic */ public boolean isUsingPublic () - { return usingPublic; } + { return usingPublic; } /** * Specifies which catalog search mode is used. @@ -572,150 +572,150 @@ public class XCat implements EntityResolver2 * @see #isUsingPublic * * @param value true to always use public identifier mappings, - * false to only use them for system ids using the urn:publicid: - * URI scheme. + * false to only use them for system ids using the urn:publicid: + * URI scheme. */ public void setUsingPublic (boolean value) - { usingPublic = value; } + { usingPublic = value; } // hmm, what's this do? :) private static Catalog loadCatalog ( - String parserClass, - ErrorHandler eh, - String uri, - boolean unified + String parserClass, + ErrorHandler eh, + String uri, + boolean unified ) throws SAXException, IOException { - XMLReader parser; - Loader loader; - boolean doesIntern = false; + XMLReader parser; + Loader loader; + boolean doesIntern = false; - if (parserClass == null) - parser = XMLReaderFactory.createXMLReader (); - else - parser = XMLReaderFactory.createXMLReader (parserClass); - if (eh != null) - parser.setErrorHandler (eh); - // resolve-dtd-entities is at default value (unrecognized == true) + if (parserClass == null) + parser = XMLReaderFactory.createXMLReader (); + else + parser = XMLReaderFactory.createXMLReader (parserClass); + if (eh != null) + parser.setErrorHandler (eh); + // resolve-dtd-entities is at default value (unrecognized == true) - try { - doesIntern = parser.getFeature ( - "http://xml.org/sax/features/string-interning"); - } catch (SAXNotRecognizedException e) { } + try { + doesIntern = parser.getFeature ( + "http://xml.org/sax/features/string-interning"); + } catch (SAXNotRecognizedException e) { } - loader = new Loader (doesIntern, eh, unified); - loader.cat.parserClass = parserClass; - loader.cat.catalogURI = uri; + loader = new Loader (doesIntern, eh, unified); + loader.cat.parserClass = parserClass; + loader.cat.catalogURI = uri; - parser.setContentHandler (loader); - parser.setProperty ( - "http://xml.org/sax/properties/declaration-handler", - loader); - parser.setProperty ( - "http://xml.org/sax/properties/lexical-handler", - loader); - parser.parse (uri); + parser.setContentHandler (loader); + parser.setProperty ( + "http://xml.org/sax/properties/declaration-handler", + loader); + parser.setProperty ( + "http://xml.org/sax/properties/lexical-handler", + loader); + parser.parse (uri); - return loader.cat; + return loader.cat; } // perform one or both the normalizations for public ids private static String normalizePublicId (boolean full, String publicId) { - if (publicId.startsWith ("urn:publicid:")) { - CPStringBuilder buf = new CPStringBuilder (); - char chars [] = publicId.toCharArray (); + if (publicId.startsWith ("urn:publicid:")) { + CPStringBuilder buf = new CPStringBuilder (); + char chars [] = publicId.toCharArray (); boolean hasbug = false; - for (int i = 13; i < chars.length; i++) { - switch (chars [i]) { - case '+': buf.append (' '); continue; - case ':': buf.append ("//"); continue; - case ';': buf.append ("::"); continue; - case '%': + for (int i = 13; i < chars.length; i++) { + switch (chars [i]) { + case '+': buf.append (' '); continue; + case ':': buf.append ("//"); continue; + case ';': buf.append ("::"); continue; + case '%': // FIXME unhex that char! meanwhile, warn and fallthrough ... - hasbug = true; - default: buf.append (chars [i]); continue; - } - } - publicId = buf.toString (); + hasbug = true; + default: buf.append (chars [i]); continue; + } + } + publicId = buf.toString (); if (hasbug) System.err.println ("nyet unhexing public id: " + publicId); - full = true; - } + full = true; + } - // SAX parsers do everything except that URN mapping, but - // we can't trust other sources to normalize correctly - if (full) { - StringTokenizer tokens; - String token; + // SAX parsers do everything except that URN mapping, but + // we can't trust other sources to normalize correctly + if (full) { + StringTokenizer tokens; + String token; - tokens = new StringTokenizer (publicId, " \r\n"); - publicId = null; - while (tokens.hasMoreTokens ()) { - if (publicId == null) - publicId = tokens.nextToken (); - else - publicId += " " + tokens.nextToken (); - } - } - return publicId; + tokens = new StringTokenizer (publicId, " \r\n"); + publicId = null; + while (tokens.hasMoreTokens ()) { + if (publicId == null) + publicId = tokens.nextToken (); + else + publicId += " " + tokens.nextToken (); + } + } + return publicId; } private static boolean isUriExcluded (int c) - { return c <= 0x20 || c >= 0x7f || "\"<>^`{|}".indexOf (c) != -1; } + { return c <= 0x20 || c >= 0x7f || "\"<>^`{|}".indexOf (c) != -1; } private static int hexNibble (int c) { - if (c < 10) - return c + '0'; - return ('a' - 10) + c; + if (c < 10) + return c + '0'; + return ('a' - 10) + c; } // handles URIs with "excluded" characters private static String normalizeURI (String systemId) { - int length = systemId.length (); + int length = systemId.length (); - for (int i = 0; i < length; i++) { - char c = systemId.charAt (i); + for (int i = 0; i < length; i++) { + char c = systemId.charAt (i); - // escape non-ASCII plus "excluded" characters - if (isUriExcluded (c)) { - byte buf []; - ByteArrayOutputStream out; - int b; + // escape non-ASCII plus "excluded" characters + if (isUriExcluded (c)) { + byte buf []; + ByteArrayOutputStream out; + int b; - // a JVM that doesn't know UTF8 and 8859_1 is unusable! - try { - buf = systemId.getBytes ("UTF8"); - out = new ByteArrayOutputStream (buf.length + 10); + // a JVM that doesn't know UTF8 and 8859_1 is unusable! + try { + buf = systemId.getBytes ("UTF8"); + out = new ByteArrayOutputStream (buf.length + 10); - for (i = 0; i < buf.length; i++) { - b = buf [i] & 0x0ff; - if (isUriExcluded (b)) { - out.write ((int) '%'); - out.write (hexNibble (b >> 4)); - out.write (hexNibble (b & 0x0f)); - } else - out.write (b); - } - return out.toString ("8859_1"); - } catch (IOException e) { - throw new RuntimeException ( - "can't normalize URI: " + e.getMessage ()); - } - } - } - return systemId; + for (i = 0; i < buf.length; i++) { + b = buf [i] & 0x0ff; + if (isUriExcluded (b)) { + out.write ((int) '%'); + out.write (hexNibble (b >> 4)); + out.write (hexNibble (b & 0x0f)); + } else + out.write (b); + } + return out.toString ("8859_1"); + } catch (IOException e) { + throw new RuntimeException ( + "can't normalize URI: " + e.getMessage ()); + } + } + } + return systemId; } // thrown to mark authoritative end of a search private static class DoneDelegation extends SAXException { - DoneDelegation () { } + DoneDelegation () { } } @@ -725,359 +725,359 @@ System.err.println ("nyet unhexing public id: " + publicId); */ private static class Catalog { - // loading infrastructure - String catalogURI; - ErrorHandler eh; - boolean unified; - String parserClass; + // loading infrastructure + String catalogURI; + ErrorHandler eh; + boolean unified; + String parserClass; - // catalog data - boolean hasPreference; - boolean usingPublic; + // catalog data + boolean hasPreference; + boolean usingPublic; - Hashtable publicIds; - Hashtable publicDelegations; + Hashtable publicIds; + Hashtable publicDelegations; - Hashtable systemIds; - Hashtable systemRewrites; - Hashtable systemDelegations; + Hashtable systemIds; + Hashtable systemRewrites; + Hashtable systemDelegations; - Hashtable uris; - Hashtable uriRewrites; - Hashtable uriDelegations; + Hashtable uris; + Hashtable uriRewrites; + Hashtable uriDelegations; - Hashtable doctypes; + Hashtable doctypes; - Vector next; + Vector next; - // nonpublic! - Catalog () { } - - - // steps as found in OASIS XML catalog spec 7.1.2 - private InputSource locatePublicId (String publicId) - throws SAXException, IOException - { - // 5. return (first) 'public' entry - if (publicIds != null) { - String retval = (String) publicIds.get (publicId); - if (retval != null) { - // IF the URI is accessible ... - return new InputSource (retval); - } - } - - // 6. return delegatePublic catalog match [complex] - if (publicDelegations != null) - return checkDelegations (publicDelegations, publicId, - publicId, null); - - return null; - } - - // steps as found in OASIS XML catalog spec 7.1.2 or 7.2.2 - private InputSource mapURI ( - String uri, - Hashtable ids, - Hashtable rewrites, - Hashtable delegations - ) throws SAXException, IOException - { - // 7.1.2: 2. return (first) 'system' entry - // 7.2.2: 2. return (first) 'uri' entry - if (ids != null) { - String retval = (String) ids.get (uri); - if (retval != null) { - // IF the URI is accessible ... - return new InputSource (retval); - } - } - - // 7.1.2: 3. return 'rewriteSystem' entries - // 7.2.2: 3. return 'rewriteURI' entries - if (rewrites != null) { - String prefix = null; - String replace = null; - int prefixLen = -1; - - for (Enumeration e = rewrites.keys (); - e.hasMoreElements (); - /* NOP */) { - String temp = (String) e.nextElement (); - int len = -1; - - if (!uri.startsWith (temp)) - continue; - if (prefix != null - && (len = temp.length ()) < prefixLen) - continue; - prefix = temp; - prefixLen = len; - replace = (String) rewrites.get (temp); - } - if (prefix != null) { - CPStringBuilder buf = new CPStringBuilder (replace); - buf.append (uri.substring (prefixLen)); - // IF the URI is accessible ... - return new InputSource (buf.toString ()); - } - } - - // 7.1.2: 4. return 'delegateSystem' catalog match [complex] - // 7.2.2: 4. return 'delegateURI' catalog match [complex] - if (delegations != null) - return checkDelegations (delegations, uri, null, uri); - - return null; - } + // nonpublic! + Catalog () { } - /** - * Returns a URI for an external entity. - */ - public InputSource resolve ( - boolean usingPublic, - String publicId, - String systemId - ) throws SAXException, IOException - { - boolean preferSystem; - InputSource retval; + // steps as found in OASIS XML catalog spec 7.1.2 + private InputSource locatePublicId (String publicId) + throws SAXException, IOException + { + // 5. return (first) 'public' entry + if (publicIds != null) { + String retval = (String) publicIds.get (publicId); + if (retval != null) { + // IF the URI is accessible ... + return new InputSource (retval); + } + } - if (hasPreference) - preferSystem = !this.usingPublic; - else - preferSystem = !usingPublic; - - if (publicId != null) - publicId = normalizePublicId (false, publicId); + // 6. return delegatePublic catalog match [complex] + if (publicDelegations != null) + return checkDelegations (publicDelegations, publicId, + publicId, null); - // behavior here matches section 7.1.1 of the oasis spec - if (systemId != null) { - if (systemId.startsWith ("urn:publicid:")) { - String temp = normalizePublicId (true, systemId); - if (publicId == null) { - publicId = temp; - systemId = null; - } else if (!publicId.equals (temp)) { - // error; ok to recover by: - systemId = null; - } - } else - systemId = normalizeURI (systemId); - } + return null; + } - if (systemId == null && publicId == null) - return null; + // steps as found in OASIS XML catalog spec 7.1.2 or 7.2.2 + private InputSource mapURI ( + String uri, + Hashtable ids, + Hashtable rewrites, + Hashtable delegations + ) throws SAXException, IOException + { + // 7.1.2: 2. return (first) 'system' entry + // 7.2.2: 2. return (first) 'uri' entry + if (ids != null) { + String retval = (String) ids.get (uri); + if (retval != null) { + // IF the URI is accessible ... + return new InputSource (retval); + } + } - if (systemId != null) { - retval = mapURI (systemId, systemIds, systemRewrites, - systemDelegations); - if (retval != null) { - retval.setPublicId (publicId); - return retval; - } - } + // 7.1.2: 3. return 'rewriteSystem' entries + // 7.2.2: 3. return 'rewriteURI' entries + if (rewrites != null) { + String prefix = null; + String replace = null; + int prefixLen = -1; - if (publicId != null - && !(systemId != null && preferSystem)) { - retval = locatePublicId (publicId); - if (retval != null) { - retval.setPublicId (publicId); - return retval; - } - } + for (Enumeration e = rewrites.keys (); + e.hasMoreElements (); + /* NOP */) { + String temp = (String) e.nextElement (); + int len = -1; - // 7. apply nextCatalog entries - if (next != null) { - int length = next.size (); - for (int i = 0; i < length; i++) { - Catalog n = getNext (i); - retval = n.resolve (usingPublic, publicId, systemId); - if (retval != null) - return retval; - } - } + if (!uri.startsWith (temp)) + continue; + if (prefix != null + && (len = temp.length ()) < prefixLen) + continue; + prefix = temp; + prefixLen = len; + replace = (String) rewrites.get (temp); + } + if (prefix != null) { + CPStringBuilder buf = new CPStringBuilder (replace); + buf.append (uri.substring (prefixLen)); + // IF the URI is accessible ... + return new InputSource (buf.toString ()); + } + } - return null; - } + // 7.1.2: 4. return 'delegateSystem' catalog match [complex] + // 7.2.2: 4. return 'delegateURI' catalog match [complex] + if (delegations != null) + return checkDelegations (delegations, uri, null, uri); - /** - * Maps one URI into another, for resources that are not defined - * using XML external entity or notation syntax. - */ - public InputSource resolveURI (String uri) - throws SAXException, IOException - { - if (uri.startsWith ("urn:publicid:")) - return resolve (true, normalizePublicId (true, uri), null); - - InputSource retval; - - uri = normalizeURI (uri); - - // 7.2.2 steps 2-4 - retval = mapURI (uri, uris, uriRewrites, uriDelegations); - if (retval != null) - return retval; - - // 7.2.2 step 5. apply nextCatalog entries - if (next != null) { - int length = next.size (); - for (int i = 0; i < length; i++) { - Catalog n = getNext (i); - retval = n.resolveURI (uri); - if (retval != null) - return retval; - } - } - - return null; - } + return null; + } - /** - * Finds the external subset associated with a given root element. - */ - public InputSource getExternalSubset (String name) - throws SAXException, IOException - { - if (doctypes != null) { - String value = (String) doctypes.get (name); - if (value != null) { - // IF the URI is accessible ... - return new InputSource (value); - } - } - if (next != null) { - int length = next.size (); - for (int i = 0; i < length; i++) { - Catalog n = getNext (i); - if (n == null) - continue; - InputSource retval = n.getExternalSubset (name); - if (retval != null) - return retval; - } - } - return null; - } + /** + * Returns a URI for an external entity. + */ + public InputSource resolve ( + boolean usingPublic, + String publicId, + String systemId + ) throws SAXException, IOException + { + boolean preferSystem; + InputSource retval; - private synchronized Catalog getNext (int i) - throws SAXException, IOException - { - Object obj; + if (hasPreference) + preferSystem = !this.usingPublic; + else + preferSystem = !usingPublic; - if (next == null || i < 0 || i >= next.size ()) - return null; - obj = next.elementAt (i); - if (obj instanceof Catalog) - return (Catalog) obj; - - // ok, we deferred reading that catalog till now. - // load and cache it. - Catalog cat = null; + if (publicId != null) + publicId = normalizePublicId (false, publicId); - try { - cat = loadCatalog (parserClass, eh, (String) obj, unified); - next.setElementAt (cat, i); - } catch (SAXException e) { - // must fail quietly, says the OASIS spec - } catch (IOException e) { - // same applies here - } - return cat; - } + // behavior here matches section 7.1.1 of the oasis spec + if (systemId != null) { + if (systemId.startsWith ("urn:publicid:")) { + String temp = normalizePublicId (true, systemId); + if (publicId == null) { + publicId = temp; + systemId = null; + } else if (!publicId.equals (temp)) { + // error; ok to recover by: + systemId = null; + } + } else + systemId = normalizeURI (systemId); + } - private InputSource checkDelegations ( - Hashtable delegations, - String id, - String publicId, // only one of public/system - String systemId // will be non-null... - ) throws SAXException, IOException - { - Vector matches = null; - int length = 0; + if (systemId == null && publicId == null) + return null; - // first, see if any prefixes match. - for (Enumeration e = delegations.keys (); - e.hasMoreElements (); - /* NOP */) { - String prefix = (String) e.nextElement (); + if (systemId != null) { + retval = mapURI (systemId, systemIds, systemRewrites, + systemDelegations); + if (retval != null) { + retval.setPublicId (publicId); + return retval; + } + } - if (!id.startsWith (prefix)) - continue; - if (matches == null) - matches = new Vector (); - - // maintain in longer->shorter sorted order - // NOTE: assumes not many matches will fire! - int index; + if (publicId != null + && !(systemId != null && preferSystem)) { + retval = locatePublicId (publicId); + if (retval != null) { + retval.setPublicId (publicId); + return retval; + } + } - for (index = 0; index < length; index++) { - String temp = (String) matches.elementAt (index); - if (prefix.length () > temp.length ()) { - matches.insertElementAt (prefix, index); - break; - } - } - if (index == length) - matches.addElement (prefix); - length++; - } - if (matches == null) - return null; + // 7. apply nextCatalog entries + if (next != null) { + int length = next.size (); + for (int i = 0; i < length; i++) { + Catalog n = getNext (i); + retval = n.resolve (usingPublic, publicId, systemId); + if (retval != null) + return retval; + } + } - // now we know the list of catalogs to replace our "top level" - // list ... we use it here, rather than somehow going back and - // restarting, since this helps avoid reading most catalogs. - // this assumes stackspace won't be a problem. - for (int i = 0; i < length; i++) { - Catalog catalog = null; - InputSource result; + return null; + } - // get this catalog. we may not have read it yet. - synchronized (delegations) { - Object prefix = matches.elementAt (i); - Object cat = delegations.get (prefix); + /** + * Maps one URI into another, for resources that are not defined + * using XML external entity or notation syntax. + */ + public InputSource resolveURI (String uri) + throws SAXException, IOException + { + if (uri.startsWith ("urn:publicid:")) + return resolve (true, normalizePublicId (true, uri), null); - if (cat instanceof Catalog) - catalog = (Catalog) cat; - else { - try { - // load and cache that catalog - catalog = loadCatalog (parserClass, eh, - (String) cat, unified); - delegations.put (prefix, catalog); - } catch (SAXException e) { - // must ignore, says the OASIS spec - } catch (IOException e) { - // same applies here - } - } - } + InputSource retval; - // ignore failed loads, and proceed - if (catalog == null) - continue; - - // we have a catalog ... resolve! - // usingPublic value can't matter, there's no choice - result = catalog.resolve (true, publicId, systemId); - if (result != null) - return result; - } + uri = normalizeURI (uri); - // if there were no successes, the entire - // lookup failed (all the way to top level) - throw new DoneDelegation (); - } + // 7.2.2 steps 2-4 + retval = mapURI (uri, uris, uriRewrites, uriDelegations); + if (retval != null) + return retval; + + // 7.2.2 step 5. apply nextCatalog entries + if (next != null) { + int length = next.size (); + for (int i = 0; i < length; i++) { + Catalog n = getNext (i); + retval = n.resolveURI (uri); + if (retval != null) + return retval; + } + } + + return null; + } + + + /** + * Finds the external subset associated with a given root element. + */ + public InputSource getExternalSubset (String name) + throws SAXException, IOException + { + if (doctypes != null) { + String value = (String) doctypes.get (name); + if (value != null) { + // IF the URI is accessible ... + return new InputSource (value); + } + } + if (next != null) { + int length = next.size (); + for (int i = 0; i < length; i++) { + Catalog n = getNext (i); + if (n == null) + continue; + InputSource retval = n.getExternalSubset (name); + if (retval != null) + return retval; + } + } + return null; + } + + private synchronized Catalog getNext (int i) + throws SAXException, IOException + { + Object obj; + + if (next == null || i < 0 || i >= next.size ()) + return null; + obj = next.elementAt (i); + if (obj instanceof Catalog) + return (Catalog) obj; + + // ok, we deferred reading that catalog till now. + // load and cache it. + Catalog cat = null; + + try { + cat = loadCatalog (parserClass, eh, (String) obj, unified); + next.setElementAt (cat, i); + } catch (SAXException e) { + // must fail quietly, says the OASIS spec + } catch (IOException e) { + // same applies here + } + return cat; + } + + private InputSource checkDelegations ( + Hashtable delegations, + String id, + String publicId, // only one of public/system + String systemId // will be non-null... + ) throws SAXException, IOException + { + Vector matches = null; + int length = 0; + + // first, see if any prefixes match. + for (Enumeration e = delegations.keys (); + e.hasMoreElements (); + /* NOP */) { + String prefix = (String) e.nextElement (); + + if (!id.startsWith (prefix)) + continue; + if (matches == null) + matches = new Vector (); + + // maintain in longer->shorter sorted order + // NOTE: assumes not many matches will fire! + int index; + + for (index = 0; index < length; index++) { + String temp = (String) matches.elementAt (index); + if (prefix.length () > temp.length ()) { + matches.insertElementAt (prefix, index); + break; + } + } + if (index == length) + matches.addElement (prefix); + length++; + } + if (matches == null) + return null; + + // now we know the list of catalogs to replace our "top level" + // list ... we use it here, rather than somehow going back and + // restarting, since this helps avoid reading most catalogs. + // this assumes stackspace won't be a problem. + for (int i = 0; i < length; i++) { + Catalog catalog = null; + InputSource result; + + // get this catalog. we may not have read it yet. + synchronized (delegations) { + Object prefix = matches.elementAt (i); + Object cat = delegations.get (prefix); + + if (cat instanceof Catalog) + catalog = (Catalog) cat; + else { + try { + // load and cache that catalog + catalog = loadCatalog (parserClass, eh, + (String) cat, unified); + delegations.put (prefix, catalog); + } catch (SAXException e) { + // must ignore, says the OASIS spec + } catch (IOException e) { + // same applies here + } + } + } + + // ignore failed loads, and proceed + if (catalog == null) + continue; + + // we have a catalog ... resolve! + // usingPublic value can't matter, there's no choice + result = catalog.resolve (true, publicId, systemId); + if (result != null) + return result; + } + + // if there were no successes, the entire + // lookup failed (all the way to top level) + throw new DoneDelegation (); + } } /** This is the namespace URI used for OASIS XML Catalogs. */ - private static final String catalogNamespace = - "urn:oasis:names:tc:entity:xmlns:xml:catalog"; + private static final String catalogNamespace = + "urn:oasis:names:tc:entity:xmlns:xml:catalog"; /** @@ -1085,527 +1085,527 @@ System.err.println ("nyet unhexing public id: " + publicId); */ private static class Loader extends DefaultHandler2 { - private boolean preInterned; - private ErrorHandler handler; - private boolean unified; - private int ignoreDepth; - private Locator locator; - private boolean started; - private Hashtable externals; - private Stack bases; + private boolean preInterned; + private ErrorHandler handler; + private boolean unified; + private int ignoreDepth; + private Locator locator; + private boolean started; + private Hashtable externals; + private Stack bases; - Catalog cat = new Catalog (); + Catalog cat = new Catalog (); - /** - * Constructor. - * @param flag true iff the parser already interns strings. - * @param eh Errors and warnings are delegated to this. - * @param unified true keeps one table for URI mappings; - * false matches OASIS spec, storing mappings - * for URIs and SYSTEM ids in parallel tables. - */ - Loader (boolean flag, ErrorHandler eh, boolean unified) - { - preInterned = flag; - handler = eh; - this.unified = unified; - cat.unified = unified; - cat.eh = eh; - } + /** + * Constructor. + * @param flag true iff the parser already interns strings. + * @param eh Errors and warnings are delegated to this. + * @param unified true keeps one table for URI mappings; + * false matches OASIS spec, storing mappings + * for URIs and SYSTEM ids in parallel tables. + */ + Loader (boolean flag, ErrorHandler eh, boolean unified) + { + preInterned = flag; + handler = eh; + this.unified = unified; + cat.unified = unified; + cat.eh = eh; + } - // strips out fragments - private String nofrag (String uri) - throws SAXException - { - if (uri.indexOf ('#') != -1) { - warn ("URI with fragment: " + uri); - uri = uri.substring (0, uri.indexOf ('#')); - } - return uri; - } + // strips out fragments + private String nofrag (String uri) + throws SAXException + { + if (uri.indexOf ('#') != -1) { + warn ("URI with fragment: " + uri); + uri = uri.substring (0, uri.indexOf ('#')); + } + return uri; + } - // absolutizes relative URIs - private String absolutize (String uri) - throws SAXException - { - // avoid creating URLs if they're already absolutized, - // or if the URI is already using a known scheme - if (uri.startsWith ("file:/") - || uri.startsWith ("http:/") - || uri.startsWith ("https:/") - || uri.startsWith ("ftp:/") - || uri.startsWith ("urn:") - ) - return uri; + // absolutizes relative URIs + private String absolutize (String uri) + throws SAXException + { + // avoid creating URLs if they're already absolutized, + // or if the URI is already using a known scheme + if (uri.startsWith ("file:/") + || uri.startsWith ("http:/") + || uri.startsWith ("https:/") + || uri.startsWith ("ftp:/") + || uri.startsWith ("urn:") + ) + return uri; - // otherwise, let's hope the JDK handles this URI scheme. - try { - URL base = (URL) bases.peek (); - return new URL (base, uri).toString (); - } catch (Exception e) { - fatal ("can't absolutize URI: " + uri); - return null; - } - } + // otherwise, let's hope the JDK handles this URI scheme. + try { + URL base = (URL) bases.peek (); + return new URL (base, uri).toString (); + } catch (Exception e) { + fatal ("can't absolutize URI: " + uri); + return null; + } + } - // recoverable error - private void error (String message) - throws SAXException - { - if (handler == null) - return; - handler.error (new SAXParseException (message, locator)); - } + // recoverable error + private void error (String message) + throws SAXException + { + if (handler == null) + return; + handler.error (new SAXParseException (message, locator)); + } - // nonrecoverable error - private void fatal (String message) - throws SAXException - { - SAXParseException spe; - - spe = new SAXParseException (message, locator); - if (handler != null) - handler.fatalError (spe); - throw spe; - } + // nonrecoverable error + private void fatal (String message) + throws SAXException + { + SAXParseException spe; - // low severity problem - private void warn (String message) - throws SAXException - { - if (handler == null) - return; - handler.warning (new SAXParseException (message, locator)); - } + spe = new SAXParseException (message, locator); + if (handler != null) + handler.fatalError (spe); + throw spe; + } - // callbacks: + // low severity problem + private void warn (String message) + throws SAXException + { + if (handler == null) + return; + handler.warning (new SAXParseException (message, locator)); + } - public void setDocumentLocator (Locator l) - { locator = l; } + // callbacks: - public void startDocument () - throws SAXException - { - if (locator == null) - error ("no locator!"); - bases = new Stack (); - String uri = locator.getSystemId (); - try { - bases.push (new URL (uri)); - } catch (IOException e) { - fatal ("bad document base URI: " + uri); - } - } + public void setDocumentLocator (Locator l) + { locator = l; } - public void endDocument () - throws SAXException - { - try { - if (!started) - error ("not a catalog!"); - } finally { - locator = null; - handler = null; - externals = null; - bases = null; - } - } + public void startDocument () + throws SAXException + { + if (locator == null) + error ("no locator!"); + bases = new Stack (); + String uri = locator.getSystemId (); + try { + bases.push (new URL (uri)); + } catch (IOException e) { + fatal ("bad document base URI: " + uri); + } + } - // XML Base support for external entities. + public void endDocument () + throws SAXException + { + try { + if (!started) + error ("not a catalog!"); + } finally { + locator = null; + handler = null; + externals = null; + bases = null; + } + } - // NOTE: expects parser is in default "resolve-dtd-uris" mode. - public void externalEntityDecl (String name, String pub, String sys) - throws SAXException - { - if (externals == null) - externals = new Hashtable (); - if (externals.get (name) == null) - externals.put (name, pub); - } + // XML Base support for external entities. - public void startEntity (String name) - throws SAXException - { - if (externals == null) - return; - String uri = (String) externals.get (name); + // NOTE: expects parser is in default "resolve-dtd-uris" mode. + public void externalEntityDecl (String name, String pub, String sys) + throws SAXException + { + if (externals == null) + externals = new Hashtable (); + if (externals.get (name) == null) + externals.put (name, pub); + } - // NOTE: breaks if an EntityResolver substitutes these URIs. - // If toplevel loader supports one, must intercept calls... - if (uri != null) { - try { - bases.push (new URL (uri)); - } catch (IOException e) { - fatal ("entity '" + name + "', bad URI: " + uri); - } - } - } + public void startEntity (String name) + throws SAXException + { + if (externals == null) + return; + String uri = (String) externals.get (name); - public void endEntity (String name) - { - if (externals == null) - return; - String value = (String) externals.get (name); + // NOTE: breaks if an EntityResolver substitutes these URIs. + // If toplevel loader supports one, must intercept calls... + if (uri != null) { + try { + bases.push (new URL (uri)); + } catch (IOException e) { + fatal ("entity '" + name + "', bad URI: " + uri); + } + } + } - if (value != null) - bases.pop (); - } + public void endEntity (String name) + { + if (externals == null) + return; + String value = (String) externals.get (name); - /** - * Processes catalog elements, saving their data. - */ - public void startElement (String namespace, String local, - String qName, Attributes atts) - throws SAXException - { - // must ignore non-catalog elements, and their contents - if (ignoreDepth != 0 || !catalogNamespace.equals (namespace)) { - ignoreDepth++; - return; - } + if (value != null) + bases.pop (); + } - // basic sanity checks - if (!preInterned) - local = local.intern (); - if (!started) { - started = true; - if ("catalog" != local) - fatal ("root element not 'catalog': " + local); - } + /** + * Processes catalog elements, saving their data. + */ + public void startElement (String namespace, String local, + String qName, Attributes atts) + throws SAXException + { + // must ignore non-catalog elements, and their contents + if (ignoreDepth != 0 || !catalogNamespace.equals (namespace)) { + ignoreDepth++; + return; + } - // Handle any xml:base attribute - String xmlbase = atts.getValue ("xml:base"); + // basic sanity checks + if (!preInterned) + local = local.intern (); + if (!started) { + started = true; + if ("catalog" != local) + fatal ("root element not 'catalog': " + local); + } - if (xmlbase != null) { - URL base = (URL) bases.peek (); - try { - base = new URL (base, xmlbase); - } catch (IOException e) { - fatal ("can't resolve xml:base attribute: " + xmlbase); - } - bases.push (base); - } else - bases.push (bases.peek ()); + // Handle any xml:base attribute + String xmlbase = atts.getValue ("xml:base"); - // fetch multi-element attributes, apply standard tweaks - // values (uri, catalog, rewritePrefix) get normalized too, - // as a precaution and since we may compare the values - String catalog = atts.getValue ("catalog"); - if (catalog != null) - catalog = normalizeURI (absolutize (catalog)); + if (xmlbase != null) { + URL base = (URL) bases.peek (); + try { + base = new URL (base, xmlbase); + } catch (IOException e) { + fatal ("can't resolve xml:base attribute: " + xmlbase); + } + bases.push (base); + } else + bases.push (bases.peek ()); - String rewritePrefix = atts.getValue ("rewritePrefix"); - if (rewritePrefix != null) - rewritePrefix = normalizeURI (absolutize (rewritePrefix)); + // fetch multi-element attributes, apply standard tweaks + // values (uri, catalog, rewritePrefix) get normalized too, + // as a precaution and since we may compare the values + String catalog = atts.getValue ("catalog"); + if (catalog != null) + catalog = normalizeURI (absolutize (catalog)); - String systemIdStartString; - systemIdStartString = atts.getValue ("systemIdStartString"); - if (systemIdStartString != null) { - systemIdStartString = normalizeURI (systemIdStartString); - // unmatchable , elements - if (systemIdStartString.startsWith ("urn:publicid:")) { - error ("systemIdStartString is really a publicId!!"); - return; - } - } + String rewritePrefix = atts.getValue ("rewritePrefix"); + if (rewritePrefix != null) + rewritePrefix = normalizeURI (absolutize (rewritePrefix)); - String uri = atts.getValue ("uri"); - if (uri != null) - uri = normalizeURI (absolutize (uri)); + String systemIdStartString; + systemIdStartString = atts.getValue ("systemIdStartString"); + if (systemIdStartString != null) { + systemIdStartString = normalizeURI (systemIdStartString); + // unmatchable , elements + if (systemIdStartString.startsWith ("urn:publicid:")) { + error ("systemIdStartString is really a publicId!!"); + return; + } + } - String uriStartString; - uriStartString = atts.getValue ("uriStartString"); - if (uriStartString != null) { - uriStartString = normalizeURI (uriStartString); - // unmatchable , elements - if (uriStartString.startsWith ("urn:publicid:")) { - error ("uriStartString is really a publicId!!"); - return; - } - } + String uri = atts.getValue ("uri"); + if (uri != null) + uri = normalizeURI (absolutize (uri)); - // strictly speaking "group" and "catalog" shouldn't nest - // ... arbitrary restriction, no evident motivation + String uriStartString; + uriStartString = atts.getValue ("uriStartString"); + if (uriStartString != null) { + uriStartString = normalizeURI (uriStartString); + // unmatchable , elements + if (uriStartString.startsWith ("urn:publicid:")) { + error ("uriStartString is really a publicId!!"); + return; + } + } + + // strictly speaking "group" and "catalog" shouldn't nest + // ... arbitrary restriction, no evident motivation // FIXME stack "prefer" settings (two elements only!) and use // them to populate different public mapping/delegation tables - if ("catalog" == local || "group" == local) { - String prefer = atts.getValue ("prefer"); + if ("catalog" == local || "group" == local) { + String prefer = atts.getValue ("prefer"); - if (prefer != null && !"public".equals (prefer)) { - if (!"system".equals (prefer)) { - error ("in <" + local + " ... prefer='...'>, " - + "assuming 'public'"); - prefer = "public"; - } - } - if (prefer != null) { - if ("catalog" == local) { - cat.hasPreference = true; - cat.usingPublic = "public".equals (prefer); - } else { - if (!cat.hasPreference || cat.usingPublic - != "public".equals (prefer)) { + if (prefer != null && !"public".equals (prefer)) { + if (!"system".equals (prefer)) { + error ("in <" + local + " ... prefer='...'>, " + + "assuming 'public'"); + prefer = "public"; + } + } + if (prefer != null) { + if ("catalog" == local) { + cat.hasPreference = true; + cat.usingPublic = "public".equals (prefer); + } else { + if (!cat.hasPreference || cat.usingPublic + != "public".equals (prefer)) { fatal (" case not handled"); - } - } - } else if ("group" == local && cat.hasPreference) { + } + } + } else if ("group" == local && cat.hasPreference) { fatal (" case not handled"); - } + } - // - // PUBLIC ids: cleanly set up for id substitution - // - } else if ("public" == local) { - String publicId = atts.getValue ("publicId"); - String value = null; + // + // PUBLIC ids: cleanly set up for id substitution + // + } else if ("public" == local) { + String publicId = atts.getValue ("publicId"); + String value = null; - if (publicId == null || uri == null) { - error ("expecting "); - return; - } - publicId = normalizePublicId (true, publicId); - uri = nofrag (uri); - if (cat.publicIds == null) - cat.publicIds = new Hashtable (); - else - value = (String) cat.publicIds.get (publicId); - if (value != null) { - if (!value.equals (uri)) - warn ("ignoring entry for " + publicId); - } else - cat.publicIds.put (publicId, uri); + if (publicId == null || uri == null) { + error ("expecting "); + return; + } + publicId = normalizePublicId (true, publicId); + uri = nofrag (uri); + if (cat.publicIds == null) + cat.publicIds = new Hashtable (); + else + value = (String) cat.publicIds.get (publicId); + if (value != null) { + if (!value.equals (uri)) + warn ("ignoring entry for " + publicId); + } else + cat.publicIds.put (publicId, uri); - } else if ("delegatePublic" == local) { - String publicIdStartString; - Object value = null; + } else if ("delegatePublic" == local) { + String publicIdStartString; + Object value = null; - publicIdStartString = atts.getValue ("publicIdStartString"); - if (publicIdStartString == null || catalog == null) { - error ("expecting "); - return; - } - publicIdStartString = normalizePublicId (true, - publicIdStartString); - if (cat.publicDelegations == null) - cat.publicDelegations = new Hashtable (); - else - value = cat.publicDelegations.get (publicIdStartString); - if (value != null) { - if (!value.equals (catalog)) - warn ("ignoring entry for " - + uriStartString); - } else - cat.publicDelegations.put (publicIdStartString, catalog); + publicIdStartString = atts.getValue ("publicIdStartString"); + if (publicIdStartString == null || catalog == null) { + error ("expecting "); + return; + } + publicIdStartString = normalizePublicId (true, + publicIdStartString); + if (cat.publicDelegations == null) + cat.publicDelegations = new Hashtable (); + else + value = cat.publicDelegations.get (publicIdStartString); + if (value != null) { + if (!value.equals (catalog)) + warn ("ignoring entry for " + + uriStartString); + } else + cat.publicDelegations.put (publicIdStartString, catalog); - // - // SYSTEM ids: need substitution due to operational issues - // - } else if ("system" == local) { - String systemId = atts.getValue ("systemId"); - String value = null; + // + // SYSTEM ids: need substitution due to operational issues + // + } else if ("system" == local) { + String systemId = atts.getValue ("systemId"); + String value = null; - if (systemId == null || uri == null) { - error ("expecting "); - return; - } - systemId = normalizeURI (systemId); - uri = nofrag (uri); - if (systemId.startsWith ("urn:publicid:")) { - error ("systemId is really a publicId!!"); - return; - } - if (cat.systemIds == null) { - cat.systemIds = new Hashtable (); - if (unified) - cat.uris = cat.systemIds; - } else - value = (String) cat.systemIds.get (systemId); - if (value != null) { - if (!value.equals (uri)) - warn ("ignoring entry for " + systemId); - } else - cat.systemIds.put (systemId, uri); + if (systemId == null || uri == null) { + error ("expecting "); + return; + } + systemId = normalizeURI (systemId); + uri = nofrag (uri); + if (systemId.startsWith ("urn:publicid:")) { + error ("systemId is really a publicId!!"); + return; + } + if (cat.systemIds == null) { + cat.systemIds = new Hashtable (); + if (unified) + cat.uris = cat.systemIds; + } else + value = (String) cat.systemIds.get (systemId); + if (value != null) { + if (!value.equals (uri)) + warn ("ignoring entry for " + systemId); + } else + cat.systemIds.put (systemId, uri); - } else if ("rewriteSystem" == local) { - String value = null; + } else if ("rewriteSystem" == local) { + String value = null; - if (systemIdStartString == null || rewritePrefix == null - || systemIdStartString.length () == 0 - || rewritePrefix.length () == 0 - ) { - error ("expecting "); - return; - } - if (cat.systemRewrites == null) { - cat.systemRewrites = new Hashtable (); - if (unified) - cat.uriRewrites = cat.systemRewrites; - } else - value = (String) cat.systemRewrites.get ( - systemIdStartString); - if (value != null) { - if (!value.equals (rewritePrefix)) - warn ("ignoring entry for " - + systemIdStartString); - } else - cat.systemRewrites.put (systemIdStartString, - rewritePrefix); + if (systemIdStartString == null || rewritePrefix == null + || systemIdStartString.length () == 0 + || rewritePrefix.length () == 0 + ) { + error ("expecting "); + return; + } + if (cat.systemRewrites == null) { + cat.systemRewrites = new Hashtable (); + if (unified) + cat.uriRewrites = cat.systemRewrites; + } else + value = (String) cat.systemRewrites.get ( + systemIdStartString); + if (value != null) { + if (!value.equals (rewritePrefix)) + warn ("ignoring entry for " + + systemIdStartString); + } else + cat.systemRewrites.put (systemIdStartString, + rewritePrefix); - } else if ("delegateSystem" == local) { - Object value = null; + } else if ("delegateSystem" == local) { + Object value = null; - if (systemIdStartString == null || catalog == null) { - error ("expecting "); - return; - } - if (cat.systemDelegations == null) { - cat.systemDelegations = new Hashtable (); - if (unified) - cat.uriDelegations = cat.systemDelegations; - } else - value = cat.systemDelegations.get (systemIdStartString); - if (value != null) { - if (!value.equals (catalog)) - warn ("ignoring entry for " - + uriStartString); - } else - cat.systemDelegations.put (systemIdStartString, catalog); + if (systemIdStartString == null || catalog == null) { + error ("expecting "); + return; + } + if (cat.systemDelegations == null) { + cat.systemDelegations = new Hashtable (); + if (unified) + cat.uriDelegations = cat.systemDelegations; + } else + value = cat.systemDelegations.get (systemIdStartString); + if (value != null) { + if (!value.equals (catalog)) + warn ("ignoring entry for " + + uriStartString); + } else + cat.systemDelegations.put (systemIdStartString, catalog); - // - // URI: just like "system" ID support, except that - // fragment IDs are disallowed in "system" elements. - // - } else if ("uri" == local) { - String name = atts.getValue ("name"); - String value = null; + // + // URI: just like "system" ID support, except that + // fragment IDs are disallowed in "system" elements. + // + } else if ("uri" == local) { + String name = atts.getValue ("name"); + String value = null; - if (name == null || uri == null) { - error ("expecting "); - return; - } - if (name.startsWith ("urn:publicid:")) { - error ("name is really a publicId!!"); - return; - } - name = normalizeURI (name); - if (cat.uris == null) { - cat.uris = new Hashtable (); - if (unified) - cat.systemIds = cat.uris; - } else - value = (String) cat.uris.get (name); - if (value != null) { - if (!value.equals (uri)) - warn ("ignoring entry for " + name); - } else - cat.uris.put (name, uri); + if (name == null || uri == null) { + error ("expecting "); + return; + } + if (name.startsWith ("urn:publicid:")) { + error ("name is really a publicId!!"); + return; + } + name = normalizeURI (name); + if (cat.uris == null) { + cat.uris = new Hashtable (); + if (unified) + cat.systemIds = cat.uris; + } else + value = (String) cat.uris.get (name); + if (value != null) { + if (!value.equals (uri)) + warn ("ignoring entry for " + name); + } else + cat.uris.put (name, uri); - } else if ("rewriteURI" == local) { - String value = null; + } else if ("rewriteURI" == local) { + String value = null; - if (uriStartString == null || rewritePrefix == null - || uriStartString.length () == 0 - || rewritePrefix.length () == 0 - ) { - error ("expecting "); - return; - } - if (cat.uriRewrites == null) { - cat.uriRewrites = new Hashtable (); - if (unified) - cat.systemRewrites = cat.uriRewrites; - } else - value = (String) cat.uriRewrites.get (uriStartString); - if (value != null) { - if (!value.equals (rewritePrefix)) - warn ("ignoring entry for " - + uriStartString); - } else - cat.uriRewrites.put (uriStartString, rewritePrefix); + if (uriStartString == null || rewritePrefix == null + || uriStartString.length () == 0 + || rewritePrefix.length () == 0 + ) { + error ("expecting "); + return; + } + if (cat.uriRewrites == null) { + cat.uriRewrites = new Hashtable (); + if (unified) + cat.systemRewrites = cat.uriRewrites; + } else + value = (String) cat.uriRewrites.get (uriStartString); + if (value != null) { + if (!value.equals (rewritePrefix)) + warn ("ignoring entry for " + + uriStartString); + } else + cat.uriRewrites.put (uriStartString, rewritePrefix); - } else if ("delegateURI" == local) { - Object value = null; + } else if ("delegateURI" == local) { + Object value = null; - if (uriStartString == null || catalog == null) { - error ("expecting "); - return; - } - if (cat.uriDelegations == null) { - cat.uriDelegations = new Hashtable (); - if (unified) - cat.systemDelegations = cat.uriDelegations; - } else - value = cat.uriDelegations.get (uriStartString); - if (value != null) { - if (!value.equals (catalog)) - warn ("ignoring entry for " - + uriStartString); - } else - cat.uriDelegations.put (uriStartString, catalog); + if (uriStartString == null || catalog == null) { + error ("expecting "); + return; + } + if (cat.uriDelegations == null) { + cat.uriDelegations = new Hashtable (); + if (unified) + cat.systemDelegations = cat.uriDelegations; + } else + value = cat.uriDelegations.get (uriStartString); + if (value != null) { + if (!value.equals (catalog)) + warn ("ignoring entry for " + + uriStartString); + } else + cat.uriDelegations.put (uriStartString, catalog); - // - // NON-DELEGATING approach to modularity - // - } else if ("nextCatalog" == local) { - if (catalog == null) { - error ("expecting "); - return; - } - if (cat.next == null) - cat.next = new Vector (); - cat.next.addElement (catalog); + // + // NON-DELEGATING approach to modularity + // + } else if ("nextCatalog" == local) { + if (catalog == null) { + error ("expecting "); + return; + } + if (cat.next == null) + cat.next = new Vector (); + cat.next.addElement (catalog); - // - // EXTENSIONS from appendix E - // - } else if ("doctype" == local) { - String name = atts.getValue ("name"); - String value = null; + // + // EXTENSIONS from appendix E + // + } else if ("doctype" == local) { + String name = atts.getValue ("name"); + String value = null; - if (name == null || uri == null) { - error ("expecting "); - return; - } - name = normalizeURI (name); - if (cat.doctypes == null) - cat.doctypes = new Hashtable (); - else - value = (String) cat.doctypes.get (name); - if (value != null) { - if (!value.equals (uri)) - warn ("ignoring entry for " - + uriStartString); - } else - cat.doctypes.put (name, uri); - + if (name == null || uri == null) { + error ("expecting "); + return; + } + name = normalizeURI (name); + if (cat.doctypes == null) + cat.doctypes = new Hashtable (); + else + value = (String) cat.doctypes.get (name); + if (value != null) { + if (!value.equals (uri)) + warn ("ignoring entry for " + + uriStartString); + } else + cat.doctypes.put (name, uri); - // - // RESERVED ... ignore (like reserved attributes) but warn - // - } else { - warn ("ignoring unknown catalog element: " + local); - ignoreDepth++; - } - } - public void endElement (String uri, String local, String qName) - throws SAXException - { - if (ignoreDepth != 0) - ignoreDepth--; - else - bases.pop (); - } + // + // RESERVED ... ignore (like reserved attributes) but warn + // + } else { + warn ("ignoring unknown catalog element: " + local); + ignoreDepth++; + } + } + + public void endElement (String uri, String local, String qName) + throws SAXException + { + if (ignoreDepth != 0) + ignoreDepth--; + else + bases.pop (); + } } } diff --git a/libjava/classpath/gnu/xml/util/XHTMLWriter.java b/libjava/classpath/gnu/xml/util/XHTMLWriter.java index 02a0afca841..3a0c1adb746 100644 --- a/libjava/classpath/gnu/xml/util/XHTMLWriter.java +++ b/libjava/classpath/gnu/xml/util/XHTMLWriter.java @@ -1,4 +1,4 @@ -/* XHTMLWriter.java -- +/* XHTMLWriter.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,7 +67,7 @@ public class XHTMLWriter extends XMLWriter public XHTMLWriter () throws IOException { - this (System.out); + this (System.out); } /** @@ -75,15 +75,15 @@ public class XHTMLWriter extends XMLWriter * is used to write SAX events in the US-ASCII encoding, as XHTML. * * @param out Where US-ASCII encoding of the stream of SAX - * events will be sent. + * events will be sent. */ public XHTMLWriter (OutputStream out) throws IOException { - // not all JVMs understand "ASCII" as an encoding name, so - // we use 8859_1 (they all seem to handle that one) and - // make the echo handler filter out non-ASCII characters - this (new OutputStreamWriter (out, "8859_1"), "US-ASCII"); + // not all JVMs understand "ASCII" as an encoding name, so + // we use 8859_1 (they all seem to handle that one) and + // make the echo handler filter out non-ASCII characters + this (new OutputStreamWriter (out, "8859_1"), "US-ASCII"); } /** @@ -94,7 +94,7 @@ public class XHTMLWriter extends XMLWriter */ public XHTMLWriter (Writer out) { - this (out, null); + this (out, null); } /** @@ -104,11 +104,11 @@ public class XHTMLWriter extends XMLWriter * * @param out Where the stream of SAX events will be written. * @param encoding If non-null, this names the encoding to be - * placed in the encoding declaration. + * placed in the encoding declaration. */ public XHTMLWriter (Writer out, String encoding) { - super (out, encoding); - setXhtml (true); + super (out, encoding); + setXhtml (true); } } diff --git a/libjava/classpath/gnu/xml/util/XMLWriter.java b/libjava/classpath/gnu/xml/util/XMLWriter.java index 27459472019..a371debffb5 100644 --- a/libjava/classpath/gnu/xml/util/XMLWriter.java +++ b/libjava/classpath/gnu/xml/util/XMLWriter.java @@ -1,4 +1,4 @@ -/* XMLWriter.java -- +/* XMLWriter.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -111,74 +111,74 @@ public class XMLWriter implements ContentHandler, LexicalHandler, DTDHandler, DeclHandler { // text prints/escapes differently depending on context - // CTX_ENTITY ... entity literal value - // CTX_ATTRIBUTE ... attribute literal value - // CTX_CONTENT ... content of an element - // CTX_UNPARSED ... CDATA, comment, PI, names, etc + // CTX_ENTITY ... entity literal value + // CTX_ATTRIBUTE ... attribute literal value + // CTX_CONTENT ... content of an element + // CTX_UNPARSED ... CDATA, comment, PI, names, etc // CTX_NAME ... name or nmtoken, no escapes possible - private static final int CTX_ENTITY = 1; - private static final int CTX_ATTRIBUTE = 2; - private static final int CTX_CONTENT = 3; - private static final int CTX_UNPARSED = 4; - private static final int CTX_NAME = 5; + private static final int CTX_ENTITY = 1; + private static final int CTX_ATTRIBUTE = 2; + private static final int CTX_CONTENT = 3; + private static final int CTX_UNPARSED = 4; + private static final int CTX_NAME = 5; // FIXME: names (element, attribute, PI, notation, etc) are not // currently written out with range checks (escapeChars). // In non-XHTML, some names can't be directly written; panic! - private static String sysEOL; + private static String sysEOL; static { - try { - sysEOL = System.getProperty ("line.separator", "\n"); + try { + sysEOL = System.getProperty ("line.separator", "\n"); - // don't use the system's EOL if it's illegal XML. - if (!isLineEnd (sysEOL)) - sysEOL = "\n"; + // don't use the system's EOL if it's illegal XML. + if (!isLineEnd (sysEOL)) + sysEOL = "\n"; - } catch (SecurityException e) { - sysEOL = "\n"; - } + } catch (SecurityException e) { + sysEOL = "\n"; + } } private static boolean isLineEnd (String eol) { - return "\n".equals (eol) - || "\r".equals (eol) - || "\r\n".equals (eol); + return "\n".equals (eol) + || "\r".equals (eol) + || "\r\n".equals (eol); } - private Writer out; - private boolean inCDATA; - private int elementNestLevel; - private String eol = sysEOL; + private Writer out; + private boolean inCDATA; + private int elementNestLevel; + private String eol = sysEOL; - private short dangerMask; - private CPStringBuilder stringBuf; - private Locator locator; - private ErrorHandler errHandler; + private short dangerMask; + private CPStringBuilder stringBuf; + private Locator locator; + private ErrorHandler errHandler; - private boolean expandingEntities = false; - private int entityNestLevel; - private boolean xhtml; - private boolean startedDoctype; - private String encoding; + private boolean expandingEntities = false; + private int entityNestLevel; + private boolean xhtml; + private boolean startedDoctype; + private String encoding; - private boolean canonical; - private boolean inDoctype; - private boolean inEpilogue; + private boolean canonical; + private boolean inDoctype; + private boolean inEpilogue; // pretty printing controls - private boolean prettyPrinting; - private int column; - private boolean noWrap; - private Stack space = new Stack (); + private boolean prettyPrinting; + private int column; + private boolean noWrap; + private Stack space = new Stack (); // this is not a hard'n'fast rule -- longer lines are OK, // but are to be avoided. Here, prettyprinting is more to // show structure "cleanly" than to be precise about it. // better to have ragged layout than one line 24Kb long. - private static final int lineLength = 75; + private static final int lineLength = 75; /** @@ -187,7 +187,7 @@ public class XMLWriter * it's safe to close System.out at the end of the document. */ public XMLWriter () throws IOException - { this (System.out); } + { this (System.out); } /** * Constructs a handler which writes all input to the output stream @@ -198,7 +198,7 @@ public class XMLWriter */ public XMLWriter (OutputStream out) throws IOException { - this (new OutputStreamWriter (out, "UTF8")); + this (new OutputStreamWriter (out, "UTF8")); } /** @@ -215,7 +215,7 @@ public class XMLWriter */ public XMLWriter (Writer writer) { - this (writer, null); + this (writer, null); } /** @@ -248,53 +248,53 @@ public class XMLWriter * * @param writer XML text is written to this writer. * @param encoding if non-null, and an XML declaration is written, - * this is the name that will be used for the character encoding. + * this is the name that will be used for the character encoding. */ public XMLWriter (Writer writer, String encoding) { - setWriter (writer, encoding); + setWriter (writer, encoding); } - + private void setEncoding (String encoding) { - if (encoding == null && out instanceof OutputStreamWriter) - encoding = ((OutputStreamWriter)out).getEncoding (); + if (encoding == null && out instanceof OutputStreamWriter) + encoding = ((OutputStreamWriter)out).getEncoding (); - if (encoding != null) { - encoding = encoding.toUpperCase (); + if (encoding != null) { + encoding = encoding.toUpperCase (); - // Use official encoding names where we know them, - // avoiding the Java-only names. When using common - // encodings where we can easily tell if characters - // are out of range, we'll escape out-of-range - // characters using character refs for safety. + // Use official encoding names where we know them, + // avoiding the Java-only names. When using common + // encodings where we can easily tell if characters + // are out of range, we'll escape out-of-range + // characters using character refs for safety. - // I _think_ these are all the main synonyms for these! - if ("UTF8".equals (encoding)) { - encoding = "UTF-8"; - } else if ("US-ASCII".equals (encoding) - || "ASCII".equals (encoding)) { - dangerMask = (short) 0xff80; - encoding = "US-ASCII"; - } else if ("ISO-8859-1".equals (encoding) - || "8859_1".equals (encoding) - || "ISO8859_1".equals (encoding)) { - dangerMask = (short) 0xff00; - encoding = "ISO-8859-1"; - } else if ("UNICODE".equals (encoding) - || "UNICODE-BIG".equals (encoding) - || "UNICODE-LITTLE".equals (encoding)) { - encoding = "UTF-16"; + // I _think_ these are all the main synonyms for these! + if ("UTF8".equals (encoding)) { + encoding = "UTF-8"; + } else if ("US-ASCII".equals (encoding) + || "ASCII".equals (encoding)) { + dangerMask = (short) 0xff80; + encoding = "US-ASCII"; + } else if ("ISO-8859-1".equals (encoding) + || "8859_1".equals (encoding) + || "ISO8859_1".equals (encoding)) { + dangerMask = (short) 0xff00; + encoding = "ISO-8859-1"; + } else if ("UNICODE".equals (encoding) + || "UNICODE-BIG".equals (encoding) + || "UNICODE-LITTLE".equals (encoding)) { + encoding = "UTF-16"; - // TODO: UTF-16BE, UTF-16LE ... no BOM; what - // release of JDK supports those Unicode names? - } + // TODO: UTF-16BE, UTF-16LE ... no BOM; what + // release of JDK supports those Unicode names? + } - if (dangerMask != 0) - stringBuf = new CPStringBuilder (); - } + if (dangerMask != 0) + stringBuf = new CPStringBuilder (); + } - this.encoding = encoding; + this.encoding = encoding; } @@ -303,37 +303,37 @@ public class XMLWriter * * @param writer XML text is written to this writer. * @param encoding if non-null, and an XML declaration is written, - * this is the name that will be used for the character encoding. + * this is the name that will be used for the character encoding. * * @exception IllegalStateException if the current - * document hasn't yet ended (with {@link #endDocument}) + * document hasn't yet ended (with {@link #endDocument}) */ final public void setWriter (Writer writer, String encoding) { - if (out != null) - throw new IllegalStateException ( - "can't change stream in mid course"); - out = writer; - if (out != null) - setEncoding (encoding); - if (!(out instanceof BufferedWriter)) - out = new BufferedWriter (out); - space.push ("default"); + if (out != null) + throw new IllegalStateException ( + "can't change stream in mid course"); + out = writer; + if (out != null) + setEncoding (encoding); + if (!(out instanceof BufferedWriter)) + out = new BufferedWriter (out); + space.push ("default"); } /** * Assigns the line ending style to be used on output. * @param eolString null to use the system default; else - * "\n", "\r", or "\r\n". + * "\n", "\r", or "\r\n". */ final public void setEOL (String eolString) { - if (eolString == null) - eol = sysEOL; - else if (!isLineEnd (eolString)) - eol = eolString; - else - throw new IllegalArgumentException (eolString); + if (eolString == null) + eol = sysEOL; + else if (!isLineEnd (eolString)) + eol = eolString; + else + throw new IllegalArgumentException (eolString); } /** @@ -342,7 +342,7 @@ public class XMLWriter */ public void setErrorHandler (ErrorHandler handler) { - errHandler = handler; + errHandler = handler; } /** @@ -355,15 +355,15 @@ public class XMLWriter protected void fatal (String message, Exception e) throws SAXException { - SAXParseException x; + SAXParseException x; - if (locator == null) - x = new SAXParseException (message, null, null, -1, -1, e); - else - x = new SAXParseException (message, locator, e); - if (errHandler != null) - errHandler.fatalError (x); - throw x; + if (locator == null) + x = new SAXParseException (message, null, null, -1, -1, e); + else + x = new SAXParseException (message, locator, e); + if (errHandler != null) + errHandler.fatalError (x); + throw x; } @@ -385,47 +385,47 @@ public class XMLWriter * be careful of in all cases, as described in the appendix referenced * above, include:

      * - *
    • Element and attribute names must be in lower case, both - * in the document and in any CSS style sheet. - *
    • All XML constructs must be valid as defined by the XHTML - * "transitional" DTD (including all familiar constructs, - * even deprecated ones). - *
    • The root element must be "html". - *
    • Elements that must be empty (such as <br> - * must have no content. - *
    • Use both lang and xml:lang attributes - * when specifying language. - *
    • Similarly, use both id and name attributes - * when defining elements that may be referred to through - * URI fragment identifiers ... and make sure that the - * value is a legal NMTOKEN, since not all such HTML 4.0 - * identifiers are valid in XML. - *
    • Be careful with character encodings; make sure you provide - * a <meta http-equiv="Content-type" - * content="text/xml;charset=..." /> element in - * the HTML "head" element, naming the same encoding - * used to create this handler. Also, if that encoding - * is anything other than US-ASCII, make sure that if - * the document is given a MIME content type, it has - * a charset=... attribute with that encoding. - *
    + *
  • Element and attribute names must be in lower case, both + * in the document and in any CSS style sheet. + *
  • All XML constructs must be valid as defined by the XHTML + * "transitional" DTD (including all familiar constructs, + * even deprecated ones). + *
  • The root element must be "html". + *
  • Elements that must be empty (such as <br> + * must have no content. + *
  • Use both lang and xml:lang attributes + * when specifying language. + *
  • Similarly, use both id and name attributes + * when defining elements that may be referred to through + * URI fragment identifiers ... and make sure that the + * value is a legal NMTOKEN, since not all such HTML 4.0 + * identifiers are valid in XML. + *
  • Be careful with character encodings; make sure you provide + * a <meta http-equiv="Content-type" + * content="text/xml;charset=..." /> element in + * the HTML "head" element, naming the same encoding + * used to create this handler. Also, if that encoding + * is anything other than US-ASCII, make sure that if + * the document is given a MIME content type, it has + * a charset=... attribute with that encoding. + * * *

    Additionally, some of the oldest browsers have additional * quirks, to address with guidelines such as:

      * - *
    • Processing instructions may be rendered, so avoid them. - * (Similarly for an XML declaration.) - *
    • Embedded style sheets and scripts should not contain XML - * markup delimiters: &, <, and ]]> are trouble. - *
    • Attribute values should not have line breaks or multiple - * consecutive white space characters. - *
    • Use no more than one of the deprecated (transitional) - * <isindex> elements. - *
    • Some boolean attributes (such as compact, checked, - * disabled, readonly, selected, and more) confuse - * some browsers, since they only understand minimized - * versions which are illegal in XML. - *
    + *
  • Processing instructions may be rendered, so avoid them. + * (Similarly for an XML declaration.) + *
  • Embedded style sheets and scripts should not contain XML + * markup delimiters: &, <, and ]]> are trouble. + *
  • Attribute values should not have line breaks or multiple + * consecutive white space characters. + *
  • Use no more than one of the deprecated (transitional) + * <isindex> elements. + *
  • Some boolean attributes (such as compact, checked, + * disabled, readonly, selected, and more) confuse + * some browsers, since they only understand minimized + * versions which are illegal in XML. + * * *

    Also, some characteristics of the resulting output may be * a function of whether the document is later given a MIME @@ -437,11 +437,11 @@ public class XMLWriter */ final public void setXhtml (boolean value) { - if (locator != null) - throw new IllegalStateException ("started parsing"); - xhtml = value; - if (xhtml) - canonical = false; + if (locator != null) + throw new IllegalStateException ("started parsing"); + xhtml = value; + if (xhtml) + canonical = false; } /** @@ -452,7 +452,7 @@ public class XMLWriter */ final public boolean isXhtml () { - return xhtml; + return xhtml; } /** @@ -462,11 +462,11 @@ public class XMLWriter */ final public void setExpandingEntities (boolean value) { - if (locator != null) - throw new IllegalStateException ("started parsing"); - expandingEntities = value; - if (!expandingEntities) - canonical = false; + if (locator != null) + throw new IllegalStateException ("started parsing"); + expandingEntities = value; + if (!expandingEntities) + canonical = false; } /** @@ -475,7 +475,7 @@ public class XMLWriter */ final public boolean isExpandingEntities () { - return expandingEntities; + return expandingEntities; } /** @@ -499,15 +499,15 @@ public class XMLWriter * to make this be more strictly formatted! * * @exception IllegalStateException thrown if this method is invoked - * after output has begun. + * after output has begun. */ final public void setPrettyPrinting (boolean value) { - if (locator != null) - throw new IllegalStateException ("started parsing"); - prettyPrinting = value; - if (prettyPrinting) - canonical = false; + if (locator != null) + throw new IllegalStateException ("started parsing"); + prettyPrinting = value; + if (prettyPrinting) + canonical = false; } /** @@ -515,7 +515,7 @@ public class XMLWriter */ final public boolean isPrettyPrinting () { - return prettyPrinting; + return prettyPrinting; } @@ -524,31 +524,31 @@ public class XMLWriter * meet requirements that are slightly more stringent than the * basic well-formedness ones, and include:

      * - *
    • Namespace prefixes must not have been changed from those - * in the original document. (This may only be ensured by setting - * the SAX2 XMLReader namespace-prefixes feature flag; - * by default, it is cleared.) + *
    • Namespace prefixes must not have been changed from those + * in the original document. (This may only be ensured by setting + * the SAX2 XMLReader namespace-prefixes feature flag; + * by default, it is cleared.) * - *
    • Redundant namespace declaration attributes have been - * removed. (If an ancestor element defines a namespace prefix - * and that declaration hasn't been overriden, an element must - * not redeclare it.) + *
    • Redundant namespace declaration attributes have been + * removed. (If an ancestor element defines a namespace prefix + * and that declaration hasn't been overriden, an element must + * not redeclare it.) * - *
    • If comments are not to be included in the canonical output, - * they must first be removed from the input event stream; this - * Canonical XML with comments by default. + *
    • If comments are not to be included in the canonical output, + * they must first be removed from the input event stream; this + * Canonical XML with comments by default. * - *
    • If the input character encoding was not UCS-based, the - * character data must have been normalized using Unicode - * Normalization Form C. (UTF-8 and UTF-16 are UCS-based.) + *
    • If the input character encoding was not UCS-based, the + * character data must have been normalized using Unicode + * Normalization Form C. (UTF-8 and UTF-16 are UCS-based.) * - *
    • Attribute values must have been normalized, as is done - * by any conformant XML processor which processes all external - * parameter entities. + *
    • Attribute values must have been normalized, as is done + * by any conformant XML processor which processes all external + * parameter entities. * - *
    • Similarly, attribute value defaulting has been performed. + *
    • Similarly, attribute value defaulting has been performed. * - *
    + * * *

    Note that fragments of XML documents, as specified by an XPath * node set, may be canonicalized. In such cases, elements may need @@ -556,18 +556,18 @@ public class XMLWriter * context). * * @exception IllegalArgumentException if the output encoding - * is anything other than UTF-8. + * is anything other than UTF-8. */ final public void setCanonical (boolean value) { - if (value && !"UTF-8".equals (encoding)) - throw new IllegalArgumentException ("encoding != UTF-8"); - canonical = value; - if (canonical) { - prettyPrinting = xhtml = false; - expandingEntities = true; - eol = "\n"; - } + if (value && !"UTF-8".equals (encoding)) + throw new IllegalArgumentException ("encoding != UTF-8"); + canonical = value; + if (canonical) { + prettyPrinting = xhtml = false; + expandingEntities = true; + eol = "\n"; + } } @@ -576,7 +576,7 @@ public class XMLWriter */ final public boolean isCanonical () { - return canonical; + return canonical; } @@ -588,8 +588,8 @@ public class XMLWriter final public void flush () throws IOException { - if (out != null) - out.flush (); + if (out != null) + out.flush (); } @@ -597,7 +597,7 @@ public class XMLWriter // FIXME: probably want a subclass that holds a lot of these... // and maybe more! - + /** * Writes the string as if characters() had been called on the contents * of the string. This is particularly useful when applications act as @@ -606,8 +606,8 @@ public class XMLWriter final public void write (String data) throws SAXException { - char buf [] = data.toCharArray (); - characters (buf, 0, buf.length); + char buf [] = data.toCharArray (); + characters (buf, 0, buf.length); } @@ -617,21 +617,21 @@ public class XMLWriter * @see #startElement */ public void writeElement ( - String uri, - String localName, - String qName, - Attributes atts, - String content + String uri, + String localName, + String qName, + Attributes atts, + String content ) throws SAXException { - if (content == null || content.length () == 0) { - writeEmptyElement (uri, localName, qName, atts); - return; - } - startElement (uri, localName, qName, atts); - char chars [] = content.toCharArray (); - characters (chars, 0, chars.length); - endElement (uri, localName, qName); + if (content == null || content.length () == 0) { + writeEmptyElement (uri, localName, qName, atts); + return; + } + startElement (uri, localName, qName, atts); + char chars [] = content.toCharArray (); + characters (chars, 0, chars.length); + endElement (uri, localName, qName); } @@ -642,14 +642,14 @@ public class XMLWriter * @see #startElement */ public void writeElement ( - String uri, - String localName, - String qName, - Attributes atts, - int content + String uri, + String localName, + String qName, + Attributes atts, + int content ) throws SAXException { - writeElement (uri, localName, qName, atts, Integer.toString (content)); + writeElement (uri, localName, qName, atts, Integer.toString (content)); } @@ -657,7 +657,7 @@ public class XMLWriter /** SAX1: provides parser status information */ final public void setDocumentLocator (Locator l) { - locator = l; + locator = l; } @@ -665,7 +665,7 @@ public class XMLWriter private static final String xhtmlFullDTD = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"; - + /** * SAX1: indicates the beginning of a document parse. * If you're writing (well formed) fragments of XML, neither @@ -675,60 +675,60 @@ public class XMLWriter public void startDocument () throws SAXException { - try { - if (out == null) - throw new IllegalStateException ( - "null Writer given to XMLWriter"); + try { + if (out == null) + throw new IllegalStateException ( + "null Writer given to XMLWriter"); - // Not all parsers provide the locator we want; this also - // flags whether events are being sent to this object yet. - // We could only have this one call if we only printed whole - // documents ... but we also print fragments, so most of the - // callbacks here replicate this test. + // Not all parsers provide the locator we want; this also + // flags whether events are being sent to this object yet. + // We could only have this one call if we only printed whole + // documents ... but we also print fragments, so most of the + // callbacks here replicate this test. - if (locator == null) - locator = new LocatorImpl (); - - // Unless the data is in US-ASCII or we're canonicalizing, write - // the XML declaration if we know the encoding. US-ASCII won't - // normally get mangled by web server confusion about the - // character encodings used. Plus, it's an easy way to - // ensure we can write ASCII that's unlikely to confuse - // elderly HTML parsers. + if (locator == null) + locator = new LocatorImpl (); - if (!canonical - && dangerMask != (short) 0xff80 - && encoding != null) { - rawWrite (""); - newline (); - } + // Unless the data is in US-ASCII or we're canonicalizing, write + // the XML declaration if we know the encoding. US-ASCII won't + // normally get mangled by web server confusion about the + // character encodings used. Plus, it's an easy way to + // ensure we can write ASCII that's unlikely to confuse + // elderly HTML parsers. - if (xhtml) { + if (!canonical + && dangerMask != (short) 0xff80 + && encoding != null) { + rawWrite (""); + newline (); + } - rawWrite (""); - newline (); - newline (); + if (xhtml) { - // fake the rest of the handler into ignoring - // everything until the root element, so any - // XHTML DTD comments, PIs, etc are ignored - startedDoctype = true; - } + rawWrite (""); + newline (); + newline (); - entityNestLevel = 0; + // fake the rest of the handler into ignoring + // everything until the root element, so any + // XHTML DTD comments, PIs, etc are ignored + startedDoctype = true; + } - } catch (IOException e) { - fatal ("can't write", e); - } + entityNestLevel = 0; + + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -740,164 +740,164 @@ public class XMLWriter public void endDocument () throws SAXException { - try { - if (!canonical) { - newline (); - newline (); - } - out.close (); - out = null; - locator = null; - } catch (IOException e) { - fatal ("can't write", e); - } + try { + if (!canonical) { + newline (); + newline (); + } + out.close (); + out = null; + locator = null; + } catch (IOException e) { + fatal ("can't write", e); + } } // XHTML elements declared as EMPTY print differently final private static boolean isEmptyElementTag (String tag) { - switch (tag.charAt (0)) { - case 'a': return "area".equals (tag); - case 'b': return "base".equals (tag) - || "basefont".equals (tag) - || "br".equals (tag); - case 'c': return "col".equals (tag); - case 'f': return "frame".equals (tag); - case 'h': return "hr".equals (tag); - case 'i': return "img".equals (tag) - || "input".equals (tag) - || "isindex".equals (tag); - case 'l': return "link".equals (tag); - case 'm': return "meta".equals (tag); - case 'p': return "param".equals (tag); - } - return false; + switch (tag.charAt (0)) { + case 'a': return "area".equals (tag); + case 'b': return "base".equals (tag) + || "basefont".equals (tag) + || "br".equals (tag); + case 'c': return "col".equals (tag); + case 'f': return "frame".equals (tag); + case 'h': return "hr".equals (tag); + case 'i': return "img".equals (tag) + || "input".equals (tag) + || "isindex".equals (tag); + case 'l': return "link".equals (tag); + case 'm': return "meta".equals (tag); + case 'p': return "param".equals (tag); + } + return false; } private static boolean indentBefore (String tag) { - // basically indent before block content - // and within structure like tables, lists - switch (tag.charAt (0)) { - case 'a': return "applet".equals (tag); - case 'b': return "body".equals (tag) - || "blockquote".equals (tag); - case 'c': return "center".equals (tag); - case 'f': return "frame".equals (tag) - || "frameset".equals (tag); - case 'h': return "head".equals (tag); - case 'm': return "meta".equals (tag); - case 'o': return "object".equals (tag); - case 'p': return "param".equals (tag) - || "pre".equals (tag); - case 's': return "style".equals (tag); - case 't': return "title".equals (tag) - || "td".equals (tag) - || "th".equals (tag); - } - // ... but not inline elements like "em", "b", "font" - return false; + // basically indent before block content + // and within structure like tables, lists + switch (tag.charAt (0)) { + case 'a': return "applet".equals (tag); + case 'b': return "body".equals (tag) + || "blockquote".equals (tag); + case 'c': return "center".equals (tag); + case 'f': return "frame".equals (tag) + || "frameset".equals (tag); + case 'h': return "head".equals (tag); + case 'm': return "meta".equals (tag); + case 'o': return "object".equals (tag); + case 'p': return "param".equals (tag) + || "pre".equals (tag); + case 's': return "style".equals (tag); + case 't': return "title".equals (tag) + || "td".equals (tag) + || "th".equals (tag); + } + // ... but not inline elements like "em", "b", "font" + return false; } private static boolean spaceBefore (String tag) { - // blank line AND INDENT before certain structural content - switch (tag.charAt (0)) { - case 'h': return "h1".equals (tag) - || "h2".equals (tag) - || "h3".equals (tag) - || "h4".equals (tag) - || "h5".equals (tag) - || "h6".equals (tag) - || "hr".equals (tag); - case 'l': return "li".equals (tag); - case 'o': return "ol".equals (tag); - case 'p': return "p".equals (tag); - case 't': return "table".equals (tag) - || "tr".equals (tag); - case 'u': return "ul".equals (tag); - } - return false; + // blank line AND INDENT before certain structural content + switch (tag.charAt (0)) { + case 'h': return "h1".equals (tag) + || "h2".equals (tag) + || "h3".equals (tag) + || "h4".equals (tag) + || "h5".equals (tag) + || "h6".equals (tag) + || "hr".equals (tag); + case 'l': return "li".equals (tag); + case 'o': return "ol".equals (tag); + case 'p': return "p".equals (tag); + case 't': return "table".equals (tag) + || "tr".equals (tag); + case 'u': return "ul".equals (tag); + } + return false; } // XHTML DTDs say these three have xml:space="preserve" private static boolean spacePreserve (String tag) { - return "pre".equals (tag) - || "style".equals (tag) - || "script".equals (tag); + return "pre".equals (tag) + || "style".equals (tag) + || "script".equals (tag); } /** * SAX2: ignored. */ final public void startPrefixMapping (String prefix, String uri) - {} + {} /** * SAX2: ignored. */ final public void endPrefixMapping (String prefix) - {} + {} private void writeStartTag ( - String name, - Attributes atts, - boolean isEmpty + String name, + Attributes atts, + boolean isEmpty ) throws SAXException, IOException { - rawWrite ('<'); - rawWrite (name); + rawWrite ('<'); + rawWrite (name); - // write out attributes ... sorting is particularly useful - // with output that's been heavily defaulted. - if (atts != null && atts.getLength () != 0) { + // write out attributes ... sorting is particularly useful + // with output that's been heavily defaulted. + if (atts != null && atts.getLength () != 0) { - // Set up to write, with optional sorting - int indices [] = new int [atts.getLength ()]; + // Set up to write, with optional sorting + int indices [] = new int [atts.getLength ()]; - for (int i= 0; i < indices.length; i++) - indices [i] = i; - - // optionally sort + for (int i= 0; i < indices.length; i++) + indices [i] = i; + + // optionally sort // FIXME: canon xml demands xmlns nodes go first, // and sorting by URI first (empty first) then localname // it should maybe use a different sort - if (canonical || prettyPrinting) { + if (canonical || prettyPrinting) { - // insertion sort by attribute name - for (int i = 1; i < indices.length; i++) { - int n = indices [i], j; - String s = atts.getQName (n); + // insertion sort by attribute name + for (int i = 1; i < indices.length; i++) { + int n = indices [i], j; + String s = atts.getQName (n); - for (j = i - 1; j >= 0; j--) { - if (s.compareTo (atts.getQName (indices [j])) - >= 0) - break; - indices [j + 1] = indices [j]; - } - indices [j + 1] = n; - } - } + for (j = i - 1; j >= 0; j--) { + if (s.compareTo (atts.getQName (indices [j])) + >= 0) + break; + indices [j + 1] = indices [j]; + } + indices [j + 1] = n; + } + } - // write, sorted or no - for (int i= 0; i < indices.length; i++) { - String s = atts.getQName (indices [i]); + // write, sorted or no + for (int i= 0; i < indices.length; i++) { + String s = atts.getQName (indices [i]); - if (s == null || "".equals (s)) - throw new IllegalArgumentException ("no XML name"); - rawWrite (" "); - rawWrite (s); - rawWrite ("="); - writeQuotedValue (atts.getValue (indices [i]), - CTX_ATTRIBUTE); - } - } - if (isEmpty) - rawWrite (" /"); - rawWrite ('>'); + if (s == null || "".equals (s)) + throw new IllegalArgumentException ("no XML name"); + rawWrite (" "); + rawWrite (s); + rawWrite ("="); + writeQuotedValue (atts.getValue (indices [i]), + CTX_ATTRIBUTE); + } + } + if (isEmpty) + rawWrite (" /"); + rawWrite ('>'); } /** @@ -907,59 +907,59 @@ public class XMLWriter * not all user agents handle them correctly. */ final public void startElement ( - String uri, - String localName, - String qName, - Attributes atts + String uri, + String localName, + String qName, + Attributes atts ) throws SAXException { - startedDoctype = false; + startedDoctype = false; - if (locator == null) - locator = new LocatorImpl (); - - if (qName == null || "".equals (qName)) - throw new IllegalArgumentException ("no XML name"); + if (locator == null) + locator = new LocatorImpl (); - try { - if (entityNestLevel != 0) - return; - if (prettyPrinting) { - String whitespace = null; + if (qName == null || "".equals (qName)) + throw new IllegalArgumentException ("no XML name"); - if (xhtml && spacePreserve (qName)) - whitespace = "preserve"; - else if (atts != null) - whitespace = atts.getValue ("xml:space"); - if (whitespace == null) - whitespace = (String) space.peek (); - space.push (whitespace); + try { + if (entityNestLevel != 0) + return; + if (prettyPrinting) { + String whitespace = null; - if ("default".equals (whitespace)) { - if (xhtml) { - if (spaceBefore (qName)) { - newline (); - doIndent (); - } else if (indentBefore (qName)) - doIndent (); - // else it's inlined, modulo line length - // FIXME: incrementing element nest level - // for inlined elements causes ugliness - } else - doIndent (); - } - } - elementNestLevel++; - writeStartTag (qName, atts, xhtml && isEmptyElementTag (qName)); + if (xhtml && spacePreserve (qName)) + whitespace = "preserve"; + else if (atts != null) + whitespace = atts.getValue ("xml:space"); + if (whitespace == null) + whitespace = (String) space.peek (); + space.push (whitespace); - if (xhtml) { + if ("default".equals (whitespace)) { + if (xhtml) { + if (spaceBefore (qName)) { + newline (); + doIndent (); + } else if (indentBefore (qName)) + doIndent (); + // else it's inlined, modulo line length + // FIXME: incrementing element nest level + // for inlined elements causes ugliness + } else + doIndent (); + } + } + elementNestLevel++; + writeStartTag (qName, atts, xhtml && isEmptyElementTag (qName)); + + if (xhtml) { // FIXME: if this is an XHTML "pre" element, turn // off automatic wrapping. - } + } - } catch (IOException e) { - fatal ("can't write", e); - } + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -967,22 +967,22 @@ public class XMLWriter * @see #startElement */ public void writeEmptyElement ( - String uri, - String localName, - String qName, - Attributes atts + String uri, + String localName, + String qName, + Attributes atts ) throws SAXException { - if (canonical) { - startElement (uri, localName, qName, atts); - endElement (uri, localName, qName); - } else { - try { - writeStartTag (qName, atts, true); - } catch (IOException e) { - fatal ("can't write", e); - } - } + if (canonical) { + startElement (uri, localName, qName, atts); + endElement (uri, localName, qName); + } else { + try { + writeStartTag (qName, atts, true); + } catch (IOException e) { + fatal ("can't write", e); + } + } } @@ -990,68 +990,68 @@ public class XMLWriter final public void endElement (String uri, String localName, String qName) throws SAXException { - if (qName == null || "".equals (qName)) - throw new IllegalArgumentException ("no XML name"); + if (qName == null || "".equals (qName)) + throw new IllegalArgumentException ("no XML name"); - try { - elementNestLevel--; - if (entityNestLevel != 0) - return; - if (xhtml && isEmptyElementTag (qName)) - return; - rawWrite ("'); + try { + elementNestLevel--; + if (entityNestLevel != 0) + return; + if (xhtml && isEmptyElementTag (qName)) + return; + rawWrite ("'); - if (prettyPrinting) { - if (!space.empty ()) - space.pop (); - else - fatal ("stack discipline", null); - } - if (elementNestLevel == 0) - inEpilogue = true; + if (prettyPrinting) { + if (!space.empty ()) + space.pop (); + else + fatal ("stack discipline", null); + } + if (elementNestLevel == 0) + inEpilogue = true; - } catch (IOException e) { - fatal ("can't write", e); - } + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX1: reports content characters */ final public void characters (char ch [], int start, int length) throws SAXException { - if (locator == null) - locator = new LocatorImpl (); + if (locator == null) + locator = new LocatorImpl (); - try { - if (entityNestLevel != 0) - return; - if (inCDATA) { - escapeChars (ch, start, length, CTX_UNPARSED); - } else { - escapeChars (ch, start, length, CTX_CONTENT); - } - } catch (IOException e) { - fatal ("can't write", e); - } + try { + if (entityNestLevel != 0) + return; + if (inCDATA) { + escapeChars (ch, start, length, CTX_UNPARSED); + } else { + escapeChars (ch, start, length, CTX_CONTENT); + } + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX1: reports ignorable whitespace */ final public void ignorableWhitespace (char ch [], int start, int length) throws SAXException { - if (locator == null) - locator = new LocatorImpl (); + if (locator == null) + locator = new LocatorImpl (); - try { - if (entityNestLevel != 0) - return; - // don't forget to map NL to CRLF, CR, etc - escapeChars (ch, start, length, CTX_CONTENT); - } catch (IOException e) { - fatal ("can't write", e); - } + try { + if (entityNestLevel != 0) + return; + // don't forget to map NL to CRLF, CR, etc + escapeChars (ch, start, length, CTX_CONTENT); + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -1063,44 +1063,44 @@ public class XMLWriter final public void processingInstruction (String target, String data) throws SAXException { - if (locator == null) - locator = new LocatorImpl (); + if (locator == null) + locator = new LocatorImpl (); - // don't print internal subset for XHTML - if (xhtml && startedDoctype) - return; + // don't print internal subset for XHTML + if (xhtml && startedDoctype) + return; - // ancient HTML browsers might render these ... their loss. - // to prevent: "if (xhtml) return;". + // ancient HTML browsers might render these ... their loss. + // to prevent: "if (xhtml) return;". - try { - if (entityNestLevel != 0) - return; - if (canonical && inEpilogue) - newline (); - rawWrite (""); - if (elementNestLevel == 0 && !(canonical && inEpilogue)) - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + try { + if (entityNestLevel != 0) + return; + if (canonical && inEpilogue) + newline (); + rawWrite (""); + if (elementNestLevel == 0 && !(canonical && inEpilogue)) + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX1: indicates a non-expanded entity reference */ public void skippedEntity (String name) throws SAXException { - try { - rawWrite ("&"); - rawWrite (name); - rawWrite (";"); - } catch (IOException e) { - fatal ("can't write", e); - } + try { + rawWrite ("&"); + rawWrite (name); + rawWrite (";"); + } catch (IOException e) { + fatal ("can't write", e); + } } // SAX2 LexicalHandler @@ -1109,35 +1109,35 @@ public class XMLWriter final public void startCDATA () throws SAXException { - if (locator == null) - locator = new LocatorImpl (); - - if (canonical) - return; + if (locator == null) + locator = new LocatorImpl (); - try { - inCDATA = true; - if (entityNestLevel == 0) - rawWrite ("SAX2: called after parsing CDATA characters */ final public void endCDATA () throws SAXException { - if (canonical) - return; + if (canonical) + return; - try { - inCDATA = false; - if (entityNestLevel == 0) - rawWrite ("]]>"); - } catch (IOException e) { - fatal ("can't write", e); - } + try { + inCDATA = false; + if (entityNestLevel == 0) + rawWrite ("]]>"); + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -1148,45 +1148,45 @@ public class XMLWriter final public void startDTD (String name, String publicId, String systemId) throws SAXException { - if (locator == null) - locator = new LocatorImpl (); - if (xhtml) - return; - try { - inDoctype = startedDoctype = true; - if (canonical) - return; - rawWrite ("SAX2: called after the doctype is parsed */ final public void endDTD () throws SAXException { - inDoctype = false; - if (canonical || xhtml) - return; - try { - rawWrite ("]>"); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + inDoctype = false; + if (canonical || xhtml) + return; + try { + rawWrite ("]>"); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -1195,30 +1195,30 @@ public class XMLWriter final public void startEntity (String name) throws SAXException { - try { - boolean writeEOL = true; + try { + boolean writeEOL = true; - // Predefined XHTML entities (for characters) will get - // mapped back later. - if (xhtml || expandingEntities) - return; + // Predefined XHTML entities (for characters) will get + // mapped back later. + if (xhtml || expandingEntities) + return; - entityNestLevel++; - if (name.equals ("[dtd]")) - return; - if (entityNestLevel != 1) - return; - if (!name.startsWith ("%")) { - writeEOL = false; - rawWrite ('&'); - } - rawWrite (name); - rawWrite (';'); - if (writeEOL) - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + entityNestLevel++; + if (name.equals ("[dtd]")) + return; + if (entityNestLevel != 1) + return; + if (!name.startsWith ("%")) { + writeEOL = false; + rawWrite ('&'); + } + rawWrite (name); + rawWrite (';'); + if (writeEOL) + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** @@ -1227,9 +1227,9 @@ public class XMLWriter final public void endEntity (String name) throws SAXException { - if (xhtml || expandingEntities) - return; - entityNestLevel--; + if (xhtml || expandingEntities) + return; + entityNestLevel--; } /** @@ -1243,294 +1243,294 @@ public class XMLWriter final public void comment (char ch [], int start, int length) throws SAXException { - if (locator == null) - locator = new LocatorImpl (); + if (locator == null) + locator = new LocatorImpl (); - // don't print internal subset for XHTML - if (xhtml && startedDoctype) - return; - // don't print comment in doctype for canon xml - if (canonical && inDoctype) - return; + // don't print internal subset for XHTML + if (xhtml && startedDoctype) + return; + // don't print comment in doctype for canon xml + if (canonical && inDoctype) + return; - try { - boolean indent; + try { + boolean indent; - if (prettyPrinting && space.empty ()) - fatal ("stack discipline", null); - indent = prettyPrinting && "default".equals (space.peek ()); - if (entityNestLevel != 0) - return; - if (indent) - doIndent (); - if (canonical && inEpilogue) - newline (); - rawWrite (""); - if (indent) - doIndent (); - if (elementNestLevel == 0 && !(canonical && inEpilogue)) - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (prettyPrinting && space.empty ()) + fatal ("stack discipline", null); + indent = prettyPrinting && "default".equals (space.peek ()); + if (entityNestLevel != 0) + return; + if (indent) + doIndent (); + if (canonical && inEpilogue) + newline (); + rawWrite (""); + if (indent) + doIndent (); + if (elementNestLevel == 0 && !(canonical && inEpilogue)) + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } // SAX1 DTDHandler /** SAX1: called on notation declarations */ final public void notationDecl (String name, - String publicId, String systemId) + String publicId, String systemId) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) - return; + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) + return; - if (entityNestLevel != 0) - return; - rawWrite (""); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (entityNestLevel != 0) + return; + rawWrite (""); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX1: called on unparsed entity declarations */ final public void unparsedEntityDecl (String name, - String publicId, String systemId, - String notationName) + String publicId, String systemId, + String notationName) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) { - // FIXME: write to temporary buffer, and make the start - // of the root element write these declarations. - return; - } + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) { + // FIXME: write to temporary buffer, and make the start + // of the root element write these declarations. + return; + } - if (entityNestLevel != 0) - return; - rawWrite (""); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (entityNestLevel != 0) + return; + rawWrite (""); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } // SAX2 DeclHandler /** SAX2: called on attribute declarations */ final public void attributeDecl (String eName, String aName, - String type, String mode, String value) + String type, String mode, String value) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) - return; - if (entityNestLevel != 0) - return; - rawWrite ("'); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) + return; + if (entityNestLevel != 0) + return; + rawWrite ("'); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX2: called on element declarations */ final public void elementDecl (String name, String model) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) - return; - if (entityNestLevel != 0) - return; - rawWrite ("'); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) + return; + if (entityNestLevel != 0) + return; + rawWrite ("'); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX2: called on external entity declarations */ final public void externalEntityDecl ( - String name, - String publicId, - String systemId) + String name, + String publicId, + String systemId) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) - return; - if (entityNestLevel != 0) - return; - rawWrite (""); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) + return; + if (entityNestLevel != 0) + return; + rawWrite (""); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } /** SAX2: called on internal entity declarations */ final public void internalEntityDecl (String name, String value) throws SAXException { - if (xhtml) - return; - try { - // At this time, only SAX2 callbacks start these. - if (!startedDoctype) - return; - if (entityNestLevel != 0) - return; - rawWrite ("'); - newline (); - } catch (IOException e) { - fatal ("can't write", e); - } + if (xhtml) + return; + try { + // At this time, only SAX2 callbacks start these. + if (!startedDoctype) + return; + if (entityNestLevel != 0) + return; + rawWrite ("'); + newline (); + } catch (IOException e) { + fatal ("can't write", e); + } } private void writeQuotedValue (String value, int code) throws SAXException, IOException { - char buf [] = value.toCharArray (); - int off = 0, len = buf.length; + char buf [] = value.toCharArray (); + int off = 0, len = buf.length; - // we can't add line breaks to attribute/entity/... values - noWrap = true; - rawWrite ('"'); - escapeChars (buf, off, len, code); - rawWrite ('"'); - noWrap = false; + // we can't add line breaks to attribute/entity/... values + noWrap = true; + rawWrite ('"'); + escapeChars (buf, off, len, code); + rawWrite ('"'); + noWrap = false; } - + // From "HTMLlat1x.ent" ... names of entities for ISO-8859-1 // (Latin/1) characters, all codes: 160-255 (0xA0-0xFF). // Codes 128-159 have no assigned values. private static final String HTMLlat1x [] = { - // 160 - "nbsp", "iexcl", "cent", "pound", "curren", - "yen", "brvbar", "sect", "uml", "copy", + // 160 + "nbsp", "iexcl", "cent", "pound", "curren", + "yen", "brvbar", "sect", "uml", "copy", - // 170 - "ordf", "laquo", "not", "shy", "reg", - "macr", "deg", "plusmn", "sup2", "sup3", + // 170 + "ordf", "laquo", "not", "shy", "reg", + "macr", "deg", "plusmn", "sup2", "sup3", - // 180 - "acute", "micro", "para", "middot", "cedil", - "sup1", "ordm", "raquo", "frac14", "frac12", + // 180 + "acute", "micro", "para", "middot", "cedil", + "sup1", "ordm", "raquo", "frac14", "frac12", - // 190 - "frac34", "iquest", "Agrave", "Aacute", "Acirc", - "Atilde", "Auml", "Aring", "AElig", "Ccedil", + // 190 + "frac34", "iquest", "Agrave", "Aacute", "Acirc", + "Atilde", "Auml", "Aring", "AElig", "Ccedil", - // 200 - "Egrave", "Eacute", "Ecirc", "Euml", "Igrave", - "Iacute", "Icirc", "Iuml", "ETH", "Ntilde", + // 200 + "Egrave", "Eacute", "Ecirc", "Euml", "Igrave", + "Iacute", "Icirc", "Iuml", "ETH", "Ntilde", - // 210 - "Ograve", "Oacute", "Ocirc", "Otilde", "Ouml", - "times", "Oslash", "Ugrave", "Uacute", "Ucirc", + // 210 + "Ograve", "Oacute", "Ocirc", "Otilde", "Ouml", + "times", "Oslash", "Ugrave", "Uacute", "Ucirc", - // 220 - "Uuml", "Yacute", "THORN", "szlig", "agrave", - "aacute", "acirc", "atilde", "auml", "aring", + // 220 + "Uuml", "Yacute", "THORN", "szlig", "agrave", + "aacute", "acirc", "atilde", "auml", "aring", - // 230 - "aelig", "ccedil", "egrave", "eacute", "ecirc", - "euml", "igrave", "iacute", "icirc", "iuml", + // 230 + "aelig", "ccedil", "egrave", "eacute", "ecirc", + "euml", "igrave", "iacute", "icirc", "iuml", - // 240 - "eth", "ntilde", "ograve", "oacute", "ocirc", - "otilde", "ouml", "divide", "oslash", "ugrave", + // 240 + "eth", "ntilde", "ograve", "oacute", "ocirc", + "otilde", "ouml", "divide", "oslash", "ugrave", - // 250 - "uacute", "ucirc", "uuml", "yacute", "thorn", - "yuml" + // 250 + "uacute", "ucirc", "uuml", "yacute", "thorn", + "yuml" }; // From "HTMLsymbolx.ent" ... some of the symbols that // we can conveniently handle. Entities for the Greek. // alphabet (upper and lower cases) are compact. private static final String HTMLsymbolx_GR [] = { - // 913 - "Alpha", "Beta", "Gamma", "Delta", "Epsilon", - "Zeta", "Eta", "Theta", "Iota", "Kappa", + // 913 + "Alpha", "Beta", "Gamma", "Delta", "Epsilon", + "Zeta", "Eta", "Theta", "Iota", "Kappa", - // 923 - "Lambda", "Mu", "Nu", "Xi", "Omicron", - "Pi", "Rho", null, "Sigma", "Tau", + // 923 + "Lambda", "Mu", "Nu", "Xi", "Omicron", + "Pi", "Rho", null, "Sigma", "Tau", - // 933 - "Upsilon", "Phi", "Chi", "Psi", "Omega" + // 933 + "Upsilon", "Phi", "Chi", "Psi", "Omega" }; private static final String HTMLsymbolx_gr [] = { - // 945 - "alpha", "beta", "gamma", "delta", "epsilon", - "zeta", "eta", "theta", "iota", "kappa", + // 945 + "alpha", "beta", "gamma", "delta", "epsilon", + "zeta", "eta", "theta", "iota", "kappa", - // 955 - "lambda", "mu", "nu", "xi", "omicron", - "pi", "rho", "sigmaf", "sigma", "tau", + // 955 + "lambda", "mu", "nu", "xi", "omicron", + "pi", "rho", "sigmaf", "sigma", "tau", - // 965 - "upsilon", "phi", "chi", "psi", "omega" + // 965 + "upsilon", "phi", "chi", "psi", "omega" }; @@ -1539,268 +1539,268 @@ public class XMLWriter private void escapeChars (char buf [], int off, int len, int code) throws SAXException, IOException { - int first = 0; + int first = 0; - if (off < 0) { - off = 0; - len = buf.length; - } - for (int i = 0; i < len; i++) { - String esc; - char c = buf [off + i]; + if (off < 0) { + off = 0; + len = buf.length; + } + for (int i = 0; i < len; i++) { + String esc; + char c = buf [off + i]; - switch (c) { - // Note that CTX_ATTRIBUTE isn't explicitly tested here; - // all syntax delimiters are escaped in CTX_ATTRIBUTE, - // otherwise it's similar to CTX_CONTENT + switch (c) { + // Note that CTX_ATTRIBUTE isn't explicitly tested here; + // all syntax delimiters are escaped in CTX_ATTRIBUTE, + // otherwise it's similar to CTX_CONTENT - // ampersand flags entity references; entity replacement - // text has unexpanded references, other text doesn't. - case '&': - if (code == CTX_ENTITY || code == CTX_UNPARSED) - continue; - esc = "amp"; - break; + // ampersand flags entity references; entity replacement + // text has unexpanded references, other text doesn't. + case '&': + if (code == CTX_ENTITY || code == CTX_UNPARSED) + continue; + esc = "amp"; + break; - // attributes and text may NOT have literal '<', but - // entities may have markup constructs - case '<': - if (code == CTX_ENTITY || code == CTX_UNPARSED) - continue; - esc = "lt"; - break; + // attributes and text may NOT have literal '<', but + // entities may have markup constructs + case '<': + if (code == CTX_ENTITY || code == CTX_UNPARSED) + continue; + esc = "lt"; + break; - // as above re markup constructs; but otherwise - // except when canonicalizing, this is for consistency - case '>': - if (code == CTX_ENTITY || code == CTX_UNPARSED) - continue; - esc = "gt"; - break; - case '\'': - if (code == CTX_CONTENT || code == CTX_UNPARSED) - continue; - if (canonical) - continue; - esc = "apos"; - break; + // as above re markup constructs; but otherwise + // except when canonicalizing, this is for consistency + case '>': + if (code == CTX_ENTITY || code == CTX_UNPARSED) + continue; + esc = "gt"; + break; + case '\'': + if (code == CTX_CONTENT || code == CTX_UNPARSED) + continue; + if (canonical) + continue; + esc = "apos"; + break; - // needed when printing quoted attribute/entity values - case '"': - if (code == CTX_CONTENT || code == CTX_UNPARSED) - continue; - esc = "quot"; - break; + // needed when printing quoted attribute/entity values + case '"': + if (code == CTX_CONTENT || code == CTX_UNPARSED) + continue; + esc = "quot"; + break; - // make line ends work per host OS convention - case '\n': - esc = eol; - break; + // make line ends work per host OS convention + case '\n': + esc = eol; + break; - // - // No other characters NEED special treatment ... except - // for encoding-specific issues, like whether the character - // can really be represented in that encoding. - // - default: - // - // There are characters we can never write safely; getting - // them is an error. - // - // (a) They're never legal in XML ... detected by range - // checks, and (eventually) by remerging surrogate - // pairs on output. (Easy error for apps to prevent.) - // - // (b) This encoding can't represent them, and we - // can't make reference substitution (e.g. inside - // CDATA sections, names, PI data, etc). (Hard for - // apps to prevent, except by using UTF-8 or UTF-16 - // as their output encoding.) - // - // We know a very little bit about what characters - // the US-ASCII and ISO-8859-1 encodings support. For - // other encodings we can't detect the second type of - // error at all. (Never an issue for UTF-8 or UTF-16.) - // + // + // No other characters NEED special treatment ... except + // for encoding-specific issues, like whether the character + // can really be represented in that encoding. + // + default: + // + // There are characters we can never write safely; getting + // them is an error. + // + // (a) They're never legal in XML ... detected by range + // checks, and (eventually) by remerging surrogate + // pairs on output. (Easy error for apps to prevent.) + // + // (b) This encoding can't represent them, and we + // can't make reference substitution (e.g. inside + // CDATA sections, names, PI data, etc). (Hard for + // apps to prevent, except by using UTF-8 or UTF-16 + // as their output encoding.) + // + // We know a very little bit about what characters + // the US-ASCII and ISO-8859-1 encodings support. For + // other encodings we can't detect the second type of + // error at all. (Never an issue for UTF-8 or UTF-16.) + // // FIXME: CR in CDATA is an error; in text, turn to a char ref // FIXME: CR/LF/TAB in attributes should become char refs - if ((c > 0xfffd) - || ((c < 0x0020) && !((c == 0x0009) - || (c == 0x000A) || (c == 0x000D))) - || (((c & dangerMask) != 0) - && (code == CTX_UNPARSED))) { + if ((c > 0xfffd) + || ((c < 0x0020) && !((c == 0x0009) + || (c == 0x000A) || (c == 0x000D))) + || (((c & dangerMask) != 0) + && (code == CTX_UNPARSED))) { - // if case (b) in CDATA, we might end the section, - // write a reference, then restart ... possible - // in one DOM L3 draft. + // if case (b) in CDATA, we might end the section, + // write a reference, then restart ... possible + // in one DOM L3 draft. - throw new CharConversionException ( - "Illegal or non-writable character: U+" - + Integer.toHexString (c)); - } + throw new CharConversionException ( + "Illegal or non-writable character: U+" + + Integer.toHexString (c)); + } - // - // If the output encoding represents the character - // directly, let it do so! Else we'll escape it. - // - if ((c & dangerMask) == 0) - continue; - esc = null; + // + // If the output encoding represents the character + // directly, let it do so! Else we'll escape it. + // + if ((c & dangerMask) == 0) + continue; + esc = null; - // Avoid numeric refs where symbolic ones exist, as - // symbolic ones make more sense to humans reading! - if (xhtml) { - // all the HTMLlat1x.ent entities - // (all the "ISO-8859-1" characters) - if (c >= 160 && c <= 255) - esc = HTMLlat1x [c - 160]; + // Avoid numeric refs where symbolic ones exist, as + // symbolic ones make more sense to humans reading! + if (xhtml) { + // all the HTMLlat1x.ent entities + // (all the "ISO-8859-1" characters) + if (c >= 160 && c <= 255) + esc = HTMLlat1x [c - 160]; - // not quite half the HTMLsymbolx.ent entities - else if (c >= 913 && c <= 937) - esc = HTMLsymbolx_GR [c - 913]; - else if (c >= 945 && c <= 969) - esc = HTMLsymbolx_gr [c - 945]; + // not quite half the HTMLsymbolx.ent entities + else if (c >= 913 && c <= 937) + esc = HTMLsymbolx_GR [c - 913]; + else if (c >= 945 && c <= 969) + esc = HTMLsymbolx_gr [c - 945]; - else switch (c) { - // all of the HTMLspecialx.ent entities - case 338: esc = "OElig"; break; - case 339: esc = "oelig"; break; - case 352: esc = "Scaron"; break; - case 353: esc = "scaron"; break; - case 376: esc = "Yuml"; break; - case 710: esc = "circ"; break; - case 732: esc = "tilde"; break; - case 8194: esc = "ensp"; break; - case 8195: esc = "emsp"; break; - case 8201: esc = "thinsp"; break; - case 8204: esc = "zwnj"; break; - case 8205: esc = "zwj"; break; - case 8206: esc = "lrm"; break; - case 8207: esc = "rlm"; break; - case 8211: esc = "ndash"; break; - case 8212: esc = "mdash"; break; - case 8216: esc = "lsquo"; break; - case 8217: esc = "rsquo"; break; - case 8218: esc = "sbquo"; break; - case 8220: esc = "ldquo"; break; - case 8221: esc = "rdquo"; break; - case 8222: esc = "bdquo"; break; - case 8224: esc = "dagger"; break; - case 8225: esc = "Dagger"; break; - case 8240: esc = "permil"; break; - case 8249: esc = "lsaquo"; break; - case 8250: esc = "rsaquo"; break; - case 8364: esc = "euro"; break; + else switch (c) { + // all of the HTMLspecialx.ent entities + case 338: esc = "OElig"; break; + case 339: esc = "oelig"; break; + case 352: esc = "Scaron"; break; + case 353: esc = "scaron"; break; + case 376: esc = "Yuml"; break; + case 710: esc = "circ"; break; + case 732: esc = "tilde"; break; + case 8194: esc = "ensp"; break; + case 8195: esc = "emsp"; break; + case 8201: esc = "thinsp"; break; + case 8204: esc = "zwnj"; break; + case 8205: esc = "zwj"; break; + case 8206: esc = "lrm"; break; + case 8207: esc = "rlm"; break; + case 8211: esc = "ndash"; break; + case 8212: esc = "mdash"; break; + case 8216: esc = "lsquo"; break; + case 8217: esc = "rsquo"; break; + case 8218: esc = "sbquo"; break; + case 8220: esc = "ldquo"; break; + case 8221: esc = "rdquo"; break; + case 8222: esc = "bdquo"; break; + case 8224: esc = "dagger"; break; + case 8225: esc = "Dagger"; break; + case 8240: esc = "permil"; break; + case 8249: esc = "lsaquo"; break; + case 8250: esc = "rsaquo"; break; + case 8364: esc = "euro"; break; - // the other HTMLsymbox.ent entities - case 402: esc = "fnof"; break; - case 977: esc = "thetasym"; break; - case 978: esc = "upsih"; break; - case 982: esc = "piv"; break; - case 8226: esc = "bull"; break; - case 8230: esc = "hellip"; break; - case 8242: esc = "prime"; break; - case 8243: esc = "Prime"; break; - case 8254: esc = "oline"; break; - case 8260: esc = "frasl"; break; - case 8472: esc = "weierp"; break; - case 8465: esc = "image"; break; - case 8476: esc = "real"; break; - case 8482: esc = "trade"; break; - case 8501: esc = "alefsym"; break; - case 8592: esc = "larr"; break; - case 8593: esc = "uarr"; break; - case 8594: esc = "rarr"; break; - case 8595: esc = "darr"; break; - case 8596: esc = "harr"; break; - case 8629: esc = "crarr"; break; - case 8656: esc = "lArr"; break; - case 8657: esc = "uArr"; break; - case 8658: esc = "rArr"; break; - case 8659: esc = "dArr"; break; - case 8660: esc = "hArr"; break; - case 8704: esc = "forall"; break; - case 8706: esc = "part"; break; - case 8707: esc = "exist"; break; - case 8709: esc = "empty"; break; - case 8711: esc = "nabla"; break; - case 8712: esc = "isin"; break; - case 8713: esc = "notin"; break; - case 8715: esc = "ni"; break; - case 8719: esc = "prod"; break; - case 8721: esc = "sum"; break; - case 8722: esc = "minus"; break; - case 8727: esc = "lowast"; break; - case 8730: esc = "radic"; break; - case 8733: esc = "prop"; break; - case 8734: esc = "infin"; break; - case 8736: esc = "ang"; break; - case 8743: esc = "and"; break; - case 8744: esc = "or"; break; - case 8745: esc = "cap"; break; - case 8746: esc = "cup"; break; - case 8747: esc = "int"; break; - case 8756: esc = "there4"; break; - case 8764: esc = "sim"; break; - case 8773: esc = "cong"; break; - case 8776: esc = "asymp"; break; - case 8800: esc = "ne"; break; - case 8801: esc = "equiv"; break; - case 8804: esc = "le"; break; - case 8805: esc = "ge"; break; - case 8834: esc = "sub"; break; - case 8835: esc = "sup"; break; - case 8836: esc = "nsub"; break; - case 8838: esc = "sube"; break; - case 8839: esc = "supe"; break; - case 8853: esc = "oplus"; break; - case 8855: esc = "otimes"; break; - case 8869: esc = "perp"; break; - case 8901: esc = "sdot"; break; - case 8968: esc = "lceil"; break; - case 8969: esc = "rceil"; break; - case 8970: esc = "lfloor"; break; - case 8971: esc = "rfloor"; break; - case 9001: esc = "lang"; break; - case 9002: esc = "rang"; break; - case 9674: esc = "loz"; break; - case 9824: esc = "spades"; break; - case 9827: esc = "clubs"; break; - case 9829: esc = "hearts"; break; - case 9830: esc = "diams"; break; - } - } + // the other HTMLsymbox.ent entities + case 402: esc = "fnof"; break; + case 977: esc = "thetasym"; break; + case 978: esc = "upsih"; break; + case 982: esc = "piv"; break; + case 8226: esc = "bull"; break; + case 8230: esc = "hellip"; break; + case 8242: esc = "prime"; break; + case 8243: esc = "Prime"; break; + case 8254: esc = "oline"; break; + case 8260: esc = "frasl"; break; + case 8472: esc = "weierp"; break; + case 8465: esc = "image"; break; + case 8476: esc = "real"; break; + case 8482: esc = "trade"; break; + case 8501: esc = "alefsym"; break; + case 8592: esc = "larr"; break; + case 8593: esc = "uarr"; break; + case 8594: esc = "rarr"; break; + case 8595: esc = "darr"; break; + case 8596: esc = "harr"; break; + case 8629: esc = "crarr"; break; + case 8656: esc = "lArr"; break; + case 8657: esc = "uArr"; break; + case 8658: esc = "rArr"; break; + case 8659: esc = "dArr"; break; + case 8660: esc = "hArr"; break; + case 8704: esc = "forall"; break; + case 8706: esc = "part"; break; + case 8707: esc = "exist"; break; + case 8709: esc = "empty"; break; + case 8711: esc = "nabla"; break; + case 8712: esc = "isin"; break; + case 8713: esc = "notin"; break; + case 8715: esc = "ni"; break; + case 8719: esc = "prod"; break; + case 8721: esc = "sum"; break; + case 8722: esc = "minus"; break; + case 8727: esc = "lowast"; break; + case 8730: esc = "radic"; break; + case 8733: esc = "prop"; break; + case 8734: esc = "infin"; break; + case 8736: esc = "ang"; break; + case 8743: esc = "and"; break; + case 8744: esc = "or"; break; + case 8745: esc = "cap"; break; + case 8746: esc = "cup"; break; + case 8747: esc = "int"; break; + case 8756: esc = "there4"; break; + case 8764: esc = "sim"; break; + case 8773: esc = "cong"; break; + case 8776: esc = "asymp"; break; + case 8800: esc = "ne"; break; + case 8801: esc = "equiv"; break; + case 8804: esc = "le"; break; + case 8805: esc = "ge"; break; + case 8834: esc = "sub"; break; + case 8835: esc = "sup"; break; + case 8836: esc = "nsub"; break; + case 8838: esc = "sube"; break; + case 8839: esc = "supe"; break; + case 8853: esc = "oplus"; break; + case 8855: esc = "otimes"; break; + case 8869: esc = "perp"; break; + case 8901: esc = "sdot"; break; + case 8968: esc = "lceil"; break; + case 8969: esc = "rceil"; break; + case 8970: esc = "lfloor"; break; + case 8971: esc = "rfloor"; break; + case 9001: esc = "lang"; break; + case 9002: esc = "rang"; break; + case 9674: esc = "loz"; break; + case 9824: esc = "spades"; break; + case 9827: esc = "clubs"; break; + case 9829: esc = "hearts"; break; + case 9830: esc = "diams"; break; + } + } - // else escape with numeric char refs - if (esc == null) { - stringBuf.setLength (0); - stringBuf.append ("#x"); - stringBuf.append (Integer.toHexString (c).toUpperCase ()); - esc = stringBuf.toString (); + // else escape with numeric char refs + if (esc == null) { + stringBuf.setLength (0); + stringBuf.append ("#x"); + stringBuf.append (Integer.toHexString (c).toUpperCase ()); + esc = stringBuf.toString (); - // FIXME: We don't write surrogate pairs correctly. - // They should work as one ref per character, since - // each pair is one character. For reading back into - // Unicode, it matters beginning in Unicode 3.1 ... - } - break; - } - if (i != first) - rawWrite (buf, off + first, i - first); - first = i + 1; - if (esc == eol) - newline (); - else { - rawWrite ('&'); - rawWrite (esc); - rawWrite (';'); - } - } - if (first < len) - rawWrite (buf, off + first, len - first); + // FIXME: We don't write surrogate pairs correctly. + // They should work as one ref per character, since + // each pair is one character. For reading back into + // Unicode, it matters beginning in Unicode 3.1 ... + } + break; + } + if (i != first) + rawWrite (buf, off + first, i - first); + first = i + 1; + if (esc == eol) + newline (); + else { + rawWrite ('&'); + rawWrite (esc); + rawWrite (';'); + } + } + if (first < len) + rawWrite (buf, off + first, len - first); } @@ -1808,45 +1808,45 @@ public class XMLWriter private void newline () throws SAXException, IOException { - out.write (eol); - column = 0; + out.write (eol); + column = 0; } private void doIndent () throws SAXException, IOException { - int space = elementNestLevel * 2; + int space = elementNestLevel * 2; - newline (); - column = space; - // track tabs only at line starts - while (space > 8) { - out.write ("\t"); - space -= 8; - } - while (space > 0) { - out.write (" "); - space -= 2; - } + newline (); + column = space; + // track tabs only at line starts + while (space > 8) { + out.write ("\t"); + space -= 8; + } + while (space > 0) { + out.write (" "); + space -= 2; + } } private void rawWrite (char c) throws IOException { - out.write (c); - column++; + out.write (c); + column++; } private void rawWrite (String s) throws SAXException, IOException { - if (prettyPrinting && "default".equals (space.peek ())) { - char data [] = s.toCharArray (); - rawWrite (data, 0, data.length); - } else { - out.write (s); - column += s.length (); - } + if (prettyPrinting && "default".equals (space.peek ())) { + char data [] = s.toCharArray (); + rawWrite (data, 0, data.length); + } else { + out.write (s); + column += s.length (); + } } // NOTE: if xhtml, the REC gives some rules about whitespace @@ -1862,70 +1862,70 @@ public class XMLWriter private void rawWrite (char buf [], int offset, int length) throws SAXException, IOException { - boolean wrap; + boolean wrap; - if (prettyPrinting && space.empty ()) - fatal ("stack discipline", null); + if (prettyPrinting && space.empty ()) + fatal ("stack discipline", null); - wrap = prettyPrinting && "default".equals (space.peek ()); - if (!wrap) { - out.write (buf, offset, length); - column += length; - return; - } + wrap = prettyPrinting && "default".equals (space.peek ()); + if (!wrap) { + out.write (buf, offset, length); + column += length; + return; + } - // we're pretty printing and want to fill lines out only - // to the desired line length. - while (length > 0) { - int target = lineLength - column; - boolean wrote = false; + // we're pretty printing and want to fill lines out only + // to the desired line length. + while (length > 0) { + int target = lineLength - column; + boolean wrote = false; - // Do we even have a problem? - if (target > length || noWrap) { - out.write (buf, offset, length); - column += length; - return; - } + // Do we even have a problem? + if (target > length || noWrap) { + out.write (buf, offset, length); + column += length; + return; + } - // break the line at a space character, trying to fill - // as much of the line as possible. - char c; + // break the line at a space character, trying to fill + // as much of the line as possible. + char c; - for (int i = target - 1; i >= 0; i--) { - if ((c = buf [offset + i]) == ' ' || c == '\t') { - i++; - out.write (buf, offset, i); - doIndent (); - offset += i; - length -= i; - wrote = true; - break; - } - } - if (wrote) - continue; - - // no space character permitting break before target - // line length is filled. So, take the next one. - if (target < 0) - target = 0; - for (int i = target; i < length; i++) - if ((c = buf [offset + i]) == ' ' || c == '\t') { - i++; - out.write (buf, offset, i); - doIndent (); - offset += i; - length -= i; - wrote = true; - break; - } - if (wrote) - continue; - - // no such luck. - out.write (buf, offset, length); - column += length; - break; - } + for (int i = target - 1; i >= 0; i--) { + if ((c = buf [offset + i]) == ' ' || c == '\t') { + i++; + out.write (buf, offset, i); + doIndent (); + offset += i; + length -= i; + wrote = true; + break; + } + } + if (wrote) + continue; + + // no space character permitting break before target + // line length is filled. So, take the next one. + if (target < 0) + target = 0; + for (int i = target; i < length; i++) + if ((c = buf [offset + i]) == ' ' || c == '\t') { + i++; + out.write (buf, offset, i); + doIndent (); + offset += i; + length -= i; + wrote = true; + break; + } + if (wrote) + continue; + + // no such luck. + out.write (buf, offset, length); + column += length; + break; + } } } diff --git a/libjava/classpath/gnu/xml/validation/datatype/Annotation.java b/libjava/classpath/gnu/xml/validation/datatype/Annotation.java index cba6954b624..6438e2ebb28 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Annotation.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Annotation.java @@ -1,4 +1,4 @@ -/* Annotation.java -- +/* Annotation.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ public class Annotation { return documentation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java index 63441c70a1d..36fb98daa3d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java @@ -1,4 +1,4 @@ -/* AnySimpleType.java -- +/* AnySimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import javax.xml.namespace.QName; final class AnySimpleType extends SimpleType { - + AnySimpleType() { super(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "anySimpleType"), @@ -56,4 +56,3 @@ final class AnySimpleType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnyType.java b/libjava/classpath/gnu/xml/validation/datatype/AnyType.java index f26a0756d8b..2a3f116dd1c 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnyType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnyType.java @@ -1,4 +1,4 @@ -/* AnyType.java -- +/* AnyType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,7 +43,7 @@ import javax.xml.namespace.QName; final class AnyType extends SimpleType { - + AnyType() { super(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "anyType"), @@ -55,4 +55,3 @@ final class AnyType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java b/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java index 56c0a0658ea..ef409b99cb1 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java @@ -1,4 +1,4 @@ -/* AnyURIType.java -- +/* AnyURIType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -89,6 +89,5 @@ final class AnyURIType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java index d685e5cf00e..38528eecf8a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java @@ -1,4 +1,4 @@ -/* AtomicSimpleType.java -- +/* AtomicSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ import org.relaxng.datatype.ValidationContext; public class AtomicSimpleType extends SimpleType { - + public AtomicSimpleType(QName name, Set facets, int fundamentalFacets, @@ -73,6 +73,5 @@ public class AtomicSimpleType if (baseType != null) baseType.checkValid(value, context); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java b/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java index 2fc4c33b91e..3f3442f8c71 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java @@ -1,4 +1,4 @@ -/* Base64BinaryType.java -- +/* Base64BinaryType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -98,7 +98,7 @@ final class Base64BinaryType char c1 = value.charAt(i--); if (c1 == ' ') c1 = value.charAt(i--); - + if (c4 == '=') { if (c3 == '=') @@ -124,6 +124,5 @@ final class Base64BinaryType throw new DatatypeException("illegal BASE64"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java b/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java index 25e488a05fd..5d98d241282 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java @@ -1,4 +1,4 @@ -/* BooleanType.java -- +/* BooleanType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,11 +80,10 @@ final class BooleanType if (!VALUE_SPACE.contains(value)) throw new DatatypeException("invalid boolean value"); } - + public Object createValue(String literal, ValidationContext context) { return ("1".equals(literal) || "true".equals(literal)) ? Boolean.TRUE : Boolean.FALSE; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ByteType.java b/libjava/classpath/gnu/xml/validation/datatype/ByteType.java index 539dba29a99..9bce45bf9a3 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ByteType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ByteType.java @@ -1,4 +1,4 @@ -/* ByteType.java -- +/* ByteType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class ByteType throw new DatatypeException(i, "invalid byte value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class ByteType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java b/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java index 749ba8106c1..81d2785bc59 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java @@ -1,4 +1,4 @@ -/* DateTimeType.java -- +/* DateTimeType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -213,7 +213,7 @@ final class DateTimeType throw new DatatypeException(len, "invalid dateTime value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 0; @@ -330,6 +330,5 @@ final class DateTimeType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DateType.java b/libjava/classpath/gnu/xml/validation/datatype/DateType.java index 6a4e1d771a7..8e6e3c35a67 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DateType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DateType.java @@ -1,4 +1,4 @@ -/* DateType.java -- +/* DateType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -128,7 +128,7 @@ final class DateType throw new DatatypeException("invalid date value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 0; @@ -217,6 +217,5 @@ final class DateType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java b/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java index b895c44b213..43a26a39958 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java @@ -1,4 +1,4 @@ -/* DecimalType.java -- +/* DecimalType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,7 +103,7 @@ final class DecimalType throw new DatatypeException(i, "invalid decimal value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -114,6 +114,5 @@ final class DecimalType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java b/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java index 5d2d8662d56..dfaa7c8cb77 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java @@ -1,4 +1,4 @@ -/* DoubleType.java -- +/* DoubleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class DoubleType throw e2; } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class DoubleType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DurationType.java b/libjava/classpath/gnu/xml/validation/datatype/DurationType.java index 2cb92baae61..6c0f7b889e9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DurationType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DurationType.java @@ -1,4 +1,4 @@ -/* DurationType.java -- +/* DurationType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,7 +103,7 @@ final class DurationType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -170,7 +170,7 @@ final class DurationType throw new DatatypeException(i, "illegal duration value"); } } - + public Object createValue(String value, ValidationContext context) { boolean negative = false; int days = 0, months = 0, years = 0; @@ -236,4 +236,3 @@ final class DurationType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java b/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java index d16106e0044..5415e88e243 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java @@ -1,4 +1,4 @@ -/* EntitiesType.java -- +/* EntitiesType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,6 +104,5 @@ final class EntitiesType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/EntityType.java b/libjava/classpath/gnu/xml/validation/datatype/EntityType.java index f1443bcb983..f4a10bd507f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EntityType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EntityType.java @@ -1,4 +1,4 @@ -/* EntityType.java -- +/* EntityType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class EntityType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java b/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java index 0ad3d3fa4d3..45b9c23785b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java @@ -1,4 +1,4 @@ -/* EnumerationFacet.java -- +/* EnumerationFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class EnumerationFacet extends Facet { - + public final String value; public EnumerationFacet(String value, Annotation annotation) @@ -64,6 +64,5 @@ public final class EnumerationFacet return (other instanceof EnumerationFacet && ((EnumerationFacet) other).value.equals(value)); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Facet.java b/libjava/classpath/gnu/xml/validation/datatype/Facet.java index 490abf8eeb7..9f18bedc86f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Facet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Facet.java @@ -1,4 +1,4 @@ -/* Facet.java -- +/* Facet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,6 +73,5 @@ public abstract class Facet this.type = type; this.annotation = annotation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/FloatType.java b/libjava/classpath/gnu/xml/validation/datatype/FloatType.java index 372e38871ae..8dbb4aa56fa 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/FloatType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/FloatType.java @@ -1,4 +1,4 @@ -/* FloatType.java -- +/* FloatType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class FloatType throw e2; } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class FloatType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java b/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java index efd986200e5..c0d714578e5 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java @@ -1,4 +1,4 @@ -/* FractionDigitsFacet.java -- +/* FractionDigitsFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class FractionDigitsFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class FractionDigitsFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class FractionDigitsFacet return (other instanceof FractionDigitsFacet && ((FractionDigitsFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GDayType.java b/libjava/classpath/gnu/xml/validation/datatype/GDayType.java index 009af35850b..cc6b8e3d47b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GDayType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GDayType.java @@ -1,4 +1,4 @@ -/* GDayType.java -- +/* GDayType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GDayType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -157,7 +157,7 @@ final class GDayType throw new DatatypeException("invalid GDay value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -170,6 +170,5 @@ final class GDayType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java b/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java index a39a1cc4370..d293d9b572d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java @@ -1,4 +1,4 @@ -/* GMonthDayType.java -- +/* GMonthDayType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ final class GMonthDayType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -165,7 +165,7 @@ final class GMonthDayType throw new DatatypeException("illegal GMonthDay type"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -179,6 +179,5 @@ final class GMonthDayType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java b/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java index 5a08af2876a..9450874b90e 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java @@ -1,4 +1,4 @@ -/* GMonthType.java -- +/* GMonthType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GMonthType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -146,7 +146,7 @@ final class GMonthType throw new DatatypeException("illegal GMonth value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -159,6 +159,5 @@ final class GMonthType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java b/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java index 9ec38c0e7bc..9aabfb61cde 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java @@ -1,4 +1,4 @@ -/* GYearMonthType.java -- +/* GYearMonthType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ final class GYearMonthType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -155,7 +155,7 @@ final class GYearMonthType throw new DatatypeException("illegal GYear value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -172,6 +172,5 @@ final class GYearMonthType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GYearType.java b/libjava/classpath/gnu/xml/validation/datatype/GYearType.java index 6dea89b76a5..5b1e0323237 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GYearType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GYearType.java @@ -1,4 +1,4 @@ -/* GYearType.java -- +/* GYearType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GYearType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -134,7 +134,7 @@ final class GYearType throw new DatatypeException("invalid GYear value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -147,6 +147,5 @@ final class GYearType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java b/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java index 8a92b15f634..5f133e322b6 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java @@ -1,4 +1,4 @@ -/* HexBinaryType.java -- +/* HexBinaryType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -85,6 +85,5 @@ final class HexBinaryType throw new DatatypeException(i, "invalid hexBinary value"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java b/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java index 8ea9805b074..93208954979 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java @@ -1,4 +1,4 @@ -/* IDRefType.java -- +/* IDRefType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDRefType { return ID_TYPE_IDREF; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java b/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java index 57f7e56d7ce..6adaed13bc7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java @@ -1,4 +1,4 @@ -/* IDRefsType.java -- +/* IDRefsType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDRefsType { return ID_TYPE_IDREFS; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDType.java b/libjava/classpath/gnu/xml/validation/datatype/IDType.java index c55601aaf8f..792601d78b3 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDType.java @@ -1,4 +1,4 @@ -/* IDType.java -- +/* IDType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDType { return ID_TYPE_ID; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IntType.java b/libjava/classpath/gnu/xml/validation/datatype/IntType.java index 6bf78660459..c8f756832b7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IntType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IntType.java @@ -1,4 +1,4 @@ -/* IntType.java -- +/* IntType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class IntType throw new DatatypeException(i, "invalid int value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class IntType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java index 2098a7d8db8..b9a2a564a85 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java @@ -1,4 +1,4 @@ -/* IntegerType.java -- +/* IntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,7 +94,7 @@ final class IntegerType throw new DatatypeException(i, "invalid integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -105,6 +105,5 @@ final class IntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java b/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java index 3df903c48c6..d30cc538f1a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java @@ -1,4 +1,4 @@ -/* LanguageType.java -- +/* LanguageType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class LanguageType if (!PATTERN.matcher(value).matches()) throw new DatatypeException("invalid language value"); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java index cab4496b12a..d6eaacd71c0 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java @@ -1,4 +1,4 @@ -/* LengthFacet.java -- +/* LengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class LengthFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class LengthFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class LengthFacet return (other instanceof LengthFacet && ((LengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java index 1f0cb76fac6..1e0d41d01bf 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java @@ -1,4 +1,4 @@ -/* ListSimpleType.java -- +/* ListSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,7 +56,7 @@ public class ListSimpleType * The type of the items in this list (atomic or union). */ public final SimpleType itemType; - + public ListSimpleType(QName name, Set facets, int fundamentalFacets, SimpleType baseType, Annotation annotation, SimpleType itemType) @@ -64,7 +64,7 @@ public class ListSimpleType super(name, LIST, facets, fundamentalFacets, baseType, annotation); this.itemType = itemType; } - + public void checkValid(String value, ValidationContext context) throws DatatypeException { @@ -78,6 +78,5 @@ public class ListSimpleType itemType.checkValid(token, context); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LongType.java b/libjava/classpath/gnu/xml/validation/datatype/LongType.java index eaf69df38fa..781b17f62f6 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LongType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LongType.java @@ -1,4 +1,4 @@ -/* LongType.java -- +/* LongType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class LongType throw new DatatypeException(i, "invalid long value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class LongType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java index 7aac1f743b1..90e940371e9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java @@ -1,4 +1,4 @@ -/* MaxExclusiveFacet.java -- +/* MaxExclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MaxExclusiveFacet extends Facet { - + public final Object value; // date or number public final boolean fixed; @@ -60,7 +60,7 @@ public final class MaxExclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -106,6 +106,5 @@ public final class MaxExclusiveFacet return false; return ((Number) test).doubleValue() < nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java index bb145ed4115..c260113da71 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java @@ -1,4 +1,4 @@ -/* MaxInclusiveFacet.java -- +/* MaxInclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MaxInclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MaxInclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MaxInclusiveFacet return (other instanceof MaxInclusiveFacet && ((MaxInclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -107,6 +107,5 @@ public final class MaxInclusiveFacet return false; return ((Number) test).doubleValue() <= nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java index d0332631152..ba77ff2dfe7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java @@ -1,4 +1,4 @@ -/* MaxLengthFacet.java -- +/* MaxLengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,6 +67,5 @@ public final class MaxLengthFacet return (other instanceof MaxLengthFacet && ((MaxLengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java index 2289bb11c61..a779d09d86d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java @@ -1,4 +1,4 @@ -/* MinExclusiveFacet.java -- +/* MinExclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MinExclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MinExclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MinExclusiveFacet return (other instanceof MinExclusiveFacet && ((MinExclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -106,6 +106,5 @@ public final class MinExclusiveFacet return false; return ((Number) test).doubleValue() > nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java index 6c07c3644a8..6138c9af876 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java @@ -1,4 +1,4 @@ -/* MinInclusiveFacet.java -- +/* MinInclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MinInclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MinInclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MinInclusiveFacet return (other instanceof MinInclusiveFacet && ((MinInclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -107,6 +107,5 @@ public final class MinInclusiveFacet return false; return ((Number) test).doubleValue() >= nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java index c7dee200bad..f13e80b62d8 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java @@ -1,4 +1,4 @@ -/* MinLengthFacet.java -- +/* MinLengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,6 +67,5 @@ public final class MinLengthFacet return (other instanceof MinLengthFacet && ((MinLengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java b/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java index 4188d886af7..3f2088f9b30 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java @@ -1,4 +1,4 @@ -/* NCNameType.java -- +/* NCNameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -106,6 +106,5 @@ final class NCNameType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java b/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java index 4498fecfa1b..ca3271fefb0 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java @@ -1,4 +1,4 @@ -/* NMTokenType.java -- +/* NMTokenType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,6 +97,5 @@ final class NMTokenType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java b/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java index d49964561a6..388b451db86 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java @@ -1,4 +1,4 @@ -/* NMTokensType.java -- +/* NMTokensType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -120,7 +120,6 @@ final class NMTokensType throw e2; } } - - -} + +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NameType.java b/libjava/classpath/gnu/xml/validation/datatype/NameType.java index a2fbb9d5bb5..70349aed81b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NameType.java @@ -1,4 +1,4 @@ -/* NameType.java -- +/* NameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,6 +99,5 @@ final class NameType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java index fd436cb55b2..1e6439c993f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java @@ -1,4 +1,4 @@ -/* NegativeIntegerType.java -- +/* NegativeIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class NegativeIntegerType throw new DatatypeException(i, "invalid negative integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class NegativeIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java index 8577785829c..c5192f34648 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java @@ -1,4 +1,4 @@ -/* NonNegativeIntegerType.java -- +/* NonNegativeIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class NonNegativeIntegerType throw new DatatypeException(i, "invalid non-negative integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class NonNegativeIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java index 0b43d5227d6..e418c061556 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java @@ -1,4 +1,4 @@ -/* NonPositiveIntegerType.java -- +/* NonPositiveIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class NonPositiveIntegerType throw new DatatypeException(i, "invalid non-positive integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class NonPositiveIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java b/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java index a74312d11d3..9009f648ae4 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java @@ -1,4 +1,4 @@ -/* NormalizedStringType.java -- +/* NormalizedStringType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class NormalizedStringType throw new DatatypeException(i, "invalid normalized-string value"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NotationType.java b/libjava/classpath/gnu/xml/validation/datatype/NotationType.java index e9d7c9fda20..b661cb4e1ea 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NotationType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NotationType.java @@ -1,4 +1,4 @@ -/* NotationType.java -- +/* NotationType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class NotationType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java b/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java index d594b26b938..9c1cb7e301f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java @@ -1,4 +1,4 @@ -/* PatternFacet.java -- +/* PatternFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,6 +66,5 @@ public final class PatternFacet return (other instanceof PatternFacet && ((PatternFacet) other).value.equals(value)); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java index 0c10df3ab8d..15d0febfc52 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java @@ -1,4 +1,4 @@ -/* PositiveIntegerType.java -- +/* PositiveIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class PositiveIntegerType throw new DatatypeException(i, "invalid positive integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class PositiveIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/QNameType.java b/libjava/classpath/gnu/xml/validation/datatype/QNameType.java index 1eaa518954d..bdc40c97f1d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/QNameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/QNameType.java @@ -1,4 +1,4 @@ -/* QNameType.java -- +/* QNameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,6 +117,5 @@ final class QNameType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ShortType.java b/libjava/classpath/gnu/xml/validation/datatype/ShortType.java index 3179c8dae99..43255571d02 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ShortType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ShortType.java @@ -1,4 +1,4 @@ -/* ShortType.java -- +/* ShortType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class ShortType throw new DatatypeException(i, "invalid short value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class ShortType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java index 1b8479922b8..1233723bd40 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java @@ -1,4 +1,4 @@ -/* SimpleType.java -- +/* SimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,12 +60,12 @@ public class SimpleType * The variety of the anySimpleType datatype. */ public static final int ANY = 0; - + /** * The atomic variety. */ public static final int ATOMIC = 1; - + /** * The list variety. */ @@ -229,15 +229,15 @@ public class SimpleType { throw new UnsupportedOperationException(); } - + public Object createValue(String literal, ValidationContext context) { return literal; } - + public boolean sameValue(Object value1, Object value2) { return value1.equals(value2); } - + public int valueHashCode(Object value) { return value.hashCode(); } @@ -253,4 +253,3 @@ public class SimpleType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/StringType.java b/libjava/classpath/gnu/xml/validation/datatype/StringType.java index 593c265dc59..e20d1b87e1b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/StringType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/StringType.java @@ -1,4 +1,4 @@ -/* StringType.java -- +/* StringType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,4 +70,3 @@ final class StringType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/TimeType.java b/libjava/classpath/gnu/xml/validation/datatype/TimeType.java index 0152e11717d..83ada5bc63c 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TimeType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TimeType.java @@ -1,4 +1,4 @@ -/* TimeType.java -- +/* TimeType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ final class TimeType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -217,7 +217,7 @@ final class TimeType throw new DatatypeException(len, "invalid time value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 3; @@ -298,6 +298,5 @@ final class TimeType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TokenType.java b/libjava/classpath/gnu/xml/validation/datatype/TokenType.java index 18e1e8ad53a..dfe5f14cef9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TokenType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TokenType.java @@ -1,4 +1,4 @@ -/* TokenType.java -- +/* TokenType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,6 +91,5 @@ final class TokenType last = c; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java b/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java index 4debc638e5e..25b50cd6f38 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java @@ -1,4 +1,4 @@ -/* TotalDigitsFacet.java -- +/* TotalDigitsFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class TotalDigitsFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class TotalDigitsFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class TotalDigitsFacet return (other instanceof TotalDigitsFacet && ((TotalDigitsFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Type.java b/libjava/classpath/gnu/xml/validation/datatype/Type.java index be6f0a0b447..ebd6509330a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Type.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Type.java @@ -1,4 +1,4 @@ -/* Type.java -- +/* Type.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,6 +58,5 @@ public abstract class Type { this.name = name; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java b/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java index 054eb8a55de..0873331536f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java @@ -1,4 +1,4 @@ -/* TypeBuilder.java -- +/* TypeBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,7 +54,7 @@ public class TypeBuilder { final SimpleType type; - + TypeBuilder(SimpleType type) { this.type = type; @@ -136,7 +136,7 @@ public class TypeBuilder } return new MaxLengthFacet(Integer.parseInt(value), fixed, null); } - + PatternFacet parsePatternFacet(String value) throws DatatypeException { @@ -185,7 +185,7 @@ public class TypeBuilder } return new MaxInclusiveFacet(type.createValue(value, context), fixed, null); } - + MaxExclusiveFacet parseMaxExclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -201,7 +201,7 @@ public class TypeBuilder } return new MaxExclusiveFacet(type.createValue(value, context), fixed, null); } - + MinExclusiveFacet parseMinExclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -217,7 +217,7 @@ public class TypeBuilder } return new MinExclusiveFacet(type.createValue(value, context), fixed, null); } - + MinInclusiveFacet parseMinInclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -233,7 +233,7 @@ public class TypeBuilder } return new MinInclusiveFacet(type.createValue(value, context), fixed, null); } - + TotalDigitsFacet parseTotalDigitsFacet(String value) throws DatatypeException { @@ -251,7 +251,7 @@ public class TypeBuilder throw new DatatypeException("value must be a positiveInteger"); return new TotalDigitsFacet(val, fixed, null); } - + FractionDigitsFacet parseFractionDigitsFacet(String value) throws DatatypeException { @@ -269,10 +269,10 @@ public class TypeBuilder throw new DatatypeException("value must be a positiveInteger"); return new FractionDigitsFacet(val, fixed, null); } - + public Datatype createDatatype() { return type; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java b/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java index f1daecebd97..4db48f79953 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java @@ -1,4 +1,4 @@ -/* TypeLibrary.java -- +/* TypeLibrary.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,7 +52,7 @@ import org.relaxng.datatype.DatatypeLibrary; public class TypeLibrary implements DatatypeLibrary { - + public static final SimpleType ANY_SIMPLE_TYPE = new AnySimpleType(); public static final SimpleType STRING = new StringType(); @@ -169,5 +169,5 @@ public class TypeLibrary throw new DatatypeException("Unknown type name: " + typeLocalName); return type; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java b/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java index 21ee6422409..2f9bbd3c61d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java @@ -1,4 +1,4 @@ -/* TypeLibraryFactory.java -- +/* TypeLibraryFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,5 +56,5 @@ public class TypeLibraryFactory return new TypeLibrary(); return null; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java index d87c2aa7a1b..253e1df7bac 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java @@ -1,4 +1,4 @@ -/* UnionSimpleType.java -- +/* UnionSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ public class UnionSimpleType * The member types in this union. */ public final List memberTypes; - + public UnionSimpleType(QName name, Set facets, int fundamentalFacets, SimpleType baseType, Annotation annotation, List memberTypes) @@ -78,6 +78,5 @@ public class UnionSimpleType } throw new DatatypeException("invalid union type value"); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java index 772c9cc0a9b..cf12abe3a74 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java @@ -1,4 +1,4 @@ -/* UnsignedByteType.java -- +/* UnsignedByteType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedByteType throw new DatatypeException(i, "invalid unsigned byte value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedByteType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java index a4e8a68201c..b634442bb12 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java @@ -1,4 +1,4 @@ -/* UnsignedIntType.java -- +/* UnsignedIntType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedIntType throw new DatatypeException(i, "invalid unsigned int value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedIntType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java index 5a36d8a3170..784b8666300 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java @@ -1,4 +1,4 @@ -/* UnsignedLongType.java -- +/* UnsignedLongType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedLongType throw new DatatypeException(i, "invalid unsigned long value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedLongType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java index 49f621be771..ececb608c0b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java @@ -1,4 +1,4 @@ -/* UnsignedShortType.java -- +/* UnsignedShortType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -106,7 +106,7 @@ final class UnsignedShortType throw new DatatypeException(i, "invalid unsigned short value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -117,6 +117,5 @@ final class UnsignedShortType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java b/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java index 5920e1c88b6..0f2109cfcf5 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java @@ -1,4 +1,4 @@ -/* WhiteSpaceFacet.java -- +/* WhiteSpaceFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,11 +45,11 @@ package gnu.xml.validation.datatype; public final class WhiteSpaceFacet extends Facet { - + public static final int PRESERVE = 0; public static final int REPLACE = 1; public static final int COLLAPSE = 2; - + public final int value; public final boolean fixed; @@ -59,7 +59,7 @@ public final class WhiteSpaceFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -70,6 +70,5 @@ public final class WhiteSpaceFacet return (other instanceof WhiteSpaceFacet && ((WhiteSpaceFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java index ecc016d4bd4..7b27a3c9835 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java @@ -1,4 +1,4 @@ -/* AnyNameNameClass.java -- +/* AnyNameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ class AnyNameNameClass { NameClass exceptNameClass; - + boolean matchesName(String uri, String localName) { return (exceptNameClass == null) ? true : @@ -55,4 +55,3 @@ class AnyNameNameClass } } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java index 48443d61b11..54e414dc5c4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java @@ -1,4 +1,4 @@ -/* AttributePattern.java -- +/* AttributePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class AttributePattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java index e196cd4eee3..9c762b92627 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java @@ -1,4 +1,4 @@ -/* ChoiceNameClass.java -- +/* ChoiceNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,6 +54,5 @@ class ChoiceNameClass return name1.matchesName(uri, localName) || name2.matchesName(uri, localName); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java index 54739b27008..48c96b2fb68 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java @@ -1,4 +1,4 @@ -/* ChoicePattern.java -- +/* ChoicePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class ChoicePattern Pattern pattern2; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java index 2315b2ce609..f4e36c7266d 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java @@ -1,4 +1,4 @@ -/* DataPattern.java -- +/* DataPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,6 +55,5 @@ class DataPattern DatatypeLibrary datatypeLibrary; List params = new LinkedList(); Pattern exceptPattern; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Define.java b/libjava/classpath/gnu/xml/validation/relaxng/Define.java index 8801d581e28..ffb1d41ee03 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Define.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Define.java @@ -1,4 +1,4 @@ -/* Define.java -- +/* Define.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,6 +47,5 @@ class Define String name; ElementPattern element; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java index 9ff3570755a..e02731968e5 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java @@ -1,4 +1,4 @@ -/* ElementPattern.java -- +/* ElementPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class ElementPattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java index ce568f84b34..13c2d3f6131 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java @@ -1,4 +1,4 @@ -/* EmptyPattern.java -- +/* EmptyPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class EmptyPattern static final EmptyPattern INSTANCE = new EmptyPattern(); } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java b/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java index 78e9f853327..bb73c4f38a4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java @@ -1,4 +1,4 @@ -/* FullSyntaxBuilder.java -- +/* FullSyntaxBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,7 +97,7 @@ class FullSyntaxBuilder defineAttrs.add("name"); defineAttrs.add("combine"); Set nsAttrs = Collections.singleton("ns"); - + VOCABULARY.put("element", elementAttrs); VOCABULARY.put("attribute", elementAttrs); VOCABULARY.put("group", Collections.EMPTY_SET); @@ -164,10 +164,10 @@ class FullSyntaxBuilder { urls = new HashSet(); refCount = 1; - + doc.normalizeDocument(); // Normalize XML document transform(doc); // Apply transformation rules to provide simple syntax - + // 4.18. grammar element Element p = doc.getDocumentElement(); Element grammar = @@ -248,7 +248,7 @@ class FullSyntaxBuilder } transform2(p); // Apply second stage transformation rules - + Grammar ret = parseGrammar(grammar); datatypeLibraries = null; // free datatype libraries cache return ret; @@ -463,7 +463,7 @@ class FullSyntaxBuilder !"grammar".equals(eName)) throw new GrammarException("included element is not " + "a grammar"); - + transform(element); urls.remove(href); // handle components @@ -513,9 +513,9 @@ class FullSyntaxBuilder } // transform to div element Document doc = include.getOwnerDocument(); - Element includeDiv = + Element includeDiv = doc.createElementNS(XMLConstants.RELAXNG_NS_URI, "div"); - Element grammarDiv = + Element grammarDiv = doc.createElementNS(XMLConstants.RELAXNG_NS_URI, "div"); // XXX copy include non-href attributes (none defined?) element = (Element) doc.importNode(element, true); @@ -849,7 +849,7 @@ class FullSyntaxBuilder } } } - + break; case Node.TEXT_NODE: case Node.CDATA_SECTION_NODE: @@ -935,7 +935,7 @@ class FullSyntaxBuilder Node grammar = grammar2; if ("parentRef".equals(elementName)) grammar = grammar1; - + String name = ((Element) node).getAttribute("name"); if (name != null) throw new GrammarException("no name attribute on " + @@ -1240,7 +1240,7 @@ class FullSyntaxBuilder } node.appendChild(child); } - + private static Element getFirstChildElement(Node node) { Node ctx = node.getFirstChild(); @@ -1485,7 +1485,7 @@ class FullSyntaxBuilder value.value = node.getTextContent(); return value; } - + ListPattern parseList(Element node) throws GrammarException { diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java b/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java index 76eff4f3a10..c2407da2bc4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java @@ -1,4 +1,4 @@ -/* Grammar.java -- +/* Grammar.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,6 +65,5 @@ class Grammar // TODO return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java b/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java index 71d03de97c6..167cf6482e5 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java @@ -1,4 +1,4 @@ -/* GrammarException.java -- +/* GrammarException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,5 +52,5 @@ class GrammarException { super(message); } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java b/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java index d811aeec94e..e4ff3dab42a 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java @@ -1,4 +1,4 @@ -/* GrammarValidator.java -- +/* GrammarValidator.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,5 +93,5 @@ class GrammarValidator { // TODO } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java index b01090efa4b..b63c7aaa7fb 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java @@ -1,4 +1,4 @@ -/* GroupPattern.java -- +/* GroupPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,6 +48,5 @@ class GroupPattern Pattern pattern1; Pattern pattern2; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java index aa7c28e5e8a..8a877d7af6e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java @@ -1,4 +1,4 @@ -/* InterleavePattern.java -- +/* InterleavePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,6 +48,5 @@ class InterleavePattern Pattern pattern1; Pattern pattern2; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java index 4c0393ae572..e16d5f6e5db 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java @@ -1,4 +1,4 @@ -/* ListPattern.java -- +/* ListPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class ListPattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java index f485e997016..2f620c1d0e4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java @@ -1,4 +1,4 @@ -/* NSNameNameClass.java -- +/* NSNameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ class NSNameNameClass return (exceptNameClass == null) ? true : !exceptNameClass.matchesName(uri, localName); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java index 2a3dc83e510..0ef9ef1315d 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java @@ -1,4 +1,4 @@ -/* NameClass.java -- +/* NameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,5 +46,5 @@ abstract class NameClass { abstract boolean matchesName(String uri, String localName); - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java index d5a0c5f0403..b2d0e04ee3e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java @@ -1,4 +1,4 @@ -/* NameNameClass.java -- +/* NameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,4 +57,3 @@ class NameNameClass } } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java index 8263a4573fa..d56afb2d768 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java @@ -1,4 +1,4 @@ -/* NotAllowedPattern.java -- +/* NotAllowedPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,5 +49,3 @@ class NotAllowedPattern static final NotAllowedPattern INSTANCE = new NotAllowedPattern(); } - - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java index 99864d72a59..0545130ad8e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java @@ -1,4 +1,4 @@ -/* OneOrMorePattern.java -- +/* OneOrMorePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class OneOrMorePattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Param.java b/libjava/classpath/gnu/xml/validation/relaxng/Param.java index 246ad20b7c5..65a1b6689bf 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Param.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Param.java @@ -1,4 +1,4 @@ -/* Param.java -- +/* Param.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class Param String value; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java b/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java index 3bf9a9919b9..157f22316c7 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java @@ -1,4 +1,4 @@ -/* Pattern.java -- +/* Pattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,4 +45,3 @@ package gnu.xml.validation.relaxng; abstract class Pattern { } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java b/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java index 890ca8eeb89..c0c9bd8876b 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java @@ -1,4 +1,4 @@ -/* RelaxNGSchemaFactory.java -- +/* RelaxNGSchemaFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -75,7 +75,7 @@ public class RELAXNGSchemaFactory public void setResourceResolver(LSResourceResolver resourceResolver) { this.resourceResolver = resourceResolver; - } + } public ErrorHandler getErrorHandler() { @@ -84,7 +84,7 @@ public class RELAXNGSchemaFactory public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; + this.errorHandler = errorHandler; } public boolean isSchemaLanguageSupported(String schemaLanguage) @@ -159,5 +159,5 @@ public class RELAXNGSchemaFactory throw e2; } } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java index d7de09542da..8c1ff8539e0 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java @@ -1,4 +1,4 @@ -/* RefPattern.java -- +/* RefPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class RefPattern String name; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java index 06af3c34ad9..81c50282025 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java @@ -1,4 +1,4 @@ -/* TextPattern.java -- +/* TextPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class TextPattern static final TextPattern INSTANCE = new TextPattern(); } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java index 81260b0caf1..8b63d79ae5c 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java @@ -1,4 +1,4 @@ -/* ValuePattern.java -- +/* ValuePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,6 +53,5 @@ class ValuePattern Datatype type; String ns; String value; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java b/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java index df90dc626ab..6f94bfe2810 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java @@ -1,4 +1,4 @@ -/* AnyAttribute.java -- +/* AnyAttribute.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,6 +62,5 @@ final class AnyAttribute this.namespace = namespace; this.processContents = processContents; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java index 98b322bee58..c475b368d15 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java @@ -1,4 +1,4 @@ -/* AttributeDeclaration.java -- +/* AttributeDeclaration.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,7 +63,7 @@ class AttributeDeclaration * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -78,7 +78,7 @@ class AttributeDeclaration * The type definition corresponding to this attribute. */ final SimpleType datatype; - + /** * The annotation associated with this attribute declaration, if any. */ @@ -94,6 +94,5 @@ class AttributeDeclaration this.datatype = datatype; this.annotation = annotation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java index f8bb11b911c..93707633877 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java @@ -1,4 +1,4 @@ -/* AttributeUse.java -- +/* AttributeUse.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ class AttributeUse * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -74,6 +74,5 @@ class AttributeUse this.value = value; this.declaration = declaration; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java b/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java index 2c7acb10a18..826ba32d9e3 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java @@ -1,4 +1,4 @@ -/* ComplexType.java -- +/* ComplexType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,6 +97,5 @@ class ComplexType this.finality = finality; attributeUses = new LinkedHashSet(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java b/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java index d41f5e536e1..7392ca5965f 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java @@ -1,4 +1,4 @@ -/* ElementDeclaration.java -- +/* ElementDeclaration.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ class ElementDeclaration * The type definition corresponding to this element. */ Type datatype; - + /** * The scope of this schema component. * One of GLOBAL, LOCAL, or ABSENT. @@ -75,7 +75,7 @@ class ElementDeclaration * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -84,7 +84,7 @@ class ElementDeclaration final boolean nillable; // TODO identity-constraint definitions - + final QName substitutionGroup; final int substitutionGroupExclusions; @@ -120,6 +120,5 @@ class ElementDeclaration this.disallowedSubstitutions = disallowedSubstitutions; this.isAbstract = isAbstract; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java b/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java index 995c4ff09cf..5fe49203ee3 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java @@ -1,4 +1,4 @@ -/* Particle.java -- +/* Particle.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ class Particle this.maxOccurs = maxOccurs; this.term = term; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java b/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java index f2d68430982..716ba8800e0 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java @@ -1,4 +1,4 @@ -/* ValidationException.java -- +/* ValidationException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,6 +53,5 @@ class ValidationException { super(message, locator); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java index 647cbdeffd0..fb8eb88b18d 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java @@ -1,4 +1,4 @@ -/* XMLSchema.java -- +/* XMLSchema.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class XMLSchema static final int FINAL_LIST = 0x04; static final int FINAL_UNION = 0x08; static final int FINAL_ALL = 0x0f; - + static final int BLOCK_NONE = 0x00; static final int BLOCK_EXTENSION = 0x01; static final int BLOCK_RESTRICTION = 0x02; @@ -129,6 +129,5 @@ final class XMLSchema //return new XMLSchemaValidatorHandler(this); return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java index 45064075a96..ba83973dfaa 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaAttributeTypeInfo.java -- +/* XMLSchemaAttributeTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,6 +94,5 @@ final class XMLSchemaAttributeTypeInfo derivationMethod); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java index ecf3ad3b89f..a7bad31293c 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java @@ -1,4 +1,4 @@ -/* XMLSchemaBuilder.java -- +/* XMLSchemaBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -209,7 +209,7 @@ class XMLSchemaBuilder datatype, annotation); } - else + else { boolean required = "required".equals(use); // TODO ref @@ -427,7 +427,7 @@ class XMLSchemaBuilder String sgNamespace = node.lookupNamespaceURI(sgPrefix); substitutionGroup = new QName(sgNamespace, sgName); } - + String block = getAttribute(attrs, "block"); int substitutionGroupExclusions = (block == null) ? schema.blockDefault : @@ -436,10 +436,10 @@ class XMLSchemaBuilder int disallowedSubstitutions = (final_ == null) ? schema.finalDefault : parseFullDerivationSet(final_); - + boolean nillable = "true".equals(getAttribute(attrs, "nillable")); boolean isAbstract = "true".equals(getAttribute(attrs, "abstract")); - + if (notTopLevel) { minOccurs = getOccurrence(getAttribute(attrs, "minOccurs")); @@ -463,11 +463,11 @@ class XMLSchemaBuilder scope, parent, constraintType, constraintValue, nillable, - substitutionGroup, - substitutionGroupExclusions, + substitutionGroup, + substitutionGroupExclusions, disallowedSubstitutions, isAbstract); - + for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) { @@ -623,7 +623,7 @@ class XMLSchemaBuilder if (mixed) { type.contentType = XMLSchema.CONTENT_MIXED; - } + } return type; } @@ -835,6 +835,5 @@ class XMLSchemaBuilder } return name; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java index a65133c20e4..99a59f39d80 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaElementTypeInfo.java -- +/* XMLSchemaElementTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,6 +87,5 @@ final class XMLSchemaElementTypeInfo return false; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java index 2b985a28ccd..18e91f28d02 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java @@ -1,4 +1,4 @@ -/* XMLSchemaSchemaFactory.java -- +/* XMLSchemaSchemaFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,7 +77,7 @@ public class XMLSchemaSchemaFactory { this.resourceResolver = resourceResolver; } - + public ErrorHandler getErrorHandler() { return this.errorHandler; @@ -85,7 +85,7 @@ public class XMLSchemaSchemaFactory public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; + this.errorHandler = errorHandler; } @@ -167,6 +167,5 @@ public class XMLSchemaSchemaFactory throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java index 60cc25fc42b..c1ca95114aa 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaTypeInfo.java -- +/* XMLSchemaTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,6 +72,5 @@ abstract class XMLSchemaTypeInfo } return false; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java index 9b20c0c8db9..4fc80d34ba8 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java @@ -1,4 +1,4 @@ -/* XMLSchemaTypeInfoProvider.java -- +/* XMLSchemaTypeInfoProvider.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,6 +77,5 @@ final class XMLSchemaTypeInfoProvider { return handler.isSpecified(index); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java index 056babf64b5..6239ba6c6d6 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java @@ -1,4 +1,4 @@ -/* XMLSchemaValidator.java -- +/* XMLSchemaValidator.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class XMLSchemaValidator ErrorHandler errorHandler; LSResourceResolver resourceResolver; - + XMLSchemaValidator(XMLSchema schema) { this.schema = schema; @@ -93,6 +93,5 @@ final class XMLSchemaValidator { this.resourceResolver = resourceResolver; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java index 9e6d8e9a9cb..6c4f1f392c8 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java @@ -1,4 +1,4 @@ -/* XMLSchemaValidatorHandler.java -- +/* XMLSchemaValidatorHandler.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -260,7 +260,7 @@ final class XMLSchemaValidatorHandler } } // TODO 5, 6, 7 - + // parent if (!context.isEmpty()) { @@ -300,7 +300,7 @@ final class XMLSchemaValidatorHandler XMLSchemaAttributeTypeInfo attTypeInfo = new XMLSchemaAttributeTypeInfo(schema, attDecl, true); attributes.add(attTypeInfo); - + atts2.addAttribute(attUri, attLocalName, attQName, attType, attValue); atts2.setDeclared(count, declared); atts2.setSpecified(count, true); @@ -363,7 +363,7 @@ final class XMLSchemaValidatorHandler contentHandler.processingInstruction(target, data); } } - + public void skippedEntity(String name) throws SAXException { @@ -389,6 +389,5 @@ final class XMLSchemaValidatorHandler return Type.ANY_TYPE; return (SimpleType) typeLibrary.createDatatype(localName); } - -} +} diff --git a/libjava/classpath/gnu/xml/xpath/AndExpr.java b/libjava/classpath/gnu/xml/xpath/AndExpr.java index dd2e1c9a159..9213a40cc33 100644 --- a/libjava/classpath/gnu/xml/xpath/AndExpr.java +++ b/libjava/classpath/gnu/xml/xpath/AndExpr.java @@ -1,4 +1,4 @@ -/* AndExpr.java -- +/* AndExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,5 +83,5 @@ public final class AndExpr { return lhs + " and " + rhs; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java b/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java index 61098d6e4f2..a7bc62f2ed2 100644 --- a/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java +++ b/libjava/classpath/gnu/xml/xpath/ArithmeticExpr.java @@ -1,4 +1,4 @@ -/* ArithmeticExpr.java -- +/* ArithmeticExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,8 +72,8 @@ final class ArithmeticExpr case MULTIPLY: case DIVIDE: case MODULO: - this.op = op; - break; + this.op = op; + break; default: throw new IllegalArgumentException(); } @@ -166,5 +166,5 @@ final class ArithmeticExpr buf.append(rhs); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/BooleanFunction.java b/libjava/classpath/gnu/xml/xpath/BooleanFunction.java index f661b2ac285..05e0bd5bcb5 100644 --- a/libjava/classpath/gnu/xml/xpath/BooleanFunction.java +++ b/libjava/classpath/gnu/xml/xpath/BooleanFunction.java @@ -1,4 +1,4 @@ -/* BooleanFunction.java -- +/* BooleanFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,7 +60,7 @@ final class BooleanFunction { final Expr arg; - + BooleanFunction(List args) { this(args.get(0)); @@ -70,7 +70,7 @@ final class BooleanFunction { this.arg = arg; } - + public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); @@ -86,10 +86,10 @@ final class BooleanFunction { return arg.references(var); } - + public String toString() { return "boolean(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/CeilingFunction.java b/libjava/classpath/gnu/xml/xpath/CeilingFunction.java index 15398842248..aa906e0dd77 100644 --- a/libjava/classpath/gnu/xml/xpath/CeilingFunction.java +++ b/libjava/classpath/gnu/xml/xpath/CeilingFunction.java @@ -1,4 +1,4 @@ -/* CeilingFunction.java -- +/* CeilingFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,17 +53,17 @@ final class CeilingFunction { final Expr arg; - + CeilingFunction(List args) { this(args.get(0)); } - + CeilingFunction(Expr arg) { this.arg = arg; } - + public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); @@ -80,10 +80,10 @@ final class CeilingFunction { return arg.references(var); } - + public String toString() { return "ceiling(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/ConcatFunction.java b/libjava/classpath/gnu/xml/xpath/ConcatFunction.java index a61a45477b1..58096e5acbb 100644 --- a/libjava/classpath/gnu/xml/xpath/ConcatFunction.java +++ b/libjava/classpath/gnu/xml/xpath/ConcatFunction.java @@ -1,4 +1,4 @@ -/* ConcatFunction.java -- +/* ConcatFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -111,5 +111,5 @@ final class ConcatFunction buf.append(')'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Constant.java b/libjava/classpath/gnu/xml/xpath/Constant.java index d5ca764a145..5ed39cc05e9 100644 --- a/libjava/classpath/gnu/xml/xpath/Constant.java +++ b/libjava/classpath/gnu/xml/xpath/Constant.java @@ -1,4 +1,4 @@ -/* Constant.java -- +/* Constant.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,5 +94,5 @@ public final class Constant } return ret; } - -} + +} diff --git a/libjava/classpath/gnu/xml/xpath/ContainsFunction.java b/libjava/classpath/gnu/xml/xpath/ContainsFunction.java index 620606b3f20..473d2532fb7 100644 --- a/libjava/classpath/gnu/xml/xpath/ContainsFunction.java +++ b/libjava/classpath/gnu/xml/xpath/ContainsFunction.java @@ -1,4 +1,4 @@ -/* ContainsFunction.java -- +/* ContainsFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -89,5 +89,5 @@ final class ContainsFunction { return "contains(" + arg1 + "," + arg2 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/CountFunction.java b/libjava/classpath/gnu/xml/xpath/CountFunction.java index f29d833106d..e1892a0583f 100644 --- a/libjava/classpath/gnu/xml/xpath/CountFunction.java +++ b/libjava/classpath/gnu/xml/xpath/CountFunction.java @@ -1,4 +1,4 @@ -/* CountFunction.java -- +/* CountFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ final class CountFunction this.arg = arg; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); @@ -85,5 +85,5 @@ final class CountFunction { return "count(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java b/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java index 605749d09d7..c4471c1205f 100644 --- a/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java +++ b/libjava/classpath/gnu/xml/xpath/DocumentOrderComparator.java @@ -1,4 +1,4 @@ -/* DocumentOrderComparator.java -- +/* DocumentOrderComparator.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import org.w3c.dom.Node; public class DocumentOrderComparator implements Comparator { - + public int compare(Node n1, Node n2) { return (int) n1.compareDocumentPosition(n2); diff --git a/libjava/classpath/gnu/xml/xpath/EqualityExpr.java b/libjava/classpath/gnu/xml/xpath/EqualityExpr.java index 3b6fd568a86..133e1ff202b 100644 --- a/libjava/classpath/gnu/xml/xpath/EqualityExpr.java +++ b/libjava/classpath/gnu/xml/xpath/EqualityExpr.java @@ -1,4 +1,4 @@ -/* EqualityExpr.java -- +/* EqualityExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,20 +91,20 @@ final class EqualityExpr boolean frns = right instanceof Collection; if (flns && frns) { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection lns = (Collection) left; - @SuppressWarnings("unchecked") - Collection rns = (Collection) right; + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection lns = (Collection) left; + @SuppressWarnings("unchecked") + Collection rns = (Collection) right; if (lns.isEmpty()) { return false; } boolean all = true; - for (Node ltest : lns) - { - for (Node rtest : rns) - { + for (Node ltest : lns) + { + for (Node rtest : rns) + { if (ltest == rtest || ltest.equals(rtest)) { // much shorter @@ -128,7 +128,7 @@ final class EqualityExpr } return all; } - /* + /* * If one object to be compared is a node-set and the other is a number, * then the comparison will be true if and only if there is a node in * the node-set such that the result of performing the comparison on the @@ -140,13 +140,13 @@ final class EqualityExpr boolean frn = right instanceof Double; if ((flns && frn) || (frns && fln)) { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection ns = flns ? (Collection) left : (Collection) right; double n = fln ? ((Double) left).doubleValue() : ((Double) right).doubleValue(); boolean all = true; - for (Node test : ns) + for (Node test : ns) { double nn = _number(context, stringValue(test)); if (nn == n) @@ -174,12 +174,12 @@ final class EqualityExpr boolean frs = right instanceof String; if ((flns && frs) || (frns && fls)) { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection ns = flns ? (Collection) left : (Collection) right; String s = fls ? (String) left : (String) right; boolean all = true; - for (Node test : ns) + for (Node test : ns) { if (stringValue(test).equals(s)) { @@ -206,9 +206,9 @@ final class EqualityExpr boolean frb = right instanceof Boolean; if ((flns && frb) || (frns && flb)) { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection ns = flns ? (Collection) left : (Collection) right; + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection ns = flns ? (Collection) left : (Collection) right; boolean b = flb ? ((Boolean) left).booleanValue() : ((Boolean) right).booleanValue(); return _boolean(context, ns) == b; @@ -270,5 +270,5 @@ final class EqualityExpr return lhs + " = " + rhs; } } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Expr.java b/libjava/classpath/gnu/xml/xpath/Expr.java index 87ce3dfb63c..0e98f43f5b2 100644 --- a/libjava/classpath/gnu/xml/xpath/Expr.java +++ b/libjava/classpath/gnu/xml/xpath/Expr.java @@ -1,4 +1,4 @@ -/* Expr.java -- +/* Expr.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -112,7 +112,7 @@ public abstract class Expr return null; } } - + } public Object evaluate(Object item, QName returnType) @@ -143,10 +143,10 @@ public abstract class Expr { if (ret instanceof Collection) { - /* Suppression is safe, as we know context - produces Collection */ - @SuppressWarnings("unchecked") - Collection ns = (Collection) ret; + /* Suppression is safe, as we know context + produces Collection */ + @SuppressWarnings("unchecked") + Collection ns = (Collection) ret; switch (ns.size()) { case 0: @@ -171,12 +171,12 @@ public abstract class Expr throw new XPathExpressionException("return value is not a node-set"); } if (ret != null) - { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection nodes = (Collection) ret; - ret = new ExprNodeSet(nodes); - } + { + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection nodes = (Collection) ret; + ret = new ExprNodeSet(nodes); + } } } return ret; @@ -185,7 +185,7 @@ public abstract class Expr public String evaluate(Object item) throws XPathExpressionException { - return (String) evaluate(item, XPathConstants.STRING); + return (String) evaluate(item, XPathConstants.STRING); } public Object evaluate(InputSource source, QName returnType) @@ -201,15 +201,15 @@ public abstract class Expr } catch (ParserConfigurationException e) { - throw new XPathExpressionException(e); + throw new XPathExpressionException(e); } catch (SAXException e) { - throw new XPathExpressionException(e); + throw new XPathExpressionException(e); } catch (IOException e) { - throw new XPathExpressionException(e); + throw new XPathExpressionException(e); } } @@ -224,7 +224,7 @@ public abstract class Expr public abstract Expr clone(Object context); public abstract boolean references(QName var); - + /* -- 4.1 Node Set Functions -- */ /** @@ -244,9 +244,9 @@ public abstract class Expr Set ret = new HashSet(); if (object instanceof Collection) { - /* Suppression is safe, as the iteration will check each value is a Node */ - @SuppressWarnings("unchecked") - Collection nodeSet = (Collection) object; + /* Suppression is safe, as the iteration will check each value is a Node */ + @SuppressWarnings("unchecked") + Collection nodeSet = (Collection) object; for (Iterator i = nodeSet.iterator(); i.hasNext(); ) { String string = stringValue(i.next()); @@ -303,7 +303,7 @@ public abstract class Expr String ret = node.getNamespaceURI(); return (ret == null) ? "" : ret; } - + /** * The name function returns a string containing a QName representing the * expanded-name of the node in the argument node-set that is first in @@ -391,7 +391,7 @@ public abstract class Expr { String ret = decimalFormat.format(d); if (ret.endsWith (".0")) - { + { ret = ret.substring(0, ret.length() - 2); } return ret; @@ -399,10 +399,10 @@ public abstract class Expr } if (object instanceof Collection) { - /* Suppression is safe, as we fail immediately if the - * first element is not a Node and don't use the rest */ - @SuppressWarnings("unchecked") - Collection nodeSet = (Collection) object; + /* Suppression is safe, as we fail immediately if the + * first element is not a Node and don't use the rest */ + @SuppressWarnings("unchecked") + Collection nodeSet = (Collection) object; if (nodeSet.isEmpty()) { return ""; @@ -414,7 +414,7 @@ public abstract class Expr } /* -- 4.3 Boolean Functions -- */ - + /** * Implementation of the XPath boolean function. */ @@ -463,10 +463,10 @@ public abstract class Expr } if (object instanceof Collection) { - /* Suppression is safe, as we fail immediately if one - * of the elements is not a Node */ - @SuppressWarnings("unchecked") - Collection nodeSet = (Collection) object; + /* Suppression is safe, as we fail immediately if one + * of the elements is not a Node */ + @SuppressWarnings("unchecked") + Collection nodeSet = (Collection) object; // Convert node-set to string object = stringValue(nodeSet); } @@ -505,7 +505,7 @@ public abstract class Expr { return stringValue(node, false); } - + static String stringValue(Node node, boolean elementMode) { switch (node.getNodeType()) diff --git a/libjava/classpath/gnu/xml/xpath/FalseFunction.java b/libjava/classpath/gnu/xml/xpath/FalseFunction.java index 87660ec81a8..9a20f91634f 100644 --- a/libjava/classpath/gnu/xml/xpath/FalseFunction.java +++ b/libjava/classpath/gnu/xml/xpath/FalseFunction.java @@ -1,4 +1,4 @@ -/* FalseFunction.java -- +/* FalseFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,5 +68,5 @@ final class FalseFunction { return "false()"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/FloorFunction.java b/libjava/classpath/gnu/xml/xpath/FloorFunction.java index bbf56c91178..ed61742a3f8 100644 --- a/libjava/classpath/gnu/xml/xpath/FloorFunction.java +++ b/libjava/classpath/gnu/xml/xpath/FloorFunction.java @@ -1,4 +1,4 @@ -/* FloorFunction.java -- +/* FloorFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,5 +86,5 @@ final class FloorFunction { return "floor(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Function.java b/libjava/classpath/gnu/xml/xpath/Function.java index 12e2e1141fd..f9eab2b7318 100644 --- a/libjava/classpath/gnu/xml/xpath/Function.java +++ b/libjava/classpath/gnu/xml/xpath/Function.java @@ -1,4 +1,4 @@ -/* Function.java -- +/* Function.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,4 +54,3 @@ public interface Function void setArguments(List args); } - diff --git a/libjava/classpath/gnu/xml/xpath/FunctionCall.java b/libjava/classpath/gnu/xml/xpath/FunctionCall.java index e811f53a2ab..977482a8ff2 100644 --- a/libjava/classpath/gnu/xml/xpath/FunctionCall.java +++ b/libjava/classpath/gnu/xml/xpath/FunctionCall.java @@ -1,4 +1,4 @@ -/* FunctionCall.java -- +/* FunctionCall.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,7 +83,7 @@ public final class FunctionCall if (resolver != null) { QName qname = QName.valueOf(name); - int arity = args.size(); + int arity = args.size(); XPathFunction function = resolver.resolveFunction(qname, arity); if (function != null) { @@ -165,5 +165,5 @@ public final class FunctionCall buf.append(')'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/IdFunction.java b/libjava/classpath/gnu/xml/xpath/IdFunction.java index b3d2208c8e4..7b6c6ac2504 100644 --- a/libjava/classpath/gnu/xml/xpath/IdFunction.java +++ b/libjava/classpath/gnu/xml/xpath/IdFunction.java @@ -1,4 +1,4 @@ -/* IdFunction.java -- +/* IdFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,5 +99,5 @@ public final class IdFunction { return "id(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/LangFunction.java b/libjava/classpath/gnu/xml/xpath/LangFunction.java index 33cf8b0a2ab..5a8d32fc0d7 100644 --- a/libjava/classpath/gnu/xml/xpath/LangFunction.java +++ b/libjava/classpath/gnu/xml/xpath/LangFunction.java @@ -1,4 +1,4 @@ -/* LangFunction.java -- +/* LangFunction.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,7 +104,7 @@ final class LangFunction } return null; } - + public Expr clone(Object context) { return new IdFunction(arg.clone(context)); @@ -119,5 +119,5 @@ final class LangFunction { return "lang(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/LastFunction.java b/libjava/classpath/gnu/xml/xpath/LastFunction.java index 751a0a9c1c9..51f988f3c6f 100644 --- a/libjava/classpath/gnu/xml/xpath/LastFunction.java +++ b/libjava/classpath/gnu/xml/xpath/LastFunction.java @@ -1,4 +1,4 @@ -/* LastFunction.java -- +/* LastFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -69,5 +69,5 @@ final class LastFunction { return "last()"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java b/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java index dbad9d3b42a..d829075c700 100644 --- a/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java +++ b/libjava/classpath/gnu/xml/xpath/LocalNameFunction.java @@ -1,4 +1,4 @@ -/* LocalNameFunction.java -- +/* LocalNameFunction.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -69,7 +69,7 @@ final class LocalNameFunction this.arg = arg; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { /* Suppression is safe, as we know context produces Collection */ @@ -94,5 +94,5 @@ final class LocalNameFunction { return (arg == null) ? "local-name()" : "local-name(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NameFunction.java b/libjava/classpath/gnu/xml/xpath/NameFunction.java index 239a53453be..7db0be531e5 100644 --- a/libjava/classpath/gnu/xml/xpath/NameFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NameFunction.java @@ -1,4 +1,4 @@ -/* NameFunction.java -- +/* NameFunction.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,7 +77,7 @@ final class NameFunction this.arg = arg; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { /* Suppression is safe, as we know context produces Collection */ @@ -93,17 +93,17 @@ final class NameFunction return new NameFunction((arg == null) ? null : arg.clone(context)); } - + @Override public boolean references(QName var) { return (arg == null) ? false : arg.references(var); } - + @Override public String toString() { return (arg == null) ? "name()" : "name(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NameTest.java b/libjava/classpath/gnu/xml/xpath/NameTest.java index 1710103903d..8bd06bd3b25 100644 --- a/libjava/classpath/gnu/xml/xpath/NameTest.java +++ b/libjava/classpath/gnu/xml/xpath/NameTest.java @@ -1,4 +1,4 @@ -/* NameTest.java -- +/* NameTest.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -139,5 +139,5 @@ public final class NameTest return "*"; return qName.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NamespaceTest.java b/libjava/classpath/gnu/xml/xpath/NamespaceTest.java index d93b76d9de8..2f4fec179ef 100644 --- a/libjava/classpath/gnu/xml/xpath/NamespaceTest.java +++ b/libjava/classpath/gnu/xml/xpath/NamespaceTest.java @@ -1,4 +1,4 @@ -/* NamespaceTest.java -- +/* NamespaceTest.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -116,5 +116,5 @@ public final class NamespaceTest return "*"; return qName.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java b/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java index 56da90f8c0a..4972b060778 100644 --- a/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NamespaceUriFunction.java @@ -1,4 +1,4 @@ -/* NamespaceUriFunction.java -- +/* NamespaceUriFunction.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,13 +63,13 @@ final class NamespaceUriFunction { this(args.size() > 0 ? args.get(0) : null); } - + NamespaceUriFunction(Expr arg) { this.arg = arg; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { /* Suppression is safe, as we know context produces Collection */ @@ -89,10 +89,10 @@ final class NamespaceUriFunction { return (arg == null) ? false : arg.references(var); } - + public String toString() { return (arg == null) ? "namespace-uri()" : "namespace-uri(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NegativeExpr.java b/libjava/classpath/gnu/xml/xpath/NegativeExpr.java index 9e24aff81a5..215ef3fa99d 100644 --- a/libjava/classpath/gnu/xml/xpath/NegativeExpr.java +++ b/libjava/classpath/gnu/xml/xpath/NegativeExpr.java @@ -1,4 +1,4 @@ -/* NegativeExpr.java -- +/* NegativeExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,5 +77,5 @@ final class NegativeExpr { return "-" + expr; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NodeTypeTest.java b/libjava/classpath/gnu/xml/xpath/NodeTypeTest.java index 4fe164625bb..43e26994b77 100644 --- a/libjava/classpath/gnu/xml/xpath/NodeTypeTest.java +++ b/libjava/classpath/gnu/xml/xpath/NodeTypeTest.java @@ -1,4 +1,4 @@ -/* NodeTypeTest.java -- +/* NodeTypeTest.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -137,5 +137,5 @@ public final class NodeTypeTest throw new IllegalStateException(); } } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java b/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java index 30069acdc43..6d728d9e788 100644 --- a/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NormalizeSpaceFunction.java @@ -1,4 +1,4 @@ -/* NormalizeSpaceFunction.java -- +/* NormalizeSpaceFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ final class NormalizeSpaceFunction { this(args.get(0)); } - + NormalizeSpaceFunction(Expr arg) { this.arg = arg; @@ -80,7 +80,7 @@ final class NormalizeSpaceFunction CPStringBuilder buf = new CPStringBuilder(); if (st.hasMoreTokens()) { - buf.append(st.nextToken()); + buf.append(st.nextToken()); while (st.hasMoreTokens()) { buf.append(' '); @@ -104,5 +104,5 @@ final class NormalizeSpaceFunction { return (arg == null) ? "normalize-space()" : "normalize-space(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NotFunction.java b/libjava/classpath/gnu/xml/xpath/NotFunction.java index 188b3dbc40e..a7c20a0c1a1 100644 --- a/libjava/classpath/gnu/xml/xpath/NotFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NotFunction.java @@ -1,4 +1,4 @@ -/* NotFunction.java -- +/* NotFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -84,5 +84,5 @@ final class NotFunction { return "not(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/NumberFunction.java b/libjava/classpath/gnu/xml/xpath/NumberFunction.java index 8804a788670..08831020b30 100644 --- a/libjava/classpath/gnu/xml/xpath/NumberFunction.java +++ b/libjava/classpath/gnu/xml/xpath/NumberFunction.java @@ -1,4 +1,4 @@ -/* NumberFunction.java -- +/* NumberFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,5 +99,5 @@ final class NumberFunction { return "number(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/OrExpr.java b/libjava/classpath/gnu/xml/xpath/OrExpr.java index 1085f51127e..937dedf6a07 100644 --- a/libjava/classpath/gnu/xml/xpath/OrExpr.java +++ b/libjava/classpath/gnu/xml/xpath/OrExpr.java @@ -1,4 +1,4 @@ -/* OrExpr.java -- +/* OrExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,5 +83,5 @@ public final class OrExpr { return lhs + " or " + rhs; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java b/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java index adadd6745c4..e8ceb5aa586 100644 --- a/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java +++ b/libjava/classpath/gnu/xml/xpath/ParenthesizedExpr.java @@ -1,4 +1,4 @@ -/* ParenthesizedExpr.java -- +/* ParenthesizedExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,16 +60,16 @@ final class ParenthesizedExpr this.expr = expr; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { Object ret = expr.evaluate(context, pos, len); if (ret instanceof Collection) { - /* Suppression is safe, as we know context produces - Collection */ - @SuppressWarnings("unchecked") - Collection nodes = (Collection) ret; + /* Suppression is safe, as we know context produces + Collection */ + @SuppressWarnings("unchecked") + Collection nodes = (Collection) ret; List list = new ArrayList(nodes); Collections.sort(list, documentOrderComparator); ret = list; @@ -91,5 +91,5 @@ final class ParenthesizedExpr { return "(" + expr + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Path.java b/libjava/classpath/gnu/xml/xpath/Path.java index 809f965ccef..f1975956716 100644 --- a/libjava/classpath/gnu/xml/xpath/Path.java +++ b/libjava/classpath/gnu/xml/xpath/Path.java @@ -1,4 +1,4 @@ -/* Path.java -- +/* Path.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,5 +50,5 @@ abstract class Path { abstract Collection evaluate(Node context, Collection nodeSet); - + } diff --git a/libjava/classpath/gnu/xml/xpath/Pattern.java b/libjava/classpath/gnu/xml/xpath/Pattern.java index 859ab569281..ca03cda37e0 100644 --- a/libjava/classpath/gnu/xml/xpath/Pattern.java +++ b/libjava/classpath/gnu/xml/xpath/Pattern.java @@ -1,4 +1,4 @@ -/* Pattern.java -- +/* Pattern.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,4 +51,3 @@ public abstract class Pattern public abstract boolean matches(Node context); } - diff --git a/libjava/classpath/gnu/xml/xpath/PositionFunction.java b/libjava/classpath/gnu/xml/xpath/PositionFunction.java index 3060eeaedb4..28ead3af068 100644 --- a/libjava/classpath/gnu/xml/xpath/PositionFunction.java +++ b/libjava/classpath/gnu/xml/xpath/PositionFunction.java @@ -1,4 +1,4 @@ -/* PositionFunction.java -- +/* PositionFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -69,5 +69,5 @@ final class PositionFunction { return "position()"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Predicate.java b/libjava/classpath/gnu/xml/xpath/Predicate.java index 5538c55aacf..a02e22b94d7 100644 --- a/libjava/classpath/gnu/xml/xpath/Predicate.java +++ b/libjava/classpath/gnu/xml/xpath/Predicate.java @@ -1,4 +1,4 @@ -/* Predicate.java -- +/* Predicate.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,10 +76,10 @@ class Predicate { return expr.references(var); } - + public String toString() { return "[" + expr + "]"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/RelationalExpr.java b/libjava/classpath/gnu/xml/xpath/RelationalExpr.java index 5cbb6bb2260..ac79d504953 100644 --- a/libjava/classpath/gnu/xml/xpath/RelationalExpr.java +++ b/libjava/classpath/gnu/xml/xpath/RelationalExpr.java @@ -1,4 +1,4 @@ -/* RelationalExpr.java -- +/* RelationalExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,5 +103,5 @@ final class RelationalExpr { return lhs + " " + (lt ? "<" : ">") + (eq ? "=" : "") + " " + rhs; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Root.java b/libjava/classpath/gnu/xml/xpath/Root.java index cbcb24999bc..8eef3408f5b 100644 --- a/libjava/classpath/gnu/xml/xpath/Root.java +++ b/libjava/classpath/gnu/xml/xpath/Root.java @@ -1,4 +1,4 @@ -/* Root.java -- +/* Root.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,5 +87,5 @@ public final class Root { return "/"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/RoundFunction.java b/libjava/classpath/gnu/xml/xpath/RoundFunction.java index 2d1bd544722..3b79e3e2167 100644 --- a/libjava/classpath/gnu/xml/xpath/RoundFunction.java +++ b/libjava/classpath/gnu/xml/xpath/RoundFunction.java @@ -1,4 +1,4 @@ -/* RoundFunction.java -- +/* RoundFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,5 +93,5 @@ final class RoundFunction { return "round(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Selector.java b/libjava/classpath/gnu/xml/xpath/Selector.java index 429b3f7e20b..2146f26f5ea 100644 --- a/libjava/classpath/gnu/xml/xpath/Selector.java +++ b/libjava/classpath/gnu/xml/xpath/Selector.java @@ -1,4 +1,4 @@ -/* Selector.java -- +/* Selector.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -115,7 +115,7 @@ public final class Selector getContextPosition(context), getContextSize(context)); } - + boolean matches(Node context, int pos, int len) { short nodeType = context.getNodeType(); @@ -499,5 +499,5 @@ public final class Selector } return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java b/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java index 2dc2c409d8d..6f9716a2d7d 100644 --- a/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StartsWithFunction.java @@ -1,4 +1,4 @@ -/* StartsWithFunction.java -- +/* StartsWithFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,5 +88,5 @@ final class StartsWithFunction { return "starts-with(" + arg1 + "," + arg2 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Steps.java b/libjava/classpath/gnu/xml/xpath/Steps.java index 427fbe20138..75644541c5d 100644 --- a/libjava/classpath/gnu/xml/xpath/Steps.java +++ b/libjava/classpath/gnu/xml/xpath/Steps.java @@ -1,4 +1,4 @@ -/* Steps.java -- +/* Steps.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ public final class Steps if (pos > 0) { Pattern left = (Pattern) path.get(pos - 1); - for (Node candidate : possibleContexts(right, context)) + for (Node candidate : possibleContexts(right, context)) { if (left.matches(candidate) && matches(candidate, pos - 1)) @@ -160,7 +160,7 @@ public final class Steps return Collections.emptySet(); } - @Override + @Override public Object evaluate(Node context, int pos, int len) { //System.err.println(toString()+" evaluate"); @@ -172,16 +172,16 @@ public final class Steps while (val instanceof Collection && i.hasNext()) { Path rhs = (Path) i.next(); - /* Suppression is safe, as we know context produces Collection */ + /* Suppression is safe, as we know context produces Collection */ @SuppressWarnings("unchecked") - Collection nodes = (Collection) val; - val = rhs.evaluate(context, nodes); + Collection nodes = (Collection) val; + val = rhs.evaluate(context, nodes); //System.err.println("\tevaluate "+rhs+" = "+val); } return val; } - @Override + @Override Collection evaluate(Node context, Collection ns) { // Left to right @@ -195,14 +195,14 @@ public final class Steps { Set acc = new LinkedHashSet(); int pos = 1, len = ns.size(); - for (Node node : ns) + for (Node node : ns) { Object ret = lhs.evaluate(node, pos++, len); if (ret instanceof Collection) { - /* Suppression is safe, as we know context produces Collection */ - @SuppressWarnings("unchecked") - Collection nodes = (Collection) ret; + /* Suppression is safe, as we know context produces Collection */ + @SuppressWarnings("unchecked") + Collection nodes = (Collection) ret; acc.addAll(nodes); } } diff --git a/libjava/classpath/gnu/xml/xpath/StringFunction.java b/libjava/classpath/gnu/xml/xpath/StringFunction.java index b8cba3798de..b2b3cecf7ef 100644 --- a/libjava/classpath/gnu/xml/xpath/StringFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StringFunction.java @@ -1,4 +1,4 @@ -/* StringFunction.java -- +/* StringFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ final class StringFunction { this(args.size() > 0 ? args.get(0) : null); } - + StringFunction(Expr arg) { this.arg = arg; @@ -115,5 +115,5 @@ final class StringFunction { return (arg == null) ? "string()" : "string(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java b/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java index 561537e99ba..c72b0d9bc59 100644 --- a/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java +++ b/libjava/classpath/gnu/xml/xpath/StringLengthFunction.java @@ -1,4 +1,4 @@ -/* StringLengthFunction.java -- +/* StringLengthFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ final class StringLengthFunction { this(args.isEmpty() ? null : (Expr) args.get(0)); } - + StringLengthFunction(Expr arg) { this.arg = arg; @@ -88,5 +88,5 @@ final class StringLengthFunction { return (arg == null) ? "string-length()" : "string-length(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java index ad75f2e3c67..4f10723a71a 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringAfterFunction.java @@ -1,4 +1,4 @@ -/* SubstringAfterFunction.java -- +/* SubstringAfterFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,5 +94,5 @@ final class SubstringAfterFunction { return "substring-after(" + arg1 + "," + arg2 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java index 1bf165777d0..1a5a04c4f3e 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringBeforeFunction.java @@ -1,4 +1,4 @@ -/* SubstringBeforeFunction.java -- +/* SubstringBeforeFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,5 +93,5 @@ final class SubstringBeforeFunction { return "substring-before(" + arg1 + "," + arg2 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/SubstringFunction.java b/libjava/classpath/gnu/xml/xpath/SubstringFunction.java index 33bcade0c2d..d17c3b66213 100644 --- a/libjava/classpath/gnu/xml/xpath/SubstringFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SubstringFunction.java @@ -1,4 +1,4 @@ -/* SubstringFunction.java -- +/* SubstringFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ final class SubstringFunction { Object val3 = arg3.evaluate(context, pos, len); int v3 = Expr.intValue(val3); - if (v3 < l) + if (v3 < l) l = v3; } @@ -115,5 +115,5 @@ final class SubstringFunction return (arg3 == null) ? "substring(" + arg1 + "," + arg2 + ")" : "substring(" + arg1 + "," + arg2 + "," + arg3 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/SumFunction.java b/libjava/classpath/gnu/xml/xpath/SumFunction.java index 73db2a91dc6..6c3323fb2ac 100644 --- a/libjava/classpath/gnu/xml/xpath/SumFunction.java +++ b/libjava/classpath/gnu/xml/xpath/SumFunction.java @@ -1,4 +1,4 @@ -/* SumFunction.java -- +/* SumFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,18 +66,18 @@ final class SumFunction this.arg = arg; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { Object val = arg.evaluate(context, pos, len); double sum = 0.0d; if (val instanceof Collection) { - /* Suppression is safe, as we know context produces - Collection */ - @SuppressWarnings("unchecked") - Collection nodes = (Collection) val; - for (Node node : nodes) + /* Suppression is safe, as we know context produces + Collection */ + @SuppressWarnings("unchecked") + Collection nodes = (Collection) val; + for (Node node : nodes) { String s = stringValue(node); sum += _number(context, s); @@ -100,5 +100,5 @@ final class SumFunction { return "sum(" + arg + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/Test.java b/libjava/classpath/gnu/xml/xpath/Test.java index 94837ffaca1..529c99bd8bf 100644 --- a/libjava/classpath/gnu/xml/xpath/Test.java +++ b/libjava/classpath/gnu/xml/xpath/Test.java @@ -1,4 +1,4 @@ -/* Test.java -- +/* Test.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/xpath/TranslateFunction.java b/libjava/classpath/gnu/xml/xpath/TranslateFunction.java index 8b4b8b2338c..4e06354c363 100644 --- a/libjava/classpath/gnu/xml/xpath/TranslateFunction.java +++ b/libjava/classpath/gnu/xml/xpath/TranslateFunction.java @@ -1,4 +1,4 @@ -/* TranslateFunction.java -- +/* TranslateFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -110,8 +110,8 @@ final class TranslateFunction if (!replaced) { buf.append(c); - } - } + } + } return buf.toString(); } @@ -126,10 +126,10 @@ final class TranslateFunction return (arg1.references(var) || arg2.references(var) || arg3.references(var)); } - + public String toString() { return "translate(" + arg1 + "," + arg2 + "," + arg3 + ")"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/TrueFunction.java b/libjava/classpath/gnu/xml/xpath/TrueFunction.java index 6ad42d726fb..41ab54b7549 100644 --- a/libjava/classpath/gnu/xml/xpath/TrueFunction.java +++ b/libjava/classpath/gnu/xml/xpath/TrueFunction.java @@ -1,4 +1,4 @@ -/* TrueFunction.java -- +/* TrueFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,5 +68,5 @@ final class TrueFunction { return "true()"; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/UnionExpr.java b/libjava/classpath/gnu/xml/xpath/UnionExpr.java index 03ae5c06d70..bd5f5e99016 100644 --- a/libjava/classpath/gnu/xml/xpath/UnionExpr.java +++ b/libjava/classpath/gnu/xml/xpath/UnionExpr.java @@ -1,4 +1,4 @@ -/* UnionExpr.java -- +/* UnionExpr.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -74,7 +74,7 @@ public final class UnionExpr return false; } - @Override + @Override public Object evaluate(Node context, int pos, int len) { Object left = lhs.evaluate(context, pos, len); @@ -83,13 +83,13 @@ public final class UnionExpr if (left instanceof Collection && right instanceof Collection) { Set set = new HashSet(); - /* Suppression is safe as addAll will check the types - of the elements and throw a ClassCastException as necessary */ - @SuppressWarnings("unchecked") - Collection l = (Collection) left; - @SuppressWarnings("unchecked") - Collection r = (Collection) right; - set.addAll (l); + /* Suppression is safe as addAll will check the types + of the elements and throw a ClassCastException as necessary */ + @SuppressWarnings("unchecked") + Collection l = (Collection) left; + @SuppressWarnings("unchecked") + Collection r = (Collection) right; + set.addAll (l); set.addAll (r); list = new ArrayList(set); Collections.sort(list, documentOrderComparator); @@ -113,5 +113,5 @@ public final class UnionExpr { return lhs + " | " + rhs; } - + } diff --git a/libjava/classpath/gnu/xml/xpath/VariableReference.java b/libjava/classpath/gnu/xml/xpath/VariableReference.java index 9ef6f160ff8..e1698c94c78 100644 --- a/libjava/classpath/gnu/xml/xpath/VariableReference.java +++ b/libjava/classpath/gnu/xml/xpath/VariableReference.java @@ -1,4 +1,4 @@ -/* VariableReference.java -- +/* VariableReference.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -98,5 +98,5 @@ public class VariableReference buf.append(name.getLocalPart()); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/XPathFactoryImpl.java b/libjava/classpath/gnu/xml/xpath/XPathFactoryImpl.java index 45dc57ed14a..970cf0e5d94 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathFactoryImpl.java +++ b/libjava/classpath/gnu/xml/xpath/XPathFactoryImpl.java @@ -1,4 +1,4 @@ -/* XPathFactoryImpl.java -- +/* XPathFactoryImpl.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,5 +86,5 @@ public class XPathFactoryImpl { return new XPathImpl(null, variableResolver, functionResolver); } - + } diff --git a/libjava/classpath/gnu/xml/xpath/XPathImpl.java b/libjava/classpath/gnu/xml/xpath/XPathImpl.java index 3511834ca90..62f86171bbb 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathImpl.java +++ b/libjava/classpath/gnu/xml/xpath/XPathImpl.java @@ -1,4 +1,4 @@ -/* XPathImpl.java -- +/* XPathImpl.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -126,7 +126,7 @@ public class XPathImpl throw new XPathExpressionException(expression); } } - + public Object evaluate(String expression, Object item, QName returnType) diff --git a/libjava/classpath/gnu/xml/xpath/XPathParser.java b/libjava/classpath/gnu/xml/xpath/XPathParser.java index e8c8e94da79..26e59091e39 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathParser.java +++ b/libjava/classpath/gnu/xml/xpath/XPathParser.java @@ -1,6 +1,6 @@ // created by jay 0.8 (c) 1998 Axel.Schreiner@informatik.uni-osnabrueck.de - // line 2 "XPathParser.y" + // line 2 "XPathParser.y" /* XPathParser.y - An XPath 1.0 parser. Copyright (C) 2004 The Free Software Foundation @@ -206,7 +206,7 @@ public class XPathParser return new FunctionCall(functionResolver, name, args); } - // line 211 "-" + // line 211 "-" // %token constants public static final int LITERAL = 257; @@ -364,7 +364,7 @@ public class XPathParser @throws yyException on irrecoverable parse error. */ public Object yyparse (yyInput yyLex, Object yydebug) - throws java.io.IOException, yyException { + throws java.io.IOException, yyException { //t this.yydebug = (jay.yydebug.yyDebug)yydebug; return yyparse(yyLex); } @@ -392,15 +392,15 @@ public class XPathParser @throws yyException on irrecoverable parse error. */ public Object yyparse (yyInput yyLex) - throws java.io.IOException, yyException { - if (yyMax <= 0) yyMax = 256; // initial size - int yyState = 0, yyStates[] = new int[yyMax]; // state stack - Object yyVal = null, yyVals[] = new Object[yyMax]; // value stack - int yyToken = -1; // current input - int yyErrorFlag = 0; // #tks to shift + throws java.io.IOException, yyException { + if (yyMax <= 0) yyMax = 256; // initial size + int yyState = 0, yyStates[] = new int[yyMax]; // state stack + Object yyVal = null, yyVals[] = new Object[yyMax]; // value stack + int yyToken = -1; // current input + int yyErrorFlag = 0; // #tks to shift yyLoop: for (int yyTop = 0;; ++ yyTop) { - if (yyTop >= yyStates.length) { // dynamically increase + if (yyTop >= yyStates.length) { // dynamically increase int[] i = new int[yyStates.length+yyMax]; System.arraycopy(yyStates, 0, i, 0, yyStates.length); yyStates = i; @@ -412,9 +412,9 @@ public class XPathParser yyVals[yyTop] = yyVal; //t if (yydebug != null) yydebug.push(yyState, yyVal); - yyDiscarded: for (;;) { // discarding a token does not change stack + yyDiscarded: for (;;) { // discarding a token does not change stack int yyN; - if ((yyN = YyDefRedClass.yyDefRed[yyState]) == 0) { // else [default] reduce (yyN) + if ((yyN = YyDefRedClass.yyDefRed[yyState]) == 0) { // else [default] reduce (yyN) if (yyToken < 0) { yyToken = yyLex.advance() ? yyLex.token() : 0; //t if (yydebug != null) @@ -424,7 +424,7 @@ public class XPathParser && yyN < YyTableClass.yyTable.length && YyCheckClass.yyCheck[yyN] == yyToken) { //t if (yydebug != null) //t yydebug.shift(yyState, YyTableClass.yyTable[yyN], yyErrorFlag-1); - yyState = YyTableClass.yyTable[yyN]; // shift to yyN + yyState = YyTableClass.yyTable[yyN]; // shift to yyN yyVal = yyLex.value(); yyToken = -1; if (yyErrorFlag > 0) -- yyErrorFlag; @@ -432,14 +432,14 @@ public class XPathParser } if ((yyN = YyRindexClass.yyRindex[yyState]) != 0 && (yyN += yyToken) >= 0 && yyN < YyTableClass.yyTable.length && YyCheckClass.yyCheck[yyN] == yyToken) - yyN = YyTableClass.yyTable[yyN]; // reduce (yyN) + yyN = YyTableClass.yyTable[yyN]; // reduce (yyN) else switch (yyErrorFlag) { - + case 0: yyerror("syntax error", yyExpecting(yyState)); //t if (yydebug != null) yydebug.error("syntax error"); - + case 1: case 2: yyErrorFlag = 3; do { @@ -456,7 +456,7 @@ public class XPathParser } while (-- yyTop >= 0); //t if (yydebug != null) yydebug.reject(); throw new yyException("irrecoverable syntax error"); - + case 3: if (yyToken == 0) { //t if (yydebug != null) yydebug.reject(); @@ -464,9 +464,9 @@ public class XPathParser } //t if (yydebug != null) //t yydebug.discard(yyState, yyToken, yyname(yyToken), -//t yyLex.value()); +//t yyLex.value()); yyToken = -1; - continue yyDiscarded; // leave stack alone + continue yyDiscarded; // leave stack alone } } int yyV = yyTop + 1-YyLenClass.yyLen[yyN]; @@ -475,13 +475,13 @@ public class XPathParser yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]); switch (yyN) { case 4: - // line 277 "XPathParser.y" + // line 277 "XPathParser.y" { yyVal = new Root(); } break; case 5: - // line 281 "XPathParser.y" + // line 281 "XPathParser.y" { Steps steps; if (yyVals[0+yyTop] instanceof Steps) @@ -499,7 +499,7 @@ case 5: } break; case 6: - // line 297 "XPathParser.y" + // line 297 "XPathParser.y" { Test nt = new NodeTypeTest((short) 0); Selector s = new Selector(Selector.DESCENDANT_OR_SELF, @@ -522,7 +522,7 @@ case 6: } break; case 8: - // line 322 "XPathParser.y" + // line 322 "XPathParser.y" { Steps steps; if (yyVals[-2+yyTop] instanceof Steps) @@ -540,7 +540,7 @@ case 8: } break; case 9: - // line 338 "XPathParser.y" + // line 338 "XPathParser.y" { Test nt = new NodeTypeTest((short) 0); Selector s = new Selector(Selector.DESCENDANT_OR_SELF, @@ -563,14 +563,14 @@ case 9: } break; case 10: - // line 362 "XPathParser.y" + // line 362 "XPathParser.y" { @SuppressWarnings("unchecked") List tests = (List) yyVals[0+yyTop]; yyVal = new Selector (Selector.CHILD, tests); } break; case 11: - // line 366 "XPathParser.y" + // line 366 "XPathParser.y" { /* This is safe as we create this in one of the other cases */ @SuppressWarnings("unchecked") List tests = (List) yyVals[0+yyTop]; @@ -578,7 +578,7 @@ case 11: } break; case 12: - // line 370 "XPathParser.y" + // line 370 "XPathParser.y" { /* This is safe as we create this in one of the other cases */ @SuppressWarnings("unchecked") List tests = (List) yyVals[0+yyTop]; @@ -586,21 +586,21 @@ case 12: } break; case 13: - // line 374 "XPathParser.y" + // line 374 "XPathParser.y" { List emptyList = Collections.emptyList(); yyVal = new Selector (Selector.SELF, emptyList); } break; case 14: - // line 378 "XPathParser.y" + // line 378 "XPathParser.y" { List emptyList = Collections.emptyList(); yyVal = new Selector (Selector.PARENT, emptyList); } break; case 15: - // line 385 "XPathParser.y" + // line 385 "XPathParser.y" { List list = new ArrayList(); list.add((Test) yyVals[0+yyTop]); @@ -608,7 +608,7 @@ case 15: } break; case 16: - // line 391 "XPathParser.y" + // line 391 "XPathParser.y" { /* This is safe as we create this in one of the other cases */ @SuppressWarnings("unchecked") List tests = (List)yyVals[-1+yyTop]; @@ -617,128 +617,128 @@ case 16: } break; case 17: - // line 415 "XPathParser.y" + // line 415 "XPathParser.y" { yyVal = new Integer(Selector.ANCESTOR); } break; case 18: - // line 419 "XPathParser.y" + // line 419 "XPathParser.y" { yyVal = new Integer(Selector.ANCESTOR_OR_SELF); } break; case 19: - // line 423 "XPathParser.y" + // line 423 "XPathParser.y" { yyVal = new Integer(Selector.ATTRIBUTE); } break; case 20: - // line 427 "XPathParser.y" + // line 427 "XPathParser.y" { yyVal = new Integer(Selector.CHILD); } break; case 21: - // line 431 "XPathParser.y" + // line 431 "XPathParser.y" { yyVal = new Integer(Selector.DESCENDANT); } break; case 22: - // line 435 "XPathParser.y" + // line 435 "XPathParser.y" { yyVal = new Integer(Selector.DESCENDANT_OR_SELF); } break; case 23: - // line 439 "XPathParser.y" + // line 439 "XPathParser.y" { yyVal = new Integer(Selector.FOLLOWING); } break; case 24: - // line 443 "XPathParser.y" + // line 443 "XPathParser.y" { yyVal = new Integer(Selector.FOLLOWING_SIBLING); } break; case 25: - // line 447 "XPathParser.y" + // line 447 "XPathParser.y" { yyVal = new Integer(Selector.NAMESPACE); } break; case 26: - // line 451 "XPathParser.y" + // line 451 "XPathParser.y" { yyVal = new Integer(Selector.PARENT); } break; case 27: - // line 455 "XPathParser.y" + // line 455 "XPathParser.y" { yyVal = new Integer(Selector.PRECEDING); } break; case 28: - // line 459 "XPathParser.y" + // line 459 "XPathParser.y" { yyVal = new Integer(Selector.PRECEDING_SIBLING); } break; case 29: - // line 463 "XPathParser.y" + // line 463 "XPathParser.y" { yyVal = new Integer(Selector.SELF); } break; case 31: - // line 472 "XPathParser.y" + // line 472 "XPathParser.y" { yyVal = new NodeTypeTest(Node.PROCESSING_INSTRUCTION_NODE, (String) yyVals[-1+yyTop]); } break; case 32: - // line 477 "XPathParser.y" + // line 477 "XPathParser.y" { yyVal = new NodeTypeTest(((Short) yyVals[-1+yyTop]).shortValue()); } break; case 33: - // line 484 "XPathParser.y" + // line 484 "XPathParser.y" { yyVal = new Predicate((Expr) yyVals[-1+yyTop]); } break; case 35: - // line 492 "XPathParser.y" + // line 492 "XPathParser.y" { yyVal = new ParenthesizedExpr((Expr) yyVals[-1+yyTop]); } break; case 36: - // line 496 "XPathParser.y" + // line 496 "XPathParser.y" { yyVal = new Constant(yyVals[0+yyTop]); } break; case 37: - // line 500 "XPathParser.y" + // line 500 "XPathParser.y" { yyVal = new Constant(yyVals[0+yyTop]); } break; case 39: - // line 508 "XPathParser.y" + // line 508 "XPathParser.y" { List emptyList = Collections.emptyList(); yyVal = lookupFunction((String) yyVals[-2+yyTop], emptyList); } break; case 40: - // line 512 "XPathParser.y" + // line 512 "XPathParser.y" { /* This is safe as we create this below */ @SuppressWarnings("unchecked") List exprs = (List) yyVals[-1+yyTop]; @@ -746,7 +746,7 @@ case 40: } break; case 41: - // line 519 "XPathParser.y" + // line 519 "XPathParser.y" { List list = new ArrayList(); list.add((Expr) yyVals[0+yyTop]); @@ -754,7 +754,7 @@ case 41: } break; case 42: - // line 525 "XPathParser.y" + // line 525 "XPathParser.y" { /* This is safe as we create this above */ @SuppressWarnings("unchecked") List list = (List) yyVals[0+yyTop]; @@ -763,13 +763,13 @@ case 42: } break; case 44: - // line 535 "XPathParser.y" + // line 535 "XPathParser.y" { yyVal = new UnionExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]); } break; case 47: - // line 544 "XPathParser.y" + // line 544 "XPathParser.y" { Steps steps; if (yyVals[0+yyTop] instanceof Steps) @@ -787,7 +787,7 @@ case 47: } break; case 48: - // line 560 "XPathParser.y" + // line 560 "XPathParser.y" { Test nt = new NodeTypeTest((short) 0); Selector s = new Selector(Selector.DESCENDANT_OR_SELF, @@ -810,7 +810,7 @@ case 48: } break; case 50: - // line 585 "XPathParser.y" + // line 585 "XPathParser.y" { Predicate filter = (Predicate) yyVals[0+yyTop]; Selector s = new Selector(Selector.SELF, @@ -831,171 +831,171 @@ case 50: } break; case 52: - // line 608 "XPathParser.y" + // line 608 "XPathParser.y" { yyVal = new OrExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]); } break; case 54: - // line 616 "XPathParser.y" + // line 616 "XPathParser.y" { yyVal = new AndExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop]); } break; case 56: - // line 624 "XPathParser.y" + // line 624 "XPathParser.y" { yyVal = new EqualityExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false); } break; case 57: - // line 628 "XPathParser.y" + // line 628 "XPathParser.y" { yyVal = new EqualityExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true); } break; case 59: - // line 636 "XPathParser.y" + // line 636 "XPathParser.y" { yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true, false); } break; case 60: - // line 640 "XPathParser.y" + // line 640 "XPathParser.y" { yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false, false); } break; case 61: - // line 644 "XPathParser.y" + // line 644 "XPathParser.y" { yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], true, true); } break; case 62: - // line 648 "XPathParser.y" + // line 648 "XPathParser.y" { yyVal = new RelationalExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], false, true); } break; case 64: - // line 656 "XPathParser.y" + // line 656 "XPathParser.y" { yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.ADD); } break; case 65: - // line 660 "XPathParser.y" + // line 660 "XPathParser.y" { yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.SUBTRACT); } break; case 67: - // line 668 "XPathParser.y" + // line 668 "XPathParser.y" { yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.MULTIPLY); } break; case 68: - // line 672 "XPathParser.y" + // line 672 "XPathParser.y" { yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.DIVIDE); } break; case 69: - // line 676 "XPathParser.y" + // line 676 "XPathParser.y" { yyVal = new ArithmeticExpr((Expr) yyVals[-2+yyTop], (Expr) yyVals[0+yyTop], ArithmeticExpr.MODULO); } break; case 71: - // line 684 "XPathParser.y" + // line 684 "XPathParser.y" { yyVal = new NegativeExpr((Expr) yyVals[0+yyTop]); } break; case 72: - // line 691 "XPathParser.y" + // line 691 "XPathParser.y" { yyVal = new Double((String) yyVals[0+yyTop] + ".0"); } break; case 73: - // line 695 "XPathParser.y" + // line 695 "XPathParser.y" { yyVal = new Double((String) yyVals[-1+yyTop] + ".0"); } break; case 74: - // line 699 "XPathParser.y" + // line 699 "XPathParser.y" { yyVal = new Double((String) yyVals[-2+yyTop] + "." + (String) yyVals[0+yyTop]); } break; case 75: - // line 703 "XPathParser.y" + // line 703 "XPathParser.y" { yyVal = new Double("0." + (String) yyVals[0+yyTop]); } break; case 77: - // line 732 "XPathParser.y" + // line 732 "XPathParser.y" { String name = (String) yyVals[0+yyTop]; yyVal = new VariableReference(variableResolver, getQName(name)); } break; case 78: - // line 740 "XPathParser.y" + // line 740 "XPathParser.y" { yyVal = new NameTest(null, true, true); } break; case 79: - // line 744 "XPathParser.y" + // line 744 "XPathParser.y" { QName qName = getQName((String) yyVals[-2+yyTop]); yyVal = new NameTest(qName, true, false); } break; case 80: - // line 749 "XPathParser.y" + // line 749 "XPathParser.y" { QName qName = getQName((String) yyVals[0+yyTop]); yyVal = new NameTest(qName, false, false); } break; case 82: - // line 758 "XPathParser.y" + // line 758 "XPathParser.y" { yyVal = (String) yyVals[-2+yyTop] + ':' + (String) yyVals[0+yyTop]; } break; case 83: - // line 765 "XPathParser.y" + // line 765 "XPathParser.y" { yyVal = new Short(Node.COMMENT_NODE); } break; case 84: - // line 769 "XPathParser.y" + // line 769 "XPathParser.y" { yyVal = new Short(Node.TEXT_NODE); } break; case 85: - // line 773 "XPathParser.y" + // line 773 "XPathParser.y" { yyVal = new Short(Node.PROCESSING_INSTRUCTION_NODE); } break; case 86: - // line 777 "XPathParser.y" + // line 777 "XPathParser.y" { yyVal = new Short((short) 0); } break; - // line 988 "-" + // line 988 "-" } yyTop -= YyLenClass.yyLen[yyN]; yyState = yyStates[yyTop]; @@ -1020,7 +1020,7 @@ case 86: else yyState = YyDgotoClass.yyDgoto[yyM]; //t if (yydebug != null) yydebug.shift(yyStates[yyTop], yyState); - continue yyLoop; + continue yyLoop; } } } @@ -1438,7 +1438,7 @@ case 86: protected static final class YyNameClass { - public static final String yyName [] = { + public static final String yyName [] = { "end-of-file",null,null,null,null,null,null,null,null,null,null,null, null,null,null,null,null,null,null,null,null,null,null,null,null,null, null,null,null,null,null,null,null,null,null,null,null,null,null,null, @@ -1469,7 +1469,7 @@ case 86: } /* End of class YyNameClass */ - // line 783 "XPathParser.y" + // line 783 "XPathParser.y" } - // line 1463 "-" + // line 1463 "-" diff --git a/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java b/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java index bf4516afae7..879931bd530 100644 --- a/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java +++ b/libjava/classpath/gnu/xml/xpath/XPathTokenizer.java @@ -1,4 +1,4 @@ -/* XPathTokenizer.java -- +/* XPathTokenizer.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,7 +53,7 @@ import antlr.TokenStreamIOException;*/ /** * XPath 1.0 expression tokenizer. - * + * * @author Chris Burdess */ public class XPathTokenizer @@ -89,7 +89,7 @@ implements XPathParser.yyInput { return val; } - + } static final Map keywords = new TreeMap (); @@ -151,7 +151,7 @@ implements XPathParser.yyInput throw new TokenStreamIOException (e); } } - + * End ANTLR specific */ public boolean advance () diff --git a/libjava/classpath/java/applet/Applet.java b/libjava/classpath/java/applet/Applet.java index bb855351b8d..2e4d46a8438 100644 --- a/libjava/classpath/java/applet/Applet.java +++ b/libjava/classpath/java/applet/Applet.java @@ -249,11 +249,11 @@ public class Applet extends Panel { try { - return getImage(new URL(url, name)); + return getImage(new URL(url, name)); } catch (MalformedURLException e) { - return null; + return null; } } @@ -302,11 +302,11 @@ public class Applet extends Panel { try { - return getAudioClip(new URL(url, name)); + return getAudioClip(new URL(url, name)); } catch (MalformedURLException e) { - return null; + return null; } } @@ -361,7 +361,7 @@ public class Applet extends Panel AudioClip ac = getAudioClip(url); try { - ac.play(); + ac.play(); } catch (Exception ignored) { @@ -382,7 +382,7 @@ public class Applet extends Panel { try { - getAudioClip(url, name).play(); + getAudioClip(url, name).play(); } catch (Exception ignored) { @@ -518,7 +518,7 @@ public class Applet extends Panel { AccessibleStateSet s = super.getAccessibleStateSet(); if (isActive()) - s.add(AccessibleState.ACTIVE); + s.add(AccessibleState.ACTIVE); return s; } } // class AccessibleApplet @@ -534,7 +534,7 @@ public class Applet extends Panel // and might be null afterward if we were unable to read the URL // for some reason. private Clip clip; - + public URLAudioClip(URL url) { this.url = url; diff --git a/libjava/classpath/java/awt/AWTEvent.java b/libjava/classpath/java/awt/AWTEvent.java index 102062cdfe6..c4f77282761 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 07a6ffc2002..722dc752d57 100644 --- a/libjava/classpath/java/awt/AWTEventMulticaster.java +++ b/libjava/classpath/java/awt/AWTEventMulticaster.java @@ -719,7 +719,7 @@ public class AWTEventMulticaster * Chain WindowListener 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 WindowStateListener 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 WindowFocusListener 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 EventListener 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[] getListeners(EventListener l, - Class type) + Class type) { ArrayList list = new ArrayList(); if (l instanceof AWTEventMulticaster) diff --git a/libjava/classpath/java/awt/AWTKeyStroke.java b/libjava/classpath/java/awt/AWTKeyStroke.java index 378e4eb159a..bdccbf0d745 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 - 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" => getAWTKeyStroke(KeyEvent.VK_X, * InputEvent.ALT_MASK | InputEvent.SHIFT_MASK, true);
    * "typed a" => getAWTKeyStroke('a'); - * + * * * @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 a668fdae696..d6c43d139b7 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 AlphaComposite similar to this, * that uses the specified rule. If rule is the same as * this.rule, then this 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 AlphaComposite similar to this, * that uses the specified alpha. - * + * * If alph is the same as this.alpha, * then this 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 ef6a7f0b7b5..eac69d9869f 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}. *

    - * 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: *

    * BasicStroke 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 BasicStroke 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 10.0. * * @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 *

  • line join style: {@link #JOIN_MITER};
    • *
  • miter limit: 10.0f. * - * + * * @param width the line width (>= 0.0f). - * + * * @throws IllegalArgumentException If width 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 * null, a continuous line will be drawn. - * + * * @return The dash array (possibly null). */ 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 int first with * Float.floatToIntBits() if the value is a * float). - * + * * @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 BasicStroke for equality with an arbitrary + * Compares this BasicStroke for equality with an arbitrary * object. This method returns true if and only if: *
      *
    • o is an instanceof BasicStroke;
      • *
    • this object has the same width, line cap style, line join style, * miter limit, dash array and dash phase as o.
      • *
    - * + * * @param o the object (null permitted). - * + * * @return true if this stroke is equal to o and * false 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 50061ec6771..c06eb834b6d 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 bba83dcb0d9..522fdf7f630 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 4c246c7650b..458a45e53b5 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[] getListeners(Class 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 95db1f57e1a..ab7a8e3fa22 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 Canvas. */ - 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 Canvas. * diff --git a/libjava/classpath/java/awt/CardLayout.java b/libjava/classpath/java/awt/CardLayout.java index 35380d2370b..c36daf4823c 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 * String */ @@ -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 * addLayoutComponent(Component, Object). */ @@ -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 null. */ 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 null. */ 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 null. */ 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 null, this method does nothing. - * + * * @param parent The parent container, not null. - * @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; + int num = parent.ncomponents; + // This is more efficient than calling getComponents(). + Component[] comps = parent.component; - if (num == 1) - { - comps[0].setVisible(true); - return; - } + if (num == 1) + { + comps[0].setVisible(true); + return; + } - int choice = -1; + int choice = -1; - if (what == FIRST) - choice = 0; - else if (what == LAST) - choice = num - 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 + 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; + int w = 0, h = 0, num = parent.ncomponents; + Component[] comps = parent.component; - for (int i = 0; i < num; ++i) - { - Dimension d; + 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 (); + 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); - } + 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; + 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; + // Handle overflow. + if (w < 0) + w = Integer.MAX_VALUE; + if (h < 0) + h = Integer.MAX_VALUE; - return new Dimension (w, h); + return new Dimension (w, h); } } diff --git a/libjava/classpath/java/awt/Checkbox.java b/libjava/classpath/java/awt/Checkbox.java index eea443edf74..dffb57da3b6 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 AccessibleAction * interface for this accessible object. In this case, the @@ -156,7 +156,7 @@ protected class AccessibleAWTCheckbox { return this; } - + /** * Returns an implementation of the AccessibleValue * 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 Checkbox 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 31b573e654d..30f3e16357c 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 * getSelectedCheckbox(). */ 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 c886fc67203..597e1964b58 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[] getListeners (Class 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 CheckboxMenuItem. * The context is created, if necessary. @@ -357,7 +357,7 @@ paramString() accessibleContext = new AccessibleAWTCheckboxMenuItem(); return accessibleContext; } - + /** * Generate a unique name for this CheckboxMenuItem. * @@ -374,4 +374,3 @@ paramString() } } // class CheckboxMenuItem - diff --git a/libjava/classpath/java/awt/Choice.java b/libjava/classpath/java/awt/Choice.java index ae89b9e9954..5d2cfaf673d 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 Choice. * @@ -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 c3d04c04976..243a5e86fe7 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 2996f899f17..5ba688617ca 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 44676ba9dd3..d2878a9fd9f 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 (null 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 true if the current preferred size is not - * null and was set by a call to + * Returns true if the current preferred size is not + * null and was set by a call to * {@link #setPreferredSize(Dimension)}, otherwise returns false. - * + * * @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 (null 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 true if the current minimum size is not - * null and was set by a call to + * Returns true if the current minimum size is not + * null and was set by a call to * {@link #setMinimumSize(Dimension)}, otherwise returns false. - * + * * @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 (null permitted). - * + * * @since 1.5 - * + * * @see #getMaximumSize() */ public void setMaximumSize(Dimension size) @@ -2030,19 +2030,19 @@ public abstract class Component } /** - * Returns true if the current maximum size is not - * null and was set by a call to + * Returns true if the current maximum size is not + * null and was set by a call to * {@link #setMaximumSize(Dimension)}, otherwise returns false. - * + * * @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 paint() 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 * listenerType. * - * @param listenerType the class of listeners to filter (null + * @param listenerType the class of listeners to filter (null * not permitted). - * + * * @return An array of registered listeners. - * + * * @throws ClassCastException if listenerType does not implement * the {@link EventListener} interface. - * @throws NullPointerException if listenerType is + * @throws NullPointerException if listenerType is * null. - * + * * @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 keystrokes) + Set 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 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 *
  • 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 *
  • 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 *
  • the set of backward traversal keys return null; } - + // Helper methods; some are package visible for use by subclasses. /** @@ -5463,13 +5463,13 @@ p *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 ComponentEvent indicating the resize */ public void componentResized(ComponentEvent event) @@ -6004,7 +6004,7 @@ p *
  • the set of backward traversal keys /** * This method is called when the component is moved. - * + * * @param event the ComponentEvent indicating the move */ public void componentMoved(ComponentEvent event) @@ -6015,7 +6015,7 @@ p *
  • the set of backward traversal keys /** * This method is called when the component is made visible. - * + * * @param event the ComponentEvent indicating the visibility */ public void componentShown(ComponentEvent event) @@ -6026,7 +6026,7 @@ p *
  • the set of backward traversal keys /** * This method is called when the component is hidden. - * + * * @param event the ComponentEvent indicating the visibility */ public void componentHidden(ComponentEvent event) @@ -6035,7 +6035,7 @@ p *
  • the set of backward traversal keys peer.hide(); } } - + /** * This class provides accessibility support for subclasses of container. * @@ -6732,13 +6732,13 @@ p *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 *
  • 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 2634735118a..7e596f10a3e 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 * listenerType. * - * @param listenerType the class of listeners to filter (null + * @param listenerType the class of listeners to filter (null * not permitted). - * + * * @return An array of registered listeners. - * + * * @throws ClassCastException if listenerType does not implement * the {@link EventListener} interface. - * @throws NullPointerException if listenerType is + * @throws NullPointerException if listenerType is * null. - * + * * @see #getContainerListeners() - * + * * @since 1.3 */ public T[] getListeners(Class 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 null 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 null 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 null 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 null * 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 keystrokes) + Set 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 true if this container provides a focus traversal * policy, false 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 14afd364876..3fa437db70c 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 * current. root 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 4d339b7211a..69d0e87f5b6 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 a5cb7dad16a..3f017c5a52c 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 325e3ac8d1a..f62e6e53e0c 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 227b8b192bb..1b4078823f5 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. - * + * * Implementation note: 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.
    - * + * * 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:
    *
    @@ -91,8 +91,8 @@ import java.net.URI; *

    * * gconftool-2 -g /apps/classpath/gnu/java/awt/peer/Desktop/html/command - * - * + * + * * @author Mario Torre * @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 Desktop.isSupported(java.awt.Desktop.Action) * method. - * + * * @author Mario Torre */ 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 uri. - * + * * 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 mailtoURI 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 file 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 83fb52d89d7..d12e1eb12b7 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; /** - * Dialog provides a top-level window normally used to receive + * Dialog provides a top-level window normally used to receive * user input in applications. *

    * 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 * BorderLayout. Dialogs can be modal (blocks user input to other * components) or non-modal (user input in other components are allowed). - *

    - * + *

    + * * @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 Dialog 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 Dialog 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 true if this dialog box is modal, * false 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 Dialog 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 Dialog 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 true if this dialog box is modal, * false 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 Dialog with the specified, * parent, title, modality and GraphicsConfiguration, that is * resizable. - * + * * @param parent The parent frame of this dialog box. * @param title The title string for this dialog box. * @param modal true if this dialog box is modal, * false otherwise. - * @param gc The GraphicsConfiguration object to use. If - * null the GraphicsConfiguration of the target + * @param gc The GraphicsConfiguration object to use. If + * null the GraphicsConfiguration 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 Dialog 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 Dialog 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 Dialog 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 true if this dialog box is modal, * false 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 Dialog with the specified, * parent, title, modality and GraphicsConfiguration, that is * resizable. - * + * * @param parent The parent frame of this dialog box. * @param title The title string for this dialog box. * @param modal true if this dialog box is modal, * false otherwise. - * @param gc The GraphicsConfiguration object to use. If - * null the GraphicsConfiguration of the target + * @param gc The GraphicsConfiguration object to use. If + * null the GraphicsConfiguration 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 null 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 true if this dialog box is modal, false * 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 true to make this dialog box modal, - * false to make it non-modal. + * false 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 true if this dialog is resizable, * false otherwise. */ @@ -361,7 +361,7 @@ public class Dialog extends Window /** * Changes the resizability of this dialog box. - * + * * @param resizable true to make this dialog resizable, * false 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 true if this dialog is undecorated, * false 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 true to disable dialog decorations, * false 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 Dialog. 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 Dialog. * diff --git a/libjava/classpath/java/awt/DisplayMode.java b/libjava/classpath/java/awt/DisplayMode.java index d41d4a87f57..be2a1d11878 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 648139cc850..f2c98b9b0ed 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 9f81a794415..c2147f4c003 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 eb17449a00c..cb52ae01318 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 21117700d6e..c1bd082647c 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 LOAD or + * @serial The mode of this dialog, either LOAD or * SAVE. */ private int mode; @@ -109,41 +109,41 @@ private static transient long next_file_dialog_number; /** * Initializes a new instance of FileDialog 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 FileDialog 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 FileDialog 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 LOAD or * SAVE. * @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 FileDialog with the + * Initializes a new instance of FileDialog 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 FileDialog. */ -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 70c98a29a74..231d041b10c 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; + int num = parent.getComponentCount (); + // This is more efficient than calling getComponents(). + Component[] comps = parent.component; - Dimension d = parent.getSize (); - Insets ins = parent.getInsets (); + Dimension d = parent.getSize (); + Insets ins = parent.getInsets (); - ComponentOrientation orient = parent.getComponentOrientation (); - boolean left_to_right = orient.isLeftToRight (); + 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; + 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 (); + 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; - } - } + 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; + // 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; + 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; + 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; - } - } + 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; - } + // 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 a7f1558dde9..d9374eae8dd 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 4e6e6bd3476..89ff1f52aad 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 createFont 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 (null + * + * @param fontspec a string specifying the required font (null * 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 default if the property + * @return The requested font, or default 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 null if the property + * @return The requested font, or null 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 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 text to measure. @@ -1002,16 +1002,16 @@ public class Font implements Serializable * @throws IndexOutOfBoundsException if the range [begin, limit] is * invalid in text. */ - 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 text to measure. @@ -1023,17 +1023,17 @@ public class Font implements Serializable * @throws IndexOutOfBoundsException if the range [begin, limit] is * invalid in chars. */ - 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 text to measure. @@ -1045,7 +1045,7 @@ public class Font implements Serializable * @throws IndexOutOfBoundsException if the range [begin, limit] is * invalid in ci. */ - 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 * [ 0, getNumGlyphs() - 1 ]. * * @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 str to measure. * @param limit Index of the last character in str 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 ci to measure. * @param limit Index of the last character in ci 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 ci to measure. * @param limit Index of the last character in ci 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 chars. + * invalid in chars. */ - 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 91866462fee..e483d28fcbd 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 3cc8738c63f..83bdb0947ca 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 * true by default. * * @return true if this frame is resizable, false @@ -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(); @@ -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 Frame. */ @@ -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 Frame. * The context is created, if necessary. diff --git a/libjava/classpath/java/awt/GradientPaint.java b/libjava/classpath/java/awt/GradientPaint.java index 74067f49e86..0bb8407551e 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 GradientPaint. - * + * * @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 (null not permitted). @@ -76,7 +76,7 @@ public class GradientPaint implements Paint /** * Creates a new acyclic GradientPaint. - * + * * @param p1 anchor point 1 (null not permitted). * @param c1 color 1 (null not permitted). * @param p2 anchor point 2 (null not permitted). @@ -90,7 +90,7 @@ public class GradientPaint implements Paint /** * Creates a new cyclic or acyclic GradientPaint. - * + * * @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 (null not permitted). @@ -116,7 +116,7 @@ public class GradientPaint implements Paint /** * Creates a new cyclic or acyclic GradientPaint. - * + * * @param p1 anchor point 1 (null not permitted). * @param c1 color 1 (null not permitted). * @param p2 anchor point 2 (null 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 GradientPaint 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 null). */ 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 GradientPaint 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 null). */ public Color getColor2() @@ -178,7 +178,7 @@ public class GradientPaint implements Paint /** * Returns true if this GradientPaint instance is * cyclic, and false 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 GradientPaint 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 09bf7cacffa..dfc7722072f 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, false is returned and - * the specified iamge observer is notified as more data becomes + * is not completely loaded, false 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, false is returned and - * the specified iamge observer is notified as more data becomes + * is not completely loaded, false 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, false is returned and - * the specified iamge observer is notified as more data becomes + * is not completely loaded, false 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, false is returned and - * the specified iamge observer is notified as more data becomes + * is not completely loaded, false 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 e0a1b4756f5..7c9622aef7b 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: *

    *

      - *
    • a {@link javax.swing.JComponent} - in the - * {@link javax.swing.JComponent#paint(Graphics)} method, the incoming - * {@link Graphics} should always be an instance of - * Graphics2D;
      • - *
    • a {@link BufferedImage} - see + *
    • a {@link javax.swing.JComponent} - in the + * {@link javax.swing.JComponent#paint(Graphics)} method, the incoming + * {@link Graphics} should always be an instance of + * Graphics2D;
      • + *
    • a {@link BufferedImage} - see * {@link BufferedImage#createGraphics()};
      • - *
    • a {@link java.awt.print.PrinterJob} - in the + *
    • 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 * Graphics2D.
      • *
    *

    - * 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 (null 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 shape using the current * paint. - * + * * @param shape the shape to fill (null 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 (null not permitted). - * + * * @see #getPaint() */ public abstract void setPaint(Paint paint); /** * Sets the stroke to be used for subsequent drawing operations. - * + * * @param stroke the stroke (null 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 transform * and the existing transform. - * + * * @param transform the transform. */ public abstract void transform(AffineTransform transform); - + /** * Sets the current transform. If the caller specifies a null - * 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 (null 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 s. - * + * * @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 3cf8b65db8f..bbd9820c951 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 95487a2a1cc..c99c14b1b1d 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 a6a64c3bb8b..8231300586a 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 d016fd31acd..224d53ff282 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(); - this.internalcomptable = new Hashtable(); - this.defaultConstraints= new GridBagConstraints(); + this.comptable = new Hashtable(); + this.internalcomptable = new Hashtable(); + 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(); + GridBagConstraints clone = (GridBagConstraints) constraints.clone(); - if (clone.gridx < 0) - clone.gridx = GridBagConstraints.RELATIVE; - - if (clone.gridy < 0) - clone.gridy = GridBagConstraints.RELATIVE; + if (clone.gridx < 0) + clone.gridx = 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); + 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); + GridBagConstraints result = comptable.get (component); - if (result == null) - { - setConstraints (component, defaultConstraints); - result = comptable.get (component); - } - - return result; + if (result == null) + { + setConstraints (component, defaultConstraints); + result = comptable.get (component); + } + + return result; } private GridBagConstraints lookupInternalConstraints (Component component) { - GridBagConstraints result = internalcomptable.get (component); + GridBagConstraints result = internalcomptable.get (component); - if (result == null) - { - result = (GridBagConstraints) lookupConstraints(component).clone(); - internalcomptable.put (component, result); - } - - return result; + 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]; + int[][] result = new int [2][]; + if (layoutInfo == null) + { + result[0] = new int[0]; + result[1] = new int[0]; - return result; - } + 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; + 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]; + double[][] result = new double [2][]; + if (layoutInfo == null) + { + result[0] = new double[0]; + result[1] = new double[0]; - return result; - } + 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; + 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 sortedByWidth = - new ArrayList(components.length); + new ArrayList(components.length); ArrayList sortedByHeight = - new ArrayList(components.length); + new ArrayList(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 list, boolean sortByWidth) + ArrayList 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 65e09aa59f8..a8b0189dec9 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; + int num = parent.ncomponents; - // There's no point, and handling this would mean adding special - // cases. - if (num == 0) - return; + // 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; + // 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; + 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; + // 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 (); + 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; + // 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; + // 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; + int x = ins.left; + int y = ins.top; + int i = 0; + int recount = 0; - while (i < num) - { - comps[i].setBounds (x, y, tw, th); + 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; - } + ++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; + 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; + for (int i = 0; i < num; ++i) + { + 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 = Math.max (d.width, w); - h = Math.max (d.height, h); - } + 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; + 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); + 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 8a1cc0f0039..7b2cee7aec2 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 762b6975b3f..1747cae6abe 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 9ffc048782c..e84901d33b1 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 cd138269e0b..691351175d4 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 - keystrokes) + Set + 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 cycleRoot 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 * redispatchEvent(). 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 (dispatchEvent()) and * the key event dispatchers should use this method to handle * dispatching rather than the dispatch method of the target - * component. + * component. *
    *
    * * This method is not intended for general consumption, and is * only for the use of the aforementioned classes. * - * + * * @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 Window, 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 71614da6482..1522dac36f4 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 * LEFT. */ 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 39bdb887dc8..11b83d8bf96 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 df8bffa1945..dc1199bbcfe 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 true if multi-select mode is enabled, * false otherwise. - * + * * @since 1.1 */ public boolean isMultipleMode() @@ -237,7 +237,7 @@ public class List extends Component * @return true if multi-select mode is enabled, * false otherwise. * - * @deprecated This method is deprecated in favor of + * @deprecated This method is deprecated in favor of * isMultipleMode(). */ public boolean allowsMultipleSelections() @@ -251,7 +251,7 @@ public class List extends Component * * @param multipleMode true to enable multiple mode, * false 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 * getMinimumSize(int)> */ 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 * getPreferredSize. */ - 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 * getPreferredSize(int)> */ 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 removeAll(). */ 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 null if there + * Returns the item that is currently selected, or null if there * is no item selected. FIXME: What happens if multiple items selected? * * @return The selected item, or null if there is no @@ -703,7 +703,7 @@ public class List extends Component * * @return true if the index is selected, false * 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 * makeVisible() method. * - * @return The index of the last item made visible via the + * @return The index of the last item made visible via the * makeVisible() 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 enableEvents() 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 enableEvents() 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 List. FooListeners are registered using the + * upon this List. 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[] getListeners (Class 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 List. * diff --git a/libjava/classpath/java/awt/MediaTracker.java b/libjava/classpath/java/awt/MediaTracker.java index 8792e1d233d..e69d23e8b7e 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 are 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 cef04a38e1a..c640b5e85c0 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 Menu. * @@ -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 6737d0419f2..3fc5622acf0 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 MenuBar. * @@ -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 163092685e7..fb0f14eb05b 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 getBounds() method. Subclasses * must provide the bounding rectangle via getBounds() - * 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 getBounds() method. Subclasses * must provide the bounding rectangle via getBounds() - * 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 getBounds() method. Subclasses * must provide the bounding rectangle via getBounds() - * 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 *
    * 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 getBounds() method. Subclasses * must provide the bounding rectangle via getBounds() - * 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 getBounds() method. Subclasses * must provide the bounding rectangle via getBounds() - * 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 b80ee4c1a5e..52d0b4ddfb9 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 true to enable this menu item, * false otherwise. */ @@ -325,7 +325,7 @@ setEnabled(boolean enabled) /** * Sets the enabled status of this menu item. - * + * * @param enabled true to enable this menu item, * false 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[] getListeners(Class 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 5216d3474ae..4939438f19c 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 8a853e15346..62d7d30681e 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 38fb696e339..825d0feb3e4 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 64bc07eaf72..87120249187 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 14d44a69b3f..2bbd97677e5 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 403c336cde5..03e91f8bdb1 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; + /** The current vertex of iteration. */ + private int vertex; - public int getWindingRule() - { - return WIND_EVEN_ODD; - } + public int getWindingRule() + { + return WIND_EVEN_ODD; + } - public boolean isDone() - { - return vertex > npoints; - } + public boolean isDone() + { + return vertex > npoints; + } - public void next() - { - vertex++; - } + 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(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; - } + 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; + 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; + 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; + 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 9268678026d..8595300f149 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 PopupMenu. * 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 PopupMenu. * @@ -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 ac2494ee078..1d5a8da0782 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 e98a00c5bab..5de6a608fd0 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 true if the specified value is compatible with * this key, and false otherwise. - * + * * @param value the value (null 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 (null permitted) - * + * * @return A boolean. */ public final boolean equals(Object other) @@ -137,9 +137,9 @@ public class RenderingHints /** * Returns true if the specified value is compatible with * this key, and false otherwise. - * + * * @param value the value (null 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 (null + * + * @param init a map containing a collection of hints (null * permitted). */ public RenderingHints(Map 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 true if there are no hints in the collection, * and false otherwise. - * + * * @return A boolean. */ public boolean isEmpty() @@ -592,11 +592,11 @@ public class RenderingHints /** * Returns true if the collection of hints contains the * specified key, and false otherwise. - * + * * @param key the key (null not permitted). - * + * * @return A boolean. - * + * * @throws NullPointerException if key is null. * @throws ClassCastException if key is not a {@link Key}. */ @@ -611,9 +611,9 @@ public class RenderingHints /** * Returns true if the collection of hints contains the * specified value, and false 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 null * if there is no value defined for the key. - * + * * @param key the key (null permitted). - * + * * @return The value (possibly null). - * + * * @throws ClassCastException if key 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 null 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 null if + * + * @return The value that was associated with the key, or null 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 keySet() @@ -731,9 +731,9 @@ public class RenderingHints /** * Returns a collection of the values from this hint collection. The - * collection is backed by the RenderingHints instance, + * collection is backed by the RenderingHints instance, * so updates to one will affect the other. - * + * * @return A collection of values. */ public Collection values() @@ -743,7 +743,7 @@ public class RenderingHints /** * Returns a set of entries from the collection. - * + * * @return A set of entries. */ public Set> entrySet() @@ -753,9 +753,9 @@ public class RenderingHints /** * Checks this collection for equality with an arbitrary object. - * + * * @param o the object (null 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 485a14e1e0f..30de5ca84b2 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 ec9746f9339..14d15f648fb 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 * ScrollPane 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 ScrollPane. * @@ -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 ca61801bf51..0f2986d591b 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 0cba512f605..4a9e36c3100 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 d76bbaba69d..495a980cbf8 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 (null 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 (null 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 2ead74a0dbd..95bcaa696d6 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 30b278d0c29..265f8c8b6af 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 null, it will be set to "". + * display policy. The TextArea initially contains the specified text. + * If text specified as null, it will be set to "". * * @param text The text to display in this text area (null 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 TextArea. * The context is created, if necessary. diff --git a/libjava/classpath/java/awt/TextComponent.java b/libjava/classpath/java/awt/TextComponent.java index 8fdd94139fc..31ea3f5de5b 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 processTextEvent() 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 b1df66f7cdc..5a58b440d31 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 * setEchoChar() */ 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 * getMinimumSize(int). */ 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 * getPreferredSize(). */ 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 * getPreferredSize(int). */ 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 enableEvents(). - * + * * @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 TextField. * @@ -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 387ccb0fd84..f88e77b23f1 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 b12e9e10dc0..6b1eb9d4b6f 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 desktopProperties = + protected final Map desktopProperties = new Hashtable(); 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 Button. * * @param target The Button to create the peer for. - * + * * @return The peer for the specified Button 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 2a59375ced9..986d1304a1c 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 Window 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 Window 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(); - } + 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(); + 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); - } + // 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()]; + // 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(); - } + 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; + 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 null 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 true as Windows are the + * Returns always true as Windows are the * root of the focus cycle. * * @return Always true. @@ -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 b50048cf94b..ac636fb26ff 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 e2efb3a8946..0eef22e49a6 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); + 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); + 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 3b5948dc8fc..f85533cec9b 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 00393328bbd..cfdbf6e549a 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 2029e2c351b..d0a1d3a3ff3 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]); - } + // 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; - if (newFlavors) - { - FlavorEvent e = new FlavorEvent(this); - for (int i = 0; i < fs.length; i++) - fs[i].flavorsChanged(e); - } + 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 df758254a55..b98059a0ea1 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 baaf43d85bc..e5477043415 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 getRederForText(). */ - 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 java.lang.String. */ - 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 java.util.List, with each + * representation type is a java.util.List, with each * element of the list being a java.io.File. */ - 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 java.awt.Image. */ - 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 plainTextFlavor. */ @@ -202,7 +202,7 @@ public class DataFlavor implements java.io.Externalizable, Cloneable { return plainTextFlavor; } - + /** * Selects the best supported text flavor on this implementation. * Returns null 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) InputStream 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 true if the flavor's MIME type is equal to this + * @return true if the flavor's MIME type is equal to this * object's MIME type, false 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(); + && ! (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)) + 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 DataFlavor 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 * DataFlavor.stringFlavor, or its representation must be * java.io.Reader, java.lang.String, - * java.nio.CharBuffer, java.io.InputStream or + * java.nio.CharBuffer, java.io.InputStream or * java.nio.ByteBuffer, - * If the representation is java.io.InputStream or - * java.nio.ByteBuffer, then this flavor's charset - * 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 java.io.InputStream or + * java.nio.ByteBuffer, then this flavor's charset + * 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. *

    * 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 38b48187175..8a292f85021 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 31b164d6b70..eb388aa8415 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 8d2dcc01d1e..143e8700bda 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 key. * * @param key the parameter key - * + * * @return the parameter for the key */ String getParameter(String key) diff --git a/libjava/classpath/java/awt/datatransfer/StringSelection.java b/libjava/classpath/java/awt/datatransfer/StringSelection.java index b74f2fa6418..4b64cda57c7 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 7f296b5941a..65c14c1ba1c 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 ClassLoaders to + * The map which maps the thread's ClassLoaders to * SystemFlavorMaps. */ 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 Strings to lists of + * This map maps native Strings to lists of * DataFlavors */ private HashMap> nativeToFlavorMap = new HashMap>(); - + /** - * This map maps DataFlavors to lists of native + * This map maps DataFlavors to lists of native * Strings */ private HashMap> flavorToNativeMap = new HashMap>(); - + /** * 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 flavs = nativeToFlavorMap.get(nat); if (flavs == null) { @@ -207,7 +207,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable * @return A Map of data flavors to native type names. */ public Map getFlavorsForNatives (String[] natives) - { + { return new HashMap(); } @@ -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 DataFlavor for use as a String - * native. The format of an encoded DataFlavor is + * native. The format of an encoded DataFlavor is * implementation-dependent. The only restrictions are: *

      *
    • The encoded representation is null if and only if the @@ -313,7 +313,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable * Decodes a String native for use as a Java MIME type. * * @param name the String to decode - * @return the decoded Java MIME type, or null if nat + * @return the decoded Java MIME type, or null if nat * is not an encoded String 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 DataFlavors to which the specified - * String native can be translated by the data transfer - * subsystem. The List will be sorted from best - * DataFlavor to worst. That is, the first DataFlavor - * will best reflect data in the specified native to a Java - * application. + /** + * Returns a List of DataFlavors to which the specified + * String native can be translated by the data transfer + * subsystem. The List will be sorted from best + * DataFlavor to worst. That is, the first DataFlavor + * will best reflect data in the specified native to a Java + * application. *

      - * 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 getFlavorsForNative(String nat) { List ret = new ArrayList(); @@ -402,7 +402,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable } return ret; } - + /** * Adds a mapping from a single String native to a single * DataFlavor. Unlike getFlavorsForNative, 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 flavors = nativeToFlavorMap.get(nativeStr); - if (flavors == null) + if (flavors == null) { flavors = new ArrayList(); nativeToFlavorMap.put(nativeStr, flavors); @@ -438,7 +438,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable flavors.add(flavor); } } - + /** * Adds a mapping from the specified DataFlavor (and all * DataFlavors equal to the specified DataFlavor) @@ -446,7 +446,7 @@ public final class SystemFlavorMap implements FlavorMap, FlavorTable * Unlike getNativesForFlavor, the mapping will only be * established in one direction, and the native will not be encoded. To * establish a two-way mapping, call - * addFlavorForUnencodedNative as well. The new mapping will + * addFlavorForUnencodedNative 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 * DataFlavor to the specified String 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 natives = flavorToNativeMap.get(flavor); - if (natives == null) + if (natives == null) { natives = new ArrayList(); 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 DataFlavor * and all DataFlavors equal to the specified - * DataFlavor, and creates new mappings to the + * DataFlavor, and creates new mappings to the * specified String natives. * Unlike getNativesForFlavor, 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 * String natives, this method will establish new mappings * for the first of those elements and ignore the rest of them. - *

      + *

      * 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 String * 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 80753923618..99239fcc6c7 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 1c1da0348c3..0ca17b2e9d8 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 ba4d4476cfc..094063ce1eb 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 d9f5ec00f1d..30594c2c73e 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 2a22abb12aa..e127a7dc118 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 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 fb37b4fc733..c41402ca7b2 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 cd4a93a3e3f..af8b3766841 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 - createDragGestureRecognizer(Class recognizer, - Component c, - int actions, - DragGestureListener dgl) + createDragGestureRecognizer(Class 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 ed1cbaa4454..e21b4fdaee1 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 7621262d839..4df984994b0 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 c5cd42a4e2b..c9e18d71286 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 63be5ac046d..e5180d074c0 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 DropTarget object. * @@ -175,7 +175,7 @@ public class DropTarget { this (null, DnDConstants.ACTION_COPY_OR_MOVE, null, true, null); } - + /** * Creates a DropTarget object. * @@ -186,7 +186,7 @@ public class DropTarget { this (c, DnDConstants.ACTION_COPY_OR_MOVE, dtl, true, null); } - + /** * Creates a DropTarget object. * @@ -197,7 +197,7 @@ public class DropTarget { this (c, i, dtl, true, null); } - + /** * Creates a DropTarget object. * @@ -208,7 +208,7 @@ public class DropTarget { this (c, i, dtl, b, null); } - + /** * Creates a DropTarget 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 DropTargetListener. - * + * * @exception TooManyListenersException Sun's JDK does not, despite * documentation, throw this exception here when you install an additional * DropTargetListener. 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 d970e2e0881..4c21a6e8adf 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 58feb438767..21c9e2b35ce 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 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 dd85ef712c5..333f8c6cc5c 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 DropTargetDropEvent. 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 cb2aec6402e..fc599a9e2fc 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 9a2a7bc4c79..08a2ac085ed 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 MouseDragGestureRecognizer 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 6eae29b3810..2f4da5ff395 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 * DropTargetListener. Occurs when a Component - * with an associated DropTarget and visible geometry is first + * with an associated DropTarget 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 079a91dd4c9..3f30df46e02 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 937d2cf5363..776ab04be2a 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 6b4893f0fc2..cb1c0dae922 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 156a3e2ad45..3fd86853b78 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 b9dad3278bd..241630ca3f1 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 e0be40d5a67..1542bcc9f44 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 6f39d6b9130..afa09de131d 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 run() 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 bb7ed4c2dc7..a2b1dc94c15 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 KeyEvent 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 86a584c4103..64142ecc6ce 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 4508019e108..735ca6b5a91 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 MouseEvent for the exit diff --git a/libjava/classpath/java/awt/event/MouseWheelEvent.java b/libjava/classpath/java/awt/event/MouseWheelEvent.java index d1d22d21866..1ca94658269 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 1298e1ad8ba..b52fefcdcb3 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 c25bae3ec16..8d530ec5f97 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 FontRenderContext. */ @@ -56,7 +56,7 @@ public class FontRenderContext { // Do nothing here. } - + /** * Construct a new FontRenderContext. */ @@ -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 5f45fd58498..cfa64f05e9a 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 0a78d3052f6..b41b7f45b55 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 f4cb01b9534..4a87f4c62c7 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 19f781bcc29..edf0c204d9c 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 3e4fdcf733f..63fff410184 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 278bc847632..d11f20d1ffc 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 3c45ad19a6e..d43fd98bbb6 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 57417ea6010..1be44bd753f 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 ece3279cc7f..e992d0700f3 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 06814972b06..8d6891632ef 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 6f5ed59f915..bfade21bb73 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 f6fee1addae..17479b09edf 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 4346ab91d53..c4f1742453d 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 attributes, - FontRenderContext frc) + Map 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; + 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); - } + 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(); + 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; + 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. + 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(); + 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 f4430bf6dfa..e443e8bc7cc 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 - * AttributedCharacterIterator and a + * AttributedCharacterIterator and a * FontRenderContext. - */ + */ 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 977cafa032e..56d15bb0b8f 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 immutable attribute (for example, in the - * {@link java.text.AttributedString} class). Any transform passed to + * an immutable 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 (null not permitted). - * - * @throws IllegalArgumentException if transform is + * + * @throws IllegalArgumentException if transform is * null. */ - 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 true if the transform contained by this attribute is * an identity transform, and false otherwise. - * + * * @return true if the transform contained by this attribute is * an identity transform, and false 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 5bc51ddee81..42590efce9c 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 ] * * 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); * * - *

      The resulting matrix is: + *

      The resulting matrix is: * 

          * [ 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);
    *
      * - *

      The resulting matrix is: + *

      The resulting matrix is: * 

          * [ 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:
-   * 
+   *
    * 
          *
    * 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, null if src is 
+   * @return the shape, transformed by this, null if src is
    * null.
    * @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 eb9a160932a..928c5cfc899 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 ad20b535f68..a1eaf63f3c3 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 (null not permitted).
-   * 
+   *
    * @throws NullPointerException if s is null.
    */
   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;
+        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;
+        // 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
+        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;
+        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 (null
    *              permitted).
    * @return true if the areas are equal, and false
@@ -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 true if the point is contained, false 
+   * @return true if the point is contained, false
    *         otherwise.
    * @throws NullPointerException if p is null.
    */
@@ -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 true if the rectangle is considered contained
-   * 
+   *
    * @throws NullPointerException if r is null.
    */
   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 true if the rectangle intersects the area, 
+   * @return true if the rectangle intersects the area,
    *         false 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 (null
    *           not permitted).
-   * @return true if the rectangle intersects the area, 
+   * @return true if the rectangle intersects the area,
    *         false otherwise.
    * @throws NullPointerException if r is null.
    */
@@ -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;
+          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);
+          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);
+          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);
+          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);
+        // 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);
+        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 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 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;
+        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;
+        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 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[] 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);
+        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 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;
+                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];
+        Intersection[] rValues = new Intersection[intersections];
 
-	for (int i = 0; i < nRoots; i++)
-	  if (temp[i] != null)
-	    rValues[--intersections] = temp[i];
-	return (rValues);
+        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);
+        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 (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;
+        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[] 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;
+        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;
-	      }
+          // 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]));
+            // 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;
+                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;
-	      }
+                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();
+            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);
+        do
+          {
+            nNodes += a.splitIntersections(b);
+            b = b.next;
+          }
+        while (b != B);
 
-	a = a.next; // move to the next segment
+        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;
+        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);
+        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
+              // 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;
+          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);
+          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++;
-	      }
+          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;
+          // 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]);
+          if (x.length == 1)
+            return createNode(b, (Intersection) x[0]);
 
-	  return createNodes(b, x);
+          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;
+          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;
+          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 ((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 d0d55984fd8..5cb11fe7745 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);
+        /* 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 (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;
+        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;
+        // 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.
    *
    * 
      = 2;
-	}
+        public boolean isDone()
+        {
+          return current >= 2;
+        }
 
-	public void next()
-	{
-	  current++;
-	}
+        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(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;
-	}
+        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 e8830770f60..3bbf2f0104b 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 true if the ellipse encloses no area, and
      * false otherwise.
-     * 
+     *
      * @return A boolean.
      */
     public boolean isEmpty()
@@ -368,7 +368,7 @@ public abstract class Ellipse2D extends RectangularShape
     /**
      * Returns true if the ellipse encloses no area, and
      * false 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 b06e6cc47b8..629936bf76b 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 fa27d1908c7..99f1905e24e 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;
  *
  * 
      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 A in the image is outside (one intersection in the 
+ * Point A in the image is outside (one intersection in the
  * ’up’
- * direction, one in the ’down’ direction) Point B in 
+ * direction, one in the ’down’ direction) Point B in
  * the image is inside (one intersection ’down’)
- * Point C in the image is inside (two intersections in the 
+ * Point C in the image is inside (two intersections in the
  * ’down’ 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 rule 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 rule 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 (null not permitted).
-   * 
+   *
    * @throws NullPointerException if shape is null.
    */
   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 connect is 
+   * Appends the segments of a Shape to the path. If connect 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 (null not permitted).
    * @param connect  whether to connect the new shape to the existing path.
-   * 
+   *
    * @throws NullPointerException if s is null.
    */
   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;
+        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;
-	  }
+          // 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();
+        connect = false;
+        iter.next();
       }
   }
 
   /**
    * Returns the path’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’s winding rule, which controls which areas are 
-   * considered ’inside’ or ’outside’ the path 
-   * on drawing. Valid rules are WIND_EVEN_ODD for an even-odd winding rule, 
+   * Sets the path’s winding rule, which controls which areas are
+   * considered ’inside’ or ’outside’ 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 (null 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];
-	    }
+          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);
+          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;
+        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;
+                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;
+                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;
+            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;
+            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;
+            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;
+            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;
+            /* 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);
+                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;
-		        }
-		    }
-	      }
+                /* 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;
+            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;
+            /* 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;
+                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;
-		        }
-		    }
-	      }
+                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;
-	  }
+            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 e15e7cfe3f5..c92aab004b3 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 true 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)->(x2,y2) intersects the line segment 
+   * Test if the line segment (x1,y1)->(x2,y2) intersects the line segment
    * (x3,y3)->(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 d247c79a5d5..62c829d30c5 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;
+        /** Current coordinate. */
+        private int current = 0;
 
-	public int getWindingRule()
-	{
-	  return WIND_NON_ZERO;
-	}
+        public int getWindingRule()
+        {
+          return WIND_NON_ZERO;
+        }
 
-	public boolean isDone()
-	{
-	  return current >= 2;
-	}
+        public boolean isDone()
+        {
+          return current >= 2;
+        }
 
-	public void next()
-	{
-	  current++;
-	}
+        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(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;
-	}
+        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 3ee1615413f..68bc451ccc4 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 ac4d89fff80..19a7b423700 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 c2e09b6d112..8667272b866 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 recent 
+  private final HashMap recent
     = new HashMap();
 
   /** 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 d234e5c57f3..ce40ab2b6f5 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 df9db7d9636..460804f9012 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 491a2f51903..db2335f1c34 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.
  * 
      
  *
- * @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 AreaAveragingScaleFilter which
    * should be used in conjunction with a FilteredImageSource
    * 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 ImageProducer should call this method with a
    * bit mask of hints from any of RANDOMPIXELORDER,
    * TOPDOWNLEFTRIGHT, COMPLETESCANLINES,
-   * SINGLEPASS, SINGLEFRAME from the 
+   * SINGLEPASS, SINGLEFRAME from the
    * ImageConsumer interface.
    * 
      
-   * FIXME - more than likely Sun's implementation desires 
+   * FIXME - more than likely Sun's implementation desires
    * TOPDOWNLEFTRIGHT 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 byte 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 pixels array
    * @param scansize the width to use in extracting pixels from the pixels 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 int 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 pixels array
    * @param scansize the width to use in extracting pixels from the pixels 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);
+        {
+          sx = (int) (x * rx);
+          sy = (int) (y * ry);
 
-	  int r,g,b,a;
-	  r = g = b = a = 0;
+          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);
+          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 ]);
+                }
+            }
 
-	  // Does this really work?
-	  destPixels[x + destScansize*y] = (byte)model.getDataElement
-	    (new int[]{r, g, b, a}, 0);
-	}
+          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);
+        {
+          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);
+        }
 
-	  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 d9ce16fad07..f3a6c575639 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 94dbd8d4669..7df6c854890 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 BandedSampleModel.
-   * 
+   *
    * @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 BandedSampleModel.
-   * 
+   *
    * @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 SampleModel 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 w or h is
    *     not greater than zero.
-   * @throws IllegalArgumentException if w * h exceeds 
+   * @throws IllegalArgumentException if w * h exceeds
    *     Integer.MAX_VALUE.
    */
   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
    *     obj.
-   * @param y The y-coordinate of the pixel rectangle to store in 
+   * @param y The y-coordinate of the pixel rectangle to store in
    *     obj.
-   * @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 (x, y)
    * 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 null, a new
    *   array is created.
    * @param data  the data buffer (null 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 0 to 
+   * @param b  the band (in the range 0 to
    *     getNumBands() - 1).
    * @param data  the data buffer (null not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if data is null.
    */
   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 0 to 
+   * @param b  the band (in the range 0 to
    *     getNumBands() - 1).
    * @param data  the data buffer (null not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if data is null.
-   * 
+   *
    * @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 0 to 
+   * @param b  the band (in the range 0 to
    *     getNumBands() - 1).
    * @param data  the data buffer (null not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
+   *
    * @throws NullPointerException if data is null.
-   * 
+   *
    * @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 (null not permitted).
    * @param data  the data buffer (null not permitted).
-   * 
-   * @throws NullPointerException if either iArray or 
+   *
+   * @throws NullPointerException if either iArray or
    *     data is null.
    */
   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 (null not permitted).
    * @param data  the data buffer (null not permitted).
-   * 
-   * @throws NullPointerException if either iArray or 
+   *
+   * @throws NullPointerException if either iArray or
    *     data is null.
    */
   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 b of the pixel at location
    * (x, y) 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 (null 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 0 to 
+   * @param b  the band (in the range 0 to
    *     getNumBands() - 1).
    * @param s  the sample value.
    * @param data  the data buffer (null not permitted).
-   * 
+   *
    * @throws NullPointerException if data is null.
    */
   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 0 to 
+   * @param b  the band (in the range 0 to
    *     getNumBands() - 1).
    * @param s  the sample value.
    * @param data  the data buffer (null not permitted).
-   * 
+   *
    * @throws NullPointerException if data is null.
    */
   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 0 to 
+   * @param b  the band (in the range 0 to
    *           getNumBands() - 1      ).
    * @param iArray  the sample values (null not permitted).
    * @param data  the data buffer (null not permitted).
-   * 
-   * @throws NullPointerException if either iArray or 
+   *
+   * @throws NullPointerException if either iArray or
    *     data is null.
    */
   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 260d254fd65..094c71dd1aa 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 tileObservers;
-  
+
   /**
    * The image's WritableRaster
    */
@@ -115,7 +115,7 @@ public class BufferedImage extends Image
   /**
    * Creates a new BufferedImage with the specified width, height
    * and type.  Valid type values are:
-   * 
+   *
    * 
        
    *   
      • {@link #TYPE_INT_RGB}
        • 
    *   
      • {@link #TYPE_INT_ARGB}
        • 
@@ -131,11 +131,11 @@ public class BufferedImage extends Image
    *   
      • {@link #TYPE_BYTE_BINARY}
        • 
    *   
      • {@link #TYPE_BYTE_INDEXED}
        • 
    * 
      
-   * 
+   *
    * @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 width or
    *     height is less than or equal to zero.
    * @throws IllegalArgumentException if type 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 true, 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 (null not permitted).
-   * 
+   *
    * @return The property value.
-   * 
+   *
    * @throws NullPointerException if string is null.
    */
   public Object getProperty(String string)
@@ -511,7 +511,7 @@ public class BufferedImage extends Image
 
   /**
    * Returns null always.
-   * 
+   *
    * @return null 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 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();
-	
+
     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 50d627d66a3..04b6672c603 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 f6a24c976ab..1aba4bb09bc 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 BufferedImage (the 
+ * An operation that is performed on one BufferedImage (the
  * source) producing a new BufferedImage (the destination).
  */
 public interface BufferedImageOp
 {
   /**
    * Performs an operation on the source image, returning the result in a
-   * BufferedImage.  If dest is null, a 
+   * BufferedImage.  If dest is null, a
    * new BufferedImage will be created by calling the
    * {@link #createCompatibleDestImage} method.  If dest
-   * is not null, the result is written to dest then 
-   * returned (this avoids creating a new BufferedImage each 
+   * is not null, the result is written to dest then
+   * returned (this avoids creating a new BufferedImage each
    * time this method is called).
-   * 
+   *
    * @param src  the source image.
    * @param dst  the destination image (null permitted).
-   * 
+   *
    * @return The filterd image.
    */
   BufferedImage filter(BufferedImage src, BufferedImage dst);
-  
+
   /**
    * Returns the bounds of the destination image on the basis of this
    * BufferedImageOp being applied to the specified source image.
-   * 
+   *
    * @param src  the source image.
-   * 
+   *
    * @return The destination bounds.
    */
   Rectangle2D getBounds2D(BufferedImage src);
-  
+
   /**
-   * Returns a new BufferedImage that can be used by this 
-   * BufferedImageOp as the destination image when filtering 
+   * Returns a new BufferedImage that can be used by this
+   * BufferedImageOp 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 (null 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 ecc0023aff6..89804c55b9c 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 (null not permitted).
    * @exception IllegalArgumentException if offset < 0 or data.length < 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 (null not 
+   * @param data Lookup table for all components (null not
    *     permitted).
    * @exception IllegalArgumentException if offset < 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 e6c85412d34..b1d6f857d91 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 005b8d45ffe..ede9e31d8f3 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;
  *
  * 
    • sRGB pixel int value: a pixel in sRGB color space, encoded in
  * default 0xAARRGGBB format, assumed not alpha premultiplied.
      • 
- * 
+ *
  * 
    • single [0, 255] scaled int samples from default sRGB color
  * space. These are always assumed to be alpha non-premultiplied.
      • 
  *
@@ -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 getRGBdefault 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.
-   * 
+   *
    * 
      This method performs the inverse function of
    * getRGB(Object inData).
    *
@@ -379,7 +379,7 @@ public abstract class ColorModel implements Transparency
    * 
    • Scale the components to the correct number of bits.
      • 
    *
    * 
    • Arrange the components in the output array
      • 
-   * 
+   *
    * 
    *
    * @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; igetComponents(int pixel, int[] components,
-   *			       int offset). I.e.
+   *                           int offset). I.e.
    *
    * (pixel == cm.getDataElement(cm.getComponents(pixel, null,
    * 0), 0)).
@@ -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 e1e85e1912a..ef0b84f001f 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= 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> 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
    * Note that the bandOffsets 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 (null
    *   not permitted).
-   *   
+   *
    * @throws IllegalArgumentException if dataType is not one of
    *   the specified values.
    * @throws IllegalArgumentException if w is less than or equal
    *   to zero.
-   * @throws IllegalArgumentException if h is less than or equal 
+   * @throws IllegalArgumentException if h is less than or equal
    *   to zero.
    * @throws IllegalArgumentException if w * h exceeds
    *   {@link Integer#MAX_VALUE}.
    * @throws IllegalArgumentException if pixelStride is negative.
-   * @throws IllegalArgumentException if scanlineStride is less 
+   * @throws IllegalArgumentException if scanlineStride is less
    *   than or equal to zero.
-   * @throws IllegalArgumentException if bandOffsets has zero 
+   * @throws IllegalArgumentException if bandOffsets 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
    *   (null 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 (null
-   *   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 dataType is not one of
    *   the specified values.
    * @throws IllegalArgumentException if w is less than or equal
    *   to zero.
-   * @throws IllegalArgumentException if h is less than or equal 
+   * @throws IllegalArgumentException if h is less than or equal
    *   to zero.
    * @throws IllegalArgumentException if w * h exceeds
    *   {@link Integer#MAX_VALUE}.
    * @throws IllegalArgumentException if pixelStride is negative.
-   * @throws IllegalArgumentException if scanlineStride is less 
+   * @throws IllegalArgumentException if scanlineStride is less
    *   than or equal to zero.
-   * @throws IllegalArgumentException if bandOffsets has zero 
+   * @throws IllegalArgumentException if bandOffsets 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 (null 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
    * (x, y).  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 b for the pixel at
    * location (x, y).  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 (x, y) 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 obj argument provides an option to supply
    * an existing array to hold the result, if this is null a new
    * array will be allocated.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * @param obj  a primitive array that, if not null, will be 
+   * @param obj  a primitive array that, if not null, will be
    *   used to store and return the sample values.
    * @param data  the data buffer (null 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 (x, y)
    * 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 null, a new
    *   array is created.
    * @param data  the data buffer (null 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-null will be populated 
+   * @param iArray  an array that if non-null will be populated
    *   with the sample values and returned as the result.
    * @param data  the data buffer (null 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 b of the pixel at 
+   * Returns the sample for band b of the pixel at
    * (x, y) 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 (null not permitted).
-   * 
+   *
    * @return The sample value.
-   * 
-   * @throws ArrayIndexOutOfBoundsException if (x, y) is outside 
+   *
+   * @throws ArrayIndexOutOfBoundsException if (x, y) is outside
    *     the bounds [0, 0, width, height].
-   *     
+   *
    * @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 (x, y) from the 
-   * supplied primitive array (the array type must be consistent with the data 
+   * Sets the samples for the pixel at location (x, y) 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 (null 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 (x, y)
    * stored in the specified data buffer.
-   * 
+   *
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
    * @param iArray  the pixel sample values (null not permitted).
    * @param data  the data buffer (null 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 b of the pixel at location
    * (x, y) 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 (null 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
    * true if and only if:
@@ -700,10 +700,10 @@ public class ComponentSampleModel extends SampleModel
    *   scanlineStride, bandOffsets and
    *   bankIndices fields.
      • *
    - * + * * @param obj the object to test (null permitted). - * - * @return true if this sample model is equal to + * + * @return true if this sample model is equal to * obj, and false 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 cf30e762599..10b85f44670 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 edgeOp is EDGE_ZERO_FILL) or the + * zero values (if edgeOp is EDGE_ZERO_FILL) or the * corresponding pixel values from the source raster (if edgeOp - * is EDGE_NO_OP). This utility method is called by the + * is EDGE_NO_OP). 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 53b41562044..4d8fb624f4a 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 *
    * 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 byte 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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); + 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); + 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; + 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); - } + 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 int 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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); + 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); + 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; + 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); - } + 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 5a2cfd3b0e5..78bc75ba510 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 short + * A constant representing a data type that uses short * primitives as the storage unit. */ public static final int TYPE_USHORT = 1; /** - * A constant representing a data type that uses short + * A constant representing a data type that uses short * primitives as the storage unit. */ public static final int TYPE_SHORT = 2; /** - * A constant representing a data type that uses int + * A constant representing a data type that uses int * primitives as the storage unit. */ public static final int TYPE_INT = 3; - + /** - * A constant representing a data type that uses float + * A constant representing a data type that uses float * primitives as the storage unit. */ public static final int TYPE_FLOAT = 4; /** - * A constant representing a data type that uses double + * A constant representing a data type that uses double * 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 DataBuffer with the specified data type and - * size. The dataType should be one of the constants - * {@link #TYPE_BYTE}, {@link #TYPE_SHORT}, {@link #TYPE_USHORT}, + * size. The dataType 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}. *

    * 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 DataBuffer with the specified data type, - * size and number of banks. The dataType 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 dataType 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}. *

    * 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 DataBuffer with the specified data type, * size and number of banks. An offset (which applies to all banks) is - * also specified. The dataType 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 dataType 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}. *

    * 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 DataBuffer with the specified data type, * size and number of banks. An offset (which applies to all banks) is - * also specified. The dataType 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 dataType 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}. *

    * 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 * numBanks != offsets.length. */ 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 dataType < 0 or + * @throws IllegalArgumentException if dataType < 0 or * dataType > TYPE_DOUBLE. */ 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 * DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 - * float. The offset (specified in the constructor) is added + * Returns an element from the first data bank, converted to a + * float. The offset (specified in the constructor) is added * to i 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 - * float. The offset (specified in the constructor) is + * Returns an element from a particular data bank, converted to a + * float. The offset (specified in the constructor) is * added to i 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 i 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 i 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 * double. The offset (specified in the constructor) is added * to i 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 - * double. The offset (specified in the constructor) is + * Returns an element from a particular data bank, converted to a + * double. The offset (specified in the constructor) is * added to i 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 i 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 i 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 1113ebb7843..01364b07aec 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 byte 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 byte 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 byte 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 a8c4b9d0558..31c5ebd8cd4 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 double 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 double 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 double 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 9cf8784d78c..44a0a3892ca 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 float 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 float 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 float 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 0aac9404067..db9d5bc301e 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 int 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 int 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 int 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @return The data banks. */ public int[][] getBankData() { return bankData; } - + /** * Returns an element from the first data bank. The offset 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 offset - * is added to the specified index before accessing the underlying data + * Returns an element from a particular data bank. The offset + * 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 i 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 i 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 5c67a8d3c3f..2156d75712a 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 short 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 short 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 short 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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. *

    - * Note: there is no exception when dataArray is + * Note: there is no exception when dataArray is * null, 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 981e9e9d2fd..d2cadcf0b5a 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 short 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 short 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 short 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 dataArray is + * + * @throws NullPointerException if dataArray is * null. */ 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 DataBuffer. - * + * * @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 i before accessing the + * the constructor) is added to i 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 i before accessing the + * the constructor) is added to i 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 i 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 i 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 3d43c764237..a464fed305a 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. *
    @@ -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. *
    * * @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 * getRGB(Object inData). * * @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>> 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; cImageConsumer with this - * ImageProducer. + * ImageProducer. */ 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 ImageConsumer is - * already registered with this ImageProducer. + * already registered with this ImageProducer. */ 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 ImageConsumer from the list of - * registered consumers for this ImageProducer. + * registered consumers for this ImageProducer. */ 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 ImageConsumer with this * ImageProducer 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 ImageConsumer with this * ImageProducer 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 11f64f97867..8f3c2b14484 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 ImageProducer 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 ImageConsumer. * - * @see #setHints + * @see #setHints */ int RANDOMPIXELORDER = 1; @@ -75,7 +75,7 @@ public interface ImageConsumer * most one call to setPixels 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 imageComplete with the * SINGLEFRAMEDONE 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 ImageProducer 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 ImageProducer 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 * ColorModel. * * @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 RANDOMPIXELORDER, * TOPDOWNLEFTRIGHT, COMPLETESCANLINES, * SINGLEPASS, SINGLEFRAME. - * + * * @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 ImageProducer 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 0ead45a4ae0..10df82e2520 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 getFilterInstance. + * It is initialized in the method getFilterInstance. */ protected ImageConsumer consumer = null; /** * The ImageConsumer can use this method to request - * the pixels be delivered in top-down, left-right order. - *
    - * The filter can respond in three different ways. + * the pixels be delivered in top-down, left-right order. + *
    + * The filter can respond in three different ways. *

      - *
    • The default behavior is to forward the request to the - * ImageProducer + *
    • The default behavior is to forward the request to the + * ImageProducer * using the method requestTopDownLeftRightResend * and using the filter as the consumer.
      • *
    • 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 - * Object.clone() + * Object.clone() * * @see java.lang.Object#clone () */ @@ -98,7 +98,7 @@ public class ImageFilter implements ImageConsumer, Cloneable /** * This is the only method which can set the * ImageConsumer 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 ImageProducer 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 setDimensions 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 ImageProducer 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 ImageProducer should call this method with a * bit mask of hints from any of RANDOMPIXELORDER, * TOPDOWNLEFTRIGHT, COMPLETESCANLINES, - * SINGLEPASS, SINGLEFRAME from the + * SINGLEPASS, SINGLEFRAME from the * ImageConsumer 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 byte 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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 int 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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 ImageProducer 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 36dd013f4e9..e63d4bba153 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; * ImageProducer 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 * width argument to imageUpdate. * - * @see #imageUpdate + * @see #imageUpdate */ int WIDTH = 1; @@ -62,7 +62,7 @@ public interface ImageObserver * The height of the image has been provided as the * height argument to imageUpdate. * - * @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 49846685a3e..c0f9ad4c780 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 ImageConsumer with this - * ImageProducer. + * ImageProducer. */ void addConsumer(ImageConsumer ic); /** * Used to determine if the given ImageConsumer is - * already registered with this ImageProducer. + * already registered with this ImageProducer. */ boolean isConsumer(ImageConsumer ic); /** * Used to remove an ImageConsumer from the list of - * registered consumers for this ImageProducer. + * registered consumers for this ImageProducer. */ void removeConsumer(ImageConsumer ic); @@ -71,15 +71,14 @@ public interface ImageProducer * Used to register an ImageConsumer with this * ImageProducer 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 ImageConsumer with this * ImageProducer 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 d8a27d51ff1..340d38e89fe 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. *

      - * The IndexColorModel 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 IndexColorModel 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. *

      * 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. *

      - * IndexColorModel supports anywhere from 1 to 16 bit index - * values. The allowed transfer types are {@link DataBuffer#TYPE_BYTE} and + * IndexColorModel 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 size color elements - * with no alpha component. Each array must contain at least - * size 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 size color elements + * with no alpha component. Each array must contain at least + * size 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 size + * @param bits the number of bits needed to represent size * 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 bits < 1 or + * @throws IllegalArgumentException if bits < 1 or * bits > 16. * @throws NullPointerException if any of the arrays is null. - * @throws ArrayIndexOutOfBoundsException if size is greater + * @throws ArrayIndexOutOfBoundsException if size 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 size color elements. - * Each array must contain at least size 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 size 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 size + * @param bits the number of bits needed to represent size * 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 bits < 1 or + * + * @throws IllegalArgumentException if bits < 1 or * bits > 16. * @throws NullPointerException if any of the arrays is null. - * @throws ArrayIndexOutOfBoundsException if size is greater + * @throws ArrayIndexOutOfBoundsException if size 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 size color elements - * including alpha. Each array must contain at least size - * 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 size color elements + * including alpha. Each array must contain at least size + * 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 size + * @param bits the number of bits needed to represent size * 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 (null + * @param alphas the alpha component of all colors (null * permitted). * - * @throws IllegalArgumentException if bits < 1 or + * @throws IllegalArgumentException if bits < 1 or * bits > 16. * @throws NullPointerException if reds, greens or * blues is null. - * @throws ArrayIndexOutOfBoundsException if size is greater + * @throws ArrayIndexOutOfBoundsException if size 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 * cmap. If hasAlpha is true then * cmap contains an alpha component after each of the red, green * and blue components. * - * @param bits the number of bits needed to represent size + * @param bits the number of bits needed to represent size * 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 cmap * @param hasAlpha cmap has alpha values - * @throws IllegalArgumentException if bits < 1, bits > 16, or size + * @throws IllegalArgumentException if bits < 1, bits > 16, or size * < 1. * @throws NullPointerException if cmap is null. */ - 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 size + * + * @param bits the number of bits needed to represent size * 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 * < 1. * @throws NullPointerException if cmap is null. */ - 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 size + * @param bits the number of bits needed to represent size * 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 cmap * @param hasAlpha cmap 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 < 1, bits > 16, or size * < 1. * @throws IllegalArgumentException if transferType 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 *

      * 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 size + * corresponding bit in validBits is set. + * + * @param bits the number of bits needed to represent size * 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 cmap. - * @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 cmap. * @throws IllegalArgumentException if bits < 1, bits > 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 r is null. - * @throws ArrayIndexOutOfBoundsException if r has less - * than {@link #getMapSize()} elements. + * @throws ArrayIndexOutOfBoundsException if r 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 g is null. - * @throws ArrayIndexOutOfBoundsException if g has less - * than {@link #getMapSize()} elements. + * @throws ArrayIndexOutOfBoundsException if g 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 b is null. - * @throws ArrayIndexOutOfBoundsException if b has less - * than {@link #getMapSize()} elements. + * @throws ArrayIndexOutOfBoundsException if b 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 a is null. - * @throws ArrayIndexOutOfBoundsException if a has less - * than {@link #getMapSize()} elements. + * @throws ArrayIndexOutOfBoundsException if a 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 pixel 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 true if the lookup table contains valid data for + + /** + * Return true if the lookup table contains valid data for * pixel, and false otherwise. * * @param pixel the pixel value used to index the color lookup table. - * @return true if pixel is valid, + * @return true if pixel is valid, * false otherwise. */ public boolean isValid(int pixel) @@ -626,12 +626,12 @@ public class IndexColorModel extends ColorModel return validBits.testBit(pixel); return false; } - - /** - * Return true if all pixels are valid, false + + /** + * Return true if all pixels are valid, false * otherwise. * - * @return true if all pixels are valid, false + * @return true if all pixels are valid, false * 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 8361c0cf97d..ae0ff14695d 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 (null not permitted). - * + * * @throws IllegalArgumentException if data.length is less than * width * height. - * @throws IllegalArgumentException if width or + * @throws IllegalArgumentException if width or * height is less than zero. * @throws NullPointerException if data is null. */ @@ -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 * (width - 1) / 2. - * + * * @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 * (height - 1) / 2. - * + * * @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 * data argument is non-null, the kernel values * are copied into it and then data is returned as the result. - * If the data argument is null, this method + * If the data argument is null, 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 * null, a new array is allocated). - * + * * @return The array with copied values. - * - * @throws IllegalArgumentException if data.length is less than + * + * @throws IllegalArgumentException if data.length is less than * the kernel's width * height. */ 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 5b0cf783168..0bc79a00b68 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 f814b8e090b..d104b2fd57f 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 83a03ca449c..e8780f6f556 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 (null permitted). + * @param props image properties (null 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 (null permitted). + * @param props image properties (null 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 (null permitted). + * @param props image properties (null 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 ImageConsumer with this * ImageProducer. - * + * * @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 ImageConsumer is * already registered with this ImageProducer. - * + * * @param ic the image consumer. */ public synchronized boolean isConsumer(ImageConsumer ic) @@ -205,7 +205,7 @@ public class MemoryImageSource implements ImageProducer /** * Used to remove an ImageConsumer from the list of * registered consumers for this ImageProducer. - * + * * @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 ImageConsumer with this * ImageProducer 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); + 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); - } - } + 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 8db26b52d42..592611cbbbf 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 *
    • {@link DataBuffer#TYPE_USHORT};
      • *
    • {@link DataBuffer#TYPE_INT};
      • *
    - * + * * @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 *
  • {@link DataBuffer#TYPE_USHORT};
    • *
  • {@link DataBuffer#TYPE_INT};
    • * - * + * * @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 MultiPixelPackedSample 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 1. */ 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 MultiPixelPackedSampleModel class supports only - * one band, so this method returns an array with length 1. - * - * @return An array containing the size (in bits) of the samples in band zero. - * + * one band, so this method returns an array with length 1. + * + * @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 * MultiPixelPackedSampleModel supports only one band -- this * method ignored the band 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 *
  • {@link DataBuffer#TYPE_USHORT};
    • *
  • {@link DataBuffer#TYPE_INT};
    • * - * + * * @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 MultiPixelPackedSampleModel, 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-null a check is made to ensure that the * array length is equal to 1). - * - * @throws RasterFormatException if bands is not + * + * @throws RasterFormatException if bands is not * null and bands.length != 1. */ 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 * obj. - * @param y The y-coordinate of the pixel rectangle to store in + * @param y The y-coordinate of the pixel rectangle to store in * obj. - * @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 iArray is not - * null, 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 iArray is not + * null, 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return An array containing the pixel sample value. - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param data the data buffer (null not permitted). - * + * * @return The sample value. - * + * * @throws NullPointerException if data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. - * + * * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param s the sample value. * @param data the data buffer (null not permitted). - * + * * @throws NullPointerException if data is null. */ 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 true if and only if: *
      *
    • obj is not null; - *
    • obj is an instance of + *
    • obj is an instance of * MultiPixelPackedSampleModel; *
    • both models have the same: *
        @@ -535,17 +535,17 @@ public class MultiPixelPackedSampleModel extends SampleModel *
      *
      • *
    - * + * * @param obj the object (null permitted) - * + * * @return true if this model is equal to obj, and * false 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 MultiPixelPackedSampleModel. - * + * * @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 b60230fa70d..a89d73b8cce 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= 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 RANDOMPIXELORDER, * TOPDOWNLEFTRIGHT, COMPLETESCANLINES, * SINGLEPASS, SINGLEFRAME. - * + * * 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; + 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; + int_pixel_buffer[i] = currentModel.getRGB (pixels[p] & 0xFF); + } + else + { + bytes_delivered = true; - byte_pixel_buffer[i] = pixels[p]; - } - } - } + 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 3a0d4152c7d..13134b41336 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 SampleModel 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 3cd14239c99..1354c3a802e 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 int 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 615155fb3f9..6d99c3683a1 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 iArray is not null, it will be + * raster. If iArray is not null, 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 null, 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 fArray is not null, it will be + * raster. If fArray is not null, 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 null, 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 dArray is not null, it will be + * raster. If dArray is not null, 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 null, 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 iArray is not null, 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 iArray is not null, 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 null, 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 fArray is not null, 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 fArray is not null, 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 null, 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 dArray is not null, 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 dArray is not null, 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 null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * + * * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * + * * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * + * * @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 - * iArray is not null, 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 + * iArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, 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 - * fArray is not null, 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 + * fArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, 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 - * dArray is not null, 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 + * dArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, 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: *
      *
    • {@link DataBuffer#TYPE_BYTE};
      • @@ -947,9 +947,9 @@ public class Raster *
    • {@link DataBuffer#TYPE_DOUBLE};
      • *
    * 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 656370e8bcc..2b2c0731f33 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 dest is null, a new * WritableRaster will be created by calling the * {@link #createCompatibleDestRaster(Raster)} method. If dest - * is not null, the result is written to dest then - * returned (this avoids creating a new WritableRaster each + * is not null, the result is written to dest then + * returned (this avoids creating a new WritableRaster each * time this method is called). - * + * * @param src the source raster. * @param dest the destination raster (null 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 * RasterOp 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 RasterOp 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 (null 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 067e9b98e38..fd18871a91f 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 5ba03f182f6..94aad85dd5b 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; *
    * 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 ImageProducer 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 setDimensions 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 / srcHeight; - } - else if (destHeight < 0) - { - destHeight = height * destWidth / srcWidth; - } + destWidth = width; + destHeight = height; + } + else if (destWidth < 0) + { + 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 ImageProducer 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 byte 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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 int 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 pixels array * @param scansize the width to use in extracting pixels from the pixels 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 d56b12cb952..efab40b7e59 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 506e78a9b87..7e0b18c552d 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 SampleModel is used to access pixel data from a + * A SampleModel 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 dataType is not one of + * + * @throws IllegalArgumentException if dataType is not one of * the listed values. * @throws IllegalArgumentException if w is less than or equal * to zero. - * @throws IllegalArgumentException if h is less than or equal + * @throws IllegalArgumentException if h is less than or equal * to zero. * @throws IllegalArgumentException if w * h 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 * SampleModel. - * + * * @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 * SampleModel. - * + * * @return The height. - * + * * @see #getWidth() */ public final int getHeight() @@ -131,20 +131,20 @@ public abstract class SampleModel /** * Returns the number of bands for this SampleModel. - * + * * @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 * SampleModel accesses. - * + * * @return The data buffer type. */ public final int getDataType() @@ -163,26 +163,26 @@ public abstract class SampleModel * specified data buffer. If iArray is not null, * 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 fArray is not null, * 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 dArray is not null, * 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 iArray is not null, it will be - * populated with the sample values and returned as the result of this + * on). If iArray is not null, 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 fArray is not null, it will be - * populated with the sample values and returned as the result of this + * on). If fArray is not null, 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 dArray is not null, it will be - * populated with the sample values and returned as the result of this + * on). If dArray is not null, 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param data the data buffer (null not permitted). - * + * * @return The sample value. - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param data the data buffer (null not permitted). - * + * * @return The sample value. - * + * * @throws NullPointerException if data is null. - * + * * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param data the data buffer (null not permitted). - * + * * @return The sample value. - * + * * @throws NullPointerException if data is null. - * + * * @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 - * iArray is not null, 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 + * iArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The sample values. - * + * * @throws NullPointerException if data is null. */ 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 - * fArray is not null, 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 + * fArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The sample values. - * + * * @throws NullPointerException if data is null. */ 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 - * dArray is not null, 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 + * dArray is not null, 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). - * @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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The sample values. - * + * * @throws NullPointerException if data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either fArray or + * + * @throws NullPointerException if either fArray or * data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either dArray or + * + * @throws NullPointerException if either dArray or * data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either fArray or + * + * @throws NullPointerException if either fArray or * data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either dArray or + * + * @throws NullPointerException if either dArray or * data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param s the sample value. * @param data the data buffer (null not permitted). - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param s the sample value. * @param data the data buffer (null not permitted). - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param s the sample value. * @param data the data buffer (null not permitted). - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param iArray the sample values (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param fArray the sample values (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param dArray the sample values (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ public void setSamples(int x, int y, int w, int h, int b, @@ -923,31 +923,31 @@ public abstract class SampleModel /** * Creates a new SampleModel 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 * SampleModel. - * + * * @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 SampleModel. - * + * * @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 0 to + * + * @param band the band (in the range 0 to * getNumBands() - 1). - * + * * @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 858818cf26d..3e276fe9f62 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 < 0 or data.length < 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 (null not + * @param data Lookup table for all components (null not * permitted). * @exception IllegalArgumentException if offset < 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 22513865197..143581db915 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 SampleModel 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 SinglePixelPackedSampleModel. - * + * * @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 SinglePixelPackedSampleModel. - * + * * @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 1. */ public int getNumDataElements() @@ -127,10 +127,10 @@ public class SinglePixelPackedSampleModel extends SampleModel /** * Creates a new SampleModel 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 SampleModel. - * + * * @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 0 to + * + * @param band the band (in the range 0 to * getNumBands() - 1). - * + * * @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 SinglePixelPackedSampleModel that accesses * the specified subset of bands. - * + * * @param bands an array containing band indices (null not * permitted). - * + * * @return A new sample model. - * + * * @throws NullPointerException if bands is null. * @throws RasterFormatException if bands.length 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 iArray is not null, * 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 iArray is not null, it will be - * populated with the sample values and returned as the result of this + * on). If iArray is not null, 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 null, a new array will be allocated). * @param data the data buffer (null not permitted). - * + * * @return The pixel sample values. - * + * * @throws NullPointerException if data is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param data the data buffer (null not permitted). - * + * * @return The sample value. - * + * * @throws NullPointerException if data is null. */ 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 (null not permitted). * @param data the data buffer (null not permitted). - * - * @throws NullPointerException if either iArray or + * + * @throws NullPointerException if either iArray or * data is null. */ 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 obj. * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param s the sample value. * @param data the data buffer (null not permitted). - * + * * @throws NullPointerException if data is null. */ 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 true if and only if: *
      *
    • obj is not null; - *
    • obj is an instance of + *
    • obj is an instance of * SinglePixelPackedSampleModel; *
    • both models have the same: *
        @@ -512,17 +512,17 @@ public class SinglePixelPackedSampleModel extends SampleModel *
      *
      • *
    - * + * * @param obj the object (null permitted) - * + * * @return true if this model is equal to obj, and * false 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 SinglePixelPackedSampleModel. - * + * * @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 99aafbce81c..769888e40cd 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 02789a3d142..68774f7850a 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 WritableRaster. - * + * * @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 WritableRaster 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 WritableRaster 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 (null not permitted). - * + * * @throws NullPointerException if iArray is null. */ 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 (null not permitted). - * + * * @throws NullPointerException if fArray is null. */ 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 (null not permitted). - * + * * @throws NullPointerException if dArray is null. */ 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 (null not permitted). - * + * * @throws NullPointerException if iArray is null. */ 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 (null not permitted). - * + * * @throws NullPointerException if fArray is null. */ 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 (null not permitted). - * + * * @throws NullPointerException if dArray is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param iArray the sample values (null not permitted). - * + * * @throws NullPointerException if iArray is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param fArray the sample values (null not permitted). - * + * * @throws NullPointerException if fArray is null. */ 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 0 to + * @param b the band (in the range 0 to * getNumBands() - 1). * @param dArray the sample values (null not permitted). - * + * * @throws NullPointerException if dArray is null. */ 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 4ed9f101371..9142fe0045a 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 729d857ac89..8852bef1c63 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 e484d6b8713..f3807781603 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 67f0b8adb23..8017c1acf9f 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 c2f6ad8b058..31767af2c0c 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 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 b9d0cd39e6e..81e537cd530 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 d8cca653527..bd3b507cb40 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 6ff4cb03176..ea2bd69f7ed 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 a55fc2236db..6e2510ff5da 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 4b33835a455..241a0e4e3f1 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 5213dc90693..3cc8f72a6fc 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 8b23b3f6f33..63961489181 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 8ed11072e15..3605a97ef04 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 b498ddf664e..736cdf3762b 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 true 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 76673a1dfec..497abdc3210 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 355d293b311..626ea840eb7 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 e26d64ff96a..b0963ecebba 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 7db1798162a..608b9c5d6eb 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 f0ba6d830c8..388e56175ab 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 929791489ac..f002368194d 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 d0fca462fdc..b0c5c346d64 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 93cad7a0318..38333b0aa62 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 c0f765d1655..55ff92913e1 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 44e37e2d43b..ae43af3ccbb 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 bfd3414ece0..7369aa52e84 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 3ba1027e501..bedbd9f9ec7 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 91d0f0d1176..e1f7a90e22f 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 e9923a653aa..71d294157a0 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 192632e46b3..a72b16cac5f 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 2e8f4bbedc5..e747a4de7d5 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 a11bfc7343d..46c0086dcb1 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 de4331e04d1..afbd2f86135 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 fe4f24d649f..4191a39b7d7 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 f8072997462..57f0fd2ebe1 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 e68d6663fdc..55c673a2d47 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 e8b7d72015b..3ca13a20fd0 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 b084a1723f1..8b040b2d143 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 0a8aa3ed0eb..86d8ba2105b 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 getOrientation 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 getOrientation and * setOrientation. */ 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 paper object being used for this page * format. - * + * * @return A copy of the Paper object for this format. */ public Paper getPaper() @@ -163,7 +163,7 @@ public class PageFormat /** * Sets the Paper object to be used by this page format. - * + * * @param paper The new Paper 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 java.awt.geom.AffineTransform. - * + * * @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 d61195a92f0..58e0885fbc9 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 - * UNKNOWN_NUMBER_OF_PAGES if it cannot determine the number + * UNKNOWN_NUMBER_OF_PAGES if it cannot determine the number * of pages to be printed. - * + * * @return The number of pages to be printed, or * UNKNOWN_NUMBER_OF_PAGES if this is unknown. */ @@ -65,11 +65,11 @@ public interface Pageable * This method returns the PageFormat 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 * PageFormat for. * @return The PageFormat 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 Printable 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 * Printable for. * @return The Printable 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 fb7ba91158f..a80da2fea41 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 62fde8406dd..c1f199c651f 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 Graphics 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 PrinterJob that is * controlling this print job. - * + * * @return The PrinterJob 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 c646acdec3a..2089af59e22 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 3715dd235ec..1a4b8c8e207 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 PrinterJob. + * Initializes a new instance of PrinterJob. */ 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 */ diff --git a/libjava/classpath/java/beans/AppletInitializer.java b/libjava/classpath/java/beans/AppletInitializer.java index 69dc2cae50e..3bc2534e125 100644 --- a/libjava/classpath/java/beans/AppletInitializer.java +++ b/libjava/classpath/java/beans/AppletInitializer.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/beans/BeanDescriptor.java b/libjava/classpath/java/beans/BeanDescriptor.java index b4bc6870d24..6795d91b376 100644 --- a/libjava/classpath/java/beans/BeanDescriptor.java +++ b/libjava/classpath/java/beans/BeanDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,42 +48,42 @@ package java.beans; **/ public class BeanDescriptor extends FeatureDescriptor { - Class beanClass; - Class customizerClass; + Class beanClass; + Class customizerClass; - /** Create a new BeanDescriptor with the given beanClass and - ** no customizer class. - ** @param beanClass the class of the Bean. - **/ - public BeanDescriptor(Class beanClass) { - this(beanClass,null); - } + /** Create a new BeanDescriptor with the given beanClass and + ** no customizer class. + ** @param beanClass the class of the Bean. + **/ + public BeanDescriptor(Class beanClass) { + this(beanClass,null); + } - /** Create a new BeanDescriptor with the given bean class and - ** customizer class. - ** @param beanClass the class of the Bean. - ** @param customizerClass the class of the Bean's Customizer. - **/ - public BeanDescriptor(Class beanClass, Class customizerClass) { - this.beanClass = beanClass; - this.customizerClass = customizerClass; + /** Create a new BeanDescriptor with the given bean class and + ** customizer class. + ** @param beanClass the class of the Bean. + ** @param customizerClass the class of the Bean's Customizer. + **/ + public BeanDescriptor(Class beanClass, Class customizerClass) { + this.beanClass = beanClass; + this.customizerClass = customizerClass; - // Set the FeatureDescriptor programmatic name. - String name = beanClass.getName(); - int lastInd = name.lastIndexOf('.'); - if (lastInd != -1) - name = name.substring(lastInd + 1); + // Set the FeatureDescriptor programmatic name. + String name = beanClass.getName(); + int lastInd = name.lastIndexOf('.'); + if (lastInd != -1) + name = name.substring(lastInd + 1); - setName(name); - } + setName(name); + } - /** Get the Bean's class. **/ - public Class getBeanClass() { - return beanClass; - } + /** Get the Bean's class. **/ + public Class getBeanClass() { + return beanClass; + } - /** Get the Bean's customizer's class. **/ - public Class getCustomizerClass() { - return customizerClass; - } + /** Get the Bean's customizer's class. **/ + public Class getCustomizerClass() { + return customizerClass; + } } diff --git a/libjava/classpath/java/beans/BeanInfo.java b/libjava/classpath/java/beans/BeanInfo.java index 525500a389c..3c9bf1bcdae 100644 --- a/libjava/classpath/java/beans/BeanInfo.java +++ b/libjava/classpath/java/beans/BeanInfo.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -73,109 +73,109 @@ package java.beans; **/ public interface BeanInfo { - /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ - int ICON_COLOR_16x16 = 1; - /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ - int ICON_COLOR_32x32 = 2; - /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ - int ICON_MONO_16x16 = 3; - /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ - int ICON_MONO_32x32 = 4; + /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ + int ICON_COLOR_16x16 = 1; + /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ + int ICON_COLOR_32x32 = 2; + /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ + int ICON_MONO_16x16 = 3; + /** Use this as a parameter for the getIcon() command to retrieve a certain type of icon. **/ + int ICON_MONO_32x32 = 4; - /** Get the general description of this Bean type. - ** @return the BeanDescriptor for the Bean, or null if - ** the BeanDescriptor should be obtained by - ** Introspection. - **/ - BeanDescriptor getBeanDescriptor(); + /** Get the general description of this Bean type. + ** @return the BeanDescriptor for the Bean, or null if + ** the BeanDescriptor should be obtained by + ** Introspection. + **/ + BeanDescriptor getBeanDescriptor(); - /** Get the events this Bean type fires. - ** @return the EventDescriptors representing events this - ** Bean fires. Returns null if the - ** events are to be acquired by Introspection. - **/ - EventSetDescriptor[] getEventSetDescriptors(); + /** Get the events this Bean type fires. + ** @return the EventDescriptors representing events this + ** Bean fires. Returns null if the + ** events are to be acquired by Introspection. + **/ + EventSetDescriptor[] getEventSetDescriptors(); - /** Get the "default" event, basically the one a RAD tool - ** user is most likely to select. - ** @return the index into the getEventSetDescriptors() - ** that the user is most likely to use. Returns - ** -1 if there is no default event. - **/ - int getDefaultEventIndex(); + /** Get the "default" event, basically the one a RAD tool + ** user is most likely to select. + ** @return the index into the getEventSetDescriptors() + ** that the user is most likely to use. Returns + ** -1 if there is no default event. + **/ + int getDefaultEventIndex(); - /** Get the properties (get/set method pairs) this Bean - ** type supports. - ** @return the PropertyDescriptors representing the - ** properties this Bean type supports. - ** Returns null if the properties - ** are to be obtained by Introspection. - **/ - PropertyDescriptor[] getPropertyDescriptors(); + /** Get the properties (get/set method pairs) this Bean + ** type supports. + ** @return the PropertyDescriptors representing the + ** properties this Bean type supports. + ** Returns null if the properties + ** are to be obtained by Introspection. + **/ + PropertyDescriptor[] getPropertyDescriptors(); - /** Get the "default" property, basically the one a RAD - ** tool user is most likely to select. - ** @return the index into the getPropertyDescriptors() - ** that the user is most likely to use. Returns - ** -1 if there is no default event. - **/ - int getDefaultPropertyIndex(); + /** Get the "default" property, basically the one a RAD + ** tool user is most likely to select. + ** @return the index into the getPropertyDescriptors() + ** that the user is most likely to use. Returns + ** -1 if there is no default event. + **/ + int getDefaultPropertyIndex(); - /** Get the methods this Bean type supports. - ** @return the MethodDescriptors representing the - ** methods this Bean type supports. Returns - ** null if the methods are to be - ** obtained by Introspection. - **/ - MethodDescriptor[] getMethodDescriptors(); + /** Get the methods this Bean type supports. + ** @return the MethodDescriptors representing the + ** methods this Bean type supports. Returns + ** null if the methods are to be + ** obtained by Introspection. + **/ + MethodDescriptor[] getMethodDescriptors(); - /** Get additional BeanInfos representing this Bean. - ** In this version of JavaBeans, this method is used so - ** that space and time can be saved by reading a BeanInfo - ** for each class in the hierarchy (super, super(super), - ** and so on).

    - ** - ** The order of precedence when two pieces of BeanInfo - ** conflict (such as two PropertyDescriptors that have - ** the same name), in order from highest precedence to - ** lowest, is: - **

      - **
    1. This BeanInfo object.
      2. - **
    2. getAdditionalBeanInfo()[getAdditionalBeanInfo().length]
      3. - **
    3. ...
      4. - **
    4. getAdditionalBeanInfo()[1]
      5. - **
    5. getAdditionalBeanInfo()[0]
      6. - **

    - ** - ** Spec Note: It is possible that - ** returning null from this method could - ** stop Introspection in its tracks, but it is unclear - ** from the spec whether this is the case. - ** - ** @return additional BeanInfos representing this Bean. - ** null may be returned (see Spec - ** Note, above). - **/ - BeanInfo[] getAdditionalBeanInfo(); + /** Get additional BeanInfos representing this Bean. + ** In this version of JavaBeans, this method is used so + ** that space and time can be saved by reading a BeanInfo + ** for each class in the hierarchy (super, super(super), + ** and so on).

    + ** + ** The order of precedence when two pieces of BeanInfo + ** conflict (such as two PropertyDescriptors that have + ** the same name), in order from highest precedence to + ** lowest, is: + **

      + **
    1. This BeanInfo object.
      2. + **
    2. getAdditionalBeanInfo()[getAdditionalBeanInfo().length]
      3. + **
    3. ...
      4. + **
    4. getAdditionalBeanInfo()[1]
      5. + **
    5. getAdditionalBeanInfo()[0]
      6. + **

    + ** + ** Spec Note: It is possible that + ** returning null from this method could + ** stop Introspection in its tracks, but it is unclear + ** from the spec whether this is the case. + ** + ** @return additional BeanInfos representing this Bean. + ** null may be returned (see Spec + ** Note, above). + **/ + BeanInfo[] getAdditionalBeanInfo(); - /** Get a visual icon for this Bean. - ** A Bean does not have to support icons, and if it does - ** support icons, it does not have to support every single - ** type. Sun recommends that if you only support one - ** type, you support 16x16 color. Sun also notes that you - ** should try to use a type (like GIF) that allows for - ** transparent pixels, so that the background of the RAD - ** tool can show through.

    - ** - ** Spec Note: If you do not support the - ** type of icon that is being asked for, but you do - ** support another type, it is unclear whether you should - ** return the other type or not. I would presume not. - ** - ** @param iconType the type of icon to get (see the - ** ICON_* constants in this class). - ** @return the icon, or null if that type of icon is - ** unsupported by this Bean. - **/ - java.awt.Image getIcon(int iconType); + /** Get a visual icon for this Bean. + ** A Bean does not have to support icons, and if it does + ** support icons, it does not have to support every single + ** type. Sun recommends that if you only support one + ** type, you support 16x16 color. Sun also notes that you + ** should try to use a type (like GIF) that allows for + ** transparent pixels, so that the background of the RAD + ** tool can show through.

    + ** + ** Spec Note: If you do not support the + ** type of icon that is being asked for, but you do + ** support another type, it is unclear whether you should + ** return the other type or not. I would presume not. + ** + ** @param iconType the type of icon to get (see the + ** ICON_* constants in this class). + ** @return the icon, or null if that type of icon is + ** unsupported by this Bean. + **/ + java.awt.Image getIcon(int iconType); } diff --git a/libjava/classpath/java/beans/Beans.java b/libjava/classpath/java/beans/Beans.java index 2f6e0a991a5..3066be7a567 100644 --- a/libjava/classpath/java/beans/Beans.java +++ b/libjava/classpath/java/beans/Beans.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,7 +52,7 @@ import java.net.URL; * * @author John Keiser * @author Robert Schuster - * + * * @since 1.1 * @status updated to 1.4 * @@ -74,13 +74,13 @@ public class Beans /** Creates a bean. *

    This is a convenience method that calls instantiate(cl, beanName, null, null).

    - * + * * @see instantiate(ClassLoader, String, BeanContext, AppletInitializer) * @param cl ClassLoader to be used or null for the system classloader. * @param beanName Name of a serialized bean or class name. * @return A newly created bean. * @throws IOException If access of an IO resource failed. - * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. + * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. */ public static Object instantiate(ClassLoader cl, String beanName) throws IOException, ClassNotFoundException @@ -89,16 +89,16 @@ public class Beans } /** Creates a bean. - * + * *

    This is a convenience method that calls instantiate(cl, beanName, beanContext, null).

    - * + * * @see instantiate(ClassLoader, String, BeanContext, AppletInitializer) * @param cl ClassLoader to be used or null for the system classloader. * @param beanName Name of a serialized bean or class name. * @param beanContext Context to which the newly created Bean should be added. * @return A newly created bean. * @throws IOException If access of an IO resource failed. - * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. + * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. */ public static Object instantiate( ClassLoader cl, @@ -110,38 +110,38 @@ public class Beans } /** Instantiates a bean according to Beans 1.0. - * + * *

    In Beans 1.0 the instantiation scheme is as follows:

    *

    The name should be dot-separated (e.g "place.for.beans.myBean") and indicate either a * serialized object or a class name. In the first case all dots in the name are replaced with * slashes ('/') and ".ser" is appended ("place.for.beans.myBean" becomes "place/for/beans/myBean.ser"). * The bean is then loaded as an application or system resource depending on whether a * ClassLoader was provided.

    - * + * *

    If no such resource exists or if it contains no bean the name is interpreted as a class name of * which an instance is then created.

    - * + * *

    If a BeanContext instance is available the created bean is added to it.

    - * + * *

    If the created Bean is an Applet or subclass and an AppletInitializer * instance is available the applet is initialized and afterwards activated using the initializer. Additionally * every instantiated Applet bean is initialized using the {@link Applet.init} method. * Furthermore every applet gets a default AppletStub. The Applet's * document base is the location of the ".ser" file if it was deserialized or the location of its class * file if it was instantiated.

    - * + * *

    A ClassNotFoundException is not only thrown when a class name was unknown * but even when the class has public no-argument constructor * (IllegalAccessException is wrapped) or an exception is thrown while * invoking such a constructor (causing exception is wrapped).

    - * + * * @param cl ClassLoader to be used or null for the system classloader. * @param beanName Name of a serialized bean or class name. * @param beanContext Context to which the newly created Bean should be added. * @param initializer The AppletInitializer which is used for initializing Applet beans. * @return A newly created bean. * @throws IOException If access of an IO resource failed. - * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. + * @throws ClassNotFoundException If the class name is not known or does not lead to a proper bean class. */ public static Object instantiate( ClassLoader cl, @@ -154,12 +154,12 @@ public class Beans URL beanLocation = null; URL classLocation = null; - // Converts bean name into a resource name (eg. "a.b.c" -> "a/b/c"). + // Converts bean name into a resource name (eg. "a.b.c" -> "a/b/c"). String resourceName = beanName.replace('.', '/'); /* Tries to get an input stream of the Bean, reading it as a system resource * if no ClassLoader is present or as an application resource if a classloader - * is given. + * is given. */ beanLocation = (cl == null) @@ -211,10 +211,10 @@ public class Beans bean = beanClass.newInstance(); } catch(Exception e) { - /* Wraps all kinds of Exceptions in a ClassNotFoundException (this behavior - * matches with official >= 1.5, this was different for <=1.4) - */ - throw new ClassNotFoundException(null, e); + /* Wraps all kinds of Exceptions in a ClassNotFoundException (this behavior + * matches with official >= 1.5, this was different for <=1.4) + */ + throw new ClassNotFoundException(null, e); } } @@ -224,8 +224,8 @@ public class Beans * - as every other Bean Applets are added to a BeanContext if one is available * - each instantiated Applet is initialized using Applet.init() (this is not done for deserialized ones) * - finally AppletS get activated using the AppletInitializerS activate-Method - * - * The order of operations is important for compatibility. + * + * The order of operations is important for compatibility. */ Applet applet = null; if (bean instanceof Applet) @@ -344,7 +344,7 @@ public class Beans /** * Sets whether the GUI is available to use. - * + * * @param guiAvailable whether the GUI is available to use. */ public static void setGuiAvailable(boolean guiAvailable) diff --git a/libjava/classpath/java/beans/Customizer.java b/libjava/classpath/java/beans/Customizer.java index b36c89f8846..bb6b4e2dd9e 100644 --- a/libjava/classpath/java/beans/Customizer.java +++ b/libjava/classpath/java/beans/Customizer.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -67,20 +67,20 @@ package java.beans; **/ public interface Customizer { - /** Set the object to Customize. This will always be a - ** Bean that had a BeanDescriptor indicating this - ** Customizer. - ** @param bean the Bean to customize. - **/ - void setObject(Object bean); + /** Set the object to Customize. This will always be a + ** Bean that had a BeanDescriptor indicating this + ** Customizer. + ** @param bean the Bean to customize. + **/ + void setObject(Object bean); - /** Add a PropertyChangeListener. - ** @param l the PropertyChangeListener to add. - **/ - void addPropertyChangeListener(PropertyChangeListener l); + /** Add a PropertyChangeListener. + ** @param l the PropertyChangeListener to add. + **/ + void addPropertyChangeListener(PropertyChangeListener l); - /** Remove a PropertyChangeListener. - ** @param l the PropertyChangeListener to remove. - **/ - void removePropertyChangeListener(PropertyChangeListener l); + /** Remove a PropertyChangeListener. + ** @param l the PropertyChangeListener to remove. + **/ + void removePropertyChangeListener(PropertyChangeListener l); } diff --git a/libjava/classpath/java/beans/DefaultPersistenceDelegate.java b/libjava/classpath/java/beans/DefaultPersistenceDelegate.java index c4328e03060..3a4d86cca49 100644 --- a/libjava/classpath/java/beans/DefaultPersistenceDelegate.java +++ b/libjava/classpath/java/beans/DefaultPersistenceDelegate.java @@ -44,7 +44,7 @@ import java.lang.reflect.Method; /**

    DefaultPersistenceDelegate is a {@link PersistenceDelegate} * implementation that can be used to serialize objects which adhere to the * Java Beans naming convention.

    - * + * * @author Robert Schuster (robertschuster@fsfe.org) * @since 1.4 */ @@ -62,11 +62,11 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate /** This constructor allows to specify which Bean properties appear * in the constructor. - * + * *

    The implementation reads the mentioned properties from the Bean * instance and applies it in the given order to a corresponding * constructor.

    - * + * * @param constructorPropertyNames The properties the Bean's constructor * should be given to. */ @@ -167,13 +167,13 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate // * PersistenceDelegate.initialize() is implemented in a way that it // calls the initialize method of the superclass' persistence delegate. super.initialize(type, oldInstance, newInstance, out); - + // Suppresses the writing of property setting statements when this delegate // is not used for the exact instance type. By doing so the following code // is called only once per object. if (type != oldInstance.getClass()) return; - + try { PropertyDescriptor[] propertyDescs = Introspector.getBeanInfo( diff --git a/libjava/classpath/java/beans/DesignMode.java b/libjava/classpath/java/beans/DesignMode.java index 9897f022ea4..bc79361c130 100644 --- a/libjava/classpath/java/beans/DesignMode.java +++ b/libjava/classpath/java/beans/DesignMode.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,7 +49,7 @@ package java.beans; * @since JDK1.2 * @see java.beans.beancontext.BeanContextChild */ -public interface DesignMode +public interface DesignMode { /** diff --git a/libjava/classpath/java/beans/Encoder.java b/libjava/classpath/java/beans/Encoder.java index 6dc36277f99..b3d232a312a 100644 --- a/libjava/classpath/java/beans/Encoder.java +++ b/libjava/classpath/java/beans/Encoder.java @@ -119,11 +119,11 @@ public class Encoder pd = new CollectionPersistenceDelegate(); delegates.put(AbstractCollection.class, pd); - + pd = new MapPersistenceDelegate(); delegates.put(java.util.AbstractMap.class, pd); delegates.put(java.util.Hashtable.class, pd); - + defaultPersistenceDelegate = new DefaultPersistenceDelegate(); delegates.put(Object.class, defaultPersistenceDelegate); @@ -158,7 +158,7 @@ public class Encoder accessCounter++; pd.writeObject(o, this); accessCounter--; - + } /** @@ -169,8 +169,8 @@ public class Encoder */ public void setExceptionListener(ExceptionListener listener) { - exceptionListener = (listener != null) - ? listener : DefaultExceptionListener.INSTANCE; + exceptionListener = (listener != null) + ? listener : DefaultExceptionListener.INSTANCE; } /** @@ -261,7 +261,7 @@ public class Encoder // String instances are handled in a special way. // No one knows why this is not officially specified // because this is a rather important design decision. - return (oldInstance == null) ? null : + return (oldInstance == null) ? null : (oldInstance.getClass() == String.class) ? oldInstance : candidates.get(oldInstance); } @@ -338,8 +338,8 @@ public class Encoder exceptionListener.exceptionThrown(e); return; } - - + + newValue = get(value); if (newValue == null) @@ -369,15 +369,15 @@ public class Encoder newArgs[i] = get(args[i]); } } - + Expression newExpr = new Expression(newTarget, expr.getMethodName(), newArgs); - + // Fakes the result of Class.forName() to make it possible // to hand such a type to the encoding process. if (value instanceof Class && ((Class) value).isPrimitive()) newExpr.setValue(value); - + // Instantiates the new object. try { @@ -388,10 +388,10 @@ public class Encoder catch (Exception e) { exceptionListener.exceptionThrown(e); - + return; } - + writeObject(value); } @@ -404,10 +404,10 @@ public class Encoder /** Returns whether the given class is an immutable * type which has to be handled differently when serializing it. - * + * *

    Immutable objects always have to be instantiated instead of * modifying an existing instance.

    - * + * * @param type The class to test. * @return Whether the first argument is an immutable type. */ @@ -419,9 +419,9 @@ public class Encoder || type == Long.class || type == Float.class || type == Double.class; } - + /** Sets the stream candidate for a given object. - * + * * @param oldObject The object given to the encoder. * @param newObject The object the encoder generated. */ @@ -429,5 +429,5 @@ public class Encoder { candidates.put(oldObject, newObject); } - + } diff --git a/libjava/classpath/java/beans/EventHandler.java b/libjava/classpath/java/beans/EventHandler.java index 5efbc8dc6d7..967ba8294f5 100644 --- a/libjava/classpath/java/beans/EventHandler.java +++ b/libjava/classpath/java/beans/EventHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,14 +46,14 @@ import java.lang.reflect.Proxy; /** *

    EventHandler forms a bridge between dynamically created listeners and * arbitrary properties and methods.

    - * + * *

    You can use this class to easily create listener implementations for * some basic interactions between an event source and its target. Using * the three static methods named create you can create * these listener implementations.

    - * + * *

    See the documentation of each method for usage examples.

    - * + * * @author Jerry Quinn (jlquinn@optonline.net) * @author Robert Schuster (thebohemian@gmx.net) * @since 1.4 @@ -74,7 +74,7 @@ public class EventHandler implements InvocationHandler // The target objects Class. private Class targetClass; - + // String class doesn't already have a capitalize routine. private String capitalize(String s) { @@ -90,9 +90,9 @@ public class EventHandler implements InvocationHandler *

    This constructs an EventHandler that will connect the method * listenerMethodName to target.action, extracting eventPropertyName from * the first argument of listenerMethodName. and sending it to action.

    - * + * *

    Throws a NullPointerException if the target - * argument is null. + * argument is null. * * @param target Object that will perform the action. * @param action A property or method of the target. @@ -100,17 +100,17 @@ public class EventHandler implements InvocationHandler * @param listenerMethodName The listener method name triggering the action. */ public EventHandler(Object target, String action, String eventPropertyName, - String listenerMethodName) + String listenerMethodName) { this.target = target; - + // Retrieving the class is done for two reasons: // 1) The class object is needed very frequently in the invoke() method. // 2) The constructor should throw a NullPointerException if target is null. targetClass = target.getClass(); - - this.action = action; // Turn this into a method or do we wait till - // runtime + + this.action = action; // Turn this into a method or do we wait till + // runtime property = eventPropertyName; listenerMethod = listenerMethodName; } @@ -164,16 +164,16 @@ public class EventHandler implements InvocationHandler String rest = null; if ((pos = prop.indexOf('.')) != -1) { - rest = prop.substring(pos + 1); - prop = prop.substring(0, pos); + rest = prop.substring(pos + 1); + prop = prop.substring(0, pos); } // Find a method named getProp. It could be isProp instead. Method getter; try { - // Look for boolean property getter isProperty - getter = o.getClass().getMethod("is" + capitalize(prop)); + // Look for boolean property getter isProperty + getter = o.getClass().getMethod("is" + capitalize(prop)); } catch (NoSuchMethodException nsme1) { @@ -209,9 +209,9 @@ public class EventHandler implements InvocationHandler /** * Invokes the EventHandler. - * + * *

    This method is normally called by the listener's proxy implementation.

    - * + * * @param proxy The listener interface that is implemented using * the proxy mechanism. * @param method The method that was called on the proxy instance. @@ -245,11 +245,11 @@ public class EventHandler implements InvocationHandler // - need method and object to do the invoke and get return type Object v[] = getProperty(event, property); Object[] args = new Object[] { v[0] }; - + // Changes the class array that controls which method signature we are going // to look up in the target object. Class[] argTypes = new Class[] { initClass((Class) v[1]) }; - + // Tries to find a setter method to which we can apply the while(argTypes[0] != null) { try @@ -263,16 +263,16 @@ public class EventHandler implements InvocationHandler { // If action as property didn't work, try as method later. } - + argTypes[0] = nextClass(argTypes[0]); } - + // We could not find a suitable setter method. Now we try again interpreting // action as the method name itself. - // Since we probably have changed the block local argTypes array + // Since we probably have changed the block local argTypes array // we need to rebuild it. argTypes = new Class[] { initClass((Class) v[1]) }; - + // Tries to find a setter method to which we can apply the while(argTypes[0] != null) { try @@ -284,15 +284,15 @@ public class EventHandler implements InvocationHandler catch (NoSuchMethodException e) { } - + argTypes[0] = nextClass(argTypes[0]); } - + throw new RuntimeException("Method not called: Could not find a public method named '" + action + "' in target " + targetClass + " which takes a '" + v[1] + "' argument or a property of this type."); - } - + } + // If property was null we will search for a no-argument method here. // Note: The ordering of method lookups is important because we want to prefer no-argument // calls like the JDK does. This means if we have actionMethod() and actionMethod(Event) we will @@ -312,25 +312,25 @@ public class EventHandler implements InvocationHandler // else this can stay this way. if(arguments != null && arguments.length >= 1/* && arguments[0] instanceof EventObject*/) { Class[] targetArgTypes = new Class[] { initClass(arguments[0].getClass()) }; - + while(targetArgTypes[0] != null) { try { // If no property exists we expect the first element of the arguments to be // an EventObject which is then applied to the target method. - + actionMethod = targetClass.getMethod(action, targetArgTypes); - + return actionMethod.invoke(target, new Object[] { arguments[0] }); } catch(NoSuchMethodException nsme2) { - + } - + targetArgTypes[0] = nextClass(targetArgTypes[0]); } - + } } @@ -338,7 +338,7 @@ public class EventHandler implements InvocationHandler // failed. The JDK throws an ArrayIndexOutOfBoundsException in this case. if(actionMethod == null) throw new ArrayIndexOutOfBoundsException(0); - + // Invoke target.action(property) return actionMethod.invoke(target); } catch(InvocationTargetException ite) { @@ -350,75 +350,75 @@ public class EventHandler implements InvocationHandler throw (InternalError) new InternalError("Non-public method was invoked.").initCause(iae); } } - + /** *

    Returns the primitive type for every wrapper class or the * class itself if it is no wrapper class.

    - * + * *

    This is needed because to be able to find both kinds of methods: * One that takes a wrapper class as the first argument and one that * accepts a primitive instead.

    */ private Class initClass(Class klass) { if(klass == Boolean.class) { - return Boolean.TYPE; + return Boolean.TYPE; } else if(klass == Byte.class) { - return Byte.TYPE; + return Byte.TYPE; } else if(klass == Short.class) { - return Short.TYPE; + return Short.TYPE; } else if(klass == Integer.class) { - return Integer.TYPE; + return Integer.TYPE; } else if(klass == Long.class) { - return Long.TYPE; + return Long.TYPE; } else if(klass == Float.class) { - return Float.TYPE; + return Float.TYPE; } else if(klass == Double.class) { - return Double.TYPE; + return Double.TYPE; } else { - return klass; + return klass; } } /** - * - * + * + * * @param klass * @return */ private Class nextClass(Class klass) { if(klass == Boolean.TYPE) { - return Boolean.class; + return Boolean.class; } else if(klass == Byte.TYPE) { - return Byte.class; + return Byte.class; } else if(klass == Short.TYPE) { - return Short.class; + return Short.class; } else if(klass == Integer.TYPE) { - return Integer.class; + return Integer.class; } else if(klass == Long.TYPE) { - return Long.class; + return Long.class; } else if(klass == Float.TYPE) { - return Float.class; + return Float.class; } else if(klass == Double.TYPE) { - return Double.class; + return Double.class; } else { return klass.getSuperclass(); } } - + /** *

    Constructs an implementation of listenerInterface * to dispatch events.

    - * + * *

    You can use such an implementation to simply call a public * no-argument method of an arbitrary target object or to forward * the first argument of the listener method to the target method.

    - * + * *

    Call this method like:

    * * button.addActionListener((ActionListener) * EventHandler.create(ActionListener.class, target, "dispose")); * - * + * *

    to achieve the following behavior:

    * * button.addActionListener(new ActionListener() { @@ -427,11 +427,11 @@ public class EventHandler implements InvocationHandler * } * }); * - * + * *

    That means if you need a listener implementation that simply calls a * a no-argument method on a given instance for each * method of the listener interface.

    - * + * *

    Note: The action is interpreted as a method name. If your target object * has no no-argument method of the given name the EventHandler tries to find * a method with the same name but which can accept the first argument of the @@ -444,15 +444,15 @@ public class EventHandler implements InvocationHandler * to their wrapper class and vice versa. Furthermore it will call * a target method if it accepts a superclass of the type of the * first argument of the listener method.

    - * + * *

    In case that the method of the target object throws an exception * it will be wrapped in a RuntimeException and thrown out * of the listener method.

    - * + * *

    In case that the method of the target object cannot be found an * ArrayIndexOutOfBoundsException will be thrown when the * listener method is invoked.

    - * + * *

    A call to this method is equivalent to: * create(listenerInterface, target, action, null, null)

    * @@ -462,7 +462,7 @@ public class EventHandler implements InvocationHandler * @return A constructed proxy object. */ public static T create(Class listenerInterface, Object target, - String action) + String action) { return create(listenerInterface, target, action, null, null); } @@ -476,27 +476,27 @@ public class EventHandler implements InvocationHandler * and applies it to the target's property or method. This first argument * of the listener is usually an event object but any other object is * valid, too.

    - * + * *

    You can set the value of eventPropertyName to "prop" * to denote the retrieval of a property named "prop" from the event * object. In case that no such property exists the EventHandler * will try to find a method with that name.

    - * + * *

    If you set eventPropertyName to a value like this "a.b.c" * EventHandler will recursively evaluate the properties "a", "b" * and "c". Again if no property can be found the EventHandler * tries a method name instead. This allows mixing the names, too: "a.toString" * will retrieve the property "a" from the event object and will then call * the method "toString" on it.

    - * + * *

    An exception thrown in any of these methods will provoke a * RuntimeException to be thrown which contains an * InvocationTargetException containing the triggering exception.

    - * + * *

    If you set eventPropertyName to a non-null value the * action parameter will be interpreted as a property name * or a method name of the target object.

    - * + * *

    Any object retrieved from the event object and applied to the * target will converted from primitives to their wrapper class or * vice versa or applied to a method that accepts a superclass @@ -512,35 +512,35 @@ public class EventHandler implements InvocationHandler * } * }); * - * + * *

    Can be expressed using the EventHandler like this:

    *

    * button.addActionListener((ActionListener) * EventHandler.create(ActionListener.class, textField, "text", "source.class.name"); * *

    - * + * *

    As said above you can specify the target as a method, too:

    *

    * button.addActionListener((ActionListener) * EventHandler.create(ActionListener.class, textField, "setText", "source.class.name"); * *

    - * + * *

    Furthermore you can use method names in the property:

    *

    * button.addActionListener((ActionListener) * EventHandler.create(ActionListener.class, textField, "setText", "getSource.getClass.getName"); * *

    - * + * *

    Finally you can mix names:

    *

    * button.addActionListener((ActionListener) * EventHandler.create(ActionListener.class, textField, "setText", "source.getClass.name"); * *

    - * + * *

    A call to this method is equivalent to: * create(listenerInterface, target, action, null, null) *

    @@ -552,7 +552,7 @@ public class EventHandler implements InvocationHandler * @return A constructed proxy object. */ public static T create(Class listenerInterface, Object target, - String action, String eventPropertyName) + String action, String eventPropertyName) { return create(listenerInterface, target, action, eventPropertyName, null); } @@ -566,7 +566,7 @@ public class EventHandler implements InvocationHandler * to filter the listener method that should have an effect. Look at these * method's documentation for more information about the EventHandler's * usage.

    - * + * *

    If you want to call dispose on a JFrame instance * when the WindowListener.windowClosing() method was invoked use * the following code:

    @@ -575,10 +575,10 @@ public class EventHandler implements InvocationHandler * EventHandler.create(WindowListener.class, jframeInstance, "dispose", null, "windowClosing"); *     *

    - * + * *

    A NullPointerException is thrown if the listenerInterface * or target argument are null. - * + * * @param listenerInterface Listener interface to implement. * @param target Object to invoke action on. * @param action Target method name to invoke. @@ -587,17 +587,17 @@ public class EventHandler implements InvocationHandler * @return A constructed proxy object. */ public static T create(Class listenerInterface, Object target, - String action, String eventPropertyName, - String listenerMethodName) + String action, String eventPropertyName, + String listenerMethodName) { // Create EventHandler instance EventHandler eh = new EventHandler(target, action, eventPropertyName, - listenerMethodName); + listenerMethodName); // Create proxy object passing in the event handler Object proxy = Proxy.newProxyInstance(listenerInterface.getClassLoader(), - new Class[] {listenerInterface}, - eh); + new Class[] {listenerInterface}, + eh); return (T) proxy; } diff --git a/libjava/classpath/java/beans/EventSetDescriptor.java b/libjava/classpath/java/beans/EventSetDescriptor.java index 69c07423fa0..3f537c743a3 100644 --- a/libjava/classpath/java/beans/EventSetDescriptor.java +++ b/libjava/classpath/java/beans/EventSetDescriptor.java @@ -7,7 +7,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,13 +47,13 @@ import java.util.Vector; /** * EventSetDescriptor describes the hookup between an event source class and * an event listener class. - * + * *

    EventSets have several attributes: the listener class, * the events that can be fired to the listener (methods in the listener * class), and an add and remove listener method from the event firer's * class. *

    - * + * *

    * The methods have these constraints on them: *

      @@ -62,29 +62,29 @@ import java.util.Vector; * package-protected. (Don't ask me why that is, I'm just following the spec. * The only place it is even mentioned is in the Java Beans white paper, and * there it is only implied.) - * + * *
    • add listener method: must have void return value. Must * take exactly one argument, of the listener class's type. May fire either * zero exceptions, or one exception of type * java.util.TooManyListenersException. * Must be public.
      • - * + * *
    • remove listener method: must have void return value. Must * take exactly one argument, of the listener class's type. May not fire any * exceptions. Must be public.
      • *
    - * + * *

    * A final constraint is that event listener classes must extend from * EventListener. *

    - * + * *

    * There are also various design patterns associated with some of the methods * of construction. Those are explained in more detail in the appropriate * constructors. *

    - * + * *

    * Documentation Convention: for proper Internalization of * Beans inside an RAD tool, sometimes there are two names for a property or @@ -92,7 +92,7 @@ import java.util.Vector; * anywhere, and a localized, display name, for ease of use. In the * documentation I will specify different String values as either * programmatic or localized to make this distinction clear. - * + * * @author John Keiser * @author Robert Schuster (robertschuster@fsfe.org) * @since 1.1 @@ -118,12 +118,12 @@ public class EventSetDescriptor extends FeatureDescriptor /** * Creates a new EventSetDescriptor * This version of the constructor enforces the rules imposed on the methods * described at the top of this class, as well as searching for: *

    - * + * *
      *
    1. * The event-firing method must be non-private with signature void @@ -140,7 +140,7 @@ public class EventSetDescriptor extends FeatureDescriptor * should be chosen (they probably weren't thinking as pathologically as I * was). I don't like arbitrarily choosing things. If your class has only one * such signature, as most do, you'll have no problems.
      2. - * + * *
    2. The add and remove methods must be public and named void * add<eventSetName>Listener(<listenerType>) and * void remove<eventSetName>Listener(<listenerType>) @@ -148,7 +148,7 @@ public class EventSetDescriptor extends FeatureDescriptor * <eventSetName> will have its first letter capitalized. * Standard exception rules (see class description) apply.
      3. *
    - * + * * @param eventSourceClass * the class containing the add/remove listener methods. * @param eventSetName @@ -202,12 +202,12 @@ public class EventSetDescriptor extends FeatureDescriptor /** * Creates a new EventSetDescriptor. - * + * *

    This form of the constructor allows you to specify the names of the * methods and adds no new constraints on top of the rules already described * at the top of the class. *

    - * + * * @param eventSourceClass * the class containing the add and remove listener methods. * @param eventSetName @@ -251,7 +251,7 @@ public class EventSetDescriptor extends FeatureDescriptor /** * Creates a new EventSetDescriptor. - * + * *

    * This variant of the constructor allows you to specify the names of the * methods and adds no new constraints on top of the rules already described @@ -266,7 +266,7 @@ public class EventSetDescriptor extends FeatureDescriptor * Note: The validity of the return value of the GetListener method is not * checked. *

    - * + * * @param eventSourceClass * the class containing the add and remove listener methods. * @param eventSetName @@ -301,13 +301,13 @@ public class EventSetDescriptor extends FeatureDescriptor try { - newGetListenerMethod + newGetListenerMethod = eventSourceClass.getMethod(getListenerMethodName, new Class[] { Class.class }); } catch (NoSuchMethodException nsme) { - throw (IntrospectionException) + throw (IntrospectionException) new IntrospectionException("No method named " + getListenerMethodName + " in class " + listenerType + " which can be used as" @@ -323,7 +323,7 @@ public class EventSetDescriptor extends FeatureDescriptor /** * Creates a new EventSetDescriptor. - * + * *

    * This variant of the constructor allows you to specify the names of the * methods and adds no new constraints on top of the rules already described @@ -338,7 +338,7 @@ public class EventSetDescriptor extends FeatureDescriptor * Note: The validity of the return value of the GetListener method is not * checked. *

    - * + * * @param eventSetName * the programmatic name of the event set, generally starting with a * lowercase letter (i.e. fooManChu instead of FooManChu). @@ -381,12 +381,12 @@ public class EventSetDescriptor extends FeatureDescriptor /** * Creates a new EventSetDescriptor. - * + * *

    This form of constructor allows you to explicitly say which methods * do what, and no reflection is done by the EventSetDescriptor. * The methods are, however, checked to ensure that they follow the rules * set forth at the top of the class. - * + * * @param eventSetName * the programmatic name of the event set, generally starting with a * lowercase letter (i.e. fooManChu instead of FooManChu). @@ -428,12 +428,12 @@ public class EventSetDescriptor extends FeatureDescriptor } /** Creates a new EventSetDescriptor. - * + * *

    This form of constructor allows you to explicitly say which methods do * what, and no reflection is done by the EventSetDescriptor. * The methods are, however, checked to ensure that they follow the rules * set forth at the top of the class. - * + * * @param eventSetName * the programmatic name of the event set, generally starting with a * lowercase letter (i.e. fooManChu instead of FooManChu). @@ -504,14 +504,14 @@ public class EventSetDescriptor extends FeatureDescriptor { listenerMethodDescriptors = new MethodDescriptor[listenerMethods.length]; - + for (int i = 0; i < listenerMethods.length; i++) { listenerMethodDescriptors[i] = new MethodDescriptor(listenerMethods[i]); } } - + return listenerMethodDescriptors; } @@ -539,7 +539,7 @@ public class EventSetDescriptor extends FeatureDescriptor } /** Sets whether or not multiple listeners may be added. - * + * * @param unicast * whether or not multiple listeners may be added. */ @@ -557,7 +557,7 @@ public class EventSetDescriptor extends FeatureDescriptor } /** Sets whether or not this is in the default event set. - * + * * @param inDefaultEventSet * whether this is in the default event set. */ @@ -759,5 +759,5 @@ public class EventSetDescriptor extends FeatureDescriptor this.listenerMethods[i] = (Method) chosenMethods.elementAt(i); } } - + } diff --git a/libjava/classpath/java/beans/Expression.java b/libjava/classpath/java/beans/Expression.java index b327864d95f..d07c28b4ad4 100644 --- a/libjava/classpath/java/beans/Expression.java +++ b/libjava/classpath/java/beans/Expression.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,13 +40,13 @@ package java.beans; /** *

    An Expression captures the execution of an object method * that returns a value.

    - * + * *

    It stores an object, the method to call, and the arguments to pass to * the method.

    - * + * *

    While this class can generally be used to describe method calls it is - * part of the XML serialization API.

    - * + * part of the XML serialization API.

    + * * @author Robert Schuster (robertschuster@fsfe.org) * @since 1.4 */ @@ -63,7 +63,7 @@ public class Expression extends Statement * Constructor Constructs an Expression representing the invocation of * object.methodName(arg[0], arg[1], ...); However, it will never be executed. * Instead, value will always be returned. - * + * * @param value * The value to return. * @param target @@ -83,7 +83,7 @@ public class Expression extends Statement /** * Constructor Constructs an Expression representing the invocation of * object.methodName(arg[0], arg[1], ...); - * + * * @param target * The object to invoke the method on. * @param methodName @@ -102,7 +102,7 @@ public class Expression extends Statement * been set, the method is executed in the same way as Statement.execute(), * except that the value is cached, and then returned. If the value has been * set, it is returned without executing the method again. - * + * * @return the result of executing the method. * @exception Exception * if an error occurs @@ -116,7 +116,7 @@ public class Expression extends Statement /** * Set the cached value to be returned by getValue() - * + * * @param value * the value to cache and return. */ diff --git a/libjava/classpath/java/beans/FeatureDescriptor.java b/libjava/classpath/java/beans/FeatureDescriptor.java index 050885158fa..87e4a2fe7a4 100644 --- a/libjava/classpath/java/beans/FeatureDescriptor.java +++ b/libjava/classpath/java/beans/FeatureDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/beans/IndexedPropertyChangeEvent.java b/libjava/classpath/java/beans/IndexedPropertyChangeEvent.java index 1a7306d14db..9c46e1fa178 100644 --- a/libjava/classpath/java/beans/IndexedPropertyChangeEvent.java +++ b/libjava/classpath/java/beans/IndexedPropertyChangeEvent.java @@ -71,7 +71,7 @@ public class IndexedPropertyChangeEvent extends PropertyChangeEvent } /** - * Return the index of the changed property. + * Return the index of the changed property. * @return the index */ public int getIndex() diff --git a/libjava/classpath/java/beans/IndexedPropertyDescriptor.java b/libjava/classpath/java/beans/IndexedPropertyDescriptor.java index 61c3f228da0..b7914133a5c 100644 --- a/libjava/classpath/java/beans/IndexedPropertyDescriptor.java +++ b/libjava/classpath/java/beans/IndexedPropertyDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -175,7 +175,7 @@ public class IndexedPropertyDescriptor extends PropertyDescriptor * Create a new PropertyDescriptor using explicit Methods. * Note that the methods will be checked for conformance to standard * Property method rules, as described above at the top of this class. - * + * * @param name the programmatic name of the property, usually * starting with a lowercase letter (e.g. fooManChu * instead of FooManChu). diff --git a/libjava/classpath/java/beans/Introspector.java b/libjava/classpath/java/beans/Introspector.java index 28df87f677f..76412e022ed 100644 --- a/libjava/classpath/java/beans/Introspector.java +++ b/libjava/classpath/java/beans/Introspector.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -94,7 +94,7 @@ import java.util.Vector; * * * Properties:

    - * + * *

      *
    1. If there is a public boolean isXXX() * method, then XXX is a read-only boolean property. @@ -167,7 +167,7 @@ import java.util.Vector; * not the case in general.

      * * Methods:

      - * + * * Any public methods (including those which were used * for Properties or Events) are used as Methods. * @@ -176,18 +176,18 @@ import java.util.Vector; * @see java.beans.BeanInfo */ public class Introspector { - + public static final int USE_ALL_BEANINFO = 1; public static final int IGNORE_IMMEDIATE_BEANINFO = 2; public static final int IGNORE_ALL_BEANINFO = 3; static String[] beanInfoSearchPath = {"gnu.java.beans.info"}; - static Hashtable,BeanInfo> beanInfoCache = + static Hashtable,BeanInfo> beanInfoCache = new Hashtable,BeanInfo>(); - + private Introspector() {} - - /** + + /** * Get the BeanInfo for class beanClass, * first by looking for explicit information, next by * using standard design patterns to determine @@ -196,32 +196,32 @@ public class Introspector { * @param beanClass the class to get BeanInfo about. * @return the BeanInfo object representing the class. */ - public static BeanInfo getBeanInfo(Class beanClass) - throws IntrospectionException + public static BeanInfo getBeanInfo(Class beanClass) + throws IntrospectionException { BeanInfo cachedInfo; - synchronized(beanClass) + synchronized(beanClass) { - cachedInfo = beanInfoCache.get(beanClass); - if(cachedInfo != null) - { - return cachedInfo; - } - cachedInfo = getBeanInfo(beanClass,null); - beanInfoCache.put(beanClass,cachedInfo); - return cachedInfo; + cachedInfo = beanInfoCache.get(beanClass); + if(cachedInfo != null) + { + return cachedInfo; + } + cachedInfo = getBeanInfo(beanClass,null); + beanInfoCache.put(beanClass,cachedInfo); + return cachedInfo; } } - + /** * Returns a {@BeanInfo} instance for the given Bean class where a flag * controls the usage of explicit BeanInfo class to retrieve that * information. - * + * *

      You have three options:

      *

      With {@link #USE_ALL_BEANINFO} the result is the same as * {@link #getBeanInfo(Class)}.

      - * + * *

      Calling the method with flag set to * {@link #IGNORE_IMMEDIATE_BEANINFO} will let it use all * explicit BeanInfo classes for the beans superclasses @@ -232,17 +232,17 @@ public class Introspector { * {@link BeanInfo.getEventSetDescriptors} and * {@link BeanInfo.getPropertyDescriptors}.) *

      - * + * *

      When the method is called with flag - * + * *

      Note: Any unknown value for flag is interpreted * as {@link #IGNORE_ALL_BEANINFO}

      . - * + * * @param beanClass The class whose BeanInfo should be returned. * @param flag Controls the usage of explicit BeanInfo classes. - * @return A BeanInfo object describing the class. + * @return A BeanInfo object describing the class. * @throws IntrospectionException If something goes wrong while retrieving * the bean data. */ @@ -251,7 +251,7 @@ public class Introspector { { IntrospectionIncubator ii; BeanInfoEmbryo infoEmbryo; - + switch(flag) { case USE_ALL_BEANINFO: @@ -259,24 +259,24 @@ public class Introspector { case IGNORE_IMMEDIATE_BEANINFO: Class superclass = beanClass.getSuperclass(); ExplicitInfo explicit = new ExplicitInfo(superclass, null); - + ii = new IntrospectionIncubator(); if (explicit.explicitEventSetDescriptors != null) ii.setEventStopClass(superclass); - + if (explicit.explicitMethodDescriptors != null) ii.setMethodStopClass(superclass); - + if (explicit.explicitPropertyDescriptors != null) ii.setPropertyStopClass(superclass); - + ii.addMethods(beanClass.getMethods()); infoEmbryo = ii.getBeanInfoEmbryo(); merge(infoEmbryo, explicit); infoEmbryo.setBeanDescriptor(new BeanDescriptor(beanClass, null)); - + return infoEmbryo.getBeanInfo(); case IGNORE_ALL_BEANINFO: default: @@ -284,7 +284,7 @@ public class Introspector { ii.addMethods(beanClass.getMethods()); infoEmbryo = ii.getBeanInfoEmbryo(); infoEmbryo.setBeanDescriptor(new BeanDescriptor(beanClass, null)); - + return infoEmbryo.getBeanInfo(); } } @@ -298,11 +298,11 @@ public class Introspector { { beanInfoCache.clear(); - // Clears all the intermediate ExplicitInfo instances which - // have been created. - // This makes sure we have to retrieve stuff like BeanDescriptors - // again. (Remember that FeatureDescriptor can be modified by the user.) - ExplicitInfo.flushCaches(); + // Clears all the intermediate ExplicitInfo instances which + // have been created. + // This makes sure we have to retrieve stuff like BeanDescriptors + // again. (Remember that FeatureDescriptor can be modified by the user.) + ExplicitInfo.flushCaches(); } /** @@ -317,62 +317,62 @@ public class Introspector { { synchronized (clz) { - beanInfoCache.remove(clz); + beanInfoCache.remove(clz); } } /** Adds all explicity given bean info data to the introspected * data. - * + * * @param infoEmbryo Bean info data retrieved by introspection. * @param explicit Bean info data retrieved by BeanInfo classes. */ private static void merge(BeanInfoEmbryo infoEmbryo, ExplicitInfo explicit) { PropertyDescriptor[] p = explicit.explicitPropertyDescriptors; - if(p!=null) + if(p!=null) { - for(int i=0;i -1) + if(explicit.defaultProperty > -1) { infoEmbryo.setDefaultPropertyName(p[explicit.defaultProperty].getName()); } } EventSetDescriptor[] e = explicit.explicitEventSetDescriptors; - if(e!=null) + if(e!=null) { - for(int i=0;i -1) + if(explicit.defaultEvent > -1) { infoEmbryo.setDefaultEventName(e[explicit.defaultEvent].getName()); } } MethodDescriptor[] m = explicit.explicitMethodDescriptors; - if(m!=null) + if(m!=null) { - for(int i=0;ibeanClass, * first by looking for explicit information, next by * using standard design patterns to determine @@ -395,8 +395,8 @@ public class Introspector { * @param stopClass the class to stop at. * @return the BeanInfo object representing the class. */ - public static BeanInfo getBeanInfo(Class beanClass, Class stopClass) - throws IntrospectionException + public static BeanInfo getBeanInfo(Class beanClass, Class stopClass) + throws IntrospectionException { ExplicitInfo explicit = new ExplicitInfo(beanClass, stopClass); @@ -405,11 +405,11 @@ public class Introspector { ii.setEventStopClass(explicit.eventStopClass); ii.setMethodStopClass(explicit.methodStopClass); ii.addMethods(beanClass.getMethods()); - + BeanInfoEmbryo currentInfo = ii.getBeanInfoEmbryo(); - + merge(currentInfo, explicit); - + // Sets the info's BeanDescriptor to the one we extracted from the // explicit BeanInfo instance(s) if they contained one. Otherwise we // create the BeanDescriptor from scratch. @@ -417,33 +417,33 @@ public class Introspector { // the user to modify the instance while it is cached. However this is how // the RI does it. currentInfo.setBeanDescriptor( - (explicit.explicitBeanDescriptor == null ? + (explicit.explicitBeanDescriptor == null ? new BeanDescriptor(beanClass, null) : - explicit.explicitBeanDescriptor)); + explicit.explicitBeanDescriptor)); return currentInfo.getBeanInfo(); } - - /** + + /** * Get the search path for BeanInfo classes. * * @return the BeanInfo search path. */ - public static String[] getBeanInfoSearchPath() + public static String[] getBeanInfoSearchPath() { return beanInfoSearchPath; } - - /** + + /** * Set the search path for BeanInfo classes. * @param beanInfoSearchPath the new BeanInfo search * path. */ - public static void setBeanInfoSearchPath(String[] beanInfoSearchPath) + public static void setBeanInfoSearchPath(String[] beanInfoSearchPath) { Introspector.beanInfoSearchPath = beanInfoSearchPath; } - - /** + + /** * A helper method to convert a name to standard Java * naming conventions: anything with two capitals as the * first two letters remains the same, otherwise the @@ -453,80 +453,80 @@ public class Introspector { * @param name the name to decapitalize. * @return the decapitalized name. */ - public static String decapitalize(String name) + public static String decapitalize(String name) { - try + try { - if(!Character.isUpperCase(name.charAt(0))) - { - return name; - } - else - { - try - { - if(Character.isUpperCase(name.charAt(1))) - { - return name; - } - else - { - char[] c = name.toCharArray(); - c[0] = Character.toLowerCase(c[0]); - return new String(c); - } - } - catch(StringIndexOutOfBoundsException E) - { - char[] c = new char[1]; - c[0] = Character.toLowerCase(name.charAt(0)); - return new String(c); - } - } - } - catch(StringIndexOutOfBoundsException E) + if(!Character.isUpperCase(name.charAt(0))) + { + return name; + } + else + { + try + { + if(Character.isUpperCase(name.charAt(1))) + { + return name; + } + else + { + char[] c = name.toCharArray(); + c[0] = Character.toLowerCase(c[0]); + return new String(c); + } + } + catch(StringIndexOutOfBoundsException E) + { + char[] c = new char[1]; + c[0] = Character.toLowerCase(name.charAt(0)); + return new String(c); + } + } + } + catch(StringIndexOutOfBoundsException E) { - return name; - } - catch(NullPointerException E) + return name; + } + catch(NullPointerException E) { - return null; + return null; } } - static BeanInfo copyBeanInfo(BeanInfo b) + static BeanInfo copyBeanInfo(BeanInfo b) { java.awt.Image[] icons = new java.awt.Image[4]; - for(int i=1;i<=4;i++) + for(int i=1;i<=4;i++) { - icons[i-1] = b.getIcon(i); + icons[i-1] = b.getIcon(i); } return new ExplicitBeanInfo(b.getBeanDescriptor(), - b.getAdditionalBeanInfo(), - b.getPropertyDescriptors(), - b.getDefaultPropertyIndex(), - b.getEventSetDescriptors(), - b.getDefaultEventIndex(), - b.getMethodDescriptors(), - icons); + b.getAdditionalBeanInfo(), + b.getPropertyDescriptors(), + b.getDefaultPropertyIndex(), + b.getEventSetDescriptors(), + b.getDefaultEventIndex(), + b.getMethodDescriptors(), + icons); } } -class ExplicitInfo +class ExplicitInfo { BeanDescriptor explicitBeanDescriptor; BeanInfo[] explicitBeanInfo; - + PropertyDescriptor[] explicitPropertyDescriptors; EventSetDescriptor[] explicitEventSetDescriptors; MethodDescriptor[] explicitMethodDescriptors; - + int defaultProperty; int defaultEvent; - + java.awt.Image[] im = new java.awt.Image[4]; - + Class propertyStopClass; Class eventStopClass; Class methodStopClass; @@ -534,119 +534,119 @@ class ExplicitInfo static Hashtable explicitBeanInfos = new Hashtable(); static Vector emptyBeanInfos = new Vector(); - ExplicitInfo(Class beanClass, Class stopClass) + ExplicitInfo(Class beanClass, Class stopClass) { - while(beanClass != null && !beanClass.equals(stopClass)) + while(beanClass != null && !beanClass.equals(stopClass)) { - BeanInfo explicit = findExplicitBeanInfo(beanClass); - + BeanInfo explicit = findExplicitBeanInfo(beanClass); - if(explicit != null) - { - if(explicitBeanDescriptor == null) - { - explicitBeanDescriptor = explicit.getBeanDescriptor(); - } + if(explicit != null) + { - if(explicitBeanInfo == null) - { - explicitBeanInfo = explicit.getAdditionalBeanInfo(); - } + if(explicitBeanDescriptor == null) + { + explicitBeanDescriptor = explicit.getBeanDescriptor(); + } - if(explicitPropertyDescriptors == null) - { - if(explicit.getPropertyDescriptors() != null) - { - explicitPropertyDescriptors = explicit.getPropertyDescriptors(); - defaultProperty = explicit.getDefaultPropertyIndex(); - propertyStopClass = beanClass; - } - } + if(explicitBeanInfo == null) + { + explicitBeanInfo = explicit.getAdditionalBeanInfo(); + } - if(explicitEventSetDescriptors == null) - { - if(explicit.getEventSetDescriptors() != null) - { - explicitEventSetDescriptors = explicit.getEventSetDescriptors(); - defaultEvent = explicit.getDefaultEventIndex(); - eventStopClass = beanClass; - } - } + if(explicitPropertyDescriptors == null) + { + if(explicit.getPropertyDescriptors() != null) + { + explicitPropertyDescriptors = explicit.getPropertyDescriptors(); + defaultProperty = explicit.getDefaultPropertyIndex(); + propertyStopClass = beanClass; + } + } - if(explicitMethodDescriptors == null) - { - if(explicit.getMethodDescriptors() != null) - { - explicitMethodDescriptors = explicit.getMethodDescriptors(); - methodStopClass = beanClass; - } - } + if(explicitEventSetDescriptors == null) + { + if(explicit.getEventSetDescriptors() != null) + { + explicitEventSetDescriptors = explicit.getEventSetDescriptors(); + defaultEvent = explicit.getDefaultEventIndex(); + eventStopClass = beanClass; + } + } - if(im[0] == null && im[1] == null - && im[2] == null && im[3] == null) - { - im[0] = explicit.getIcon(0); - im[1] = explicit.getIcon(1); - im[2] = explicit.getIcon(2); - im[3] = explicit.getIcon(3); - } - } - beanClass = beanClass.getSuperclass(); + if(explicitMethodDescriptors == null) + { + if(explicit.getMethodDescriptors() != null) + { + explicitMethodDescriptors = explicit.getMethodDescriptors(); + methodStopClass = beanClass; + } + } + + if(im[0] == null && im[1] == null + && im[2] == null && im[3] == null) + { + im[0] = explicit.getIcon(0); + im[1] = explicit.getIcon(1); + im[2] = explicit.getIcon(2); + im[3] = explicit.getIcon(3); + } + } + beanClass = beanClass.getSuperclass(); } - if(propertyStopClass == null) + if(propertyStopClass == null) { - propertyStopClass = stopClass; + propertyStopClass = stopClass; } - if(eventStopClass == null) + if(eventStopClass == null) { - eventStopClass = stopClass; + eventStopClass = stopClass; } - if(methodStopClass == null) + if(methodStopClass == null) { - methodStopClass = stopClass; + methodStopClass = stopClass; } } - + /** Throws away all cached data and makes sure we re-instantiate things * like BeanDescriptors again. */ static void flushCaches() { - explicitBeanInfos.clear(); - emptyBeanInfos.clear(); + explicitBeanInfos.clear(); + emptyBeanInfos.clear(); } - - static BeanInfo findExplicitBeanInfo(Class beanClass) + + static BeanInfo findExplicitBeanInfo(Class beanClass) { BeanInfo retval = (BeanInfo)explicitBeanInfos.get(beanClass); - if(retval != null) + if(retval != null) { - return retval; - } - else if(emptyBeanInfos.indexOf(beanClass) != -1) + return retval; + } + else if(emptyBeanInfos.indexOf(beanClass) != -1) { - return null; - } - else + return null; + } + else { - retval = reallyFindExplicitBeanInfo(beanClass); - if(retval != null) - { - explicitBeanInfos.put(beanClass,retval); - } - else - { - emptyBeanInfos.addElement(beanClass); - } - return retval; + retval = reallyFindExplicitBeanInfo(beanClass); + if(retval != null) + { + explicitBeanInfos.put(beanClass,retval); + } + else + { + emptyBeanInfos.addElement(beanClass); + } + return retval; } } - - static BeanInfo reallyFindExplicitBeanInfo(Class beanClass) + + static BeanInfo reallyFindExplicitBeanInfo(Class beanClass) { ClassLoader beanClassLoader = beanClass.getClassLoader(); BeanInfo beanInfo; @@ -654,25 +654,25 @@ class ExplicitInfo beanInfo = getBeanInfo(beanClassLoader, beanClass.getName() + "BeanInfo"); if (beanInfo == null) { - String newName; - newName = ClassHelper.getTruncatedClassName(beanClass) + "BeanInfo"; + String newName; + newName = ClassHelper.getTruncatedClassName(beanClass) + "BeanInfo"; - for(int i = 0; i < Introspector.beanInfoSearchPath.length; i++) - { - if (Introspector.beanInfoSearchPath[i].equals("")) - beanInfo = getBeanInfo(beanClassLoader, newName); - else - beanInfo = getBeanInfo(beanClassLoader, - Introspector.beanInfoSearchPath[i] + "." - + newName); + for(int i = 0; i < Introspector.beanInfoSearchPath.length; i++) + { + if (Introspector.beanInfoSearchPath[i].equals("")) + beanInfo = getBeanInfo(beanClassLoader, newName); + else + beanInfo = getBeanInfo(beanClassLoader, + Introspector.beanInfoSearchPath[i] + "." + + newName); - // Returns the beanInfo if it exists and the described class matches - // the one we searched. - if (beanInfo != null && beanInfo.getBeanDescriptor() != null && - beanInfo.getBeanDescriptor().getBeanClass() == beanClass) + // Returns the beanInfo if it exists and the described class matches + // the one we searched. + if (beanInfo != null && beanInfo.getBeanDescriptor() != null && + beanInfo.getBeanDescriptor().getBeanClass() == beanClass) - return beanInfo; - } + return beanInfo; + } } return beanInfo; @@ -686,20 +686,20 @@ class ExplicitInfo { try { - return (BeanInfo) Class.forName(infoName, true, cl).newInstance(); + return (BeanInfo) Class.forName(infoName, true, cl).newInstance(); } catch (ClassNotFoundException cnfe) { - return null; + return null; } catch (IllegalAccessException iae) { - return null; + return null; } catch (InstantiationException ie) { - return null; + return null; } } - + } diff --git a/libjava/classpath/java/beans/MethodDescriptor.java b/libjava/classpath/java/beans/MethodDescriptor.java index 123dba60cc9..0185fde81d7 100644 --- a/libjava/classpath/java/beans/MethodDescriptor.java +++ b/libjava/classpath/java/beans/MethodDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,40 +49,39 @@ import java.lang.reflect.Method; ** @version 1.1.0, 26 Jul 1998 **/ public class MethodDescriptor extends FeatureDescriptor { - private Method m; - private ParameterDescriptor[] parameterDescriptors; + private Method m; + private ParameterDescriptor[] parameterDescriptors; - /** Create a new MethodDescriptor. - ** This method sets the name to the name of the method (Method.getName()). - ** @param m the method it will represent. - **/ - public MethodDescriptor(Method m) { - setName(m.getName()); - this.m = m; - } + /** Create a new MethodDescriptor. + ** This method sets the name to the name of the method (Method.getName()). + ** @param m the method it will represent. + **/ + public MethodDescriptor(Method m) { + setName(m.getName()); + this.m = m; + } - /** Create a new MethodDescriptor. - ** This method sets the name to the name of the method (Method.getName()). - ** @param m the method it will represent. - ** @param parameterDescriptors descriptions of the parameters (especially names). - **/ - public MethodDescriptor(Method m, ParameterDescriptor[] parameterDescriptors) { - setName(m.getName()); - this.m = m; - this.parameterDescriptors = parameterDescriptors; - } + /** Create a new MethodDescriptor. + ** This method sets the name to the name of the method (Method.getName()). + ** @param m the method it will represent. + ** @param parameterDescriptors descriptions of the parameters (especially names). + **/ + public MethodDescriptor(Method m, ParameterDescriptor[] parameterDescriptors) { + setName(m.getName()); + this.m = m; + this.parameterDescriptors = parameterDescriptors; + } - /** Get the parameter descriptors from this method. - ** Since MethodDescriptor has no way of determining what - ** the parameter names were, this defaults to null. - **/ - public ParameterDescriptor[] getParameterDescriptors() { - return parameterDescriptors; - } + /** Get the parameter descriptors from this method. + ** Since MethodDescriptor has no way of determining what + ** the parameter names were, this defaults to null. + **/ + public ParameterDescriptor[] getParameterDescriptors() { + return parameterDescriptors; + } - /** Get the method this MethodDescriptor represents. **/ - public Method getMethod() { - return m; - } + /** Get the method this MethodDescriptor represents. **/ + public Method getMethod() { + return m; + } } - diff --git a/libjava/classpath/java/beans/ParameterDescriptor.java b/libjava/classpath/java/beans/ParameterDescriptor.java index 8ea93a9bd8d..148690066e3 100644 --- a/libjava/classpath/java/beans/ParameterDescriptor.java +++ b/libjava/classpath/java/beans/ParameterDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,5 +48,5 @@ package java.beans; ** @version 1.1.0, 26 Jul 1998 **/ public class ParameterDescriptor extends FeatureDescriptor { - + } diff --git a/libjava/classpath/java/beans/PersistenceDelegate.java b/libjava/classpath/java/beans/PersistenceDelegate.java index a6f71576349..d4e777844d5 100644 --- a/libjava/classpath/java/beans/PersistenceDelegate.java +++ b/libjava/classpath/java/beans/PersistenceDelegate.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,12 +40,12 @@ package java.beans; /**

      A PersistenceDelegate describes how a another object * has to constructed and transformed in order to create a complete * replicate.

      - * + * *

      For custom classes you will need to implement * PersistenceDelegate in a way that is suitable for them. * To make use of the implementation you have to register it with an * {@link Encoder} using the {Encoder#setPersistenceDelegate} method.

      - * + * * @author Robert Schuster (robertschuster@fsfe.org) * @since 1.4 */ @@ -60,7 +60,7 @@ public abstract class PersistenceDelegate type = type.getSuperclass(); PersistenceDelegate pd = out.getPersistenceDelegate(type); - + pd.initialize(type, oldInstance, newInstance, out); } } diff --git a/libjava/classpath/java/beans/PropertyChangeSupport.java b/libjava/classpath/java/beans/PropertyChangeSupport.java index ecadb146fd7..3f3f53d4239 100644 --- a/libjava/classpath/java/beans/PropertyChangeSupport.java +++ b/libjava/classpath/java/beans/PropertyChangeSupport.java @@ -404,7 +404,7 @@ public class PropertyChangeSupport implements Serializable /** * Fire an indexed property change event. This will only fire - * an event if the old and new values are not equal and not null. + * an event if the old and new values are not equal and not null. * @param name the name of the property which changed * @param index the index of the property which changed * @param oldValue the old value of the property diff --git a/libjava/classpath/java/beans/PropertyDescriptor.java b/libjava/classpath/java/beans/PropertyDescriptor.java index 4b586d915de..a74fa7b1392 100644 --- a/libjava/classpath/java/beans/PropertyDescriptor.java +++ b/libjava/classpath/java/beans/PropertyDescriptor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -100,7 +100,7 @@ public class PropertyDescriptor extends FeatureDescriptor ** starting with a lowercase letter (e.g. fooManChu ** instead of FooManChu). ** @param beanClass the class the get and set methods live in. - ** @exception IntrospectionException if the methods are not found + ** @exception IntrospectionException if the methods are not found ** or invalid. **/ public PropertyDescriptor(String name, Class beanClass) @@ -126,7 +126,7 @@ public class PropertyDescriptor extends FeatureDescriptor "Cannot find a " + caps + " method"); } - // finally check the methods compatibility + // finally check the methods compatibility propertyType = checkMethods(getMethod, setMethod); } @@ -154,7 +154,7 @@ public class PropertyDescriptor extends FeatureDescriptor ** @param beanClass the class the get and set methods live in. ** @param getMethodName the name of the get method or null if the property is write-only. ** @param setMethodName the name of the set method or null if the property is read-only. - ** @exception IntrospectionException if the methods are not found + ** @exception IntrospectionException if the methods are not found ** or invalid. **/ public PropertyDescriptor( @@ -188,13 +188,13 @@ public class PropertyDescriptor extends FeatureDescriptor **
      ** It is possible to call this method with both Method arguments ** being null. In such a case the property type is null. - ** + ** ** @param name the programmatic name of the property, usually ** starting with a lowercase letter (e.g. fooManChu ** instead of FooManChu). ** @param readMethod the read method or null if the property is write-only. ** @param writeMethod the write method or null if the property is read-only. - ** @exception IntrospectionException if the methods are not found + ** @exception IntrospectionException if the methods are not found ** or invalid. **/ public PropertyDescriptor( @@ -234,7 +234,7 @@ public class PropertyDescriptor extends FeatureDescriptor *
      * It is legal to set the read and the write method to null * or provide method which have been declared in distinct classes. - * + * * @param readMethod The new method to be used or null. * @throws IntrospectionException If the given method is invalid. * @since 1.2 @@ -262,7 +262,7 @@ public class PropertyDescriptor extends FeatureDescriptor *
      * It is legal to set the read and the write method to null * or provide method which have been declared in distinct classes. - * + * * @param writeMethod The new method to be used or null. * @throws IntrospectionException If the given method is invalid. * @since 1.2 @@ -338,7 +338,7 @@ public class PropertyDescriptor extends FeatureDescriptor /** Set the PropertyEditor class. If the class does not implement ** the PropertyEditor interface, you will likely get an exception ** late in the game. - ** @param propertyEditorClass the PropertyEditor class for this + ** @param propertyEditorClass the PropertyEditor class for this ** class to use. **/ public void setPropertyEditorClass(Class propertyEditorClass) @@ -510,7 +510,7 @@ public class PropertyDescriptor extends FeatureDescriptor *
      * For compatibility this has to be noted:
      * The two methods are allowed to be defined in two distinct classes and may both be null. - * + * * @param readMethod The new read method to check. * @param writeMethod The new write method to check. * @return The common property type of the two method. @@ -566,7 +566,7 @@ public class PropertyDescriptor extends FeatureDescriptor } /* note: the check whether both method are defined in related classes makes sense but is not - * done in the JDK. + * done in the JDK. * I leave this code here in case someone at Sun decides to add that functionality in later versions (rschuster) if ((!readMethod .getDeclaringClass() @@ -659,7 +659,7 @@ public class PropertyDescriptor extends FeatureDescriptor { return false; } - + } } diff --git a/libjava/classpath/java/beans/PropertyEditor.java b/libjava/classpath/java/beans/PropertyEditor.java index d1c5103419f..5fba014eae9 100644 --- a/libjava/classpath/java/beans/PropertyEditor.java +++ b/libjava/classpath/java/beans/PropertyEditor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -109,101 +109,101 @@ package java.beans; **/ public interface PropertyEditor { - /** Called by the RAD tool to set the value of this property for the PropertyEditor. - ** If the property type is native, it should be wrapped in the appropriate - ** wrapper type. - ** @param value the value to set this property to. - **/ - void setValue(Object value); + /** Called by the RAD tool to set the value of this property for the PropertyEditor. + ** If the property type is native, it should be wrapped in the appropriate + ** wrapper type. + ** @param value the value to set this property to. + **/ + void setValue(Object value); - /** Accessor method to get the current value the PropertyEditor is working with. - ** If the property type is native, it will be wrapped in the appropriate - ** wrapper type. - ** @return the current value of the PropertyEditor. - **/ - Object getValue(); + /** Accessor method to get the current value the PropertyEditor is working with. + ** If the property type is native, it will be wrapped in the appropriate + ** wrapper type. + ** @return the current value of the PropertyEditor. + **/ + Object getValue(); - /** Set the value of this property using a String. - ** Whether or not this PropertyEditor is editing a String type, this converts - ** the String into the type of the PropertyEditor. - ** @param text the text to set it to. - ** @exception IllegalArgumentException if the String is in the wrong format or setAsText() is not supported. - **/ - void setAsText(String text) throws IllegalArgumentException; + /** Set the value of this property using a String. + ** Whether or not this PropertyEditor is editing a String type, this converts + ** the String into the type of the PropertyEditor. + ** @param text the text to set it to. + ** @exception IllegalArgumentException if the String is in the wrong format or setAsText() is not supported. + **/ + void setAsText(String text) throws IllegalArgumentException; - /** Get the value of this property in String format. - ** Many times this can simply use Object.toString().

      - ** Return null if you do not support getAsText()/setAsText(). - ** setAsText(getAsText()) should be valid; i.e. the stuff you spit out in - ** getAsText() should be able to go into setAsText(). - ** @return the value of this property in String format. - **/ - String getAsText(); + /** Get the value of this property in String format. + ** Many times this can simply use Object.toString().

      + ** Return null if you do not support getAsText()/setAsText(). + ** setAsText(getAsText()) should be valid; i.e. the stuff you spit out in + ** getAsText() should be able to go into setAsText(). + ** @return the value of this property in String format. + **/ + String getAsText(); - /** Get a list of possible Strings which this property type can have. - ** The value of these will be used by the RAD tool to construct some sort - ** of list box or to check text box input, and the resulting String passed - ** to setAsText() should be one of these. Note, however, that like most things - ** with this mammoth, unwieldy interface, this is not guaranteed. Thus, you - ** must check the value in setAsText() anyway. - ** @return the list of possible String values for this property type. - **/ - String[] getTags(); + /** Get a list of possible Strings which this property type can have. + ** The value of these will be used by the RAD tool to construct some sort + ** of list box or to check text box input, and the resulting String passed + ** to setAsText() should be one of these. Note, however, that like most things + ** with this mammoth, unwieldy interface, this is not guaranteed. Thus, you + ** must check the value in setAsText() anyway. + ** @return the list of possible String values for this property type. + **/ + String[] getTags(); - /** The RAD tool calls this to find out whether the PropertyEditor can paint itself. - ** @return true if it can paint itself graphically, false if it cannot. - **/ - boolean isPaintable(); + /** The RAD tool calls this to find out whether the PropertyEditor can paint itself. + ** @return true if it can paint itself graphically, false if it cannot. + **/ + boolean isPaintable(); - /** The RAD tool calls this to paint the actual value of the property. - ** The Graphics context will have the same current font, color, etc. as the - ** parent Container. You may safely change the font, color, etc. and not - ** change them back.

      - ** This method should do a silent no-op if isPaintable() is false. - ** @param g the Graphics context to paint on - ** @param bounds the rectangle you have reserved to work in - **/ - void paintValue(java.awt.Graphics g, java.awt.Rectangle bounds); + /** The RAD tool calls this to paint the actual value of the property. + ** The Graphics context will have the same current font, color, etc. as the + ** parent Container. You may safely change the font, color, etc. and not + ** change them back.

      + ** This method should do a silent no-op if isPaintable() is false. + ** @param g the Graphics context to paint on + ** @param bounds the rectangle you have reserved to work in + **/ + void paintValue(java.awt.Graphics g, java.awt.Rectangle bounds); - /** The RAD tool calls this to find out whether the PropertyEditor supports a custom component to edit and display itself. - ** @return true if getCustomEditor() will return a component, false if not. - **/ - boolean supportsCustomEditor(); + /** The RAD tool calls this to find out whether the PropertyEditor supports a custom component to edit and display itself. + ** @return true if getCustomEditor() will return a component, false if not. + **/ + boolean supportsCustomEditor(); - /** The RAD tool calls this to grab the component that can edit this type. - ** The component may be painted anywhere the RAD tool wants to paint it-- - ** even in its own window.

      - ** The component must hook up with the PropertyEditor and, whenever a - ** change to the value is made, fire a PropertyChangeEvent to the source.

      - ** @return the custom editor for this property type. - **/ - java.awt.Component getCustomEditor(); + /** The RAD tool calls this to grab the component that can edit this type. + ** The component may be painted anywhere the RAD tool wants to paint it-- + ** even in its own window.

      + ** The component must hook up with the PropertyEditor and, whenever a + ** change to the value is made, fire a PropertyChangeEvent to the source.

      + ** @return the custom editor for this property type. + **/ + java.awt.Component getCustomEditor(); - /** Adds a property change listener to this PropertyEditor. - ** @param listener the listener to add - **/ - void addPropertyChangeListener(PropertyChangeListener listener); + /** Adds a property change listener to this PropertyEditor. + ** @param listener the listener to add + **/ + void addPropertyChangeListener(PropertyChangeListener listener); - /** Removes a property change listener from this PropertyEditor. - ** @param listener the listener to remove - **/ - void removePropertyChangeListener(PropertyChangeListener listener); + /** Removes a property change listener from this PropertyEditor. + ** @param listener the listener to remove + **/ + void removePropertyChangeListener(PropertyChangeListener listener); - /** Get a Java language-specific String which could be used to create an Object - ** of the specified type. Every PropertyEditor must support this.

      - ** The reason for this is that while most RAD tools will serialize the Beans - ** and deserialize them at runtime, some RAD tools will generate code that - ** creates the Beans. Examples of Java initialization strings would be:

      - **

        - **
      1. 2
        2. - **
      2. "I am a String"
        3. - **
      3. new MyObject(2, "String", new StringBuffer())
        4. - **
      - ** @return the initialization string for this object in Java. - **/ - String getJavaInitializationString(); + /** Get a Java language-specific String which could be used to create an Object + ** of the specified type. Every PropertyEditor must support this.

      + ** The reason for this is that while most RAD tools will serialize the Beans + ** and deserialize them at runtime, some RAD tools will generate code that + ** creates the Beans. Examples of Java initialization strings would be:

      + **

        + **
      1. 2
        2. + **
      2. "I am a String"
        3. + **
      3. new MyObject(2, "String", new StringBuffer())
        4. + **
      + ** @return the initialization string for this object in Java. + **/ + String getJavaInitializationString(); } diff --git a/libjava/classpath/java/beans/PropertyEditorManager.java b/libjava/classpath/java/beans/PropertyEditorManager.java index 0dd3b176dea..253ddafe1fa 100644 --- a/libjava/classpath/java/beans/PropertyEditorManager.java +++ b/libjava/classpath/java/beans/PropertyEditorManager.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -64,7 +64,7 @@ import java.awt.Font; * package and then in the property editor search path. * *

      Default property editors are provided for:

      - * + * *
        *
      1. boolean, byte, short, int, long, float, and double
        2. *
      2. java.lang.String
        3. @@ -143,13 +143,13 @@ public class PropertyEditorManager return (PropertyEditor)found.newInstance(); } - ClassLoader contextClassLoader - = Thread.currentThread().getContextClassLoader(); + ClassLoader contextClassLoader + = Thread.currentThread().getContextClassLoader(); try { found = Class.forName(editedClass.getName()+"Editor", true, - contextClassLoader); + contextClassLoader); registerEditor(editedClass,found); return (PropertyEditor)found.newInstance(); } @@ -158,9 +158,9 @@ public class PropertyEditorManager } String appendName - = "." - + ClassHelper.getTruncatedClassName(editedClass) - + "Editor"; + = "." + + ClassHelper.getTruncatedClassName(editedClass) + + "Editor"; synchronized(editorSearchPath) { for(int i=0;inull        . - **/ - public BeanDescriptor getBeanDescriptor() { - return null; - } + /** Force Introspection of the general bean info. + ** @return null. + **/ + public BeanDescriptor getBeanDescriptor() { + return null; + } - /** Force Introspection of the events this Bean type - ** fires. - ** @return null - **/ - public EventSetDescriptor[] getEventSetDescriptors() { - return null; - } + /** Force Introspection of the events this Bean type + ** fires. + ** @return null + **/ + public EventSetDescriptor[] getEventSetDescriptors() { + return null; + } - /** Say that there is no "default" event set. - ** @return -1. - **/ - public int getDefaultEventIndex() { - return -1; - } + /** Say that there is no "default" event set. + ** @return -1. + **/ + public int getDefaultEventIndex() { + return -1; + } - /** Force Introspection of the Bean properties. - ** @return null. - **/ - public PropertyDescriptor[] getPropertyDescriptors() { - return null; - } + /** Force Introspection of the Bean properties. + ** @return null. + **/ + public PropertyDescriptor[] getPropertyDescriptors() { + return null; + } - /** Say that there is no "default" property. - ** @return -1. - **/ - public int getDefaultPropertyIndex() { - return -1; - } + /** Say that there is no "default" property. + ** @return -1. + **/ + public int getDefaultPropertyIndex() { + return -1; + } - /** Force Introspection of the Bean's methods. - ** @return null. - **/ - public MethodDescriptor[] getMethodDescriptors() { - return null; - } + /** Force Introspection of the Bean's methods. + ** @return null. + **/ + public MethodDescriptor[] getMethodDescriptors() { + return null; + } - /** Tell the Introspector to go look for other BeanInfo - ** itself. - ** @return null. - **/ - public BeanInfo[] getAdditionalBeanInfo() { - return null; - } + /** Tell the Introspector to go look for other BeanInfo + ** itself. + ** @return null. + **/ + public BeanInfo[] getAdditionalBeanInfo() { + return null; + } - /** Say that this Bean has no icons. - ** @param iconType the type of icon - ** @return null. - **/ - public Image getIcon(int iconType) { - return null; - } + /** Say that this Bean has no icons. + ** @param iconType the type of icon + ** @return null. + **/ + public Image getIcon(int iconType) { + return null; + } - /** Helper method to load an image using the Bean class - ** getResource() method on the BeanInfo class (using - ** getClass(), since you'll extend this class to get - ** the BeanInfo). Basically it's assumed that the Bean - ** and its BeanInfo are both loaded by the same - ** ClassLoader, generally a reasonable assumption. - ** @param location the URL relative - ** @return the Image in question (possibly null). - **/ - public Image loadImage(String location) + /** Helper method to load an image using the Bean class + ** getResource() method on the BeanInfo class (using + ** getClass(), since you'll extend this class to get + ** the BeanInfo). Basically it's assumed that the Bean + ** and its BeanInfo are both loaded by the same + ** ClassLoader, generally a reasonable assumption. + ** @param location the URL relative + ** @return the Image in question (possibly null). + **/ + public Image loadImage(String location) { if (location == null) return null; @@ -141,6 +141,5 @@ public class SimpleBeanInfo implements BeanInfo { if (url == null) return null; return Toolkit.getDefaultToolkit().getImage(url); - } + } } - diff --git a/libjava/classpath/java/beans/Statement.java b/libjava/classpath/java/beans/Statement.java index 5ecba37c87d..d9cd304dadc 100644 --- a/libjava/classpath/java/beans/Statement.java +++ b/libjava/classpath/java/beans/Statement.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -100,7 +100,7 @@ public class Statement *
      3. Static methods can be executed by providing the class as a * target.
        4. * - *
      4. The method name new is reserved to call the constructor + *
      5. The method name new is reserved to call the constructor * new() will construct an object and return it. Not useful unless * an expression :-)
        6. * @@ -123,34 +123,34 @@ public class Statement * declared in the source file.

        * * @throws Exception if an exception occurs while locating or - * invoking the method. + * invoking the method. */ public void execute() throws Exception { doExecute(); } - - private static Class wrappers[] = + + private static Class wrappers[] = { Boolean.class, Byte.class, Character.class, Double.class, Float.class, Integer.class, Long.class, Short.class }; - private static Class natives[] = + private static Class natives[] = { Boolean.TYPE, Byte.TYPE, Character.TYPE, Double.TYPE, Float.TYPE, Integer.TYPE, Long.TYPE, Short.TYPE }; /** Given a wrapper class, return the native class for it. - *

        For example, if c is Integer, + *

        For example, if c is Integer, * Integer.TYPE is returned.

        */ private Class unwrap(Class c) { for (int i = 0; i < wrappers.length; i++) if (c == wrappers[i]) - return natives[i]; + return natives[i]; return null; } @@ -168,16 +168,16 @@ public class Statement // any type. if (args[i] == null) continue; - - // Treat Integer like int if appropriate - Class nativeType = unwrap(args[i]); - if (nativeType != null && params[i].isPrimitive() - && params[i].isAssignableFrom(nativeType)) - continue; - if (params[i].isAssignableFrom(args[i])) - continue; - return false; + // Treat Integer like int if appropriate + Class nativeType = unwrap(args[i]); + if (nativeType != null && params[i].isPrimitive() + && params[i].isAssignableFrom(nativeType)) + continue; + if (params[i].isAssignableFrom(args[i])) + continue; + + return false; } return true; } @@ -201,9 +201,9 @@ public class Statement { for (int j=0; j < first.length; j++) { - if (second[j].isAssignableFrom(first[j])) - continue; - return false; + if (second[j].isAssignableFrom(first[j])) + continue; + return false; } return true; } @@ -211,10 +211,10 @@ public class Statement final Object doExecute() throws Exception { Class klazz = (target instanceof Class) - ? (Class) target : target.getClass(); + ? (Class) target : target.getClass(); Object args[] = (arguments == null) ? new Object[0] : arguments; Class argTypes[] = new Class[args.length]; - + // Retrieve type or use null if the argument is null. The null argument // type is later used in compatible(). for (int i = 0; i < args.length; i++) @@ -222,18 +222,18 @@ public class Statement if (target.getClass().isArray()) { - // FIXME: invoke may have to be used. For now, cast to Number - // and hope for the best. If caller didn't behave, we go boom - // and throw the exception. - if (methodName.equals("get") && argTypes.length == 1) - return Array.get(target, ((Number)args[0]).intValue()); - if (methodName.equals("set") && argTypes.length == 2) - { - Object obj = Array.get(target, ((Number)args[0]).intValue()); - Array.set(target, ((Number)args[0]).intValue(), args[1]); - return obj; - } - throw new NoSuchMethodException("No matching method for statement " + toString()); + // FIXME: invoke may have to be used. For now, cast to Number + // and hope for the best. If caller didn't behave, we go boom + // and throw the exception. + if (methodName.equals("get") && argTypes.length == 1) + return Array.get(target, ((Number)args[0]).intValue()); + if (methodName.equals("set") && argTypes.length == 2) + { + Object obj = Array.get(target, ((Number)args[0]).intValue()); + Array.set(target, ((Number)args[0]).intValue(), args[1]); + return obj; + } + throw new NoSuchMethodException("No matching method for statement " + toString()); } // If we already cached the method, just use it. @@ -253,62 +253,62 @@ public class Statement if (methodName.equals("new") && target instanceof Class) { - Constructor ctors[] = klazz.getConstructors(); - for (int i = 0; i < ctors.length; i++) - { - // Skip methods with wrong number of args. - Class ptypes[] = ctors[i].getParameterTypes(); + Constructor ctors[] = klazz.getConstructors(); + for (int i = 0; i < ctors.length; i++) + { + // Skip methods with wrong number of args. + Class ptypes[] = ctors[i].getParameterTypes(); - if (ptypes.length != args.length) - continue; + if (ptypes.length != args.length) + continue; - // Check if method matches - if (!compatible(ptypes, argTypes)) - continue; + // Check if method matches + if (!compatible(ptypes, argTypes)) + continue; - // Use method[i] if it is more specific. - // FIXME: should this check both directions and throw if - // neither is more specific? - if (ctor == null) - { - ctor = ctors[i]; - continue; - } - Class mptypes[] = ctor.getParameterTypes(); - if (moreSpecific(ptypes, mptypes)) - ctor = ctors[i]; - } - if (ctor == null) - throw new InstantiationException("No matching constructor for statement " + toString()); - return ctor.newInstance(args); + // Use method[i] if it is more specific. + // FIXME: should this check both directions and throw if + // neither is more specific? + if (ctor == null) + { + ctor = ctors[i]; + continue; + } + Class mptypes[] = ctor.getParameterTypes(); + if (moreSpecific(ptypes, mptypes)) + ctor = ctors[i]; + } + if (ctor == null) + throw new InstantiationException("No matching constructor for statement " + toString()); + return ctor.newInstance(args); } Method methods[] = klazz.getMethods(); for (int i = 0; i < methods.length; i++) { - // Skip methods with wrong name or number of args. - if (!methods[i].getName().equals(methodName)) - continue; - Class ptypes[] = methods[i].getParameterTypes(); - if (ptypes.length != args.length) - continue; + // Skip methods with wrong name or number of args. + if (!methods[i].getName().equals(methodName)) + continue; + Class ptypes[] = methods[i].getParameterTypes(); + if (ptypes.length != args.length) + continue; - // Check if method matches - if (!compatible(ptypes, argTypes)) - continue; + // Check if method matches + if (!compatible(ptypes, argTypes)) + continue; - // Use method[i] if it is more specific. - // FIXME: should this check both directions and throw if - // neither is more specific? - if (method == null) - { - method = methods[i]; - continue; - } - Class mptypes[] = method.getParameterTypes(); - if (moreSpecific(ptypes, mptypes)) - method = methods[i]; + // Use method[i] if it is more specific. + // FIXME: should this check both directions and throw if + // neither is more specific? + if (method == null) + { + method = methods[i]; + continue; + } + Class mptypes[] = method.getParameterTypes(); + if (moreSpecific(ptypes, mptypes)) + method = methods[i]; } if (method == null) throw new NoSuchMethodException("No matching method for statement " + toString()); @@ -329,7 +329,7 @@ public class Statement return method.invoke(target, args); } catch(IllegalArgumentException iae){ System.err.println("method: " + method); - + for(int i=0;iStatement. - * - * @return A string representation of this Statement. + /** + * Returns a string representation of this Statement. + * + * @return A string representation of this Statement. */ public String toString() { - CPStringBuilder result = new CPStringBuilder(); + CPStringBuilder result = new CPStringBuilder(); String targetName; if (target != null) targetName = target.getClass().getSimpleName(); - else + else targetName = "null"; result.append(targetName); @@ -373,7 +373,7 @@ public class Statement { result.append(sep); result.append( - ( arguments[i] == null ) ? "null" : + ( arguments[i] == null ) ? "null" : ( arguments[i] instanceof String ) ? "\"" + arguments[i] + "\"" : arguments[i].getClass().getSimpleName()); sep = ", "; @@ -382,5 +382,5 @@ public class Statement return result.toString(); } - + } diff --git a/libjava/classpath/java/beans/VetoableChangeSupport.java b/libjava/classpath/java/beans/VetoableChangeSupport.java index f2b6a1df84d..698e82d8f6d 100644 --- a/libjava/classpath/java/beans/VetoableChangeSupport.java +++ b/libjava/classpath/java/beans/VetoableChangeSupport.java @@ -1,5 +1,5 @@ /* VetoableChangeSupport.java -- support to manage vetoable change listeners - Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006, + Copyright (C) 1998, 1999, 2000, 2002, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/beans/Visibility.java b/libjava/classpath/java/beans/Visibility.java index 428f3a2073b..33806018149 100644 --- a/libjava/classpath/java/beans/Visibility.java +++ b/libjava/classpath/java/beans/Visibility.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,32 +54,32 @@ package java.beans; */ public interface Visibility { - /** - * Tells whether the Bean can run without a GUI or not. - * @return false if Bean can run without a GUI, else true. - */ - boolean needsGui(); + /** + * Tells whether the Bean can run without a GUI or not. + * @return false if Bean can run without a GUI, else true. + */ + boolean needsGui(); - /** - * Tells whether Bean is trying not to use the GUI. - * If needsGui() is true, this method should always return false. - * @return true if definitely not using GUI, otherwise false. - */ - boolean avoidingGui(); + /** + * Tells whether Bean is trying not to use the GUI. + * If needsGui() is true, this method should always return false. + * @return true if definitely not using GUI, otherwise false. + */ + boolean avoidingGui(); - /** - * Tells the Bean not to use GUI methods. - * If needsGUI() is false, then after this method is called, - * avoidingGui() should return true. - */ - void dontUseGui(); + /** + * Tells the Bean not to use GUI methods. + * If needsGUI() is false, then after this method is called, + * avoidingGui() should return true. + */ + void dontUseGui(); - /** - * Tells the Bean it may use the GUI. - * The Bean is not required to use the GUI in this case, it is - * merely being permitted to use it. If needsGui() is - * false, avoidingGui() may return true or false after this method - * is called. - */ - void okToUseGui(); + /** + * Tells the Bean it may use the GUI. + * The Bean is not required to use the GUI in this case, it is + * merely being permitted to use it. If needsGui() is + * false, avoidingGui() may return true or false after this method + * is called. + */ + void okToUseGui(); } diff --git a/libjava/classpath/java/beans/XMLDecoder.java b/libjava/classpath/java/beans/XMLDecoder.java index 131cf3b0464..26896393a9e 100644 --- a/libjava/classpath/java/beans/XMLDecoder.java +++ b/libjava/classpath/java/beans/XMLDecoder.java @@ -55,8 +55,8 @@ import java.util.NoSuchElementException; * An example XML document might look like this: * * <java> - * <string>Hello World</string> - * <int>200</int> + * <string>Hello World</string> + * <int>200</int> * </java> * *

        To read the String and the Integer instance the following can be used (assume @@ -71,12 +71,12 @@ import java.util.NoSuchElementException; *

        An owner object can be set using the setOwner method which can then be accessed when * decoding. This feature is only useful if the XML data is aware of the owner object. Such data may * look like this (assume that the owner object is a JFrame instance):

        - * + * * <java> - * <void method="getOwner"> - * <void method="setVisible"> - * <boolean>true<boolean> - * </void> + * <void method="getOwner"> + * <void method="setVisible"> + * <boolean>true<boolean> + * </void> * </void> * </java> * @@ -98,210 +98,210 @@ import java.util.NoSuchElementException; * the resulting XMLDecoder will be silently (without any exception) useless. Each call * to readObject will return null and never throws an * ArrayIndexOutOfBoundsException.

        - * + * * @author Robert Schuster * @since 1.4 * @status updated to 1.5 */ public class XMLDecoder { - private Object owner; + private Object owner; - private ExceptionListener exceptionListener; + private ExceptionListener exceptionListener; - private InputStream inputStream; + private InputStream inputStream; - private boolean isStreamClosed; + private boolean isStreamClosed; - private ClassLoader classLoader; + private ClassLoader classLoader; - private Iterator iterator; + private Iterator iterator; - /** Creates a XMLDecoder instance that parses the XML data of the given input stream. - * Using this constructor no special ClassLoader, a default ExceptionListener - * and no owner object is used. - * - * @param in InputStream to read XML data from. - */ - public XMLDecoder(InputStream in) - { - this(in, null); - } + /** Creates a XMLDecoder instance that parses the XML data of the given input stream. + * Using this constructor no special ClassLoader, a default ExceptionListener + * and no owner object is used. + * + * @param in InputStream to read XML data from. + */ + public XMLDecoder(InputStream in) + { + this(in, null); + } - /** Creates a XMLDecoder instance that parses the XML data of the given input stream. - * Using this constructor no special ClassLoader and a default ExceptionListener - * is used. - * - * @param in InputStream to read XML data from. - * @param owner Owner object which can be accessed and modified while parsing. - */ - public XMLDecoder(InputStream in, Object owner) - { - this(in, owner, null); - } + /** Creates a XMLDecoder instance that parses the XML data of the given input stream. + * Using this constructor no special ClassLoader and a default ExceptionListener + * is used. + * + * @param in InputStream to read XML data from. + * @param owner Owner object which can be accessed and modified while parsing. + */ + public XMLDecoder(InputStream in, Object owner) + { + this(in, owner, null); + } - /** Creates a XMLDecoder instance that parses the XML data of the given input stream. - * If the ExceptionListener argument is null a default implementation is used. - * - * @param in InputStream to read XML data from. - * @param owner Owner object which can be accessed and modified while parsing. - * @param exceptionListener ExceptionListener instance to which exception notifications are send. - */ - public XMLDecoder( - InputStream in, - Object owner, - ExceptionListener exceptionListener) - { - this( - in, - owner, - exceptionListener, - Thread.currentThread().getContextClassLoader()); - } + /** Creates a XMLDecoder instance that parses the XML data of the given input stream. + * If the ExceptionListener argument is null a default implementation is used. + * + * @param in InputStream to read XML data from. + * @param owner Owner object which can be accessed and modified while parsing. + * @param exceptionListener ExceptionListener instance to which exception notifications are send. + */ + public XMLDecoder( + InputStream in, + Object owner, + ExceptionListener exceptionListener) + { + this( + in, + owner, + exceptionListener, + Thread.currentThread().getContextClassLoader()); + } - /** Creates a XMLDecoder instance that parses the XML data of the given input stream. - * If the ExceptionListener argument is null a default implementation is used. - * - * @param in InputStream to read XML data from. - * @param owner Owner object which can be accessed and modified while parsing. - * @param listener ExceptionListener instance to which exception notifications are send. - * @param cl ClassLoader instance that is used for calls to Class.forName(String, boolean, ClassLoader) - * @since 1.5 - */ - public XMLDecoder( - InputStream in, - Object owner, - ExceptionListener listener, - ClassLoader cl) - { - // initially here was a check for the validity of the InputStream argument but some - // great engineers decided that this API should silently discard this and behave rather - // odd: readObject will always return null ... - inputStream = in; + /** Creates a XMLDecoder instance that parses the XML data of the given input stream. + * If the ExceptionListener argument is null a default implementation is used. + * + * @param in InputStream to read XML data from. + * @param owner Owner object which can be accessed and modified while parsing. + * @param listener ExceptionListener instance to which exception notifications are send. + * @param cl ClassLoader instance that is used for calls to Class.forName(String, boolean, ClassLoader) + * @since 1.5 + */ + public XMLDecoder( + InputStream in, + Object owner, + ExceptionListener listener, + ClassLoader cl) + { + // initially here was a check for the validity of the InputStream argument but some + // great engineers decided that this API should silently discard this and behave rather + // odd: readObject will always return null ... + inputStream = in; - setExceptionListener(listener); + setExceptionListener(listener); - // validity of this object is checked in Class.forName() and therefore may be null - classLoader = cl; + // validity of this object is checked in Class.forName() and therefore may be null + classLoader = cl; - this.owner = owner; - } + this.owner = owner; + } - /** Closes the stream associated with this decoder. This should be done after having read all - * decoded objects. - *

        See the description of the {@link #readObject()} for the effect caused by close.

        - */ - public void close() - { - if (isStreamClosed) - { - return; - } + /** Closes the stream associated with this decoder. This should be done after having read all + * decoded objects. + *

        See the description of the {@link #readObject()} for the effect caused by close.

        + */ + public void close() + { + if (isStreamClosed) + { + return; + } - try - { - inputStream.close(); - isStreamClosed = true; - } - catch (IOException e) - { - // bad style forced by original API design ... - } - } + try + { + inputStream.close(); + isStreamClosed = true; + } + catch (IOException e) + { + // bad style forced by original API design ... + } + } - /** Returns the ExceptionListener instance associated with this decoder. - *

        See the description of {@link XMLDecoder} class for more information on the ExceptionListener.

        - * - * @return Current ExceptionListener of the decoder. - */ - public ExceptionListener getExceptionListener() - { - return exceptionListener; - } + /** Returns the ExceptionListener instance associated with this decoder. + *

        See the description of {@link XMLDecoder} class for more information on the ExceptionListener.

        + * + * @return Current ExceptionListener of the decoder. + */ + public ExceptionListener getExceptionListener() + { + return exceptionListener; + } - /** Returns the owner object of the decoder. This method is usually called - * from within the parsed XML data. - *

        See the description of {@link XMLDecoder} class for more information on the owner object.

        - * - * @return The owner object of this decoder. - */ - public Object getOwner() - { - return owner; - } + /** Returns the owner object of the decoder. This method is usually called + * from within the parsed XML data. + *

        See the description of {@link XMLDecoder} class for more information on the owner object.

        + * + * @return The owner object of this decoder. + */ + public Object getOwner() + { + return owner; + } - /** Returns the next available decoded object. - *

        Note that the actual decoding takes place when the method is called for the first time.

        - *

        If the close method was already called a NoSuchElementException - * is thrown.

        - *

        If the InputStream instance used in the constructors was null this method - * will always return null itself.

        - * - * @return The next object in a sequence decoded from XML data. - * @throws ArrayIndexOutOfBoundsException When no more objects are available. - */ - public Object readObject() throws ArrayIndexOutOfBoundsException - { - // note: the RI does it this way ... - if(inputStream == null) { - return null; - } - - // note: the original API documentation says nothing on what to do - // when the stream was closed before readObject is called but it actually - // throws a NoSuchElementException - this behaviour is imitated here - if (isStreamClosed) - { - throw new NoSuchElementException("Cannot read any objects - XMLDecoder was already closed."); - } + /** Returns the next available decoded object. + *

        Note that the actual decoding takes place when the method is called for the first time.

        + *

        If the close method was already called a NoSuchElementException + * is thrown.

        + *

        If the InputStream instance used in the constructors was null this method + * will always return null itself.

        + * + * @return The next object in a sequence decoded from XML data. + * @throws ArrayIndexOutOfBoundsException When no more objects are available. + */ + public Object readObject() throws ArrayIndexOutOfBoundsException + { + // note: the RI does it this way ... + if(inputStream == null) { + return null; + } - // creates the PersistenceParser (doing the parsing and decoding) and returns its - // Iterator on first invocation - if (iterator == null) - { - iterator = - new PersistenceParser( - inputStream, - exceptionListener, - classLoader, - this) - .iterator(); - } + // note: the original API documentation says nothing on what to do + // when the stream was closed before readObject is called but it actually + // throws a NoSuchElementException - this behaviour is imitated here + if (isStreamClosed) + { + throw new NoSuchElementException("Cannot read any objects - XMLDecoder was already closed."); + } - // note: done according to the official documentation - if (!iterator.hasNext()) - { - throw new ArrayIndexOutOfBoundsException("No more objects available from this XMLDecoder."); - } + // creates the PersistenceParser (doing the parsing and decoding) and returns its + // Iterator on first invocation + if (iterator == null) + { + iterator = + new PersistenceParser( + inputStream, + exceptionListener, + classLoader, + this) + .iterator(); + } - // returns just the next object if there was no problem - return iterator.next(); - } + // note: done according to the official documentation + if (!iterator.hasNext()) + { + throw new ArrayIndexOutOfBoundsException("No more objects available from this XMLDecoder."); + } - /** Sets the ExceptionListener instance to which notifications of exceptions are send - * while parsing the XML data. - *

        See the description of {@link XMLDecoder} class for more information on the ExceptionListener.

        - * - * @param listener - */ - public void setExceptionListener(ExceptionListener listener) - { - // uses a default implementation when null - if (listener == null) - { - listener = DefaultExceptionListener.INSTANCE; - } - exceptionListener = listener; - } + // returns just the next object if there was no problem + return iterator.next(); + } - /** Sets the owner object which can be accessed from the parsed XML data. - *

        See the description of {@link XMLDecoder} class for more information on the owner object.

        - * - * @param newOwner - */ - public void setOwner(Object newOwner) - { - owner = newOwner; - } + /** Sets the ExceptionListener instance to which notifications of exceptions are send + * while parsing the XML data. + *

        See the description of {@link XMLDecoder} class for more information on the ExceptionListener.

        + * + * @param listener + */ + public void setExceptionListener(ExceptionListener listener) + { + // uses a default implementation when null + if (listener == null) + { + listener = DefaultExceptionListener.INSTANCE; + } + exceptionListener = listener; + } + + /** Sets the owner object which can be accessed from the parsed XML data. + *

        See the description of {@link XMLDecoder} class for more information on the owner object.

        + * + * @param newOwner + */ + public void setOwner(Object newOwner) + { + owner = newOwner; + } } diff --git a/libjava/classpath/java/beans/XMLEncoder.java b/libjava/classpath/java/beans/XMLEncoder.java index 7242d0c699e..40cb6dbfb59 100644 --- a/libjava/classpath/java/beans/XMLEncoder.java +++ b/libjava/classpath/java/beans/XMLEncoder.java @@ -7,7 +7,7 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,7 +46,7 @@ import java.io.OutputStream; * This class uses the {@link PersistenceDelegate} and {@link Encoder} * infrastructure to generate an XML representation of the objects it * serializes. - * + * * @author Robert Schuster (robertschuster@fsfe.org) * @since 1.4 */ @@ -92,11 +92,11 @@ public class XMLEncoder extends Encoder // I needed for a succesfull operation of XMLEncoder. // // The same is true for the writeStatement method. - + // Silently ignore out of bounds calls. if (accessCounter <= 0) return; - + scanEngine.writeExpression(expr); @@ -113,8 +113,8 @@ public class XMLEncoder extends Encoder getExceptionListener().exceptionThrown(e); return; } - - + + newValue = get(value); if (newValue == null) @@ -144,15 +144,15 @@ public class XMLEncoder extends Encoder newArgs[i] = get(args[i]); } } - + Expression newExpr = new Expression(newTarget, expr.getMethodName(), newArgs); - + // Fakes the result of Class.forName() to make it possible // to hand such a type to the encoding process. if (value instanceof Class && ((Class) value).isPrimitive()) newExpr.setValue(value); - + // Instantiates the new object. try { @@ -163,15 +163,15 @@ public class XMLEncoder extends Encoder catch (Exception e) { getExceptionListener().exceptionThrown(e); - + // In Statement.writeExpression we had no possibility to flags // an erroneous state to the ScanEngine without behaving different - // to the JDK. + // to the JDK. scanEngine.revoke(); - + return; } - + writeObject(value); } @@ -187,7 +187,7 @@ public class XMLEncoder extends Encoder { // In case of questions have a at the implementation note in // writeExpression. - + scanEngine.writeStatement(stmt); // Silently ignore out of bounds calls. @@ -234,7 +234,7 @@ public class XMLEncoder extends Encoder // In Statement.writeStatement we had no possibility to flags // an erroneous state to the ScanEngine without behaving different - // to the JDK. + // to the JDK. scanEngine.revoke(); return; } @@ -245,15 +245,15 @@ public class XMLEncoder extends Encoder public void writeObject(Object o) { accessCounter++; - + scanEngine.writeObject(o); - + if (get(o) == null) super.writeObject(o); - + accessCounter--; } - + public void setOwner(Object o) { owner = o; diff --git a/libjava/classpath/java/beans/beancontext/BeanContext.java b/libjava/classpath/java/beans/beancontext/BeanContext.java index 02f4a1a4011..803cb36ff05 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContext.java +++ b/libjava/classpath/java/beans/beancontext/BeanContext.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -166,107 +166,107 @@ import java.util.Collection; */ public interface BeanContext - extends Collection, BeanContextChild, Visibility, DesignMode { + extends Collection, BeanContextChild, Visibility, DesignMode { - /** - * The global lock on changing any BeanContext hierarchy. - * It kinda sucks that there is only one lock, since there can be - * multiple hierarchies. Oh well, I didn't design, I just code. - *

        - * - * Methods that must (or do) synchronize on the global lock: - *
        - *

          - *
        • - * Implementors of BeanContext.add() and addAll() - *
          • - *
        - * @fixme fill in the rest of the methods which use the global lock. - */ - Object globalHierarchyLock = new Object(); + /** + * The global lock on changing any BeanContext hierarchy. + * It kinda sucks that there is only one lock, since there can be + * multiple hierarchies. Oh well, I didn't design, I just code. + *

        + * + * Methods that must (or do) synchronize on the global lock: + *
        + *

          + *
        • + * Implementors of BeanContext.add() and addAll() + *
          • + *
        + * @fixme fill in the rest of the methods which use the global lock. + */ + Object globalHierarchyLock = new Object(); - /** - * Instantiate a Bean using this Bean's ClassLoader - * and this BeanContext as the parent. - *

        - * - * This method exists mainly so that BeanContext - * implementations can perform extra actions on Beans that are - * created within them. - * - * @param beanName the name of the bean to instantiate - * @return the created Bean - * - * @see java.beans.Beans#instantiate(java.lang.ClassLoader,java.lang.String) - * @see java.beans.Beans#instantiate(java.lang.ClassLoader,java.lang.String,java.beans.beancontext.BeanContext) - * @exception IOException if there is an I/O problem during - * instantiation. - * @exception ClassNotFoundException if a serialized Bean's class - * is not found. - */ - Object instantiateChild(String beanName) + /** + * Instantiate a Bean using this Bean's ClassLoader + * and this BeanContext as the parent. + *

        + * + * This method exists mainly so that BeanContext + * implementations can perform extra actions on Beans that are + * created within them. + * + * @param beanName the name of the bean to instantiate + * @return the created Bean + * + * @see java.beans.Beans#instantiate(java.lang.ClassLoader,java.lang.String) + * @see java.beans.Beans#instantiate(java.lang.ClassLoader,java.lang.String,java.beans.beancontext.BeanContext) + * @exception IOException if there is an I/O problem during + * instantiation. + * @exception ClassNotFoundException if a serialized Bean's class + * is not found. + */ + Object instantiateChild(String beanName) throws IOException, ClassNotFoundException; - /** - * Get a resource. The BeanContext will typically - * call ClassLoader.getResource(), but may do it any - * way it wants to. This allows a BeanContext to - * have its own set of resources separate from the rest of the - * system. - *

        - * - * Beans should call this method on their parent rather than the - * associated ClassLoader method. - *

        - * - * I am assuming, but am not entirely sure, that if a - * BeanContext cannot find a resource, its - * responsibility is to call the getResource method - * of its parent BeanContext. - * - * @return a URL to the requested resource. - * @param resourceName the name of the resource requested. - * @param requestor a reference to the child requesting the resource. - * @see java.lang.ClassLoader#getResource(java.lang.String) - */ - URL getResource(String resourceName, BeanContextChild requestor); + /** + * Get a resource. The BeanContext will typically + * call ClassLoader.getResource(), but may do it any + * way it wants to. This allows a BeanContext to + * have its own set of resources separate from the rest of the + * system. + *

        + * + * Beans should call this method on their parent rather than the + * associated ClassLoader method. + *

        + * + * I am assuming, but am not entirely sure, that if a + * BeanContext cannot find a resource, its + * responsibility is to call the getResource method + * of its parent BeanContext. + * + * @return a URL to the requested resource. + * @param resourceName the name of the resource requested. + * @param requestor a reference to the child requesting the resource. + * @see java.lang.ClassLoader#getResource(java.lang.String) + */ + URL getResource(String resourceName, BeanContextChild requestor); - /** - * Get a resource as a stream. The BeanContext will - * typically call ClassLoader.getResourceAsStream(), - * but may do it any way it wants to. This allows a - * BeanContext's children to have their own set of - * resources separate from the rest of the system. - *

        - * - * Beans should call this method on their parent rather than the - * associated ClassLoader method. - *

        - * - * I am assuming, but am not entirely sure, that if a - * BeanContext cannot find a resource, its - * responsibility is to call the getResourceAsStream - * method of its parent BeanContext. - * - * @return the requested resource as a stream. - * @param resourceName the name of the resource requested. - * @param requestor a reference to the child requesting the resource. - * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String) - */ - InputStream getResourceAsStream(String resourceName, BeanContextChild requestor); + /** + * Get a resource as a stream. The BeanContext will + * typically call ClassLoader.getResourceAsStream(), + * but may do it any way it wants to. This allows a + * BeanContext's children to have their own set of + * resources separate from the rest of the system. + *

        + * + * Beans should call this method on their parent rather than the + * associated ClassLoader method. + *

        + * + * I am assuming, but am not entirely sure, that if a + * BeanContext cannot find a resource, its + * responsibility is to call the getResourceAsStream + * method of its parent BeanContext. + * + * @return the requested resource as a stream. + * @param resourceName the name of the resource requested. + * @param requestor a reference to the child requesting the resource. + * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String) + */ + InputStream getResourceAsStream(String resourceName, BeanContextChild requestor); - /** - * Add a listener on changes to the membership of this - * BeanContext object. - * @param listener the listener to add. - */ - void addBeanContextMembershipListener(BeanContextMembershipListener listener); + /** + * Add a listener on changes to the membership of this + * BeanContext object. + * @param listener the listener to add. + */ + void addBeanContextMembershipListener(BeanContextMembershipListener listener); - /** - * Remove a listener on changes to the membership of this - * BeanContext object. - * @param listener the listener to remove. - */ - void removeBeanContextMembershipListener(BeanContextMembershipListener listener); + /** + * Remove a listener on changes to the membership of this + * BeanContext object. + * @param listener the listener to remove. + */ + void removeBeanContextMembershipListener(BeanContextMembershipListener listener); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextChild.java b/libjava/classpath/java/beans/beancontext/BeanContextChild.java index d1115efac85..e2bdcf33633 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextChild.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextChild.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -77,98 +77,98 @@ import java.beans.VetoableChangeListener; */ public interface BeanContextChild { - /** - * Set the parent BeanContext. - *

        - * - * This method is called from BeanContext.add() and - * should not be called directly. - *

        - * - * When this Object is being added to a new BeanContext or moved - * from an old one, a non-null value will be passed in. - *

        - * - * When this Object is being removed from the current - * BeanContext, setBeanContext() will - * receive the parameter null. - *

        - * - * When being removed from the current BeanContext, - * it is the BeanContextChild's responsibility to - * release all services it has obtained. - *

        - * - * This change should generate PropertyChangeEvent - * and VetoableChangeEvents with the property name - * "beanContext". If the change is vetoed, it must re-throw the - * exception and not change anything. In this way, the parent - * BeanContextChild, who has registered himself with - * you, will have a chance to remove this child from its - * collection. - *

        - * - * If the Bean does not wish to change the parent or be removed - * from one, it may throw the PropertyVetoException. - * If you veto a setBeanContext(null) call, then you - * should try your hardest to remedy whatever problem is keeping - * you from being removed from the BeanContext so - * that you can not veto it the next time. - * Otherwise, nasty pathological recursion stuff could occur in - * certain situations. - *

        - * - * If you do veto the change, you must first back out any changes - * you made prior to the veto. Best not to make any such changes - * prior to the veto in the first place. - *

        - * - * This method is called from BeanContext.add() and - * should not be called directly. - * - * @param parent the new parent for the BeanContextChild, - * or null to signify removal from a tree. - * @exception PropertyVetoException if the - * BeanContextChild implementor does not - * wish to have its parent changed. - */ - void setBeanContext(BeanContext parent) - throws PropertyVetoException; + /** + * Set the parent BeanContext. + *

        + * + * This method is called from BeanContext.add() and + * should not be called directly. + *

        + * + * When this Object is being added to a new BeanContext or moved + * from an old one, a non-null value will be passed in. + *

        + * + * When this Object is being removed from the current + * BeanContext, setBeanContext() will + * receive the parameter null. + *

        + * + * When being removed from the current BeanContext, + * it is the BeanContextChild's responsibility to + * release all services it has obtained. + *

        + * + * This change should generate PropertyChangeEvent + * and VetoableChangeEvents with the property name + * "beanContext". If the change is vetoed, it must re-throw the + * exception and not change anything. In this way, the parent + * BeanContextChild, who has registered himself with + * you, will have a chance to remove this child from its + * collection. + *

        + * + * If the Bean does not wish to change the parent or be removed + * from one, it may throw the PropertyVetoException. + * If you veto a setBeanContext(null) call, then you + * should try your hardest to remedy whatever problem is keeping + * you from being removed from the BeanContext so + * that you can not veto it the next time. + * Otherwise, nasty pathological recursion stuff could occur in + * certain situations. + *

        + * + * If you do veto the change, you must first back out any changes + * you made prior to the veto. Best not to make any such changes + * prior to the veto in the first place. + *

        + * + * This method is called from BeanContext.add() and + * should not be called directly. + * + * @param parent the new parent for the BeanContextChild, + * or null to signify removal from a tree. + * @exception PropertyVetoException if the + * BeanContextChild implementor does not + * wish to have its parent changed. + */ + void setBeanContext(BeanContext parent) + throws PropertyVetoException; - /** - * Get the parent BeanContext. - * @return the parent BeanContext. - */ - BeanContext getBeanContext(); + /** + * Get the parent BeanContext. + * @return the parent BeanContext. + */ + BeanContext getBeanContext(); - /** - * Add a listener that will be notified when a specific property changes. - * @param prop the name of the property to listen on - * @param listener the listener to listen on the property. - */ - void addPropertyChangeListener(String prop, PropertyChangeListener listener); + /** + * Add a listener that will be notified when a specific property changes. + * @param prop the name of the property to listen on + * @param listener the listener to listen on the property. + */ + void addPropertyChangeListener(String prop, PropertyChangeListener listener); - /** - * Remove a listener to a certain property. - * @param prop the name of the property being listened on - * @param listener the listener listening on the property. - */ - void removePropertyChangeListener(String prop, PropertyChangeListener listener); + /** + * Remove a listener to a certain property. + * @param prop the name of the property being listened on + * @param listener the listener listening on the property. + */ + void removePropertyChangeListener(String prop, PropertyChangeListener listener); - /** - * Add a listener that will be notified when a specific property - * change is requested (a PropertyVetoException may be thrown) as - * well as after the change is successfully made. - * - * @param prop the name of the property to listen on - * @param listener the listener to listen on the property. - */ - void addVetoableChangeListener(String prop, VetoableChangeListener listener); + /** + * Add a listener that will be notified when a specific property + * change is requested (a PropertyVetoException may be thrown) as + * well as after the change is successfully made. + * + * @param prop the name of the property to listen on + * @param listener the listener to listen on the property. + */ + void addVetoableChangeListener(String prop, VetoableChangeListener listener); - /** - * Remove a listener to a certain property. - * @param prop the name of the property being listened on - * @param listener the listener listening on the property. - */ - void removeVetoableChangeListener(String prop, VetoableChangeListener listener); + /** + * Remove a listener to a certain property. + * @param prop the name of the property being listened on + * @param listener the listener listening on the property. + */ + void removeVetoableChangeListener(String prop, VetoableChangeListener listener); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextChildComponentProxy.java b/libjava/classpath/java/beans/beancontext/BeanContextChildComponentProxy.java index a8d6e34045e..cb75d508dc7 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextChildComponentProxy.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextChildComponentProxy.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,10 +51,10 @@ import java.awt.Component; */ public interface BeanContextChildComponentProxy { - /** - * Get the Component associated with this BeanContextChild. - * @return the Component associated with this - * BeanContextChild. - */ - Component getComponent(); + /** + * Get the Component associated with this BeanContextChild. + * @return the Component associated with this + * BeanContextChild. + */ + Component getComponent(); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextChildSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextChildSupport.java index 4444ad71377..8cd887d0c41 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextChildSupport.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextChildSupport.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -64,121 +64,121 @@ public class BeanContextChildSupport { static final long serialVersionUID = 6328947014421475877L; - /** - * The peer on which to perform set actions. - * This is here so that this class can be used as a peer. - *

        - * - * When extending this class, this variable will be set to - * this. - */ - public BeanContextChild beanContextChildPeer; + /** + * The peer on which to perform set actions. + * This is here so that this class can be used as a peer. + *

        + * + * When extending this class, this variable will be set to + * this. + */ + public BeanContextChild beanContextChildPeer; - /** - * The parent BeanContext. - */ - protected transient BeanContext beanContext; + /** + * The parent BeanContext. + */ + protected transient BeanContext beanContext; - /** - * If setBeanContext() was vetoed once before, this - * is set to true so that the next time, vetoes will - * be ignored. - */ - protected transient boolean rejectedSetBCOnce; + /** + * If setBeanContext() was vetoed once before, this + * is set to true so that the next time, vetoes will + * be ignored. + */ + protected transient boolean rejectedSetBCOnce; - /** - * Listeners are registered here and events are fired through here. - */ - protected PropertyChangeSupport pcSupport; + /** + * Listeners are registered here and events are fired through here. + */ + protected PropertyChangeSupport pcSupport; - /** - * Listeners are registered here and events are fired through here. - */ - protected VetoableChangeSupport vcSupport; + /** + * Listeners are registered here and events are fired through here. + */ + protected VetoableChangeSupport vcSupport; - /** - * Create a new BeanContextChildSupport with itself as the peer. - * This is meant to be used when you subclass - * BeanContextChildSupport to create your child. - */ - public BeanContextChildSupport() + /** + * Create a new BeanContextChildSupport with itself as the peer. + * This is meant to be used when you subclass + * BeanContextChildSupport to create your child. + */ + public BeanContextChildSupport() { - this (null); - } + this (null); + } - /** - * Create a new BeanContextChildSupport with the specified peer. - * @param peer the peer to use, or null to specify - * this. - */ - public BeanContextChildSupport (BeanContextChild peer) + /** + * Create a new BeanContextChildSupport with the specified peer. + * @param peer the peer to use, or null to specify + * this. + */ + public BeanContextChildSupport (BeanContextChild peer) { - if (peer == null) + if (peer == null) { peer = this; } - beanContextChildPeer = peer; - pcSupport = new PropertyChangeSupport (peer); - vcSupport = new VetoableChangeSupport (peer); - } + beanContextChildPeer = peer; + pcSupport = new PropertyChangeSupport (peer); + vcSupport = new VetoableChangeSupport (peer); + } - /** - * Set the parent BeanContext. - *

        - * - * When this Object is being added to a new BeanContext or moved - * from an old one, a non-null value will be passed in. - *

        - * - * When this Object is being removed from the current - * BeanContext, setBeanContext() will - * receive the parameter null. - *

        - * - * Order of events: - *

          - *
        1. - * If the new BeanContext is the same as the old - * one, nothing happens. - *
          2. - *
        2. - * If the change has not been rejected or vetoed before, call - * validatePendingSetBeanContext(). If this call - * returns false, the change is rejected and a - * PropertyVetoException is thrown. - *
          3. - *
        3. - * If the change has not been rejected or vetoed before, - * VetoableChangeEvents are fired with the name - * "beanContext", using the - * fireVetoableChange() method. If a veto - * occurs, reversion events are fired using the same method, - * the change is rejected, and the veto is rethrown. - *
          4. - *
        4. - * releaseBeanContextResources() is called. - *
          5. - *
        5. - * The change is made. - *
          6. - *
        6. - * PropertyChangeEvents are fired using the - * firePropertyChange() method. - *
          7. - *
        7. - * initializeBeanContextResources() is called. - *
          8. - *
        - *

        - * - * @param newBeanContext the new parent for the - * BeanContextChild, or null to - * signify removal from a tree. - * @exception PropertyVetoException if the - * BeanContextChild implementor does not - * wish to have its parent changed. - */ + /** + * Set the parent BeanContext. + *

        + * + * When this Object is being added to a new BeanContext or moved + * from an old one, a non-null value will be passed in. + *

        + * + * When this Object is being removed from the current + * BeanContext, setBeanContext() will + * receive the parameter null. + *

        + * + * Order of events: + *

          + *
        1. + * If the new BeanContext is the same as the old + * one, nothing happens. + *
          2. + *
        2. + * If the change has not been rejected or vetoed before, call + * validatePendingSetBeanContext(). If this call + * returns false, the change is rejected and a + * PropertyVetoException is thrown. + *
          3. + *
        3. + * If the change has not been rejected or vetoed before, + * VetoableChangeEvents are fired with the name + * "beanContext", using the + * fireVetoableChange() method. If a veto + * occurs, reversion events are fired using the same method, + * the change is rejected, and the veto is rethrown. + *
          4. + *
        4. + * releaseBeanContextResources() is called. + *
          5. + *
        5. + * The change is made. + *
          6. + *
        6. + * PropertyChangeEvents are fired using the + * firePropertyChange() method. + *
          7. + *
        7. + * initializeBeanContextResources() is called. + *
          8. + *
        + *

        + * + * @param newBeanContext the new parent for the + * BeanContextChild, or null to + * signify removal from a tree. + * @exception PropertyVetoException if the + * BeanContextChild implementor does not + * wish to have its parent changed. + */ public void setBeanContext(BeanContext newBeanContext) throws PropertyVetoException { @@ -195,7 +195,7 @@ public class BeanContextChildSupport throw new PropertyVetoException ("validatePendingSetBeanContext() rejected change", new PropertyChangeEvent(beanContextChildPeer, "beanContext", beanContext, newBeanContext)); } - + try { fireVetoableChange ("beanContext", beanContext, newBeanContext); @@ -207,175 +207,175 @@ public class BeanContextChildSupport } } - releaseBeanContextResources (); + releaseBeanContextResources (); - beanContext = newBeanContext; - rejectedSetBCOnce = false; + beanContext = newBeanContext; + rejectedSetBCOnce = false; - firePropertyChange ("beanContext", beanContext, newBeanContext); + firePropertyChange ("beanContext", beanContext, newBeanContext); - initializeBeanContextResources (); - } - } + initializeBeanContextResources (); + } + } - /** - * Get the parent BeanContext. - * @return the parent BeanContext. - */ - public BeanContext getBeanContext() + /** + * Get the parent BeanContext. + * @return the parent BeanContext. + */ + public BeanContext getBeanContext() { - return beanContext; - } + return beanContext; + } - /** - * Get the peer (or this if there is no peer). - * @return the peer, or this if there is no peer. - */ - public BeanContextChild getBeanContextChildPeer() { - return beanContextChildPeer; - } + /** + * Get the peer (or this if there is no peer). + * @return the peer, or this if there is no peer. + */ + public BeanContextChild getBeanContextChildPeer() { + return beanContextChildPeer; + } - /** - * Determine whether there is a peer. - * This is true iff getBeanContextChildPeer() == this. - * @return whether there is a peer. - */ - public boolean isDelegated() { - return beanContextChildPeer == this; - } + /** + * Determine whether there is a peer. + * This is true iff getBeanContextChildPeer() == this. + * @return whether there is a peer. + */ + public boolean isDelegated() { + return beanContextChildPeer == this; + } - /** - * Add a listener that will be notified when a specific property changes. - * @param propertyName the name of the property to listen on. - * @param listener the listener to listen on the property. - */ - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcSupport.addPropertyChangeListener(propertyName, listener); - } + /** + * Add a listener that will be notified when a specific property changes. + * @param propertyName the name of the property to listen on. + * @param listener the listener to listen on the property. + */ + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcSupport.addPropertyChangeListener(propertyName, listener); + } - /** - * Remove a listener to a certain property. - * - * @param propertyName the name of the property being listened on. - * @param listener the listener listening on the property. - */ - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcSupport.removePropertyChangeListener(propertyName, listener); - } + /** + * Remove a listener to a certain property. + * + * @param propertyName the name of the property being listened on. + * @param listener the listener listening on the property. + */ + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcSupport.removePropertyChangeListener(propertyName, listener); + } - /** - * Add a listener that will be notified when a specific property - * change is requested (a PropertyVetoException may be thrown) as - * well as after the change is successfully made. - * - * @param propertyName the name of the property to listen on. - * @param listener the listener to listen on the property. - */ - public void addVetoableChangeListener(String propertyName, VetoableChangeListener listener) { - vcSupport.addVetoableChangeListener(propertyName, listener); - } + /** + * Add a listener that will be notified when a specific property + * change is requested (a PropertyVetoException may be thrown) as + * well as after the change is successfully made. + * + * @param propertyName the name of the property to listen on. + * @param listener the listener to listen on the property. + */ + public void addVetoableChangeListener(String propertyName, VetoableChangeListener listener) { + vcSupport.addVetoableChangeListener(propertyName, listener); + } - /** - * Remove a listener to a certain property. - * - * @param propertyName the name of the property being listened on - * @param listener the listener listening on the property. - */ - public void removeVetoableChangeListener(String propertyName, VetoableChangeListener listener) { - vcSupport.removeVetoableChangeListener(propertyName, listener); - } + /** + * Remove a listener to a certain property. + * + * @param propertyName the name of the property being listened on + * @param listener the listener listening on the property. + */ + public void removeVetoableChangeListener(String propertyName, VetoableChangeListener listener) { + vcSupport.removeVetoableChangeListener(propertyName, listener); + } - /** - * Fire a property change. - * - * @param propertyName the name of the property that changed - * @param oldVal the old value of the property - * @param newVal the new value of the property - */ - public void firePropertyChange(String propertyName, Object oldVal, Object newVal) { - pcSupport.firePropertyChange(propertyName, oldVal, newVal); - } + /** + * Fire a property change. + * + * @param propertyName the name of the property that changed + * @param oldVal the old value of the property + * @param newVal the new value of the property + */ + public void firePropertyChange(String propertyName, Object oldVal, Object newVal) { + pcSupport.firePropertyChange(propertyName, oldVal, newVal); + } - /** - * Fire a vetoable property change. - * - * @param propertyName the name of the property that changed - * @param oldVal the old value of the property - * @param newVal the new value of the property - * @exception PropertyVetoException if the change is vetoed. - */ - public void fireVetoableChange(String propertyName, Object oldVal, Object newVal) + /** + * Fire a vetoable property change. + * + * @param propertyName the name of the property that changed + * @param oldVal the old value of the property + * @param newVal the new value of the property + * @exception PropertyVetoException if the change is vetoed. + */ + public void fireVetoableChange(String propertyName, Object oldVal, Object newVal) throws PropertyVetoException { - vcSupport.fireVetoableChange(propertyName, oldVal, newVal); - } + vcSupport.fireVetoableChange(propertyName, oldVal, newVal); + } - /** - * Called by BeanContextServices.revokeService() to indicate that a service has been revoked. - * If you have a reference to such a service, it should be - * discarded and may no longer function properly. - * getService() will no longer work on the specified - * service class after this event has been fired. - *

        - * - * This method is meant to be overriden. - * BeanContextChildSupport's implementation does - * nothing. - * - * @param event the service revoked event. - * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,java.beans.beancontext.BeanContextServiceProvider,boolean) - */ - public void serviceRevoked(BeanContextServiceRevokedEvent event) { - } + /** + * Called by BeanContextServices.revokeService() to indicate that a service has been revoked. + * If you have a reference to such a service, it should be + * discarded and may no longer function properly. + * getService() will no longer work on the specified + * service class after this event has been fired. + *

        + * + * This method is meant to be overriden. + * BeanContextChildSupport's implementation does + * nothing. + * + * @param event the service revoked event. + * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,java.beans.beancontext.BeanContextServiceProvider,boolean) + */ + public void serviceRevoked(BeanContextServiceRevokedEvent event) { + } - /** - * Called by BeanContextServices whenever a service is made available. - *

        - * - * This method is meant to be overriden. - * BeanContextChildSupport's implementation does - * nothing. - * - * @param event the service revoked event, with useful information - * about the new service. - */ - public void serviceAvailable(BeanContextServiceAvailableEvent event) { - } + /** + * Called by BeanContextServices whenever a service is made available. + *

        + * + * This method is meant to be overriden. + * BeanContextChildSupport's implementation does + * nothing. + * + * @param event the service revoked event, with useful information + * about the new service. + */ + public void serviceAvailable(BeanContextServiceAvailableEvent event) { + } - /** - * Called by setBeanContext() to determine whether the set should be rejected. - *

        - * - * This method is meant to be overriden. - * BeanContextChildSupport's implementation simply - * returns true. - * - * @param newBeanContext the new parent. - * @return whether to allow the parent to be changed to the new - * value. - */ - public boolean validatePendingSetBeanContext(BeanContext newBeanContext) { - return true; - } + /** + * Called by setBeanContext() to determine whether the set should be rejected. + *

        + * + * This method is meant to be overriden. + * BeanContextChildSupport's implementation simply + * returns true. + * + * @param newBeanContext the new parent. + * @return whether to allow the parent to be changed to the new + * value. + */ + public boolean validatePendingSetBeanContext(BeanContext newBeanContext) { + return true; + } - /** - * Called by setBeanContext() to release resources of a what will soon no longer be the parent. - *

        - * - * This method is meant to be overriden. - * BeanContextChildSupport's implementation does - * nothing. - */ - protected void releaseBeanContextResources() { - } + /** + * Called by setBeanContext() to release resources of a what will soon no longer be the parent. + *

        + * + * This method is meant to be overriden. + * BeanContextChildSupport's implementation does + * nothing. + */ + protected void releaseBeanContextResources() { + } - /** - * Called by setBeanContext() to grab resources when the parent has been set. - *

        - * - * This method is meant to be overriden. - * BeanContextChildSupport's implementation does - * nothing. - */ - protected void initializeBeanContextResources() { - } + /** + * Called by setBeanContext() to grab resources when the parent has been set. + *

        + * + * This method is meant to be overriden. + * BeanContextChildSupport's implementation does + * nothing. + */ + protected void initializeBeanContextResources() { + } } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextContainerProxy.java b/libjava/classpath/java/beans/beancontext/BeanContextContainerProxy.java index 3df91038bfe..962cb5fc9a8 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextContainerProxy.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextContainerProxy.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,10 +54,10 @@ import java.awt.Container; */ public interface BeanContextContainerProxy { - /** - * Get the Container associated with this BeanContext. - * @return the Container associated with this - * BeanContext. - */ - Container getContainer(); + /** + * Get the Container associated with this BeanContext. + * @return the Container associated with this + * BeanContext. + */ + Container getContainer(); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextEvent.java b/libjava/classpath/java/beans/beancontext/BeanContextEvent.java index f326541b034..959d54e5860 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextEvent.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextEvent.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.util.EventObject; public abstract class BeanContextEvent extends EventObject { private static final long serialVersionUID = 7267998073569045052L; - + /** * The BeanContext that most recently passed this * event on. diff --git a/libjava/classpath/java/beans/beancontext/BeanContextMembershipEvent.java b/libjava/classpath/java/beans/beancontext/BeanContextMembershipEvent.java index 9560889f8f2..77b1be43eef 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextMembershipEvent.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextMembershipEvent.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -55,60 +55,60 @@ public class BeanContextMembershipEvent extends BeanContextEvent { private static final long serialVersionUID = 3499346510334590959L; /** - * The children that were added or removed. - */ - protected Collection children; + * The children that were added or removed. + */ + protected Collection children; - /** - * Create a new membership event. - * @param context the event source. - * @param children the children added to or removed from the source. - */ - public BeanContextMembershipEvent(BeanContext context, Collection children) { - super(context); - this.children = children; - } + /** + * Create a new membership event. + * @param context the event source. + * @param children the children added to or removed from the source. + */ + public BeanContextMembershipEvent(BeanContext context, Collection children) { + super(context); + this.children = children; + } - /** - * Create a new membership event. - * @param context the event source. - * @param children the children added to or removed from the source. - */ - public BeanContextMembershipEvent(BeanContext context, Object[] children) { - super(context); - this.children = Arrays.asList(children); - } + /** + * Create a new membership event. + * @param context the event source. + * @param children the children added to or removed from the source. + */ + public BeanContextMembershipEvent(BeanContext context, Object[] children) { + super(context); + this.children = Arrays.asList(children); + } - /** - * The number of children removed or added. - * @return the number of children removed or added. - */ - public int size() { - return children.size(); - } + /** + * The number of children removed or added. + * @return the number of children removed or added. + */ + public int size() { + return children.size(); + } - /** - * An iterator that will step through all the children. - * @return an iterator over all the children. - */ - public Iterator iterator() { - return children.iterator(); - } + /** + * An iterator that will step through all the children. + * @return an iterator over all the children. + */ + public Iterator iterator() { + return children.iterator(); + } - /** - * An array of the children. - * @return an array of the children. - */ - public Object[] toArray() { - return children.toArray(); - } + /** + * An array of the children. + * @return an array of the children. + */ + public Object[] toArray() { + return children.toArray(); + } - /** - * Tell whether the Object is one of the children added or removed. - * @param child the child to check. - * @return whether the Object is added or removed. - */ - public boolean contains(Object child) { - return children.contains(child); - } + /** + * Tell whether the Object is one of the children added or removed. + * @param child the child to check. + * @return whether the Object is added or removed. + */ + public boolean contains(Object child) { + return children.contains(child); + } } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextMembershipListener.java b/libjava/classpath/java/beans/beancontext/BeanContextMembershipListener.java index d39c36c4b12..cdb47c8118e 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextMembershipListener.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextMembershipListener.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,21 +50,21 @@ import java.util.EventListener; */ public interface BeanContextMembershipListener extends EventListener { - /** - * When beans are added to a BeanContext, - * this method is called to fire the event. - * - * @param event the event, including which children were added. - * @see java.beans.beancontext.BeanContext#add(java.lang.Object) - */ - void childrenAdded(BeanContextMembershipEvent event); + /** + * When beans are added to a BeanContext, + * this method is called to fire the event. + * + * @param event the event, including which children were added. + * @see java.beans.beancontext.BeanContext#add(java.lang.Object) + */ + void childrenAdded(BeanContextMembershipEvent event); - /** - * When beans are removed from a BeanContext, - * this method is called to fire the event. - * - * @param event the event, including which children were removed. - * @see java.beans.beancontext.BeanContext#remove(java.lang.Object) - */ - void childrenRemoved(BeanContextMembershipEvent event); + /** + * When beans are removed from a BeanContext, + * this method is called to fire the event. + * + * @param event the event, including which children were removed. + * @see java.beans.beancontext.BeanContext#remove(java.lang.Object) + */ + void childrenRemoved(BeanContextMembershipEvent event); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextProxy.java b/libjava/classpath/java/beans/beancontext/BeanContextProxy.java index 49dd7a77f30..53632e86be7 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextProxy.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextProxy.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,12 +54,12 @@ package java.beans.beancontext; */ public interface BeanContextProxy { - /** - * Return the BeanContextChild associated with this - * Object. - * - * @return the BeanContextChild associated with this - * Object. - */ - BeanContextChild getBeanContextProxy(); + /** + * Return the BeanContextChild associated with this + * Object. + * + * @return the BeanContextChild associated with this + * Object. + */ + BeanContextChild getBeanContextProxy(); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServiceAvailableEvent.java b/libjava/classpath/java/beans/beancontext/BeanContextServiceAvailableEvent.java index 6dc2c38ab39..a2bdcdde7b1 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServiceAvailableEvent.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServiceAvailableEvent.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,46 +52,46 @@ public class BeanContextServiceAvailableEvent extends BeanContextEvent { private static final long serialVersionUID = -5333985775656400778L; /** - * The Class representing the service which is now - * available. - */ - protected Class serviceClass; + * The Class representing the service which is now + * available. + */ + protected Class serviceClass; - /** - * Create a new service available event. - * @param services the BeanContextServices through - * which the service is available. This is also the source - * of the event. - * @param serviceClass the service class that is now available. - */ - public BeanContextServiceAvailableEvent(BeanContextServices services, Class serviceClass) { - super(services); - this.serviceClass = serviceClass; - } + /** + * Create a new service available event. + * @param services the BeanContextServices through + * which the service is available. This is also the source + * of the event. + * @param serviceClass the service class that is now available. + */ + public BeanContextServiceAvailableEvent(BeanContextServices services, Class serviceClass) { + super(services); + this.serviceClass = serviceClass; + } - /** - * Get the current service selectors of the service class. - * This is identical to getSourceAsBeanContextServices().getCurrentServiceSelectors(getServiceClass()) - * @return the current service selectors of the service class. - */ - public Iterator getCurrentServiceSelectors() { - return getSourceAsBeanContextServices().getCurrentServiceSelectors(serviceClass); - } + /** + * Get the current service selectors of the service class. + * This is identical to getSourceAsBeanContextServices().getCurrentServiceSelectors(getServiceClass()) + * @return the current service selectors of the service class. + */ + public Iterator getCurrentServiceSelectors() { + return getSourceAsBeanContextServices().getCurrentServiceSelectors(serviceClass); + } - /** - * Get the newly available service class. - * @return the service class. - */ - public Class getServiceClass() { - return serviceClass; - } + /** + * Get the newly available service class. + * @return the service class. + */ + public Class getServiceClass() { + return serviceClass; + } - /** - * Get the BeanContextServices through which the new service is available. - * @return the BeanContextServices through which the - * new service is available. - */ - public BeanContextServices getSourceAsBeanContextServices() { - return (BeanContextServices)getSource(); - } + /** + * Get the BeanContextServices through which the new service is available. + * @return the BeanContextServices through which the + * new service is available. + */ + public BeanContextServices getSourceAsBeanContextServices() { + return (BeanContextServices)getSource(); + } } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServiceProvider.java b/libjava/classpath/java/beans/beancontext/BeanContextServiceProvider.java index c09b5815fd7..7475a61bd8a 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServiceProvider.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServiceProvider.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -60,79 +60,79 @@ import java.util.Iterator; */ public interface BeanContextServiceProvider { - /** - * Get a service. - * Called from BeanContextServices.getService(). - * - *

        If the requested service class is not available, or if this - * BeanContextServiceProvider chooses not honor the - * request for some reason, then this method will return - * null.

        - * - * This method may throw unchecked exceptions, so watch out. - * - * @param services the BeanContextServices that wants - * to get the service. Only weak references to this will - * be retained, and it will never be changed, only queried - * in a read-only manner. - * @param requestor the actual requestor of the service. Only - * weak references to this will be retained, and it will - * never be changed, only queried in a read-only manner. - * @param serviceClass the Class of the service being - * requested. - * @param serviceSelector a parameter to customize the service - * returned with. - * @return an instance of serviceClass (such that - * instanceof serviceClass is true), or - * null. - * @see java.beans.beancontext.BeanContextServices#getService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Class,java.lang.Object,java.beans.beancontext.BeanContextServiceRevokedListener) - */ - Object getService(BeanContextServices services, Object requestor, Class serviceClass, Object serviceSelector); + /** + * Get a service. + * Called from BeanContextServices.getService(). + * + *

        If the requested service class is not available, or if this + * BeanContextServiceProvider chooses not honor the + * request for some reason, then this method will return + * null.

        + * + * This method may throw unchecked exceptions, so watch out. + * + * @param services the BeanContextServices that wants + * to get the service. Only weak references to this will + * be retained, and it will never be changed, only queried + * in a read-only manner. + * @param requestor the actual requestor of the service. Only + * weak references to this will be retained, and it will + * never be changed, only queried in a read-only manner. + * @param serviceClass the Class of the service being + * requested. + * @param serviceSelector a parameter to customize the service + * returned with. + * @return an instance of serviceClass (such that + * instanceof serviceClass is true), or + * null. + * @see java.beans.beancontext.BeanContextServices#getService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Class,java.lang.Object,java.beans.beancontext.BeanContextServiceRevokedListener) + */ + Object getService(BeanContextServices services, Object requestor, Class serviceClass, Object serviceSelector); - /** - * Release the service. - *

        - * - * Called by BeanContextServices.releaseService(). - *

        - * - * Most BeanContextServiceProviders won't have to do - * anything here. - * - * @param services the BeanContextServices that wants - * to release the service. Only weak references to this will - * be retained, and it will never be changed, only queried - * in a read-only manner. - * @param requestor the original requestor of the service. - * @param service the service to relinquish - * @see java.beans.beancontext.BeanContextServices#releaseService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Object) - */ - void releaseService(BeanContextServices services, Object requestor, Object service); + /** + * Release the service. + *

        + * + * Called by BeanContextServices.releaseService(). + *

        + * + * Most BeanContextServiceProviders won't have to do + * anything here. + * + * @param services the BeanContextServices that wants + * to release the service. Only weak references to this will + * be retained, and it will never be changed, only queried + * in a read-only manner. + * @param requestor the original requestor of the service. + * @param service the service to relinquish + * @see java.beans.beancontext.BeanContextServices#releaseService(java.beans.beancontext.BeanContextChild,java.lang.Object,java.lang.Object) + */ + void releaseService(BeanContextServices services, Object requestor, Object service); - /** - * Get a list of valid service selectors for the specified service class. - * This method is called from - * BeanContextServices.getCurrentServiceSelectors(). - *

        - * - * If the specified service class does not have a finite number of - * valid service selectors, it should return null. - * If it takes a general Integer parameter, for - * example, you may as well return null or the poor - * soul who called this method will be iterating all day. - *

        - * - * If it has no valid service selectors, it should still return an empty - * Iterator. - * - * @param services the BeanContextServices that wants - * to get the service selectors. Only weak references to this will - * be retained, and it will never be changed, only queried - * in a read-only manner. - * @param serviceClass the service class to get selectors for. - * @return a list of valid service selectors for the service - * class, or null. - * @see java.beans.beancontext.BeanContextServices#getCurrentServiceSelectors(java.lang.Class) - */ - Iterator getCurrentServiceSelectors(BeanContextServices services, Class serviceClass); + /** + * Get a list of valid service selectors for the specified service class. + * This method is called from + * BeanContextServices.getCurrentServiceSelectors(). + *

        + * + * If the specified service class does not have a finite number of + * valid service selectors, it should return null. + * If it takes a general Integer parameter, for + * example, you may as well return null or the poor + * soul who called this method will be iterating all day. + *

        + * + * If it has no valid service selectors, it should still return an empty + * Iterator. + * + * @param services the BeanContextServices that wants + * to get the service selectors. Only weak references to this will + * be retained, and it will never be changed, only queried + * in a read-only manner. + * @param serviceClass the service class to get selectors for. + * @return a list of valid service selectors for the service + * class, or null. + * @see java.beans.beancontext.BeanContextServices#getCurrentServiceSelectors(java.lang.Class) + */ + Iterator getCurrentServiceSelectors(BeanContextServices services, Class serviceClass); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java b/libjava/classpath/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java index 690b94e2cc7..78bfc200dca 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -52,9 +52,9 @@ import java.beans.BeanInfo; * @since JDK1.2 */ public interface BeanContextServiceProviderBeanInfo extends BeanInfo { - /** - * Get BeanInfos for all of the service classes of this BeanInfoServiceProvider. - * @return BeanInfos for all provided service classes. - */ - BeanInfo[] getServicesBeanInfo(); + /** + * Get BeanInfos for all of the service classes of this BeanInfoServiceProvider. + * @return BeanInfos for all provided service classes. + */ + BeanInfo[] getServicesBeanInfo(); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedEvent.java b/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedEvent.java index 1f5ebd3cd83..b4f2fa8562d 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedEvent.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedEvent.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,63 +50,63 @@ public class BeanContextServiceRevokedEvent extends BeanContextEvent { private static final long serialVersionUID = -1295543154724961754L; /** - * The Class representing the service which is now - * available. - */ - protected Class serviceClass; - private boolean invalidateRefs; + * The Class representing the service which is now + * available. + */ + protected Class serviceClass; + private boolean invalidateRefs; - /** - * Create a new service revoked event. - * @param services the BeanContextServices through - * which the service was available. This is also the source - * of the event. - * @param serviceClass the service class that is now revoked. - * @param revokeNow whether the revocation is immediate for all - * classes or just a suggestion. - */ - public BeanContextServiceRevokedEvent(BeanContextServices services, Class serviceClass, boolean revokeNow) { - super(services); - this.serviceClass = serviceClass; - invalidateRefs = revokeNow; - } + /** + * Create a new service revoked event. + * @param services the BeanContextServices through + * which the service was available. This is also the source + * of the event. + * @param serviceClass the service class that is now revoked. + * @param revokeNow whether the revocation is immediate for all + * classes or just a suggestion. + */ + public BeanContextServiceRevokedEvent(BeanContextServices services, Class serviceClass, boolean revokeNow) { + super(services); + this.serviceClass = serviceClass; + invalidateRefs = revokeNow; + } - /** - * Get the revoked service class. - * @return the service class. - */ - public Class getServiceClass() { - return serviceClass; - } + /** + * Get the revoked service class. + * @return the service class. + */ + public Class getServiceClass() { + return serviceClass; + } - /** - * Tell whether the revoked service class is the same as the specified class. - * Identical to getServiceClass().equals(c). - * @param c the class to compare. - * @return whether the clases are equal. - */ - public boolean isServiceClass(Class c) { - return serviceClass.equals(c); - } + /** + * Tell whether the revoked service class is the same as the specified class. + * Identical to getServiceClass().equals(c). + * @param c the class to compare. + * @return whether the clases are equal. + */ + public boolean isServiceClass(Class c) { + return serviceClass.equals(c); + } - /** - * Get the BeanContextServices through which the service was available. - * @return the BeanContextServices through which the - * service was available. - */ - public BeanContextServices getSourceAsBeanContextServices() { - return (BeanContextServices)getSource(); - } + /** + * Get the BeanContextServices through which the service was available. + * @return the BeanContextServices through which the + * service was available. + */ + public BeanContextServices getSourceAsBeanContextServices() { + return (BeanContextServices)getSource(); + } - /** - * Tell whether current instances of the revoked service are usable or not. - * This is determined by whether the service was revoked - * immediately. - * - * @return whether current instances of the revoked service are - * usable. - */ - public boolean isCurrentServiceInvalidNow() { - return invalidateRefs; - } + /** + * Tell whether current instances of the revoked service are usable or not. + * This is determined by whether the service was revoked + * immediately. + * + * @return whether current instances of the revoked service are + * usable. + */ + public boolean isCurrentServiceInvalidNow() { + return invalidateRefs; + } } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedListener.java b/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedListener.java index 101e6e191b0..11b83dd65b3 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedListener.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServiceRevokedListener.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,15 +48,15 @@ import java.util.EventListener; */ public interface BeanContextServiceRevokedListener extends EventListener { - /** - * Called by BeanContextServices.revokeService() to indicate that a service has been revoked. - * If you have a reference to such a service, it should be - * discarded and may no longer function properly. - * getService() will no longer work on the specified - * service class after this event has been fired. - * - * @param event the service revoked event. - * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,java.beans.beancontext.BeanContextServiceProvider,boolean) - */ - void serviceRevoked(BeanContextServiceRevokedEvent event); + /** + * Called by BeanContextServices.revokeService() to indicate that a service has been revoked. + * If you have a reference to such a service, it should be + * discarded and may no longer function properly. + * getService() will no longer work on the specified + * service class after this event has been fired. + * + * @param event the service revoked event. + * @see java.beans.beancontext.BeanContextServices#revokeService(java.lang.Class,java.beans.beancontext.BeanContextServiceProvider,boolean) + */ + void serviceRevoked(BeanContextServiceRevokedEvent event); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServices.java b/libjava/classpath/java/beans/beancontext/BeanContextServices.java index cb1950360af..787618ad51d 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServices.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServices.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServicesListener.java b/libjava/classpath/java/beans/beancontext/BeanContextServicesListener.java index becc7cdb6e4..2081080dd8f 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServicesListener.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServicesListener.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,11 +46,11 @@ package java.beans.beancontext; */ public interface BeanContextServicesListener extends BeanContextServiceRevokedListener { - /** - * Called by BeanContextServices whenever a service is made available. - * - * @param event the service revoked event, with useful information - * about the new service. - */ - void serviceAvailable(BeanContextServiceAvailableEvent event); + /** + * Called by BeanContextServices whenever a service is made available. + * + * @param event the service revoked event, with useful information + * about the new service. + */ + void serviceAvailable(BeanContextServiceAvailableEvent event); } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java index 725c2d46888..30b4a6fbdbd 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextServicesSupport.java @@ -66,7 +66,7 @@ public class BeanContextServicesSupport implements BeanContextServices { private static final long serialVersionUID = -8494482757288719206L; - + protected class BCSSChild extends BeanContextSupport.BCSChild { @@ -103,7 +103,7 @@ public class BeanContextServicesSupport Object serviceSelector) { return provider.getService(bcs, requestor, serviceClass, - serviceSelector); + serviceSelector); } public void releaseService (BeanContextServices bcs, @@ -116,7 +116,7 @@ public class BeanContextServicesSupport public void serviceRevoked (BeanContextServiceRevokedEvent bcsre) { if (provider instanceof BeanContextServiceRevokedListener) - ((BeanContextServiceRevokedListener) provider).serviceRevoked(bcsre); + ((BeanContextServiceRevokedListener) provider).serviceRevoked(bcsre); } } @@ -130,7 +130,7 @@ public class BeanContextServicesSupport private Class serviceClass; private BCSSServiceProvider(Class serviceClass, - BeanContextServiceProvider provider) + BeanContextServiceProvider provider) { this.serviceClass = serviceClass; serviceProvider = provider; @@ -167,10 +167,10 @@ public class BeanContextServicesSupport public boolean equals(Object obj) { if (obj instanceof Request) - { - Request req = (Request) obj; - return req.getRequestor().equals(requestor); - } + { + Request req = (Request) obj; + return req.getRequestor().equals(requestor); + } return false; } @@ -194,7 +194,7 @@ public class BeanContextServicesSupport private BeanContextServiceRevokedListener listener; public ServiceRequest(Object requestor, - BeanContextServiceRevokedListener listener) + BeanContextServiceRevokedListener listener) { super(requestor); this.listener = listener; @@ -203,11 +203,11 @@ public class BeanContextServicesSupport public boolean equals(Object obj) { if (obj instanceof ServiceRequest) - { - ServiceRequest sr = (ServiceRequest) obj; - return (super.equals(obj) && - sr.getListener().equals(listener)); - } + { + ServiceRequest sr = (ServiceRequest) obj; + return (super.equals(obj) && + sr.getListener().equals(listener)); + } return false; } @@ -238,11 +238,11 @@ public class BeanContextServicesSupport public boolean equals(Object obj) { if (obj instanceof ServiceLease) - { - ServiceLease sl = (ServiceLease) obj; - return (super.equals(obj) && - sl.getService().equals(service)); - } + { + ServiceLease sl = (ServiceLease) obj; + return (super.equals(obj) && + sl.getService().equals(service)); + } return false; } @@ -257,7 +257,7 @@ public class BeanContextServicesSupport * and revocation notifications. */ protected transient ArrayList bcsListeners; - + protected transient BCSSProxyServiceProvider proxy; /** @@ -297,7 +297,7 @@ public class BeanContextServicesSupport /** * Construct a {@link BeanContextServicesSupport} instance. - * + * * @param peer the bean context services peer (null permitted). */ public BeanContextServicesSupport (BeanContextServices peer) @@ -307,9 +307,9 @@ public class BeanContextServicesSupport /** * Construct a {@link BeanContextServicesSupport} instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). */ public BeanContextServicesSupport(BeanContextServices peer, Locale locale) @@ -319,9 +319,9 @@ public class BeanContextServicesSupport /** * Construct a {@link BeanContextServicesSupport} instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). * @param dtime a flag indicating whether or not the bean context is in * design time mode. @@ -334,9 +334,9 @@ public class BeanContextServicesSupport /** * Construct a {@link BeanContextServicesSupport} instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). * @param dtime a flag indicating whether or not the bean context is in * design time mode. @@ -347,7 +347,7 @@ public class BeanContextServicesSupport { super(peer, locale, dtime, visible); } - + /** * Adds a new listener for service availability and * revocation events. @@ -403,21 +403,21 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - if (services.containsKey(serviceClass)) - return false; - services.put(serviceClass, - createBCSSServiceProvider(serviceClass, bcsp)); - if (bcsp instanceof Serializable) - ++serializable; - if (fireEvent) - fireServiceAdded(serviceClass); - return true; - } + synchronized (services) + { + if (services.containsKey(serviceClass)) + return false; + services.put(serviceClass, + createBCSSServiceProvider(serviceClass, bcsp)); + if (bcsp instanceof Serializable) + ++serializable; + if (fireEvent) + fireServiceAdded(serviceClass); + return true; + } } } - + /** * Deserializes any service providers which are serializable. This * method is called by the readObject method of @@ -436,8 +436,8 @@ public class BeanContextServicesSupport serializable = ois.readInt(); for (int a = 0; a < serializable; ++a) { - BCSSServiceProvider bcsssp = (BCSSServiceProvider) ois.readObject(); - addService(bcsssp.getServiceClass(), bcsssp.getServiceProvider()); + BCSSServiceProvider bcsssp = (BCSSServiceProvider) ois.readObject(); + addService(bcsssp.getServiceClass(), bcsssp.getServiceProvider()); } } @@ -451,19 +451,19 @@ public class BeanContextServicesSupport * @param oos the stream to which data is being serialized. * @throws IOException if an I/O error occurs. */ - protected void bcsPreSerializationHook (ObjectOutputStream oos) + protected void bcsPreSerializationHook (ObjectOutputStream oos) throws IOException { oos.writeInt(serializable); synchronized (services) { - Iterator i = services.values().iterator(); - while (i.hasNext()) - { - BCSSServiceProvider bcsssp = (BCSSServiceProvider) i.next(); - if (bcsssp.getServiceProvider() instanceof Serializable) - oos.writeObject(bcsssp); - } + Iterator i = services.values().iterator(); + while (i.hasNext()) + { + BCSSServiceProvider bcsssp = (BCSSServiceProvider) i.next(); + if (bcsssp.getServiceProvider() instanceof Serializable) + oos.writeObject(bcsssp); + } } } @@ -476,17 +476,17 @@ public class BeanContextServicesSupport * * @param child the child being removed. * @param bcsc the support object for the child. - */ + */ protected void childJustRemovedHook (Object child, BeanContextSupport.BCSChild bcsc) { if (child instanceof BeanContextChild) { - BeanContextChild bcchild = (BeanContextChild) child; - Iterator childServices = ((List) serviceUsers.get(bcchild)).iterator(); - while (childServices.hasNext()) - releaseService(bcchild, this, childServices.next()); - serviceUsers.remove(bcchild); + BeanContextChild bcchild = (BeanContextChild) child; + Iterator childServices = ((List) serviceUsers.get(bcchild)).iterator(); + while (childServices.hasNext()) + releaseService(bcchild, this, childServices.next()); + serviceUsers.remove(bcchild); } } @@ -570,16 +570,16 @@ public class BeanContextServicesSupport = (BeanContextServicesListener) bcsListeners.get(i); bcsl.serviceRevoked(event); } - List requests = (List) serviceRequests.get(event.getServiceClass()); - if (requests != null) - { - Iterator i = requests.iterator(); - while (i.hasNext()) - { - ServiceRequest r = (ServiceRequest) i.next(); - r.getListener().serviceRevoked(event); - } - } + List requests = (List) serviceRequests.get(event.getServiceClass()); + if (requests != null) + { + Iterator i = requests.iterator(); + while (i.hasNext()) + { + ServiceRequest r = (ServiceRequest) i.next(); + r.getListener().serviceRevoked(event); + } + } } } @@ -609,20 +609,20 @@ public class BeanContextServicesSupport } /** - * Returns child as an instance of - * {@link BeanContextServicesListener}, or null if + * Returns child as an instance of + * {@link BeanContextServicesListener}, or null if * child does not implement that interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link BeanContextServicesListener}. */ protected static final BeanContextServicesListener getChildBeanContextServicesListener(Object child) { - if (child instanceof BeanContextServicesListener) + if (child instanceof BeanContextServicesListener) return (BeanContextServicesListener) child; - else + else return null; } @@ -636,10 +636,10 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - return services.keySet().iterator(); - } + synchronized (services) + { + return services.keySet().iterator(); + } } } @@ -660,16 +660,16 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - BeanContextServiceProvider bcsp - = ((BCSSServiceProvider) - services.get(serviceClass)).getServiceProvider(); - if (bcsp == null) - return null; - else - return bcsp.getCurrentServiceSelectors(this, serviceClass); - } + synchronized (services) + { + BeanContextServiceProvider bcsp + = ((BCSSServiceProvider) + services.get(serviceClass)).getServiceProvider(); + if (bcsp == null) + return null; + else + return bcsp.getCurrentServiceSelectors(this, serviceClass); + } } } @@ -699,47 +699,47 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - Object service; - BeanContextServiceProvider provider = ((BCSSServiceProvider) - services.get(serviceClass)).getServiceProvider(); - if (provider != null) - { - service = provider.getService(this, requestor, serviceClass, - serviceSelector); - List childServices = (List) serviceUsers.get(child); - if (childServices == null) - { - childServices = new ArrayList(); - serviceUsers.put(child, childServices); - } - childServices.add(serviceClass); - } - else - { - BeanContextServices peer = getBeanContextServicesPeer(); - if (peer != null) - service = peer.getService(child, requestor, serviceClass, - serviceSelector, bcsrl); - else - service = null; - } - if (service != null) - { - ServiceRequest request = new ServiceRequest(requestor, bcsrl); - Set requests = (Set) serviceRequests.get(serviceClass); - if (requests == null) - { - requests = new HashSet(); - serviceRequests.put(serviceClass, requests); - } - requests.add(request); - ServiceLease lease = new ServiceLease(requestor, service); - serviceLeases.put(lease, provider); - } - return service; - } + synchronized (services) + { + Object service; + BeanContextServiceProvider provider = ((BCSSServiceProvider) + services.get(serviceClass)).getServiceProvider(); + if (provider != null) + { + service = provider.getService(this, requestor, serviceClass, + serviceSelector); + List childServices = (List) serviceUsers.get(child); + if (childServices == null) + { + childServices = new ArrayList(); + serviceUsers.put(child, childServices); + } + childServices.add(serviceClass); + } + else + { + BeanContextServices peer = getBeanContextServicesPeer(); + if (peer != null) + service = peer.getService(child, requestor, serviceClass, + serviceSelector, bcsrl); + else + service = null; + } + if (service != null) + { + ServiceRequest request = new ServiceRequest(requestor, bcsrl); + Set requests = (Set) serviceRequests.get(serviceClass); + if (requests == null) + { + requests = new HashSet(); + serviceRequests.put(serviceClass, requests); + } + requests.add(request); + ServiceLease lease = new ServiceLease(requestor, service); + serviceLeases.put(lease, provider); + } + return service; + } } } @@ -753,10 +753,10 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - return services.containsKey(serviceClass); - } + synchronized (services) + { + return services.containsKey(serviceClass); + } } } @@ -784,7 +784,7 @@ public class BeanContextServicesSupport * Relinquishes any resources obtained from the parent context. * Specifically, those services obtained from the parent are revoked. * Subclasses may override this method to deallocate resources - * from the nesting bean context. + * from the nesting bean context. */ protected void releaseBeanContextResources() { @@ -806,21 +806,21 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - ServiceLease lease = new ServiceLease(requestor, service); - BeanContextServiceProvider provider = (BeanContextServiceProvider) - serviceLeases.get(lease); - if (provider != null) - provider.releaseService(this, requestor, service); - else - { - BeanContextServices peer = getBeanContextServicesPeer(); - if (peer != null) - peer.releaseService(child, requestor, service); - } - serviceLeases.remove(lease); - } + synchronized (services) + { + ServiceLease lease = new ServiceLease(requestor, service); + BeanContextServiceProvider provider = (BeanContextServiceProvider) + serviceLeases.get(lease); + if (provider != null) + provider.releaseService(this, requestor, service); + else + { + BeanContextServices peer = getBeanContextServicesPeer(); + if (peer != null) + peer.releaseService(child, requestor, service); + } + serviceLeases.remove(lease); + } } } @@ -829,7 +829,7 @@ public class BeanContextServicesSupport { synchronized (bcsListeners) { - bcsListeners.remove(listener); + bcsListeners.remove(listener); } } @@ -850,13 +850,13 @@ public class BeanContextServicesSupport { synchronized (globalHierarchyLock) { - synchronized (services) - { - fireServiceRevoked(serviceClass, revokeCurrentServicesNow); - services.remove(serviceClass); - if (bcsp instanceof Serializable) - --serializable; - } + synchronized (services) + { + fireServiceRevoked(serviceClass, revokeCurrentServicesNow); + services.remove(serviceClass); + if (bcsp instanceof Serializable) + --serializable; + } } } diff --git a/libjava/classpath/java/beans/beancontext/BeanContextSupport.java b/libjava/classpath/java/beans/beancontext/BeanContextSupport.java index 7572af3f0f9..fdae387d41c 100644 --- a/libjava/classpath/java/beans/beancontext/BeanContextSupport.java +++ b/libjava/classpath/java/beans/beancontext/BeanContextSupport.java @@ -188,7 +188,7 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Construct a BeanContextSupport instance. - * + * * @param peer the bean context peer (null permitted). */ public BeanContextSupport(BeanContext peer) @@ -198,9 +198,9 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Construct a BeanContextSupport instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). */ public BeanContextSupport (BeanContext peer, Locale locale) @@ -210,9 +210,9 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Construct a BeanContextSupport instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). * @param dtime a flag indicating whether or not the bean context is in * design time mode. @@ -224,9 +224,9 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Construct a BeanContextSupport instance. - * + * * @param peer the bean context peer (null permitted). - * @param locale the locale (null permitted, equivalent to + * @param locale the locale (null permitted, equivalent to * the default locale). * @param dtime a flag indicating whether or not the bean context is in * design time mode. @@ -248,7 +248,7 @@ public class BeanContextSupport extends BeanContextChildSupport *

        * Add a child to the bean context. A child can be a simple * Object, a BeanContextChild - * or another BeanContext. + * or another BeanContext. *

        *

        * The children of a BeanContext form a set. As @@ -272,7 +272,7 @@ public class BeanContextSupport extends BeanContextChildSupport * then its ability to use a GUI is set based on that of * this context. *

        - *

        + *

        * A BeanContextMembershipEvent is fired when the * child is successfully added to the bean context. *

        @@ -290,55 +290,55 @@ public class BeanContextSupport extends BeanContextChildSupport { synchronized (globalHierarchyLock) { - if (targetChild == null) - throw new IllegalArgumentException(); + if (targetChild == null) + throw new IllegalArgumentException(); - BCSChild child; - synchronized (children) - { - if (children.containsKey(targetChild) - || ! validatePendingAdd(targetChild)) - return false; - child = createBCSChild(targetChild, beanContextChildPeer); - children.put(targetChild, child); - } - synchronized (targetChild) - { - BeanContextChild bcChild = null; - if (targetChild instanceof BeanContextChild) - bcChild = (BeanContextChild) targetChild; - if (targetChild instanceof BeanContextProxy) - bcChild = ((BeanContextProxy) targetChild).getBeanContextProxy(); - if (bcChild != null) - try - { - bcChild.setBeanContext(this); - bcChild.addVetoableChangeListener("beanContext", this); - bcChild.addPropertyChangeListener("beanContext", this); - } - catch (PropertyVetoException e) - { - synchronized (children) - { - children.remove(targetChild); - } - throw new IllegalStateException("The child refused to " + - "associate itself with " + - "this context.", e); - } - if (targetChild instanceof Visibility) - { - Visibility visibleChild = (Visibility) targetChild; - if (okToUseGui) - visibleChild.okToUseGui(); - else - visibleChild.dontUseGui(); - } - childJustAddedHook(targetChild, child); - } - fireChildrenAdded(new BeanContextMembershipEvent(this, - new Object[]{ targetChild })); - return true; + BCSChild child; + synchronized (children) + { + if (children.containsKey(targetChild) + || ! validatePendingAdd(targetChild)) + return false; + child = createBCSChild(targetChild, beanContextChildPeer); + children.put(targetChild, child); + } + synchronized (targetChild) + { + BeanContextChild bcChild = null; + if (targetChild instanceof BeanContextChild) + bcChild = (BeanContextChild) targetChild; + if (targetChild instanceof BeanContextProxy) + bcChild = ((BeanContextProxy) targetChild).getBeanContextProxy(); + if (bcChild != null) + try + { + bcChild.setBeanContext(this); + bcChild.addVetoableChangeListener("beanContext", this); + bcChild.addPropertyChangeListener("beanContext", this); + } + catch (PropertyVetoException e) + { + synchronized (children) + { + children.remove(targetChild); + } + throw new IllegalStateException("The child refused to " + + "associate itself with " + + "this context.", e); + } + if (targetChild instanceof Visibility) + { + Visibility visibleChild = (Visibility) targetChild; + if (okToUseGui) + visibleChild.okToUseGui(); + else + visibleChild.dontUseGui(); + } + childJustAddedHook(targetChild, child); + } + fireChildrenAdded(new BeanContextMembershipEvent(this, + new Object[]{ targetChild })); + return true; } } @@ -415,7 +415,7 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Called when a child is deserialized. - * + * * @param child the deserialized child. * @param bcsc the deserialized context wrapper for the child. */ @@ -489,16 +489,16 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Deserializes objects (written by {@link #serialize(ObjectOutputStream, + * Deserializes objects (written by {@link #serialize(ObjectOutputStream, * Collection)}) and adds them to the specified collection. - * + * * @param ois the input stream (null not permitted). * @param coll the collection to add the objects to (null not * permitted). - * + * * @throws ClassNotFoundException * @throws IOException - * + * * @see #serialize(ObjectOutputStream, Collection) */ protected final void deserialize (ObjectInputStream ois, Collection coll) @@ -548,9 +548,9 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Returns the bean context peer. - * + * * @return The bean context peer. - * + * * @see BeanContextChildSupport#beanContextChildPeer */ public BeanContext getBeanContextPeer() @@ -560,11 +560,11 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Returns the {@link BeanContextChild} implementation for the given child. - * + * * @param child the child (null permitted). - * + * * @return The bean context child. - * + * * @throws IllegalArgumentException if child implements both * the {@link BeanContextChild} and {@link BeanContextProxy} interfaces. */ @@ -573,7 +573,7 @@ public class BeanContextSupport extends BeanContextChildSupport if (child == null) return null; if (child instanceof BeanContextChild && child instanceof BeanContextProxy) - throw new IllegalArgumentException("Child cannot implement " + throw new IllegalArgumentException("Child cannot implement " + "BeanContextChild and BeanContextProxy simultaneously."); if (child instanceof BeanContextChild) return (BeanContextChild) child; @@ -583,89 +583,89 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Returns child as an instance of - * {@link BeanContextMembershipListener}, or null if + * Returns child as an instance of + * {@link BeanContextMembershipListener}, or null if * child does not implement that interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link BeanContextMembershipListener}. */ - protected static final BeanContextMembershipListener + protected static final BeanContextMembershipListener getChildBeanContextMembershipListener(Object child) { - if (child instanceof BeanContextMembershipListener) + if (child instanceof BeanContextMembershipListener) return (BeanContextMembershipListener) child; - else + else return null; } /** - * Returns child as an instance of + * Returns child as an instance of * {@link PropertyChangeListener}, or null if child * does not implement that interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link PropertyChangeListener}. */ protected static final PropertyChangeListener getChildPropertyChangeListener( Object child) { - if (child instanceof PropertyChangeListener) + if (child instanceof PropertyChangeListener) return (PropertyChangeListener) child; - else + else return null; } /** - * Returns child as an instance of {@link Serializable}, or - * null if child does not implement that + * Returns child as an instance of {@link Serializable}, or + * null if child does not implement that * interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link Serializable}. */ protected static final Serializable getChildSerializable(Object child) { - if (child instanceof Serializable) + if (child instanceof Serializable) return (Serializable) child; - else + else return null; } /** - * Returns child as an instance of + * Returns child as an instance of * {@link VetoableChangeListener}, or null if child * does not implement that interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link VetoableChangeListener}. */ protected static final VetoableChangeListener getChildVetoableChangeListener( Object child) { - if (child instanceof VetoableChangeListener) + if (child instanceof VetoableChangeListener) return (VetoableChangeListener) child; - else + else return null; } /** * Returns child as an instance of {@link Visibility}, or * null if child does not implement that interface. - * + * * @param child the child (null permitted). - * + * * @return The child cast to {@link Visibility}. */ protected static final Visibility getChildVisibility(Object child) { - if (child instanceof Visibility) + if (child instanceof Visibility) return (Visibility) child; - else + else return null; } @@ -715,11 +715,11 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Returns true if the BeanContext is in + * Returns true if the BeanContext is in * design time mode, and false if it is in runtime mode. - * + * * @return A boolean. - * + * * @see #setDesignTime(boolean) */ public boolean isDesignTime() @@ -810,15 +810,15 @@ public class BeanContextSupport extends BeanContextChildSupport Iterator i = temp.iterator(); synchronized (globalHierarchyLock) { - synchronized (children) - { - while (i.hasNext()) - { - BCSChild bcs = (BCSChild) i.next(); - childDeserializedHook(bcs.getTargetChild(), bcs); - children.put(bcs.getTargetChild(), bcs); - } - } + synchronized (children) + { + while (i.hasNext()) + { + BCSChild bcs = (BCSChild) i.next(); + childDeserializedHook(bcs.getTargetChild(), bcs); + children.put(bcs.getTargetChild(), bcs); + } + } } } @@ -854,7 +854,7 @@ public class BeanContextSupport extends BeanContextChildSupport * PropertyChangeListener and * VetoableChangeListener for "beanContext" events. *

        - *

        + *

        * A BeanContextMembershipEvent is fired when the * child is successfully removed from the bean context. *

        @@ -874,47 +874,47 @@ public class BeanContextSupport extends BeanContextChildSupport { synchronized (globalHierarchyLock) { - if (targetChild == null) - throw new IllegalArgumentException(); + if (targetChild == null) + throw new IllegalArgumentException(); - BCSChild child; - synchronized (children) - { - if (!children.containsKey(targetChild) - || !validatePendingRemove(targetChild)) - return false; - child = (BCSChild) children.remove(targetChild); - } - synchronized (targetChild) - { - BeanContextChild bcChild = null; - if (targetChild instanceof BeanContextChild) - bcChild = (BeanContextChild) targetChild; - if (targetChild instanceof BeanContextProxy) - bcChild = ((BeanContextProxy) targetChild).getBeanContextProxy(); - if (bcChild != null) - try - { - if (callChildSetBC) - bcChild.setBeanContext(null); - bcChild.removeVetoableChangeListener("beanContext", this); - bcChild.removePropertyChangeListener("beanContext", this); - } - catch (PropertyVetoException e) - { - synchronized (children) - { - children.put(targetChild, child); - } - throw new IllegalStateException("The child refused to " + - "disassociate itself with " + - "this context.", e); - } - childJustRemovedHook(targetChild, child); - } - fireChildrenRemoved(new BeanContextMembershipEvent(this, - new Object[]{ targetChild })); - return true; + BCSChild child; + synchronized (children) + { + if (!children.containsKey(targetChild) + || !validatePendingRemove(targetChild)) + return false; + child = (BCSChild) children.remove(targetChild); + } + synchronized (targetChild) + { + BeanContextChild bcChild = null; + if (targetChild instanceof BeanContextChild) + bcChild = (BeanContextChild) targetChild; + if (targetChild instanceof BeanContextProxy) + bcChild = ((BeanContextProxy) targetChild).getBeanContextProxy(); + if (bcChild != null) + try + { + if (callChildSetBC) + bcChild.setBeanContext(null); + bcChild.removeVetoableChangeListener("beanContext", this); + bcChild.removePropertyChangeListener("beanContext", this); + } + catch (PropertyVetoException e) + { + synchronized (children) + { + children.put(targetChild, child); + } + throw new IllegalStateException("The child refused to " + + "disassociate itself with " + + "this context.", e); + } + childJustRemovedHook(targetChild, child); + } + fireChildrenRemoved(new BeanContextMembershipEvent(this, + new Object[]{ targetChild })); + return true; } } @@ -940,14 +940,14 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Writes the items in the collection to the specified output stream. Items - * in the collection that are not instances of {@link Serializable} + * in the collection that are not instances of {@link Serializable} * (this includes null) are simply ignored. - * + * * @param oos the output stream (null not permitted). * @param coll the collection (null not permitted). - * + * * @throws IOException - * + * * @see #deserialize(ObjectInputStream, Collection) */ protected final void serialize(ObjectOutputStream oos, Collection coll) @@ -969,15 +969,15 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Sets the flag that indicates whether or not the + * Sets the flag that indicates whether or not the * BeanContext is in design mode. If the flag changes * value, a {@link PropertyChangeEvent} (with the property name 'designMode') * is sent to registered listeners. Note that the property name used here * does NOT match the specification in the {@link DesignMode} interface, we * match the reference implementation instead - see bug parade entry 4295174. - * + * * @param dtime the new value for the flag. - * + * * @see #isDesignTime() */ public void setDesignTime(boolean dtime) @@ -1011,7 +1011,7 @@ public class BeanContextSupport extends BeanContextChildSupport /** * Returns an array containing the children of this BeanContext. - * + * * @return An array containing the children. */ public Object[] toArray() @@ -1023,11 +1023,11 @@ public class BeanContextSupport extends BeanContextChildSupport } /** - * Populates, then returns, the supplied array with the children of this - * BeanContext. If the array is too short to hold the - * children, a new array is allocated and returned. If the array is too + * Populates, then returns, the supplied array with the children of this + * BeanContext. If the array is too short to hold the + * children, a new array is allocated and returned. If the array is too * long, it is padded with null items at the end. - * + * * @param array an array to populate (null not permitted). */ public Object[] toArray(Object[] array) @@ -1072,7 +1072,7 @@ public class BeanContextSupport extends BeanContextChildSupport { synchronized (children) { - serialize(oos, children.values()); + serialize(oos, children.values()); } } diff --git a/libjava/classpath/java/io/BufferedInputStream.java b/libjava/classpath/java/io/BufferedInputStream.java index 6fb024614d2..7013b0948ce 100644 --- a/libjava/classpath/java/io/BufferedInputStream.java +++ b/libjava/classpath/java/io/BufferedInputStream.java @@ -35,7 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - + package java.io; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 @@ -43,11 +43,11 @@ package java.io; * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ - + /** - * This subclass of FilterInputStream buffers input from an + * This subclass of FilterInputStream buffers input from an * underlying implementation to provide a possibly more efficient read - * mechanism. It maintains the buffer and buffer state in instance + * mechanism. It maintains the buffer and buffer state in instance * variables that are available to subclasses. The default buffer size * of 2048 bytes can be overridden by the creator of the stream. *

        @@ -90,13 +90,13 @@ public class BufferedInputStream extends FilterInputStream /** * The value of pos when the mark() method was - * called. + * called. * This is set to -1 if there is no mark set. */ protected int markpos = -1; /** - * This is the maximum number of bytes than can be read after a + * This is the maximum number of bytes than can be read after a * call to mark() before the mark can be discarded. * After this may bytes are read, the reset() method * may not be called successfully. @@ -148,7 +148,7 @@ public class BufferedInputStream extends FilterInputStream * stream before a read can block. A return of 0 indicates that blocking * might (or might not) occur on the very next read attempt. *

        - * The number of available bytes will be the number of read ahead bytes + * The number of available bytes will be the number of read ahead bytes * stored in the internal buffer plus the number of available bytes in * the underlying stream. * @@ -179,7 +179,7 @@ public class BufferedInputStream extends FilterInputStream /** * This method marks a position in the input to which the stream can be * "reset" by calling the reset() method. The parameter - * readlimit is the number of bytes that can be read from the + * readlimit is the number of bytes that can be read from the * stream after setting the mark before the mark becomes invalid. For * example, if mark() is called with a read limit of 10, then * when 11 bytes of data are read from the stream before the @@ -227,7 +227,7 @@ public class BufferedInputStream extends FilterInputStream public synchronized int read() throws IOException { if (pos >= count && !refill()) - return -1; // EOF + return -1; // EOF return buf[pos++] & 0xFF; } @@ -265,7 +265,7 @@ public class BufferedInputStream extends FilterInputStream return 0; if (pos >= count && !refill()) - return -1; // No bytes were read before EOF. + return -1; // No bytes were read before EOF. int totalBytesRead = Math.min(count - pos, len); System.arraycopy(buf, pos, b, off, totalBytesRead); @@ -275,12 +275,12 @@ public class BufferedInputStream extends FilterInputStream while (len > 0 && super.available() > 0 && refill()) { - int remain = Math.min(count - pos, len); - System.arraycopy(buf, pos, b, off, remain); - pos += remain; - off += remain; - len -= remain; - totalBytesRead += remain; + int remain = Math.min(count - pos, len); + System.arraycopy(buf, pos, b, off, remain); + pos += remain; + off += remain; + len -= remain; + totalBytesRead += remain; } return totalBytesRead; @@ -327,12 +327,12 @@ public class BufferedInputStream extends FilterInputStream while (n > 0L) { - if (pos >= count && !refill()) + if (pos >= count && !refill()) break; - int numread = (int) Math.min((long) (count - pos), n); - pos += numread; - n -= numread; + int numread = (int) Math.min((long) (count - pos), n); + pos += numread; + n -= numread; } return origN - n; @@ -351,26 +351,26 @@ public class BufferedInputStream extends FilterInputStream if (markpos == -1 || count - markpos >= marklimit) { - markpos = -1; - pos = count = 0; + markpos = -1; + pos = count = 0; } else { - byte[] newbuf = buf; - if (markpos < bufferSize) - { - newbuf = new byte[count - markpos + bufferSize]; - } - System.arraycopy(buf, markpos, newbuf, 0, count - markpos); - buf = newbuf; - count -= markpos; - pos -= markpos; - markpos = 0; + byte[] newbuf = buf; + if (markpos < bufferSize) + { + newbuf = new byte[count - markpos + bufferSize]; + } + System.arraycopy(buf, markpos, newbuf, 0, count - markpos); + buf = newbuf; + count -= markpos; + pos -= markpos; + markpos = 0; } int numread = super.read(buf, count, bufferSize); - if (numread <= 0) // EOF + if (numread <= 0) // EOF return false; count += numread; diff --git a/libjava/classpath/java/io/BufferedOutputStream.java b/libjava/classpath/java/io/BufferedOutputStream.java index ce7ebc7e938..e6027cad6f3 100644 --- a/libjava/classpath/java/io/BufferedOutputStream.java +++ b/libjava/classpath/java/io/BufferedOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -112,7 +112,7 @@ public class BufferedOutputStream extends FilterOutputStream } /** - * This method flushes any remaining buffered bytes then closes the + * This method flushes any remaining buffered bytes then closes the * underlying output stream. Any further attempts to write to this stream * may throw an exception * @@ -124,7 +124,7 @@ public class BufferedOutputStream extends FilterOutputStream */ /** - * This method runs when the object is garbage collected. It is + * This method runs when the object is garbage collected. It is * responsible for ensuring that all buffered bytes are written and * for closing the underlying stream. * @@ -156,8 +156,8 @@ public class BufferedOutputStream extends FilterOutputStream } /** - * This method writes len bytes from the byte array - * buf starting at position offset in the buffer. + * This method writes len bytes from the byte array + * buf starting at position offset in the buffer. * These bytes will be written to the internal buffer. However, if this * write operation fills the buffer, the buffer will be flushed to the * underlying output stream. @@ -168,7 +168,7 @@ public class BufferedOutputStream extends FilterOutputStream * * @exception IOException If an error occurs */ - public synchronized void write(byte[] buf, int offset, int len) + public synchronized void write(byte[] buf, int offset, int len) throws IOException { // Buffer can hold everything. Note that the case where LEN < 0 @@ -188,5 +188,4 @@ public class BufferedOutputStream extends FilterOutputStream } } -} // class BufferedOutputStream - +} // class BufferedOutputStream diff --git a/libjava/classpath/java/io/BufferedReader.java b/libjava/classpath/java/io/BufferedReader.java index 3dbe80b77fb..868fa3a9478 100644 --- a/libjava/classpath/java/io/BufferedReader.java +++ b/libjava/classpath/java/io/BufferedReader.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,9 +47,9 @@ import gnu.java.lang.CPStringBuilder; */ /** - * This subclass of FilterReader buffers input from an + * This subclass of FilterReader buffers input from an * underlying implementation to provide a possibly more efficient read - * mechanism. It maintains the buffer and buffer state in instance + * mechanism. It maintains the buffer and buffer state in instance * variables that are available to subclasses. The default buffer size * of 8192 chars can be overridden by the creator of the stream. *

        @@ -91,7 +91,7 @@ public class BufferedReader extends Reader static final int DEFAULT_BUFFER_SIZE = 8192; /** - * Create a new BufferedReader that will read from the + * Create a new BufferedReader that will read from the * specified subordinate stream with a default buffer size of 8192 chars. * * @param in The subordinate stream to read from @@ -102,8 +102,8 @@ public class BufferedReader extends Reader } /** - * Create a new BufferedReader that will read from the - * specified subordinate stream with a buffer size that is specified by the + * Create a new BufferedReader that will read from the + * specified subordinate stream with a buffer size that is specified by the * caller. * * @param in The subordinate stream to read from @@ -130,15 +130,15 @@ public class BufferedReader extends Reader { synchronized (lock) { - if (in != null) - in.close(); - in = null; - buffer = null; + if (in != null) + in.close(); + in = null; + buffer = null; } } /** - * Returns true to indicate that this class supports mark/reset + * Returns true to indicate that this class supports mark/reset * functionality. * * @return true @@ -151,11 +151,11 @@ public class BufferedReader extends Reader /** * Mark a position in the input to which the stream can be * "reset" by calling the reset() method. The parameter - * readLimit is the number of chars that can be read from the + * readLimit is the number of chars that can be read from the * stream after setting the mark before the mark becomes invalid. For - * example, if mark() is called with a read limit of 10, then - * when 11 chars of data are read from the stream before the - * reset() method is called, then the mark is invalid and the + * example, if mark() is called with a read limit of 10, then + * when 11 chars of data are read from the stream before the + * reset() method is called, then the mark is invalid and the * stream object instance is not required to remember the mark. *

        * Note that the number of chars that can be remembered by this method @@ -163,7 +163,7 @@ public class BufferedReader extends Reader * not dependent on the subordinate stream supporting mark/reset * functionality. * - * @param readLimit The number of chars that can be read before the mark + * @param readLimit The number of chars that can be read before the mark * becomes invalid * * @exception IOException If an error occurs @@ -176,45 +176,45 @@ public class BufferedReader extends Reader synchronized (lock) { - checkStatus(); - // In this method we need to be aware of the special case where - // pos + 1 == limit. This indicates that a '\r' was the last char - // in the buffer during a readLine. We'll want to maintain that - // condition after we shift things around and if a larger buffer is - // needed to track readLimit, we'll have to make it one element - // larger to ensure we don't invalidate the mark too early, if the - // char following the '\r' is NOT a '\n'. This is ok because, per - // the spec, we are not required to invalidate when passing readLimit. - // - // Note that if 'pos > limit', then doing 'limit -= pos' will cause - // limit to be negative. This is the only way limit will be < 0. + checkStatus(); + // In this method we need to be aware of the special case where + // pos + 1 == limit. This indicates that a '\r' was the last char + // in the buffer during a readLine. We'll want to maintain that + // condition after we shift things around and if a larger buffer is + // needed to track readLimit, we'll have to make it one element + // larger to ensure we don't invalidate the mark too early, if the + // char following the '\r' is NOT a '\n'. This is ok because, per + // the spec, we are not required to invalidate when passing readLimit. + // + // Note that if 'pos > limit', then doing 'limit -= pos' will cause + // limit to be negative. This is the only way limit will be < 0. - if (pos + readLimit > limit) - { - char[] old_buffer = buffer; - int extraBuffSpace = 0; - if (pos > limit) - extraBuffSpace = 1; - if (readLimit + extraBuffSpace > limit) - buffer = new char[readLimit + extraBuffSpace]; - limit -= pos; - if (limit >= 0) - { - System.arraycopy(old_buffer, pos, buffer, 0, limit); - pos = 0; - } - } + if (pos + readLimit > limit) + { + char[] old_buffer = buffer; + int extraBuffSpace = 0; + if (pos > limit) + extraBuffSpace = 1; + if (readLimit + extraBuffSpace > limit) + buffer = new char[readLimit + extraBuffSpace]; + limit -= pos; + if (limit >= 0) + { + System.arraycopy(old_buffer, pos, buffer, 0, limit); + pos = 0; + } + } - if (limit < 0) - { - // Maintain the relationship of 'pos > limit'. - pos = 1; - limit = markPos = 0; - } - else - markPos = pos; - // Now pos + readLimit <= buffer.length. thus if we need to read - // beyond buffer.length, then we are allowed to invalidate markPos. + if (limit < 0) + { + // Maintain the relationship of 'pos > limit'. + pos = 1; + limit = markPos = 0; + } + else + markPos = pos; + // Now pos + readLimit <= buffer.length. thus if we need to read + // beyond buffer.length, then we are allowed to invalidate markPos. } } @@ -233,20 +233,20 @@ public class BufferedReader extends Reader { synchronized (lock) { - checkStatus(); - if (markPos < 0) - throw new IOException("mark never set or invalidated"); + checkStatus(); + if (markPos < 0) + throw new IOException("mark never set or invalidated"); - // Need to handle the extremely unlikely case where a readLine was - // done with a '\r' as the last char in the buffer; which was then - // immediately followed by a mark and a reset with NO intervening - // read of any sort. In that case, setting pos to markPos would - // lose that info and a subsequent read would thus not skip a '\n' - // (if one exists). The value of limit in this rare case is zero. - // We can assume that if limit is zero for other reasons, then - // pos is already set to zero and doesn't need to be readjusted. - if (limit > 0) - pos = markPos; + // Need to handle the extremely unlikely case where a readLine was + // done with a '\r' as the last char in the buffer; which was then + // immediately followed by a mark and a reset with NO intervening + // read of any sort. In that case, setting pos to markPos would + // lose that info and a subsequent read would thus not skip a '\n' + // (if one exists). The value of limit in this rare case is zero. + // We can assume that if limit is zero for other reasons, then + // pos is already set to zero and doesn't need to be readjusted. + if (limit > 0) + pos = markPos; } } @@ -255,7 +255,7 @@ public class BufferedReader extends Reader * this method returns false then this stream could (but is * not guaranteed to) block on the next read attempt. * - * @return true if this stream is ready to be read, + * @return true if this stream is ready to be read, * false otherwise * * @exception IOException If an error occurs @@ -264,14 +264,14 @@ public class BufferedReader extends Reader { synchronized (lock) { - checkStatus(); - return pos < limit || in.ready(); + checkStatus(); + return pos < limit || in.ready(); } } /** * This method read chars from a stream and stores them into a caller - * supplied buffer. It starts storing the data at index + * supplied buffer. It starts storing the data at index * offset into * the buffer and attempts to read len chars. This method can * return before reading the number of chars requested. The actual number @@ -297,53 +297,53 @@ public class BufferedReader extends Reader synchronized (lock) { - checkStatus(); - // Once again, we need to handle the special case of a readLine - // that has a '\r' at the end of the buffer. In this case, we'll - // need to skip a '\n' if it is the next char to be read. - // This special case is indicated by 'pos > limit'. - boolean retAtEndOfBuffer = false; + checkStatus(); + // Once again, we need to handle the special case of a readLine + // that has a '\r' at the end of the buffer. In this case, we'll + // need to skip a '\n' if it is the next char to be read. + // This special case is indicated by 'pos > limit'. + boolean retAtEndOfBuffer = false; - int avail = limit - pos; - if (count > avail) - { - if (avail > 0) - count = avail; - else // pos >= limit - { - if (limit == buffer.length) - markPos = -1; // read too far - invalidate the mark. - if (pos > limit) - { - // Set a boolean and make pos == limit to simplify things. - retAtEndOfBuffer = true; - --pos; - } - if (markPos < 0) - { - // Optimization: can read directly into buf. - if (count >= buffer.length && !retAtEndOfBuffer) - return in.read(buf, offset, count); - pos = limit = 0; - } - avail = in.read(buffer, limit, buffer.length - limit); - if (retAtEndOfBuffer && avail > 0 && buffer[limit] == '\n') - { - --avail; - limit++; - } - if (avail < count) - { - if (avail <= 0) - return avail; - count = avail; - } - limit += avail; - } - } - System.arraycopy(buffer, pos, buf, offset, count); - pos += count; - return count; + int avail = limit - pos; + if (count > avail) + { + if (avail > 0) + count = avail; + else // pos >= limit + { + if (limit == buffer.length) + markPos = -1; // read too far - invalidate the mark. + if (pos > limit) + { + // Set a boolean and make pos == limit to simplify things. + retAtEndOfBuffer = true; + --pos; + } + if (markPos < 0) + { + // Optimization: can read directly into buf. + if (count >= buffer.length && !retAtEndOfBuffer) + return in.read(buf, offset, count); + pos = limit = 0; + } + avail = in.read(buffer, limit, buffer.length - limit); + if (retAtEndOfBuffer && avail > 0 && buffer[limit] == '\n') + { + --avail; + limit++; + } + if (avail < count) + { + if (avail <= 0) + return avail; + count = avail; + } + limit += avail; + } + } + System.arraycopy(buffer, pos, buf, offset, count); + pos += count; + return count; } } @@ -360,7 +360,7 @@ public class BufferedReader extends Reader if (pos > limit) { retAtEndOfBuffer = true; - --pos; + --pos; } if (markPos >= 0 && limit == buffer.length) @@ -373,26 +373,26 @@ public class BufferedReader extends Reader if (retAtEndOfBuffer && buffer[pos] == '\n') { - --count; - // If the mark was set to the location of the \n, then we - // must change it to fully pretend that the \n does not - // exist. - if (markPos == pos) - ++markPos; - ++pos; + --count; + // If the mark was set to the location of the \n, then we + // must change it to fully pretend that the \n does not + // exist. + if (markPos == pos) + ++markPos; + ++pos; } return count; } - + public int read() throws IOException { synchronized (lock) { - checkStatus(); - if (pos >= limit && fill () <= 0) - return -1; - return buffer[pos++]; + checkStatus(); + if (pos >= limit && fill () <= 0) + return -1; + return buffer[pos++]; } } @@ -405,9 +405,9 @@ public class BufferedReader extends Reader int i = pos; for (; i < limit; i++) { - char ch = buffer[i]; - if (ch == '\n' || ch == '\r') - break; + char ch = buffer[i]; + if (ch == '\n' || ch == '\r') + break; } return i; } @@ -418,9 +418,9 @@ public class BufferedReader extends Reader * an "\r\n" sequence. The system dependent line separator is not used. * The line termination characters are not returned in the resulting * String. - * + * * @return The line of text read, or null if end of stream. - * + * * @exception IOException If an error occurs */ public String readLine() throws IOException @@ -432,25 +432,25 @@ public class BufferedReader extends Reader // This special case is indicated by 'pos > limit'. if (pos > limit) { - int ch = read(); - if (ch < 0) - return null; - if (ch != '\n') - --pos; + int ch = read(); + if (ch < 0) + return null; + if (ch != '\n') + --pos; } int i = lineEnd(limit); if (i < limit) { - String str = String.valueOf(buffer, pos, i - pos); - pos = i + 1; - // If the last char in the buffer is a '\r', we must remember - // to check if the next char to be read after the buffer is refilled - // is a '\n'. If so, skip it. To indicate this condition, we set pos - // to be limit + 1, which normally is never possible. - if (buffer[i] == '\r') - if (pos == limit || buffer[pos] == '\n') - pos++; - return str; + String str = String.valueOf(buffer, pos, i - pos); + pos = i + 1; + // If the last char in the buffer is a '\r', we must remember + // to check if the next char to be read after the buffer is refilled + // is a '\n'. If so, skip it. To indicate this condition, we set pos + // to be limit + 1, which normally is never possible. + if (buffer[i] == '\r') + if (pos == limit || buffer[pos] == '\n') + pos++; + return str; } CPStringBuilder sbuf = new CPStringBuilder(200); sbuf.append(buffer, pos, i - pos); @@ -462,33 +462,33 @@ public class BufferedReader extends Reader boolean eof = false; for (;;) { - // readLine should block. So we must not return until a -1 is reached. - if (pos >= limit) - { - // here count == 0 isn't sufficient to give a failure. - int count = fill(); - if (count < 0) - { - eof = true; - break; - } - continue; - } - int ch = buffer[pos++]; - if (ch == '\n' || ch == '\r') - { - // Check here if a '\r' was the last char in the buffer; if so, - // mark it as in the comment above to indicate future reads - // should skip a newline that is the next char read after - // refilling the buffer. - if (ch == '\r') - if (pos == limit || buffer[pos] == '\n') - pos++; - break; - } - i = lineEnd(limit); - sbuf.append(buffer, pos - 1, i - (pos - 1)); - pos = i; + // readLine should block. So we must not return until a -1 is reached. + if (pos >= limit) + { + // here count == 0 isn't sufficient to give a failure. + int count = fill(); + if (count < 0) + { + eof = true; + break; + } + continue; + } + int ch = buffer[pos++]; + if (ch == '\n' || ch == '\r') + { + // Check here if a '\r' was the last char in the buffer; if so, + // mark it as in the comment above to indicate future reads + // should skip a newline that is the next char read after + // refilling the buffer. + if (ch == '\r') + if (pos == limit || buffer[pos] == '\n') + pos++; + break; + } + i = lineEnd(limit); + sbuf.append(buffer, pos - 1, i - (pos - 1)); + pos = i; } return (sbuf.length() == 0 && eof) ? null : sbuf.toString(); } @@ -499,7 +499,7 @@ public class BufferedReader extends Reader * requested amount. *

        * This method first discards chars in the buffer, then calls the - * skip method on the underlying stream to skip the + * skip method on the underlying stream to skip the * remaining chars. * * @param count The requested number of chars to skip @@ -513,63 +513,63 @@ public class BufferedReader extends Reader { synchronized (lock) { - checkStatus(); - if (count < 0) - throw new IllegalArgumentException("skip value is negative"); - if (count == 0) - return 0; - // Yet again, we need to handle the special case of a readLine - // that has a '\r' at the end of the buffer. In this case, we need - // to ignore a '\n' if it is the next char to be read. - // This special case is indicated by 'pos > limit' (i.e. avail < 0). - // To simplify things, if we're dealing with the special case for - // readLine, just read the next char (since the fill method will - // skip the '\n' for us). By doing this, we'll have to back up pos. - // That's easier than trying to keep track of whether we've skipped - // one element or not. - if (pos > limit) - { - if (read() < 0) - return 0; - else - --pos; - } + checkStatus(); + if (count < 0) + throw new IllegalArgumentException("skip value is negative"); + if (count == 0) + return 0; + // Yet again, we need to handle the special case of a readLine + // that has a '\r' at the end of the buffer. In this case, we need + // to ignore a '\n' if it is the next char to be read. + // This special case is indicated by 'pos > limit' (i.e. avail < 0). + // To simplify things, if we're dealing with the special case for + // readLine, just read the next char (since the fill method will + // skip the '\n' for us). By doing this, we'll have to back up pos. + // That's easier than trying to keep track of whether we've skipped + // one element or not. + if (pos > limit) + { + if (read() < 0) + return 0; + else + --pos; + } - int avail = limit - pos; + int avail = limit - pos; - if (count < avail) - { - pos += count; - return count; - } + if (count < avail) + { + pos += count; + return count; + } - pos = limit; - long todo = count - avail; - if (todo > buffer.length) - { - markPos = -1; - todo -= in.skip(todo); - } - else - { - while (todo > 0) - { - avail = fill(); - if (avail <= 0) - break; - if (avail > todo) - avail = (int) todo; - pos += avail; - todo -= avail; - } - } - return count - todo; + pos = limit; + long todo = count - avail; + if (todo > buffer.length) + { + markPos = -1; + todo -= in.skip(todo); + } + else + { + while (todo > 0) + { + avail = fill(); + if (avail <= 0) + break; + if (avail > todo) + avail = (int) todo; + pos += avail; + todo -= avail; + } + } + return count - todo; } } - + private void checkStatus() throws IOException { if (in == null) throw new IOException("Stream closed"); - } + } } diff --git a/libjava/classpath/java/io/BufferedWriter.java b/libjava/classpath/java/io/BufferedWriter.java index 185a5344062..ae6751c437e 100644 --- a/libjava/classpath/java/io/BufferedWriter.java +++ b/libjava/classpath/java/io/BufferedWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -53,7 +53,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey (tromey@cygnus.com) - * @date September 25, 1998 + * @date September 25, 1998 */ public class BufferedWriter extends Writer { @@ -110,7 +110,7 @@ public class BufferedWriter extends Writer } /** - * This method flushes any remaining buffered chars then closes the + * This method flushes any remaining buffered chars then closes the * underlying output stream. Any further attempts to write to this stream * may throw an exception * @@ -120,11 +120,11 @@ public class BufferedWriter extends Writer { synchronized (lock) { - // It is safe to call localFlush even if the stream is already - // closed. - localFlush (); - out.close(); - buffer = null; + // It is safe to call localFlush even if the stream is already + // closed. + localFlush (); + out.close(); + buffer = null; } } @@ -138,10 +138,10 @@ public class BufferedWriter extends Writer { synchronized (lock) { - if (buffer == null) - throw new IOException ("Stream closed"); - localFlush (); - out.flush(); + if (buffer == null) + throw new IOException ("Stream closed"); + localFlush (); + out.flush(); } } @@ -171,17 +171,17 @@ public class BufferedWriter extends Writer { synchronized (lock) { - if (buffer == null) - throw new IOException ("Stream closed"); - buffer[count++] = (char) oneChar; - if (count == buffer.length) - localFlush (); + if (buffer == null) + throw new IOException ("Stream closed"); + buffer[count++] = (char) oneChar; + if (count == buffer.length) + localFlush (); } } /** - * This method writes len chars from the char array - * buf starting at position offset in the buffer. + * This method writes len chars from the char array + * buf starting at position offset in the buffer. * These chars will be written to the internal buffer. However, if this * write operation fills the buffer, the buffer will be flushed to the * underlying output stream. @@ -196,28 +196,28 @@ public class BufferedWriter extends Writer { synchronized (lock) { - if (buffer == null) - throw new IOException ("Stream closed"); + if (buffer == null) + throw new IOException ("Stream closed"); - // Bypass buffering if there is too much incoming data. - if (count + len > buffer.length) - { - localFlush (); - out.write(buf, offset, len); - } - else - { - System.arraycopy(buf, offset, buffer, count, len); - count += len; - if (count == buffer.length) - localFlush (); - } + // Bypass buffering if there is too much incoming data. + if (count + len > buffer.length) + { + localFlush (); + out.write(buf, offset, len); + } + else + { + System.arraycopy(buf, offset, buffer, count, len); + count += len; + if (count == buffer.length) + localFlush (); + } } } /** * This method writes len chars from the String - * str starting at position offset in the string. + * str starting at position offset in the string. * These chars will be written to the internal buffer. However, if this * write operation fills the buffer, the buffer will be flushed to the * underlying output stream. @@ -232,21 +232,21 @@ public class BufferedWriter extends Writer { synchronized (lock) { - if (buffer == null) - throw new IOException ("Stream closed"); + if (buffer == null) + throw new IOException ("Stream closed"); - if (count + len > buffer.length) - { - localFlush (); - out.write(str, offset, len); - } - else - { - str.getChars(offset, offset + len, buffer, count); - count += len; - if (count == buffer.length) - localFlush (); - } + if (count + len > buffer.length) + { + localFlush (); + out.write(str, offset, len); + } + else + { + str.getChars(offset, offset + len, buffer, count); + count += len; + if (count == buffer.length) + localFlush (); + } } } @@ -255,8 +255,8 @@ public class BufferedWriter extends Writer { if (count > 0) { - out.write(buffer, 0, count); - count = 0; + out.write(buffer, 0, count); + count = 0; } } } diff --git a/libjava/classpath/java/io/ByteArrayInputStream.java b/libjava/classpath/java/io/ByteArrayInputStream.java index 2bbde95b724..f46ee3c0f9b 100644 --- a/libjava/classpath/java/io/ByteArrayInputStream.java +++ b/libjava/classpath/java/io/ByteArrayInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.io; * * @author Warren Levy (warrenl@cygnus.com) * @author Aaron M. Renn (arenn@urbanophile.com) - */ + */ public class ByteArrayInputStream extends InputStream { /** @@ -78,9 +78,9 @@ public class ByteArrayInputStream extends InputStream * of the array. It is identical to calling an overloaded constructor * as ByteArrayInputStream(buf, 0, buf.length). *

        - * Note that this array is not copied. If its contents are changed + * Note that this array is not copied. If its contents are changed * while this stream is being read, those changes will be reflected in the - * bytes supplied to the reader. Please use caution in changing the + * bytes supplied to the reader. Please use caution in changing the * contents of the buffer while this stream is open. * * @param buffer The byte array buffer this stream will read from. @@ -100,9 +100,9 @@ public class ByteArrayInputStream extends InputStream * The length value should be viewed as the array index * one greater than the last position in the buffer to read. *

        - * Note that this array is not copied. If its contents are changed + * Note that this array is not copied. If its contents are changed * while this stream is being read, those changes will be reflected in the - * bytes supplied to the reader. Please use caution in changing the + * bytes supplied to the reader. Please use caution in changing the * contents of the buffer while this stream is open. * * @param buffer The byte array buffer this stream will read from. @@ -129,7 +129,7 @@ public class ByteArrayInputStream extends InputStream * stream. The value returned will be equal to count - pos. * * @return The number of bytes that can be read from this stream - * before blocking, which is all of them + * before blocking, which is all of them */ public synchronized int available() { diff --git a/libjava/classpath/java/io/ByteArrayOutputStream.java b/libjava/classpath/java/io/ByteArrayOutputStream.java index 4196523d28e..9c1a86b7ffc 100644 --- a/libjava/classpath/java/io/ByteArrayOutputStream.java +++ b/libjava/classpath/java/io/ByteArrayOutputStream.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -63,12 +63,12 @@ package java.io; *

        * Note that this class also has methods that convert the byte array * buffer to a String using either the system default or an - * application specified character encoding. Thus it can handle + * application specified character encoding. Thus it can handle * multibyte character encodings. * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey (tromey@cygnus.com) - * @date September 24, 1998 + * @date September 24, 1998 */ public class ByteArrayOutputStream extends OutputStream { @@ -130,7 +130,7 @@ public class ByteArrayOutputStream extends OutputStream * This method returns a byte array containing the bytes that have been * written to this stream so far. This array is a copy of the valid * bytes in the internal buffer and its length is equal to the number of - * valid bytes, not necessarily to the the length of the current + * valid bytes, not necessarily to the the length of the current * internal buffer. Note that since this method allocates a new array, * it should be used with caution when the internal buffer is very large. */ @@ -158,7 +158,7 @@ public class ByteArrayOutputStream extends OutputStream /** * Returns the bytes in the internal array as a String. The * bytes in the buffer are converted to characters using the specified - * encoding. + * encoding. * * @param enc The name of the character encoding to use * @@ -184,7 +184,7 @@ public class ByteArrayOutputStream extends OutputStream * methods which use a true character encoding. * * @param hibyte The high eight bits to use for each character in - * the String + * the String * * @return A String containing the data written to this * stream so far @@ -201,12 +201,12 @@ public class ByteArrayOutputStream extends OutputStream { if (count + add > buf.length) { - int newlen = buf.length * 2; - if (count + add > newlen) - newlen = count + add; - byte[] newbuf = new byte[newlen]; - System.arraycopy(buf, 0, newbuf, 0, count); - buf = newbuf; + int newlen = buf.length * 2; + if (count + add > newlen) + newlen = count + add; + byte[] newbuf = new byte[newlen]; + System.arraycopy(buf, 0, newbuf, 0, count); + buf = newbuf; } } @@ -223,7 +223,7 @@ public class ByteArrayOutputStream extends OutputStream } /** - * This method writes len bytes from the passed in array + * This method writes len bytes from the passed in array * buf starting at index offset into the * internal buffer. * @@ -276,7 +276,7 @@ public class ByteArrayOutputStream extends OutputStream { int r = Integer.getInteger ("gnu.java.io.ByteArrayOutputStream.initialBufferSize", - DEFAULT_INITIAL_BUFFER_SIZE).intValue (); + DEFAULT_INITIAL_BUFFER_SIZE).intValue (); if (r <= 0) r = DEFAULT_INITIAL_BUFFER_SIZE; initial_buffer_size = r; diff --git a/libjava/classpath/java/io/CharArrayReader.java b/libjava/classpath/java/io/CharArrayReader.java index c14fa077592..8405f48f3c9 100644 --- a/libjava/classpath/java/io/CharArrayReader.java +++ b/libjava/classpath/java/io/CharArrayReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -35,7 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - + package java.io; /** @@ -78,9 +78,9 @@ public class CharArrayReader extends Reader * of the array. It is identical to calling an overloaded constructor * as CharArrayReader(buf, 0, buf.length). *

        - * Note that this array is not copied. If its contents are changed + * Note that this array is not copied. If its contents are changed * while this stream is being read, those changes will be reflected in the - * chars supplied to the reader. Please use caution in changing the + * chars supplied to the reader. Please use caution in changing the * contents of the buffer while this stream is open. * * @param buffer The char array buffer this stream will read from. @@ -100,9 +100,9 @@ public class CharArrayReader extends Reader * The length value should be viewed as the array index * one greater than the last position in the buffer to read. *

        - * Note that this array is not copied. If its contents are changed + * Note that this array is not copied. If its contents are changed * while this stream is being read, those changes will be reflected in the - * chars supplied to the reader. Please use caution in changing the + * chars supplied to the reader. Please use caution in changing the * contents of the buffer while this stream is open. * * @param buffer The char array buffer this stream will read from. @@ -114,13 +114,13 @@ public class CharArrayReader extends Reader super(); if (offset < 0 || length < 0 || offset > buffer.length) throw new IllegalArgumentException(); - + buf = buffer; count = offset + length; if (count > buf.length) count = buf.length; - + pos = offset; markedPos = pos; } @@ -132,7 +132,7 @@ public class CharArrayReader extends Reader { synchronized (lock) { - buf = null; + buf = null; } } @@ -155,10 +155,10 @@ public class CharArrayReader extends Reader { synchronized (lock) { - if (buf == null) - throw new IOException("Stream closed"); - // readAheadLimit is ignored per Java Class Lib. book, p. 318. - markedPos = pos; + if (buf == null) + throw new IOException("Stream closed"); + // readAheadLimit is ignored per Java Class Lib. book, p. 318. + markedPos = pos; } } @@ -189,15 +189,15 @@ public class CharArrayReader extends Reader { synchronized (lock) { - if (buf == null) - throw new IOException("Stream closed"); + if (buf == null) + throw new IOException("Stream closed"); - if (pos < 0) - throw new ArrayIndexOutOfBoundsException(pos); + if (pos < 0) + throw new ArrayIndexOutOfBoundsException(pos); - if (pos < count) - return ((int) buf[pos++]) & 0xFFFF; - return -1; + if (pos < count) + return ((int) buf[pos++]) & 0xFFFF; + return -1; } } @@ -223,25 +223,25 @@ public class CharArrayReader extends Reader { synchronized (lock) { - if (buf == null) - throw new IOException("Stream closed"); + if (buf == null) + throw new IOException("Stream closed"); - /* Don't need to check pos value, arraycopy will check it. */ - if (off < 0 || len < 0 || off + len > b.length) - throw new IndexOutOfBoundsException(); + /* Don't need to check pos value, arraycopy will check it. */ + if (off < 0 || len < 0 || off + len > b.length) + throw new IndexOutOfBoundsException(); - if (pos >= count) - return -1; + if (pos >= count) + return -1; - int numChars = Math.min(count - pos, len); - System.arraycopy(buf, pos, b, off, numChars); - pos += numChars; - return numChars; + int numChars = Math.min(count - pos, len); + System.arraycopy(buf, pos, b, off, numChars); + pos += numChars; + return numChars; } } /** - * Return true if more characters are available to be read. + * Return true if more characters are available to be read. * * @return true to indicate that this stream is ready * to be read. @@ -268,10 +268,10 @@ public class CharArrayReader extends Reader { synchronized (lock) { - if (buf == null) - throw new IOException("Stream closed"); + if (buf == null) + throw new IOException("Stream closed"); - pos = markedPos; + pos = markedPos; } } @@ -290,16 +290,16 @@ public class CharArrayReader extends Reader { synchronized (lock) { - if (buf == null) - throw new IOException("Stream closed"); + if (buf == null) + throw new IOException("Stream closed"); - // Even though the var numChars is a long, in reality it can never - // be larger than an int since the result of subtracting 2 positive - // ints will always fit in an int. Since we have to return a long - // anyway, numChars might as well just be a long. - long numChars = Math.min((long) (count - pos), n < 0 ? 0L : n); - pos += numChars; - return numChars; + // Even though the var numChars is a long, in reality it can never + // be larger than an int since the result of subtracting 2 positive + // ints will always fit in an int. Since we have to return a long + // anyway, numChars might as well just be a long. + long numChars = Math.min((long) (count - pos), n < 0 ? 0L : n); + pos += numChars; + return numChars; } } } diff --git a/libjava/classpath/java/io/CharArrayWriter.java b/libjava/classpath/java/io/CharArrayWriter.java index 8cbc8aeac43..dea727aa1db 100644 --- a/libjava/classpath/java/io/CharArrayWriter.java +++ b/libjava/classpath/java/io/CharArrayWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -116,7 +116,7 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - count = 0; + count = 0; } } @@ -141,17 +141,17 @@ public class CharArrayWriter extends Writer * This method returns a char array containing the chars that have been * written to this stream so far. This array is a copy of the valid * chars in the internal buffer and its length is equal to the number of - * valid chars, not necessarily to the the length of the current + * valid chars, not necessarily to the the length of the current * internal buffer. Note that since this method allocates a new array, * it should be used with caution when the internal buffer is very large. */ public char[] toCharArray () { synchronized (lock) - { - char[] nc = new char[count]; - System.arraycopy(buf, 0, nc, 0, count); - return nc; + { + char[] nc = new char[count]; + System.arraycopy(buf, 0, nc, 0, count); + return nc; } } @@ -168,7 +168,7 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - return new String (buf, 0, count); + return new String (buf, 0, count); } } @@ -182,13 +182,13 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - resize (1); - buf[count++] = (char) oneChar; + resize (1); + buf[count++] = (char) oneChar; } } /** - * This method writes len chars from the passed in array + * This method writes len chars from the passed in array * buf starting at index offset into that buffer * * @param buffer The char array to write data from @@ -199,10 +199,10 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - if (len >= 0) - resize (len); - System.arraycopy(buffer, offset, buf, count, len); - count += len; + if (len >= 0) + resize (len); + System.arraycopy(buffer, offset, buf, count, len); + count += len; } } @@ -219,10 +219,10 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - if (len >= 0) - resize (len); - str.getChars(offset, offset + len, buf, count); - count += len; + if (len >= 0) + resize (len); + str.getChars(offset, offset + len, buf, count); + count += len; } } @@ -238,17 +238,17 @@ public class CharArrayWriter extends Writer { synchronized (lock) { - out.write(buf, 0, count); + out.write(buf, 0, count); } } - /** + /** * Appends the Unicode character, c, to the output stream * underlying this writer. This is equivalent to write(c). * * @param c the character to append. * @return a reference to this object. - * @since 1.5 + * @since 1.5 */ public CharArrayWriter append(char c) { @@ -256,7 +256,7 @@ public class CharArrayWriter extends Writer return this; } - /** + /** * Appends the specified sequence of Unicode characters to the * output stream underlying this writer. This is equivalent to * appending the results of calling toString() on the @@ -271,22 +271,22 @@ public class CharArrayWriter extends Writer * then the string "null" (the string representation of null) * is appended. * @return a reference to this object. - * @since 1.5 + * @since 1.5 */ public CharArrayWriter append(CharSequence cs) { try { - write(cs == null ? "null" : cs.toString()); + write(cs == null ? "null" : cs.toString()); } catch (IOException _) { - // Can't happen. + // Can't happen. } return this; } - /** + /** * Appends the specified subsequence of Unicode characters to the * output stream underlying this writer, starting and ending at the * specified positions within the sequence. The behaviour of this @@ -311,11 +311,11 @@ public class CharArrayWriter extends Writer { try { - write(cs == null ? "null" : cs.subSequence(start, end).toString()); + write(cs == null ? "null" : cs.subSequence(start, end).toString()); } catch (IOException _) { - // Can't happen. + // Can't happen. } return this; } @@ -331,12 +331,12 @@ public class CharArrayWriter extends Writer { if (count + len >= buf.length) { - int newlen = buf.length * 2; - if (count + len > newlen) - newlen = count + len; - char[] newbuf = new char[newlen]; - System.arraycopy(buf, 0, newbuf, 0, count); - buf = newbuf; + int newlen = buf.length * 2; + if (count + len > newlen) + newlen = count + len; + char[] newbuf = new char[newlen]; + System.arraycopy(buf, 0, newbuf, 0, count); + buf = newbuf; } } diff --git a/libjava/classpath/java/io/DataInput.java b/libjava/classpath/java/io/DataInput.java index 45cb0c13025..a713319cf0e 100644 --- a/libjava/classpath/java/io/DataInput.java +++ b/libjava/classpath/java/io/DataInput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,12 +40,12 @@ package java.io; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 - * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. + * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ /** - * This interface is implemented by classes that can data from streams - * into Java primitive types. + * This interface is implemented by classes that can data from streams + * into Java primitive types. * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Warren Levy (warrenl@cygnus.com) @@ -65,7 +65,7 @@ public interface DataInput * * @return The boolean value read * - * @exception EOFException If end of file is reached before + * @exception EOFException If end of file is reached before * reading the boolean * @exception IOException If any other error occurs * @@ -78,7 +78,7 @@ public interface DataInput * is in the range of -128 to 127. *

        * This method can read a byte written by an object - * implementing the + * implementing the * writeByte() method in the DataOutput interface. *

        * @return The byte value read @@ -94,7 +94,7 @@ public interface DataInput * This method reads 8 unsigned bits into a Java int value from * the stream. The value returned is in the range of 0 to 255. *

        - * This method can read an unsigned byte written by an object + * This method can read an unsigned byte written by an object * implementing the * writeByte() method in the DataOutput * interface. @@ -109,11 +109,11 @@ public interface DataInput int readUnsignedByte() throws EOFException, IOException; /** - * This method reads a Java char value from an input stream. - * It operates by reading two bytes from the stream and converting them to + * This method reads a Java char value from an input stream. + * It operates by reading two bytes from the stream and converting them to * a single 16-bit Java char. The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 and byte2 represent the * first and second byte read from the stream respectively, they will be @@ -125,7 +125,7 @@ public interface DataInput * the * writeChar() method in the DataOutput interface. * - * @return The char value read + * @return The char value read * * @exception EOFException If end of file is reached before reading the char * @exception IOException If any other error occurs @@ -136,10 +136,10 @@ public interface DataInput /** * This method reads a signed 16-bit value into a Java in from the stream. - * It operates by reading two bytes from the stream and converting them to + * It operates by reading two bytes from the stream and converting them to * a single 16-bit Java short. The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 and byte2 represent the * first and second byte read from the stream respectively, they will be @@ -149,7 +149,7 @@ public interface DataInput *

        * The value returned is in the range of -32768 to 32767. *

        - * This method can read a short written by an object + * This method can read a short written by an object * implementing * the writeShort() method in the DataOutput * interface. @@ -165,10 +165,10 @@ public interface DataInput /** * This method reads 16 unsigned bits into a Java int value from the stream. - * It operates by reading two bytes from the stream and converting them to + * It operates by reading two bytes from the stream and converting them to * a single Java int. The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 and byte2 represent the * first and second byte read from the stream respectively, they will be @@ -179,13 +179,13 @@ public interface DataInput * The value returned is in the range of 0 to 65535. *

        * This method can read an unsigned short written by an object implementing - * the writeShort() method in the + * the writeShort() method in the * DataOutput * interface. * * @return The unsigned short value read as a Java int. * - * @exception EOFException If end of file is reached before reading + * @exception EOFException If end of file is reached before reading * the value * @exception IOException If any other error occurs * @@ -195,22 +195,22 @@ public interface DataInput /** * This method reads a Java int value from an input stream - * It operates by reading four bytes from the stream and converting them to + * It operates by reading four bytes from the stream and converting them to * a single Java int. The bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 through byte4 represent * the first four bytes read from the stream, they will be * transformed to an int in the following manner: *

        - * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + + * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + * ((byte3 & 0xFF)<< 8) + (byte4 & 0xFF))) *

        * The value returned is in the range of -2147483648 to 2147483647. *

        - * This method can read an int written by an object - * implementing the writeInt() method in the + * This method can read an int written by an object + * implementing the writeInt() method in the * DataOutput interface. * * @return The int value read @@ -224,26 +224,26 @@ public interface DataInput /** * This method reads a Java long value from an input stream - * It operates by reading eight bytes from the stream and converting them to + * It operates by reading eight bytes from the stream and converting them to * a single Java long. The bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 through byte8 represent * the first eight bytes read from the stream, they will be * transformed to an long in the following manner: *

        - * (long)(((byte1 & 0xFF) << 56) + ((byte2 & 0xFF) << 48) + - * ((byte3 & 0xFF) << 40) + ((byte4 & 0xFF) << 32) + - * ((byte5 & 0xFF) << 24) + ((byte6 & 0xFF) << 16) + + * (long)(((byte1 & 0xFF) << 56) + ((byte2 & 0xFF) << 48) + + * ((byte3 & 0xFF) << 40) + ((byte4 & 0xFF) << 32) + + * ((byte5 & 0xFF) << 24) + ((byte6 & 0xFF) << 16) + * ((byte7 & 0xFF) << 8) + (byte8 & 0xFF))) * *

        * The value returned is in the range of -9223372036854775808 to * 9223372036854775807. *

        - * This method can read an long written by an object - * implementing the writeLong() method in the + * This method can read an long written by an object + * implementing the writeLong() method in the * DataOutput interface. * * @return The long value read @@ -263,14 +263,14 @@ public interface DataInput * intBitsToFloat method in the class * java.lang.Float. *

        - * This method can read a float written by an object + * This method can read a float written by an object * implementing * the writeFloat() method in the DataOutput * interface. * * @return The float value read * - * @exception EOFException If end of file is reached before reading the + * @exception EOFException If end of file is reached before reading the * float * @exception IOException If any other error occurs * @@ -293,7 +293,7 @@ public interface DataInput * * @return The double value read * - * @exception EOFException If end of file is reached before reading the + * @exception EOFException If end of file is reached before reading the * double * @exception IOException If any other error occurs * @@ -304,16 +304,16 @@ public interface DataInput /** * This method reads the next line of text data from an input stream. - * It operates by reading bytes and converting those bytes to + * It operates by reading bytes and converting those bytes to * char * values by treating the byte read as the low eight bits of the * char and using 0 as the high eight bits. Because of this, * it does not support the full 16-bit Unicode character set. *

        * The reading of bytes ends when either the end of file or a line terminator - * is encountered. The bytes read are then returned as a + * is encountered. The bytes read are then returned as a * String. - * A line terminator is a byte sequence consisting of either + * A line terminator is a byte sequence consisting of either * \r, \n or \r\n. These termination * charaters are discarded and are not returned as part of the string. * A line is also terminated by an end of file condition. @@ -328,17 +328,17 @@ public interface DataInput /** * This method reads a String from an input stream that is * encoded in a modified UTF-8 format. This format has a leading two byte - * sequence that contains the remaining number of bytes to read. + * sequence that contains the remaining number of bytes to read. * This two byte * sequence is read using the readUnsignedShort() method of this * interface. * * After the number of remaining bytes have been determined, these bytes * are read an transformed into char values. These - * char values are encoded in the stream using either a one, + * char values are encoded in the stream using either a one, * two, or three byte format. * The particular format in use can be determined by examining the first - * byte read. + * byte read. *

        * If the first byte has a high order bit of 0, then * that character consists on only one byte. This character value consists @@ -348,10 +348,10 @@ public interface DataInput *

        * (char)byte1 *

        - * If the first byte has 110 as its high order bits, then the + * If the first byte has 110 as its high order bits, then the * character consists of two bytes. The bits that make up the character * value are in positions 0 through 4 of the first byte and bit positions - * 0 through 5 of the second byte. (The second byte should have + * 0 through 5 of the second byte. (The second byte should have * 10 as its high order bits). These values are in most significant * byte first (i.e., "big endian") order. *

        @@ -380,16 +380,16 @@ public interface DataInput * * Note that all characters are encoded in the method that requires the * fewest number of bytes with the exception of the character with the - * value of \<llll>u0000 which is encoded as two bytes. - * This is a modification of the UTF standard used to prevent C language + * value of \<llll>u0000 which is encoded as two bytes. + * This is a modification of the UTF standard used to prevent C language * style NUL values from appearing in the byte stream. *

        * This method can read data that was written by an object implementing the * writeUTF() method in DataOutput. - * + * * @return The String read * - * @exception EOFException If end of file is reached before reading the + * @exception EOFException If end of file is reached before reading the * String * @exception UTFDataFormatException If the data is not in UTF-8 format * @exception IOException If any other error occurs @@ -408,19 +408,19 @@ public interface DataInput * * @param buf The buffer into which to read the data * - * @exception EOFException If end of file is reached before filling the + * @exception EOFException If end of file is reached before filling the * buffer * @exception IOException If any other error occurs */ void readFully(byte[] buf) throws EOFException, IOException; /** - * This method reads raw bytes into the passed array buf + * This method reads raw bytes into the passed array buf * starting - * offset bytes into the buffer. The number of bytes read + * offset bytes into the buffer. The number of bytes read * will be - * exactly len. Note that this method blocks until the data is - * available and throws an exception if there is not enough data left in + * exactly len. Note that this method blocks until the data is + * available and throws an exception if there is not enough data left in * the stream to read len bytes. Note also that zero length * buffers are permitted. In this case, the method will return immediately * without reading any bytes from the stream. @@ -429,11 +429,11 @@ public interface DataInput * @param offset The offset into the buffer to start storing data * @param len The number of bytes to read into the buffer * - * @exception EOFException If end of file is reached before filling the + * @exception EOFException If end of file is reached before filling the * buffer * @exception IOException If any other error occurs */ - void readFully(byte[] buf, int offset, int len) + void readFully(byte[] buf, int offset, int len) throws EOFException, IOException; /** diff --git a/libjava/classpath/java/io/DataInputStream.java b/libjava/classpath/java/io/DataInputStream.java index 51cf51a8e2a..518205b24dc 100644 --- a/libjava/classpath/java/io/DataInputStream.java +++ b/libjava/classpath/java/io/DataInputStream.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -35,7 +35,7 @@ or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - + package java.io; import gnu.java.lang.CPStringBuilder; @@ -45,7 +45,7 @@ import gnu.java.lang.CPStringBuilder; * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ - + /** * This subclass of FilteredInputStream implements the * DataInput interface that provides method for reading primitive @@ -55,13 +55,13 @@ import gnu.java.lang.CPStringBuilder; * * @author Warren Levy (warrenl@cygnus.com) * @author Aaron M. Renn (arenn@urbanophile.com) - * @date October 20, 1998. + * @date October 20, 1998. */ public class DataInputStream extends FilterInputStream implements DataInput { // Byte buffer, used to make primitive read calls more efficient. byte[] buf = new byte [8]; - + /** * This constructor initializes a new DataInputStream * to read from the specified subordinate stream. @@ -80,8 +80,8 @@ public class DataInputStream extends FilterInputStream implements DataInput * read to fill the buffer. * * @param b The buffer into which bytes will be read. - * - * @return The actual number of bytes read, or -1 if end of stream reached + * + * @return The actual number of bytes read, or -1 if end of stream reached * before reading any bytes. * * @exception IOException If an error occurs. @@ -120,7 +120,7 @@ public class DataInputStream extends FilterInputStream implements DataInput *

        * This method can read a boolean written by an object * implementing the writeBoolean() method in the - * DataOutput interface. + * DataOutput interface. * * @return The boolean value read * @@ -156,24 +156,24 @@ public class DataInputStream extends FilterInputStream implements DataInput } /** - * This method reads a Java char value from an input stream. - * It operates by reading two bytes from the stream and converting them to + * This method reads a Java char value from an input stream. + * It operates by reading two bytes from the stream and converting them to * a single 16-bit Java char. The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 and byte2 * represent the first and second byte read from the stream * respectively, they will be transformed to a char in - * the following manner: + * the following manner: *

        * (char)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF) *

        * This method can read a char written by an object * implementing the writeChar() method in the - * DataOutput interface. + * DataOutput interface. * - * @return The char value read + * @return The char value read * * @exception EOFException If end of file is reached before reading the char * @exception IOException If any other error occurs @@ -192,7 +192,7 @@ public class DataInputStream extends FilterInputStream implements DataInput * readLong() method in this interface, then converts * that long to a double using the * longBitsToDouble method in the class - * java.lang.Double + * java.lang.Double *

        * This method can read a double written by an object * implementing the writeDouble() method in the @@ -229,7 +229,7 @@ public class DataInputStream extends FilterInputStream implements DataInput * @exception EOFException If end of file is reached before reading the float * @exception IOException If any other error occurs * - * @see DataOutput#writeFloat + * @see DataOutput#writeFloat * @see java.lang.Float#intBitsToFloat */ public final float readFloat () throws IOException @@ -279,15 +279,15 @@ public class DataInputStream extends FilterInputStream implements DataInput { if (len < 0) throw new IndexOutOfBoundsException("Negative length: " + len); - + while (len > 0) { - // in.read will block until some data is available. - int numread = in.read (buf, offset, len); - if (numread < 0) - throw new EOFException (); - len -= numread; - offset += numread; + // in.read will block until some data is available. + int numread = in.read (buf, offset, len); + if (numread < 0) + throw new EOFException (); + len -= numread; + offset += numread; } } @@ -357,11 +357,11 @@ public class DataInputStream extends FilterInputStream implements DataInput while (true) { int c = in.read(); - if (c == -1) // got an EOF - return strb.length() > 0 ? strb.toString() : null; - if (c == '\r') - { - int next_c = in.read(); + if (c == -1) // got an EOF + return strb.length() > 0 ? strb.toString() : null; + if (c == '\r') + { + int next_c = in.read(); if (next_c != '\n' && next_c != -1) { if (!(in instanceof PushbackInputStream)) @@ -369,10 +369,10 @@ public class DataInputStream extends FilterInputStream implements DataInput ((PushbackInputStream) in).unread(next_c); } break; - } + } if (c == '\n') break; - strb.append((char) c); + strb.append((char) c); } return strb.length() > 0 ? strb.toString() : ""; @@ -447,7 +447,7 @@ public class DataInputStream extends FilterInputStream implements DataInput readFully (buf, 0, 2); return convertToShort (buf); } - + /** * This method reads 8 unsigned bits into a Java int * value from the stream. The value returned is in the range of 0 to @@ -471,10 +471,10 @@ public class DataInputStream extends FilterInputStream implements DataInput /** * This method reads 16 unsigned bits into a Java int value from the stream. - * It operates by reading two bytes from the stream and converting them to + * It operates by reading two bytes from the stream and converting them to * a single Java int The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        * As an example, if byte1 and byte2 * represent the first and second byte read from the stream @@ -523,10 +523,10 @@ public class DataInputStream extends FilterInputStream implements DataInput *

        * (char)byte1 *

        - * If the first byte has 110 as its high order bits, then the + * If the first byte has 110 as its high order bits, then the * character consists of two bytes. The bits that make up the character * value are in positions 0 through 4 of the first byte and bit positions - * 0 through 5 of the second byte. (The second byte should have + * 0 through 5 of the second byte. (The second byte should have * 10 as its high order bits). These values are in most significant * byte first (i.e., "big endian") order. *

        @@ -551,7 +551,7 @@ public class DataInputStream extends FilterInputStream implements DataInput * character encoding, then they would be converted to a Java * char like so: *

        - * (char)(((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | + * (char)(((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | * (byte3 & 0x3F)) *

        * Note that all characters are encoded in the method that requires @@ -563,7 +563,7 @@ public class DataInputStream extends FilterInputStream implements DataInput *

        * This method can read data that was written by an object implementing the * writeUTF() method in DataOutput - * + * * @return The String read * * @exception EOFException If end of file is reached before reading @@ -579,7 +579,7 @@ public class DataInputStream extends FilterInputStream implements DataInput } /** - * This method reads a String encoded in UTF-8 format from the + * This method reads a String encoded in UTF-8 format from the * specified DataInput source. * * @param in The DataInput source to read from @@ -593,7 +593,7 @@ public class DataInputStream extends FilterInputStream implements DataInput public static final String readUTF(DataInput in) throws IOException { final int UTFlen = in.readUnsignedShort (); - + return readUTF(in, UTFlen); } @@ -601,7 +601,7 @@ public class DataInputStream extends FilterInputStream implements DataInput * This method is similar to readUTF, but the * UTF-8 byte length is in 64 bits. * This method is not public. It is used by ObjectInputStream. - * + * * @return The String read * * @exception EOFException If end of file is reached before reading @@ -648,25 +648,25 @@ public class DataInputStream extends FilterInputStream implements DataInput } /** - * This method attempts to skip and discard the specified number of bytes - * in the input stream. It may actually skip fewer bytes than requested. - * This method will not skip any bytes if passed a negative number of bytes - * to skip. + * This method attempts to skip and discard the specified number of bytes + * in the input stream. It may actually skip fewer bytes than requested. + * This method will not skip any bytes if passed a negative number of bytes + * to skip. * * @param n The requested number of bytes to skip. * * @return The requested number of bytes to skip. * * @exception IOException If an error occurs. - * @specnote The JDK docs claim that this returns the number of bytes - * actually skipped. The JCL claims that this method can throw an + * @specnote The JDK docs claim that this returns the number of bytes + * actually skipped. The JCL claims that this method can throw an * EOFException. Neither of these appear to be true in the JDK 1.3's * implementation. This tries to implement the actual JDK behaviour. */ public final int skipBytes (int n) throws IOException { if (n <= 0) - return 0; + return 0; try { return (int) in.skip (n); @@ -674,15 +674,15 @@ public class DataInputStream extends FilterInputStream implements DataInput catch (EOFException x) { // do nothing. - } + } return n; } - + static boolean convertToBoolean (int b) throws EOFException { if (b < 0) throw new EOFException (); - + return (b != 0); } @@ -690,7 +690,7 @@ public class DataInputStream extends FilterInputStream implements DataInput { if (i < 0) throw new EOFException (); - + return (byte) i; } @@ -698,86 +698,86 @@ public class DataInputStream extends FilterInputStream implements DataInput { if (i < 0) throw new EOFException (); - + return (i & 0xFF); } static char convertToChar (byte[] buf) { return (char) ((buf [0] << 8) - | (buf [1] & 0xff)); - } + | (buf [1] & 0xff)); + } static short convertToShort (byte[] buf) { return (short) ((buf [0] << 8) - | (buf [1] & 0xff)); - } + | (buf [1] & 0xff)); + } static int convertToUnsignedShort (byte[] buf) { return (((buf [0] & 0xff) << 8) - | (buf [1] & 0xff)); + | (buf [1] & 0xff)); } static int convertToInt (byte[] buf) { return (((buf [0] & 0xff) << 24) - | ((buf [1] & 0xff) << 16) - | ((buf [2] & 0xff) << 8) - | (buf [3] & 0xff)); + | ((buf [1] & 0xff) << 16) + | ((buf [2] & 0xff) << 8) + | (buf [3] & 0xff)); } static long convertToLong (byte[] buf) { return (((long)(buf [0] & 0xff) << 56) | - ((long)(buf [1] & 0xff) << 48) | - ((long)(buf [2] & 0xff) << 40) | - ((long)(buf [3] & 0xff) << 32) | - ((long)(buf [4] & 0xff) << 24) | - ((long)(buf [5] & 0xff) << 16) | - ((long)(buf [6] & 0xff) << 8) | - ((long)(buf [7] & 0xff))); + ((long)(buf [1] & 0xff) << 48) | + ((long)(buf [2] & 0xff) << 40) | + ((long)(buf [3] & 0xff) << 32) | + ((long)(buf [4] & 0xff) << 24) | + ((long)(buf [5] & 0xff) << 16) | + ((long)(buf [6] & 0xff) << 8) | + ((long)(buf [7] & 0xff))); } // FIXME: This method should be re-thought. I suspect we have multiple // UTF-8 decoders floating around. We should use the standard charset // converters, maybe and adding a direct call into one of the new // NIO converters for a super-fast UTF8 decode. - static String convertFromUTF (byte[] buf) + static String convertFromUTF (byte[] buf) throws EOFException, UTFDataFormatException { - // Give StringBuffer an initial estimated size to avoid + // Give StringBuffer an initial estimated size to avoid // enlarge buffer frequently CPStringBuilder strbuf = new CPStringBuilder (buf.length / 2 + 2); for (int i = 0; i < buf.length; ) { - if ((buf [i] & 0x80) == 0) // bit pattern 0xxxxxxx - strbuf.append ((char) (buf [i++] & 0xFF)); - else if ((buf [i] & 0xE0) == 0xC0) // bit pattern 110xxxxx - { - if (i + 1 >= buf.length - || (buf [i + 1] & 0xC0) != 0x80) - throw new UTFDataFormatException (); + if ((buf [i] & 0x80) == 0) // bit pattern 0xxxxxxx + strbuf.append ((char) (buf [i++] & 0xFF)); + else if ((buf [i] & 0xE0) == 0xC0) // bit pattern 110xxxxx + { + if (i + 1 >= buf.length + || (buf [i + 1] & 0xC0) != 0x80) + throw new UTFDataFormatException (); - strbuf.append((char) (((buf [i++] & 0x1F) << 6) - | (buf [i++] & 0x3F))); - } - else if ((buf [i] & 0xF0) == 0xE0) // bit pattern 1110xxxx - { - if (i + 2 >= buf.length - || (buf [i + 1] & 0xC0) != 0x80 - || (buf [i + 2] & 0xC0) != 0x80) - throw new UTFDataFormatException (); + strbuf.append((char) (((buf [i++] & 0x1F) << 6) + | (buf [i++] & 0x3F))); + } + else if ((buf [i] & 0xF0) == 0xE0) // bit pattern 1110xxxx + { + if (i + 2 >= buf.length + || (buf [i + 1] & 0xC0) != 0x80 + || (buf [i + 2] & 0xC0) != 0x80) + throw new UTFDataFormatException (); - strbuf.append ((char) (((buf [i++] & 0x0F) << 12) - | ((buf [i++] & 0x3F) << 6) - | (buf [i++] & 0x3F))); - } - else // must be ((buf [i] & 0xF0) == 0xF0 || (buf [i] & 0xC0) == 0x80) - throw new UTFDataFormatException (); // bit patterns 1111xxxx or - // 10xxxxxx + strbuf.append ((char) (((buf [i++] & 0x0F) << 12) + | ((buf [i++] & 0x3F) << 6) + | (buf [i++] & 0x3F))); + } + else // must be ((buf [i] & 0xF0) == 0xF0 || (buf [i] & 0xC0) == 0x80) + throw new UTFDataFormatException (); // bit patterns 1111xxxx or + // 10xxxxxx } return strbuf.toString (); diff --git a/libjava/classpath/java/io/DataOutput.java b/libjava/classpath/java/io/DataOutput.java index 0d436233218..6eee4b702ca 100644 --- a/libjava/classpath/java/io/DataOutput.java +++ b/libjava/classpath/java/io/DataOutput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,9 +44,9 @@ package java.io; */ /** - * This interface is implemented by classes that can wrte data to streams + * This interface is implemented by classes that can wrte data to streams * from Java primitive types. This data can subsequently be read back - * by classes implementing the DataInput interface. + * by classes implementing the DataInput interface. * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey (tromey@cygnus.com) @@ -58,7 +58,7 @@ public interface DataOutput /** * This method writes a Java boolean value to an output stream. If * value is true, a byte with the value of - * 1 will be written, otherwise a byte with the value of 0 will be + * 1 will be written, otherwise a byte with the value of 0 will be * written. * * The value written can be read using the readBoolean @@ -74,7 +74,7 @@ public interface DataOutput /** * This method writes a Java byte value to an output stream. The - * byte to be written will be in the lowest 8 bits of the + * byte to be written will be in the lowest 8 bits of the * int value passed. * * The value written can be read using the readByte or @@ -236,10 +236,10 @@ public interface DataOutput void writeBytes(String value) throws IOException; /** - * This method writes all the characters of a String to an + * This method writes all the characters of a String to an * output stream as an array of char's. Each character * is written using the method specified in the writeChar - * method. + * method. * * @param value The String to write * @@ -253,13 +253,13 @@ public interface DataOutput * This method writes a Java String to the stream in a modified * UTF-8 format. First, two bytes are written to the stream indicating the * number of bytes to follow. This is written in the form of a Java - * short value in the same manner used by the - * writeShort method. Note that this is the number of + * short value in the same manner used by the + * writeShort method. Note that this is the number of * bytes in the * encoded String not the String length. Next * come the encoded characters. Each character in the String * is encoded as either one, two or three bytes. For characters in the - * range of \u0001 to \u007F, one byte is used. + * range of \u0001 to \u007F, one byte is used. * The character * value goes into bits 0-7 and bit eight is 0. For characters in the range * of \u0080 to \u007FF, two bytes are used. Bits @@ -308,14 +308,14 @@ public interface DataOutput void write(byte[] buf) throws IOException; /** - * This method writes raw bytes from the passed array buf + * This method writes raw bytes from the passed array buf * starting - * offset bytes into the buffer. The number of bytes - * written will be exactly len. + * offset bytes into the buffer. The number of bytes + * written will be exactly len. * * @param buf The buffer from which to write the data * @param offset The offset into the buffer to start writing data from - * @param len The number of bytes to write from the buffer to the output + * @param len The number of bytes to write from the buffer to the output * stream * * @exception IOException If any other error occurs @@ -323,4 +323,3 @@ public interface DataOutput void write(byte[] buf, int offset, int len) throws IOException; } // interface DataOutput - diff --git a/libjava/classpath/java/io/DataOutputStream.java b/libjava/classpath/java/io/DataOutputStream.java index 435ff76d13e..4837795c649 100644 --- a/libjava/classpath/java/io/DataOutputStream.java +++ b/libjava/classpath/java/io/DataOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -66,12 +66,12 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput * Utf8 byte buffer, used by writeUTF() */ private byte[] buf; - + /** * This method initializes an instance of DataOutputStream to * write its data to the specified underlying OutputStream * - * @param out The subordinate OutputStream to which this + * @param out The subordinate OutputStream to which this * object will write */ public DataOutputStream (OutputStream out) @@ -127,7 +127,7 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput * * @exception IOException If an error occurs. */ - public synchronized void write (byte[] buf, int offset, int len) + public synchronized void write (byte[] buf, int offset, int len) throws IOException { out.write(buf, offset, len); @@ -162,7 +162,7 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput * The value written can be read using the readByte or * readUnsignedByte methods in DataInput. * - * @param value The byte to write to the stream, passed as + * @param value The byte to write to the stream, passed as * the low eight bits of an int. * * @exception IOException If an error occurs @@ -215,7 +215,7 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput * The value written can be read using the readChar * method in DataInput. * - * @param value The char value to write, + * @param value The char value to write, * passed as an int. * * @exception IOException If an error occurs @@ -394,18 +394,18 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput for (int i = start; i < len; ++i) { - char c = value.charAt(i); - if (c >= '\u0001' && c <= '\u007f') - sum += 1; - else if (c == '\u0000' || (c >= '\u0080' && c <= '\u07ff')) - sum += 2; - else - sum += 3; + char c = value.charAt(i); + if (c >= '\u0001' && c <= '\u007f') + sum += 1; + else if (c == '\u0000' || (c >= '\u0080' && c <= '\u07ff')) + sum += 2; + else + sum += 3; } return sum; } - + /** * This method writes a Java String to the stream in a modified * UTF-8 format. First, two bytes are written to the stream indicating the @@ -507,34 +507,33 @@ public class DataOutputStream extends FilterOutputStream implements DataOutput if (buf == null) buf = new byte[512]; - + do { - while (i < len && pos < buf.length - 3) - { - char c = value.charAt(i++); - if (c >= '\u0001' && c <= '\u007f') + while (i < len && pos < buf.length - 3) + { + char c = value.charAt(i++); + if (c >= '\u0001' && c <= '\u007f') buf[pos++] = (byte) c; - else if (c == '\u0000' || (c >= '\u0080' && c <= '\u07ff')) - { - buf[pos++] = (byte) (0xc0 | (0x1f & (c >> 6))); - buf[pos++] = (byte) (0x80 | (0x3f & c)); - } - else - { - // JSL says the first byte should be or'd with 0xc0, but - // that is a typo. Unicode says 0xe0, and that is what is - // consistent with DataInputStream. - buf[pos++] = (byte) (0xe0 | (0x0f & (c >> 12))); - buf[pos++] = (byte) (0x80 | (0x3f & (c >> 6))); - buf[pos++] = (byte) (0x80 | (0x3f & c)); - } - } - write(buf, 0, pos); - pos = 0; + else if (c == '\u0000' || (c >= '\u0080' && c <= '\u07ff')) + { + buf[pos++] = (byte) (0xc0 | (0x1f & (c >> 6))); + buf[pos++] = (byte) (0x80 | (0x3f & c)); + } + else + { + // JSL says the first byte should be or'd with 0xc0, but + // that is a typo. Unicode says 0xe0, and that is what is + // consistent with DataInputStream. + buf[pos++] = (byte) (0xe0 | (0x0f & (c >> 12))); + buf[pos++] = (byte) (0x80 | (0x3f & (c >> 6))); + buf[pos++] = (byte) (0x80 | (0x3f & c)); + } + } + write(buf, 0, pos); + pos = 0; } while (i < len); } } // class DataOutputStream - diff --git a/libjava/classpath/java/io/DeleteFileHelper.java b/libjava/classpath/java/io/DeleteFileHelper.java index 6e33adce801..a2b96bb415c 100644 --- a/libjava/classpath/java/io/DeleteFileHelper.java +++ b/libjava/classpath/java/io/DeleteFileHelper.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,7 +56,7 @@ final class DeleteFileHelper extends Thread if (filesToDelete == null) { filesToDelete = new ArrayList(); - + AccessController.doPrivileged(new PrivilegedAction() { public Object run() @@ -70,12 +70,12 @@ final class DeleteFileHelper extends Thread // Shutdown is already in progress, so we can't // register ours. } - + return null; } }); } - + filesToDelete.add(file); } @@ -83,14 +83,14 @@ final class DeleteFileHelper extends Thread { for (File file : filesToDelete) { - try - { - file.delete(); - } - catch (Exception e) - { - // Do nothing here. - } + try + { + file.delete(); + } + catch (Exception e) + { + // Do nothing here. + } } } @@ -98,7 +98,7 @@ final class DeleteFileHelper extends Thread DeleteFileHelper() { } - + public void run() { deleteFiles(); diff --git a/libjava/classpath/java/io/EOFException.java b/libjava/classpath/java/io/EOFException.java index cfedb7d9eb0..0d90a3f0f96 100644 --- a/libjava/classpath/java/io/EOFException.java +++ b/libjava/classpath/java/io/EOFException.java @@ -39,7 +39,7 @@ exception statement from your version. */ package java.io; /** - * This exception is thrown when the end of the file or stream was + * This exception is thrown when the end of the file or stream was * encountered unexpectedly. This is not the normal way that an EOF * condition is reported; such as a special value like -1 being returned. * However, certain types of streams expecting certain data in a certain diff --git a/libjava/classpath/java/io/Externalizable.java b/libjava/classpath/java/io/Externalizable.java index 113c19ff60f..7399dab3bd5 100644 --- a/libjava/classpath/java/io/Externalizable.java +++ b/libjava/classpath/java/io/Externalizable.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,20 +40,20 @@ package java.io; /** * This interface provides a way that classes can completely control how - * the data of their object instances are written and read to and from - * streams. It has two methods which are used to write the data to a stream - * and to read the data from a stream. The read method must read the data - * in exactly the way it was written by the write method. + * the data of their object instances are written and read to and from + * streams. It has two methods which are used to write the data to a stream + * and to read the data from a stream. The read method must read the data + * in exactly the way it was written by the write method. *

        * Note that classes which implement this interface must take into account - * that all superclass data must also be written to the stream as well. + * that all superclass data must also be written to the stream as well. * The class implementing this interface must figure out how to make that * happen. *

        - * This interface can be used to provide object persistence. When an + * This interface can be used to provide object persistence. When an * object is to be stored externally, the writeExternal method is * called to save state. When the object is restored, an instance is - * created using the default no-argument constructor and the + * created using the default no-argument constructor and the * readExternal method is used to restore the state. * * @author Aaron M. Renn (arenn@urbanophile.com) @@ -63,9 +63,9 @@ public interface Externalizable extends Serializable /** * This method restores an object's state by reading in the instance data * for the object from the passed in stream. Note that this stream is not - * a subclass of InputStream, but rather is a class that + * a subclass of InputStream, but rather is a class that * implements - * the ObjectInput interface. That interface provides a + * the ObjectInput interface. That interface provides a * mechanism for * reading in Java data types from a stream. *

        @@ -77,28 +77,28 @@ public interface Externalizable extends Serializable * for that object must be found and loaded. If that operation fails, * then this method throws a ClassNotFoundException * - * @param in An ObjectInput instance for reading in the object + * @param in An ObjectInput instance for reading in the object * state * - * @exception ClassNotFoundException If the class of an object being + * @exception ClassNotFoundException If the class of an object being * restored cannot be found * @exception IOException If any other error occurs */ - void readExternal(ObjectInput in) + void readExternal(ObjectInput in) throws ClassNotFoundException, IOException; /** * This method is responsible for writing the instance data of an object * to the passed in stream. Note that this stream is not a subclass of * OutputStream, but rather is a class that implements the - * ObjectOutput interface. That interface provides a + * ObjectOutput interface. That interface provides a * number of methods * for writing Java data values to a stream. *

        * Not that the implementation of this method must be coordinated with * the implementation of readExternal. * - * @param out An ObjectOutput instance for writing the + * @param out An ObjectOutput instance for writing the * object state * * @exception IOException If an error occurs diff --git a/libjava/classpath/java/io/File.java b/libjava/classpath/java/io/File.java index f023310449f..4f670e147fe 100644 --- a/libjava/classpath/java/io/File.java +++ b/libjava/classpath/java/io/File.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -76,12 +76,12 @@ public class File implements Serializable, Comparable /** * This is the first character of the file separator string. On many - * hosts (for example, on the GNU system), this represents the entire + * hosts (for example, on the GNU system), this represents the entire * separator string. The complete separator string is obtained from the * file.separatorsystem property. */ public static final char separatorChar = separator.charAt(0); - + /** * This is the string that is used to separate the host name from the * path name in paths that include the host name. It is the value of @@ -89,7 +89,7 @@ public class File implements Serializable, Comparable */ public static final String pathSeparator = SystemProperties.getProperty("path.separator"); - + /** * This is the first character of the string used to separate the host name * from the path name in paths that include a host. The separator string @@ -102,17 +102,17 @@ public class File implements Serializable, Comparable * may be an absolute or relative path name. */ private String path; - - + + /** * The time (millisecond), when the last temporary file was created. */ private static long last_tmp; - + /** * The number of files, created during the current millisecond. */ - private static int n_created; + private static int n_created; /** * This method tests whether or not the current thread is allowed to @@ -121,10 +121,10 @@ public class File implements Serializable, Comparable * (if any) allows access to the file via it's checkRead * method 3) the file is readable. * - * @return true if reading is allowed, + * @return true if reading is allowed, * false otherwise * - * @exception SecurityException If the SecurityManager + * @exception SecurityException If the SecurityManager * does not allow access to the file */ public boolean canRead() @@ -144,17 +144,17 @@ public class File implements Serializable, Comparable * whether or not a non-existent file can be created, check the parent * directory for write access. * - * @return true if writing is allowed, false + * @return true if writing is allowed, false * otherwise * - * @exception SecurityException If the SecurityManager + * @exception SecurityException If the SecurityManager * does not allow access to the file */ public boolean canWrite() { // First do a SecurityCheck before doing anything else. checkWrite(); - + // Test for existence. This is required by the spec if (! VMFile.exists(path)) return false; @@ -172,10 +172,10 @@ public class File implements Serializable, Comparable * (if any) allows access to the file via it's checkExec * method 3) the file is executable. * - * @return true if execution is allowed, + * @return true if execution is allowed, * false otherwise * - * @exception SecurityException If the SecurityManager + * @exception SecurityException If the SecurityManager * does not allow access to the file */ public boolean canExecute() @@ -184,7 +184,7 @@ public class File implements Serializable, Comparable return false; checkExec(); - + return VMFile.canExecute(path); } @@ -214,7 +214,7 @@ public class File implements Serializable, Comparable * This method deletes the file represented by this object. If this file * is a directory, it must be empty in order for the delete to succeed. * - * @return true if the file was deleted, false + * @return true if the file was deleted, false * otherwise * * @exception SecurityException If deleting of the file is not allowed @@ -222,33 +222,33 @@ public class File implements Serializable, Comparable public synchronized boolean delete() { SecurityManager s = System.getSecurityManager(); - + if (s != null) s.checkDelete(path); - + return VMFile.delete(path); } /** - * This method tests two File objects for equality by + * This method tests two File objects for equality by * comparing the path of the specified File against the path * of this object. The two objects are equal if an only if 1) The * argument is not null 2) The argument is a File object and * 3) The path of the Fileargument is equal to the path * of this object. *

        - * The paths of the files are determined by calling the + * The paths of the files are determined by calling the * getPath() * method on each object. * - * @return true if the two objects are equal, + * @return true if the two objects are equal, * false otherwise. */ public boolean equals(Object obj) { if (! (obj instanceof File)) return false; - + File other = (File) obj; if (VMFile.IS_CASE_SENSITIVE) @@ -281,7 +281,7 @@ public class File implements Serializable, Comparable { path = normalizePath (name); } - + // Remove duplicate and redundant separator characters. private String normalizePath(String p) { @@ -290,12 +290,12 @@ public class File implements Serializable, Comparable if (separatorChar == '\\') { p = p.replace ('/', '\\'); - // We have to special case the "\c:" prefix. - if (p.length() > 2 && p.charAt(0) == '\\' && - ((p.charAt(1) >= 'a' && p.charAt(1) <= 'z') || - (p.charAt(1) >= 'A' && p.charAt(1) <= 'Z')) && - p.charAt(2) == ':') - p = p.substring(1); + // We have to special case the "\c:" prefix. + if (p.length() > 2 && p.charAt(0) == '\\' && + ((p.charAt(1) >= 'a' && p.charAt(1) <= 'z') || + (p.charAt(1) >= 'A' && p.charAt(1) <= 'Z')) && + p.charAt(2) == ':') + p = p.substring(1); } int dupIndex = p.indexOf(dupSeparator); @@ -310,25 +310,25 @@ public class File implements Serializable, Comparable // Ignore trailing separator (though on Windows "a:\", for // example, is a valid and minimal path). if (plen > 1 && p.charAt (plen - 1) == separatorChar) - { - if (! (separatorChar == '\\' && ((plen == 3 && p.charAt(1) == ':') + { + if (! (separatorChar == '\\' && ((plen == 3 && p.charAt(1) == ':') || (plen == 2 && p.charAt(0) == separatorChar)))) - return p.substring (0, plen - 1); - } - else - return p; + return p.substring (0, plen - 1); + } + else + return p; } - + CPStringBuilder newpath = new CPStringBuilder(plen); int last = 0; while (dupIndex != -1) { newpath.append(p.substring(last, dupIndex)); - // Ignore the duplicate path characters. - while (p.charAt(dupIndex) == separatorChar) - { - dupIndex++; - if (dupIndex == plen) + // Ignore the duplicate path characters. + while (p.charAt(dupIndex) == separatorChar) + { + dupIndex++; + if (dupIndex == plen) { if ((separatorChar == '\\' && newpath.length() == 2 @@ -337,14 +337,14 @@ public class File implements Serializable, Comparable { newpath.append(separatorChar); } - return newpath.toString(); + return newpath.toString(); } - } - newpath.append(separatorChar); - last = dupIndex; - dupIndex = p.indexOf(dupSeparator, last); + } + newpath.append(separatorChar); + last = dupIndex; + dupIndex = p.indexOf(dupSeparator, last); } - + // Again, ignore possible trailing separator (except special cases // like "a:\" on Windows). int end; @@ -360,10 +360,10 @@ public class File implements Serializable, Comparable else end = plen; newpath.append(p.substring(last, end)); - + return newpath.toString(); } - + /** * This method initializes a new File object to represent * a file in the specified named directory. The path name to the file @@ -380,35 +380,35 @@ public class File implements Serializable, Comparable throw new NullPointerException(); if (dirPath != null) { - if (dirPath.length() > 0) - { - // Try to be smart about the number of separator characters. - if (dirPath.charAt(dirPath.length() - 1) == separatorChar - || name.length() == 0) - path = normalizePath(dirPath + name); - else - path = normalizePath(dirPath + separatorChar + name); - } - else - { - // If dirPath is empty, use a system dependant - // default prefix. - // Note that the leading separators in name have - // to be chopped off, to prevent them forming - // a UNC prefix on Windows. - if (separatorChar == '\\' /* TODO use ON_WINDOWS */) - { - int skip = 0; - while(name.length() > skip - && (name.charAt(skip) == separatorChar - || name.charAt(skip) == '/')) - { - skip++; - } - name = name.substring(skip); - } - path = normalizePath(separatorChar + name); - } + if (dirPath.length() > 0) + { + // Try to be smart about the number of separator characters. + if (dirPath.charAt(dirPath.length() - 1) == separatorChar + || name.length() == 0) + path = normalizePath(dirPath + name); + else + path = normalizePath(dirPath + separatorChar + name); + } + else + { + // If dirPath is empty, use a system dependant + // default prefix. + // Note that the leading separators in name have + // to be chopped off, to prevent them forming + // a UNC prefix on Windows. + if (separatorChar == '\\' /* TODO use ON_WINDOWS */) + { + int skip = 0; + while(name.length() > skip + && (name.charAt(skip) == separatorChar + || name.charAt(skip) == '/')) + { + skip++; + } + name = name.substring(skip); + } + path = normalizePath(separatorChar + name); + } } else path = normalizePath(name); @@ -439,10 +439,10 @@ public class File implements Serializable, Comparable public File(URI uri) { if (uri == null) - throw new NullPointerException("uri is null"); + throw new NullPointerException("uri is null"); if (!uri.getScheme().equals("file")) - throw new IllegalArgumentException("invalid uri protocol"); + throw new IllegalArgumentException("invalid uri protocol"); String name = uri.getPath(); if (name == null) @@ -489,7 +489,7 @@ public class File implements Serializable, Comparable * "." and "..", and symbolic links. *

        * Note that this method, unlike the other methods which return path - * names, can throw an IOException. This is because native method + * names, can throw an IOException. This is because native method * might be required in order to resolve the canonical path * * @exception IOException If an error occurs @@ -499,11 +499,11 @@ public class File implements Serializable, Comparable // On Windows, getAbsolutePath might end up calling us, so we // have to special case that call to avoid infinite recursion. if (separatorChar == '\\' && path.length() == 2 && - ((path.charAt(0) >= 'a' && path.charAt(0) <= 'z') || - (path.charAt(0) >= 'A' && path.charAt(0) <= 'Z')) && - path.charAt(1) == ':') + ((path.charAt(0) >= 'a' && path.charAt(0) <= 'z') || + (path.charAt(0) >= 'A' && path.charAt(0) <= 'Z')) && + path.charAt(1) == ':') { - return VMFile.toCanonicalForm(path); + return VMFile.toCanonicalForm(path); } // Call getAbsolutePath first to make sure that we do the // current directory handling, because the native code @@ -536,7 +536,7 @@ public class File implements Serializable, Comparable */ public String getName() { - return VMFile.getName(path); + return VMFile.getName(path); } /** @@ -551,11 +551,11 @@ public class File implements Serializable, Comparable { String prefix = null; int nameSeqIndex = 0; - + if (path.equals("")) return null; - // The "prefix", if present, is the leading "/" on UNIX and + // The "prefix", if present, is the leading "/" on UNIX and // either the drive specifier (e.g. "C:") or the leading "\\" // of a UNC network path on Windows. if (separatorChar == '/' && path.charAt (0) == '/') @@ -575,7 +575,7 @@ public class File implements Serializable, Comparable } } - // According to the JDK docs, the returned parent path is the + // According to the JDK docs, the returned parent path is the // portion of the name sequence before the last separator // character, if found, prefixed by the prefix, otherwise null. if (nameSeqIndex < path.length()) @@ -586,7 +586,7 @@ public class File implements Serializable, Comparable return prefix; else if (last == (nameSeq.length() - 1)) // Note: The path would not have a trailing separator - // except for cases like "C:\" on Windows (see + // except for cases like "C:\" on Windows (see // normalizePath( )), where Sun's JRE 1.4 returns null. return null; else if (last == 0) @@ -598,8 +598,8 @@ public class File implements Serializable, Comparable return nameSeq.substring (0, last); } else - // Sun's JRE 1.4 returns null if the prefix is the only - // component of the path - so "/" gives null on UNIX and + // Sun's JRE 1.4 returns null if the prefix is the only + // component of the path - so "/" gives null on UNIX and // "C:", "\\", etc. return null on Windows. return null; } @@ -608,7 +608,7 @@ public class File implements Serializable, Comparable * This method returns a File object representing the parent * file of this one. * - * @return a File for the parent of this object. + * @return a File for the parent of this object. * null * will be returned if this object does not have a parent. * @@ -652,7 +652,7 @@ public class File implements Serializable, Comparable * by system. As an example, on GNU systems, a path is absolute if it starts * with a "/". * - * @return true if this object represents an absolute + * @return true if this object represents an absolute * file name, false otherwise. */ public boolean isAbsolute() @@ -664,7 +664,7 @@ public class File implements Serializable, Comparable * This method tests whether or not the file represented by this object * is a directory. In order for this method to return true, * the file represented by this object must exist and be a directory. - * + * * @return true if this file is a directory, false * otherwise * @@ -673,7 +673,7 @@ public class File implements Serializable, Comparable public boolean isDirectory() { checkRead(); - return VMFile.isDirectory(path); + return VMFile.isDirectory(path); } /** @@ -681,7 +681,7 @@ public class File implements Serializable, Comparable * is a "plain" file. A file is a plain file if and only if it 1) Exists, * 2) Is not a directory or other type of special file. * - * @return true if this is a plain file, false + * @return true if this is a plain file, false * otherwise * * @exception SecurityException If reading of the file is not permitted @@ -713,7 +713,7 @@ public class File implements Serializable, Comparable * time value returned is an abstract value that should not be interpreted * as a specified time value. It is only useful for comparing to other * such time values returned on the same system. In that case, the larger - * value indicates a more recent modification time. + * value indicates a more recent modification time. *

        * If the file does not exist, then a value of 0 is returned. * @@ -759,13 +759,13 @@ public class File implements Serializable, Comparable * directory. If read access to the directory is denied, an exception * will be thrown. * - * @param filter An object which will identify files to exclude from + * @param filter An object which will identify files to exclude from * the directory listing. * - * @return An array of files in the directory, or null + * @return An array of files in the directory, or null * if this object does not represent a valid directory. - * - * @exception SecurityException If read access is not allowed to the + * + * @exception SecurityException If read access is not allowed to the * directory by the SecurityManager */ public String[] list(FilenameFilter filter) @@ -774,10 +774,10 @@ public class File implements Serializable, Comparable if (!exists() || !isDirectory()) return null; - + // Get the list of files String files[] = VMFile.list(path); - + // Check if an error occured in listInternal(). // This is an unreadable directory, pretend there is nothing inside. if (files == null) @@ -785,15 +785,15 @@ public class File implements Serializable, Comparable if (filter == null) return files; - + // Apply the filter int count = 0; for (int i = 0; i < files.length; i++) { if (filter.accept(this, files[i])) - ++count; + ++count; else - files[i] = null; + files[i] = null; } String[] retfiles = new String[count]; @@ -817,10 +817,10 @@ public class File implements Serializable, Comparable * directory. If read access to the directory is denied, an exception * will be thrown. * - * @return An array of files in the directory, or null if + * @return An array of files in the directory, or null if * this object does not represent a valid directory. - * - * @exception SecurityException If read access is not allowed to the + * + * @exception SecurityException If read access is not allowed to the * directory by the SecurityManager */ public String[] list() @@ -850,14 +850,14 @@ public class File implements Serializable, Comparable { return listFiles((FilenameFilter) null); } - + /** * This method returns an array of File objects representing * all the files in the directory represented by this object. If this * object does not represent a directory, null is returned. * Each of the returned File object is constructed with this * object as its parent. - *

        + *

        * In this form of the listFiles() method, a filter is specified * that allows the caller to control which files are returned in the * list. The FilenameFilter specified is called for each @@ -878,7 +878,7 @@ public class File implements Serializable, Comparable public File[] listFiles(FilenameFilter filter) { String[] filelist = list(filter); - + if (filelist == null) return null; @@ -896,7 +896,7 @@ public class File implements Serializable, Comparable * object does not represent a directory, null is returned. * Each of the returned File object is constructed with this * object as its parent. - *

        + *

        * In this form of the listFiles() method, a filter is specified * that allows the caller to control which files are returned in the * list. The FileFilter specified is called for each @@ -958,13 +958,13 @@ public class File implements Serializable, Comparable public URI toURI() { String abspath = getAbsolutePath(); - + if (isDirectory() || path.equals("")) abspath = abspath + separatorChar; if (separatorChar == '\\') abspath = separatorChar + abspath; - + try { return new URI("file", null, null, -1, @@ -975,7 +975,7 @@ public class File implements Serializable, Comparable { // Can't happen. throw (InternalError) new InternalError("Unconvertible file: " - + this).initCause(use); + + this).initCause(use); } } @@ -986,7 +986,7 @@ public class File implements Serializable, Comparable * * @return A URL for this object. * - * @exception MalformedURLException If the URL cannot be created + * @exception MalformedURLException If the URL cannot be created * successfully. */ public URL toURL() throws MalformedURLException @@ -998,7 +998,7 @@ public class File implements Serializable, Comparable /** * This method creates a directory for the path represented by this object. * - * @return true if the directory was created, + * @return true if the directory was created, * false otherwise * * @exception SecurityException If write access is not allowed to this file @@ -1013,7 +1013,7 @@ public class File implements Serializable, Comparable * This method creates a directory for the path represented by this file. * It will also create any intervening parent directories if necessary. * - * @return true if the directory was created, + * @return true if the directory was created, * false otherwise * * @exception SecurityException If write access is not allowed to this file @@ -1025,7 +1025,7 @@ public class File implements Serializable, Comparable { return mkdir(); } - + File f = new File(parent); if (!f.exists()) { @@ -1038,12 +1038,12 @@ public class File implements Serializable, Comparable } /** - * This method creates a temporary file in the specified directory. If - * the directory name is null, then this method uses the system temporary - * directory. The files created are guaranteed not to currently exist and - * the same file name will never be used twice in the same virtual - * machine instance. - * The system temporary directory is determined by examinging the + * This method creates a temporary file in the specified directory. If + * the directory name is null, then this method uses the system temporary + * directory. The files created are guaranteed not to currently exist and + * the same file name will never be used twice in the same virtual + * machine instance. + * The system temporary directory is determined by examinging the * java.io.tmpdir system property. *

        * The prefix parameter is a sequence of at least three @@ -1057,18 +1057,18 @@ public class File implements Serializable, Comparable * * @param prefix The character prefix to use in generating the path name. * @param suffix The character suffix to use in generating the path name. - * @param directory The directory to create the file in, or + * @param directory The directory to create the file in, or * null for the default temporary directory * * @exception IllegalArgumentException If the patterns is not valid - * @exception SecurityException If there is no permission to perform + * @exception SecurityException If there is no permission to perform * this operation * @exception IOException If an error occurs * * @since 1.2 */ public static synchronized File createTempFile(String prefix, String suffix, - File directory) + File directory) throws IOException { // Grab the system temp directory if necessary @@ -1076,8 +1076,8 @@ public class File implements Serializable, Comparable { String dirname = System.getProperty("java.io.tmpdir"); if (dirname == null) - throw new IOException("Cannot determine system temporary directory"); - + throw new IOException("Cannot determine system temporary directory"); + directory = new File(dirname); if (! VMFile.exists(directory.path)) throw new IOException("System temporary directory " @@ -1099,7 +1099,7 @@ public class File implements Serializable, Comparable // Now identify a file name and make sure it doesn't exist. File file; if (!VMFile.IS_DOS_8_3) - { + { do { long now = System.currentTimeMillis(); @@ -1111,7 +1111,7 @@ public class File implements Serializable, Comparable } else n_created++; - + String name = Long.toHexString(now); if (n_created > 0) name += '_'+Integer.toHexString(n_created); @@ -1143,16 +1143,16 @@ public class File implements Serializable, Comparable // Now create the file and return our file object // XXX - FIXME race condition. - VMFile.create(file.getAbsolutePath()); + VMFile.create(file.getAbsolutePath()); return file; } /** * This method sets the owner's read permission for the File represented by * this object. - * + * * It is the same as calling setReadable(readable, true). - * + * * @param readable true to set read permission, * false to unset the read permission. * @return true if the file permissions are changed, @@ -1165,21 +1165,21 @@ public class File implements Serializable, Comparable { return setReadable(readable, true); } - + /** * This method sets the read permissions for the File represented by * this object. - * + * * If ownerOnly is set to true then only the * read permission bit for the owner of the file is changed. - * + * * If ownerOnly is set to false, the file * permissions are changed so that the file can be read by everyone. - * + * * On unix like systems this sets the user, group * and other read bits and is equal to call * chmod a+r on the file. - * + * * @param readable true to set read permission, * false to unset the read permission. * @param ownerOnly true to set read permission @@ -1195,13 +1195,13 @@ public class File implements Serializable, Comparable checkWrite(); return VMFile.setReadable(path, readable, ownerOnly); } - + /** * This method sets the owner's write permission for the File represented by * this object. - * - * It is the same as calling setWritable(readable, true). - * + * + * It is the same as calling setWritable(readable, true). + * * @param writable true to set write permission, * false to unset write permission. * @return true if the file permissions are changed, @@ -1214,25 +1214,25 @@ public class File implements Serializable, Comparable { return setWritable(writable, true); } - + /** * This method sets the write permissions for the File represented by * this object. - * + * * If ownerOnly is set to true then only the * write permission bit for the owner of the file is changed. - * + * * If ownerOnly is set to false, the file * permissions are changed so that the file can be written by everyone. - * + * * On unix like systems this set the user, group * and other write bits and is equal to call * chmod a+w on the file. - * + * * @param writable true to set write permission, * false to unset write permission. * @param ownerOnly true to set write permission - * for owner only, false for all. + * for owner only, false for all. * @return true if the file permissions are changed, * false otherwise. * @exception SecurityException If write access of the file is not permitted. @@ -1244,13 +1244,13 @@ public class File implements Serializable, Comparable checkWrite(); return VMFile.setWritable(path, writable, ownerOnly); } - + /** * This method sets the owner's execute permission for the File represented * by this object. - * - * It is the same as calling setExecutable(readable, true). - * + * + * It is the same as calling setExecutable(readable, true). + * * @param executable true to set execute permission, * false to unset execute permission. * @return true if the file permissions are changed, @@ -1259,29 +1259,29 @@ public class File implements Serializable, Comparable * @see #setExecutable(boolean, boolean) * @since 1.6 */ - public boolean setExecutable(boolean executable) + public boolean setExecutable(boolean executable) { return setExecutable(executable, true); } - + /** * This method sets the execute permissions for the File represented by * this object. - * + * * If ownerOnly is set to true then only the * execute permission bit for the owner of the file is changed. - * + * * If ownerOnly is set to false, the file * permissions are changed so that the file can be executed by everyone. - * + * * On unix like systems this set the user, group * and other write bits and is equal to call * chmod a+x on the file. - * + * * @param executable true to set write permission, * false to unset write permission. * @param ownerOnly true to set write permission - * for owner only, false for all. + * for owner only, false for all. * @return true if the file permissions are changed, * false otherwise. * @exception SecurityException If write access of the file is not permitted. @@ -1296,8 +1296,8 @@ public class File implements Serializable, Comparable /** * Get the total space for the partition pointed by this file path, in bytes. - * - * @return the total number of bytes in this partition. + * + * @return the total number of bytes in this partition. * @since 1.6 */ public long getTotalSpace() @@ -1307,14 +1307,14 @@ public class File implements Serializable, Comparable if (s != null) s.checkPermission(new RuntimePermission("getFileSystemAttributes")); checkRead(); - + return VMFile.getTotalSpace(path); } - + /** * Get the free space in the partition pointed by this file path, in bytes. - * - * @return the number of free bytes in this partition. + * + * @return the number of free bytes in this partition. * @since 1.6 */ public long getFreeSpace() @@ -1324,25 +1324,25 @@ public class File implements Serializable, Comparable if (s != null) s.checkPermission(new RuntimePermission("getFileSystemAttributes")); checkRead(); - + return VMFile.getFreeSpace(path); } - + /** * Get the usable space in the partition pointed by this file path, in bytes. * This is not necessarily the same as the number returned by * {@link #getFreeSpace()}. - * + * * Implementation note: Unlike the RI, on Linux and UNIX * like systems this methods take into account the reserved space for the * "root" user. This means that the returned results will be a little * different if a normal user or root perform the query. - * + * * Also, the bytes returned should be interpreted as an hint, and may be * different at each call of this method or even right after the method * returns. - * - * @return the number of usable bytes in this partition. + * + * @return the number of usable bytes in this partition. * @since 1.6 */ public long getUsableSpace() @@ -1352,18 +1352,18 @@ public class File implements Serializable, Comparable if (s != null) s.checkPermission(new RuntimePermission("getFileSystemAttributes")); checkRead(); - + // root users can use the reserved extra space String user = System.getProperty("user.name"); if (user != null && user.equals("root")) return VMFile.getFreeSpace(path); - + return VMFile.getUsableSpace(path); } - + /** * This method sets the file represented by this object to be read only. - * A read only file or directory cannot be modified. Please note that + * A read only file or directory cannot be modified. Please note that * GNU systems allow read only files to be deleted if the directory it * is contained in is writable. * @@ -1401,44 +1401,44 @@ public class File implements Serializable, Comparable public static File[] listRoots() { File[] roots = VMFile.listRoots(); - + SecurityManager s = System.getSecurityManager(); if (s != null) { - // Only return roots to which the security manager permits read access. - int count = roots.length; - for (int i = 0; i < roots.length; i++) - { - try - { - s.checkRead (roots[i].path); - } - catch (SecurityException sx) - { - roots[i] = null; - count--; - } - } - if (count != roots.length) - { - File[] newRoots = new File[count]; - int k = 0; - for (int i = 0; i < roots.length; i++) - { - if (roots[i] != null) - newRoots[k++] = roots[i]; - } - roots = newRoots; - } + // Only return roots to which the security manager permits read access. + int count = roots.length; + for (int i = 0; i < roots.length; i++) + { + try + { + s.checkRead (roots[i].path); + } + catch (SecurityException sx) + { + roots[i] = null; + count--; + } + } + if (count != roots.length) + { + File[] newRoots = new File[count]; + int k = 0; + for (int i = 0; i < roots.length; i++) + { + if (roots[i] != null) + newRoots[k++] = roots[i]; + } + roots = newRoots; + } } return roots; } /** - * This method creates a temporary file in the system temporary directory. + * This method creates a temporary file in the system temporary directory. * The files created are guaranteed not to currently exist and the same file * name will never be used twice in the same virtual machine instance. The - * system temporary directory is determined by examinging the + * system temporary directory is determined by examinging the * java.io.tmpdir system property. *

        * The prefix parameter is a sequence of at least three @@ -1450,14 +1450,14 @@ public class File implements Serializable, Comparable * If a SecurityManager exists, then its checkWrite * method is used to verify that this operation is permitted. *

        - * This method is identical to calling + * This method is identical to calling * createTempFile(prefix, suffix, null). * * @param prefix The character prefix to use in generating the path name. * @param suffix The character suffix to use in generating the path name. * * @exception IllegalArgumentException If the prefix or suffix are not valid. - * @exception SecurityException If there is no permission to perform + * @exception SecurityException If there is no permission to perform * this operation * @exception IOException If an error occurs */ @@ -1470,13 +1470,13 @@ public class File implements Serializable, Comparable /** * This method compares the specified File to this one * to test for equality. It does this by comparing the canonical path names - * of the files. + * of the files. *

        * The canonical paths of the files are determined by calling the * getCanonicalPath method on each object. *

        * This method returns a 0 if the specified Object is equal - * to this one, a negative value if it is less than this one + * to this one, a negative value if it is less than this one * a positive value if it is greater than this one. * * @return An integer as described above @@ -1497,10 +1497,10 @@ public class File implements Serializable, Comparable * * @param dest The File object representing the target name * - * @return true if the rename succeeds, false + * @return true if the rename succeeds, false * otherwise. * - * @exception SecurityException If write access is not allowed to the + * @exception SecurityException If write access is not allowed to the * file by the SecurityMananger. */ public synchronized boolean renameTo(File dest) @@ -1527,7 +1527,7 @@ public class File implements Serializable, Comparable * * @since 1.2 */ - public boolean setLastModified(long time) + public boolean setLastModified(long time) { if (time < 0) throw new IllegalArgumentException("Negative modification time: " + time); @@ -1540,7 +1540,7 @@ public class File implements Serializable, Comparable { // Check the SecurityManager SecurityManager s = System.getSecurityManager(); - + if (s != null) s.checkWrite(path); } @@ -1549,7 +1549,7 @@ public class File implements Serializable, Comparable { // Check the SecurityManager SecurityManager s = System.getSecurityManager(); - + if (s != null) s.checkRead(path); } @@ -1558,12 +1558,12 @@ public class File implements Serializable, Comparable { // Check the SecurityManager SecurityManager s = System.getSecurityManager(); - + if (s != null) s.checkExec(path); } - - /** + + /** * Calling this method requests that the file represented by this object * be deleted when the virtual machine exits. Note that this request cannot * be cancelled. Also, it will only be carried out if the virtual machine @@ -1571,7 +1571,7 @@ public class File implements Serializable, Comparable * * @exception SecurityException If deleting of the file is not allowed * - * @since 1.2 + * @since 1.2 */ public void deleteOnExit() { @@ -1597,10 +1597,9 @@ public class File implements Serializable, Comparable // If the file was from an OS with a different dir separator, // fixup the path to use the separator on this OS. char oldSeparatorChar = ois.readChar(); - + if (oldSeparatorChar != separatorChar) path = path.replace(oldSeparatorChar, separatorChar); } - -} // class File +} // class File diff --git a/libjava/classpath/java/io/FileDescriptor.java b/libjava/classpath/java/io/FileDescriptor.java index cf9ff20d564..ce58a9fb0fa 100644 --- a/libjava/classpath/java/io/FileDescriptor.java +++ b/libjava/classpath/java/io/FileDescriptor.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,7 +51,7 @@ import java.nio.channels.FileChannel; * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey (tromey@cygnus.com) - * @date September 24, 1998 + * @date September 24, 1998 */ public final class FileDescriptor { @@ -100,7 +100,7 @@ public final class FileDescriptor /** * This method forces all data that has not yet been physically written to - * the underlying storage medium associated with this + * the underlying storage medium associated with this * FileDescriptor * to be written out. This method will not return until all data has * been fully written to the underlying device. If the device does not @@ -111,17 +111,17 @@ public final class FileDescriptor { if (channel instanceof FileChannel) { - try - { - ((FileChannel) channel).force(true); - } - catch (IOException ex) - { - if (ex instanceof SyncFailedException) - throw (SyncFailedException) ex; - else - throw new SyncFailedException(ex.toString()); - } + try + { + ((FileChannel) channel).force(true); + } + catch (IOException ex) + { + if (ex instanceof SyncFailedException) + throw (SyncFailedException) ex; + else + throw new SyncFailedException(ex.toString()); + } } } @@ -129,11 +129,11 @@ public final class FileDescriptor * This methods tests whether or not this object represents a valid open * native file handle. * - * @return true if this object represents a valid + * @return true if this object represents a valid * native file handle, false otherwise */ public boolean valid () - { + { ByteChannel c = channel; return (c != null) && (c.isOpen()); } diff --git a/libjava/classpath/java/io/FileFilter.java b/libjava/classpath/java/io/FileFilter.java index e57ac9fd060..087c5e9f0c1 100644 --- a/libjava/classpath/java/io/FileFilter.java +++ b/libjava/classpath/java/io/FileFilter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,14 +40,14 @@ package java.io; /** * This interface has one method which is used for filtering pathnames - * returned in a pathname listing. It is currently used by the + * returned in a pathname listing. It is currently used by the * File.listFiles(FileFilter) method. *

        * The method in this interface determines if a particular pathname should * or should not be included in the pathname listing. * * @author Aaron M. Renn (arenn@urbanophile.com) - * + * * @see File#listFiles(java.io.FileFilter) */ public interface FileFilter @@ -58,7 +58,7 @@ public interface FileFilter * * @param pathname The pathname to test * - * @return true if the path should be included in the list, + * @return true if the path should be included in the list, * false otherwise. */ boolean accept(File pathname); diff --git a/libjava/classpath/java/io/FileInputStream.java b/libjava/classpath/java/io/FileInputStream.java index 8217668b479..0e71caf371e 100644 --- a/libjava/classpath/java/io/FileInputStream.java +++ b/libjava/classpath/java/io/FileInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,9 +48,9 @@ import java.nio.channels.FileChannel; * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ - + /** - * This class is a stream that reads its bytes from a file. + * This class is a stream that reads its bytes from a file. * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Warren Levy (warrenl@cygnus.com) @@ -68,7 +68,7 @@ public class FileInputStream extends InputStream * This method initializes a FileInputStream to read from the * specified named file. A security check is first made to determine * whether or not access to this file is allowed. This is done by - * calling the checkRead() method of the + * calling the checkRead() method of the * SecurityManager * (if one exists) with the name of this file. An exception is thrown * if reading is not allowed. If the file does not exist, an exception @@ -77,7 +77,7 @@ public class FileInputStream extends InputStream * @param name The name of the file this stream should read from * * @exception SecurityException If read access to the file is not allowed - * @exception FileNotFoundException If the file does not exist + * @exception FileNotFoundException If the file does not exist * or if it is a directory */ public FileInputStream(String name) throws FileNotFoundException @@ -129,13 +129,13 @@ public class FileInputStream extends InputStream * specified FileDescriptor object. A security * check is first made to * determine whether or not access to this file is allowed. This is done by - * calling the checkRead() method of the + * calling the checkRead() method of the * SecurityManager - * (if one exists) with the specified FileDescriptor - * An exception is + * (if one exists) with the specified FileDescriptor + * An exception is * thrown if reading is not allowed. * - * @param fdObj The FileDescriptor object this stream + * @param fdObj The FileDescriptor object this stream * should read from * * @exception SecurityException If read access to the file is not allowed @@ -210,9 +210,9 @@ public class FileInputStream extends InputStream { synchronized (this) { - if (fd == null) - fd = new FileDescriptor (ch); - return fd; + if (fd == null) + fd = new FileDescriptor (ch); + return fd; } } @@ -256,7 +256,7 @@ public class FileInputStream extends InputStream /** * This method read bytes from a stream and stores them into a caller - * supplied buffer. It starts storing the data at index + * supplied buffer. It starts storing the data at index * offset into * the buffer and attempts to read len bytes. This method can * return before reading the number of bytes requested. The actual number @@ -297,7 +297,7 @@ public class FileInputStream extends InputStream public synchronized long skip (long numBytes) throws IOException { if (numBytes < 0) - throw new IllegalArgumentException ("Can't skip negative bytes: " + + throw new IllegalArgumentException ("Can't skip negative bytes: " + numBytes); if (numBytes == 0) @@ -314,10 +314,9 @@ public class FileInputStream extends InputStream * A file channel must be created by first creating an instance of * Input/Output/RandomAccessFile and invoking the getChannel() method on it. */ - public synchronized FileChannel getChannel () + public synchronized FileChannel getChannel () { return ch; } } // class FileInputStream - diff --git a/libjava/classpath/java/io/FileOutputStream.java b/libjava/classpath/java/io/FileOutputStream.java index b012e604404..6915822ea49 100644 --- a/libjava/classpath/java/io/FileOutputStream.java +++ b/libjava/classpath/java/io/FileOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -71,7 +71,7 @@ public class FileOutputStream extends OutputStream * Before opening a file, a security check is performed by calling the * checkWrite method of the SecurityManager (if * one exists) with the name of the file to be opened. An exception is - * thrown if writing is not allowed. + * thrown if writing is not allowed. * * @param path The name of the file this stream should write to * @param append true to append bytes to the end of the file, @@ -94,7 +94,7 @@ public class FileOutputStream extends OutputStream * Before opening a file, a security check is performed by calling the * checkWrite method of the SecurityManager (if * one exists) with the name of the file to be opened. An exception is - * thrown if writing is not allowed. + * thrown if writing is not allowed. * * @param path The name of the file this stream should write to * @@ -109,14 +109,14 @@ public class FileOutputStream extends OutputStream /** * This method initializes a FileOutputStream object to write - * to the specified File object. The file is created if it - * does not exist, and the bytes written are written starting at the + * to the specified File object. The file is created if it + * does not exist, and the bytes written are written starting at the * beginning of the file. *

        * Before opening a file, a security check is performed by calling the * checkWrite method of the SecurityManager (if * one exists) with the name of the file to be opened. An exception is - * thrown if writing is not allowed. + * thrown if writing is not allowed. * * @param file The File object this stream should write to * @@ -131,16 +131,16 @@ public class FileOutputStream extends OutputStream /** * This method initializes a FileOutputStream object to write - * to the specified File object. The file is created if it - * does not exist, and the bytes written are written starting at the - * beginning of the file if the append parameter is + * to the specified File object. The file is created if it + * does not exist, and the bytes written are written starting at the + * beginning of the file if the append parameter is * false. Otherwise bytes are written at the end of the * file. *

        * Before opening a file, a security check is performed by calling the * checkWrite method of the SecurityManager (if * one exists) with the name of the file to be opened. An exception is - * thrown if writing is not allowed. + * thrown if writing is not allowed. * * @param file The File object this stream should write to * @param append true to append bytes to the end of the file, @@ -185,7 +185,7 @@ public class FileOutputStream extends OutputStream * Before opening a file, a security check is performed by calling the * checkWrite method of the SecurityManager (if * one exists) with the specified FileDescriptor as an argument. - * An exception is thrown if writing is not allowed. + * An exception is thrown if writing is not allowed. * * @param fdObj The FileDescriptor this stream should write to * @@ -230,14 +230,14 @@ public class FileOutputStream extends OutputStream { synchronized (this) { - if (fd == null) - fd = new FileDescriptor (ch); - return fd; + if (fd == null) + fd = new FileDescriptor (ch); + return fd; } } /** - * This method writes a single byte of data to the file. + * This method writes a single byte of data to the file. * * @param b The byte of data to write, passed as an int * @@ -263,7 +263,7 @@ public class FileOutputStream extends OutputStream } /** - * This method writes len bytes from the byte array + * This method writes len bytes from the byte array * buf to the file starting at index offset. * * @param buf The array of bytes to write to the file @@ -279,7 +279,7 @@ public class FileOutputStream extends OutputStream || len < 0 || offset + len > buf.length) throw new ArrayIndexOutOfBoundsException (); - + ch.write(ByteBuffer.wrap(buf, offset, len)); } @@ -301,10 +301,9 @@ public class FileOutputStream extends OutputStream * A file channel must be created by first creating an instance of * Input/Output/RandomAccessFile and invoking the getChannel() method on it. */ - public synchronized FileChannel getChannel() + public synchronized FileChannel getChannel() { return ch; } } // class FileOutputStream - diff --git a/libjava/classpath/java/io/FilePermission.java b/libjava/classpath/java/io/FilePermission.java index 0872a378bc3..5aa10b3c026 100644 --- a/libjava/classpath/java/io/FilePermission.java +++ b/libjava/classpath/java/io/FilePermission.java @@ -59,7 +59,7 @@ public final class FilePermission extends Permission implements Serializable String action; int i = actionsString.indexOf(','); int startI = 0; - while (i != -1) + while (i != -1) { action = actionsString.substring(startI, i).trim().toLowerCase(); if (action.equals("read")) @@ -70,9 +70,9 @@ public final class FilePermission extends Permission implements Serializable executePerm = true; else if (action.equals("delete")) deletePerm = true; - else - throw new IllegalArgumentException("Unknown action: " + action); - + else + throw new IllegalArgumentException("Unknown action: " + action); + startI = i + 1; i = actionsString.indexOf(',', startI); } @@ -99,7 +99,7 @@ public final class FilePermission extends Permission implements Serializable * permission represents. The actions must be "read", "write", * "execute" and/or "delete". */ - public FilePermission(String pathExpression, String actionsString) + public FilePermission(String pathExpression, String actionsString) { // FIXME: what to do when the file string is malformed? super(pathExpression); @@ -110,26 +110,26 @@ public final class FilePermission extends Permission implements Serializable this.actionsString = actionsString; checkPerms(); } - + /** * Get the actions this FilePermission supports. * @return the String representing the actions this FilePermission supports. */ - public String getActions() + public String getActions() { return actionsString; } /** * Get the hash code for this Object.

        - * FilePermission's hash code is calculated as the exclusive or of the + * FilePermission's hash code is calculated as the exclusive or of the * target * String's hash code and the action String's hash code. - * @specnote Sun did not specify how to calculate the hash code; + * @specnote Sun did not specify how to calculate the hash code; * I made this up. * @return the hash code for this Object. */ - public int hashCode() + public int hashCode() { return getName().hashCode() ^ actionsString.hashCode(); } @@ -141,7 +141,7 @@ public final class FilePermission extends Permission implements Serializable * @param o the Object to compare to. * @return whether the Objects are semantically equivalent. */ - public boolean equals(Object o) + public boolean equals(Object o) { if (! (o instanceof FilePermission)) return false; @@ -152,38 +152,38 @@ public final class FilePermission extends Permission implements Serializable // Compare names, taking into account if they refer to a directory // and one has a separator and the other does not. - if (f1.length() > 0 && f1.charAt(f1.length() - 1) == File.separatorChar) + if (f1.length() > 0 && f1.charAt(f1.length() - 1) == File.separatorChar) { if (f2.length() > 0 - && f2.charAt(f2.length() - 1) == File.separatorChar) + && f2.charAt(f2.length() - 1) == File.separatorChar) { - if (! f2.equals(f1)) - return false; + if (! f2.equals(f1)) + return false; } else { - if (! f2.equals(f1.substring(0, f1.length() - 1))) - return false; + if (! f2.equals(f1.substring(0, f1.length() - 1))) + return false; } } else { if (f2.length() > 0 - && f2.charAt(f2.length() - 1) == File.separatorChar) + && f2.charAt(f2.length() - 1) == File.separatorChar) { - if (! f1.equals(f2.substring(0, f2.length() - 1))) - return false; + if (! f1.equals(f2.substring(0, f2.length() - 1))) + return false; } else { - if (! f1.equals(f2)) - return false; + if (! f1.equals(f2)) + return false; } } return (readPerm == p.readPerm - && writePerm == p.writePerm - && executePerm == p.executePerm - && deletePerm == p.deletePerm); + && writePerm == p.writePerm + && executePerm == p.executePerm + && deletePerm == p.deletePerm); } /** @@ -191,14 +191,14 @@ public final class FilePermission extends Permission implements Serializable * Permission A implies permission B if these things are all true: *

          *
        1. A and B are both FilePermissions.
          2. - *
        2. All possible files in B are included in A + *
        3. All possible files in B are included in A * (possibly more are in A).
          4. *
        4. All actions B supports, A also supports.
          5. *
        * @param p the Permission to compare against. * @return whether this Permission implies p */ - public boolean implies(Permission p) + public boolean implies(Permission p) { if (! (p instanceof FilePermission)) return false; @@ -207,7 +207,7 @@ public final class FilePermission extends Permission implements Serializable if (f1.equals(ALL_FILES)) return true; - + FilePermission fp = (FilePermission) p; String f2 = fp.getName(); @@ -216,12 +216,12 @@ public final class FilePermission extends Permission implements Serializable try { - f1 = new File(f1).getCanonicalPath(); - f2 = new File(f2).getCanonicalPath(); + f1 = new File(f1).getCanonicalPath(); + f2 = new File(f2).getCanonicalPath(); } catch (IOException ioe) { - return false; + return false; } String sub1; @@ -229,54 +229,54 @@ public final class FilePermission extends Permission implements Serializable switch (f1.charAt(f1.length() - 1)) { case '*': - sub1 = f1.substring(0, f1.length() - 1); // chop off "*" - if (f2.length() <= sub1.length()) - { - // If it's smaller, there is no way it could be part of - // this directory. If it's the same (or length - 1), it - // could be the same directory but specifies access to - // the directory rather than the files in it. - return false; - } - else if (f2.charAt(sub1.length() - 1) == File.separatorChar) - { - // Make sure the part before the "/" is the same. - if (! f2.substring(0, sub1.length()).equals(sub1)) - return false; - // Make sure there are no subdirectories specified - // underneath this one. - if (f2.substring(sub1.length() + 1).indexOf(File.separatorChar) - != -1) - return false; - } - else - { - // Obviously not equal: f2 is either not a directory or - // is not the same directory (its name continues further - // than we want). - return false; - } - break; + sub1 = f1.substring(0, f1.length() - 1); // chop off "*" + if (f2.length() <= sub1.length()) + { + // If it's smaller, there is no way it could be part of + // this directory. If it's the same (or length - 1), it + // could be the same directory but specifies access to + // the directory rather than the files in it. + return false; + } + else if (f2.charAt(sub1.length() - 1) == File.separatorChar) + { + // Make sure the part before the "/" is the same. + if (! f2.substring(0, sub1.length()).equals(sub1)) + return false; + // Make sure there are no subdirectories specified + // underneath this one. + if (f2.substring(sub1.length() + 1).indexOf(File.separatorChar) + != -1) + return false; + } + else + { + // Obviously not equal: f2 is either not a directory or + // is not the same directory (its name continues further + // than we want). + return false; + } + break; case '-': - // Chop off "/-". - sub1 = f1.substring(0, f1.length() - 2); - if (f2.length() < sub1.length()) - { - // If it's smaller, there is no way it could be part of - // this directory. - return false; - } - else if (f2.length() > sub1.length() - && f2.charAt(sub1.length()) != File.separatorChar) - return false; - else if (! f2.substring(0, sub1.length()).equals(sub1)) - return false; - break; + // Chop off "/-". + sub1 = f1.substring(0, f1.length() - 2); + if (f2.length() < sub1.length()) + { + // If it's smaller, there is no way it could be part of + // this directory. + return false; + } + else if (f2.length() > sub1.length() + && f2.charAt(sub1.length()) != File.separatorChar) + return false; + else if (! f2.substring(0, sub1.length()).equals(sub1)) + return false; + break; default: - if (!f1.equals(f2)) - return false; - break; + if (!f1.equals(f2)) + return false; + break; } if (fp.readPerm && ! readPerm) @@ -287,7 +287,7 @@ public final class FilePermission extends Permission implements Serializable return false; if (fp.deletePerm && ! deletePerm) return false; - + return true; } } diff --git a/libjava/classpath/java/io/FileReader.java b/libjava/classpath/java/io/FileReader.java index 4a1dd5ff4ce..05e14c37638 100644 --- a/libjava/classpath/java/io/FileReader.java +++ b/libjava/classpath/java/io/FileReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,7 +41,7 @@ package java.io; /** * This class provides a convenient way to set up a Reader * to read from a file. It opens the specified file for reading and creates - * the InputStreamReader to read from the + * the InputStreamReader to read from the * resulting FileInputStream. This class can only be used * to read from files using the default character encoding. Use * InputStreamReader directly to use a non-default encoding. @@ -56,7 +56,7 @@ public class FileReader extends InputStreamReader * * @param file The File object representing the file to read from * - * @exception FileNotFoundException If the file is not found or some other + * @exception FileNotFoundException If the file is not found or some other * error occurs */ public FileReader(File file) throws FileNotFoundException @@ -81,7 +81,7 @@ public class FileReader extends InputStreamReader * * @param name The name of the file to read from * - * @exception FileNotFoundException If the file is not found or some other + * @exception FileNotFoundException If the file is not found or some other * error occurs */ public FileReader(String name) throws FileNotFoundException @@ -89,4 +89,3 @@ public class FileReader extends InputStreamReader super(new FileInputStream(name)); } } // class FileReader - diff --git a/libjava/classpath/java/io/FileWriter.java b/libjava/classpath/java/io/FileWriter.java index ce18efe5e39..95d5eea3bdb 100644 --- a/libjava/classpath/java/io/FileWriter.java +++ b/libjava/classpath/java/io/FileWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ package java.io; /** * This is a convenience class for writing to files. It creates an - * FileOutputStream and initializes an + * FileOutputStream and initializes an * OutputStreamWriter to write to it. * * @author Aaron M. Renn (arenn@urbanophile.com) @@ -100,7 +100,7 @@ public class FileWriter extends OutputStreamWriter } /** - * This method intializes a new FileWriter object to + * This method intializes a new FileWriter object to * write to the * specified named file. * @@ -116,7 +116,7 @@ public class FileWriter extends OutputStreamWriter } /** - * This method intializes a new FileWriter object to + * This method intializes a new FileWriter object to * write to the * specified named file. This form of the constructor allows the caller * to determine whether data should be written starting at the beginning or diff --git a/libjava/classpath/java/io/FilenameFilter.java b/libjava/classpath/java/io/FilenameFilter.java index 57b4d3b182c..5a9045f52ca 100644 --- a/libjava/classpath/java/io/FilenameFilter.java +++ b/libjava/classpath/java/io/FilenameFilter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,8 +45,8 @@ package java.io; /** * This interface has one method which is used for filtering filenames - * returned in a directory listing. It is currently used by the - * File.list(FilenameFilter) method and by the filename + * returned in a directory listing. It is currently used by the + * File.list(FilenameFilter) method and by the filename * dialog in AWT. *

        * The method in this interface determines if a particular file should @@ -73,4 +73,3 @@ public interface FilenameFilter boolean accept(File dir, String name); } // interface FilenameFilter - diff --git a/libjava/classpath/java/io/FilterInputStream.java b/libjava/classpath/java/io/FilterInputStream.java index d3cb9e4f71f..c9d50e5357b 100644 --- a/libjava/classpath/java/io/FilterInputStream.java +++ b/libjava/classpath/java/io/FilterInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ package java.io; */ /** - * This is the common superclass of all standard classes that filter + * This is the common superclass of all standard classes that filter * input. It acts as a layer on top of an underlying InputStream * and simply redirects calls made to it to the subordinate InputStream * instead. Subclasses of this class perform additional filtering @@ -60,7 +60,7 @@ package java.io; * When creating a subclass of FilterInputStream, override the * appropriate methods to implement the desired filtering. However, note * that the read(byte[]) method does not need to be overridden - * as this class redirects calls to that method to + * as this class redirects calls to that method to * read(byte[], int, int) instead of to the subordinate * InputStream read(byte[]) method. * @@ -132,7 +132,7 @@ public class FilterInputStream extends InputStream /** * Calls the in.skip(long) method * - * @param numBytes The requested number of bytes to skip. + * @param numBytes The requested number of bytes to skip. * * @return The value returned from in.skip(long) * @@ -156,8 +156,8 @@ public class FilterInputStream extends InputStream } /** - * Calls the read(byte[], int, int) overloaded method. - * Note that + * Calls the read(byte[], int, int) overloaded method. + * Note that * this method does not redirect its call directly to a corresponding * method in in. This allows subclasses to override only the * three argument version of read. @@ -193,7 +193,7 @@ public class FilterInputStream extends InputStream * This method closes the input stream by closing the input stream that * this object is filtering. Future attempts to access this stream may * throw an exception. - * + * * @exception IOException If an error occurs */ public void close() throws IOException diff --git a/libjava/classpath/java/io/FilterOutputStream.java b/libjava/classpath/java/io/FilterOutputStream.java index 4c2dfc04a65..401e5478cef 100644 --- a/libjava/classpath/java/io/FilterOutputStream.java +++ b/libjava/classpath/java/io/FilterOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,10 +44,10 @@ package java.io; */ /** - * This class is the common superclass of output stream classes that + * This class is the common superclass of output stream classes that * filter the output they write. These classes typically transform the * data in some way prior to writing it out to another underlying - * OutputStream. This class simply overrides all the + * OutputStream. This class simply overrides all the * methods in OutputStream to redirect them to the * underlying stream. Subclasses provide actual filtering. * @@ -141,10 +141,9 @@ public class FilterOutputStream extends OutputStream public void write(byte[] buf, int offset, int len) throws IOException { // Don't do checking here, per Java Lang Spec. - for (int i=0; i < len; i++) + for (int i=0; i < len; i++) write(buf[offset + i]); } } // class FilterOutputStream - diff --git a/libjava/classpath/java/io/FilterReader.java b/libjava/classpath/java/io/FilterReader.java index 1abaa8a4b68..0e57e21c582 100644 --- a/libjava/classpath/java/io/FilterReader.java +++ b/libjava/classpath/java/io/FilterReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ package java.io; */ /** - * This is the common superclass of all standard classes that filter + * This is the common superclass of all standard classes that filter * input. It acts as a layer on top of an underlying Reader * and simply redirects calls made to it to the subordinate Reader * instead. Subclasses of this class perform additional filtering @@ -54,7 +54,7 @@ package java.io; * When creating a subclass of FilterReader, override the * appropriate methods to implement the desired filtering. However, note * that the read(char[]) method does not need to be overridden - * as this class redirects calls to that method to + * as this class redirects calls to that method to * read(yte[], int, int) instead of to the subordinate * Reader} read(yte[]) method. * @@ -98,7 +98,7 @@ public abstract class FilterReader extends Reader /** * Calls the in.markSupported() method. * - * @return true if mark/reset is supported, + * @return true if mark/reset is supported, * false otherwise */ public boolean markSupported() @@ -131,7 +131,7 @@ public abstract class FilterReader extends Reader /** * Calls the in.skip(long) method * - * @param num_chars The requested number of chars to skip. + * @param num_chars The requested number of chars to skip. * * @return The value returned from in.skip(long) * @@ -182,4 +182,3 @@ public abstract class FilterReader extends Reader } } // class FilterReader - diff --git a/libjava/classpath/java/io/FilterWriter.java b/libjava/classpath/java/io/FilterWriter.java index 9b9ce33f9f6..382dec06a0f 100644 --- a/libjava/classpath/java/io/FilterWriter.java +++ b/libjava/classpath/java/io/FilterWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,15 +44,15 @@ package java.io; */ /** - * This class is the common superclass of output character stream classes + * This class is the common superclass of output character stream classes * that filter the output they write. These classes typically transform the * data in some way prior to writing it out to another underlying - * Writer. This class simply overrides all the + * Writer. This class simply overrides all the * methods in Writer to redirect them to the * underlying stream. Subclasses provide actual filtering. * * @author Aaron M. Renn (arenn@urbanophile.com) - * @author Tom Tromey (tromey@cygnus.com) + * @author Tom Tromey (tromey@cygnus.com) */ public abstract class FilterWriter extends Writer { @@ -132,7 +132,7 @@ public abstract class FilterWriter extends Writer * starting at position offset. * * @param str The String that is to be written - * @param offset The character offset into the String + * @param offset The character offset into the String * to start writing from * @param len The number of chars to write * @@ -144,4 +144,3 @@ public abstract class FilterWriter extends Writer } } // class FilterWriter - diff --git a/libjava/classpath/java/io/InputStream.java b/libjava/classpath/java/io/InputStream.java index 2934f0034a5..58b3dbd19a0 100644 --- a/libjava/classpath/java/io/InputStream.java +++ b/libjava/classpath/java/io/InputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -35,7 +35,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - + package java.io; /** @@ -121,7 +121,7 @@ public abstract class InputStream implements Closeable * if they support mark/reset functionality. * * @return true if mark/reset functionality is - * supported, false otherwise + * supported, false otherwise */ public boolean markSupported() { @@ -200,18 +200,18 @@ public abstract class InputStream implements Closeable for (i = 0; i < len; ++i) try - { - if ((ch = read()) < 0) - return i == 0 ? -1 : i; // EOF - b[off + i] = (byte) ch; - } + { + if ((ch = read()) < 0) + return i == 0 ? -1 : i; // EOF + b[off + i] = (byte) ch; + } catch (IOException ex) - { - // Only reading the first byte should cause an IOException. - if (i == 0) - throw ex; - return i; - } + { + // Only reading the first byte should cause an IOException. + if (i == 0) + throw ex; + return i; + } return i; } @@ -259,10 +259,10 @@ public abstract class InputStream implements Closeable while (n > 0L) { - int numread = read(tmpbuf, 0, n > buflen ? buflen : (int) n); - if (numread <= 0) - break; - n -= numread; + int numread = read(tmpbuf, 0, n > buflen ? buflen : (int) n); + if (numread <= 0) + break; + n -= numread; } return origN - n; diff --git a/libjava/classpath/java/io/InputStreamReader.java b/libjava/classpath/java/io/InputStreamReader.java index 6c5297f6ba8..51925a8c5df 100644 --- a/libjava/classpath/java/io/InputStreamReader.java +++ b/libjava/classpath/java/io/InputStreamReader.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,13 +51,13 @@ import java.nio.charset.CodingErrorAction; /** * This class reads characters from a byte input stream. The characters - * read are converted from bytes in the underlying stream by a + * read are converted from bytes in the underlying stream by a * decoding layer. The decoding layer transforms bytes to chars according - * to an encoding standard. There are many available encodings to choose + * to an encoding standard. There are many available encodings to choose * from. The desired encoding can either be specified by name, or if no * encoding is selected, the system default encoding will be used. The * system default encoding name is determined from the system property - * file.encoding. The only encodings that are guaranteed to + * file.encoding. The only encodings that are guaranteed to * be availalbe are "8859_1" (the Latin-1 character set) and "UTF8". * Unforunately, Java does not provide a mechanism for listing the * ecodings that are supported in a given implementation. @@ -79,7 +79,7 @@ import java.nio.charset.CodingErrorAction; *

      6. More later
        7. * *

        - * It is recommended that applications do not use + * It is recommended that applications do not use * InputStreamReader's * directly. Rather, for efficiency purposes, an object of this class * should be wrapped by a BufferedReader. @@ -93,7 +93,7 @@ import java.nio.charset.CodingErrorAction; * @author Robert Schuster * @author Aaron M. Renn (arenn@urbanophile.com) * @author Per Bothner (bothner@cygnus.com) - * @date April 22, 1998. + * @date April 22, 1998. */ public class InputStreamReader extends Reader { @@ -148,44 +148,44 @@ public class InputStreamReader extends Reader * This method initializes a new instance of InputStreamReader * to read from the specified stream using the default encoding. * - * @param in The InputStream to read from + * @param in The InputStream to read from */ public InputStreamReader(InputStream in) { if (in == null) throw new NullPointerException(); this.in = in; - try - { - encoding = SystemProperties.getProperty("file.encoding"); - // Don't use NIO if avoidable - if(EncodingHelper.isISOLatin1(encoding)) - { - encoding = "ISO8859_1"; - maxBytesPerChar = 1f; - decoder = null; - return; - } - Charset cs = EncodingHelper.getCharset(encoding); - decoder = cs.newDecoder(); - encoding = EncodingHelper.getOldCanonical(cs.name()); - try { - maxBytesPerChar = cs.newEncoder().maxBytesPerChar(); - } catch(UnsupportedOperationException _){ - maxBytesPerChar = 1f; - } - decoder.onMalformedInput(CodingErrorAction.REPLACE); - decoder.onUnmappableCharacter(CodingErrorAction.REPLACE); - decoder.reset(); - } catch(RuntimeException e) { - encoding = "ISO8859_1"; - maxBytesPerChar = 1f; - decoder = null; - } catch(UnsupportedEncodingException e) { - encoding = "ISO8859_1"; - maxBytesPerChar = 1f; - decoder = null; - } + try + { + encoding = SystemProperties.getProperty("file.encoding"); + // Don't use NIO if avoidable + if(EncodingHelper.isISOLatin1(encoding)) + { + encoding = "ISO8859_1"; + maxBytesPerChar = 1f; + decoder = null; + return; + } + Charset cs = EncodingHelper.getCharset(encoding); + decoder = cs.newDecoder(); + encoding = EncodingHelper.getOldCanonical(cs.name()); + try { + maxBytesPerChar = cs.newEncoder().maxBytesPerChar(); + } catch(UnsupportedOperationException _){ + maxBytesPerChar = 1f; + } + decoder.onMalformedInput(CodingErrorAction.REPLACE); + decoder.onUnmappableCharacter(CodingErrorAction.REPLACE); + decoder.reset(); + } catch(RuntimeException e) { + encoding = "ISO8859_1"; + maxBytesPerChar = 1f; + decoder = null; + } catch(UnsupportedEncodingException e) { + encoding = "ISO8859_1"; + maxBytesPerChar = 1f; + decoder = null; + } } /** @@ -193,11 +193,11 @@ public class InputStreamReader extends Reader * to read from the specified stream using a caller supplied character * encoding scheme. Note that due to a deficiency in the Java language * design, there is no way to determine which encodings are supported. - * + * * @param in The InputStream to read from * @param encoding_name The name of the encoding scheme to use * - * @exception UnsupportedEncodingException If the encoding scheme + * @exception UnsupportedEncodingException If the encoding scheme * requested is not available. */ public InputStreamReader(InputStream in, String encoding_name) @@ -206,23 +206,23 @@ public class InputStreamReader extends Reader if (in == null || encoding_name == null) throw new NullPointerException(); - + this.in = in; // Don't use NIO if avoidable if(EncodingHelper.isISOLatin1(encoding_name)) { - encoding = "ISO8859_1"; - maxBytesPerChar = 1f; - decoder = null; - return; + encoding = "ISO8859_1"; + maxBytesPerChar = 1f; + decoder = null; + return; } try { Charset cs = EncodingHelper.getCharset(encoding_name); try { maxBytesPerChar = cs.newEncoder().maxBytesPerChar(); } catch(UnsupportedOperationException _){ - maxBytesPerChar = 1f; - } + maxBytesPerChar = 1f; + } decoder = cs.newDecoder(); decoder.onMalformedInput(CodingErrorAction.REPLACE); @@ -242,7 +242,7 @@ public class InputStreamReader extends Reader * Creates an InputStreamReader that uses a decoder of the given * charset to decode the bytes in the InputStream into * characters. - * + * * @since 1.4 */ public InputStreamReader(InputStream in, Charset charset) { @@ -266,7 +266,7 @@ public class InputStreamReader extends Reader /** * Creates an InputStreamReader that uses the given charset decoder * to decode the bytes in the InputStream into characters. - * + * * @since 1.4 */ public InputStreamReader(InputStream in, CharsetDecoder decoder) { @@ -282,8 +282,8 @@ public class InputStreamReader extends Reader else maxBytesPerChar = charset.newEncoder().maxBytesPerChar(); } catch(UnsupportedOperationException _){ - maxBytesPerChar = 1f; - } + maxBytesPerChar = 1f; + } decoder.onMalformedInput(CodingErrorAction.REPLACE); decoder.onUnmappableCharacter(CodingErrorAction.REPLACE); @@ -291,11 +291,11 @@ public class InputStreamReader extends Reader if (charset == null) encoding = "US-ASCII"; else - encoding = EncodingHelper.getOldCanonical(decoder.charset().name()); + encoding = EncodingHelper.getOldCanonical(decoder.charset().name()); } - + /** - * This method closes this stream, as well as the underlying + * This method closes this stream, as well as the underlying * InputStream. * * @exception IOException If an error occurs @@ -304,14 +304,14 @@ public class InputStreamReader extends Reader { synchronized (lock) { - // Makes sure all intermediate data is released by the decoder. - if (decoder != null) - decoder.reset(); - if (in != null) - in.close(); - in = null; - isDone = true; - decoder = null; + // Makes sure all intermediate data is released by the decoder. + if (decoder != null) + decoder.reset(); + if (in != null) + in.close(); + in = null; + isDone = true; + decoder = null; } } @@ -333,7 +333,7 @@ public class InputStreamReader extends Reader * If the stream is not ready to be read, it could (although is not required * to) block on the next read attempt. * - * @return true if the stream is ready to be read, + * @return true if the stream is ready to be read, * false otherwise * * @exception IOException If an error occurs @@ -342,7 +342,7 @@ public class InputStreamReader extends Reader { if (in == null) throw new IOException("Reader has been closed"); - + return in.available() != 0; } @@ -367,10 +367,10 @@ public class InputStreamReader extends Reader return -1; if(decoder != null) { - int totalBytes = (int)((double) length * maxBytesPerChar); + int totalBytes = (int)((double) length * maxBytesPerChar); if (byteBuffer != null) totalBytes = Math.max(totalBytes, byteBuffer.remaining()); - byte[] bytes; + byte[] bytes; // Fetch cached bytes array if available and big enough. synchronized(cacheLock) { @@ -381,57 +381,57 @@ public class InputStreamReader extends Reader bytesCache = null; } - int remaining = 0; - if(byteBuffer != null) - { - remaining = byteBuffer.remaining(); - byteBuffer.get(bytes, 0, remaining); - } - int read; - if(totalBytes - remaining > 0) - { - read = in.read(bytes, remaining, totalBytes - remaining); - if(read == -1){ - read = remaining; - isDone = true; - } else - read += remaining; - } else + int remaining = 0; + if(byteBuffer != null) + { + remaining = byteBuffer.remaining(); + byteBuffer.get(bytes, 0, remaining); + } + int read; + if(totalBytes - remaining > 0) + { + read = in.read(bytes, remaining, totalBytes - remaining); + if(read == -1){ + read = remaining; + isDone = true; + } else + read += remaining; + } else read = remaining; - byteBuffer = ByteBuffer.wrap(bytes, 0, read); - CharBuffer cb = CharBuffer.wrap(buf, offset, length); - int startPos = cb.position(); + byteBuffer = ByteBuffer.wrap(bytes, 0, read); + CharBuffer cb = CharBuffer.wrap(buf, offset, length); + int startPos = cb.position(); - if(hasSavedSurrogate){ - hasSavedSurrogate = false; - cb.put(savedSurrogate); - read++; - } + if(hasSavedSurrogate){ + hasSavedSurrogate = false; + cb.put(savedSurrogate); + read++; + } - CoderResult cr = decoder.decode(byteBuffer, cb, isDone); - decoder.reset(); - // 1 char remains which is the first half of a surrogate pair. - if(cr.isOverflow() && cb.hasRemaining()){ - CharBuffer overflowbuf = CharBuffer.allocate(2); - cr = decoder.decode(byteBuffer, overflowbuf, isDone); - overflowbuf.flip(); - if(overflowbuf.hasRemaining()) - { - cb.put(overflowbuf.get()); - savedSurrogate = overflowbuf.get(); - hasSavedSurrogate = true; - isDone = false; - } - } + CoderResult cr = decoder.decode(byteBuffer, cb, isDone); + decoder.reset(); + // 1 char remains which is the first half of a surrogate pair. + if(cr.isOverflow() && cb.hasRemaining()){ + CharBuffer overflowbuf = CharBuffer.allocate(2); + cr = decoder.decode(byteBuffer, overflowbuf, isDone); + overflowbuf.flip(); + if(overflowbuf.hasRemaining()) + { + cb.put(overflowbuf.get()); + savedSurrogate = overflowbuf.get(); + hasSavedSurrogate = true; + isDone = false; + } + } - if(byteBuffer.hasRemaining()) { - byteBuffer.compact(); - byteBuffer.flip(); - isDone = false; - } else - byteBuffer = null; + if(byteBuffer.hasRemaining()) { + byteBuffer.compact(); + byteBuffer.flip(); + isDone = false; + } else + byteBuffer = null; - read = cb.position() - startPos; + read = cb.position() - startPos; // Put cached bytes array back if we are finished and the cache // is null or smaller than the used bytes array. @@ -445,7 +445,7 @@ public class InputStreamReader extends Reader } else { - byte[] bytes; + byte[] bytes; // Fetch cached bytes array if available and big enough. synchronized (cacheLock) { @@ -456,8 +456,8 @@ public class InputStreamReader extends Reader bytesCache = null; } - int read = in.read(bytes); - for(int i=0;iLineNumberInputStream that reads from the + * Create a new LineNumberInputStream that reads from the * specified subordinate InputStream * * @param in The subordinate InputStream to read from @@ -147,7 +147,7 @@ public class LineNumberInputStream extends FilterInputStream * functionality. * * @param readlimit The number of bytes that can be read before the - * mark becomes invalid + * mark becomes invalid */ public void mark(int readlimit) { @@ -170,7 +170,7 @@ public class LineNumberInputStream extends FilterInputStream * to be read. * * @return The byte read or -1 if end of stream - * + * * @exception IOException If an error occurs */ public int read() throws IOException @@ -183,17 +183,17 @@ public class LineNumberInputStream extends FilterInputStream if (ch == '\n') if (justReadReturnChar) - { - ch = in.read(); + { + ch = in.read(); justReadReturnChar = false; - } + } else - lineNumber++; + lineNumber++; else if (ch == '\r') { - ch = '\n'; - justReadReturnChar = true; - lineNumber++; + ch = '\n'; + justReadReturnChar = true; + lineNumber++; } else justReadReturnChar = false; @@ -239,11 +239,11 @@ public class LineNumberInputStream extends FilterInputStream final int origOff = off; while (len-- > 0) { - int ch = read(); - if (ch < 0) - break; + int ch = read(); + if (ch < 0) + break; - b[off++] = (byte) ch; + b[off++] = (byte) ch; } // This is safe since we already know that some bytes were @@ -274,7 +274,7 @@ public class LineNumberInputStream extends FilterInputStream /** * This method sets the current line number to the specified value. - * + * * @param lineNumber The new line number */ public void setLineNumber(int lineNumber) @@ -283,7 +283,7 @@ public class LineNumberInputStream extends FilterInputStream } /** - * This method skips up to the requested number of bytes in the + * This method skips up to the requested number of bytes in the * input stream. The actual number of bytes skipped is returned. If the * desired number of bytes to skip is negative, no bytes are skipped. * @@ -302,11 +302,11 @@ public class LineNumberInputStream extends FilterInputStream do { - int ch = read(); - if (ch < 0) - break; - if (ch == '\n' || ch == '\r') - lineNumber++; + int ch = read(); + if (ch < 0) + break; + if (ch == '\n' || ch == '\r') + lineNumber++; } while (--n > 0); diff --git a/libjava/classpath/java/io/LineNumberReader.java b/libjava/classpath/java/io/LineNumberReader.java index 5e263f76111..6ac0b55fefd 100644 --- a/libjava/classpath/java/io/LineNumberReader.java +++ b/libjava/classpath/java/io/LineNumberReader.java @@ -151,22 +151,22 @@ public class LineNumberReader extends BufferedReader synchronized (lock) { - // This is basically the same as BufferedReader.mark. - // However, if the previous character was a '\r', we need to - // save that 'r', in case the next character is a '\n'. - if (pos + readLimit > limit) - { - int saveCR = matchedNewLine ? 1 : 0; - char[] old_buffer = buffer; - if (readLimit > limit) - buffer = new char[saveCR + readLimit]; - int copy_start = pos - saveCR; - savedLineNumber = lineNumber; - limit -= copy_start; - System.arraycopy(old_buffer, copy_start, buffer, 0, limit); - pos = saveCR; - } - markPos = pos; + // This is basically the same as BufferedReader.mark. + // However, if the previous character was a '\r', we need to + // save that 'r', in case the next character is a '\n'. + if (pos + readLimit > limit) + { + int saveCR = matchedNewLine ? 1 : 0; + char[] old_buffer = buffer; + if (readLimit > limit) + buffer = new char[saveCR + readLimit]; + int copy_start = pos - saveCR; + savedLineNumber = lineNumber; + limit -= copy_start; + System.arraycopy(old_buffer, copy_start, buffer, 0, limit); + pos = saveCR; + } + markPos = pos; } } @@ -185,11 +185,11 @@ public class LineNumberReader extends BufferedReader { synchronized (lock) { - if (markPos < 0) - throw new IOException("mark never set or invalidated"); - lineNumber = savedLineNumber; - pos = markPos; - matchedNewLine = (markPos > 0 && buffer[markPos-1] == '\r'); + if (markPos < 0) + throw new IOException("mark never set or invalidated"); + lineNumber = savedLineNumber; + pos = markPos; + matchedNewLine = (markPos > 0 && buffer[markPos-1] == '\r'); } } @@ -237,24 +237,24 @@ public class LineNumberReader extends BufferedReader { synchronized (lock) { - skipRedundantLF(); - if (pos >= limit && fill() < 0) - return -1; - char ch = buffer[pos++]; - - if ((matchedNewLine = (ch == '\r')) || ch == '\n') - { - lineNumber++; - return '\n'; - } - matchedNewLine = false; - return (int) ch; + skipRedundantLF(); + if (pos >= limit && fill() < 0) + return -1; + char ch = buffer[pos++]; + + if ((matchedNewLine = (ch == '\r')) || ch == '\n') + { + lineNumber++; + return '\n'; + } + matchedNewLine = false; + return (int) ch; } } /** * This method reads chars from a stream and stores them into a caller - * supplied buffer. It starts storing data at index offset into + * supplied buffer. It starts storing data at index offset into * the buffer and attemps to read len chars. This method can * return before reading the number of chars requested. The actual number * of chars read is returned as an int. A -1 is returned to indicated the @@ -288,37 +288,37 @@ public class LineNumberReader extends BufferedReader if (count <= 0) { - if (count < 0) - throw new IndexOutOfBoundsException(); - return 0; + if (count < 0) + throw new IndexOutOfBoundsException(); + return 0; } synchronized (lock) { - if (pos >= limit && fill() < 0) - return -1; - - int start_offset = offset; - boolean matched = matchedNewLine; - - while (count-- > 0 && pos < limit) - { - char ch = buffer[pos++]; - if (ch == '\r') - { - lineNumber++; - matched = true; - } - else if (ch == '\n' && !matched) - lineNumber++; - else - matched = false; + if (pos >= limit && fill() < 0) + return -1; - buf[offset++] = ch; - } + int start_offset = offset; + boolean matched = matchedNewLine; - matchedNewLine = matched; - return offset - start_offset; + while (count-- > 0 && pos < limit) + { + char ch = buffer[pos++]; + if (ch == '\r') + { + lineNumber++; + matched = true; + } + else if (ch == '\n' && !matched) + lineNumber++; + else + matched = false; + + buf[offset++] = ch; + } + + matchedNewLine = matched; + return offset - start_offset; } } @@ -326,20 +326,20 @@ public class LineNumberReader extends BufferedReader { if (pos > 0 && matchedNewLine) { - if (pos < limit) - { // fast case - if (buffer[pos] == '\n') - pos++; - } - else - { // check whether the next buffer begins with '\n'. - // in that case kill the '\n'. - if (fill() <= 0) - return; - if (buffer[pos] == '\n') - pos++; - } - matchedNewLine = true; + if (pos < limit) + { // fast case + if (buffer[pos] == '\n') + pos++; + } + else + { // check whether the next buffer begins with '\n'. + // in that case kill the '\n'. + if (fill() <= 0) + return; + if (buffer[pos] == '\n') + pos++; + } + matchedNewLine = true; } } @@ -414,4 +414,3 @@ public class LineNumberReader extends BufferedReader return skipped; } } - diff --git a/libjava/classpath/java/io/ObjectInput.java b/libjava/classpath/java/io/ObjectInput.java index 175b60f9dc0..f8d51e00d07 100644 --- a/libjava/classpath/java/io/ObjectInput.java +++ b/libjava/classpath/java/io/ObjectInput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -36,7 +36,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package java.io; +package java.io; /** * This interface extends the DataInput interface to provide a @@ -62,9 +62,9 @@ public interface ObjectInput extends DataInput /** * This method reading a byte of data from a stream. It returns that byte - * as an int. This method blocks if no data is available + * as an int. This method blocks if no data is available * to be read. - * + * * @return The byte of data read * * @exception IOException If an error occurs @@ -73,7 +73,7 @@ public interface ObjectInput extends DataInput /** * This method reads raw bytes and stores them them a byte array buffer. - * Note that this method will block if no data is available. However, + * Note that this method will block if no data is available. However, * it will not necessarily block until it fills the entire buffer. That is, * a "short count" is possible. * @@ -87,8 +87,8 @@ public interface ObjectInput extends DataInput /** * This method reads raw bytes and stores them in a byte array buffer - * buf starting at position offset into the - * buffer. A + * buf starting at position offset into the + * buffer. A * maximum of len bytes will be read. Note that this method * blocks if no data is available, but will not necessarily block until * it can read len bytes of data. That is, a "short count" is @@ -111,11 +111,11 @@ public interface ObjectInput extends DataInput * * @return The object instance that was read * - * @exception ClassNotFoundException If a class for the object cannot be + * @exception ClassNotFoundException If a class for the object cannot be * found * @exception IOException If any other error occurs */ - Object readObject() + Object readObject() throws ClassNotFoundException, IOException; /** diff --git a/libjava/classpath/java/io/ObjectInputStream.java b/libjava/classpath/java/io/ObjectInputStream.java index 6b2a65133d8..c37f7665f1c 100644 --- a/libjava/classpath/java/io/ObjectInputStream.java +++ b/libjava/classpath/java/io/ObjectInputStream.java @@ -86,17 +86,17 @@ public class ObjectInputStream extends InputStream { if (DEBUG) { - String val = System.getProperty("gcj.dumpobjects"); - if (dump == false && val != null && !val.equals("")) - { - dump = true; - System.out.println ("Serialization debugging enabled"); - } - else if (dump == true && (val == null || val.equals(""))) - { - dump = false; - System.out.println ("Serialization debugging disabled"); - } + String val = System.getProperty("gcj.dumpobjects"); + if (dump == false && val != null && !val.equals("")) + { + dump = true; + System.out.println ("Serialization debugging enabled"); + } + else if (dump == true && (val == null || val.equals(""))) + { + dump = false; + System.out.println ("Serialization debugging disabled"); + } } this.resolveEnabled = false; @@ -120,9 +120,9 @@ public class ObjectInputStream extends InputStream * private void readObject (ObjectInputStream). * * If an exception is thrown from this method, the stream is left in - * an undefined state. This method can also throw Errors and + * an undefined state. This method can also throw Errors and * RuntimeExceptions if caused by existing readResolve() user code. - * + * * @return The object read from the underlying stream. * * @exception ClassNotFoundException The class that an object being @@ -182,9 +182,9 @@ public class ObjectInputStream extends InputStream * private void readObject (ObjectInputStream). * * If an exception is thrown from this method, the stream is left in - * an undefined state. This method can also throw Errors and + * an undefined state. This method can also throw Errors and * RuntimeExceptions if caused by existing readResolve() user code. - * + * * @param shared true if handles created by this call should be shared * with later calls. * @return The object read from the underlying stream. @@ -212,15 +212,15 @@ public class ObjectInputStream extends InputStream try { - ret_val = parseContent(marker, shared); + ret_val = parseContent(marker, shared); } finally { - setBlockDataMode(old_mode); - if (DEBUG) - depth -= 2; + setBlockDataMode(old_mode); + if (DEBUG) + depth -= 2; } - + return ret_val; } @@ -246,75 +246,75 @@ public class ObjectInputStream extends InputStream switch (marker) { case TC_ENDBLOCKDATA: - { - ret_val = null; - is_consumed = true; - break; - } - + { + ret_val = null; + is_consumed = true; + break; + } + case TC_BLOCKDATA: case TC_BLOCKDATALONG: - { - if (marker == TC_BLOCKDATALONG) - { if(dump) dumpElementln("BLOCKDATALONG"); } - else - { if(dump) dumpElementln("BLOCKDATA"); } - readNextBlock(marker); - } - + { + if (marker == TC_BLOCKDATALONG) + { if(dump) dumpElementln("BLOCKDATALONG"); } + else + { if(dump) dumpElementln("BLOCKDATA"); } + readNextBlock(marker); + } + case TC_NULL: - { - if(dump) dumpElementln("NULL"); - ret_val = null; - break; - } - + { + if(dump) dumpElementln("NULL"); + ret_val = null; + break; + } + case TC_REFERENCE: - { - if(dump) dumpElement("REFERENCE "); - int oid = realInputStream.readInt(); - if(dump) dumpElementln(Integer.toHexString(oid)); - ret_val = lookupHandle(oid); - if (!shared) - throw new - InvalidObjectException("References can not be read unshared."); - break; - } - + { + if(dump) dumpElement("REFERENCE "); + int oid = realInputStream.readInt(); + if(dump) dumpElementln(Integer.toHexString(oid)); + ret_val = lookupHandle(oid); + if (!shared) + throw new + InvalidObjectException("References can not be read unshared."); + break; + } + case TC_CLASS: - { - if(dump) dumpElementln("CLASS"); - ObjectStreamClass osc = (ObjectStreamClass)readObject(); - Class clazz = osc.forClass(); - assignNewHandle(clazz,shared); - ret_val = clazz; - break; - } - + { + if(dump) dumpElementln("CLASS"); + ObjectStreamClass osc = (ObjectStreamClass)readObject(); + Class clazz = osc.forClass(); + assignNewHandle(clazz,shared); + ret_val = clazz; + break; + } + case TC_PROXYCLASSDESC: - { - if(dump) dumpElementln("PROXYCLASS"); + { + if(dump) dumpElementln("PROXYCLASS"); /* GCJ LOCAL */ - // The grammar at this point is - // TC_PROXYCLASSDESC newHandle proxyClassDescInfo - // i.e. we have to assign the handle immediately after - // reading the marker. - int handle = assignNewHandle("Dummy proxy",shared); + // The grammar at this point is + // TC_PROXYCLASSDESC newHandle proxyClassDescInfo + // i.e. we have to assign the handle immediately after + // reading the marker. + int handle = assignNewHandle("Dummy proxy",shared); /* END GCJ LOCAL */ - int n_intf = this.realInputStream.readInt(); - String[] intfs = new String[n_intf]; - for (int i = 0; i < n_intf; i++) - { - intfs[i] = this.realInputStream.readUTF(); - } - - boolean oldmode = setBlockDataMode(true); - Class cl = resolveProxyClass(intfs); - setBlockDataMode(oldmode); - - ObjectStreamClass osc = lookupClass(cl); + int n_intf = this.realInputStream.readInt(); + String[] intfs = new String[n_intf]; + for (int i = 0; i < n_intf; i++) + { + intfs[i] = this.realInputStream.readUTF(); + } + + boolean oldmode = setBlockDataMode(true); + Class cl = resolveProxyClass(intfs); + setBlockDataMode(oldmode); + + ObjectStreamClass osc = lookupClass(cl); if (osc.firstNonSerializableParentConstructor == null) { osc.realClassIsSerializable = true; @@ -331,216 +331,216 @@ public class ObjectInputStream extends InputStream } } /* GCJ LOCAL */ - rememberHandle(osc,shared,handle); + rememberHandle(osc,shared,handle); /* END GCJ LOCAL */ - - if (!is_consumed) - { - byte b = this.realInputStream.readByte(); - if (b != TC_ENDBLOCKDATA) - throw new IOException("Data annotated to class was not consumed." + b); - } - else - is_consumed = false; - ObjectStreamClass superosc = (ObjectStreamClass)readObject(); - osc.setSuperclass(superosc); - ret_val = osc; - break; - } - + + if (!is_consumed) + { + byte b = this.realInputStream.readByte(); + if (b != TC_ENDBLOCKDATA) + throw new IOException("Data annotated to class was not consumed." + b); + } + else + is_consumed = false; + ObjectStreamClass superosc = (ObjectStreamClass)readObject(); + osc.setSuperclass(superosc); + ret_val = osc; + break; + } + case TC_CLASSDESC: - { - ObjectStreamClass osc = readClassDescriptor(); - - if (!is_consumed) - { - byte b = this.realInputStream.readByte(); - if (b != TC_ENDBLOCKDATA) - throw new IOException("Data annotated to class was not consumed." + b); - } - else - is_consumed = false; - - osc.setSuperclass ((ObjectStreamClass)readObject()); - ret_val = osc; - break; - } - + { + ObjectStreamClass osc = readClassDescriptor(); + + if (!is_consumed) + { + byte b = this.realInputStream.readByte(); + if (b != TC_ENDBLOCKDATA) + throw new IOException("Data annotated to class was not consumed." + b); + } + else + is_consumed = false; + + osc.setSuperclass ((ObjectStreamClass)readObject()); + ret_val = osc; + break; + } + case TC_STRING: - { - if(dump) dumpElement("STRING="); - String s = this.realInputStream.readUTF(); - if(dump) dumpElementln(s); - ret_val = processResolution(null, s, assignNewHandle(s,shared), - shared); - break; - } - + { + if(dump) dumpElement("STRING="); + String s = this.realInputStream.readUTF(); + if(dump) dumpElementln(s); + ret_val = processResolution(null, s, assignNewHandle(s,shared), + shared); + break; + } + case TC_LONGSTRING: - { - if(dump) dumpElement("STRING="); - String s = this.realInputStream.readUTFLong(); - if(dump) dumpElementln(s); - ret_val = processResolution(null, s, assignNewHandle(s,shared), - shared); - break; - } + { + if(dump) dumpElement("STRING="); + String s = this.realInputStream.readUTFLong(); + if(dump) dumpElementln(s); + ret_val = processResolution(null, s, assignNewHandle(s,shared), + shared); + break; + } case TC_ARRAY: - { - if(dump) dumpElementln("ARRAY"); - ObjectStreamClass osc = (ObjectStreamClass)readObject(); - Class componentType = osc.forClass().getComponentType(); - if(dump) dumpElement("ARRAY LENGTH="); - int length = this.realInputStream.readInt(); - if(dump) dumpElementln (length + "; COMPONENT TYPE=" + componentType); - Object array = Array.newInstance(componentType, length); - int handle = assignNewHandle(array,shared); - readArrayElements(array, componentType); - if(dump) - for (int i = 0, len = Array.getLength(array); i < len; i++) - dumpElementln(" ELEMENT[" + i + "]=", Array.get(array, i)); - ret_val = processResolution(null, array, handle, shared); - break; - } - + { + if(dump) dumpElementln("ARRAY"); + ObjectStreamClass osc = (ObjectStreamClass)readObject(); + Class componentType = osc.forClass().getComponentType(); + if(dump) dumpElement("ARRAY LENGTH="); + int length = this.realInputStream.readInt(); + if(dump) dumpElementln (length + "; COMPONENT TYPE=" + componentType); + Object array = Array.newInstance(componentType, length); + int handle = assignNewHandle(array,shared); + readArrayElements(array, componentType); + if(dump) + for (int i = 0, len = Array.getLength(array); i < len; i++) + dumpElementln(" ELEMENT[" + i + "]=", Array.get(array, i)); + ret_val = processResolution(null, array, handle, shared); + break; + } + case TC_OBJECT: - { - if(dump) dumpElementln("OBJECT"); - ObjectStreamClass osc = (ObjectStreamClass)readObject(); - Class clazz = osc.forClass(); - - if (!osc.realClassIsSerializable) - throw new NotSerializableException - (clazz + " is not Serializable, and thus cannot be deserialized."); - - if (osc.realClassIsExternalizable) - { - Externalizable obj = osc.newInstance(); - - int handle = assignNewHandle(obj,shared); - - boolean read_from_blocks = ((osc.getFlags() & SC_BLOCK_DATA) != 0); - - boolean oldmode = this.readDataFromBlock; - if (read_from_blocks) - setBlockDataMode(true); - - obj.readExternal(this); - - if (read_from_blocks) + { + if(dump) dumpElementln("OBJECT"); + ObjectStreamClass osc = (ObjectStreamClass)readObject(); + Class clazz = osc.forClass(); + + if (!osc.realClassIsSerializable) + throw new NotSerializableException + (clazz + " is not Serializable, and thus cannot be deserialized."); + + if (osc.realClassIsExternalizable) + { + Externalizable obj = osc.newInstance(); + + int handle = assignNewHandle(obj,shared); + + boolean read_from_blocks = ((osc.getFlags() & SC_BLOCK_DATA) != 0); + + boolean oldmode = this.readDataFromBlock; + if (read_from_blocks) + setBlockDataMode(true); + + obj.readExternal(this); + + if (read_from_blocks) { - setBlockDataMode(oldmode); - if (!oldmode) - if (this.realInputStream.readByte() != TC_ENDBLOCKDATA) - throw new IOException("No end of block data seen for class with readExternal (ObjectInputStream) method."); - } + setBlockDataMode(oldmode); + if (!oldmode) + if (this.realInputStream.readByte() != TC_ENDBLOCKDATA) + throw new IOException("No end of block data seen for class with readExternal (ObjectInputStream) method."); + } - ret_val = processResolution(osc, obj, handle,shared); + ret_val = processResolution(osc, obj, handle,shared); break; - - } // end if (osc.realClassIsExternalizable) - - Object obj = newObject(clazz, osc.firstNonSerializableParentConstructor); - - int handle = assignNewHandle(obj,shared); - Object prevObject = this.currentObject; - ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass; - TreeSet prevObjectValidators = - this.currentObjectValidators; - - this.currentObject = obj; - this.currentObjectValidators = null; - ObjectStreamClass[] hierarchy = hierarchy(clazz); - - for (int i = 0; i < hierarchy.length; i++) - { - this.currentObjectStreamClass = hierarchy[i]; - if(dump) dumpElementln("Reading fields of " + this.currentObjectStreamClass.getName ()); - - // XXX: should initialize fields in classes in the hierarchy - // that aren't in the stream - // should skip over classes in the stream that aren't in the - // real classes hierarchy - - Method readObjectMethod = this.currentObjectStreamClass.readObjectMethod; - if (readObjectMethod != null) - { - fieldsAlreadyRead = false; - boolean oldmode = setBlockDataMode(true); - callReadMethod(readObjectMethod, this.currentObjectStreamClass.forClass(), obj); - setBlockDataMode(oldmode); - } - else - { - readFields(obj, currentObjectStreamClass); - } - - if (this.currentObjectStreamClass.hasWriteMethod()) - { - if(dump) dumpElement("ENDBLOCKDATA? "); - try - { - /* Read blocks until an end marker */ - byte writeMarker = this.realInputStream.readByte(); - while (writeMarker != TC_ENDBLOCKDATA) - { - parseContent(writeMarker, shared); - writeMarker = this.realInputStream.readByte(); - } - if(dump) dumpElementln("yes"); - } - catch (EOFException e) - { - throw (IOException) new IOException - ("No end of block data seen for class with readObject (ObjectInputStream) method.").initCause(e); - } - } - } - - this.currentObject = prevObject; - this.currentObjectStreamClass = prevObjectStreamClass; - ret_val = processResolution(osc, obj, handle, shared); - if (currentObjectValidators != null) - invokeValidators(); - this.currentObjectValidators = prevObjectValidators; - break; - } - + } // end if (osc.realClassIsExternalizable) + + Object obj = newObject(clazz, osc.firstNonSerializableParentConstructor); + + int handle = assignNewHandle(obj,shared); + Object prevObject = this.currentObject; + ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass; + TreeSet prevObjectValidators = + this.currentObjectValidators; + + this.currentObject = obj; + this.currentObjectValidators = null; + ObjectStreamClass[] hierarchy = hierarchy(clazz); + + for (int i = 0; i < hierarchy.length; i++) + { + this.currentObjectStreamClass = hierarchy[i]; + if(dump) dumpElementln("Reading fields of " + this.currentObjectStreamClass.getName ()); + + // XXX: should initialize fields in classes in the hierarchy + // that aren't in the stream + // should skip over classes in the stream that aren't in the + // real classes hierarchy + + Method readObjectMethod = this.currentObjectStreamClass.readObjectMethod; + if (readObjectMethod != null) + { + fieldsAlreadyRead = false; + boolean oldmode = setBlockDataMode(true); + callReadMethod(readObjectMethod, this.currentObjectStreamClass.forClass(), obj); + setBlockDataMode(oldmode); + } + else + { + readFields(obj, currentObjectStreamClass); + } + + if (this.currentObjectStreamClass.hasWriteMethod()) + { + if(dump) dumpElement("ENDBLOCKDATA? "); + try + { + /* Read blocks until an end marker */ + byte writeMarker = this.realInputStream.readByte(); + while (writeMarker != TC_ENDBLOCKDATA) + { + parseContent(writeMarker, shared); + writeMarker = this.realInputStream.readByte(); + } + if(dump) dumpElementln("yes"); + } + catch (EOFException e) + { + throw (IOException) new IOException + ("No end of block data seen for class with readObject (ObjectInputStream) method.").initCause(e); + } + } + } + + this.currentObject = prevObject; + this.currentObjectStreamClass = prevObjectStreamClass; + ret_val = processResolution(osc, obj, handle, shared); + if (currentObjectValidators != null) + invokeValidators(); + this.currentObjectValidators = prevObjectValidators; + + break; + } + case TC_RESET: - if(dump) dumpElementln("RESET"); - clearHandles(); - ret_val = readObject(); - break; - + if(dump) dumpElementln("RESET"); + clearHandles(); + ret_val = readObject(); + break; + case TC_EXCEPTION: - { - if(dump) dumpElement("EXCEPTION="); - Exception e = (Exception)readObject(); - if(dump) dumpElementln(e.toString()); - clearHandles(); - throw new WriteAbortedException("Exception thrown during writing of stream", e); - } + { + if(dump) dumpElement("EXCEPTION="); + Exception e = (Exception)readObject(); + if(dump) dumpElementln(e.toString()); + clearHandles(); + throw new WriteAbortedException("Exception thrown during writing of stream", e); + } case TC_ENUM: - { - /* TC_ENUM classDesc newHandle enumConstantName */ - if (dump) - dumpElementln("ENUM="); - ObjectStreamClass osc = (ObjectStreamClass) readObject(); - String constantName = (String) readObject(); - if (dump) - dumpElementln("CONSTANT NAME = " + constantName); - Class clazz = osc.forClass(); - Enum instance = Enum.valueOf(clazz, constantName); - assignNewHandle(instance,shared); - ret_val = instance; - break; - } + { + /* TC_ENUM classDesc newHandle enumConstantName */ + if (dump) + dumpElementln("ENUM="); + ObjectStreamClass osc = (ObjectStreamClass) readObject(); + String constantName = (String) readObject(); + if (dump) + dumpElementln("CONSTANT NAME = " + constantName); + Class clazz = osc.forClass(); + Enum instance = Enum.valueOf(clazz, constantName); + assignNewHandle(instance,shared); + ret_val = instance; + break; + } default: - throw new IOException("Unknown marker on stream: " + marker); + throw new IOException("Unknown marker on stream: " + marker); } return ret_val; } @@ -548,8 +548,8 @@ public class ObjectInputStream extends InputStream /** * This method makes a partial check of types for the fields * contained given in arguments. It checks primitive types of - * fields1 against non primitive types of fields2. This method - * assumes the two lists has already been sorted according to + * fields1 against non primitive types of fields2. This method + * assumes the two lists has already been sorted according to * the Java specification. * * @param name Name of the class owning the given fields. @@ -562,45 +562,45 @@ public class ObjectInputStream extends InputStream throws InvalidClassException { int nonPrimitive = 0; - - for (nonPrimitive = 0; - nonPrimitive < fields1.length - && fields1[nonPrimitive].isPrimitive(); nonPrimitive++) + + for (nonPrimitive = 0; + nonPrimitive < fields1.length + && fields1[nonPrimitive].isPrimitive(); nonPrimitive++) { } if (nonPrimitive == fields1.length) return; - + int i = 0; ObjectStreamField f1; ObjectStreamField f2; - + while (i < fields2.length - && nonPrimitive < fields1.length) + && nonPrimitive < fields1.length) { - f1 = fields1[nonPrimitive]; - f2 = fields2[i]; - - if (!f2.isPrimitive()) - break; + f1 = fields1[nonPrimitive]; + f2 = fields2[i]; - int compVal = f1.getName().compareTo (f2.getName()); + if (!f2.isPrimitive()) + break; - if (compVal < 0) - { - nonPrimitive++; - } - else if (compVal > 0) - { - i++; - } - else - { - throw new InvalidClassException - ("invalid field type for " + f2.getName() + - " in class " + name); - } + int compVal = f1.getName().compareTo (f2.getName()); + + if (compVal < 0) + { + nonPrimitive++; + } + else if (compVal > 0) + { + i++; + } + else + { + throw new InvalidClassException + ("invalid field type for " + f2.getName() + + " in class " + name); + } } } @@ -634,31 +634,31 @@ public class ObjectInputStream extends InputStream if(dump) dumpElementln(Short.toString(field_count)); ObjectStreamField[] fields = new ObjectStreamField[field_count]; ObjectStreamClass osc = new ObjectStreamClass(name, uid, - flags, fields); + flags, fields); assignNewHandle(osc,true); for (int i = 0; i < field_count; i++) { - if(dump) dumpElement(" TYPE CODE="); - char type_code = (char)this.realInputStream.readByte(); - if(dump) dumpElement(type_code + "; FIELD NAME="); - String field_name = this.realInputStream.readUTF(); - if(dump) dumpElementln(field_name); - String class_name; - - // If the type code is an array or an object we must - // decode a String here. In the other case we convert - // the type code and pass it to ObjectStreamField. - // Type codes are decoded by gnu.java.lang.reflect.TypeSignature. - if (type_code == 'L' || type_code == '[') - class_name = (String)readObject(); - else - class_name = String.valueOf(type_code); - - fields[i] = - new ObjectStreamField(field_name, class_name); + if(dump) dumpElement(" TYPE CODE="); + char type_code = (char)this.realInputStream.readByte(); + if(dump) dumpElement(type_code + "; FIELD NAME="); + String field_name = this.realInputStream.readUTF(); + if(dump) dumpElementln(field_name); + String class_name; + + // If the type code is an array or an object we must + // decode a String here. In the other case we convert + // the type code and pass it to ObjectStreamField. + // Type codes are decoded by gnu.java.lang.reflect.TypeSignature. + if (type_code == 'L' || type_code == '[') + class_name = (String)readObject(); + else + class_name = String.valueOf(type_code); + + fields[i] = + new ObjectStreamField(field_name, class_name); } - + /* Now that fields have been read we may resolve the class * (and read annotation if needed). */ Class clazz = resolveClass(osc); @@ -721,63 +721,63 @@ public class ObjectInputStream extends InputStream /* * Check that there is no type inconsistencies between the lists. * A special checking must be done for the two groups: primitive types and - * not primitive types. + * not primitive types. */ checkTypeConsistency(name, real_fields, stream_fields); checkTypeConsistency(name, stream_fields, real_fields); - + while (stream_idx < stream_fields.length - || real_idx < real_fields.length) + || real_idx < real_fields.length) { - ObjectStreamField stream_field = null; - ObjectStreamField real_field = null; + ObjectStreamField stream_field = null; + ObjectStreamField real_field = null; - if (stream_idx == stream_fields.length) - { - real_field = real_fields[real_idx++]; - } - else if (real_idx == real_fields.length) - { - stream_field = stream_fields[stream_idx++]; - } - else - { - int comp_val = - real_fields[real_idx].compareTo (stream_fields[stream_idx]); + if (stream_idx == stream_fields.length) + { + real_field = real_fields[real_idx++]; + } + else if (real_idx == real_fields.length) + { + stream_field = stream_fields[stream_idx++]; + } + else + { + int comp_val = + real_fields[real_idx].compareTo (stream_fields[stream_idx]); - if (comp_val < 0) - { - real_field = real_fields[real_idx++]; - } - else if (comp_val > 0) - { - stream_field = stream_fields[stream_idx++]; - } - else - { - stream_field = stream_fields[stream_idx++]; - real_field = real_fields[real_idx++]; - if (stream_field.getType() != real_field.getType()) - throw new InvalidClassException - ("invalid field type for " + real_field.getName() + - " in class " + name); - } - } + if (comp_val < 0) + { + real_field = real_fields[real_idx++]; + } + else if (comp_val > 0) + { + stream_field = stream_fields[stream_idx++]; + } + else + { + stream_field = stream_fields[stream_idx++]; + real_field = real_fields[real_idx++]; + if (stream_field.getType() != real_field.getType()) + throw new InvalidClassException + ("invalid field type for " + real_field.getName() + + " in class " + name); + } + } - /* If some of stream_fields does not correspond to any of real_fields, - * or the opposite, then fieldmapping will go short. - */ - if (map_idx == fieldmapping.length) - { - ObjectStreamField[] newfieldmapping = - new ObjectStreamField[fieldmapping.length + 2]; - System.arraycopy(fieldmapping, 0, - newfieldmapping, 0, fieldmapping.length); - fieldmapping = newfieldmapping; - } - fieldmapping[map_idx++] = stream_field; - fieldmapping[map_idx++] = real_field; + /* If some of stream_fields does not correspond to any of real_fields, + * or the opposite, then fieldmapping will go short. + */ + if (map_idx == fieldmapping.length) + { + ObjectStreamField[] newfieldmapping = + new ObjectStreamField[fieldmapping.length + 2]; + System.arraycopy(fieldmapping, 0, + newfieldmapping, 0, fieldmapping.length); + fieldmapping = newfieldmapping; + } + fieldmapping[map_idx++] = stream_field; + fieldmapping[map_idx++] = real_field; } osc.fieldMapping = fieldmapping; @@ -808,12 +808,12 @@ public class ObjectInputStream extends InputStream { if (this.currentObject == null || this.currentObjectStreamClass == null) throw new NotActiveException("defaultReadObject called by non-active" - + " class and/or object"); + + " class and/or object"); if (fieldsAlreadyRead) throw new NotActiveException("defaultReadObject called but fields " - + "already read from stream (by " - + "defaultReadObject or readFields)"); + + "already read from stream (by " + + "defaultReadObject or readFields)"); boolean oldmode = setBlockDataMode(false); readFields(this.currentObject, this.currentObjectStreamClass); @@ -842,20 +842,20 @@ public class ObjectInputStream extends InputStream * object currently being deserialized */ public void registerValidation(ObjectInputValidation validator, - int priority) + int priority) throws InvalidObjectException, NotActiveException { if (this.currentObject == null || this.currentObjectStreamClass == null) throw new NotActiveException("registerValidation called by non-active " - + "class and/or object"); + + "class and/or object"); if (validator == null) throw new InvalidObjectException("attempt to add a null " - + "ObjectInputValidation object"); + + "ObjectInputValidation object"); if (currentObjectValidators == null) currentObjectValidators = new TreeSet(); - + currentObjectValidators.add(new ValidatorAndPriority(validator, priority)); } @@ -953,10 +953,10 @@ public class ObjectInputStream extends InputStream * represent the class hierarchy for clazz. */ private ObjectStreamClass[] hierarchy(Class clazz) - { + { ObjectStreamClass osc = lookupClass(clazz); - return osc == null ? new ObjectStreamClass[0] : osc.hierarchy(); + return osc == null ? new ObjectStreamClass[0] : osc.hierarchy(); } /** @@ -982,27 +982,27 @@ public class ObjectInputStream extends InputStream throws IOException, ClassNotFoundException { ClassLoader cl = currentLoader(); - + Class[] clss = new Class[intfs.length]; if(cl == null) { - for (int i = 0; i < intfs.length; i++) - clss[i] = Class.forName(intfs[i]); - cl = ClassLoader.getSystemClassLoader(); + for (int i = 0; i < intfs.length; i++) + clss[i] = Class.forName(intfs[i]); + cl = ClassLoader.getSystemClassLoader(); } else for (int i = 0; i < intfs.length; i++) - clss[i] = Class.forName(intfs[i], false, cl); - try + clss[i] = Class.forName(intfs[i], false, cl); + try { - return Proxy.getProxyClass(cl, clss); - } - catch (IllegalArgumentException e) + return Proxy.getProxyClass(cl, clss); + } + catch (IllegalArgumentException e) { - throw new ClassNotFoundException(null, e); + throw new ClassNotFoundException(null, e); } } - + /** * If enable is true and this object is * trusted, then resolveObject (Object) will be called @@ -1016,9 +1016,9 @@ public class ObjectInputStream extends InputStream { if (enable) { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkPermission(new SerializablePermission("enableSubstitution")); + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new SerializablePermission("enableSubstitution")); } boolean old_val = this.resolveEnabled; @@ -1051,9 +1051,9 @@ public class ObjectInputStream extends InputStream { if (this.readDataFromBlock) { - if (this.blockDataPosition >= this.blockDataBytes) - readNextBlock(); - return (this.blockData[this.blockDataPosition++] & 0xff); + if (this.blockDataPosition >= this.blockDataBytes) + readNextBlock(); + return (this.blockData[this.blockDataPosition++] & 0xff); } else return this.realInputStream.read(); @@ -1070,11 +1070,11 @@ public class ObjectInputStream extends InputStream remain = this.blockDataBytes - this.blockDataPosition; } length = Math.min(length, remain); - System.arraycopy(this.blockData, this.blockDataPosition, - data, offset, length); - this.blockDataPosition += length; + System.arraycopy(this.blockData, this.blockDataPosition, + data, offset, length); + this.blockDataPosition += length; - return length; + return length; } else return this.realInputStream.read(data, offset, length); @@ -1084,10 +1084,10 @@ public class ObjectInputStream extends InputStream { if (this.readDataFromBlock) { - if (this.blockDataPosition >= this.blockDataBytes) - readNextBlock (); + if (this.blockDataPosition >= this.blockDataBytes) + readNextBlock (); - return this.blockDataBytes - this.blockDataPosition; + return this.blockDataBytes - this.blockDataPosition; } else return this.realInputStream.available(); @@ -1318,8 +1318,8 @@ public class ObjectInputStream extends InputStream * * @return A valid freshly created 'GetField' instance to get access to * the deserialized stream. - * @throws IOException An input/output exception occured. - * @throws ClassNotFoundException + * @throws IOException An input/output exception occured. + * @throws ClassNotFoundException * @throws NotActiveException */ public GetField readFields() @@ -1333,7 +1333,7 @@ public class ObjectInputStream extends InputStream if (fieldsAlreadyRead) throw new NotActiveException("readFields called but fields already read from" - + " stream (by defaultReadObject or readFields)"); + + " stream (by defaultReadObject or readFields)"); final ObjectStreamClass clazz = this.currentObjectStreamClass; final byte[] prim_field_data = new byte[clazz.primFieldSize]; @@ -1350,247 +1350,247 @@ public class ObjectInputStream extends InputStream prereadFields = new GetField() { - public ObjectStreamClass getObjectStreamClass() - { - return clazz; - } + public ObjectStreamClass getObjectStreamClass() + { + return clazz; + } - public boolean defaulted(String name) - throws IOException, IllegalArgumentException - { - ObjectStreamField f = clazz.getField(name); - - /* First if we have a serialized field use the descriptor */ - if (f != null) - { - /* It is in serialPersistentFields but setClass tells us - * it should not be set. This value is defaulted. - */ - if (f.isPersistent() && !f.isToSet()) - return true; - - return false; - } + public boolean defaulted(String name) + throws IOException, IllegalArgumentException + { + ObjectStreamField f = clazz.getField(name); - /* This is not a serialized field. There should be - * a default value only if the field really exists. - */ - try - { - return (clazz.forClass().getDeclaredField (name) != null); - } - catch (NoSuchFieldException e) - { - throw new IllegalArgumentException(e); - } - } + /* First if we have a serialized field use the descriptor */ + if (f != null) + { + /* It is in serialPersistentFields but setClass tells us + * it should not be set. This value is defaulted. + */ + if (f.isPersistent() && !f.isToSet()) + return true; - public boolean get(String name, boolean defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Boolean.TYPE); + return false; + } - if (field == null) - return defvalue; + /* This is not a serialized field. There should be + * a default value only if the field really exists. + */ + try + { + return (clazz.forClass().getDeclaredField (name) != null); + } + catch (NoSuchFieldException e) + { + throw new IllegalArgumentException(e); + } + } - return prim_field_data[field.getOffset()] == 0 ? false : true; - } + public boolean get(String name, boolean defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Boolean.TYPE); - public char get(String name, char defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Character.TYPE); + if (field == null) + return defvalue; - if (field == null) - return defvalue; + return prim_field_data[field.getOffset()] == 0 ? false : true; + } - int off = field.getOffset(); + public char get(String name, char defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Character.TYPE); - return (char)(((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF)); - } + if (field == null) + return defvalue; - public byte get(String name, byte defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Byte.TYPE); + int off = field.getOffset(); - if (field == null) - return defvalue; + return (char)(((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF)); + } - return prim_field_data[field.getOffset()]; - } + public byte get(String name, byte defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Byte.TYPE); - public short get(String name, short defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Short.TYPE); + if (field == null) + return defvalue; - if (field == null) - return defvalue; + return prim_field_data[field.getOffset()]; + } - int off = field.getOffset(); + public short get(String name, short defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Short.TYPE); - return (short)(((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF)); - } + if (field == null) + return defvalue; - public int get(String name, int defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Integer.TYPE); + int off = field.getOffset(); - if (field == null) - return defvalue; + return (short)(((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF)); + } - int off = field.getOffset(); + public int get(String name, int defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Integer.TYPE); - return ((prim_field_data[off++] & 0xFF) << 24) - | ((prim_field_data[off++] & 0xFF) << 16) - | ((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF); - } + if (field == null) + return defvalue; - public long get(String name, long defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Long.TYPE); + int off = field.getOffset(); - if (field == null) - return defvalue; + return ((prim_field_data[off++] & 0xFF) << 24) + | ((prim_field_data[off++] & 0xFF) << 16) + | ((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF); + } - int off = field.getOffset(); + public long get(String name, long defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Long.TYPE); - return (long)(((prim_field_data[off++] & 0xFFL) << 56) - | ((prim_field_data[off++] & 0xFFL) << 48) - | ((prim_field_data[off++] & 0xFFL) << 40) - | ((prim_field_data[off++] & 0xFFL) << 32) - | ((prim_field_data[off++] & 0xFF) << 24) - | ((prim_field_data[off++] & 0xFF) << 16) - | ((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF)); - } + if (field == null) + return defvalue; - public float get(String name, float defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Float.TYPE); + int off = field.getOffset(); - if (field == null) - return defvalue; + return (long)(((prim_field_data[off++] & 0xFFL) << 56) + | ((prim_field_data[off++] & 0xFFL) << 48) + | ((prim_field_data[off++] & 0xFFL) << 40) + | ((prim_field_data[off++] & 0xFFL) << 32) + | ((prim_field_data[off++] & 0xFF) << 24) + | ((prim_field_data[off++] & 0xFF) << 16) + | ((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF)); + } - int off = field.getOffset(); + public float get(String name, float defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Float.TYPE); - return Float.intBitsToFloat(((prim_field_data[off++] & 0xFF) << 24) - | ((prim_field_data[off++] & 0xFF) << 16) - | ((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF)); - } + if (field == null) + return defvalue; - public double get(String name, double defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = getField(name, Double.TYPE); + int off = field.getOffset(); - if (field == null) - return defvalue; + return Float.intBitsToFloat(((prim_field_data[off++] & 0xFF) << 24) + | ((prim_field_data[off++] & 0xFF) << 16) + | ((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF)); + } - int off = field.getOffset(); + public double get(String name, double defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = getField(name, Double.TYPE); - return Double.longBitsToDouble - ( (long) (((prim_field_data[off++] & 0xFFL) << 56) - | ((prim_field_data[off++] & 0xFFL) << 48) - | ((prim_field_data[off++] & 0xFFL) << 40) - | ((prim_field_data[off++] & 0xFFL) << 32) - | ((prim_field_data[off++] & 0xFF) << 24) - | ((prim_field_data[off++] & 0xFF) << 16) - | ((prim_field_data[off++] & 0xFF) << 8) - | (prim_field_data[off] & 0xFF))); - } + if (field == null) + return defvalue; - public Object get(String name, Object defvalue) - throws IOException, IllegalArgumentException - { - ObjectStreamField field = - getField(name, defvalue == null ? null : defvalue.getClass ()); + int off = field.getOffset(); - if (field == null) - return defvalue; + return Double.longBitsToDouble + ( (long) (((prim_field_data[off++] & 0xFFL) << 56) + | ((prim_field_data[off++] & 0xFFL) << 48) + | ((prim_field_data[off++] & 0xFFL) << 40) + | ((prim_field_data[off++] & 0xFFL) << 32) + | ((prim_field_data[off++] & 0xFF) << 24) + | ((prim_field_data[off++] & 0xFF) << 16) + | ((prim_field_data[off++] & 0xFF) << 8) + | (prim_field_data[off] & 0xFF))); + } - return objs[field.getOffset()]; - } + public Object get(String name, Object defvalue) + throws IOException, IllegalArgumentException + { + ObjectStreamField field = + getField(name, defvalue == null ? null : defvalue.getClass ()); - private ObjectStreamField getField(String name, Class type) - throws IllegalArgumentException - { - ObjectStreamField field = clazz.getField(name); - boolean illegal = false; + if (field == null) + return defvalue; + + return objs[field.getOffset()]; + } + + private ObjectStreamField getField(String name, Class type) + throws IllegalArgumentException + { + ObjectStreamField field = clazz.getField(name); + boolean illegal = false; // XXX This code is horrible and needs to be rewritten! - try - { - try - { - Class field_type = field.getType(); - - if (type == field_type || - (type == null && !field_type.isPrimitive())) - { - /* See defaulted */ - return field; - } - - illegal = true; - throw new IllegalArgumentException - ("Field requested is of type " - + field_type.getName() - + ", but requested type was " - + (type == null ? "Object" : type.getName())); - } - catch (NullPointerException _) - { - /* Here we catch NullPointerException, because it may - only come from the call 'field.getType()'. If field - is null, we have to return null and classpath ethic - say we must try to avoid 'if (xxx == null)'. - */ - } - catch (IllegalArgumentException e) - { - throw e; - } - - return null; - } - finally - { - /* If this is an unassigned field we should return - * the default value. - */ - if (!illegal && field != null && !field.isToSet() && field.isPersistent()) - return null; + try + { + try + { + Class field_type = field.getType(); - /* We do not want to modify transient fields. They should - * be left to 0. - */ - try - { - Field f = clazz.forClass().getDeclaredField(name); - if (Modifier.isTransient(f.getModifiers())) - throw new IllegalArgumentException - ("no such field (non transient) " + name); - if (field == null && f.getType() != type) - throw new IllegalArgumentException - ("Invalid requested type for field " + name); - } - catch (NoSuchFieldException e) - { - if (field == null) - throw new IllegalArgumentException(e); - } - - } - } + if (type == field_type || + (type == null && !field_type.isPrimitive())) + { + /* See defaulted */ + return field; + } + + illegal = true; + throw new IllegalArgumentException + ("Field requested is of type " + + field_type.getName() + + ", but requested type was " + + (type == null ? "Object" : type.getName())); + } + catch (NullPointerException _) + { + /* Here we catch NullPointerException, because it may + only come from the call 'field.getType()'. If field + is null, we have to return null and classpath ethic + say we must try to avoid 'if (xxx == null)'. + */ + } + catch (IllegalArgumentException e) + { + throw e; + } + + return null; + } + finally + { + /* If this is an unassigned field we should return + * the default value. + */ + if (!illegal && field != null && !field.isToSet() && field.isPersistent()) + return null; + + /* We do not want to modify transient fields. They should + * be left to 0. + */ + try + { + Field f = clazz.forClass().getDeclaredField(name); + if (Modifier.isTransient(f.getModifiers())) + throw new IllegalArgumentException + ("no such field (non transient) " + name); + if (field == null && f.getType() != type) + throw new IllegalArgumentException + ("Invalid requested type for field " + name); + } + catch (NoSuchFieldException e) + { + if (field == null) + throw new IllegalArgumentException(e); + } + + } + } }; fieldsAlreadyRead = true; @@ -1659,11 +1659,11 @@ public class ObjectInputStream extends InputStream * @see #lookupHandle */ private void rememberHandle(Object obj, boolean shared, - int handle) + int handle) { handles.put(handle, new Pair(shared, obj)); } - + /** * Look up the object associated with a given handle. * @@ -1678,43 +1678,43 @@ public class ObjectInputStream extends InputStream { Pair result = handles.get(handle); if (result == null) - throw new StreamCorruptedException("The handle, " + - Integer.toHexString(handle) + - ", is invalid."); + throw new StreamCorruptedException("The handle, " + + Integer.toHexString(handle) + + ", is invalid."); if (!result.getLeft()) - throw new InvalidObjectException("The handle, " + - Integer.toHexString(handle) + - ", is not shared."); + throw new InvalidObjectException("The handle, " + + Integer.toHexString(handle) + + ", is not shared."); return result.getRight(); } private Object processResolution(ObjectStreamClass osc, Object obj, int handle, - boolean shared) + boolean shared) throws IOException { if (osc != null && obj instanceof Serializable) { - try - { - Method m = osc.readResolveMethod; - if(m != null) - { - obj = m.invoke(obj, new Object[] {}); - } - } - catch (IllegalAccessException ignore) - { - } - catch (InvocationTargetException exception) - { - Throwable cause = exception.getCause(); - if (cause instanceof ObjectStreamException) - throw (ObjectStreamException) cause; - else if (cause instanceof RuntimeException) - throw (RuntimeException) cause; - else if (cause instanceof Error) - throw (Error) cause; - } + try + { + Method m = osc.readResolveMethod; + if(m != null) + { + obj = m.invoke(obj, new Object[] {}); + } + } + catch (IllegalAccessException ignore) + { + } + catch (InvocationTargetException exception) + { + Throwable cause = exception.getCause(); + if (cause instanceof ObjectStreamException) + throw (ObjectStreamException) cause; + else if (cause instanceof RuntimeException) + throw (RuntimeException) cause; + else if (cause instanceof Error) + throw (Error) cause; + } } if (this.resolveEnabled) @@ -1723,24 +1723,24 @@ public class ObjectInputStream extends InputStream rememberHandle(obj, shared, handle); if (!shared) { - if (obj instanceof byte[]) - return ((byte[]) obj).clone(); - if (obj instanceof short[]) - return ((short[]) obj).clone(); - if (obj instanceof int[]) - return ((int[]) obj).clone(); - if (obj instanceof long[]) - return ((long[]) obj).clone(); - if (obj instanceof char[]) - return ((char[]) obj).clone(); - if (obj instanceof boolean[]) - return ((boolean[]) obj).clone(); - if (obj instanceof float[]) - return ((float[]) obj).clone(); - if (obj instanceof double[]) - return ((double[]) obj).clone(); - if (obj instanceof Object[]) - return ((Object[]) obj).clone(); + if (obj instanceof byte[]) + return ((byte[]) obj).clone(); + if (obj instanceof short[]) + return ((short[]) obj).clone(); + if (obj instanceof int[]) + return ((int[]) obj).clone(); + if (obj instanceof long[]) + return ((long[]) obj).clone(); + if (obj instanceof char[]) + return ((char[]) obj).clone(); + if (obj instanceof boolean[]) + return ((boolean[]) obj).clone(); + if (obj instanceof float[]) + return ((float[]) obj).clone(); + if (obj instanceof double[]) + return ((double[]) obj).clone(); + if (obj instanceof Object[]) + return ((Object[]) obj).clone(); } return obj; } @@ -1767,19 +1767,19 @@ public class ObjectInputStream extends InputStream { if (marker == TC_BLOCKDATA) { - if(dump) dumpElement("BLOCK DATA SIZE="); - this.blockDataBytes = this.realInputStream.readUnsignedByte(); - if(dump) dumpElementln (Integer.toString(this.blockDataBytes)); + if(dump) dumpElement("BLOCK DATA SIZE="); + this.blockDataBytes = this.realInputStream.readUnsignedByte(); + if(dump) dumpElementln (Integer.toString(this.blockDataBytes)); } else if (marker == TC_BLOCKDATALONG) { - if(dump) dumpElement("BLOCK DATA LONG SIZE="); - this.blockDataBytes = this.realInputStream.readInt(); - if(dump) dumpElementln (Integer.toString(this.blockDataBytes)); + if(dump) dumpElement("BLOCK DATA LONG SIZE="); + this.blockDataBytes = this.realInputStream.readInt(); + if(dump) dumpElementln (Integer.toString(this.blockDataBytes)); } else { - throw new EOFException("Attempt to read primitive data, but no data block is active."); + throw new EOFException("Attempt to read primitive data, but no data block is active."); } if (this.blockData.length < this.blockDataBytes) @@ -1794,68 +1794,68 @@ public class ObjectInputStream extends InputStream { if (clazz.isPrimitive()) { - if (clazz == Boolean.TYPE) - { - boolean[] cast_array = (boolean[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readBoolean(); - return; - } - if (clazz == Byte.TYPE) - { - byte[] cast_array = (byte[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readByte(); - return; - } - if (clazz == Character.TYPE) - { - char[] cast_array = (char[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readChar(); - return; - } - if (clazz == Double.TYPE) - { - double[] cast_array = (double[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readDouble(); - return; - } - if (clazz == Float.TYPE) - { - float[] cast_array = (float[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readFloat(); - return; - } - if (clazz == Integer.TYPE) - { - int[] cast_array = (int[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readInt(); - return; - } - if (clazz == Long.TYPE) - { - long[] cast_array = (long[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readLong(); - return; - } - if (clazz == Short.TYPE) - { - short[] cast_array = (short[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = this.realInputStream.readShort(); - return; - } + if (clazz == Boolean.TYPE) + { + boolean[] cast_array = (boolean[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readBoolean(); + return; + } + if (clazz == Byte.TYPE) + { + byte[] cast_array = (byte[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readByte(); + return; + } + if (clazz == Character.TYPE) + { + char[] cast_array = (char[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readChar(); + return; + } + if (clazz == Double.TYPE) + { + double[] cast_array = (double[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readDouble(); + return; + } + if (clazz == Float.TYPE) + { + float[] cast_array = (float[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readFloat(); + return; + } + if (clazz == Integer.TYPE) + { + int[] cast_array = (int[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readInt(); + return; + } + if (clazz == Long.TYPE) + { + long[] cast_array = (long[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readLong(); + return; + } + if (clazz == Short.TYPE) + { + short[] cast_array = (short[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = this.realInputStream.readShort(); + return; + } } else { - Object[] cast_array = (Object[])array; - for (int i=0; i < cast_array.length; i++) - cast_array[i] = readObject(); + Object[] cast_array = (Object[])array; + for (int i=0; i < cast_array.length; i++) + cast_array[i] = readObject(); } } @@ -1866,121 +1866,121 @@ public class ObjectInputStream extends InputStream for (int i = 0; i < fields.length; i += 2) { - ObjectStreamField stream_field = fields[i]; - ObjectStreamField real_field = fields[i + 1]; - boolean read_value = (stream_field != null && stream_field.getOffset() >= 0 && stream_field.isToSet()); - boolean set_value = (real_field != null && real_field.isToSet()); - String field_name; - char type; + ObjectStreamField stream_field = fields[i]; + ObjectStreamField real_field = fields[i + 1]; + boolean read_value = (stream_field != null && stream_field.getOffset() >= 0 && stream_field.isToSet()); + boolean set_value = (real_field != null && real_field.isToSet()); + String field_name; + char type; - if (stream_field != null) - { - field_name = stream_field.getName(); - type = stream_field.getTypeCode(); - } - else - { - field_name = real_field.getName(); - type = real_field.getTypeCode(); - } - - switch(type) - { - case 'Z': - { - boolean value = - read_value ? this.realInputStream.readBoolean() : false; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setBooleanField(obj, value); - break; - } - case 'B': - { - byte value = - read_value ? this.realInputStream.readByte() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setByteField(obj, value); - break; - } - case 'C': - { - char value = - read_value ? this.realInputStream.readChar(): 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setCharField(obj, value); - break; - } - case 'D': - { - double value = - read_value ? this.realInputStream.readDouble() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setDoubleField(obj, value); - break; - } - case 'F': - { - float value = - read_value ? this.realInputStream.readFloat() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setFloatField(obj, value); - break; - } - case 'I': - { - int value = - read_value ? this.realInputStream.readInt() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setIntField(obj, value); - break; - } - case 'J': - { - long value = - read_value ? this.realInputStream.readLong() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setLongField(obj, value); - break; - } - case 'S': - { - short value = - read_value ? this.realInputStream.readShort() : 0; - if (dump && read_value && set_value) - dumpElementln(" " + field_name + ": " + value); - if (set_value) - real_field.setShortField(obj, value); - break; - } - case 'L': - case '[': - { - Object value = - read_value ? readObject() : null; - if (set_value) - real_field.setObjectField(obj, value); - break; - } - default: - throw new InternalError("Invalid type code: " + type); - } + if (stream_field != null) + { + field_name = stream_field.getName(); + type = stream_field.getTypeCode(); + } + else + { + field_name = real_field.getName(); + type = real_field.getTypeCode(); + } + + switch(type) + { + case 'Z': + { + boolean value = + read_value ? this.realInputStream.readBoolean() : false; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setBooleanField(obj, value); + break; + } + case 'B': + { + byte value = + read_value ? this.realInputStream.readByte() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setByteField(obj, value); + break; + } + case 'C': + { + char value = + read_value ? this.realInputStream.readChar(): 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setCharField(obj, value); + break; + } + case 'D': + { + double value = + read_value ? this.realInputStream.readDouble() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setDoubleField(obj, value); + break; + } + case 'F': + { + float value = + read_value ? this.realInputStream.readFloat() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setFloatField(obj, value); + break; + } + case 'I': + { + int value = + read_value ? this.realInputStream.readInt() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setIntField(obj, value); + break; + } + case 'J': + { + long value = + read_value ? this.realInputStream.readLong() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setLongField(obj, value); + break; + } + case 'S': + { + short value = + read_value ? this.realInputStream.readShort() : 0; + if (dump && read_value && set_value) + dumpElementln(" " + field_name + ": " + value); + if (set_value) + real_field.setShortField(obj, value); + break; + } + case 'L': + case '[': + { + Object value = + read_value ? readObject() : null; + if (set_value) + real_field.setObjectField(obj, value); + break; + } + default: + throw new InternalError("Invalid type code: " + type); + } } } - + // Toggles writing primitive data to block-data buffer. private boolean setBlockDataMode (boolean on) { @@ -2000,10 +2000,10 @@ public class ObjectInputStream extends InputStream throws ClassNotFoundException, IOException { if (constructor == null) - throw new InvalidClassException("Missing accessible no-arg base class constructor for " + real_class.getName()); + throw new InvalidClassException("Missing accessible no-arg base class constructor for " + real_class.getName()); try { - return VMObjectInputStream.allocateObject(real_class, constructor.getDeclaringClass(), constructor); + return VMObjectInputStream.allocateObject(real_class, constructor.getDeclaringClass(), constructor); } catch (InstantiationException e) { @@ -2018,17 +2018,17 @@ public class ObjectInputStream extends InputStream { try { - Iterator it = currentObjectValidators.iterator(); - while(it.hasNext()) - { - ValidatorAndPriority vap = it.next(); - ObjectInputValidation validator = vap.validator; - validator.validateObject(); - } + Iterator it = currentObjectValidators.iterator(); + while(it.hasNext()) + { + ValidatorAndPriority vap = it.next(); + ObjectInputValidation validator = vap.validator; + validator.validateObject(); + } } finally { - currentObjectValidators = null; + currentObjectValidators = null; } } @@ -2037,32 +2037,32 @@ public class ObjectInputStream extends InputStream { try { - readObject.invoke(obj, new Object[] { this }); + readObject.invoke(obj, new Object[] { this }); } catch (InvocationTargetException x) { /* Rethrow if possible. */ - Throwable exception = x.getTargetException(); - if (exception instanceof RuntimeException) - throw (RuntimeException) exception; - if (exception instanceof IOException) - throw (IOException) exception; + Throwable exception = x.getTargetException(); + if (exception instanceof RuntimeException) + throw (RuntimeException) exception; + if (exception instanceof IOException) + throw (IOException) exception; if (exception instanceof ClassNotFoundException) throw (ClassNotFoundException) exception; - throw (IOException) new IOException( - "Exception thrown from readObject() on " + klass).initCause(x); + throw (IOException) new IOException( + "Exception thrown from readObject() on " + klass).initCause(x); } catch (Exception x) { - throw (IOException) new IOException( - "Failure invoking readObject() on " + klass).initCause(x); + throw (IOException) new IOException( + "Failure invoking readObject() on " + klass).initCause(x); } // Invalidate fields which has been read through readFields. prereadFields = null; } - + private static final int BUFFER_SIZE = 1024; private DataInputStream realInputStream; @@ -2094,7 +2094,7 @@ public class ObjectInputStream extends InputStream { System.out.print(msg); } - + private void dumpElementln (String msg) { System.out.println(msg); @@ -2107,11 +2107,11 @@ public class ObjectInputStream extends InputStream { try { - System.out.print(msg); - if (java.lang.reflect.Proxy.isProxyClass(obj.getClass())) - System.out.println(obj.getClass()); - else - System.out.println(obj); + System.out.print(msg); + if (java.lang.reflect.Proxy.isProxyClass(obj.getClass())) + System.out.println(obj.getClass()); + else + System.out.println(obj); } catch (Exception _) { @@ -2140,4 +2140,3 @@ public class ObjectInputStream extends InputStream } } } - diff --git a/libjava/classpath/java/io/ObjectInputValidation.java b/libjava/classpath/java/io/ObjectInputValidation.java index 4fdb8414f63..fb6de190563 100644 --- a/libjava/classpath/java/io/ObjectInputValidation.java +++ b/libjava/classpath/java/io/ObjectInputValidation.java @@ -1,4 +1,4 @@ -/* ObjectInputValidation.java -- Validate an object +/* ObjectInputValidation.java -- Validate an object Copyright (C) 1998, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -36,7 +36,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ -package java.io; +package java.io; /** * This class allows an object to validate that it is valid after @@ -46,7 +46,7 @@ package java.io; * be used to perform re-initialization type activities on an object * after it has been completely deserialized. * - * Since this method functions as a type of callback, it must be + * Since this method functions as a type of callback, it must be * registered through ObjectInputStream.registerValidation * in order to be invoked. This is typically done in the * readObject method. diff --git a/libjava/classpath/java/io/ObjectOutput.java b/libjava/classpath/java/io/ObjectOutput.java index d35a09c3acb..628f8b97b86 100644 --- a/libjava/classpath/java/io/ObjectOutput.java +++ b/libjava/classpath/java/io/ObjectOutput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,7 +41,7 @@ package java.io; /** * This interface extends DataOutput to provide the additional * facility of writing object instances to a stream. It also adds some - * additional methods to make the interface more + * additional methods to make the interface more * OutputStream like. * * @author Aaron M. Renn (arenn@urbanophile.com) @@ -64,7 +64,7 @@ public interface ObjectOutput extends DataOutput * output stream. * * @param buf The array of bytes to write. - * + * * @exception IOException If an error occurs. */ void write(byte[] buf) throws IOException; @@ -79,7 +79,7 @@ public interface ObjectOutput extends DataOutput * * @exception IOException If an error occurs. */ - void write(byte[] buf, int offset, int len) + void write(byte[] buf, int offset, int len) throws IOException; /** @@ -108,4 +108,3 @@ public interface ObjectOutput extends DataOutput void close() throws IOException; } // interface ObjectOutput - diff --git a/libjava/classpath/java/io/ObjectOutputStream.java b/libjava/classpath/java/io/ObjectOutputStream.java index 303aed472d9..71d2e0b3439 100644 --- a/libjava/classpath/java/io/ObjectOutputStream.java +++ b/libjava/classpath/java/io/ObjectOutputStream.java @@ -151,9 +151,9 @@ public class ObjectOutputStream extends OutputStream if (DEBUG) { - String val = System.getProperty("gcj.dumpobjects"); - if (val != null && !val.equals("")) - dump = true; + String val = System.getProperty("gcj.dumpobjects"); + if (val != null && !val.equals("")) + dump = true; } } @@ -246,261 +246,261 @@ public class ObjectOutputStream extends OutputStream { if (useSubclassMethod) { - if (dump) - dumpElementln ("WRITE OVERRIDE: " + obj); - - writeObjectOverride(obj); - return; + if (dump) + dumpElementln ("WRITE OVERRIDE: " + obj); + + writeObjectOverride(obj); + return; } if (dump) dumpElementln ("WRITE: ", obj); - - depth += 2; + + depth += 2; boolean was_serializing = isSerializing; boolean old_mode = setBlockDataMode(false); try { - isSerializing = true; - boolean replaceDone = false; - Object replacedObject = null; - - while (true) - { - if (obj == null) - { - realOutput.writeByte(TC_NULL); - break; - } + isSerializing = true; + boolean replaceDone = false; + Object replacedObject = null; - int handle = findHandle(obj); - if (handle >= 0 && shared) - { - realOutput.writeByte(TC_REFERENCE); - realOutput.writeInt(handle); - break; - } + while (true) + { + if (obj == null) + { + realOutput.writeByte(TC_NULL); + break; + } - if (obj instanceof Class) - { - Class cl = (Class)obj; - ObjectStreamClass osc = ObjectStreamClass.lookupForClassObject(cl); - realOutput.writeByte(TC_CLASS); - if (!osc.isProxyClass) - { - writeObject (osc); - } - else - {System.err.println("1"); - realOutput.writeByte(TC_PROXYCLASSDESC); - Class[] intfs = cl.getInterfaces(); - realOutput.writeInt(intfs.length); - for (int i = 0; i < intfs.length; i++) - realOutput.writeUTF(intfs[i].getName()); - - boolean oldmode = setBlockDataMode(true); - annotateProxyClass(cl); - setBlockDataMode(oldmode); - realOutput.writeByte(TC_ENDBLOCKDATA); - - writeObject(osc.getSuper()); - } - if (shared) - assignNewHandle(obj); - break; - } + int handle = findHandle(obj); + if (handle >= 0 && shared) + { + realOutput.writeByte(TC_REFERENCE); + realOutput.writeInt(handle); + break; + } - if (obj instanceof ObjectStreamClass) - { - writeClassDescriptor((ObjectStreamClass) obj); - break; - } + if (obj instanceof Class) + { + Class cl = (Class)obj; + ObjectStreamClass osc = ObjectStreamClass.lookupForClassObject(cl); + realOutput.writeByte(TC_CLASS); + if (!osc.isProxyClass) + { + writeObject (osc); + } + else + {System.err.println("1"); + realOutput.writeByte(TC_PROXYCLASSDESC); + Class[] intfs = cl.getInterfaces(); + realOutput.writeInt(intfs.length); + for (int i = 0; i < intfs.length; i++) + realOutput.writeUTF(intfs[i].getName()); - Class clazz = obj.getClass(); - ObjectStreamClass osc = ObjectStreamClass.lookupForClassObject(clazz); - if (osc == null) - throw new NotSerializableException(clazz.getName()); + boolean oldmode = setBlockDataMode(true); + annotateProxyClass(cl); + setBlockDataMode(oldmode); + realOutput.writeByte(TC_ENDBLOCKDATA); - if (osc.isEnum()) - { - /* TC_ENUM classDesc newHandle enumConstantName */ - realOutput.writeByte(TC_ENUM); - writeObject(osc); - if (shared) - assignNewHandle(obj); - writeObject(((Enum) obj).name()); - break; - } + writeObject(osc.getSuper()); + } + if (shared) + assignNewHandle(obj); + break; + } - if ((replacementEnabled || obj instanceof Serializable) - && ! replaceDone) - { - replacedObject = obj; - - if (obj instanceof Serializable) - { - try - { + if (obj instanceof ObjectStreamClass) + { + writeClassDescriptor((ObjectStreamClass) obj); + break; + } + + Class clazz = obj.getClass(); + ObjectStreamClass osc = ObjectStreamClass.lookupForClassObject(clazz); + if (osc == null) + throw new NotSerializableException(clazz.getName()); + + if (osc.isEnum()) + { + /* TC_ENUM classDesc newHandle enumConstantName */ + realOutput.writeByte(TC_ENUM); + writeObject(osc); + if (shared) + assignNewHandle(obj); + writeObject(((Enum) obj).name()); + break; + } + + if ((replacementEnabled || obj instanceof Serializable) + && ! replaceDone) + { + replacedObject = obj; + + if (obj instanceof Serializable) + { + try + { Method m = osc.writeReplaceMethod; if (m != null) obj = m.invoke(obj, new Object[0]); - } - catch (IllegalAccessException ignore) - { - } - catch (InvocationTargetException ignore) - { - } - } - - if (replacementEnabled) - obj = replaceObject(obj); - - replaceDone = true; - continue; - } + } + catch (IllegalAccessException ignore) + { + } + catch (InvocationTargetException ignore) + { + } + } - if (obj instanceof String) - { + if (replacementEnabled) + obj = replaceObject(obj); + + replaceDone = true; + continue; + } + + if (obj instanceof String) + { String s = (String)obj; long l = realOutput.getUTFlength(s, 0, 0); if (l <= 65535) { - realOutput.writeByte(TC_STRING); - if (shared) - assignNewHandle(obj); - realOutput.writeUTFShort(s, (int)l); + realOutput.writeByte(TC_STRING); + if (shared) + assignNewHandle(obj); + realOutput.writeUTFShort(s, (int)l); } else { - realOutput.writeByte(TC_LONGSTRING); - if (shared) - assignNewHandle(obj); - realOutput.writeUTFLong(s, l); + realOutput.writeByte(TC_LONGSTRING); + if (shared) + assignNewHandle(obj); + realOutput.writeUTFLong(s, l); } - break; - } + break; + } - if (clazz.isArray ()) - { - realOutput.writeByte(TC_ARRAY); - writeObject(osc); - if (shared) - assignNewHandle(obj); - writeArraySizeAndElements(obj, clazz.getComponentType()); - break; - } - - realOutput.writeByte(TC_OBJECT); - writeObject(osc); + if (clazz.isArray ()) + { + realOutput.writeByte(TC_ARRAY); + writeObject(osc); + if (shared) + assignNewHandle(obj); + writeArraySizeAndElements(obj, clazz.getComponentType()); + break; + } - if (shared) - if (replaceDone) - assignNewHandle(replacedObject); - else - assignNewHandle(obj); - - if (obj instanceof Externalizable) - { - if (protocolVersion == PROTOCOL_VERSION_2) - setBlockDataMode(true); - - ((Externalizable)obj).writeExternal(this); - - if (protocolVersion == PROTOCOL_VERSION_2) - { - setBlockDataMode(false); - realOutput.writeByte(TC_ENDBLOCKDATA); - } + realOutput.writeByte(TC_OBJECT); + writeObject(osc); - break; - } + if (shared) + if (replaceDone) + assignNewHandle(replacedObject); + else + assignNewHandle(obj); - if (obj instanceof Serializable) - { - Object prevObject = this.currentObject; - ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass; - currentObject = obj; - ObjectStreamClass[] hierarchy = osc.hierarchy(); - - for (int i = 0; i < hierarchy.length; i++) - { - currentObjectStreamClass = hierarchy[i]; - - fieldsAlreadyWritten = false; - if (currentObjectStreamClass.hasWriteMethod()) - { - if (dump) - dumpElementln ("WRITE METHOD CALLED FOR: ", obj); - setBlockDataMode(true); - callWriteMethod(obj, currentObjectStreamClass); - setBlockDataMode(false); - realOutput.writeByte(TC_ENDBLOCKDATA); - if (dump) - dumpElementln ("WRITE ENDBLOCKDATA FOR: ", obj); - } - else - { - if (dump) - dumpElementln ("WRITE FIELDS CALLED FOR: ", obj); - writeFields(obj, currentObjectStreamClass); - } - } + if (obj instanceof Externalizable) + { + if (protocolVersion == PROTOCOL_VERSION_2) + setBlockDataMode(true); - this.currentObject = prevObject; - this.currentObjectStreamClass = prevObjectStreamClass; - currentPutField = null; - break; - } + ((Externalizable)obj).writeExternal(this); - throw new NotSerializableException(clazz.getName() - + " in " - + obj.getClass()); - } // end pseudo-loop + if (protocolVersion == PROTOCOL_VERSION_2) + { + setBlockDataMode(false); + realOutput.writeByte(TC_ENDBLOCKDATA); + } + + break; + } + + if (obj instanceof Serializable) + { + Object prevObject = this.currentObject; + ObjectStreamClass prevObjectStreamClass = this.currentObjectStreamClass; + currentObject = obj; + ObjectStreamClass[] hierarchy = osc.hierarchy(); + + for (int i = 0; i < hierarchy.length; i++) + { + currentObjectStreamClass = hierarchy[i]; + + fieldsAlreadyWritten = false; + if (currentObjectStreamClass.hasWriteMethod()) + { + if (dump) + dumpElementln ("WRITE METHOD CALLED FOR: ", obj); + setBlockDataMode(true); + callWriteMethod(obj, currentObjectStreamClass); + setBlockDataMode(false); + realOutput.writeByte(TC_ENDBLOCKDATA); + if (dump) + dumpElementln ("WRITE ENDBLOCKDATA FOR: ", obj); + } + else + { + if (dump) + dumpElementln ("WRITE FIELDS CALLED FOR: ", obj); + writeFields(obj, currentObjectStreamClass); + } + } + + this.currentObject = prevObject; + this.currentObjectStreamClass = prevObjectStreamClass; + currentPutField = null; + break; + } + + throw new NotSerializableException(clazz.getName() + + " in " + + obj.getClass()); + } // end pseudo-loop } catch (ObjectStreamException ose) { - // Rethrow these are fatal. - throw ose; + // Rethrow these are fatal. + throw ose; } catch (IOException e) { - realOutput.writeByte(TC_EXCEPTION); - reset(true); + realOutput.writeByte(TC_EXCEPTION); + reset(true); - setBlockDataMode(false); - try - { - if (DEBUG) - { - e.printStackTrace(System.out); - } - writeObject(e); - } - catch (IOException ioe) - { - StreamCorruptedException ex = - new StreamCorruptedException - (ioe + " thrown while exception was being written to stream."); - if (DEBUG) - { - ex.printStackTrace(System.out); - } - throw ex; - } + setBlockDataMode(false); + try + { + if (DEBUG) + { + e.printStackTrace(System.out); + } + writeObject(e); + } + catch (IOException ioe) + { + StreamCorruptedException ex = + new StreamCorruptedException + (ioe + " thrown while exception was being written to stream."); + if (DEBUG) + { + ex.printStackTrace(System.out); + } + throw ex; + } + + reset (true); - reset (true); - } finally { - isSerializing = was_serializing; - setBlockDataMode(old_mode); - depth -= 2; + isSerializing = was_serializing; + setBlockDataMode(old_mode); + depth -= 2; - if (dump) - dumpElementln ("END: ", obj); + if (dump) + dumpElementln ("END: ", obj); } } @@ -509,13 +509,13 @@ public class ObjectOutputStream extends OutputStream if (osc.isProxyClass) { realOutput.writeByte(TC_PROXYCLASSDESC); - Class[] intfs = osc.forClass().getInterfaces(); - realOutput.writeInt(intfs.length); - for (int i = 0; i < intfs.length; i++) - realOutput.writeUTF(intfs[i].getName()); + Class[] intfs = osc.forClass().getInterfaces(); + realOutput.writeInt(intfs.length); + for (int i = 0; i < intfs.length; i++) + realOutput.writeUTF(intfs[i].getName()); assignNewHandle(osc); - + boolean oldmode = setBlockDataMode(true); annotateProxyClass(osc.forClass()); setBlockDataMode(oldmode); @@ -525,37 +525,37 @@ public class ObjectOutputStream extends OutputStream { realOutput.writeByte(TC_CLASSDESC); realOutput.writeUTF(osc.getName()); - if (osc.isEnum()) - realOutput.writeLong(0L); - else - realOutput.writeLong(osc.getSerialVersionUID()); + if (osc.isEnum()) + realOutput.writeLong(0L); + else + realOutput.writeLong(osc.getSerialVersionUID()); assignNewHandle(osc); int flags = osc.getFlags(); if (protocolVersion == PROTOCOL_VERSION_2 - && osc.isExternalizable()) + && osc.isExternalizable()) flags |= SC_BLOCK_DATA; realOutput.writeByte(flags); ObjectStreamField[] fields = osc.fields; - if (fields == ObjectStreamClass.INVALID_FIELDS) - throw new InvalidClassException - (osc.getName(), "serialPersistentFields is invalid"); + if (fields == ObjectStreamClass.INVALID_FIELDS) + throw new InvalidClassException + (osc.getName(), "serialPersistentFields is invalid"); realOutput.writeShort(fields.length); ObjectStreamField field; for (int i = 0; i < fields.length; i++) { - field = fields[i]; - realOutput.writeByte(field.getTypeCode ()); - realOutput.writeUTF(field.getName ()); + field = fields[i]; + realOutput.writeByte(field.getTypeCode ()); + realOutput.writeUTF(field.getName ()); - if (! field.isPrimitive()) - writeObject(field.getTypeString()); + if (! field.isPrimitive()) + writeObject(field.getTypeString()); } boolean oldmode = setBlockDataMode(true); @@ -569,7 +569,7 @@ public class ObjectOutputStream extends OutputStream else writeObject(null); } - + /** * Writes the current objects non-transient, non-static fields from * the current class to the underlying output stream. @@ -598,11 +598,11 @@ public class ObjectOutputStream extends OutputStream { if (currentObject == null || currentObjectStreamClass == null) throw new NotActiveException - ("defaultWriteObject called by non-active class and/or object"); + ("defaultWriteObject called by non-active class and/or object"); if (fieldsAlreadyWritten) throw new IOException - ("Only one of writeFields and defaultWriteObject may be called, and it may only be called once"); + ("Only one of writeFields and defaultWriteObject may be called, and it may only be called once"); fieldsAlreadyWritten = true; } @@ -629,12 +629,12 @@ public class ObjectOutputStream extends OutputStream { if (!internal) { - if (isSerializing) - throw new IOException("Reset called while serialization in progress"); + if (isSerializing) + throw new IOException("Reset called while serialization in progress"); - realOutput.writeByte(TC_RESET); + realOutput.writeByte(TC_RESET); } - + clearHandles(); } @@ -650,29 +650,29 @@ public class ObjectOutputStream extends OutputStream * For an explanation of the differences between the two protocols * see the Java Object Serialization Specification. *

        - * + * * @param version the version to use. - * - * @throws IllegalArgumentException if version is not a valid + * + * @throws IllegalArgumentException if version is not a valid * protocol. * @throws IllegalStateException if called after the first the first object * was serialized. * @throws IOException if an I/O error occurs. - * + * * @see ObjectStreamConstants#PROTOCOL_VERSION_1 * @see ObjectStreamConstants#PROTOCOL_VERSION_2 - * + * * @since 1.2 */ public void useProtocolVersion(int version) throws IOException { if (version != PROTOCOL_VERSION_1 && version != PROTOCOL_VERSION_2) throw new IllegalArgumentException("Invalid protocol version requested."); - + if (nextOID != baseWireHandle) - throw new IllegalStateException("Protocol version cannot be changed " + throw new IllegalStateException("Protocol version cannot be changed " + "after serialization started."); - + protocolVersion = version; } @@ -728,9 +728,9 @@ public class ObjectOutputStream extends OutputStream { if (enable) { - SecurityManager sm = System.getSecurityManager(); - if (sm != null) - sm.checkPermission(new SerializablePermission("enableSubstitution")); + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new SerializablePermission("enableSubstitution")); } boolean old_val = replacementEnabled; @@ -799,10 +799,10 @@ public class ObjectOutputStream extends OutputStream { if (writeDataAsBlocks) { - if (blockDataCount == BUFFER_SIZE) - drain(); + if (blockDataCount == BUFFER_SIZE) + drain(); - blockData[ blockDataCount++ ] = (byte)data; + blockData[ blockDataCount++ ] = (byte)data; } else realOutput.write(data); @@ -825,20 +825,20 @@ public class ObjectOutputStream extends OutputStream { if (writeDataAsBlocks) { - if (len < 0) - throw new IndexOutOfBoundsException(); + if (len < 0) + throw new IndexOutOfBoundsException(); - if (blockDataCount + len < BUFFER_SIZE) - { - System.arraycopy(b, off, blockData, blockDataCount, len); - blockDataCount += len; - } - else - { - drain(); - writeBlockDataHeader(len); - realOutput.write(b, off, len); - } + if (blockDataCount + len < BUFFER_SIZE) + { + System.arraycopy(b, off, blockData, blockDataCount, len); + blockDataCount += len; + } + else + { + drain(); + writeBlockDataHeader(len); + realOutput.write(b, off, len); + } } else realOutput.write(b, off, len); @@ -1014,143 +1014,143 @@ public class ObjectOutputStream extends OutputStream currentPutField = new PutField() { - private byte[] prim_field_data - = new byte[currentObjectStreamClass.primFieldSize]; - private Object[] objs - = new Object[currentObjectStreamClass.objectFieldCount]; + private byte[] prim_field_data + = new byte[currentObjectStreamClass.primFieldSize]; + private Object[] objs + = new Object[currentObjectStreamClass.objectFieldCount]; - private ObjectStreamField getField (String name) - { - ObjectStreamField field - = currentObjectStreamClass.getField(name); - - if (field == null) - throw new IllegalArgumentException("no such serializable field " + name); - - return field; - } - - public void put(String name, boolean value) - { - ObjectStreamField field = getField(name); + private ObjectStreamField getField (String name) + { + ObjectStreamField field + = currentObjectStreamClass.getField(name); - checkType(field, 'Z'); - prim_field_data[field.getOffset ()] = (byte)(value ? 1 : 0); - } + if (field == null) + throw new IllegalArgumentException("no such serializable field " + name); - public void put(String name, byte value) - { - ObjectStreamField field = getField(name); + return field; + } - checkType(field, 'B'); - prim_field_data[field.getOffset()] = value; - } + public void put(String name, boolean value) + { + ObjectStreamField field = getField(name); - public void put(String name, char value) - { - ObjectStreamField field = getField(name); + checkType(field, 'Z'); + prim_field_data[field.getOffset ()] = (byte)(value ? 1 : 0); + } - checkType(field, 'C'); - int off = field.getOffset(); - prim_field_data[off++] = (byte)(value >>> 8); - prim_field_data[off] = (byte)value; - } + public void put(String name, byte value) + { + ObjectStreamField field = getField(name); - public void put(String name, double value) - { - ObjectStreamField field = getField (name); + checkType(field, 'B'); + prim_field_data[field.getOffset()] = value; + } - checkType(field, 'D'); - int off = field.getOffset(); - long l_value = Double.doubleToLongBits (value); - prim_field_data[off++] = (byte)(l_value >>> 52); - prim_field_data[off++] = (byte)(l_value >>> 48); - prim_field_data[off++] = (byte)(l_value >>> 40); - prim_field_data[off++] = (byte)(l_value >>> 32); - prim_field_data[off++] = (byte)(l_value >>> 24); - prim_field_data[off++] = (byte)(l_value >>> 16); - prim_field_data[off++] = (byte)(l_value >>> 8); - prim_field_data[off] = (byte)l_value; - } + public void put(String name, char value) + { + ObjectStreamField field = getField(name); - public void put(String name, float value) - { - ObjectStreamField field = getField(name); + checkType(field, 'C'); + int off = field.getOffset(); + prim_field_data[off++] = (byte)(value >>> 8); + prim_field_data[off] = (byte)value; + } - checkType(field, 'F'); - int off = field.getOffset(); - int i_value = Float.floatToIntBits(value); - prim_field_data[off++] = (byte)(i_value >>> 24); - prim_field_data[off++] = (byte)(i_value >>> 16); - prim_field_data[off++] = (byte)(i_value >>> 8); - prim_field_data[off] = (byte)i_value; - } + public void put(String name, double value) + { + ObjectStreamField field = getField (name); - public void put(String name, int value) - { - ObjectStreamField field = getField(name); - checkType(field, 'I'); - int off = field.getOffset(); - prim_field_data[off++] = (byte)(value >>> 24); - prim_field_data[off++] = (byte)(value >>> 16); - prim_field_data[off++] = (byte)(value >>> 8); - prim_field_data[off] = (byte)value; - } + checkType(field, 'D'); + int off = field.getOffset(); + long l_value = Double.doubleToLongBits (value); + prim_field_data[off++] = (byte)(l_value >>> 52); + prim_field_data[off++] = (byte)(l_value >>> 48); + prim_field_data[off++] = (byte)(l_value >>> 40); + prim_field_data[off++] = (byte)(l_value >>> 32); + prim_field_data[off++] = (byte)(l_value >>> 24); + prim_field_data[off++] = (byte)(l_value >>> 16); + prim_field_data[off++] = (byte)(l_value >>> 8); + prim_field_data[off] = (byte)l_value; + } - public void put(String name, long value) - { - ObjectStreamField field = getField(name); - checkType(field, 'J'); - int off = field.getOffset(); - prim_field_data[off++] = (byte)(value >>> 52); - prim_field_data[off++] = (byte)(value >>> 48); - prim_field_data[off++] = (byte)(value >>> 40); - prim_field_data[off++] = (byte)(value >>> 32); - prim_field_data[off++] = (byte)(value >>> 24); - prim_field_data[off++] = (byte)(value >>> 16); - prim_field_data[off++] = (byte)(value >>> 8); - prim_field_data[off] = (byte)value; - } + public void put(String name, float value) + { + ObjectStreamField field = getField(name); - public void put(String name, short value) - { - ObjectStreamField field = getField(name); - checkType(field, 'S'); - int off = field.getOffset(); - prim_field_data[off++] = (byte)(value >>> 8); - prim_field_data[off] = (byte)value; - } + checkType(field, 'F'); + int off = field.getOffset(); + int i_value = Float.floatToIntBits(value); + prim_field_data[off++] = (byte)(i_value >>> 24); + prim_field_data[off++] = (byte)(i_value >>> 16); + prim_field_data[off++] = (byte)(i_value >>> 8); + prim_field_data[off] = (byte)i_value; + } - public void put(String name, Object value) - { - ObjectStreamField field = getField(name); + public void put(String name, int value) + { + ObjectStreamField field = getField(name); + checkType(field, 'I'); + int off = field.getOffset(); + prim_field_data[off++] = (byte)(value >>> 24); + prim_field_data[off++] = (byte)(value >>> 16); + prim_field_data[off++] = (byte)(value >>> 8); + prim_field_data[off] = (byte)value; + } - if (value != null && - ! field.getType().isAssignableFrom(value.getClass ())) - throw new IllegalArgumentException("Class " + value.getClass() + - " cannot be cast to " + field.getType()); - objs[field.getOffset()] = value; - } + public void put(String name, long value) + { + ObjectStreamField field = getField(name); + checkType(field, 'J'); + int off = field.getOffset(); + prim_field_data[off++] = (byte)(value >>> 52); + prim_field_data[off++] = (byte)(value >>> 48); + prim_field_data[off++] = (byte)(value >>> 40); + prim_field_data[off++] = (byte)(value >>> 32); + prim_field_data[off++] = (byte)(value >>> 24); + prim_field_data[off++] = (byte)(value >>> 16); + prim_field_data[off++] = (byte)(value >>> 8); + prim_field_data[off] = (byte)value; + } - public void write(ObjectOutput out) throws IOException - { - // Apparently Block data is not used with PutField as per - // empirical evidence against JDK 1.2. Also see Mauve test - // java.io.ObjectInputOutput.Test.GetPutField. - boolean oldmode = setBlockDataMode(false); - out.write(prim_field_data); - for (int i = 0; i < objs.length; ++ i) - out.writeObject(objs[i]); - setBlockDataMode(oldmode); - } + public void put(String name, short value) + { + ObjectStreamField field = getField(name); + checkType(field, 'S'); + int off = field.getOffset(); + prim_field_data[off++] = (byte)(value >>> 8); + prim_field_data[off] = (byte)value; + } - private void checkType(ObjectStreamField field, char type) - throws IllegalArgumentException - { - if (TypeSignature.getEncodingOfClass(field.getType()).charAt(0) - != type) - throw new IllegalArgumentException(); - } + public void put(String name, Object value) + { + ObjectStreamField field = getField(name); + + if (value != null && + ! field.getType().isAssignableFrom(value.getClass ())) + throw new IllegalArgumentException("Class " + value.getClass() + + " cannot be cast to " + field.getType()); + objs[field.getOffset()] = value; + } + + public void write(ObjectOutput out) throws IOException + { + // Apparently Block data is not used with PutField as per + // empirical evidence against JDK 1.2. Also see Mauve test + // java.io.ObjectInputOutput.Test.GetPutField. + boolean oldmode = setBlockDataMode(false); + out.write(prim_field_data); + for (int i = 0; i < objs.length; ++ i) + out.writeObject(objs[i]); + setBlockDataMode(oldmode); + } + + private void checkType(ObjectStreamField field, char type) + throws IllegalArgumentException + { + if (TypeSignature.getEncodingOfClass(field.getType()).charAt(0) + != type) + throw new IllegalArgumentException(); + } }; // end PutFieldImpl @@ -1174,13 +1174,13 @@ public class ObjectOutputStream extends OutputStream { if (size < 256) { - realOutput.writeByte(TC_BLOCKDATA); - realOutput.write(size); + realOutput.writeByte(TC_BLOCKDATA); + realOutput.write(size); } else { - realOutput.writeByte(TC_BLOCKDATALONG); - realOutput.writeInt(size); + realOutput.writeByte(TC_BLOCKDATALONG); + realOutput.writeInt(size); } } @@ -1217,76 +1217,76 @@ public class ObjectOutputStream extends OutputStream if (clazz.isPrimitive()) { - if (clazz == Boolean.TYPE) - { - boolean[] cast_array = (boolean[])array; - realOutput.writeInt (length); - for (int i = 0; i < length; i++) - realOutput.writeBoolean(cast_array[i]); - return; - } - if (clazz == Byte.TYPE) - { - byte[] cast_array = (byte[])array; - realOutput.writeInt(length); - realOutput.write(cast_array, 0, length); - return; - } - if (clazz == Character.TYPE) - { - char[] cast_array = (char[])array; - realOutput.writeInt(length); - for (int i = 0; i < length; i++) - realOutput.writeChar(cast_array[i]); - return; - } - if (clazz == Double.TYPE) - { - double[] cast_array = (double[])array; - realOutput.writeInt(length); - for (int i = 0; i < length; i++) - realOutput.writeDouble(cast_array[i]); - return; - } - if (clazz == Float.TYPE) - { - float[] cast_array = (float[])array; - realOutput.writeInt(length); - for (int i = 0; i < length; i++) - realOutput.writeFloat(cast_array[i]); - return; - } - if (clazz == Integer.TYPE) - { - int[] cast_array = (int[])array; - realOutput.writeInt(length); - for (int i = 0; i < length; i++) - realOutput.writeInt(cast_array[i]); - return; - } - if (clazz == Long.TYPE) - { - long[] cast_array = (long[])array; - realOutput.writeInt (length); - for (int i = 0; i < length; i++) - realOutput.writeLong(cast_array[i]); - return; - } - if (clazz == Short.TYPE) - { - short[] cast_array = (short[])array; - realOutput.writeInt (length); - for (int i = 0; i < length; i++) - realOutput.writeShort(cast_array[i]); - return; - } + if (clazz == Boolean.TYPE) + { + boolean[] cast_array = (boolean[])array; + realOutput.writeInt (length); + for (int i = 0; i < length; i++) + realOutput.writeBoolean(cast_array[i]); + return; + } + if (clazz == Byte.TYPE) + { + byte[] cast_array = (byte[])array; + realOutput.writeInt(length); + realOutput.write(cast_array, 0, length); + return; + } + if (clazz == Character.TYPE) + { + char[] cast_array = (char[])array; + realOutput.writeInt(length); + for (int i = 0; i < length; i++) + realOutput.writeChar(cast_array[i]); + return; + } + if (clazz == Double.TYPE) + { + double[] cast_array = (double[])array; + realOutput.writeInt(length); + for (int i = 0; i < length; i++) + realOutput.writeDouble(cast_array[i]); + return; + } + if (clazz == Float.TYPE) + { + float[] cast_array = (float[])array; + realOutput.writeInt(length); + for (int i = 0; i < length; i++) + realOutput.writeFloat(cast_array[i]); + return; + } + if (clazz == Integer.TYPE) + { + int[] cast_array = (int[])array; + realOutput.writeInt(length); + for (int i = 0; i < length; i++) + realOutput.writeInt(cast_array[i]); + return; + } + if (clazz == Long.TYPE) + { + long[] cast_array = (long[])array; + realOutput.writeInt (length); + for (int i = 0; i < length; i++) + realOutput.writeLong(cast_array[i]); + return; + } + if (clazz == Short.TYPE) + { + short[] cast_array = (short[])array; + realOutput.writeInt (length); + for (int i = 0; i < length; i++) + realOutput.writeShort(cast_array[i]); + return; + } } else { - Object[] cast_array = (Object[])array; - realOutput.writeInt(length); - for (int i = 0; i < length; i++) - writeObject(cast_array[i]); + Object[] cast_array = (Object[])array; + realOutput.writeInt(length); + for (int i = 0; i < length; i++) + writeObject(cast_array[i]); } } @@ -1325,11 +1325,11 @@ public class ObjectOutputStream extends OutputStream IOException e = new IOException("Unexpected exception " + _); e.initCause(_); throw(e); - } + } setBlockDataMode(oldmode); } - + /** * Helper function for writeFields(Object,ObjectStreamClass): write @@ -1347,10 +1347,10 @@ public class ObjectOutputStream extends OutputStream { ObjectStreamField osf = fields[i]; Field field = osf.field; - + if (DEBUG && dump) dumpElementln ("WRITE FIELD: " + osf.getName() + " type=" + osf.getType()); - + switch (osf.getTypeCode()) { case 'Z': realOutput.writeBoolean(field.getBoolean(obj)); break; @@ -1361,9 +1361,9 @@ public class ObjectOutputStream extends OutputStream case 'F': realOutput.writeFloat (field.getFloat (obj)); break; case 'J': realOutput.writeLong (field.getLong (obj)); break; case 'D': realOutput.writeDouble (field.getDouble (obj)); break; - case 'L': + case 'L': case '[': writeObject (field.get (obj)); break; - default: + default: throw new IOException("Unexpected type code " + osf.getTypeCode()); } } @@ -1402,27 +1402,27 @@ public class ObjectOutputStream extends OutputStream catch (InvocationTargetException x) { /* Rethrow if possible. */ - Throwable exception = x.getTargetException(); - if (exception instanceof RuntimeException) - throw (RuntimeException) exception; - if (exception instanceof IOException) - throw (IOException) exception; + Throwable exception = x.getTargetException(); + if (exception instanceof RuntimeException) + throw (RuntimeException) exception; + if (exception instanceof IOException) + throw (IOException) exception; - IOException ioe - = new IOException("Exception thrown from writeObject() on " + - osc.forClass().getName() + ": " + + IOException ioe + = new IOException("Exception thrown from writeObject() on " + + osc.forClass().getName() + ": " + exception.getClass().getName()); - ioe.initCause(exception); - throw ioe; + ioe.initCause(exception); + throw ioe; } catch (Exception x) { - IOException ioe - = new IOException("Failure invoking writeObject() on " + - osc.forClass().getName() + ": " + - x.getClass().getName()); - ioe.initCause(x); - throw ioe; + IOException ioe + = new IOException("Failure invoking writeObject() on " + + osc.forClass().getName() + ": " + + x.getClass().getName()); + ioe.initCause(x); + throw ioe; } } @@ -1430,21 +1430,21 @@ public class ObjectOutputStream extends OutputStream { try { - for (int i = 0; i < depth; i++) - System.out.print (" "); - System.out.print (Thread.currentThread() + ": "); - System.out.print (msg); - if (java.lang.reflect.Proxy.isProxyClass(obj.getClass())) - System.out.print (obj.getClass()); - else - System.out.print (obj); + for (int i = 0; i < depth; i++) + System.out.print (" "); + System.out.print (Thread.currentThread() + ": "); + System.out.print (msg); + if (java.lang.reflect.Proxy.isProxyClass(obj.getClass())) + System.out.print (obj.getClass()); + else + System.out.print (obj); } catch (Exception _) { } finally { - System.out.println (); + System.out.println (); } } diff --git a/libjava/classpath/java/io/ObjectStreamClass.java b/libjava/classpath/java/io/ObjectStreamClass.java index 8ebf32c58a4..b71f5489566 100644 --- a/libjava/classpath/java/io/ObjectStreamClass.java +++ b/libjava/classpath/java/io/ObjectStreamClass.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -81,7 +81,7 @@ public class ObjectStreamClass implements Serializable * * Warning: If this class contains an invalid serialPersistentField arrays * lookup will not throw anything. However {@link #getFields()} will return - * an empty array and {@link java.io.ObjectOutputStream#writeObject} will throw an + * an empty array and {@link java.io.ObjectOutputStream#writeObject} will throw an * {@link java.io.InvalidClassException}. * * @see java.io.Serializable @@ -112,9 +112,9 @@ public class ObjectStreamClass implements Serializable return osc; else { - osc = new ObjectStreamClass(cl); - classLookupTable.put(cl, osc); - return osc; + osc = new ObjectStreamClass(cl); + classLookupTable.put(cl, osc); + return osc; } } @@ -180,7 +180,7 @@ public class ObjectStreamClass implements Serializable { for (int i = 0; i < fields.length; i++) if (fields[i].getName().equals(name)) - return fields[i]; + return fields[i]; return null; } @@ -256,24 +256,24 @@ public class ObjectStreamClass implements Serializable */ ObjectStreamClass[] hierarchy() { - ObjectStreamClass[] result = hierarchy; + ObjectStreamClass[] result = hierarchy; if (result == null) { - int d = 0; - + int d = 0; + for(ObjectStreamClass osc = this; osc != null; osc = osc.getSuper()) d++; - + result = new ObjectStreamClass[d]; - + for (ObjectStreamClass osc = this; osc != null; osc = osc.getSuper()) { result[--d] = osc; } - - hierarchy = result; + + hierarchy = result; } - return result; + return result; } /** @@ -292,7 +292,7 @@ public class ObjectStreamClass implements Serializable ObjectStreamClass(String name, long uid, byte flags, - ObjectStreamField[] fields) + ObjectStreamField[] fields) { this.name = name; this.uid = uid; @@ -322,117 +322,117 @@ public class ObjectStreamClass implements Serializable uid = class_uid; else { - // Check that the actual UID of the resolved class matches the UID from - // the stream. Mismatches for array classes are ignored. - if (!cl.isArray() && uid != class_uid) - { - String msg = cl + - ": Local class not compatible: stream serialVersionUID=" - + uid + ", local serialVersionUID=" + class_uid; - throw new InvalidClassException (msg); - } + // Check that the actual UID of the resolved class matches the UID from + // the stream. Mismatches for array classes are ignored. + if (!cl.isArray() && uid != class_uid) + { + String msg = cl + + ": Local class not compatible: stream serialVersionUID=" + + uid + ", local serialVersionUID=" + class_uid; + throw new InvalidClassException (msg); + } } isProxyClass = clazz != null && Proxy.isProxyClass(clazz); this.superClass = superClass; calculateOffsets(); - + try { - ObjectStreamField[] exportedFields = getSerialPersistentFields (clazz); + ObjectStreamField[] exportedFields = getSerialPersistentFields (clazz); - if (exportedFields == null) - return; + if (exportedFields == null) + return; - ObjectStreamField[] newFieldList = new ObjectStreamField[exportedFields.length + fields.length]; - int i, j, k; + ObjectStreamField[] newFieldList = new ObjectStreamField[exportedFields.length + fields.length]; + int i, j, k; - /* We now check the import fields against the exported fields. - * There should not be contradiction (e.g. int x and String x) - * but extra virtual fields can be added to the class. - */ + /* We now check the import fields against the exported fields. + * There should not be contradiction (e.g. int x and String x) + * but extra virtual fields can be added to the class. + */ - Arrays.sort(exportedFields); + Arrays.sort(exportedFields); - i = 0; j = 0; k = 0; - while (i < fields.length && j < exportedFields.length) - { - int comp = fields[i].compareTo(exportedFields[j]); + i = 0; j = 0; k = 0; + while (i < fields.length && j < exportedFields.length) + { + int comp = fields[i].compareTo(exportedFields[j]); - if (comp < 0) - { - newFieldList[k] = fields[i]; - fields[i].setPersistent(false); - fields[i].setToSet(false); - i++; - } - else if (comp > 0) - { - /* field not found in imported fields. We add it - * in the list of supported fields. - */ - newFieldList[k] = exportedFields[j]; - newFieldList[k].setPersistent(true); - newFieldList[k].setToSet(false); - try - { - newFieldList[k].lookupField(clazz); - newFieldList[k].checkFieldType(); - } - catch (NoSuchFieldException _) - { - } - j++; - } - else - { - try - { - exportedFields[j].lookupField(clazz); - exportedFields[j].checkFieldType(); - } - catch (NoSuchFieldException _) - { - } + if (comp < 0) + { + newFieldList[k] = fields[i]; + fields[i].setPersistent(false); + fields[i].setToSet(false); + i++; + } + else if (comp > 0) + { + /* field not found in imported fields. We add it + * in the list of supported fields. + */ + newFieldList[k] = exportedFields[j]; + newFieldList[k].setPersistent(true); + newFieldList[k].setToSet(false); + try + { + newFieldList[k].lookupField(clazz); + newFieldList[k].checkFieldType(); + } + catch (NoSuchFieldException _) + { + } + j++; + } + else + { + try + { + exportedFields[j].lookupField(clazz); + exportedFields[j].checkFieldType(); + } + catch (NoSuchFieldException _) + { + } - if (!fields[i].getType().equals(exportedFields[j].getType())) - throw new InvalidClassException - ("serialPersistentFields must be compatible with" + - " imported fields (about " + fields[i].getName() + ")"); - newFieldList[k] = fields[i]; - fields[i].setPersistent(true); - i++; - j++; - } - k++; - } + if (!fields[i].getType().equals(exportedFields[j].getType())) + throw new InvalidClassException + ("serialPersistentFields must be compatible with" + + " imported fields (about " + fields[i].getName() + ")"); + newFieldList[k] = fields[i]; + fields[i].setPersistent(true); + i++; + j++; + } + k++; + } - if (i < fields.length) - for (;i"); data_out.writeInt(modifiers); - + // the replacement of '/' with '.' was needed to make computed // SUID's agree with those computed by JDK - data_out.writeUTF + data_out.writeUTF (TypeSignature.getEncodingOfConstructor(constructor).replace('/','.')); } - + Method method; Method[] methods = cl.getDeclaredMethods(); Arrays.sort(methods, memberComparator); @@ -979,16 +979,16 @@ outer: modifiers = method.getModifiers(); if (Modifier.isPrivate(modifiers)) continue; - + data_out.writeUTF(method.getName()); data_out.writeInt(modifiers); - + // the replacement of '/' with '.' was needed to make computed // SUID's agree with those computed by JDK data_out.writeUTF (TypeSignature.getEncodingOfMethod(method).replace('/', '.')); } - + data_out.close(); byte[] sha = md.digest(); result = 0; @@ -1008,7 +1008,7 @@ outer: * @param clazz Class to retrieve 'serialPersistentFields' from. * @return The content of 'serialPersistentFields'. */ - private ObjectStreamField[] getSerialPersistentFields(Class clazz) + private ObjectStreamField[] getSerialPersistentFields(Class clazz) throws NoSuchFieldException, IllegalAccessException { ObjectStreamField[] fieldsArray = null; @@ -1021,12 +1021,12 @@ outer: int modifiers = f.getModifiers(); if (!(Modifier.isStatic(modifiers) && - Modifier.isFinal(modifiers) && - Modifier.isPrivate(modifiers))) + Modifier.isFinal(modifiers) && + Modifier.isPrivate(modifiers))) return null; - + o = (ObjectStreamField[]) f.get(null); - + if (o == null) return null; @@ -1047,40 +1047,40 @@ outer: { synchronized(this) { - if (constructor == null) - { - try - { - final Constructor c = clazz.getConstructor(new Class[0]); + if (constructor == null) + { + try + { + final Constructor c = clazz.getConstructor(new Class[0]); - AccessController.doPrivileged(new PrivilegedAction() - { - public Object run() - { - c.setAccessible(true); - return null; - } - }); + AccessController.doPrivileged(new PrivilegedAction() + { + public Object run() + { + c.setAccessible(true); + return null; + } + }); - constructor = c; - } - catch(NoSuchMethodException x) - { - throw new InvalidClassException(clazz.getName(), - "No public zero-argument constructor"); - } - } + constructor = c; + } + catch(NoSuchMethodException x) + { + throw new InvalidClassException(clazz.getName(), + "No public zero-argument constructor"); + } + } } try { - return (Externalizable)constructor.newInstance(); + return (Externalizable)constructor.newInstance(); } catch(Exception x) { - throw (InvalidClassException) - new InvalidClassException(clazz.getName(), - "Unable to instantiate").initCause(x); + throw (InvalidClassException) + new InvalidClassException(clazz.getName(), + "Unable to instantiate").initCause(x); } } @@ -1153,7 +1153,7 @@ outer: if (comp == 0) return TypeSignature.getEncodingOfMember(m1). - compareTo(TypeSignature.getEncodingOfMember(m2)); + compareTo(TypeSignature.getEncodingOfMember(m2)); else return comp; } diff --git a/libjava/classpath/java/io/ObjectStreamConstants.java b/libjava/classpath/java/io/ObjectStreamConstants.java index a29db2a0e2c..8f70196c9c7 100644 --- a/libjava/classpath/java/io/ObjectStreamConstants.java +++ b/libjava/classpath/java/io/ObjectStreamConstants.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,24 +45,24 @@ package java.io; * ObjectInputStream, and ObjectStreamClass. * The values for these constants are specified by the Java library * specification. - * + * * @since 1.1 */ public interface ObjectStreamConstants { - /** + /** * The serialization stream protocol version 1. This version was * the default serialization protocol before JDK 1.2. - * + * * @see ObjectOutputStream#useProtocolVersion(int) * @since 1.2 */ int PROTOCOL_VERSION_1 = 1; - - /** + + /** * The serialization stream protocol version 2. This version is * used as the default serialization protocol since JDK 1.2. - * + * * @see ObjectOutputStream#useProtocolVersion(int) * @since 1.2 */ @@ -72,7 +72,7 @@ public interface ObjectStreamConstants * The magic number that is written as part of the stream header. */ short STREAM_MAGIC = (short)0xaced; - + /** * The stream version number that is written as part of the stream header. * Note that this is different from the protocol version that specifies @@ -84,70 +84,70 @@ public interface ObjectStreamConstants * Token value to designate a null reference in the stream. */ byte TC_NULL = (byte)112; //0x70 - + /** * Token value to designate a reference to an already serialized object. */ byte TC_REFERENCE = (byte)113; //0x71 - + /** * Token value to designate a class descriptor is next in the stream. */ byte TC_CLASSDESC = (byte)114; //0x72 - + /** - * Token value to designate a new object is next in the stream. + * Token value to designate a new object is next in the stream. */ byte TC_OBJECT = (byte)115; //0x73 - + /** * Token value to designate a new string is next in the stream. */ byte TC_STRING = (byte)116; //0x74 - + /** * Token value to designate a new array is next in the stream. */ byte TC_ARRAY = (byte)117; //0x75 - + /** * Token reference to designate a reference to a class. */ byte TC_CLASS = (byte)118; //0x76 - + /** * Token value to designate a block of primitive data is next in the stream. * The next byte in the stream holds the size of the block (in bytes). */ byte TC_BLOCKDATA = (byte)119; //0x77 - + /** * Token value to designate the end of a block of primitve data. */ byte TC_ENDBLOCKDATA = (byte)120; //0x78 - + /** * Token value to designate a reset of the stream state. */ byte TC_RESET = (byte)121; //0x79 - + /** * Token value to designate a long block of primitive data is next in the * stream. The next long in the stream holds the size of the block - * (in bytes). + * (in bytes). */ byte TC_BLOCKDATALONG = (byte)122; //0x7A - + /** * Token value to designate an exception occured during serialization. */ byte TC_EXCEPTION = (byte)123; //0x7B - + /** * Token value to designate a long string is next in the stream. */ byte TC_LONGSTRING = (byte)124; //0x7C - + /** * Token value to designate a proxy class descriptor is next in the stream. */ @@ -155,16 +155,16 @@ public interface ObjectStreamConstants /** * Token value to designate an enum constant is next in the stream. - * + * * @since 1.5 */ byte TC_ENUM = (byte)126; //0x7E - + /** * The first token value. */ byte TC_BASE = TC_NULL; - + /** * The last token value. */ @@ -180,23 +180,23 @@ public interface ObjectStreamConstants * defines the writeObject method. */ byte SC_WRITE_METHOD = 0x01; - + /** * Flag used in ObjectStreamClass to designate that the class * is serializeable. */ byte SC_SERIALIZABLE = 0x02; - + /** * Flag used in ObjectStreamClass to designate that the class * is externalizable. */ byte SC_EXTERNALIZABLE = 0x04; - + /** * Flag used in ObjectStreamClass to designate that * externalizable data is written in block data mode. - * + * * @since 1.2 */ byte SC_BLOCK_DATA = 0x08; @@ -204,11 +204,11 @@ public interface ObjectStreamConstants /** * Flag used in ObjectStreamClass to designate that the class * is an enum constant. - * + * * @since 1.5 */ byte SC_ENUM = 0x10; - + /** * Constant for use with a SecurityManager to check if * substitution of objects is allowed. @@ -224,4 +224,3 @@ public interface ObjectStreamConstants SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION = new SerializablePermission("enableSubclassImplementation"); } - diff --git a/libjava/classpath/java/io/ObjectStreamField.java b/libjava/classpath/java/io/ObjectStreamField.java index 91f557870a5..dfb6728a7ef 100644 --- a/libjava/classpath/java/io/ObjectStreamField.java +++ b/libjava/classpath/java/io/ObjectStreamField.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -55,7 +55,7 @@ import java.security.PrivilegedAction; * @author Michael Koch (konqueror@gmx.de) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) */ -public class ObjectStreamField +public class ObjectStreamField implements Comparable { private String name; @@ -74,7 +74,7 @@ public class ObjectStreamField } /** - * This constructor creates an ObjectStreamField instance + * This constructor creates an ObjectStreamField instance * which represents a field named name and is * of the type type. * @@ -87,7 +87,7 @@ public class ObjectStreamField } /** - * This constructor creates an ObjectStreamField instance + * This constructor creates an ObjectStreamField instance * which represents a field named name and is * of the type type. * @@ -105,9 +105,9 @@ public class ObjectStreamField this.typename = TypeSignature.getEncodingOfClass(type); this.unshared = unshared; } - + /** - * There are many cases you can not get java.lang.Class from typename + * There are many cases you can not get java.lang.Class from typename * if your context class loader cannot load it, then use typename to * construct the field. * @@ -130,7 +130,7 @@ public class ObjectStreamField { } } - + /** * This method returns the name of the field represented by the * ObjectStreamField instance. @@ -169,7 +169,7 @@ public class ObjectStreamField * {@link #getTypeCode()} in the case the type is a real * class (and not a primitive). * - * @return The name of the type (class name) if it is not a + * @return The name of the type (class name) if it is not a * primitive, in the other case null is returned. */ public String getTypeString () @@ -195,7 +195,7 @@ public class ObjectStreamField /** * This method sets the current offset of the field. - * + * * @param off The offset of the field in bytes. * @see #getOffset() */ @@ -255,7 +255,7 @@ public class ObjectStreamField * the field should not be changed when the stream is read (if it is not * explicitly specified using serialPersistentFields). * - * @param persistent True if the field is persistent, false in the + * @param persistent True if the field is persistent, false in the * other cases. * @see #isPersistent() */ @@ -276,7 +276,7 @@ public class ObjectStreamField } /** - * This method is specific to classpath's implementation and so + * This method is specific to classpath's implementation and so * has the default access. It changes the state of this field as * to be set by ObjectInputStream. * @@ -312,16 +312,16 @@ public class ObjectStreamField void lookupField(Class clazz) throws NoSuchFieldException, SecurityException { final Field f = clazz.getDeclaredField(name); - + AccessController.doPrivileged(new PrivilegedAction() { - public Object run() - { - f.setAccessible(true); - return null; - } + public Object run() + { + f.setAccessible(true); + return null; + } }); - + this.field = f; } @@ -340,8 +340,8 @@ public class ObjectStreamField if (!ftype.isAssignableFrom(type)) throw new InvalidClassException - ("invalid field type for " + name + - " in class " + field.getDeclaringClass()); + ("invalid field type for " + name + + " in class " + field.getDeclaringClass()); } /** @@ -356,19 +356,19 @@ public class ObjectStreamField final void setBooleanField(Object obj, boolean val) { - VMObjectStreamClass.setBooleanNative(field, obj, val); + VMObjectStreamClass.setBooleanNative(field, obj, val); } final void setByteField(Object obj, byte val) { VMObjectStreamClass.setByteNative(field, obj, val); } - + final void setCharField(Object obj, char val) { VMObjectStreamClass.setCharNative(field, obj, val); } - + final void setShortField(Object obj, short val) { VMObjectStreamClass.setShortNative(field, obj, val); @@ -378,24 +378,24 @@ public class ObjectStreamField { VMObjectStreamClass.setIntNative(field, obj, val); } - + final void setLongField(Object obj, long val) { VMObjectStreamClass.setLongNative(field, obj, val); } - + final void setFloatField(Object obj, float val) { VMObjectStreamClass.setFloatNative(field, obj, val); } - + final void setDoubleField(Object obj, double val) { VMObjectStreamClass.setDoubleNative(field, obj, val); } - + final void setObjectField(Object obj, Object val) - { + { VMObjectStreamClass.setObjectNative(field, obj, val); } } diff --git a/libjava/classpath/java/io/OutputStream.java b/libjava/classpath/java/io/OutputStream.java index e3caa70f19c..5ba9478e32e 100644 --- a/libjava/classpath/java/io/OutputStream.java +++ b/libjava/classpath/java/io/OutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,10 +39,10 @@ exception statement from your version. */ package java.io; /** - * This abstract class forms the base of the hierarchy of classes that + * This abstract class forms the base of the hierarchy of classes that * write output as a stream of bytes. It provides a common set of methods * for writing bytes to stream. Subclasses implement and/or extend these - * methods to write bytes in a particular manner or to a particular + * methods to write bytes in a particular manner or to a particular * destination such as a file on disk or network connection. * * @author Aaron M. Renn (arenn@urbanophile.com) @@ -65,7 +65,7 @@ public abstract class OutputStream implements Closeable, Flushable * Subclasses must provide an implementation of this abstract method * * @param b The byte to be written to the output stream, passed as - * the low eight bits of an int + * the low eight bits of an int * * @exception IOException If an error occurs */ @@ -98,7 +98,7 @@ public abstract class OutputStream implements Closeable, Flushable * @param b The array of bytes to write from * @param off The index into the array to start writing from * @param len The number of bytes to write - * + * * @exception IOException If an error occurs */ public void write (byte[] b, int off, int len) diff --git a/libjava/classpath/java/io/OutputStreamWriter.java b/libjava/classpath/java/io/OutputStreamWriter.java index 5ccceed70b0..27067fdb951 100644 --- a/libjava/classpath/java/io/OutputStreamWriter.java +++ b/libjava/classpath/java/io/OutputStreamWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -79,7 +79,7 @@ import java.nio.charset.MalformedInputException; * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Per Bothner (bothner@cygnus.com) - * @date April 17, 1998. + * @date April 17, 1998. */ public class OutputStreamWriter extends Writer { @@ -111,13 +111,13 @@ public class OutputStreamWriter extends Writer * design, there is no way to determine which encodings are supported. * * @param out The OutputStream to write to - * @param encoding_scheme The name of the encoding scheme to use for + * @param encoding_scheme The name of the encoding scheme to use for * character to byte translation * - * @exception UnsupportedEncodingException If the named encoding is + * @exception UnsupportedEncodingException If the named encoding is * not available. */ - public OutputStreamWriter (OutputStream out, String encoding_scheme) + public OutputStreamWriter (OutputStream out, String encoding_scheme) throws UnsupportedEncodingException { CharsetEncoder encoder; @@ -125,58 +125,58 @@ public class OutputStreamWriter extends Writer this.out = out; outputBuffer = CharBuffer.allocate(BUFFER_SIZE); - try + try { - // Don't use NIO if avoidable - if(EncodingHelper.isISOLatin1(encoding_scheme)) - { - encodingName = "ISO8859_1"; - encoder = null; - } + // Don't use NIO if avoidable + if(EncodingHelper.isISOLatin1(encoding_scheme)) + { + encodingName = "ISO8859_1"; + encoder = null; + } else - { - /* - * Workaround for encodings with a byte-order-mark. - * We only want to write it once per stream. - */ - try - { - if(encoding_scheme.equalsIgnoreCase("UnicodeBig") || - encoding_scheme.equalsIgnoreCase("UTF-16") || - encoding_scheme.equalsIgnoreCase("UTF16")) - { - encoding_scheme = "UTF-16BE"; - out.write((byte)0xFE); - out.write((byte)0xFF); - } - else if(encoding_scheme.equalsIgnoreCase("UnicodeLittle")) - { - encoding_scheme = "UTF-16LE"; - out.write((byte)0xFF); - out.write((byte)0xFE); - } - } - catch(IOException ioe) - { - } - - Charset cs = EncodingHelper.getCharset(encoding_scheme); - if(cs == null) - throw new UnsupportedEncodingException("Encoding "+encoding_scheme+ - " unknown"); - encoder = cs.newEncoder(); - encodingName = EncodingHelper.getOldCanonical(cs.name()); - - encoder.onMalformedInput(CodingErrorAction.REPLACE); - encoder.onUnmappableCharacter(CodingErrorAction.REPLACE); - } - } - catch(RuntimeException e) + { + /* + * Workaround for encodings with a byte-order-mark. + * We only want to write it once per stream. + */ + try + { + if(encoding_scheme.equalsIgnoreCase("UnicodeBig") || + encoding_scheme.equalsIgnoreCase("UTF-16") || + encoding_scheme.equalsIgnoreCase("UTF16")) + { + encoding_scheme = "UTF-16BE"; + out.write((byte)0xFE); + out.write((byte)0xFF); + } + else if(encoding_scheme.equalsIgnoreCase("UnicodeLittle")) + { + encoding_scheme = "UTF-16LE"; + out.write((byte)0xFF); + out.write((byte)0xFE); + } + } + catch(IOException ioe) + { + } + + Charset cs = EncodingHelper.getCharset(encoding_scheme); + if(cs == null) + throw new UnsupportedEncodingException("Encoding "+encoding_scheme+ + " unknown"); + encoder = cs.newEncoder(); + encodingName = EncodingHelper.getOldCanonical(cs.name()); + + encoder.onMalformedInput(CodingErrorAction.REPLACE); + encoder.onUnmappableCharacter(CodingErrorAction.REPLACE); + } + } + catch(RuntimeException e) { - // Default to ISO Latin-1, will happen if this is called, for instance, - // before the NIO provider is loadable. - encoder = null; - encodingName = "ISO8859_1"; + // Default to ISO Latin-1, will happen if this is called, for instance, + // before the NIO provider is loadable. + encoder = null; + encodingName = "ISO8859_1"; } this.encoder = encoder; this.encodingName = encodingName; @@ -194,23 +194,23 @@ public class OutputStreamWriter extends Writer String encodingName; this.out = out; outputBuffer = CharBuffer.allocate(BUFFER_SIZE); - try + try { - String encoding = System.getProperty("file.encoding"); - Charset cs = Charset.forName(encoding); - encoder = cs.newEncoder(); - encodingName = EncodingHelper.getOldCanonical(cs.name()); - } - catch(RuntimeException e) + String encoding = System.getProperty("file.encoding"); + Charset cs = Charset.forName(encoding); + encoder = cs.newEncoder(); + encodingName = EncodingHelper.getOldCanonical(cs.name()); + } + catch(RuntimeException e) { - encoder = null; - encodingName = "ISO8859_1"; + encoder = null; + encodingName = "ISO8859_1"; } if(encoder != null) { - encoder.onMalformedInput(CodingErrorAction.REPLACE); - encoder.onUnmappableCharacter(CodingErrorAction.REPLACE); + encoder.onMalformedInput(CodingErrorAction.REPLACE); + encoder.onUnmappableCharacter(CodingErrorAction.REPLACE); } this.encoder = encoder; this.encodingName = encodingName; @@ -222,7 +222,7 @@ public class OutputStreamWriter extends Writer * * @param out The OutputStream to write to * @param cs The Charset of the encoding to use - * + * * @since 1.5 */ public OutputStreamWriter(OutputStream out, Charset cs) @@ -234,7 +234,7 @@ public class OutputStreamWriter extends Writer outputBuffer = CharBuffer.allocate(BUFFER_SIZE); encodingName = EncodingHelper.getOldCanonical(cs.name()); } - + /** * This method initializes a new instance of OutputStreamWriter * to write to the specified stream using a given @@ -242,7 +242,7 @@ public class OutputStreamWriter extends Writer * * @param out The OutputStream to write to * @param enc The CharsetEncoder to encode the output with - * + * * @since 1.5 */ public OutputStreamWriter(OutputStream out, CharsetEncoder enc) @@ -258,7 +258,7 @@ public class OutputStreamWriter extends Writer } /** - * This method closes this stream, and the underlying + * This method closes this stream, and the underlying * OutputStream * * @exception IOException If an error occurs @@ -291,17 +291,17 @@ public class OutputStreamWriter extends Writer */ public void flush () throws IOException { - if(out != null){ - if(outputBuffer != null){ - char[] buf = new char[outputBuffer.position()]; - if(buf.length > 0){ - outputBuffer.flip(); - outputBuffer.get(buf); - writeConvert(buf, 0, buf.length); - outputBuffer.clear(); - } - } - out.flush (); + if(out != null){ + if(outputBuffer != null){ + char[] buf = new char[outputBuffer.position()]; + if(buf.length > 0){ + outputBuffer.flip(); + outputBuffer.get(buf); + writeConvert(buf, 0, buf.length); + outputBuffer.clear(); + } + } + out.flush (); } } @@ -324,71 +324,71 @@ public class OutputStreamWriter extends Writer throw new IOException("Buffer is null."); if(outputBuffer != null) - { - if(count >= outputBuffer.remaining()) - { - int r = outputBuffer.remaining(); - outputBuffer.put(buf, offset, r); - writeConvert(outputBuffer.array(), 0, BUFFER_SIZE); - outputBuffer.clear(); - offset += r; - count -= r; - // if the remaining bytes is larger than the whole buffer, - // just don't buffer. - if(count >= outputBuffer.remaining()){ + { + if(count >= outputBuffer.remaining()) + { + int r = outputBuffer.remaining(); + outputBuffer.put(buf, offset, r); + writeConvert(outputBuffer.array(), 0, BUFFER_SIZE); + outputBuffer.clear(); + offset += r; + count -= r; + // if the remaining bytes is larger than the whole buffer, + // just don't buffer. + if(count >= outputBuffer.remaining()){ writeConvert(buf, offset, count); - return; - } - } - outputBuffer.put(buf, offset, count); - } else writeConvert(buf, offset, count); + return; + } + } + outputBuffer.put(buf, offset, count); + } else writeConvert(buf, offset, count); } /** * Converts and writes characters. */ - private void writeConvert (char[] buf, int offset, int count) + private void writeConvert (char[] buf, int offset, int count) throws IOException { if(encoder == null) { byte[] b = new byte[count]; for(int i=0;icount bytes from the specified + * This method writes count bytes from the specified * String starting at position offset into the * String. * * @param str The String to write chars from - * @param offset The position in the String to start + * @param offset The position in the String to start * writing chars from * @param count The number of chars to write * @@ -411,20 +411,19 @@ public class OutputStreamWriter extends Writer */ public void write (int ch) throws IOException { - // No buffering, no encoding ... just pass through - if (encoder == null && outputBuffer == null) { - out.write(nullConversion((char)ch)); - } else { - if (outputBuffer != null) { - if (outputBuffer.remaining() == 0) { - writeConvert(outputBuffer.array(), 0, BUFFER_SIZE); - outputBuffer.clear(); - } - outputBuffer.put((char)ch); - } else { - writeConvert(new char[]{ (char)ch }, 0, 1); - } - } + // No buffering, no encoding ... just pass through + if (encoder == null && outputBuffer == null) { + out.write(nullConversion((char)ch)); + } else { + if (outputBuffer != null) { + if (outputBuffer.remaining() == 0) { + writeConvert(outputBuffer.array(), 0, BUFFER_SIZE); + outputBuffer.clear(); + } + outputBuffer.put((char)ch); + } else { + writeConvert(new char[]{ (char)ch }, 0, 1); + } + } } } // class OutputStreamWriter - diff --git a/libjava/classpath/java/io/PipedInputStream.java b/libjava/classpath/java/io/PipedInputStream.java index 924cc6662f0..0171a1b6fee 100644 --- a/libjava/classpath/java/io/PipedInputStream.java +++ b/libjava/classpath/java/io/PipedInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,21 +37,21 @@ exception statement from your version. */ package java.io; -// NOTE: This implementation is very similar to that of PipedReader. If you -// fix a bug in here, chances are you should make a similar change to the +// NOTE: This implementation is very similar to that of PipedReader. If you +// fix a bug in here, chances are you should make a similar change to the // PipedReader code. /** * An input stream that reads its bytes from an output stream - * to which it is connected. + * to which it is connected. *

        * Data is read and written to an internal buffer. It is highly recommended - * that the PipedInputStream and connected + * that the PipedInputStream and connected * PipedOutputStream - * be part of different threads. If they are not, the read and write + * be part of different threads. If they are not, the read and write * operations could deadlock their thread. * - * @specnote The JDK implementation appears to have some undocumented + * @specnote The JDK implementation appears to have some undocumented * functionality where it keeps track of what thread is writing * to pipe and throws an IOException if that thread susequently * dies. This behaviour seems dubious and unreliable - we don't @@ -61,7 +61,7 @@ package java.io; */ public class PipedInputStream extends InputStream { - /** PipedOutputStream to which this is connected. Null only if this + /** PipedOutputStream to which this is connected. Null only if this * InputStream hasn't been connected yet. */ PipedOutputStream source; @@ -86,7 +86,7 @@ public class PipedInputStream extends InputStream /** * The index into buffer where the next byte from the connected - * PipedOutputStream will be written. If this variable is + * PipedOutputStream will be written. If this variable is * equal to out, then the buffer is full. If set to < 0, * the buffer is empty. */ @@ -101,8 +101,8 @@ public class PipedInputStream extends InputStream private byte[] read_buf = new byte[1]; /** - * Creates a new PipedInputStream that is not connected to a - * PipedOutputStream. It must be connected before bytes can + * Creates a new PipedInputStream that is not connected to a + * PipedOutputStream. It must be connected before bytes can * be read from this stream. */ public PipedInputStream() @@ -114,24 +114,24 @@ public class PipedInputStream extends InputStream * Creates a new PipedInputStream of the given size that is not * connected to a PipedOutputStream. * It must be connected before bytes can be read from this stream. - * + * * @since 1.6 * @since IllegalArgumentException If pipeSize <= 0. */ - public PipedInputStream(int pipeSize) throws IllegalArgumentException + public PipedInputStream(int pipeSize) throws IllegalArgumentException { if (pipeSize <= 0) throw new IllegalArgumentException("pipeSize must be > 0"); - + this.buffer = new byte[pipeSize]; } - + /** * This constructor creates a new PipedInputStream and connects - * it to the passed in PipedOutputStream. The stream is then + * it to the passed in PipedOutputStream. The stream is then * ready for reading. * - * @param source The PipedOutputStream to connect this + * @param source The PipedOutputStream to connect this * stream to * * @exception IOException If source is already connected. @@ -147,7 +147,7 @@ public class PipedInputStream extends InputStream * size and connects it to the passed in PipedOutputStream. * The stream is then ready for reading. * - * @param source The PipedOutputStream to connect this + * @param source The PipedOutputStream to connect this * stream to * * @since 1.6 @@ -159,30 +159,30 @@ public class PipedInputStream extends InputStream this(pipeSize); connect(source); } - + /** - * This method connects this stream to the passed in + * This method connects this stream to the passed in * PipedOutputStream. * This stream is then ready for reading. If this stream is already * connected or has been previously closed, then an exception is thrown * * @param source The PipedOutputStream to connect this stream to * - * @exception IOException If this PipedInputStream or source + * @exception IOException If this PipedInputStream or source * has been connected already. */ public void connect(PipedOutputStream source) throws IOException { - // The JDK (1.3) does not appear to check for a previously closed + // The JDK (1.3) does not appear to check for a previously closed // connection here. - + if (this.source != null || source.sink != null) throw new IOException ("Already connected"); - + source.sink = this; this.source = source; } - + /** * This method receives a byte of input from the source PipedOutputStream. * If the internal circular buffer is full, this method blocks. @@ -210,7 +210,7 @@ public class PipedInputStream extends InputStream * @specnote This code should be in PipedOutputStream.write, but we * put it here in order to support that bizarre recieve(int) * method. - */ + */ synchronized void receive(byte[] buf, int offset, int len) throws IOException { @@ -219,59 +219,59 @@ public class PipedInputStream extends InputStream int bufpos = offset; int copylen; - + while (len > 0) { try - { - while (in == out) - { - // The pipe is full. Wake up any readers and wait for them. - notifyAll(); - wait(); - // The pipe could have been closed while we were waiting. - if (closed) - throw new IOException ("Pipe closed"); - } - } - catch (InterruptedException ix) - { + { + while (in == out) + { + // The pipe is full. Wake up any readers and wait for them. + notifyAll(); + wait(); + // The pipe could have been closed while we were waiting. + if (closed) + throw new IOException ("Pipe closed"); + } + } + catch (InterruptedException ix) + { throw new InterruptedIOException (); - } + } - if (in < 0) // The pipe is empty. - in = 0; - - // Figure out how many bytes from buf can be copied without - // overrunning out or going past the length of the buffer. - if (in < out) - copylen = Math.min (len, out - in); - else - copylen = Math.min (len, buffer.length - in); + if (in < 0) // The pipe is empty. + in = 0; - // Copy bytes until the pipe is filled, wrapping if necessary. - System.arraycopy(buf, bufpos, buffer, in, copylen); - len -= copylen; - bufpos += copylen; - in += copylen; - if (in == buffer.length) - in = 0; + // Figure out how many bytes from buf can be copied without + // overrunning out or going past the length of the buffer. + if (in < out) + copylen = Math.min (len, out - in); + else + copylen = Math.min (len, buffer.length - in); + + // Copy bytes until the pipe is filled, wrapping if necessary. + System.arraycopy(buf, bufpos, buffer, in, copylen); + len -= copylen; + bufpos += copylen; + in += copylen; + if (in == buffer.length) + in = 0; } // Notify readers that new data is in the pipe. notifyAll(); } - + /** * This method reads one byte from the stream. * -1 is returned to indicated that no bytes can be read * because the end of the stream was reached. If the stream is already * closed, a -1 will again be returned to indicate the end of the stream. - * + * *

        This method will block if no byte is available to be read.

        * * @return the value of the read byte value, or -1 of the end of the stream * was reached - * + * * @throws IOException if an error occured */ public int read() throws IOException @@ -285,14 +285,14 @@ public class PipedInputStream extends InputStream int r = read(read_buf, 0, 1); return r != -1 ? (read_buf[0] & 0xff) : -1; } - + /** * This method reads bytes from the stream into a caller supplied buffer. - * It starts storing bytes at position offset into the + * It starts storing bytes at position offset into the * buffer and - * reads a maximum of len bytes. Note that this method + * reads a maximum of len bytes. Note that this method * can actually - * read fewer than len bytes. The actual number of bytes + * read fewer than len bytes. The actual number of bytes * read is * returned. A -1 is returned to indicated that no bytes can be read * because the end of the stream was reached - ie close() was called on the @@ -306,7 +306,7 @@ public class PipedInputStream extends InputStream * * @exception IOException If close() was called on this Piped * InputStream. - */ + */ public synchronized int read(byte[] buf, int offset, int len) throws IOException { @@ -319,61 +319,61 @@ public class PipedInputStream extends InputStream if (len == 0) return 0; - // If the buffer is empty, wait until there is something in the pipe + // If the buffer is empty, wait until there is something in the pipe // to read. try { - while (in < 0) - { - if (source.closed) - return -1; - wait(); - } + while (in < 0) + { + if (source.closed) + return -1; + wait(); + } } catch (InterruptedException ix) { throw new InterruptedIOException(); } - + int total = 0; int copylen; - + while (true) { - // Figure out how many bytes from the pipe can be copied without - // overrunning in or going past the length of buf. - if (out < in) - copylen = Math.min (len, in - out); - else - copylen = Math.min (len, buffer.length - out); + // Figure out how many bytes from the pipe can be copied without + // overrunning in or going past the length of buf. + if (out < in) + copylen = Math.min (len, in - out); + else + copylen = Math.min (len, buffer.length - out); System.arraycopy (buffer, out, buf, offset, copylen); - offset += copylen; - len -= copylen; - out += copylen; - total += copylen; - - if (out == buffer.length) - out = 0; - - if (out == in) - { - // Pipe is now empty. - in = -1; - out = 0; - } + offset += copylen; + len -= copylen; + out += copylen; + total += copylen; + + if (out == buffer.length) + out = 0; + + if (out == in) + { + // Pipe is now empty. + in = -1; + out = 0; + } // If output buffer is filled or the pipe is empty, we're done. - if (len == 0 || in == -1) - { - // Notify any waiting outputstream that there is now space - // to write. - notifyAll(); - return total; - } + if (len == 0 || in == -1) + { + // Notify any waiting outputstream that there is now space + // to write. + notifyAll(); + return total; + } } } - + /** * This method returns the number of bytes that can be read from this stream * before blocking could occur. This is the number of bytes that are @@ -384,12 +384,12 @@ public class PipedInputStream extends InputStream * @return The number of bytes that can be read before blocking might occur * * @exception IOException If an error occurs - */ + */ public synchronized int available() throws IOException { - // The JDK 1.3 implementation does not appear to check for the closed or + // The JDK 1.3 implementation does not appear to check for the closed or // unconnected stream conditions here. - + if (in < 0) return 0; else if (out < in) @@ -397,7 +397,7 @@ public class PipedInputStream extends InputStream else return (buffer.length - out) + in; } - + /** * This methods closes the stream so that no more data can be read * from it. @@ -411,4 +411,3 @@ public class PipedInputStream extends InputStream notifyAll(); } } - diff --git a/libjava/classpath/java/io/PipedOutputStream.java b/libjava/classpath/java/io/PipedOutputStream.java index 81881050d1b..839cb1e228b 100644 --- a/libjava/classpath/java/io/PipedOutputStream.java +++ b/libjava/classpath/java/io/PipedOutputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,16 +38,16 @@ exception statement from your version. */ package java.io; -// NOTE: This implementation is very similar to that of PipedWriter. If you -// fix a bug in here, chances are you should make a similar change to the +// NOTE: This implementation is very similar to that of PipedWriter. If you +// fix a bug in here, chances are you should make a similar change to the // PipedWriter code. /** - * This class writes its bytes to a PipedInputStream to + * This class writes its bytes to a PipedInputStream to * which it is connected. *

        * It is highly recommended that a PipedOutputStream and its - * connected PipedInputStream be in different threads. If + * connected PipedInputStream be in different threads. If * they are in the same thread, read and write operations could deadlock * the thread. * @@ -55,14 +55,14 @@ package java.io; */ public class PipedOutputStream extends OutputStream { - /** Target PipedInputStream to which this is connected. Null only if this + /** Target PipedInputStream to which this is connected. Null only if this * OutputStream hasn't been connected yet. */ PipedInputStream sink; - + /** Set to true if close() has been called on this OutputStream. */ boolean closed; - - /** + + /** * Create an unconnected PipedOutputStream. It must be connected * to a PipedInputStream using the connect * method prior to writing any data or an exception will be thrown. @@ -78,7 +78,7 @@ public class PipedOutputStream extends OutputStream * * @param sink The PipedInputStream to connect this stream to. * - * @exception IOException If sink has already been connected + * @exception IOException If sink has already been connected * to a different PipedOutputStream. */ public PipedOutputStream(PipedInputStream sink) throws IOException @@ -87,7 +87,7 @@ public class PipedOutputStream extends OutputStream } /** - * Connects this object to the specified PipedInputStream + * Connects this object to the specified PipedInputStream * object. This stream will then be ready for writing. * * @param sink The PipedInputStream to connect this stream to @@ -103,29 +103,29 @@ public class PipedOutputStream extends OutputStream } /** - * Write a single byte of date to the stream. Note that this method will - * block if the PipedInputStream to which this object is + * Write a single byte of date to the stream. Note that this method will + * block if the PipedInputStream to which this object is * connected has a full buffer. * * @param b The byte of data to be written, passed as an int. * * @exception IOException If the stream has not been connected or has * been closed. - */ + */ public void write(int b) throws IOException { if (sink == null) throw new IOException ("Not connected"); if (closed) throw new IOException ("Pipe closed"); - + sink.receive (b); } - + /** * This method writes len bytes of data from the byte array * buf starting at index offset in the array - * to the stream. Note that this method will block if the + * to the stream. Note that this method will block if the * PipedInputStream to which this object is connected has * a buffer that cannot hold all of the bytes to be written. * @@ -142,7 +142,7 @@ public class PipedOutputStream extends OutputStream throw new IOException ("Not connected"); if (closed) throw new IOException ("Pipe closed"); - + sink.receive(buffer, offset, len); } @@ -157,7 +157,7 @@ public class PipedOutputStream extends OutputStream public void flush() throws IOException { } - + /** * This method closes this stream so that no more data can be written * to it. Any further attempts to write to this stream may throw an @@ -170,12 +170,12 @@ public class PipedOutputStream extends OutputStream // A close call on an unconnected PipedOutputStream has no effect. if (sink != null) { - closed = true; - // Notify any waiting readers that the stream is now closed. - synchronized (sink) - { - sink.notifyAll(); - } + closed = true; + // Notify any waiting readers that the stream is now closed. + synchronized (sink) + { + sink.notifyAll(); + } } } } diff --git a/libjava/classpath/java/io/PipedReader.java b/libjava/classpath/java/io/PipedReader.java index 8a3363a6004..4f449ffce3b 100644 --- a/libjava/classpath/java/io/PipedReader.java +++ b/libjava/classpath/java/io/PipedReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,20 +37,20 @@ exception statement from your version. */ package java.io; -// NOTE: This implementation is very similar to that of PipedInputStream. -// If you fix a bug in here, chances are you should make a similar change to +// NOTE: This implementation is very similar to that of PipedInputStream. +// If you fix a bug in here, chances are you should make a similar change to // the PipedInputStream code. /** - * An input stream that reads characters from a piped writer to which it is - * connected. + * An input stream that reads characters from a piped writer to which it is + * connected. *

        * Data is read and written to an internal buffer. It is highly recommended * that the PipedReader and connected PipedWriter * be part of different threads. If they are not, there is a possibility * that the read and write operations could deadlock their thread. * - * @specnote The JDK implementation appears to have some undocumented + * @specnote The JDK implementation appears to have some undocumented * functionality where it keeps track of what thread is writing * to pipe and throws an IOException if that thread susequently * dies. This behaviour seems dubious and unreliable - we don't @@ -60,7 +60,7 @@ package java.io; */ public class PipedReader extends Reader { - /** PipedWriter to which this is connected. Null only if this + /** PipedWriter to which this is connected. Null only if this * Reader hasn't been connected yet. */ PipedWriter source; @@ -80,7 +80,7 @@ public class PipedReader extends Reader /** * The index into buffer where the next char from the connected - * PipedWriter will be written. If this variable is + * PipedWriter will be written. If this variable is * equal to out, then the buffer is full. If set to < 0, * the buffer is empty. */ @@ -95,8 +95,8 @@ public class PipedReader extends Reader char[] read_buf = new char[1]; /** - * Creates a new PipedReader that is not connected to a - * PipedWriter. It must be connected before chars can + * Creates a new PipedReader that is not connected to a + * PipedWriter. It must be connected before chars can * be read from this stream. */ public PipedReader() @@ -105,7 +105,7 @@ public class PipedReader extends Reader /** * This constructor creates a new PipedReader and connects - * it to the passed in PipedWriter. The stream is then + * it to the passed in PipedWriter. The stream is then * ready for reading. * * @param source The PipedWriter to connect this stream to @@ -118,28 +118,28 @@ public class PipedReader extends Reader } /** - * This method connects this stream to the passed in + * This method connects this stream to the passed in * PipedWriter. * This stream is then ready for reading. If this stream is already * connected or has been previously closed, then an exception is thrown * * @param source The PipedWriter to connect this stream to * - * @exception IOException If this PipedReader or source + * @exception IOException If this PipedReader or source * has been connected already. */ public void connect(PipedWriter source) throws IOException { - // The JDK (1.3) does not appear to check for a previously closed + // The JDK (1.3) does not appear to check for a previously closed // connection here. - + if (this.source != null || source.sink != null) throw new IOException ("Already connected"); - + source.sink = this; this.source = source; } - + /** * This method is used by the connected PipedWriter to * write chars into the buffer. @@ -152,67 +152,67 @@ public class PipedReader extends Reader * @specnote This code should be in PipedWriter.write, but we * put it here in order to support that bizarre recieve(int) * method. - */ + */ void receive(char[] buf, int offset, int len) throws IOException { synchronized (lock) { if (closed) - throw new IOException ("Pipe closed"); + throw new IOException ("Pipe closed"); int bufpos = offset; int copylen; while (len > 0) - { + { try - { - while (in == out) - { - // The pipe is full. Wake up any readers and wait for them. - lock.notifyAll(); - lock.wait(); - // The pipe could have been closed while we were waiting. - if (closed) - throw new IOException ("Pipe closed"); - } - } - catch (InterruptedException ix) - { + { + while (in == out) + { + // The pipe is full. Wake up any readers and wait for them. + lock.notifyAll(); + lock.wait(); + // The pipe could have been closed while we were waiting. + if (closed) + throw new IOException ("Pipe closed"); + } + } + catch (InterruptedException ix) + { throw new InterruptedIOException (); - } + } - if (in < 0) // The pipe is empty. - in = 0; + if (in < 0) // The pipe is empty. + in = 0; - // Figure out how many chars from buf can be copied without - // overrunning out or going past the length of the buffer. - if (in < out) - copylen = Math.min (len, out - in); - else - copylen = Math.min (len, buffer.length - in); + // Figure out how many chars from buf can be copied without + // overrunning out or going past the length of the buffer. + if (in < out) + copylen = Math.min (len, out - in); + else + copylen = Math.min (len, buffer.length - in); - // Copy chars until the pipe is filled, wrapping if necessary. - System.arraycopy(buf, bufpos, buffer, in, copylen); - len -= copylen; - bufpos += copylen; - in += copylen; - if (in == buffer.length) - in = 0; - } + // Copy chars until the pipe is filled, wrapping if necessary. + System.arraycopy(buf, bufpos, buffer, in, copylen); + len -= copylen; + bufpos += copylen; + in += copylen; + if (in == buffer.length) + in = 0; + } // Notify readers that new data is in the pipe. lock.notifyAll(); } } - + /** * This method reads chars from the stream into a caller supplied buffer. - * It starts storing chars at position offset into the + * It starts storing chars at position offset into the * buffer and - * reads a maximum of len chars. Note that this method + * reads a maximum of len chars. Note that this method * can actually - * read fewer than len chars. The actual number of chars + * read fewer than len chars. The actual number of chars * read is * returned. A -1 is returned to indicated that no chars can be read * because the end of the stream was reached. If the stream is already @@ -231,12 +231,12 @@ public class PipedReader extends Reader int r = read(read_buf, 0, 1); return r != -1 ? read_buf[0] : -1; } - + /** - * This method reads characters from the stream into a caller supplied - * buffer. It starts storing chars at position offset into - * the buffer and reads a maximum of len chars. Note that - * this method can actually read fewer than len chars. + * This method reads characters from the stream into a caller supplied + * buffer. It starts storing chars at position offset into + * the buffer and reads a maximum of len chars. Note that + * this method can actually read fewer than len chars. * The actual number of chars read is * returned. A -1 is returned to indicated that no chars can be read * because the end of the stream was reached - ie close() was called on the @@ -250,102 +250,102 @@ public class PipedReader extends Reader * * @exception IOException If close() was called on this Piped * Reader. - */ + */ public int read(char[] buf, int offset, int len) throws IOException { synchronized (lock) { if (source == null) - throw new IOException ("Not connected"); + throw new IOException ("Not connected"); if (closed) - throw new IOException ("Pipe closed"); + throw new IOException ("Pipe closed"); // Don't block if nothing was requested. if (len == 0) return 0; - // If the buffer is empty, wait until there is something in the pipe + // If the buffer is empty, wait until there is something in the pipe // to read. try - { - while (in < 0) - { - if (source.closed) - return -1; - lock.wait(); - } - } + { + while (in < 0) + { + if (source.closed) + return -1; + lock.wait(); + } + } catch (InterruptedException ix) - { + { throw new InterruptedIOException(); - } + } int total = 0; int copylen; while (true) - { - // Figure out how many chars from the pipe can be copied without - // overrunning in or going past the length of buf. - if (out < in) - copylen = Math.min (len, in - out); - else - copylen = Math.min (len, buffer.length - out); + { + // Figure out how many chars from the pipe can be copied without + // overrunning in or going past the length of buf. + if (out < in) + copylen = Math.min (len, in - out); + else + copylen = Math.min (len, buffer.length - out); System.arraycopy (buffer, out, buf, offset, copylen); - offset += copylen; - len -= copylen; - out += copylen; - total += copylen; + offset += copylen; + len -= copylen; + out += copylen; + total += copylen; - if (out == buffer.length) - out = 0; + if (out == buffer.length) + out = 0; - if (out == in) - { - // Pipe is now empty. - in = -1; - out = 0; - } + if (out == in) + { + // Pipe is now empty. + in = -1; + out = 0; + } // If output buffer is filled or the pipe is empty, we're done. - if (len == 0 || in == -1) - { - // Notify any waiting Writer that there is now space - // to write. - lock.notifyAll(); - return total; - } - } + if (len == 0 || in == -1) + { + // Notify any waiting Writer that there is now space + // to write. + lock.notifyAll(); + return total; + } + } } } - + public boolean ready() throws IOException { - // The JDK 1.3 implementation does not appear to check for the closed or + // The JDK 1.3 implementation does not appear to check for the closed or // unconnected stream conditions here. However, checking for a // closed stream is explicitly required by the JDK 1.2 and 1.3 // documentation (for Reader.close()), so we do it. - + synchronized (lock) { if (closed) - throw new IOException("Pipe closed"); + throw new IOException("Pipe closed"); if (in < 0) - return false; + return false; int count; if (out < in) - count = in - out; + count = in - out; else - count = (buffer.length - out) - in; + count = (buffer.length - out) - in; return (count > 0); } } - + /** * This methods closes the stream so that no more data can be read * from it. @@ -362,4 +362,3 @@ public class PipedReader extends Reader } } } - diff --git a/libjava/classpath/java/io/PipedWriter.java b/libjava/classpath/java/io/PipedWriter.java index 92786e5de7d..0d48ab0e437 100644 --- a/libjava/classpath/java/io/PipedWriter.java +++ b/libjava/classpath/java/io/PipedWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,16 +38,16 @@ exception statement from your version. */ package java.io; -// NOTE: This implementation is very similar to that of PipedOutputStream. -// If you fix a bug in here, chances are you should make a similar change to +// NOTE: This implementation is very similar to that of PipedOutputStream. +// If you fix a bug in here, chances are you should make a similar change to // the PipedOutputStream code. /** - * This class writes its chars to a PipedReader to + * This class writes its chars to a PipedReader to * which it is connected. *

        * It is highly recommended that a PipedWriter and its - * connected PipedReader be in different threads. If + * connected PipedReader be in different threads. If * they are in the same thread, read and write operations could deadlock * the thread. * @@ -55,17 +55,17 @@ package java.io; */ public class PipedWriter extends Writer { - /** Target PipedReader to which this is connected. Null only if this + /** Target PipedReader to which this is connected. Null only if this * Writer hasn't been connected yet. */ PipedReader sink; - + /** Set to true if close() has been called on this Writer. */ boolean closed; /** Buffer used to implement single-argument write */ char[] read_buf = new char[1]; - - /** + + /** * Create an unconnected PipedWriter. It must be connected * to a PipedReader using the connect * method prior to writing any data or an exception will be thrown. @@ -81,7 +81,7 @@ public class PipedWriter extends Writer * * @param sink The PipedReader to connect this stream to. * - * @exception IOException If sink has already been connected + * @exception IOException If sink has already been connected * to a different PipedWriter. */ public PipedWriter(PipedReader sink) throws IOException @@ -90,7 +90,7 @@ public class PipedWriter extends Writer } /** - * Connects this object to the specified PipedReader + * Connects this object to the specified PipedReader * object. This stream will then be ready for writing. * * @param sink The PipedReader to connect this stream to @@ -106,25 +106,25 @@ public class PipedWriter extends Writer } /** - * Write a single char of date to the stream. Note that this method will - * block if the PipedReader to which this object is + * Write a single char of date to the stream. Note that this method will + * block if the PipedReader to which this object is * connected has a full buffer. * * @param b The char of data to be written, passed as an int. * * @exception IOException If the stream has not been connected or has * been closed. - */ + */ public void write(int b) throws IOException { read_buf[0] = (char) (b & 0xffff); sink.receive (read_buf, 0, 1); } - + /** * This method writes len chars of data from the char array * buf starting at index offset in the array - * to the stream. Note that this method will block if the + * to the stream. Note that this method will block if the * PipedReader to which this object is connected has * a buffer that cannot hold all of the chars to be written. * @@ -141,7 +141,7 @@ public class PipedWriter extends Writer throw new IOException ("Not connected"); if (closed) throw new IOException ("Pipe closed"); - + sink.receive(buffer, offset, len); } @@ -158,7 +158,7 @@ public class PipedWriter extends Writer if (closed) throw new IOException ("Pipe closed"); } - + /** * This method closes this stream so that no more data can be written * to it. Any further attempts to write to this stream may throw an @@ -171,12 +171,12 @@ public class PipedWriter extends Writer // A close call on an unconnected PipedWriter has no effect. if (sink != null) { - closed = true; - // Notify any waiting readers that the stream is now closed. - synchronized (sink) - { - sink.notifyAll(); - } + closed = true; + // Notify any waiting readers that the stream is now closed. + synchronized (sink) + { + sink.notifyAll(); + } } } } diff --git a/libjava/classpath/java/io/PrintStream.java b/libjava/classpath/java/io/PrintStream.java index 9347ac39795..eaab7c3d4b5 100644 --- a/libjava/classpath/java/io/PrintStream.java +++ b/libjava/classpath/java/io/PrintStream.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -53,7 +53,7 @@ import gnu.classpath.SystemProperties; * This class prints Java primitive values and object to a stream as * text. None of the methods in this class throw an exception. However, * errors can be detected by calling the checkError() method. - * Additionally, this stream can be designated as "autoflush" when + * Additionally, this stream can be designated as "autoflush" when * created so that any writes are automatically flushed to the underlying * output sink when the current line is terminated. *

        @@ -85,7 +85,7 @@ public class PrintStream extends FilterOutputStream implements Appendable private boolean error_occurred = false; /** - * This is true if auto-flush is enabled, + * This is true if auto-flush is enabled, * false otherwise */ private final boolean auto_flush; @@ -173,13 +173,13 @@ public class PrintStream extends FilterOutputStream implements Appendable * This method initializes a new PrintStream object to write * to the specified output sink. This constructor also allows "auto-flush" * functionality to be specified where the stream will be flushed after - * every print or println call, when the - * write methods with array arguments are called, or when a + * every print or println call, when the + * write methods with array arguments are called, or when a * single new-line character is written. *

        * * @param out The OutputStream to write to. - * @param auto_flush true to flush the stream after every + * @param auto_flush true to flush the stream after every * line, false otherwise */ public PrintStream (OutputStream out, boolean auto_flush) @@ -187,13 +187,13 @@ public class PrintStream extends FilterOutputStream implements Appendable super (out); String encoding; try { - encoding = SystemProperties.getProperty("file.encoding"); + encoding = SystemProperties.getProperty("file.encoding"); } catch (SecurityException e){ - encoding = "ISO8859_1"; + encoding = "ISO8859_1"; } catch (IllegalArgumentException e){ - encoding = "ISO8859_1"; + encoding = "ISO8859_1"; } catch (NullPointerException e){ - encoding = "ISO8859_1"; + encoding = "ISO8859_1"; } this.encoding = encoding; this.auto_flush = auto_flush; @@ -203,13 +203,13 @@ public class PrintStream extends FilterOutputStream implements Appendable * This method initializes a new PrintStream object to write * to the specified output sink. This constructor also allows "auto-flush" * functionality to be specified where the stream will be flushed after - * every print or println call, when the - * write methods with array arguments are called, or when a + * every print or println call, when the + * write methods with array arguments are called, or when a * single new-line character is written. *

        * * @param out The OutputStream to write to. - * @param auto_flush true to flush the stream after every + * @param auto_flush true to flush the stream after every * line, false otherwise * @param encoding The name of the character encoding to use for this * object. @@ -230,7 +230,7 @@ public class PrintStream extends FilterOutputStream implements Appendable * true forever for this stream. Before checking for an * error condition, this method flushes the stream. * - * @return true if an error has occurred, + * @return true if an error has occurred, * false otherwise */ public boolean checkError () @@ -255,16 +255,16 @@ public class PrintStream extends FilterOutputStream implements Appendable { try { - flush(); - out.close(); + flush(); + out.close(); } catch (InterruptedIOException iioe) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } catch (IOException e) { - setError (); + setError (); } } @@ -276,15 +276,15 @@ public class PrintStream extends FilterOutputStream implements Appendable { try { - out.flush(); + out.flush(); } catch (InterruptedIOException iioe) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } catch (IOException e) { - setError (); + setError (); } } @@ -293,39 +293,39 @@ public class PrintStream extends FilterOutputStream implements Appendable try { writeChars(str, 0, str.length()); - if (println) - writeChars(line_separator, 0, line_separator.length); - if (auto_flush) - flush(); + if (println) + writeChars(line_separator, 0, line_separator.length); + if (auto_flush) + flush(); } catch (InterruptedIOException iioe) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } catch (IOException e) { - setError (); + setError (); } } private synchronized void print (char[] chars, int pos, int len, - boolean println) + boolean println) { try { writeChars(chars, pos, len); - if (println) - writeChars(line_separator, 0, line_separator.length); - if (auto_flush) - flush(); + if (println) + writeChars(line_separator, 0, line_separator.length); + if (auto_flush) + flush(); } catch (InterruptedIOException iioe) { - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } catch (IOException e) { - setError (); + setError (); } } @@ -577,7 +577,7 @@ public class PrintStream extends FilterOutputStream implements Appendable * This method writes a byte of data to the stream. If auto-flush is * enabled, printing a newline character will cause the stream to be * flushed after the character is written. - * + * * @param oneByte The byte to be written */ public void write (int oneByte) @@ -585,13 +585,13 @@ public class PrintStream extends FilterOutputStream implements Appendable try { out.write (oneByte & 0xff); - + if (auto_flush && (oneByte == '\n')) flush (); } catch (InterruptedIOException iioe) { - Thread.currentThread ().interrupt (); + Thread.currentThread ().interrupt (); } catch (IOException e) { @@ -612,13 +612,13 @@ public class PrintStream extends FilterOutputStream implements Appendable try { out.write (buffer, offset, len); - + if (auto_flush) flush (); } catch (InterruptedIOException iioe) { - Thread.currentThread ().interrupt (); + Thread.currentThread ().interrupt (); } catch (IOException e) { diff --git a/libjava/classpath/java/io/PrintWriter.java b/libjava/classpath/java/io/PrintWriter.java index 5b4294cbaa7..a67a7f8aaf0 100644 --- a/libjava/classpath/java/io/PrintWriter.java +++ b/libjava/classpath/java/io/PrintWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.util.Formatter; * This class prints Java primitive values and objects to a stream as * text. None of the methods in this class throw an exception. However, * errors can be detected by calling the checkError() method. - * Additionally, this stream can be designated as "autoflush" when + * Additionally, this stream can be designated as "autoflush" when * created so that any writes are automatically flushed to the underlying * output sink whenever one of the println methods is * called. (Note that this differs from the PrintStream @@ -59,7 +59,7 @@ import java.util.Formatter; * * @author Per Bothner (bothner@cygnus.com) * @author Aaron M. Renn (arenn@urbanophile.com) - * @date April 17, 1998. + * @date April 17, 1998. */ public class PrintWriter extends Writer { @@ -73,7 +73,7 @@ public class PrintWriter extends Writer * on this stream. */ private boolean error; - + /** * Indicates whether or not the stream has been closed. */ @@ -105,7 +105,7 @@ public class PrintWriter extends Writer * every line is terminated or newline character is written. * * @param wr The Writer to write to. - * @param autoflush true to flush the stream after every + * @param autoflush true to flush the stream after every * line, false otherwise */ public PrintWriter(Writer wr, boolean autoflush) @@ -133,11 +133,11 @@ public class PrintWriter extends Writer /** * This method initializes a new PrintWriter object to write * to the specified OutputStream. Characters will be converted - * to chars using the system default encoding. This form of the + * to chars using the system default encoding. This form of the * constructor allows auto-flush functionality to be enabled if desired * * @param out The OutputStream to write to - * @param autoflush true to flush the stream after every + * @param autoflush true to flush the stream after every * println call, false otherwise. */ public PrintWriter(OutputStream out, boolean autoflush) @@ -152,7 +152,7 @@ public class PrintWriter extends Writer * OutputStreamWriter using the default encoding. * @param file name of the file to write to * @throws FileNotFoundException if the file cannot be written or created - * + * * @since 1.5 */ public PrintWriter(String file) throws FileNotFoundException @@ -168,10 +168,10 @@ public class PrintWriter extends Writer * @param enc the encoding to use * @throws FileNotFoundException if the file cannot be written or created * @throws UnsupportedEncodingException if the encoding is not supported - * + * * @since 1.5 */ - public PrintWriter(String file, String enc) + public PrintWriter(String file, String enc) throws FileNotFoundException, UnsupportedEncodingException { this(new OutputStreamWriter(new FileOutputStream(file), enc)); @@ -183,7 +183,7 @@ public class PrintWriter extends Writer * OutputStreamWriter using the default encoding. * @param file the file to write to * @throws FileNotFoundException if the file cannot be written or created - * + * * @since 1.5 */ public PrintWriter(File file) throws FileNotFoundException @@ -199,10 +199,10 @@ public class PrintWriter extends Writer * @param enc the encoding to use * @throws FileNotFoundException if the file cannot be written or created * @throws UnsupportedEncodingException if the encoding is not supported - * + * * @since 1.5 */ - public PrintWriter(File file, String enc) + public PrintWriter(File file, String enc) throws FileNotFoundException, UnsupportedEncodingException { this(new OutputStreamWriter(new FileOutputStream(file), enc)); @@ -223,7 +223,7 @@ public class PrintWriter extends Writer * true forever for this stream. Before checking for an * error condition, this method flushes the stream. * - * @return true if an error has occurred, + * @return true if an error has occurred, * false otherwise */ public boolean checkError() @@ -241,11 +241,11 @@ public class PrintWriter extends Writer { try { - out.flush(); + out.flush(); } catch (IOException ex) { - error = true; + error = true; } } @@ -261,7 +261,7 @@ public class PrintWriter extends Writer } catch (IOException ex) { - error = true; + error = true; } } @@ -382,7 +382,7 @@ public class PrintWriter extends Writer * This is the system dependent line separator */ private static final char[] line_separator - = System.getProperty("line.separator", "\n").toCharArray(); + = System.getProperty("line.separator", "\n").toCharArray(); /** * This method prints a line separator sequence to the stream. The value @@ -393,16 +393,16 @@ public class PrintWriter extends Writer { synchronized (lock) { - try - { - write(line_separator, 0, line_separator.length); - if (autoflush) - out.flush(); - } - catch (IOException ex) - { - error = true; - } + try + { + write(line_separator, 0, line_separator.length); + if (autoflush) + out.flush(); + } + catch (IOException ex) + { + error = true; + } } } @@ -419,8 +419,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(bool); - println(); + print(bool); + println(); } } @@ -436,8 +436,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(inum); - println(); + print(inum); + println(); } } @@ -453,8 +453,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(lnum); - println(); + print(lnum); + println(); } } @@ -470,8 +470,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(fnum); - println(); + print(fnum); + println(); } } @@ -487,8 +487,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(dnum); - println(); + print(dnum); + println(); } } @@ -505,8 +505,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(obj); - println(); + print(obj); + println(); } } @@ -522,8 +522,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(str); - println(); + print(str); + println(); } } @@ -539,8 +539,8 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(ch); - println(); + print(ch); + println(); } } @@ -556,30 +556,30 @@ public class PrintWriter extends Writer { synchronized (lock) { - print(charArray); - println(); + print(charArray); + println(); } } /** - * This method writes a single char to the stream. - * + * This method writes a single char to the stream. + * * @param ch The char to be written, passed as a int */ public void write(int ch) { try { - out.write(ch); + out.write(ch); } catch (IOException ex) { - error = true; + error = true; } } /** - * This method writes count chars from the specified array + * This method writes count chars from the specified array * starting at index offset into the array. * * @param charArray The array of chars to write @@ -590,11 +590,11 @@ public class PrintWriter extends Writer { try { - out.write(charArray, offset, count); + out.write(charArray, offset, count); } catch (IOException ex) { - error = true; + error = true; } } @@ -611,11 +611,11 @@ public class PrintWriter extends Writer { try { - out.write(str, offset, count); + out.write(str, offset, count); } catch (IOException ex) { - error = true; + error = true; } } @@ -627,7 +627,7 @@ public class PrintWriter extends Writer public void write(char[] charArray) { write(charArray, 0, charArray.length); - } + } /** * This method writes the contents of the specified String @@ -638,7 +638,7 @@ public class PrintWriter extends Writer public void write(String str) { write(str, 0, str.length()); - } + } /** @since 1.5 */ public PrintWriter append(char c) @@ -687,4 +687,3 @@ public class PrintWriter extends Writer return this; } } - diff --git a/libjava/classpath/java/io/PushbackInputStream.java b/libjava/classpath/java/io/PushbackInputStream.java index ff202c72df1..62737870c64 100644 --- a/libjava/classpath/java/io/PushbackInputStream.java +++ b/libjava/classpath/java/io/PushbackInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,10 +38,10 @@ exception statement from your version. */ package java.io; /** - * This subclass of FilterInputStream provides the ability to + * This subclass of FilterInputStream provides the ability to * unread data from a stream. It maintains an internal buffer of unread * data that is supplied to the next read operation. This is conceptually - * similar to mark/reset functionality, except that in this case the + * similar to mark/reset functionality, except that in this case the * position to reset the stream to does not need to be known in advance. *

        * The default pushback buffer size one byte, but this can be overridden @@ -66,8 +66,8 @@ public class PushbackInputStream extends FilterInputStream /** * This is the position in the buffer from which the next byte will be * read. Bytes are stored in reverse order in the buffer, starting from - * buf[buf.length - 1] to buf[0]. Thus when - * pos is 0 the buffer is full and buf.length when + * buf[buf.length - 1] to buf[0]. Thus when + * pos is 0 the buffer is full and buf.length when * it is empty */ protected int pos; @@ -107,7 +107,7 @@ public class PushbackInputStream extends FilterInputStream * might (or might not) occur on the very next read attempt. *

        * This method will return the number of bytes available from the - * pushback buffer plus the number of bytes available from the + * pushback buffer plus the number of bytes available from the * underlying stream. * * @return The number of bytes that can be read before blocking could occur @@ -116,19 +116,19 @@ public class PushbackInputStream extends FilterInputStream */ public int available() throws IOException { - try + try { - return (buf.length - pos) + super.available(); - } - catch (NullPointerException npe) + return (buf.length - pos) + super.available(); + } + catch (NullPointerException npe) { - throw new IOException ("Stream closed"); + throw new IOException ("Stream closed"); } } /** * This method closes the stream and releases any associated resources. - * + * * @exception IOException If an error occurs. */ public synchronized void close() throws IOException @@ -192,9 +192,9 @@ public class PushbackInputStream extends FilterInputStream *

        * This method will block until some data can be read. *

        - * This method first reads bytes from the pushback buffer in order to + * This method first reads bytes from the pushback buffer in order to * satisfy the read request. If the pushback buffer cannot provide all - * of the bytes requested, the remaining bytes are read from the + * of the bytes requested, the remaining bytes are read from the * underlying stream. * * @param b The array into which the bytes read should be stored @@ -211,18 +211,18 @@ public class PushbackInputStream extends FilterInputStream if (numBytes > 0) { - System.arraycopy (buf, pos, b, off, numBytes); - pos += numBytes; - len -= numBytes; - off += numBytes; + System.arraycopy (buf, pos, b, off, numBytes); + pos += numBytes; + len -= numBytes; + off += numBytes; } - if (len > 0) + if (len > 0) { len = super.read(b, off, len); if (len == -1) //EOF - return numBytes > 0 ? numBytes : -1; - numBytes += len; + return numBytes > 0 ? numBytes : -1; + numBytes += len; } return numBytes; } @@ -250,7 +250,7 @@ public class PushbackInputStream extends FilterInputStream } /** - * This method pushes all of the bytes in the passed byte array into + * This method pushes all of the bytes in the passed byte array into * the pushback bfer. These bytes are pushed in reverse order so that * the next byte read from the stream after this operation will be * b[0] followed by b[1], etc. @@ -306,7 +306,7 @@ public class PushbackInputStream extends FilterInputStream * requested amount. *

        * This method first discards bytes from the buffer, then calls the - * skip method on the underlying InputStream to + * skip method on the underlying InputStream to * skip additional bytes if necessary. * * @param n The requested number of bytes to skip @@ -323,11 +323,11 @@ public class PushbackInputStream extends FilterInputStream if (n > 0L) { - int numread = (int) Math.min((long) (buf.length - pos), n); - pos += numread; - n -= numread; - if (n > 0) - n -= super.skip(n); + int numread = (int) Math.min((long) (buf.length - pos), n); + pos += numread; + n -= numread; + if (n > 0) + n -= super.skip(n); } return origN - n; diff --git a/libjava/classpath/java/io/PushbackReader.java b/libjava/classpath/java/io/PushbackReader.java index 04bccc70fc5..43bf826a869 100644 --- a/libjava/classpath/java/io/PushbackReader.java +++ b/libjava/classpath/java/io/PushbackReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,10 +39,10 @@ exception statement from your version. */ package java.io; /** - * This subclass of FilterReader provides the ability to + * This subclass of FilterReader provides the ability to * unread data from a stream. It maintains an internal buffer of unread * data that is supplied to the next read operation. This is conceptually - * similar to mark/reset functionality, except that in this case the + * similar to mark/reset functionality, except that in this case the * position to reset the stream to does not need to be known in advance. *

        * The default pushback buffer size one char, but this can be overridden @@ -66,15 +66,15 @@ public class PushbackReader extends FilterReader /** * This is the position in the buffer from which the next char will be * read. Bytes are stored in reverse order in the buffer, starting from - * buf[buf.length - 1] to buf[0]. Thus when - * pos is 0 the buffer is full and buf.length when + * buf[buf.length - 1] to buf[0]. Thus when + * pos is 0 the buffer is full and buf.length when * it is empty */ private int pos; /** * This method initializes a PushbackReader to read from the - * specified subordinate Reader with a default pushback buffer + * specified subordinate Reader with a default pushback buffer * size of 1. * * @param in The subordinate stream to read from @@ -112,8 +112,8 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - buf = null; - super.close(); + buf = null; + super.close(); } } @@ -134,7 +134,7 @@ public class PushbackReader extends FilterReader * This method returns false to indicate that it does not support * mark/reset functionality. * - * @return This method returns false to indicate that this + * @return This method returns false to indicate that this * class does not support mark/reset functionality * */ @@ -164,7 +164,7 @@ public class PushbackReader extends FilterReader * read in the pushback buffer or if the underlying stream is ready to * be read. * - * @return true if this stream is ready to be read, + * @return true if this stream is ready to be read, * false otherwise * * @exception IOException If an error occurs @@ -173,13 +173,13 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (buf == null) - throw new IOException ("stream closed"); + if (buf == null) + throw new IOException ("stream closed"); - if (((buf.length - pos) > 0) || super.ready()) - return(true); - else - return(false); + if (((buf.length - pos) > 0) || super.ready()) + return(true); + else + return(false); } } @@ -191,7 +191,7 @@ public class PushbackReader extends FilterReader * requested amount. *

        * This method first discards chars from the buffer, then calls the - * skip method on the underlying Reader to + * skip method on the underlying Reader to * skip additional chars if necessary. * * @param num_chars The requested number of chars to skip @@ -204,21 +204,21 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (num_chars <= 0) - return(0); + if (num_chars <= 0) + return(0); - if ((buf.length - pos) >= num_chars) - { - pos += num_chars; - return(num_chars); - } + if ((buf.length - pos) >= num_chars) + { + pos += num_chars; + return(num_chars); + } - int chars_discarded = buf.length - pos; - pos = buf.length; + int chars_discarded = buf.length - pos; + pos = buf.length; - long chars_skipped = in.skip(num_chars - chars_discarded); + long chars_skipped = in.skip(num_chars - chars_discarded); - return(chars_discarded + chars_skipped); + return(chars_discarded + chars_skipped); } } @@ -239,14 +239,14 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (buf == null) + if (buf == null) throw new IOException("stream closed"); - if (pos == buf.length) - return(super.read()); + if (pos == buf.length) + return(super.read()); - ++pos; - return((buf[pos - 1] & 0xFFFF)); + ++pos; + return((buf[pos - 1] & 0xFFFF)); } } @@ -261,9 +261,9 @@ public class PushbackReader extends FilterReader *

        * This method will block until some data can be read. *

        - * This method first reads chars from the pushback buffer in order to + * This method first reads chars from the pushback buffer in order to * satisfy the read request. If the pushback buffer cannot provide all - * of the chars requested, the remaining chars are read from the + * of the chars requested, the remaining chars are read from the * underlying stream. * * @param buffer The array into which the chars read should be stored @@ -279,21 +279,21 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (buf == null) + if (buf == null) throw new IOException("stream closed"); - if (offset < 0 || length < 0 || offset + length > buffer.length) + if (offset < 0 || length < 0 || offset + length > buffer.length) throw new ArrayIndexOutOfBoundsException(); - int numBytes = Math.min(buf.length - pos, length); - if (numBytes > 0) - { - System.arraycopy (buf, pos, buffer, offset, numBytes); - pos += numBytes; - return numBytes; - } + int numBytes = Math.min(buf.length - pos, length); + if (numBytes > 0) + { + System.arraycopy (buf, pos, buffer, offset, numBytes); + pos += numBytes; + return numBytes; + } - return super.read(buffer, offset, length); + return super.read(buffer, offset, length); } } @@ -304,7 +304,7 @@ public class PushbackReader extends FilterReader *

        * If the pushback buffer is full, this method throws an exception. *

        - * The argument to this method is an int. Only the low eight + * The argument to this method is an int. Only the low eight * bits of this value are pushed back. * * @param b The char to be pushed back, passed as an int @@ -315,18 +315,18 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (buf == null) - throw new IOException("stream closed"); - if (pos == 0) - throw new IOException("Pushback buffer is full"); + if (buf == null) + throw new IOException("stream closed"); + if (pos == 0) + throw new IOException("Pushback buffer is full"); - --pos; - buf[pos] = (char)(b & 0xFFFF); + --pos; + buf[pos] = (char)(b & 0xFFFF); } } /** - * This method pushes all of the chars in the passed char array into + * This method pushes all of the chars in the passed char array into * the pushback buffer. These chars are pushed in reverse order so that * the next char read from the stream after this operation will be * buf[0] followed by buf[1], etc. @@ -345,7 +345,7 @@ public class PushbackReader extends FilterReader /** * This method pushed back chars from the passed in array into the pushback - * buffer. The chars from buf[offset] to + * buffer. The chars from buf[offset] to * buf[offset + len] * are pushed in reverse order so that the next char read from the stream * after this operation will be buf[offset] followed by @@ -365,20 +365,19 @@ public class PushbackReader extends FilterReader { synchronized (lock) { - if (buf == null) + if (buf == null) throw new IOException("stream closed"); - if (pos < length) - throw new IOException("Pushback buffer is full"); + if (pos < length) + throw new IOException("Pushback buffer is full"); - // Note the order that these chars are being added is the opposite - // of what would be done if they were added to the buffer one at a time. - // See the Java Class Libraries book p. 1397. - System.arraycopy(buffer, offset, buf, pos - length, length); + // Note the order that these chars are being added is the opposite + // of what would be done if they were added to the buffer one at a time. + // See the Java Class Libraries book p. 1397. + System.arraycopy(buffer, offset, buf, pos - length, length); - // Don't put this into the arraycopy above, an exception might be thrown - // and in that case we don't want to modify pos. - pos -= length; + // Don't put this into the arraycopy above, an exception might be thrown + // and in that case we don't want to modify pos. + pos -= length; } } } - diff --git a/libjava/classpath/java/io/RandomAccessFile.java b/libjava/classpath/java/io/RandomAccessFile.java index 036fc8c6bda..da0c81272ec 100644 --- a/libjava/classpath/java/io/RandomAccessFile.java +++ b/libjava/classpath/java/io/RandomAccessFile.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -67,12 +67,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable // The corresponding input and output streams. private DataOutputStream out; private DataInputStream in; - - + + /** * This method initializes a new instance of RandomAccessFile - * to read from the specified File object with the specified - * access mode. The access mode is either "r" for read only access or "rw" + * to read from the specified File object with the specified + * access mode. The access mode is either "r" for read only access or "rw" * for read-write access. *

        * Note that a SecurityManager check is made prior to @@ -82,11 +82,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * @param file The File object to read and/or write. * @param mode "r" for read only or "rw" for read-write access to the file * - * @exception IllegalArgumentException If mode has an + * @exception IllegalArgumentException If mode has an * illegal value - * @exception SecurityException If the requested access to the file + * @exception SecurityException If the requested access to the file * is not allowed - * @exception FileNotFoundException If the file is a directory, or + * @exception FileNotFoundException If the file is a directory, or * any other error occurs */ public RandomAccessFile (File file, String mode) @@ -99,13 +99,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable fdmode = FileChannelImpl.READ | FileChannelImpl.WRITE; else if (mode.equals("rws")) { - fdmode = (FileChannelImpl.READ | FileChannelImpl.WRITE - | FileChannelImpl.SYNC); + fdmode = (FileChannelImpl.READ | FileChannelImpl.WRITE + | FileChannelImpl.SYNC); } else if (mode.equals("rwd")) { - fdmode = (FileChannelImpl.READ | FileChannelImpl.WRITE - | FileChannelImpl.DSYNC); + fdmode = (FileChannelImpl.READ | FileChannelImpl.WRITE + | FileChannelImpl.DSYNC); } else throw new IllegalArgumentException ("invalid mode: " + mode); @@ -159,11 +159,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * @param fileName The name of the file to read and/or write * @param mode "r", "rw", "rws", or "rwd" * - * @exception IllegalArgumentException If mode has an + * @exception IllegalArgumentException If mode has an * illegal value - * @exception SecurityException If the requested access to the file + * @exception SecurityException If the requested access to the file * is not allowed - * @exception FileNotFoundException If the file is a directory or + * @exception FileNotFoundException If the file is a directory or * any other error occurs */ public RandomAccessFile (String fileName, String mode) @@ -184,7 +184,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method returns a FileDescriptor object that + * This method returns a FileDescriptor object that * represents the native file handle for this file. * * @return The FileDescriptor object for this file @@ -195,9 +195,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable { synchronized (this) { - if (fd == null) - fd = new FileDescriptor (ch); - return fd; + if (fd == null) + fd = new FileDescriptor (ch); + return fd; } } @@ -239,10 +239,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable ch.truncate (newLen); else if (newLen > length()) { - long pos = getFilePointer(); - seek(newLen - 1); - write(0); - seek(pos); + long pos = getFilePointer(); + seek(newLen - 1); + write(0); + seek(pos); } } @@ -273,7 +273,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads bytes from the file into the specified array. The - * bytes are stored starting at the beginning of the array and up to + * bytes are stored starting at the beginning of the array and up to * buf.length bytes can be read. * * @param buffer The buffer to read bytes from the file into @@ -310,14 +310,14 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * value returned is false If the byte is non-zero, then * the value returned is true *

        - * This method can read a boolean written by an object + * This method can read a boolean written by an object * implementing the - * writeBoolean() method in the DataOutput + * writeBoolean() method in the DataOutput * interface. * * @return The boolean value read * - * @exception EOFException If end of file is reached before reading the + * @exception EOFException If end of file is reached before reading the * boolean * @exception IOException If any other error occurs */ @@ -330,8 +330,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * This method reads a Java byte value from an input stream. The value * is in the range of -128 to 127. *

        - * This method can read a byte written by an object - * implementing the + * This method can read a byte written by an object + * implementing the * writeByte() method in the DataOutput interface. * * @return The byte value read @@ -347,24 +347,24 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method reads a Java char value from an input stream. - * It operates by reading two bytes from the stream and converting them to + * This method reads a Java char value from an input stream. + * It operates by reading two bytes from the stream and converting them to * a single 16-bit Java char The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        - * As an example, if byte1 and byte2 represent + * As an example, if byte1 and byte2 represent * the first * and second byte read from the stream respectively, they will be * transformed to a char in the following manner: *

        * (char)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF) *

        - * This method can read a char written by an object + * This method can read a char written by an object * implementing the * writeChar() method in the DataOutput interface. * - * @return The char value read + * @return The char value read * * @exception EOFException If end of file is reached before reading the char * @exception IOException If any other error occurs @@ -379,19 +379,19 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads a Java double value from an input stream. It operates * by first reading a logn value from the stream by calling the - * readLong() method in this interface, then + * readLong() method in this interface, then * converts that long - * to a double using the longBitsToDouble + * to a double using the longBitsToDouble * method in the class java.lang.Double *

        - * This method can read a double written by an object + * This method can read a double written by an object * implementing the - * writeDouble() method in the DataOutput + * writeDouble() method in the DataOutput * interface. * * @return The double value read * - * @exception EOFException If end of file is reached before reading + * @exception EOFException If end of file is reached before reading * the double * @exception IOException If any other error occurs * @@ -406,12 +406,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads a Java float value from an input stream. It operates * by first reading an int value from the stream by calling the - * readInt() method in this interface, then converts + * readInt() method in this interface, then converts * that int - * to a float using the intBitsToFloat method in + * to a float using the intBitsToFloat method in * the class java.lang.Float *

        - * This method can read a float written by an object + * This method can read a float written by an object * implementing the * writeFloat() method in the DataOutput interface. * @@ -436,7 +436,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * * @param buffer The buffer into which to read the data * - * @exception EOFException If end of file is reached before filling the + * @exception EOFException If end of file is reached before filling the * buffer * @exception IOException If any other error occurs */ @@ -446,19 +446,19 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method reads raw bytes into the passed array buf + * This method reads raw bytes into the passed array buf * starting - * offset bytes into the buffer. The number of bytes read + * offset bytes into the buffer. The number of bytes read * will be - * exactly len Note that this method blocks until the data is - * available and throws an exception if there is not enough data left in + * exactly len Note that this method blocks until the data is + * available and throws an exception if there is not enough data left in * the stream to read len bytes. * * @param buffer The buffer into which to read the data * @param offset The offset into the buffer to start storing data * @param count The number of bytes to read into the buffer * - * @exception EOFException If end of file is reached before filling + * @exception EOFException If end of file is reached before filling * the buffer * @exception IOException If any other error occurs */ @@ -470,22 +470,22 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads a Java int value from an input stream - * It operates by reading four bytes from the stream and converting them to + * It operates by reading four bytes from the stream and converting them to * a single Java int The bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        - * As an example, if byte1 through byte4 + * As an example, if byte1 through byte4 * represent the first * four bytes read from the stream, they will be * transformed to an int in the following manner: *

        - * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + + * (int)(((byte1 & 0xFF) << 24) + ((byte2 & 0xFF) << 16) + * ((byte3 & 0xFF) << 8) + (byte4 & 0xFF))) *

        * The value returned is in the range of 0 to 65535. *

        - * This method can read an int written by an object + * This method can read an int written by an object * implementing the * writeInt() method in the DataOutput interface. * @@ -503,17 +503,17 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads the next line of text data from an input stream. - * It operates by reading bytes and converting those bytes to + * It operates by reading bytes and converting those bytes to * char - * values by treating the byte read as the low eight bits of the + * values by treating the byte read as the low eight bits of the * char * and using 0 as the high eight bits. Because of this, it does * not support the full 16-bit Unicode character set. *

        * The reading of bytes ends when either the end of file or a line terminator * is encountered. The bytes read are then returned as a String - * A line terminator is a byte sequence consisting of either - * \r \n or \r\n These + * A line terminator is a byte sequence consisting of either + * \r \n or \r\n These * termination charaters are * discarded and are not returned as part of the string. *

        @@ -533,25 +533,25 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads a Java long value from an input stream - * It operates by reading eight bytes from the stream and converting them to + * It operates by reading eight bytes from the stream and converting them to * a single Java long The bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        - * As an example, if byte1 through byte8 + * As an example, if byte1 through byte8 * represent the first * eight bytes read from the stream, they will be * transformed to an long in the following manner: *

        * - * (long)((((long)byte1 & 0xFF) << 56) + (((long)byte2 & 0xFF) << 48) + - * (((long)byte3 & 0xFF) << 40) + (((long)byte4 & 0xFF) << 32) + - * (((long)byte5 & 0xFF) << 24) + (((long)byte6 & 0xFF) << 16) + + * (long)((((long)byte1 & 0xFF) << 56) + (((long)byte2 & 0xFF) << 48) + + * (((long)byte3 & 0xFF) << 40) + (((long)byte4 & 0xFF) << 32) + + * (((long)byte5 & 0xFF) << 24) + (((long)byte6 & 0xFF) << 16) + * (((long)byte7 & 0xFF) << 8) + ((long)byte9 & 0xFF))) *

        * The value returned is in the range of 0 to 65535. *

        - * This method can read an long written by an object + * This method can read an long written by an object * implementing the * writeLong() method in the DataOutput interface. * @@ -569,12 +569,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads a signed 16-bit value into a Java in from the stream. - * It operates by reading two bytes from the stream and converting them to + * It operates by reading two bytes from the stream and converting them to * a single 16-bit Java short The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        - * As an example, if byte1 and byte2 + * As an example, if byte1 and byte2 * represent the first * and second byte read from the stream respectively, they will be * transformed to a short in the following manner: @@ -583,7 +583,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable *

        * The value returned is in the range of -32768 to 32767. *

        - * This method can read a short written by an object + * This method can read a short written by an object * implementing the * writeShort() method in the DataOutput interface. * @@ -600,12 +600,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method reads 8 unsigned bits into a Java int value - * from the + * This method reads 8 unsigned bits into a Java int value + * from the * stream. The value returned is in the range of 0 to 255. *

        - * This method can read an unsigned byte written by an object implementing - * the writeUnsignedByte() method in the + * This method can read an unsigned byte written by an object implementing + * the writeUnsignedByte() method in the * DataOutput interface. * * @return The unsigned bytes value read as a Java int @@ -622,12 +622,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method reads 16 unsigned bits into a Java int value from the stream. - * It operates by reading two bytes from the stream and converting them to + * It operates by reading two bytes from the stream and converting them to * a single Java int The two bytes are stored most * significant byte first (i.e., "big endian") regardless of the native - * host byte ordering. + * host byte ordering. *

        - * As an example, if byte1 and byte2 + * As an example, if byte1 and byte2 * represent the first * and second byte read from the stream respectively, they will be * transformed to an int in the following manner: @@ -637,7 +637,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * The value returned is in the range of 0 to 65535. *

        * This method can read an unsigned short written by an object implementing - * the writeUnsignedShort() method in the + * the writeUnsignedShort() method in the * DataOutput interface. * * @return The unsigned short value read as a Java int @@ -651,7 +651,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method reads a String from an input stream that + * This method reads a String from an input stream that * is encoded in * a modified UTF-8 format. This format has a leading two byte sequence * that contains the remaining number of bytes to read. This two byte @@ -659,11 +659,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * interface. *

        * After the number of remaining bytes have been determined, these bytes - * are read an transformed into char values. + * are read an transformed into char values. * These char values * are encoded in the stream using either a one, two, or three byte format. * The particular format in use can be determined by examining the first - * byte read. + * byte read. *

        * If the first byte has a high order bit of 0 then * that character consists on only one byte. This character value consists @@ -673,14 +673,14 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable *

        * (char)byte1 *

        - * If the first byte has 110 as its high order bits, then the + * If the first byte has 110 as its high order bits, then the * character consists of two bytes. The bits that make up the character * value are in positions 0 through 4 of the first byte and bit positions - * 0 through 5 of the second byte. (The second byte should have + * 0 through 5 of the second byte. (The second byte should have * 10 as its high order bits). These values are in most significant * byte first (i.e., "big endian") order. *

        - * As an example, if byte1 and byte2 + * As an example, if byte1 and byte2 * are the first two bytes * read respectively, and the high order bits of them match the patterns * which indicate a two byte character encoding, then they would be @@ -695,27 +695,27 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * have 10 as their high order bits). These values are in most * significant byte first (i.e., "big endian") order. *

        - * As an example, if byte1 byte2 + * As an example, if byte1 byte2 * and byte3 are the * three bytes read, and the high order bits of them match the patterns * which indicate a three byte character encoding, then they would be * converted to a Java char like so: *

        - * (char)(((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | + * (char)(((byte1 & 0x0F) << 12) | ((byte2 & 0x3F) << 6) | * (byte3 & 0x3F)) *

        * Note that all characters are encoded in the method that requires the * fewest number of bytes with the exception of the character with the - * value of \u0000 which is encoded as two bytes. This is + * value of \u0000 which is encoded as two bytes. This is * a modification of the UTF standard used to prevent C language style * NUL values from appearing in the byte stream. *

        * This method can read data that was written by an object implementing the * writeUTF() method in DataOutput - * + * * @return The String read * - * @exception EOFException If end of file is reached before reading the + * @exception EOFException If end of file is reached before reading the * String * @exception UTFDataFormatException If the data is not in UTF-8 format * @exception IOException If any other error occurs @@ -728,11 +728,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method sets the current file position to the specified offset + * This method sets the current file position to the specified offset * from the beginning of the file. Note that some operating systems will * allow the file pointer to be set past the current end of the file. * - * @param pos The offset from the beginning of the file at which to set + * @param pos The offset from the beginning of the file at which to set * the file pointer * * @exception IOException If an error occurs @@ -743,8 +743,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method attempts to skip and discard the specified number of bytes - * in the input stream. It may actually skip fewer bytes than requested. + * This method attempts to skip and discard the specified number of bytes + * in the input stream. It may actually skip fewer bytes than requested. * The actual number of bytes skipped is returned. This method will not * skip any bytes if passed a negative number of bytes to skip. * @@ -759,10 +759,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable if (numBytes < 0) throw new IllegalArgumentException ("Can't skip negative bytes: " + numBytes); - + if (numBytes == 0) return 0; - + long oldPos = ch.position(); long newPos = oldPos + numBytes; long size = ch.size(); @@ -821,7 +821,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable } /** - * This method writes a Java boolean to the underlying output + * This method writes a Java boolean to the underlying output * stream. For a value of true, 1 is written to the stream. * For a value of false, 0 is written. * @@ -841,7 +841,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * This method writes a Java byte value to the underlying * output stream. * - * @param val The byte to write to the stream, passed + * @param val The byte to write to the stream, passed * as an int. * * @exception IOException If an error occurs @@ -858,7 +858,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * This method writes a Java short to the stream, high byte * first. This method requires two bytes to encode the value. * - * @param val The short value to write to the stream, + * @param val The short value to write to the stream, * passed as an int. * * @exception IOException If an error occurs @@ -875,7 +875,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * This method writes a single char value to the stream, * high byte first. * - * @param val The char value to write, passed as + * @param val The char value to write, passed as * an int. * * @exception IOException If an error occurs @@ -922,7 +922,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method writes a Java float value to the stream. This - * value is written by first calling the method + * value is written by first calling the method * Float.floatToIntBits * to retrieve an int representing the floating point number, * then writing this int value to the stream exactly the same @@ -944,13 +944,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable /** * This method writes a Java double value to the stream. This - * value is written by first calling the method + * value is written by first calling the method * Double.doubleToLongBits * to retrieve an long representing the floating point number, * then writing this long value to the stream exactly the same * as the writeLong() method does. * - * @param val The double precision floating point number to write to the + * @param val The double precision floating point number to write to the * stream. * * @exception IOException If an error occurs @@ -981,7 +981,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable out.writeBytes(val); } - + /** * This method writes all the characters in a String to the * stream. There will be two bytes for each character value. The high @@ -998,7 +998,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable out.writeChars(val); } - + /** * This method writes a Java String to the stream in a modified * UTF-8 format. First, two bytes are written to the stream indicating the @@ -1006,10 +1006,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable * encoded String not the String length. Next * come the encoded characters. Each character in the String * is encoded as either one, two or three bytes. For characters in the - * range of \u0001 to \u007F, + * range of \u0001 to \u007F, * one byte is used. The character * value goes into bits 0-7 and bit eight is 0. For characters in the range - * of \u0080 to \u007FF, two + * of \u0080 to \u007FF, two * bytes are used. Bits * 6-10 of the character value are encoded bits 0-4 of the first byte, with * the high bytes having a value of "110". Bits 0-5 of the character value @@ -1035,7 +1035,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable out.writeUTF(val); } - + /** * This method creates a java.nio.channels.FileChannel. * Nio does not allow one to create a file channel directly. diff --git a/libjava/classpath/java/io/Reader.java b/libjava/classpath/java/io/Reader.java index 6da1813c6ca..11a12f81262 100644 --- a/libjava/classpath/java/io/Reader.java +++ b/libjava/classpath/java/io/Reader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -36,7 +36,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ package java.io; - + import java.nio.CharBuffer; /* Written using "Java Class Libraries", 2nd edition, plus online @@ -52,18 +52,18 @@ import java.nio.CharBuffer; * or network connection. * * @author Per Bothner (bothner@cygnus.com) - * @date April 21, 1998. - * @author Aaron M. Renn (arenn@urbanophile.com) + * @date April 21, 1998. + * @author Aaron M. Renn (arenn@urbanophile.com) */ public abstract class Reader implements Closeable, Readable { /** * This is the Object used for synchronizing critical code - * sections. Subclasses should use this variable instead of a + * sections. Subclasses should use this variable instead of a * synchronized method or an explicit synchronization on this */ protected Object lock; - + /** * Unitializes a Reader that will use the object * itself for synchronization of critical code sections. @@ -86,10 +86,10 @@ public abstract class Reader implements Closeable, Readable /** * Read chars from a stream and stores them into a caller - * supplied buffer. It starts storing the data at index offset - * into the buffer and attempts to read len chars. This method - * can return before reading the number of chars requested. The actual - * number of chars read is returned as an int. A -1 is returned to indicate + * supplied buffer. It starts storing the data at index offset + * into the buffer and attempts to read len chars. This method + * can return before reading the number of chars requested. The actual + * number of chars read is returned as an int. A -1 is returned to indicate * the end of the stream. *

        * This method will block until some data can be read. @@ -113,7 +113,7 @@ public abstract class Reader implements Closeable, Readable */ public abstract int read(char buf[], int offset, int count) throws IOException; - + /** * Reads chars from a stream and stores them into a caller * supplied buffer. This method attempts to completely fill the buffer, @@ -182,10 +182,10 @@ public abstract class Reader implements Closeable, Readable * point. *

        * This method always returns false in this class, but - * subclasses can override this method to return true if they + * subclasses can override this method to return true if they * support mark/reset functionality. * - * @return true if mark/reset functionality is supported, + * @return true if mark/reset functionality is supported, * false otherwise * */ @@ -197,17 +197,17 @@ public abstract class Reader implements Closeable, Readable /** * Marks a position in the input to which the stream can be * "reset" by calling the reset() method. The parameter - * readlimit is the number of chars that can be read from the + * readlimit is the number of chars that can be read from the * stream after setting the mark before the mark becomes invalid. For - * example, if mark() is called with a read limit of 10, then - * when 11 chars of data are read from the stream before the - * reset() method is called, then the mark is invalid and the + * example, if mark() is called with a read limit of 10, then + * when 11 chars of data are read from the stream before the + * reset() method is called, then the mark is invalid and the * stream object instance is not required to remember the mark. * - * @param readLimit The number of chars that can be read before the mark + * @param readLimit The number of chars that can be read before the mark * becomes invalid * - * @exception IOException If an error occurs such as mark not being + * @exception IOException If an error occurs such as mark not being * supported for this class */ public void mark(int readLimit) throws IOException @@ -216,8 +216,8 @@ public abstract class Reader implements Closeable, Readable } /** - * Resets a stream to the point where the mark() - * method was called. Any chars that were read after the mark point was + * Resets a stream to the point where the mark() + * method was called. Any chars that were read after the mark point was * set will be re-read during subsequent reads. *

        * This method always throws an IOException in this class, but subclasses @@ -237,7 +237,7 @@ public abstract class Reader implements Closeable, Readable *

        * This method always returns false in this class * - * @return true if the stream is ready to be read, + * @return true if the stream is ready to be read, * false otherwise. * * @exception IOException If an error occurs @@ -274,12 +274,12 @@ public abstract class Reader implements Closeable, Readable synchronized (lock) { while (todo > 0) - { - int skipped = read(buffer, 0, bsize > todo ? (int) todo : bsize); - if (skipped <= 0) - break; - todo -= skipped; - } + { + int skipped = read(buffer, 0, bsize > todo ? (int) todo : bsize); + if (skipped <= 0) + break; + todo -= skipped; + } } return count - todo; } diff --git a/libjava/classpath/java/io/SequenceInputStream.java b/libjava/classpath/java/io/SequenceInputStream.java index 5ff85e9893f..92f032ccfc0 100644 --- a/libjava/classpath/java/io/SequenceInputStream.java +++ b/libjava/classpath/java/io/SequenceInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.util.Enumeration; * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ - + /** * This class merges a sequence of multiple InputStream's in * order to form a single logical stream that can be read by applications @@ -126,7 +126,7 @@ public class SequenceInputStream extends InputStream /** * Closes this stream. This will cause any remaining unclosed subordinate - * InputStream's to be closed as well. Subsequent attempts to + * InputStream's to be closed as well. Subsequent attempts to * read from this stream may cause an exception. * * @exception IOException If an error occurs @@ -135,8 +135,8 @@ public class SequenceInputStream extends InputStream { while (in != null) { - in.close(); - in = getNextStream (); + in.close(); + in = getNextStream (); } } @@ -158,7 +158,7 @@ public class SequenceInputStream extends InputStream while (in != null && (ch = in.read()) < 0) { - in.close(); + in.close(); in = getNextStream(); } @@ -192,7 +192,7 @@ public class SequenceInputStream extends InputStream // don't bother doing it here. while (in != null && (ch = in.read(b, off, len)) < 0) { - in.close(); + in.close(); in = getNextStream(); } @@ -210,12 +210,12 @@ public class SequenceInputStream extends InputStream if (e != null) { if (e.hasMoreElements()) - nextIn = e.nextElement(); + nextIn = e.nextElement(); } else if (in2 != null) { - nextIn = in2; - in2 = null; + nextIn = in2; + in2 = null; } return nextIn; diff --git a/libjava/classpath/java/io/Serializable.java b/libjava/classpath/java/io/Serializable.java index a6d99f6d522..869fa6de899 100644 --- a/libjava/classpath/java/io/Serializable.java +++ b/libjava/classpath/java/io/Serializable.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/io/SerializablePermission.java b/libjava/classpath/java/io/SerializablePermission.java index b5c07e4ec2c..88846cc3537 100644 --- a/libjava/classpath/java/io/SerializablePermission.java +++ b/libjava/classpath/java/io/SerializablePermission.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -60,19 +60,19 @@ import java.security.BasicPermission; public final class SerializablePermission extends BasicPermission { static final long serialVersionUID = 8537212141160296410L; - + /* * Class Variables */ private static final String[] legal_names = { "enableSubclassImplementation", - "enableSubstitution" }; + "enableSubstitution" }; /* * Constructors */ /** - * This method initializes a new instance of + * This method initializes a new instance of * SerializablePermission * that has the specified name. * @@ -87,7 +87,7 @@ public final class SerializablePermission extends BasicPermission } /** - * This method initializes a new instance of + * This method initializes a new instance of * SerializablePermission * that has the specified name and action list. Note that the action list * is unused in this class. @@ -95,7 +95,7 @@ public final class SerializablePermission extends BasicPermission * @param name The name of the permission. * @param actions The action list (unused). * - * @exception IllegalArgumentException If the name is not valid for + * @exception IllegalArgumentException If the name is not valid for * this class. */ public SerializablePermission(String name, String actions) @@ -110,4 +110,3 @@ public final class SerializablePermission extends BasicPermission } } // class SerializablePermission - diff --git a/libjava/classpath/java/io/StreamTokenizer.java b/libjava/classpath/java/io/StreamTokenizer.java index 87384f39f3a..0245fbf51c6 100644 --- a/libjava/classpath/java/io/StreamTokenizer.java +++ b/libjava/classpath/java/io/StreamTokenizer.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,18 +41,18 @@ import gnu.java.lang.CPStringBuilder; /** * This class parses streams of characters into tokens. There are a - * million-zillion flags that can be set to control the parsing, as + * million-zillion flags that can be set to control the parsing, as * described under the various method headings. * * @author Warren Levy (warrenl@cygnus.com) - * @date October 25, 1998. + * @date October 25, 1998. */ /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. */ - + public class StreamTokenizer { /** A constant indicating that the end of the stream has been read. */ @@ -74,7 +74,7 @@ public class StreamTokenizer * Contains the type of the token read resulting from a call to nextToken * The rules are as follows: *

          - *
        • For a token consisting of a single ordinary character, this is the + *
        • For a token consisting of a single ordinary character, this is the * value of that character.
          • *
        • For a quoted string, this is the value of the quote character
          • *
        • For a word, this is TT_WORD
          • @@ -134,7 +134,7 @@ public class StreamTokenizer } /** - * This method initializes a new StreamTokenizer to read + * This method initializes a new StreamTokenizer to read * characters from a Reader and parse them. The char values * have their hight bits masked so that the value is treated a character * in the range of 0x0000 to 0x00FF. @@ -178,11 +178,11 @@ public class StreamTokenizer { if (ch >= 0 && ch <= 255) { - comment[ch] = true; - whitespace[ch] = false; - alphabetic[ch] = false; - numeric[ch] = false; - quote[ch] = false; + comment[ch] = true; + whitespace[ch] = false; + alphabetic[ch] = false; + numeric[ch] = false; + quote[ch] = false; } } @@ -199,7 +199,7 @@ public class StreamTokenizer } /** - * This method returns the current line number. Note that if the + * This method returns the current line number. Note that if the * pushBack() method is called, it has no effect on the * line number returned by this method. * @@ -213,7 +213,7 @@ public class StreamTokenizer /** * This method sets a flag that indicates whether or not alphabetic * tokens that are returned should be converted to lower case. - * + * * @param flag true to convert to lower case, * false otherwise */ @@ -248,8 +248,8 @@ public class StreamTokenizer } /** - * This method reads the next token from the stream. It sets the - * ttype variable to the appropriate token type and + * This method reads the next token from the stream. It sets the + * ttype variable to the appropriate token type and * returns it. It also can set sval or nval * as described below. The parsing strategy is as follows: *
            @@ -266,13 +266,13 @@ public class StreamTokenizer * is stored in sval. If lower case mode is set, the token * stored in sval is converted to lower case. The end of line * sequence terminates a word only if EOL signficance has been turned on. - * The start of a comment also terminates a word. Any character with a + * The start of a comment also terminates a word. Any character with a * non-alphabetic and non-numeric attribute (such as white space, a quote, * or a commet) are treated as non-alphabetic and terminate the word. *
          • If a comment character is parsed, then all remaining characters on * the current line are skipped and another token is parsed. Any EOL or * EOF's encountered are not discarded, but rather terminate the comment.
            • - *
          • If a quote character is parsed, then all characters up to the + *
          • If a quote character is parsed, then all characters up to the * second occurrence of the same quote character are parsed into a * String. This String is stored as * sval, but is not converted to lower case, even if lower case @@ -281,7 +281,7 @@ public class StreamTokenizer * (\b (backspace), \t (HTAB), \n (linefeed), \f (form feed), \r * (carriage return), \" (double quote), \' (single quote), \\ * (backslash), \XXX (octal esacpe)) are converted to the appropriate - * char values. Invalid esacape sequences are left in untranslated. + * char values. Invalid esacape sequences are left in untranslated. * Unicode characters like ('\ u0000') are not recognized.
            • *
          • If the C++ comment sequence "//" is encountered, and the parser * is configured to handle that sequence, then the remainder of the line @@ -303,9 +303,9 @@ public class StreamTokenizer { if (pushedBack) { - pushedBack = false; - if (ttype != TT_NONE) - return ttype; + pushedBack = false; + if (ttype != TT_NONE) + return ttype; } sval = null; @@ -314,196 +314,196 @@ public class StreamTokenizer // Skip whitespace. Deal with EOL along the way. while (isWhitespace(ch = in.read())) if (ch == '\n' || ch == '\r') - { - lineNumber++; + { + lineNumber++; - // Throw away \n if in combination with \r. - if (ch == '\r' && (ch = in.read()) != '\n') - { - if (ch != TT_EOF) - in.unread(ch); - } - if (eolSignificant) - return (ttype = TT_EOL); - } + // Throw away \n if in combination with \r. + if (ch == '\r' && (ch = in.read()) != '\n') + { + if (ch != TT_EOF) + in.unread(ch); + } + if (eolSignificant) + return (ttype = TT_EOL); + } if (ch == '/') if ((ch = in.read()) == '/' && slashSlash) - { - while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) - ; - - if (ch != TT_EOF) - in.unread(ch); - return nextToken(); // Recursive, but not too deep in normal cases - } - else if (ch == '*' && slashStar) - { - while (true) - { - ch = in.read(); - if (ch == '*') - { - if ((ch = in.read()) == '/') - break; - else if (ch != TT_EOF) - in.unread(ch); - } - else if (ch == '\n' || ch == '\r') - { - lineNumber++; - if (ch == '\r' && (ch = in.read()) != '\n') - { - if (ch != TT_EOF) - in.unread(ch); - } - } - else if (ch == TT_EOF) - { - break; - } - } - return nextToken(); // Recursive, but not too deep in normal cases - } + { + while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) + ; + + if (ch != TT_EOF) + in.unread(ch); + return nextToken(); // Recursive, but not too deep in normal cases + } + else if (ch == '*' && slashStar) + { + while (true) + { + ch = in.read(); + if (ch == '*') + { + if ((ch = in.read()) == '/') + break; + else if (ch != TT_EOF) + in.unread(ch); + } + else if (ch == '\n' || ch == '\r') + { + lineNumber++; + if (ch == '\r' && (ch = in.read()) != '\n') + { + if (ch != TT_EOF) + in.unread(ch); + } + } + else if (ch == TT_EOF) + { + break; + } + } + return nextToken(); // Recursive, but not too deep in normal cases + } else - { - if (ch != TT_EOF) - in.unread(ch); - ch = '/'; - } + { + if (ch != TT_EOF) + in.unread(ch); + ch = '/'; + } if (ch == TT_EOF) ttype = TT_EOF; else if (isNumeric(ch)) { - boolean isNegative = false; - if (ch == '-') - { - // Read ahead to see if this is an ordinary '-' rather than numeric. - ch = in.read(); - if (isNumeric(ch) && ch != '-') - { - isNegative = true; - } - else - { - if (ch != TT_EOF) - in.unread(ch); - return (ttype = '-'); - } - } + boolean isNegative = false; + if (ch == '-') + { + // Read ahead to see if this is an ordinary '-' rather than numeric. + ch = in.read(); + if (isNumeric(ch) && ch != '-') + { + isNegative = true; + } + else + { + if (ch != TT_EOF) + in.unread(ch); + return (ttype = '-'); + } + } - CPStringBuilder tokbuf = new CPStringBuilder(); - tokbuf.append((char) ch); + CPStringBuilder tokbuf = new CPStringBuilder(); + tokbuf.append((char) ch); - int decCount = 0; - while (isNumeric(ch = in.read()) && ch != '-') - if (ch == '.' && decCount++ > 0) - break; - else - tokbuf.append((char) ch); + int decCount = 0; + while (isNumeric(ch = in.read()) && ch != '-') + if (ch == '.' && decCount++ > 0) + break; + else + tokbuf.append((char) ch); - if (ch != TT_EOF) - in.unread(ch); - ttype = TT_NUMBER; - try - { - nval = Double.valueOf(tokbuf.toString()).doubleValue(); - } - catch (NumberFormatException _) - { - nval = 0.0; - } - if (isNegative) - nval = -nval; + if (ch != TT_EOF) + in.unread(ch); + ttype = TT_NUMBER; + try + { + nval = Double.valueOf(tokbuf.toString()).doubleValue(); + } + catch (NumberFormatException _) + { + nval = 0.0; + } + if (isNegative) + nval = -nval; } else if (isAlphabetic(ch)) { - CPStringBuilder tokbuf = new CPStringBuilder(); - tokbuf.append((char) ch); - while (isAlphabetic(ch = in.read()) || isNumeric(ch)) - tokbuf.append((char) ch); - if (ch != TT_EOF) - in.unread(ch); - ttype = TT_WORD; - sval = tokbuf.toString(); - if (lowerCase) - sval = sval.toLowerCase(); + CPStringBuilder tokbuf = new CPStringBuilder(); + tokbuf.append((char) ch); + while (isAlphabetic(ch = in.read()) || isNumeric(ch)) + tokbuf.append((char) ch); + if (ch != TT_EOF) + in.unread(ch); + ttype = TT_WORD; + sval = tokbuf.toString(); + if (lowerCase) + sval = sval.toLowerCase(); } else if (isComment(ch)) { - while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) - ; - - if (ch != TT_EOF) - in.unread(ch); - return nextToken(); // Recursive, but not too deep in normal cases. + while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF) + ; + + if (ch != TT_EOF) + in.unread(ch); + return nextToken(); // Recursive, but not too deep in normal cases. } else if (isQuote(ch)) { - ttype = ch; - CPStringBuilder tokbuf = new CPStringBuilder(); - while ((ch = in.read()) != ttype && ch != '\n' && ch != '\r' && - ch != TT_EOF) - { - if (ch == '\\') - switch (ch = in.read()) - { - case 'a': ch = 0x7; - break; - case 'b': ch = '\b'; - break; - case 'f': ch = 0xC; - break; - case 'n': ch = '\n'; - break; - case 'r': ch = '\r'; - break; - case 't': ch = '\t'; - break; - case 'v': ch = 0xB; - break; - case '\n': ch = '\n'; - break; + ttype = ch; + CPStringBuilder tokbuf = new CPStringBuilder(); + while ((ch = in.read()) != ttype && ch != '\n' && ch != '\r' && + ch != TT_EOF) + { + if (ch == '\\') + switch (ch = in.read()) + { + case 'a': ch = 0x7; + break; + case 'b': ch = '\b'; + break; + case 'f': ch = 0xC; + break; + case 'n': ch = '\n'; + break; + case 'r': ch = '\r'; + break; + case 't': ch = '\t'; + break; + case 'v': ch = 0xB; + break; + case '\n': ch = '\n'; + break; case '\r': ch = '\r'; - break; - case '\"': - case '\'': - case '\\': - break; - default: - int ch1, nextch; - if ((nextch = ch1 = ch) >= '0' && ch <= '7') - { - ch -= '0'; - if ((nextch = in.read()) >= '0' && nextch <= '7') - { - ch = ch * 8 + nextch - '0'; - if ((nextch = in.read()) >= '0' && nextch <= '7' && - ch1 >= '0' && ch1 <= '3') - { - ch = ch * 8 + nextch - '0'; - nextch = in.read(); - } - } - } + break; + case '\"': + case '\'': + case '\\': + break; + default: + int ch1, nextch; + if ((nextch = ch1 = ch) >= '0' && ch <= '7') + { + ch -= '0'; + if ((nextch = in.read()) >= '0' && nextch <= '7') + { + ch = ch * 8 + nextch - '0'; + if ((nextch = in.read()) >= '0' && nextch <= '7' && + ch1 >= '0' && ch1 <= '3') + { + ch = ch * 8 + nextch - '0'; + nextch = in.read(); + } + } + } - if (nextch != TT_EOF) - in.unread(nextch); - } + if (nextch != TT_EOF) + in.unread(nextch); + } - tokbuf.append((char) ch); - } + tokbuf.append((char) ch); + } - // Throw away matching quote char. - if (ch != ttype && ch != TT_EOF) - in.unread(ch); + // Throw away matching quote char. + if (ch != ttype && ch != TT_EOF) + in.unread(ch); - sval = tokbuf.toString(); + sval = tokbuf.toString(); } else { - ttype = ch; + ttype = ch; } return ttype; @@ -591,11 +591,11 @@ public class StreamTokenizer { if (ch >= 0 && ch <= 255) { - quote[ch] = true; - comment[ch] = false; - whitespace[ch] = false; - alphabetic[ch] = false; - numeric[ch] = false; + quote[ch] = true; + comment[ch] = false; + whitespace[ch] = false; + alphabetic[ch] = false; + numeric[ch] = false; } } @@ -692,8 +692,8 @@ public class StreamTokenizer hi = 255; for (int i = low; i <= hi; i++) { - resetChar(i); - whitespace[i] = true; + resetChar(i); + whitespace[i] = true; } } diff --git a/libjava/classpath/java/io/StringBufferInputStream.java b/libjava/classpath/java/io/StringBufferInputStream.java index 090881985b8..28405d938c4 100644 --- a/libjava/classpath/java/io/StringBufferInputStream.java +++ b/libjava/classpath/java/io/StringBufferInputStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.io; * plus online API docs for JDK 1.2 beta from http://www.javasoft.com. * Status: Believed complete and correct. Deprecated in JDK 1.1. */ - + /** * This class permits a String to be read as an input stream. * The low eight bits of each character in the String are the @@ -51,10 +51,10 @@ package java.io; * discarded. *

            * The mark/reset functionality in this class behaves differently than - * normal. The mark() method is always ignored and the - * reset() method always resets in stream to start reading from - * position 0 in the String. Note that since this method does not override - * markSupported() in InputStream, calling that + * normal. The mark() method is always ignored and the + * reset() method always resets in stream to start reading from + * position 0 in the String. Note that since this method does not override + * markSupported() in InputStream, calling that * method will return false. *

            * Note that this class is deprecated because it does not properly handle @@ -104,7 +104,7 @@ public class StringBufferInputStream extends InputStream } /** - * This method reads one byte from the stream. The pos counter + * This method reads one byte from the stream. The pos counter * is advanced to the next byte to be read. The byte read is returned as * an int in the range of 0-255. If the stream position is already at the * end of the buffer, no byte is read and a -1 is returned in order to @@ -115,18 +115,18 @@ public class StringBufferInputStream extends InputStream public int read() { if (pos >= count) - return -1; // EOF + return -1; // EOF return ((int) buffer.charAt(pos++)) & 0xFF; } /** * This method reads bytes from the stream and stores them into a caller - * supplied buffer. It starts storing the data at index offset + * supplied buffer. It starts storing the data at index offset * into the buffer and attempts to read len bytes. This method * can return before reading the number of bytes requested if the end of the - * stream is encountered first. The actual number of bytes read is - * returned. If no bytes can be read because the stream is already at + * stream is encountered first. The actual number of bytes read is + * returned. If no bytes can be read because the stream is already at * the end of stream position, a -1 is returned. *

            * This method does not block. @@ -143,7 +143,7 @@ public class StringBufferInputStream extends InputStream throw new ArrayIndexOutOfBoundsException(); if (pos >= count) - return -1; // EOF + return -1; // EOF int numRead = Math.min(len, count - pos); if (numRead < 0) diff --git a/libjava/classpath/java/io/StringReader.java b/libjava/classpath/java/io/StringReader.java index 7e4e7d84f62..c4021a8fb31 100644 --- a/libjava/classpath/java/io/StringReader.java +++ b/libjava/classpath/java/io/StringReader.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,7 +44,7 @@ package java.io; */ /** - * This class permits a String to be read as a character + * This class permits a String to be read as a character * input stream. *

            * The mark/reset functionality in this class behaves differently than @@ -53,7 +53,7 @@ package java.io; * * @author Aaron M. Renn (arenn@urbanophile.com) * @author Warren Levy (warrenl@cygnus.com) - * @date October 19, 1998. + * @date October 19, 1998. */ public class StringReader extends Reader { @@ -70,8 +70,8 @@ public class StringReader extends Reader private int count; /** - * Create a new StringReader that will read chars from the - * passed in String. This stream will read from the beginning + * Create a new StringReader that will read chars from the + * passed in String. This stream will read from the beginning * to the end of the String. * * @param buffer The String this stream will read from. @@ -180,7 +180,7 @@ public class StringReader extends Reader /** * This method attempts to skip the requested number of chars in the - * input stream. It does this by advancing the pos value by + * input stream. It does this by advancing the pos value by * the specified number of chars. It this would exceed the length of the * buffer, then only enough chars are skipped to position the stream at * the end of the buffer. The actual number of chars skipped is returned. @@ -206,4 +206,3 @@ public class StringReader extends Reader } } } - diff --git a/libjava/classpath/java/io/StringWriter.java b/libjava/classpath/java/io/StringWriter.java index 5a16e63ea7a..85500b5cb0c 100644 --- a/libjava/classpath/java/io/StringWriter.java +++ b/libjava/classpath/java/io/StringWriter.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -118,7 +118,7 @@ public class StringWriter extends Writer * as a String. * * @return A String representing the chars written to - * this stream. + * this stream. */ public String toString () { @@ -170,7 +170,7 @@ public class StringWriter extends Writer * @param str The String to write characters from * @param offset The character position to start writing from * @param len The number of characters to write. - */ + */ public void write (String str, int offset, int len) { // char[] tmpbuf = new char[len]; diff --git a/libjava/classpath/java/io/UnsupportedEncodingException.java b/libjava/classpath/java/io/UnsupportedEncodingException.java index cf0ab64cb89..5975975630c 100644 --- a/libjava/classpath/java/io/UnsupportedEncodingException.java +++ b/libjava/classpath/java/io/UnsupportedEncodingException.java @@ -39,7 +39,7 @@ exception statement from your version. */ package java.io; /** - * This exception is thrown when the requested character encoding is + * This exception is thrown when the requested character encoding is * not supported. * * @author Aaron M. Renn (arenn@urbanophile.com) diff --git a/libjava/classpath/java/io/Writer.java b/libjava/classpath/java/io/Writer.java index 660b6908935..5b3e7073aa3 100644 --- a/libjava/classpath/java/io/Writer.java +++ b/libjava/classpath/java/io/Writer.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,10 +44,10 @@ package java.io; */ /** - * This abstract class forms the base of the hierarchy of classes that + * This abstract class forms the base of the hierarchy of classes that * write output as a stream of chars. It provides a common set of methods * for writing chars to stream. Subclasses implement and/or extend these - * methods to write chars in a particular manner or to a particular + * methods to write chars in a particular manner or to a particular * destination such as a file on disk or network connection. * * @author Aaron M. Renn (arenn@urbanophile.com) @@ -98,7 +98,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable public abstract void flush() throws IOException; /** - * This method closes the stream. Any internal or native resources + * This method closes the stream. Any internal or native resources * associated * with this stream are freed. Any subsequent attempt to access the stream * might throw an exception. @@ -110,7 +110,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable public abstract void close() throws IOException; /** - * This method writes a single char to the output stream. + * This method writes a single char to the output stream. * * @param b The char to be written to the output stream, passed as an int * @@ -125,8 +125,8 @@ public abstract class Writer implements Appendable, Closeable, Flushable } /** - * This method all the writes char from the passed array to the output - * stream. This method is equivalent to + * This method all the writes char from the passed array to the output + * stream. This method is equivalent to * write(buf, 0, buf.length) which * is exactly how it is implemented in this class. * @@ -148,10 +148,10 @@ public abstract class Writer implements Appendable, Closeable, Flushable * @param buf The array of char to write from * @param offset The index into the array to start writing from * @param len The number of char to write - * + * * @exception IOException If an error occurs */ - public abstract void write(char[] buf, int offset, int len) + public abstract void write(char[] buf, int offset, int len) throws IOException; /** @@ -165,7 +165,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable public void write(String str) throws IOException { write(str, 0, str.length()); - } + } /** * This method writes len chars from the String @@ -180,7 +180,7 @@ public abstract class Writer implements Appendable, Closeable, Flushable */ public void write(String str, int offset, int len) throws IOException { - // FIXME - for libgcj re-write using native code to not require + // FIXME - for libgcj re-write using native code to not require // copied buffer. char[] buf = new char[len]; diff --git a/libjava/classpath/java/lang/AbstractStringBuffer.java b/libjava/classpath/java/lang/AbstractStringBuffer.java index dc3a8c9ecda..242afdcb4ef 100644 --- a/libjava/classpath/java/lang/AbstractStringBuffer.java +++ b/libjava/classpath/java/lang/AbstractStringBuffer.java @@ -169,13 +169,13 @@ abstract class AbstractStringBuffer /* If the StringBuffer's value just grew, then we know that value is newly allocated and the region between count and newLength is filled with '\0'. */ - count = newLength; + count = newLength; } else { - /* The StringBuffer's value doesn't need to grow. However, - we should clear out any cruft that may exist. */ - while (count < newLength) + /* The StringBuffer's value doesn't need to grow. However, + we should clear out any cruft that may exist. */ + while (count < newLength) value[count++] = '\0'; } } @@ -244,7 +244,7 @@ abstract class AbstractStringBuffer * @see System#arraycopy(Object, int, Object, int, int) */ public void getChars(int srcOffset, int srcEnd, - char[] dst, int dstOffset) + char[] dst, int dstOffset) { if (srcOffset < 0 || srcEnd > count || srcEnd < srcOffset) throw new StringIndexOutOfBoundsException(); @@ -316,10 +316,10 @@ abstract class AbstractStringBuffer return append("null"); synchronized (stringBuffer) { - int len = stringBuffer.count; - ensureCapacity(count + len); - VMSystem.arraycopy(stringBuffer.value, 0, value, count, len); - count += len; + int len = stringBuffer.count; + ensureCapacity(count + len); + VMSystem.arraycopy(stringBuffer.value, 0, value, count, len); + count += len; } return this; } @@ -420,9 +420,9 @@ abstract class AbstractStringBuffer seq = "null"; if (end - start > 0) { - ensureCapacity_unsynchronized(count + end - start); - for (; start < end; ++start) - value[count++] = seq.charAt(start); + ensureCapacity_unsynchronized(count + end - start); + for (; start < end; ++start) + value[count++] = seq.charAt(start); } return this; } @@ -907,9 +907,9 @@ abstract class AbstractStringBuffer // If we save more than 1/4 of the buffer, shrink. if (wouldSave > 200 || wouldSave * 4 > value.length) { - char[] newValue = new char[count]; - VMSystem.arraycopy(value, 0, newValue, 0, count); - value = newValue; + char[] newValue = new char[count]; + VMSystem.arraycopy(value, 0, newValue, 0, count); + value = newValue; } } @@ -933,23 +933,23 @@ abstract class AbstractStringBuffer int count = 0; while (start < end) { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == end - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - ++count; + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == end + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + ++count; } return count; } @@ -969,22 +969,22 @@ abstract class AbstractStringBuffer { while (codePoints > 0) { - char base = value[start]; - if (base < Character.MIN_HIGH_SURROGATE - || base > Character.MAX_HIGH_SURROGATE - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - --codePoints; + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + --codePoints; } return start; } diff --git a/libjava/classpath/java/lang/Boolean.java b/libjava/classpath/java/lang/Boolean.java index 2b0236d1b9b..f2eaf412592 100644 --- a/libjava/classpath/java/lang/Boolean.java +++ b/libjava/classpath/java/lang/Boolean.java @@ -226,7 +226,7 @@ public final class Boolean implements Serializable, Comparable * Compares this Boolean to another. * * @param other the Boolean to compare this Boolean to - * @return 0 if both Booleans represent the same value, a positive number + * @return 0 if both Booleans represent the same value, a positive number * if this Boolean represents true and the other false, and a negative * number otherwise. * @since 1.5 @@ -247,5 +247,5 @@ public final class Boolean implements Serializable, Comparable { return "true".equalsIgnoreCase(b) ? true : false; } - + } diff --git a/libjava/classpath/java/lang/Character.java b/libjava/classpath/java/lang/Character.java index eaa9557f651..05e641c3a48 100644 --- a/libjava/classpath/java/lang/Character.java +++ b/libjava/classpath/java/lang/Character.java @@ -168,7 +168,7 @@ public final class Character implements Serializable, Comparable * standard. */ private UnicodeBlock(int start, int end, String name, - String canonicalName) + String canonicalName) { super(name); this.start = start; @@ -202,8 +202,8 @@ public final class Character implements Serializable, Comparable public static UnicodeBlock of(int codePoint) { if (codePoint > MAX_CODE_POINT) - throw new IllegalArgumentException("The supplied integer value is " + - "too large to be a codepoint."); + throw new IllegalArgumentException("The supplied integer value is " + + "too large to be a codepoint."); // Simple binary search for the correct block. int low = 0; int hi = sets.length - 1; @@ -278,7 +278,7 @@ public final class Character implements Serializable, Comparable return SURROGATES_AREA; break; case CONSTANT: - if (usCollator.compare(blockName, "SURROGATES_AREA") == 0) + if (usCollator.compare(blockName, "SURROGATES_AREA") == 0) return SURROGATES_AREA; break; } @@ -292,12 +292,12 @@ public final class Character implements Serializable, Comparable break; case NO_SPACES: for (UnicodeBlock block : sets) - { - String nsName = block.canonicalName.replaceAll(" ",""); - if (usCollator.compare(blockName, nsName) == 0) - return block; - } - break; + { + String nsName = block.canonicalName.replaceAll(" ",""); + if (usCollator.compare(blockName, nsName) == 0) + return block; + } + break; case CONSTANT: for (UnicodeBlock block : sets) if (usCollator.compare(blockName, block.toString()) == 0) @@ -314,7 +314,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BASIC_LATIN = new UnicodeBlock(0x0000, 0x007F, - "BASIC_LATIN", + "BASIC_LATIN", "Basic Latin"); /** @@ -323,7 +323,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LATIN_1_SUPPLEMENT = new UnicodeBlock(0x0080, 0x00FF, - "LATIN_1_SUPPLEMENT", + "LATIN_1_SUPPLEMENT", "Latin-1 Supplement"); /** @@ -332,7 +332,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LATIN_EXTENDED_A = new UnicodeBlock(0x0100, 0x017F, - "LATIN_EXTENDED_A", + "LATIN_EXTENDED_A", "Latin Extended-A"); /** @@ -341,7 +341,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LATIN_EXTENDED_B = new UnicodeBlock(0x0180, 0x024F, - "LATIN_EXTENDED_B", + "LATIN_EXTENDED_B", "Latin Extended-B"); /** @@ -350,7 +350,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock IPA_EXTENSIONS = new UnicodeBlock(0x0250, 0x02AF, - "IPA_EXTENSIONS", + "IPA_EXTENSIONS", "IPA Extensions"); /** @@ -359,7 +359,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SPACING_MODIFIER_LETTERS = new UnicodeBlock(0x02B0, 0x02FF, - "SPACING_MODIFIER_LETTERS", + "SPACING_MODIFIER_LETTERS", "Spacing Modifier Letters"); /** @@ -368,7 +368,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock COMBINING_DIACRITICAL_MARKS = new UnicodeBlock(0x0300, 0x036F, - "COMBINING_DIACRITICAL_MARKS", + "COMBINING_DIACRITICAL_MARKS", "Combining Diacritical Marks"); /** @@ -377,7 +377,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GREEK = new UnicodeBlock(0x0370, 0x03FF, - "GREEK", + "GREEK", "Greek"); /** @@ -386,7 +386,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CYRILLIC = new UnicodeBlock(0x0400, 0x04FF, - "CYRILLIC", + "CYRILLIC", "Cyrillic"); /** @@ -396,7 +396,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CYRILLIC_SUPPLEMENTARY = new UnicodeBlock(0x0500, 0x052F, - "CYRILLIC_SUPPLEMENTARY", + "CYRILLIC_SUPPLEMENTARY", "Cyrillic Supplementary"); /** @@ -405,7 +405,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ARMENIAN = new UnicodeBlock(0x0530, 0x058F, - "ARMENIAN", + "ARMENIAN", "Armenian"); /** @@ -414,7 +414,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HEBREW = new UnicodeBlock(0x0590, 0x05FF, - "HEBREW", + "HEBREW", "Hebrew"); /** @@ -423,7 +423,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ARABIC = new UnicodeBlock(0x0600, 0x06FF, - "ARABIC", + "ARABIC", "Arabic"); /** @@ -433,7 +433,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SYRIAC = new UnicodeBlock(0x0700, 0x074F, - "SYRIAC", + "SYRIAC", "Syriac"); /** @@ -443,7 +443,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock THAANA = new UnicodeBlock(0x0780, 0x07BF, - "THAANA", + "THAANA", "Thaana"); /** @@ -452,7 +452,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock DEVANAGARI = new UnicodeBlock(0x0900, 0x097F, - "DEVANAGARI", + "DEVANAGARI", "Devanagari"); /** @@ -461,7 +461,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BENGALI = new UnicodeBlock(0x0980, 0x09FF, - "BENGALI", + "BENGALI", "Bengali"); /** @@ -470,7 +470,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GURMUKHI = new UnicodeBlock(0x0A00, 0x0A7F, - "GURMUKHI", + "GURMUKHI", "Gurmukhi"); /** @@ -479,7 +479,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GUJARATI = new UnicodeBlock(0x0A80, 0x0AFF, - "GUJARATI", + "GUJARATI", "Gujarati"); /** @@ -488,7 +488,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ORIYA = new UnicodeBlock(0x0B00, 0x0B7F, - "ORIYA", + "ORIYA", "Oriya"); /** @@ -497,7 +497,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAMIL = new UnicodeBlock(0x0B80, 0x0BFF, - "TAMIL", + "TAMIL", "Tamil"); /** @@ -506,7 +506,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TELUGU = new UnicodeBlock(0x0C00, 0x0C7F, - "TELUGU", + "TELUGU", "Telugu"); /** @@ -515,7 +515,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KANNADA = new UnicodeBlock(0x0C80, 0x0CFF, - "KANNADA", + "KANNADA", "Kannada"); /** @@ -524,7 +524,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MALAYALAM = new UnicodeBlock(0x0D00, 0x0D7F, - "MALAYALAM", + "MALAYALAM", "Malayalam"); /** @@ -534,7 +534,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SINHALA = new UnicodeBlock(0x0D80, 0x0DFF, - "SINHALA", + "SINHALA", "Sinhala"); /** @@ -543,7 +543,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock THAI = new UnicodeBlock(0x0E00, 0x0E7F, - "THAI", + "THAI", "Thai"); /** @@ -552,7 +552,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LAO = new UnicodeBlock(0x0E80, 0x0EFF, - "LAO", + "LAO", "Lao"); /** @@ -561,7 +561,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TIBETAN = new UnicodeBlock(0x0F00, 0x0FFF, - "TIBETAN", + "TIBETAN", "Tibetan"); /** @@ -571,7 +571,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MYANMAR = new UnicodeBlock(0x1000, 0x109F, - "MYANMAR", + "MYANMAR", "Myanmar"); /** @@ -580,7 +580,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GEORGIAN = new UnicodeBlock(0x10A0, 0x10FF, - "GEORGIAN", + "GEORGIAN", "Georgian"); /** @@ -589,7 +589,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HANGUL_JAMO = new UnicodeBlock(0x1100, 0x11FF, - "HANGUL_JAMO", + "HANGUL_JAMO", "Hangul Jamo"); /** @@ -599,7 +599,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ETHIOPIC = new UnicodeBlock(0x1200, 0x137F, - "ETHIOPIC", + "ETHIOPIC", "Ethiopic"); /** @@ -609,7 +609,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CHEROKEE = new UnicodeBlock(0x13A0, 0x13FF, - "CHEROKEE", + "CHEROKEE", "Cherokee"); /** @@ -619,7 +619,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS = new UnicodeBlock(0x1400, 0x167F, - "UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS", + "UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS", "Unified Canadian Aboriginal Syllabics"); /** @@ -629,7 +629,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock OGHAM = new UnicodeBlock(0x1680, 0x169F, - "OGHAM", + "OGHAM", "Ogham"); /** @@ -639,7 +639,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock RUNIC = new UnicodeBlock(0x16A0, 0x16FF, - "RUNIC", + "RUNIC", "Runic"); /** @@ -649,7 +649,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAGALOG = new UnicodeBlock(0x1700, 0x171F, - "TAGALOG", + "TAGALOG", "Tagalog"); /** @@ -659,7 +659,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HANUNOO = new UnicodeBlock(0x1720, 0x173F, - "HANUNOO", + "HANUNOO", "Hanunoo"); /** @@ -669,7 +669,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BUHID = new UnicodeBlock(0x1740, 0x175F, - "BUHID", + "BUHID", "Buhid"); /** @@ -679,7 +679,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAGBANWA = new UnicodeBlock(0x1760, 0x177F, - "TAGBANWA", + "TAGBANWA", "Tagbanwa"); /** @@ -689,7 +689,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KHMER = new UnicodeBlock(0x1780, 0x17FF, - "KHMER", + "KHMER", "Khmer"); /** @@ -699,7 +699,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MONGOLIAN = new UnicodeBlock(0x1800, 0x18AF, - "MONGOLIAN", + "MONGOLIAN", "Mongolian"); /** @@ -709,7 +709,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LIMBU = new UnicodeBlock(0x1900, 0x194F, - "LIMBU", + "LIMBU", "Limbu"); /** @@ -719,7 +719,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAI_LE = new UnicodeBlock(0x1950, 0x197F, - "TAI_LE", + "TAI_LE", "Tai Le"); /** @@ -729,7 +729,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KHMER_SYMBOLS = new UnicodeBlock(0x19E0, 0x19FF, - "KHMER_SYMBOLS", + "KHMER_SYMBOLS", "Khmer Symbols"); /** @@ -739,7 +739,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock PHONETIC_EXTENSIONS = new UnicodeBlock(0x1D00, 0x1D7F, - "PHONETIC_EXTENSIONS", + "PHONETIC_EXTENSIONS", "Phonetic Extensions"); /** @@ -748,7 +748,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LATIN_EXTENDED_ADDITIONAL = new UnicodeBlock(0x1E00, 0x1EFF, - "LATIN_EXTENDED_ADDITIONAL", + "LATIN_EXTENDED_ADDITIONAL", "Latin Extended Additional"); /** @@ -757,7 +757,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GREEK_EXTENDED = new UnicodeBlock(0x1F00, 0x1FFF, - "GREEK_EXTENDED", + "GREEK_EXTENDED", "Greek Extended"); /** @@ -766,7 +766,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GENERAL_PUNCTUATION = new UnicodeBlock(0x2000, 0x206F, - "GENERAL_PUNCTUATION", + "GENERAL_PUNCTUATION", "General Punctuation"); /** @@ -775,7 +775,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPERSCRIPTS_AND_SUBSCRIPTS = new UnicodeBlock(0x2070, 0x209F, - "SUPERSCRIPTS_AND_SUBSCRIPTS", + "SUPERSCRIPTS_AND_SUBSCRIPTS", "Superscripts and Subscripts"); /** @@ -784,7 +784,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CURRENCY_SYMBOLS = new UnicodeBlock(0x20A0, 0x20CF, - "CURRENCY_SYMBOLS", + "CURRENCY_SYMBOLS", "Currency Symbols"); /** @@ -793,7 +793,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock COMBINING_MARKS_FOR_SYMBOLS = new UnicodeBlock(0x20D0, 0x20FF, - "COMBINING_MARKS_FOR_SYMBOLS", + "COMBINING_MARKS_FOR_SYMBOLS", "Combining Marks for Symbols"); /** @@ -802,7 +802,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LETTERLIKE_SYMBOLS = new UnicodeBlock(0x2100, 0x214F, - "LETTERLIKE_SYMBOLS", + "LETTERLIKE_SYMBOLS", "Letterlike Symbols"); /** @@ -811,7 +811,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock NUMBER_FORMS = new UnicodeBlock(0x2150, 0x218F, - "NUMBER_FORMS", + "NUMBER_FORMS", "Number Forms"); /** @@ -820,7 +820,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ARROWS = new UnicodeBlock(0x2190, 0x21FF, - "ARROWS", + "ARROWS", "Arrows"); /** @@ -829,7 +829,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MATHEMATICAL_OPERATORS = new UnicodeBlock(0x2200, 0x22FF, - "MATHEMATICAL_OPERATORS", + "MATHEMATICAL_OPERATORS", "Mathematical Operators"); /** @@ -838,7 +838,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MISCELLANEOUS_TECHNICAL = new UnicodeBlock(0x2300, 0x23FF, - "MISCELLANEOUS_TECHNICAL", + "MISCELLANEOUS_TECHNICAL", "Miscellaneous Technical"); /** @@ -847,7 +847,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CONTROL_PICTURES = new UnicodeBlock(0x2400, 0x243F, - "CONTROL_PICTURES", + "CONTROL_PICTURES", "Control Pictures"); /** @@ -856,7 +856,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock OPTICAL_CHARACTER_RECOGNITION = new UnicodeBlock(0x2440, 0x245F, - "OPTICAL_CHARACTER_RECOGNITION", + "OPTICAL_CHARACTER_RECOGNITION", "Optical Character Recognition"); /** @@ -865,7 +865,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ENCLOSED_ALPHANUMERICS = new UnicodeBlock(0x2460, 0x24FF, - "ENCLOSED_ALPHANUMERICS", + "ENCLOSED_ALPHANUMERICS", "Enclosed Alphanumerics"); /** @@ -874,7 +874,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BOX_DRAWING = new UnicodeBlock(0x2500, 0x257F, - "BOX_DRAWING", + "BOX_DRAWING", "Box Drawing"); /** @@ -883,7 +883,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BLOCK_ELEMENTS = new UnicodeBlock(0x2580, 0x259F, - "BLOCK_ELEMENTS", + "BLOCK_ELEMENTS", "Block Elements"); /** @@ -892,7 +892,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GEOMETRIC_SHAPES = new UnicodeBlock(0x25A0, 0x25FF, - "GEOMETRIC_SHAPES", + "GEOMETRIC_SHAPES", "Geometric Shapes"); /** @@ -901,7 +901,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MISCELLANEOUS_SYMBOLS = new UnicodeBlock(0x2600, 0x26FF, - "MISCELLANEOUS_SYMBOLS", + "MISCELLANEOUS_SYMBOLS", "Miscellaneous Symbols"); /** @@ -910,7 +910,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock DINGBATS = new UnicodeBlock(0x2700, 0x27BF, - "DINGBATS", + "DINGBATS", "Dingbats"); /** @@ -920,7 +920,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A = new UnicodeBlock(0x27C0, 0x27EF, - "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A", + "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A", "Miscellaneous Mathematical Symbols-A"); /** @@ -930,7 +930,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPPLEMENTAL_ARROWS_A = new UnicodeBlock(0x27F0, 0x27FF, - "SUPPLEMENTAL_ARROWS_A", + "SUPPLEMENTAL_ARROWS_A", "Supplemental Arrows-A"); /** @@ -940,7 +940,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BRAILLE_PATTERNS = new UnicodeBlock(0x2800, 0x28FF, - "BRAILLE_PATTERNS", + "BRAILLE_PATTERNS", "Braille Patterns"); /** @@ -950,7 +950,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPPLEMENTAL_ARROWS_B = new UnicodeBlock(0x2900, 0x297F, - "SUPPLEMENTAL_ARROWS_B", + "SUPPLEMENTAL_ARROWS_B", "Supplemental Arrows-B"); /** @@ -960,7 +960,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B = new UnicodeBlock(0x2980, 0x29FF, - "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B", + "MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B", "Miscellaneous Mathematical Symbols-B"); /** @@ -970,7 +970,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPPLEMENTAL_MATHEMATICAL_OPERATORS = new UnicodeBlock(0x2A00, 0x2AFF, - "SUPPLEMENTAL_MATHEMATICAL_OPERATORS", + "SUPPLEMENTAL_MATHEMATICAL_OPERATORS", "Supplemental Mathematical Operators"); /** @@ -980,7 +980,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MISCELLANEOUS_SYMBOLS_AND_ARROWS = new UnicodeBlock(0x2B00, 0x2BFF, - "MISCELLANEOUS_SYMBOLS_AND_ARROWS", + "MISCELLANEOUS_SYMBOLS_AND_ARROWS", "Miscellaneous Symbols and Arrows"); /** @@ -990,7 +990,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_RADICALS_SUPPLEMENT = new UnicodeBlock(0x2E80, 0x2EFF, - "CJK_RADICALS_SUPPLEMENT", + "CJK_RADICALS_SUPPLEMENT", "CJK Radicals Supplement"); /** @@ -1000,7 +1000,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KANGXI_RADICALS = new UnicodeBlock(0x2F00, 0x2FDF, - "KANGXI_RADICALS", + "KANGXI_RADICALS", "Kangxi Radicals"); /** @@ -1010,7 +1010,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS = new UnicodeBlock(0x2FF0, 0x2FFF, - "IDEOGRAPHIC_DESCRIPTION_CHARACTERS", + "IDEOGRAPHIC_DESCRIPTION_CHARACTERS", "Ideographic Description Characters"); /** @@ -1019,7 +1019,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_SYMBOLS_AND_PUNCTUATION = new UnicodeBlock(0x3000, 0x303F, - "CJK_SYMBOLS_AND_PUNCTUATION", + "CJK_SYMBOLS_AND_PUNCTUATION", "CJK Symbols and Punctuation"); /** @@ -1028,7 +1028,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HIRAGANA = new UnicodeBlock(0x3040, 0x309F, - "HIRAGANA", + "HIRAGANA", "Hiragana"); /** @@ -1037,7 +1037,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KATAKANA = new UnicodeBlock(0x30A0, 0x30FF, - "KATAKANA", + "KATAKANA", "Katakana"); /** @@ -1046,7 +1046,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BOPOMOFO = new UnicodeBlock(0x3100, 0x312F, - "BOPOMOFO", + "BOPOMOFO", "Bopomofo"); /** @@ -1055,7 +1055,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HANGUL_COMPATIBILITY_JAMO = new UnicodeBlock(0x3130, 0x318F, - "HANGUL_COMPATIBILITY_JAMO", + "HANGUL_COMPATIBILITY_JAMO", "Hangul Compatibility Jamo"); /** @@ -1064,7 +1064,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KANBUN = new UnicodeBlock(0x3190, 0x319F, - "KANBUN", + "KANBUN", "Kanbun"); /** @@ -1074,7 +1074,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BOPOMOFO_EXTENDED = new UnicodeBlock(0x31A0, 0x31BF, - "BOPOMOFO_EXTENDED", + "BOPOMOFO_EXTENDED", "Bopomofo Extended"); /** @@ -1084,7 +1084,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock KATAKANA_PHONETIC_EXTENSIONS = new UnicodeBlock(0x31F0, 0x31FF, - "KATAKANA_PHONETIC_EXTENSIONS", + "KATAKANA_PHONETIC_EXTENSIONS", "Katakana Phonetic Extensions"); /** @@ -1093,7 +1093,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ENCLOSED_CJK_LETTERS_AND_MONTHS = new UnicodeBlock(0x3200, 0x32FF, - "ENCLOSED_CJK_LETTERS_AND_MONTHS", + "ENCLOSED_CJK_LETTERS_AND_MONTHS", "Enclosed CJK Letters and Months"); /** @@ -1102,7 +1102,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_COMPATIBILITY = new UnicodeBlock(0x3300, 0x33FF, - "CJK_COMPATIBILITY", + "CJK_COMPATIBILITY", "CJK Compatibility"); /** @@ -1112,7 +1112,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A = new UnicodeBlock(0x3400, 0x4DBF, - "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A", + "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A", "CJK Unified Ideographs Extension A"); /** @@ -1122,7 +1122,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock YIJING_HEXAGRAM_SYMBOLS = new UnicodeBlock(0x4DC0, 0x4DFF, - "YIJING_HEXAGRAM_SYMBOLS", + "YIJING_HEXAGRAM_SYMBOLS", "Yijing Hexagram Symbols"); /** @@ -1131,7 +1131,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS = new UnicodeBlock(0x4E00, 0x9FFF, - "CJK_UNIFIED_IDEOGRAPHS", + "CJK_UNIFIED_IDEOGRAPHS", "CJK Unified Ideographs"); /** @@ -1141,7 +1141,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock YI_SYLLABLES = new UnicodeBlock(0xA000, 0xA48F, - "YI_SYLLABLES", + "YI_SYLLABLES", "Yi Syllables"); /** @@ -1151,7 +1151,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock YI_RADICALS = new UnicodeBlock(0xA490, 0xA4CF, - "YI_RADICALS", + "YI_RADICALS", "Yi Radicals"); /** @@ -1160,7 +1160,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HANGUL_SYLLABLES = new UnicodeBlock(0xAC00, 0xD7AF, - "HANGUL_SYLLABLES", + "HANGUL_SYLLABLES", "Hangul Syllables"); /** @@ -1170,7 +1170,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HIGH_SURROGATES = new UnicodeBlock(0xD800, 0xDB7F, - "HIGH_SURROGATES", + "HIGH_SURROGATES", "High Surrogates"); /** @@ -1180,7 +1180,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HIGH_PRIVATE_USE_SURROGATES = new UnicodeBlock(0xDB80, 0xDBFF, - "HIGH_PRIVATE_USE_SURROGATES", + "HIGH_PRIVATE_USE_SURROGATES", "High Private Use Surrogates"); /** @@ -1190,7 +1190,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LOW_SURROGATES = new UnicodeBlock(0xDC00, 0xDFFF, - "LOW_SURROGATES", + "LOW_SURROGATES", "Low Surrogates"); /** @@ -1199,7 +1199,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock PRIVATE_USE_AREA = new UnicodeBlock(0xE000, 0xF8FF, - "PRIVATE_USE_AREA", + "PRIVATE_USE_AREA", "Private Use Area"); /** @@ -1208,7 +1208,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS = new UnicodeBlock(0xF900, 0xFAFF, - "CJK_COMPATIBILITY_IDEOGRAPHS", + "CJK_COMPATIBILITY_IDEOGRAPHS", "CJK Compatibility Ideographs"); /** @@ -1217,7 +1217,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ALPHABETIC_PRESENTATION_FORMS = new UnicodeBlock(0xFB00, 0xFB4F, - "ALPHABETIC_PRESENTATION_FORMS", + "ALPHABETIC_PRESENTATION_FORMS", "Alphabetic Presentation Forms"); /** @@ -1226,7 +1226,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_A = new UnicodeBlock(0xFB50, 0xFDFF, - "ARABIC_PRESENTATION_FORMS_A", + "ARABIC_PRESENTATION_FORMS_A", "Arabic Presentation Forms-A"); /** @@ -1236,7 +1236,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock VARIATION_SELECTORS = new UnicodeBlock(0xFE00, 0xFE0F, - "VARIATION_SELECTORS", + "VARIATION_SELECTORS", "Variation Selectors"); /** @@ -1245,7 +1245,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock COMBINING_HALF_MARKS = new UnicodeBlock(0xFE20, 0xFE2F, - "COMBINING_HALF_MARKS", + "COMBINING_HALF_MARKS", "Combining Half Marks"); /** @@ -1254,7 +1254,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_COMPATIBILITY_FORMS = new UnicodeBlock(0xFE30, 0xFE4F, - "CJK_COMPATIBILITY_FORMS", + "CJK_COMPATIBILITY_FORMS", "CJK Compatibility Forms"); /** @@ -1263,7 +1263,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SMALL_FORM_VARIANTS = new UnicodeBlock(0xFE50, 0xFE6F, - "SMALL_FORM_VARIANTS", + "SMALL_FORM_VARIANTS", "Small Form Variants"); /** @@ -1272,7 +1272,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock ARABIC_PRESENTATION_FORMS_B = new UnicodeBlock(0xFE70, 0xFEFF, - "ARABIC_PRESENTATION_FORMS_B", + "ARABIC_PRESENTATION_FORMS_B", "Arabic Presentation Forms-B"); /** @@ -1281,7 +1281,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock HALFWIDTH_AND_FULLWIDTH_FORMS = new UnicodeBlock(0xFF00, 0xFFEF, - "HALFWIDTH_AND_FULLWIDTH_FORMS", + "HALFWIDTH_AND_FULLWIDTH_FORMS", "Halfwidth and Fullwidth Forms"); /** @@ -1290,7 +1290,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SPECIALS = new UnicodeBlock(0xFFF0, 0xFFFF, - "SPECIALS", + "SPECIALS", "Specials"); /** @@ -1300,7 +1300,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LINEAR_B_SYLLABARY = new UnicodeBlock(0x10000, 0x1007F, - "LINEAR_B_SYLLABARY", + "LINEAR_B_SYLLABARY", "Linear B Syllabary"); /** @@ -1310,7 +1310,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock LINEAR_B_IDEOGRAMS = new UnicodeBlock(0x10080, 0x100FF, - "LINEAR_B_IDEOGRAMS", + "LINEAR_B_IDEOGRAMS", "Linear B Ideograms"); /** @@ -1320,7 +1320,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock AEGEAN_NUMBERS = new UnicodeBlock(0x10100, 0x1013F, - "AEGEAN_NUMBERS", + "AEGEAN_NUMBERS", "Aegean Numbers"); /** @@ -1330,7 +1330,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock OLD_ITALIC = new UnicodeBlock(0x10300, 0x1032F, - "OLD_ITALIC", + "OLD_ITALIC", "Old Italic"); /** @@ -1340,7 +1340,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock GOTHIC = new UnicodeBlock(0x10330, 0x1034F, - "GOTHIC", + "GOTHIC", "Gothic"); /** @@ -1350,7 +1350,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock UGARITIC = new UnicodeBlock(0x10380, 0x1039F, - "UGARITIC", + "UGARITIC", "Ugaritic"); /** @@ -1360,7 +1360,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock DESERET = new UnicodeBlock(0x10400, 0x1044F, - "DESERET", + "DESERET", "Deseret"); /** @@ -1370,7 +1370,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SHAVIAN = new UnicodeBlock(0x10450, 0x1047F, - "SHAVIAN", + "SHAVIAN", "Shavian"); /** @@ -1380,7 +1380,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock OSMANYA = new UnicodeBlock(0x10480, 0x104AF, - "OSMANYA", + "OSMANYA", "Osmanya"); /** @@ -1390,7 +1390,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CYPRIOT_SYLLABARY = new UnicodeBlock(0x10800, 0x1083F, - "CYPRIOT_SYLLABARY", + "CYPRIOT_SYLLABARY", "Cypriot Syllabary"); /** @@ -1400,7 +1400,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock BYZANTINE_MUSICAL_SYMBOLS = new UnicodeBlock(0x1D000, 0x1D0FF, - "BYZANTINE_MUSICAL_SYMBOLS", + "BYZANTINE_MUSICAL_SYMBOLS", "Byzantine Musical Symbols"); /** @@ -1410,7 +1410,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MUSICAL_SYMBOLS = new UnicodeBlock(0x1D100, 0x1D1FF, - "MUSICAL_SYMBOLS", + "MUSICAL_SYMBOLS", "Musical Symbols"); /** @@ -1420,7 +1420,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAI_XUAN_JING_SYMBOLS = new UnicodeBlock(0x1D300, 0x1D35F, - "TAI_XUAN_JING_SYMBOLS", + "TAI_XUAN_JING_SYMBOLS", "Tai Xuan Jing Symbols"); /** @@ -1430,7 +1430,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS = new UnicodeBlock(0x1D400, 0x1D7FF, - "MATHEMATICAL_ALPHANUMERIC_SYMBOLS", + "MATHEMATICAL_ALPHANUMERIC_SYMBOLS", "Mathematical Alphanumeric Symbols"); /** @@ -1440,7 +1440,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B = new UnicodeBlock(0x20000, 0x2A6DF, - "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B", + "CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B", "CJK Unified Ideographs Extension B"); /** @@ -1450,7 +1450,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT = new UnicodeBlock(0x2F800, 0x2FA1F, - "CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT", + "CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT", "CJK Compatibility Ideographs Supplement"); /** @@ -1460,7 +1460,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock TAGS = new UnicodeBlock(0xE0000, 0xE007F, - "TAGS", + "TAGS", "Tags"); /** @@ -1470,7 +1470,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock VARIATION_SELECTORS_SUPPLEMENT = new UnicodeBlock(0xE0100, 0xE01EF, - "VARIATION_SELECTORS_SUPPLEMENT", + "VARIATION_SELECTORS_SUPPLEMENT", "Variation Selectors Supplement"); /** @@ -1480,7 +1480,7 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_A = new UnicodeBlock(0xF0000, 0xFFFFF, - "SUPPLEMENTARY_PRIVATE_USE_AREA_A", + "SUPPLEMENTARY_PRIVATE_USE_AREA_A", "Supplementary Private Use Area-A"); /** @@ -1490,13 +1490,13 @@ public final class Character implements Serializable, Comparable */ public static final UnicodeBlock SUPPLEMENTARY_PRIVATE_USE_AREA_B = new UnicodeBlock(0x100000, 0x10FFFF, - "SUPPLEMENTARY_PRIVATE_USE_AREA_B", + "SUPPLEMENTARY_PRIVATE_USE_AREA_B", "Supplementary Private Use Area-B"); /** * Surrogates Area. * 'D800' - 'DFFF'. - * @deprecated As of 1.5, the three areas, + * @deprecated As of 1.5, the three areas, * HIGH_SURROGATES, * HIGH_PRIVATE_USE_SURROGATES * and LOW_SURROGATES, as defined @@ -1508,7 +1508,7 @@ public final class Character implements Serializable, Comparable public static final UnicodeBlock SURROGATES_AREA = new UnicodeBlock(0xD800, 0xDFFF, "SURROGATES_AREA", - "Surrogates Area"); + "Surrogates Area"); /** * The defined subsets. @@ -1643,9 +1643,9 @@ public final class Character implements Serializable, Comparable } // class UnicodeBlock /** - * A class to encompass all the properties of characters in the + * A class to encompass all the properties of characters in the * private use blocks in the Unicode standard. This class extends - * UnassignedCharacters because the return type from getType() is + * UnassignedCharacters because the return type from getType() is * different. * @author Anthony Balkissoon abalkiss at redhat dot com * @@ -1657,25 +1657,25 @@ public final class Character implements Serializable, Comparable */ static int getType(int cp) { - // The upper 2 code points in any plane are considered unassigned, + // The upper 2 code points in any plane are considered unassigned, // even in the private-use planes. if ((cp & 0xffff) >= 0xfffe) return UnassignedCharacters.getType(cp); return PRIVATE_USE; } - + /** * Returns true if the character cp is defined. */ static boolean isDefined(int cp) { - // The upper 2 code points in any plane are considered unassigned, + // The upper 2 code points in any plane are considered unassigned, // even in the private-use planes. if ((cp & 0xffff) >= 0xfffe) return UnassignedCharacters.isDefined(cp); return true; } - + /** * Gets the directionality for the character cp. */ @@ -1686,9 +1686,9 @@ public final class Character implements Serializable, Comparable return DIRECTIONALITY_LEFT_TO_RIGHT; } } - + /** - * A class to encompass all the properties of code points that are + * A class to encompass all the properties of code points that are * currently undefined in the Unicode standard. * @author Anthony Balkissoon abalkiss at redhat dot com * @@ -1707,7 +1707,7 @@ public final class Character implements Serializable, Comparable } /** - * Returns the Unicode directionality property for unassigned + * Returns the Unicode directionality property for unassigned * characters. * @param cp the character * @return DIRECTIONALITY_UNDEFINED @@ -1736,9 +1736,9 @@ public final class Character implements Serializable, Comparable { return UNASSIGNED; } - + /** - * Returns false to indiciate that the character is not defined in the + * Returns false to indiciate that the character is not defined in the * Unicode standard. * @param cp the character * @return false @@ -1759,7 +1759,7 @@ public final class Character implements Serializable, Comparable } /** - * Returns false to indicate that the character cannot be ignored + * Returns false to indicate that the character cannot be ignored * within an identifier * @param cp the character * @return false @@ -1770,7 +1770,7 @@ public final class Character implements Serializable, Comparable } /** - * Returns false to indicate that the character cannot be part of a + * Returns false to indicate that the character cannot be part of a * Java identifier. * @param cp the character * @return false @@ -1781,7 +1781,7 @@ public final class Character implements Serializable, Comparable } /** - * Returns false to indicate that the character cannot be start a + * Returns false to indicate that the character cannot be start a * Java identifier. * @param cp the character * @return false @@ -1821,7 +1821,7 @@ public final class Character implements Serializable, Comparable { return false; } - + /** * Returns false to indicate that the character cannot is not mirrored. * @param cp the character @@ -1841,7 +1841,7 @@ public final class Character implements Serializable, Comparable { return false; } - + /** * Returns false to indicate that the character it not a titlecase letter. * @param cp the character @@ -1851,9 +1851,9 @@ public final class Character implements Serializable, Comparable { return false; } - + /** - * Returns false to indicate that the character cannot be part of a + * Returns false to indicate that the character cannot be part of a * Unicode identifier. * @param cp the character * @return false @@ -1864,7 +1864,7 @@ public final class Character implements Serializable, Comparable } /** - * Returns false to indicate that the character cannot start a + * Returns false to indicate that the character cannot start a * Unicode identifier. * @param cp the character * @return false @@ -1904,7 +1904,7 @@ public final class Character implements Serializable, Comparable { return cp; } - + /** * Returns cp to indicate this character has no titlecase conversion. * @param cp the character @@ -1923,7 +1923,7 @@ public final class Character implements Serializable, Comparable static int toUpperCase(int cp) { return cp; - } + } } /** @@ -2014,7 +2014,7 @@ public final class Character implements Serializable, Comparable * This value is '\uDFFF'. * @since 1.5 */ - public static final char MAX_LOW_SURROGATE = '\uDFFF'; + public static final char MAX_LOW_SURROGATE = '\uDFFF'; /** * The minimum Unicode surrogate code unit in the UTF-16 character encoding. @@ -2034,7 +2034,7 @@ public final class Character implements Serializable, Comparable * The lowest possible supplementary Unicode code point (the first code * point outside the basic multilingual plane (BMP)). * This value is 0x10000. - */ + */ public static final int MIN_SUPPLEMENTARY_CODE_POINT = 0x10000; /** @@ -2418,7 +2418,7 @@ public final class Character implements Serializable, Comparable * @see #readCodePoint(int) * @see CharData#BLOCKS */ - private static final char[][] blocks = + private static final char[][] blocks = new char[][]{ String.zeroBasedStringValue(CharData.BLOCKS[0]), String.zeroBasedStringValue(CharData.BLOCKS[1]), @@ -2443,7 +2443,7 @@ public final class Character implements Serializable, Comparable * of String.value to avoid copying the array. * @see CharData#DATA */ - private static final char[][] data = + private static final char[][] data = new char[][]{ String.zeroBasedStringValue(CharData.DATA[0]), String.zeroBasedStringValue(CharData.DATA[1]), @@ -2468,7 +2468,7 @@ public final class Character implements Serializable, Comparable * of String.value to avoid copying the array. * @see CharData#NUM_VALUE */ - private static final char[][] numValue = + private static final char[][] numValue = new char[][]{ String.zeroBasedStringValue(CharData.NUM_VALUE[0]), String.zeroBasedStringValue(CharData.NUM_VALUE[1]), @@ -2492,8 +2492,8 @@ public final class Character implements Serializable, Comparable * Stores unicode uppercase attribute table. Exploit package visibility * of String.value to avoid copying the array. * @see CharData#UPPER - */ - private static final char[][] upper = + */ + private static final char[][] upper = new char[][]{ String.zeroBasedStringValue(CharData.UPPER[0]), String.zeroBasedStringValue(CharData.UPPER[1]), @@ -2518,7 +2518,7 @@ public final class Character implements Serializable, Comparable * of String.value to avoid copying the array. * @see CharData#LOWER */ - private static final char[][] lower = + private static final char[][] lower = new char[][]{ String.zeroBasedStringValue(CharData.LOWER[0]), String.zeroBasedStringValue(CharData.LOWER[1]), @@ -2544,7 +2544,7 @@ public final class Character implements Serializable, Comparable * @see CharData#DIRECTION */ // Package visible for use by String. - static final char[][] direction = + static final char[][] direction = new char[][]{ String.zeroBasedStringValue(CharData.DIRECTION[0]), String.zeroBasedStringValue(CharData.DIRECTION[1]), @@ -2569,7 +2569,7 @@ public final class Character implements Serializable, Comparable * String.value to avoid copying the array. * @see CharData#TITLE */ - private static final char[] title = String.zeroBasedStringValue(CharData.TITLE); + private static final char[] title = String.zeroBasedStringValue(CharData.TITLE); /** * Mask for grabbing the type out of the contents of data. @@ -2698,7 +2698,7 @@ public final class Character implements Serializable, Comparable { return isLowerCase((int)ch); } - + /** * Determines if a character is a Unicode lowercase letter. For example, * 'a' is lowercase. Returns true if getType() returns @@ -2712,7 +2712,7 @@ public final class Character implements Serializable, Comparable * @see #isTitleCase(char) * @see #toLowerCase(char) * @see #getType(char) - * + * * @since 1.5 */ public static boolean isLowerCase(int codePoint) @@ -2738,7 +2738,7 @@ public final class Character implements Serializable, Comparable { return isUpperCase((int)ch); } - + /** * Determines if a character is a Unicode uppercase letter. For example, * 'A' is uppercase. Returns true if getType() returns @@ -2752,7 +2752,7 @@ public final class Character implements Serializable, Comparable * @see #isTitleCase(char) * @see #toUpperCase(char) * @see #getType(char) - * + * * @since 1.5 */ public static boolean isUpperCase(int codePoint) @@ -2792,14 +2792,14 @@ public final class Character implements Serializable, Comparable * @see #isUpperCase(char) * @see #toTitleCase(char) * @see #getType(char) - * + * * @since 1.5 */ public static boolean isTitleCase(int codePoint) { return getType(codePoint) == TITLECASE_LETTER; } - + /** * Determines if a character is a Unicode decimal digit. For example, @@ -2818,7 +2818,7 @@ public final class Character implements Serializable, Comparable { return isDigit((int)ch); } - + /** * Determines if a character is a Unicode decimal digit. For example, * '0' is a digit. A character is a Unicode digit if @@ -2831,7 +2831,7 @@ public final class Character implements Serializable, Comparable * @see #digit(char, int) * @see #forDigit(int, int) * @see #getType(char) - * + * * @since 1.5 */ @@ -2859,7 +2859,7 @@ public final class Character implements Serializable, Comparable { return isDefined((int)ch); } - + /** * Determines if a character is part of the Unicode Standard. This is an * evolving standard, but covers every character in the data file. @@ -2874,7 +2874,7 @@ public final class Character implements Serializable, Comparable * @see #isLowerCase(char) * @see #isTitleCase(char) * @see #isUpperCase(char) - * + * * @since 1.5 */ public static boolean isDefined(int codePoint) @@ -2885,7 +2885,7 @@ public final class Character implements Serializable, Comparable /** * Determines if a character is a Unicode letter. Not all letters have case, * so this may return true when isLowerCase and isUpperCase return false. - * A character is a Unicode letter if getType() returns one of + * A character is a Unicode letter if getType() returns one of * UPPERCASE_LETTER, LOWERCASE_LETTER, TITLECASE_LETTER, MODIFIER_LETTER, * or OTHER_LETTER. *
            @@ -2907,11 +2907,11 @@ public final class Character implements Serializable, Comparable { return isLetter((int)ch); } - + /** * Determines if a character is a Unicode letter. Not all letters have case, * so this may return true when isLowerCase and isUpperCase return false. - * A character is a Unicode letter if getType() returns one of + * A character is a Unicode letter if getType() returns one of * UPPERCASE_LETTER, LOWERCASE_LETTER, TITLECASE_LETTER, MODIFIER_LETTER, * or OTHER_LETTER. *
            @@ -2928,7 +2928,7 @@ public final class Character implements Serializable, Comparable * @see #isTitleCase(char) * @see #isUnicodeIdentifierStart(char) * @see #isUpperCase(char) - * + * * @since 1.5 */ public static boolean isLetter(int codePoint) @@ -2947,17 +2947,17 @@ public final class Character implements Serializable, Comparable * @param index the start position in the CharSequence * @param codePointOffset the number of code points offset from the start * position - * @return the index into the CharSequence that is codePointOffset code + * @return the index into the CharSequence that is codePointOffset code * points offset from index - * + * * @throws NullPointerException if seq is null * @throws IndexOutOfBoundsException if index is negative or greater than the * length of the sequence. - * @throws IndexOutOfBoundsException if codePointOffset is positive and the + * @throws IndexOutOfBoundsException if codePointOffset is positive and the * subsequence from index to the end of seq has fewer than codePointOffset * code points * @throws IndexOutOfBoundsException if codePointOffset is negative and the - * subsequence from the start of seq to index has fewer than + * subsequence from the start of seq to index has fewer than * (-codePointOffset) code points * @since 1.5 */ @@ -2968,7 +2968,7 @@ public final class Character implements Serializable, Comparable int len = seq.length(); if (index < 0 || index > len) throw new IndexOutOfBoundsException(); - + int numToGo = codePointOffset; int offset = index; int adjust = 1; @@ -2999,7 +2999,7 @@ public final class Character implements Serializable, Comparable return offset; } } - + /** * Returns the index into the given char subarray that is offset * codePointOffset code points from index. @@ -3010,11 +3010,11 @@ public final class Character implements Serializable, Comparable * @param codePointOffset the number of code points offset from index * * @return the index into the char array - * + * * @throws NullPointerException if a is null * @throws IndexOutOfBoundsException if start or count is negative or if * start + count is greater than the length of the array - * @throws IndexOutOfBoundsException if index is less than start or larger + * @throws IndexOutOfBoundsException if index is less than start or larger * than start + count * @throws IndexOutOfBoundsException if codePointOffset is positive and the * subarray from index to start + count - 1 has fewer than codePointOffset @@ -3022,7 +3022,7 @@ public final class Character implements Serializable, Comparable * @throws IndexOutOfBoundsException if codePointOffset is negative and the * subarray from start to index - 1 has fewer than (-codePointOffset) code * points - * + * * @since 1.5 */ public static int offsetByCodePoints(char[] a, @@ -3035,7 +3035,7 @@ public final class Character implements Serializable, Comparable int end = start + count; if (start < 0 || count < 0 || end > len || index < start || index > end) throw new IndexOutOfBoundsException(); - + int numToGo = codePointOffset; int offset = index; int adjust = 1; @@ -3069,18 +3069,18 @@ public final class Character implements Serializable, Comparable } } - + /** * Returns the number of Unicode code points in the specified range of the * given CharSequence. The first char in the range is at position - * beginIndex and the last one is at position endIndex - 1. Paired - * surrogates (supplementary characters are represented by a pair of chars - - * one from the high surrogates and one from the low surrogates) + * beginIndex and the last one is at position endIndex - 1. Paired + * surrogates (supplementary characters are represented by a pair of chars - + * one from the high surrogates and one from the low surrogates) * count as just one code point. * @param seq the CharSequence to inspect * @param beginIndex the beginning of the range * @param endIndex the end of the range - * @return the number of Unicode code points in the given range of the + * @return the number of Unicode code points in the given range of the * sequence * @throws NullPointerException if seq is null * @throws IndexOutOfBoundsException if beginIndex is negative, endIndex is @@ -3093,7 +3093,7 @@ public final class Character implements Serializable, Comparable int len = seq.length(); if (beginIndex < 0 || endIndex > len || beginIndex > endIndex) throw new IndexOutOfBoundsException(); - + int count = 0; for (int i = beginIndex; i < endIndex; i++) { @@ -3102,24 +3102,24 @@ public final class Character implements Serializable, Comparable if (isHighSurrogate(seq.charAt(i)) && (i + 1) < endIndex && isLowSurrogate(seq.charAt(i + 1))) i ++; - } + } return count; } - + /** * Returns the number of Unicode code points in the specified range of the * given char array. The first char in the range is at position * offset and the length of the range is count. Paired surrogates - * (supplementary characters are represented by a pair of chars - - * one from the high surrogates and one from the low surrogates) + * (supplementary characters are represented by a pair of chars - + * one from the high surrogates and one from the low surrogates) * count as just one code point. * @param a the char array to inspect * @param offset the beginning of the range * @param count the length of the range - * @return the number of Unicode code points in the given range of the + * @return the number of Unicode code points in the given range of the * array * @throws NullPointerException if a is null - * @throws IndexOutOfBoundsException if offset or count is negative or if + * @throws IndexOutOfBoundsException if offset or count is negative or if * offset + countendIndex is larger than the length of a. * @since 1.5 */ @@ -3130,7 +3130,7 @@ public final class Character implements Serializable, Comparable int end = offset + count; if (offset < 0 || count < 0 || end > len) throw new IndexOutOfBoundsException(); - + int counter = 0; for (int i = offset; i < end; i++) { @@ -3139,7 +3139,7 @@ public final class Character implements Serializable, Comparable if (isHighSurrogate(a[i]) && (i + 1) < end && isLowSurrogate(a[i + 1])) i ++; - } + } return counter; } @@ -3177,7 +3177,7 @@ public final class Character implements Serializable, Comparable * @see #isJavaLetterOrDigit(char) * @see #isLetter(char) * @see #isUnicodeIdentifierPart(char) - * + * * @since 1.5 */ public static boolean isLetterOrDigit(int codePoint) @@ -3190,7 +3190,7 @@ public final class Character implements Serializable, Comparable | (1 << OTHER_LETTER) | (1 << DECIMAL_DIGIT_NUMBER))) != 0; } - + /** * Determines if a character can start a Java identifier. This is the * combination of isLetter, any character where getType returns @@ -3306,7 +3306,7 @@ public final class Character implements Serializable, Comparable { return isJavaIdentifierPart((int)ch); } - + /** * Determines if a character can follow the first letter in * a Java identifier. This is the combination of isJavaLetter (isLetter, @@ -3411,7 +3411,7 @@ public final class Character implements Serializable, Comparable { return isUnicodeIdentifierPart((int)ch); } - + /** * Determines if a character can follow the first letter in * a Unicode identifier. This includes letters, connecting punctuation, @@ -3512,7 +3512,7 @@ public final class Character implements Serializable, Comparable { return (char) (lower[0][readCodePoint((int)ch) >>> 7] + ch); } - + /** * Converts a Unicode character into its lowercase equivalent mapping. * If a mapping does not exist, then the character passed is returned. @@ -3525,7 +3525,7 @@ public final class Character implements Serializable, Comparable * @see #isUpperCase(char) * @see #toTitleCase(char) * @see #toUpperCase(char) - * + * * @since 1.5 */ public static int toLowerCase(int codePoint) @@ -3537,7 +3537,7 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.toLowerCase(codePoint); if (plane > 14) return PrivateUseCharacters.toLowerCase(codePoint); - + // The short value stored in lower[plane] is the signed difference between // codePoint and its lowercase conversion. return ((short)lower[plane][readCodePoint(codePoint) >>> 7]) + codePoint; @@ -3560,7 +3560,7 @@ public final class Character implements Serializable, Comparable { return (char) (upper[0][readCodePoint((int)ch) >>> 7] + ch); } - + /** * Converts a Unicode character into its uppercase equivalent mapping. * If a mapping does not exist, then the character passed is returned. @@ -3573,7 +3573,7 @@ public final class Character implements Serializable, Comparable * @see #isUpperCase(char) * @see #toLowerCase(char) * @see #toTitleCase(char) - * + * * @since 1.5 */ public static int toUpperCase(int codePoint) @@ -3585,7 +3585,7 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.toUpperCase(codePoint); if (plane > 14) return PrivateUseCharacters.toUpperCase(codePoint); - + // The short value stored in upper[plane] is the signed difference between // codePoint and its uppercase conversion. return ((short)upper[plane][readCodePoint(codePoint) >>> 7]) + codePoint; @@ -3623,7 +3623,7 @@ public final class Character implements Serializable, Comparable * @see #isTitleCase(char) * @see #toLowerCase(char) * @see #toUpperCase(char) - * + * * @since 1.5 */ public static int toTitleCase(int codePoint) @@ -3693,7 +3693,7 @@ public final class Character implements Serializable, Comparable { if (radix < MIN_RADIX || radix > MAX_RADIX) return -1; - + // If the code point is unassigned or in one of the private use areas // then we delegate the call to the appropriate private static inner class. int plane = codePoint >>> 16; @@ -3709,8 +3709,8 @@ public final class Character implements Serializable, Comparable { // Signedness doesn't matter; 0xffff vs. -1 are both rejected. int digit = numValue[plane][attr >> 7]; - - // If digit is less than or equal to -3 then the numerical value was + + // If digit is less than or equal to -3 then the numerical value was // too large to fit into numValue and is stored in CharData.LARGENUMS. if (digit <= -3) digit = CharData.LARGENUMS[-digit - 3]; @@ -3718,7 +3718,7 @@ public final class Character implements Serializable, Comparable } return -1; } - + /** * Returns the Unicode numeric value property of a character. For example, * '\\u216C' (the Roman numeral fifty) returns 50. @@ -3751,7 +3751,7 @@ public final class Character implements Serializable, Comparable // Treat numValue as signed. return (short) numValue[0][readCodePoint((int)ch) >> 7]; } - + /** * Returns the Unicode numeric value property of a character. For example, * '\\u216C' (the Roman numeral fifty) returns 50. @@ -3788,9 +3788,9 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.getNumericValue(codePoint); if (plane > 14) return PrivateUseCharacters.getNumericValue(codePoint); - + // If the value N found in numValue[plane] is less than or equal to -3 - // then the numeric value was too big to fit into 16 bits and is + // then the numeric value was too big to fit into 16 bits and is // stored in CharData.LARGENUMS at offset (-N - 3). short num = (short)numValue[plane][readCodePoint(codePoint) >> 7]; if (num <= -3) @@ -3837,7 +3837,7 @@ public final class Character implements Serializable, Comparable { return isSpaceChar((int)ch); } - + /** * Determines if a character is a Unicode space character. This includes * SPACE_SEPARATOR, LINE_SEPARATOR, and PARAGRAPH_SEPARATOR. @@ -3878,7 +3878,7 @@ public final class Character implements Serializable, Comparable { return isWhitespace((int) ch); } - + /** * Determines if a character is Java whitespace. This includes Unicode * space characters (SPACE_SEPARATOR, LINE_SEPARATOR, and @@ -3903,7 +3903,7 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.isWhiteSpace(codePoint); if (plane > 14) return PrivateUseCharacters.isWhiteSpace(codePoint); - + int attr = readCodePoint(codePoint); return ((((1 << (attr & TYPE_MASK)) & ((1 << SPACE_SEPARATOR) @@ -3937,14 +3937,14 @@ public final class Character implements Serializable, Comparable { return isISOControl((int)ch); } - + /** * Determines if the character is an ISO Control character. This is true * if the code point is in the range [0, 0x001F] or if it is in the range * [0x007F, 0x009F]. * @param codePoint the character to check * @return true if the character is in one of the above ranges - * + * * @since 1.5 */ public static boolean isISOControl(int codePoint) @@ -3952,7 +3952,7 @@ public final class Character implements Serializable, Comparable if ((codePoint >= 0 && codePoint <= 0x001F) || (codePoint >= 0x007F && codePoint <= 0x009F)) return true; - return false; + return false; } /** @@ -3996,7 +3996,7 @@ public final class Character implements Serializable, Comparable { return getType((int)ch); } - + /** * Returns the Unicode general category property of a character. * @@ -4032,7 +4032,7 @@ public final class Character implements Serializable, Comparable * @see #MODIFIER_SYMBOL * @see #INITIAL_QUOTE_PUNCTUATION * @see #FINAL_QUOTE_PUNCTUATION - * + * * @since 1.5 */ public static int getType(int codePoint) @@ -4044,7 +4044,7 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.getType(codePoint); if (plane > 14) return PrivateUseCharacters.getType(codePoint); - + return readCodePoint(codePoint) & TYPE_MASK; } @@ -4105,7 +4105,7 @@ public final class Character implements Serializable, Comparable return getDirectionality((int)ch); } - + /** * Returns the Unicode directionality property of the character. This * is used in the visual ordering of text. @@ -4143,11 +4143,11 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.getDirectionality(codePoint); if (plane > 14) return PrivateUseCharacters.getDirectionality(codePoint); - + // The result will correctly be signed. return (byte) (direction[plane][readCodePoint(codePoint) >> 7] >> 2); } - + /** * Determines whether the character is mirrored according to Unicode. For * example, \u0028 (LEFT PARENTHESIS) appears as '(' in @@ -4161,7 +4161,7 @@ public final class Character implements Serializable, Comparable { return (readCodePoint((int)ch) & MIRROR_MASK) != 0; } - + /** * Determines whether the character is mirrored according to Unicode. For * example, \u0028 (LEFT PARENTHESIS) appears as '(' in @@ -4180,7 +4180,7 @@ public final class Character implements Serializable, Comparable return UnassignedCharacters.isMirrored(codePoint); if (plane > 14) return PrivateUseCharacters.isMirrored(codePoint); - + return (readCodePoint(codePoint) & MIRROR_MASK) != 0; } @@ -4229,7 +4229,7 @@ public final class Character implements Serializable, Comparable /** * Converts a unicode code point to a UTF-16 representation of that * code point. - * + * * @param codePoint the unicode code point * * @return the UTF-16 representation of that code point @@ -4288,7 +4288,7 @@ public final class Character implements Serializable, Comparable else { dst[dstIndex] = (char) codePoint; - result = 1; + result = 1; } return result; } @@ -4305,9 +4305,9 @@ public final class Character implements Serializable, Comparable */ public static int charCount(int codePoint) { - return - (codePoint >= MIN_SUPPLEMENTARY_CODE_POINT) - ? 2 + return + (codePoint >= MIN_SUPPLEMENTARY_CODE_POINT) + ? 2 : 1; } @@ -4510,7 +4510,7 @@ public final class Character implements Serializable, Comparable public static int codePointBefore(char[] chars, int index, int start) { if (index < start || index > chars.length - || start < 0 || start >= chars.length) + || start < 0 || start >= chars.length) throw new IndexOutOfBoundsException(); --index; char low = chars[index]; diff --git a/libjava/classpath/java/lang/Class.java b/libjava/classpath/java/lang/Class.java index 0aafe80f83c..1caee014736 100644 --- a/libjava/classpath/java/lang/Class.java +++ b/libjava/classpath/java/lang/Class.java @@ -99,7 +99,7 @@ import java.util.LinkedHashSet; * @since 1.0 * @see ClassLoader */ -public final class Class +public final class Class implements Serializable, Type, AnnotatedElement, GenericDeclaration { /** @@ -215,7 +215,7 @@ public final class Class * @since 1.2 */ public static Class forName(String name, boolean initialize, - ClassLoader classloader) + ClassLoader classloader) throws ClassNotFoundException { if (classloader == null) @@ -232,7 +232,7 @@ public final class Class } return (Class) VMClass.forName(name, initialize, classloader); } - + /** * Get all the public member classes and interfaces declared in this * class or inherited from superclasses. This returns an array of length @@ -263,7 +263,7 @@ public final class Class list.addAll(Arrays.asList(superClass.internalGetClasses())); return list.toArray(new Class[list.size()]); } - + /** * Get the ClassLoader that loaded this class. If the class was loaded * by the bootstrap classloader, this method will return null. @@ -288,7 +288,7 @@ public final class Class if (loader != null && sm != null) { // Get the calling classloader - ClassLoader cl = VMStackWalker.getCallingClassLoader(); + ClassLoader cl = VMStackWalker.getCallingClassLoader(); if (cl != null && !cl.isAncestorOf(loader)) sm.checkPermission(new RuntimePermission("getClassLoader")); } @@ -331,9 +331,9 @@ public final class Class Constructor[] constructors = getDeclaredConstructors(true); for (int i = 0; i < constructors.length; i++) { - Constructor constructor = constructors[i]; - if (matchParameters(types, constructor.getParameterTypes())) - return constructor; + Constructor constructor = constructors[i]; + if (matchParameters(types, constructor.getParameterTypes())) + return constructor; } throw new NoSuchMethodException(); } @@ -377,9 +377,9 @@ public final class Class Constructor[] constructors = getDeclaredConstructors(false); for (int i = 0; i < constructors.length; i++) { - Constructor constructor = constructors[i]; - if (matchParameters(types, constructor.getParameterTypes())) - return constructor; + Constructor constructor = constructors[i]; + if (matchParameters(types, constructor.getParameterTypes())) + return constructor; } throw new NoSuchMethodException(); } @@ -429,7 +429,7 @@ public final class Class { return VMClass.getDeclaredConstructors (this, publicOnly); } - + /** * Get a field declared in this class, where name is its simple name. The * implicit length field of arrays is not available. A security check may @@ -449,8 +449,8 @@ public final class Class Field[] fields = getDeclaredFields(false); for (int i = 0; i < fields.length; i++) { - if (fields[i].getName().equals(name)) - return fields[i]; + if (fields[i].getName().equals(name)) + return fields[i]; } throw new NoSuchFieldException(); } @@ -535,7 +535,7 @@ public final class Class { return VMClass.getDeclaredMethods (this, publicOnly); } - + /** * If this is a nested or inner class, return the class that declared it. * If not, return null. @@ -643,7 +643,7 @@ public final class Class private Class[] params; private Class returnType; private int hash; - + MethodKey(Method m) { name = m.getName(); @@ -651,36 +651,36 @@ public final class Class returnType = m.getReturnType(); hash = name.hashCode() ^ returnType.hashCode(); for(int i = 0; i < params.length; i++) - { - hash ^= params[i].hashCode(); - } + { + hash ^= params[i].hashCode(); + } } - + public boolean equals(Object o) { if (o instanceof MethodKey) - { - MethodKey m = (MethodKey) o; - if (m.name.equals(name) && m.params.length == params.length - && m.returnType == returnType) - { - for (int i = 0; i < params.length; i++) - { - if (m.params[i] != params[i]) - return false; - } - return true; - } - } + { + MethodKey m = (MethodKey) o; + if (m.name.equals(name) && m.params.length == params.length + && m.returnType == returnType) + { + for (int i = 0; i < params.length; i++) + { + if (m.params[i] != params[i]) + return false; + } + return true; + } + } return false; } - + public int hashCode() { return hash; } } - + /** * Get a public method declared or inherited in this class, where name is * its simple name. The implicit methods of Object are not available from @@ -725,21 +725,21 @@ public final class Class Class superClass = getSuperclass(); if (superClass != null) { - match = superClass.internalGetMethod(methodName, args); - if(match != null) - return match; + match = superClass.internalGetMethod(methodName, args); + if(match != null) + return match; } Class[] interfaces = getInterfaces(); for (int i = 0; i < interfaces.length; i++) { - match = interfaces[i].internalGetMethod(methodName, args); - if (match != null) - return match; + match = interfaces[i].internalGetMethod(methodName, args); + if (match != null) + return match; } return null; } - /** + /** * Find the best matching method in list according to * the definition of ``best matching'' used by getMethod() * @@ -756,14 +756,14 @@ public final class Class Method match = null; for (int i = 0; i < list.length; i++) { - Method method = list[i]; - if (!method.getName().equals(name)) - continue; - if (!matchParameters(args, method.getParameterTypes())) - continue; - if (match == null - || match.getReturnType().isAssignableFrom(method.getReturnType())) - match = method; + Method method = list[i]; + if (!method.getName().equals(name)) + continue; + if (!matchParameters(args, method.getParameterTypes())) + continue; + if (match == null + || match.getReturnType().isAssignableFrom(method.getReturnType())) + match = method; } return match; } @@ -783,12 +783,12 @@ public final class Class return false; for (int i = 0; i < types1.length; i++) { - if (types1[i] != types2[i]) - return false; + if (types1[i] != types2[i]) + return false; } return true; } - + /** * Get all the public methods declared in this class or inherited from * superclasses. This returns an array of length 0 if there are no methods, @@ -825,25 +825,25 @@ public final class Class Class[] interfaces = getInterfaces(); for(int i = 0; i < interfaces.length; i++) { - methods = interfaces[i].internalGetMethods(); - for(int j = 0; j < methods.length; j++) - { - map.put(new MethodKey(methods[j]), methods[j]); - } + methods = interfaces[i].internalGetMethods(); + for(int j = 0; j < methods.length; j++) + { + map.put(new MethodKey(methods[j]), methods[j]); + } } Class superClass = getSuperclass(); if(superClass != null) { - methods = superClass.internalGetMethods(); - for(int i = 0; i < methods.length; i++) - { - map.put(new MethodKey(methods[i]), methods[i]); - } + methods = superClass.internalGetMethods(); + for(int i = 0; i < methods.length; i++) + { + map.put(new MethodKey(methods[i]), methods[i]); + } } methods = getDeclaredMethods(true); for(int i = 0; i < methods.length; i++) { - map.put(new MethodKey(methods[i]), methods[i]); + map.put(new MethodKey(methods[i]), methods[i]); } return map.values().toArray(new Method[map.size()]); } @@ -867,7 +867,7 @@ public final class Class Modifier.FINAL | Modifier.STATIC | Modifier.ABSTRACT | Modifier.INTERFACE)); } - + /** * Get the name of this class, separated by dots for package separators. * If the class represents a primitive type, or void, then the @@ -896,7 +896,7 @@ public final class Class * @return the name of this class */ public String getName() - { + { return VMClass.getName (this); } @@ -959,16 +959,16 @@ public final class Class { if (resourceName.length() > 0) { - if (resourceName.charAt(0) != '/') - { - String pkg = getPackagePortion(getName()); - if (pkg.length() > 0) - resourceName = pkg.replace('.','/') + '/' + resourceName; - } - else - { - resourceName = resourceName.substring(1); - } + if (resourceName.charAt(0) != '/') + { + String pkg = getPackagePortion(getName()); + if (pkg.length() > 0) + resourceName = pkg.replace('.','/') + '/' + resourceName; + } + else + { + resourceName = resourceName.substring(1); + } } return resourceName; } @@ -984,7 +984,7 @@ public final class Class { return signers == null ? null : (Object[]) signers.clone (); } - + /** * Set the signers of this class. * @@ -1006,7 +1006,7 @@ public final class Class { return VMClass.getSuperclass (this); } - + /** * Return whether this class is an array type. * @@ -1017,7 +1017,7 @@ public final class Class { return VMClass.isArray (this); } - + /** * Discover whether an instance of the Class parameter would be an * instance of this Class as well. Think of doing @@ -1036,7 +1036,7 @@ public final class Class { return VMClass.isAssignableFrom (this, c); } - + /** * Discover whether an Object is an instance of this Class. Think of it * as almost like o instanceof (this class). @@ -1049,7 +1049,7 @@ public final class Class { return VMClass.isInstance (this, o); } - + /** * Check whether this class is an interface or not. Array types are not * interfaces. @@ -1060,7 +1060,7 @@ public final class Class { return VMClass.isInterface (this); } - + /** * Return whether this class is a primitive type. A primitive type class * is a class representing a kind of "placeholder" for the various @@ -1084,7 +1084,7 @@ public final class Class { return VMClass.isPrimitive (this); } - + /** * Get a new instance of this class by calling the no-argument constructor. * The class is initialized if it has not been already. A security check @@ -1109,45 +1109,45 @@ public final class Class Constructor constructor; synchronized(this) { - constructor = this.constructor; + constructor = this.constructor; } if (constructor == null) { - Constructor[] constructors = getDeclaredConstructors(false); - for (int i = 0; i < constructors.length; i++) - { - if (constructors[i].getParameterTypes().length == 0) - { - constructor = constructors[i]; - break; - } - } - if (constructor == null) - throw new InstantiationException(getName()); - if (!Modifier.isPublic(constructor.getModifiers()) + Constructor[] constructors = getDeclaredConstructors(false); + for (int i = 0; i < constructors.length; i++) + { + if (constructors[i].getParameterTypes().length == 0) + { + constructor = constructors[i]; + break; + } + } + if (constructor == null) + throw new InstantiationException(getName()); + if (!Modifier.isPublic(constructor.getModifiers()) || !Modifier.isPublic(VMClass.getModifiers(this, true))) - { - setAccessible(constructor); - } - synchronized(this) - { - if (this.constructor == null) - this.constructor = constructor; - } + { + setAccessible(constructor); + } + synchronized(this) + { + if (this.constructor == null) + this.constructor = constructor; + } } int modifiers = constructor.getModifiers(); if (!Modifier.isPublic(modifiers) || !Modifier.isPublic(VMClass.getModifiers(this, true))) { - Class caller = VMStackWalker.getCallingClass(); - if (caller != null && - caller != this && - (Modifier.isPrivate(modifiers) - || getClassLoader() != caller.getClassLoader() - || !getPackagePortion(getName()) - .equals(getPackagePortion(caller.getName())))) - throw new IllegalAccessException(getName() - + " has an inaccessible constructor"); + Class caller = VMStackWalker.getCallingClass(); + if (caller != null && + caller != this && + (Modifier.isPrivate(modifiers) + || getClassLoader() != caller.getClassLoader() + || !getPackagePortion(getName()) + .equals(getPackagePortion(caller.getName())))) + throw new IllegalAccessException(getName() + + " has an inaccessible constructor"); } try { @@ -1155,9 +1155,9 @@ public final class Class } catch (InvocationTargetException e) { - VMClass.throwException(e.getTargetException()); - throw (InternalError) new InternalError - ("VMClass.throwException returned").initCause(e); + VMClass.throwException(e.getTargetException()); + throw (InternalError) new InternalError + ("VMClass.throwException returned").initCause(e); } } @@ -1288,14 +1288,14 @@ public final class Class * returns an appropriately cast reference to this object. Otherwise, * a ClassCastException is thrown. *

            - * + * * @param klass the class object, the parameterized type (U) of * which should be a superclass of the parameterized type of * this instance. * @return a reference to this object, appropriately cast. * @throws ClassCastException if this class can not be converted to one * which represents a subclass of the specified - * type, U. + * type, U. * @since 1.5 */ public Class asSubclass(Class klass) @@ -1328,16 +1328,16 @@ public final class Class Field[] fields = getDeclaredFields(true); for (int i = 0; i < fields.length; i++) { - Field field = fields[i]; - if (field.getName().equals(name)) - return field; + Field field = fields[i]; + if (field.getName().equals(name)) + return field; } Class[] interfaces = getInterfaces(); for (int i = 0; i < interfaces.length; i++) { - Field field = interfaces[i].internalGetField(name); - if(field != null) - return field; + Field field = interfaces[i].internalGetField(name); + if(field != null) + return field; } Class superClass = getSuperclass(); if (superClass != null) @@ -1368,10 +1368,10 @@ public final class Class SecurityManager sm = SecurityManager.current; if (sm != null) { - sm.checkMemberAccess(this, which); - Package pkg = getPackage(); - if (pkg != null) - sm.checkPackageAccess(pkg.getName()); + sm.checkMemberAccess(this, which); + Package pkg = getPackage(); + if (pkg != null) + sm.checkPackageAccess(pkg.getName()); } } @@ -1388,30 +1388,30 @@ public final class Class { if (isEnum()) { - try - { + try + { Method m = getMethod("values"); setAccessible(m); - return (T[]) m.invoke(null); - } - catch (NoSuchMethodException exception) - { - throw new Error("Enum lacks values() method"); - } - catch (IllegalAccessException exception) - { - throw new Error("Unable to access Enum class"); - } - catch (InvocationTargetException exception) - { - throw new - RuntimeException("The values method threw an exception", - exception); - } + return (T[]) m.invoke(null); + } + catch (NoSuchMethodException exception) + { + throw new Error("Enum lacks values() method"); + } + catch (IllegalAccessException exception) + { + throw new Error("Unable to access Enum class"); + } + catch (InvocationTargetException exception) + { + throw new + RuntimeException("The values method threw an exception", + exception); + } } else { - return null; + return null; } } @@ -1458,7 +1458,7 @@ public final class Class * getName() which follows the last ".". Anonymous * classes have no name, and so the result of calling this method is * "". The simple name of an array consists of the simple name of - * its component type, followed by "[]". Thus, an array with the + * its component type, followed by "[]". Thus, an array with the * component type of an anonymous class has a simple name of simply * "[]". * @@ -1485,7 +1485,7 @@ public final class Class Annotation[] annotations = getAnnotations(); for (Annotation annotation : annotations) if (annotation.annotationType() == annotationClass) - foundAnnotation = (A) annotation; + foundAnnotation = (A) annotation; return foundAnnotation; } @@ -1506,15 +1506,15 @@ public final class Class for (Annotation a : getDeclaredAnnotations()) map.put((Class) a.annotationType(), a); for (Class s = getSuperclass(); - s != null; - s = s.getSuperclass()) + s != null; + s = s.getSuperclass()) { - for (Annotation a : s.getDeclaredAnnotations()) - { - Class k = (Class) a.annotationType(); - if (! map.containsKey(k) && k.isAnnotationPresent(Inherited.class)) - map.put(k, a); - } + for (Annotation a : s.getDeclaredAnnotations()) + { + Class k = (Class) a.annotationType(); + if (! map.containsKey(k) && k.isAnnotationPresent(Inherited.class)) + map.put(k, a); + } } Collection v = map.values(); return v.toArray(new Annotation[v.size()]); @@ -1533,7 +1533,7 @@ public final class Class * The canonical name for top-level classes, top-level interfaces and * primitive types is always the same as the fully-qualified name. * For array types, the canonical name is the canonical name of its - * component type with `[]' appended. + * component type with `[]' appended. *

            *

            * The canonical name of a member class always refers to the place where @@ -1590,7 +1590,7 @@ public final class Class /** * Returns the constructor which immediately encloses this class. If - * this class is a top-level class, or a local or anonymous class + * this class is a top-level class, or a local or anonymous class * immediately enclosed by a type definition, instance initializer * or static initializer, then null is returned. * @@ -1606,7 +1606,7 @@ public final class Class /** * Returns the method which immediately encloses this class. If - * this class is a top-level class, or a local or anonymous class + * this class is a top-level class, or a local or anonymous class * immediately enclosed by a type definition, instance initializer * or static initializer, then null is returned. * @@ -1718,7 +1718,7 @@ public final class Class * An array of size zero is returned if this class has no type * variables. * - * @return the type variables associated with this class. + * @return the type variables associated with this class. * @throws GenericSignatureFormatError if the generic signature does * not conform to the format specified in the Virtual Machine * specification, version 3. @@ -1743,8 +1743,8 @@ public final class Class * @return true if an annotation exists for the specified type. * @since 1.5 */ - public boolean isAnnotationPresent(Class - annotationClass) + public boolean isAnnotationPresent(Class + annotationClass) { return getAnnotation(annotationClass) != null; } diff --git a/libjava/classpath/java/lang/ClassLoader.java b/libjava/classpath/java/lang/ClassLoader.java index 591406ac4dc..b7cbb2a1a3a 100644 --- a/libjava/classpath/java/lang/ClassLoader.java +++ b/libjava/classpath/java/lang/ClassLoader.java @@ -165,23 +165,23 @@ public abstract class ClassLoader if (secman != null && SecurityManager.current == null) { if (secman.equals("") || secman.equals("default")) - { - SecurityManager.current = new SecurityManager(); - } - else - { - try - { - Class cl = Class.forName(secman, false, StaticData.systemClassLoader); - SecurityManager.current = (SecurityManager)cl.newInstance(); - } - catch (Exception x) - { - throw (InternalError) - new InternalError("Unable to create SecurityManager") - .initCause(x); - } - } + { + SecurityManager.current = new SecurityManager(); + } + else + { + try + { + Class cl = Class.forName(secman, false, StaticData.systemClassLoader); + SecurityManager.current = (SecurityManager)cl.newInstance(); + } + catch (Exception x) + { + throw (InternalError) + new InternalError("Unable to create SecurityManager") + .initCause(x); + } + } } } @@ -320,23 +320,23 @@ public abstract class ClassLoader Class c = findLoadedClass(name); if (c == null) { - // Can the class be loaded by a parent? - try - { - if (parent == null) - { - c = VMClassLoader.loadClass(name, resolve); - if (c != null) - return c; - } - else - { - return parent.loadClass(name, resolve); - } - } + // Can the class be loaded by a parent? + try + { + if (parent == null) + { + c = VMClassLoader.loadClass(name, resolve); + if (c != null) + return c; + } + else + { + return parent.loadClass(name, resolve); + } + } catch (ClassNotFoundException e) - { - } + { + } // Still not found, we have to do it ourself. c = findClass(name); } @@ -431,7 +431,7 @@ public abstract class ClassLoader * @since 1.1 */ protected final Class defineClass(String name, byte[] data, int offset, - int len) throws ClassFormatError + int len) throws ClassFormatError { return defineClass(name, data, offset, len, null); } @@ -460,16 +460,16 @@ public abstract class ClassLoader * @since 1.2 */ protected final synchronized Class defineClass(String name, byte[] data, - int offset, int len, - ProtectionDomain domain) + int offset, int len, + ProtectionDomain domain) throws ClassFormatError { checkInitialized(); if (domain == null) domain = StaticData.defaultProtectionDomain; - + return VMClassLoader.defineClassWithTransformers(this, name, data, offset, - len, domain); + len, domain); } /** @@ -493,7 +493,7 @@ public abstract class ClassLoader * @since 1.5 */ protected final Class defineClass(String name, ByteBuffer buf, - ProtectionDomain domain) + ProtectionDomain domain) throws ClassFormatError { byte[] data = new byte[buf.remaining()]; @@ -547,8 +547,8 @@ public abstract class ClassLoader SecurityManager sm = SecurityManager.current; if (sm != null) { - ClassLoader cl = VMStackWalker.getCallingClassLoader(); - if (cl != null && ! cl.isAncestorOf(this)) + ClassLoader cl = VMStackWalker.getCallingClassLoader(); + if (cl != null && ! cl.isAncestorOf(this)) sm.checkPermission(new RuntimePermission("getClassLoader")); } return parent; @@ -791,9 +791,9 @@ public abstract class ClassLoader SecurityManager sm = SecurityManager.current; if (sm != null) { - ClassLoader cl = VMStackWalker.getCallingClassLoader(); - if (cl != null && cl != StaticData.systemClassLoader) - sm.checkPermission(new RuntimePermission("getClassLoader")); + ClassLoader cl = VMStackWalker.getCallingClassLoader(); + if (cl != null && cl != StaticData.systemClassLoader) + sm.checkPermission(new RuntimePermission("getClassLoader")); } return StaticData.systemClassLoader; @@ -863,10 +863,10 @@ public abstract class ClassLoader if (p == null) { - synchronized (definedPackages) - { - p = definedPackages.get(name); - } + synchronized (definedPackages) + { + p = definedPackages.get(name); + } } return p; } @@ -895,7 +895,7 @@ public abstract class ClassLoader parentPackages = parent.getPackages(); Package[] allPackages = new Package[parentPackages.length - + packages.length]; + + packages.length]; System.arraycopy(parentPackages, 0, allPackages, 0, parentPackages.length); System.arraycopy(packages, 0, allPackages, parentPackages.length, @@ -937,7 +937,7 @@ public abstract class ClassLoader { defaultAssertionStatus = enabled; } - + /** * Set the default assertion status for packages, used unless overridden * by a class request. This default also covers subpackages, unless they @@ -958,7 +958,7 @@ public abstract class ClassLoader = new HashMap(StaticData.systemPackageAssertionStatus); packageAssertionStatus.put(name, Boolean.valueOf(enabled)); } - + /** * Set the default assertion status for a class. This only affects the * status of top-level classes, any other string is harmless. @@ -976,11 +976,11 @@ public abstract class ClassLoader { if (classAssertionStatus == null) classAssertionStatus - = new HashMap(StaticData.systemClassAssertionStatus); + = new HashMap(StaticData.systemClassAssertionStatus); // The toString() hack catches null, as required. classAssertionStatus.put(name.toString(), Boolean.valueOf(enabled)); } - + /** * Resets the default assertion status of this classloader, its packages * and classes, all to false. This allows overriding defaults inherited @@ -1007,9 +1007,9 @@ public abstract class ClassLoader { while (loader != null) { - if (this == loader) - return true; - loader = loader.parent; + if (this == loader) + return true; + loader = loader.parent; } return false; } @@ -1021,17 +1021,17 @@ public abstract class ClassLoader ArrayList list = new ArrayList(); while (tok.hasMoreTokens()) { - try - { - File f = new File(tok.nextToken()); - File[] files = f.listFiles(); - if (files != null) - for (int i = 0; i < files.length; i++) - list.add(files[i].toURL()); - } - catch(Exception x) - { - } + try + { + File f = new File(tok.nextToken()); + File[] files = f.listFiles(); + if (files != null) + for (int i = 0; i < files.length; i++) + list.add(files[i].toURL()); + } + catch(Exception x) + { + } } URL[] urls = new URL[list.size()]; list.toArray(urls); @@ -1042,7 +1042,7 @@ public abstract class ClassLoader { try { - list.add(new File(file).toURL()); + list.add(new File(file).toURL()); } catch(java.net.MalformedURLException x) { @@ -1056,22 +1056,22 @@ public abstract class ClassLoader ArrayList list = new ArrayList(); while (tok.hasMoreTokens()) { - String s = tok.nextToken(); - if (s.equals(File.pathSeparator)) - addFileURL(list, "."); - else - { - addFileURL(list, s); - if (tok.hasMoreTokens()) - { - // Skip the separator. - tok.nextToken(); - // If the classpath ended with a separator, - // append the current directory. - if (!tok.hasMoreTokens()) - addFileURL(list, "."); - } - } + String s = tok.nextToken(); + if (s.equals(File.pathSeparator)) + addFileURL(list, "."); + else + { + addFileURL(list, s); + if (tok.hasMoreTokens()) + { + // Skip the separator. + tok.nextToken(); + // If the classpath ended with a separator, + // append the current directory. + if (!tok.hasMoreTokens()) + addFileURL(list, "."); + } + } } URL[] urls = new URL[list.size()]; list.toArray(urls); @@ -1096,22 +1096,22 @@ public abstract class ClassLoader static ClassLoader createSystemClassLoader(URL[] urls, ClassLoader parent) { return - new URLClassLoader(urls, parent) - { - protected synchronized Class loadClass(String name, - boolean resolve) - throws ClassNotFoundException - { - SecurityManager sm = SecurityManager.current; - if (sm != null) - { - int lastDot = name.lastIndexOf('.'); - if (lastDot != -1) - sm.checkPackageAccess(name.substring(0, lastDot)); - } - return super.loadClass(name, resolve); - } - }; + new URLClassLoader(urls, parent) + { + protected synchronized Class loadClass(String name, + boolean resolve) + throws ClassNotFoundException + { + SecurityManager sm = SecurityManager.current; + if (sm != null) + { + int lastDot = name.lastIndexOf('.'); + if (lastDot != -1) + sm.checkPackageAccess(name.substring(0, lastDot)); + } + return super.loadClass(name, resolve); + } + }; } static ClassLoader createAuxiliarySystemClassLoader(ClassLoader parent) @@ -1119,20 +1119,20 @@ public abstract class ClassLoader String loader = SystemProperties.getProperty("java.system.class.loader", null); if (loader == null) { - return parent; + return parent; } try { - Constructor c = Class.forName(loader, false, parent) - .getConstructor(new Class[] { ClassLoader.class }); - return (ClassLoader)c.newInstance(new Object[] { parent }); + Constructor c = Class.forName(loader, false, parent) + .getConstructor(new Class[] { ClassLoader.class }); + return (ClassLoader)c.newInstance(new Object[] { parent }); } catch (Exception e) { - System.err.println("Requested system classloader " + loader + " failed."); - throw (Error) - new Error("Requested system classloader " + loader + " failed.") - .initCause(e); + System.err.println("Requested system classloader " + loader + " failed."); + throw (Error) + new Error("Requested system classloader " + loader + " failed.") + .initCause(e); } } diff --git a/libjava/classpath/java/lang/Comparable.java b/libjava/classpath/java/lang/Comparable.java index 4ad39af833a..d4ca63ad82e 100644 --- a/libjava/classpath/java/lang/Comparable.java +++ b/libjava/classpath/java/lang/Comparable.java @@ -52,8 +52,8 @@ package java.lang; * *

            Lists, arrays, and sets of objects that implement this interface can * be sorted automatically, without the need for an explicit - * {@link java.util.Comparator}. Note that e1.compareTo(null) - * should throw an Exception; as should comparison between incompatible + * {@link java.util.Comparator}. Note that e1.compareTo(null) + * should throw an Exception; as should comparison between incompatible * classes. * * @author Geoff Berry diff --git a/libjava/classpath/java/lang/Double.java b/libjava/classpath/java/lang/Double.java index f3f7cb1e0ec..3ae1b0111af 100644 --- a/libjava/classpath/java/lang/Double.java +++ b/libjava/classpath/java/lang/Double.java @@ -213,7 +213,7 @@ public final class Double extends Number implements Comparable long bits = doubleToLongBits(d); CPStringBuilder result = new CPStringBuilder(); - + if (bits < 0) result.append('-'); result.append("0x"); @@ -603,21 +603,21 @@ public final class Double extends Number implements Comparable { // handle the easy cases: if (x < y) - return -1; + return -1; if (x > y) - return 1; + return 1; // handle equality respecting that 0.0 != -0.0 (hence not using x == y): long lx = doubleToRawLongBits(x); long ly = doubleToRawLongBits(y); if (lx == ly) - return 0; + return 0; // handle NaNs: if (x != x) - return (y != y) ? 0 : 1; + return (y != y) ? 0 : 1; else if (y != y) - return -1; + return -1; // handle +/- 0.0 return (lx < ly) ? -1 : 1; diff --git a/libjava/classpath/java/lang/Enum.java b/libjava/classpath/java/lang/Enum.java index da2e40b8e05..46d28243f98 100644 --- a/libjava/classpath/java/lang/Enum.java +++ b/libjava/classpath/java/lang/Enum.java @@ -102,17 +102,17 @@ public abstract class Enum> if (! f.isEnumConstant()) throw new IllegalArgumentException(s); Class.setAccessible(f); - @SuppressWarnings("unchecked") - S val = (S) f.get(null); + @SuppressWarnings("unchecked") + S val = (S) f.get(null); return val; } catch (NoSuchFieldException exception) { - throw new IllegalArgumentException(s); + throw new IllegalArgumentException(s); } catch (IllegalAccessException exception) { - throw new Error("Unable to access Enum class"); + throw new Error("Unable to access Enum class"); } } @@ -167,7 +167,7 @@ public abstract class Enum> * integer if e.ordinal > this.ordinal. * @throws ClassCastException if e is not an enumeration * constant of the same class. - */ + */ public final int compareTo(T e) { if (getDeclaringClass() != e.getDeclaringClass()) @@ -201,7 +201,7 @@ public abstract class Enum> /** * Returns the number of this enumeration constant, which represents * the order in which it was originally declared, starting from zero. - * + * * @return the number of this constant. */ public final int ordinal() diff --git a/libjava/classpath/java/lang/EnumConstantNotPresentException.java b/libjava/classpath/java/lang/EnumConstantNotPresentException.java index 4586c372cca..f597318db53 100644 --- a/libjava/classpath/java/lang/EnumConstantNotPresentException.java +++ b/libjava/classpath/java/lang/EnumConstantNotPresentException.java @@ -69,7 +69,7 @@ public class EnumConstantNotPresentException extends RuntimeException * @param name the name of the missing enum constant */ public EnumConstantNotPresentException(Class theEnum, - String name) + String name) { super("enum " + theEnum + " is missing the constant " + name); enumType = theEnum; diff --git a/libjava/classpath/java/lang/Float.java b/libjava/classpath/java/lang/Float.java index 63e43c257ea..a4a766ec4df 100644 --- a/libjava/classpath/java/lang/Float.java +++ b/libjava/classpath/java/lang/Float.java @@ -224,7 +224,7 @@ public final class Float extends Number implements Comparable int bits = floatToIntBits(f); CPStringBuilder result = new CPStringBuilder(); - + if (bits < 0) result.append('-'); result.append("0x"); @@ -611,21 +611,21 @@ public final class Float extends Number implements Comparable { // handle the easy cases: if (x < y) - return -1; + return -1; if (x > y) - return 1; + return 1; // handle equality respecting that 0.0 != -0.0 (hence not using x == y): int ix = floatToRawIntBits(x); int iy = floatToRawIntBits(y); if (ix == iy) - return 0; + return 0; // handle NaNs: if (x != x) - return (y != y) ? 0 : 1; + return (y != y) ? 0 : 1; else if (y != y) - return -1; + return -1; // handle +/- 0.0 return (ix < iy) ? -1 : 1; diff --git a/libjava/classpath/java/lang/IllegalArgumentException.java b/libjava/classpath/java/lang/IllegalArgumentException.java index 75a0b8bfe38..26354a58eac 100644 --- a/libjava/classpath/java/lang/IllegalArgumentException.java +++ b/libjava/classpath/java/lang/IllegalArgumentException.java @@ -88,7 +88,7 @@ public class IllegalArgumentException extends RuntimeException * automatically incorporated into the resulting detail message of * this exception. *

            - * + * * @param message the detail message, which should give the reason for * this exception being thrown. * @param cause the cause of this exception, or null if the cause @@ -116,7 +116,7 @@ public class IllegalArgumentException extends RuntimeException * This makes this constructor very useful for simply wrapping another * exception. *

            - * + * * @param cause the cause of this exception, or null if the cause * is unknown. * @since 1.5 diff --git a/libjava/classpath/java/lang/IllegalStateException.java b/libjava/classpath/java/lang/IllegalStateException.java index 6b4e5f8428a..b182f092e43 100644 --- a/libjava/classpath/java/lang/IllegalStateException.java +++ b/libjava/classpath/java/lang/IllegalStateException.java @@ -93,7 +93,7 @@ public class IllegalStateException extends RuntimeException * automatically incorporated into the resulting detail message of * this exception. *

            - * + * * @param message the detail message, which should give the reason for * this exception being thrown. * @param cause the cause of this exception, or null if the cause @@ -121,7 +121,7 @@ public class IllegalStateException extends RuntimeException * This makes this constructor very useful for simply wrapping another * exception. *

            - * + * * @param cause the cause of this exception, or null if the cause * is unknown. * @since 1.5 @@ -132,4 +132,3 @@ public class IllegalStateException extends RuntimeException } } - diff --git a/libjava/classpath/java/lang/IndexOutOfBoundsException.java b/libjava/classpath/java/lang/IndexOutOfBoundsException.java index c53c67e5574..0a00253aef8 100644 --- a/libjava/classpath/java/lang/IndexOutOfBoundsException.java +++ b/libjava/classpath/java/lang/IndexOutOfBoundsException.java @@ -41,7 +41,7 @@ package java.lang; /** * This exception can be thrown to indicate an attempt to access an * index which is out of bounds on objects like String, Array, or Vector. - * Usually any negative integer less than or equal to -1 and positive + * Usually any negative integer less than or equal to -1 and positive * integer greater than or equal to the size of the object is an index * which would be out of bounds. * diff --git a/libjava/classpath/java/lang/Integer.java b/libjava/classpath/java/lang/Integer.java index e5ca4b3428e..f379795ea3d 100644 --- a/libjava/classpath/java/lang/Integer.java +++ b/libjava/classpath/java/lang/Integer.java @@ -205,12 +205,12 @@ public final class Integer extends Number implements Comparable // When the value is MIN_VALUE, it overflows when made positive if (num < 0) - { + { i = size = stringSize(MAX_VALUE, radix) + 2; buffer = new char[size]; - buffer[--i] = digits[(int) (-(num + radix) % radix)]; - num = -(num / radix); - } + buffer[--i] = digits[(int) (-(num + radix) % radix)]; + num = -(num / radix); + } else { i = size = stringSize(num, radix) + 1; @@ -704,9 +704,9 @@ public final class Integer extends Number implements Comparable public static int reverseBytes(int val) { return ( ((val >> 24) & 0xff) - | ((val >> 8) & 0xff00) - | ((val << 8) & 0xff0000) - | ((val << 24) & 0xff000000)); + | ((val >> 8) & 0xff00) + | ((val << 8) & 0xff0000) + | ((val << 24) & 0xff000000)); } /** @@ -786,15 +786,15 @@ public final class Integer extends Number implements Comparable if (ch == '-') { if (len == 1) - throw new NumberFormatException("pure '-'"); + throw new NumberFormatException("pure '-'"); isNeg = true; ch = str.charAt(++index); } else if (ch == '+') { - if (len == 1) - throw new NumberFormatException("pure '+'"); - ch = str.charAt(++index); + if (len == 1) + throw new NumberFormatException("pure '+'"); + ch = str.charAt(++index); } if (decode) { @@ -828,8 +828,8 @@ public final class Integer extends Number implements Comparable int val = 0; while (index < len) { - if (val < 0 || val > max) - throw new NumberFormatException("number overflow (pos=" + index + ") : " + str); + if (val < 0 || val > max) + throw new NumberFormatException("number overflow (pos=" + index + ") : " + str); ch = Character.digit(str.charAt(index++), radix); val = val * radix + ch; diff --git a/libjava/classpath/java/lang/Long.java b/libjava/classpath/java/lang/Long.java index a5ee6c707ad..e7579d86556 100644 --- a/libjava/classpath/java/lang/Long.java +++ b/libjava/classpath/java/lang/Long.java @@ -817,8 +817,8 @@ public final class Long extends Number implements Comparable long val = 0; while (index < len) { - if (val < 0 || val > max) - throw new NumberFormatException(); + if (val < 0 || val > max) + throw new NumberFormatException(); ch = Character.digit(str.charAt(index++), radix); val = val * radix + ch; diff --git a/libjava/classpath/java/lang/Math.java b/libjava/classpath/java/lang/Math.java index 90574d52fc8..6cf29b4a04f 100644 --- a/libjava/classpath/java/lang/Math.java +++ b/libjava/classpath/java/lang/Math.java @@ -709,7 +709,7 @@ public final class Math * zero, then the original value is returned. The returned result is * within 1 ulp of the exact result. For a finite value, x, * the cube root of -x is equal to the negation of the cube root - * of x. + * of x. *

            *

            * For a square root, use sqrt. For other roots, use @@ -730,7 +730,7 @@ public final class Math /** *

            * Returns the hyperbolic cosine of the given value. For a value, - * x, the hyperbolic cosine is (ex + + * x, the hyperbolic cosine is (ex + * e-x)/2 * with e being Euler's number. The returned * result is within 2.5 ulps of the exact result. @@ -740,7 +740,7 @@ public final class Math * returned. For either infinity, positive infinity is returned. * The hyperbolic cosine of zero is 1.0. *

            - * + * * @param a the numeric argument * @return the hyperbolic cosine of a. * @since 1.5 @@ -758,12 +758,12 @@ public final class Math * 1 ulp of the exact result, and results are semi-monotonic. For finite * inputs, the returned value is greater than or equal to -1.0. Once * a result enters within half a ulp of this limit, the limit is returned. - *

            + *

            *

            * For NaN, positive infinity and zero, the original value * is returned. Negative infinity returns a result of -1.0 (the limit). *

            - * + * * @param a the numeric argument * @return ea - 1 * @since 1.5 @@ -785,7 +785,7 @@ public final class Math * is positive infinity. Otherwise, if either argument is NaN, * then NaN is returned. *

            - * + * * @param a the first parameter. * @param b the second parameter. * @return the hypotenuse matching the supplied parameters. @@ -855,7 +855,7 @@ public final class Math *
          • If a is positive or negative zero, the result is the * same.
            • *
          - * + * * @param a the numeric argument. * @return the sign of the argument. * @since 1.5. @@ -882,7 +882,7 @@ public final class Math *
        • If a is positive or negative zero, the result is the * same.
          • *
        - * + * * @param a the numeric argument. * @return the sign of the argument. * @since 1.5. @@ -901,7 +901,7 @@ public final class Math /** *

        * Returns the hyperbolic sine of the given value. For a value, - * x, the hyperbolic sine is (ex - + * x, the hyperbolic sine is (ex - * e-x)/2 * with e being Euler's number. The returned * result is within 2.5 ulps of the exact result. @@ -910,7 +910,7 @@ public final class Math * If the supplied value is NaN, an infinity or a zero, then the * original value is returned. *

        - * + * * @param a the numeric argument * @return the hyperbolic sine of a. * @since 1.5 @@ -923,7 +923,7 @@ public final class Math /** *

        * Returns the hyperbolic tangent of the given value. For a value, - * x, the hyperbolic tangent is (ex - + * x, the hyperbolic tangent is (ex - * e-x)/(ex + e-x) * (i.e. sinh(a)/cosh(a)) * with e being Euler's number. The returned @@ -938,7 +938,7 @@ public final class Math * value is returned. Positive infinity returns +1.0 and negative infinity * returns -1.0. *

        - * + * * @param a the numeric argument * @return the hyperbolic tangent of a. * @since 1.5 diff --git a/libjava/classpath/java/lang/NoClassDefFoundError.java b/libjava/classpath/java/lang/NoClassDefFoundError.java index 7e8e6caff80..55d5f26059f 100644 --- a/libjava/classpath/java/lang/NoClassDefFoundError.java +++ b/libjava/classpath/java/lang/NoClassDefFoundError.java @@ -43,7 +43,7 @@ package java.lang; * Java Virtual Machine tries to load a class and no definition of the class * can be found. This could happen when using the new expression * or during a normal method call. The reason this would occur at runtime is - * because the missing class definition existed when the currently executing + * because the missing class definition existed when the currently executing * class was compiled, but now that definition cannot be found. * * @author Brian Jones diff --git a/libjava/classpath/java/lang/Object.java b/libjava/classpath/java/lang/Object.java index fbd1dc77d9f..a6e70043438 100644 --- a/libjava/classpath/java/lang/Object.java +++ b/libjava/classpath/java/lang/Object.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/lang/Package.java b/libjava/classpath/java/lang/Package.java index 1141a0722ee..9220dfd21cb 100644 --- a/libjava/classpath/java/lang/Package.java +++ b/libjava/classpath/java/lang/Package.java @@ -109,8 +109,8 @@ public class Package * that defines the Package. */ Package(String name, - String specTitle, String specVendor, String specVersion, - String implTitle, String implVendor, String implVersion, URL sealed) + String specTitle, String specVendor, String specVersion, + String implTitle, String implVendor, String implVersion, URL sealed) { this(name, specTitle, specVendor, specVersion, implTitle, implVendor, implVersion, sealed, null); @@ -121,7 +121,7 @@ public class Package * the name of the package may be null. * There are no public constructors defined for Package; this is a package * local constructor that is used by java.lang.Classloader.definePackage(). - * + * * @param name The name of the Package * @param specTitle The name of the specification * @param specVendor The name of the specification designer @@ -132,8 +132,8 @@ public class Package * @param sealed If sealed the origin of the package classes */ Package(String name, - String specTitle, String specVendor, String specVersion, - String implTitle, String implVendor, String implVersion, URL sealed, + String specTitle, String specVendor, String specVersion, + String implTitle, String implVendor, String implVersion, URL sealed, ClassLoader loader) { if (name == null) @@ -333,7 +333,7 @@ public class Package public String toString() { return ("package " + name + (specTitle == null ? "" : ", " + specTitle) - + (specVersion == null ? "" : ", version " + specVersion)); + + (specVersion == null ? "" : ", version " + specVersion)); } /** @@ -351,7 +351,7 @@ public class Package Annotation[] annotations = getAnnotations(); for (Annotation annotation : annotations) if (annotation.annotationType() == annotationClass) - foundAnnotation = (A) annotation; + foundAnnotation = (A) annotation; return foundAnnotation; } @@ -405,8 +405,8 @@ public class Package * @return true if an annotation exists for the specified type. * @since 1.5 */ - public boolean isAnnotationPresent(Class - annotationClass) + public boolean isAnnotationPresent(Class + annotationClass) { return getAnnotation(annotationClass) != null; } diff --git a/libjava/classpath/java/lang/ProcessBuilder.java b/libjava/classpath/java/lang/ProcessBuilder.java index 9ffe24cde16..0b32edec2a5 100644 --- a/libjava/classpath/java/lang/ProcessBuilder.java +++ b/libjava/classpath/java/lang/ProcessBuilder.java @@ -204,7 +204,7 @@ public final class ProcessBuilder * indicates that the default behaviour of using the * working directory of the current process should * be adopted. - * + * * @return the working directory. */ public File directory() @@ -218,7 +218,7 @@ public final class ProcessBuilder * which indicates the default value should be used. * The default is the working directory of the current * process. - * + * * @param directory the new working directory. * @return a reference to this process builder. */ @@ -252,7 +252,7 @@ public final class ProcessBuilder * some may not allow any changes to the environment variables or * may prevent certain values being used. Attempts to do so will * throw an UnsupportedOperationException or - * IllegalArgumentException, respectively. + * IllegalArgumentException, respectively. *

        *

        * Use of this method may require a security check for the diff --git a/libjava/classpath/java/lang/Runtime.java b/libjava/classpath/java/lang/Runtime.java index 64ca5d912d9..3134c2a4790 100644 --- a/libjava/classpath/java/lang/Runtime.java +++ b/libjava/classpath/java/lang/Runtime.java @@ -93,11 +93,11 @@ public class Runtime { if (current != null) throw new InternalError("Attempt to recreate Runtime"); - + // If used by underlying VM this contains the directories where Classpath's own // native libraries are located. String bootPath = SystemProperties.getProperty("gnu.classpath.boot.library.path", ""); - + // If properly set by the user this contains the directories where the application's // native libraries are located. On operating systems where a LD_LIBRARY_PATH environment // variable is available a VM should preset java.library.path with value of this @@ -109,22 +109,22 @@ public class Runtime StringTokenizer t1 = new StringTokenizer(bootPath, pathSep); StringTokenizer t2 = new StringTokenizer(path, pathSep); libpath = new String[t1.countTokens() + t2.countTokens()]; - + int i = 0; while(t1.hasMoreTokens()) { String prefix = t1.nextToken(); if (! prefix.endsWith(fileSep)) prefix += fileSep; - + libpath[i] = prefix; i++; } - + while(t2.hasMoreTokens()) { String prefix = t2.nextToken(); if (! prefix.endsWith(fileSep)) prefix += fileSep; - + libpath[i] = prefix; i++; } @@ -185,8 +185,8 @@ public class Runtime // inside a join on our thread. exitSequence.interrupt(); // Shutdown hooks are still running, so we clear status to - // make sure we don't halt. - status = 0; + // make sure we don't halt. + status = 0; } } @@ -214,7 +214,7 @@ public class Runtime * Any subsequent invocations will simply return false. * Note that it is package accessible so that VMRuntime can call it * when VM exit is not triggered by a call to Runtime.exit(). - * + * * @return was the current thread the first one to call this method? */ boolean runShutdownHooks() @@ -286,8 +286,8 @@ public class Runtime shutdownHooks = null; } } - // Run finalization on all finalizable objects (even if they are - // still reachable). + // Run finalization on all finalizable objects (even if they are + // still reachable). VMRuntime.runFinalizationForExit(); } return first; @@ -750,15 +750,15 @@ public class Runtime String filename; if (loader != null && (filename = loader.findLibrary(libname)) != null) { - if (loadLib(filename, loader) != 0) - return; + if (loadLib(filename, loader) != 0) + return; } else { - filename = VMRuntime.mapLibraryName(libname); - for (int i = 0; i < libpath.length; i++) - if (loadLib(libpath[i] + filename, loader) != 0) - return; + filename = VMRuntime.mapLibraryName(libname); + for (int i = 0; i < libpath.length; i++) + if (loadLib(libpath[i] + filename, loader) != 0) + return; } throw new UnsatisfiedLinkError("Native library `" + libname + "' not found (as file `" + filename + "') in gnu.classpath.boot.library.path and java.library.path"); diff --git a/libjava/classpath/java/lang/SecurityException.java b/libjava/classpath/java/lang/SecurityException.java index 84be33ce026..f20fbe04fe4 100644 --- a/libjava/classpath/java/lang/SecurityException.java +++ b/libjava/classpath/java/lang/SecurityException.java @@ -87,7 +87,7 @@ public class SecurityException extends RuntimeException * automatically incorporated into the resulting detail message of * this exception. *

        - * + * * @param message the detail message, which should give the reason for * this exception being thrown. * @param cause the cause of this exception, or null if the cause @@ -115,7 +115,7 @@ public class SecurityException extends RuntimeException * This makes this constructor very useful for simply wrapping another * exception. *

        - * + * * @param cause the cause of this exception, or null if the cause * is unknown. * @since 1.5 diff --git a/libjava/classpath/java/lang/SecurityManager.java b/libjava/classpath/java/lang/SecurityManager.java index ff84d950608..d7adc112fb7 100644 --- a/libjava/classpath/java/lang/SecurityManager.java +++ b/libjava/classpath/java/lang/SecurityManager.java @@ -225,7 +225,7 @@ public class SecurityManager * are from system classes *
      7. A check of java.security.AllPermission succeeds.
        8. * - * + * * @return the most recent non-system ClassLoader on the execution stack * @deprecated use {@link #checkPermission(Permission)} instead */ @@ -248,7 +248,7 @@ public class SecurityManager * are from system classes *
      8. A check of java.security.AllPermission succeeds.
        9. * - * + * * @return the most recent non-system Class on the execution stack * @deprecated use {@link #checkPermission(Permission)} instead */ @@ -287,7 +287,7 @@ public class SecurityManager * are from system classes *
      9. A check of java.security.AllPermission succeeds.
        10. * - * + * * @return the index of the most recent non-system Class on the stack * @deprecated use {@link #checkPermission(Permission)} instead */ @@ -432,8 +432,8 @@ public class SecurityManager */ public void checkAccess(Thread thread) { - if (thread.getThreadGroup() != null - && thread.getThreadGroup().parent == null) + if (thread.getThreadGroup() != null + && thread.getThreadGroup().parent == null) checkPermission(new RuntimePermission("modifyThread")); } @@ -1062,10 +1062,10 @@ public class SecurityManager String list = (String)AccessController.doPrivileged(new PrivilegedAction() { - public Object run() + public Object run() { - return Security.getProperty(restriction); - } + return Security.getProperty(restriction); + } }); if (list == null || list.equals("")) @@ -1076,12 +1076,12 @@ public class SecurityManager StringTokenizer st = new StringTokenizer(list, ","); while (st.hasMoreTokens()) { - if (packageNamePlusDot.startsWith(st.nextToken())) - { - Permission p = new RuntimePermission(permission + packageName); - checkPermission(p); - return; - } + if (packageNamePlusDot.startsWith(st.nextToken())) + { + Permission p = new RuntimePermission(permission + packageName); + checkPermission(p); + return; + } } } } diff --git a/libjava/classpath/java/lang/StackTraceElement.java b/libjava/classpath/java/lang/StackTraceElement.java index 73e1a463dd7..167272dab85 100644 --- a/libjava/classpath/java/lang/StackTraceElement.java +++ b/libjava/classpath/java/lang/StackTraceElement.java @@ -119,7 +119,7 @@ public final class StackTraceElement implements Serializable * @param fileName the name of the file, null if unknown * @param lineNumber the line in the file, negative if unknown, or -2 * if this method is native - * + * * @since 1.5 */ public StackTraceElement(String className, String methodName, String fileName, diff --git a/libjava/classpath/java/lang/StrictMath.java b/libjava/classpath/java/lang/StrictMath.java index 6eb1cb20859..88f5e5750bb 100644 --- a/libjava/classpath/java/lang/StrictMath.java +++ b/libjava/classpath/java/lang/StrictMath.java @@ -658,12 +658,12 @@ public final strictfp class StrictMath // 1. Replace x by |x| (sinh(-x) = -sinh(x)). // 2. // E + E/(E+1) - // 0 <= x <= 22 : sinh(x) := --------------, E=expm1(x) - // 2 + // 0 <= x <= 22 : sinh(x) := --------------, E=expm1(x) + // 2 // // 22 <= x <= lnovft : sinh(x) := exp(x)/2 // lnovft <= x <= ln2ovft: sinh(x) := exp(x/2)/2 * exp(x/2) - // ln2ovft < x : sinh(x) := +inf (overflow) + // ln2ovft < x : sinh(x) := +inf (overflow) double t, w, h; @@ -691,15 +691,15 @@ public final strictfp class StrictMath // |x| in [0, 22], return sign(x) * 0.5 * (E+E/(E+1)) if (h_bits < 0x40360000L) // |x| < 22 { - if (h_bits < 0x3e300000L) // |x| < 2^-28 - return x; // for tiny arguments return x + if (h_bits < 0x3e300000L) // |x| < 2^-28 + return x; // for tiny arguments return x - t = expm1(abs(x)); + t = expm1(abs(x)); - if (h_bits < 0x3ff00000L) - return h * (2.0 * t - t * t / (t + 1.0)); + if (h_bits < 0x3ff00000L) + return h * (2.0 * t - t * t / (t + 1.0)); - return h * (t + t / (t + 1.0)); + return h * (t + t / (t + 1.0)); } // |x| in [22, log(Double.MAX_VALUE)], return 0.5 * exp(|x|) @@ -708,12 +708,12 @@ public final strictfp class StrictMath // |x| in [log(Double.MAX_VALUE), overflowthreshold] if ((h_bits < 0x408633ceL) - || ((h_bits == 0x408633ceL) && (l_bits <= 0x8fb9f87dL))) + || ((h_bits == 0x408633ceL) && (l_bits <= 0x8fb9f87dL))) { - w = exp(0.5 * abs(x)); - t = h * w; + w = exp(0.5 * abs(x)); + t = h * w; - return t * w; + return t * w; } // |x| > overflowthershold @@ -749,12 +749,12 @@ public final strictfp class StrictMath // 0 <= x <= ln2/2 : cosh(x) := 1 + ------------------- // 2*exp(x) // - // exp(x) + 1/exp(x) + // exp(x) + 1/exp(x) // ln2/2 <= x <= 22 : cosh(x) := ------------------ - // 2 + // 2 // 22 <= x <= lnovft : cosh(x) := exp(x)/2 // lnovft <= x <= ln2ovft: cosh(x) := exp(x/2)/2 * exp(x/2) - // ln2ovft < x : cosh(x) := +inf (overflow) + // ln2ovft < x : cosh(x) := +inf (overflow) double t, w; long bits; @@ -776,22 +776,22 @@ public final strictfp class StrictMath // |x| in [0, 0.5 * ln(2)], return 1 + expm1(|x|)^2 / (2 * exp(|x|)) if (hx < 0x3fd62e43L) { - t = expm1(abs(x)); - w = 1.0 + t; + t = expm1(abs(x)); + w = 1.0 + t; - // for tiny arguments return 1. - if (hx < 0x3c800000L) - return w; + // for tiny arguments return 1. + if (hx < 0x3c800000L) + return w; - return 1.0 + (t * t) / (w + w); + return 1.0 + (t * t) / (w + w); } // |x| in [0.5 * ln(2), 22], return exp(|x|)/2 + 1 / (2 * exp(|x|)) if (hx < 0x40360000L) { - t = exp(abs(x)); + t = exp(abs(x)); - return 0.5 * t + 0.5 / t; + return 0.5 * t + 0.5 / t; } // |x| in [22, log(Double.MAX_VALUE)], return 0.5 * exp(|x|) @@ -801,12 +801,12 @@ public final strictfp class StrictMath // |x| in [log(Double.MAX_VALUE), overflowthreshold], // return exp(x/2)/2 * exp(x/2) if ((hx < 0x408633ceL) - || ((hx == 0x408633ceL) && (lx <= 0x8fb9f87dL))) + || ((hx == 0x408633ceL) && (lx <= 0x8fb9f87dL))) { - w = exp(0.5 * abs(x)); - t = 0.5 * w; + w = exp(0.5 * abs(x)); + t = 0.5 * w; - return t * w; + return t * w; } // |x| > overflowthreshold @@ -862,22 +862,22 @@ public final strictfp class StrictMath if (h_bits < 0x40360000L) // |x| < 22 { - if (h_bits < 0x3c800000L) // |x| < 2^-55 - return x * (1.0 + x); + if (h_bits < 0x3c800000L) // |x| < 2^-55 + return x * (1.0 + x); - if (h_bits >= 0x3ff00000L) // |x| >= 1 - { - t = expm1(2.0 * abs(x)); - z = 1.0 - 2.0 / (t + 2.0); - } - else // |x| < 1 - { - t = expm1(-2.0 * abs(x)); - z = -t / (t + 2.0); - } + if (h_bits >= 0x3ff00000L) // |x| >= 1 + { + t = expm1(2.0 * abs(x)); + z = 1.0 - 2.0 / (t + 2.0); + } + else // |x| < 1 + { + t = expm1(-2.0 * abs(x)); + z = -t / (t + 2.0); + } } else // |x| >= 22 - z = 1.0; + z = 1.0; return (x >= 0) ? z : -z; } @@ -909,7 +909,7 @@ public final strictfp class StrictMath private static double buildDouble(long lowDWord, long highDWord) { return Double.longBitsToDouble(((highDWord & 0xffffffffL) << 32) - | (lowDWord & 0xffffffffL)); + | (lowDWord & 0xffffffffL)); } /** @@ -960,26 +960,26 @@ public final strictfp class StrictMath if (bits < 0x0010000000000000L) // subnormal number { - t = TWO_54; - t *= x; + t = TWO_54; + t *= x; - // __HI(t)=__HI(t)/3+B2; - bits = Double.doubleToLongBits(t); - h = getHighDWord(bits); - l = getLowDWord(bits); + // __HI(t)=__HI(t)/3+B2; + bits = Double.doubleToLongBits(t); + h = getHighDWord(bits); + l = getLowDWord(bits); - h = h / 3 + CBRT_B2; + h = h / 3 + CBRT_B2; - t = buildDouble(l, h); + t = buildDouble(l, h); } else { - // __HI(t)=__HI(x)/3+B1; - h = getHighDWord(bits); - l = 0; + // __HI(t)=__HI(x)/3+B1; + h = getHighDWord(bits); + l = 0; - h = h / 3 + CBRT_B1; - t = buildDouble(l, h); + h = h / 3 + CBRT_B1; + t = buildDouble(l, h); } // new cbrt to 23 bits @@ -998,7 +998,7 @@ public final strictfp class StrictMath t = buildDouble(l, h); // one step newton iteration to 53 bits with error less than 0.667 ulps - s = t * t; // t * t is exact + s = t * t; // t * t is exact r = x / s; w = t + t; r = (r - t) / (w + r); // r - t is exact @@ -1087,75 +1087,75 @@ public final strictfp class StrictMath { // Method // 1. Argument reduction: - // Given x, find r and integer k such that + // Given x, find r and integer k such that // // x = k * ln(2) + r, |r| <= 0.5 * ln(2) // // Here a correction term c will be computed to compensate - // the error in r when rounded to a floating-point number. + // the error in r when rounded to a floating-point number. // // 2. Approximating expm1(r) by a special rational function on - // the interval [0, 0.5 * ln(2)]: - // Since - // r*(exp(r)+1)/(exp(r)-1) = 2 + r^2/6 - r^4/360 + ... - // we define R1(r*r) by - // r*(exp(r)+1)/(exp(r)-1) = 2 + r^2/6 * R1(r*r) - // That is, - // R1(r**2) = 6/r *((exp(r)+1)/(exp(r)-1) - 2/r) - // = 6/r * ( 1 + 2.0*(1/(exp(r)-1) - 1/r)) - // = 1 - r^2/60 + r^4/2520 - r^6/100800 + ... + // the interval [0, 0.5 * ln(2)]: + // Since + // r*(exp(r)+1)/(exp(r)-1) = 2 + r^2/6 - r^4/360 + ... + // we define R1(r*r) by + // r*(exp(r)+1)/(exp(r)-1) = 2 + r^2/6 * R1(r*r) + // That is, + // R1(r**2) = 6/r *((exp(r)+1)/(exp(r)-1) - 2/r) + // = 6/r * ( 1 + 2.0*(1/(exp(r)-1) - 1/r)) + // = 1 - r^2/60 + r^4/2520 - r^6/100800 + ... // We use a special Remes algorithm on [0, 0.347] to generate - // a polynomial of degree 5 in r*r to approximate R1. The - // maximum error of this polynomial approximation is bounded - // by 2**-61. In other words, - // R1(z) ~ 1.0 + Q1*z + Q2*z**2 + Q3*z**3 + Q4*z**4 + Q5*z**5 - // where Q1 = -1.6666666666666567384E-2, - // Q2 = 3.9682539681370365873E-4, - // Q3 = -9.9206344733435987357E-6, - // Q4 = 2.5051361420808517002E-7, - // Q5 = -6.2843505682382617102E-9; - // (where z=r*r, and Q1 to Q5 are called EXPM1_Qx in the source) - // with error bounded by - // | 5 | -61 - // | 1.0+Q1*z+...+Q5*z - R1(z) | <= 2 - // | | + // a polynomial of degree 5 in r*r to approximate R1. The + // maximum error of this polynomial approximation is bounded + // by 2**-61. In other words, + // R1(z) ~ 1.0 + Q1*z + Q2*z**2 + Q3*z**3 + Q4*z**4 + Q5*z**5 + // where Q1 = -1.6666666666666567384E-2, + // Q2 = 3.9682539681370365873E-4, + // Q3 = -9.9206344733435987357E-6, + // Q4 = 2.5051361420808517002E-7, + // Q5 = -6.2843505682382617102E-9; + // (where z=r*r, and Q1 to Q5 are called EXPM1_Qx in the source) + // with error bounded by + // | 5 | -61 + // | 1.0+Q1*z+...+Q5*z - R1(z) | <= 2 + // | | // - // expm1(r) = exp(r)-1 is then computed by the following - // specific way which minimize the accumulation rounding error: - // 2 3 - // r r [ 3 - (R1 + R1*r/2) ] - // expm1(r) = r + --- + --- * [--------------------] - // 2 2 [ 6 - r*(3 - R1*r/2) ] + // expm1(r) = exp(r)-1 is then computed by the following + // specific way which minimize the accumulation rounding error: + // 2 3 + // r r [ 3 - (R1 + R1*r/2) ] + // expm1(r) = r + --- + --- * [--------------------] + // 2 2 [ 6 - r*(3 - R1*r/2) ] // - // To compensate the error in the argument reduction, we use - // expm1(r+c) = expm1(r) + c + expm1(r)*c - // ~ expm1(r) + c + r*c - // Thus c+r*c will be added in as the correction terms for - // expm1(r+c). Now rearrange the term to avoid optimization - // screw up: - // ( 2 2 ) - // ({ ( r [ R1 - (3 - R1*r/2) ] ) } r ) - // expm1(r+c)~r - ({r*(--- * [--------------------]-c)-c} - --- ) - // ({ ( 2 [ 6 - r*(3 - R1*r/2) ] ) } 2 ) + // To compensate the error in the argument reduction, we use + // expm1(r+c) = expm1(r) + c + expm1(r)*c + // ~ expm1(r) + c + r*c + // Thus c+r*c will be added in as the correction terms for + // expm1(r+c). Now rearrange the term to avoid optimization + // screw up: + // ( 2 2 ) + // ({ ( r [ R1 - (3 - R1*r/2) ] ) } r ) + // expm1(r+c)~r - ({r*(--- * [--------------------]-c)-c} - --- ) + // ({ ( 2 [ 6 - r*(3 - R1*r/2) ] ) } 2 ) // ( ) // - // = r - E + // = r - E // 3. Scale back to obtain expm1(x): - // From step 1, we have - // expm1(x) = either 2^k*[expm1(r)+1] - 1 - // = or 2^k*[expm1(r) + (1-2^-k)] + // From step 1, we have + // expm1(x) = either 2^k*[expm1(r)+1] - 1 + // = or 2^k*[expm1(r) + (1-2^-k)] // 4. Implementation notes: - // (A). To save one multiplication, we scale the coefficient Qi - // to Qi*2^i, and replace z by (x^2)/2. - // (B). To achieve maximum accuracy, we compute expm1(x) by - // (i) if x < -56*ln2, return -1.0, (raise inexact if x!=inf) - // (ii) if k=0, return r-E - // (iii) if k=-1, return 0.5*(r-E)-0.5 - // (iv) if k=1 if r < -0.25, return 2*((r+0.5)- E) - // else return 1.0+2.0*(r-E); - // (v) if (k<-2||k>56) return 2^k(1-(E-r)) - 1 (or exp(x)-1) - // (vi) if k <= 20, return 2^k((1-2^-k)-(E-r)), else - // (vii) return 2^k(1-((E+2^-k)-r)) + // (A). To save one multiplication, we scale the coefficient Qi + // to Qi*2^i, and replace z by (x^2)/2. + // (B). To achieve maximum accuracy, we compute expm1(x) by + // (i) if x < -56*ln2, return -1.0, (raise inexact if x!=inf) + // (ii) if k=0, return r-E + // (iii) if k=-1, return 0.5*(r-E)-0.5 + // (iv) if k=1 if r < -0.25, return 2*((r+0.5)- E) + // else return 1.0+2.0*(r-E); + // (v) if (k<-2||k>56) return 2^k(1-(E-r)) - 1 (or exp(x)-1) + // (vi) if k <= 20, return 2^k((1-2^-k)-(E-r)), else + // (vii) return 2^k(1-((E+2^-k)-r)) boolean negative = (x < 0); double y, hi, lo, c, t, e, hxs, hfx, r1; @@ -1175,52 +1175,52 @@ public final strictfp class StrictMath // handle special cases and large arguments if (h_bits >= 0x4043687aL) // if |x| >= 56 * ln(2) { - if (h_bits >= 0x40862e42L) // if |x| >= EXP_LIMIT_H - { - if (h_bits >= 0x7ff00000L) - { - if (((h_bits & 0x000fffffL) | (l_bits & 0xffffffffL)) != 0) - return x; // exp(NaN) = NaN - else - return negative ? -1.0 : x; // exp({+-inf}) = {+inf, -1} - } + if (h_bits >= 0x40862e42L) // if |x| >= EXP_LIMIT_H + { + if (h_bits >= 0x7ff00000L) + { + if (((h_bits & 0x000fffffL) | (l_bits & 0xffffffffL)) != 0) + return x; // exp(NaN) = NaN + else + return negative ? -1.0 : x; // exp({+-inf}) = {+inf, -1} + } - if (x > EXP_LIMIT_H) - return Double.POSITIVE_INFINITY; // overflow - } + if (x > EXP_LIMIT_H) + return Double.POSITIVE_INFINITY; // overflow + } - if (negative) // x <= -56 * ln(2) - return -1.0; + if (negative) // x <= -56 * ln(2) + return -1.0; } // argument reduction if (h_bits > 0x3fd62e42L) // |x| > 0.5 * ln(2) { - if (h_bits < 0x3ff0a2b2L) // |x| < 1.5 * ln(2) - { - if (negative) - { - hi = x + LN2_H; - lo = -LN2_L; - k = -1; - } - else - { - hi = x - LN2_H; - lo = LN2_L; - k = 1; - } - } - else - { - k = (int) (INV_LN2 * x + (negative ? - 0.5 : 0.5)); - t = k; - hi = x - t * LN2_H; - lo = t * LN2_L; - } + if (h_bits < 0x3ff0a2b2L) // |x| < 1.5 * ln(2) + { + if (negative) + { + hi = x + LN2_H; + lo = -LN2_L; + k = -1; + } + else + { + hi = x - LN2_H; + lo = LN2_L; + k = 1; + } + } + else + { + k = (int) (INV_LN2 * x + (negative ? - 0.5 : 0.5)); + t = k; + hi = x - t * LN2_H; + lo = t * LN2_L; + } - x = hi - lo; - c = (hi - x) - lo; + x = hi - lo; + c = (hi - x) - lo; } else if (h_bits < 0x3c900000L) // |x| < 2^-54 return x @@ -1232,85 +1232,85 @@ public final strictfp class StrictMath hfx = 0.5 * x; hxs = x * hfx; r1 = 1.0 + hxs * (EXPM1_Q1 - + hxs * (EXPM1_Q2 + + hxs * (EXPM1_Q2 + hxs * (EXPM1_Q3 - + hxs * (EXPM1_Q4 - + hxs * EXPM1_Q5)))); + + hxs * (EXPM1_Q4 + + hxs * EXPM1_Q5)))); t = 3.0 - r1 * hfx; e = hxs * ((r1 - t) / (6.0 - x * t)); if (k == 0) { - return x - (x * e - hxs); // c == 0 + return x - (x * e - hxs); // c == 0 } else { - e = x * (e - c) - c; - e -= hxs; + e = x * (e - c) - c; + e -= hxs; - if (k == -1) - return 0.5 * (x - e) - 0.5; + if (k == -1) + return 0.5 * (x - e) - 0.5; - if (k == 1) - { - if (x < - 0.25) - return -2.0 * (e - (x + 0.5)); - else - return 1.0 + 2.0 * (x - e); - } + if (k == 1) + { + if (x < - 0.25) + return -2.0 * (e - (x + 0.5)); + else + return 1.0 + 2.0 * (x - e); + } - if (k <= -2 || k > 56) // sufficient to return exp(x) - 1 - { - y = 1.0 - (e - x); + if (k <= -2 || k > 56) // sufficient to return exp(x) - 1 + { + y = 1.0 - (e - x); - bits = Double.doubleToLongBits(y); - h_bits = getHighDWord(bits); - l_bits = getLowDWord(bits); + bits = Double.doubleToLongBits(y); + h_bits = getHighDWord(bits); + l_bits = getLowDWord(bits); - h_bits += (k << 20); // add k to y's exponent + h_bits += (k << 20); // add k to y's exponent - y = buildDouble(l_bits, h_bits); + y = buildDouble(l_bits, h_bits); - return y - 1.0; - } + return y - 1.0; + } - t = 1.0; - if (k < 20) - { - bits = Double.doubleToLongBits(t); - h_bits = 0x3ff00000L - (0x00200000L >> k); - l_bits = getLowDWord(bits); + t = 1.0; + if (k < 20) + { + bits = Double.doubleToLongBits(t); + h_bits = 0x3ff00000L - (0x00200000L >> k); + l_bits = getLowDWord(bits); - t = buildDouble(l_bits, h_bits); // t = 1 - 2^(-k) - y = t - (e - x); + t = buildDouble(l_bits, h_bits); // t = 1 - 2^(-k) + y = t - (e - x); - bits = Double.doubleToLongBits(y); - h_bits = getHighDWord(bits); - l_bits = getLowDWord(bits); + bits = Double.doubleToLongBits(y); + h_bits = getHighDWord(bits); + l_bits = getLowDWord(bits); - h_bits += (k << 20); // add k to y's exponent + h_bits += (k << 20); // add k to y's exponent - y = buildDouble(l_bits, h_bits); - } - else - { - bits = Double.doubleToLongBits(t); - h_bits = (0x000003ffL - k) << 20; - l_bits = getLowDWord(bits); + y = buildDouble(l_bits, h_bits); + } + else + { + bits = Double.doubleToLongBits(t); + h_bits = (0x000003ffL - k) << 20; + l_bits = getLowDWord(bits); - t = buildDouble(l_bits, h_bits); // t = 2^(-k) + t = buildDouble(l_bits, h_bits); // t = 2^(-k) - y = x - (e + t); - y += 1.0; + y = x - (e + t); + y += 1.0; - bits = Double.doubleToLongBits(y); - h_bits = getHighDWord(bits); - l_bits = getLowDWord(bits); + bits = Double.doubleToLongBits(y); + h_bits = getHighDWord(bits); + l_bits = getLowDWord(bits); - h_bits += (k << 20); // add k to y's exponent + h_bits += (k << 20); // add k to y's exponent - y = buildDouble(l_bits, h_bits); - } + y = buildDouble(l_bits, h_bits); + } } return y; @@ -2504,7 +2504,7 @@ public final strictfp class StrictMath *
      10. If a is positive or negative zero, the result is the * same.
        11. * - * + * * @param a the numeric argument. * @return the sign of the argument. * @since 1.5. @@ -2526,7 +2526,7 @@ public final strictfp class StrictMath *
      11. If a is positive or negative zero, the result is the * same.
        12. * - * + * * @param a the numeric argument. * @return the sign of the argument. * @since 1.5. diff --git a/libjava/classpath/java/lang/String.java b/libjava/classpath/java/lang/String.java index c8c6cb9627a..45c0daff673 100644 --- a/libjava/classpath/java/lang/String.java +++ b/libjava/classpath/java/lang/String.java @@ -107,7 +107,7 @@ public final class String * @see CharData#UPPER_EXPAND */ private static final char[] upperExpand - = zeroBasedStringValue(CharData.UPPER_EXPAND); + = zeroBasedStringValue(CharData.UPPER_EXPAND); /** * Stores unicode multi-character uppercase special casing table. @@ -115,8 +115,8 @@ public final class String * @see CharData#UPPER_SPECIAL */ private static final char[] upperSpecial - = zeroBasedStringValue(CharData.UPPER_SPECIAL); - + = zeroBasedStringValue(CharData.UPPER_SPECIAL); + /** * Characters which make up the String. * Package access is granted for use by StringBuffer. @@ -281,7 +281,7 @@ public final class String // equivalent to: offset + count < 0 || offset + count > ascii.length if (ascii.length - offset < count) throw new StringIndexOutOfBoundsException("offset + count: " - + (offset + count)); + + (offset + count)); value = new char[count]; this.offset = 0; this.count = count; @@ -355,18 +355,18 @@ public final class String { try { - return Charset.forName(encoding); + return Charset.forName(encoding); } catch(IllegalCharsetNameException e) { - throw new UnsupportedEncodingException("Encoding: "+encoding+ - " not found."); + throw new UnsupportedEncodingException("Encoding: "+encoding+ + " not found."); } catch(UnsupportedCharsetException e) { - throw new UnsupportedEncodingException("Encoding: "+encoding+ - " not found."); - } + throw new UnsupportedEncodingException("Encoding: "+encoding+ + " not found."); + } } /** @@ -397,31 +397,31 @@ public final class String // equivalent to: offset + count < 0 || offset + count > data.length if (data.length - offset < count) throw new StringIndexOutOfBoundsException("offset + count: " - + (offset + count)); - try + + (offset + count)); + try { CharsetDecoder csd = encoding.newDecoder(); - csd.onMalformedInput(CodingErrorAction.REPLACE); - csd.onUnmappableCharacter(CodingErrorAction.REPLACE); - CharBuffer cbuf = csd.decode(ByteBuffer.wrap(data, offset, count)); - if(cbuf.hasArray()) - { - value = cbuf.array(); - this.offset = cbuf.position(); - this.count = cbuf.remaining(); - } else { - // Doubt this will happen. But just in case. - value = new char[cbuf.remaining()]; - cbuf.get(value); - this.offset = 0; - this.count = value.length; - } - } + csd.onMalformedInput(CodingErrorAction.REPLACE); + csd.onUnmappableCharacter(CodingErrorAction.REPLACE); + CharBuffer cbuf = csd.decode(ByteBuffer.wrap(data, offset, count)); + if(cbuf.hasArray()) + { + value = cbuf.array(); + this.offset = cbuf.position(); + this.count = cbuf.remaining(); + } else { + // Doubt this will happen. But just in case. + value = new char[cbuf.remaining()]; + cbuf.get(value); + this.offset = 0; + this.count = value.length; + } + } catch(CharacterCodingException e) { - // This shouldn't ever happen. - throw (InternalError) new InternalError().initCause(e); - } + // This shouldn't ever happen. + throw (InternalError) new InternalError().initCause(e); + } } /** @@ -494,39 +494,39 @@ public final class String // equivalent to: offset + count < 0 || offset + count > data.length if (data.length - offset < count) throw new StringIndexOutOfBoundsException("offset + count: " - + (offset + count)); + + (offset + count)); int o, c; char[] v; String encoding; - try - { - encoding = System.getProperty("file.encoding"); - CharsetDecoder csd = Charset.forName(encoding).newDecoder(); - csd.onMalformedInput(CodingErrorAction.REPLACE); - csd.onUnmappableCharacter(CodingErrorAction.REPLACE); - CharBuffer cbuf = csd.decode(ByteBuffer.wrap(data, offset, count)); - if(cbuf.hasArray()) - { + try + { + encoding = System.getProperty("file.encoding"); + CharsetDecoder csd = Charset.forName(encoding).newDecoder(); + csd.onMalformedInput(CodingErrorAction.REPLACE); + csd.onUnmappableCharacter(CodingErrorAction.REPLACE); + CharBuffer cbuf = csd.decode(ByteBuffer.wrap(data, offset, count)); + if(cbuf.hasArray()) + { v = cbuf.array(); - o = cbuf.position(); - c = cbuf.remaining(); - } else { - // Doubt this will happen. But just in case. - v = new char[cbuf.remaining()]; - cbuf.get(v); - o = 0; - c = v.length; - } - } catch(Exception ex){ - // If anything goes wrong (System property not set, - // NIO provider not available, etc) - // Default to the 'safe' encoding ISO8859_1 - v = new char[count]; - o = 0; - c = count; - for (int i=0;i data.length if (data.length - offset < count) throw new StringIndexOutOfBoundsException("offset + count: " - + (offset + count)); + + (offset + count)); if (dont_copy) { value = data; @@ -631,7 +631,7 @@ public final class String * @param codePoints the entire array of code points * @param offset the start of the subarray * @param count the length of the subarray - * + * * @throws IllegalArgumentException if an invalid code point is found * in the codePoints array * @throws IndexOutOfBoundsException if offset is negative or offset + count @@ -640,34 +640,34 @@ public final class String public String(int[] codePoints, int offset, int count) { // FIXME: This implementation appears to give correct internal - // representation of the String because: + // representation of the String because: // - length() is correct - // - getting a char[] from toCharArray() and testing + // - getting a char[] from toCharArray() and testing // Character.codePointAt() on all the characters in that array gives // the appropriate results - // however printing the String gives incorrect results. This may be + // however printing the String gives incorrect results. This may be // due to printing method errors (such as incorrectly looping through // the String one char at a time rather than one "character" at a time. - + if (offset < 0) throw new IndexOutOfBoundsException(); int end = offset + count; int pos = 0; // This creates a char array that is long enough for all of the code // points to represent supplementary characters. This is more than likely - // a waste of storage, so we use it only temporarily and then copy the + // a waste of storage, so we use it only temporarily and then copy the // used portion into the value array. char[] temp = new char[2 * codePoints.length]; for (int i = offset; i < end; i++) { - pos += Character.toChars(codePoints[i], temp, pos); + pos += Character.toChars(codePoints[i], temp, pos); } this.count = pos; this.value = new char[pos]; System.arraycopy(temp, 0, value, 0, pos); this.offset = 0; } - + /** * Returns the number of characters contained in this String. * @@ -813,25 +813,25 @@ public final class String */ public byte[] getBytes(Charset enc) { - try + try { - CharsetEncoder cse = enc.newEncoder(); - cse.onMalformedInput(CodingErrorAction.REPLACE); - cse.onUnmappableCharacter(CodingErrorAction.REPLACE); - ByteBuffer bbuf = cse.encode(CharBuffer.wrap(value, offset, count)); - if(bbuf.hasArray()) - return bbuf.array(); - - // Doubt this will happen. But just in case. - byte[] bytes = new byte[bbuf.remaining()]; - bbuf.get(bytes); - return bytes; - } + CharsetEncoder cse = enc.newEncoder(); + cse.onMalformedInput(CodingErrorAction.REPLACE); + cse.onUnmappableCharacter(CodingErrorAction.REPLACE); + ByteBuffer bbuf = cse.encode(CharBuffer.wrap(value, offset, count)); + if(bbuf.hasArray()) + return bbuf.array(); + + // Doubt this will happen. But just in case. + byte[] bytes = new byte[bbuf.remaining()]; + bbuf.get(bytes); + return bytes; + } catch(CharacterCodingException e) { - // This shouldn't ever happen. - throw (InternalError) new InternalError().initCause(e); - } + // This shouldn't ever happen. + throw (InternalError) new InternalError().initCause(e); + } } /** @@ -845,18 +845,18 @@ public final class String * @since 1.1 */ public byte[] getBytes() - { - try - { - return getBytes(System.getProperty("file.encoding")); - } catch(Exception e) { - // XXX - Throw an error here? - // For now, default to the 'safe' encoding. - byte[] bytes = new byte[count]; - for(int i=0;i Character.MAX_HIGH_SURROGATE - || start == end - || start == count - || value[start + 1] < Character.MIN_LOW_SURROGATE - || value[start + 1] > Character.MAX_LOW_SURROGATE) - { - // Nothing. - } - else - { - // Surrogate pair. - ++start; - } - ++start; - ++count; + char base = value[start]; + if (base < Character.MIN_HIGH_SURROGATE + || base > Character.MAX_HIGH_SURROGATE + || start == end + || start == count + || value[start + 1] < Character.MIN_LOW_SURROGATE + || value[start + 1] > Character.MAX_LOW_SURROGATE) + { + // Nothing. + } + else + { + // Surrogate pair. + ++start; + } + ++start; + ++count; } return count; } @@ -2111,30 +2111,30 @@ public final class String value = s.value; else { - int count = s.count; - value = new char[count]; - VMSystem.arraycopy(s.value, s.offset, value, 0, count); + int count = s.count; + value = new char[count]; + VMSystem.arraycopy(s.value, s.offset, value, 0, count); } return value; } - + /** * Returns true iff this String contains the sequence of Characters * described in s. * @param s the CharSequence * @return true iff this String contains s - * + * * @since 1.5 */ public boolean contains (CharSequence s) { return this.indexOf(s.toString()) != -1; } - + /** * Returns a string that is this string with all instances of the sequence - * represented by target replaced by the sequence in + * represented by target replaced by the sequence in * replacement. * @param target the sequence to be replaced * @param replacement the sequence used as the replacement @@ -2146,9 +2146,9 @@ public final class String String replaceString = replacement.toString(); int targetLength = target.length(); int replaceLength = replacement.length(); - + int startPos = this.indexOf(targetString); - CPStringBuilder result = new CPStringBuilder(this); + CPStringBuilder result = new CPStringBuilder(this); while (startPos != -1) { // Replace the target with the replacement @@ -2159,15 +2159,15 @@ public final class String } return result.toString(); } - + /** - * Return the index into this String that is offset from the given index by + * Return the index into this String that is offset from the given index by * codePointOffset code points. * @param index the index at which to start * @param codePointOffset the number of code points to offset * @return the index into this String that is codePointOffset * code points offset from index. - * + * * @throws IndexOutOfBoundsException if index is negative or larger than the * length of this string. * @throws IndexOutOfBoundsException if codePointOffset is positive and the @@ -2180,7 +2180,7 @@ public final class String { if (index < 0 || index > count) throw new IndexOutOfBoundsException(); - + return Character.offsetByCodePoints(value, offset, count, offset + index, codePointOffset); } diff --git a/libjava/classpath/java/lang/StringBuffer.java b/libjava/classpath/java/lang/StringBuffer.java index b105f55da56..81a52f6d438 100644 --- a/libjava/classpath/java/lang/StringBuffer.java +++ b/libjava/classpath/java/lang/StringBuffer.java @@ -691,7 +691,7 @@ public final class StringBuffer * @since 1.5 */ public synchronized StringBuffer insert(int offset, CharSequence sequence, - int start, int end) + int start, int end) { super.insert(offset, sequence, start, end); return this; diff --git a/libjava/classpath/java/lang/StringBuilder.java b/libjava/classpath/java/lang/StringBuilder.java index aefe9272b6e..83a064ad06b 100644 --- a/libjava/classpath/java/lang/StringBuilder.java +++ b/libjava/classpath/java/lang/StringBuilder.java @@ -291,7 +291,7 @@ public final class StringBuilder * @return this StringBuilder */ public StringBuilder append(CharSequence seq, int start, - int end) + int end) { super.append(seq, start, end); return this; @@ -487,7 +487,7 @@ public final class StringBuilder * @throws StringIndexOutOfBoundsException if any index is out of bounds */ public StringBuilder insert(int offset, - char[] str, int str_offset, int len) + char[] str, int str_offset, int len) { super.insert(offset, str, str_offset, len); return this; @@ -556,7 +556,7 @@ public final class StringBuilder * or end are out of bounds */ public StringBuilder insert(int offset, CharSequence sequence, - int start, int end) + int start, int end) { super.insert(offset, sequence, start, end); return this; diff --git a/libjava/classpath/java/lang/System.java b/libjava/classpath/java/lang/System.java index 58b1bbad3d1..39d6da22907 100644 --- a/libjava/classpath/java/lang/System.java +++ b/libjava/classpath/java/lang/System.java @@ -134,7 +134,7 @@ public final class System SecurityManager sm = SecurityManager.current; // Be thread-safe. if (sm != null) sm.checkPermission(new RuntimePermission("setIO")); - + VMSystem.setIn(in); } @@ -151,7 +151,7 @@ public final class System { SecurityManager sm = SecurityManager.current; // Be thread-safe. if (sm != null) - sm.checkPermission(new RuntimePermission("setIO")); + sm.checkPermission(new RuntimePermission("setIO")); VMSystem.setOut(out); } @@ -202,15 +202,15 @@ public final class System // preload it here. if (SecurityManager.current == null) { - try - { - Class.forName("java.security.Security"); - } - catch (ClassNotFoundException e) - { - } + try + { + Class.forName("java.security.Security"); + } + catch (ClassNotFoundException e) + { + } } - + SecurityManager.current = sm; } @@ -237,8 +237,8 @@ public final class System { return VMSystem.currentTimeMillis(); } - - /** + + /** *

        * Returns the current value of a nanosecond-precise system timer. * The value of the timer is an offset relative to some arbitrary fixed @@ -261,7 +261,7 @@ public final class System *

        * * @return the time of a system timer in nanoseconds. - * @since 1.5 + * @since 1.5 */ public static long nanoTime() { @@ -365,7 +365,7 @@ public final class System *
        gnu.java.io.encoding_scheme_alias.iso-latin-_?
        8859_?
        *
        gnu.java.io.encoding_scheme_alias.latin?
        8859_?
        *
        gnu.java.io.encoding_scheme_alias.utf-8
        UTF8
        - *
        gnu.java.util.zoneinfo.dir
        Root of zoneinfo tree
        + *
        gnu.java.util.zoneinfo.dir
        Root of zoneinfo tree
        *
        gnu.javax.print.server
        Hostname of external CUPS server.
        * * @@ -549,7 +549,7 @@ public final class System if (environmentMap == null) { - Map variables = new EnvironmentMap(); + Map variables = new EnvironmentMap(); List environ = (List)VMSystem.environ(); for (String envEntry : environ) { @@ -558,16 +558,16 @@ public final class System { // it's perfectly legal that some entries may be in the form // key=value=value=value - int equalSignIndex = envEntry.indexOf('='); + int equalSignIndex = envEntry.indexOf('='); String key = envEntry.substring(0, equalSignIndex); String value = envEntry.substring(equalSignIndex + 1); variables.put(key, value); } } - + environmentMap = Collections.unmodifiableMap(variables); } - + return environmentMap; } @@ -731,7 +731,7 @@ public final class System { c = coll; } - + /** * Blocks queries containing a null object or an object which * isn't of type String. All other queries @@ -745,15 +745,15 @@ public final class System public boolean contains(Object obj) { if (obj == null) - throw new - NullPointerException("This collection does not support " + - "null values."); + throw new + NullPointerException("This collection does not support " + + "null values."); if (!(obj instanceof String)) - throw new - ClassCastException("This collection only supports Strings."); + throw new + ClassCastException("This collection only supports Strings."); return c.contains(obj); } - + /** * Blocks queries where the collection contains a null object or * an object which isn't of type String. All other @@ -768,15 +768,15 @@ public final class System public boolean containsAll(Collection coll) { for (Object o: coll) - { - if (o == null) - throw new - NullPointerException("This collection does not support " + - "null values."); - if (!(o instanceof String)) - throw new - ClassCastException("This collection only supports Strings."); - } + { + if (o == null) + throw new + NullPointerException("This collection does not support " + + "null values."); + if (!(o instanceof String)) + throw new + ClassCastException("This collection only supports Strings."); + } return c.containsAll(coll); } @@ -790,7 +790,7 @@ public final class System { return c.iterator(); } - + /** * Blocks the removal of elements from the collection. * @@ -802,15 +802,15 @@ public final class System public boolean remove(Object key) { if (key == null) - throw new - NullPointerException("This collection does not support " + - "null values."); + throw new + NullPointerException("This collection does not support " + + "null values."); if (!(key instanceof String)) - throw new - ClassCastException("This collection only supports Strings."); + throw new + ClassCastException("This collection only supports Strings."); return c.contains(key); - } - + } + /** * Blocks the removal of all elements in the specified * collection from the collection. @@ -824,18 +824,18 @@ public final class System public boolean removeAll(Collection coll) { for (Object o: coll) - { - if (o == null) - throw new - NullPointerException("This collection does not support " + - "null values."); - if (!(o instanceof String)) - throw new - ClassCastException("This collection only supports Strings."); - } + { + if (o == null) + throw new + NullPointerException("This collection does not support " + + "null values."); + if (!(o instanceof String)) + throw new + ClassCastException("This collection only supports Strings."); + } return c.removeAll(coll); } - + /** * Blocks the retention of all elements in the specified * collection from the collection. @@ -849,15 +849,15 @@ public final class System public boolean retainAll(Collection coll) { for (Object o: coll) - { - if (o == null) - throw new - NullPointerException("This collection does not support " + - "null values."); - if (!(o instanceof String)) - throw new - ClassCastException("This collection only supports Strings."); - } + { + if (o == null) + throw new + NullPointerException("This collection does not support " + + "null values."); + if (!(o instanceof String)) + throw new + ClassCastException("This collection only supports Strings."); + } return c.containsAll(coll); } @@ -877,14 +877,14 @@ public final class System /** * This is a specialised HashMap, which * prevents the addition or querying of anything other than - * String objects. + * String objects. * * @author Andrew John Hughes (gnu_andrew@member.fsf.org) */ static class EnvironmentMap extends HashMap { - + /** * Cache the entry set. */ @@ -915,7 +915,7 @@ public final class System * @param m the map to be added to this. * @throws NullPointerException if a key or value is null. * @throws ClassCastException if a key or value is not a String. - */ + */ EnvironmentMap(Map m) { super(m); @@ -933,14 +933,14 @@ public final class System public boolean containsKey(Object key) { if (key == null) - throw new - NullPointerException("This map does not support null keys."); + throw new + NullPointerException("This map does not support null keys."); if (!(key instanceof String)) - throw new - ClassCastException("This map only allows queries using Strings."); + throw new + ClassCastException("This map only allows queries using Strings."); return super.containsKey(key); } - + /** * Blocks queries using a null or non-String value. * All other queries are forwarded to the superclass. @@ -952,11 +952,11 @@ public final class System public boolean containsValue(Object value) { if (value == null) - throw new - NullPointerException("This map does not support null values."); + throw new + NullPointerException("This map does not support null values."); if (!(value instanceof String)) - throw new - ClassCastException("This map only allows queries using Strings."); + throw new + ClassCastException("This map only allows queries using Strings."); return super.containsValue(value); } @@ -985,14 +985,14 @@ public final class System public String get(Object key) { if (key == null) - throw new - NullPointerException("This map does not support null keys."); + throw new + NullPointerException("This map does not support null keys."); if (!(key instanceof String)) - throw new - ClassCastException("This map only allows queries using Strings."); + throw new + ClassCastException("This map only allows queries using Strings."); return super.get(key); } - + /** * Returns a set view of the keys, with the same * provisions as for the underlying map. @@ -1021,13 +1021,13 @@ public final class System public String put(String key, String value) { if (key == null) - throw new NullPointerException("A new key is null."); + throw new NullPointerException("A new key is null."); if (value == null) - throw new NullPointerException("A new value is null."); + throw new NullPointerException("A new value is null."); if (!(key instanceof String)) - throw new ClassCastException("A new key is not a String."); + throw new ClassCastException("A new key is not a String."); if (!(value instanceof String)) - throw new ClassCastException("A new value is not a String."); + throw new ClassCastException("A new value is not a String."); return super.put(key, value); } @@ -1043,14 +1043,14 @@ public final class System public String remove(Object key) { if (key == null) - throw new - NullPointerException("This map does not support null keys."); + throw new + NullPointerException("This map does not support null keys."); if (!(key instanceof String)) - throw new - ClassCastException("This map only allows queries using Strings."); + throw new + ClassCastException("This map only allows queries using Strings."); return super.remove(key); } - + /** * Returns a collection view of the values, with the same * provisions as for the underlying map. @@ -1063,7 +1063,7 @@ public final class System values = new EnvironmentCollection(super.values()); return values; } - + } /** diff --git a/libjava/classpath/java/lang/Thread.java b/libjava/classpath/java/lang/Thread.java index 82e72618780..bc2dbb5b709 100644 --- a/libjava/classpath/java/lang/Thread.java +++ b/libjava/classpath/java/lang/Thread.java @@ -143,13 +143,13 @@ public class Thread implements Runnable /** This thread's ID. */ private final long threadId; - + /** The park blocker. See LockSupport. */ Object parkBlocker; /** The next thread number to use. */ private static int numAnonymousThreadsCreated; - + /** Used to generate the next thread ID to use. */ private static long totalThreadsCreated; @@ -354,10 +354,10 @@ public class Thread implements Runnable Thread current = currentThread(); if (group == null) { - if (sm != null) - group = sm.getThreadGroup(); - if (group == null) - group = current.group; + if (sm != null) + group = sm.getThreadGroup(); + if (group == null) + group = current.group; } if (sm != null) sm.checkAccess(group); @@ -368,7 +368,7 @@ public class Thread implements Runnable this.runnable = target; this.stacksize = size; this.locals = new ThreadLocalMap(); - + synchronized (Thread.class) { this.threadId = ++totalThreadsCreated; @@ -422,7 +422,7 @@ public class Thread implements Runnable this.threadId = ++totalThreadsCreated; } } - + /** * Generate a name for an anonymous thread. */ @@ -510,7 +510,7 @@ public class Thread implements Runnable { throw new NoSuchMethodError(); } - + /** * Print a stack trace of the current thread to stderr using the same * format as Throwable's printStackTrace() method. @@ -540,7 +540,7 @@ public class Thread implements Runnable { return currentThread().group.enumerate(array); } - + /** * Get this Thread's name. * @@ -731,7 +731,7 @@ public class Thread implements Runnable if (t != null) t.resume(); } - + /** * The method of Thread that will be run if there is no Runnable object * associated with the Thread. Thread's implementation does nothing at all. @@ -788,7 +788,7 @@ public class Thread implements Runnable if (loader != null && sm != null) { // Get the calling classloader - ClassLoader cl = VMStackWalker.getCallingClassLoader(); + ClassLoader cl = VMStackWalker.getCallingClassLoader(); if (cl != null && !cl.isAncestorOf(loader)) sm.checkPermission(new RuntimePermission("getClassLoader")); } @@ -921,7 +921,7 @@ public class Thread implements Runnable VMThread.create(this, stacksize); } - + /** * Cause this Thread to stop abnormally because of the throw of a ThreadDeath * error. If you stop a Thread that has not yet started, it will stop @@ -992,9 +992,9 @@ public class Thread implements Runnable } VMThread vt = vmThread; if (vt != null) - vt.stop(t); + vt.stop(t); else - stillborn = t; + stillborn = t; } /** @@ -1055,7 +1055,7 @@ public class Thread implements Runnable public String toString() { return ("Thread[" + name + "," + priority + "," - + (group == null ? "" : group.getName()) + "]"); + + (group == null ? "" : group.getName()) + "]"); } /** @@ -1076,7 +1076,7 @@ public class Thread implements Runnable return currentThread().locals; } - /** + /** * Assigns the given UncaughtExceptionHandler to this * thread. This will then be called if the thread terminates due * to an uncaught exception, pre-empting that of the @@ -1084,17 +1084,17 @@ public class Thread implements Runnable * * @param h the handler to use for this thread. * @throws SecurityException if the current thread can't modify this thread. - * @since 1.5 + * @since 1.5 */ public void setUncaughtExceptionHandler(UncaughtExceptionHandler h) { SecurityManager sm = SecurityManager.current; // Be thread-safe. if (sm != null) - sm.checkAccess(this); + sm.checkAccess(this); exceptionHandler = h; } - /** + /** *

        * Returns the handler used when this thread terminates due to an * uncaught exception. The handler used is determined by the following: @@ -1107,17 +1107,17 @@ public class Thread implements Runnable * (which can only happen when the thread was terminated since * then it won't have an associated thread group anymore). * - * + * * @return the appropriate UncaughtExceptionHandler or * null if one can't be obtained. - * @since 1.5 + * @since 1.5 */ public UncaughtExceptionHandler getUncaughtExceptionHandler() { return exceptionHandler != null ? exceptionHandler : group; } - /** + /** *

        * Sets the default uncaught exception handler used when one isn't * provided by the thread or its associated ThreadGroup. @@ -1137,36 +1137,36 @@ public class Thread implements Runnable * @throws SecurityException if a security manager is present and * disallows the runtime permission * "setDefaultUncaughtExceptionHandler". - * @since 1.5 + * @since 1.5 */ - public static void + public static void setDefaultUncaughtExceptionHandler(UncaughtExceptionHandler h) { SecurityManager sm = SecurityManager.current; // Be thread-safe. if (sm != null) - sm.checkPermission(new RuntimePermission("setDefaultUncaughtExceptionHandler")); + sm.checkPermission(new RuntimePermission("setDefaultUncaughtExceptionHandler")); defaultHandler = h; } - /** + /** * Returns the handler used by default when a thread terminates * unexpectedly due to an exception, or null if one doesn't * exist. * * @return the default uncaught exception handler. - * @since 1.5 + * @since 1.5 */ public static UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() { return defaultHandler; } - - /** + + /** * Returns the unique identifier for this thread. This ID is generated * on thread creation, and may be re-used on its death. * * @return a positive long number representing the thread's ID. - * @since 1.5 + * @since 1.5 */ public long getId() { @@ -1231,7 +1231,7 @@ public class Thread implements Runnable void uncaughtException(Thread thr, Throwable exc); } - /** + /** *

        * Represents the current state of a thread, according to the VM rather * than the operating system. It can be one of the following: @@ -1249,7 +1249,7 @@ public class Thread implements Runnable *

      12. TERMINATED -- The thread has exited.
        13. * * - * @since 1.5 + * @since 1.5 */ public enum State { @@ -1296,7 +1296,7 @@ public class Thread implements Runnable * by the thread, with the most recent method forming the * first element in the array. The array will be empty * if the virtual machine can not obtain information on the - * thread. + * thread. *

        *

        * To execute this method, the current security manager @@ -1304,7 +1304,7 @@ public class Thread implements Runnable * "getStackTrace" and * "modifyThreadGroup" {@link RuntimePermission}s. *

        - * + * * @return a map of threads to arrays of {@link StackTraceElement}s. * @throws SecurityException if a security manager exists, and * prevents either or both the runtime @@ -1322,14 +1322,14 @@ public class Thread implements Runnable int filled = group.enumerate(threadList); while (filled == arraySize) { - arraySize *= 2; - threadList = new Thread[arraySize]; - filled = group.enumerate(threadList); + arraySize *= 2; + threadList = new Thread[arraySize]; + filled = group.enumerate(threadList); } Map traces = new HashMap(); for (int a = 0; a < filled; ++a) traces.put(threadList[a], - threadList[a].getStackTrace()); + threadList[a].getStackTrace()); return traces; } diff --git a/libjava/classpath/java/lang/ThreadLocal.java b/libjava/classpath/java/lang/ThreadLocal.java index 1f60a55539b..71b722e55c5 100644 --- a/libjava/classpath/java/lang/ThreadLocal.java +++ b/libjava/classpath/java/lang/ThreadLocal.java @@ -100,7 +100,7 @@ public class ThreadLocal /** * Allocate a new hash. */ - private synchronized int computeNextHash() + private synchronized int computeNextHash() { return nextHashBase++ * 6709; } diff --git a/libjava/classpath/java/lang/Throwable.java b/libjava/classpath/java/lang/Throwable.java index f74851f0b1b..13bc5b90354 100644 --- a/libjava/classpath/java/lang/Throwable.java +++ b/libjava/classpath/java/lang/Throwable.java @@ -423,32 +423,32 @@ public class Throwable implements Serializable Throwable cause = getCause(); while (cause != null) { - // Cause start first line + // Cause start first line sb.append("Caused by: "); // Cause stacktrace StackTraceElement[] parentStack = stack; stack = cause.getStackTrace(); - if (parentStack == null || parentStack.length == 0) - stackTraceStringBuffer(sb, cause.toString(), stack, 0); - else - { - int equal = 0; // Count how many of the last stack frames are equal - int frame = stack.length-1; - int parentFrame = parentStack.length-1; - while (frame > 0 && parentFrame > 0) - { - if (stack[frame].equals(parentStack[parentFrame])) - { - equal++; - frame--; - parentFrame--; - } - else - break; - } - stackTraceStringBuffer(sb, cause.toString(), stack, equal); - } + if (parentStack == null || parentStack.length == 0) + stackTraceStringBuffer(sb, cause.toString(), stack, 0); + else + { + int equal = 0; // Count how many of the last stack frames are equal + int frame = stack.length-1; + int parentFrame = parentStack.length-1; + while (frame > 0 && parentFrame > 0) + { + if (stack[frame].equals(parentStack[parentFrame])) + { + equal++; + frame--; + parentFrame--; + } + else + break; + } + stackTraceStringBuffer(sb, cause.toString(), stack, equal); + } cause = cause.getCause(); } @@ -458,7 +458,7 @@ public class Throwable implements Serializable // Adds to the given StringBuffer a line containing the name and // all stacktrace elements minus the last equal ones. private static void stackTraceStringBuffer(CPStringBuilder sb, String name, - StackTraceElement[] stack, int equal) + StackTraceElement[] stack, int equal) { String nl = StaticData.nl; // (finish) first line @@ -468,24 +468,24 @@ public class Throwable implements Serializable // The stacktrace if (stack == null || stack.length == 0) { - sb.append(" <>"); - sb.append(nl); + sb.append(" <>"); + sb.append(nl); } else { - for (int i = 0; i < stack.length-equal; i++) - { - sb.append(" at "); - sb.append(stack[i] == null ? "<>" : stack[i].toString()); - sb.append(nl); - } - if (equal > 0) - { - sb.append(" ..."); - sb.append(equal); - sb.append(" more"); - sb.append(nl); - } + for (int i = 0; i < stack.length-equal; i++) + { + sb.append(" at "); + sb.append(stack[i] == null ? "<>" : stack[i].toString()); + sb.append(nl); + } + if (equal > 0) + { + sb.append(" ..."); + sb.append(equal); + sb.append(" more"); + sb.append(nl); + } } } @@ -518,12 +518,12 @@ public class Throwable implements Serializable { if (stackTrace == null) if (vmState == null) - stackTrace = new StackTraceElement[0]; - else - { - stackTrace = vmState.getStackTrace(this); - vmState = null; // No longer needed - } + stackTrace = new StackTraceElement[0]; + else + { + stackTrace = vmState.getStackTrace(this); + vmState = null; // No longer needed + } return stackTrace; } @@ -548,9 +548,9 @@ public class Throwable implements Serializable while (--i >= 0) { - st[i] = stackTrace[i]; - if (st[i] == null) - throw new NullPointerException("Element " + i + " null"); + st[i] = stackTrace[i]; + if (st[i] == null) + throw new NullPointerException("Element " + i + " null"); } this.stackTrace = st; diff --git a/libjava/classpath/java/lang/TypeNotPresentException.java b/libjava/classpath/java/lang/TypeNotPresentException.java index 65d98457ec8..4d6bf23996b 100644 --- a/libjava/classpath/java/lang/TypeNotPresentException.java +++ b/libjava/classpath/java/lang/TypeNotPresentException.java @@ -43,7 +43,7 @@ package java.lang; * Thrown when a type is accessed using a String-based * representation, but no definition of the supplied type is found. * This is effectively an unchecked equivalent of the existing - * ClassNotFound exception. + * ClassNotFound exception. *

        *

        * It may occur due to an attempt to load a missing class, interface or @@ -66,7 +66,7 @@ public class TypeNotPresentException * may be used to provide additional history, with regards to the * root of the problem. It is perfectly valid for this to be null, * if the cause of the problem is unknown. - * + * * @param typeName the name of the missing type. * @param cause the cause of this exception, or null if the cause * is unknown. diff --git a/libjava/classpath/java/lang/UnsupportedOperationException.java b/libjava/classpath/java/lang/UnsupportedOperationException.java index e691cc7c9ec..4994f6714a4 100644 --- a/libjava/classpath/java/lang/UnsupportedOperationException.java +++ b/libjava/classpath/java/lang/UnsupportedOperationException.java @@ -86,7 +86,7 @@ public class UnsupportedOperationException extends RuntimeException * automatically incorporated into the resulting detail message of * this exception. *

        - * + * * @param message the detail message, which should give the reason for * this exception being thrown. * @param cause the cause of this exception, or null if the cause @@ -114,7 +114,7 @@ public class UnsupportedOperationException extends RuntimeException * This makes this constructor very useful for simply wrapping another * exception. *

        - * + * * @param cause the cause of this exception, or null if the cause * is unknown. * @since 1.5 diff --git a/libjava/classpath/java/lang/annotation/Annotation.java b/libjava/classpath/java/lang/annotation/Annotation.java index cc334ec3bb6..aac8bb9f199 100644 --- a/libjava/classpath/java/lang/annotation/Annotation.java +++ b/libjava/classpath/java/lang/annotation/Annotation.java @@ -67,13 +67,13 @@ public interface Annotation * annotation, according to the following: *
          *
        • If the members are floats, then, for floats - * x and y, + * x and y, * Float.valueOf(x).equals(Float.valueOf(y) must return * true. This differs from the usual (==) comparison * in that NaN is considered equal to itself and positive * and negative zero are seen as different.
          • *
        • Likewise, if the members are doubles, then, for doubles - * x and y, + * x and y, * Double.valueOf(x).equals(Double.valueOf(y) must return * true. This differs from the usual (==) comparison * in that NaN is considered equal to itself and positive diff --git a/libjava/classpath/java/lang/annotation/AnnotationTypeMismatchException.java b/libjava/classpath/java/lang/annotation/AnnotationTypeMismatchException.java index 653305d632a..bab32e0eaa2 100644 --- a/libjava/classpath/java/lang/annotation/AnnotationTypeMismatchException.java +++ b/libjava/classpath/java/lang/annotation/AnnotationTypeMismatchException.java @@ -44,7 +44,7 @@ import java.lang.reflect.Method; * which the type has changed, since compilation or serialization * took place. The mismatch between the compiled or serialized * type and the current type causes this exception to be thrown. - * + * * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 diff --git a/libjava/classpath/java/lang/annotation/IncompleteAnnotationException.java b/libjava/classpath/java/lang/annotation/IncompleteAnnotationException.java index 5b20650d1cf..b511b36c2c2 100644 --- a/libjava/classpath/java/lang/annotation/IncompleteAnnotationException.java +++ b/libjava/classpath/java/lang/annotation/IncompleteAnnotationException.java @@ -40,8 +40,8 @@ package java.lang.annotation; /** * Thrown when accessing an element within an annotation which * was added since compilation or serialization took place, and - * does not have a default value. - * + * does not have a default value. + * * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 @@ -59,7 +59,7 @@ public class IncompleteAnnotationException extends RuntimeException * @param name the name of the missing element. */ public IncompleteAnnotationException(Class type, - String name) + String name) { this.annotationType = type; this.elementName = name; @@ -100,7 +100,7 @@ public class IncompleteAnnotationException extends RuntimeException /** * The name of the missing element. * - * @serial the name of the missing element. + * @serial the name of the missing element. */ private String elementName; diff --git a/libjava/classpath/java/lang/instrument/ClassFileTransformer.java b/libjava/classpath/java/lang/instrument/ClassFileTransformer.java index 01b2f8aaaf5..189a46a3c90 100644 --- a/libjava/classpath/java/lang/instrument/ClassFileTransformer.java +++ b/libjava/classpath/java/lang/instrument/ClassFileTransformer.java @@ -67,9 +67,9 @@ public interface ClassFileTransformer * @param protectionDomain the protection domain of the class being defined or * redefined * @param classfileBuffer the input byte buffer in class file format - * + * * @return a class file buffer or null when no transformation has been performed - * + * * @throws IllegalClassFormatException if the byte buffer does not represent * a well-formed class file * @see Instrumentation#redefineClasses(java.lang.instrument.ClassDefinition[]) @@ -82,4 +82,3 @@ public interface ClassFileTransformer byte[] classfileBuffer) throws IllegalClassFormatException; } - diff --git a/libjava/classpath/java/lang/instrument/Instrumentation.java b/libjava/classpath/java/lang/instrument/Instrumentation.java index 81aefa6d6b8..42e3ab5be7e 100644 --- a/libjava/classpath/java/lang/instrument/Instrumentation.java +++ b/libjava/classpath/java/lang/instrument/Instrumentation.java @@ -50,22 +50,22 @@ package java.lang.instrument; */ public interface Instrumentation { - + /** * Adds a ClassFileTransformer object * to the instrumentation. Each time a class is defined * or redefined, the transform method of the * transformer object is called. - * + * * @param transformer the transformer to add * @throws NullPointerException if transformer is null */ void addTransformer(ClassFileTransformer transformer); - + /** * Removes the given transformer from the set of transformers * this Instrumentation object has. - * + * * @param transformer the transformer to remove * @return true if the transformer was found and removed, false if * the transformer was not found @@ -75,7 +75,7 @@ public interface Instrumentation /** * Returns if the current JVM supports class redefinition - * + * * @return true if the current JVM supports class redefinition */ boolean isRedefineClassesSupported(); @@ -85,9 +85,9 @@ public interface Instrumentation * the corresponding class files. * * @param definitions an array of classes to redefine - * - * @throws ClassNotFoundException if a class cannot be found - * @throws UnmodifiableClassException if a class cannot be modified + * + * @throws ClassNotFoundException if a class cannot be found + * @throws UnmodifiableClassException if a class cannot be modified * @throws UnsupportedOperationException if the JVM does not support * redefinition or the redefinition made unsupported changes * @throws ClassFormatError if a class file is not valid @@ -97,7 +97,7 @@ public interface Instrumentation * are unsupported * @throws ClassCircularityError if circularity occured with the new * classes - * @throws LinkageError if a linkage error occurs + * @throws LinkageError if a linkage error occurs * @throws NullPointerException if the definitions array is null, or any * of its element * @@ -112,7 +112,7 @@ public interface Instrumentation /** * Get all the classes loaded by the JVM. - * + * * @return an array containing all the classes loaded by the JVM. The array * is empty if no class is loaded. */ @@ -120,9 +120,9 @@ public interface Instrumentation /** * Get all the classes loaded by a given class loader - * + * * @param loader the loader - * + * * @return an array containing all the classes loaded by the given loader. * The array is empty if no class was loaded by the loader. */ @@ -130,7 +130,7 @@ public interface Instrumentation /** * Get the size of an object. It contains the size of all fields. - * + * * @param objectToSize the object * @return the size of the object * @throws NullPointerException if objectToSize is null. diff --git a/libjava/classpath/java/lang/management/ClassLoadingMXBean.java b/libjava/classpath/java/lang/management/ClassLoadingMXBean.java index 2a8651b9c81..491af247f75 100644 --- a/libjava/classpath/java/lang/management/ClassLoadingMXBean.java +++ b/libjava/classpath/java/lang/management/ClassLoadingMXBean.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.lang.management; /** - * Provides access to information about the class loading + * Provides access to information about the class loading * behaviour of the current invocation of the virtual * machine. An instance of this bean is obtained by calling * {@link ManagementFactory#getClassLoadingMXBean()}. @@ -100,4 +100,3 @@ public interface ClassLoadingMXBean void setVerbose(boolean verbose); } - diff --git a/libjava/classpath/java/lang/management/CompilationMXBean.java b/libjava/classpath/java/lang/management/CompilationMXBean.java index 7f666f2c64b..36f69c44b1b 100644 --- a/libjava/classpath/java/lang/management/CompilationMXBean.java +++ b/libjava/classpath/java/lang/management/CompilationMXBean.java @@ -50,7 +50,7 @@ package java.lang.management; */ public interface CompilationMXBean { - + /** * Returns the name of the Just-In-Time (JIT) compiler. * diff --git a/libjava/classpath/java/lang/management/GarbageCollectorMXBean.java b/libjava/classpath/java/lang/management/GarbageCollectorMXBean.java index 5bb0a18d386..f3da0042d9d 100644 --- a/libjava/classpath/java/lang/management/GarbageCollectorMXBean.java +++ b/libjava/classpath/java/lang/management/GarbageCollectorMXBean.java @@ -70,7 +70,7 @@ public interface GarbageCollectorMXBean * Note that the accumulated time may not change, even when the * collection count increases, if the time taken is sufficiently * short; this depends on the resolution of the timer used. - * + * * @return the accumulated number of milliseconds spent collecting, * or -1 if this is undefined. */ diff --git a/libjava/classpath/java/lang/management/ManagementFactory.java b/libjava/classpath/java/lang/management/ManagementFactory.java index 977b3997535..c054f5dd98a 100644 --- a/libjava/classpath/java/lang/management/ManagementFactory.java +++ b/libjava/classpath/java/lang/management/ManagementFactory.java @@ -82,7 +82,7 @@ import javax.management.openmbean.TabularData; /** *

          * Provides access to the system's management beans via a series - * of static methods. + * of static methods. *

          *

          * An instance of a system management bean can be obtained by @@ -251,16 +251,16 @@ public class ManagementFactory public static OperatingSystemMXBean getOperatingSystemMXBean() { if (osBean == null) - try - { - osBean = new OperatingSystemMXBeanImpl(); - } + try + { + osBean = new OperatingSystemMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "operating system bean is not a " + - "compliant management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "operating system bean is not a " + + "compliant management bean."); + } return osBean; } @@ -275,15 +275,15 @@ public class ManagementFactory { if (runtimeBean == null) try - { - runtimeBean = new RuntimeMXBeanImpl(); - } + { + runtimeBean = new RuntimeMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "runtime bean is not a compliant " + - "management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "runtime bean is not a compliant " + + "management bean."); + } return runtimeBean; } @@ -298,15 +298,15 @@ public class ManagementFactory { if (classLoadingBean == null) try - { - classLoadingBean = new ClassLoadingMXBeanImpl(); - } + { + classLoadingBean = new ClassLoadingMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "class loading bean is not a " + - "compliant management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "class loading bean is not a " + + "compliant management bean."); + } return classLoadingBean; } @@ -321,15 +321,15 @@ public class ManagementFactory { if (threadBean == null) try - { - threadBean = new ThreadMXBeanImpl(); - } + { + threadBean = new ThreadMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "thread bean is not a compliant " + - "management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "thread bean is not a compliant " + + "management bean."); + } return threadBean; } @@ -344,15 +344,15 @@ public class ManagementFactory { if (memoryBean == null) try - { - memoryBean = new MemoryMXBeanImpl(); - } + { + memoryBean = new MemoryMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "memory bean is not a compliant " + - "management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "memory bean is not a compliant " + + "management bean."); + } return memoryBean; } @@ -369,17 +369,17 @@ public class ManagementFactory public static CompilationMXBean getCompilationMXBean() { if (compilationBean == null && - SystemProperties.getProperty("gnu.java.compiler.name") != null) + SystemProperties.getProperty("gnu.java.compiler.name") != null) try - { - compilationBean = new CompilationMXBeanImpl(); - } + { + compilationBean = new CompilationMXBeanImpl(); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "compilation bean is not a compliant " + - "management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "compilation bean is not a compliant " + + "management bean."); + } return compilationBean; } @@ -397,15 +397,15 @@ public class ManagementFactory String[] names = VMManagementFactory.getMemoryPoolNames(); for (int a = 0; a < names.length; ++a) try - { - poolBeans.add(new MemoryPoolMXBeanImpl(names[a])); - } + { + poolBeans.add(new MemoryPoolMXBeanImpl(names[a])); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "memory pool bean, " + a + ", is " + - "not a compliant management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "memory pool bean, " + a + ", is " + + "not a compliant management bean."); + } return poolBeans; } @@ -423,15 +423,15 @@ public class ManagementFactory String[] names = VMManagementFactory.getMemoryManagerNames(); for (int a = 0; a < names.length; ++a) try - { - managerBeans.add(new MemoryManagerMXBeanImpl(names[a])); - } + { + managerBeans.add(new MemoryManagerMXBeanImpl(names[a])); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "memory manager bean, " + a + ", is " + - "not a compliant management bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "memory manager bean, " + a + ", is " + + "not a compliant management bean."); + } managerBeans.addAll(getGarbageCollectorMXBeans()); return managerBeans; } @@ -450,16 +450,16 @@ public class ManagementFactory String[] names = VMManagementFactory.getGarbageCollectorNames(); for (int a = 0; a < names.length; ++a) try - { - gcBeans.add(new GarbageCollectorMXBeanImpl(names[a])); - } + { + gcBeans.add(new GarbageCollectorMXBeanImpl(names[a])); + } catch (NotCompliantMBeanException e) - { - throw new InternalError("The GNU implementation of the " + - "garbage collector bean, " + a + - ", is not a compliant management " + - "bean."); - } + { + throw new InternalError("The GNU implementation of the " + + "garbage collector bean, " + a + + ", is not a compliant management " + + "bean."); + } return gcBeans; } @@ -490,77 +490,77 @@ public class ManagementFactory { if (platformServer == null) { - platformServer = MBeanServerFactory.createMBeanServer(); - try - { - platformServer.registerMBean(getOperatingSystemMXBean(), - new ObjectName(OPERATING_SYSTEM_MXBEAN_NAME)); - platformServer.registerMBean(getRuntimeMXBean(), - new ObjectName(RUNTIME_MXBEAN_NAME)); - platformServer.registerMBean(getClassLoadingMXBean(), - new ObjectName(CLASS_LOADING_MXBEAN_NAME)); - platformServer.registerMBean(getThreadMXBean(), - new ObjectName(THREAD_MXBEAN_NAME)); - platformServer.registerMBean(getMemoryMXBean(), - new ObjectName(MEMORY_MXBEAN_NAME)); - CompilationMXBean compBean = getCompilationMXBean(); - if (compBean != null) - platformServer.registerMBean(compBean, - new ObjectName(COMPILATION_MXBEAN_NAME)); - Iterator beans = getMemoryPoolMXBeans().iterator(); - while (beans.hasNext()) - { - MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); - platformServer.registerMBean(bean, - new ObjectName(MEMORY_POOL_MXBEAN_DOMAIN_TYPE + - ",name=" + - bean.getName())); - } - beans = getMemoryManagerMXBeans().iterator(); - while (beans.hasNext()) - { - MemoryManagerMXBean bean = (MemoryManagerMXBean) beans.next(); - platformServer.registerMBean(bean, - new ObjectName(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE + - ",name=" + - bean.getName())); - } - beans = getGarbageCollectorMXBeans().iterator(); - while (beans.hasNext()) - { - GarbageCollectorMXBean bean = (GarbageCollectorMXBean) beans.next(); - platformServer.registerMBean(bean, - new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + - ",name=" + - bean.getName())); - } - platformServer.registerMBean(LogManager.getLoggingMXBean(), - new ObjectName(LogManager.LOGGING_MXBEAN_NAME)); - } - catch (InstanceAlreadyExistsException e) - { - throw (Error) - (new InternalError("One of the management beans is " + - "already registered.").initCause(e)); - } - catch (MBeanRegistrationException e) - { - throw (Error) - (new InternalError("One of the management beans' preRegister " + - "methods threw an exception.").initCause(e)); - } - catch (NotCompliantMBeanException e) - { - throw (Error) - (new InternalError("One of the management beans is " + - "not compliant.").initCause(e)); - } - catch (MalformedObjectNameException e) - { - throw (Error) - (new InternalError("The object name of a management bean is " + - "not compliant.").initCause(e)); - } + platformServer = MBeanServerFactory.createMBeanServer(); + try + { + platformServer.registerMBean(getOperatingSystemMXBean(), + new ObjectName(OPERATING_SYSTEM_MXBEAN_NAME)); + platformServer.registerMBean(getRuntimeMXBean(), + new ObjectName(RUNTIME_MXBEAN_NAME)); + platformServer.registerMBean(getClassLoadingMXBean(), + new ObjectName(CLASS_LOADING_MXBEAN_NAME)); + platformServer.registerMBean(getThreadMXBean(), + new ObjectName(THREAD_MXBEAN_NAME)); + platformServer.registerMBean(getMemoryMXBean(), + new ObjectName(MEMORY_MXBEAN_NAME)); + CompilationMXBean compBean = getCompilationMXBean(); + if (compBean != null) + platformServer.registerMBean(compBean, + new ObjectName(COMPILATION_MXBEAN_NAME)); + Iterator beans = getMemoryPoolMXBeans().iterator(); + while (beans.hasNext()) + { + MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next(); + platformServer.registerMBean(bean, + new ObjectName(MEMORY_POOL_MXBEAN_DOMAIN_TYPE + + ",name=" + + bean.getName())); + } + beans = getMemoryManagerMXBeans().iterator(); + while (beans.hasNext()) + { + MemoryManagerMXBean bean = (MemoryManagerMXBean) beans.next(); + platformServer.registerMBean(bean, + new ObjectName(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE + + ",name=" + + bean.getName())); + } + beans = getGarbageCollectorMXBeans().iterator(); + while (beans.hasNext()) + { + GarbageCollectorMXBean bean = (GarbageCollectorMXBean) beans.next(); + platformServer.registerMBean(bean, + new ObjectName(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + + ",name=" + + bean.getName())); + } + platformServer.registerMBean(LogManager.getLoggingMXBean(), + new ObjectName(LogManager.LOGGING_MXBEAN_NAME)); + } + catch (InstanceAlreadyExistsException e) + { + throw (Error) + (new InternalError("One of the management beans is " + + "already registered.").initCause(e)); + } + catch (MBeanRegistrationException e) + { + throw (Error) + (new InternalError("One of the management beans' preRegister " + + "methods threw an exception.").initCause(e)); + } + catch (NotCompliantMBeanException e) + { + throw (Error) + (new InternalError("One of the management beans is " + + "not compliant.").initCause(e)); + } + catch (MalformedObjectNameException e) + { + throw (Error) + (new InternalError("The object name of a management bean is " + + "not compliant.").initCause(e)); + } } return platformServer; } @@ -600,51 +600,51 @@ public class ManagementFactory * @throws IOException if the connection throws one. */ public static T newPlatformMXBeanProxy(MBeanServerConnection connection, - String mxbeanName, - Class mxbeanInterface) + String mxbeanName, + Class mxbeanInterface) throws IOException { if (!(mxbeanName.equals(CLASS_LOADING_MXBEAN_NAME) || - mxbeanName.equals(COMPILATION_MXBEAN_NAME) || - mxbeanName.startsWith(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE) || - mxbeanName.startsWith(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE) || - mxbeanName.equals(MEMORY_MXBEAN_NAME) || - mxbeanName.startsWith(MEMORY_POOL_MXBEAN_DOMAIN_TYPE) || - mxbeanName.equals(OPERATING_SYSTEM_MXBEAN_NAME) || - mxbeanName.equals(RUNTIME_MXBEAN_NAME) || - mxbeanName.equals(THREAD_MXBEAN_NAME))) + mxbeanName.equals(COMPILATION_MXBEAN_NAME) || + mxbeanName.startsWith(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE) || + mxbeanName.startsWith(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE) || + mxbeanName.equals(MEMORY_MXBEAN_NAME) || + mxbeanName.startsWith(MEMORY_POOL_MXBEAN_DOMAIN_TYPE) || + mxbeanName.equals(OPERATING_SYSTEM_MXBEAN_NAME) || + mxbeanName.equals(RUNTIME_MXBEAN_NAME) || + mxbeanName.equals(THREAD_MXBEAN_NAME))) { - throw new IllegalArgumentException("The named bean, " + mxbeanName + - ", is not a platform name."); + throw new IllegalArgumentException("The named bean, " + mxbeanName + + ", is not a platform name."); } if ((mxbeanName.equals(CLASS_LOADING_MXBEAN_NAME) && - mxbeanInterface != ClassLoadingMXBean.class) || - (mxbeanName.equals(COMPILATION_MXBEAN_NAME) && - mxbeanInterface != CompilationMXBean.class) || - (mxbeanName.startsWith(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE) && - mxbeanInterface != GarbageCollectorMXBean.class) || - (mxbeanName.startsWith(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE) && - mxbeanInterface != MemoryManagerMXBean.class) || - (mxbeanName.equals(MEMORY_MXBEAN_NAME) && - mxbeanInterface != MemoryMXBean.class) || - (mxbeanName.startsWith(MEMORY_POOL_MXBEAN_DOMAIN_TYPE) && - mxbeanInterface != MemoryPoolMXBean.class) || - (mxbeanName.equals(OPERATING_SYSTEM_MXBEAN_NAME) && - mxbeanInterface != OperatingSystemMXBean.class) || - (mxbeanName.equals(RUNTIME_MXBEAN_NAME) && - mxbeanInterface != RuntimeMXBean.class) || - (mxbeanName.equals(THREAD_MXBEAN_NAME) && - mxbeanInterface != ThreadMXBean.class)) + mxbeanInterface != ClassLoadingMXBean.class) || + (mxbeanName.equals(COMPILATION_MXBEAN_NAME) && + mxbeanInterface != CompilationMXBean.class) || + (mxbeanName.startsWith(GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE) && + mxbeanInterface != GarbageCollectorMXBean.class) || + (mxbeanName.startsWith(MEMORY_MANAGER_MXBEAN_DOMAIN_TYPE) && + mxbeanInterface != MemoryManagerMXBean.class) || + (mxbeanName.equals(MEMORY_MXBEAN_NAME) && + mxbeanInterface != MemoryMXBean.class) || + (mxbeanName.startsWith(MEMORY_POOL_MXBEAN_DOMAIN_TYPE) && + mxbeanInterface != MemoryPoolMXBean.class) || + (mxbeanName.equals(OPERATING_SYSTEM_MXBEAN_NAME) && + mxbeanInterface != OperatingSystemMXBean.class) || + (mxbeanName.equals(RUNTIME_MXBEAN_NAME) && + mxbeanInterface != RuntimeMXBean.class) || + (mxbeanName.equals(THREAD_MXBEAN_NAME) && + mxbeanInterface != ThreadMXBean.class)) throw new IllegalArgumentException("The interface, " + mxbeanInterface + - ", does not match the bean, " + mxbeanName); + ", does not match the bean, " + mxbeanName); ObjectName bean; try { - bean = new ObjectName(mxbeanName); + bean = new ObjectName(mxbeanName); } catch (MalformedObjectNameException e) { - throw new IllegalArgumentException("The named bean is invalid."); + throw new IllegalArgumentException("The named bean is invalid."); } if (!(connection.isRegistered(bean))) throw new IllegalArgumentException("The bean is not registered on this connection."); @@ -654,8 +654,8 @@ public class ManagementFactory else interfaces = new Class[] { mxbeanInterface }; return (T) Proxy.newProxyInstance(mxbeanInterface.getClassLoader(), - interfaces, - new ManagementInvocationHandler(connection, bean)); + interfaces, + new ManagementInvocationHandler(connection, bean)); } /** @@ -688,7 +688,7 @@ public class ManagementFactory * @param bean the bean to proxy. */ public ManagementInvocationHandler(MBeanServerConnection conn, - ObjectName bean) + ObjectName bean) throws IOException { this.conn = conn; @@ -715,46 +715,46 @@ public class ManagementFactory { String name = method.getName(); if (name.equals("toString")) - return "Proxy for " + bean + " using " + conn; + return "Proxy for " + bean + " using " + conn; if (name.equals("addNotificationListener")) - { - conn.addNotificationListener(bean, - (NotificationListener) args[0], - (NotificationFilter) args[1], - args[2]); - return null; - } + { + conn.addNotificationListener(bean, + (NotificationListener) args[0], + (NotificationFilter) args[1], + args[2]); + return null; + } if (name.equals("getNotificationInfo")) - return conn.getMBeanInfo(bean).getNotifications(); + return conn.getMBeanInfo(bean).getNotifications(); if (name.equals("removeNotificationListener")) - { - if (args.length == 1) - conn.removeNotificationListener(bean, - (NotificationListener) - args[0]); - else - conn.removeNotificationListener(bean, - (NotificationListener) - args[0], - (NotificationFilter) - args[1], args[2]); - return null; - } + { + if (args.length == 1) + conn.removeNotificationListener(bean, + (NotificationListener) + args[0]); + else + conn.removeNotificationListener(bean, + (NotificationListener) + args[0], + (NotificationFilter) + args[1], args[2]); + return null; + } String attrib = null; if (name.startsWith("get")) - attrib = name.substring(3); + attrib = name.substring(3); else if (name.startsWith("is")) - attrib = name.substring(2); + attrib = name.substring(2); if (attrib != null) - return translate(conn.getAttribute(bean, attrib), method); + return translate(conn.getAttribute(bean, attrib), method); else if (name.startsWith("set")) - { - conn.setAttribute(bean, new Attribute(name.substring(3), - args[0])); - return null; - } + { + conn.setAttribute(bean, new Attribute(name.substring(3), + args[0])); + return null; + } else - return translate(conn.invoke(bean, name, args, null), method); + return translate(conn.invoke(bean, name, args, null), method); } /** @@ -772,44 +772,44 @@ public class ManagementFactory { Class returnType = method.getReturnType(); if (returnType.isEnum()) - { - String ename = (String) otype; - Enum[] constants = (Enum[]) returnType.getEnumConstants(); - for (Enum c : constants) - if (c.name().equals(ename)) - return c; - } + { + String ename = (String) otype; + Enum[] constants = (Enum[]) returnType.getEnumConstants(); + for (Enum c : constants) + if (c.name().equals(ename)) + return c; + } if (List.class.isAssignableFrom(returnType)) - { - Object[] elems = (Object[]) otype; - List l = new ArrayList(elems.length); - for (Object elem : elems) - l.add(elem); - return l; - } + { + Object[] elems = (Object[]) otype; + List l = new ArrayList(elems.length); + for (Object elem : elems) + l.add(elem); + return l; + } if (Map.class.isAssignableFrom(returnType)) - { - TabularData data = (TabularData) otype; - Map m = new HashMap(data.size()); - for (Object val : data.values()) - { - CompositeData vals = (CompositeData) val; - m.put(vals.get("key"), vals.get("value")); - } - return m; - } + { + TabularData data = (TabularData) otype; + Map m = new HashMap(data.size()); + for (Object val : data.values()) + { + CompositeData vals = (CompositeData) val; + m.put(vals.get("key"), vals.get("value")); + } + return m; + } try - { - Method m = returnType.getMethod("from", - new Class[] - { CompositeData.class }); - return m.invoke(null, (CompositeData) otype); - } + { + Method m = returnType.getMethod("from", + new Class[] + { CompositeData.class }); + return m.invoke(null, (CompositeData) otype); + } catch (NoSuchMethodException e) - { - /* Ignored; we expect this if this - isn't a from(CompositeData) class */ - } + { + /* Ignored; we expect this if this + isn't a from(CompositeData) class */ + } return otype; } diff --git a/libjava/classpath/java/lang/management/ManagementPermission.java b/libjava/classpath/java/lang/management/ManagementPermission.java index 0e6bd06126f..73794571cbb 100644 --- a/libjava/classpath/java/lang/management/ManagementPermission.java +++ b/libjava/classpath/java/lang/management/ManagementPermission.java @@ -71,7 +71,7 @@ import java.security.BasicPermission; * usage limits changed. Malicious code could use * this to alter the behaviour of the system.

          • *
        - * + * * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 */ @@ -127,6 +127,5 @@ public final class ManagementPermission if (!(actions == null || actions.equals(""))) throw new IllegalArgumentException("Invalid actions."); } - -} +} diff --git a/libjava/classpath/java/lang/management/MemoryMXBean.java b/libjava/classpath/java/lang/management/MemoryMXBean.java index 4d9e5ff1cfd..acf0e6795cb 100644 --- a/libjava/classpath/java/lang/management/MemoryMXBean.java +++ b/libjava/classpath/java/lang/management/MemoryMXBean.java @@ -39,7 +39,7 @@ package java.lang.management; /** *

        - * Provides access to information about the memory used + * Provides access to information about the memory used * by the virtual machine. An instance of this bean is * obtained by calling * {@link ManagementFactory#getMemoryMXBean()}. @@ -104,7 +104,7 @@ package java.lang.management; */ public interface MemoryMXBean { - + /** * Instigates a garbage collection cycle. The virtual * machine's garbage collector should make the best @@ -135,7 +135,7 @@ public interface MemoryMXBean * memory. */ MemoryUsage getNonHeapMemoryUsage(); - + /** * Returns the number of objects which are waiting to * be garbage collected (finalized). An object is diff --git a/libjava/classpath/java/lang/management/MemoryManagerMXBean.java b/libjava/classpath/java/lang/management/MemoryManagerMXBean.java index 9210705394e..1b10e998f70 100644 --- a/libjava/classpath/java/lang/management/MemoryManagerMXBean.java +++ b/libjava/classpath/java/lang/management/MemoryManagerMXBean.java @@ -49,10 +49,10 @@ package java.lang.management; public interface MemoryManagerMXBean { - /** + /** * Returns an array containing the names of the memory pools * this memory manager manages. - * + * * @return an array containing the name of each memory pool * this manager is responsible for. */ diff --git a/libjava/classpath/java/lang/management/MemoryNotificationInfo.java b/libjava/classpath/java/lang/management/MemoryNotificationInfo.java index adb38b06fd7..85856e0583d 100644 --- a/libjava/classpath/java/lang/management/MemoryNotificationInfo.java +++ b/libjava/classpath/java/lang/management/MemoryNotificationInfo.java @@ -74,7 +74,7 @@ import javax.management.openmbean.SimpleType; * {@link #from(javax.management.openmbean.CompositeData)} method may be * used to unwrap the value and obtain an instance of this class. *

        - * + * * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 */ @@ -87,7 +87,7 @@ public class MemoryNotificationInfo * threshold again before another notification is emitted. The value is * java.management.memory.threshold.exceeded. */ - public static final String MEMORY_THRESHOLD_EXCEEDED = + public static final String MEMORY_THRESHOLD_EXCEEDED = "java.management.memory.threshold.exceeded"; /** @@ -153,9 +153,9 @@ public class MemoryNotificationInfo * committedjava.lang.Long * maxjava.lang.Long * - * + * * @param data the composite data structure to take values from. - * @return a new instance containing the values from the + * @return a new instance containing the values from the * composite data structure, or null * if the data structure was also null. * @throws IllegalArgumentException if the composite data structure @@ -172,8 +172,8 @@ public class MemoryNotificationInfo ThreadInfo.checkAttribute(type, "count", SimpleType.LONG); MemoryUsage usage = MemoryUsage.from((CompositeData) data.get("usage")); return new MemoryNotificationInfo(((String) data.get("poolName")), - usage, - ((Long) data.get("count")).longValue()); + usage, + ((Long) data.get("count")).longValue()); } /** @@ -212,4 +212,3 @@ public class MemoryNotificationInfo } } - diff --git a/libjava/classpath/java/lang/management/MemoryPoolMXBean.java b/libjava/classpath/java/lang/management/MemoryPoolMXBean.java index 36a8236dc01..9729093b262 100644 --- a/libjava/classpath/java/lang/management/MemoryPoolMXBean.java +++ b/libjava/classpath/java/lang/management/MemoryPoolMXBean.java @@ -209,7 +209,7 @@ public interface MemoryPoolMXBean long getUsageThresholdCount(); /** - * Returns true if the collection usage level is equal to + * Returns true if the collection usage level is equal to * or greater than the collection usage threshold. * * @return true if the collection usage threshold has been @@ -236,7 +236,7 @@ public interface MemoryPoolMXBean boolean isCollectionUsageThresholdSupported(); /** - * Returns true if the usage level is equal to + * Returns true if the usage level is equal to * or greater than the usage threshold. * * @return true if the usage threshold has been @@ -260,7 +260,7 @@ public interface MemoryPoolMXBean * @see #setUsageThreshold(long) */ boolean isUsageThresholdSupported(); - + /** * Returns true if this memory pool is still valid. A memory pool * becomes invalid when it is removed by the virtual machine and diff --git a/libjava/classpath/java/lang/management/MemoryType.java b/libjava/classpath/java/lang/management/MemoryType.java index 4422b329836..c864d540758 100644 --- a/libjava/classpath/java/lang/management/MemoryType.java +++ b/libjava/classpath/java/lang/management/MemoryType.java @@ -48,4 +48,3 @@ public enum MemoryType { HEAP, NON_HEAP; } - diff --git a/libjava/classpath/java/lang/management/MemoryUsage.java b/libjava/classpath/java/lang/management/MemoryUsage.java index d851da9a72e..42aef3cc5f3 100644 --- a/libjava/classpath/java/lang/management/MemoryUsage.java +++ b/libjava/classpath/java/lang/management/MemoryUsage.java @@ -119,29 +119,29 @@ public class MemoryUsage * above. */ public MemoryUsage(long init, long used, long committed, - long maximum) + long maximum) { if (init < -1) throw new IllegalArgumentException("Initial value of " - + init + " is too small."); + + init + " is too small."); if (used < 0) throw new IllegalArgumentException("Used value of " - + used + " is too small."); + + used + " is too small."); if (committed < 0) throw new IllegalArgumentException("Committed value of " - + committed + " is too small."); + + committed + " is too small."); if (committed < used) throw new IllegalArgumentException("Committed value of " - + committed + " is below " - + used + ", the amount used."); + + committed + " is below " + + used + ", the amount used."); if (maximum < -1) throw new IllegalArgumentException("Maximum value of " - + maximum + " is too small."); + + maximum + " is too small."); if (maximum != -1 && maximum < committed) - throw new IllegalArgumentException("Maximum value of " - + maximum + " is below " - + committed + ", the amount " - + "committed."); + throw new IllegalArgumentException("Maximum value of " + + maximum + " is below " + + committed + ", the amount " + + "committed."); this.init = init; this.used = used; this.committed = committed; @@ -165,9 +165,9 @@ public class MemoryUsage *

        * All should have the type, java.lang.Long. *

        - * + * * @param data the composite data structure to take values from. - * @return a new instance containing the values from the + * @return a new instance containing the values from the * composite data structure, or null * if the data structure was also null. * @throws IllegalArgumentException if the composite data structure @@ -185,9 +185,9 @@ public class MemoryUsage ThreadInfo.checkAttribute(type, "Committed", SimpleType.LONG); ThreadInfo.checkAttribute(type, "Max", SimpleType.LONG); return new MemoryUsage(((Long) data.get("Init")).longValue(), - ((Long) data.get("Used")).longValue(), - ((Long) data.get("Committed")).longValue(), - ((Long) data.get("Max")).longValue()); + ((Long) data.get("Used")).longValue(), + ((Long) data.get("Committed")).longValue(), + ((Long) data.get("Max")).longValue()); } /** @@ -217,7 +217,7 @@ public class MemoryUsage /** * Returns the maximum amount of memory available for this - * pool (in bytes). This amount is not guaranteed to + * pool (in bytes). This amount is not guaranteed to * actually be usable. This method may return -1, if the * value is undefined. * @@ -262,4 +262,3 @@ public class MemoryUsage } } - diff --git a/libjava/classpath/java/lang/management/MonitorInfo.java b/libjava/classpath/java/lang/management/MonitorInfo.java index cba73a80de4..fd72337161d 100644 --- a/libjava/classpath/java/lang/management/MonitorInfo.java +++ b/libjava/classpath/java/lang/management/MonitorInfo.java @@ -82,16 +82,16 @@ public class MonitorInfo * < 0. */ public MonitorInfo(String className, int identityHashCode, int stackDepth, - StackTraceElement stackFrame) + StackTraceElement stackFrame) { super(className, identityHashCode); if (stackFrame == null && stackDepth >= 0) throw new IllegalArgumentException("The stack frame is null, but the " + - "stack depth is greater than or equal " + - "to zero."); + "stack depth is greater than or equal " + + "to zero."); if (stackFrame != null && stackDepth < 0) throw new IllegalArgumentException("The stack frame is not null, but the " + - "stack depth is less than zero."); + "stack depth is less than zero."); this.stackDepth = stackDepth; this.stackFrame = stackFrame; } @@ -123,9 +123,9 @@ public class MonitorInfo * lineNumberjava.lang.Integer * nativeMethodjava.lang.Boolean * - * + * * @param data the composite data structure to take values from. - * @return a new instance containing the values from the + * @return a new instance containing the values from the * composite data structure, or null * if the data structure was also null. * @throws IllegalArgumentException if the composite data structure @@ -141,15 +141,15 @@ public class MonitorInfo ThreadInfo.checkAttribute(type, "IdentityHashCode", SimpleType.INTEGER); ThreadInfo.checkAttribute(type, "LockedStackDepth", SimpleType.INTEGER); ThreadInfo.checkAttribute(type, "LockedStackFrame", - ThreadInfo.getStackTraceType()); + ThreadInfo.getStackTraceType()); CompositeData frame = (CompositeData) data.get("LockedStackFrame"); return new MonitorInfo((String) data.get("ClassName"), - (Integer) data.get("IdentityHashCode"), - (Integer) data.get("LockedStackDepth"), - new StackTraceElement((String) frame.get("ClassName"), - (String) frame.get("MethodName"), - (String) frame.get("FileName"), - (Integer) frame.get("LineNumber"))); + (Integer) data.get("IdentityHashCode"), + (Integer) data.get("LockedStackDepth"), + new StackTraceElement((String) frame.get("ClassName"), + (String) frame.get("MethodName"), + (String) frame.get("FileName"), + (Integer) frame.get("LineNumber"))); } /** diff --git a/libjava/classpath/java/lang/management/OperatingSystemMXBean.java b/libjava/classpath/java/lang/management/OperatingSystemMXBean.java index ed38285a560..dcc963ef16b 100644 --- a/libjava/classpath/java/lang/management/OperatingSystemMXBean.java +++ b/libjava/classpath/java/lang/management/OperatingSystemMXBean.java @@ -89,7 +89,7 @@ public interface OperatingSystemMXBean /** * Returns the system load average for the last minute, or -1 * if this is unavailable. The availability and calculation - * of the load average is system-dependent, but is usually + * of the load average is system-dependent, but is usually * a damped time-dependent average obtained by monitoring the * number of queued and running processes. It is expected * that this method will be called frequently to monitor the diff --git a/libjava/classpath/java/lang/management/RuntimeMXBean.java b/libjava/classpath/java/lang/management/RuntimeMXBean.java index a2931d12783..1e2aa017f6d 100644 --- a/libjava/classpath/java/lang/management/RuntimeMXBean.java +++ b/libjava/classpath/java/lang/management/RuntimeMXBean.java @@ -56,7 +56,7 @@ public interface RuntimeMXBean * Returns the boot classpath used by the virtual machine. This * value follows the standard path syntax used by the underlying * operating system (e.g. directories separated by ':' on UNIX - * or ';' on Windows). + * or ';' on Windows). *

        *

        * Supplying this value is optional. Users should check the @@ -81,7 +81,7 @@ public interface RuntimeMXBean * property via {@link System#getProperty(String)}. This value * follows the standard path syntax used by the underlying operating * system (e.g. directories separated by ':' on UNIX or ';' on - * Windows). + * Windows). * * @return the classpath used by the system class loader. * @throws SecurityException if a security manager exists which @@ -114,7 +114,7 @@ public interface RuntimeMXBean * {@link System#getProperty(String)}. This value follows the * standard path syntax used by the underlying operating * system (e.g. directories separated by ':' on UNIX or ';' on - * Windows). + * Windows). * * @return the library path. * @throws SecurityException if a security manager exists which @@ -142,7 +142,7 @@ public interface RuntimeMXBean * same virtual machine (for example, it might include * the process identifier or the host name of the machine * on which it is running). The intention is that this - * name refers to the precise entity that the other data + * name refers to the precise entity that the other data * supplied by this bean refers to, rather than the VM * in general. * @@ -154,7 +154,7 @@ public interface RuntimeMXBean * Returns the specification name of the virtual machine. * This is equivalent to obtaining the * java.vm.specification.name property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the specification name of the VM. * @throws SecurityException if a security manager exists which @@ -169,7 +169,7 @@ public interface RuntimeMXBean * Returns the specification vendor of the virtual machine. * This is equivalent to obtaining the * java.vm.specification.vendor property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the specification vendor of the VM. * @throws SecurityException if a security manager exists which @@ -184,7 +184,7 @@ public interface RuntimeMXBean * Returns the specification version of the virtual machine. * This is equivalent to obtaining the * java.vm.specification.version property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the specification version of the VM. * @throws SecurityException if a security manager exists which @@ -198,7 +198,7 @@ public interface RuntimeMXBean /** * Returns the approximate start time of the virtual machine * in milliseconds. - * + * * @return the start time of the virtual machine. */ long getStartTime(); @@ -216,7 +216,7 @@ public interface RuntimeMXBean /** * Returns the uptime of the virtual machine in milliseconds. - * + * * @return the uptime of the virtual machine. */ long getUptime(); @@ -225,7 +225,7 @@ public interface RuntimeMXBean * Returns the implementation name of the virtual machine. * This is equivalent to obtaining the * java.vm.name property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the implementation name of the VM. * @throws SecurityException if a security manager exists which @@ -240,7 +240,7 @@ public interface RuntimeMXBean * Returns the implementation vendor of the virtual machine. * This is equivalent to obtaining the * java.vm.vendor property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the implementation vendor of the VM. * @throws SecurityException if a security manager exists which @@ -255,7 +255,7 @@ public interface RuntimeMXBean * Returns the implementation version of the virtual machine. * This is equivalent to obtaining the * java.vm.version property via - * {@link System#getProperty(String)}. + * {@link System#getProperty(String)}. * * @return the implementation version of the VM. * @throws SecurityException if a security manager exists which diff --git a/libjava/classpath/java/lang/management/ThreadInfo.java b/libjava/classpath/java/lang/management/ThreadInfo.java index 5b8856d3599..a4ecc76f5b5 100644 --- a/libjava/classpath/java/lang/management/ThreadInfo.java +++ b/libjava/classpath/java/lang/management/ThreadInfo.java @@ -211,7 +211,7 @@ public class ThreadInfo * lock, or -1 if it doesn't have an owner * (only used if blocked) * @param lockOwnerName the name of the thread which owns the monitor - * lock, or null if it doesn't have an + * lock, or null if it doesn't have an * owner (only used if blocked) * @param waitedCount the number of times the thread has been in a * waiting state. @@ -227,16 +227,16 @@ public class ThreadInfo * by the thread. * @param lockedSynchronizers an array of {@link LockInfo} objects * representing locks held on ownable - * synchronizers by the thread. + * synchronizers by the thread. * * @since 1.6 */ private ThreadInfo(long threadId, String threadName, Thread.State threadState, - long blockedCount, long blockedTime, String lockName, - long lockOwnerId, String lockOwnerName, long waitedCount, - long waitedTime, boolean isInNative, boolean isSuspended, - StackTraceElement[] trace, MonitorInfo[] lockedMonitors, - LockInfo[] lockedSynchronizers) + long blockedCount, long blockedTime, String lockName, + long lockOwnerId, String lockOwnerName, long waitedCount, + long waitedTime, boolean isInNative, boolean isSuspended, + StackTraceElement[] trace, MonitorInfo[] lockedMonitors, + LockInfo[] lockedSynchronizers) { this.threadId = threadId; this.threadName = threadName; @@ -266,16 +266,16 @@ public class ThreadInfo * or of the wrong type. */ static void checkAttribute(CompositeType ctype, String name, - OpenType type) + OpenType type) throws IllegalArgumentException { OpenType foundType = ctype.getType(name); if (foundType == null) throw new IllegalArgumentException("Could not find a field named " + - name); + name); if (!(foundType.equals(type))) throw new IllegalArgumentException("Field " + name + " is not of " + - "type " + type.getClassName()); + "type " + type.getClassName()); } /** @@ -288,31 +288,31 @@ public class ThreadInfo { if (seType == null) try - { - seType = new CompositeType(StackTraceElement.class.getName(), - "An element of a stack trace", - new String[] { "className", "methodName", - "fileName", "lineNumber", - "nativeMethod" - }, - new String[] { "Name of the class", - "Name of the method", - "Name of the source code file", - "Line number", - "True if this is a native method" - }, - new OpenType[] { - SimpleType.STRING, SimpleType.STRING, - SimpleType.STRING, SimpleType.INTEGER, - SimpleType.BOOLEAN - }); - } + { + seType = new CompositeType(StackTraceElement.class.getName(), + "An element of a stack trace", + new String[] { "className", "methodName", + "fileName", "lineNumber", + "nativeMethod" + }, + new String[] { "Name of the class", + "Name of the method", + "Name of the source code file", + "Line number", + "True if this is a native method" + }, + new OpenType[] { + SimpleType.STRING, SimpleType.STRING, + SimpleType.STRING, SimpleType.INTEGER, + SimpleType.BOOLEAN + }); + } catch (OpenDataException e) - { - throw new IllegalStateException("Something went wrong in creating " + - "the composite data type for the " + - "stack trace element.", e); - } + { + throw new IllegalStateException("Something went wrong in creating " + + "the composite data type for the " + + "stack trace element.", e); + } return seType; } @@ -352,9 +352,9 @@ public class ThreadInfo * lineNumberjava.lang.Integer * nativeMethodjava.lang.Boolean * - * + * * @param data the composite data structure to take values from. - * @return a new instance containing the values from the + * @return a new instance containing the values from the * composite data structure, or null * if the data structure was also null. * @throws IllegalArgumentException if the composite data structure @@ -380,119 +380,119 @@ public class ThreadInfo checkAttribute(type, "LockOwnerName", SimpleType.STRING); try { - checkAttribute(type, "StackTrace", - new ArrayType(1, getStackTraceType())); + checkAttribute(type, "StackTrace", + new ArrayType(1, getStackTraceType())); } catch (OpenDataException e) { - throw new IllegalStateException("Something went wrong in creating " + - "the array for the stack trace element.", - e); + throw new IllegalStateException("Something went wrong in creating " + + "the array for the stack trace element.", + e); } OpenType foundType = type.getType("LockedMonitors"); if (foundType != null) try - { - CompositeType mType = new CompositeType(MonitorInfo.class.getName(), - "Information on a object monitor lock", - new String[] { "ClassName", - "IdentityHashCode", - "LockedStackDepth", - "LockedStackFrame" - }, - new String[] { "Name of the class", - "Identity hash code " + - "of the class", - "Stack depth at time " + - "of lock", - "Stack frame at time " + - "of lock", - }, - new OpenType[] { - SimpleType.STRING, SimpleType.INTEGER, - SimpleType.INTEGER, getStackTraceType() - }); - if (!(foundType.equals(new ArrayType(1, mType)))) - throw new IllegalArgumentException("Field LockedMonitors is not of " + - "type " + mType.getClassName()); - } + { + CompositeType mType = new CompositeType(MonitorInfo.class.getName(), + "Information on a object monitor lock", + new String[] { "ClassName", + "IdentityHashCode", + "LockedStackDepth", + "LockedStackFrame" + }, + new String[] { "Name of the class", + "Identity hash code " + + "of the class", + "Stack depth at time " + + "of lock", + "Stack frame at time " + + "of lock", + }, + new OpenType[] { + SimpleType.STRING, SimpleType.INTEGER, + SimpleType.INTEGER, getStackTraceType() + }); + if (!(foundType.equals(new ArrayType(1, mType)))) + throw new IllegalArgumentException("Field LockedMonitors is not of " + + "type " + mType.getClassName()); + } catch (OpenDataException e) { - throw new IllegalStateException("Something went wrong in creating " + - "the composite data type for the " + - "object monitor information array.", e); + throw new IllegalStateException("Something went wrong in creating " + + "the composite data type for the " + + "object monitor information array.", e); } foundType = type.getType("LockedSynchronizers"); if (foundType != null) try - { - CompositeType lType = new CompositeType(LockInfo.class.getName(), - "Information on a lock", - new String[] { "ClassName", - "IdentityHashCode" - }, - new String[] { "Name of the class", - "Identity hash code " + - "of the class" - }, - new OpenType[] { - SimpleType.STRING, SimpleType.INTEGER - }); - if (!(foundType.equals(new ArrayType(1, lType)))) - throw new IllegalArgumentException("Field LockedSynchronizers is not of " + - "type " + lType.getClassName()); - } + { + CompositeType lType = new CompositeType(LockInfo.class.getName(), + "Information on a lock", + new String[] { "ClassName", + "IdentityHashCode" + }, + new String[] { "Name of the class", + "Identity hash code " + + "of the class" + }, + new OpenType[] { + SimpleType.STRING, SimpleType.INTEGER + }); + if (!(foundType.equals(new ArrayType(1, lType)))) + throw new IllegalArgumentException("Field LockedSynchronizers is not of " + + "type " + lType.getClassName()); + } catch (OpenDataException e) { - throw new IllegalStateException("Something went wrong in creating " + - "the composite data type for the " + - "ownable synchronizerinformation array.", e); + throw new IllegalStateException("Something went wrong in creating " + + "the composite data type for the " + + "ownable synchronizerinformation array.", e); } CompositeData[] dTraces = (CompositeData[]) data.get("StackTrace"); StackTraceElement[] traces = new StackTraceElement[dTraces.length]; for (int a = 0; a < dTraces.length; ++a) - /* FIXME: We can't use the boolean as there is no available - constructor. */ - traces[a] = - new StackTraceElement((String) dTraces[a].get("ClassName"), - (String) dTraces[a].get("MethodName"), - (String) dTraces[a].get("FileName"), - ((Integer) - dTraces[a].get("LineNumber")).intValue()); + /* FIXME: We can't use the boolean as there is no available + constructor. */ + traces[a] = + new StackTraceElement((String) dTraces[a].get("ClassName"), + (String) dTraces[a].get("MethodName"), + (String) dTraces[a].get("FileName"), + ((Integer) + dTraces[a].get("LineNumber")).intValue()); MonitorInfo[] mInfo; if (data.containsKey("LockedMonitors")) { - CompositeData[] dmInfos = (CompositeData[]) data.get("LockedMonitors"); - mInfo = new MonitorInfo[dmInfos.length]; - for (int a = 0; a < dmInfos.length; ++a) - mInfo[a] = MonitorInfo.from(dmInfos[a]); + CompositeData[] dmInfos = (CompositeData[]) data.get("LockedMonitors"); + mInfo = new MonitorInfo[dmInfos.length]; + for (int a = 0; a < dmInfos.length; ++a) + mInfo[a] = MonitorInfo.from(dmInfos[a]); } else mInfo = new MonitorInfo[]{}; LockInfo[] lInfo; if (data.containsKey("LockedSynchronizers")) { - CompositeData[] dlInfos = (CompositeData[]) data.get("LockedSynchronizers"); - lInfo = new LockInfo[dlInfos.length]; - for (int a = 0; a < dlInfos.length; ++a) - lInfo[a] = new LockInfo((String) dlInfos[a].get("ClassName"), - (Integer) dlInfos[a].get("IdentityHashCode")); + CompositeData[] dlInfos = (CompositeData[]) data.get("LockedSynchronizers"); + lInfo = new LockInfo[dlInfos.length]; + for (int a = 0; a < dlInfos.length; ++a) + lInfo[a] = new LockInfo((String) dlInfos[a].get("ClassName"), + (Integer) dlInfos[a].get("IdentityHashCode")); } else lInfo = new LockInfo[]{}; return new ThreadInfo(((Long) data.get("ThreadId")).longValue(), - (String) data.get("ThreadName"), - Thread.State.valueOf((String) data.get("ThreadState")), - ((Long) data.get("BlockedCount")).longValue(), - ((Long) data.get("BlockedTime")).longValue(), - (String) data.get("LockName"), - ((Long) data.get("LockOwnerId")).longValue(), - (String) data.get("LockOwnerName"), - ((Long) data.get("WaitedCount")).longValue(), - ((Long) data.get("WaitedTime")).longValue(), - ((Boolean) data.get("InNative")).booleanValue(), - ((Boolean) data.get("Suspended")).booleanValue(), - traces, mInfo, lInfo); + (String) data.get("ThreadName"), + Thread.State.valueOf((String) data.get("ThreadState")), + ((Long) data.get("BlockedCount")).longValue(), + ((Long) data.get("BlockedTime")).longValue(), + (String) data.get("LockName"), + ((Long) data.get("LockOwnerId")).longValue(), + (String) data.get("LockOwnerName"), + ((Long) data.get("WaitedCount")).longValue(), + ((Long) data.get("WaitedTime")).longValue(), + ((Boolean) data.get("InNative")).booleanValue(), + ((Boolean) data.get("Suspended")).booleanValue(), + traces, mInfo, lInfo); } /** @@ -528,7 +528,7 @@ public class ThreadInfo * for thread contention monitoring and for this support * to be enabled. *

        - * + * * @return the accumulated time (in milliseconds) that this * thread has spent in the blocked state, since * thread contention monitoring was enabled, or -1 @@ -601,7 +601,7 @@ public class ThreadInfo * The lock is the return value of * {@link java.util.concurrent.locks.LockSupport#getBlocker()}. * - * + * * @return a {@link LockInfo} object representing the lock on * which the thread is blocked, or null if * the thread isn't blocked. @@ -613,7 +613,7 @@ public class ThreadInfo String lockName = getLockName(); int at = lockName.indexOf('@'); return new LockInfo(lockName.substring(0, at), - Integer.decode(lockName.substring(at + 1))); + Integer.decode(lockName.substring(at + 1))); } /** @@ -655,7 +655,7 @@ public class ThreadInfo * monitor lock this thread is waiting for. -1 is returned * if either this thread is not blocked, or the lock is * not held by any other thread. - * + * * @return the thread identifier of thread holding the lock * this thread is waiting for, or -1 if the thread * is not blocked or the lock is not held by another @@ -673,7 +673,7 @@ public class ThreadInfo * monitor lock this thread is waiting for. null * is returned if either this thread is not blocked, * or the lock is not held by any other thread. - * + * * @return the thread identifier of thread holding the lock * this thread is waiting for, or null * if the thread is not blocked or the lock is not @@ -701,7 +701,7 @@ public class ThreadInfo * stack trace information for a thread. In these * cases, an empty array will also be returned. *

        - * + * * @return an array of {@link java.lang.StackTraceElement}s * representing the trace of this thread. */ @@ -742,16 +742,16 @@ public class ThreadInfo { return threadState; } - + /** * Returns the number of times this thread has been - * in the {@link java.lang.Thread.State#WAITING} + * in the {@link java.lang.Thread.State#WAITING} * or {@link java.lang.Thread.State#TIMED_WAITING} state. * A thread enters one of these states when it is waiting * due to a call to {@link java.lang.Object.wait()}, * {@link java.lang.Object.join()} or * {@link java.lang.concurrent.locks.LockSupport.park()}, - * either with an infinite or timed delay, respectively. + * either with an infinite or timed delay, respectively. * * @return the number of times this thread has been waiting. */ @@ -771,14 +771,14 @@ public class ThreadInfo * due to a call to {@link java.lang.Object.wait()}, * {@link java.lang.Object.join()} or * {@link java.lang.concurrent.locks.LockSupport.park()}, - * either with an infinite or timed delay, respectively. + * either with an infinite or timed delay, respectively. *

        *

        * Use of this method requires virtual machine support * for thread contention monitoring and for this support * to be enabled. *

        - * + * * @return the accumulated time (in milliseconds) that this * thread has spent in one of the waiting states, since * thread contention monitoring was enabled, or -1 @@ -849,14 +849,14 @@ public class ThreadInfo public String toString() { return getClass().getName() + - "[id=" + threadId + + "[id=" + threadId + ", name=" + threadName + ", state=" + threadState + ", blockedCount=" + blockedCount + ", waitedCount=" + waitedCount + - ", isInNative=" + isInNative + + ", isInNative=" + isInNative + ", isSuspended=" + isSuspended + - (isThreadBlocked() ? + (isThreadBlocked() ? ", lockOwnerId=" + lockOwnerId + ", lockOwnerName=" + lockOwnerName : "") + ", lockedMonitors=" + Arrays.toString(lockedMonitors) + @@ -888,8 +888,8 @@ public class ThreadInfo private boolean isThreadBlocked() { return (threadState == Thread.State.BLOCKED || - threadState == Thread.State.WAITING || - threadState == Thread.State.TIMED_WAITING); + threadState == Thread.State.WAITING || + threadState == Thread.State.TIMED_WAITING); } - + } diff --git a/libjava/classpath/java/lang/management/ThreadMXBean.java b/libjava/classpath/java/lang/management/ThreadMXBean.java index f73075dfdc2..551c5328297 100644 --- a/libjava/classpath/java/lang/management/ThreadMXBean.java +++ b/libjava/classpath/java/lang/management/ThreadMXBean.java @@ -39,7 +39,7 @@ package java.lang.management; /** *

        - * Provides access to information about the threads + * Provides access to information about the threads * of the virtual machine. An instance of this bean is * obtained by calling * {@link ManagementFactory#getThreadMXBean()}. @@ -122,8 +122,8 @@ public interface ThreadMXBean * @see #isSynchronizerUsageSupported() */ ThreadInfo[] dumpAllThreads(boolean lockedMonitors, - boolean lockedSynchronizers); - + boolean lockedSynchronizers); + /** *

        * This method obtains a list of threads which are deadlocked @@ -140,7 +140,7 @@ public interface ThreadMXBean * then {@link #findMonitorDeadlockedThreads()} should be used in * preference to this method. *

        - * + * * @return an array of thread identifiers, corresponding to threads * which are currently in a deadlocked situation, or * null if there are no deadlocks. @@ -161,7 +161,7 @@ public interface ThreadMXBean * waiting to obtain monitor ownership. On entering a synchronized * method of an object, or re-entering it after returning from an * {@link java.lang.Object#wait()} call, a thread obtains ownership - * of the object's monitor. + * of the object's monitor. *

        *

        * Deadlocks can occur in this situation if one or more threads end up @@ -174,7 +174,7 @@ public interface ThreadMXBean * of a different object. While in that method, it then wants to * call the original synchronized method, R, called by A. Doing so * requires ownership of P, which is still held by A. Hence, it - * becomes blocked. + * becomes blocked. *

        *

        * A then finishes its sleep, becomes runnable, and is then allowed @@ -193,7 +193,7 @@ public interface ThreadMXBean * to include deadlocks involving ownable synchronizers, * {@link #findDeadlockedThreads()} should be used instead. *

        - * + * * @return an array of thread identifiers, corresponding to threads * which are currently in a deadlocked situation, or * null if there are no deadlocks. @@ -221,7 +221,7 @@ public interface ThreadMXBean * Returns the total number of nanoseconds of CPU time * the current thread has used. This is equivalent to calling * {@link #getThreadCpuTime()}(Thread.currentThread.getId()). - *

        + *

        *

        * Note that the value is only nanosecond-precise, and not accurate; there * is no guarantee that the difference between two values is really a @@ -248,7 +248,7 @@ public interface ThreadMXBean * the current thread has executed in user mode. This is * equivalent to calling * {@link #getThreadUserTime()}(Thread.currentThread.getId()). - *

        + *

        *

        * Note that the value is only nanosecond-precise, and not accurate; there * is no guarantee that the difference between two values is really a @@ -298,8 +298,8 @@ public interface ThreadMXBean /** *

        * Returns the total number of nanoseconds of CPU time - * the specified thread has used. - *

        + * the specified thread has used. + *

        *

        * Note that the value is only nanosecond-precise, and not accurate; there * is no guarantee that the difference between two values is really a @@ -329,7 +329,7 @@ public interface ThreadMXBean * {@link #getThreadInfo}(id, 0). If the * identifier specifies a thread which is either non-existant * or not alive, then the method returns null. - * + * * @param id the identifier of the thread to return information * on. * @return a {@link ThreadInfo} object pertaining to the specified @@ -348,11 +348,11 @@ public interface ThreadMXBean * identifier specifies a thread which is either non-existant * or not alive, then the corresponding element in the returned * array is null. - * + * * @param ids an array of thread identifiers to return information * on. * @return an array of {@link ThreadInfo} objects matching the - * specified threads. The corresponding element is + * specified threads. The corresponding element is * null if the identifier specifies * a thread that doesn't exist or is not alive. * @throws IllegalArgumentException if an identifier in the array is @@ -379,15 +379,15 @@ public interface ThreadMXBean * If an identifier specifies a thread which is either non-existant * or not alive, then the corresponding element in the returned * array is null. - * + * * @param ids an array of thread identifiers to return information * on. * @param lockedMonitors true if information on locked monitors * should be included. * @param lockedSynchronizers true if information on locked - * ownable synchronizers should be included. + * ownable synchronizers should be included. * @return an array of {@link ThreadInfo} objects matching the - * specified threads. The corresponding element is + * specified threads. The corresponding element is * null if the identifier specifies * a thread that doesn't exist or is not alive. * @throws IllegalArgumentException if an identifier in the array is @@ -407,7 +407,7 @@ public interface ThreadMXBean * @see #isSynchronizerUsageSupported() */ ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors, - boolean lockedSynchronizers); + boolean lockedSynchronizers); /** * Returns information on the specified thread with @@ -444,7 +444,7 @@ public interface ThreadMXBean * to an empty stack trace (an empty array is returned by the * appropriate {@link ThreadInfo} method). A maximum depth of * Integer.MAX_VALUE returns the full stack trace. - * + * * @param ids an array of thread identifiers to return information * on. * @param maxDepth the maximum depth of the stack trace. @@ -452,7 +452,7 @@ public interface ThreadMXBean * correspond to an empty and full stack trace * respectively. * @return an array of {@link ThreadInfo} objects matching the - * specified threads. The corresponding element is + * specified threads. The corresponding element is * null if the identifier specifies * a thread that doesn't exist or is not alive. * @throws IllegalArgumentException if an identifier in the array is @@ -466,8 +466,8 @@ public interface ThreadMXBean /** *

        * Returns the total number of nanoseconds of CPU time - * the specified thread has executed in user mode. - *

        + * the specified thread has executed in user mode. + *

        *

        * Note that the value is only nanosecond-precise, and not accurate; there * is no guarantee that the difference between two values is really a diff --git a/libjava/classpath/java/lang/ref/PhantomReference.java b/libjava/classpath/java/lang/ref/PhantomReference.java index 67e97d399cd..29215ead756 100644 --- a/libjava/classpath/java/lang/ref/PhantomReference.java +++ b/libjava/classpath/java/lang/ref/PhantomReference.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,7 +44,7 @@ package java.lang.ref; * finalized. This is the reason, why get() always * returns null. * - * @author Jochen Hoenicke + * @author Jochen Hoenicke */ public class PhantomReference extends Reference @@ -60,11 +60,11 @@ public class PhantomReference { super(referent, q); } - + /** * Returns the object, this reference refers to. * @return null, since the refered object may be - * finalized and thus not accessible. + * finalized and thus not accessible. */ public T get() { diff --git a/libjava/classpath/java/lang/ref/Reference.java b/libjava/classpath/java/lang/ref/Reference.java index ce224b891f9..37cda6f02c2 100644 --- a/libjava/classpath/java/lang/ref/Reference.java +++ b/libjava/classpath/java/lang/ref/Reference.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -89,7 +89,7 @@ public abstract class Reference * reference is not enqueued. Otherwise it points to the next * reference. The last reference on a queue will point to itself * (not to null, that value is used to mark a not enqueued - * reference). + * reference). */ volatile Reference nextOnQueue; @@ -103,7 +103,7 @@ public abstract class Reference /** * Creates a new reference that is not registered to any queue. * Since it is package private, it is not possible to overload this - * class in a different package. + * class in a different package. * @param ref the object we refer to. */ Reference(T ref) @@ -114,7 +114,7 @@ public abstract class Reference /** * Creates a reference that is registered to a queue. Since this is * package private, it is not possible to overload this class in a - * different package. + * different package. * @param ref the object we refer to. * @param q the reference queue to register on. * @exception NullPointerException if q is null. @@ -129,21 +129,21 @@ public abstract class Reference /** * Returns the object, this reference refers to. - * @return the object, this reference refers to, or null if the + * @return the object, this reference refers to, or null if the * reference was cleared. */ public T get() { synchronized (lock) { - return referent; + return referent; } } /** * Clears the reference, so that it doesn't refer to its object * anymore. For soft and weak references this is called by the - * garbage collector. For phantom references you should call + * garbage collector. For phantom references you should call * this when enqueuing the reference. */ public void clear() @@ -164,12 +164,12 @@ public abstract class Reference * Enqueue an object on a reference queue. This is normally executed * by the garbage collector. */ - public boolean enqueue() + public boolean enqueue() { ReferenceQueue q = queue; if (q != null) { - return q.enqueue(this); + return q.enqueue(this); } return false; } diff --git a/libjava/classpath/java/lang/ref/ReferenceQueue.java b/libjava/classpath/java/lang/ref/ReferenceQueue.java index 28162877905..73f62d64a84 100644 --- a/libjava/classpath/java/lang/ref/ReferenceQueue.java +++ b/libjava/classpath/java/lang/ref/ReferenceQueue.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -55,9 +55,9 @@ public class ReferenceQueue /** * This is a linked list of references. If this is null, the list is * empty. Otherwise this points to the first reference on the queue. - * The first reference will point to the next reference via the + * The first reference will point to the next reference via the * nextOnQueue field. The last reference will point to - * itself (not to null, since nextOnQueue is used to + * itself (not to null, since nextOnQueue is used to * determine if a reference is enqueued). */ private Reference first; @@ -80,15 +80,15 @@ public class ReferenceQueue * immediately. The reference will be dequeued. * * @return a reference on the queue, if there is one, - * null otherwise. + * null otherwise. */ public Reference poll() - { + { return dequeue(); } /** - * This is called by reference to enqueue itself on this queue. + * This is called by reference to enqueue itself on this queue. * @param ref the reference that should be enqueued. * @return true if successful, false if not. */ @@ -119,7 +119,7 @@ public class ReferenceQueue { if (first == null) return null; - + Reference result = first; first = (first == first.nextOnQueue) ? null : first.nextOnQueue; result.nextOnQueue = null; @@ -132,8 +132,8 @@ public class ReferenceQueue * until a reference is enqueued. * @param timeout the timeout period in milliseconds, 0 means * wait forever. - * @return the reference removed from the queue, or - * null if timeout period expired. + * @return the reference removed from the queue, or + * null if timeout period expired. * @exception InterruptedException if the wait was interrupted. */ public Reference remove(long timeout) @@ -147,13 +147,13 @@ public class ReferenceQueue return dequeue(); } - + /** * Removes a reference from the queue, blocking until a reference is * enqueued. * - * @return the reference removed from the queue. + * @return the reference removed from the queue. * @exception InterruptedException if the wait was interrupted. */ public Reference remove() diff --git a/libjava/classpath/java/lang/ref/SoftReference.java b/libjava/classpath/java/lang/ref/SoftReference.java index 077dc173ddd..269ffd0ec9e 100644 --- a/libjava/classpath/java/lang/ref/SoftReference.java +++ b/libjava/classpath/java/lang/ref/SoftReference.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ package java.lang.ref; * references it should clear. This makes a soft reference ideal for * caches.
        * - * @author Jochen Hoenicke + * @author Jochen Hoenicke */ public class SoftReference extends Reference @@ -69,15 +69,15 @@ public class SoftReference { super(referent, q); } - + /** * Returns the object, this reference refers to. - * @return the object, this reference refers to, or null if the + * @return the object, this reference refers to, or null if the * reference was cleared. */ public T get() { - /* Why is this overloaded??? + /* Why is this overloaded??? * Maybe for a kind of LRU strategy. */ return super.get(); } diff --git a/libjava/classpath/java/lang/ref/WeakReference.java b/libjava/classpath/java/lang/ref/WeakReference.java index 563563bf164..973564336a4 100644 --- a/libjava/classpath/java/lang/ref/WeakReference.java +++ b/libjava/classpath/java/lang/ref/WeakReference.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,8 +51,8 @@ package java.lang.ref; * an object is not referenced anymore, the reference will * automatically cleared, and you may remove it from the set.
        * - * @author Jochen Hoenicke - * @see java.util.WeakHashMap + * @author Jochen Hoenicke + * @see java.util.WeakHashMap */ public class WeakReference extends Reference diff --git a/libjava/classpath/java/lang/reflect/AccessibleObject.java b/libjava/classpath/java/lang/reflect/AccessibleObject.java index 328f81d7933..75676913d43 100644 --- a/libjava/classpath/java/lang/reflect/AccessibleObject.java +++ b/libjava/classpath/java/lang/reflect/AccessibleObject.java @@ -91,9 +91,9 @@ public class AccessibleObject * ReflectPermission("suppressAccessChecks").

        * * It is forbidden to set the accessibility flag to true on any constructor - * for java.lang.Class. This will result in a SecurityException. If the + * for java.lang.Class. This will result in a SecurityException. If the * SecurityException is thrown for any of the passed AccessibleObjects, - * the accessibility flag will be set on AccessibleObjects in the array prior + * the accessibility flag will be set on AccessibleObjects in the array prior * to the one which resulted in the exception. * * @param array the array of accessible objects @@ -115,7 +115,7 @@ public class AccessibleObject * manager exists, it is checked for * ReflectPermission("suppressAccessChecks").

        * - * It is forbidden to set the accessibility flag to true on any constructor for + * It is forbidden to set the accessibility flag to true on any constructor for * java.lang.Class. This will result in a SecurityException. * * @param flag the desired state of accessibility, true to bypass security diff --git a/libjava/classpath/java/lang/reflect/AnnotatedElement.java b/libjava/classpath/java/lang/reflect/AnnotatedElement.java index 8f2a8b6f5c8..0179a0f4cca 100644 --- a/libjava/classpath/java/lang/reflect/AnnotatedElement.java +++ b/libjava/classpath/java/lang/reflect/AnnotatedElement.java @@ -57,7 +57,7 @@ import java.lang.annotation.Annotation; * AnnotationTypeMismatchException or * IncompleteAnnotationException. *

        - * + * * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 diff --git a/libjava/classpath/java/lang/reflect/Array.java b/libjava/classpath/java/lang/reflect/Array.java index d64e36c3790..a31e48ea6a6 100644 --- a/libjava/classpath/java/lang/reflect/Array.java +++ b/libjava/classpath/java/lang/reflect/Array.java @@ -248,7 +248,7 @@ public final class Array throw new NullPointerException(); throw new IllegalArgumentException(); } - + /** * Gets an element of a byte array. * @@ -422,11 +422,11 @@ public final class Array { if (array instanceof Object[]) { - // Too bad the API won't let us throw the easier ArrayStoreException! - if (value != null - && ! array.getClass().getComponentType().isInstance(value)) - throw new IllegalArgumentException(); - ((Object[]) array)[index] = value; + // Too bad the API won't let us throw the easier ArrayStoreException! + if (value != null + && ! array.getClass().getComponentType().isInstance(value)) + throw new IllegalArgumentException(); + ((Object[]) array)[index] = value; } else if (value instanceof Byte) setByte(array, index, ((Byte) value).byteValue()); diff --git a/libjava/classpath/java/lang/reflect/Constructor.java b/libjava/classpath/java/lang/reflect/Constructor.java index d9b7e831216..d6c8d793422 100644 --- a/libjava/classpath/java/lang/reflect/Constructor.java +++ b/libjava/classpath/java/lang/reflect/Constructor.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -81,7 +81,7 @@ import java.lang.annotation.Annotation; public final class Constructor extends AccessibleObject implements GenericDeclaration, Member -{ +{ private static final int CONSTRUCTOR_MODIFIERS = Modifier.PRIVATE | Modifier.PROTECTED | Modifier.PUBLIC; @@ -108,7 +108,7 @@ public final class Constructor */ public Class getDeclaringClass() { - // Inescapable as the VM layer is 1.4 based. + // Inescapable as the VM layer is 1.4 based. @SuppressWarnings("unchecked") Class declClass = (Class) cons.getDeclaringClass(); return declClass; @@ -314,7 +314,7 @@ public final class Constructor throws InstantiationException, IllegalAccessException, InvocationTargetException { - // Inescapable as the VM layer is 1.4 based. + // Inescapable as the VM layer is 1.4 based. @SuppressWarnings("unchecked") T ins = (T) cons.construct(args); return ins; @@ -336,10 +336,10 @@ public final class Constructor { if (p == null) { - String sig = cons.getSignature(); - if (sig == null) - return new TypeVariable[0]; - p = new MethodSignatureParser(this, sig); + String sig = cons.getSignature(); + if (sig == null) + return new TypeVariable[0]; + p = new MethodSignatureParser(this, sig); } return p.getTypeParameters(); } @@ -350,7 +350,7 @@ public final class Constructor * An array of size zero is returned if this constructor declares no * exceptions. * - * @return the exception types declared by this constructor. + * @return the exception types declared by this constructor. * @throws GenericSignatureFormatError if the generic signature does * not conform to the format specified in the Virtual Machine * specification, version 3. @@ -360,10 +360,10 @@ public final class Constructor { if (p == null) { - String sig = cons.getSignature(); - if (sig == null) - return getExceptionTypes(); - p = new MethodSignatureParser(this, sig); + String sig = cons.getSignature(); + if (sig == null) + return getExceptionTypes(); + p = new MethodSignatureParser(this, sig); } return p.getGenericExceptionTypes(); } @@ -384,10 +384,10 @@ public final class Constructor { if (p == null) { - String sig = cons.getSignature(); - if (sig == null) - return getParameterTypes(); - p = new MethodSignatureParser(this, sig); + String sig = cons.getSignature(); + if (sig == null) + return getParameterTypes(); + p = new MethodSignatureParser(this, sig); } return p.getGenericParameterTypes(); } @@ -406,7 +406,7 @@ public final class Constructor * The returned annotations are serialized. Changing the annotations has * no affect on the return value of future calls to this method. *

        - * + * * @return an array of arrays which represents the annotations used on the * parameters of this constructor. The order of the array elements * matches the declaration order of the parameters. @@ -428,7 +428,7 @@ public final class Constructor */ public T getAnnotation(Class annotationClass) { - // Inescapable as the VM layer is 1.4 based. + // Inescapable as the VM layer is 1.4 based. @SuppressWarnings("unchecked") T ann = (T) cons.getAnnotation(annotationClass); return ann; diff --git a/libjava/classpath/java/lang/reflect/Field.java b/libjava/classpath/java/lang/reflect/Field.java index b9d92884564..29ca795b8ad 100644 --- a/libjava/classpath/java/lang/reflect/Field.java +++ b/libjava/classpath/java/lang/reflect/Field.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -691,11 +691,11 @@ extends AccessibleObject implements Member { if (p == null) { - String signature = f.getSignature(); - if (signature == null) - return getType(); - p = new FieldSignatureParser(getDeclaringClass(), - signature); + String signature = f.getSignature(); + if (signature == null) + return getType(); + p = new FieldSignatureParser(getDeclaringClass(), + signature); } return p.getFieldType(); } @@ -711,7 +711,7 @@ extends AccessibleObject implements Member */ public T getAnnotation(Class annotationClass) { - // Inescapable as the VM layer is 1.4 based. T will erase to Annotation anyway. + // Inescapable as the VM layer is 1.4 based. T will erase to Annotation anyway. @SuppressWarnings("unchecked") T ann = (T) f.getAnnotation(annotationClass); return ann; } diff --git a/libjava/classpath/java/lang/reflect/GenericArrayType.java b/libjava/classpath/java/lang/reflect/GenericArrayType.java index 8dc33a796c5..2e080247c9d 100644 --- a/libjava/classpath/java/lang/reflect/GenericArrayType.java +++ b/libjava/classpath/java/lang/reflect/GenericArrayType.java @@ -46,7 +46,7 @@ package java.lang.reflect; * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 */ -public interface GenericArrayType +public interface GenericArrayType extends Type { diff --git a/libjava/classpath/java/lang/reflect/GenericDeclaration.java b/libjava/classpath/java/lang/reflect/GenericDeclaration.java index 244befd8810..d78aba91315 100644 --- a/libjava/classpath/java/lang/reflect/GenericDeclaration.java +++ b/libjava/classpath/java/lang/reflect/GenericDeclaration.java @@ -52,7 +52,7 @@ public interface GenericDeclaration * Returns a TypeVariable object for each type variable * declared by this entity, in order of declaration. An empty array * is returned if no type variables are declared. - * + * * @return an array of TypeVariable objects. * @throws GenericSignatureFormatError if the signature format within the * class file does not conform to that specified in the 3rd edition diff --git a/libjava/classpath/java/lang/reflect/InvocationHandler.java b/libjava/classpath/java/lang/reflect/InvocationHandler.java index 208e621eedc..3d30afd931e 100644 --- a/libjava/classpath/java/lang/reflect/InvocationHandler.java +++ b/libjava/classpath/java/lang/reflect/InvocationHandler.java @@ -55,7 +55,7 @@ package java.lang.reflect; * work on any object in general.

        * *

        Hints for implementing this class:

        - * + * *
          *
        • Don't forget that Object.equals, Object.hashCode, and * Object.toString will call this handler. In particular, diff --git a/libjava/classpath/java/lang/reflect/MalformedParameterizedTypeException.java b/libjava/classpath/java/lang/reflect/MalformedParameterizedTypeException.java index 50ae23000e7..bfbe3bc89fa 100644 --- a/libjava/classpath/java/lang/reflect/MalformedParameterizedTypeException.java +++ b/libjava/classpath/java/lang/reflect/MalformedParameterizedTypeException.java @@ -38,7 +38,7 @@ exception statement from your version. */ package java.lang.reflect; -/** +/** * This exception class is thrown when one of the reflection * methods encountered an invalid parameterized type within * the metadata of a class. One possible reason for this @@ -47,9 +47,9 @@ package java.lang.reflect; * * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) - * @since 1.5 + * @since 1.5 */ -public class MalformedParameterizedTypeException +public class MalformedParameterizedTypeException extends RuntimeException { private static final long serialVersionUID = -5696557788586220964L; diff --git a/libjava/classpath/java/lang/reflect/Method.java b/libjava/classpath/java/lang/reflect/Method.java index 0a532ddb6f2..fe4b2eb1fb3 100644 --- a/libjava/classpath/java/lang/reflect/Method.java +++ b/libjava/classpath/java/lang/reflect/Method.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -333,7 +333,7 @@ extends AccessibleObject implements Member, GenericDeclaration * An array of size zero is returned if this class has no type * variables. * - * @return the type variables associated with this class. + * @return the type variables associated with this class. * @throws GenericSignatureFormatError if the generic signature does * not conform to the format specified in the Virtual Machine * specification, version 3. @@ -343,10 +343,10 @@ extends AccessibleObject implements Member, GenericDeclaration { if (p == null) { - String sig = m.getSignature(); - if (sig == null) - return (TypeVariable[]) new TypeVariable[0]; - p = new MethodSignatureParser(this, sig); + String sig = m.getSignature(); + if (sig == null) + return (TypeVariable[]) new TypeVariable[0]; + p = new MethodSignatureParser(this, sig); } return p.getTypeParameters(); } @@ -357,7 +357,7 @@ extends AccessibleObject implements Member, GenericDeclaration * An array of size zero is returned if this method declares no * exceptions. * - * @return the exception types declared by this method. + * @return the exception types declared by this method. * @throws GenericSignatureFormatError if the generic signature does * not conform to the format specified in the Virtual Machine * specification, version 3. @@ -367,10 +367,10 @@ extends AccessibleObject implements Member, GenericDeclaration { if (p == null) { - String sig = m.getSignature(); - if (sig == null) - return getExceptionTypes(); - p = new MethodSignatureParser(this, sig); + String sig = m.getSignature(); + if (sig == null) + return getExceptionTypes(); + p = new MethodSignatureParser(this, sig); } return p.getGenericExceptionTypes(); } @@ -391,10 +391,10 @@ extends AccessibleObject implements Member, GenericDeclaration { if (p == null) { - String sig = m.getSignature(); - if (sig == null) - return getParameterTypes(); - p = new MethodSignatureParser(this, sig); + String sig = m.getSignature(); + if (sig == null) + return getParameterTypes(); + p = new MethodSignatureParser(this, sig); } return p.getGenericParameterTypes(); } @@ -412,10 +412,10 @@ extends AccessibleObject implements Member, GenericDeclaration { if (p == null) { - String sig = m.getSignature(); - if (sig == null) - return getReturnType(); - p = new MethodSignatureParser(this, sig); + String sig = m.getSignature(); + if (sig == null) + return getReturnType(); + p = new MethodSignatureParser(this, sig); } return p.getGenericReturnType(); } @@ -450,7 +450,7 @@ extends AccessibleObject implements Member, GenericDeclaration * The returned annotations are serialized. Changing the annotations has * no affect on the return value of future calls to this method. *

          - * + * * @return an array of arrays which represents the annotations used on the * parameters of this method. The order of the array elements * matches the declaration order of the parameters. @@ -472,7 +472,7 @@ extends AccessibleObject implements Member, GenericDeclaration */ public T getAnnotation(Class annotationClass) { - // Inescapable as the VM layer is 1.4 based. T will erase to Annotation anyway. + // Inescapable as the VM layer is 1.4 based. T will erase to Annotation anyway. @SuppressWarnings("unchecked") T ann = (T) m.getAnnotation(annotationClass); return ann; diff --git a/libjava/classpath/java/lang/reflect/Modifier.java b/libjava/classpath/java/lang/reflect/Modifier.java index 45d9b51a75e..15bad05e738 100644 --- a/libjava/classpath/java/lang/reflect/Modifier.java +++ b/libjava/classpath/java/lang/reflect/Modifier.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -345,7 +345,7 @@ public class Modifier r.append("strictfp "); if (isInterface(mod)) r.append("interface "); - + // Trim trailing space. if ((mod & ALL_FLAGS) != 0) r.setLength(r.length() - 1); diff --git a/libjava/classpath/java/lang/reflect/Proxy.java b/libjava/classpath/java/lang/reflect/Proxy.java index fb2004e790b..0e76124df01 100644 --- a/libjava/classpath/java/lang/reflect/Proxy.java +++ b/libjava/classpath/java/lang/reflect/Proxy.java @@ -217,7 +217,7 @@ public class Proxy implements Serializable *

          There are several restrictions on this method, the violation of * which will result in an IllegalArgumentException or * NullPointerException:

          - * + * *
            *
          • All objects in `interfaces' must represent distinct interfaces. * Classes, primitive types, null, and duplicates are forbidden.
            • @@ -258,7 +258,7 @@ public class Proxy implements Serializable // synchronized so that we aren't trying to build the same class // simultaneously in two threads public static synchronized Class getProxyClass(ClassLoader loader, - Class... interfaces) + Class... interfaces) { interfaces = (Class[]) interfaces.clone(); ProxyType pt = new ProxyType(loader, interfaces); @@ -274,7 +274,7 @@ public class Proxy implements Serializable : ProxyData.getProxyData(pt)); clazz = (VMProxy.HAVE_NATIVE_GENERATE_PROXY_CLASS - ? VMProxy.generateProxyClass(loader, data) + ? VMProxy.generateProxyClass(loader, data) : new ClassFactory(data).generate(loader)); } @@ -716,7 +716,7 @@ public class Proxy implements Serializable if (! Modifier.isPublic(inter.getModifiers())) if (in_package) { - String p = getPackage(inter); + String p = getPackage(inter); if (! data.pack.equals(p)) throw new IllegalArgumentException("non-public interfaces " + "from different " @@ -769,7 +769,7 @@ public class Proxy implements Serializable * Method.equals as it would also check the declaring class, what we do not * want. We only want to check that the given method have the same signature * as a core method (same name and parameter types) - * + * * @param method the method to check * @return whether the method has the same name and parameter types as * Object.equals, Object.hashCode or Object.toString @@ -795,7 +795,7 @@ public class Proxy implements Serializable } return false; } - + } // class ProxyData /** @@ -1260,7 +1260,7 @@ public class Proxy implements Serializable ProtectionDomain.class }; Method m = vmClassLoader.getDeclaredMethod("defineClass", types); // We can bypass the security check of setAccessible(true), since - // we're in the same package. + // we're in the same package. m.flag = true; Object[] args = {loader, qualName, bytecode, Integer.valueOf(0), diff --git a/libjava/classpath/java/lang/reflect/Type.java b/libjava/classpath/java/lang/reflect/Type.java index c9ea5bfb9cb..41b0a9ca9e8 100644 --- a/libjava/classpath/java/lang/reflect/Type.java +++ b/libjava/classpath/java/lang/reflect/Type.java @@ -49,7 +49,7 @@ package java.lang.reflect; * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 - */ + */ public interface Type { } diff --git a/libjava/classpath/java/lang/reflect/TypeVariable.java b/libjava/classpath/java/lang/reflect/TypeVariable.java index ec6af69db4f..671c290ba1d 100644 --- a/libjava/classpath/java/lang/reflect/TypeVariable.java +++ b/libjava/classpath/java/lang/reflect/TypeVariable.java @@ -39,13 +39,13 @@ exception statement from your version. */ package java.lang.reflect; /** - *

            + *

            * This is a common interface for all type variables provided by * the Java language. Instances are created the first time a type * variable is needed by one of the reflective methods declared in * this package. *

            - *

            + *

            * Creating a type variable requires resolving the appropriate type. * This may involve resolving other classes as a side effect (e.g. * if the type is nested inside other classes). Creation should not @@ -57,7 +57,7 @@ package java.lang.reflect; * @author Tom Tromey (tromey@redhat.com) * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.5 - */ + */ public interface TypeVariable extends Type { diff --git a/libjava/classpath/java/lang/reflect/WildcardType.java b/libjava/classpath/java/lang/reflect/WildcardType.java index 4f789067cf0..43b5d0a4005 100644 --- a/libjava/classpath/java/lang/reflect/WildcardType.java +++ b/libjava/classpath/java/lang/reflect/WildcardType.java @@ -84,7 +84,7 @@ public interface WildcardType extends Type * the lower bounds of this type do not actually exist. * @throws MalformedParameterizedTypeException if any of the types * refer to a type which can not be instantiated. - */ + */ Type[] getLowerBounds(); /** @@ -109,7 +109,7 @@ public interface WildcardType extends Type * the upper bounds of this type do not actually exist. * @throws MalformedParameterizedTypeException if any of the types * refer to a type which can not be instantiated. - */ + */ Type[] getUpperBounds(); } diff --git a/libjava/classpath/java/math/BigDecimal.java b/libjava/classpath/java/math/BigDecimal.java index eceaf8cddc2..7f4546cdac9 100644 --- a/libjava/classpath/java/math/BigDecimal.java +++ b/libjava/classpath/java/math/BigDecimal.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,21 +50,21 @@ public class BigDecimal extends Number implements Comparable * The constant zero as a BigDecimal with scale zero. * @since 1.5 */ - public static final BigDecimal ZERO = + public static final BigDecimal ZERO = new BigDecimal (BigInteger.ZERO, 0); /** * The constant one as a BigDecimal with scale zero. * @since 1.5 */ - public static final BigDecimal ONE = + public static final BigDecimal ONE = new BigDecimal (BigInteger.ONE, 0); /** * The constant ten as a BigDecimal with scale zero. * @since 1.5 */ - public static final BigDecimal TEN = + public static final BigDecimal TEN = new BigDecimal (BigInteger.TEN, 0); public static final int ROUND_UP = 0; @@ -87,7 +87,7 @@ public class BigDecimal extends Number implements Comparable this.intVal = BigInteger.valueOf(val); this.scale = 0; } - + /** * Constructs a BigDecimal using the BigDecimal(int) constructor and then * rounds according to the MathContext. @@ -106,9 +106,9 @@ public class BigDecimal extends Number implements Comparable this.intVal = result.intVal; this.scale = result.scale; this.precision = result.precision; - } + } } - + /** * Constructs a new BigDecimal whose unscaled value is val and whose * scale is zero. @@ -119,7 +119,7 @@ public class BigDecimal extends Number implements Comparable this.intVal = BigInteger.valueOf(val); this.scale = 0; } - + /** * Constructs a BigDecimal from the long in the same way as BigDecimal(long) * and then rounds according to the MathContext. @@ -138,12 +138,12 @@ public class BigDecimal extends Number implements Comparable this.intVal = result.intVal; this.scale = result.scale; this.precision = result.precision; - } + } } - + /** - * Constructs a BigDecimal whose value is given by num rounded according to - * mc. Since num is already a BigInteger, the rounding refers only to the + * Constructs a BigDecimal whose value is given by num rounded according to + * mc. Since num is already a BigInteger, the rounding refers only to the * precision setting in mc, if mc.getPrecision() returns an int lower than * the number of digits in num, then rounding is necessary. * @param num the unscaledValue, before rounding @@ -163,15 +163,15 @@ public class BigDecimal extends Number implements Comparable this.precision = result.precision; } } - + /** * Constructs a BigDecimal from the String val according to the same - * rules as the BigDecimal(String) constructor and then rounds + * rules as the BigDecimal(String) constructor and then rounds * according to the MathContext mc. * @param val the String from which we construct the initial BigDecimal * @param mc the MathContext that specifies the rounding * @throws ArithmeticException if the result is inexact but the rounding type - * is RoundingMode.UNNECESSARY + * is RoundingMode.UNNECESSARY * @since 1.5 */ public BigDecimal (String val, MathContext mc) @@ -185,13 +185,13 @@ public class BigDecimal extends Number implements Comparable this.precision = result.precision; } } - + /** * Constructs a BigDecimal whose unscaled value is num and whose * scale is zero. * @param num the value of the new BigDecimal */ - public BigDecimal (BigInteger num) + public BigDecimal (BigInteger num) { this (num, 0); } @@ -207,9 +207,9 @@ public class BigDecimal extends Number implements Comparable this.intVal = num; this.scale = scale; } - + /** - * Constructs a BigDecimal using the BigDecimal(BigInteger, int) + * Constructs a BigDecimal using the BigDecimal(BigInteger, int) * constructor and then rounds according to the MathContext. * @param num the unscaled value of the unrounded BigDecimal * @param scale the scale of the unrounded BigDecimal @@ -236,7 +236,7 @@ public class BigDecimal extends Number implements Comparable * @param num the double from which the initial BigDecimal is created * @param mc the MathContext that specifies the rounding behaviour * @throws ArithmeticException if the result is inexact but the rounding type - * is RoundingMode.UNNECESSARY + * is RoundingMode.UNNECESSARY * @since 1.5 */ public BigDecimal (double num, MathContext mc) @@ -250,8 +250,8 @@ public class BigDecimal extends Number implements Comparable this.precision = result.precision; } } - - public BigDecimal (double num) throws NumberFormatException + + public BigDecimal (double num) throws NumberFormatException { if (Double.isInfinite (num) || Double.isNaN (num)) throw new NumberFormatException ("invalid argument: " + num); @@ -282,37 +282,37 @@ public class BigDecimal extends Number implements Comparable // Shave off factors of 10. while (exponent < 0 && (mantissa & 1) == 0) { - ++exponent; - mantissa >>= 1; + ++exponent; + mantissa >>= 1; } intVal = BigInteger.valueOf (bits < 0 ? - mantissa : mantissa); if (exponent < 0) { - // We have MANTISSA * 2 ^ (EXPONENT). - // Since (1/2)^N == 5^N * 10^-N we can easily convert this - // into a power of 10. - scale = (int) (- exponent); - BigInteger mult = BigInteger.valueOf (5).pow (scale); - intVal = intVal.multiply (mult); + // We have MANTISSA * 2 ^ (EXPONENT). + // Since (1/2)^N == 5^N * 10^-N we can easily convert this + // into a power of 10. + scale = (int) (- exponent); + BigInteger mult = BigInteger.valueOf (5).pow (scale); + intVal = intVal.multiply (mult); } else { - intVal = intVal.shiftLeft ((int) exponent); - scale = 0; + intVal = intVal.shiftLeft ((int) exponent); + scale = 0; } } /** - * Constructs a BigDecimal from the char subarray and rounding + * Constructs a BigDecimal from the char subarray and rounding * according to the MathContext. * @param in the char array * @param offset the start of the subarray * @param len the length of the subarray * @param mc the MathContext for rounding - * @throws NumberFormatException if the char subarray is not a valid + * @throws NumberFormatException if the char subarray is not a valid * BigDecimal representation - * @throws ArithmeticException if the result is inexact but the rounding + * @throws ArithmeticException if the result is inexact but the rounding * mode is RoundingMode.UNNECESSARY * @since 1.5 */ @@ -328,10 +328,10 @@ public class BigDecimal extends Number implements Comparable this.precision = temp.precision; } } - + /** * Constructs a BigDecimal from the char array and rounding according - * to the MathContext. + * to the MathContext. * @param in the char array * @param mc the MathContext * @throws NumberFormatException if in is not a valid BigDecimal @@ -350,9 +350,9 @@ public class BigDecimal extends Number implements Comparable this.intVal = temp.intVal; this.scale = temp.scale; this.precision = temp.precision; - } + } } - + /** * Constructs a BigDecimal from the given char array, accepting the same * sequence of characters as the BigDecimal(String) constructor. @@ -365,10 +365,10 @@ public class BigDecimal extends Number implements Comparable { this(in, 0, in.length); } - + /** * Constructs a BigDecimal from a char subarray, accepting the same sequence - * of characters as the BigDecimal(String) constructor. + * of characters as the BigDecimal(String) constructor. * @param in the char array * @param offset the start of the subarray * @param len the length of the subarray @@ -385,12 +385,12 @@ public class BigDecimal extends Number implements Comparable // point is the index into the char array where the exponent starts // (or, if there is no exponent, this is equal to end) int point = offset; - // dot is the index into the char array where the decimal point is + // dot is the index into the char array where the decimal point is // found, or -1 if there is no decimal point int dot = -1; - + // The following examples show what these variables mean. Note that - // point and dot don't yet have the correct values, they will be + // point and dot don't yet have the correct values, they will be // properly assigned in a loop later on in this method. // // Example 1 @@ -409,11 +409,11 @@ public class BigDecimal extends Number implements Comparable // // Example 3 // - // - 1 2 3 4 5 e 7 + // - 1 2 3 4 5 e 7 // __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ // - // offset = 2, len = 8, start = 3, dot = -1, point = 8, end = 10 - + // offset = 2, len = 8, start = 3, dot = -1, point = 8, end = 10 + // Determine the sign of the number. boolean negative = false; if (in[offset] == '+') @@ -428,7 +428,7 @@ public class BigDecimal extends Number implements Comparable negative = true; } - // Check each character looking for the decimal point and the + // Check each character looking for the decimal point and the // start of the exponent. while (point < end) { @@ -443,7 +443,7 @@ public class BigDecimal extends Number implements Comparable // Break when we reach the start of the exponent. else if (c == 'e' || c == 'E') break; - // Throw an exception if the character was not a decimal or an + // Throw an exception if the character was not a decimal or an // exponent and is not a digit. else if (!Character.isDigit(c)) throw new NumberFormatException("unrecognized character at " + point @@ -456,7 +456,7 @@ public class BigDecimal extends Number implements Comparable CPStringBuilder val = new CPStringBuilder(point - start - 1); if (dot != -1) { - // If there was a decimal we must combine the two parts that + // If there was a decimal we must combine the two parts that // contain only digits and we must set the scale properly. val.append(in, start, dot - start); val.append(in, dot + 1, point - dot - 1); @@ -494,7 +494,7 @@ public class BigDecimal extends Number implements Comparable try { - // Adjust the scale according to the exponent. + // Adjust the scale according to the exponent. // Remember that the value of a BigDecimal is // unscaledValue x Math.pow(10, -scale) scale -= Integer.parseInt(new String(in, point, end - point)); @@ -505,8 +505,8 @@ public class BigDecimal extends Number implements Comparable } } } - - public BigDecimal (String num) throws NumberFormatException + + public BigDecimal (String num) throws NumberFormatException { int len = num.length(); int start = 0, point = 0; @@ -514,42 +514,42 @@ public class BigDecimal extends Number implements Comparable boolean negative = false; if (num.charAt(0) == '+') { - ++start; - ++point; + ++start; + ++point; } else if (num.charAt(0) == '-') { - ++start; - ++point; - negative = true; + ++start; + ++point; + negative = true; } while (point < len) { - char c = num.charAt (point); - if (c == '.') - { - if (dot >= 0) - throw new NumberFormatException ("multiple `.'s in number"); - dot = point; - } - else if (c == 'e' || c == 'E') - break; - else if (Character.digit (c, 10) < 0) - throw new NumberFormatException ("unrecognized character: " + c); - ++point; + char c = num.charAt (point); + if (c == '.') + { + if (dot >= 0) + throw new NumberFormatException ("multiple `.'s in number"); + dot = point; + } + else if (c == 'e' || c == 'E') + break; + else if (Character.digit (c, 10) < 0) + throw new NumberFormatException ("unrecognized character: " + c); + ++point; } String val; if (dot >= 0) { - val = num.substring (start, dot) + num.substring (dot + 1, point); - scale = point - 1 - dot; + val = num.substring (start, dot) + num.substring (dot + 1, point); + scale = point - 1 - dot; } else { - val = num.substring (start, point); - scale = 0; + val = num.substring (start, point); + scale = 0; } if (val.length () == 0) throw new NumberFormatException ("no digits seen"); @@ -567,39 +567,39 @@ public class BigDecimal extends Number implements Comparable if (point >= len ) throw new NumberFormatException ("no exponent following e or E"); - - try - { + + try + { scale -= Integer.parseInt (num.substring (point)); - } - catch (NumberFormatException ex) - { - throw new NumberFormatException ("malformed exponent"); - } + } + catch (NumberFormatException ex) + { + throw new NumberFormatException ("malformed exponent"); + } } } - public static BigDecimal valueOf (long val) + public static BigDecimal valueOf (long val) { return valueOf (val, 0); } - public static BigDecimal valueOf (long val, int scale) - throws NumberFormatException + public static BigDecimal valueOf (long val, int scale) + throws NumberFormatException { if ((scale == 0) && ((int)val == val)) switch ((int) val) - { - case 0: - return ZERO; - case 1: - return ONE; - } + { + case 0: + return ZERO; + case 1: + return ONE; + } return new BigDecimal (BigInteger.valueOf (val), scale); } - public BigDecimal add (BigDecimal val) + public BigDecimal add (BigDecimal val) { // For addition, need to line up decimals. Note that the movePointRight // method cannot be used for this as it might return a BigDecimal with @@ -613,9 +613,9 @@ public class BigDecimal extends Number implements Comparable return new BigDecimal (op1.add (op2), Math.max (scale, val.scale)); } - + /** - * Returns a BigDecimal whose value is found first by calling the + * Returns a BigDecimal whose value is found first by calling the * method add(val) and then by rounding according to the MathContext mc. * @param val the augend * @param mc the MathContext for rounding @@ -629,13 +629,13 @@ public class BigDecimal extends Number implements Comparable return add(val).round(mc); } - public BigDecimal subtract (BigDecimal val) + public BigDecimal subtract (BigDecimal val) { return this.add(val.negate()); } /** - * Returns a BigDecimal whose value is found first by calling the + * Returns a BigDecimal whose value is found first by calling the * method subtract(val) and then by rounding according to the MathContext mc. * @param val the subtrahend * @param mc the MathContext for rounding @@ -649,14 +649,14 @@ public class BigDecimal extends Number implements Comparable return subtract(val).round(mc); } - public BigDecimal multiply (BigDecimal val) + public BigDecimal multiply (BigDecimal val) { return new BigDecimal (intVal.multiply (val.intVal), scale + val.scale); } - + /** * Returns a BigDecimal whose value is (this x val) before it is rounded - * according to the MathContext mc. + * according to the MathContext mc. * @param val the multiplicand * @param mc the MathContext for rounding * @return a new BigDecimal with value approximately (this x val) @@ -669,15 +669,15 @@ public class BigDecimal extends Number implements Comparable return multiply(val).round(mc); } - public BigDecimal divide (BigDecimal val, int roundingMode) - throws ArithmeticException, IllegalArgumentException + public BigDecimal divide (BigDecimal val, int roundingMode) + throws ArithmeticException, IllegalArgumentException { return divide (val, scale, roundingMode); } - + /** * Returns a BigDecimal whose value is (this / val), with the specified scale - * and rounding according to the RoundingMode + * and rounding according to the RoundingMode * @param val the divisor * @param scale the scale of the BigDecimal returned * @param roundingMode the rounding mode to use @@ -686,7 +686,7 @@ public class BigDecimal extends Number implements Comparable * UNNECESSARY but the specified scale cannot represent the value exactly * @since 1.5 */ - public BigDecimal divide(BigDecimal val, + public BigDecimal divide(BigDecimal val, int scale, RoundingMode roundingMode) { return divide (val, scale, roundingMode.ordinal()); @@ -705,30 +705,30 @@ public class BigDecimal extends Number implements Comparable { return divide (val, scale, roundingMode.ordinal()); } - + public BigDecimal divide(BigDecimal val, int newScale, int roundingMode) - throws ArithmeticException, IllegalArgumentException + throws ArithmeticException, IllegalArgumentException { if (roundingMode < 0 || roundingMode > 7) - throw - new IllegalArgumentException("illegal rounding mode: " + roundingMode); + throw + new IllegalArgumentException("illegal rounding mode: " + roundingMode); - if (intVal.signum () == 0) // handle special case of 0.0/0.0 + if (intVal.signum () == 0) // handle special case of 0.0/0.0 return newScale == 0 ? ZERO : new BigDecimal (ZERO.intVal, newScale); - + // Ensure that pow gets a non-negative value. BigInteger valIntVal = val.intVal; int power = newScale - (scale - val.scale); if (power < 0) { - // Effectively increase the scale of val to avoid an - // ArithmeticException for a negative power. + // Effectively increase the scale of val to avoid an + // ArithmeticException for a negative power. valIntVal = valIntVal.multiply (BigInteger.TEN.pow (-power)); - power = 0; + power = 0; } BigInteger dividend = intVal.multiply (BigInteger.TEN.pow (power)); - + BigInteger parts[] = dividend.divideAndRemainder (valIntVal); BigInteger unrounded = parts[0]; @@ -746,33 +746,33 @@ public class BigDecimal extends Number implements Comparable roundingMode = (sign < 0) ? ROUND_UP : ROUND_DOWN; else { - // half is -1 if remainder*2 < positive intValue (*power), 0 if equal, - // 1 if >. This implies that the remainder to round is less than, - // equal to, or greater than half way to the next digit. - BigInteger posRemainder - = parts[1].signum () < 0 ? parts[1].negate() : parts[1]; - valIntVal = valIntVal.signum () < 0 ? valIntVal.negate () : valIntVal; - int half = posRemainder.shiftLeft(1).compareTo(valIntVal); + // half is -1 if remainder*2 < positive intValue (*power), 0 if equal, + // 1 if >. This implies that the remainder to round is less than, + // equal to, or greater than half way to the next digit. + BigInteger posRemainder + = parts[1].signum () < 0 ? parts[1].negate() : parts[1]; + valIntVal = valIntVal.signum () < 0 ? valIntVal.negate () : valIntVal; + int half = posRemainder.shiftLeft(1).compareTo(valIntVal); - switch(roundingMode) - { - case ROUND_HALF_UP: - roundingMode = (half < 0) ? ROUND_DOWN : ROUND_UP; - break; - case ROUND_HALF_DOWN: - roundingMode = (half > 0) ? ROUND_UP : ROUND_DOWN; - break; - case ROUND_HALF_EVEN: - if (half < 0) - roundingMode = ROUND_DOWN; - else if (half > 0) - roundingMode = ROUND_UP; - else if (unrounded.testBit(0)) // odd, then ROUND_HALF_UP - roundingMode = ROUND_UP; - else // even, ROUND_HALF_DOWN - roundingMode = ROUND_DOWN; - break; - } + switch(roundingMode) + { + case ROUND_HALF_UP: + roundingMode = (half < 0) ? ROUND_DOWN : ROUND_UP; + break; + case ROUND_HALF_DOWN: + roundingMode = (half > 0) ? ROUND_UP : ROUND_DOWN; + break; + case ROUND_HALF_EVEN: + if (half < 0) + roundingMode = ROUND_DOWN; + else if (half > 0) + roundingMode = ROUND_UP; + else if (unrounded.testBit(0)) // odd, then ROUND_HALF_UP + roundingMode = ROUND_UP; + else // even, ROUND_HALF_DOWN + roundingMode = ROUND_DOWN; + break; + } } if (roundingMode == ROUND_UP) @@ -781,24 +781,24 @@ public class BigDecimal extends Number implements Comparable // roundingMode == ROUND_DOWN return new BigDecimal (unrounded, newScale); } - + /** * Performs division, if the resulting quotient requires rounding - * (has a nonterminating decimal expansion), - * an ArithmeticException is thrown. + * (has a nonterminating decimal expansion), + * an ArithmeticException is thrown. * #see divide(BigDecimal, int, int) * @since 1.5 */ public BigDecimal divide(BigDecimal divisor) - throws ArithmeticException, IllegalArgumentException + throws ArithmeticException, IllegalArgumentException { return divide(divisor, scale, ROUND_UNNECESSARY); } /** * Returns a BigDecimal whose value is the remainder in the quotient - * this / val. This is obtained by - * subtract(divideToIntegralValue(val).multiply(val)). + * this / val. This is obtained by + * subtract(divideToIntegralValue(val).multiply(val)). * @param val the divisor * @return a BigDecimal whose value is the remainder * @throws ArithmeticException if val == 0 @@ -811,7 +811,7 @@ public class BigDecimal extends Number implements Comparable /** * Returns a BigDecimal array, the first element of which is the integer part - * of this / val, and the second element of which is the remainder of + * of this / val, and the second element of which is the remainder of * that quotient. * @param val the divisor * @return the above described BigDecimal array @@ -825,9 +825,9 @@ public class BigDecimal extends Number implements Comparable result[1] = subtract(result[0].multiply(val)); return result; } - + /** - * Returns a BigDecimal whose value is the integer part of the quotient + * Returns a BigDecimal whose value is the integer part of the quotient * this / val. The preferred scale is this.scale - val.scale. * @param val the divisor * @return a BigDecimal whose value is the integer part of this / val. @@ -838,12 +838,12 @@ public class BigDecimal extends Number implements Comparable { return divide(val, ROUND_DOWN).floor().setScale(scale - val.scale, ROUND_DOWN); } - + /** - * Mutates this BigDecimal into one with no fractional part, whose value is + * Mutates this BigDecimal into one with no fractional part, whose value is * equal to the largest integer that is <= to this BigDecimal. Note that * since this method is private it is okay to mutate this BigDecimal. - * @return the BigDecimal obtained through the floor operation on this + * @return the BigDecimal obtained through the floor operation on this * BigDecimal. */ private BigDecimal floor() @@ -855,17 +855,17 @@ public class BigDecimal extends Number implements Comparable intVal = new BigInteger(intValStr).multiply(BigInteger.TEN.pow(scale)); return this; } - - public int compareTo (BigDecimal val) + + public int compareTo (BigDecimal val) { if (scale == val.scale) return intVal.compareTo (val.intVal); - BigInteger thisParts[] = + BigInteger thisParts[] = intVal.divideAndRemainder (BigInteger.TEN.pow (scale)); BigInteger valParts[] = val.intVal.divideAndRemainder (BigInteger.TEN.pow (val.scale)); - + int compare; if ((compare = thisParts[0].compareTo (valParts[0])) != 0) return compare; @@ -875,46 +875,46 @@ public class BigDecimal extends Number implements Comparable // Add some trailing zeros to the remainder with the smallest scale if (scale < val.scale) thisParts[1] = thisParts[1].multiply - (BigInteger.valueOf (10).pow (val.scale - scale)); + (BigInteger.valueOf (10).pow (val.scale - scale)); else if (scale > val.scale) valParts[1] = valParts[1].multiply - (BigInteger.valueOf (10).pow (scale - val.scale)); + (BigInteger.valueOf (10).pow (scale - val.scale)); // and compare them return thisParts[1].compareTo (valParts[1]); } - public boolean equals (Object o) + public boolean equals (Object o) { - return (o instanceof BigDecimal - && scale == ((BigDecimal) o).scale - && compareTo ((BigDecimal) o) == 0); + return (o instanceof BigDecimal + && scale == ((BigDecimal) o).scale + && compareTo ((BigDecimal) o) == 0); } - public int hashCode() + public int hashCode() { return intValue() ^ scale; } public BigDecimal max (BigDecimal val) { - switch (compareTo (val)) + switch (compareTo (val)) { case 1: - return this; + return this; default: - return val; + return val; } } - public BigDecimal min (BigDecimal val) + public BigDecimal min (BigDecimal val) { - switch (compareTo (val)) + switch (compareTo (val)) { case -1: - return this; + return this; default: - return val; + return val; } } @@ -931,35 +931,35 @@ public class BigDecimal extends Number implements Comparable if (scale >= n) return new BigDecimal (intVal, scale - n); - return new BigDecimal (intVal.multiply - (BigInteger.TEN.pow (n - scale)), 0); + return new BigDecimal (intVal.multiply + (BigInteger.TEN.pow (n - scale)), 0); } - public int signum () + public int signum () { return intVal.signum (); } - public int scale () + public int scale () { return scale; } - + public BigInteger unscaledValue() { return intVal; } - public BigDecimal abs () + public BigDecimal abs () { return new BigDecimal (intVal.abs (), scale); } - public BigDecimal negate () + public BigDecimal negate () { return new BigDecimal (intVal.negate (), scale); } - + /** * Returns a BigDecimal whose value is found first by negating this via * the negate() method, then by rounding according to the MathContext mc. @@ -976,9 +976,9 @@ public class BigDecimal extends Number implements Comparable result = result.round(mc); return result; } - + /** - * Returns this BigDecimal. This is included for symmetry with the + * Returns this BigDecimal. This is included for symmetry with the * method negate(). * @return this * @since 1.5 @@ -987,9 +987,9 @@ public class BigDecimal extends Number implements Comparable { return this; } - + /** - * Returns a BigDecimal whose value is found by rounding this + * Returns a BigDecimal whose value is found by rounding this * according to the MathContext. This is the same as round(MathContext). * @param mc the MathContext for rounding * @return a BigDecimal whose value is this before being rounded @@ -1001,7 +1001,7 @@ public class BigDecimal extends Number implements Comparable { return round(mc); } - + /** * Returns a BigDecimal which is this BigDecimal rounded according to the * MathContext rounding settings. @@ -1012,12 +1012,12 @@ public class BigDecimal extends Number implements Comparable { int mcPrecision = mc.getPrecision(); int numToChop = precision() - mcPrecision; - // If mc specifies not to chop any digits or if we've already chopped + // If mc specifies not to chop any digits or if we've already chopped // enough digits (say by using a MathContext in the constructor for this // BigDecimal) then just return this. if (mcPrecision == 0 || numToChop <= 0) return this; - + // Make a new BigDecimal which is the correct power of 10 to chop off // the required number of digits and then call divide. BigDecimal div = new BigDecimal(BigInteger.TEN.pow(numToChop)); @@ -1026,38 +1026,38 @@ public class BigDecimal extends Number implements Comparable rounded.precision = mcPrecision; return rounded; } - + /** * Returns the precision of this BigDecimal (the number of digits in the * unscaled value). The precision of a zero value is 1. - * @return the number of digits in the unscaled value, or 1 if the value + * @return the number of digits in the unscaled value, or 1 if the value * is zero. */ public int precision() { if (precision == 0) { - String s = intVal.toString(); - precision = s.length() - (( s.charAt(0) == '-' ) ? 1 : 0); + String s = intVal.toString(); + precision = s.length() - (( s.charAt(0) == '-' ) ? 1 : 0); } return precision; } - + /** * Returns the String representation of this BigDecimal, using scientific * notation if necessary. The following steps are taken to generate * the result: - * + * * 1. the BigInteger unscaledValue's toString method is called and if * scale == 0 is returned. * 2. an int adjExp is created which is equal to the negation - * of scale plus the number of digits in the unscaled value, + * of scale plus the number of digits in the unscaled value, * minus one. - * 3. if scale >= 0 && adjExp >= -6 then we represent this - * BigDecimal without scientific notation. A decimal is added if the + * 3. if scale >= 0 && adjExp >= -6 then we represent this + * BigDecimal without scientific notation. A decimal is added if the * scale is positive and zeros are prepended as necessary. * 4. if scale is negative or adjExp is less than -6 we use scientific - * notation. If the unscaled value has more than one digit, a decimal + * notation. If the unscaled value has more than one digit, a decimal * as inserted after the first digit, the character 'E' is appended * and adjExp is appended. */ @@ -1076,7 +1076,7 @@ public class BigDecimal extends Number implements Comparable if (scale >= 0 && (point - 1) >= -6) { - // Convert to character form without scientific notation. + // Convert to character form without scientific notation. if (point <= 0) { // Zeros need to be prepended to the StringBuilder. @@ -1094,7 +1094,7 @@ public class BigDecimal extends Number implements Comparable } else { - // No zeros need to be prepended so the String is simply the + // No zeros need to be prepended so the String is simply the // unscaled value with the decimal point inserted. val.append(bigStr); val.insert(point + (negative ? 1 : 0), '.'); @@ -1104,7 +1104,7 @@ public class BigDecimal extends Number implements Comparable { // We must use scientific notation to represent this BigDecimal. val.append(bigStr); - // If there is more than one digit in the unscaled value we put a + // If there is more than one digit in the unscaled value we put a // decimal after the first digit. if (bigStr.length() > 1) val.insert( ( negative ? 2 : 1 ), '.'); @@ -1119,10 +1119,10 @@ public class BigDecimal extends Number implements Comparable /** * Returns the String representation of this BigDecimal, using engineering - * notation if necessary. This is similar to toString() but when exponents + * notation if necessary. This is similar to toString() but when exponents * are used the exponent is made to be a multiple of 3 such that the integer * part is between 1 and 999. - * + * * @return a String representation of this BigDecimal in engineering notation * @since 1.5 */ @@ -1161,7 +1161,7 @@ public class BigDecimal extends Number implements Comparable } else { - // No zeros need to be prepended so the String is simply the + // No zeros need to be prepended so the String is simply the // unscaled value with the decimal point inserted. val.append(bigStr); val.insert(point + (negative ? 1 : 0), '.'); @@ -1172,7 +1172,7 @@ public class BigDecimal extends Number implements Comparable // We must use scientific notation to represent this BigDecimal. // The exponent must be a multiple of 3 and the integer part // must be between 1 and 999. - val.append(bigStr); + val.append(bigStr); int zeros = adjExp % 3; int dot = 1; if (adjExp > 0) @@ -1185,9 +1185,9 @@ public class BigDecimal extends Number implements Comparable else { // If the exponent is negative then we move the dot to the right - // and decrease the exponent (increase its magnitude) until + // and decrease the exponent (increase its magnitude) until // it is a multiple of 3. Note that this is not adjExp -= zeros - // because the mod operator doesn't give us the distance to the + // because the mod operator doesn't give us the distance to the // correct multiple of 3. (-5 mod 3) is -2 but the distance from // -5 to the correct multiple of 3 (-6) is 1, not 2. if (zeros == -2) @@ -1211,7 +1211,7 @@ public class BigDecimal extends Number implements Comparable } else if (bigStr.length() > dot) val.insert(dot + (negative ? 1 : 0), '.'); - + // And then append 'E' and the exponent (adjExp). val.append('E'); if (adjExp >= 0) @@ -1220,20 +1220,20 @@ public class BigDecimal extends Number implements Comparable } return val.toString(); } - + /** - * Returns a String representation of this BigDecimal without using + * Returns a String representation of this BigDecimal without using * scientific notation. This is how toString() worked for releases 1.4 * and previous. Zeros may be added to the end of the String. For - * example, an unscaled value of 1234 and a scale of -3 would result in - * the String 1234000, but the toString() method would return + * example, an unscaled value of 1234 and a scale of -3 would result in + * the String 1234000, but the toString() method would return * 1.234E+6. * @return a String representation of this BigDecimal * @since 1.5 */ public String toPlainString() { - // If the scale is zero we simply return the String representation of the + // If the scale is zero we simply return the String representation of the // unscaled value. String bigStr = intVal.toString(); if (scale == 0) @@ -1245,7 +1245,7 @@ public class BigDecimal extends Number implements Comparable int point = bigStr.length() - scale - (negative ? 1 : 0); CPStringBuilder sb = new CPStringBuilder(bigStr.length() + 2 - + (point <= 0 ? (-point + 1) : 0)); + + (point <= 0 ? (-point + 1) : 0)); if (point <= 0) { // We have to prepend zeros and a decimal point. @@ -1275,13 +1275,13 @@ public class BigDecimal extends Number implements Comparable } return sb.toString(); } - + /** * Converts this BigDecimal to a BigInteger. Any fractional part will * be discarded. * @return a BigDecimal whose value is equal to floor[this] */ - public BigInteger toBigInteger () + public BigInteger toBigInteger () { // If scale > 0 then we must divide, if scale > 0 then we must multiply, // and if scale is zero then we just return intVal; @@ -1291,9 +1291,9 @@ public class BigDecimal extends Number implements Comparable return intVal.multiply(BigInteger.TEN.pow(-scale)); return intVal; } - + /** - * Converts this BigDecimal into a BigInteger, throwing an + * Converts this BigDecimal into a BigInteger, throwing an * ArithmeticException if the conversion is not exact. * @return a BigInteger whose value is equal to the value of this BigDecimal * @since 1.5 @@ -1303,7 +1303,7 @@ public class BigDecimal extends Number implements Comparable if (scale > 0) { // If we have to divide, we must check if the result is exact. - BigInteger[] result = + BigInteger[] result = intVal.divideAndRemainder(BigInteger.TEN.pow(scale)); if (result[1].equals(BigInteger.ZERO)) return result[0]; @@ -1316,20 +1316,20 @@ public class BigDecimal extends Number implements Comparable return intVal; } - public int intValue () + public int intValue () { return toBigInteger ().intValue (); } - + /** - * Returns a BigDecimal which is numerically equal to this BigDecimal but - * with no trailing zeros in the representation. For example, if this + * Returns a BigDecimal which is numerically equal to this BigDecimal but + * with no trailing zeros in the representation. For example, if this * BigDecimal has [unscaledValue, scale] = [6313000, 4] this method returns - * a BigDecimal with [unscaledValue, scale] = [6313, 1]. As another + * a BigDecimal with [unscaledValue, scale] = [6313, 1]. As another * example, [12400, -2] would become [124, -4]. * @return a numerically equal BigDecimal with no trailing zeros */ - public BigDecimal stripTrailingZeros() + public BigDecimal stripTrailingZeros() { String intValStr = intVal.toString(); int newScale = scale; @@ -1344,7 +1344,7 @@ public class BigDecimal extends Number implements Comparable } // Create a new BigDecimal with the appropriate substring and then // set its scale. - BigDecimal result = new BigDecimal(intValStr.substring(0, pointer + 1)); + BigDecimal result = new BigDecimal(intValStr.substring(0, pointer + 1)); result.scale = newScale; return result; } @@ -1354,12 +1354,12 @@ public class BigDecimal extends Number implements Comparable return toBigInteger().longValue(); } - public float floatValue() + public float floatValue() { return Float.valueOf(toString()).floatValue(); } - public double doubleValue() + public double doubleValue() { return Double.valueOf(toString()).doubleValue(); } @@ -1378,26 +1378,26 @@ public class BigDecimal extends Number implements Comparable if( scale < 0 ) throw new ArithmeticException("Scale parameter < 0."); return divide (ONE, scale, roundingMode); } - + /** * Returns a BigDecimal whose value is the same as this BigDecimal but whose * representation has a scale of newScale. If the scale is * reduced then rounding may occur, according to the RoundingMode. * @param newScale * @param roundingMode - * @return a BigDecimal whose scale is as given, whose value is + * @return a BigDecimal whose scale is as given, whose value is * this with possible rounding - * @throws ArithmeticException if the rounding mode is UNNECESSARY but - * rounding is required + * @throws ArithmeticException if the rounding mode is UNNECESSARY but + * rounding is required * @since 1.5 */ public BigDecimal setScale(int newScale, RoundingMode roundingMode) { return setScale(newScale, roundingMode.ordinal()); } - + /** - * Returns a new BigDecimal constructed from the BigDecimal(String) + * Returns a new BigDecimal constructed from the BigDecimal(String) * constructor using the Double.toString(double) method to obtain * the String. * @param val the double value used in Double.toString(double) @@ -1411,10 +1411,10 @@ public class BigDecimal extends Number implements Comparable throw new NumberFormatException("argument cannot be NaN or infinite."); return new BigDecimal(Double.toString(val)); } - + /** * Returns a BigDecimal whose numerical value is the numerical value - * of this BigDecimal multiplied by 10 to the power of n. + * of this BigDecimal multiplied by 10 to the power of n. * @param n the power of ten * @return the new BigDecimal * @since 1.5 @@ -1425,10 +1425,10 @@ public class BigDecimal extends Number implements Comparable result.precision = precision; return result; } - + /** - * Returns a BigDecimal whose value is this to the power of - * n. + * Returns a BigDecimal whose value is this to the power of + * n. * @param n the power * @return the new BigDecimal * @since 1.5 @@ -1440,7 +1440,7 @@ public class BigDecimal extends Number implements Comparable BigDecimal result = new BigDecimal(intVal.pow(n), scale * n); return result; } - + /** * Returns a BigDecimal whose value is determined by first calling pow(n) * and then by rounding according to the MathContext mc. @@ -1457,7 +1457,7 @@ public class BigDecimal extends Number implements Comparable // currently do not. return pow(n).round(mc); } - + /** * Returns a BigDecimal whose value is the absolute value of this BigDecimal * with rounding according to the given MathContext. @@ -1470,7 +1470,7 @@ public class BigDecimal extends Number implements Comparable result = result.round(mc); return result; } - + /** * Returns the size of a unit in the last place of this BigDecimal. This * returns a BigDecimal with [unscaledValue, scale] = [1, this.scale()]. @@ -1481,7 +1481,7 @@ public class BigDecimal extends Number implements Comparable { return new BigDecimal(BigInteger.ONE, scale); } - + /** * Converts this BigDecimal to a long value. * @return the long value @@ -1499,10 +1499,10 @@ public class BigDecimal extends Number implements Comparable || (result < 0 && signum() == 1) || (result > 0 && signum() == -1)) throw new ArithmeticException("this BigDecimal is too " + "large to fit into the return type"); - + return intVal.longValue(); } - + /** * Converts this BigDecimal into an int by first calling longValueExact * and then checking that the long returned from that @@ -1520,7 +1520,7 @@ public class BigDecimal extends Number implements Comparable throw new ArithmeticException ("this BigDecimal cannot fit into an int"); return result; } - + /** * Converts this BigDecimal into a byte by first calling longValueExact * and then checking that the long returned from that @@ -1538,7 +1538,7 @@ public class BigDecimal extends Number implements Comparable throw new ArithmeticException ("this BigDecimal cannot fit into a byte"); return result; } - + /** * Converts this BigDecimal into a short by first calling longValueExact * and then checking that the long returned from that diff --git a/libjava/classpath/java/math/BigInteger.java b/libjava/classpath/java/math/BigInteger.java index 9d7abc755ac..953e557a811 100644 --- a/libjava/classpath/java/math/BigInteger.java +++ b/libjava/classpath/java/math/BigInteger.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -54,7 +54,7 @@ import java.util.logging.Logger; * Written using on-line Java Platform 1.2 API Specification, as well * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998) and * "Applied Cryptography, Second Edition" by Bruce Schneier (Wiley, 1996). - * + * * Based primarily on IntNum.java BitOps.java by Per Bothner (per@bothner.com) * (found in Kawa 1.6.62). * @@ -84,13 +84,13 @@ public class BigInteger extends Number implements Comparable private static final long serialVersionUID = -8287574255936472291L; - /** We pre-allocate integers in the range minFixNum..maxFixNum. + /** We pre-allocate integers in the range minFixNum..maxFixNum. * Note that we must at least preallocate 0, 1, and 10. */ private static final int minFixNum = -100; private static final int maxFixNum = 1024; private static final int numFixNum = maxFixNum-minFixNum+1; private static final BigInteger[] smallFixNums; - + /** The alter-ego GMP instance for this. */ private transient GMP mpz; @@ -109,8 +109,8 @@ public class BigInteger extends Number implements Comparable else { smallFixNums = new BigInteger[numFixNum]; - for (int i = numFixNum; --i >= 0; ) - smallFixNums[i] = new BigInteger(i + minFixNum); + for (int i = numFixNum; --i >= 0; ) + smallFixNums[i] = new BigInteger(i + minFixNum); ZERO = smallFixNums[-minFixNum]; ONE = smallFixNums[1 - minFixNum]; @@ -260,11 +260,11 @@ public class BigInteger extends Number implements Comparable if (signum == 0) { - int i; - for (i = magnitude.length - 1; i >= 0 && magnitude[i] == 0; --i) - ; - if (i >= 0) - throw new NumberFormatException(); + int i; + for (i = magnitude.length - 1; i >= 0 && magnitude[i] == 0; --i) + ; + if (i >= 0) + throw new NumberFormatException(); return; } @@ -330,20 +330,20 @@ public class BigInteger extends Number implements Comparable while (highbits == 0 && nwords > 0) { - highbits = rnd.nextInt(); - --nwords; + highbits = rnd.nextInt(); + --nwords; } if (nwords == 0 && highbits >= 0) { - ival = highbits; + ival = highbits; } else { - ival = highbits < 0 ? nwords + 2 : nwords + 1; - words = new int[ival]; - words[nwords] = highbits; - while (--nwords >= 0) - words[nwords] = rnd.nextInt(); + ival = highbits < 0 ? nwords + 2 : nwords + 1; + words = new int[ival]; + words[nwords] = highbits; + while (--nwords >= 0) + words[nwords] = rnd.nextInt(); } } @@ -369,7 +369,7 @@ public class BigInteger extends Number implements Comparable } } - /** + /** * Return a BigInteger that is bitLength bits long with a * probability < 2^-100 of being composite. * @@ -465,9 +465,9 @@ public class BigInteger extends Number implements Comparable // Elements remaining in byte[] are a multiple of 4. while (nwords > 0) words[--nwords] = bytes[bptr++] << 24 | - (bytes[bptr++] & 0xff) << 16 | - (bytes[bptr++] & 0xff) << 8 | - (bytes[bptr++] & 0xff); + (bytes[bptr++] & 0xff) << 16 | + (bytes[bptr++] & 0xff) << 8 | + (bytes[bptr++] & 0xff); return words; } @@ -489,30 +489,30 @@ public class BigInteger extends Number implements Comparable { if (nwords == 0) { - if (words != null) - { - if (ival > 0) - ival = words[0]; - words = null; - } + if (words != null) + { + if (ival > 0) + ival = words[0]; + words = null; + } } else if (words == null - || words.length < nwords - || words.length > nwords + 2) + || words.length < nwords + || words.length > nwords + 2) { - int[] new_words = new int [nwords]; - if (words == null) - { - new_words[0] = ival; - ival = 1; - } - else - { - if (nwords < ival) - ival = nwords; - System.arraycopy(words, 0, new_words, 0, ival); - } - words = new_words; + int[] new_words = new int [nwords]; + if (words == null) + { + new_words[0] = ival; + ival = 1; + } + else + { + if (nwords < ival) + ival = nwords; + System.arraycopy(words, 0, new_words, 0, ival); + } + words = new_words; } } @@ -588,19 +588,19 @@ public class BigInteger extends Number implements Comparable int i = len; if (i > 0) { - int word = words[--i]; - if (word == -1) - { - while (i > 0 && (word = words[i - 1]) < 0) - { - i--; - if (word != -1) break; - } - } - else - { - while (word == 0 && i > 0 && (word = words[i - 1]) >= 0) i--; - } + int word = words[--i]; + if (word == -1) + { + while (i > 0 && (word = words[i - 1]) < 0) + { + i--; + if (word != -1) break; + } + } + else + { + while (word == 0 && i > 0 && (word = words[i - 1]) >= 0) i--; + } } return i + 1; } @@ -608,11 +608,11 @@ public class BigInteger extends Number implements Comparable private BigInteger canonicalize() { if (words != null - && (ival = BigInteger.wordsNeeded(words, ival)) <= 1) + && (ival = BigInteger.wordsNeeded(words, ival)) <= 1) { - if (ival == 1) - ival = words[0]; - words = null; + if (ival == 1) + ival = words[0]; + words = null; } if (words == null && ival >= minFixNum && ival <= maxFixNum) return smallFixNums[ival - minFixNum]; @@ -641,17 +641,17 @@ public class BigInteger extends Number implements Comparable { if (x.words == null) { - set((long) x.ival + (long) y); - return; + set((long) x.ival + (long) y); + return; } int len = x.ival; realloc(len + 1); long carry = y; for (int i = 0; i < len; i++) { - carry += ((long) x.words[i] & 0xffffffffL); - words[i] = (int) carry; - carry >>= 32; + carry += ((long) x.words[i] & 0xffffffffL); + words[i] = (int) carry; + carry >>= 32; } if (x.words[len - 1] < 0) carry--; @@ -671,15 +671,15 @@ public class BigInteger extends Number implements Comparable int i = (int) y; if ((long) i == y) { - ival = i; - words = null; + ival = i; + words = null; } else { - realloc(2); - words[0] = i; - words[1] = (int) (y >> 32); - ival = 2; + realloc(2); + words[0] = i; + words[1] = (int) (y >> 32); + ival = 2; } } @@ -698,9 +698,9 @@ public class BigInteger extends Number implements Comparable set(y.ival); else if (this != y) { - realloc(y.ival); - System.arraycopy(y.words, 0, words, 0, y.ival); - ival = y.ival; + realloc(y.ival); + System.arraycopy(y.words, 0, words, 0, y.ival); + ival = y.ival; } } @@ -711,10 +711,10 @@ public class BigInteger extends Number implements Comparable return valueOf((long) k * (long) y.ival + (long) x.ival); if (k != 1) { - if (k == -1) - y = BigInteger.neg(y); - else - y = BigInteger.times(y, valueOf(k)); + if (k == -1) + y = BigInteger.neg(y); + else + y = BigInteger.times(y, valueOf(k)); } if (x.words == null) return BigInteger.add(y, x.ival); @@ -723,7 +723,7 @@ public class BigInteger extends Number implements Comparable // Both are big if (y.ival > x.ival) { // Swap so x is longer then y. - BigInteger tmp = x; x = y; y = tmp; + BigInteger tmp = x; x = y; y = tmp; } BigInteger result = alloc(x.ival + 1); int i = y.ival; @@ -731,9 +731,9 @@ public class BigInteger extends Number implements Comparable long y_ext = y.words[i - 1] < 0 ? 0xffffffffL : 0; for (; i < x.ival; i++) { - carry += ((long) x.words[i] & 0xffffffffL) + y_ext; - result.words[i] = (int) carry; - carry >>>= 32; + carry += ((long) x.words[i] & 0xffffffffL) + y_ext; + result.words[i] = (int) carry; + carry >>>= 32; } if (x.words[i - 1] < 0) y_ext--; @@ -782,16 +782,16 @@ public class BigInteger extends Number implements Comparable BigInteger result = BigInteger.alloc(xlen + 1); if (xwords[xlen - 1] < 0) { - negative = true; - negate(result.words, xwords, xlen); - xwords = result.words; + negative = true; + negate(result.words, xwords, xlen); + xwords = result.words; } else negative = false; if (y < 0) { - negative = !negative; - y = -y; + negative = !negative; + y = -y; } result.words[xlen] = MPN.mul_1(result.words, xwords, xlen, y); result.ival = xlen + 1; @@ -813,28 +813,28 @@ public class BigInteger extends Number implements Comparable int ylen = y.ival; if (x.isNegative()) { - negative = true; - xwords = new int[xlen]; - negate(xwords, x.words, xlen); + negative = true; + xwords = new int[xlen]; + negate(xwords, x.words, xlen); } else { - negative = false; - xwords = x.words; + negative = false; + xwords = x.words; } if (y.isNegative()) { - negative = !negative; - ywords = new int[ylen]; - negate(ywords, y.words, ylen); + negative = !negative; + ywords = new int[ylen]; + negate(ywords, y.words, ylen); } else ywords = y.words; // Swap if x is shorter then y. if (xlen < ylen) { - int[] twords = xwords; xwords = ywords; ywords = twords; - int tlen = xlen; xlen = ylen; ylen = tlen; + int[] twords = xwords; xwords = ywords; ywords = twords; + int tlen = xlen; xlen = ylen; ylen = tlen; } BigInteger result = BigInteger.alloc(xlen+ylen); MPN.mul(result.words, xwords, xlen, ywords, ylen); @@ -858,42 +858,42 @@ public class BigInteger extends Number implements Comparable } private static void divide(long x, long y, - BigInteger quotient, BigInteger remainder, - int rounding_mode) + BigInteger quotient, BigInteger remainder, + int rounding_mode) { boolean xNegative, yNegative; if (x < 0) { - xNegative = true; - if (x == Long.MIN_VALUE) - { - divide(valueOf(x), valueOf(y), - quotient, remainder, rounding_mode); - return; - } - x = -x; + xNegative = true; + if (x == Long.MIN_VALUE) + { + divide(valueOf(x), valueOf(y), + quotient, remainder, rounding_mode); + return; + } + x = -x; } else xNegative = false; if (y < 0) { - yNegative = true; - if (y == Long.MIN_VALUE) - { - if (rounding_mode == TRUNCATE) - { // x != Long.Min_VALUE implies abs(x) < abs(y) - if (quotient != null) - quotient.set(0); - if (remainder != null) - remainder.set(x); - } - else - divide(valueOf(x), valueOf(y), - quotient, remainder, rounding_mode); - return; - } - y = -y; + yNegative = true; + if (y == Long.MIN_VALUE) + { + if (rounding_mode == TRUNCATE) + { // x != Long.Min_VALUE implies abs(x) < abs(y) + if (quotient != null) + quotient.set(0); + if (remainder != null) + remainder.set(x); + } + else + divide(valueOf(x), valueOf(y), + quotient, remainder, rounding_mode); + return; + } + y = -y; } else yNegative = false; @@ -905,47 +905,47 @@ public class BigInteger extends Number implements Comparable boolean add_one = false; if (r != 0) { - switch (rounding_mode) - { - case TRUNCATE: - break; - case CEILING: - case FLOOR: - if (qNegative == (rounding_mode == FLOOR)) - add_one = true; - break; - case ROUND: - add_one = r > ((y - (q & 1)) >> 1); - break; - } + switch (rounding_mode) + { + case TRUNCATE: + break; + case CEILING: + case FLOOR: + if (qNegative == (rounding_mode == FLOOR)) + add_one = true; + break; + case ROUND: + add_one = r > ((y - (q & 1)) >> 1); + break; + } } if (quotient != null) { - if (add_one) - q++; - if (qNegative) - q = -q; - quotient.set(q); + if (add_one) + q++; + if (qNegative) + q = -q; + quotient.set(q); } if (remainder != null) { - // The remainder is by definition: X-Q*Y - if (add_one) - { - // Subtract the remainder from Y. - r = y - r; - // In this case, abs(Q*Y) > abs(X). - // So sign(remainder) = -sign(X). - xNegative = ! xNegative; - } - else - { - // If !add_one, then: abs(Q*Y) <= abs(X). - // So sign(remainder) = sign(X). - } - if (xNegative) - r = -r; - remainder.set(r); + // The remainder is by definition: X-Q*Y + if (add_one) + { + // Subtract the remainder from Y. + r = y - r; + // In this case, abs(Q*Y) > abs(X). + // So sign(remainder) = -sign(X). + xNegative = ! xNegative; + } + else + { + // If !add_one, then: abs(Q*Y) <= abs(X). + // So sign(remainder) = sign(X). + } + if (xNegative) + r = -r; + remainder.set(r); } } @@ -958,19 +958,19 @@ public class BigInteger extends Number implements Comparable * @param rounding_mode one of FLOOR, CEILING, TRUNCATE, or ROUND. */ private static void divide(BigInteger x, BigInteger y, - BigInteger quotient, BigInteger remainder, - int rounding_mode) + BigInteger quotient, BigInteger remainder, + int rounding_mode) { if ((x.words == null || x.ival <= 2) - && (y.words == null || y.ival <= 2)) + && (y.words == null || y.ival <= 2)) { - long x_l = x.longValue(); - long y_l = y.longValue(); - if (x_l != Long.MIN_VALUE && y_l != Long.MIN_VALUE) - { - divide(x_l, y_l, quotient, remainder, rounding_mode); - return; - } + long x_l = x.longValue(); + long y_l = y.longValue(); + if (x_l != Long.MIN_VALUE && y_l != Long.MIN_VALUE) + { + divide(x_l, y_l, quotient, remainder, rounding_mode); + return; + } } boolean xNegative = x.isNegative(); @@ -992,57 +992,57 @@ public class BigInteger extends Number implements Comparable int cmpval = MPN.cmp(xwords, xlen, ywords, ylen); if (cmpval < 0) // abs(x) < abs(y) { // quotient = 0; remainder = num. - int[] rwords = xwords; xwords = ywords; ywords = rwords; - rlen = xlen; qlen = 1; xwords[0] = 0; + int[] rwords = xwords; xwords = ywords; ywords = rwords; + rlen = xlen; qlen = 1; xwords[0] = 0; } else if (cmpval == 0) // abs(x) == abs(y) { - xwords[0] = 1; qlen = 1; // quotient = 1 - ywords[0] = 0; rlen = 1; // remainder = 0; + xwords[0] = 1; qlen = 1; // quotient = 1 + ywords[0] = 0; rlen = 1; // remainder = 0; } else if (ylen == 1) { - qlen = xlen; - // Need to leave room for a word of leading zeros if dividing by 1 - // and the dividend has the high bit set. It might be safe to - // increment qlen in all cases, but it certainly is only necessary - // in the following case. - if (ywords[0] == 1 && xwords[xlen-1] < 0) - qlen++; - rlen = 1; - ywords[0] = MPN.divmod_1(xwords, xwords, xlen, ywords[0]); + qlen = xlen; + // Need to leave room for a word of leading zeros if dividing by 1 + // and the dividend has the high bit set. It might be safe to + // increment qlen in all cases, but it certainly is only necessary + // in the following case. + if (ywords[0] == 1 && xwords[xlen-1] < 0) + qlen++; + rlen = 1; + ywords[0] = MPN.divmod_1(xwords, xwords, xlen, ywords[0]); } else // abs(x) > abs(y) { - // Normalize the denominator, i.e. make its most significant bit set by - // shifting it normalization_steps bits to the left. Also shift the - // numerator the same number of steps (to keep the quotient the same!). + // Normalize the denominator, i.e. make its most significant bit set by + // shifting it normalization_steps bits to the left. Also shift the + // numerator the same number of steps (to keep the quotient the same!). - int nshift = MPN.count_leading_zeros(ywords[ylen - 1]); - if (nshift != 0) - { - // Shift up the denominator setting the most significant bit of - // the most significant word. - MPN.lshift(ywords, 0, ywords, ylen, nshift); + int nshift = MPN.count_leading_zeros(ywords[ylen - 1]); + if (nshift != 0) + { + // Shift up the denominator setting the most significant bit of + // the most significant word. + MPN.lshift(ywords, 0, ywords, ylen, nshift); - // Shift up the numerator, possibly introducing a new most - // significant word. - int x_high = MPN.lshift(xwords, 0, xwords, xlen, nshift); - xwords[xlen++] = x_high; - } + // Shift up the numerator, possibly introducing a new most + // significant word. + int x_high = MPN.lshift(xwords, 0, xwords, xlen, nshift); + xwords[xlen++] = x_high; + } - if (xlen == ylen) - xwords[xlen++] = 0; - MPN.divide(xwords, xlen, ywords, ylen); - rlen = ylen; - MPN.rshift0 (ywords, xwords, 0, rlen, nshift); + if (xlen == ylen) + xwords[xlen++] = 0; + MPN.divide(xwords, xlen, ywords, ylen); + rlen = ylen; + MPN.rshift0 (ywords, xwords, 0, rlen, nshift); - qlen = xlen + 1 - ylen; - if (quotient != null) - { - for (int i = 0; i < qlen; i++) - xwords[i] = xwords[i+ylen]; - } + qlen = xlen + 1 - ylen; + if (quotient != null) + { + for (int i = 0; i < qlen; i++) + xwords[i] = xwords[i+ylen]; + } } if (ywords[rlen-1] < 0) @@ -1056,74 +1056,74 @@ public class BigInteger extends Number implements Comparable boolean add_one = false; if (rlen > 1 || ywords[0] != 0) { // Non-zero remainder i.e. in-exact quotient. - switch (rounding_mode) - { - case TRUNCATE: - break; - case CEILING: - case FLOOR: - if (qNegative == (rounding_mode == FLOOR)) - add_one = true; - break; - case ROUND: - // int cmp = compareTo(remainder<<1, abs(y)); - BigInteger tmp = remainder == null ? new BigInteger() : remainder; - tmp.set(ywords, rlen); - tmp = shift(tmp, 1); - if (yNegative) - tmp.setNegative(); - int cmp = compareTo(tmp, y); - // Now cmp == compareTo(sign(y)*(remainder<<1), y) - if (yNegative) - cmp = -cmp; - add_one = (cmp == 1) || (cmp == 0 && (xwords[0]&1) != 0); - } + switch (rounding_mode) + { + case TRUNCATE: + break; + case CEILING: + case FLOOR: + if (qNegative == (rounding_mode == FLOOR)) + add_one = true; + break; + case ROUND: + // int cmp = compareTo(remainder<<1, abs(y)); + BigInteger tmp = remainder == null ? new BigInteger() : remainder; + tmp.set(ywords, rlen); + tmp = shift(tmp, 1); + if (yNegative) + tmp.setNegative(); + int cmp = compareTo(tmp, y); + // Now cmp == compareTo(sign(y)*(remainder<<1), y) + if (yNegative) + cmp = -cmp; + add_one = (cmp == 1) || (cmp == 0 && (xwords[0]&1) != 0); + } } if (quotient != null) { - quotient.set(xwords, qlen); - if (qNegative) - { - if (add_one) // -(quotient + 1) == ~(quotient) - quotient.setInvert(); - else - quotient.setNegative(); - } - else if (add_one) - quotient.setAdd(1); + quotient.set(xwords, qlen); + if (qNegative) + { + if (add_one) // -(quotient + 1) == ~(quotient) + quotient.setInvert(); + else + quotient.setNegative(); + } + else if (add_one) + quotient.setAdd(1); } if (remainder != null) { - // The remainder is by definition: X-Q*Y - remainder.set(ywords, rlen); - if (add_one) - { - // Subtract the remainder from Y: - // abs(R) = abs(Y) - abs(orig_rem) = -(abs(orig_rem) - abs(Y)). - BigInteger tmp; - if (y.words == null) - { - tmp = remainder; - tmp.set(yNegative ? ywords[0] + y.ival : ywords[0] - y.ival); - } - else - tmp = BigInteger.add(remainder, y, yNegative ? 1 : -1); - // Now tmp <= 0. - // In this case, abs(Q) = 1 + floor(abs(X)/abs(Y)). - // Hence, abs(Q*Y) > abs(X). - // So sign(remainder) = -sign(X). - if (xNegative) - remainder.setNegative(tmp); - else - remainder.set(tmp); - } - else - { - // If !add_one, then: abs(Q*Y) <= abs(X). - // So sign(remainder) = sign(X). - if (xNegative) - remainder.setNegative(); - } + // The remainder is by definition: X-Q*Y + remainder.set(ywords, rlen); + if (add_one) + { + // Subtract the remainder from Y: + // abs(R) = abs(Y) - abs(orig_rem) = -(abs(orig_rem) - abs(Y)). + BigInteger tmp; + if (y.words == null) + { + tmp = remainder; + tmp.set(yNegative ? ywords[0] + y.ival : ywords[0] - y.ival); + } + else + tmp = BigInteger.add(remainder, y, yNegative ? 1 : -1); + // Now tmp <= 0. + // In this case, abs(Q) = 1 + floor(abs(X)/abs(Y)). + // Hence, abs(Q*Y) > abs(X). + // So sign(remainder) = -sign(X). + if (xNegative) + remainder.setNegative(tmp); + else + remainder.set(tmp); + } + else + { + // If !add_one, then: abs(Q*Y) <= abs(X). + // So sign(remainder) = sign(X). + if (xNegative) + remainder.setNegative(); + } } } @@ -1220,9 +1220,9 @@ public class BigInteger extends Number implements Comparable { if (exponent <= 0) { - if (exponent == 0) - return ONE; - throw new ArithmeticException("negative exponent"); + if (exponent == 0) + return ONE; + throw new ArithmeticException("negative exponent"); } if (USING_NATIVE) @@ -1240,28 +1240,28 @@ public class BigInteger extends Number implements Comparable int[] pow2 = new int [blen]; int[] rwords = new int [blen]; int[] work = new int [blen]; - getAbsolute(pow2); // pow2 = abs(this); + getAbsolute(pow2); // pow2 = abs(this); int rlen = 1; rwords[0] = 1; // rwords = 1; for (;;) // for (i = 0; ; i++) { - // pow2 == this**(2**i) - // prod = this**(sum(j=0..i-1, (exponent>>j)&1)) - if ((exponent & 1) != 0) - { // r *= pow2 - MPN.mul(work, pow2, plen, rwords, rlen); - int[] temp = work; work = rwords; rwords = temp; - rlen += plen; - while (rwords[rlen - 1] == 0) rlen--; - } - exponent >>= 1; - if (exponent == 0) - break; - // pow2 *= pow2; - MPN.mul(work, pow2, plen, pow2, plen); - int[] temp = work; work = pow2; pow2 = temp; // swap to avoid a copy - plen *= 2; - while (pow2[plen - 1] == 0) plen--; + // pow2 == this**(2**i) + // prod = this**(sum(j=0..i-1, (exponent>>j)&1)) + if ((exponent & 1) != 0) + { // r *= pow2 + MPN.mul(work, pow2, plen, rwords, rlen); + int[] temp = work; work = rwords; rwords = temp; + rlen += plen; + while (rwords[rlen - 1] == 0) rlen--; + } + exponent >>= 1; + if (exponent == 0) + break; + // pow2 *= pow2; + MPN.mul(work, pow2, plen, pow2, plen); + int[] temp = work; work = pow2; pow2 = temp; // swap to avoid a copy + plen *= 2; + while (pow2[plen - 1] == 0) plen--; } if (rwords[rlen - 1] < 0) rlen++; @@ -1276,11 +1276,11 @@ public class BigInteger extends Number implements Comparable throw new ArithmeticException("not invertible"); if (b == 1) - // Success: values are indeed invertible! - // Bottom of the recursion reached; start unwinding. - return new int[] { -prevDiv, 1 }; + // Success: values are indeed invertible! + // Bottom of the recursion reached; start unwinding. + return new int[] { -prevDiv, 1 }; - int[] xy = euclidInv(b, a % b, a / b); // Recursion happens here. + int[] xy = euclidInv(b, a % b, a / b); // Recursion happens here. a = xy[0]; // use our local copy of 'a' as a work var xy[0] = a * -prevDiv + xy[1]; xy[1] = a; @@ -1295,11 +1295,11 @@ public class BigInteger extends Number implements Comparable if (b.isOne()) { - // Success: values are indeed invertible! - // Bottom of the recursion reached; start unwinding. - xy[0] = neg(prevDiv); + // Success: values are indeed invertible! + // Bottom of the recursion reached; start unwinding. + xy[0] = neg(prevDiv); xy[1] = ONE; - return; + return; } // Recursion happens in the following conditional! @@ -1308,18 +1308,18 @@ public class BigInteger extends Number implements Comparable if (a.words == null) { int[] xyInt = euclidInv(b.ival, a.ival % b.ival, a.ival / b.ival); - xy[0] = new BigInteger(xyInt[0]); + xy[0] = new BigInteger(xyInt[0]); xy[1] = new BigInteger(xyInt[1]); } else { - BigInteger rem = new BigInteger(); - BigInteger quot = new BigInteger(); - divide(a, b, quot, rem, FLOOR); + BigInteger rem = new BigInteger(); + BigInteger quot = new BigInteger(); + divide(a, b, quot, rem, FLOOR); // quot and rem may not be in canonical form. ensure rem.canonicalize(); quot.canonicalize(); - euclidInv(b, rem, quot, xy); + euclidInv(b, rem, quot, xy); } BigInteger t = xy[0]; @@ -1358,61 +1358,61 @@ public class BigInteger extends Number implements Comparable if (y.words == null) { - // The result is guaranteed to be less than the modulus, y (which is - // an int), so simplify this by working with the int result of this - // modulo y. Also, if this is negative, make it positive via modulo - // math. Note that BigInteger.mod() must be used even if this is - // already an int as the % operator would provide a negative result if - // this is negative, BigInteger.mod() never returns negative values. + // The result is guaranteed to be less than the modulus, y (which is + // an int), so simplify this by working with the int result of this + // modulo y. Also, if this is negative, make it positive via modulo + // math. Note that BigInteger.mod() must be used even if this is + // already an int as the % operator would provide a negative result if + // this is negative, BigInteger.mod() never returns negative values. int xval = (words != null || isNegative()) ? mod(y).ival : ival; int yval = y.ival; - // Swap values so x > y. - if (yval > xval) - { - int tmp = xval; xval = yval; yval = tmp; - swapped = true; - } - // Normally, the result is in the 2nd element of the array, but - // if originally x < y, then x and y were swapped and the result - // is in the 1st element of the array. - result.ival = - euclidInv(yval, xval % yval, xval / yval)[swapped ? 0 : 1]; + // Swap values so x > y. + if (yval > xval) + { + int tmp = xval; xval = yval; yval = tmp; + swapped = true; + } + // Normally, the result is in the 2nd element of the array, but + // if originally x < y, then x and y were swapped and the result + // is in the 1st element of the array. + result.ival = + euclidInv(yval, xval % yval, xval / yval)[swapped ? 0 : 1]; - // Result can't be negative, so make it positive by adding the - // original modulus, y.ival (not the possibly "swapped" yval). - if (result.ival < 0) - result.ival += y.ival; + // Result can't be negative, so make it positive by adding the + // original modulus, y.ival (not the possibly "swapped" yval). + if (result.ival < 0) + result.ival += y.ival; } else { - // As above, force this to be a positive value via modulo math. - BigInteger x = isNegative() ? this.mod(y) : this; + // As above, force this to be a positive value via modulo math. + BigInteger x = isNegative() ? this.mod(y) : this; - // Swap values so x > y. - if (x.compareTo(y) < 0) - { - result = x; x = y; y = result; // use 'result' as a work var - swapped = true; - } - // As above (for ints), result will be in the 2nd element unless - // the original x and y were swapped. - BigInteger rem = new BigInteger(); - BigInteger quot = new BigInteger(); - divide(x, y, quot, rem, FLOOR); + // Swap values so x > y. + if (x.compareTo(y) < 0) + { + result = x; x = y; y = result; // use 'result' as a work var + swapped = true; + } + // As above (for ints), result will be in the 2nd element unless + // the original x and y were swapped. + BigInteger rem = new BigInteger(); + BigInteger quot = new BigInteger(); + divide(x, y, quot, rem, FLOOR); // quot and rem may not be in canonical form. ensure rem.canonicalize(); quot.canonicalize(); - BigInteger[] xy = new BigInteger[2]; - euclidInv(y, rem, quot, xy); - result = swapped ? xy[0] : xy[1]; + BigInteger[] xy = new BigInteger[2]; + euclidInv(y, rem, quot, xy); + result = swapped ? xy[0] : xy[1]; - // Result can't be negative, so make it positive by adding the - // original modulus, y (which is now x if they were swapped). - if (result.isNegative()) - result = add(result, swapped ? x : y, 1); + // Result can't be negative, so make it positive by adding the + // original modulus, y (which is now x if they were swapped). + if (result.isNegative()) + result = add(result, swapped ? x : y, 1); } - + return result; } @@ -1450,10 +1450,10 @@ public class BigInteger extends Number implements Comparable while (!u.isZero()) { - if (u.and(ONE).isOne()) - s = times(s, t).mod(m); - u = u.shiftRight(1); - t = times(t, t).mod(m); + if (u.and(ONE).isOne()) + s = times(s, t).mod(m); + u = u.shiftRight(1); + t = times(t, t).mod(m); } return s; @@ -1466,18 +1466,18 @@ public class BigInteger extends Number implements Comparable int tmp; if (b > a) { - tmp = a; a = b; b = tmp; + tmp = a; a = b; b = tmp; } for(;;) { - if (b == 0) - return a; + if (b == 0) + return a; if (b == 1) - return b; + return b; tmp = b; - b = a % b; - a = tmp; - } + b = a % b; + a = tmp; + } } public BigInteger gcd(BigInteger y) @@ -1494,24 +1494,24 @@ public class BigInteger extends Number implements Comparable int yval = y.ival; if (words == null) { - if (xval == 0) - return abs(y); - if (y.words == null - && xval != Integer.MIN_VALUE && yval != Integer.MIN_VALUE) - { - if (xval < 0) - xval = -xval; - if (yval < 0) - yval = -yval; - return valueOf(gcd(xval, yval)); - } - xval = 1; + if (xval == 0) + return abs(y); + if (y.words == null + && xval != Integer.MIN_VALUE && yval != Integer.MIN_VALUE) + { + if (xval < 0) + xval = -xval; + if (yval < 0) + yval = -yval; + return valueOf(gcd(xval, yval)); + } + xval = 1; } if (y.words == null) { - if (yval == 0) - return abs(this); - yval = 1; + if (yval == 0) + return abs(this); + yval = 1; } int len = (xval > yval ? xval : yval) + 1; int[] xwords = new int[len]; @@ -1562,12 +1562,12 @@ public class BigInteger extends Number implements Comparable int i; for (i = 0; i < primes.length; i++) { - if (words == null && ival == primes[i]) - return true; + if (words == null && ival == primes[i]) + return true; divide(this, smallFixNums[primes[i] - minFixNum], null, rem, TRUNCATE); if (rem.canonicalize().isZero()) - return false; + return false; } // Now perform the Rabin-Miller test. @@ -1599,23 +1599,23 @@ public class BigInteger extends Number implements Comparable // Remark 4.28 states: "...A strategy that is sometimes employed // is to fix the bases a to be the first few primes instead of // choosing them at random. - z = smallFixNums[primes[t] - minFixNum].modPow(m, this); - if (z.isOne() || z.equals(pMinus1)) - continue; // Passes the test; may be prime. + z = smallFixNums[primes[t] - minFixNum].modPow(m, this); + if (z.isOne() || z.equals(pMinus1)) + continue; // Passes the test; may be prime. - for (i = 0; i < b; ) - { - if (z.isOne()) - return false; - i++; - if (z.equals(pMinus1)) - break; // Passes the test; may be prime. + for (i = 0; i < b; ) + { + if (z.isOne()) + return false; + i++; + if (z.equals(pMinus1)) + break; // Passes the test; may be prime. - z = z.modPow(valueOf(2), this); - } + z = z.modPow(valueOf(2), this); + } - if (i == b && !z.equals(pMinus1)) - return false; + if (i == b && !z.equals(pMinus1)) + return false; } return true; } @@ -1626,8 +1626,8 @@ public class BigInteger extends Number implements Comparable ival = ~ival; else { - for (int i = ival; --i >= 0; ) - words[i] = ~words[i]; + for (int i = ival; --i >= 0; ) + words[i] = ~words[i]; } } @@ -1637,36 +1637,36 @@ public class BigInteger extends Number implements Comparable int xlen; if (x.words == null) { - if (count < 32) - { - set((long) x.ival << count); - return; - } - xwords = new int[1]; - xwords[0] = x.ival; - xlen = 1; + if (count < 32) + { + set((long) x.ival << count); + return; + } + xwords = new int[1]; + xwords[0] = x.ival; + xlen = 1; } else { - xwords = x.words; - xlen = x.ival; + xwords = x.words; + xlen = x.ival; } int word_count = count >> 5; count &= 31; int new_len = xlen + word_count; if (count == 0) { - realloc(new_len); - for (int i = xlen; --i >= 0; ) - words[i+word_count] = xwords[i]; + realloc(new_len); + for (int i = xlen; --i >= 0; ) + words[i+word_count] = xwords[i]; } else { - new_len++; - realloc(new_len); - int shift_out = MPN.lshift(words, word_count, xwords, xlen, count); - count = 32 - count; - words[new_len-1] = (shift_out << count) >> count; // sign-extend. + new_len++; + realloc(new_len); + int shift_out = MPN.lshift(words, word_count, xwords, xlen, count); + count = 32 - count; + words[new_len-1] = (shift_out << count) >> count; // sign-extend. } ival = new_len; for (int i = word_count; --i >= 0; ) @@ -1681,21 +1681,21 @@ public class BigInteger extends Number implements Comparable set(x); else { - boolean neg = x.isNegative(); - int word_count = count >> 5; - count &= 31; - int d_len = x.ival - word_count; - if (d_len <= 0) - set(neg ? -1 : 0); - else - { - if (words == null || words.length < d_len) - realloc(d_len); - MPN.rshift0 (words, x.words, word_count, d_len, count); - ival = d_len; - if (neg) - words[d_len-1] |= -2 << (31 - count); - } + boolean neg = x.isNegative(); + int word_count = count >> 5; + count &= 31; + int d_len = x.ival - word_count; + if (d_len <= 0) + set(neg ? -1 : 0); + else + { + if (words == null || words.length < d_len) + realloc(d_len); + MPN.rshift0 (words, x.words, word_count, d_len, count); + ival = d_len; + if (neg) + words[d_len-1] |= -2 << (31 - count); + } } } @@ -1711,10 +1711,10 @@ public class BigInteger extends Number implements Comparable { if (x.words == null) { - if (count <= 0) - return valueOf(count > -32 ? x.ival >> (-count) : x.ival < 0 ? -1 : 0); - if (count < 32) - return valueOf((long) x.ival << count); + if (count <= 0) + return valueOf(count > -32 ? x.ival >> (-count) : x.ival < 0 ? -1 : 0); + if (count < 32) + return valueOf((long) x.ival << count); } if (count == 0) return x; @@ -1767,57 +1767,57 @@ public class BigInteger extends Number implements Comparable buffer.append(Long.toString(longValue(), radix)); else { - boolean neg = isNegative(); - int[] work; - if (neg || radix != 16) - { - work = new int[ival]; - getAbsolute(work); - } - else - work = words; - int len = ival; + boolean neg = isNegative(); + int[] work; + if (neg || radix != 16) + { + work = new int[ival]; + getAbsolute(work); + } + else + work = words; + int len = ival; - if (radix == 16) - { - if (neg) - buffer.append('-'); - int buf_start = buffer.length(); - for (int i = len; --i >= 0; ) - { - int word = work[i]; - for (int j = 8; --j >= 0; ) - { - int hex_digit = (word >> (4 * j)) & 0xF; - // Suppress leading zeros: - if (hex_digit > 0 || buffer.length() > buf_start) - buffer.append(Character.forDigit(hex_digit, 16)); - } - } - } - else - { - int i = buffer.length(); - for (;;) - { - int digit = MPN.divmod_1(work, work, len, radix); - buffer.append(Character.forDigit(digit, radix)); - while (len > 0 && work[len-1] == 0) len--; - if (len == 0) - break; - } - if (neg) - buffer.append('-'); - /* Reverse buffer. */ - int j = buffer.length() - 1; - while (i < j) - { - char tmp = buffer.charAt(i); - buffer.setCharAt(i, buffer.charAt(j)); - buffer.setCharAt(j, tmp); - i++; j--; - } - } + if (radix == 16) + { + if (neg) + buffer.append('-'); + int buf_start = buffer.length(); + for (int i = len; --i >= 0; ) + { + int word = work[i]; + for (int j = 8; --j >= 0; ) + { + int hex_digit = (word >> (4 * j)) & 0xF; + // Suppress leading zeros: + if (hex_digit > 0 || buffer.length() > buf_start) + buffer.append(Character.forDigit(hex_digit, 16)); + } + } + } + else + { + int i = buffer.length(); + for (;;) + { + int digit = MPN.divmod_1(work, work, len, radix); + buffer.append(Character.forDigit(digit, radix)); + while (len > 0 && work[len-1] == 0) len--; + if (len == 0) + break; + } + if (neg) + buffer.append('-'); + /* Reverse buffer. */ + int j = buffer.length() - 1; + while (i < j) + { + char tmp = buffer.charAt(i); + buffer.setCharAt(i, buffer.charAt(j)); + buffer.setCharAt(j, tmp); + i++; j--; + } + } } } @@ -1900,8 +1900,8 @@ public class BigInteger extends Number implements Comparable return false; for (int i = x.ival; --i >= 0; ) { - if (x.words[i] != y.words[i]) - return false; + if (x.words[i] != y.words[i]) + return false; } return true; } @@ -1915,7 +1915,7 @@ public class BigInteger extends Number implements Comparable } private static BigInteger valueOf(byte[] digits, int byte_len, - boolean negative, int radix) + boolean negative, int radix) { int chars_per_word = MPN.chars_per_word(radix); int[] words = new int[byte_len / chars_per_word + 1]; @@ -1959,7 +1959,7 @@ public class BigInteger extends Number implements Comparable int i; for (i = 0; i < (n >> 5) ; i++) if (words[i] != 0) - return true; + return true; return (n & 31) != 0 && (words[i] & ((1 << (n & 31)) - 1)) != 0; } @@ -2000,7 +2000,7 @@ public class BigInteger extends Number implements Comparable int excess_bits = il - (ml + 1); if (excess_bits > 0) m = ((words == null) ? ival >> excess_bits - : MPN.rshift_long(words, ival, excess_bits)); + : MPN.rshift_long(words, ival, excess_bits)); else m = longValue() << (- excess_bits); @@ -2008,31 +2008,31 @@ public class BigInteger extends Number implements Comparable // any amount, even if it's less than half a step, it overflows. if (exp == 1023 && ((m >> 1) == (1L << 53) - 1)) { - if (remainder || checkBits(il - ml)) - return neg ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY; - else - return neg ? - Double.MAX_VALUE : Double.MAX_VALUE; + if (remainder || checkBits(il - ml)) + return neg ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY; + else + return neg ? - Double.MAX_VALUE : Double.MAX_VALUE; } // Normal round-to-even rule: round up if the bit dropped is a one, and // the bit above it or any of the bits below it is a one. if ((m & 1) == 1 - && ((m & 2) == 2 || remainder || checkBits(excess_bits))) + && ((m & 2) == 2 || remainder || checkBits(excess_bits))) { - m += 2; - // Check if we overflowed the mantissa - if ((m & (1L << 54)) != 0) - { - exp++; - // renormalize - m >>= 1; - } - // Check if a denormalized mantissa was just rounded up to a - // normalized one. - else if (ml == 52 && (m & (1L << 53)) != 0) - exp++; + m += 2; + // Check if we overflowed the mantissa + if ((m & (1L << 54)) != 0) + { + exp++; + // renormalize + m >>= 1; + } + // Check if a denormalized mantissa was just rounded up to a + // normalized one. + else if (ml == 52 && (m & (1L << 53)) != 0) + exp++; } - + // Discard the rounding bit m >>= 1; @@ -2052,14 +2052,14 @@ public class BigInteger extends Number implements Comparable int len; if (this.words == null) { - len = 1; - words[0] = this.ival; + len = 1; + words[0] = this.ival; } else { - len = this.ival; - for (int i = len; --i >= 0; ) - words[i] = this.words[i]; + len = this.ival; + for (int i = len; --i >= 0; ) + words[i] = this.words[i]; } if (words[len - 1] < 0) negate(words, words, len); @@ -2090,11 +2090,11 @@ public class BigInteger extends Number implements Comparable int len = x.ival; if (x.words == null) { - if (len == Integer.MIN_VALUE) - set(- (long) len); - else - set(-len); - return; + if (len == Integer.MIN_VALUE) + set(- (long) len); + else + set(-len); + return; } realloc(len + 1); if (negate(words, x.words, len)) @@ -2139,7 +2139,7 @@ public class BigInteger extends Number implements Comparable if (USING_NATIVE) { BigInteger result = new BigInteger(); - mpz.negate(result.mpz); + mpz.negate(result.mpz); return result; } @@ -2193,8 +2193,8 @@ public class BigInteger extends Number implements Comparable // If BigInteger is an int, then it is in ival and nbytes will be <= 4. while (nbytes > 4) { - word = words[wptr++]; - for (int i = 4; i > 0; --i, word >>= 8) + word = words[wptr++]; + for (int i = 4; i > 0; --i, word >>= 8) bytes[--nbytes] = (byte) word; } @@ -2234,35 +2234,35 @@ public class BigInteger extends Number implements Comparable /** Do one the the 16 possible bit-wise operations of two BigIntegers. */ private static void setBitOp(BigInteger result, int op, - BigInteger x, BigInteger y) + BigInteger x, BigInteger y) { if ((y.words != null) && (x.words == null || x.ival < y.ival)) { - BigInteger temp = x; x = y; y = temp; - op = swappedOp(op); + BigInteger temp = x; x = y; y = temp; + op = swappedOp(op); } int xi; int yi; int xlen, ylen; if (y.words == null) { - yi = y.ival; - ylen = 1; + yi = y.ival; + ylen = 1; } else { - yi = y.words[0]; - ylen = y.ival; + yi = y.words[0]; + ylen = y.ival; } if (x.words == null) { - xi = x.ival; - xlen = 1; + xi = x.ival; + xlen = 1; } else { - xi = x.words[0]; - xlen = x.ival; + xi = x.words[0]; + xlen = x.ival; } if (xlen > 1) result.realloc(xlen); @@ -2277,126 +2277,126 @@ public class BigInteger extends Number implements Comparable switch (op) { case 0: // clr - ni = 0; - break; + ni = 0; + break; case 1: // and - for (;;) - { - ni = xi & yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi < 0) finish = 1; - break; + for (;;) + { + ni = xi & yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi < 0) finish = 1; + break; case 2: // andc2 - for (;;) - { - ni = xi & ~yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi >= 0) finish = 1; - break; + for (;;) + { + ni = xi & ~yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi >= 0) finish = 1; + break; case 3: // copy x - ni = xi; - finish = 1; // Copy rest - break; + ni = xi; + finish = 1; // Copy rest + break; case 4: // andc1 - for (;;) - { - ni = ~xi & yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi < 0) finish = 2; - break; + for (;;) + { + ni = ~xi & yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi < 0) finish = 2; + break; case 5: // copy y - for (;;) - { - ni = yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - break; + for (;;) + { + ni = yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + break; case 6: // xor - for (;;) - { - ni = xi ^ yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - finish = yi < 0 ? 2 : 1; - break; + for (;;) + { + ni = xi ^ yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + finish = yi < 0 ? 2 : 1; + break; case 7: // ior - for (;;) - { - ni = xi | yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi >= 0) finish = 1; - break; + for (;;) + { + ni = xi | yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi >= 0) finish = 1; + break; case 8: // nor - for (;;) - { - ni = ~(xi | yi); - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi >= 0) finish = 2; - break; + for (;;) + { + ni = ~(xi | yi); + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi >= 0) finish = 2; + break; case 9: // eqv [exclusive nor] - for (;;) - { - ni = ~(xi ^ yi); - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - finish = yi >= 0 ? 2 : 1; - break; + for (;;) + { + ni = ~(xi ^ yi); + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + finish = yi >= 0 ? 2 : 1; + break; case 10: // c2 - for (;;) - { - ni = ~yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - break; + for (;;) + { + ni = ~yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + break; case 11: // orc2 - for (;;) - { - ni = xi | ~yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi < 0) finish = 1; - break; + for (;;) + { + ni = xi | ~yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi < 0) finish = 1; + break; case 12: // c1 - ni = ~xi; - finish = 2; - break; + ni = ~xi; + finish = 2; + break; case 13: // orc1 - for (;;) - { - ni = ~xi | yi; - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi >= 0) finish = 2; - break; + for (;;) + { + ni = ~xi | yi; + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi >= 0) finish = 2; + break; case 14: // nand - for (;;) - { - ni = ~(xi & yi); - if (i+1 >= ylen) break; - w[i++] = ni; xi = x.words[i]; yi = y.words[i]; - } - if (yi < 0) finish = 2; - break; + for (;;) + { + ni = ~(xi & yi); + if (i+1 >= ylen) break; + w[i++] = ni; xi = x.words[i]; yi = y.words[i]; + } + if (yi < 0) finish = 2; + break; default: case 15: // set - ni = -1; - break; + ni = -1; + break; } // Here i==ylen-1; w[0]..w[i-1] have the correct result; // and ni contains the correct result for w[i+1]. @@ -2405,13 +2405,13 @@ public class BigInteger extends Number implements Comparable switch (finish) { case 0: - if (i == 0 && w == null) - { - result.ival = ni; - return; - } - w[i++] = ni; - break; + if (i == 0 && w == null) + { + result.ival = ni; + return; + } + w[i++] = ni; + break; case 1: w[i] = ni; while (++i < xlen) w[i] = x.words[i]; break; case 2: w[i] = ni; while (++i < xlen) w[i] = ~x.words[i]; break; } @@ -2590,15 +2590,15 @@ public class BigInteger extends Number implements Comparable // bit4count[I] is number of '1' bits in I. private static final byte[] bit4_count = { 0, 1, 1, 2, 1, 2, 2, 3, - 1, 2, 2, 3, 2, 3, 3, 4}; + 1, 2, 2, 3, 2, 3, 3, 4}; private static int bitCount(int i) { int count = 0; while (i != 0) { - count += bit4_count[i & 15]; - i >>>= 4; + count += bit4_count[i & 15]; + i >>>= 4; } return count; } @@ -2622,13 +2622,13 @@ public class BigInteger extends Number implements Comparable int[] x_words = words; if (x_words == null) { - x_len = 1; - i = bitCount(ival); + x_len = 1; + i = bitCount(ival); } else { - x_len = ival; - i = bitCount(x_words, x_len); + x_len = ival; + i = bitCount(x_words, x_len); } return isNegative() ? x_len * 32 - i : i; } @@ -2646,19 +2646,19 @@ public class BigInteger extends Number implements Comparable } else { - s.defaultReadObject(); - if (magnitude.length == 0 || signum == 0) - { - this.ival = 0; - this.words = null; - } - else - { - words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0); - BigInteger result = make(words, words.length); - this.ival = result.ival; - this.words = result.words; - } + s.defaultReadObject(); + if (magnitude.length == 0 || signum == 0) + { + this.ival = 0; + this.words = null; + } + else + { + words = byteArrayToIntArray(magnitude, signum < 0 ? -1 : 0); + BigInteger result = make(words, words.length); + this.ival = result.ival; + this.words = result.words; + } } } diff --git a/libjava/classpath/java/math/MathContext.java b/libjava/classpath/java/math/MathContext.java index 533ab13acf3..16114954031 100644 --- a/libjava/classpath/java/math/MathContext.java +++ b/libjava/classpath/java/math/MathContext.java @@ -1,4 +1,4 @@ -/* MathContext.java -- +/* MathContext.java -- Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,58 +49,58 @@ import java.io.Serializable; public final class MathContext implements Serializable { /** A MathContext for unlimited precision arithmetic * */ - public static final MathContext UNLIMITED = + public static final MathContext UNLIMITED = new MathContext(0, RoundingMode.HALF_UP); - + /** * A MathContext for the IEEE 754R Decimal32 format - 7 digit preicision and * HALF_EVEN rounding. */ - public static final MathContext DECIMAL32 = + public static final MathContext DECIMAL32 = new MathContext(7, RoundingMode.HALF_EVEN); - + /** * A MathContext for the IEEE 754R Decimal64 format - 16 digit preicision and * HALF_EVEN rounding. */ - public static final MathContext DECIMAL64 = + public static final MathContext DECIMAL64 = new MathContext(16, RoundingMode.HALF_EVEN); - + /** * A MathContext for the IEEE 754R Decimal128 format - 34 digit preicision and * HALF_EVEN rounding. */ - public static final MathContext DECIMAL128 = + public static final MathContext DECIMAL128 = new MathContext(34, RoundingMode.HALF_EVEN); - + /** * This is the serialVersionUID reported here: * java.sun.com/j2se/1.5.0/docs/api/serialized-form.html#java.math.MathContext */ private static final long serialVersionUID = 5579720004786848255L; - + private int precision; - + private RoundingMode roundMode; - + /** * Constructs a new MathContext with the specified precision and with HALF_UP * rounding. * @param setPrecision the precision for the new MathContext - * + * * @throws IllegalArgumentException if precision is < 0. */ public MathContext(int setPrecision) { this(setPrecision, RoundingMode.HALF_UP); } - + /** * Constructs a new MathContext with the specified precision and rounding * mode. * @param setPrecision the precision * @param setRoundingMode the rounding mode - * + * * @throws IllegalArgumentException if precision is < 0. */ public MathContext(int setPrecision, RoundingMode setRoundingMode) @@ -110,12 +110,12 @@ public final class MathContext implements Serializable precision = setPrecision; roundMode = setRoundingMode; } - + /** * Constructs a MathContext from a String that has the same form as one * produced by the toString() method. * @param val - * + * * @throws IllegalArgumentException if the String is not in the correct * format or if the precision specified is < 0. */ @@ -138,11 +138,11 @@ public final class MathContext implements Serializable if (precision < 0) throw new IllegalArgumentException("Precision cannot be less than 0."); } - + /** * Returns true if x is a MathContext and has the same precision setting * and rounding mode as this MathContext. - * + * * @return true if the above conditions hold */ public boolean equals(Object x) @@ -153,7 +153,7 @@ public final class MathContext implements Serializable return mc.precision == this.precision && mc.roundMode.equals(this.roundMode); } - + /** * Returns the precision setting. * @return the precision setting. @@ -162,11 +162,11 @@ public final class MathContext implements Serializable { return precision; } - + /** - * Returns the rounding mode setting. This will be one of - * RoundingMode.CEILING, RoundingMode.DOWN, RoundingMode.FLOOR, - * RoundingMode.HALF_DOWN, RoundingMode.HALF_EVEN, RoundingMode.HALF_UP, + * Returns the rounding mode setting. This will be one of + * RoundingMode.CEILING, RoundingMode.DOWN, RoundingMode.FLOOR, + * RoundingMode.HALF_DOWN, RoundingMode.HALF_EVEN, RoundingMode.HALF_UP, * RoundingMode.UNNECESSARY, or RoundingMode.UP. * @return the rounding mode setting. */ @@ -174,19 +174,19 @@ public final class MathContext implements Serializable { return roundMode; } - + /** - * Returns "precision=p roundingMode=MODE" where p is an int giving the + * Returns "precision=p roundingMode=MODE" where p is an int giving the * precision and MODE is UP, DOWN, HALF_UP, HALF_DOWN, HALF_EVEN, CEILING, * FLOOR, or UNNECESSARY corresponding to rounding modes. - * + * * @return a String describing this MathContext */ public String toString() { return "precision="+precision+" roundingMode="+roundMode; } - + /** * Returns the hashcode for this MathContext. * @return the hashcode for this MathContext. diff --git a/libjava/classpath/java/math/RoundingMode.java b/libjava/classpath/java/math/RoundingMode.java index c85bf4ff533..140f0a36e4c 100644 --- a/libjava/classpath/java/math/RoundingMode.java +++ b/libjava/classpath/java/math/RoundingMode.java @@ -1,4 +1,4 @@ -/* RoundingMode.java -- An Enum to replace BigDecimal rounding constants. +/* RoundingMode.java -- An Enum to replace BigDecimal rounding constants. Copyright (C) 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,7 +52,7 @@ public enum RoundingMode * For compatability with Sun's JDK */ private static final long serialVersionUID = 432302042773881265L; - + /** * Returns the RoundingMode object corresponding to the legacy rounding modes * in BigDecimal. @@ -80,9 +80,9 @@ public enum RoundingMode case BigDecimal.ROUND_UNNECESSARY: return UNNECESSARY; default: - throw new - IllegalArgumentException("invalid argument: " + rm + - ". Argument should be one of the " + + throw new + IllegalArgumentException("invalid argument: " + rm + + ". Argument should be one of the " + "rounding modes defined in BigDecimal."); } } diff --git a/libjava/classpath/java/net/ContentHandler.java b/libjava/classpath/java/net/ContentHandler.java index 7f63e740229..fed8f3de4b5 100644 --- a/libjava/classpath/java/net/ContentHandler.java +++ b/libjava/classpath/java/net/ContentHandler.java @@ -117,8 +117,8 @@ public abstract class ContentHandler for (int i = 0; i < classes.length; i++) { - if (classes[i].isInstance(obj)) - return obj; + if (classes[i].isInstance(obj)) + return obj; } return null; diff --git a/libjava/classpath/java/net/DatagramSocket.java b/libjava/classpath/java/net/DatagramSocket.java index ea681a1ab0a..6ca9c42fea6 100644 --- a/libjava/classpath/java/net/DatagramSocket.java +++ b/libjava/classpath/java/net/DatagramSocket.java @@ -196,15 +196,15 @@ public class DatagramSocket else try { - impl = - (DatagramSocketImpl) Class.forName("java.net." + propVal - + "DatagramSocketImpl") - .newInstance(); + impl = + (DatagramSocketImpl) Class.forName("java.net." + propVal + + "DatagramSocketImpl") + .newInstance(); } catch (Exception e) { - System.err.println("Could not instantiate class: java.net." - + propVal + "DatagramSocketImpl"); + System.err.println("Could not instantiate class: java.net." + + propVal + "DatagramSocketImpl"); try { impl = new PlainDatagramSocketImpl(); @@ -226,19 +226,19 @@ public class DatagramSocket { try { - if (! implCreated) - { - impl.create(); - implCreated = true; - } + if (! implCreated) + { + impl.create(); + implCreated = true; + } - return impl; + return impl; } catch (IOException e) { - SocketException se = new SocketException(); - se.initCause(e); - throw se; + SocketException se = new SocketException(); + se.initCause(e); + throw se; } } @@ -252,27 +252,27 @@ public class DatagramSocket try { - getImpl().close(); + getImpl().close(); } catch (SocketException e) { - // Ignore this case, just close the socket in finally clause. + // Ignore this case, just close the socket in finally clause. } finally { - remoteAddress = null; - remotePort = -1; - impl = null; + remoteAddress = null; + remotePort = -1; + impl = null; } try { - if (getChannel() != null) - getChannel().close(); + if (getChannel() != null) + getChannel().close(); } catch (IOException e) { - // Do nothing. + // Do nothing. } } @@ -320,21 +320,21 @@ public class DatagramSocket try { - localAddr = - (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR); + localAddr = + (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR); - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkConnect(localAddr.getHostAddress(), -1); + SecurityManager s = System.getSecurityManager(); + if (s != null) + s.checkConnect(localAddr.getHostAddress(), -1); } catch (SecurityException e) { - localAddr = InetAddress.ANY_IF; + localAddr = InetAddress.ANY_IF; } catch (SocketException e) { - // This cannot happen as we are bound. - return null; + // This cannot happen as we are bound. + return null; } return localAddr; @@ -352,12 +352,12 @@ public class DatagramSocket try { - return getImpl().getLocalPort(); + return getImpl().getLocalPort(); } catch (SocketException e) { - // This cannot happen as we are bound. - return 0; + // This cannot happen as we are bound. + return 0; } } @@ -529,13 +529,13 @@ public class DatagramSocket try { - getImpl().connect(address, port); - remoteAddress = address; - remotePort = port; + getImpl().connect(address, port); + remoteAddress = address; + remotePort = port; } catch (SocketException e) { - // This means simply not connected or connect not implemented. + // This means simply not connected or connect not implemented. } } @@ -553,16 +553,16 @@ public class DatagramSocket try { - getImpl().disconnect(); + getImpl().disconnect(); } catch (SocketException e) { - // This cannot happen as we are connected. + // This cannot happen as we are connected. } finally { - remoteAddress = null; - remotePort = -1; + remoteAddress = null; + remotePort = -1; } } @@ -592,7 +592,7 @@ public class DatagramSocket if (remoteAddress != null && remoteAddress.isMulticastAddress()) throw new IOException - ("Socket connected to a multicast address my not receive"); + ("Socket connected to a multicast address my not receive"); if (getChannel() != null && ! getChannel().isBlocking() && ! ((DatagramChannelImpl) getChannel()).isInChannelOperation()) @@ -635,19 +635,19 @@ public class DatagramSocket SecurityManager s = System.getSecurityManager(); if (s != null && ! isConnected()) { - InetAddress addr = p.getAddress(); - if (addr.isMulticastAddress()) - s.checkMulticast(addr); - else - s.checkConnect(addr.getHostAddress(), p.getPort()); + InetAddress addr = p.getAddress(); + if (addr.isMulticastAddress()) + s.checkMulticast(addr); + else + s.checkConnect(addr.getHostAddress(), p.getPort()); } if (isConnected()) { - if (p.getAddress() != null - && (remoteAddress != p.getAddress() || remotePort != p.getPort())) - throw new IllegalArgumentException - ("DatagramPacket address does not match remote address"); + if (p.getAddress() != null + && (remoteAddress != p.getAddress() || remotePort != p.getPort())) + throw new IllegalArgumentException + ("DatagramPacket address does not match remote address"); } // FIXME: if this is a subclass of MulticastSocket, @@ -675,7 +675,7 @@ public class DatagramSocket { if (isClosed()) throw new SocketException("socket is closed"); - + if (address == null) address = new InetSocketAddress(InetAddress.ANY_IF, 0); @@ -697,23 +697,23 @@ public class DatagramSocket try { - getImpl().bind(port, addr); - bound = true; + getImpl().bind(port, addr); + bound = true; } catch (SocketException exception) { - getImpl().close(); - throw exception; + getImpl().close(); + throw exception; } catch (RuntimeException exception) { - getImpl().close(); - throw exception; + getImpl().close(); + throw exception; } catch (Error error) { - getImpl().close(); - throw error; + getImpl().close(); + throw error; } } diff --git a/libjava/classpath/java/net/DatagramSocketImpl.java b/libjava/classpath/java/net/DatagramSocketImpl.java index cfcde92e5fc..4f51f9f938a 100644 --- a/libjava/classpath/java/net/DatagramSocketImpl.java +++ b/libjava/classpath/java/net/DatagramSocketImpl.java @@ -200,9 +200,9 @@ public abstract class DatagramSocketImpl implements SocketOptions * socket. Use getTimeToLive() instead. * * @return the current time-to-live - * + * * @exception IOException If an error occurs - * + * * @deprecated // FIXME: when ? */ protected abstract byte getTTL() throws IOException; @@ -222,7 +222,7 @@ public abstract class DatagramSocketImpl implements SocketOptions * socket. * * @return the current time-to-live - * + * * @exception IOException If an error occurs */ protected abstract int getTimeToLive() throws IOException; @@ -276,7 +276,7 @@ public abstract class DatagramSocketImpl implements SocketOptions /** * Returns the FileDescriptor for this socket - * + * * @return the file descriptor associated with this socket */ protected FileDescriptor getFileDescriptor() diff --git a/libjava/classpath/java/net/HttpURLConnection.java b/libjava/classpath/java/net/HttpURLConnection.java index 07eae48e77a..72dd67d9164 100644 --- a/libjava/classpath/java/net/HttpURLConnection.java +++ b/libjava/classpath/java/net/HttpURLConnection.java @@ -380,7 +380,7 @@ public abstract class HttpURLConnection extends URLConnection /** * Returns the value of this HttpURLConnection's instanceFollowRedirects * field - * + * * @return true if following redirects is enabled, false otherwise */ public boolean getInstanceFollowRedirects() @@ -474,33 +474,33 @@ public abstract class HttpURLConnection extends URLConnection // If responseCode not yet explicitly set by subclass if (responseCode == -1) { - // Response is the first header received from the connection. - String respField = getHeaderField(0); + // Response is the first header received from the connection. + String respField = getHeaderField(0); - if (respField == null || ! respField.startsWith("HTTP/")) - { - // Set to default values on failure. - responseCode = -1; - responseMessage = null; - return; - } + if (respField == null || ! respField.startsWith("HTTP/")) + { + // Set to default values on failure. + responseCode = -1; + responseMessage = null; + return; + } - int firstSpc; - int nextSpc; - firstSpc = respField.indexOf(' '); - nextSpc = respField.indexOf(' ', firstSpc + 1); - responseMessage = respField.substring(nextSpc + 1); - String codeStr = respField.substring(firstSpc + 1, nextSpc); - try - { - responseCode = Integer.parseInt(codeStr); - } - catch (NumberFormatException e) - { - // Set to default values on failure. - responseCode = -1; - responseMessage = null; - } + int firstSpc; + int nextSpc; + firstSpc = respField.indexOf(' '); + nextSpc = respField.indexOf(' ', firstSpc + 1); + responseMessage = respField.substring(nextSpc + 1); + String codeStr = respField.substring(firstSpc + 1, nextSpc); + try + { + responseCode = Integer.parseInt(codeStr); + } + catch (NumberFormatException e) + { + // Set to default values on failure. + responseCode = -1; + responseMessage = null; + } } } @@ -542,11 +542,11 @@ public abstract class HttpURLConnection extends URLConnection int code; try { - code = getResponseCode(); + code = getResponseCode(); } catch (IOException e) { - code = -1; + code = -1; } if (code == -1) @@ -557,18 +557,18 @@ public abstract class HttpURLConnection extends URLConnection try { - PushbackInputStream pbis = new PushbackInputStream(getInputStream()); + PushbackInputStream pbis = new PushbackInputStream(getInputStream()); - int i = pbis.read(); - if (i == -1) - return null; + int i = pbis.read(); + if (i == -1) + return null; - pbis.unread(i); - return pbis; + pbis.unread(i); + return pbis; } catch (IOException e) { - return null; + return null; } } diff --git a/libjava/classpath/java/net/Inet4Address.java b/libjava/classpath/java/net/Inet4Address.java index 1a50a472925..e3cff7b13ae 100644 --- a/libjava/classpath/java/net/Inet4Address.java +++ b/libjava/classpath/java/net/Inet4Address.java @@ -70,7 +70,7 @@ public final class Inet4Address extends InetAddress { return new InetAddress(addr, hostName, AF_INET); } - + /** * Initializes this object's addr instance variable from the passed in * byte array. Note that this constructor is protected and is called @@ -175,8 +175,8 @@ public final class Inet4Address extends InetAddress return false; return ((addr[0] & 0xff) == 0xe0 - && (addr[1] & 0xff) == 0x00 - && (addr[2] & 0xff) == 0x00); + && (addr[1] & 0xff) == 0x00 + && (addr[2] & 0xff) == 0x00); } /** @@ -218,15 +218,15 @@ public final class Inet4Address extends InetAddress int len = addr.length; int i = 0; - + for ( ; ; ) { sb.append(addr[i] & 0xff); i++; - + if (i == len) break; - + sb.append('.'); } @@ -266,7 +266,7 @@ public final class Inet4Address extends InetAddress for (int i = addr1.length; --i >= 0;) if (addr1[i] != addr2[i]) - return false; + return false; return true; } diff --git a/libjava/classpath/java/net/Inet6Address.java b/libjava/classpath/java/net/Inet6Address.java index 9a1c4ea96da..60c406587d4 100644 --- a/libjava/classpath/java/net/Inet6Address.java +++ b/libjava/classpath/java/net/Inet6Address.java @@ -48,7 +48,7 @@ import java.io.IOException; /* * Written using on-line Java Platform 1.4 API Specification and * RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt) - * + * * @author Michael Koch * @status Updated to 1.5. Serialization compatibility is tested. */ @@ -62,37 +62,37 @@ public final class Inet6Address extends InetAddress byte[] ipaddress; /** - * The scope ID, if any. + * The scope ID, if any. * @since 1.5 - * @serial + * @serial */ private int scope_id; /** - * The scope ID, if any. + * The scope ID, if any. * @since 1.5 - * @serial + * @serial */ private boolean scope_id_set; /** * Whether ifname is set or not. * @since 1.5 - * @serial + * @serial */ private boolean scope_ifname_set; /** * Name of the network interface, used only by the serialization methods * @since 1.5 - * @serial + * @serial */ private String ifname; /** * Scope network interface, or null. */ - private transient NetworkInterface nif; + private transient NetworkInterface nif; /** * The address family of these addresses (used for serialization). @@ -250,14 +250,14 @@ public final class Inet6Address extends InetAddress * * @throws UnkownHostException if the address is an invalid number of bytes. * @since 1.5 - */ - public static Inet6Address getByAddress(String host, byte[] addr, - int scopeId) + */ + public static Inet6Address getByAddress(String host, byte[] addr, + int scopeId) throws UnknownHostException { if( addr.length != 16 ) throw new UnknownHostException("Illegal address length: " + addr.length - + " bytes."); + + " bytes."); Inet6Address ip = new Inet6Address( addr, host ); ip.scope_id = scopeId; ip.scope_id_set = true; @@ -270,14 +270,14 @@ public final class Inet6Address extends InetAddress * * @throws UnkownHostException if the address is an invalid number of bytes. * @since 1.5 - */ - public static Inet6Address getByAddress(String host, byte[] addr, - NetworkInterface nif) + */ + public static Inet6Address getByAddress(String host, byte[] addr, + NetworkInterface nif) throws UnknownHostException { if( addr.length != 16 ) throw new UnknownHostException("Illegal address length: " + addr.length - + " bytes."); + + " bytes."); Inet6Address ip = new Inet6Address( addr, host ); ip.nif = nif; @@ -287,8 +287,8 @@ public final class Inet6Address extends InetAddress /** * Returns the NetworkInterface of the address scope * if it is a scoped address and the scope is given in the form of a - * NetworkInterface. - * (I.e. the address was created using the + * NetworkInterface. + * (I.e. the address was created using the * getByAddress(String, byte[], NetworkInterface) method) * Otherwise this method returns null. * @since 1.5 @@ -310,7 +310,7 @@ public final class Inet6Address extends InetAddress // check scope_id_set because some JDK-serialized objects seem to have // scope_id set to a nonzero value even when scope_id_set == false if( scope_id_set ) - return scope_id; + return scope_id; return 0; } @@ -323,12 +323,12 @@ public final class Inet6Address extends InetAddress for (int i = 0; i < 16; i += 2) { - int x = ((ipaddress[i] & 0xFF) << 8) | (ipaddress[i + 1] & 0xFF); + int x = ((ipaddress[i] & 0xFF) << 8) | (ipaddress[i + 1] & 0xFF); - if (i > 0) - sbuf.append(':'); + if (i > 0) + sbuf.append(':'); - sbuf.append(Integer.toHexString(x)); + sbuf.append(Integer.toHexString(x)); } if( nif != null ) sbuf.append( "%" + nif.getName() ); @@ -361,7 +361,7 @@ public final class Inet6Address extends InetAddress for (int i = 0; i < ip.ipaddress.length; i++) if (ipaddress[i] != ip.ipaddress[i]) - return false; + return false; if( ip.nif != null && nif != null ) return nif.equals( ip.nif ); @@ -399,16 +399,16 @@ public final class Inet6Address extends InetAddress */ private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException - { + { s.defaultReadObject(); try { - if( scope_ifname_set ) - nif = NetworkInterface.getByName( ifname ); + if( scope_ifname_set ) + nif = NetworkInterface.getByName( ifname ); } catch( SocketException se ) { - // FIXME: Ignore this? or throw an IOException? + // FIXME: Ignore this? or throw an IOException? } } @@ -421,8 +421,8 @@ public final class Inet6Address extends InetAddress { if( nif != null ) { - ifname = nif.getName(); - scope_ifname_set = true; + ifname = nif.getName(); + scope_ifname_set = true; } s.defaultWriteObject(); } diff --git a/libjava/classpath/java/net/InetAddress.java b/libjava/classpath/java/net/InetAddress.java index 1f266798045..1a9dc62026b 100644 --- a/libjava/classpath/java/net/InetAddress.java +++ b/libjava/classpath/java/net/InetAddress.java @@ -74,24 +74,24 @@ public class InetAddress implements Serializable byte[] addr; try { - addr = VMInetAddress.lookupInaddrAny(); + addr = VMInetAddress.lookupInaddrAny(); } catch (UnknownHostException e) { - // Make one up and hope it works. - addr = new byte[] {0, 0, 0, 0}; + // Make one up and hope it works. + addr = new byte[] {0, 0, 0, 0}; } try { - ANY_IF = getByAddress(addr); + ANY_IF = getByAddress(addr); } catch (UnknownHostException e) { - throw (InternalError) new InternalError().initCause(e); + throw (InternalError) new InternalError().initCause(e); } ANY_IF.hostName = ANY_IF.getHostName(); } - + /** * Stores static localhost address object. */ @@ -100,13 +100,13 @@ public class InetAddress implements Serializable { try { - LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1}); + LOCALHOST = getByAddress("localhost", new byte[] {127, 0, 0, 1}); } catch (UnknownHostException e) { - throw (InternalError) new InternalError().initCause(e); + throw (InternalError) new InternalError().initCause(e); } - } + } /** * The Serialized Form specifies that an int 'address' is saved/restored. @@ -158,7 +158,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @return true if mulitcast, false if not * * @since 1.1 @@ -174,7 +174,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isAnyLocalAddress() @@ -188,7 +188,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isLoopbackAddress() @@ -202,7 +202,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isLinkLocalAddress() @@ -216,7 +216,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isSiteLocalAddress() @@ -230,7 +230,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isMCGlobal() @@ -244,7 +244,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isMCNodeLocal() @@ -258,7 +258,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isMCLinkLocal() @@ -272,7 +272,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isMCSiteLocal() @@ -287,7 +287,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @since 1.4 */ public boolean isMCOrgLocal() @@ -316,17 +316,17 @@ public class InetAddress implements Serializable { try { - return ResolverCache.getHostByAddr(addr); + return ResolverCache.getHostByAddr(addr); } catch (UnknownHostException e) { - return getHostAddress(); + return getHostAddress(); } } /** * Returns the canonical hostname represented by this InetAddress - * + * * @since 1.4 */ public String getCanonicalHostName() @@ -337,13 +337,13 @@ public class InetAddress implements Serializable if (sm != null) { try - { + { sm.checkConnect(hostname, -1); - } - catch (SecurityException e) - { - return getHostAddress(); - } + } + catch (SecurityException e) + { + return getHostAddress(); + } } return hostname; @@ -367,7 +367,7 @@ public class InetAddress implements Serializable *

            This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

            - * + * * @return The IP address of this object in String form * * @since 1.0.2 @@ -425,7 +425,7 @@ public class InetAddress implements Serializable for (int i = 0; i < addr.length; i++) if (addr[i] != addr2[i]) - return false; + return false; return true; } @@ -481,18 +481,18 @@ public class InetAddress implements Serializable if (addr.length == 16) { - for (int i = 0; i < 12; i++) - { - if (addr[i] != (i < 10 ? 0 : (byte) 0xFF)) - return new Inet6Address(addr, host); - } - - byte[] ip4addr = new byte[4]; - ip4addr[0] = addr[12]; - ip4addr[1] = addr[13]; - ip4addr[2] = addr[14]; - ip4addr[3] = addr[15]; - return new Inet4Address(ip4addr, host); + for (int i = 0; i < 12; i++) + { + if (addr[i] != (i < 10 ? 0 : (byte) 0xFF)) + return new Inet6Address(addr, host); + } + + byte[] ip4addr = new byte[4]; + ip4addr[0] = addr[12]; + ip4addr[1] = addr[13]; + ip4addr[2] = addr[14]; + ip4addr[3] = addr[15]; + return new Inet4Address(ip4addr, host); } throw new UnknownHostException("IP address has illegal length"); @@ -515,14 +515,14 @@ public class InetAddress implements Serializable byte[] address = VMInetAddress.aton(literal); if (address == null) return null; - + try { - return getByAddress(address); + return getByAddress(address); } catch (UnknownHostException e) { - throw (InternalError) new InternalError().initCause(e); + throw (InternalError) new InternalError().initCause(e); } } @@ -534,7 +534,7 @@ public class InetAddress implements Serializable * default. This method is equivalent to returning the first element in * the InetAddress array returned from GetAllByName. * - * @param hostname The name of the desired host, or null for the local + * @param hostname The name of the desired host, or null for the local * loopback address. * * @return The address of the host as an InetAddress object. @@ -612,11 +612,11 @@ public class InetAddress implements Serializable String hostname = VMInetAddress.getLocalHostname(); try { - return getByName(hostname); + return getByName(hostname); } catch (SecurityException e) { - return LOCALHOST; + return LOCALHOST; } } diff --git a/libjava/classpath/java/net/InetSocketAddress.java b/libjava/classpath/java/net/InetSocketAddress.java index 5267cc11a5d..2126f770324 100644 --- a/libjava/classpath/java/net/InetSocketAddress.java +++ b/libjava/classpath/java/net/InetSocketAddress.java @@ -181,14 +181,14 @@ public class InetSocketAddress extends SocketAddress // The hostname may differ. if (obj instanceof InetSocketAddress) { - InetSocketAddress sa = (InetSocketAddress) obj; + InetSocketAddress sa = (InetSocketAddress) obj; - if (addr == null && sa.addr != null) - return false; - else if (addr == null && sa.addr == null) // we know hostname != null - return hostname.equals(sa.hostname) && sa.port == port; - else - return addr.equals(sa.addr) && sa.port == port; + if (addr == null && sa.addr != null) + return false; + else if (addr == null && sa.addr == null) // we know hostname != null + return hostname.equals(sa.hostname) && sa.port == port; + else + return addr.equals(sa.addr) && sa.port == port; } return false; diff --git a/libjava/classpath/java/net/MimeTypeMapper.java b/libjava/classpath/java/net/MimeTypeMapper.java index b0d400cedbf..3e43792911a 100644 --- a/libjava/classpath/java/net/MimeTypeMapper.java +++ b/libjava/classpath/java/net/MimeTypeMapper.java @@ -258,15 +258,15 @@ class MimeTypeMapper implements FileNameMap } } - public static void fillFromFile (Map table, String fname) + public static void fillFromFile (Map table, String fname) throws IOException { - LineNumberReader reader = + LineNumberReader reader = new LineNumberReader (new FileReader (fname)); while (reader.ready ()) { - StringTokenizer tokenizer = + StringTokenizer tokenizer = new StringTokenizer (reader.readLine ()); try @@ -308,10 +308,10 @@ class MimeTypeMapper implements FileNameMap int index = filename.lastIndexOf("."); if (index != -1) { - if (index == filename.length()) - return "application/octet-stream"; - else - filename = filename.substring(index + 1); + if (index == filename.length()) + return "application/octet-stream"; + else + filename = filename.substring(index + 1); } String type = (String) mime_types.get(filename); @@ -338,7 +338,7 @@ class MimeTypeMapper implements FileNameMap String key = it.next(); String value = map.get(key); // Put the "," first since it is easier to make correct syntax this way. - System.out.println(" " + (first ? " " : ", ") + System.out.println(" " + (first ? " " : ", ") + "{ \"" + key + "\", \"" + value + "\" }"); first = false; } diff --git a/libjava/classpath/java/net/MulticastSocket.java b/libjava/classpath/java/net/MulticastSocket.java index 114d11f2d3c..5014b6a8e53 100644 --- a/libjava/classpath/java/net/MulticastSocket.java +++ b/libjava/classpath/java/net/MulticastSocket.java @@ -202,7 +202,7 @@ public class MulticastSocket extends DatagramSocket { if (isClosed()) throw new SocketException("socket is closed"); - + InetAddress address; if (netIf != null) out: @@ -235,8 +235,8 @@ public class MulticastSocket extends DatagramSocket } else address = InetAddress.ANY_IF; - - + + getImpl().setOption(SocketOptions.IP_MULTICAST_IF, address); } @@ -258,10 +258,10 @@ public class MulticastSocket extends DatagramSocket InetAddress address = (InetAddress) getImpl().getOption(SocketOptions.IP_MULTICAST_IF); - + if (address.isAnyLocalAddress()) return NetworkInterface.createAnyInterface(); - + NetworkInterface netIf = NetworkInterface.getByInetAddress(address); return netIf; @@ -294,7 +294,7 @@ public class MulticastSocket extends DatagramSocket * Checks if local loopback mode is enabled * * @return true if loopback mode is enabled, false otherwise - * + * * @exception SocketException If an error occurs * * @since 1.4 @@ -501,13 +501,13 @@ public class MulticastSocket extends DatagramSocket SecurityManager s = System.getSecurityManager(); if (s != null) { - InetAddress addr = packet.getAddress(); - if (addr.isMulticastAddress()) - s.checkPermission(new SocketPermission(addr.getHostName() - + packet.getPort(), - "accept,connect")); - else - s.checkConnect(addr.getHostAddress(), packet.getPort()); + InetAddress addr = packet.getAddress(); + if (addr.isMulticastAddress()) + s.checkPermission(new SocketPermission(addr.getHostName() + + packet.getPort(), + "accept,connect")); + else + s.checkConnect(addr.getHostAddress(), packet.getPort()); } int oldttl = getImpl().getTimeToLive(); diff --git a/libjava/classpath/java/net/NetworkInterface.java b/libjava/classpath/java/net/NetworkInterface.java index 5ec64ff16ce..127dfba7835 100644 --- a/libjava/classpath/java/net/NetworkInterface.java +++ b/libjava/classpath/java/net/NetworkInterface.java @@ -59,12 +59,12 @@ import java.util.Vector; public final class NetworkInterface { private final VMNetworkInterface netif; - + private NetworkInterface(VMNetworkInterface netif) { this.netif = netif; } - + /** Creates an NetworkInterface instance which * represents any interface in the system. Its only * address is 0.0.0.0/0.0.0.0. This @@ -74,7 +74,7 @@ public final class NetworkInterface { return new NetworkInterface(new VMNetworkInterface()); } - + /** * Returns the name of the network interface * @@ -109,16 +109,16 @@ public final class NetworkInterface for (Enumeration addresses = inetAddresses.elements(); addresses.hasMoreElements();) { - InetAddress addr = addresses.nextElement(); - try - { - s.checkConnect(addr.getHostAddress(), -1); - tmpInetAddresses.add(addr); - } - catch (SecurityException e) - { - // Ignore. - } + InetAddress addr = addresses.nextElement(); + try + { + s.checkConnect(addr.getHostAddress(), -1); + tmpInetAddresses.add(addr); + } + catch (SecurityException e) + { + // Ignore. + } } return tmpInetAddresses.elements(); @@ -138,7 +138,7 @@ public final class NetworkInterface * Returns an network interface by name * * @param name The name of the interface to return - * + * * @return a NetworkInterface object representing the interface, * or null if there is no interface with that name. * @@ -187,14 +187,14 @@ public final class NetworkInterface * Return an Enumeration of all available network interfaces * * @return all interfaces - * + * * @exception SocketException If an error occurs */ public static Enumeration getNetworkInterfaces() throws SocketException { VMNetworkInterface[] netifs = VMNetworkInterface.getVMInterfaces(); - Vector networkInterfaces = + Vector networkInterfaces = new Vector(netifs.length); for (int i = 0; i < netifs.length; i++) { @@ -217,7 +217,7 @@ public final class NetworkInterface return false; NetworkInterface tmp = (NetworkInterface) obj; - + if (netif.name == null) return tmp.netif.name == null; @@ -234,10 +234,10 @@ public final class NetworkInterface { // FIXME: hash correctly int hc = netif.addresses.hashCode(); - + if (netif.name != null) hc += netif.name.hashCode(); - + return hc; } @@ -253,7 +253,7 @@ public final class NetworkInterface String separator = SystemProperties.getProperty("line.separator"); result = new CPStringBuilder(); - + result.append("name: "); result.append(getDisplayName()); result.append(" (").append(getName()).append(") addresses:"); @@ -261,8 +261,8 @@ public final class NetworkInterface for (Iterator it = netif.addresses.iterator(); it.hasNext(); ) { - InetAddress address = (InetAddress) it.next(); - result.append(address.toString()).append(";").append(separator); + InetAddress address = (InetAddress) it.next(); + result.append(address.toString()).append(";").append(separator); } return result.toString(); diff --git a/libjava/classpath/java/net/Proxy.java b/libjava/classpath/java/net/Proxy.java index 315177413ad..36a25fa801c 100644 --- a/libjava/classpath/java/net/Proxy.java +++ b/libjava/classpath/java/net/Proxy.java @@ -41,7 +41,7 @@ package java.net; /** * Defines a proxy setting. This setting contains a type (https, socks, * direct) and a socket address. - * + * * @since 1.5 */ public class Proxy @@ -49,8 +49,8 @@ public class Proxy /** * Represents the proxy type. */ - public enum Type - { + public enum Type + { DIRECT, HTTP, SOCKS; /** @@ -112,8 +112,8 @@ public class Proxy Proxy tmp = (Proxy) obj; return (type.equals(tmp.type) - && (address == null ? tmp.address == null - : address.equals(tmp.address))); + && (address == null ? tmp.address == null + : address.equals(tmp.address))); } /** @@ -134,6 +134,6 @@ public class Proxy public String toString() { return type.toString() + (address == null ? "" - : (":" + address.toString())); + : (":" + address.toString())); } } diff --git a/libjava/classpath/java/net/ProxySelector.java b/libjava/classpath/java/net/ProxySelector.java index 78592a24441..6c85f99c782 100644 --- a/libjava/classpath/java/net/ProxySelector.java +++ b/libjava/classpath/java/net/ProxySelector.java @@ -44,7 +44,7 @@ import java.util.List; /** * Class for handling proxies for different connections. - * + * * @since 1.5 */ public abstract class ProxySelector @@ -100,17 +100,17 @@ public abstract class ProxySelector /** * Signals to the selector that a proxy was no available. - * + * * @throws IllegalArgumentException If one argument is null */ public abstract void connectFailed(URI uri, SocketAddress address, - IOException exception); + IOException exception); /** * Returns the list of proxy settings for a given URI. * * @return list of proxy settings - * + * * @throws IllegalArgumentException If uri is null */ public abstract List select(URI uri); diff --git a/libjava/classpath/java/net/ResolverCache.java b/libjava/classpath/java/net/ResolverCache.java index ad329b6075d..d7e5ed407b8 100644 --- a/libjava/classpath/java/net/ResolverCache.java +++ b/libjava/classpath/java/net/ResolverCache.java @@ -119,21 +119,21 @@ class ResolverCache Entry entry = get(key); if (entry != null) { - if (entry.value == null) - throw new UnknownHostException(); - return (String) entry.value; + if (entry.value == null) + throw new UnknownHostException(); + return (String) entry.value; } try { - String hostname = VMInetAddress.getHostByAddr(addr); - put(new Entry(key, hostname)); - return hostname; + String hostname = VMInetAddress.getHostByAddr(addr); + put(new Entry(key, hostname)); + return hostname; } catch (UnknownHostException e) { - put(new Entry(key, null)); - throw e; + put(new Entry(key, null)); + throw e; } } @@ -152,21 +152,21 @@ class ResolverCache Entry entry = get(hostname); if (entry != null) { - if (entry.value == null) - throw new UnknownHostException(); - return (byte[][]) entry.value; + if (entry.value == null) + throw new UnknownHostException(); + return (byte[][]) entry.value; } try { - byte[][] addrs = VMInetAddress.getHostByName(hostname); - put(new Entry(hostname, addrs)); - return addrs; + byte[][] addrs = VMInetAddress.getHostByName(hostname); + put(new Entry(hostname, addrs)); + return addrs; } catch (UnknownHostException e) { - put(new Entry(hostname, null)); - throw e; + put(new Entry(hostname, null)); + throw e; } } @@ -201,9 +201,9 @@ class ResolverCache reap(); if (entry.expires != 0) { - if (entry.expires != -1) - killqueue.add(entry); - cache.put(entry.key, entry); + if (entry.expires != -1) + killqueue.add(entry); + cache.put(entry.key, entry); } } @@ -215,20 +215,20 @@ class ResolverCache { if (!killqueue.isEmpty()) { - long now = System.currentTimeMillis(); + long now = System.currentTimeMillis(); - Iterator iter = killqueue.iterator(); - while (iter.hasNext()) - { - Entry entry = (Entry) iter.next(); - if (entry.expires > now) - break; - cache.remove(entry.key); - iter.remove(); - } + Iterator iter = killqueue.iterator(); + while (iter.hasNext()) + { + Entry entry = (Entry) iter.next(); + if (entry.expires > now) + break; + cache.remove(entry.key); + iter.remove(); + } } } - + /** * An entry in the cache. */ @@ -243,7 +243,7 @@ class ResolverCache * The entry itself. A null value indicates a failed lookup. */ public final Object value; - + /** * The time when this cache entry expires. If set to -1 then * this entry will never expire. If set to 0 then this entry @@ -261,9 +261,9 @@ class ResolverCache int ttl = value != null ? POSITIVE_TTL : NEGATIVE_TTL; if (ttl < 1) - expires = ttl; + expires = ttl; else - expires = System.currentTimeMillis() + ttl * 1000; + expires = System.currentTimeMillis() + ttl * 1000; } } } diff --git a/libjava/classpath/java/net/ServerSocket.java b/libjava/classpath/java/net/ServerSocket.java index fa1c51e75c1..1dbd7636cb5 100644 --- a/libjava/classpath/java/net/ServerSocket.java +++ b/libjava/classpath/java/net/ServerSocket.java @@ -247,8 +247,8 @@ public class ServerSocket try { - impl.bind(addr, port); - impl.listen(backlog); + impl.bind(addr, port); + impl.listen(backlog); this.port = port; local = new InetSocketAddress( (InetAddress) impl.getOption(SocketOptions.SO_BINDADDR), @@ -259,7 +259,7 @@ public class ServerSocket try { if (local == null) - close(); + close(); } catch (IOException _) { @@ -297,7 +297,7 @@ public class ServerSocket * Returns the local socket address * * @return the local socket address, null if not bound - * + * * @since 1.4 */ public SocketAddress getLocalSocketAddress() @@ -326,33 +326,33 @@ public class ServerSocket try { - implAccept(socket); + implAccept(socket); } catch (IOException e) { - try - { - socket.close(); - } - catch (IOException e2) - { - // Ignore. - } + try + { + socket.close(); + } + catch (IOException e2) + { + // Ignore. + } - throw e; + throw e; } catch (SecurityException e) { - try - { - socket.close(); - } - catch (IOException e2) - { - // Ignore. - } + try + { + socket.close(); + } + catch (IOException e2) + { + // Ignore. + } - throw e; + throw e; } return socket; @@ -391,7 +391,7 @@ public class ServerSocket SecurityManager sm = System.getSecurityManager(); if (sm != null) sm.checkAccept(socket.getInetAddress().getHostAddress(), - socket.getPort()); + socket.getPort()); } /** @@ -416,7 +416,7 @@ public class ServerSocket * by ServerSocketChannel.open().

            * * @return the associated socket channel, null if none exists - * + * * @since 1.4 */ public ServerSocketChannel getChannel() @@ -428,7 +428,7 @@ public class ServerSocket * Returns true when the socket is bound, otherwise false * * @return true if socket is bound, false otherwise - * + * * @since 1.4 */ public boolean isBound() @@ -440,7 +440,7 @@ public class ServerSocket * Returns true if the socket is closed, otherwise false * * @return true if socket is closed, false otherwise - * + * * @since 1.4 */ public boolean isClosed() @@ -501,7 +501,7 @@ public class ServerSocket * Enables/Disables the SO_REUSEADDR option * * @param on true if SO_REUSEADDR should be enabled, false otherwise - * + * * @exception SocketException If an error occurs * * @since 1.4 diff --git a/libjava/classpath/java/net/Socket.java b/libjava/classpath/java/net/Socket.java index 7541bdf78c5..d61e81f5e42 100644 --- a/libjava/classpath/java/net/Socket.java +++ b/libjava/classpath/java/net/Socket.java @@ -377,23 +377,23 @@ public class Socket // bind to address/port try { - getImpl().bind(tmp.getAddress(), tmp.getPort()); - bound = true; + getImpl().bind(tmp.getAddress(), tmp.getPort()); + bound = true; } catch (IOException exception) { - close(); - throw exception; + close(); + throw exception; } catch (RuntimeException exception) { - close(); - throw exception; + close(); + throw exception; } catch (Error error) { - close(); - throw error; + close(); + throw error; } } @@ -467,11 +467,11 @@ public class Socket try { - return getImpl().getInetAddress(); + return getImpl().getInetAddress(); } catch (SocketException e) { - // This cannot happen as we are connected. + // This cannot happen as we are connected. } return null; @@ -495,7 +495,7 @@ public class Socket if (impl instanceof PlainSocketImpl) addr = ((PlainSocketImpl) impl).getLocalAddress().getAddress(); - + if (addr == null) { try @@ -536,11 +536,11 @@ public class Socket try { - return getImpl().getPort(); + return getImpl().getPort(); } catch (SocketException e) { - // This cannot happen as we are connected. + // This cannot happen as we are connected. } return 0; @@ -559,12 +559,12 @@ public class Socket try { - if (getImpl() != null) - return getImpl().getLocalPort(); + if (getImpl() != null) + return getImpl().getLocalPort(); } catch (SocketException e) { - // This cannot happen as we are bound. + // This cannot happen as we are bound. } return -1; @@ -586,12 +586,12 @@ public class Socket try { - return new InetSocketAddress(addr, getImpl().getLocalPort()); + return new InetSocketAddress(addr, getImpl().getLocalPort()); } catch (SocketException e) { - // This cannot happen as we are bound. - return null; + // This cannot happen as we are bound. + return null; } } @@ -609,13 +609,13 @@ public class Socket try { - return new InetSocketAddress(getImpl().getInetAddress(), - getImpl().getPort()); + return new InetSocketAddress(getImpl().getInetAddress(), + getImpl().getPort()); } catch (SocketException e) { - // This cannot happen as we are connected. - return null; + // This cannot happen as we are connected. + return null; } } @@ -721,13 +721,13 @@ public class Socket if (on) { - if (linger < 0) - throw new IllegalArgumentException("SO_LINGER must be >= 0"); + if (linger < 0) + throw new IllegalArgumentException("SO_LINGER must be >= 0"); - if (linger > 65535) - linger = 65535; + if (linger > 65535) + linger = 65535; - getImpl().setOption(SocketOptions.SO_LINGER, Integer.valueOf(linger)); + getImpl().setOption(SocketOptions.SO_LINGER, Integer.valueOf(linger)); } else getImpl().setOption(SocketOptions.SO_LINGER, Integer.valueOf(-1)); @@ -1034,15 +1034,15 @@ public class Socket { try { - if (isConnected()) - return (super.toString() + if (isConnected()) + return (super.toString() + " [addr=" + getImpl().getInetAddress() + ",port=" - + getImpl().getPort() + ",localport=" - + getImpl().getLocalPort() + "]"); + + getImpl().getPort() + ",localport=" + + getImpl().getLocalPort() + "]"); } catch (SocketException e) { - // This cannot happen as we are connected. + // This cannot happen as we are connected. } return super.toString() + " [unconnected]"; @@ -1225,7 +1225,7 @@ public class Socket { if (impl == null) return false; - + return impl.getInetAddress() != null; } @@ -1242,7 +1242,7 @@ public class Socket return false; if (impl instanceof PlainSocketImpl) { - InetSocketAddress addr = ((PlainSocketImpl) impl).getLocalAddress(); + InetSocketAddress addr = ((PlainSocketImpl) impl).getLocalAddress(); return addr != null && addr.getAddress() != null; } return bound; @@ -1258,7 +1258,7 @@ public class Socket public boolean isClosed() { SocketChannel channel = getChannel(); - + return impl == null || (channel != null && ! channel.isOpen()); } diff --git a/libjava/classpath/java/net/SocketPermission.java b/libjava/classpath/java/net/SocketPermission.java index a5a848eee7a..ce16a79a078 100644 --- a/libjava/classpath/java/net/SocketPermission.java +++ b/libjava/classpath/java/net/SocketPermission.java @@ -127,9 +127,9 @@ public final class SocketPermission extends Permission implements Serializable /** * An IP address (IPv4 or IPv6). Will be set if and only if this * object was initialized with a single literal IP address. - */ + */ private transient InetAddress address = null; - + /** * A range of ports. */ @@ -199,39 +199,39 @@ public final class SocketPermission extends Permission implements Serializable boolean colon_allowed = true; for (int i = 0; i < hostport.length(); i++) { - if (hostport.charAt(i) == ':') - { - if (!colon_allowed) - throw new IllegalArgumentException("Ambiguous hostport part"); - colons++; - colon_allowed = false; - } - else - colon_allowed = true; + if (hostport.charAt(i) == ':') + { + if (!colon_allowed) + throw new IllegalArgumentException("Ambiguous hostport part"); + colons++; + colon_allowed = false; + } + else + colon_allowed = true; } switch (colons) { case 0: case 1: - // a hostname or IPv4 address - return hostport; - + // a hostname or IPv4 address + return hostport; + case 7: - // an IPv6 address with no ports - return "[" + hostport + "]"; + // an IPv6 address with no ports + return "[" + hostport + "]"; case 8: - // an IPv6 address with ports - int last_colon = hostport.lastIndexOf(':'); - return "[" + hostport.substring(0, last_colon) + "]" - + hostport.substring(last_colon); + // an IPv6 address with ports + int last_colon = hostport.lastIndexOf(':'); + return "[" + hostport.substring(0, last_colon) + "]" + + hostport.substring(last_colon); default: - throw new IllegalArgumentException("Ambiguous hostport part"); + throw new IllegalArgumentException("Ambiguous hostport part"); } } - + /** * Parse the hostport argument to the constructor. */ @@ -241,90 +241,90 @@ public final class SocketPermission extends Permission implements Serializable String host, ports; if (hostport.charAt(0) == '[') { - // host is a bracketed IPv6 address - int end = hostport.indexOf("]"); - if (end == -1) - throw new IllegalArgumentException("Unmatched '['"); - host = hostport.substring(1, end); + // host is a bracketed IPv6 address + int end = hostport.indexOf("]"); + if (end == -1) + throw new IllegalArgumentException("Unmatched '['"); + host = hostport.substring(1, end); - address = InetAddress.getByLiteral(host); - if (address == null) - throw new IllegalArgumentException("Bad IPv6 address"); + address = InetAddress.getByLiteral(host); + if (address == null) + throw new IllegalArgumentException("Bad IPv6 address"); - if (end == hostport.length() - 1) - ports = ""; - else if (hostport.charAt(end + 1) == ':') - ports = hostport.substring(end + 2); - else - throw new IllegalArgumentException("Bad character after ']'"); + if (end == hostport.length() - 1) + ports = ""; + else if (hostport.charAt(end + 1) == ':') + ports = hostport.substring(end + 2); + else + throw new IllegalArgumentException("Bad character after ']'"); } else { - // host is a hostname or IPv4 address - int sep = hostport.indexOf(":"); - if (sep == -1) - { - host = hostport; - ports = ""; - } - else - { - host = hostport.substring(0, sep); - ports = hostport.substring(sep + 1); - } + // host is a hostname or IPv4 address + int sep = hostport.indexOf(":"); + if (sep == -1) + { + host = hostport; + ports = ""; + } + else + { + host = hostport.substring(0, sep); + ports = hostport.substring(sep + 1); + } - address = InetAddress.getByLiteral(host); - if (address == null) - { - if (host.lastIndexOf('*') > 0) - throw new IllegalArgumentException("Bad hostname"); + address = InetAddress.getByLiteral(host); + if (address == null) + { + if (host.lastIndexOf('*') > 0) + throw new IllegalArgumentException("Bad hostname"); - hostname = host; - } + hostname = host; + } } // Parse and validate the ports if (ports.length() == 0) { - minport = MIN_PORT; - maxport = MAX_PORT; + minport = MIN_PORT; + maxport = MAX_PORT; } else { - int sep = ports.indexOf("-"); - if (sep == -1) - { - // a single port - minport = maxport = Integer.parseInt(ports); - } - else - { - if (ports.indexOf("-", sep + 1) != -1) - throw new IllegalArgumentException("Unexpected '-'"); + int sep = ports.indexOf("-"); + if (sep == -1) + { + // a single port + minport = maxport = Integer.parseInt(ports); + } + else + { + if (ports.indexOf("-", sep + 1) != -1) + throw new IllegalArgumentException("Unexpected '-'"); - if (sep == 0) - { - // an upper bound - minport = MIN_PORT; - maxport = Integer.parseInt(ports.substring(1)); - } - else if (sep == ports.length() - 1) - { - // a lower bound - minport = - Integer.parseInt(ports.substring(0, ports.length() - 1)); - maxport = MAX_PORT; - } - else - { - // a range with two bounds - minport = Integer.parseInt(ports.substring(0, sep)); - maxport = Integer.parseInt(ports.substring(sep + 1)); - } - } + if (sep == 0) + { + // an upper bound + minport = MIN_PORT; + maxport = Integer.parseInt(ports.substring(1)); + } + else if (sep == ports.length() - 1) + { + // a lower bound + minport = + Integer.parseInt(ports.substring(0, ports.length() - 1)); + maxport = MAX_PORT; + } + else + { + // a range with two bounds + minport = Integer.parseInt(ports.substring(0, sep)); + maxport = Integer.parseInt(ports.substring(sep + 1)); + } + } } } - + /** * Parse the actions argument to the constructor. */ @@ -334,18 +334,18 @@ public final class SocketPermission extends Permission implements Serializable boolean resolve_needed = false; boolean resolve_present = false; - + StringTokenizer t = new StringTokenizer(actionstring, ","); while (t.hasMoreTokens()) { - String action = t.nextToken(); - action = action.trim().toLowerCase(); - setAction(action); + String action = t.nextToken(); + action = action.trim().toLowerCase(); + setAction(action); - if (action.equals("resolve")) - resolve_present = true; - else - resolve_needed = true; + if (action.equals("resolve")) + resolve_present = true; + else + resolve_needed = true; } if (resolve_needed && !resolve_present) @@ -359,11 +359,11 @@ public final class SocketPermission extends Permission implements Serializable { for (int i = 0; i < ACTIONS.length; i++) { - if (action.equals(ACTIONS[i])) - { - actionmask |= 1 << i; - return; - } + if (action.equals(ACTIONS[i])) + { + actionmask |= 1 << i; + return; + } } throw new IllegalArgumentException("Unknown action " + action); } @@ -389,23 +389,23 @@ public final class SocketPermission extends Permission implements Serializable return false; if (p.actionmask != actionmask || - p.minport != minport || - p.maxport != maxport) + p.minport != minport || + p.maxport != maxport) return false; if (address != null) { - if (p.address == null) - return false; - else - return p.address.equals(address); + if (p.address == null) + return false; + else + return p.address.equals(address); } else { - if (p.hostname == null) - return false; - else - return p.hostname.equals(hostname); + if (p.hostname == null) + return false; + else + return p.hostname.equals(hostname); } } @@ -437,12 +437,12 @@ public final class SocketPermission extends Permission implements Serializable for (int i = 0; i < ACTIONS.length; i++) { - if ((actionmask & (1 << i)) != 0) - { - if (sb.length() != 0) - sb.append(","); - sb.append(ACTIONS[i]); - } + if ((actionmask & (1 << i)) != 0) + { + if (sb.length() != 0) + sb.append(","); + sb.append(ACTIONS[i]); + } } return sb.toString(); @@ -471,11 +471,11 @@ public final class SocketPermission extends Permission implements Serializable try { - return InetAddress.getAllByName(hostname); + return InetAddress.getAllByName(hostname); } catch (UnknownHostException e) { - return new InetAddress[0]; + return new InetAddress[0]; } } @@ -491,18 +491,18 @@ public final class SocketPermission extends Permission implements Serializable return null; try { - return InetAddress.getByName(hostname).internalGetCanonicalHostName(); + return InetAddress.getByName(hostname).internalGetCanonicalHostName(); } catch (UnknownHostException e) { - return null; + return null; } } - + /** * Returns true if the permission object passed it is implied by the * this permission. This will be true if: - * + * *
              *
            • The argument is of type SocketPermission
              • *
            • The actions list of the argument are in this object's actions
              • @@ -511,7 +511,7 @@ public final class SocketPermission extends Permission implements Serializable *
            * *

            The argument's hostname will be a subset of this object's hostname if:

            - * + * *
              *
            • The argument's hostname or IP address is equal to this object's.
              • *
            • The argument's canonical hostname is equal to this object's.
              • @@ -538,10 +538,10 @@ public final class SocketPermission extends Permission implements Serializable // imply it. This is not part of the spec, but it seems necessary. if (p.hostname != null && p.hostname.length() == 0) return false; - + // Next check the actions if ((p.actionmask & actionmask) != p.actionmask) - return false; + return false; // Then check the ports if ((p.minport < minport) || (p.maxport > maxport)) @@ -554,49 +554,49 @@ public final class SocketPermission extends Permission implements Serializable // IP address which one of p's IP addresses is equal to. if (address != null) { - InetAddress[] addrs = p.getAddresses(); - for (int i = 0; i < addrs.length; i++) - { - if (address.equals(addrs[i])) - return true; - } + InetAddress[] addrs = p.getAddresses(); + for (int i = 0; i < addrs.length; i++) + { + if (address.equals(addrs[i])) + return true; + } } // Return true if this object is a wildcarded domain that // p's canonical name matches. if (hostname != null && hostname.charAt(0) == '*') { - p_canon = p.getCanonicalHostName(); - if (p_canon != null && p_canon.endsWith(hostname.substring(1))) - return true; - + p_canon = p.getCanonicalHostName(); + if (p_canon != null && p_canon.endsWith(hostname.substring(1))) + return true; + } // Return true if this one of this object's IP addresses // is equal to one of p's. if (address == null) { - InetAddress[] addrs = p.getAddresses(); - InetAddress[] p_addrs = p.getAddresses(); + InetAddress[] addrs = p.getAddresses(); + InetAddress[] p_addrs = p.getAddresses(); - for (int i = 0; i < addrs.length; i++) - { - for (int j = 0; j < p_addrs.length; j++) - { - if (addrs[i].equals(p_addrs[j])) - return true; - } - } + for (int i = 0; i < addrs.length; i++) + { + for (int j = 0; j < p_addrs.length; j++) + { + if (addrs[i].equals(p_addrs[j])) + return true; + } + } } // Return true if this object's canonical name equals p's. String canon = getCanonicalHostName(); if (canon != null) { - if (p_canon == null) - p_canon = p.getCanonicalHostName(); - if (p_canon != null && canon.equals(p_canon)) - return true; + if (p_canon == null) + p_canon = p.getCanonicalHostName(); + if (p_canon != null && canon.equals(p_canon)) + return true; } // Didn't make it diff --git a/libjava/classpath/java/net/URI.java b/libjava/classpath/java/net/URI.java index 933e4f451f0..b5fb9654fec 100644 --- a/libjava/classpath/java/net/URI.java +++ b/libjava/classpath/java/net/URI.java @@ -49,7 +49,7 @@ import java.util.regex.Pattern; /** *

              - * A URI instance represents that defined by + * A URI instance represents that defined by * RFC3986, * with some deviations. *

              @@ -157,7 +157,7 @@ import java.util.regex.Pattern; * @author Andrew John Hughes (gnu_andrew@member.fsf.org) * @since 1.4 */ -public final class URI +public final class URI implements Comparable, Serializable { /** @@ -193,7 +193,7 @@ public final class URI private static final String RFC3986_SUBDELIMS = "!$&'()*+,;="; private static final String RFC3986_REG_NAME = RFC3986_UNRESERVED + RFC3986_SUBDELIMS + "%"; - private static final String RFC3986_PCHAR = RFC3986_UNRESERVED + + private static final String RFC3986_PCHAR = RFC3986_UNRESERVED + RFC3986_SUBDELIMS + ":@%"; private static final String RFC3986_SEGMENT = RFC3986_PCHAR; private static final String RFC3986_PATH_SEGMENTS = RFC3986_SEGMENT + "/"; @@ -230,7 +230,7 @@ public final class URI * Index of fragment component in parsed URI. */ private static final int FRAGMENT_GROUP = 10; - + /** * Index of userinfo component in parsed authority section. */ @@ -294,19 +294,19 @@ public final class URI this.string = (String) is.readObject(); try { - parseURI(this.string); + parseURI(this.string); } catch (URISyntaxException x) { - // Should not happen. - throw new RuntimeException(x); + // Should not happen. + throw new RuntimeException(x); } } private void writeObject(ObjectOutputStream os) throws IOException { if (string == null) - string = toString(); + string = toString(); os.writeObject(string); } @@ -350,11 +350,11 @@ public final class URI String matched = match.group(group); if (matched == null || matched.length() == 0) { - String prevMatched = match.group(group -1); - if (prevMatched == null || prevMatched.length() == 0) - return null; - else - return ""; + String prevMatched = match.group(group -1); + if (prevMatched == null || prevMatched.length() == 0) + return null; + else + return ""; } return matched; } @@ -369,23 +369,23 @@ public final class URI private void parseURI(String str) throws URISyntaxException { Matcher matcher = URI_PATTERN.matcher(str); - + if (matcher.matches()) { - scheme = getURIGroup(matcher, SCHEME_GROUP); - rawSchemeSpecificPart = matcher.group(SCHEME_SPEC_PART_GROUP); - schemeSpecificPart = unquote(rawSchemeSpecificPart); - if (!isOpaque()) - { - rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP); - rawPath = matcher.group(PATH_GROUP); - rawQuery = getURIGroup(matcher, QUERY_GROUP); - } - rawFragment = getURIGroup(matcher, FRAGMENT_GROUP); + scheme = getURIGroup(matcher, SCHEME_GROUP); + rawSchemeSpecificPart = matcher.group(SCHEME_SPEC_PART_GROUP); + schemeSpecificPart = unquote(rawSchemeSpecificPart); + if (!isOpaque()) + { + rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP); + rawPath = matcher.group(PATH_GROUP); + rawQuery = getURIGroup(matcher, QUERY_GROUP); + } + rawFragment = getURIGroup(matcher, FRAGMENT_GROUP); } else throw new URISyntaxException(str, - "doesn't match URI regular expression"); + "doesn't match URI regular expression"); parseServerAuthority(); // We must eagerly unquote the parts, because this is the only time @@ -416,27 +416,27 @@ public final class URI int pos = 0; for (int i = 0; i < str.length(); i++) { - char c = str.charAt(i); - if (c == '%') - { - if (i + 2 >= str.length()) - throw new URISyntaxException(str, "Invalid quoted character"); - int hi = Character.digit(str.charAt(++i), 16); - int lo = Character.digit(str.charAt(++i), 16); - if (lo < 0 || hi < 0) - throw new URISyntaxException(str, "Invalid quoted character"); - buf[pos++] = (byte) (hi * 16 + lo); - } - else - buf[pos++] = (byte) c; + char c = str.charAt(i); + if (c == '%') + { + if (i + 2 >= str.length()) + throw new URISyntaxException(str, "Invalid quoted character"); + int hi = Character.digit(str.charAt(++i), 16); + int lo = Character.digit(str.charAt(++i), 16); + if (lo < 0 || hi < 0) + throw new URISyntaxException(str, "Invalid quoted character"); + buf[pos++] = (byte) (hi * 16 + lo); + } + else + buf[pos++] = (byte) c; } try { - return new String(buf, 0, pos, "utf-8"); + return new String(buf, 0, pos, "utf-8"); } catch (java.io.UnsupportedEncodingException x2) { - throw (Error) new InternalError().initCause(x2); + throw (Error) new InternalError().initCause(x2); } } @@ -488,16 +488,16 @@ public final class URI CPStringBuilder sb = new CPStringBuilder(str.length()); for (int i = 0; i < str.length(); i++) { - char c = str.charAt(i); - if ((legalCharacters.indexOf(c) == -1) - && (c <= 127)) - { - sb.append('%'); - sb.append(HEX.charAt(c / 16)); - sb.append(HEX.charAt(c % 16)); - } - else - sb.append(c); + char c = str.charAt(i); + if ((legalCharacters.indexOf(c) == -1) + && (c <= 127)) + { + sb.append('%'); + sb.append(HEX.charAt(c / 16)); + sb.append(HEX.charAt(c % 16)); + } + else + sb.append(c); } return sb.toString(); } @@ -659,12 +659,12 @@ public final class URI { try { - return new URI(str); + return new URI(str); } catch (URISyntaxException e) { - throw (IllegalArgumentException) new IllegalArgumentException() - .initCause(e); + throw (IllegalArgumentException) new IllegalArgumentException() + .initCause(e); } } @@ -686,32 +686,32 @@ public final class URI { if (rawAuthority != null) { - Matcher matcher = AUTHORITY_PATTERN.matcher(rawAuthority); + Matcher matcher = AUTHORITY_PATTERN.matcher(rawAuthority); - if (matcher.matches()) - { - rawUserInfo = getURIGroup(matcher, AUTHORITY_USERINFO_GROUP); - rawHost = getURIGroup(matcher, AUTHORITY_HOST_GROUP); - - String portStr = getURIGroup(matcher, AUTHORITY_PORT_GROUP); - - if (portStr != null && ! portStr.isEmpty()) - try - { - port = Integer.parseInt(portStr); - } - catch (NumberFormatException e) - { - URISyntaxException use = - new URISyntaxException - (string, "doesn't match URI regular expression"); - use.initCause(e); - throw use; - } - } - else - throw new URISyntaxException(string, - "doesn't match URI regular expression"); + if (matcher.matches()) + { + rawUserInfo = getURIGroup(matcher, AUTHORITY_USERINFO_GROUP); + rawHost = getURIGroup(matcher, AUTHORITY_HOST_GROUP); + + String portStr = getURIGroup(matcher, AUTHORITY_PORT_GROUP); + + if (portStr != null && ! portStr.isEmpty()) + try + { + port = Integer.parseInt(portStr); + } + catch (NumberFormatException e) + { + URISyntaxException use = + new URISyntaxException + (string, "doesn't match URI regular expression"); + use.initCause(e); + throw use; + } + } + else + throw new URISyntaxException(string, + "doesn't match URI regular expression"); } return this; } @@ -744,13 +744,13 @@ public final class URI return this; try { - return new URI(scheme, authority, normalizePath(path), query, - fragment); + return new URI(scheme, authority, normalizePath(path), query, + fragment); } catch (URISyntaxException e) { - throw (Error) new InternalError("Normalized URI variant could not "+ - "be constructed").initCause(e); + throw (Error) new InternalError("Normalized URI variant could not "+ + "be constructed").initCause(e); } } @@ -770,13 +770,13 @@ public final class URI * The resulting URI will be free of `.' and `..' segments, barring those * that were prepended or which couldn't be paired, respectively. *

              - * + * * @param relativePath the relative path to be normalized. * @return the normalized path. */ private String normalizePath(String relativePath) { - /* + /* This follows the algorithm in section 5.2.4. of RFC3986, but doesn't modify the input buffer. */ @@ -785,66 +785,66 @@ public final class URI int start = 0; while (start < input.length()) { - /* A */ - if (input.indexOf("../",start) == start) - { - start += 3; - continue; - } - if (input.indexOf("./",start) == start) - { - start += 2; - continue; - } - /* B */ - if (input.indexOf("/./",start) == start) - { - start += 2; - continue; - } - if (input.indexOf("/.",start) == start - && input.charAt(start + 2) != '.') - { - start += 1; - input.setCharAt(start,'/'); - continue; - } - /* C */ - if (input.indexOf("/../",start) == start) - { - start += 3; - removeLastSegment(output); - continue; - } - if (input.indexOf("/..",start) == start) - { - start += 2; - input.setCharAt(start,'/'); - removeLastSegment(output); - continue; - } - /* D */ - if (start == input.length() - 1 && input.indexOf(".",start) == start) - { - input.delete(0,1); - continue; - } - if (start == input.length() - 2 && input.indexOf("..",start) == start) - { - input.delete(0,2); - continue; - } - /* E */ - int indexOfSlash = input.indexOf("/",start); - while (indexOfSlash == start) - { - output.append("/"); - ++start; - indexOfSlash = input.indexOf("/",start); - } - if (indexOfSlash == -1) - indexOfSlash = input.length(); - output.append(input.substring(start, indexOfSlash)); + /* A */ + if (input.indexOf("../",start) == start) + { + start += 3; + continue; + } + if (input.indexOf("./",start) == start) + { + start += 2; + continue; + } + /* B */ + if (input.indexOf("/./",start) == start) + { + start += 2; + continue; + } + if (input.indexOf("/.",start) == start + && input.charAt(start + 2) != '.') + { + start += 1; + input.setCharAt(start,'/'); + continue; + } + /* C */ + if (input.indexOf("/../",start) == start) + { + start += 3; + removeLastSegment(output); + continue; + } + if (input.indexOf("/..",start) == start) + { + start += 2; + input.setCharAt(start,'/'); + removeLastSegment(output); + continue; + } + /* D */ + if (start == input.length() - 1 && input.indexOf(".",start) == start) + { + input.delete(0,1); + continue; + } + if (start == input.length() - 2 && input.indexOf("..",start) == start) + { + input.delete(0,2); + continue; + } + /* E */ + int indexOfSlash = input.indexOf("/",start); + while (indexOfSlash == start) + { + output.append("/"); + ++start; + indexOfSlash = input.indexOf("/",start); + } + if (indexOfSlash == -1) + indexOfSlash = input.length(); + output.append(input.substring(start, indexOfSlash)); start = indexOfSlash; } return output.toString(); @@ -890,33 +890,33 @@ public final class URI try { - if (fragment != null && path != null && path.equals("") - && scheme == null && authority == null && query == null) - return new URI(this.scheme, this.schemeSpecificPart, fragment); + if (fragment != null && path != null && path.equals("") + && scheme == null && authority == null && query == null) + return new URI(this.scheme, this.schemeSpecificPart, fragment); - if (authority == null) - { - authority = this.authority; - if (path == null) - path = ""; - if (! (path.startsWith("/"))) - { - CPStringBuilder basepath = new CPStringBuilder(this.path); - int i = this.path.lastIndexOf('/'); + if (authority == null) + { + authority = this.authority; + if (path == null) + path = ""; + if (! (path.startsWith("/"))) + { + CPStringBuilder basepath = new CPStringBuilder(this.path); + int i = this.path.lastIndexOf('/'); - if (i >= 0) - basepath.delete(i + 1, basepath.length()); + if (i >= 0) + basepath.delete(i + 1, basepath.length()); - basepath.append(path); - path = normalizePath(basepath.toString()); - } - } - return new URI(this.scheme, authority, path, query, fragment); + basepath.append(path); + path = normalizePath(basepath.toString()); + } + } + return new URI(this.scheme, authority, path, query, fragment); } catch (URISyntaxException e) { - throw (Error) new InternalError("Resolved URI variant could not "+ - "be constructed").initCause(e); + throw (Error) new InternalError("Resolved URI variant could not "+ + "be constructed").initCause(e); } } @@ -973,21 +973,21 @@ public final class URI String basePath = rawPath; if (!(uri.getRawPath().equals(rawPath))) { - if (!(basePath.endsWith("/"))) - basePath = basePath.concat("/"); - if (!(uri.getRawPath().startsWith(basePath))) - return uri; + if (!(basePath.endsWith("/"))) + basePath = basePath.concat("/"); + if (!(uri.getRawPath().startsWith(basePath))) + return uri; } try { - return new URI(null, null, - uri.getRawPath().substring(basePath.length()), - uri.getRawQuery(), uri.getRawFragment()); + return new URI(null, null, + uri.getRawPath().substring(basePath.length()), + uri.getRawQuery(), uri.getRawFragment()); } catch (URISyntaxException e) { - throw (Error) new InternalError("Relativized URI variant could not "+ - "be constructed").initCause(e); + throw (Error) new InternalError("Relativized URI variant could not "+ + "be constructed").initCause(e); } } @@ -1144,7 +1144,7 @@ public final class URI } /** - *

              + *

              * Compares the URI with the given object for equality. If the * object is not a URI, then the method returns false. * Otherwise, the following criteria are observed: @@ -1187,40 +1187,40 @@ public final class URI URI uriObj = (URI) obj; if (scheme == null) { - if (uriObj.getScheme() != null) - return false; + if (uriObj.getScheme() != null) + return false; } else if (!(scheme.equalsIgnoreCase(uriObj.getScheme()))) - return false; + return false; if (rawFragment == null) { - if (uriObj.getRawFragment() != null) - return false; + if (uriObj.getRawFragment() != null) + return false; } else if (!(rawFragment.equalsIgnoreCase(uriObj.getRawFragment()))) - return false; + return false; boolean opaqueThis = isOpaque(); boolean opaqueObj = uriObj.isOpaque(); if (opaqueThis && opaqueObj) return rawSchemeSpecificPart.equals(uriObj.getRawSchemeSpecificPart()); else if (!opaqueThis && !opaqueObj) { - boolean common = rawPath.equalsIgnoreCase(uriObj.getRawPath()) - && ((rawQuery == null && uriObj.getRawQuery() == null) - || rawQuery.equalsIgnoreCase(uriObj.getRawQuery())); - if (rawAuthority == null && uriObj.getRawAuthority() == null) - return common; - if (host == null) - return common - && rawAuthority.equalsIgnoreCase(uriObj.getRawAuthority()); - return common - && host.equalsIgnoreCase(uriObj.getHost()) - && port == uriObj.getPort() - && (rawUserInfo == null ? - uriObj.getRawUserInfo() == null : - rawUserInfo.equalsIgnoreCase(uriObj.getRawUserInfo())); + boolean common = rawPath.equalsIgnoreCase(uriObj.getRawPath()) + && ((rawQuery == null && uriObj.getRawQuery() == null) + || rawQuery.equalsIgnoreCase(uriObj.getRawQuery())); + if (rawAuthority == null && uriObj.getRawAuthority() == null) + return common; + if (host == null) + return common + && rawAuthority.equalsIgnoreCase(uriObj.getRawAuthority()); + return common + && host.equalsIgnoreCase(uriObj.getHost()) + && port == uriObj.getPort() + && (rawUserInfo == null ? + uriObj.getRawUserInfo() == null : + rawUserInfo.equalsIgnoreCase(uriObj.getRawUserInfo())); } else return false; @@ -1278,16 +1278,16 @@ public final class URI * on whether this URI is less than, equal to or greater * than that supplied, respectively. */ - public int compareTo(URI uri) + public int compareTo(URI uri) throws ClassCastException { if (scheme == null && uri.getScheme() != null) return -1; if (scheme != null) { - int sCompare = scheme.compareToIgnoreCase(uri.getScheme()); - if (sCompare != 0) - return sCompare; + int sCompare = scheme.compareToIgnoreCase(uri.getScheme()); + if (sCompare != 0) + return sCompare; } boolean opaqueThis = isOpaque(); boolean opaqueObj = uri.isOpaque(); @@ -1297,51 +1297,51 @@ public final class URI return -1; if (opaqueThis) { - int ssCompare = - rawSchemeSpecificPart.compareTo(uri.getRawSchemeSpecificPart()); - if (ssCompare == 0) - return compareFragments(uri); - else - return ssCompare; + int ssCompare = + rawSchemeSpecificPart.compareTo(uri.getRawSchemeSpecificPart()); + if (ssCompare == 0) + return compareFragments(uri); + else + return ssCompare; } if (rawAuthority == null && uri.getRawAuthority() != null) return -1; if (rawAuthority != null) { - int aCompare = rawAuthority.compareTo(uri.getRawAuthority()); - if (aCompare != 0) - { - if (host == null) - return aCompare; - if (rawUserInfo == null && uri.getRawUserInfo() != null) - return -1; - int uCompare = rawUserInfo.compareTo(uri.getRawUserInfo()); - if (uCompare != 0) - return uCompare; - if (host == null && uri.getHost() != null) - return -1; - int hCompare = host.compareTo(uri.getHost()); - if (hCompare != 0) - return hCompare; - int uriPort = uri.getPort(); - return (uriPort == port) ? 0 : (uriPort > port) ? -1 : 1; - } + int aCompare = rawAuthority.compareTo(uri.getRawAuthority()); + if (aCompare != 0) + { + if (host == null) + return aCompare; + if (rawUserInfo == null && uri.getRawUserInfo() != null) + return -1; + int uCompare = rawUserInfo.compareTo(uri.getRawUserInfo()); + if (uCompare != 0) + return uCompare; + if (host == null && uri.getHost() != null) + return -1; + int hCompare = host.compareTo(uri.getHost()); + if (hCompare != 0) + return hCompare; + int uriPort = uri.getPort(); + return (uriPort == port) ? 0 : (uriPort > port) ? -1 : 1; + } } if (rawPath == null && uri.getRawPath() != null) return -1; if (rawPath != null) { - int pCompare = rawPath.compareTo(uri.getRawPath()); - if (pCompare != 0) - return pCompare; + int pCompare = rawPath.compareTo(uri.getRawPath()); + if (pCompare != 0) + return pCompare; } if (rawQuery == null && uri.getRawQuery() != null) return -1; if (rawQuery != null) { - int qCompare = rawQuery.compareTo(uri.getRawQuery()); - if (qCompare != 0) - return qCompare; + int qCompare = rawQuery.compareTo(uri.getRawQuery()); + if (qCompare != 0) + return qCompare; } return compareFragments(uri); } @@ -1394,25 +1394,25 @@ public final class URI CPStringBuilder encBuffer = null; for (int i = 0; i < strRep.length(); i++) { - char c = strRep.charAt(i); - if (c <= 127) - { - if (inNonAsciiBlock) - { - buffer.append(escapeCharacters(encBuffer.toString())); - inNonAsciiBlock = false; - } - buffer.append(c); - } - else - { - if (!inNonAsciiBlock) - { - encBuffer = new CPStringBuilder(); - inNonAsciiBlock = true; - } - encBuffer.append(c); - } + char c = strRep.charAt(i); + if (c <= 127) + { + if (inNonAsciiBlock) + { + buffer.append(escapeCharacters(encBuffer.toString())); + inNonAsciiBlock = false; + } + buffer.append(c); + } + else + { + if (!inNonAsciiBlock) + { + encBuffer = new CPStringBuilder(); + inNonAsciiBlock = true; + } + encBuffer.append(c); + } } return buffer.toString(); } @@ -1430,20 +1430,20 @@ public final class URI { try { - CPStringBuilder sb = new CPStringBuilder(); - // this is far from optimal, but it works - byte[] utf8 = str.getBytes("utf-8"); - for (int j = 0; j < utf8.length; j++) - { - sb.append('%'); - sb.append(HEX.charAt((utf8[j] & 0xff) / 16)); - sb.append(HEX.charAt((utf8[j] & 0xff) % 16)); - } - return sb.toString(); + CPStringBuilder sb = new CPStringBuilder(); + // this is far from optimal, but it works + byte[] utf8 = str.getBytes("utf-8"); + for (int j = 0; j < utf8.length; j++) + { + sb.append('%'); + sb.append(HEX.charAt((utf8[j] & 0xff) / 16)); + sb.append(HEX.charAt((utf8[j] & 0xff) % 16)); + } + return sb.toString(); } catch (java.io.UnsupportedEncodingException x) { - throw (Error) new InternalError("Escaping error").initCause(x); + throw (Error) new InternalError("Escaping error").initCause(x); } } diff --git a/libjava/classpath/java/net/URL.java b/libjava/classpath/java/net/URL.java index 16a606fbc7e..1b778b40a4b 100644 --- a/libjava/classpath/java/net/URL.java +++ b/libjava/classpath/java/net/URL.java @@ -203,9 +203,9 @@ public final class URL implements Serializable String s = SystemProperties.getProperty("gnu.java.net.nocache_protocol_handlers"); if (s == null) - cache_handlers = true; + cache_handlers = true; else - cache_handlers = false; + cache_handlers = false; } /** @@ -276,11 +276,11 @@ public final class URL implements Serializable if (ph != null) { - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkPermission(new NetPermission("specifyStreamHandler")); + SecurityManager s = System.getSecurityManager(); + if (s != null) + s.checkPermission(new NetPermission("specifyStreamHandler")); - this.ph = ph; + this.ph = ph; } else this.ph = getURLStreamHandler(protocol); @@ -293,18 +293,18 @@ public final class URL implements Serializable this.port = port; this.authority = (host != null) ? host : ""; if (port >= 0 && host != null) - this.authority += ":" + port; + this.authority += ":" + port; int hashAt = file.indexOf('#'); if (hashAt < 0) { - this.file = file; - this.ref = null; + this.file = file; + this.ref = null; } else { - this.file = file.substring(0, hashAt); - this.ref = file.substring(hashAt + 1); + this.file = file.substring(0, hashAt); + this.ref = file.substring(hashAt + 1); } hashCode = hashCode(); // Used for serialization. } @@ -324,7 +324,7 @@ public final class URL implements Serializable public URL(String spec) throws MalformedURLException { this((URL) null, spec != null ? spec : "", (URLStreamHandler) null, - false); + false); } /** @@ -346,8 +346,8 @@ public final class URL implements Serializable public URL(URL context, String spec) throws MalformedURLException { this(context, spec, - (context == null) ? (URLStreamHandler) null : context.ph, - false); + (context == null) ? (URLStreamHandler) null : context.ph, + false); } /** @@ -395,7 +395,7 @@ public final class URL implements Serializable * */ private URL(URL context, String spec, URLStreamHandler ph, - boolean phFromUser) + boolean phFromUser) throws MalformedURLException { /* A protocol is defined by the doc as the substring before a ':' @@ -416,12 +416,12 @@ public final class URL implements Serializable int colon; int slash = spec.indexOf('/'); if ((colon = spec.indexOf("://", 1)) > 0 - && ((colon < slash || slash < 0)) + && ((colon < slash || slash < 0)) && ! spec.regionMatches(colon, "://:", 0, 4)) { - context = null; - if (! phFromUser) - ph = null; + context = null; + if (! phFromUser) + ph = null; } boolean protocolSpecified = false; @@ -429,10 +429,10 @@ public final class URL implements Serializable if ((colon = spec.indexOf(':')) > 0 && (colon < slash || slash < 0)) { - // Protocol may have been specified in spec string. + // Protocol may have been specified in spec string. protocolSpecified = true; - protocol = spec.substring(0, colon).toLowerCase(); - if (context != null) + protocol = spec.substring(0, colon).toLowerCase(); + if (context != null) { if (context.protocol.equals(protocol)) { @@ -482,11 +482,11 @@ public final class URL implements Serializable if (ph != null) { - SecurityManager s = System.getSecurityManager(); - if (s != null && phFromUser) - s.checkPermission(new NetPermission("specifyStreamHandler")); + SecurityManager s = System.getSecurityManager(); + if (s != null && phFromUser) + s.checkPermission(new NetPermission("specifyStreamHandler")); - this.ph = ph; + this.ph = ph; } else this.ph = getURLStreamHandler(protocol); @@ -502,14 +502,14 @@ public final class URL implements Serializable try { - this.ph.parseURL(this, spec, colon + 1, - hashAt < 0 ? spec.length() : hashAt); + this.ph.parseURL(this, spec, colon + 1, + hashAt < 0 ? spec.length() : hashAt); } catch (URLParseError e) { MalformedURLException mue = new MalformedURLException(e.getMessage()); mue.initCause(e); - throw mue; + throw mue; } catch (RuntimeException e) { @@ -772,13 +772,13 @@ public final class URL implements Serializable protocol = protocol.toLowerCase(); if (! this.protocol.equals(protocol)) protocolHandler = getURLStreamHandler(protocol); - + // It is an hidden feature of the JDK. If the protocol does not exist, // we keep the previously initialized protocol. if (protocolHandler != null) { - this.ph = protocolHandler; - this.protocol = protocol; + this.ph = protocolHandler; + this.protocol = protocol; } this.authority = ""; this.port = port; @@ -818,13 +818,13 @@ public final class URL implements Serializable protocol = protocol.toLowerCase(); if (! this.protocol.equals(protocol)) protocolHandler = getURLStreamHandler(protocol); - + // It is an hidden feature of the JDK. If the protocol does not exist, // we keep the previously initialized protocol. if (protocolHandler != null) { - this.ph = protocolHandler; - this.protocol = protocol; + this.ph = protocolHandler; + this.protocol = protocol; } this.host = host; this.userInfo = userInfo; @@ -902,70 +902,70 @@ public final class URL implements Serializable // First, see if a protocol handler is in our cache. if (cache_handlers) { - if ((ph = ph_cache.get(protocol)) != null) - return ph; + if ((ph = ph_cache.get(protocol)) != null) + return ph; } // If a non-default factory has been set, use it to find the protocol. if (factory != null) { - ph = factory.createURLStreamHandler(protocol); + ph = factory.createURLStreamHandler(protocol); } // Non-default factory may have returned null or a factory wasn't set. // Use the default search algorithm to find a handler for this protocol. if (ph == null) { - // Get the list of packages to check and append our default handler - // to it, along with the JDK specified default as a last resort. - // Except in very unusual environments the JDK specified one shouldn't - // ever be needed (or available). - String ph_search_path = - SystemProperties.getProperty("java.protocol.handler.pkgs"); + // Get the list of packages to check and append our default handler + // to it, along with the JDK specified default as a last resort. + // Except in very unusual environments the JDK specified one shouldn't + // ever be needed (or available). + String ph_search_path = + SystemProperties.getProperty("java.protocol.handler.pkgs"); - // Tack our default package on at the ends. - if (ph_search_path != null) - ph_search_path += "|" + DEFAULT_SEARCH_PATH; - else - ph_search_path = DEFAULT_SEARCH_PATH; + // Tack our default package on at the ends. + if (ph_search_path != null) + ph_search_path += "|" + DEFAULT_SEARCH_PATH; + else + ph_search_path = DEFAULT_SEARCH_PATH; - // Finally loop through our search path looking for a match. - StringTokenizer pkgPrefix = new StringTokenizer(ph_search_path, "|"); + // Finally loop through our search path looking for a match. + StringTokenizer pkgPrefix = new StringTokenizer(ph_search_path, "|"); - // Cache the systemClassLoader - if (systemClassLoader == null) - { - systemClassLoader = AccessController.doPrivileged - (new PrivilegedAction() { - public ClassLoader run() - { - return ClassLoader.getSystemClassLoader(); - } - }); - } + // Cache the systemClassLoader + if (systemClassLoader == null) + { + systemClassLoader = AccessController.doPrivileged + (new PrivilegedAction() { + public ClassLoader run() + { + return ClassLoader.getSystemClassLoader(); + } + }); + } - do - { - try - { - // Try to get a class from the system/application - // classloader, initialize it, make an instance - // and try to cast it to a URLStreamHandler. - String clsName = - (pkgPrefix.nextToken() + "." + protocol + ".Handler"); - Class c = Class.forName(clsName, true, systemClassLoader); - ph = (URLStreamHandler) c.newInstance(); - } + do + { + try + { + // Try to get a class from the system/application + // classloader, initialize it, make an instance + // and try to cast it to a URLStreamHandler. + String clsName = + (pkgPrefix.nextToken() + "." + protocol + ".Handler"); + Class c = Class.forName(clsName, true, systemClassLoader); + ph = (URLStreamHandler) c.newInstance(); + } catch (ThreadDeath death) { throw death; } - catch (Throwable t) - { - // Ignored. - } - } - while (ph == null && pkgPrefix.hasMoreTokens()); + catch (Throwable t) + { + // Ignored. + } + } + while (ph == null && pkgPrefix.hasMoreTokens()); } // Update the hashtable with the new protocol handler. diff --git a/libjava/classpath/java/net/URLClassLoader.java b/libjava/classpath/java/net/URLClassLoader.java index 52d297a3c17..418ee77f358 100644 --- a/libjava/classpath/java/net/URLClassLoader.java +++ b/libjava/classpath/java/net/URLClassLoader.java @@ -288,8 +288,8 @@ public class URLClassLoader extends SecureClassLoader if (newUrl == null) return; // Silently ignore... - // Reset the toString() value. - thisString = null; + // Reset the toString() value. + thisString = null; // Create a loader for this URL. URLLoader loader = null; @@ -394,8 +394,8 @@ public class URLClassLoader extends SecureClassLoader newUrl); } - urlinfos.add(loader); - ArrayList extra = loader.getClassPath(); + urlinfos.add(loader); + ArrayList extra = loader.getClassPath(); if (extra != null) urlinfos.addAll(extra); } @@ -414,8 +414,8 @@ public class URLClassLoader extends SecureClassLoader { for (int i = 0; i < newUrls.length; i++) { - urls.add(newUrls[i]); - addURLImpl(newUrls[i]); + urls.add(newUrls[i]); + addURLImpl(newUrls[i]); } } @@ -424,7 +424,7 @@ public class URLClassLoader extends SecureClassLoader * object, if not null, has precedence. */ private String getAttributeValue(Attributes.Name name, Attributes first, - Attributes second) + Attributes second) { String result = null; if (first != null) @@ -457,7 +457,7 @@ public class URLClassLoader extends SecureClassLoader CPStringBuilder xform = new CPStringBuilder(name); for (int i = xform.length () - 1; i >= 0; --i) if (xform.charAt(i) == '.') - xform.setCharAt(i, '/'); + xform.setCharAt(i, '/'); xform.append('/'); String xformName = xform.toString(); @@ -466,22 +466,22 @@ public class URLClassLoader extends SecureClassLoader String specTitle = getAttributeValue(Attributes.Name.SPECIFICATION_TITLE, - entryAttr, attr); + entryAttr, attr); String specVersion = getAttributeValue(Attributes.Name.SPECIFICATION_VERSION, - entryAttr, attr); + entryAttr, attr); String specVendor = getAttributeValue(Attributes.Name.SPECIFICATION_VENDOR, - entryAttr, attr); + entryAttr, attr); String implTitle = getAttributeValue(Attributes.Name.IMPLEMENTATION_TITLE, - entryAttr, attr); + entryAttr, attr); String implVersion = getAttributeValue(Attributes.Name.IMPLEMENTATION_VERSION, - entryAttr, attr); + entryAttr, attr); String implVendor = getAttributeValue(Attributes.Name.IMPLEMENTATION_VENDOR, - entryAttr, attr); + entryAttr, attr); // Look if the Manifest indicates that this package is sealed // XXX - most likely not completely correct! @@ -494,9 +494,9 @@ public class URLClassLoader extends SecureClassLoader url = null; return definePackage(name, - specTitle, specVendor, specVersion, - implTitle, implVendor, implVersion, - url); + specTitle, specVendor, specVersion, + implTitle, implVendor, implVersion, + url); } /** @@ -534,47 +534,47 @@ public class URLClassLoader extends SecureClassLoader // construct the class (and watch out for those nasty IOExceptions) try { - byte[] data; - InputStream in = resource.getInputStream(); - try - { - int length = resource.getLength(); - if (length != -1) - { - // We know the length of the data. - // Just try to read it in all at once - data = new byte[length]; - int pos = 0; - while (length - pos > 0) - { - int len = in.read(data, pos, length - pos); - if (len == -1) - throw new EOFException("Not enough data reading from: " - + in); - pos += len; - } - } - else - { - // We don't know the data length. - // Have to read it in chunks. - ByteArrayOutputStream out = new ByteArrayOutputStream(4096); - byte[] b = new byte[4096]; - int l = 0; - while (l != -1) - { - l = in.read(b); - if (l != -1) - out.write(b, 0, l); - } - data = out.toByteArray(); - } - } - finally - { - in.close(); - } - final byte[] classData = data; + byte[] data; + InputStream in = resource.getInputStream(); + try + { + int length = resource.getLength(); + if (length != -1) + { + // We know the length of the data. + // Just try to read it in all at once + data = new byte[length]; + int pos = 0; + while (length - pos > 0) + { + int len = in.read(data, pos, length - pos); + if (len == -1) + throw new EOFException("Not enough data reading from: " + + in); + pos += len; + } + } + else + { + // We don't know the data length. + // Have to read it in chunks. + ByteArrayOutputStream out = new ByteArrayOutputStream(4096); + byte[] b = new byte[4096]; + int l = 0; + while (l != -1) + { + l = in.read(b); + if (l != -1) + out.write(b, 0, l); + } + data = out.toByteArray(); + } + } + finally + { + in.close(); + } + final byte[] classData = data; // Now get the CodeSource final CodeSource source = resource.getCodeSource(); @@ -620,18 +620,18 @@ public class URLClassLoader extends SecureClassLoader Certificate[] resourceCertificates = resource.getCertificates(); if(resourceCertificates != null) super.setSigners(result, resourceCertificates); - + return result; } catch (IOException ioe) { - throw new ClassNotFoundException(className + " not found in " + this, ioe); + throw new ClassNotFoundException(className + " not found in " + this, ioe); } } - + // Cached String representation of this URLClassLoader private String thisString; - + /** * Returns a String representation of this URLClassLoader giving the * actual Class name, the URLs that are searched and the parent @@ -641,25 +641,25 @@ public class URLClassLoader extends SecureClassLoader { synchronized (this) { - if (thisString == null) - { - CPStringBuilder sb = new CPStringBuilder(); - sb.append(this.getClass().getName()); - sb.append("{urls=[" ); - URL[] thisURLs = getURLs(); - for (int i = 0; i < thisURLs.length; i++) - { - sb.append(thisURLs[i]); - if (i < thisURLs.length - 1) - sb.append(','); - } - sb.append(']'); - sb.append(", parent="); - sb.append(getParent()); - sb.append('}'); - thisString = sb.toString(); - } - return thisString; + if (thisString == null) + { + CPStringBuilder sb = new CPStringBuilder(); + sb.append(this.getClass().getName()); + sb.append("{urls=[" ); + URL[] thisURLs = getURLs(); + for (int i = 0; i < thisURLs.length; i++) + { + sb.append(thisURLs[i]); + if (i < thisURLs.length - 1) + sb.append(','); + } + sb.append(']'); + sb.append(", parent="); + sb.append(getParent()); + sb.append('}'); + thisString = sb.toString(); + } + return thisString; } } diff --git a/libjava/classpath/java/net/URLConnection.java b/libjava/classpath/java/net/URLConnection.java index 67405801416..e9365a3e0eb 100644 --- a/libjava/classpath/java/net/URLConnection.java +++ b/libjava/classpath/java/net/URLConnection.java @@ -173,7 +173,7 @@ public abstract class URLConnection private static SimpleDateFormat[] dateFormats; private static boolean dateformats_initialized; - + /** * The connection timeout period. */ @@ -236,7 +236,7 @@ public abstract class URLConnection /** * Set the connection timeout speed, in milliseconds, or zero if the timeout - * is to be considered infinite. Note that in certain socket + * is to be considered infinite. Note that in certain socket * implementations/platforms this method may not have any effect. * * Throws an IllegalArgumentException if timeout < 0. @@ -270,7 +270,7 @@ public abstract class URLConnection /** * Set the read timeout, in milliseconds, or zero if the timeout - * is to be considered infinite. Note that in certain socket + * is to be considered infinite. Note that in certain socket * implementations/platforms this method may not have any effect. * * Throws an IllegalArgumentException if timeout < 0. @@ -368,7 +368,7 @@ public abstract class URLConnection /** * Return a String representing the header value at the specified index. * This allows the caller to walk the list of header fields. The analogous - * {@link #getHeaderField(int)} method allows access to the corresponding + * {@link #getHeaderField(int)} method allows access to the corresponding * key for this header field * * @param index The index into the header field list to retrieve the value for @@ -397,8 +397,8 @@ public abstract class URLConnection /** * Returns an unmodifiable Map containing all sent header fields. - * - * @return The map of header fields. The map consists of String keys with + * + * @return The map of header fields. The map consists of String keys with * an unmodifiable List of String objects as value. * * @since 1.4 @@ -430,11 +430,11 @@ public abstract class URLConnection try { - return Integer.parseInt(value); + return Integer.parseInt(value); } catch (NumberFormatException e) { - return defaultValue; + return defaultValue; } } @@ -463,15 +463,15 @@ public abstract class URLConnection if (str != null) { - for (int i = 0; i < dateFormats.length; i++) - { - SimpleDateFormat df = dateFormats[i]; - position.setIndex(0); - position.setErrorIndex(0); - Date date = df.parse(str, position); - if (date != null) - return date.getTime(); - } + for (int i = 0; i < dateFormats.length; i++) + { + SimpleDateFormat df = dateFormats[i]; + position.setIndex(0); + position.setErrorIndex(0); + Date date = df.parse(str, position); + if (date != null) + return date.getTime(); + } } return result; @@ -480,7 +480,7 @@ public abstract class URLConnection /** * Returns a String representing the header key at the specified index. * This allows the caller to walk the list of header fields. The analogous - * {@link #getHeaderField(int)} method allows access to the corresponding + * {@link #getHeaderField(int)} method allows access to the corresponding * value for this tag. * * @param index The index into the header field list to retrieve the key for. @@ -527,7 +527,7 @@ public abstract class URLConnection connect(); // FIXME: Doc indicates that other criteria should be applied as - // heuristics to determine the true content type, e.g. see + // heuristics to determine the true content type, e.g. see // guessContentTypeFromName() and guessContentTypeFromStream methods // as well as FileNameMap class & fileNameMap field & get/set methods. String type = getContentType(); @@ -698,7 +698,7 @@ public abstract class URLConnection { if (connected) throw new IllegalStateException("Already connected"); - + allowUserInteraction = allow; } @@ -820,8 +820,8 @@ public abstract class URLConnection } /** - * Sets the value of the named request property. - * This method does overwrite the value of existing properties with + * Sets the value of the named request property. + * This method does overwrite the value of existing properties with * the new value. * * @param key The name of the property @@ -898,8 +898,8 @@ public abstract class URLConnection /** * Returns an unmodifiable Map containing the request properties. - * - * @return The map of properties. The map consists of String keys with an + * + * @return The map of properties. The map consists of String keys with an * unmodifiable List of String objects as value. * * @exception IllegalStateException If already connected @@ -1074,11 +1074,11 @@ public abstract class URLConnection handler = factory.createContentHandler(contentType); // Now try default factory. Using this factory to instantiate built-in - // content handlers is preferable + // content handlers is preferable if (handler == null) handler = defaultFactory.createContentHandler(contentType); - // User-set factory has not returned a handler. Use the default search + // User-set factory has not returned a handler. Use the default search // algorithm. if (handler == null) { @@ -1103,7 +1103,7 @@ public abstract class URLConnection { if (cArray[i] == '/') cArray[i] = '.'; - else if (! ((cArray[i] >= 'A' && cArray[i] <= 'Z') || + else if (! ((cArray[i] >= 'A' && cArray[i] <= 'Z') || (cArray[i] >= 'a' && cArray[i] <= 'z') || (cArray[i] >= '0' && cArray[i] <= '9'))) cArray[i] = '_'; @@ -1129,7 +1129,7 @@ public abstract class URLConnection return handler; } - + // We don't put these in a static initializer, because it creates problems // with initializer co-dependency: SimpleDateFormat's constructors // eventually depend on URLConnection (via the java.text.*Symbols classes). diff --git a/libjava/classpath/java/net/URLDecoder.java b/libjava/classpath/java/net/URLDecoder.java index fb7ab591696..73cedea5cf7 100644 --- a/libjava/classpath/java/net/URLDecoder.java +++ b/libjava/classpath/java/net/URLDecoder.java @@ -87,12 +87,12 @@ public class URLDecoder { try { - return decode(s, "UTF-8"); + return decode(s, "UTF-8"); } catch (UnsupportedEncodingException uee) { - // Should never happen since UTF-8 encoding should always be supported - return s; + // Should never happen since UTF-8 encoding should always be supported + return s; } } @@ -132,45 +132,45 @@ public class URLDecoder CPStringBuilder result = new CPStringBuilder(length); while ((i = str.indexOf('%', start)) >= 0) { - // Add all non-encoded characters to the result buffer - result.append(str.substring(start, i)); - start = i; + // Add all non-encoded characters to the result buffer + result.append(str.substring(start, i)); + start = i; - // Get all consecutive encoded bytes - while ((i + 2 < length) && (str.charAt(i) == '%')) - i += 3; + // Get all consecutive encoded bytes + while ((i + 2 < length) && (str.charAt(i) == '%')) + i += 3; - // Decode all these bytes - if ((bytes == null) || (bytes.length < ((i - start) / 3))) - bytes = new byte[((i - start) / 3)]; + // Decode all these bytes + if ((bytes == null) || (bytes.length < ((i - start) / 3))) + bytes = new byte[((i - start) / 3)]; - int index = 0; - try - { - while (start < i) - { - String sub = str.substring(start + 1, start + 3); - bytes[index] = (byte) Integer.parseInt(sub, 16); - index++; - start += 3; - } - } - catch (NumberFormatException nfe) - { - // One of the hex encoded strings was bad - } + int index = 0; + try + { + while (start < i) + { + String sub = str.substring(start + 1, start + 3); + bytes[index] = (byte) Integer.parseInt(sub, 16); + index++; + start += 3; + } + } + catch (NumberFormatException nfe) + { + // One of the hex encoded strings was bad + } - // Add the bytes as characters according to the given encoding - result.append(new String(bytes, 0, index, encoding)); + // Add the bytes as characters according to the given encoding + result.append(new String(bytes, 0, index, encoding)); - // Make sure we skip to just after a % sign - // There might not have been enough encoded characters after the % - // or the hex chars were not actually hex chars (NumberFormatException) - if (start < length && s.charAt(start) == '%') - { - result.append('%'); - start++; - } + // Make sure we skip to just after a % sign + // There might not have been enough encoded characters after the % + // or the hex chars were not actually hex chars (NumberFormatException) + if (start < length && s.charAt(start) == '%') + { + result.append('%'); + start++; + } } // Add any characters left diff --git a/libjava/classpath/java/net/URLEncoder.java b/libjava/classpath/java/net/URLEncoder.java index 89d9a0bd04c..09c0f3de024 100644 --- a/libjava/classpath/java/net/URLEncoder.java +++ b/libjava/classpath/java/net/URLEncoder.java @@ -83,14 +83,14 @@ public class URLEncoder { try { - // We default to 8859_1 for compatibility with the same - // default elsewhere in the library. - return encode(s, System.getProperty("file.encoding", "8859_1")); + // We default to 8859_1 for compatibility with the same + // default elsewhere in the library. + return encode(s, System.getProperty("file.encoding", "8859_1")); } catch (UnsupportedEncodingException uee) { - // Should never happen since default should always be supported - return s; + // Should never happen since default should always be supported + return s; } } @@ -118,40 +118,40 @@ public class URLEncoder CPStringBuilder result = new CPStringBuilder(length); while (true) { - while (i < length && isSafe(s.charAt(i))) - i++; + while (i < length && isSafe(s.charAt(i))) + i++; - // Safe character can just be added - result.append(s.substring(start, i)); + // Safe character can just be added + result.append(s.substring(start, i)); - // Are we done? - if (i >= length) - return result.toString(); - else if (s.charAt(i) == ' ') - { - result.append('+'); // Replace space char with plus symbol. - i++; - } - else - { - // Get all unsafe characters - start = i; - char c; - while (i < length && (c = s.charAt(i)) != ' ' && ! isSafe(c)) - i++; + // Are we done? + if (i >= length) + return result.toString(); + else if (s.charAt(i) == ' ') + { + result.append('+'); // Replace space char with plus symbol. + i++; + } + else + { + // Get all unsafe characters + start = i; + char c; + while (i < length && (c = s.charAt(i)) != ' ' && ! isSafe(c)) + i++; - // Convert them to %XY encoded strings - String unsafe = s.substring(start, i); - byte[] bytes = unsafe.getBytes(encoding); - for (int j = 0; j < bytes.length; j++) - { - result.append('%'); - int val = bytes[j]; - result.append(hex.charAt((val & 0xf0) >> 4)); - result.append(hex.charAt(val & 0x0f)); - } - } - start = i; + // Convert them to %XY encoded strings + String unsafe = s.substring(start, i); + byte[] bytes = unsafe.getBytes(encoding); + for (int j = 0; j < bytes.length; j++) + { + result.append('%'); + int val = bytes[j]; + result.append(hex.charAt((val & 0xf0) >> 4)); + result.append(hex.charAt(val & 0x0f)); + } + } + start = i; } } diff --git a/libjava/classpath/java/net/URLStreamHandler.java b/libjava/classpath/java/net/URLStreamHandler.java index 4748191e07b..5433aedd9d7 100644 --- a/libjava/classpath/java/net/URLStreamHandler.java +++ b/libjava/classpath/java/net/URLStreamHandler.java @@ -131,69 +131,69 @@ public abstract class URLStreamHandler String userInfo = url.getUserInfo(); String authority = url.getAuthority(); String query = null; - + // On Windows we need to change \ to / for file URLs char separator = File.separatorChar; if (url.getProtocol().equals("file") && separator != '/') { - file = file.replace(separator, '/'); - spec = spec.replace(separator, '/'); + file = file.replace(separator, '/'); + spec = spec.replace(separator, '/'); } if (spec.regionMatches(start, "//", 0, 2)) { - String genuineHost; - int hostEnd; - int colon; - int at_host; + String genuineHost; + int hostEnd; + int colon; + int at_host; - start += 2; - int slash = spec.indexOf('/', start); - if (slash >= 0) - hostEnd = slash; - else - hostEnd = end; + start += 2; + int slash = spec.indexOf('/', start); + if (slash >= 0) + hostEnd = slash; + else + hostEnd = end; - authority = host = spec.substring(start, hostEnd); + authority = host = spec.substring(start, hostEnd); - // We first need a genuine host name (with userinfo). - // So we check for '@': if it's present check the port in the - // section after '@' in the other case check it in the full string. - // P.S.: We don't care having '@' at the beginning of the string. - if ((at_host = host.indexOf('@')) >= 0) - { - genuineHost = host.substring(at_host); - userInfo = host.substring(0, at_host); - } - else - genuineHost = host; + // We first need a genuine host name (with userinfo). + // So we check for '@': if it's present check the port in the + // section after '@' in the other case check it in the full string. + // P.S.: We don't care having '@' at the beginning of the string. + if ((at_host = host.indexOf('@')) >= 0) + { + genuineHost = host.substring(at_host); + userInfo = host.substring(0, at_host); + } + else + genuineHost = host; - // Look for optional port number. It is valid for the non-port - // part of the host name to be null (e.g. a URL "http://:80"). - // TBD: JDK 1.2 in this case sets host to null rather than ""; - // this is undocumented and likely an unintended side effect in 1.2 - // so we'll be simple here and stick with "". Note that - // "http://" or "http:///" produce a "" host in JDK 1.2. - if ((colon = genuineHost.indexOf(':')) >= 0) - { - try - { - port = Integer.parseInt(genuineHost.substring(colon + 1)); - } - catch (NumberFormatException e) - { - // Ignore invalid port values; port is already set to u's - // port. - } + // Look for optional port number. It is valid for the non-port + // part of the host name to be null (e.g. a URL "http://:80"). + // TBD: JDK 1.2 in this case sets host to null rather than ""; + // this is undocumented and likely an unintended side effect in 1.2 + // so we'll be simple here and stick with "". Note that + // "http://" or "http:///" produce a "" host in JDK 1.2. + if ((colon = genuineHost.indexOf(':')) >= 0) + { + try + { + port = Integer.parseInt(genuineHost.substring(colon + 1)); + } + catch (NumberFormatException e) + { + // Ignore invalid port values; port is already set to u's + // port. + } - // Now we must cut the port number in the original string. - if (at_host >= 0) - host = host.substring(0, at_host + colon); - else - host = host.substring(0, colon); - } - file = null; - start = hostEnd; + // Now we must cut the port number in the original string. + if (at_host >= 0) + host = host.substring(0, at_host + colon); + else + host = host.substring(0, colon); + } + file = null; + start = hostEnd; } else if (host == null) host = ""; @@ -201,49 +201,49 @@ public abstract class URLStreamHandler if (file == null || file.length() == 0 || (start < end && spec.charAt(start) == '/')) { - // No file context available; just spec for file. - // Or this is an absolute path name; ignore any file context. - file = spec.substring(start, end); - ref = null; + // No file context available; just spec for file. + // Or this is an absolute path name; ignore any file context. + file = spec.substring(start, end); + ref = null; } else if (start < end) { - // Context is available, but only override it if there is a new file. - int lastSlash = file.lastIndexOf('/'); - if (lastSlash < 0) - file = spec.substring(start, end); - else - file = (file.substring(0, lastSlash) - + '/' + spec.substring(start, end)); + // Context is available, but only override it if there is a new file. + int lastSlash = file.lastIndexOf('/'); + if (lastSlash < 0) + file = spec.substring(start, end); + else + file = (file.substring(0, lastSlash) + + '/' + spec.substring(start, end)); - // For URLs constructed relative to a context, we - // need to canonicalise the file path. - file = canonicalizeFilename(file); + // For URLs constructed relative to a context, we + // need to canonicalise the file path. + file = canonicalizeFilename(file); - ref = null; + ref = null; } if (ref == null) { - // Normally there should be no '#' in the file part, - // but we are nice. - int hash = file.indexOf('#'); - if (hash != -1) - { - ref = file.substring(hash + 1, file.length()); - file = file.substring(0, hash); - } + // Normally there should be no '#' in the file part, + // but we are nice. + int hash = file.indexOf('#'); + if (hash != -1) + { + ref = file.substring(hash + 1, file.length()); + file = file.substring(0, hash); + } } // We care about the query tag only if there is no reference at all. if (ref == null) { - int queryTag = file.indexOf('?'); - if (queryTag != -1) - { - query = file.substring(queryTag + 1); - file = file.substring(0, queryTag); - } + int queryTag = file.indexOf('?'); + if (queryTag != -1) + { + query = file.substring(queryTag + 1); + file = file.substring(0, queryTag); + } } // XXX - Classpath used to call PlatformHelper.toCanonicalForm() on @@ -270,12 +270,12 @@ public abstract class URLStreamHandler // the general case, but it's probably not bad most of the time. while ((index = file.indexOf("/../")) >= 0) { - // Strip of the previous directory - if it exists. - int previous = file.lastIndexOf('/', index - 1); - if (previous >= 0) - file = file.substring(0, previous) + file.substring(index + 3); - else - break; + // Strip of the previous directory - if it exists. + int previous = file.lastIndexOf('/', index - 1); + if (previous >= 0) + file = file.substring(0, previous) + file.substring(index + 3); + else + break; } return file; } @@ -451,11 +451,11 @@ public abstract class URLStreamHandler try { - return InetAddress.getByName(hostname); + return InetAddress.getByName(hostname); } catch (UnknownHostException e) { - return null; + return null; } } @@ -505,7 +505,7 @@ public abstract class URLStreamHandler authority = url.getAuthority(); if (authority == null) authority = ""; - + file = url.getFile(); ref = url.getRef(); @@ -516,15 +516,15 @@ public abstract class URLStreamHandler if (protocol.length() > 0) { - sb.append(protocol); - sb.append(":"); + sb.append(protocol); + sb.append(":"); } - + // If we have superfluous leading slashes (that means, at least 2) // we always add the authority component ("//" + host) to // avoid ambiguity. Otherwise we would generate an URL like // proto://home/foo - // where we meant: + // where we meant: // host: - file: //home/foo // but URL spec says it is: // host: home - file: /foo diff --git a/libjava/classpath/java/nio/Buffer.java b/libjava/classpath/java/nio/Buffer.java index 5dc67025537..023ab0e1d18 100644 --- a/libjava/classpath/java/nio/Buffer.java +++ b/libjava/classpath/java/nio/Buffer.java @@ -1,4 +1,4 @@ -/* Buffer.java -- +/* Buffer.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,22 +57,22 @@ public abstract class Buffer * Should be package private. */ Buffer (int capacity, int limit, int position, int mark, - Pointer address) + Pointer address) { this.address = address; if (capacity < 0) throw new IllegalArgumentException (); - + cap = capacity; limit (limit); position (position); - + if (mark >= 0) { if (mark > pos) throw new IllegalArgumentException (); - + this.mark = mark; } else @@ -80,7 +80,7 @@ public abstract class Buffer this.mark = -1; } } - + /** * Retrieves the capacity of the buffer. * @@ -103,7 +103,7 @@ public abstract class Buffer mark = -1; return this; } - + /** * Flips the buffer. * @@ -116,7 +116,7 @@ public abstract class Buffer mark = -1; return this; } - + /** * Tells whether the buffer has remaining data to read or not. * @@ -147,7 +147,7 @@ public abstract class Buffer /** * Sets this buffer's limit. - * + * * @param newLimit The new limit value; must be non-negative and no larger * than this buffer's capacity. * @@ -191,11 +191,11 @@ public abstract class Buffer { return pos; } - + /** * Sets this buffer's position. If the mark is defined and larger than the * new position then it is discarded. - * + * * @param newPosition The new position value; must be non-negative and no * larger than the current limit. * @@ -257,7 +257,7 @@ public abstract class Buffer /** * Checks for underflow. This method is used internally to check - * whether a buffer has enough elements left to satisfy a read + * whether a buffer has enough elements left to satisfy a read * request. * * @exception BufferUnderflowException If there are no remaining @@ -271,12 +271,12 @@ public abstract class Buffer /** * Checks for underflow. This method is used internally to check - * whether a buffer has enough elements left to satisfy a read + * whether a buffer has enough elements left to satisfy a read * request for a given number of elements. * * @param length The length of a sequence of elements. * - * @exception BufferUnderflowException If there are not enough + * @exception BufferUnderflowException If there are not enough * remaining elements in this buffer. */ final void checkForUnderflow(int length) @@ -287,7 +287,7 @@ public abstract class Buffer /** * Checks for overflow. This method is used internally to check - * whether a buffer has enough space left to satisfy a write + * whether a buffer has enough space left to satisfy a write * request. * * @exception BufferOverflowException If there is no remaining @@ -301,12 +301,12 @@ public abstract class Buffer /** * Checks for overflow. This method is used internally to check - * whether a buffer has enough space left to satisfy a write + * whether a buffer has enough space left to satisfy a write * request for a given number of elements. * * @param length The length of a sequence of elements. * - * @exception BufferUnderflowException If there is not enough + * @exception BufferUnderflowException If there is not enough * remaining space in this buffer. */ final void checkForOverflow(int length) @@ -316,7 +316,7 @@ public abstract class Buffer } /** - * Checks if index is negative or not smaller than the buffer's + * Checks if index is negative or not smaller than the buffer's * limit. This method is used internally to check whether * an indexed request can be fulfilled. * @@ -338,7 +338,7 @@ public abstract class Buffer * * @exception ReadOnlyBufferException If this buffer is read-only. */ - final void checkIfReadOnly() + final void checkIfReadOnly() { if (isReadOnly()) throw new ReadOnlyBufferException (); diff --git a/libjava/classpath/java/nio/BufferOverflowException.java b/libjava/classpath/java/nio/BufferOverflowException.java index c72ae923801..eac79ed750d 100644 --- a/libjava/classpath/java/nio/BufferOverflowException.java +++ b/libjava/classpath/java/nio/BufferOverflowException.java @@ -1,4 +1,4 @@ -/* BufferOverflowException.java -- +/* BufferOverflowException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/BufferUnderflowException.java b/libjava/classpath/java/nio/BufferUnderflowException.java index a6d391e00cc..76581371b6a 100644 --- a/libjava/classpath/java/nio/BufferUnderflowException.java +++ b/libjava/classpath/java/nio/BufferUnderflowException.java @@ -1,4 +1,4 @@ -/* BufferUnderflowException.java -- +/* BufferUnderflowException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/ByteBuffer.java b/libjava/classpath/java/nio/ByteBuffer.java index 94aae4bf021..00db5bf4f4d 100644 --- a/libjava/classpath/java/nio/ByteBuffer.java +++ b/libjava/classpath/java/nio/ByteBuffer.java @@ -1,4 +1,4 @@ -/* ByteBuffer.java -- +/* ByteBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,7 +53,7 @@ public abstract class ByteBuffer extends Buffer final int array_offset; ByteBuffer (int capacity, int limit, int position, int mark, - RawData address, byte[] backing_buffer, int array_offset) + RawData address, byte[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -62,7 +62,7 @@ public abstract class ByteBuffer extends Buffer /** * Allocates a new direct byte buffer. - */ + */ public static ByteBuffer allocateDirect (int capacity) { return DirectByteBufferImpl.allocate (capacity); @@ -104,7 +104,7 @@ public abstract class ByteBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers bytes from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than @@ -187,7 +187,7 @@ public abstract class ByteBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining bytes in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -210,7 +210,7 @@ public abstract class ByteBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining bytes in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -243,7 +243,7 @@ public abstract class ByteBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -260,7 +260,7 @@ public abstract class ByteBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -283,8 +283,8 @@ public abstract class ByteBuffer extends Buffer int multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (get(i) + 30)*multiplier; + multiplier *= 31; + hashCode += (get(i) + 30)*multiplier; } return hashCode; } @@ -313,32 +313,32 @@ public abstract class ByteBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { byte a = get(pos_this++); - byte b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + byte b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } /** * Returns the byte order of this buffer. - */ + */ public final ByteOrder order () { return endian; } - + /** * Modifies this buffer's byte order. */ @@ -347,7 +347,7 @@ public abstract class ByteBuffer extends Buffer this.endian = endian; return this; } - + /** * Reads the byte at this buffer's current position, * and then increments the position. @@ -361,7 +361,7 @@ public abstract class ByteBuffer extends Buffer * Writes the byte at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * bytes in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -374,7 +374,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit. */ public abstract byte get (int index); - + /** * Absolute put method. * @@ -386,7 +386,7 @@ public abstract class ByteBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract ByteBuffer compact (); @@ -419,32 +419,32 @@ public abstract class ByteBuffer extends Buffer * buffer's content. */ public abstract ByteBuffer asReadOnlyBuffer (); - + /** * Creates a view of this byte buffer as a short buffer. */ public abstract ShortBuffer asShortBuffer (); - + /** * Creates a view of this byte buffer as a char buffer. */ public abstract CharBuffer asCharBuffer (); - + /** * Creates a view of this byte buffer as an integer buffer. */ public abstract IntBuffer asIntBuffer (); - + /** * Creates a view of this byte buffer as a long buffer. */ public abstract LongBuffer asLongBuffer (); - + /** * Creates a view of this byte buffer as a float buffer. */ public abstract FloatBuffer asFloatBuffer (); - + /** * Creates a view of this byte buffer as a double buffer. */ @@ -457,7 +457,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract char getChar (); - + /** * Relative put method for writing a character value. * @@ -465,7 +465,7 @@ public abstract class ByteBuffer extends Buffer * not smaller than its limit. */ public abstract ByteBuffer putChar (char value); - + /** * Absolute get method for reading a character value. * @@ -473,7 +473,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer */ public abstract char getChar (int index); - + /** * Absolute put method for writing a character value. * @@ -481,7 +481,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus one. */ public abstract ByteBuffer putChar (int index, char value); - + /** * Relative get method for reading a short value. * @@ -489,7 +489,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus one. */ public abstract short getShort (); - + /** * Relative put method for writing a short value. * @@ -497,7 +497,7 @@ public abstract class ByteBuffer extends Buffer * not smaller than its limit. */ public abstract ByteBuffer putShort (short value); - + /** * Absolute get method for reading a short value. * @@ -505,7 +505,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer */ public abstract short getShort (int index); - + /** * Absolute put method for writing a short value. * @@ -513,7 +513,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus one. */ public abstract ByteBuffer putShort (int index, short value); - + /** * Relative get method for reading an integer value. * @@ -521,7 +521,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract int getInt (); - + /** * Relative put method for writing an integer value. * @@ -529,7 +529,7 @@ public abstract class ByteBuffer extends Buffer * not smaller than its limit. */ public abstract ByteBuffer putInt (int value); - + /** * Absolute get method for reading an integer value. * @@ -537,7 +537,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus three. */ public abstract int getInt (int index); - + /** * Absolute put method for writing an integer value. * @@ -545,7 +545,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus three. */ public abstract ByteBuffer putInt (int index, int value); - + /** * Relative get method for reading a long value. * @@ -553,7 +553,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract long getLong (); - + /** * Relative put method for writing a long value. * @@ -561,7 +561,7 @@ public abstract class ByteBuffer extends Buffer * not smaller than its limit. */ public abstract ByteBuffer putLong (long value); - + /** * Absolute get method for reading a long value. * @@ -569,7 +569,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus seven. */ public abstract long getLong (int index); - + /** * Absolute put method for writing a float value. * @@ -577,7 +577,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus seven. */ public abstract ByteBuffer putLong (int index, long value); - + /** * Relative get method for reading a float value. * @@ -585,7 +585,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract float getFloat (); - + /** * Relative put method for writing a float value. * @@ -593,7 +593,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract ByteBuffer putFloat (float value); - + /** * Absolute get method for reading a float value. * @@ -601,7 +601,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus three. */ public abstract float getFloat (int index); - + /** * Relative put method for writing a float value. * @@ -609,7 +609,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus three. */ public abstract ByteBuffer putFloat (int index, float value); - + /** * Relative get method for reading a double value. * @@ -617,7 +617,7 @@ public abstract class ByteBuffer extends Buffer * remaining in this buffer. */ public abstract double getDouble (); - + /** * Relative put method for writing a double value. * @@ -625,7 +625,7 @@ public abstract class ByteBuffer extends Buffer * not smaller than its limit. */ public abstract ByteBuffer putDouble (double value); - + /** * Absolute get method for reading a double value. * @@ -633,7 +633,7 @@ public abstract class ByteBuffer extends Buffer * than the buffer's limit, minus seven. */ public abstract double getDouble (int index); - + /** * Absolute put method for writing a double value. * @@ -648,8 +648,8 @@ public abstract class ByteBuffer extends Buffer public String toString () { return getClass ().getName () + - "[pos=" + position () + - " lim=" + limit () + - " cap=" + capacity () + "]"; + "[pos=" + position () + + " lim=" + limit () + + " cap=" + capacity () + "]"; } } diff --git a/libjava/classpath/java/nio/ByteBufferHelper.java b/libjava/classpath/java/nio/ByteBufferHelper.java index 6c46ca5d7ab..aee007b508b 100644 --- a/libjava/classpath/java/nio/ByteBufferHelper.java +++ b/libjava/classpath/java/nio/ByteBufferHelper.java @@ -1,4 +1,4 @@ -/* ByteBufferImpl.java -- +/* ByteBufferImpl.java -- Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,19 +46,19 @@ final class ByteBufferHelper { return (char) getShort (buffer, order); } - + public static void putChar (ByteBuffer buffer, char value, ByteOrder order) { putShort (buffer, (short) value, order); } - + public static char getChar (ByteBuffer buffer, int index, ByteOrder order) { return (char) getShort (buffer, index, order); } - + public static void putChar (ByteBuffer buffer, int index, - char value, ByteOrder order) + char value, ByteOrder order) { putShort (buffer, index, (short) value, order); } @@ -76,7 +76,7 @@ final class ByteBufferHelper return (short) ((buffer.get() << 8) + (buffer.get() & 0xff)); } - + public static void putShort (ByteBuffer buffer, short value, ByteOrder order) { buffer.checkForOverflow(2); @@ -92,9 +92,9 @@ final class ByteBufferHelper buffer.put ((byte) value); } } - + public static short getShort (ByteBuffer buffer, - int index, ByteOrder order) + int index, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) { @@ -105,9 +105,9 @@ final class ByteBufferHelper return (short) ((buffer.get (index) << 8) + (buffer.get (++index) & 0xff)); } - + public static void putShort (ByteBuffer buffer, int index, - short value, ByteOrder order) + short value, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) { @@ -138,7 +138,7 @@ final class ByteBufferHelper + ((buffer.get() & 0xff) << 8) + (buffer.get() & 0xff)); } - + public static void putInt (ByteBuffer buffer, int value, ByteOrder order) { buffer.checkForOverflow(4); @@ -158,7 +158,7 @@ final class ByteBufferHelper buffer.put ((byte) value); } } - + public static int getInt (ByteBuffer buffer, int index, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) @@ -174,9 +174,9 @@ final class ByteBufferHelper + ((buffer.get (++index) & 0xff) << 8) + (buffer.get (++index) & 0xff)); } - + public static void putInt (ByteBuffer buffer, int index, - int value, ByteOrder order) + int value, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) { @@ -219,7 +219,7 @@ final class ByteBufferHelper + ((buffer.get() & 0xff) << 8) + (buffer.get() & 0xff)); } - + public static void putLong (ByteBuffer buffer, long value, ByteOrder order) { buffer.checkForOverflow(8); @@ -247,7 +247,7 @@ final class ByteBufferHelper buffer.put ((byte) value); } } - + public static long getLong (ByteBuffer buffer, int index, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) @@ -271,9 +271,9 @@ final class ByteBufferHelper + ((buffer.get (++index) & 0xff) << 8) + (buffer.get (++index) & 0xff)); } - + public static void putLong (ByteBuffer buffer, int index, - long value, ByteOrder order) + long value, ByteOrder order) { if (order == ByteOrder.LITTLE_ENDIAN) { @@ -303,19 +303,19 @@ final class ByteBufferHelper { return Float.intBitsToFloat (getInt (buffer, order)); } - + public static void putFloat (ByteBuffer buffer, float value, ByteOrder order) { putInt (buffer, Float.floatToRawIntBits (value), order); } - + public static float getFloat (ByteBuffer buffer, int index, ByteOrder order) { return Float.intBitsToFloat (getInt (buffer, index, order)); } public static void putFloat (ByteBuffer buffer, int index, - float value, ByteOrder order) + float value, ByteOrder order) { putInt (buffer, index, Float.floatToRawIntBits (value), order); } @@ -329,16 +329,15 @@ final class ByteBufferHelper { putLong (buffer, Double.doubleToRawLongBits (value), order); } - + public static double getDouble (ByteBuffer buffer, int index, ByteOrder order) { return Double.longBitsToDouble (getLong (buffer, index, order)); } - + public static void putDouble (ByteBuffer buffer, int index, - double value, ByteOrder order) + double value, ByteOrder order) { putLong (buffer, index, Double.doubleToRawLongBits (value), order); } } // ByteBufferHelper - diff --git a/libjava/classpath/java/nio/ByteBufferImpl.java b/libjava/classpath/java/nio/ByteBufferImpl.java index 6a1ac4681da..2bf31922066 100644 --- a/libjava/classpath/java/nio/ByteBufferImpl.java +++ b/libjava/classpath/java/nio/ByteBufferImpl.java @@ -1,4 +1,4 @@ -/* ByteBufferImpl.java -- +/* ByteBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,12 +46,12 @@ final class ByteBufferImpl extends ByteBuffer private final boolean readOnly; ByteBufferImpl (byte[] buffer, int offset, int capacity, int limit, - int position, int mark, boolean readOnly) + int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public CharBuffer asCharBuffer () { return new CharViewBufferImpl (this, remaining() >> 1); @@ -86,30 +86,30 @@ final class ByteBufferImpl extends ByteBuffer { return readOnly; } - + public ByteBuffer slice () { return new ByteBufferImpl (backing_buffer, array_offset + position (), - remaining (), remaining (), 0, -1, isReadOnly ()); + remaining (), remaining (), 0, -1, isReadOnly ()); } - + public ByteBuffer duplicate () { return new ByteBufferImpl (backing_buffer, array_offset, capacity (), - limit (), position (), mark, isReadOnly ()); + limit (), position (), mark, isReadOnly ()); } - + public ByteBuffer asReadOnlyBuffer () { return new ByteBufferImpl (backing_buffer, array_offset, capacity (), - limit (), position (), mark, true); + limit (), position (), mark, true); } - + void shiftDown (int dst_offset, int src_offset, int count) { System.arraycopy(backing_buffer, array_offset + src_offset, - backing_buffer, array_offset + dst_offset, - count); + backing_buffer, array_offset + dst_offset, + count); } public ByteBuffer compact () @@ -124,7 +124,7 @@ final class ByteBufferImpl extends ByteBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -154,8 +154,8 @@ final class ByteBufferImpl extends ByteBuffer if ( (limit - pos) < length) // check for overflow throw new BufferUnderflowException(); - System.arraycopy(backing_buffer, pos + array_offset, - dst, offset, length); + System.arraycopy(backing_buffer, pos + array_offset, + dst, offset, length); pos += length; return this; @@ -194,7 +194,7 @@ final class ByteBufferImpl extends ByteBuffer backing_buffer [(pos++) + array_offset] = value; return this; } - + /** * Absolute get method. Reads the byte at position * index. @@ -208,7 +208,7 @@ final class ByteBufferImpl extends ByteBuffer return backing_buffer [index + array_offset]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -225,12 +225,12 @@ final class ByteBufferImpl extends ByteBuffer backing_buffer [index + array_offset] = value; return this; } - + public char getChar () { return ByteBufferHelper.getChar(this, order()); } - + public ByteBuffer putChar (char value) { if (readOnly) @@ -250,12 +250,12 @@ final class ByteBufferImpl extends ByteBuffer } return this; } - + public char getChar (int index) { return ByteBufferHelper.getChar(this, index, order()); } - + public ByteBuffer putChar (int index, char value) { ByteBufferHelper.putChar(this, index, value, order()); @@ -266,18 +266,18 @@ final class ByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getShort(this, order()); } - + public ByteBuffer putShort (short value) { ByteBufferHelper.putShort(this, value, order()); return this; } - + public short getShort (int index) { return ByteBufferHelper.getShort(this, index, order()); } - + public ByteBuffer putShort (int index, short value) { ByteBufferHelper.putShort(this, index, value, order()); @@ -288,18 +288,18 @@ final class ByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getInt(this, order()); } - + public ByteBuffer putInt (int value) { ByteBufferHelper.putInt(this, value, order()); return this; } - + public int getInt (int index) { return ByteBufferHelper.getInt(this, index, order()); } - + public ByteBuffer putInt (int index, int value) { ByteBufferHelper.putInt(this, index, value, order()); @@ -310,18 +310,18 @@ final class ByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getLong(this, order()); } - + public ByteBuffer putLong (long value) { ByteBufferHelper.putLong (this, value, order()); return this; } - + public long getLong (int index) { return ByteBufferHelper.getLong (this, index, order()); } - + public ByteBuffer putLong (int index, long value) { ByteBufferHelper.putLong (this, index, value, order()); @@ -332,13 +332,13 @@ final class ByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getFloat (this, order()); } - + public ByteBuffer putFloat (float value) { ByteBufferHelper.putFloat (this, value, order()); return this; } - + public float getFloat (int index) { return ByteBufferHelper.getFloat (this, index, order()); @@ -360,12 +360,12 @@ final class ByteBufferImpl extends ByteBuffer ByteBufferHelper.putDouble (this, value, order()); return this; } - + public double getDouble (int index) { return ByteBufferHelper.getDouble (this, index, order()); } - + public ByteBuffer putDouble (int index, double value) { ByteBufferHelper.putDouble (this, index, value, order()); diff --git a/libjava/classpath/java/nio/ByteOrder.java b/libjava/classpath/java/nio/ByteOrder.java index 0e3b9173eb6..364aa182981 100644 --- a/libjava/classpath/java/nio/ByteOrder.java +++ b/libjava/classpath/java/nio/ByteOrder.java @@ -1,4 +1,4 @@ -/* ByteOrder.java -- +/* ByteOrder.java -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/CharBuffer.java b/libjava/classpath/java/nio/CharBuffer.java index 969b5bb3df3..a1729e6e79c 100644 --- a/libjava/classpath/java/nio/CharBuffer.java +++ b/libjava/classpath/java/nio/CharBuffer.java @@ -1,4 +1,4 @@ -/* CharBuffer.java -- +/* CharBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,7 +53,7 @@ public abstract class CharBuffer extends Buffer final char[] backing_buffer; CharBuffer (int capacity, int limit, int position, int mark, - RawData address, char[] backing_buffer, int array_offset) + RawData address, char[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -77,16 +77,16 @@ public abstract class CharBuffer extends Buffer * @param length the length of the region in the array to wrap * * @return a new CharBuffer object - * + * * @exception IndexOutOfBoundsException If the preconditions on the offset * and length parameters do not hold */ public static final CharBuffer wrap(char[] array, int offset, int length) { return new CharBufferImpl(array, 0, array.length, offset + length, offset, - -1, false); + -1, false); } - + /** * Wraps a character sequence into a CharBuffer object. * @@ -98,16 +98,16 @@ public abstract class CharBuffer extends Buffer { return wrap(seq, 0, seq.length()); } - + /** * Wraps a character sequence into a CharBuffer object. - * + * * @param seq the sequence to wrap * @param start the index of the first character to wrap * @param end the index of the first character not to wrap * * @return a new CharBuffer object - * + * * @exception IndexOutOfBoundsException If the preconditions on the offset * and length parameters do not hold */ @@ -128,11 +128,11 @@ public abstract class CharBuffer extends Buffer { return wrap(array, 0, array.length); } - + /** * This method transfers chars from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length chars remaining in this buffer. + * length chars remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first char @@ -207,7 +207,7 @@ public abstract class CharBuffer extends Buffer { char[] toPut = new char [src.remaining ()]; src.get (toPut); - put (toPut); + put (toPut); } return this; @@ -223,7 +223,7 @@ public abstract class CharBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining chars in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -234,7 +234,7 @@ public abstract class CharBuffer extends Buffer { checkArraySize(src.length, offset, length); checkForOverflow(length); - + for (int i = offset; i < offset + length; i++) put (src [i]); @@ -246,7 +246,7 @@ public abstract class CharBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining chars in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -296,7 +296,7 @@ public abstract class CharBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -317,8 +317,8 @@ public abstract class CharBuffer extends Buffer int multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (get(i) + 30)*multiplier; + multiplier *= 31; + hashCode += (get(i) + 30)*multiplier; } return hashCode; } @@ -347,21 +347,21 @@ public abstract class CharBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - char a = get(pos_this++); - char b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + char a = get(pos_this++); + char b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -383,7 +383,7 @@ public abstract class CharBuffer extends Buffer * Writes the char at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * chars in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -396,7 +396,7 @@ public abstract class CharBuffer extends Buffer * than the buffer's limit. */ public abstract char get (int index); - + /** * Absolute put method. * @@ -408,7 +408,7 @@ public abstract class CharBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract CharBuffer compact (); @@ -435,7 +435,7 @@ public abstract class CharBuffer extends Buffer * buffer's content. */ public abstract CharBuffer asReadOnlyBuffer (); - + /** * Returns the remaining content of the buffer as a string. */ @@ -455,7 +455,7 @@ public abstract class CharBuffer extends Buffer * Returns the length of the remaining chars in this buffer. */ public final int length () - { + { return remaining (); } @@ -470,7 +470,7 @@ public abstract class CharBuffer extends Buffer /** * Relative put method. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer. * @exception IndexOutOfBoundsException If the preconditions on the start @@ -481,10 +481,10 @@ public abstract class CharBuffer extends Buffer { return put (str.toCharArray (), start, length); } - + /** * Relative put method. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -493,10 +493,10 @@ public abstract class CharBuffer extends Buffer { return put (str.toCharArray (), 0, str.length ()); } - + /** * Returns the character at position() + index. - * + * * @exception IndexOutOfBoundsException If index is negative not smaller than * remaining(). */ @@ -505,7 +505,7 @@ public abstract class CharBuffer extends Buffer if (index < 0 || index >= remaining ()) throw new IndexOutOfBoundsException (); - + return get (position () + index); } diff --git a/libjava/classpath/java/nio/CharBufferImpl.java b/libjava/classpath/java/nio/CharBufferImpl.java index d35ca5962f1..8df9dbbea5a 100644 --- a/libjava/classpath/java/nio/CharBufferImpl.java +++ b/libjava/classpath/java/nio/CharBufferImpl.java @@ -1,4 +1,4 @@ -/* CharBufferImpl.java -- +/* CharBufferImpl.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,39 +49,39 @@ final class CharBufferImpl extends CharBuffer { this (new char [capacity], 0, capacity, capacity, 0, -1, false); } - + CharBufferImpl (char[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public CharBufferImpl (CharBufferImpl copy) { super (copy.capacity (), copy.limit (), copy.position (), 0, null, copy.backing_buffer, copy.array_offset); this.readOnly = copy.isReadOnly (); } - + public boolean isReadOnly () { return readOnly; } - + public CharBuffer slice () { return new CharBufferImpl (backing_buffer, array_offset + position (), remaining (), remaining (), 0, -1, isReadOnly ()); } - + public CharBuffer duplicate () { return new CharBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, isReadOnly ()); } - + public CharBuffer asReadOnlyBuffer () { return new CharBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, true); } - + public CharBuffer compact () { checkIfReadOnly(); @@ -97,7 +97,7 @@ final class CharBufferImpl extends CharBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -113,7 +113,7 @@ final class CharBufferImpl extends CharBuffer return new CharBufferImpl (backing_buffer, array_offset, capacity (), position () + end, position () + start, -1, isReadOnly ()); } - + /** * Reads the char at this buffer's current position, * and then increments the position. @@ -128,11 +128,11 @@ final class CharBufferImpl extends CharBuffer return backing_buffer [(pos++) + array_offset]; } - + /** * Relative put method. Writes value to the next position * in the buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public CharBuffer put (char value) @@ -145,7 +145,7 @@ final class CharBufferImpl extends CharBuffer backing_buffer [(pos++) + array_offset] = value; return this; } - + /** * Absolute get method. Reads the char at position * index. @@ -158,10 +158,10 @@ final class CharBufferImpl extends CharBuffer public char get (int index) { checkIndex(index); - + return backing_buffer [index + array_offset]; } - + /** * Bulk get, overloaded for speed. */ @@ -170,8 +170,8 @@ final class CharBufferImpl extends CharBuffer checkArraySize(dst.length, offset, length); checkForUnderflow(length); - System.arraycopy(backing_buffer, pos + array_offset, - dst, offset, length); + System.arraycopy(backing_buffer, pos + array_offset, + dst, offset, length); pos += length; return this; } @@ -183,9 +183,9 @@ final class CharBufferImpl extends CharBuffer { checkArraySize(src.length, offset, length); checkForOverflow(length); - + System.arraycopy(src, offset, - backing_buffer, pos + array_offset, length); + backing_buffer, pos + array_offset, length); pos += length; return this; } @@ -202,11 +202,11 @@ final class CharBufferImpl extends CharBuffer { checkIndex(index); checkIfReadOnly(); - + backing_buffer [index + array_offset] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/CharSequenceBuffer.java b/libjava/classpath/java/nio/CharSequenceBuffer.java index 3003670d83c..95c37cc97d6 100644 --- a/libjava/classpath/java/nio/CharSequenceBuffer.java +++ b/libjava/classpath/java/nio/CharSequenceBuffer.java @@ -1,4 +1,4 @@ -/* CharBuffer.java -- +/* CharBuffer.java -- Copyright (C) 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ final class CharSequenceBuffer public CharBuffer asReadOnlyBuffer() { return duplicate(); - } + } /** * This buffer class is not writable by definition and thus throws diff --git a/libjava/classpath/java/nio/CharViewBufferImpl.java b/libjava/classpath/java/nio/CharViewBufferImpl.java index 98a27a6e601..72e344d661f 100644 --- a/libjava/classpath/java/nio/CharViewBufferImpl.java +++ b/libjava/classpath/java/nio/CharViewBufferImpl.java @@ -1,4 +1,4 @@ -/* CharViewBufferImpl.java -- +/* CharViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,25 +45,25 @@ class CharViewBufferImpl extends CharBuffer private final ByteBuffer bb; private final boolean readOnly; private final ByteOrder endian; - + CharViewBufferImpl (ByteBuffer bb, int capacity) { super (capacity, capacity, 0, -1, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, bb.position()) : null, - null, 0); + null, 0); this.bb = bb; this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly, ByteOrder endian) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (capacity, limit, position, mark, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, offset) : null, - null, 0); + null, 0); this.bb = bb; this.offset = offset; this.readOnly = readOnly; @@ -106,7 +106,7 @@ class CharViewBufferImpl extends CharBuffer position(p + 1); return this; } - + public CharBuffer put (int index, char value) { ByteBufferHelper.putChar(bb, (index << 1) + offset, value, endian); @@ -118,26 +118,26 @@ class CharViewBufferImpl extends CharBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 2 * position(), 2 * count); + bb.shiftDown(offset, offset + 2 * position(), 2 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public CharBuffer slice () { // Create a sliced copy of this object that shares its content. return new CharViewBufferImpl (bb, (position () << 1) + offset, - remaining (), remaining (), 0, -1, - isReadOnly (), endian); + remaining (), remaining (), 0, -1, + isReadOnly (), endian); } - + CharBuffer duplicate (boolean readOnly) { int pos = position(); @@ -147,7 +147,7 @@ class CharViewBufferImpl extends CharBuffer return new CharViewBufferImpl (bb, offset, capacity(), limit(), pos, mark, readOnly, endian); } - + public CharBuffer duplicate () { return duplicate(readOnly); @@ -166,20 +166,20 @@ class CharViewBufferImpl extends CharBuffer throw new IndexOutOfBoundsException (); return new CharViewBufferImpl (bb, array_offset, capacity (), - position () + end, position () + start, - -1, isReadOnly (), endian); + position () + end, position () + start, + -1, isReadOnly (), endian); } public boolean isReadOnly () { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/DirectByteBufferImpl.java b/libjava/classpath/java/nio/DirectByteBufferImpl.java index 939718e9c0f..4f34732a8be 100644 --- a/libjava/classpath/java/nio/DirectByteBufferImpl.java +++ b/libjava/classpath/java/nio/DirectByteBufferImpl.java @@ -1,4 +1,4 @@ -/* DirectByteBufferImpl.java -- +/* DirectByteBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,8 +60,8 @@ abstract class DirectByteBufferImpl extends ByteBuffer static final class ReadOnly extends DirectByteBufferImpl { ReadOnly(Object owner, Pointer address, - int capacity, int limit, - int position) + int capacity, int limit, + int position) { super(owner, address, capacity, limit, position); } @@ -93,10 +93,10 @@ abstract class DirectByteBufferImpl extends ByteBuffer { super(address, capacity); } - + ReadWrite(Object owner, Pointer address, - int capacity, int limit, - int position) + int capacity, int limit, + int position) { super(owner, address, capacity, limit, position); } @@ -110,7 +110,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer DirectByteBufferImpl(int capacity) { super(capacity, capacity, 0, -1, - VMDirectByteBuffer.allocate(capacity), null, 0); + VMDirectByteBuffer.allocate(capacity), null, 0); this.owner = this; } @@ -119,10 +119,10 @@ abstract class DirectByteBufferImpl extends ByteBuffer super(capacity, capacity, 0, -1, address, null, 0); this.owner = null; } - + DirectByteBufferImpl(Object owner, Pointer address, - int capacity, int limit, - int position) + int capacity, int limit, + int position) { super(capacity, limit, position, -1, address, null, 0); this.owner = owner; @@ -130,7 +130,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer /** * Allocates a new direct byte buffer. - */ + */ public static ByteBuffer allocate(int capacity) { return new DirectByteBufferImpl.ReadWrite(capacity); @@ -141,7 +141,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer if (owner == this) VMDirectByteBuffer.free(address); } - + public byte get() { checkForUnderflow(); @@ -180,7 +180,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer position(pos + 1); return this; } - + public ByteBuffer put(int index, byte value) { checkIndex(index); @@ -188,7 +188,7 @@ abstract class DirectByteBufferImpl extends ByteBuffer VMDirectByteBuffer.put(address, index, value); return this; } - + public ByteBuffer put (byte[] src, int offset, int length) { checkArraySize (src.length, offset, length); @@ -196,15 +196,15 @@ abstract class DirectByteBufferImpl extends ByteBuffer int index = position (); VMDirectByteBuffer.put (address, index, src, offset, length); position (index + length); - + return this; } - + void shiftDown(int dst_offset, int src_offset, int count) { VMDirectByteBuffer.shiftDown(address, dst_offset, src_offset, count); } - + public ByteBuffer compact() { checkIfReadOnly(); @@ -212,15 +212,15 @@ abstract class DirectByteBufferImpl extends ByteBuffer int pos = position(); if (pos > 0) { - int count = remaining(); - VMDirectByteBuffer.shiftDown(address, 0, pos, count); - position(count); - limit(capacity()); + int count = remaining(); + VMDirectByteBuffer.shiftDown(address, 0, pos, count); + position(count); + limit(capacity()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } @@ -255,9 +255,9 @@ abstract class DirectByteBufferImpl extends ByteBuffer if (mark != pos) { - result.position(mark); - result.mark(); - result.position(pos); + result.position(mark); + result.mark(); + result.position(pos); } return result; } @@ -311,18 +311,18 @@ abstract class DirectByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getChar(this, order()); } - + public ByteBuffer putChar(char value) { ByteBufferHelper.putChar(this, value, order()); return this; } - + public char getChar(int index) { return ByteBufferHelper.getChar(this, index, order()); } - + public ByteBuffer putChar(int index, char value) { ByteBufferHelper.putChar(this, index, value, order()); @@ -333,18 +333,18 @@ abstract class DirectByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getShort(this, order()); } - + public ByteBuffer putShort(short value) { ByteBufferHelper.putShort(this, value, order()); return this; } - + public short getShort(int index) { return ByteBufferHelper.getShort(this, index, order()); } - + public ByteBuffer putShort(int index, short value) { ByteBufferHelper.putShort(this, index, value, order()); @@ -355,18 +355,18 @@ abstract class DirectByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getInt(this, order()); } - + public ByteBuffer putInt(int value) { ByteBufferHelper.putInt(this, value, order()); return this; } - + public int getInt(int index) { return ByteBufferHelper.getInt(this, index, order()); } - + public ByteBuffer putInt(int index, int value) { ByteBufferHelper.putInt(this, index, value, order()); @@ -377,18 +377,18 @@ abstract class DirectByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getLong(this, order()); } - + public ByteBuffer putLong(long value) { ByteBufferHelper.putLong(this, value, order()); return this; } - + public long getLong(int index) { return ByteBufferHelper.getLong(this, index, order()); } - + public ByteBuffer putLong(int index, long value) { ByteBufferHelper.putLong(this, index, value, order()); @@ -399,13 +399,13 @@ abstract class DirectByteBufferImpl extends ByteBuffer { return ByteBufferHelper.getFloat(this, order()); } - + public ByteBuffer putFloat(float value) { ByteBufferHelper.putFloat(this, value, order()); return this; } - + public float getFloat(int index) { return ByteBufferHelper.getFloat(this, index, order()); @@ -427,12 +427,12 @@ abstract class DirectByteBufferImpl extends ByteBuffer ByteBufferHelper.putDouble(this, value, order()); return this; } - + public double getDouble(int index) { return ByteBufferHelper.getDouble(this, index, order()); } - + public ByteBuffer putDouble(int index, double value) { ByteBufferHelper.putDouble(this, index, value, order()); diff --git a/libjava/classpath/java/nio/DoubleBuffer.java b/libjava/classpath/java/nio/DoubleBuffer.java index 1a51f1889be..c17058c44a8 100644 --- a/libjava/classpath/java/nio/DoubleBuffer.java +++ b/libjava/classpath/java/nio/DoubleBuffer.java @@ -1,4 +1,4 @@ -/* DoubleBuffer.java -- +/* DoubleBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ public abstract class DoubleBuffer extends Buffer final double[] backing_buffer; DoubleBuffer (int capacity, int limit, int position, int mark, - RawData address, double[] backing_buffer, int array_offset) + RawData address, double[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -86,11 +86,11 @@ public abstract class DoubleBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers doubles from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length doubles remaining in this buffer. + * length doubles remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first double @@ -169,7 +169,7 @@ public abstract class DoubleBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining doubles in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -192,7 +192,7 @@ public abstract class DoubleBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining doubles in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -225,7 +225,7 @@ public abstract class DoubleBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -242,7 +242,7 @@ public abstract class DoubleBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -254,7 +254,7 @@ public abstract class DoubleBuffer extends Buffer * s[position()] + 31 + (s[position()+1] + 30)*31**1 + ... + * (s[limit()-1]+30)*31**(limit()-1). * Where s is the buffer data, in Double.doubleToLongBits() form - * Note that the hashcode is dependent on buffer content, + * Note that the hashcode is dependent on buffer content, * and therefore is not useful if the buffer content may change. * * @return the hash code (casted to int) @@ -265,8 +265,8 @@ public abstract class DoubleBuffer extends Buffer long multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (Double.doubleToLongBits(get(i)) + 30)*multiplier; + multiplier *= 31; + hashCode += (Double.doubleToLongBits(get(i)) + 30)*multiplier; } return ((int)hashCode); } @@ -295,21 +295,21 @@ public abstract class DoubleBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - double a = get(pos_this++); - double b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + double a = get(pos_this++); + double b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -331,7 +331,7 @@ public abstract class DoubleBuffer extends Buffer * Writes the double at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * doubles in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -344,7 +344,7 @@ public abstract class DoubleBuffer extends Buffer * than the buffer's limit. */ public abstract double get (int index); - + /** * Absolute put method. * @@ -356,7 +356,7 @@ public abstract class DoubleBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract DoubleBuffer compact (); diff --git a/libjava/classpath/java/nio/DoubleBufferImpl.java b/libjava/classpath/java/nio/DoubleBufferImpl.java index bc292df646d..1608413535a 100644 --- a/libjava/classpath/java/nio/DoubleBufferImpl.java +++ b/libjava/classpath/java/nio/DoubleBufferImpl.java @@ -1,4 +1,4 @@ -/* DoubleBufferImpl.java -- +/* DoubleBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,37 +49,37 @@ final class DoubleBufferImpl extends DoubleBuffer { this (new double [capacity], 0, capacity, capacity, 0, -1, false); } - + DoubleBufferImpl (double[] buffer, int offset, int capacity, int limit, - int position, int mark, boolean readOnly) + int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public boolean isReadOnly () { return readOnly; } - + public DoubleBuffer slice () { return new DoubleBufferImpl (backing_buffer, array_offset + position (), - remaining (), remaining (), 0, -1, isReadOnly ()); + remaining (), remaining (), 0, -1, isReadOnly ()); } - + public DoubleBuffer duplicate () { return new DoubleBufferImpl (backing_buffer, array_offset, capacity (), - limit (), position (), mark, isReadOnly ()); + limit (), position (), mark, isReadOnly ()); } - + public DoubleBuffer asReadOnlyBuffer () { return new DoubleBufferImpl (backing_buffer, array_offset, capacity (), - limit (), position (), mark, true); + limit (), position (), mark, true); } - + public DoubleBuffer compact () { checkIfReadOnly(); @@ -95,7 +95,7 @@ final class DoubleBufferImpl extends DoubleBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -116,12 +116,12 @@ final class DoubleBufferImpl extends DoubleBuffer position (position () + 1); return result; } - + /** * Relative put method. Writes value to the next position * in the buffer. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * space in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -129,12 +129,12 @@ final class DoubleBufferImpl extends DoubleBuffer { checkIfReadOnly(); checkForOverflow(); - + backing_buffer [position ()] = value; position (position () + 1); return this; } - + /** * Absolute get method. Reads the double at position * index. @@ -148,7 +148,7 @@ final class DoubleBufferImpl extends DoubleBuffer return backing_buffer [index]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -165,7 +165,7 @@ final class DoubleBufferImpl extends DoubleBuffer backing_buffer [index] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/DoubleViewBufferImpl.java b/libjava/classpath/java/nio/DoubleViewBufferImpl.java index d82fa92c4a7..a78bf273878 100644 --- a/libjava/classpath/java/nio/DoubleViewBufferImpl.java +++ b/libjava/classpath/java/nio/DoubleViewBufferImpl.java @@ -1,4 +1,4 @@ -/* DoubleViewBufferImpl.java -- +/* DoubleViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ final class DoubleViewBufferImpl extends DoubleBuffer private final ByteBuffer bb; private final boolean readOnly; private final ByteOrder endian; - + DoubleViewBufferImpl (ByteBuffer bb, int capacity) { super (capacity, capacity, 0, -1, bb.isDirect() ? @@ -55,7 +55,7 @@ final class DoubleViewBufferImpl extends DoubleBuffer this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public DoubleViewBufferImpl (ByteBuffer bb, int offset, int capacity, int limit, int position, int mark, boolean readOnly, ByteOrder endian) @@ -102,7 +102,7 @@ final class DoubleViewBufferImpl extends DoubleBuffer position(p + 1); return this; } - + public DoubleBuffer put (int index, double value) { ByteBufferHelper.putDouble(bb, (index << 3) + offset, value, endian); @@ -114,25 +114,25 @@ final class DoubleViewBufferImpl extends DoubleBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 8 * position(), 8 * count); + bb.shiftDown(offset, offset + 8 * position(), 8 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public DoubleBuffer slice () { return new DoubleViewBufferImpl (bb, (position () << 3) + offset, - remaining(), remaining(), 0, -1, + remaining(), remaining(), 0, -1, readOnly, endian); } - + DoubleBuffer duplicate (boolean readOnly) { int pos = position(); @@ -142,7 +142,7 @@ final class DoubleViewBufferImpl extends DoubleBuffer return new DoubleViewBufferImpl (bb, offset, capacity(), limit(), pos, mark, readOnly, endian); } - + public DoubleBuffer duplicate () { return duplicate(readOnly); @@ -157,12 +157,12 @@ final class DoubleViewBufferImpl extends DoubleBuffer { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/FloatBuffer.java b/libjava/classpath/java/nio/FloatBuffer.java index ce40a09e37b..3459cf12b22 100644 --- a/libjava/classpath/java/nio/FloatBuffer.java +++ b/libjava/classpath/java/nio/FloatBuffer.java @@ -1,4 +1,4 @@ -/* FloatBuffer.java -- +/* FloatBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ public abstract class FloatBuffer extends Buffer final float[] backing_buffer; FloatBuffer (int capacity, int limit, int position, int mark, - RawData address, float[] backing_buffer, int array_offset) + RawData address, float[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -86,11 +86,11 @@ public abstract class FloatBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers floats from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length floats remaining in this buffer. + * length floats remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first float @@ -169,7 +169,7 @@ public abstract class FloatBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining floats in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -192,7 +192,7 @@ public abstract class FloatBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining floats in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -225,7 +225,7 @@ public abstract class FloatBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -242,7 +242,7 @@ public abstract class FloatBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -254,7 +254,7 @@ public abstract class FloatBuffer extends Buffer * s[position()] + 31 + (s[position()+1] + 30)*31**1 + ... + * (s[limit()-1]+30)*31**(limit()-1). * Where s is the buffer data, in Float.floatToIntBits() form - * Note that the hashcode is dependent on buffer content, + * Note that the hashcode is dependent on buffer content, * and therefore is not useful if the buffer content may change. * * @return the hash code @@ -265,8 +265,8 @@ public abstract class FloatBuffer extends Buffer int multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (Float.floatToIntBits(get(i)) + 30)*multiplier; + multiplier *= 31; + hashCode += (Float.floatToIntBits(get(i)) + 30)*multiplier; } return hashCode; } @@ -295,21 +295,21 @@ public abstract class FloatBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - float a = get(pos_this++); - float b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + float a = get(pos_this++); + float b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -331,7 +331,7 @@ public abstract class FloatBuffer extends Buffer * Writes the float at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * floats in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -344,7 +344,7 @@ public abstract class FloatBuffer extends Buffer * than the buffer's limit. */ public abstract float get (int index); - + /** * Absolute put method. * @@ -356,7 +356,7 @@ public abstract class FloatBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract FloatBuffer compact (); diff --git a/libjava/classpath/java/nio/FloatBufferImpl.java b/libjava/classpath/java/nio/FloatBufferImpl.java index 5d0e7ca8590..603832d7a49 100644 --- a/libjava/classpath/java/nio/FloatBufferImpl.java +++ b/libjava/classpath/java/nio/FloatBufferImpl.java @@ -1,4 +1,4 @@ -/* FloatBufferImpl.java -- +/* FloatBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,34 +49,34 @@ final class FloatBufferImpl extends FloatBuffer { this (new float [capacity], 0, capacity, capacity, 0, -1, false); } - + FloatBufferImpl (float[] buffer, int offset, int capacity, int limit, - int position, int mark, boolean readOnly) + int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public boolean isReadOnly () { return readOnly; } - + public FloatBuffer slice () { return new FloatBufferImpl (backing_buffer, array_offset + position (), remaining (), remaining (), 0, -1, isReadOnly ()); } - + public FloatBuffer duplicate () { return new FloatBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, isReadOnly ()); } - + public FloatBuffer asReadOnlyBuffer () { return new FloatBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, true); } - + public FloatBuffer compact () { checkIfReadOnly(); @@ -92,7 +92,7 @@ final class FloatBufferImpl extends FloatBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -113,12 +113,12 @@ final class FloatBufferImpl extends FloatBuffer position (position () + 1); return result; } - + /** * Relative put method. Writes value to the next position * in the buffer. - * - * @exception BufferOverflowException If there no remaining + * + * @exception BufferOverflowException If there no remaining * space in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -131,7 +131,7 @@ final class FloatBufferImpl extends FloatBuffer position (position () + 1); return this; } - + /** * Absolute get method. Reads the float at position * index. @@ -145,7 +145,7 @@ final class FloatBufferImpl extends FloatBuffer return backing_buffer [index]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -162,7 +162,7 @@ final class FloatBufferImpl extends FloatBuffer backing_buffer [index] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/FloatViewBufferImpl.java b/libjava/classpath/java/nio/FloatViewBufferImpl.java index 9f10d824fe0..663b65c4e3a 100644 --- a/libjava/classpath/java/nio/FloatViewBufferImpl.java +++ b/libjava/classpath/java/nio/FloatViewBufferImpl.java @@ -1,4 +1,4 @@ -/* FloatViewBufferImpl.java -- +/* FloatViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ final class FloatViewBufferImpl extends FloatBuffer private final ByteBuffer bb; private final boolean readOnly; private final ByteOrder endian; - + FloatViewBufferImpl (ByteBuffer bb, int capacity) { super (capacity, capacity, 0, -1, bb.isDirect() ? @@ -55,10 +55,10 @@ final class FloatViewBufferImpl extends FloatBuffer this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly, ByteOrder endian) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (capacity, limit, position, mark, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, offset):null, null, 0); @@ -102,7 +102,7 @@ final class FloatViewBufferImpl extends FloatBuffer position(p + 1); return this; } - + public FloatBuffer put (int index, float value) { ByteBufferHelper.putFloat(bb, (index << 2) + offset, value, endian); @@ -114,26 +114,26 @@ final class FloatViewBufferImpl extends FloatBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 4 * position(), 4 * count); + bb.shiftDown(offset, offset + 4 * position(), 4 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public FloatBuffer slice () { // Create a sliced copy of this object that shares its content. return new FloatViewBufferImpl (bb, (position () << 2) + offset, - remaining(), remaining(), 0, -1, - readOnly, endian); + remaining(), remaining(), 0, -1, + readOnly, endian); } - + FloatBuffer duplicate (boolean readOnly) { int pos = position(); @@ -141,9 +141,9 @@ final class FloatViewBufferImpl extends FloatBuffer int mark = position(); position(pos); return new FloatViewBufferImpl (bb, offset, capacity(), limit(), - pos, mark, readOnly, endian); + pos, mark, readOnly, endian); } - + public FloatBuffer duplicate () { return duplicate(readOnly); @@ -158,12 +158,12 @@ final class FloatViewBufferImpl extends FloatBuffer { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/IntBuffer.java b/libjava/classpath/java/nio/IntBuffer.java index dd50be84611..597886d9a26 100644 --- a/libjava/classpath/java/nio/IntBuffer.java +++ b/libjava/classpath/java/nio/IntBuffer.java @@ -1,4 +1,4 @@ -/* IntBuffer.java -- +/* IntBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ public abstract class IntBuffer extends Buffer final int[] backing_buffer; IntBuffer (int capacity, int limit, int position, int mark, - RawData address, int[] backing_buffer, int array_offset) + RawData address, int[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -76,7 +76,7 @@ public abstract class IntBuffer extends Buffer public static final IntBuffer wrap (int[] array, int offset, int length) { return new IntBufferImpl (array, 0, array.length, offset + length, offset, - -1, false); + -1, false); } /** @@ -87,11 +87,11 @@ public abstract class IntBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers ints from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length ints remaining in this buffer. + * length ints remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first int @@ -170,7 +170,7 @@ public abstract class IntBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining ints in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -193,7 +193,7 @@ public abstract class IntBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining ints in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -226,7 +226,7 @@ public abstract class IntBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -243,7 +243,7 @@ public abstract class IntBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -266,8 +266,8 @@ public abstract class IntBuffer extends Buffer int multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (get(i) + 30)*multiplier; + multiplier *= 31; + hashCode += (get(i) + 30)*multiplier; } return hashCode; } @@ -296,21 +296,21 @@ public abstract class IntBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - int a = get(pos_this++); - int b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + int a = get(pos_this++); + int b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -332,7 +332,7 @@ public abstract class IntBuffer extends Buffer * Writes the int at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * ints in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -345,7 +345,7 @@ public abstract class IntBuffer extends Buffer * than the buffer's limit. */ public abstract int get (int index); - + /** * Absolute put method. * @@ -357,7 +357,7 @@ public abstract class IntBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract IntBuffer compact (); diff --git a/libjava/classpath/java/nio/IntBufferImpl.java b/libjava/classpath/java/nio/IntBufferImpl.java index c332715fbda..1b31b079523 100644 --- a/libjava/classpath/java/nio/IntBufferImpl.java +++ b/libjava/classpath/java/nio/IntBufferImpl.java @@ -1,4 +1,4 @@ -/* IntBufferImpl.java -- +/* IntBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,33 +49,33 @@ final class IntBufferImpl extends IntBuffer { this (new int [capacity], 0, capacity, capacity, 0, -1, false); } - + IntBufferImpl (int[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public boolean isReadOnly () { return readOnly; } - + public IntBuffer slice () { return new IntBufferImpl (backing_buffer, array_offset + position (), remaining (), remaining (), 0, -1, isReadOnly ()); } - + public IntBuffer duplicate () { return new IntBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, isReadOnly ()); } - + public IntBuffer asReadOnlyBuffer () { return new IntBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, true); } - + public IntBuffer compact () { checkIfReadOnly(); @@ -91,7 +91,7 @@ final class IntBufferImpl extends IntBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -112,12 +112,12 @@ final class IntBufferImpl extends IntBuffer position (position () + 1); return result; } - + /** * Relative put method. Writes value to the next position * in the buffer. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * space in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -130,7 +130,7 @@ final class IntBufferImpl extends IntBuffer position (position () + 1); return this; } - + /** * Absolute get method. Reads the int at position * index. @@ -144,7 +144,7 @@ final class IntBufferImpl extends IntBuffer return backing_buffer [index]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -161,7 +161,7 @@ final class IntBufferImpl extends IntBuffer backing_buffer [index] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/IntViewBufferImpl.java b/libjava/classpath/java/nio/IntViewBufferImpl.java index 9af5d58a4dc..dd3d6941aa2 100644 --- a/libjava/classpath/java/nio/IntViewBufferImpl.java +++ b/libjava/classpath/java/nio/IntViewBufferImpl.java @@ -1,4 +1,4 @@ -/* IntViewBufferImpl.java -- +/* IntViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ final class IntViewBufferImpl extends IntBuffer private final ByteBuffer bb; private final boolean readOnly; private final ByteOrder endian; - + IntViewBufferImpl (ByteBuffer bb, int capacity) { super (capacity, capacity, 0, -1, bb.isDirect() ? @@ -55,10 +55,10 @@ final class IntViewBufferImpl extends IntBuffer this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public IntViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly, ByteOrder endian) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (capacity, limit, position, mark, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, offset):null, null, 0); @@ -102,7 +102,7 @@ final class IntViewBufferImpl extends IntBuffer position(p + 1); return this; } - + public IntBuffer put (int index, int value) { ByteBufferHelper.putInt(bb, (index << 2) + offset, value, endian); @@ -114,26 +114,26 @@ final class IntViewBufferImpl extends IntBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 4 * position(), 4 * count); + bb.shiftDown(offset, offset + 4 * position(), 4 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public IntBuffer slice () { // Create a sliced copy of this object that shares its content. return new IntViewBufferImpl (bb, (position () << 2) + offset, - remaining(), remaining(), 0, -1, - readOnly, endian); + remaining(), remaining(), 0, -1, + readOnly, endian); } - + IntBuffer duplicate (boolean readOnly) { int pos = position(); @@ -141,9 +141,9 @@ final class IntViewBufferImpl extends IntBuffer int mark = position(); position(pos); return new IntViewBufferImpl (bb, offset, capacity(), limit(), - pos, mark, readOnly, endian); + pos, mark, readOnly, endian); } - + public IntBuffer duplicate () { return duplicate(readOnly); @@ -158,12 +158,12 @@ final class IntViewBufferImpl extends IntBuffer { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/InvalidMarkException.java b/libjava/classpath/java/nio/InvalidMarkException.java index 013f02f79f2..e13d76f1f3f 100644 --- a/libjava/classpath/java/nio/InvalidMarkException.java +++ b/libjava/classpath/java/nio/InvalidMarkException.java @@ -1,4 +1,4 @@ -/* InvalidMarkException.java -- +/* InvalidMarkException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/LongBuffer.java b/libjava/classpath/java/nio/LongBuffer.java index 1195cc88ce2..b6e94e8a8d2 100644 --- a/libjava/classpath/java/nio/LongBuffer.java +++ b/libjava/classpath/java/nio/LongBuffer.java @@ -1,4 +1,4 @@ -/* LongBuffer.java -- +/* LongBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ public abstract class LongBuffer extends Buffer final long[] backing_buffer; LongBuffer (int capacity, int limit, int position, int mark, - RawData address, long[] backing_buffer, int array_offset) + RawData address, long[] backing_buffer, int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -86,11 +86,11 @@ public abstract class LongBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers longs from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length longs remaining in this buffer. + * length longs remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first long @@ -169,7 +169,7 @@ public abstract class LongBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining longs in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -192,7 +192,7 @@ public abstract class LongBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining longs in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -225,7 +225,7 @@ public abstract class LongBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -242,7 +242,7 @@ public abstract class LongBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -265,8 +265,8 @@ public abstract class LongBuffer extends Buffer long multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (get(i) + 30)*multiplier; + multiplier *= 31; + hashCode += (get(i) + 30)*multiplier; } return ((int)hashCode); } @@ -295,21 +295,21 @@ public abstract class LongBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - long a = get(pos_this++); - long b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + long a = get(pos_this++); + long b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -331,7 +331,7 @@ public abstract class LongBuffer extends Buffer * Writes the long at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * longs in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -344,7 +344,7 @@ public abstract class LongBuffer extends Buffer * than the buffer's limit. */ public abstract long get (int index); - + /** * Absolute put method. * @@ -356,7 +356,7 @@ public abstract class LongBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract LongBuffer compact (); diff --git a/libjava/classpath/java/nio/LongBufferImpl.java b/libjava/classpath/java/nio/LongBufferImpl.java index 4cf922b149d..85502c1940e 100644 --- a/libjava/classpath/java/nio/LongBufferImpl.java +++ b/libjava/classpath/java/nio/LongBufferImpl.java @@ -1,4 +1,4 @@ -/* LongBufferImpl.java -- +/* LongBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,37 +49,37 @@ final class LongBufferImpl extends LongBuffer { this (new long [capacity], 0, capacity, capacity, 0, -1, false); } - + LongBufferImpl (long[] buffer, int offset, int capacity, int limit, - int position, int mark, boolean readOnly) + int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public boolean isReadOnly () { return readOnly; } - + public LongBuffer slice () { return new LongBufferImpl (backing_buffer, array_offset + position (), - remaining (), remaining (), 0, -1, isReadOnly ()); + remaining (), remaining (), 0, -1, isReadOnly ()); } - + public LongBuffer duplicate () { return new LongBufferImpl (backing_buffer, array_offset, capacity (), limit (), - position (), mark, isReadOnly ()); + position (), mark, isReadOnly ()); } - + public LongBuffer asReadOnlyBuffer () { return new LongBufferImpl (backing_buffer, array_offset, capacity (), limit (), - position (), mark, true); + position (), mark, true); } - + public LongBuffer compact () { checkIfReadOnly(); @@ -95,7 +95,7 @@ final class LongBufferImpl extends LongBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -116,7 +116,7 @@ final class LongBufferImpl extends LongBuffer position (position () + 1); return result; } - + /** * Relative put method. Writes value to the next position * in the buffer. @@ -134,7 +134,7 @@ final class LongBufferImpl extends LongBuffer position (position () + 1); return this; } - + /** * Absolute get method. Reads the long at position * index. @@ -148,7 +148,7 @@ final class LongBufferImpl extends LongBuffer return backing_buffer [index]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -165,7 +165,7 @@ final class LongBufferImpl extends LongBuffer backing_buffer [index] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/LongViewBufferImpl.java b/libjava/classpath/java/nio/LongViewBufferImpl.java index b775a99462f..a0a7cd36a74 100644 --- a/libjava/classpath/java/nio/LongViewBufferImpl.java +++ b/libjava/classpath/java/nio/LongViewBufferImpl.java @@ -1,4 +1,4 @@ -/* LongViewBufferImpl.java -- +/* LongViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ final class LongViewBufferImpl extends LongBuffer private final ByteBuffer bb; private final boolean readOnly; private final ByteOrder endian; - + LongViewBufferImpl (ByteBuffer bb, int capacity) { super (capacity, capacity, 0, -1, bb.isDirect() ? @@ -55,10 +55,10 @@ final class LongViewBufferImpl extends LongBuffer this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public LongViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly, ByteOrder endian) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (capacity, limit, position, mark, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, offset):null, null, 0); @@ -102,7 +102,7 @@ final class LongViewBufferImpl extends LongBuffer position(p + 1); return this; } - + public LongBuffer put (int index, long value) { ByteBufferHelper.putLong(bb, (index << 3) + offset, value, endian); @@ -114,26 +114,26 @@ final class LongViewBufferImpl extends LongBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 8 * position(), 8 * count); + bb.shiftDown(offset, offset + 8 * position(), 8 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public LongBuffer slice () { // Create a sliced copy of this object that shares its content. return new LongViewBufferImpl (bb, (position () << 3) + offset, - remaining(), remaining(), 0, -1, - readOnly, endian); + remaining(), remaining(), 0, -1, + readOnly, endian); } - + LongBuffer duplicate (boolean readOnly) { int pos = position(); @@ -141,9 +141,9 @@ final class LongViewBufferImpl extends LongBuffer int mark = position(); position(pos); return new LongViewBufferImpl (bb, offset, capacity(), limit(), - pos, mark, readOnly, endian); + pos, mark, readOnly, endian); } - + public LongBuffer duplicate () { return duplicate(readOnly); @@ -158,12 +158,12 @@ final class LongViewBufferImpl extends LongBuffer { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/MappedByteBuffer.java b/libjava/classpath/java/nio/MappedByteBuffer.java index 1f82f823f5a..f71e63051c0 100644 --- a/libjava/classpath/java/nio/MappedByteBuffer.java +++ b/libjava/classpath/java/nio/MappedByteBuffer.java @@ -1,4 +1,4 @@ -/* MappedByteBuffer.java -- +/* MappedByteBuffer.java -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,11 +48,11 @@ import gnu.gcj.RawData; public abstract class MappedByteBuffer extends ByteBuffer { MappedByteBuffer (int capacity, int limit, int position, int mark, - RawData address) + RawData address) { super (capacity, limit, position, mark, address, null, 0); } - + void forceImpl() { } @@ -62,7 +62,7 @@ public abstract class MappedByteBuffer extends ByteBuffer forceImpl(); return this; } - + boolean isLoadedImpl() { load(); @@ -73,7 +73,7 @@ public abstract class MappedByteBuffer extends ByteBuffer { return isLoadedImpl(); } - + void loadImpl() { } diff --git a/libjava/classpath/java/nio/MappedByteBufferImpl.java b/libjava/classpath/java/nio/MappedByteBufferImpl.java index f11d1e72eb2..58ea635cdf6 100644 --- a/libjava/classpath/java/nio/MappedByteBufferImpl.java +++ b/libjava/classpath/java/nio/MappedByteBufferImpl.java @@ -1,4 +1,4 @@ -/* MappedByteBufferImpl.java -- +/* MappedByteBufferImpl.java -- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,7 +52,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer /** Posix uses this for the actual length passed to mmap; * Win32 uses it for the pointer returned by CreateFileMapping. */ public long implLen; - + public MappedByteBufferImpl(Pointer address, int size, boolean readOnly) throws IOException { @@ -64,7 +64,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return readOnly; } - + public byte get() { checkForUnderflow(); @@ -121,16 +121,16 @@ final class MappedByteBufferImpl extends MappedByteBuffer int pos = position(); if (pos > 0) { - int count = remaining(); - // Call shiftDown method optimized for direct buffers. - VMDirectByteBuffer.shiftDown(address, 0, pos, count); - position(count); - limit(capacity()); + int count = remaining(); + // Call shiftDown method optimized for direct buffers. + VMDirectByteBuffer.shiftDown(address, 0, pos, count); + position(count); + limit(capacity()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } @@ -169,9 +169,9 @@ final class MappedByteBufferImpl extends MappedByteBuffer if (mark != pos) { - result.position(mark); - result.mark(); - result.position(pos); + result.position(mark); + result.mark(); + result.position(pos); } return result; } @@ -220,18 +220,18 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return ByteBufferHelper.getChar(this, order()); } - + public ByteBuffer putChar(char value) { ByteBufferHelper.putChar(this, value, order()); return this; } - + public char getChar(int index) { return ByteBufferHelper.getChar(this, index, order()); } - + public ByteBuffer putChar(int index, char value) { ByteBufferHelper.putChar(this, index, value, order()); @@ -242,18 +242,18 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return ByteBufferHelper.getShort(this, order()); } - + public ByteBuffer putShort(short value) { ByteBufferHelper.putShort(this, value, order()); return this; } - + public short getShort(int index) { return ByteBufferHelper.getShort(this, index, order()); } - + public ByteBuffer putShort(int index, short value) { ByteBufferHelper.putShort(this, index, value, order()); @@ -264,18 +264,18 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return ByteBufferHelper.getInt(this, order()); } - + public ByteBuffer putInt(int value) { ByteBufferHelper.putInt(this, value, order()); return this; } - + public int getInt(int index) { return ByteBufferHelper.getInt(this, index, order()); } - + public ByteBuffer putInt(int index, int value) { ByteBufferHelper.putInt(this, index, value, order()); @@ -286,18 +286,18 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return ByteBufferHelper.getLong(this, order()); } - + public ByteBuffer putLong(long value) { ByteBufferHelper.putLong(this, value, order()); return this; } - + public long getLong(int index) { return ByteBufferHelper.getLong(this, index, order()); } - + public ByteBuffer putLong(int index, long value) { ByteBufferHelper.putLong(this, index, value, order()); @@ -308,13 +308,13 @@ final class MappedByteBufferImpl extends MappedByteBuffer { return ByteBufferHelper.getFloat(this, order()); } - + public ByteBuffer putFloat(float value) { ByteBufferHelper.putFloat(this, value, order()); return this; } - + public float getFloat(int index) { return ByteBufferHelper.getFloat(this, index, order()); @@ -336,12 +336,12 @@ final class MappedByteBufferImpl extends MappedByteBuffer ByteBufferHelper.putDouble(this, value, order()); return this; } - + public double getDouble(int index) { return ByteBufferHelper.getDouble(this, index, order()); } - + public ByteBuffer putDouble(int index, double value) { ByteBufferHelper.putDouble(this, index, value, order()); diff --git a/libjava/classpath/java/nio/ReadOnlyBufferException.java b/libjava/classpath/java/nio/ReadOnlyBufferException.java index 22f8a6f7379..ea58c375b80 100644 --- a/libjava/classpath/java/nio/ReadOnlyBufferException.java +++ b/libjava/classpath/java/nio/ReadOnlyBufferException.java @@ -1,4 +1,4 @@ -/* ReadOnlyBufferException.java -- +/* ReadOnlyBufferException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/ShortBuffer.java b/libjava/classpath/java/nio/ShortBuffer.java index f15c0635577..e7cb12167c8 100644 --- a/libjava/classpath/java/nio/ShortBuffer.java +++ b/libjava/classpath/java/nio/ShortBuffer.java @@ -1,4 +1,4 @@ -/* ShortBuffer.java -- +/* ShortBuffer.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,8 +51,8 @@ public abstract class ShortBuffer extends Buffer final short[] backing_buffer; ShortBuffer (int capacity, int limit, int position, - int mark, RawData address, short[] backing_buffer, - int array_offset) + int mark, RawData address, short[] backing_buffer, + int array_offset) { super (capacity, limit, position, mark, address); this.backing_buffer = backing_buffer; @@ -87,11 +87,11 @@ public abstract class ShortBuffer extends Buffer { return wrap (array, 0, array.length); } - + /** * This method transfers shorts from this buffer into the given * destination array. Before the transfer, it checks if there are fewer than - * length shorts remaining in this buffer. + * length shorts remaining in this buffer. * * @param dst The destination array * @param offset The offset within the array of the first short @@ -170,7 +170,7 @@ public abstract class ShortBuffer extends Buffer * must be non-negative and no larger than src.length. * @param length The number of bytes to be read from the given array; * must be non-negative and no larger than src.length - offset. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining shorts in the source array. * @exception IndexOutOfBoundsException If the preconditions on the offset @@ -193,7 +193,7 @@ public abstract class ShortBuffer extends Buffer * into the buffer. * * @param src The array to copy into the buffer. - * + * * @exception BufferOverflowException If there is insufficient space in this * buffer for the remaining shorts in the source array. * @exception ReadOnlyBufferException If this buffer is read-only. @@ -226,7 +226,7 @@ public abstract class ShortBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return backing_buffer; } @@ -243,7 +243,7 @@ public abstract class ShortBuffer extends Buffer throw new UnsupportedOperationException (); checkIfReadOnly(); - + return array_offset; } @@ -266,8 +266,8 @@ public abstract class ShortBuffer extends Buffer int multiplier = 1; for (int i = position() + 1; i < limit(); ++i) { - multiplier *= 31; - hashCode += (get(i) + 30)*multiplier; + multiplier *= 31; + hashCode += (get(i) + 30)*multiplier; } return hashCode; } @@ -296,21 +296,21 @@ public abstract class ShortBuffer extends Buffer int num = Math.min(remaining(), other.remaining()); int pos_this = position(); int pos_other = other.position(); - + for (int count = 0; count < num; count++) { - short a = get(pos_this++); - short b = other.get(pos_other++); - - if (a == b) - continue; - - if (a < b) - return -1; - - return 1; + short a = get(pos_this++); + short b = other.get(pos_other++); + + if (a == b) + continue; + + if (a < b) + return -1; + + return 1; } - + return remaining() - other.remaining(); } @@ -332,7 +332,7 @@ public abstract class ShortBuffer extends Buffer * Writes the short at this buffer's current position, * and then increments the position. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * shorts in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -345,7 +345,7 @@ public abstract class ShortBuffer extends Buffer * than the buffer's limit. */ public abstract short get (int index); - + /** * Absolute put method. * @@ -357,7 +357,7 @@ public abstract class ShortBuffer extends Buffer /** * Compacts this buffer. - * + * * @exception ReadOnlyBufferException If this buffer is read-only. */ public abstract ShortBuffer compact (); diff --git a/libjava/classpath/java/nio/ShortBufferImpl.java b/libjava/classpath/java/nio/ShortBufferImpl.java index 3a8ff57f822..4d66ec907b0 100644 --- a/libjava/classpath/java/nio/ShortBufferImpl.java +++ b/libjava/classpath/java/nio/ShortBufferImpl.java @@ -1,4 +1,4 @@ -/* ShortBufferImpl.java -- +/* ShortBufferImpl.java -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,37 +49,37 @@ final class ShortBufferImpl extends ShortBuffer { this (new short [capacity], 0, capacity, capacity, 0, -1, false); } - + ShortBufferImpl (short[] buffer, int offset, int capacity, - int limit, int position, int mark, boolean readOnly) + int limit, int position, int mark, boolean readOnly) { super (capacity, limit, position, mark, null, buffer, offset); this.readOnly = readOnly; } - + public boolean isReadOnly () { return readOnly; } - + public ShortBuffer slice () { return new ShortBufferImpl (backing_buffer, array_offset + position (), - remaining (), remaining (), 0, -1, isReadOnly ()); + remaining (), remaining (), 0, -1, isReadOnly ()); } - + public ShortBuffer duplicate () { return new ShortBufferImpl (backing_buffer, array_offset, capacity (), - limit (), position (), mark, isReadOnly ()); + limit (), position (), mark, isReadOnly ()); } - + public ShortBuffer asReadOnlyBuffer () { return new ShortBufferImpl (backing_buffer, array_offset, capacity (), limit (), - position (), mark, true); + position (), mark, true); } - + public ShortBuffer compact () { checkIfReadOnly(); @@ -95,7 +95,7 @@ final class ShortBufferImpl extends ShortBuffer limit(capacity()); return this; } - + public boolean isDirect () { return false; @@ -116,12 +116,12 @@ final class ShortBufferImpl extends ShortBuffer position (position () + 1); return result; } - + /** * Relative put method. Writes value to the next position * in the buffer. * - * @exception BufferOverflowException If there no remaining + * @exception BufferOverflowException If there no remaining * space in this buffer. * @exception ReadOnlyBufferException If this buffer is read-only. */ @@ -134,7 +134,7 @@ final class ShortBufferImpl extends ShortBuffer position (position () + 1); return this; } - + /** * Absolute get method. Reads the short at position * index. @@ -148,7 +148,7 @@ final class ShortBufferImpl extends ShortBuffer return backing_buffer [index]; } - + /** * Absolute put method. Writes value to position * index in the buffer. @@ -165,7 +165,7 @@ final class ShortBufferImpl extends ShortBuffer backing_buffer [index] = value; return this; } - + public ByteOrder order () { return ByteOrder.nativeOrder (); diff --git a/libjava/classpath/java/nio/ShortViewBufferImpl.java b/libjava/classpath/java/nio/ShortViewBufferImpl.java index 627085556f6..f7ef3e34657 100644 --- a/libjava/classpath/java/nio/ShortViewBufferImpl.java +++ b/libjava/classpath/java/nio/ShortViewBufferImpl.java @@ -1,4 +1,4 @@ -/* ShortViewBufferImpl.java -- +/* ShortViewBufferImpl.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,20 +50,20 @@ final class ShortViewBufferImpl extends ShortBuffer { super (capacity, capacity, 0, -1, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, bb.position()):null, - null, 0); + null, 0); this.bb = bb; this.offset = bb.position(); this.readOnly = bb.isReadOnly(); this.endian = bb.order(); } - + public ShortViewBufferImpl (ByteBuffer bb, int offset, int capacity, - int limit, int position, int mark, - boolean readOnly, ByteOrder endian) + int limit, int position, int mark, + boolean readOnly, ByteOrder endian) { super (capacity, limit, position, mark, bb.isDirect() ? VMDirectByteBuffer.adjustAddress(bb.address, offset):null, - null, 0); + null, 0); this.bb = bb; this.offset = offset; this.readOnly = readOnly; @@ -104,7 +104,7 @@ final class ShortViewBufferImpl extends ShortBuffer position(p + 1); return this; } - + public ShortBuffer put (int index, short value) { ByteBufferHelper.putShort(bb, (index << 1) + offset, value, endian); @@ -116,26 +116,26 @@ final class ShortViewBufferImpl extends ShortBuffer if (position () > 0) { int count = limit () - position (); - bb.shiftDown(offset, offset + 2 * position(), 2 * count); + bb.shiftDown(offset, offset + 2 * position(), 2 * count); position (count); limit (capacity ()); } else { - position(limit()); - limit(capacity()); + position(limit()); + limit(capacity()); } return this; } - + public ShortBuffer slice () { // Create a sliced copy of this object that shares its content. return new ShortViewBufferImpl (bb, (position () << 1) + offset, - remaining(), remaining(), 0, -1, - readOnly, endian); + remaining(), remaining(), 0, -1, + readOnly, endian); } - + ShortBuffer duplicate (boolean readOnly) { int pos = position(); @@ -143,9 +143,9 @@ final class ShortViewBufferImpl extends ShortBuffer int mark = position(); position(pos); return new ShortViewBufferImpl (bb, offset, capacity(), limit(), - pos, mark, readOnly, endian); + pos, mark, readOnly, endian); } - + public ShortBuffer duplicate () { return duplicate(readOnly); @@ -160,12 +160,12 @@ final class ShortViewBufferImpl extends ShortBuffer { return readOnly; } - + public boolean isDirect () { return bb.isDirect (); } - + public ByteOrder order () { return endian; diff --git a/libjava/classpath/java/nio/channels/FileChannel.java b/libjava/classpath/java/nio/channels/FileChannel.java index 3aa19990917..8c8029fe764 100644 --- a/libjava/classpath/java/nio/channels/FileChannel.java +++ b/libjava/classpath/java/nio/channels/FileChannel.java @@ -71,9 +71,9 @@ public abstract class FileChannel extends AbstractInterruptibleChannel public String toString() { if (this == READ_ONLY) - return "READ_ONLY"; + return "READ_ONLY"; else if (this == READ_WRITE) - return "READ_WRITE"; + return "READ_WRITE"; return "PRIVATE"; } diff --git a/libjava/classpath/java/nio/channels/SocketChannel.java b/libjava/classpath/java/nio/channels/SocketChannel.java index 50f21368c88..324c9816bdd 100644 --- a/libjava/classpath/java/nio/channels/SocketChannel.java +++ b/libjava/classpath/java/nio/channels/SocketChannel.java @@ -64,7 +64,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * Opens a socket channel. * * @return the new SocketChannel object - * + * * @exception IOException If an error occurs */ public static SocketChannel open() throws IOException @@ -76,7 +76,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * Opens a channel and connects it to a remote address. * * @return the new SocketChannel object - * + * * @exception AsynchronousCloseException If this channel is already connected. * @exception ClosedByInterruptException If another thread interrupts the * current thread while the connect operation is in progress, thereby closing @@ -120,7 +120,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * Writes data to the channel. * * @return the number of bytes written, zero is valid too - * + * * @exception IOException If an error occurs * @exception NotYetConnectedException If this channel is not yet connected. */ @@ -150,7 +150,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * * @return the number of bytes read, zero is valid too, -1 if end of stream * is reached - * + * * @exception IOException If an error occurs * @exception NotYetConnectedException If this channel is not yet connected. */ @@ -162,7 +162,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * @return true if the channel got successfully connected, * false if the channel is in non-blocking mode and connection * operation is still in progress. - * + * * @exception AlreadyConnectedException If this channel is already connected. * @exception AsynchronousCloseException If this channel is already connected. * @exception ClosedByInterruptException If another thread interrupts the @@ -211,7 +211,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * * @return the number of bytes read, zero is valid too, -1 if end of stream * is reached - * + * * @exception IOException If an error occurs * @exception NotYetConnectedException If this channel is not yet connected. */ @@ -229,7 +229,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * Writes data to the channel. * * @return the number of bytes written, zero is valid too - * + * * @exception IOException If an error occurs * @exception NotYetConnectedException If this channel is not yet connected. */ @@ -239,7 +239,7 @@ public abstract class SocketChannel extends AbstractSelectableChannel * Writes data to the channel. * * @return the number of bytes written, zero is valid too - * + * * @exception IOException If an error occurs * @exception NotYetConnectedException If this channel is not yet connected. */ diff --git a/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java b/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java index 8e5b7b0b158..b1ed7c7f2b1 100644 --- a/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java +++ b/libjava/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java @@ -1,4 +1,4 @@ -/* AbstractInterruptibleChannel.java -- +/* AbstractInterruptibleChannel.java -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,8 +76,8 @@ public abstract class AbstractInterruptibleChannel { if (! closed) { - closed = true; - implCloseChannel(); + closed = true; + implCloseChannel(); } } @@ -96,7 +96,7 @@ public abstract class AbstractInterruptibleChannel throws AsynchronousCloseException { // FIXME: check more here. - + if (closed) throw new AsynchronousCloseException(); } @@ -109,8 +109,8 @@ public abstract class AbstractInterruptibleChannel /** * Tells whether or not this channel is open. - * - * @return true if the channel is open, false otherwise + * + * @return true if the channel is open, false otherwise */ public final boolean isOpen() { diff --git a/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java b/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java index 5d5277b4a68..97ed685b8ff 100644 --- a/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java +++ b/libjava/classpath/java/nio/channels/spi/AbstractSelectableChannel.java @@ -90,11 +90,11 @@ public abstract class AbstractSelectableChannel extends SelectableChannel { synchronized (blockingLock()) { - if (this.blocking != blocking) - { - implConfigureBlocking(blocking); - this.blocking = blocking; - } + if (this.blocking != blocking) + { + implConfigureBlocking(blocking); + this.blocking = blocking; + } } return this; @@ -173,14 +173,14 @@ public abstract class AbstractSelectableChannel extends SelectableChannel try { - synchronized (blockingLock()) - { - return locate(selector); - } + synchronized (blockingLock()) + { + return locate(selector); + } } catch (Exception e) { - return null; + return null; } } @@ -200,10 +200,10 @@ public abstract class AbstractSelectableChannel extends SelectableChannel while (it.hasNext()) { - SelectionKey key = (SelectionKey) it.next(); + SelectionKey key = (SelectionKey) it.next(); - if (key.selector() == selector) - return key; + if (key.selector() == selector) + return key; } return null; @@ -217,7 +217,7 @@ public abstract class AbstractSelectableChannel extends SelectableChannel * @param att an attachment for the returned selection key * * @return the registered selection key - * + * * @exception ClosedChannelException If the channel is already closed. * @exception IllegalBlockingModeException If the channel is configured in * blocking mode. @@ -230,29 +230,29 @@ public abstract class AbstractSelectableChannel extends SelectableChannel if ((ops & ~validOps()) != 0) throw new IllegalArgumentException(); - + SelectionKey key = null; AbstractSelector selector = (AbstractSelector) selin; synchronized (blockingLock()) { - if (blocking) - throw new IllegalBlockingModeException(); + if (blocking) + throw new IllegalBlockingModeException(); - key = locate(selector); + key = locate(selector); - if (key != null && key.isValid()) - { + if (key != null && key.isValid()) + { key.interestOps(ops); key.attach(att); - } - else - { - key = selector.register(this, ops, att); + } + else + { + key = selector.register(this, ops, att); - if (key != null) - addSelectionKey(key); - } + if (key != null) + addSelectionKey(key); + } } return key; diff --git a/libjava/classpath/java/nio/channels/spi/AbstractSelectionKey.java b/libjava/classpath/java/nio/channels/spi/AbstractSelectionKey.java index 02d09ce10ad..e0dc03f5345 100644 --- a/libjava/classpath/java/nio/channels/spi/AbstractSelectionKey.java +++ b/libjava/classpath/java/nio/channels/spi/AbstractSelectionKey.java @@ -61,8 +61,8 @@ public abstract class AbstractSelectionKey extends SelectionKey { if (isValid()) { - ((AbstractSelector) selector()).cancelKey(this); - cancelled = true; + ((AbstractSelector) selector()).cancelKey(this); + cancelled = true; } } diff --git a/libjava/classpath/java/nio/channels/spi/AbstractSelector.java b/libjava/classpath/java/nio/channels/spi/AbstractSelector.java index 73f5077df92..b67d4aeccf1 100644 --- a/libjava/classpath/java/nio/channels/spi/AbstractSelector.java +++ b/libjava/classpath/java/nio/channels/spi/AbstractSelector.java @@ -132,7 +132,7 @@ public abstract class AbstractSelector extends Selector { synchronized (cancelledKeys) { - cancelledKeys.add(key); + cancelledKeys.add(key); } } diff --git a/libjava/classpath/java/nio/channels/spi/SelectorProvider.java b/libjava/classpath/java/nio/channels/spi/SelectorProvider.java index b2fb7bb9c81..821bc436152 100644 --- a/libjava/classpath/java/nio/channels/spi/SelectorProvider.java +++ b/libjava/classpath/java/nio/channels/spi/SelectorProvider.java @@ -72,7 +72,7 @@ public abstract class SelectorProvider * Opens a datagram channel. * * @return a new datagram channel object - * + * * @exception IOException if an error occurs */ public abstract DatagramChannel openDatagramChannel() @@ -82,7 +82,7 @@ public abstract class SelectorProvider * Opens a pipe. * * @return a new pipe object - * + * * @exception IOException if an error occurs */ public abstract Pipe openPipe() throws IOException; @@ -91,7 +91,7 @@ public abstract class SelectorProvider * Opens a selector. * * @return a new selector object - * + * * @exception IOException if an error occurs */ public abstract AbstractSelector openSelector() throws IOException; @@ -100,7 +100,7 @@ public abstract class SelectorProvider * Opens a server socket channel. * * @return a new server socket channel object - * + * * @exception IOException if an error occurs */ public abstract ServerSocketChannel openServerSocketChannel() @@ -110,7 +110,7 @@ public abstract class SelectorProvider * Opens a socket channel. * * @return a new socket channel object - * + * * @exception IOException if an error occurs */ public abstract SocketChannel openSocketChannel() throws IOException; @@ -151,26 +151,26 @@ public abstract class SelectorProvider { if (systemDefaultProvider == null) { - String propertyValue = - System.getProperty("java.nio.channels.spi.SelectorProvider"); + String propertyValue = + System.getProperty("java.nio.channels.spi.SelectorProvider"); - if (propertyValue == null || propertyValue.equals("")) - systemDefaultProvider = new SelectorProviderImpl(); - else - { - try - { - systemDefaultProvider = - (SelectorProvider) Class.forName(propertyValue) - .newInstance(); - } - catch (Exception e) - { - System.err.println("Could not instantiate class: " - + propertyValue); - systemDefaultProvider = new SelectorProviderImpl(); - } - } + if (propertyValue == null || propertyValue.equals("")) + systemDefaultProvider = new SelectorProviderImpl(); + else + { + try + { + systemDefaultProvider = + (SelectorProvider) Class.forName(propertyValue) + .newInstance(); + } + catch (Exception e) + { + System.err.println("Could not instantiate class: " + + propertyValue); + systemDefaultProvider = new SelectorProviderImpl(); + } + } } return systemDefaultProvider; diff --git a/libjava/classpath/java/nio/charset/CharacterCodingException.java b/libjava/classpath/java/nio/charset/CharacterCodingException.java index d0580c95548..05f1e3aea11 100644 --- a/libjava/classpath/java/nio/charset/CharacterCodingException.java +++ b/libjava/classpath/java/nio/charset/CharacterCodingException.java @@ -1,4 +1,4 @@ -/* CharacterCodingException.java -- +/* CharacterCodingException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/charset/Charset.java b/libjava/classpath/java/nio/charset/Charset.java index 924e005e65a..1757b82ea60 100644 --- a/libjava/classpath/java/nio/charset/Charset.java +++ b/libjava/classpath/java/nio/charset/Charset.java @@ -1,4 +1,4 @@ -/* Charset.java -- +/* Charset.java -- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,15 +64,15 @@ public abstract class Charset implements Comparable { private CharsetEncoder cachedEncoder; private CharsetDecoder cachedDecoder; - + /** * Extra Charset providers. */ private static CharsetProvider[] providers; - + private final String canonicalName; private final String[] aliases; - + protected Charset (String canonicalName, String[] aliases) { checkName (canonicalName); @@ -121,45 +121,45 @@ public abstract class Charset implements Comparable * * This may be set by the user or VM with the file.encoding * property. - * + * * @since 1.5 */ public static Charset defaultCharset() { String encoding; - - try + + try { - encoding = SystemProperties.getProperty("file.encoding"); + encoding = SystemProperties.getProperty("file.encoding"); } catch(SecurityException e) { - // Use fallback. - encoding = "ISO-8859-1"; + // Use fallback. + encoding = "ISO-8859-1"; } catch(IllegalArgumentException e) { - // Use fallback. - encoding = "ISO-8859-1"; + // Use fallback. + encoding = "ISO-8859-1"; } try { - return forName(encoding); + return forName(encoding); } catch(UnsupportedCharsetException e) { - // Ignore. + // Ignore. } catch(IllegalCharsetNameException e) { - // Ignore. + // Ignore. } catch(IllegalArgumentException e) { - // Ignore. + // Ignore. } - + throw new IllegalStateException("Can't get default charset!"); } @@ -170,7 +170,7 @@ public abstract class Charset implements Comparable /** * Returns the Charset instance for the charset of the given name. - * + * * @param charsetName * @return the Charset instance for the indicated charset * @throws UnsupportedCharsetException if this VM does not support @@ -184,7 +184,7 @@ public abstract class Charset implements Comparable // Throws IllegalArgumentException as the JDK does. if(charsetName == null) throw new IllegalArgumentException("Charset name must not be null."); - + Charset cs = charsetForName (charsetName); if (cs == null) throw new UnsupportedCharsetException (charsetName); @@ -208,13 +208,13 @@ public abstract class Charset implements Comparable Charset cs = provider().charsetForName(charsetName); if (cs == null) { - CharsetProvider[] providers = providers2(); - for (int i = 0; i < providers.length; i++) - { - cs = providers[i].charsetForName(charsetName); - if (cs != null) - break; - } + CharsetProvider[] providers = providers2(); + for (int i = 0; i < providers.length; i++) + { + cs = providers[i].charsetForName(charsetName); + if (cs != null) + break; + } } return cs; } @@ -225,8 +225,8 @@ public abstract class Charset implements Comparable = new TreeMap(String.CASE_INSENSITIVE_ORDER); for (Iterator i = provider().charsets(); i.hasNext(); ) { - Charset cs = i.next(); - charsets.put(cs.name(), cs); + Charset cs = i.next(); + charsets.put(cs.name(), cs); } CharsetProvider[] providers = providers2(); @@ -333,21 +333,21 @@ public abstract class Charset implements Comparable { try { - if (cachedEncoder == null) - { - cachedEncoder = newEncoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedEncoder.reset(); - return cachedEncoder.encode (cb); + if (cachedEncoder == null) + { + cachedEncoder = newEncoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedEncoder.reset(); + return cachedEncoder.encode (cb); } catch (CharacterCodingException e) { throw new AssertionError (e); } } - + public final ByteBuffer encode (String str) { return encode (CharBuffer.wrap (str)); @@ -361,15 +361,15 @@ public abstract class Charset implements Comparable { try { - if (cachedDecoder == null) - { - cachedDecoder = newDecoder () - .onMalformedInput (CodingErrorAction.REPLACE) - .onUnmappableCharacter (CodingErrorAction.REPLACE); - } else - cachedDecoder.reset(); + if (cachedDecoder == null) + { + cachedDecoder = newDecoder () + .onMalformedInput (CodingErrorAction.REPLACE) + .onUnmappableCharacter (CodingErrorAction.REPLACE); + } else + cachedDecoder.reset(); - return cachedDecoder.decode (bb); + return cachedDecoder.decode (bb); } catch (CharacterCodingException e) { diff --git a/libjava/classpath/java/nio/charset/CharsetDecoder.java b/libjava/classpath/java/nio/charset/CharsetDecoder.java index c86f1c8a4ad..cf43feafd8e 100644 --- a/libjava/classpath/java/nio/charset/CharsetDecoder.java +++ b/libjava/classpath/java/nio/charset/CharsetDecoder.java @@ -1,4 +1,4 @@ -/* CharsetDecoder.java -- +/* CharsetDecoder.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -160,7 +160,7 @@ public abstract class CharsetDecoder cr = decodeLoop (in, out); } catch (RuntimeException e) - { + { throw new CoderMalfunctionError (e); } @@ -199,7 +199,7 @@ public abstract class CharsetDecoder { throw new UnsupportedOperationException (); } - + public final CoderResult flush (CharBuffer out) { // It seems weird that you can flush after reset, but Sun's javadoc diff --git a/libjava/classpath/java/nio/charset/CharsetEncoder.java b/libjava/classpath/java/nio/charset/CharsetEncoder.java index 932fe355df9..1f079a3cc91 100644 --- a/libjava/classpath/java/nio/charset/CharsetEncoder.java +++ b/libjava/classpath/java/nio/charset/CharsetEncoder.java @@ -1,4 +1,4 @@ -/* CharsetEncoder.java -- +/* CharsetEncoder.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ public abstract class CharsetEncoder private static final int STATE_CODING = 1; private static final int STATE_END = 2; private static final int STATE_FLUSHED = 3; - + private static final byte[] DEFAULT_REPLACEMENT = {(byte)'?'}; private final Charset charset; @@ -71,7 +71,7 @@ public abstract class CharsetEncoder this (cs, averageBytesPerChar, maxBytesPerChar, DEFAULT_REPLACEMENT); } - protected CharsetEncoder (Charset cs, float averageBytesPerChar, + protected CharsetEncoder (Charset cs, float averageBytesPerChar, float maxBytesPerChar, byte[] replacement) { if (averageBytesPerChar <= 0.0f) @@ -87,7 +87,7 @@ public abstract class CharsetEncoder this.replacement = replacement; implReplaceWith (replacement); } - + public final float averageBytesPerChar () { return averageBytesPerChar; diff --git a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java index 5770aded628..f7a32d20783 100644 --- a/libjava/classpath/java/nio/charset/CoderMalfunctionError.java +++ b/libjava/classpath/java/nio/charset/CoderMalfunctionError.java @@ -1,4 +1,4 @@ -/* CoderMalfunctionError.java -- +/* CoderMalfunctionError.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/nio/charset/CoderResult.java b/libjava/classpath/java/nio/charset/CoderResult.java index 304d9d70895..b083d840e2d 100644 --- a/libjava/classpath/java/nio/charset/CoderResult.java +++ b/libjava/classpath/java/nio/charset/CoderResult.java @@ -1,4 +1,4 @@ -/* CoderResult.java -- +/* CoderResult.java -- Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ import java.util.HashMap; * @since 1.4 */ public class CoderResult -{ +{ private static final int TYPE_MALFORMED = 0; private static final int TYPE_OVERFLOW = 1; private static final int TYPE_UNDERFLOW = 2; @@ -57,7 +57,7 @@ public class CoderResult = new CoderResult (TYPE_OVERFLOW, 0); public static final CoderResult UNDERFLOW = new CoderResult (TYPE_UNDERFLOW, 0); - + private static final String[] names = { "MALFORMED", "OVERFLOW", "UNDERFLOW", "UNMAPPABLE" }; @@ -126,7 +126,7 @@ public class CoderResult { return malformedCache.get (length); } - + public void throwException () throws CharacterCodingException { @@ -152,7 +152,7 @@ public class CoderResult public static CoderResult unmappableForLength (int length) { return unmappableCache.get (length); - } + } private abstract static class Cache { diff --git a/libjava/classpath/java/nio/charset/CodingErrorAction.java b/libjava/classpath/java/nio/charset/CodingErrorAction.java index 592c15934ac..3b64030977c 100644 --- a/libjava/classpath/java/nio/charset/CodingErrorAction.java +++ b/libjava/classpath/java/nio/charset/CodingErrorAction.java @@ -1,4 +1,4 @@ -/* CodingErrorAction.java -- +/* CodingErrorAction.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,11 +40,11 @@ package java.nio.charset; public class CodingErrorAction { public static final CodingErrorAction IGNORE - = new CodingErrorAction("ignore"); + = new CodingErrorAction("ignore"); public static final CodingErrorAction REPLACE - = new CodingErrorAction("replace"); + = new CodingErrorAction("replace"); public static final CodingErrorAction REPORT - = new CodingErrorAction("report"); + = new CodingErrorAction("report"); private final String name; diff --git a/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java b/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java index 7baeac3234e..0e05d4dbfd2 100644 --- a/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java +++ b/libjava/classpath/java/nio/charset/IllegalCharsetNameException.java @@ -1,4 +1,4 @@ -/* IllegalCharsetNameException.java -- +/* IllegalCharsetNameException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,9 +47,9 @@ public class IllegalCharsetNameException extends IllegalArgumentException * Compatible with JDK 1.4+ */ private static final long serialVersionUID = 1457525358470002989L; - + private String charsetName; - + /** * Creates the exception * diff --git a/libjava/classpath/java/nio/charset/MalformedInputException.java b/libjava/classpath/java/nio/charset/MalformedInputException.java index 463d36868f3..3870b55bea1 100644 --- a/libjava/classpath/java/nio/charset/MalformedInputException.java +++ b/libjava/classpath/java/nio/charset/MalformedInputException.java @@ -1,4 +1,4 @@ -/* MalformedInputException.java -- +/* MalformedInputException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ public class MalformedInputException extends CharacterCodingException private static final long serialVersionUID = - 3438823399834806194L; private int inputLength; - + /** * Creates the exception * diff --git a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java index d22a23807b6..d9cdb49cf7a 100644 --- a/libjava/classpath/java/nio/charset/UnmappableCharacterException.java +++ b/libjava/classpath/java/nio/charset/UnmappableCharacterException.java @@ -1,4 +1,4 @@ -/* UnmappableCharacterException.java -- +/* UnmappableCharacterException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ public class UnmappableCharacterException extends CharacterCodingException private static final long serialVersionUID = - 7026962371537706123L; private int inputLength; - + /** * Creates the exception */ diff --git a/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java b/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java index 39536baa563..c4f9d17fd71 100644 --- a/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java +++ b/libjava/classpath/java/nio/charset/UnsupportedCharsetException.java @@ -1,4 +1,4 @@ -/* UnsupportedCharsetException.java -- +/* UnsupportedCharsetException.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,9 +47,9 @@ public class UnsupportedCharsetException extends IllegalArgumentException * Compatible with JDK 1.4+ */ private static final long serialVersionUID = 1490765524727386367L; - + String charsetName; - + /** * Creates the exception */ diff --git a/libjava/classpath/java/rmi/AccessException.java b/libjava/classpath/java/rmi/AccessException.java index 40954dfd3e1..c14b87675e7 100644 --- a/libjava/classpath/java/rmi/AccessException.java +++ b/libjava/classpath/java/rmi/AccessException.java @@ -1,5 +1,5 @@ /* AccessException.java -- thrown if the caller does not have access - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/AlreadyBoundException.java b/libjava/classpath/java/rmi/AlreadyBoundException.java index 10f6e4cec98..c56a4ee85c2 100644 --- a/libjava/classpath/java/rmi/AlreadyBoundException.java +++ b/libjava/classpath/java/rmi/AlreadyBoundException.java @@ -1,5 +1,5 @@ /* AlreadyBoundException.java -- thrown if a binding is already bound - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/MarshalledObject.java b/libjava/classpath/java/rmi/MarshalledObject.java index 180c0a9be29..a48e4c00934 100644 --- a/libjava/classpath/java/rmi/MarshalledObject.java +++ b/libjava/classpath/java/rmi/MarshalledObject.java @@ -1,5 +1,5 @@ /* MarshalledObject.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,8 +51,8 @@ import java.io.Serializable; * marshalled according to the RMI specification. *

              * An object passed to the constructor is serialized and tagged with the needed - * URL to retrieve its class definition for remote usage. If the object is a - * remote reference its stub is serialized instead. The instance of this + * URL to retrieve its class definition for remote usage. If the object is a + * remote reference its stub is serialized instead. The instance of this * marshalled object can be later retrieved by its get() method. *

              * @@ -70,14 +70,14 @@ public final class MarshalledObject /** * Constructs a MarshalledObject from the given object. - * + * * @param obj the object to marshal * @throws IOException if an I/O error during serialization occurs. */ public MarshalledObject(T obj) throws IOException { ByteArrayOutputStream objStream = new ByteArrayOutputStream(); - RMIMarshalledObjectOutputStream stream = + RMIMarshalledObjectOutputStream stream = new RMIMarshalledObjectOutputStream(objStream); stream.writeObject(obj); stream.flush(); @@ -88,7 +88,7 @@ public final class MarshalledObject hash = 0; for (int i = 0; i < objBytes.length; i++) hash = hash * 31 + objBytes[i]; - + if (locBytes != null) for (int i = 0; i < locBytes.length; i++) hash = hash * 31 + locBytes[i]; @@ -96,12 +96,12 @@ public final class MarshalledObject /** * Checks if the given object is equal to this marshalled object. - * + * *

              Marshalled objects are considered equal if they contain the - * same serialized object. Codebase annotations where the class + * same serialized object. Codebase annotations where the class * definition can be downloaded are ignored in the equals test.

              * - * @param obj the object to compare. + * @param obj the object to compare. * @return true if equal, false otherwise. */ public boolean equals(Object obj) @@ -129,19 +129,19 @@ public final class MarshalledObject /** * Constructs and returns a copy of the internal serialized object. - * + * * @return The deserialized object. - * + * * @throws IOException if an I/O exception occurs during deserialization. - * @throws ClassNotFoundException if the class of the deserialized object + * @throws ClassNotFoundException if the class of the deserialized object * cannot be found. */ public T get() throws IOException, ClassNotFoundException { if (objBytes == null) return null; - - RMIMarshalledObjectInputStream stream = + + RMIMarshalledObjectInputStream stream = new RMIMarshalledObjectInputStream(objBytes, locBytes); return (T) stream.readObject(); } diff --git a/libjava/classpath/java/rmi/Naming.java b/libjava/classpath/java/rmi/Naming.java index b605da70d12..7f74add7a4d 100644 --- a/libjava/classpath/java/rmi/Naming.java +++ b/libjava/classpath/java/rmi/Naming.java @@ -1,5 +1,5 @@ /* Naming.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -65,7 +65,7 @@ import java.rmi.registry.Registry; *

              *

              * RMI services are registered using one of these names, and the same name - * is later used by the client to lookup the service and access its methods. + * is later used by the client to lookup the service and access its methods. * Registries can be shared by multiple services, or a service can create * its own registry using createRegistry(). *

              @@ -87,15 +87,15 @@ public final class Naming } /** - * Looks for the remote object that is associated with the named service. + * Looks for the remote object that is associated with the named service. * Name and location is given in form of a URL without a scheme: - * + * * 
                  * //host:port/service-name
    *
              - * + * * The port is optional. - * + * * @param name the service name and location * @return Remote-object that implements the named service * @throws NotBoundException if no object implements the service @@ -112,7 +112,7 @@ public final class Naming /** * Try to bind the given object to the given service name. - * + * * @param name * @param obj * @throws AlreadyBoundException @@ -129,7 +129,7 @@ public final class Naming /** * Remove a binding for a given service name. - * + * * @param name * @throws RemoteException * @throws NotBoundException @@ -146,7 +146,7 @@ public final class Naming /** * Forces the binding between the given Remote-object and the given service * name, even if there was already an object bound to this name. - * + * * @param name * @param obj * @throws RemoteException @@ -162,7 +162,7 @@ public final class Naming /** * Lists all services at the named registry. - * + * * @param name url that specifies the registry * @return list of services at the name registry * @throws RemoteException @@ -190,7 +190,7 @@ public final class Naming * Parses the supplied URL and converts it to use the HTTP protocol. From an * RMI perspective, the scheme is irrelevant and we want to be able to create * a URL for which a handler is available. - * + * * @param name the URL in String form. * @throws MalformedURLException if the URL is invalid. */ @@ -216,7 +216,7 @@ public final class Naming /** * Checks that the URL contains a name, and removes any leading slashes. - * + * * @param url the URL to check. * @throws MalformedURLException if no name is specified. */ diff --git a/libjava/classpath/java/rmi/NoSuchObjectException.java b/libjava/classpath/java/rmi/NoSuchObjectException.java index 2943906701b..a2af433c994 100644 --- a/libjava/classpath/java/rmi/NoSuchObjectException.java +++ b/libjava/classpath/java/rmi/NoSuchObjectException.java @@ -1,5 +1,5 @@ /* NoSuchObjectException.java -- thrown if the remote object no longer exists - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/NotBoundException.java b/libjava/classpath/java/rmi/NotBoundException.java index 03d4adf8f71..fdd646857cf 100644 --- a/libjava/classpath/java/rmi/NotBoundException.java +++ b/libjava/classpath/java/rmi/NotBoundException.java @@ -1,5 +1,5 @@ /* NotBoundException.java -- attempt to use a registry name with no binding - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/RMISecurityException.java b/libjava/classpath/java/rmi/RMISecurityException.java index 6f15af85280..7a2d214a39f 100644 --- a/libjava/classpath/java/rmi/RMISecurityException.java +++ b/libjava/classpath/java/rmi/RMISecurityException.java @@ -1,5 +1,5 @@ /* RMISecurityException.java -- deprecated version of SecurityException - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,7 +39,7 @@ exception statement from your version. */ package java.rmi; /** - * Never thrown, but originally intended to wrap a + * Never thrown, but originally intended to wrap a * {@link java.lang.SecurityException} in the case of RMI. * * @author unknown diff --git a/libjava/classpath/java/rmi/RMISecurityManager.java b/libjava/classpath/java/rmi/RMISecurityManager.java index a8eb13e1a0a..3f7e1fbcf6a 100644 --- a/libjava/classpath/java/rmi/RMISecurityManager.java +++ b/libjava/classpath/java/rmi/RMISecurityManager.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/Remote.java b/libjava/classpath/java/rmi/Remote.java index 0306981e96f..8c2720e42fd 100644 --- a/libjava/classpath/java/rmi/Remote.java +++ b/libjava/classpath/java/rmi/Remote.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -42,15 +42,15 @@ package java.rmi; * from outside of this virtual machine through remote method calls. *

              * Remote invokable methods of remote object implementations are specified - * as the methods defined in the implemented remote interfaces. Typically - * remote object implementations are subclasses of the convenience classes - * {@link java.rmi.server.UnicastRemoteObject} or + * as the methods defined in the implemented remote interfaces. Typically + * remote object implementations are subclasses of the convenience classes + * {@link java.rmi.server.UnicastRemoteObject} or * {@link java.rmi.activation.Activatable} implementing one or more remote * interfaces indicating their remotely accessible methods. The convenience - * classes provide implementations for correct remote object creation, + * classes provide implementations for correct remote object creation, * hash, equals and toString methods. *

              - * + * * @author unknown */ public interface Remote { diff --git a/libjava/classpath/java/rmi/RemoteException.java b/libjava/classpath/java/rmi/RemoteException.java index 929bc80f67f..276aa37742e 100644 --- a/libjava/classpath/java/rmi/RemoteException.java +++ b/libjava/classpath/java/rmi/RemoteException.java @@ -1,5 +1,5 @@ /* RemoteException.java -- common superclass for exceptions in java.rmi - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/StubNotFoundException.java b/libjava/classpath/java/rmi/StubNotFoundException.java index 524b418cea1..992df121773 100644 --- a/libjava/classpath/java/rmi/StubNotFoundException.java +++ b/libjava/classpath/java/rmi/StubNotFoundException.java @@ -1,5 +1,5 @@ /* StubNotFoundException.java -- thrown if a valid stub is not found - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/java/rmi/UnknownHostException.java b/libjava/classpath/java/rmi/UnknownHostException.java index e21b9944c6b..7e77dca3119 100644 --- a/libjava/classpath/java/rmi/UnknownHostException.java +++ b/libjava/classpath/java/rmi/UnknownHostException.java @@ -45,7 +45,7 @@ package java.rmi; * @since 1.1 * @status updated to 1.4 */ -public class UnknownHostException extends RemoteException +public class UnknownHostException extends RemoteException { /** * Compatible with JDK 1.1+. diff --git a/libjava/classpath/java/rmi/activation/Activatable.java b/libjava/classpath/java/rmi/activation/Activatable.java index 6977d984c54..9ec7cad48d9 100644 --- a/libjava/classpath/java/rmi/activation/Activatable.java +++ b/libjava/classpath/java/rmi/activation/Activatable.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -63,10 +63,10 @@ import java.rmi.server.UnicastRemoteObject; * parameter being the {@link ActivationID} and the second the * {@link MarshalledObject}. Activatable is the main class that developers need * to use to implement and manage activatable objects. It also contains methods - * for making activatable remote objects that are not derived from the + * for making activatable remote objects that are not derived from the * Activatable class. - * - * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) + * + * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) */ public abstract class Activatable extends RemoteServer @@ -76,12 +76,12 @@ public abstract class Activatable * Use SVUID for interoperability. */ static final long serialVersionUID = - 3120617863591563455L; - + /** * The object activation id. */ final ActivationID id; - + /** * This constructor is used to register export the object on the given port. A * subclass of the Activatable class calls this constructor to register and @@ -90,7 +90,7 @@ public abstract class Activatable * with the activation system and "exported" (on an anonymous port, if port is * zero) to the RMI runtime so that it is available to accept incoming calls * from clients. - * + * * @param codebase the object code base url * @param data the data, needed to activate the object. * @param restart specifies reactivation mode after crash. If true, the object @@ -118,7 +118,7 @@ public abstract class Activatable * additionally specifying the socket factories. A subclass of the Activatable * class calls this constructor to register and export the object during * initial construction. - * + * * @param codebase the object code base url * @param data the data, needed to activate the object. * @param restart specifies reactivation mode after crash. If true, the object @@ -151,7 +151,7 @@ public abstract class Activatable * "activation" constructor with the two parameters ({@link ActivationID}, * {@link MarshalledObject}). As a side effect, the object is exported and is * available to accept incoming calls. - * + * * @param anId the activation id * @param port the port, on which the activatable will be listening * @throws RemoteException if the activation failed. @@ -166,7 +166,7 @@ public abstract class Activatable catch (Exception e) { e.printStackTrace(); - RemoteException acex = + RemoteException acex = new RemoteException("cannot export Activatable", e); throw acex; } @@ -180,12 +180,12 @@ public abstract class Activatable * "activation" constructor with the two parameters ({@link ActivationID}, * {@link MarshalledObject}). As a side effect, the object is exported and is * available to accept incoming calls. - * + * * @param anId the activation id * @param port the port, on which the activatable will be listening * @param csf the client socket factory * @param ssf the server socket factory - * + * * @throws RemoteException if the remote call failed */ protected Activatable(ActivationID anId, int port, RMIClientSocketFactory csf, @@ -203,17 +203,17 @@ public abstract class Activatable throw acex; } } - + /** * Get the objects activation identifier. - * + * * @return the object activation identifier */ protected ActivationID getID() { return id; } - + /** * Obtain the activation Id from the activation descriptor by registering * within the current group. @@ -230,11 +230,11 @@ public abstract class Activatable system = ActivationGroup.currentGroupID().getSystem(); return system.registerObject(descriptor); } - + /** * This method registers an activatable object. The object is expected to be * on the anonymous port (null client and server socket factories). - * + * * @param desc the object description. * @return the remote stub for the activatable object (the first call on this * stub will activate the object). @@ -258,12 +258,12 @@ public abstract class Activatable throw new ActivationException("Class not found: "+desc.getClassName()); } } - + /** * Inactivates and unexports the object. The subsequent calls will activate * the object again. The object is not inactivated if it is currently * executing calls. - * + * * @param id the id of the object being inactivated * @return true if the object has been inactivated, false if it has not been * inactivated because of the running or pending calls. @@ -278,10 +278,10 @@ public abstract class Activatable id.group.inactiveObject(id); return UnicastRemoteObject.unexportObject(id.activate(false), false); } - + /** * Unregister the object (the object will no longer be activable with that id) - * + * * @param id the object id * @throws UnknownObjectException if the id is unknown * @throws ActivationException if the activation system is not running @@ -293,23 +293,23 @@ public abstract class Activatable ActivationGroup.currentGroupId.getSystem().unregisterObject(id); UnicastServer.unregisterActivatable(id); } - + /** * Register and export the object that activatable object that is not derived * from the Activatable super class. It creates and registers the object * activation descriptor. There is no need to call this method if the object * extends Activable, as its work is done in the constructor * {@link #Activatable(String, MarshalledObject, boolean, int)}. - * + * * @param obj the object, that is exported, becoming available at the given * port. * @param location the object code location (codebase). * @param data the data, needed to activate the object * @param restart the restart mode * @param port the port, where the object will be available - * + * * @return the created object activation ID. - * + * * @throws ActivationException if the activation group is not active * @throws RemoteException if the registration or export fails */ @@ -321,7 +321,7 @@ public abstract class Activatable ActivationDesc descriptor = new ActivationDesc(obj.getClass().getName(), location, data, restart); ActivationID id = obtainId(descriptor); - Remote stub = exportObject(obj, id, port); + Remote stub = exportObject(obj, id, port); return id; } @@ -331,7 +331,7 @@ public abstract class Activatable * activation descriptor. There is no need to call this method if the object * extends Activable, as its work is done in the constructor * {@link #Activatable(String, MarshalledObject, boolean, int, RMIClientSocketFactory, RMIServerSocketFactory)} - * + * * @param obj the object, that is exported, becoming available at the given * port. * @param location the object code location (codebase). @@ -340,9 +340,9 @@ public abstract class Activatable * @param port the port, where the object will be available * @param csf the client socket factory * @param ssf the server socket factory - * + * * @return the created object activation ID. - * + * * @throws ActivationException if the activation group is not active * @throws RemoteException if the registration or export fails */ @@ -356,7 +356,7 @@ public abstract class Activatable ActivationDesc descriptor = new ActivationDesc(obj.getClass().getName(), location, data, restart); ActivationID id = obtainId(descriptor); - Remote stub = exportObject(obj, id, port, csf, ssf); + Remote stub = exportObject(obj, id, port, csf, ssf); return id; } @@ -367,13 +367,13 @@ public abstract class Activatable * class. There is no need to call this method if the object extends * Activable, as its work is done in the constructor * {@link #Activatable(ActivationID, int)} - * + * * @param obj the object * @param id the known activation id * @param port the object port - * + * * @return the remote stub of the activatable object - * + * * @throws RemoteException if the object export fails */ public static Remote exportObject(Remote obj, ActivationID id, int port) @@ -389,15 +389,15 @@ public abstract class Activatable * class. There is no need to call this method if the object extends * Activable, as its work is done in the constructor * {@link #Activatable(ActivationID, int)} - * + * * @param obj the object * @param id the known activation id * @param port the object port * @param csf the client socket factory * @param ssf the server socket factory - * + * * @return the remote stub of the activatable object - * + * * @throws RemoteException if the object export fails */ public static Remote exportObject(Remote obj, ActivationID id, int port, @@ -405,7 +405,7 @@ public abstract class Activatable RMIServerSocketFactory ssf) throws RemoteException { - Remote stub = export(id, obj, port, ssf); + Remote stub = export(id, obj, port, ssf); return stub; } @@ -414,7 +414,7 @@ public abstract class Activatable * Make the remote object unavailable for incoming calls. This method also * unregisters the object, so it cannot be activated again by incoming call * (unless registered). - * + * * @param obj the object to unexport * @param force if true, cancel all pending or running calls to that object * (if false, the object with such calls is not unexported and false @@ -426,7 +426,7 @@ public abstract class Activatable throws NoSuchObjectException { Object aref = UnicastServer.getExportedRef(obj); - + // Unregister it also (otherwise will be activated during the subsequent // call. if (aref instanceof ActivatableServerRef) @@ -436,9 +436,9 @@ public abstract class Activatable } return UnicastRemoteObject.unexportObject(obj, force); } - - static Remote exportObject(Remote obj, int port, - RMIServerSocketFactory serverSocketFactory) + + static Remote exportObject(Remote obj, int port, + RMIServerSocketFactory serverSocketFactory) throws RemoteException { UnicastServerRef sref = null; @@ -449,52 +449,52 @@ public abstract class Activatable sref = new UnicastServerRef(new ObjID(), port, serverSocketFactory); Remote stub = sref.exportObject(obj); - // addStub(obj, stub); + // addStub(obj, stub); // TODO Need to change the place of the stub repository return stub; } - + /** * Create and export the new remote object, making it available at the given * port, using sockets, produced by the specified factories. - * + * * @param port the port, on that the object should become available. Zero * means anonymous port. * @param serverSocketFactory the server socket factory */ private static Remote export(ActivationID id, Remote obj, int port, - RMIServerSocketFactory serverSocketFactory) + RMIServerSocketFactory serverSocketFactory) throws RemoteException { ActivatableServerRef sref = null; sref = new ActivatableServerRef(makeId(id), id, port, serverSocketFactory); return sref.exportObject(obj); - } - + } + /** * Make the object ID from the activation ID. The same activation ID always * produces the identical object id. - * + * * @param aid the activation id - * + * * @return the object id */ private static ObjID makeId(ActivationID aid) { ObjID id = new ObjID(0); - + // The fields of both ObjID and ActivationID must be package private, // so we need to use the reflection to access them anyway. // Probably other implementations use some very different approach. - + try { Field idUid = ObjID.class.getDeclaredField("space"); Field aidUid = ActivationID.class.getDeclaredField("uid"); - + aidUid.setAccessible(true); idUid.setAccessible(true); - + idUid.set(id, aidUid.get(aid)); } catch (Exception e) @@ -503,10 +503,10 @@ public abstract class Activatable ierr.initCause(e); throw ierr; } - + return id; - } - + } + /** * Connect the object to the UnicastServer (export), but not activate it. * The object will be activated on the first call. @@ -515,7 +515,7 @@ public abstract class Activatable { try { - ActivatableServerRef asr = + ActivatableServerRef asr = new ActivatableServerRef(makeId(anId), anId, 0, null); UnicastServer.exportActivatableObject(asr); return asr.exportClass(stubFor); diff --git a/libjava/classpath/java/rmi/activation/ActivationDesc.java b/libjava/classpath/java/rmi/activation/ActivationDesc.java index ae2b78eca8e..9970cd63b63 100644 --- a/libjava/classpath/java/rmi/activation/ActivationDesc.java +++ b/libjava/classpath/java/rmi/activation/ActivationDesc.java @@ -1,13 +1,13 @@ /* ActivationDesc.java -- record with info to activate an object Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. - + This file is part of GNU Classpath. GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,8 +51,8 @@ import java.rmi.MarshalledObject; *
            • the object restart mode
              • *
            • the object specific intialization information
              • *
            - * - * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) + * + * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) */ public final class ActivationDesc implements Serializable @@ -89,8 +89,8 @@ public final class ActivationDesc /** * Create the new activation description, assuming the object group is the - * {@link ActivationGroup#currentGroupID()}. - * + * {@link ActivationGroup#currentGroupID()}. + * * @param className the object fully qualified class name * @param location the code base URL * @param data the object initialization data, contained in a marshalled form @@ -103,8 +103,8 @@ public final class ActivationDesc /** * Create the new activation description, assuming the object group is the - * {@link ActivationGroup#currentGroupID()}. - * + * {@link ActivationGroup#currentGroupID()}. + * * @param className the object fully qualified class name * @param location the code base URL * @param data the object initialization data, contained in a marshalled form @@ -124,7 +124,7 @@ public final class ActivationDesc /** * Create the new activation description. Under crash, the object will only * be reactivated on demand. - * + * * @param groupID the object group id. * @param className the object fully qualified class name * @param location the code base URL @@ -138,7 +138,7 @@ public final class ActivationDesc /** * Create the new activation description, providing full information. - * + * * @param groupID the object group id. * @param className the object fully qualified class name * @param location the code base URL @@ -166,7 +166,7 @@ public final class ActivationDesc /** * Get the class name of the object being activated - * + * * @return the fully qualified class name of the object being activated */ public String getClassName() @@ -176,7 +176,7 @@ public final class ActivationDesc /** * Get the code location URL ("codebase") of the object being activated. - * + * * @return the codebase of the object being activated. */ public String getLocation() @@ -191,7 +191,7 @@ public final class ActivationDesc /** * Get the object reactivation strategy after crash. - * + * * @return true ir the object is activated when activator is restarted or the * activation group is restarted. False if the object is only * activated on demand. This flag does has no effect during the normal @@ -201,10 +201,10 @@ public final class ActivationDesc { return restart; } - + /** * Compare this object with another activation description for equality. - * + * * @return true if all fields have the equal values, false otherwise. */ public boolean equals(Object obj) @@ -213,25 +213,25 @@ public final class ActivationDesc { ActivationDesc that = (ActivationDesc) obj; return eq(groupid, that.groupid) && - eq(classname, that.classname) && - eq(location, that.location) && + eq(classname, that.classname) && + eq(location, that.location) && eq(data, that.data) && restart == that.restart; } else return false; } - + /** * Get the hash code of this object (overridden to make the returned value * consistent with .equals(..). */ public int hashCode() { - return hash(groupid) ^ hash(classname) ^ + return hash(groupid) ^ hash(classname) ^ hash(location) ^ hash(data); } - + /** * Get the hashcode of x or 0 if x == null. */ @@ -239,7 +239,7 @@ public final class ActivationDesc { return x == null ? 0 : x.hashCode(); } - + /** * Compare by .equals if both a and b are not null, compare directly if at * least one of them is null. diff --git a/libjava/classpath/java/rmi/activation/ActivationGroup.java b/libjava/classpath/java/rmi/activation/ActivationGroup.java index ad5a05d01a9..230c7145592 100644 --- a/libjava/classpath/java/rmi/activation/ActivationGroup.java +++ b/libjava/classpath/java/rmi/activation/ActivationGroup.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.rmi.server.UnicastRemoteObject; /** * The entity that receives the request to activate object and activates it. * Frequently there is one activation group per virtual machine. - * + * * @author Audrius Meskauskas (audriusa@Bioinformatics.org) (from stub) */ public abstract class ActivationGroup @@ -62,12 +62,12 @@ public abstract class ActivationGroup * Use the SVUID for interoperability. */ static final long serialVersionUID = - 7696947875314805420L; - + /** * The Id of the current group on this VM (null if none). */ - static ActivationGroupID currentGroupId = null; - + static ActivationGroupID currentGroupId = null; + /** * The groups identifier. */ @@ -77,17 +77,17 @@ public abstract class ActivationGroup * The groups activation monitor. */ ActivationMonitor monitor; - + /** * The groups incarnation number. */ long incarnation; - + /** * The groups activation system. */ static ActivationSystem system; - + /** * Used during the group creation (required constructor). */ @@ -98,34 +98,34 @@ public abstract class ActivationGroup }; /** - * Create the new activation group with the given group id. - * + * Create the new activation group with the given group id. + * * @param aGroupId the group Id. - * + * * @throws RemoteException if the group export fails. */ protected ActivationGroup(ActivationGroupID aGroupId) throws RemoteException { groupId = aGroupId; } - + /** * The method is called when the object is exported. The group must notify * the activation monitor, if this was not already done before. - * + * * @param id the object activation id * @param obj the remote object implementation - * + * * @throws ActivationException if the group is inactive * @throws UnknownObjectException if such object is not known * @throws RemoteException if the call to monitor fails */ public abstract void activeObject(ActivationID id, Remote obj) throws ActivationException, UnknownObjectException, RemoteException; - + /** * Notifies the monitor about the object being inactivated. - * + * * @param id the object being inactivated. * @return true always (must be overridden to return other values). * @throws ActivationException never @@ -148,7 +148,7 @@ public abstract class ActivationGroup * {@link MarshalledObject}. The group must be first be registered with the * ActivationSystem. Once a group is created, the currentGroupID method * returns the identifier for this group until the group becomes inactive. - * + * * @param id the activation group id * @param desc the group descriptor, providing the information, necessary to * create the group @@ -165,7 +165,7 @@ public abstract class ActivationGroup // passed in the group id. if (system == null) system = id.system; - + ActivationGroup group = null; // TODO at the moment all groups are created on the current jre and the @@ -220,7 +220,7 @@ public abstract class ActivationGroup /** * Get the id of current activation group. - * + * * @return the id of the current activation group or null if none exists. */ public static ActivationGroupID currentGroupID() @@ -240,16 +240,16 @@ public abstract class ActivationGroup ierr.initCause(e); throw ierr; } - + return currentGroupId; } /** * Set the activation system for this virtual machine. The system can only - * be set if no group is active. - * + * be set if no group is active. + * * @param aSystem the system to set - * + * * @throws ActivationException if some group is active now. */ public static void setSystem(ActivationSystem aSystem) @@ -259,7 +259,7 @@ public abstract class ActivationGroup throw new ActivationException("Group active"); else { - try + try { // Register the default transient activation system and group. system = aSystem; @@ -277,9 +277,9 @@ public abstract class ActivationGroup ierr.initCause(ex); throw ierr; } - } + } } - + /** * Get the current activation system. If the system is not set via * {@link #setSystem} method, the default system for this virtual machine is @@ -293,7 +293,7 @@ public abstract class ActivationGroup * transient activation system will be created and returned. This internal * system is highly limited in in capabilities and is not intended to be used * anywhere apart automated testing. - * + * * @return the activation system for this virtual machine * @throws ActivationException */ @@ -306,7 +306,7 @@ public abstract class ActivationGroup /** * Makes the call back to the groups {@link ActivationMonitor}. - * + * * @param id the id obj the object being activated * @param mObject the marshalled object, contains the activated remote object * stub. @@ -315,24 +315,24 @@ public abstract class ActivationGroup * @throws RemoteException on remote call (to monitor) error */ protected void activeObject(ActivationID id, - MarshalledObject mObject) + MarshalledObject mObject) throws ActivationException, UnknownObjectException, RemoteException { if (monitor!=null) monitor.activeObject(id, mObject); - + id.group = this; } /** * Makes the call back to the groups {@link ActivationMonitor} and sets * the current group to null. - */ + */ protected void inactiveGroup() throws UnknownGroupException, RemoteException { if (monitor!=null) monitor.inactiveGroup(groupId, incarnation); - + if (currentGroupId!=null && currentGroupId.equals(groupId)) currentGroupId = null; } diff --git a/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java b/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java index bf7445f17bb..a0c88ec0aed 100644 --- a/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java +++ b/libjava/classpath/java/rmi/activation/ActivationGroupDesc.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -64,7 +64,7 @@ import java.util.zip.Adler32; * expectes the group class to have the two parameter constructor, the first * parameter being the {@link ActivationGroupID} and the second the * {@link MarshalledObject}. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) */ public final class ActivationGroupDesc @@ -74,7 +74,7 @@ public final class ActivationGroupDesc * Contains the startup options for the {@link ActivationGroup} * implementations. Allows to override system properties and specify other * options for the implementation groups. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) */ public static class CommandEnvironment @@ -85,7 +85,7 @@ public final class ActivationGroupDesc * Use the SVUID for interoperability. */ static final long serialVersionUID = 6165754737887770191L; - + /** * The zero size string array used as argv value when null is passed. */ @@ -95,15 +95,15 @@ public final class ActivationGroupDesc * The path to the java executable (or null for using default jre). */ final String command; - + /** * The extra parameters (may be empty array but never null). */ final String[] options; - + /** * Create the new command environment. - * + * * @param commandPatch the full path (and name) to the java executable of * null for using the default executable. * @param args extra options that will be used when creating the activation @@ -117,10 +117,10 @@ public final class ActivationGroupDesc else options = NO_ARGS; } - + /** * Get the path to the java executable. - * + * * @return the path to the java executable or null for using the default * jre. */ @@ -128,17 +128,17 @@ public final class ActivationGroupDesc { return command; } - + /** * Get the additional command options. - * + * * @return the command options array, may be empty string */ public String[] getCommandOptions() { return options; } - + /** * Compare for content equality. */ @@ -179,49 +179,49 @@ public final class ActivationGroupDesc return h; } } - + /** * Use the SVUID for interoperability. */ static final long serialVersionUID = - 4936225423168276595L; - + /** * The group class name or null for the default group class implementation. */ final String className; - + /** * The group class download location URL (codebase), ignored by the - * default implementation. + * default implementation. */ final String location; - + /** * The group initialization data. */ final MarshalledObject data; - + /** * The path to the group jre and the parameters of this jre, may be * null for the default jre. */ final ActivationGroupDesc.CommandEnvironment env; - + /** * The properties that override the system properties. */ final Properties props; - + /** * The cached hash code. */ transient long hash; - + /** * Create the new activation group descriptor that will use the default * activation group implementation with the given properties and * environment. - * + * * @param aProperties the properties that override the system properties * @param environment the command line (and parameters), indicating, where to * find the jre executable and with that parameters to call it. May @@ -235,10 +235,10 @@ public final class ActivationGroupDesc this(DefaultActivationGroup.class.getName(), null, null, aProperties, environment); } - + /** * Create the new activation group descriptor. - * + * * @param aClassName the name of the group implementation class. The null * value indicates the default implementation. * @param aLocation the location, from where the group implementation class @@ -261,20 +261,20 @@ public final class ActivationGroupDesc props = aProperties; env = environment; } - + /** * Get the activation group class name. - * + * * @return the activation group class name (null for default implementation) */ public String getClassName() { return className; } - + /** * Get the location, from where the group class will be loaded - * + * * @return the location, from where the implementation should be loaded (null * for the default implementation) */ @@ -282,10 +282,10 @@ public final class ActivationGroupDesc { return location; } - + /** * Get the group intialization data. - * + * * @return the group intialization data in the marshalled form. */ public MarshalledObject getData() @@ -295,18 +295,18 @@ public final class ActivationGroupDesc /** * Get the overridded system properties. - * + * * @return the overridden group system properties. */ public Properties getPropertyOverrides() { return props; } - + /** * Get the group command environment, containing path to the jre executable * and startup options. - * + * * @return the command environment or null if the default environment should * be used. */ @@ -314,7 +314,7 @@ public final class ActivationGroupDesc { return env; } - + /** * Compare for the content equality. */ @@ -366,7 +366,7 @@ public final class ActivationGroupDesc else return false; } - + /** * Compare for direct equality if one or both parameters are null, otherwise * call .equals. @@ -378,7 +378,7 @@ public final class ActivationGroupDesc else return a.equals(b); } - + /** * Return the hashcode. */ @@ -401,11 +401,11 @@ public final class ActivationGroupDesc if (props!=null) { Enumeration en = props.propertyNames(); - + // Using the intermediate sorted set to ensure that the // properties are sorted. TreeSet pr = new TreeSet(); - + Object key; Object value; while (en.hasMoreElements()) @@ -414,7 +414,7 @@ public final class ActivationGroupDesc if (key!=null) pr.add(key); } - + Iterator it = pr.iterator(); while (it.hasNext()) { diff --git a/libjava/classpath/java/rmi/activation/ActivationGroupID.java b/libjava/classpath/java/rmi/activation/ActivationGroupID.java index e54b2a05d8d..77fa4fba174 100644 --- a/libjava/classpath/java/rmi/activation/ActivationGroupID.java +++ b/libjava/classpath/java/rmi/activation/ActivationGroupID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.rmi.server.UID; * This identifier identifies the activation group inside the scope of its * activation system. It also contains (and can provide) the reference to the * groups activation system. - * + * * @see ActivationSystem#registerGroup(ActivationGroupDesc) */ public class ActivationGroupID @@ -60,7 +60,7 @@ public class ActivationGroupID * The associated activation system. */ final ActivationSystem system; - + /** * The object identifier, making the ID unique. */ @@ -69,7 +69,7 @@ public class ActivationGroupID /** * Create the new activation group id in the scope of the given activation * system - * + * * @param aSystem the activation system */ public ActivationGroupID(ActivationSystem aSystem) @@ -80,7 +80,7 @@ public class ActivationGroupID /** * Get the associated activation system - * + * * @return the associated activation system */ public ActivationSystem getSystem() @@ -110,7 +110,7 @@ public class ActivationGroupID else return false; } - + /** * Get the string representation */ diff --git a/libjava/classpath/java/rmi/activation/ActivationID.java b/libjava/classpath/java/rmi/activation/ActivationID.java index e1cc8a712e1..f89a0edf891 100644 --- a/libjava/classpath/java/rmi/activation/ActivationID.java +++ b/libjava/classpath/java/rmi/activation/ActivationID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -57,7 +57,7 @@ import java.rmi.server.UID; *
          * An instance of the ActivationID has the {@link UID} as its component and * hence is globally unique. - * + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) (from stub) */ public class ActivationID @@ -72,12 +72,12 @@ public class ActivationID * The activator. */ transient Activator activator; - + /** * The UID, making this instance unique. */ - transient UID uid; - + transient UID uid; + /** * The activation group that has activated the object with this * activation id. The field is filled in inside the group and is used @@ -87,7 +87,7 @@ public class ActivationID /** * Create a new instance with the given activator. - * + * * @param an_activator tha activator that should activate the object. */ public ActivationID(Activator an_activator) @@ -95,10 +95,10 @@ public class ActivationID activator = an_activator; uid = new UID(); } - + /** * Activate the object. - * + * * @param force if true, always contact the group. Otherwise, the cached value * may be returned. * @return the activated object @@ -116,7 +116,7 @@ public class ActivationID catch (IOException e) { ActivationException acex = new ActivationException("id "+uid, e); - throw acex; + throw acex; } catch (ClassNotFoundException e) { @@ -124,7 +124,7 @@ public class ActivationID throw acex; } } - + /** * Returns the hash code of the activator. */ @@ -132,7 +132,7 @@ public class ActivationID { return uid == null ? 0 : uid.hashCode(); } - + /** * Compares the activators for equality. */ @@ -146,12 +146,12 @@ public class ActivationID else return false; } - + /** * Read the object from the input stream. - * + * * @param in the stream to read from - * + * * @throws IOException if thrown by the stream * @throws ClassNotFoundException */ @@ -161,10 +161,10 @@ public class ActivationID uid = (UID) in.readObject(); activator = (Activator) in.readObject(); } - + /** * Write the object to the output stream. - * + * * @param out the stream to write int * @throws IOException if thrown by the stream * @throws ClassNotFoundException @@ -175,7 +175,7 @@ public class ActivationID out.writeObject(uid); out.writeObject(activator); } - + /** * Compare by .equals if both a and b are not null, compare directly if at * least one of them is null. @@ -186,7 +186,7 @@ public class ActivationID return a == b; else return a.equals(b); - } + } /** * Return the content based string representation. @@ -195,5 +195,5 @@ public class ActivationID { return uid.toString(); } - + } diff --git a/libjava/classpath/java/rmi/activation/ActivationInstantiator.java b/libjava/classpath/java/rmi/activation/ActivationInstantiator.java index 3f4b557cb91..e4ea5415141 100644 --- a/libjava/classpath/java/rmi/activation/ActivationInstantiator.java +++ b/libjava/classpath/java/rmi/activation/ActivationInstantiator.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.rmi.RemoteException; /** * The implementation of this interface creates (instantiates) the new remote * objects in response to the activation request. The instantiator is returned - * by the {@link ActivationGroup} that calls + * by the {@link ActivationGroup} that calls * {@link ActivationSystem#activeGroup(ActivationGroupID, ActivationInstantiator, long)}. */ public interface ActivationInstantiator @@ -60,7 +60,7 @@ public interface ActivationInstantiator *
        • Creates an instance of the object using its special two parameter * activation constructor, the first parameter being the {@link ActivationID} * and the second the {@link MarshalledObject}.
          • - * + * * @param id the id of the object being instantiated * @param desc the activation descriptor being instantiated * @return the MarshalledObject, containing the stub to the newly created diff --git a/libjava/classpath/java/rmi/activation/ActivationMonitor.java b/libjava/classpath/java/rmi/activation/ActivationMonitor.java index 93def8c441a..7c4c17144f4 100644 --- a/libjava/classpath/java/rmi/activation/ActivationMonitor.java +++ b/libjava/classpath/java/rmi/activation/ActivationMonitor.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,9 +44,9 @@ import java.rmi.Remote; import java.rmi.RemoteException; /** - * The activation and inactivation event listener. The group obtains this + * The activation and inactivation event listener. The group obtains this * listener via {@link ActivationSystem#activeGroup} and must notify it - * when the group objects are activated or inactivated and also when the + * when the group objects are activated or inactivated and also when the * whole group becomes inactive. * @author root. */ @@ -54,7 +54,7 @@ public interface ActivationMonitor extends Remote { /** * Informs that the object is now active. - * + * * @param id the activation id of the object that is now active * @throws UnknownObjectException is such object is not known in this group * @throws RemoteException if remote call fails @@ -64,7 +64,7 @@ public interface ActivationMonitor extends Remote /** * Informs that the object is not inactive. - * + * * @param id the activation id of the object that is now inactive * @throws UnknownObjectException is such object is not known in this group * @throws RemoteException if remote call fails @@ -76,7 +76,7 @@ public interface ActivationMonitor extends Remote * Informs that the whole group is now inactive because all group objects are * inactive. The group will be recreated upon the later request to activate * any object, belonging to the group. - * + * * @param groupId the group id * @param incarnation the group incarnation number * @throws UnknownGroupException if the group id is not known diff --git a/libjava/classpath/java/rmi/activation/ActivationSystem.java b/libjava/classpath/java/rmi/activation/ActivationSystem.java index 719676445f8..090ce48154d 100644 --- a/libjava/classpath/java/rmi/activation/ActivationSystem.java +++ b/libjava/classpath/java/rmi/activation/ActivationSystem.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -66,13 +66,13 @@ public interface ActivationSystem * . */ int SYSTEM_PORT = 1098; - + /** * Registers the activation descriptor and creates (and returns) its * activation identifier. The map entry (identifier to descriptor) is stored * in the stable map and used when the {@link Activator} receives the request * to activate the object. - * + * * @param desc the activation descriptor to register. * @return the created activation identifier that is mapped to the passed * descriptor. @@ -84,11 +84,11 @@ public interface ActivationSystem */ ActivationID registerObject(ActivationDesc desc) throws ActivationException, UnknownGroupException, RemoteException; - + /** * Removes the stored identifier-description map entry. The object will no * longer be activable using the passed activation id - * + * * @param id the activation id to remove * @throws ActivationException if the entry removing operation failed * (database update problems, etc) @@ -97,11 +97,11 @@ public interface ActivationSystem */ void unregisterObject(ActivationID id) throws ActivationException, UnknownObjectException, RemoteException; - + /** * Register the new activation group. For instance, it can be one activation * group per virtual machine. - * + * * @param groupDesc the activation group descriptor. * @return the created activation group ID for the activation group * @throws ActivationException if the group registration fails @@ -109,13 +109,13 @@ public interface ActivationSystem */ ActivationGroupID registerGroup(ActivationGroupDesc groupDesc) throws ActivationException, RemoteException; - + /** * This method is called from the {@link ActivationGroup} to inform the * ActivatinSystem that the group is now active and there is the * {@link ActivationInstantiator} for that group. This call is made internally * from the {@link ActivationGroup#createGroup}. - * + * * @param id the group id * @param group the group activation instantiator * @param incarnation the groups incarnatin number. @@ -132,7 +132,7 @@ public interface ActivationSystem /** * Removes the activation group with the given identifier. The group calls * back, informing the activator about the shutdown. - * + * * @param id the group activation id. * @throws ActivationException if the database update fails * @throws UnknownGroupException if such group is not registered @@ -140,10 +140,10 @@ public interface ActivationSystem */ void unregisterGroup(ActivationGroupID id) throws ActivationException, UnknownGroupException, RemoteException; - + /** * Shutdown the activation system and all associated activation groups - * + * * @throws RemoteException if the remote call fails */ void shutdown() throws RemoteException; @@ -151,7 +151,7 @@ public interface ActivationSystem /** * Replace the activation descriptor for the object with the given activation * id. - * + * * @param id the activation id * @param desc the new activation descriptor * @return the previous activation descriptor for that object. @@ -164,11 +164,11 @@ public interface ActivationSystem ActivationDesc setActivationDesc(ActivationID id, ActivationDesc desc) throws ActivationException, UnknownObjectException, UnknownGroupException, RemoteException; - + /** * Replaces the group descriptor for the group with the given group activation * id. - * + * * @param groupId the group id * @param groupDesc the new group descriptor * @return the previous group descriptor @@ -179,10 +179,10 @@ public interface ActivationSystem ActivationGroupDesc setActivationGroupDesc(ActivationGroupID groupId, ActivationGroupDesc groupDesc) throws ActivationException, UnknownGroupException, RemoteException; - + /** * Get the activation descriptor for the object with the given activation id. - * + * * @param id the object activation id * @return the activation descriptor for that object * @throws ActivationException if the database access fails @@ -191,10 +191,10 @@ public interface ActivationSystem */ ActivationDesc getActivationDesc(ActivationID id) throws ActivationException, UnknownObjectException, RemoteException; - + /** * Get the group descriptor for the group with the given id. - * + * * @param groupId the group id * @return the group descriptor * @throws ActivationException if the database access fails diff --git a/libjava/classpath/java/rmi/activation/Activator.java b/libjava/classpath/java/rmi/activation/Activator.java index d0de12d8c97..fc66b2b6322 100644 --- a/libjava/classpath/java/rmi/activation/Activator.java +++ b/libjava/classpath/java/rmi/activation/Activator.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -58,7 +58,7 @@ public interface Activator * identifier, determines the object activation group and initiates object * recreation either via {@link ActivationInstantiator} or via * {@link Class#newInstance()}. - * + * * @param id the identifier of the object to activate. * @param force if true, the activator always contacts the group to obtain the * reference. If false, it may return the cached value. diff --git a/libjava/classpath/java/rmi/activation/UnknownGroupException.java b/libjava/classpath/java/rmi/activation/UnknownGroupException.java index 91890a9073d..3c67aec0c74 100644 --- a/libjava/classpath/java/rmi/activation/UnknownGroupException.java +++ b/libjava/classpath/java/rmi/activation/UnknownGroupException.java @@ -1,4 +1,4 @@ -/* UnknownGroupException.java -- thrown on an invalid ActivationGroupID +/* UnknownGroupException.java -- thrown on an invalid ActivationGroupID Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/dgc/DGC.java b/libjava/classpath/java/rmi/dgc/DGC.java index 66bfc6dfd62..5ec874a5ed3 100644 --- a/libjava/classpath/java/rmi/dgc/DGC.java +++ b/libjava/classpath/java/rmi/dgc/DGC.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,7 +56,7 @@ public interface DGC { /** * Mark the given objects referecnes as used on the client side. - * + * * @param ids the ids of the used objects. * @param sequenceNum the number of the call (used to detect and discard late * calls). @@ -68,7 +68,7 @@ public interface DGC /** * Mark the given objects as no longer used on the client side. - * + * * @param ids the ids of the objects that are no longer used. * @param sequenceNum the number of the call (used to detect and discard late * @param vmid the VMID of the client. diff --git a/libjava/classpath/java/rmi/dgc/Lease.java b/libjava/classpath/java/rmi/dgc/Lease.java index 36ff12ad224..58b82cf580a 100644 --- a/libjava/classpath/java/rmi/dgc/Lease.java +++ b/libjava/classpath/java/rmi/dgc/Lease.java @@ -56,7 +56,7 @@ public final class Lease /** * Create the new lease with the given id and duration - * + * * @param id the lease id * @param duration the lease duration */ @@ -68,7 +68,7 @@ public final class Lease /** * Get the lease id. - * + * * @return the lease id */ public VMID getVMID() @@ -78,7 +78,7 @@ public final class Lease /** * Get the lease duration - * + * * @return the lease duration */ public long getValue() @@ -88,7 +88,7 @@ public final class Lease /** * Get the string representation of this lease - * + * * @return the string represenation (lease id, followed by the lease * duration). */ diff --git a/libjava/classpath/java/rmi/dgc/VMID.java b/libjava/classpath/java/rmi/dgc/VMID.java index 22b737367df..925c1bfb1f3 100644 --- a/libjava/classpath/java/rmi/dgc/VMID.java +++ b/libjava/classpath/java/rmi/dgc/VMID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,24 +49,24 @@ import java.util.Arrays; * An identifier that is unique accross the all virtual machines. This class is * used by distributed garbage collector to identify the virtual machine of * the client, but may also be used in various other cases, when such identifier - * is required. This class separately stores and transfers the host IP + * is required. This class separately stores and transfers the host IP * address, but will try to do its best also for the case if it failed to - * determine it. The alternative algorithms are used in {@link UID} that is + * determine it. The alternative algorithms are used in {@link UID} that is * part of this class. The VMID's, created on the same host, but in the two * separately (parallely) running virtual machines are different. */ -public final class VMID implements Serializable +public final class VMID implements Serializable { /** * Use SVUID for interoperability. */ static final long serialVersionUID = -538642295484486218L; - + /** * If true, the IP of this host can ve reliably determined. */ static boolean areWeUnique; - + /** * The IP address of the local host. */ @@ -76,12 +76,12 @@ public final class VMID implements Serializable * The IP address of the local host. */ private byte[] addr; - + /** * The cached hash code. */ transient int hash; - + /** * The UID of this VMID. */ @@ -89,7 +89,7 @@ public final class VMID implements Serializable static { - // This "local host" value usually indicates that the local + // This "local host" value usually indicates that the local // IP address cannot be reliably determined. byte[] localHost = new byte[] { 127, 0, 0, 1 }; @@ -104,10 +104,10 @@ public final class VMID implements Serializable areWeUnique = false; } } - + /** * Create the new VMID. All VMID's are unique accross tha all virtual - * machines. + * machines. */ public VMID() { @@ -119,11 +119,11 @@ public final class VMID implements Serializable * Return true if it is possible to get the accurate address of this host. * If false is returned, the created VMID's are less reliable, but the * starting time and possibly the memory allocation are also taken into - * consideration in the incorporated UID. Hence the VMID's, created on the + * consideration in the incorporated UID. Hence the VMID's, created on the * different virtual machines, still should be different. - * + * * @deprecated VMID's are more or less always reliable. - * + * * @return false if the local host ip address is 127.0.0.1 or unknown, * true otherwise. */ @@ -131,7 +131,7 @@ public final class VMID implements Serializable { return areWeUnique; } - + /** * Get the hash code of this VMID. */ @@ -145,7 +145,7 @@ public final class VMID implements Serializable } return hash; } - + /** * Returns true if the passed parameter is also VMID and it is equal to this * VMID. The VMID should only be equal to itself (also if the passed value is @@ -164,24 +164,24 @@ public final class VMID implements Serializable return false; } - + /** * Get the string representation of this VMID. */ public String toString () { CPStringBuilder buf = new CPStringBuilder ("[VMID: "); - + for (int i = 0; i < addr.length; i++) { if (i > 0) { buf.append ("."); } - + buf.append (Integer.toString (addr [i])); } - + buf.append (" "); buf.append (uid.toString ()); buf.append ("]"); diff --git a/libjava/classpath/java/rmi/registry/LocateRegistry.java b/libjava/classpath/java/rmi/registry/LocateRegistry.java index 3547a7ad0f4..d0918e1b904 100644 --- a/libjava/classpath/java/rmi/registry/LocateRegistry.java +++ b/libjava/classpath/java/rmi/registry/LocateRegistry.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,32 +56,32 @@ public final class LocateRegistry { private LocateRegistry() {} public static Registry getRegistry() throws RemoteException { - return (getRegistry("localhost", Registry.REGISTRY_PORT)); + return (getRegistry("localhost", Registry.REGISTRY_PORT)); } public static Registry getRegistry(int port) throws RemoteException { - return (getRegistry("localhost", port)); + return (getRegistry("localhost", port)); } public static Registry getRegistry(String host) throws RemoteException { - return (getRegistry(host, Registry.REGISTRY_PORT)); + return (getRegistry(host, Registry.REGISTRY_PORT)); } public static Registry getRegistry(String host, int port) throws RemoteException { - return (getRegistry(host, port, RMISocketFactory.getSocketFactory())); + return (getRegistry(host, port, RMISocketFactory.getSocketFactory())); } public static Registry getRegistry(String host, int port, RMIClientSocketFactory csf) throws RemoteException { - RemoteRef ref = new UnicastRef(new ObjID(ObjID.REGISTRY_ID), host, port, csf); - return (new RegistryImpl_Stub(ref)); + RemoteRef ref = new UnicastRef(new ObjID(ObjID.REGISTRY_ID), host, port, csf); + return (new RegistryImpl_Stub(ref)); } public static Registry createRegistry(int port) throws RemoteException { - return (createRegistry(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory())); + return (createRegistry(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory())); } public static Registry createRegistry(int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) throws RemoteException { - return (new RegistryImpl(port, csf, ssf)); + return (new RegistryImpl(port, csf, ssf)); } } diff --git a/libjava/classpath/java/rmi/registry/Registry.java b/libjava/classpath/java/rmi/registry/Registry.java index 02d8c50cc2a..dabe6549cf9 100644 --- a/libjava/classpath/java/rmi/registry/Registry.java +++ b/libjava/classpath/java/rmi/registry/Registry.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,25 +47,25 @@ import java.rmi.RemoteException; public interface Registry extends Remote { int REGISTRY_PORT = 1099; - + /** * Find and return the reference to the object that was previously bound * to the registry by this name. For remote objects, this method returns * the stub instances, containing the code for remote invocations. - * - * Since jdk 1.5 this method does not longer require the stub class - * (nameImpl_Stub) to be present. If such class is not found, the stub is - * replaced by the dynamically constructed proxy class. No attempt to find - * and load the stubs is made if the system property - * java.rmi.server.ignoreStubClasses is set to true (set to reduce the + * + * Since jdk 1.5 this method does not longer require the stub class + * (nameImpl_Stub) to be present. If such class is not found, the stub is + * replaced by the dynamically constructed proxy class. No attempt to find + * and load the stubs is made if the system property + * java.rmi.server.ignoreStubClasses is set to true (set to reduce the * starting time if the stubs are surely not present and exclusively 1.2 * RMI is used). - * + * * @param name the name of the object - * + * * @return the reference to that object on that it is possible to invoke * the (usually remote) object methods. - * + * * @throws RemoteException * @throws NotBoundException * @throws AccessException diff --git a/libjava/classpath/java/rmi/registry/RegistryHandler.java b/libjava/classpath/java/rmi/registry/RegistryHandler.java index b9b45092305..19e8caa70b9 100644 --- a/libjava/classpath/java/rmi/registry/RegistryHandler.java +++ b/libjava/classpath/java/rmi/registry/RegistryHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/LoaderHandler.java b/libjava/classpath/java/rmi/server/LoaderHandler.java index 8e966156475..de9d6532fa9 100644 --- a/libjava/classpath/java/rmi/server/LoaderHandler.java +++ b/libjava/classpath/java/rmi/server/LoaderHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/LogStream.java b/libjava/classpath/java/rmi/server/LogStream.java index a2dfbb47fcc..a74ffb4398b 100644 --- a/libjava/classpath/java/rmi/server/LogStream.java +++ b/libjava/classpath/java/rmi/server/LogStream.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -72,7 +72,7 @@ public class LogStream extends PrintStream { return defStream; } - + /** * @deprecated */ @@ -130,17 +130,17 @@ public class LogStream extends PrintStream { return SILENT; } - + if (s.equalsIgnoreCase ("brief")) { return BRIEF; } - + if (s.equalsIgnoreCase ("verbose")) { return VERBOSE; } - + return SILENT; } } diff --git a/libjava/classpath/java/rmi/server/ObjID.java b/libjava/classpath/java/rmi/server/ObjID.java index 1aaa223602c..2bdd44ae02e 100644 --- a/libjava/classpath/java/rmi/server/ObjID.java +++ b/libjava/classpath/java/rmi/server/ObjID.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.io.Serializable; * Represents the object identifier, unique for the host that generated it. * The ObjID contains inside the integer object identifier that, if needed, * may indicated that this is a reference to one of the well known objects - * on that host (registry, activator or dgc) and the {@link UID} that + * on that host (registry, activator or dgc) and the {@link UID} that * ensures uniqueness. */ public final class ObjID @@ -121,7 +121,7 @@ public final class ObjID *
        • {@link #DGC_ID} - distributed garbage collector (grants lease * durations to keep the object before it is garbage collected.
          • *
        - * + * * @param id the well known object id, one of the above. */ public ObjID(int id) @@ -184,8 +184,8 @@ public final class ObjID return a == b; else return a.equals(b); - } - + } + /** * Get the string representation. */ diff --git a/libjava/classpath/java/rmi/server/Operation.java b/libjava/classpath/java/rmi/server/Operation.java index f7b5f02cc0b..de30cd08ac1 100644 --- a/libjava/classpath/java/rmi/server/Operation.java +++ b/libjava/classpath/java/rmi/server/Operation.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,7 +40,7 @@ package java.rmi.server; /** * This class was used with jdk 1.1 stubs and skeletons. It is no longer * needed since jdk 1.2 and higher. - * + * * @deprecated */ public class Operation @@ -58,7 +58,7 @@ public class Operation /** * Get the name of the operation. - * + * * @deprecated */ public String getOperation () @@ -68,7 +68,7 @@ public class Operation /** * Return the name of the operation. - * + * * @deprecated */ public String toString () diff --git a/libjava/classpath/java/rmi/server/RMIClassLoader.java b/libjava/classpath/java/rmi/server/RMIClassLoader.java index 7b69d2f2c72..f43a68c5b29 100644 --- a/libjava/classpath/java/rmi/server/RMIClassLoader.java +++ b/libjava/classpath/java/rmi/server/RMIClassLoader.java @@ -74,7 +74,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codebase, name, null); } @@ -84,7 +84,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codebase, name, defaultLoader); } @@ -120,29 +120,29 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.loadClass(codeBase.toString(), name, null); } /** * Gets a classloader for the given codebase and with the current * context classloader as parent. - * + * * @param codebase - * + * * @return a classloader for the given codebase - * + * * @throws MalformedURLException if the codebase contains a malformed URL */ - public static ClassLoader getClassLoader(String codebase) + public static ClassLoader getClassLoader(String codebase) throws MalformedURLException { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.getClassLoader(codebase); } - + /** * Returns a string representation of the network location where a remote * endpoint can get the class-definition of the given class. @@ -156,7 +156,7 @@ public class RMIClassLoader { RMIClassLoaderSpi spi = getProviderInstance(); if (spi == null) - spi = getDefaultProviderInstance(); + spi = getDefaultProviderInstance(); return spi.getClassAnnotation(cl); } diff --git a/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java b/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java index a54d11175e0..ee829fb29de 100644 --- a/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMIClientSocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/RMIFailureHandler.java b/libjava/classpath/java/rmi/server/RMIFailureHandler.java index 3496cd6a073..68a5706ed0a 100644 --- a/libjava/classpath/java/rmi/server/RMIFailureHandler.java +++ b/libjava/classpath/java/rmi/server/RMIFailureHandler.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java b/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java index 88eaff32dbc..7af8ef06908 100644 --- a/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMIServerSocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/RMISocketFactory.java b/libjava/classpath/java/rmi/server/RMISocketFactory.java index 953f1ef33ce..af5a12072ad 100644 --- a/libjava/classpath/java/rmi/server/RMISocketFactory.java +++ b/libjava/classpath/java/rmi/server/RMISocketFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/RemoteCall.java b/libjava/classpath/java/rmi/server/RemoteCall.java index 35f3bf1a655..cd4b004d8ca 100644 --- a/libjava/classpath/java/rmi/server/RemoteCall.java +++ b/libjava/classpath/java/rmi/server/RemoteCall.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/RemoteObject.java b/libjava/classpath/java/rmi/server/RemoteObject.java index 5b926bfc34e..220c1c95b5b 100644 --- a/libjava/classpath/java/rmi/server/RemoteObject.java +++ b/libjava/classpath/java/rmi/server/RemoteObject.java @@ -48,7 +48,7 @@ import java.rmi.UnmarshalException; import java.util.WeakHashMap; public abstract class RemoteObject - implements Remote, Serializable { + implements Remote, Serializable { private static final long serialVersionUID = -3215090123894869218l; @@ -57,15 +57,15 @@ protected transient RemoteRef ref; private static final WeakHashMap stubs = new WeakHashMap(); protected RemoteObject() { - this(null); + this(null); } protected RemoteObject(RemoteRef newref) { - ref = newref; + ref = newref; } public RemoteRef getRef() { - return (ref); + return (ref); } synchronized static void addStub(Remote obj, Remote stub) @@ -78,7 +78,7 @@ synchronized static void deleteStub(Remote obj) stubs.remove(obj); } - public static Remote toStub(Remote obj) throws NoSuchObjectException + public static Remote toStub(Remote obj) throws NoSuchObjectException { Remote stub = (Remote)stubs.get(obj); @@ -89,36 +89,36 @@ synchronized static void deleteStub(Remote obj) } public int hashCode() { - if (ref == null) { - return (0); - } - else { - return (ref.hashCode()); - } + if (ref == null) { + return (0); + } + else { + return (ref.hashCode()); + } } public boolean equals(Object obj) { - // We only compare references. - return (this == obj); + // We only compare references. + return (this == obj); } /** * Get the string representation of this remote object. */ - public String toString() + public String toString() { if (ref == null) return getClass ().toString (); return (ref.toString ()); } - + /** * Read the remote object from the input stream. Expects the class name * without package first. Then the method creates and assigns the {@link #ref} * an instance of this class and calls its .readExternal method. The standard * packageless class names are UnicastRef, UnicastRef2, UnicastServerRef, * UnicastServerRef2, ActivatableRef or ActivatableServerRef. - * + * * @param in the stream to read from * @throws IOException if the IO exception occurs * @throws ClassNotFoundException if the class with the given name is not @@ -171,7 +171,7 @@ public boolean equals(Object obj) { * ActivatableRef or ActivatableServerRef. The empty string with the * subsequently following serialized ref instance be written if the * ref.getRefClass returns null. - * + * * @param out the stream to write to * @throws IOException if one occurs during writing * @throws ClassNotFoundException never in this implementation (specified as diff --git a/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java b/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java index 2c19cd5afc4..0cf4bca989a 100644 --- a/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java +++ b/libjava/classpath/java/rmi/server/RemoteObjectInvocationHandler.java @@ -60,7 +60,7 @@ import java.util.Hashtable; * user program. Such instances are automatically created and returned by * {@link Registry} or {@link UnicastRemoteObject} methods if the remote * reference is known but the corresponding stub class is not accessible. - * + * * @see Registry#lookup * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) @@ -72,32 +72,32 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements * Use the jdk 1.5 SUID for interoperability. */ static final long serialVersionUID = 2L; - + /** * The RMI method hash codes, computed once as described in the section 8.3 * of the Java Remote Method Invocation (RMI) Specification. */ static Hashtable methodHashCodes = new Hashtable(); - + /** * The empty class array to define parameters of .hashCode and .toString. */ static final Class[] noArgsC = new Class[0]; - + /** * The class array to define parameters of .equals */ static final Class[] anObjectC = new Class[] { Object.class }; - + /** * The empty object array to replace null when no args are passed. */ static final Object[] noArgs = new Object[0]; - + /** * Construct the remote invocation handler that forwards calls to the given * remote object. - * + * * @param reference the reference to the remote object where the method * calls should be forwarded. */ @@ -121,7 +121,7 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements *
      13. All other methods are converted to remote calls and forwarded to the * remote reference.
        14. * - * + * * @param proxyInstance * the instance of the proxy stub * @param method @@ -148,7 +148,7 @@ public class RemoteObjectInvocationHandler extends RemoteObject implements throw new IllegalAccessException(name + " does not implement " + Remote.class.getName()); } - + if (parameters == null) parameters = noArgs; diff --git a/libjava/classpath/java/rmi/server/RemoteRef.java b/libjava/classpath/java/rmi/server/RemoteRef.java index 8bdb6633040..e0488fb4c67 100644 --- a/libjava/classpath/java/rmi/server/RemoteRef.java +++ b/libjava/classpath/java/rmi/server/RemoteRef.java @@ -1,5 +1,5 @@ /* RemoteRef.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,7 +56,7 @@ public interface RemoteRef extends Externalizable * Indicates compatibility with JDK 1.1.* */ long serialVersionUID = 3632638527362204081L; - + /** * For binary compatibility with the JDK, the string "sun.rmi.server". * Not actually used for anything. @@ -67,12 +67,12 @@ public interface RemoteRef extends Externalizable * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ void invoke (RemoteCall call) throws Exception; - + /** * Invoke a method. This method either returns the result of remote invocation * or throws RemoteException if the remote call failed. Other exceptions may * be thrown if some problem has occured in the application level. - * + * * @param obj the object, containing the remote reference (for instance, * remote stub, generated by rmic). * @param method the method to invoke @@ -85,7 +85,7 @@ public interface RemoteRef extends Externalizable */ Object invoke (Remote obj, Method method, Object[] params, long methodHash) throws Exception; - + /** * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ @@ -96,41 +96,41 @@ public interface RemoteRef extends Externalizable * @deprecated use {@link #invoke(Remote, Method, Object[], long)} instead. */ void done (RemoteCall call) throws RemoteException; - + /** * Compare two remote objects for equality. The references are equal if * they point to the same remote object. - * + * * @param ref the reference to compare. - * + * * @return true if this and passed references both point to the same remote * object, false otherwise. */ boolean remoteEquals (RemoteRef ref); - + /** * Get the hashcode for a remote object. Two remote object stubs, referring * to the same remote object, have the same hash code. - * + * * @return the hashcode of the remote object */ int remoteHashCode(); - - + + /** * Returns the class name of the reference type that must be written to the * given stream. When writing, this returned name is passed first, and * the reference.writeExternal(out) writes the reference specific data. - * - * @param out the stream, where the data must be written - * - * @return the class name. + * + * @param out the stream, where the data must be written + * + * @return the class name. */ String getRefClass (ObjectOutput out); - + /** * Get the string representation of this remote reference. - * + * * @return the string representation. */ String remoteToString(); diff --git a/libjava/classpath/java/rmi/server/RemoteServer.java b/libjava/classpath/java/rmi/server/RemoteServer.java index f022b732604..158c4643919 100644 --- a/libjava/classpath/java/rmi/server/RemoteServer.java +++ b/libjava/classpath/java/rmi/server/RemoteServer.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -51,7 +51,7 @@ public abstract class RemoteServer extends RemoteObject { private static final long serialVersionUID = - 4100238210092549637L; - + /** * Does nothing, delegates to super(). */ @@ -59,7 +59,7 @@ public abstract class RemoteServer { super(); } - + /** * Does nothing, delegates to super(ref). */ @@ -67,13 +67,13 @@ public abstract class RemoteServer { super(ref); } - + /** * Get the host of the calling client. The current thread must be an instance * of the {@link RMIIncomingThread}. - * + * * @return the client host address - * + * * @throws ServerNotActiveException if the current thread is not an instance * of the RMIIncomingThread. */ @@ -91,20 +91,20 @@ public abstract class RemoteServer "Unknown client host - current thread not instance of 'RMIIncomingThread'"); } } - + /** * Set the stream for logging RMI calls. - * + * * @param out the stream to set or null to turn the logging off. */ public static void setLog(OutputStream out) { throw new Error("Not implemented"); } - + /** * Get the stream for logging RMI calls. - * + * * @return the associated stream. */ public static PrintStream getLog() diff --git a/libjava/classpath/java/rmi/server/RemoteStub.java b/libjava/classpath/java/rmi/server/RemoteStub.java index d6dff7fadc8..9fd5846ee29 100644 --- a/libjava/classpath/java/rmi/server/RemoteStub.java +++ b/libjava/classpath/java/rmi/server/RemoteStub.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,7 +38,7 @@ exception statement from your version. */ package java.rmi.server; /** - * This is a base class for the automatically generated RMI stubs. + * This is a base class for the automatically generated RMI stubs. */ public abstract class RemoteStub extends RemoteObject { @@ -46,7 +46,7 @@ public abstract class RemoteStub extends RemoteObject * Use serialVersionUID for interoperability. */ static final long serialVersionUID = -1585587260594494182l; - + /** * Constructs the remote stub with no reference set. */ @@ -54,11 +54,11 @@ public abstract class RemoteStub extends RemoteObject { super (); } - + /** * Constructs the remote stub that uses given remote reference for the * method invocations. - * + * * @param ref the remote reference for the method invocation. */ protected RemoteStub (RemoteRef ref) @@ -67,10 +67,10 @@ public abstract class RemoteStub extends RemoteObject } /** - * Sets the given remote reference for the given stub. This method is + * Sets the given remote reference for the given stub. This method is * deprecated. Pass the stub remote reference to the RemoteStub * constructor instead. - * + * * @deprecated */ protected static void setRef (RemoteStub stub, RemoteRef ref) diff --git a/libjava/classpath/java/rmi/server/ServerRef.java b/libjava/classpath/java/rmi/server/ServerRef.java index cf1013cf02b..5d34ef2e21f 100644 --- a/libjava/classpath/java/rmi/server/ServerRef.java +++ b/libjava/classpath/java/rmi/server/ServerRef.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/Skeleton.java b/libjava/classpath/java/rmi/server/Skeleton.java index 82f5d3837f4..94d57986b29 100644 --- a/libjava/classpath/java/rmi/server/Skeleton.java +++ b/libjava/classpath/java/rmi/server/Skeleton.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/rmi/server/UID.java b/libjava/classpath/java/rmi/server/UID.java index 940339e813a..464d3d8606b 100644 --- a/libjava/classpath/java/rmi/server/UID.java +++ b/libjava/classpath/java/rmi/server/UID.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,8 +49,8 @@ import java.net.InetAddress; * it. It contains time (when created), counter (the number of the UID * creation order) and virtual machine id components. The UID can also be * constructed specifying a "well known" identifier in the for of short: - * this identifier defines the UID uniqueness alone. - * + * this identifier defines the UID uniqueness alone. + * * @author Audrius Meskauskas (audriusa@bioinformatics.org) */ public final class UID @@ -60,16 +60,16 @@ public final class UID * Use the serial version uid for interoperability. */ private static final long serialVersionUID = 1086053664494604050L; - + /** * The UID counter (the ordinary number in the sequence of number of UID's, - * created during the recent millisecond). In the next millisecond, it + * created during the recent millisecond). In the next millisecond, it * starts from the minimal value again. In the unlikely case of creating * more than 65536 uids per millisecond the process pauses till the next * ms. */ private static short uidCounter = Short.MIN_VALUE; - + /** * The time, when the last UID has been created. */ @@ -94,7 +94,7 @@ public final class UID * The time stamp, when the UID was created. */ private long time; - + /** * Create the new UID that would have the described features of the * uniqueness. @@ -130,19 +130,19 @@ public final class UID } } } - + /** * Create the new UID with the well known id (number). All UIDs, creates * with the this constructor having the same parameter are equal to each * other (regardless to the host and time where they were created. - * + * * @param wellKnownId the well known UID. */ public UID(short wellKnownId) { unique = wellKnownId; } - + /** * Get the hashCode of this UID. */ @@ -150,7 +150,7 @@ public final class UID { return (int) (unique ^ time ^ count); } - + /** * Compare this UID with another UID for equality (not equal to other types of * objects). @@ -165,7 +165,7 @@ public final class UID else return false; } - + public static UID read(DataInput in) throws IOException { UID uid = new UID(); @@ -208,10 +208,10 @@ public final class UID return new Object().hashCode() ^ (int) System.currentTimeMillis() ^ hostIpHash; } - + /** * Get the string representation of this UID. - * + * * @return a string, uniquely identifying this id. */ public String toString() diff --git a/libjava/classpath/java/rmi/server/UnicastRemoteObject.java b/libjava/classpath/java/rmi/server/UnicastRemoteObject.java index 6ef3432b567..b6a97212605 100644 --- a/libjava/classpath/java/rmi/server/UnicastRemoteObject.java +++ b/libjava/classpath/java/rmi/server/UnicastRemoteObject.java @@ -1,5 +1,5 @@ /* UnicastRemoteObject.java -- - Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2006 + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,7 +46,7 @@ import java.rmi.Remote; import java.rmi.RemoteException; /** - * This class obtains stub that communicates with the remote object. + * This class obtains stub that communicates with the remote object. */ public class UnicastRemoteObject extends RemoteServer { @@ -57,19 +57,19 @@ public class UnicastRemoteObject extends RemoteServer //The following serialized fields are from Java API Documentation // "Serialized form" - + /** * The port, on that the created remote object becomes available, * zero meaning the anonymous port. */ private int port; - + /** * The client socket factory for producing client sockets, used by this * object. */ private RMIClientSocketFactory csf; - + /** * The server socket factory for producing server sockets, used by this * object. @@ -78,44 +78,44 @@ public class UnicastRemoteObject extends RemoteServer /** * Create and export new remote object without specifying the port value. - * + * * @throws RemoteException if the attempt to export the object failed. */ protected UnicastRemoteObject() throws RemoteException { - this(0); + this(0); } - + /** * Create and export the new remote object, making it available at the * given port, local host. - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @throws RemoteException if the attempt to export the object failed. */ protected UnicastRemoteObject(int port) throws RemoteException { - this(port, RMISocketFactory.getSocketFactory(), + this(port, RMISocketFactory.getSocketFactory(), RMISocketFactory.getSocketFactory()); } /** * Create and export the new remote object, making it available at the * given port, using sockets, produced by the specified factories. - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @param clientSocketFactory the client socket factory * @param serverSocketFactory the server socket factory - * + * * @throws RemoteException if the attempt to export the object failed. */ - protected UnicastRemoteObject(int port, + protected UnicastRemoteObject(int port, RMIClientSocketFactory clientSocketFactory, RMIServerSocketFactory serverSocketFactory) throws RemoteException @@ -131,53 +131,53 @@ public class UnicastRemoteObject extends RemoteServer protected UnicastRemoteObject(RemoteRef ref) throws RemoteException { - super((UnicastServerRef) ref); - exportObject(this, 0); + super((UnicastServerRef) ref); + exportObject(this, 0); } public Object clone() throws CloneNotSupportedException { - throw new Error("Not implemented"); + throw new Error("Not implemented"); } - + /** - * Export object, making it available for the remote calls at the - * anonymous port. - * + * Export object, making it available for the remote calls at the + * anonymous port. + * * This method returns the instance of the abstract class, not an interface. * Hence it will not work with the proxy stubs that are supported since * jdk 1.5 (such stubs cannot be derived from the RemoteStub). Only use * this method if you are sure that the stub class will be accessible. - * + * * @param obj the object being exported. - * + * * @return the remote object stub - * + * * @throws RemoteException if the attempt to export the object failed. */ public static RemoteStub exportObject(Remote obj) throws RemoteException { - return (RemoteStub) exportObject(obj, 0); + return (RemoteStub) exportObject(obj, 0); } /** - * Export object, making it available for the remote calls at the + * Export object, making it available for the remote calls at the * specified port. - * + * * Since jdk 1.5 this method does not longer require the stub class to be - * present. If such class is not found, the stub is replaced by the + * present. If such class is not found, the stub is replaced by the * dynamically constructed proxy class. No attempt to find and load the stubs * is made if the system property java.rmi.server.ignoreStubClasses - * is set to true (set to reduce the starting time if the stubs are + * is set to true (set to reduce the starting time if the stubs are * surely not present and exclusively 1.2 RMI is used). - * + * * @param obj the object being exported. * @param port the remote object port - * + * * @return the remote object stub - * + * * @throws RemoteException if the attempt to export the object failed. */ public static Remote exportObject(Remote obj, int port) @@ -189,21 +189,21 @@ public class UnicastRemoteObject extends RemoteServer /** * Create and export the new remote object, making it available at the * given port, using sockets, produced by the specified factories. - * + * * Since jdk 1.5 this method does not longer require the stub class to be - * present. If such class is not found, the stub is replaced by the + * present. If such class is not found, the stub is replaced by the * dynamically constructed proxy class. No attempt to find and load the stubs * is made if the system property java.rmi.server.ignoreStubClasses - * is set to true (set to reduce the starting time if the stubs are + * is set to true (set to reduce the starting time if the stubs are * surely not present and exclusively 1.2 RMI is used). - * + * * @param port the port, on that the object should become available. * Zero means anonymous port. - * + * * @param serverSocketFactory the server socket factory - */ - static Remote exportObject(Remote obj, int port, - RMIServerSocketFactory serverSocketFactory) + */ + static Remote exportObject(Remote obj, int port, + RMIServerSocketFactory serverSocketFactory) throws RemoteException { UnicastServerRef sref = null; @@ -224,13 +224,13 @@ public class UnicastRemoteObject extends RemoteServer public static Remote exportObject(Remote obj, int port, RMIClientSocketFactory csf, RMIServerSocketFactory ssf) - throws RemoteException + throws RemoteException { return (exportObject(obj, port, ssf)); } - public static boolean unexportObject(Remote obj, boolean force) - throws NoSuchObjectException + public static boolean unexportObject(Remote obj, boolean force) + throws NoSuchObjectException { if (obj instanceof RemoteObject) { diff --git a/libjava/classpath/java/rmi/server/Unreferenced.java b/libjava/classpath/java/rmi/server/Unreferenced.java index 982aa64458f..6d4df48bc41 100644 --- a/libjava/classpath/java/rmi/server/Unreferenced.java +++ b/libjava/classpath/java/rmi/server/Unreferenced.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/AccessControlContext.java b/libjava/classpath/java/security/AccessControlContext.java index ffcfc0e41af..fd964751c20 100644 --- a/libjava/classpath/java/security/AccessControlContext.java +++ b/libjava/classpath/java/security/AccessControlContext.java @@ -40,8 +40,8 @@ package java.security; import java.util.HashSet; /** - * AccessControlContext makes system resource access decsion - * based on permission rights. + * AccessControlContext makes system resource access decsion + * based on permission rights. * * It is used for a specific context and has only one method * checkPermission. It is similar to AccessController except @@ -60,7 +60,7 @@ public final class AccessControlContext /** * Construct a new AccessControlContext with the specified - * ProtectionDomains. context must not be + * ProtectionDomains. context must not be * null and duplicates will be removed. * * @param context The ProtectionDomains to use @@ -87,29 +87,29 @@ public final class AccessControlContext * @since 1.3 */ public AccessControlContext(AccessControlContext acc, - DomainCombiner combiner) + DomainCombiner combiner) { AccessControlContext acc2 = null; SecurityManager sm = System.getSecurityManager (); if (sm != null) { - Permission perm = - new SecurityPermission ("createAccessControlContext"); + Permission perm = + new SecurityPermission ("createAccessControlContext"); - // The default SecurityManager.checkPermission(perm) just calls - // AccessController.checkPermission(perm) which in turn just - // calls AccessController.getContext().checkPermission(perm). - // This means AccessController.getContext() is called twice, - // once for the security check and once by us. It's a very - // expensive call (on gcj at least) so if we're using the - // default security manager we avoid this duplication. - if (sm.getClass() == SecurityManager.class) - { - acc2 = AccessController.getContext (); - acc2.checkPermission (perm); - } - else - sm.checkPermission (perm); + // The default SecurityManager.checkPermission(perm) just calls + // AccessController.checkPermission(perm) which in turn just + // calls AccessController.getContext().checkPermission(perm). + // This means AccessController.getContext() is called twice, + // once for the security check and once by us. It's a very + // expensive call (on gcj at least) so if we're using the + // default security manager we avoid this duplication. + if (sm.getClass() == SecurityManager.class) + { + acc2 = AccessController.getContext (); + acc2.checkPermission (perm); + } + else + sm.checkPermission (perm); } if (acc2 == null) acc2 = AccessController.getContext (); @@ -137,7 +137,7 @@ public final class AccessControlContext /** * Determines whether or not the specific permission is granted - * depending on the context it is within. + * depending on the context it is within. * * @param perm a permission to check * @@ -146,19 +146,19 @@ public final class AccessControlContext public void checkPermission(Permission perm) throws AccessControlException { if (protectionDomains.length == 0) - throw new AccessControlException ("permission " - + perm - + " not granted: no protection domains"); + throw new AccessControlException ("permission " + + perm + + " not granted: no protection domains"); for (int i = 0; i < protectionDomains.length; i++) { - final ProtectionDomain domain = protectionDomains[i]; - if (!domain.implies(perm)) - throw new AccessControlException ("permission " - + perm - + " not granted: " - + domain - + " does not imply it."); + final ProtectionDomain domain = protectionDomains[i]; + if (!domain.implies(perm)) + throw new AccessControlException ("permission " + + perm + + " not granted: " + + domain + + " does not imply it."); } } @@ -176,10 +176,10 @@ public final class AccessControlContext { if (obj instanceof AccessControlContext) { - AccessControlContext acc = (AccessControlContext) obj; + AccessControlContext acc = (AccessControlContext) obj; - if (acc.protectionDomains.length != protectionDomains.length) - return false; + if (acc.protectionDomains.length != protectionDomains.length) + return false; int i, j; for (i = 0; i < protectionDomains.length; i++) diff --git a/libjava/classpath/java/security/AccessController.java b/libjava/classpath/java/security/AccessController.java index 6f8b3ecbd41..ec5b14c9e67 100644 --- a/libjava/classpath/java/security/AccessController.java +++ b/libjava/classpath/java/security/AccessController.java @@ -155,7 +155,7 @@ public final class AccessController } catch (RuntimeException e) { - throw e; + throw e; } catch (Exception e) { @@ -196,7 +196,7 @@ public final class AccessController } catch (RuntimeException e) { - throw e; + throw e; } catch (Exception e) { diff --git a/libjava/classpath/java/security/AlgorithmParameterGenerator.java b/libjava/classpath/java/security/AlgorithmParameterGenerator.java index da1ea46d214..a92552b9edc 100644 --- a/libjava/classpath/java/security/AlgorithmParameterGenerator.java +++ b/libjava/classpath/java/security/AlgorithmParameterGenerator.java @@ -48,7 +48,7 @@ import java.security.spec.AlgorithmParameterSpec; /** * AlgorithmParameterGenerator is used to generate algorithm * parameters for specified algorithms. - * + * *

        In case the client does not explicitly initialize the * AlgorithmParameterGenerator (via a call to an * init() method), each provider must supply (and document) a @@ -73,7 +73,7 @@ public class AlgorithmParameterGenerator /** * Constructs a new instance of AlgorithmParameterGenerator. - * + * * @param paramGenSpi * the generator to use. * @param provider @@ -82,8 +82,8 @@ public class AlgorithmParameterGenerator * the algorithm to use. */ protected AlgorithmParameterGenerator(AlgorithmParameterGeneratorSpi - paramGenSpi, Provider provider, - String algorithm) + paramGenSpi, Provider provider, + String algorithm) { this.paramGenSpi = paramGenSpi; this.provider = provider; @@ -99,7 +99,7 @@ public class AlgorithmParameterGenerator /** * Returns a new AlgorithmParameterGenerator instance which * generates algorithm parameters for the specified algorithm. - * + * * @param algorithm the name of algorithm to use. * @return the new instance. * @throws NoSuchAlgorithmException if algorithm is not @@ -129,7 +129,7 @@ public class AlgorithmParameterGenerator /** * Returns a new AlgorithmParameterGenerator instance which * generates algorithm parameters for the specified algorithm. - * + * * @param algorithm the name of algorithm to use. * @param provider the name of the {@link Provider} to use. * @return the new instance. @@ -157,7 +157,7 @@ public class AlgorithmParameterGenerator /** * Returns a new AlgorithmParameterGenerator instance which * generates algorithm parameters for the specified algorithm. - * + * * @param algorithm the name of algorithm to use. * @param provider the {@link Provider} to use. * @return the new instance. @@ -213,7 +213,7 @@ public class AlgorithmParameterGenerator /** * Initializes this instance with the specified size. Since no source of * randomness is supplied, a default one will be used. - * + * * @param size * size (in bits) to use. */ @@ -225,7 +225,7 @@ public class AlgorithmParameterGenerator /** * Initializes this instance with the specified key-size and source of * randomness. - * + * * @param size * the size (in bits) to use. * @param random @@ -239,7 +239,7 @@ public class AlgorithmParameterGenerator /** * Initializes this instance with the specified {@link AlgorithmParameterSpec}. * Since no source of randomness is supplied, a default one will be used. - * + * * @param genParamSpec * the {@link AlgorithmParameterSpec} to use. * @throws InvalidAlgorithmParameterException @@ -254,7 +254,7 @@ public class AlgorithmParameterGenerator /** * Initializes this instance with the specified {@link AlgorithmParameterSpec} * and source of randomness. - * + * * @param genParamSpec * the {@link AlgorithmParameterSpec} to use. * @param random diff --git a/libjava/classpath/java/security/AlgorithmParameterGeneratorSpi.java b/libjava/classpath/java/security/AlgorithmParameterGeneratorSpi.java index 3143ea76b8b..15f39f64667 100644 --- a/libjava/classpath/java/security/AlgorithmParameterGeneratorSpi.java +++ b/libjava/classpath/java/security/AlgorithmParameterGeneratorSpi.java @@ -39,8 +39,8 @@ package java.security; import java.security.spec.AlgorithmParameterSpec; /** - AlgorithmParameterGeneratorSpi is the Service Provider - Interface for the AlgorithmParameterGenerator class. + AlgorithmParameterGeneratorSpi is the Service Provider + Interface for the AlgorithmParameterGenerator class. This class is used to generate the algorithm parameters for a specific algorithm. @@ -61,7 +61,7 @@ public abstract class AlgorithmParameterGeneratorSpi Initializes the parameter generator with the specified size and SecureRandom - @param size the size( in number of bits) + @param size the size( in number of bits) @param random the SecureRandom class to use for randomness */ protected abstract void engineInit(int size, SecureRandom random); @@ -80,7 +80,7 @@ public abstract class AlgorithmParameterGeneratorSpi @throws InvalidAlgorithmParameterException genParamSpec is invalid */ protected abstract void engineInit(AlgorithmParameterSpec genParamSpec, - SecureRandom random) throws + SecureRandom random) throws InvalidAlgorithmParameterException; diff --git a/libjava/classpath/java/security/AlgorithmParameters.java b/libjava/classpath/java/security/AlgorithmParameters.java index 3de8ad02c05..ba805143efc 100644 --- a/libjava/classpath/java/security/AlgorithmParameters.java +++ b/libjava/classpath/java/security/AlgorithmParameters.java @@ -69,7 +69,7 @@ public class AlgorithmParameters /** * Constructs a new instance of AlgorithmParameters. - * + * * @param paramSpi * the engine to use. * @param provider @@ -97,7 +97,7 @@ public class AlgorithmParameters *

        * The returned AlgorithmParameters must still be initialized * with an init() method. - * + * * @param algorithm the algorithm to use. * @return the new instance repesenting the desired algorithm. * @throws NoSuchAlgorithmException if the algorithm is not implemented by any @@ -131,7 +131,7 @@ public class AlgorithmParameters * The returned AlgorithmParameters must still be intialized * with an init() method. *

        - * + * * @param algorithm the algorithm to use. * @param provider the name of the {@link Provider} to use. * @return the new instance repesenting the desired algorithm. @@ -162,7 +162,7 @@ public class AlgorithmParameters *

        * The returned AlgorithmParameters must still be intialized * with an init() method. - * + * * @param algorithm the algorithm to use. * @param provider the {@link Provider} to use. * @return the new instance repesenting the desired algorithm. @@ -213,7 +213,7 @@ public class AlgorithmParameters /** * Initializes the engine with the specified {@link AlgorithmParameterSpec}. - * + * * @param paramSpec * A {@link AlgorithmParameterSpec} to use. * @throws InvalidParameterSpecException @@ -230,7 +230,7 @@ public class AlgorithmParameters * array and decodes them according to the ASN.1 specification. If the ASN.1 * specification exists then it succeeds otherwise an {@link IOException} is * thrown. - * + * * @param params * the parameters to use. * @throws IOException @@ -247,7 +247,7 @@ public class AlgorithmParameters * If format is null, then this method decodes the * byte array using the ASN.1 specification if it exists, otherwise it throws * an {@link IOException}. - * + * * @param params * the parameters to use. * @param format @@ -263,7 +263,7 @@ public class AlgorithmParameters /** * Returns a new instance of AlgorithmParameters as a * designated parameter specification {@link Class}. - * + * * @param paramSpec * the {@link Class} to use. * @return the parameter specification. @@ -280,7 +280,7 @@ public class AlgorithmParameters /** * Returns the parameters in the default encoding format. The primary encoding * format is ASN.1 if it exists for the specified type. - * + * * @return byte array representing the parameters. */ public final byte[] getEncoded() throws IOException @@ -292,7 +292,7 @@ public class AlgorithmParameters * Returns the parameters in the specified encoding format. If * format is null then the ASN.1 encoding * format is used if it exists for the specified type. - * + * * @param format * the name of the encoding format to use. * @return the parameters encoded using the specified encoding scheme. @@ -307,7 +307,7 @@ public class AlgorithmParameters /** * Returns a string representation of the encoded form. - * + * * @return a string representation of the encoded form. */ public final String toString() diff --git a/libjava/classpath/java/security/AlgorithmParametersSpi.java b/libjava/classpath/java/security/AlgorithmParametersSpi.java index bd61ce7df01..15cc1c657fe 100644 --- a/libjava/classpath/java/security/AlgorithmParametersSpi.java +++ b/libjava/classpath/java/security/AlgorithmParametersSpi.java @@ -60,7 +60,7 @@ public abstract class AlgorithmParametersSpi } /** - * Initializes the engine with the specified + * Initializes the engine with the specified * AlgorithmParameterSpec class. * * @param paramSpec A AlgorithmParameterSpec to initialize with @@ -72,7 +72,7 @@ public abstract class AlgorithmParametersSpi throws InvalidParameterSpecException; /** - * Initializes the engine with the specified + * Initializes the engine with the specified * parameters stored in the byte array and decodes them * according to the ASN.1 specification. If the ASN.1 * specification exists then it succeeds or else it throws @@ -85,10 +85,10 @@ public abstract class AlgorithmParametersSpi protected abstract void engineInit(byte[]params) throws IOException; /** - * Initializes the engine with the specified + * Initializes the engine with the specified * parameters stored in the byte array and decodes them - * according to the specified decoding specification. - * If format is null, then it is decoded using the ASN.1 + * according to the specified decoding specification. + * If format is null, then it is decoded using the ASN.1 * specification if it exists or else it throws * IOException. * @@ -113,13 +113,13 @@ public abstract class AlgorithmParametersSpi * @throws InvalidParameterSpecException if the paramSpec is an * invalid parameter class */ - protected abstract + protected abstract T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException; /** - * Returns the parameters in the default encoding format. + * Returns the parameters in the default encoding format. * The primary encoding format is ASN.1 format if it exists * for the specified type. * @@ -129,9 +129,9 @@ public abstract class AlgorithmParametersSpi /** - * Returns the parameters in the specified encoding format. - * If format is null then the - * primary encoding format is used, the ASN.1 format, + * Returns the parameters in the specified encoding format. + * If format is null then the + * primary encoding format is used, the ASN.1 format, * if it exists for the specified type. * * @return byte array representing the parameters @@ -140,7 +140,7 @@ public abstract class AlgorithmParametersSpi throws IOException; /** - * Returns a string describing the parameters in the + * Returns a string describing the parameters in the * AlgorithmParametersSpi class. * * @return A string representing the format of the parameters. diff --git a/libjava/classpath/java/security/CodeSource.java b/libjava/classpath/java/security/CodeSource.java index 90eb089079d..dd353eda0b5 100644 --- a/libjava/classpath/java/security/CodeSource.java +++ b/libjava/classpath/java/security/CodeSource.java @@ -195,14 +195,14 @@ public class CodeSource implements Serializable * *

        For example, each of these locations imply the location * "http://java.sun.com/classes/foo.jar":

        - * + * * 
            * http:
    * http://*.sun.com/classes/*
    * http://java.sun.com/classes/-
    * http://java.sun.com/classes/foo.jar
    *
        - * + * *

        Note that the code source with null location and null certificates implies * all other code sources.

        * diff --git a/libjava/classpath/java/security/DigestInputStream.java b/libjava/classpath/java/security/DigestInputStream.java index 0d4a9d05dc6..c0a74f3ab8e 100644 --- a/libjava/classpath/java/security/DigestInputStream.java +++ b/libjava/classpath/java/security/DigestInputStream.java @@ -43,8 +43,8 @@ import java.io.IOException; import java.io.InputStream; /** - * DigestInputStream is a class that ties an InputStream with a - * MessageDigest. The Message Digest is used by the class to + * DigestInputStream is a class that ties an InputStream with a + * MessageDigest. The Message Digest is used by the class to * update it self as bytes are read from the InputStream. * * The updating to the digest depends on the on flag which is set @@ -57,7 +57,7 @@ import java.io.InputStream; public class DigestInputStream extends FilterInputStream { /** - * The message digest for the DigestInputStream + * The message digest for the DigestInputStream */ protected MessageDigest digest; @@ -66,7 +66,7 @@ public class DigestInputStream extends FilterInputStream /** * Constructs a new DigestInputStream. - * It associates a MessageDigest with the stream to + * It associates a MessageDigest with the stream to * compute the stream as data is written. * * @param stream An InputStream to associate this stream with @@ -80,7 +80,7 @@ public class DigestInputStream extends FilterInputStream } /** - * Returns the MessageDigest associated with this DigestInputStream + * Returns the MessageDigest associated with this DigestInputStream * * @return The MessageDigest used to hash this stream */ @@ -99,12 +99,12 @@ public class DigestInputStream extends FilterInputStream this.digest = digest; } - /** + /** * Reads a byte from the input stream and updates the digest. - * This method reads the underlying input stream and if the + * This method reads the underlying input stream and if the * on flag is true then updates the message digest. * - * @return Returns a byte from the input stream, -1 is returned to indicate that + * @return Returns a byte from the input stream, -1 is returned to indicate that * the end of stream was reached before this read call * * @throws IOException if an IO error occurs in the underlying input stream, @@ -120,15 +120,15 @@ public class DigestInputStream extends FilterInputStream return temp; } - /** + /** * Reads bytes from the input stream and updates the digest. - * This method reads the underlying input stream and if the + * This method reads the underlying input stream and if the * on flag is true then updates the message digest. * * @param b a byte array to store the data from the input stream * @param off an offset to start at in the array * @param len length of data to read - * @return Returns count of bytes read, -1 is returned to indicate that + * @return Returns count of bytes read, -1 is returned to indicate that * the end of stream was reached before this read call * * @throws IOException if an IO error occurs in the underlying input stream, diff --git a/libjava/classpath/java/security/DigestOutputStream.java b/libjava/classpath/java/security/DigestOutputStream.java index 037b39e789c..748f83d79e9 100644 --- a/libjava/classpath/java/security/DigestOutputStream.java +++ b/libjava/classpath/java/security/DigestOutputStream.java @@ -105,7 +105,7 @@ public class DigestOutputStream extends FilterOutputStream * * @param b A byte to write to the output stream * - * @exception IOException if the underlying output stream + * @exception IOException if the underlying output stream * cannot write the byte, this is thrown. */ public void write(int b) throws IOException @@ -124,7 +124,7 @@ public class DigestOutputStream extends FilterOutputStream * @param off Offset to start to start at in array * @param len Length of data to write * - * @exception IOException if the underlying output stream + * @exception IOException if the underlying output stream * cannot write the bytes, this is thrown. */ public void write(byte[]b, int off, int len) throws IOException diff --git a/libjava/classpath/java/security/GeneralSecurityException.java b/libjava/classpath/java/security/GeneralSecurityException.java index 87e51ce3b50..b2594c5fbe8 100644 --- a/libjava/classpath/java/security/GeneralSecurityException.java +++ b/libjava/classpath/java/security/GeneralSecurityException.java @@ -40,7 +40,7 @@ package java.security; /** * This class is the common superclass of all security exceptions. All * exceptions in java.security extend this class with the exception (no - * pun intended) of AccessControlException and + * pun intended) of AccessControlException and * CertificateException (which extend * SecurityException), ProviderException * (RuntimeException), and InvalidParamterException diff --git a/libjava/classpath/java/security/Identity.java b/libjava/classpath/java/security/Identity.java index c9df0a58ffa..83ec4c8e1d2 100644 --- a/libjava/classpath/java/security/Identity.java +++ b/libjava/classpath/java/security/Identity.java @@ -44,14 +44,14 @@ import java.util.Vector; * The Identity class is used to represent people and companies * that can be authenticated using public key encryption. The identities can * also be abstract objects such as smart cards. - * + * *

        Identity objects store a name and public key for each * identity. The names cannot be changed and the identities can be scoped. Each * identity (name and public key) within a scope are unique to that scope.

        - * + * *

        Each identity has a set of ceritificates which all specify the same * public key, but not necessarily the same name.

        - * + * *

        The Identity class can be subclassed to allow additional * information to be attached to it.

        * @@ -81,7 +81,7 @@ public abstract class Identity implements Principal, Serializable /** * Constructs a new instance of Identity with the specified * name and scope. - * + * * @param name * the name to use. * @param scope @@ -99,7 +99,7 @@ public abstract class Identity implements Principal, Serializable /** * Constructs a new instance of Identity with the specified * name and no scope. - * + * * @param name * the name to use. */ @@ -133,7 +133,7 @@ public abstract class Identity implements Principal, Serializable /** * Sets the public key for this identity. The old key and all certificates * are removed. - * + * * @param key * the public key to use. * @throws KeyManagementException @@ -154,7 +154,7 @@ public abstract class Identity implements Principal, Serializable /** * Sets the general information string. - * + * * @param info * the general information string. * @throws SecurityException @@ -183,7 +183,7 @@ public abstract class Identity implements Principal, Serializable * Adds a certificate to the list of ceritificates for this identity. The * public key in this certificate must match the existing public key if it * exists. - * + * * @param certificate * the certificate to add. * @throws KeyManagementException @@ -202,15 +202,15 @@ public abstract class Identity implements Principal, Serializable // Check public key of this certificate against the first one in the vector if (certificates.size() > 0) { - if (((Certificate) certificates.firstElement()).getPublicKey() != publicKey) - throw new KeyManagementException("Public key does not match"); + if (((Certificate) certificates.firstElement()).getPublicKey() != publicKey) + throw new KeyManagementException("Public key does not match"); } certificates.addElement(certificate); } /** * Removes a certificate from the list of ceritificates for this identity. - * + * * @param certificate * the certificate to remove. * @throws KeyManagementException @@ -248,7 +248,7 @@ public abstract class Identity implements Principal, Serializable * checks if they are the same object, then if the name and scope match and * returns true if successful. If these tests fail, the * {@link #identityEquals(Identity)} method is called. - * + * * @return true if they are equal, false * otherwise. */ @@ -256,14 +256,14 @@ public abstract class Identity implements Principal, Serializable { if (identity instanceof Identity) { - if (identity == this) - return true; + if (identity == this) + return true; - if ((((Identity) identity).getName().equals(this.name)) && - (((Identity) identity).getScope().equals(this.scope))) - return true; + if ((((Identity) identity).getName().equals(this.name)) && + (((Identity) identity).getScope().equals(this.scope))) + return true; - return identityEquals((Identity) identity); + return identityEquals((Identity) identity); } return false; } @@ -272,19 +272,19 @@ public abstract class Identity implements Principal, Serializable * Checks for equality between this Identity and a specified object. A * subclass should override this method. The default behavior is to return * true if the public key and names match. - * + * * @return true if they are equal, false * otherwise. */ protected boolean identityEquals(Identity identity) { return ((identity.getName().equals(this.name)) && - (identity.getPublicKey().equals(this.publicKey))); + (identity.getPublicKey().equals(this.publicKey))); } /** * Returns a string representation of this Identity. - * + * * @return a string representation of this Identity. * @throws SecurityException * if a {@link SecurityManager} is installed which disallows this @@ -302,7 +302,7 @@ public abstract class Identity implements Principal, Serializable /** * Returns a detailed string representation of this Identity. - * + * * @param detailed * indicates whether or detailed information is desired. * @return a string representation of this Identity. @@ -318,13 +318,13 @@ public abstract class Identity implements Principal, Serializable if (detailed) { - /* TODO: Insert proper detailed format here */ - return (name + ":@" + scope + " Public Key: " + publicKey); + /* TODO: Insert proper detailed format here */ + return (name + ":@" + scope + " Public Key: " + publicKey); } else { - /* TODO: Insert proper format here */ - return (name + ":@" + scope + " Public Key: " + publicKey); + /* TODO: Insert proper format here */ + return (name + ":@" + scope + " Public Key: " + publicKey); } } diff --git a/libjava/classpath/java/security/IdentityScope.java b/libjava/classpath/java/security/IdentityScope.java index 610d3534c26..4391fbd49ba 100644 --- a/libjava/classpath/java/security/IdentityScope.java +++ b/libjava/classpath/java/security/IdentityScope.java @@ -43,14 +43,14 @@ import java.util.Enumeration; * IdentityScope represents a scope of an identity. * IdentityScope is also an {@link Identity} and can have a name * and scope along with the other qualitites identities possess. - * + * *

        An IdentityScope contains other {@link Identity} objects. * All {@link Identity} objects are manipulated in the scope the same way. The * scope is supposed to apply different scope to different type of * Identities.

        - * + * *

        No identity within the same scope can have the same public key.

        - * + * * @author Mark Benvenuto * @see Identity * @see Signer @@ -73,7 +73,7 @@ public abstract class IdentityScope extends Identity /** * Constructs a new instance of IdentityScope with the * specified name and no scope. - * + * * @param name * the name to use. */ @@ -85,7 +85,7 @@ public abstract class IdentityScope extends Identity /** * Constructs a new instance of IdentityScope with the * specified name and {@link IdentityScope}. - * + * * @param name * the name to use. * @param scope @@ -101,22 +101,22 @@ public abstract class IdentityScope extends Identity /** * Returns the system's Scope. - * + * * @return the system's Scope. */ public static IdentityScope getSystemScope() { if (systemScope == null) { - //Load it - //systemScope; + //Load it + //systemScope; } return systemScope; } /** * Sets the scope of the system. - * + * * @param scope * the new system scope. * @throws SecurityException @@ -134,14 +134,14 @@ public abstract class IdentityScope extends Identity /** * Returns the number of entries within this IdentityScope. - * + * * @return the number of entries within this IdentityScope. */ public abstract int size(); /** * Returns the specified {@link Identity}, by name, within this scope. - * + * * @param name * name of {@link Identity} to get. * @return an {@link Identity} representing the name or null if @@ -152,7 +152,7 @@ public abstract class IdentityScope extends Identity /** * Returns the specified {@link Identity}, by {@link Principal}, within this * scope. - * + * * @param principal * the {@link Principal} to use. * @return an identity representing the {@link Principal} or null @@ -165,7 +165,7 @@ public abstract class IdentityScope extends Identity /** * Returns the specified {@link Identity}, by public key, within this scope. - * + * * @param key * the {@link PublicKey} to use. * @return an identity representing the public key or null if @@ -175,7 +175,7 @@ public abstract class IdentityScope extends Identity /** * Adds an identity to his scope. - * + * * @param identity * the {@link Identity} to add. * @throws KeyManagementException @@ -187,7 +187,7 @@ public abstract class IdentityScope extends Identity /** * Removes an identity in this scope. - * + * * @param identity * the {@link Identity} to remove. * @throws KeyManagementException @@ -198,7 +198,7 @@ public abstract class IdentityScope extends Identity /** * Returns an {@link Enumeration} of identities in this scope. - * + * * @return an {@link Enumeration} of the identities in this scope. */ public abstract Enumeration identities(); @@ -206,7 +206,7 @@ public abstract class IdentityScope extends Identity /** * Returns a string representing this instance. It includes the name, the * scope name, and number of identities. - * + * * @return a string representation of this instance. */ public String toString() diff --git a/libjava/classpath/java/security/KeyFactory.java b/libjava/classpath/java/security/KeyFactory.java index f06004bad7e..6f47de04406 100644 --- a/libjava/classpath/java/security/KeyFactory.java +++ b/libjava/classpath/java/security/KeyFactory.java @@ -50,7 +50,7 @@ import java.security.spec.KeySpec; * Key factories are used to convert keys (opaque cryptographic keys of type * {@link Key}) into key specifications (transparent representations of the * underlying key material). - * + * *

        Key factories are bi-directional. They allow a key class to be converted * into a key specification (key material) and back again. For example DSA * public keys can be specified as DSAPublicKeySpec or @@ -76,7 +76,7 @@ public class KeyFactory /** * Constructs a new instance of KeyFactory with the specified * parameters. - * + * * @param keyFacSpi * the key factory to use. * @param provider @@ -85,7 +85,7 @@ public class KeyFactory * the name of the key algorithm to use. */ protected KeyFactory(KeyFactorySpi keyFacSpi, Provider provider, - String algorithm) + String algorithm) { this.keyFacSpi = keyFacSpi; this.provider = provider; @@ -95,7 +95,7 @@ public class KeyFactory /** * Returns a new instance of KeyFactory representing the * specified key factory. - * + * * @param algorithm the name of algorithm to use. * @return a new instance repesenting the desired algorithm. * @throws NoSuchAlgorithmException if the algorithm is not implemented by any @@ -125,7 +125,7 @@ public class KeyFactory /** * Returns a new instance of KeyFactory representing the * specified key factory from the specified provider. - * + * * @param algorithm the name of algorithm to use. * @param provider the name of the provider to use. * @return a new instance repesenting the desired algorithm. @@ -152,7 +152,7 @@ public class KeyFactory /** * Returns a new instance of KeyFactory representing the * specified key factory from the designated {@link Provider}. - * + * * @param algorithm the name of algorithm to use. * @param provider the {@link Provider} to use. * @return a new instance repesenting the desired algorithm. @@ -195,7 +195,7 @@ public class KeyFactory /** * Returns the {@link Provider} of this instance. - * + * * @return the {@link Provider} of this instance. */ public final Provider getProvider() @@ -205,7 +205,7 @@ public class KeyFactory /** * Returns the name of the algorithm used. - * + * * @return the name of the algorithm used. */ public final String getAlgorithm() @@ -215,7 +215,7 @@ public class KeyFactory /** * Generates a public key from the provided key specification. - * + * * @param keySpec * the key specification. * @return the public key. @@ -230,7 +230,7 @@ public class KeyFactory /** * Generates a private key from the provided key specification. - * + * * @param keySpec * the key specification. * @return the private key. @@ -246,7 +246,7 @@ public class KeyFactory /** * Returns a key specification for the given key. keySpec * identifies the specification class to return the key material in. - * + * * @param key * the key to use. * @param keySpec @@ -266,7 +266,7 @@ public class KeyFactory /** * Translates the key from an unknown or untrusted provider into a key from * this key factory. - * + * * @param key * the key to translate from. * @return the translated key. diff --git a/libjava/classpath/java/security/KeyFactorySpi.java b/libjava/classpath/java/security/KeyFactorySpi.java index fa56378121b..b8424638f14 100644 --- a/libjava/classpath/java/security/KeyFactorySpi.java +++ b/libjava/classpath/java/security/KeyFactorySpi.java @@ -42,21 +42,21 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; /** - * KeyFactorySpi is the Service Provider Interface (SPI) for the - * KeyFactory class. This is the interface for providers to + * KeyFactorySpi is the Service Provider Interface (SPI) for the + * KeyFactory class. This is the interface for providers to * supply to implement a key factory for an algorithm. * - * Key factories are used to convert keys (opaque cryptographic - * keys of type Key) into key specifications (transparent + * Key factories are used to convert keys (opaque cryptographic + * keys of type Key) into key specifications (transparent * representations of the underlying key material). * - * Key factories are bi-directional. They allow a key class + * Key factories are bi-directional. They allow a key class * to be converted into a key specification (key material) and * back again. * - * For example DSA public keys can be specified as + * For example DSA public keys can be specified as * DSAPublicKeySpec or X509EncodedKeySpec. The key factory - * translate these key specifications. + * translate these key specifications. * * @since JDK 1.2 * @author Mark Benvenuto @@ -98,19 +98,19 @@ public abstract class KeyFactorySpi throws InvalidKeySpecException; /** - * Returns a key specification for the given key. keySpec - * identifies the specification class to return the key + * Returns a key specification for the given key. keySpec + * identifies the specification class to return the key * material in. * * @param key the key - * @param keySpec the specification class to return the + * @param keySpec the specification class to return the * key material in. * * @return the key specification in an instance of the requested * specification class * * @throws InvalidKeySpecException the requested key specification - * is inappropriate for this key or the key is + * is inappropriate for this key or the key is * unrecognized. */ protected abstract T engineGetKeySpec(Key key, @@ -126,7 +126,7 @@ public abstract class KeyFactorySpi * * @return the translated key * - * @throws InvalidKeyException if the key cannot be + * @throws InvalidKeyException if the key cannot be * processed by this key factory */ protected abstract Key engineTranslateKey(Key key) diff --git a/libjava/classpath/java/security/KeyPairGenerator.java b/libjava/classpath/java/security/KeyPairGenerator.java index f4ca20611e1..5e6bb1a3ce8 100644 --- a/libjava/classpath/java/security/KeyPairGenerator.java +++ b/libjava/classpath/java/security/KeyPairGenerator.java @@ -48,7 +48,7 @@ import java.security.spec.AlgorithmParameterSpec; /** * KeyPairGenerator is a class used to generate key-pairs for a * security algorithm. - * + * *

        The KeyPairGenerator is created with the * getInstance() Factory methods. It is used to generate a pair of * public and private keys for a specific algorithm and associate this key-pair @@ -69,7 +69,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Constructs a new instance of KeyPairGenerator. - * + * * @param algorithm * the algorithm to use. */ @@ -81,7 +81,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Returns the name of the algorithm used. - * + * * @return the name of the algorithm used. */ public String getAlgorithm() @@ -92,7 +92,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Returns a new instance of KeyPairGenerator which generates * key-pairs for the specified algorithm. - * + * * @param algorithm the name of the algorithm to use. * @return a new instance repesenting the desired algorithm. * @throws NoSuchAlgorithmException if the algorithm is not implemented by any @@ -122,7 +122,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Returns a new instance of KeyPairGenerator which generates * key-pairs for the specified algorithm from a named provider. - * + * * @param algorithm the name of the algorithm to use. * @param provider the name of a {@link Provider} to use. * @return a new instance repesenting the desired algorithm. @@ -149,7 +149,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Returns a new instance of KeyPairGenerator which generates * key-pairs for the specified algorithm from a designated {@link Provider}. - * + * * @param algorithm * the name of the algorithm to use. * @param provider @@ -163,8 +163,8 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi * @since 1.4 * @see Provider */ - public static KeyPairGenerator getInstance(String algorithm, - Provider provider) + public static KeyPairGenerator getInstance(String algorithm, + Provider provider) throws NoSuchAlgorithmException { CPStringBuilder sb = new CPStringBuilder("KeyPairGenerator for algorithm [") @@ -206,7 +206,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Returns the {@link Provider} of this instance. - * + * * @return the {@link Provider} of this instance. */ public final Provider getProvider() @@ -217,7 +217,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Initializes this instance for the specified key size. Since no source of * randomness is specified, a default one will be used. - * + * * @param keysize * the size of keys to use. */ @@ -229,7 +229,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Initializes this instance for the specified key size and * {@link SecureRandom}. - * + * * @param keysize * the size of keys to use. * @param random @@ -244,7 +244,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi * Initializes this instance with the specified * {@link AlgorithmParameterSpec}. Since no source of randomness is specified, * a default one will be used. - * + * * @param params * the {@link AlgorithmParameterSpec} to use. * @throws InvalidAlgorithmParameterException @@ -260,7 +260,7 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Initializes this instance with the specified {@link AlgorithmParameterSpec} * and {@link SecureRandom}. - * + * * @param params * the {@link AlgorithmParameterSpec} to use. * @param random @@ -277,9 +277,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Generates a new "DSA" {@link KeyPair} from the "GNU" security provider. - * + * *

        This method generates a unique key-pair each time it is called.

        - * + * * @return a new unique {@link KeyPair}. * @see #generateKeyPair() * @since 1.2 @@ -300,9 +300,9 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi /** * Generates a new "DSA" {@link KeyPair} from the "GNU" security provider. - * + * *

        This method generates a unique key pair each time it is called.

        - * + * * @return a new unique {@link KeyPair}. * @see #genKeyPair() */ diff --git a/libjava/classpath/java/security/KeyPairGeneratorSpi.java b/libjava/classpath/java/security/KeyPairGeneratorSpi.java index 689fbec128e..1eaad98322a 100644 --- a/libjava/classpath/java/security/KeyPairGeneratorSpi.java +++ b/libjava/classpath/java/security/KeyPairGeneratorSpi.java @@ -58,7 +58,7 @@ public abstract class KeyPairGeneratorSpi key size and source of randomness @param keysize size of the key to generate - @param random A SecureRandom source of randomness + @param random A SecureRandom source of randomness */ public abstract void initialize(int keysize, SecureRandom random); @@ -72,7 +72,7 @@ public abstract class KeyPairGeneratorSpi method just throws UnsupportedOperationException. @param params A AlgorithmParameterSpec to intialize with - @param random A SecureRandom source of randomness + @param random A SecureRandom source of randomness @throws InvalidAlgorithmParameterException */ @@ -84,7 +84,7 @@ public abstract class KeyPairGeneratorSpi /** Generates a KeyPair according the rules for the algorithm. - Unless intialized, algorithm defaults will be used. It + Unless intialized, algorithm defaults will be used. It creates a unique key pair each time. @return a key pair diff --git a/libjava/classpath/java/security/KeyStore.java b/libjava/classpath/java/security/KeyStore.java index 1d036c31ce2..b7a0e2ab1f1 100644 --- a/libjava/classpath/java/security/KeyStore.java +++ b/libjava/classpath/java/security/KeyStore.java @@ -49,19 +49,19 @@ import java.util.Date; import java.util.Enumeration; /** - * Keystore represents an in-memory collection of keys and + * Keystore represents an in-memory collection of keys and * certificates. There are two types of entries: * *
        *
        Key Entry
        * *

        This type of keystore entry store sensitive crytographic key - * information in a protected format.Typically this is a secret + * information in a protected format.Typically this is a secret * key or a private key with a certificate chain.

        * *
        Trusted Ceritificate Entry
        * - *

        This type of keystore entry contains a single public key + *

        This type of keystore entry contains a single public key * certificate belonging to annother entity. It is called trusted * because the keystore owner trusts that the certificates * belongs to the subject (owner) of the certificate.

        @@ -70,10 +70,10 @@ import java.util.Enumeration; *

        Entries in a key store are referred to by their "alias": a simple * unique string. * - *

        The structure and persistentence of the key store is not - * specified. Any method could be used to protect sensitive - * (private or secret) keys. Smart cards or integrated - * cryptographic engines could be used or the keystore could + *

        The structure and persistentence of the key store is not + * specified. Any method could be used to protect sensitive + * (private or secret) keys. Smart cards or integrated + * cryptographic engines could be used or the keystore could * be simply stored in a file.

        * * @see java.security.cert.Certificate @@ -112,7 +112,7 @@ public class KeyStore /** * Returns an instance of a KeyStore representing the specified * type, from the first provider that implements it. - * + * * @param type the type of keystore to create. * @return a KeyStore repesenting the desired type. * @throws KeyStoreException if the designated type of is not implemented by @@ -141,7 +141,7 @@ public class KeyStore /** * Returns an instance of a KeyStore representing the specified * type, from the named provider. - * + * * @param type the type of keystore to create. * @param provider the name of the provider to use. * @return a KeyStore repesenting the desired type. @@ -168,7 +168,7 @@ public class KeyStore /** * Returns an instance of a KeyStore representing the specified * type, from the specified provider. - * + * * @param type the type of keystore to create. * @param provider the provider to use. * @return a KeyStore repesenting the desired type. @@ -207,13 +207,13 @@ public class KeyStore /** * Returns the default KeyStore type. This method looks up the - * type in <JAVA_HOME>/lib/security/java.security with the + * type in <JAVA_HOME>/lib/security/java.security with the * property "keystore.type" or if that fails then "gkr" . */ public static final String getDefaultType() { - // Security reads every property in java.security so it - // will return this property if it exists. + // Security reads every property in java.security so it + // will return this property if it exists. String tmp = Security.getProperty("keystore.type"); if (tmp == null) @@ -246,7 +246,7 @@ public class KeyStore } /** - Returns the key associated with given alias using the + Returns the key associated with given alias using the supplied password. @param alias an alias for the key to get @@ -271,8 +271,8 @@ public class KeyStore @param alias the alias name - @return a chain of Certificates ( ordered from the user's - certificate to the Certificate Authority's ) or + @return a chain of Certificates ( ordered from the user's + certificate to the Certificate Authority's ) or null if the alias does not exist or there is no certificate chain for the alias ( the alias refers to a trusted certificate entry or there is no entry). @@ -292,7 +292,7 @@ public class KeyStore @param alias the alias name - @return a Certificate or null if the alias does not exist + @return a Certificate or null if the alias does not exist or there is no certificate for the alias */ public final java.security.cert.Certificate getCertificate(String alias) @@ -315,8 +315,8 @@ public class KeyStore /** Assign the key to the alias in the keystore, protecting it - with the given password. It will overwrite an existing - entry and if the key is a PrivateKey, also add the + with the given password. It will overwrite an existing + entry and if the key is a PrivateKey, also add the certificate chain representing the corresponding public key. @param alias the alias name @@ -328,16 +328,16 @@ public class KeyStore @throws KeyStoreException if it fails */ public final void setKeyEntry(String alias, Key key, char[]password, - java.security.cert. - Certificate[]chain) throws KeyStoreException + java.security.cert. + Certificate[]chain) throws KeyStoreException { keyStoreSpi.engineSetKeyEntry(alias, key, password, chain); } /** Assign the key to the alias in the keystore. It will overwrite - an existing entry and if the key is a PrivateKey, also - add the certificate chain representing the corresponding + an existing entry and if the key is a PrivateKey, also + add the certificate chain representing the corresponding public key. @param alias the alias name @@ -348,14 +348,14 @@ public class KeyStore @throws KeyStoreException if it fails */ public final void setKeyEntry(String alias, byte[]key, - java.security.cert. - Certificate[]chain) throws KeyStoreException + java.security.cert. + Certificate[]chain) throws KeyStoreException { keyStoreSpi.engineSetKeyEntry(alias, key, chain); } /** - Assign the certificate to the alias in the keystore. It + Assign the certificate to the alias in the keystore. It will overwrite an existing entry. @param alias the alias name @@ -364,8 +364,8 @@ public class KeyStore @throws KeyStoreException if it fails */ public final void setCertificateEntry(String alias, - java.security.cert. - Certificate cert) throws + java.security.cert. + Certificate cert) throws KeyStoreException { keyStoreSpi.engineSetCertificateEntry(alias, cert); @@ -416,7 +416,7 @@ public class KeyStore } /** - Determines if the keystore contains a key entry for + Determines if the keystore contains a key entry for the specified alias. @param alias the alias name @@ -430,7 +430,7 @@ public class KeyStore /** - Determines if the keystore contains a certificate entry for + Determines if the keystore contains a certificate entry for the specified alias. @param alias the alias name @@ -444,7 +444,7 @@ public class KeyStore } /** - Determines if the keystore contains the specified certificate + Determines if the keystore contains the specified certificate entry and returns the alias. It checks every entry and for a key entry checks only the @@ -452,7 +452,7 @@ public class KeyStore @param cert Certificate to look for - @return alias of first matching certificate, null if it + @return alias of first matching certificate, null if it does not exist. */ public final String getCertificateAlias(java.security.cert.Certificate cert) @@ -469,7 +469,7 @@ public class KeyStore @param password the password to protect the keystore integrity with @throws IOException if an I/O error occurs. - @throws NoSuchAlgorithmException the data integrity algorithm + @throws NoSuchAlgorithmException the data integrity algorithm used cannot be found. @throws CertificateException if any certificates could not be stored in the output stream. @@ -489,7 +489,7 @@ public class KeyStore @param password the password to check the keystore integrity with @throws IOException if an I/O error occurs. - @throws NoSuchAlgorithmException the data integrity algorithm + @throws NoSuchAlgorithmException the data integrity algorithm used cannot be found. @throws CertificateException if any certificates could not be stored in the output stream. diff --git a/libjava/classpath/java/security/KeyStoreSpi.java b/libjava/classpath/java/security/KeyStoreSpi.java index c8d23166321..b44bd84a84f 100644 --- a/libjava/classpath/java/security/KeyStoreSpi.java +++ b/libjava/classpath/java/security/KeyStoreSpi.java @@ -46,9 +46,9 @@ import java.util.Date; import java.util.Enumeration; /** - * KeyStoreSpi is the Service Provider Interface (SPI) for the - * KeyStore class. This is the interface for providers to - * supply to implement a keystore for a particular keystore + * KeyStoreSpi is the Service Provider Interface (SPI) for the + * KeyStore class. This is the interface for providers to + * supply to implement a keystore for a particular keystore * type. * * @since 1.2 @@ -64,7 +64,7 @@ public abstract class KeyStoreSpi } /** - * Returns the key associated with given alias using the + * Returns the key associated with given alias using the * supplied password. * * @param alias an alias for the key to get @@ -85,8 +85,8 @@ public abstract class KeyStoreSpi * * @param alias the alias name * - * @return a chain of Certificates ( ordered from the user's - * certificate to the Certificate Authority's ) or + * @return a chain of Certificates ( ordered from the user's + * certificate to the Certificate Authority's ) or * null if the alias does not exist or there is no * certificate chain for the alias ( the alias refers * to a trusted certificate entry or there is no entry). @@ -104,7 +104,7 @@ public abstract class KeyStoreSpi * * @param alias the alias name * - * @return a Certificate or null if the alias does not exist + * @return a Certificate or null if the alias does not exist * or there is no certificate for the alias */ public abstract java.security.cert. @@ -121,8 +121,8 @@ public abstract class KeyStoreSpi /** * Assign the key to the alias in the keystore, protecting it - * with the given password. It will overwrite an existing - * entry and if the key is a PrivateKey, also add the + * with the given password. It will overwrite an existing + * entry and if the key is a PrivateKey, also add the * certificate chain representing the corresponding public key. * * @param alias the alias name @@ -134,15 +134,15 @@ public abstract class KeyStoreSpi * @throws KeyStoreException if it fails */ public abstract void engineSetKeyEntry(String alias, Key key, - char[]password, - java.security.cert. - Certificate[]chain) throws + char[]password, + java.security.cert. + Certificate[]chain) throws KeyStoreException; /** * Assign the key to the alias in the keystore. It will overwrite - * an existing entry and if the key is a PrivateKey, also - * add the certificate chain representing the corresponding + * an existing entry and if the key is a PrivateKey, also + * add the certificate chain representing the corresponding * public key. * * @param alias the alias name @@ -153,13 +153,13 @@ public abstract class KeyStoreSpi * @throws KeyStoreException if it fails */ public abstract void engineSetKeyEntry(String alias, byte[]key, - java.security.cert. - Certificate[]chain) throws + java.security.cert. + Certificate[]chain) throws KeyStoreException; /** - * Assign the certificate to the alias in the keystore. It + * Assign the certificate to the alias in the keystore. It * will overwrite an existing entry. * * @param alias the alias name @@ -168,8 +168,8 @@ public abstract class KeyStoreSpi * @throws KeyStoreException if it fails */ public abstract void engineSetCertificateEntry(String alias, - java.security.cert. - Certificate cert) throws + java.security.cert. + Certificate cert) throws KeyStoreException; /** @@ -206,7 +206,7 @@ public abstract class KeyStoreSpi public abstract int engineSize(); /** - * Determines if the keystore contains a key entry for + * Determines if the keystore contains a key entry for * the specified alias. * * @param alias the alias name @@ -216,7 +216,7 @@ public abstract class KeyStoreSpi public abstract boolean engineIsKeyEntry(String alias); /** - * Determines if the keystore contains a certificate entry for + * Determines if the keystore contains a certificate entry for * the specified alias. * * @param alias the alias name @@ -226,7 +226,7 @@ public abstract class KeyStoreSpi public abstract boolean engineIsCertificateEntry(String alias); /** - * Determines if the keystore contains the specified certificate + * Determines if the keystore contains the specified certificate * entry and returns the alias. * * It checks every entry and for a key entry checks only the @@ -234,11 +234,11 @@ public abstract class KeyStoreSpi * * @param cert Certificate to look for * - * @return alias of first matching certificate, null if it + * @return alias of first matching certificate, null if it * does not exist. */ public abstract String engineGetCertificateAlias(java.security.cert. - Certificate cert); + Certificate cert); /** * Stores the keystore in the specified output stream and it @@ -248,7 +248,7 @@ public abstract class KeyStoreSpi * @param password the password to protect the keystore integrity with * * @throws IOException if an I/O error occurs. - * @throws NoSuchAlgorithmException the data integrity algorithm + * @throws NoSuchAlgorithmException the data integrity algorithm * used cannot be found. * @throws CertificateException if any certificates could not be * stored in the output stream. @@ -265,7 +265,7 @@ public abstract class KeyStoreSpi * @param password the password to check the keystore integrity with * * @throws IOException if an I/O error occurs. - * @throws NoSuchAlgorithmException the data integrity algorithm + * @throws NoSuchAlgorithmException the data integrity algorithm * used cannot be found. * @throws CertificateException if any certificates could not be * stored in the output stream. diff --git a/libjava/classpath/java/security/MessageDigest.java b/libjava/classpath/java/security/MessageDigest.java index d94d96b1aa6..a4eeab4471f 100644 --- a/libjava/classpath/java/security/MessageDigest.java +++ b/libjava/classpath/java/security/MessageDigest.java @@ -63,7 +63,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Constructs a new instance of MessageDigest representing the * specified algorithm. - * + * * @param algorithm * the name of the digest algorithm to use. */ @@ -76,7 +76,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns a new instance of MessageDigest representing the * specified algorithm. - * + * * @param algorithm the name of the digest algorithm to use. * @return a new instance representing the desired algorithm. * @throws NoSuchAlgorithmException if the algorithm is not implemented by any @@ -106,7 +106,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns a new instance of MessageDigest representing the * specified algorithm from a named provider. - * + * * @param algorithm the name of the digest algorithm to use. * @param provider the name of the provider to use. * @return a new instance representing the desired algorithm. @@ -133,7 +133,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns a new instance of MessageDigest representing the * specified algorithm from a designated {@link Provider}. - * + * * @param algorithm the name of the digest algorithm to use. * @param provider the {@link Provider} to use. * @return a new instance representing the desired algorithm. @@ -187,7 +187,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns the {@link Provider} of this instance. - * + * * @return the {@link Provider} of this instance. */ public final Provider getProvider() @@ -197,7 +197,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Updates the digest with the byte. - * + * * @param input byte to update the digest with. */ public void update(byte input) @@ -208,7 +208,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Updates the digest with the bytes from the array starting from the * specified offset and using the specified length of bytes. - * + * * @param input * bytes to update the digest with. * @param offset @@ -223,7 +223,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Updates the digest with the bytes of an array. - * + * * @param input bytes to update the digest with. */ public void update(byte[] input) @@ -233,7 +233,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Updates the digest with the remaining bytes of a buffer. - * + * * @param input The input byte buffer. * @since 1.5 */ @@ -241,10 +241,10 @@ public abstract class MessageDigest extends MessageDigestSpi { engineUpdate (input); } - + /** * Computes the final digest of the stored data. - * + * * @return a byte array representing the message digest. */ public byte[] digest() @@ -254,7 +254,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Computes the final digest of the stored bytes and returns the result. - * + * * @param buf * an array of bytes to store the result in. * @param offset @@ -272,7 +272,7 @@ public abstract class MessageDigest extends MessageDigestSpi * Computes a final update using the input array of bytes, then computes a * final digest and returns it. It calls {@link #update(byte[])} and then * {@link #digest(byte[])}. - * + * * @param input * an array of bytes to perform final update with. * @return a byte array representing the message digest. @@ -285,7 +285,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns a string representation of this instance. - * + * * @return a string representation of this instance. */ public String toString() @@ -295,7 +295,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Does a simple byte comparison of the two digests. - * + * * @param digesta * first digest to compare. * @param digestb @@ -323,7 +323,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns the name of message digest algorithm. - * + * * @return the name of message digest algorithm. */ public final String getAlgorithm() @@ -334,7 +334,7 @@ public abstract class MessageDigest extends MessageDigestSpi /** * Returns the length of the message digest. The default is zero which means * that the concrete implementation does not implement this method. - * + * * @return length of the message digest. * @since 1.2 */ @@ -348,7 +348,7 @@ public abstract class MessageDigest extends MessageDigestSpi * then a {@link CloneNotSupportedException} is thrown. Cloning depends on * whether the subclass {@link MessageDigestSpi} implements {@link Cloneable} * which contains the actual implementation of the appropriate algorithm. - * + * * @return a clone of this instance. * @throws CloneNotSupportedException * the implementation does not support cloning. diff --git a/libjava/classpath/java/security/MessageDigestSpi.java b/libjava/classpath/java/security/MessageDigestSpi.java index 6615b1d93b0..63cc960477a 100644 --- a/libjava/classpath/java/security/MessageDigestSpi.java +++ b/libjava/classpath/java/security/MessageDigestSpi.java @@ -101,7 +101,7 @@ public abstract class MessageDigestSpi /** * Updates this digest with the remaining bytes of a byte buffer. - * + * * @param input The input buffer. * @since 1.5 */ @@ -115,7 +115,7 @@ public abstract class MessageDigestSpi engineUpdate (buf, 0, n); } } - + /** Computes the final digest of the stored bytes and returns them. It performs any necessary padding. The message digest diff --git a/libjava/classpath/java/security/Permission.java b/libjava/classpath/java/security/Permission.java index 8f3e2a23646..cf6399b1671 100644 --- a/libjava/classpath/java/security/Permission.java +++ b/libjava/classpath/java/security/Permission.java @@ -183,20 +183,20 @@ public abstract class Permission implements Guard, Serializable */ public String toString() { - CPStringBuilder string = new CPStringBuilder(); - + CPStringBuilder string = new CPStringBuilder(); + string = string.append('('); string = string.append(getClass().getName()); string = string.append(' '); string = string.append(getName()); - + if (!(getActions().equals(""))) { string = string.append(' '); string = string.append(getActions()); } - + string = string.append(')'); - return string.toString(); + return string.toString(); } } // class Permission diff --git a/libjava/classpath/java/security/Permissions.java b/libjava/classpath/java/security/Permissions.java index 56f5ad8f5a0..d814064e06c 100644 --- a/libjava/classpath/java/security/Permissions.java +++ b/libjava/classpath/java/security/Permissions.java @@ -231,13 +231,13 @@ public final class Permissions extends PermissionCollection public boolean implies(Permission perm) { Enumeration elements = elements(); - + while (elements.hasMoreElements()) - { - Permission p = (Permission)elements.nextElement(); - if (p.implies(perm)) - return true; - } + { + Permission p = (Permission)elements.nextElement(); + if (p.implies(perm)) + return true; + } return false; } diff --git a/libjava/classpath/java/security/Policy.java b/libjava/classpath/java/security/Policy.java index de1ab80ef19..118626ea197 100644 --- a/libjava/classpath/java/security/Policy.java +++ b/libjava/classpath/java/security/Policy.java @@ -47,36 +47,36 @@ import java.util.Map; * policy for the Java application environment. It specifies which permissions * are available for code from various sources. The security policy is * represented through a subclass of Policy. - * + * *

        Only one Policy is in effect at any time. A * {@link ProtectionDomain} initializes itself with information from this class * on the set of permssions to grant.

        - * + * *

        The location for the actual Policy could be anywhere in any * form because it depends on the Policy implementation. The default system is * in a flat ASCII file or it could be in a database.

        - * + * *

        The current installed Policy can be accessed with * {@link #getPolicy()} and changed with {@link #setPolicy(Policy)} if the code * has the correct permissions.

        - * + * *

        The {@link #refresh()} method causes the Policy instance to * refresh/reload its configuration. The method used to refresh depends on the * Policy implementation.

        - * + * *

        When a protection domain initializes its permissions, it uses code like * the following:

        - * + * * * policy = Policy.getPolicy(); * PermissionCollection perms = policy.getPermissions(myCodeSource); * - * + * *

        The protection domain passes the Policy handler a * {@link CodeSource} instance which contains the codebase URL and a public key. * The Policy implementation then returns the proper set of * permissions for that {@link CodeSource}.

        - * + * *

        The default Policy implementation can be changed by setting * the "policy.provider" security provider in the "java.security" file to the * correct Policy implementation class.

        @@ -103,7 +103,7 @@ public abstract class Policy * Returns the currently installed Policy handler. The value * should not be cached as it can be changed any time by * {@link #setPolicy(Policy)}. - * + * * @return the current Policy. * @throws SecurityException * if a {@link SecurityManager} is installed which disallows this @@ -120,7 +120,7 @@ public abstract class Policy /** * Sets the Policy handler to a new value. - * + * * @param policy * the new Policy to use. * @throws SecurityException @@ -177,10 +177,10 @@ public abstract class Policy { currentPolicy = (Policy) Class.forName(pp).newInstance(); } - catch (Exception e) - { - // Ignored. - } + catch (Exception e) + { + // Ignored. + } if (currentPolicy == null) currentPolicy = new gnu.java.security.provider.DefaultPolicy(); @@ -200,7 +200,7 @@ public abstract class Policy /** * Returns the set of Permissions allowed for a given {@link CodeSource}. - * + * * @param codesource * the {@link CodeSource} for which, the caller needs to find the * set of granted permissions. @@ -214,7 +214,7 @@ public abstract class Policy /** * Returns the set of Permissions allowed for a given {@link ProtectionDomain}. - * + * * @param domain * the {@link ProtectionDomain} for which, the caller needs to find * the set of granted permissions. @@ -257,7 +257,7 @@ public abstract class Policy /** * Checks if the designated {@link Permission} is granted to a designated * {@link ProtectionDomain}. - * + * * @param domain * the {@link ProtectionDomain} to test. * @param permission diff --git a/libjava/classpath/java/security/ProtectionDomain.java b/libjava/classpath/java/security/ProtectionDomain.java index b1eb049e3f2..d5d657d615f 100644 --- a/libjava/classpath/java/security/ProtectionDomain.java +++ b/libjava/classpath/java/security/ProtectionDomain.java @@ -47,7 +47,7 @@ import gnu.java.lang.CPStringBuilder; * class loaded from the specified {@link CodeSource} is treated as part of * this domain. The set of permissions is represented by an instance of * {@link PermissionCollection}. - * + * *

        Every class in the system will belong to one and only one * ProtectionDomain.

        * @@ -77,7 +77,7 @@ public class ProtectionDomain * can be added later to the {@link PermissionCollection} and this contructor * will call the setReadOnly method on the specified set of * permissions. - * + * * @param codesource * The {@link CodeSource} for this domain. * @param permissions @@ -93,11 +93,11 @@ public class ProtectionDomain * This method initializes a new instance of ProtectionDomain * given its {@link CodeSource}, granted permissions, associated * {@link ClassLoader} and {@link Principal}s. - * + * *

        Similar to the previous constructor, if the designated set of * permissions is not null, the setReadOnly method * is called on that set.

        - * + * * @param codesource * The {@link CodeSource} for this domain. * @param permissions @@ -138,7 +138,7 @@ public class ProtectionDomain /** * Returns the {@link CodeSource} of this domain. - * + * * @return the {@link CodeSource} of this domain. * @since 1.2 */ @@ -149,7 +149,7 @@ public class ProtectionDomain /** * Returns the {@link ClassLoader} of this domain. - * + * * @return the {@link ClassLoader} of this domain. * @since 1.4 */ @@ -160,7 +160,7 @@ public class ProtectionDomain /** * Returns a clone of the {@link Principal}s of this domain. - * + * * @return a clone of the {@link Principal}s of this domain. * @since 1.4 */ @@ -171,7 +171,7 @@ public class ProtectionDomain /** * Returns the {@link PermissionCollection} of this domain. - * + * * @return The {@link PermissionCollection} of this domain. */ public final PermissionCollection getPermissions() @@ -182,7 +182,7 @@ public class ProtectionDomain /** * Tests whether or not the specified {@link Permission} is implied by the * set of permissions granted to this domain. - * + * * @param permission * the {@link Permission} to test. * @return true if the specified {@link Permission} is implied @@ -200,7 +200,7 @@ public class ProtectionDomain /** * Returns a string representation of this object. It will include the * {@link CodeSource} and set of permissions associated with this domain. - * + * * @return A string representation of this object. */ public String toString() diff --git a/libjava/classpath/java/security/Provider.java b/libjava/classpath/java/security/Provider.java index ea1dd9d3ff2..b1d6d9ce2a9 100644 --- a/libjava/classpath/java/security/Provider.java +++ b/libjava/classpath/java/security/Provider.java @@ -48,7 +48,7 @@ import java.util.Properties; * Providers are installed by name and version number. See the static * initializer of the {@link java.security.Security} class for the default * security providers installed by this class library. - * + * * @author Aaron M. Renn (arenn@urbanophile.com) */ public abstract class Provider @@ -99,7 +99,7 @@ public abstract class Provider /** * This method retunrs the version number of this Provider. - * + * * @return The Provider's version number. */ public double getVersion() @@ -126,7 +126,7 @@ public abstract class Provider * name is this provider's name. For the default implementation * this translates into a {@link SecurityManager#checkPermission(Permission)} * for a SecurityPermission("putProviderProperty." + name). - * + * * @param key The property key. * @param value The property value. * @return The previous value of the specified property (key), @@ -162,7 +162,7 @@ public abstract class Provider * name is this provider's name. For the default implementation * this translates into a {@link SecurityManager#checkPermission(Permission)} * for a SecurityPermission("removeProviderProperty." + name). - * + * * @param key The key to remove * @return The previous value for this key, or null if no * previous value. @@ -206,7 +206,7 @@ public abstract class Provider public String toString() { return (getClass().getName() + ": name=" + getName() + " version=" + - version); + version); } private Object toCanonicalKey(Object key) diff --git a/libjava/classpath/java/security/ProviderException.java b/libjava/classpath/java/security/ProviderException.java index 4559a170812..a2b469a6a77 100644 --- a/libjava/classpath/java/security/ProviderException.java +++ b/libjava/classpath/java/security/ProviderException.java @@ -39,7 +39,7 @@ package java.security; /** * This exception indicates that a runtime problem was encounterd with - * a security provider. + * a security provider. * * @author Aaron M. Renn (arenn@urbanophile.com) * @status updated to 1.4 diff --git a/libjava/classpath/java/security/SecureClassLoader.java b/libjava/classpath/java/security/SecureClassLoader.java index 6e173007e45..1480b71168a 100644 --- a/libjava/classpath/java/security/SecureClassLoader.java +++ b/libjava/classpath/java/security/SecureClassLoader.java @@ -41,7 +41,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; /** - * A Secure Class Loader for loading classes with additional + * A Secure Class Loader for loading classes with additional * support for specifying code source and permissions when * they are retrieved by the system policy handler. * @@ -63,8 +63,8 @@ public class SecureClassLoader extends ClassLoader { } - /** - * Creates a class using an array of bytes and a + /** + * Creates a class using an array of bytes and a * CodeSource. * * @param name the name to give the class. null if unknown. @@ -78,13 +78,13 @@ public class SecureClassLoader extends ClassLoader * @exception ClassFormatError if the byte array is not in proper classfile format. */ protected final Class defineClass(String name, byte[] b, int off, int len, - CodeSource cs) + CodeSource cs) { return super.defineClass(name, b, off, len, getProtectionDomain(cs)); } - /** - * Creates a class using an ByteBuffer and a + /** + * Creates a class using an ByteBuffer and a * CodeSource. * * @param name the name to give the class. null if unknown. @@ -109,31 +109,31 @@ public class SecureClassLoader extends ClassLoader ProtectionDomain protectionDomain = null; if (cs != null) { - synchronized (protectionDomainCache) - { - protectionDomain = protectionDomainCache.get(cs); - } + synchronized (protectionDomainCache) + { + protectionDomain = protectionDomainCache.get(cs); + } - if (protectionDomain == null) - { - protectionDomain - = new ProtectionDomain(cs, getPermissions(cs), this, null); - synchronized (protectionDomainCache) - { - ProtectionDomain domain = protectionDomainCache.get(cs); - if (domain == null) - protectionDomainCache.put(cs, protectionDomain); - else - protectionDomain = domain; - } - } + if (protectionDomain == null) + { + protectionDomain + = new ProtectionDomain(cs, getPermissions(cs), this, null); + synchronized (protectionDomainCache) + { + ProtectionDomain domain = protectionDomainCache.get(cs); + if (domain == null) + protectionDomainCache.put(cs, protectionDomain); + else + protectionDomain = domain; + } + } } return protectionDomain; } /** * Returns a PermissionCollection for the specified CodeSource. - * The default implementation invokes + * The default implementation invokes * java.security.Policy.getPermissions. * * This method is called by defineClass that takes a CodeSource diff --git a/libjava/classpath/java/security/SecureRandom.java b/libjava/classpath/java/security/SecureRandom.java index 0c7183879ce..abf4ff3083e 100644 --- a/libjava/classpath/java/security/SecureRandom.java +++ b/libjava/classpath/java/security/SecureRandom.java @@ -77,9 +77,9 @@ public class SecureRandom extends Random private static final long serialVersionUID = 4940670005562187L; //Serialized Field - long counter = 0; //Serialized + long counter = 0; //Serialized Provider provider = null; - byte[] randomBytes = null; //Always null + byte[] randomBytes = null; //Always null int randomBytesUsed = 0; SecureRandomSpi secureRandomSpi = null; byte[] state = null; @@ -91,9 +91,9 @@ public class SecureRandom extends Random // ------------------------------------------------------------------------ /** - Default constructor for SecureRandom. It constructs a - new SecureRandom by instantating the first SecureRandom - algorithm in the default security provier. + Default constructor for SecureRandom. It constructs a + new SecureRandom by instantating the first SecureRandom + algorithm in the default security provier. It is not seeded and should be seeded using setSeed or else on the first call to getnextBytes it will force a seed. @@ -134,9 +134,9 @@ public class SecureRandom extends Random throw death; } catch (Throwable t) - { - // Ignore. - } + { + // Ignore. + } } } } @@ -148,9 +148,9 @@ public class SecureRandom extends Random } /** - A constructor for SecureRandom. It constructs a new - SecureRandom by instantating the first SecureRandom algorithm - in the default security provier. + A constructor for SecureRandom. It constructs a new + SecureRandom by instantating the first SecureRandom algorithm + in the default security provier. It is seeded with the passed function and is useful if the user has access to hardware random device (like a radiation detector). @@ -167,9 +167,9 @@ public class SecureRandom extends Random } /** - A constructor for SecureRandom. It constructs a new + A constructor for SecureRandom. It constructs a new SecureRandom using the specified SecureRandomSpi from - the specified security provier. + the specified security provier. @param secureRandomSpi A SecureRandomSpi class @param provider A Provider class @@ -183,7 +183,7 @@ public class SecureRandom extends Random * Private constructor called from the getInstance() method. */ private SecureRandom(SecureRandomSpi secureRandomSpi, Provider provider, - String algorithm) + String algorithm) { this.secureRandomSpi = secureRandomSpi; this.provider = provider; @@ -193,7 +193,7 @@ public class SecureRandom extends Random /** * Returns an instance of a SecureRandom from the first provider * that implements it. - * + * * @param algorithm The algorithm name. * @return A new SecureRandom implementing the given algorithm. * @throws NoSuchAlgorithmException If no installed provider implements the @@ -223,7 +223,7 @@ public class SecureRandom extends Random /** * Returns an instance of a SecureRandom for the specified * algorithm from the named provider. - * + * * @param algorithm The algorithm name. * @param provider The provider name. * @return A new SecureRandom implementing the chosen @@ -252,7 +252,7 @@ public class SecureRandom extends Random /** * Returns an instance of a SecureRandom for the specified * algorithm from the given provider. - * + * * @param algorithm The SecureRandom algorithm to create. * @param provider The provider to use. * @throws NoSuchAlgorithmException If the algorithm cannot be found, or if @@ -313,7 +313,7 @@ public class SecureRandom extends Random } /** - Seeds the SecureRandom. The class is re-seeded for each call and + Seeds the SecureRandom. The class is re-seeded for each call and each seed builds on the previous seed so as not to weaken security. @param seed seed bytes to seed with @@ -325,7 +325,7 @@ public class SecureRandom extends Random } /** - Seeds the SecureRandom. The class is re-seeded for each call and + Seeds the SecureRandom. The class is re-seeded for each call and each seed builds on the previous seed so as not to weaken security. @param seed 8 seed bytes to seed with @@ -340,13 +340,13 @@ public class SecureRandom extends Random if (secureRandomSpi != null) { byte[] tmp = { (byte) (0xff & (seed >> 56)), - (byte) (0xff & (seed >> 48)), - (byte) (0xff & (seed >> 40)), - (byte) (0xff & (seed >> 32)), - (byte) (0xff & (seed >> 24)), - (byte) (0xff & (seed >> 16)), - (byte) (0xff & (seed >> 8)), - (byte) (0xff & seed) + (byte) (0xff & (seed >> 48)), + (byte) (0xff & (seed >> 40)), + (byte) (0xff & (seed >> 32)), + (byte) (0xff & (seed >> 24)), + (byte) (0xff & (seed >> 16)), + (byte) (0xff & (seed >> 8)), + (byte) (0xff & seed) }; secureRandomSpi.engineSetSeed(tmp); isSeeded = true; @@ -394,7 +394,7 @@ public class SecureRandom extends Random /** Returns the given number of seed bytes. This method is - maintained only for backwards capability. + maintained only for backwards capability. @param numBytes number of seed bytes to get diff --git a/libjava/classpath/java/security/SecureRandomSpi.java b/libjava/classpath/java/security/SecureRandomSpi.java index 7759097a456..08488ced701 100644 --- a/libjava/classpath/java/security/SecureRandomSpi.java +++ b/libjava/classpath/java/security/SecureRandomSpi.java @@ -40,11 +40,11 @@ import java.io.Serializable; /** SecureRandomSpi is the Service Provider Interface for SecureRandom - providers. It provides an interface for providers to the + providers. It provides an interface for providers to the SecureRandom engine to write their own pseudo-random number generator. - @since JDK 1.2 + @since JDK 1.2 @author Mark Benvenuto (ivymccough@worldnet.att.net) */ @@ -60,7 +60,7 @@ public abstract class SecureRandomSpi implements Serializable } /** - Updates the seed for SecureRandomSpi but does not reset seed. + Updates the seed for SecureRandomSpi but does not reset seed. It does to this so repeated called never decrease randomness. */ protected abstract void engineSetSeed(byte[] seed); @@ -74,7 +74,7 @@ public abstract class SecureRandomSpi implements Serializable protected abstract void engineNextBytes(byte[] bytes); /** - Gets a user specified number of bytes specified by the + Gets a user specified number of bytes specified by the parameter. @param numBytes number of random bytes to generate diff --git a/libjava/classpath/java/security/Security.java b/libjava/classpath/java/security/Security.java index 6b7b66428ec..6cd98b0fb84 100644 --- a/libjava/classpath/java/security/Security.java +++ b/libjava/classpath/java/security/Security.java @@ -70,7 +70,7 @@ public final class Security private static Vector providers = new Vector(); private static Properties secprops = new Properties(); - + static { String base = SystemProperties.getProperty("gnu.classpath.home.url"); @@ -78,36 +78,36 @@ public final class Security // Try VM specific security file boolean loaded = loadProviders (base, vendor); - + // Append classpath standard provider if possible if (!loadProviders (base, "classpath") - && !loaded - && providers.size() == 0) - { - if (Configuration.DEBUG) - { - /* No providers found and both security files failed to - * load properly. Give a warning in case of DEBUG is - * enabled. Could be done with java.util.logging later. - */ - System.err.println - ("WARNING: could not properly read security provider files:"); - System.err.println - (" " + base + "/security/" + vendor - + ".security"); - System.err.println - (" " + base + "/security/" + "classpath" - + ".security"); - System.err.println - (" Falling back to standard GNU security provider"); - } + && !loaded + && providers.size() == 0) + { + if (Configuration.DEBUG) + { + /* No providers found and both security files failed to + * load properly. Give a warning in case of DEBUG is + * enabled. Could be done with java.util.logging later. + */ + System.err.println + ("WARNING: could not properly read security provider files:"); + System.err.println + (" " + base + "/security/" + vendor + + ".security"); + System.err.println + (" " + base + "/security/" + "classpath" + + ".security"); + System.err.println + (" Falling back to standard GNU security provider"); + } // Note that this matches our classpath.security file. - providers.addElement (new gnu.java.security.provider.Gnu()); - providers.addElement(new gnu.javax.crypto.jce.GnuCrypto()); + providers.addElement (new gnu.java.security.provider.Gnu()); + providers.addElement(new gnu.javax.crypto.jce.GnuCrypto()); providers.addElement(new gnu.javax.crypto.jce.GnuSasl()); providers.addElement(new gnu.javax.net.ssl.provider.Jessie()); providers.addElement(new gnu.javax.security.auth.callback.GnuCallbacks()); - } + } } // This class can't be instantiated. private Security() @@ -128,44 +128,44 @@ public final class Security String secfilestr = baseUrl + "/security/" + vendor + ".security"; try { - InputStream fin = new URL(secfilestr).openStream(); - secprops.load(fin); + InputStream fin = new URL(secfilestr).openStream(); + secprops.load(fin); - int i = 1; - String name; - while ((name = secprops.getProperty("security.provider." + i)) != null) - { - Exception exception = null; - try - { - ClassLoader sys = ClassLoader.getSystemClassLoader(); - providers.addElement(Class.forName(name, true, sys).newInstance()); - } - catch (ClassNotFoundException x) - { - exception = x; - } - catch (InstantiationException x) - { - exception = x; - } - catch (IllegalAccessException x) - { - exception = x; - } + int i = 1; + String name; + while ((name = secprops.getProperty("security.provider." + i)) != null) + { + Exception exception = null; + try + { + ClassLoader sys = ClassLoader.getSystemClassLoader(); + providers.addElement(Class.forName(name, true, sys).newInstance()); + } + catch (ClassNotFoundException x) + { + exception = x; + } + catch (InstantiationException x) + { + exception = x; + } + catch (IllegalAccessException x) + { + exception = x; + } - if (exception != null) - { - System.err.println ("WARNING: Error loading security provider " - + name + ": " + exception); - result = false; - } - i++; - } + if (exception != null) + { + System.err.println ("WARNING: Error loading security provider " + + name + ": " + exception); + result = false; + } + i++; + } } catch (IOException ignored) { - result = false; + result = false; } return result; @@ -174,7 +174,7 @@ public final class Security /** * Returns the value associated to a designated property name for a given * algorithm. - * + * * @param algName * the algorithm name. * @param propName @@ -208,7 +208,7 @@ public final class Security /** * Inserts a new designated {@link Provider} at a designated (1-based) * position in the current list of installed {@link Provider}s, - * + * * @param provider * the new {@link Provider} to add. * @param position @@ -235,8 +235,8 @@ public final class Security int max = providers.size (); for (int i = 0; i < max; i++) { - if (((Provider) providers.elementAt(i)).getName().equals(provider.getName())) - return -1; + if (((Provider) providers.elementAt(i)).getName().equals(provider.getName())) + return -1; } if (position < 0) @@ -252,7 +252,7 @@ public final class Security /** * Appends the designated new {@link Provider} to the current list of * installed {@link Provider}s. - * + * * @param provider * the new {@link Provider} to append. * @return the position (starting from 1) of provider in the @@ -273,7 +273,7 @@ public final class Security /** * Removes an already installed {@link Provider}, given its name, from the * current list of installed {@link Provider}s. - * + * * @param name * the name of an already installed {@link Provider} to remove. * @throws SecurityException @@ -291,18 +291,18 @@ public final class Security int max = providers.size (); for (int i = 0; i < max; i++) { - if (((Provider) providers.elementAt(i)).getName().equals(name)) - { - providers.remove(i); - break; - } + if (((Provider) providers.elementAt(i)).getName().equals(name)) + { + providers.remove(i); + break; + } } } /** * Returns the current list of installed {@link Provider}s as an array * ordered according to their installation preference order. - * + * * @return an array of all the installed providers. */ public static Provider[] getProviders() @@ -314,7 +314,7 @@ public final class Security /** * Returns an already installed {@link Provider} given its name. - * + * * @param name * the name of an already installed {@link Provider}. * @return the {@link Provider} known by name. Returns @@ -337,16 +337,16 @@ public final class Security int max = providers.size (); for (int i = 0; i < max; i++) { - p = (Provider) providers.elementAt(i); - if (p.getName().equals(name)) - return p; + p = (Provider) providers.elementAt(i); + if (p.getName().equals(name)) + return p; } return null; } /** * Returns the value associated with a Security propery. - * + * * @param key * the key of the property to fetch. * @return the value of the Security property associated with @@ -372,7 +372,7 @@ public final class Security /** * Sets or changes a designated Security property to a designated value. - * + * * @param key * the name of the property to set. * @param datum @@ -399,7 +399,7 @@ public final class Security * For a given service (e.g. Signature, MessageDigest, etc...) this * method returns the {@link Set} of all available algorithm names (instances * of {@link String}, from all currently installed {@link Provider}s. - * + * * @param serviceName * the case-insensitive name of a service (e.g. Signature, * MessageDigest, etc). @@ -441,21 +441,21 @@ public final class Security * Returns an array of currently installed {@link Provider}s, ordered * according to their installation preference order, which satisfy a given * selection criterion. - * + * *

        This implementation recognizes a selection criterion written in * one of two following forms:

        - * + * *
          *
        • <crypto_service>.<algorithm_or_type>: Where * crypto_service is a case-insensitive string, similar to what has * been described in the {@link #getAlgorithms(String)} method, and * algorithm_or_type is a known case-insensitive name of an * Algorithm, or one of its aliases. - * + * *

          For example, "CertificateFactory.X.509" would return all the installed * {@link Provider}s which provide a CertificateFactory * implementation of X.509.

          • - * + * *
        • <crypto_service>.<algorithm_or_type> <attribute_name>:<value>: * Where crypto_service is a case-insensitive string, similar to what * has been described in the {@link #getAlgorithms(String)} method, @@ -463,13 +463,13 @@ public final class Security * or one of its aliases, attribute_name is a case-insensitive * property name with no whitespace characters, and no dots, in-between, and * value is a {@link String} with no whitespace characters in-between. - * + * *

          For example, "Signature.Sha1WithDSS KeySize:1024" would return all the * installed {@link Provider}s which declared their ability to provide * Signature services, using the Sha1WithDSS algorithm with * key sizes of 1024.

          • *
        - * + * * @param filter * the selection criterion for selecting among the installed * {@link Provider}s. @@ -503,11 +503,11 @@ public final class Security /** * Returns an array of currently installed {@link Provider}s which satisfy a * set of selection criteria. - * + * *

        The selection criteria are defined in a {@link Map} where each * element specifies a selection querry. The Keys in this * {@link Map} must be in one of the two following forms:

        - * + * *
          *
        • <crypto_service>.<algorithm_or_type>: Where * crypto_service is a case-insensitive string, similar to what has @@ -517,7 +517,7 @@ public final class Security * {@link Map} for such a Key MUST be the empty string. * {@link Provider}s which provide an implementation for the designated * service algorithm are included in the result.
          • - * + * *
        • <crypto_service>.<algorithm_or_type> <attribute_name>: * Where crypto_service is a case-insensitive string, similar to what * has been described in the {@link #getAlgorithms(String)} method, @@ -529,7 +529,7 @@ public final class Security * declare the designated attribute_name and value for the * designated service algorithm are included in the result.
          • *
        - * + * * @param filter * a {@link Map} of selection querries. * @return all currently installed {@link Provider}s which satisfy ALL the diff --git a/libjava/classpath/java/security/Signature.java b/libjava/classpath/java/security/Signature.java index 26333b68687..d7186395f71 100644 --- a/libjava/classpath/java/security/Signature.java +++ b/libjava/classpath/java/security/Signature.java @@ -52,30 +52,30 @@ import java.security.spec.AlgorithmParameterSpec; * Signature is used to provide an interface to digital signature * algorithms. Digital signatures provide authentication and data integrity of * digital data. - * + * *

        The GNU provider provides the NIST standard DSA which uses DSA and SHA-1. * It can be specified by SHA/DSA, SHA-1/DSA or its OID. If the RSA signature * algorithm is provided then it could be MD2/RSA. MD5/RSA, or SHA-1/RSA. The * algorithm must be specified because there is no default.

        - * + * *

        Signature provides implementation-independent algorithms which are * requested by the user through the getInstance() methods. It can * be requested by specifying just the algorithm name or by specifying both the * algorithm name and provider name.

        - * + * *

        The three phases of using Signature are:

        - * + * *
          *
        1. Initializing: *
            *
          • It must be initialized with a private key for signing.
            • *
          • It must be initialized with a public key for verifying.
            • * - * + * *
          • Updating: *

            Update the bytes for signing or verifying with calls to update.

            *
            • - * + * *
          • Signing or Verify the signature on the currently stored bytes by * calling sign or verify.
            • *
        @@ -117,7 +117,7 @@ public abstract class Signature extends SignatureSpi /** * Constructs a new Signature instance for a designated digital * signature algorithm. - * + * * @param algorithm * the algorithm to use. */ @@ -130,7 +130,7 @@ public abstract class Signature extends SignatureSpi /** * Returns an instance of Signature representing the specified * signature. - * + * * @param algorithm the algorithm to use. * @return a new instance repesenting the desired algorithm. * @throws NoSuchAlgorithmException if the algorithm is not implemented by any @@ -160,7 +160,7 @@ public abstract class Signature extends SignatureSpi /** * Returns an instance of Signature representing the specified * signature from the named provider. - * + * * @param algorithm the algorithm to use. * @param provider the name of the provider to use. * @return a new instance repesenting the desired algorithm. @@ -187,7 +187,7 @@ public abstract class Signature extends SignatureSpi /** * Returns an instance of Signature representing the specified * signature from the specified {@link Provider}. - * + * * @param algorithm the algorithm to use. * @param provider the {@link Provider} to use. * @return a new instance repesenting the desired algorithm. @@ -239,7 +239,7 @@ public abstract class Signature extends SignatureSpi /** * Returns the {@link Provider} of this instance. - * + * * @return the {@link Provider} of this instance. */ public final Provider getProvider() @@ -249,7 +249,7 @@ public abstract class Signature extends SignatureSpi /** * Initializes this instance with the public key for verification purposes. - * + * * @param publicKey * the public key to verify with. * @throws InvalidKeyException @@ -264,11 +264,11 @@ public abstract class Signature extends SignatureSpi /** * Verify a signature with a designated {@link Certificate}. This is a FIPS * 140-1 compatible method since it verifies a signature with a certificate. - * + * *

        If the {@link Certificate} is an X.509 one, has a KeyUsage * parameter and that parameter indicates this key is not to be used for * signing then an exception is thrown.

        - * + * * @param certificate * a {@link Certificate} containing a public key to verify with. * @throws InvalidKeyException if the key is invalid. @@ -290,7 +290,7 @@ public abstract class Signature extends SignatureSpi /** * Initializes this class with the private key for signing purposes. - * + * * @param privateKey * the private key to sign with. * @throws InvalidKeyException @@ -305,7 +305,7 @@ public abstract class Signature extends SignatureSpi /** * Initializes this class with the private key and source of randomness for * signing purposes. - * + * * @param privateKey * the private key to sign with. * @param random @@ -323,7 +323,7 @@ public abstract class Signature extends SignatureSpi /** * Returns the signature bytes of all the data fed to this instance. The * format of the output depends on the underlying signature algorithm. - * + * * @return the signature bytes. * @throws SignatureException * if the engine is not properly initialized. @@ -340,15 +340,15 @@ public abstract class Signature extends SignatureSpi * Generates signature bytes of all the data fed to this instance and stores * it in the designated array. The format of the result depends on the * underlying signature algorithm. - * + * *

        After calling this method, the instance is reset to its initial state * and can then be used to generate additional signatures.

        - * + * *

        IMPLEMENTATION NOTE: Neither this method nor the GNU provider * will return partial digests. If len is less than the * signature length, this method will throw a {@link SignatureException}. If * it is greater than or equal then it is ignored.

        - * + * * @param outbuf * array of bytes of where to store the resulting signature bytes. * @param offset @@ -371,7 +371,7 @@ public abstract class Signature extends SignatureSpi /** * Verifies a designated signature. - * + * * @param signature * the signature bytes to verify. * @return true if verified, false otherwise. @@ -389,7 +389,7 @@ public abstract class Signature extends SignatureSpi /** * Verifies a designated signature. - * + * * @param signature * the signature bytes to verify. * @param offset @@ -427,7 +427,7 @@ public abstract class Signature extends SignatureSpi /** * Updates the data to be signed or verified with the specified byte. - * + * * @param b * the byte to update with. * @throws SignatureException @@ -443,7 +443,7 @@ public abstract class Signature extends SignatureSpi /** * Updates the data to be signed or verified with the specified bytes. - * + * * @param data * the array of bytes to use. * @throws SignatureException @@ -459,7 +459,7 @@ public abstract class Signature extends SignatureSpi /** * Updates the data to be signed or verified with the specified bytes. - * + * * @param data * an array of bytes to use. * @param off @@ -477,11 +477,11 @@ public abstract class Signature extends SignatureSpi else throw new SignatureException(); } - + /** * Update this signature with the {@link java.nio.Buffer#remaining()} * bytes of the input buffer. - * + * * @param input The input buffer. * @throws SignatureException If this instance was not properly * initialized. @@ -497,7 +497,7 @@ public abstract class Signature extends SignatureSpi /** * Returns the name of the algorithm currently used. The names of algorithms * are usually SHA/DSA or SHA/RSA. - * + * * @return name of algorithm. */ public final String getAlgorithm() @@ -507,7 +507,7 @@ public abstract class Signature extends SignatureSpi /** * Returns a rstring representation of this instance. - * + * * @return a rstring representation of this instance. */ public String toString() @@ -517,7 +517,7 @@ public abstract class Signature extends SignatureSpi /** * Sets the specified algorithm parameter to the specified value. - * + * * @param param * the parameter name. * @param value @@ -535,10 +535,10 @@ public abstract class Signature extends SignatureSpi /** * Sets the signature engine with the specified {@link AlgorithmParameterSpec}. - * + * *

        By default, and unless overriden by the concrete SPI, this method always * throws an {@link UnsupportedOperationException}.

        - * + * * @param params * the parameters to use for intializing this instance. * @throws InvalidParameterException @@ -554,7 +554,7 @@ public abstract class Signature extends SignatureSpi /** * Return the parameters of the algorithm used in this instance as an * {@link AlgorithmParameters}. - * + * * @return the parameters used with this instance, or null if * this instance does not use any parameters. */ @@ -565,7 +565,7 @@ public abstract class Signature extends SignatureSpi /** * Returns the value for the specified algorithm parameter. - * + * * @param param * the parameter name. * @return the parameter value. @@ -581,7 +581,7 @@ public abstract class Signature extends SignatureSpi /** * Returns a clone of this instance. - * + * * @return a clone of this instace. * @throws CloneNotSupportedException * if the implementation does not support cloning. diff --git a/libjava/classpath/java/security/SignatureSpi.java b/libjava/classpath/java/security/SignatureSpi.java index 80ecbfd44e0..1ed078c0b2a 100644 --- a/libjava/classpath/java/security/SignatureSpi.java +++ b/libjava/classpath/java/security/SignatureSpi.java @@ -65,7 +65,7 @@ public abstract class SignatureSpi /** * Initializes this instance with the public key for verification purposes. - * + * * @param publicKey * the public key to verify with. * @throws InvalidKeyException @@ -76,7 +76,7 @@ public abstract class SignatureSpi /** * Initializes this instance with the private key for signing purposes. - * + * * @param privateKey * the private key to sign with. * @throws InvalidKeyException @@ -88,9 +88,9 @@ public abstract class SignatureSpi /** * Initializes this instance with the private key and source of randomness for * signing purposes. - * + * *

        This method cannot be abstract for backward compatibility reasons.

        - * + * * @param privateKey * the private key to sign with. * @param random @@ -108,7 +108,7 @@ public abstract class SignatureSpi /** * Updates the data to be signed or verified with the specified byte. - * + * * @param b * byte to update with. * @throws SignatureException @@ -118,7 +118,7 @@ public abstract class SignatureSpi /** * Updates the data to be signed or verified with the specified bytes. - * + * * @param b * the array of bytes to use. * @param off @@ -134,7 +134,7 @@ public abstract class SignatureSpi /** * Update this signature with the {@link java.nio.Buffer#remaining()} * bytes of the given buffer. - * + * * @param input The input buffer. * @throws IllegalStateException if the engine is not properly initialized. */ @@ -155,11 +155,11 @@ public abstract class SignatureSpi } } } - + /** * Returns the signature bytes of all the data fed to this instance. The * format of the output depends on the underlying signature algorithm. - * + * * @return the signature bytes. * @throws SignatureException * if the engine is not properly initialized. @@ -170,16 +170,16 @@ public abstract class SignatureSpi * Generates signature bytes of all the data fed to this instance and stores * the result in the designated array. The format of the output depends on * the underlying signature algorithm. - * + * *

        This method cannot be abstract for backward compatibility reasons. * After calling this method, the signature is reset to its initial state and * can be used to generate additional signatures.

        - * + * *

        IMPLEMENTATION NOTE:: Neither this method nor the GNU provider * will return partial digests. If len is less than the * signature length, this method will throw a {@link SignatureException}. If * it is greater than or equal then it is ignored.

        - * + * * @param outbuf * the array of bytes to store the result in. * @param offset @@ -204,7 +204,7 @@ public abstract class SignatureSpi /** * Verifies a designated signature. - * + * * @param sigBytes * the signature bytes to verify. * @return true if verified, false otherwise. @@ -219,7 +219,7 @@ public abstract class SignatureSpi * Convenience method which calls the method with the same name and one * argument after copying the designated bytes into a temporary byte array. * Subclasses may override this method for performance reasons. - * + * * @param sigBytes * the array of bytes to use. * @param offset @@ -240,7 +240,7 @@ public abstract class SignatureSpi /** * Sets the specified algorithm parameter to the specified value. - * + * * @param param * the parameter name. * @param value @@ -255,11 +255,11 @@ public abstract class SignatureSpi /** * Sets the signature engine with the specified {@link AlgorithmParameterSpec}. - * + * *

        This method cannot be abstract for backward compatibility reasons. By * default it always throws {@link UnsupportedOperationException} unless * overridden.

        - * + * * @param params * the parameters. * @throws InvalidParameterException @@ -278,7 +278,7 @@ public abstract class SignatureSpi * implementations to return the appropriate {@link AlgorithmParameters} for * this signature engine (or null when that engine does not use * any parameters. - * + * * @return the parameters used with this signature engine, or * null if it does not use any parameters. * @throws UnsupportedOperationException @@ -291,7 +291,7 @@ public abstract class SignatureSpi /** * Returns the value for the specified algorithm parameter. - * + * * @param param * the parameter name. * @return the parameter value. @@ -304,7 +304,7 @@ public abstract class SignatureSpi /** * Returns a clone of this instance. - * + * * @return a clone of this instance. * @throws CloneNotSupportedException * if the implementation does not support cloning. diff --git a/libjava/classpath/java/security/SignedObject.java b/libjava/classpath/java/security/SignedObject.java index be5a6746122..79f551cce1c 100644 --- a/libjava/classpath/java/security/SignedObject.java +++ b/libjava/classpath/java/security/SignedObject.java @@ -48,27 +48,27 @@ import java.io.Serializable; /** * SignedObject is used for storing runtime objects whose * integrity cannot be compromised without being detected. - * + * *

        SignedObject contains a {@link Serializable} object which is * yet to be signed and a digital signature of that object.

        - * + * *

        The signed copy is a "deep copy" (in serialized form) of an original * object. Any changes to that original instance are not reflected in the * enclosed copy inside this SignedObject.

        - * + * *

        Several things to note are that, first there is no need to initialize the * signature engine as this class will handle that automatically. Second, * verification will only succeed if the public key corresponds to the private * key used to generate the digital signature inside this * SignedObject.

        - * + * *

        For fexibility, the signature engine can be specified in the constructor * or the verify() method. Programmers wishing to verify * SignedObjects should be aware of the {@link Signature} engine * they use. A malicious or flawed {@link Signature} implementation may always * return true on verification thus circumventing the intended secrity check * provided by the SignedObject.

        - * + * *

        The GNU security provider offers an implementation of the standard NIST * DSA which uses "DSA" and "SHA-1". It can be specified by "SHA/DSA", * "SHA-1/DSA" or its OID. If the RSA signature algorithm is provided then it @@ -94,7 +94,7 @@ public final class SignedObject implements Serializable * Constructs a new instance of SignedObject from a * {@link Serializable} object. The object is signed with a designated * private key and a signature engine. - * + * * @param object * the object to sign. * @param signingKey @@ -109,7 +109,7 @@ public final class SignedObject implements Serializable * if a signing error occurs. */ public SignedObject(Serializable object, PrivateKey signingKey, - Signature signingEngine) + Signature signingEngine) throws IOException, InvalidKeyException, SignatureException { thealgorithm = signingEngine.getAlgorithm(); @@ -130,7 +130,7 @@ public final class SignedObject implements Serializable /** * Returns the encapsulated object. The object is de-serialized before being * returned. - * + * * @return the encapsulated object. * @throws IOException * if a de-serialization error occurs. @@ -150,7 +150,7 @@ public final class SignedObject implements Serializable /** * Returns the signature bytes of the encapsulated object. - * + * * @return the signature bytes of the encapsulated object. */ public byte[] getSignature() @@ -161,7 +161,7 @@ public final class SignedObject implements Serializable /** * Returns the name of the signature algorithm. - * + * * @return the name of the signature algorithm. */ public String getAlgorithm() @@ -172,7 +172,7 @@ public final class SignedObject implements Serializable /** * Verifies the encapsulated digital signature by checking that it was * generated by the owner of a designated public key. - * + * * @param verificationKey * the public key to use. * @param verificationEngine diff --git a/libjava/classpath/java/security/Signer.java b/libjava/classpath/java/security/Signer.java index c7780f6d3aa..18259c86358 100644 --- a/libjava/classpath/java/security/Signer.java +++ b/libjava/classpath/java/security/Signer.java @@ -58,7 +58,7 @@ public abstract class Signer extends Identity /** * Constructs a new instance of Signer with the specified * identity name. - * + * * @param name * the name of the identity to use. */ @@ -70,7 +70,7 @@ public abstract class Signer extends Identity /** * Constructs a new instance of Signer with the specified * identity name and {@link IdentityScope}. - * + * * @param name * the name of the the identity to use. * @param scope @@ -86,7 +86,7 @@ public abstract class Signer extends Identity /** * Returns the private key of this Signer. - * + * * @returns the private key of this Signer. * @throws SecurityException * if a {@link SecurityManager} is installed which disallows this @@ -103,7 +103,7 @@ public abstract class Signer extends Identity /** * Specifies the {@link KeyPair} associated with this Signer. - * + * * @param pair * the {@link KeyPair} to use. * @throws InvalidParameterException diff --git a/libjava/classpath/java/security/acl/Acl.java b/libjava/classpath/java/security/acl/Acl.java index 6a3f7d52a87..10a59fdf507 100644 --- a/libjava/classpath/java/security/acl/Acl.java +++ b/libjava/classpath/java/security/acl/Acl.java @@ -50,7 +50,7 @@ import java.util.Enumeration; * denied, the ACL treats it as if it were never granted or denied. If * both a Principal and a Group to which the * Principal belongs have an ACL entry, the permissions for - * the individual Principal take precedence over the + * the individual Principal take precedence over the * permissions of the Group if there is a conflict. *

        * Additionally, the ACL interface extends the Owner interface @@ -94,7 +94,7 @@ public interface Acl extends Owner * * @exception NotOwnerException If the caller is not an owner of this ACL. */ - boolean addEntry(Principal caller, AclEntry entry) + boolean addEntry(Principal caller, AclEntry entry) throws NotOwnerException; /** diff --git a/libjava/classpath/java/security/acl/AclEntry.java b/libjava/classpath/java/security/acl/AclEntry.java index ea906f184d8..47154b28591 100644 --- a/libjava/classpath/java/security/acl/AclEntry.java +++ b/libjava/classpath/java/security/acl/AclEntry.java @@ -42,10 +42,10 @@ import java.util.Enumeration; /** * This interface models an entry in an access control list (ACL). Java - * ACL's consist of a list of entries, where each consists of a + * ACL's consist of a list of entries, where each consists of a * Principal and a list of Permission's which * have been granted to that Principal. An ACL can also - * be negative, which indicates that the list of + * be negative, which indicates that the list of * Permission's is a list of permissions that are not * granted to the Principal. A Principal can * have at most one regular (or positive) ACL entry and one negative diff --git a/libjava/classpath/java/security/acl/Group.java b/libjava/classpath/java/security/acl/Group.java index ed6d56a572e..a0df75526c5 100644 --- a/libjava/classpath/java/security/acl/Group.java +++ b/libjava/classpath/java/security/acl/Group.java @@ -81,7 +81,7 @@ public interface Group extends Principal boolean isMember(Principal member); /** - * This method returns a list of all members of the group as an + * This method returns a list of all members of the group as an * Enumeration. * * @return The list of all members of the group diff --git a/libjava/classpath/java/security/acl/Owner.java b/libjava/classpath/java/security/acl/Owner.java index df1605b2e4f..c671cd362a6 100644 --- a/libjava/classpath/java/security/acl/Owner.java +++ b/libjava/classpath/java/security/acl/Owner.java @@ -64,7 +64,7 @@ public interface Owner * * @exception NotOwnerException If the caller is not already an owner of this ACL */ - boolean addOwner(Principal caller, Principal owner) + boolean addOwner(Principal caller, Principal owner) throws NotOwnerException; /** @@ -82,7 +82,7 @@ public interface Owner * @exception NotOwnerException If the caller is not already an owner of this ACL * @exception LastOwnerException If completing the operation would delete the last ACL owner */ - boolean deleteOwner(Principal caller, Principal owner) + boolean deleteOwner(Principal caller, Principal owner) throws NotOwnerException, LastOwnerException; /** diff --git a/libjava/classpath/java/security/cert/CRL.java b/libjava/classpath/java/security/cert/CRL.java index e763663f52c..1eaa70fa9a0 100644 --- a/libjava/classpath/java/security/cert/CRL.java +++ b/libjava/classpath/java/security/cert/CRL.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,11 +43,11 @@ package java.security.cert; have different formats but the same general use. They all serve as lists of revoked certificates and can be queried for a given certificate. - + Specialized CRLs extend this class. - + @author Mark Benvenuto - + @since JDK 1.2 */ public abstract class CRL @@ -59,7 +59,7 @@ public abstract class CRL Creates a new CRL for the specified type. An example is "X.509". - @param type the standard name for the CRL type. + @param type the standard name for the CRL type. */ protected CRL(String type) { @@ -90,7 +90,7 @@ public abstract class CRL @param cert A certificate to check if it is revoked @return true if the certificate is revoked, - false otherwise. + false otherwise. */ public abstract boolean isRevoked(Certificate cert); diff --git a/libjava/classpath/java/security/cert/CRLSelector.java b/libjava/classpath/java/security/cert/CRLSelector.java index 1fa5a207dfc..6cd657c7ff6 100644 --- a/libjava/classpath/java/security/cert/CRLSelector.java +++ b/libjava/classpath/java/security/cert/CRLSelector.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/CertPathBuilder.java b/libjava/classpath/java/security/cert/CertPathBuilder.java index 99f7c975252..47bae6db80c 100644 --- a/libjava/classpath/java/security/cert/CertPathBuilder.java +++ b/libjava/classpath/java/security/cert/CertPathBuilder.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -116,7 +116,7 @@ public class CertPathBuilder /** * Returns an instance of a named CertPathBuilder from the * first provider that implements it. - * + * * @param algorithm The name of the CertPathBuilder to create. * @return The new instance. * @throws NoSuchAlgorithmException If no installed provider implements the @@ -146,7 +146,7 @@ public class CertPathBuilder /** * Returns an instance of a named CertPathBuilder from a named * provider. - * + * * @param algorithm The name of the CertPathBuilder to create. * @param provider The name of the provider to use. * @return The new instance. @@ -171,7 +171,7 @@ public class CertPathBuilder /** * Returns an instance of a named CertPathBuilder from the * specified provider. - * + * * @param algorithm The name of the CertPathBuilder to create. * @param provider The provider to use. * @return The new instance. diff --git a/libjava/classpath/java/security/cert/CertPathBuilderResult.java b/libjava/classpath/java/security/cert/CertPathBuilderResult.java index 737ba9431b3..edae88f64c3 100644 --- a/libjava/classpath/java/security/cert/CertPathBuilderResult.java +++ b/libjava/classpath/java/security/cert/CertPathBuilderResult.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,17 +47,17 @@ package java.security.cert; */ public interface CertPathBuilderResult extends Cloneable { - /** + /** * Creates a copy of this builder result. * * @return The copy. */ - Object clone(); + Object clone(); /** * Get the certificate path that was built. * * @retrn The certificate path. */ - CertPath getCertPath(); + CertPath getCertPath(); } diff --git a/libjava/classpath/java/security/cert/CertPathValidator.java b/libjava/classpath/java/security/cert/CertPathValidator.java index af08b54a84e..8bd7b58e8fb 100644 --- a/libjava/classpath/java/security/cert/CertPathValidator.java +++ b/libjava/classpath/java/security/cert/CertPathValidator.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -129,7 +129,7 @@ public class CertPathValidator { /** * Returns an instance of the given validator from the first provider that * implements it. - * + * * @param algorithm The name of the algorithm to get. * @return The new instance. * @throws NoSuchAlgorithmException If no installed provider implements the @@ -158,7 +158,7 @@ public class CertPathValidator { /** * Returns an instance of the given validator from the named provider. - * + * * @param algorithm The name of the algorithm to get. * @param provider The name of the provider from which to get the * implementation. @@ -184,7 +184,7 @@ public class CertPathValidator { /** * Returns an instance of the given validator from the given provider. - * + * * @param algorithm The name of the algorithm to get. * @param provider The provider from which to get the implementation. * @return The new instance. diff --git a/libjava/classpath/java/security/cert/CertPathValidatorResult.java b/libjava/classpath/java/security/cert/CertPathValidatorResult.java index 71aaf89bc18..0ccd1be78ce 100644 --- a/libjava/classpath/java/security/cert/CertPathValidatorResult.java +++ b/libjava/classpath/java/security/cert/CertPathValidatorResult.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/CertPathValidatorSpi.java b/libjava/classpath/java/security/cert/CertPathValidatorSpi.java index 282b7a695b9..d4531e716e1 100644 --- a/libjava/classpath/java/security/cert/CertPathValidatorSpi.java +++ b/libjava/classpath/java/security/cert/CertPathValidatorSpi.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/CertSelector.java b/libjava/classpath/java/security/cert/CertSelector.java index aea614ad95e..4a2e7d921c0 100644 --- a/libjava/classpath/java/security/cert/CertSelector.java +++ b/libjava/classpath/java/security/cert/CertSelector.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/CertStore.java b/libjava/classpath/java/security/cert/CertStore.java index 1ebdb50337b..630e9676295 100644 --- a/libjava/classpath/java/security/cert/CertStore.java +++ b/libjava/classpath/java/security/cert/CertStore.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -128,7 +128,7 @@ public class CertStore /** * Returns an instance of the given certificate store type from the first * installed provider. - * + * * @param type The type of CertStore to create. * @param params The parameters to initialize this cert store with. * @return The new instance. @@ -161,7 +161,7 @@ public class CertStore /** * Returns an instance of the given certificate store type from a named * provider. - * + * * @param type The type of CertStore to create. * @param params The parameters to initialize this cert store with. * @param provider The name of the provider to use. diff --git a/libjava/classpath/java/security/cert/CertStoreParameters.java b/libjava/classpath/java/security/cert/CertStoreParameters.java index aab22f01fda..71bcd61090f 100644 --- a/libjava/classpath/java/security/cert/CertStoreParameters.java +++ b/libjava/classpath/java/security/cert/CertStoreParameters.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/CertStoreSpi.java b/libjava/classpath/java/security/cert/CertStoreSpi.java index 976d65ce922..a47978a2247 100644 --- a/libjava/classpath/java/security/cert/CertStoreSpi.java +++ b/libjava/classpath/java/security/cert/CertStoreSpi.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/Certificate.java b/libjava/classpath/java/security/cert/Certificate.java index 33a14a43983..be1713cbf0c 100644 --- a/libjava/classpath/java/security/cert/Certificate.java +++ b/libjava/classpath/java/security/cert/Certificate.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,18 +49,18 @@ import java.security.PublicKey; import java.security.SignatureException; /** - * The Certificate class is an abstract class used to manage + * The Certificate class is an abstract class used to manage * identity certificates. An identity certificate is a - * combination of a principal and a public key which is - * certified by another principal. This is the puprose of + * combination of a principal and a public key which is + * certified by another principal. This is the puprose of * Certificate Authorities (CA). - * + * *

        This class is used to manage different types of certificates - * but have important common puposes. Different types of + * but have important common puposes. Different types of * certificates like X.509 and OpenPGP share general certificate * functions (like encoding and verifying) and information like * public keys. - * + * *

        X.509, OpenPGP, and SDSI can be implemented by subclassing this * class even though they differ in storage methods and information * stored. @@ -74,7 +74,7 @@ import java.security.SignatureException; public abstract class Certificate implements Serializable { private static final long serialVersionUID = -3585440601605666277L; - + private String type; /** @@ -111,19 +111,19 @@ public abstract class Certificate implements Serializable { if( other instanceof Certificate ) { try { - Certificate x = (Certificate) other; - if( getEncoded().length != x.getEncoded().length ) - return false; + Certificate x = (Certificate) other; + if( getEncoded().length != x.getEncoded().length ) + return false; - byte[] b1 = getEncoded(); - byte[] b2 = x.getEncoded(); + byte[] b1 = getEncoded(); + byte[] b2 = x.getEncoded(); - for( int i = 0; i < b1.length; i++ ) - if( b1[i] != b2[i] ) - return false; + for( int i = 0; i < b1.length; i++ ) + if( b1[i] != b2[i] ) + return false; - } catch( CertificateEncodingException cee ) { - return false; + } catch( CertificateEncodingException cee ) { + return false; } return true; } @@ -154,7 +154,7 @@ public abstract class Certificate implements Serializable /** Verifies that this Certificate was properly signed with the - PublicKey that corresponds to its private key. + PublicKey that corresponds to its private key. @param key PublicKey to verify with @@ -174,7 +174,7 @@ public abstract class Certificate implements Serializable /** Verifies that this Certificate was properly signed with the PublicKey that corresponds to its private key and uses - the signature engine provided by the provider. + the signature engine provided by the provider. @param key PublicKey to verify with @param sigProvider Provider to use for signature algorithm @@ -186,7 +186,7 @@ public abstract class Certificate implements Serializable @throws SignatureException signature error */ public abstract void verify(PublicKey key, - String sigProvider) + String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, @@ -251,7 +251,7 @@ public abstract class Certificate implements Serializable /** From JDK1.4. */ private static final long serialVersionUID = -8563758940495660020L; - + /** The certificate type, e.g. "X.509". */ private String type; diff --git a/libjava/classpath/java/security/cert/CertificateFactory.java b/libjava/classpath/java/security/cert/CertificateFactory.java index d83b8160e27..4fd5b39655d 100644 --- a/libjava/classpath/java/security/cert/CertificateFactory.java +++ b/libjava/classpath/java/security/cert/CertificateFactory.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -88,7 +88,7 @@ public class CertificateFactory /** * Returns an instance of a CertificateFactory representing the * specified certificate factory type. - * + * * @param type The type of certificate factory to create. * @return A CertificateFactory of the desired type. * @throws CertificateException If the type of certificate factory is not @@ -118,7 +118,7 @@ public class CertificateFactory /** * Returns an instance of a CertificateFactory representing the * specified certificate factory type from the named provider. - * + * * @param type The type of certificate factory to create. * @param provider The name of the provider to use. * @return A CertificateFactory for the desired type. @@ -130,7 +130,7 @@ public class CertificateFactory * type is an empty string. */ public static final CertificateFactory getInstance(String type, - String provider) + String provider) throws CertificateException, NoSuchProviderException { if (provider == null) @@ -144,7 +144,7 @@ public class CertificateFactory /** * Returns an instance of a CertificateFactory representing the * specified certificate factory type from the designated provider. - * + * * @param type The type of certificate factory to create. * @param provider The provider from which to get the implementation. * @return A CertificateFactory for the desired type. @@ -213,10 +213,10 @@ public class CertificateFactory * Ex: A X.509 CertificateFactory should return X509Certificate. * *

        For X.509 certificates, the certificate in inStream must be - * DER encoded and supplied in binary or printable (Base64) - * encoding. If the certificate is in Base64 encoding, it must be - * bounded by -----BEGINCERTIFICATE-----, and - * -----END CERTIFICATE-----. + * DER encoded and supplied in binary or printable (Base64) + * encoding. If the certificate is in Base64 encoding, it must be + * bounded by -----BEGINCERTIFICATE-----, and + * -----END CERTIFICATE-----. * * @param inStream An input stream containing the certificate data. * @return A certificate initialized from the decoded InputStream data. @@ -230,16 +230,16 @@ public class CertificateFactory } /** - * Returns a collection of certificates that were read from the - * input stream. It may be empty, have only one, or have + * Returns a collection of certificates that were read from the + * input stream. It may be empty, have only one, or have * multiple certificates. * * For a X.509 certificate factory, the stream may contain a - * single DER encoded certificate or a PKCS#7 certificate - * chain. This is a PKCS#7 SignedData object with the - * most significant field being certificates. If no + * single DER encoded certificate or a PKCS#7 certificate + * chain. This is a PKCS#7 SignedData object with the + * most significant field being certificates. If no * CRLs are present, then an empty collection is returned. - * + * * @param inStream An input stream containing the certificate data. * @return A collection of certificates initialized from the decoded * InputStream data. @@ -278,8 +278,8 @@ public class CertificateFactory * from the InputStream. * *

        For a X.509 certificate factory, the stream may contain a - * single DER encoded CRL or a PKCS#7 CRL set. This is a - * PKCS#7 SignedData object with the most significant + * single DER encoded CRL or a PKCS#7 CRL set. This is a + * PKCS#7 SignedData object with the most significant * field being crls. If no CRLs are present, then an * empty collection is returned. * diff --git a/libjava/classpath/java/security/cert/CertificateFactorySpi.java b/libjava/classpath/java/security/cert/CertificateFactorySpi.java index e6a22b4ebf8..2c9ca5d3831 100644 --- a/libjava/classpath/java/security/cert/CertificateFactorySpi.java +++ b/libjava/classpath/java/security/cert/CertificateFactorySpi.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -47,15 +47,15 @@ import java.util.List; /** CertificateFactorySpi is the abstract class Service Provider Interface (SPI) for the CertificateFactory class. A provider - must implement all the abstract methods if they wish to + must implement all the abstract methods if they wish to supply a certificate factory for a particular certificate type. Ex: X.509 - + Certificate factories are used to generate certificates and certificate revocation lists (CRL) from their encoding. - + @since 1.2 - + @author Mark Benvenuto */ public abstract class CertificateFactorySpi @@ -85,10 +85,10 @@ public abstract class CertificateFactorySpi Ex: A X.509 CertificateFactory should return X509Certificate. For X.509 certificates, the certificate in inStream must be - DER encoded and supplied in binary or printable (Base64) - encoding. If the certificate is in Base64 encoding, it must be - bounded by -----BEGIN CERTIFICATE-----, and - -----END CERTIFICATE-----. + DER encoded and supplied in binary or printable (Base64) + encoding. If the certificate is in Base64 encoding, it must be + bounded by -----BEGIN CERTIFICATE-----, and + -----END CERTIFICATE-----. @param inStream an input stream containing the certificate data @@ -100,19 +100,19 @@ public abstract class CertificateFactorySpi throws CertificateException; /** - Returns a collection of certificates that were read from the - input stream. It may be empty, have only one, or have + Returns a collection of certificates that were read from the + input stream. It may be empty, have only one, or have multiple certificates. For a X.509 certificate factory, the stream may contain a - single DER encoded certificate or a PKCS#7 certificate - chain. This is a PKCS#7 SignedData object with the - most significant field being certificates. If no + single DER encoded certificate or a PKCS#7 certificate + chain. This is a PKCS#7 SignedData object with the + most significant field being certificates. If no CRLs are present, then an empty collection is returned. - + @param inStream an input stream containing the certificates - @return a collection of certificates initialized with + @return a collection of certificates initialized with the InputStream data. @throws CertificateException Certificate parsing error @@ -145,14 +145,14 @@ public abstract class CertificateFactorySpi from the InputStream. For a X.509 certificate factory, the stream may contain a - single DER encoded CRL or a PKCS#7 CRL set. This is a - PKCS#7 SignedData object with the most significant + single DER encoded CRL or a PKCS#7 CRL set. This is a + PKCS#7 SignedData object with the most significant field being crls. If no CRLs are present, then an empty collection is returned. @param inStream an input stream containing the CRLs - @return a collection of CRLs initialized with + @return a collection of CRLs initialized with the InputStream data. @throws CRLException CRL parsing error @@ -222,4 +222,3 @@ public abstract class CertificateFactorySpi throw new UnsupportedOperationException("not implemented"); } } - diff --git a/libjava/classpath/java/security/cert/CollectionCertStoreParameters.java b/libjava/classpath/java/security/cert/CollectionCertStoreParameters.java index b3ee93235f8..3898748540f 100644 --- a/libjava/classpath/java/security/cert/CollectionCertStoreParameters.java +++ b/libjava/classpath/java/security/cert/CollectionCertStoreParameters.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/LDAPCertStoreParameters.java b/libjava/classpath/java/security/cert/LDAPCertStoreParameters.java index 4414e65a092..f2dff764ac0 100644 --- a/libjava/classpath/java/security/cert/LDAPCertStoreParameters.java +++ b/libjava/classpath/java/security/cert/LDAPCertStoreParameters.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PKIXBuilderParameters.java b/libjava/classpath/java/security/cert/PKIXBuilderParameters.java index fd5f1f87fd0..3a29b521854 100644 --- a/libjava/classpath/java/security/cert/PKIXBuilderParameters.java +++ b/libjava/classpath/java/security/cert/PKIXBuilderParameters.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java b/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java index fa160913c7d..52984b543da 100644 --- a/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java +++ b/libjava/classpath/java/security/cert/PKIXCertPathBuilderResult.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PKIXCertPathChecker.java b/libjava/classpath/java/security/cert/PKIXCertPathChecker.java index a69347fcd0b..0bedf401a08 100644 --- a/libjava/classpath/java/security/cert/PKIXCertPathChecker.java +++ b/libjava/classpath/java/security/cert/PKIXCertPathChecker.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PKIXCertPathValidatorResult.java b/libjava/classpath/java/security/cert/PKIXCertPathValidatorResult.java index 5a1660c3bc9..17b5c86f8f1 100644 --- a/libjava/classpath/java/security/cert/PKIXCertPathValidatorResult.java +++ b/libjava/classpath/java/security/cert/PKIXCertPathValidatorResult.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PKIXParameters.java b/libjava/classpath/java/security/cert/PKIXParameters.java index bb68cb93726..bbb75571f1f 100644 --- a/libjava/classpath/java/security/cert/PKIXParameters.java +++ b/libjava/classpath/java/security/cert/PKIXParameters.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PolicyNode.java b/libjava/classpath/java/security/cert/PolicyNode.java index b1196037e87..5da78c188b9 100644 --- a/libjava/classpath/java/security/cert/PolicyNode.java +++ b/libjava/classpath/java/security/cert/PolicyNode.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/PolicyQualifierInfo.java b/libjava/classpath/java/security/cert/PolicyQualifierInfo.java index d4d9f99844d..b53faa93570 100644 --- a/libjava/classpath/java/security/cert/PolicyQualifierInfo.java +++ b/libjava/classpath/java/security/cert/PolicyQualifierInfo.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU diff --git a/libjava/classpath/java/security/cert/X509CRL.java b/libjava/classpath/java/security/cert/X509CRL.java index a00706e678f..895ba33e754 100644 --- a/libjava/classpath/java/security/cert/X509CRL.java +++ b/libjava/classpath/java/security/cert/X509CRL.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -56,48 +56,48 @@ import javax.security.auth.x500.X500Principal; time stamped entries which indicate which lists have been revoked. The list is signed by a Certificate Authority (CA) and made publically available in a repository. - - Each revoked certificate in the CRL is identified by its - certificate serial number. When a piece of code uses a - certificate, the certificates validity is checked by + + Each revoked certificate in the CRL is identified by its + certificate serial number. When a piece of code uses a + certificate, the certificates validity is checked by validating its signature and determing that it is not only a recently acquired CRL. The recently aquired CRL is depends on the local policy in affect. The CA issues - a new CRL periodically and entries are removed as the + a new CRL periodically and entries are removed as the certificate expiration date is reached - - + + A description of the X.509 v2 CRL follows below from rfc2459. - + "The X.509 v2 CRL syntax is as follows. For signature calculation, the data that is to be signed is ASN.1 DER encoded. ASN.1 DER encoding is a tag, length, value encoding system for each element. - - CertificateList ::= SEQUENCE { - tbsCertList TBSCertList, - signatureAlgorithm AlgorithmIdentifier, - signatureValue BIT STRING } - - TBSCertList ::= SEQUENCE { - version Version OPTIONAL, + + CertificateList ::= SEQUENCE { + tbsCertList TBSCertList, + signatureAlgorithm AlgorithmIdentifier, + signatureValue BIT STRING } + + TBSCertList ::= SEQUENCE { + version Version OPTIONAL, -- if present, shall be v2 - signature AlgorithmIdentifier, - issuer Name, - thisUpdate Time, - nextUpdate Time OPTIONAL, - revokedCertificates SEQUENCE OF SEQUENCE { - userCertificate CertificateSerialNumber, - revocationDate Time, - crlEntryExtensions Extensions OPTIONAL - -- if present, shall be v2 - } OPTIONAL, - crlExtensions [0] EXPLICIT Extensions OPTIONAL - -- if present, shall be v2 - }" + signature AlgorithmIdentifier, + issuer Name, + thisUpdate Time, + nextUpdate Time OPTIONAL, + revokedCertificates SEQUENCE OF SEQUENCE { + userCertificate CertificateSerialNumber, + revocationDate Time, + crlEntryExtensions Extensions OPTIONAL + -- if present, shall be v2 + } OPTIONAL, + crlExtensions [0] EXPLICIT Extensions OPTIONAL + -- if present, shall be v2 + }" - @author Mark Benvenuto + @author Mark Benvenuto - @since 1.2 + @since 1.2 */ public abstract class X509CRL extends CRL implements X509Extension { @@ -123,19 +123,19 @@ public abstract class X509CRL extends CRL implements X509Extension { if( other instanceof X509CRL ) { try { - X509CRL x = (X509CRL) other; - if( getEncoded().length != x.getEncoded().length ) - return false; + X509CRL x = (X509CRL) other; + if( getEncoded().length != x.getEncoded().length ) + return false; - byte[] b1 = getEncoded(); - byte[] b2 = x.getEncoded(); + byte[] b1 = getEncoded(); + byte[] b2 = x.getEncoded(); - for( int i = 0; i < b1.length; i++ ) - if( b1[i] != b2[i] ) - return false; + for( int i = 0; i < b1.length; i++ ) + if( b1[i] != b2[i] ) + return false; - } catch( CRLException crle ) { - return false; + } catch( CRLException crle ) { + return false; } return true; } @@ -164,7 +164,7 @@ public abstract class X509CRL extends CRL implements X509Extension /** Verifies that this CRL was properly signed with the - PublicKey that corresponds to its private key. + PublicKey that corresponds to its private key. @param key PublicKey to verify with @@ -184,7 +184,7 @@ public abstract class X509CRL extends CRL implements X509Extension /** Verifies that this CRL was properly signed with the PublicKey that corresponds to its private key and uses - the signature engine provided by the provider. + the signature engine provided by the provider. @param key PublicKey to verify with @param sigProvider Provider to use for signature algorithm @@ -196,7 +196,7 @@ public abstract class X509CRL extends CRL implements X509Extension @throws SignatureException signature error */ public abstract void verify(PublicKey key, - String sigProvider) + String sigProvider) throws CRLException, NoSuchAlgorithmException, InvalidKeyException, @@ -221,7 +221,7 @@ public abstract class X509CRL extends CRL implements X509Extension /** Returns the issuer (issuer distinguished name) of the CRL. - The issuer is the entity who signed and issued the + The issuer is the entity who signed and issued the Certificate Revocation List. The ASN.1 DER encoding is: @@ -307,7 +307,7 @@ public abstract class X509CRL extends CRL implements X509Extension public abstract Set getRevokedCertificates(); /** - Returns the DER ASN.1 encoded tbsCertList which is + Returns the DER ASN.1 encoded tbsCertList which is the basic information of the list and associated certificates in the encoded state. See top for more information. @@ -323,7 +323,7 @@ public abstract class X509CRL extends CRL implements X509Extension /** - Returns the signature for the CRL. + Returns the signature for the CRL. The ASN.1 DER encoding is: @@ -334,7 +334,7 @@ public abstract class X509CRL extends CRL implements X509Extension public abstract byte[] getSignature(); /** - Returns the signature algorithm used to sign the CRL. + Returns the signature algorithm used to sign the CRL. An examples is "SHA-1/DSA". The ASN.1 DER encoding is: @@ -371,9 +371,9 @@ public abstract class X509CRL extends CRL implements X509Extension /** Returns the AlgorithmParameters in the encoded form - for the signature algorithm used. + for the signature algorithm used. - If access to the parameters is need, create an + If access to the parameters is need, create an instance of AlgorithmParameters. @return byte array containing algorithm parameters, null diff --git a/libjava/classpath/java/security/cert/X509CRLEntry.java b/libjava/classpath/java/security/cert/X509CRLEntry.java index 4c9cada4747..ac5ef4714b6 100644 --- a/libjava/classpath/java/security/cert/X509CRLEntry.java +++ b/libjava/classpath/java/security/cert/X509CRLEntry.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -42,8 +42,8 @@ import java.math.BigInteger; import java.util.Date; /** - Abstract class for entries in the CRL (Certificate Revocation - List). The ASN.1 definition for revokedCertificates is + Abstract class for entries in the CRL (Certificate Revocation + List). The ASN.1 definition for revokedCertificates is revokedCertificates SEQUENCE OF SEQUENCE { userCertificate CertificateSerialNumber, @@ -52,24 +52,24 @@ import java.util.Date; -- if present, shall be v2 } OPTIONAL, - CertificateSerialNumber ::= INTEGER + CertificateSerialNumber ::= INTEGER - Time ::= CHOICE { + Time ::= CHOICE { utcTime UTCTime, - generalTime GeneralizedTime } + generalTime GeneralizedTime } - Extensions ::= SEQUENCE SIZE (1..MAX) OF Extension + Extensions ::= SEQUENCE SIZE (1..MAX) OF Extension - Extension ::= SEQUENCE { - extnID OBJECT IDENTIFIER, + Extension ::= SEQUENCE { + extnID OBJECT IDENTIFIER, critical BOOLEAN DEFAULT FALSE, extnValue OCTET STRING } - - For more information consult rfc2459. - @author Mark Benvenuto + For more information consult rfc2459. - @since JDK 1.2 + @author Mark Benvenuto + + @since JDK 1.2 */ public abstract class X509CRLEntry implements X509Extension { @@ -93,19 +93,19 @@ public abstract class X509CRLEntry implements X509Extension { if( other instanceof X509CRLEntry ) { try { - X509CRLEntry xe = (X509CRLEntry) other; - if( getEncoded().length != xe.getEncoded().length ) - return false; + X509CRLEntry xe = (X509CRLEntry) other; + if( getEncoded().length != xe.getEncoded().length ) + return false; - byte[] b1 = getEncoded(); - byte[] b2 = xe.getEncoded(); + byte[] b1 = getEncoded(); + byte[] b2 = xe.getEncoded(); - for( int i = 0; i < b1.length; i++ ) - if( b1[i] != b2[i] ) - return false; + for( int i = 0; i < b1.length; i++ ) + if( b1[i] != b2[i] ) + return false; - } catch( CRLException crle ) { - return false; + } catch( CRLException crle ) { + return false; } return true; } diff --git a/libjava/classpath/java/security/cert/X509CertSelector.java b/libjava/classpath/java/security/cert/X509CertSelector.java index 4115fffacfa..8c1230afbea 100644 --- a/libjava/classpath/java/security/cert/X509CertSelector.java +++ b/libjava/classpath/java/security/cert/X509CertSelector.java @@ -102,7 +102,7 @@ public class X509CertSelector implements CertSelector, Cloneable return (oid != null && oid.length > 2 && (oid[0] >= 0 && oid[0] <= 2) && (oid[1] >= 0 && oid[1] <= 39)); } - + private static GeneralName makeName(int id, String name) throws IOException { byte[] nameBytes = null; @@ -114,22 +114,22 @@ public class X509CertSelector implements CertSelector, Cloneable case uniformResourceIdentifier: nameBytes = name.getBytes("ASCII"); break; - + case iPAddress: InetAddress addr = InetAddress.getByName(name); nameBytes = addr.getAddress(); break; - + case registeredId: OID oid = new OID(name); nameBytes = oid.getDER(); break; - + case directoryName: X500Principal xname = new X500Principal(name); nameBytes = xname.getEncoded(); break; - + case ediPartyName: case x400Address: case otherName: @@ -138,7 +138,7 @@ public class X509CertSelector implements CertSelector, Cloneable } return new GeneralName(kind, nameBytes); } - + private int basicConstraints; private X509Certificate cert; private BigInteger serialNo; @@ -171,7 +171,7 @@ public class X509CertSelector implements CertSelector, Cloneable /** * Add a name to match in the NameConstraints extension. The argument is * the DER-encoded bytes of a GeneralName structure. - * + * * See the method {@link #addSubjectAlternativeName(int, byte[])} for the * format of the GeneralName structure. * @@ -208,9 +208,9 @@ public class X509CertSelector implements CertSelector, Cloneable /** * Add a name, as DER-encoded bytes, to the subject alternative names * criterion. - * + * * The name is a GeneralName structure, which has the ASN.1 format: - * + * * 

           GeneralName ::= CHOICE {
     otherName                       [0]     OtherName,
@@ -242,7 +242,7 @@ public class X509CertSelector implements CertSelector, Cloneable
    * only recognize certain types of name that have convenient string
    * encodings. For robustness, you should use the {@link
    *  #addSubjectAlternativeName(int, byte[])} method whenever possible.
-   * 
+   *
    * This method can only decode certain name kinds of names as strings.
    *
    * @param id The type of name this is. Must be in the range [0,8].
@@ -417,7 +417,7 @@ public class X509CertSelector implements CertSelector, Cloneable
             n.add(name.name());
             names.add(n);
           }
-        
+
         return names;
       }
     return null;
@@ -735,7 +735,7 @@ public class X509CertSelector implements CertSelector, Cloneable
                 // ignored
               }
           }
-        
+
         if (policies == null)
           return false;
         if (!policies.getPolicies().containsAll(policy))
@@ -766,7 +766,7 @@ public class X509CertSelector implements CertSelector, Cloneable
                   }
               }
           }
-        
+
         if (nc == null)
           return false;
 
@@ -956,18 +956,18 @@ public class X509CertSelector implements CertSelector, Cloneable
   {
     // Check if the input is well-formed...
     new NameConstraints(nameConstraints);
-    
+
     // But we just compare raw byte arrays.
     this.nameConstraints = nameConstraints != null
       ? (byte[]) nameConstraints.clone() : null;
   }
-  
+
   /**
-   * Sets the pathToNames criterion. The argument is a collection of 
+   * Sets the pathToNames criterion. The argument is a collection of
    * pairs, the first element of which is an {@link Integer} giving
    * the ID of the name, and the second element is either a {@link String}
    * or a byte array.
-   * 
+   *
    * See {@link #addPathToName(int, byte[])} and {@link #addPathToName(int, String)}
    * for how these arguments are handled.
    *
@@ -1249,7 +1249,7 @@ public class X509CertSelector implements CertSelector, Cloneable
     else
       this.sigId = null;
   }
-  
+
   public String toString()
   {
     CPStringBuilder str = new CPStringBuilder(X509CertSelector.class.getName());
diff --git a/libjava/classpath/java/security/cert/X509Certificate.java b/libjava/classpath/java/security/cert/X509Certificate.java
index b398e093e6a..ab9e1be3748 100644
--- a/libjava/classpath/java/security/cert/X509Certificate.java
+++ b/libjava/classpath/java/security/cert/X509Certificate.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,10 +45,10 @@ import java.util.List;
 
 /**
  * X509Certificate is the abstract class for X.509 certificates.
- * This provides a stanard class interface for accessing all 
+ * This provides a stanard class interface for accessing all
  * the attributes of X.509 certificates.
  *
- * 
        In June 1996, the basic X.509 v3 format was finished by 
+ * 
        In June 1996, the basic X.509 v3 format was finished by
  * ISO/IEC and ANSI X.9. The ASN.1 DER format is below:
  *
  * 
        @@ -58,22 +58,22 @@ import java.util.List;
  *   signatureValue       BIT STRING  }
  * 
        
  *
- * 
        These certificates are widely used in various Internet 
- * protocols to support authentication. It is used in 
+ * 
        These certificates are widely used in various Internet
+ * protocols to support authentication. It is used in
  * Privacy Enhanced Mail (PEM), Transport Layer Security (TLS),
  * Secure Sockets Layer (SSL), code signing for trusted software
  * distribution, and Secure Electronic Transactions (SET).
  *
- * 
        The certificates are managed and vouched for by 
- * Certificate Authorities (CAs). CAs are companies or 
- * groups that create certificates by placing the data in the 
+ * 
        The certificates are managed and vouched for by
+ * Certificate Authorities (CAs). CAs are companies or
+ * groups that create certificates by placing the data in the
  * X.509 certificate format and signing it with their private
  * key. CAs serve as trusted third parties by certifying that
  * the person or group specified in the certificate is who
- * they say they are. 
+ * they say they are.
  *
  * 
        The ASN.1 defintion for tbsCertificate is
- * 
+ *
  * 
          * TBSCertificate  ::=  SEQUENCE  {
  *   version         [0]  EXPLICIT Version DEFAULT v1,
@@ -116,7 +116,7 @@ import java.util.List;
  *   critical    BOOLEAN DEFAULT FALSE,
  *   extnValue   OCTET STRING  }
  * 
        
- * 
+ *
  * Certificates are created with the CertificateFactory.
  *
  * 
        References:
@@ -170,7 +170,7 @@ public abstract class X509Certificate
      Consult rfc2459 for more information.
 
      @throws CertificateExpiredException if the certificate expired
-     @throws CertificateNotYetValidException if the certificate is 
+     @throws CertificateNotYetValidException if the certificate is
      not yet valid
   */
   public abstract void checkValidity()
@@ -178,14 +178,14 @@ public abstract class X509Certificate
     CertificateNotYetValidException;
 
   /**
-     Checks the validity of the X.509 certificate for the 
-     specified time and date. It is valid if the specified 
-     date and time are within the period specified by 
+     Checks the validity of the X.509 certificate for the
+     specified time and date. It is valid if the specified
+     date and time are within the period specified by
      the certificate.
 
-     @throws CertificateExpiredException if the certificate expired 
+     @throws CertificateExpiredException if the certificate expired
      based on the date
-     @throws CertificateNotYetValidException if the certificate is 
+     @throws CertificateNotYetValidException if the certificate is
      not yet valid based on the date
   */
   public abstract void checkValidity(Date date)
@@ -203,13 +203,13 @@ public abstract class X509Certificate
 
      Consult rfc2459 for more information.
 
-     @return version number of certificate	
+     @return version number of certificate
   */
   public abstract int getVersion();
 
   /**
      Gets the serial number for serial Number in
-     this Certifcate. It must be a unique number 
+     this Certifcate. It must be a unique number
      unique other serial numbers from the granting CA.
 
      The ASN.1 DER encoding is:
@@ -225,8 +225,8 @@ public abstract class X509Certificate
   public abstract BigInteger getSerialNumber();
 
   /**
-     Returns the issuer (issuer distinguished name) of the 
-     Certificate. The issuer is the entity who signed 
+     Returns the issuer (issuer distinguished name) of the
+     Certificate. The issuer is the entity who signed
      and issued the Certificate.
 
      The ASN.1 DER encoding is:
@@ -263,7 +263,7 @@ public abstract class X509Certificate
   public abstract Principal getIssuerDN();
 
   /**
-     Returns the subject (subject distinguished name) of the 
+     Returns the subject (subject distinguished name) of the
      Certificate. The subject is the entity who the Certificate
      identifies.
 
@@ -331,7 +331,7 @@ public abstract class X509Certificate
   public abstract byte[] getSignature();
 
   /**
-     Returns the signature algorithm used to sign the CRL. 
+     Returns the signature algorithm used to sign the CRL.
      An examples is "SHA-1/DSA".
 
      The ASN.1 DER encoding is:
@@ -370,9 +370,9 @@ public abstract class X509Certificate
 
   /**
      Returns the AlgorithmParameters in the encoded form
-     for the signature algorithm used. 
+     for the signature algorithm used.
 
-     If access to the parameters is need, create an 
+     If access to the parameters is need, create an
      instance of AlgorithmParameters.
 
      @return byte array containing algorithm parameters, null
@@ -390,7 +390,7 @@ public abstract class X509Certificate
      -- If present, version shall be v2 or v3
 
      UniqueIdentifier  ::=  BIT STRING
-	
+
      Consult rfc2459 for more information.
 
      @return bit representation of issuerUniqueID
@@ -406,7 +406,7 @@ public abstract class X509Certificate
      -- If present, version shall be v2 or v3
 
      UniqueIdentifier  ::=  BIT STRING
-	
+
      Consult rfc2459 for more information.
 
      @return bit representation of subjectUniqueID
@@ -414,7 +414,7 @@ public abstract class X509Certificate
   public abstract boolean[] getSubjectUniqueID();
 
   /**
-     Returns a boolean array representing the KeyUsage 
+     Returns a boolean array representing the KeyUsage
      extension for the certificate. The KeyUsage (OID = 2.5.29.15)
      defines the purpose of the key in the certificate.
 
@@ -441,15 +441,15 @@ public abstract class X509Certificate
 
   /**
      Returns the certificate constraints path length from the
-     critical BasicConstraints extension, (OID = 2.5.29.19).	
+     critical BasicConstraints extension, (OID = 2.5.29.19).
 
-     The basic constraints extensions is used to determine if 
-     the subject of the certificate is a Certificate Authority (CA) 
-     and how deep the certification path may exist. The 
+     The basic constraints extensions is used to determine if
+     the subject of the certificate is a Certificate Authority (CA)
+     and how deep the certification path may exist. The
      pathLenConstraint only takes affect if cA
-     is set to true. "A value of zero indicates that only an 
+     is set to true. "A value of zero indicates that only an
      end-entity certificate may follow in the path." (rfc2459)
-	
+
      The ASN.1 DER encoding is:
 
      id-ce-basicConstraints OBJECT IDENTIFIER ::=  { id-ce 19 }
@@ -477,7 +477,7 @@ public abstract class X509Certificate
    *
    * 
        The ASN.1 definition for this extension is:
    *
-   * 
         
+   * 
            * ExtendedKeyUsage ::= SEQUENCE SIZE (1..MAX) OF KeyPurposeId
    *
    * KeyPurposeId ::= OBJECT IDENTIFIER
@@ -575,7 +575,7 @@ public abstract class X509Certificate
   {
     throw new UnsupportedOperationException();
   }
- 
+
   /**
    * Returns the X.500 distinguished name of this certificate's issuer.
    *
diff --git a/libjava/classpath/java/security/cert/X509Extension.java b/libjava/classpath/java/security/cert/X509Extension.java
index bd9473782e4..a0c24f42947 100644
--- a/libjava/classpath/java/security/cert/X509Extension.java
+++ b/libjava/classpath/java/security/cert/X509Extension.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,37 +40,37 @@ package java.security.cert;
 import java.util.Set;
 
 /**
-	Public interface for the X.509 Extension.
+        Public interface for the X.509 Extension.
 
-	This is used for X.509 v3 Certificates and CRL v2 (Certificate
-	Revocation Lists) for managing attributes assoicated with
-	Certificates, for managing the hierarchy of certificates,
-	and for managing the distribution of CRL. This extension
-	format is used to define private extensions.
+        This is used for X.509 v3 Certificates and CRL v2 (Certificate
+        Revocation Lists) for managing attributes assoicated with
+        Certificates, for managing the hierarchy of certificates,
+        and for managing the distribution of CRL. This extension
+        format is used to define private extensions.
 
-	Each extensions for a certificate or CRL must be marked
-	either critical or non-critical. If the certificate/CRL 
-	system encounters a critical extension not recognized then 
-	it must reject the certificate. A non-critical extension
-	may be just ignored if not recognized.
+        Each extensions for a certificate or CRL must be marked
+        either critical or non-critical. If the certificate/CRL
+        system encounters a critical extension not recognized then
+        it must reject the certificate. A non-critical extension
+        may be just ignored if not recognized.
 
 
-	The ASN.1 definition for this class is: 
+        The ASN.1 definition for this class is:
 
-	 Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
+         Extensions  ::=  SEQUENCE SIZE (1..MAX) OF Extension
 
-	 Extension  ::=  SEQUENCE  {
-	     extnId        OBJECT IDENTIFIER,
-	     critical      BOOLEAN DEFAULT FALSE,
-	     extnValue     OCTET STRING
-	                   -- contains a DER encoding of a value
-	                   -- of the type registered for use with
-	                   -- the extnId object identifier value
-	 }
- 	
-	@author Mark Benvenuto
+         Extension  ::=  SEQUENCE  {
+             extnId        OBJECT IDENTIFIER,
+             critical      BOOLEAN DEFAULT FALSE,
+             extnValue     OCTET STRING
+                           -- contains a DER encoding of a value
+                           -- of the type registered for use with
+                           -- the extnId object identifier value
+         }
 
-	@since 1.2
+        @author Mark Benvenuto
+
+        @since 1.2
 */
 public interface X509Extension
 {
@@ -79,12 +79,12 @@ public interface X509Extension
      Returns true if the certificate contains a critical extension
      that is not supported.
 
-     @return true if has unsupported extension, false otherwise	
+     @return true if has unsupported extension, false otherwise
   */
   boolean hasUnsupportedCriticalExtension();
 
   /**
-     Returns a set of the CRITICAL extension OIDs from the 
+     Returns a set of the CRITICAL extension OIDs from the
      certificate/CRL that the object implementing this interface
      manages.
 
@@ -94,7 +94,7 @@ public interface X509Extension
   Set getCriticalExtensionOIDs();
 
   /**
-     Returns a set of the NON-CRITICAL extension OIDs from the 
+     Returns a set of the NON-CRITICAL extension OIDs from the
      certificate/CRL that the object implementing this interface
      manages.
 
diff --git a/libjava/classpath/java/security/spec/AlgorithmParameterSpec.java b/libjava/classpath/java/security/spec/AlgorithmParameterSpec.java
index 25506f55cfe..bc877e3126a 100644
--- a/libjava/classpath/java/security/spec/AlgorithmParameterSpec.java
+++ b/libjava/classpath/java/security/spec/AlgorithmParameterSpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,13 +39,13 @@ exception statement from your version. */
 package java.security.spec;
 
 /**
-	A transparent interface for Algorithm Parameter Specifications. 
-	It contains no member functions. It is used to group
-	algorithm parameter classes.
+        A transparent interface for Algorithm Parameter Specifications.
+        It contains no member functions. It is used to group
+        algorithm parameter classes.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public interface AlgorithmParameterSpec
 {
diff --git a/libjava/classpath/java/security/spec/DSAParameterSpec.java b/libjava/classpath/java/security/spec/DSAParameterSpec.java
index 7e263291c03..f7f6731104a 100644
--- a/libjava/classpath/java/security/spec/DSAParameterSpec.java
+++ b/libjava/classpath/java/security/spec/DSAParameterSpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -62,19 +62,19 @@ public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams
    * @param q the sub-prime
    * @param g the base
    */
-  public DSAParameterSpec(BigInteger p, BigInteger q, BigInteger g) 
+  public DSAParameterSpec(BigInteger p, BigInteger q, BigInteger g)
   {
     this.p = p;
     this.q = q;
     this.g = g;
   }
-  
+
   /**
    * Returns p for the DSA algorithm.
    *
    * @return Returns the requested BigInteger
    */
-  public BigInteger getP() 
+  public BigInteger getP()
   {
     return this.p;
   }
@@ -84,7 +84,7 @@ public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams
    *
    * @return Returns the requested BigInteger
    */
-  public BigInteger getQ() 
+  public BigInteger getQ()
   {
     return this.q;
   }
@@ -98,4 +98,4 @@ public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams
   {
     return this.g;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/java/security/spec/DSAPrivateKeySpec.java b/libjava/classpath/java/security/spec/DSAPrivateKeySpec.java
index 7415fa11a45..19af107e6f4 100644
--- a/libjava/classpath/java/security/spec/DSAPrivateKeySpec.java
+++ b/libjava/classpath/java/security/spec/DSAPrivateKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,14 +40,14 @@ package java.security.spec;
 import java.math.BigInteger;
 
 /**
-	DSA Private Key class Specification. Used to maintain the DSA
-	Private Keys.
+        DSA Private Key class Specification. Used to maintain the DSA
+        Private Keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
-public class DSAPrivateKeySpec implements KeySpec 
+public class DSAPrivateKeySpec implements KeySpec
 {
   private BigInteger x = null;
   private BigInteger p = null;
@@ -62,7 +62,7 @@ public class DSAPrivateKeySpec implements KeySpec
      @param q the sub-prime
      @param g the base
   */
-  public DSAPrivateKeySpec(BigInteger x, BigInteger p, BigInteger q, BigInteger g) 
+  public DSAPrivateKeySpec(BigInteger x, BigInteger p, BigInteger q, BigInteger g)
   {
     this.x = x;
     this.p = p;
@@ -75,7 +75,7 @@ public class DSAPrivateKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getX() 
+  public BigInteger getX()
   {
     return this.x;
   }
@@ -85,7 +85,7 @@ public class DSAPrivateKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getP() 
+  public BigInteger getP()
   {
     return this.p;
   }
@@ -95,7 +95,7 @@ public class DSAPrivateKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getQ() 
+  public BigInteger getQ()
   {
     return this.q;
   }
@@ -105,7 +105,7 @@ public class DSAPrivateKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getG() 
+  public BigInteger getG()
   {
     return this.g;
   }
diff --git a/libjava/classpath/java/security/spec/DSAPublicKeySpec.java b/libjava/classpath/java/security/spec/DSAPublicKeySpec.java
index ac1310c1caa..751844bcc2c 100644
--- a/libjava/classpath/java/security/spec/DSAPublicKeySpec.java
+++ b/libjava/classpath/java/security/spec/DSAPublicKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,14 +40,14 @@ package java.security.spec;
 import java.math.BigInteger;
 
 /**
-	DSA Public Key class Specification. Used to maintain the DSA
-	Public Keys.
+        DSA Public Key class Specification. Used to maintain the DSA
+        Public Keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
-public class DSAPublicKeySpec implements KeySpec 
+public class DSAPublicKeySpec implements KeySpec
 {
   private BigInteger y = null;
   private BigInteger p = null;
@@ -62,7 +62,7 @@ public class DSAPublicKeySpec implements KeySpec
      @param q the sub-prime
      @param g the base
   */
-  public DSAPublicKeySpec(BigInteger y, BigInteger p, BigInteger q, BigInteger g) 
+  public DSAPublicKeySpec(BigInteger y, BigInteger p, BigInteger q, BigInteger g)
   {
     this.y = y;
     this.p = p;
@@ -75,7 +75,7 @@ public class DSAPublicKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getY() 
+  public BigInteger getY()
   {
     return this.y;
   }
@@ -85,7 +85,7 @@ public class DSAPublicKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getP() 
+  public BigInteger getP()
   {
     return this.p;
   }
@@ -95,7 +95,7 @@ public class DSAPublicKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getQ() 
+  public BigInteger getQ()
   {
     return this.q;
   }
@@ -105,7 +105,7 @@ public class DSAPublicKeySpec implements KeySpec
 
      @return Returns the requested BigInteger
   */
-  public BigInteger getG() 
+  public BigInteger getG()
   {
     return this.g;
   }
diff --git a/libjava/classpath/java/security/spec/EncodedKeySpec.java b/libjava/classpath/java/security/spec/EncodedKeySpec.java
index c5baf55fd7a..93e15838558 100644
--- a/libjava/classpath/java/security/spec/EncodedKeySpec.java
+++ b/libjava/classpath/java/security/spec/EncodedKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,12 +39,12 @@ exception statement from your version. */
 package java.security.spec;
 
 /**
-	Encoded Key Specification class which is used to store 
-	byte encoded keys.
+        Encoded Key Specification class which is used to store
+        byte encoded keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public abstract class EncodedKeySpec implements KeySpec
 {
@@ -56,7 +56,7 @@ public abstract class EncodedKeySpec implements KeySpec
 
      @param encodedKey A key to store
   */
-  public EncodedKeySpec(byte[] encodedKey) 
+  public EncodedKeySpec(byte[] encodedKey)
   {
     this.encodedKey = encodedKey;
   }
@@ -66,7 +66,7 @@ public abstract class EncodedKeySpec implements KeySpec
 
      @returns the encoded key
   */
-  public byte[] getEncoded() 
+  public byte[] getEncoded()
   {
     return this.encodedKey;
   }
@@ -75,8 +75,8 @@ public abstract class EncodedKeySpec implements KeySpec
      Returns the name of the key format used.
 
      This name is the format such as "PKCS#8" or "X.509" which
-     if it matches a Key class name of the same type can be 
-     transformed using the apporiate KeyFactory. 
+     if it matches a Key class name of the same type can be
+     transformed using the apporiate KeyFactory.
 
      @return a string representing the name
   */
diff --git a/libjava/classpath/java/security/spec/InvalidParameterSpecException.java b/libjava/classpath/java/security/spec/InvalidParameterSpecException.java
index 481e11e306b..ff34565f1d6 100644
--- a/libjava/classpath/java/security/spec/InvalidParameterSpecException.java
+++ b/libjava/classpath/java/security/spec/InvalidParameterSpecException.java
@@ -60,7 +60,7 @@ public class InvalidParameterSpecException extends GeneralSecurityException
   /**
    * Constructs an InvalidParameterSpecException without a message string.
    */
-  public InvalidParameterSpecException() 
+  public InvalidParameterSpecException()
   {
   }
 
diff --git a/libjava/classpath/java/security/spec/KeySpec.java b/libjava/classpath/java/security/spec/KeySpec.java
index 93f1a6db277..13c7dad4229 100644
--- a/libjava/classpath/java/security/spec/KeySpec.java
+++ b/libjava/classpath/java/security/spec/KeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,14 +39,14 @@ exception statement from your version. */
 package java.security.spec;
 
 /**
-	A transparent interface for Key Specifications.
-	It contains no member functions. It is used to group
-	key classes.
+        A transparent interface for Key Specifications.
+        It contains no member functions. It is used to group
+        key classes.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
-public interface KeySpec 
+public interface KeySpec
 {
 }
diff --git a/libjava/classpath/java/security/spec/PKCS8EncodedKeySpec.java b/libjava/classpath/java/security/spec/PKCS8EncodedKeySpec.java
index 4a4f1eccea7..53b68de47f3 100644
--- a/libjava/classpath/java/security/spec/PKCS8EncodedKeySpec.java
+++ b/libjava/classpath/java/security/spec/PKCS8EncodedKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,12 +39,12 @@ exception statement from your version. */
 package java.security.spec;
 
 /**
-	PKCS8 Encoded Key Specification class which is used to store 
-	"PKCS#8" byte encoded keys.
+        PKCS8 Encoded Key Specification class which is used to store
+        "PKCS#8" byte encoded keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public class PKCS8EncodedKeySpec extends EncodedKeySpec
 {
@@ -59,9 +59,9 @@ public class PKCS8EncodedKeySpec extends EncodedKeySpec
   }
 
   /**
-	Gets the encoded key in byte format.
+        Gets the encoded key in byte format.
 
-	@returns the encoded key
+        @returns the encoded key
 */
   public byte[] getEncoded()
   {
@@ -69,9 +69,9 @@ public class PKCS8EncodedKeySpec extends EncodedKeySpec
   }
 
   /**
-	Returns the name of the key format used which is "PKCS#8"
+        Returns the name of the key format used which is "PKCS#8"
 
-	@return a string representing the name
+        @return a string representing the name
 */
   public final String getFormat()
   {
diff --git a/libjava/classpath/java/security/spec/PSSParameterSpec.java b/libjava/classpath/java/security/spec/PSSParameterSpec.java
index f2a83d96718..92a6c9eddea 100644
--- a/libjava/classpath/java/security/spec/PSSParameterSpec.java
+++ b/libjava/classpath/java/security/spec/PSSParameterSpec.java
@@ -40,7 +40,7 @@ package java.security.spec;
 /**
  * An implementation of {@link AlgorithmParameterSpec} for the RSA PSS encoding
  * scheme.
- * 
+ *
  * @since 1.4
  * @see AlgorithmParameterSpec
  * @see java.security.Signature
@@ -58,7 +58,7 @@ public class PSSParameterSpec implements AlgorithmParameterSpec
   /**
    * Construct a new instance of PSSParameterSpec given a salt
    * length.
-   * 
+   *
    * @param saltLen
    *          the length in bits of the salt.
    * @throws IllegalArgumentException
diff --git a/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java b/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java
index ad551117729..5a1dafe2ab9 100644
--- a/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java
+++ b/libjava/classpath/java/security/spec/RSAKeyGenParameterSpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -63,7 +63,7 @@ public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec
   public static final BigInteger F4 = BigInteger.valueOf(65537L);
 
   /**
-     Create a new RSAKeyGenParameterSpec to store the RSA key's keysize 
+     Create a new RSAKeyGenParameterSpec to store the RSA key's keysize
      and public exponent
 
      @param keysize Modulus size of key in bits
@@ -74,7 +74,7 @@ public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec
     this.keysize = keysize;
     this.publicExponent = publicExponent;
   }
-    
+
   /**
      Return the size of the key.
 
@@ -84,7 +84,7 @@ public class RSAKeyGenParameterSpec implements AlgorithmParameterSpec
   {
     return keysize;
   }
-    
+
   /**
      Return the public exponent.
 
diff --git a/libjava/classpath/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/libjava/classpath/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
index 9e8ad0da776..09b8438dff1 100644
--- a/libjava/classpath/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+++ b/libjava/classpath/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
@@ -72,10 +72,10 @@ public class RSAMultiPrimePrivateCrtKeySpec extends RSAPrivateKeySpec
   /**
    * Constructs a new instance of RSAMultiPrimePrivateCrtKeySpec
    * given the various PKCS#1 v2.1 parameters.
-   * 
+   *
    * 
        Note that otherPrimeInfo is cloned when constructing this
    * object.
        
-   * 
+   *
    * @param modulus
    *          the modulus n.
    * @param publicExponent
diff --git a/libjava/classpath/java/security/spec/RSAOtherPrimeInfo.java b/libjava/classpath/java/security/spec/RSAOtherPrimeInfo.java
index 03cdca227ed..45dd53fab41 100644
--- a/libjava/classpath/java/security/spec/RSAOtherPrimeInfo.java
+++ b/libjava/classpath/java/security/spec/RSAOtherPrimeInfo.java
@@ -61,7 +61,7 @@ public class RSAOtherPrimeInfo
 
   /**
    * Constructs a new RSAOtherPrimeInfo given the PKCS#1 MPIs.
-   * 
+   *
    * @param prime
    *          the prime factor of n.
    * @param primeExponent
diff --git a/libjava/classpath/java/security/spec/RSAPrivateCrtKeySpec.java b/libjava/classpath/java/security/spec/RSAPrivateCrtKeySpec.java
index a904c305d65..6d327e62bb0 100644
--- a/libjava/classpath/java/security/spec/RSAPrivateCrtKeySpec.java
+++ b/libjava/classpath/java/security/spec/RSAPrivateCrtKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,13 +40,13 @@ package java.security.spec;
 import java.math.BigInteger;
 
 /**
-	RSA Private Certificate Key class Specification. Used to 
-	maintain the RSA Private Certificate Keys with the 
-	Chinese Remainder Theorem(CRT) as specified by PKCS#1.
+        RSA Private Certificate Key class Specification. Used to
+        maintain the RSA Private Certificate Keys with the
+        Chinese Remainder Theorem(CRT) as specified by PKCS#1.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public class RSAPrivateCrtKeySpec extends RSAPrivateKeySpec
 {
@@ -71,13 +71,13 @@ public class RSAPrivateCrtKeySpec extends RSAPrivateKeySpec
      @param crtCoefficient the CRT coefficient
   */
   public RSAPrivateCrtKeySpec(BigInteger modulus,
-			      BigInteger publicExponent,
-			      BigInteger privateExponent,
-			      BigInteger primeP,
-			      BigInteger primeQ,
-			      BigInteger primeExponentP,
-			      BigInteger primeExponentQ,
-			      BigInteger crtCoefficient)
+                              BigInteger publicExponent,
+                              BigInteger privateExponent,
+                              BigInteger primeP,
+                              BigInteger primeQ,
+                              BigInteger primeExponentP,
+                              BigInteger primeExponentQ,
+                              BigInteger crtCoefficient)
   {
     super( modulus, privateExponent);
     this.publicExponent = publicExponent;
diff --git a/libjava/classpath/java/security/spec/RSAPrivateKeySpec.java b/libjava/classpath/java/security/spec/RSAPrivateKeySpec.java
index d29f261cfb3..f812766ba81 100644
--- a/libjava/classpath/java/security/spec/RSAPrivateKeySpec.java
+++ b/libjava/classpath/java/security/spec/RSAPrivateKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,12 +40,12 @@ package java.security.spec;
 import java.math.BigInteger;
 
 /**
-	RSA Private Key class Specification. Used to maintain the RSA
-	Private Keys.
+        RSA Private Key class Specification. Used to maintain the RSA
+        Private Keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public class RSAPrivateKeySpec implements KeySpec
 {
diff --git a/libjava/classpath/java/security/spec/RSAPublicKeySpec.java b/libjava/classpath/java/security/spec/RSAPublicKeySpec.java
index 21283aa643b..acee6bcdf37 100644
--- a/libjava/classpath/java/security/spec/RSAPublicKeySpec.java
+++ b/libjava/classpath/java/security/spec/RSAPublicKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,12 +40,12 @@ package java.security.spec;
 import java.math.BigInteger;
 
 /**
-	RSA Public Key class Specification. Used to maintain the RSA
-	Public Keys.
+        RSA Public Key class Specification. Used to maintain the RSA
+        Public Keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public class RSAPublicKeySpec implements KeySpec
 {
diff --git a/libjava/classpath/java/security/spec/X509EncodedKeySpec.java b/libjava/classpath/java/security/spec/X509EncodedKeySpec.java
index de35960296d..8b50aaae1e4 100644
--- a/libjava/classpath/java/security/spec/X509EncodedKeySpec.java
+++ b/libjava/classpath/java/security/spec/X509EncodedKeySpec.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,12 +39,12 @@ exception statement from your version. */
 package java.security.spec;
 
 /**
-	X.509 Encoded Key Specification class which is used to store 
-	"X.509" byte encoded keys.
+        X.509 Encoded Key Specification class which is used to store
+        "X.509" byte encoded keys.
 
-	@since JDK 1.2
+        @since JDK 1.2
 
-	@author Mark Benvenuto
+        @author Mark Benvenuto
 */
 public class X509EncodedKeySpec extends EncodedKeySpec
 {
diff --git a/libjava/classpath/java/sql/Array.java b/libjava/classpath/java/sql/Array.java
index cdd60a42f12..5cea23e8acf 100644
--- a/libjava/classpath/java/sql/Array.java
+++ b/libjava/classpath/java/sql/Array.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.util.Map;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface Array 
+public interface Array
 {
   /**
    * Returns the name of the SQL type of the elements in this
@@ -57,7 +57,7 @@ public interface Array
 
   /**
    * Returns the JDBC type identifier of the elements in this
-   * array.  This will be one of the values defined in the 
+   * array.  This will be one of the values defined in the
    * Types class.
    *
    * @return The JDBC type of the elements in this array.
@@ -77,9 +77,9 @@ public interface Array
 
   /**
    * Returns the contents of this array.  The specified
-   * Map will be used to override selected mappings 
+   * Map will be used to override selected mappings
    * between SQL types and Java classes.
-   * 
+   *
    * @param map A mapping of SQL types to Java classes.
    * @return The contents of the array as an array of Java objects.
    * @exception SQLException If an error occurs.
@@ -162,7 +162,7 @@ public interface Array
    * @see ResultSet
    */
   ResultSet getResultSet(long start, int count) throws SQLException;
-  
+
   /**
    * This method returns a portion of the array as a ResultSet.
    * The returned portion will start at start into the
@@ -180,7 +180,7 @@ public interface Array
    * @return The requested elements of this array as a ResultSet.
    * @exception SQLException If an error occurs.
    * @see ResultSet
-   */  
+   */
   ResultSet getResultSet(long start, int count, Map> map)
     throws SQLException;
 }
diff --git a/libjava/classpath/java/sql/BatchUpdateException.java b/libjava/classpath/java/sql/BatchUpdateException.java
index c2e186548db..6b88bbad76c 100644
--- a/libjava/classpath/java/sql/BatchUpdateException.java
+++ b/libjava/classpath/java/sql/BatchUpdateException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,12 +39,12 @@ package java.sql;
 
 /**
  * This class extends SQLException to count the successful
- * updates in each statement in a batch that was successfully updated prior 
+ * updates in each statement in a batch that was successfully updated prior
  * to the error.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public class BatchUpdateException extends SQLException 
+public class BatchUpdateException extends SQLException
 {
   static final long serialVersionUID = 5977529877145521757L;
 
@@ -84,7 +84,7 @@ public class BatchUpdateException extends SQLException
     int[] updateCounts)
   {
     super(message, SQLState);
-    this.updateCounts = updateCounts;  
+    this.updateCounts = updateCounts;
   }
 
   /**
@@ -118,7 +118,7 @@ public class BatchUpdateException extends SQLException
   /**
    * Initializes a new instance of BatchUpdateException
    * with no descriptive error message.  The SQL state and update count will
-   * be initialized to null and the vendor specific error code will 
+   * be initialized to null and the vendor specific error code will
    * initialized to 0.
    */
   public BatchUpdateException()
diff --git a/libjava/classpath/java/sql/Blob.java b/libjava/classpath/java/sql/Blob.java
index c662aad5f2f..00fe49f707c 100644
--- a/libjava/classpath/java/sql/Blob.java
+++ b/libjava/classpath/java/sql/Blob.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.io.OutputStream;
 /**
  * This interface specified methods for accessing a SQL BLOB (Binary Large
  * OBject) type.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @since 1.2
  */
@@ -51,7 +51,7 @@ public interface Blob
 {
   /**
    * This method returns the number of bytes in this Blob.
-   * 
+   *
    * @return The number of bytes in this Blob.
    * @exception SQLException If an error occurs.
    */
@@ -60,7 +60,7 @@ public interface Blob
   /**
    * This method returns up to the requested bytes of this Blob
    * as a byte array.
-   * 
+   *
    * @param start The index into this Blob to start returning
    *              bytes from.
    * @param count The requested number of bytes to return.
@@ -72,7 +72,7 @@ public interface Blob
   /**
    * This method returns a stream that will read the bytes of this
    * Blob.
-   * 
+   *
    * @return A stream that will read the bytes of this Blob.
    * @exception SQLException If an error occurs.
    */
@@ -82,7 +82,7 @@ public interface Blob
    * This method returns the index into this Blob at which the
    * first instance of the specified bytes occur. The searching starts at the
    * specified index into this Blob.
-   * 
+   *
    * @param pattern The byte pattern to search for.
    * @param start The index into this Blob to start searching for
    *              the pattern.
@@ -97,7 +97,7 @@ public interface Blob
    * first instance of the specified pattern occurs. The searching starts at the
    * specified index into this Blob. The bytes in the specified
    * Blob are used as the search pattern.
-   * 
+   *
    * @param pattern The Blob containing the byte pattern to
    *                search for.
    * @param start The index into this Blob to start searching for
@@ -111,7 +111,7 @@ public interface Blob
   /**
    * Writes the specified data into this Blob, starting at the
    * specified index.
-   * 
+   *
    * @param start The index at which the writing starts.
    * @param bytes The data to write.
    * @exception SQLException If an error occurs.
@@ -122,7 +122,7 @@ public interface Blob
   /**
    * Writes a portion of the specified data into this Blob,
    * starting at the specified index.
-   * 
+   *
    * @param startWrite The index into this Blob at which writing
    *                   starts.
    * @param bytes The data to write a portion of.
@@ -137,7 +137,7 @@ public interface Blob
   /**
    * Returns a binary stream that writes into this Blob,
    * starting at the specified index.
-   * 
+   *
    * @param start The index at which the writing starts.
    * @return A binary stream to write into this Blob.
    * @exception SQLException If an error occurs.
@@ -148,7 +148,7 @@ public interface Blob
   /**
    * Truncates this Blob to be at most the specified number of
    * bytes long.
-   * 
+   *
    * @param count The length this Blob is truncated to.
    * @exception SQLException If an error occurs.
    * @since 1.4
diff --git a/libjava/classpath/java/sql/CallableStatement.java b/libjava/classpath/java/sql/CallableStatement.java
index e605b381d5b..09d58704e88 100644
--- a/libjava/classpath/java/sql/CallableStatement.java
+++ b/libjava/classpath/java/sql/CallableStatement.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -49,7 +49,7 @@ import java.util.Map;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface CallableStatement extends PreparedStatement 
+public interface CallableStatement extends PreparedStatement
 {
   /**
    * This method registers the specified parameter as an output parameter
@@ -58,7 +58,7 @@ public interface CallableStatement extends PreparedStatement
    * @param index The index of the parameter to register as output.
    * @param sqlType The SQL type value from Types.
    * @exception SQLException If an error occurs.
-   */   
+   */
   void registerOutParameter(int index, int sqlType)
     throws SQLException;
 
@@ -70,7 +70,7 @@ public interface CallableStatement extends PreparedStatement
    * @param sqlType The SQL type value from Types.
    * @param scale The scale of the value that will be returned.
    * @exception SQLException If an error occurs.
-   */   
+   */
   void registerOutParameter(int index, int sqlType, int scale)
     throws SQLException;
 
@@ -271,7 +271,7 @@ public interface CallableStatement extends PreparedStatement
    * @return The parameter value as a Blob.
    * @exception SQLException If an error occurs.
    * @since 1.2
-   */   
+   */
   Blob getBlob(int index) throws SQLException;
 
   /**
@@ -359,7 +359,7 @@ public interface CallableStatement extends PreparedStatement
 
   /**
    * This method registers the specified parameter as an output parameter
-   * of the specified SQL type.  This version of registerOutParameter is used 
+   * of the specified SQL type.  This version of registerOutParameter is used
    * for NUMERIC or DECIMAL types.
    *
    * @param name The name of the parameter to register as output.
@@ -374,7 +374,7 @@ public interface CallableStatement extends PreparedStatement
 
   /**
    * This method registers the specified parameter as an output parameter
-   * of the specified SQL type.  This version of registerOutParameter is used 
+   * of the specified SQL type.  This version of registerOutParameter is used
    * for user-named or REF types. If the type of the output parameter does
    * not have such a type, the typeName argument is ignored.
    *
@@ -384,7 +384,7 @@ public interface CallableStatement extends PreparedStatement
    * @exception SQLException If an error occurs.
    * @since 1.4
    */
-  void registerOutParameter(String name, int sqlType, String typeName) 
+  void registerOutParameter(String name, int sqlType, String typeName)
     throws SQLException;
 
   /**
@@ -401,7 +401,7 @@ public interface CallableStatement extends PreparedStatement
   /**
    * This method sets the value of the specified parameter to the specified
    * java.net.URL
-   * 
+   *
    * @param name The name of the parameter to set.
    * @param value The value the parameter.
    * @since 1.4
@@ -413,7 +413,7 @@ public interface CallableStatement extends PreparedStatement
    * for the specified type.
    *
    * @param name The name of the parameter to set.
-   * @param sqlType The SQL type identifier of the parameter from 
+   * @param sqlType The SQL type identifier of the parameter from
    *                Types
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -597,7 +597,7 @@ public interface CallableStatement extends PreparedStatement
    *
    * @param name The name of the parameter value to set.
    * @param value The value of the parameter.
-   * @param sqlType The SQL type to use for the parameter, from 
+   * @param sqlType The SQL type to use for the parameter, from
    *                Types
    * @param scale The scale of the value, for numeric values only.
    * @exception SQLException If an error occurs.
@@ -613,7 +613,7 @@ public interface CallableStatement extends PreparedStatement
    *
    * @param name The name of the parameter value to set.
    * @param value The value of the parameter.
-   * @param sqlType The SQL type to use for the parameter, from 
+   * @param sqlType The SQL type to use for the parameter, from
    *                Types
    * @exception SQLException If an error occurs.
    * @see Types
diff --git a/libjava/classpath/java/sql/Clob.java b/libjava/classpath/java/sql/Clob.java
index 53bf6393cde..483276e6992 100644
--- a/libjava/classpath/java/sql/Clob.java
+++ b/libjava/classpath/java/sql/Clob.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -46,14 +46,14 @@ import java.io.Writer;
 /**
  * This interface contains methods for accessing a SQL CLOB (Character Large
  * OBject) type.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
 public interface Clob
 {
   /**
    * This method returns the number of characters in this Clob.
-   * 
+   *
    * @return The number of characters in this Clob.
    * @exception SQLException If an error occurs.
    * @since 1.2
@@ -63,7 +63,7 @@ public interface Clob
   /**
    * This method returns the specified portion of this Clob as a
    * String.
-   * 
+   *
    * @param start The index into this Clob (index values
    *              start at 1) to start returning characters from.
    * @param count The requested number of characters to return.
@@ -76,7 +76,7 @@ public interface Clob
   /**
    * This method returns a character stream that reads the contents of this
    * Clob.
-   * 
+   *
    * @return A character stream to read this Clob's contents.
    * @exception SQLException If an error occurs.
    * @since 1.2
@@ -86,7 +86,7 @@ public interface Clob
   /**
    * This method returns a byte stream that reads the contents of this
    * Clob as a series of ASCII bytes.
-   * 
+   *
    * @return A stream to read this Clob's contents.
    * @exception SQLException If an error occurs.
    * @since 1.2
@@ -97,7 +97,7 @@ public interface Clob
    * This method returns the index into this Clob of the first
    * occurrence of the specified character pattern (supplied by the caller as a
    * String). The search begins at the specified index.
-   * 
+   *
    * @param pattern The character pattern to search for, passed as a
    *                String.
    * @param start The index into this Clob to start searching
@@ -113,7 +113,7 @@ public interface Clob
    * This method returns the index into this Clob of the first
    * occurrence of the specified character pattern (supplied by the caller as a
    * Clob). The search begins at the specified index.
-   * 
+   *
    * @param pattern The character pattern to search for, passed as a
    *                Clob.
    * @param start The index into this Clob to start searching
@@ -128,7 +128,7 @@ public interface Clob
   /**
    * Writes the specified string into this Clob, starting at the
    * specified index.
-   * 
+   *
    * @param start The index at which the writing starts.
    * @param value The string to write.
    * @return The number of characters written.
@@ -140,7 +140,7 @@ public interface Clob
   /**
    * Writes the specified portion of a string into this Clob,
    * starting at the specified index.
-   * 
+   *
    * @param startWrite The index at which the writing starts.
    * @param value The string to write a portion of.
    * @param startRead The offset into the string where the portion to copy
@@ -156,7 +156,7 @@ public interface Clob
   /**
    * Returns an ASCII text stream that writes into this Clob,
    * starting at the specified index.
-   * 
+   *
    * @param start The index at which the writing starts.
    * @return An ASCII text stream to write into this Clob.
    * @exception SQLException If an error occurs.
@@ -167,7 +167,7 @@ public interface Clob
   /**
    * Returns a character stream that writes into this Clob,
    * starting at the specified index.
-   * 
+   *
    * @param start The index at which the writing starts.
    * @return A character stream to write into this Clob.
    * @exception SQLException If an error occurs.
@@ -178,7 +178,7 @@ public interface Clob
   /**
    * Truncates this Clob to be at most the specified number of
    * characters long.
-   * 
+   *
    * @param count The length this Clob is truncated to.
    * @exception SQLException If an error occurs.
    * @since 1.4
diff --git a/libjava/classpath/java/sql/Connection.java b/libjava/classpath/java/sql/Connection.java
index 8dc7544c760..f3752762597 100644
--- a/libjava/classpath/java/sql/Connection.java
+++ b/libjava/classpath/java/sql/Connection.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,7 +45,7 @@ import java.util.Map;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface Connection 
+public interface Connection
 {
   /**
    * This transaction isolation level indicates that transactions are not
@@ -90,7 +90,7 @@ public interface Connection
    * This method creates a new SQL statement.  The default result set type
    * and concurrency will be used.
    *
-   * @return A new Statement object. 
+   * @return A new Statement object.
    * @exception SQLException If an error occurs.
    * @see Statement
    */
@@ -101,7 +101,7 @@ public interface Connection
    * SQL string.  This method is designed for use with parameterized
    * statements.  The default result set type and concurrency will be used.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            PreparedStatement.
    * @return A new PreparedStatement.
    * @exception SQLException If an error occurs.
@@ -110,12 +110,12 @@ public interface Connection
   PreparedStatement prepareStatement(String sql) throws SQLException;
 
   /**
-   * This method creates a new CallableStatement for the 
+   * This method creates a new CallableStatement for the
    * specified SQL string.  Thie method is designed to be used with
    * stored procedures.  The default result set type and concurrency
    * will be used.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            CallableStatement.
    * @return A new CallableStatement.
    * @exception SQLException If an error occurs.
@@ -151,7 +151,7 @@ public interface Connection
    * In auto commit mode,  every SQL statement is committed its own transaction.
    * Otherwise a transaction must be explicitly committed or rolled back.
    *
-   * @return true if auto commit mode is enabled, 
+   * @return true if auto commit mode is enabled,
    *         false otherwise.
    * @exception SQLException If an error occurs.
    * @see #commit()
@@ -160,7 +160,7 @@ public interface Connection
   boolean getAutoCommit() throws SQLException;
 
  /**
-  * This method commits any SQL statements executed on this connection since 
+  * This method commits any SQL statements executed on this connection since
   * the last commit or rollback.
   *
   * @exception SQLException If an error occurs.
@@ -183,7 +183,7 @@ public interface Connection
   void close() throws SQLException;
 
   /**
-   * This method tests whether or not this connection has been closed. 
+   * This method tests whether or not this connection has been closed.
    *
    * @return true if the connection is closed, false
    *         otherwise.
@@ -233,7 +233,7 @@ public interface Connection
    * This method returns the name of the catalog in use by this connection,
    * if any.
    *
-   * @return The name of the catalog, or null if none 
+   * @return The name of the catalog, or null if none
    *         exists or catalogs are not supported by this database.
    * @exception SQLException If an error occurs.
    */
@@ -262,7 +262,7 @@ public interface Connection
    * if any.  If there were any subsequence warnings, they will be chained
    * to the first one.
    *
-   * @return The first SQLWarning that occurred, or 
+   * @return The first SQLWarning that occurred, or
    *         null if there have been no warnings.
    * @exception SQLException If an error occurs.
    */
@@ -298,7 +298,7 @@ public interface Connection
    * Valid values for these parameters are specified in the
    * ResultSet class.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            PreparedStatement.
    * @param resultSetType The type of result set to use for this statement.
    * @param resultSetConcurrency  The type of concurrency to be used in
@@ -308,17 +308,17 @@ public interface Connection
    * @see PreparedStatement
    * @see ResultSet
    */
-  PreparedStatement prepareStatement(String sql, int resultSetType, 
+  PreparedStatement prepareStatement(String sql, int resultSetType,
     int resultSetConcurrency) throws SQLException;
 
   /**
-   * This method creates a new CallableStatement for the 
+   * This method creates a new CallableStatement for the
    * specified SQL string.  Thie method is designed to be used with
    * stored procedures.  The specified result set type and concurrency
    * will be used.  Valid values for these parameters are specified in the
    * ResultSet class.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            PreparedStatement.
    * @param resultSetType The type of result set to use for this statement.
    * @param resultSetConcurrency  The type of concurrency to be used in
@@ -353,7 +353,7 @@ public interface Connection
   /**
    * Sets the default holdability of ResultSetS that are created
    * from StatementS using this Connection.
-   * 
+   *
    * @param holdability The default holdability value to set, this must be one
    *                    of ResultSet.HOLD_CURSORS_OVER_COMMIT or
    *                    ResultSet.CLOSE_CURSORS_AT_COMMIT.
@@ -366,7 +366,7 @@ public interface Connection
   /**
    * Gets the default holdability of ResultSetS that are created
    * from StatementS using this Connection.
-   * 
+   *
    * @return The current default holdability value, this must be one of
    *          ResultSet.HOLD_CURSORS_OVER_COMMIT or
    *          ResultSet.CLOSE_CURSORS_AT_COMMIT.
@@ -378,7 +378,7 @@ public interface Connection
 
   /**
    * Creates a new unnamed savepoint for this Connection
-   * 
+   *
    * @return The Savepoint object representing the savepoint.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -388,7 +388,7 @@ public interface Connection
   /**
    * Creates a new savepoint with the specifiend name for this
    * Connection.
-   * 
+   *
    * @param name The name of the savepoint.
    * @return The Savepoint object representing the savepoint.
    * @exception SQLException If an error occurs.
@@ -398,7 +398,7 @@ public interface Connection
 
   /**
    * Undoes all changes made after the specified savepoint was set.
-   * 
+   *
    * @param savepoint The safepoint to roll back to.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -409,7 +409,7 @@ public interface Connection
    * Removes the specified savepoint from this Connection.
    * Refering to a savepoint after it was removed is an error and will throw an
    * SQLException.
-   * 
+   *
    * @param savepoint The savepoint to release.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -420,7 +420,7 @@ public interface Connection
    * This method creates a new SQL statement with the specified type,
    * concurrency and holdability, instead of using the defaults.  Valid values
    * for these parameters are specified in the ResultSet class.
-   * 
+   *
    * @param resultSetType The type of result set to use for this statement.
    * @param resultSetConcurrency The type of concurrency to be used in
    *                             the result set for this statement.
@@ -441,7 +441,7 @@ public interface Connection
    * will be used. Valid values for these parameters are specified in the
    * ResultSet class.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            PreparedStatement.
    * @param resultSetType The type of result set to use for this statement.
    * @param resultSetConcurrency The type of concurrency to be used in
@@ -458,13 +458,13 @@ public interface Connection
       resultSetConcurrency, int resultSetHoldability) throws SQLException;
 
   /**
-   * This method creates a new CallableStatement for the 
+   * This method creates a new CallableStatement for the
    * specified SQL string.  Thie method is designed to be used with
    * stored procedures.  The specified result set type, concurrency and
    * holdability will be used.  Valid values for these parameters are specified
    * in the ResultSet class.
    *
-   * @param sql The SQL statement to use in creating this 
+   * @param sql The SQL statement to use in creating this
    *            PreparedStatement.
    * @param resultSetType The type of result set to use for this statement.
    * @param resultSetConcurrency The type of concurrency to be used in
diff --git a/libjava/classpath/java/sql/DataTruncation.java b/libjava/classpath/java/sql/DataTruncation.java
index ec522c0251c..efa4487b395 100644
--- a/libjava/classpath/java/sql/DataTruncation.java
+++ b/libjava/classpath/java/sql/DataTruncation.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -38,12 +38,12 @@ exception statement from your version. */
 package java.sql;
 
 /**
-  * This exception is thrown when a piece of data is unexpectedly 
+  * This exception is thrown when a piece of data is unexpectedly
   * truncated in JDBC.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class DataTruncation extends SQLWarning 
+public class DataTruncation extends SQLWarning
 {
   static final long serialVersionUID = 6464298989504059473L;
 
@@ -74,7 +74,7 @@ public class DataTruncation extends SQLWarning
 
   /**
    * This method initializes a new instance of DataTruncation
-   * with the specified values.  The descriptive error message for this 
+   * with the specified values.  The descriptive error message for this
    * exception will be "Data truncation", the SQL state will be "01004"
    * and the vendor specific error code will be set to 0.
    *
diff --git a/libjava/classpath/java/sql/DatabaseMetaData.java b/libjava/classpath/java/sql/DatabaseMetaData.java
index 48c2d9afcd8..3ffd5b0dff7 100644
--- a/libjava/classpath/java/sql/DatabaseMetaData.java
+++ b/libjava/classpath/java/sql/DatabaseMetaData.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 package java.sql;
 
-public interface DatabaseMetaData 
+public interface DatabaseMetaData
 {
   /**
    * It is unknown whether or not the procedure returns a result.
@@ -409,7 +409,7 @@ public interface DatabaseMetaData
    * This method tests whether or not the database uses local files to
    * store tables.
    *
-   * @return true if the database uses local files, 
+   * @return true if the database uses local files,
    * false otherwise.
    *
    * @exception SQLException If an error occurs.
@@ -459,7 +459,7 @@ public interface DatabaseMetaData
   boolean storesLowerCaseIdentifiers() throws SQLException;
 
   /**
-   * This method tests whether or not the database stores mixed case 
+   * This method tests whether or not the database stores mixed case
    * identifers even if it treats them as case insensitive.
    *
    * @return true if the database stores mixed case identifiers,
@@ -482,7 +482,7 @@ public interface DatabaseMetaData
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all upper case.
    *
-   * @return true if the database treats all quoted identifiers 
+   * @return true if the database treats all quoted identifiers
    *         as upper case, false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -492,17 +492,17 @@ public interface DatabaseMetaData
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all lower case.
    *
-   * @return true if the database treats all quoted identifiers 
+   * @return true if the database treats all quoted identifiers
    *         as lower case, false otherwise.
    * @exception SQLException If an error occurs.
    */
   boolean storesLowerCaseQuotedIdentifiers() throws SQLException;
 
   /**
-   * This method tests whether or not the database stores mixed case 
+   * This method tests whether or not the database stores mixed case
    * quoted identifers even if it treats them as case insensitive.
    *
-   * @return true if the database stores mixed case quoted 
+   * @return true if the database stores mixed case quoted
    *         identifiers, false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -552,7 +552,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns comma separated list of time/date functions.
-   * 
+   *
    * @return The list of time/date functions.
    * @exception SQLException If an error occurs.
    */
@@ -567,7 +567,7 @@ public interface DatabaseMetaData
   String getSearchStringEscape() throws SQLException;
 
   /**
-   * This methods returns non-standard characters that can appear in 
+   * This methods returns non-standard characters that can appear in
    * unquoted identifiers.
    *
    * @return Non-standard characters that can appear in unquoted identifiers.
@@ -638,7 +638,7 @@ public interface DatabaseMetaData
       SQLException;
 
   /**
-   * This method tests whether or not table correlation names are 
+   * This method tests whether or not table correlation names are
    * supported.  This will be always be true in a fully JDBC
    * compliant driver.
    *
@@ -722,7 +722,7 @@ public interface DatabaseMetaData
    * This method tests whether multiple result sets for a single statement are
    * supported.
    *
-   * @return true if multiple result sets are supported for a 
+   * @return true if multiple result sets are supported for a
    *         single statement, false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -789,7 +789,7 @@ public interface DatabaseMetaData
 
   /**
    * This method tests whether or not the ANSI92 intermediate SQL
-   * grammar is supported.  
+   * grammar is supported.
    *
    * @return true if the ANSI92 intermediate SQL grammar is
    *         supported, false otherwise.
@@ -799,7 +799,7 @@ public interface DatabaseMetaData
 
   /**
    * This method tests whether or not the ANSI92 full SQL
-   * grammar is supported.  
+   * grammar is supported.
    *
    * @return true if the ANSI92 full SQL grammar is
    *         supported, false otherwise.
@@ -829,7 +829,7 @@ public interface DatabaseMetaData
   /**
    * This method tests whether or not the database supports full outer joins.
    *
-   * @return true if full outer joins are supported, 
+   * @return true if full outer joins are supported,
    *         false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -838,7 +838,7 @@ public interface DatabaseMetaData
   /**
    * This method tests whether or not the database supports limited outer joins.
    *
-   * @return true if limited outer joins are supported, 
+   * @return true if limited outer joins are supported,
    *         false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -1005,7 +1005,7 @@ public interface DatabaseMetaData
    * This method tests whether or not SELECT FOR UPDATE is supported by the
    * database.
    *
-   * @return true if SELECT FOR UPDATE is supported 
+   * @return true if SELECT FOR UPDATE is supported
    *         false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -1036,7 +1036,7 @@ public interface DatabaseMetaData
    * expressions.  A fully JDBC compliant driver will always return
    * true.
    *
-   * @return true if subqueries are allowed in exists 
+   * @return true if subqueries are allowed in exists
    *         expressions, false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -1057,7 +1057,7 @@ public interface DatabaseMetaData
    * expressions.  A fully JDBC compliant driver will always return
    * true.
    *
-   * @return true if subqueries are allowed in quantified 
+   * @return true if subqueries are allowed in quantified
    *         expressions, false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -1143,7 +1143,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the maximum length of a character literal.
-   * 
+   *
    * @return The maximum length of a character literal.
    * @exception SQLException If an error occurs.
    */
@@ -1338,7 +1338,7 @@ public interface DatabaseMetaData
       SQLException;
 
   /**
-   * This method tests whether or not DDL and DML statements allowed within 
+   * This method tests whether or not DDL and DML statements allowed within
    * the same transaction.
    *
    * @return true if DDL and DML statements are allowed in the
@@ -1385,7 +1385,7 @@ public interface DatabaseMetaData
    * a ResultSet with the following columns:
    * 
        
    * 
          
-   * 
        1. PROCEDURE_CAT - The catalog the procedure is in, which may be 
+   * 
        2. PROCEDURE_CAT - The catalog the procedure is in, which may be
    * null.
          3. 
    * 
        3. PROCEDURE_SCHEM - The schema the procedures is in, which may be
    * null.
          4. 
@@ -1394,8 +1394,8 @@ public interface DatabaseMetaData
    * 
        4. Unused
          5. 
    * 
        5. Unused
          6. 
    * 
        6. REMARKS - A description of the procedure
          7. 
-   * 
        7. PROCEDURE_TYPE - Indicates the return type of the procedure, which 
-   * is one of the contstants defined in this class 
+   * 
        8. PROCEDURE_TYPE - Indicates the return type of the procedure, which
+   * is one of the contstants defined in this class
    * (procedureResultUnknown, procedureNoResult, or
    * procedureReturnsResult).
          9. 
    * 
        
@@ -1417,7 +1417,7 @@ public interface DatabaseMetaData
    * ResultSet with the following columns:
    * 
        
    * 
          
-   * 
        1. PROCEDURE_CAT - The catalog the procedure is in, which may be 
+   * 
        2. PROCEDURE_CAT - The catalog the procedure is in, which may be
    * null.
          3. 
    * 
        3. PROCEDURE_SCHEM - The schema the procedures is in, which may be
    * null.
          4. 
@@ -1455,7 +1455,7 @@ public interface DatabaseMetaData
       SQLException;
 
   /**
-   * This method returns a list of the requested table as a   
+   * This method returns a list of the requested table as a
    * ResultSet with the following columns:
    *
    * 
            
@@ -1466,7 +1466,7 @@ public interface DatabaseMetaData
    * of the values returned by the getTableTypes() method.
    * 
          1. REMARKS - Comments about the table.
            2. 
    * 
          
-   * 
+   *
    * @param catalog The name of the catalog to return tables from,
    *        or "" to return tables from all catalogs.
    * @param schemaPattern A schema pattern for the schemas to return tables
@@ -1480,7 +1480,7 @@ public interface DatabaseMetaData
       tablePattern, String[] types) throws SQLException;
 
   /**
-   * This method returns the list of database schemas as a 
+   * This method returns the list of database schemas as a
    * ResultSet, with one column - TABLE_SCHEM - that is the
    * name of the schema.
    *
@@ -1515,7 +1515,7 @@ public interface DatabaseMetaData
    * ResultSet with the following columns:
    * 
          
    * 
            
-   * 
          1. TABLE_CAT - The catalog the table is in, which may be 
+   * 
          2. TABLE_CAT - The catalog the table is in, which may be
    * null.
            3. 
    * 
          3. TABLE_SCHEM - The schema the tables is in, which may be
    * null.
            4. 
@@ -1543,7 +1543,7 @@ public interface DatabaseMetaData
    *
    * @param catalog The name of the catalog to return table from,
    * or "" to return tables from all catalogs.
-   * @param schemaPattern A schema pattern for the schemas to return 
+   * @param schemaPattern A schema pattern for the schemas to return
    * tables from, or "" to return tables from all schemas.
    * @param tablePattern The pattern of table names to return.
    * @param columnPattern The pattern of column names to return.
@@ -1559,7 +1559,7 @@ public interface DatabaseMetaData
    * with the following columns:
    *
    * 
              
-   * 
            1. TABLE_CAT - The catalog the table is in, which may be 
+   * 
            2. TABLE_CAT - The catalog the table is in, which may be
    * null.
              3. 
    * 
            3. TABLE_SCHEM - The schema the tables is in, which may be
    * null.
              4. 
@@ -1591,7 +1591,7 @@ public interface DatabaseMetaData
    * with the following columns:
    *
    * 
                
-   * 
              1. TABLE_CAT - The catalog the table is in, which may be 
+   * 
              2. TABLE_CAT - The catalog the table is in, which may be
    * null.
                3. 
    * 
              3. TABLE_SCHEM - The schema the tables is in, which may be
    * null.
                4. 
@@ -1608,7 +1608,7 @@ public interface DatabaseMetaData
    *        to return information from all catalogs.
    * @param schemaPattern The schema to retrieve information from, or the empty string
    *        to return entities not associated with a schema.
-   * @param tablePattern The table name pattern of tables to return 
+   * @param tablePattern The table name pattern of tables to return
    *        information for.
    * @return A ResultSet with all the requested privileges.
    * @exception SQLException If an error occurs.
@@ -1622,7 +1622,7 @@ public interface DatabaseMetaData
    * the following columns:
    *
    * 
                  
-   * 
                1. SCOPE - The scope of the results returned.  This is one of the 
+   * 
                2. SCOPE - The scope of the results returned.  This is one of the
    * constants defined in this class (bestRowTemporary,
    * bestRowTransaction, or bestRowSession).
                  3. 
    * 
                3. COLUMN_NAME - The name of the column.
                  4. 
@@ -1633,7 +1633,7 @@ public interface DatabaseMetaData
    * 
                4. BUFFER_LENGTH - Unused
                  5. 
    * 
                5. DECIMAL_DIGITS - The scale of the column.
                  6. 
    * 
                6. PSEUDO_COLUMN - Whether or not the best row identifier is a
-   * pseudo_column.  This is one of the constants defined in this class 
+   * pseudo_column.  This is one of the constants defined in this class
    * (bestRowUnknown, bestRowNotPseudo, or
    * bestRowPseudo).
                  7. 
    * 
                
@@ -1655,7 +1655,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the set of columns that are automatically updated
-   * when the row is update. It returns this information as a 
+   * when the row is update. It returns this information as a
    * ResultSet with the following columns:
    *
    * 
                  
@@ -1668,7 +1668,7 @@ public interface DatabaseMetaData
    * 
                1. BUFFER_LENGTH - Unused
                  2. 
    * 
                2. DECIMAL_DIGITS - The scale of the column.
                  3. 
    * 
                3. PSEUDO_COLUMN - Whether or not the best row identifier is a
-   * pseudo_column.  This is one of the constants defined in this class 
+   * pseudo_column.  This is one of the constants defined in this class
    * (versionRowUnknown, versionRowNotPseudo, or
    * versionRowPseudo).
                  4. 
    * 
                
@@ -1725,12 +1725,12 @@ public interface DatabaseMetaData
    * 
              4. FKCOLUMN_NAME - The foreign key column name.
                5. 
    * 
              5. KEY_SEQ - The sequence number of the column within the foreign key.
                6. 
    * 
              6. UPDATE_RULE - How the foreign key behaves when the primary key is
-   * updated.  This is one of the constants defined in this class 
+   * updated.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, importedKeySetDefault, or
    * importedKeyRestrict).
                7. 
    * 
              7. DELETE_RULE - How the foreign key behaves when the primary key is
-   * deleted.  This is one of the constants defined in this class 
+   * deleted.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, or importedKeySetDefault)
                8. 
    * 
              8. FK_NAME - The name of the foreign key.
                9. 
@@ -1769,12 +1769,12 @@ public interface DatabaseMetaData
    * 
              9. FKCOLUMN_NAME - The foreign key column name.
                10. 
    * 
              10. KEY_SEQ - The sequence number of the column within the foreign key.
                11. 
    * 
              11. UPDATE_RULE - How the foreign key behaves when the primary key is
-   * updated.  This is one of the constants defined in this class 
+   * updated.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, importedKeySetDefault, or
    * importedKeyRestrict).
                12. 
    * 
              12. DELETE_RULE - How the foreign key behaves when the primary key is
-   * deleted.  This is one of the constants defined in this class 
+   * deleted.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, or importedKeySetDefault)
                13. 
    * 
              13. FK_NAME - The name of the foreign key.
                14. 
@@ -1813,12 +1813,12 @@ public interface DatabaseMetaData
    * 
              14. FKCOLUMN_NAME - The foreign key column name.
                15. 
    * 
              15. KEY_SEQ - The sequence number of the column within the foreign key.
                16. 
    * 
              16. UPDATE_RULE - How the foreign key behaves when the primary key is
-   * updated.  This is one of the constants defined in this class 
+   * updated.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, importedKeySetDefault, or
    * importedKeyRestrict).
                17. 
    * 
              17. DELETE_RULE - How the foreign key behaves when the primary key is
-   * deleted.  This is one of the constants defined in this class 
+   * deleted.  This is one of the constants defined in this class
    * (importedNoAction, importedKeyCascade,
    * importedKeySetNull, or importedKeySetDefault)
                18. 
    * 
              18. FK_NAME - The name of the foreign key.
                19. 
@@ -1871,7 +1871,7 @@ public interface DatabaseMetaData
    * 
              19. CREATE_PARAMS - The parameters used to create the type, which may be
    * null.
                20. 
    * 
              20. NULLABLE - Whether or not this type supports NULL values.  This will
-   * be one of the constants defined in this interface 
+   * be one of the constants defined in this interface
    * (typeNoNulls, typeNullable, or
    * typeNullableUnknown).
                21. 
    * 
              21. CASE_SENSITIVE - Whether or not the value is case sensitive.
                22. 
@@ -1889,7 +1889,7 @@ public interface DatabaseMetaData
    * 
              22. SQL_DATETIME_SUB - Unused.
                23. 
    * 
              23. NUM_PREC_RADIX - The radix of this data type.
                24. 
    * 
              
-   * 
+   *
    * @return A ResultSet with the list of available data types.
    * @exception SQLException If an error occurs.
    */
@@ -1925,12 +1925,12 @@ public interface DatabaseMetaData
    * 
            
    *
    * @param catalog The catalog to retrieve information from, or the empty string
-   *        to return entities not associated with a catalog, or 
+   *        to return entities not associated with a catalog, or
    *        null to return information from all catalogs.
    * @param schema The schema to retrieve information from, or the empty string
    *        to return entities not associated with a schema.
    * @param tableName The table name to return information for.
-   * @param unique true to return only unique indexes, 
+   * @param unique true to return only unique indexes,
    *        false otherwise.
    * @param approximate true if data values can be approximations,
    *        false otherwise.
@@ -2012,7 +2012,7 @@ public interface DatabaseMetaData
   boolean ownInsertsAreVisible(int type) throws SQLException;
 
   /**
-   * This method tests whether or not the specified result set type sees 
+   * This method tests whether or not the specified result set type sees
    * updates committed by others.
    *
    * @param type The desired result type, which is one of the constants
@@ -2025,7 +2025,7 @@ public interface DatabaseMetaData
   boolean othersUpdatesAreVisible(int type) throws SQLException;
 
   /**
-   * This method tests whether or not the specified result set type sees 
+   * This method tests whether or not the specified result set type sees
    * deletes committed by others.
    *
    * @param type The desired result type, which is one of the constants
@@ -2038,7 +2038,7 @@ public interface DatabaseMetaData
   boolean othersDeletesAreVisible(int type) throws SQLException;
 
   /**
-   * This method tests whether or not the specified result set type sees 
+   * This method tests whether or not the specified result set type sees
    * inserts committed by others.
    *
    * @param type The desired result type, which is one of the constants
@@ -2075,7 +2075,7 @@ public interface DatabaseMetaData
    * @see ResultSet
    */
   boolean deletesAreDetected(int type) throws SQLException;
-  
+
   /**
    * This method tests whether or not the specified result set type can detect
    * a visible insert by calling the rowUpdated method.
@@ -2138,7 +2138,7 @@ public interface DatabaseMetaData
 
   /**
    * This method tests whether the databse supports savepoints.
-   * 
+   *
    * @return true if the database supports savepoints,
    *         false if it does not.
    * @exception SQLException If an error occurs.
@@ -2149,7 +2149,7 @@ public interface DatabaseMetaData
 
   /**
    * This method tests whether the database supports named parameters.
-   * 
+   *
    * @return true if the database supports named parameters,
    *         false if it does not.
    * @exception SQLException If an error occurs.
@@ -2160,7 +2160,7 @@ public interface DatabaseMetaData
   /**
    * This method tests whether the database supports returning multiple
    * ResultSetS from a CallableStatement at once.
-   * 
+   *
    * @return true if the database supports returnig multiple
    *         results at once, false if it does not.
    * @exception SQLException If an error occurs.
@@ -2195,7 +2195,7 @@ public interface DatabaseMetaData
    * This method tests if the database supports the specified holdability type.
    * Valid values for this parameter are specified in the
    * ResultSet class.
-   * 
+   *
    * @param holdability The holdability type to test.
    * @return true if the database supports the holdability type,
    *         false if it does not.
@@ -2210,7 +2210,7 @@ public interface DatabaseMetaData
    * This method returns the default holdability type of ResultSetS
    * retrieved from this database. The possible values are specified in the
    * ResultSet class.
-   * 
+   *
    * @return The default holdability type.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -2219,7 +2219,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the major version number of the database.
-   * 
+   *
    * @return The major version number of the database.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -2228,7 +2228,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the minor version number of the database.
-   * 
+   *
    * @return The minor version number of the database.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -2237,7 +2237,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the major version number of the JDBC driver.
-   * 
+   *
    * @return The major version number of the JDBC driver.
    * @exception  SQLException If an error occurs.
    * @since 1.4
@@ -2246,7 +2246,7 @@ public interface DatabaseMetaData
 
   /**
    * This method returns the minor version number of the JDBC driver.
-   * 
+   *
    * @return The minor version number of the database.
    * @exception SQLException If an error occurs.
    * @since 1.4
diff --git a/libjava/classpath/java/sql/Date.java b/libjava/classpath/java/sql/Date.java
index f4c3307092e..f5eea1a2d4e 100644
--- a/libjava/classpath/java/sql/Date.java
+++ b/libjava/classpath/java/sql/Date.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -46,7 +46,7 @@ import java.text.SimpleDateFormat;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class Date extends java.util.Date 
+public class Date extends java.util.Date
 {
   static final long serialVersionUID = 1511598038487230103L;
 
@@ -67,12 +67,12 @@ public class Date extends java.util.Date
    */
   public Date(int year, int month, int day)
   {
-    super(year, month, day);  
+    super(year, month, day);
   }
 
   /**
    * This method initializes a new instance of this class with the
-   * specified time value representing the number of milliseconds since 
+   * specified time value representing the number of milliseconds since
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param date The time value to intialize this date to.
@@ -157,18 +157,18 @@ public class Date extends java.util.Date
    */
   public static Date valueOf (String str)
   {
-    try 
+    try
       {
-	java.util.Date d = (java.util.Date) sdf.parseObject(str);
+        java.util.Date d = (java.util.Date) sdf.parseObject(str);
 
-	if (d == null)
-	  throw new IllegalArgumentException(str);
-	else
-	  return new Date(d.getTime());
+        if (d == null)
+          throw new IllegalArgumentException(str);
+        else
+          return new Date(d.getTime());
       }
     catch (ParseException e)
       {
-	throw new IllegalArgumentException(str);
+        throw new IllegalArgumentException(str);
       }
   }
 
diff --git a/libjava/classpath/java/sql/Driver.java b/libjava/classpath/java/sql/Driver.java
index 277dd171360..d7b2e8a17bc 100644
--- a/libjava/classpath/java/sql/Driver.java
+++ b/libjava/classpath/java/sql/Driver.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,17 +43,17 @@ import java.util.Properties;
   * This interface specifies a mechanism for accessing a JDBC database
   * driver.  When the class implementing this method is loaded, it should
   * register an instance of itself with the DriverManager in
-  * a static initializer.  
+  * a static initializer.
   * 
            
   * Because the DriverManager might attempt to use several
-  * drivers to find one that can connect to the requested database, 
+  * drivers to find one that can connect to the requested database,
   * this driver should not cause large numbers of classes and code to
   * be loaded.  If another driver is the one that ends up performing the
   * request, any loading done by this driver would be wasted.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public interface Driver 
+public interface Driver
 {
   /**
    * This method connects to the specified database using the connection
@@ -61,7 +61,7 @@ public interface Driver
    * URL, it should return null instead of throwing an
    * exception since the DriverManager will probe a driver
    * in this manner.
-   * 
+   *
    * @param url The URL string for this connection.
    * @param properties The list of database connection properties.
    * @return A Connection object for the newly established
@@ -72,12 +72,12 @@ public interface Driver
 
   /**
    * This method tests whether or not the driver believes it can connect to
-   * the specified database.  The driver should only test whether it 
-   * understands and accepts the URL. It should not necessarily attempt to 
+   * the specified database.  The driver should only test whether it
+   * understands and accepts the URL. It should not necessarily attempt to
    * probe the database for a connection.
    *
    * @param url The database URL string.
-   * @return true if the drivers can connect to the database, 
+   * @return true if the drivers can connect to the database,
    *         false otherwise.
    * @exception SQLException If an error occurs.
    */
@@ -101,7 +101,7 @@ public interface Driver
    * This method returns the major version number of the driver.
    *
    * @return The major version number of the driver.
-   */      
+   */
   int getMajorVersion();
 
   /**
diff --git a/libjava/classpath/java/sql/DriverManager.java b/libjava/classpath/java/sql/DriverManager.java
index 7d1ef07c1a0..86ed029306a 100644
--- a/libjava/classpath/java/sql/DriverManager.java
+++ b/libjava/classpath/java/sql/DriverManager.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -55,7 +55,7 @@ import java.util.Vector;
   * property should be a colon separated list of fully qualified driver
   * class names.  Additional drivers can be loaded at any time by
   * simply loading the driver class with class.forName(String).
-  * The driver should automatically register itself in a static 
+  * The driver should automatically register itself in a static
   * initializer.
   * 
            
   * The methods in this class are all static. This class
@@ -63,7 +63,7 @@ import java.util.Vector;
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
-public class DriverManager 
+public class DriverManager
 {
   /**
    * This is the log stream for JDBC drivers.
@@ -95,19 +95,19 @@ public class DriverManager
     String driver_string = System.getProperty("jdbc.drivers");
     if (driver_string != null)
       {
-	StringTokenizer st = new StringTokenizer(driver_string);
-	while (st.hasMoreTokens())
+        StringTokenizer st = new StringTokenizer(driver_string);
+        while (st.hasMoreTokens())
           {
             String driver_classname = st.nextToken();
 
             try
               {
-        	Class.forName(driver_classname); // The driver registers itself
+                Class.forName(driver_classname); // The driver registers itself
               }
             catch (Exception e)
-	      {
-		// Ignore not founds
-	      }
+              {
+                // Ignore not founds
+              }
           }
       }
 
@@ -129,11 +129,11 @@ public class DriverManager
   {
     return log_writer;
   }
-  
+
   /**
    * This method sets the log writer being used by JDBC drivers.  This is a
    * system-wide parameter that affects all drivers.  Note that since there
-   * is no way to retrieve a PrintStream from a 
+   * is no way to retrieve a PrintStream from a
    * PrintWriter, this method cannot set the log stream in
    * use by JDBC.  Thus any older drivers may not see this setting.
    *
@@ -223,8 +223,8 @@ public class DriverManager
     Enumeration e = drivers.elements();
     while(e.hasMoreElements())
       {
-	Driver d = (Driver)e.nextElement();
-	if (d.acceptsURL(url))
+        Driver d = (Driver)e.nextElement();
+        if (d.acceptsURL(url))
           return d;
       }
 
@@ -242,7 +242,7 @@ public class DriverManager
   public static void registerDriver(Driver driver) throws SQLException
   {
     if (! drivers.contains(driver))
-      drivers.addElement(driver);  
+      drivers.addElement(driver);
   }
 
 /**
@@ -274,17 +274,17 @@ public class DriverManager
 
     while(e.hasMoreElements())
       {
-	Object obj = e.nextElement();
+        Object obj = e.nextElement();
 
-	ClassLoader loader = obj.getClass().getClassLoader();
+        ClassLoader loader = obj.getClass().getClassLoader();
 
-	if (loader == null)
-	  loader = ClassLoader.getSystemClassLoader();
-	if (! loader.equals(cl))
-	  continue;
+        if (loader == null)
+          loader = ClassLoader.getSystemClassLoader();
+        if (! loader.equals(cl))
+          continue;
 
-	v.addElement(obj);
-      } 
+        v.addElement(obj);
+      }
 
     return v.elements();
   }
@@ -297,7 +297,7 @@ public class DriverManager
    */
   public static void setLoginTimeout(int seconds)
   {
-    DriverManager.login_timeout = seconds;  
+    DriverManager.login_timeout = seconds;
   }
 
   /**
diff --git a/libjava/classpath/java/sql/DriverPropertyInfo.java b/libjava/classpath/java/sql/DriverPropertyInfo.java
index 34e40fa0c3e..c191fa5efa2 100644
--- a/libjava/classpath/java/sql/DriverPropertyInfo.java
+++ b/libjava/classpath/java/sql/DriverPropertyInfo.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public class DriverPropertyInfo 
+public class DriverPropertyInfo
 {
   /**
    * The name of the property.
diff --git a/libjava/classpath/java/sql/ParameterMetaData.java b/libjava/classpath/java/sql/ParameterMetaData.java
index b3a75fd2058..722d78becd2 100644
--- a/libjava/classpath/java/sql/ParameterMetaData.java
+++ b/libjava/classpath/java/sql/ParameterMetaData.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -40,7 +40,7 @@ package java.sql;
 /**
  * @since 1.4
  */
-public interface ParameterMetaData 
+public interface ParameterMetaData
 {
   int parameterNoNulls = 0;
 
diff --git a/libjava/classpath/java/sql/PreparedStatement.java b/libjava/classpath/java/sql/PreparedStatement.java
index ca7eb2c5d79..4490b5bab4a 100644
--- a/libjava/classpath/java/sql/PreparedStatement.java
+++ b/libjava/classpath/java/sql/PreparedStatement.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -48,12 +48,12 @@ import java.util.Calendar;
  * statements.  This provides greater efficiency when calling the same
  * statement multiple times.  Parameters are allowed in a statement,
  * providings for maximum reusability.
- * 
+ *
  * 
             Note that in this class parameter indices start at 1, not 0.
            
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface PreparedStatement extends Statement 
+public interface PreparedStatement extends Statement
 {
   /**
    * This method executes a prepared SQL query and returns its ResultSet.
@@ -78,7 +78,7 @@ public interface PreparedStatement extends Statement
    * for the specified type.
    *
    * @param index The index of the parameter to set.
-   * @param sqlType The SQL type identifier of the parameter from 
+   * @param sqlType The SQL type identifier of the parameter from
    *                Types
    *
    * @exception SQLException If an error occurs.
@@ -268,7 +268,7 @@ public interface PreparedStatement extends Statement
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-   * @param sqlType The SQL type to use for the parameter, from 
+   * @param sqlType The SQL type to use for the parameter, from
    *                Types
    * @param scale The scale of the value, for numeric values only.
    * @exception SQLException If an error occurs.
@@ -283,7 +283,7 @@ public interface PreparedStatement extends Statement
    *
    * @param index The index of the parameter value to set.
    * @param value The value of the parameter.
-   * @param sqlType The SQL type to use for the parameter, from 
+   * @param sqlType The SQL type to use for the parameter, from
    *                      Types
    * @exception SQLException If an error occurs.
    * @see Types
@@ -348,7 +348,7 @@ public interface PreparedStatement extends Statement
    * will be used.
    *
    * @param index The index of the parameter value to set.
-   * @param value The Blob used to set the 
+   * @param value The Blob used to set the
    *             value of the parameter.
    * @exception SQLException If an error occurs.
    */
@@ -437,7 +437,7 @@ public interface PreparedStatement extends Statement
   /**
    * This method sets the specified parameter from the given Java
    * java.net.URL value.
-   * 
+   *
    * @param index The index of the parameter to set.
    * @param value The value of the parameter.
    * @exception SQLException If an error occurs.
@@ -446,10 +446,10 @@ public interface PreparedStatement extends Statement
   void setURL(int index, URL value) throws SQLException;
 
   /**
-   * Returns information about the parameters set on this 
+   * Returns information about the parameters set on this
    * PreparedStatement (see {@link ParameterMetaData} for a
    * detailed description of the provided information).
-   * 
+   *
    * @return Meta data for the parameters of this statement.
    * @see ParameterMetaData
    * @since 1.4
diff --git a/libjava/classpath/java/sql/Ref.java b/libjava/classpath/java/sql/Ref.java
index c5c54eefef1..f37c8fe4d86 100644
--- a/libjava/classpath/java/sql/Ref.java
+++ b/libjava/classpath/java/sql/Ref.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -46,7 +46,7 @@ import java.util.Map;
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @since 1.2
  */
-public interface Ref 
+public interface Ref
 {
   /**
    * This method returns the fully qualified name of the SQL structured
diff --git a/libjava/classpath/java/sql/ResultSet.java b/libjava/classpath/java/sql/ResultSet.java
index 573deb3e105..3b49a6a0d6c 100644
--- a/libjava/classpath/java/sql/ResultSet.java
+++ b/libjava/classpath/java/sql/ResultSet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -59,7 +59,7 @@ import java.util.Map;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface ResultSet 
+public interface ResultSet
 {
   /**
    * The rows will be processed in order from first to last.
@@ -119,7 +119,7 @@ public interface ResultSet
 
   /**
    * This method closes the result set and frees any associated resources.
-   * 
+   *
    * @exception SQLException If an error occurs.
    */
   void close() throws SQLException;
@@ -268,9 +268,9 @@ public interface ResultSet
   Timestamp getTimestamp(int columnIndex) throws SQLException;
 
   /**
-   * This method returns the value of the specified column as an ASCII 
+   * This method returns the value of the specified column as an ASCII
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -283,7 +283,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a Unicode UTF-8
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -297,7 +297,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a raw byte
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -440,9 +440,9 @@ public interface ResultSet
   Timestamp getTimestamp(String columnName) throws SQLException;
 
   /**
-   * This method returns the value of the specified column as an ASCII 
+   * This method returns the value of the specified column as an ASCII
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -455,7 +455,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a Unicode UTF-8
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -469,7 +469,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a raw byte
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -546,7 +546,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a character
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -559,7 +559,7 @@ public interface ResultSet
   /**
    * This method returns the value of the specified column as a character
    * stream.  Note that all the data from this stream must be read before
-   * fetching the value of any other column.  Please also be aware that 
+   * fetching the value of any other column.  Please also be aware that
    * calling next() or close() on this result set
    * will close this stream as well.
    *
@@ -632,7 +632,7 @@ public interface ResultSet
   /**
    * This method repositions the cursor to before the first row in the
    * result set.
-   * 
+   *
    * @exception SQLException If an error occurs.
    */
   void beforeFirst() throws SQLException;
@@ -640,7 +640,7 @@ public interface ResultSet
   /**
    * This method repositions the cursor to after the last row in the result
    * set.
-   * 
+   *
    * @exception SQLException If an error occurs.
    */
   void afterLast() throws SQLException;
@@ -658,7 +658,7 @@ public interface ResultSet
   /**
    * This method repositions the cursor on the last row in the result
    * set.
-   * 
+   *
    * @return true if the cursor is on a valid row;
    *         false if there are no rows in the result set.
    * @exception SQLException If an error occurs.
@@ -711,7 +711,7 @@ public interface ResultSet
 
   /**
    * This method provides a hint to the driver about which direction the
-   * result set will be processed in. 
+   * result set will be processed in.
    *
    * @param direction The direction in which rows will be processed. The
    *                  allowed values are the FETCH_* constants
@@ -738,7 +738,7 @@ public interface ResultSet
   void setFetchSize(int rows) throws SQLException;
 
   /**
-   * This method returns the current number of rows that will be fetched 
+   * This method returns the current number of rows that will be fetched
    * from the database at a time.
    *
    * @return The current fetch size for this result set.
@@ -941,7 +941,7 @@ public interface ResultSet
   void updateTime(int columnIndex, Time value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a java.sql.Timestamp value.  
+   * This method updates the specified column to have a java.sql.Timestamp value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -992,7 +992,7 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method updates the specified column to have an Object value.  
+   * This method updates the specified column to have an Object value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -1006,7 +1006,7 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method updates the specified column to have an Object value.  
+   * This method updates the specified column to have an Object value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -1160,7 +1160,7 @@ public interface ResultSet
   void updateTime(String columnName, Time value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a java.sql.Timestamp value.  
+   * This method updates the specified column to have a java.sql.Timestamp value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -1211,7 +1211,7 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method updates the specified column to have an Object value.  
+   * This method updates the specified column to have an Object value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -1225,7 +1225,7 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method updates the specified column to have an Object value.  
+   * This method updates the specified column to have an Object value.
    * This does not update the actual database.  updateRow must be
    * called in order to do that.
    *
@@ -1266,7 +1266,7 @@ public interface ResultSet
   void refreshRow() throws SQLException;
 
   /**
-   * This method cancels any changes that have been made to a row.  If 
+   * This method cancels any changes that have been made to a row.  If
    * the rowUpdate method has been called, then the changes
    * cannot be undone.
    *
@@ -1358,7 +1358,7 @@ public interface ResultSet
    * @return The value of the column as an Object.
    * @exception SQLException If an error occurs.
    */
-  Object getObject(String columnName, Map> map) 
+  Object getObject(String columnName, Map> map)
     throws SQLException;
 
   /**
@@ -1399,7 +1399,7 @@ public interface ResultSet
   Array getArray(String columnName) throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Date.  The specified Calendar is used
    * to generate a value for the date if the database does not support
    * timezones.
@@ -1412,7 +1412,7 @@ public interface ResultSet
   Date getDate(int columnIndex, Calendar cal) throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Date.  The specified Calendar is used
    * to generate a value for the date if the database does not support
    * timezones.
@@ -1425,7 +1425,7 @@ public interface ResultSet
   Date getDate(String columnName, Calendar cal) throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Time.  The specified Calendar is used
    * to generate a value for the time if the database does not support
    * timezones.
@@ -1438,7 +1438,7 @@ public interface ResultSet
   Time getTime(int columnIndex, Calendar cal) throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Time.  The specified Calendar is used
    * to generate a value for the time if the database does not support
    * timezones.
@@ -1451,7 +1451,7 @@ public interface ResultSet
   Time getTime(String columnName, Calendar cal) throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Timestamp.  The specified Calendar is used
    * to generate a value for the timestamp if the database does not support
    * timezones.
@@ -1465,7 +1465,7 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.sql.Timestamp.  The specified Calendar is used
    * to generate a value for the timestamp if the database does not support
    * timezones.
@@ -1481,9 +1481,9 @@ public interface ResultSet
     throws SQLException;
 
   /**
-   * This method returns the specified column value as a 
+   * This method returns the specified column value as a
    * java.net.URL.
-   * 
+   *
    * @param columnIndex The index of the column value to return.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1493,7 +1493,7 @@ public interface ResultSet
   /**
    * This method returns the specified column value as a
    * java.net.URL.
-   * 
+   *
    * @param columnName The name of the column value to return.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1501,13 +1501,13 @@ public interface ResultSet
   URL getURL(String columnName) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Ref value. 
+   * This method updates the specified column to have a
+   * java.sql.Ref value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnIndex The index of the column value to update.
-   * @parm value The java.sql.Ref used to set the new value 
+   * @parm value The java.sql.Ref used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1515,13 +1515,13 @@ public interface ResultSet
   void updateRef(int columnIndex, Ref value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Ref value. 
+   * This method updates the specified column to have a
+   * java.sql.Ref value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnName The name of the column value to update.
-   * @parm value The java.sql.Ref used to set the new value 
+   * @parm value The java.sql.Ref used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1529,13 +1529,13 @@ public interface ResultSet
   void updateRef(String columnName, Ref value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Blob value. 
+   * This method updates the specified column to have a
+   * java.sql.Blob value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnIndex The index of the column value to update.
-   * @parm value The java.sql.Blob used to set the new value 
+   * @parm value The java.sql.Blob used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1543,13 +1543,13 @@ public interface ResultSet
   void updateBlob(int columnIndex, Blob value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Blob value. 
+   * This method updates the specified column to have a
+   * java.sql.Blob value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnName The name of the column value to update.
-   * @parm value The java.sql.Blob used to set the new value 
+   * @parm value The java.sql.Blob used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1557,13 +1557,13 @@ public interface ResultSet
   void updateBlob(String columnName, Blob value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Clob value. 
+   * This method updates the specified column to have a
+   * java.sql.Clob value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnIndex The index of the column value to update.
-   * @parm value The java.sql.Clob used to set the new value 
+   * @parm value The java.sql.Clob used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1571,13 +1571,13 @@ public interface ResultSet
   void updateClob(int columnIndex, Clob value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sql.Clob value. 
+   * This method updates the specified column to have a
+   * java.sql.Clob value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnName The name of the column value to update.
-   * @parm value The java.sql.Clob used to set the new value 
+   * @parm value The java.sql.Clob used to set the new value
    *             of the column.
    * @exception SQLException If an error occurs.
    * @since 1.4
@@ -1585,11 +1585,11 @@ public interface ResultSet
   void updateClob(String columnName, Clob value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sqlArray value. 
+   * This method updates the specified column to have a
+   * java.sqlArray value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnIndex The index of the column value to update.
    * @parm value The new value of the column.
    * @exception SQLException If an error occurs.
@@ -1598,11 +1598,11 @@ public interface ResultSet
   void updateArray(int columnIndex, Array value) throws SQLException;
 
   /**
-   * This method updates the specified column to have a 
-   * java.sqlArray value. 
+   * This method updates the specified column to have a
+   * java.sqlArray value.
    * This does not update the actual database. updateRow must be
    * called in order to do that.
-   * 
+   *
    * @parm columnName The name of the column value to update.
    * @parm value The new value of the column.
    * @exception SQLException If an error occurs.
diff --git a/libjava/classpath/java/sql/ResultSetMetaData.java b/libjava/classpath/java/sql/ResultSetMetaData.java
index 5a62c549e1e..98485e3d3ab 100644
--- a/libjava/classpath/java/sql/ResultSetMetaData.java
+++ b/libjava/classpath/java/sql/ResultSetMetaData.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,12 +41,12 @@ package java.sql;
 /**
  * This interface provides a mechanism for obtaining information about
  * the columns that are present in a ResultSet.
- * 
+ *
  * 
             Note that in this class column indices start at 1, not 0.
            
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface ResultSetMetaData 
+public interface ResultSetMetaData
 {
   /**
    * The column does not allow NULL's.
@@ -93,7 +93,7 @@ public interface ResultSetMetaData
   boolean isCaseSensitive(int columnIndex) throws SQLException;
 
   /**
-   * This method tests whether not the specified column can be used in 
+   * This method tests whether not the specified column can be used in
    * a WHERE clause.
    *
    * @param columnIndex The index of the column to test.
diff --git a/libjava/classpath/java/sql/SQLData.java b/libjava/classpath/java/sql/SQLData.java
index cf006e15a0d..97a42a443cc 100644
--- a/libjava/classpath/java/sql/SQLData.java
+++ b/libjava/classpath/java/sql/SQLData.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface SQLData 
+public interface SQLData
 {
   /**
    * This method returns the user defined datatype name for this object.
diff --git a/libjava/classpath/java/sql/SQLException.java b/libjava/classpath/java/sql/SQLException.java
index 8c502f2df7c..d8d845c6b9a 100644
--- a/libjava/classpath/java/sql/SQLException.java
+++ b/libjava/classpath/java/sql/SQLException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public class SQLException extends Exception 
+public class SQLException extends Exception
 {
   static final long serialVersionUID = 2135244094396331484L;
 
@@ -75,7 +75,7 @@ public class SQLException extends Exception
   {
     super(message);
     this.SQLState = SQLState;
-    this.vendorCode = vendorCode;  
+    this.vendorCode = vendorCode;
   }
 
   /**
@@ -100,7 +100,7 @@ public class SQLException extends Exception
    */
   public SQLException(String message)
   {
-    this(message, null, 0);  
+    this(message, null, 0);
   }
 
   /**
@@ -110,7 +110,7 @@ public class SQLException extends Exception
    */
   public SQLException()
   {
-    this(null, null, 0);  
+    this(null, null, 0);
   }
 
   /**
@@ -126,7 +126,7 @@ public class SQLException extends Exception
   }
 
   /**
-   * This method returns the vendor specific error code associated with 
+   * This method returns the vendor specific error code associated with
    * this error.
    *
    * @return The vendor specific error code associated with this error.
@@ -139,7 +139,7 @@ public class SQLException extends Exception
   /**
    * This method returns the exception that is chained to this object.
    *
-   * @return The exception chained to this object, which may be 
+   * @return The exception chained to this object, which may be
    *         null.
    */
   public SQLException getNextException()
diff --git a/libjava/classpath/java/sql/SQLInput.java b/libjava/classpath/java/sql/SQLInput.java
index 730627d9a9e..e277a5020cf 100644
--- a/libjava/classpath/java/sql/SQLInput.java
+++ b/libjava/classpath/java/sql/SQLInput.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -50,7 +50,7 @@ import java.net.URL;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface SQLInput 
+public interface SQLInput
 {
   /**
    * This method reads the next item from the stream a Java
@@ -137,7 +137,7 @@ public interface SQLInput
    * This method reads the next item from the stream a Java
    * byte array
    *
-   * @return The value read from the stream as a byte array. 
+   * @return The value read from the stream as a byte array.
    * @exception SQLException If an error occurs.
    */
   byte[] readBytes() throws SQLException;
@@ -256,4 +256,3 @@ public interface SQLInput
    */
   URL readURL() throws SQLException;
 }
-
diff --git a/libjava/classpath/java/sql/SQLOutput.java b/libjava/classpath/java/sql/SQLOutput.java
index e210258fa0a..cd075f1d288 100644
--- a/libjava/classpath/java/sql/SQLOutput.java
+++ b/libjava/classpath/java/sql/SQLOutput.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -50,7 +50,7 @@ import java.net.URL;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface SQLOutput 
+public interface SQLOutput
 {
   /**
    * This method writes the specified Java String
@@ -143,7 +143,7 @@ public interface SQLOutput
   void writeBytes(byte[] value) throws SQLException;
 
   /**
-   * This method writes the specified Java java.sql.Date 
+   * This method writes the specified Java java.sql.Date
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
@@ -152,7 +152,7 @@ public interface SQLOutput
   void writeDate(Date value) throws SQLException;
 
   /**
-   * This method writes the specified Java java.sql.Time 
+   * This method writes the specified Java java.sql.Time
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
@@ -161,7 +161,7 @@ public interface SQLOutput
   void writeTime(Time value) throws SQLException;
 
   /**
-   * This method writes the specified Java java.sql.Timestamp 
+   * This method writes the specified Java java.sql.Timestamp
    * to the SQL stream.
    *
    * @param value The value to write to the stream.
@@ -256,9 +256,9 @@ public interface SQLOutput
   void writeArray(Array value) throws SQLException;
 
   /**
-   * This method writes the specified java.net.URL object to the 
+   * This method writes the specified java.net.URL object to the
    * SQL stream.
-   * 
+   *
    * @param value The value to write to the stream.
    * @exception SQLException If an error occurs.
    * @since 1.4
diff --git a/libjava/classpath/java/sql/SQLPermission.java b/libjava/classpath/java/sql/SQLPermission.java
index 101fa0161b4..ed3dd7f9eb6 100644
--- a/libjava/classpath/java/sql/SQLPermission.java
+++ b/libjava/classpath/java/sql/SQLPermission.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.security.BasicPermission;
 /**
  * @since 1.3
  */
-public final class SQLPermission extends BasicPermission 
+public final class SQLPermission extends BasicPermission
 {
   public SQLPermission(String name)
   {
diff --git a/libjava/classpath/java/sql/SQLWarning.java b/libjava/classpath/java/sql/SQLWarning.java
index d9c7e354ed6..c2cee0ad5c6 100644
--- a/libjava/classpath/java/sql/SQLWarning.java
+++ b/libjava/classpath/java/sql/SQLWarning.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public class SQLWarning extends SQLException 
+public class SQLWarning extends SQLException
 {
   static final long serialVersionUID = 3917336774604784856L;
 
@@ -99,7 +99,7 @@ public class SQLWarning extends SQLException
   /**
    * This method returns the exception that is chained to this object.
    *
-   * @return The exception chained to this object, which may be 
+   * @return The exception chained to this object, which may be
    *         null.
    */
   public SQLWarning getNextWarning()
diff --git a/libjava/classpath/java/sql/Savepoint.java b/libjava/classpath/java/sql/Savepoint.java
index a4d89ae6e50..6526dfb4472 100644
--- a/libjava/classpath/java/sql/Savepoint.java
+++ b/libjava/classpath/java/sql/Savepoint.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,7 +41,7 @@ package java.sql;
 /**
  * @since 1.4
  */
-public interface Savepoint 
+public interface Savepoint
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/java/sql/Statement.java b/libjava/classpath/java/sql/Statement.java
index 195600eaa2c..1b57fb3ce3c 100644
--- a/libjava/classpath/java/sql/Statement.java
+++ b/libjava/classpath/java/sql/Statement.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface Statement 
+public interface Statement
 {
   int CLOSE_CURRENT_RESULT = 1;
   int KEEP_CURRENT_RESULT = 2;
@@ -66,7 +66,7 @@ public interface Statement
   /**
    * This method executes the specified SQL INSERT, UPDATE, or DELETE statement
    * and returns the number of rows affected, which may be 0.
-   * 
+   *
    * @param sql The SQL statement to execute.
    * @return The number of rows affected by the SQL statement.
    * @exception SQLException If an error occurs.
@@ -117,7 +117,7 @@ public interface Statement
    * This method sets the local escape processing mode on or off.  The
    * default value is on.
    *
-   * @param escape true to enable local escape processing, 
+   * @param escape true to enable local escape processing,
    *               false to disable it.
    * @exception SQLException If an error occurs.
    */
@@ -214,10 +214,10 @@ public interface Statement
   int getUpdateCount() throws SQLException;
 
   /**
-   * This method advances the result set pointer to the next result set, 
+   * This method advances the result set pointer to the next result set,
    * which can then be retrieved using getResultSet
    *
-   * @return true if there is another result set, 
+   * @return true if there is another result set,
    *         false otherwise (for example, the next result is an
    *         update count).
    * @exception SQLException If an error occurs.
diff --git a/libjava/classpath/java/sql/Struct.java b/libjava/classpath/java/sql/Struct.java
index ce8db22bb55..897344b9889 100644
--- a/libjava/classpath/java/sql/Struct.java
+++ b/libjava/classpath/java/sql/Struct.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,12 +41,12 @@ package java.sql;
 import java.util.Map;
 
 /**
- * This interface implements the standard type mapping for a SQL 
+ * This interface implements the standard type mapping for a SQL
  * structured type.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public interface Struct 
+public interface Struct
 {
   /**
    * This method returns the name of the SQL structured type for this
diff --git a/libjava/classpath/java/sql/Time.java b/libjava/classpath/java/sql/Time.java
index 2d1a433fa41..8de16368334 100644
--- a/libjava/classpath/java/sql/Time.java
+++ b/libjava/classpath/java/sql/Time.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -145,16 +145,16 @@ public class Time extends java.util.Date
   {
     try
       {
-	java.util.Date d = (java.util.Date) sdf.parseObject(str);
+        java.util.Date d = (java.util.Date) sdf.parseObject(str);
 
-	if (d == null)
-	  throw new IllegalArgumentException(str);
-	else
-	  return new Time(d.getTime());
+        if (d == null)
+          throw new IllegalArgumentException(str);
+        else
+          return new Time(d.getTime());
       }
     catch (ParseException e)
       {
-	throw new IllegalArgumentException(str);
+        throw new IllegalArgumentException(str);
       }
   }
 
@@ -178,7 +178,7 @@ public class Time extends java.util.Date
 
   /**
    * This method initializes a new instance of this class with the
-   * specified time value representing the number of milliseconds since 
+   * specified time value representing the number of milliseconds since
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param date The time value to intialize this Time to.
@@ -199,4 +199,3 @@ public class Time extends java.util.Date
   }
 
 }
-
diff --git a/libjava/classpath/java/sql/Timestamp.java b/libjava/classpath/java/sql/Timestamp.java
index 18ccda5577d..9488f8e2de8 100644
--- a/libjava/classpath/java/sql/Timestamp.java
+++ b/libjava/classpath/java/sql/Timestamp.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,7 +45,7 @@ import java.text.SimpleDateFormat;
 /**
  * This class is a wrapper around java.util.Date to allow the JDBC
  * driver to identify the value as a SQL Timestamp.  Note that this
- * class also adds an additional field for nano-seconds, and so 
+ * class also adds an additional field for nano-seconds, and so
  * is not completely identical to java.util.Date as
  * the java.sql.Date and java.sql.Time
  * classes are.
@@ -74,7 +74,7 @@ public class Timestamp extends java.util.Date
    * date in JDBC format into a Java date.
    *
    * @param str The string to parse.
-   * @return The resulting java.sql.Timestamp value. 
+   * @return The resulting java.sql.Timestamp value.
    */
   public static Timestamp valueOf(String str)
   {
@@ -82,18 +82,18 @@ public class Timestamp extends java.util.Date
     int dot = str.indexOf('.');
     if (dot != -1)
       {
-	if (str.lastIndexOf('.') != dot)
-	  throw new IllegalArgumentException(str);
+        if (str.lastIndexOf('.') != dot)
+          throw new IllegalArgumentException(str);
 
-	int len = str.length() - dot - 1;
-	if (len < 1 || len > 9)
-	  throw new IllegalArgumentException(str);
+        int len = str.length() - dot - 1;
+        if (len < 1 || len > 9)
+          throw new IllegalArgumentException(str);
 
-	nanos = Integer.parseInt(str.substring(dot + 1));
-	for (int i = len; i < 9; i++)
-	  nanos *= 10;
-	
-	str = str.substring(0, dot);
+        nanos = Integer.parseInt(str.substring(dot + 1));
+        for (int i = len; i < 9; i++)
+          nanos *= 10;
+
+        str = str.substring(0, dot);
 
       }
 
@@ -101,20 +101,20 @@ public class Timestamp extends java.util.Date
       {
         java.util.Date d;
         synchronized (dateFormat)
-	  {
-	    d = (java.util.Date) dateFormat.parseObject(str);
-	  }
+          {
+            d = (java.util.Date) dateFormat.parseObject(str);
+          }
 
-	if (d == null)
-	  throw new IllegalArgumentException(str);
+        if (d == null)
+          throw new IllegalArgumentException(str);
 
-	Timestamp ts = new Timestamp(d.getTime() + nanos / 1000000);
-	ts.nanos = nanos;
-	return ts;
+        Timestamp ts = new Timestamp(d.getTime() + nanos / 1000000);
+        ts.nanos = nanos;
+        return ts;
       }
     catch (ParseException e)
       {
-	throw new IllegalArgumentException(str);
+        throw new IllegalArgumentException(str);
       }
   }
 
@@ -131,7 +131,7 @@ public class Timestamp extends java.util.Date
    * @param nanos The nanosecond value for this Timestamp (0 to 999,999,9999)
    * @deprecated
    */
-  public Timestamp(int year, int month, int day, int hour, int minute, 
+  public Timestamp(int year, int month, int day, int hour, int minute,
     int second, int nanos)
   {
     super(year, month, day, hour, minute, second);
@@ -140,7 +140,7 @@ public class Timestamp extends java.util.Date
 
   /**
    * This method initializes a new instance of this class with the
-   * specified time value representing the number of milliseconds since 
+   * specified time value representing the number of milliseconds since
    * Jan 1, 1970 at 12:00 midnight GMT.
    *
    * @param date The time value to intialize this Time to.
@@ -152,7 +152,7 @@ public class Timestamp extends java.util.Date
   }
 
   /**
-   * Return the value of this Timestamp as the number of milliseconds 
+   * Return the value of this Timestamp as the number of milliseconds
    * since Jan 1, 1970 at 12:00 midnight GMT.
    */
   public long getTime()
@@ -170,13 +170,13 @@ public class Timestamp extends java.util.Date
     synchronized (dateFormat)
       {
         sbuf.setLength(0);
-	dateFormat.format(this, sbuf, null);
-	sbuf.append('.');
-	decimalFormat.format(nanos, sbuf, null);
-	int end = sbuf.length() - 1;
-	while (end > 20 && sbuf.charAt(end) == '0')
-	  end--;
-	return sbuf.substring(0, end + 1);
+        dateFormat.format(this, sbuf, null);
+        sbuf.append('.');
+        decimalFormat.format(nanos, sbuf, null);
+        int end = sbuf.length() - 1;
+        while (end > 20 && sbuf.charAt(end) == '0')
+          end--;
+        return sbuf.substring(0, end + 1);
       }
   }
 
@@ -280,7 +280,7 @@ public class Timestamp extends java.util.Date
 
   /**
    * Compares this Timestamp to another one.
-   * 
+   *
    * @param ts The other Timestamp.
    * @return 0, if both Timestamp's represent exactly
    *         the same date, a negative value if this Timestamp is
@@ -302,7 +302,7 @@ public class Timestamp extends java.util.Date
    * compareTo(Timestamp), but it may throw a
    * ClassCastException, if the specified object is not of type
    * Timestamp.
-   * 
+   *
    * @param obj The object to compare with.
    * @return 0, if both Timestamp's represent exactly
    *         the same date, a negative value if this Timestamp is
diff --git a/libjava/classpath/java/sql/Types.java b/libjava/classpath/java/sql/Types.java
index 7dd41411ada..c07ef1353f8 100644
--- a/libjava/classpath/java/sql/Types.java
+++ b/libjava/classpath/java/sql/Types.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.sql;
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public class Types 
+public class Types
 {
   // These should be self explanatory.  People need a SQL book, not
   // Javadoc comments for these.
diff --git a/libjava/classpath/java/text/Annotation.java b/libjava/classpath/java/text/Annotation.java
index cecb44aaf0e..7c4d001f66d 100644
--- a/libjava/classpath/java/text/Annotation.java
+++ b/libjava/classpath/java/text/Annotation.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -110,4 +110,3 @@ toString()
 }
 
 } // class Annotation
-
diff --git a/libjava/classpath/java/text/AttributedCharacterIterator.java b/libjava/classpath/java/text/AttributedCharacterIterator.java
index 4f9c762b3cd..72c0ebbfe8b 100644
--- a/libjava/classpath/java/text/AttributedCharacterIterator.java
+++ b/libjava/classpath/java/text/AttributedCharacterIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -54,7 +54,7 @@ import java.util.Set;
  * characters or which is undefined over a range of characters.
  *
  * @since 1.2
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @since 1.2
  */
@@ -77,7 +77,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
      * This is the attribute for the reading form of text.  This is used
      * for storing pronunciation along with the written text for languages
      * which need it.  The value of attributes of this key type are
-     * instances of Annotation which wrappers a 
+     * instances of Annotation which wrappers a
      * String.
      */
     public static final Attribute READING = new Attribute("reading");
@@ -117,7 +117,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
     }
 
     /**
-     * Resolves an instance of 
+     * Resolves an instance of
      * AttributedCharacterIterator.Attribute
      * that is being deserialized to one of the three pre-defined attribute
      * constants.  It does this by comparing the names of the attributes.  The
@@ -125,7 +125,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
      *
      * @return The resolved contant value
      *
-     * @exception InvalidObjectException If the object being deserialized 
+     * @exception InvalidObjectException If the object being deserialized
      *            cannot be resolved.
      */
     protected Object readResolve() throws InvalidObjectException
@@ -139,31 +139,31 @@ public interface AttributedCharacterIterator extends CharacterIterator
       if (getName().equals(INPUT_METHOD_SEGMENT.getName()))
         return INPUT_METHOD_SEGMENT;
 
-      throw new InvalidObjectException ("Can't resolve Attribute: " 
+      throw new InvalidObjectException ("Can't resolve Attribute: "
               + getName());
     }
-    
+
     /**
      * Tests this object for equality against the specified object.
      * The two objects will be considered equal if and only if:
      * 
              
      * 
            • The specified object is not null.
-     * 
            • The specified object is an instance of 
+     * 
            • The specified object is an instance of
      * AttributedCharacterIterator.Attribute.
      * 
            • The specified object has the same attribute name as this object.
      * 
            
      *
-     * @param obj  the Object to test for equality against this 
+     * @param obj  the Object to test for equality against this
      *             object.
      *
-     * @return true if the specified object is equal to this one, 
+     * @return true if the specified object is equal to this one,
      *         false otherwise.
      */
     public final boolean equals(Object obj)
     {
       if (obj == this)
         return true;
-      else 
+      else
         return false;
     }
 
@@ -190,15 +190,15 @@ public interface AttributedCharacterIterator extends CharacterIterator
   } // Inner class Attribute
 
   /**
-   * Returns a list of all keys that are defined for the 
+   * Returns a list of all keys that are defined for the
    * text range.  This can be an empty list if no attributes are defined.
    *
-   * @return A list of keys 
+   * @return A list of keys
    */
   Set getAllAttributeKeys();
 
   /**
-   * Returns a Map of the attributes defined for the current 
+   * Returns a Map of the attributes defined for the current
    * character.
    *
    * @return A Map of the attributes for the current character.
@@ -234,7 +234,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
    * @return The start index of the run.
    */
   int getRunStart(Set attribs);
-  
+
   /**
    * Returns the index of the first character in the run that
    * contains the specified attribute defined for the current character.
@@ -244,7 +244,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
    * @return The start index of the run.
    */
   int getRunStart(AttributedCharacterIterator.Attribute attrib);
-  
+
   /**
    * Returns the index of the character after the end of the run
    * that contains all attributes defined for the current character.
@@ -252,7 +252,7 @@ public interface AttributedCharacterIterator extends CharacterIterator
    * @return The end index of the run.
    */
   int getRunLimit();
-  
+
   /**
    * Returns the index of the character after the end of the run
    * that contains all attributes in the specified Set defined
@@ -263,13 +263,13 @@ public interface AttributedCharacterIterator extends CharacterIterator
    * @return The end index of the run.
    */
   int getRunLimit(Set attribs);
-  
+
   /**
    * Returns the index of the character after the end of the run
    * that contains the specified attribute defined for the current character.
    *
    * @param attrib The attribute.
-   * 
+   *
    * @return The end index of the run.
    */
   int getRunLimit(AttributedCharacterIterator.Attribute attrib);
diff --git a/libjava/classpath/java/text/AttributedString.java b/libjava/classpath/java/text/AttributedString.java
index cb338bfe8df..7ffb3d4c073 100644
--- a/libjava/classpath/java/text/AttributedString.java
+++ b/libjava/classpath/java/text/AttributedString.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -50,9 +50,9 @@ import java.util.Set;
 
 /**
  * This class models a String with attributes over various
- * subranges of the string.  It allows applications to access this 
+ * subranges of the string.  It allows applications to access this
  * information via the AttributedCharacterIterator interface.
- * 
+ *
  * @since 1.2
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -61,8 +61,8 @@ import java.util.Set;
 public class AttributedString
 {
 
-  /** 
-   * The attributes and ranges of text over which those attributes apply. 
+  /**
+   * The attributes and ranges of text over which those attributes apply.
    */
   final class AttributeRange
   {
@@ -78,12 +78,12 @@ public class AttributedString
 
     /**
      * Creates a new attribute range.
-     * 
+     *
      * @param attribs  the attributes.
      * @param beginIndex  the start index.
      * @param endIndex  the end index.
      */
-    AttributeRange(Map attribs, int beginIndex, int endIndex) 
+    AttributeRange(Map attribs, int beginIndex, int endIndex)
     {
       this.attribs = attribs;
       this.beginIndex = beginIndex;
@@ -104,7 +104,7 @@ public class AttributedString
    *
    * @param str The String to be attributed (null not
    *            permitted).
-   * 
+   *
    * @throws NullPointerException if str is null.
    */
   public AttributedString(String str)
@@ -135,10 +135,10 @@ public class AttributedString
    * that will use the text and attribute information from the specified
    * AttributedCharacterIterator.
    *
-   * @param aci The AttributedCharacterIterator containing the 
-   *            text and attribute information (null not 
+   * @param aci The AttributedCharacterIterator containing the
+   *            text and attribute information (null not
    *            permitted).
-   * 
+   *
    * @throws NullPointerException if aci is null.
    */
   public AttributedString(AttributedCharacterIterator aci)
@@ -151,7 +151,7 @@ public class AttributedString
    * that will use the text and attribute information from the specified
    * subrange of the specified AttributedCharacterIterator.
    *
-   * @param aci The AttributedCharacterIterator containing the 
+   * @param aci The AttributedCharacterIterator containing the
    *            text and attribute information.
    * @param beginIndex The beginning index of the text subrange.
    * @param endIndex The ending index of the text subrange.
@@ -170,14 +170,14 @@ public class AttributedString
    * specified array of attributes will be included in the attribute list
    * for this object.
    *
-   * @param aci The AttributedCharacterIterator containing the 
+   * @param aci The AttributedCharacterIterator containing the
    *            text and attribute information.
    * @param begin The beginning index of the text subrange.
    * @param end The ending index of the text subrange.
-   * @param attributes A list of attributes to include from the iterator, or 
+   * @param attributes A list of attributes to include from the iterator, or
    *                   null to include all attributes.
    */
-  public AttributedString(AttributedCharacterIterator aci, int begin, int end, 
+  public AttributedString(AttributedCharacterIterator aci, int begin, int end,
                           AttributedCharacterIterator.Attribute[] attributes)
   {
     // Validate some arguments
@@ -196,7 +196,7 @@ public class AttributedString
 
     ArrayList accum = new ArrayList();
     do
-      { 
+      {
         sb.append(c);
 
         Iterator iter = allAttribs.iterator();
@@ -208,7 +208,7 @@ public class AttributedString
             if (!(obj instanceof AttributedCharacterIterator.Attribute))
               continue;
 
-            AttributedCharacterIterator.Attribute attrib = 
+            AttributedCharacterIterator.Attribute attrib =
               (AttributedCharacterIterator.Attribute)obj;
 
             // Make sure the attribute is defined.
@@ -260,7 +260,7 @@ public class AttributedString
    * @param attrib The attribute to add.
    * @param value The value of the attribute.
    */
-  public void addAttribute(AttributedCharacterIterator.Attribute attrib, 
+  public void addAttribute(AttributedCharacterIterator.Attribute attrib,
           Object value)
   {
     addAttribute(attrib, value, 0, sci.getEndIndex());
@@ -275,10 +275,10 @@ public class AttributedString
    * @param begin The beginning index of the subrange.
    * @param end The ending index of the subrange.
    *
-   * @exception IllegalArgumentException If attribute is null or 
+   * @exception IllegalArgumentException If attribute is null or
    *            the subrange is not valid.
    */
-  public void addAttribute(AttributedCharacterIterator.Attribute attrib, 
+  public void addAttribute(AttributedCharacterIterator.Attribute attrib,
           Object value, int begin, int end)
   {
     if (attrib == null)
@@ -299,12 +299,12 @@ public class AttributedString
    * @param beginIndex The beginning index.
    * @param endIndex The ending index
    *
-   * @throws NullPointerException if attributes is 
+   * @throws NullPointerException if attributes is
    *         null.
    * @throws IllegalArgumentException if the subrange is not valid.
    */
   public void addAttributes(Map attributes,
-			    int beginIndex, int endIndex)
+                            int beginIndex, int endIndex)
   {
     if (attributes == null)
       throw new NullPointerException("null attribute");
@@ -316,19 +316,19 @@ public class AttributedString
     AttributeRange[] new_list = new AttributeRange[attribs.length + 1];
     System.arraycopy(attribs, 0, new_list, 0, attribs.length);
     attribs = new_list;
-    attribs[attribs.length - 1] = new AttributeRange(attributes, beginIndex, 
+    attribs[attribs.length - 1] = new AttributeRange(attributes, beginIndex,
                                                      endIndex);
-  } 
+  }
 
   /**
-   * Returns an AttributedCharacterIterator that 
+   * Returns an AttributedCharacterIterator that
    * will iterate over the entire string.
    *
    * @return An AttributedCharacterIterator for the entire string.
    */
   public AttributedCharacterIterator getIterator()
   {
-    return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex(), 
+    return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex(),
             null));
   }
 
@@ -351,11 +351,11 @@ public class AttributedString
 
   /**
    * Returns an AttributedCharacterIterator that
-   * will iterate over the specified subrange.  This iterator will return 
-   * information about the list of attributes in the specified array.  
-   * Attributes not in the array may or may not be returned by the iterator.  
-   * If the specified array is null, all attributes will be 
-   * returned.  
+   * will iterate over the specified subrange.  This iterator will return
+   * information about the list of attributes in the specified array.
+   * Attributes not in the array may or may not be returned by the iterator.
+   * If the specified array is null, all attributes will be
+   * returned.
    *
    * @param attributes A list of attributes to include in the returned iterator.
    * @param beginIndex The beginning index of the subrange.
@@ -364,7 +364,7 @@ public class AttributedString
    * @return An AttributedCharacterIterator for this string.
    */
   public AttributedCharacterIterator getIterator(
-          AttributedCharacterIterator.Attribute[] attributes, 
+          AttributedCharacterIterator.Attribute[] attributes,
           int beginIndex, int endIndex)
   {
     if ((beginIndex < 0) || (endIndex > sci.getEndIndex()) ||
diff --git a/libjava/classpath/java/text/AttributedStringIterator.java b/libjava/classpath/java/text/AttributedStringIterator.java
index 2f970feba43..429bd7063db 100644
--- a/libjava/classpath/java/text/AttributedStringIterator.java
+++ b/libjava/classpath/java/text/AttributedStringIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -73,14 +73,14 @@ class AttributedStringIterator implements AttributedCharacterIterator
 
   /**
    * Creates a new instance.
-   * 
+   *
    * @param sci  an iterator for the string content.
    * @param attribs  the attribute ranges.
    * @param beginIndex  the start index.
    * @param endIndex  the end index.
    * @param restricts  the attributes that the user is interested in.
    */
-  AttributedStringIterator(StringCharacterIterator sci, 
+  AttributedStringIterator(StringCharacterIterator sci,
                            AttributedString.AttributeRange[] attribs,
                            int beginIndex, int endIndex,
                            AttributedCharacterIterator.Attribute[] restricts)
@@ -132,7 +132,7 @@ class AttributedStringIterator implements AttributedCharacterIterator
 
   public char setIndex(int index)
   {
-    return(ci.setIndex(index));  
+    return(ci.setIndex(index));
   }
 
   public int getBeginIndex()
@@ -147,7 +147,7 @@ class AttributedStringIterator implements AttributedCharacterIterator
 
   /*
    * Here is where the AttributedCharacterIterator methods start.
-   */ 
+   */
 
   /*************************************************************************/
 
@@ -164,8 +164,8 @@ class AttributedStringIterator implements AttributedCharacterIterator
     for (int i = 0; i < attribs.length; i++)
     {
       if (attribs[i].beginIndex > getEndIndex()
-	  || attribs[i].endIndex <= getBeginIndex())
-	continue;
+          || attribs[i].endIndex <= getBeginIndex())
+        continue;
 
       Set key_set = attribs[i].attribs.keySet();
       Iterator iter = key_set.iterator();
@@ -201,30 +201,30 @@ class AttributedStringIterator implements AttributedCharacterIterator
   {
     if (attributeSet == null)
       return ci.getEndIndex();
-    
+
     int current = ci.getIndex();
     int end = ci.getEndIndex();
     int limit = current;
-    if (current == end) 
+    if (current == end)
       return end;
     Map runValues = getAttributes();
-    while (limit < end) 
+    while (limit < end)
     {
       Iterator iterator = attributeSet.iterator();
-      while (iterator.hasNext()) 
+      while (iterator.hasNext())
       {
         Attribute attributeKey = (Attribute) iterator.next();
         Object v1 = runValues.get(attributeKey);
         Object v2 = getAttribute(attributeKey, limit + 1);
         boolean changed = false;
         // check for equal or both null, if NO return start
-        if (v1 != null) 
+        if (v1 != null)
           {
             changed = !v1.equals(v2);
           }
-        else 
+        else
           {
-            changed = (v2 != null);  
+            changed = (v2 != null);
           }
         if (changed)
           return limit + 1;
@@ -246,7 +246,7 @@ class AttributedStringIterator implements AttributedCharacterIterator
    * Returns the index of the first character in the run containing the current
    * character and defined by all the attributes defined for that character
    * position.
-   * 
+   *
    * @return The run start index.
    */
   public int getRunStart()
@@ -255,11 +255,11 @@ class AttributedStringIterator implements AttributedCharacterIterator
   }
 
   /**
-   * Returns the index of the first character in the run, defined by the 
+   * Returns the index of the first character in the run, defined by the
    * specified attribute, that contains the current character.
-   * 
+   *
    * @param attrib  the attribute (null permitted).
-   * 
+   *
    * return The index of the first character in the run.
    */
   public int getRunStart(AttributedCharacterIterator.Attribute attrib)
@@ -272,42 +272,42 @@ class AttributedStringIterator implements AttributedCharacterIterator
   }
 
   /**
-   * Returns the index of the first character in the run, defined by the 
+   * Returns the index of the first character in the run, defined by the
    * specified attribute set, that contains the current character.
-   * 
+   *
    * @param attributeSet  the attribute set (null permitted).
-   * 
+   *
    * return The index of the first character in the run.
    */
   public int getRunStart(Set attributeSet)
   {
     if (attributeSet == null)
       return ci.getBeginIndex();
-    
+
     int current = ci.getIndex();
     int begin = ci.getBeginIndex();
     int start = current;
-    if (start == begin) 
+    if (start == begin)
       return begin;
     Map runValues = getAttributes();
     int prev = start - 1;
-    while (start > begin) 
+    while (start > begin)
     {
       Iterator iterator = attributeSet.iterator();
-      while (iterator.hasNext()) 
+      while (iterator.hasNext())
       {
         Attribute attributeKey = (Attribute) iterator.next();
         Object v1 = runValues.get(attributeKey);
         Object v2 = getAttribute(attributeKey, prev);
         boolean changed = false;
         // check for equal or both null, if NO return start
-        if (v1 != null) 
+        if (v1 != null)
           {
             changed = !v1.equals(v2);
           }
-        else 
+        else
           {
-            changed = (v2 != null);  
+            changed = (v2 != null);
           }
         if (changed)
           return start;
@@ -325,13 +325,13 @@ class AttributedStringIterator implements AttributedCharacterIterator
    * Returns the value for an attribute at the specified position.  If the
    * attribute key (key) is null, the method returns
    * null.
-   * 
+   *
    * @param key  the key (null permitted).
    * @param pos  the character position.
-   * 
+   *
    * @return The attribute value (possibly null).
    */
-  private Object getAttribute(AttributedCharacterIterator.Attribute key, 
+  private Object getAttribute(AttributedCharacterIterator.Attribute key,
           int pos)
   {
     if (attribs == null)
@@ -341,22 +341,22 @@ class AttributedStringIterator implements AttributedCharacterIterator
         if (pos >= attribs[i].beginIndex && pos < attribs[i].endIndex)
           {
             Set keys = attribs[i].attribs.keySet();
-            if (keys.contains(key)) 
+            if (keys.contains(key))
               {
                 return attribs[i].attribs.get(key);
               }
           }
       }
-    return null;   
+    return null;
   }
-  
+
   /**
    * Returns the value for an attribute at the current position.  If the
    * attribute key (key) is null, the method returns
    * null.
-   * 
+   *
    * @param key  the key (null permitted).
-   * 
+   *
    * @return The attribute value (possibly null).
    */
   public Object getAttribute(AttributedCharacterIterator.Attribute key)
@@ -375,7 +375,7 @@ class AttributedStringIterator implements AttributedCharacterIterator
     HashMap m = new HashMap();
     if (attribs == null)
       return(m);
-  
+
     for (int i = 0; i < attribs.length; i++)
       {
          if ((ci.getIndex() >= attribs[i].beginIndex) &&
diff --git a/libjava/classpath/java/text/Bidi.java b/libjava/classpath/java/text/Bidi.java
index 491f9e36ef7..6a7bd075069 100644
--- a/libjava/classpath/java/text/Bidi.java
+++ b/libjava/classpath/java/text/Bidi.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -111,7 +111,7 @@ public final class Bidi
   // the codes have been removed.
   private ArrayList formatterIndices;
 
-  // Indices of the starts of runs in the text. 
+  // Indices of the starts of runs in the text.
   private int[] runs;
 
   // A convenience field where we keep track of what kinds of runs
@@ -128,11 +128,11 @@ public final class Bidi
    * {@link TextAttribute#RUN_DIRECTION_RTL}.  If neither is given,
    * {@link #DIRECTION_DEFAULT_LEFT_TO_RIGHT} is assumed.
    * 
-   * 
+   *
    * 
          4.  If {@link TextAttribute#NUMERIC_SHAPING} is seen, then numeric
    * shaping will be done before the Bidi algorithm is run.
    * 
            5. 
-   * 
+   *
    * 
          5.  If {@link TextAttribute#BIDI_EMBEDDING} is seen on a given
    * character, then the value of this attribute will be used as an
    * embedding level override.
@@ -192,12 +192,12 @@ public final class Bidi
   /**
    * Create a new Bidi object with the indicated text and, possibly, explicit
    * embedding settings.
-   * 
+   *
    * If the embeddings array is null, it is ignored.  Otherwise it is taken to
    * be explicit embedding settings corresponding to the text.  Positive values
    * from 1 to 61 are embedding levels, and negative values from -1 to -61 are
    * embedding overrides.  (FIXME: not at all clear what this really means.)
-   * 
+   *
    * @param text the text to use
    * @param offset the offset of the first character of the text
    * @param embeddings the explicit embeddings, or null if there are none
@@ -321,7 +321,7 @@ public final class Bidi
             // It isn't at all clear what we're supposed to do here.
             // What does a negative value really mean?
             // Should we push on the embedding stack here?
-            currentEmbedding = embeddings[embeddingOffset + i]; 
+            currentEmbedding = embeddings[embeddingOffset + i];
             if (currentEmbedding < 0)
               {
                 currentEmbedding = (byte) -currentEmbedding;
@@ -486,7 +486,7 @@ public final class Bidi
   private void resolveWeakTypes()
   {
     final int runCount = getRunCount();
-    
+
     int previousLevel = baseEmbedding;
     for (int run = 0; run < runCount; ++run)
       {
@@ -600,7 +600,7 @@ public final class Bidi
   {
     // This implements rules N1 and N2.
     final int runCount = getRunCount();
-    
+
     int previousLevel = baseEmbedding;
     for (int run = 0; run < runCount; ++run)
       {
@@ -644,7 +644,7 @@ public final class Bidi
               case Character.DIRECTIONALITY_OTHER_NEUTRALS:
               case Character.DIRECTIONALITY_SEGMENT_SEPARATOR:
               case Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR:
-	      case Character.DIRECTIONALITY_WHITESPACE:
+              case Character.DIRECTIONALITY_WHITESPACE:
                 if (neutralStart == -1)
                   neutralStart = i;
                 break;
@@ -983,17 +983,17 @@ public final class Bidi
   {
     for (int i = start; i < end; i++)
       {
-	byte dir = Character.getDirectionality(text[i]);
-	if (dir != Character.DIRECTIONALITY_LEFT_TO_RIGHT
-	    && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER
-	    && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR
-	    && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR
-	    && dir != Character.DIRECTIONALITY_ARABIC_NUMBER
-	    && dir != Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR
-	    && dir != Character.DIRECTIONALITY_SEGMENT_SEPARATOR
-	    && dir != Character.DIRECTIONALITY_WHITESPACE
+        byte dir = Character.getDirectionality(text[i]);
+        if (dir != Character.DIRECTIONALITY_LEFT_TO_RIGHT
+            && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER
+            && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR
+            && dir != Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR
+            && dir != Character.DIRECTIONALITY_ARABIC_NUMBER
+            && dir != Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR
+            && dir != Character.DIRECTIONALITY_SEGMENT_SEPARATOR
+            && dir != Character.DIRECTIONALITY_WHITESPACE
             && dir != Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR)
-	  return true;
+          return true;
       }
 
     return false;
diff --git a/libjava/classpath/java/text/BreakIterator.java b/libjava/classpath/java/text/BreakIterator.java
index 30e5f2b9491..628cb723513 100644
--- a/libjava/classpath/java/text/BreakIterator.java
+++ b/libjava/classpath/java/text/BreakIterator.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -105,7 +105,7 @@ public abstract class BreakIterator implements Cloneable
         return null;
       }
   }
-  
+
   /**
    * This method returns the index of the current text element boundary.
    *
@@ -149,31 +149,31 @@ public abstract class BreakIterator implements Cloneable
     String className;
     try
       {
-	ResourceBundle res
-	  = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-				     loc, ClassLoader.getSystemClassLoader());
-	className = res.getString(type);
+        ResourceBundle res
+          = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+                                     loc, ClassLoader.getSystemClassLoader());
+        className = res.getString(type);
       }
     catch (MissingResourceException x)
       {
-	return null;
+        return null;
       }
     try
       {
-	Class k = Class.forName(className);
-	return (BreakIterator) k.newInstance();
+        Class k = Class.forName(className);
+        return (BreakIterator) k.newInstance();
       }
     catch (ClassNotFoundException x1)
       {
-	return null;
+        return null;
       }
     catch (InstantiationException x2)
       {
-	return null;
+        return null;
       }
     catch (IllegalAccessException x3)
       {
-	return null;
+        return null;
       }
   }
 
@@ -202,18 +202,18 @@ public abstract class BreakIterator implements Cloneable
     if (r != null)
       return r;
     for (BreakIteratorProvider p :
-	   ServiceLoader.load(BreakIteratorProvider.class))
+           ServiceLoader.load(BreakIteratorProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		BreakIterator bi = p.getCharacterInstance(locale);
-		if (bi != null)
-		  return bi;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                BreakIterator bi = p.getCharacterInstance(locale);
+                if (bi != null)
+                  return bi;
+                break;
+              }
+          }
       }
     if (locale.equals(Locale.ROOT))
       return new CharacterBreakIterator();
@@ -245,18 +245,18 @@ public abstract class BreakIterator implements Cloneable
     if (r != null)
       return r;
     for (BreakIteratorProvider p :
-	   ServiceLoader.load(BreakIteratorProvider.class))
+           ServiceLoader.load(BreakIteratorProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		BreakIterator bi = p.getLineInstance(locale);
-		if (bi != null)
-		  return bi;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                BreakIterator bi = p.getLineInstance(locale);
+                if (bi != null)
+                  return bi;
+                break;
+              }
+          }
       }
     if (locale.equals(Locale.ROOT))
       return new LineBreakIterator();
@@ -288,18 +288,18 @@ public abstract class BreakIterator implements Cloneable
     if (r != null)
       return r;
     for (BreakIteratorProvider p :
-	   ServiceLoader.load(BreakIteratorProvider.class))
+           ServiceLoader.load(BreakIteratorProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		BreakIterator bi = p.getSentenceInstance(locale);
-		if (bi != null)
-		  return bi;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                BreakIterator bi = p.getSentenceInstance(locale);
+                if (bi != null)
+                  return bi;
+                break;
+              }
+          }
       }
     if (locale.equals(Locale.ROOT))
       return new SentenceBreakIterator();
@@ -327,7 +327,7 @@ public abstract class BreakIterator implements Cloneable
 
   /**
    * This method returns an instance of BreakIterator that will
-   * iterate over words as defined in the specified locale.  
+   * iterate over words as defined in the specified locale.
    *
    * @param locale The desired locale.
    *
@@ -339,18 +339,18 @@ public abstract class BreakIterator implements Cloneable
     if (r != null)
       return r;
     for (BreakIteratorProvider p :
-	   ServiceLoader.load(BreakIteratorProvider.class))
+           ServiceLoader.load(BreakIteratorProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		BreakIterator bi = p.getWordInstance(locale);
-		if (bi != null)
-		  return bi;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                BreakIterator bi = p.getWordInstance(locale);
+                if (bi != null)
+                  return bi;
+                break;
+              }
+          }
       }
     if (locale.equals(Locale.ROOT))
       return new WordBreakIterator();
@@ -364,7 +364,7 @@ public abstract class BreakIterator implements Cloneable
    * @param pos The text position to test.
    *
    * @return true if the position is a boundary,
-   * false otherwise. 
+   * false otherwise.
    */
   public boolean isBoundary (int pos)
   {
@@ -403,7 +403,7 @@ public abstract class BreakIterator implements Cloneable
    * This methdod returns the offset of the text element boundary preceding
    * the specified offset.
    *
-   * @param pos The text index from which to find the preceding text boundary. 
+   * @param pos The text index from which to find the preceding text boundary.
    *
    * @returns The next text boundary preceding the specified index.
    */
@@ -437,7 +437,7 @@ public abstract class BreakIterator implements Cloneable
   /**
    * This method sets the text to iterate over from the specified
    * CharacterIterator.
-   * 
+   *
    * @param newText The desired CharacterIterator.
    */
   public abstract void setText (CharacterIterator newText);
diff --git a/libjava/classpath/java/text/CharacterIterator.java b/libjava/classpath/java/text/CharacterIterator.java
index 42da33c432f..e202d91df05 100644
--- a/libjava/classpath/java/text/CharacterIterator.java
+++ b/libjava/classpath/java/text/CharacterIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.text;
   * characters.  For a given range of text, a beginning and ending index,
   * as well as a current index are defined.  These values can be queried
   * by the methods in this interface.  Additionally, various methods allow
-  * the index to be set. 
+  * the index to be set.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
@@ -64,7 +64,7 @@ public interface CharacterIterator extends Cloneable
 
   /**
    * This method increments the current index and then returns the character
-   * at the new index value.  If the index is already at 
+   * at the new index value.  If the index is already at
    * getEndIndex() - 1, it will not be incremented.
    *
    * @return The character at the position of the incremented index value,
@@ -87,7 +87,7 @@ public interface CharacterIterator extends Cloneable
    * This method sets the index value to the beginning of the range and returns
    * the character there.
    *
-   * @return The character at the beginning of the range, or {@link #DONE} if 
+   * @return The character at the beginning of the range, or {@link #DONE} if
    *         the range is empty.
    */
   char first();
@@ -97,10 +97,10 @@ public interface CharacterIterator extends Cloneable
    * returns the character there.  If the range is empty, then the index value
    * will be set equal to the beginning index.
    *
-   * @return The character at the end of the range, or {@link #DONE} if the 
+   * @return The character at the end of the range, or {@link #DONE} if the
    *         range is empty.
    */
-  char last();  
+  char last();
 
   /**
    * This method returns the current value of the index.
diff --git a/libjava/classpath/java/text/ChoiceFormat.java b/libjava/classpath/java/text/ChoiceFormat.java
index a552dd4a6c2..4842f491d9c 100644
--- a/libjava/classpath/java/text/ChoiceFormat.java
+++ b/libjava/classpath/java/text/ChoiceFormat.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -46,10 +46,10 @@ import java.util.Vector;
 /**
  * This class allows a format to be specified based on a range of numbers.
  * To use this class, first specify two lists of formats and range terminators.
- * These lists must be arrays of equal length.  The format of index 
- * i will be selected for value X if 
+ * These lists must be arrays of equal length.  The format of index
+ * i will be selected for value X if
  * terminator[i] <= X < limit[i + 1].  If the value X is not
- * included in any range, then either the first or last format will be 
+ * included in any range, then either the first or last format will be
  * used depending on whether the value X falls outside the range.
  * 
            
  * This sounds complicated, but that is because I did a poor job of
@@ -85,7 +85,7 @@ public class ChoiceFormat extends NumberFormat
 {
   /**
    * This method sets new range terminators and format strings for this
-   * object based on the specified pattern. This pattern is of the form 
+   * object based on the specified pattern. This pattern is of the form
    * "term#string|term#string...".  For example "1#Sunday|2#Monday|#Tuesday".
    *
    * @param newPattern The pattern of terminators and format strings.
@@ -104,53 +104,53 @@ public class ChoiceFormat extends NumberFormat
 
     while (true)
       {
-	// Find end of double.
-	int dstart = index;
-	while (index < max)
-	  {
-	    char c = newPattern.charAt(index);
-	    if (c == '#' || c == '\u2064' || c == '<')
-	      break;
-	    ++index;
-	  }
-	
-	if (index == max)
-	  throw new IllegalArgumentException ("unexpected end of text");
-	Double d = Double.valueOf (newPattern.substring(dstart, index));
+        // Find end of double.
+        int dstart = index;
+        while (index < max)
+          {
+            char c = newPattern.charAt(index);
+            if (c == '#' || c == '\u2064' || c == '<')
+              break;
+            ++index;
+          }
 
-	if (newPattern.charAt(index) == '<')
-	  d = Double.valueOf (nextDouble (d.doubleValue()));
+        if (index == max)
+          throw new IllegalArgumentException ("unexpected end of text");
+        Double d = Double.valueOf (newPattern.substring(dstart, index));
 
-	limitVec.addElement(d);
+        if (newPattern.charAt(index) == '<')
+          d = Double.valueOf (nextDouble (d.doubleValue()));
 
-	// Scan text.
-	++index;
-	buf.setLength(0);
-	while (index < max)
-	  {
-	    char c = newPattern.charAt(index);
-	    if (c == '\'' && index < max + 1
-		&& newPattern.charAt(index + 1) == '\'')
-	      {
-		buf.append(c);
-		++index;
-	      }
-	    else if (c == '\'' && index < max + 2)
-	      {
-		buf.append(newPattern.charAt(index + 1));
-		index += 2;
-	      }
-	    else if (c == '|')
-	      break;
-	    else
-	      buf.append(c);
-	    ++index;
-	  }
+        limitVec.addElement(d);
 
-	stringVec.addElement(buf.toString());
-	if (index == max)
-	  break;
-	++index;
+        // Scan text.
+        ++index;
+        buf.setLength(0);
+        while (index < max)
+          {
+            char c = newPattern.charAt(index);
+            if (c == '\'' && index < max + 1
+                && newPattern.charAt(index + 1) == '\'')
+              {
+                buf.append(c);
+                ++index;
+              }
+            else if (c == '\'' && index < max + 2)
+              {
+                buf.append(newPattern.charAt(index + 1));
+                index += 2;
+              }
+            else if (c == '|')
+              break;
+            else
+              buf.append(c);
+            ++index;
+          }
+
+        stringVec.addElement(buf.toString());
+        if (index == max)
+          break;
+        ++index;
       }
 
     choiceFormats = new String[stringVec.size()];
@@ -159,15 +159,15 @@ public class ChoiceFormat extends NumberFormat
     choiceLimits = new double[limitVec.size()];
     for (int i = 0; i < choiceLimits.length; ++i)
       {
-	Double d = (Double) limitVec.elementAt(i);
-	choiceLimits[i] = d.doubleValue();
+        Double d = (Double) limitVec.elementAt(i);
+        choiceLimits[i] = d.doubleValue();
       }
   }
 
   /**
    * This method initializes a new instance of ChoiceFormat that
    * generates its range terminator and format string arrays from the
-   * specified pattern.  This pattern is of the form 
+   * specified pattern.  This pattern is of the form
    * "term#string|term#string...".  For example "1#Sunday|2#Monday|#Tuesday".
    * This is the same pattern type used by the applyPattern
    * method.
@@ -196,7 +196,7 @@ public class ChoiceFormat extends NumberFormat
   }
 
   /**
-   * This method tests this object for equality with the specified 
+   * This method tests this object for equality with the specified
    * object.  This will be true if and only if:
    * 
              
    * 
            • The specified object is not null.
              • 
@@ -208,7 +208,7 @@ public class ChoiceFormat extends NumberFormat
    * @param obj The object to test for equality against.
    *
    * @return true if the specified object is equal to
-   * this one, false otherwise. 
+   * this one, false otherwise.
    */
   public boolean equals (Object obj)
   {
@@ -219,9 +219,9 @@ public class ChoiceFormat extends NumberFormat
       return false;
     for (int i = choiceLimits.length - 1; i >= 0; --i)
       {
-	if (choiceLimits[i] != cf.choiceLimits[i]
-	    || !choiceFormats[i].equals(cf.choiceFormats[i]))
-	  return false;
+        if (choiceLimits[i] != cf.choiceLimits[i]
+            || !choiceFormats[i].equals(cf.choiceFormats[i]))
+          return false;
       }
     return true;
   }
@@ -232,15 +232,15 @@ public class ChoiceFormat extends NumberFormat
    * argument.
    *
    * @param num The number used for determine (based on the range
-   *               terminators) which format string to append. 
-   * @param appendBuf The StringBuffer to append the format string 
+   *               terminators) which format string to append.
+   * @param appendBuf The StringBuffer to append the format string
    *                  to.
    * @param pos Unused.
    *
    * @return The StringBuffer with the format string appended.
    */
   public StringBuffer format (long num, StringBuffer appendBuf,
-			      FieldPosition pos)
+                              FieldPosition pos)
   {
     return format ((double) num, appendBuf, pos);
   }
@@ -251,14 +251,14 @@ public class ChoiceFormat extends NumberFormat
    * argument.
    *
    * @param num The number used for determine (based on the range
-   *               terminators) which format string to append. 
+   *               terminators) which format string to append.
    * @param appendBuf The StringBuffer to append the format string to.
    * @param pos Unused.
    *
    * @return The StringBuffer with the format string appended.
    */
   public StringBuffer format (double num, StringBuffer appendBuf,
-			      FieldPosition pos)
+                              FieldPosition pos)
   {
     if (choiceLimits.length == 0)
       return appendBuf;
@@ -266,11 +266,11 @@ public class ChoiceFormat extends NumberFormat
     int index = 0;
     if (! Double.isNaN(num) && num >= choiceLimits[0])
       {
-	for (; index < choiceLimits.length - 1; ++index)
-	  {
-	    if (choiceLimits[index] <= num && num < choiceLimits[index + 1])
-	      break;
-	  }
+        for (; index < choiceLimits.length - 1; ++index)
+          {
+            if (choiceLimits[index] <= num && num < choiceLimits[index + 1])
+              break;
+          }
       }
 
     return appendBuf.append(choiceFormats[index]);
@@ -298,7 +298,7 @@ public class ChoiceFormat extends NumberFormat
 
   /**
    * This method returns a hash value for this object
-   * 
+   *
    * @return A hash value for this object.
    */
   public int hashCode ()
@@ -306,15 +306,15 @@ public class ChoiceFormat extends NumberFormat
     int hash = 0;
     for (int i = 0; i < choiceLimits.length; ++i)
       {
-	long v = Double.doubleToLongBits(choiceLimits[i]);
-	hash ^= (v ^ (v >>> 32));
-	hash ^= choiceFormats[i].hashCode();
+        long v = Double.doubleToLongBits(choiceLimits[i]);
+        hash ^= (v ^ (v >>> 32));
+        hash ^= choiceFormats[i].hashCode();
       }
     return hash;
   }
 
   /**
-   * This method returns the lowest possible double greater than the 
+   * This method returns the lowest possible double greater than the
    * specified double.  If the specified double value is equal to
    * Double.NaN then that is the value returned.
    *
@@ -331,13 +331,13 @@ public class ChoiceFormat extends NumberFormat
    * This method returns a double that is either the next highest double
    * or next lowest double compared to the specified double depending on the
    * value of the passed boolean parameter.  If the boolean parameter is
-   * true, then the lowest possible double greater than the 
+   * true, then the lowest possible double greater than the
    * specified double will be returned.  Otherwise the highest possible
    * double less than the specified double will be returned.
    *
    * @param d The specified double
    * @param next true to return the next highest
-   *                 double, false otherwise. 
+   *                 double, false otherwise.
    *
    * @return The next highest or lowest double value.
    */
@@ -356,36 +356,36 @@ public class ChoiceFormat extends NumberFormat
 
     if (next ^ (bits < 0)) // Increment magnitude
       {
-	if (mantissa == (1L << mantissaBits) - 1)
-	  {
-	    mantissa = 0L;
-	    exponent++;
-	     
-	    // Check for absolute overflow.
-	    if (exponent >= (1L << mantissaBits))
-	      return (bits > 0) ? Double.POSITIVE_INFINITY 
-		: Double.NEGATIVE_INFINITY;		      
-	  }
-	else
-	  mantissa++;
+        if (mantissa == (1L << mantissaBits) - 1)
+          {
+            mantissa = 0L;
+            exponent++;
+
+            // Check for absolute overflow.
+            if (exponent >= (1L << mantissaBits))
+              return (bits > 0) ? Double.POSITIVE_INFINITY
+                : Double.NEGATIVE_INFINITY;
+          }
+        else
+          mantissa++;
       }
     else // Decrement magnitude
       {
-	if (exponent == 0L && mantissa == 0L)
-	  {
-	    // The only case where there is a change of sign
-	    return next ? Double.MIN_VALUE : -Double.MIN_VALUE;
-	  }
-	else
-	  {
-	    if (mantissa == 0L)
-	      {
-		mantissa = (1L << mantissaBits) - 1;
-		exponent--;
-	      }
-	    else
-	      mantissa--;
-	  }
+        if (exponent == 0L && mantissa == 0L)
+          {
+            // The only case where there is a change of sign
+            return next ? Double.MIN_VALUE : -Double.MIN_VALUE;
+          }
+        else
+          {
+            if (mantissa == 0L)
+              {
+                mantissa = (1L << mantissaBits) - 1;
+                exponent--;
+              }
+            else
+              mantissa--;
+          }
       }
 
     long result = bits < 0 ? 1 : 0;
@@ -403,18 +403,18 @@ public class ChoiceFormat extends NumberFormat
     int index = pos.getIndex();
     for (int i = 0; i < choiceLimits.length; ++i)
       {
-	if (sourceStr.startsWith(choiceFormats[i], index))
-	  {
-	    pos.setIndex(index + choiceFormats[i].length());
-	    return Double.valueOf (choiceLimits[i]);
-	  }
+        if (sourceStr.startsWith(choiceFormats[i], index))
+          {
+            pos.setIndex(index + choiceFormats[i].length());
+            return Double.valueOf (choiceLimits[i]);
+          }
       }
     pos.setErrorIndex(index);
     return Double.valueOf (Double.NaN);
   }
 
   /**
-   * This method returns the highest possible double less than the 
+   * This method returns the highest possible double less than the
    * specified double.  If the specified double value is equal to
    * Double.NaN then that is the value returned.
    *
@@ -449,26 +449,26 @@ public class ChoiceFormat extends NumberFormat
     int max = text.length();
     for (int i = 0; i < max; ++i)
       {
-	char c = text.charAt(i);
-	if (c == '\'')
-	  {
-	    dest.append(c);
-	    dest.append(c);
-	  }
-	else if (c == '#' || c == '|' || c == '\u2064' || c == '<')
-	  {
-	    dest.append('\'');
-	    dest.append(c);
-	    dest.append('\'');
-	  }
-	else
-	  dest.append(c);
+        char c = text.charAt(i);
+        if (c == '\'')
+          {
+            dest.append(c);
+            dest.append(c);
+          }
+        else if (c == '#' || c == '|' || c == '\u2064' || c == '<')
+          {
+            dest.append('\'');
+            dest.append(c);
+            dest.append('\'');
+          }
+        else
+          dest.append(c);
       }
   }
 
   /**
    * This method returns the range terminator list and format string list
-   * as a String suitable for using with the 
+   * as a String suitable for using with the
    * applyPattern method.
    *
    * @return A pattern string for this object
@@ -478,9 +478,9 @@ public class ChoiceFormat extends NumberFormat
     CPStringBuilder result = new CPStringBuilder ();
     for (int i = 0; i < choiceLimits.length; ++i)
       {
-	result.append(choiceLimits[i]);
-	result.append('#');
-	quoteString (result, choiceFormats[i]);
+        result.append(choiceLimits[i]);
+        result.append('#');
+        quoteString (result, choiceFormats[i]);
       }
     return result.toString();
   }
diff --git a/libjava/classpath/java/text/CollationElementIterator.java b/libjava/classpath/java/text/CollationElementIterator.java
index f6e0022aa3d..0ca23d07402 100644
--- a/libjava/classpath/java/text/CollationElementIterator.java
+++ b/libjava/classpath/java/text/CollationElementIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -48,11 +48,11 @@ import java.util.ArrayList;
  */
 
 /**
- * This class walks through the character collation elements of a 
- * String as defined by the collation rules in an instance of 
+ * This class walks through the character collation elements of a
+ * String as defined by the collation rules in an instance of
  * RuleBasedCollator.  There is no public constructor for
  * this class.  An instance is created by calling the
- * getCollationElementIterator method on 
+ * getCollationElementIterator method on
  * RuleBasedCollator.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -62,7 +62,7 @@ import java.util.ArrayList;
 public final class CollationElementIterator
 {
   /**
-   * This is a constant value that is returned to indicate that the end of 
+   * This is a constant value that is returned to indicate that the end of
    * the string was encountered.
    */
   public static final int NULLORDER = -1;
@@ -109,8 +109,8 @@ public final class CollationElementIterator
   CollationElementIterator(RuleBasedCollator collator, String text)
   {
     this.collator = collator;
-    
-    setText (text);    
+
+    setText (text);
   }
 
   /**
@@ -124,17 +124,17 @@ public final class CollationElementIterator
   CollationElementIterator(RuleBasedCollator collator, CharacterIterator text)
   {
     this.collator = collator;
-    
-    setText (text);    
+
+    setText (text);
   }
 
   RuleBasedCollator.CollationElement nextBlock()
   {
     if (index >= text_decomposition.length)
       return null;
-    
+
     RuleBasedCollator.CollationElement e = text_decomposition[index];
-    
+
     textIndex = text_indexes[index+1];
 
     index++;
@@ -146,12 +146,12 @@ public final class CollationElementIterator
   {
     if (index == 0)
       return null;
-    
+
     index--;
     RuleBasedCollator.CollationElement e = text_decomposition[index];
 
     textIndex = text_indexes[index+1];
-    
+
     return e;
   }
 
@@ -169,7 +169,7 @@ public final class CollationElementIterator
 
     if (e == null)
       return NULLORDER;
-    
+
     return e.getValue();
   }
 
@@ -186,7 +186,7 @@ public final class CollationElementIterator
 
     if (e == null)
       return NULLORDER;
-    
+
     return e.getValue();
   }
 
@@ -194,7 +194,7 @@ public final class CollationElementIterator
    * This method returns the primary order value for the given collation
    * value.
    *
-   * @param order The collation value returned from next() or 
+   * @param order The collation value returned from next() or
    *              previous().
    *
    * @return The primary order value of the specified collation value.  This is
@@ -220,10 +220,10 @@ public final class CollationElementIterator
    * This method returns the secondary order value for the given collation
    * value.
    *
-   * @param order The collation value returned from next() or 
+   * @param order The collation value returned from next() or
    *              previous().
    *
-   * @return The secondary order value of the specified collation value.  This 
+   * @return The secondary order value of the specified collation value.  This
    *         is the bits 8-15.
    */
   public static short secondaryOrder(int order)
@@ -236,10 +236,10 @@ public final class CollationElementIterator
    * This method returns the tertiary order value for the given collation
    * value.
    *
-   * @param order The collation value returned from next() or 
+   * @param order The collation value returned from next() or
    *              previous().
    *
-   * @return The tertiary order value of the specified collation value.  This 
+   * @return The tertiary order value of the specified collation value.  This
    *         is the low eight bits.
    */
   public static short tertiaryOrder(int order)
@@ -274,136 +274,136 @@ public final class CollationElementIterator
     // Build element collection ordered as they come in "text".
     while (idx < work_text.length())
       {
-	String key, key_old;
+        String key, key_old;
 
-	Object object = null;
-	int p = 1;
-	
-	// IMPROVE: use a TreeMap with a prefix-ordering rule.
-	key_old = key = null;
-	do
-	  {
-	    if (object != null)
-	      key_old = key;
-	    key = work_text.substring (idx, idx+p);
-	    object = collator.prefix_tree.get (key);
-	    if (object != null && idx < alreadyExpanded)
-	      {
-		RuleBasedCollator.CollationElement prefix = (RuleBasedCollator.CollationElement)object;
-		if (prefix.expansion != null && 
-		    prefix.expansion.startsWith(work_text.substring(0, idx)))
-		{
-		  object = null;
-		  key = key_old;
-		}
-	      }
-	    p++;
-	  }
-	while (idx+p <= work_text.length());
-	
-	if (object == null)
-	  key = key_old;
-	
-	RuleBasedCollator.CollationElement prefix =
-	  (RuleBasedCollator.CollationElement) collator.prefix_tree.get (key);
+        Object object = null;
+        int p = 1;
 
-	/*
-	 * First case: There is no such sequence in the database.
-	 * We will have to build one from the context.
-	 */
-	if (prefix == null)
-	  {
-	    /*
-	     * We are dealing with sequences in an expansion. They
-	     * are treated as accented characters (tertiary order).
-	     */
-	    if (alreadyExpanded > 0)
-	      {
-		RuleBasedCollator.CollationElement e =
-		  collator.getDefaultAccentedElement (work_text.charAt (idx));
-		
-		a_element.add (e);
-		a_idx.add (new Integer(idx_idx));
-		idx++;
-		alreadyExpanded--;
-		if (alreadyExpanded == 0)
-		  {
-		    /* There is not any characters left in the expansion set.
-		     * We can increase the pointer in the source string.
-		     */
-		    idx_idx += idxToMove;
-		    idxToMove = 0; 
-		  }
-		else
-		  idx_idx++;
-	      }
-	    else
-	      {
-		/* This is a normal character. */
-		RuleBasedCollator.CollationElement e =
-		  collator.getDefaultElement (work_text.charAt (idx));
-		Integer i_ref = new Integer(idx_idx);
+        // IMPROVE: use a TreeMap with a prefix-ordering rule.
+        key_old = key = null;
+        do
+          {
+            if (object != null)
+              key_old = key;
+            key = work_text.substring (idx, idx+p);
+            object = collator.prefix_tree.get (key);
+            if (object != null && idx < alreadyExpanded)
+              {
+                RuleBasedCollator.CollationElement prefix = (RuleBasedCollator.CollationElement)object;
+                if (prefix.expansion != null &&
+                    prefix.expansion.startsWith(work_text.substring(0, idx)))
+                {
+                  object = null;
+                  key = key_old;
+                }
+              }
+            p++;
+          }
+        while (idx+p <= work_text.length());
 
-		/* Don't forget to mark it as a special sequence so the
-		 * string can be ordered.
-		 */
-		a_element.add (RuleBasedCollator.SPECIAL_UNKNOWN_SEQ);
-		a_idx.add (i_ref);
-		a_element.add (e);
-		a_idx.add (i_ref);
-		idx_idx++;
-		idx++;
-	      }
-	    continue;
-	  }
- 
-	/*
-	 * Second case: Here we have found a matching sequence.
-	 * Here we have an expansion string prepend it to the "work text" and
-	 * add the corresponding sorting element. We must also mark 
-	 */
-	if (prefix.expansion != null)
-	  {
-	    work_text = prefix.expansion
-	      + work_text.substring (idx+prefix.key.length());
-	    idx = 0;
-	    a_element.add (prefix);
-	    a_idx.add (new Integer(idx_idx));
-	    if (alreadyExpanded == 0)
-	      idxToMove = prefix.key.length();
-	    alreadyExpanded += prefix.expansion.length()-prefix.key.length();
-	  }
-	else
-	  {
-	    /* Third case: the simplest. We have got the prefix and it
-	     * has not to be expanded.
-	     */
-	    a_element.add (prefix);
-	    a_idx.add (new Integer(idx_idx));
-	    idx += prefix.key.length();
-	    /* If the sequence is in an expansion, we must decrease the
-	     * counter.
-	     */
-	    if (alreadyExpanded > 0)
-	      {
-		alreadyExpanded -= prefix.key.length();
-		if (alreadyExpanded == 0)
-		  {
-		    idx_idx += idxToMove;
-		    idxToMove = 0;
-		  }
-	      }
-	    else
-	      idx_idx += prefix.key.length();
-	  }
+        if (object == null)
+          key = key_old;
+
+        RuleBasedCollator.CollationElement prefix =
+          (RuleBasedCollator.CollationElement) collator.prefix_tree.get (key);
+
+        /*
+         * First case: There is no such sequence in the database.
+         * We will have to build one from the context.
+         */
+        if (prefix == null)
+          {
+            /*
+             * We are dealing with sequences in an expansion. They
+             * are treated as accented characters (tertiary order).
+             */
+            if (alreadyExpanded > 0)
+              {
+                RuleBasedCollator.CollationElement e =
+                  collator.getDefaultAccentedElement (work_text.charAt (idx));
+
+                a_element.add (e);
+                a_idx.add (new Integer(idx_idx));
+                idx++;
+                alreadyExpanded--;
+                if (alreadyExpanded == 0)
+                  {
+                    /* There is not any characters left in the expansion set.
+                     * We can increase the pointer in the source string.
+                     */
+                    idx_idx += idxToMove;
+                    idxToMove = 0;
+                  }
+                else
+                  idx_idx++;
+              }
+            else
+              {
+                /* This is a normal character. */
+                RuleBasedCollator.CollationElement e =
+                  collator.getDefaultElement (work_text.charAt (idx));
+                Integer i_ref = new Integer(idx_idx);
+
+                /* Don't forget to mark it as a special sequence so the
+                 * string can be ordered.
+                 */
+                a_element.add (RuleBasedCollator.SPECIAL_UNKNOWN_SEQ);
+                a_idx.add (i_ref);
+                a_element.add (e);
+                a_idx.add (i_ref);
+                idx_idx++;
+                idx++;
+              }
+            continue;
+          }
+
+        /*
+         * Second case: Here we have found a matching sequence.
+         * Here we have an expansion string prepend it to the "work text" and
+         * add the corresponding sorting element. We must also mark
+         */
+        if (prefix.expansion != null)
+          {
+            work_text = prefix.expansion
+              + work_text.substring (idx+prefix.key.length());
+            idx = 0;
+            a_element.add (prefix);
+            a_idx.add (new Integer(idx_idx));
+            if (alreadyExpanded == 0)
+              idxToMove = prefix.key.length();
+            alreadyExpanded += prefix.expansion.length()-prefix.key.length();
+          }
+        else
+          {
+            /* Third case: the simplest. We have got the prefix and it
+             * has not to be expanded.
+             */
+            a_element.add (prefix);
+            a_idx.add (new Integer(idx_idx));
+            idx += prefix.key.length();
+            /* If the sequence is in an expansion, we must decrease the
+             * counter.
+             */
+            if (alreadyExpanded > 0)
+              {
+                alreadyExpanded -= prefix.key.length();
+                if (alreadyExpanded == 0)
+                  {
+                    idx_idx += idxToMove;
+                    idxToMove = 0;
+                  }
+              }
+            else
+              idx_idx += prefix.key.length();
+          }
       }
-    
+
     text_decomposition = (RuleBasedCollator.CollationElement[])
-	   a_element.toArray(new RuleBasedCollator.CollationElement[a_element.size()]);
+           a_element.toArray(new RuleBasedCollator.CollationElement[a_element.size()]);
     text_indexes = new int[a_idx.size()+1];
-    for (int i = 0; i < a_idx.size(); i++) 
+    for (int i = 0; i < a_idx.size(); i++)
       {
-	text_indexes[i] = ((Integer)a_idx.get(i)).intValue();
+        text_indexes[i] = ((Integer)a_idx.get(i)).intValue();
       }
     text_indexes[a_idx.size()] = text.length();
   }
@@ -422,8 +422,8 @@ public final class CollationElementIterator
 
     // For now assume we read from the beginning of the string.
     for (char c = source.first();
-	 c != CharacterIterator.DONE;
-	 c = source.next())
+         c != CharacterIterator.DONE;
+         c = source.next())
       expand.append(c);
 
     setText(expand.toString());
@@ -459,11 +459,11 @@ public final class CollationElementIterator
 
     if (offset > (text.getEndIndex() - 1))
       throw new IllegalArgumentException("Offset too large: " + offset);
-    
+
     for (index = 0; index < text_decomposition.length; index++)
-      {	
-	if (offset <= text_indexes[index])
-	  break;
+      {
+        if (offset <= text_indexes[index])
+          break;
       }
     /*
      * As text_indexes[0] == 0, we should not have to take care whether index is
diff --git a/libjava/classpath/java/text/CollationKey.java b/libjava/classpath/java/text/CollationKey.java
index 1ae8abc556c..ce9db5f0d1c 100644
--- a/libjava/classpath/java/text/CollationKey.java
+++ b/libjava/classpath/java/text/CollationKey.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -53,11 +53,11 @@ import java.util.Arrays;
  * Collator in a manner than is usually more efficient than
  * using the raw Collator compare methods.  There is overhead
  * associated with calculating this value, so it is generally not
- * advisable to compute CollationKey's unless multiple 
+ * advisable to compute CollationKey's unless multiple
  * comparisons against a String will be done.  (For example,
  * in a sort routine).
  * 
              
- * This class cannot be instantiated directly.  Instead, a 
+ * This class cannot be instantiated directly.  Instead, a
  * CollationKey is created by calling the
  * getCollationKey method on an instance of Collator.
  *
@@ -90,8 +90,8 @@ public class CollationKey implements Comparable
   }
 
   /**
-   * This method compares the specified object to this one.  An integer is 
-   * returned which indicates whether the specified object is less than, 
+   * This method compares the specified object to this one.  An integer is
+   * returned which indicates whether the specified object is less than,
    * greater than, or equal to this object.
    *
    * @param ck The CollationKey to compare against this one.
@@ -104,8 +104,8 @@ public class CollationKey implements Comparable
 
     for (int i = 0; i < max; ++i)
       {
-	if (key[i] != ck.key[i])
-	  return key[i] - ck.key[i];
+        if (key[i] != ck.key[i])
+          return key[i] - ck.key[i];
       }
 
     return key.length - ck.key.length;
@@ -173,7 +173,7 @@ public class CollationKey implements Comparable
       h ^= key[i] * (i + 1);
     return (int) ((h >> 32) ^ h);
   }
-  
+
   /**
    * This method returns the collation bit sequence as a byte array.
    *
diff --git a/libjava/classpath/java/text/Collator.java b/libjava/classpath/java/text/Collator.java
index d6cb5ac0eb9..a9fc55ccfdc 100644
--- a/libjava/classpath/java/text/Collator.java
+++ b/libjava/classpath/java/text/Collator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -49,14 +49,14 @@ import java.util.ResourceBundle;
 import java.util.ServiceLoader;
 
 /**
- * This class is the abstract superclass of classes which perform 
+ * This class is the abstract superclass of classes which perform
  * locale dependent String comparisons.  A caller requests
  * an instance of Collator for a particular locale using
  * the getInstance() static method in this class.  That method
  * will return a locale specific subclass of Collator which
  * can be used to perform String comparisons for that locale.
  * If a subclass of Collator cannot be located for a particular
- * locale, a default instance for the current locale will be returned.  
+ * locale, a default instance for the current locale will be returned.
  *
  * In addition to setting the correct locale, there are two additional
  * settings that can be adjusted to affect String comparisons:
@@ -82,7 +82,7 @@ public abstract class Collator implements Comparator, Cloneable
    * are considered to have a primary difference.
    */
   public static final int PRIMARY = 0;
-  
+
   /**
    * This constant is a strength value which indicates that only secondary
    * or primary differences between characters will be considered
@@ -90,7 +90,7 @@ public abstract class Collator implements Comparator, Cloneable
    * are instances of the same letter with different accented forms.
    */
   public static final int SECONDARY = 1;
-  
+
   /**
    * This constant is a strength value which indicates that tertiary,
    * secondary, and primary differences will be considered during sorting.
@@ -98,13 +98,13 @@ public abstract class Collator implements Comparator, Cloneable
    * This is the default value for the strength setting.
    */
   public static final int TERTIARY = 2;
-  
+
   /**
    * This constant is a strength value which indicates that any difference
    * at all between character values are considered significant.
    */
   public static final int IDENTICAL = 3;
-  
+
   /**
    * This constant indicates that accented characters won't be decomposed
    * when performing comparisons.  This will yield the fastest results, but
@@ -112,7 +112,7 @@ public abstract class Collator implements Comparator, Cloneable
    * use accents such as English.
    */
   public static final int NO_DECOMPOSITION = 0;
-  
+
   /**
    * This constant indicates that only characters which are canonical variants
    * in Unicode 2.0 will be decomposed prior to performing comparisons.  This
@@ -120,7 +120,7 @@ public abstract class Collator implements Comparator, Cloneable
    * default decomposition value.
    */
   public static final int CANONICAL_DECOMPOSITION = 1;
-  
+
   /**
    * This constant indicates that both canonical variants and compatibility
    * variants in Unicode 2.0 will be decomposed prior to performing
@@ -131,7 +131,7 @@ public abstract class Collator implements Comparator, Cloneable
 
   /**
    * This method initializes a new instance of Collator to have
-   * the default strength (TERTIARY) and decomposition 
+   * the default strength (TERTIARY) and decomposition
    * (CANONICAL_DECOMPOSITION) settings.  This constructor is protected and
    * is for use by subclasses only.  Non-subclass callers should use the
    * static getInstance() methods of this class to instantiate
@@ -147,7 +147,7 @@ public abstract class Collator implements Comparator, Cloneable
    * This method compares the two String's and returns an
    * integer indicating whether or not the first argument is less than,
    * equal to, or greater than the second argument.  The comparison is
-   * performed according to the rules of the locale for this 
+   * performed according to the rules of the locale for this
    * Collator and the strength and decomposition rules in
    * effect.
    *
@@ -155,7 +155,7 @@ public abstract class Collator implements Comparator, Cloneable
    * @param target The second object to compare
    *
    * @return A negative integer if str1 < str2, 0 if str1 == str2, or
-   * a positive integer if str1 > str2. 
+   * a positive integer if str1 > str2.
    */
   public abstract int compare (String source, String target);
 
@@ -169,10 +169,10 @@ public abstract class Collator implements Comparator, Cloneable
    * @param o2 The second object to compare
    *
    * @return A negative integer if obj1 < obj2, 0 if obj1 == obj2, or
-   * a positive integer if obj1 > obj2. 
+   * a positive integer if obj1 > obj2.
    *
    * @exception ClassCastException If the arguments are not instances
-   * of String. 
+   * of String.
    */
   public int compare (Object o1, Object o2)
   {
@@ -191,7 +191,7 @@ public abstract class Collator implements Comparator, Cloneable
    * 
    *
    * @param obj The Object to test for equality against
-   *            this object. 
+   *            this object.
    *
    * @return true if the specified object is equal to
    * this one, false otherwise.
@@ -213,7 +213,7 @@ public abstract class Collator implements Comparator, Cloneable
    * @param target The second String to compare
    *
    * @return true if the two strings are equal,
-   * false otherwise. 
+   * false otherwise.
    */
   public boolean equals (String source, String target)
   {
@@ -229,11 +229,11 @@ public abstract class Collator implements Comparator, Cloneable
   {
     try
       {
-	return super.clone ();
+        return super.clone ();
       }
     catch (CloneNotSupportedException _)
       {
-	return null;
+        return null;
       }
   }
 
@@ -300,46 +300,46 @@ public abstract class Collator implements Comparator, Cloneable
     String pattern;
     try
       {
-	ResourceBundle res =
-	  ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-				   loc, ClassLoader.getSystemClassLoader());
-	return new RuleBasedCollator(res.getString("collation_rules"));
+        ResourceBundle res =
+          ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+                                   loc, ClassLoader.getSystemClassLoader());
+        return new RuleBasedCollator(res.getString("collation_rules"));
       }
     catch (MissingResourceException x)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     catch (ParseException x)
       {
-	throw (InternalError)new InternalError().initCause(x);
+        throw (InternalError)new InternalError().initCause(x);
       }
     for (CollatorProvider p : ServiceLoader.load(CollatorProvider.class))
       {
-	for (Locale l : p.getAvailableLocales())
-	  {
-	    if (l.equals(loc))
-	      {
-		Collator c = p.getInstance(loc);
-		if (c != null)
-		  return c;
-		break;
-	      }
-	  }
+        for (Locale l : p.getAvailableLocales())
+          {
+            if (l.equals(loc))
+              {
+                Collator c = p.getInstance(loc);
+                if (c != null)
+                  return c;
+                break;
+              }
+          }
       }
     if (loc.equals(Locale.ROOT))
       {
-	try
-	  {
-	    return new RuleBasedCollator("<0<1<2<3<4<5<6<7<8<9, Cloneable
   public synchronized void setDecomposition (int mode)
   {
     if (mode != NO_DECOMPOSITION
-	&& mode != CANONICAL_DECOMPOSITION
-	&& mode != FULL_DECOMPOSITION)
+        && mode != CANONICAL_DECOMPOSITION
+        && mode != FULL_DECOMPOSITION)
       throw new IllegalArgumentException ();
     decmp = mode;
   }
@@ -389,7 +389,7 @@ public abstract class Collator implements Comparator, Cloneable
    * value.  This must be one of PRIMARY, SECONDARY, TERTIARY, or IDENTICAL.
    * Otherwise an exception is thrown. See the documentation for these
    * constants for an explanation of this setting.
-   * 
+   *
    * @param strength The new strength setting.
    *
    * @exception IllegalArgumentException If the requested strength
@@ -398,7 +398,7 @@ public abstract class Collator implements Comparator, Cloneable
   public synchronized void setStrength (int strength)
   {
     if (strength != PRIMARY && strength != SECONDARY
-	&& strength != TERTIARY && strength != IDENTICAL)
+        && strength != TERTIARY && strength != IDENTICAL)
       throw new IllegalArgumentException ();
     this.strength = strength;
   }
diff --git a/libjava/classpath/java/text/DateFormat.java b/libjava/classpath/java/text/DateFormat.java
index dabcb867079..1757a0cb91e 100644
--- a/libjava/classpath/java/text/DateFormat.java
+++ b/libjava/classpath/java/text/DateFormat.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -89,11 +89,11 @@ public abstract class DateFormat extends Format implements Cloneable
   /**
    * Represents the position of the era
    * pattern character in the array of
-   * localized pattern characters. 
+   * localized pattern characters.
    * For example, 'AD' is an era used
    * in the Gregorian calendar system.
    * In the U.S. locale, this is 'G'.
-   */  
+   */
   public static final int ERA_FIELD = 0;
   /**
    * Represents the position of the year
@@ -197,7 +197,7 @@ public abstract class DateFormat extends Format implements Cloneable
    */
   public static final int AM_PM_FIELD = 14;
   /**
-   * Represents the position of the 12 
+   * Represents the position of the 12
    * hour pattern character in the array of
    * localized pattern characters.
    * In the U.S. locale, this is 'h'.
@@ -205,7 +205,7 @@ public abstract class DateFormat extends Format implements Cloneable
    */
   public static final int HOUR1_FIELD = 15;
   /**
-   * Represents the position of the 12 
+   * Represents the position of the 12
    * hour pattern character in the array of
    * localized pattern characters.
    * In the U.S. locale, this is 'K'.
@@ -223,45 +223,45 @@ public abstract class DateFormat extends Format implements Cloneable
   public static class Field extends Format.Field
   {
     static final long serialVersionUID = 7441350119349544720L;
-    
+
     private int calendarField;
 
     public static final DateFormat.Field ERA
-	= new Field("era", Calendar.ERA);
+        = new Field("era", Calendar.ERA);
     public static final DateFormat.Field YEAR
-	= new Field("year", Calendar.YEAR);
+        = new Field("year", Calendar.YEAR);
     public static final DateFormat.Field MONTH
-	= new Field("month", Calendar.MONTH);
+        = new Field("month", Calendar.MONTH);
     public static final DateFormat.Field DAY_OF_MONTH
-	= new Field("day of month", Calendar.DAY_OF_MONTH);
+        = new Field("day of month", Calendar.DAY_OF_MONTH);
     public static final DateFormat.Field HOUR_OF_DAY1
-	= new Field("hour of day 1", Calendar.HOUR_OF_DAY);
+        = new Field("hour of day 1", Calendar.HOUR_OF_DAY);
     public static final DateFormat.Field HOUR_OF_DAY0
-	= new Field("hour of day 0", Calendar.HOUR_OF_DAY);
+        = new Field("hour of day 0", Calendar.HOUR_OF_DAY);
     public static final DateFormat.Field MINUTE
-	= new Field("minute", Calendar.MINUTE);
+        = new Field("minute", Calendar.MINUTE);
     public static final DateFormat.Field SECOND
-	= new Field("second", Calendar.SECOND);
+        = new Field("second", Calendar.SECOND);
     public static final DateFormat.Field MILLISECOND
-	= new Field("millisecond", Calendar.MILLISECOND);
+        = new Field("millisecond", Calendar.MILLISECOND);
     public static final DateFormat.Field DAY_OF_WEEK
-	= new Field("day of week", Calendar.DAY_OF_WEEK);
+        = new Field("day of week", Calendar.DAY_OF_WEEK);
     public static final DateFormat.Field DAY_OF_YEAR
-	= new Field("day of year", Calendar.DAY_OF_YEAR);
+        = new Field("day of year", Calendar.DAY_OF_YEAR);
     public static final DateFormat.Field DAY_OF_WEEK_IN_MONTH
-	= new Field("day of week in month", Calendar.DAY_OF_WEEK_IN_MONTH);
+        = new Field("day of week in month", Calendar.DAY_OF_WEEK_IN_MONTH);
     public static final DateFormat.Field WEEK_OF_YEAR
-	= new Field("week of year", Calendar.WEEK_OF_YEAR);
+        = new Field("week of year", Calendar.WEEK_OF_YEAR);
     public static final DateFormat.Field WEEK_OF_MONTH
-	= new Field("week of month", Calendar.WEEK_OF_MONTH);
+        = new Field("week of month", Calendar.WEEK_OF_MONTH);
     public static final DateFormat.Field AM_PM
-	= new Field("am/pm", Calendar.AM_PM);
+        = new Field("am/pm", Calendar.AM_PM);
     public static final DateFormat.Field HOUR1
-	= new Field("hour1", Calendar.HOUR);
+        = new Field("hour1", Calendar.HOUR);
     public static final DateFormat.Field HOUR0
-	= new Field("hour0", Calendar.HOUR);
+        = new Field("hour0", Calendar.HOUR);
     public static final DateFormat.Field TIME_ZONE
-	= new Field("timezone", Calendar.ZONE_OFFSET);
+        = new Field("timezone", Calendar.ZONE_OFFSET);
 
     static final DateFormat.Field[] allFields =
     {
@@ -283,7 +283,7 @@ public abstract class DateFormat extends Format implements Cloneable
       super(name);
       this.calendarField = calendarField;
     }
-    
+
     public int getCalendarField()
     {
       return calendarField;
@@ -292,20 +292,20 @@ public abstract class DateFormat extends Format implements Cloneable
     public static Field ofCalendarField(int calendarField)
     {
       if (calendarField >= allFields.length || calendarField < 0)
-	throw new IllegalArgumentException("no such calendar field ("
-					   + calendarField + ")");
-      
+        throw new IllegalArgumentException("no such calendar field ("
+                                           + calendarField + ")");
+
       return allFields[calendarField];
     }
-    
+
     protected Object readResolve() throws InvalidObjectException
     {
       String s = getName();
 
       for (int i=0;iIs an instance of DateFormat.
    * 
            • Has equal numberFormat field as this object.
              • 
    * 
            • Has equal (Calendar) TimeZone rules as this object.
              • 
-   * 
            • Has equal (Calendar) isLenient results.
              •  
+   * 
            • Has equal (Calendar) isLenient results.
              • 
    * 
            • Has equal Calendar first day of week and minimal days in week
    * values.
              • 
    * 
@@ -339,7 +339,7 @@ public abstract class DateFormat extends Format implements Cloneable
    * are not taken into account.
    *
    * @param obj The object to test for equality against.
-   * 
+   *
    * @return true if the specified object is equal to this object,
    * false otherwise.
    */
@@ -353,18 +353,18 @@ public abstract class DateFormat extends Format implements Cloneable
     TimeZone tzd = d.getTimeZone();
     if (tz.hasSameRules(tzd))
       if (isLenient() == d.isLenient())
-	{
-	  Calendar c = getCalendar();
-	  Calendar cd = d.getCalendar();
-	  if ((c == null && cd == null)
-	      ||
-	      (c.getFirstDayOfWeek() == cd.getFirstDayOfWeek()
-	       &&
-	       c.getMinimalDaysInFirstWeek()
-	       == cd.getMinimalDaysInFirstWeek()))
-	    return ((numberFormat == null && d.numberFormat == null)
-		    || numberFormat.equals(d.numberFormat));
-	}
+        {
+          Calendar c = getCalendar();
+          Calendar cd = d.getCalendar();
+          if ((c == null && cd == null)
+              ||
+              (c.getFirstDayOfWeek() == cd.getFirstDayOfWeek()
+               &&
+               c.getMinimalDaysInFirstWeek()
+               == cd.getMinimalDaysInFirstWeek()))
+            return ((numberFormat == null && d.numberFormat == null)
+                    || numberFormat.equals(d.numberFormat));
+        }
 
     return false;
   }
@@ -397,19 +397,19 @@ public abstract class DateFormat extends Format implements Cloneable
    * formatted date/time appended.
    */
   public final StringBuffer format (Object obj,
-				    StringBuffer buf, FieldPosition pos)
+                                    StringBuffer buf, FieldPosition pos)
   {
     if (obj instanceof Number)
       obj = new Date(((Number) obj).longValue());
     else if (! (obj instanceof Date))
       throw new IllegalArgumentException
-	("Cannot format given Object as a Date");
+        ("Cannot format given Object as a Date");
 
     return format ((Date) obj, buf, pos);
   }
 
-  /**  
-    * Formats the date argument according to the pattern specified. 
+  /**
+    * Formats the date argument according to the pattern specified.
     *
     * @param date The formatted date.
     */
@@ -434,7 +434,7 @@ public abstract class DateFormat extends Format implements Cloneable
    * formatted date/time appended.
    */
   public abstract StringBuffer format (Date date,
-				       StringBuffer buf, FieldPosition pos);
+                                       StringBuffer buf, FieldPosition pos);
 
   /**
    * This method returns a list of available locales supported by this
@@ -474,136 +474,136 @@ public abstract class DateFormat extends Format implements Cloneable
 
     ResourceBundle res =
       ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-			       loc, ClassLoader.getSystemClassLoader());
+                               loc, ClassLoader.getSystemClassLoader());
 
     String pattern = null;
     if (use_date)
       {
-	String name, def;
-	switch (dateStyle)
-	  {
-	  case FULL:
-	    name = "fullDateFormat";
-	    def = "EEEE MMMM d, yyyy G";
-	    break;
-	  case LONG:
-	    name = "longDateFormat";
-	    def = "MMMM d, yyyy";
-	    break;
-	  case MEDIUM:
-	    name = "mediumDateFormat";
-	    def = "d-MMM-yy";
-	    break;
-	  case SHORT:
-	    name = "shortDateFormat";
-	    def = "M/d/yy";
-	    break;
-	  default:
-	    throw new IllegalArgumentException ();
-	  }
-	try
-	  {
-	    pattern = res == null ? def : res.getString(name);
-	  }
-	catch (MissingResourceException x)
-	  {
-	    pattern = def;
-	  }
+        String name, def;
+        switch (dateStyle)
+          {
+          case FULL:
+            name = "fullDateFormat";
+            def = "EEEE MMMM d, yyyy G";
+            break;
+          case LONG:
+            name = "longDateFormat";
+            def = "MMMM d, yyyy";
+            break;
+          case MEDIUM:
+            name = "mediumDateFormat";
+            def = "d-MMM-yy";
+            break;
+          case SHORT:
+            name = "shortDateFormat";
+            def = "M/d/yy";
+            break;
+          default:
+            throw new IllegalArgumentException ();
+          }
+        try
+          {
+            pattern = res == null ? def : res.getString(name);
+          }
+        catch (MissingResourceException x)
+          {
+            pattern = def;
+          }
       }
 
     if (use_time)
       {
-	if (pattern == null)
-	  pattern = "";
-	else
-	  pattern += " ";
+        if (pattern == null)
+          pattern = "";
+        else
+          pattern += " ";
 
-	String name, def;
-	switch (timeStyle)
-	  {
-	  case FULL:
-	    name = "fullTimeFormat";
-	    def = "h:mm:ss;S 'o''clock' a z";
-	    break;
-	  case LONG:
-	    name = "longTimeFormat";
-	    def = "h:mm:ss a z";
-	    break;
-	  case MEDIUM:
-	    name = "mediumTimeFormat";
-	    def = "h:mm:ss a";
-	    break;
-	  case SHORT:
-	    name = "shortTimeFormat";
-	    def = "h:mm a";
-	    break;
-	  default:
-	    throw new IllegalArgumentException ();
-	  }
+        String name, def;
+        switch (timeStyle)
+          {
+          case FULL:
+            name = "fullTimeFormat";
+            def = "h:mm:ss;S 'o''clock' a z";
+            break;
+          case LONG:
+            name = "longTimeFormat";
+            def = "h:mm:ss a z";
+            break;
+          case MEDIUM:
+            name = "mediumTimeFormat";
+            def = "h:mm:ss a";
+            break;
+          case SHORT:
+            name = "shortTimeFormat";
+            def = "h:mm a";
+            break;
+          default:
+            throw new IllegalArgumentException ();
+          }
 
-	String s;
-	try
-	  {
-	    s = res == null ? def : res.getString(name);
-	  }
-	catch (MissingResourceException x)
-	  {
-	    s = def;
-	  }
-	pattern += s;
+        String s;
+        try
+          {
+            s = res == null ? def : res.getString(name);
+          }
+        catch (MissingResourceException x)
+          {
+            s = def;
+          }
+        pattern += s;
       }
 
     return new SimpleDateFormat (pattern, loc);
   }
 
   private static DateFormat computeDefault (int dateStyle, int timeStyle,
-					    boolean use_date, boolean use_time)
+                                            boolean use_date, boolean use_time)
   {
     String pattern = null;
     if (use_date)
       {
-	switch (dateStyle)
-	  {
-	  case FULL:
-	    pattern = "EEEE MMMM d, yyyy G";
-	    break;
-	  case LONG:
-	    pattern = "MMMM d, yyyy";
-	    break;
-	  case MEDIUM:
-	    pattern = "d-MMM-yy";
-	    break;
-	  case SHORT:
-	    pattern = "M/d/yy";
-	  default:
-	    throw new IllegalArgumentException ();
-	  }
+        switch (dateStyle)
+          {
+          case FULL:
+            pattern = "EEEE MMMM d, yyyy G";
+            break;
+          case LONG:
+            pattern = "MMMM d, yyyy";
+            break;
+          case MEDIUM:
+            pattern = "d-MMM-yy";
+            break;
+          case SHORT:
+            pattern = "M/d/yy";
+          default:
+            throw new IllegalArgumentException ();
+          }
       }
-    
+
     if (use_time)
       {
-	if (pattern == null)
-	  pattern = "";
-	else
-	  pattern += " ";
+        if (pattern == null)
+          pattern = "";
+        else
+          pattern += " ";
 
-	switch (timeStyle)
-	  {
-	  case FULL:
-	    pattern += "h:mm:ss;S 'o''clock' a z";
-	    break;
-	  case LONG:
-	    pattern += "h:mm:ss a z";
-	    break;
-	  case MEDIUM:
-	    pattern += "h:mm:ss a";
-	    break;
-	  case SHORT:
-	    pattern += "h:mm a";
-	    break;
-	  default:
-	    throw new IllegalArgumentException ();
-	  }
+        switch (timeStyle)
+          {
+          case FULL:
+            pattern += "h:mm:ss;S 'o''clock' a z";
+            break;
+          case LONG:
+            pattern += "h:mm:ss a z";
+            break;
+          case MEDIUM:
+            pattern += "h:mm:ss a";
+            break;
+          case SHORT:
+            pattern += "h:mm a";
+            break;
+          default:
+            throw new IllegalArgumentException ();
+          }
       }
 
     return new SimpleDateFormat (pattern, Locale.ROOT);
@@ -624,8 +624,8 @@ public abstract class DateFormat extends Format implements Cloneable
    * This method returns an instance of DateFormat that will
    * format using the specified formatting style for dates.
    *
-   * @param style The type of formatting to perform. 
-   * 
+   * @param style The type of formatting to perform.
+   *
    * @return A new DateFormat instance.
    */
   public static final DateFormat getDateInstance (int style)
@@ -638,35 +638,35 @@ public abstract class DateFormat extends Format implements Cloneable
    * format using the specified formatting style for dates.  The specified
    * localed will be used in place of the default.
    *
-   * @param style The type of formatting to perform. 
+   * @param style The type of formatting to perform.
    * @param loc The desired locale.
-   * 
+   *
    * @return A new DateFormat instance.
    */
   public static final DateFormat getDateInstance (int style, Locale loc)
   {
     try
       {
-	return computeInstance (style, loc, true, false);
+        return computeInstance (style, loc, true, false);
       }
     catch (MissingResourceException e)
       {
-	for (DateFormatProvider p :
-	       ServiceLoader.load(DateFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    DateFormat df = p.getDateInstance(style, loc);
-		    if (df != null)
-		      return df;
-		    break;
-		  }
-	      }
-	  }
-	return getDateInstance(style,
-			       LocaleHelper.getFallbackLocale(loc));
+        for (DateFormatProvider p :
+               ServiceLoader.load(DateFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    DateFormat df = p.getDateInstance(style, loc);
+                    if (df != null)
+                      return df;
+                    break;
+                  }
+              }
+          }
+        return getDateInstance(style,
+                               LocaleHelper.getFallbackLocale(loc));
       }
   }
 
@@ -687,8 +687,8 @@ public abstract class DateFormat extends Format implements Cloneable
    *
    * @return A new DateFormatinstance.
    */
-  public static final DateFormat getDateTimeInstance (int dateStyle, 
-						      int timeStyle)
+  public static final DateFormat getDateTimeInstance (int dateStyle,
+                                                      int timeStyle)
   {
     return getDateTimeInstance (dateStyle, timeStyle, Locale.getDefault());
   }
@@ -696,39 +696,39 @@ public abstract class DateFormat extends Format implements Cloneable
   /**
    * This method returns a new instance of DateFormat that
    * formats both dates and times using the specified styles.
-   * 
+   *
    * @param dateStyle The desired style for date formatting.
    * @param timeStyle The desired style for time formatting
    *
    * @return A new DateFormatinstance.
    */
-  public static final DateFormat getDateTimeInstance (int dateStyle, 
-						      int timeStyle, 
-						      Locale loc)
+  public static final DateFormat getDateTimeInstance (int dateStyle,
+                                                      int timeStyle,
+                                                      Locale loc)
   {
     try
       {
-	return computeInstance (dateStyle, timeStyle, loc, true, true);
+        return computeInstance (dateStyle, timeStyle, loc, true, true);
       }
     catch (MissingResourceException e)
       {
-	for (DateFormatProvider p :
-	       ServiceLoader.load(DateFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    DateFormat df = p.getDateTimeInstance(dateStyle,
-							  timeStyle, loc);
-		    if (df != null)
-		      return df;
-		    break;
-		  }
-	      }
-	  }
-	return getDateTimeInstance(dateStyle, timeStyle,
-				   LocaleHelper.getFallbackLocale(loc));
+        for (DateFormatProvider p :
+               ServiceLoader.load(DateFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    DateFormat df = p.getDateTimeInstance(dateStyle,
+                                                          timeStyle, loc);
+                    if (df != null)
+                      return df;
+                    break;
+                  }
+              }
+          }
+        return getDateTimeInstance(dateStyle, timeStyle,
+                                   LocaleHelper.getFallbackLocale(loc));
       }
   }
 
@@ -770,8 +770,8 @@ public abstract class DateFormat extends Format implements Cloneable
    * This method returns an instance of DateFormat that will
    * format using the specified formatting style for times.
    *
-   * @param style The type of formatting to perform. 
-   * 
+   * @param style The type of formatting to perform.
+   *
    * @return A new DateFormat instance.
    */
   public static final DateFormat getTimeInstance (int style)
@@ -784,35 +784,35 @@ public abstract class DateFormat extends Format implements Cloneable
    * format using the specified formatting style for times.  The specified
    * localed will be used in place of the default.
    *
-   * @param style The type of formatting to perform. 
+   * @param style The type of formatting to perform.
    * @param loc The desired locale.
-   * 
+   *
    * @return A new DateFormat instance.
    */
   public static final DateFormat getTimeInstance (int style, Locale loc)
   {
     try
       {
-	return computeInstance (style, loc, false, true);
+        return computeInstance (style, loc, false, true);
       }
     catch (MissingResourceException e)
       {
-	for (DateFormatProvider p :
-	       ServiceLoader.load(DateFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    DateFormat df = p.getTimeInstance(style, loc);
-		    if (df != null)
-		      return df;
-		    break;
-		  }
-	      }
-	  }
-	return getTimeInstance(style,
-			       LocaleHelper.getFallbackLocale(loc));
+        for (DateFormatProvider p :
+               ServiceLoader.load(DateFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    DateFormat df = p.getTimeInstance(style, loc);
+                    if (df != null)
+                      return df;
+                    break;
+                  }
+              }
+          }
+        return getTimeInstance(style,
+                               LocaleHelper.getFallbackLocale(loc));
       }
   }
 
@@ -829,7 +829,7 @@ public abstract class DateFormat extends Format implements Cloneable
 
   /**
    * This method returns a hash value for this object.
-   * 
+   *
    * @return A hash value for this object.
    */
   public int hashCode ()
@@ -866,17 +866,17 @@ public abstract class DateFormat extends Format implements Cloneable
     Date result = parse (source, pos);
     if (result == null)
       {
-	int index = pos.getErrorIndex();
-	if (index < 0)
-	  index = pos.getIndex();
-	throw new ParseException("invalid Date syntax in \""
-				 + source + '\"', index);
+        int index = pos.getErrorIndex();
+        if (index < 0)
+          index = pos.getIndex();
+        throw new ParseException("invalid Date syntax in \""
+                                 + source + '\"', index);
       }
     return result;
   }
 
-  /** 
-   * This method parses the specified String into a 
+  /**
+   * This method parses the specified String into a
    * Date.  The pos argument contains the
    * starting parse position on method entry and the ending parse
    * position on method exit.
@@ -894,7 +894,7 @@ public abstract class DateFormat extends Format implements Cloneable
    * This method is identical to parse(String, ParsePosition),
    * but returns its result as an Object instead of a
    * Date.
-   * 
+   *
    * @param source The string to parse.
    * @param pos The starting parse position in entry, the ending parse
    * position on exit.
@@ -908,7 +908,7 @@ public abstract class DateFormat extends Format implements Cloneable
   }
 
   /**
-   * This method specified the Calendar that should be used 
+   * This method specified the Calendar that should be used
    * by this object to parse/format datetimes.
    *
    * @param calendar The new Calendar for this object.
@@ -921,7 +921,7 @@ public abstract class DateFormat extends Format implements Cloneable
   }
 
   /**
-   * This method specifies whether or not this object should be lenient in 
+   * This method specifies whether or not this object should be lenient in
    * the syntax it accepts while parsing date/time values.
    *
    * @param lenient true if parsing should be lenient,
diff --git a/libjava/classpath/java/text/DateFormatSymbols.java b/libjava/classpath/java/text/DateFormatSymbols.java
index ed953dd0733..c22dd38f765 100644
--- a/libjava/classpath/java/text/DateFormatSymbols.java
+++ b/libjava/classpath/java/text/DateFormatSymbols.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -89,7 +89,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   static
   {
     properties = new Properties();
-    try 
+    try
       {
         properties.load(DateFormatSymbols.class.getResourceAsStream("metazones.properties"));
       }
@@ -126,7 +126,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   transient String[] timeFormats;
 
   private static String[] getStringArray(ResourceBundle res, String name)
-  { 
+  {
     return res.getString(name).split("\u00ae");
   }
 
@@ -135,116 +135,116 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
     List allZones = new ArrayList();
     try
       {
-	Map systemZones = new HashMap();
-	while (true)
-	  {
-	    int index = 0;
-	    String country = locale.getCountry();
-	    String data = res.getString("zoneStrings");
-	    String[] zones = data.split("\u00a9");
-	    for (int a = 0; a < zones.length; ++a)
-	      {
-		String[] strings = zones[a].split("\u00ae");
-		String type = properties.getProperty(strings[0] + "." + country);
-		if (type == null)
-		  type = properties.getProperty(strings[0] + ".DEFAULT");
-		if (type != null)
-		  strings[0] = type;
-		if (strings.length < 5)
-		  {
-		    String[] newStrings = new String[5];
-		    System.arraycopy(strings, 0, newStrings, 0, strings.length);
-		    for (int b = strings.length; b < newStrings.length; ++b)
-		      newStrings[b] = "";
-		    strings = newStrings;
-		  }
-		String[] existing = systemZones.get(strings[0]);
-		if (existing != null && existing.length > 1)
-		  {
-		    for (int b = 1; b < existing.length; ++b)
-		      if (!existing[b].equals(""))
-			strings[b] = existing[b];	   
-		  }
-		systemZones.put(strings[0], strings);
-	      }
-	    if (res.getLocale() == Locale.ROOT)
-	      break;
-	    else
-	      res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", 
-					     LocaleHelper.getFallbackLocale(res.getLocale()),
-					     ClassLoader.getSystemClassLoader());
-	  }
-	/* Final sanity check for missing values */
-	for (String[] zstrings : systemZones.values())
-	  {
-	    if (zstrings[1].equals("") && zstrings[2].equals(""))
-	      {
-		for (Map.Entry entry : properties.entrySet())
-		  {
-		    String val = (String) entry.getValue();
-		    if (val.equals(zstrings[0]))
-		      {
-			String key = (String) entry.getKey();
-			String metazone = key.substring(0, key.indexOf("."));
-			String type = properties.getProperty(metazone + "." + locale.getCountry());
-			if (type == null)
-			  type = properties.getProperty(metazone + ".DEFAULT");
-			if (type != null)
-			  {
-			    String[] ostrings = systemZones.get(type);
-			    zstrings[1] = ostrings[1];
-			    zstrings[2] = ostrings[2];
-			  }
-		      }
-		  }
-	      }
-	  }
-	allZones.addAll(systemZones.values());	
+        Map systemZones = new HashMap();
+        while (true)
+          {
+            int index = 0;
+            String country = locale.getCountry();
+            String data = res.getString("zoneStrings");
+            String[] zones = data.split("\u00a9");
+            for (int a = 0; a < zones.length; ++a)
+              {
+                String[] strings = zones[a].split("\u00ae");
+                String type = properties.getProperty(strings[0] + "." + country);
+                if (type == null)
+                  type = properties.getProperty(strings[0] + ".DEFAULT");
+                if (type != null)
+                  strings[0] = type;
+                if (strings.length < 5)
+                  {
+                    String[] newStrings = new String[5];
+                    System.arraycopy(strings, 0, newStrings, 0, strings.length);
+                    for (int b = strings.length; b < newStrings.length; ++b)
+                      newStrings[b] = "";
+                    strings = newStrings;
+                  }
+                String[] existing = systemZones.get(strings[0]);
+                if (existing != null && existing.length > 1)
+                  {
+                    for (int b = 1; b < existing.length; ++b)
+                      if (!existing[b].equals(""))
+                        strings[b] = existing[b];
+                  }
+                systemZones.put(strings[0], strings);
+              }
+            if (res.getLocale() == Locale.ROOT)
+              break;
+            else
+              res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+                                             LocaleHelper.getFallbackLocale(res.getLocale()),
+                                             ClassLoader.getSystemClassLoader());
+          }
+        /* Final sanity check for missing values */
+        for (String[] zstrings : systemZones.values())
+          {
+            if (zstrings[1].equals("") && zstrings[2].equals(""))
+              {
+                for (Map.Entry entry : properties.entrySet())
+                  {
+                    String val = (String) entry.getValue();
+                    if (val.equals(zstrings[0]))
+                      {
+                        String key = (String) entry.getKey();
+                        String metazone = key.substring(0, key.indexOf("."));
+                        String type = properties.getProperty(metazone + "." + locale.getCountry());
+                        if (type == null)
+                          type = properties.getProperty(metazone + ".DEFAULT");
+                        if (type != null)
+                          {
+                            String[] ostrings = systemZones.get(type);
+                            zstrings[1] = ostrings[1];
+                            zstrings[2] = ostrings[2];
+                          }
+                      }
+                  }
+              }
+          }
+        allZones.addAll(systemZones.values());
       }
     catch (MissingResourceException e)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we just include providers. */
+        /* This means runtime support for the locale
+         * is not available, so we just include providers. */
       }
     for (TimeZoneNameProvider p :
-	   ServiceLoader.load(TimeZoneNameProvider.class))
+           ServiceLoader.load(TimeZoneNameProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		for (String id : TimeZone.getAvailableIDs())
-		  {
-		    String[] z = new String[5];
-		    z[0] = id;
-		    z[1] = p.getDisplayName(id, false,
-					    TimeZone.LONG,
-					    locale);
-		    z[2] = p.getDisplayName(id, false,
-					    TimeZone.SHORT,
-					    locale);
-		    z[3] = p.getDisplayName(id, true,
-					    TimeZone.LONG,
-					    locale);
-		    z[4] = p.getDisplayName(id, true,
-					    TimeZone.SHORT,
-					    locale);
-		    allZones.add(z);
-		  }
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                for (String id : TimeZone.getAvailableIDs())
+                  {
+                    String[] z = new String[5];
+                    z[0] = id;
+                    z[1] = p.getDisplayName(id, false,
+                                            TimeZone.LONG,
+                                            locale);
+                    z[2] = p.getDisplayName(id, false,
+                                            TimeZone.SHORT,
+                                            locale);
+                    z[3] = p.getDisplayName(id, true,
+                                            TimeZone.LONG,
+                                            locale);
+                    z[4] = p.getDisplayName(id, true,
+                                            TimeZone.SHORT,
+                                            locale);
+                    allZones.add(z);
+                  }
+                break;
+              }
+          }
       }
     return allZones.toArray(new String[allZones.size()][]);
   }
-  
-  private String[] formatsForKey(ResourceBundle res, String key) 
+
+  private String[] formatsForKey(ResourceBundle res, String key)
   {
     String[] values = new String[formatPrefixes.length];
-    
+
     for (int i = 0; i < formatPrefixes.length; i++)
       values[i] = res.getString(formatPrefixes[i] + key);
-  
+
     return values;
   }
 
@@ -256,7 +256,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
    * call {@link #getInstance(java.util.Locale)} instead.
    *
    * @param locale The locale for which date formatting symbols should
-   *               be loaded. 
+   *               be loaded.
    * @throws MissingResourceException if the resources for the specified
    *                                  locale could not be found or loaded.
    * @see #getInstance(java.util.Locale)
@@ -266,7 +266,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   {
     ResourceBundle res
       = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale,
-      				 ClassLoader.getSystemClassLoader());
+                                 ClassLoader.getSystemClassLoader());
 
     ampms = getStringArray(res, "ampms");
     eras = getStringArray(res, "eras");
@@ -290,7 +290,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
    *                                  locale could not be found or loaded.
    * @see #getInstance()
    */
-  public DateFormatSymbols() 
+  public DateFormatSymbols()
     throws MissingResourceException
   {
     this (Locale.getDefault());
@@ -323,7 +323,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   /**
     * This method returns the pattern character information for this
     * object.  This is an 18 character string that contains the characters
-    * that are used in creating the date formatting strings in 
+    * that are used in creating the date formatting strings in
     * SimpleDateFormat.   The following are the character
     * positions in the string and which format character they correspond
     * to (the character in parentheses is the default value in the US English
@@ -386,7 +386,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   }
 
   /**
-   * This method returns the list of strings used for displaying abbreviated 
+   * This method returns the list of strings used for displaying abbreviated
    * weekday names (e.g., "Sun" and "Mon").  This is an eight element
    * String array indexed by Calendar.SUNDAY
    * through Calendar.SATURDAY.  Note that the first element
@@ -476,7 +476,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
     * This method sets the list of characters used to specific date/time
     * formatting strings.
     * This is an 18 character string that contains the characters
-    * that are used in creating the date formatting strings in 
+    * that are used in creating the date formatting strings in
     * SimpleDateFormat.   The following are the character
     * positions in the string and which format character they correspond
     * to (the character in parentheses is the default value in the US English
@@ -615,8 +615,8 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
       return false;
     for (int i = xa.length;  --i >= 0; )
       {
-	if (! equals(xa[i], ya[i]))
-	  return false;
+        if (! equals(xa[i], ya[i]))
+          return false;
       }
     return true;
   }
@@ -643,7 +643,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
    * 
            •  Is an instance of DateFormatSymbols.
              • 
    * 
            •  Contains identical formatting symbols to this object.
              • 
    * 
-   * 
+   *
    * @param obj The Object to test for equality against.
    *
    * @return true if the specified object is equal to this one,
@@ -655,13 +655,13 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
       return false;
     DateFormatSymbols other = (DateFormatSymbols) obj;
     return (equals(ampms, other.ampms)
-	    && equals(eras, other.eras)
-	    && equals(localPatternChars, other.localPatternChars)
-	    && equals(months, other.months)
-	    && equals(shortMonths, other.shortMonths)
-	    && equals(shortWeekdays, other.shortWeekdays)
-	    && equals(weekdays, other.weekdays)
-	    && equals(zoneStrings, other.zoneStrings));
+            && equals(eras, other.eras)
+            && equals(localPatternChars, other.localPatternChars)
+            && equals(months, other.months)
+            && equals(shortMonths, other.shortMonths)
+            && equals(shortWeekdays, other.shortWeekdays)
+            && equals(weekdays, other.weekdays)
+            && equals(zoneStrings, other.zoneStrings));
   }
 
   /**
@@ -674,8 +674,8 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
     try
       {
         return super.clone ();
-      } 
-    catch (CloneNotSupportedException e) 
+      }
+    catch (CloneNotSupportedException e)
       {
         return null;
       }
@@ -689,13 +689,13 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   public int hashCode ()
   {
     return (hashCode(ampms)
-	    ^ hashCode(eras)
-	    ^ hashCode(localPatternChars)
-	    ^ hashCode(months)
-	    ^ hashCode(shortMonths)
-	    ^ hashCode(shortWeekdays)
-	    ^ hashCode(weekdays)
-	    ^ hashCode(zoneStrings));
+            ^ hashCode(eras)
+            ^ hashCode(localPatternChars)
+            ^ hashCode(months)
+            ^ hashCode(shortMonths)
+            ^ hashCode(shortWeekdays)
+            ^ hashCode(weekdays)
+            ^ hashCode(zoneStrings));
   }
 
   /**
@@ -705,7 +705,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
    * {@link java.text.spi.DateFormatSymbolsProvider} instances.
    * This is equivalent to calling
    * getInstance(Locale.getDefault()).
-   * 
+   *
    * @return a {@link DateFormatSymbols} instance for the default
    *         locale.
    * @since 1.6
@@ -720,7 +720,7 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
    * specified locale obtained from either the runtime itself
    * or one of the installed
    * {@link java.text.spi.DateFormatSymbolsProvider} instances.
-   * 
+   *
    * @param locale the locale for which an instance should be
    *               returned.
    * @return a {@link DateFormatSymbols} instance for the specified
@@ -733,27 +733,27 @@ public class DateFormatSymbols implements java.io.Serializable, Cloneable
   {
     try
       {
-	DateFormatSymbols syms = new DateFormatSymbols(locale);
-	return syms;
+        DateFormatSymbols syms = new DateFormatSymbols(locale);
+        return syms;
       }
     catch (MissingResourceException e)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (DateFormatSymbolsProvider p :
-	   ServiceLoader.load(DateFormatSymbolsProvider.class))
+           ServiceLoader.load(DateFormatSymbolsProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		DateFormatSymbols syms = p.getInstance(locale);
-		if (syms != null)
-		  return syms;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                DateFormatSymbols syms = p.getInstance(locale);
+                if (syms != null)
+                  return syms;
+                break;
+              }
+          }
       }
     return getInstance(LocaleHelper.getFallbackLocale(locale));
   }
diff --git a/libjava/classpath/java/text/DecimalFormat.java b/libjava/classpath/java/text/DecimalFormat.java
index 425174437a7..9f02bb8d4cb 100644
--- a/libjava/classpath/java/text/DecimalFormat.java
+++ b/libjava/classpath/java/text/DecimalFormat.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -35,7 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-/* 
+/*
  * This class contains few bits from ICU4J (http://icu.sourceforge.net/),
  * Copyright by IBM and others and distributed under the
  * distributed under MIT/X.
@@ -55,7 +55,7 @@ import java.util.Locale;
 /*
  * This note is here for historical reasons and because I had not the courage
  * to remove it :)
- *  
+ *
  * @author Tom Tromey (tromey@cygnus.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @date March 4, 1999
@@ -72,7 +72,7 @@ import java.util.Locale;
  * decimal numbers. The class can format numbers given a specific locale.
  * Generally, to get an instance of DecimalFormat you should call the factory
  * methods in the NumberFormat base class.
- * 
+ *
  * @author Mario Torre (neugens@limasoftware.net)
  * @author Tom Tromey (tromey@cygnus.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -81,104 +81,104 @@ public class DecimalFormat extends NumberFormat
 {
   /** serialVersionUID for serializartion. */
   private static final long serialVersionUID = 864413376551465018L;
-  
+
   /** Defines the default number of digits allowed while formatting integers. */
-  private static final int DEFAULT_INTEGER_DIGITS = 309; 
+  private static final int DEFAULT_INTEGER_DIGITS = 309;
 
   /**
    * Defines the default number of digits allowed while formatting
    * fractions.
    */
   private static final int DEFAULT_FRACTION_DIGITS = 340;
-  
+
   /**
    * Locale-independent pattern symbols.
    */
   // Happen to be the same as the US symbols.
   private static final DecimalFormatSymbols nonLocalizedSymbols
     = new DecimalFormatSymbols (Locale.US);
-  
+
   /**
    * Defines if parse should return a BigDecimal or not.
    */
   private boolean parseBigDecimal;
-  
+
   /**
    * Defines if we have to use the monetary decimal separator or
    * the decimal separator while formatting numbers.
    */
   private boolean useCurrencySeparator;
-    
+
   /** Defines if the decimal separator is always shown or not. */
   private boolean decimalSeparatorAlwaysShown;
-  
+
   /**
    * Defines if the decimal separator has to be shown.
-   * 
+   *
    * This is different then decimalSeparatorAlwaysShown,
    * as it defines if the format string contains a decimal separator or no.
    */
   private boolean showDecimalSeparator;
-  
+
   /**
    * This field is used to determine if the grouping
    * separator is included in the format string or not.
    * This is only needed to match the behaviour of the RI.
    */
   private boolean groupingSeparatorInPattern;
-  
+
   /** Defines the size of grouping groups when grouping is used. */
   private byte groupingSize;
-  
+
   /**
    * This is an internal parameter used to keep track of the number
    * of digits the form the exponent, when exponential notation is used.
    * It is used with exponentRound
    */
   private byte minExponentDigits;
- 
+
   /** This field is used to set the exponent in the engineering notation. */
   private int exponentRound;
-  
+
   /** Multiplier used in percent style formats. */
   private int multiplier;
-  
+
   /** Multiplier used in percent style formats. */
   private int negativePatternMultiplier;
-  
+
   /** The negative prefix. */
   private String negativePrefix;
-  
+
   /** The negative suffix. */
   private String negativeSuffix;
-  
+
   /** The positive prefix. */
   private String positivePrefix;
-  
+
   /** The positive suffix. */
   private String positiveSuffix;
-  
+
   /** Decimal Format Symbols for the given locale. */
   private DecimalFormatSymbols symbols;
-  
+
   /** Determine if we have to use exponential notation or not. */
   private boolean useExponentialNotation;
-  
+
   /**
    * Defines the maximum number of integer digits to show when we use
    * the exponential notation.
    */
   private int maxIntegerDigitsExponent;
-  
+
   /** Defines if the format string has a negative prefix or not. */
   private boolean hasNegativePrefix;
-  
+
   /** Defines if the format string has a fractional pattern or not. */
   private boolean hasFractionalPattern;
- 
+
   /** Stores a list of attributes for use by formatToCharacterIterator. */
   private ArrayList attributes = new ArrayList();
-  
+
   /**
    * Constructs a DecimalFormat which uses the default
    * pattern and symbols.
@@ -187,7 +187,7 @@ public class DecimalFormat extends NumberFormat
   {
     this ("#,##0.###");
   }
-  
+
   /**
    * Constructs a DecimalFormat which uses the given
    * pattern and the default symbols for formatting and parsing.
@@ -204,7 +204,7 @@ public class DecimalFormat extends NumberFormat
   /**
    * Constructs a DecimalFormat using the given pattern
    * and formatting symbols.  This construction method is used to give
-   * complete control over the formatting process.  
+   * complete control over the formatting process.
    *
    * @param pattern the non-localized pattern to use.
    * @param symbols the set of symbols used for parsing and formatting.
@@ -216,10 +216,10 @@ public class DecimalFormat extends NumberFormat
     this.symbols = (DecimalFormatSymbols) symbols.clone();
     applyPatternWithSymbols(pattern, nonLocalizedSymbols);
   }
-  
+
   /**
    * Apply the given localized patern to the current DecimalFormat object.
-   * 
+   *
    * @param pattern The localized pattern to apply.
    * @throws IllegalArgumentException if the given pattern is invalid.
    * @throws NullPointerException if the input pattern is null.
@@ -231,7 +231,7 @@ public class DecimalFormat extends NumberFormat
 
   /**
    * Apply the given localized pattern to the current DecimalFormat object.
-   * 
+   *
    * @param pattern The localized pattern to apply.
    * @throws IllegalArgumentException if the given pattern is invalid.
    * @throws NullPointerException if the input pattern is null.
@@ -256,9 +256,9 @@ public class DecimalFormat extends NumberFormat
    * 
            • obj is an instance of DecimalFormat;
              • 
    * 
            • this instance and obj have the same attributes;
              • 
    * 
-   * 
+   *
    * @param obj  the object (null permitted).
-   * 
+   *
    * @return A boolean.
    */
   public boolean equals(Object obj)
@@ -266,9 +266,9 @@ public class DecimalFormat extends NumberFormat
     if (! (obj instanceof DecimalFormat))
       return false;
     DecimalFormat dup = (DecimalFormat) obj;
-    return (decimalSeparatorAlwaysShown == dup.decimalSeparatorAlwaysShown 
+    return (decimalSeparatorAlwaysShown == dup.decimalSeparatorAlwaysShown
            && groupingUsed == dup.groupingUsed
-           && groupingSeparatorInPattern == dup.groupingSeparatorInPattern 
+           && groupingSeparatorInPattern == dup.groupingSeparatorInPattern
            && groupingSize == dup.groupingSize
            && multiplier == dup.multiplier
            && useExponentialNotation == dup.useExponentialNotation
@@ -301,13 +301,13 @@ public class DecimalFormat extends NumberFormat
   {
     return toPattern().hashCode();
   }
-  
+
   /**
    * Produce a formatted {@link String} representation of this object.
-   * The passed object must be of type number. 
-   * 
+   * The passed object must be of type number.
+   *
    * @param obj The {@link Number} to format.
-   * @param sbuf The destination String; text will be appended to this String. 
+   * @param sbuf The destination String; text will be appended to this String.
    * @param pos If used on input can be used to define an alignment
    * field. If used on output defines the offsets of the alignment field.
    * @return The String representation of this long.
@@ -325,22 +325,22 @@ public class DecimalFormat extends NumberFormat
         formatInternal((BigDecimal) obj, true, sbuf, pos);
         return sbuf;
       }
-    
+
     return super.format(obj, sbuf, pos);
   }
-  
+
   /**
    * Produce a formatted {@link String} representation of this double.
-   * 
+   *
    * @param number The double to format.
-   * @param dest The destination String; text will be appended to this String. 
+   * @param dest The destination String; text will be appended to this String.
    * @param fieldPos If used on input can be used to define an alignment
    * field. If used on output defines the offsets of the alignment field.
    * @return The String representation of this long.
    * @throws NullPointerException if dest or fieldPos are null
    */
   public StringBuffer format(double number, StringBuffer dest,
-			     FieldPosition fieldPos)
+                             FieldPosition fieldPos)
   {
     // special cases for double: NaN and negative or positive infinity
     if (Double.isNaN(number))
@@ -348,7 +348,7 @@ public class DecimalFormat extends NumberFormat
         // 1. NaN
         String nan = symbols.getNaN();
         dest.append(nan);
-        
+
         // update field position if required
         if ((fieldPos.getField() == INTEGER_FIELD ||
              fieldPos.getFieldAttribute() == NumberFormat.Field.INTEGER))
@@ -365,14 +365,14 @@ public class DecimalFormat extends NumberFormat
           dest.append(this.negativePrefix);
         else
           dest.append(this.positivePrefix);
-        
+
         dest.append(symbols.getInfinity());
-        
+
         if (number < 0)
           dest.append(this.negativeSuffix);
         else
           dest.append(this.positiveSuffix);
-        
+
         if ((fieldPos.getField() == INTEGER_FIELD ||
             fieldPos.getFieldAttribute() == NumberFormat.Field.INTEGER))
          {
@@ -386,15 +386,15 @@ public class DecimalFormat extends NumberFormat
         BigDecimal bigDecimal = new BigDecimal(String.valueOf(number));
         formatInternal(bigDecimal, false, dest, fieldPos);
       }
-    
+
     return dest;
   }
 
   /**
    * Produce a formatted {@link String} representation of this long.
-   * 
+   *
    * @param number The long to format.
-   * @param dest The destination String; text will be appended to this String. 
+   * @param dest The destination String; text will be appended to this String.
    * @param fieldPos If used on input can be used to define an alignment
    * field. If used on output defines the offsets of the alignment field.
    * @return The String representation of this long.
@@ -406,13 +406,13 @@ public class DecimalFormat extends NumberFormat
     formatInternal(bigDecimal, true, dest, fieldPos);
     return dest;
   }
-  
+
   /**
    * Return an AttributedCharacterIterator as a result of
    * the formatting of the passed {@link Object}.
-   * 
+   *
    * @return An {@link AttributedCharacterIterator}.
-   * @throws NullPointerException if value is null. 
+   * @throws NullPointerException if value is null.
    * @throws IllegalArgumentException if value is not an instance of
    * {@link Number}.
    */
@@ -422,13 +422,13 @@ public class DecimalFormat extends NumberFormat
      * This method implementation derives directly from the
      * ICU4J (http://icu.sourceforge.net/) library, distributed under MIT/X.
      */
-    
+
     if (value == null)
       throw new NullPointerException("Passed Object is null");
-    
+
     if (!(value instanceof Number)) throw new
       IllegalArgumentException("Cannot format given Object as a Number");
-    
+
     StringBuffer text = new StringBuffer();
     attributes.clear();
     super.format(value, text, new FieldPosition(0));
@@ -440,15 +440,15 @@ public class DecimalFormat extends NumberFormat
       {
         FieldPosition pos = (FieldPosition) attributes.get(i);
         Format.Field attribute = pos.getFieldAttribute();
-        
+
         as.addAttribute(attribute, attribute, pos.getBeginIndex(),
                         pos.getEndIndex());
       }
-    
+
     // return the CharacterIterator from AttributedString
     return as.getIterator();
   }
-  
+
   /**
    * Returns the currency corresponding to the currency symbol stored
    * in the instance of DecimalFormatSymbols used by this
@@ -461,25 +461,25 @@ public class DecimalFormat extends NumberFormat
   {
     return symbols.getCurrency();
   }
-  
+
   /**
    * Returns a copy of the symbols used by this instance.
-   * 
+   *
    * @return A copy of the symbols.
    */
   public DecimalFormatSymbols getDecimalFormatSymbols()
   {
     return (DecimalFormatSymbols) symbols.clone();
   }
-  
+
   /**
    * Gets the interval used between a grouping separator and the next.
    * For example, a grouping size of 3 means that the number 1234 is
    * formatted as 1,234.
-   * 
+   *
    * The actual character used as grouping separator depends on the
    * locale and is defined by {@link DecimalFormatSymbols#getDecimalSeparator()}
-   * 
+   *
    * @return The interval used between a grouping separator and the next.
    */
   public int getGroupingSize()
@@ -489,17 +489,17 @@ public class DecimalFormat extends NumberFormat
 
   /**
    * Gets the multiplier used in percent and similar formats.
-   * 
+   *
    * @return The multiplier used in percent and similar formats.
    */
   public int getMultiplier()
   {
     return multiplier;
   }
-  
+
   /**
    * Gets the negative prefix.
-   * 
+   *
    * @return The negative prefix.
    */
   public String getNegativePrefix()
@@ -509,56 +509,56 @@ public class DecimalFormat extends NumberFormat
 
   /**
    * Gets the negative suffix.
-   * 
+   *
    * @return The negative suffix.
    */
   public String getNegativeSuffix()
   {
     return negativeSuffix;
   }
-  
+
   /**
    * Gets the positive prefix.
-   * 
+   *
    * @return The positive prefix.
    */
   public String getPositivePrefix()
   {
     return positivePrefix;
   }
-  
+
   /**
    * Gets the positive suffix.
-   *  
+   *
    * @return The positive suffix.
    */
   public String getPositiveSuffix()
   {
     return positiveSuffix;
   }
-  
+
   public boolean isDecimalSeparatorAlwaysShown()
   {
     return decimalSeparatorAlwaysShown;
   }
-  
+
   /**
    * Define if parse(java.lang.String, java.text.ParsePosition)
-   * should return a {@link BigDecimal} or not. 
-   * 
+   * should return a {@link BigDecimal} or not.
+   *
    * @param newValue
    */
   public void setParseBigDecimal(boolean newValue)
   {
     this.parseBigDecimal = newValue;
   }
-  
+
   /**
    * Returns true if
    * parse(java.lang.String, java.text.ParsePosition) returns
    * a BigDecimal, false otherwise.
    * The default return value for this method is false.
-   * 
+   *
    * @return true if the parse method returns a {@link BigDecimal},
    * false otherwise.
    * @since 1.5
@@ -568,15 +568,15 @@ public class DecimalFormat extends NumberFormat
   {
     return this.parseBigDecimal;
   }
-  
+
   /**
    * This method parses the specified string into a Number.
-   * 
+   *
    * The parsing starts at pos, which is updated as the parser
    * consume characters in the passed string.
    * On error, the Position object index is not updated, while
    * error position is set appropriately, an null is returned.
-   * 
+   *
    * @param str The string to parse.
    * @param pos The desired ParsePosition.
    *
@@ -588,30 +588,30 @@ public class DecimalFormat extends NumberFormat
     // NaN
     if (str.contains(this.symbols.getNaN()))
       return Double.valueOf(Double.NaN);
-   
+
     // this will be our final number
     CPStringBuilder number = new CPStringBuilder();
-    
+
     // special character
     char minus = symbols.getMinusSign();
-    
+
     // starting parsing position
     int start = pos.getIndex();
-    
-    // validate the string, it have to be in the 
+
+    // validate the string, it have to be in the
     // same form as the format string or parsing will fail
     String _negativePrefix = (this.negativePrefix.compareTo("") == 0
                               ? minus + positivePrefix
                               : this.negativePrefix);
-    
+
     // we check both prefixes, because one might be empty.
     // We want to pick the longest prefix that matches.
     int positiveLen = positivePrefix.length();
     int negativeLen = _negativePrefix.length();
-    
+
     boolean isNegative = str.startsWith(_negativePrefix);
     boolean isPositive = str.startsWith(positivePrefix);
-    
+
     if (isPositive && isNegative)
       {
         // By checking this way, we preserve ambiguity in the case
@@ -644,31 +644,31 @@ public class DecimalFormat extends NumberFormat
         pos.setErrorIndex(start);
         return null;
       }
-    
+
     // other special characters used by the parser
     char decimalSeparator = symbols.getDecimalSeparator();
     char zero = symbols.getZeroDigit();
-    char exponent = symbols.getExponential(); 
-    
+    char exponent = symbols.getExponential();
+
     // stop parsing position in the string
     int stop = start + this.maximumIntegerDigits + maximumFractionDigits + 2;
-    
+
     if (useExponentialNotation)
       stop += minExponentDigits + 1;
-    
+
     boolean inExponent = false;
 
     // correct the size of the end parsing flag
     int len = str.length();
     if (len < stop) stop = len;
     char groupingSeparator = symbols.getGroupingSeparator();
-    
+
     int i = start;
     while (i < stop)
       {
         char ch = str.charAt(i);
         i++;
-       
+
         if (ch >= zero && ch <= (zero + 9))
           {
             number.append(ch);
@@ -692,43 +692,43 @@ public class DecimalFormat extends NumberFormat
             if (inExponent)
               number.append(ch);
             else
-	      {
-		i--;
-        	break;
-	      }
+              {
+                i--;
+                break;
+              }
+          }
+        else
+          {
+            if (!groupingUsed || ch != groupingSeparator)
+              {
+                i--;
+                break;
+              }
           }
-	else
-	  {
-	    if (!groupingUsed || ch != groupingSeparator)
-	      {
-	        i--;
-	        break;
-	      }
-	  }
       }
 
     // 2nd special case: infinity
     // XXX: need to be tested
     if (str.contains(symbols.getInfinity()))
       {
-        int inf = str.indexOf(symbols.getInfinity()); 
+        int inf = str.indexOf(symbols.getInfinity());
         pos.setIndex(inf);
-        
+
         // FIXME: ouch, this is really ugly and lazy code...
         if (this.parseBigDecimal)
           {
             if (isNegative)
               return BigDecimal.valueOf(Double.NEGATIVE_INFINITY);
-            
+
             return BigDecimal.valueOf(Double.POSITIVE_INFINITY);
           }
-        
+
         if (isNegative)
           return Double.valueOf(Double.NEGATIVE_INFINITY);
 
         return Double.valueOf(Double.POSITIVE_INFINITY);
       }
-    
+
     // no number...
     if (i == start || number.length() == 0)
       {
@@ -744,7 +744,7 @@ public class DecimalFormat extends NumberFormat
 
     positiveLen = positiveSuffix.length();
     negativeLen = negativeSuffix.length();
-    
+
     if (isNegative && !hasNegativeSuffix)
       {
         pos.setErrorIndex(i);
@@ -761,16 +761,16 @@ public class DecimalFormat extends NumberFormat
         pos.setErrorIndex(i);
         return null;
       }
-    
+
     if (isNegative) number.insert(0, '-');
-   
+
     pos.setIndex(i);
-    
+
     // now we handle the return type
     BigDecimal bigDecimal = new BigDecimal(number.toString());
     if (this.parseBigDecimal)
       return bigDecimal;
-    
+
     // want integer?
     if (this.parseIntegerOnly)
       return Long.valueOf(bigDecimal.longValue());
@@ -778,7 +778,7 @@ public class DecimalFormat extends NumberFormat
     // 3th special case -0.0
     if (isNegative && (bigDecimal.compareTo(BigDecimal.ZERO) == 0))
       return Double.valueOf(-0.0);
-    
+
     try
       {
         BigDecimal integer
@@ -795,7 +795,7 @@ public class DecimalFormat extends NumberFormat
    * Sets the Currency on the
    * DecimalFormatSymbols used, which also sets the
    * currency symbols on those symbols.
-   * 
+   *
    * @param currency The new Currency on the
    * DecimalFormatSymbols.
    */
@@ -804,46 +804,46 @@ public class DecimalFormat extends NumberFormat
     Currency current = symbols.getCurrency();
     if (current != currency)
       {
-	String oldSymbol = symbols.getCurrencySymbol();
-	int len = oldSymbol.length();
-	symbols.setCurrency(currency);
-	String newSymbol = symbols.getCurrencySymbol();
-	int posPre = positivePrefix.indexOf(oldSymbol);
-	if (posPre != -1)
-	  positivePrefix = positivePrefix.substring(0, posPre) +
-	    newSymbol + positivePrefix.substring(posPre+len);
-	int negPre = negativePrefix.indexOf(oldSymbol);
-	if (negPre != -1)
-	  negativePrefix = negativePrefix.substring(0, negPre) +
-	    newSymbol + negativePrefix.substring(negPre+len);
-	int posSuf = positiveSuffix.indexOf(oldSymbol);
-	if (posSuf != -1)
-	  positiveSuffix = positiveSuffix.substring(0, posSuf) +
-	    newSymbol + positiveSuffix.substring(posSuf+len);
-	int negSuf = negativeSuffix.indexOf(oldSymbol);
-	if (negSuf != -1)
-	  negativeSuffix = negativeSuffix.substring(0, negSuf) +
-	    newSymbol + negativeSuffix.substring(negSuf+len);
+        String oldSymbol = symbols.getCurrencySymbol();
+        int len = oldSymbol.length();
+        symbols.setCurrency(currency);
+        String newSymbol = symbols.getCurrencySymbol();
+        int posPre = positivePrefix.indexOf(oldSymbol);
+        if (posPre != -1)
+          positivePrefix = positivePrefix.substring(0, posPre) +
+            newSymbol + positivePrefix.substring(posPre+len);
+        int negPre = negativePrefix.indexOf(oldSymbol);
+        if (negPre != -1)
+          negativePrefix = negativePrefix.substring(0, negPre) +
+            newSymbol + negativePrefix.substring(negPre+len);
+        int posSuf = positiveSuffix.indexOf(oldSymbol);
+        if (posSuf != -1)
+          positiveSuffix = positiveSuffix.substring(0, posSuf) +
+            newSymbol + positiveSuffix.substring(posSuf+len);
+        int negSuf = negativeSuffix.indexOf(oldSymbol);
+        if (negSuf != -1)
+          negativeSuffix = negativeSuffix.substring(0, negSuf) +
+            newSymbol + negativeSuffix.substring(negSuf+len);
       }
   }
-  
+
   /**
-   * Sets the symbols used by this instance.  This method makes a copy of 
+   * Sets the symbols used by this instance.  This method makes a copy of
    * the supplied symbols.
-   * 
+   *
    * @param newSymbols  the symbols (null not permitted).
    */
   public void setDecimalFormatSymbols(DecimalFormatSymbols newSymbols)
   {
     symbols = (DecimalFormatSymbols) newSymbols.clone();
   }
-  
+
   /**
    * Define if the decimal separator should be always visible or only
    * visible when needed. This method as effect only on integer values.
    * Pass true if you want the decimal separator to be
    * always shown, false otherwise.
-   * 
+   *
    * @param newValue true if you want the decimal separator to be
    * always shown, false otherwise.
    */
@@ -851,12 +851,12 @@ public class DecimalFormat extends NumberFormat
   {
     decimalSeparatorAlwaysShown = newValue;
   }
-  
+
   /**
    * Sets the number of digits used to group portions of the integer part of
    * the number. For example, the number 123456, with a grouping
    * size of 3, is rendered 123,456.
-   * 
+   *
    * @param groupSize The number of digits used while grouping portions
    * of the integer part of a number.
    */
@@ -864,14 +864,14 @@ public class DecimalFormat extends NumberFormat
   {
     groupingSize = (byte) groupSize;
   }
-  
+
   /**
    * Sets the maximum number of digits allowed in the integer
    * portion of a number to the specified value.
    * The new value will be the choosen as the minimum between
    * newvalue and 309. Any value below zero will be
    * replaced by zero.
-   * 
+   *
    * @param newValue The new maximum integer digits value.
    */
   public void setMaximumIntegerDigits(int newValue)
@@ -879,14 +879,14 @@ public class DecimalFormat extends NumberFormat
     newValue = (newValue > 0) ? newValue : 0;
     super.setMaximumIntegerDigits(Math.min(newValue, DEFAULT_INTEGER_DIGITS));
   }
-  
+
   /**
    * Sets the minimum number of digits allowed in the integer
    * portion of a number to the specified value.
    * The new value will be the choosen as the minimum between
    * newvalue and 309. Any value below zero will be
    * replaced by zero.
-   * 
+   *
    * @param newValue The new minimum integer digits value.
    */
   public void setMinimumIntegerDigits(int newValue)
@@ -894,14 +894,14 @@ public class DecimalFormat extends NumberFormat
     newValue = (newValue > 0) ? newValue : 0;
     super.setMinimumIntegerDigits(Math.min(newValue,  DEFAULT_INTEGER_DIGITS));
   }
-  
+
   /**
    * Sets the maximum number of digits allowed in the fraction
    * portion of a number to the specified value.
    * The new value will be the choosen as the minimum between
    * newvalue and 309. Any value below zero will be
    * replaced by zero.
-   * 
+   *
    * @param newValue The new maximum fraction digits value.
    */
   public void setMaximumFractionDigits(int newValue)
@@ -909,14 +909,14 @@ public class DecimalFormat extends NumberFormat
     newValue = (newValue > 0) ? newValue : 0;
     super.setMaximumFractionDigits(Math.min(newValue, DEFAULT_FRACTION_DIGITS));
   }
-  
+
   /**
    * Sets the minimum number of digits allowed in the fraction
    * portion of a number to the specified value.
    * The new value will be the choosen as the minimum between
    * newvalue and 309. Any value below zero will be
    * replaced by zero.
-   * 
+   *
    * @param newValue The new minimum fraction digits value.
    */
   public void setMinimumFractionDigits(int newValue)
@@ -924,22 +924,22 @@ public class DecimalFormat extends NumberFormat
     newValue = (newValue > 0) ? newValue : 0;
     super.setMinimumFractionDigits(Math.min(newValue, DEFAULT_FRACTION_DIGITS));
   }
-  
+
   /**
    * Sets the multiplier for use in percent and similar formats.
    * For example, for percent set the multiplier to 100, for permille, set the
    * miltiplier to 1000.
-   * 
+   *
    * @param newValue the new value for multiplier.
    */
   public void setMultiplier(int newValue)
   {
     multiplier = newValue;
   }
-  
+
   /**
    * Sets the negative prefix.
-   * 
+   *
    * @param newValue The new negative prefix.
    */
   public void setNegativePrefix(String newValue)
@@ -949,38 +949,38 @@ public class DecimalFormat extends NumberFormat
 
   /**
    * Sets the negative suffix.
-   * 
+   *
    * @param newValue The new negative suffix.
    */
   public void setNegativeSuffix(String newValue)
   {
     negativeSuffix = newValue;
   }
-  
+
   /**
    * Sets the positive prefix.
-   * 
+   *
    * @param newValue The new positive prefix.
    */
   public void setPositivePrefix(String newValue)
   {
     positivePrefix = newValue;
   }
-  
+
   /**
    * Sets the new positive suffix.
-   * 
+   *
    * @param newValue The new positive suffix.
    */
   public void setPositiveSuffix(String newValue)
   {
     positiveSuffix = newValue;
   }
-  
+
   /**
    * This method returns a string with the formatting pattern being used
    * by this object. The string is localized.
-   * 
+   *
    * @return A localized String with the formatting pattern.
    * @see #toPattern()
    */
@@ -988,11 +988,11 @@ public class DecimalFormat extends NumberFormat
   {
     return computePattern(this.symbols);
   }
-  
+
   /**
    * This method returns a string with the formatting pattern being used
    * by this object. The string is not localized.
-   * 
+   *
    * @return A String with the formatting pattern.
    * @see #toLocalizedPattern()
    */
@@ -1000,13 +1000,13 @@ public class DecimalFormat extends NumberFormat
   {
     return computePattern(nonLocalizedSymbols);
   }
-  
+
   /* ***** private methods ***** */
-  
+
   /**
    * This is an shortcut helper method used to test if two given strings are
    * equals.
-   * 
+   *
    * @param s1 The first string to test for equality.
    * @param s2 The second string to test for equality.
    * @return true if the strings are both null or
@@ -1018,10 +1018,10 @@ public class DecimalFormat extends NumberFormat
       return s1 == s2;
     return s1.equals(s2);
   }
-  
-  
+
+
   /* ****** PATTERN ****** */
-  
+
   /**
    * This helper function creates a string consisting of all the
    * characters which can appear in a pattern and must be quoted.
@@ -1029,7 +1029,7 @@ public class DecimalFormat extends NumberFormat
   private String patternChars (DecimalFormatSymbols syms)
   {
     CPStringBuilder buf = new CPStringBuilder ();
-    
+
     buf.append(syms.getDecimalSeparator());
     buf.append(syms.getDigit());
     buf.append(syms.getExponential());
@@ -1041,14 +1041,14 @@ public class DecimalFormat extends NumberFormat
     buf.append(syms.getZeroDigit());
     buf.append('\'');
     buf.append('\u00a4');
-    
+
     return buf.toString();
   }
 
   /**
    * Quote special characters as defined by patChars in the
    * input string.
-   * 
+   *
    * @param text
    * @param patChars
    * @return A StringBuffer with special characters quoted.
@@ -1056,7 +1056,7 @@ public class DecimalFormat extends NumberFormat
   private CPStringBuilder quoteFix(String text, String patChars)
   {
     CPStringBuilder buf = new CPStringBuilder();
-    
+
     int len = text.length();
     char ch;
     for (int index = 0; index < len; ++index)
@@ -1073,10 +1073,10 @@ public class DecimalFormat extends NumberFormat
             buf.append(ch);
           }
       }
-    
+
     return buf;
   }
-  
+
   /**
    * Returns the format pattern, localized to follow the given
    * symbols.
@@ -1084,23 +1084,23 @@ public class DecimalFormat extends NumberFormat
   private String computePattern(DecimalFormatSymbols symbols)
   {
     StringBuilder mainPattern = new StringBuilder();
-    
+
     // We have to at least emit a zero for the minimum number of
     // digits. Past that we need hash marks up to the grouping
     // separator (and one beyond).
     int _groupingSize = groupingUsed ? groupingSize + 1: groupingSize;
     int totalDigits = Math.max(minimumIntegerDigits, _groupingSize);
-    
+
     // if it is not in exponential notiation,
     // we always have a # prebended
     if (!useExponentialNotation) mainPattern.append(symbols.getDigit());
-    
+
     for (int i = 1; i < totalDigits - minimumIntegerDigits; i++)
       mainPattern.append(symbols.getDigit());
-    
+
     for (int i = totalDigits - minimumIntegerDigits; i < totalDigits; i++)
       mainPattern.append(symbols.getZeroDigit());
-    
+
     if (groupingUsed)
       {
         mainPattern.insert(mainPattern.length() - groupingSize,
@@ -1113,33 +1113,33 @@ public class DecimalFormat extends NumberFormat
       {
         mainPattern.append(symbols.getDecimalSeparator());
       }
-    
+
     for (int i = 0; i < minimumFractionDigits; ++i)
       mainPattern.append(symbols.getZeroDigit());
-    
+
     for (int i = minimumFractionDigits; i < maximumFractionDigits; ++i)
       mainPattern.append(symbols.getDigit());
-    
+
     if (useExponentialNotation)
       {
         mainPattern.append(symbols.getExponential());
-        
+
         for (int i = 0; i < minExponentDigits; ++i)
           mainPattern.append(symbols.getZeroDigit());
-        
+
         if (minExponentDigits == 0)
           mainPattern.append(symbols.getDigit());
       }
-    
+
     // save the pattern
     String pattern = mainPattern.toString();
-    
+
     // so far we have the pattern itself, now we need to add
     // the positive and the optional negative prefixes and suffixes
     String patternChars = patternChars(symbols);
     mainPattern.insert(0, quoteFix(positivePrefix, patternChars));
     mainPattern.append(quoteFix(positiveSuffix, patternChars));
-    
+
     if (hasNegativePrefix)
       {
         mainPattern.append(symbols.getPatternSeparator());
@@ -1147,17 +1147,17 @@ public class DecimalFormat extends NumberFormat
         mainPattern.append(pattern);
         mainPattern.append(quoteFix(negativeSuffix, patternChars));
       }
-    
+
     // finally, return the pattern string
     return mainPattern.toString();
   }
-  
+
   /* ****** FORMAT PARSING ****** */
-  
+
   /**
    * Scan the input string and define a pattern suitable for use
    * with this decimal format.
-   * 
+   *
    * @param pattern
    * @param symbols
    */
@@ -1175,11 +1175,11 @@ public class DecimalFormat extends NumberFormat
     // the parameters we need for formatting (which is basicly what
     // a descendent recursive parser would do - but without recursion).
     // I'm sure that there are smarter methods to do this.
-    
+
     // Restore default values. Most of these will be overwritten
     // but we want to be sure that nothing is left out.
     setDefaultValues();
-    
+
     int len = pattern.length();
     if (len == 0)
       {
@@ -1188,16 +1188,16 @@ public class DecimalFormat extends NumberFormat
         this.maximumIntegerDigits = DEFAULT_INTEGER_DIGITS;
         this.minimumFractionDigits = 0;
         this.maximumFractionDigits = DEFAULT_FRACTION_DIGITS;
-        
+
         // FIXME: ...and these values may not be valid in all locales
         this.minExponentDigits = 0;
         this.showDecimalSeparator = true;
         this.groupingUsed = true;
         this.groupingSize = 3;
-        
+
         return;
       }
-    
+
     int start = scanFix(pattern, symbols, 0, true);
     if (start < len) start = scanNumberInteger(pattern, symbols, start);
     if (start < len)
@@ -1213,16 +1213,16 @@ public class DecimalFormat extends NumberFormat
         //this.decimalSeparatorAlwaysShown = false;
         //this.showDecimalSeparator = false;
       }
-    
+
     // XXX: this fixes a compatibility test with the RI.
     // If new uses cases fail, try removing this line first.
     //if (!this.hasIntegerPattern && !this.hasFractionalPattern)
     //  throw new IllegalArgumentException("No valid pattern found!");
-    
+
     if (start < len) start = scanExponent(pattern, symbols, start);
     if (start < len) start = scanFix(pattern, symbols, start, false);
     if (start < len) scanNegativePattern(pattern, symbols, start);
-    
+
     if (useExponentialNotation &&
         (maxIntegerDigitsExponent > minimumIntegerDigits) &&
         (maxIntegerDigitsExponent > 1))
@@ -1230,20 +1230,20 @@ public class DecimalFormat extends NumberFormat
         minimumIntegerDigits = 1;
         exponentRound = maxIntegerDigitsExponent;
       }
-    
+
     if (useExponentialNotation)
       maximumIntegerDigits = maxIntegerDigitsExponent;
-    
+
     if (!this.hasFractionalPattern && this.showDecimalSeparator == true)
       {
         this.decimalSeparatorAlwaysShown = true;
       }
   }
-  
+
   /**
    * Scans for the prefix or suffix portion of the pattern string.
    * This method handles the positive subpattern of the pattern string.
-   *  
+   *
    * @param pattern The pattern string to parse.
    * @return The position in the pattern string where parsing ended.
    */
@@ -1251,7 +1251,7 @@ public class DecimalFormat extends NumberFormat
                       int start, boolean prefix)
   {
     CPStringBuilder buffer = new CPStringBuilder();
-    
+
     // the number portion is always delimited by one of those
     // characters
     char decimalSeparator = sourceSymbols.getDecimalSeparator();
@@ -1260,15 +1260,15 @@ public class DecimalFormat extends NumberFormat
     char digit = sourceSymbols.getDigit();
     char zero = sourceSymbols.getZeroDigit();
     char minus = sourceSymbols.getMinusSign();
-    
+
     // other special characters, cached here to avoid method calls later
     char percent = sourceSymbols.getPercent();
     char permille = sourceSymbols.getPerMill();
-    
+
     String currencySymbol = this.symbols.getCurrencySymbol();
-    
+
     boolean quote = false;
-    
+
     char ch = pattern.charAt(start);
     if (ch == patternSeparator)
       {
@@ -1277,7 +1277,7 @@ public class DecimalFormat extends NumberFormat
         ++start;
         return start;
       }
-    
+
     int len = pattern.length();
     int i;
     for (i = start; i < len; i++)
@@ -1292,12 +1292,12 @@ public class DecimalFormat extends NumberFormat
                 throw new IllegalArgumentException("Invalid pattern found: "
                                                    + start);
               }
-            
+
             this.hasNegativePrefix = true;
             ++i;
             break;
           }
-        
+
         // this means we are inside the number portion
         if (!quote &&
             (ch == minus || ch == digit || ch == zero ||
@@ -1314,7 +1314,7 @@ public class DecimalFormat extends NumberFormat
             buffer.append(ch);
             continue;
           }
-        
+
         if (ch == '\u00A4')
           {
             // CURRENCY
@@ -1347,7 +1347,7 @@ public class DecimalFormat extends NumberFormat
             // QUOTE
             if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
               {
-                // we need to add ' to the buffer 
+                // we need to add ' to the buffer
                 buffer.append(ch);
                 i++;
               }
@@ -1362,7 +1362,7 @@ public class DecimalFormat extends NumberFormat
             buffer.append(ch);
           }
       }
-    
+
     if (prefix)
       {
         this.positivePrefix = buffer.toString();
@@ -1372,15 +1372,15 @@ public class DecimalFormat extends NumberFormat
       {
         this.positiveSuffix = buffer.toString();
       }
-    
+
     return i;
   }
-  
+
   /**
    * Scan the given string for number patterns, starting
    * from start.
    * This method searches the integer part of the pattern only.
-   * 
+   *
    * @param pattern The pattern string to parse.
    * @param start The starting parse position in the string.
    * @return The position in the pattern string where parsing ended,
@@ -1395,33 +1395,33 @@ public class DecimalFormat extends NumberFormat
     char decimalSeparator = symbols.getDecimalSeparator();
     char exponent = symbols.getExponential();
     char patternSeparator = symbols.getPatternSeparator();
-    
+
     // count the number of zeroes in the pattern
     // this number defines the minum digits in the integer portion
     int zeros = 0;
-    
+
     // count the number of digits used in grouping
     int _groupingSize = 0;
-    
+
     this.maxIntegerDigitsExponent = 0;
-    
+
     boolean intPartTouched = false;
-    
+
     char ch;
     int len = pattern.length();
     int i;
     for (i = start; i < len; i++)
       {
         ch = pattern.charAt(i);
- 
+
         // break on decimal separator or exponent or pattern separator
         if (ch == decimalSeparator || ch == exponent)
           break;
-        
+
         if (this.hasNegativePrefix && ch == patternSeparator)
           throw new IllegalArgumentException("Invalid pattern found: "
                                              + start);
-        
+
         if (ch == digit)
           {
             // in our implementation we could relax this strict
@@ -1430,7 +1430,7 @@ public class DecimalFormat extends NumberFormat
             if (zeros > 0) throw new
               IllegalArgumentException("digit mark following zero in " +
                         "positive subpattern, not allowed. Position: " + i);
-            
+
             _groupingSize++;
             intPartTouched = true;
             this.maxIntegerDigitsExponent++;
@@ -1454,10 +1454,10 @@ public class DecimalFormat extends NumberFormat
             break;
           }
       }
-    
+
     if (groupingSeparatorInPattern) this.groupingSize = (byte) _groupingSize;
     this.minimumIntegerDigits = zeros;
-    
+
     // XXX: compatibility code with the RI: the number of minimum integer
     // digits is at least one when maximumIntegerDigits is more than zero
     if (intPartTouched && this.maximumIntegerDigits > 0 &&
@@ -1466,12 +1466,12 @@ public class DecimalFormat extends NumberFormat
 
     return i;
   }
-  
+
   /**
    * Scan the given string for number patterns, starting
    * from start.
    * This method searches the fractional part of the pattern only.
-   * 
+   *
    * @param pattern The pattern string to parse.
    * @param start The starting parse position in the string.
    * @return The position in the pattern string where parsing ended,
@@ -1487,7 +1487,7 @@ public class DecimalFormat extends NumberFormat
     char decimalSeparator = symbols.getDecimalSeparator();
     char exponent = symbols.getExponential();
     char patternSeparator = symbols.getPatternSeparator();
-    
+
     // first character needs to be '.' otherwise we are not parsing the
     // fractional portion
     char ch = pattern.charAt(start);
@@ -1497,29 +1497,29 @@ public class DecimalFormat extends NumberFormat
         this.maximumFractionDigits = 0;
         return start;
       }
-    
+
     ++start;
-    
+
     this.hasFractionalPattern = true;
-    
+
     this.minimumFractionDigits = 0;
     int digits = 0;
-    
+
     int len = pattern.length();
     int i;
     for (i = start; i < len; i++)
       {
         ch = pattern.charAt(i);
-        
+
         // we hit the exponential or negative subpattern
         if (ch == exponent || ch == patternSeparator)
           break;
-        
+
         // pattern error
         if (ch == groupingSeparator || ch == decimalSeparator) throw new
           IllegalArgumentException("unexpected character '" + ch + "' " +
                                    "in fractional subpattern. Position: " + i);
-        
+
         if (ch == digit)
           {
             digits++;
@@ -1529,7 +1529,7 @@ public class DecimalFormat extends NumberFormat
             if (digits > 0) throw new
             IllegalArgumentException("digit mark following zero in " +
                       "positive subpattern, not allowed. Position: " + i);
-            
+
             this.minimumFractionDigits++;
           }
         else
@@ -1538,20 +1538,20 @@ public class DecimalFormat extends NumberFormat
             break;
           }
       }
-    
+
     if (i == start) this.hasFractionalPattern = false;
-    
+
     this.maximumFractionDigits = this.minimumFractionDigits + digits;
     this.showDecimalSeparator = true;
-    
+
     return i;
   }
-  
+
   /**
    * Scan the given string for number patterns, starting
    * from start.
    * This method searches the expoential part of the pattern only.
-   * 
+   *
    * @param pattern The pattern string to parse.
    * @param start The starting parse position in the string.
    * @return The position in the pattern string where parsing ended,
@@ -1565,36 +1565,36 @@ public class DecimalFormat extends NumberFormat
     char groupingSeparator = symbols.getGroupingSeparator();
     char decimalSeparator = symbols.getDecimalSeparator();
     char exponent = symbols.getExponential();
-    
+
     char ch = pattern.charAt(start);
-    
+
     if (ch == decimalSeparator)
       {
         // ignore dots
         ++start;
       }
-    
+
     if (ch != exponent)
       {
         this.useExponentialNotation = false;
         return start;
       }
-    
+
     ++start;
-    
+
     this.minExponentDigits = 0;
-    
+
     int len = pattern.length();
     int i;
     for (i = start; i < len; i++)
       {
         ch = pattern.charAt(i);
-        
+
         if (ch == groupingSeparator || ch == decimalSeparator ||
             ch == digit || ch == exponent) throw new
-        IllegalArgumentException("unexpected character '" + ch + "' " + 
+        IllegalArgumentException("unexpected character '" + ch + "' " +
                                  "in exponential subpattern. Position: " + i);
-        
+
         if (ch == zero)
           {
             this.minExponentDigits++;
@@ -1605,18 +1605,18 @@ public class DecimalFormat extends NumberFormat
             break;
           }
       }
-    
-    this.useExponentialNotation = true; 
-    
+
+    this.useExponentialNotation = true;
+
     return i;
   }
-  
+
   /**
    * Scan the given string for number patterns, starting
    * from start.
    * This method searches the negative part of the pattern only and scan
    * throught the end of the string.
-   * 
+   *
    * @param pattern The pattern string to parse.
    * @param start The starting parse position in the string.
    */
@@ -1625,7 +1625,7 @@ public class DecimalFormat extends NumberFormat
                                    int start)
   {
     StringBuilder buffer = new StringBuilder();
-    
+
     // the number portion is always delimited by one of those
     // characters
     char decimalSeparator = sourceSymbols.getDecimalSeparator();
@@ -1634,35 +1634,35 @@ public class DecimalFormat extends NumberFormat
     char digit = sourceSymbols.getDigit();
     char zero = sourceSymbols.getZeroDigit();
     char minus = sourceSymbols.getMinusSign();
-    
+
     // other special charcaters, cached here to avoid method calls later
     char percent = sourceSymbols.getPercent();
     char permille = sourceSymbols.getPerMill();
-    
+
     String CURRENCY_SYMBOL = this.symbols.getCurrencySymbol();
     String currencySymbol = CURRENCY_SYMBOL;
-    
+
     boolean quote = false;
     boolean prefixDone = false;
-    
+
     int len = pattern.length();
     if (len > 0) this.hasNegativePrefix = true;
-    
+
     char ch = pattern.charAt(start);
     if (ch == patternSeparator)
       {
         // no pattern separator in the negative pattern
         if ((start + 1) > len) throw new
           IllegalArgumentException("unexpected character '" + ch + "' " +
-                                   "in negative subpattern.");    
+                                   "in negative subpattern.");
         start++;
       }
-    
+
     int i;
     for (i = start; i < len; i++)
       {
         ch = pattern.charAt(i);
-        
+
         // this means we are inside the number portion
         if (!quote &&
             (ch == digit || ch == zero || ch == decimalSeparator ||
@@ -1699,7 +1699,7 @@ public class DecimalFormat extends NumberFormat
             // change prefix and suffix, so leave it as commented
             // unless in case of bug report/errors
             //this.useCurrencySeparator = true;
-            
+
             buffer.append(currencySymbol);
           }
         else if (ch == percent)
@@ -1719,7 +1719,7 @@ public class DecimalFormat extends NumberFormat
             // QUOTE
             if ((i + 1) < len && pattern.charAt(i + 1) == '\'')
               {
-                // we need to add ' to the buffer 
+                // we need to add ' to the buffer
                 buffer.append(ch);
                 i++;
               }
@@ -1739,25 +1739,25 @@ public class DecimalFormat extends NumberFormat
             buffer.append(ch);
           }
       }
-    
+
     if (prefixDone)
       this.negativeSuffix = buffer.toString();
     else
       this.negativePrefix = buffer.toString();
   }
-  
+
   /* ****** FORMATTING ****** */
-  
+
   /**
    * Handles the real formatting.
-   * 
+   *
    * We use a BigDecimal to format the number without precision loss.
    * All the rounding is done by methods in BigDecimal.
    * The isLong parameter is used to determine if we are
    * formatting a long or BigInteger. In this case, we avoid to format
    * the fractional part of the number (unless specified otherwise in the
    * format string) that would consist only of a 0 digit.
-   * 
+   *
    * @param number A BigDecimal representation fo the input number.
    * @param dest The destination buffer.
    * @param isLong A boolean that indicates if this BigDecimal is a real
@@ -1766,7 +1766,7 @@ public class DecimalFormat extends NumberFormat
    */
   private void formatInternal(BigDecimal number, boolean isLong,
                               StringBuffer dest, FieldPosition fieldPos)
-  {  
+  {
     // The specs says that fieldPos should not be null, and that we
     // should throw a NPE, but it seems that in few classes that
     // reference this one, fieldPos is set to null.
@@ -1775,28 +1775,28 @@ public class DecimalFormat extends NumberFormat
     // null. If it cause harms or regressions, just remove this line and
     // fix the classes in the point of call, insted.
     if (fieldPos == null) fieldPos = new FieldPosition(0);
-    
+
     int _multiplier = this.multiplier;
-    
+
     // used to track attribute starting position for each attribute
     int attributeStart = -1;
-    
+
     // now get the sign this will be used by the special case Inifinity
     // and by the normal cases.
     boolean isNegative = (number.signum() < 0) ? true : false;
     if (isNegative)
       {
         attributeStart = dest.length();
-        
+
         // append the negative prefix to the string
         dest.append(negativePrefix);
-        
+
         // once got the negative prefix, we can use
         // the absolute value.
         number = number.abs();
-        
+
         _multiplier = negativePatternMultiplier;
-        
+
         addAttribute(Field.SIGN, attributeStart, dest.length());
       }
     else
@@ -1804,16 +1804,16 @@ public class DecimalFormat extends NumberFormat
         // not negative, use the positive prefix
         dest.append(positivePrefix);
       }
-    
+
     // these are used ot update the field position
     int beginIndexInt = dest.length();
     int endIndexInt = 0;
     int beginIndexFract = 0;
     int endIndexFract = 0;
-    
+
     // compute the multiplier to use with percent and similar
     number = number.multiply(BigDecimal.valueOf(_multiplier));
-    
+
     // XXX: special case, not sure if it belongs here or if it is
     // correct at all. There may be other special cases as well
     // these should be handled in the format string parser.
@@ -1823,54 +1823,54 @@ public class DecimalFormat extends NumberFormat
         this.maximumIntegerDigits = 1;
         this.minimumIntegerDigits = 1;
       }
-    
+
     //  get the absolute number
     number = number.abs();
 
     // the scaling to use while formatting this number
     int scale = this.maximumFractionDigits;
-    
+
     // this is the actual number we will use
     // it is corrected later on to handle exponential
     // notation, if needed
     long exponent = 0;
-    
+
     // are we using exponential notation?
     if (this.useExponentialNotation)
       {
         exponent = getExponent(number);
         number = number.movePointLeft((int) exponent);
-        
+
         // FIXME: this makes the test ##.###E0 to pass,
         // but all all the other tests to fail...
         // this should be really something like
         // min + max - what is already shown...
         //scale = this.minimumIntegerDigits + this.maximumFractionDigits;
       }
-    
+
     // round the number to the nearest neighbor
     number = number.setScale(scale, BigDecimal.ROUND_HALF_EVEN);
 
     // now get the integer and fractional part of the string
     // that will be processed later
     String plain = number.toPlainString();
-    
+
     String intPart = null;
     String fractPart = null;
-    
+
     // remove - from the integer part, this is needed as
     // the Narrowing Primitive Conversions algorithm used may loose
     // information about the sign
     int minusIndex = plain.lastIndexOf('-', 0);
     if (minusIndex > -1) plain = plain.substring(minusIndex + 1);
-    
+
     // strip the decimal portion
     int dot = plain.indexOf('.');
     if (dot > -1)
       {
         intPart = plain.substring(0, dot);
         dot++;
-        
+
         if (useExponentialNotation)
           fractPart = plain.substring(dot, dot + scale);
         else
@@ -1880,11 +1880,11 @@ public class DecimalFormat extends NumberFormat
       {
         intPart = plain;
       }
-    
+
     // used in various places later on
     int intPartLen = intPart.length();
     endIndexInt = intPartLen;
-    
+
     // if the number of digits in our intPart is not greater than the
     // minimum we have to display, we append zero to the destination
     // buffer before adding the integer portion of the number.
@@ -1901,7 +1901,7 @@ public class DecimalFormat extends NumberFormat
         // the sum of the minimum integer and maximum fraction
         // digits, and does not take into account the maximun integer
         // digits to display.
-        
+
         if (attributeStart < 0)
           attributeStart = Math.max(dest.length() - 1, 0);
         appendDigit(intPart, dest, this.groupingUsed);
@@ -1911,12 +1911,12 @@ public class DecimalFormat extends NumberFormat
         // non exponential notation
         intPartLen = intPart.length();
         int canary = Math.min(intPartLen, this.maximumIntegerDigits);
-        
+
         // remove from the string the number in excess
         // use only latest digits
         intPart = intPart.substring(intPartLen - canary);
         endIndexInt = intPart.length() + 1;
-        
+
         // append it
         if (maximumIntegerDigits > 0 &&
             !(this.minimumIntegerDigits == 0 &&
@@ -1927,10 +1927,10 @@ public class DecimalFormat extends NumberFormat
             appendDigit(intPart, dest, this.groupingUsed);
           }
       }
-    
+
     // add the INTEGER attribute
     addAttribute(Field.INTEGER, attributeStart, dest.length());
-    
+
     // ...update field position, if needed, and return...
     if ((fieldPos.getField() == INTEGER_FIELD ||
         fieldPos.getFieldAttribute() == NumberFormat.Field.INTEGER))
@@ -1938,41 +1938,41 @@ public class DecimalFormat extends NumberFormat
         fieldPos.setBeginIndex(beginIndexInt);
         fieldPos.setEndIndex(endIndexInt);
       }
-    
+
     handleFractionalPart(dest, fractPart, fieldPos, isLong);
-        
+
     // and the exponent
     if (this.useExponentialNotation)
       {
         attributeStart = dest.length();
-        
+
         dest.append(symbols.getExponential());
-        
+
         addAttribute(Field.EXPONENT_SYMBOL, attributeStart, dest.length());
         attributeStart = dest.length();
-        
+
         if (exponent < 0)
           {
             dest.append(symbols.getMinusSign());
             exponent = -exponent;
-            
+
             addAttribute(Field.EXPONENT_SIGN, attributeStart, dest.length());
           }
-        
+
         attributeStart = dest.length();
-        
+
         String exponentString = String.valueOf(exponent);
         int exponentLength = exponentString.length();
-        
+
         for (int i = 0; i < minExponentDigits - exponentLength; i++)
           dest.append(symbols.getZeroDigit());
-        
+
         for (int i = 0; i < exponentLength; ++i)
           dest.append(exponentString.charAt(i));
-        
+
         addAttribute(Field.EXPONENT, attributeStart, dest.length());
       }
- 
+
     // now include the suffixes...
     if (isNegative)
       {
@@ -1987,7 +1987,7 @@ public class DecimalFormat extends NumberFormat
   /**
    * Add to the input buffer the result of formatting the fractional
    * portion of the number.
-   * 
+   *
    * @param dest
    * @param fractPart
    * @param fieldPos
@@ -1999,46 +1999,46 @@ public class DecimalFormat extends NumberFormat
     int dotStart = 0;
     int dotEnd = 0;
     boolean addDecimal = false;
-    
+
     if (this.decimalSeparatorAlwaysShown  ||
          ((!isLong || this.useExponentialNotation) &&
            this.showDecimalSeparator && this.maximumFractionDigits > 0) ||
         this.minimumFractionDigits > 0)
       {
         dotStart = dest.length();
-        
+
         if (this.useCurrencySeparator)
           dest.append(symbols.getMonetaryDecimalSeparator());
         else
           dest.append(symbols.getDecimalSeparator());
-        
+
         dotEnd = dest.length();
         addDecimal = true;
       }
-    
+
     // now handle the fraction portion of the number
     int fractStart = 0;
     int fractEnd = 0;
     boolean addFractional = false;
-    
+
     if ((!isLong || this.useExponentialNotation)
         && this.maximumFractionDigits > 0
         || this.minimumFractionDigits > 0)
       {
         fractStart = dest.length();
         fractEnd = fractStart;
-        
+
         int digits = this.minimumFractionDigits;
-        
+
         if (this.useExponentialNotation)
           {
             digits = (this.minimumIntegerDigits + this.minimumFractionDigits)
               - dest.length();
             if (digits < 0) digits = 0;
           }
-        
+
         fractPart = adjustTrailingZeros(fractPart, digits);
-        
+
         // FIXME: this code must be improved
         // now check if the factional part is just 0, in this case
         // we need to remove the '.' unless requested
@@ -2049,12 +2049,12 @@ public class DecimalFormat extends NumberFormat
             if (fracts[i] != '0')
               allZeros = false;
           }
-        
+
         if (!allZeros || (minimumFractionDigits > 0))
           {
             appendDigit(fractPart, dest, false);
             fractEnd = dest.length();
-            
+
             addDecimal = true;
             addFractional = true;
           }
@@ -2069,13 +2069,13 @@ public class DecimalFormat extends NumberFormat
             addFractional = true;
           }
       }
-    
+
     if (addDecimal)
       addAttribute(Field.DECIMAL_SEPARATOR, dotStart, dotEnd);
-    
+
     if (addFractional)
       addAttribute(Field.FRACTION, fractStart, fractEnd);
-    
+
     if ((fieldPos.getField() == FRACTION_FIELD ||
         fieldPos.getFieldAttribute() == NumberFormat.Field.FRACTION))
       {
@@ -2083,7 +2083,7 @@ public class DecimalFormat extends NumberFormat
         fieldPos.setEndIndex(fractEnd);
       }
   }
-  
+
   /**
    * Append to destthe give number of zeros.
    * Grouping is added if needed.
@@ -2094,7 +2094,7 @@ public class DecimalFormat extends NumberFormat
   {
     char ch = symbols.getZeroDigit();
     char gSeparator = symbols.getGroupingSeparator();
-    
+
     int i = 0;
     int gPos = totalDigitCount;
     for (i = 0; i < zeroes; i++, gPos--)
@@ -2103,20 +2103,20 @@ public class DecimalFormat extends NumberFormat
             (this.groupingUsed && this.groupingSize != 0) &&
             (gPos % groupingSize == 0 && i > 0))
           dest.append(gSeparator);
-        
+
         dest.append(ch);
       }
-    
+
     // special case, that requires adding an additional separator
     if (this.groupingSeparatorInPattern &&
         (this.groupingUsed && this.groupingSize != 0) &&
         (gPos % groupingSize == 0))
       dest.append(gSeparator);
   }
-  
+
   /**
    * Append src to dest.
-   * 
+   *
    * Grouping is added if groupingUsed is set
    * to true.
    */
@@ -2124,10 +2124,10 @@ public class DecimalFormat extends NumberFormat
                              boolean groupingUsed)
   {
     int zero = symbols.getZeroDigit() - '0';
-    
+
     int ch;
     char gSeparator = symbols.getGroupingSeparator();
-        
+
     int len = src.length();
     for (int i = 0, gPos = len; i < len; i++, gPos--)
       {
@@ -2139,7 +2139,7 @@ public class DecimalFormat extends NumberFormat
         dest.append((char) (zero + ch));
       }
   }
-  
+
   /**
    * Calculate the exponent to use if eponential notation is used.
    * The exponent is calculated as a power of ten.
@@ -2149,15 +2149,15 @@ public class DecimalFormat extends NumberFormat
   private long getExponent(BigDecimal number)
   {
     long exponent = 0;
-    
+
     if (number.signum() > 0)
       {
         double _number = number.doubleValue();
         exponent = (long) Math.floor (Math.log10(_number));
-        
+
         // get the right value for the exponent
         exponent = exponent - (exponent % this.exponentRound);
-        
+
         // if the minimumIntegerDigits is more than zero
         // we display minimumIntegerDigits of digits.
         // so, for example, if minimumIntegerDigits == 2
@@ -2168,31 +2168,31 @@ public class DecimalFormat extends NumberFormat
         if (minimumIntegerDigits > 0)
               exponent -= minimumIntegerDigits - 1;
       }
-    
+
     return exponent;
   }
- 
+
   /**
    * Remove contiguos zeros from the end of the src string,
    * if src contains more than minimumDigits digits.
    * if src contains less that minimumDigits,
    * then append zeros to the string.
-   * 
+   *
    * Only the first block of zero digits is removed from the string
    * and only if they fall in the src.length - minimumDigits
    * portion of the string.
-   * 
+   *
    * @param src The string with the correct number of zeros.
    */
   private String adjustTrailingZeros(String src, int minimumDigits)
   {
     int len = src.length();
     String result;
-    
+
     // remove all trailing zero
     if (len > minimumDigits)
       {
-        int zeros = 0;    
+        int zeros = 0;
         for (int i = len - 1; i > minimumDigits; i--)
           {
             if (src.charAt(i) == '0')
@@ -2200,7 +2200,7 @@ public class DecimalFormat extends NumberFormat
             else
               break;
           }
-        result =  src.substring(0, len - zeros);                
+        result =  src.substring(0, len - zeros);
       }
     else
       {
@@ -2212,13 +2212,13 @@ public class DecimalFormat extends NumberFormat
           }
         result = _result.toString();
       }
-    
+
     return result;
   }
-  
+
   /**
    * Adds an attribute to the attributes list.
-   * 
+   *
    * @param field
    * @param begin
    * @param end
@@ -2229,13 +2229,13 @@ public class DecimalFormat extends NumberFormat
      * This method and its implementation derives directly from the
      * ICU4J (http://icu.sourceforge.net/) library, distributed under MIT/X.
      */
-    
+
     FieldPosition pos = new FieldPosition(field);
     pos.setBeginIndex(begin);
     pos.setEndIndex(end);
     attributes.add(pos);
   }
-  
+
   /**
    * Sets the default values for the various properties in this DecimaFormat.
    */
@@ -2245,34 +2245,34 @@ public class DecimalFormat extends NumberFormat
     // the most appropriate for them for any locale.
     // Anyway, these seem to be good values for a default in most languages.
     // Note that most of these will change based on the format string.
-    
+
     this.negativePrefix = String.valueOf(symbols.getMinusSign());
     this.negativeSuffix = "";
     this.positivePrefix = "";
     this.positiveSuffix = "";
-    
+
     this.multiplier = 1;
     this.negativePatternMultiplier = 1;
     this.exponentRound = 1;
-    
+
     this.hasNegativePrefix = false;
-    
+
     this.minimumIntegerDigits = 1;
     this.maximumIntegerDigits = DEFAULT_INTEGER_DIGITS;
     this.minimumFractionDigits = 0;
     this.maximumFractionDigits = DEFAULT_FRACTION_DIGITS;
     this.minExponentDigits = 0;
-    
+
     this.groupingSize = 0;
-    
+
     this.decimalSeparatorAlwaysShown = false;
     this.showDecimalSeparator = false;
     this.useExponentialNotation = false;
     this.groupingUsed = false;
     this.groupingSeparatorInPattern = false;
-    
+
     this.useCurrencySeparator = false;
-    
+
     this.hasFractionalPattern = false;
   }
 }
diff --git a/libjava/classpath/java/text/DecimalFormatSymbols.java b/libjava/classpath/java/text/DecimalFormatSymbols.java
index b7edf39c45e..fa33f34e44c 100644
--- a/libjava/classpath/java/text/DecimalFormatSymbols.java
+++ b/libjava/classpath/java/text/DecimalFormatSymbols.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -53,7 +53,7 @@ import java.util.ResourceBundle;
 import java.util.ServiceLoader;
 
 /**
- * This class is a container for the symbols used by 
+ * This class is a container for the symbols used by
  * DecimalFormat to format numbers and currency
  * for a particular locale.  These are
  * normally handled automatically, but an application can override
@@ -79,7 +79,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
       }
     catch(CloneNotSupportedException e)
       {
-	return null;
+        return null;
       }
   }
 
@@ -110,13 +110,13 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
   {
     if (bundle != null)
       {
-	try
-	  {
-	    return bundle.getString(name);
-	  }
-	catch (MissingResourceException x)
-	  {
-	  }
+        try
+          {
+            return bundle.getString(name);
+          }
+        catch (MissingResourceException x)
+          {
+          }
       }
     return def;
   }
@@ -127,13 +127,13 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
     String r = null;
     if (bundle != null)
       {
-	try
-	  {
-	    r = bundle.getString(name);
-	  }
-	catch (MissingResourceException x)
-	  {
-	  }
+        try
+          {
+            r = bundle.getString(name);
+          }
+        catch (MissingResourceException x)
+          {
+          }
       }
     if (r == null || r.length() < 1)
       return def;
@@ -163,12 +163,12 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
 
     try
       {
-	res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-		loc, ClassLoader.getSystemClassLoader());
+        res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+                loc, ClassLoader.getSystemClassLoader());
       }
     catch (MissingResourceException x)
       {
-	res = null;
+        res = null;
       }
     locale = loc;
     currency = Currency.getInstance("XXX");
@@ -176,15 +176,15 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
     intlCurrencySymbol = "XXX";
     try
       {
-	Currency localeCurrency = Currency.getInstance(loc);
-	if (localeCurrency != null)
-	  {
-	    setCurrency(localeCurrency);
-	  }
+        Currency localeCurrency = Currency.getInstance(loc);
+        if (localeCurrency != null)
+          {
+            setCurrency(localeCurrency);
+          }
       }
     catch(IllegalArgumentException exception)
       {
-	/* Locale has an invalid currency */
+        /* Locale has an invalid currency */
       }
     decimalSeparator = safeGetChar (res, "decimalSeparator", '.');
     digit = safeGetChar (res, "digit", '#');
@@ -193,11 +193,11 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
     infinity = safeGetString (res, "infinity", "\u221e");
     try
       {
-	monetarySeparator = safeGetChar (res, "monetarySeparator", '.');
+        monetarySeparator = safeGetChar (res, "monetarySeparator", '.');
       }
     catch (MissingResourceException x)
       {
-	monetarySeparator = decimalSeparator;
+        monetarySeparator = decimalSeparator;
       }
     minusSign = safeGetChar (res, "minusSign", '-');
     NaN = safeGetString (res, "NaN", "\ufffd");
@@ -227,19 +227,19 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
       return false;
     DecimalFormatSymbols dfs = (DecimalFormatSymbols) obj;
     return (currencySymbol.equals(dfs.currencySymbol)
-	    && decimalSeparator == dfs.decimalSeparator
-	    && digit == dfs.digit
-	    && exponential == dfs.exponential
-	    && groupingSeparator == dfs.groupingSeparator
-	    && infinity.equals(dfs.infinity)
-	    && intlCurrencySymbol.equals(dfs.intlCurrencySymbol)
-	    && minusSign == dfs.minusSign
-	    && monetarySeparator == dfs.monetarySeparator
-	    && NaN.equals(dfs.NaN)
-	    && patternSeparator == dfs.patternSeparator
-	    && percent == dfs.percent
-	    && perMill == dfs.perMill
-	    && zeroDigit == dfs.zeroDigit);
+            && decimalSeparator == dfs.decimalSeparator
+            && digit == dfs.digit
+            && exponential == dfs.exponential
+            && groupingSeparator == dfs.groupingSeparator
+            && infinity.equals(dfs.infinity)
+            && intlCurrencySymbol.equals(dfs.intlCurrencySymbol)
+            && minusSign == dfs.minusSign
+            && monetarySeparator == dfs.monetarySeparator
+            && NaN.equals(dfs.NaN)
+            && patternSeparator == dfs.patternSeparator
+            && percent == dfs.percent
+            && perMill == dfs.perMill
+            && zeroDigit == dfs.zeroDigit);
   }
 
   /**
@@ -281,7 +281,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
    * format pattern string.
    *
    * @return The character used to represent a digit in a format
-   * pattern string. 
+   * pattern string.
    */
   public char getDigit ()
   {
@@ -503,7 +503,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
    * used for the currency attribute, and the currency symbol
    * is set to the corresponding value from this instance.
    * Otherwise, the currency attribute is set to null and the
-   * symbol is left unmodified. 
+   * symbol is left unmodified.
    *
    * @param currencyCode The new international currency symbol.
    */
@@ -512,11 +512,11 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
     intlCurrencySymbol = currencyCode;
     try
       {
-	currency = Currency.getInstance(currencyCode);
+        currency = Currency.getInstance(currencyCode);
       }
     catch (IllegalArgumentException exception)
       {
-	currency = null;
+        currency = null;
       }
     if (currency != null)
       {
@@ -538,7 +538,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
    * This method sets the character used for the decimal point in currency
    * values.
    *
-   * @param decimalSep The decimal point character used in currency values. 
+   * @param decimalSep The decimal point character used in currency values.
    */
   public void setMonetaryDecimalSeparator (char decimalSep)
   {
@@ -547,7 +547,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
 
   /**
    * This method sets the string used to represent the NaN (not a
-   * number) value. 
+   * number) value.
    *
    * @param nan The string used to represent NaN
    */
@@ -692,10 +692,10 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
     if (serialVersionOnStream < 1)
       {
         monetarySeparator = decimalSeparator;
-	exponential = 'E';
+        exponential = 'E';
       }
     if (serialVersionOnStream < 2)
-	locale = Locale.getDefault();
+        locale = Locale.getDefault();
 
     serialVersionOnStream = 2;
   }
@@ -707,7 +707,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
    * {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
    * This is equivalent to calling
    * getInstance(Locale.getDefault()).
-   * 
+   *
    * @return a {@link DecimalFormatSymbols} instance for the default
    *         locale.
    * @since 1.6
@@ -722,7 +722,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
    * specified locale obtained from either the runtime itself
    * or one of the installed
    * {@link java.text.spi.DecimalFormatSymbolsProvider} instances.
-   * 
+   *
    * @param locale the locale for which an instance should be
    *               returned.
    * @return a {@link DecimalFormatSymbols} instance for the specified
@@ -735,30 +735,30 @@ public class DecimalFormatSymbols implements Cloneable, Serializable
   {
     try
       {
-	if (!locale.equals(Locale.ROOT))
-	  ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-				   locale,
-				   ClassLoader.getSystemClassLoader());
-	return new DecimalFormatSymbols(locale);	
+        if (!locale.equals(Locale.ROOT))
+          ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
+                                   locale,
+                                   ClassLoader.getSystemClassLoader());
+        return new DecimalFormatSymbols(locale);
       }
     catch (MissingResourceException x)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (DecimalFormatSymbolsProvider p :
-	   ServiceLoader.load(DecimalFormatSymbolsProvider.class))
+           ServiceLoader.load(DecimalFormatSymbolsProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		DecimalFormatSymbols syms = p.getInstance(locale);
-		if (syms != null)
-		  return syms;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                DecimalFormatSymbols syms = p.getInstance(locale);
+                if (syms != null)
+                  return syms;
+                break;
+              }
+          }
       }
     return getInstance(LocaleHelper.getFallbackLocale(locale));
   }
diff --git a/libjava/classpath/java/text/FieldPosition.java b/libjava/classpath/java/text/FieldPosition.java
index 427c07e8e11..3a92a677861 100644
--- a/libjava/classpath/java/text/FieldPosition.java
+++ b/libjava/classpath/java/text/FieldPosition.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -169,14 +169,14 @@ public class FieldPosition
    * 
                
    * 
              • The specified object is not null.
    * 
              • The specified object has the same class as this object.
-   * 
              • The specified object has the same field identifier, field attribute 
+   * 
              • The specified object has the same field identifier, field attribute
    * and beginning and ending index as this object.
    * 
              
    *
    * @param obj The object to test for equality to this object.
    *
    * @return true if the specified object is equal to
-   * this object, false otherwise. 
+   * this object, false otherwise.
    */
   public boolean equals (Object obj)
   {
@@ -188,17 +188,17 @@ public class FieldPosition
 
     FieldPosition fp = (FieldPosition) obj;
     return (field_id == fp.field_id
-	    && (field_attribute == fp.field_attribute 
-		|| (field_attribute != null 
-		    && field_attribute.equals(fp.field_attribute)))
-	    && begin == fp.begin
-	    && end == fp.end);
+            && (field_attribute == fp.field_attribute
+                || (field_attribute != null
+                    && field_attribute.equals(fp.field_attribute)))
+            && begin == fp.begin
+            && end == fp.end);
   }
 
 
   /**
    * This method returns a hash value for this object
-   * 
+   *
    * @return A hash value for this object.
    */
   public int hashCode ()
@@ -208,7 +208,7 @@ public class FieldPosition
     hash = 31 * hash + field_id;
     hash = 31 * hash + begin;
     hash = 31 * hash + end;
-    hash = 31 * hash + 
+    hash = 31 * hash +
       (null == field_attribute ? 0 : field_attribute.hashCode());
 
     return hash;
@@ -223,10 +223,10 @@ public class FieldPosition
   public String toString ()
   {
     return (getClass ().getName ()
-	    + "[field=" + getField ()
-	    + ",attribute=" + getFieldAttribute ()
-	    + ",beginIndex=" + getBeginIndex () 
-	    + ",endIndex=" + getEndIndex () 
-	    + "]");
+            + "[field=" + getField ()
+            + ",attribute=" + getFieldAttribute ()
+            + ",beginIndex=" + getBeginIndex ()
+            + ",endIndex=" + getEndIndex ()
+            + "]");
   }
 }
diff --git a/libjava/classpath/java/text/Format.java b/libjava/classpath/java/text/Format.java
index 7159f468552..29edf055238 100644
--- a/libjava/classpath/java/text/Format.java
+++ b/libjava/classpath/java/text/Format.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,16 +44,16 @@ import java.io.Serializable;
 
 /**
  * This class is the abstract superclass of classes that format and parse
- * data to/from Strings.  It is guaranteed that any 
+ * data to/from Strings.  It is guaranteed that any
  * String produced by a concrete subclass of Format
  * will be parseable by that same subclass.
  * 
              
  * In addition to implementing the abstract methods in this class, subclasses
- * should provide static factory methods of the form 
+ * should provide static factory methods of the form
  * getInstance() and getInstance(Locale) if the
  * subclass loads different formatting/parsing schemes based on locale.
  * These subclasses should also implement a static method called
- * getAvailableLocales() which returns an array of 
+ * getAvailableLocales() which returns an array of
  * available locales in the current runtime environment.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -69,13 +69,13 @@ public abstract class Format implements Serializable, Cloneable
   public static class Field extends AttributedCharacterIterator.Attribute
   {
     static final long serialVersionUID = 276966692217360283L;
-   
+
     protected Field(String name)
     {
       super(name);
     }
   }
-  
+
   /**
    * This method initializes a new instance of Format.
    * It performs no actions, but acts as a default constructor for
@@ -87,13 +87,13 @@ public abstract class Format implements Serializable, Cloneable
 
   /**
    * This method formats an Object into a String.
-   * 
+   *
    * @param obj The Object to format.
    *
    * @return The formatted String.
    *
    * @exception IllegalArgumentException If the Object
-   * cannot be formatted. 
+   * cannot be formatted.
    */
   public final String format(Object obj) throws IllegalArgumentException
   {
@@ -109,19 +109,19 @@ public abstract class Format implements Serializable, Cloneable
    * @param obj The Object to format.
    * @param sb The StringBuffer to append to.
    * @param pos The desired FieldPosition, which is also
-   *            updated by this call. 
+   *            updated by this call.
    *
    * @return The updated StringBuffer.
    *
    * @exception IllegalArgumentException If the Object
-   * cannot be formatted. 
+   * cannot be formatted.
    */
   public abstract StringBuffer format (Object obj, StringBuffer sb,
-				       FieldPosition pos)
+                                       FieldPosition pos)
     throws IllegalArgumentException;
 
   /**
-   * This method parses a String and converts the parsed 
+   * This method parses a String and converts the parsed
    * contents into an Object.
    *
    * @param str The String to parse.
@@ -136,21 +136,21 @@ public abstract class Format implements Serializable, Cloneable
     Object result = parseObject (str, pos);
     if (result == null)
       {
-	int index = pos.getErrorIndex();
-	if (index < 0)
-	  index = pos.getIndex();
-	throw new ParseException("parseObject failed", index);
+        int index = pos.getErrorIndex();
+        if (index < 0)
+          index = pos.getIndex();
+        throw new ParseException("parseObject failed", index);
       }
     return result;
   }
 
   /**
    * This method parses a String and converts the parsed
-   * contents into an Object. 
+   * contents into an Object.
    *
    * @param str The String to parse.
    * @param pos The starting parse index on input, the ending parse
-   *            index on output. 
+   *            index on output.
    *
    * @return The parsed Object, or null in
    *         case of error.
@@ -171,11 +171,11 @@ public abstract class Format implements Serializable, Cloneable
   {
     try
       {
-	return super.clone ();
+        return super.clone ();
       }
     catch (CloneNotSupportedException e)
       {
-	return null;
+        return null;
       }
   }
 }
diff --git a/libjava/classpath/java/text/MessageFormat.java b/libjava/classpath/java/text/MessageFormat.java
index 700b187fefd..ba5805aa0b9 100644
--- a/libjava/classpath/java/text/MessageFormat.java
+++ b/libjava/classpath/java/text/MessageFormat.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -99,7 +99,7 @@ public class MessageFormat extends Format
               else if (style.equals("percent"))
                 format = NumberFormat.getPercentInstance(loc);
               else if (style.equals("integer"))
-		format = NumberFormat.getIntegerInstance(loc);
+                format = NumberFormat.getIntegerInstance(loc);
               else
                 {
                   format = NumberFormat.getNumberInstance(loc);
@@ -126,7 +126,7 @@ public class MessageFormat extends Format
                   else
                     styleIsPattern = true;
                 }
-          
+
               if (type.equals("time"))
                 format = DateFormat.getTimeInstance(val, loc);
               else
@@ -169,7 +169,7 @@ public class MessageFormat extends Format
     {
       super("");
     }
-    
+
     protected Field(String s)
     {
       super(s);
@@ -184,7 +184,7 @@ public class MessageFormat extends Format
     protected Object readResolve() throws InvalidObjectException
     {
       if (getName().equals(ARGUMENT.getName()))
-	return ARGUMENT;
+        return ARGUMENT;
 
       throw new InvalidObjectException("no such MessageFormat field called " + getName());
     }
@@ -201,30 +201,30 @@ public class MessageFormat extends Format
     boolean quoted = false;
     for (; index < max; ++index)
       {
-	char c = pat.charAt(index);
-	if (quoted)
-	  {
-	    // In a quoted context, a single quote ends the quoting.
-	    if (c == '\'')
-	      quoted = false;
-	    else
-	      buffer.append(c);
-	  }
-	// Check for '', which is a single quote.
-	else if (c == '\'' && index + 1 < max && pat.charAt(index + 1) == '\'')
-	  {
-	    buffer.append(c);
-	    ++index;
-	  }
-	else if (c == '\'')
-	  {
-	    // Start quoting.
-	    quoted = true;
-	  }
-	else if (c == '{')
-	  break;
-	else
-	  buffer.append(c);
+        char c = pat.charAt(index);
+        if (quoted)
+          {
+            // In a quoted context, a single quote ends the quoting.
+            if (c == '\'')
+              quoted = false;
+            else
+              buffer.append(c);
+          }
+        // Check for '', which is a single quote.
+        else if (c == '\'' && index + 1 < max && pat.charAt(index + 1) == '\'')
+          {
+            buffer.append(c);
+            ++index;
+          }
+        else if (c == '\'')
+          {
+            // Start quoting.
+            quoted = true;
+          }
+        else if (c == '{')
+          break;
+        else
+          buffer.append(c);
       }
     // Note that we explicitly allow an unterminated quote.  This is
     // done for compatibility.
@@ -243,38 +243,38 @@ public class MessageFormat extends Format
 
     for (; index < max; ++index)
       {
-	char c = pat.charAt(index);
-	// First see if we should turn off quoting.
-	if (quoted)
-	  {
-	    if (c == '\'')
-	      quoted = false;
-	    // In both cases we fall through to inserting the
-	    // character here.
-	  }
-	// See if we have just a plain quote to insert.
-	else if (c == '\'' && index + 1 < max
-		 && pat.charAt(index + 1) == '\'')
-	  {
-	    buffer.append(c);
-	    ++index;
-	  }
-	// See if quoting should turn on.
-	else if (c == '\'')
-	  quoted = true;
-	else if (c == '{')
-	  ++brace_depth;
-	else if (c == '}')
-	  {
-	    if (--brace_depth == 0)
-	      break;
-	  }
-	// Check for TERM after braces, because TERM might be `}'.
-	else if (c == term)
-	  break;
-	// All characters, including opening and closing quotes, are
-	// inserted here.
-	buffer.append(c);
+        char c = pat.charAt(index);
+        // First see if we should turn off quoting.
+        if (quoted)
+          {
+            if (c == '\'')
+              quoted = false;
+            // In both cases we fall through to inserting the
+            // character here.
+          }
+        // See if we have just a plain quote to insert.
+        else if (c == '\'' && index + 1 < max
+                 && pat.charAt(index + 1) == '\'')
+          {
+            buffer.append(c);
+            ++index;
+          }
+        // See if quoting should turn on.
+        else if (c == '\'')
+          quoted = true;
+        else if (c == '{')
+          ++brace_depth;
+        else if (c == '}')
+          {
+            if (--brace_depth == 0)
+              break;
+          }
+        // Check for TERM after braces, because TERM might be `}'.
+        else if (c == term)
+          break;
+        // All characters, including opening and closing quotes, are
+        // inserted here.
+        buffer.append(c);
       }
     return index;
   }
@@ -296,27 +296,27 @@ public class MessageFormat extends Format
     index = scanFormatElement (pat, index, buffer, ',');
     try
       {
-	mfe.argNumber = Integer.parseInt(buffer.toString());
+        mfe.argNumber = Integer.parseInt(buffer.toString());
       }
     catch (NumberFormatException nfx)
       {
-	IllegalArgumentException iae = new IllegalArgumentException(pat);
-	iae.initCause(nfx);
-	throw iae;
+        IllegalArgumentException iae = new IllegalArgumentException(pat);
+        iae.initCause(nfx);
+        throw iae;
       }
 
     // Extract the element format.
     if (index < max && pat.charAt(index) == ',')
       {
-	index = scanFormatElement (pat, index + 1, buffer, ',');
-	mfe.type = buffer.toString();
+        index = scanFormatElement (pat, index + 1, buffer, ',');
+        mfe.type = buffer.toString();
 
-	// Extract the style.
-	if (index < max && pat.charAt(index) == ',')
-	  {
-	    index = scanFormatElement (pat, index + 1, buffer, '}');
-	    mfe.style = buffer.toString ();
-	  }
+        // Extract the style.
+        if (index < max && pat.charAt(index) == ',')
+          {
+            index = scanFormatElement (pat, index + 1, buffer, '}');
+            mfe.style = buffer.toString ();
+          }
       }
 
     // Advance past the last terminator.
@@ -373,7 +373,7 @@ public class MessageFormat extends Format
       return false;
     MessageFormat mf = (MessageFormat) obj;
     return (pattern.equals(mf.pattern)
-	    && locale.equals(mf.locale));
+            && locale.equals(mf.locale));
   }
 
   /**
@@ -385,9 +385,9 @@ public class MessageFormat extends Format
   {
     Object[] arguments_array = (Object[])arguments;
     FormatCharacterIterator iterator = new FormatCharacterIterator();
-    
+
     formatInternal(arguments_array, new StringBuffer(), null, iterator);
-  
+
     return iterator;
   }
 
@@ -413,15 +413,15 @@ public class MessageFormat extends Format
    * @param fp A FieldPosition object (it is ignored).
    */
   public final StringBuffer format (Object arguments[], StringBuffer appendBuf,
-				    FieldPosition fp)
+                                    FieldPosition fp)
   {
     return formatInternal(arguments, appendBuf, fp, null);
   }
 
   private StringBuffer formatInternal (Object arguments[],
                                        StringBuffer appendBuf,
-				       FieldPosition fp,
-				       FormatCharacterIterator output_iterator)
+                                       FieldPosition fp,
+                                       FormatCharacterIterator output_iterator)
   {
     appendBuf.append(leader);
     if (output_iterator != null)
@@ -429,93 +429,93 @@ public class MessageFormat extends Format
 
     for (int i = 0; i < elements.length; ++i)
       {
-	Object thisArg = null;
-	boolean unavailable = false;
-	if (arguments == null || elements[i].argNumber >= arguments.length)
-	  unavailable = true;
-	else
-	  thisArg = arguments[elements[i].argNumber];
+        Object thisArg = null;
+        boolean unavailable = false;
+        if (arguments == null || elements[i].argNumber >= arguments.length)
+          unavailable = true;
+        else
+          thisArg = arguments[elements[i].argNumber];
 
-	AttributedCharacterIterator iterator = null;
+        AttributedCharacterIterator iterator = null;
 
-	Format formatter = null;
+        Format formatter = null;
 
-	if (fp != null && i == fp.getField() && fp.getFieldAttribute() == Field.ARGUMENT)
-	  fp.setBeginIndex(appendBuf.length());
+        if (fp != null && i == fp.getField() && fp.getFieldAttribute() == Field.ARGUMENT)
+          fp.setBeginIndex(appendBuf.length());
 
-	if (unavailable)
-	  appendBuf.append("{" + elements[i].argNumber + "}");
-	else
-	  {
-	    if (elements[i].setFormat != null)
-	      formatter = elements[i].setFormat;
-	    else if (elements[i].format != null)
-	      {
-	        if (elements[i].formatClass != null
-		    && ! elements[i].formatClass.isInstance(thisArg))
-	          throw new IllegalArgumentException("Wrong format class");
-	    
-	        formatter = elements[i].format;
-	      }
-	    else if (thisArg instanceof Number)
-	      formatter = NumberFormat.getInstance(locale);
-	    else if (thisArg instanceof Date)
-	      formatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
-	    else
-	      appendBuf.append(thisArg);
-	  }
+        if (unavailable)
+          appendBuf.append("{" + elements[i].argNumber + "}");
+        else
+          {
+            if (elements[i].setFormat != null)
+              formatter = elements[i].setFormat;
+            else if (elements[i].format != null)
+              {
+                if (elements[i].formatClass != null
+                    && ! elements[i].formatClass.isInstance(thisArg))
+                  throw new IllegalArgumentException("Wrong format class");
 
-	if (fp != null && fp.getField() == i && fp.getFieldAttribute() == Field.ARGUMENT)
-	  fp.setEndIndex(appendBuf.length());
+                formatter = elements[i].format;
+              }
+            else if (thisArg instanceof Number)
+              formatter = NumberFormat.getInstance(locale);
+            else if (thisArg instanceof Date)
+              formatter = DateFormat.getTimeInstance(DateFormat.DEFAULT, locale);
+            else
+              appendBuf.append(thisArg);
+          }
 
-	if (formatter != null)
-	  {
-	    // Special-case ChoiceFormat.
-	    if (formatter instanceof ChoiceFormat)
-	      {
-		StringBuffer buf = new StringBuffer ();
-		formatter.format(thisArg, buf, fp);
-		MessageFormat mf = new MessageFormat ();
-		mf.setLocale(locale);
-		mf.applyPattern(buf.toString());
-		mf.format(arguments, appendBuf, fp);
-	      }
-	    else
-	      {
-		if (output_iterator != null)
-		  iterator = formatter.formatToCharacterIterator(thisArg);
-		else
-		  formatter.format(thisArg, appendBuf, fp);
-	      }
+        if (fp != null && fp.getField() == i && fp.getFieldAttribute() == Field.ARGUMENT)
+          fp.setEndIndex(appendBuf.length());
 
-	    elements[i].format = formatter;
-	  }
+        if (formatter != null)
+          {
+            // Special-case ChoiceFormat.
+            if (formatter instanceof ChoiceFormat)
+              {
+                StringBuffer buf = new StringBuffer ();
+                formatter.format(thisArg, buf, fp);
+                MessageFormat mf = new MessageFormat ();
+                mf.setLocale(locale);
+                mf.applyPattern(buf.toString());
+                mf.format(arguments, appendBuf, fp);
+              }
+            else
+              {
+                if (output_iterator != null)
+                  iterator = formatter.formatToCharacterIterator(thisArg);
+                else
+                  formatter.format(thisArg, appendBuf, fp);
+              }
 
-	if (output_iterator != null)
-	  {
-	    HashMap hash_argument =
-	      new HashMap();
-	    int position = output_iterator.getEndIndex();
-	    
-	    hash_argument.put (MessageFormat.Field.ARGUMENT,
-			       Integer.valueOf(elements[i].argNumber));
+            elements[i].format = formatter;
+          }
 
-	    
-	    if (iterator != null)
-	      {
-		output_iterator.append(iterator);
-		output_iterator.addAttributes(hash_argument, position, 
-					      output_iterator.getEndIndex());
-	      }	
-	    else
-	      output_iterator.append(thisArg.toString(), hash_argument);
-	    
-	    output_iterator.append(elements[i].trailer);
-	  }
-	
-	appendBuf.append(elements[i].trailer);
+        if (output_iterator != null)
+          {
+            HashMap hash_argument =
+              new HashMap();
+            int position = output_iterator.getEndIndex();
+
+            hash_argument.put (MessageFormat.Field.ARGUMENT,
+                               Integer.valueOf(elements[i].argNumber));
+
+
+            if (iterator != null)
+              {
+                output_iterator.append(iterator);
+                output_iterator.addAttributes(hash_argument, position,
+                                              output_iterator.getEndIndex());
+              }
+            else
+              output_iterator.append(thisArg.toString(), hash_argument);
+
+            output_iterator.append(elements[i].trailer);
+          }
+
+        appendBuf.append(elements[i].trailer);
       }
-    
+
     return appendBuf;
   }
 
@@ -529,7 +529,7 @@ public class MessageFormat extends Format
    * @param fpos A FieldPosition object (it is ignored).
    */
   public final StringBuffer format (Object objectArray, StringBuffer appendBuf,
-				    FieldPosition fpos)
+                                    FieldPosition fpos)
   {
     return format ((Object[])objectArray, appendBuf, fpos);
   }
@@ -601,15 +601,15 @@ public class MessageFormat extends Format
    * @param pos the current parse position (and eventually the error position).
    * @return the array of parsed objects sorted according to their argument number
    * in the pattern.
-   */ 
+   */
   public Object[] parse (String sourceStr, ParsePosition pos)
   {
     // Check initial text.
     int index = pos.getIndex();
     if (! sourceStr.startsWith(leader, index))
       {
-	pos.setErrorIndex(index);
-	return null;
+        pos.setErrorIndex(index);
+        return null;
       }
     index += leader.length();
 
@@ -617,79 +617,79 @@ public class MessageFormat extends Format
     // Now check each format.
     for (int i = 0; i < elements.length; ++i)
       {
-	Format formatter = null;
-	if (elements[i].setFormat != null)
-	  formatter = elements[i].setFormat;
-	else if (elements[i].format != null)
-	  formatter = elements[i].format;
+        Format formatter = null;
+        if (elements[i].setFormat != null)
+          formatter = elements[i].setFormat;
+        else if (elements[i].format != null)
+          formatter = elements[i].format;
 
-	Object value = null;
-	if (formatter instanceof ChoiceFormat)
-	  {
-	    // We must special-case a ChoiceFormat because it might
-	    // have recursive formatting.
-	    ChoiceFormat cf = (ChoiceFormat) formatter;
-	    String[] formats = (String[]) cf.getFormats();
-	    double[] limits = cf.getLimits();
-	    MessageFormat subfmt = new MessageFormat ();
-	    subfmt.setLocale(locale);
-	    ParsePosition subpos = new ParsePosition (index);
+        Object value = null;
+        if (formatter instanceof ChoiceFormat)
+          {
+            // We must special-case a ChoiceFormat because it might
+            // have recursive formatting.
+            ChoiceFormat cf = (ChoiceFormat) formatter;
+            String[] formats = (String[]) cf.getFormats();
+            double[] limits = cf.getLimits();
+            MessageFormat subfmt = new MessageFormat ();
+            subfmt.setLocale(locale);
+            ParsePosition subpos = new ParsePosition (index);
 
-	    int j;
-	    for (j = 0; value == null && j < limits.length; ++j)
-	      {
-		subfmt.applyPattern(formats[j]);
-		subpos.setIndex(index);
-		value = subfmt.parse(sourceStr, subpos);
-	      }
-	    if (value != null)
-	      {
-		index = subpos.getIndex();
-		value = new Double (limits[j]);
-	      }
-	  }
-	else if (formatter != null)
-	  {
-	    pos.setIndex(index);
-	    value = formatter.parseObject(sourceStr, pos);
-	    if (value != null)
-	      index = pos.getIndex();
-	  }
-	else
-	  {
-	    // We have a String format.  This can lose in a number
-	    // of ways, but we give it a shot.
-	    int next_index;
-	    if (elements[i].trailer.length() > 0)
-	      next_index = sourceStr.indexOf(elements[i].trailer, index);
-	    else
-	      next_index = sourceStr.length();
-	    if (next_index == -1)
-	      {
-		pos.setErrorIndex(index);
-		return null;
-	      }
-	    value = sourceStr.substring(index, next_index);
-	    index = next_index;
-	  }
+            int j;
+            for (j = 0; value == null && j < limits.length; ++j)
+              {
+                subfmt.applyPattern(formats[j]);
+                subpos.setIndex(index);
+                value = subfmt.parse(sourceStr, subpos);
+              }
+            if (value != null)
+              {
+                index = subpos.getIndex();
+                value = new Double (limits[j]);
+              }
+          }
+        else if (formatter != null)
+          {
+            pos.setIndex(index);
+            value = formatter.parseObject(sourceStr, pos);
+            if (value != null)
+              index = pos.getIndex();
+          }
+        else
+          {
+            // We have a String format.  This can lose in a number
+            // of ways, but we give it a shot.
+            int next_index;
+            if (elements[i].trailer.length() > 0)
+              next_index = sourceStr.indexOf(elements[i].trailer, index);
+            else
+              next_index = sourceStr.length();
+            if (next_index == -1)
+              {
+                pos.setErrorIndex(index);
+                return null;
+              }
+            value = sourceStr.substring(index, next_index);
+            index = next_index;
+          }
 
-	if (value == null
-	    || ! sourceStr.startsWith(elements[i].trailer, index))
-	  {
-	    pos.setErrorIndex(index);
-	    return null;
-	  }
+        if (value == null
+            || ! sourceStr.startsWith(elements[i].trailer, index))
+          {
+            pos.setErrorIndex(index);
+            return null;
+          }
 
-	if (elements[i].argNumber >= results.size())
-	  {
-	    // Emulate padding behaviour of Vector.setSize() with ArrayList
-	    results.ensureCapacity(elements[i].argNumber + 1);
-	    for (int a = results.size(); a <= elements[i].argNumber; ++a)
-	      results.add(a, null);
-	  }
-	results.set(elements[i].argNumber, value);
+        if (elements[i].argNumber >= results.size())
+          {
+            // Emulate padding behaviour of Vector.setSize() with ArrayList
+            results.ensureCapacity(elements[i].argNumber + 1);
+            for (int a = results.size(); a <= elements[i].argNumber; ++a)
+              results.add(a, null);
+          }
+        results.set(elements[i].argNumber, value);
 
-	index += elements[i].trailer.length();
+        index += elements[i].trailer.length();
       }
 
     return results.toArray(new Object[results.size()]);
@@ -746,8 +746,8 @@ public class MessageFormat extends Format
     locale = loc;
     if (elements != null)
       {
-	for (int i = 0; i < elements.length; ++i)
-	  elements[i].setLocale(loc);
+        for (int i = 0; i < elements.length; ++i)
+          elements[i].setLocale(loc);
       }
   }
 
@@ -777,15 +777,15 @@ public class MessageFormat extends Format
     // First, find the greatest argument number.
     for (int i=0;i argNumMax)
-	argNumMax = elements[i].argNumber;
+        argNumMax = elements[i].argNumber;
 
     Format[] formats = new Format[argNumMax];
     for (int i=0;i
  * To create an instance of a concrete subclass of NumberFormat,
  * do not call a class constructor directly.  Instead, use one of the
- * static factory methods in this class such as 
+ * static factory methods in this class such as
  * getCurrencyInstance.
- * 
+ *
  * @author Tom Tromey (tromey@cygnus.com)
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @date March 4, 1999
@@ -195,7 +195,7 @@ public abstract class NumberFormat extends Format implements Cloneable
 
     /**
      * This function is used by the deserializer to know which object
-     * to use when it encounters an encoded NumberFormat.Field in a 
+     * to use when it encounters an encoded NumberFormat.Field in a
      * serialization stream. If the stream is valid it should return
      * one of the above field. In the other case we throw an exception.
      *
@@ -207,11 +207,11 @@ public abstract class NumberFormat extends Format implements Cloneable
     {
       String s = getName();
       for (int i = 0; i < allFields.length; i++)
-	if (s.equals(allFields[i].getName()))
-	  return allFields[i];
+        if (s.equals(allFields[i].getName()))
+          return allFields[i];
 
       throw new InvalidObjectException("no such NumberFormat field called "
-				       + s);
+                                       + s);
     }
   }
 
@@ -238,7 +238,7 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     if (obj instanceof Number)
       return format(((Number) obj).doubleValue(), sbuf, pos);
-  
+
     throw new
       IllegalArgumentException("Cannot format given Object as a Number");
   }
@@ -246,30 +246,30 @@ public abstract class NumberFormat extends Format implements Cloneable
   /**
    * This method formats the specified double and appends it to
    * a StringBuffer.
-   * 
+   *
    * @param number The double to format.
-   * @param sbuf The StringBuffer to append the formatted number 
+   * @param sbuf The StringBuffer to append the formatted number
    *             to.
    * @param pos The desired FieldPosition.
    *
    * @return The StringBuffer with the appended number.
    */
   public abstract StringBuffer format (double number,
-				       StringBuffer sbuf, FieldPosition pos);
+                                       StringBuffer sbuf, FieldPosition pos);
 
   /**
    * This method formats the specified long and appends it to
    * a StringBuffer.
-   * 
+   *
    * @param number The long to format.
-   * @param sbuf The StringBuffer to append the formatted number 
+   * @param sbuf The StringBuffer to append the formatted number
    *             to.
    * @param pos The desired FieldPosition.
    *
    * @return The StringBuffer with the appended number.
    */
   public abstract StringBuffer format (long number,
-				       StringBuffer sbuf, FieldPosition pos);
+                                       StringBuffer sbuf, FieldPosition pos);
 
   /**
    * This method tests the specified object for equality against this object.
@@ -280,14 +280,14 @@ public abstract class NumberFormat extends Format implements Cloneable
    * 
            • The specified object is an instance of NumberFormat.
    * 
    * 
              
-   * Since this method does not test much, it is highly advised that 
+   * Since this method does not test much, it is highly advised that
    * concrete subclasses override this method.
    *
    * @param obj The Object to test against equality with
-   *            this object. 
-   * 
+   *            this object.
+   *
    * @return true if the specified object is equal to
-   * this object, false otherwise. 
+   * this object, false otherwise.
    */
   public boolean equals (Object obj)
   {
@@ -295,11 +295,11 @@ public abstract class NumberFormat extends Format implements Cloneable
       return false;
     NumberFormat nf = (NumberFormat) obj;
     return (groupingUsed == nf.groupingUsed
-	    && maximumFractionDigits == nf.maximumFractionDigits
-	    && maximumIntegerDigits == nf.maximumIntegerDigits
-	    && minimumFractionDigits == nf.minimumFractionDigits
-	    && minimumIntegerDigits == nf.minimumIntegerDigits
-	    && parseIntegerOnly == nf.parseIntegerOnly);
+            && maximumFractionDigits == nf.maximumFractionDigits
+            && maximumIntegerDigits == nf.maximumIntegerDigits
+            && minimumFractionDigits == nf.minimumFractionDigits
+            && minimumIntegerDigits == nf.minimumIntegerDigits
+            && parseIntegerOnly == nf.parseIntegerOnly);
   }
 
   /**
@@ -320,18 +320,18 @@ public abstract class NumberFormat extends Format implements Cloneable
     throws MissingResourceException
   {
     if (loc.equals(Locale.ROOT))
-      return new DecimalFormat(def, DecimalFormatSymbols.getInstance(loc)); 
+      return new DecimalFormat(def, DecimalFormatSymbols.getInstance(loc));
     ResourceBundle res =
       ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-			       loc, ClassLoader.getSystemClassLoader());
+                               loc, ClassLoader.getSystemClassLoader());
     String fmt;
     try
       {
-	fmt = res == null ? def : res.getString(resource);
+        fmt = res == null ? def : res.getString(resource);
       }
     catch (MissingResourceException x)
       {
-	fmt = def;
+        fmt = def;
       }
     DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(loc);
     return new DecimalFormat (fmt, dfs);
@@ -358,36 +358,36 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     try
       {
-	NumberFormat format;
-	
-	format = computeInstance (loc, "currencyFormat",
-				  "\u00A4#,##0.00;(\u00A4#,##0.00)");
-	format.setMaximumFractionDigits(format.getCurrency().getDefaultFractionDigits());  
-	return format;
+        NumberFormat format;
+
+        format = computeInstance (loc, "currencyFormat",
+                                  "\u00A4#,##0.00;(\u00A4#,##0.00)");
+        format.setMaximumFractionDigits(format.getCurrency().getDefaultFractionDigits());
+        return format;
       }
     catch (MissingResourceException e)
       {
-	for (NumberFormatProvider p :
-	       ServiceLoader.load(NumberFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    NumberFormat nf = p.getCurrencyInstance(loc);
-		    if (nf != null)
-		      return nf;
-		    break;
-		  }
-	      }
-	  }
-	return getCurrencyInstance(LocaleHelper.getFallbackLocale(loc));
+        for (NumberFormatProvider p :
+               ServiceLoader.load(NumberFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    NumberFormat nf = p.getCurrencyInstance(loc);
+                    if (nf != null)
+                      return nf;
+                    break;
+                  }
+              }
+          }
+        return getCurrencyInstance(LocaleHelper.getFallbackLocale(loc));
       }
   }
 
   /**
    * This method returns a default instance for the default locale. This
-   * will be a concrete subclass of NumberFormat, but the 
+   * will be a concrete subclass of NumberFormat, but the
    * actual class returned is dependent on the locale.
    *
    * @return An instance of the default NumberFormat class.
@@ -399,7 +399,7 @@ public abstract class NumberFormat extends Format implements Cloneable
 
   /**
    * This method returns a default instance for the specified locale. This
-   * will be a concrete subclass of NumberFormat, but the 
+   * will be a concrete subclass of NumberFormat, but the
    * actual class returned is dependent on the locale.
    *
    * @param loc The desired locale.
@@ -417,7 +417,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * portion of a number.
    *
    * @return The maximum number of digits allowed in the fraction
-   * portion of a number. 
+   * portion of a number.
    */
   public int getMaximumFractionDigits ()
   {
@@ -429,7 +429,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * portion of a number.
    *
    * @return The maximum number of digits allowed in the integer
-   * portion of a number. 
+   * portion of a number.
    */
   public int getMaximumIntegerDigits ()
   {
@@ -441,7 +441,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * portion of a number.
    *
    * @return The minimum number of digits allowed in the fraction
-   * portion of a number. 
+   * portion of a number.
    */
   public int getMinimumFractionDigits ()
   {
@@ -453,7 +453,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * portion of a number.
    *
    * @return The minimum number of digits allowed in the integer
-   * portion of a number. 
+   * portion of a number.
    */
   public int getMinimumIntegerDigits ()
   {
@@ -462,7 +462,7 @@ public abstract class NumberFormat extends Format implements Cloneable
 
   /**
    * This method returns a default instance for the specified locale. This
-   * will be a concrete subclass of NumberFormat, but the 
+   * will be a concrete subclass of NumberFormat, but the
    * actual class returned is dependent on the locale.
    *
    * @return An instance of the default NumberFormat class.
@@ -484,25 +484,25 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     try
       {
-	return computeInstance (loc, "numberFormat", "#,##0.###");
+        return computeInstance (loc, "numberFormat", "#,##0.###");
       }
     catch (MissingResourceException e)
       {
-	for (NumberFormatProvider p :
-	       ServiceLoader.load(NumberFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    NumberFormat nf = p.getNumberInstance(loc);
-		    if (nf != null)
-		      return nf;
-		    break;
-		  }
-	      }
-	  }
-	return getNumberInstance(LocaleHelper.getFallbackLocale(loc));
+        for (NumberFormatProvider p :
+               ServiceLoader.load(NumberFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    NumberFormat nf = p.getNumberInstance(loc);
+                    if (nf != null)
+                      return nf;
+                    break;
+                  }
+              }
+          }
+        return getNumberInstance(LocaleHelper.getFallbackLocale(loc));
       }
   }
 
@@ -512,7 +512,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * but the actual class returned is dependent on the locale.
    *
    * @return An instance of an integer number formatter for the default locale.
-   * @since 1.4 
+   * @since 1.4
    */
   public static final NumberFormat getIntegerInstance()
   {
@@ -527,35 +527,35 @@ public abstract class NumberFormat extends Format implements Cloneable
    * @param locale the desired locale.
    *
    * @return An instance of an integer number formatter for the desired locale.
-   * @since 1.4 
+   * @since 1.4
    */
   public static NumberFormat getIntegerInstance(Locale locale)
   {
     try
       {
-	NumberFormat format = computeInstance (locale,
-					       "integerFormat", "#,##0");
-	format.setMaximumFractionDigits(0);
-	format.setParseIntegerOnly (true);
-	return format;
+        NumberFormat format = computeInstance (locale,
+                                               "integerFormat", "#,##0");
+        format.setMaximumFractionDigits(0);
+        format.setParseIntegerOnly (true);
+        return format;
       }
     catch (MissingResourceException e)
       {
-	for (NumberFormatProvider p :
-	       ServiceLoader.load(NumberFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(locale))
-		  {
-		    NumberFormat nf = p.getIntegerInstance(locale);
-		    if (nf != null)
-		      return nf;
-		    break;
-		  }
-	      }
-	  }
-	return getIntegerInstance(LocaleHelper.getFallbackLocale(locale));
+        for (NumberFormatProvider p :
+               ServiceLoader.load(NumberFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(locale))
+                  {
+                    NumberFormat nf = p.getIntegerInstance(locale);
+                    if (nf != null)
+                      return nf;
+                    break;
+                  }
+              }
+          }
+        return getIntegerInstance(LocaleHelper.getFallbackLocale(locale));
       }
   }
 
@@ -582,25 +582,25 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     try
       {
-	return computeInstance (loc, "percentFormat", "#,##0%");
+        return computeInstance (loc, "percentFormat", "#,##0%");
       }
     catch (MissingResourceException e)
       {
-	for (NumberFormatProvider p :
-	       ServiceLoader.load(NumberFormatProvider.class))
-	  {
-	    for (Locale l : p.getAvailableLocales())
-	      {
-		if (l.equals(loc))
-		  {
-		    NumberFormat nf = p.getPercentInstance(loc);
-		    if (nf != null)
-		      return nf;
-		    break;
-		  }
-	      }
-	  }
-	return getPercentInstance(LocaleHelper.getFallbackLocale(loc));
+        for (NumberFormatProvider p :
+               ServiceLoader.load(NumberFormatProvider.class))
+          {
+            for (Locale l : p.getAvailableLocales())
+              {
+                if (l.equals(loc))
+                  {
+                    NumberFormat nf = p.getPercentInstance(loc);
+                    if (nf != null)
+                      return nf;
+                    break;
+                  }
+              }
+          }
+        return getPercentInstance(LocaleHelper.getFallbackLocale(loc));
       }
   }
 
@@ -613,7 +613,7 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     int hash = super.hashCode();
     hash ^= (maximumFractionDigits + maximumIntegerDigits
-	     + minimumFractionDigits + minimumIntegerDigits);
+             + minimumFractionDigits + minimumIntegerDigits);
     if (groupingUsed)
       hash ^= 0xf0f0;
     if (parseIntegerOnly)
@@ -631,7 +631,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * locale).
    *
    * @return true if grouping is enabled,
-   * false otherwise. 
+   * false otherwise.
    */
   public boolean isGroupingUsed ()
   {
@@ -644,7 +644,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * point.
    *
    * @return true if only integers are parsed,
-   * false otherwise. 
+   * false otherwise.
    */
   public boolean isParseIntegerOnly ()
   {
@@ -689,10 +689,10 @@ public abstract class NumberFormat extends Format implements Cloneable
     Number r = parse (sourceStr, pp);
     if (r == null)
       {
-	int index = pp.getErrorIndex();
-	if (index < 0)
-	  index = pp.getIndex();
-	throw new ParseException ("couldn't parse number", index);
+        int index = pp.getErrorIndex();
+        if (index < 0)
+          index = pp.getIndex();
+        throw new ParseException ("couldn't parse number", index);
       }
     return r;
   }
@@ -723,7 +723,7 @@ public abstract class NumberFormat extends Format implements Cloneable
    * locale).
    *
    * @param newValue true to enable grouping,
-   *                     false to disable it. 
+   *                     false to disable it.
    */
   public void setGroupingUsed (boolean newValue)
   {
@@ -790,12 +790,12 @@ public abstract class NumberFormat extends Format implements Cloneable
       setMaximumIntegerDigits (minimumIntegerDigits);
   }
 
-  /** 
-   * This method sets the parsing behavior of this object to parse only 
+  /**
+   * This method sets the parsing behavior of this object to parse only
    * integers or not.
    *
    * @param value true to parse only integers,
-   *                         false otherwise. 
+   *                         false otherwise.
    */
   public void setParseIntegerOnly (boolean value)
   {
@@ -814,7 +814,7 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     StringBuffer sbuf = new StringBuffer(50);
     FieldPosition position = new FieldPosition(0);
-    
+
     format (number, sbuf, position);
     return sbuf.toString();
   }
@@ -840,10 +840,10 @@ public abstract class NumberFormat extends Format implements Cloneable
     if (serialVersionOnStream < 1)
       {
         maximumFractionDigits = maxFractionDigits;
-	maximumIntegerDigits = maxIntegerDigits;
-	minimumFractionDigits = minFractionDigits;
-	minimumIntegerDigits = minIntegerDigits;
-	serialVersionOnStream = 1;
+        maximumIntegerDigits = maxIntegerDigits;
+        minimumFractionDigits = minFractionDigits;
+        minimumIntegerDigits = minIntegerDigits;
+        serialVersionOnStream = 1;
       }
   }
 
@@ -897,7 +897,7 @@ public abstract class NumberFormat extends Format implements Cloneable
   {
     if (currency == null)
       throw new NullPointerException("currency may not be null");
-    
+
     throw new UnsupportedOperationException();
   }
 }
diff --git a/libjava/classpath/java/text/ParsePosition.java b/libjava/classpath/java/text/ParsePosition.java
index b0a8a4a0b36..80652161d30 100644
--- a/libjava/classpath/java/text/ParsePosition.java
+++ b/libjava/classpath/java/text/ParsePosition.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -123,7 +123,7 @@ public class ParsePosition
    * 
    *
    * @param obj The Object to test for equality against
-   *            this object. 
+   *            this object.
    *
    * @return true if the specified object is equal to
    * this object, false otherwise.
@@ -136,7 +136,7 @@ public class ParsePosition
     ParsePosition other = (ParsePosition) obj;
     return index == other.index && error_index == other.error_index;
   }
-  
+
   /**
    * Return the hash code for this object.
    * @return the hash code
@@ -155,6 +155,6 @@ public class ParsePosition
   public String toString ()
   {
     return (getClass ().getName () + "[index=" + getIndex ()
-	    + ",errorIndex=" + getErrorIndex () + "]");
+            + ",errorIndex=" + getErrorIndex () + "]");
   }
 }
diff --git a/libjava/classpath/java/text/RuleBasedCollator.java b/libjava/classpath/java/text/RuleBasedCollator.java
index b761039ad80..c7fc549fe57 100644
--- a/libjava/classpath/java/text/RuleBasedCollator.java
+++ b/libjava/classpath/java/text/RuleBasedCollator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -66,7 +66,7 @@ import java.util.HashMap;
  * case with French.  The modifier applies to all rules after
  * the modifier but before the next primary sequence. If placed at the end
  * of the sequence if applies to all unknown accented character.
- * The relational operators specify how the text 
+ * The relational operators specify how the text
  * argument relates to the previous term.  The relation characters have
  * the following meanings:
  * 
                
@@ -81,9 +81,9 @@ import java.util.HashMap;
  * 
                
  * As for the text argument itself, this is any sequence of Unicode
  * characters not in the following ranges: 0x0009-0x000D, 0x0020-0x002F,
- * 0x003A-0x0040, 0x005B-0x0060, and 0x007B-0x007E. If these characters are 
- * desired, they must be enclosed in single quotes.  If any whitespace is 
- * encountered, it is ignored.  (For example, "a b" is equal to "ab").  
+ * 0x003A-0x0040, 0x005B-0x0060, and 0x007B-0x007E. If these characters are
+ * desired, they must be enclosed in single quotes.  If any whitespace is
+ * encountered, it is ignored.  (For example, "a b" is equal to "ab").
  * 
                
  * The reset operation inserts the following rule at the point where the
  * text argument to it exists in the previously declared rule string.  This
@@ -91,7 +91,7 @@ import java.util.HashMap;
  * them in a reset sequence at the end.  Note that the text argument, or
  * at least the first character of it, must be present somewhere in the
  * previously declared rules in order to be inserted properly.  If this
- * is not satisfied, a ParseException will be thrown. 
+ * is not satisfied, a ParseException will be thrown.
  * 
                
  * This system of configuring RuleBasedCollator is needlessly
  * complex and the people at Taligent who developed it (along with the folks
@@ -100,7 +100,7 @@ import java.util.HashMap;
  * 
                
  * Here are a couple of example of rule strings:
  * 
                
- * "< a < b < c" - This string says that a is greater than b which is 
+ * "< a < b < c" - This string says that a is greater than b which is
  * greater than c, with all differences being primary differences.
  * 
                
  * "< a,A < b,B < c,C" - This string says that 'A' is greater than 'a' with
@@ -108,7 +108,7 @@ import java.util.HashMap;
  * 'A' during a primary strength comparison.  But 'B' is greater than 'b'
  * under a tertiary strength comparison.
  * 
                
- * "< a < c & a < b " - This sequence is identical in function to the 
+ * "< a < c & a < b " - This sequence is identical in function to the
  * "< a < b < c" rule string above.  The '&' reset symbol indicates that
  * the rule "< b" is to be inserted after the text argument "a" in the
  * previous rule string segment.
@@ -125,7 +125,7 @@ import java.util.HashMap;
  * 
                
  * As an additional complication to this already overly complex rule scheme,
  * if any characters precede the first rule, these characters are considered
- * ignorable.  They will be treated as if they did not exist during 
+ * ignorable.  They will be treated as if they did not exist during
  * comparisons.  For example, "- < a < b ..." would make '-' an ignorable
  * character such that the strings "high-tech" and "hightech" would
  * be considered identical.
@@ -146,7 +146,7 @@ import java.util.HashMap;
 public class RuleBasedCollator extends Collator
 {
   /**
-   * This class describes what rank has a character (or a sequence of characters) 
+   * This class describes what rank has a character (or a sequence of characters)
    * in the lexicographic order. Each element in a rule has a collation element.
    */
   static final class CollationElement
@@ -160,7 +160,7 @@ public class RuleBasedCollator extends Collator
     final String expansion;
 
     CollationElement(String key, int primary, short secondary, short tertiary,
-		     short equality, String expansion, boolean ignore)
+                     short equality, String expansion, boolean ignore)
     {
       this.key = key;
       this.primary = primary;
@@ -193,7 +193,7 @@ public class RuleBasedCollator extends Collator
     static final int EQUAL = 3;
     static final int RESET = 4;
     static final int INVERSE_SECONDARY = 5;
-    
+
     final int comparisonType;
     final String textElement;
     final int hashText;
@@ -203,7 +203,7 @@ public class RuleBasedCollator extends Collator
     String expansionOrdering;
 
     private CollationSorter(final int comparisonType, final String textElement,
-			    final int offset, final boolean ignore)
+                            final int offset, final boolean ignore)
     {
       this.comparisonType = comparisonType;
       this.textElement = textElement;
@@ -254,10 +254,10 @@ public class RuleBasedCollator extends Collator
    * The JDK uses it to mark and sort the characters which has
    * no collation rules.
    */
-  static final CollationElement SPECIAL_UNKNOWN_SEQ = 
+  static final CollationElement SPECIAL_UNKNOWN_SEQ =
     new CollationElement("", (short) 32767, (short) 0, (short) 0,
-			 (short) 0, null, false);
-  
+                         (short) 0, null, false);
+
   /**
    * This method initializes a new instance of RuleBasedCollator
    * with the specified collation rules.  Note that an application normally
@@ -273,7 +273,7 @@ public class RuleBasedCollator extends Collator
   {
     if (rules.equals(""))
       throw new ParseException("empty rule set", 0);
-    
+
     this.rules = rules;
 
     buildCollationVector(parseString(rules));
@@ -296,8 +296,8 @@ public class RuleBasedCollator extends Collator
 
     for (index = 0; index < len && index < s.length(); ++index)
       {
-	if (prefix.charAt(index) != s.charAt(index))
-	  return index;
+        if (prefix.charAt(index) != s.charAt(index))
+          return index;
       }
 
 
@@ -317,45 +317,45 @@ public class RuleBasedCollator extends Collator
    * @throws ParseException if it is impossible to find an anchor point for the new rules.
    */
   private void mergeRules(int offset, String starter, ArrayList main,
-			  ArrayList patch)
-    throws ParseException 
+                          ArrayList patch)
+    throws ParseException
   {
     int insertion_point = -1;
     int max_length = 0;
-    
+
     /* We must check that no rules conflict with another already present. If it
-     * is the case delete the old rule. 
+     * is the case delete the old rule.
      */
-    
+
     /* For the moment good old O(N^2) algorithm.
      */
     for (int i = 0; i < patch.size(); i++)
       {
-	int j = 0;
-	
-	while (j < main.size())
-	  {
-	    CollationSorter rule1 = patch.get(i);
-	    CollationSorter rule2 = main.get(j);
-	    
-	    if (rule1.textElement.equals(rule2.textElement))
-	      main.remove(j);
-	    else
-	      j++;
-	  }
+        int j = 0;
+
+        while (j < main.size())
+          {
+            CollationSorter rule1 = patch.get(i);
+            CollationSorter rule2 = main.get(j);
+
+            if (rule1.textElement.equals(rule2.textElement))
+              main.remove(j);
+            else
+              j++;
+          }
       }
 
     // Find the insertion point... O(N)
     for (int i = 0; i < main.size(); i++)
       {
-	CollationSorter sorter = main.get(i);
-	int length = findPrefixLength(starter, sorter.textElement);
-		
-	if (length > max_length)
-	  {
-	    max_length = length;
-	    insertion_point = i+1;
-	  }
+        CollationSorter sorter = main.get(i);
+        int length = findPrefixLength(starter, sorter.textElement);
+
+        if (length > max_length)
+          {
+            max_length = length;
+            insertion_point = i+1;
+          }
       }
 
     if (insertion_point < 0)
@@ -363,28 +363,28 @@ public class RuleBasedCollator extends Collator
 
     if (max_length < starter.length())
       {
-	/*
-	 * We need to expand the first entry. It must be sorted
-	 * like if it was the reference key itself (like the spec
-	 * said. So the first entry is special: the element is
-	 * replaced by the specified text element for the sorting.
-	 * This text replace the old one for comparisons. However
-	 * to preserve the behaviour we replace the first key (corresponding
-	 * to the found prefix) by a new code rightly ordered in the
-	 * sequence. The rest of the subsequence must be appended
-	 * to the end of the sequence.
-	 */
-	CollationSorter sorter = patch.get(0);
-	
-	sorter.expansionOrdering = starter.substring(max_length); // Skip the first good prefix element
-		
-	main.add(insertion_point, sorter);
-	
-	/*
-	 * This is a new set of rules. Append to the list.
-	 */
-	patch.remove(0);
-	insertion_point++;
+        /*
+         * We need to expand the first entry. It must be sorted
+         * like if it was the reference key itself (like the spec
+         * said. So the first entry is special: the element is
+         * replaced by the specified text element for the sorting.
+         * This text replace the old one for comparisons. However
+         * to preserve the behaviour we replace the first key (corresponding
+         * to the found prefix) by a new code rightly ordered in the
+         * sequence. The rest of the subsequence must be appended
+         * to the end of the sequence.
+         */
+        CollationSorter sorter = patch.get(0);
+
+        sorter.expansionOrdering = starter.substring(max_length); // Skip the first good prefix element
+
+        main.add(insertion_point, sorter);
+
+        /*
+         * This is a new set of rules. Append to the list.
+         */
+        patch.remove(0);
+        insertion_point++;
       }
 
     // Now insert all elements of patch at the insertion point.
@@ -395,7 +395,7 @@ public class RuleBasedCollator extends Collator
   /**
    * This method parses a string and build a set of sorting instructions. The parsing
    * may only be partial on the case the rules are to be merged sometime later.
-   * 
+   *
    * @param stop_on_reset If this parameter is true then the parser stops when it
    * encounters a reset instruction. In the other case, it tries to parse the subrules
    * and merged it in the same repository.
@@ -403,12 +403,12 @@ public class RuleBasedCollator extends Collator
    * @param base_offset Offset in the string to begin parsing.
    * @param rules Rules to be parsed.
    * @return -1 if the parser reached the end of the string, an integer representing the
-   * offset in the string at which it stopped parsing. 
+   * offset in the string at which it stopped parsing.
    * @throws ParseException if something turned wrong during the parsing. To get details
    * decode the message.
    */
   private int subParseString(boolean stop_on_reset, ArrayList v,
-			     int base_offset, String rules)
+                             int base_offset, String rules)
     throws ParseException
   {
     boolean ignoreChars = (base_offset == 0);
@@ -419,155 +419,155 @@ public class RuleBasedCollator extends Collator
     boolean nextIsModifier = false;
     boolean isModifier = false;
     int i;
-    
+
 main_parse_loop:
     for (i = 0; i < rules.length(); i++)
       {
-	char c = rules.charAt(i);
-	int type = -1;
-	
-	if (!eatingChars &&
-	    ((c >= 0x09 && c <= 0x0D) || (c == 0x20)))
-	      continue;
+        char c = rules.charAt(i);
+        int type = -1;
 
-	isModifier = nextIsModifier;
-	nextIsModifier = false;
+        if (!eatingChars &&
+            ((c >= 0x09 && c <= 0x0D) || (c == 0x20)))
+              continue;
 
-	if (eatingChars && c != '\'')
-	  {
-	    doubleQuote = false;
-	    sb.append(c);
-	    continue;
-	  }
-	if (doubleQuote && eatingChars)
-	  {
-	    sb.append(c);
-	    doubleQuote = false;
-	    continue;
-	  }
+        isModifier = nextIsModifier;
+        nextIsModifier = false;
 
-	switch (c)
-	  {
-	  case '!':
-	    throw new ParseException
-	      ("Modifier '!' is not yet supported by Classpath", i + base_offset);
-	  case '<':
-	    type = CollationSorter.GREATERP;
-	    break;
-	  case ';':
-	    type = CollationSorter.GREATERS;
-	    break;
-	  case ',':
-	    type = CollationSorter.GREATERT;
-	    break;
-	  case '=':
-	    type = CollationSorter.EQUAL;
-	    break;
-	  case '\'':
-	    eatingChars = !eatingChars;
-	    doubleQuote = true;
-	    break;
-	  case '@':
-	    if (ignoreChars)
-	      throw new ParseException
-		("comparison list has not yet been started. You may only use"
-		 + "(<,;=&)", i + base_offset);
-	    // Inverse the order of secondaries from now on.
-	    nextIsModifier = true;
-	    type = CollationSorter.INVERSE_SECONDARY;
-	    break;
-	  case '&':
-	    type = CollationSorter.RESET;
-	    if (stop_on_reset)
-	      break main_parse_loop;
-	    break;
-	  default:
-	    if (operator < 0)
-	      throw new ParseException
-		("operator missing at " + (i + base_offset), i + base_offset);
-	    if (! eatingChars
-		&& ((c >= 0x21 && c <= 0x2F) 
-		    || (c >= 0x3A && c <= 0x40)
-		    || (c >= 0x5B && c <= 0x60)
-		    || (c >= 0x7B && c <= 0x7E)))
-	      throw new ParseException
-		("unquoted punctuation character '" + c + "'", i + base_offset);
+        if (eatingChars && c != '\'')
+          {
+            doubleQuote = false;
+            sb.append(c);
+            continue;
+          }
+        if (doubleQuote && eatingChars)
+          {
+            sb.append(c);
+            doubleQuote = false;
+            continue;
+          }
 
-	    //type = ignoreChars ? CollationSorter.IGNORE : -1;
-	    sb.append(c);
-	    break;
-	  }
+        switch (c)
+          {
+          case '!':
+            throw new ParseException
+              ("Modifier '!' is not yet supported by Classpath", i + base_offset);
+          case '<':
+            type = CollationSorter.GREATERP;
+            break;
+          case ';':
+            type = CollationSorter.GREATERS;
+            break;
+          case ',':
+            type = CollationSorter.GREATERT;
+            break;
+          case '=':
+            type = CollationSorter.EQUAL;
+            break;
+          case '\'':
+            eatingChars = !eatingChars;
+            doubleQuote = true;
+            break;
+          case '@':
+            if (ignoreChars)
+              throw new ParseException
+                ("comparison list has not yet been started. You may only use"
+                 + "(<,;=&)", i + base_offset);
+            // Inverse the order of secondaries from now on.
+            nextIsModifier = true;
+            type = CollationSorter.INVERSE_SECONDARY;
+            break;
+          case '&':
+            type = CollationSorter.RESET;
+            if (stop_on_reset)
+              break main_parse_loop;
+            break;
+          default:
+            if (operator < 0)
+              throw new ParseException
+                ("operator missing at " + (i + base_offset), i + base_offset);
+            if (! eatingChars
+                && ((c >= 0x21 && c <= 0x2F)
+                    || (c >= 0x3A && c <= 0x40)
+                    || (c >= 0x5B && c <= 0x60)
+                    || (c >= 0x7B && c <= 0x7E)))
+              throw new ParseException
+                ("unquoted punctuation character '" + c + "'", i + base_offset);
 
-	if (type  < 0)
-	  continue;
+            //type = ignoreChars ? CollationSorter.IGNORE : -1;
+            sb.append(c);
+            break;
+          }
 
-	if (operator < 0)
-	  {
-	    operator = type;
-	    continue;
-	  }
+        if (type  < 0)
+          continue;
 
-	if (sb.length() == 0 && !isModifier)
-	  throw new ParseException
-	    ("text element empty at " + (i+base_offset), i+base_offset);
+        if (operator < 0)
+          {
+            operator = type;
+            continue;
+          }
 
-	if (operator == CollationSorter.RESET)
-	  {
-	    /* Reposition in the sorting list at the position
-	     * indicated by the text element.
-	     */
-	    String subrules = rules.substring(i);
-	    ArrayList sorted_rules = new ArrayList();
-	    int idx;
+        if (sb.length() == 0 && !isModifier)
+          throw new ParseException
+            ("text element empty at " + (i+base_offset), i+base_offset);
 
-	    // Parse the subrules but do not iterate through all
-	    // sublist. This is the privilege of the first call.
-	    idx = subParseString(true, sorted_rules, base_offset+i, subrules);
-    
-	    // Merge new parsed rules into the list.
-	    mergeRules(base_offset+i, sb.toString(), v, sorted_rules);
-	    sb.setLength(0);
-	    
-	    // Reset state to none.
-	    operator = -1;
-	    type = -1;
-	    // We have found a new subrule at 'idx' but it has not been parsed.
-	    if (idx >= 0)
-	      {
-		i += idx-1;
-		continue main_parse_loop;
-	      }
-	    else
-		// No more rules.
-		break main_parse_loop;
-	  }
+        if (operator == CollationSorter.RESET)
+          {
+            /* Reposition in the sorting list at the position
+             * indicated by the text element.
+             */
+            String subrules = rules.substring(i);
+            ArrayList sorted_rules = new ArrayList();
+            int idx;
 
-	String textElement = sb.toString();
-	if (operator == CollationSorter.GREATERP)
-	  ignoreChars = false;
-	CollationSorter sorter = new CollationSorter(operator, textElement,
-						     base_offset + rules.length(),
-						     ignoreChars);
-	sb.setLength(0);
+            // Parse the subrules but do not iterate through all
+            // sublist. This is the privilege of the first call.
+            idx = subParseString(true, sorted_rules, base_offset+i, subrules);
 
-	v.add(sorter);
-	operator = type;
+            // Merge new parsed rules into the list.
+            mergeRules(base_offset+i, sb.toString(), v, sorted_rules);
+            sb.setLength(0);
+
+            // Reset state to none.
+            operator = -1;
+            type = -1;
+            // We have found a new subrule at 'idx' but it has not been parsed.
+            if (idx >= 0)
+              {
+                i += idx-1;
+                continue main_parse_loop;
+              }
+            else
+                // No more rules.
+                break main_parse_loop;
+          }
+
+        String textElement = sb.toString();
+        if (operator == CollationSorter.GREATERP)
+          ignoreChars = false;
+        CollationSorter sorter = new CollationSorter(operator, textElement,
+                                                     base_offset + rules.length(),
+                                                     ignoreChars);
+        sb.setLength(0);
+
+        v.add(sorter);
+        operator = type;
       }
 
     if (operator >= 0)
       {
-	int pos = rules.length() + base_offset;
+        int pos = rules.length() + base_offset;
 
-	if ((sb.length() != 0 && nextIsModifier)
-	    || (sb.length() == 0 && !nextIsModifier && !eatingChars))
-	  throw new ParseException("text element empty at " + pos, pos);
+        if ((sb.length() != 0 && nextIsModifier)
+            || (sb.length() == 0 && !nextIsModifier && !eatingChars))
+          throw new ParseException("text element empty at " + pos, pos);
 
-	if (operator == CollationSorter.GREATERP)
-	  ignoreChars = false;
+        if (operator == CollationSorter.GREATERP)
+          ignoreChars = false;
 
-	CollationSorter sorter = new CollationSorter(operator, sb.toString(),
-						     base_offset+pos, ignoreChars);
-	v.add(sorter);
+        CollationSorter sorter = new CollationSorter(operator, sb.toString(),
+                                                     base_offset+pos, ignoreChars);
+        v.add(sorter);
       }
 
     if (i == rules.length())
@@ -589,12 +589,12 @@ main_parse_loop:
   /**
    * This method completely parses a string 'rules' containing sorting rules.
    *
-   * @param rules String containing the rules to be parsed. 
+   * @param rules String containing the rules to be parsed.
    * @return A set of sorting instructions stored in a Vector.
    * @throws ParseException if something turned wrong during the parsing. To get details
    * decode the message.
    */
-  private ArrayList parseString(String rules) 
+  private ArrayList parseString(String rules)
     throws ParseException
   {
     ArrayList v = new ArrayList();
@@ -602,7 +602,7 @@ main_parse_loop:
     // result of the first subParseString is not absolute (may be -1 or a
     // positive integer). But we do not care.
     subParseString(false, v, 0, rules);
-    
+
     return v;
   }
 
@@ -631,60 +631,60 @@ main_parse_loop:
 element_loop:
     for (int i = 0; i < parsedElements.size(); i++)
       {
-	CollationSorter elt = parsedElements.get(i);
+        CollationSorter elt = parsedElements.get(i);
 
-	switch (elt.comparisonType)
-	  {
-	  case CollationSorter.GREATERP:
-	    primary_seq++;
-	    if (inverseComparisons)
-	      {
-		secondary_seq = Short.MAX_VALUE;
-		secondaryType = DECREASING;
-	      }
-	    else
-	      {
-		secondary_seq = 0;
-		secondaryType = INCREASING;
-	      }
-	    tertiary_seq = 0;
-	    equality_seq = 0;
-	    inverseComparisons = false;
-	    break;
-	  case CollationSorter.GREATERS:
-	    if (secondaryType == DECREASING)
-	      secondary_seq--;
-	    else
-	      secondary_seq++;
-	    tertiary_seq = 0;
-	    equality_seq = 0;
-	    break;
-	  case CollationSorter.INVERSE_SECONDARY:
-	    inverseComparisons = true;
-	    continue element_loop;
-	  case CollationSorter.GREATERT:
-	    tertiary_seq++;
-	    if (primary_seq == 0)
-	      last_tertiary_seq = tertiary_seq;
-	    equality_seq = 0;
-	    break;
-	  case CollationSorter.EQUAL:
-	    equality_seq++;
-	    break;
-	  case CollationSorter.RESET:
-	    throw new ParseException
-	      ("Invalid reached state 'RESET'. Internal error", elt.offset);
-	  default:
-	    throw new ParseException
-	      ("Invalid unknown state '" + elt.comparisonType + "'", elt.offset);
-	  }
+        switch (elt.comparisonType)
+          {
+          case CollationSorter.GREATERP:
+            primary_seq++;
+            if (inverseComparisons)
+              {
+                secondary_seq = Short.MAX_VALUE;
+                secondaryType = DECREASING;
+              }
+            else
+              {
+                secondary_seq = 0;
+                secondaryType = INCREASING;
+              }
+            tertiary_seq = 0;
+            equality_seq = 0;
+            inverseComparisons = false;
+            break;
+          case CollationSorter.GREATERS:
+            if (secondaryType == DECREASING)
+              secondary_seq--;
+            else
+              secondary_seq++;
+            tertiary_seq = 0;
+            equality_seq = 0;
+            break;
+          case CollationSorter.INVERSE_SECONDARY:
+            inverseComparisons = true;
+            continue element_loop;
+          case CollationSorter.GREATERT:
+            tertiary_seq++;
+            if (primary_seq == 0)
+              last_tertiary_seq = tertiary_seq;
+            equality_seq = 0;
+            break;
+          case CollationSorter.EQUAL:
+            equality_seq++;
+            break;
+          case CollationSorter.RESET:
+            throw new ParseException
+              ("Invalid reached state 'RESET'. Internal error", elt.offset);
+          default:
+            throw new ParseException
+              ("Invalid unknown state '" + elt.comparisonType + "'", elt.offset);
+          }
 
-	v.add(new CollationElement(elt.textElement, primary_seq,
-				   secondary_seq, tertiary_seq,
-				   equality_seq, elt.expansionOrdering, elt.ignore));
+        v.add(new CollationElement(elt.textElement, primary_seq,
+                                   secondary_seq, tertiary_seq,
+                                   equality_seq, elt.expansionOrdering, elt.ignore));
       }
 
-    this.inverseAccentComparison = inverseComparisons; 
+    this.inverseAccentComparison = inverseComparisons;
 
     ce_table = v.toArray(new CollationElement[v.size()]);
 
@@ -703,9 +703,9 @@ element_loop:
 
     for (int i = 0; i < ce_table.length; i++)
       {
-	CollationElement e = ce_table[i];
+        CollationElement e = ce_table[i];
 
-	prefix_tree.put(e.key, e);
+        prefix_tree.put(e.key, e);
       }
   }
 
@@ -734,72 +734,72 @@ element_loop:
 
     for(;;)
       {
-	int ord1;
-	int ord2;
+        int ord1;
+        int ord2;
 
-	/*
-	 * We have to check whether the characters are ignorable.
-	 * If it is the case then forget them. 
-	 */
-	if (advance_block_1)
-	  {
-	    ord1block = cs.nextBlock();
-	    if (ord1block != null && ord1block.ignore)
-	      continue;
-	  }
-	
-	if (advance_block_2)
-	  {
-	    ord2block = ct.nextBlock();
-	    if (ord2block != null && ord2block.ignore)
-	      {
-	        advance_block_1 = false;
-	        continue;
-	      }
-	 }
-	else
-	  advance_block_2 = true;
+        /*
+         * We have to check whether the characters are ignorable.
+         * If it is the case then forget them.
+         */
+        if (advance_block_1)
+          {
+            ord1block = cs.nextBlock();
+            if (ord1block != null && ord1block.ignore)
+              continue;
+          }
 
-	if (!advance_block_1)
-	  advance_block_1 = true;
+        if (advance_block_2)
+          {
+            ord2block = ct.nextBlock();
+            if (ord2block != null && ord2block.ignore)
+              {
+                advance_block_1 = false;
+                continue;
+              }
+         }
+        else
+          advance_block_2 = true;
 
-	if (ord1block != null)
-	  ord1 = ord1block.getValue();
-	else
-	  {
-	    if (ord2block == null)
-	      return 0;
-	    return -1;
-	  }
+        if (!advance_block_1)
+          advance_block_1 = true;
 
-	if (ord2block == null)
-	  return 1;
-	
-	ord2 = ord2block.getValue();
-	
-	// We know chars are totally equal, so skip
+        if (ord1block != null)
+          ord1 = ord1block.getValue();
+        else
+          {
+            if (ord2block == null)
+              return 0;
+            return -1;
+          }
+
+        if (ord2block == null)
+          return 1;
+
+        ord2 = ord2block.getValue();
+
+        // We know chars are totally equal, so skip
         if (ord1 == ord2)
-	  {
-	    if (getStrength() == IDENTICAL)
-	      if (!ord1block.key.equals(ord2block.key))
-		return ord1block.key.compareTo(ord2block.key);
-	    continue;
-	  }
+          {
+            if (getStrength() == IDENTICAL)
+              if (!ord1block.key.equals(ord2block.key))
+                return ord1block.key.compareTo(ord2block.key);
+            continue;
+          }
 
         // Check for primary strength differences
-        int prim1 = CollationElementIterator.primaryOrder(ord1); 
-        int prim2 = CollationElementIterator.primaryOrder(ord2); 
-	
-	if (prim1 == 0 && getStrength() < TERTIARY)
-	  {
+        int prim1 = CollationElementIterator.primaryOrder(ord1);
+        int prim2 = CollationElementIterator.primaryOrder(ord2);
+
+        if (prim1 == 0 && getStrength() < TERTIARY)
+          {
             advance_block_2 = false;
-	    continue;
-	  }
-	else if (prim2 == 0 && getStrength() < TERTIARY)
-	  {
-	    advance_block_1 = false;
-	    continue;
-	  }
+            continue;
+          }
+        else if (prim2 == 0 && getStrength() < TERTIARY)
+          {
+            advance_block_1 = false;
+            continue;
+          }
 
         if (prim1 < prim2)
           return -1;
@@ -812,7 +812,7 @@ element_loop:
         int sec1 = CollationElementIterator.secondaryOrder(ord1);
         int sec2 = CollationElementIterator.secondaryOrder(ord2);
 
-	if (sec1 < sec2)
+        if (sec1 < sec2)
           return -1;
         else if (sec1 > sec2)
           return 1;
@@ -827,16 +827,16 @@ element_loop:
           return -1;
         else if (tert1 > tert2)
           return 1;
-	else if (getStrength() == TERTIARY)
-	  continue;
+        else if (getStrength() == TERTIARY)
+          continue;
 
-	// Apparently JDK does this (at least for my test case).
-	return ord1block.key.compareTo(ord2block.key);    
+        // Apparently JDK does this (at least for my test case).
+        return ord1block.key.compareTo(ord2block.key);
       }
   }
 
   /**
-   * This method tests this object for equality against the specified 
+   * This method tests this object for equality against the specified
    * object.  This will be true if and only if the specified object is
    * another reference to this object.
    *
@@ -872,7 +872,7 @@ element_loop:
     else
       v = (short) c;
     return new CollationElement("" + c, last_primary_value + v,
-				(short) 0, (short) 0, (short) 0, null, false);
+                                (short) 0, (short) 0, (short) 0, null, false);
   }
 
   /**
@@ -894,7 +894,7 @@ element_loop:
     else
       v = (short) c;
     return new CollationElement("" + c, (short) 0,
-				(short) 0, (short) (last_tertiary_value + v), (short) 0, null, false);
+                                (short) 0, (short) (last_tertiary_value + v), (short) 0, null, false);
   }
 
   /**
@@ -948,29 +948,29 @@ element_loop:
 
     while (ord != CollationElementIterator.NULLORDER)
       {
-	// If the primary order is null, it means this is an ignorable
-	// character.
-	if (CollationElementIterator.primaryOrder(ord) == 0)
-	  {
+        // If the primary order is null, it means this is an ignorable
+        // character.
+        if (CollationElementIterator.primaryOrder(ord) == 0)
+          {
             ord = cei.next();
-	    continue;
-	  }
+            continue;
+          }
         switch (getStrength())
           {
             case PRIMARY:
-	      ord = CollationElementIterator.primaryOrder(ord);
-	      break;
-	      
+              ord = CollationElementIterator.primaryOrder(ord);
+              break;
+
             case SECONDARY:
-	      ord = CollationElementIterator.primaryOrder(ord) << 8;
-	      ord |= CollationElementIterator.secondaryOrder(ord);
+              ord = CollationElementIterator.primaryOrder(ord) << 8;
+              ord |= CollationElementIterator.secondaryOrder(ord);
 
             default:
                break;
           }
 
-        vect.add(Integer.valueOf(ord)); 
-	ord = cei.next(); //increment to next key
+        vect.add(Integer.valueOf(ord));
+        ord = cei.next(); //increment to next key
       }
 
     Integer[] objarr = vect.toArray(new Integer[vect.size()]);
diff --git a/libjava/classpath/java/text/SimpleDateFormat.java b/libjava/classpath/java/text/SimpleDateFormat.java
index b09c7caa28d..05fa4cf15ef 100644
--- a/libjava/classpath/java/text/SimpleDateFormat.java
+++ b/libjava/classpath/java/text/SimpleDateFormat.java
@@ -1,4 +1,4 @@
-/* SimpleDateFormat.java -- A class for parsing/formating simple 
+/* SimpleDateFormat.java -- A class for parsing/formating simple
    date constructs
    Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
    Free Software Foundation, Inc.
@@ -9,7 +9,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -62,13 +62,13 @@ import java.util.regex.Pattern;
 
 /**
  * SimpleDateFormat provides convenient methods for parsing and formatting
- * dates using Gregorian calendars (see java.util.GregorianCalendar). 
+ * dates using Gregorian calendars (see java.util.GregorianCalendar).
  * This class is not thread-safe; external synchronisation should be applied
  * if an instance is to be accessed from multiple threads.
  */
-public class SimpleDateFormat extends DateFormat 
+public class SimpleDateFormat extends DateFormat
 {
-  /** 
+  /**
    * This class is used by SimpleDateFormat as a
    * compiled representation of a format string.  The field
    * ID, size, and character used are stored for each sequence
@@ -93,7 +93,7 @@ public class SimpleDateFormat extends DateFormat
      */
     private char character;
 
-    /** 
+    /**
      * Constructs a compiled field using the
      * the given field ID, size and character
      * values.
@@ -238,12 +238,12 @@ public class SimpleDateFormat extends DateFormat
   // This string is specified in the root of the CLDR.
   private static final String standardChars = "GyMdkHmsSEDFwWahKzYeugAZvcL";
 
-  /**  
+  /**
    * Represents the position of the RFC822 timezone pattern character
    * in the array of localized pattern characters.  In the
    * U.S. locale, this is 'Z'.  The value is the offset of the current
    * time from GMT e.g. -0500 would be five hours prior to GMT.
-   */  
+   */
   private static final int RFC822_TIMEZONE_FIELD = 23;
 
   /**
@@ -259,7 +259,7 @@ public class SimpleDateFormat extends DateFormat
    * @throws ClassNotFoundException if the class of the serialized data
    *         could not be found.
    * @throws InvalidObjectException if the pattern is invalid.
-   */ 
+   */
   private void readObject(ObjectInputStream stream)
     throws IOException, ClassNotFoundException
   {
@@ -267,7 +267,7 @@ public class SimpleDateFormat extends DateFormat
     if (serialVersionOnStream < 1)
       {
         computeCenturyStart ();
-	serialVersionOnStream = 1;
+        serialVersionOnStream = 1;
       }
     else
       // Ensure that defaultCentury gets set.
@@ -277,11 +277,11 @@ public class SimpleDateFormat extends DateFormat
     tokens = new ArrayList();
     try
       {
-	compileFormat(pattern);
+        compileFormat(pattern);
       }
     catch (IllegalArgumentException e)
       {
-	throw new InvalidObjectException("The stream pattern was invalid.");
+        throw new InvalidObjectException("The stream pattern was invalid.");
       }
   }
 
@@ -294,7 +294,7 @@ public class SimpleDateFormat extends DateFormat
    * @param pattern the non-localized pattern to compile.
    * @throws IllegalArgumentException if the pattern is invalid.
    */
-  private void compileFormat(String pattern) 
+  private void compileFormat(String pattern)
   {
     // Any alphabetical characters are treated as pattern characters
     // unless enclosed in single quotes.
@@ -306,70 +306,70 @@ public class SimpleDateFormat extends DateFormat
 
     for (int i = 0; i < pattern.length(); i++)
       {
-	thisChar = pattern.charAt(i);
-	field = standardChars.indexOf(thisChar);
-	if (field == -1)
-	  {
-	    current = null;
-	    if ((thisChar >= 'A' && thisChar <= 'Z')
-		|| (thisChar >= 'a' && thisChar <= 'z'))
-	      {
-		// Not a valid letter
-		throw new IllegalArgumentException("Invalid letter "
-						   + thisChar +
-						   " encountered at character "
-						   + i + ".");
-	      }
-	    else if (thisChar == '\'')
-	      {
-		// Quoted text section; skip to next single quote
-		pos = pattern.indexOf('\'', i + 1);
-		// First look for '' -- meaning a single quote.
-		if (pos == i + 1)
-		  tokens.add("'");
-		else
-		  {
-		    // Look for the terminating quote.  However, if we
-		    // see a '', that represents a literal quote and
-		    // we must iterate.
-		    CPStringBuilder buf = new CPStringBuilder();
-		    int oldPos = i + 1;
-		    do
-		      {
-			if (pos == -1)
-			  throw new IllegalArgumentException("Quotes starting at character "
-							     + i +
-							     " not closed.");
-			buf.append(pattern.substring(oldPos, pos));
-			if (pos + 1 >= pattern.length()
-			    || pattern.charAt(pos + 1) != '\'')
-			  break;
-			buf.append('\'');
-			oldPos = pos + 2;
-			pos = pattern.indexOf('\'', pos + 2);
-		      }
-		    while (true);
-		    tokens.add(buf.toString());
-		  }
-		i = pos;
-	      }
-	    else
-	      {
-		// A special character
-		tokens.add(Character.valueOf(thisChar));
-	      }
-	  }
-	else
-	  {
-	    // A valid field
-	    if ((current != null) && (field == current.field))
-	      current.size++;
-	    else
-	      {
-		current = new CompiledField(field, 1, thisChar);
-		tokens.add(current);
-	      }
-	  }
+        thisChar = pattern.charAt(i);
+        field = standardChars.indexOf(thisChar);
+        if (field == -1)
+          {
+            current = null;
+            if ((thisChar >= 'A' && thisChar <= 'Z')
+                || (thisChar >= 'a' && thisChar <= 'z'))
+              {
+                // Not a valid letter
+                throw new IllegalArgumentException("Invalid letter "
+                                                   + thisChar +
+                                                   " encountered at character "
+                                                   + i + ".");
+              }
+            else if (thisChar == '\'')
+              {
+                // Quoted text section; skip to next single quote
+                pos = pattern.indexOf('\'', i + 1);
+                // First look for '' -- meaning a single quote.
+                if (pos == i + 1)
+                  tokens.add("'");
+                else
+                  {
+                    // Look for the terminating quote.  However, if we
+                    // see a '', that represents a literal quote and
+                    // we must iterate.
+                    CPStringBuilder buf = new CPStringBuilder();
+                    int oldPos = i + 1;
+                    do
+                      {
+                        if (pos == -1)
+                          throw new IllegalArgumentException("Quotes starting at character "
+                                                             + i +
+                                                             " not closed.");
+                        buf.append(pattern.substring(oldPos, pos));
+                        if (pos + 1 >= pattern.length()
+                            || pattern.charAt(pos + 1) != '\'')
+                          break;
+                        buf.append('\'');
+                        oldPos = pos + 2;
+                        pos = pattern.indexOf('\'', pos + 2);
+                      }
+                    while (true);
+                    tokens.add(buf.toString());
+                  }
+                i = pos;
+              }
+            else
+              {
+                // A special character
+                tokens.add(Character.valueOf(thisChar));
+              }
+          }
+        else
+          {
+            // A valid field
+            if ((current != null) && (field == current.field))
+              current.size++;
+            else
+              {
+                current = new CompiledField(field, 1, thisChar);
+                tokens.add(current);
+              }
+          }
       }
   }
 
@@ -380,7 +380,7 @@ public class SimpleDateFormat extends DateFormat
    * @return a string representation of the SimpleDateFormat
    *         instance.
    */
-  public String toString() 
+  public String toString()
   {
     CPStringBuilder output = new CPStringBuilder(getClass().getName());
     output.append("[tokens=");
@@ -405,10 +405,10 @@ public class SimpleDateFormat extends DateFormat
    * Constructs a SimpleDateFormat using the default pattern for
    * the default locale.
    */
-  public SimpleDateFormat() 
+  public SimpleDateFormat()
   {
     /*
-     * There does not appear to be a standard API for determining 
+     * There does not appear to be a standard API for determining
      * what the default pattern for a locale is, so use package-scope
      * variables in DateFormatSymbols to encapsulate this.
      */
@@ -419,14 +419,14 @@ public class SimpleDateFormat extends DateFormat
     tokens = new ArrayList();
     formatData = new DateFormatSymbols(locale);
     pattern = (formatData.dateFormats[DEFAULT] + ' '
-	       + formatData.timeFormats[DEFAULT]);
+               + formatData.timeFormats[DEFAULT]);
     compileFormat(pattern);
     numberFormat = NumberFormat.getInstance(locale);
     numberFormat.setGroupingUsed (false);
     numberFormat.setParseIntegerOnly (true);
     numberFormat.setMaximumFractionDigits (0);
   }
-  
+
   /**
    * Creates a date formatter using the specified non-localized pattern,
    * with the default DateFormatSymbols for the default locale.
@@ -435,7 +435,7 @@ public class SimpleDateFormat extends DateFormat
    * @throws NullPointerException if the pattern is null.
    * @throws IllegalArgumentException if the pattern is invalid.
    */
-  public SimpleDateFormat(String pattern) 
+  public SimpleDateFormat(String pattern)
   {
     this(pattern, Locale.getDefault());
   }
@@ -449,7 +449,7 @@ public class SimpleDateFormat extends DateFormat
    * @throws NullPointerException if the pattern is null.
    * @throws IllegalArgumentException if the pattern is invalid.
    */
-  public SimpleDateFormat(String pattern, Locale locale) 
+  public SimpleDateFormat(String pattern, Locale locale)
   {
     super();
     calendar = new GregorianCalendar(locale);
@@ -561,28 +561,28 @@ public class SimpleDateFormat extends DateFormat
    *         newChars.
    */
   private String translateLocalizedPattern(String pattern,
-					   String oldChars, String newChars)
+                                           String oldChars, String newChars)
   {
     int len = pattern.length();
     CPStringBuilder buf = new CPStringBuilder(len);
     boolean quoted = false;
     for (int i = 0;  i < len;  i++)
       {
-	char ch = pattern.charAt(i);
-	if (ch == '\'')
-	  quoted = ! quoted;
-	if (! quoted)
-	  {
-	    int j = oldChars.indexOf(ch);
-	    if (j >= 0)
-	      ch = newChars.charAt(j);
-	  }
-	buf.append(ch);
+        char ch = pattern.charAt(i);
+        if (ch == '\'')
+          quoted = ! quoted;
+        if (! quoted)
+          {
+            int j = oldChars.indexOf(ch);
+            if (j >= 0)
+              ch = newChars.charAt(j);
+          }
+        buf.append(ch);
       }
     return buf.toString();
   }
 
-  /** 
+  /**
    * Returns the start of the century used for two digit years.
    *
    * @return A Date representing the start of the century
@@ -630,8 +630,8 @@ public class SimpleDateFormat extends DateFormat
    {
      if (formatData == null)
        {
-	 throw new
-	   NullPointerException("The supplied format data was null.");
+         throw new
+           NullPointerException("The supplied format data was null.");
        }
      this.formatData = formatData;
    }
@@ -703,143 +703,143 @@ public class SimpleDateFormat extends DateFormat
     Iterator iter = tokens.iterator();
     while (iter.hasNext())
       {
-	Object o = iter.next();
-	if (o instanceof CompiledField)
-	  {
-	    CompiledField cf = (CompiledField) o;
-	    int beginIndex = buffer.length();
-	    
-	    switch (cf.getField())
-	      {
-	      case ERA_FIELD:
-		buffer.append (formatData.eras[calendar.get (Calendar.ERA)], DateFormat.Field.ERA);
-		break;
-	      case YEAR_FIELD:
-		// If we have two digits, then we truncate.  Otherwise, we
-		// use the size of the pattern, and zero pad.
-		buffer.setDefaultAttribute (DateFormat.Field.YEAR);
-		if (cf.getSize() == 2)
-		  {
-		    temp = "00"+String.valueOf (calendar.get (Calendar.YEAR));
-		    buffer.append (temp.substring (temp.length() - 2));
-		  }
-		else
-		  withLeadingZeros (calendar.get (Calendar.YEAR), cf.getSize(), buffer);
-		break;
-	      case MONTH_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.MONTH);
-		if (cf.getSize() < 3)
-		  withLeadingZeros (calendar.get (Calendar.MONTH) + 1, cf.getSize(), buffer);
-		else if (cf.getSize() < 4)
-		  buffer.append (formatData.shortMonths[calendar.get (Calendar.MONTH)]);
-		else
-		  buffer.append (formatData.months[calendar.get (Calendar.MONTH)]);
-		break;
-	      case DATE_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_MONTH);
-		withLeadingZeros (calendar.get (Calendar.DATE), cf.getSize(), buffer);
-		break;
-	      case HOUR_OF_DAY1_FIELD: // 1-24
-		buffer.setDefaultAttribute(DateFormat.Field.HOUR_OF_DAY1);
-		withLeadingZeros ( ((calendar.get (Calendar.HOUR_OF_DAY) + 23) % 24) + 1, 
-				   cf.getSize(), buffer);
-		break;
-	      case HOUR_OF_DAY0_FIELD: // 0-23
-		buffer.setDefaultAttribute (DateFormat.Field.HOUR_OF_DAY0);
-		withLeadingZeros (calendar.get (Calendar.HOUR_OF_DAY), cf.getSize(), buffer);
-		break;
-	      case MINUTE_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.MINUTE);
-		withLeadingZeros (calendar.get (Calendar.MINUTE),
-				  cf.getSize(), buffer);
-		break;
-	      case SECOND_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.SECOND);
-		withLeadingZeros(calendar.get (Calendar.SECOND), 
-				 cf.getSize(), buffer);
-		break;
-	      case MILLISECOND_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.MILLISECOND);
-		withLeadingZeros (calendar.get (Calendar.MILLISECOND), cf.getSize(), buffer);
-		break;
-	      case DAY_OF_WEEK_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK);
-		if (cf.getSize() < 4)
-		  buffer.append (formatData.shortWeekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
-		else
-		  buffer.append (formatData.weekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
-		break;
-	      case DAY_OF_YEAR_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_YEAR);
-		withLeadingZeros (calendar.get (Calendar.DAY_OF_YEAR), cf.getSize(), buffer);
-		break;
-	      case DAY_OF_WEEK_IN_MONTH_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK_IN_MONTH);
-		withLeadingZeros (calendar.get (Calendar.DAY_OF_WEEK_IN_MONTH), 
-				 cf.getSize(), buffer);
-		break;
-	      case WEEK_OF_YEAR_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_YEAR);
-		withLeadingZeros (calendar.get (Calendar.WEEK_OF_YEAR),
-				  cf.getSize(), buffer);
-		break;
-	      case WEEK_OF_MONTH_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_MONTH);
-		withLeadingZeros (calendar.get (Calendar.WEEK_OF_MONTH),
-				  cf.getSize(), buffer);
-		break;
-	      case AM_PM_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.AM_PM);
-		buffer.append (formatData.ampms[calendar.get (Calendar.AM_PM)]);
-		break;
-	      case HOUR1_FIELD: // 1-12
-		buffer.setDefaultAttribute (DateFormat.Field.HOUR1);
-		withLeadingZeros (((calendar.get (Calendar.HOUR) + 11) % 12) + 1,
-				  cf.getSize(), buffer);
-		break;
-	      case HOUR0_FIELD: // 0-11
-		buffer.setDefaultAttribute (DateFormat.Field.HOUR0);
-		withLeadingZeros (calendar.get (Calendar.HOUR), cf.getSize(), buffer);
-		break;
-	      case TIMEZONE_FIELD:
-		buffer.setDefaultAttribute (DateFormat.Field.TIME_ZONE);
-		TimeZone zone = calendar.getTimeZone();
-		boolean isDST = calendar.get (Calendar.DST_OFFSET) != 0;
-		// FIXME: XXX: This should be a localized time zone.
-		String zoneID = zone.getDisplayName
-		  (isDST, cf.getSize() > 3 ? TimeZone.LONG : TimeZone.SHORT);
-		buffer.append (zoneID);
-		break;
-	      case RFC822_TIMEZONE_FIELD:
-		buffer.setDefaultAttribute(DateFormat.Field.TIME_ZONE);
-		int pureMinutes = (calendar.get(Calendar.ZONE_OFFSET) +
-				   calendar.get(Calendar.DST_OFFSET)) / (1000 * 60);
-		String sign = (pureMinutes < 0) ? "-" : "+";
+        Object o = iter.next();
+        if (o instanceof CompiledField)
+          {
+            CompiledField cf = (CompiledField) o;
+            int beginIndex = buffer.length();
+
+            switch (cf.getField())
+              {
+              case ERA_FIELD:
+                buffer.append (formatData.eras[calendar.get (Calendar.ERA)], DateFormat.Field.ERA);
+                break;
+              case YEAR_FIELD:
+                // If we have two digits, then we truncate.  Otherwise, we
+                // use the size of the pattern, and zero pad.
+                buffer.setDefaultAttribute (DateFormat.Field.YEAR);
+                if (cf.getSize() == 2)
+                  {
+                    temp = "00"+String.valueOf (calendar.get (Calendar.YEAR));
+                    buffer.append (temp.substring (temp.length() - 2));
+                  }
+                else
+                  withLeadingZeros (calendar.get (Calendar.YEAR), cf.getSize(), buffer);
+                break;
+              case MONTH_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.MONTH);
+                if (cf.getSize() < 3)
+                  withLeadingZeros (calendar.get (Calendar.MONTH) + 1, cf.getSize(), buffer);
+                else if (cf.getSize() < 4)
+                  buffer.append (formatData.shortMonths[calendar.get (Calendar.MONTH)]);
+                else
+                  buffer.append (formatData.months[calendar.get (Calendar.MONTH)]);
+                break;
+              case DATE_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_MONTH);
+                withLeadingZeros (calendar.get (Calendar.DATE), cf.getSize(), buffer);
+                break;
+              case HOUR_OF_DAY1_FIELD: // 1-24
+                buffer.setDefaultAttribute(DateFormat.Field.HOUR_OF_DAY1);
+                withLeadingZeros ( ((calendar.get (Calendar.HOUR_OF_DAY) + 23) % 24) + 1,
+                                   cf.getSize(), buffer);
+                break;
+              case HOUR_OF_DAY0_FIELD: // 0-23
+                buffer.setDefaultAttribute (DateFormat.Field.HOUR_OF_DAY0);
+                withLeadingZeros (calendar.get (Calendar.HOUR_OF_DAY), cf.getSize(), buffer);
+                break;
+              case MINUTE_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.MINUTE);
+                withLeadingZeros (calendar.get (Calendar.MINUTE),
+                                  cf.getSize(), buffer);
+                break;
+              case SECOND_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.SECOND);
+                withLeadingZeros(calendar.get (Calendar.SECOND),
+                                 cf.getSize(), buffer);
+                break;
+              case MILLISECOND_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.MILLISECOND);
+                withLeadingZeros (calendar.get (Calendar.MILLISECOND), cf.getSize(), buffer);
+                break;
+              case DAY_OF_WEEK_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK);
+                if (cf.getSize() < 4)
+                  buffer.append (formatData.shortWeekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
+                else
+                  buffer.append (formatData.weekdays[calendar.get (Calendar.DAY_OF_WEEK)]);
+                break;
+              case DAY_OF_YEAR_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_YEAR);
+                withLeadingZeros (calendar.get (Calendar.DAY_OF_YEAR), cf.getSize(), buffer);
+                break;
+              case DAY_OF_WEEK_IN_MONTH_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.DAY_OF_WEEK_IN_MONTH);
+                withLeadingZeros (calendar.get (Calendar.DAY_OF_WEEK_IN_MONTH),
+                                 cf.getSize(), buffer);
+                break;
+              case WEEK_OF_YEAR_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_YEAR);
+                withLeadingZeros (calendar.get (Calendar.WEEK_OF_YEAR),
+                                  cf.getSize(), buffer);
+                break;
+              case WEEK_OF_MONTH_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.WEEK_OF_MONTH);
+                withLeadingZeros (calendar.get (Calendar.WEEK_OF_MONTH),
+                                  cf.getSize(), buffer);
+                break;
+              case AM_PM_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.AM_PM);
+                buffer.append (formatData.ampms[calendar.get (Calendar.AM_PM)]);
+                break;
+              case HOUR1_FIELD: // 1-12
+                buffer.setDefaultAttribute (DateFormat.Field.HOUR1);
+                withLeadingZeros (((calendar.get (Calendar.HOUR) + 11) % 12) + 1,
+                                  cf.getSize(), buffer);
+                break;
+              case HOUR0_FIELD: // 0-11
+                buffer.setDefaultAttribute (DateFormat.Field.HOUR0);
+                withLeadingZeros (calendar.get (Calendar.HOUR), cf.getSize(), buffer);
+                break;
+              case TIMEZONE_FIELD:
+                buffer.setDefaultAttribute (DateFormat.Field.TIME_ZONE);
+                TimeZone zone = calendar.getTimeZone();
+                boolean isDST = calendar.get (Calendar.DST_OFFSET) != 0;
+                // FIXME: XXX: This should be a localized time zone.
+                String zoneID = zone.getDisplayName
+                  (isDST, cf.getSize() > 3 ? TimeZone.LONG : TimeZone.SHORT);
+                buffer.append (zoneID);
+                break;
+              case RFC822_TIMEZONE_FIELD:
+                buffer.setDefaultAttribute(DateFormat.Field.TIME_ZONE);
+                int pureMinutes = (calendar.get(Calendar.ZONE_OFFSET) +
+                                   calendar.get(Calendar.DST_OFFSET)) / (1000 * 60);
+                String sign = (pureMinutes < 0) ? "-" : "+";
                 pureMinutes = Math.abs(pureMinutes);
-		int hours = pureMinutes / 60;
-		int minutes = pureMinutes % 60;
-		buffer.append(sign);
-		withLeadingZeros(hours, 2, buffer);
-		withLeadingZeros(minutes, 2, buffer);
-		break;
-	      default:
-		throw new IllegalArgumentException ("Illegal pattern character " +
-						    cf.getCharacter());
-	      }
-	    if (pos != null && (buffer.getDefaultAttribute() == pos.getFieldAttribute()
-				|| cf.getField() == pos.getField()))
-	      {
-		pos.setBeginIndex(beginIndex);
-		pos.setEndIndex(buffer.length());
-	      }
-	  } 
+                int hours = pureMinutes / 60;
+                int minutes = pureMinutes % 60;
+                buffer.append(sign);
+                withLeadingZeros(hours, 2, buffer);
+                withLeadingZeros(minutes, 2, buffer);
+                break;
+              default:
+                throw new IllegalArgumentException ("Illegal pattern character " +
+                                                    cf.getCharacter());
+              }
+            if (pos != null && (buffer.getDefaultAttribute() == pos.getFieldAttribute()
+                                || cf.getField() == pos.getField()))
+              {
+                pos.setBeginIndex(beginIndex);
+                pos.setEndIndex(buffer.length());
+              }
+          }
       else
-	{  
-	  buffer.append(o.toString(), null);
-	}
+        {
+          buffer.append(o.toString(), null);
+        }
       }
   }
-  
+
   public StringBuffer format(Date date, StringBuffer buffer, FieldPosition pos)
   {
     formatWithAttribute(date, new StringFormatBuffer (buffer), pos);
@@ -857,15 +857,15 @@ public class SimpleDateFormat extends DateFormat
 
     AttributedFormatBuffer buf = new AttributedFormatBuffer();
     formatWithAttribute((Date)date, buf,
-			null);
+                        null);
     buf.sync();
-        
+
     return new FormatCharacterIterator(buf.getBuffer().toString(),
-				       buf.getRanges(),
-				       buf.getAttributes());
+                                       buf.getRanges(),
+                                       buf.getAttributes());
   }
 
-  private void withLeadingZeros(int value, int length, FormatBuffer buffer) 
+  private void withLeadingZeros(int value, int length, FormatBuffer buffer)
   {
     String valStr = String.valueOf(value);
     for (length -= valStr.length(); length > 0; length--)
@@ -886,7 +886,7 @@ public class SimpleDateFormat extends DateFormat
 
   /**
    * This method parses the specified string into a date.
-   * 
+   *
    * @param dateStr The date string to parse.
    * @param pos The input and output parse position
    *
@@ -904,27 +904,27 @@ public class SimpleDateFormat extends DateFormat
     boolean is2DigitYear = false;
     try
       {
-	for (; fmt_index < fmt_max; ++fmt_index)
-	  {
-	    char ch = pattern.charAt(fmt_index);
-	    if (ch == '\'')
-	      {
-		if (fmt_index < fmt_max - 1
-		    && pattern.charAt(fmt_index + 1) == '\'')
-		  {
-		    if (! expect (dateStr, pos, ch))
-		      return null;
-		    ++fmt_index;
-		  }
-		else
-		  quote_start = quote_start < 0 ? fmt_index : -1;
-		continue;
-	      }
-	    
-	    if (quote_start != -1
-		|| ((ch < 'a' || ch > 'z')
-		    && (ch < 'A' || ch > 'Z')))
-	      {
+        for (; fmt_index < fmt_max; ++fmt_index)
+          {
+            char ch = pattern.charAt(fmt_index);
+            if (ch == '\'')
+              {
+                if (fmt_index < fmt_max - 1
+                    && pattern.charAt(fmt_index + 1) == '\'')
+                  {
+                    if (! expect (dateStr, pos, ch))
+                      return null;
+                    ++fmt_index;
+                  }
+                else
+                  quote_start = quote_start < 0 ? fmt_index : -1;
+                continue;
+              }
+
+            if (quote_start != -1
+                || ((ch < 'a' || ch > 'z')
+                    && (ch < 'A' || ch > 'Z')))
+              {
                 if (quote_start == -1 && ch == ' ')
                   {
                     // A single unquoted space in the pattern may match
@@ -944,275 +944,275 @@ public class SimpleDateFormat extends DateFormat
                       }
                   }
                 else if (! expect (dateStr, pos, ch))
-		  return null;
-		continue;
-	      }
-	    
-	    // We've arrived at a potential pattern character in the
-	    // pattern.
-	    int fmt_count = 1;
-	    while (++fmt_index < fmt_max && pattern.charAt(fmt_index) == ch)
-	      {
-		++fmt_count;
-	      }
-	    
-	    // We might need to limit the number of digits to parse in
-	    // some cases.  We look to the next pattern character to
-	    // decide.
-	    boolean limit_digits = false;
-	    if (fmt_index < fmt_max
-		&& standardChars.indexOf(pattern.charAt(fmt_index)) >= 0)
-	      limit_digits = true;
-	    --fmt_index;
-	    
-	    // We can handle most fields automatically: most either are
-	    // numeric or are looked up in a string vector.  In some cases
-	    // we need an offset.  When numeric, `offset' is added to the
-	    // resulting value.  When doing a string lookup, offset is the
-	    // initial index into the string array.
-	    int calendar_field;
-	    boolean is_numeric = true;
-	    int offset = 0;
-	    boolean maybe2DigitYear = false;
-	    boolean oneBasedHour = false;
-	    boolean oneBasedHourOfDay = false;
-	    Integer simpleOffset;
-	    String[] set1 = null;
-	    String[] set2 = null;
-	    switch (ch)
-	      {
-	      case 'd':
-		calendar_field = Calendar.DATE;
-		break;
-	      case 'D':
-		calendar_field = Calendar.DAY_OF_YEAR;
-		break;
-	      case 'F':
-		calendar_field = Calendar.DAY_OF_WEEK_IN_MONTH;
-		break;
-	      case 'E':
-		is_numeric = false;
-		offset = 1;
-		calendar_field = Calendar.DAY_OF_WEEK;
-		set1 = formatData.getWeekdays();
-		set2 = formatData.getShortWeekdays();
-		break;
-	      case 'w':
-		calendar_field = Calendar.WEEK_OF_YEAR;
-		break;
-	      case 'W':
-		calendar_field = Calendar.WEEK_OF_MONTH;
-		break;
-	      case 'M':
-		calendar_field = Calendar.MONTH;
-		if (fmt_count <= 2)
-		  offset = -1;
-		else
-		  {
-		    is_numeric = false;
-		    set1 = formatData.getMonths();
-		    set2 = formatData.getShortMonths();
-		  }
-		break;
-	      case 'y':
-		calendar_field = Calendar.YEAR;
-		if (fmt_count <= 2)
-		  maybe2DigitYear = true;
-		break;
-	      case 'K':
-		calendar_field = Calendar.HOUR;
-		break;
-	      case 'h':
-		calendar_field = Calendar.HOUR;
-		oneBasedHour = true;
-		break;
-	      case 'H':
-		calendar_field = Calendar.HOUR_OF_DAY;
-		break;
-	      case 'k':
-		calendar_field = Calendar.HOUR_OF_DAY;
-		oneBasedHourOfDay = true;
-		break;
-	      case 'm':
-		calendar_field = Calendar.MINUTE;
-		break;
-	      case 's':
-		calendar_field = Calendar.SECOND;
-		break;
-	      case 'S':
-		calendar_field = Calendar.MILLISECOND;
-		break;
-	      case 'a':
-		is_numeric = false;
-		calendar_field = Calendar.AM_PM;
-		set1 = formatData.getAmPmStrings();
-		break;
-	      case 'z':
-	      case 'Z':
-		// We need a special case for the timezone, because it
-		// uses a different data structure than the other cases.
-		is_numeric = false;
-		calendar_field = Calendar.ZONE_OFFSET;
-		String[][] zoneStrings = formatData.getZoneStrings();
-		int zoneCount = zoneStrings.length;
-		int index = pos.getIndex();
-		boolean found_zone = false;
-		simpleOffset = computeOffset(dateStr.substring(index), pos);
-		if (simpleOffset != null)
-		  {
-		    found_zone = true;
-		    saw_timezone = true;
-		    calendar.set(Calendar.DST_OFFSET, 0);
-		    offset = simpleOffset.intValue();
-		  }
-		else
-		  {
-		    for (int j = 0;  j < zoneCount;  j++)
-		      {
-			String[] strings = zoneStrings[j];
-			int k;
-			for (k = 0; k < strings.length; ++k)
-			  {
-			    if (dateStr.startsWith(strings[k], index))
-			      break;
-			  }
-			if (k != strings.length)
-			  {
-			    found_zone = true;
-			    saw_timezone = true;
-			    TimeZone tz = TimeZone.getTimeZone (strings[0]);
-			    // Check if it's a DST zone or ordinary 
-			    if(k == 3 || k == 4)
-			      calendar.set (Calendar.DST_OFFSET, tz.getDSTSavings());
-			    else
-			      calendar.set (Calendar.DST_OFFSET, 0);
-                            offset = tz.getRawOffset ();
-			    pos.setIndex(index + strings[k].length());
-			    break;
-			  }
-		      }
-		  }
-		if (! found_zone)
-		  {
-			pos.setErrorIndex(pos.getIndex());
-			return null;
-		  }
-		break;
-	      default:
-		pos.setErrorIndex(pos.getIndex());
-		return null;
-	      }
-      
-	    // Compute the value we should assign to the field.
-	    int value;
-	    int index = -1;
-	    if (is_numeric)
-	      {
-		numberFormat.setMinimumIntegerDigits(fmt_count);
-		if (maybe2DigitYear)
-		  index = pos.getIndex();
-		Number n = null;
-		if (limit_digits)
-		  {
-		    // numberFormat.setMaximumIntegerDigits(fmt_count) may
-		    // not work as expected. So we explicitly use substring
-		    // of dateStr.
-		    int origPos = pos.getIndex();
-		    pos.setIndex(0);
-		    n = numberFormat.parse(dateStr.substring(origPos, origPos + fmt_count), pos);
-		    pos.setIndex(origPos + pos.getIndex());
-		  }
-		else
-		  n = numberFormat.parse(dateStr, pos);
-		if (pos == null || ! (n instanceof Long))
-		  return null;
-		value = n.intValue() + offset;
-	      }
-	    else if (set1 != null)
-	      {
-		index = pos.getIndex();
-		int i;
-		boolean found = false;
-		for (i = offset; i < set1.length; ++i)
-		  {
-		    if (set1[i] != null)
-		      if (dateStr.toUpperCase().startsWith(set1[i].toUpperCase(),
-							   index))
-			{
-			  found = true;
-			  pos.setIndex(index + set1[i].length());
-			  break;
-			}
-		  }
-		if (!found && set2 != null)
-		  {
-		    for (i = offset; i < set2.length; ++i)
-		      {
-			if (set2[i] != null)
-			  if (dateStr.toUpperCase().startsWith(set2[i].toUpperCase(),
-							       index))
-			    {
-			      found = true;
-			      pos.setIndex(index + set2[i].length());
-			      break;
-			    }
-		      }
-		  }
-		if (!found)
-		  {
-		    pos.setErrorIndex(index);
-		    return null;
-		  }
-		value = i;
-	      }
-	    else
-	      value = offset;
-	  
-	    if (maybe2DigitYear)
-	      {
-		// Parse into default century if the numeric year string has 
-		// exactly 2 digits.
-		int digit_count = pos.getIndex() - index;
-		if (digit_count == 2)
-		  {
-		    is2DigitYear = true;
-		    value += defaultCentury;
-		  }
-	      }
-	    
-	    // Calendar uses 0-based hours. 
-	    // I.e. 00:00 AM is midnight, not 12 AM or 24:00
-	    if (oneBasedHour && value == 12)
-	      value = 0;
+                  return null;
+                continue;
+              }
 
-	    if (oneBasedHourOfDay && value == 24)
-	      value = 0;
-	    
-	    // Assign the value and move on.
-	    calendar.set(calendar_field, value);
-	  }
-    
-	if (is2DigitYear)
-	  {
-	    // Apply the 80-20 heuristic to dermine the full year based on 
-	    // defaultCenturyStart. 
-	    int year = calendar.get(Calendar.YEAR);
-	    if (calendar.getTime().compareTo(defaultCenturyStart) < 0)
-	      calendar.set(Calendar.YEAR, year + 100);      
-	  }
-	if (! saw_timezone)
-	  {
-	    // Use the real rules to determine whether or not this
-	    // particular time is in daylight savings.
-	    calendar.clear (Calendar.DST_OFFSET);
-	    calendar.clear (Calendar.ZONE_OFFSET);
-	  }
+            // We've arrived at a potential pattern character in the
+            // pattern.
+            int fmt_count = 1;
+            while (++fmt_index < fmt_max && pattern.charAt(fmt_index) == ch)
+              {
+                ++fmt_count;
+              }
+
+            // We might need to limit the number of digits to parse in
+            // some cases.  We look to the next pattern character to
+            // decide.
+            boolean limit_digits = false;
+            if (fmt_index < fmt_max
+                && standardChars.indexOf(pattern.charAt(fmt_index)) >= 0)
+              limit_digits = true;
+            --fmt_index;
+
+            // We can handle most fields automatically: most either are
+            // numeric or are looked up in a string vector.  In some cases
+            // we need an offset.  When numeric, `offset' is added to the
+            // resulting value.  When doing a string lookup, offset is the
+            // initial index into the string array.
+            int calendar_field;
+            boolean is_numeric = true;
+            int offset = 0;
+            boolean maybe2DigitYear = false;
+            boolean oneBasedHour = false;
+            boolean oneBasedHourOfDay = false;
+            Integer simpleOffset;
+            String[] set1 = null;
+            String[] set2 = null;
+            switch (ch)
+              {
+              case 'd':
+                calendar_field = Calendar.DATE;
+                break;
+              case 'D':
+                calendar_field = Calendar.DAY_OF_YEAR;
+                break;
+              case 'F':
+                calendar_field = Calendar.DAY_OF_WEEK_IN_MONTH;
+                break;
+              case 'E':
+                is_numeric = false;
+                offset = 1;
+                calendar_field = Calendar.DAY_OF_WEEK;
+                set1 = formatData.getWeekdays();
+                set2 = formatData.getShortWeekdays();
+                break;
+              case 'w':
+                calendar_field = Calendar.WEEK_OF_YEAR;
+                break;
+              case 'W':
+                calendar_field = Calendar.WEEK_OF_MONTH;
+                break;
+              case 'M':
+                calendar_field = Calendar.MONTH;
+                if (fmt_count <= 2)
+                  offset = -1;
+                else
+                  {
+                    is_numeric = false;
+                    set1 = formatData.getMonths();
+                    set2 = formatData.getShortMonths();
+                  }
+                break;
+              case 'y':
+                calendar_field = Calendar.YEAR;
+                if (fmt_count <= 2)
+                  maybe2DigitYear = true;
+                break;
+              case 'K':
+                calendar_field = Calendar.HOUR;
+                break;
+              case 'h':
+                calendar_field = Calendar.HOUR;
+                oneBasedHour = true;
+                break;
+              case 'H':
+                calendar_field = Calendar.HOUR_OF_DAY;
+                break;
+              case 'k':
+                calendar_field = Calendar.HOUR_OF_DAY;
+                oneBasedHourOfDay = true;
+                break;
+              case 'm':
+                calendar_field = Calendar.MINUTE;
+                break;
+              case 's':
+                calendar_field = Calendar.SECOND;
+                break;
+              case 'S':
+                calendar_field = Calendar.MILLISECOND;
+                break;
+              case 'a':
+                is_numeric = false;
+                calendar_field = Calendar.AM_PM;
+                set1 = formatData.getAmPmStrings();
+                break;
+              case 'z':
+              case 'Z':
+                // We need a special case for the timezone, because it
+                // uses a different data structure than the other cases.
+                is_numeric = false;
+                calendar_field = Calendar.ZONE_OFFSET;
+                String[][] zoneStrings = formatData.getZoneStrings();
+                int zoneCount = zoneStrings.length;
+                int index = pos.getIndex();
+                boolean found_zone = false;
+                simpleOffset = computeOffset(dateStr.substring(index), pos);
+                if (simpleOffset != null)
+                  {
+                    found_zone = true;
+                    saw_timezone = true;
+                    calendar.set(Calendar.DST_OFFSET, 0);
+                    offset = simpleOffset.intValue();
+                  }
+                else
+                  {
+                    for (int j = 0;  j < zoneCount;  j++)
+                      {
+                        String[] strings = zoneStrings[j];
+                        int k;
+                        for (k = 0; k < strings.length; ++k)
+                          {
+                            if (dateStr.startsWith(strings[k], index))
+                              break;
+                          }
+                        if (k != strings.length)
+                          {
+                            found_zone = true;
+                            saw_timezone = true;
+                            TimeZone tz = TimeZone.getTimeZone (strings[0]);
+                            // Check if it's a DST zone or ordinary
+                            if(k == 3 || k == 4)
+                              calendar.set (Calendar.DST_OFFSET, tz.getDSTSavings());
+                            else
+                              calendar.set (Calendar.DST_OFFSET, 0);
+                            offset = tz.getRawOffset ();
+                            pos.setIndex(index + strings[k].length());
+                            break;
+                          }
+                      }
+                  }
+                if (! found_zone)
+                  {
+                        pos.setErrorIndex(pos.getIndex());
+                        return null;
+                  }
+                break;
+              default:
+                pos.setErrorIndex(pos.getIndex());
+                return null;
+              }
+
+            // Compute the value we should assign to the field.
+            int value;
+            int index = -1;
+            if (is_numeric)
+              {
+                numberFormat.setMinimumIntegerDigits(fmt_count);
+                if (maybe2DigitYear)
+                  index = pos.getIndex();
+                Number n = null;
+                if (limit_digits)
+                  {
+                    // numberFormat.setMaximumIntegerDigits(fmt_count) may
+                    // not work as expected. So we explicitly use substring
+                    // of dateStr.
+                    int origPos = pos.getIndex();
+                    pos.setIndex(0);
+                    n = numberFormat.parse(dateStr.substring(origPos, origPos + fmt_count), pos);
+                    pos.setIndex(origPos + pos.getIndex());
+                  }
+                else
+                  n = numberFormat.parse(dateStr, pos);
+                if (pos == null || ! (n instanceof Long))
+                  return null;
+                value = n.intValue() + offset;
+              }
+            else if (set1 != null)
+              {
+                index = pos.getIndex();
+                int i;
+                boolean found = false;
+                for (i = offset; i < set1.length; ++i)
+                  {
+                    if (set1[i] != null)
+                      if (dateStr.toUpperCase().startsWith(set1[i].toUpperCase(),
+                                                           index))
+                        {
+                          found = true;
+                          pos.setIndex(index + set1[i].length());
+                          break;
+                        }
+                  }
+                if (!found && set2 != null)
+                  {
+                    for (i = offset; i < set2.length; ++i)
+                      {
+                        if (set2[i] != null)
+                          if (dateStr.toUpperCase().startsWith(set2[i].toUpperCase(),
+                                                               index))
+                            {
+                              found = true;
+                              pos.setIndex(index + set2[i].length());
+                              break;
+                            }
+                      }
+                  }
+                if (!found)
+                  {
+                    pos.setErrorIndex(index);
+                    return null;
+                  }
+                value = i;
+              }
+            else
+              value = offset;
+
+            if (maybe2DigitYear)
+              {
+                // Parse into default century if the numeric year string has
+                // exactly 2 digits.
+                int digit_count = pos.getIndex() - index;
+                if (digit_count == 2)
+                  {
+                    is2DigitYear = true;
+                    value += defaultCentury;
+                  }
+              }
+
+            // Calendar uses 0-based hours.
+            // I.e. 00:00 AM is midnight, not 12 AM or 24:00
+            if (oneBasedHour && value == 12)
+              value = 0;
+
+            if (oneBasedHourOfDay && value == 24)
+              value = 0;
+
+            // Assign the value and move on.
+            calendar.set(calendar_field, value);
+          }
+
+        if (is2DigitYear)
+          {
+            // Apply the 80-20 heuristic to dermine the full year based on
+            // defaultCenturyStart.
+            int year = calendar.get(Calendar.YEAR);
+            if (calendar.getTime().compareTo(defaultCenturyStart) < 0)
+              calendar.set(Calendar.YEAR, year + 100);
+          }
+        if (! saw_timezone)
+          {
+            // Use the real rules to determine whether or not this
+            // particular time is in daylight savings.
+            calendar.clear (Calendar.DST_OFFSET);
+            calendar.clear (Calendar.ZONE_OFFSET);
+          }
         return calendar.getTime();
       }
     catch (IllegalArgumentException x)
       {
         pos.setErrorIndex(pos.getIndex());
-	return null;
+        return null;
       }
       }
 
@@ -1244,7 +1244,7 @@ public class SimpleDateFormat extends DateFormat
    * order to allow such failure to be represented.
    * 
                
    *
-   * @param zoneString a string in the form 
+   * @param zoneString a string in the form
    *        (GMT)? sign hours : minutes
    *        where sign = '+' or '-', hours
    *        is a one or two digits representing
@@ -1256,7 +1256,7 @@ public class SimpleDateFormat extends DateFormat
    */
   private Integer computeOffset(String zoneString, ParsePosition pos)
   {
-    Pattern pattern = 
+    Pattern pattern =
       Pattern.compile("(GMT)?([+-])([012])?([0-9]):?([0-9]{2})");
     Matcher matcher = pattern.matcher(zoneString);
 
@@ -1264,35 +1264,35 @@ public class SimpleDateFormat extends DateFormat
     boolean hasAll = matcher.lookingAt();
     try
       {
-	// Do we have at least the sign, hour and minute?
-	matcher.group(2);
-	matcher.group(4);
-	matcher.group(5);
+        // Do we have at least the sign, hour and minute?
+        matcher.group(2);
+        matcher.group(4);
+        matcher.group(5);
       }
     catch (IllegalStateException ise)
       {
-	hasAll = false;
+        hasAll = false;
       }
     if (hasAll)
       {
-	int sign = matcher.group(2).equals("+") ? 1 : -1;
-	int hour = Integer.parseInt(matcher.group(4));
-	if (!matcher.group(3).equals(""))
-	  hour += (Integer.parseInt(matcher.group(3)) * 10);
-	int minutes = Integer.parseInt(matcher.group(5));
+        int sign = matcher.group(2).equals("+") ? 1 : -1;
+        int hour = Integer.parseInt(matcher.group(4));
+        if (!matcher.group(3).equals(""))
+          hour += (Integer.parseInt(matcher.group(3)) * 10);
+        int minutes = Integer.parseInt(matcher.group(5));
 
-	if (hour > 23)
-	  return null;
-	int offset = sign * ((hour * 60) + minutes) * 60000;
+        if (hour > 23)
+          return null;
+        int offset = sign * ((hour * 60) + minutes) * 60000;
 
-	// advance the index
-	pos.setIndex(pos.getIndex() + matcher.end());
-	return Integer.valueOf(offset);
+        // advance the index
+        pos.setIndex(pos.getIndex() + matcher.end());
+        return Integer.valueOf(offset);
       }
     else if (zoneString.startsWith("GMT"))
       {
-	pos.setIndex(pos.getIndex() + 3);
-	return Integer.valueOf(0);
+        pos.setIndex(pos.getIndex() + 3);
+        return Integer.valueOf(0);
       }
     return null;
   }
diff --git a/libjava/classpath/java/text/StringCharacterIterator.java b/libjava/classpath/java/text/StringCharacterIterator.java
index 85ca302cbe8..e94e0fbef2d 100644
--- a/libjava/classpath/java/text/StringCharacterIterator.java
+++ b/libjava/classpath/java/text/StringCharacterIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -39,11 +39,11 @@ exception statement from your version. */
 package java.text;
 
 /**
- * This class iterates over a range of characters in a String.  
+ * This class iterates over a range of characters in a String.
  * For a given range of text, a beginning and ending index,
  * as well as a current index are defined.  These values can be queried
  * by the methods in this interface.  Additionally, various methods allow
- * the index to be set. 
+ * the index to be set.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Tom Tromey (tromey@cygnus.com)
@@ -76,9 +76,9 @@ public final class StringCharacterIterator implements CharacterIterator
    * text of the specified String.  The initial index
    * value will be set to the first character in the string.
    *
-   * @param text The String to iterate through (null 
+   * @param text The String to iterate through (null
    *             not permitted).
-   * 
+   *
    * @throws NullPointerException if text is null.
    */
   public StringCharacterIterator (String text)
@@ -209,7 +209,7 @@ public final class StringCharacterIterator implements CharacterIterator
    * the character there.
    *
    * @return The character at the beginning of the range, or
-   * DONE if the range is empty. 
+   * DONE if the range is empty.
    */
   public char first ()
   {
@@ -225,7 +225,7 @@ public final class StringCharacterIterator implements CharacterIterator
    * will be set equal to the beginning index.
    *
    * @return The character at the end of the range, or
-   * DONE if the range is empty. 
+   * DONE if the range is empty.
    */
   public char last ()
   {
@@ -257,7 +257,7 @@ public final class StringCharacterIterator implements CharacterIterator
    * @param index The new index value.
    *
    * @return The character at the new index value or DONE
-   * if the index value is equal to getEndIndex. 
+   * if the index value is equal to getEndIndex.
    *
    * @exception IllegalArgumentException If the specified index is not valid
    */
@@ -313,7 +313,7 @@ public final class StringCharacterIterator implements CharacterIterator
   /*************************************************************************/
 
   /**
-   * This method tests this object for equality againt the specified 
+   * This method tests this object for equality againt the specified
    * object.  This will be true if and only if the specified object:
    * 
                
    * 
                  
@@ -336,11 +336,11 @@ public final class StringCharacterIterator implements CharacterIterator
     StringCharacterIterator sci = (StringCharacterIterator) obj;
 
     return (begin == sci.begin
-	    && end == sci.end
-	    && index == sci.index
-	    && text.equals (sci.text));
+            && end == sci.end
+            && index == sci.index
+            && text.equals (sci.text));
   }
-  
+
   /**
    * Return the hash code for this object.
    * @return the hash code
diff --git a/libjava/classpath/java/text/spi/DateFormatProvider.java b/libjava/classpath/java/text/spi/DateFormatProvider.java
index 43d54a0c60d..ea7ecd39e48 100644
--- a/libjava/classpath/java/text/spi/DateFormatProvider.java
+++ b/libjava/classpath/java/text/spi/DateFormatProvider.java
@@ -80,7 +80,7 @@ public abstract class DateFormatProvider
    * @see java.text.DateFormat#getDateInstance(int,java.util.Locale)
    */
   public abstract DateFormat getDateInstance(int style,
-					     Locale locale);
+                                             Locale locale);
 
   /**
    * Returns a {@link java.text.DateFormat} instance
@@ -103,8 +103,8 @@ public abstract class DateFormatProvider
    * @see java.text.DateFormat#getDateInstance(java.util.Locale)
    */
   public abstract DateFormat getDateTimeInstance(int dateStyle,
-						 int timeStyle,
-						 Locale locale);
+                                                 int timeStyle,
+                                                 Locale locale);
 
   /**
    * Returns a {@link java.text.DateFormat} instance
@@ -124,6 +124,6 @@ public abstract class DateFormatProvider
    * @see java.text.DateFormat#getTimeInstance(int,java.util.Locale)
    */
   public abstract DateFormat getTimeInstance(int style,
-					     Locale locale);
+                                             Locale locale);
 
 }
diff --git a/libjava/classpath/java/text/spi/NumberFormatProvider.java b/libjava/classpath/java/text/spi/NumberFormatProvider.java
index 2a252701f4a..e8a72e44c1e 100644
--- a/libjava/classpath/java/text/spi/NumberFormatProvider.java
+++ b/libjava/classpath/java/text/spi/NumberFormatProvider.java
@@ -80,7 +80,7 @@ public abstract class NumberFormatProvider
   /**
    * Returns a {@link java.text.NumberFormat} instance
    * for integers in the specified {@link java.util.Locale}.
-   * The returned instance should be configured to round 
+   * The returned instance should be configured to round
    * floating point numbers to the nearest integer using
    * {@link java.math.RoundingMode#HALF_EVEN} rounding,
    * and to parse only the integer part of a number.
diff --git a/libjava/classpath/java/util/AbstractCollection.java b/libjava/classpath/java/util/AbstractCollection.java
index a11654ebbaf..d3406c230ae 100644
--- a/libjava/classpath/java/util/AbstractCollection.java
+++ b/libjava/classpath/java/util/AbstractCollection.java
@@ -441,11 +441,11 @@ public abstract class AbstractCollection
     while (hasNext)
       {
         Object o = itr.next();
-	if (o == this)
-	  r.append("");
-	else
-	  r.append(o);
-	hasNext = itr.hasNext();
+        if (o == this)
+          r.append("");
+        else
+          r.append(o);
+        hasNext = itr.hasNext();
         if (hasNext)
           r.append(", ");
       }
diff --git a/libjava/classpath/java/util/AbstractList.java b/libjava/classpath/java/util/AbstractList.java
index c47b59b21ad..13ee28a04ee 100644
--- a/libjava/classpath/java/util/AbstractList.java
+++ b/libjava/classpath/java/util/AbstractList.java
@@ -243,7 +243,7 @@ public abstract class AbstractList
    * Obtains a hash code for this list. In order to obey the general
    * contract of the hashCode method of class Object, this value is
    * calculated as follows:
-   * 
+   *
 
                  hashCode = 1;
 Iterator i = list.iterator();
 while (i.hasNext())
@@ -591,7 +591,7 @@ while (i.hasNext())
       /**
        * Adds the supplied object before the element that would be returned
        * by a call to next(), if the list supports addition.
-       * 
+       *
        * @param o The object to add to the list.
        * @throws UnsupportedOperationException if the list doesn't support
        *         the addition of new elements.
@@ -713,7 +713,7 @@ while (i.hasNext())
    *
    * All methods first check to see if the actual modCount of the backing
    * list is equal to its expected value, and throw a
-   * ConcurrentModificationException if it is not. 
+   * ConcurrentModificationException if it is not.
    *
    * @param fromIndex the index that the returned list should start from
    *        (inclusive)
@@ -756,7 +756,7 @@ while (i.hasNext())
     final int offset;
     /** The size of the sublist. */
     int size;
-    
+
     /**
      * Construct the sublist.
      *
@@ -771,7 +771,7 @@ while (i.hasNext())
       offset = fromIndex;
       size = toIndex - fromIndex;
     }
-    
+
     /**
      * This method checks the two modCount fields to ensure that there has
      * not been a concurrent modification, returning if all is okay.
@@ -783,9 +783,9 @@ while (i.hasNext())
     void checkMod()
     {
       if (modCount != backingList.modCount)
-	throw new ConcurrentModificationException();
+        throw new ConcurrentModificationException();
     }
-    
+
     /**
      * This method checks that a value is between 0 and size (inclusive). If
      * it is not, an exception is thrown.
@@ -797,10 +797,10 @@ while (i.hasNext())
     private void checkBoundsInclusive(int index)
     {
       if (index < 0 || index > size)
-	throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
-					    + size);
+        throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
+                                            + size);
     }
-    
+
     /**
      * This method checks that a value is between 0 (inclusive) and size
      * (exclusive). If it is not, an exception is thrown.
@@ -812,10 +812,10 @@ while (i.hasNext())
     private void checkBoundsExclusive(int index)
     {
       if (index < 0 || index >= size)
-	throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
-					    + size);
+        throw new IndexOutOfBoundsException("Index: " + index + ", Size:"
+                                            + size);
     }
-    
+
     /**
      * Specified by AbstractList.subList to return the private field size.
      *
@@ -828,7 +828,7 @@ while (i.hasNext())
       checkMod();
       return size;
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -851,7 +851,7 @@ while (i.hasNext())
       checkBoundsExclusive(index);
       return backingList.set(index + offset, o);
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -867,7 +867,7 @@ while (i.hasNext())
       checkBoundsExclusive(index);
       return backingList.get(index + offset);
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -891,7 +891,7 @@ while (i.hasNext())
       size++;
       modCount = backingList.modCount;
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -912,7 +912,7 @@ while (i.hasNext())
       modCount = backingList.modCount;
       return o;
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      * This does no bounds checking, as it assumes it will only be called
@@ -928,12 +928,12 @@ while (i.hasNext())
     protected void removeRange(int fromIndex, int toIndex)
     {
       checkMod();
-      
+
       backingList.removeRange(offset + fromIndex, offset + toIndex);
       size -= toIndex - fromIndex;
       modCount = backingList.modCount;
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -961,7 +961,7 @@ while (i.hasNext())
       modCount = backingList.modCount;
       return result;
     }
-    
+
     /**
      * Specified by AbstractList.subList to return addAll(size, c).
      *
@@ -981,7 +981,7 @@ while (i.hasNext())
     {
       return addAll(size, c);
     }
-    
+
     /**
      * Specified by AbstractList.subList to return listIterator().
      *
@@ -991,7 +991,7 @@ while (i.hasNext())
     {
       return listIterator();
     }
-    
+
     /**
      * Specified by AbstractList.subList to return a wrapper around the
      * backing list's iterator.
@@ -1006,176 +1006,176 @@ while (i.hasNext())
     {
       checkMod();
       checkBoundsInclusive(index);
-      
-      return new ListIterator()
-	{
-	  private final ListIterator i
-	    = backingList.listIterator(index + offset);
-	  private int position = index;
-	  
-	  /**
-	   * Tests to see if there are any more objects to
-	   * return.
-	   *
-	   * @return True if the end of the list has not yet been
-	   *         reached.
-	   */
-	  public boolean hasNext()
-	  {
-	      return position < size;
-	  }
-	  
-	  /**
-	   * Tests to see if there are objects prior to the
-	   * current position in the list.
-	   *
-	   * @return True if objects exist prior to the current
-	   *         position of the iterator.
-	   */
-	  public boolean hasPrevious()
-	  {
-	      return position > 0;
-	  }
-	  
-	  /**
-	   * Retrieves the next object from the list.
-	   *
-	   * @return The next object.
-	   * @throws NoSuchElementException if there are no
-	   *         more objects to retrieve.
-	   * @throws ConcurrentModificationException if the
-	   *         list has been modified elsewhere.
-	   */
-	  public E next()
-	  {
-	      if (position == size)
-		throw new NoSuchElementException();
-	      position++;
-	      return i.next();
-	  }
 
-	  /**
-	   * Retrieves the previous object from the list.
-	   *
-	   * @return The next object.
-	   * @throws NoSuchElementException if there are no
-	   *         previous objects to retrieve.
-	   * @throws ConcurrentModificationException if the
-	   *         list has been modified elsewhere.
-	   */
-	  public E previous()
-	  {
-	      if (position == 0)
-		throw new NoSuchElementException();
-	      position--;
-	      return i.previous();
-	  }
-	  
-	  /**
-	   * Returns the index of the next element in the
-	   * list, which will be retrieved by next()
-	   *
-	   * @return The index of the next element.
-	   */
-	  public int nextIndex()
-	  {
-	      return i.nextIndex() - offset;
-	  }
-	  
-	  /**
-	   * Returns the index of the previous element in the
-	   * list, which will be retrieved by previous()
-	   *
-	   * @return The index of the previous element.
-	   */
-	  public int previousIndex()
-	  {
-	      return i.previousIndex() - offset;
-	  }
-	  
-	  /**
-	   * Removes the last object retrieved by next()
-	   * from the list, if the list supports object removal.
-	   *
-	   * @throws IllegalStateException if the iterator is positioned
-	   *         before the start of the list or the last object has already
-	   *         been removed.
-	   * @throws UnsupportedOperationException if the list does
-	   *         not support removing elements.
-	   */
-	  public void remove()
-	  {
-	      i.remove();
-	      size--;
-	      position = nextIndex();
-	      modCount = backingList.modCount;
-	  }
-	  
-	  
-	  /**
-	   * Replaces the last object retrieved by next()
-	   * or previous with o, if the list supports object
-	   * replacement and an add or remove operation has not already
-	   * been performed.
-	   *
-	   * @throws IllegalStateException if the iterator is positioned
-	   *         before the start of the list or the last object has already
-	   *         been removed.
-	   * @throws UnsupportedOperationException if the list doesn't support
-	   *         the addition or removal of elements.
-	   * @throws ClassCastException if the type of o is not a valid type
-	   *         for this list.
-	   * @throws IllegalArgumentException if something else related to o
-	   *         prevents its addition.
-	   * @throws ConcurrentModificationException if the list
-	   *         has been modified elsewhere.
-	   */
-	  public void set(E o)
-	  {
-	      i.set(o);
-	  }
-	  
-	  /**
-	   * Adds the supplied object before the element that would be returned
-	   * by a call to next(), if the list supports addition.
-	   * 
-	   * @param o The object to add to the list.
-	   * @throws UnsupportedOperationException if the list doesn't support
-	   *         the addition of new elements.
-	   * @throws ClassCastException if the type of o is not a valid type
-	   *         for this list.
-	   * @throws IllegalArgumentException if something else related to o
-	   *         prevents its addition.
-	   * @throws ConcurrentModificationException if the list
-	   *         has been modified elsewhere.
-	   */
-	  public void add(E o)
-	  {
-	      i.add(o);
-	      size++;
-	      position++;
-	      modCount = backingList.modCount;
-	  }
-	  
-	  // Here is the reason why the various modCount fields are mostly
-	  // ignored in this wrapper listIterator.
-	  // If the backing listIterator is failfast, then the following holds:
-	  //   Using any other method on this list will call a corresponding
-	  //   method on the backing list *after* the backing listIterator
-	  //   is created, which will in turn cause a ConcurrentModException
-	  //   when this listIterator comes to use the backing one. So it is
-	  //   implicitly failfast.
-	  // If the backing listIterator is NOT failfast, then the whole of
-	  //   this list isn't failfast, because the modCount field of the
-	  //   backing list is not valid. It would still be *possible* to
-	  //   make the iterator failfast wrt modifications of the sublist
-	  //   only, but somewhat pointless when the list can be changed under
-	  //   us.
-	  // Either way, no explicit handling of modCount is needed.
-	  // However modCount = backingList.modCount must be executed in add
-	  // and remove, and size must also be updated in these two methods,
-	  // since they do not go through the corresponding methods of the subList.
-	};
+      return new ListIterator()
+        {
+          private final ListIterator i
+            = backingList.listIterator(index + offset);
+          private int position = index;
+
+          /**
+           * Tests to see if there are any more objects to
+           * return.
+           *
+           * @return True if the end of the list has not yet been
+           *         reached.
+           */
+          public boolean hasNext()
+          {
+              return position < size;
+          }
+
+          /**
+           * Tests to see if there are objects prior to the
+           * current position in the list.
+           *
+           * @return True if objects exist prior to the current
+           *         position of the iterator.
+           */
+          public boolean hasPrevious()
+          {
+              return position > 0;
+          }
+
+          /**
+           * Retrieves the next object from the list.
+           *
+           * @return The next object.
+           * @throws NoSuchElementException if there are no
+           *         more objects to retrieve.
+           * @throws ConcurrentModificationException if the
+           *         list has been modified elsewhere.
+           */
+          public E next()
+          {
+              if (position == size)
+                throw new NoSuchElementException();
+              position++;
+              return i.next();
+          }
+
+          /**
+           * Retrieves the previous object from the list.
+           *
+           * @return The next object.
+           * @throws NoSuchElementException if there are no
+           *         previous objects to retrieve.
+           * @throws ConcurrentModificationException if the
+           *         list has been modified elsewhere.
+           */
+          public E previous()
+          {
+              if (position == 0)
+                throw new NoSuchElementException();
+              position--;
+              return i.previous();
+          }
+
+          /**
+           * Returns the index of the next element in the
+           * list, which will be retrieved by next()
+           *
+           * @return The index of the next element.
+           */
+          public int nextIndex()
+          {
+              return i.nextIndex() - offset;
+          }
+
+          /**
+           * Returns the index of the previous element in the
+           * list, which will be retrieved by previous()
+           *
+           * @return The index of the previous element.
+           */
+          public int previousIndex()
+          {
+              return i.previousIndex() - offset;
+          }
+
+          /**
+           * Removes the last object retrieved by next()
+           * from the list, if the list supports object removal.
+           *
+           * @throws IllegalStateException if the iterator is positioned
+           *         before the start of the list or the last object has already
+           *         been removed.
+           * @throws UnsupportedOperationException if the list does
+           *         not support removing elements.
+           */
+          public void remove()
+          {
+              i.remove();
+              size--;
+              position = nextIndex();
+              modCount = backingList.modCount;
+          }
+
+
+          /**
+           * Replaces the last object retrieved by next()
+           * or previous with o, if the list supports object
+           * replacement and an add or remove operation has not already
+           * been performed.
+           *
+           * @throws IllegalStateException if the iterator is positioned
+           *         before the start of the list or the last object has already
+           *         been removed.
+           * @throws UnsupportedOperationException if the list doesn't support
+           *         the addition or removal of elements.
+           * @throws ClassCastException if the type of o is not a valid type
+           *         for this list.
+           * @throws IllegalArgumentException if something else related to o
+           *         prevents its addition.
+           * @throws ConcurrentModificationException if the list
+           *         has been modified elsewhere.
+           */
+          public void set(E o)
+          {
+              i.set(o);
+          }
+
+          /**
+           * Adds the supplied object before the element that would be returned
+           * by a call to next(), if the list supports addition.
+           *
+           * @param o The object to add to the list.
+           * @throws UnsupportedOperationException if the list doesn't support
+           *         the addition of new elements.
+           * @throws ClassCastException if the type of o is not a valid type
+           *         for this list.
+           * @throws IllegalArgumentException if something else related to o
+           *         prevents its addition.
+           * @throws ConcurrentModificationException if the list
+           *         has been modified elsewhere.
+           */
+          public void add(E o)
+          {
+              i.add(o);
+              size++;
+              position++;
+              modCount = backingList.modCount;
+          }
+
+          // Here is the reason why the various modCount fields are mostly
+          // ignored in this wrapper listIterator.
+          // If the backing listIterator is failfast, then the following holds:
+          //   Using any other method on this list will call a corresponding
+          //   method on the backing list *after* the backing listIterator
+          //   is created, which will in turn cause a ConcurrentModException
+          //   when this listIterator comes to use the backing one. So it is
+          //   implicitly failfast.
+          // If the backing listIterator is NOT failfast, then the whole of
+          //   this list isn't failfast, because the modCount field of the
+          //   backing list is not valid. It would still be *possible* to
+          //   make the iterator failfast wrt modifications of the sublist
+          //   only, but somewhat pointless when the list can be changed under
+          //   us.
+          // Either way, no explicit handling of modCount is needed.
+          // However modCount = backingList.modCount must be executed in add
+          // and remove, and size must also be updated in these two methods,
+          // since they do not go through the corresponding methods of the subList.
+        };
     }
   } // class SubList
 
@@ -1200,5 +1200,5 @@ while (i.hasNext())
       super(backing, fromIndex, toIndex);
     }
   } // class RandomAccessSubList
-  
+
 } // class AbstractList
diff --git a/libjava/classpath/java/util/AbstractMap.java b/libjava/classpath/java/util/AbstractMap.java
index 5d59db9a666..e0e35712ae5 100644
--- a/libjava/classpath/java/util/AbstractMap.java
+++ b/libjava/classpath/java/util/AbstractMap.java
@@ -71,14 +71,14 @@ import java.io.Serializable;
  */
 public abstract class AbstractMap implements Map
 {
-  /** 
+  /**
    * A class containing an immutable key and value.  The
    * implementation of {@link Entry#setValue(V)} for this class
    * simply throws an {@link UnsupportedOperationException},
    * thus preventing changes being made.  This is useful when
    * a static thread-safe view of a map is required.
    *
-   * @since 1.6 
+   * @since 1.6
    */
   public static class SimpleImmutableEntry
     implements Entry, Serializable
@@ -251,8 +251,8 @@ public abstract class AbstractMap implements Map
   public boolean equals(Object o)
   {
     return (o == this
-	    || (o instanceof Map
-		&& entrySet().equals(((Map) o).entrySet())));
+            || (o instanceof Map
+                && entrySet().equals(((Map) o).entrySet())));
   }
 
   /**
@@ -330,76 +330,76 @@ public abstract class AbstractMap implements Map
     if (keys == null)
       keys = new AbstractSet()
       {
-	/**
-	 * Retrieves the number of keys in the backing map.
-	 *
-	 * @return The number of keys.
-	 */
+        /**
+         * Retrieves the number of keys in the backing map.
+         *
+         * @return The number of keys.
+         */
         public int size()
         {
           return AbstractMap.this.size();
         }
 
-	/**
-	 * Returns true if the backing map contains the
-	 * supplied key.
-	 *
-	 * @param key The key to search for.
-	 * @return True if the key was found, false otherwise.
- 	 */
+        /**
+         * Returns true if the backing map contains the
+         * supplied key.
+         *
+         * @param key The key to search for.
+         * @return True if the key was found, false otherwise.
+         */
         public boolean contains(Object key)
         {
           return containsKey(key);
         }
 
-	/**
-	 * Returns an iterator which iterates over the keys
-	 * in the backing map, using a wrapper around the
-	 * iterator returned by entrySet().
-	 *
-	 * @return An iterator over the keys.
-	 */
+        /**
+         * Returns an iterator which iterates over the keys
+         * in the backing map, using a wrapper around the
+         * iterator returned by entrySet().
+         *
+         * @return An iterator over the keys.
+         */
         public Iterator iterator()
         {
           return new Iterator()
           {
-	    /**
-	     * The iterator returned by entrySet().
-	     */
+            /**
+             * The iterator returned by entrySet().
+             */
             private final Iterator> map_iterator
-	      = entrySet().iterator();
+              = entrySet().iterator();
 
-	    /**
-	     * Returns true if a call to next() will
-	     * return another key.
-	     *
-	     * @return True if the iterator has not yet reached
-	     *         the last key.
-	     */
+            /**
+             * Returns true if a call to next() will
+             * return another key.
+             *
+             * @return True if the iterator has not yet reached
+             *         the last key.
+             */
             public boolean hasNext()
             {
               return map_iterator.hasNext();
             }
 
-	    /**
-	     * Returns the key from the next entry retrieved
-	     * by the underlying entrySet() iterator.
-	     *
-	     * @return The next key.
-	     */ 
+            /**
+             * Returns the key from the next entry retrieved
+             * by the underlying entrySet() iterator.
+             *
+             * @return The next key.
+             */
            public K next()
             {
               return map_iterator.next().getKey();
             }
 
-	    /**
-	     * Removes the map entry which has a key equal
-	     * to that returned by the last call to
-	     * next().
-	     *
-	     * @throws UnsupportedOperationException if the
-	     *         map doesn't support removal.
-	     */
+            /**
+             * Removes the map entry which has a key equal
+             * to that returned by the last call to
+             * next().
+             *
+             * @throws UnsupportedOperationException if the
+             *         map doesn't support removal.
+             */
             public void remove()
             {
               map_iterator.remove();
@@ -565,77 +565,77 @@ public abstract class AbstractMap implements Map
     if (values == null)
       values = new AbstractCollection()
       {
- 	/**
-	 * Returns the number of values stored in
-	 * the backing map.
-	 *
-	 * @return The number of values.
-	 */
+        /**
+         * Returns the number of values stored in
+         * the backing map.
+         *
+         * @return The number of values.
+         */
        public int size()
         {
           return AbstractMap.this.size();
         }
 
-	/**
-	 * Returns true if the backing map contains
-	 * the supplied value.
-	 *
-	 * @param value The value to search for.
-	 * @return True if the value was found, false otherwise.
-	 */
+        /**
+         * Returns true if the backing map contains
+         * the supplied value.
+         *
+         * @param value The value to search for.
+         * @return True if the value was found, false otherwise.
+         */
         public boolean contains(Object value)
         {
           return containsValue(value);
         }
 
-	/**
-	 * Returns an iterator which iterates over the
-	 * values in the backing map, by using a wrapper
-	 * around the iterator returned by entrySet().
-	 *
-	 * @return An iterator over the values.
-	 */
+        /**
+         * Returns an iterator which iterates over the
+         * values in the backing map, by using a wrapper
+         * around the iterator returned by entrySet().
+         *
+         * @return An iterator over the values.
+         */
         public Iterator iterator()
         {
           return new Iterator()
           {
-	    /**
-	     * The iterator returned by entrySet().
-	     */
+            /**
+             * The iterator returned by entrySet().
+             */
             private final Iterator> map_iterator
-	      = entrySet().iterator();
+              = entrySet().iterator();
 
- 	    /**
- 	     * Returns true if a call to next() will
- 	     * return another value.
- 	     *
- 	     * @return True if the iterator has not yet reached
- 	     * the last value.
- 	     */
+            /**
+             * Returns true if a call to next() will
+             * return another value.
+             *
+             * @return True if the iterator has not yet reached
+             * the last value.
+             */
             public boolean hasNext()
             {
               return map_iterator.hasNext();
             }
 
- 	    /**
- 	     * Returns the value from the next entry retrieved
- 	     * by the underlying entrySet() iterator.
- 	     *
- 	     * @return The next value.
- 	     */
+            /**
+             * Returns the value from the next entry retrieved
+             * by the underlying entrySet() iterator.
+             *
+             * @return The next value.
+             */
             public V next()
             {
               return map_iterator.next().getValue();
             }
 
- 	    /**
- 	     * Removes the map entry which has a key equal
- 	     * to that returned by the last call to
- 	     * next().
- 	     *
- 	     * @throws UnsupportedOperationException if the
- 	     *         map doesn't support removal.
- 	     */
+            /**
+             * Removes the map entry which has a key equal
+             * to that returned by the last call to
+             * next().
+             *
+             * @throws UnsupportedOperationException if the
+             *         map doesn't support removal.
+             */
             public void remove()
             {
               map_iterator.remove();
@@ -680,7 +680,7 @@ public abstract class AbstractMap implements Map
    *
    * @author Jon Zeppieri
    * @author Eric Blake (ebb9@email.byu.edu)
-   * 
+   *
    * @since 1.6
    */
   public static class SimpleEntry implements Entry, Serializable
@@ -711,7 +711,7 @@ public abstract class AbstractMap implements Map
       key = newKey;
       value = newValue;
     }
-    
+
     public SimpleEntry(Entry entry)
     {
       this(entry.getKey(), entry.getValue());
@@ -814,6 +814,6 @@ public abstract class AbstractMap implements Map
       return key + "=" + value;
     }
   } // class SimpleEntry
-  
-  
+
+
 }
diff --git a/libjava/classpath/java/util/AbstractSet.java b/libjava/classpath/java/util/AbstractSet.java
index 423ac8083a6..af1e4d125eb 100644
--- a/libjava/classpath/java/util/AbstractSet.java
+++ b/libjava/classpath/java/util/AbstractSet.java
@@ -83,8 +83,8 @@ public abstract class AbstractSet
   public boolean equals(Object o)
   {
     return (o == this
-	    || (o instanceof Set && ((Set) o).size() == size()
-		&& containsAll((Collection) o)));
+            || (o instanceof Set && ((Set) o).size() == size()
+                && containsAll((Collection) o)));
   }
 
   /**
@@ -128,18 +128,18 @@ public abstract class AbstractSet
     int count = c.size();
     if (oldsize < count)
       {
-	Iterator i;
-	for (i = iterator(), count = oldsize; count > 0; count--)
-	  {
-	    if (c.contains(i.next()))
-	      i.remove();
-	  }
+        Iterator i;
+        for (i = iterator(), count = oldsize; count > 0; count--)
+          {
+            if (c.contains(i.next()))
+              i.remove();
+          }
       }
     else
       {
-	Iterator i;
-	for (i = c.iterator(); count > 0; count--)
-	  remove(i.next());
+        Iterator i;
+        for (i = c.iterator(); count > 0; count--)
+          remove(i.next());
       }
     return oldsize != size();
   }
diff --git a/libjava/classpath/java/util/ArrayList.java b/libjava/classpath/java/util/ArrayList.java
index 1fb25d80152..0da2193af73 100644
--- a/libjava/classpath/java/util/ArrayList.java
+++ b/libjava/classpath/java/util/ArrayList.java
@@ -503,8 +503,8 @@ public class ArrayList extends AbstractList
     // do so).
     throw new IndexOutOfBoundsException("Index: " + index + ", Size: " + size);
   }
-  
-  
+
+
   /**
    * Remove from this list all elements contained in the given collection.
    * This is not public, due to Sun's API, but this performs in linear
diff --git a/libjava/classpath/java/util/Arrays.java b/libjava/classpath/java/util/Arrays.java
index d154eb1d1ba..dad55c45917 100644
--- a/libjava/classpath/java/util/Arrays.java
+++ b/libjava/classpath/java/util/Arrays.java
@@ -76,7 +76,7 @@ public class Arrays
   {
   }
 
-
+
 // binarySearch
   /**
    * Perform a binary search of a byte array for a key. The array must be
@@ -122,10 +122,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
@@ -186,10 +186,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
@@ -250,10 +250,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
@@ -314,10 +314,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
@@ -378,10 +378,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
@@ -442,10 +442,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     // Must use Float.compare to take into account NaN, +-0.
     int mid = 0;
     while (low <= hi)
@@ -507,10 +507,10 @@ public class Arrays
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     // Must use Double.compare to take into account NaN, +-0.
     int mid = 0;
     while (low <= hi)
@@ -629,21 +629,21 @@ public class Arrays
    *                                        hi > a.length.
    */
   public static  int binarySearch(T[] a, int low, int hi, T key,
-				     Comparator c)
+                                     Comparator c)
   {
     if (low > hi)
       throw new IllegalArgumentException("The start index is higher than " +
-					 "the finish index.");
+                                         "the finish index.");
     if (low < 0 || hi > a.length)
       throw new ArrayIndexOutOfBoundsException("One of the indices is out " +
-					       "of bounds.");
+                                               "of bounds.");
     int mid = 0;
     while (low <= hi)
       {
         mid = (low + hi) >>> 1;
-	// NOTE: Please keep the order of a[mid] and key.  Although
-	// not required by the specs, the RI has it in this order as
-	// well, and real programs (erroneously) depend on it.
+        // NOTE: Please keep the order of a[mid] and key.  Although
+        // not required by the specs, the RI has it in this order as
+        // well, and real programs (erroneously) depend on it.
         final int d = Collections.compare(a[mid], key, c);
         if (d == 0)
           return mid;
@@ -656,7 +656,7 @@ public class Arrays
     return -mid - 1;
   }
 
-
+
 // equals
   /**
    * Compare two boolean arrays for equality.
@@ -675,15 +675,15 @@ public class Arrays
 
     if (null == a1 || null == a2)
       return false;
-    
+
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -709,11 +709,11 @@ public class Arrays
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -735,15 +735,15 @@ public class Arrays
 
     if (null == a1 || null == a2)
       return false;
-    
+
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -769,11 +769,11 @@ public class Arrays
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -799,11 +799,11 @@ public class Arrays
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -829,11 +829,11 @@ public class Arrays
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (a1[i] != a2[i])
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (a1[i] != a2[i])
+            return false;
+        return true;
       }
     return false;
   }
@@ -860,11 +860,11 @@ public class Arrays
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (Float.compare(a1[i], a2[i]) != 0)
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (Float.compare(a1[i], a2[i]) != 0)
+            return false;
+        return true;
       }
     return false;
   }
@@ -886,16 +886,16 @@ public class Arrays
 
     if (null == a1 || null == a2)
       return false;
-    
+
     // Must use Double.compare to take into account NaN, +-0.
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (Double.compare(a1[i], a2[i]) != 0)
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (Double.compare(a1[i], a2[i]) != 0)
+            return false;
+        return true;
       }
     return false;
   }
@@ -918,20 +918,20 @@ public class Arrays
 
     if (null == a1 || null == a2)
       return false;
-    
+
     // If they're the same length, test each element
     if (a1.length == a2.length)
       {
-	int i = a1.length;
-	while (--i >= 0)
-	  if (! AbstractCollection.equals(a1[i], a2[i]))
-	    return false;
-	return true;
+        int i = a1.length;
+        while (--i >= 0)
+          if (! AbstractCollection.equals(a1[i], a2[i]))
+            return false;
+        return true;
       }
     return false;
   }
 
-
+
 // fill
   /**
    * Fill an array with a boolean value.
@@ -1207,7 +1207,7 @@ public class Arrays
       a[i] = val;
   }
 
-
+
 // sort
   // Thanks to Paul Fisher (rao@gnu.org) for finding this quicksort algorithm
   // as specified by Sun and porting it to Java. The algorithm is an optimised
@@ -1633,8 +1633,8 @@ public class Arrays
     if (count <= 7)
       {
         for (int i = from + 1; i < from + count; i++)
-	  for (int j = i; j > from && array[j - 1] > array[j]; j--)
-	    swap(j, j - 1, array);
+          for (int j = i; j > from && array[j - 1] > array[j]; j--)
+            swap(j, j - 1, array);
         return;
       }
 
@@ -2488,7 +2488,7 @@ public class Arrays
    *         ordering (only possible when c is null)
    */
   public static  void sort(T[] a, int fromIndex, int toIndex,
-			      Comparator c)
+                              Comparator c)
   {
     if (fromIndex > toIndex)
       throw new IllegalArgumentException("fromIndex " + fromIndex
@@ -2618,7 +2618,7 @@ public class Arrays
    *
    * @param a the array to return a view of (null not permitted)
    * @return a fixed-size list, changes to which "write through" to the array
-   * 
+   *
    * @throws NullPointerException if a is null.
    * @see Serializable
    * @see RandomAccess
@@ -2629,7 +2629,7 @@ public class Arrays
     return new Arrays.ArrayList(a);
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of long numbers.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2640,7 +2640,7 @@ public class Arrays
    * @param v an array of long numbers for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(long[] v)
   {
@@ -2649,13 +2649,13 @@ public class Arrays
     int result = 1;
     for (int i = 0; i < v.length; ++i)
       {
-	int elt = (int) (v[i] ^ (v[i] >>> 32));
-	result = 31 * result + elt;
+        int elt = (int) (v[i] ^ (v[i] >>> 32));
+        result = 31 * result + elt;
       }
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of integer numbers.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2666,7 +2666,7 @@ public class Arrays
    * @param v an array of integer numbers for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(int[] v)
   {
@@ -2678,7 +2678,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of short numbers.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2689,7 +2689,7 @@ public class Arrays
    * @param v an array of short numbers for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(short[] v)
   {
@@ -2701,7 +2701,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of characters.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2712,7 +2712,7 @@ public class Arrays
    * @param v an array of characters for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(char[] v)
   {
@@ -2724,7 +2724,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of bytes.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2735,7 +2735,7 @@ public class Arrays
    * @param v an array of bytes for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(byte[] v)
   {
@@ -2747,7 +2747,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of booleans.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2758,7 +2758,7 @@ public class Arrays
    * @param v an array of booleans for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(boolean[] v)
   {
@@ -2770,7 +2770,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of floats.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2781,7 +2781,7 @@ public class Arrays
    * @param v an array of floats for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(float[] v)
   {
@@ -2793,7 +2793,7 @@ public class Arrays
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of doubles.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
@@ -2804,7 +2804,7 @@ public class Arrays
    * @param v an array of doubles for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(double[] v)
   {
@@ -2813,24 +2813,24 @@ public class Arrays
     int result = 1;
     for (int i = 0; i < v.length; ++i)
       {
-	long l = Double.doubleToLongBits(v[i]);
-	int elt = (int) (l ^ (l >>> 32));
-	result = 31 * result + elt;
+        long l = Double.doubleToLongBits(v[i]);
+        int elt = (int) (l ^ (l >>> 32));
+        result = 31 * result + elt;
       }
     return result;
   }
 
-  /** 
+  /**
    * Returns the hashcode of an array of objects.  If two arrays
    * are equal, according to equals(), they should have the
    * same hashcode.  The hashcode returned by the method is equal to that
-   * obtained by the corresponding List object.  
+   * obtained by the corresponding List object.
    * For null, 0 is returned.
    *
    * @param v an array of integer numbers for which the hash code should be
    *          computed.
    * @return the hash code of the array, or 0 if null was given.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int hashCode(Object[] v)
   {
@@ -2839,8 +2839,8 @@ public class Arrays
     int result = 1;
     for (int i = 0; i < v.length; ++i)
       {
-	int elt = v[i] == null ? 0 : v[i].hashCode();
-	result = 31 * result + elt;
+        int elt = v[i] == null ? 0 : v[i].hashCode();
+        result = 31 * result + elt;
       }
     return result;
   }
@@ -2852,30 +2852,30 @@ public class Arrays
     int result = 1;
     for (int i = 0; i < v.length; ++i)
       {
-	int elt;
-	if (v[i] == null)
-	  elt = 0;
-	else if (v[i] instanceof boolean[])
-	  elt = hashCode((boolean[]) v[i]);
-	else if (v[i] instanceof byte[])
-	  elt = hashCode((byte[]) v[i]);
-	else if (v[i] instanceof char[])
-	  elt = hashCode((char[]) v[i]);
-	else if (v[i] instanceof short[])
-	  elt = hashCode((short[]) v[i]);
-	else if (v[i] instanceof int[])
-	  elt = hashCode((int[]) v[i]);
-	else if (v[i] instanceof long[])
-	  elt = hashCode((long[]) v[i]);
-	else if (v[i] instanceof float[])
-	  elt = hashCode((float[]) v[i]);
-	else if (v[i] instanceof double[])
-	  elt = hashCode((double[]) v[i]);
-	else if (v[i] instanceof Object[])
-	  elt = hashCode((Object[]) v[i]);
-	else
-	  elt = v[i].hashCode();
-	result = 31 * result + elt;
+        int elt;
+        if (v[i] == null)
+          elt = 0;
+        else if (v[i] instanceof boolean[])
+          elt = hashCode((boolean[]) v[i]);
+        else if (v[i] instanceof byte[])
+          elt = hashCode((byte[]) v[i]);
+        else if (v[i] instanceof char[])
+          elt = hashCode((char[]) v[i]);
+        else if (v[i] instanceof short[])
+          elt = hashCode((short[]) v[i]);
+        else if (v[i] instanceof int[])
+          elt = hashCode((int[]) v[i]);
+        else if (v[i] instanceof long[])
+          elt = hashCode((long[]) v[i]);
+        else if (v[i] instanceof float[])
+          elt = hashCode((float[]) v[i]);
+        else if (v[i] instanceof double[])
+          elt = hashCode((double[]) v[i]);
+        else if (v[i] instanceof Object[])
+          elt = hashCode((Object[]) v[i]);
+        else
+          elt = v[i].hashCode();
+        result = 31 * result + elt;
       }
     return result;
   }
@@ -2890,37 +2890,37 @@ public class Arrays
 
     for (int i = 0; i < v1.length; ++i)
       {
-	Object e1 = v1[i];
-	Object e2 = v2[i];
+        Object e1 = v1[i];
+        Object e2 = v2[i];
 
-	if (e1 == e2)
-	  continue;
-	if (e1 == null || e2 == null)
-	  return false;
+        if (e1 == e2)
+          continue;
+        if (e1 == null || e2 == null)
+          return false;
 
-	boolean check;
-	if (e1 instanceof boolean[] && e2 instanceof boolean[])
-	  check = equals((boolean[]) e1, (boolean[]) e2);
-	else if (e1 instanceof byte[] && e2 instanceof byte[])
-	  check = equals((byte[]) e1, (byte[]) e2);
-	else if (e1 instanceof char[] && e2 instanceof char[])
-	  check = equals((char[]) e1, (char[]) e2);
-	else if (e1 instanceof short[] && e2 instanceof short[])
-	  check = equals((short[]) e1, (short[]) e2);
-	else if (e1 instanceof int[] && e2 instanceof int[])
-	  check = equals((int[]) e1, (int[]) e2);
-	else if (e1 instanceof long[] && e2 instanceof long[])
-	  check = equals((long[]) e1, (long[]) e2);
-	else if (e1 instanceof float[] && e2 instanceof float[])
-	  check = equals((float[]) e1, (float[]) e2);
-	else if (e1 instanceof double[] && e2 instanceof double[])
-	  check = equals((double[]) e1, (double[]) e2);
-	else if (e1 instanceof Object[] && e2 instanceof Object[])
-	  check = equals((Object[]) e1, (Object[]) e2);
-	else
-	  check = e1.equals(e2);
-	if (! check)
-	  return false;
+        boolean check;
+        if (e1 instanceof boolean[] && e2 instanceof boolean[])
+          check = equals((boolean[]) e1, (boolean[]) e2);
+        else if (e1 instanceof byte[] && e2 instanceof byte[])
+          check = equals((byte[]) e1, (byte[]) e2);
+        else if (e1 instanceof char[] && e2 instanceof char[])
+          check = equals((char[]) e1, (char[]) e2);
+        else if (e1 instanceof short[] && e2 instanceof short[])
+          check = equals((short[]) e1, (short[]) e2);
+        else if (e1 instanceof int[] && e2 instanceof int[])
+          check = equals((int[]) e1, (int[]) e2);
+        else if (e1 instanceof long[] && e2 instanceof long[])
+          check = equals((long[]) e1, (long[]) e2);
+        else if (e1 instanceof float[] && e2 instanceof float[])
+          check = equals((float[]) e1, (float[]) e2);
+        else if (e1 instanceof double[] && e2 instanceof double[])
+          check = equals((double[]) e1, (double[]) e2);
+        else if (e1 instanceof Object[] && e2 instanceof Object[])
+          check = equals((Object[]) e1, (Object[]) e2);
+        else
+          check = e1.equals(e2);
+        if (! check)
+          return false;
       }
 
     return true;
@@ -2940,9 +2940,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -2962,9 +2962,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -2984,9 +2984,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3006,9 +3006,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3028,9 +3028,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3050,9 +3050,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3072,9 +3072,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3094,9 +3094,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3116,9 +3116,9 @@ public class Arrays
     CPStringBuilder b = new CPStringBuilder("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	b.append(v[i]);
+        if (i > 0)
+          b.append(", ");
+        b.append(v[i]);
       }
     b.append("]");
     return b.toString();
@@ -3129,40 +3129,40 @@ public class Arrays
     b.append("[");
     for (int i = 0; i < v.length; ++i)
       {
-	if (i > 0)
-	  b.append(", ");
-	Object elt = v[i];
-	if (elt == null)
-	  b.append("null");
-	else if (elt instanceof boolean[])
-	  b.append(toString((boolean[]) elt));
-	else if (elt instanceof byte[])
-	  b.append(toString((byte[]) elt));
-	else if (elt instanceof char[])
-	  b.append(toString((char[]) elt));
-	else if (elt instanceof short[])
-	  b.append(toString((short[]) elt));
-	else if (elt instanceof int[])
-	  b.append(toString((int[]) elt));
-	else if (elt instanceof long[])
-	  b.append(toString((long[]) elt));
-	else if (elt instanceof float[])
-	  b.append(toString((float[]) elt));
-	else if (elt instanceof double[])
-	  b.append(toString((double[]) elt));
-	else if (elt instanceof Object[])
-	  {
-	    Object[] os = (Object[]) elt;
-	    if (seen.contains(os))
-	      b.append("[...]");
-	    else
-	      {
-		seen.add(os);
-		deepToString(os, b, seen);
-	      }
-	  }
-	else
-	  b.append(elt);
+        if (i > 0)
+          b.append(", ");
+        Object elt = v[i];
+        if (elt == null)
+          b.append("null");
+        else if (elt instanceof boolean[])
+          b.append(toString((boolean[]) elt));
+        else if (elt instanceof byte[])
+          b.append(toString((byte[]) elt));
+        else if (elt instanceof char[])
+          b.append(toString((char[]) elt));
+        else if (elt instanceof short[])
+          b.append(toString((short[]) elt));
+        else if (elt instanceof int[])
+          b.append(toString((int[]) elt));
+        else if (elt instanceof long[])
+          b.append(toString((long[]) elt));
+        else if (elt instanceof float[])
+          b.append(toString((float[]) elt));
+        else if (elt instanceof double[])
+          b.append(toString((double[]) elt));
+        else if (elt instanceof Object[])
+          {
+            Object[] os = (Object[]) elt;
+            if (seen.contains(os))
+              b.append("[...]");
+            else
+              {
+                seen.add(os);
+                deepToString(os, b, seen);
+              }
+          }
+        else
+          b.append(elt);
       }
     b.append("]");
   }
@@ -3223,7 +3223,7 @@ public class Arrays
      *
      * @param index The index to retrieve an object from.
      * @return The object at the array index specified.
-     */ 
+     */
     public E get(int index)
     {
       return a[index];
@@ -3325,7 +3325,7 @@ public class Arrays
       int size = a.length;
       if (array.length < size)
         array = (T[]) Array.newInstance(array.getClass().getComponentType(),
-					size);
+                                        size);
       else if (array.length > size)
         array[size] = null;
 
@@ -3390,13 +3390,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     boolean[] newArray = new boolean[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, false);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, false);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3459,13 +3459,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     byte[] newArray = new byte[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, (byte)0);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, (byte)0);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3528,13 +3528,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     char[] newArray = new char[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, '\0');
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, '\0');
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3597,13 +3597,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     double[] newArray = new double[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, 0d);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, 0d);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3666,13 +3666,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     float[] newArray = new float[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, 0f);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, 0f);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3735,13 +3735,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     int[] newArray = new int[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, 0);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, 0);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3804,13 +3804,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     long[] newArray = new long[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, 0L);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, 0L);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3873,13 +3873,13 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     short[] newArray = new short[to - from];
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, (short)0);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, (short)0);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3942,14 +3942,14 @@ public class Arrays
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     Class elemType = original.getClass().getComponentType();
     T[] newArray = (T[]) Array.newInstance(elemType, to - from);
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, null);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, null);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
@@ -3977,7 +3977,7 @@ public class Arrays
    * @see #copyOfRange(U[],int,int,Class)
    */
   public static  T[] copyOf(U[] original, int newLength,
-				 Class newType)
+                                 Class newType)
   {
     if (newLength < 0)
       throw new NegativeArraySizeException("The array size is negative.");
@@ -4014,18 +4014,18 @@ public class Arrays
    * @see #copyOf(T[],int)
    */
   public static  T[] copyOfRange(U[] original, int from, int to,
-				      Class newType)
+                                      Class newType)
   {
     if (from > to)
       throw new IllegalArgumentException("The initial index is after " +
-					 "the final index.");
+                                         "the final index.");
     T[] newArray = (T[]) Array.newInstance(newType.getComponentType(),
-					   to - from);
+                                           to - from);
     if (to > original.length)
       {
-	System.arraycopy(original, from, newArray, 0,
-			 original.length - from);
-	fill(newArray, original.length, newArray.length, null);
+        System.arraycopy(original, from, newArray, 0,
+                         original.length - from);
+        fill(newArray, original.length, newArray.length, null);
       }
     else
       System.arraycopy(original, from, newArray, 0, to - from);
diff --git a/libjava/classpath/java/util/BitSet.java b/libjava/classpath/java/util/BitSet.java
index 13bf8a13cff..1072978a4fd 100644
--- a/libjava/classpath/java/util/BitSet.java
+++ b/libjava/classpath/java/util/BitSet.java
@@ -107,7 +107,7 @@ public class BitSet implements Cloneable, Serializable
   {
     if (nbits < 0)
       throw new NegativeArraySizeException();
-    
+
     int length = nbits >>> 6;
     if ((nbits & LONG_MASK) != 0)
       ++length;
@@ -412,7 +412,7 @@ public class BitSet implements Cloneable, Serializable
    * Then the following definition of the hashCode method
    * would be a correct implementation of the actual algorithm:
    *
-   * 
+   *
 
                  public int hashCode()
 {
   long h = 1234;
@@ -535,7 +535,7 @@ public class BitSet implements Cloneable, Serializable
    * Returns the index of the next true bit, from the specified bit
    * (inclusive). If there is none, -1 is returned. You can iterate over
    * all true bits with this loop:
                  
-   * 
+   *
 
                  for (int i = bs.nextSetBit(0); i >= 0; i = bs.nextSetBit(i + 1))
 {
   // operate on i here
@@ -750,8 +750,8 @@ public class BitSet implements Cloneable, Serializable
   {
     for (int i = other.bits.length - 1; i >= 0; i--)
       {
-	if ((bits[i] & other.bits[i]) != other.bits[i])
-	  return false;
+        if ((bits[i] & other.bits[i]) != other.bits[i])
+          return false;
       }
     return true;
   }
diff --git a/libjava/classpath/java/util/Calendar.java b/libjava/classpath/java/util/Calendar.java
index 0449e126db8..8123b170677 100644
--- a/libjava/classpath/java/util/Calendar.java
+++ b/libjava/classpath/java/util/Calendar.java
@@ -1,5 +1,5 @@
 /* Calendar.java --
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,  
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -487,7 +487,7 @@ public abstract class Calendar
   }
 
   /**
-   * The set of properties for obtaining the minimum number of days in 
+   * The set of properties for obtaining the minimum number of days in
    * the first week.
    */
   private static transient final Properties properties;
@@ -498,7 +498,7 @@ public abstract class Calendar
   static
   {
     properties = new Properties();
-    try 
+    try
       {
         properties.load(Calendar.class.getResourceAsStream("weeks.properties"));
       }
@@ -538,19 +538,19 @@ public abstract class Calendar
       first = properties.getProperty("firstDay.DEFAULT");
     try
       {
-	if (min != null)
-	  minimalDaysInFirstWeek = Integer.parseInt(min);
+        if (min != null)
+          minimalDaysInFirstWeek = Integer.parseInt(min);
       }
     catch (NumberFormatException ex)
       {
-	minimalDaysInFirstWeek = 1;
+        minimalDaysInFirstWeek = 1;
       }
 
     firstDayOfWeek = 1;
     if (first != null)
       for (int i = 0; i < 8; i++)
-	if (days[i].equals(first))
-	  firstDayOfWeek = i;
+        if (days[i].equals(first))
+          firstDayOfWeek = i;
 
     clear();
   }
@@ -558,7 +558,7 @@ public abstract class Calendar
   /**
    * Creates a calendar representing the actual time, using the default
    * time zone and locale.
-   * 
+   *
    * @return The new calendar.
    */
   public static synchronized Calendar getInstance()
@@ -569,11 +569,11 @@ public abstract class Calendar
   /**
    * Creates a calendar representing the actual time, using the given
    * time zone and the default locale.
-   * 
+   *
    * @param zone a time zone (null not permitted).
-   * 
+   *
    * @return The new calendar.
-   * 
+   *
    * @throws NullPointerException if zone is null.
    */
   public static synchronized Calendar getInstance(TimeZone zone)
@@ -584,11 +584,11 @@ public abstract class Calendar
   /**
    * Creates a calendar representing the actual time, using the default
    * time zone and the given locale.
-   * 
+   *
    * @param locale a locale (null not permitted).
-   * 
+   *
    * @return The new calendar.
-   * 
+   *
    * @throws NullPointerException if locale is null.
    */
   public static synchronized Calendar getInstance(Locale locale)
@@ -611,12 +611,12 @@ public abstract class Calendar
   /**
    * Creates a calendar representing the actual time, using the given
    * time zone and locale.
-   * 
+   *
    * @param zone a time zone (null not permitted).
    * @param locale a locale (null not permitted).
-   * 
+   *
    * @return The new calendar.
-   * 
+   *
    * @throws NullPointerException if zone or locale
    *     is null.
    */
@@ -627,43 +627,43 @@ public abstract class Calendar
 
     try
       {
-	if (calendarClass == null)
-	  {
-	    calendarClass = Class.forName(calendarClassName);
-	    if (Calendar.class.isAssignableFrom(calendarClass))
-	      cache.put(locale, calendarClass);
-	  }
+        if (calendarClass == null)
+          {
+            calendarClass = Class.forName(calendarClassName);
+            if (Calendar.class.isAssignableFrom(calendarClass))
+              cache.put(locale, calendarClass);
+          }
 
-	// GregorianCalendar is by far the most common case. Optimize by 
-	// avoiding reflection.
-	if (calendarClass == GregorianCalendar.class)
-	  return new GregorianCalendar(zone, locale);
+        // GregorianCalendar is by far the most common case. Optimize by
+        // avoiding reflection.
+        if (calendarClass == GregorianCalendar.class)
+          return new GregorianCalendar(zone, locale);
 
-	if (Calendar.class.isAssignableFrom(calendarClass))
-	  {
-	    Constructor ctor = calendarClass.getConstructor(ctorArgTypes);
-	    return (Calendar) ctor.newInstance(new Object[] { zone, locale });
-	  }
+        if (Calendar.class.isAssignableFrom(calendarClass))
+          {
+            Constructor ctor = calendarClass.getConstructor(ctorArgTypes);
+            return (Calendar) ctor.newInstance(new Object[] { zone, locale });
+          }
       }
     catch (ClassNotFoundException ex)
       {
-	exception = ex;
+        exception = ex;
       }
     catch (IllegalAccessException ex)
       {
-	exception = ex;
+        exception = ex;
       }
     catch (NoSuchMethodException ex)
       {
-	exception = ex;
+        exception = ex;
       }
     catch (InstantiationException ex)
       {
-	exception = ex;
+        exception = ex;
       }
     catch (InvocationTargetException ex)
       {
-	exception = ex;
+        exception = ex;
       }
 
     throw new RuntimeException("Error instantiating calendar for locale "
@@ -710,9 +710,9 @@ public abstract class Calendar
   /**
    * Sets this Calendar's time to the given Date.  All time fields
    * are invalidated by this method.
-   * 
+   *
    * @param date  the date (null not permitted).
-   * 
+   *
    * @throws NullPointerException if date is null.
    */
   public final void setTime(Date date)
@@ -794,7 +794,7 @@ public abstract class Calendar
   {
     if (isTimeSet)
       for (int i = 0; i < FIELD_COUNT; i++)
-	isSet[i] = false;
+        isSet[i] = false;
     isTimeSet = false;
     fields[field] = value;
     isSet[field] = true;
@@ -808,74 +808,74 @@ public abstract class Calendar
     switch (field)
       {
       case MONTH: // pattern 1,2 or 3
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	break;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        break;
       case DAY_OF_MONTH: // pattern 1
-	isSet[YEAR] = true;
-	isSet[MONTH] = true;
-	isSet[WEEK_OF_MONTH] = true;
-	isSet[DAY_OF_WEEK] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	break;
+        isSet[YEAR] = true;
+        isSet[MONTH] = true;
+        isSet[WEEK_OF_MONTH] = true;
+        isSet[DAY_OF_WEEK] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        break;
       case WEEK_OF_MONTH: // pattern 2
-	if (! isSet[DAY_OF_WEEK])
-	  fields[DAY_OF_WEEK] = getFirstDayOfWeek();
-	isSet[YEAR] = true;
-	isSet[MONTH] = true;
-	isSet[DAY_OF_WEEK] = true;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	break;
+        if (! isSet[DAY_OF_WEEK])
+          fields[DAY_OF_WEEK] = getFirstDayOfWeek();
+        isSet[YEAR] = true;
+        isSet[MONTH] = true;
+        isSet[DAY_OF_WEEK] = true;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        break;
       case DAY_OF_WEEK_IN_MONTH: // pattern 3
-	if (! isSet[DAY_OF_WEEK])
-	  fields[DAY_OF_WEEK] = getFirstDayOfWeek();
-	isSet[YEAR] = true;
-	isSet[MONTH] = true;
-	isSet[DAY_OF_WEEK] = true;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	break;
+        if (! isSet[DAY_OF_WEEK])
+          fields[DAY_OF_WEEK] = getFirstDayOfWeek();
+        isSet[YEAR] = true;
+        isSet[MONTH] = true;
+        isSet[DAY_OF_WEEK] = true;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        break;
       case DAY_OF_YEAR: // pattern 4
-	isSet[YEAR] = true;
-	isSet[MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	break;
+        isSet[YEAR] = true;
+        isSet[MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        break;
       case WEEK_OF_YEAR: // pattern 5
-	if (! isSet[DAY_OF_WEEK])
-	  fields[DAY_OF_WEEK] = getFirstDayOfWeek();
-	isSet[YEAR] = true;
-	isSet[DAY_OF_WEEK] = true;
-	isSet[MONTH] = false;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	break;
+        if (! isSet[DAY_OF_WEEK])
+          fields[DAY_OF_WEEK] = getFirstDayOfWeek();
+        isSet[YEAR] = true;
+        isSet[DAY_OF_WEEK] = true;
+        isSet[MONTH] = false;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        break;
       case AM_PM:
-	isSet[HOUR] = true;
-	isSet[HOUR_OF_DAY] = false;
-	break;
+        isSet[HOUR] = true;
+        isSet[HOUR_OF_DAY] = false;
+        break;
       case HOUR_OF_DAY:
-	isSet[AM_PM] = false;
-	isSet[HOUR] = false;
-	break;
+        isSet[AM_PM] = false;
+        isSet[HOUR] = false;
+        break;
       case HOUR:
-	isSet[AM_PM] = true;
-	isSet[HOUR_OF_DAY] = false;
-	break;
+        isSet[AM_PM] = true;
+        isSet[HOUR_OF_DAY] = false;
+        break;
       case DST_OFFSET:
-	explicitDSTOffset = true;
+        explicitDSTOffset = true;
       }
 
     // May have crossed over a DST boundary.
@@ -950,7 +950,7 @@ public abstract class Calendar
     isTimeSet = false;
     areFieldsSet = false;
     int zoneOffs = zone.getRawOffset();
-    int[] tempFields = 
+    int[] tempFields =
                        {
                          1, 1970, JANUARY, 1, 1, 1, 1, THURSDAY, 1, AM, 0, 0, 0,
                          0, 0, zoneOffs, 0
@@ -969,7 +969,7 @@ public abstract class Calendar
    */
   public final void clear(int field)
   {
-    int[] tempFields = 
+    int[] tempFields =
                        {
                          1, 1970, JANUARY, 1, 1, 1, 1, THURSDAY, 1, AM, 0, 0, 0,
                          0, 0, zone.getRawOffset(), 0
@@ -1118,13 +1118,13 @@ public abstract class Calendar
   {
     while (amount > 0)
       {
-	roll(field, true);
-	amount--;
+        roll(field, true);
+        amount--;
       }
     while (amount < 0)
       {
-	roll(field, false);
-	amount++;
+        roll(field, false);
+        amount++;
       }
   }
 
@@ -1260,9 +1260,9 @@ public abstract class Calendar
     tmp.set(field, min);
     for (; min > end; min--)
       {
-	tmp.add(field, -1); // Try to get smaller
-	if (tmp.get(field) != min - 1)
-	  break; // Done if not successful
+        tmp.add(field, -1); // Try to get smaller
+        if (tmp.get(field) != min - 1)
+          break; // Done if not successful
       }
     return min;
   }
@@ -1285,9 +1285,9 @@ public abstract class Calendar
     tmp.set(field, max);
     for (; max < end; max++)
       {
-	tmp.add(field, 1);
-	if (tmp.get(field) != max + 1)
-	  break;
+        tmp.add(field, 1);
+        if (tmp.get(field) != max + 1)
+          break;
       }
     return max;
   }
@@ -1295,14 +1295,14 @@ public abstract class Calendar
   /**
    * Compares the time of two calendar instances.
    * @param cal the calendar to which the time should be compared.
-   * @return 0 if the two calendars are set to the same time, 
-   * less than 0 if the time of this calendar is before that of 
+   * @return 0 if the two calendars are set to the same time,
+   * less than 0 if the time of this calendar is before that of
    * cal, or more than 0 if the time of this calendar is after
    * that of cal.
    *
    * @param cal the calendar to compare this instance with.
    * @throws NullPointerException if cal is null.
-   * @throws IllegalArgumentException if either calendar has fields set to 
+   * @throws IllegalArgumentException if either calendar has fields set to
    * invalid values.
    * @since 1.5
    */
@@ -1324,18 +1324,18 @@ public abstract class Calendar
   {
     try
       {
-	Calendar cal = (Calendar) super.clone();
-	cal.fields = (int[]) fields.clone();
-	cal.isSet = (boolean[]) isSet.clone();
-	return cal;
+        Calendar cal = (Calendar) super.clone();
+        cal.fields = (int[]) fields.clone();
+        cal.isSet = (boolean[]) isSet.clone();
+        return cal;
       }
     catch (CloneNotSupportedException ex)
       {
-	return null;
+        return null;
       }
   }
 
-  private static final String[] fieldNames = 
+  private static final String[] fieldNames =
                                              {
                                                ",ERA=", ",YEAR=", ",MONTH=",
                                                ",WEEK_OF_YEAR=",
@@ -1367,11 +1367,11 @@ public abstract class Calendar
     sb.append(",areFieldsSet=" + areFieldsSet);
     for (int i = 0; i < FIELD_COUNT; i++)
       {
-	sb.append(fieldNames[i]);
-	if (isSet[i])
-	  sb.append(fields[i]);
-	else
-	  sb.append("?");
+        sb.append(fieldNames[i]);
+        if (isSet[i])
+          sb.append(fields[i]);
+        else
+          sb.append("?");
       }
     sb.append(",lenient=").append(lenient);
     sb.append(",firstDayOfWeek=").append(firstDayOfWeek);
@@ -1407,13 +1407,13 @@ public abstract class Calendar
 
     if (serialVersionOnStream > 1)
       {
-	// This is my interpretation of the serial number:
-	// Sun wants to remove all fields from the stream someday
-	// and will then increase the serialVersion number again.
-	// We prepare to be compatible.
-	fields = new int[FIELD_COUNT];
-	isSet = new boolean[FIELD_COUNT];
-	areFieldsSet = false;
+        // This is my interpretation of the serial number:
+        // Sun wants to remove all fields from the stream someday
+        // and will then increase the serialVersion number again.
+        // We prepare to be compatible.
+        fields = new int[FIELD_COUNT];
+        isSet = new boolean[FIELD_COUNT];
+        areFieldsSet = false;
       }
   }
 
@@ -1449,15 +1449,15 @@ public abstract class Calendar
   {
     if (field < 0 || field >= FIELD_COUNT)
       throw new IllegalArgumentException("The field value, " + field +
-					 ", is invalid.");
+                                         ", is invalid.");
     if (style != SHORT && style != LONG)
       throw new IllegalArgumentException("The style must be either " +
-					 "short or long.");
+                                         "short or long.");
     if (field == YEAR || field == WEEK_OF_YEAR ||
-	field == WEEK_OF_MONTH || field == DAY_OF_MONTH ||
-	field == DAY_OF_YEAR || field == DAY_OF_WEEK_IN_MONTH ||
-	field == HOUR || field == HOUR_OF_DAY || field == MINUTE ||
-	field == SECOND || field == MILLISECOND)
+        field == WEEK_OF_MONTH || field == DAY_OF_MONTH ||
+        field == DAY_OF_YEAR || field == DAY_OF_WEEK_IN_MONTH ||
+        field == HOUR || field == HOUR_OF_DAY || field == MINUTE ||
+        field == SECOND || field == MILLISECOND)
       return null;
 
     int value = get(field);
@@ -1466,30 +1466,30 @@ public abstract class Calendar
       return syms.getEras()[value];
     if (field == MONTH)
       if (style == LONG)
-	return syms.getMonths()[value];
-      else 
-	return syms.getShortMonths()[value];
+        return syms.getMonths()[value];
+      else
+        return syms.getShortMonths()[value];
     if (field == DAY_OF_WEEK)
       if (style == LONG)
-	return syms.getWeekdays()[value];
+        return syms.getWeekdays()[value];
       else
-	return syms.getShortWeekdays()[value];
+        return syms.getShortWeekdays()[value];
     if (field == AM_PM)
       return syms.getAmPmStrings()[value];
     if (field == ZONE_OFFSET)
       if (style == LONG)
-	return syms.getZoneStrings()[value][1];
+        return syms.getZoneStrings()[value][1];
       else
-	return syms.getZoneStrings()[value][2];
+        return syms.getZoneStrings()[value][2];
     if (field == DST_OFFSET)
       if (style == LONG)
-	return syms.getZoneStrings()[value][3];
+        return syms.getZoneStrings()[value][3];
       else
-	return syms.getZoneStrings()[value][4];
+        return syms.getZoneStrings()[value][4];
 
     throw new InternalError("Failed to resolve field " + field +
-			    " with style " + style + " for locale " +
-			    locale);
+                            " with style " + style + " for locale " +
+                            locale);
   }
 
   /**
@@ -1528,93 +1528,93 @@ public abstract class Calendar
   {
     if (field < 0 || field >= FIELD_COUNT)
       throw new IllegalArgumentException("The field value, " + field +
-					 ", is invalid.");
+                                         ", is invalid.");
     if (style != SHORT && style != LONG && style != ALL_STYLES)
       throw new IllegalArgumentException("The style must be either " +
-					 "short, long or all styles.");
+                                         "short, long or all styles.");
     if (field == YEAR || field == WEEK_OF_YEAR ||
-	field == WEEK_OF_MONTH || field == DAY_OF_MONTH ||
-	field == DAY_OF_YEAR || field == DAY_OF_WEEK_IN_MONTH ||
-	field == HOUR || field == HOUR_OF_DAY || field == MINUTE ||
-	field == SECOND || field == MILLISECOND)
+        field == WEEK_OF_MONTH || field == DAY_OF_MONTH ||
+        field == DAY_OF_YEAR || field == DAY_OF_WEEK_IN_MONTH ||
+        field == HOUR || field == HOUR_OF_DAY || field == MINUTE ||
+        field == SECOND || field == MILLISECOND)
       return null;
 
     DateFormatSymbols syms = DateFormatSymbols.getInstance(locale);
     Map map = new HashMap();
     if (field == ERA)
       {
-	String[] eras = syms.getEras();
-	for (int a = 0; a < eras.length; ++a)
-	  map.put(eras[a], a);
-	return map;
+        String[] eras = syms.getEras();
+        for (int a = 0; a < eras.length; ++a)
+          map.put(eras[a], a);
+        return map;
       }
     if (field == MONTH)
       {
-	if (style == LONG || style == ALL_STYLES)
-	  {
-	    String[] months = syms.getMonths();
-	    for (int a = 0; a < months.length; ++a)
-	      map.put(months[a], a);
-	  }
-	if (style == SHORT || style == ALL_STYLES)
-	  {
-	    String[] months = syms.getShortMonths();
-	    for (int a = 0; a < months.length; ++a)
-	      map.put(months[a], a);
-	  }
-	return map;
+        if (style == LONG || style == ALL_STYLES)
+          {
+            String[] months = syms.getMonths();
+            for (int a = 0; a < months.length; ++a)
+              map.put(months[a], a);
+          }
+        if (style == SHORT || style == ALL_STYLES)
+          {
+            String[] months = syms.getShortMonths();
+            for (int a = 0; a < months.length; ++a)
+              map.put(months[a], a);
+          }
+        return map;
       }
     if (field == DAY_OF_WEEK)
       {
-	if (style == LONG || style == ALL_STYLES)
-	  {
-	    String[] weekdays = syms.getWeekdays();
-	    for (int a = SUNDAY; a < weekdays.length; ++a)
-	      map.put(weekdays[a], a);
-	  }
-	if (style == SHORT || style == ALL_STYLES)
-	  {
-	    String[] weekdays = syms.getShortWeekdays();
-	    for (int a = SUNDAY; a < weekdays.length; ++a)
-	      map.put(weekdays[a], a);
-	  }
-	return map;
+        if (style == LONG || style == ALL_STYLES)
+          {
+            String[] weekdays = syms.getWeekdays();
+            for (int a = SUNDAY; a < weekdays.length; ++a)
+              map.put(weekdays[a], a);
+          }
+        if (style == SHORT || style == ALL_STYLES)
+          {
+            String[] weekdays = syms.getShortWeekdays();
+            for (int a = SUNDAY; a < weekdays.length; ++a)
+              map.put(weekdays[a], a);
+          }
+        return map;
       }
     if (field == AM_PM)
       {
-	String[] ampms = syms.getAmPmStrings();
-	for (int a = 0; a < ampms.length; ++a)
-	  map.put(ampms[a], a);
-	return map;
+        String[] ampms = syms.getAmPmStrings();
+        for (int a = 0; a < ampms.length; ++a)
+          map.put(ampms[a], a);
+        return map;
       }
     if (field == ZONE_OFFSET)
       {
-	String[][] zones = syms.getZoneStrings();
-	for (int a = 0; a < zones.length; ++a)
-	  {
-	    if (style == LONG || style == ALL_STYLES) 
-	      map.put(zones[a][1], a);
-	    if (style == SHORT || style == ALL_STYLES)
-	      map.put(zones[a][2], a);
-	  }
-	return map;
+        String[][] zones = syms.getZoneStrings();
+        for (int a = 0; a < zones.length; ++a)
+          {
+            if (style == LONG || style == ALL_STYLES)
+              map.put(zones[a][1], a);
+            if (style == SHORT || style == ALL_STYLES)
+              map.put(zones[a][2], a);
+          }
+        return map;
       }
     if (field == DST_OFFSET)
       {
-	String[][] zones = syms.getZoneStrings();
-	for (int a = 0; a < zones.length; ++a)
-	  {
-	    if (style == LONG || style == ALL_STYLES) 
-	      map.put(zones[a][3], a);
-	    if (style == SHORT || style == ALL_STYLES)
-	      map.put(zones[a][4], a);
-	  }
-	return map;
+        String[][] zones = syms.getZoneStrings();
+        for (int a = 0; a < zones.length; ++a)
+          {
+            if (style == LONG || style == ALL_STYLES)
+              map.put(zones[a][3], a);
+            if (style == SHORT || style == ALL_STYLES)
+              map.put(zones[a][4], a);
+          }
+        return map;
       }
-    
+
     throw new InternalError("Failed to resolve field " + field +
-			    " with style " + style + " for locale " +
-			    locale);
+                            " with style " + style + " for locale " +
+                            locale);
   }
 
 }
diff --git a/libjava/classpath/java/util/Collections.java b/libjava/classpath/java/util/Collections.java
index 066c9d53893..828c6ecea12 100644
--- a/libjava/classpath/java/util/Collections.java
+++ b/libjava/classpath/java/util/Collections.java
@@ -354,7 +354,7 @@ public class Collections
      * This is true only if the given collection is also empty.
      * @param c The collection of objects, which should be compared
      *          against the members of this list.
-     * @return true if c is also empty. 
+     * @return true if c is also empty.
      */
     public boolean containsAll(Collection c)
     {
@@ -552,7 +552,7 @@ public class Collections
     /**
      * No mappings, so this returns null.
      * @param o The key of the object to retrieve.
-     * @return null. 
+     * @return null.
      */
     public V get(Object o)
     {
@@ -617,7 +617,7 @@ public class Collections
     }
   } // class EmptyMap
 
-
+
   /**
    * Compare two objects with or without a Comparator. If c is null, uses the
    * natural ordering. Slightly slower than doing it inline if the JVM isn't
@@ -653,8 +653,8 @@ public class Collections
    * @throws NullPointerException if a null element has compareTo called
    * @see #sort(List)
    */
-  public static  int binarySearch(List> l, 
-				     T key)
+  public static  int binarySearch(List> l,
+                                     T key)
   {
     return binarySearch(l, key, null);
   }
@@ -687,7 +687,7 @@ public class Collections
    * @see #sort(List, Comparator)
    */
   public static  int binarySearch(List l, T key,
-				     Comparator c)
+                                     Comparator c)
   {
     int pos = 0;
     int low = 0;
@@ -697,53 +697,53 @@ public class Collections
     // if the list is sequential-access.
     if (isSequential(l))
       {
-	ListIterator itr = ((List) l).listIterator();
+        ListIterator itr = ((List) l).listIterator();
         int i = 0;
-	T o = itr.next(); // Assumes list is not empty (see isSequential)
-	boolean forward = true;
+        T o = itr.next(); // Assumes list is not empty (see isSequential)
+        boolean forward = true;
         while (low <= hi)
           {
             pos = (low + hi) >>> 1;
             if (i < pos)
-	      {
-		if (!forward)
-		  itr.next(); // Changing direction first.
-		for ( ; i != pos; i++, o = itr.next())
+              {
+                if (!forward)
+                  itr.next(); // Changing direction first.
+                for ( ; i != pos; i++, o = itr.next())
                   ;
-		forward = true;
-	      }
+                forward = true;
+              }
             else
-	      {
-		if (forward)
-		  itr.previous(); // Changing direction first.
-		for ( ; i != pos; i--, o = itr.previous())
+              {
+                if (forward)
+                  itr.previous(); // Changing direction first.
+                for ( ; i != pos; i--, o = itr.previous())
                   ;
-		forward = false;
-	      }
-	    final int d = compare(o, key, c);
-	    if (d == 0)
+                forward = false;
+              }
+            final int d = compare(o, key, c);
+            if (d == 0)
               return pos;
-	    else if (d > 0)
+            else if (d > 0)
               hi = pos - 1;
-	    else
+            else
               // This gets the insertion point right on the last loop
               low = ++pos;
           }
       }
     else
       {
-	while (low <= hi)
-	  {
-	    pos = (low + hi) >>> 1;
-	    final int d = compare(((List) l).get(pos), key, c);
-	    if (d == 0)
+        while (low <= hi)
+          {
+            pos = (low + hi) >>> 1;
+            final int d = compare(((List) l).get(pos), key, c);
+            if (d == 0)
               return pos;
-	    else if (d > 0)
+            else if (d > 0)
               hi = pos - 1;
-	    else
+            else
               // This gets the insertion point right on the last loop
               low = ++pos;
-	  }
+          }
       }
 
     // If we failed to find it, we do the same whichever search we did.
@@ -799,7 +799,7 @@ public class Collections
        */
       public final boolean hasMoreElements()
       {
-	return i.hasNext();
+        return i.hasNext();
       }
 
       /**
@@ -810,7 +810,7 @@ public class Collections
        */
       public final T nextElement()
       {
-	return i.next();
+        return i.next();
       }
     };
   }
@@ -829,8 +829,8 @@ public class Collections
     ListIterator itr = l.listIterator();
     for (int i = l.size() - 1; i >= 0; --i)
       {
-	itr.next();
-	itr.set(val);
+        itr.next();
+        itr.set(val);
       }
   }
 
@@ -928,16 +928,16 @@ public class Collections
    *        (only possible when order is null)
    */
   public static  T max(Collection c,
-			  Comparator order)
+                          Comparator order)
   {
     Iterator itr = c.iterator();
     T max = itr.next(); // throws NoSuchElementException
     int csize = c.size();
     for (int i = 1; i < csize; i++)
       {
-	T o = itr.next();
-	if (compare(max, o, order) < 0)
-	  max = o;
+        T o = itr.next();
+        if (compare(max, o, order) < 0)
+          max = o;
       }
     return max;
   }
@@ -974,16 +974,16 @@ public class Collections
    *        (only possible when order is null)
    */
   public static  T min(Collection c,
-			  Comparator order)
+                          Comparator order)
   {
     Iterator itr = c.iterator();
-    T min = itr.next();	// throws NoSuchElementExcception
+    T min = itr.next(); // throws NoSuchElementExcception
     int csize = c.size();
     for (int i = 1; i < csize; i++)
       {
-	T o = itr.next();
-	if (compare(min, o, order) > 0)
-	  min = o;
+        T o = itr.next();
+        if (compare(min, o, order) > 0)
+          min = o;
       }
     return min;
   }
@@ -1044,7 +1044,7 @@ public class Collections
     CopiesList(int n, T o)
     {
       if (n < 0)
-	throw new IllegalArgumentException();
+        throw new IllegalArgumentException();
       this.n = n;
       element = o;
     }
@@ -1190,12 +1190,12 @@ public class Collections
     ListIterator i2 = l.listIterator(pos2);
     while (pos1 < pos2)
       {
-	Object o1 = i1.next();
+        Object o1 = i1.next();
     Object o2 = i2.previous();
-	i1.set(o2);
-	i2.set(o1);
-	++pos1;
-	--pos2;
+        i1.set(o2);
+        i2.set(o1);
+        ++pos1;
+        --pos2;
       }
   }
 
@@ -1221,7 +1221,7 @@ public class Collections
     {
       public int compare(T a, T b)
       {
-	return - c.compare(a, b);
+        return - c.compare(a, b);
       }
     };
   }
@@ -1344,7 +1344,7 @@ public class Collections
 
         // Now, make the swaps. We must take the remainder every time through
         // the inner loop so that we don't overflow i to negative values.
-	List objList = (List) list;
+        List objList = (List) list;
         while (--lcm >= 0)
           {
             Object o = objList.get(lcm);
@@ -1381,10 +1381,10 @@ public class Collections
     if (defaultRandom == null)
       {
         synchronized (Collections.class)
-	  {
-	    if (defaultRandom == null)
-	      defaultRandom = new Random();
-	  }
+          {
+            if (defaultRandom == null)
+              defaultRandom = new Random();
+          }
       }
     shuffle(l, defaultRandom);
   }
@@ -1432,12 +1432,12 @@ public class Collections
 
     for (int pos = lsize - 1; pos > 0; --pos)
       {
-	// Obtain a random position to swap with. pos + 1 is used so that the
-	// range of the random number includes the current position.
-	int swap = r.nextInt(pos + 1);
+        // Obtain a random position to swap with. pos + 1 is used so that the
+        // range of the random number includes the current position.
+        int swap = r.nextInt(pos + 1);
 
-	// Swap the desired element.
-	Object o;
+        // Swap the desired element.
+        Object o;
         if (sequential)
           {
             o = a[swap];
@@ -1446,7 +1446,7 @@ public class Collections
         else
           o = list.set(swap, i.previous());
 
-	i.set(o);
+        i.set(o);
       }
   }
 
@@ -1455,11 +1455,11 @@ public class Collections
    * collection.  The frequency represents the number of occurrences of
    * elements within the collection which return true when
    * compared with the object using the equals method.
-   * 
+   *
    * @param c the collection to scan for occurrences of the object.
    * @param o the object to locate occurrances of within the collection.
    * @throws NullPointerException if the collection is null.
-   * @since 1.5 
+   * @since 1.5
    */
   public static int frequency (Collection c, Object o)
   {
@@ -1467,9 +1467,9 @@ public class Collections
     final Iterator it = c.iterator();
     while (it.hasNext())
       {
-	Object v = it.next();
-	if (AbstractCollection.equals(o, v))
-	  ++result;
+        Object v = it.next();
+        if (AbstractCollection.equals(o, v))
+          ++result;
       }
     return result;
   }
@@ -1505,9 +1505,9 @@ public class Collections
 
     for (T element : a)
       {
-	boolean result = c.add(element);
-	if (result)
-	  overall = true;
+        boolean result = c.add(element);
+        if (result)
+          overall = true;
       }
     return overall;
   }
@@ -1531,11 +1531,11 @@ public class Collections
     final Iterator it = oc1.iterator();
     while (it.hasNext())
       if (c2.contains(it.next()))
-	return false;
+        return false;
     return true;
   }
 
-
+
   /**
    * Obtain an immutable Set consisting of a single element. The return value
    * of this method is Serializable.
@@ -1595,30 +1595,30 @@ public class Collections
     {
       return new Iterator()
       {
-	/**
-	 * Flag to indicate whether or not the element has
-	 * been retrieved.
-	 */
+        /**
+         * Flag to indicate whether or not the element has
+         * been retrieved.
+         */
         private boolean hasNext = true;
 
-	/**
-	 * Returns true if elements still remain to be
-	 * iterated through.
-	 *
-	 * @return true if the element has not yet been returned.
-	 */
+        /**
+         * Returns true if elements still remain to be
+         * iterated through.
+         *
+         * @return true if the element has not yet been returned.
+         */
         public boolean hasNext()
         {
           return hasNext;
         }
 
-	/**
-	 * Returns the element.
-	 *
-	 * @return The element used by this singleton.
-	 * @throws NoSuchElementException if the object
-	 *         has already been retrieved.
-	 */ 
+        /**
+         * Returns the element.
+         *
+         * @return The element used by this singleton.
+         * @throws NoSuchElementException if the object
+         *         has already been retrieved.
+         */
         public T next()
         {
           if (hasNext)
@@ -1630,15 +1630,15 @@ public class Collections
             throw new NoSuchElementException();
         }
 
-	/**
-	 * Removes the element from the singleton.
-	 * As this set is immutable, this will always
-	 * throw an exception.
-	 *
-	 * @throws UnsupportedOperationException as the
-	 *         singleton set doesn't support
-	 *         remove().
-	 */
+        /**
+         * Removes the element from the singleton.
+         * As this set is immutable, this will always
+         * throw an exception.
+         *
+         * @throws UnsupportedOperationException as the
+         *         singleton set doesn't support
+         *         remove().
+         */
         public void remove()
         {
           throw new UnsupportedOperationException();
@@ -1678,7 +1678,7 @@ public class Collections
 
     /**
      * The hash is just that of the element.
-     * 
+     *
      * @return The hashcode of the element.
      */
     public int hashCode()
@@ -1842,7 +1842,7 @@ public class Collections
 
     /**
      * Sublists are limited in scope.
-     * 
+     *
      * @param from The starting bound for the sublist.
      * @param to The ending bound for the sublist.
      * @return Either an empty list if both bounds are
@@ -1876,7 +1876,7 @@ public class Collections
      * Obvious string.
      *
      * @return The string surrounded by enclosing
-     *         square brackets. 
+     *         square brackets.
      */
     public String toString()
     {
@@ -1949,25 +1949,25 @@ public class Collections
     public Set> entrySet()
     {
       if (entries == null)
-	{
-	  Map.Entry entry = new AbstractMap.SimpleEntry(k, v)
-	  {
-	    /**
-	     * Sets the value of the map entry to the supplied value.
-	     * An exception is always thrown, as the map is immutable.
-	     *
-	     * @param o The new value.
-	     * @return The old value.
-	     * @throws UnsupportedOperationException as setting the value
-	     *         is not supported.
-	     */
-	    public V setValue(V o)
-	    {
-	      throw new UnsupportedOperationException();
-	    }
-	  };
-	  entries = singleton(entry);
-	}
+        {
+          Map.Entry entry = new AbstractMap.SimpleEntry(k, v)
+          {
+            /**
+             * Sets the value of the map entry to the supplied value.
+             * An exception is always thrown, as the map is immutable.
+             *
+             * @param o The new value.
+             * @return The old value.
+             * @throws UnsupportedOperationException as setting the value
+             *         is not supported.
+             */
+            public V setValue(V o)
+            {
+              throw new UnsupportedOperationException();
+            }
+          };
+          entries = singleton(entry);
+        }
       return entries;
     }
 
@@ -2100,10 +2100,10 @@ public class Collections
    *        null for natural ordering
    * @throws ClassCastException if c will not compare some pair of items
    * @throws UnsupportedOperationException if the List is not modifiable
-   * @throws NullPointerException if the List is null or 
-   *         null is compared by natural ordering (only possible 
+   * @throws NullPointerException if the List is null or
+   *         null is compared by natural ordering (only possible
    *         when c is null)
-   *         
+   *
    * @see Arrays#sort(Object[], Comparator)
    */
   public static  void sort(List l, Comparator c)
@@ -2113,8 +2113,8 @@ public class Collections
     ListIterator i = l.listIterator();
     for (int pos = 0, alen = a.length;  pos < alen;  pos++)
       {
-	i.next();
-	i.set(a[pos]);
+        i.next();
+        i.set(a[pos]);
       }
   }
 
@@ -2136,7 +2136,7 @@ public class Collections
     list.set(i, list.set(j, list.get(i)));
   }
 
-
+
   /**
    * Returns a synchronized (thread-safe) collection wrapper backed by the
    * given collection. Notice that element access through the iterators
@@ -2536,7 +2536,7 @@ public class Collections
     /**
      * Retrieves the next object in the underlying collection.
      * A lock is obtained on the mutex before the collection is accessed.
-     * 
+     *
      * @return The next object in the collection.
      * @throws NoSuchElementException if there are no more elements
      */
@@ -2695,7 +2695,7 @@ public class Collections
 
   /**
    * Add the contents of a collection to the underlying list at the given
-   * index (optional operation).  If the list imposes restraints on what 
+   * index (optional operation).  If the list imposes restraints on what
    * can be inserted, such as no null elements, this should be documented.
    * A lock is obtained on the mutex before any of the elements are added.
    *
@@ -2854,7 +2854,7 @@ public class Collections
       synchronized (mutex)
         {
           return new SynchronizedListIterator(mutex,
-						 list.listIterator(index));
+                                                 list.listIterator(index));
         }
     }
 
@@ -2926,7 +2926,7 @@ public class Collections
       synchronized (mutex)
         {
           return new SynchronizedList(mutex,
-					 list.subList(fromIndex, toIndex));
+                                         list.subList(fromIndex, toIndex));
         }
     }
   } // class SynchronizedList
@@ -2991,8 +2991,8 @@ public class Collections
       synchronized (mutex)
         {
           return new SynchronizedRandomAccessList(mutex,
-						     list.subList(fromIndex,
-								  toIndex));
+                                                     list.subList(fromIndex,
+                                                                  toIndex));
         }
     }
   } // class SynchronizedRandomAccessList
@@ -3308,14 +3308,14 @@ public class Collections
           e = o;
         }
 
-	/**
-	 * Returns true if the object, o, implements Map.Entry
-	 * with the same key and value as the underlying entry.  A lock is
-	 * obtained on the mutex before the comparison takes place.
-	 *
-	 * @param o The object to compare with this entry.
-	 * @return true if o is equivalent to the underlying map entry.
-	 */
+        /**
+         * Returns true if the object, o, implements Map.Entry
+         * with the same key and value as the underlying entry.  A lock is
+         * obtained on the mutex before the comparison takes place.
+         *
+         * @param o The object to compare with this entry.
+         * @return true if o is equivalent to the underlying map entry.
+         */
         public boolean equals(Object o)
         {
           synchronized (mutex)
@@ -3324,12 +3324,12 @@ public class Collections
             }
         }
 
-	/**
-	 * Returns the key used in the underlying map entry.  A lock is obtained
-	 * on the mutex before the key is retrieved.
-	 *
-	 * @return The key of the underlying map entry.
-	 */
+        /**
+         * Returns the key used in the underlying map entry.  A lock is obtained
+         * on the mutex before the key is retrieved.
+         *
+         * @return The key of the underlying map entry.
+         */
         public K getKey()
         {
           synchronized (mutex)
@@ -3338,12 +3338,12 @@ public class Collections
             }
         }
 
-	/**
-	 * Returns the value used in the underlying map entry.  A lock is obtained
-	 * on the mutex before the value is retrieved.
-	 *
-	 * @return The value of the underlying map entry.
-	 */
+        /**
+         * Returns the value used in the underlying map entry.  A lock is obtained
+         * on the mutex before the value is retrieved.
+         *
+         * @return The value of the underlying map entry.
+         */
         public V getValue()
         {
           synchronized (mutex)
@@ -3352,15 +3352,15 @@ public class Collections
             }
         }
 
-	/**
-	 * Computes the hash code for the underlying map entry.
-	 * This computation is described in the documentation for the
-	 * Map interface.  A lock is obtained on the mutex
-	 * before the underlying map is accessed.
-	 *
-	 * @return The hash code of the underlying map entry.
-	 * @see Map#hashCode()
-	 */
+        /**
+         * Computes the hash code for the underlying map entry.
+         * This computation is described in the documentation for the
+         * Map interface.  A lock is obtained on the mutex
+         * before the underlying map is accessed.
+         *
+         * @return The hash code of the underlying map entry.
+         * @see Map#hashCode()
+         */
         public int hashCode()
         {
           synchronized (mutex)
@@ -3369,22 +3369,22 @@ public class Collections
             }
         }
 
-	/**
-	 * Replaces the value in the underlying map entry with the specified
-	 * object (optional operation).  A lock is obtained on the mutex
-	 * before the map is altered.  The map entry, in turn, will alter
-	 * the underlying map object.  The operation is undefined if the
-	 * remove() method of the iterator has been called
-	 * beforehand.
-	 *
-	 * @param value the new value to store
-	 * @return the old value
-	 * @throws UnsupportedOperationException if the operation is not supported.
-	 * @throws ClassCastException if the value is of the wrong type.
-	 * @throws IllegalArgumentException if something about the value
-	 *         prevents it from existing in this map.
-	 * @throws NullPointerException if the map forbids null values.
-	 */
+        /**
+         * Replaces the value in the underlying map entry with the specified
+         * object (optional operation).  A lock is obtained on the mutex
+         * before the map is altered.  The map entry, in turn, will alter
+         * the underlying map object.  The operation is undefined if the
+         * remove() method of the iterator has been called
+         * beforehand.
+         *
+         * @param value the new value to store
+         * @return the old value
+         * @throws UnsupportedOperationException if the operation is not supported.
+         * @throws ClassCastException if the value is of the wrong type.
+         * @throws IllegalArgumentException if something about the value
+         *         prevents it from existing in this map.
+         * @throws NullPointerException if the map forbids null values.
+         */
         public V setValue(V value)
         {
           synchronized (mutex)
@@ -3393,12 +3393,12 @@ public class Collections
             }
         }
 
-	/**
-	 * Returns a textual representation of the underlying map entry.
-	 * A lock is obtained on the mutex before the entry is accessed.
-	 *
-	 * @return The contents of the map entry in String form.
-	 */
+        /**
+         * Returns a textual representation of the underlying map entry.
+         * A lock is obtained on the mutex before the entry is accessed.
+         *
+         * @return The contents of the map entry in String form.
+         */
         public String toString()
         {
           synchronized (mutex)
@@ -3414,29 +3414,29 @@ public class Collections
           {
             entries = new SynchronizedSet>(mutex, m.entrySet())
             {
-	      /**
-	       * Returns an iterator over the set.  The iterator has no specific order,
-	       * unless further specified.  A lock is obtained on the set's mutex
-	       * before the iterator is created.  The created iterator is also
-	       * thread-safe.
-	       *
-	       * @return A synchronized set iterator.
-	       */
+              /**
+               * Returns an iterator over the set.  The iterator has no specific order,
+               * unless further specified.  A lock is obtained on the set's mutex
+               * before the iterator is created.  The created iterator is also
+               * thread-safe.
+               *
+               * @return A synchronized set iterator.
+               */
               public Iterator> iterator()
               {
                 synchronized (super.mutex)
                   {
                     return new SynchronizedIterator>(super.mutex,
-								     c.iterator())
+                                                                     c.iterator())
                     {
-		      /**
-		       * Retrieves the next map entry from the iterator.
-		       * A lock is obtained on the iterator's mutex before
-		       * the entry is created.  The new map entry is enclosed in
-		       * a thread-safe wrapper.
-		       *
-		       * @return A synchronized map entry.
-		       */
+                      /**
+                       * Retrieves the next map entry from the iterator.
+                       * A lock is obtained on the iterator's mutex before
+                       * the entry is created.  The new map entry is enclosed in
+                       * a thread-safe wrapper.
+                       *
+                       * @return A synchronized map entry.
+                       */
                       public Map.Entry next()
                       {
                         synchronized (super.mutex)
@@ -3658,7 +3658,7 @@ public class Collections
      * add or addAll, is not supported via this
      * collection.  A lock is obtained on the mutex before the collection
      * is created.
-     * 
+     *
      * @return the collection of all values in the underlying map.
      */
     public Collection values()
@@ -3946,7 +3946,7 @@ public class Collections
       synchronized (mutex)
         {
           return new SynchronizedSortedMap(mutex,
-						 sm.subMap(fromKey, toKey));
+                                                 sm.subMap(fromKey, toKey));
         }
     }
 
@@ -4144,8 +4144,8 @@ public class Collections
       synchronized (mutex)
         {
           return new SynchronizedSortedSet(mutex,
-					      ss.subSet(fromElement,
-							toElement));
+                                              ss.subSet(fromElement,
+                                                        toElement));
         }
     }
 
@@ -4174,7 +4174,7 @@ public class Collections
     }
   } // class SynchronizedSortedSet
 
-
+
   /**
    * Returns an unmodifiable view of the given collection. This allows
    * "read-only" access, although changes in the backing collection show up
@@ -4497,7 +4497,7 @@ public class Collections
    * via sublists, will fail with {@link UnsupportedOperationException}.
    * Although this view prevents changes to the structure of the list and
    * its elements, the values referenced by the objects in the list can
-   * still be modified.   
+   * still be modified.
    * 
                  
    *
    * The returned List implements Serializable, but can only be serialized if
@@ -4868,7 +4868,7 @@ public class Collections
    * iterators will fail with {@link UnsupportedOperationException}.
    * Although this view prevents changes to the structure of the map and its
    * entries, the values referenced by the objects in the map can still be
-   * modified.   
+   * modified.
    * 
                  
    *
    * The returned Map implements Serializable, but can only be serialized if
@@ -4879,7 +4879,7 @@ public class Collections
    * @see Serializable
    */
   public static  Map unmodifiableMap(Map m)
+                                                 ? extends V> m)
   {
     return new UnmodifiableMap(m);
   }
@@ -5019,7 +5019,7 @@ public class Collections
         /**
          * Returns true if the object, o, is also a map entry
          * with an identical key and value.
-         * 
+         *
          * @param o the object to compare.
          * @return true if o is an equivalent map entry.
          */
@@ -5030,7 +5030,7 @@ public class Collections
 
         /**
          * Returns the key of this map entry.
-         * 
+         *
          * @return the key.
          */
         public K getKey()
@@ -5040,7 +5040,7 @@ public class Collections
 
         /**
          * Returns the value of this map entry.
-         * 
+         *
          * @return the value.
          */
         public V getValue()
@@ -5051,7 +5051,7 @@ public class Collections
         /**
          * Computes the hash code of this map entry. The computation is
          * described in the Map interface documentation.
-         * 
+         *
          * @return the hash code of this entry.
          * @see Map#hashCode()
          */
@@ -5063,7 +5063,7 @@ public class Collections
         /**
          * Blocks the alteration of the value of this map entry. This method
          * never returns, throwing an exception instead.
-         * 
+         *
          * @param value The new value.
          * @throws UnsupportedOperationException as an unmodifiable map entry
          *           does not support the setValue() operation.
@@ -5075,7 +5075,7 @@ public class Collections
 
         /**
          * Returns a textual representation of the map entry.
-         * 
+         *
          * @return The map entry as a String.
          */
         public String toString()
@@ -5102,20 +5102,20 @@ public class Collections
       public Iterator> iterator()
       {
         return new UnmodifiableIterator>(c.iterator())
-	{
-	  /**
-	   * Obtains the next element from the underlying set of
-	   * map entries.
-	   *
-	   * @return the next element in the collection.
-	   * @throws NoSuchElementException if there are no more elements.
-	   */
+        {
+          /**
+           * Obtains the next element from the underlying set of
+           * map entries.
+           *
+           * @return the next element in the collection.
+           * @throws NoSuchElementException if there are no more elements.
+           */
           public Map.Entry next()
           {
             final Map.Entry e = super.next();
-	    return new UnmodifiableMapEntry(e);
-	  }
-	};
+            return new UnmodifiableMapEntry(e);
+          }
+        };
       }
 
       // The array returned is an array of UnmodifiableMapEntry instead of
@@ -5124,14 +5124,14 @@ public class Collections
       {
         Object[] mapEntryResult = super.toArray();
         UnmodifiableMapEntry result[] = null;
-  
+
         if (mapEntryResult != null)
           {
             result = (UnmodifiableMapEntry[])
-	      new UnmodifiableMapEntry[mapEntryResult.length];
+              new UnmodifiableMapEntry[mapEntryResult.length];
             for (int i = 0; i < mapEntryResult.length; ++i)
-	      result[i] = new UnmodifiableMapEntry((Map.Entry)mapEntryResult[i]);
-	  }
+              result[i] = new UnmodifiableMapEntry((Map.Entry)mapEntryResult[i]);
+          }
         return result;
       }
 
@@ -5140,14 +5140,14 @@ public class Collections
       public  S[] toArray(S[] array)
       {
         S[] result = super.toArray(array);
-  
+
         if (result != null)
-	  for (int i = 0; i < result.length; i++)
-	    array[i] =
-	      (S) new UnmodifiableMapEntry((Map.Entry) result[i]);
+          for (int i = 0; i < result.length; i++)
+            array[i] =
+              (S) new UnmodifiableMapEntry((Map.Entry) result[i]);
         return array;
       }
-      
+
 
     } // class UnmodifiableEntrySet
 
@@ -5311,7 +5311,7 @@ public class Collections
    * will fail with {@link UnsupportedOperationException}.
    * Although this view prevents changes to the structure of the set and its
    * entries, the values referenced by the objects in the set can still be
-   * modified.   
+   * modified.
    * 
                  
    *
    * The returned Set implements Serializable, but can only be serialized if
@@ -5366,7 +5366,7 @@ public class Collections
      * hash codes of all elements within the set.
      *
      * @return the hash code of the set.
-     */ 
+     */
     public int hashCode()
     {
       return c.hashCode();
@@ -5380,7 +5380,7 @@ public class Collections
    * views, or iterators, will fail with {@link UnsupportedOperationException}.
    * Although this view prevents changes to the structure of the map and its
    * entries, the values referenced by the objects in the map can still be
-   * modified.   
+   * modified.
    * 
                  
    *
    * The returned SortedMap implements Serializable, but can only be
@@ -5391,7 +5391,7 @@ public class Collections
    * @see Serializable
    */
   public static  SortedMap unmodifiableSortedMap(SortedMap m)
+                                                             ? extends V> m)
   {
     return new UnmodifiableSortedMap(m);
   }
@@ -5555,7 +5555,7 @@ public class Collections
    * iterators, will fail with {@link UnsupportedOperationException}.
    * Although this view prevents changes to the structure of the set and its
    * entries, the values referenced by the objects in the set can still be
-   * modified.   
+   * modified.
    * 
                  
    *
    * The returns SortedSet implements Serializable, but can only be
@@ -5724,7 +5724,7 @@ public class Collections
   } // class UnmodifiableSortedSet
 
   /**
-   * 
                   
+   * 
                  
    * Returns a dynamically typesafe view of the given collection,
    * where any modification is first checked to ensure that the type
    * of the new data is appropriate.  Although the addition of
@@ -5740,7 +5740,7 @@ public class Collections
    * ClassCastException caused by erroneous casting, or
    * for protecting collections from corruption by external libraries.
    * 
                  
-   * 
                   
+   * 
                  
    * Since the collection might be a List or a Set, and those
    * have incompatible equals and hashCode requirements, this relies
    * on Object's implementation rather than passing those calls on to
@@ -5748,7 +5748,7 @@ public class Collections
    * Serializable, but can only be serialized if the collection it
    * wraps is likewise Serializable.
    * 
                  
-   * 
+   *
    * @param c the collection to wrap in a dynamically typesafe wrapper
    * @param type the type of elements the collection should hold.
    * @return a dynamically typesafe view of the collection.
@@ -5756,7 +5756,7 @@ public class Collections
    * @since 1.5
    */
   public static  Collection checkedCollection(Collection c,
-						    Class type)
+                                                    Class type)
   {
     return new CheckedCollection(c, type);
   }
@@ -5775,7 +5775,7 @@ public class Collections
      * Compatible with JDK 1.5.
      */
     private static final long serialVersionUID = 1578914078182001775L;
-    
+
     /**
      * The wrapped collection. Package visible for use by subclasses.
      * @serial the real collection
@@ -5814,9 +5814,9 @@ public class Collections
     public boolean add(E o)
     {
       if (type.isInstance(o))
-	return c.add(o);
+        return c.add(o);
       else
-	throw new ClassCastException("The element is of the incorrect type.");
+        throw new ClassCastException("The element is of the incorrect type.");
     }
 
     /**
@@ -5834,11 +5834,11 @@ public class Collections
       Collection typedColl = (Collection) c;
       final Iterator it = typedColl.iterator();
       while (it.hasNext())
-	{
-	  final E element = it.next();
-	  if (!type.isInstance(element))
-	    throw new ClassCastException("A member of the collection is not of the correct type.");
-	}
+        {
+          final E element = it.next();
+          if (!type.isInstance(element))
+            throw new ClassCastException("A member of the collection is not of the correct type.");
+        }
       return c.addAll(typedColl);
     }
 
@@ -6075,7 +6075,7 @@ public class Collections
   } // class CheckedIterator
 
   /**
-   * 
                   
+   * 
                  
    * Returns a dynamically typesafe view of the given list,
    * where any modification is first checked to ensure that the type
    * of the new data is appropriate.  Although the addition of
@@ -6118,7 +6118,7 @@ public class Collections
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.5
    */
-  private static class CheckedList 
+  private static class CheckedList
     extends CheckedCollection
     implements List
   {
@@ -6158,9 +6158,9 @@ public class Collections
     public void add(int index, E o)
     {
       if (type.isInstance(o))
-	list.add(index, o);
+        list.add(index, o);
       else
-	throw new ClassCastException("The object is of the wrong type.");
+        throw new ClassCastException("The object is of the wrong type.");
     }
 
     /**
@@ -6178,10 +6178,10 @@ public class Collections
       Collection typedColl = (Collection) coll;
       final Iterator it = typedColl.iterator();
       while (it.hasNext())
-	{
-	  if (!type.isInstance(it.next()))
-	    throw new ClassCastException("A member of the collection is not of the correct type.");
-	}
+        {
+          if (!type.isInstance(it.next()))
+            throw new ClassCastException("A member of the collection is not of the correct type.");
+        }
       return list.addAll(index, coll);
     }
 
@@ -6399,9 +6399,9 @@ public class Collections
     public void add(E o)
     {
       if (type.isInstance(o))
-	li.add(o);
+        li.add(o);
       else
-	throw new ClassCastException("The object is of the wrong type.");
+        throw new ClassCastException("The object is of the wrong type.");
     }
 
     /**
@@ -6466,14 +6466,14 @@ public class Collections
     public void set(E o)
     {
       if (type.isInstance(o))
-	li.set(o);
+        li.set(o);
       else
-	throw new ClassCastException("The object is of the wrong type.");
+        throw new ClassCastException("The object is of the wrong type.");
     }
   } // class CheckedListIterator
 
   /**
-   * 
                   
+   * 
                  
    * Returns a dynamically typesafe view of the given map,
    * where any modification is first checked to ensure that the type
    * of the new data is appropriate.  Although the addition of
@@ -6501,7 +6501,7 @@ public class Collections
    * @see Serializable
    */
   public static  Map checkedMap(Map m, Class keyType,
-					    Class valueType)
+                                            Class valueType)
   {
     return new CheckedMap(m, keyType, valueType);
   }
@@ -6513,7 +6513,7 @@ public class Collections
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.5
    */
-  private static class CheckedMap 
+  private static class CheckedMap
     implements Map, Serializable
   {
     /**
@@ -6621,7 +6621,7 @@ public class Collections
      * 
                  
      * The set is backed by the map, so that changes in one show up in the
      * other.  Modifications made while an iterator is in progress cause
-     * undefined behavior.  
+     * undefined behavior.
      * 
                  
      *
      * @return the checked set view of all mapping entries.
@@ -6630,14 +6630,14 @@ public class Collections
     public Set> entrySet()
     {
       if (entries == null)
-	{
-	  Class> klass =
-	    (Class>) (Class) Map.Entry.class;
-	  entries = new CheckedEntrySet,K,V>(m.entrySet(),
-							    klass,
-							    keyType,
-							    valueType);
-	}
+        {
+          Class> klass =
+            (Class>) (Class) Map.Entry.class;
+          entries = new CheckedEntrySet,K,V>(m.entrySet(),
+                                                            klass,
+                                                            keyType,
+                                                            valueType);
+        }
       return entries;
     }
 
@@ -6656,13 +6656,13 @@ public class Collections
        * @serial the key type.
        */
       private final Class keyType;
-      
+
       /**
        * The type of the map's values.
        * @serial the value type.
        */
       private final Class valueType;
-      
+
       /**
        * Wrap a given set of map entries.
        *
@@ -6672,104 +6672,104 @@ public class Collections
        * @param valueType the type of the map's values.
        */
       CheckedEntrySet(Set s, Class type, Class keyType,
-		      Class valueType)
+                      Class valueType)
       {
         super(s, type);
-	this.keyType = keyType;
-	this.valueType = valueType;
+        this.keyType = keyType;
+        this.valueType = valueType;
       }
 
       // The iterator must return checked map entries.
       public Iterator iterator()
       {
         return new CheckedIterator(c.iterator(), type)
-	{
-	  /**
-	   * Obtains the next element from the underlying set of
-	   * map entries.
-	   *
-	   * @return the next element in the collection.
-	   * @throws NoSuchElementException if there are no more elements.
-	   */
+        {
+          /**
+           * Obtains the next element from the underlying set of
+           * map entries.
+           *
+           * @return the next element in the collection.
+           * @throws NoSuchElementException if there are no more elements.
+           */
           public E next()
           {
             final Map.Entry e = (Map.Entry) super.next();
             return (E) new Map.Entry()
-	    {
-	      /**
-	       * Returns true if the object, o, is also a map
-	       * entry with an identical key and value.
-	       *
-	       * @param o the object to compare.
-	       * @return true if o is an equivalent map entry.
-	       */
+            {
+              /**
+               * Returns true if the object, o, is also a map
+               * entry with an identical key and value.
+               *
+               * @param o the object to compare.
+               * @return true if o is an equivalent map entry.
+               */
               public boolean equals(Object o)
               {
                 return e.equals(o);
               }
-	      
-	      /**
-	       * Returns the key of this map entry.
-	       *
-	       * @return the key.
-	       */
+
+              /**
+               * Returns the key of this map entry.
+               *
+               * @return the key.
+               */
               public Object getKey()
               {
                 return e.getKey();
               }
 
-	      /**
-	       * Returns the value of this map entry.
-	       *
-	       * @return the value.
-	       */
+              /**
+               * Returns the value of this map entry.
+               *
+               * @return the value.
+               */
               public Object getValue()
               {
                 return e.getValue();
               }
 
-	      /**
-	       * Computes the hash code of this map entry.
-	       * The computation is described in the Map
-	       * interface documentation.
-	       *
-	       * @return the hash code of this entry.
-	       * @see Map#hashCode()
-	       */ 
-	      public int hashCode()
+              /**
+               * Computes the hash code of this map entry.
+               * The computation is described in the Map
+               * interface documentation.
+               *
+               * @return the hash code of this entry.
+               * @see Map#hashCode()
+               */
+              public int hashCode()
               {
                 return e.hashCode();
               }
 
-	      /**
-	       * Sets the value of this map entry, provided it is of the
-	       * right type.
-	       *
-	       * @param value The new value.
-	       * @throws ClassCastException if the type of the value is not
-	       *                            a valid type for the underlying
-	       *                             map.
-	       */
+              /**
+               * Sets the value of this map entry, provided it is of the
+               * right type.
+               *
+               * @param value The new value.
+               * @throws ClassCastException if the type of the value is not
+               *                            a valid type for the underlying
+               *                             map.
+               */
               public Object setValue(Object value)
               {
-		if (valueType.isInstance(value))
-		  return e.setValue(value);
-		else
-		  throw new ClassCastException("The value is of the wrong type.");
+                if (valueType.isInstance(value))
+                  return e.setValue(value);
+                else
+                  throw new ClassCastException("The value is of the wrong type.");
               }
 
-	      /**
-	       * Returns a textual representation of the map entry.
-	       *
-	       * @return The map entry as a String.
-	       */
+              /**
+               * Returns a textual representation of the map entry.
+               *
+               * @return The map entry as a String.
+               */
               public String toString()
               {
                 return e.toString();
               }
-	    };
+            };
           }
-	};
+        };
       }
     } // class CheckedEntrySet
 
@@ -6811,17 +6811,17 @@ public class Collections
      * @param value The new value.
      * @return the previous value of the key, or null if there was no mapping.
      * @throws ClassCastException if the type of the key or the value is
-     *                            not a valid type for the underlying map.    
+     *                            not a valid type for the underlying map.
      */
     public V put(K key, V value)
     {
       if (keyType.isInstance(key))
-	{
-	  if (valueType.isInstance(value))
-	    return m.put(key,value);
-	  else
-	    throw new ClassCastException("The value is of the wrong type.");
-	}
+        {
+          if (valueType.isInstance(value))
+            return m.put(key,value);
+          else
+            throw new ClassCastException("The value is of the wrong type.");
+        }
       throw new ClassCastException("The key is of the wrong type.");
     }
 
@@ -6875,20 +6875,20 @@ public class Collections
      * @param map the map, the entries of which should be added
      *          to the underlying map.
      * @throws ClassCastException if the type of a key or value is
-     *                            not a valid type for the underlying map.    
+     *                            not a valid type for the underlying map.
      */
     public void putAll(Map map)
     {
       Map typedMap = (Map) map;
       final Iterator> it = typedMap.entrySet().iterator();
       while (it.hasNext())
-	{
-	  final Map.Entry entry = it.next();
-	  if (!keyType.isInstance(entry.getKey()))
-	    throw new ClassCastException("A key is of the wrong type.");
-	  if (!valueType.isInstance(entry.getValue()))
-	    throw new ClassCastException("A value is of the wrong type.");
-	}
+        {
+          final Map.Entry entry = it.next();
+          if (!keyType.isInstance(entry.getKey()))
+            throw new ClassCastException("A key is of the wrong type.");
+          if (!valueType.isInstance(entry.getValue()))
+            throw new ClassCastException("A value is of the wrong type.");
+        }
       m.putAll(typedMap);
     }
 
@@ -6941,7 +6941,7 @@ public class Collections
      * behavior.  These modifications are again limited to the values of
      * the keys.
      * 
                  
-     * 
+     *
      * @return the collection view of all values.
      */
     public Collection values()
@@ -6953,7 +6953,7 @@ public class Collections
   } // class CheckedMap
 
   /**
-   * 
                   
+   * 
                  
    * Returns a dynamically typesafe view of the given set,
    * where any modification is first checked to ensure that the type
    * of the new data is appropriate.  Although the addition of
@@ -6991,7 +6991,7 @@ public class Collections
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.5
    */
-  private static class CheckedSet 
+  private static class CheckedSet
     extends CheckedCollection
     implements Set
   {
@@ -7027,7 +7027,7 @@ public class Collections
      * hash codes of all elements within the set.
      *
      * @return the hash code of the set.
-     */ 
+     */
     public int hashCode()
     {
       return c.hashCode();
@@ -7035,7 +7035,7 @@ public class Collections
   } // class CheckedSet
 
   /**
-   * 
                   
+   * 
                  
    * Returns a dynamically typesafe view of the given sorted map,
    * where any modification is first checked to ensure that the type
    * of the new data is appropriate.  Although the addition of
@@ -7063,8 +7063,8 @@ public class Collections
    * @see Serializable
    */
   public static  SortedMap checkedSortedMap(SortedMap m,
-							Class keyType,
-							Class valueType)
+                                                        Class keyType,
+                                                        Class valueType)
   {
     return new CheckedSortedMap(m, keyType, valueType);
   }
@@ -7199,8 +7199,8 @@ public class Collections
      */
     public SortedMap subMap(K fromKey, K toKey)
     {
-      return new CheckedSortedMap(sm.subMap(fromKey, toKey), keyType, 
-					valueType);
+      return new CheckedSortedMap(sm.subMap(fromKey, toKey), keyType,
+                                        valueType);
     }
 
     /**
@@ -7231,7 +7231,7 @@ public class Collections
     public SortedMap tailMap(K fromKey)
     {
       return new CheckedSortedMap(sm.tailMap(fromKey), keyType,
-					valueType);
+                                        valueType);
     }
   } // class CheckedSortedMap
 
@@ -7263,7 +7263,7 @@ public class Collections
    * @see Serializable
    */
   public static  SortedSet checkedSortedSet(SortedSet s,
-						  Class type)
+                                                  Class type)
   {
     return new CheckedSortedSet(s, type);
   }
@@ -7275,7 +7275,7 @@ public class Collections
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.5
    */
-  private static class CheckedSortedSet 
+  private static class CheckedSortedSet
     extends CheckedSet
     implements SortedSet
   {
@@ -7287,7 +7287,7 @@ public class Collections
     /**
      * The wrapped set; stored both here and in the superclass to avoid
      * excessive casting.
-     * 
+     *
      * @serial the wrapped set
      */
     private SortedSet ss;
@@ -7388,7 +7388,7 @@ public class Collections
      * new Integer(highlimit.intValue() + 1)) to reverse
      * the inclusiveness of both endpoints.
      * 
                  
-     * 
+     *
      * @param fromElement the inclusive lower range of the subset.
      * @param toElement the exclusive upper range of the subset.
      * @return the subset.
@@ -7471,7 +7471,7 @@ public class Collections
   }
 
   /**
-   * The implementation of {@link #asLIFOQueue(Deque)}. 
+   * The implementation of {@link #asLIFOQueue(Deque)}.
    *
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.6
@@ -7479,7 +7479,7 @@ public class Collections
   private static class LIFOQueue
     extends AbstractQueue
   {
-    
+
     /**
      * The backing deque.
      */
@@ -7500,36 +7500,36 @@ public class Collections
     {
       return deque.offerFirst(e);
     }
-    
+
     public boolean addAll(Collection c)
     {
       boolean result = false;
       final Iterator it = c.iterator();
       while (it.hasNext())
-	result |= deque.offerFirst(it.next());
+        result |= deque.offerFirst(it.next());
       return result;
     }
-    
+
     public void clear()
     {
       deque.clear();
     }
-    
+
     public boolean isEmpty()
     {
       return deque.isEmpty();
     }
-    
+
     public Iterator iterator()
     {
       return deque.iterator();
     }
-    
+
     public boolean offer(T e)
     {
       return deque.offerFirst(e);
     }
-    
+
     public T peek()
     {
       return deque.peek();
@@ -7539,7 +7539,7 @@ public class Collections
     {
       return deque.poll();
     }
-    
+
     public int size()
     {
       return deque.size();
@@ -7547,7 +7547,7 @@ public class Collections
   } // class LIFOQueue
 
   /**
-   * The implementation of {@link #newSetFromMap(Map)}. 
+   * The implementation of {@link #newSetFromMap(Map)}.
    *
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    * @since 1.6
@@ -7555,7 +7555,7 @@ public class Collections
   private static class MapSet
     extends AbstractSet
   {
-    
+
     /**
      * The backing map.
      */
@@ -7571,7 +7571,7 @@ public class Collections
     public MapSet(Map map)
     {
       if (!map.isEmpty())
-	throw new IllegalArgumentException("The map must be empty.");
+        throw new IllegalArgumentException("The map must be empty.");
       this.map = map;
     }
 
@@ -7579,45 +7579,45 @@ public class Collections
     {
       return map.put(e, true) == null;
     }
-    
+
     public boolean addAll(Collection c)
     {
       boolean result = false;
       final Iterator it = c.iterator();
       while (it.hasNext())
-	result |= (map.put(it.next(), true) == null);
+        result |= (map.put(it.next(), true) == null);
       return result;
     }
-    
+
     public void clear()
     {
       map.clear();
     }
-    
+
     public boolean contains(Object o)
     {
       return map.containsKey(o);
     }
-    
+
     public boolean isEmpty()
     {
       return map.isEmpty();
     }
-    
+
     public Iterator iterator()
     {
       return map.keySet().iterator();
     }
-    
+
     public boolean remove(Object o)
     {
       return map.remove(o) != null;
     }
-    
+
     public int size()
     {
       return map.size();
     }
   } // class MapSet
-  
+
 } // class Collections
diff --git a/libjava/classpath/java/util/Currency.java b/libjava/classpath/java/util/Currency.java
index 11235f14b35..d58082c175a 100644
--- a/libjava/classpath/java/util/Currency.java
+++ b/libjava/classpath/java/util/Currency.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -60,7 +60,7 @@ import java.util.spi.CurrencyNameProvider;
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.4
  */
-public final class Currency 
+public final class Currency
   implements Serializable
 {
   /**
@@ -95,7 +95,7 @@ public final class Currency
    * @serial the number of fraction digits
    */
   private transient int fractionDigits;
-  
+
   /**
    * A cached map of country codes
    * instances to international currency code
@@ -115,7 +115,7 @@ public final class Currency
    * is the international currency code.
    *
    * @see #getInstance(java.util.Locale)
-   * @see #getInstance(java.lang.String) 
+   * @see #getInstance(java.lang.String)
    * @see #readResolve()
    * @serial ignored.
    */
@@ -133,7 +133,7 @@ public final class Currency
     /* Create the properties object */
     properties = new Properties();
     /* Try and load the properties from our iso4217.properties resource */
-    try 
+    try
       {
         properties.load(Currency.class.getResourceAsStream("iso4217.properties"));
       }
@@ -157,7 +157,7 @@ public final class Currency
    * country code, are ignored.  The results of calling this
    * method may vary over time, as the currency associated with
    * a particular country changes.  For countries without
-   * a given currency (e.g. Antarctica), the result is null. 
+   * a given currency (e.g. Antarctica), the result is null.
    *
    * @param loc the locale for the new currency, or null if
    *        there is no country code specified or a currency
@@ -176,8 +176,8 @@ public final class Currency
     if (countryCode.equals(""))
       {
         throw new
-	  IllegalArgumentException("Invalid (empty) country code for locale:"
-			  	   + loc);
+          IllegalArgumentException("Invalid (empty) country code for locale:"
+                                   + loc);
       }
     /* Construct the key for the currency */
     currencyKey = countryCode + ".currency";
@@ -206,7 +206,7 @@ public final class Currency
    * currency code.
    *
    * @param code the code to use.
-   */  
+   */
   private Currency(String code)
   {
     currencyCode = code;
@@ -234,19 +234,19 @@ public final class Currency
    * currencies, such as IMF Special Drawing Rights, -1 is returned.
    *
    * @return the number of digits after the decimal separator for this currency.
-   */   
+   */
   public int getDefaultFractionDigits()
   {
     return fractionDigits;
   }
-    
+
   /**
    * Builds a new currency instance for this locale.
    * All components of the given locale, other than the
    * country code, are ignored.  The results of calling this
    * method may vary over time, as the currency associated with
    * a particular country changes.  For countries without
-   * a given currency (e.g. Antarctica), the result is null. 
+   * a given currency (e.g. Antarctica), the result is null.
    *
    * @param locale a Locale instance.
    * @return a new Currency instance.
@@ -254,7 +254,7 @@ public final class Currency
    *         country code is null.
    * @throws IllegalArgumentException if the country of
    *         the given locale is not a supported ISO3166 code.
-   */ 
+   */
   public static Currency getInstance(Locale locale)
   {
     /**
@@ -270,39 +270,39 @@ public final class Currency
     String country = locale.getCountry();
     if (locale == null || country == null)
       {
-	throw new
-	  NullPointerException("The locale or its country is null.");
+        throw new
+          NullPointerException("The locale or its country is null.");
       }
-    
+
     /* Check that country of locale given is valid. */
     if (country.length() != 2)
       throw new IllegalArgumentException();
-    
+
     /* Attempt to get the currency from the cache */
     String code = (String) countryMap.get(country);
     if (code == null)
       {
         /* Create the currency for this locale */
         newCurrency = new Currency(locale);
-        /* 
+        /*
          * If the currency code is null, then creation failed
          * and we return null.
          */
-	code = newCurrency.getCurrencyCode();
+        code = newCurrency.getCurrencyCode();
         if (code == null)
           {
             return null;
           }
-        else 
+        else
           {
             /* Cache it */
             countryMap.put(country, code);
-	    cache.put(code, newCurrency);
+            cache.put(code, newCurrency);
           }
       }
     else
       {
-	newCurrency = (Currency) cache.get(code);
+        newCurrency = (Currency) cache.get(code);
       }
     /* Return the instance */
     return newCurrency;
@@ -321,10 +321,10 @@ public final class Currency
   {
     Locale[] allLocales;
 
-    /* 
+    /*
      * Throw a null pointer exception explicitly if currencyCode is null.
      * One is not thrown otherwise.  It results in an
-     * IllegalArgumentException. 
+     * IllegalArgumentException.
      */
     if (currencyCode == null)
       {
@@ -336,35 +336,35 @@ public final class Currency
     Currency newCurrency = (Currency) cache.get(currencyCode);
     if (newCurrency == null)
       {
-	/* Get all locales */
-	allLocales = Locale.getAvailableLocales();
-	/* Loop through each locale, looking for the code */
-	for (int i = 0;i < allLocales.length; i++)
-	  {
-	    try
-	      {
-		Currency testCurrency = getInstance (allLocales[i]);
-		if (testCurrency != null &&
-		    testCurrency.getCurrencyCode().equals(currencyCode))
-		  {
-		    return testCurrency;
-		  }
-	      }
-	    catch (IllegalArgumentException exception)
-	      {
-		/* Ignore locales without valid countries */
-	      }
-	  }
-	/* 
-	 * If we get this far, the code is not supported by any of
-	 * our locales.
-	 */
-	throw new IllegalArgumentException("The currency code, " + currencyCode +
-					   ", is not supported.");
+        /* Get all locales */
+        allLocales = Locale.getAvailableLocales();
+        /* Loop through each locale, looking for the code */
+        for (int i = 0;i < allLocales.length; i++)
+          {
+            try
+              {
+                Currency testCurrency = getInstance (allLocales[i]);
+                if (testCurrency != null &&
+                    testCurrency.getCurrencyCode().equals(currencyCode))
+                  {
+                    return testCurrency;
+                  }
+              }
+            catch (IllegalArgumentException exception)
+              {
+                /* Ignore locales without valid countries */
+              }
+          }
+        /*
+         * If we get this far, the code is not supported by any of
+         * our locales.
+         */
+        throw new IllegalArgumentException("The currency code, " + currencyCode +
+                                           ", is not supported.");
       }
     else
       {
-	return newCurrency;
+        return newCurrency;
       }
   }
 
@@ -413,27 +413,27 @@ public final class Currency
     try
       {
         return ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
-					locale).getString(property);
+                                        locale).getString(property);
       }
     catch (MissingResourceException exception)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (CurrencyNameProvider p :
-	   ServiceLoader.load(CurrencyNameProvider.class))
+           ServiceLoader.load(CurrencyNameProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(locale))
-	      {
-		String localizedString = p.getSymbol(currencyCode,
-						     locale);
-		if (localizedString != null)
-		  return localizedString;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(locale))
+              {
+                String localizedString = p.getSymbol(currencyCode,
+                                                     locale);
+                if (localizedString != null)
+                  return localizedString;
+                break;
+              }
+          }
       }
     if (locale.equals(Locale.ROOT)) // Base case
       return currencyCode;
diff --git a/libjava/classpath/java/util/Date.java b/libjava/classpath/java/util/Date.java
index 5f83cd06cb3..3f7ba6f5918 100644
--- a/libjava/classpath/java/util/Date.java
+++ b/libjava/classpath/java/util/Date.java
@@ -49,11 +49,11 @@ import java.text.SimpleDateFormat;
 /**
  * 
                  
  * This class represents a specific time in milliseconds since the epoch.
- * The epoch is 1970, January 1 00:00:00.0000 UTC.  
+ * The epoch is 1970, January 1 00:00:00.0000 UTC.
  * 
                  
  * 
                  
  * Date is intended to reflect universal time coordinate (UTC),
- * but this depends on the underlying host environment.  Most operating systems 
+ * but this depends on the underlying host environment.  Most operating systems
  * don't handle the leap second, which occurs about once every year or
  * so.  The leap second is added to the last minute of the day on either
  * the 30th of June or the 31st of December, creating a minute 61 seconds
@@ -127,13 +127,13 @@ public class Date
    * An array of week names used to map names to integer values.
    */
   private static final String[] weekNames = { "Sun", "Mon", "Tue", "Wed",
-					      "Thu", "Fri", "Sat" };
+                                              "Thu", "Fri", "Sat" };
   /**
    * An array of month names used to map names to integer values.
    */
   private static final String[] monthNames = { "Jan", "Feb", "Mar", "Apr",
-					       "May", "Jun", "Jul", "Aug",
-					       "Sep", "Oct", "Nov", "Dec" };
+                                               "May", "Jun", "Jul", "Aug",
+                                               "Sep", "Oct", "Nov", "Dec" };
   /**
    * Creates a new Date Object representing the current time.
    */
@@ -187,7 +187,7 @@ public class Date
    * Creates a new Date Object representing the given time.
    *
    * @deprecated use new GregorianCalendar(year+1900, month,
-   * day, hour, min, sec) instead. 
+   * day, hour, min, sec) instead.
    * @param year the difference between the required year and 1900.
    * @param month the month as a value between 0 and 11.
    * @param day the day as a value between 0 and 31.
@@ -200,7 +200,7 @@ public class Date
   public Date(int year, int month, int day, int hour, int min, int sec)
   {
     GregorianCalendar cal =
-	new GregorianCalendar(year + 1900, month, day, hour, min, sec);
+        new GregorianCalendar(year + 1900, month, day, hour, min, sec);
     time = cal.getTimeInMillis();
   }
 
@@ -208,7 +208,7 @@ public class Date
    * Creates a new Date from the given string representation.  This
    * does the same as new Date(Date.parse(s))
    * @see #parse
-   * @deprecated use java.text.DateFormat.parse(s) instead.  
+   * @deprecated use java.text.DateFormat.parse(s) instead.
    */
   public Date(String s)
   {
@@ -226,11 +226,11 @@ public class Date
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException ex)
       {
-	return null;
+        return null;
       }
   }
 
@@ -253,7 +253,7 @@ public class Date
    * @return the time in milliseconds since the epoch.
    */
   public static long UTC(int year, int month, int date,
-			 int hrs, int min, int sec)
+                         int hrs, int min, int sec)
   {
     GregorianCalendar cal =
       new GregorianCalendar(year + 1900, month, date, hrs, min, sec);
@@ -278,7 +278,7 @@ public class Date
    * from this object is also used to determine whether or not daylight savings
    * time is in effect.  For example, the offset for the UK would be 0 if the
    * month of the date object was January, and 1 if the month was August.
-   * 
+   *
    * @deprecated use
    * Calendar.get(Calendar.ZONE_OFFSET)+Calendar.get(Calendar.DST_OFFSET)
    * instead.
@@ -291,13 +291,13 @@ public class Date
     Calendar cal = Calendar.getInstance();
     cal.setTimeInMillis(time);
     return - (cal.get(Calendar.ZONE_OFFSET)
-	    + cal.get(Calendar.DST_OFFSET)) / (60 * 1000);
+            + cal.get(Calendar.DST_OFFSET)) / (60 * 1000);
   }
 
   /**
    * Sets the time which this object should represent.
    *
-   * @param time the time in milliseconds since the epoch.  
+   * @param time the time in milliseconds since the epoch.
    */
   public void setTime(long time)
   {
@@ -309,7 +309,7 @@ public class Date
    *
    * @param when the other date
    * @return true, if the date represented by this object is
-   * strictly later than the time represented by when.  
+   * strictly later than the time represented by when.
    */
   public boolean after(Date when)
   {
@@ -334,7 +334,7 @@ public class Date
    * @param obj the object to compare.
    * @return true, if obj is a Date object and the time represented
    * by obj is exactly the same as the time represented by this
-   * object.  
+   * object.
    */
   public boolean equals(Object obj)
   {
@@ -348,7 +348,7 @@ public class Date
    * @return 0, if the date represented
    * by obj is exactly the same as the time represented by this
    * object, a negative if this Date is before the other Date, and
-   * a positive value otherwise.  
+   * a positive value otherwise.
    */
   public int compareTo(Date when)
   {
@@ -414,7 +414,7 @@ public class Date
    * 
    * 
    * 
                  
-   * The DateFormat class should now be 
+   * The DateFormat class should now be
    * preferred over using this method.
    * 
                  
    *
@@ -439,11 +439,11 @@ public class Date
       + sec.substring(sec.length() - 2) + " "
       +
       cal.getTimeZone().getDisplayName(cal.getTimeZone().inDaylightTime(this),
-				       TimeZone.SHORT) + " " +
+                                       TimeZone.SHORT) + " " +
       year.substring(year.length() - 4);
   }
 
-  /** 
+  /**
    * Returns a locale-dependent string representation of this
    * Date object.
    *
@@ -457,7 +457,7 @@ public class Date
     return java.text.DateFormat.getInstance().format(this);
   }
 
-  /** 
+  /**
    * 
                  
    * Returns a string representation of this Date
    * object using GMT rather than the local timezone.
@@ -497,7 +497,7 @@ public class Date
    * the local timezone.
    * 
    * 
-   * 
+   *
    * @deprecated Use DateFormat.format(Date) with a GMT TimeZone.
    * @return A string of the form 'd mon yyyy hh:mm:ss GMT' using
    *         GMT as opposed to the local timezone.
@@ -526,12 +526,12 @@ public class Date
 
     try
       {
-	// parseInt doesn't handle '+' so strip off sign.
-	num = Integer.parseInt(tok.substring(1));
+        // parseInt doesn't handle '+' so strip off sign.
+        num = Integer.parseInt(tok.substring(1));
       }
     catch (NumberFormatException ex)
       {
-	throw new IllegalArgumentException(tok);
+        throw new IllegalArgumentException(tok);
       }
 
     // Convert hours to minutes.
@@ -557,8 +557,8 @@ public class Date
     // We could possibly use the fields of DateFormatSymbols but that is
     // localized and thus might not match the English words specified.
     String months[] = { "JANUARY", "FEBRUARY", "MARCH", "APRIL", "MAY",
-			"JUNE", "JULY", "AUGUST", "SEPTEMBER", "OCTOBER",
-			"NOVEMBER", "DECEMBER" };
+                        "JUNE", "JULY", "AUGUST", "SEPTEMBER", "OCTOBER",
+                        "NOVEMBER", "DECEMBER" };
 
     int i;
     for (i = 0; i < 12; i++)
@@ -581,7 +581,7 @@ public class Date
     // We could possibly use the fields of DateFormatSymbols but that is
     // localized and thus might not match the English words specified.
     String daysOfWeek[] = { "SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY",
-			    "THURSDAY", "FRIDAY", "SATURDAY" };
+                            "THURSDAY", "FRIDAY", "SATURDAY" };
 
     int i;
     for (i = 0; i < 7; i++)
@@ -591,7 +591,7 @@ public class Date
     return false;
   }
 
-  /** 
+  /**
    * 
                  
    * Parses a String and returns the time, in milliseconds since the
    * epoch, it represents.  Most syntaxes are handled, including
@@ -612,7 +612,7 @@ public class Date
    * failure.  The ASCII characters A-Z, a-z, 0-9, and ',', '+', '-',
    * ':' and '/' are the only characters permitted within the string,
    * besides whitespace and characters enclosed within parantheses
-   * '(' and ')'.  
+   * '(' and ')'.
    * 
                  
    * 
                  
    * A sequence of consecutive digits are recognised as a number,
@@ -729,15 +729,15 @@ public class Date
     int len = string.length();
     for (int i = 0;  i < len;  i++)
       {
-	char ch = string.charAt(i);
-	if (ch >= 'a' && ch <= 'z')
-	  ch -= 'a' - 'A';
-	if (ch == '(')
-	  parenNesting++;
-	else if (parenNesting == 0)
-	  buf.append(ch);
-	else if (ch == ')')
-	  parenNesting--;
+        char ch = string.charAt(i);
+        if (ch >= 'a' && ch <= 'z')
+          ch -= 'a' - 'A';
+        if (ch == '(')
+          parenNesting++;
+        else if (parenNesting == 0)
+          buf.append(ch);
+        else if (ch == ')')
+          parenNesting--;
       }
     int tmpMonth;
 
@@ -747,163 +747,163 @@ public class Date
 
     while (strtok.hasMoreTokens())
       {
-	String tok = strtok.nextToken();
-	char firstch = tok.charAt(0);
-	if ((firstch == '+' || firstch == '-') && year >= 0)
-	  {
-	    timezone = parseTz(tok, firstch);
-	    localTimezone = false;
-	  }
-	else if (firstch >= '0' && firstch <= '9')
-	  {
-	    int lastPunct = -1;
-	    while (tok != null && tok.length() > 0)
-	      {
-		int punctOffset = tok.length();
-		int num = 0;
-		int punct;
-		for (int i = 0;  ;  i++)
-		  {
-		    if (i >= punctOffset)
-		      {
-			punct = -1;
-			break;
-		      }
-		    else
-		      {
-			punct = tok.charAt(i);
-			if (punct >= '0' && punct <= '9')
-			  {
-			    if (num > 999999999) // in case of overflow
-			      throw new IllegalArgumentException(tok);
-			    num = 10 * num + (punct - '0');
-			  }
-			else
-			  {
-			    punctOffset = i;
-			    break;
-			  }
-		      }
-		      
-		  }
+        String tok = strtok.nextToken();
+        char firstch = tok.charAt(0);
+        if ((firstch == '+' || firstch == '-') && year >= 0)
+          {
+            timezone = parseTz(tok, firstch);
+            localTimezone = false;
+          }
+        else if (firstch >= '0' && firstch <= '9')
+          {
+            int lastPunct = -1;
+            while (tok != null && tok.length() > 0)
+              {
+                int punctOffset = tok.length();
+                int num = 0;
+                int punct;
+                for (int i = 0;  ;  i++)
+                  {
+                    if (i >= punctOffset)
+                      {
+                        punct = -1;
+                        break;
+                      }
+                    else
+                      {
+                        punct = tok.charAt(i);
+                        if (punct >= '0' && punct <= '9')
+                          {
+                            if (num > 999999999) // in case of overflow
+                              throw new IllegalArgumentException(tok);
+                            num = 10 * num + (punct - '0');
+                          }
+                        else
+                          {
+                            punctOffset = i;
+                            break;
+                          }
+                      }
 
-		if (punct == ':')
-		  {
-		    if (hour < 0)
-		      hour = num;
-		    else
-		      minute = num;
-		  }
-		else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0))
-		  {
-		    if (minute < 0)
-		      minute = num;
-		    else
-		      second = num;
-		  }
-	        else if ((num >= 70
-			  && (punct == ' ' || punct == ','
-			      || punct == '/' || punct < 0))
-			 || (num < 70 && day >= 0 && month >= 0 && year < 0))
-		  {
-		    if (num >= 100)
-		      year = num;
-		    else
-		      {
-			int curYear = 1900 + new Date().getYear();
-			int firstYear = curYear - 80;
-			year = firstYear / 100 * 100 + num;
-			if (year < firstYear)
-			  year += 100;
-		      }
-		  }
-		else if (punct == '/')
-		  {
-		    if (month < 0)
-		      month = num - 1;
-		    else
-		      day = num;
-		  }
-		else if (hour >= 0 && minute < 0)
-		  minute = num;
-		else if (minute >= 0 && second < 0)
-		  second = num;
-		else if (day < 0)
-		  day = num;
-		else
-		  throw new IllegalArgumentException(tok);
+                  }
 
-		// Advance string if there's more to process in this token.
-		if (punct < 0 || punctOffset + 1 >= tok.length())
-		  tok = null;
-		else
-		  tok = tok.substring(punctOffset + 1);
-		lastPunct = punct;
-	      }
-	  }
-	else if (firstch >= 'A' && firstch <= 'Z')
-	  {
-	    if (tok.equals("AM"))
-	      {
-		if (hour < 1 || hour > 12)
-		  throw new IllegalArgumentException(tok);
-		if (hour == 12)
-		  hour = 0;
-	      }
-	    else if (tok.equals("PM"))
-	      {
-		if (hour < 1 || hour > 12)
-		  throw new IllegalArgumentException(tok);
-		if (hour < 12)
-		  hour += 12;
-	      }
-	    else if (parseDayOfWeek(tok))
-	      { /* Ignore it; throw the token away. */ }
-	    else if (tok.equals("UT") || tok.equals("UTC") || tok.equals("GMT"))
-	      localTimezone = false;
-	    else if (tok.startsWith("UT") || tok.startsWith("GMT"))
-	      {
-		int signOffset = 3;
-		if (tok.charAt(1) == 'T' && tok.charAt(2) != 'C')
-		  signOffset = 2;
+                if (punct == ':')
+                  {
+                    if (hour < 0)
+                      hour = num;
+                    else
+                      minute = num;
+                  }
+                else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0))
+                  {
+                    if (minute < 0)
+                      minute = num;
+                    else
+                      second = num;
+                  }
+                else if ((num >= 70
+                          && (punct == ' ' || punct == ','
+                              || punct == '/' || punct < 0))
+                         || (num < 70 && day >= 0 && month >= 0 && year < 0))
+                  {
+                    if (num >= 100)
+                      year = num;
+                    else
+                      {
+                        int curYear = 1900 + new Date().getYear();
+                        int firstYear = curYear - 80;
+                        year = firstYear / 100 * 100 + num;
+                        if (year < firstYear)
+                          year += 100;
+                      }
+                  }
+                else if (punct == '/')
+                  {
+                    if (month < 0)
+                      month = num - 1;
+                    else
+                      day = num;
+                  }
+                else if (hour >= 0 && minute < 0)
+                  minute = num;
+                else if (minute >= 0 && second < 0)
+                  second = num;
+                else if (day < 0)
+                  day = num;
+                else
+                  throw new IllegalArgumentException(tok);
 
-	        char sign = tok.charAt(signOffset);
-		if (sign != '+' && sign != '-')
-		  throw new IllegalArgumentException(tok);
+                // Advance string if there's more to process in this token.
+                if (punct < 0 || punctOffset + 1 >= tok.length())
+                  tok = null;
+                else
+                  tok = tok.substring(punctOffset + 1);
+                lastPunct = punct;
+              }
+          }
+        else if (firstch >= 'A' && firstch <= 'Z')
+          {
+            if (tok.equals("AM"))
+              {
+                if (hour < 1 || hour > 12)
+                  throw new IllegalArgumentException(tok);
+                if (hour == 12)
+                  hour = 0;
+              }
+            else if (tok.equals("PM"))
+              {
+                if (hour < 1 || hour > 12)
+                  throw new IllegalArgumentException(tok);
+                if (hour < 12)
+                  hour += 12;
+              }
+            else if (parseDayOfWeek(tok))
+              { /* Ignore it; throw the token away. */ }
+            else if (tok.equals("UT") || tok.equals("UTC") || tok.equals("GMT"))
+              localTimezone = false;
+            else if (tok.startsWith("UT") || tok.startsWith("GMT"))
+              {
+                int signOffset = 3;
+                if (tok.charAt(1) == 'T' && tok.charAt(2) != 'C')
+                  signOffset = 2;
 
-	        timezone = parseTz(tok.substring(signOffset), sign);
-	        localTimezone = false;
-	      }
-	    else if ((tmpMonth = parseMonth(tok)) >= 0)
-	      month = tmpMonth;
-	    else if (tok.length() == 3 && tok.charAt(2) == 'T')
-	      {
-		// Convert timezone offset from hours to minutes.
-		char ch = tok.charAt(0);
-		if (ch == 'E')
-		  timezone = -5 * 60;
-		else if (ch == 'C')
-		  timezone = -6 * 60;
-		else if (ch == 'M')
-		  timezone = -7 * 60;
-		else if (ch == 'P')
-		  timezone = -8 * 60;
-		else
-		  throw new IllegalArgumentException(tok);
+                char sign = tok.charAt(signOffset);
+                if (sign != '+' && sign != '-')
+                  throw new IllegalArgumentException(tok);
 
-		// Shift 60 minutes for Daylight Savings Time.
-		if (tok.charAt(1) == 'D')
-		  timezone += 60;
-		else if (tok.charAt(1) != 'S')
-		  throw new IllegalArgumentException(tok);
+                timezone = parseTz(tok.substring(signOffset), sign);
+                localTimezone = false;
+              }
+            else if ((tmpMonth = parseMonth(tok)) >= 0)
+              month = tmpMonth;
+            else if (tok.length() == 3 && tok.charAt(2) == 'T')
+              {
+                // Convert timezone offset from hours to minutes.
+                char ch = tok.charAt(0);
+                if (ch == 'E')
+                  timezone = -5 * 60;
+                else if (ch == 'C')
+                  timezone = -6 * 60;
+                else if (ch == 'M')
+                  timezone = -7 * 60;
+                else if (ch == 'P')
+                  timezone = -8 * 60;
+                else
+                  throw new IllegalArgumentException(tok);
 
-	        localTimezone = false;
-	      }
-	    else
-	      throw new IllegalArgumentException(tok);
-	  }
-	else
-	  throw new IllegalArgumentException(tok);
+                // Shift 60 minutes for Daylight Savings Time.
+                if (tok.charAt(1) == 'D')
+                  timezone += 60;
+                else if (tok.charAt(1) != 'S')
+                  throw new IllegalArgumentException(tok);
+
+                localTimezone = false;
+              }
+            else
+              throw new IllegalArgumentException(tok);
+          }
+        else
+          throw new IllegalArgumentException(tok);
       }
 
     // Unspecified hours, minutes, or seconds should default to 0.
@@ -925,8 +925,8 @@ public class Date
       = new GregorianCalendar(year, month, day, hour, minute, second);
     if (!localTimezone)
       {
-	cal.set(Calendar.ZONE_OFFSET, timezone * 60 * 1000);
-	cal.set(Calendar.DST_OFFSET, 0);
+        cal.set(Calendar.ZONE_OFFSET, timezone * 60 * 1000);
+        cal.set(Calendar.DST_OFFSET, 0);
       }
     return cal.getTimeInMillis();
   }
@@ -965,7 +965,7 @@ public class Date
    * @param year the year minus 1900.
    * @deprecated Use Calendar instead of Date, and use
    * set(Calendar.YEAR, year) instead.  Note about the 1900
-   * difference in year.  
+   * difference in year.
    * @see #getYear()
    * @see Calendar
    */
@@ -1008,13 +1008,13 @@ public class Date
    * in the seconds value being reset to 0 and the minutes
    * value being incremented by 1, if the new time does
    * not include a leap second.
-   * 
+   *
    * @param month the month, with a zero-based index
    *        from January.
    * @deprecated Use Calendar instead of Date, and use
    * set(Calendar.MONTH, month) instead.
    * @see #getMonth()
-   * @see Calendar 
+   * @see Calendar
    */
   public void setMonth(int month)
   {
@@ -1059,7 +1059,7 @@ public class Date
    *
    * @param date the date.
    * @deprecated Use Calendar instead of Date, and use
-   * set(Calendar.DATE, date) instead. 
+   * set(Calendar.DATE, date) instead.
    * @see Calendar
    * @see #getDate()
    */
@@ -1121,7 +1121,7 @@ public class Date
    * @deprecated Use Calendar instead of Date, and use
    * set(Calendar.HOUR_OF_DAY, hours) instead.
    * @see Calendar
-   * @see #getHours() 
+   * @see #getHours()
    */
   public void setHours(int hours)
   {
@@ -1162,7 +1162,7 @@ public class Date
    *
    * @param minutes the minutes.
    * @deprecated Use Calendar instead of Date, and use
-   * set(Calendar.MINUTE, minutes) instead. 
+   * set(Calendar.MINUTE, minutes) instead.
    * @see Calendar
    * @see #getMinutes()
    */
@@ -1207,7 +1207,7 @@ public class Date
    * @deprecated Use Calendar instead of Date, and use
    * set(Calendar.SECOND, seconds) instead.
    * @see Calendar
-   * @see #getSeconds() 
+   * @see #getSeconds()
    */
   public void setSeconds(int seconds)
   {
diff --git a/libjava/classpath/java/util/Dictionary.java b/libjava/classpath/java/util/Dictionary.java
index 7b82a9f644d..acd90eb04f6 100644
--- a/libjava/classpath/java/util/Dictionary.java
+++ b/libjava/classpath/java/util/Dictionary.java
@@ -1,4 +1,4 @@
-/* Dictionary.java -- an abstract (and essentially worthless) 
+/* Dictionary.java -- an abstract (and essentially worthless)
    class which is Hashtable's superclass
    Copyright (C) 1998, 2001, 2002, 2004 Free Software Foundation, Inc.
 
@@ -42,12 +42,12 @@ package java.util;
 /**
  * A Dictionary maps keys to values; how it does that is
  * implementation-specific.
- * 
+ *
  * This is an abstract class which has really gone by the wayside.
  * People at Javasoft are probably embarrassed by it.  At this point,
  * it might as well be an interface rather than a class, but it remains
  * this poor, laughable skeleton for the sake of backwards compatibility.
- * At any rate, this was what came before the {@link Map} interface 
+ * At any rate, this was what came before the {@link Map} interface
  * in the Collections framework.
  *
  * @author Jon Zeppieri
@@ -77,7 +77,7 @@ public abstract class Dictionary
    */
   public abstract Enumeration elements();
 
-  /** 
+  /**
    * Returns the value associated with the supplied key, or null
    * if no such value exists. Since Dictionaries are not allowed null keys
    * or elements, a null result always means the key is not present.
diff --git a/libjava/classpath/java/util/DuplicateFormatFlagsException.java b/libjava/classpath/java/util/DuplicateFormatFlagsException.java
index c180605cdc5..38c37669d7c 100644
--- a/libjava/classpath/java/util/DuplicateFormatFlagsException.java
+++ b/libjava/classpath/java/util/DuplicateFormatFlagsException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the flags supplied to the {@link Formatter#format()}
  * method of a {@link Formatter} contain duplicates.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class DuplicateFormatFlagsException 
+public class DuplicateFormatFlagsException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 18890531L;
@@ -72,7 +72,7 @@ public class DuplicateFormatFlagsException
     super("Duplicate flag passed in " + flags);
     if (flags == null)
       throw new
-	NullPointerException("Null flags value passed to constructor.");
+        NullPointerException("Null flags value passed to constructor.");
     this.flags = flags;
   }
 
diff --git a/libjava/classpath/java/util/EnumMap.java b/libjava/classpath/java/util/EnumMap.java
index b7187b935f2..78f05002fde 100644
--- a/libjava/classpath/java/util/EnumMap.java
+++ b/libjava/classpath/java/util/EnumMap.java
@@ -40,10 +40,10 @@ package java.util;
 
 import java.io.Serializable;
 
-/** 
+/**
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
 
 public class EnumMap, V>
@@ -82,29 +82,29 @@ public class EnumMap, V>
   {
     if (map instanceof EnumMap)
       {
-	EnumMap other = (EnumMap) map;
-	store = (V[]) other.store.clone();
-	cardinality = other.cardinality;
-	enumClass = other.enumClass;
+        EnumMap other = (EnumMap) map;
+        store = (V[]) other.store.clone();
+        cardinality = other.cardinality;
+        enumClass = other.enumClass;
       }
     else
       {
-	for (K key : map.keySet())
-	  {
-	    V value = map.get(key);
-	    if (store == null)
-	      {
-		enumClass = key.getDeclaringClass();
-		store = (V[]) new Object[enumClass.getEnumConstants().length];
-	      }
-	    int o = key.ordinal();
-	    if (store[o] == emptySlot)
-	      ++cardinality;
-	    store[o] = value;
-	  }
-	// There must be a single element.
-	if (store == null)
-	  throw new IllegalArgumentException("no elements in map");
+        for (K key : map.keySet())
+          {
+            V value = map.get(key);
+            if (store == null)
+              {
+                enumClass = key.getDeclaringClass();
+                store = (V[]) new Object[enumClass.getEnumConstants().length];
+              }
+            int o = key.ordinal();
+            if (store[o] == emptySlot)
+              ++cardinality;
+            store[o] = value;
+          }
+        // There must be a single element.
+        if (store == null)
+          throw new IllegalArgumentException("no elements in map");
       }
   }
 
@@ -117,8 +117,8 @@ public class EnumMap, V>
   {
     for (V i : store)
       {
-	if (i != emptySlot && AbstractCollection.equals(i , value))
-	  return true;
+        if (i != emptySlot && AbstractCollection.equals(i , value))
+          return true;
       }
     return false;
   }
@@ -150,8 +150,8 @@ public class EnumMap, V>
     V result;
     if (store[o] == emptySlot)
       {
-	result = null;
-	++cardinality;
+        result = null;
+        ++cardinality;
       }
     else
       result = store[o];
@@ -179,12 +179,12 @@ public class EnumMap, V>
   {
     for (K key : map.keySet())
       {
-	V value = map.get(key);
+        V value = map.get(key);
 
-	int o = key.ordinal();
-	if (store[o] == emptySlot)
-	  ++cardinality;
-	store[o] = value;
+        int o = key.ordinal();
+        if (store[o] == emptySlot)
+          ++cardinality;
+        store[o] = value;
       }
   }
 
@@ -198,56 +198,56 @@ public class EnumMap, V>
   {
     if (keys == null)
       {
-	keys = new AbstractSet()
-	{
-	  public int size()
-	  {
-	    return cardinality;
-	  }
+        keys = new AbstractSet()
+        {
+          public int size()
+          {
+            return cardinality;
+          }
 
-	  public Iterator iterator()
-	  {
-	    return new Iterator()
-	    {
-	      int count = 0;
-	      int index = -1;
+          public Iterator iterator()
+          {
+            return new Iterator()
+            {
+              int count = 0;
+              int index = -1;
 
-	      public boolean hasNext()
-	      {
-		return count < cardinality;
-	      }
+              public boolean hasNext()
+              {
+                return count < cardinality;
+              }
 
-	      public K next()
-	      {
-		++count;
-		for (++index; store[index] == emptySlot; ++index)
-		  ;
-		return enumClass.getEnumConstants()[index];
-	      }
+              public K next()
+              {
+                ++count;
+                for (++index; store[index] == emptySlot; ++index)
+                  ;
+                return enumClass.getEnumConstants()[index];
+              }
 
-	      public void remove()
-	      {
-		--cardinality;
-		store[index] = (V) emptySlot;
-	      }
-	    };
-	  }
+              public void remove()
+              {
+                --cardinality;
+                store[index] = (V) emptySlot;
+              }
+            };
+          }
 
-	  public void clear()
-	  {
-	    EnumMap.this.clear();
-	  }
+          public void clear()
+          {
+            EnumMap.this.clear();
+          }
 
-	  public boolean contains(Object o)
-	  {
-	    return contains(o);
-	  }
+          public boolean contains(Object o)
+          {
+            return contains(o);
+          }
 
-	  public boolean remove(Object o)
-	  {
-	    return EnumMap.this.remove(o) != null;
-	  }
-	};
+          public boolean remove(Object o)
+          {
+            return EnumMap.this.remove(o) != null;
+          }
+        };
       }
     return keys;
   }
@@ -256,46 +256,46 @@ public class EnumMap, V>
   {
     if (values == null)
       {
-	values = new AbstractCollection()
-	{
-	  public int size()
-	  {
-	    return cardinality;
-	  }
+        values = new AbstractCollection()
+        {
+          public int size()
+          {
+            return cardinality;
+          }
 
-	  public Iterator iterator()
-	  {
-	    return new Iterator()
-	    {
-	      int count = 0;
-	      int index = -1;
+          public Iterator iterator()
+          {
+            return new Iterator()
+            {
+              int count = 0;
+              int index = -1;
 
-	      public boolean hasNext()
-	      {
-		return count < cardinality;
-	      }
+              public boolean hasNext()
+              {
+                return count < cardinality;
+              }
 
-	      public V next()
-	      {
-		++count;
-		for (++index; store[index] == emptySlot; ++index)
-		  ;
-		return store[index];
-	      }
+              public V next()
+              {
+                ++count;
+                for (++index; store[index] == emptySlot; ++index)
+                  ;
+                return store[index];
+              }
 
-	      public void remove()
-	      {
-		--cardinality;
-		store[index] = (V) emptySlot;
-	      }
-	    };
-	  }
+              public void remove()
+              {
+                --cardinality;
+                store[index] = (V) emptySlot;
+              }
+            };
+          }
 
-	  public void clear()
-	  {
-	    EnumMap.this.clear();
-	  }
-	};
+          public void clear()
+          {
+            EnumMap.this.clear();
+          }
+        };
       }
     return values;
   }
@@ -304,74 +304,74 @@ public class EnumMap, V>
   {
     if (entries == null)
       {
-	entries = new AbstractSet>()
-	{
-	  public int size()
-	  {
-	    return cardinality;
-	  }
+        entries = new AbstractSet>()
+        {
+          public int size()
+          {
+            return cardinality;
+          }
 
-	  public Iterator> iterator()
-	  {
-	    return new Iterator>()
-	    {
-	      int count = 0;
-	      int index = -1;
+          public Iterator> iterator()
+          {
+            return new Iterator>()
+            {
+              int count = 0;
+              int index = -1;
 
-	      public boolean hasNext()
-	      {
-		return count < cardinality;
-	      }
+              public boolean hasNext()
+              {
+                return count < cardinality;
+              }
 
-	      public Map.Entry next()
-	      {
-		++count;
-		for (++index; store[index] == emptySlot; ++index)
-		  ;
-		// FIXME: we could just return something that
-		// only knows the index.  That would be cleaner.
-		return new AbstractMap.SimpleEntry(enumClass.getEnumConstants()[index],
-							   store[index])
-		{
-		  public V setValue(V newVal)
-		  {
-		    value = newVal;
-		    return put(key, newVal);
-		  }
-		};
-	      }
+              public Map.Entry next()
+              {
+                ++count;
+                for (++index; store[index] == emptySlot; ++index)
+                  ;
+                // FIXME: we could just return something that
+                // only knows the index.  That would be cleaner.
+                return new AbstractMap.SimpleEntry(enumClass.getEnumConstants()[index],
+                                                           store[index])
+                {
+                  public V setValue(V newVal)
+                  {
+                    value = newVal;
+                    return put(key, newVal);
+                  }
+                };
+              }
 
-	      public void remove()
-	      {
-		--cardinality;
-		store[index] = (V) emptySlot;
-	      }
-	    };
-	  }
+              public void remove()
+              {
+                --cardinality;
+                store[index] = (V) emptySlot;
+              }
+            };
+          }
 
-	  public void clear()
-	  {
-	    EnumMap.this.clear();
-	  }
+          public void clear()
+          {
+            EnumMap.this.clear();
+          }
 
-	  public boolean contains(Object o)
-	  {
-	    if (! (o instanceof Map.Entry))
-	      return false;
-	    Map.Entry other = (Map.Entry) o;
-	    return (containsKey(other.getKey())
-		    && AbstractCollection.equals(get(other.getKey()),
-						 other.getValue()));
-	  }
+          public boolean contains(Object o)
+          {
+            if (! (o instanceof Map.Entry))
+              return false;
+            Map.Entry other = (Map.Entry) o;
+            return (containsKey(other.getKey())
+                    && AbstractCollection.equals(get(other.getKey()),
+                                                 other.getValue()));
+          }
 
-	  public boolean remove(Object o)
-	  {
-	    if (! (o instanceof Map.Entry))
-	      return false;
-	    Map.Entry other = (Map.Entry) o;
-	    return EnumMap.this.remove(other.getKey()) != null;
-	  }
-	};
+          public boolean remove(Object o)
+          {
+            if (! (o instanceof Map.Entry))
+              return false;
+            Map.Entry other = (Map.Entry) o;
+            return EnumMap.this.remove(other.getKey()) != null;
+          }
+        };
       }
     return entries;
   }
@@ -391,12 +391,12 @@ public class EnumMap, V>
     EnumMap result;
     try
       {
-	result = (EnumMap) super.clone();
+        result = (EnumMap) super.clone();
       }
     catch (CloneNotSupportedException ignore)
       {
-	// Can't happen.
-	result = null;
+        // Can't happen.
+        result = null;
       }
     result.store = (V[]) store.clone();
     return result;
diff --git a/libjava/classpath/java/util/EnumSet.java b/libjava/classpath/java/util/EnumSet.java
index 31b03684ab6..60d010654ed 100644
--- a/libjava/classpath/java/util/EnumSet.java
+++ b/libjava/classpath/java/util/EnumSet.java
@@ -52,7 +52,7 @@ import java.io.Serializable;
  * 
                  
  * 
                  
  * This class is designed to provide an alternative to using integer bit flags
- * by providing a typesafe {@link Collection} interface with an underlying 
+ * by providing a typesafe {@link Collection} interface with an underlying
  * implementation that utilises the assumptions above to give an equivalent level
  * of efficiency.  The values in a {@link EnumSet} must all be from the same
  * {@link Enum} type, which allows the contents to be packed into a bit vector.
@@ -76,7 +76,7 @@ import java.io.Serializable;
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @author Dalibor Topic (robilad@kaffe.org)
- * @since 1.5 
+ * @since 1.5
  */
 
 // FIXME: serialization is special, uses SerializationProxy.
@@ -115,7 +115,7 @@ public abstract class EnumSet>
 
   /**
    * Returns a clone of the set.
-   * 
+   *
    * @return a clone of the set.
    */
   public EnumSet clone()
@@ -124,12 +124,12 @@ public abstract class EnumSet>
 
     try
       {
-	r = (EnumSet) super.clone();
+        r = (EnumSet) super.clone();
       }
     catch (CloneNotSupportedException _)
       {
-	/* Can't happen */
-	return null;
+        /* Can't happen */
+        return null;
       }
     r.store = (BitSet) store.clone();
     return r;
@@ -190,16 +190,16 @@ public abstract class EnumSet>
     if (other instanceof EnumSet)
       return copyOf((EnumSet) other);
     if (other.isEmpty())
-	throw new IllegalArgumentException("Collection is empty");
+        throw new IllegalArgumentException("Collection is empty");
 
     EnumSet r = null;
 
     for (T val : other)
       {
-	if (r == null)
-	  r = of(val);
-	else
-	  r.add(val);
+        if (r == null)
+          r = of(val);
+        else
+          r.add(val);
       }
 
     return r;
@@ -225,7 +225,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given element.
-   * 
+   *
    * @param first the element to use to populate the new set.
    * @return an {@link EnumSet} containing the element.
    * @throws NullPointerException if first is null.
@@ -236,149 +236,149 @@ public abstract class EnumSet>
     {
       public boolean add(T val)
       {
-	if (store.get(val.ordinal()))
-	  return false;
+        if (store.get(val.ordinal()))
+          return false;
 
-	store.set(val.ordinal());
-	++cardinality;
-	return true;
+        store.set(val.ordinal());
+        ++cardinality;
+        return true;
       }
 
       public boolean addAll(Collection c)
       {
-	boolean result = false;
-	if (c instanceof EnumSet)
-	{
-	  EnumSet other = (EnumSet) c;
-	  if (enumClass == other.enumClass)
-	  {
-	    store.or(other.store);
-	    int save = cardinality;
-	    cardinality = store.cardinality();
-	    result = save != cardinality;
-	  }
-	}
-	else
-	{
-	  for (T val : c)
-	  {
-	    if (add (val))
-	    result = true;
-	  }
-	}
-	return result;
+        boolean result = false;
+        if (c instanceof EnumSet)
+        {
+          EnumSet other = (EnumSet) c;
+          if (enumClass == other.enumClass)
+          {
+            store.or(other.store);
+            int save = cardinality;
+            cardinality = store.cardinality();
+            result = save != cardinality;
+          }
+        }
+        else
+        {
+          for (T val : c)
+          {
+            if (add (val))
+            result = true;
+          }
+        }
+        return result;
       }
 
       public void clear()
       {
-	store.clear();
-	cardinality = 0;
+        store.clear();
+        cardinality = 0;
       }
 
       public boolean contains(Object o)
       {
-	if (! (o instanceof Enum))
-	  return false;
+        if (! (o instanceof Enum))
+          return false;
 
-	Enum e = (Enum) o;
-	if (e.getDeclaringClass() != enumClass)
-	  return false;
+        Enum e = (Enum) o;
+        if (e.getDeclaringClass() != enumClass)
+          return false;
 
-	return store.get(e.ordinal());
+        return store.get(e.ordinal());
       }
 
       public boolean containsAll(Collection c)
       {
-	if (c instanceof EnumSet)
-	{
-	  EnumSet other = (EnumSet) c;
-	  if (enumClass == other.enumClass)
-	    return store.containsAll(other.store);
+        if (c instanceof EnumSet)
+        {
+          EnumSet other = (EnumSet) c;
+          if (enumClass == other.enumClass)
+            return store.containsAll(other.store);
 
-	  return false;
-	}
-	return super.containsAll(c);
+          return false;
+        }
+        return super.containsAll(c);
       }
 
       public Iterator iterator()
       {
-	return new Iterator()
-	{
-	  int next = -1;
-	  int count = 0;
+        return new Iterator()
+        {
+          int next = -1;
+          int count = 0;
 
-	  public boolean hasNext()
-	  {
-	    return count < cardinality;
-	  }
+          public boolean hasNext()
+          {
+            return count < cardinality;
+          }
 
-	  public T next()
-	  {
-	    next = store.nextSetBit(next + 1);
-	    ++count;
-	    return enumClass.getEnumConstants()[next];
-	  }
+          public T next()
+          {
+            next = store.nextSetBit(next + 1);
+            ++count;
+            return enumClass.getEnumConstants()[next];
+          }
 
-	  public void remove()
-	  {
-	    if (! store.get(next))
-	    {
-		store.clear(next);
-		--cardinality;
-	    }
-	  }
-	};
+          public void remove()
+          {
+            if (! store.get(next))
+            {
+                store.clear(next);
+                --cardinality;
+            }
+          }
+        };
       }
 
       public boolean remove(Object o)
       {
-	if (! (o instanceof Enum))
-	  return false;
+        if (! (o instanceof Enum))
+          return false;
 
-	Enum e = (Enum) o;
-	if (e.getDeclaringClass() != enumClass)
-	  return false;
+        Enum e = (Enum) o;
+        if (e.getDeclaringClass() != enumClass)
+          return false;
 
-	store.clear(e.ordinal());
-	--cardinality;
-	return true;
+        store.clear(e.ordinal());
+        --cardinality;
+        return true;
       }
 
       public boolean removeAll(Collection c)
       {
-	if (c instanceof EnumSet)
-	{
-	  EnumSet other = (EnumSet) c;
-	  if (enumClass != other.enumClass)
-	    return false;
+        if (c instanceof EnumSet)
+        {
+          EnumSet other = (EnumSet) c;
+          if (enumClass != other.enumClass)
+            return false;
 
-	  store.andNot(other.store);
-	  int save = cardinality;
-	  cardinality = store.cardinality();
-	  return save != cardinality;
-	}
-	return super.removeAll(c);
+          store.andNot(other.store);
+          int save = cardinality;
+          cardinality = store.cardinality();
+          return save != cardinality;
+        }
+        return super.removeAll(c);
       }
 
       public boolean retainAll(Collection c)
       {
-	if (c instanceof EnumSet)
-	{
-	  EnumSet other = (EnumSet) c;
-	  if (enumClass != other.enumClass)
-	    return false;
+        if (c instanceof EnumSet)
+        {
+          EnumSet other = (EnumSet) c;
+          if (enumClass != other.enumClass)
+            return false;
 
-	  store.and(other.store);
-	  int save = cardinality;
-	  cardinality = store.cardinality();
-	  return save != cardinality;
-	}
-	return super.retainAll(c);
+          store.and(other.store);
+          int save = cardinality;
+          cardinality = store.cardinality();
+          return save != cardinality;
+        }
+        return super.retainAll(c);
       }
 
       public int size()
       {
-	return cardinality;
+        return cardinality;
       }
     };
 
@@ -392,7 +392,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given two elements.
-   * 
+   *
    * @param first the first element to use to populate the new set.
    * @param second the second element to use.
    * @return an {@link EnumSet} containing the elements.
@@ -407,7 +407,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given three elements.
-   * 
+   *
    * @param first the first element to use to populate the new set.
    * @param second the second element to use.
    * @param third the third element to use.
@@ -423,7 +423,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given four elements.
-   * 
+   *
    * @param first the first element to use to populate the new set.
    * @param second the second element to use.
    * @param third the third element to use.
@@ -432,7 +432,7 @@ public abstract class EnumSet>
    * @throws NullPointerException if any of the parameters are null.
    */
   public static > EnumSet of(T first, T second, T third,
-						  T fourth)
+                                                  T fourth)
   {
     EnumSet r = of(first, second, third);
     r.add(fourth);
@@ -441,7 +441,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given five elements.
-   * 
+   *
    * @param first the first element to use to populate the new set.
    * @param second the second element to use.
    * @param third the third element to use.
@@ -451,7 +451,7 @@ public abstract class EnumSet>
    * @throws NullPointerException if any of the parameters are null.
    */
   public static > EnumSet of(T first, T second, T third,
-						  T fourth, T fifth)
+                                                  T fourth, T fifth)
   {
     EnumSet r = of(first, second, third, fourth);
     r.add(fifth);
@@ -460,7 +460,7 @@ public abstract class EnumSet>
 
   /**
    * Creates a new {@link EnumSet} populated with the given elements.
-   * 
+   *
    * @param first the first element to use to populate the new set.
    * @param rest the other elements to use.
    * @return an {@link EnumSet} containing the elements.
diff --git a/libjava/classpath/java/util/FormatFlagsConversionMismatchException.java b/libjava/classpath/java/util/FormatFlagsConversionMismatchException.java
index ec317730503..b28ded187b5 100644
--- a/libjava/classpath/java/util/FormatFlagsConversionMismatchException.java
+++ b/libjava/classpath/java/util/FormatFlagsConversionMismatchException.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the flags supplied to the {@link Formatter#format()}
  * method of a {@link Formatter} contains a flag that does not match
  * the conversion character specified for it.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
 public class FormatFlagsConversionMismatchException
   extends IllegalFormatException
@@ -83,7 +83,7 @@ public class FormatFlagsConversionMismatchException
     super("Invalid flag " + f + " for conversion " + c);
     if (f == null)
       throw new
-	NullPointerException("Null flag value passed to constructor.");
+        NullPointerException("Null flag value passed to constructor.");
     this.f = f;
     this.c = c;
   }
diff --git a/libjava/classpath/java/util/Formattable.java b/libjava/classpath/java/util/Formattable.java
index 27e26a701e4..6a83ed5d26a 100644
--- a/libjava/classpath/java/util/Formattable.java
+++ b/libjava/classpath/java/util/Formattable.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * 
                  
  * The Formattable interface is used to provide customised
  * formatting to arbitrary objects via the {@link Formatter}.  The
@@ -54,7 +54,7 @@ package java.util;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
 public interface Formattable
 {
@@ -88,5 +88,5 @@ public interface Formattable
    *                                between it and the arguments.
    */
   public void formatTo(Formatter formatter, int flags, int width,
-		       int precision);
+                       int precision);
 }
diff --git a/libjava/classpath/java/util/FormattableFlags.java b/libjava/classpath/java/util/FormattableFlags.java
index 648b3c03839..2c5e199ba23 100644
--- a/libjava/classpath/java/util/FormattableFlags.java
+++ b/libjava/classpath/java/util/FormattableFlags.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * This class contains a set of flags used
  * by the {@link Formattable#formatTo()} method.
  * They are used to modify the output of the
@@ -48,7 +48,7 @@ package java.util;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
 public class FormattableFlags
 {
diff --git a/libjava/classpath/java/util/Formatter.java b/libjava/classpath/java/util/Formatter.java
index 9217d93b6e9..04ae8058dcf 100644
--- a/libjava/classpath/java/util/Formatter.java
+++ b/libjava/classpath/java/util/Formatter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -56,7 +56,7 @@ import java.text.DecimalFormatSymbols;
 
 import gnu.classpath.SystemProperties;
 
-/** 
+/**
  * 
                  
  * A Java formatter for printf-style format strings,
  * as seen in the C programming language.   This differs from the
@@ -79,12 +79,12 @@ import gnu.classpath.SystemProperties;
  * Note: the formatter is not thread-safe.  For
  * multi-threaded access, external synchronization should be provided.
  * 
                  
- *  
+ *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public final class Formatter 
+public final class Formatter
   implements Closeable, Flushable
 {
 
@@ -211,7 +211,7 @@ public final class Formatter
    * @throws SecurityException if a security manager is present
    *                           and doesn't allow writing to the file.
    */
-  public Formatter(File file) 
+  public Formatter(File file)
     throws FileNotFoundException
   {
     this(new OutputStreamWriter(new FileOutputStream(file)));
@@ -257,7 +257,7 @@ public final class Formatter
     throws FileNotFoundException, UnsupportedEncodingException
   {
     this(new OutputStreamWriter(new FileOutputStream(file), charset),
-	 loc);
+         loc);
   }
 
   /**
@@ -373,7 +373,7 @@ public final class Formatter
     throws FileNotFoundException, UnsupportedEncodingException
   {
     this(new OutputStreamWriter(new FileOutputStream(file), charset),
-	 loc);
+         loc);
   }
 
   /**
@@ -390,13 +390,13 @@ public final class Formatter
       return;
     try
       {
-	if (out instanceof Closeable)
-	  ((Closeable) out).close();
+        if (out instanceof Closeable)
+          ((Closeable) out).close();
       }
     catch (IOException _)
       {
-	// FIXME: do we ignore these or do we set ioException?
-	// The docs seem to indicate that we should ignore.
+        // FIXME: do we ignore these or do we set ioException?
+        // The docs seem to indicate that we should ignore.
       }
     closed = true;
   }
@@ -414,13 +414,13 @@ public final class Formatter
       throw new FormatterClosedException();
     try
       {
-	if (out instanceof Flushable)
-	  ((Flushable) out).flush();
+        if (out instanceof Flushable)
+          ((Flushable) out).flush();
       }
     catch (IOException _)
       {
-	// FIXME: do we ignore these or do we set ioException?
-	// The docs seem to indicate that we should ignore.
+        // FIXME: do we ignore these or do we set ioException?
+        // The docs seem to indicate that we should ignore.
       }
   }
 
@@ -450,7 +450,7 @@ public final class Formatter
     flags &= ~allowed;
     if (flags != 0)
       throw new FormatFlagsConversionMismatchException(getName(flags),
-						       conversion);
+                                                       conversion);
   }
 
   /**
@@ -473,7 +473,7 @@ public final class Formatter
    * @param isNegative true if the value is negative.
    */
   private void applyLocalization(CPStringBuilder builder, int flags, int width,
-				 boolean isNegative)
+                                 boolean isNegative)
   {
     DecimalFormatSymbols dfsyms;
     if (fmtLocale == null)
@@ -486,52 +486,52 @@ public final class Formatter
     int decimalOffset = -1;
     for (int i = builder.length() - 1; i >= 0; --i)
       {
-	char c = builder.charAt(i);
-	if (c >= '0' && c <= '9')
-	  builder.setCharAt(i, (char) (c - '0' + zeroDigit));
-	else if (c == '.')
-	  {
-	    assert decimalOffset == -1;
-	    decimalOffset = i;
-	  }
+        char c = builder.charAt(i);
+        if (c >= '0' && c <= '9')
+          builder.setCharAt(i, (char) (c - '0' + zeroDigit));
+        else if (c == '.')
+          {
+            assert decimalOffset == -1;
+            decimalOffset = i;
+          }
       }
 
     // Localize the decimal separator.
     if (decimalOffset != -1)
       {
-	builder.deleteCharAt(decimalOffset);
-	builder.insert(decimalOffset, dfsyms.getDecimalSeparator());
+        builder.deleteCharAt(decimalOffset);
+        builder.insert(decimalOffset, dfsyms.getDecimalSeparator());
       }
-	
+
     // Insert the grouping separators.
     if ((flags & FormattableFlags.COMMA) != 0)
       {
-	char groupSeparator = dfsyms.getGroupingSeparator();
-	int groupSize = 3;	// FIXME
-	int offset = (decimalOffset == -1) ? builder.length() : decimalOffset;
-	// We use '>' because we don't want to insert a separator
-	// before the first digit.
-	for (int i = offset - groupSize; i > 0; i -= groupSize)
-	  builder.insert(i, groupSeparator);
+        char groupSeparator = dfsyms.getGroupingSeparator();
+        int groupSize = 3;      // FIXME
+        int offset = (decimalOffset == -1) ? builder.length() : decimalOffset;
+        // We use '>' because we don't want to insert a separator
+        // before the first digit.
+        for (int i = offset - groupSize; i > 0; i -= groupSize)
+          builder.insert(i, groupSeparator);
       }
 
     if ((flags & FormattableFlags.ZERO) != 0)
       {
-	// Zero fill.  Note that according to the algorithm we do not
-	// insert grouping separators here.
-	for (int i = width - builder.length(); i > 0; --i)
-	  builder.insert(0, zeroDigit);
+        // Zero fill.  Note that according to the algorithm we do not
+        // insert grouping separators here.
+        for (int i = width - builder.length(); i > 0; --i)
+          builder.insert(0, zeroDigit);
       }
 
     if (isNegative)
       {
-	if ((flags & FormattableFlags.PAREN) != 0)
-	  {
-	    builder.insert(0, '(');
-	    builder.append(')');
-	  }
-	else
-	  builder.insert(0, '-');
+        if ((flags & FormattableFlags.PAREN) != 0)
+          {
+            builder.insert(0, '(');
+            builder.append(')');
+          }
+        else
+          builder.insert(0, '-');
       }
     else if ((flags & FormattableFlags.PLUS) != 0)
       builder.insert(0, '+');
@@ -554,10 +554,10 @@ public final class Formatter
   {
     if ((flags & FormattableFlags.UPPERCASE) != 0)
       {
-	if (fmtLocale == null)
-	  arg = arg.toUpperCase();
-	else
-	  arg = arg.toUpperCase(fmtLocale);
+        if (fmtLocale == null)
+          arg = arg.toUpperCase();
+        else
+          arg = arg.toUpperCase(fmtLocale);
       }
 
     if (precision >= 0 && arg.length() > precision)
@@ -568,19 +568,19 @@ public final class Formatter
       throw new MissingFormatWidthException("fixme");
     if (! leftJustify && arg.length() < width)
       {
-	for (int i = width - arg.length(); i > 0; --i)
-	  out.append(' ');
+        for (int i = width - arg.length(); i > 0; --i)
+          out.append(' ');
       }
     out.append(arg);
     if (leftJustify && arg.length() < width)
       {
-	for (int i = width - arg.length(); i > 0; --i)
-	  out.append(' ');
+        for (int i = width - arg.length(); i > 0; --i)
+          out.append(' ');
       }
   }
 
-  /** 
-   * Emit a boolean.  
+  /**
+   * Emit a boolean.
    *
    * @param arg the boolean to emit.
    * @param flags the formatting flags to use.
@@ -590,12 +590,12 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void booleanFormat(Object arg, int flags, int width, int precision,
-			     char conversion)
+                             char conversion)
     throws IOException
   {
     checkFlags(flags,
-	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
-	       conversion);
+               FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+               conversion);
     String result;
     if (arg instanceof Boolean)
       result = String.valueOf((Boolean) arg);
@@ -604,8 +604,8 @@ public final class Formatter
     genericFormat(result, flags, width, precision);
   }
 
-  /** 
-   * Emit a hash code.  
+  /**
+   * Emit a hash code.
    *
    * @param arg the hash code to emit.
    * @param flags the formatting flags to use.
@@ -615,18 +615,18 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void hashCodeFormat(Object arg, int flags, int width, int precision,
-			      char conversion)
+                              char conversion)
     throws IOException
   {
     checkFlags(flags,
-	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
-	       conversion);
+               FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+               conversion);
     genericFormat(arg == null ? "null" : Integer.toHexString(arg.hashCode()),
-		  flags, width, precision);
+                  flags, width, precision);
   }
 
-  /** 
-   * Emit a String or Formattable conversion.  
+  /**
+   * Emit a String or Formattable conversion.
    *
    * @param arg the String or Formattable to emit.
    * @param flags the formatting flags to use.
@@ -636,31 +636,31 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void stringFormat(Object arg, int flags, int width, int precision,
-			    char conversion)
+                            char conversion)
     throws IOException
   {
     if (arg instanceof Formattable)
       {
-	checkFlags(flags,
-		   (FormattableFlags.LEFT_JUSTIFY
-		    | FormattableFlags.UPPERCASE
-		    | FormattableFlags.ALTERNATE),
-		   conversion);
-	Formattable fmt = (Formattable) arg;
-	fmt.formatTo(this, flags, width, precision);
+        checkFlags(flags,
+                   (FormattableFlags.LEFT_JUSTIFY
+                    | FormattableFlags.UPPERCASE
+                    | FormattableFlags.ALTERNATE),
+                   conversion);
+        Formattable fmt = (Formattable) arg;
+        fmt.formatTo(this, flags, width, precision);
       }
     else
       {
-	checkFlags(flags,
-		   FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
-		   conversion);
-	genericFormat(arg == null ? "null" : arg.toString(), flags, width,
-		      precision);
+        checkFlags(flags,
+                   FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+                   conversion);
+        genericFormat(arg == null ? "null" : arg.toString(), flags, width,
+                      precision);
       }
   }
 
-  /** 
-   * Emit a character.  
+  /**
+   * Emit a character.
    *
    * @param arg the character to emit.
    * @param flags the formatting flags to use.
@@ -670,12 +670,12 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void characterFormat(Object arg, int flags, int width, int precision,
-			       char conversion)
+                               char conversion)
     throws IOException
   {
     checkFlags(flags,
-	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
-	       conversion);
+               FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+               conversion);
     noPrecision(precision);
 
     int theChar;
@@ -687,9 +687,9 @@ public final class Formatter
       theChar = (char) (((Short) arg).shortValue ());
     else if (arg instanceof Integer)
       {
-	theChar = ((Integer) arg).intValue();
-	if (! Character.isValidCodePoint(theChar))
-	  throw new IllegalFormatCodePointException(theChar);
+        theChar = ((Integer) arg).intValue();
+        if (! Character.isValidCodePoint(theChar))
+          throw new IllegalFormatCodePointException(theChar);
       }
     else
       throw new IllegalFormatConversionException(conversion, arg.getClass());
@@ -697,7 +697,7 @@ public final class Formatter
     genericFormat(result, flags, width, precision);
   }
 
-  /** 
+  /**
    * Emit a '%'.
    *
    * @param flags the formatting flags to use.
@@ -713,7 +713,7 @@ public final class Formatter
     genericFormat("%", flags, width, precision);
   }
 
-  /** 
+  /**
    * Emit a newline.
    *
    * @param flags the formatting flags to use.
@@ -744,15 +744,15 @@ public final class Formatter
    * @return the result.
    */
   private CPStringBuilder basicIntegralConversion(Object arg, int flags,
-						  int width, int precision,
-						  int radix, char conversion)
+                                                  int width, int precision,
+                                                  int radix, char conversion)
   {
     assert radix == 8 || radix == 10 || radix == 16;
     noPrecision(precision);
 
     // Some error checking.
     if ((flags & FormattableFlags.PLUS) != 0
-	&& (flags & FormattableFlags.SPACE) != 0)
+        && (flags & FormattableFlags.SPACE) != 0)
       throw new IllegalFormatFlagsException(getName(flags));
 
     if ((flags & FormattableFlags.LEFT_JUSTIFY) != 0 && width == -1)
@@ -761,41 +761,41 @@ public final class Formatter
     // Do the base translation of the value to a string.
     String result;
     int basicFlags = (FormattableFlags.LEFT_JUSTIFY
-		      // We already handled any possible error when
-		      // parsing.
-		      | FormattableFlags.UPPERCASE
-		      | FormattableFlags.ZERO);
+                      // We already handled any possible error when
+                      // parsing.
+                      | FormattableFlags.UPPERCASE
+                      | FormattableFlags.ZERO);
     if (radix == 10)
       basicFlags |= (FormattableFlags.PLUS
-		     | FormattableFlags.SPACE
-		     | FormattableFlags.COMMA
-		     | FormattableFlags.PAREN);
+                     | FormattableFlags.SPACE
+                     | FormattableFlags.COMMA
+                     | FormattableFlags.PAREN);
     else
       basicFlags |= FormattableFlags.ALTERNATE;
 
     if (arg instanceof BigInteger)
       {
-	checkFlags(flags,
-		   (basicFlags
-		    | FormattableFlags.PLUS
-		    | FormattableFlags.SPACE
-		    | FormattableFlags.PAREN),
-		   conversion);
-	BigInteger bi = (BigInteger) arg;
-	result = bi.toString(radix);
+        checkFlags(flags,
+                   (basicFlags
+                    | FormattableFlags.PLUS
+                    | FormattableFlags.SPACE
+                    | FormattableFlags.PAREN),
+                   conversion);
+        BigInteger bi = (BigInteger) arg;
+        result = bi.toString(radix);
       }
     else if (arg instanceof Number
-	     && ! (arg instanceof Float)
-	     && ! (arg instanceof Double))
+             && ! (arg instanceof Float)
+             && ! (arg instanceof Double))
       {
-	checkFlags(flags, basicFlags, conversion);
-	long value = ((Number) arg).longValue ();
-	if (radix == 8)
-	  result = Long.toOctalString(value);
-	else if (radix == 16)
-	  result = Long.toHexString(value);
-	else
-	  result = Long.toString(value);
+        checkFlags(flags, basicFlags, conversion);
+        long value = ((Number) arg).longValue ();
+        if (radix == 8)
+          result = Long.toOctalString(value);
+        else if (radix == 16)
+          result = Long.toHexString(value);
+        else
+          result = Long.toString(value);
       }
     else
       throw new IllegalFormatConversionException(conversion, arg.getClass());
@@ -803,9 +803,9 @@ public final class Formatter
     return new CPStringBuilder(result);
   }
 
-  /** 
-   * Emit a hex or octal value.  
-   * 
+  /**
+   * Emit a hex or octal value.
+   *
    * @param arg the hexadecimal or octal value.
    * @param flags the formatting flags to use.
    * @param width the width to use.
@@ -815,79 +815,79 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void hexOrOctalConversion(Object arg, int flags, int width,
-				    int precision, int radix,
-				    char conversion)
+                                    int precision, int radix,
+                                    char conversion)
     throws IOException
   {
     assert radix == 8 || radix == 16;
 
     CPStringBuilder builder = basicIntegralConversion(arg, flags, width,
-						      precision, radix,
-						      conversion);
+                                                      precision, radix,
+                                                      conversion);
     int insertPoint = 0;
 
     // Insert the sign.
     if (builder.charAt(0) == '-')
       {
-	// Already inserted.  Note that we don't insert a sign, since
-	// the only case where it is needed it BigInteger, and it has
-	// already been inserted by toString.
-	++insertPoint;
+        // Already inserted.  Note that we don't insert a sign, since
+        // the only case where it is needed it BigInteger, and it has
+        // already been inserted by toString.
+        ++insertPoint;
       }
     else if ((flags & FormattableFlags.PLUS) != 0)
       {
-	builder.insert(insertPoint, '+');
-	++insertPoint;
+        builder.insert(insertPoint, '+');
+        ++insertPoint;
       }
     else if ((flags & FormattableFlags.SPACE) != 0)
       {
-	builder.insert(insertPoint, ' ');
-	++insertPoint;
+        builder.insert(insertPoint, ' ');
+        ++insertPoint;
       }
 
     // Insert the radix prefix.
     if ((flags & FormattableFlags.ALTERNATE) != 0)
       {
-	builder.insert(insertPoint, radix == 8 ? "0" : "0x");
-	insertPoint += radix == 8 ? 1 : 2;
+        builder.insert(insertPoint, radix == 8 ? "0" : "0x");
+        insertPoint += radix == 8 ? 1 : 2;
       }
 
     // Now justify the result.
     int resultWidth = builder.length();
     if (resultWidth < width)
       {
-	char fill = ((flags & FormattableFlags.ZERO) != 0) ? '0' : ' ';
-	if ((flags & FormattableFlags.LEFT_JUSTIFY) != 0)
-	  {
-	    // Left justify.  
-	    if (fill == ' ')
-	      insertPoint = builder.length();
-	  }
-	else
-	  {
-	    // Right justify.  Insert spaces before the radix prefix
-	    // and sign.
-	    insertPoint = 0;
-	  }
-	while (resultWidth++ < width)
-	  builder.insert(insertPoint, fill);
+        char fill = ((flags & FormattableFlags.ZERO) != 0) ? '0' : ' ';
+        if ((flags & FormattableFlags.LEFT_JUSTIFY) != 0)
+          {
+            // Left justify.
+            if (fill == ' ')
+              insertPoint = builder.length();
+          }
+        else
+          {
+            // Right justify.  Insert spaces before the radix prefix
+            // and sign.
+            insertPoint = 0;
+          }
+        while (resultWidth++ < width)
+          builder.insert(insertPoint, fill);
       }
 
     String result = builder.toString();
     if ((flags & FormattableFlags.UPPERCASE) != 0)
       {
-	if (fmtLocale == null)
-	  result = result.toUpperCase();
-	else
-	  result = result.toUpperCase(fmtLocale);
+        if (fmtLocale == null)
+          result = result.toUpperCase();
+        else
+          result = result.toUpperCase(fmtLocale);
       }
 
     out.append(result);
   }
 
-  /** 
-   * Emit a decimal value.  
-   * 
+  /**
+   * Emit a decimal value.
+   *
    * @param arg the hexadecimal or octal value.
    * @param flags the formatting flags to use.
    * @param width the width to use.
@@ -896,26 +896,26 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void decimalConversion(Object arg, int flags, int width,
-				 int precision, char conversion)
+                                 int precision, char conversion)
     throws IOException
   {
     CPStringBuilder builder = basicIntegralConversion(arg, flags, width,
-						      precision, 10,
-						      conversion);
+                                                      precision, 10,
+                                                      conversion);
     boolean isNegative = false;
     if (builder.charAt(0) == '-')
       {
-	// Sign handling is done during localization.
-	builder.deleteCharAt(0);
-	isNegative = true;
+        // Sign handling is done during localization.
+        builder.deleteCharAt(0);
+        isNegative = true;
       }
 
     applyLocalization(builder, flags, width, isNegative);
     genericFormat(builder.toString(), flags, width, precision);
   }
 
-  /** 
-   * Emit a single date or time conversion to a StringBuilder.  
+  /**
+   * Emit a single date or time conversion to a StringBuilder.
    *
    * @param builder the builder to write to.
    * @param cal the calendar to use in the conversion.
@@ -923,185 +923,185 @@ public final class Formatter
    * @param syms the date formatting symbols.
    */
   private void singleDateTimeConversion(CPStringBuilder builder, Calendar cal,
-					char conversion,
-					DateFormatSymbols syms)
+                                        char conversion,
+                                        DateFormatSymbols syms)
   {
     int oldLen = builder.length();
     int digits = -1;
     switch (conversion)
       {
       case 'H':
-	builder.append(cal.get(Calendar.HOUR_OF_DAY));
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.HOUR_OF_DAY));
+        digits = 2;
+        break;
       case 'I':
-	builder.append(cal.get(Calendar.HOUR));
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.HOUR));
+        digits = 2;
+        break;
       case 'k':
-	builder.append(cal.get(Calendar.HOUR_OF_DAY));
-	break;
+        builder.append(cal.get(Calendar.HOUR_OF_DAY));
+        break;
       case 'l':
-	builder.append(cal.get(Calendar.HOUR));
-	break;
+        builder.append(cal.get(Calendar.HOUR));
+        break;
       case 'M':
-	builder.append(cal.get(Calendar.MINUTE));
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.MINUTE));
+        digits = 2;
+        break;
       case 'S':
-	builder.append(cal.get(Calendar.SECOND));
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.SECOND));
+        digits = 2;
+        break;
       case 'N':
-	// FIXME: nanosecond ...
-	digits = 9;
-	break;
+        // FIXME: nanosecond ...
+        digits = 9;
+        break;
       case 'p':
-	{
-	  int ampm = cal.get(Calendar.AM_PM);
-	  builder.append(syms.getAmPmStrings()[ampm]);
-	}
-	break;
+        {
+          int ampm = cal.get(Calendar.AM_PM);
+          builder.append(syms.getAmPmStrings()[ampm]);
+        }
+        break;
       case 'z':
-	{
-	  int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60);
-	  builder.append(zone);
-	  digits = 4;
-	  // Skip the '-' sign.
-	  if (zone < 0)
-	    ++oldLen;
-	}
-	break;
+        {
+          int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60);
+          builder.append(zone);
+          digits = 4;
+          // Skip the '-' sign.
+          if (zone < 0)
+            ++oldLen;
+        }
+        break;
       case 'Z':
-	{
-	  // FIXME: DST?
-	  int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60 * 60);
-	  String[][] zs = syms.getZoneStrings();
-	  builder.append(zs[zone + 12][1]);
-	}
-	break;
+        {
+          // FIXME: DST?
+          int zone = cal.get(Calendar.ZONE_OFFSET) / (1000 * 60 * 60);
+          String[][] zs = syms.getZoneStrings();
+          builder.append(zs[zone + 12][1]);
+        }
+        break;
       case 's':
-	{
-	  long val = cal.getTime().getTime();
-	  builder.append(val / 1000);
-	}
-	break;
+        {
+          long val = cal.getTime().getTime();
+          builder.append(val / 1000);
+        }
+        break;
       case 'Q':
-	{
-	  long val = cal.getTime().getTime();
-	  builder.append(val);
-	}
-	break;
+        {
+          long val = cal.getTime().getTime();
+          builder.append(val);
+        }
+        break;
       case 'B':
-	{
-	  int month = cal.get(Calendar.MONTH);
-	  builder.append(syms.getMonths()[month]);
-	}
-	break;
+        {
+          int month = cal.get(Calendar.MONTH);
+          builder.append(syms.getMonths()[month]);
+        }
+        break;
       case 'b':
       case 'h':
-	{
-	  int month = cal.get(Calendar.MONTH);
-	  builder.append(syms.getShortMonths()[month]);
-	}
-	break;
+        {
+          int month = cal.get(Calendar.MONTH);
+          builder.append(syms.getShortMonths()[month]);
+        }
+        break;
       case 'A':
-	{
-	  int day = cal.get(Calendar.DAY_OF_WEEK);
-	  builder.append(syms.getWeekdays()[day]);
-	}
-	break;
+        {
+          int day = cal.get(Calendar.DAY_OF_WEEK);
+          builder.append(syms.getWeekdays()[day]);
+        }
+        break;
       case 'a':
-	{
-	  int day = cal.get(Calendar.DAY_OF_WEEK);
-	  builder.append(syms.getShortWeekdays()[day]);
-	}
-	break;
+        {
+          int day = cal.get(Calendar.DAY_OF_WEEK);
+          builder.append(syms.getShortWeekdays()[day]);
+        }
+        break;
       case 'C':
-	builder.append(cal.get(Calendar.YEAR) / 100);
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.YEAR) / 100);
+        digits = 2;
+        break;
       case 'Y':
-	builder.append(cal.get(Calendar.YEAR));
-	digits = 4;
-	break;
+        builder.append(cal.get(Calendar.YEAR));
+        digits = 4;
+        break;
       case 'y':
-	builder.append(cal.get(Calendar.YEAR) % 100);
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.YEAR) % 100);
+        digits = 2;
+        break;
       case 'j':
-	builder.append(cal.get(Calendar.DAY_OF_YEAR));
-	digits = 3;
-	break;
+        builder.append(cal.get(Calendar.DAY_OF_YEAR));
+        digits = 3;
+        break;
       case 'm':
-	builder.append(cal.get(Calendar.MONTH) + 1);
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.MONTH) + 1);
+        digits = 2;
+        break;
       case 'd':
-	builder.append(cal.get(Calendar.DAY_OF_MONTH));
-	digits = 2;
-	break;
+        builder.append(cal.get(Calendar.DAY_OF_MONTH));
+        digits = 2;
+        break;
       case 'e':
-	builder.append(cal.get(Calendar.DAY_OF_MONTH));
-	break;
+        builder.append(cal.get(Calendar.DAY_OF_MONTH));
+        break;
       case 'R':
-	singleDateTimeConversion(builder, cal, 'H', syms);
-	builder.append(':');
-	singleDateTimeConversion(builder, cal, 'M', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'H', syms);
+        builder.append(':');
+        singleDateTimeConversion(builder, cal, 'M', syms);
+        break;
       case 'T':
-	singleDateTimeConversion(builder, cal, 'H', syms);
-	builder.append(':');
-	singleDateTimeConversion(builder, cal, 'M', syms);
-	builder.append(':');
-	singleDateTimeConversion(builder, cal, 'S', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'H', syms);
+        builder.append(':');
+        singleDateTimeConversion(builder, cal, 'M', syms);
+        builder.append(':');
+        singleDateTimeConversion(builder, cal, 'S', syms);
+        break;
       case 'r':
-	singleDateTimeConversion(builder, cal, 'I', syms);
-	builder.append(':');
-	singleDateTimeConversion(builder, cal, 'M', syms);
-	builder.append(':');
-	singleDateTimeConversion(builder, cal, 'S', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'p', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'I', syms);
+        builder.append(':');
+        singleDateTimeConversion(builder, cal, 'M', syms);
+        builder.append(':');
+        singleDateTimeConversion(builder, cal, 'S', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'p', syms);
+        break;
       case 'D':
-	singleDateTimeConversion(builder, cal, 'm', syms);
-	builder.append('/');
-    	singleDateTimeConversion(builder, cal, 'd', syms);
-	builder.append('/');
-	singleDateTimeConversion(builder, cal, 'y', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'm', syms);
+        builder.append('/');
+        singleDateTimeConversion(builder, cal, 'd', syms);
+        builder.append('/');
+        singleDateTimeConversion(builder, cal, 'y', syms);
+        break;
       case 'F':
-	singleDateTimeConversion(builder, cal, 'Y', syms);
-	builder.append('-');
-	singleDateTimeConversion(builder, cal, 'm', syms);
-	builder.append('-');
-	singleDateTimeConversion(builder, cal, 'd', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'Y', syms);
+        builder.append('-');
+        singleDateTimeConversion(builder, cal, 'm', syms);
+        builder.append('-');
+        singleDateTimeConversion(builder, cal, 'd', syms);
+        break;
       case 'c':
-	singleDateTimeConversion(builder, cal, 'a', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'b', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'd', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'T', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'Z', syms);
-	builder.append(' ');
-	singleDateTimeConversion(builder, cal, 'Y', syms);
-	break;
+        singleDateTimeConversion(builder, cal, 'a', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'b', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'd', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'T', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'Z', syms);
+        builder.append(' ');
+        singleDateTimeConversion(builder, cal, 'Y', syms);
+        break;
       default:
-	throw new UnknownFormatConversionException(String.valueOf(conversion));
+        throw new UnknownFormatConversionException(String.valueOf(conversion));
       }
 
     if (digits > 0)
       {
-	int newLen = builder.length();
-	int delta = newLen - oldLen;
-	while (delta++ < digits)
-	  builder.insert(oldLen, '0');
+        int newLen = builder.length();
+        int delta = newLen - oldLen;
+        while (delta++ < digits)
+          builder.insert(oldLen, '0');
       }
   }
 
@@ -1117,33 +1117,33 @@ public final class Formatter
    * @throws IOException if the output stream throws an I/O error.
    */
   private void dateTimeConversion(Object arg, int flags, int width,
-				  int precision, char conversion,
-				  char subConversion)
+                                  int precision, char conversion,
+                                  char subConversion)
     throws IOException
   {
     noPrecision(precision);
     checkFlags(flags,
-	       FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
-	       conversion);
+               FormattableFlags.LEFT_JUSTIFY | FormattableFlags.UPPERCASE,
+               conversion);
 
     Calendar cal;
     if (arg instanceof Calendar)
       cal = (Calendar) arg;
     else
       {
-	Date date;
-	if (arg instanceof Date)
-	  date = (Date) arg;
-	else if (arg instanceof Long)
-	  date = new Date(((Long) arg).longValue());
-	else
-	  throw new IllegalFormatConversionException(conversion,
-						     arg.getClass());
-	if (fmtLocale == null)
-	  cal = Calendar.getInstance();
-	else
-	  cal = Calendar.getInstance(fmtLocale);
-	cal.setTime(date);
+        Date date;
+        if (arg instanceof Date)
+          date = (Date) arg;
+        else if (arg instanceof Long)
+          date = new Date(((Long) arg).longValue());
+        else
+          throw new IllegalFormatConversionException(conversion,
+                                                     arg.getClass());
+        if (fmtLocale == null)
+          cal = Calendar.getInstance();
+        else
+          cal = Calendar.getInstance(fmtLocale);
+        cal.setTime(date);
       }
 
     // We could try to be more efficient by computing this lazily.
@@ -1170,8 +1170,8 @@ public final class Formatter
     ++index;
     if (index >= length)
       {
-	// FIXME: what exception here?
-	throw new IllegalArgumentException();
+        // FIXME: what exception here?
+        throw new IllegalArgumentException();
       }
   }
 
@@ -1204,20 +1204,20 @@ public final class Formatter
     int start = index;
     if (format.charAt(index) == '<')
       {
-	result = 0;
-	advance();
+        result = 0;
+        advance();
       }
     else if (Character.isDigit(format.charAt(index)))
       {
-	result = parseInt();
-	if (format.charAt(index) == '$')
-	  advance();
-	else
-	  {
-	    // Reset.
-	    index = start;
-	    result = -1;
-	  }
+        result = parseInt();
+        if (format.charAt(index) == '$')
+          advance();
+        else
+          {
+            // Reset.
+            index = start;
+            result = -1;
+          }
       }
     return result;
   }
@@ -1235,15 +1235,15 @@ public final class Formatter
     int start = index;
     while (true)
       {
-	int x = FLAGS.indexOf(format.charAt(index));
-	if (x == -1)
-	  break;
-	int newValue = 1 << x;
-	if ((value & newValue) != 0)
-	  throw new DuplicateFormatFlagsException(format.substring(start,
-								   index + 1));
-	value |= newValue;
-	advance();
+        int x = FLAGS.indexOf(format.charAt(index));
+        if (x == -1)
+          break;
+        int newValue = 1 << x;
+        if ((value & newValue) != 0)
+          throw new DuplicateFormatFlagsException(format.substring(start,
+                                                                   index + 1));
+        value |= newValue;
+        advance();
       }
     return value;
   }
@@ -1293,7 +1293,7 @@ public final class Formatter
    *                                specification or a mismatch
    *                                between it and the arguments.
    * @throws FormatterClosedException if the formatter is closed.
-   */ 
+   */
   public Formatter format(Locale loc, String fmt, Object... args)
   {
     if (closed)
@@ -1305,122 +1305,122 @@ public final class Formatter
 
     try
       {
-	fmtLocale = loc;
-	format = fmt;
-	length = format.length();
-	for (index = 0; index < length; ++index)
-	  {
-	    char c = format.charAt(index);
-	    if (c != '%')
-	      {
-		out.append(c);
-		continue;
-	      }
+        fmtLocale = loc;
+        format = fmt;
+        length = format.length();
+        for (index = 0; index < length; ++index)
+          {
+            char c = format.charAt(index);
+            if (c != '%')
+              {
+                out.append(c);
+                continue;
+              }
 
-	    int start = index;
-	    advance();
+            int start = index;
+            advance();
 
-	    // We do the needed post-processing of this later, when we
-	    // determine whether an argument is actually needed by
-	    // this conversion.
-	    int argumentIndex = parseArgumentIndex();
+            // We do the needed post-processing of this later, when we
+            // determine whether an argument is actually needed by
+            // this conversion.
+            int argumentIndex = parseArgumentIndex();
 
-	    int flags = parseFlags();
-	    int width = parseWidth();
-	    int precision = parsePrecision();
-	    char origConversion = format.charAt(index);
-	    char conversion = origConversion;
-	    if (Character.isUpperCase(conversion))
-	      {
-		flags |= FormattableFlags.UPPERCASE;
-		conversion = Character.toLowerCase(conversion);
-	      }
+            int flags = parseFlags();
+            int width = parseWidth();
+            int precision = parsePrecision();
+            char origConversion = format.charAt(index);
+            char conversion = origConversion;
+            if (Character.isUpperCase(conversion))
+              {
+                flags |= FormattableFlags.UPPERCASE;
+                conversion = Character.toLowerCase(conversion);
+              }
 
-	    Object argument = null;
-	    if (conversion == '%' || conversion == 'n')
-	      {
-		if (argumentIndex != -1)
-		  {
-		    // FIXME: not sure about this.
-		    throw new UnknownFormatConversionException("FIXME");
-		  }
-	      }
-	    else
-	      {
-		if (argumentIndex == -1)
-		  argumentIndex = implicitArgumentIndex++;
-		else if (argumentIndex == 0)
-		  argumentIndex = previousArgumentIndex;
-		// Argument indices start at 1 but array indices at 0.
-		--argumentIndex;
-		if (argumentIndex < 0 || argumentIndex >= args.length)
-		  throw new MissingFormatArgumentException(format.substring(start, index));
-		argument = args[argumentIndex];
-	      }
+            Object argument = null;
+            if (conversion == '%' || conversion == 'n')
+              {
+                if (argumentIndex != -1)
+                  {
+                    // FIXME: not sure about this.
+                    throw new UnknownFormatConversionException("FIXME");
+                  }
+              }
+            else
+              {
+                if (argumentIndex == -1)
+                  argumentIndex = implicitArgumentIndex++;
+                else if (argumentIndex == 0)
+                  argumentIndex = previousArgumentIndex;
+                // Argument indices start at 1 but array indices at 0.
+                --argumentIndex;
+                if (argumentIndex < 0 || argumentIndex >= args.length)
+                  throw new MissingFormatArgumentException(format.substring(start, index));
+                argument = args[argumentIndex];
+              }
 
-	    switch (conversion)
-	      {
-	      case 'b':
-		booleanFormat(argument, flags, width, precision,
-			      origConversion);
-		break;
-	      case 'h':
-		hashCodeFormat(argument, flags, width, precision,
-			       origConversion);
-		break;
-	      case 's':
-		stringFormat(argument, flags, width, precision,
-			     origConversion);
-		break;
-	      case 'c':
-		characterFormat(argument, flags, width, precision,
-				origConversion);
-		break;
-	      case 'd':
-		checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'd');
-		decimalConversion(argument, flags, width, precision,
-				  origConversion);
-		break;
-	      case 'o':
-		checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'o');
-		hexOrOctalConversion(argument, flags, width, precision, 8,
-				     origConversion);
-		break;
-	      case 'x':
-		hexOrOctalConversion(argument, flags, width, precision, 16,
-				     origConversion);
-	      case 'e':
-		// scientificNotationConversion();
-		break;
-	      case 'f':
-		// floatingDecimalConversion();
-		break;
-	      case 'g':
-		// smartFloatingConversion();
-		break;
-	      case 'a':
-		// hexFloatingConversion();
-		break;
-	      case 't':
-		advance();
-		char subConversion = format.charAt(index);
-		dateTimeConversion(argument, flags, width, precision,
-				   origConversion, subConversion);
-		break;
-	      case '%':
-		percentFormat(flags, width, precision);
-		break;
-	      case 'n':
-		newLineFormat(flags, width, precision);
-		break;
-	      default:
-		throw new UnknownFormatConversionException(String.valueOf(origConversion));
-	      }
-	  }
+            switch (conversion)
+              {
+              case 'b':
+                booleanFormat(argument, flags, width, precision,
+                              origConversion);
+                break;
+              case 'h':
+                hashCodeFormat(argument, flags, width, precision,
+                               origConversion);
+                break;
+              case 's':
+                stringFormat(argument, flags, width, precision,
+                             origConversion);
+                break;
+              case 'c':
+                characterFormat(argument, flags, width, precision,
+                                origConversion);
+                break;
+              case 'd':
+                checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'd');
+                decimalConversion(argument, flags, width, precision,
+                                  origConversion);
+                break;
+              case 'o':
+                checkFlags(flags & FormattableFlags.UPPERCASE, 0, 'o');
+                hexOrOctalConversion(argument, flags, width, precision, 8,
+                                     origConversion);
+                break;
+              case 'x':
+                hexOrOctalConversion(argument, flags, width, precision, 16,
+                                     origConversion);
+              case 'e':
+                // scientificNotationConversion();
+                break;
+              case 'f':
+                // floatingDecimalConversion();
+                break;
+              case 'g':
+                // smartFloatingConversion();
+                break;
+              case 'a':
+                // hexFloatingConversion();
+                break;
+              case 't':
+                advance();
+                char subConversion = format.charAt(index);
+                dateTimeConversion(argument, flags, width, precision,
+                                   origConversion, subConversion);
+                break;
+              case '%':
+                percentFormat(flags, width, precision);
+                break;
+              case 'n':
+                newLineFormat(flags, width, precision);
+                break;
+              default:
+                throw new UnknownFormatConversionException(String.valueOf(origConversion));
+              }
+          }
       }
     catch (IOException exc)
       {
-	ioException = exc;
+        ioException = exc;
       }
     return this;
   }
diff --git a/libjava/classpath/java/util/FormatterClosedException.java b/libjava/classpath/java/util/FormatterClosedException.java
index c3588648e34..6206849384b 100644
--- a/libjava/classpath/java/util/FormatterClosedException.java
+++ b/libjava/classpath/java/util/FormatterClosedException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when a method is called on a {@link Formatter} but
  * it has already been closed.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class FormatterClosedException 
+public class FormatterClosedException
   extends IllegalStateException
 {
   private static final long serialVersionUID = 18111216L;
diff --git a/libjava/classpath/java/util/GregorianCalendar.java b/libjava/classpath/java/util/GregorianCalendar.java
index 6eb7ce84eab..b5d9e8c4773 100644
--- a/libjava/classpath/java/util/GregorianCalendar.java
+++ b/libjava/classpath/java/util/GregorianCalendar.java
@@ -367,25 +367,25 @@ public class GregorianCalendar extends Calendar
 
     if (month > 11)
       {
-	year += (month / 12);
-	month = month % 12;
+        year += (month / 12);
+        month = month % 12;
       }
 
     if (month < 0)
       {
-	year += (int) month / 12;
-	month = month % 12;
-	if (month < 0)
-	  {
-	    month += 12;
-	    year--;
-	  }
+        year += (int) month / 12;
+        month = month % 12;
+        if (month < 0)
+          {
+            month += 12;
+            year--;
+          }
       }
 
     int dayOfYear = dayCount[month] + 1;
     if (month > 1)
       if (isLeapYear(year))
-	dayOfYear++;
+        dayOfYear++;
 
     boolean greg = isGregorian(year, dayOfYear);
     int day = (int) getLinearDay(year, dayOfYear, greg);
@@ -431,29 +431,29 @@ public class GregorianCalendar extends Calendar
       throw new IllegalArgumentException("Illegal MONTH.");
     if (isSet[WEEK_OF_YEAR])
       {
-	int daysInYear = 365 + leap;
-	daysInYear += (getFirstDayOfMonth(year, 0) - 1); // pad first week
-	int last = getFirstDayOfMonth(year, 11) + 4;
-	if (last > 7)
-	  last -= 7;
-	daysInYear += 7 - last;
-	int weeks = daysInYear / 7;
-	if (fields[WEEK_OF_YEAR] < 1 || fields[WEEK_OF_YEAR] > weeks)
-	  throw new IllegalArgumentException("Illegal WEEK_OF_YEAR.");
+        int daysInYear = 365 + leap;
+        daysInYear += (getFirstDayOfMonth(year, 0) - 1); // pad first week
+        int last = getFirstDayOfMonth(year, 11) + 4;
+        if (last > 7)
+          last -= 7;
+        daysInYear += 7 - last;
+        int weeks = daysInYear / 7;
+        if (fields[WEEK_OF_YEAR] < 1 || fields[WEEK_OF_YEAR] > weeks)
+          throw new IllegalArgumentException("Illegal WEEK_OF_YEAR.");
       }
 
     if (isSet[WEEK_OF_MONTH])
       {
-	int weeks = (month == 1 && leap == 0) ? 5 : 6;
-	if (fields[WEEK_OF_MONTH] < 1 || fields[WEEK_OF_MONTH] > weeks)
-	  throw new IllegalArgumentException("Illegal WEEK_OF_MONTH.");
+        int weeks = (month == 1 && leap == 0) ? 5 : 6;
+        if (fields[WEEK_OF_MONTH] < 1 || fields[WEEK_OF_MONTH] > weeks)
+          throw new IllegalArgumentException("Illegal WEEK_OF_MONTH.");
       }
 
     if (isSet[DAY_OF_MONTH])
       if (fields[DAY_OF_MONTH] < 1
           || fields[DAY_OF_MONTH] > month_days[month]
           + ((month == 1) ? leap : 0))
-	throw new IllegalArgumentException("Illegal DAY_OF_MONTH.");
+        throw new IllegalArgumentException("Illegal DAY_OF_MONTH.");
 
     if (isSet[DAY_OF_YEAR]
         && (fields[DAY_OF_YEAR] < 1 || fields[DAY_OF_YEAR] > 365 + leap))
@@ -465,10 +465,10 @@ public class GregorianCalendar extends Calendar
 
     if (isSet[DAY_OF_WEEK_IN_MONTH])
       {
-	int weeks = (month == 1 && leap == 0) ? 4 : 5;
-	if (fields[DAY_OF_WEEK_IN_MONTH] < -weeks
-	    || fields[DAY_OF_WEEK_IN_MONTH] > weeks)
-	  throw new IllegalArgumentException("Illegal DAY_OF_WEEK_IN_MONTH.");
+        int weeks = (month == 1 && leap == 0) ? 4 : 5;
+        if (fields[DAY_OF_WEEK_IN_MONTH] < -weeks
+            || fields[DAY_OF_WEEK_IN_MONTH] > weeks)
+          throw new IllegalArgumentException("Illegal DAY_OF_WEEK_IN_MONTH.");
       }
 
     if (isSet[AM_PM] && fields[AM_PM] != AM && fields[AM_PM] != PM)
@@ -522,78 +522,78 @@ public class GregorianCalendar extends Calendar
 
     if (! isSet[MONTH] && (! isSet[DAY_OF_WEEK] || isSet[WEEK_OF_YEAR]))
       {
-	// 5: YEAR + DAY_OF_WEEK + WEEK_OF_YEAR
-	if (isSet[WEEK_OF_YEAR])
-	  {
-	    int first = getFirstDayOfMonth(year, 0);
-	    int offs = 1;
-	    int daysInFirstWeek = getFirstDayOfWeek() - first;
-	    if (daysInFirstWeek <= 0)
-	      daysInFirstWeek += 7;
+        // 5: YEAR + DAY_OF_WEEK + WEEK_OF_YEAR
+        if (isSet[WEEK_OF_YEAR])
+          {
+            int first = getFirstDayOfMonth(year, 0);
+            int offs = 1;
+            int daysInFirstWeek = getFirstDayOfWeek() - first;
+            if (daysInFirstWeek <= 0)
+              daysInFirstWeek += 7;
 
-	    if (daysInFirstWeek < getMinimalDaysInFirstWeek())
-	      offs += daysInFirstWeek;
-	    else
-	      offs -= 7 - daysInFirstWeek;
-	    month = 0;
-	    day = offs + 7 * (fields[WEEK_OF_YEAR] - 1);
-	    offs = fields[DAY_OF_WEEK] - getFirstDayOfWeek();
+            if (daysInFirstWeek < getMinimalDaysInFirstWeek())
+              offs += daysInFirstWeek;
+            else
+              offs -= 7 - daysInFirstWeek;
+            month = 0;
+            day = offs + 7 * (fields[WEEK_OF_YEAR] - 1);
+            offs = fields[DAY_OF_WEEK] - getFirstDayOfWeek();
 
-	    if (offs < 0)
-	      offs += 7;
-	    day += offs;
-	  }
-	else
-	  {
-	    // 4:  YEAR + DAY_OF_YEAR
-	    month = 0;
-	    day = fields[DAY_OF_YEAR];
-	  }
+            if (offs < 0)
+              offs += 7;
+            day += offs;
+          }
+        else
+          {
+            // 4:  YEAR + DAY_OF_YEAR
+            month = 0;
+            day = fields[DAY_OF_YEAR];
+          }
       }
     else
       {
-	if (isSet[DAY_OF_WEEK])
-	  {
-	    int first = getFirstDayOfMonth(year, month);
+        if (isSet[DAY_OF_WEEK])
+          {
+            int first = getFirstDayOfMonth(year, month);
 
-	    // 3: YEAR + MONTH + DAY_OF_WEEK_IN_MONTH + DAY_OF_WEEK
-	    if (isSet[DAY_OF_WEEK_IN_MONTH])
-	      {
-		if (fields[DAY_OF_WEEK_IN_MONTH] < 0)
-		  {
-		    month++;
-		    first = getFirstDayOfMonth(year, month);
-		    day = 1 + 7 * (fields[DAY_OF_WEEK_IN_MONTH]);
-		  }
-		else
-		  day = 1 + 7 * (fields[DAY_OF_WEEK_IN_MONTH] - 1);
+            // 3: YEAR + MONTH + DAY_OF_WEEK_IN_MONTH + DAY_OF_WEEK
+            if (isSet[DAY_OF_WEEK_IN_MONTH])
+              {
+                if (fields[DAY_OF_WEEK_IN_MONTH] < 0)
+                  {
+                    month++;
+                    first = getFirstDayOfMonth(year, month);
+                    day = 1 + 7 * (fields[DAY_OF_WEEK_IN_MONTH]);
+                  }
+                else
+                  day = 1 + 7 * (fields[DAY_OF_WEEK_IN_MONTH] - 1);
 
-		int offs = fields[DAY_OF_WEEK] - first;
-		if (offs < 0)
-		  offs += 7;
-		day += offs;
-	      }
-	    else
-	      { // 2: YEAR + MONTH + WEEK_OF_MONTH + DAY_OF_WEEK
-		int offs = 1;
-		int daysInFirstWeek = getFirstDayOfWeek() - first;
-		if (daysInFirstWeek <= 0)
-		  daysInFirstWeek += 7;
+                int offs = fields[DAY_OF_WEEK] - first;
+                if (offs < 0)
+                  offs += 7;
+                day += offs;
+              }
+            else
+              { // 2: YEAR + MONTH + WEEK_OF_MONTH + DAY_OF_WEEK
+                int offs = 1;
+                int daysInFirstWeek = getFirstDayOfWeek() - first;
+                if (daysInFirstWeek <= 0)
+                  daysInFirstWeek += 7;
 
-		if (daysInFirstWeek < getMinimalDaysInFirstWeek())
-		  offs += daysInFirstWeek;
-		else
-		  offs -= 7 - daysInFirstWeek;
+                if (daysInFirstWeek < getMinimalDaysInFirstWeek())
+                  offs += daysInFirstWeek;
+                else
+                  offs -= 7 - daysInFirstWeek;
 
-		day = offs + 7 * (fields[WEEK_OF_MONTH] - 1);
-		offs = fields[DAY_OF_WEEK] - getFirstDayOfWeek();
-		if (offs < 0)
-		  offs += 7;
-		day += offs;
-	      }
-	  }
+                day = offs + 7 * (fields[WEEK_OF_MONTH] - 1);
+                offs = fields[DAY_OF_WEEK] - getFirstDayOfWeek();
+                if (offs < 0)
+                  offs += 7;
+                day += offs;
+              }
+          }
 
-	// 1:  YEAR + MONTH + DAY_OF_MONTH
+        // 1:  YEAR + MONTH + DAY_OF_MONTH
       }
     if (era == BC && year > 0)
       year = 1 - year;
@@ -603,9 +603,9 @@ public class GregorianCalendar extends Calendar
     // get the hour (but no check for validity)
     if (isSet[HOUR])
       {
-	hour = fields[HOUR];
-	if (fields[AM_PM] == PM)
-	  hour += 12;
+        hour = fields[HOUR];
+        if (fields[AM_PM] == PM)
+          hour += 12;
       }
     else
       hour = fields[HOUR_OF_DAY];
@@ -619,41 +619,41 @@ public class GregorianCalendar extends Calendar
 
     if (month < 0)
       {
-	year += (int) month / 12;
-	month = month % 12;
-	if (month < 0)
-	  {
-	    month += 12;
-	    year--;
-	  }
+        year += (int) month / 12;
+        month = month % 12;
+        if (month < 0)
+          {
+            month += 12;
+            year--;
+          }
       }
     if (month > 11)
       {
-	year += (month / 12);
-	month = month % 12;
+        year += (month / 12);
+        month = month % 12;
       }
 
     month_days[1] = isLeapYear(year) ? 29 : 28;
 
     while (day <= 0)
       {
-	if (month == 0)
-	  {
-	    year--;
-	    month_days[1] = isLeapYear(year) ? 29 : 28;
-	  }
-	month = (month + 11) % 12;
-	day += month_days[month];
+        if (month == 0)
+          {
+            year--;
+            month_days[1] = isLeapYear(year) ? 29 : 28;
+          }
+        month = (month + 11) % 12;
+        day += month_days[month];
       }
     while (day > month_days[month])
       {
-	day -= (month_days[month]);
-	month = (month + 1) % 12;
-	if (month == 0)
-	  {
-	    year++;
-	    month_days[1] = isLeapYear(year) ? 29 : 28;
-	  }
+        day -= (month_days[month]);
+        month = (month + 1) % 12;
+        if (month == 0)
+          {
+            year++;
+            month_days[1] = isLeapYear(year) ? 29 : 28;
+          }
       }
 
     // ok, by here we have valid day,month,year,era and millisinday
@@ -719,19 +719,19 @@ public class GregorianCalendar extends Calendar
 
     if (gregorian)
       {
-	// subtract the days that are missing in gregorian calendar
-	// with respect to julian calendar.
-	//
-	// Okay, here we rely on the fact that the gregorian
-	// calendar was introduced in the AD era.  This doesn't work
-	// with negative years.
-	//
-	// The additional leap year factor accounts for the fact that
-	// a leap day is not seen on Jan 1 of the leap year.
-	int gregOffset = (int) Math.floor((double) (year - 1) / 400.)
-	                 - (int) Math.floor((double) (year - 1) / 100.);
+        // subtract the days that are missing in gregorian calendar
+        // with respect to julian calendar.
+        //
+        // Okay, here we rely on the fact that the gregorian
+        // calendar was introduced in the AD era.  This doesn't work
+        // with negative years.
+        //
+        // The additional leap year factor accounts for the fact that
+        // a leap day is not seen on Jan 1 of the leap year.
+        int gregOffset = (int) Math.floor((double) (year - 1) / 400.)
+                         - (int) Math.floor((double) (year - 1) / 100.);
 
-	return julianDay + gregOffset;
+        return julianDay + gregOffset;
       }
     else
       julianDay -= 2;
@@ -754,7 +754,7 @@ public class GregorianCalendar extends Calendar
       weekday += 7;
     fields[DAY_OF_WEEK] = weekday;
 
-    // get a first approximation of the year.  This may be one 
+    // get a first approximation of the year.  This may be one
     // year too big.
     int year = 1970
                + (int) (gregorian
@@ -768,8 +768,8 @@ public class GregorianCalendar extends Calendar
     // Now look in which year day really lies.
     if (day < firstDayOfYear)
       {
-	year--;
-	firstDayOfYear = getLinearDay(year, 1, gregorian);
+        year--;
+        firstDayOfYear = getLinearDay(year, 1, gregorian);
       }
 
     day -= firstDayOfYear - 1; // day of year,  one based.
@@ -777,27 +777,27 @@ public class GregorianCalendar extends Calendar
     fields[DAY_OF_YEAR] = (int) day;
     if (year <= 0)
       {
-	fields[ERA] = BC;
-	fields[YEAR] = 1 - year;
+        fields[ERA] = BC;
+        fields[YEAR] = 1 - year;
       }
     else
       {
-	fields[ERA] = AD;
-	fields[YEAR] = year;
+        fields[ERA] = AD;
+        fields[YEAR] = year;
       }
 
     int leapday = isLeapYear(year) ? 1 : 0;
     if (day <= 31 + 28 + leapday)
       {
-	fields[MONTH] = (int) day / 32; // 31->JANUARY, 32->FEBRUARY
-	fields[DAY_OF_MONTH] = (int) day - 31 * fields[MONTH];
+        fields[MONTH] = (int) day / 32; // 31->JANUARY, 32->FEBRUARY
+        fields[DAY_OF_MONTH] = (int) day - 31 * fields[MONTH];
       }
     else
       {
-	// A few more magic formulas
-	int scaledDay = ((int) day - leapday) * 5 + 8;
-	fields[MONTH] = scaledDay / (31 + 30 + 31 + 30 + 31);
-	fields[DAY_OF_MONTH] = (scaledDay % (31 + 30 + 31 + 30 + 31)) / 5 + 1;
+        // A few more magic formulas
+        int scaledDay = ((int) day - leapday) * 5 + 8;
+        fields[MONTH] = scaledDay / (31 + 30 + 31 + 30 + 31);
+        fields[DAY_OF_MONTH] = (scaledDay % (31 + 30 + 31 + 30 + 31)) / 5 + 1;
       }
   }
 
@@ -819,8 +819,8 @@ public class GregorianCalendar extends Calendar
 
     if (millisInDay < 0)
       {
-	millisInDay += (24 * 60 * 60 * 1000);
-	day--;
+        millisInDay += (24 * 60 * 60 * 1000);
+        day--;
       }
 
     calculateDay(fields, day, gregorian);
@@ -832,8 +832,8 @@ public class GregorianCalendar extends Calendar
     millisInDay += fields[DST_OFFSET];
     if (millisInDay >= 24 * 60 * 60 * 1000)
       {
-	millisInDay -= 24 * 60 * 60 * 1000;
-	calculateDay(fields, ++day, gregorian);
+        millisInDay -= 24 * 60 * 60 * 1000;
+        calculateDay(fields, ++day, gregorian);
       }
 
     fields[DAY_OF_WEEK_IN_MONTH] = (fields[DAY_OF_MONTH] + 6) / 7;
@@ -845,7 +845,7 @@ public class GregorianCalendar extends Calendar
     // nb 35 is the smallest multiple of 7 that ensures that
     // the left hand side of the modulo operator is positive.
     int relativeWeekdayOfFirst = (relativeWeekday - fields[DAY_OF_MONTH]
-				  + 1 + 35) % 7;
+                                  + 1 + 35) % 7;
 
     // which week of the month is the first of this month in?
     int minDays = getMinimalDaysInFirstWeek();
@@ -853,11 +853,11 @@ public class GregorianCalendar extends Calendar
 
     // which week of the month is this day in?
     fields[WEEK_OF_MONTH] = (fields[DAY_OF_MONTH]
-			     + relativeWeekdayOfFirst - 1) / 7 + weekOfFirst;
+                             + relativeWeekdayOfFirst - 1) / 7 + weekOfFirst;
 
     int weekOfYear = (fields[DAY_OF_YEAR] - relativeWeekday + 6) / 7;
 
-    // Do the Correction: getMinimalDaysInFirstWeek() is always in the 
+    // Do the Correction: getMinimalDaysInFirstWeek() is always in the
     // first week.
     int firstWeekday = (7 + getWeekDay(fields[YEAR], minDays)
                        - getFirstDayOfWeek()) % 7;
@@ -878,7 +878,7 @@ public class GregorianCalendar extends Calendar
 
     areFieldsSet = isSet[ERA] = isSet[YEAR] = isSet[MONTH] = isSet[WEEK_OF_YEAR] = isSet[WEEK_OF_MONTH] = isSet[DAY_OF_MONTH] = isSet[DAY_OF_YEAR] = isSet[DAY_OF_WEEK] = isSet[DAY_OF_WEEK_IN_MONTH] = isSet[AM_PM] = isSet[HOUR] = isSet[HOUR_OF_DAY] = isSet[MINUTE] = isSet[SECOND] = isSet[MILLISECOND] = isSet[ZONE_OFFSET] = isSet[DST_OFFSET] = true;
   }
-  
+
   /**
    * Return a hash code for this object, following the general contract
    * specified by {@link Object#hashCode()}.
@@ -931,76 +931,76 @@ public class GregorianCalendar extends Calendar
     switch (field)
       {
       case YEAR:
-	complete();
-	fields[YEAR] += amount;
-	isTimeSet = false;
-	break;
+        complete();
+        fields[YEAR] += amount;
+        isTimeSet = false;
+        break;
       case MONTH:
-	complete();
-	int months = fields[MONTH] + amount;
-	fields[YEAR] += months / 12;
-	fields[MONTH] = months % 12;
-	if (fields[MONTH] < 0)
-	  {
-	    fields[MONTH] += 12;
-	    fields[YEAR]--;
-	  }
-	int maxDay = getActualMaximum(DAY_OF_MONTH);
-	if (fields[DAY_OF_MONTH] > maxDay)
-	  fields[DAY_OF_MONTH] = maxDay;
-	set(YEAR, fields[YEAR]);
-	set(MONTH, fields[MONTH]);
-	break;
+        complete();
+        int months = fields[MONTH] + amount;
+        fields[YEAR] += months / 12;
+        fields[MONTH] = months % 12;
+        if (fields[MONTH] < 0)
+          {
+            fields[MONTH] += 12;
+            fields[YEAR]--;
+          }
+        int maxDay = getActualMaximum(DAY_OF_MONTH);
+        if (fields[DAY_OF_MONTH] > maxDay)
+          fields[DAY_OF_MONTH] = maxDay;
+        set(YEAR, fields[YEAR]);
+        set(MONTH, fields[MONTH]);
+        break;
       case DAY_OF_MONTH:
       case DAY_OF_YEAR:
       case DAY_OF_WEEK:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (24 * 60 * 60 * 1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (24 * 60 * 60 * 1000L);
+        areFieldsSet = false;
+        break;
       case WEEK_OF_YEAR:
       case WEEK_OF_MONTH:
       case DAY_OF_WEEK_IN_MONTH:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (7 * 24 * 60 * 60 * 1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (7 * 24 * 60 * 60 * 1000L);
+        areFieldsSet = false;
+        break;
       case AM_PM:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (12 * 60 * 60 * 1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (12 * 60 * 60 * 1000L);
+        areFieldsSet = false;
+        break;
       case HOUR:
       case HOUR_OF_DAY:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (60 * 60 * 1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (60 * 60 * 1000L);
+        areFieldsSet = false;
+        break;
       case MINUTE:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (60 * 1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (60 * 1000L);
+        areFieldsSet = false;
+        break;
       case SECOND:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount * (1000L);
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount * (1000L);
+        areFieldsSet = false;
+        break;
       case MILLISECOND:
-	if (! isTimeSet)
-	  computeTime();
-	time += amount;
-	areFieldsSet = false;
-	break;
+        if (! isTimeSet)
+          computeTime();
+        time += amount;
+        areFieldsSet = false;
+        break;
       case ZONE_OFFSET:
       case DST_OFFSET:default:
-	throw new IllegalArgumentException("Invalid or unknown field");
+        throw new IllegalArgumentException("Invalid or unknown field");
       }
   }
 
@@ -1044,77 +1044,77 @@ public class GregorianCalendar extends Calendar
       case ERA:
       case YEAR:
       case MONTH:
-	// check that day of month is still in correct range
-	if (fields[DAY_OF_MONTH] > getActualMaximum(DAY_OF_MONTH))
-	  fields[DAY_OF_MONTH] = getActualMaximum(DAY_OF_MONTH);
-	isTimeSet = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	break;
+        // check that day of month is still in correct range
+        if (fields[DAY_OF_MONTH] > getActualMaximum(DAY_OF_MONTH))
+          fields[DAY_OF_MONTH] = getActualMaximum(DAY_OF_MONTH);
+        isTimeSet = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        break;
       case DAY_OF_MONTH:
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	time += delta * (24 * 60 * 60 * 1000L);
-	break;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        time += delta * (24 * 60 * 60 * 1000L);
+        break;
       case WEEK_OF_MONTH:
-	isSet[DAY_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	time += delta * (7 * 24 * 60 * 60 * 1000L);
-	break;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        time += delta * (7 * 24 * 60 * 60 * 1000L);
+        break;
       case DAY_OF_WEEK_IN_MONTH:
-	isSet[DAY_OF_MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	time += delta * (7 * 24 * 60 * 60 * 1000L);
-	break;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        time += delta * (7 * 24 * 60 * 60 * 1000L);
+        break;
       case DAY_OF_YEAR:
-	isSet[MONTH] = false;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_WEEK] = false;
-	isSet[WEEK_OF_YEAR] = false;
-	time += delta * (24 * 60 * 60 * 1000L);
-	break;
+        isSet[MONTH] = false;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_WEEK] = false;
+        isSet[WEEK_OF_YEAR] = false;
+        time += delta * (24 * 60 * 60 * 1000L);
+        break;
       case WEEK_OF_YEAR:
-	isSet[MONTH] = false;
-	isSet[DAY_OF_MONTH] = false;
-	isSet[WEEK_OF_MONTH] = false;
-	isSet[DAY_OF_WEEK_IN_MONTH] = false;
-	isSet[DAY_OF_YEAR] = false;
-	time += delta * (7 * 24 * 60 * 60 * 1000L);
-	break;
+        isSet[MONTH] = false;
+        isSet[DAY_OF_MONTH] = false;
+        isSet[WEEK_OF_MONTH] = false;
+        isSet[DAY_OF_WEEK_IN_MONTH] = false;
+        isSet[DAY_OF_YEAR] = false;
+        time += delta * (7 * 24 * 60 * 60 * 1000L);
+        break;
       case AM_PM:
-	isSet[HOUR_OF_DAY] = false;
-	time += delta * (12 * 60 * 60 * 1000L);
-	break;
+        isSet[HOUR_OF_DAY] = false;
+        time += delta * (12 * 60 * 60 * 1000L);
+        break;
       case HOUR:
-	isSet[HOUR_OF_DAY] = false;
-	time += delta * (60 * 60 * 1000L);
-	break;
+        isSet[HOUR_OF_DAY] = false;
+        time += delta * (60 * 60 * 1000L);
+        break;
       case HOUR_OF_DAY:
-	isSet[HOUR] = false;
-	isSet[AM_PM] = false;
-	time += delta * (60 * 60 * 1000L);
-	break;
+        isSet[HOUR] = false;
+        isSet[AM_PM] = false;
+        time += delta * (60 * 60 * 1000L);
+        break;
       case MINUTE:
-	time += delta * (60 * 1000L);
-	break;
+        time += delta * (60 * 1000L);
+        break;
       case SECOND:
-	time += delta * (1000L);
-	break;
+        time += delta * (1000L);
+        break;
       case MILLISECOND:
-	time += delta;
-	break;
+        time += delta;
+        break;
       }
   }
 
@@ -1141,12 +1141,12 @@ public class GregorianCalendar extends Calendar
     switch (field)
       {
       case DAY_OF_WEEK:
-	// day of week is special: it rolls automatically
-	add(field, amount);
-	return;
+        // day of week is special: it rolls automatically
+        add(field, amount);
+        return;
       case ZONE_OFFSET:
       case DST_OFFSET:
-	throw new IllegalArgumentException("Can't roll time zone");
+        throw new IllegalArgumentException("Can't roll time zone");
       }
     complete();
     int min = getActualMinimum(field);
@@ -1162,7 +1162,7 @@ public class GregorianCalendar extends Calendar
   /**
    * The minimum values for the calendar fields.
    */
-  private static final int[] minimums = 
+  private static final int[] minimums =
                                         {
                                           BC, 1, 0, 0, 1, 1, 1, SUNDAY, 1, AM,
                                           1, 0, 0, 0, 0, -(12 * 60 * 60 * 1000),
@@ -1172,7 +1172,7 @@ public class GregorianCalendar extends Calendar
   /**
    * The maximum values for the calendar fields.
    */
-  private static final int[] maximums = 
+  private static final int[] maximums =
                                         {
                                           AD, 5000000, 11, 53, 6, 31, 366,
                                           SATURDAY, 5, PM, 12, 23, 59, 59, 999,
@@ -1235,16 +1235,16 @@ public class GregorianCalendar extends Calendar
     switch (field)
       {
       case WEEK_OF_YEAR:
-	return 52;
+        return 52;
       case DAY_OF_MONTH:
-	return 28;
+        return 28;
       case DAY_OF_YEAR:
-	return 365;
+        return 365;
       case DAY_OF_WEEK_IN_MONTH:
       case WEEK_OF_MONTH:
-	return 4;
+        return 4;
       default:
-	return maximums[field];
+        return maximums[field];
       }
   }
 
@@ -1263,17 +1263,17 @@ public class GregorianCalendar extends Calendar
   {
     if (field == WEEK_OF_YEAR)
       {
-	int min = getMinimalDaysInFirstWeek();
-	if (min == 0)
-	  return 1;
-	if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
-	  complete();
+        int min = getMinimalDaysInFirstWeek();
+        if (min == 0)
+          return 1;
+        if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
+          complete();
 
-	int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
-	int weekday = getWeekDay(year, min);
-	if ((7 + weekday - getFirstDayOfWeek()) % 7 >= min - 1)
-	  return 1;
-	return 0;
+        int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
+        int weekday = getWeekDay(year, min);
+        if ((7 + weekday - getFirstDayOfWeek()) % 7 >= min - 1)
+          return 1;
+        return 0;
       }
     return minimums[field];
   }
@@ -1295,71 +1295,71 @@ public class GregorianCalendar extends Calendar
       {
       case WEEK_OF_YEAR:
         {
-	  if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
-	    complete();
+          if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
+            complete();
 
-	  // This is wrong for the year that contains the gregorian change.
-	  // I.e it gives the weeks in the julian year or in the gregorian
-	  // year in that case.
-	  int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
-	  int lastDay = isLeapYear(year) ? 366 : 365;
-	  int weekday = getWeekDay(year, lastDay);
-	  int week = (lastDay + 6 - (7 + weekday - getFirstDayOfWeek()) % 7) / 7;
+          // This is wrong for the year that contains the gregorian change.
+          // I.e it gives the weeks in the julian year or in the gregorian
+          // year in that case.
+          int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
+          int lastDay = isLeapYear(year) ? 366 : 365;
+          int weekday = getWeekDay(year, lastDay);
+          int week = (lastDay + 6 - (7 + weekday - getFirstDayOfWeek()) % 7) / 7;
 
-	  int minimalDays = getMinimalDaysInFirstWeek();
-	  int firstWeekday = getWeekDay(year, minimalDays);
-	  /*
-	   * Is there a set of days at the beginning of the year, before the
-	   * first day of the week, equal to or greater than the minimum number
-	   * of days required in the first week?
-	   */
-	  if (minimalDays - (7 + firstWeekday - getFirstDayOfWeek()) % 7 < 1)
-	    return week + 1; /* Add week 1: firstWeekday through to firstDayOfWeek */
+          int minimalDays = getMinimalDaysInFirstWeek();
+          int firstWeekday = getWeekDay(year, minimalDays);
+          /*
+           * Is there a set of days at the beginning of the year, before the
+           * first day of the week, equal to or greater than the minimum number
+           * of days required in the first week?
+           */
+          if (minimalDays - (7 + firstWeekday - getFirstDayOfWeek()) % 7 < 1)
+            return week + 1; /* Add week 1: firstWeekday through to firstDayOfWeek */
         }
       case DAY_OF_MONTH:
         {
-	  if (! areFieldsSet || ! isSet[MONTH])
-	    complete();
-	  int month = fields[MONTH];
+          if (! areFieldsSet || ! isSet[MONTH])
+            complete();
+          int month = fields[MONTH];
 
-	  // If you change this, you should also change 
-	  // SimpleTimeZone.getDaysInMonth();
-	  if (month == FEBRUARY)
-	    {
-	      if (! isSet[YEAR] || ! isSet[ERA])
-		complete();
-	      int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
-	      return isLeapYear(year) ? 29 : 28;
-	    }
-	  else if (month < AUGUST)
-	    return 31 - (month & 1);
-	  else
-	    return 30 + (month & 1);
+          // If you change this, you should also change
+          // SimpleTimeZone.getDaysInMonth();
+          if (month == FEBRUARY)
+            {
+              if (! isSet[YEAR] || ! isSet[ERA])
+                complete();
+              int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
+              return isLeapYear(year) ? 29 : 28;
+            }
+          else if (month < AUGUST)
+            return 31 - (month & 1);
+          else
+            return 30 + (month & 1);
         }
       case DAY_OF_YEAR:
         {
-	  if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
-	    complete();
-	  int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
-	  return isLeapYear(year) ? 366 : 365;
+          if (! areFieldsSet || ! isSet[ERA] || ! isSet[YEAR])
+            complete();
+          int year = fields[ERA] == AD ? fields[YEAR] : 1 - fields[YEAR];
+          return isLeapYear(year) ? 366 : 365;
         }
       case DAY_OF_WEEK_IN_MONTH:
         {
-	  // This is wrong for the month that contains the gregorian change.
-	  int daysInMonth = getActualMaximum(DAY_OF_MONTH);
+          // This is wrong for the month that contains the gregorian change.
+          int daysInMonth = getActualMaximum(DAY_OF_MONTH);
 
-	  // That's black magic, I know
-	  return (daysInMonth - (fields[DAY_OF_MONTH] - 1) % 7 + 6) / 7;
+          // That's black magic, I know
+          return (daysInMonth - (fields[DAY_OF_MONTH] - 1) % 7 + 6) / 7;
         }
       case WEEK_OF_MONTH:
         {
-	  int daysInMonth = getActualMaximum(DAY_OF_MONTH);
-	  int weekday = (daysInMonth - fields[DAY_OF_MONTH]
-	                + fields[DAY_OF_WEEK] - SUNDAY) % 7 + SUNDAY;
-	  return (daysInMonth + 6 - (7 + weekday - getFirstDayOfWeek()) % 7) / 7;
+          int daysInMonth = getActualMaximum(DAY_OF_MONTH);
+          int weekday = (daysInMonth - fields[DAY_OF_MONTH]
+                        + fields[DAY_OF_WEEK] - SUNDAY) % 7 + SUNDAY;
+          return (daysInMonth + 6 - (7 + weekday - getFirstDayOfWeek()) % 7) / 7;
         }
       default:
-	return maximums[field];
+        return maximums[field];
       }
   }
 }
diff --git a/libjava/classpath/java/util/HashMap.java b/libjava/classpath/java/util/HashMap.java
index eca3ad6aaf3..55d81c620b1 100644
--- a/libjava/classpath/java/util/HashMap.java
+++ b/libjava/classpath/java/util/HashMap.java
@@ -349,7 +349,7 @@ public class HashMap extends AbstractMap
         if (equals(key, e.key))
           {
             e.access(); // Must call this for bookkeeping in LinkedHashMap.
-	    V r = e.value;
+            V r = e.value;
             e.value = value;
             return r;
           }
@@ -384,12 +384,12 @@ public class HashMap extends AbstractMap
     final Iterator> it = addMap.entrySet().iterator();
     while (it.hasNext())
       {
-	final Map.Entry e = it.next();
+        final Map.Entry e = it.next();
         // Optimize in case the Entry is one of our own.
         if (e instanceof AbstractMap.SimpleEntry)
           {
             AbstractMap.SimpleEntry entry
-	      = (AbstractMap.SimpleEntry) e;
+              = (AbstractMap.SimpleEntry) e;
             put(entry.key, entry.value);
           }
         else
@@ -702,8 +702,8 @@ public class HashMap extends AbstractMap
   }
 
   /**
-   * A simplified, more efficient internal implementation of putAll(). clone() 
-   * should not call putAll or put, in order to be compatible with the JDK 
+   * A simplified, more efficient internal implementation of putAll(). clone()
+   * should not call putAll or put, in order to be compatible with the JDK
    * implementation with respect to subclasses.
    *
    * @param m the map to initialize this from
@@ -715,11 +715,11 @@ public class HashMap extends AbstractMap
     size = 0;
     while (it.hasNext())
       {
-	final Map.Entry e = it.next();
+        final Map.Entry e = it.next();
         size++;
-	K key = e.getKey();
-	int idx = hash(key);
-	addEntry(key, e.getValue(), idx, false);
+        K key = e.getKey();
+        int idx = hash(key);
+        addEntry(key, e.getValue(), idx, false);
       }
   }
 
diff --git a/libjava/classpath/java/util/Hashtable.java b/libjava/classpath/java/util/Hashtable.java
index 0851de8249a..8f08e96ab8d 100644
--- a/libjava/classpath/java/util/Hashtable.java
+++ b/libjava/classpath/java/util/Hashtable.java
@@ -345,7 +345,7 @@ public class Hashtable extends Dictionary
           }
       }
 
-    return false;  
+    return false;
   }
 
   /**
@@ -362,7 +362,7 @@ public class Hashtable extends Dictionary
    */
   public boolean containsValue(Object value)
   {
-    // Delegate to older method to make sure code overriding it continues 
+    // Delegate to older method to make sure code overriding it continues
     // to work.
     return contains(value);
   }
@@ -511,12 +511,12 @@ public class Hashtable extends Dictionary
     final Iterator> it = addMap.entrySet().iterator();
     while (it.hasNext())
       {
-	final Map.Entry e = it.next();
+        final Map.Entry e = it.next();
         // Optimize in case the Entry is one of our own.
         if (e instanceof AbstractMap.SimpleEntry)
           {
             AbstractMap.SimpleEntry entry
-	      = (AbstractMap.SimpleEntry) e;
+              = (AbstractMap.SimpleEntry) e;
             put(entry.key, entry.value);
           }
         else
@@ -850,8 +850,8 @@ public class Hashtable extends Dictionary
   }
 
   /**
-   * A simplified, more efficient internal implementation of putAll(). clone() 
-   * should not call putAll or put, in order to be compatible with the JDK 
+   * A simplified, more efficient internal implementation of putAll(). clone()
+   * should not call putAll or put, in order to be compatible with the JDK
    * implementation with respect to subclasses.
    *
    * @param m the map to initialize this from
@@ -863,13 +863,13 @@ public class Hashtable extends Dictionary
     size = 0;
     while (it.hasNext())
       {
-	final Map.Entry e = it.next();
+        final Map.Entry e = it.next();
         size++;
-	K key = e.getKey();
-	int idx = hash(key);
-	HashEntry he = new HashEntry(key, e.getValue());
-	he.next = buckets[idx];
-	buckets[idx] = he;
+        K key = e.getKey();
+        int idx = hash(key);
+        HashEntry he = new HashEntry(key, e.getValue());
+        he.next = buckets[idx];
+        buckets[idx] = he;
       }
   }
 
@@ -991,7 +991,7 @@ public class Hashtable extends Dictionary
    * @author Jon Zeppieri
    * @author Fridjof Siebert
    */
-  private class EntryIterator 
+  private class EntryIterator
       implements Iterator>
   {
     /**
@@ -1044,10 +1044,10 @@ public class Hashtable extends Dictionary
       HashEntry e = next;
 
       while (e == null)
-	if (idx <= 0)
-	  return null;
-	else
-	  e = buckets[--idx];
+        if (idx <= 0)
+          return null;
+        else
+          e = buckets[--idx];
 
       next = e.next;
       last = e;
@@ -1081,7 +1081,7 @@ public class Hashtable extends Dictionary
    * @author Fridtjof Siebert
    * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
    */
-  private class KeyIterator 
+  private class KeyIterator
       implements Iterator
   {
 
@@ -1097,7 +1097,7 @@ public class Hashtable extends Dictionary
      */
     KeyIterator()
     {
-	iterator = new EntryIterator();
+        iterator = new EntryIterator();
     }
 
 
@@ -1109,7 +1109,7 @@ public class Hashtable extends Dictionary
      */
     public boolean hasNext()
     {
-	return iterator.hasNext();
+        return iterator.hasNext();
     }
 
     /**
@@ -1137,7 +1137,7 @@ public class Hashtable extends Dictionary
       iterator.remove();
     }
   } // class KeyIterator
- 
+
   /**
    * A class which implements the Iterator interface and is used for
    * iterating over values in Hashtables.  This class uses an
@@ -1162,7 +1162,7 @@ public class Hashtable extends Dictionary
      */
     ValueIterator()
     {
-	iterator = new EntryIterator();
+        iterator = new EntryIterator();
     }
 
 
@@ -1174,7 +1174,7 @@ public class Hashtable extends Dictionary
      */
     public boolean hasNext()
     {
-	return iterator.hasNext();
+        return iterator.hasNext();
     }
 
     /**
@@ -1218,7 +1218,7 @@ public class Hashtable extends Dictionary
    * @author Jon Zeppieri
    * @author Fridjof Siebert
    */
-  private class EntryEnumerator 
+  private class EntryEnumerator
       implements Enumeration>
   {
     /** The number of elements remaining to be returned by next(). */
@@ -1315,7 +1315,7 @@ public class Hashtable extends Dictionary
      */
     public boolean hasMoreElements()
     {
-	return enumerator.hasMoreElements();
+        return enumerator.hasMoreElements();
     }
 
     /**
@@ -1376,7 +1376,7 @@ public class Hashtable extends Dictionary
      */
     public boolean hasMoreElements()
     {
-	return enumerator.hasMoreElements();
+        return enumerator.hasMoreElements();
     }
 
     /**
diff --git a/libjava/classpath/java/util/IdentityHashMap.java b/libjava/classpath/java/util/IdentityHashMap.java
index 8dead96c193..89a75259e76 100644
--- a/libjava/classpath/java/util/IdentityHashMap.java
+++ b/libjava/classpath/java/util/IdentityHashMap.java
@@ -789,10 +789,10 @@ public class IdentityHashMap extends AbstractMap
           key = table[loc];
         }
       while (key == null);
-  
-      return (I) (type == KEYS ? unxform(key) 
-		  : (type == VALUES ? unxform(table[loc + 1])
-		     : new IdentityEntry(loc)));
+
+      return (I) (type == KEYS ? unxform(key)
+                  : (type == VALUES ? unxform(table[loc + 1])
+                     : new IdentityEntry(loc)));
     }
 
     /**
diff --git a/libjava/classpath/java/util/IllegalFormatCodePointException.java b/libjava/classpath/java/util/IllegalFormatCodePointException.java
index 001839fe1eb..f6d5c2fef63 100644
--- a/libjava/classpath/java/util/IllegalFormatCodePointException.java
+++ b/libjava/classpath/java/util/IllegalFormatCodePointException.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when a {@link Formatter} receives a character with an
  * invalid Unicode codepoint, as defined by
  * {@link Character#isValidCodePoint(int)}.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatCodePointException 
+public class IllegalFormatCodePointException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 19080630L;
diff --git a/libjava/classpath/java/util/IllegalFormatConversionException.java b/libjava/classpath/java/util/IllegalFormatConversionException.java
index d59c0a4b18f..58aa91833d9 100644
--- a/libjava/classpath/java/util/IllegalFormatConversionException.java
+++ b/libjava/classpath/java/util/IllegalFormatConversionException.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the type of an argument supplied to the
  * {@link Formatter#format()} method of a {@link Formatter}
  * does not match the conversion character specified for it.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatConversionException 
+public class IllegalFormatConversionException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 17000126L;
@@ -81,7 +81,7 @@ public class IllegalFormatConversionException
   public IllegalFormatConversionException(char c, Class arg)
   {
     super("The type, " + arg + ", is invalid for the conversion character, " +
-	  c + ".");
+          c + ".");
     if (arg == null)
       throw new NullPointerException("The supplied type was null.");
     this.c = c;
diff --git a/libjava/classpath/java/util/IllegalFormatException.java b/libjava/classpath/java/util/IllegalFormatException.java
index 4daafca4414..b5c740a8f94 100644
--- a/libjava/classpath/java/util/IllegalFormatException.java
+++ b/libjava/classpath/java/util/IllegalFormatException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * A general exception thrown when a format string is supplied
  * to a {@link Formatter} that contains either invalid syntax
  * or a mismatch between the format specification and the
@@ -48,9 +48,9 @@ package java.util;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatException 
+public class IllegalFormatException
   extends IllegalArgumentException
 {
   private static final long serialVersionUID = 18830826L;
diff --git a/libjava/classpath/java/util/IllegalFormatFlagsException.java b/libjava/classpath/java/util/IllegalFormatFlagsException.java
index 2a085c14113..b53bfa50a72 100644
--- a/libjava/classpath/java/util/IllegalFormatFlagsException.java
+++ b/libjava/classpath/java/util/IllegalFormatFlagsException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the flags supplied to the {@link Formatter#format()}
  * method of a {@link Formatter} form an illegal combination.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatFlagsException 
+public class IllegalFormatFlagsException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 790824L;
diff --git a/libjava/classpath/java/util/IllegalFormatPrecisionException.java b/libjava/classpath/java/util/IllegalFormatPrecisionException.java
index a555f5df425..a216dc185c8 100644
--- a/libjava/classpath/java/util/IllegalFormatPrecisionException.java
+++ b/libjava/classpath/java/util/IllegalFormatPrecisionException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the specified precision for a {@link Formatter}
  * argument is illegal.  This may be because the number is
  * a negative number (other than -1), the argument does not
@@ -46,9 +46,9 @@ package java.util;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatPrecisionException 
+public class IllegalFormatPrecisionException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 18711008L;
diff --git a/libjava/classpath/java/util/IllegalFormatWidthException.java b/libjava/classpath/java/util/IllegalFormatWidthException.java
index 95d3e150282..7f2a6257e92 100644
--- a/libjava/classpath/java/util/IllegalFormatWidthException.java
+++ b/libjava/classpath/java/util/IllegalFormatWidthException.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the specified width for a {@link Formatter}
  * argument is illegal.  This may be because the number is
  * a negative number (other than -1) or for some other reason.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class IllegalFormatWidthException 
+public class IllegalFormatWidthException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 16660902L;
diff --git a/libjava/classpath/java/util/InputMismatchException.java b/libjava/classpath/java/util/InputMismatchException.java
index 39326c33e0d..ee29e465379 100644
--- a/libjava/classpath/java/util/InputMismatchException.java
+++ b/libjava/classpath/java/util/InputMismatchException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when a {@link Scanner} instance encounters a mismatch
  * between the input data and the pattern it is trying to match it
  * against.  This could be because the input data represents an
@@ -47,9 +47,9 @@ package java.util;
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class InputMismatchException 
+public class InputMismatchException
   extends NoSuchElementException
 {
   /**
diff --git a/libjava/classpath/java/util/LinkedHashMap.java b/libjava/classpath/java/util/LinkedHashMap.java
index 6ec06a949d8..7701d7763e1 100644
--- a/libjava/classpath/java/util/LinkedHashMap.java
+++ b/libjava/classpath/java/util/LinkedHashMap.java
@@ -76,9 +76,9 @@ package java.util;
  * things like keep the map at a fixed size.
  * 
                  
  *
- * Under ideal circumstances (no collisions), LinkedHashMap offers O(1) 
+ * Under ideal circumstances (no collisions), LinkedHashMap offers O(1)
  * performance on most operations (containsValue() is,
- * of course, O(n)).  In the worst case (all keys map to the same 
+ * of course, O(n)).  In the worst case (all keys map to the same
  * hash code -- very unlikely), most operations are O(n).  Traversal is
  * faster than in HashMap (proportional to the map size, and not the space
  * allocated for the map), but other operations may be slower because of the
@@ -188,7 +188,7 @@ public class LinkedHashMap extends HashMap
               succ = null;
               pred = root.pred;
               pred.succ = this;
-	      root.pred = this;
+              root.pred = this;
             }
         }
     }
@@ -477,7 +477,7 @@ public class LinkedHashMap extends HashMap
         current = current.succ;
         return type == VALUES ? last.value : type == KEYS ? last.key : last;
       }
-      
+
       /**
        * Removes from the backing HashMap the last element which was fetched
        * with the next() method.
diff --git a/libjava/classpath/java/util/LinkedHashSet.java b/libjava/classpath/java/util/LinkedHashSet.java
index 03b9556062c..2caebaf9306 100644
--- a/libjava/classpath/java/util/LinkedHashSet.java
+++ b/libjava/classpath/java/util/LinkedHashSet.java
@@ -62,7 +62,7 @@ import java.io.Serializable;
  * without needing the overhead of TreeSet.
  * 
                  
  *
- * Under ideal circumstances (no collisions), LinkedHashSet offers O(1) 
+ * Under ideal circumstances (no collisions), LinkedHashSet offers O(1)
  * performance on most operations.  In the worst case (all elements map
  * to the same hash code -- very unlikely), most operations are O(n).
  * 
                  
diff --git a/libjava/classpath/java/util/LinkedList.java b/libjava/classpath/java/util/LinkedList.java
index 3f8b2ad60a0..813d099dac4 100644
--- a/libjava/classpath/java/util/LinkedList.java
+++ b/libjava/classpath/java/util/LinkedList.java
@@ -684,7 +684,7 @@ public class LinkedList extends AbstractSequentialList
    * Returns an Array whose component type is the runtime component type of
    * the passed-in Array.  The returned Array is populated with all of the
    * elements in this LinkedList.  If the passed-in Array is not large enough
-   * to store all of the elements in this List, a new Array will be created 
+   * to store all of the elements in this List, a new Array will be created
    * and returned; if the passed-in Array is larger than the size
    * of this List, then size() index will be set to null.
    *
@@ -1081,8 +1081,8 @@ public class LinkedList extends AbstractSequentialList
         if (next == null)
           throw new NoSuchElementException();
         --position;
-	lastReturned = next;
-	next = lastReturned.previous;
+        lastReturned = next;
+        next = lastReturned.previous;
         return lastReturned.data;
       }
 
@@ -1101,9 +1101,9 @@ public class LinkedList extends AbstractSequentialList
         checkMod();
         if (lastReturned == null)
           throw new IllegalStateException();
-	removeEntry(lastReturned);
-	lastReturned = null;
-	++knownMod;
+        removeEntry(lastReturned);
+        lastReturned = null;
+        ++knownMod;
       }
     };
   }
@@ -1217,7 +1217,7 @@ public class LinkedList extends AbstractSequentialList
   {
     addFirst(value);
   }
-  
+
   /**
    * Removes the first occurrence of the specified element
    * from the list, when traversing the list from head to
@@ -1247,12 +1247,12 @@ public class LinkedList extends AbstractSequentialList
     Entry e = last;
     while (e != null)
       {
-	if (equals(o, e.data))
-	  {
-	    removeEntry(e);
-	    return true;
-	  }
-	e = e.previous;
+        if (equals(o, e.data))
+          {
+            removeEntry(e);
+            return true;
+          }
+        e = e.previous;
       }
     return false;
   }
diff --git a/libjava/classpath/java/util/List.java b/libjava/classpath/java/util/List.java
index 0a1c4098c80..3a437a5a24d 100644
--- a/libjava/classpath/java/util/List.java
+++ b/libjava/classpath/java/util/List.java
@@ -232,7 +232,7 @@ public interface List extends Collection
    * Obtains a hash code for this list. In order to obey the general
    * contract of the hashCode method of class Object, this value is
    * calculated as follows:
-   * 
+   *
 
                  hashCode = 1;
 Iterator i = list.iterator();
 while (i.hasNext())
diff --git a/libjava/classpath/java/util/Locale.java b/libjava/classpath/java/util/Locale.java
index c28709f95d6..ef111737dc5 100644
--- a/libjava/classpath/java/util/Locale.java
+++ b/libjava/classpath/java/util/Locale.java
@@ -215,7 +215,7 @@ public final class Locale implements Serializable, Cloneable
    * got called.
    */
   private static transient HashMap localeMap;
-  
+
   /**
    * The default locale. Except for during bootstrapping, this should never be
    * null. Note the logic in the main constructor, to detect when
@@ -249,12 +249,12 @@ public final class Locale implements Serializable, Cloneable
    *
    * @param language the language of the locale to retrieve.
    * @return the locale.
-   */ 
+   */
   private static Locale getLocale(String language)
   {
     return getLocale(language, "", "");
   }
-  
+
   /**
    * Retrieves the locale with the specified language and country
    * from the cache.
@@ -262,12 +262,12 @@ public final class Locale implements Serializable, Cloneable
    * @param language the language of the locale to retrieve.
    * @param country the country of the locale to retrieve.
    * @return the locale.
-   */ 
+   */
   private static Locale getLocale(String language, String country)
   {
     return getLocale(language, country, "");
   }
-  
+
   /**
    * Retrieves the locale with the specified language, country
    * and variant from the cache.
@@ -276,7 +276,7 @@ public final class Locale implements Serializable, Cloneable
    * @param country the country of the locale to retrieve.
    * @param variant the variant of the locale to retrieve.
    * @return the locale.
-   */ 
+   */
   private static Locale getLocale(String language, String country, String variant)
   {
     if (localeMap == null)
@@ -287,13 +287,13 @@ public final class Locale implements Serializable, Cloneable
 
     if (locale == null)
       {
-	locale = new Locale(language, country, variant);
-	localeMap.put(name, locale);
+        locale = new Locale(language, country, variant);
+        localeMap.put(name, locale);
       }
 
     return locale;
   }
-  
+
   /**
    * Convert new iso639 codes to the old ones.
    *
@@ -418,17 +418,17 @@ public final class Locale implements Serializable, Cloneable
             if (name.length() > 2)
               country = name.substring(3);
 
-	    int index = country.indexOf("_");
-	    if (index > 0)
-	      {
-		variant = country.substring(index + 1);
-		country = country.substring(0, index - 1);
-	      }
+            int index = country.indexOf("_");
+            if (index > 0)
+              {
+                variant = country.substring(index + 1);
+                country = country.substring(0, index - 1);
+              }
 
             availableLocales[i] = getLocale(language, country, variant);
           }
       }
-    
+
     return (Locale[]) availableLocales.clone();
   }
 
@@ -442,7 +442,7 @@ public final class Locale implements Serializable, Cloneable
   {
     if (countryCache == null)
       {
-	countryCache = getISOStrings("territories");
+        countryCache = getISOStrings("territories");
       }
 
     return (String[]) countryCache.clone();
@@ -458,7 +458,7 @@ public final class Locale implements Serializable, Cloneable
   {
     if (languageCache == null)
       {
-	languageCache = getISOStrings("languages");
+        languageCache = getISOStrings("languages");
       }
     return (String[]) languageCache.clone();
   }
@@ -480,27 +480,27 @@ public final class Locale implements Serializable, Cloneable
 
     while (e.hasMoreElements())
       {
-	String key = (String) e.nextElement();
-	
-	if (key.startsWith(tableName + "."))
-	  {
-	    String str = key.substring(tableName.length() + 1);
+        String key = (String) e.nextElement();
 
-	    if (str.length() == 2
-		&& Character.isLetter(str.charAt(0))
-		&& Character.isLetter(str.charAt(1)))
-	      {
-		tempList.add(str);
-		++count;
-	      }
-	  }
+        if (key.startsWith(tableName + "."))
+          {
+            String str = key.substring(tableName.length() + 1);
+
+            if (str.length() == 2
+                && Character.isLetter(str.charAt(0))
+                && Character.isLetter(str.charAt(1)))
+              {
+                tempList.add(str);
+                ++count;
+              }
+          }
       }
 
     String[] strings = new String[count];
-    
+
     for (int a = 0; a < count; ++a)
       strings[a] = (String) tempList.get(a);
-    
+
     return strings;
   }
 
@@ -687,7 +687,7 @@ public final class Locale implements Serializable, Cloneable
       return "";
     try
       {
-	ResourceBundle res =
+        ResourceBundle res =
           ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
                                    inLocale,
                                    ClassLoader.getSystemClassLoader());
@@ -696,23 +696,23 @@ public final class Locale implements Serializable, Cloneable
       }
     catch (MissingResourceException e)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (LocaleNameProvider p :
-	   ServiceLoader.load(LocaleNameProvider.class))
+           ServiceLoader.load(LocaleNameProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(inLocale))
-	      {
-		String locLang = p.getDisplayLanguage(language,
-						      inLocale);
-		if (locLang != null)
-		  return locLang;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(inLocale))
+              {
+                String locLang = p.getDisplayLanguage(language,
+                                                      inLocale);
+                if (locLang != null)
+                  return locLang;
+                break;
+              }
+          }
       }
     if (inLocale.equals(Locale.ROOT)) // Base case
       return language;
@@ -770,28 +770,28 @@ public final class Locale implements Serializable, Cloneable
           ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
                                    inLocale,
                                    ClassLoader.getSystemClassLoader());
-    
+
         return res.getString("territories." + country);
       }
     catch (MissingResourceException e)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (LocaleNameProvider p :
-	   ServiceLoader.load(LocaleNameProvider.class))
+           ServiceLoader.load(LocaleNameProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(inLocale))
-	      {
-		String locCountry = p.getDisplayCountry(country,
-							inLocale);
-		if (locCountry != null)
-		  return locCountry;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(inLocale))
+              {
+                String locCountry = p.getDisplayCountry(country,
+                                                        inLocale);
+                if (locCountry != null)
+                  return locCountry;
+                break;
+              }
+          }
       }
     if (inLocale.equals(Locale.ROOT)) // Base case
       return country;
@@ -850,28 +850,28 @@ public final class Locale implements Serializable, Cloneable
           ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
                                    inLocale,
                                    ClassLoader.getSystemClassLoader());
-    
+
         return res.getString("variants." + variant);
       }
     catch (MissingResourceException e)
       {
-	/* This means runtime support for the locale
-	 * is not available, so we check providers. */
+        /* This means runtime support for the locale
+         * is not available, so we check providers. */
       }
     for (LocaleNameProvider p :
-	   ServiceLoader.load(LocaleNameProvider.class))
+           ServiceLoader.load(LocaleNameProvider.class))
       {
-	for (Locale loc : p.getAvailableLocales())
-	  {
-	    if (loc.equals(inLocale))
-	      {
-		String locVar = p.getDisplayVariant(variant,
-						    inLocale);
-		if (locVar != null)
-		  return locVar;
-		break;
-	      }
-	  }
+        for (Locale loc : p.getAvailableLocales())
+          {
+            if (loc.equals(inLocale))
+              {
+                String locVar = p.getDisplayVariant(variant,
+                                                    inLocale);
+                if (locVar != null)
+                  return locVar;
+                break;
+              }
+          }
       }
     if (inLocale.equals(Locale.ROOT)) // Base case
       return country;
@@ -989,8 +989,8 @@ public final class Locale implements Serializable, Cloneable
       return false;
     Locale l = (Locale) obj;
 
-    return (language == l.language 
-            && country == l.country 
+    return (language == l.language
+            && country == l.country
             && variant == l.variant);
   }
 
@@ -1000,8 +1000,8 @@ public final class Locale implements Serializable, Cloneable
    * @param s the stream to write to
    * @throws IOException if the write fails
    * @serialData The first three fields are Strings representing language,
-   *             country, and variant. The fourth field is a placeholder for 
-   *             the cached hashcode, but this is always written as -1, and 
+   *             country, and variant. The fourth field is a placeholder for
+   *             the cached hashcode, but this is always written as -1, and
    *             recomputed when reading it back.
    */
   private void writeObject(ObjectOutputStream s)
diff --git a/libjava/classpath/java/util/Map.java b/libjava/classpath/java/util/Map.java
index 67b3d8aa507..1bcb1b2f022 100644
--- a/libjava/classpath/java/util/Map.java
+++ b/libjava/classpath/java/util/Map.java
@@ -310,7 +310,7 @@ public interface Map
      * Returns the hash code of the entry.  This is defined as the
      * exclusive-or of the hashcodes of the key and value (using 0 for
      * null). In other words, this must be:
-     * 
+     *
 
                  (getKey() == null ? 0 : getKey().hashCode())
 ^ (getValue() == null ? 0 : getValue().hashCode())
                  
      *
@@ -322,7 +322,7 @@ public interface Map
      * Compares the specified object with this entry. Returns true only if
      * the object is a mapping of identical key and value. In other words,
      * this must be:
-     * 
+     *
 
                  (o instanceof Map.Entry)
 && (getKey() == null ? ((Map.Entry) o).getKey() == null
                      : getKey().equals(((Map.Entry) o).getKey()))
diff --git a/libjava/classpath/java/util/MissingFormatArgumentException.java b/libjava/classpath/java/util/MissingFormatArgumentException.java
index 4a9385ed5b5..e53de0ae33a 100644
--- a/libjava/classpath/java/util/MissingFormatArgumentException.java
+++ b/libjava/classpath/java/util/MissingFormatArgumentException.java
@@ -38,16 +38,16 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the a format specification for a {@link Formatter}
  * refers to an argument that is non-existent, or an argument index
  * references a non-existent argument.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class MissingFormatArgumentException 
+public class MissingFormatArgumentException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 19190115L;
@@ -71,8 +71,8 @@ public class MissingFormatArgumentException
    */
   public MissingFormatArgumentException(String s)
   {
-    super("The specification, " + s + 
-	  ", refers to a non-existent argument.");
+    super("The specification, " + s +
+          ", refers to a non-existent argument.");
     if (s == null)
       throw new NullPointerException("The specification is null.");
     this.s = s;
diff --git a/libjava/classpath/java/util/MissingFormatWidthException.java b/libjava/classpath/java/util/MissingFormatWidthException.java
index 55de6202f42..e083172a90e 100644
--- a/libjava/classpath/java/util/MissingFormatWidthException.java
+++ b/libjava/classpath/java/util/MissingFormatWidthException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when the a format specification for a {@link Formatter}
  * does not include a width for a value where one is required.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class MissingFormatWidthException 
+public class MissingFormatWidthException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 15560123L;
diff --git a/libjava/classpath/java/util/PriorityQueue.java b/libjava/classpath/java/util/PriorityQueue.java
index 9e738d6e99c..5b6a3680453 100644
--- a/libjava/classpath/java/util/PriorityQueue.java
+++ b/libjava/classpath/java/util/PriorityQueue.java
@@ -79,23 +79,23 @@ public class PriorityQueue extends AbstractQueue implements Serializable
     // Special case where we can find the comparator to use.
     if (c instanceof SortedSet)
       {
-	SortedSet ss = (SortedSet) c;
-	this.comparator = (Comparator) ss.comparator();
-	// We can insert the elements directly, since they are sorted.
-	int i = 0;
-	for (E val : ss)
-	  {
-	    if (val == null)
-	      throw new NullPointerException();
-	    storage[i++] = val;
-	  }
+        SortedSet ss = (SortedSet) c;
+        this.comparator = (Comparator) ss.comparator();
+        // We can insert the elements directly, since they are sorted.
+        int i = 0;
+        for (E val : ss)
+          {
+            if (val == null)
+              throw new NullPointerException();
+            storage[i++] = val;
+          }
       }
     else if (c instanceof PriorityQueue)
       {
-	PriorityQueue pq = (PriorityQueue) c;
-	this.comparator = (Comparator)pq.comparator();
-	// We can just copy the contents.
-	System.arraycopy(pq.storage, 0, storage, 0, pq.storage.length);
+        PriorityQueue pq = (PriorityQueue) c;
+        this.comparator = (Comparator)pq.comparator();
+        // We can just copy the contents.
+        System.arraycopy(pq.storage, 0, storage, 0, pq.storage.length);
       }
 
     addAll(c);
@@ -109,7 +109,7 @@ public class PriorityQueue extends AbstractQueue implements Serializable
   public PriorityQueue(int cap, Comparator comp)
   {
     if (cap < 1)
-      throw new IllegalArgumentException();      
+      throw new IllegalArgumentException();
     this.used = 0;
     this.storage = (E[]) new Object[cap];
     this.comparator = comp;
@@ -118,7 +118,7 @@ public class PriorityQueue extends AbstractQueue implements Serializable
   public PriorityQueue(PriorityQueue c)
   {
     this(Math.max(1, (int) (1.1 * c.size())),
-	 (Comparator)c.comparator());
+         (Comparator)c.comparator());
     // We can just copy the contents.
     System.arraycopy(c.storage, 0, storage, 0, c.storage.length);
   }
@@ -126,14 +126,14 @@ public class PriorityQueue extends AbstractQueue implements Serializable
   public PriorityQueue(SortedSet c)
   {
     this(Math.max(1, (int) (1.1 * c.size())),
-	 (Comparator)c.comparator());
+         (Comparator)c.comparator());
     // We can insert the elements directly, since they are sorted.
     int i = 0;
     for (E val : c)
       {
-	if (val == null)
-	  throw new NullPointerException();
-	storage[i++] = val;
+        if (val == null)
+          throw new NullPointerException();
+        storage[i++] = val;
       }
   }
 
@@ -157,22 +157,22 @@ public class PriorityQueue extends AbstractQueue implements Serializable
 
       public boolean hasNext()
       {
-	return count < used;
+        return count < used;
       }
 
       public E next()
       {
-	while (storage[++index] == null)
-	  ;
-        
-	++count;
-	return storage[index];
+        while (storage[++index] == null)
+          ;
+
+        ++count;
+        return storage[index];
       }
 
       public void remove()
       {
-	PriorityQueue.this.remove(index);
-	index--;
+        PriorityQueue.this.remove(index);
+        index--;
       }
     };
   }
@@ -209,14 +209,14 @@ public class PriorityQueue extends AbstractQueue implements Serializable
   {
     if (o != null)
       {
-	for (int i = 0; i < storage.length; ++i)
-	  {
-	    if (o.equals(storage[i]))
-	      {
-		remove(i);
-		return true;
-	      }
-	  }
+        for (int i = 0; i < storage.length; ++i)
+          {
+            if (o.equals(storage[i]))
+              {
+                remove(i);
+                return true;
+              }
+          }
       }
     return false;
   }
@@ -237,12 +237,12 @@ public class PriorityQueue extends AbstractQueue implements Serializable
     int save = used;
     for (E val : c)
       {
-	if (val == null)
-	  throw new NullPointerException();
-	newSlot = findSlot(newSlot);
-	storage[newSlot] = val;
-	++used;
-	bubbleUp(newSlot);
+        if (val == null)
+          throw new NullPointerException();
+        newSlot = findSlot(newSlot);
+        storage[newSlot] = val;
+        ++used;
+        bubbleUp(newSlot);
       }
 
     return save != used;
@@ -253,17 +253,17 @@ public class PriorityQueue extends AbstractQueue implements Serializable
     int slot;
     if (used == storage.length)
       {
-	resize();
-	slot = used;
+        resize();
+        slot = used;
       }
     else
       {
-	for (slot = start + 1; slot < storage.length; ++slot)
-	  {
-	    if (storage[slot] == null)
-	      break;
-	  }
-	// We'll always find a slot.
+        for (slot = start + 1; slot < storage.length; ++slot)
+          {
+            if (storage[slot] == null)
+              break;
+          }
+        // We'll always find a slot.
       }
     return slot;
   }
@@ -275,28 +275,28 @@ public class PriorityQueue extends AbstractQueue implements Serializable
     // the bottom of the tree.
     while (storage[index] != null)
       {
-	int child = 2 * index + 1;
+        int child = 2 * index + 1;
 
-	// See if we went off the end.
-	if (child >= storage.length)
-	  {
-	    storage[index] = null;
-	    break;
-	  }
+        // See if we went off the end.
+        if (child >= storage.length)
+          {
+            storage[index] = null;
+            break;
+          }
 
-	// Find which child we want to promote.  If one is not null,
-	// we pick it.  If both are null, it doesn't matter, we're
-	// about to leave.  If neither is null, pick the lesser.
-	if (child + 1 >= storage.length || storage[child + 1] == null)
-	  {
-	    // Nothing.
-	  }
-	else if (storage[child] == null
-		 || (Collections.compare(storage[child], storage[child + 1],
-					 comparator) > 0))
-	  ++child;
-	storage[index] = storage[child];
-	index = child;
+        // Find which child we want to promote.  If one is not null,
+        // we pick it.  If both are null, it doesn't matter, we're
+        // about to leave.  If neither is null, pick the lesser.
+        if (child + 1 >= storage.length || storage[child + 1] == null)
+          {
+            // Nothing.
+          }
+        else if (storage[child] == null
+                 || (Collections.compare(storage[child], storage[child + 1],
+                                         comparator) > 0))
+          ++child;
+        storage[index] = storage[child];
+        index = child;
       }
     --used;
   }
@@ -307,23 +307,23 @@ public class PriorityQueue extends AbstractQueue implements Serializable
     // it up the tree to its natural resting place.
     while (index > 0)
       {
-	// This works regardless of whether we're at 2N+1 or 2N+2.
-	int parent = (index - 1) / 2;
-	if (Collections.compare(storage[parent], storage[index], comparator)
-	    <= 0)
-	  {
-	    // Parent is the same or smaller than this element, so the
-	    // invariant is preserved.  Note that if the new element
-	    // is smaller than the parent, then it is necessarily
-	    // smaller than the parent's other child.
-	    break;
-	  }
+        // This works regardless of whether we're at 2N+1 or 2N+2.
+        int parent = (index - 1) / 2;
+        if (Collections.compare(storage[parent], storage[index], comparator)
+            <= 0)
+          {
+            // Parent is the same or smaller than this element, so the
+            // invariant is preserved.  Note that if the new element
+            // is smaller than the parent, then it is necessarily
+            // smaller than the parent's other child.
+            break;
+          }
 
-	E temp = storage[index];
-	storage[index] = storage[parent];
-	storage[parent] = temp;
+        E temp = storage[index];
+        storage[index] = storage[parent];
+        storage[parent] = temp;
 
-	index = parent;
+        index = parent;
       }
   }
 
diff --git a/libjava/classpath/java/util/Properties.java b/libjava/classpath/java/util/Properties.java
index a57004b3415..b0f436f4245 100644
--- a/libjava/classpath/java/util/Properties.java
+++ b/libjava/classpath/java/util/Properties.java
@@ -75,7 +75,7 @@ import org.w3c.dom.ls.LSSerializer;
  * and put it in the CLASSPATH.  (The character
  * \u00e4 is the german umlaut)
  *
- * 
+ *
 
                  s1=3
 s2=MeineDisk
 s3=3. M\u00e4rz 96
@@ -179,7 +179,7 @@ public class Properties extends Hashtable
    * \\uxxxx notation are detected, and
    * converted to the corresponding single character. 
                  
    *
-   * 
+   *
 
                  # This is a comment
 key     = value
 k\:5      \ a string starting with space and ending with newline\n
@@ -204,21 +204,21 @@ label   = Name:\\u0020
                  
       {
         char c = 0;
         int pos = 0;
-	// Leading whitespaces must be deleted first.
+        // Leading whitespaces must be deleted first.
         while (pos < line.length()
                && Character.isWhitespace(c = line.charAt(pos)))
           pos++;
 
         // If empty line or begins with a comment character, skip this line.
         if ((line.length() - pos) == 0
-	    || line.charAt(pos) == '#' || line.charAt(pos) == '!')
+            || line.charAt(pos) == '#' || line.charAt(pos) == '!')
           continue;
 
         // The characters up to the next Whitespace, ':', or '='
         // describe the key.  But look for escape sequences.
-	// Try to short-circuit when there is no escape char.
-	int start = pos;
-	boolean needsEscape = line.indexOf('\\', pos) != -1;
+        // Try to short-circuit when there is no escape char.
+        int start = pos;
+        boolean needsEscape = line.indexOf('\\', pos) != -1;
         CPStringBuilder key = needsEscape ? new CPStringBuilder() : null;
         while (pos < line.length()
                && ! Character.isWhitespace(c = line.charAt(pos++))
@@ -232,8 +232,8 @@ label   = Name:\\u0020
                  
                     // is no next line, just treat it as a key with an
                     // empty value.
                     line = reader.readLine();
-		    if (line == null)
-		      line = "";
+                    if (line == null)
+                      line = "";
                     pos = 0;
                     while (pos < line.length()
                            && Character.isWhitespace(c = line.charAt(pos)))
@@ -274,13 +274,13 @@ label   = Name:\\u0020
                  
 
         boolean isDelim = (c == ':' || c == '=');
 
-	String keyString;
-	if (needsEscape)
-	  keyString = key.toString();
-	else if (isDelim || Character.isWhitespace(c))
-	  keyString = line.substring(start, pos - 1);
-	else
-	  keyString = line.substring(start, pos);
+        String keyString;
+        if (needsEscape)
+          keyString = key.toString();
+        else if (isDelim || Character.isWhitespace(c))
+          keyString = line.substring(start, pos - 1);
+        else
+          keyString = line.substring(start, pos);
 
         while (pos < line.length()
                && Character.isWhitespace(c = line.charAt(pos)))
@@ -294,14 +294,14 @@ label   = Name:\\u0020
                  
               pos++;
           }
 
-	// Short-circuit if no escape chars found.
-	if (!needsEscape)
-	  {
-	    put(keyString, line.substring(pos));
-	    continue;
-	  }
+        // Short-circuit if no escape chars found.
+        if (!needsEscape)
+          {
+            put(keyString, line.substring(pos));
+            continue;
+          }
 
-	// Escape char found so iterate through the rest of the line.
+        // Escape char found so iterate through the rest of the line.
         StringBuilder element = new StringBuilder(line.length() - pos);
         while (pos < line.length())
           {
@@ -313,11 +313,11 @@ label   = Name:\\u0020
                     // The line continues on the next line.
                     line = reader.readLine();
 
-		    // We might have seen a backslash at the end of
-		    // the file.  The JDK ignores the backslash in
-		    // this case, so we follow for compatibility.
-		    if (line == null)
-		      break;
+                    // We might have seen a backslash at the end of
+                    // the file.  The JDK ignores the backslash in
+                    // this case, so we follow for compatibility.
+                    if (line == null)
+                      break;
 
                     pos = 0;
                     while (pos < line.length()
@@ -438,7 +438,7 @@ label   = Name:\\u0020
     if (header != null)
       writer.println("#" + header);
     writer.println ("#" + Calendar.getInstance ().getTime ());
-    
+
     Iterator iter = entrySet ().iterator ();
     int i = size ();
     CPStringBuilder s = new CPStringBuilder (); // Reuse the same buffer.
@@ -528,7 +528,7 @@ label   = Name:\\u0020
   }
 
   /**
-   * Prints the key/value pairs to the given print stream.  This is 
+   * Prints the key/value pairs to the given print stream.  This is
    * mainly useful for debugging purposes.
    *
    * @param out the print stream, where the key/value pairs are written to
@@ -645,7 +645,7 @@ label   = Name:\\u0020
    * Invoking this method provides the same behaviour as invoking
    * storeToXML(os, comment, "UTF-8").
    * 
                  
-   * 
+   *
    * @param os the stream to output to.
    * @param comment a comment to include at the top of the XML file, or
    *                null if one is not required.
@@ -666,7 +666,7 @@ label   = Name:\\u0020
    * 
    * http://java.sun.com/dtd/properties.dtd.
    * 
                  
-   * 
+   *
    * @param os the stream to output to.
    * @param comment a comment to include at the top of the XML file, or
    *                null if one is not required.
@@ -685,53 +685,53 @@ label   = Name:\\u0020
       throw new NullPointerException("Null encoding supplied.");
     try
       {
-	DOMImplementationRegistry registry = 
-	  DOMImplementationRegistry.newInstance();
-	DOMImplementation domImpl = registry.getDOMImplementation("LS 3.0");
-	DocumentType doctype =
-	  domImpl.createDocumentType("properties", null,
-				     "http://java.sun.com/dtd/properties.dtd");
-	Document doc = domImpl.createDocument(null, "properties", doctype);
-	Element root = doc.getDocumentElement();
-	if (comment != null)
-	  {
-	    Element commentElement = doc.createElement("comment");
-	    commentElement.appendChild(doc.createTextNode(comment));
-	    root.appendChild(commentElement);
-	  }
-	Iterator iterator = entrySet().iterator();
-	while (iterator.hasNext())
-	  {
-	    Map.Entry entry = (Map.Entry) iterator.next();
-	    Element entryElement = doc.createElement("entry");
-	    entryElement.setAttribute("key", (String) entry.getKey());
-	    entryElement.appendChild(doc.createTextNode((String)
-							entry.getValue()));
-	    root.appendChild(entryElement);
-	  }
-	DOMImplementationLS loadAndSave = (DOMImplementationLS) domImpl;
-	LSSerializer serializer = loadAndSave.createLSSerializer();
-	LSOutput output = loadAndSave.createLSOutput();
-	output.setByteStream(os);
-	output.setEncoding(encoding);
-	serializer.write(doc, output);
+        DOMImplementationRegistry registry =
+          DOMImplementationRegistry.newInstance();
+        DOMImplementation domImpl = registry.getDOMImplementation("LS 3.0");
+        DocumentType doctype =
+          domImpl.createDocumentType("properties", null,
+                                     "http://java.sun.com/dtd/properties.dtd");
+        Document doc = domImpl.createDocument(null, "properties", doctype);
+        Element root = doc.getDocumentElement();
+        if (comment != null)
+          {
+            Element commentElement = doc.createElement("comment");
+            commentElement.appendChild(doc.createTextNode(comment));
+            root.appendChild(commentElement);
+          }
+        Iterator iterator = entrySet().iterator();
+        while (iterator.hasNext())
+          {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            Element entryElement = doc.createElement("entry");
+            entryElement.setAttribute("key", (String) entry.getKey());
+            entryElement.appendChild(doc.createTextNode((String)
+                                                        entry.getValue()));
+            root.appendChild(entryElement);
+          }
+        DOMImplementationLS loadAndSave = (DOMImplementationLS) domImpl;
+        LSSerializer serializer = loadAndSave.createLSSerializer();
+        LSOutput output = loadAndSave.createLSOutput();
+        output.setByteStream(os);
+        output.setEncoding(encoding);
+        serializer.write(doc, output);
       }
     catch (ClassNotFoundException e)
       {
-	throw (IOException) 
-	  new IOException("The XML classes could not be found.").initCause(e);
+        throw (IOException)
+          new IOException("The XML classes could not be found.").initCause(e);
       }
     catch (InstantiationException e)
       {
-	throw (IOException)
-	  new IOException("The XML classes could not be instantiated.")
-	  .initCause(e);
+        throw (IOException)
+          new IOException("The XML classes could not be instantiated.")
+          .initCause(e);
       }
     catch (IllegalAccessException e)
       {
-	throw (IOException)
-	  new IOException("The XML classes could not be accessed.")
-	  .initCause(e);
+        throw (IOException)
+          new IOException("The XML classes could not be accessed.")
+          .initCause(e);
       }
   }
 
@@ -813,9 +813,9 @@ label   = Name:\\u0020
       }
     catch (XMLStreamException e)
       {
-	throw (InvalidPropertiesFormatException)
-	  new InvalidPropertiesFormatException("Error in parsing XML.").
-	  initCause(e);
+        throw (InvalidPropertiesFormatException)
+          new InvalidPropertiesFormatException("Error in parsing XML.").
+          initCause(e);
       }
   }
 
diff --git a/libjava/classpath/java/util/PropertyPermission.java b/libjava/classpath/java/util/PropertyPermission.java
index d1bdbd1d058..6ed4690d85f 100644
--- a/libjava/classpath/java/util/PropertyPermission.java
+++ b/libjava/classpath/java/util/PropertyPermission.java
@@ -136,7 +136,7 @@ public final class PropertyPermission extends BasicPermission
   {
     // Initialising the class java.util.Locale ...
     //    tries to initialise the Locale.defaultLocale static
-    //    which calls System.getProperty, 
+    //    which calls System.getProperty,
     //    which calls SecurityManager.checkPropertiesAccess,
     //    which creates a PropertyPermission with action "read,write",
     //    which calls setActions("read,write").
@@ -144,9 +144,9 @@ public final class PropertyPermission extends BasicPermission
     //    this would call Locale.getDefault() which returns null
     //       because Locale.defaultLocale hasn't been set yet
     //    then toLowerCase will fail with a null pointer exception.
-    // 
+    //
     // The solution is to take a punt on 'str' being lower case, and
-    // test accordingly.  If that fails, we convert 'str' to lower case 
+    // test accordingly.  If that fails, we convert 'str' to lower case
     // and try the tests again.
     if ("read".equals(str))
       actions = READ;
@@ -156,15 +156,15 @@ public final class PropertyPermission extends BasicPermission
       actions = READ | WRITE;
     else
       {
-	String lstr = str.toLowerCase();
-	if ("read".equals(lstr))
- 	  actions = READ;
-	else if ("write".equals(lstr))
-	  actions = WRITE;
-	else if ("read,write".equals(lstr) || "write,read".equals(lstr))
-	  actions = READ | WRITE;
-	else
-	  throw new IllegalArgumentException("illegal action " + str);
+        String lstr = str.toLowerCase();
+        if ("read".equals(lstr))
+          actions = READ;
+        else if ("write".equals(lstr))
+          actions = WRITE;
+        else if ("read,write".equals(lstr) || "write,read".equals(lstr))
+          actions = READ | WRITE;
+        else
+          throw new IllegalArgumentException("illegal action " + str);
       }
   }
 
diff --git a/libjava/classpath/java/util/PropertyPermissionCollection.java b/libjava/classpath/java/util/PropertyPermissionCollection.java
index c95fa4e66bf..768b112256a 100644
--- a/libjava/classpath/java/util/PropertyPermissionCollection.java
+++ b/libjava/classpath/java/util/PropertyPermissionCollection.java
@@ -67,7 +67,7 @@ class PropertyPermissionCollection extends PermissionCollection
   /**
    * A flag to detect if "*" is in the collection.
    *
-   * @serial true if "*" is in the collection 
+   * @serial true if "*" is in the collection
    */
   private boolean all_allowed;
 
diff --git a/libjava/classpath/java/util/Random.java b/libjava/classpath/java/util/Random.java
index b016f78d4a2..999e89547cd 100644
--- a/libjava/classpath/java/util/Random.java
+++ b/libjava/classpath/java/util/Random.java
@@ -227,7 +227,7 @@ public class Random implements Serializable
    * an int value whose 32 bits are independent chosen random bits
    * (0 and 1 are equally likely).  The implementation for
    * java.util.Random is:
-   * 
+   *
 
                  public int nextInt()
 {
   return next(32);
@@ -246,7 +246,7 @@ public class Random implements Serializable
    * each value has the same likelihodd (1/n).
    * (0 and 1 are equally likely).  The implementation for
    * java.util.Random is:
-   * 
+   *
 
                   public int nextInt(int n)
 {
@@ -266,7 +266,7 @@ public int nextInt(int n)
 
   return val;
 }
                  
-   *   
+   *
    * 
                  This algorithm would return every value with exactly the same
    * probability, if the next()-method would be a perfect random number
    * generator.
@@ -323,7 +323,7 @@ public int nextInt(int n)
   /**
    * Generates the next pseudorandom boolean.  True and false have
    * the same probability.  The implementation is:
-   * 
+   *
 
                  public boolean nextBoolean()
 {
   return next(1) != 0;
@@ -341,7 +341,7 @@ public int nextInt(int n)
    * Generates the next pseudorandom float uniformly distributed
    * between 0.0f (inclusive) and 1.0f (exclusive).  The
    * implementation is as follows.
-   * 
+   *
 
                  public float nextFloat()
 {
   return next(24) / ((float)(1 << 24));
@@ -375,7 +375,7 @@ public int nextInt(int n)
    * Generates the next pseudorandom, Gaussian (normally) distributed
    * double value, with mean 0.0 and standard deviation 1.0.
    * The algorithm is as follows.
-   * 
+   *
 
                  public synchronized double nextGaussian()
 {
   if (haveNextNextGaussian)
diff --git a/libjava/classpath/java/util/ResourceBundle.java b/libjava/classpath/java/util/ResourceBundle.java
index 21243403c5f..966eb026c7e 100644
--- a/libjava/classpath/java/util/ResourceBundle.java
+++ b/libjava/classpath/java/util/ResourceBundle.java
@@ -95,7 +95,7 @@ public abstract class ResourceBundle
   /**
    * Maximum size of our cache of ResourceBundles keyed by
    * {@link BundleKey} instances.
-   * 
+   *
    * @see BundleKey
    */
   private static final int CACHE_SIZE = 100;
@@ -120,7 +120,7 @@ public abstract class ResourceBundle
    * {@link #CACHE_SIZE} accessed ResourceBundles keyed by the
    * tuple: default locale, resource-bundle name, resource-bundle locale, and
    * classloader.
-   * 
+   *
    * @see BundleKey
    */
   private static Map bundleCache =
@@ -188,8 +188,8 @@ public abstract class ResourceBundle
 
     String className = getClass().getName();
     throw new MissingResourceException("Key '" + key
-				       + "'not found in Bundle: "
-				       + className, className, key);
+                                       + "'not found in Bundle: "
+                                       + className, className, key);
   }
 
   /**
@@ -270,7 +270,7 @@ public abstract class ResourceBundle
     {
       set(dl, s, l, cl);
     }
-    
+
     void set(Locale dl, String s, Locale l, ClassLoader cl)
     {
       defaultLocale = dl;
@@ -280,12 +280,12 @@ public abstract class ResourceBundle
       hashcode = defaultLocale.hashCode() ^ baseName.hashCode()
           ^ locale.hashCode() ^ classLoader.hashCode();
     }
-    
+
     public int hashCode()
     {
       return hashcode;
     }
-    
+
     public boolean equals(Object o)
     {
       if (! (o instanceof BundleKey))
@@ -296,7 +296,7 @@ public abstract class ResourceBundle
           && baseName.equals(key.baseName)
           && locale.equals(key.locale)
           && classLoader.equals(key.classLoader);
-    }    
+    }
 
     public String toString()
     {
@@ -313,11 +313,11 @@ public abstract class ResourceBundle
       return builder.toString();
     }
   }
-  
+
   /** A cache lookup key. This avoids having to a new one for every
    *  getBundle() call. */
   private static final BundleKey lookupKey = new BundleKey();
-  
+
   /** Singleton cache entry to represent previous failed lookups. */
   private static final Object nullEntry = new Object();
 
@@ -383,7 +383,7 @@ public abstract class ResourceBundle
    * 
                • Locale("es", "ES"): result MyResources_es_ES.class, parent
    *   MyResources.class
                  • 
    * 
-   * 
+   *
    * 
                  The file MyResources_fr_CH.properties is never used because it is hidden
    * by MyResources_fr_CH.class.
                  
    *
@@ -475,38 +475,38 @@ public abstract class ResourceBundle
           rbClass = Class.forName(localizedName);
         else
           rbClass = classloader.loadClass(localizedName);
-	// Note that we do the check up front instead of catching
-	// ClassCastException.  The reason for this is that some crazy
-	// programs (Eclipse) have classes that do not extend
-	// ResourceBundle but that have the same name as a property
-	// bundle; in fact Eclipse relies on ResourceBundle not
-	// instantiating these classes.
-	if (ResourceBundle.class.isAssignableFrom(rbClass))
-	  bundle = (ResourceBundle) rbClass.newInstance();
+        // Note that we do the check up front instead of catching
+        // ClassCastException.  The reason for this is that some crazy
+        // programs (Eclipse) have classes that do not extend
+        // ResourceBundle but that have the same name as a property
+        // bundle; in fact Eclipse relies on ResourceBundle not
+        // instantiating these classes.
+        if (ResourceBundle.class.isAssignableFrom(rbClass))
+          bundle = (ResourceBundle) rbClass.newInstance();
       }
     catch (Exception ex) {}
 
     if (bundle == null)
       {
-	try
-	  {
-	    InputStream is;
-	    String resourceName
-	      = localizedName.replace('.', '/') + ".properties";
-	    if (classloader == null)
-	      is = ClassLoader.getSystemResourceAsStream(resourceName);
-	    else
-	      is = classloader.getResourceAsStream(resourceName);
-	    if (is != null)
-	      bundle = new PropertyResourceBundle(is);
-	  }
-	catch (IOException ex)
-	  {
-	    MissingResourceException mre = new MissingResourceException
-	      ("Failed to load bundle: " + localizedName, localizedName, "");
-	    mre.initCause(ex);
-	    throw mre;
-	  }
+        try
+          {
+            InputStream is;
+            String resourceName
+              = localizedName.replace('.', '/') + ".properties";
+            if (classloader == null)
+              is = ClassLoader.getSystemResourceAsStream(resourceName);
+            else
+              is = classloader.getResourceAsStream(resourceName);
+            if (is != null)
+              bundle = new PropertyResourceBundle(is);
+          }
+        catch (IOException ex)
+          {
+            MissingResourceException mre = new MissingResourceException
+              ("Failed to load bundle: " + localizedName, localizedName, "");
+            mre.initCause(ex);
+            throw mre;
+          }
       }
 
     return bundle;
@@ -524,13 +524,13 @@ public abstract class ResourceBundle
    * @return the resource bundle if it was loaded, otherwise the backup
    */
   private static ResourceBundle tryBundle(String baseName, Locale locale,
-                                          ClassLoader classLoader, 
-					  boolean wantBase)
+                                          ClassLoader classLoader,
+                                          boolean wantBase)
   {
     String language = locale.getLanguage();
     String country = locale.getCountry();
     String variant = locale.getVariant();
-    
+
     int baseLen = baseName.length();
 
     // Build up a CPStringBuilder containing the complete bundle name, fully
@@ -538,23 +538,23 @@ public abstract class ResourceBundle
     CPStringBuilder sb = new CPStringBuilder(baseLen + variant.length() + 7);
 
     sb.append(baseName);
-    
+
     if (language.length() > 0)
       {
-	sb.append('_');
-	sb.append(language);
-	
-	if (country.length() > 0)
-	  {
-	    sb.append('_');
-	    sb.append(country);
-	    
-	    if (variant.length() > 0)
-	      {
-	        sb.append('_');
-		sb.append(variant);
-	      }
-	  }
+        sb.append('_');
+        sb.append(language);
+
+        if (country.length() > 0)
+          {
+            sb.append('_');
+            sb.append(country);
+
+            if (variant.length() > 0)
+              {
+                sb.append('_');
+                sb.append(variant);
+              }
+          }
       }
 
     // Now try to load bundles, starting with the most specialized name.
@@ -562,28 +562,28 @@ public abstract class ResourceBundle
     String bundleName = sb.toString();
     ResourceBundle first = null; // The most specialized bundle.
     ResourceBundle last = null; // The least specialized bundle.
-    
+
     while (true)
       {
         ResourceBundle foundBundle = tryBundle(bundleName, classLoader);
-	if (foundBundle != null)
-	  {
-	    if (first == null)
-	      first = foundBundle;
-	    if (last != null)
-	      last.parent = foundBundle;
-	    foundBundle.locale = locale;
-	    last = foundBundle;
-	  }
-	int idx = bundleName.lastIndexOf('_');
-	// Try the non-localized base name only if we already have a
-	// localized child bundle, or wantBase is true.
-	if (idx > baseLen || (idx == baseLen && (first != null || wantBase)))
-	  bundleName = bundleName.substring(0, idx);
-	else
-	  break;
+        if (foundBundle != null)
+          {
+            if (first == null)
+              first = foundBundle;
+            if (last != null)
+              last.parent = foundBundle;
+            foundBundle.locale = locale;
+            last = foundBundle;
+          }
+        int idx = bundleName.lastIndexOf('_');
+        // Try the non-localized base name only if we already have a
+        // localized child bundle, or wantBase is true.
+        if (idx > baseLen || (idx == baseLen && (first != null || wantBase)))
+          bundleName = bundleName.substring(0, idx);
+        else
+          break;
       }
-    
+
     return first;
   }
 
@@ -611,14 +611,14 @@ public abstract class ResourceBundle
     if (loader == null)
       throw new NullPointerException("The loader can not be null.");
     synchronized (ResourceBundle.class)
-      {    
-	Iterator iter = bundleCache.keySet().iterator();
-	while (iter.hasNext())
-	  {
-	    BundleKey key = iter.next();
-	    if (key.classLoader == loader)
-	      iter.remove();
-	  }
+      {
+        Iterator iter = bundleCache.keySet().iterator();
+        while (iter.hasNext())
+          {
+            BundleKey key = iter.next();
+            if (key.classLoader == loader)
+              iter.remove();
+          }
       }
   }
 
diff --git a/libjava/classpath/java/util/ServiceConfigurationError.java b/libjava/classpath/java/util/ServiceConfigurationError.java
index 1d006c8de20..40d744c2360 100644
--- a/libjava/classpath/java/util/ServiceConfigurationError.java
+++ b/libjava/classpath/java/util/ServiceConfigurationError.java
@@ -50,14 +50,14 @@ package java.util;
  * 
                • A listed class does not implement the service
                  • 
  * 
                • A listed class can not be instantiated
                  • 
  * 
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.6
  */
 public class ServiceConfigurationError
   extends Error
 {
-  
+
   /**
    * Compatible with JDK 1.6
    */
@@ -86,7 +86,7 @@ public class ServiceConfigurationError
    *              or inappropriate.
    */
   public ServiceConfigurationError(String message,
-				   Throwable cause)
+                                   Throwable cause)
   {
     super(message,cause);
   }
diff --git a/libjava/classpath/java/util/ServiceLoader.java b/libjava/classpath/java/util/ServiceLoader.java
index 9935416359e..bcac0704a42 100644
--- a/libjava/classpath/java/util/ServiceLoader.java
+++ b/libjava/classpath/java/util/ServiceLoader.java
@@ -149,37 +149,37 @@ public final class ServiceLoader
   {
     return new Iterator()
       {
-	/**
-	 * The cache iterator.
-	 */
-	private Iterator cacheIt = cache.iterator();
+        /**
+         * The cache iterator.
+         */
+        private Iterator cacheIt = cache.iterator();
 
-	public boolean hasNext()
-	{
-	  if (cacheIt.hasNext())
-	    return true;
-	  if (serviceIt == null)
-	    serviceIt =
-	      ServiceFactory.lookupProviders(spi, loader, true);
-	  return serviceIt.hasNext();
-	}
+        public boolean hasNext()
+        {
+          if (cacheIt.hasNext())
+            return true;
+          if (serviceIt == null)
+            serviceIt =
+              ServiceFactory.lookupProviders(spi, loader, true);
+          return serviceIt.hasNext();
+        }
 
-	public S next()
-	{
-	  if (cacheIt.hasNext())
-	    return cacheIt.next();
-	  if (serviceIt == null)
-	    serviceIt =
-	      ServiceFactory.lookupProviders(spi, loader, true);
-	  S nextService = serviceIt.next();
-	  cache.add(nextService);
-	  return nextService;
-	}
+        public S next()
+        {
+          if (cacheIt.hasNext())
+            return cacheIt.next();
+          if (serviceIt == null)
+            serviceIt =
+              ServiceFactory.lookupProviders(spi, loader, true);
+          S nextService = serviceIt.next();
+          cache.add(nextService);
+          return nextService;
+        }
 
-	public void remove()
-	{
-	  throw new UnsupportedOperationException();
-	}
+        public void remove()
+        {
+          throw new UnsupportedOperationException();
+        }
       };
   }
 
@@ -196,7 +196,7 @@ public final class ServiceLoader
   public static  ServiceLoader load(Class service)
   {
     return load(service,
-		Thread.currentThread().getContextClassLoader());
+                Thread.currentThread().getContextClassLoader());
   }
 
   /**
@@ -215,7 +215,7 @@ public final class ServiceLoader
    * @return a new {@link ServiceLoader} instance.
    */
   public static  ServiceLoader load(Class service,
-					  ClassLoader loader)
+                                          ClassLoader loader)
   {
     if (loader == null)
       loader = ClassLoader.getSystemClassLoader();
@@ -244,7 +244,7 @@ public final class ServiceLoader
      * of the system class loader, as in
      * ClassLoader.getDefaultSystemClassLoader() */
     return load(service,
-		ClassLoader.getSystemClassLoader().getParent());
+                ClassLoader.getSystemClassLoader().getParent());
   }
 
   /**
@@ -258,8 +258,8 @@ public final class ServiceLoader
 
   /**
    * Returns a textual representation of this
-   * {@link ServiceLoader}. 
-   * 
+   * {@link ServiceLoader}.
+   *
    * @return a textual representation of the
    *         service loader.
    */
diff --git a/libjava/classpath/java/util/SimpleTimeZone.java b/libjava/classpath/java/util/SimpleTimeZone.java
index 4f1840173e1..6b3b55f179c 100644
--- a/libjava/classpath/java/util/SimpleTimeZone.java
+++ b/libjava/classpath/java/util/SimpleTimeZone.java
@@ -211,7 +211,7 @@ public class SimpleTimeZone extends TimeZone
    * @serial
    */
   private byte[] monthLength = monthArr;
-  private static final byte[] monthArr = 
+  private static final byte[] monthArr =
                                          {
                                            31, 28, 31, 30, 31, 30, 31, 31, 30,
                                            31, 30, 31
@@ -382,7 +382,7 @@ public class SimpleTimeZone extends TimeZone
                         int endTime, int endTimeMode, int dstSavings)
   {
     this(rawOffset, id, startMonth, startDayOfWeekInMonth, startDayOfWeek,
-	 startTime, endMonth, endDayOfWeekInMonth, endDayOfWeek, endTime);
+         startTime, endMonth, endDayOfWeekInMonth, endDayOfWeek, endTime);
 
     if (startTimeMode < WALL_TIME || startTimeMode > UTC_TIME)
       throw new IllegalArgumentException("startTimeMode must be one of WALL_TIME, STANDARD_TIME, or UTC_TIME");
@@ -425,28 +425,28 @@ public class SimpleTimeZone extends TimeZone
     int daysInMonth = getDaysInMonth(month, 1);
     if (dayOfWeek == 0)
       {
-	if (day <= 0 || day > daysInMonth)
-	  throw new IllegalArgumentException("day out of range");
-	return DOM_MODE;
+        if (day <= 0 || day > daysInMonth)
+          throw new IllegalArgumentException("day out of range");
+        return DOM_MODE;
       }
     else if (dayOfWeek > 0)
       {
-	if (Math.abs(day) > (daysInMonth + 6) / 7)
-	  throw new IllegalArgumentException("dayOfWeekInMonth out of range");
-	if (dayOfWeek > Calendar.SATURDAY)
-	  throw new IllegalArgumentException("dayOfWeek out of range");
-	return DOW_IN_MONTH_MODE;
+        if (Math.abs(day) > (daysInMonth + 6) / 7)
+          throw new IllegalArgumentException("dayOfWeekInMonth out of range");
+        if (dayOfWeek > Calendar.SATURDAY)
+          throw new IllegalArgumentException("dayOfWeek out of range");
+        return DOW_IN_MONTH_MODE;
       }
     else
       {
-	if (day == 0 || Math.abs(day) > daysInMonth)
-	  throw new IllegalArgumentException("day out of range");
-	if (dayOfWeek < -Calendar.SATURDAY)
-	  throw new IllegalArgumentException("dayOfWeek out of range");
-	if (day < 0)
-	  return DOW_LE_DOM_MODE;
-	else
-	  return DOW_GE_DOM_MODE;
+        if (day == 0 || Math.abs(day) > daysInMonth)
+          throw new IllegalArgumentException("day out of range");
+        if (dayOfWeek < -Calendar.SATURDAY)
+          throw new IllegalArgumentException("dayOfWeek out of range");
+        if (day < 0)
+          return DOW_LE_DOM_MODE;
+        else
+          return DOW_GE_DOM_MODE;
       }
   }
 
@@ -641,45 +641,45 @@ public class SimpleTimeZone extends TimeZone
     int daylightSavings = 0;
     if (useDaylight && era == GregorianCalendar.AD && year >= startYear)
       {
-	int orig_year = year;
-	int time = startTime + (startTimeMode == UTC_TIME ? rawOffset : 0);
-	// This does only work for Gregorian calendars :-(
-	// This is mainly because setStartYear doesn't take an era.
-	boolean afterStart = ! isBefore(year, month, day, dayOfWeek, millis,
-	                                startMode, startMonth, startDay,
-					startDayOfWeek, time);
-	millis += dstSavings;
-	if (millis >= 24 * 60 * 60 * 1000)
-	  {
-	    millis -= 24 * 60 * 60 * 1000;
-	    dayOfWeek = (dayOfWeek % 7) + 1;
-	    if (++day > daysInMonth)
-	      {
-		day = 1;
-		if (month++ == Calendar.DECEMBER)
-		  {
-		    month = Calendar.JANUARY;
-		    year++;
-		  }
-	      }
-	  }
-	time = endTime + (endTimeMode == UTC_TIME ? rawOffset : 0);
-	if (endTimeMode != WALL_TIME)
-	  time += dstSavings;
-	boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis,
-				     endMode, endMonth, endDay, endDayOfWeek,
-				     time);
+        int orig_year = year;
+        int time = startTime + (startTimeMode == UTC_TIME ? rawOffset : 0);
+        // This does only work for Gregorian calendars :-(
+        // This is mainly because setStartYear doesn't take an era.
+        boolean afterStart = ! isBefore(year, month, day, dayOfWeek, millis,
+                                        startMode, startMonth, startDay,
+                                        startDayOfWeek, time);
+        millis += dstSavings;
+        if (millis >= 24 * 60 * 60 * 1000)
+          {
+            millis -= 24 * 60 * 60 * 1000;
+            dayOfWeek = (dayOfWeek % 7) + 1;
+            if (++day > daysInMonth)
+              {
+                day = 1;
+                if (month++ == Calendar.DECEMBER)
+                  {
+                    month = Calendar.JANUARY;
+                    year++;
+                  }
+              }
+          }
+        time = endTime + (endTimeMode == UTC_TIME ? rawOffset : 0);
+        if (endTimeMode != WALL_TIME)
+          time += dstSavings;
+        boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis,
+                                     endMode, endMonth, endDay, endDayOfWeek,
+                                     time);
 
-	if (year != orig_year)
-	  afterStart = false;
-	if (startMonth < endMonth)
-	  // use daylight savings, if the date is after the start of
-	  // savings, and before the end of savings.
-	  daylightSavings = afterStart && beforeEnd ? dstSavings : 0;
-	else
-	  // use daylight savings, if the date is before the end of
-	  // savings, or after the start of savings.
-	  daylightSavings = beforeEnd || afterStart ? dstSavings : 0;
+        if (year != orig_year)
+          afterStart = false;
+        if (startMonth < endMonth)
+          // use daylight savings, if the date is after the start of
+          // savings, and before the end of savings.
+          daylightSavings = afterStart && beforeEnd ? dstSavings : 0;
+        else
+          // use daylight savings, if the date is before the end of
+          // savings, or after the start of savings.
+          daylightSavings = beforeEnd || afterStart ? dstSavings : 0;
       }
     return rawOffset + daylightSavings;
   }
@@ -748,19 +748,19 @@ public class SimpleTimeZone extends TimeZone
    * @param year  The year.
    */
   private int getDaysInMonth(int month, int year)
-  {    
+  {
     if (month == Calendar.FEBRUARY)
       {
-	if ((year & 3) != 0)
-	  return 28;
+        if ((year & 3) != 0)
+          return 28;
 
-	// Assume default Gregorian cutover, 
-	// all years prior to this must be Julian
-	if (year < 1582)
-	  return 29;
+        // Assume default Gregorian cutover,
+        // all years prior to this must be Julian
+        if (year < 1582)
+          return 29;
 
-	// Gregorian rules 
-	return ((year % 100) != 0 || (year % 400) == 0) ? 29 : 28;
+        // Gregorian rules
+        return ((year % 100) != 0 || (year % 400) == 0) ? 29 : 28;
       }
     else
       return monthArr[month];
@@ -800,66 +800,66 @@ public class SimpleTimeZone extends TimeZone
     switch (mode)
       {
       case DOM_MODE:
-	if (calDayOfMonth != day)
-	  return calDayOfMonth < day;
-	break;
+        if (calDayOfMonth != day)
+          return calDayOfMonth < day;
+        break;
       case DOW_IN_MONTH_MODE:
         {
-	  // This computes the day of month of the day of type
-	  // "dayOfWeek" that lies in the same (sunday based) week as cal.
-	  calDayOfMonth += (dayOfWeek - calDayOfWeek);
+          // This computes the day of month of the day of type
+          // "dayOfWeek" that lies in the same (sunday based) week as cal.
+          calDayOfMonth += (dayOfWeek - calDayOfWeek);
 
-	  // Now we convert it to 7 based number (to get a one based offset
-	  // after dividing by 7).  If we count from the end of the
-	  // month, we get want a -7 based number counting the days from 
-	  // the end:
-	  if (day < 0)
-	    calDayOfMonth -= getDaysInMonth(calMonth, calYear) + 7;
-	  else
-	    calDayOfMonth += 6;
+          // Now we convert it to 7 based number (to get a one based offset
+          // after dividing by 7).  If we count from the end of the
+          // month, we get want a -7 based number counting the days from
+          // the end:
+          if (day < 0)
+            calDayOfMonth -= getDaysInMonth(calMonth, calYear) + 7;
+          else
+            calDayOfMonth += 6;
 
-	  //  day > 0                    day < 0
-	  //  S  M  T  W  T  F  S        S  M  T  W  T  F  S
-	  //     7  8  9 10 11 12         -36-35-34-33-32-31
-	  // 13 14 15 16 17 18 19      -30-29-28-27-26-25-24
-	  // 20 21 22 23 24 25 26      -23-22-21-20-19-18-17
-	  // 27 28 29 30 31 32 33      -16-15-14-13-12-11-10
-	  // 34 35 36                   -9 -8 -7
-	  // Now we calculate the day of week in month:
-	  int week = calDayOfMonth / 7;
+          //  day > 0                    day < 0
+          //  S  M  T  W  T  F  S        S  M  T  W  T  F  S
+          //     7  8  9 10 11 12         -36-35-34-33-32-31
+          // 13 14 15 16 17 18 19      -30-29-28-27-26-25-24
+          // 20 21 22 23 24 25 26      -23-22-21-20-19-18-17
+          // 27 28 29 30 31 32 33      -16-15-14-13-12-11-10
+          // 34 35 36                   -9 -8 -7
+          // Now we calculate the day of week in month:
+          int week = calDayOfMonth / 7;
 
-	  //  day > 0                    day < 0
-	  //  S  M  T  W  T  F  S        S  M  T  W  T  F  S
-	  //     1  1  1  1  1  1          -5 -5 -4 -4 -4 -4
-	  //  1  2  2  2  2  2  2       -4 -4 -4 -3 -3 -3 -3
-	  //  2  3  3  3  3  3  3       -3 -3 -3 -2 -2 -2 -2
-	  //  3  4  4  4  4  4  4       -2 -2 -2 -1 -1 -1 -1
-	  //  4  5  5                   -1 -1 -1
-	  if (week != day)
-	    return week < day;
+          //  day > 0                    day < 0
+          //  S  M  T  W  T  F  S        S  M  T  W  T  F  S
+          //     1  1  1  1  1  1          -5 -5 -4 -4 -4 -4
+          //  1  2  2  2  2  2  2       -4 -4 -4 -3 -3 -3 -3
+          //  2  3  3  3  3  3  3       -3 -3 -3 -2 -2 -2 -2
+          //  3  4  4  4  4  4  4       -2 -2 -2 -1 -1 -1 -1
+          //  4  5  5                   -1 -1 -1
+          if (week != day)
+            return week < day;
 
-	  if (calDayOfWeek != dayOfWeek)
-	    return calDayOfWeek < dayOfWeek;
+          if (calDayOfWeek != dayOfWeek)
+            return calDayOfWeek < dayOfWeek;
 
-	  // daylight savings starts/ends  on the given day.
-	  break;
+          // daylight savings starts/ends  on the given day.
+          break;
         }
       case DOW_LE_DOM_MODE:
-	// The greatest sunday before or equal December, 12
-	// is the same as smallest sunday after or equal December, 6.
-	day = Math.abs(day) - 6;
+        // The greatest sunday before or equal December, 12
+        // is the same as smallest sunday after or equal December, 6.
+        day = Math.abs(day) - 6;
       case DOW_GE_DOM_MODE:
-	// Calculate the day of month of the day of type
-	// "dayOfWeek" that lies before (or on) the given date.
-	calDayOfMonth -= (calDayOfWeek < dayOfWeek ? 7 : 0) + calDayOfWeek
-	- dayOfWeek;
-	if (calDayOfMonth < day)
-	  return true;
-	if (calDayOfWeek != dayOfWeek || calDayOfMonth >= day + 7)
-	  return false;
+        // Calculate the day of month of the day of type
+        // "dayOfWeek" that lies before (or on) the given date.
+        calDayOfMonth -= (calDayOfWeek < dayOfWeek ? 7 : 0) + calDayOfWeek
+        - dayOfWeek;
+        if (calDayOfMonth < day)
+          return true;
+        if (calDayOfWeek != dayOfWeek || calDayOfMonth >= day + 7)
+          return false;
 
-	// now we have the same day
-	break;
+        // now we have the same day
+        break;
       }
 
     // the millis decides:
@@ -971,28 +971,28 @@ public class SimpleTimeZone extends TimeZone
     input.defaultReadObject();
     if (serialVersionOnStream == 0)
       {
-	// initialize the new fields to default values.
-	dstSavings = 60 * 60 * 1000;
-	endMode = DOW_IN_MONTH_MODE;
-	startMode = DOW_IN_MONTH_MODE;
-	startTimeMode = WALL_TIME;
-	endTimeMode = WALL_TIME;
-	serialVersionOnStream = 2;
+        // initialize the new fields to default values.
+        dstSavings = 60 * 60 * 1000;
+        endMode = DOW_IN_MONTH_MODE;
+        startMode = DOW_IN_MONTH_MODE;
+        startTimeMode = WALL_TIME;
+        endTimeMode = WALL_TIME;
+        serialVersionOnStream = 2;
       }
     else
       {
-	int length = input.readInt();
-	byte[] byteArray = new byte[length];
-	input.read(byteArray, 0, length);
-	if (length >= 4)
-	  {
-	    // Lets hope that Sun does extensions to the serialized
-	    // form in a sane manner.
-	    startDay = byteArray[0];
-	    startDayOfWeek = byteArray[1];
-	    endDay = byteArray[2];
-	    endDayOfWeek = byteArray[3];
-	  }
+        int length = input.readInt();
+        byte[] byteArray = new byte[length];
+        input.read(byteArray, 0, length);
+        if (length >= 4)
+          {
+            // Lets hope that Sun does extensions to the serialized
+            // form in a sane manner.
+            startDay = byteArray[0];
+            startDayOfWeek = byteArray[1];
+            endDay = byteArray[2];
+            endDayOfWeek = byteArray[3];
+          }
       }
   }
 
@@ -1025,22 +1025,22 @@ public class SimpleTimeZone extends TimeZone
     switch (startMode)
       {
       case DOM_MODE:
-	startDayOfWeek = Calendar.SUNDAY; // random day of week
+        startDayOfWeek = Calendar.SUNDAY; // random day of week
 
       // fall through
       case DOW_GE_DOM_MODE:
       case DOW_LE_DOM_MODE:
-	startDay = (startDay + 6) / 7;
+        startDay = (startDay + 6) / 7;
       }
     switch (endMode)
       {
       case DOM_MODE:
-	endDayOfWeek = Calendar.SUNDAY;
+        endDayOfWeek = Calendar.SUNDAY;
 
       // fall through
       case DOW_GE_DOM_MODE:
       case DOW_LE_DOM_MODE:
-	endDay = (endDay + 6) / 7;
+        endDay = (endDay + 6) / 7;
       }
 
     // the required part:
diff --git a/libjava/classpath/java/util/StringTokenizer.java b/libjava/classpath/java/util/StringTokenizer.java
index b230c73d869..d16ec9bc49e 100644
--- a/libjava/classpath/java/util/StringTokenizer.java
+++ b/libjava/classpath/java/util/StringTokenizer.java
@@ -189,7 +189,7 @@ public class StringTokenizer implements Enumeration
         int start = pos;
         while (++pos < len && delim.indexOf(str.charAt(pos)) < 0)
           ;
-        
+
         return str.substring(start, pos);
       }
     throw new NoSuchElementException();
diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java
index 681a6a24ad4..86a62918ed5 100644
--- a/libjava/classpath/java/util/TimeZone.java
+++ b/libjava/classpath/java/util/TimeZone.java
@@ -50,7 +50,7 @@ import java.text.DateFormatSymbols;
 
 /**
  * This class represents a time zone offset and handles daylight savings.
- * 
+ *
  * You can get the default time zone with getDefault.
  * This represents the time zone where program is running.
  *
@@ -100,36 +100,36 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   private static synchronized TimeZone defaultZone()
   {
     /* Look up default timezone */
-    if (defaultZone0 == null) 
+    if (defaultZone0 == null)
       {
-	defaultZone0 = (TimeZone) AccessController.doPrivileged
-	  (new PrivilegedAction()
-	    {
-	      public Object run()
-	      {
-		TimeZone zone = null;
-		
-		// Prefer System property user.timezone.
-		String tzid = System.getProperty("user.timezone");
-		if (tzid != null && !tzid.equals(""))
-		  zone = getDefaultTimeZone(tzid);
-		
-		// Try platfom specific way.
-		if (zone == null)
-		  zone = VMTimeZone.getDefaultTimeZoneId();
-		
-		// Fall back on GMT.
-		if (zone == null)
-		  zone = getTimeZone ("GMT");
-		
-		return zone;
-	      }
-	    });
+        defaultZone0 = (TimeZone) AccessController.doPrivileged
+          (new PrivilegedAction()
+            {
+              public Object run()
+              {
+                TimeZone zone = null;
+
+                // Prefer System property user.timezone.
+                String tzid = System.getProperty("user.timezone");
+                if (tzid != null && !tzid.equals(""))
+                  zone = getDefaultTimeZone(tzid);
+
+                // Try platfom specific way.
+                if (zone == null)
+                  zone = VMTimeZone.getDefaultTimeZoneId();
+
+                // Fall back on GMT.
+                if (zone == null)
+                  zone = getTimeZone ("GMT");
+
+                return zone;
+              }
+            });
       }
-    
-    return defaultZone0; 
+
+    return defaultZone0;
   }
-  
+
   private static final long serialVersionUID = 3581463369166924961L;
 
   /**
@@ -149,756 +149,756 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   private static HashMap aliases0;
 
   /**
-   * HashMap for timezones by ID.  
+   * HashMap for timezones by ID.
    */
   private static HashMap timezones0;
   /* initialize this static field lazily to overhead if
-   * it is not needed: 
+   * it is not needed:
    */
   // Package-private to avoid a trampoline.
   static HashMap timezones()
   {
-    if (timezones0 == null) 
+    if (timezones0 == null)
       {
-	HashMap timezones = new HashMap();
-	timezones0 = timezones;
+        HashMap timezones = new HashMap();
+        timezones0 = timezones;
 
-	zoneinfo_dir = SystemProperties.getProperty("gnu.java.util.zoneinfo.dir");
-	if (zoneinfo_dir != null && !new File(zoneinfo_dir).isDirectory())
-	  zoneinfo_dir = null;
+        zoneinfo_dir = SystemProperties.getProperty("gnu.java.util.zoneinfo.dir");
+        if (zoneinfo_dir != null && !new File(zoneinfo_dir).isDirectory())
+          zoneinfo_dir = null;
 
-	if (zoneinfo_dir != null)
-	  {
-	    aliases0 = new HashMap();
+        if (zoneinfo_dir != null)
+          {
+            aliases0 = new HashMap();
 
-	    // These deprecated aliases for JDK 1.1.x compatibility
-	    // should take precedence over data files read from
-	    // /usr/share/zoneinfo.
-	    aliases0.put("ACT", "Australia/Darwin");
-	    aliases0.put("AET", "Australia/Sydney");
-	    aliases0.put("AGT", "America/Argentina/Buenos_Aires");
-	    aliases0.put("ART", "Africa/Cairo");
-	    aliases0.put("AST", "America/Juneau");
-	    aliases0.put("BST", "Asia/Colombo");
-	    aliases0.put("CAT", "Africa/Gaborone");
-	    aliases0.put("CNT", "America/St_Johns");
-	    aliases0.put("CST", "CST6CDT");
-	    aliases0.put("CTT", "Asia/Brunei");
-	    aliases0.put("EAT", "Indian/Comoro");
-	    aliases0.put("ECT", "CET");
-	    aliases0.put("EST", "EST5EDT");
-	    aliases0.put("EST5", "EST5EDT");
-	    aliases0.put("IET", "EST5EDT");
-	    aliases0.put("IST", "Asia/Calcutta");
-	    aliases0.put("JST", "Asia/Seoul");
-	    aliases0.put("MIT", "Pacific/Niue");
-	    aliases0.put("MST", "MST7MDT");
-	    aliases0.put("MST7", "MST7MDT");
-	    aliases0.put("NET", "Indian/Mauritius");
-	    aliases0.put("NST", "Pacific/Auckland");
-	    aliases0.put("PLT", "Indian/Kerguelen");
-	    aliases0.put("PNT", "MST7MDT");
-	    aliases0.put("PRT", "America/Anguilla");
-	    aliases0.put("PST", "PST8PDT");
-	    aliases0.put("SST", "Pacific/Ponape");
-	    aliases0.put("VST", "Asia/Bangkok");
-	    return timezones;
-	  }
+            // These deprecated aliases for JDK 1.1.x compatibility
+            // should take precedence over data files read from
+            // /usr/share/zoneinfo.
+            aliases0.put("ACT", "Australia/Darwin");
+            aliases0.put("AET", "Australia/Sydney");
+            aliases0.put("AGT", "America/Argentina/Buenos_Aires");
+            aliases0.put("ART", "Africa/Cairo");
+            aliases0.put("AST", "America/Juneau");
+            aliases0.put("BST", "Asia/Colombo");
+            aliases0.put("CAT", "Africa/Gaborone");
+            aliases0.put("CNT", "America/St_Johns");
+            aliases0.put("CST", "CST6CDT");
+            aliases0.put("CTT", "Asia/Brunei");
+            aliases0.put("EAT", "Indian/Comoro");
+            aliases0.put("ECT", "CET");
+            aliases0.put("EST", "EST5EDT");
+            aliases0.put("EST5", "EST5EDT");
+            aliases0.put("IET", "EST5EDT");
+            aliases0.put("IST", "Asia/Calcutta");
+            aliases0.put("JST", "Asia/Seoul");
+            aliases0.put("MIT", "Pacific/Niue");
+            aliases0.put("MST", "MST7MDT");
+            aliases0.put("MST7", "MST7MDT");
+            aliases0.put("NET", "Indian/Mauritius");
+            aliases0.put("NST", "Pacific/Auckland");
+            aliases0.put("PLT", "Indian/Kerguelen");
+            aliases0.put("PNT", "MST7MDT");
+            aliases0.put("PRT", "America/Anguilla");
+            aliases0.put("PST", "PST8PDT");
+            aliases0.put("SST", "Pacific/Ponape");
+            aliases0.put("VST", "Asia/Bangkok");
+            return timezones;
+          }
 
-	TimeZone tz;
-	// Automatically generated by scripts/timezones.pl
-	// XXX - Should we read this data from a file?
-	tz = new SimpleTimeZone(-11000 * 3600, "MIT");
-	timezones0.put("MIT", tz);
-	timezones0.put("Pacific/Apia", tz);
-	timezones0.put("Pacific/Midway", tz);
-	timezones0.put("Pacific/Niue", tz);
-	timezones0.put("Pacific/Pago_Pago", tz);
-	tz = new SimpleTimeZone
-	  (-10000 * 3600, "America/Adak",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Adak", tz);
-	tz = new SimpleTimeZone(-10000 * 3600, "HST");
-	timezones0.put("HST", tz);
-	timezones0.put("Pacific/Fakaofo", tz);
-	timezones0.put("Pacific/Honolulu", tz);
-	timezones0.put("Pacific/Johnston", tz);
-	timezones0.put("Pacific/Rarotonga", tz);
-	timezones0.put("Pacific/Tahiti", tz);
-	tz = new SimpleTimeZone(-9500 * 3600, "Pacific/Marquesas");
-	timezones0.put("Pacific/Marquesas", tz);
-	tz = new SimpleTimeZone
-	  (-9000 * 3600, "AST",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("AST", tz);
-	timezones0.put("America/Anchorage", tz);
-	timezones0.put("America/Juneau", tz);
-	timezones0.put("America/Nome", tz);
-	timezones0.put("America/Yakutat", tz);
-	tz = new SimpleTimeZone(-9000 * 3600, "Pacific/Gambier");
-	timezones0.put("Pacific/Gambier", tz);
-	tz = new SimpleTimeZone
-	  (-8000 * 3600, "America/Tijuana",
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Tijuana", tz);
-	tz = new SimpleTimeZone
-	  (-8000 * 3600, "PST",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("PST", tz);
-	timezones0.put("PST8PDT", tz);
-	timezones0.put("America/Dawson", tz);
-	timezones0.put("America/Los_Angeles", tz);
-	timezones0.put("America/Vancouver", tz);
-	timezones0.put("America/Whitehorse", tz);
-	timezones0.put("US/Pacific-New", tz);
-	tz = new SimpleTimeZone(-8000 * 3600, "Pacific/Pitcairn");
-	timezones0.put("Pacific/Pitcairn", tz);
-	tz = new SimpleTimeZone
-	  (-7000 * 3600, "America/Chihuahua",
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Chihuahua", tz);
-	timezones0.put("America/Mazatlan", tz);
-	tz = new SimpleTimeZone(-7000 * 3600, "MST7");
-	timezones0.put("MST7", tz);
-	timezones0.put("PNT", tz);
-	timezones0.put("America/Dawson_Creek", tz);
-	timezones0.put("America/Hermosillo", tz);
-	timezones0.put("America/Phoenix", tz);
-	tz = new SimpleTimeZone
-	  (-7000 * 3600, "MST",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("MST", tz);
-	timezones0.put("MST7MDT", tz);
-	timezones0.put("America/Boise", tz);
-	timezones0.put("America/Cambridge_Bay", tz);
-	timezones0.put("America/Denver", tz);
-	timezones0.put("America/Edmonton", tz);
-	timezones0.put("America/Inuvik", tz);
-	timezones0.put("America/Shiprock", tz);
-	timezones0.put("America/Yellowknife", tz);
-	tz = new SimpleTimeZone
-	  (-6000 * 3600, "America/Cancun",
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Cancun", tz);
-	timezones0.put("America/Merida", tz);
-	timezones0.put("America/Mexico_City", tz);
-	timezones0.put("America/Monterrey", tz);
-	tz = new SimpleTimeZone(-6000 * 3600, "America/Belize");
-	timezones0.put("America/Belize", tz);
-	timezones0.put("America/Costa_Rica", tz);
-	timezones0.put("America/El_Salvador", tz);
-	timezones0.put("America/Guatemala", tz);
-	timezones0.put("America/Managua", tz);
-	timezones0.put("America/Regina", tz);
-	timezones0.put("America/Swift_Current", tz);
-	timezones0.put("America/Tegucigalpa", tz);
-	timezones0.put("Pacific/Galapagos", tz);
-	tz = new SimpleTimeZone
-	  (-6000 * 3600, "CST",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("CST", tz);
-	timezones0.put("CST6CDT", tz);
-	timezones0.put("America/Chicago", tz);
-	timezones0.put("America/Indiana/Knox", tz);
-	timezones0.put("America/Indiana/Petersburg", tz);
-	timezones0.put("America/Indiana/Vincennes", tz);
-	timezones0.put("America/Menominee", tz);
-	timezones0.put("America/North_Dakota/Center", tz);
-	timezones0.put("America/North_Dakota/New_Salem", tz);
-	timezones0.put("America/Rainy_River", tz);
-	timezones0.put("America/Rankin_Inlet", tz);
-	timezones0.put("America/Winnipeg", tz);
-	tz = new SimpleTimeZone
-	  (-6000 * 3600, "Pacific/Easter",
-	   Calendar.OCTOBER, 2, Calendar.SATURDAY, 22000 * 3600,
-	   Calendar.MARCH, 2, Calendar.SATURDAY, 22000 * 3600);
-	timezones0.put("Pacific/Easter", tz);
-	tz = new SimpleTimeZone(-5000 * 3600, "EST5");
-	timezones0.put("EST5", tz);
-	timezones0.put("IET", tz);
-	timezones0.put("America/Atikokan", tz);
-	timezones0.put("America/Bogota", tz);
-	timezones0.put("America/Cayman", tz);
-	timezones0.put("America/Eirunepe", tz);
-	timezones0.put("America/Guayaquil", tz);
-	timezones0.put("America/Jamaica", tz);
-	timezones0.put("America/Lima", tz);
-	timezones0.put("America/Panama", tz);
-	timezones0.put("America/Rio_Branco", tz);
-	tz = new SimpleTimeZone
-	  (-5000 * 3600, "America/Havana",
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
-	timezones0.put("America/Havana", tz);
-	tz = new SimpleTimeZone
-	  (-5000 * 3600, "America/Grand_Turk",
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("America/Grand_Turk", tz);
-	timezones0.put("America/Port-au-Prince", tz);
-	tz = new SimpleTimeZone
-	  (-5000 * 3600, "EST",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("EST", tz);
-	timezones0.put("EST5EDT", tz);
-	timezones0.put("America/Detroit", tz);
-	timezones0.put("America/Indiana/Indianapolis", tz);
-	timezones0.put("America/Indiana/Marengo", tz);
-	timezones0.put("America/Indiana/Vevay", tz);
-	timezones0.put("America/Iqaluit", tz);
-	timezones0.put("America/Kentucky/Louisville", tz);
-	timezones0.put("America/Kentucky/Monticello", tz);
-	timezones0.put("America/Montreal", tz);
-	timezones0.put("America/Nassau", tz);
-	timezones0.put("America/New_York", tz);
-	timezones0.put("America/Nipigon", tz);
-	timezones0.put("America/Pangnirtung", tz);
-	timezones0.put("America/Thunder_Bay", tz);
-	timezones0.put("America/Toronto", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "America/Asuncion",
-	   Calendar.OCTOBER, 3, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("America/Asuncion", tz);
-	tz = new SimpleTimeZone(-4000 * 3600, "PRT");
-	timezones0.put("PRT", tz);
-	timezones0.put("America/Anguilla", tz);
-	timezones0.put("America/Antigua", tz);
-	timezones0.put("America/Aruba", tz);
-	timezones0.put("America/Barbados", tz);
-	timezones0.put("America/Blanc-Sablon", tz);
-	timezones0.put("America/Boa_Vista", tz);
-	timezones0.put("America/Caracas", tz);
-	timezones0.put("America/Curacao", tz);
-	timezones0.put("America/Dominica", tz);
-	timezones0.put("America/Grenada", tz);
-	timezones0.put("America/Guadeloupe", tz);
-	timezones0.put("America/Guyana", tz);
-	timezones0.put("America/La_Paz", tz);
-	timezones0.put("America/Manaus", tz);
-	timezones0.put("America/Martinique", tz);
-	timezones0.put("America/Montserrat", tz);
-	timezones0.put("America/Port_of_Spain", tz);
-	timezones0.put("America/Porto_Velho", tz);
-	timezones0.put("America/Puerto_Rico", tz);
-	timezones0.put("America/Santo_Domingo", tz);
-	timezones0.put("America/St_Kitts", tz);
-	timezones0.put("America/St_Lucia", tz);
-	timezones0.put("America/St_Thomas", tz);
-	timezones0.put("America/St_Vincent", tz);
-	timezones0.put("America/Tortola", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "America/Campo_Grande",
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("America/Campo_Grande", tz);
-	timezones0.put("America/Cuiaba", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "America/Goose_Bay",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 60000,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);
-	timezones0.put("America/Goose_Bay", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "America/Glace_Bay",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Glace_Bay", tz);
-	timezones0.put("America/Halifax", tz);
-	timezones0.put("America/Moncton", tz);
-	timezones0.put("America/Thule", tz);
-	timezones0.put("Atlantic/Bermuda", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "America/Santiago",
-	   Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
-	   Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("America/Santiago", tz);
-	timezones0.put("Antarctica/Palmer", tz);
-	tz = new SimpleTimeZone
-	  (-4000 * 3600, "Atlantic/Stanley",
-	   Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.APRIL, 3, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("Atlantic/Stanley", tz);
-	tz = new SimpleTimeZone
-	  (-3500 * 3600, "CNT",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 60000,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);
-	timezones0.put("CNT", tz);
-	timezones0.put("America/St_Johns", tz);
-	tz = new SimpleTimeZone
-	  (-3000 * 3600, "America/Godthab",
-	   Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,
-	   Calendar.OCTOBER, 30, -Calendar.SATURDAY, 23000 * 3600);
-	timezones0.put("America/Godthab", tz);
-	tz = new SimpleTimeZone
-	  (-3000 * 3600, "America/Miquelon",
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Miquelon", tz);
-	tz = new SimpleTimeZone
-	  (-3000 * 3600, "America/Montevideo",
-	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("America/Montevideo", tz);
-	tz = new SimpleTimeZone
-	  (-3000 * 3600, "America/Sao_Paulo",
-	   Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("America/Sao_Paulo", tz);
-	tz = new SimpleTimeZone(-3000 * 3600, "AGT");
-	timezones0.put("AGT", tz);
-	timezones0.put("America/Araguaina", tz);
-	timezones0.put("America/Argentina/Buenos_Aires", tz);
-	timezones0.put("America/Argentina/Catamarca", tz);
-	timezones0.put("America/Argentina/Cordoba", tz);
-	timezones0.put("America/Argentina/Jujuy", tz);
-	timezones0.put("America/Argentina/La_Rioja", tz);
-	timezones0.put("America/Argentina/Mendoza", tz);
-	timezones0.put("America/Argentina/Rio_Gallegos", tz);
-	timezones0.put("America/Argentina/San_Juan", tz);
-	timezones0.put("America/Argentina/Tucuman", tz);
-	timezones0.put("America/Argentina/Ushuaia", tz);
-	timezones0.put("America/Bahia", tz);
-	timezones0.put("America/Belem", tz);
-	timezones0.put("America/Cayenne", tz);
-	timezones0.put("America/Fortaleza", tz);
-	timezones0.put("America/Maceio", tz);
-	timezones0.put("America/Paramaribo", tz);
-	timezones0.put("America/Recife", tz);
-	timezones0.put("Antarctica/Rothera", tz);
-	tz = new SimpleTimeZone(-2000 * 3600, "America/Noronha");
-	timezones0.put("America/Noronha", tz);
-	timezones0.put("Atlantic/South_Georgia", tz);
-	tz = new SimpleTimeZone
-	  (-1000 * 3600, "America/Scoresbysund",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
-	timezones0.put("America/Scoresbysund", tz);
-	timezones0.put("Atlantic/Azores", tz);
-	tz = new SimpleTimeZone(-1000 * 3600, "Atlantic/Cape_Verde");
-	timezones0.put("Atlantic/Cape_Verde", tz);
-	tz = new SimpleTimeZone(0 * 3600, "GMT");
-	timezones0.put("GMT", tz);
-	timezones0.put("UTC", tz);
-	timezones0.put("Africa/Abidjan", tz);
-	timezones0.put("Africa/Accra", tz);
-	timezones0.put("Africa/Bamako", tz);
-	timezones0.put("Africa/Banjul", tz);
-	timezones0.put("Africa/Bissau", tz);
-	timezones0.put("Africa/Casablanca", tz);
-	timezones0.put("Africa/Conakry", tz);
-	timezones0.put("Africa/Dakar", tz);
-	timezones0.put("Africa/El_Aaiun", tz);
-	timezones0.put("Africa/Freetown", tz);
-	timezones0.put("Africa/Lome", tz);
-	timezones0.put("Africa/Monrovia", tz);
-	timezones0.put("Africa/Nouakchott", tz);
-	timezones0.put("Africa/Ouagadougou", tz);
-	timezones0.put("Africa/Sao_Tome", tz);
-	timezones0.put("America/Danmarkshavn", tz);
-	timezones0.put("Atlantic/Reykjavik", tz);
-	timezones0.put("Atlantic/St_Helena", tz);
-	tz = new SimpleTimeZone
-	  (0 * 3600, "WET",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 1000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("WET", tz);
-	timezones0.put("Atlantic/Canary", tz);
-	timezones0.put("Atlantic/Faroe", tz);
-	timezones0.put("Atlantic/Madeira", tz);
-	timezones0.put("Europe/Dublin", tz);
-	timezones0.put("Europe/Guernsey", tz);
-	timezones0.put("Europe/Isle_of_Man", tz);
-	timezones0.put("Europe/Jersey", tz);
-	timezones0.put("Europe/Lisbon", tz);
-	timezones0.put("Europe/London", tz);
-	tz = new SimpleTimeZone(1000 * 3600, "Africa/Algiers");
-	timezones0.put("Africa/Algiers", tz);
-	timezones0.put("Africa/Bangui", tz);
-	timezones0.put("Africa/Brazzaville", tz);
-	timezones0.put("Africa/Douala", tz);
-	timezones0.put("Africa/Kinshasa", tz);
-	timezones0.put("Africa/Lagos", tz);
-	timezones0.put("Africa/Libreville", tz);
-	timezones0.put("Africa/Luanda", tz);
-	timezones0.put("Africa/Malabo", tz);
-	timezones0.put("Africa/Ndjamena", tz);
-	timezones0.put("Africa/Niamey", tz);
-	timezones0.put("Africa/Porto-Novo", tz);
-	tz = new SimpleTimeZone
-	  (1000 * 3600, "Africa/Windhoek",
-	   Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600);
-	timezones0.put("Africa/Windhoek", tz);
-	tz = new SimpleTimeZone
-	  (1000 * 3600, "CET",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("CET", tz);
-	timezones0.put("ECT", tz);
-	timezones0.put("MET", tz);
-	timezones0.put("Africa/Ceuta", tz);
-	timezones0.put("Africa/Tunis", tz);
-	timezones0.put("Arctic/Longyearbyen", tz);
-	timezones0.put("Atlantic/Jan_Mayen", tz);
-	timezones0.put("Europe/Amsterdam", tz);
-	timezones0.put("Europe/Andorra", tz);
-	timezones0.put("Europe/Belgrade", tz);
-	timezones0.put("Europe/Berlin", tz);
-	timezones0.put("Europe/Bratislava", tz);
-	timezones0.put("Europe/Brussels", tz);
-	timezones0.put("Europe/Budapest", tz);
-	timezones0.put("Europe/Copenhagen", tz);
-	timezones0.put("Europe/Gibraltar", tz);
-	timezones0.put("Europe/Ljubljana", tz);
-	timezones0.put("Europe/Luxembourg", tz);
-	timezones0.put("Europe/Madrid", tz);
-	timezones0.put("Europe/Malta", tz);
-	timezones0.put("Europe/Monaco", tz);
-	timezones0.put("Europe/Oslo", tz);
-	timezones0.put("Europe/Paris", tz);
-	timezones0.put("Europe/Podgorica", tz);
-	timezones0.put("Europe/Prague", tz);
-	timezones0.put("Europe/Rome", tz);
-	timezones0.put("Europe/San_Marino", tz);
-	timezones0.put("Europe/Sarajevo", tz);
-	timezones0.put("Europe/Skopje", tz);
-	timezones0.put("Europe/Stockholm", tz);
-	timezones0.put("Europe/Tirane", tz);
-	timezones0.put("Europe/Vaduz", tz);
-	timezones0.put("Europe/Vatican", tz);
-	timezones0.put("Europe/Vienna", tz);
-	timezones0.put("Europe/Warsaw", tz);
-	timezones0.put("Europe/Zagreb", tz);
-	timezones0.put("Europe/Zurich", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "ART",
-	   Calendar.APRIL, -1, Calendar.FRIDAY, 0 * 3600,
-	   Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 24000 * 3600);
-	timezones0.put("ART", tz);
-	timezones0.put("Africa/Cairo", tz);
-	tz = new SimpleTimeZone(2000 * 3600, "CAT");
-	timezones0.put("CAT", tz);
-	timezones0.put("Africa/Blantyre", tz);
-	timezones0.put("Africa/Bujumbura", tz);
-	timezones0.put("Africa/Gaborone", tz);
-	timezones0.put("Africa/Harare", tz);
-	timezones0.put("Africa/Johannesburg", tz);
-	timezones0.put("Africa/Kigali", tz);
-	timezones0.put("Africa/Lubumbashi", tz);
-	timezones0.put("Africa/Lusaka", tz);
-	timezones0.put("Africa/Maputo", tz);
-	timezones0.put("Africa/Maseru", tz);
-	timezones0.put("Africa/Mbabane", tz);
-	timezones0.put("Africa/Tripoli", tz);
-	timezones0.put("Asia/Jerusalem", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "Asia/Amman",
-	   Calendar.MARCH, -1, Calendar.THURSDAY, 0 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.FRIDAY, 1000 * 3600);
-	timezones0.put("Asia/Amman", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "Asia/Beirut",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
-	timezones0.put("Asia/Beirut", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "Asia/Damascus",
-	   Calendar.APRIL, 1, 0, 0 * 3600,
-	   Calendar.OCTOBER, 1, 0, 0 * 3600);
-	timezones0.put("Asia/Damascus", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "Asia/Gaza",
-	   Calendar.APRIL, 1, 0, 0 * 3600,
-	   Calendar.OCTOBER, 3, Calendar.FRIDAY, 0 * 3600);
-	timezones0.put("Asia/Gaza", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "EET",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 4000 * 3600);
-	timezones0.put("EET", tz);
-	timezones0.put("Asia/Istanbul", tz);
-	timezones0.put("Asia/Nicosia", tz);
-	timezones0.put("Europe/Athens", tz);
-	timezones0.put("Europe/Bucharest", tz);
-	timezones0.put("Europe/Chisinau", tz);
-	timezones0.put("Europe/Helsinki", tz);
-	timezones0.put("Europe/Istanbul", tz);
-	timezones0.put("Europe/Kiev", tz);
-	timezones0.put("Europe/Mariehamn", tz);
-	timezones0.put("Europe/Nicosia", tz);
-	timezones0.put("Europe/Riga", tz);
-	timezones0.put("Europe/Simferopol", tz);
-	timezones0.put("Europe/Sofia", tz);
-	timezones0.put("Europe/Tallinn", tz);
-	timezones0.put("Europe/Uzhgorod", tz);
-	timezones0.put("Europe/Vilnius", tz);
-	timezones0.put("Europe/Zaporozhye", tz);
-	tz = new SimpleTimeZone
-	  (2000 * 3600, "Europe/Kaliningrad",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Europe/Kaliningrad", tz);
-	timezones0.put("Europe/Minsk", tz);
-	tz = new SimpleTimeZone
-	  (3000 * 3600, "Asia/Baghdad",
-	   Calendar.APRIL, 1, 0, 3000 * 3600,
-	   Calendar.OCTOBER, 1, 0, 4000 * 3600);
-	timezones0.put("Asia/Baghdad", tz);
-	tz = new SimpleTimeZone
-	  (3000 * 3600, "Europe/Moscow",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Europe/Moscow", tz);
-	timezones0.put("Europe/Volgograd", tz);
-	tz = new SimpleTimeZone(3000 * 3600, "EAT");
-	timezones0.put("EAT", tz);
-	timezones0.put("Africa/Addis_Ababa", tz);
-	timezones0.put("Africa/Asmara", tz);
-	timezones0.put("Africa/Dar_es_Salaam", tz);
-	timezones0.put("Africa/Djibouti", tz);
-	timezones0.put("Africa/Kampala", tz);
-	timezones0.put("Africa/Khartoum", tz);
-	timezones0.put("Africa/Mogadishu", tz);
-	timezones0.put("Africa/Nairobi", tz);
-	timezones0.put("Antarctica/Syowa", tz);
-	timezones0.put("Asia/Aden", tz);
-	timezones0.put("Asia/Bahrain", tz);
-	timezones0.put("Asia/Kuwait", tz);
-	timezones0.put("Asia/Qatar", tz);
-	timezones0.put("Asia/Riyadh", tz);
-	timezones0.put("Indian/Antananarivo", tz);
-	timezones0.put("Indian/Comoro", tz);
-	timezones0.put("Indian/Mayotte", tz);
-	tz = new SimpleTimeZone(3500 * 3600, "Asia/Tehran");
-	timezones0.put("Asia/Tehran", tz);
-	tz = new SimpleTimeZone
-	  (4000 * 3600, "Asia/Baku",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 4000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 5000 * 3600);
-	timezones0.put("Asia/Baku", tz);
-	tz = new SimpleTimeZone
-	  (4000 * 3600, "Asia/Yerevan",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Yerevan", tz);
-	timezones0.put("Europe/Samara", tz);
-	tz = new SimpleTimeZone(4000 * 3600, "NET");
-	timezones0.put("NET", tz);
-	timezones0.put("Asia/Dubai", tz);
-	timezones0.put("Asia/Muscat", tz);
-	timezones0.put("Asia/Tbilisi", tz);
-	timezones0.put("Indian/Mahe", tz);
-	timezones0.put("Indian/Mauritius", tz);
-	timezones0.put("Indian/Reunion", tz);
-	tz = new SimpleTimeZone(4500 * 3600, "Asia/Kabul");
-	timezones0.put("Asia/Kabul", tz);
-	tz = new SimpleTimeZone
-	  (5000 * 3600, "Asia/Yekaterinburg",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Yekaterinburg", tz);
-	tz = new SimpleTimeZone(5000 * 3600, "PLT");
-	timezones0.put("PLT", tz);
-	timezones0.put("Asia/Aqtau", tz);
-	timezones0.put("Asia/Aqtobe", tz);
-	timezones0.put("Asia/Ashgabat", tz);
-	timezones0.put("Asia/Dushanbe", tz);
-	timezones0.put("Asia/Karachi", tz);
-	timezones0.put("Asia/Oral", tz);
-	timezones0.put("Asia/Samarkand", tz);
-	timezones0.put("Asia/Tashkent", tz);
-	timezones0.put("Indian/Kerguelen", tz);
-	timezones0.put("Indian/Maldives", tz);
-	tz = new SimpleTimeZone(5500 * 3600, "BST");
-	timezones0.put("BST", tz);
-	timezones0.put("IST", tz);
-	timezones0.put("Asia/Calcutta", tz);
-	timezones0.put("Asia/Colombo", tz);
-	tz = new SimpleTimeZone(5750 * 3600, "Asia/Katmandu");
-	timezones0.put("Asia/Katmandu", tz);
-	tz = new SimpleTimeZone(6000 * 3600, "Antarctica/Mawson");
-	timezones0.put("Antarctica/Mawson", tz);
-	timezones0.put("Antarctica/Vostok", tz);
-	timezones0.put("Asia/Almaty", tz);
-	timezones0.put("Asia/Bishkek", tz);
-	timezones0.put("Asia/Dhaka", tz);
-	timezones0.put("Asia/Qyzylorda", tz);
-	timezones0.put("Asia/Thimphu", tz);
-	timezones0.put("Indian/Chagos", tz);
-	tz = new SimpleTimeZone
-	  (6000 * 3600, "Asia/Novosibirsk",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Novosibirsk", tz);
-	timezones0.put("Asia/Omsk", tz);
-	tz = new SimpleTimeZone(6500 * 3600, "Asia/Rangoon");
-	timezones0.put("Asia/Rangoon", tz);
-	timezones0.put("Indian/Cocos", tz);
-	tz = new SimpleTimeZone(7000 * 3600, "VST");
-	timezones0.put("VST", tz);
-	timezones0.put("Antarctica/Davis", tz);
-	timezones0.put("Asia/Bangkok", tz);
-	timezones0.put("Asia/Jakarta", tz);
-	timezones0.put("Asia/Phnom_Penh", tz);
-	timezones0.put("Asia/Pontianak", tz);
-	timezones0.put("Asia/Saigon", tz);
-	timezones0.put("Asia/Vientiane", tz);
-	timezones0.put("Indian/Christmas", tz);
-	tz = new SimpleTimeZone
-	  (7000 * 3600, "Asia/Hovd",
-	   Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
-	   Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
-	timezones0.put("Asia/Hovd", tz);
-	tz = new SimpleTimeZone
-	  (7000 * 3600, "Asia/Krasnoyarsk",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Krasnoyarsk", tz);
-	tz = new SimpleTimeZone(8000 * 3600, "CTT");
-	timezones0.put("CTT", tz);
-	timezones0.put("Antarctica/Casey", tz);
-	timezones0.put("Asia/Brunei", tz);
-	timezones0.put("Asia/Chongqing", tz);
-	timezones0.put("Asia/Harbin", tz);
-	timezones0.put("Asia/Hong_Kong", tz);
-	timezones0.put("Asia/Kashgar", tz);
-	timezones0.put("Asia/Kuala_Lumpur", tz);
-	timezones0.put("Asia/Kuching", tz);
-	timezones0.put("Asia/Macau", tz);
-	timezones0.put("Asia/Makassar", tz);
-	timezones0.put("Asia/Manila", tz);
-	timezones0.put("Asia/Shanghai", tz);
-	timezones0.put("Asia/Singapore", tz);
-	timezones0.put("Asia/Taipei", tz);
-	timezones0.put("Asia/Urumqi", tz);
-	timezones0.put("Australia/Perth", tz);
-	tz = new SimpleTimeZone
-	  (8000 * 3600, "Asia/Irkutsk",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Irkutsk", tz);
-	tz = new SimpleTimeZone
-	  (8000 * 3600, "Asia/Ulaanbaatar",
-	   Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
-	   Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
-	timezones0.put("Asia/Ulaanbaatar", tz);
-	tz = new SimpleTimeZone(8750 * 3600, "Australia/Eucla");
-	timezones0.put("Australia/Eucla", tz);
-	tz = new SimpleTimeZone
-	  (9000 * 3600, "Asia/Choibalsan",
-	   Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
-	   Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
-	timezones0.put("Asia/Choibalsan", tz);
-	tz = new SimpleTimeZone(9000 * 3600, "JST");
-	timezones0.put("JST", tz);
-	timezones0.put("Asia/Dili", tz);
-	timezones0.put("Asia/Jayapura", tz);
-	timezones0.put("Asia/Pyongyang", tz);
-	timezones0.put("Asia/Seoul", tz);
-	timezones0.put("Asia/Tokyo", tz);
-	timezones0.put("Pacific/Palau", tz);
-	tz = new SimpleTimeZone
-	  (9000 * 3600, "Asia/Yakutsk",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Yakutsk", tz);
-	tz = new SimpleTimeZone
-	  (9500 * 3600, "Australia/Adelaide",
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Australia/Adelaide", tz);
-	timezones0.put("Australia/Broken_Hill", tz);
-	tz = new SimpleTimeZone(9500 * 3600, "ACT");
-	timezones0.put("ACT", tz);
-	timezones0.put("Australia/Darwin", tz);
-	tz = new SimpleTimeZone(10000 * 3600, "Antarctica/DumontDUrville");
-	timezones0.put("Antarctica/DumontDUrville", tz);
-	timezones0.put("Australia/Brisbane", tz);
-	timezones0.put("Australia/Lindeman", tz);
-	timezones0.put("Pacific/Guam", tz);
-	timezones0.put("Pacific/Port_Moresby", tz);
-	timezones0.put("Pacific/Saipan", tz);
-	timezones0.put("Pacific/Truk", tz);
-	tz = new SimpleTimeZone
-	  (10000 * 3600, "Asia/Sakhalin",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Sakhalin", tz);
-	timezones0.put("Asia/Vladivostok", tz);
-	tz = new SimpleTimeZone
-	  (10000 * 3600, "Australia/Currie",
-	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Australia/Currie", tz);
-	timezones0.put("Australia/Hobart", tz);
-	tz = new SimpleTimeZone
-	  (10000 * 3600, "AET",
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("AET", tz);
-	timezones0.put("Australia/Melbourne", tz);
-	timezones0.put("Australia/Sydney", tz);
-	tz = new SimpleTimeZone
-	  (10500 * 3600, "Australia/Lord_Howe",
-	  Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
-	  Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, 500 * 3600);
-	timezones0.put("Australia/Lord_Howe", tz);
-	tz = new SimpleTimeZone
-	  (11000 * 3600, "Asia/Magadan",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Magadan", tz);
-	tz = new SimpleTimeZone(11000 * 3600, "SST");
-	timezones0.put("SST", tz);
-	timezones0.put("Pacific/Efate", tz);
-	timezones0.put("Pacific/Guadalcanal", tz);
-	timezones0.put("Pacific/Kosrae", tz);
-	timezones0.put("Pacific/Noumea", tz);
-	timezones0.put("Pacific/Ponape", tz);
-	tz = new SimpleTimeZone(11500 * 3600, "Pacific/Norfolk");
-	timezones0.put("Pacific/Norfolk", tz);
-	tz = new SimpleTimeZone
-	  (12000 * 3600, "NST",
-	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.MARCH, 3, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("NST", tz);
-	timezones0.put("Antarctica/McMurdo", tz);
-	timezones0.put("Antarctica/South_Pole", tz);
-	timezones0.put("Pacific/Auckland", tz);
-	tz = new SimpleTimeZone
-	  (12000 * 3600, "Asia/Anadyr",
-	   Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
-	   Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
-	timezones0.put("Asia/Anadyr", tz);
-	timezones0.put("Asia/Kamchatka", tz);
-	tz = new SimpleTimeZone(12000 * 3600, "Pacific/Fiji");
-	timezones0.put("Pacific/Fiji", tz);
-	timezones0.put("Pacific/Funafuti", tz);
-	timezones0.put("Pacific/Kwajalein", tz);
-	timezones0.put("Pacific/Majuro", tz);
-	timezones0.put("Pacific/Nauru", tz);
-	timezones0.put("Pacific/Tarawa", tz);
-	timezones0.put("Pacific/Wake", tz);
-	timezones0.put("Pacific/Wallis", tz);
-	tz = new SimpleTimeZone
-	  (12750 * 3600, "Pacific/Chatham",
-	   Calendar.OCTOBER, 1, Calendar.SUNDAY, 2750 * 3600,
-	   Calendar.MARCH, 3, Calendar.SUNDAY, 3750 * 3600);
-	timezones0.put("Pacific/Chatham", tz);
-	tz = new SimpleTimeZone(13000 * 3600, "Pacific/Enderbury");
-	timezones0.put("Pacific/Enderbury", tz);
-	timezones0.put("Pacific/Tongatapu", tz);
-	tz = new SimpleTimeZone(14000 * 3600, "Pacific/Kiritimati");
-	timezones0.put("Pacific/Kiritimati", tz);
+        TimeZone tz;
+        // Automatically generated by scripts/timezones.pl
+        // XXX - Should we read this data from a file?
+        tz = new SimpleTimeZone(-11000 * 3600, "MIT");
+        timezones0.put("MIT", tz);
+        timezones0.put("Pacific/Apia", tz);
+        timezones0.put("Pacific/Midway", tz);
+        timezones0.put("Pacific/Niue", tz);
+        timezones0.put("Pacific/Pago_Pago", tz);
+        tz = new SimpleTimeZone
+          (-10000 * 3600, "America/Adak",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Adak", tz);
+        tz = new SimpleTimeZone(-10000 * 3600, "HST");
+        timezones0.put("HST", tz);
+        timezones0.put("Pacific/Fakaofo", tz);
+        timezones0.put("Pacific/Honolulu", tz);
+        timezones0.put("Pacific/Johnston", tz);
+        timezones0.put("Pacific/Rarotonga", tz);
+        timezones0.put("Pacific/Tahiti", tz);
+        tz = new SimpleTimeZone(-9500 * 3600, "Pacific/Marquesas");
+        timezones0.put("Pacific/Marquesas", tz);
+        tz = new SimpleTimeZone
+          (-9000 * 3600, "AST",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("AST", tz);
+        timezones0.put("America/Anchorage", tz);
+        timezones0.put("America/Juneau", tz);
+        timezones0.put("America/Nome", tz);
+        timezones0.put("America/Yakutat", tz);
+        tz = new SimpleTimeZone(-9000 * 3600, "Pacific/Gambier");
+        timezones0.put("Pacific/Gambier", tz);
+        tz = new SimpleTimeZone
+          (-8000 * 3600, "America/Tijuana",
+           Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Tijuana", tz);
+        tz = new SimpleTimeZone
+          (-8000 * 3600, "PST",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("PST", tz);
+        timezones0.put("PST8PDT", tz);
+        timezones0.put("America/Dawson", tz);
+        timezones0.put("America/Los_Angeles", tz);
+        timezones0.put("America/Vancouver", tz);
+        timezones0.put("America/Whitehorse", tz);
+        timezones0.put("US/Pacific-New", tz);
+        tz = new SimpleTimeZone(-8000 * 3600, "Pacific/Pitcairn");
+        timezones0.put("Pacific/Pitcairn", tz);
+        tz = new SimpleTimeZone
+          (-7000 * 3600, "America/Chihuahua",
+           Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Chihuahua", tz);
+        timezones0.put("America/Mazatlan", tz);
+        tz = new SimpleTimeZone(-7000 * 3600, "MST7");
+        timezones0.put("MST7", tz);
+        timezones0.put("PNT", tz);
+        timezones0.put("America/Dawson_Creek", tz);
+        timezones0.put("America/Hermosillo", tz);
+        timezones0.put("America/Phoenix", tz);
+        tz = new SimpleTimeZone
+          (-7000 * 3600, "MST",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("MST", tz);
+        timezones0.put("MST7MDT", tz);
+        timezones0.put("America/Boise", tz);
+        timezones0.put("America/Cambridge_Bay", tz);
+        timezones0.put("America/Denver", tz);
+        timezones0.put("America/Edmonton", tz);
+        timezones0.put("America/Inuvik", tz);
+        timezones0.put("America/Shiprock", tz);
+        timezones0.put("America/Yellowknife", tz);
+        tz = new SimpleTimeZone
+          (-6000 * 3600, "America/Cancun",
+           Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Cancun", tz);
+        timezones0.put("America/Merida", tz);
+        timezones0.put("America/Mexico_City", tz);
+        timezones0.put("America/Monterrey", tz);
+        tz = new SimpleTimeZone(-6000 * 3600, "America/Belize");
+        timezones0.put("America/Belize", tz);
+        timezones0.put("America/Costa_Rica", tz);
+        timezones0.put("America/El_Salvador", tz);
+        timezones0.put("America/Guatemala", tz);
+        timezones0.put("America/Managua", tz);
+        timezones0.put("America/Regina", tz);
+        timezones0.put("America/Swift_Current", tz);
+        timezones0.put("America/Tegucigalpa", tz);
+        timezones0.put("Pacific/Galapagos", tz);
+        tz = new SimpleTimeZone
+          (-6000 * 3600, "CST",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("CST", tz);
+        timezones0.put("CST6CDT", tz);
+        timezones0.put("America/Chicago", tz);
+        timezones0.put("America/Indiana/Knox", tz);
+        timezones0.put("America/Indiana/Petersburg", tz);
+        timezones0.put("America/Indiana/Vincennes", tz);
+        timezones0.put("America/Menominee", tz);
+        timezones0.put("America/North_Dakota/Center", tz);
+        timezones0.put("America/North_Dakota/New_Salem", tz);
+        timezones0.put("America/Rainy_River", tz);
+        timezones0.put("America/Rankin_Inlet", tz);
+        timezones0.put("America/Winnipeg", tz);
+        tz = new SimpleTimeZone
+          (-6000 * 3600, "Pacific/Easter",
+           Calendar.OCTOBER, 2, Calendar.SATURDAY, 22000 * 3600,
+           Calendar.MARCH, 2, Calendar.SATURDAY, 22000 * 3600);
+        timezones0.put("Pacific/Easter", tz);
+        tz = new SimpleTimeZone(-5000 * 3600, "EST5");
+        timezones0.put("EST5", tz);
+        timezones0.put("IET", tz);
+        timezones0.put("America/Atikokan", tz);
+        timezones0.put("America/Bogota", tz);
+        timezones0.put("America/Cayman", tz);
+        timezones0.put("America/Eirunepe", tz);
+        timezones0.put("America/Guayaquil", tz);
+        timezones0.put("America/Jamaica", tz);
+        timezones0.put("America/Lima", tz);
+        timezones0.put("America/Panama", tz);
+        timezones0.put("America/Rio_Branco", tz);
+        tz = new SimpleTimeZone
+          (-5000 * 3600, "America/Havana",
+           Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
+        timezones0.put("America/Havana", tz);
+        tz = new SimpleTimeZone
+          (-5000 * 3600, "America/Grand_Turk",
+           Calendar.APRIL, 1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("America/Grand_Turk", tz);
+        timezones0.put("America/Port-au-Prince", tz);
+        tz = new SimpleTimeZone
+          (-5000 * 3600, "EST",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("EST", tz);
+        timezones0.put("EST5EDT", tz);
+        timezones0.put("America/Detroit", tz);
+        timezones0.put("America/Indiana/Indianapolis", tz);
+        timezones0.put("America/Indiana/Marengo", tz);
+        timezones0.put("America/Indiana/Vevay", tz);
+        timezones0.put("America/Iqaluit", tz);
+        timezones0.put("America/Kentucky/Louisville", tz);
+        timezones0.put("America/Kentucky/Monticello", tz);
+        timezones0.put("America/Montreal", tz);
+        timezones0.put("America/Nassau", tz);
+        timezones0.put("America/New_York", tz);
+        timezones0.put("America/Nipigon", tz);
+        timezones0.put("America/Pangnirtung", tz);
+        timezones0.put("America/Thunder_Bay", tz);
+        timezones0.put("America/Toronto", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "America/Asuncion",
+           Calendar.OCTOBER, 3, Calendar.SUNDAY, 0 * 3600,
+           Calendar.MARCH, 2, Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("America/Asuncion", tz);
+        tz = new SimpleTimeZone(-4000 * 3600, "PRT");
+        timezones0.put("PRT", tz);
+        timezones0.put("America/Anguilla", tz);
+        timezones0.put("America/Antigua", tz);
+        timezones0.put("America/Aruba", tz);
+        timezones0.put("America/Barbados", tz);
+        timezones0.put("America/Blanc-Sablon", tz);
+        timezones0.put("America/Boa_Vista", tz);
+        timezones0.put("America/Caracas", tz);
+        timezones0.put("America/Curacao", tz);
+        timezones0.put("America/Dominica", tz);
+        timezones0.put("America/Grenada", tz);
+        timezones0.put("America/Guadeloupe", tz);
+        timezones0.put("America/Guyana", tz);
+        timezones0.put("America/La_Paz", tz);
+        timezones0.put("America/Manaus", tz);
+        timezones0.put("America/Martinique", tz);
+        timezones0.put("America/Montserrat", tz);
+        timezones0.put("America/Port_of_Spain", tz);
+        timezones0.put("America/Porto_Velho", tz);
+        timezones0.put("America/Puerto_Rico", tz);
+        timezones0.put("America/Santo_Domingo", tz);
+        timezones0.put("America/St_Kitts", tz);
+        timezones0.put("America/St_Lucia", tz);
+        timezones0.put("America/St_Thomas", tz);
+        timezones0.put("America/St_Vincent", tz);
+        timezones0.put("America/Tortola", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "America/Campo_Grande",
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("America/Campo_Grande", tz);
+        timezones0.put("America/Cuiaba", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "America/Goose_Bay",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 60000,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);
+        timezones0.put("America/Goose_Bay", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "America/Glace_Bay",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Glace_Bay", tz);
+        timezones0.put("America/Halifax", tz);
+        timezones0.put("America/Moncton", tz);
+        timezones0.put("America/Thule", tz);
+        timezones0.put("Atlantic/Bermuda", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "America/Santiago",
+           Calendar.OCTOBER, 9, -Calendar.SUNDAY, 0 * 3600,
+           Calendar.MARCH, 9, -Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("America/Santiago", tz);
+        timezones0.put("Antarctica/Palmer", tz);
+        tz = new SimpleTimeZone
+          (-4000 * 3600, "Atlantic/Stanley",
+           Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.APRIL, 3, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("Atlantic/Stanley", tz);
+        tz = new SimpleTimeZone
+          (-3500 * 3600, "CNT",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 60000,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 60000);
+        timezones0.put("CNT", tz);
+        timezones0.put("America/St_Johns", tz);
+        tz = new SimpleTimeZone
+          (-3000 * 3600, "America/Godthab",
+           Calendar.MARCH, 30, -Calendar.SATURDAY, 22000 * 3600,
+           Calendar.OCTOBER, 30, -Calendar.SATURDAY, 23000 * 3600);
+        timezones0.put("America/Godthab", tz);
+        tz = new SimpleTimeZone
+          (-3000 * 3600, "America/Miquelon",
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Miquelon", tz);
+        tz = new SimpleTimeZone
+          (-3000 * 3600, "America/Montevideo",
+           Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.MARCH, 2, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("America/Montevideo", tz);
+        tz = new SimpleTimeZone
+          (-3000 * 3600, "America/Sao_Paulo",
+           Calendar.NOVEMBER, 1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.FEBRUARY, -1, Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("America/Sao_Paulo", tz);
+        tz = new SimpleTimeZone(-3000 * 3600, "AGT");
+        timezones0.put("AGT", tz);
+        timezones0.put("America/Araguaina", tz);
+        timezones0.put("America/Argentina/Buenos_Aires", tz);
+        timezones0.put("America/Argentina/Catamarca", tz);
+        timezones0.put("America/Argentina/Cordoba", tz);
+        timezones0.put("America/Argentina/Jujuy", tz);
+        timezones0.put("America/Argentina/La_Rioja", tz);
+        timezones0.put("America/Argentina/Mendoza", tz);
+        timezones0.put("America/Argentina/Rio_Gallegos", tz);
+        timezones0.put("America/Argentina/San_Juan", tz);
+        timezones0.put("America/Argentina/Tucuman", tz);
+        timezones0.put("America/Argentina/Ushuaia", tz);
+        timezones0.put("America/Bahia", tz);
+        timezones0.put("America/Belem", tz);
+        timezones0.put("America/Cayenne", tz);
+        timezones0.put("America/Fortaleza", tz);
+        timezones0.put("America/Maceio", tz);
+        timezones0.put("America/Paramaribo", tz);
+        timezones0.put("America/Recife", tz);
+        timezones0.put("Antarctica/Rothera", tz);
+        tz = new SimpleTimeZone(-2000 * 3600, "America/Noronha");
+        timezones0.put("America/Noronha", tz);
+        timezones0.put("Atlantic/South_Georgia", tz);
+        tz = new SimpleTimeZone
+          (-1000 * 3600, "America/Scoresbysund",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 1000 * 3600);
+        timezones0.put("America/Scoresbysund", tz);
+        timezones0.put("Atlantic/Azores", tz);
+        tz = new SimpleTimeZone(-1000 * 3600, "Atlantic/Cape_Verde");
+        timezones0.put("Atlantic/Cape_Verde", tz);
+        tz = new SimpleTimeZone(0 * 3600, "GMT");
+        timezones0.put("GMT", tz);
+        timezones0.put("UTC", tz);
+        timezones0.put("Africa/Abidjan", tz);
+        timezones0.put("Africa/Accra", tz);
+        timezones0.put("Africa/Bamako", tz);
+        timezones0.put("Africa/Banjul", tz);
+        timezones0.put("Africa/Bissau", tz);
+        timezones0.put("Africa/Casablanca", tz);
+        timezones0.put("Africa/Conakry", tz);
+        timezones0.put("Africa/Dakar", tz);
+        timezones0.put("Africa/El_Aaiun", tz);
+        timezones0.put("Africa/Freetown", tz);
+        timezones0.put("Africa/Lome", tz);
+        timezones0.put("Africa/Monrovia", tz);
+        timezones0.put("Africa/Nouakchott", tz);
+        timezones0.put("Africa/Ouagadougou", tz);
+        timezones0.put("Africa/Sao_Tome", tz);
+        timezones0.put("America/Danmarkshavn", tz);
+        timezones0.put("Atlantic/Reykjavik", tz);
+        timezones0.put("Atlantic/St_Helena", tz);
+        tz = new SimpleTimeZone
+          (0 * 3600, "WET",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 1000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("WET", tz);
+        timezones0.put("Atlantic/Canary", tz);
+        timezones0.put("Atlantic/Faroe", tz);
+        timezones0.put("Atlantic/Madeira", tz);
+        timezones0.put("Europe/Dublin", tz);
+        timezones0.put("Europe/Guernsey", tz);
+        timezones0.put("Europe/Isle_of_Man", tz);
+        timezones0.put("Europe/Jersey", tz);
+        timezones0.put("Europe/Lisbon", tz);
+        timezones0.put("Europe/London", tz);
+        tz = new SimpleTimeZone(1000 * 3600, "Africa/Algiers");
+        timezones0.put("Africa/Algiers", tz);
+        timezones0.put("Africa/Bangui", tz);
+        timezones0.put("Africa/Brazzaville", tz);
+        timezones0.put("Africa/Douala", tz);
+        timezones0.put("Africa/Kinshasa", tz);
+        timezones0.put("Africa/Lagos", tz);
+        timezones0.put("Africa/Libreville", tz);
+        timezones0.put("Africa/Luanda", tz);
+        timezones0.put("Africa/Malabo", tz);
+        timezones0.put("Africa/Ndjamena", tz);
+        timezones0.put("Africa/Niamey", tz);
+        timezones0.put("Africa/Porto-Novo", tz);
+        tz = new SimpleTimeZone
+          (1000 * 3600, "Africa/Windhoek",
+           Calendar.SEPTEMBER, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.APRIL, 1, Calendar.SUNDAY, 2000 * 3600);
+        timezones0.put("Africa/Windhoek", tz);
+        tz = new SimpleTimeZone
+          (1000 * 3600, "CET",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("CET", tz);
+        timezones0.put("ECT", tz);
+        timezones0.put("MET", tz);
+        timezones0.put("Africa/Ceuta", tz);
+        timezones0.put("Africa/Tunis", tz);
+        timezones0.put("Arctic/Longyearbyen", tz);
+        timezones0.put("Atlantic/Jan_Mayen", tz);
+        timezones0.put("Europe/Amsterdam", tz);
+        timezones0.put("Europe/Andorra", tz);
+        timezones0.put("Europe/Belgrade", tz);
+        timezones0.put("Europe/Berlin", tz);
+        timezones0.put("Europe/Bratislava", tz);
+        timezones0.put("Europe/Brussels", tz);
+        timezones0.put("Europe/Budapest", tz);
+        timezones0.put("Europe/Copenhagen", tz);
+        timezones0.put("Europe/Gibraltar", tz);
+        timezones0.put("Europe/Ljubljana", tz);
+        timezones0.put("Europe/Luxembourg", tz);
+        timezones0.put("Europe/Madrid", tz);
+        timezones0.put("Europe/Malta", tz);
+        timezones0.put("Europe/Monaco", tz);
+        timezones0.put("Europe/Oslo", tz);
+        timezones0.put("Europe/Paris", tz);
+        timezones0.put("Europe/Podgorica", tz);
+        timezones0.put("Europe/Prague", tz);
+        timezones0.put("Europe/Rome", tz);
+        timezones0.put("Europe/San_Marino", tz);
+        timezones0.put("Europe/Sarajevo", tz);
+        timezones0.put("Europe/Skopje", tz);
+        timezones0.put("Europe/Stockholm", tz);
+        timezones0.put("Europe/Tirane", tz);
+        timezones0.put("Europe/Vaduz", tz);
+        timezones0.put("Europe/Vatican", tz);
+        timezones0.put("Europe/Vienna", tz);
+        timezones0.put("Europe/Warsaw", tz);
+        timezones0.put("Europe/Zagreb", tz);
+        timezones0.put("Europe/Zurich", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "ART",
+           Calendar.APRIL, -1, Calendar.FRIDAY, 0 * 3600,
+           Calendar.SEPTEMBER, -1, Calendar.THURSDAY, 24000 * 3600);
+        timezones0.put("ART", tz);
+        timezones0.put("Africa/Cairo", tz);
+        tz = new SimpleTimeZone(2000 * 3600, "CAT");
+        timezones0.put("CAT", tz);
+        timezones0.put("Africa/Blantyre", tz);
+        timezones0.put("Africa/Bujumbura", tz);
+        timezones0.put("Africa/Gaborone", tz);
+        timezones0.put("Africa/Harare", tz);
+        timezones0.put("Africa/Johannesburg", tz);
+        timezones0.put("Africa/Kigali", tz);
+        timezones0.put("Africa/Lubumbashi", tz);
+        timezones0.put("Africa/Lusaka", tz);
+        timezones0.put("Africa/Maputo", tz);
+        timezones0.put("Africa/Maseru", tz);
+        timezones0.put("Africa/Mbabane", tz);
+        timezones0.put("Africa/Tripoli", tz);
+        timezones0.put("Asia/Jerusalem", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "Asia/Amman",
+           Calendar.MARCH, -1, Calendar.THURSDAY, 0 * 3600,
+           Calendar.OCTOBER, -1, Calendar.FRIDAY, 1000 * 3600);
+        timezones0.put("Asia/Amman", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "Asia/Beirut",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 0 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 0 * 3600);
+        timezones0.put("Asia/Beirut", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "Asia/Damascus",
+           Calendar.APRIL, 1, 0, 0 * 3600,
+           Calendar.OCTOBER, 1, 0, 0 * 3600);
+        timezones0.put("Asia/Damascus", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "Asia/Gaza",
+           Calendar.APRIL, 1, 0, 0 * 3600,
+           Calendar.OCTOBER, 3, Calendar.FRIDAY, 0 * 3600);
+        timezones0.put("Asia/Gaza", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "EET",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 4000 * 3600);
+        timezones0.put("EET", tz);
+        timezones0.put("Asia/Istanbul", tz);
+        timezones0.put("Asia/Nicosia", tz);
+        timezones0.put("Europe/Athens", tz);
+        timezones0.put("Europe/Bucharest", tz);
+        timezones0.put("Europe/Chisinau", tz);
+        timezones0.put("Europe/Helsinki", tz);
+        timezones0.put("Europe/Istanbul", tz);
+        timezones0.put("Europe/Kiev", tz);
+        timezones0.put("Europe/Mariehamn", tz);
+        timezones0.put("Europe/Nicosia", tz);
+        timezones0.put("Europe/Riga", tz);
+        timezones0.put("Europe/Simferopol", tz);
+        timezones0.put("Europe/Sofia", tz);
+        timezones0.put("Europe/Tallinn", tz);
+        timezones0.put("Europe/Uzhgorod", tz);
+        timezones0.put("Europe/Vilnius", tz);
+        timezones0.put("Europe/Zaporozhye", tz);
+        tz = new SimpleTimeZone
+          (2000 * 3600, "Europe/Kaliningrad",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Europe/Kaliningrad", tz);
+        timezones0.put("Europe/Minsk", tz);
+        tz = new SimpleTimeZone
+          (3000 * 3600, "Asia/Baghdad",
+           Calendar.APRIL, 1, 0, 3000 * 3600,
+           Calendar.OCTOBER, 1, 0, 4000 * 3600);
+        timezones0.put("Asia/Baghdad", tz);
+        tz = new SimpleTimeZone
+          (3000 * 3600, "Europe/Moscow",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Europe/Moscow", tz);
+        timezones0.put("Europe/Volgograd", tz);
+        tz = new SimpleTimeZone(3000 * 3600, "EAT");
+        timezones0.put("EAT", tz);
+        timezones0.put("Africa/Addis_Ababa", tz);
+        timezones0.put("Africa/Asmara", tz);
+        timezones0.put("Africa/Dar_es_Salaam", tz);
+        timezones0.put("Africa/Djibouti", tz);
+        timezones0.put("Africa/Kampala", tz);
+        timezones0.put("Africa/Khartoum", tz);
+        timezones0.put("Africa/Mogadishu", tz);
+        timezones0.put("Africa/Nairobi", tz);
+        timezones0.put("Antarctica/Syowa", tz);
+        timezones0.put("Asia/Aden", tz);
+        timezones0.put("Asia/Bahrain", tz);
+        timezones0.put("Asia/Kuwait", tz);
+        timezones0.put("Asia/Qatar", tz);
+        timezones0.put("Asia/Riyadh", tz);
+        timezones0.put("Indian/Antananarivo", tz);
+        timezones0.put("Indian/Comoro", tz);
+        timezones0.put("Indian/Mayotte", tz);
+        tz = new SimpleTimeZone(3500 * 3600, "Asia/Tehran");
+        timezones0.put("Asia/Tehran", tz);
+        tz = new SimpleTimeZone
+          (4000 * 3600, "Asia/Baku",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 4000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 5000 * 3600);
+        timezones0.put("Asia/Baku", tz);
+        tz = new SimpleTimeZone
+          (4000 * 3600, "Asia/Yerevan",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Yerevan", tz);
+        timezones0.put("Europe/Samara", tz);
+        tz = new SimpleTimeZone(4000 * 3600, "NET");
+        timezones0.put("NET", tz);
+        timezones0.put("Asia/Dubai", tz);
+        timezones0.put("Asia/Muscat", tz);
+        timezones0.put("Asia/Tbilisi", tz);
+        timezones0.put("Indian/Mahe", tz);
+        timezones0.put("Indian/Mauritius", tz);
+        timezones0.put("Indian/Reunion", tz);
+        tz = new SimpleTimeZone(4500 * 3600, "Asia/Kabul");
+        timezones0.put("Asia/Kabul", tz);
+        tz = new SimpleTimeZone
+          (5000 * 3600, "Asia/Yekaterinburg",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Yekaterinburg", tz);
+        tz = new SimpleTimeZone(5000 * 3600, "PLT");
+        timezones0.put("PLT", tz);
+        timezones0.put("Asia/Aqtau", tz);
+        timezones0.put("Asia/Aqtobe", tz);
+        timezones0.put("Asia/Ashgabat", tz);
+        timezones0.put("Asia/Dushanbe", tz);
+        timezones0.put("Asia/Karachi", tz);
+        timezones0.put("Asia/Oral", tz);
+        timezones0.put("Asia/Samarkand", tz);
+        timezones0.put("Asia/Tashkent", tz);
+        timezones0.put("Indian/Kerguelen", tz);
+        timezones0.put("Indian/Maldives", tz);
+        tz = new SimpleTimeZone(5500 * 3600, "BST");
+        timezones0.put("BST", tz);
+        timezones0.put("IST", tz);
+        timezones0.put("Asia/Calcutta", tz);
+        timezones0.put("Asia/Colombo", tz);
+        tz = new SimpleTimeZone(5750 * 3600, "Asia/Katmandu");
+        timezones0.put("Asia/Katmandu", tz);
+        tz = new SimpleTimeZone(6000 * 3600, "Antarctica/Mawson");
+        timezones0.put("Antarctica/Mawson", tz);
+        timezones0.put("Antarctica/Vostok", tz);
+        timezones0.put("Asia/Almaty", tz);
+        timezones0.put("Asia/Bishkek", tz);
+        timezones0.put("Asia/Dhaka", tz);
+        timezones0.put("Asia/Qyzylorda", tz);
+        timezones0.put("Asia/Thimphu", tz);
+        timezones0.put("Indian/Chagos", tz);
+        tz = new SimpleTimeZone
+          (6000 * 3600, "Asia/Novosibirsk",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Novosibirsk", tz);
+        timezones0.put("Asia/Omsk", tz);
+        tz = new SimpleTimeZone(6500 * 3600, "Asia/Rangoon");
+        timezones0.put("Asia/Rangoon", tz);
+        timezones0.put("Indian/Cocos", tz);
+        tz = new SimpleTimeZone(7000 * 3600, "VST");
+        timezones0.put("VST", tz);
+        timezones0.put("Antarctica/Davis", tz);
+        timezones0.put("Asia/Bangkok", tz);
+        timezones0.put("Asia/Jakarta", tz);
+        timezones0.put("Asia/Phnom_Penh", tz);
+        timezones0.put("Asia/Pontianak", tz);
+        timezones0.put("Asia/Saigon", tz);
+        timezones0.put("Asia/Vientiane", tz);
+        timezones0.put("Indian/Christmas", tz);
+        tz = new SimpleTimeZone
+          (7000 * 3600, "Asia/Hovd",
+           Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
+           Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
+        timezones0.put("Asia/Hovd", tz);
+        tz = new SimpleTimeZone
+          (7000 * 3600, "Asia/Krasnoyarsk",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Krasnoyarsk", tz);
+        tz = new SimpleTimeZone(8000 * 3600, "CTT");
+        timezones0.put("CTT", tz);
+        timezones0.put("Antarctica/Casey", tz);
+        timezones0.put("Asia/Brunei", tz);
+        timezones0.put("Asia/Chongqing", tz);
+        timezones0.put("Asia/Harbin", tz);
+        timezones0.put("Asia/Hong_Kong", tz);
+        timezones0.put("Asia/Kashgar", tz);
+        timezones0.put("Asia/Kuala_Lumpur", tz);
+        timezones0.put("Asia/Kuching", tz);
+        timezones0.put("Asia/Macau", tz);
+        timezones0.put("Asia/Makassar", tz);
+        timezones0.put("Asia/Manila", tz);
+        timezones0.put("Asia/Shanghai", tz);
+        timezones0.put("Asia/Singapore", tz);
+        timezones0.put("Asia/Taipei", tz);
+        timezones0.put("Asia/Urumqi", tz);
+        timezones0.put("Australia/Perth", tz);
+        tz = new SimpleTimeZone
+          (8000 * 3600, "Asia/Irkutsk",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Irkutsk", tz);
+        tz = new SimpleTimeZone
+          (8000 * 3600, "Asia/Ulaanbaatar",
+           Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
+           Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
+        timezones0.put("Asia/Ulaanbaatar", tz);
+        tz = new SimpleTimeZone(8750 * 3600, "Australia/Eucla");
+        timezones0.put("Australia/Eucla", tz);
+        tz = new SimpleTimeZone
+          (9000 * 3600, "Asia/Choibalsan",
+           Calendar.MARCH, -1, Calendar.SATURDAY, 2000 * 3600,
+           Calendar.SEPTEMBER, -1, Calendar.SATURDAY, 2000 * 3600);
+        timezones0.put("Asia/Choibalsan", tz);
+        tz = new SimpleTimeZone(9000 * 3600, "JST");
+        timezones0.put("JST", tz);
+        timezones0.put("Asia/Dili", tz);
+        timezones0.put("Asia/Jayapura", tz);
+        timezones0.put("Asia/Pyongyang", tz);
+        timezones0.put("Asia/Seoul", tz);
+        timezones0.put("Asia/Tokyo", tz);
+        timezones0.put("Pacific/Palau", tz);
+        tz = new SimpleTimeZone
+          (9000 * 3600, "Asia/Yakutsk",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Yakutsk", tz);
+        tz = new SimpleTimeZone
+          (9500 * 3600, "Australia/Adelaide",
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Australia/Adelaide", tz);
+        timezones0.put("Australia/Broken_Hill", tz);
+        tz = new SimpleTimeZone(9500 * 3600, "ACT");
+        timezones0.put("ACT", tz);
+        timezones0.put("Australia/Darwin", tz);
+        tz = new SimpleTimeZone(10000 * 3600, "Antarctica/DumontDUrville");
+        timezones0.put("Antarctica/DumontDUrville", tz);
+        timezones0.put("Australia/Brisbane", tz);
+        timezones0.put("Australia/Lindeman", tz);
+        timezones0.put("Pacific/Guam", tz);
+        timezones0.put("Pacific/Port_Moresby", tz);
+        timezones0.put("Pacific/Saipan", tz);
+        timezones0.put("Pacific/Truk", tz);
+        tz = new SimpleTimeZone
+          (10000 * 3600, "Asia/Sakhalin",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Sakhalin", tz);
+        timezones0.put("Asia/Vladivostok", tz);
+        tz = new SimpleTimeZone
+          (10000 * 3600, "Australia/Currie",
+           Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Australia/Currie", tz);
+        timezones0.put("Australia/Hobart", tz);
+        tz = new SimpleTimeZone
+          (10000 * 3600, "AET",
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.MARCH, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("AET", tz);
+        timezones0.put("Australia/Melbourne", tz);
+        timezones0.put("Australia/Sydney", tz);
+        tz = new SimpleTimeZone
+          (10500 * 3600, "Australia/Lord_Howe",
+          Calendar.OCTOBER, -1, Calendar.SUNDAY, 2000 * 3600,
+          Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600, 500 * 3600);
+        timezones0.put("Australia/Lord_Howe", tz);
+        tz = new SimpleTimeZone
+          (11000 * 3600, "Asia/Magadan",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Magadan", tz);
+        tz = new SimpleTimeZone(11000 * 3600, "SST");
+        timezones0.put("SST", tz);
+        timezones0.put("Pacific/Efate", tz);
+        timezones0.put("Pacific/Guadalcanal", tz);
+        timezones0.put("Pacific/Kosrae", tz);
+        timezones0.put("Pacific/Noumea", tz);
+        timezones0.put("Pacific/Ponape", tz);
+        tz = new SimpleTimeZone(11500 * 3600, "Pacific/Norfolk");
+        timezones0.put("Pacific/Norfolk", tz);
+        tz = new SimpleTimeZone
+          (12000 * 3600, "NST",
+           Calendar.OCTOBER, 1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.MARCH, 3, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("NST", tz);
+        timezones0.put("Antarctica/McMurdo", tz);
+        timezones0.put("Antarctica/South_Pole", tz);
+        timezones0.put("Pacific/Auckland", tz);
+        tz = new SimpleTimeZone
+          (12000 * 3600, "Asia/Anadyr",
+           Calendar.MARCH, -1, Calendar.SUNDAY, 2000 * 3600,
+           Calendar.OCTOBER, -1, Calendar.SUNDAY, 3000 * 3600);
+        timezones0.put("Asia/Anadyr", tz);
+        timezones0.put("Asia/Kamchatka", tz);
+        tz = new SimpleTimeZone(12000 * 3600, "Pacific/Fiji");
+        timezones0.put("Pacific/Fiji", tz);
+        timezones0.put("Pacific/Funafuti", tz);
+        timezones0.put("Pacific/Kwajalein", tz);
+        timezones0.put("Pacific/Majuro", tz);
+        timezones0.put("Pacific/Nauru", tz);
+        timezones0.put("Pacific/Tarawa", tz);
+        timezones0.put("Pacific/Wake", tz);
+        timezones0.put("Pacific/Wallis", tz);
+        tz = new SimpleTimeZone
+          (12750 * 3600, "Pacific/Chatham",
+           Calendar.OCTOBER, 1, Calendar.SUNDAY, 2750 * 3600,
+           Calendar.MARCH, 3, Calendar.SUNDAY, 3750 * 3600);
+        timezones0.put("Pacific/Chatham", tz);
+        tz = new SimpleTimeZone(13000 * 3600, "Pacific/Enderbury");
+        timezones0.put("Pacific/Enderbury", tz);
+        timezones0.put("Pacific/Tongatapu", tz);
+        tz = new SimpleTimeZone(14000 * 3600, "Pacific/Kiritimati");
+        timezones0.put("Pacific/Kiritimati", tz);
       }
     return timezones0;
   }
@@ -909,7 +909,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
    * with the result of System.getProperty("user.timezone")
    * or getDefaultTimeZoneId().  Note that giving one of
    * the standard tz data names from ftp://elsie.nci.nih.gov/pub/ is
-   * preferred.  
+   * preferred.
    * The time zone name can be given as follows:
    * (standard zone name)[(GMT offset)[(DST zone name)[DST offset]]]
    * 
@@ -954,175 +954,175 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     int dstOffs;
     try
       {
-	int idLength = sysTimeZoneId.length();
+        int idLength = sysTimeZoneId.length();
 
-	int index = 0;
-	int prevIndex;
-	char c;
+        int index = 0;
+        int prevIndex;
+        char c;
 
-	// get std
-	do
-	  c = sysTimeZoneId.charAt(index);
-	while (c != '+' && c != '-' && c != ',' && c != ':'
-	       && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
+        // get std
+        do
+          c = sysTimeZoneId.charAt(index);
+        while (c != '+' && c != '-' && c != ',' && c != ':'
+               && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
 
-	if (index >= idLength)
-	  return getTimeZoneInternal(sysTimeZoneId);
+        if (index >= idLength)
+          return getTimeZoneInternal(sysTimeZoneId);
 
-	stdName = sysTimeZoneId.substring(0, index);
-	prevIndex = index;
+        stdName = sysTimeZoneId.substring(0, index);
+        prevIndex = index;
 
-	// get the std offset
-	do
-	  c = sysTimeZoneId.charAt(index++);
-	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
-	       && index < idLength);
-	if (index < idLength)
-	  index--;
+        // get the std offset
+        do
+          c = sysTimeZoneId.charAt(index++);
+        while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+               && index < idLength);
+        if (index < idLength)
+          index--;
 
-	{ // convert the dst string to a millis number
-	    String offset = sysTimeZoneId.substring(prevIndex, index);
-	    prevIndex = index;
+        { // convert the dst string to a millis number
+            String offset = sysTimeZoneId.substring(prevIndex, index);
+            prevIndex = index;
 
-	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
-	      stdOffs = parseTime(offset.substring(1));
-	    else
-	      stdOffs = parseTime(offset);
+            if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+              stdOffs = parseTime(offset.substring(1));
+            else
+              stdOffs = parseTime(offset);
 
-	    if (offset.charAt(0) == '-')
-	      stdOffs = -stdOffs;
+            if (offset.charAt(0) == '-')
+              stdOffs = -stdOffs;
 
-	    // TZ timezone offsets are positive when WEST of the meridian.
-	    stdOffs = -stdOffs;
-	}
+            // TZ timezone offsets are positive when WEST of the meridian.
+            stdOffs = -stdOffs;
+        }
 
-	// Done yet? (Format: std offset)
-	if (index >= idLength)
-	  {
-	    // Do we have an existing timezone with that name and offset?
-	    TimeZone tz = getTimeZoneInternal(stdName);
-	    if (tz != null)
-	      if (tz.getRawOffset() == stdOffs)
-		return tz;
+        // Done yet? (Format: std offset)
+        if (index >= idLength)
+          {
+            // Do we have an existing timezone with that name and offset?
+            TimeZone tz = getTimeZoneInternal(stdName);
+            if (tz != null)
+              if (tz.getRawOffset() == stdOffs)
+                return tz;
 
-	    // Custom then.
-	    return new SimpleTimeZone(stdOffs, stdName);
-	  }
+            // Custom then.
+            return new SimpleTimeZone(stdOffs, stdName);
+          }
 
-	// get dst
-	do
-	  c = sysTimeZoneId.charAt(index);
-	while (c != '+' && c != '-' && c != ',' && c != ':'
-	       && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
+        // get dst
+        do
+          c = sysTimeZoneId.charAt(index);
+        while (c != '+' && c != '-' && c != ',' && c != ':'
+               && ! Character.isDigit(c) && c != '\0' && ++index < idLength);
 
-	// Done yet? (Format: std offset dst)
-	if (index >= idLength)
-	  {
-	    // Do we have an existing timezone with that name and offset 
-	    // which has DST?
-	    TimeZone tz = getTimeZoneInternal(stdName);
-	    if (tz != null)
-	      if (tz.getRawOffset() == stdOffs && tz.useDaylightTime())
-		return tz;
+        // Done yet? (Format: std offset dst)
+        if (index >= idLength)
+          {
+            // Do we have an existing timezone with that name and offset
+            // which has DST?
+            TimeZone tz = getTimeZoneInternal(stdName);
+            if (tz != null)
+              if (tz.getRawOffset() == stdOffs && tz.useDaylightTime())
+                return tz;
 
-	    // Custom then.
-	    return new SimpleTimeZone(stdOffs, stdName);
-	  }
+            // Custom then.
+            return new SimpleTimeZone(stdOffs, stdName);
+          }
 
-	// get the dst offset
-	prevIndex = index;
-	do
-	  c = sysTimeZoneId.charAt(index++);
-	while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
-	       && index < idLength);
-	if (index < idLength)
-	  index--;
+        // get the dst offset
+        prevIndex = index;
+        do
+          c = sysTimeZoneId.charAt(index++);
+        while ((c == '-' || c == '+' || c == ':' || Character.isDigit(c))
+               && index < idLength);
+        if (index < idLength)
+          index--;
 
-	if (index == prevIndex && (c == ',' || c == ';'))
-	  {
-	    // Missing dst offset defaults to one hour ahead of standard
-	    // time.  
-	    dstOffs = stdOffs + 60 * 60 * 1000;
-	  }
-	else
-	  { // convert the dst string to a millis number
-	    String offset = sysTimeZoneId.substring(prevIndex, index);
-	    prevIndex = index;
+        if (index == prevIndex && (c == ',' || c == ';'))
+          {
+            // Missing dst offset defaults to one hour ahead of standard
+            // time.
+            dstOffs = stdOffs + 60 * 60 * 1000;
+          }
+        else
+          { // convert the dst string to a millis number
+            String offset = sysTimeZoneId.substring(prevIndex, index);
+            prevIndex = index;
 
-	    if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
-	      dstOffs = parseTime(offset.substring(1));
-	    else
-	      dstOffs = parseTime(offset);
+            if (offset.charAt(0) == '+' || offset.charAt(0) == '-')
+              dstOffs = parseTime(offset.substring(1));
+            else
+              dstOffs = parseTime(offset);
 
-	    if (offset.charAt(0) == '-')
-	      dstOffs = -dstOffs;
+            if (offset.charAt(0) == '-')
+              dstOffs = -dstOffs;
 
-	    // TZ timezone offsets are positive when WEST of the meridian.
-	    dstOffs = -dstOffs;
-	  }
+            // TZ timezone offsets are positive when WEST of the meridian.
+            dstOffs = -dstOffs;
+          }
 
-	// Done yet? (Format: std offset dst offset)
-	// FIXME: We don't support DST without a rule given. Should we?
-	if (index >= idLength)
-	  {
-	    // Time Zone existing with same name, dst and offsets?
-	    TimeZone tz = getTimeZoneInternal(stdName);
-	    if (tz != null)
-	      if (tz.getRawOffset() == stdOffs && tz.useDaylightTime()
-	          && tz.getDSTSavings() == (dstOffs - stdOffs))
-		return tz;
+        // Done yet? (Format: std offset dst offset)
+        // FIXME: We don't support DST without a rule given. Should we?
+        if (index >= idLength)
+          {
+            // Time Zone existing with same name, dst and offsets?
+            TimeZone tz = getTimeZoneInternal(stdName);
+            if (tz != null)
+              if (tz.getRawOffset() == stdOffs && tz.useDaylightTime()
+                  && tz.getDSTSavings() == (dstOffs - stdOffs))
+                return tz;
 
-	    return new SimpleTimeZone(stdOffs, stdName);
-	  }
+            return new SimpleTimeZone(stdOffs, stdName);
+          }
 
-	// get the DST rule
-	if (sysTimeZoneId.charAt(index) == ','
-	    || sysTimeZoneId.charAt(index) == ';')
-	  {
-	    index++;
-	    int offs = index;
-	    while (sysTimeZoneId.charAt(index) != ','
-	           && sysTimeZoneId.charAt(index) != ';')
-	      index++;
-	    String startTime = sysTimeZoneId.substring(offs, index);
-	    index++;
-	    String endTime = sysTimeZoneId.substring(index);
+        // get the DST rule
+        if (sysTimeZoneId.charAt(index) == ','
+            || sysTimeZoneId.charAt(index) == ';')
+          {
+            index++;
+            int offs = index;
+            while (sysTimeZoneId.charAt(index) != ','
+                   && sysTimeZoneId.charAt(index) != ';')
+              index++;
+            String startTime = sysTimeZoneId.substring(offs, index);
+            index++;
+            String endTime = sysTimeZoneId.substring(index);
 
-	    index = startTime.indexOf('/');
-	    int startMillis;
-	    int endMillis;
-	    String startDate;
-	    String endDate;
-	    if (index != -1)
-	      {
-		startDate = startTime.substring(0, index);
-		startMillis = parseTime(startTime.substring(index + 1));
-	      }
-	    else
-	      {
-		startDate = startTime;
-		// if time isn't given, default to 2:00:00 AM.
-		startMillis = 2 * 60 * 60 * 1000;
-	      }
-	    index = endTime.indexOf('/');
-	    if (index != -1)
-	      {
-		endDate = endTime.substring(0, index);
-		endMillis = parseTime(endTime.substring(index + 1));
-	      }
-	    else
-	      {
-		endDate = endTime;
-		// if time isn't given, default to 2:00:00 AM.
-		endMillis = 2 * 60 * 60 * 1000;
-	      }
+            index = startTime.indexOf('/');
+            int startMillis;
+            int endMillis;
+            String startDate;
+            String endDate;
+            if (index != -1)
+              {
+                startDate = startTime.substring(0, index);
+                startMillis = parseTime(startTime.substring(index + 1));
+              }
+            else
+              {
+                startDate = startTime;
+                // if time isn't given, default to 2:00:00 AM.
+                startMillis = 2 * 60 * 60 * 1000;
+              }
+            index = endTime.indexOf('/');
+            if (index != -1)
+              {
+                endDate = endTime.substring(0, index);
+                endMillis = parseTime(endTime.substring(index + 1));
+              }
+            else
+              {
+                endDate = endTime;
+                // if time isn't given, default to 2:00:00 AM.
+                endMillis = 2 * 60 * 60 * 1000;
+              }
 
-	    int[] start = getDateParams(startDate);
-	    int[] end = getDateParams(endDate);
-	    return new SimpleTimeZone(stdOffs, stdName, start[0], start[1],
-	                              start[2], startMillis, end[0], end[1],
-	                              end[2], endMillis, (dstOffs - stdOffs));
-	  }
+            int[] start = getDateParams(startDate);
+            int[] end = getDateParams(endDate);
+            return new SimpleTimeZone(stdOffs, stdName, start[0], start[1],
+                                      start[2], startMillis, end[0], end[1],
+                                      end[2], endMillis, (dstOffs - stdOffs));
+          }
       }
 
     // FIXME: Produce a warning here?
@@ -1148,50 +1148,50 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 
     if (date.charAt(0) == 'M' || date.charAt(0) == 'm')
       {
-	int day;
+        int day;
 
-	// Month, week of month, day of week
+        // Month, week of month, day of week
 
-	// "Mm.w.d".  d is between 0 (Sunday) and 6.  Week w is
-	// between 1 and 5; Week 1 is the first week in which day d
-	// occurs and Week 5 specifies the last d day in the month.
-	// Month m is between 1 and 12.
+        // "Mm.w.d".  d is between 0 (Sunday) and 6.  Week w is
+        // between 1 and 5; Week 1 is the first week in which day d
+        // occurs and Week 5 specifies the last d day in the month.
+        // Month m is between 1 and 12.
 
-	month = Integer.parseInt(date.substring(1, date.indexOf('.')));
-	int week = Integer.parseInt(date.substring(date.indexOf('.') + 1,
-	                                           date.lastIndexOf('.')));
-	int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.')
-	                                                + 1));
-	dayOfWeek++; // Java day of week is one-based, Sunday is first day.
+        month = Integer.parseInt(date.substring(1, date.indexOf('.')));
+        int week = Integer.parseInt(date.substring(date.indexOf('.') + 1,
+                                                   date.lastIndexOf('.')));
+        int dayOfWeek = Integer.parseInt(date.substring(date.lastIndexOf('.')
+                                                        + 1));
+        dayOfWeek++; // Java day of week is one-based, Sunday is first day.
 
- 	if (week == 5)
- 	  day = -1; // last day of month is -1 in java, 5 in TZ
- 	else
-	  {
-	    // First day of week starting on or after.  For example,
-	    // to specify the second Sunday of April, set month to
-	    // APRIL, day-of-month to 8, and day-of-week to -SUNDAY.
-	    day = (week - 1) * 7 + 1;
-	    dayOfWeek = -dayOfWeek;
-	  }
+        if (week == 5)
+          day = -1; // last day of month is -1 in java, 5 in TZ
+        else
+          {
+            // First day of week starting on or after.  For example,
+            // to specify the second Sunday of April, set month to
+            // APRIL, day-of-month to 8, and day-of-week to -SUNDAY.
+            day = (week - 1) * 7 + 1;
+            dayOfWeek = -dayOfWeek;
+          }
 
-	month--; // Java month is zero-based.
-	return new int[] { month, day, dayOfWeek };
+        month--; // Java month is zero-based.
+        return new int[] { month, day, dayOfWeek };
       }
 
     // julian day, either zero-based 0<=n<=365 (incl feb 29)
     // or one-based 1<=n<=365 (no feb 29)
-    int julianDay; // Julian day, 
+    int julianDay; // Julian day,
 
     if (date.charAt(0) != 'J' || date.charAt(0) != 'j')
       {
-	julianDay = Integer.parseInt(date.substring(1));
-	julianDay++; // make 1-based
-	// Adjust day count to include feb 29.
-	dayCount = new int[]
-	           {
-	             0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335
-	           };
+        julianDay = Integer.parseInt(date.substring(1));
+        julianDay++; // make 1-based
+        // Adjust day count to include feb 29.
+        dayCount = new int[]
+                   {
+                     0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335
+                   };
       }
     else
       // 1-based julian day
@@ -1200,9 +1200,9 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     int i = 11;
     while (i > 0)
       if (dayCount[i] < julianDay)
-	break;
+        break;
       else
-	i--;
+        i--;
     julianDay -= dayCount[i];
     month = i;
     return new int[] { month, julianDay, 0 };
@@ -1219,9 +1219,9 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 
     while (i < time.length())
       if (time.charAt(i) == ':')
-	break;
+        break;
       else
-	i++;
+        i++;
     millis = 60 * 60 * 1000 * Integer.parseInt(time.substring(0, i));
     if (i >= time.length())
       return millis;
@@ -1229,9 +1229,9 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     int iprev = ++i;
     while (i < time.length())
       if (time.charAt(i) == ':')
-	break;
+        break;
       else
-	i++;
+        i++;
     millis += 60 * 1000 * Integer.parseInt(time.substring(iprev, i));
     if (i >= time.length())
       return millis;
@@ -1241,7 +1241,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   }
 
   /**
-   * Gets the time zone offset, for current date, modified in case of 
+   * Gets the time zone offset, for current date, modified in case of
    * daylight savings.  This is the offset to add to UTC to get the local
    * time.
    * @param era the era of the given date
@@ -1253,7 +1253,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
    * @return the time zone offset in milliseconds.
    */
   public abstract int getOffset(int era, int year, int month,
-				int day, int dayOfWeek, int milliseconds);
+                                int day, int dayOfWeek, int milliseconds);
 
   /**
    * Get the time zone offset for the specified date, modified in case of
@@ -1269,11 +1269,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
             ? getRawOffset() + getDSTSavings()
             : getRawOffset());
   }
-  
+
   /**
    * Gets the time zone offset, ignoring daylight savings.  This is
    * the offset to add to UTC to get the local time.
-   * @return the time zone offset in milliseconds.  
+   * @return the time zone offset in milliseconds.
    */
   public abstract int getRawOffset();
 
@@ -1287,7 +1287,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   /**
    * Gets the identifier of this time zone. For instance, PST for
    * Pacific Standard Time.
-   * @returns the ID of this time zone.  
+   * @returns the ID of this time zone.
    */
   public String getID()
   {
@@ -1304,7 +1304,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   {
     if (id == null)
       throw new NullPointerException();
-    
+
     this.ID = id;
   }
 
@@ -1339,7 +1339,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   /**
    * This method returns a string name of the time zone suitable
    * for displaying to the user.  The string returned will be of the
-   * specified type in the current locale. 
+   * specified type in the current locale.
    *
    * @param dst Whether or not daylight savings time is in effect.
    * @param style LONG for a long name, SHORT for
@@ -1356,7 +1356,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   /**
    * This method returns a string name of the time zone suitable
    * for displaying to the user.  The string returned will be of the
-   * specified type in the specified locale. 
+   * specified type in the specified locale.
    *
    * @param dst Whether or not daylight savings time is in effect.
    * @param style LONG for a long name, SHORT for
@@ -1370,30 +1370,30 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     DateFormatSymbols dfs;
     try
       {
-	dfs = new DateFormatSymbols(locale);
+        dfs = new DateFormatSymbols(locale);
 
-	// The format of the value returned is defined by us.
-	String[][]zoneinfo = dfs.getZoneStrings();
-	for (int i = 0; i < zoneinfo.length; i++)
-	  {
-	    if (zoneinfo[i][0].equals(getID()))
-	      {
-		if (!dst)
-		  {
-		    if (style == SHORT)
-		      return (zoneinfo[i][2]);
-		    else
-		      return (zoneinfo[i][1]);
-		  }
-		else
-		  {
-		    if (style == SHORT)
-		      return (zoneinfo[i][4]);
-		    else
-		      return (zoneinfo[i][3]);
-		  }
-	      }
-	  }
+        // The format of the value returned is defined by us.
+        String[][]zoneinfo = dfs.getZoneStrings();
+        for (int i = 0; i < zoneinfo.length; i++)
+          {
+            if (zoneinfo[i][0].equals(getID()))
+              {
+                if (!dst)
+                  {
+                    if (style == SHORT)
+                      return (zoneinfo[i][2]);
+                    else
+                      return (zoneinfo[i][1]);
+                  }
+                else
+                  {
+                    if (style == SHORT)
+                      return (zoneinfo[i][4]);
+                    else
+                      return (zoneinfo[i][3]);
+                  }
+              }
+          }
       }
     catch (MissingResourceException e)
       {
@@ -1415,18 +1415,18 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 
     if (minutes != 0 || hours != 0)
       {
-	sb.append(offset >= 0 ? '+' : '-');
-	sb.append((char) ('0' + hours / 10));
-	sb.append((char) ('0' + hours % 10));
-	sb.append(':');
-	sb.append((char) ('0' + minutes / 10));
-	sb.append((char) ('0' + minutes % 10));
+        sb.append(offset >= 0 ? '+' : '-');
+        sb.append((char) ('0' + hours / 10));
+        sb.append((char) ('0' + hours % 10));
+        sb.append(':');
+        sb.append((char) ('0' + minutes / 10));
+        sb.append((char) ('0' + minutes % 10));
       }
 
     return sb.toString();
   }
 
-  /** 
+  /**
    * Returns true, if this time zone uses Daylight Savings Time.
    */
   public abstract boolean useDaylightTime();
@@ -1467,45 +1467,45 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     TimeZone tznew = null;
     for (int pass = 0; pass < 2; pass++)
       {
-	synchronized (TimeZone.class)
-	  {
-	    tz = (TimeZone) timezones().get(ID);
-	    if (tz != null)
-	      {
-		if (!tz.getID().equals(ID))
-		  {
-		    // We always return a timezone with the requested ID.
-		    // This is the same behaviour as with JDK1.2.
-		    tz = (TimeZone) tz.clone();
-		    tz.setID(ID);
-		    // We also save the alias, so that we return the same
-		    // object again if getTimeZone is called with the same
-		    // alias.
-		    timezones().put(ID, tz);
-		  }
-		return tz;
-	      }
-	    else if (tznew != null)
-	      {
-		timezones().put(ID, tznew);
-		return tznew;
-	      }
-	  }
+        synchronized (TimeZone.class)
+          {
+            tz = (TimeZone) timezones().get(ID);
+            if (tz != null)
+              {
+                if (!tz.getID().equals(ID))
+                  {
+                    // We always return a timezone with the requested ID.
+                    // This is the same behaviour as with JDK1.2.
+                    tz = (TimeZone) tz.clone();
+                    tz.setID(ID);
+                    // We also save the alias, so that we return the same
+                    // object again if getTimeZone is called with the same
+                    // alias.
+                    timezones().put(ID, tz);
+                  }
+                return tz;
+              }
+            else if (tznew != null)
+              {
+                timezones().put(ID, tznew);
+                return tznew;
+              }
+          }
 
-	if (pass == 1 || zoneinfo_dir == null)
-	  return null;
+        if (pass == 1 || zoneinfo_dir == null)
+          return null;
 
-	// aliases0 is never changing after first timezones(), so should
-	// be safe without synchronization.
-	String zonename = (String) aliases0.get(ID);
-	if (zonename == null)
-	  zonename = ID;
+        // aliases0 is never changing after first timezones(), so should
+        // be safe without synchronization.
+        String zonename = (String) aliases0.get(ID);
+        if (zonename == null)
+          zonename = ID;
 
-	// Read the file outside of the critical section, it is expensive.
-	tznew = ZoneInfo.readTZFile (ID, zoneinfo_dir
-				     + File.separatorChar + zonename);
-	if (tznew == null)
-	  return null;
+        // Read the file outside of the critical section, it is expensive.
+        tznew = ZoneInfo.readTZFile (ID, zoneinfo_dir
+                                     + File.separatorChar + zonename);
+        if (tznew == null)
+          return null;
       }
 
     return null;
@@ -1522,68 +1522,68 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
     // Check for custom IDs first
     if (ID.startsWith("GMT") && ID.length() > 3)
       {
-	int pos = 3;
-	int offset_direction = 1;
+        int pos = 3;
+        int offset_direction = 1;
 
-	if (ID.charAt(pos) == '-')
-	  {
-	    offset_direction = -1;
-	    pos++;
-	  }
-	else if (ID.charAt(pos) == '+')
-	  {
-	    pos++;
-	  }
+        if (ID.charAt(pos) == '-')
+          {
+            offset_direction = -1;
+            pos++;
+          }
+        else if (ID.charAt(pos) == '+')
+          {
+            pos++;
+          }
 
-	try
-	  {
-	    int hour, minute;
+        try
+          {
+            int hour, minute;
 
-	    String offset_str = ID.substring(pos);
-	    int idx = offset_str.indexOf(":");
-	    if (idx != -1)
-	      {
-		hour = Integer.parseInt(offset_str.substring(0, idx));
-		minute = Integer.parseInt(offset_str.substring(idx + 1));
-	      }
-	    else
-	      {
-		int offset_length = offset_str.length();
-		if (offset_length <= 2)
-		  {
-		    // Only hour
-		    hour = Integer.parseInt(offset_str);
-		    minute = 0;
-		  }
-		else
-		  {
-		    // hour and minute, not separated by colon
-		    hour = Integer.parseInt
-		      (offset_str.substring(0, offset_length - 2));
-		    minute = Integer.parseInt
-		      (offset_str.substring(offset_length - 2));
-		  }
-	      }
+            String offset_str = ID.substring(pos);
+            int idx = offset_str.indexOf(":");
+            if (idx != -1)
+              {
+                hour = Integer.parseInt(offset_str.substring(0, idx));
+                minute = Integer.parseInt(offset_str.substring(idx + 1));
+              }
+            else
+              {
+                int offset_length = offset_str.length();
+                if (offset_length <= 2)
+                  {
+                    // Only hour
+                    hour = Integer.parseInt(offset_str);
+                    minute = 0;
+                  }
+                else
+                  {
+                    // hour and minute, not separated by colon
+                    hour = Integer.parseInt
+                      (offset_str.substring(0, offset_length - 2));
+                    minute = Integer.parseInt
+                      (offset_str.substring(offset_length - 2));
+                  }
+              }
 
-	    // Custom IDs have to be normalized
-	    CPStringBuilder sb = new CPStringBuilder(9);
-	    sb.append("GMT");
+            // Custom IDs have to be normalized
+            CPStringBuilder sb = new CPStringBuilder(9);
+            sb.append("GMT");
 
-	    sb.append(offset_direction >= 0 ? '+' : '-');
-	    sb.append((char) ('0' + hour / 10));
-	    sb.append((char) ('0' + hour % 10));
-	    sb.append(':');
-	    sb.append((char) ('0' + minute / 10));
-	    sb.append((char) ('0' + minute % 10));
-	    ID = sb.toString();
+            sb.append(offset_direction >= 0 ? '+' : '-');
+            sb.append((char) ('0' + hour / 10));
+            sb.append((char) ('0' + hour % 10));
+            sb.append(':');
+            sb.append((char) ('0' + minute / 10));
+            sb.append((char) ('0' + minute % 10));
+            ID = sb.toString();
 
-	    return new SimpleTimeZone((hour * (60 * 60 * 1000)
-				       + minute * (60 * 1000))
-				      * offset_direction, ID);
-	  }
-	catch (NumberFormatException e)
-	  {
-	  }
+            return new SimpleTimeZone((hour * (60 * 60 * 1000)
+                                       + minute * (60 * 1000))
+                                      * offset_direction, ID);
+          }
+        catch (NumberFormatException e)
+          {
+          }
       }
 
     TimeZone tz = getTimeZoneInternal(ID);
@@ -1595,7 +1595,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
 
   /**
    * Gets the available IDs according to the given time zone
-   * offset.  
+   * offset.
    * @param rawOffset the given time zone GMT offset.
    * @return An array of IDs, where the time zone has the specified GMT
    * offset. For example {"Phoenix", "Denver"}, since both have
@@ -1605,42 +1605,42 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   {
     synchronized (TimeZone.class)
       {
-	HashMap h = timezones();
-	int count = 0;
-	if (zoneinfo_dir == null)
-	  {
-	    Iterator iter = h.entrySet().iterator();
-	    while (iter.hasNext())
-	      {
-		// Don't iterate the values, since we want to count
-		// doubled values (aliases)
-		Map.Entry entry = (Map.Entry) iter.next();
-		if (((TimeZone) entry.getValue()).getRawOffset() == rawOffset)
-		  count++;
-	      }
+        HashMap h = timezones();
+        int count = 0;
+        if (zoneinfo_dir == null)
+          {
+            Iterator iter = h.entrySet().iterator();
+            while (iter.hasNext())
+              {
+                // Don't iterate the values, since we want to count
+                // doubled values (aliases)
+                Map.Entry entry = (Map.Entry) iter.next();
+                if (((TimeZone) entry.getValue()).getRawOffset() == rawOffset)
+                  count++;
+              }
 
-	    String[] ids = new String[count];
-	    count = 0;
-	    iter = h.entrySet().iterator();
-	    while (iter.hasNext())
-	      {
-		Map.Entry entry = (Map.Entry) iter.next();
-		if (((TimeZone) entry.getValue()).getRawOffset() == rawOffset)
-		  ids[count++] = (String) entry.getKey();
-	      }
-	    return ids;
-	  }
+            String[] ids = new String[count];
+            count = 0;
+            iter = h.entrySet().iterator();
+            while (iter.hasNext())
+              {
+                Map.Entry entry = (Map.Entry) iter.next();
+                if (((TimeZone) entry.getValue()).getRawOffset() == rawOffset)
+                  ids[count++] = (String) entry.getKey();
+              }
+            return ids;
+          }
       }
 
     String[] s = getAvailableIDs();
     int count = 0;
     for (int i = 0; i < s.length; i++)
       {
-	TimeZone t = getTimeZoneInternal(s[i]);
-	if (t == null || t.getRawOffset() != rawOffset)
-	  s[i] = null;
-	else
-	  count++;
+        TimeZone t = getTimeZoneInternal(s[i]);
+        if (t == null || t.getRawOffset() != rawOffset)
+          s[i] = null;
+        else
+          count++;
       }
     String[] ids = new String[count];
     count = 0;
@@ -1658,28 +1658,28 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
       boolean top = prefix.length() == 0;
       list.add (files);
       for (int i = 0; i < files.length; i++)
-	{
-	  if (top
-	      && (files[i].equals("posix")
-		  || files[i].equals("right")
-		  || files[i].endsWith(".tab")
-		  || aliases0.get(files[i]) != null))
-	    {
-	      files[i] = null;
-	      count--;
-	      continue;
-	    }
+        {
+          if (top
+              && (files[i].equals("posix")
+                  || files[i].equals("right")
+                  || files[i].endsWith(".tab")
+                  || aliases0.get(files[i]) != null))
+            {
+              files[i] = null;
+              count--;
+              continue;
+            }
 
-	  File f = new File(d, files[i]);
-	  if (f.isDirectory())
-	    {
-	      count += getAvailableIDs(f, prefix + files[i]
-				       + File.separatorChar, list) - 1;
-	      files[i] = null;
-	    }
-	  else
-	    files[i] = prefix + files[i];
-	}
+          File f = new File(d, files[i]);
+          if (f.isDirectory())
+            {
+              count += getAvailableIDs(f, prefix + files[i]
+                                       + File.separatorChar, list) - 1;
+              files[i] = null;
+            }
+          else
+            files[i] = prefix + files[i];
+        }
       return count;
     }
 
@@ -1691,45 +1691,45 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   {
     synchronized (TimeZone.class)
       {
-	HashMap h = timezones();
-	if (zoneinfo_dir == null)
-	  return (String[]) h.keySet().toArray(new String[h.size()]);
+        HashMap h = timezones();
+        if (zoneinfo_dir == null)
+          return (String[]) h.keySet().toArray(new String[h.size()]);
 
-	if (availableIDs != null)
-	  {
-	    String[] ids = new String[availableIDs.length];
-	    for (int i = 0; i < availableIDs.length; i++)
-	      ids[i] = availableIDs[i];
-	    return ids;
-	  }
+        if (availableIDs != null)
+          {
+            String[] ids = new String[availableIDs.length];
+            for (int i = 0; i < availableIDs.length; i++)
+              ids[i] = availableIDs[i];
+            return ids;
+          }
 
-	File d = new File(zoneinfo_dir);
-	ArrayList list = new ArrayList(30);
-	int count = getAvailableIDs(d, "", list) + aliases0.size();
-	availableIDs = new String[count];
-	String[] ids = new String[count];
+        File d = new File(zoneinfo_dir);
+        ArrayList list = new ArrayList(30);
+        int count = getAvailableIDs(d, "", list) + aliases0.size();
+        availableIDs = new String[count];
+        String[] ids = new String[count];
 
-	count = 0;
-	for (int i = 0; i < list.size(); i++)
-	  {
-	    String[] s = (String[]) list.get(i);
-	    for (int j = 0; j < s.length; j++)
-	      if (s[j] != null)
-		{
-		  availableIDs[count] = s[j];
-		  ids[count++] = s[j];
-		}
-	  }
+        count = 0;
+        for (int i = 0; i < list.size(); i++)
+          {
+            String[] s = (String[]) list.get(i);
+            for (int j = 0; j < s.length; j++)
+              if (s[j] != null)
+                {
+                  availableIDs[count] = s[j];
+                  ids[count++] = s[j];
+                }
+          }
 
-	Iterator iter = aliases0.entrySet().iterator();
-	while (iter.hasNext())
-	  {
-	    Map.Entry entry = (Map.Entry) iter.next();
-	    availableIDs[count] = (String) entry.getKey();
-	    ids[count++] = (String) entry.getKey();
-	  }
+        Iterator iter = aliases0.entrySet().iterator();
+        while (iter.hasNext())
+          {
+            Map.Entry entry = (Map.Entry) iter.next();
+            availableIDs[count] = (String) entry.getKey();
+            ids[count++] = (String) entry.getKey();
+          }
 
-	return ids;
+        return ids;
       }
   }
 
@@ -1771,11 +1771,11 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException ex)
       {
-	return null;
+        return null;
       }
   }
 }
diff --git a/libjava/classpath/java/util/Timer.java b/libjava/classpath/java/util/Timer.java
index 9b23a8fe709..99027554c0f 100644
--- a/libjava/classpath/java/util/Timer.java
+++ b/libjava/classpath/java/util/Timer.java
@@ -111,11 +111,11 @@ public class Timer
     {
       elements++;
       if (elements == heap.length)
-	{
-	  TimerTask new_heap[] = new TimerTask[heap.length * 2];
-	  System.arraycopy(heap, 0, new_heap, 0, heap.length);
-	  heap = new_heap;
-	}
+        {
+          TimerTask new_heap[] = new TimerTask[heap.length * 2];
+          System.arraycopy(heap, 0, new_heap, 0, heap.length);
+          heap = new_heap;
+        }
       heap[elements] = task;
     }
 
@@ -130,11 +130,11 @@ public class Timer
       heap[elements] = null;
       elements--;
       if (elements + DEFAULT_SIZE / 2 <= (heap.length / 4))
-	{
-	  TimerTask new_heap[] = new TimerTask[heap.length / 2];
-	  System.arraycopy(heap, 0, new_heap, 0, elements + 1);
-	  heap = new_heap;
-	}
+        {
+          TimerTask new_heap[] = new TimerTask[heap.length / 2];
+          System.arraycopy(heap, 0, new_heap, 0, elements + 1);
+          heap = new_heap;
+        }
     }
 
     /**
@@ -145,25 +145,25 @@ public class Timer
     {
       // Check if it is legal to add another element
       if (heap == null)
-	{
-	  throw new IllegalStateException
-	    ("cannot enqueue when stop() has been called on queue");
-	}
+        {
+          throw new IllegalStateException
+            ("cannot enqueue when stop() has been called on queue");
+        }
 
-      heap[0] = task;		// sentinel
-      add(task);		// put the new task at the end
+      heap[0] = task;           // sentinel
+      add(task);                // put the new task at the end
       // Now push the task up in the heap until it has reached its place
       int child = elements;
       int parent = child / 2;
       while (heap[parent].scheduled > task.scheduled)
-	{
-	  heap[child] = heap[parent];
-	  child = parent;
-	  parent = child / 2;
-	}
+        {
+          heap[child] = heap[parent];
+          child = parent;
+          parent = child / 2;
+        }
       // This is the correct place for the new task
       heap[child] = task;
-      heap[0] = null;		// clear sentinel
+      heap[0] = null;           // clear sentinel
       // Maybe sched() is waiting for a new element
       this.notify();
     }
@@ -175,13 +175,13 @@ public class Timer
     private TimerTask top()
     {
       if (elements == 0)
-	{
-	  return null;
-	}
+        {
+          return null;
+        }
       else
-	{
-	  return heap[1];
-	}
+        {
+          return heap[1];
+        }
     }
 
     /**
@@ -195,50 +195,50 @@ public class Timer
       TimerTask task = null;
 
       while (task == null)
-	{
-	  // Get the next task
-	  task = top();
+        {
+          // Get the next task
+          task = top();
 
-	  // return null when asked to stop
-	  // or if asked to return null when the queue is empty
-	  if ((heap == null) || (task == null && nullOnEmpty))
-	    {
-	      return null;
-	    }
+          // return null when asked to stop
+          // or if asked to return null when the queue is empty
+          if ((heap == null) || (task == null && nullOnEmpty))
+            {
+              return null;
+            }
 
-	  // Do we have a task?
-	  if (task != null)
-	    {
-	      // The time to wait until the task should be served
-	      long time = task.scheduled - System.currentTimeMillis();
-	      if (time > 0)
-		{
-		  // This task should not yet be served
-		  // So wait until this task is ready
-		  // or something else happens to the queue
-		  task = null;	// set to null to make sure we call top()
-		  try
-		    {
-		      this.wait(time);
-		    }
-		  catch (InterruptedException _)
-		    {
-		    }
-		}
-	    }
-	  else
-	    {
-	      // wait until a task is added
-	      // or something else happens to the queue
-	      try
-		{
-		  this.wait();
-		}
-	      catch (InterruptedException _)
-		{
-		}
-	    }
-	}
+          // Do we have a task?
+          if (task != null)
+            {
+              // The time to wait until the task should be served
+              long time = task.scheduled - System.currentTimeMillis();
+              if (time > 0)
+                {
+                  // This task should not yet be served
+                  // So wait until this task is ready
+                  // or something else happens to the queue
+                  task = null;  // set to null to make sure we call top()
+                  try
+                    {
+                      this.wait(time);
+                    }
+                  catch (InterruptedException _)
+                    {
+                    }
+                }
+            }
+          else
+            {
+              // wait until a task is added
+              // or something else happens to the queue
+              try
+                {
+                  this.wait();
+                }
+              catch (InterruptedException _)
+                {
+                }
+            }
+        }
 
       // reconstruct the heap
       TimerTask lastTask = heap[elements];
@@ -249,22 +249,22 @@ public class Timer
       int child = 2;
       heap[1] = lastTask;
       while (child <= elements)
-	{
-	  if (child < elements)
-	    {
-	      if (heap[child].scheduled > heap[child + 1].scheduled)
-		{
-		  child++;
-		}
-	    }
+        {
+          if (child < elements)
+            {
+              if (heap[child].scheduled > heap[child + 1].scheduled)
+                {
+                  child++;
+                }
+            }
 
-	  if (lastTask.scheduled <= heap[child].scheduled)
-	    break;		// found the correct place (the parent) - done
+          if (lastTask.scheduled <= heap[child].scheduled)
+            break;              // found the correct place (the parent) - done
 
-	  heap[parent] = heap[child];
-	  parent = child;
-	  child = parent * 2;
-	}
+          heap[parent] = heap[child];
+          parent = child;
+          child = parent * 2;
+        }
 
       // this is the correct new place for the lastTask
       heap[parent] = lastTask;
@@ -306,53 +306,53 @@ public class Timer
       // Null out any elements that are canceled.  Skip element 0 as
       // it is the sentinel.
       for (int i = elements; i > 0; --i)
-	{
-	  if (heap[i].scheduled < 0)
-	    {
-	      ++removed;
+        {
+          if (heap[i].scheduled < 0)
+            {
+              ++removed;
 
-	      // Remove an element by pushing the appropriate child
-	      // into place, and then iterating to the bottom of the
-	      // tree.
-	      int index = i;
-	      while (heap[index] != null)
-		{
-		  int child = 2 * index;
-		  if (child >= heap.length)
-		    {
-		      // Off end; we're done.
-		      heap[index] = null;
-		      break;
-		    }
+              // Remove an element by pushing the appropriate child
+              // into place, and then iterating to the bottom of the
+              // tree.
+              int index = i;
+              while (heap[index] != null)
+                {
+                  int child = 2 * index;
+                  if (child >= heap.length)
+                    {
+                      // Off end; we're done.
+                      heap[index] = null;
+                      break;
+                    }
 
-		  if (child + 1 >= heap.length || heap[child + 1] == null)
-		    {
-		      // Nothing -- we're done.
-		    }
-		  else if (heap[child] == null
-			   || (heap[child].scheduled
-			       > heap[child + 1].scheduled))
-		    ++child;
-		  heap[index] = heap[child];
-		  index = child;
-		}
-	    }
-	}
+                  if (child + 1 >= heap.length || heap[child + 1] == null)
+                    {
+                      // Nothing -- we're done.
+                    }
+                  else if (heap[child] == null
+                           || (heap[child].scheduled
+                               > heap[child + 1].scheduled))
+                    ++child;
+                  heap[index] = heap[child];
+                  index = child;
+                }
+            }
+        }
 
       // Make a new heap if we shrank enough.
       int newLen = heap.length;
       while (elements - removed + DEFAULT_SIZE / 2 <= newLen / 4)
-	newLen /= 2;
+        newLen /= 2;
       if (newLen != heap.length)
-	{
-	  TimerTask[] newHeap = new TimerTask[newLen];
-	  System.arraycopy(heap, 0, newHeap, 0, elements + 1);
-	  heap = newHeap;
-	}
+        {
+          TimerTask[] newHeap = new TimerTask[newLen];
+          System.arraycopy(heap, 0, newHeap, 0, elements + 1);
+          heap = newHeap;
+        }
 
       return removed;
     }
-  }				// TaskQueue
+  }                             // TaskQueue
 
   /**
    * The scheduler that executes all the tasks on a particular TaskQueue,
@@ -378,63 +378,63 @@ public class Timer
     {
       TimerTask task;
       while ((task = queue.serve()) != null)
-	{
-	  // If this task has not been canceled
-	  if (task.scheduled >= 0)
-	    {
+        {
+          // If this task has not been canceled
+          if (task.scheduled >= 0)
+            {
 
-	      // Mark execution time
-	      task.lastExecutionTime = task.scheduled;
+              // Mark execution time
+              task.lastExecutionTime = task.scheduled;
 
-	      // Repeatable task?
-	      if (task.period < 0)
-		{
-		  // Last time this task is executed
-		  task.scheduled = -1;
-		}
+              // Repeatable task?
+              if (task.period < 0)
+                {
+                  // Last time this task is executed
+                  task.scheduled = -1;
+                }
 
-	      // Run the task
-	      try
-		{
-		  task.run();
-		}
+              // Run the task
+              try
+                {
+                  task.run();
+                }
               catch (ThreadDeath death)
                 {
                   // If an exception escapes, the Timer becomes invalid.
                   queue.stop();
                   throw death;
                 }
-	      catch (Throwable t)
-		{
-		  // If an exception escapes, the Timer becomes invalid.
+              catch (Throwable t)
+                {
+                  // If an exception escapes, the Timer becomes invalid.
                   queue.stop();
-		}
-	    }
+                }
+            }
 
-	  // Calculate next time and possibly re-enqueue.
-	  if (task.scheduled >= 0)
-	    {
-	      if (task.fixed)
-		{
-		  task.scheduled += task.period;
-		}
-	      else
-		{
-		  task.scheduled = task.period + System.currentTimeMillis();
-		}
+          // Calculate next time and possibly re-enqueue.
+          if (task.scheduled >= 0)
+            {
+              if (task.fixed)
+                {
+                  task.scheduled += task.period;
+                }
+              else
+                {
+                  task.scheduled = task.period + System.currentTimeMillis();
+                }
 
-	      try
-	        {
-	          queue.enqueue(task);
-		}
-	      catch (IllegalStateException ise)
-	        {
-		  // Ignore. Apparently the Timer queue has been stopped.
-		}
-	    }
-	}
+              try
+                {
+                  queue.enqueue(task);
+                }
+              catch (IllegalStateException ise)
+                {
+                  // Ignore. Apparently the Timer queue has been stopped.
+                }
+            }
+        }
     }
-  }				// Scheduler
+  }                             // Scheduler
 
   // Number of Timers created.
   // Used for creating nice Thread names.
@@ -474,11 +474,11 @@ public class Timer
     this(daemon, Thread.NORM_PRIORITY);
   }
 
-  /** 
-   * Create a new Timer whose Thread has the indicated name.  It will have 
-   * normal priority and will not be a daemon thread. 
+  /**
+   * Create a new Timer whose Thread has the indicated name.  It will have
+   * normal priority and will not be a daemon thread.
    * @param name the name of the Thread
-   * @since 1.5 
+   * @since 1.5
    */
   public Timer(String name)
   {
@@ -486,7 +486,7 @@ public class Timer
   }
 
   /**
-   * Create a new Timer whose Thread has the indicated name.  It will have 
+   * Create a new Timer whose Thread has the indicated name.  It will have
    * normal priority.  The boolean argument controls whether or not it
    * will be a daemon thread.
    * @param name the name of the Thread
@@ -548,24 +548,24 @@ public class Timer
 
     if (task.scheduled == 0 && task.lastExecutionTime == -1)
       {
-	task.scheduled = time;
-	task.period = period;
-	task.fixed = fixed;
+        task.scheduled = time;
+        task.period = period;
+        task.fixed = fixed;
       }
     else
       {
-	throw new IllegalStateException
-	  ("task was already scheduled or canceled");
+        throw new IllegalStateException
+          ("task was already scheduled or canceled");
       }
 
     if (!this.canceled && this.thread != null)
       {
-	queue.enqueue(task);
+        queue.enqueue(task);
       }
     else
       {
-	throw new IllegalStateException
-	  ("timer was canceled or scheduler thread has died");
+        throw new IllegalStateException
+          ("timer was canceled or scheduler thread has died");
       }
   }
 
@@ -573,7 +573,7 @@ public class Timer
   {
     if (delay < 0)
       {
-	throw new IllegalArgumentException("delay is negative");
+        throw new IllegalArgumentException("delay is negative");
       }
   }
 
@@ -581,7 +581,7 @@ public class Timer
   {
     if (period < 0)
       {
-	throw new IllegalArgumentException("period is negative");
+        throw new IllegalArgumentException("period is negative");
       }
   }
 
diff --git a/libjava/classpath/java/util/TreeMap.java b/libjava/classpath/java/util/TreeMap.java
index 99a42cbfb50..87c532fc1ed 100644
--- a/libjava/classpath/java/util/TreeMap.java
+++ b/libjava/classpath/java/util/TreeMap.java
@@ -446,7 +446,7 @@ public class TreeMap extends AbstractMap
    * (or equal to, if inclusive is true) toKey.
    * The returned map is backed by the original, so changes in one appear
    * in the other. The submap will throw an {@link IllegalArgumentException}
-   * for any attempt to access or add an element beyond the specified cutoff. 
+   * for any attempt to access or add an element beyond the specified cutoff.
    *
    * @param toKey the cutoff point
    * @param inclusive true if the cutoff point should be included.
@@ -459,8 +459,8 @@ public class TreeMap extends AbstractMap
    */
   public NavigableMap headMap(K toKey, boolean inclusive)
   {
-    return new SubMap((K)(Object)nil, inclusive 
-		      ? successor(getNode(toKey)).key : toKey);
+    return new SubMap((K)(Object)nil, inclusive
+                      ? successor(getNode(toKey)).key : toKey);
   }
 
   /**
@@ -641,7 +641,7 @@ public class TreeMap extends AbstractMap
    * toKey. The returned map is backed by the original, so
    * changes in one appear in the other. The submap will throw an
    * {@link IllegalArgumentException} for any attempt to access or add an
-   * element beyond the specified cutoffs. 
+   * element beyond the specified cutoffs.
    *
    * @param fromKey the low cutoff point
    * @param fromInclusive true if the low cutoff point should be included.
@@ -655,10 +655,10 @@ public class TreeMap extends AbstractMap
    * @throws IllegalArgumentException if fromKey is greater than toKey
    */
   public NavigableMap subMap(K fromKey, boolean fromInclusive,
-				   K toKey, boolean toInclusive)
+                                   K toKey, boolean toInclusive)
   {
     return new SubMap(fromInclusive ? fromKey : successor(getNode(fromKey)).key,
-		      toInclusive ? successor(getNode(toKey)).key : toKey);
+                      toInclusive ? successor(getNode(toKey)).key : toKey);
   }
 
   /**
@@ -701,7 +701,7 @@ public class TreeMap extends AbstractMap
   public NavigableMap tailMap(K fromKey, boolean inclusive)
   {
     return new SubMap(inclusive ? fromKey : successor(getNode(fromKey)).key,
-		      (K)(Object)nil);
+                      (K)(Object)nil);
   }
 
   /**
@@ -873,9 +873,9 @@ public class TreeMap extends AbstractMap
   {
     if (count == 0)
       {
-	root = nil;
-	size = 0;
-	return;
+        root = nil;
+        size = 0;
+        return;
       }
 
     // We color every row of nodes black, except for the overflow nodes.
@@ -1601,7 +1601,7 @@ public class TreeMap extends AbstractMap
     {
       Entry n = TreeMap.this.ceilingEntry(key);
       if (n != null && keyInRange(n.getKey()))
-	return n;
+        return n;
       return null;
     }
 
@@ -1609,9 +1609,9 @@ public class TreeMap extends AbstractMap
     {
       K found = TreeMap.this.ceilingKey(key);
       if (keyInRange(found))
-	return found;
+        return found;
       else
-	return null;
+        return null;
     }
 
     public NavigableSet descendingKeySet()
@@ -1622,10 +1622,10 @@ public class TreeMap extends AbstractMap
     public NavigableMap descendingMap()
     {
       if (descendingMap == null)
-	descendingMap = new DescendingMap(this);
+        descendingMap = new DescendingMap(this);
       return descendingMap;
     }
-    
+
     public void clear()
     {
       Node next = lowestGreaterThan(minKey, true);
@@ -1674,7 +1674,7 @@ public class TreeMap extends AbstractMap
     {
       Node node = lowestGreaterThan(minKey, true);
       if (node == nil || ! keyInRange(node.key))
-	return null;
+        return null;
       return node;
     }
 
@@ -1690,7 +1690,7 @@ public class TreeMap extends AbstractMap
     {
       Entry n = TreeMap.this.floorEntry(key);
       if (n != null && keyInRange(n.getKey()))
-	return n;
+        return n;
       return null;
     }
 
@@ -1698,9 +1698,9 @@ public class TreeMap extends AbstractMap
     {
       K found = TreeMap.this.floorKey(key);
       if (keyInRange(found))
-	return found;
+        return found;
       else
-	return null;
+        return null;
     }
 
     public V get(Object key)
@@ -1719,8 +1719,8 @@ public class TreeMap extends AbstractMap
     {
       if (!keyInRange(toKey))
         throw new IllegalArgumentException("Key outside submap range");
-      return new SubMap(minKey, (inclusive ? 
-				 successor(getNode(toKey)).key : toKey));
+      return new SubMap(minKey, (inclusive ?
+                                 successor(getNode(toKey)).key : toKey));
     }
 
     public Set keySet()
@@ -1736,7 +1736,7 @@ public class TreeMap extends AbstractMap
     {
       Entry n = TreeMap.this.higherEntry(key);
       if (n != null && keyInRange(n.getKey()))
-	return n;
+        return n;
       return null;
     }
 
@@ -1744,9 +1744,9 @@ public class TreeMap extends AbstractMap
     {
       K found = TreeMap.this.higherKey(key);
       if (keyInRange(found))
-	return found;
+        return found;
       else
-	return null;
+        return null;
     }
 
     public Entry lastEntry()
@@ -1766,7 +1766,7 @@ public class TreeMap extends AbstractMap
     {
       Entry n = TreeMap.this.lowerEntry(key);
       if (n != null && keyInRange(n.getKey()))
-	return n;
+        return n;
       return null;
     }
 
@@ -1774,9 +1774,9 @@ public class TreeMap extends AbstractMap
     {
       K found = TreeMap.this.lowerKey(key);
       if (keyInRange(found))
-	return found;
+        return found;
       else
-	return null;
+        return null;
     }
 
     public NavigableSet navigableKeySet()
@@ -1785,14 +1785,14 @@ public class TreeMap extends AbstractMap
         // Create an AbstractSet with custom implementations of those methods
         // that can be overriden easily and efficiently.
         this.nKeys = new SubMap.NavigableKeySet();
-      return this.nKeys;    
+      return this.nKeys;
     }
 
     public Entry pollFirstEntry()
     {
       Entry e = firstEntry();
       if (e != null)
-	removeNode((Node) e);
+        removeNode((Node) e);
       return e;
     }
 
@@ -1800,7 +1800,7 @@ public class TreeMap extends AbstractMap
     {
       Entry e = lastEntry();
       if (e != null)
-	removeNode((Node) e);
+        removeNode((Node) e);
       return e;
     }
 
@@ -1837,25 +1837,25 @@ public class TreeMap extends AbstractMap
     }
 
     public NavigableMap subMap(K fromKey, boolean fromInclusive,
-				    K toKey, boolean toInclusive)
+                                    K toKey, boolean toInclusive)
     {
       if (! keyInRange(fromKey) || ! keyInRange(toKey))
         throw new IllegalArgumentException("key outside range");
-      return new SubMap(fromInclusive ? fromKey : successor(getNode(fromKey)).key, 
-			toInclusive ? successor(getNode(toKey)).key : toKey);
+      return new SubMap(fromInclusive ? fromKey : successor(getNode(fromKey)).key,
+                        toInclusive ? successor(getNode(toKey)).key : toKey);
     }
 
     public SortedMap tailMap(K fromKey)
     {
       return tailMap(fromKey, true);
     }
-    
+
     public NavigableMap tailMap(K fromKey, boolean inclusive)
     {
       if (! keyInRange(fromKey))
         throw new IllegalArgumentException("key outside range");
       return new SubMap(inclusive ? fromKey : successor(getNode(fromKey)).key,
-			maxKey);
+                        maxKey);
     }
 
     public Collection values()
@@ -1884,47 +1884,47 @@ public class TreeMap extends AbstractMap
         };
       return this.values;
     }
-    
+
     private class KeySet
       extends AbstractSet
     {
       public int size()
       {
-	return SubMap.this.size();
+        return SubMap.this.size();
       }
-      
+
       public Iterator iterator()
       {
-	Node first = lowestGreaterThan(minKey, true);
-	Node max = lowestGreaterThan(maxKey, false);
-	return new TreeIterator(KEYS, first, max);
+        Node first = lowestGreaterThan(minKey, true);
+        Node max = lowestGreaterThan(maxKey, false);
+        return new TreeIterator(KEYS, first, max);
       }
-      
+
       public void clear()
       {
-	SubMap.this.clear();
+        SubMap.this.clear();
       }
-      
+
       public boolean contains(Object o)
       {
-	if (! keyInRange((K) o))
-	  return false;
-	return getNode((K) o) != nil;
+        if (! keyInRange((K) o))
+          return false;
+        return getNode((K) o) != nil;
       }
-      
+
       public boolean remove(Object o)
       {
-	if (! keyInRange((K) o))
-	  return false;
-	Node n = getNode((K) o);
-	if (n != nil)
-	  {
-	    removeNode(n);
-	    return true;
-	  }
-	return false;
+        if (! keyInRange((K) o))
+          return false;
+        Node n = getNode((K) o);
+        if (n != nil)
+          {
+            removeNode(n);
+            return true;
+          }
+        return false;
       }
-      
+
     } // class SubMap.KeySet
 
     private final class NavigableKeySet
@@ -1934,91 +1934,91 @@ public class TreeMap extends AbstractMap
 
       public K ceiling(K k)
       {
-	return SubMap.this.ceilingKey(k);
+        return SubMap.this.ceilingKey(k);
       }
-      
+
       public Comparator comparator()
       {
-	return comparator;
+        return comparator;
       }
-      
+
       public Iterator descendingIterator()
       {
-	return descendingSet().iterator();
+        return descendingSet().iterator();
       }
-      
+
       public NavigableSet descendingSet()
       {
-	return new DescendingSet(this);
+        return new DescendingSet(this);
       }
-      
+
       public K first()
       {
-	return SubMap.this.firstKey();
+        return SubMap.this.firstKey();
       }
-      
+
       public K floor(K k)
       {
-	return SubMap.this.floorKey(k);
+        return SubMap.this.floorKey(k);
       }
-      
+
       public SortedSet headSet(K to)
       {
-	return headSet(to, false);
+        return headSet(to, false);
       }
 
       public NavigableSet headSet(K to, boolean inclusive)
       {
-	return SubMap.this.headMap(to, inclusive).navigableKeySet();
+        return SubMap.this.headMap(to, inclusive).navigableKeySet();
       }
 
       public K higher(K k)
       {
-	return SubMap.this.higherKey(k);
+        return SubMap.this.higherKey(k);
       }
 
       public K last()
       {
-	return SubMap.this.lastKey();
+        return SubMap.this.lastKey();
       }
 
       public K lower(K k)
       {
-	return SubMap.this.lowerKey(k);
+        return SubMap.this.lowerKey(k);
       }
 
       public K pollFirst()
       {
-	return SubMap.this.pollFirstEntry().getKey();
+        return SubMap.this.pollFirstEntry().getKey();
       }
 
       public K pollLast()
       {
-	return SubMap.this.pollLastEntry().getKey();
+        return SubMap.this.pollLastEntry().getKey();
       }
 
       public SortedSet subSet(K from, K to)
       {
-	return subSet(from, true, to, false);
+        return subSet(from, true, to, false);
       }
-      
+
       public NavigableSet subSet(K from, boolean fromInclusive,
-				    K to, boolean toInclusive)
+                                    K to, boolean toInclusive)
       {
-	return SubMap.this.subMap(from, fromInclusive,
-				  to, toInclusive).navigableKeySet();
+        return SubMap.this.subMap(from, fromInclusive,
+                                  to, toInclusive).navigableKeySet();
       }
 
       public SortedSet tailSet(K from)
       {
-	return tailSet(from, true);
+        return tailSet(from, true);
       }
-      
+
       public NavigableSet tailSet(K from, boolean inclusive)
       {
-	return SubMap.this.tailMap(from, inclusive).navigableKeySet();
+        return SubMap.this.tailMap(from, inclusive).navigableKeySet();
       }
-      
+
   } // class SubMap.NavigableKeySet
 
   /**
@@ -2027,54 +2027,54 @@ public class TreeMap extends AbstractMap
   private class EntrySet
     extends AbstractSet>
   {
-    
+
     public int size()
     {
       return SubMap.this.size();
     }
-    
+
     public Iterator> iterator()
     {
       Node first = lowestGreaterThan(minKey, true);
       Node max = lowestGreaterThan(maxKey, false);
       return new TreeIterator(ENTRIES, first, max);
     }
-    
+
     public void clear()
     {
       SubMap.this.clear();
     }
-    
+
     public boolean contains(Object o)
     {
       if (! (o instanceof Map.Entry))
-	return false;
+        return false;
       Map.Entry me = (Map.Entry) o;
       K key = me.getKey();
       if (! keyInRange(key))
-	return false;
+        return false;
       Node n = getNode(key);
       return n != nil && AbstractSet.equals(me.getValue(), n.value);
     }
-    
+
     public boolean remove(Object o)
     {
       if (! (o instanceof Map.Entry))
-	return false;
+        return false;
       Map.Entry me = (Map.Entry) o;
       K key = me.getKey();
       if (! keyInRange(key))
-	return false;
+        return false;
       Node n = getNode(key);
       if (n != nil && AbstractSet.equals(me.getValue(), n.value))
-	{
-	  removeNode(n);
-	  return true;
-	}
+        {
+          removeNode(n);
+          return true;
+        }
       return false;
     }
   } // class SubMap.EntrySet
-    
+
     private final class NavigableEntrySet
       extends EntrySet
       implements NavigableSet>
@@ -2082,103 +2082,103 @@ public class TreeMap extends AbstractMap
 
       public Entry ceiling(Entry e)
       {
-	return SubMap.this.ceilingEntry(e.getKey());
+        return SubMap.this.ceilingEntry(e.getKey());
       }
-      
+
       public Comparator> comparator()
       {
-	return new Comparator>()
-	  {
-	    public int compare(Entry t1, Entry t2)
-	      {
-		return comparator.compare(t1.getKey(), t2.getKey());
-	      }
-	  };
+        return new Comparator>()
+          {
+            public int compare(Entry t1, Entry t2)
+              {
+                return comparator.compare(t1.getKey(), t2.getKey());
+              }
+          };
       }
-      
+
       public Iterator> descendingIterator()
       {
-	return descendingSet().iterator();
+        return descendingSet().iterator();
       }
-      
+
       public NavigableSet> descendingSet()
       {
-	return new DescendingSet(this);
+        return new DescendingSet(this);
       }
-      
+
       public Entry first()
       {
-	return SubMap.this.firstEntry();
+        return SubMap.this.firstEntry();
       }
-      
+
       public Entry floor(Entry e)
       {
-	return SubMap.this.floorEntry(e.getKey());
+        return SubMap.this.floorEntry(e.getKey());
       }
-      
+
       public SortedSet> headSet(Entry to)
       {
-	return headSet(to, false);
+        return headSet(to, false);
       }
 
       public NavigableSet> headSet(Entry to, boolean inclusive)
       {
-	return (NavigableSet>)
-	  SubMap.this.headMap(to.getKey(), inclusive).entrySet();
+        return (NavigableSet>)
+          SubMap.this.headMap(to.getKey(), inclusive).entrySet();
       }
 
       public Entry higher(Entry e)
       {
-	return SubMap.this.higherEntry(e.getKey());
+        return SubMap.this.higherEntry(e.getKey());
       }
 
       public Entry last()
       {
-	return SubMap.this.lastEntry();
+        return SubMap.this.lastEntry();
       }
 
       public Entry lower(Entry e)
       {
-	return SubMap.this.lowerEntry(e.getKey());
+        return SubMap.this.lowerEntry(e.getKey());
       }
 
       public Entry pollFirst()
       {
-	return SubMap.this.pollFirstEntry();
+        return SubMap.this.pollFirstEntry();
       }
 
       public Entry pollLast()
       {
-	return SubMap.this.pollLastEntry();
+        return SubMap.this.pollLastEntry();
       }
 
       public SortedSet> subSet(Entry from, Entry to)
       {
-	return subSet(from, true, to, false);
+        return subSet(from, true, to, false);
       }
-      
+
       public NavigableSet> subSet(Entry from, boolean fromInclusive,
-					     Entry to, boolean toInclusive)
+                                             Entry to, boolean toInclusive)
       {
-	return (NavigableSet>)
-	  SubMap.this.subMap(from.getKey(), fromInclusive,
-			     to.getKey(), toInclusive).entrySet();
+        return (NavigableSet>)
+          SubMap.this.subMap(from.getKey(), fromInclusive,
+                             to.getKey(), toInclusive).entrySet();
       }
 
       public SortedSet> tailSet(Entry from)
       {
-	return tailSet(from, true);
+        return tailSet(from, true);
       }
-      
+
       public NavigableSet> tailSet(Entry from, boolean inclusive)
       {
-	return (NavigableSet>)
-	  SubMap.this.tailMap(from.getKey(), inclusive).navigableKeySet();
+        return (NavigableSet>)
+          SubMap.this.tailMap(from.getKey(), inclusive).navigableKeySet();
       }
-      
+
   } // class SubMap.NavigableEntrySet
 
-} // class SubMap  
+} // class SubMap
 
   /**
    * Returns the entry associated with the least or lowest key
@@ -2326,7 +2326,7 @@ public class TreeMap extends AbstractMap
    * null if there is no such key.
    *
    * @param key the key relative to the returned entry.
-   * @return the entry with the least key greater than 
+   * @return the entry with the least key greater than
    *         the given key, or null if there is
    *         no such key.
    * @throws ClassCastException if the specified key can not
@@ -2385,7 +2385,7 @@ public class TreeMap extends AbstractMap
    * null if there is no such key.
    *
    * @param key the key relative to the returned entry.
-   * @return the entry with the greatest key less than 
+   * @return the entry with the greatest key less than
    *         the given key, or null if there is
    *         no such key.
    * @throws ClassCastException if the specified key can not
@@ -2473,7 +2473,7 @@ public class TreeMap extends AbstractMap
     Entry e = lastEntry();
     if (e != null)
       removeNode((Node)e);
-    return e;    
+    return e;
   }
 
   /**
@@ -2524,7 +2524,7 @@ public class TreeMap extends AbstractMap
     {
       this.map = map;
     }
-      
+
     public Map.Entry ceilingEntry(DK key)
     {
       return map.floorEntry(key);
@@ -2549,7 +2549,7 @@ public class TreeMap extends AbstractMap
     {
       return map.containsKey(o);
     }
-    
+
     public boolean containsValue(Object o)
     {
       return map.containsValue(o);
@@ -2568,9 +2568,9 @@ public class TreeMap extends AbstractMap
     public Set> entrySet()
     {
       if (entries == null)
-	entries =
-	  new DescendingSet>((NavigableSet>)
-					  map.entrySet());
+        entries =
+          new DescendingSet>((NavigableSet>)
+                                          map.entrySet());
       return entries;
     }
 
@@ -2632,7 +2632,7 @@ public class TreeMap extends AbstractMap
     public Set keySet()
     {
       if (keys == null)
-	keys = new DescendingSet(map.navigableKeySet());
+        keys = new DescendingSet(map.navigableKeySet());
       return keys;
     }
 
@@ -2664,7 +2664,7 @@ public class TreeMap extends AbstractMap
     public NavigableSet navigableKeySet()
     {
       if (nKeys == null)
-	nKeys = new DescendingSet(map.navigableKeySet());
+        nKeys = new DescendingSet(map.navigableKeySet());
       return nKeys;
     }
 
@@ -2704,10 +2704,10 @@ public class TreeMap extends AbstractMap
     }
 
     public NavigableMap subMap(DK fromKey, boolean fromInclusive,
-				      DK toKey, boolean toInclusive)
+                                      DK toKey, boolean toInclusive)
     {
       return new DescendingMap(map.subMap(fromKey, fromInclusive,
-					  toKey, toInclusive));
+                                          toKey, toInclusive));
     }
 
     public SortedMap tailMap(DK fromKey)
@@ -2726,11 +2726,11 @@ public class TreeMap extends AbstractMap
       final Iterator> it = entrySet().iterator();
       while (it.hasNext())
       {
-	final Entry e = it.next();
+        final Entry e = it.next();
         r.append(e.getKey());
         r.append('=');
         r.append(e.getValue());
-	r.append(", ");
+        r.append(", ");
       }
       r.replace(r.length() - 2, r.length(), "}");
       return r.toString();
@@ -2742,53 +2742,53 @@ public class TreeMap extends AbstractMap
         // Create an AbstractCollection with custom implementations of those
         // methods that can be overriden easily and efficiently.
         values = new AbstractCollection()
-	  {
-	    public int size()
-	    {
-	      return DescendingMap.this.size();
-	    }
-	    
-	    public Iterator iterator()
-	    {
-	      return new Iterator()
-		{	  
-		  /** The last Entry returned by a next() call. */
-		  private Entry last;
-		  
-		  /** The next entry that should be returned by next(). */
-		  private Entry next = firstEntry();
-		  
-		  public boolean hasNext()
-		  {
-		    return next != null;
-		  }
+          {
+            public int size()
+            {
+              return DescendingMap.this.size();
+            }
 
-		  public DV next()
-		  {
-		    if (next == null)
-		      throw new NoSuchElementException();
-		    last = next;
-		    next = higherEntry(last.getKey());
-		    
-		    return last.getValue();
-		  }
+            public Iterator iterator()
+            {
+              return new Iterator()
+                {
+                  /** The last Entry returned by a next() call. */
+                  private Entry last;
 
-		  public void remove()
-		  {
-		    if (last == null)
-		      throw new IllegalStateException();
-		    
-		    DescendingMap.this.remove(last.getKey());
-		    last = null;
-		  }
-		};
-	    }
-	    
-	    public void clear()
-	    {
-	      DescendingMap.this.clear();
-	    }
-	  };
+                  /** The next entry that should be returned by next(). */
+                  private Entry next = firstEntry();
+
+                  public boolean hasNext()
+                  {
+                    return next != null;
+                  }
+
+                  public DV next()
+                  {
+                    if (next == null)
+                      throw new NoSuchElementException();
+                    last = next;
+                    next = higherEntry(last.getKey());
+
+                    return last.getValue();
+                  }
+
+                  public void remove()
+                  {
+                    if (last == null)
+                      throw new IllegalStateException();
+
+                    DescendingMap.this.remove(last.getKey());
+                    last = null;
+                  }
+                };
+            }
+
+            public void clear()
+            {
+              DescendingMap.this.clear();
+            }
+          };
       return values;
     }
 
@@ -2815,17 +2815,17 @@ public class TreeMap extends AbstractMap
     {
       TreeMap.this.clear();
     }
-    
+
     public boolean contains(Object o)
     {
       return containsKey(o);
     }
-    
+
     public boolean remove(Object key)
     {
       Node n = getNode((K) key);
       if (n == nil)
-	return false;
+        return false;
       removeNode(n);
       return true;
     }
@@ -2912,10 +2912,10 @@ public class TreeMap extends AbstractMap
     }
 
     public NavigableSet subSet(K from, boolean fromInclusive,
-				  K to, boolean toInclusive)
+                                  K to, boolean toInclusive)
     {
       return subMap(from, fromInclusive,
-		    to, toInclusive).navigableKeySet();
+                    to, toInclusive).navigableKeySet();
     }
 
     public SortedSet tailSet(K from)
@@ -2959,7 +2959,7 @@ public class TreeMap extends AbstractMap
     {
       this.set = set;
     }
-    
+
     public boolean add(D e)
     {
       return set.add(e);
@@ -3048,38 +3048,38 @@ public class TreeMap extends AbstractMap
     public Iterator iterator()
     {
       return new Iterator()
-	{
-	  	  
-	  /** The last element returned by a next() call. */
-	  private D last;
-		  
-	  /** The next element that should be returned by next(). */
-	  private D next = first();
-		  
-	  public boolean hasNext()
-	  {
-	    return next != null;
-	  }
+        {
 
-	  public D next()
-	  {
-	    if (next == null)
-	      throw new NoSuchElementException();
-	    last = next;
-	    next = higher(last);
-		    
-	    return last;
-	  }
+          /** The last element returned by a next() call. */
+          private D last;
 
-	  public void remove()
-	  {
-	    if (last == null)
-	      throw new IllegalStateException();
-	    
-	    DescendingSet.this.remove(last);
-	    last = null;
-	  }
-	};
+          /** The next element that should be returned by next(). */
+          private D next = first();
+
+          public boolean hasNext()
+          {
+            return next != null;
+          }
+
+          public D next()
+          {
+            if (next == null)
+              throw new NoSuchElementException();
+            last = next;
+            next = higher(last);
+
+            return last;
+          }
+
+          public void remove()
+          {
+            if (last == null)
+              throw new IllegalStateException();
+
+            DescendingSet.this.remove(last);
+            last = null;
+          }
+        };
     }
 
     public D last()
@@ -3128,10 +3128,10 @@ public class TreeMap extends AbstractMap
     }
 
     public NavigableSet subSet(D from, boolean fromInclusive,
-				  D to, boolean toInclusive)
+                                  D to, boolean toInclusive)
     {
       return new DescendingSet(set.subSet(from, fromInclusive,
-					  to, toInclusive));
+                                          to, toInclusive));
     }
 
     public SortedSet tailSet(D from)
@@ -3164,12 +3164,12 @@ public class TreeMap extends AbstractMap
       final Iterator it = iterator();
       while (it.hasNext())
       {
-	final D o = it.next();
-	if (o == this)
-	  r.append("");
-	else
-	  r.append(o);
-	r.append(", ");
+        final D o = it.next();
+        if (o == this)
+          r.append("");
+        else
+          r.append(o);
+        r.append(", ");
       }
       r.replace(r.length() - 2, r.length(), "]");
       return r.toString();
@@ -3184,12 +3184,12 @@ public class TreeMap extends AbstractMap
     {
       return size;
     }
-    
+
     public Iterator> iterator()
     {
       return new TreeIterator(ENTRIES);
     }
-    
+
     public void clear()
     {
       TreeMap.this.clear();
@@ -3198,68 +3198,68 @@ public class TreeMap extends AbstractMap
     public boolean contains(Object o)
     {
       if (! (o instanceof Map.Entry))
-	return false;
+        return false;
       Map.Entry me = (Map.Entry) o;
       Node n = getNode(me.getKey());
       return n != nil && AbstractSet.equals(me.getValue(), n.value);
     }
-    
+
     public boolean remove(Object o)
     {
       if (! (o instanceof Map.Entry))
-	return false;
+        return false;
       Map.Entry me = (Map.Entry) o;
       Node n = getNode(me.getKey());
       if (n != nil && AbstractSet.equals(me.getValue(), n.value))
-	{
-	  removeNode(n);
-	  return true;
-	}
+        {
+          removeNode(n);
+          return true;
+        }
       return false;
     }
   }
-  
+
   private final class NavigableEntrySet
     extends EntrySet
     implements NavigableSet>
   {
-    
+
     public Entry ceiling(Entry e)
     {
       return ceilingEntry(e.getKey());
     }
-      
+
     public Comparator> comparator()
     {
       return new Comparator>()
-	{
-	  public int compare(Entry t1, Entry t2)
-	  {
-	    return comparator.compare(t1.getKey(), t2.getKey());
-	  }
-	};
+        {
+          public int compare(Entry t1, Entry t2)
+          {
+            return comparator.compare(t1.getKey(), t2.getKey());
+          }
+        };
     }
-    
+
     public Iterator> descendingIterator()
     {
       return descendingSet().iterator();
     }
-    
+
     public NavigableSet> descendingSet()
     {
       return new DescendingSet(this);
     }
-    
+
     public Entry first()
     {
       return firstEntry();
     }
-      
+
     public Entry floor(Entry e)
     {
       return floorEntry(e.getKey());
     }
-      
+
     public SortedSet> headSet(Entry to)
     {
       return headSet(to, false);
@@ -3269,7 +3269,7 @@ public class TreeMap extends AbstractMap
     {
       return (NavigableSet>) headMap(to.getKey(), inclusive).entrySet();
     }
-    
+
     public Entry higher(Entry e)
     {
       return higherEntry(e.getKey());
@@ -3299,24 +3299,24 @@ public class TreeMap extends AbstractMap
     {
       return subSet(from, true, to, false);
     }
-    
+
     public NavigableSet> subSet(Entry from, boolean fromInclusive,
-					   Entry to, boolean toInclusive)
+                                           Entry to, boolean toInclusive)
     {
       return (NavigableSet>) subMap(from.getKey(), fromInclusive,
-					       to.getKey(), toInclusive).entrySet();
+                                               to.getKey(), toInclusive).entrySet();
     }
 
     public SortedSet> tailSet(Entry from)
     {
       return tailSet(from, true);
     }
-    
+
     public NavigableSet> tailSet(Entry from, boolean inclusive)
     {
       return (NavigableSet>) tailMap(from.getKey(), inclusive).navigableKeySet();
     }
-    
+
   } // class NavigableEntrySet
 
 } // class TreeMap
diff --git a/libjava/classpath/java/util/TreeSet.java b/libjava/classpath/java/util/TreeSet.java
index 572cda6425c..06f4fa5b3f6 100644
--- a/libjava/classpath/java/util/TreeSet.java
+++ b/libjava/classpath/java/util/TreeSet.java
@@ -291,7 +291,7 @@ public class TreeSet extends AbstractSet
    * The returned set is backed by the original, so changes
    * in one appear in the other. The subset will throw an
    * {@link IllegalArgumentException} for any attempt to access or add an
-   * element beyond the specified cutoff. 
+   * element beyond the specified cutoff.
    *
    * @param to the cutoff point
    * @param inclusive true if to should be included.
@@ -406,10 +406,10 @@ public class TreeSet extends AbstractSet
    * @throws IllegalArgumentException if from is greater than to
    */
   public NavigableSet subSet(T from, boolean fromInclusive,
-				T to, boolean toInclusive)
+                                T to, boolean toInclusive)
   {
     return new TreeSet(map.subMap(from, fromInclusive,
-				     to, toInclusive));
+                                     to, toInclusive));
   }
 
   /**
@@ -574,7 +574,7 @@ public class TreeSet extends AbstractSet
    * no such element.
    *
    * @param e the element relative to the returned element.
-   * @return the least element greater than 
+   * @return the least element greater than
    *         the given element, or null if there is
    *         no such element.
    * @throws ClassCastException if the specified element can not
@@ -596,7 +596,7 @@ public class TreeSet extends AbstractSet
    * no such element.
    *
    * @param e the element relative to the returned element.
-   * @return the greatest element less than 
+   * @return the greatest element less than
    *         the given element, or null if there is
    *         no such element.
    * @throws ClassCastException if the specified element can not
diff --git a/libjava/classpath/java/util/UUID.java b/libjava/classpath/java/util/UUID.java
index 9a402d15922..bb25e071c91 100644
--- a/libjava/classpath/java/util/UUID.java
+++ b/libjava/classpath/java/util/UUID.java
@@ -44,29 +44,29 @@ import java.security.NoSuchAlgorithmException;
 
 /**
  * This class represents a 128-bit UUID value.
- * 
+ *
  * There are several types of UUID, and while this class can be used to store
- * them, only the Leach-Salz (variant 2) UUID specified in RFC-4122 will 
+ * them, only the Leach-Salz (variant 2) UUID specified in RFC-4122 will
  * give meaningful results from the method calls.
  * See: http://tools.ietf.org/html/4122 for the details
  *
- * The format of a Leach-Salz (variant 2) time-based (version 1) UUID 
+ * The format of a Leach-Salz (variant 2) time-based (version 1) UUID
  * is as follows:
  * time_low - upper 32 bits of the most significant 64 bits,
  *            this is the least-significant part of the timestamp.
  *
  * time_mid - bits 16-31 of the most significant 64 bits,
- *            this is the middle portion of the timestamp. 
+ *            this is the middle portion of the timestamp.
  *
- * version  - bits 8-15 of the most significant 64 bits. 
+ * version  - bits 8-15 of the most significant 64 bits.
  *
  * time_hi  - bits 0-7 of the most significant 64 bits,
  *            the most significant portion of the timestamp.
  *
  * clock_and_reserved  - bits 48-63 of the least significant 64 bits.
- *                       a variable number of bits hold the variant 
+ *                       a variable number of bits hold the variant
  *                       (see the spec)
- * 
+ *
  * node identifier     - bits 0-47 of the least signficant 64 bits.
  *
  * These fields are valid only for version 1, in the remaining versions,
@@ -75,8 +75,8 @@ import java.security.NoSuchAlgorithmException;
  * @since 1.5
  * @author Sven de Marothy
  */
-public final class UUID 
-  extends Object 
+public final class UUID
+  extends Object
   implements Serializable, Comparable
 {
   private static final long serialVersionUID = -4856846361193249489L;
@@ -106,7 +106,7 @@ public final class UUID
     this.mostSigBits = mostSigBits;
     this.leastSigBits = leastSigBits;
   }
- 
+
   /**
    * Returns the clock-sequence value of this UUID.
    * This field only exists in a time-based (version 1) UUID.
@@ -147,8 +147,8 @@ public final class UUID
   {
     if( !(obj instanceof UUID ) )
       return false;
-    return ( ((UUID)obj).mostSigBits == mostSigBits && 
-	     ((UUID)obj).leastSigBits == leastSigBits );
+    return ( ((UUID)obj).mostSigBits == mostSigBits &&
+             ((UUID)obj).leastSigBits == leastSigBits );
   }
 
   /**
@@ -164,7 +164,7 @@ public final class UUID
     StringTokenizer st = new StringTokenizer( name.trim(), "-" );
     if( st.countTokens() < 5 )
       throw new IllegalArgumentException( "Incorrect UUID string"+
-					  " representation:"+name );
+                                          " representation:"+name );
 
     long msb = (Long.parseLong(st.nextToken(), 16) << 32); // time low
     msb |= (Long.parseLong(st.nextToken(), 16) << 16); // time mid
@@ -195,18 +195,18 @@ public final class UUID
     return // time-low first
       padHex( (( mostSigBits & 0xFFFFFFFF00000000L) >> 32) & 0xFFFFFFFFL, 8)
       + "-" + // then time-mid
-      padHex( (( mostSigBits & 0xFFFF0000L ) >> 16), 4 ) 
+      padHex( (( mostSigBits & 0xFFFF0000L ) >> 16), 4 )
       + "-" + // time-high
-      padHex( ( mostSigBits & 0x0000000000000000FFFFL ), 4 ) 
+      padHex( ( mostSigBits & 0x0000000000000000FFFFL ), 4 )
       + "-" + // clock (note - no reason to separate high and low here)
-      padHex( (((leastSigBits & 0xFFFF000000000000L) >> 48) & 0xFFFF), 4 ) 
+      padHex( (((leastSigBits & 0xFFFF000000000000L) >> 48) & 0xFFFF), 4 )
       + "-" + // finally the node value.
-      padHex(leastSigBits & 0xFFFFFFFFFFFFL, 12); 
+      padHex(leastSigBits & 0xFFFFFFFFFFFFL, 12);
   }
 
   /**
    * Returns the least significant 64 bits of the UUID as a long.
-   */ 
+   */
   public long getLeastSignificantBits()
   {
     return leastSigBits;
@@ -214,7 +214,7 @@ public final class UUID
 
   /**
    * Returns the most significant 64 bits of the UUID as a long.
-   */ 
+   */
   public long getMostSignificantBits()
   {
     return mostSigBits;
@@ -238,20 +238,20 @@ public final class UUID
    * from a series of bytes representing a name.
    */
   public static UUID nameUUIDFromBytes(byte[] name)
-  {    
+  {
     long msb, lsb;
     byte[] hash;
 
     try
       {
-	MessageDigest md5 = MessageDigest.getInstance("MD5");
-	hash = md5.digest( name );
-      } 
-    catch (NoSuchAlgorithmException e) 
-      {
-	throw new UnsupportedOperationException("No MD5 algorithm available.");
+        MessageDigest md5 = MessageDigest.getInstance("MD5");
+        hash = md5.digest( name );
       }
-	
+    catch (NoSuchAlgorithmException e)
+      {
+        throw new UnsupportedOperationException("No MD5 algorithm available.");
+      }
+
     msb = ((hash[0] & 0xFFL) << 56) | ((hash[1] & 0xFFL) << 48) |
       ((hash[2] & 0xFFL) << 40) | ((hash[3] & 0xFFL) << 32) |
       ((hash[4] & 0xFFL) << 24) | ((hash[5] & 0xFFL) << 16) |
@@ -262,23 +262,23 @@ public final class UUID
       ((hash[12] & 0xFFL) << 24) | ((hash[13] & 0xFFL) << 16) |
       ((hash[14] & 0xFFL) << 8) | (hash[15] & 0xFFL);
 
-    lsb &= 0x3FFFFFFFFFFFFFFFL; 
+    lsb &= 0x3FFFFFFFFFFFFFFFL;
     lsb |= 0x8000000000000000L; // set top two bits to variant 2
 
-    msb &= 0xFFFFFFFFFFFF0FFFL; 
-    msb |= 0x3000; // Version 3; 
+    msb &= 0xFFFFFFFFFFFF0FFFL;
+    msb |= 0x3000; // Version 3;
 
     return new UUID(msb, lsb);
   }
 
   /**
-   * Returns the 48-bit node value in a long. 
+   * Returns the 48-bit node value in a long.
    * This field only exists in a time-based (version 1) UUID.
    *
    * @throws UnsupportedOperationException if the UUID type is not 1.
    * @returns a long with the node value in the lower 48 bits.
    */
-  public long node() 
+  public long node()
   {
     if( version() != 1 )
       throw new UnsupportedOperationException("Not a type 1 UUID");
@@ -286,7 +286,7 @@ public final class UUID
   }
 
   /**
-   * Returns the 60-bit timestamp value of the UUID in a long. 
+   * Returns the 60-bit timestamp value of the UUID in a long.
    * This field only exists in a time-based (version 1) UUID.
    *
    * @throws UnsupportedOperationException if the UUID type is not 1.
@@ -309,15 +309,15 @@ public final class UUID
    *
    */
   public static UUID randomUUID()
-  {  
-    long lsb = r.nextLong(); 
+  {
+    long lsb = r.nextLong();
     long msb = r.nextLong();
 
-    lsb &= 0x3FFFFFFFFFFFFFFFL; 
+    lsb &= 0x3FFFFFFFFFFFFFFFL;
     lsb |= 0x8000000000000000L; // set top two bits to variant 2
 
-    msb &= 0xFFFFFFFFFFFF0FFFL; 
-    msb |= 0x4000; // Version 4; 
+    msb &= 0xFFFFFFFFFFFF0FFFL;
+    msb |= 0x4000; // Version 4;
 
     return new UUID( msb, lsb );
   }
@@ -350,7 +350,7 @@ public final class UUID
       return 0;
     if( (v & 0x02) == 0 ) // variant is 0 1 (Leach-Salz)
       return 2;
-    return v; // 6 or 7 
+    return v; // 6 or 7
   }
 
   /**
diff --git a/libjava/classpath/java/util/UnknownFormatConversionException.java b/libjava/classpath/java/util/UnknownFormatConversionException.java
index e37d9d356b2..7326a82500a 100644
--- a/libjava/classpath/java/util/UnknownFormatConversionException.java
+++ b/libjava/classpath/java/util/UnknownFormatConversionException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when a {@link Formatter} is supplied with an
  * unknown conversion.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class UnknownFormatConversionException 
+public class UnknownFormatConversionException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 19060418L;
diff --git a/libjava/classpath/java/util/UnknownFormatFlagsException.java b/libjava/classpath/java/util/UnknownFormatFlagsException.java
index b8f939ec42c..a7f4fc6abe3 100644
--- a/libjava/classpath/java/util/UnknownFormatFlagsException.java
+++ b/libjava/classpath/java/util/UnknownFormatFlagsException.java
@@ -38,15 +38,15 @@ exception statement from your version. */
 
 package java.util;
 
-/** 
+/**
  * Thrown when a {@link Formatter} is supplied with an
  * unknown flag.
  *
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- * @since 1.5 
+ * @since 1.5
  */
-public class UnknownFormatFlagsException 
+public class UnknownFormatFlagsException
   extends IllegalFormatException
 {
   private static final long serialVersionUID = 19370506L;
@@ -72,7 +72,7 @@ public class UnknownFormatFlagsException
     super("Unknown flag passed in " + s);
     if (s == null)
       throw new
-	NullPointerException("Null flags value passed to constructor.");
+        NullPointerException("Null flags value passed to constructor.");
     this.flags = s;
   }
 
diff --git a/libjava/classpath/java/util/Vector.java b/libjava/classpath/java/util/Vector.java
index 101a78ddac2..44370a1e4da 100644
--- a/libjava/classpath/java/util/Vector.java
+++ b/libjava/classpath/java/util/Vector.java
@@ -1,5 +1,5 @@
 /* Vector.java -- Class that provides growable arrays.
-   Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2006,  
+   Copyright (C) 1998, 1999, 2000, 2001, 2004, 2005, 2006,
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -167,8 +167,8 @@ public class Vector extends AbstractList
 
   /**
    * Copies the contents of the Vector into the provided array.  If the
-   * array is too small to fit all the elements in the Vector, an 
-   * {@link IndexOutOfBoundsException} is thrown without modifying the array.  
+   * array is too small to fit all the elements in the Vector, an
+   * {@link IndexOutOfBoundsException} is thrown without modifying the array.
    * Old elements in the array are overwritten by the new elements.
    *
    * @param a target array for the copy
@@ -578,7 +578,7 @@ public class Vector extends AbstractList
   {
     if (a.length < elementCount)
       a = (S[]) Array.newInstance(a.getClass().getComponentType(),
-				  elementCount);
+                                  elementCount);
     else if (a.length > elementCount)
       a[elementCount] = null;
     System.arraycopy(elementData, 0, a, 0, elementCount);
@@ -800,7 +800,7 @@ public class Vector extends AbstractList
     int end = index + csize;
     if (elementCount > 0 && index != elementCount)
       System.arraycopy(elementData, index,
-		       elementData, end, elementCount - index);
+                       elementData, end, elementCount - index);
     elementCount += csize;
     for ( ; index < end; index++)
       elementData[index] = itr.next();
@@ -941,7 +941,7 @@ public class Vector extends AbstractList
     // do so).
     throw new ArrayIndexOutOfBoundsException(index + operator + elementCount);
   }
-  
+
   /**
    * Serializes this object to the given stream.
    *
diff --git a/libjava/classpath/java/util/WeakHashMap.java b/libjava/classpath/java/util/WeakHashMap.java
index 1f460291558..3e4d34796ca 100644
--- a/libjava/classpath/java/util/WeakHashMap.java
+++ b/libjava/classpath/java/util/WeakHashMap.java
@@ -86,7 +86,7 @@ import java.lang.ref.WeakReference;
  * @since 1.2
  * @status updated to 1.4 (partial 1.5)
  */
-public class WeakHashMap extends AbstractMap 
+public class WeakHashMap extends AbstractMap
 {
   // WARNING: WeakHashMap is a CORE class in the bootstrap cycle. See the
   // comments in vm/reference/java/lang/Runtime for implications of this fact.
@@ -704,12 +704,12 @@ public class WeakHashMap extends AbstractMap
     while (next != bucket)
       {
          if (next == null) throw new InternalError("WeakHashMap in incosistent state");
-         prev = next; 
+         prev = next;
          next = prev.next;
       }
     if (prev == null)
       buckets[slot] = bucket.next;
-    else 
+    else
       prev.next = bucket.next;
 
     size--;
diff --git a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
index 02071829269..f9f1ac1b4aa 100644
--- a/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/libjava/classpath/java/util/concurrent/CopyOnWriteArrayList.java
@@ -75,12 +75,12 @@ import java.util.RandomAccess;
  * This class is especially useful when used with event handling, like the
  * following code demonstrates:
                  
  * 
                  - * 
+ *
  * CopyOnWriteArrayList listeners =
  *   new CopyOnWriteArrayList();
- * 
+ *
  * [...]
- * 
+ *
  * for (final EventListener listener : listeners)
  *   {
  *     Runnable dispatcher = new Runnable() {
@@ -89,22 +89,22 @@ import java.util.RandomAccess;
  *         listener.preferenceChange(event);
  *       }
  *     };
- *         
+ *
  *     Executor executor = Executors.newSingleThreadExecutor();
  *     executor.execute(dispatcher);
  *   }
  * 
                  
- * 
+ *
  * @since 1.5
  */
-public class CopyOnWriteArrayList 
+public class CopyOnWriteArrayList
   implements List, RandomAccess, Cloneable, Serializable
 {
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 8673264195747942595L;
-  
+
   /**
    * Where the data is stored.
    */
@@ -121,7 +121,7 @@ public class CopyOnWriteArrayList
   /**
    * Construct a new ArrayList, and initialize it with the elements in the
    * supplied Collection. The initial capacity is 110% of the Collection's size.
-   * 
+   *
    * @param c
    *          the collection whose elements will initialize this list
    * @throws NullPointerException
@@ -139,7 +139,7 @@ public class CopyOnWriteArrayList
   /**
    * Construct a new ArrayList, and initialize it with the elements in the
    * supplied array.
-   * 
+   *
    * @param array
    *          the array used to initialize this list
    * @throws NullPointerException
@@ -152,7 +152,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Returns the number of elements in this list.
-   * 
+   *
    * @return the list size
    */
   public int size()
@@ -162,7 +162,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Checks if the list is empty.
-   * 
+   *
    * @return true if there are no elements
    */
   public boolean isEmpty()
@@ -172,7 +172,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Returns true if element is in this ArrayList.
-   * 
+   *
    * @param e
    *          the element whose inclusion in the List is being tested
    * @return true if the list contains e
@@ -207,7 +207,7 @@ public class CopyOnWriteArrayList
   /**
    * Returns the lowest index at which element appears in this List, or -1 if it
    * does not appear.
-   * 
+   *
    * @param e
    *          the element whose inclusion in the List is being tested
    * @return the index where e was found
@@ -243,7 +243,7 @@ public class CopyOnWriteArrayList
   /**
    * Returns the highest index at which element appears in this List, or -1 if
    * it does not appear.
-   * 
+   *
    * @param e
    *          the element whose inclusion in the List is being tested
    * @return the index where e was found
@@ -278,7 +278,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Creates a shallow copy of this ArrayList (elements are not cloned).
-   * 
+   *
    * @return the cloned object
    */
   public Object clone()
@@ -298,7 +298,7 @@ public class CopyOnWriteArrayList
   /**
    * Returns an Object array containing all of the elements in this ArrayList.
    * The array is independent of this list.
-   * 
+   *
    * @return an array representation of this list
    */
   public Object[] toArray()
@@ -316,7 +316,7 @@ public class CopyOnWriteArrayList
    * of the elements in this List, a new Array will be created and returned; if
    * the passed-in Array is larger than the size of this List, then
    * size() index will be set to null.
-   * 
+   *
    * @param a
    *          the passed-in Array
    * @return an array representation of this list
@@ -338,7 +338,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Retrieves the element at the user-supplied index.
-   * 
+   *
    * @param index
    *          the index of the element we are fetching
    * @throws IndexOutOfBoundsException
@@ -352,7 +352,7 @@ public class CopyOnWriteArrayList
   /**
    * Sets the element at the specified index. The new element, e, can be an
    * object of any type or null.
-   * 
+   *
    * @param index
    *          the index at which the element is being set
    * @param e
@@ -373,7 +373,7 @@ public class CopyOnWriteArrayList
   /**
    * Appends the supplied element to the end of this list. The element, e, can
    * be an object of any type or null.
-   * 
+   *
    * @param e
    *          the element to be appended to this list
    * @return true, the add will always succeed
@@ -392,7 +392,7 @@ public class CopyOnWriteArrayList
    * Adds the supplied element at the specified index, shifting all elements
    * currently at that index or higher one to the right. The element, e, can be
    * an object of any type or null.
-   * 
+   *
    * @param index
    *          the index at which the element is being added
    * @param e
@@ -412,7 +412,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Removes the element at the user-supplied index.
-   * 
+   *
    * @param index
    *          the index of the element to be removed
    * @return the removed Object
@@ -423,20 +423,20 @@ public class CopyOnWriteArrayList
   {
     if (index < 0 || index >= this.size())
       throw new IndexOutOfBoundsException("index = " +  index);
-    
+
     E[] snapshot = this.data;
     E[] newData = (E[]) new Object[snapshot.length - 1];
-    
+
     E result = snapshot[index];
-    
+
     if (index > 0)
       System.arraycopy(snapshot, 0, newData, 0, index);
-    
+
     System.arraycopy(snapshot, index + 1, newData, index,
                      snapshot.length - index - 1);
-    
+
     this.data = newData;
-    
+
     return result;
   }
 
@@ -444,7 +444,7 @@ public class CopyOnWriteArrayList
    * Remove the first occurrence, if any, of the given object from this list,
    * returning true if the object was removed, false
    * otherwise.
-   * 
+   *
    * @param element the object to be removed.
    * @return true if element was removed, false otherwise. false means also that
    * the underlying storage was unchanged after this operation concluded.
@@ -458,7 +458,7 @@ public class CopyOnWriteArrayList
       return false;
 
     E[] newData = (E[]) new Object[len - 1];
-    
+
     // search the element to remove while filling the backup array
     // this way we can run this method in O(n)
     int elementIndex = -1;
@@ -469,40 +469,40 @@ public class CopyOnWriteArrayList
             elementIndex = i;
             break;
           }
-        
+
         if (i < newData.length)
           newData[i] = snapshot[i];
       }
-    
+
     if (elementIndex < 0)
       return false;
-     
+
     System.arraycopy(snapshot, elementIndex + 1, newData, elementIndex,
                      snapshot.length - elementIndex - 1);
     this.data = newData;
-    
+
     return true;
   }
-  
+
   /**
    * Removes all the elements contained in the given collection.
    * This method removes the elements that are contained in both
    * this list and in the given collection.
-   * 
+   *
    * @param c the collection containing the elements to be removed from this
    * list.
    * @return true if at least one element was removed, indicating that
-   * the list internal storage changed as a result, false otherwise. 
+   * the list internal storage changed as a result, false otherwise.
    */
   public synchronized boolean removeAll(Collection c)
   {
     if (c.size() == 0)
       return false;
-    
+
     E [] snapshot = this.data;
-    E [] storage = (E[]) new Object[this.data.length]; 
+    E [] storage = (E[]) new Object[this.data.length];
     boolean changed = false;
-    
+
     int length = 0;
     for (E element : snapshot)
       {
@@ -514,18 +514,18 @@ public class CopyOnWriteArrayList
         else
           storage[length++] = element;
       }
-    
+
     if (!changed)
       return false;
-    
+
     E[] newData = (E[]) new Object[length];
     System.arraycopy(storage, 0, newData, 0, length);
-    
+
     this.data = newData;
-    
+
     return true;
   }
-  
+
   /**
    * Removes all the elements that are not in the passed collection.
    * If the collection is void, this method has the same effect of
@@ -533,7 +533,7 @@ public class CopyOnWriteArrayList
    * Please, note that this method is extremely slow (unless the argument has
    * size == 0) and has bad performance is both space and time
    * usage.
-   * 
+   *
    * @param c the collection containing the elements to be retained by this
    * list.
    * @return true the list internal storage changed as a result of this
@@ -548,31 +548,31 @@ public class CopyOnWriteArrayList
         this.clear();
         return true;
       }
-    
+
     E [] snapshot = this.data;
-    E [] storage = (E[]) new Object[this.data.length]; 
-    
+    E [] storage = (E[]) new Object[this.data.length];
+
     int length = 0;
     for (E element : snapshot)
       {
         if (c.contains(element))
           storage[length++] = element;
       }
-    
+
     // means we retained all the elements previously in our storage
     // we are running already slow here, but at least we avoid copying
     // another array and changing the internal storage
     if (length == snapshot.length)
       return false;
-    
+
     E[] newData = (E[]) new Object[length];
     System.arraycopy(storage, 0, newData, 0, length);
-    
+
     this.data = newData;
-    
+
     return true;
   }
-  
+
   /**
    * Removes all elements from this List
    */
@@ -586,7 +586,7 @@ public class CopyOnWriteArrayList
    * what happens if you modify the list while this is taking place; for
    * example, if the collection contains this list. c can contain objects of any
    * type, as well as null values.
-   * 
+   *
    * @param c
    *          a Collection containing elements to be added to this List
    * @return true if the list was modified, in other words c is not empty
@@ -602,7 +602,7 @@ public class CopyOnWriteArrayList
    * Add all elements in the supplied collection, inserting them beginning at
    * the specified index. c can contain objects of any type, as well as null
    * values.
-   * 
+   *
    * @param index
    *          the index at which the elements will be inserted
    * @param c
@@ -616,37 +616,37 @@ public class CopyOnWriteArrayList
   {
     if (index < 0 || index > this.size())
       throw new IndexOutOfBoundsException("index = " +  index);
-    
+
     int csize = c.size();
     if (csize == 0)
       return false;
-    
+
     E[] data = this.data;
     Iterator itr = c.iterator();
-    
+
     E[] newData = (E[]) new Object[data.length + csize];
-    
+
     // avoid this call at all if we were asked to put the elements at the
     // beginning of our storage
     if (index != 0)
       System.arraycopy(data, 0, newData, 0, index);
-    
+
     int itemsLeft = index;
-    
+
     for (E value : c)
       newData[index++] = value;
-    
+
     // now copy the remaining elements
     System.arraycopy(data, itemsLeft, newData, 0, data.length - itemsLeft);
-    
+
     this.data = newData;
-    
+
     return true;
   }
-  
+
   /**
    * Adds an element if the list does not contains it already.
-   * 
+   *
    * @param val the element to add to the list.
    * @return true if the element was added, false otherwise.
    */
@@ -661,7 +661,7 @@ public class CopyOnWriteArrayList
   /**
    * Adds all the element from the given collection that are not already
    * in this list.
-   * 
+   *
    * @param c the Collection containing the elements to be inserted
    * @return true the list internal storage changed as a result of this
    * operation, false otherwise.
@@ -671,28 +671,28 @@ public class CopyOnWriteArrayList
     int size = c.size();
     if (size == 0)
       return 0;
-    
+
     E [] snapshot = this.data;
     E [] storage = (E[]) new Object[size];
-    
+
     size = 0;
     for (E val : c)
       {
         if (!this.contains(val))
           storage[size++] = val;
       }
-    
+
     if (size == 0)
       return 0;
-    
+
     // append storage to data
     E [] newData = (E[]) new Object[snapshot.length + size];
-    
+
     System.arraycopy(snapshot, 0, newData, 0, snapshot.length);
     System.arraycopy(storage, 0, newData, snapshot.length, size);
-    
+
     this.data = newData;
-    
+
     return size;
   }
 
@@ -705,19 +705,19 @@ public class CopyOnWriteArrayList
   {
     if (o == null)
       return false;
-    
+
     if (this == o)
       return true;
-    
+
     // let's see if 'o' is a list, if so, we need to compare the elements
     // as returned by the iterator
     if (o instanceof List)
       {
         List source = (List) o;
-        
+
         if (source.size() != this.size())
           return false;
-        
+
         Iterator sourceIterator = source.iterator();
         for (E element : this)
           {
@@ -727,10 +727,10 @@ public class CopyOnWriteArrayList
 
         return true;
       }
-    
+
     return false;
   }
-  
+
   public int hashCode()
   {
     // see http://java.sun.com/6/docs/api/java/util/List.html#hashcode()
@@ -741,14 +741,14 @@ public class CopyOnWriteArrayList
       }
     return hashcode;
   }
-  
+
   /**
    * Return an Iterator containing the elements of this list.
    * The Iterator uses a snapshot of the state of the internal storage
    * at the moment this method is called and does not support
    * update operations, so no synchronization is needed to traverse the
    * iterator.
-   * 
+   *
    * @return an Iterator containing the elements of this list in sequence.
    */
   public Iterator iterator()
@@ -757,7 +757,7 @@ public class CopyOnWriteArrayList
     {
       E [] iteratorData = CopyOnWriteArrayList.this.data;
       int currentElement = 0;
-      
+
       public boolean hasNext()
       {
         return (currentElement < iteratorData.length);
@@ -776,14 +776,14 @@ public class CopyOnWriteArrayList
       }
     };
   }
-  
+
   /**
    * Return a ListIterator containing the elements of this list.
    * The Iterator uses a snapshot of the state of the internal storage
    * at the moment this method is called and does not support
    * update operations, so no synchronization is needed to traverse the
    * iterator.
-   * 
+   *
    * @return a ListIterator containing the elements of this list in sequence.
    */
   public ListIterator listIterator()
@@ -800,7 +800,7 @@ public class CopyOnWriteArrayList
    * at the moment this method is called and does not support
    * update operations, so no synchronization is needed to traverse the
    * iterator.
-   * 
+   *
    * @param index the index at which to start iterating.
    * @return a ListIterator containing the elements of this list in sequence.
    */
@@ -814,7 +814,7 @@ public class CopyOnWriteArrayList
     {
       E [] iteratorData = CopyOnWriteArrayList.this.data;
       int currentElement = index;
-      
+
       public void add(E o)
       {
         throw new UnsupportedOperationException("updating of elements in " +
@@ -836,7 +836,7 @@ public class CopyOnWriteArrayList
       {
         if (hasNext() == false)
           throw new java.util.NoSuchElementException();
-        
+
         return iteratorData[currentElement++];
       }
 
@@ -849,7 +849,7 @@ public class CopyOnWriteArrayList
       {
         if (hasPrevious() == false)
           throw new java.util.NoSuchElementException();
-        
+
         return iteratorData[--currentElement];
       }
 
@@ -871,10 +871,10 @@ public class CopyOnWriteArrayList
                                                 "iterators is not supported " +
                                                 "by this class");
       }
-      
+
     };
   }
-  
+
   /**
    * Obtain a List view of a subsection of this list, from fromIndex
    * (inclusive) to toIndex (exclusive). If the two indices are equal, the
@@ -907,7 +907,7 @@ public class CopyOnWriteArrayList
    *
    * All methods first check to see if the actual modCount of the backing
    * list is equal to its expected value, and throw a
-   * ConcurrentModificationException if it is not. 
+   * ConcurrentModificationException if it is not.
    *
    * @param fromIndex the index that the returned list should start from
    *        (inclusive)
@@ -941,7 +941,7 @@ public class CopyOnWriteArrayList
    * @author Original author unknown
    * @author Eric Blake (ebb9@email.byu.edu)
    */
-  private static class SubList 
+  private static class SubList
     extends AbstractList
   {
     // Package visible, for use by iterator.
@@ -968,7 +968,7 @@ public class CopyOnWriteArrayList
       offset = fromIndex;
       size = toIndex - fromIndex;
     }
-    
+
     /**
      * This method checks the two modCount fields to ensure that there has
      * not been a concurrent modification, returning if all is okay.
@@ -982,7 +982,7 @@ public class CopyOnWriteArrayList
       if (data != backingList.data)
         throw new ConcurrentModificationException();
     }
-    
+
     /**
      * This method checks that a value is between 0 and size (inclusive). If
      * it is not, an exception is thrown.
@@ -997,7 +997,7 @@ public class CopyOnWriteArrayList
         throw new IndexOutOfBoundsException("Index: " + index +
                                             ", Size:" + size);
     }
-    
+
     /**
      * This method checks that a value is between 0 (inclusive) and size
      * (exclusive). If it is not, an exception is thrown.
@@ -1012,7 +1012,7 @@ public class CopyOnWriteArrayList
         throw new IndexOutOfBoundsException("Index: " + index +
                                             ", Size:" + size);
     }
-    
+
     /**
      * Specified by AbstractList.subList to return the private field size.
      *
@@ -1028,7 +1028,7 @@ public class CopyOnWriteArrayList
           return size;
         }
     }
-    
+
     public void clear()
     {
       synchronized (backingList)
@@ -1037,17 +1037,17 @@ public class CopyOnWriteArrayList
           E[] newData = (E[]) new Object[snapshot.length - size];
 
           int toIndex = size + offset;
-          
+
           System.arraycopy(snapshot, 0, newData, 0, offset);
           System.arraycopy(snapshot, toIndex, newData, offset,
                            snapshot.length - toIndex);
-          
+
           backingList.data = newData;
           this.data = backingList.data;
           this.size = 0;
         }
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -1070,14 +1070,14 @@ public class CopyOnWriteArrayList
         {
           checkMod();
           checkBoundsExclusive(index);
-          
+
           E el =  backingList.set(index + offset, o);
           this.data = backingList.data;
-          
+
           return el;
         }
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -1093,11 +1093,11 @@ public class CopyOnWriteArrayList
       {
         checkMod();
         checkBoundsExclusive(index);
-        
+
         return backingList.get(index + offset);
       }
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -1119,14 +1119,14 @@ public class CopyOnWriteArrayList
       {
         checkMod();
         checkBoundsInclusive(index);
-      
+
         backingList.add(index + offset, o);
-        
+
         this.data = backingList.data;
         size++;
       }
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -1145,14 +1145,14 @@ public class CopyOnWriteArrayList
         checkMod();
         checkBoundsExclusive(index);
         E o = backingList.remove(index + offset);
-        
+
         this.data = backingList.data;
         size--;
-        
+
         return o;
       }
     }
-    
+
     /**
      * Specified by AbstractList.subList to delegate to the backing list.
      *
@@ -1178,14 +1178,14 @@ public class CopyOnWriteArrayList
         checkBoundsInclusive(index);
         int csize = c.size();
         boolean result = backingList.addAll(offset + index, c);
-        
+
         this.data = backingList.data;
         size += csize;
-        
+
         return result;
       }
     }
-    
+
     /**
      * Specified by AbstractList.subList to return addAll(size, c).
      *
@@ -1208,7 +1208,7 @@ public class CopyOnWriteArrayList
         return addAll(size, c);
       }
     }
-    
+
     /**
      * Specified by AbstractList.subList to return listIterator().
      *
@@ -1218,7 +1218,7 @@ public class CopyOnWriteArrayList
     {
       return listIterator();
     }
-    
+
     /**
      * Specified by AbstractList.subList to return a wrapper around the
      * backing list's iterator.
@@ -1363,7 +1363,7 @@ public class CopyOnWriteArrayList
         /**
          * Adds the supplied object before the element that would be returned
          * by a call to next(), if the list supports addition.
-         * 
+         *
          * @param o The object to add to the list.
          * @throws UnsupportedOperationException if the list doesn't support
          *         the addition of new elements.
@@ -1378,7 +1378,7 @@ public class CopyOnWriteArrayList
         {
           throw new UnsupportedOperationException("Modification not supported " +
               "on CopyOnWriteArrayList iterators");
-        } 
+        }
       };
     }
   } // class SubList
@@ -1407,7 +1407,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Serializes this object to the given stream.
-   * 
+   *
    * @param s
    *          the stream to write to
    * @throws IOException
@@ -1430,7 +1430,7 @@ public class CopyOnWriteArrayList
 
   /**
    * Deserializes this object from the given stream.
-   * 
+   *
    * @param s
    *          the stream to read from
    * @throws ClassNotFoundException
@@ -1455,7 +1455,7 @@ public class CopyOnWriteArrayList
   {
     return o1 == null ? o2 == null : o1.equals(o2);
   }
-  
+
   Object[] getArray()
   {
     return data;
diff --git a/libjava/classpath/java/util/jar/Attributes.java b/libjava/classpath/java/util/jar/Attributes.java
index 329fe6323b7..88800294c40 100644
--- a/libjava/classpath/java/util/jar/Attributes.java
+++ b/libjava/classpath/java/util/jar/Attributes.java
@@ -67,7 +67,7 @@ import java.util.Set;
  * @see java.util.jar.Attributes.Name
  * @author Mark Wielaard (mark@klomp.org)
  */
-public class Attributes 
+public class Attributes
   implements Cloneable, Map
 {
 
@@ -87,16 +87,16 @@ public class Attributes
    * know names for the general main attributes, stand alone application
    * attributes, applet attributes, extension identification attributes,
    * package versioning and sealing attributes, file contents attributes,
-   * bean objects attribute and signing attributes. See the 
-   * 
+   * bean objects attribute and signing attributes. See the
+   *
    * 
                  The characters of a Name must obey the following restrictions:
                  
-   * 
+   *
    * 
                    
    * 
                  • Must contain at least one character
                    • 
    * 
                  • The first character must be alphanumeric (a-z, A-Z, 0-9)
                    • 
    * 
                  • All other characters must be alphanumeric, a '-' or a '_'
                    • 
    * 
                  
-   * 
+   *
    * 
                  When comparing Names (with equals) all characters are
    * converted to lowercase. But you can get the original case sensitive
    * string with the toString() method.
                  
@@ -125,13 +125,13 @@ public class Attributes
      * the version of this Manifest file.
      */
     public static final Name MANIFEST_VERSION = new Name(JarUtils.MANIFEST_VERSION);
-    
+
     /**
      * General main attribute -
      * the version of the jar file signature.
      */
     public static final Name SIGNATURE_VERSION = new Name(JarUtils.SIGNATURE_VERSION);
-    
+
     /**
      * General main attribute -
      * (relative) file paths of the libraries/classpaths that the Classes in
@@ -172,7 +172,7 @@ public class Attributes
      * the name if the extension library contained in the jar.
      */
     public static final Name EXTENSION_NAME = new Name("Extension-Name");
-    
+
     /**
      * Extension identification attribute -
      * synonym for EXTENSTION_NAME.
@@ -180,42 +180,42 @@ public class Attributes
     public static final Name EXTENSION_INSTALLATION = EXTENSION_NAME;
 
     // Package versioning and sealing attributes
-    
+
     /**
      * Package versioning -
      * name of extension library contained in this jar.
      */
     public static final Name IMPLEMENTATION_TITLE
       = new Name("Implementation-Title");
-    
+
     /**
      * Package versioning -
      * version of the extension library contained in this jar.
      */
     public static final Name IMPLEMENTATION_VERSION
       = new Name("Implementation-Version");
-    
+
     /**
      * Package versioning -
      * name of extension library creator contained in this jar.
      */
     public static final Name IMPLEMENTATION_VENDOR
       = new Name("Implementation-Vendor");
-    
+
     /**
      * Package versioning -
      * unique id of extension library creator.
      */
     public static final Name IMPLEMENTATION_VENDOR_ID
       = new Name("Implementation-Vendor-Id");
-    
+
     /**
      * Package versioning -
      * location where this implementation can be downloaded.
      */
     public static final Name IMPLEMENTATION_URL
       = new Name("Implementation-URL");
-    
+
     /**
      * Package versioning -
      * title of the specification contained in this jar.
@@ -263,7 +263,7 @@ public class Attributes
      * Creates a new Name from the given String.
      * Throws an IllegalArgumentException if the given String is empty or
      * contains any illegal Name characters.
-     * 
+     *
      * @param name the name of the new Name
      * @exception IllegalArgumentException if name isn't a valid String
      * representation of a Name
@@ -278,28 +278,28 @@ public class Attributes
 
       // there must be at least one character
       if (chars.length == 0)
-	throw new
-	  IllegalArgumentException
-	  ("There must be at least one character in a name");
+        throw new
+          IllegalArgumentException
+          ("There must be at least one character in a name");
 
       // first character must be alphanum
       char c = chars[0];
       if (!((c >= 'a' && c <= 'z') ||
-	    (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')))
-	throw new
-	  IllegalArgumentException("First character must be alphanum");
+            (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')))
+        throw new
+          IllegalArgumentException("First character must be alphanum");
 
       // all other characters must be alphanums, '-' or '_'
       for (int i = 1; i < chars.length; i++)
-	{
-	  c = chars[i];
-	  if (!((c >= 'a' && c <= 'z') ||
-		(c >= 'A' && c <= 'Z') ||
-		(c >= '0' && c <= '9') || (c == '-') || (c == '_')))
-	    throw new
-	      IllegalArgumentException
-	      ("Characters must be alphanums, '-' or '_'");
-	}
+        {
+          c = chars[i];
+          if (!((c >= 'a' && c <= 'z') ||
+                (c >= 'A' && c <= 'Z') ||
+                (c >= '0' && c <= '9') || (c == '-') || (c == '_')))
+            throw new
+              IllegalArgumentException
+              ("Characters must be alphanums, '-' or '_'");
+        }
 
       // Still here? Then convert to lower case and be done.
       // Store the original name for toString();
@@ -325,23 +325,23 @@ public class Attributes
     {
       // Quick and dirty check
       if (name == o)
-	return true;
+        return true;
 
       try
-	{
-	  // Note that the constructor already converts the strings to
-	  // lowercase.
-	  String otherName = ((Name) o).name;
-	  return name.equals(otherName);
-	}
+        {
+          // Note that the constructor already converts the strings to
+          // lowercase.
+          String otherName = ((Name) o).name;
+          return name.equals(otherName);
+        }
       catch (ClassCastException cce)
-	{
-	  return false;
-	}
+        {
+          return false;
+        }
       catch (NullPointerException npe)
-	{
-	  return false;
-	}
+        {
+          return false;
+        }
     }
 
     /**
@@ -514,15 +514,15 @@ public class Attributes
 
     try
       {
-	return map.equals(((Attributes) o).map);
+        return map.equals(((Attributes) o).map);
       }
     catch (ClassCastException cce)
       {
-	return false;
+        return false;
       }
     catch (NullPointerException npe)
       {
-	return false;
+        return false;
       }
   }
 
@@ -591,8 +591,8 @@ public class Attributes
   {
     if (!(attr instanceof Attributes))
       {
-	throw new
-	  ClassCastException("Supplied Map is not an instance of Attributes");
+        throw new
+          ClassCastException("Supplied Map is not an instance of Attributes");
       }
     map.putAll(attr);
   }
diff --git a/libjava/classpath/java/util/jar/JarEntry.java b/libjava/classpath/java/util/jar/JarEntry.java
index 515b45fa9b4..52cb2c31cc5 100644
--- a/libjava/classpath/java/util/jar/JarEntry.java
+++ b/libjava/classpath/java/util/jar/JarEntry.java
@@ -108,7 +108,7 @@ public class JarEntry extends ZipEntry
     super(entry);
     try
       {
-	attr = entry.getAttributes();
+        attr = entry.getAttributes();
       }
     catch (IOException _)
       {
@@ -130,11 +130,11 @@ public class JarEntry extends ZipEntry
   {
     if (attr != null)
       {
-	return (Attributes) attr.clone();
+        return (Attributes) attr.clone();
       }
     else
       {
-	return null;
+        return null;
       }
   }
 
diff --git a/libjava/classpath/java/util/jar/JarFile.java b/libjava/classpath/java/util/jar/JarFile.java
index 6807736590a..b67c953460e 100644
--- a/libjava/classpath/java/util/jar/JarFile.java
+++ b/libjava/classpath/java/util/jar/JarFile.java
@@ -199,8 +199,8 @@ public class JarFile extends ZipFile
     super(fileName);
     if (verify)
       {
-	manifest = readManifest();
-	verify();
+        manifest = readManifest();
+        verify();
       }
   }
 
@@ -236,8 +236,8 @@ public class JarFile extends ZipFile
     super(file);
     if (verify)
       {
-	manifest = readManifest();
-	verify();
+        manifest = readManifest();
+        verify();
       }
   }
 
@@ -256,7 +256,7 @@ public class JarFile extends ZipFile
    * @exception FileNotFoundException if the file does not exist
    * @exception IOException if another IO exception occurs while reading
    * @exception IllegalArgumentException when given an illegal mode
-   * 
+   *
    * @since 1.3
    */
   public JarFile(File file, boolean verify, int mode) throws
@@ -265,8 +265,8 @@ public class JarFile extends ZipFile
     super(file, mode);
     if (verify)
       {
-	manifest = readManifest();
-	verify();
+        manifest = readManifest();
+        verify();
       }
   }
 
@@ -280,8 +280,8 @@ public class JarFile extends ZipFile
     // only check if manifest is not null
     if (manifest == null)
       {
-	verify = false;
-	return;
+        verify = false;
+        return;
       }
 
     verify = true;
@@ -295,23 +295,23 @@ public class JarFile extends ZipFile
   {
     try
       {
-	ZipEntry manEntry = super.getEntry(MANIFEST_NAME);
-	if (manEntry != null)
-	  {
-	    InputStream in = super.getInputStream(manEntry);
-	    manifestRead = true;
-	    return new Manifest(in);
-	  }
-	else
-	  {
-	    manifestRead = true;
-	    return null;
-	  }
+        ZipEntry manEntry = super.getEntry(MANIFEST_NAME);
+        if (manEntry != null)
+          {
+            InputStream in = super.getInputStream(manEntry);
+            manifestRead = true;
+            return new Manifest(in);
+          }
+        else
+          {
+            manifestRead = true;
+            return null;
+          }
       }
     catch (IOException ioe)
       {
-	manifestRead = true;
-	return null;
+        manifestRead = true;
+        return null;
       }
   }
 
@@ -353,36 +353,36 @@ public class JarFile extends ZipFile
       JarEntry jar = new JarEntry(zip);
       Manifest manifest;
       try
-	{
-	  manifest = jarfile.getManifest();
-	}
+        {
+          manifest = jarfile.getManifest();
+        }
       catch (IOException ioe)
-	{
-	  manifest = null;
-	}
+        {
+          manifest = null;
+        }
 
       if (manifest != null)
-	{
-	  jar.attr = manifest.getAttributes(jar.getName());
-	}
+        {
+          jar.attr = manifest.getAttributes(jar.getName());
+        }
 
       synchronized(jarfile)
-	{
-	  if (jarfile.verify && !jarfile.signaturesRead)
-	    try
-	      {
-		jarfile.readSignatures();
-	      }
-	    catch (IOException ioe)
-	      {
-		if (JarFile.DEBUG)
-		  {
-		    JarFile.debug(ioe);
-		    ioe.printStackTrace();
-		  }
-		jarfile.signaturesRead = true; // fudge it.
-	      }
-	}
+        {
+          if (jarfile.verify && !jarfile.signaturesRead)
+            try
+              {
+                jarfile.readSignatures();
+              }
+            catch (IOException ioe)
+              {
+                if (JarFile.DEBUG)
+                  {
+                    JarFile.debug(ioe);
+                    ioe.printStackTrace();
+                  }
+                jarfile.signaturesRead = true; // fudge it.
+              }
+        }
       jar.jarfile = jarfile;
       return jar;
     }
@@ -398,38 +398,38 @@ public class JarFile extends ZipFile
     ZipEntry entry = super.getEntry(name);
     if (entry != null)
       {
-	JarEntry jarEntry = new JarEntry(entry);
-	Manifest manifest;
-	try
-	  {
-	    manifest = getManifest();
-	  }
-	catch (IOException ioe)
-	  {
-	    manifest = null;
-	  }
-
-	if (manifest != null)
-	  {
-	    jarEntry.attr = manifest.getAttributes(name);
+        JarEntry jarEntry = new JarEntry(entry);
+        Manifest manifest;
+        try
+          {
+            manifest = getManifest();
+          }
+        catch (IOException ioe)
+          {
+            manifest = null;
           }
 
-	if (verify && !signaturesRead)
-	  try
-	    {
-	      readSignatures();
-	    }
-	  catch (IOException ioe)
-	    {
-	      if (DEBUG)
-		{
-		  debug(ioe);
-		  ioe.printStackTrace();
-		}
-	      signaturesRead = true;
-	    }
+        if (manifest != null)
+          {
+            jarEntry.attr = manifest.getAttributes(name);
+          }
+
+        if (verify && !signaturesRead)
+          try
+            {
+              readSignatures();
+            }
+          catch (IOException ioe)
+            {
+              if (DEBUG)
+                {
+                  debug(ioe);
+                  ioe.printStackTrace();
+                }
+              signaturesRead = true;
+            }
         jarEntry.jarfile = this;
-	return jarEntry;
+        return jarEntry;
       }
     return null;
   }
@@ -734,11 +734,11 @@ public class JarFile extends ZipFile
   /**
    * Verifies that the digest(s) in a signature file were, in fact, made over
    * the manifest entry for ENTRY.
-   * 
+   *
    * @param entry The entry name.
    * @param attr The attributes from the signature file to verify.
    * @param hmManifestEntries Mappings of Jar file entry names to their manifest
-   *          entry text; i.e. the base-64 encoding of their 
+   *          entry text; i.e. the base-64 encoding of their
    */
   private boolean verifyHashes(String entry, Attributes attr,
                                HashMap hmManifestEntries)
@@ -820,8 +820,8 @@ public class JarFile extends ZipFile
     private boolean checked;
 
     EntryInputStream(final ZipEntry entry,
-		     final InputStream in,
-		     final JarFile jar)
+                     final InputStream in,
+                     final JarFile jar)
       throws IOException
     {
       super(in);
@@ -835,9 +835,9 @@ public class JarFile extends ZipFile
       Attributes attr;
       Manifest manifest = jarfile.getManifest();
       if (manifest != null)
-	attr = manifest.getAttributes(entry.getName());
+        attr = manifest.getAttributes(entry.getName());
       else
-	attr = null;
+        attr = null;
       if (DEBUG)
         debug("verifying entry " + entry + " attr=" + attr);
       if (attr == null)
@@ -958,24 +958,24 @@ public class JarFile extends ZipFile
                   + " comp=" + new java.math.BigInteger(hash).toString(16));
           if (!Arrays.equals(hash, hashes[i]))
             {
-	      synchronized(jarfile)
-		{
-		  if (DEBUG)
-		    debug(entry + " could NOT be verified");
-		  jarfile.verified.put(entry.getName(), Boolean.FALSE);
-		}
-	      return;
-	      // XXX ??? what do we do here?
-	      // throw new ZipException("message digest mismatch");
+              synchronized(jarfile)
+                {
+                  if (DEBUG)
+                    debug(entry + " could NOT be verified");
+                  jarfile.verified.put(entry.getName(), Boolean.FALSE);
+                }
+              return;
+              // XXX ??? what do we do here?
+              // throw new ZipException("message digest mismatch");
             }
         }
 
       synchronized(jarfile)
-	{
-	  if (DEBUG)
-	    debug(entry + " has been VERIFIED");
-	  jarfile.verified.put(entry.getName(), Boolean.TRUE);
-	}
+        {
+          if (DEBUG)
+            debug(entry + " has been VERIFIED");
+          jarfile.verified.put(entry.getName(), Boolean.TRUE);
+        }
     }
   }
 }
diff --git a/libjava/classpath/java/util/jar/JarInputStream.java b/libjava/classpath/java/util/jar/JarInputStream.java
index 1788af6add5..4de6609a596 100644
--- a/libjava/classpath/java/util/jar/JarInputStream.java
+++ b/libjava/classpath/java/util/jar/JarInputStream.java
@@ -108,18 +108,18 @@ public class JarInputStream extends ZipInputStream
   {
     firstEntry = (JarEntry) super.getNextEntry();
     while ((firstEntry != null) &&
-	   firstEntry.getName().startsWith("META-INF/"))
+           firstEntry.getName().startsWith("META-INF/"))
       {
-	if (firstEntry.getName().equals(JarFile.MANIFEST_NAME))
-	  {
-	    manifest = new Manifest(this);
-	  }
-	firstEntry = (JarEntry) super.getNextEntry();
+        if (firstEntry.getName().equals(JarFile.MANIFEST_NAME))
+          {
+            manifest = new Manifest(this);
+          }
+        firstEntry = (JarEntry) super.getNextEntry();
       }
 
     if (verify)
       {
-	// XXX
+        // XXX
       }
   }
 
@@ -136,7 +136,7 @@ public class JarInputStream extends ZipInputStream
     JarEntry jarEntry = new JarEntry(zipEntry);
     if (manifest != null)
       {
-	jarEntry.attr = manifest.getAttributes(name);
+        jarEntry.attr = manifest.getAttributes(name);
       }
     return jarEntry;
   }
@@ -163,12 +163,12 @@ public class JarInputStream extends ZipInputStream
     ZipEntry entry;
     if (firstEntry != null)
       {
-	entry = firstEntry;
-	firstEntry = null;
+        entry = firstEntry;
+        firstEntry = null;
       }
     else
       {
-	entry = super.getNextEntry();
+        entry = super.getNextEntry();
       }
     return entry;
   }
diff --git a/libjava/classpath/java/util/jar/JarOutputStream.java b/libjava/classpath/java/util/jar/JarOutputStream.java
index 46c71b38c4c..0ba6002cb47 100644
--- a/libjava/classpath/java/util/jar/JarOutputStream.java
+++ b/libjava/classpath/java/util/jar/JarOutputStream.java
@@ -100,7 +100,7 @@ public class JarOutputStream extends ZipOutputStream
   }
 
   /**
-   * Prepares the JarOutputStream for writing the next entry. 
+   * Prepares the JarOutputStream for writing the next entry.
    * This implementation just calls super.putNextEntry().
    *
    * @param entry The information for the next entry
@@ -108,6 +108,6 @@ public class JarOutputStream extends ZipOutputStream
    */
   public void putNextEntry(ZipEntry entry) throws IOException
   {
-    super.putNextEntry(entry);	// XXX
+    super.putNextEntry(entry);  // XXX
   }
 }
diff --git a/libjava/classpath/java/util/jar/Manifest.java b/libjava/classpath/java/util/jar/Manifest.java
index 980cfc60baf..f266d823ed3 100644
--- a/libjava/classpath/java/util/jar/Manifest.java
+++ b/libjava/classpath/java/util/jar/Manifest.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 package java.util.jar;
 
 import gnu.java.util.jar.JarUtils;
- 
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -48,7 +48,7 @@ import java.util.Map;
 /**
  * Reads, writes and manipulaties jar manifest files.
  * XXX
- * 
+ *
  * @since 1.2
  * @author Mark Wielaard (mark@klomp.org)
  */
@@ -153,7 +153,7 @@ public class Manifest implements Cloneable
 
   /**
    * Read and merge a Manifest from the designated input stream.
-   * 
+   *
    * @param in the input stream to read from.
    * @throws IOException if an I/O related exception occurs during the process.
    */
@@ -166,7 +166,7 @@ public class Manifest implements Cloneable
    * Writes the contents of this Manifest to the designated
    * output stream. Line-endings are platform-independent and consist of the
    * 2-codepoint sequence 0x0D and 0x0A.
-   * 
+   *
    * @param out the output stream to write this Manifest to.
    * @throws IOException if an I/O related exception occurs during the process.
    */
diff --git a/libjava/classpath/java/util/logging/ConsoleHandler.java b/libjava/classpath/java/util/logging/ConsoleHandler.java
index 3cf4bca3354..9f6bb724014 100644
--- a/libjava/classpath/java/util/logging/ConsoleHandler.java
+++ b/libjava/classpath/java/util/logging/ConsoleHandler.java
@@ -81,7 +81,7 @@ public class ConsoleHandler
   public ConsoleHandler()
   {
     super(System.err, "java.util.logging.ConsoleHandler", Level.INFO,
-	 /* formatter */ null, SimpleFormatter.class);
+         /* formatter */ null, SimpleFormatter.class);
   }
 
 
diff --git a/libjava/classpath/java/util/logging/ErrorManager.java b/libjava/classpath/java/util/logging/ErrorManager.java
index 57c079fe25b..291efb2f13f 100644
--- a/libjava/classpath/java/util/logging/ErrorManager.java
+++ b/libjava/classpath/java/util/logging/ErrorManager.java
@@ -82,7 +82,7 @@ public class ErrorManager
    */
   public static final int CLOSE_FAILURE = 3;
 
-    
+
   /**
    * Indicates that there was a problem upon opening
    * an output stream.
@@ -146,7 +146,7 @@ public class ErrorManager
        * widespread acceptance. See Classpath bug #2944.
        */
       if (everUsed)
-	return;
+        return;
 
       everUsed = true;
     }
@@ -191,4 +191,3 @@ public class ErrorManager
       ex.printStackTrace();
   }
 }
-
diff --git a/libjava/classpath/java/util/logging/FileHandler.java b/libjava/classpath/java/util/logging/FileHandler.java
index deba5c2e55c..00d967f57d6 100644
--- a/libjava/classpath/java/util/logging/FileHandler.java
+++ b/libjava/classpath/java/util/logging/FileHandler.java
@@ -120,7 +120,7 @@ import java.util.ListIterator;
  *     system property user.home.
  *
  * 
                • %g - replaced by a generation number for
- *     distinguisthing the individual items in the rotating set 
+ *     distinguisthing the individual items in the rotating set
  *     of log files.  The generation number cycles through the
  *     sequence 0, 1, ..., count - 1.
                  • 
  *
@@ -160,7 +160,7 @@ import java.util.ListIterator;
  * step is performed after any generation number has been
  * appended.
  *
- * 
                  Examples for the GNU platform: 
+ * 
                  Examples for the GNU platform:
  *
  * 
                    
  *
@@ -269,7 +269,7 @@ public class FileHandler
 
   /**
    * A linked list of files we are, or have written to. The entries
-   * are file path strings, kept in the order 
+   * are file path strings, kept in the order
    */
   private LinkedList logFiles;
 
@@ -291,9 +291,9 @@ public class FileHandler
     throws IOException, SecurityException
   {
     this(LogManager.getLogManager().getProperty(PATTERN_KEY),
-	 LogManager.getIntProperty(LIMIT_KEY, DEFAULT_LIMIT),
-	 LogManager.getIntProperty(COUNT_KEY, DEFAULT_COUNT),
-	 LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
+         LogManager.getIntProperty(LIMIT_KEY, DEFAULT_LIMIT),
+         LogManager.getIntProperty(COUNT_KEY, DEFAULT_COUNT),
+         LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
   }
 
 
@@ -317,8 +317,8 @@ public class FileHandler
   public FileHandler(String pattern, int limit, int count)
     throws IOException, SecurityException
   {
-    this(pattern, limit, count, 
-	 LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
+    this(pattern, limit, count,
+         LogManager.getBooleanProperty(APPEND_KEY, DEFAULT_APPEND));
   }
 
 
@@ -368,16 +368,16 @@ public class FileHandler
    *         the Sun reference implementation.
    */
   public FileHandler(String pattern,
-		     int limit,
-		     int count,
-		     boolean append)
+                     int limit,
+                     int count,
+                     boolean append)
     throws IOException, SecurityException
   {
     super(/* output stream, created below */ null,
-	  PROPERTY_PREFIX,
-	  /* default level */ Level.ALL,
-	  /* formatter */ null,
-	  /* default formatter */ XMLFormatter.class);
+          PROPERTY_PREFIX,
+          /* default level */ Level.ALL,
+          /* formatter */ null,
+          /* default formatter */ XMLFormatter.class);
 
     if ((limit <0) || (count < 1))
       throw new IllegalArgumentException();
@@ -426,7 +426,7 @@ public class FileHandler
 
       try
       {
-	File file = new File(path);
+        File file = new File(path);
         if (!file.exists () || append)
           {
             FileOutputStream fout = new FileOutputStream (file, append);
@@ -476,9 +476,9 @@ public class FileHandler
    *         pattern.
    */
   private static String replaceFileNameEscapes(String pattern,
-					       int generation,
-					       int uniqueNumber,
-					       int count)
+                                               int generation,
+                                               int uniqueNumber,
+                                               int count)
   {
     CPStringBuilder buf = new CPStringBuilder(pattern);
     String       replaceWith;
@@ -489,49 +489,49 @@ public class FileHandler
     {
       // Uncomment the next line for finding bugs.
       // System.out.println(buf.substring(0,pos) + '|' + buf.substring(pos));
-      
+
       if (buf.charAt(pos) == '/')
       {
-	/* The same value is also provided by java.io.File.separator. */
-	replaceWith = System.getProperty("file.separator");
-	buf.replace(pos, pos + 1, replaceWith);
-	pos = pos + replaceWith.length() - 1;
-	continue;
+        /* The same value is also provided by java.io.File.separator. */
+        replaceWith = System.getProperty("file.separator");
+        buf.replace(pos, pos + 1, replaceWith);
+        pos = pos + replaceWith.length() - 1;
+        continue;
       }
 
       if (buf.charAt(pos) == '%')
       {
         switch (buf.charAt(pos + 1))
-	{
-	case 't':
-	  replaceWith = System.getProperty("java.io.tmpdir");
-	  break;
+        {
+        case 't':
+          replaceWith = System.getProperty("java.io.tmpdir");
+          break;
 
-	case 'h':
-	  replaceWith = System.getProperty("user.home");
-	  break;
+        case 'h':
+          replaceWith = System.getProperty("user.home");
+          break;
 
-	case 'g':
-	  replaceWith = Integer.toString(generation);
-	  foundGeneration = true;
-	  break;
+        case 'g':
+          replaceWith = Integer.toString(generation);
+          foundGeneration = true;
+          break;
 
-	case 'u':
-	  replaceWith = Integer.toString(uniqueNumber);
-	  break;
+        case 'u':
+          replaceWith = Integer.toString(uniqueNumber);
+          break;
 
-	case '%':
-	  replaceWith = "%";
-	  break;
+        case '%':
+          replaceWith = "%";
+          break;
 
-	default:
-	  replaceWith = "??";
-	  break; // FIXME: Throw exception?
-	}
+        default:
+          replaceWith = "??";
+          break; // FIXME: Throw exception?
+        }
 
-	buf.replace(pos, pos + 2, replaceWith);
-	pos = pos + replaceWith.length() - 1;
-	continue;
+        buf.replace(pos, pos + 2, replaceWith);
+        pos = pos + replaceWith.length() - 1;
+        continue;
       }
     }
     while (++pos < buf.length() - 1);
diff --git a/libjava/classpath/java/util/logging/Formatter.java b/libjava/classpath/java/util/logging/Formatter.java
index ee747b0b978..feaf553152c 100644
--- a/libjava/classpath/java/util/logging/Formatter.java
+++ b/libjava/classpath/java/util/logging/Formatter.java
@@ -150,7 +150,7 @@ public abstract class Formatter
     {
       try
       {
-	msg = bundle.getString(msg);
+        msg = bundle.getString(msg);
       }
       catch (java.util.MissingResourceException _)
       {
@@ -160,8 +160,8 @@ public abstract class Formatter
     /* Format the message if there are parameters. */
     params = record.getParameters();
     if ((params != null)
-	&& (params.length > 0)
-	&& (msg.indexOf("{0") >= 0))
+        && (params.length > 0)
+        && (msg.indexOf("{0") >= 0))
     {
       msg = MessageFormat.format(msg, params);
     }
diff --git a/libjava/classpath/java/util/logging/Handler.java b/libjava/classpath/java/util/logging/Handler.java
index 616b50234c4..e254b4d35a6 100644
--- a/libjava/classpath/java/util/logging/Handler.java
+++ b/libjava/classpath/java/util/logging/Handler.java
@@ -179,7 +179,7 @@ h.setFormatter(h.getFormatter());
     throws SecurityException
   {
     LogManager.getLogManager().checkAccess();
-    
+
     /* Throws a NullPointerException if formatter is null. */
     formatter.getClass();
 
@@ -377,7 +377,7 @@ h.setFormatter(h.getFormatter());
   {
     if (record.getLevel().intValue() < level.intValue())
       return false;
-    
+
     if (filter != null)
       return filter.isLoggable(record);
     else
diff --git a/libjava/classpath/java/util/logging/Level.java b/libjava/classpath/java/util/logging/Level.java
index 48ff318a464..ea2c83fb2b8 100644
--- a/libjava/classpath/java/util/logging/Level.java
+++ b/libjava/classpath/java/util/logging/Level.java
@@ -180,12 +180,12 @@ public class Level implements Serializable
    * @param value the integer value of the level.  Please note
    *     that the JavaTM
    *     Logging API does not specify integer
-   *	 values for standard levels (such as
-   *	 Level.FINE).  Therefore, a custom
-   *	 level should pass an integer value that
-   *	 is calculated at run-time, e.g.
-   *	 (Level.FINE.intValue() + Level.CONFIG.intValue())
-   *	 / 2 for a level between FINE and CONFIG.
+   *     values for standard levels (such as
+   *     Level.FINE).  Therefore, a custom
+   *     level should pass an integer value that
+   *     is calculated at run-time, e.g.
+   *     (Level.FINE.intValue() + Level.CONFIG.intValue())
+   *     / 2 for a level between FINE and CONFIG.
    */
   protected Level(String name, int value)
   {
@@ -205,13 +205,13 @@ public class Level implements Serializable
    *
    * @param value the integer value of the level.  Please note
    *        that the JavaTM
-   *	    Logging API does not specify integer
-   *	    values for standard levels (such as
-   *	    Level.FINE).  Therefore, a custom
-   *	    level should pass an integer value that
-   *	    is calculated at run-time, e.g.
-   *	    (Level.FINE.intValue() + Level.CONFIG.intValue())
-   *	    / 2 for a level between FINE and CONFIG.
+   *        Logging API does not specify integer
+   *        values for standard levels (such as
+   *        Level.FINE).  Therefore, a custom
+   *        level should pass an integer value that
+   *        is calculated at run-time, e.g.
+   *        (Level.FINE.intValue() + Level.CONFIG.intValue())
+   *        / 2 for a level between FINE and CONFIG.
    *
    * @param resourceBundleName the name of a resource bundle
    *       for localizing the level name, or null
@@ -243,7 +243,7 @@ public class Level implements Serializable
   {
     for (int i = 0; i < knownLevels.length; i++)
       if (value == knownLevels[i].intValue())
-	return knownLevels[i];
+        return knownLevels[i];
 
     return this;
   }
@@ -286,7 +286,7 @@ public class Level implements Serializable
       try
       {
         ResourceBundle b = ResourceBundle.getBundle(resourceBundleName);
-	localizedName = b.getString(name);
+        localizedName = b.getString(name);
       }
       catch (Exception _)
       {
@@ -345,15 +345,15 @@ public class Level implements Serializable
       // standard logging levels will be returned by this method, and
       // they are all created using string literals.
       if (name == knownLevels[i].name)
-	return knownLevels[i];
+        return knownLevels[i];
     }
-    
+
     try
     {
       int num = Integer.parseInt(name);
       for (int i = 0; i < knownLevels.length; i++)
-	if (num == knownLevels[i].value)
-	  return knownLevels[i];
+        if (num == knownLevels[i].value)
+          return knownLevels[i];
     }
     catch (NumberFormatException _)
     {
@@ -369,7 +369,7 @@ public class Level implements Serializable
    * another object.
    *
    * @return true if other is an instance of
-   *	 java.util.logging.Level and has the same integer
+   *     java.util.logging.Level and has the same integer
    * value, false otherwise.
    */
   public boolean equals(Object other)
@@ -388,7 +388,7 @@ public class Level implements Serializable
   public int hashCode()
   {
     return value;
-  }  
+  }
 
 
   /**
@@ -409,9 +409,8 @@ public class Level implements Serializable
   {
     for (int i = 0; i < knownLevels.length; i++)
       if (knownLevels[i] == this)
-	return true;
+        return true;
 
     return false;
   }
 }
-
diff --git a/libjava/classpath/java/util/logging/LogManager.java b/libjava/classpath/java/util/logging/LogManager.java
index 6daf3dbd9eb..dffa44d9cf0 100644
--- a/libjava/classpath/java/util/logging/LogManager.java
+++ b/libjava/classpath/java/util/logging/LogManager.java
@@ -150,7 +150,7 @@ public class LogManager
    * this case.
    */
   private final PropertyChangeSupport pcs = new PropertyChangeSupport( /* source bean */
-								      LogManager.class);
+                                                                      LogManager.class);
 
   protected LogManager()
   {
@@ -272,13 +272,13 @@ public class LogManager
     ref = loggers.get(name);
     if (ref != null)
       {
-	if (ref.get() != null)
-	  return false;
+        if (ref.get() != null)
+          return false;
 
-	/* There has been a logger under this name in the past,
-	 * but it has been garbage collected.
-	 */
-	loggers.remove(ref);
+        /* There has been a logger under this name in the past,
+         * but it has been garbage collected.
+         */
+        loggers.remove(ref);
       }
 
     /* Adding a named logger requires a security permission. */
@@ -292,10 +292,10 @@ public class LogManager
 
     // The level of the newly added logger must be specified.
     // The easiest case is if there is a level for exactly this logger
-    // in the properties. If no such level exists the level needs to be 
+    // in the properties. If no such level exists the level needs to be
     // searched along the hirachy. So if there is a new logger 'foo.blah.blub'
     // and an existing parent logger 'foo' the properties 'foo.blah.blub.level'
-    // and 'foo.blah.level' need to be checked. If both do not exist in the 
+    // and 'foo.blah.level' need to be checked. If both do not exist in the
     // properties the level of the new logger is set to 'null' (i.e. it uses the
     // level of its parent 'foo').
     Level logLevel = logger.getLevel();
@@ -320,21 +320,21 @@ public class LogManager
      */
     for (Iterator iter = loggers.keySet().iterator(); iter.hasNext();)
       {
-	Logger possChild = (Logger) ((WeakReference) loggers.get(iter.next()))
-	  .get();
-	if ((possChild == null) || (possChild == logger)
-	    || (possChild.getParent() != parent))
-	  continue;
-	
-	if (! possChild.getName().startsWith(name))
-	  continue;
-	
-	if (possChild.getName().charAt(name.length()) != '.')
-	  continue;
-	
-	possChild.setParent(logger);
+        Logger possChild = (Logger) ((WeakReference) loggers.get(iter.next()))
+          .get();
+        if ((possChild == null) || (possChild == logger)
+            || (possChild.getParent() != parent))
+          continue;
+
+        if (! possChild.getName().startsWith(name))
+          continue;
+
+        if (possChild.getName().charAt(name.length()) != '.')
+          continue;
+
+        possChild.setParent(logger);
       }
-    
+
     return true;
   }
 
@@ -369,20 +369,20 @@ public class LogManager
 
     for (String candName : loggers.keySet())
       {
-	candNameLength = candName.length();
+        candNameLength = candName.length();
 
-	if (candNameLength > bestNameLength
-	    && childNameLength > candNameLength
-	    && childName.startsWith(candName)
-	    && childName.charAt(candNameLength) == '.')
-	  {
-	    cand = loggers.get(candName).get();
-	    if ((cand == null) || (cand == child))
-	      continue;
+        if (candNameLength > bestNameLength
+            && childNameLength > candNameLength
+            && childName.startsWith(candName)
+            && childName.charAt(candNameLength) == '.')
+          {
+            cand = loggers.get(candName).get();
+            if ((cand == null) || (cand == child))
+              continue;
 
-	    bestNameLength = candName.length();
-	    best = cand;
-	  }
+            bestNameLength = candName.length();
+            best = cand;
+          }
       }
 
     return best;
@@ -447,22 +447,22 @@ public class LogManager
     Iterator> iter = loggers.values().iterator();
     while (iter.hasNext())
       {
-	WeakReference ref;
-	Logger logger;
+        WeakReference ref;
+        Logger logger;
 
-	ref = iter.next();
-	if (ref != null)
-	  {
-	    logger = ref.get();
+        ref = iter.next();
+        if (ref != null)
+          {
+            logger = ref.get();
 
-	    if (logger == null)
-	      iter.remove();
-	    else if (logger != Logger.root)
-	      {
-	        logger.resetLogger();
-	        logger.setLevel(null);
-	      }
-	  }
+            if (logger == null)
+              iter.remove();
+            else if (logger != Logger.root)
+              {
+                logger.resetLogger();
+                logger.setLevel(null);
+              }
+          }
       }
 
     Logger.root.setLevel(Level.INFO);
@@ -505,7 +505,7 @@ public class LogManager
         try
           {
             inputStream = new URL(url).openStream();
-          } 
+          }
         catch (Exception e)
           {
             inputStream=null;
@@ -549,46 +549,46 @@ public class LogManager
 
     while (keys.hasMoreElements())
       {
-	String key = ((String) keys.nextElement()).trim();
-	String value = newProperties.getProperty(key);
+        String key = ((String) keys.nextElement()).trim();
+        String value = newProperties.getProperty(key);
 
-	if (value == null)
-	  continue;
+        if (value == null)
+          continue;
 
-	value = value.trim();
+        value = value.trim();
 
-	if ("handlers".equals(key))
-	  {
-	    // In Java 5 and earlier this was specified to be
-	    // whitespace-separated, but in reality it also accepted
-	    // commas (tomcat relied on this), and in Java 6 the
-	    // documentation was updated to fit the implementation.
-	    StringTokenizer tokenizer = new StringTokenizer(value,
-							    " \t\n\r\f,");
-	    while (tokenizer.hasMoreTokens())
-	      {
-		String handlerName = tokenizer.nextToken();
+        if ("handlers".equals(key))
+          {
+            // In Java 5 and earlier this was specified to be
+            // whitespace-separated, but in reality it also accepted
+            // commas (tomcat relied on this), and in Java 6 the
+            // documentation was updated to fit the implementation.
+            StringTokenizer tokenizer = new StringTokenizer(value,
+                                                            " \t\n\r\f,");
+            while (tokenizer.hasMoreTokens())
+              {
+                String handlerName = tokenizer.nextToken();
                 Handler handler = (Handler)
                   createInstance(handlerName, Handler.class, key);
-		// Tomcat also relies on the implementation ignoring
-		// items in 'handlers' which are not class names.
-		if (handler != null)
-		  Logger.root.addHandler(handler);
-	      }
-	  }
+                // Tomcat also relies on the implementation ignoring
+                // items in 'handlers' which are not class names.
+                if (handler != null)
+                  Logger.root.addHandler(handler);
+              }
+          }
 
-	if (key.endsWith(".level"))
-	  {
-	    String loggerName = key.substring(0, key.length() - 6);
-	    Logger logger = getLogger(loggerName);
+        if (key.endsWith(".level"))
+          {
+            String loggerName = key.substring(0, key.length() - 6);
+            Logger logger = getLogger(loggerName);
 
-	    if (logger == null)
-	      {
-		logger = Logger.getLogger(loggerName);
-		addLogger(logger);
-	      }
+            if (logger == null)
+              {
+                logger = Logger.getLogger(loggerName);
+                addLogger(logger);
+              }
             Level level = null;
-	    try
+            try
               {
                 level = Level.parse(value);
               }
@@ -600,8 +600,8 @@ public class LogManager
               {
                 logger.setLevel(level);
               }
-	    continue;
-	  }
+            continue;
+          }
       }
 
     /* The API specification does not talk about the
@@ -640,11 +640,11 @@ public class LogManager
   {
     try
       {
-	return Integer.parseInt(getLogManager().getProperty(name));
+        return Integer.parseInt(getLogManager().getProperty(name));
       }
     catch (Exception ex)
       {
-	return defaultValue;
+        return defaultValue;
       }
   }
 
@@ -691,11 +691,11 @@ public class LogManager
   {
     try
       {
-	return (Boolean.valueOf(getLogManager().getProperty(name))).booleanValue();
+        return (Boolean.valueOf(getLogManager().getProperty(name))).booleanValue();
       }
     catch (Exception ex)
       {
-	return defaultValue;
+        return defaultValue;
       }
   }
 
@@ -717,14 +717,14 @@ public class LogManager
     try
       {
         String value = getLogManager().getProperty(propertyName);
-	if (value != null)
-	  return Level.parse(getLogManager().getProperty(propertyName));
+        if (value != null)
+          return Level.parse(getLogManager().getProperty(propertyName));
         else
-	   return defaultValue;
+           return defaultValue;
       }
     catch (Exception ex)
       {
-	return defaultValue;
+        return defaultValue;
       }
   }
 
@@ -784,15 +784,15 @@ public class LogManager
 
     try
       {
-	return defaultClass.newInstance();
+        return defaultClass.newInstance();
       }
     catch (java.lang.InstantiationException ex)
       {
-	throw new RuntimeException(ex.getMessage());
+        throw new RuntimeException(ex.getMessage());
       }
     catch (java.lang.IllegalAccessException ex)
       {
-	throw new RuntimeException(ex.getMessage());
+        throw new RuntimeException(ex.getMessage());
       }
   }
 
diff --git a/libjava/classpath/java/util/logging/LogRecord.java b/libjava/classpath/java/util/logging/LogRecord.java
index af7f2058dbe..ee99ee69a22 100644
--- a/libjava/classpath/java/util/logging/LogRecord.java
+++ b/libjava/classpath/java/util/logging/LogRecord.java
@@ -140,7 +140,7 @@ public class LogRecord
    *
    * @param message the message text (which will be used as key
    *                for looking up the localized message text
-   *                if a resource bundle has been associated). 
+   *                if a resource bundle has been associated).
    */
   public LogRecord(Level level, String message)
   {
@@ -182,7 +182,7 @@ public class LogRecord
     {
       parameters = new Object[numParams];
       for (int i = 0; i < numParams; i++)
-	parameters[i] = in.readObject();
+        parameters[i] = in.readObject();
     }
   }
 
@@ -220,10 +220,10 @@ public class LogRecord
       out.writeInt(parameters.length);
       for (int i = 0; i < parameters.length; i++)
       {
-	if (parameters[i] == null)
-	  out.writeObject(null);
-	else
-	  out.writeObject(parameters[i].toString());
+        if (parameters[i] == null)
+          out.writeObject(null);
+        else
+          out.writeObject(parameters[i].toString());
       }
     }
   }
@@ -331,11 +331,11 @@ public class LogRecord
   {
     resourceBundleName = name;
     bundle = null;
-    
+
     try
     {
       if (resourceBundleName != null)
-	bundle = ResourceBundle.getBundle(resourceBundleName);
+        bundle = ResourceBundle.getBundle(resourceBundleName);
     }
     catch (java.util.MissingResourceException _)
     {
@@ -427,7 +427,7 @@ public class LogRecord
    * parameter to some logging calls, and in certain cases, the
    * logging framework tries to determine an approximation
    * (which may or may not be accurate).
-   * 
+   *
    * @return the name of the class that issued the logging request,
    *         or null if this information could not
    *         be obtained.
@@ -450,7 +450,7 @@ public class LogRecord
    * to the logging framework, applications should not modify it
    * anymore.  Therefore, this method should only be called on
    * freshly constructed LogRecords.
-   * 
+   *
    * @param sourceClassName the name of the class that issued the
    *          logging request, or null to indicate that
    *          this information could not be obtained.
@@ -467,7 +467,7 @@ public class LogRecord
    * parameter to some logging calls, and in certain cases, the
    * logging framework tries to determine an approximation
    * (which may or may not be accurate).
-   * 
+   *
    * @return the name of the method that issued the logging request,
    *         or null if this information could not
    *         be obtained.
@@ -490,7 +490,7 @@ public class LogRecord
    * to the logging framework, applications should not modify it
    * anymore.  Therefore, this method should only be called on
    * freshly constructed LogRecords.
-   * 
+   *
    * @param sourceMethodName the name of the method that issued the
    *          logging request, or null to indicate that
    *          this information could not be obtained.
@@ -543,7 +543,7 @@ public class LogRecord
    *
    * @param message the message text (which will be used as key
    *                for looking up the localized message text
-   *                if a resource bundle has been associated). 
+   *                if a resource bundle has been associated).
    */
   public void setMessage(String message)
   {
diff --git a/libjava/classpath/java/util/logging/Logger.java b/libjava/classpath/java/util/logging/Logger.java
index cddc02d1c9c..c55e133e5bf 100644
--- a/libjava/classpath/java/util/logging/Logger.java
+++ b/libjava/classpath/java/util/logging/Logger.java
@@ -65,7 +65,7 @@ import java.security.PrivilegedAction;
  * to perform any modifications to the logger.
  * 
                    
  * FIXME: Write more documentation.
- * 
+ *
  * @author Sascha Brawer (brawer@acm.org)
  */
 public class Logger
@@ -85,7 +85,7 @@ public class Logger
    * to avoid deadlocks. Yeah, no kidding, we got them :)
    */
   private static final Object[] lock = new Object[0];
-  
+
   static
     {
       // Our class might be initialized from an unprivileged context
@@ -159,7 +159,7 @@ public class Logger
    * (with ResourceBundle for localization) or
    * {@link #getLogger(java.lang.String) getLogger} (without ResourceBundle),
    * respectively.
-   * 
+   *
    * @param name the name for the logger, for example "java.awt" or
    *            "com.foo.bar". The name should be based on the name of the
    *            package issuing log records and consist of dot-separated Java
@@ -196,7 +196,7 @@ public class Logger
   /**
    * Finds a registered logger for a subsystem, or creates one in case no logger
    * has been registered yet.
-   * 
+   *
    * @param name the name for the logger, for example "java.awt" or
    *            "com.foo.bar". The name should be based on the name of the
    *            package issuing log records and consist of dot-separated Java
@@ -232,7 +232,7 @@ public class Logger
    * a different one than specified by resourceBundleName, an
    * IllegalArgumentException is thrown.
    * 
                  
-   * 
+   *
    * @param name the name for the logger, for example "java.awt" or
    *            "org.gnu.foo". The name should be based on the name of the
    *            package issuing log records and consist of dot-separated Java
@@ -351,7 +351,7 @@ public class Logger
    * 
                  
    * The parent of the newly created logger will the the root logger, from which
    * the level threshold and the handlers are inherited.
-   * 
+   *
    * @param resourceBundleName the name of a resource bundle for localizing
    *            messages, or null to indicate that messages do
    *            not need to be localized.
@@ -372,7 +372,7 @@ public class Logger
   /**
    * Returns the name of the resource bundle that is being used for localizing
    * messages.
-   * 
+   *
    * @return the name of the resource bundle used for localizing messages, or
    *         null if the parent's resource bundle is used for
    *         this purpose.
@@ -387,7 +387,7 @@ public class Logger
 
   /**
    * Returns the resource bundle that is being used for localizing messages.
-   * 
+   *
    * @return the resource bundle used for localizing messages, or
    *         null if the parent's resource bundle is used for
    *         this purpose.
@@ -405,7 +405,7 @@ public class Logger
    * log records with a lower severity level will be discarded; a log record of
    * the same or a higher level will be published unless an installed
    * Filter decides to discard it.
-   * 
+   *
    * @return the severity level below which all log messages will be discarded,
    *         or null if the logger inherits the threshold from
    *         its parent.
@@ -421,7 +421,7 @@ public class Logger
   /**
    * Returns whether or not a message of the specified level would be logged by
    * this logger.
-   * 
+   *
    * @throws NullPointerException if level is null.
    */
   public boolean isLoggable(Level level)
@@ -443,7 +443,7 @@ public class Logger
    * records with a lower severity level will be discarded immediately. A log
    * record of the same or a higher level will be published unless an installed
    * Filter decides to discard it.
-   * 
+   *
    * @param level the severity level below which all log messages will be
    *            discarded, or null to indicate that the logger
    *            should inherit the threshold from its parent.
@@ -502,7 +502,7 @@ public class Logger
 
   /**
    * Returns the name of this logger.
-   * 
+   *
    * @return the name of this logger, or null if the logger is
    *         anonymous.
    */
@@ -528,7 +528,7 @@ public class Logger
    * create a new LogRecord and pass it to this method. Therefore, subclasses
    * usually just need to override this single method for customizing the
    * logging behavior.
-   * 
+   *
    * @param record the log record to be inspected and possibly forwarded.
    */
   public void log(LogRecord record)
@@ -825,7 +825,7 @@ public class Logger
    * understandable to an inexperienced, non-technical end user. Ideally, they
    * explain in simple words what actions the user can take in order to resolve
    * the problem.
-   * 
+   *
    * @see Level#SEVERE
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
@@ -847,7 +847,7 @@ public class Logger
    * should be understandable to an inexperienced, non-technical end user.
    * Ideally, they explain in simple words what actions the user can take in
    * order to resolve the problem.
-   * 
+   *
    * @see Level#WARNING
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
@@ -871,7 +871,7 @@ public class Logger
    * used only for messages that are important to end users and system
    * administrators. Messages at this level should be understandable to an
    * inexperienced, non-technical user.
-   * 
+   *
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
    *            to pass null, this is not recommended, since a
@@ -890,7 +890,7 @@ public class Logger
    * Logs a message with severity level CONFIG. {@link Level#CONFIG} is intended
    * for static configuration messages, for example about the windowing
    * environment, the operating system version, etc.
-   * 
+   *
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
    *            to pass null, this is not recommended, since a
@@ -910,7 +910,7 @@ public class Logger
    * messages that are relevant for developers using the component generating
    * log messages. Examples include minor, recoverable failures, or possible
    * inefficiencies.
-   * 
+   *
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
    *            to pass null, this is not recommended, since a
@@ -929,7 +929,7 @@ public class Logger
    * Logs a message with severity level FINER. {@link Level#FINER} is intended
    * for rather detailed tracing, for example entering a method, returning from
    * a method, or throwing an exception.
-   * 
+   *
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
    *            to pass null, this is not recommended, since a
@@ -948,7 +948,7 @@ public class Logger
    * Logs a message with severity level FINEST. {@link Level#FINEST} is intended
    * for highly detailed tracing, for example reaching a certain point inside
    * the body of a method.
-   * 
+   *
    * @param message the message text, also used as look-up key if the logger is
    *            localizing messages with a resource bundle. While it is possible
    *            to pass null, this is not recommended, since a
@@ -966,7 +966,7 @@ public class Logger
   /**
    * Adds a handler to the set of handlers that get notified when a log record
    * is to be published.
-   * 
+   *
    * @param handler the handler to be added.
    * @throws NullPointerException if handler is null.
    * @throws SecurityException if this logger is not anonymous, a security
@@ -1001,7 +1001,7 @@ public class Logger
   /**
    * Removes a handler from the set of handlers that get notified when a log
    * record is to be published.
-   * 
+   *
    * @param handler the handler to be removed.
    * @throws SecurityException if this logger is not anonymous, a security
    *             manager exists, and the caller is not granted the permission to
@@ -1053,7 +1053,7 @@ public class Logger
   /**
    * Returns whether or not this Logger forwards log records to handlers
    * registered for its parent loggers.
-   * 
+   *
    * @return false if this Logger sends log records merely to
    *         Handlers registered with itself; true if this Logger
    *         sends log records not only to Handlers registered with itself, but
@@ -1070,7 +1070,7 @@ public class Logger
   /**
    * Sets whether or not this Logger forwards log records to handlers registered
    * for its parent loggers.
-   * 
+   *
    * @param useParentHandlers false to let this Logger send log
    *            records merely to Handlers registered with itself;
    *            true to let this Logger send log records not only
@@ -1101,7 +1101,7 @@ public class Logger
   /**
    * Returns the parent of this logger. By default, the parent is assigned by
    * the LogManager by inspecting the logger's name.
-   * 
+   *
    * @return the parent of this logger (as detemined by the LogManager by
    *         inspecting logger names), the root logger if no other logger has a
    *         name which is a prefix of this logger's name, or null
@@ -1121,7 +1121,7 @@ public class Logger
    * loggers reflects the hierarchical logger namespace. Basically, this method
    * should not be public at all, but the GNU implementation follows the API
    * specification.
-   * 
+   *
    * @throws NullPointerException if parent is null.
    * @throws SecurityException if this logger is not anonymous, a security
    *             manager exists, and the caller is not granted the permission to
@@ -1155,7 +1155,7 @@ public class Logger
   /**
    * Gets the StackTraceElement of the first class that is not this class. That
    * should be the initial caller of a logging method.
-   * 
+   *
    * @return caller of the initial logging method or null if unknown.
    */
   private StackTraceElement getCallerStackFrame()
diff --git a/libjava/classpath/java/util/logging/LoggingMXBean.java b/libjava/classpath/java/util/logging/LoggingMXBean.java
index 3e0a7276db3..24d8834c74a 100644
--- a/libjava/classpath/java/util/logging/LoggingMXBean.java
+++ b/libjava/classpath/java/util/logging/LoggingMXBean.java
@@ -44,7 +44,7 @@ import java.util.List;
  * This interface represents the management interface for logging.
  * There is a single logging bean per VM instance, which can be
  * retrieved via {@link LogManager#getLoggingMXBean()}.
- * 
+ *
  * @since 1.5
  */
 public interface LoggingMXBean
@@ -73,7 +73,7 @@ public interface LoggingMXBean
 
   /**
    * Sets the logging level for a particular logger.
-   * 
+   *
    * @param logger the name of the logger
    * @param level the name of the new logging level, or null
    * @throws IllegalArgumentException if the level is not
diff --git a/libjava/classpath/java/util/logging/LoggingPermission.java b/libjava/classpath/java/util/logging/LoggingPermission.java
index 1139a793a70..804fb940168 100644
--- a/libjava/classpath/java/util/logging/LoggingPermission.java
+++ b/libjava/classpath/java/util/logging/LoggingPermission.java
@@ -59,17 +59,17 @@ public final class LoggingPermission
   public LoggingPermission(String name, String actions)
   {
     super("control", "");
-    
+
     if (!"control".equals(name))
     {
       throw new IllegalArgumentException(
         "name of LoggingPermission must be \"control\"");
     }
-    
+
     if ((actions != null) && (actions.length() != 0))
     {
       throw new IllegalArgumentException(
-	"actions of LoggingPermissions must be null or empty");
-    }    
+        "actions of LoggingPermissions must be null or empty");
+    }
   }
 }
diff --git a/libjava/classpath/java/util/logging/MemoryHandler.java b/libjava/classpath/java/util/logging/MemoryHandler.java
index ffa589f1668..e5c258bbf23 100644
--- a/libjava/classpath/java/util/logging/MemoryHandler.java
+++ b/libjava/classpath/java/util/logging/MemoryHandler.java
@@ -122,19 +122,19 @@ public class MemoryHandler
   public MemoryHandler()
   {
     this((Handler) LogManager.getInstanceProperty(
-	   "java.util.logging.MemoryHandler.target",
-	   Handler.class, /* default */ null),
-	 LogManager.getIntPropertyClamped(
-	   "java.util.logging.MemoryHandler.size",
-	   /* default */ 1000,
-	   /* minimum value */ 1,
-	   /* maximum value */ Integer.MAX_VALUE),
-	 LogManager.getLevelProperty(
-	   "java.util.logging.MemoryHandler.push",
-	   /* default push level */ Level.SEVERE));
+           "java.util.logging.MemoryHandler.target",
+           Handler.class, /* default */ null),
+         LogManager.getIntPropertyClamped(
+           "java.util.logging.MemoryHandler.size",
+           /* default */ 1000,
+           /* minimum value */ 1,
+           /* maximum value */ Integer.MAX_VALUE),
+         LogManager.getLevelProperty(
+           "java.util.logging.MemoryHandler.push",
+           /* default push level */ Level.SEVERE));
   }
 
-  
+
   /**
    * Constructs a MemoryHandler for keeping a circular
    * buffer of LogRecords, given some parameters. The values of the
@@ -162,7 +162,7 @@ public class MemoryHandler
    *         in those cases.
    */
   public MemoryHandler(Handler target, int size, Level pushLevel)
-  { 
+  {
     if ((target == null) || (size <= 0) || (pushLevel == null))
       throw new IllegalArgumentException();
 
@@ -235,9 +235,9 @@ public class MemoryHandler
     else
     {
       for (i = position; i < buffer.length; i++)
-	target.publish(buffer[i]);
+        target.publish(buffer[i]);
       for (i = 0; i < position; i++)
-	target.publish(buffer[i]);
+        target.publish(buffer[i]);
     }
 
     numPublished = 0;
@@ -298,7 +298,7 @@ public class MemoryHandler
     target.close();
   }
 
-    
+
 
   /**
    * Returns the push level threshold for this Handler.
diff --git a/libjava/classpath/java/util/logging/SocketHandler.java b/libjava/classpath/java/util/logging/SocketHandler.java
index 002dfdbbe5e..3c17b9bbcc7 100644
--- a/libjava/classpath/java/util/logging/SocketHandler.java
+++ b/libjava/classpath/java/util/logging/SocketHandler.java
@@ -104,10 +104,10 @@ public class SocketHandler
     throws java.io.IOException
   {
     this(LogManager.getLogManager().getProperty("java.util.logging.SocketHandler.host"),
-	 getPortNumber());
+         getPortNumber());
   }
 
-    
+
   /**
    * Constructs a SocketHandler that publishes log
    * records to a TCP/IP socket.  With the exception of the internet
@@ -131,10 +131,10 @@ public class SocketHandler
     throws java.io.IOException
   {
     super(createSocket(host, port),
-	  "java.util.logging.SocketHandler",
-	  /* default level */ Level.ALL,
-	  /* formatter */ null,
-	  /* default formatter */ XMLFormatter.class);
+          "java.util.logging.SocketHandler",
+          /* default level */ Level.ALL,
+          /* formatter */ null,
+          /* default formatter */ XMLFormatter.class);
   }
 
 
@@ -218,4 +218,3 @@ public class SocketHandler
     flush();
   }
 }
-    
diff --git a/libjava/classpath/java/util/logging/StreamHandler.java b/libjava/classpath/java/util/logging/StreamHandler.java
index 5c35c1e481d..d74dfac0ca3 100644
--- a/libjava/classpath/java/util/logging/StreamHandler.java
+++ b/libjava/classpath/java/util/logging/StreamHandler.java
@@ -114,7 +114,7 @@ public class StreamHandler
   public StreamHandler(OutputStream out, Formatter formatter)
   {
     this(out, "java.util.logging.StreamHandler", Level.INFO,
-	 formatter, SimpleFormatter.class);
+         formatter, SimpleFormatter.class);
   }
 
 
@@ -125,7 +125,7 @@ public class StreamHandler
     Formatter formatter, Class defaultFormatterClass)
   {
     this.level = LogManager.getLevelProperty(propertyPrefix + ".level",
-					     defaultLevel);
+                                             defaultLevel);
 
     this.filter = (Filter) LogManager.getInstanceProperty(
       propertyPrefix + ".filter",
@@ -136,14 +136,14 @@ public class StreamHandler
       this.formatter = formatter;
     else
       this.formatter = (Formatter) LogManager.getInstanceProperty(
-	propertyPrefix + ".formatter",
+        propertyPrefix + ".formatter",
         /* must be instance of */       Formatter.class,
         /* default: new instance of */  defaultFormatterClass);
 
     try
     {
       String enc = LogManager.getLogManager().getProperty(propertyPrefix
-							  + ".encoding");
+                                                          + ".encoding");
 
       /* make sure enc actually is a valid encoding */
       if ((enc != null) && (enc.length() > 0))
@@ -163,10 +163,10 @@ public class StreamHandler
       }
       catch (UnsupportedEncodingException uex)
       {
-	/* This should never happen, since the validity of the encoding
-	 * name has been checked above.
-	 */
-	throw new RuntimeException(uex.getMessage());
+        /* This should never happen, since the validity of the encoding
+         * name has been checked above.
+         */
+        throw new RuntimeException(uex.getMessage());
       }
     }
   }
@@ -263,9 +263,9 @@ public class StreamHandler
        * null would throw an exception.
        */
       if (encoding == null)
-	writer = new OutputStreamWriter(out);
+        writer = new OutputStreamWriter(out);
       else
-	writer = new OutputStreamWriter(out, encoding);
+        writer = new OutputStreamWriter(out, encoding);
     }
   }
 
@@ -330,7 +330,7 @@ public class StreamHandler
    * would depend on the exact behavior in this rather obscure,
    * erroneous case -- especially since the API specification does not
    * prescribe what is supposed to happen.
-   * 
+   *
    * @param record the log event to be published.
    */
   public void publish(LogRecord record)
@@ -348,13 +348,13 @@ public class StreamHandler
       }
       catch (java.io.IOException ex)
       {
-	reportError(null, ex, ErrorManager.WRITE_FAILURE);
-	return;
+        reportError(null, ex, ErrorManager.WRITE_FAILURE);
+        return;
       }
       catch (Exception ex)
       {
-	reportError(null, ex, ErrorManager.GENERIC_FAILURE);
-	return;
+        reportError(null, ex, ErrorManager.GENERIC_FAILURE);
+        return;
       }
 
       streamState = STATE_PUBLISHED;
@@ -449,7 +449,7 @@ public class StreamHandler
   /**
    * Closes this StreamHandler after having forced any
    * data that may have been buffered to the underlying output
-   * device. 
+   * device.
    *
    * 
                  As soon as close has been called,
    * a Handler should not be used anymore. Attempts
@@ -496,20 +496,20 @@ public class StreamHandler
 
       if (writer != null)
       {
-	if (formatter != null)
-	{
-	  /* Even if the StreamHandler has never published a record,
-	   * it emits head and tail upon closing. An earlier version
-	   * of the GNU Classpath implementation did not emitted
-	   * anything. However, this had caused XML log files to be
-	   * entirely empty instead of containing no log records.
-	   */
-	  if (streamState == STATE_FRESH)
+        if (formatter != null)
+        {
+          /* Even if the StreamHandler has never published a record,
+           * it emits head and tail upon closing. An earlier version
+           * of the GNU Classpath implementation did not emitted
+           * anything. However, this had caused XML log files to be
+           * entirely empty instead of containing no log records.
+           */
+          if (streamState == STATE_FRESH)
             writer.write(formatter.getHead(this));
-	  if (streamState != STATE_CLOSED)
-	    writer.write(formatter.getTail(this));
-	}
-	streamState = STATE_CLOSED;
+          if (streamState != STATE_CLOSED)
+            writer.write(formatter.getTail(this));
+        }
+        streamState = STATE_CLOSED;
         writer.close();
       }
     }
diff --git a/libjava/classpath/java/util/logging/XMLFormatter.java b/libjava/classpath/java/util/logging/XMLFormatter.java
index 194fcd238ce..da7c6ef29f2 100644
--- a/libjava/classpath/java/util/logging/XMLFormatter.java
+++ b/libjava/classpath/java/util/logging/XMLFormatter.java
@@ -75,7 +75,7 @@ public class XMLFormatter
    */
   private static final String lineSep = SimpleFormatter.lineSep;
 
-    
+
   /**
    * A DateFormat for emitting time in the ISO 8601 format.
    * Since the API specification of SimpleDateFormat does not talk
@@ -129,29 +129,29 @@ public class XMLFormatter
       switch (c)
       {
       case '&':
-	buf.append("&");
-	break;
+        buf.append("&");
+        break;
 
       case '<':
-	buf.append("<");
-	break;
+        buf.append("<");
+        break;
 
       case '>':
-	buf.append(">");
-	break;
+        buf.append(">");
+        break;
 
       default:
-	if (((c >= 0x20) && (c <= 0x7e))
-	    || (c == /* line feed */ 10)
-	    || (c == /* carriage return */ 13))
-	  buf.append(c);
-	else
-	{
-	  buf.append("&#");
-	  buf.append((int) c);
-	  buf.append(';');
-	}
-	break;
+        if (((c >= 0x20) && (c <= 0x7e))
+            || (c == /* line feed */ 10)
+            || (c == /* carriage return */ 13))
+          buf.append(c);
+        else
+        {
+          buf.append("&#");
+          buf.append((int) c);
+          buf.append(';');
+        }
+        break;
       } /* switch (c) */
     } /* for i */
 
@@ -190,11 +190,11 @@ public class XMLFormatter
     Object[]        params = record.getParameters();
     ResourceBundle  bundle = record.getResourceBundle();
     String          message;
-    
+
     buf.append("");
     buf.append(lineSep);
-    
-    
+
+
     appendTag(buf, 1, "date", iso8601.format(new Date(millis)));
     appendTag(buf, 1, "millis", millis);
     appendTag(buf, 1, "sequence", record.getSequenceNumber());
@@ -346,7 +346,7 @@ public class XMLFormatter
      */
     if (encoding == null)
       encoding = "UTF-8";
-    
+
     /* On Windows XP localized for Swiss German (this is one of
      * my [Sascha Brawer's] test machines), the default encoding
      * has the canonical name "windows-1252". The "historical" name
diff --git a/libjava/classpath/java/util/prefs/AbstractPreferences.java b/libjava/classpath/java/util/prefs/AbstractPreferences.java
index 9562e1bbf5b..14fed384adb 100644
--- a/libjava/classpath/java/util/prefs/AbstractPreferences.java
+++ b/libjava/classpath/java/util/prefs/AbstractPreferences.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -118,7 +118,7 @@ public abstract class AbstractPreferences extends Preferences {
 
     /**
      * Creates a new AbstractPreferences node with the given parent and name.
-     * 
+     *
      * @param parent the parent of this node or null when this is the root node
      * @param name the name of this node, can not be null, only 80 characters
      *             maximum, must be empty when parent is null and cannot
@@ -174,9 +174,9 @@ public abstract class AbstractPreferences extends Preferences {
      */
     public boolean isUserNode() {
         AbstractPreferences root = this;
-	while (root.parent != null)
-	    root = root.parent;
-	return root == Preferences.userRoot();
+        while (root.parent != null)
+            root = root.parent;
+        return root == Preferences.userRoot();
     }
 
     /**
@@ -238,7 +238,7 @@ public abstract class AbstractPreferences extends Preferences {
 
             // First get all cached node names
             childrenNames.addAll(childCache.keySet());
-            
+
             // Then add any others
             String names[] = childrenNamesSpi();
             for (int i = 0; i < names.length; i++) {
@@ -339,7 +339,7 @@ public abstract class AbstractPreferences extends Preferences {
         if (child == null) {
 
             if (childName.length() > MAX_NAME_LENGTH)
-               throw new IllegalArgumentException(childName); 
+               throw new IllegalArgumentException(childName);
 
             // Not in childCache yet so create a new sub node
             child = childSpi(childName);
@@ -457,7 +457,7 @@ public abstract class AbstractPreferences extends Preferences {
             for (int i=0; i < names.length; i++)
                 if (name.equals(names[i]))
                     return childSpi(name);
-           
+
             // No child with that name found
             return null;
         }
@@ -523,8 +523,8 @@ public abstract class AbstractPreferences extends Preferences {
      * This method locks this node and checks if the node has not been
      * removed, if it has been removed it throws an exception, then it returns
      * the result of calling keysSpi().
-     * 
-     * @exception BackingStoreException when the backing store cannot be     
+     *
+     * @exception BackingStoreException when the backing store cannot be
      *            reached
      * @exception IllegalStateException if this node has been removed
      */
@@ -597,7 +597,7 @@ public abstract class AbstractPreferences extends Preferences {
 
         if ("false".equalsIgnoreCase(value))
             return false;
-        
+
         return defaultVal;
     }
 
@@ -625,7 +625,7 @@ public abstract class AbstractPreferences extends Preferences {
         else
             return defaultVal;
     }
-    
+
     /**
      * Helper method for decoding a Base64 string as an byte array.
      * Returns null on encoding error. This method does not allow any other
@@ -807,7 +807,7 @@ public abstract class AbstractPreferences extends Preferences {
             if (preferenceListeners != null)
               fire(new PreferenceChangeEvent(this, key, value));
         }
-            
+
     }
 
     /**
@@ -948,7 +948,7 @@ public abstract class AbstractPreferences extends Preferences {
 
     /**
      * Removes the preferences entry from this preferences node.
-     * 
                       
+     * 
                  
      * The result will be immediately visible in this VM, but may not be
      * immediately written to the backing store.
      * 
                  
@@ -1040,7 +1040,7 @@ public abstract class AbstractPreferences extends Preferences {
     public void sync() throws BackingStoreException {
         flushNode(true);
     }
-    
+
 
     /**
      * Private helper method that locks this node and calls either
@@ -1247,7 +1247,7 @@ public abstract class AbstractPreferences extends Preferences {
               listener.preferenceChange(event);
             }
           };
-          
+
           Executor executor =
             Executors.newSingleThreadExecutor(new DefaultDaemonThreadFactory());
           executor.execute(dispatcher);
@@ -1273,7 +1273,7 @@ public abstract class AbstractPreferences extends Preferences {
                 listener.childRemoved(event);
             }
           };
-          
+
           Executor executor =
             Executors.newSingleThreadExecutor(new DefaultDaemonThreadFactory());
           executor.execute(dispatcher);
@@ -1316,11 +1316,11 @@ public abstract class AbstractPreferences extends Preferences {
      * not been removed. May throw an exception when the backing store cannot
      * be accessed.
      *
-     * @exception BackingStoreException when the backing store cannot be     
+     * @exception BackingStoreException when the backing store cannot be
      *            reached
      */
     protected abstract String[] keysSpi() throws BackingStoreException;
-     
+
     /**
      * Returns the value associated with the key in this preferences node or
      * null when the key does not exist in this preferences node.
diff --git a/libjava/classpath/java/util/prefs/NodeChangeEvent.java b/libjava/classpath/java/util/prefs/NodeChangeEvent.java
index 8c48fb29f9e..5bdeb334664 100644
--- a/libjava/classpath/java/util/prefs/NodeChangeEvent.java
+++ b/libjava/classpath/java/util/prefs/NodeChangeEvent.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -58,8 +58,8 @@ import java.util.EventObject;
 public class NodeChangeEvent extends EventObject {
 
   // We have this to placate the compiler.
-  private static final long serialVersionUID =8068949086596572957L; 
-  
+  private static final long serialVersionUID =8068949086596572957L;
+
     /**
      * The sub node that was added or removed.
      * Defined transient just like EventObject.source since
@@ -102,7 +102,7 @@ public class NodeChangeEvent extends EventObject {
     {
       throw new NotSerializableException("LineEvent is not serializable");
     }
-  
+
     private void writeObject(ObjectOutputStream oos)
       throws IOException
     {
diff --git a/libjava/classpath/java/util/prefs/NodeChangeListener.java b/libjava/classpath/java/util/prefs/NodeChangeListener.java
index 19664c6652d..8d018ab6721 100644
--- a/libjava/classpath/java/util/prefs/NodeChangeListener.java
+++ b/libjava/classpath/java/util/prefs/NodeChangeListener.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/java/util/prefs/PreferenceChangeEvent.java b/libjava/classpath/java/util/prefs/PreferenceChangeEvent.java
index 41c3a478c71..f273361e19e 100644
--- a/libjava/classpath/java/util/prefs/PreferenceChangeEvent.java
+++ b/libjava/classpath/java/util/prefs/PreferenceChangeEvent.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -62,7 +62,7 @@ public class PreferenceChangeEvent extends EventObject {
 
   // We have this to placate the compiler.
   private static final long serialVersionUID = 793724513368024975L;
-  
+
     /**
      * The key of the changed entry.
      */
@@ -116,7 +116,7 @@ public class PreferenceChangeEvent extends EventObject {
     {
       throw new NotSerializableException("LineEvent is not serializable");
     }
-  
+
     private void writeObject(ObjectOutputStream oos)
       throws IOException
     {
diff --git a/libjava/classpath/java/util/prefs/PreferenceChangeListener.java b/libjava/classpath/java/util/prefs/PreferenceChangeListener.java
index adff3582079..e6118bc31ed 100644
--- a/libjava/classpath/java/util/prefs/PreferenceChangeListener.java
+++ b/libjava/classpath/java/util/prefs/PreferenceChangeListener.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/java/util/prefs/Preferences.java b/libjava/classpath/java/util/prefs/Preferences.java
index e8cdda8ed0a..3ff9c85e349 100644
--- a/libjava/classpath/java/util/prefs/Preferences.java
+++ b/libjava/classpath/java/util/prefs/Preferences.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -213,28 +213,28 @@ public abstract class Preferences {
               {
                 Iterator iter = ServiceFactory.lookupProviders
                     (PreferencesFactory.class, null);
-            
+
                 if (iter != null && iter.hasNext())
                   factory = (PreferencesFactory) iter.next();
               }
-            
+
             // Still no factory? Use our default.
             if (factory == null)
-	      {
+              {
                 try
-		  {
+                  {
                     Class cls = Class.forName (defaultFactoryClass);
                     factory = (PreferencesFactory) cls.newInstance();
                   }
-		catch (Exception e)
-		  {
+                catch (Exception e)
+                  {
                     throw new RuntimeException ("Couldn't load default factory"
                         + " '"+ defaultFactoryClass +"'", e);
                   }
               }
 
         }
-	
+
         return factory;
     }
 
@@ -305,7 +305,7 @@ public abstract class Preferences {
      * @throws InvalidPreferencesFormatException if the XML is not properly
      * formatted
      */
-    public static void importPreferences(InputStream is) 
+    public static void importPreferences(InputStream is)
                                     throws InvalidPreferencesFormatException,
                                            IOException
     {
@@ -318,7 +318,7 @@ public abstract class Preferences {
 
     /**
      * Returns the absolute path name of this preference node.
-     * The absolute path name of a node is the path name of its parent node 
+     * The absolute path name of a node is the path name of its parent node
      * plus a '/' plus its own name. If the node is the root node and has no
      * parent then its name is "" and its absolute path name is "/".
      */
@@ -400,8 +400,8 @@ public abstract class Preferences {
     // abstract methods (export)
 
     /**
-     * Export this node, but not its descendants, as XML to the 
-     * indicated output stream.  The XML will be encoded using UTF-8 
+     * Export this node, but not its descendants, as XML to the
+     * indicated output stream.  The XML will be encoded using UTF-8
      * and will use a specified document type:
                  
      * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
                  
      * @param os the output stream to which the XML is sent
@@ -414,8 +414,8 @@ public abstract class Preferences {
                                        IOException;
 
     /**
-     * Export this node and all its descendants as XML to the 
-     * indicated output stream.  The XML will be encoded using UTF-8 
+     * Export this node and all its descendants as XML to the
+     * indicated output stream.  The XML will be encoded using UTF-8
      * and will use a specified document type:
                  
      * <!DOCTYPE preferences SYSTEM "http://java.sun.com/dtd/preferences.dtd">
                  
      * @param os the output stream to which the XML is sent
@@ -670,7 +670,7 @@ public abstract class Preferences {
      * 
                  
      * Note that according to the specification an implementation may delay
      * removal of the node from the backing store till the flush()
-     * method is called. But the flush() method may throw a 
+     * method is called. But the flush() method may throw a
      * IllegalStateException when the node has been removed.
      * So most implementations will actually remove the node and any subnodes
      * from the backing store immediatly.
@@ -694,4 +694,3 @@ public abstract class Preferences {
     public abstract void removePreferenceChangeListener
                             (PreferenceChangeListener listener);
 }
-
diff --git a/libjava/classpath/java/util/prefs/PreferencesFactory.java b/libjava/classpath/java/util/prefs/PreferencesFactory.java
index f4fe7e37ffe..5674f806d9b 100644
--- a/libjava/classpath/java/util/prefs/PreferencesFactory.java
+++ b/libjava/classpath/java/util/prefs/PreferencesFactory.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/java/util/regex/MatchResult.java b/libjava/classpath/java/util/regex/MatchResult.java
index c82d8cc9963..605873dd041 100644
--- a/libjava/classpath/java/util/regex/MatchResult.java
+++ b/libjava/classpath/java/util/regex/MatchResult.java
@@ -48,25 +48,25 @@ public interface MatchResult
 {
   /** Returns the index just after the last matched character.  */
   int end();
-  
+
   /**
    * Returns the index just after the last matched character of the
    * given sub-match group.
    * @param group the sub-match group
-   */ 
+   */
   int end(int group);
 
   /** Returns the substring of the input which was matched.  */
   String group();
-  
-  /** 
+
+  /**
    * Returns the substring of the input which was matched by the
    * given sub-match group.
    * @param group the sub-match group
    */
   String group(int group);
 
-  /** Returns the number of sub-match groups in the matching pattern.  */  
+  /** Returns the number of sub-match groups in the matching pattern.  */
   int groupCount();
 
   /** Returns the index of the first character of the match.  */
diff --git a/libjava/classpath/java/util/regex/Pattern.java b/libjava/classpath/java/util/regex/Pattern.java
index 35ec0b89eb6..7d1fc84b4e6 100644
--- a/libjava/classpath/java/util/regex/Pattern.java
+++ b/libjava/classpath/java/util/regex/Pattern.java
@@ -46,14 +46,14 @@ import java.util.ArrayList;
 
 
 /**
- * Compiled regular expression ready to be applied. 
+ * Compiled regular expression ready to be applied.
  *
  * @since 1.4
  */
 public final class Pattern implements Serializable
 {
   private static final long serialVersionUID = 5073258162644648461L;
-  
+
   public static final int CANON_EQ = 128;
   public static final int CASE_INSENSITIVE = 2;
   public static final int COMMENTS = 4;
@@ -61,7 +61,7 @@ public final class Pattern implements Serializable
   public static final int MULTILINE = 8;
   public static final int UNICODE_CASE = 64;
   public static final int UNIX_LINES = 1;
-  
+
   private final String regex;
   private final int flags;
 
@@ -93,30 +93,30 @@ public final class Pattern implements Serializable
 
     if ((flags & UNIX_LINES) != 0)
       {
-	// Use a syntax set with \n for linefeeds?
-	syntax = new RESyntax(syntax);
-	syntax.setLineSeparator("\n");
+        // Use a syntax set with \n for linefeeds?
+        syntax = new RESyntax(syntax);
+        syntax.setLineSeparator("\n");
       }
 
     if ((flags & COMMENTS) != 0)
       {
-	gnuFlags |= RE.REG_X_COMMENTS;
+        gnuFlags |= RE.REG_X_COMMENTS;
       }
 
     try
       {
-	this.re = new RE(regex, gnuFlags, syntax);
+        this.re = new RE(regex, gnuFlags, syntax);
       }
     catch (REException e)
       {
-	PatternSyntaxException pse;
-	pse = new PatternSyntaxException(e.getMessage(),
-					 regex, e.getPosition());
-	pse.initCause(e);
-	throw pse;
+        PatternSyntaxException pse;
+        pse = new PatternSyntaxException(e.getMessage(),
+                                         regex, e.getPosition());
+        pse.initCause(e);
+        throw pse;
       }
   }
- 
+
   // package private accessor method
   RE getRE()
   {
@@ -133,7 +133,7 @@ public final class Pattern implements Serializable
   {
     return compile(regex, 0);
   }
-  
+
   /**
    * @param regex The regular expression
    * @param flags The match flags, a bit mask
@@ -148,26 +148,26 @@ public final class Pattern implements Serializable
     // FIXME: check which flags are really accepted
     if ((flags & ~0xEF) != 0)
       throw new IllegalArgumentException ();
-    
-    return new Pattern (regex, flags); 
+
+    return new Pattern (regex, flags);
   }
-  
+
   public int flags ()
   {
     return this.flags;
   }
-  
+
   /**
    * @param regex The regular expression
    * @param input The character sequence to be matched
    *
    * @exception PatternSyntaxException If the expression's syntax is invalid
    */
-  public static boolean matches (String regex, CharSequence input) 
+  public static boolean matches (String regex, CharSequence input)
   {
     return compile(regex).matcher(input).matches();
   }
-  
+
   /**
    * @param input The character sequence to be matched
    */
@@ -175,7 +175,7 @@ public final class Pattern implements Serializable
   {
     return new Matcher(this, input);
   }
-  
+
   /**
    * @param input The character sequence to be matched
    */
@@ -183,7 +183,7 @@ public final class Pattern implements Serializable
   {
     return split(input, 0);
   }
-  
+
   /**
    * @param input The character sequence to be matched
    * @param limit The result threshold
@@ -200,60 +200,60 @@ public final class Pattern implements Serializable
 
     while (matched && (limit <= 0 || count < limit - 1))
       {
-	++count;
-	end = matcher.start();
-	if (start == end)
-	  empties++;
-	else
-	  {
-	    while (empties > 0)
-	      {
-		list.add("");
-		empties--;
-	      }
+        ++count;
+        end = matcher.start();
+        if (start == end)
+          empties++;
+        else
+          {
+            while (empties > 0)
+              {
+                list.add("");
+                empties--;
+              }
 
-	    String text = input.subSequence(start, end).toString();
-	    list.add(text);
-	  }
-	start = matcher.end();
-	matched = matcher.find();
+            String text = input.subSequence(start, end).toString();
+            list.add(text);
+          }
+        start = matcher.end();
+        matched = matcher.find();
       }
 
     // We matched nothing.
     if (!matched && count == 0)
       return new String[] { input.toString() };
-    
+
     // Is the last token empty?
     boolean emptyLast = (start == input.length());
 
     // Can/Must we add empties or an extra last token at the end?
     if (list.size() < limit || limit < 0 || (limit == 0 && !emptyLast))
       {
-	if (limit > list.size())
-	  {
-	    int max = limit - list.size();
-	    empties = (empties > max) ? max : empties;
-	  }
-	while (empties > 0)
-	  {
-	    list.add("");
-	    empties--;
-	  }
+        if (limit > list.size())
+          {
+            int max = limit - list.size();
+            empties = (empties > max) ? max : empties;
+          }
+        while (empties > 0)
+          {
+            list.add("");
+            empties--;
+          }
       }
 
     // last token at end
     if (limit != 0 || (limit == 0 && !emptyLast))
       {
-	String t = input.subSequence(start, input.length()).toString();
-	if ("".equals(t) && limit == 0)
-	  { /* Don't add. */ }
-	else
-	  list.add(t);
+        String t = input.subSequence(start, input.length()).toString();
+        if ("".equals(t) && limit == 0)
+          { /* Don't add. */ }
+        else
+          list.add(t);
       }
 
     return list.toArray(new String[list.size()]);
   }
-  
+
   public String pattern ()
   {
     return regex;
diff --git a/libjava/classpath/java/util/regex/PatternSyntaxException.java b/libjava/classpath/java/util/regex/PatternSyntaxException.java
index 38e27db2709..db73d06e2a4 100644
--- a/libjava/classpath/java/util/regex/PatternSyntaxException.java
+++ b/libjava/classpath/java/util/regex/PatternSyntaxException.java
@@ -58,7 +58,7 @@ public class PatternSyntaxException extends IllegalArgumentException
    * The original pattern that contained the syntax error.
    */
   private final String pattern;
-  
+
   /**
    * Index of the first character in the String that was probably invalid,
    * or -1 when unknown.
@@ -74,8 +74,8 @@ public class PatternSyntaxException extends IllegalArgumentException
    *        probably invalid, or -1 when unknown.
    */
   public PatternSyntaxException(String description,
-		                String pattern,
-				int index)
+                                String pattern,
+                                int index)
   {
     super(description);
     this.desc = description;
@@ -123,11 +123,11 @@ public class PatternSyntaxException extends IllegalArgumentException
     sb.append(pattern);
     if (index != -1)
       {
-	sb.append(lineSep);
-	sb.append('\t');
-	for (int i=0; i
  * The specification for Adler32 may be found in RFC 1950.
@@ -60,7 +60,7 @@ package java.util.zip;
  *       (excluding any dictionary data) computed according to Adler-32
  *       algorithm. This algorithm is a 32-bit extension and improvement
  *       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073
- *       standard. 
+ *       standard.
  *
                  
  *       Adler-32 is composed of two sums accumulated per byte: s1 is
  *       the sum of all bytes, s2 is the sum of all s1 values. Both sums
@@ -103,13 +103,13 @@ public class Adler32 implements Checksum
   private int checksum; //we do all in int.
 
   //Note that java doesn't have unsigned integers,
-  //so we have to be careful with what arithmetic 
-  //we do. We return the checksum as a long to 
+  //so we have to be careful with what arithmetic
+  //we do. We return the checksum as a long to
   //avoid sign confusion.
 
   /**
-   * Creates a new instance of the Adler32 class. 
-   * The checksum starts off with a value of 1. 
+   * Creates a new instance of the Adler32 class.
+   * The checksum starts off with a value of 1.
    */
   public Adler32 ()
   {
@@ -119,13 +119,13 @@ public class Adler32 implements Checksum
   /**
    * Resets the Adler32 checksum to the initial value.
    */
-  public void reset () 
+  public void reset ()
   {
-    checksum = 1; //Initialize to 1    
+    checksum = 1; //Initialize to 1
   }
 
   /**
-   * Updates the checksum with the byte b. 
+   * Updates the checksum with the byte b.
    *
    * @param bval the data value to add. The high byte of the int is ignored.
    */
@@ -135,16 +135,16 @@ public class Adler32 implements Checksum
     //would rather not have that overhead
     int s1 = checksum & 0xffff;
     int s2 = checksum >>> 16;
-    
+
     s1 = (s1 + (bval & 0xFF)) % BASE;
     s2 = (s1 + s2) % BASE;
-    
+
     checksum = (s2 << 16) + s1;
   }
 
   /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
+   * Updates the checksum with the bytes taken from the array.
+   *
    * @param buffer an array of bytes
    */
   public void update (byte[] buffer)
@@ -153,8 +153,8 @@ public class Adler32 implements Checksum
   }
 
   /**
-   * Updates the checksum with the bytes taken from the array. 
-   * 
+   * Updates the checksum with the bytes taken from the array.
+   *
    * @param buf an array of bytes
    * @param off the start of the data used for this update
    * @param len the number of bytes to use for this update
@@ -167,31 +167,31 @@ public class Adler32 implements Checksum
 
     while (len > 0)
       {
-	// We can defer the modulo operation:
-	// s1 maximally grows from 65521 to 65521 + 255 * 3800
-	// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
-	int n = 3800;
-	if (n > len)
-	  n = len;
-	len -= n;
-	while (--n >= 0)
-	  {
-	    s1 = s1 + (buf[off++] & 0xFF);
-	    s2 = s2 + s1;
-	  }
-	s1 %= BASE;
-	s2 %= BASE;
+        // We can defer the modulo operation:
+        // s1 maximally grows from 65521 to 65521 + 255 * 3800
+        // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31
+        int n = 3800;
+        if (n > len)
+          n = len;
+        len -= n;
+        while (--n >= 0)
+          {
+            s1 = s1 + (buf[off++] & 0xFF);
+            s2 = s2 + s1;
+          }
+        s1 %= BASE;
+        s2 %= BASE;
       }
 
     /*Old implementation, borrowed from somewhere:
     int n;
-    
+
     while (len-- > 0) {
 
-      s1 = (s1 + (bs[offset++] & 0xff)) % BASE; 
+      s1 = (s1 + (bs[offset++] & 0xff)) % BASE;
       s2 = (s2 + s1) % BASE;
     }*/
-    
+
     checksum = (s2 << 16) | s1;
   }
 
diff --git a/libjava/classpath/java/util/zip/CRC32.java b/libjava/classpath/java/util/zip/CRC32.java
index 1c2b3973852..de2e7083db5 100644
--- a/libjava/classpath/java/util/zip/CRC32.java
+++ b/libjava/classpath/java/util/zip/CRC32.java
@@ -71,15 +71,15 @@ public class CRC32 implements Checksum
     int[] crc_table = new int[256];
     for (int n = 0; n < 256; n++)
       {
-	int c = n;
-	for (int k = 8;  --k >= 0; )
-	  {
-	    if ((c & 1) != 0)
-	      c = 0xedb88320 ^ (c >>> 1);
-	    else
-	      c = c >>> 1;
-	  }
-	crc_table[n] = c;
+        int c = n;
+        for (int k = 8;  --k >= 0; )
+          {
+            if ((c & 1) != 0)
+              c = 0xedb88320 ^ (c >>> 1);
+            else
+              c = c >>> 1;
+          }
+        crc_table[n] = c;
       }
     return crc_table;
   }
@@ -98,7 +98,7 @@ public class CRC32 implements Checksum
   public void reset () { crc = 0; }
 
   /**
-   * Updates the checksum with the int bval. 
+   * Updates the checksum with the int bval.
    *
    * @param bval (the byte is taken as the lower 8 bits of bval)
    */
diff --git a/libjava/classpath/java/util/zip/CheckedInputStream.java b/libjava/classpath/java/util/zip/CheckedInputStream.java
index d743fbb2447..163a4c4aa30 100644
--- a/libjava/classpath/java/util/zip/CheckedInputStream.java
+++ b/libjava/classpath/java/util/zip/CheckedInputStream.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -118,13 +118,13 @@ public class CheckedInputStream extends FilterInputStream
     long s = 0;
     while (n > 0)
       {
-	int r = in.read(buf, 0, min);
-	if (r == -1)
-	  break;
-	n -= r;
-	s += r;
-	min = (int) Math.min(n, 1024);
-	sum.update(buf, 0, r);
+        int r = in.read(buf, 0, min);
+        if (r == -1)
+          break;
+        n -= r;
+        s += r;
+        min = (int) Math.min(n, 1024);
+        sum.update(buf, 0, r);
       }
 
     return s;
diff --git a/libjava/classpath/java/util/zip/CheckedOutputStream.java b/libjava/classpath/java/util/zip/CheckedOutputStream.java
index a3c19292fae..e0222258add 100644
--- a/libjava/classpath/java/util/zip/CheckedOutputStream.java
+++ b/libjava/classpath/java/util/zip/CheckedOutputStream.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/java/util/zip/Deflater.java b/libjava/classpath/java/util/zip/Deflater.java
index 41d9881448c..dd81fe748ff 100644
--- a/libjava/classpath/java/util/zip/Deflater.java
+++ b/libjava/classpath/java/util/zip/Deflater.java
@@ -41,10 +41,10 @@ package java.util.zip;
  * This is the Deflater class.  The deflater class compresses input
  * with the deflate algorithm described in RFC 1951.  It has several
  * compression levels and three different strategies described below.
- * 
+ *
  * This class is not thread safe.  This is inherent in the API, due
  * to the split of deflate and setInput.
- * 
+ *
  * @author Jochen Hoenicke
  * @author Tom Tromey
  */
@@ -52,11 +52,11 @@ public class Deflater
 {
   /**
    * The best and slowest compression level.  This tries to find very
-   * long and distant string repetitions.  
+   * long and distant string repetitions.
    */
   public static final int BEST_COMPRESSION = 9;
   /**
-   * The worst but fastest compression level.  
+   * The worst but fastest compression level.
    */
   public static final int BEST_SPEED = 1;
   /**
@@ -78,10 +78,10 @@ public class Deflater
    */
   public static final int FILTERED = 1;
 
-  /** 
+  /**
    * This strategy will not look for string repetitions at all.  It
    * only encodes with Huffman trees (which means, that more common
-   * characters get a smaller encoding.  
+   * characters get a smaller encoding.
    */
   public static final int HUFFMAN_ONLY = 2;
 
@@ -123,13 +123,13 @@ public class Deflater
    * (6) FINISHED_STATE is entered, when everything has been flushed to the
    *     internal pending output buffer.
    * (7) At any time (7)
-   * 
+   *
    */
 
   private static final int IS_SETDICT              = 0x01;
   private static final int IS_FLUSHING             = 0x04;
   private static final int IS_FINISHING            = 0x08;
-  
+
   private static final int INIT_STATE              = 0x00;
   private static final int SETDICT_STATE           = 0x01;
   private static final int INIT_FINISHING_STATE    = 0x08;
@@ -151,7 +151,7 @@ public class Deflater
 
   /** The total bytes of output written. */
   private long totalOut;
- 
+
   /** The pending output. */
   private DeflaterPending pending;
 
@@ -169,7 +169,7 @@ public class Deflater
   /**
    * Creates a new deflater with given compression level.
    * @param lvl the compression level, a value between NO_COMPRESSION
-   * and BEST_COMPRESSION, or DEFAULT_COMPRESSION.  
+   * and BEST_COMPRESSION, or DEFAULT_COMPRESSION.
    * @exception IllegalArgumentException if lvl is out of range.
    */
   public Deflater(int lvl)
@@ -180,7 +180,7 @@ public class Deflater
   /**
    * Creates a new deflater with given compression level.
    * @param lvl the compression level, a value between NO_COMPRESSION
-   * and BEST_COMPRESSION.  
+   * and BEST_COMPRESSION.
    * @param nowrap true, iff we should suppress the deflate header at the
    * beginning and the adler checksum at the end of the output.  This is
    * useful for the GZIP format.
@@ -201,26 +201,26 @@ public class Deflater
     reset();
   }
 
-  /** 
+  /**
    * Resets the deflater.  The deflater acts afterwards as if it was
    * just created with the same compression level and strategy as it
-   * had before.  
+   * had before.
    */
-  public void reset() 
+  public void reset()
   {
     state = (noHeader ? BUSY_STATE : INIT_STATE);
     totalOut = 0;
     pending.reset();
     engine.reset();
   }
-  
+
   /**
    * Frees all objects allocated by the compressor.  There's no
    * reason to call this, since you can just rely on garbage
    * collection.  Exists only for compatibility against Sun's JDK,
    * where the compressor allocates native memory.
    * If you call any method (even reset) afterwards the behaviour is
-   * undefined.  
+   * undefined.
    */
   public void end()
   {
@@ -229,7 +229,7 @@ public class Deflater
     state = CLOSED_STATE;
   }
 
-  /** 
+  /**
    * Gets the current adler checksum of the data that was processed so
    * far.
    */
@@ -238,7 +238,7 @@ public class Deflater
     return engine.getAdler();
   }
 
-  /** 
+  /**
    * Gets the number of input bytes processed so far.
    */
   public int getTotalIn()
@@ -246,7 +246,7 @@ public class Deflater
     return (int) engine.getTotalIn();
   }
 
-  /** 
+  /**
    * Gets the number of input bytes processed so far.
    * @since 1.5
    */
@@ -255,7 +255,7 @@ public class Deflater
     return engine.getTotalIn();
   }
 
-  /** 
+  /**
    * Gets the number of output bytes so far.
    */
   public int getTotalOut()
@@ -263,7 +263,7 @@ public class Deflater
     return (int) totalOut;
   }
 
-  /** 
+  /**
    * Gets the number of output bytes so far.
    * @since 1.5
    */
@@ -272,7 +272,7 @@ public class Deflater
     return totalOut;
   }
 
-  /** 
+  /**
    * Finalizes this object.
    */
   protected void finalize()
@@ -280,7 +280,7 @@ public class Deflater
     /* Exists solely for compatibility.  We don't have any native state. */
   }
 
-  /** 
+  /**
    * Flushes the current input block.  Further calls to deflate() will
    * produce enough output to inflate everything in the current input
    * block.  This is not part of Sun's JDK so I have made it package
@@ -291,7 +291,7 @@ public class Deflater
     state |= IS_FLUSHING;
   }
 
-  /** 
+  /**
    * Finishes the deflater with the current input block.  It is an error
    * to give more input after this method was called.  This method must
    * be called to force all bytes to be flushed.
@@ -300,7 +300,7 @@ public class Deflater
     state |= IS_FLUSHING | IS_FINISHING;
   }
 
-  /** 
+  /**
    * Returns true iff the stream was finished and no more output bytes
    * are available.
    */
@@ -314,7 +314,7 @@ public class Deflater
    * You should then call setInput(). 
                  
    *
    * NOTE: This method can also return true when the stream
-   * was finished.  
+   * was finished.
    */
   public boolean needsInput()
   {
@@ -344,7 +344,7 @@ public class Deflater
    * true again.
    * @param input the buffer containing the input data.
    * @param off the start of the data.
-   * @param len the length of the data.  
+   * @param len the length of the data.
    * @exception IllegalStateException if the buffer was finished() or ended()
    * or if previous input is still pending.
    */
@@ -355,11 +355,11 @@ public class Deflater
     engine.setInput(input, off, len);
   }
 
-  /** 
+  /**
    * Sets the compression level.  There is no guarantee of the exact
    * position of the change, but if you call this when needsInput is
    * true the change of compression level will occur somewhere near
-   * before the end of the so far given input.  
+   * before the end of the so far given input.
    * @param lvl the new compression level.
    */
   public void setLevel(int lvl)
@@ -372,12 +372,12 @@ public class Deflater
 
     if (level != lvl)
       {
-	level = lvl;
-	engine.setLevel(lvl);
+        level = lvl;
+        engine.setLevel(lvl);
       }
   }
 
-  /** 
+  /**
    * Sets the compression strategy. Strategy is one of
    * DEFAULT_STRATEGY, HUFFMAN_ONLY and FILTERED.  For the exact
    * position where the strategy is changed, the same as for
@@ -387,14 +387,14 @@ public class Deflater
   public void setStrategy(int stgy)
   {
     if (stgy != DEFAULT_STRATEGY && stgy != FILTERED
-	&& stgy != HUFFMAN_ONLY)
+        && stgy != HUFFMAN_ONLY)
       throw new IllegalArgumentException();
     engine.setStrategy(stgy);
   }
 
   /**
-   * Deflates the current input block to the given array.  It returns 
-   * the number of bytes compressed, or 0 if either 
+   * Deflates the current input block to the given array.  It returns
+   * the number of bytes compressed, or 0 if either
    * needsInput() or finished() returns true or length is zero.
    * @param output the buffer where to write the compressed data.
    */
@@ -404,15 +404,15 @@ public class Deflater
   }
 
   /**
-   * Deflates the current input block to the given array.  It returns 
-   * the number of bytes compressed, or 0 if either 
+   * Deflates the current input block to the given array.  It returns
+   * the number of bytes compressed, or 0 if either
    * needsInput() or finished() returns true or length is zero.
    * @param output the buffer where to write the compressed data.
    * @param offset the offset into the output array.
    * @param length the maximum number of bytes that may be written.
    * @exception IllegalStateException if end() was called.
    * @exception IndexOutOfBoundsException if offset and/or length
-   * don't match the array length.  
+   * don't match the array length.
    */
   public int deflate(byte[] output, int offset, int length)
   {
@@ -423,78 +423,78 @@ public class Deflater
 
     if (state < BUSY_STATE)
       {
-	/* output header */
-	int header = (DEFLATED + 
-		      ((DeflaterConstants.MAX_WBITS - 8) << 4)) << 8;
-	int level_flags = (level - 1) >> 1;
-	if (level_flags < 0 || level_flags > 3) 
-	  level_flags = 3;
-	header |= level_flags << 6;
-	if ((state & IS_SETDICT) != 0)
-	  /* Dictionary was set */
-	  header |= DeflaterConstants.PRESET_DICT;
-	header += 31 - (header % 31);
+        /* output header */
+        int header = (DEFLATED +
+                      ((DeflaterConstants.MAX_WBITS - 8) << 4)) << 8;
+        int level_flags = (level - 1) >> 1;
+        if (level_flags < 0 || level_flags > 3)
+          level_flags = 3;
+        header |= level_flags << 6;
+        if ((state & IS_SETDICT) != 0)
+          /* Dictionary was set */
+          header |= DeflaterConstants.PRESET_DICT;
+        header += 31 - (header % 31);
 
-	pending.writeShortMSB(header);
-	if ((state & IS_SETDICT) != 0)
-	  {
-	    int chksum = engine.getAdler();
-	    engine.resetAdler();
-	    pending.writeShortMSB(chksum >> 16);
-	    pending.writeShortMSB(chksum & 0xffff);
-	  }
+        pending.writeShortMSB(header);
+        if ((state & IS_SETDICT) != 0)
+          {
+            int chksum = engine.getAdler();
+            engine.resetAdler();
+            pending.writeShortMSB(chksum >> 16);
+            pending.writeShortMSB(chksum & 0xffff);
+          }
 
-	state = BUSY_STATE | (state & (IS_FLUSHING | IS_FINISHING));
+        state = BUSY_STATE | (state & (IS_FLUSHING | IS_FINISHING));
       }
 
     for (;;)
       {
-	int count = pending.flush(output, offset, length);
-	offset += count;
-	totalOut += count;
-	length -= count;
-	if (length == 0 || state == FINISHED_STATE)
-	  break;
+        int count = pending.flush(output, offset, length);
+        offset += count;
+        totalOut += count;
+        length -= count;
+        if (length == 0 || state == FINISHED_STATE)
+          break;
 
-	if (!engine.deflate((state & IS_FLUSHING) != 0, 
-			    (state & IS_FINISHING) != 0))
-	  {
-	    if (state == BUSY_STATE)
-	      /* We need more input now */
-	      return origLength - length;
-	    else if (state == FLUSHING_STATE)
-	      {
-		if (level != NO_COMPRESSION)
-		  {
-		    /* We have to supply some lookahead.  8 bit lookahead
-		     * are needed by the zlib inflater, and we must fill 
-		     * the next byte, so that all bits are flushed.
-		     */
-		    int neededbits = 8 + ((-pending.getBitCount()) & 7);
-		    while (neededbits > 0)
-		      {
-			/* write a static tree block consisting solely of
-			 * an EOF:
-			 */
-			pending.writeBits(2, 10);
-			neededbits -= 10;
-		      }
-		  }
-		state = BUSY_STATE;
-	      }
-	    else if (state == FINISHING_STATE)
-	      {
-		pending.alignToByte();
-		/* We have completed the stream */
-		if (!noHeader)
-		  {
-		    int adler = engine.getAdler();
-		    pending.writeShortMSB(adler >> 16);
-		    pending.writeShortMSB(adler & 0xffff);
-		  }
-		state = FINISHED_STATE;
-	      }
-	  }
+        if (!engine.deflate((state & IS_FLUSHING) != 0,
+                            (state & IS_FINISHING) != 0))
+          {
+            if (state == BUSY_STATE)
+              /* We need more input now */
+              return origLength - length;
+            else if (state == FLUSHING_STATE)
+              {
+                if (level != NO_COMPRESSION)
+                  {
+                    /* We have to supply some lookahead.  8 bit lookahead
+                     * are needed by the zlib inflater, and we must fill
+                     * the next byte, so that all bits are flushed.
+                     */
+                    int neededbits = 8 + ((-pending.getBitCount()) & 7);
+                    while (neededbits > 0)
+                      {
+                        /* write a static tree block consisting solely of
+                         * an EOF:
+                         */
+                        pending.writeBits(2, 10);
+                        neededbits -= 10;
+                      }
+                  }
+                state = BUSY_STATE;
+              }
+            else if (state == FINISHING_STATE)
+              {
+                pending.alignToByte();
+                /* We have completed the stream */
+                if (!noHeader)
+                  {
+                    int adler = engine.getAdler();
+                    pending.writeShortMSB(adler >> 16);
+                    pending.writeShortMSB(adler & 0xffff);
+                  }
+                state = FINISHED_STATE;
+              }
+          }
       }
 
     return origLength - length;
@@ -503,10 +503,10 @@ public class Deflater
   /**
    * Sets the dictionary which should be used in the deflate process.
    * This call is equivalent to setDictionary(dict, 0,
-   * dict.length).  
-   * @param dict the dictionary.  
+   * dict.length).
+   * @param dict the dictionary.
    * @exception IllegalStateException if setInput () or deflate ()
-   * were already called or another dictionary was already set.  
+   * were already called or another dictionary was already set.
    */
   public void setDictionary(byte[] dict)
   {
diff --git a/libjava/classpath/java/util/zip/DeflaterEngine.java b/libjava/classpath/java/util/zip/DeflaterEngine.java
index 38a82d8b77b..287558e3e84 100644
--- a/libjava/classpath/java/util/zip/DeflaterEngine.java
+++ b/libjava/classpath/java/util/zip/DeflaterEngine.java
@@ -45,7 +45,7 @@ class DeflaterEngine implements DeflaterConstants
 
   /**
    * Hashtable, hashing three characters to an index for window, so
-   * that window[index]..window[index+2] have this hash code.  
+   * that window[index]..window[index+2] have this hash code.
    * Note that the array should really be unsigned short, so you need
    * to and the values with 0xffff.
    */
@@ -53,7 +53,7 @@ class DeflaterEngine implements DeflaterConstants
 
   /**
    * prev[index & WMASK] points to the previous index that has the
-   * same hash code as the string starting at index.  This way 
+   * same hash code as the string starting at index.  This way
    * entries with the same hash code are in a linked list.
    * Note that the array should really be unsigned short, so you need
    * to and the values with 0xffff.
@@ -78,7 +78,7 @@ class DeflaterEngine implements DeflaterConstants
   private int lookahead;
 
   /**
-   * This array contains the part of the uncompressed stream that 
+   * This array contains the part of the uncompressed stream that
    * is of relevance.  The current character is indexed by strstart.
    */
   private byte[] window;
@@ -113,12 +113,12 @@ class DeflaterEngine implements DeflaterConstants
    * second half is copied to the beginning.
    *
    * The head array is a hash table.  Three characters build a hash value
-   * and they the value points to the corresponding index in window of 
+   * and they the value points to the corresponding index in window of
    * the last string with this hash.  The prev array implements a
    * linked list of matches with the same hash: prev[index & WMASK] points
    * to the previous index with the same hash.
-   * 
-   * 
+   *
+   *
    */
 
 
@@ -180,44 +180,44 @@ class DeflaterEngine implements DeflaterConstants
     niceLength = DeflaterConstants.NICE_LENGTH[lvl];
     max_chain   = DeflaterConstants.MAX_CHAIN[lvl];
 
-    if (DeflaterConstants.COMPR_FUNC[lvl] != comprFunc) 
+    if (DeflaterConstants.COMPR_FUNC[lvl] != comprFunc)
       {
-	if (DeflaterConstants.DEBUGGING)
-	  System.err.println("Change from "+comprFunc +" to "
-			     + DeflaterConstants.COMPR_FUNC[lvl]);
-	switch (comprFunc)
-	  {
-	  case DEFLATE_STORED:
-	    if (strstart > blockStart)
-	      {
-		huffman.flushStoredBlock(window, blockStart, 
-					 strstart - blockStart, false);
-		blockStart = strstart;
-	      }
-	    updateHash();
-	    break;
-	  case DEFLATE_FAST:
-	    if (strstart > blockStart)
-	      {
-		huffman.flushBlock(window, blockStart, strstart - blockStart,
-				   false);
-		blockStart = strstart;
-	      }
-	    break;
-	  case DEFLATE_SLOW:
-	    if (prevAvailable)
-	      huffman.tallyLit(window[strstart-1] & 0xff);
-	    if (strstart > blockStart)
-	      {
-		huffman.flushBlock(window, blockStart, strstart - blockStart,
-				   false);
-		blockStart = strstart;
-	      }
-	    prevAvailable = false;
-	    matchLen = MIN_MATCH - 1;
-	    break;
-	  }
-	comprFunc = COMPR_FUNC[lvl];
+        if (DeflaterConstants.DEBUGGING)
+          System.err.println("Change from "+comprFunc +" to "
+                             + DeflaterConstants.COMPR_FUNC[lvl]);
+        switch (comprFunc)
+          {
+          case DEFLATE_STORED:
+            if (strstart > blockStart)
+              {
+                huffman.flushStoredBlock(window, blockStart,
+                                         strstart - blockStart, false);
+                blockStart = strstart;
+              }
+            updateHash();
+            break;
+          case DEFLATE_FAST:
+            if (strstart > blockStart)
+              {
+                huffman.flushBlock(window, blockStart, strstart - blockStart,
+                                   false);
+                blockStart = strstart;
+              }
+            break;
+          case DEFLATE_SLOW:
+            if (prevAvailable)
+              huffman.tallyLit(window[strstart-1] & 0xff);
+            if (strstart > blockStart)
+              {
+                huffman.flushBlock(window, blockStart, strstart - blockStart,
+                                   false);
+                blockStart = strstart;
+              }
+            prevAvailable = false;
+            matchLen = MIN_MATCH - 1;
+            break;
+          }
+        comprFunc = COMPR_FUNC[lvl];
       }
   }
 
@@ -225,7 +225,7 @@ class DeflaterEngine implements DeflaterConstants
     if (DEBUGGING)
       System.err.println("updateHash: "+strstart);
     ins_h = (window[strstart] << HASH_SHIFT) ^ window[strstart + 1];
-  }    
+  }
 
   /**
    * Inserts the current string in the head hash and returns the previous
@@ -238,13 +238,13 @@ class DeflaterEngine implements DeflaterConstants
 
     if (DEBUGGING)
       {
-	if (hash != (((window[strstart] << (2*HASH_SHIFT))
-		      ^ (window[strstart + 1] << HASH_SHIFT)
-		      ^ (window[strstart + 2])) & HASH_MASK))
-	  throw new InternalError("hash inconsistent: "+hash+"/"
-				  +window[strstart]+","
-				  +window[strstart+1]+","
-				  +window[strstart+2]+","+HASH_SHIFT);
+        if (hash != (((window[strstart] << (2*HASH_SHIFT))
+                      ^ (window[strstart + 1] << HASH_SHIFT)
+                      ^ (window[strstart + 2])) & HASH_MASK))
+          throw new InternalError("hash inconsistent: "+hash+"/"
+                                  +window[strstart]+","
+                                  +window[strstart+1]+","
+                                  +window[strstart+2]+","+HASH_SHIFT);
       }
 
     prev[strstart & WMASK] = match = head[hash];
@@ -259,22 +259,22 @@ class DeflaterEngine implements DeflaterConstants
     matchStart -= WSIZE;
     strstart -= WSIZE;
     blockStart -= WSIZE;
-    
+
     /* Slide the hash table (could be avoided with 32 bit values
      * at the expense of memory usage).
      */
-    for (int i = 0; i < HASH_SIZE; i++) 
+    for (int i = 0; i < HASH_SIZE; i++)
       {
-	int m = head[i] & 0xffff;
-	head[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
+        int m = head[i] & 0xffff;
+        head[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
       }
 
     /* Slide the prev table.
      */
-    for (int i = 0; i < WSIZE; i++) 
+    for (int i = 0; i < WSIZE; i++)
       {
-	int m = prev[i] & 0xffff;
-	prev[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
+        int m = prev[i] & 0xffff;
+        prev[i] = m >= WSIZE ? (short) (m - WSIZE) : 0;
       }
   }
 
@@ -298,30 +298,30 @@ class DeflaterEngine implements DeflaterConstants
      */
     while (lookahead < DeflaterConstants.MIN_LOOKAHEAD && inputOff < inputEnd)
       {
-	int more = 2*WSIZE - lookahead - strstart;
-	
-	if (more > inputEnd - inputOff)
-	  more = inputEnd - inputOff;
+        int more = 2*WSIZE - lookahead - strstart;
 
-	System.arraycopy(inputBuf, inputOff, 
-			 window, strstart + lookahead, more);
-	adler.update(inputBuf, inputOff, more);
-	inputOff += more;
-	totalIn  += more;
-	lookahead += more;
+        if (more > inputEnd - inputOff)
+          more = inputEnd - inputOff;
+
+        System.arraycopy(inputBuf, inputOff,
+                         window, strstart + lookahead, more);
+        adler.update(inputBuf, inputOff, more);
+        inputOff += more;
+        totalIn  += more;
+        lookahead += more;
       }
 
-    if (lookahead >= MIN_MATCH) 
+    if (lookahead >= MIN_MATCH)
       updateHash();
   }
 
   /**
-   * Find the best (longest) string in the window matching the 
+   * Find the best (longest) string in the window matching the
    * string starting at strstart.
    *
    * Preconditions:
    *    strstart + MAX_MATCH <= window.length.
-   *    
+   *
    *
    * @param curMatch
    */
@@ -333,7 +333,7 @@ class DeflaterEngine implements DeflaterConstants
     int match;
     int best_end = this.strstart + matchLen;
     int best_len = Math.max(matchLen, MIN_MATCH - 1);
-    
+
     int limit = Math.max(strstart - MAX_DIST, 0);
 
     int strend = scan + MAX_MATCH - 1;
@@ -350,51 +350,51 @@ class DeflaterEngine implements DeflaterConstants
     if (niceLength > lookahead)
       niceLength = lookahead;
 
-    if (DeflaterConstants.DEBUGGING 
-	&& strstart > 2*WSIZE - MIN_LOOKAHEAD)
+    if (DeflaterConstants.DEBUGGING
+        && strstart > 2*WSIZE - MIN_LOOKAHEAD)
       throw new InternalError("need lookahead");
-    
+
     do {
       if (DeflaterConstants.DEBUGGING && curMatch >= strstart)
-	throw new InternalError("future match");
+        throw new InternalError("future match");
       if (window[curMatch + best_len] != scan_end
-	  || window[curMatch + best_len - 1] != scan_end1
-	  || window[curMatch] != window[scan]
-	  || window[curMatch+1] != window[scan + 1])
-	continue;
+          || window[curMatch + best_len - 1] != scan_end1
+          || window[curMatch] != window[scan]
+          || window[curMatch+1] != window[scan + 1])
+        continue;
 
-      match = curMatch + 2;      
+      match = curMatch + 2;
       scan += 2;
 
       /* We check for insufficient lookahead only every 8th comparison;
        * the 256th check will be made at strstart+258.
        */
       while (window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && window[++scan] == window[++match]
-	     && scan < strend)
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && window[++scan] == window[++match]
+             && scan < strend)
         ;
 
       if (scan > best_end) {
-//  	if (DeflaterConstants.DEBUGGING && ins_h == 0)
-//  	  System.err.println("Found match: "+curMatch+"-"+(scan-strstart));
-	matchStart = curMatch;
-	best_end = scan;
-	best_len = scan - strstart;
-	if (best_len >= niceLength)
-	  break;
+//      if (DeflaterConstants.DEBUGGING && ins_h == 0)
+//        System.err.println("Found match: "+curMatch+"-"+(scan-strstart));
+        matchStart = curMatch;
+        best_end = scan;
+        best_len = scan - strstart;
+        if (best_len >= niceLength)
+          break;
 
-	scan_end1  = window[best_end-1];
-	scan_end   = window[best_end];
+        scan_end1  = window[best_end-1];
+        scan_end   = window[best_end];
       }
       scan = strstart;
     } while ((curMatch = (prev[curMatch & WMASK] & 0xffff)) > limit
-	     && --chainLength != 0);
+             && --chainLength != 0);
 
     matchLen = Math.min(best_len, lookahead);
     return matchLen >= MIN_MATCH;
@@ -417,13 +417,13 @@ class DeflaterEngine implements DeflaterConstants
     length--;
     while (--length > 0)
       {
-	insertString();
-	strstart++;
+        insertString();
+        strstart++;
       }
     strstart += 2;
     blockStart = strstart;
-  }    
-    
+  }
+
   private boolean deflateStored(boolean flush, boolean finish)
   {
     if (!flush && lookahead == 0)
@@ -434,25 +434,25 @@ class DeflaterEngine implements DeflaterConstants
 
     int storedLen = strstart - blockStart;
 
-    if ((storedLen >= DeflaterConstants.MAX_BLOCK_SIZE) 
-	/* Block is full */
-	|| (blockStart < WSIZE && storedLen >= MAX_DIST)
-	/* Block may move out of window */
-	|| flush)
+    if ((storedLen >= DeflaterConstants.MAX_BLOCK_SIZE)
+        /* Block is full */
+        || (blockStart < WSIZE && storedLen >= MAX_DIST)
+        /* Block may move out of window */
+        || flush)
       {
-	boolean lastBlock = finish;
-	if (storedLen > DeflaterConstants.MAX_BLOCK_SIZE)
-	  {
-	    storedLen = DeflaterConstants.MAX_BLOCK_SIZE;
-	    lastBlock = false;
-	  }
+        boolean lastBlock = finish;
+        if (storedLen > DeflaterConstants.MAX_BLOCK_SIZE)
+          {
+            storedLen = DeflaterConstants.MAX_BLOCK_SIZE;
+            lastBlock = false;
+          }
 
-	if (DeflaterConstants.DEBUGGING)
-	  System.err.println("storedBlock["+storedLen+","+lastBlock+"]");
+        if (DeflaterConstants.DEBUGGING)
+          System.err.println("storedBlock["+storedLen+","+lastBlock+"]");
 
-	huffman.flushStoredBlock(window, blockStart, storedLen, lastBlock);
-	blockStart += storedLen;
-	return !lastBlock;
+        huffman.flushStoredBlock(window, blockStart, storedLen, lastBlock);
+        blockStart += storedLen;
+        return !lastBlock;
       }
     return true;
   }
@@ -464,78 +464,78 @@ class DeflaterEngine implements DeflaterConstants
 
     while (lookahead >= MIN_LOOKAHEAD || flush)
       {
-	if (lookahead == 0)
-	  {
-	    /* We are flushing everything */
-	    huffman.flushBlock(window, blockStart, strstart - blockStart,
-			       finish);
-	    blockStart = strstart;
-	    return false;
-	  }
+        if (lookahead == 0)
+          {
+            /* We are flushing everything */
+            huffman.flushBlock(window, blockStart, strstart - blockStart,
+                               finish);
+            blockStart = strstart;
+            return false;
+          }
 
-	if (strstart > 2 * WSIZE - MIN_LOOKAHEAD)
-	  {
-	    /* slide window, as findLongestMatch need this.
-	     * This should only happen when flushing and the window
-	     * is almost full.
-	     */
-	    slideWindow();
-	  }
+        if (strstart > 2 * WSIZE - MIN_LOOKAHEAD)
+          {
+            /* slide window, as findLongestMatch need this.
+             * This should only happen when flushing and the window
+             * is almost full.
+             */
+            slideWindow();
+          }
 
-	int hashHead;
-	if (lookahead >= MIN_MATCH 
-	    && (hashHead = insertString()) != 0
-	    && strategy != Deflater.HUFFMAN_ONLY
-	    && strstart - hashHead <= MAX_DIST
-	    && findLongestMatch(hashHead))
-	  {
-	    /* longestMatch sets matchStart and matchLen */
-	    if (DeflaterConstants.DEBUGGING)
-	      {
-		for (int i = 0 ; i < matchLen; i++)
-		  {
-		    if (window[strstart+i] != window[matchStart + i])
-		      throw new InternalError();
-		  }
-	      }
-	    boolean full = huffman.tallyDist(strstart - matchStart, matchLen);
-	    
-	    lookahead -= matchLen;
-	    if (matchLen <= max_lazy && lookahead >= MIN_MATCH)
-	      {
-		while (--matchLen > 0)
-		  {
-		    strstart++;
-		    insertString();
-		  }
-		strstart++;
-	      }
-	    else
-	      {
-		strstart += matchLen;
-		if (lookahead >= MIN_MATCH - 1)
-		  updateHash();
-	      }
-	    matchLen = MIN_MATCH - 1;
-	    if (!full)
-	      continue;
-	  }
-	else
-	  {
-	    /* No match found */
-	    huffman.tallyLit(window[strstart] & 0xff);
-	    strstart++;
-	    lookahead--;
-	  }
+        int hashHead;
+        if (lookahead >= MIN_MATCH
+            && (hashHead = insertString()) != 0
+            && strategy != Deflater.HUFFMAN_ONLY
+            && strstart - hashHead <= MAX_DIST
+            && findLongestMatch(hashHead))
+          {
+            /* longestMatch sets matchStart and matchLen */
+            if (DeflaterConstants.DEBUGGING)
+              {
+                for (int i = 0 ; i < matchLen; i++)
+                  {
+                    if (window[strstart+i] != window[matchStart + i])
+                      throw new InternalError();
+                  }
+              }
+            boolean full = huffman.tallyDist(strstart - matchStart, matchLen);
 
-	if (huffman.isFull())
-	  {
-	    boolean lastBlock = finish && lookahead == 0;
-	    huffman.flushBlock(window, blockStart, strstart - blockStart,
-			       lastBlock);
-	    blockStart = strstart;
-	    return !lastBlock;
-	  }
+            lookahead -= matchLen;
+            if (matchLen <= max_lazy && lookahead >= MIN_MATCH)
+              {
+                while (--matchLen > 0)
+                  {
+                    strstart++;
+                    insertString();
+                  }
+                strstart++;
+              }
+            else
+              {
+                strstart += matchLen;
+                if (lookahead >= MIN_MATCH - 1)
+                  updateHash();
+              }
+            matchLen = MIN_MATCH - 1;
+            if (!full)
+              continue;
+          }
+        else
+          {
+            /* No match found */
+            huffman.tallyLit(window[strstart] & 0xff);
+            strstart++;
+            lookahead--;
+          }
+
+        if (huffman.isFull())
+          {
+            boolean lastBlock = finish && lookahead == 0;
+            huffman.flushBlock(window, blockStart, strstart - blockStart,
+                               lastBlock);
+            blockStart = strstart;
+            return !lastBlock;
+          }
       }
     return true;
   }
@@ -547,127 +547,127 @@ class DeflaterEngine implements DeflaterConstants
 
     while (lookahead >= MIN_LOOKAHEAD || flush)
       {
-	if (lookahead == 0)
-	  {
-	    if (prevAvailable)
-	      huffman.tallyLit(window[strstart-1] & 0xff);
-	    prevAvailable = false;
+        if (lookahead == 0)
+          {
+            if (prevAvailable)
+              huffman.tallyLit(window[strstart-1] & 0xff);
+            prevAvailable = false;
 
-	    /* We are flushing everything */
-	    if (DeflaterConstants.DEBUGGING && !flush)
-	      throw new InternalError("Not flushing, but no lookahead");
-	    huffman.flushBlock(window, blockStart, strstart - blockStart,
-			       finish);
-	    blockStart = strstart;
-	    return false;
-	  }
+            /* We are flushing everything */
+            if (DeflaterConstants.DEBUGGING && !flush)
+              throw new InternalError("Not flushing, but no lookahead");
+            huffman.flushBlock(window, blockStart, strstart - blockStart,
+                               finish);
+            blockStart = strstart;
+            return false;
+          }
 
-	if (strstart >= 2 * WSIZE - MIN_LOOKAHEAD)
-	  {
-	    /* slide window, as findLongestMatch need this.
-	     * This should only happen when flushing and the window
-	     * is almost full.
-	     */
-	    slideWindow();
-	  }
+        if (strstart >= 2 * WSIZE - MIN_LOOKAHEAD)
+          {
+            /* slide window, as findLongestMatch need this.
+             * This should only happen when flushing and the window
+             * is almost full.
+             */
+            slideWindow();
+          }
 
-	int prevMatch = matchStart;
-	int prevLen = matchLen;
-	if (lookahead >= MIN_MATCH)
-	  {
-	    int hashHead = insertString();
-	    if (strategy != Deflater.HUFFMAN_ONLY
-		&& hashHead != 0 && strstart - hashHead <= MAX_DIST
-		&& findLongestMatch(hashHead))
-	      {
-		/* longestMatch sets matchStart and matchLen */
-		
-		/* Discard match if too small and too far away */
-		if (matchLen <= 5
-		    && (strategy == Deflater.FILTERED
-			|| (matchLen == MIN_MATCH
-			    && strstart - matchStart > TOO_FAR))) {
-		  matchLen = MIN_MATCH - 1;
-		}
-	      }
-	  }
-	
-	/* previous match was better */
-	if (prevLen >= MIN_MATCH && matchLen <= prevLen)
-	  {
-	    if (DeflaterConstants.DEBUGGING)
-	      {
-		for (int i = 0 ; i < matchLen; i++)
-		  {
-		    if (window[strstart-1+i] != window[prevMatch + i])
-		      throw new InternalError();
-		  }
-	      }
-	    huffman.tallyDist(strstart - 1 - prevMatch, prevLen);
-	    prevLen -= 2;
-	    do 
-	      {
-		strstart++;
-		lookahead--;
-		if (lookahead >= MIN_MATCH)
-		  insertString();
-	      }
-	    while (--prevLen > 0);
-	    strstart ++;
-	    lookahead--;
-	    prevAvailable = false;
-	    matchLen = MIN_MATCH - 1;
-	  }
-	else
-	  {
-	    if (prevAvailable)
-	      huffman.tallyLit(window[strstart-1] & 0xff);
-	    prevAvailable = true;
-	    strstart++;
-	    lookahead--;
-	  }
+        int prevMatch = matchStart;
+        int prevLen = matchLen;
+        if (lookahead >= MIN_MATCH)
+          {
+            int hashHead = insertString();
+            if (strategy != Deflater.HUFFMAN_ONLY
+                && hashHead != 0 && strstart - hashHead <= MAX_DIST
+                && findLongestMatch(hashHead))
+              {
+                /* longestMatch sets matchStart and matchLen */
 
-	if (huffman.isFull())
-	  {
-	    int len = strstart - blockStart;
-	    if (prevAvailable)
-	      len--;
-	    boolean lastBlock = (finish && lookahead == 0 && !prevAvailable);
-	    huffman.flushBlock(window, blockStart, len, lastBlock);
-	    blockStart += len;
-	    return !lastBlock;
-	  }
+                /* Discard match if too small and too far away */
+                if (matchLen <= 5
+                    && (strategy == Deflater.FILTERED
+                        || (matchLen == MIN_MATCH
+                            && strstart - matchStart > TOO_FAR))) {
+                  matchLen = MIN_MATCH - 1;
+                }
+              }
+          }
+
+        /* previous match was better */
+        if (prevLen >= MIN_MATCH && matchLen <= prevLen)
+          {
+            if (DeflaterConstants.DEBUGGING)
+              {
+                for (int i = 0 ; i < matchLen; i++)
+                  {
+                    if (window[strstart-1+i] != window[prevMatch + i])
+                      throw new InternalError();
+                  }
+              }
+            huffman.tallyDist(strstart - 1 - prevMatch, prevLen);
+            prevLen -= 2;
+            do
+              {
+                strstart++;
+                lookahead--;
+                if (lookahead >= MIN_MATCH)
+                  insertString();
+              }
+            while (--prevLen > 0);
+            strstart ++;
+            lookahead--;
+            prevAvailable = false;
+            matchLen = MIN_MATCH - 1;
+          }
+        else
+          {
+            if (prevAvailable)
+              huffman.tallyLit(window[strstart-1] & 0xff);
+            prevAvailable = true;
+            strstart++;
+            lookahead--;
+          }
+
+        if (huffman.isFull())
+          {
+            int len = strstart - blockStart;
+            if (prevAvailable)
+              len--;
+            boolean lastBlock = (finish && lookahead == 0 && !prevAvailable);
+            huffman.flushBlock(window, blockStart, len, lastBlock);
+            blockStart += len;
+            return !lastBlock;
+          }
       }
     return true;
-  } 
+  }
 
-  public boolean deflate(boolean flush, boolean finish) 
+  public boolean deflate(boolean flush, boolean finish)
   {
     boolean progress;
     do
       {
-	fillWindow();
-	boolean canFlush = flush && inputOff == inputEnd;
-	if (DeflaterConstants.DEBUGGING)
-	  System.err.println("window: ["+blockStart+","+strstart+","
-			     +lookahead+"], "+comprFunc+","+canFlush);
-	switch (comprFunc)
-	  {
-	  case DEFLATE_STORED:
-	    progress = deflateStored(canFlush, finish);
-	    break;
-	  case DEFLATE_FAST:
-	    progress = deflateFast(canFlush, finish);
-	    break;
-	  case DEFLATE_SLOW:
-	    progress = deflateSlow(canFlush, finish);
-	    break;
-	  default:
-	    throw new InternalError();
-	  }
+        fillWindow();
+        boolean canFlush = flush && inputOff == inputEnd;
+        if (DeflaterConstants.DEBUGGING)
+          System.err.println("window: ["+blockStart+","+strstart+","
+                             +lookahead+"], "+comprFunc+","+canFlush);
+        switch (comprFunc)
+          {
+          case DEFLATE_STORED:
+            progress = deflateStored(canFlush, finish);
+            break;
+          case DEFLATE_FAST:
+            progress = deflateFast(canFlush, finish);
+            break;
+          case DEFLATE_SLOW:
+            progress = deflateSlow(canFlush, finish);
+            break;
+          default:
+            throw new InternalError();
+          }
       }
     while (pending.isFlushed()  /* repeat while we have no pending output */
-	   && progress);        /* and progress was made */
+           && progress);        /* and progress was made */
 
     return progress;
   }
@@ -676,12 +676,12 @@ class DeflaterEngine implements DeflaterConstants
   {
     if (inputOff < inputEnd)
       throw new IllegalStateException
-	("Old input was not completely processed");
+        ("Old input was not completely processed");
 
     int end = off + len;
 
     /* We want to throw an ArrayIndexOutOfBoundsException early.  The
-     * check is very tricky: it also handles integer wrap around.  
+     * check is very tricky: it also handles integer wrap around.
      */
     if (0 > off || off > end || end > buf.length)
       throw new ArrayIndexOutOfBoundsException();
diff --git a/libjava/classpath/java/util/zip/DeflaterHuffman.java b/libjava/classpath/java/util/zip/DeflaterHuffman.java
index 32c10b6de80..8da987e0fd9 100644
--- a/libjava/classpath/java/util/zip/DeflaterHuffman.java
+++ b/libjava/classpath/java/util/zip/DeflaterHuffman.java
@@ -44,7 +44,7 @@ package java.util.zip;
  * to the split of deflate and setInput.
  *
  * @author Jochen Hoenicke
- * @date Jan 6, 2000 
+ * @date Jan 6, 2000
  */
 class DeflaterHuffman
 {
@@ -79,7 +79,7 @@ class DeflaterHuffman
 
     void reset() {
       for (int i = 0; i < freqs.length; i++)
-	freqs[i] = 0;
+        freqs[i] = 0;
       codes = null;
       length = null;
     }
@@ -87,10 +87,10 @@ class DeflaterHuffman
     final void writeSymbol(int code)
     {
       if (DeflaterConstants.DEBUGGING)
- 	{
- 	  freqs[code]--;
-//  	  System.err.print("writeSymbol("+freqs.length+","+code+"): ");
- 	}
+        {
+          freqs[code]--;
+//        System.err.print("writeSymbol("+freqs.length+","+code+"): ");
+        }
       pending.writeBits(codes[code] & 0xffff, length[code]);
     }
 
@@ -98,13 +98,13 @@ class DeflaterHuffman
     {
       boolean empty = true;
       for (int i = 0; i < freqs.length; i++)
-	if (freqs[i] != 0)
-	  {
-	    System.err.println("freqs["+i+"] == "+freqs[i]);
-	    empty = false;
-	  }
+        if (freqs[i] != 0)
+          {
+            System.err.println("freqs["+i+"] == "+freqs[i]);
+            empty = false;
+          }
       if (!empty)
-	throw new InternalError();
+        throw new InternalError();
       System.err.println("checkEmpty suceeded!");
     }
 
@@ -120,31 +120,31 @@ class DeflaterHuffman
       codes = new short[freqs.length];
 
       if (DeflaterConstants.DEBUGGING)
-	System.err.println("buildCodes: "+freqs.length);
-      for (int bits = 0; bits < maxLength; bits++) 
-	{
-	  nextCode[bits] = code;
-	  code += bl_counts[bits] << (15 - bits);
-	  if (DeflaterConstants.DEBUGGING)
-	    System.err.println("bits: "+(bits+1)+" count: "+bl_counts[bits]
-			       +" nextCode: "+Integer.toHexString(code));
-	}
+        System.err.println("buildCodes: "+freqs.length);
+      for (int bits = 0; bits < maxLength; bits++)
+        {
+          nextCode[bits] = code;
+          code += bl_counts[bits] << (15 - bits);
+          if (DeflaterConstants.DEBUGGING)
+            System.err.println("bits: "+(bits+1)+" count: "+bl_counts[bits]
+                               +" nextCode: "+Integer.toHexString(code));
+        }
       if (DeflaterConstants.DEBUGGING && code != 65536)
-	throw new RuntimeException("Inconsistent bl_counts!");
-      
+        throw new RuntimeException("Inconsistent bl_counts!");
+
       for (int i=0; i < numCodes; i++)
-	{
-	  int bits = length[i];
-	  if (bits > 0)
-	    {
-	      if (DeflaterConstants.DEBUGGING)
-		System.err.println("codes["+i+"] = rev("
-				   +Integer.toHexString(nextCode[bits-1])+"),"
-				   +bits);
-	      codes[i] = bitReverse(nextCode[bits-1]);
-	      nextCode[bits-1] += 1 << (16 - bits);
-	    }
-	}
+        {
+          int bits = length[i];
+          if (bits > 0)
+            {
+              if (DeflaterConstants.DEBUGGING)
+                System.err.println("codes["+i+"] = rev("
+                                   +Integer.toHexString(nextCode[bits-1])+"),"
+                                   +bits);
+              codes[i] = bitReverse(nextCode[bits-1]);
+              nextCode[bits-1] += 1 << (16 - bits);
+            }
+        }
     }
 
     private void buildLength(int childs[])
@@ -153,63 +153,63 @@ class DeflaterHuffman
       int numNodes = childs.length / 2;
       int numLeafs = (numNodes + 1) / 2;
       int overflow = 0;
-      
+
       for (int i = 0; i < maxLength; i++)
-	bl_counts[i] = 0;
+        bl_counts[i] = 0;
 
       /* First calculate optimal bit lengths */
       int lengths[] = new int[numNodes];
       lengths[numNodes-1] = 0;
       for (int i = numNodes - 1; i >= 0; i--)
-	{
-	  if (childs[2*i+1] != -1)
-	    {
-	      int bitLength = lengths[i] + 1;
-	      if (bitLength > maxLength)
-		{
-		  bitLength = maxLength;
-		  overflow++;
-		}
-	      lengths[childs[2*i]] = lengths[childs[2*i+1]] = bitLength;
-	    }
-	  else
-	    {
-	      /* A leaf node */
-	      int bitLength = lengths[i];
-	      bl_counts[bitLength - 1]++;
-	      this.length[childs[2*i]] = (byte) lengths[i];
-	    }
-	}
-      
+        {
+          if (childs[2*i+1] != -1)
+            {
+              int bitLength = lengths[i] + 1;
+              if (bitLength > maxLength)
+                {
+                  bitLength = maxLength;
+                  overflow++;
+                }
+              lengths[childs[2*i]] = lengths[childs[2*i+1]] = bitLength;
+            }
+          else
+            {
+              /* A leaf node */
+              int bitLength = lengths[i];
+              bl_counts[bitLength - 1]++;
+              this.length[childs[2*i]] = (byte) lengths[i];
+            }
+        }
+
       if (DeflaterConstants.DEBUGGING)
-	{
-	  System.err.println("Tree "+freqs.length+" lengths:");
-	  for (int i=0; i < numLeafs; i++)
-	    System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
-			       + " len: "+length[childs[2*i]]);
-	}
-      
+        {
+          System.err.println("Tree "+freqs.length+" lengths:");
+          for (int i=0; i < numLeafs; i++)
+            System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
+                               + " len: "+length[childs[2*i]]);
+        }
+
       if (overflow == 0)
-	return;
-      
+        return;
+
       int incrBitLen = maxLength - 1;
       do
-	{
-	  /* Find the first bit length which could increase: */
-	  while (bl_counts[--incrBitLen] == 0)
-	    ;
-	  
-	  /* Move this node one down and remove a corresponding
-	   * amount of overflow nodes.
-	   */
-	  do
-	    {
-	      bl_counts[incrBitLen]--;
-	      bl_counts[++incrBitLen]++;
-	      overflow -= 1 << (maxLength - 1 - incrBitLen);
-	    }
-	  while (overflow > 0 && incrBitLen < maxLength - 1);
-	}
+        {
+          /* Find the first bit length which could increase: */
+          while (bl_counts[--incrBitLen] == 0)
+            ;
+
+          /* Move this node one down and remove a corresponding
+           * amount of overflow nodes.
+           */
+          do
+            {
+              bl_counts[incrBitLen]--;
+              bl_counts[++incrBitLen]++;
+              overflow -= 1 << (maxLength - 1 - incrBitLen);
+            }
+          while (overflow > 0 && incrBitLen < maxLength - 1);
+        }
       while (overflow > 0);
 
       /* We may have overshot above.  Move some nodes from maxLength to
@@ -217,7 +217,7 @@ class DeflaterHuffman
        */
       bl_counts[maxLength-1] += overflow;
       bl_counts[maxLength-2] -= overflow;
-      
+
       /* Now recompute all bit lengths, scanning in increasing
        * frequency.  It is simpler to reconstruct all lengths instead of
        * fixing only the wrong ones. This idea is taken from 'ar'
@@ -227,30 +227,30 @@ class DeflaterHuffman
        * array.
        */
       int nodePtr = 2 * numLeafs;
-      for (int bits = maxLength; bits != 0; bits--) 
-	{
-	  int n = bl_counts[bits-1];
-	  while (n > 0) 
-	    {
-	      int childPtr = 2*childs[nodePtr++];
-	      if (childs[childPtr + 1] == -1)
-		{
-		  /* We found another leaf */
-		  length[childs[childPtr]] = (byte) bits;
-		  n--;
-		}
-	    }
-	}
+      for (int bits = maxLength; bits != 0; bits--)
+        {
+          int n = bl_counts[bits-1];
+          while (n > 0)
+            {
+              int childPtr = 2*childs[nodePtr++];
+              if (childs[childPtr + 1] == -1)
+                {
+                  /* We found another leaf */
+                  length[childs[childPtr]] = (byte) bits;
+                  n--;
+                }
+            }
+        }
       if (DeflaterConstants.DEBUGGING)
-	{
-	  System.err.println("*** After overflow elimination. ***");
-	  for (int i=0; i < numLeafs; i++)
-	    System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
-			       + " len: "+length[childs[2*i]]);
-	}
+        {
+          System.err.println("*** After overflow elimination. ***");
+          for (int i=0; i < numLeafs; i++)
+            System.err.println("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]
+                               + " len: "+length[childs[2*i]]);
+        }
     }
-    
-    void buildTree() 
+
+    void buildTree()
     {
       int numSymbols = freqs.length;
 
@@ -266,123 +266,123 @@ class DeflaterHuffman
       int heapLen = 0;
       int maxCode = 0;
       for (int n = 0; n < numSymbols; n++)
-	{
-	  int freq = freqs[n];
-	  if (freq != 0)
-	    {
-	      /* Insert n into heap */
-	      int pos = heapLen++;
-	      int ppos;
-	      while (pos > 0 &&
-		     freqs[heap[ppos = (pos - 1) / 2]] > freq) {
-		heap[pos] = heap[ppos];
-		pos = ppos;
-	      }
-	      heap[pos] = n;
-	      maxCode = n;
-	    }
-	}
-      
+        {
+          int freq = freqs[n];
+          if (freq != 0)
+            {
+              /* Insert n into heap */
+              int pos = heapLen++;
+              int ppos;
+              while (pos > 0 &&
+                     freqs[heap[ppos = (pos - 1) / 2]] > freq) {
+                heap[pos] = heap[ppos];
+                pos = ppos;
+              }
+              heap[pos] = n;
+              maxCode = n;
+            }
+        }
+
       /* We could encode a single literal with 0 bits but then we
        * don't see the literals.  Therefore we force at least two
        * literals to avoid this case.  We don't care about order in
-       * this case, both literals get a 1 bit code.  
+       * this case, both literals get a 1 bit code.
        */
       while (heapLen < 2)
-	{
-	  int node = maxCode < 2 ? ++maxCode : 0;
-	  heap[heapLen++] = node;
-	}
+        {
+          int node = maxCode < 2 ? ++maxCode : 0;
+          heap[heapLen++] = node;
+        }
 
       numCodes = Math.max(maxCode + 1, minNumCodes);
-      
+
       int numLeafs = heapLen;
       int[] childs = new int[4*heapLen - 2];
       int[] values = new int[2*heapLen - 1];
       int numNodes = numLeafs;
       for (int i = 0; i < heapLen; i++)
-	{
-	  int node = heap[i];
-	  childs[2*i]   = node;
-	  childs[2*i+1] = -1;
-	  values[i] = freqs[node] << 8;
-	  heap[i] = i;
-	}
-      
+        {
+          int node = heap[i];
+          childs[2*i]   = node;
+          childs[2*i+1] = -1;
+          values[i] = freqs[node] << 8;
+          heap[i] = i;
+        }
+
       /* Construct the Huffman tree by repeatedly combining the least two
        * frequent nodes.
        */
       do
-	{
-	  int first = heap[0];
-	  int last  = heap[--heapLen];
-	  
-	  /* Propagate the hole to the leafs of the heap */
-	  int ppos = 0;
-	  int path = 1;
-	  while (path < heapLen)
-	    {
-	      if (path + 1 < heapLen 
-		  && values[heap[path]] > values[heap[path+1]])
-		path++;
-	      
-	      heap[ppos] = heap[path];
-	      ppos = path;
-	      path = path * 2 + 1;
-	    }
-	  
-	  /* Now propagate the last element down along path.  Normally
-	   * it shouldn't go too deep.
-	   */
-	  int lastVal = values[last];
-	  while ((path = ppos) > 0
-		 && values[heap[ppos = (path - 1)/2]] > lastVal)
-	    heap[path] = heap[ppos];
-	  heap[path] = last;
-	  
-	  
-	  int second = heap[0];
-	  
-	  /* Create a new node father of first and second */
-	  last = numNodes++;
-	  childs[2*last] = first;
-	  childs[2*last+1] = second;
-	  int mindepth = Math.min(values[first] & 0xff, values[second] & 0xff);
-	  values[last] = lastVal = values[first] + values[second] - mindepth + 1;
-	  
-	  /* Again, propagate the hole to the leafs */
-	  ppos = 0;
-	  path = 1;
-	  while (path < heapLen)
-	    {
-	      if (path + 1 < heapLen 
-		  && values[heap[path]] > values[heap[path+1]])
-		path++;
-	      
-	      heap[ppos] = heap[path];
-	      ppos = path;
-	      path = ppos * 2 + 1;
-	    }
-	  
-	  /* Now propagate the new element down along path */
-	  while ((path = ppos) > 0
-		 && values[heap[ppos = (path - 1)/2]] > lastVal)
-	    heap[path] = heap[ppos];
-	  heap[path] = last;
-	}
+        {
+          int first = heap[0];
+          int last  = heap[--heapLen];
+
+          /* Propagate the hole to the leafs of the heap */
+          int ppos = 0;
+          int path = 1;
+          while (path < heapLen)
+            {
+              if (path + 1 < heapLen
+                  && values[heap[path]] > values[heap[path+1]])
+                path++;
+
+              heap[ppos] = heap[path];
+              ppos = path;
+              path = path * 2 + 1;
+            }
+
+          /* Now propagate the last element down along path.  Normally
+           * it shouldn't go too deep.
+           */
+          int lastVal = values[last];
+          while ((path = ppos) > 0
+                 && values[heap[ppos = (path - 1)/2]] > lastVal)
+            heap[path] = heap[ppos];
+          heap[path] = last;
+
+
+          int second = heap[0];
+
+          /* Create a new node father of first and second */
+          last = numNodes++;
+          childs[2*last] = first;
+          childs[2*last+1] = second;
+          int mindepth = Math.min(values[first] & 0xff, values[second] & 0xff);
+          values[last] = lastVal = values[first] + values[second] - mindepth + 1;
+
+          /* Again, propagate the hole to the leafs */
+          ppos = 0;
+          path = 1;
+          while (path < heapLen)
+            {
+              if (path + 1 < heapLen
+                  && values[heap[path]] > values[heap[path+1]])
+                path++;
+
+              heap[ppos] = heap[path];
+              ppos = path;
+              path = ppos * 2 + 1;
+            }
+
+          /* Now propagate the new element down along path */
+          while ((path = ppos) > 0
+                 && values[heap[ppos = (path - 1)/2]] > lastVal)
+            heap[path] = heap[ppos];
+          heap[path] = last;
+        }
       while (heapLen > 1);
-      
+
       if (heap[0] != childs.length / 2 - 1)
-	throw new RuntimeException("Weird!");
-      
+        throw new RuntimeException("Weird!");
+
       buildLength(childs);
     }
 
-    int getEncodedLength() 
+    int getEncodedLength()
     {
       int len = 0;
       for (int i = 0; i < freqs.length; i++)
-	len += freqs[i] * length[i];
+        len += freqs[i] * length[i];
       return len;
     }
 
@@ -391,46 +391,46 @@ class DeflaterHuffman
       int min_count;               /* min repeat count */
       int count;                   /* repeat count of the current code */
       int curlen = -1;             /* length of current code */
-      
+
       int i = 0;
       while (i < numCodes)
-	{
-	  count = 1;
-	  int nextlen = length[i];
-	  if (nextlen == 0) 
-	    {
-	      max_count = 138;
-	      min_count = 3;
-	    }
-	  else
-	    {
-	      max_count = 6;
-	      min_count = 3;
-	      if (curlen != nextlen)
-		{
-		  blTree.freqs[nextlen]++;
-		  count = 0;
-		}
-	    }
-	  curlen = nextlen;
-	  i++;
+        {
+          count = 1;
+          int nextlen = length[i];
+          if (nextlen == 0)
+            {
+              max_count = 138;
+              min_count = 3;
+            }
+          else
+            {
+              max_count = 6;
+              min_count = 3;
+              if (curlen != nextlen)
+                {
+                  blTree.freqs[nextlen]++;
+                  count = 0;
+                }
+            }
+          curlen = nextlen;
+          i++;
 
-	  while (i < numCodes && curlen == length[i])
-	    {
-	      i++;
-	      if (++count >= max_count)
-		break;
-	    }
+          while (i < numCodes && curlen == length[i])
+            {
+              i++;
+              if (++count >= max_count)
+                break;
+            }
 
-	  if (count < min_count)
-	    blTree.freqs[curlen] += count;
-	  else if (curlen != 0)
-	    blTree.freqs[REP_3_6]++;
-	  else if (count <= 10)
-	    blTree.freqs[REP_3_10]++;
-	  else
-	    blTree.freqs[REP_11_138]++;
-	}
+          if (count < min_count)
+            blTree.freqs[curlen] += count;
+          else if (curlen != 0)
+            blTree.freqs[REP_3_6]++;
+          else if (count <= 10)
+            blTree.freqs[REP_3_10]++;
+          else
+            blTree.freqs[REP_11_138]++;
+        }
     }
 
     void writeTree(Tree blTree)
@@ -439,58 +439,58 @@ class DeflaterHuffman
       int min_count;               /* min repeat count */
       int count;                   /* repeat count of the current code */
       int curlen = -1;             /* length of current code */
-      
+
       int i = 0;
       while (i < numCodes)
-	{
-	  count = 1;
-	  int nextlen = length[i];
-	  if (nextlen == 0) 
-	    {
-	      max_count = 138;
-	      min_count = 3;
-	    }
-	  else
-	    {
-	      max_count = 6;
-	      min_count = 3;
-	      if (curlen != nextlen)
-		{
-		  blTree.writeSymbol(nextlen);
-		  count = 0;
-		}
-	    }
-	  curlen = nextlen;
-	  i++;
+        {
+          count = 1;
+          int nextlen = length[i];
+          if (nextlen == 0)
+            {
+              max_count = 138;
+              min_count = 3;
+            }
+          else
+            {
+              max_count = 6;
+              min_count = 3;
+              if (curlen != nextlen)
+                {
+                  blTree.writeSymbol(nextlen);
+                  count = 0;
+                }
+            }
+          curlen = nextlen;
+          i++;
 
-	  while (i < numCodes && curlen == length[i])
-	    {
-	      i++;
-	      if (++count >= max_count)
-		break;
-	    }
+          while (i < numCodes && curlen == length[i])
+            {
+              i++;
+              if (++count >= max_count)
+                break;
+            }
 
-	  if (count < min_count)
-	    {
-	      while (count-- > 0)
-		blTree.writeSymbol(curlen);
-	    }
-	  else if (curlen != 0)
-	    {
-	      blTree.writeSymbol(REP_3_6);
-	      pending.writeBits(count - 3, 2);
-	    }
-	  else if (count <= 10)
-	    {
-	      blTree.writeSymbol(REP_3_10);
-	      pending.writeBits(count - 3, 3);
-	    }
-	  else
-	    {
-	      blTree.writeSymbol(REP_11_138);
-	      pending.writeBits(count - 11, 7);
-	    }
-	}
+          if (count < min_count)
+            {
+              while (count-- > 0)
+                blTree.writeSymbol(curlen);
+            }
+          else if (curlen != 0)
+            {
+              blTree.writeSymbol(REP_3_6);
+              pending.writeBits(count - 3, 2);
+            }
+          else if (count <= 10)
+            {
+              blTree.writeSymbol(REP_3_10);
+              pending.writeBits(count - 3, 3);
+            }
+          else
+            {
+              blTree.writeSymbol(REP_11_138);
+              pending.writeBits(count - 11, 7);
+            }
+        }
     }
   }
 
@@ -514,9 +514,9 @@ class DeflaterHuffman
    */
   static short bitReverse(int value) {
     return (short) (bit4Reverse.charAt(value & 0xf) << 12
-		    | bit4Reverse.charAt((value >> 4) & 0xf) << 8
-		    | bit4Reverse.charAt((value >> 8) & 0xf) << 4
-		    | bit4Reverse.charAt(value >> 12));
+                    | bit4Reverse.charAt((value >> 4) & 0xf) << 8
+                    | bit4Reverse.charAt((value >> 8) & 0xf) << 4
+                    | bit4Reverse.charAt(value >> 12));
   }
 
   static {
@@ -550,8 +550,8 @@ class DeflaterHuffman
       staticDLength[i] = 5;
     }
   }
-    
-  public DeflaterHuffman(DeflaterPending pending) 
+
+  public DeflaterHuffman(DeflaterPending pending)
   {
     this.pending = pending;
 
@@ -578,8 +578,8 @@ class DeflaterHuffman
     int code = 257;
     while (len >= 8)
       {
-	code += 4;
-	len >>= 1;
+        code += 4;
+        len >>= 1;
       }
     return code + len;
   }
@@ -588,8 +588,8 @@ class DeflaterHuffman
     int code = 0;
     while (distance >= 4)
       {
-	code += 2;
-	distance >>= 1;
+        code += 2;
+        distance >>= 1;
       }
     return code + distance;
   }
@@ -610,58 +610,58 @@ class DeflaterHuffman
   }
 
   public void compressBlock() {
-    for (int i = 0; i < last_lit; i++) 
+    for (int i = 0; i < last_lit; i++)
       {
-	int litlen = l_buf[i] & 0xff;
-	int dist = d_buf[i];
-	if (dist-- != 0)
-	  {
-	    if (DeflaterConstants.DEBUGGING)
-	      System.err.print("["+(dist+1)+","+(litlen+3)+"]: ");
+        int litlen = l_buf[i] & 0xff;
+        int dist = d_buf[i];
+        if (dist-- != 0)
+          {
+            if (DeflaterConstants.DEBUGGING)
+              System.err.print("["+(dist+1)+","+(litlen+3)+"]: ");
 
-	    int lc = l_code(litlen);
-	    literalTree.writeSymbol(lc);
+            int lc = l_code(litlen);
+            literalTree.writeSymbol(lc);
 
-	    int bits = (lc - 261) / 4;
-	    if (bits > 0 && bits <= 5)
-	      pending.writeBits(litlen & ((1 << bits) - 1), bits);
+            int bits = (lc - 261) / 4;
+            if (bits > 0 && bits <= 5)
+              pending.writeBits(litlen & ((1 << bits) - 1), bits);
 
-	    int dc = d_code(dist);
-	    distTree.writeSymbol(dc);
+            int dc = d_code(dist);
+            distTree.writeSymbol(dc);
 
-	    bits = dc / 2 - 1;
-	    if (bits > 0)
-	      pending.writeBits(dist & ((1 << bits) - 1), bits);
-	  }
-	else
-	  {
-	    if (DeflaterConstants.DEBUGGING)
-	      {
-		if (litlen > 32 && litlen < 127)
-		  System.err.print("("+(char)litlen+"): ");
-		else
-		  System.err.print("{"+litlen+"}: ");
-	      }
-	    literalTree.writeSymbol(litlen);
-	  }
+            bits = dc / 2 - 1;
+            if (bits > 0)
+              pending.writeBits(dist & ((1 << bits) - 1), bits);
+          }
+        else
+          {
+            if (DeflaterConstants.DEBUGGING)
+              {
+                if (litlen > 32 && litlen < 127)
+                  System.err.print("("+(char)litlen+"): ");
+                else
+                  System.err.print("{"+litlen+"}: ");
+              }
+            literalTree.writeSymbol(litlen);
+          }
       }
     if (DeflaterConstants.DEBUGGING)
       System.err.print("EOF: ");
     literalTree.writeSymbol(EOF_SYMBOL);
     if (DeflaterConstants.DEBUGGING)
       {
-	literalTree.checkEmpty();
-	distTree.checkEmpty();
+        literalTree.checkEmpty();
+        distTree.checkEmpty();
       }
   }
 
-  public void flushStoredBlock(byte[] stored, 
-			       int stored_offset, int stored_len,
-			       boolean lastBlock) {
+  public void flushStoredBlock(byte[] stored,
+                               int stored_offset, int stored_len,
+                               boolean lastBlock) {
     if (DeflaterConstants.DEBUGGING)
       System.err.println("Flushing stored block "+ stored_len);
     pending.writeBits((DeflaterConstants.STORED_BLOCK << 1)
-		      + (lastBlock ? 1 : 0), 3);
+                      + (lastBlock ? 1 : 0), 3);
     pending.alignToByte();
     pending.writeShort(stored_len);
     pending.writeShort(~stored_len);
@@ -670,7 +670,7 @@ class DeflaterHuffman
   }
 
   public void flushBlock(byte[] stored, int stored_offset, int stored_len,
-			 boolean lastBlock) {
+                         boolean lastBlock) {
     literalTree.freqs[EOF_SYMBOL]++;
 
     /* Build trees */
@@ -687,8 +687,8 @@ class DeflaterHuffman
     int blTreeCodes = 4;
     for (int i = 18; i > blTreeCodes; i--)
       {
-	if (blTree.length[BL_ORDER[i]] > 0)
-	  blTreeCodes = i+1;
+        if (blTree.length[BL_ORDER[i]] > 0)
+          blTreeCodes = i+1;
       }
     int opt_len = 14 + blTreeCodes * 3 + blTree.getEncodedLength()
       + literalTree.getEncodedLength() + distTree.getEncodedLength()
@@ -701,36 +701,36 @@ class DeflaterHuffman
       static_len += distTree.freqs[i] * staticDLength[i];
     if (opt_len >= static_len)
       {
-	/* Force static trees */
-	opt_len = static_len;
+        /* Force static trees */
+        opt_len = static_len;
       }
 
     if (stored_offset >= 0 && stored_len+4 < opt_len >> 3)
       {
-	/* Store Block */
-	if (DeflaterConstants.DEBUGGING)
-	  System.err.println("Storing, since " + stored_len + " < " + opt_len
-			     + " <= " + static_len);
-	flushStoredBlock(stored, stored_offset, stored_len, lastBlock);
+        /* Store Block */
+        if (DeflaterConstants.DEBUGGING)
+          System.err.println("Storing, since " + stored_len + " < " + opt_len
+                             + " <= " + static_len);
+        flushStoredBlock(stored, stored_offset, stored_len, lastBlock);
       }
     else if (opt_len == static_len)
       {
-	/* Encode with static tree */
-	pending.writeBits((DeflaterConstants.STATIC_TREES << 1)
-			  + (lastBlock ? 1 : 0), 3);
-	literalTree.setStaticCodes(staticLCodes, staticLLength);
-	distTree.setStaticCodes(staticDCodes, staticDLength);
-	compressBlock();
-	reset();
+        /* Encode with static tree */
+        pending.writeBits((DeflaterConstants.STATIC_TREES << 1)
+                          + (lastBlock ? 1 : 0), 3);
+        literalTree.setStaticCodes(staticLCodes, staticLLength);
+        distTree.setStaticCodes(staticDCodes, staticDLength);
+        compressBlock();
+        reset();
       }
     else
       {
-	/* Encode with dynamic tree */
-	pending.writeBits((DeflaterConstants.DYN_TREES << 1)
-			  + (lastBlock ? 1 : 0), 3);
-	sendAllTrees(blTreeCodes);
-	compressBlock();
-	reset();
+        /* Encode with dynamic tree */
+        pending.writeBits((DeflaterConstants.DYN_TREES << 1)
+                          + (lastBlock ? 1 : 0), 3);
+        sendAllTrees(blTreeCodes);
+        compressBlock();
+        reset();
       }
   }
 
@@ -739,14 +739,14 @@ class DeflaterHuffman
     return last_lit == BUFSIZE;
   }
 
-  public final boolean tallyLit(int lit) 
+  public final boolean tallyLit(int lit)
   {
     if (DeflaterConstants.DEBUGGING)
       {
-	if (lit > 32 && lit < 127)
-	  System.err.println("("+(char)lit+")");
-	else
-	  System.err.println("{"+lit+"}");
+        if (lit > 32 && lit < 127)
+          System.err.println("("+(char)lit+")");
+        else
+          System.err.println("{"+lit+"}");
       }
     d_buf[last_lit] = 0;
     l_buf[last_lit++] = (byte) lit;
@@ -754,7 +754,7 @@ class DeflaterHuffman
     return last_lit == BUFSIZE;
   }
 
-  public final boolean tallyDist(int dist, int len) 
+  public final boolean tallyDist(int dist, int len)
   {
     if (DeflaterConstants.DEBUGGING)
       System.err.println("["+dist+","+len+"]");
diff --git a/libjava/classpath/java/util/zip/DeflaterOutputStream.java b/libjava/classpath/java/util/zip/DeflaterOutputStream.java
index 4321c0f2cae..6fd1c5cfb57 100644
--- a/libjava/classpath/java/util/zip/DeflaterOutputStream.java
+++ b/libjava/classpath/java/util/zip/DeflaterOutputStream.java
@@ -57,21 +57,21 @@ import java.io.OutputStream;
  * finishing the stream.
  *
  * @author Tom Tromey, Jochen Hoenicke
- * @date Jan 11, 2001 
+ * @date Jan 11, 2001
  */
 public class DeflaterOutputStream extends FilterOutputStream
 {
-  /** 
+  /**
    * This buffer is used temporarily to retrieve the bytes from the
-   * deflater and write them to the underlying output stream.  
+   * deflater and write them to the underlying output stream.
    */
   protected byte[] buf;
 
-  /** 
+  /**
    * The deflater which is used to deflate the stream.
    */
   protected Deflater def;
-  
+
   /**
    * Deflates everything in the def's input buffers.  This will call
    * def.deflate() until all bytes from the input buffers
@@ -81,19 +81,19 @@ public class DeflaterOutputStream extends FilterOutputStream
   {
     while (! def.needsInput())
       {
-	int len = def.deflate(buf, 0, buf.length);
+        int len = def.deflate(buf, 0, buf.length);
 
-	//	System.err.println("DOS deflated " + len + " out of " + buf.length);
-	if (len <= 0)
-	  break;
-	out.write(buf, 0, len);
+        //      System.err.println("DOS deflated " + len + " out of " + buf.length);
+        if (len <= 0)
+          break;
+        out.write(buf, 0, len);
       }
 
     if (! def.needsInput())
       throw new InternalError("Can't deflate all input?");
   }
 
-  /** 
+  /**
    * Creates a new DeflaterOutputStream with a default Deflater and
    * default buffer size.
    * @param out the output stream where deflated output should be written.
@@ -103,7 +103,7 @@ public class DeflaterOutputStream extends FilterOutputStream
     this(out, new Deflater(), 4096);
   }
 
-  /** 
+  /**
    * Creates a new DeflaterOutputStream with the given Deflater and
    * default buffer size.
    * @param out the output stream where deflated output should be written.
@@ -114,7 +114,7 @@ public class DeflaterOutputStream extends FilterOutputStream
     this(out, defl, 4096);
   }
 
-  /** 
+  /**
    * Creates a new DeflaterOutputStream with the given Deflater and
    * buffer size.
    * @param out the output stream where deflated output should be written.
@@ -131,7 +131,7 @@ public class DeflaterOutputStream extends FilterOutputStream
     def = defl;
   }
 
-  /**  
+  /**
    * Flushes the stream by calling flush() on the deflater and then
    * on the underlying stream.  This ensures that all bytes are
    * flushed.  This function doesn't work in Sun's JDK, but only in
@@ -147,17 +147,17 @@ public class DeflaterOutputStream extends FilterOutputStream
   /**
    * Finishes the stream by calling finish() on the deflater.  This
    * was the only way to ensure that all bytes are flushed in Sun's
-   * JDK.  
+   * JDK.
    */
   public void finish() throws IOException
   {
     def.finish();
     while (! def.finished())
       {
-	int len = def.deflate(buf, 0, buf.length);
-	if (len <= 0)
-	  break;
-	out.write(buf, 0, len);
+        int len = def.deflate(buf, 0, buf.length);
+        if (len <= 0)
+          break;
+        out.write(buf, 0, len);
       }
     if (! def.finished())
       throw new InternalError("Can't deflate all input?");
@@ -165,7 +165,7 @@ public class DeflaterOutputStream extends FilterOutputStream
   }
 
   /**
-   * Calls finish() and closes the stream. 
+   * Calls finish() and closes the stream.
    */
   public void close() throws IOException
   {
diff --git a/libjava/classpath/java/util/zip/DeflaterPending.java b/libjava/classpath/java/util/zip/DeflaterPending.java
index f38212c352d..fabc2264e6e 100644
--- a/libjava/classpath/java/util/zip/DeflaterPending.java
+++ b/libjava/classpath/java/util/zip/DeflaterPending.java
@@ -41,7 +41,7 @@ package java.util.zip;
  * This class stores the pending output of the Deflater.
  *
  * @author Jochen Hoenicke
- * @date Jan 5, 2000 
+ * @date Jan 5, 2000
  */
 
 class DeflaterPending extends PendingBuffer
@@ -51,4 +51,3 @@ class DeflaterPending extends PendingBuffer
     super(DeflaterConstants.PENDING_BUF_SIZE);
   }
 }
-
diff --git a/libjava/classpath/java/util/zip/GZIPInputStream.java b/libjava/classpath/java/util/zip/GZIPInputStream.java
index f244810e787..ed99ee92c4b 100644
--- a/libjava/classpath/java/util/zip/GZIPInputStream.java
+++ b/libjava/classpath/java/util/zip/GZIPInputStream.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * This filter stream is used to decompress a "GZIP" format stream. 
+ * This filter stream is used to decompress a "GZIP" format stream.
  * The "GZIP" format is described in RFC 1952.
  *
  * @author John Leuner
@@ -86,11 +86,11 @@ public class GZIPInputStream
   /**
    * The CRC-32 checksum value for uncompressed data.
    */
-  protected CRC32 crc; 
+  protected CRC32 crc;
 
   /**
    * Indicates whether or not the end of the stream has been reached.
-   */  
+   */
   protected boolean eos;
 
   /**
@@ -101,7 +101,7 @@ public class GZIPInputStream
   /**
    * Creates a GZIPInputStream with the default buffer size.
    *
-   * @param in The stream to read compressed data from 
+   * @param in The stream to read compressed data from
    *           (in GZIP format).
    *
    * @throws IOException if an error occurs during an I/O operation.
@@ -115,7 +115,7 @@ public class GZIPInputStream
   /**
    * Creates a GZIPInputStream with the specified buffer size.
    *
-   * @param in The stream to read compressed data from 
+   * @param in The stream to read compressed data from
    *           (in GZIP format).
    * @param size The size of the buffer to use.
    *
@@ -204,7 +204,7 @@ public class GZIPInputStream
       throw new IOException("Error in GZIP header, bad magic code");
     headCRC.update(magic);
     headCRC.update(magic2);
-    
+
     /* 2. Check the compression type (must be 8) */
     int CM = in.read();
     if (CM != Deflater.DEFLATED)
@@ -216,32 +216,32 @@ public class GZIPInputStream
     if (flags < 0)
       throw new EOFException("Early EOF in GZIP header");
     headCRC.update(flags);
-    
+
     /*    This flag byte is divided into individual bits as follows:
-	  
-	  bit 0   FTEXT
-	  bit 1   FHCRC
-	  bit 2   FEXTRA
-	  bit 3   FNAME
-	  bit 4   FCOMMENT
-	  bit 5   reserved
-	  bit 6   reserved
-	  bit 7   reserved
+
+          bit 0   FTEXT
+          bit 1   FHCRC
+          bit 2   FEXTRA
+          bit 3   FNAME
+          bit 4   FCOMMENT
+          bit 5   reserved
+          bit 6   reserved
+          bit 7   reserved
     */
-    
-    /* 3.1 Check the reserved bits are zero */    
+
+    /* 3.1 Check the reserved bits are zero */
     if ((flags & 0xd0) != 0)
       throw new IOException("Reserved flag bits in GZIP header != 0");
-    
+
     /* 4.-6. Skip the modification time, extra flags, and OS type */
     for (int i=0; i< 6; i++)
     {
       int readByte = in.read();
       if (readByte < 0)
-	throw new EOFException("Early EOF in GZIP header");
+        throw new EOFException("Early EOF in GZIP header");
       headCRC.update(readByte);
     }
-    
+
     /* 7. Read extra field */
     if ((flags & FEXTRA) != 0)
     {
@@ -249,39 +249,39 @@ public class GZIPInputStream
       for (int i=0; i< 2; i++)
       {
         int readByte = in.read();
-	if (readByte < 0)
-	  throw new EOFException("Early EOF in GZIP header");
-	headCRC.update(readByte);
+        if (readByte < 0)
+          throw new EOFException("Early EOF in GZIP header");
+        headCRC.update(readByte);
       }
       if (in.read() < 0 || in.read() < 0)
-	throw new EOFException("Early EOF in GZIP header");
-	
+        throw new EOFException("Early EOF in GZIP header");
+
       int len1, len2, extraLen;
       len1 = in.read();
       len2 = in.read();
       if ((len1 < 0) || (len2 < 0))
-	throw new EOFException("Early EOF in GZIP header");
+        throw new EOFException("Early EOF in GZIP header");
       headCRC.update(len1);
       headCRC.update(len2);
 
       extraLen = (len1 << 8) | len2;
       for (int i = 0; i < extraLen;i++)
       {
-	int readByte = in.read();
-	if (readByte < 0)
-	  throw new EOFException("Early EOF in GZIP header");
-	headCRC.update(readByte);
+        int readByte = in.read();
+        if (readByte < 0)
+          throw new EOFException("Early EOF in GZIP header");
+        headCRC.update(readByte);
       }
     }
-    
+
     /* 8. Read file name */
     if ((flags & FNAME) != 0)
     {
       int readByte;
       while ( (readByte = in.read()) > 0)
-	headCRC.update(readByte);
+        headCRC.update(readByte);
       if (readByte < 0)
-	throw new EOFException("Early EOF in GZIP file name");
+        throw new EOFException("Early EOF in GZIP file name");
       headCRC.update(readByte);
     }
 
@@ -296,7 +296,7 @@ public class GZIPInputStream
         throw new EOFException("Early EOF in GZIP comment");
       headCRC.update(readByte);
     }
-    
+
     /* 10. Read header CRC */
     if ((flags & FHCRC) != 0)
     {
@@ -304,16 +304,16 @@ public class GZIPInputStream
       int crcval = in.read();
       if (crcval < 0)
         throw new EOFException("Early EOF in GZIP header");
-	
+
       tempByte = in.read();
       if (tempByte < 0)
         throw new EOFException("Early EOF in GZIP header");
-	
+
       crcval = (crcval << 8) | tempByte;
       if (crcval != ((int) headCRC.getValue() & 0xffff))
         throw new IOException("Header CRC value mismatch");
     }
-    
+
     readGZIPHeader = true;
     //System.err.println("Read GZIP header");
   }
@@ -330,7 +330,7 @@ public class GZIPInputStream
     {
       int count = in.read(footer, 8-needed, needed);
       if (count <= 0)
-	throw new EOFException("Early EOF in GZIP footer");
+        throw new EOFException("Early EOF in GZIP footer");
       needed -= count; //Jewel Jan 16
     }
 
@@ -338,9 +338,9 @@ public class GZIPInputStream
       | ((footer[2] & 0xff) << 16) | (footer[3] << 24);
     if (crcval != (int) crc.getValue())
       throw new IOException("GZIP crc sum mismatch, theirs \""
-			    + Integer.toHexString(crcval)
-			    + "\" and ours \""
-			    + Integer.toHexString( (int) crc.getValue()));
+                            + Integer.toHexString(crcval)
+                            + "\" and ours \""
+                            + Integer.toHexString( (int) crc.getValue()));
 
     int total = (footer[4] & 0xff) | ((footer[5] & 0xff) << 8)
       | ((footer[6] & 0xff) << 16) | (footer[7] << 24);
diff --git a/libjava/classpath/java/util/zip/GZIPOutputStream.java b/libjava/classpath/java/util/zip/GZIPOutputStream.java
index 5b7b827a9ff..0080ab645a7 100644
--- a/libjava/classpath/java/util/zip/GZIPOutputStream.java
+++ b/libjava/classpath/java/util/zip/GZIPOutputStream.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -41,7 +41,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 /**
- * This filter stream is used to compress a stream into a "GZIP" stream. 
+ * This filter stream is used to compress a stream into a "GZIP" stream.
  * The "GZIP" format is described in RFC 1952.
  *
  * @author John Leuner
@@ -64,8 +64,8 @@ public class GZIPOutputStream extends DeflaterOutputStream
   /**
    * Creates a GZIPOutputStream with the default buffer size
    *
-   * @param out The stream to read data (to be compressed) from 
-   * 
+   * @param out The stream to read data (to be compressed) from
+   *
    */
   public GZIPOutputStream(OutputStream out) throws IOException
   {
@@ -75,8 +75,8 @@ public class GZIPOutputStream extends DeflaterOutputStream
   /**
    * Creates a GZIPOutputStream with the specified buffer size
    *
-   * @param out The stream to read compressed data from 
-   * @param size Size of the buffer to use 
+   * @param out The stream to read compressed data from
+   * @param size Size of the buffer to use
    */
   public GZIPOutputStream(OutputStream out, int size) throws IOException
   {
@@ -85,25 +85,25 @@ public class GZIPOutputStream extends DeflaterOutputStream
     int mod_time = (int) (System.currentTimeMillis() / 1000L);
     byte[] gzipHeader =
       {
-	/* The two magic bytes */
-	(byte) GZIPInputStream.GZIP_MAGIC,
-	(byte) (GZIPInputStream.GZIP_MAGIC >> 8),
-	  
-	/* The compression type */
-	(byte) Deflater.DEFLATED,
-	
-        /* The flags (not set) */
-	0,
-	
-	/* The modification time */
-	(byte) mod_time, (byte) (mod_time >> 8), 
-	(byte) (mod_time >> 16), (byte) (mod_time >> 24), 
+        /* The two magic bytes */
+        (byte) GZIPInputStream.GZIP_MAGIC,
+        (byte) (GZIPInputStream.GZIP_MAGIC >> 8),
 
-	/* The extra flags */
-	0,
-    
-	/* The OS type (unknown) */
-	(byte) 255
+        /* The compression type */
+        (byte) Deflater.DEFLATED,
+
+        /* The flags (not set) */
+        0,
+
+        /* The modification time */
+        (byte) mod_time, (byte) (mod_time >> 8),
+        (byte) (mod_time >> 16), (byte) (mod_time >> 24),
+
+        /* The extra flags */
+        0,
+
+        /* The OS type (unknown) */
+        (byte) 255
       };
 
     out.write(gzipHeader);
@@ -134,18 +134,18 @@ public class GZIPOutputStream extends DeflaterOutputStream
     int totalin = def.getTotalIn();
     int crcval = (int) (crc.getValue() & 0xffffffff);
 
-    //    System.err.println("CRC val is " + Integer.toHexString( crcval ) 		       + " and length " + Integer.toHexString(totalin));
-    
-    byte[] gzipFooter = 
-      {
-	(byte) crcval, (byte) (crcval >> 8),
-	(byte) (crcval >> 16), (byte) (crcval >> 24),
+    //    System.err.println("CRC val is " + Integer.toHexString( crcval )                     + " and length " + Integer.toHexString(totalin));
 
-	(byte) totalin, (byte) (totalin >> 8),
-	(byte) (totalin >> 16), (byte) (totalin >> 24)
+    byte[] gzipFooter =
+      {
+        (byte) crcval, (byte) (crcval >> 8),
+        (byte) (crcval >> 16), (byte) (crcval >> 24),
+
+        (byte) totalin, (byte) (totalin >> 8),
+        (byte) (totalin >> 16), (byte) (totalin >> 24)
       };
 
     out.write(gzipFooter);
-  //    System.err.println("wrote GZIP trailer (" + gzipFooter.length + " bytes )");    
+  //    System.err.println("wrote GZIP trailer (" + gzipFooter.length + " bytes )");
   }
 }
diff --git a/libjava/classpath/java/util/zip/Inflater.java b/libjava/classpath/java/util/zip/Inflater.java
index f529dc691c6..0f094d66744 100644
--- a/libjava/classpath/java/util/zip/Inflater.java
+++ b/libjava/classpath/java/util/zip/Inflater.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ package java.util.zip;
  */
 
 /**
- * Inflater is used to decompress data that has been compressed according 
+ * Inflater is used to decompress data that has been compressed according
  * to the "deflate" standard described in rfc1950.
  *
  * The usage is as following.  First you have to set some input with
@@ -51,10 +51,10 @@ package java.util.zip;
  * inflate any bytes there may be three reasons:
  * 
                    
  * 
                  • needsInput() returns true because the input buffer is empty.
- * You have to provide more input with setInput().  
+ * You have to provide more input with setInput().
  * NOTE: needsInput() also returns true when, the stream is finished.
  * 
                    • 
- * 
                  • needsDictionary() returns true, you have to provide a preset 
+ * 
                  • needsDictionary() returns true, you have to provide a preset
  *     dictionary with setDictionary().
                    • 
  * 
                  • finished() returns true, the inflater has finished.
                    • 
  * 
                  
@@ -69,15 +69,15 @@ package java.util.zip;
 public class Inflater
 {
   /* Copy lengths for literal codes 257..285 */
-  private static final int CPLENS[] = 
-  { 
+  private static final int CPLENS[] =
+  {
     3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
     35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258
   };
-  
-  /* Extra bits for literal codes 257..285 */  
-  private static final int CPLEXT[] = 
-  { 
+
+  /* Extra bits for literal codes 257..285 */
+  private static final int CPLEXT[] =
+  {
     0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
     3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0
   };
@@ -88,11 +88,11 @@ public class Inflater
     257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
     8193, 12289, 16385, 24577
   };
-  
+
   /* Extra bits for distance codes */
   private static final int CPDEXT[] = {
     0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-    7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 
+    7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
     12, 12, 13, 13
   };
 
@@ -122,10 +122,10 @@ public class Inflater
    * Only valid if mode is DECODE_DICT or DECODE_CHKSUM.
    */
   private int readAdler;
-  /** 
+  /**
    * The number of bits needed to complete the current state.  This
    * is valid, if mode is DECODE_DICT, DECODE_CHKSUM,
-   * DECODE_HUFFMAN_LENBITS or DECODE_HUFFMAN_DISTBITS.  
+   * DECODE_HUFFMAN_LENBITS or DECODE_HUFFMAN_DISTBITS.
    */
   private int neededBits;
   private int repLength, repDist;
@@ -133,7 +133,7 @@ public class Inflater
   /**
    * True, if the last block flag was set in the last block of the
    * inflated stream.  This means that the stream ends after the
-   * current block.  
+   * current block.
    */
   private boolean isLastBlock;
 
@@ -143,7 +143,7 @@ public class Inflater
   private long totalOut;
   /**
    * The total number of bytes set with setInput().  This is not the
-   * value returned by getTotalIn(), since this also includes the 
+   * value returned by getTotalIn(), since this also includes the
    * unprocessed input.
    */
   private long totalIn;
@@ -198,7 +198,7 @@ public class Inflater
    * for the Sun implementation).  Exists only for compatibility
    * with Sun's JDK, where the compressor allocates native memory.
    * If you call any method (even reset) afterwards the behaviour is
-   * undefined.  
+   * undefined.
    */
   public void end ()
   {
@@ -214,7 +214,7 @@ public class Inflater
    * Returns true, if the inflater has finished.  This means, that no
    * input is needed and no output can be produced.
    */
-  public boolean finished() 
+  public boolean finished()
   {
     return mode == FINISHED && outputWindow.getAvailable() == 0;
   }
@@ -230,18 +230,18 @@ public class Inflater
   {
     return needsDictionary() ? readAdler : (int) adler.getValue();
   }
-  
+
   /**
    * Gets the number of unprocessed input.  Useful, if the end of the
    * stream is reached and you want to further process the bytes after
-   * the deflate stream.  
+   * the deflate stream.
    * @return the number of bytes of the input which were not processed.
    */
   public int getRemaining()
   {
     return input.getAvailableBytes();
   }
-  
+
   /**
    * Gets the total number of processed compressed input bytes.
    * @return the total number of bytes of processed input bytes.
@@ -283,11 +283,11 @@ public class Inflater
   /**
    * Inflates the compressed stream to the output buffer.  If this
    * returns 0, you should check, whether needsDictionary(),
-   * needsInput() or finished() returns true, to determine why no 
+   * needsInput() or finished() returns true, to determine why no
    * further output is produced.
    * @param buf the output buffer.
    * @return the number of bytes written to the buffer, 0 if no further
-   * output can be produced.  
+   * output can be produced.
    * @exception DataFormatException if deflated stream is invalid.
    * @exception IllegalArgumentException if buf has length 0.
    */
@@ -299,13 +299,13 @@ public class Inflater
   /**
    * Inflates the compressed stream to the output buffer.  If this
    * returns 0, you should check, whether needsDictionary(),
-   * needsInput() or finished() returns true, to determine why no 
+   * needsInput() or finished() returns true, to determine why no
    * further output is produced.
    * @param buf the output buffer.
    * @param off the offset into buffer where the output should start.
    * @param len the maximum length of the output.
    * @return the number of bytes written to the buffer, 0 if no further
-   * output can be produced.  
+   * output can be produced.
    * @exception DataFormatException if deflated stream is invalid.
    * @exception IndexOutOfBoundsException if the off and/or len are wrong.
    */
@@ -351,7 +351,7 @@ public class Inflater
    *
    * NOTE: This method also returns true when the stream is finished.
    */
-  public boolean needsInput () 
+  public boolean needsInput ()
   {
     return input.needsInput ();
   }
@@ -381,7 +381,7 @@ public class Inflater
    * @param buffer the dictionary.
    * @exception IllegalStateException if no dictionary is needed.
    * @exception IllegalArgumentException if the dictionary checksum is
-   * wrong.  
+   * wrong.
    */
   public void setDictionary (byte[] buffer)
   {
@@ -398,7 +398,7 @@ public class Inflater
    * @param len the length of the dictionary.
    * @exception IllegalStateException if no dictionary is needed.
    * @exception IllegalArgumentException if the dictionary checksum is
-   * wrong.  
+   * wrong.
    * @exception IndexOutOfBoundsException if the off and/or len are wrong.
    */
   public void setDictionary (byte[] buffer, int off, int len)
@@ -420,7 +420,7 @@ public class Inflater
    * @param buf the input.
    * @exception IllegalStateException if no input is needed.
    */
-  public void setInput (byte[] buf) 
+  public void setInput (byte[] buf)
   {
     setInput (buf, 0, buf.length);
   }
@@ -430,11 +430,11 @@ public class Inflater
    * returns true.
    * @param buf the input.
    * @param off the offset into buffer where the input starts.
-   * @param len the length of the input.  
+   * @param len the length of the input.
    * @exception IllegalStateException if no input is needed.
    * @exception IndexOutOfBoundsException if the off and/or len are wrong.
    */
-  public void setInput (byte[] buf, int off, int len) 
+  public void setInput (byte[] buf, int off, int len)
   {
     input.setInput (buf, off, len);
     totalIn += len;
@@ -442,7 +442,7 @@ public class Inflater
 
   /**
    * Decodes the deflate header.
-   * @return false if more input is needed. 
+   * @return false if more input is needed.
    * @exception DataFormatException if header is invalid.
    */
   private boolean decodeHeader () throws DataFormatException
@@ -451,48 +451,48 @@ public class Inflater
     if (header < 0)
       return false;
     input.dropBits(16);
-    
+
     /* The header is written in "wrong" byte order */
     header = ((header << 8) | (header >> 8)) & 0xffff;
     if (header % 31 != 0)
       throw new DataFormatException("Header checksum illegal");
-    
+
     if ((header & 0x0f00) != (Deflater.DEFLATED << 8))
       throw new DataFormatException("Compression Method unknown");
 
-    /* Maximum size of the backwards window in bits. 
+    /* Maximum size of the backwards window in bits.
      * We currently ignore this, but we could use it to make the
      * inflater window more space efficient. On the other hand the
      * full window (15 bits) is needed most times, anyway.
      int max_wbits = ((header & 0x7000) >> 12) + 8;
      */
-    
+
     if ((header & 0x0020) == 0) // Dictionary flag?
       {
-	mode = DECODE_BLOCKS;
+        mode = DECODE_BLOCKS;
       }
     else
       {
-	mode = DECODE_DICT;
-	neededBits = 32;      
+        mode = DECODE_DICT;
+        neededBits = 32;
       }
     return true;
   }
-   
+
   /**
    * Decodes the dictionary checksum after the deflate header.
-   * @return false if more input is needed. 
+   * @return false if more input is needed.
    */
   private boolean decodeDict ()
   {
     while (neededBits > 0)
       {
-	int dictByte = input.peekBits(8);
-	if (dictByte < 0)
-	  return false;
-	input.dropBits(8);
-	readAdler = (readAdler << 8) | dictByte;
-	neededBits -= 8;
+        int dictByte = input.peekBits(8);
+        if (dictByte < 0)
+          return false;
+        input.dropBits(8);
+        readAdler = (readAdler << 8) | dictByte;
+        neededBits -= 8;
       }
     return false;
   }
@@ -501,226 +501,226 @@ public class Inflater
    * Decodes the huffman encoded symbols in the input stream.
    * @return false if more input is needed, true if output window is
    * full or the current block ends.
-   * @exception DataFormatException if deflated stream is invalid.  
+   * @exception DataFormatException if deflated stream is invalid.
    */
   private boolean decodeHuffman () throws DataFormatException
   {
     int free = outputWindow.getFreeSpace();
     while (free >= 258)
       {
-	int symbol;
-	switch (mode)
-	  {
-	  case DECODE_HUFFMAN:
-	    /* This is the inner loop so it is optimized a bit */
-	    while (((symbol = litlenTree.getSymbol(input)) & ~0xff) == 0)
-	      {
-		outputWindow.write(symbol);
-		if (--free < 258)
-		  return true;
-	      } 
-	    if (symbol < 257)
-	      {
-		if (symbol < 0)
-		  return false;
-		else
-		  {
-		    /* symbol == 256: end of block */
-		    distTree = null;
-		    litlenTree = null;
-		    mode = DECODE_BLOCKS;
-		    return true;
-		  }
-	      }
-		
-	    try
-	      {
-		repLength = CPLENS[symbol - 257];
-		neededBits = CPLEXT[symbol - 257];
-	      }
-	    catch (ArrayIndexOutOfBoundsException ex)
-	      {
-		throw new DataFormatException("Illegal rep length code");
-	      }
-	    /* fall through */
-	  case DECODE_HUFFMAN_LENBITS:
-	    if (neededBits > 0)
-	      {
-		mode = DECODE_HUFFMAN_LENBITS;
-		int i = input.peekBits(neededBits);
-		if (i < 0)
-		  return false;
-		input.dropBits(neededBits);
-		repLength += i;
-	      }
-	    mode = DECODE_HUFFMAN_DIST;
-	    /* fall through */
-	  case DECODE_HUFFMAN_DIST:
-	    symbol = distTree.getSymbol(input);
-	    if (symbol < 0)
-	      return false;
-	    try 
-	      {
-		repDist = CPDIST[symbol];
-		neededBits = CPDEXT[symbol];
-	      }
-	    catch (ArrayIndexOutOfBoundsException ex)
-	      {
-		throw new DataFormatException("Illegal rep dist code");
-	      }
-	    /* fall through */
-	  case DECODE_HUFFMAN_DISTBITS:
-	    if (neededBits > 0)
-	      {
-		mode = DECODE_HUFFMAN_DISTBITS;
-		int i = input.peekBits(neededBits);
-		if (i < 0)
-		  return false;
-		input.dropBits(neededBits);
-		repDist += i;
-	      }
-	    outputWindow.repeat(repLength, repDist);
-	    free -= repLength;
-	    mode = DECODE_HUFFMAN;
-	    break;
-	  default:
-	    throw new IllegalStateException();
-	  }
+        int symbol;
+        switch (mode)
+          {
+          case DECODE_HUFFMAN:
+            /* This is the inner loop so it is optimized a bit */
+            while (((symbol = litlenTree.getSymbol(input)) & ~0xff) == 0)
+              {
+                outputWindow.write(symbol);
+                if (--free < 258)
+                  return true;
+              }
+            if (symbol < 257)
+              {
+                if (symbol < 0)
+                  return false;
+                else
+                  {
+                    /* symbol == 256: end of block */
+                    distTree = null;
+                    litlenTree = null;
+                    mode = DECODE_BLOCKS;
+                    return true;
+                  }
+              }
+
+            try
+              {
+                repLength = CPLENS[symbol - 257];
+                neededBits = CPLEXT[symbol - 257];
+              }
+            catch (ArrayIndexOutOfBoundsException ex)
+              {
+                throw new DataFormatException("Illegal rep length code");
+              }
+            /* fall through */
+          case DECODE_HUFFMAN_LENBITS:
+            if (neededBits > 0)
+              {
+                mode = DECODE_HUFFMAN_LENBITS;
+                int i = input.peekBits(neededBits);
+                if (i < 0)
+                  return false;
+                input.dropBits(neededBits);
+                repLength += i;
+              }
+            mode = DECODE_HUFFMAN_DIST;
+            /* fall through */
+          case DECODE_HUFFMAN_DIST:
+            symbol = distTree.getSymbol(input);
+            if (symbol < 0)
+              return false;
+            try
+              {
+                repDist = CPDIST[symbol];
+                neededBits = CPDEXT[symbol];
+              }
+            catch (ArrayIndexOutOfBoundsException ex)
+              {
+                throw new DataFormatException("Illegal rep dist code");
+              }
+            /* fall through */
+          case DECODE_HUFFMAN_DISTBITS:
+            if (neededBits > 0)
+              {
+                mode = DECODE_HUFFMAN_DISTBITS;
+                int i = input.peekBits(neededBits);
+                if (i < 0)
+                  return false;
+                input.dropBits(neededBits);
+                repDist += i;
+              }
+            outputWindow.repeat(repLength, repDist);
+            free -= repLength;
+            mode = DECODE_HUFFMAN;
+            break;
+          default:
+            throw new IllegalStateException();
+          }
       }
     return true;
   }
 
   /**
    * Decodes the adler checksum after the deflate stream.
-   * @return false if more input is needed. 
+   * @return false if more input is needed.
    * @exception DataFormatException if checksum doesn't match.
    */
   private boolean decodeChksum () throws DataFormatException
   {
     while (neededBits > 0)
       {
-	int chkByte = input.peekBits(8);
-	if (chkByte < 0)
-	  return false;
-	input.dropBits(8);
-	readAdler = (readAdler << 8) | chkByte;
-	neededBits -= 8;
+        int chkByte = input.peekBits(8);
+        if (chkByte < 0)
+          return false;
+        input.dropBits(8);
+        readAdler = (readAdler << 8) | chkByte;
+        neededBits -= 8;
       }
     if ((int) adler.getValue() != readAdler)
       throw new DataFormatException("Adler chksum doesn't match: "
-				    +Integer.toHexString((int)adler.getValue())
-				    +" vs. "+Integer.toHexString(readAdler));
+                                    +Integer.toHexString((int)adler.getValue())
+                                    +" vs. "+Integer.toHexString(readAdler));
     mode = FINISHED;
     return false;
   }
 
   /**
    * Decodes the deflated stream.
-   * @return false if more input is needed, or if finished. 
+   * @return false if more input is needed, or if finished.
    * @exception DataFormatException if deflated stream is invalid.
    */
   private boolean decode () throws DataFormatException
   {
-    switch (mode) 
+    switch (mode)
       {
       case DECODE_HEADER:
-	return decodeHeader();
+        return decodeHeader();
       case DECODE_DICT:
-	return decodeDict();
+        return decodeDict();
       case DECODE_CHKSUM:
-	return decodeChksum();
+        return decodeChksum();
 
       case DECODE_BLOCKS:
-	if (isLastBlock)
-	  {
-	    if (nowrap)
-	      {
-		mode = FINISHED;
-		return false;
-	      }
-	    else
-	      {
-		input.skipToByteBoundary();
-		neededBits = 32;
-		mode = DECODE_CHKSUM;
-		return true;
-	      }
-	  }
+        if (isLastBlock)
+          {
+            if (nowrap)
+              {
+                mode = FINISHED;
+                return false;
+              }
+            else
+              {
+                input.skipToByteBoundary();
+                neededBits = 32;
+                mode = DECODE_CHKSUM;
+                return true;
+              }
+          }
 
-	int type = input.peekBits(3);
-	if (type < 0)
-	  return false;
-	input.dropBits(3);
+        int type = input.peekBits(3);
+        if (type < 0)
+          return false;
+        input.dropBits(3);
 
-	if ((type & 1) != 0)
-	  isLastBlock = true;
-	switch (type >> 1)
-	  {
-	  case DeflaterConstants.STORED_BLOCK:
-	    input.skipToByteBoundary();
-	    mode = DECODE_STORED_LEN1;
-	    break;
-	  case DeflaterConstants.STATIC_TREES:
-	    litlenTree = InflaterHuffmanTree.defLitLenTree;
-	    distTree = InflaterHuffmanTree.defDistTree;
-	    mode = DECODE_HUFFMAN;
-	    break;
-	  case DeflaterConstants.DYN_TREES:
-	    dynHeader = new InflaterDynHeader();
-	    mode = DECODE_DYN_HEADER;
-	    break;
-	  default:
-	    throw new DataFormatException("Unknown block type "+type);
-	  }
-	return true;
+        if ((type & 1) != 0)
+          isLastBlock = true;
+        switch (type >> 1)
+          {
+          case DeflaterConstants.STORED_BLOCK:
+            input.skipToByteBoundary();
+            mode = DECODE_STORED_LEN1;
+            break;
+          case DeflaterConstants.STATIC_TREES:
+            litlenTree = InflaterHuffmanTree.defLitLenTree;
+            distTree = InflaterHuffmanTree.defDistTree;
+            mode = DECODE_HUFFMAN;
+            break;
+          case DeflaterConstants.DYN_TREES:
+            dynHeader = new InflaterDynHeader();
+            mode = DECODE_DYN_HEADER;
+            break;
+          default:
+            throw new DataFormatException("Unknown block type "+type);
+          }
+        return true;
 
       case DECODE_STORED_LEN1:
-	{
-	  if ((uncomprLen = input.peekBits(16)) < 0)
-	    return false;
-	  input.dropBits(16);
-	  mode = DECODE_STORED_LEN2;
-	}
-	/* fall through */
+        {
+          if ((uncomprLen = input.peekBits(16)) < 0)
+            return false;
+          input.dropBits(16);
+          mode = DECODE_STORED_LEN2;
+        }
+        /* fall through */
       case DECODE_STORED_LEN2:
-	{
-	  int nlen = input.peekBits(16);
-	  if (nlen < 0)
-	    return false;
-	  input.dropBits(16);
-	  if (nlen != (uncomprLen ^ 0xffff))
-	    throw new DataFormatException("broken uncompressed block");
-	  mode = DECODE_STORED;
-	}
-	/* fall through */
+        {
+          int nlen = input.peekBits(16);
+          if (nlen < 0)
+            return false;
+          input.dropBits(16);
+          if (nlen != (uncomprLen ^ 0xffff))
+            throw new DataFormatException("broken uncompressed block");
+          mode = DECODE_STORED;
+        }
+        /* fall through */
       case DECODE_STORED:
-	{
-	  int more = outputWindow.copyStored(input, uncomprLen);
-	  uncomprLen -= more;
-	  if (uncomprLen == 0)
-	    {
-	      mode = DECODE_BLOCKS;
-	      return true;
-	    }
-	  return !input.needsInput();
-	}
+        {
+          int more = outputWindow.copyStored(input, uncomprLen);
+          uncomprLen -= more;
+          if (uncomprLen == 0)
+            {
+              mode = DECODE_BLOCKS;
+              return true;
+            }
+          return !input.needsInput();
+        }
 
       case DECODE_DYN_HEADER:
-	if (!dynHeader.decode(input))
-	  return false;
-	litlenTree = dynHeader.buildLitLenTree();
-	distTree = dynHeader.buildDistTree();
-	mode = DECODE_HUFFMAN;
-	/* fall through */
+        if (!dynHeader.decode(input))
+          return false;
+        litlenTree = dynHeader.buildLitLenTree();
+        distTree = dynHeader.buildDistTree();
+        mode = DECODE_HUFFMAN;
+        /* fall through */
       case DECODE_HUFFMAN:
       case DECODE_HUFFMAN_LENBITS:
       case DECODE_HUFFMAN_DIST:
       case DECODE_HUFFMAN_DISTBITS:
-	return decodeHuffman();
+        return decodeHuffman();
       case FINISHED:
-	return false;
+        return false;
       default:
-	throw new IllegalStateException();
-      }	
+        throw new IllegalStateException();
+      }
   }
 }
diff --git a/libjava/classpath/java/util/zip/InflaterDynHeader.java b/libjava/classpath/java/util/zip/InflaterDynHeader.java
index bff84a894d8..64e08d6bbb5 100644
--- a/libjava/classpath/java/util/zip/InflaterDynHeader.java
+++ b/libjava/classpath/java/util/zip/InflaterDynHeader.java
@@ -49,12 +49,12 @@ class InflaterDynHeader
   private static final int repMin[]  = { 3, 3, 11 };
   private static final int repBits[] = { 2, 3,  7 };
 
-  
+
   private byte[] blLens;
   private byte[] litdistLens;
 
   private InflaterHuffmanTree blTree;
-  
+
   private int mode;
   private int lnum, dnum, blnum, num;
   private int repSymbol;
@@ -63,127 +63,127 @@ class InflaterDynHeader
 
   private static final int[] BL_ORDER =
   { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
-  
+
   public InflaterDynHeader()
   {
   }
-  
+
   public boolean decode(StreamManipulator input) throws DataFormatException
   {
   decode_loop:
     for (;;)
       {
-	switch (mode)
-	  {
-	  case LNUM:
-	    lnum = input.peekBits(5);
-	    if (lnum < 0)
-	      return false;
-	    lnum += 257;
-	    input.dropBits(5);
-//  	    System.err.println("LNUM: "+lnum);
-	    mode = DNUM;
-	    /* fall through */
-	  case DNUM:
-	    dnum = input.peekBits(5);
-	    if (dnum < 0)
-	      return false;
-	    dnum++;
-	    input.dropBits(5);
-//  	    System.err.println("DNUM: "+dnum);
-	    num = lnum+dnum;
-	    litdistLens = new byte[num];
-	    mode = BLNUM;
-	    /* fall through */
-	  case BLNUM:
-	    blnum = input.peekBits(4);
-	    if (blnum < 0)
-	      return false;
-	    blnum += 4;
-	    input.dropBits(4);
-	    blLens = new byte[19];
-	    ptr = 0;
-//  	    System.err.println("BLNUM: "+blnum);
-	    mode = BLLENS;
-	    /* fall through */
-	  case BLLENS:
-	    while (ptr < blnum)
-	      {
-		int len = input.peekBits(3);
-		if (len < 0)
-		  return false;
-		input.dropBits(3);
-//  		System.err.println("blLens["+BL_ORDER[ptr]+"]: "+len);
-		blLens[BL_ORDER[ptr]] = (byte) len;
-		ptr++;
-	      }
-	    blTree = new InflaterHuffmanTree(blLens);
-	    blLens = null;
-	    ptr = 0;
-	    mode = LENS;
-	    /* fall through */
-	  case LENS:
-	    {
-	      int symbol;
-	      while (((symbol = blTree.getSymbol(input)) & ~15) == 0)
-		{
-		  /* Normal case: symbol in [0..15] */
+        switch (mode)
+          {
+          case LNUM:
+            lnum = input.peekBits(5);
+            if (lnum < 0)
+              return false;
+            lnum += 257;
+            input.dropBits(5);
+//          System.err.println("LNUM: "+lnum);
+            mode = DNUM;
+            /* fall through */
+          case DNUM:
+            dnum = input.peekBits(5);
+            if (dnum < 0)
+              return false;
+            dnum++;
+            input.dropBits(5);
+//          System.err.println("DNUM: "+dnum);
+            num = lnum+dnum;
+            litdistLens = new byte[num];
+            mode = BLNUM;
+            /* fall through */
+          case BLNUM:
+            blnum = input.peekBits(4);
+            if (blnum < 0)
+              return false;
+            blnum += 4;
+            input.dropBits(4);
+            blLens = new byte[19];
+            ptr = 0;
+//          System.err.println("BLNUM: "+blnum);
+            mode = BLLENS;
+            /* fall through */
+          case BLLENS:
+            while (ptr < blnum)
+              {
+                int len = input.peekBits(3);
+                if (len < 0)
+                  return false;
+                input.dropBits(3);
+//              System.err.println("blLens["+BL_ORDER[ptr]+"]: "+len);
+                blLens[BL_ORDER[ptr]] = (byte) len;
+                ptr++;
+              }
+            blTree = new InflaterHuffmanTree(blLens);
+            blLens = null;
+            ptr = 0;
+            mode = LENS;
+            /* fall through */
+          case LENS:
+            {
+              int symbol;
+              while (((symbol = blTree.getSymbol(input)) & ~15) == 0)
+                {
+                  /* Normal case: symbol in [0..15] */
 
-//  		  System.err.println("litdistLens["+ptr+"]: "+symbol);
-		  litdistLens[ptr++] = lastLen = (byte) symbol;
+//                System.err.println("litdistLens["+ptr+"]: "+symbol);
+                  litdistLens[ptr++] = lastLen = (byte) symbol;
 
-		  if (ptr == num)
-		    {
-		      /* Finished */
-		      return true;
-		    }
-		}
-	      
-	      /* need more input ? */
-	      if (symbol < 0)
-		return false;
+                  if (ptr == num)
+                    {
+                      /* Finished */
+                      return true;
+                    }
+                }
 
-	      /* otherwise repeat code */
-	      if (symbol >= 17)
-		{
-		  /* repeat zero */
-//  		  System.err.println("repeating zero");
-		  lastLen = 0;
-		}
-	      else
-		{
-		  if (ptr == 0)
-		    throw new DataFormatException();
-		}
-	      repSymbol = symbol-16;
-	      mode = REPS;
-	    }
-	    /* fall through */
+              /* need more input ? */
+              if (symbol < 0)
+                return false;
 
-	  case REPS:
-	    {
-	      int bits = repBits[repSymbol];
-	      int count = input.peekBits(bits);
-	      if (count < 0)
-		return false;
-	      input.dropBits(bits);
-	      count += repMin[repSymbol];
-//  	      System.err.println("litdistLens repeated: "+count);
+              /* otherwise repeat code */
+              if (symbol >= 17)
+                {
+                  /* repeat zero */
+//                System.err.println("repeating zero");
+                  lastLen = 0;
+                }
+              else
+                {
+                  if (ptr == 0)
+                    throw new DataFormatException();
+                }
+              repSymbol = symbol-16;
+              mode = REPS;
+            }
+            /* fall through */
 
-	      if (ptr + count > num)
-		throw new DataFormatException();
-	      while (count-- > 0)
-		litdistLens[ptr++] = lastLen;
+          case REPS:
+            {
+              int bits = repBits[repSymbol];
+              int count = input.peekBits(bits);
+              if (count < 0)
+                return false;
+              input.dropBits(bits);
+              count += repMin[repSymbol];
+//            System.err.println("litdistLens repeated: "+count);
 
-	      if (ptr == num)
-		{
-		  /* Finished */
-		  return true;
-		}
-	    }
-	    mode = LENS;
-	    continue decode_loop;
-	  }
+              if (ptr + count > num)
+                throw new DataFormatException();
+              while (count-- > 0)
+                litdistLens[ptr++] = lastLen;
+
+              if (ptr == num)
+                {
+                  /* Finished */
+                  return true;
+                }
+            }
+            mode = LENS;
+            continue decode_loop;
+          }
       }
   }
 
diff --git a/libjava/classpath/java/util/zip/InflaterHuffmanTree.java b/libjava/classpath/java/util/zip/InflaterHuffmanTree.java
index 6c9b2175d33..c12c732e0c7 100644
--- a/libjava/classpath/java/util/zip/InflaterHuffmanTree.java
+++ b/libjava/classpath/java/util/zip/InflaterHuffmanTree.java
@@ -40,37 +40,37 @@ package java.util.zip;
 class InflaterHuffmanTree
 {
   private static final int MAX_BITLEN = 15;
-  
+
   private short[] tree;
 
   static InflaterHuffmanTree defLitLenTree, defDistTree;
 
   static
   {
-    try 
+    try
       {
-	byte[] codeLengths = new byte[288];
-	int i = 0;
-	while (i < 144)
-	  codeLengths[i++] = 8;
-	while (i < 256)
-	  codeLengths[i++] = 9;
-	while (i < 280)
-	  codeLengths[i++] = 7;
-	while (i < 288)
-	  codeLengths[i++] = 8;
-	defLitLenTree = new InflaterHuffmanTree(codeLengths);
-	
-	codeLengths = new byte[32];
-	i = 0;
-	while (i < 32)
-	  codeLengths[i++] = 5;
-	defDistTree = new InflaterHuffmanTree(codeLengths);
-      } 
+        byte[] codeLengths = new byte[288];
+        int i = 0;
+        while (i < 144)
+          codeLengths[i++] = 8;
+        while (i < 256)
+          codeLengths[i++] = 9;
+        while (i < 280)
+          codeLengths[i++] = 7;
+        while (i < 288)
+          codeLengths[i++] = 8;
+        defLitLenTree = new InflaterHuffmanTree(codeLengths);
+
+        codeLengths = new byte[32];
+        i = 0;
+        while (i < 32)
+          codeLengths[i++] = 5;
+        defDistTree = new InflaterHuffmanTree(codeLengths);
+      }
     catch (DataFormatException ex)
       {
-	throw new InternalError
-	  ("InflaterHuffmanTree: static tree length illegal");
+        throw new InternalError
+          ("InflaterHuffmanTree: static tree length illegal");
       }
   }
 
@@ -83,31 +83,31 @@ class InflaterHuffmanTree
   {
     buildTree(codeLengths);
   }
-  
+
   private void buildTree(byte[] codeLengths) throws DataFormatException
   {
     int[] blCount = new int[MAX_BITLEN+1];
     int[] nextCode = new int[MAX_BITLEN+1];
     for (int i = 0; i < codeLengths.length; i++)
       {
-	int bits = codeLengths[i];
-	if (bits > 0)
-	  blCount[bits]++;
+        int bits = codeLengths[i];
+        if (bits > 0)
+          blCount[bits]++;
       }
 
     int code = 0;
     int treeSize = 512;
     for (int bits = 1; bits <= MAX_BITLEN; bits++)
       {
-	nextCode[bits] = code;
-	code += blCount[bits] << (16 - bits);
-	if (bits >= 10)
-	  {
-	    /* We need an extra table for bit lengths >= 10. */
-	    int start = nextCode[bits] & 0x1ff80;
-	    int end   = code & 0x1ff80;
-	    treeSize += (end - start) >> (16 - bits);
-	  }
+        nextCode[bits] = code;
+        code += blCount[bits] << (16 - bits);
+        if (bits >= 10)
+          {
+            /* We need an extra table for bit lengths >= 10. */
+            int start = nextCode[bits] & 0x1ff80;
+            int end   = code & 0x1ff80;
+            treeSize += (end - start) >> (16 - bits);
+          }
       }
     if (code != 65536)
       throw new DataFormatException("Code lengths don't add up properly.");
@@ -119,46 +119,46 @@ class InflaterHuffmanTree
     int treePtr = 512;
     for (int bits = MAX_BITLEN; bits >= 10; bits--)
       {
-	int end   = code & 0x1ff80;
-	code -= blCount[bits] << (16 - bits);
-	int start = code & 0x1ff80;
-	for (int i = start; i < end; i += 1 << 7)
-	  {
-	    tree[DeflaterHuffman.bitReverse(i)]
-	      = (short) ((-treePtr << 4) | bits);
-	    treePtr += 1 << (bits-9);
-	  }
+        int end   = code & 0x1ff80;
+        code -= blCount[bits] << (16 - bits);
+        int start = code & 0x1ff80;
+        for (int i = start; i < end; i += 1 << 7)
+          {
+            tree[DeflaterHuffman.bitReverse(i)]
+              = (short) ((-treePtr << 4) | bits);
+            treePtr += 1 << (bits-9);
+          }
       }
-    
+
     for (int i = 0; i < codeLengths.length; i++)
       {
-	int bits = codeLengths[i];
-	if (bits == 0)
-	  continue;
-	code = nextCode[bits];
-	int revcode = DeflaterHuffman.bitReverse(code);
-	if (bits <= 9)
-	  {
-	    do
-	      {
-		tree[revcode] = (short) ((i << 4) | bits);
-		revcode += 1 << bits;
-	      }
-	    while (revcode < 512);
-	  }
-	else
-	  {
-	    int subTree = tree[revcode & 511];
-	    int treeLen = 1 << (subTree & 15);
-	    subTree = -(subTree >> 4);
-	    do
-	      { 
-		tree[subTree | (revcode >> 9)] = (short) ((i << 4) | bits);
-		revcode += 1 << bits;
-	      }
-	    while (revcode < treeLen);
-	  }
-	nextCode[bits] = code + (1 << (16 - bits));
+        int bits = codeLengths[i];
+        if (bits == 0)
+          continue;
+        code = nextCode[bits];
+        int revcode = DeflaterHuffman.bitReverse(code);
+        if (bits <= 9)
+          {
+            do
+              {
+                tree[revcode] = (short) ((i << 4) | bits);
+                revcode += 1 << bits;
+              }
+            while (revcode < 512);
+          }
+        else
+          {
+            int subTree = tree[revcode & 511];
+            int treeLen = 1 << (subTree & 15);
+            subTree = -(subTree >> 4);
+            do
+              {
+                tree[subTree | (revcode >> 9)] = (short) ((i << 4) | bits);
+                revcode += 1 << bits;
+              }
+            while (revcode < treeLen);
+          }
+        nextCode[bits] = code + (1 << (16 - bits));
       }
   }
 
@@ -173,45 +173,45 @@ class InflaterHuffmanTree
     int lookahead, symbol;
     if ((lookahead = input.peekBits(9)) >= 0)
       {
-	if ((symbol = tree[lookahead]) >= 0)
-	  {
-	    input.dropBits(symbol & 15);
-	    return symbol >> 4;
-	  }
-	int subtree = -(symbol >> 4);
-	int bitlen = symbol & 15;
-	if ((lookahead = input.peekBits(bitlen)) >= 0)
-	  {
-	    symbol = tree[subtree | (lookahead >> 9)];
-	    input.dropBits(symbol & 15);
-	    return symbol >> 4;
-	  }
-	else
-	  {
-	    int bits = input.getAvailableBits();
-	    lookahead = input.peekBits(bits);
-	    symbol = tree[subtree | (lookahead >> 9)];
-	    if ((symbol & 15) <= bits)
-	      {
-		input.dropBits(symbol & 15);
-		return symbol >> 4;
-	      }
-	    else
-	      return -1;
-	  }
+        if ((symbol = tree[lookahead]) >= 0)
+          {
+            input.dropBits(symbol & 15);
+            return symbol >> 4;
+          }
+        int subtree = -(symbol >> 4);
+        int bitlen = symbol & 15;
+        if ((lookahead = input.peekBits(bitlen)) >= 0)
+          {
+            symbol = tree[subtree | (lookahead >> 9)];
+            input.dropBits(symbol & 15);
+            return symbol >> 4;
+          }
+        else
+          {
+            int bits = input.getAvailableBits();
+            lookahead = input.peekBits(bits);
+            symbol = tree[subtree | (lookahead >> 9)];
+            if ((symbol & 15) <= bits)
+              {
+                input.dropBits(symbol & 15);
+                return symbol >> 4;
+              }
+            else
+              return -1;
+          }
       }
     else
       {
-	int bits = input.getAvailableBits();
-	lookahead = input.peekBits(bits);
-	symbol = tree[lookahead];
-	if (symbol >= 0 && (symbol & 15) <= bits)
-	  {
-	    input.dropBits(symbol & 15);
-	    return symbol >> 4;
-	  }
-	else
-	  return -1;
+        int bits = input.getAvailableBits();
+        lookahead = input.peekBits(bits);
+        symbol = tree[lookahead];
+        if (symbol >= 0 && (symbol & 15) <= bits)
+          {
+            input.dropBits(symbol & 15);
+            return symbol >> 4;
+          }
+        else
+          return -1;
       }
   }
 }
diff --git a/libjava/classpath/java/util/zip/InflaterInputStream.java b/libjava/classpath/java/util/zip/InflaterInputStream.java
index 08c1fd75a0b..1c5e9f2dd6c 100644
--- a/libjava/classpath/java/util/zip/InflaterInputStream.java
+++ b/libjava/classpath/java/util/zip/InflaterInputStream.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -57,17 +57,17 @@ import java.io.InputStream;
 public class InflaterInputStream extends FilterInputStream
 {
   /**
-   * Decompressor for this filter 
+   * Decompressor for this filter
    */
   protected Inflater inf;
 
   /**
-   * Byte array used as a buffer 
+   * Byte array used as a buffer
    */
   protected byte[] buf;
 
   /**
-   * Size of buffer   
+   * Size of buffer
    */
   protected int len;
 
@@ -81,7 +81,7 @@ public class InflaterInputStream extends FilterInputStream
    *
    * @param in the InputStream to read bytes from
    */
-  public InflaterInputStream(InputStream in) 
+  public InflaterInputStream(InputStream in)
   {
     this(in, new Inflater(), 4096);
   }
@@ -93,7 +93,7 @@ public class InflaterInputStream extends FilterInputStream
    * @param in the InputStream to read bytes from
    * @param inf the decompressor used to decompress data read from in
    */
-  public InflaterInputStream(InputStream in, Inflater inf) 
+  public InflaterInputStream(InputStream in, Inflater inf)
   {
     this(in, inf, 4096);
   }
@@ -106,7 +106,7 @@ public class InflaterInputStream extends FilterInputStream
    * @param inf the decompressor used to decompress data read from in
    * @param size size of the buffer to use
    */
-  public InflaterInputStream(InputStream in, Inflater inf, int size) 
+  public InflaterInputStream(InputStream in, Inflater inf, int size)
   {
     super(in);
 
@@ -116,7 +116,7 @@ public class InflaterInputStream extends FilterInputStream
       throw new NullPointerException("inf may not be null");
     if (size < 0)
       throw new IllegalArgumentException("size may not be negative");
-    
+
     this.inf = inf;
     this.buf = new byte [size];
   }
@@ -151,12 +151,12 @@ public class InflaterInputStream extends FilterInputStream
   {
     if (in == null)
       throw new ZipException ("InflaterInputStream is closed");
-    
+
     len = in.read(buf, 0, buf.length);
 
     if (len < 0)
       throw new ZipException("Deflated stream ends early.");
-    
+
     inf.setInput(buf, 0, len);
   }
 
@@ -166,7 +166,7 @@ public class InflaterInputStream extends FilterInputStream
    * The byte is in the lower 8 bits of the int.
    */
   public int read() throws IOException
-  { 
+  {
     int nread = read(onebytebuffer, 0, 1);
     if (nread > 0)
       return onebytebuffer[0] & 0xff;
@@ -192,27 +192,27 @@ public class InflaterInputStream extends FilterInputStream
     int count = 0;
     while (count == 0)
       {
-	if (inf.needsInput())
-	  fill();
-	
-	try
-	  {
-	    count = inf.inflate(b, off, len);
-	    if (count == 0)
-	      {
-		if (this.len == -1)
-		  {
-		    // Couldn't get any more data to feed to the Inflater
-		    return -1;
-		  }
-		if (inf.needsDictionary())
-		  throw new ZipException("Inflater needs Dictionary");
-	      }
-	  } 
-	catch (DataFormatException dfe) 
-	  {
-	    throw new ZipException(dfe.getMessage());
-	  }
+        if (inf.needsInput())
+          fill();
+
+        try
+          {
+            count = inf.inflate(b, off, len);
+            if (count == 0)
+              {
+                if (this.len == -1)
+                  {
+                    // Couldn't get any more data to feed to the Inflater
+                    return -1;
+                  }
+                if (inf.needsDictionary())
+                  throw new ZipException("Inflater needs Dictionary");
+              }
+          }
+        catch (DataFormatException dfe)
+          {
+            throw new ZipException(dfe.getMessage());
+          }
       }
     return count;
   }
@@ -238,12 +238,12 @@ public class InflaterInputStream extends FilterInputStream
     long skipped = 0L;
     while (n > 0L)
       {
-	int numread = read(tmpbuf, 0, buflen);
-	if (numread <= 0)
-	  break;
-	n -= numread;
-	skipped += numread;
-	buflen = (int) Math.min(n, 2048);
+        int numread = read(tmpbuf, 0, buflen);
+        if (numread <= 0)
+          break;
+        n -= numread;
+        skipped += numread;
+        buflen = (int) Math.min(n, 2048);
       }
 
     return skipped;
diff --git a/libjava/classpath/java/util/zip/OutputWindow.java b/libjava/classpath/java/util/zip/OutputWindow.java
index 1f082a9faa4..59dadb5f320 100644
--- a/libjava/classpath/java/util/zip/OutputWindow.java
+++ b/libjava/classpath/java/util/zip/OutputWindow.java
@@ -67,9 +67,9 @@ class OutputWindow
   {
     while (len-- > 0)
       {
-	window[window_end++] = window[rep_start++];
-	window_end &= WINDOW_MASK;
-	rep_start &= WINDOW_MASK;
+        window[window_end++] = window[rep_start++];
+        window_end &= WINDOW_MASK;
+        rep_start &= WINDOW_MASK;
       }
   }
 
@@ -82,18 +82,18 @@ class OutputWindow
     int border = WINDOW_SIZE - len;
     if (rep_start <= border && window_end < border)
       {
-	if (len <= dist)
-	  {
-	    System.arraycopy(window, rep_start, window, window_end, len);
-	    window_end += len;
-	  }
-	else
-	  {
-	    /* We have to copy manually, since the repeat pattern overlaps.
-	     */
-	    while (len-- > 0)
-	      window[window_end++] = window[rep_start++];
-	  }
+        if (len <= dist)
+          {
+            System.arraycopy(window, rep_start, window, window_end, len);
+            window_end += len;
+          }
+        else
+          {
+            /* We have to copy manually, since the repeat pattern overlaps.
+             */
+            while (len-- > 0)
+              window[window_end++] = window[rep_start++];
+          }
       }
     else
       slowRepeat(rep_start, len, dist);
@@ -101,16 +101,16 @@ class OutputWindow
 
   public int copyStored(StreamManipulator input, int len)
   {
-    len = Math.min(Math.min(len, WINDOW_SIZE - window_filled), 
-		   input.getAvailableBytes());
+    len = Math.min(Math.min(len, WINDOW_SIZE - window_filled),
+                   input.getAvailableBytes());
     int copied;
 
     int tailLen = WINDOW_SIZE - window_end;
     if (len > tailLen)
       {
-	copied = input.copyBytes(window, window_end, tailLen);
-	if (copied == tailLen)
-	  copied += input.copyBytes(window, 0, len - tailLen);
+        copied = input.copyBytes(window, window_end, tailLen);
+        if (copied == tailLen)
+          copied += input.copyBytes(window, 0, len - tailLen);
       }
     else
       copied = input.copyBytes(window, window_end, len);
@@ -127,8 +127,8 @@ class OutputWindow
 
     if (len > WINDOW_SIZE)
       {
-	offset += len - WINDOW_SIZE;
-	len = WINDOW_SIZE;
+        offset += len - WINDOW_SIZE;
+        len = WINDOW_SIZE;
       }
     System.arraycopy(dict, offset, window, 0, len);
     window_end = len & WINDOW_MASK;
@@ -157,10 +157,10 @@ class OutputWindow
 
     if (tailLen > 0)
       {
-	System.arraycopy(window, WINDOW_SIZE - tailLen,
-			 output, offset, tailLen);
-	offset += tailLen;
-	len = copy_end;
+        System.arraycopy(window, WINDOW_SIZE - tailLen,
+                         output, offset, tailLen);
+        offset += tailLen;
+        len = copy_end;
       }
     System.arraycopy(window, copy_end - len, output, offset, len);
     window_filled -= copied;
@@ -173,6 +173,3 @@ class OutputWindow
     window_filled = window_end = 0;
   }
 }
-
-
-
diff --git a/libjava/classpath/java/util/zip/PendingBuffer.java b/libjava/classpath/java/util/zip/PendingBuffer.java
index 9079b9804b7..50f561f49a3 100644
--- a/libjava/classpath/java/util/zip/PendingBuffer.java
+++ b/libjava/classpath/java/util/zip/PendingBuffer.java
@@ -40,12 +40,12 @@ package java.util.zip;
 /**
  * This class is general purpose class for writing data to a buffer.
  *
- * It allows you to write bits as well as bytes 
+ * It allows you to write bits as well as bytes
  *
  * Based on DeflaterPending.java
  *
  * @author Jochen Hoenicke
- * @date Jan 5, 2000 
+ * @date Jan 5, 2000
  */
 
 class PendingBuffer
@@ -71,14 +71,14 @@ class PendingBuffer
     start = end = bitCount = 0;
   }
 
-  public final void writeByte(int b) 
+  public final void writeByte(int b)
   {
     if (DeflaterConstants.DEBUGGING && start != 0)
       throw new IllegalStateException();
     buf[end++] = (byte) b;
   }
 
-  public final void writeShort(int s) 
+  public final void writeShort(int s)
   {
     if (DeflaterConstants.DEBUGGING && start != 0)
       throw new IllegalStateException();
@@ -86,7 +86,7 @@ class PendingBuffer
     buf[end++] = (byte) (s >> 8);
   }
 
-  public final void writeInt(int s) 
+  public final void writeInt(int s)
   {
     if (DeflaterConstants.DEBUGGING && start != 0)
       throw new IllegalStateException();
@@ -96,7 +96,7 @@ class PendingBuffer
     buf[end++] = (byte) (s >> 24);
   }
 
-  public final void writeBlock(byte[] block, int offset, int len) 
+  public final void writeBlock(byte[] block, int offset, int len)
   {
     if (DeflaterConstants.DEBUGGING && start != 0)
       throw new IllegalStateException();
@@ -113,9 +113,9 @@ class PendingBuffer
       throw new IllegalStateException();
     if (bitCount > 0)
       {
-	buf[end++] = (byte) bits;
-	if (bitCount > 8)
-	  buf[end++] = (byte) (bits >>> 8);
+        buf[end++] = (byte) bits;
+        if (bitCount > 8)
+          buf[end++] = (byte) (bits >>> 8);
       }
     bits = 0;
     bitCount = 0;
@@ -161,28 +161,28 @@ class PendingBuffer
   public final int flush(byte[] output, int offset, int length) {
     if (bitCount >= 8)
       {
-	buf[end++] = (byte) bits;
-	bits >>>= 8;
-	bitCount -= 8;
+        buf[end++] = (byte) bits;
+        bits >>>= 8;
+        bitCount -= 8;
       }
     if (length > end - start)
       {
-	length = end - start;
-	System.arraycopy(buf, start, output, offset, length);
-	start = 0;
-	end = 0;
+        length = end - start;
+        System.arraycopy(buf, start, output, offset, length);
+        start = 0;
+        end = 0;
       }
     else
       {
-	System.arraycopy(buf, start, output, offset, length);
-	start += length;
+        System.arraycopy(buf, start, output, offset, length);
+        start += length;
       }
     return length;
   }
 
   /**
    * Flushes the pending buffer and returns that data in a new array
-   * 
+   *
    * @return the output stream
    */
 
@@ -197,4 +197,3 @@ class PendingBuffer
 
 
 }
-
diff --git a/libjava/classpath/java/util/zip/StreamManipulator.java b/libjava/classpath/java/util/zip/StreamManipulator.java
index 57d15ae283b..105d807e4bf 100644
--- a/libjava/classpath/java/util/zip/StreamManipulator.java
+++ b/libjava/classpath/java/util/zip/StreamManipulator.java
@@ -46,7 +46,7 @@ package java.util.zip;
  * but we only need at most 15, so this is all safe.
  *
  * There are some optimizations in this class, for example, you must
- * never peek more then 8 bits more than needed, and you must first 
+ * never peek more then 8 bits more than needed, and you must first
  * peek bits before you may drop them.  This is not a general purpose
  * class but optimized for the behaviour of the Inflater.
  *
@@ -66,17 +66,17 @@ class StreamManipulator
    * Get the next n bits but don't increase input pointer.  n must be
    * less or equal 16 and if you if this call succeeds, you must drop
    * at least n-8 bits in the next call.
-   * 
+   *
    * @return the value of the bits, or -1 if not enough bits available.  */
   public final int peekBits(int n)
   {
     if (bits_in_buffer < n)
       {
-	if (window_start == window_end)
-	  return -1;
-	buffer |= (window[window_start++] & 0xff
-		   | (window[window_start++] & 0xff) << 8) << bits_in_buffer;
-	bits_in_buffer += 16;
+        if (window_start == window_end)
+          return -1;
+        buffer |= (window[window_start++] & 0xff
+                   | (window[window_start++] & 0xff) << 8) << bits_in_buffer;
+        bits_in_buffer += 16;
       }
     return buffer & ((1 << n) - 1);
   }
@@ -94,7 +94,7 @@ class StreamManipulator
   /**
    * Gets the next n bits and increases input pointer.  This is equivalent
    * to peekBits followed by dropBits, except for correct error handling.
-   * @return the value of the bits, or -1 if not enough bits available. 
+   * @return the value of the bits, or -1 if not enough bits available.
    */
   public final int getBits(int n)
   {
@@ -114,7 +114,7 @@ class StreamManipulator
   }
 
   /**
-   * Gets the number of bytes available.  
+   * Gets the number of bytes available.
    * @return the number of bytes available.
    */
   public final int getAvailableBytes()
@@ -141,24 +141,24 @@ class StreamManipulator
    * byte aligned.  If not enough bytes are available, copies fewer
    * bytes.
    * @param length the length to copy, 0 is allowed.
-   * @return the number of bytes copied, 0 if no byte is available.  
+   * @return the number of bytes copied, 0 if no byte is available.
    */
   public int copyBytes(byte[] output, int offset, int length)
   {
     if (length < 0)
       throw new IllegalArgumentException("length negative");
-    if ((bits_in_buffer & 7) != 0)  
+    if ((bits_in_buffer & 7) != 0)
       /* bits_in_buffer may only be 0 or 8 */
       throw new IllegalStateException("Bit buffer is not aligned!");
 
     int count = 0;
     while (bits_in_buffer > 0 && length > 0)
       {
-	output[offset++] = (byte) buffer;
-	buffer >>>= 8;
-	bits_in_buffer -= 8;
-	length--;
-	count++;
+        output[offset++] = (byte) buffer;
+        buffer >>>= 8;
+        bits_in_buffer -= 8;
+        length--;
+        count++;
       }
     if (length == 0)
       return count;
@@ -171,9 +171,9 @@ class StreamManipulator
 
     if (((window_start - window_end) & 1) != 0)
       {
-	/* We always want an even number of bytes in input, see peekBits */
-	buffer = (window[window_start++] & 0xff);
-	bits_in_buffer = 8;
+        /* We always want an even number of bytes in input, see peekBits */
+        buffer = (window[window_start++] & 0xff);
+        bits_in_buffer = 8;
       }
     return count + length;
   }
@@ -191,26 +191,25 @@ class StreamManipulator
   {
     if (window_start < window_end)
       throw new IllegalStateException
-	("Old input was not completely processed");
+        ("Old input was not completely processed");
 
     int end = off + len;
 
     /* We want to throw an ArrayIndexOutOfBoundsException early.  The
-     * check is very tricky: it also handles integer wrap around.  
+     * check is very tricky: it also handles integer wrap around.
      */
     if (0 > off || off > end || end > buf.length)
       throw new ArrayIndexOutOfBoundsException();
-    
+
     if ((len & 1) != 0)
       {
-	/* We always want an even number of bytes in input, see peekBits */
-	buffer |= (buf[off++] & 0xff) << bits_in_buffer;
-	bits_in_buffer += 8;
+        /* We always want an even number of bytes in input, see peekBits */
+        buffer |= (buf[off++] & 0xff) << bits_in_buffer;
+        bits_in_buffer += 8;
       }
-    
+
     window = buf;
     window_start = off;
     window_end = end;
   }
 }
-
diff --git a/libjava/classpath/java/util/zip/ZipConstants.java b/libjava/classpath/java/util/zip/ZipConstants.java
index bdf94506ba2..69f589a3166 100644
--- a/libjava/classpath/java/util/zip/ZipConstants.java
+++ b/libjava/classpath/java/util/zip/ZipConstants.java
@@ -91,4 +91,3 @@ interface ZipConstants
   int ENDOFF = 16;
   int ENDCOM = 20;
 }
-
diff --git a/libjava/classpath/java/util/zip/ZipEntry.java b/libjava/classpath/java/util/zip/ZipEntry.java
index a6d01af5ff6..73afc893b6c 100644
--- a/libjava/classpath/java/util/zip/ZipEntry.java
+++ b/libjava/classpath/java/util/zip/ZipEntry.java
@@ -46,7 +46,7 @@ import java.util.Calendar;
  * about the members in an archive.  On the other hand ZipOutputStream
  * needs an instance of this class to create a new member.
  *
- * @author Jochen Hoenicke 
+ * @author Jochen Hoenicke
  */
 public class ZipEntry implements ZipConstants, Cloneable
 {
@@ -196,7 +196,7 @@ public class ZipEntry implements ZipConstants, Cloneable
 
   /**
    * Returns the entry name.  The path components in the entry are
-   * always separated by slashes ('/').  
+   * always separated by slashes ('/').
    */
   public String getName()
   {
@@ -241,7 +241,7 @@ public class ZipEntry implements ZipConstants, Cloneable
           time = cal.getTimeInMillis();
           known |= KNOWN_TIME;
           return time;
-	 }
+         }
        catch (RuntimeException ex)
          {
           /* Ignore illegal time stamp */
@@ -260,7 +260,7 @@ public class ZipEntry implements ZipConstants, Cloneable
   public void setSize(long size)
   {
     if ((size & 0xffffffff00000000L) != 0)
-	throw new IllegalArgumentException();
+        throw new IllegalArgumentException();
     this.size = (int) size;
     this.known |= KNOWN_SIZE;
   }
@@ -298,7 +298,7 @@ public class ZipEntry implements ZipConstants, Cloneable
   public void setCrc(long crc)
   {
     if ((crc & 0xffffffff00000000L) != 0)
-	throw new IllegalArgumentException();
+        throw new IllegalArgumentException();
     this.crc = (int) crc;
     this.known |= KNOWN_CRC;
   }
@@ -317,18 +317,18 @@ public class ZipEntry implements ZipConstants, Cloneable
    * supported.
    * @exception IllegalArgumentException if method is not supported.
    * @see ZipOutputStream#DEFLATED
-   * @see ZipOutputStream#STORED 
+   * @see ZipOutputStream#STORED
    */
   public void setMethod(int method)
   {
     if (method != ZipOutputStream.STORED
-	&& method != ZipOutputStream.DEFLATED)
-	throw new IllegalArgumentException();
+        && method != ZipOutputStream.DEFLATED)
+        throw new IllegalArgumentException();
     this.method = (byte) method;
   }
 
   /**
-   * Gets the compression method.  
+   * Gets the compression method.
    * @return the compression method or -1 if unknown.
    */
   public int getMethod()
@@ -342,10 +342,10 @@ public class ZipEntry implements ZipConstants, Cloneable
    */
   public void setExtra(byte[] extra)
   {
-    if (extra == null) 
+    if (extra == null)
       {
-	this.extra = null;
-	return;
+        this.extra = null;
+        return;
       }
     if (extra.length > 0xffff)
       throw new IllegalArgumentException();
@@ -360,38 +360,38 @@ public class ZipEntry implements ZipConstants, Cloneable
 
     if (extra == null)
       {
-	known |= KNOWN_EXTRA;
-	return;
+        known |= KNOWN_EXTRA;
+        return;
       }
 
     try
       {
-	int pos = 0;
-	while (pos < extra.length) 
-	  {
-	    int sig = (extra[pos++] & 0xff)
-	      | (extra[pos++] & 0xff) << 8;
-	    int len = (extra[pos++] & 0xff)
-	      | (extra[pos++] & 0xff) << 8;
-	    if (sig == 0x5455) 
-	      {
-		/* extended time stamp */
-		int flags = extra[pos];
-		if ((flags & 1) != 0)
-		  {
-		    long time = ((extra[pos+1] & 0xff)
-			    | (extra[pos+2] & 0xff) << 8
-			    | (extra[pos+3] & 0xff) << 16
-			    | (extra[pos+4] & 0xff) << 24);
-		    setTime(time*1000);
-		  }
-	      }
-	    pos += len;
-	  }
+        int pos = 0;
+        while (pos < extra.length)
+          {
+            int sig = (extra[pos++] & 0xff)
+              | (extra[pos++] & 0xff) << 8;
+            int len = (extra[pos++] & 0xff)
+              | (extra[pos++] & 0xff) << 8;
+            if (sig == 0x5455)
+              {
+                /* extended time stamp */
+                int flags = extra[pos];
+                if ((flags & 1) != 0)
+                  {
+                    long time = ((extra[pos+1] & 0xff)
+                            | (extra[pos+2] & 0xff) << 8
+                            | (extra[pos+3] & 0xff) << 16
+                            | (extra[pos+4] & 0xff) << 24);
+                    setTime(time*1000);
+                  }
+              }
+            pos += len;
+          }
       }
     catch (ArrayIndexOutOfBoundsException ex)
       {
-	/* be lenient */
+        /* be lenient */
       }
 
     known |= KNOWN_EXTRA;
@@ -429,7 +429,7 @@ public class ZipEntry implements ZipConstants, Cloneable
 
   /**
    * Gets true, if the entry is a directory.  This is solely
-   * determined by the name, a trailing slash '/' marks a directory.  
+   * determined by the name, a trailing slash '/' marks a directory.
    */
   public boolean isDirectory()
   {
diff --git a/libjava/classpath/java/util/zip/ZipFile.java b/libjava/classpath/java/util/zip/ZipFile.java
index 7cf7007ed8f..3963bcb1eb5 100644
--- a/libjava/classpath/java/util/zip/ZipFile.java
+++ b/libjava/classpath/java/util/zip/ZipFile.java
@@ -106,19 +106,19 @@ public class ZipFile implements ZipConstants
    *
    * @return the newly open RandomAccessFile, never null
    */
-  private RandomAccessFile openFile(String name, 
-                                    File file) 
+  private RandomAccessFile openFile(String name,
+                                    File file)
     throws ZipException, IOException
-  {                                       
-    try 
+  {
+    try
       {
-        return 
+        return
           (name != null)
           ? new RandomAccessFile(name, "r")
           : new RandomAccessFile(file, "r");
       }
     catch (FileNotFoundException f)
-      { 
+      {
         ZipException ze = new ZipException(f.getMessage());
         ze.initCause(f);
         throw ze;
@@ -130,7 +130,7 @@ public class ZipFile implements ZipConstants
    * Opens a Zip file with the given name for reading.
    * @exception IOException if a i/o error occured.
    * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
+   * archive.
    */
   public ZipFile(String name) throws ZipException, IOException
   {
@@ -143,7 +143,7 @@ public class ZipFile implements ZipConstants
    * Opens a Zip file reading the given File.
    * @exception IOException if a i/o error occured.
    * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
+   * archive.
    */
   public ZipFile(File file) throws ZipException, IOException
   {
@@ -158,7 +158,7 @@ public class ZipFile implements ZipConstants
    * If the OPEN_DELETE mode is specified, the zip file will be deleted at
    * some time moment after it is opened. It will be deleted before the zip
    * file is closed or the Virtual Machine exits.
-   * 
+   *
    * The contents of the zip file will be accessible until it is closed.
    *
    * @since JDK1.3
@@ -166,7 +166,7 @@ public class ZipFile implements ZipConstants
    *
    * @exception IOException if a i/o error occured.
    * @exception ZipException if the file doesn't contain a valid zip
-   * archive.  
+   * archive.
    */
   public ZipFile(File file, int mode) throws ZipException, IOException
   {
@@ -183,7 +183,7 @@ public class ZipFile implements ZipConstants
   {
     boolean valid = false;
 
-    try 
+    try
       {
         byte[] buf = new byte[4];
         raf.readFully(buf);
@@ -195,18 +195,18 @@ public class ZipFile implements ZipConstants
       }
     catch (IOException _)
       {
-      } 
+      }
 
     if (!valid)
       {
         try
           {
-	    raf.close();
+            raf.close();
           }
         catch (IOException _)
           {
           }
-	throw new ZipException("Not a valid zip file");
+        throw new ZipException("Not a valid zip file");
       }
   }
 
@@ -225,11 +225,11 @@ public class ZipFile implements ZipConstants
    * while holding the lock on raf.
    *
    * @exception IOException if a i/o error occured.
-   * @exception ZipException if the central directory is malformed 
+   * @exception ZipException if the central directory is malformed
    */
   private void readEntries() throws ZipException, IOException
   {
-    /* Search for the End Of Central Directory.  When a zip comment is 
+    /* Search for the End Of Central Directory.  When a zip comment is
      * present the directory may start earlier.
      * Note that a comment has a maximum length of 64K, so that is the
      * maximum we search backwards.
@@ -239,13 +239,13 @@ public class ZipFile implements ZipConstants
     long top = Math.max(0, pos - 65536);
     do
       {
-	if (pos < top)
-	  throw new ZipException
-	    ("central directory not found, probably not a zip file: " + name);
-	inp.seek(pos--);
+        if (pos < top)
+          throw new ZipException
+            ("central directory not found, probably not a zip file: " + name);
+        inp.seek(pos--);
       }
     while (inp.readLeInt() != ENDSIG);
-    
+
     if (inp.skip(ENDTOT - ENDNRD) != ENDTOT - ENDNRD)
       throw new EOFException(name);
     int count = inp.readLeShort();
@@ -255,43 +255,43 @@ public class ZipFile implements ZipConstants
 
     entries = new LinkedHashMap (count+count/2);
     inp.seek(centralOffset);
-    
+
     for (int i = 0; i < count; i++)
       {
-	if (inp.readLeInt() != CENSIG)
-	  throw new ZipException("Wrong Central Directory signature: " + name);
+        if (inp.readLeInt() != CENSIG)
+          throw new ZipException("Wrong Central Directory signature: " + name);
 
         inp.skip(6);
-	int method = inp.readLeShort();
-	int dostime = inp.readLeInt();
-	int crc = inp.readLeInt();
-	int csize = inp.readLeInt();
-	int size = inp.readLeInt();
-	int nameLen = inp.readLeShort();
-	int extraLen = inp.readLeShort();
-	int commentLen = inp.readLeShort();
+        int method = inp.readLeShort();
+        int dostime = inp.readLeInt();
+        int crc = inp.readLeInt();
+        int csize = inp.readLeInt();
+        int size = inp.readLeInt();
+        int nameLen = inp.readLeShort();
+        int extraLen = inp.readLeShort();
+        int commentLen = inp.readLeShort();
         inp.skip(8);
-	int offset = inp.readLeInt();
-	String name = inp.readString(nameLen);
+        int offset = inp.readLeInt();
+        String name = inp.readString(nameLen);
 
-	ZipEntry entry = new ZipEntry(name);
-	entry.setMethod(method);
-	entry.setCrc(crc & 0xffffffffL);
-	entry.setSize(size & 0xffffffffL);
-	entry.setCompressedSize(csize & 0xffffffffL);
-	entry.setDOSTime(dostime);
-	if (extraLen > 0)
-	  {
-	    byte[] extra = new byte[extraLen];
-	    inp.readFully(extra);
-	    entry.setExtra(extra);
-	  }
-	if (commentLen > 0)
-	  {
+        ZipEntry entry = new ZipEntry(name);
+        entry.setMethod(method);
+        entry.setCrc(crc & 0xffffffffL);
+        entry.setSize(size & 0xffffffffL);
+        entry.setCompressedSize(csize & 0xffffffffL);
+        entry.setDOSTime(dostime);
+        if (extraLen > 0)
+          {
+            byte[] extra = new byte[extraLen];
+            inp.readFully(extra);
+            entry.setExtra(extra);
+          }
+        if (commentLen > 0)
+          {
             entry.setComment(inp.readString(commentLen));
-	  }
-	entry.offset = offset;
-	entries.put(name, entry);
+          }
+        entry.offset = offset;
+        entries.put(name, entry);
       }
   }
 
@@ -299,7 +299,7 @@ public class ZipFile implements ZipConstants
    * Closes the ZipFile.  This also closes all input streams given by
    * this class.  After this is called, no further method should be
    * called.
-   * 
+   *
    * @exception IOException if a i/o error occured.
    */
   public void close() throws IOException
@@ -310,9 +310,9 @@ public class ZipFile implements ZipConstants
 
     synchronized (raf)
       {
-	closed = true;
-	entries = null;
-	raf.close();
+        closed = true;
+        entries = null;
+        raf.close();
       }
   }
 
@@ -333,14 +333,14 @@ public class ZipFile implements ZipConstants
   public Enumeration entries()
   {
     checkClosed();
-    
+
     try
       {
-	return new ZipEntryEnumeration(getEntries().values().iterator());
+        return new ZipEntryEnumeration(getEntries().values().iterator());
       }
     catch (IOException ioe)
       {
-	return new EmptyEnumeration();
+        return new EmptyEnumeration();
       }
   }
 
@@ -354,12 +354,12 @@ public class ZipFile implements ZipConstants
   {
     synchronized(raf)
       {
-	checkClosed();
+        checkClosed();
 
-	if (entries == null)
-	  readEntries();
+        if (entries == null)
+          readEntries();
 
-	return entries;
+        return entries;
       }
   }
 
@@ -378,16 +378,16 @@ public class ZipFile implements ZipConstants
 
     try
       {
-	LinkedHashMap entries = getEntries();
-	ZipEntry entry = entries.get(name);
+        LinkedHashMap entries = getEntries();
+        ZipEntry entry = entries.get(name);
         // If we didn't find it, maybe it's a directory.
         if (entry == null && !name.endsWith("/"))
-	  entry = entries.get(name + '/');
-	return entry != null ? new ZipEntry(entry, name) : null;
+          entry = entries.get(name + '/');
+        return entry != null ? new ZipEntry(entry, name) : null;
       }
     catch (IOException ioe)
       {
-	return null;
+        return null;
       }
   }
 
@@ -411,7 +411,7 @@ public class ZipFile implements ZipConstants
    *
    * @exception IllegalStateException when the ZipFile has already been closed
    * @exception IOException if a i/o error occured.
-   * @exception ZipException if the Zip archive is malformed.  
+   * @exception ZipException if the Zip archive is malformed.
    */
   public InputStream getInputStream(ZipEntry entry) throws IOException
   {
@@ -446,7 +446,7 @@ public class ZipFile implements ZipConstants
     switch (method)
       {
       case ZipOutputStream.STORED:
-	return inp;
+        return inp;
       case ZipOutputStream.DEFLATED:
         inp.addDummyByte();
         final Inflater inf = new Inflater(true);
@@ -463,10 +463,10 @@ public class ZipFile implements ZipConstants
           }
         };
       default:
-	throw new ZipException("Unknown compression method " + method);
+        throw new ZipException("Unknown compression method " + method);
       }
   }
-  
+
   /**
    * Returns the (path) name of this zip file.
    */
@@ -483,17 +483,17 @@ public class ZipFile implements ZipConstants
   public int size()
   {
     checkClosed();
-    
+
     try
       {
-	return getEntries().size();
+        return getEntries().size();
       }
     catch (IOException ioe)
       {
-	return 0;
+        return 0;
       }
   }
-  
+
   private static class ZipEntryEnumeration implements Enumeration
   {
     private final Iterator elements;
@@ -511,7 +511,7 @@ public class ZipFile implements ZipConstants
     public ZipEntry nextElement()
     {
       /* We return a clone, just to be safe that the user doesn't
-       * change the entry.  
+       * change the entry.
        */
       return (ZipEntry) (elements.next().clone());
     }
@@ -525,7 +525,7 @@ public class ZipFile implements ZipConstants
     private static final Charset UTF8CHARSET = Charset.forName("UTF-8");
 
     /**
-     * The actual UTF-8 decoder. Created on demand. 
+     * The actual UTF-8 decoder. Created on demand.
      */
     private CharsetDecoder utf8Decoder;
 
@@ -572,37 +572,37 @@ public class ZipFile implements ZipConstants
             }
         }
     }
-    
+
     public int available()
     {
       long amount = end - (bufferOffset + pos);
       if (amount > Integer.MAX_VALUE)
-	return Integer.MAX_VALUE;
+        return Integer.MAX_VALUE;
       return (int) amount;
     }
-    
+
     public int read() throws IOException
     {
       if (bufferOffset + pos >= end + dummyByteCount)
-	return -1;
+        return -1;
       if (pos == buffer.length)
         {
           bufferOffset += buffer.length;
           pos = 0;
           fillBuffer();
         }
-      
+
       return buffer[pos++] & 0xFF;
     }
 
     public int read(byte[] b, int off, int len) throws IOException
     {
       if (len > end + dummyByteCount - (bufferOffset + pos))
-	{
-	  len = (int) (end + dummyByteCount - (bufferOffset + pos));
-	  if (len == 0)
-	    return -1;
-	}
+        {
+          len = (int) (end + dummyByteCount - (bufferOffset + pos));
+          if (len == 0)
+            return -1;
+        }
 
       int totalBytesRead = Math.min(buffer.length - pos, len);
       System.arraycopy(buffer, pos, b, off, totalBytesRead);
@@ -622,16 +622,16 @@ public class ZipFile implements ZipConstants
           len -= remain;
           totalBytesRead += remain;
         }
-      
+
       return totalBytesRead;
     }
 
     public long skip(long amount) throws IOException
     {
       if (amount < 0)
-	return 0;
+        return 0;
       if (amount > end - (bufferOffset + pos))
-	amount = end - (bufferOffset + pos);
+        amount = end - (bufferOffset + pos);
       seek(bufferOffset + pos + amount);
       return amount;
     }
diff --git a/libjava/classpath/java/util/zip/ZipInputStream.java b/libjava/classpath/java/util/zip/ZipInputStream.java
index df44bb3e808..3eae026da9d 100644
--- a/libjava/classpath/java/util/zip/ZipInputStream.java
+++ b/libjava/classpath/java/util/zip/ZipInputStream.java
@@ -82,9 +82,9 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
   {
     if (avail <= 0)
       {
-	fillBuf();
-	if (avail <= 0)
-	  return -1;
+        fillBuf();
+        if (avail <= 0)
+          return -1;
       }
     if (length > avail)
       length = avail;
@@ -92,28 +92,28 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
     avail -= length;
     return length;
   }
-  
+
   private void readFully(byte[] out) throws IOException
   {
     int off = 0;
     int len = out.length;
     while (len > 0)
       {
-	int count = readBuf(out, off, len);
-	if (count == -1)
-	  throw new EOFException();
-	off += count;
-	len -= count;
+        int count = readBuf(out, off, len);
+        if (count == -1)
+          throw new EOFException();
+        off += count;
+        len -= count;
       }
   }
-  
+
   private int readLeByte() throws IOException
   {
     if (avail <= 0)
       {
-	fillBuf();
-	if (avail <= 0)
-	  throw new ZipException("EOF in header");
+        fillBuf();
+        if (avail <= 0)
+          throw new ZipException("EOF in header");
       }
     return buf[len - avail--] & 0xff;
   }
@@ -121,7 +121,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
   /**
    * Read an unsigned short in little endian byte order.
    */
-  private int readLeShort() throws IOException 
+  private int readLeShort() throws IOException
   {
     return readLeByte() | (readLeByte() << 8);
   }
@@ -129,7 +129,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
   /**
    * Read an int in little endian byte order.
    */
-  private int readLeInt() throws IOException 
+  private int readLeInt() throws IOException
   {
     return readLeShort() | (readLeShort() << 16);
   }
@@ -148,13 +148,13 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
     int header = readLeInt();
     if (header == CENSIG)
       {
-	/* Central Header reached. */
-	close();
-	return null;
+        /* Central Header reached. */
+        close();
+        return null;
       }
     if (header != LOCSIG)
       throw new ZipException("Wrong Local header signature: "
-			     + Integer.toHexString(header));
+                             + Integer.toHexString(header));
     /* skip version */
     readLeShort();
     flags = readLeShort();
@@ -175,36 +175,36 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
     String name;
     try
       {
-	name = new String(buffer, "UTF-8");
+        name = new String(buffer, "UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-	throw new AssertionError(uee);
+        throw new AssertionError(uee);
       }
-    
+
     entry = createZipEntry(name);
     entryAtEOF = false;
     entry.setMethod(method);
     if ((flags & 8) == 0)
       {
-	entry.setCrc(crc & 0xffffffffL);
-	entry.setSize(size & 0xffffffffL);
-	entry.setCompressedSize(csize & 0xffffffffL);
+        entry.setCrc(crc & 0xffffffffL);
+        entry.setSize(size & 0xffffffffL);
+        entry.setCompressedSize(csize & 0xffffffffL);
       }
     entry.setDOSTime(dostime);
     if (extraLen > 0)
       {
-	byte[] extra = new byte[extraLen];
-	readFully(extra);
-	entry.setExtra(extra);
+        byte[] extra = new byte[extraLen];
+        readFully(extra);
+        entry.setExtra(extra);
       }
 
     if (method == ZipOutputStream.DEFLATED && avail > 0)
       {
-	System.arraycopy(buf, len - avail, buf, 0, avail);
-	len = avail;
-	avail = 0;
-	inf.setInput(buf, 0, len);
+        System.arraycopy(buf, len - avail, buf, 0, avail);
+        len = avail;
+        avail = 0;
+        inf.setInput(buf, 0, len);
       }
     return entry;
   }
@@ -232,33 +232,33 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
 
     if (method == ZipOutputStream.DEFLATED)
       {
-	if ((flags & 8) != 0)
-	  {
-	    /* We don't know how much we must skip, read until end. */
-	    byte[] tmp = new byte[2048];
-	    while (read(tmp) > 0)
-	      ;
-            
-	    /* read will close this entry */
-	    return;
-	  }
-	csize -= inf.getTotalIn();
-	avail = inf.getRemaining();
+        if ((flags & 8) != 0)
+          {
+            /* We don't know how much we must skip, read until end. */
+            byte[] tmp = new byte[2048];
+            while (read(tmp) > 0)
+              ;
+
+            /* read will close this entry */
+            return;
+          }
+        csize -= inf.getTotalIn();
+        avail = inf.getRemaining();
       }
 
     if (avail > csize && csize >= 0)
       avail -= csize;
     else
       {
-	csize -= avail;
-	avail = 0;
-	while (csize != 0)
-	  {
-	    long skipped = in.skip(csize & 0xffffffffL);
-	    if (skipped <= 0)
-	      throw new ZipException("zip archive ends early.");
-	    csize -= skipped;
-	  }
+        csize -= avail;
+        avail = 0;
+        while (csize != 0)
+          {
+            long skipped = in.skip(csize & 0xffffffffL);
+            if (skipped <= 0)
+              throw new ZipException("zip archive ends early.");
+            csize -= skipped;
+          }
       }
 
     size = 0;
@@ -307,40 +307,40 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
     switch (method)
       {
       case ZipOutputStream.DEFLATED:
-	len = super.read(b, off, len);
-	if (len < 0)
-	  {
-	    if (!inf.finished())
-	      throw new ZipException("Inflater not finished!?");
-	    avail = inf.getRemaining();
-	    if ((flags & 8) != 0)
-	      readDataDescr();
+        len = super.read(b, off, len);
+        if (len < 0)
+          {
+            if (!inf.finished())
+              throw new ZipException("Inflater not finished!?");
+            avail = inf.getRemaining();
+            if ((flags & 8) != 0)
+              readDataDescr();
+
+            if (inf.getTotalIn() != csize
+                || inf.getTotalOut() != size)
+              throw new ZipException("size mismatch: "+csize+";"+size+" <-> "+inf.getTotalIn()+";"+inf.getTotalOut());
+            inf.reset();
+            finished = true;
+          }
+        break;
 
-	    if (inf.getTotalIn() != csize
-		|| inf.getTotalOut() != size)
-	      throw new ZipException("size mismatch: "+csize+";"+size+" <-> "+inf.getTotalIn()+";"+inf.getTotalOut());
-	    inf.reset();
-	    finished = true;
-	  }
-	break;
-	
       case ZipOutputStream.STORED:
 
-	if (len > csize && csize >= 0)
-	  len = csize;
-	
-	len = readBuf(b, off, len);
-	if (len > 0)
-	  {
-	    csize -= len;
-	    size -= len;
-	  }
+        if (len > csize && csize >= 0)
+          len = csize;
 
-	if (csize == 0)
-	  finished = true;
-	else if (len < 0)
-	  throw new ZipException("EOF in stored block");
-	break;
+        len = readBuf(b, off, len);
+        if (len > 0)
+          {
+            csize -= len;
+            size -= len;
+          }
+
+        if (csize == 0)
+          finished = true;
+        else if (len < 0)
+          throw new ZipException("EOF in stored block");
+        break;
       }
 
     if (len > 0)
@@ -348,11 +348,11 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
 
     if (finished)
       {
-	if ((crc.getValue() & 0xffffffffL) != entry.getCrc())
-	  throw new ZipException("CRC mismatch");
-	crc.reset();
-	entry = null;
-	entryAtEOF = true;
+        if ((crc.getValue() & 0xffffffffL) != entry.getCrc())
+          throw new ZipException("CRC mismatch");
+        crc.reset();
+        entry = null;
+        entryAtEOF = true;
       }
     return len;
   }
@@ -374,7 +374,7 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
    * to new ZipEntry(name).
    * @param name the name of the zip entry.
    */
-  protected ZipEntry createZipEntry(String name) 
+  protected ZipEntry createZipEntry(String name)
   {
     return new ZipEntry(name);
   }
diff --git a/libjava/classpath/java/util/zip/ZipOutputStream.java b/libjava/classpath/java/util/zip/ZipOutputStream.java
index d292f7d40e2..bc1c3e99c52 100644
--- a/libjava/classpath/java/util/zip/ZipOutputStream.java
+++ b/libjava/classpath/java/util/zip/ZipOutputStream.java
@@ -54,7 +54,7 @@ import java.util.Vector;
  *
  * This class is not thread safe.
  *
- * @author Jochen Hoenicke 
+ * @author Jochen Hoenicke
  */
 public class ZipOutputStream extends DeflaterOutputStream implements ZipConstants
 {
@@ -79,7 +79,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
    * Compression method.  This method doesn't compress at all.
    */
   public static final int STORED = 0;
-  
+
   /**
    * Compression method.  This method uses the Deflater.
    */
@@ -105,17 +105,17 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     byte[] commentBytes;
     try
       {
-	commentBytes = comment.getBytes("UTF-8");
+        commentBytes = comment.getBytes("UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-	throw new AssertionError(uee);
+        throw new AssertionError(uee);
       }
     if (commentBytes.length > 0xffff)
       throw new IllegalArgumentException("Comment too long.");
     zipComment = commentBytes;
   }
-  
+
   /**
    * Sets default compression method.  If the Zip entry specifies
    * another method its method takes precedence.
@@ -133,7 +133,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
   /**
    * Sets default compression level.  The new level will be activated
-   * immediately.  
+   * immediately.
    * @exception IllegalArgumentException if level is not supported.
    * @see Deflater
    */
@@ -141,11 +141,11 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
   {
     def.setLevel(level);
   }
-  
+
   /**
    * Write an unsigned short in little endian byte order.
    */
-  private void writeLeShort(int value) throws IOException 
+  private void writeLeShort(int value) throws IOException
   {
     out.write(value & 0xff);
     out.write((value >> 8) & 0xff);
@@ -154,7 +154,7 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
   /**
    * Write an int in little endian byte order.
    */
-  private void writeLeInt(int value) throws IOException 
+  private void writeLeInt(int value) throws IOException
   {
     writeLeShort(value);
     writeLeShort(value >> 16);
@@ -192,27 +192,27 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
     if (method == STORED)
       {
-	if (entry.getCompressedSize() >= 0)
-	  {
-	    if (entry.getSize() < 0)
-	      entry.setSize(entry.getCompressedSize());
-	    else if (entry.getSize() != entry.getCompressedSize())
-	      throw new ZipException
-		("Method STORED, but compressed size != size");
-	  }
-	else
-	  entry.setCompressedSize(entry.getSize());
+        if (entry.getCompressedSize() >= 0)
+          {
+            if (entry.getSize() < 0)
+              entry.setSize(entry.getCompressedSize());
+            else if (entry.getSize() != entry.getCompressedSize())
+              throw new ZipException
+                ("Method STORED, but compressed size != size");
+          }
+        else
+          entry.setCompressedSize(entry.getSize());
 
-	if (entry.getSize() < 0)
-	  throw new ZipException("Method STORED, but size not set");
-	if (entry.getCrc() < 0)
-	  throw new ZipException("Method STORED, but crc not set");
+        if (entry.getSize() < 0)
+          throw new ZipException("Method STORED, but size not set");
+        if (entry.getCrc() < 0)
+          throw new ZipException("Method STORED, but crc not set");
       }
     else if (method == DEFLATED)
       {
-	if (entry.getCompressedSize() < 0
-	    || entry.getSize() < 0 || entry.getCrc() < 0)
-	  flags |= 8;
+        if (entry.getCompressedSize() < 0
+            || entry.getSize() < 0 || entry.getCrc() < 0)
+          flags |= 8;
       }
 
     if (curEntry != null)
@@ -228,30 +228,30 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     /* Write the local file header */
     writeLeInt(LOCSIG);
     writeLeShort(method == STORED
-		 ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+                 ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
     writeLeShort(flags);
     writeLeShort(method);
     writeLeInt(entry.getDOSTime());
     if ((flags & 8) == 0)
       {
-	writeLeInt((int)entry.getCrc());
-	writeLeInt((int)entry.getCompressedSize());
-	writeLeInt((int)entry.getSize());
+        writeLeInt((int)entry.getCrc());
+        writeLeInt((int)entry.getCompressedSize());
+        writeLeInt((int)entry.getSize());
       }
     else
       {
-	writeLeInt(0);
-	writeLeInt(0);
-	writeLeInt(0);
+        writeLeInt(0);
+        writeLeInt(0);
+        writeLeInt(0);
       }
     byte[] name;
     try
       {
-	name = entry.getName().getBytes("UTF-8");
+        name = entry.getName().getBytes("UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-	throw new AssertionError(uee);
+        throw new AssertionError(uee);
       }
     if (name.length > 0xffff)
       throw new ZipException("Name too long.");
@@ -294,31 +294,31 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
       curEntry.setSize(size);
     else if (curEntry.getSize() != size)
       throw new ZipException("size was "+size
-			     +", but I expected "+curEntry.getSize());
+                             +", but I expected "+curEntry.getSize());
 
     if (curEntry.getCompressedSize() < 0)
       curEntry.setCompressedSize(csize);
     else if (curEntry.getCompressedSize() != csize)
       throw new ZipException("compressed size was "+csize
-			     +", but I expected "+curEntry.getSize());
+                             +", but I expected "+curEntry.getSize());
 
     if (curEntry.getCrc() < 0)
       curEntry.setCrc(crc.getValue());
     else if (curEntry.getCrc() != crc.getValue())
       throw new ZipException("crc was " + Long.toHexString(crc.getValue())
-			     + ", but I expected " 
-			     + Long.toHexString(curEntry.getCrc()));
+                             + ", but I expected "
+                             + Long.toHexString(curEntry.getCrc()));
 
     offset += csize;
 
     /* Now write the data descriptor entry if needed. */
     if (curMethod == DEFLATED && (curEntry.flags & 8) != 0)
       {
-	writeLeInt(EXTSIG);
-	writeLeInt((int)curEntry.getCrc());
-	writeLeInt((int)curEntry.getCompressedSize());
-	writeLeInt((int)curEntry.getSize());
-	offset += EXTHDR;
+        writeLeInt(EXTSIG);
+        writeLeInt((int)curEntry.getCrc());
+        writeLeInt((int)curEntry.getCompressedSize());
+        writeLeInt((int)curEntry.getSize());
+        offset += EXTHDR;
       }
 
     entries.addElement(curEntry);
@@ -338,12 +338,12 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
     switch (curMethod)
       {
       case DEFLATED:
-	super.write(b, off, len);
-	break;
-	
+        super.write(b, off, len);
+        break;
+
       case STORED:
-	out.write(b, off, len);
-	break;
+        out.write(b, off, len);
+        break;
       }
 
     crc.update(b, off, len);
@@ -364,65 +364,65 @@ public class ZipOutputStream extends DeflaterOutputStream implements ZipConstant
 
     int numEntries = 0;
     int sizeEntries = 0;
-    
+
     Enumeration e = entries.elements();
     while (e.hasMoreElements())
       {
-	ZipEntry entry = (ZipEntry) e.nextElement();
-	
-	int method = entry.getMethod();
-	writeLeInt(CENSIG);
-	writeLeShort(method == STORED
-		     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
-	writeLeShort(method == STORED
-		     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
-	writeLeShort(entry.flags);
-	writeLeShort(method);
-	writeLeInt(entry.getDOSTime());
-	writeLeInt((int)entry.getCrc());
-	writeLeInt((int)entry.getCompressedSize());
-	writeLeInt((int)entry.getSize());
+        ZipEntry entry = (ZipEntry) e.nextElement();
 
-	byte[] name;
-	try
-	  {
-	    name = entry.getName().getBytes("UTF-8");
-	  }
-	catch (UnsupportedEncodingException uee)
-	  {
-	    throw new AssertionError(uee);
-	  }
-	if (name.length > 0xffff)
-	  throw new ZipException("Name too long.");
-	byte[] extra = entry.getExtra();
-	if (extra == null)
-	  extra = new byte[0];
-	String str = entry.getComment();
-	byte[] comment;
-	try
-	  {
-	    comment = str != null ? str.getBytes("UTF-8") : new byte[0];
-	  }
-	catch (UnsupportedEncodingException uee)
-	  {
-	    throw new AssertionError(uee);
-	  }
-	if (comment.length > 0xffff)
-	  throw new ZipException("Comment too long.");
+        int method = entry.getMethod();
+        writeLeInt(CENSIG);
+        writeLeShort(method == STORED
+                     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+        writeLeShort(method == STORED
+                     ? ZIP_STORED_VERSION : ZIP_DEFLATED_VERSION);
+        writeLeShort(entry.flags);
+        writeLeShort(method);
+        writeLeInt(entry.getDOSTime());
+        writeLeInt((int)entry.getCrc());
+        writeLeInt((int)entry.getCompressedSize());
+        writeLeInt((int)entry.getSize());
 
-	writeLeShort(name.length);
-	writeLeShort(extra.length);
-	writeLeShort(comment.length);
-	writeLeShort(0); /* disk number */
-	writeLeShort(0); /* internal file attr */
-	writeLeInt(0);   /* external file attr */
-	writeLeInt(entry.offset);
+        byte[] name;
+        try
+          {
+            name = entry.getName().getBytes("UTF-8");
+          }
+        catch (UnsupportedEncodingException uee)
+          {
+            throw new AssertionError(uee);
+          }
+        if (name.length > 0xffff)
+          throw new ZipException("Name too long.");
+        byte[] extra = entry.getExtra();
+        if (extra == null)
+          extra = new byte[0];
+        String str = entry.getComment();
+        byte[] comment;
+        try
+          {
+            comment = str != null ? str.getBytes("UTF-8") : new byte[0];
+          }
+        catch (UnsupportedEncodingException uee)
+          {
+            throw new AssertionError(uee);
+          }
+        if (comment.length > 0xffff)
+          throw new ZipException("Comment too long.");
 
-	out.write(name);
-	out.write(extra);
-	out.write(comment);
-	numEntries++;
-	sizeEntries += CENHDR + name.length + extra.length + comment.length;
+        writeLeShort(name.length);
+        writeLeShort(extra.length);
+        writeLeShort(comment.length);
+        writeLeShort(0); /* disk number */
+        writeLeShort(0); /* internal file attr */
+        writeLeInt(0);   /* external file attr */
+        writeLeInt(entry.offset);
+
+        out.write(name);
+        out.write(extra);
+        out.write(comment);
+        numEntries++;
+        sizeEntries += CENHDR + name.length + extra.length + comment.length;
       }
 
     writeLeInt(ENDSIG);
diff --git a/libjava/classpath/javax/accessibility/AccessibleExtendedText.java b/libjava/classpath/javax/accessibility/AccessibleExtendedText.java
index f40fa0fd2dc..026cd3a7d8a 100644
--- a/libjava/classpath/javax/accessibility/AccessibleExtendedText.java
+++ b/libjava/classpath/javax/accessibility/AccessibleExtendedText.java
@@ -56,7 +56,7 @@ public interface AccessibleExtendedText
 
   /**
    * This constant indicates that the retrieved text should consist
-   * of a run with identical attributes. 
+   * of a run with identical attributes.
    */
   int ATTRIBUTE_RUN = 5;
 
@@ -81,7 +81,7 @@ public interface AccessibleExtendedText
    * parameter describes the type of sequence to return; it is one
    * of the constants from {@link AccessibleText} or from this
    * class.
-   * @param part the type of the sequence to return 
+   * @param part the type of the sequence to return
    * @param index start of the sequence
    */
   AccessibleTextSequence getTextSequenceAfter(int part, int index);
@@ -91,7 +91,7 @@ public interface AccessibleExtendedText
    * parameter describes the type of sequence to return; it is one
    * of the constants from {@link AccessibleText} or from this
    * class.
-   * @param part the type of the sequence to return 
+   * @param part the type of the sequence to return
    * @param index start of the sequence
    */
   AccessibleTextSequence getTextSequenceAt(int part, int index);
@@ -101,7 +101,7 @@ public interface AccessibleExtendedText
    * parameter describes the type of sequence to return; it is one
    * of the constants from {@link AccessibleText} or from this
    * class.
-   * @param part the type of the sequence to return 
+   * @param part the type of the sequence to return
    * @param index end of the sequence
    */
   AccessibleTextSequence getTextSequenceBefore(int part, int index);
diff --git a/libjava/classpath/javax/accessibility/AccessibleRelation.java b/libjava/classpath/javax/accessibility/AccessibleRelation.java
index 3d515fd5765..9e1b0da371a 100644
--- a/libjava/classpath/javax/accessibility/AccessibleRelation.java
+++ b/libjava/classpath/javax/accessibility/AccessibleRelation.java
@@ -45,7 +45,7 @@ import java.util.Locale;
  * summarizes all relations of the object. This strongly typed "enumeration"
  * supports localized strings. If the constants of this class are not
  * adequate, new ones may be added in a similar matter.
- * 
+ *
  * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.2
  * @status updated to 1.4
@@ -210,7 +210,7 @@ public class AccessibleRelation extends AccessibleBundle
 
   /** An empty set of targets. */
   private static final Object[] EMPTY_TARGETS = { };
-  
+
   static
     {
       // not constants in JDK
diff --git a/libjava/classpath/javax/accessibility/AccessibleRole.java b/libjava/classpath/javax/accessibility/AccessibleRole.java
index c568b4fe93b..ff51dd4496a 100644
--- a/libjava/classpath/javax/accessibility/AccessibleRole.java
+++ b/libjava/classpath/javax/accessibility/AccessibleRole.java
@@ -44,7 +44,7 @@ import java.util.Locale;
  * "table". This strongly typed "enumeration" supports localized strings. If
  * the constants of this class are not adequate, new ones may be added in a
  * similar matter, while avoiding a public constructor.
- * 
+ *
  * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.2
  * @status updated to 1.4
diff --git a/libjava/classpath/javax/accessibility/AccessibleState.java b/libjava/classpath/javax/accessibility/AccessibleState.java
index e4d00bd70b8..2d5106f36d2 100644
--- a/libjava/classpath/javax/accessibility/AccessibleState.java
+++ b/libjava/classpath/javax/accessibility/AccessibleState.java
@@ -46,7 +46,7 @@ import java.util.Locale;
  * be "active" or "selected". This strongly typed "enumeration" supports
  * localized strings. If the constants of this class are not adequate, new
  * ones may be added in a similar matter, while avoiding a public constructor.
- * 
+ *
  * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.2
  * @status updated to 1.4
diff --git a/libjava/classpath/javax/activation/ActivationDataFlavor.java b/libjava/classpath/javax/activation/ActivationDataFlavor.java
index 07ba1a38363..91812092ee9 100644
--- a/libjava/classpath/javax/activation/ActivationDataFlavor.java
+++ b/libjava/classpath/javax/activation/ActivationDataFlavor.java
@@ -125,7 +125,7 @@ public class ActivationDataFlavor extends DataFlavor
     {
         this.humanPresentableName = humanPresentableName;
     }
-    
+
     public boolean equals(DataFlavor dataFlavor)
     {
         return (isMimeTypeEqual(dataFlavor) &&
diff --git a/libjava/classpath/javax/activation/CommandInfo.java b/libjava/classpath/javax/activation/CommandInfo.java
index d420c6ee106..c0b81e62ca6 100644
--- a/libjava/classpath/javax/activation/CommandInfo.java
+++ b/libjava/classpath/javax/activation/CommandInfo.java
@@ -54,7 +54,7 @@ public class CommandInfo
 
   private final String verb;
   private final String className;
-  
+
   /**
    * Constructor.
    * @param verb the command verb
@@ -65,7 +65,7 @@ public class CommandInfo
     this.verb = verb;
     this.className = className;
   }
-  
+
   /**
    * Returns the command verb.
    */
@@ -73,7 +73,7 @@ public class CommandInfo
   {
     return verb;
   }
-  
+
   /**
    * Returns the command class name.
    */
@@ -81,7 +81,7 @@ public class CommandInfo
   {
     return className;
   }
-  
+
   /**
    * Returns the instantiated bean.
    * If the bean implements CommandObject, its
@@ -112,6 +112,5 @@ public class CommandInfo
       }
     return object;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/CommandMap.java b/libjava/classpath/javax/activation/CommandMap.java
index fd749612a30..dbe80a9520e 100644
--- a/libjava/classpath/javax/activation/CommandMap.java
+++ b/libjava/classpath/javax/activation/CommandMap.java
@@ -39,7 +39,7 @@ package javax.activation;
 
 /**
  * Registry of command objects available to the system.
- * 
+ *
  * @author Chris Burdess
  * @version 1.1
  */
@@ -47,9 +47,9 @@ public abstract class CommandMap
 {
 
   /* Class scope */
-  
+
   private static CommandMap defaultCommandMap;
-  
+
   /**
    * Returns the default command map.
    * This returns a MailcapCommandMap if no value has been set using
@@ -63,7 +63,7 @@ public abstract class CommandMap
       }
     return defaultCommandMap;
   }
-  
+
   /**
    * Sets the default command map.
    * @param commandMap the new default command map
@@ -90,19 +90,19 @@ public abstract class CommandMap
   }
 
   /* Instance scope */
-  
+
   /**
    * Returns the list of preferred commands for a MIME type.
    * @param mimeType the MIME type
    */
   public abstract CommandInfo[] getPreferredCommands(String mimeType);
-  
+
   /**
    * Returns the complete list of commands for a MIME type.
    * @param mimeType the MIME type
    */
   public abstract CommandInfo[] getAllCommands(String mimeType);
-  
+
   /**
    * Returns the command corresponding to the specified MIME type and
    * command name.
@@ -110,13 +110,13 @@ public abstract class CommandMap
    * @param cmdName the command name
    */
   public abstract CommandInfo getCommand(String mimeType, String cmdName);
-  
+
   /**
    * Returns a DataContentHandler corresponding to the MIME type.
    * @param mimeType the MIME type
    */
   public abstract DataContentHandler createDataContentHandler(String mimeType);
-  
+
   /**
    * Get all the MIME types known to this command map.
    * If the command map doesn't support this operation, null is returned.
@@ -127,7 +127,7 @@ public abstract class CommandMap
   {
     return null;
   }
-  
+
   /**
    * Get the preferred command list from a MIME Type. The actual semantics
    * are determined by the implementation of the CommandMap.
@@ -147,7 +147,7 @@ public abstract class CommandMap
   {
     return getPreferredCommands(mimeType);
   }
-  
+
   /**
    * Get all the available commands for this type. This method
    * should return all the possible commands for this MIME type.
@@ -166,7 +166,7 @@ public abstract class CommandMap
   {
     return getAllCommands(mimeType);
   }
-  
+
   /**
    * Get the default command corresponding to the MIME type.
    * 
                  
@@ -186,7 +186,7 @@ public abstract class CommandMap
   {
     return getCommand(mimeType, cmdName);
   }
-  
+
   /**
    * Locate a DataContentHandler that corresponds to the MIME type.
    * The mechanism and semantics for determining this are determined
@@ -206,7 +206,6 @@ public abstract class CommandMap
                                                      DataSource ds)
   {
     return createDataContentHandler(mimeType);
-  }  
+  }
 
 }
-
diff --git a/libjava/classpath/javax/activation/CommandObject.java b/libjava/classpath/javax/activation/CommandObject.java
index 594622dae9a..f89a976c75f 100644
--- a/libjava/classpath/javax/activation/CommandObject.java
+++ b/libjava/classpath/javax/activation/CommandObject.java
@@ -57,6 +57,5 @@ public interface CommandObject
    */
   void setCommandContext(String verb, DataHandler dh)
     throws IOException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/DataContentHandler.java b/libjava/classpath/javax/activation/DataContentHandler.java
index f9507398b5a..be919c231d7 100644
--- a/libjava/classpath/javax/activation/DataContentHandler.java
+++ b/libjava/classpath/javax/activation/DataContentHandler.java
@@ -56,7 +56,7 @@ public interface DataContentHandler
    * by preference.
    */
   DataFlavor[] getTransferDataFlavors();
-  
+
   /**
    * Returns an object representing the data to be transferred.
    * @param df the flavor representing the requested type
@@ -64,14 +64,14 @@ public interface DataContentHandler
    */
   Object getTransferData(DataFlavor df, DataSource ds)
     throws UnsupportedFlavorException, IOException;
-  
+
   /**
    * Returns an object representing the data in its most preferred form.
    * @param ds the data source of the data to be converted
    */
   Object getContent(DataSource ds)
     throws IOException;
-  
+
   /**
    * Writes the object as a stream of bytes.
    * @param obj the object to convert
@@ -80,6 +80,5 @@ public interface DataContentHandler
    */
   void writeTo(Object obj, String mimeType, OutputStream os)
     throws IOException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/DataContentHandlerFactory.java b/libjava/classpath/javax/activation/DataContentHandlerFactory.java
index c1f2b78dd16..815c1a9a462 100644
--- a/libjava/classpath/javax/activation/DataContentHandlerFactory.java
+++ b/libjava/classpath/javax/activation/DataContentHandlerFactory.java
@@ -51,6 +51,5 @@ public interface DataContentHandlerFactory
    * @param mimeType the MIME type
    */
   DataContentHandler createDataContentHandler(String mimeType);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/DataHandler.java b/libjava/classpath/javax/activation/DataHandler.java
index de786f96847..63ad0c4182a 100644
--- a/libjava/classpath/javax/activation/DataHandler.java
+++ b/libjava/classpath/javax/activation/DataHandler.java
@@ -59,7 +59,7 @@ public class DataHandler
 
   private static final DataFlavor[] NO_FLAVORS = new DataFlavor[0];
   private static DataContentHandlerFactory factory = null;
-  
+
   private final DataSource dataSource;
   private DataSource objDataSource;
   private Object object;
@@ -70,7 +70,7 @@ public class DataHandler
   private DataContentHandler factoryDCH;
   private DataContentHandlerFactory oldFactory;
   private String shortType;
-  
+
   /**
    * Constructor in which the data is read from a data source.
    * @param ds the data source
@@ -80,7 +80,7 @@ public class DataHandler
     dataSource = ds;
     oldFactory = factory;
   }
-  
+
   /**
    * Constructor using a reified object representation.
    * @param obj the object representation of the data
@@ -93,7 +93,7 @@ public class DataHandler
     objectMimeType = mimeType;
     oldFactory = factory;
   }
-  
+
   /**
    * Constructor in which the data is read from a URL.
    * @param url the URL
@@ -103,7 +103,7 @@ public class DataHandler
     dataSource = new URLDataSource(url);
     oldFactory = factory;
   }
-  
+
   /**
    * Returns the data source from which data is read.
    */
@@ -119,7 +119,7 @@ public class DataHandler
       }
     return objDataSource;
   }
-  
+
   /**
    * Returns the name of the data object if created with a DataSource.
    */
@@ -131,7 +131,7 @@ public class DataHandler
       }
     return null;
   }
-  
+
   /**
    * Returns the MIME type of the data (with parameters).
    */
@@ -143,7 +143,7 @@ public class DataHandler
       }
     return objectMimeType;
   }
-  
+
   /**
    * Returns an input stream from which the data can be read.
    */
@@ -174,16 +174,16 @@ public class DataHandler
     thread.start();
     return new PipedInputStream(pos);
   }
-  
+
   static class DataContentHandlerWriter
     implements Runnable
   {
-    
+
     DataContentHandler dch;
     Object object;
     String mimeType;
     OutputStream out;
-    
+
     DataContentHandlerWriter(DataContentHandler dch, Object object,
                              String mimeType, OutputStream out)
     {
@@ -192,7 +192,7 @@ public class DataHandler
       this.mimeType = mimeType;
       this.out = out;
     }
-    
+
     public void run()
     {
       try
@@ -214,7 +214,7 @@ public class DataHandler
         }
     }
   }
-  
+
   /**
    * Writes the data as a byte stream.
    * @param os the stream to write to
@@ -238,7 +238,7 @@ public class DataHandler
         dch.writeTo(object, objectMimeType, os);
       }
   }
-  
+
   /**
    * Returns an output stream that can be used to overwrite the underlying
    * data, if the DataSource constructor was used.
@@ -252,7 +252,7 @@ public class DataHandler
       }
     return null;
   }
-  
+
   /**
    * Returns the data flavors in which this data is available.
    */
@@ -265,7 +265,7 @@ public class DataHandler
       }
     return transferFlavors;
   }
-  
+
   /**
    * Indicates whether the specified data flavor is supported for this
    * data.
@@ -282,7 +282,7 @@ public class DataHandler
       }
     return false;
   }
-  
+
   /**
    * Returns an object representing the data to be transferred.
    * @param flavor the requested data flavor
@@ -293,7 +293,7 @@ public class DataHandler
     DataContentHandler dch = getDataContentHandler();
     return dch.getTransferData(flavor, dataSource);
   }
-  
+
   /**
    * Sets the command map to be used by this data handler.
    * Setting to null uses the default command map.
@@ -308,7 +308,7 @@ public class DataHandler
         currentCommandMap = commandMap;
       }
   }
-  
+
   /**
    * Returns the preferred commands for this type of data.
    */
@@ -336,7 +336,7 @@ public class DataHandler
     CommandMap commandMap = getCommandMap();
     return commandMap.getCommand(getShortType(), cmdName);
   }
-  
+
   /**
    * Returns the data as a reified object.
    */
@@ -346,7 +346,7 @@ public class DataHandler
     DataContentHandler dch = getDataContentHandler();
     return dch.getContent(getDataSource());
   }
-  
+
   /**
    * Returns the instantiated bean using the specified command.
    * @param cmdInfo the command to instantiate the bean with
@@ -399,7 +399,7 @@ public class DataHandler
       }
     factory = newFactory;
   }
-  
+
   /*
    * Returns just the base part of the data's content-type, with no
    * parameters.
@@ -421,7 +421,7 @@ public class DataHandler
       }
     return shortType;
   }
-  
+
   /*
    * Returns the command map for this handler.
    */
@@ -433,7 +433,7 @@ public class DataHandler
       }
     return CommandMap.getDefaultCommandMap();
   }
-  
+
   /*
    * Returns the DCH for this handler.
    */
@@ -477,6 +477,5 @@ public class DataHandler
       }
     return dataContentHandler;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/DataHandlerDataSource.java b/libjava/classpath/javax/activation/DataHandlerDataSource.java
index 8dcd1a7a086..9781b395094 100644
--- a/libjava/classpath/javax/activation/DataHandlerDataSource.java
+++ b/libjava/classpath/javax/activation/DataHandlerDataSource.java
@@ -52,28 +52,28 @@ final class DataHandlerDataSource
 {
 
   final DataHandler dh;
-  
+
   DataHandlerDataSource(DataHandler dh)
   {
     this.dh = dh;
   }
-  
+
   public String getContentType()
   {
     return dh.getContentType();
   }
-  
+
   public InputStream getInputStream()
     throws IOException
   {
     return dh.getInputStream();
   }
-  
+
   public String getName()
   {
     return dh.getName();
   }
-  
+
   public OutputStream getOutputStream()
     throws IOException
   {
@@ -81,4 +81,3 @@ final class DataHandlerDataSource
   }
 
 }
-
diff --git a/libjava/classpath/javax/activation/DataSource.java b/libjava/classpath/javax/activation/DataSource.java
index 0d70843677a..c4da9d3af01 100644
--- a/libjava/classpath/javax/activation/DataSource.java
+++ b/libjava/classpath/javax/activation/DataSource.java
@@ -49,28 +49,27 @@ import java.io.OutputStream;
  */
 public interface DataSource
 {
-  
+
   /**
    * Returns an input stream from which the data can be read.
    */
   InputStream getInputStream()
     throws IOException;
-  
+
   /**
    * Returns an output stream to which the data can be written.
    */
   OutputStream getOutputStream()
     throws IOException;
-  
+
   /**
    * Returns the MIME content type of the data.
    */
   String getContentType();
-  
+
   /**
    * Returns the underlying name of this object.
    */
   String getName();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/DataSourceDataContentHandler.java b/libjava/classpath/javax/activation/DataSourceDataContentHandler.java
index 9706ac19a16..8b16fd15040 100644
--- a/libjava/classpath/javax/activation/DataSourceDataContentHandler.java
+++ b/libjava/classpath/javax/activation/DataSourceDataContentHandler.java
@@ -55,13 +55,13 @@ class DataSourceDataContentHandler
   private DataSource ds;
   private DataFlavor[] flavors;
   private DataContentHandler dch;
-  
+
   public DataSourceDataContentHandler(DataContentHandler dch, DataSource ds)
   {
     this.ds = ds;
     this.dch = dch;
   }
-  
+
   public Object getContent(DataSource ds)
     throws IOException
   {
@@ -74,7 +74,7 @@ class DataSourceDataContentHandler
         return ds.getInputStream();
       }
   }
-  
+
   public Object getTransferData(DataFlavor flavor, DataSource ds)
     throws UnsupportedFlavorException, IOException
   {
@@ -92,7 +92,7 @@ class DataSourceDataContentHandler
         throw new UnsupportedFlavorException(flavor);
       }
   }
-  
+
   public DataFlavor[] getTransferDataFlavors()
   {
     if (flavors == null)
@@ -121,6 +121,5 @@ class DataSourceDataContentHandler
       }
     dch.writeTo(obj, mimeType, out);
   }
-    
-}
 
+}
diff --git a/libjava/classpath/javax/activation/FileDataSource.java b/libjava/classpath/javax/activation/FileDataSource.java
index 6e9035f1361..72ef066d9ed 100644
--- a/libjava/classpath/javax/activation/FileDataSource.java
+++ b/libjava/classpath/javax/activation/FileDataSource.java
@@ -56,7 +56,7 @@ public class FileDataSource
 
   private final File file;
   private FileTypeMap typeMap;
-  
+
   /**
    * Constructor.
    * @param file the underlying file to use
@@ -65,7 +65,7 @@ public class FileDataSource
   {
     this.file = file;
   }
-  
+
   /**
    * Constructor.
    * @param name the path to the underlying file to use
@@ -74,7 +74,7 @@ public class FileDataSource
   {
     this(new File(name));
   }
-  
+
   public InputStream getInputStream()
     throws IOException
   {
@@ -86,7 +86,7 @@ public class FileDataSource
   {
     return new FileOutputStream(file);
   }
-  
+
   public String getContentType()
   {
     if (typeMap == null)
@@ -96,12 +96,12 @@ public class FileDataSource
       }
     return typeMap.getContentType(file);
   }
-  
+
   public String getName()
   {
     return file.getName();
   }
-  
+
   /**
    * Returns the underlying file.
    */
@@ -118,6 +118,5 @@ public class FileDataSource
   {
     typeMap = map;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/FileTypeMap.java b/libjava/classpath/javax/activation/FileTypeMap.java
index 2ef7805bf49..bbd088c1c3a 100644
--- a/libjava/classpath/javax/activation/FileTypeMap.java
+++ b/libjava/classpath/javax/activation/FileTypeMap.java
@@ -49,9 +49,9 @@ public abstract class FileTypeMap
 {
 
   /* Class scope */
-  
+
   private static FileTypeMap defaultMap;
-  
+
   /**
    * Returns the system default file type map.
    * If one has not been set, this returns a MimetypesFileTypeMap.
@@ -64,7 +64,7 @@ public abstract class FileTypeMap
       }
     return defaultMap;
   }
-  
+
   /**
    * Sets the default file type map.
    * @param map the new file type map
@@ -91,13 +91,13 @@ public abstract class FileTypeMap
   }
 
   /* Instance scope */
-  
+
   /**
    * Returns the content type of the specified file.
    * @param file the file to classify
    */
   public abstract String getContentType(File file);
-  
+
   /**
    * Returns the content type of the specified file path.
    * @param filename the path of the file to classify
@@ -105,4 +105,3 @@ public abstract class FileTypeMap
   public abstract String getContentType(String filename);
 
 }
-
diff --git a/libjava/classpath/javax/activation/MailcapCommandMap.java b/libjava/classpath/javax/activation/MailcapCommandMap.java
index cca5f04aafe..48b1bbb0808 100644
--- a/libjava/classpath/javax/activation/MailcapCommandMap.java
+++ b/libjava/classpath/javax/activation/MailcapCommandMap.java
@@ -82,8 +82,8 @@ public class MailcapCommandMap
   private static boolean debug = false;
   private static final int NORMAL = 0;
   private static final int FALLBACK = 1;
-  
-  static 
+
+  static
   {
     try
       {
@@ -94,9 +94,9 @@ public class MailcapCommandMap
       {
       }
   }
-  
+
   private Map>>[][] mailcaps;
-  
+
   /**
    * Default constructor.
    */
@@ -104,7 +104,7 @@ public class MailcapCommandMap
   {
     init(null);
   }
-  
+
   /**
    * Constructor specifying a filename.
    * @param fileName the name of the file to read mailcap entries from
@@ -132,7 +132,7 @@ public class MailcapCommandMap
           }
       }
   }
-  
+
   /**
    * Constructor specifying an input stream.
    * @param is the input stream to read mailcap entries from
@@ -150,7 +150,7 @@ public class MailcapCommandMap
         for (int j = 0; j < 2; j++)
           {
             mailcaps[i][j] =
-	      new LinkedHashMap>>();
+              new LinkedHashMap>>();
           }
       }
     if (in != null)
@@ -167,7 +167,7 @@ public class MailcapCommandMap
           {
           }
       }
-    
+
     if (debug)
       {
         System.out.println("MailcapCommandMap: load HOME");
@@ -186,17 +186,17 @@ public class MailcapCommandMap
     catch (SecurityException e)
       {
       }
-    
+
     if (debug)
       {
         System.out.println("MailcapCommandMap: load SYS");
       }
     try
       {
-        parseFile(SYS, 
+        parseFile(SYS,
                   new CPStringBuilder(System.getProperty("java.home"))
-                  .append(File.separatorChar)                                                     
-		  .append("lib")
+                  .append(File.separatorChar)
+                  .append("lib")
                   .append(File.separatorChar)
                   .append("mailcap")
                   .toString());
@@ -204,7 +204,7 @@ public class MailcapCommandMap
     catch (SecurityException e)
       {
       }
-    
+
     if (debug)
       {
         System.out.println("MailcapCommandMap: load JAR");
@@ -253,14 +253,14 @@ public class MailcapCommandMap
       {
         parseResource(JAR, "/META-INF/mailcap");
       }
-    
+
     if (debug)
       {
         System.out.println("MailcapCommandMap: load DEF");
       }
     parseResource(DEF, "/META-INF/mailcap.default");
   }
-  
+
   /**
    * Returns the list of preferred commands for a given MIME type.
    * @param mimeType the MIME type
@@ -295,7 +295,7 @@ public class MailcapCommandMap
     cmdList.toArray(cmds);
     return cmds;
   }
-  
+
   /**
    * Returns all commands for the given MIME type.
    * @param mimeType the MIME type
@@ -343,7 +343,7 @@ public class MailcapCommandMap
         for (int j = 0; j < 5; j++)
           {
             Map> map =
-	      getCommands(mailcaps[j][i], mimeType);
+              getCommands(mailcaps[j][i], mimeType);
             if (map != null)
               {
                 List classNames = map.get(cmdName);
@@ -449,7 +449,7 @@ public class MailcapCommandMap
       }
     return null;
   }
-    
+
   /**
    * Get the native commands for the given MIME type.
    * Returns an array of strings where each string is
@@ -479,8 +479,8 @@ public class MailcapCommandMap
   }
 
   private void addNativeCommands(List acc,
-				 Map>> mailcap,
-				 String mimeType)
+                                 Map>> mailcap,
+                                 String mimeType)
   {
     for (Map.Entry>> mEntry : mailcap.entrySet())
       {
@@ -522,7 +522,7 @@ public class MailcapCommandMap
           }
       }
   }
-  
+
   private static String nameOf(int mailcap)
   {
     switch (mailcap)
@@ -539,7 +539,7 @@ public class MailcapCommandMap
         return "DEF";
       default:
         return "ERR";
-      }   
+      }
   }
 
   private void parseFile(int index, String filename)
@@ -576,7 +576,7 @@ public class MailcapCommandMap
           }
       }
   }
-  
+
   private void parseResource(int index, String name)
   {
     Reader in = null;
@@ -615,7 +615,7 @@ public class MailcapCommandMap
           }
       }
   }
-  
+
   private void parse(int index, Reader in)
     throws IOException
   {
@@ -649,7 +649,7 @@ public class MailcapCommandMap
           }
       }
   }
-  
+
   private void parseEntry(int index, String line)
   {
     // Tokenize entry into fields
@@ -691,7 +691,7 @@ public class MailcapCommandMap
         fallback = true;
       }
     fields.add(field);
-    
+
     len = fields.size();
     if (len < 2)
       {
@@ -701,7 +701,7 @@ public class MailcapCommandMap
           }
         return;
       }
-    
+
     Map>> mailcap =
       fallback ? mailcaps[index][FALLBACK] : mailcaps[index][NORMAL];
     String mimeType = fields.get(0);
@@ -711,9 +711,9 @@ public class MailcapCommandMap
         addField(mailcap, mimeType, null, (String) fields.get(i));
       }
   }
-    
+
   private void addField(Map>> mailcap,
-			String mimeType, String verb, String command)
+                        String mimeType, String verb, String command)
   {
     if (verb == null)
       {
@@ -728,7 +728,7 @@ public class MailcapCommandMap
       {
         return; // Invalid field or flag
       }
-      
+
     Map> commands = mailcap.get(mimeType);
     if (commands == null)
       {
@@ -743,10 +743,10 @@ public class MailcapCommandMap
       }
     classNames.add(command);
   }
-  
+
   private Map>
     getCommands(Map>> mailcap,
-		String mimeType)
+                String mimeType)
   {
     int si = mimeType.indexOf('/');
     String genericMimeType = new CPStringBuilder(mimeType.substring(0, si))
@@ -782,7 +782,7 @@ public class MailcapCommandMap
   }
 
   // -- Utility methods --
-  
+
   private List getSystemResources(String name)
   {
     List acc = new ArrayList();
@@ -799,6 +799,5 @@ public class MailcapCommandMap
       }
     return acc;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/MimeType.java b/libjava/classpath/javax/activation/MimeType.java
index 70045d6686b..bc3afc18e3b 100644
--- a/libjava/classpath/javax/activation/MimeType.java
+++ b/libjava/classpath/javax/activation/MimeType.java
@@ -53,13 +53,13 @@ import java.io.ObjectOutput;
 public class MimeType
   implements Externalizable
 {
-    
+
   static final String TSPECIALS = "()<>@,;:/[]?=\\\"";
-  
+
   private String primaryType;
   private String subType;
   private MimeTypeParameterList parameters;
-  
+
   /**
    * Constructor for an application/* content type.
    */
@@ -69,7 +69,7 @@ public class MimeType
     subType = "*";
     parameters = new MimeTypeParameterList();
   }
-  
+
   /**
    * Constructor that parses a raw String.
    * @param rawdata the MIME type string
@@ -79,7 +79,7 @@ public class MimeType
   {
     parse(rawdata);
   }
-  
+
   /**
    * Constructor for a new MIME type with the given primary and sub types
    * and an empty parameter list.
@@ -103,7 +103,7 @@ public class MimeType
   {
     return primaryType;
   }
-  
+
   /**
    * Sets the primary type.
    * @param primary the new primary type
@@ -114,7 +114,7 @@ public class MimeType
     checkValidity(primary, "Primary type is invalid");
     primaryType = primary.toLowerCase();
   }
-  
+
   /**
    * Returns the subtype.
    */
@@ -122,7 +122,7 @@ public class MimeType
   {
     return subType;
   }
-  
+
   /**
    * Sets the subtype.
    * @param sub the new subtype
@@ -133,7 +133,7 @@ public class MimeType
     checkValidity(sub, "Sub type is invalid");
     subType = sub.toLowerCase();
   }
-  
+
   /**
    * Returns the MIME parameters.
    */
@@ -141,7 +141,7 @@ public class MimeType
   {
     return parameters;
   }
-  
+
   /**
    * Returns the parameter value for the specified name.
    * @param name the parameter name
@@ -150,7 +150,7 @@ public class MimeType
   {
     return parameters.get(name);
   }
-  
+
   /**
    * Sets the parameter value for the specified name.
    * @param name the parameter name
@@ -160,7 +160,7 @@ public class MimeType
   {
     parameters.set(name, value);
   }
-  
+
   /**
    * Removes the parameter value for the specified name.
    * @param name the parameter name
@@ -169,7 +169,7 @@ public class MimeType
   {
     parameters.remove(name);
   }
-  
+
   /**
    * Returns the complete string representation of this MIME type.
    */
@@ -181,7 +181,7 @@ public class MimeType
       .append(parameters.toString())
       .toString();
   }
-  
+
   /**
    * Returns the string representation of this MIME type without
    * parameters.
@@ -193,7 +193,7 @@ public class MimeType
       .append(subType)
       .toString();
   }
-  
+
   /**
    * Returns true if the primary and subtype of this MIME type are the
    * same as in the given MIME type.
@@ -206,7 +206,7 @@ public class MimeType
                                             "*".equals(subType) ||
                                             "*".equals(sub2));
   }
-  
+
   /**
    * Returns true if the primary and subtype of this MIME type are the
    * same as in the given MIME type string.
@@ -216,14 +216,14 @@ public class MimeType
   {
     return match(new MimeType(rawdata));
   }
-  
+
   public void writeExternal(ObjectOutput out)
     throws IOException
   {
     out.writeUTF(toString());
     out.flush();
   }
-    
+
   public void readExternal(ObjectInput in)
     throws IOException, ClassNotFoundException
   {
@@ -236,7 +236,7 @@ public class MimeType
         throw new IOException(e.getMessage());
       }
   }
-  
+
   private void parse(String rawdata)
     throws MimeTypeParseException
   {
@@ -283,11 +283,10 @@ public class MimeType
           }
       }
   }
-  
+
   static boolean isValidChar(char c)
   {
     return c > ' ' && c <= '~' && TSPECIALS.indexOf(c) == -1;
   }
 
 }
-
diff --git a/libjava/classpath/javax/activation/MimeTypeParameterList.java b/libjava/classpath/javax/activation/MimeTypeParameterList.java
index e15469da88c..3d36ede948b 100644
--- a/libjava/classpath/javax/activation/MimeTypeParameterList.java
+++ b/libjava/classpath/javax/activation/MimeTypeParameterList.java
@@ -57,7 +57,7 @@ public class MimeTypeParameterList
 
   private final List parameterNames;
   private final Map parameterValues;
-  
+
   /**
    * Constructor for an empty parameter list.
    */
@@ -122,11 +122,11 @@ public class MimeTypeParameterList
       {
         params.add(param);
       }
-    
+
     // Tokenize each parameter into name + value
     for (Iterator i = params.iterator(); i.hasNext();)
       {
-	param = i.next();
+        param = i.next();
         int ei = param.indexOf('=');
         if (ei == -1)
           {
@@ -147,12 +147,12 @@ public class MimeTypeParameterList
           {
             MimeType.checkValidity(name, "Parameter value is invalid");
           }
-        
+
         parameterNames.add(name);
         parameterValues.put(name.toLowerCase(), value);
       }
   }
-  
+
   /**
    * Returns the number of parameters.
    */
@@ -160,7 +160,7 @@ public class MimeTypeParameterList
   {
     return parameterNames.size();
   }
-  
+
   /**
    * Indicates if there are no parameters.
    */
@@ -178,7 +178,7 @@ public class MimeTypeParameterList
     name = name.trim();
     return parameterValues.get(name.toLowerCase());
   }
-  
+
   /**
    * Sets the value for the specified parameter name.
    * @param name the parameter name
@@ -201,7 +201,7 @@ public class MimeTypeParameterList
       }
     parameterValues.put(name.toLowerCase(), value);
   }
-  
+
   /**
    * Removes the parameter identified by the specified name.
    * @param name the parameter name
@@ -211,7 +211,7 @@ public class MimeTypeParameterList
     name = name.trim();
     for (Iterator i = parameterNames.iterator();i.hasNext();)
       {
-	String pname = i.next();
+        String pname = i.next();
         if (name.equalsIgnoreCase(pname))
           {
             i.remove();
@@ -219,7 +219,7 @@ public class MimeTypeParameterList
       }
     parameterValues.remove(name.toLowerCase());
   }
-  
+
   /**
    * Returns an enumeration of all the parameter names.
    */
@@ -229,7 +229,7 @@ public class MimeTypeParameterList
   {
     return new IteratorEnumeration(parameterNames.iterator());
   }
-  
+
   /**
    * Returns an RFC 2045-compliant string representation of this parameter
    * list.
@@ -240,7 +240,7 @@ public class MimeTypeParameterList
     for (String name : parameterNames)
       {
         String value = parameterValues.get(name.toLowerCase());
-        
+
         buffer.append(';');
         buffer.append(' ');
         buffer.append(name);
@@ -249,7 +249,7 @@ public class MimeTypeParameterList
       }
     return buffer.toString();
   }
-  
+
   private static String quote(String value)
   {
     boolean needsQuoting = false;
@@ -262,7 +262,7 @@ public class MimeTypeParameterList
             break;
           }
       }
-    
+
     if (needsQuoting)
       {
         CPStringBuilder buffer = new CPStringBuilder();
@@ -281,7 +281,7 @@ public class MimeTypeParameterList
       }
     return value;
   }
-  
+
   private static String unquote(String value)
   {
     int len = value.length();
@@ -305,32 +305,31 @@ public class MimeTypeParameterList
       }
     return buffer.toString();
   }
-  
+
   /**
    * Enumeration proxy for an Iterator.
    */
   static class IteratorEnumeration
     implements Enumeration
   {
-    
+
     final Iterator iterator;
-    
+
     IteratorEnumeration(Iterator iterator)
     {
       this.iterator = iterator;
     }
-    
+
     public boolean hasMoreElements()
     {
       return iterator.hasNext();
     }
-    
+
     public String nextElement()
     {
       return iterator.next();
     }
-    
-  }
-  
-}
 
+  }
+
+}
diff --git a/libjava/classpath/javax/activation/MimeTypeParseException.java b/libjava/classpath/javax/activation/MimeTypeParseException.java
index b46e244fda6..18e8a62e29f 100644
--- a/libjava/classpath/javax/activation/MimeTypeParseException.java
+++ b/libjava/classpath/javax/activation/MimeTypeParseException.java
@@ -55,7 +55,7 @@ public class MimeTypeParseException
   public MimeTypeParseException()
   {
   }
-  
+
   /**
    * MimeTypeParseException with the specified detail message.
    * @param message the exception message
@@ -79,6 +79,5 @@ public class MimeTypeParseException
          .append(token)
          .toString());
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/MimetypesFileTypeMap.java b/libjava/classpath/javax/activation/MimetypesFileTypeMap.java
index d1566fd969c..0c381d8e443 100644
--- a/libjava/classpath/javax/activation/MimetypesFileTypeMap.java
+++ b/libjava/classpath/javax/activation/MimetypesFileTypeMap.java
@@ -92,9 +92,9 @@ public class MimetypesFileTypeMap
       {
       }
   }
-  
+
   private Map[] mimetypes;
-  
+
   /**
    * Default constructor.
    */
@@ -102,7 +102,7 @@ public class MimetypesFileTypeMap
   {
     init(null);
   }
-  
+
   /**
    * Constructor specifying a filename.
    * @param mimeTypeFileName the name of the file to read mime.types
@@ -125,7 +125,7 @@ public class MimetypesFileTypeMap
           }
       }
   }
-  
+
   /**
    * Constructor specifying an input stream.
    * @param is the input stream to read mime.types entries from
@@ -156,7 +156,7 @@ public class MimetypesFileTypeMap
           {
           }
       }
-    
+
     if (debug)
       {
         System.out.println("MimetypesFileTypeMap: load HOME");
@@ -175,7 +175,7 @@ public class MimetypesFileTypeMap
     catch (SecurityException e)
       {
       }
-    
+
     if (debug)
       {
         System.out.println("MimetypesFileTypeMap: load SYS");
@@ -184,8 +184,8 @@ public class MimetypesFileTypeMap
       {
         parseFile(mimetypes[SYS],
                   new CPStringBuilder(System.getProperty("java.home"))
-                  .append(File.separatorChar)                                                     
-		  .append("lib")
+                  .append(File.separatorChar)
+                  .append("lib")
                   .append(File.separatorChar)
                   .append("mime.types")
                   .toString());
@@ -232,14 +232,14 @@ public class MimetypesFileTypeMap
       {
         parseResource(mimetypes[JAR], "/META-INF/mime.types");
       }
-    
+
     if (debug)
       {
         System.out.println("MimetypesFileTypeMap: load DEF");
       }
     parseResource(mimetypes[DEF], "/META-INF/mimetypes.default");
   }
-  
+
   /**
    * Adds entries prorammatically to the registry.
    * @param mime_types a mime.types formatted entries string
@@ -268,7 +268,7 @@ public class MimetypesFileTypeMap
   {
     return getContentType(f.getName());
   }
-  
+
   /**
    * Returns the MIME type based on the given filename.
    * If no entry is found, returns "application/octet-stream".
@@ -296,7 +296,7 @@ public class MimetypesFileTypeMap
       }
     return DEFAULT_MIME_TYPE;
   }
-  
+
   private void parseFile(Map mimetypes, String filename)
   {
     Reader in = null;
@@ -322,7 +322,7 @@ public class MimetypesFileTypeMap
           }
       }
   }
-  
+
   private void parseResource(Map mimetypes, String name)
   {
     Reader in = null;
@@ -352,7 +352,7 @@ public class MimetypesFileTypeMap
           }
       }
   }
-  
+
   private void parse(Map mimetypes, Reader in)
     throws IOException
   {
@@ -386,9 +386,9 @@ public class MimetypesFileTypeMap
           }
       }
   }
-  
+
   private void parseEntry(Map mimetypes,
-			  String line)
+                          String line)
   {
     // Tokenize
     String mimeType = null;
@@ -418,9 +418,9 @@ public class MimetypesFileTypeMap
         mimetypes.put(buffer.toString(), mimeType);
       }
   }
-  
+
   // -- Utility methods --
-  
+
   private List getSystemResources(String name)
   {
     List acc = new ArrayList();
@@ -435,6 +435,5 @@ public class MimetypesFileTypeMap
       }
     return acc;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/ObjectDataContentHandler.java b/libjava/classpath/javax/activation/ObjectDataContentHandler.java
index 5105cb45b2c..3f5e2967a2f 100644
--- a/libjava/classpath/javax/activation/ObjectDataContentHandler.java
+++ b/libjava/classpath/javax/activation/ObjectDataContentHandler.java
@@ -56,7 +56,7 @@ class ObjectDataContentHandler
   private Object object;
   private String mimeType;
   private DataFlavor[] flavors;
-  
+
   public ObjectDataContentHandler(DataContentHandler dch, Object object,
                                   String mimeType)
   {
@@ -64,12 +64,12 @@ class ObjectDataContentHandler
     this.object = object;
     this.mimeType = mimeType;
   }
-  
+
   public Object getContent(DataSource ds)
   {
     return object;
   }
-  
+
   public DataContentHandler getDCH()
   {
     return dch;
@@ -92,7 +92,7 @@ class ObjectDataContentHandler
       }
     throw new UnsupportedFlavorException(flavor);
   }
-  
+
   public DataFlavor[] getTransferDataFlavors()
   {
     if (flavors == null)
@@ -123,6 +123,5 @@ class ObjectDataContentHandler
         throw new UnsupportedDataTypeException("no object DCH for MIME type " + mimeType);
       }
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/URLDataSource.java b/libjava/classpath/javax/activation/URLDataSource.java
index 8b77567aeac..66472ada915 100644
--- a/libjava/classpath/javax/activation/URLDataSource.java
+++ b/libjava/classpath/javax/activation/URLDataSource.java
@@ -55,7 +55,7 @@ public class URLDataSource
 
   private final URL url;
   private URLConnection connection;
-  
+
   /**
    * Constructor.
    * This will not open the connection to the URL.
@@ -64,7 +64,7 @@ public class URLDataSource
   {
     this.url = url;
   }
-  
+
   /**
    * Returns the Content-Type header for the URL.
    * In the case of failure or lack of such a header,
@@ -93,7 +93,7 @@ public class URLDataSource
       }
     return contentType;
   }
-  
+
   /**
    * Returns the result of getFile of the underlying URL.
    */
@@ -101,7 +101,7 @@ public class URLDataSource
   {
     return url.getFile();
   }
-  
+
   public InputStream getInputStream()
     throws IOException
   {
@@ -125,7 +125,7 @@ public class URLDataSource
       }
     return null;
   }
-  
+
   /**
    * Returns the underlying URL.
    */
@@ -133,6 +133,5 @@ public class URLDataSource
   {
     return url;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/activation/UnsupportedDataTypeException.java b/libjava/classpath/javax/activation/UnsupportedDataTypeException.java
index 09460b06985..d0c4b9d8a88 100644
--- a/libjava/classpath/javax/activation/UnsupportedDataTypeException.java
+++ b/libjava/classpath/javax/activation/UnsupportedDataTypeException.java
@@ -55,7 +55,7 @@ public class UnsupportedDataTypeException extends IOException
   public UnsupportedDataTypeException()
   {
   }
-  
+
   /**
    * Constructs an UnsupportedDataTypeException with the specified detail
    * message.
@@ -65,6 +65,5 @@ public class UnsupportedDataTypeException extends IOException
   {
     super(message);
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/crypto/Cipher.java b/libjava/classpath/javax/crypto/Cipher.java
index 7c18e6f6ab3..9b7d8f9fe69 100644
--- a/libjava/classpath/javax/crypto/Cipher.java
+++ b/libjava/classpath/javax/crypto/Cipher.java
@@ -163,7 +163,7 @@ public class Cipher
    * The installed providers are tried in order for an implementation, and the
    * first appropriate instance is returned. If no installed provider can
    * provide the implementation, an appropriate exception is thrown.
-   * 
+   *
    * @param transformation The transformation to create.
    * @return An appropriate cipher for this transformation.
    * @throws NoSuchAlgorithmException If no installed provider can supply the
@@ -201,7 +201,7 @@ public class Cipher
   /**
    * Creates a new cipher instance for the given transformation and the named
    * provider.
-   * 
+   *
    * @param transformation The transformation to create.
    * @param provider The name of the provider to use.
    * @return An appropriate cipher for this transformation.
@@ -228,7 +228,7 @@ public class Cipher
   /**
    * Creates a new cipher instance for a given transformation from a given
    * provider.
-   * 
+   *
    * @param transformation The transformation to create.
    * @param provider The provider to use.
    * @return An appropriate cipher for this transformation.
diff --git a/libjava/classpath/javax/crypto/CipherOutputStream.java b/libjava/classpath/javax/crypto/CipherOutputStream.java
index 960f6fb60ab..170feed4751 100644
--- a/libjava/classpath/javax/crypto/CipherOutputStream.java
+++ b/libjava/classpath/javax/crypto/CipherOutputStream.java
@@ -45,7 +45,7 @@ import java.io.OutputStream;
 /**
  * A filtered output stream that transforms data written to it with a
  * {@link Cipher} before sending it to the underlying output stream.
- * 
+ *
  * @author Casey Marshall (csm@gnu.org)
  */
 public class CipherOutputStream extends FilterOutputStream
@@ -56,7 +56,7 @@ public class CipherOutputStream extends FilterOutputStream
   /**
    * Create a new cipher output stream. The cipher argument must have already
    * been initialized.
-   * 
+   *
    * @param out The sink for transformed data.
    * @param cipher The cipher to transform data with.
    */
@@ -82,7 +82,7 @@ public class CipherOutputStream extends FilterOutputStream
    * This method will first invoke the {@link Cipher#doFinal()} method of the
    * underlying {@link Cipher}, and writes the output of that method to the
    * sink output stream.
-   * 
+   *
    * @throws IOException If an I/O error occurs, or if an error is caused by
    *           finalizing the transformation.
    */
@@ -114,7 +114,7 @@ public class CipherOutputStream extends FilterOutputStream
 
   /**
    * Write a single byte to the output stream.
-   * 
+   *
    * @param b The next byte.
    * @throws IOException If an I/O error occurs, or if the underlying cipher is
    *           not in the correct state to transform data.
@@ -126,7 +126,7 @@ public class CipherOutputStream extends FilterOutputStream
 
   /**
    * Write a byte array to the output stream.
-   * 
+   *
    * @param buf The next bytes.
    * @throws IOException If an I/O error occurs, or if the underlying cipher is
    *           not in the correct state to transform data.
@@ -138,7 +138,7 @@ public class CipherOutputStream extends FilterOutputStream
 
   /**
    * Write a portion of a byte array to the output stream.
-   * 
+   *
    * @param buf The next bytes.
    * @param off The offset in the byte array to start.
    * @param len The number of bytes to write.
diff --git a/libjava/classpath/javax/crypto/ExemptionMechanism.java b/libjava/classpath/javax/crypto/ExemptionMechanism.java
index baf6bad99e0..b8b17c4afed 100644
--- a/libjava/classpath/javax/crypto/ExemptionMechanism.java
+++ b/libjava/classpath/javax/crypto/ExemptionMechanism.java
@@ -90,7 +90,7 @@ public class ExemptionMechanism
   /**
    * Create an instance of ExemptionMechanism for a designated
    * mechanism from the first Security Provider offering it.
-   * 
+   *
    * @param mechanism the name of the exemption mechanism to create.
    * @return a newly created instance of ExemptionMechanism.
    * @throws IllegalArgumentException if the provider is null.
@@ -121,7 +121,7 @@ public class ExemptionMechanism
   /**
    * Create an instance of ExemptionMechanism for a designated
    * mechanism from a named provider.
-   * 
+   *
    * @param mechanism the name of the exemption mechanism to create.
    * @param provider the security provider to provide the exemption
    *          mechanism.
@@ -149,7 +149,7 @@ public class ExemptionMechanism
   /**
    * Create an instance of ExemptionMechanism for a designated
    * mechanism from a designated provider.
-   * 
+   *
    * @param mechanism the name of the exemption mechanism to create.
    * @param provider the security provider to provide the exemption
    *          mechanism.
diff --git a/libjava/classpath/javax/crypto/KeyAgreement.java b/libjava/classpath/javax/crypto/KeyAgreement.java
index 49003109106..fe3e226fafb 100644
--- a/libjava/classpath/javax/crypto/KeyAgreement.java
+++ b/libjava/classpath/javax/crypto/KeyAgreement.java
@@ -104,7 +104,7 @@ public class KeyAgreement
   /**
    * Get an implementation of an algorithm from the first provider that
    * implements it.
-   * 
+   *
    * @param algorithm The name of the algorithm to get.
    * @return The proper KeyAgreement instacne, if found.
    * @throws NoSuchAlgorithmException If the specified algorithm is not
@@ -133,7 +133,7 @@ public class KeyAgreement
 
   /**
    * Return an implementation of an algorithm from a named provider.
-   * 
+   *
    * @param algorithm The name of the algorithm to create.
    * @param provider The name of the provider from which to get the
    *          implementation.
@@ -158,7 +158,7 @@ public class KeyAgreement
 
   /**
    * Return an implementation of an algorithm from a specific provider.
-   * 
+   *
    * @param algorithm The name of the algorithm to get.
    * @param provider The provider from which to get the implementation.
    * @return The proper KeyAgreement instance, if found.
diff --git a/libjava/classpath/javax/crypto/KeyGenerator.java b/libjava/classpath/javax/crypto/KeyGenerator.java
index 79334e9e05e..f0c80e1dbdc 100644
--- a/libjava/classpath/javax/crypto/KeyGenerator.java
+++ b/libjava/classpath/javax/crypto/KeyGenerator.java
@@ -96,7 +96,7 @@ public class KeyGenerator
 
   /**
    * Create a new key generator, returning the first available implementation.
-   * 
+   *
    * @param algorithm The generator algorithm name.
    * @throws NoSuchAlgorithmException If the specified algorithm does not exist.
    * @throws IllegalArgumentException if algorithm is
@@ -123,7 +123,7 @@ public class KeyGenerator
 
   /**
    * Create a new key generator from the named provider.
-   * 
+   *
    * @param algorithm The generator algorithm name.
    * @param provider The name of the provider to use.
    * @return An appropriate key generator, if found.
@@ -147,7 +147,7 @@ public class KeyGenerator
 
   /**
    * Create a new key generator from the supplied provider.
-   * 
+   *
    * @param algorithm The generator algorithm name.
    * @param provider The provider to use.
    * @return An appropriate key generator, if found.
diff --git a/libjava/classpath/javax/crypto/Mac.java b/libjava/classpath/javax/crypto/Mac.java
index 2a269ab8084..9175e580011 100644
--- a/libjava/classpath/javax/crypto/Mac.java
+++ b/libjava/classpath/javax/crypto/Mac.java
@@ -111,7 +111,7 @@ public class Mac implements Cloneable
   /**
    * Create an instance of the named algorithm from the first provider with an
    * appropriate implementation.
-   * 
+   *
    * @param algorithm The name of the algorithm.
    * @return An appropriate Mac instance, if the specified algorithm is
    *         implemented by a provider.
@@ -141,7 +141,7 @@ public class Mac implements Cloneable
 
   /**
    * Create an instance of the named algorithm from the named provider.
-   * 
+   *
    * @param algorithm The name of the algorithm.
    * @param provider The name of the provider.
    * @return An appropriate Mac instance, if the specified algorithm is
@@ -166,7 +166,7 @@ public class Mac implements Cloneable
 
   /**
    * Create an instance of the named algorithm from a provider.
-   * 
+   *
    * @param algorithm The name of the algorithm.
    * @param provider The provider.
    * @return An appropriate Mac instance, if the specified algorithm is
@@ -417,7 +417,7 @@ public class Mac implements Cloneable
       throw new IllegalStateException ("not initialized");
     macSpi.engineUpdate(buffer);
   }
-  
+
   /**
    * Clone this instance, if the underlying implementation supports it.
    *
diff --git a/libjava/classpath/javax/crypto/MacSpi.java b/libjava/classpath/javax/crypto/MacSpi.java
index 853bd66aa0f..a03aa6983c9 100644
--- a/libjava/classpath/javax/crypto/MacSpi.java
+++ b/libjava/classpath/javax/crypto/MacSpi.java
@@ -143,10 +143,10 @@ public abstract class MacSpi
    * @param length The number of bytes to update.
    */
   protected abstract void engineUpdate(byte[] input, int offset, int length);
-  
+
   /**
    * Update this MAC with the remaining bytes of a buffer.
-   * 
+   *
    * @param buffer The input buffer.
    * @since 1.5
    */
diff --git a/libjava/classpath/javax/crypto/SecretKeyFactory.java b/libjava/classpath/javax/crypto/SecretKeyFactory.java
index 1c857d274a8..9749a8285fc 100644
--- a/libjava/classpath/javax/crypto/SecretKeyFactory.java
+++ b/libjava/classpath/javax/crypto/SecretKeyFactory.java
@@ -96,7 +96,7 @@ public class SecretKeyFactory
 
   /**
    * Create a new secret key factory from the first appropriate instance.
-   * 
+   *
    * @param algorithm The algorithm name.
    * @return The appropriate key factory, if found.
    * @throws NoSuchAlgorithmException If no provider implements the specified
@@ -125,7 +125,7 @@ public class SecretKeyFactory
 
   /**
    * Create a new secret key factory from the named provider.
-   * 
+   *
    * @param algorithm The algorithm name.
    * @param provider The provider name.
    * @return The appropriate key factory, if found.
@@ -150,7 +150,7 @@ public class SecretKeyFactory
 
   /**
    * Create a new secret key factory from the specified provider.
-   * 
+   *
    * @param algorithm The algorithm name.
    * @param provider The provider.
    * @return The appropriate key factory, if found.
diff --git a/libjava/classpath/javax/crypto/spec/PBEKeySpec.java b/libjava/classpath/javax/crypto/spec/PBEKeySpec.java
index 54b821a79fd..f0ffa379a4c 100644
--- a/libjava/classpath/javax/crypto/spec/PBEKeySpec.java
+++ b/libjava/classpath/javax/crypto/spec/PBEKeySpec.java
@@ -78,7 +78,7 @@ public class PBEKeySpec implements KeySpec
 
   /** The password state */
   private boolean passwordValid = true;
-  
+
   // Constructors.
   // ------------------------------------------------------------------------
 
@@ -86,13 +86,13 @@ public class PBEKeySpec implements KeySpec
    * Create a new PBE key spec with just a password.
    * 
                  
    * A copy of the password argument is stored instead of the argument itself.
-   * 
+   *
    * @param password The password char array.
    */
   public PBEKeySpec(char[] password)
   {
     setPassword(password);
-    
+
     // load the default values for unspecified variables.
     salt = null;
     iterationCount = 0;
@@ -104,7 +104,7 @@ public class PBEKeySpec implements KeySpec
    * 
                  
    * A copy of the password and salt arguments are stored instead of the
    * arguments themselves.
-   * 
+   *
    * @param password The password char array.
    * @param salt The salt bytes.
    * @param iterationCount The iteration count.
@@ -128,7 +128,7 @@ public class PBEKeySpec implements KeySpec
    * 
                  
    * A copy of the password and salt arguments are stored instead of the
    * arguments themselves.
-   * 
+   *
    * @param password The password char array.
    * @param salt The salt bytes.
    * @param iterationCount The iteration count.
@@ -161,7 +161,7 @@ public class PBEKeySpec implements KeySpec
       return;
     for (int i = 0; i < password.length; i++)
       password[i] = '\u0000';
-    
+
     // since the password is cleared, it is no longer valid
     passwordValid = false;
   }
@@ -190,7 +190,7 @@ public class PBEKeySpec implements KeySpec
    * Get the password character array copy.
    * 
                  
    * This returns a copy of the password, not the password itself.
-   * 
+   *
    * @return a clone of the password.
    * @throws IllegalStateException If {@link #clearPassword()} has already been
    *           called.
@@ -207,7 +207,7 @@ public class PBEKeySpec implements KeySpec
    * Get the salt bytes array copy.
    * 
                  
    * This returns a copy of the salt, not the salt itself.
-   * 
+   *
    * @return The salt.
    */
   public final byte[] getSalt()
@@ -221,7 +221,7 @@ public class PBEKeySpec implements KeySpec
    * Set the password char array.
    * 
                  
    * A copy of the password argument is stored instead of the argument itself.
-   * 
+   *
    * @param password The password to be set
    */
   private void setPassword(char[] password)
@@ -238,7 +238,7 @@ public class PBEKeySpec implements KeySpec
    * Set the salt byte array.
    * 
                  
    * A copy of the salt arguments is stored instead of the argument itself.
-   * 
+   *
    * @param salt The salt to be set.
    * @throws NullPointerException If the salt is null.
    * @throws IllegalArgumentException If the salt is an empty array.
@@ -253,7 +253,7 @@ public class PBEKeySpec implements KeySpec
 
   /**
    * Set the iterationCount.
-   * 
+   *
    * @param iterationCount The iteration count to be set.
    * @throws IllegalArgumentException If the iterationCount is negative.
    */
@@ -267,7 +267,7 @@ public class PBEKeySpec implements KeySpec
 
   /**
    * Set the keyLength.
-   * 
+   *
    * @param keyLength The keyLength to be set.
    * @throws IllegalArgumentException if the keyLength is negative.
    */
diff --git a/libjava/classpath/javax/imageio/IIOImage.java b/libjava/classpath/javax/imageio/IIOImage.java
index bd69bae5f1e..a368e5a840d 100644
--- a/libjava/classpath/javax/imageio/IIOImage.java
+++ b/libjava/classpath/javax/imageio/IIOImage.java
@@ -96,12 +96,12 @@ public class IIOImage
   {
     if (raster == null)
       throw new IllegalArgumentException ("raster may not be null");
-    
+
     this.raster = raster;
     this.thumbnails = thumbnails;
     this.metadata = metadata;
   }
-  
+
   /**
    * Construct an IIOImage containing rendered image data, thumbnails
    * and metadata.
@@ -117,7 +117,7 @@ public class IIOImage
   {
     if (image == null)
       throw new IllegalArgumentException ("image may not be null");
-    
+
     this.image = image;
     this.thumbnails = thumbnails;
     this.metadata = metadata;
@@ -232,7 +232,7 @@ public class IIOImage
   {
     if (raster == null)
       throw new IllegalArgumentException ("raster may not be null");
-    
+
     this.image = null;
     this.raster = raster;
   }
diff --git a/libjava/classpath/javax/imageio/IIOParam.java b/libjava/classpath/javax/imageio/IIOParam.java
index f6460b4e7ed..3e785474764 100644
--- a/libjava/classpath/javax/imageio/IIOParam.java
+++ b/libjava/classpath/javax/imageio/IIOParam.java
@@ -158,10 +158,10 @@ public abstract class IIOParam
   {
     if (controller == null)
       {
-	if (defaultController == null || no_controller)
-	  return false;
-	else
-	  return defaultController.activate (this);
+        if (defaultController == null || no_controller)
+          return false;
+        else
+          return defaultController.activate (this);
       }
     else
       return controller.activate(this);
@@ -173,7 +173,7 @@ public abstract class IIOParam
    * set to null.
    *
    * @return the currently used controller or null
-   */  
+   */
   public IIOParamController getController()
   {
     return controller == null ?
@@ -254,7 +254,7 @@ public abstract class IIOParam
   {
     return sourceXSubsampling;
   }
-  
+
   /**
    * Retrieve the number of pixel rows to advance before taking a
    * pixel sample.
@@ -313,13 +313,13 @@ public abstract class IIOParam
   {
     if (controller == defaultController)
       {
-	this.controller = null;
-	no_controller = false;
+        this.controller = null;
+        no_controller = false;
       }
     else
       {
-	no_controller = (controller == null);
-	this.controller = controller;
+        no_controller = (controller == null);
+        this.controller = controller;
       }
   }
 
@@ -401,24 +401,24 @@ public abstract class IIOParam
   public void setSourceRegion(Rectangle sourceRegion)
   {
     if (sourceRegion != null
-	&& (sourceRegion.x < 0
-	    || sourceRegion.y < 0
-	    || sourceRegion.width <= 0
-	    || sourceRegion.height <= 0))
+        && (sourceRegion.x < 0
+            || sourceRegion.y < 0
+            || sourceRegion.width <= 0
+            || sourceRegion.height <= 0))
       throw new IllegalArgumentException("illegal source region");
 
     if (sourceRegion != null)
       {
-	int num_rows =
-	  (sourceRegion.height - subsamplingYOffset + sourceYSubsampling - 1)
-	  / sourceYSubsampling;
+        int num_rows =
+          (sourceRegion.height - subsamplingYOffset + sourceYSubsampling - 1)
+          / sourceYSubsampling;
 
-	int num_columns =
-	  (sourceRegion.width - subsamplingXOffset + sourceXSubsampling - 1)
-	  / sourceXSubsampling;
+        int num_columns =
+          (sourceRegion.width - subsamplingXOffset + sourceXSubsampling - 1)
+          / sourceXSubsampling;
 
-	if (num_rows <= 0 || num_columns <= 0)
-	  throw new IllegalStateException("zero pixels in source region");
+        if (num_rows <= 0 || num_columns <= 0)
+          throw new IllegalStateException("zero pixels in source region");
       }
 
     this.sourceRegion = sourceRegion;
@@ -462,25 +462,25 @@ public abstract class IIOParam
    * zero pixel samples
    */
   public void setSourceSubsampling(int sourceXSubsampling, int sourceYSubsampling,
-				   int subsamplingXOffset, int subsamplingYOffset)
+                                   int subsamplingXOffset, int subsamplingYOffset)
   {
     if (subsamplingXOffset < 0 || subsamplingYOffset < 0)
       throw new IllegalArgumentException("subsampling offset < 0");
 
     if (sourceRegion != null)
       {
-	int num_rows =
-	  (sourceRegion.height - subsamplingYOffset + sourceYSubsampling - 1)
-	  / sourceYSubsampling;
+        int num_rows =
+          (sourceRegion.height - subsamplingYOffset + sourceYSubsampling - 1)
+          / sourceYSubsampling;
 
-	int num_columns =
-	  (sourceRegion.width - subsamplingXOffset + sourceXSubsampling - 1)
-	  / sourceXSubsampling;
+        int num_columns =
+          (sourceRegion.width - subsamplingXOffset + sourceXSubsampling - 1)
+          / sourceXSubsampling;
 
-	if (num_rows <= 0 || num_columns <= 0)
-	  throw new IllegalStateException("subsampling parameters would"
-					  + " produce zero pixel samples"
-					  + " in source region");
+        if (num_rows <= 0 || num_columns <= 0)
+          throw new IllegalStateException("subsampling parameters would"
+                                          + " produce zero pixel samples"
+                                          + " in source region");
       }
 
     this.sourceXSubsampling = sourceXSubsampling;
diff --git a/libjava/classpath/javax/imageio/IIOParamController.java b/libjava/classpath/javax/imageio/IIOParamController.java
index 0ee54df4071..e77f8542f6f 100644
--- a/libjava/classpath/javax/imageio/IIOParamController.java
+++ b/libjava/classpath/javax/imageio/IIOParamController.java
@@ -61,7 +61,7 @@ public interface IIOParamController
    *
    * @return true if the IIOParam has been modified,
    * false otherwise
-   * 
+   *
    * @exception IllegalArgumentException if param is null or is not an instance
    * of the correct class
    */
diff --git a/libjava/classpath/javax/imageio/ImageIO.java b/libjava/classpath/javax/imageio/ImageIO.java
index 5f0d71d60a9..9abb1c81890 100644
--- a/libjava/classpath/javax/imageio/ImageIO.java
+++ b/libjava/classpath/javax/imageio/ImageIO.java
@@ -125,7 +125,7 @@ public final class ImageIO
       return false;
     }
   }
-  
+
   private static final class ReaderObjectFilter implements ServiceRegistry.Filter
   {
     private Object object;
@@ -179,7 +179,7 @@ public final class ImageIO
       return false;
     }
   }
-  
+
   private static final class WriterFormatFilter implements ServiceRegistry.Filter
   {
     private String formatName;
@@ -192,14 +192,14 @@ public final class ImageIO
     public boolean filter(Object provider)
     {
       if (provider instanceof ImageWriterSpi)
-	{
-	  ImageWriterSpi spi = (ImageWriterSpi) provider;
-	  String[] formatNames = spi.getFormatNames();
-	  
-	  for (int i = formatNames.length - 1; i >= 0; --i)
+        {
+          ImageWriterSpi spi = (ImageWriterSpi) provider;
+          String[] formatNames = spi.getFormatNames();
+
+          for (int i = formatNames.length - 1; i >= 0; --i)
             if (formatName.equals(formatNames[i]))
               return true;
-	}
+        }
 
       return false;
     }
@@ -229,7 +229,7 @@ public final class ImageIO
       return false;
     }
   }
-  
+
   private static final class WriterSuffixFilter implements ServiceRegistry.Filter
   {
     private String fileSuffix;
@@ -261,7 +261,7 @@ public final class ImageIO
     private String formatName;
 
     public WriterObjectFilter(ImageTypeSpecifier type,
-			      String formatName)
+                              String formatName)
     {
       this.type = type;
       this.formatName = formatName;
@@ -273,13 +273,13 @@ public final class ImageIO
         {
           ImageWriterSpi spi = (ImageWriterSpi) provider;
 
-	  if (spi.canEncodeImage(type))
-	    {
-	      String[] formatNames = spi.getFormatNames();
-	      for (int i = formatNames.length - 1; i >= 0; --i)
-		if (formatName.equals(formatNames[i]))
-		  return true;
-	    }
+          if (spi.canEncodeImage(type))
+            {
+              String[] formatNames = spi.getFormatNames();
+              for (int i = formatNames.length - 1; i >= 0; --i)
+                if (formatName.equals(formatNames[i]))
+                  return true;
+            }
         }
 
       return false;
@@ -304,11 +304,11 @@ public final class ImageIO
         {
           ImageTranscoderSpi spi = (ImageTranscoderSpi) provider;
 
-	  if (spi.getReaderServiceProviderName().equals
-	      (reader.getOriginatingProvider().getClass().getName())
-	      && spi.getWriterServiceProviderName().equals
-	      (writer.getOriginatingProvider().getClass().getName()))
-	    return true;
+          if (spi.getReaderServiceProviderName().equals
+              (reader.getOriginatingProvider().getClass().getName())
+              && spi.getWriterServiceProviderName().equals
+              (writer.getOriginatingProvider().getClass().getName()))
+            return true;
         }
 
       return false;
@@ -320,14 +320,14 @@ public final class ImageIO
   {
     Iterator it;
     Object readerExtension;
-    
+
     public ImageReaderIterator(Iterator it,
                                Object readerExtension)
     {
       this.it = it;
       this.readerExtension = readerExtension;
     }
-    
+
     public ImageReaderIterator(Iterator it)
     {
       this.it = it;
@@ -364,14 +364,14 @@ public final class ImageIO
   {
     Iterator it;
     Object writerExtension;
-    
+
     public ImageWriterIterator(Iterator it,
                                Object writerExtension)
     {
       this.it = it;
       this.writerExtension = writerExtension;
     }
-    
+
     public ImageWriterIterator(Iterator it)
     {
       this.it = it;
@@ -402,7 +402,7 @@ public final class ImageIO
       throw new UnsupportedOperationException();
     }
   }
-  
+
   private static File cacheDirectory;
   private static boolean useCache = true;
 
@@ -421,7 +421,7 @@ public final class ImageIO
         return Collections.EMPTY_SET.iterator();
       }
   }
-  
+
   private static Iterator getWritersByFilter(Class type,
                                                           ServiceRegistry.Filter filter,
                                                           Object writerExtension)
@@ -503,7 +503,7 @@ public final class ImageIO
   {
     if (fileSuffix == null)
       throw new IllegalArgumentException("formatName may not be null");
-    
+
     return getReadersByFilter(ImageReaderSpi.class,
                               new ReaderSuffixFilter(fileSuffix),
                               fileSuffix);
@@ -523,7 +523,7 @@ public final class ImageIO
   {
     if (formatName == null)
       throw new IllegalArgumentException("formatName may not be null");
-    
+
     return getWritersByFilter(ImageWriterSpi.class,
                               new WriterFormatFilter(formatName),
                               formatName);
@@ -544,7 +544,7 @@ public final class ImageIO
   {
     if (MIMEType == null)
       throw new IllegalArgumentException("MIMEType may not be null");
-    
+
     return getWritersByFilter(ImageWriterSpi.class,
                               new WriterMIMETypeFilter(MIMEType),
                               MIMEType);
@@ -564,7 +564,7 @@ public final class ImageIO
   {
     if (fileSuffix == null)
       throw new IllegalArgumentException("fileSuffix may not be null");
-    
+
     return getWritersByFilter(ImageWriterSpi.class,
                               new WriterSuffixFilter(fileSuffix),
                               fileSuffix);
@@ -581,19 +581,19 @@ public final class ImageIO
     try
       {
         Iterator it =
-	  getRegistry().getServiceProviders(ImageReaderSpi.class, true);
-	ArrayList result = new ArrayList();
+          getRegistry().getServiceProviders(ImageReaderSpi.class, true);
+        ArrayList result = new ArrayList();
 
-	while (it.hasNext())
-	  {
-	    ImageReaderSpi spi = (ImageReaderSpi) it.next();
-	    String[] names = spi.getFormatNames();
+        while (it.hasNext())
+          {
+            ImageReaderSpi spi = (ImageReaderSpi) it.next();
+            String[] names = spi.getFormatNames();
 
-	    for (int i = names.length - 1; i >= 0; --i)
-	      result.add(names[i]);
-	  }
+            for (int i = names.length - 1; i >= 0; --i)
+              result.add(names[i]);
+          }
 
-	return (String[]) result.toArray(new String[result.size()]);
+        return (String[]) result.toArray(new String[result.size()]);
       }
     catch (IllegalArgumentException e)
       {
@@ -612,19 +612,19 @@ public final class ImageIO
     try
       {
         Iterator it =
-	  getRegistry().getServiceProviders(ImageReaderSpi.class, true);
-	ArrayList result = new ArrayList();
+          getRegistry().getServiceProviders(ImageReaderSpi.class, true);
+        ArrayList result = new ArrayList();
 
-	while (it.hasNext())
-	  {
-	    ImageReaderSpi spi = (ImageReaderSpi) it.next();
-	    String[] names = spi.getMIMETypes();
+        while (it.hasNext())
+          {
+            ImageReaderSpi spi = (ImageReaderSpi) it.next();
+            String[] names = spi.getMIMETypes();
 
-	    for (int i = names.length - 1; i >= 0; --i)
-	      result.add(names[i]);
-	  }
+            for (int i = names.length - 1; i >= 0; --i)
+              result.add(names[i]);
+          }
 
-	return (String[]) result.toArray(new String[result.size()]);
+        return (String[]) result.toArray(new String[result.size()]);
       }
     catch (IllegalArgumentException e)
       {
@@ -659,19 +659,19 @@ public final class ImageIO
     try
       {
         Iterator it =
-	  getRegistry().getServiceProviders(ImageWriterSpi.class, true);
-	ArrayList result = new ArrayList();
+          getRegistry().getServiceProviders(ImageWriterSpi.class, true);
+        ArrayList result = new ArrayList();
 
-	while (it.hasNext())
-	  {
-	    ImageWriterSpi spi = (ImageWriterSpi) it.next();
-	    String[] names = spi.getFormatNames();
+        while (it.hasNext())
+          {
+            ImageWriterSpi spi = (ImageWriterSpi) it.next();
+            String[] names = spi.getFormatNames();
 
-	    for (int i = names.length - 1; i >= 0; --i)
-	      result.add(names[i]);
-	  }
+            for (int i = names.length - 1; i >= 0; --i)
+              result.add(names[i]);
+          }
 
-	return (String[]) result.toArray(new String[result.size()]);
+        return (String[]) result.toArray(new String[result.size()]);
       }
     catch (IllegalArgumentException e)
       {
@@ -690,26 +690,26 @@ public final class ImageIO
     try
       {
         Iterator it =
-	  getRegistry().getServiceProviders(ImageWriterSpi.class, true);
-	ArrayList result = new ArrayList();
+          getRegistry().getServiceProviders(ImageWriterSpi.class, true);
+        ArrayList result = new ArrayList();
 
-	while (it.hasNext())
-	  {
-	    ImageWriterSpi spi = (ImageWriterSpi) it.next();
-	    String[] names = spi.getMIMETypes();
+        while (it.hasNext())
+          {
+            ImageWriterSpi spi = (ImageWriterSpi) it.next();
+            String[] names = spi.getMIMETypes();
 
-	    for (int i = names.length - 1; i >= 0; --i)
-	      result.add(names[i]);
-	  }
+            for (int i = names.length - 1; i >= 0; --i)
+              result.add(names[i]);
+          }
 
-	return (String[]) result.toArray(new String[result.size()]);
+        return (String[]) result.toArray(new String[result.size()]);
       }
     catch (IllegalArgumentException e)
       {
         return new String[0];
       }
   }
-  
+
   /**
    * Rescans the application classpath for ImageIO service providers
    * and registers them.
@@ -740,7 +740,7 @@ public final class ImageIO
 
         cacheDirectory.canWrite();
       }
-    
+
     ImageIO.cacheDirectory = cacheDirectory;
   }
 
@@ -841,7 +841,7 @@ public final class ImageIO
     while (writers.hasNext())
       {
         ImageWriter w = (ImageWriter) writers.next();
-        try 
+        try
           {
             w.setOutput(output);
           }
@@ -849,7 +849,7 @@ public final class ImageIO
           {
             continue;
           }
-        
+
         w.write(null, img, null);
         w.dispose();
         output.close();
@@ -1014,13 +1014,13 @@ public final class ImageIO
 
     while(spis.hasNext())
       {
-	ImageInputStreamSpi spi = (ImageInputStreamSpi) spis.next();
+        ImageInputStreamSpi spi = (ImageInputStreamSpi) spis.next();
 
-	if (input.getClass().equals(spi.getInputClass()))
-	  {
-	    foundSpi = spi;
-	    break;
-	  }
+        if (input.getClass().equals(spi.getInputClass()))
+          {
+            foundSpi = spi;
+            break;
+          }
       }
 
     return foundSpi == null ? null :
@@ -1060,13 +1060,13 @@ public final class ImageIO
 
     while(spis.hasNext())
       {
-	ImageOutputStreamSpi spi = (ImageOutputStreamSpi) spis.next();
+        ImageOutputStreamSpi spi = (ImageOutputStreamSpi) spis.next();
 
-	if (output.getClass().equals(spi.getOutputClass()))
-	  {
-	    foundSpi = spi;
-	    break;
-	  }
+        if (output.getClass().equals(spi.getOutputClass()))
+          {
+            foundSpi = spi;
+            break;
+          }
       }
 
     return foundSpi == null ? null :
@@ -1143,7 +1143,7 @@ public final class ImageIO
    * @return an iterator over a collection of image writers
    */
   public static Iterator getImageWriters (ImageTypeSpecifier type,
-					  String formatName)
+                                          String formatName)
   {
     if (type == null || formatName == null)
       throw new IllegalArgumentException ("null argument");
@@ -1226,12 +1226,12 @@ public final class ImageIO
       {
         return spiIterator.hasNext();
       }
-      
+
       public ImageTranscoder next()
       {
         return spiIterator.next().createTranscoderInstance();
       }
-      
+
       public void remove()
       {
         throw new UnsupportedOperationException();
diff --git a/libjava/classpath/javax/imageio/ImageReadParam.java b/libjava/classpath/javax/imageio/ImageReadParam.java
index b2680f6b14e..8a31253e8d4 100644
--- a/libjava/classpath/javax/imageio/ImageReadParam.java
+++ b/libjava/classpath/javax/imageio/ImageReadParam.java
@@ -112,17 +112,17 @@ public class ImageReadParam extends IIOParam
     this.minProgressivePass = minPass;
     this.numProgressivePasses = numPasses;
   }
-  
+
   public void setSourceRenderSize(Dimension size)
     throws UnsupportedOperationException
   {
     if (! canSetSourceRenderSize())
       throw new UnsupportedOperationException
-	("setting source render size not supported");
-    
+        ("setting source render size not supported");
+
     if (size.width <= 0 || size.height <= 0)
       throw new IllegalArgumentException("negative dimension not allowed");
-    
+
     sourceRenderSize = size;
   }
 }
diff --git a/libjava/classpath/javax/imageio/ImageReader.java b/libjava/classpath/javax/imageio/ImageReader.java
index 269493f2330..14e935994cb 100644
--- a/libjava/classpath/javax/imageio/ImageReader.java
+++ b/libjava/classpath/javax/imageio/ImageReader.java
@@ -290,7 +290,7 @@ public abstract class ImageReader
   {
     if (availableLocales == null)
       return null;
-    
+
     return (Locale[]) availableLocales.clone();
   }
 
@@ -770,14 +770,14 @@ public abstract class ImageReader
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.imageComplete (this);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.imageComplete (this);
+          }
       }
   }
 
@@ -793,14 +793,14 @@ public abstract class ImageReader
   {
      if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.imageProgress(this, percentageDone);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.imageProgress(this, percentageDone);
+          }
       }
   }
   /**
@@ -815,14 +815,14 @@ public abstract class ImageReader
   {
      if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.imageStarted(this, imageIndex);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.imageStarted(this, imageIndex);
+          }
       }
   }
 
@@ -842,19 +842,19 @@ public abstract class ImageReader
    * @param bands the affected bands in the destination
    */
   protected void processImageUpdate(BufferedImage image, int minX, int minY,
-				    int width, int height, int periodX,
-				    int periodY, int[] bands)
+                                    int width, int height, int periodX,
+                                    int periodY, int[] bands)
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.imageUpdate(this, image, minX, minY, width, height,
-				 periodX, periodY, bands);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.imageUpdate(this, image, minX, minY, width, height,
+                                 periodX, periodY, bands);
+          }
       }
   }
 
@@ -869,13 +869,13 @@ public abstract class ImageReader
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.passComplete(this, image);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.passComplete(this, image);
+          }
       }
   }
 
@@ -898,19 +898,19 @@ public abstract class ImageReader
    * @param bands the affected bands in the destination
    */
   protected void processPassStarted(BufferedImage image, int pass, int minPass,
-				    int maxPass, int minX, int minY,
-				    int periodX, int periodY, int[] bands)
+                                    int maxPass, int minX, int minY,
+                                    int periodX, int periodY, int[] bands)
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.passStarted(this, image, pass, minPass, maxPass, minX,
-				 minY, periodX, periodY, bands);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.passStarted(this, image, pass, minPass, maxPass, minX,
+                                 minY, periodX, periodY, bands);
+          }
       }
   }
 
@@ -922,14 +922,14 @@ public abstract class ImageReader
   {
      if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.readAborted(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.readAborted(this);
+          }
       }
   }
   /**
@@ -941,14 +941,14 @@ public abstract class ImageReader
   {
      if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.sequenceComplete(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.sequenceComplete(this);
+          }
       }
   }
 
@@ -964,14 +964,14 @@ public abstract class ImageReader
 
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.sequenceStarted(this, minIndex);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.sequenceStarted(this, minIndex);
+          }
       }
   }
 
@@ -984,14 +984,14 @@ public abstract class ImageReader
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.thumbnailComplete(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.thumbnailComplete(this);
+          }
       }
   }
 
@@ -1006,13 +1006,13 @@ public abstract class ImageReader
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.thumbnailPassComplete(this, thumbnail);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.thumbnailPassComplete(this, thumbnail);
+          }
       }
   }
 
@@ -1035,21 +1035,21 @@ public abstract class ImageReader
    * @param bands the affected bands in the destination
    */
   protected void processThumbnailPassStarted(BufferedImage thumbnail, int pass,
-					     int minPass, int maxPass, int minX,
-					     int minY, int periodX, int periodY,
-					     int[] bands)
+                                             int minPass, int maxPass, int minX,
+                                             int minY, int periodX, int periodY,
+                                             int[] bands)
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.thumbnailPassStarted(this, thumbnail, pass, minPass,
-					  maxPass, minX, minY, periodX,
-					  periodY, bands);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.thumbnailPassStarted(this, thumbnail, pass, minPass,
+                                          maxPass, minX, minY, periodX,
+                                          periodY, bands);
+          }
       }
   }
 
@@ -1065,14 +1065,14 @@ public abstract class ImageReader
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.thumbnailProgress(this, percentageDone);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.thumbnailProgress(this, percentageDone);
+          }
       }
   }
 
@@ -1090,14 +1090,14 @@ public abstract class ImageReader
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadProgressListener listener =
-	      (IIOReadProgressListener) it.next();
-	    listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadProgressListener listener =
+              (IIOReadProgressListener) it.next();
+            listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
+          }
       }
   }
 
@@ -1117,19 +1117,19 @@ public abstract class ImageReader
    * @param bands the affected bands in the destination
    */
   protected void processThumbnailUpdate(BufferedImage image, int minX, int minY,
-					int width, int height, int periodX,
-					int periodY, int[] bands)
+                                        int width, int height, int periodX,
+                                        int periodY, int[] bands)
   {
     if (updateListeners != null)
       {
-	Iterator it = updateListeners.iterator();
+        Iterator it = updateListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
-	    listener.thumbnailUpdate(this, image, minX, minY, width, height,
-				     periodX, periodY, bands);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadUpdateListener listener = (IIOReadUpdateListener) it.next();
+            listener.thumbnailUpdate(this, image, minX, minY, width, height,
+                                     periodX, periodY, bands);
+          }
       }
   }
 
@@ -1147,14 +1147,14 @@ public abstract class ImageReader
       throw new IllegalArgumentException ("null argument");
     if (warningListeners != null)
       {
-	Iterator it = warningListeners.iterator();
+        Iterator it = warningListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadWarningListener listener =
-	      (IIOReadWarningListener) it.next();
-	    listener.warningOccurred(this, warning);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadWarningListener listener =
+              (IIOReadWarningListener) it.next();
+            listener.warningOccurred(this, warning);
+          }
       }
   }
 
@@ -1179,7 +1179,7 @@ public abstract class ImageReader
    * not a String
    */
   protected void processWarningOccurred(String baseName,
-					String keyword)
+                                        String keyword)
   {
     if (baseName == null || keyword == null)
       throw new IllegalArgumentException ("null argument");
@@ -1188,22 +1188,22 @@ public abstract class ImageReader
 
     try
       {
-	b = ResourceBundle.getBundle(baseName, getLocale());
+        b = ResourceBundle.getBundle(baseName, getLocale());
       }
     catch (MissingResourceException e)
       {
-	throw new IllegalArgumentException ("no resource bundle found");
+        throw new IllegalArgumentException ("no resource bundle found");
       }
 
     Object str = null;
 
     try
       {
-	str = b.getObject(keyword);
+        str = b.getObject(keyword);
       }
     catch (MissingResourceException e)
       {
-	throw new IllegalArgumentException ("no results found for keyword");
+        throw new IllegalArgumentException ("no results found for keyword");
       }
 
     if (! (str instanceof String))
@@ -1213,14 +1213,14 @@ public abstract class ImageReader
 
     if (warningListeners != null)
       {
-	Iterator it = warningListeners.iterator();
+        Iterator it = warningListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOReadWarningListener listener =
-	      (IIOReadWarningListener) it.next();
-	    listener.warningOccurred(this, warning);
-	  }
+        while (it.hasNext())
+          {
+            IIOReadWarningListener listener =
+              (IIOReadWarningListener) it.next();
+            listener.warningOccurred(this, warning);
+          }
       }
   }
 
@@ -1292,7 +1292,7 @@ public abstract class ImageReader
    * @exception IndexOutOfBoundsException if either the frame index or
    * the thumbnail index is out-of-bounds
    * @exception IOException if a read error occurs
-   * 
+   *
    */
   public BufferedImage readThumbnail(int imageIndex, int thumbnailIndex)
     throws IOException
@@ -1329,13 +1329,13 @@ public abstract class ImageReader
    *
    * @param listener the listener to remove
    */
-  public void removeIIOReadProgressListener(IIOReadProgressListener listener) 
+  public void removeIIOReadProgressListener(IIOReadProgressListener listener)
   {
     if (listener == null)
       return;
     if (progressListeners != null)
       {
-	progressListeners.remove(listener);
+        progressListeners.remove(listener);
       }
   }
 
@@ -1344,14 +1344,14 @@ public abstract class ImageReader
    *
    * @param listener the listener to remove
    */
-  public void removeIIOReadUpdateListener(IIOReadUpdateListener listener) 
+  public void removeIIOReadUpdateListener(IIOReadUpdateListener listener)
   {
     if (listener == null)
       return;
 
     if (updateListeners != null)
       {
-	updateListeners.remove(listener);
+        updateListeners.remove(listener);
       }
   }
 
@@ -1366,7 +1366,7 @@ public abstract class ImageReader
       return;
     if (warningListeners != null)
       {
-	warningListeners.remove(listener);
+        warningListeners.remove(listener);
       }
   }
 
@@ -1379,16 +1379,16 @@ public abstract class ImageReader
   {
     if (locale != null)
       {
-	// Check if its a valid locale.
-	boolean found = false;
+        // Check if its a valid locale.
+        boolean found = false;
 
-	if (availableLocales != null)
-	  for (int i = availableLocales.length - 1; i >= 0; --i)
-	    if (availableLocales[i].equals(locale))
-	      found = true;
+        if (availableLocales != null)
+          for (int i = availableLocales.length - 1; i >= 0; --i)
+            if (availableLocales[i].equals(locale))
+              found = true;
 
-	if (! found)
-	  throw new IllegalArgumentException("looale not available");
+        if (! found)
+          throw new IllegalArgumentException("looale not available");
       }
 
     this.locale = locale;
@@ -1411,8 +1411,8 @@ public abstract class ImageReader
    * destination band indices are invalid
    */
   protected static void checkReadParamBandSettings(ImageReadParam param,
-						   int numSrcBands,
-						   int numDstBands)
+                                                   int numSrcBands,
+                                                   int numDstBands)
   {
     int[] srcBands = param.getSourceBands();
     int[] dstBands = param.getDestinationBands();
@@ -1513,11 +1513,11 @@ public abstract class ImageReader
    * regions is empty
    */
   protected static void computeRegions (ImageReadParam param,
-					int srcWidth,
-					int srcHeight,
-					BufferedImage image,
-					Rectangle srcRegion,
-					Rectangle destRegion)
+                                        int srcWidth,
+                                        int srcHeight,
+                                        BufferedImage image,
+                                        Rectangle srcRegion,
+                                        Rectangle destRegion)
   {
     if (srcRegion == null || destRegion == null)
       throw new IllegalArgumentException ("null region");
@@ -1594,9 +1594,9 @@ public abstract class ImageReader
    * height is greater than Integer.MAX_VALUE
    */
   protected static BufferedImage getDestination (ImageReadParam param,
-						 Iterator imageTypes,
-						 int width,
-						 int height)
+                                                 Iterator imageTypes,
+                                                 int width,
+                                                 int height)
     throws IIOException
   {
     if (imageTypes == null || !imageTypes.hasNext())
@@ -1751,8 +1751,8 @@ public abstract class ImageReader
    * @return a clipped rectangle
    */
   protected static Rectangle getSourceRegion (ImageReadParam param,
-					      int srcWidth,
-					      int srcHeight)
+                                              int srcWidth,
+                                              int srcHeight)
   {
     Rectangle clippedRegion = new Rectangle (0, 0, srcWidth, srcHeight);
 
@@ -1870,7 +1870,7 @@ public abstract class ImageReader
    * @exception IOException if a read error occurs
    */
   public IIOImage readAll (int imageIndex,
-			   ImageReadParam param)
+                           ImageReadParam param)
     throws IOException
   {
     checkReadParamBandSettings (param,
@@ -1953,7 +1953,7 @@ public abstract class ImageReader
    * @exception IOException if a read error occurs
    */
   public RenderedImage readAsRenderedImage (int imageIndex,
-					    ImageReadParam param)
+                                            ImageReadParam param)
     throws IOException
   {
     return read (imageIndex, param);
@@ -2033,4 +2033,3 @@ public abstract class ImageReader
     clearAbortRequest ();
   }
 }
-
diff --git a/libjava/classpath/javax/imageio/ImageTranscoder.java b/libjava/classpath/javax/imageio/ImageTranscoder.java
index 1f9195f5816..352bb18b763 100644
--- a/libjava/classpath/javax/imageio/ImageTranscoder.java
+++ b/libjava/classpath/javax/imageio/ImageTranscoder.java
@@ -78,8 +78,8 @@ public interface ImageTranscoder
    * is null
    */
   IIOMetadata convertImageMetadata(IIOMetadata inData,
-		                   ImageTypeSpecifier imageType,
-				   ImageWriteParam param);
+                                   ImageTypeSpecifier imageType,
+                                   ImageWriteParam param);
 
   /**
    * Converts IIOMetadata from an input stream format, returning an
@@ -98,5 +98,5 @@ public interface ImageTranscoder
    * @exception IllegalArgumentException if inData is null
    */
   IIOMetadata convertStreamMetadata(IIOMetadata inData,
-				    ImageWriteParam param);
+                                    ImageWriteParam param);
 }
diff --git a/libjava/classpath/javax/imageio/ImageTypeSpecifier.java b/libjava/classpath/javax/imageio/ImageTypeSpecifier.java
index 3faa3c937c3..da229610aee 100644
--- a/libjava/classpath/javax/imageio/ImageTypeSpecifier.java
+++ b/libjava/classpath/javax/imageio/ImageTypeSpecifier.java
@@ -90,7 +90,7 @@ public class ImageTypeSpecifier
     if (!colorModel.isCompatibleSampleModel(sampleModel))
       throw new IllegalArgumentException
         ("sample Model not compatible with colorModel");
-    
+
     this.colorModel = colorModel;
     this.sampleModel = sampleModel;
   }
@@ -107,7 +107,7 @@ public class ImageTypeSpecifier
   {
     if (image == null)
       throw new IllegalArgumentException("image may not be null");
-    
+
     this.colorModel = image.getColorModel();
     this.sampleModel = image.getSampleModel();
   }
@@ -324,11 +324,11 @@ public class ImageTypeSpecifier
    * data type
    */
   public static ImageTypeSpecifier createIndexed (byte[] redLUT,
-						  byte[] greenLUT,
-						  byte[] blueLUT,
-						  byte[] alphaLUT,
-						  int bits,
-						  int dataType)
+                                                  byte[] greenLUT,
+                                                  byte[] blueLUT,
+                                                  byte[] alphaLUT,
+                                                  int bits,
+                                                  int dataType)
   {
     if (redLUT == null || greenLUT == null || blueLUT == null)
       throw new IllegalArgumentException ("null colour table");
@@ -402,10 +402,10 @@ public class ImageTypeSpecifier
    * one value of the given data type.
    *
    * @param colorSpace the color space to use in the color model
-   * @param redMask the bitmask for the red bits 
-   * @param greenMask the bitmask for the green bits 
-   * @param blueMask the bitmask for the blue bits 
-   * @param alphaMask the bitmask for the alpha bits 
+   * @param redMask the bitmask for the red bits
+   * @param greenMask the bitmask for the green bits
+   * @param blueMask the bitmask for the blue bits
+   * @param alphaMask the bitmask for the alpha bits
    * @param transferType the data type used to store pixel values
    * @param isAlphaPremultiplied true if other colour channels should
    * be premultiplied by the alpha value, false otherwise
diff --git a/libjava/classpath/javax/imageio/ImageWriteParam.java b/libjava/classpath/javax/imageio/ImageWriteParam.java
index f4794a37530..1c400e1ea36 100644
--- a/libjava/classpath/javax/imageio/ImageWriteParam.java
+++ b/libjava/classpath/javax/imageio/ImageWriteParam.java
@@ -46,118 +46,118 @@ import java.util.Locale;
  */
 public class ImageWriteParam extends IIOParam
 {
-  
-  /** 
+
+  /**
    * Can be passed to setTilingMode, setProgressiveMode and
    * setCompressionMode to disable feature.
    */
   public static final int MODE_DISABLED = 0;
-  
-  /** 
-   * Can be passed to setTilingMode, setProgressiveMode and 
+
+  /**
+   * Can be passed to setTilingMode, setProgressiveMode and
    * setCompressionMode to enable feature.
    */
   public static final int MODE_DEFAULT = 1;
-  
-  /** 
+
+  /**
    * Can be passed to setTilingMode, setCompressionMode to disable feature.
    */
   public static final int MODE_EXPLICIT = 2;
-  
-  /** 
-   * Can be passed to setTilingMode, setProgressiveMode and 
+
+  /**
+   * Can be passed to setTilingMode, setProgressiveMode and
    * setCompressionMode to enable feature.
    */
   public static final int MODE_COPY_FROM_METADATA = 3;
-  
+
   /**
    * True if tiling grid offset parameters can be set.
    */
   protected boolean canOffsetTiles;
-  
+
   /**
    * True if this writer can write images using compression.
    */
   protected boolean canWriteCompressed;
-  
+
   /**
    * True if images can be written as a progressive sequence
    * of increasing quality.
    */
   protected boolean canWriteProgressive;
-  
+
   /**
    * True if tile width and height parameters can be set.
    */
   protected boolean canWriteTiles;
-  
+
   /**
    * Controls compression settings, which must be set to one of the four
    * MODE_* values.
    */
   protected int compressionMode = MODE_COPY_FROM_METADATA;
-  
+
   /**
    * Contains the current compression quality setting.
    */
   protected float compressionQuality;
-  
+
   /**
    * Contains the name of the current compression type.
    */
   protected String compressionType;
-  
+
   /**
    * Array of the names of the available compression types.
    */
   protected String[] compressionTypes;
-  
+
   /**
    * Localizes compression type names and quality descriptions,
    * or null to use default Locale.
    */
   protected Locale locale;
-  
+
   /**
    * Preferred tile size range pairs.
    */
   protected Dimension[] preferredTileSizes;
-  
+
   /**
    * The mode controlling progressive encoding, which must
    * be set to one of the four MODE_* values, except
    * MODE_EXPLICIT.
    */
   protected int progressiveMode = MODE_COPY_FROM_METADATA;
-  
+
   /**
    * The amount by which the tile grid origin should be offset
    * horizontally from the image origin if tiling has been set.
    */
   protected int tileGridXOffset;
-  
+
   /**
    * The amount by which the tile grid origin should be offset
    * vertically from the image origin if tiling has been set.
    */
   protected int tileGridYOffset;
-  
+
   /**
    * The height of each tile if tiling has been set.
    */
   protected int tileHeight;
-  
+
   /**
    * The width of each tile if tiling has been set.
    */
   protected int tileWidth;
-  
+
   /**
    * The mode controlling tiling settings, which must be
    * set to one of the four MODE_* values.
    */
   protected int tilingMode;
-  
+
   /**
    * True if the tiling parameters have been specified.
    */
@@ -201,11 +201,11 @@ public class ImageWriteParam extends IIOParam
     if (getCompressionMode() != MODE_EXPLICIT)
       throw new IllegalStateException("compression mode is not MODE_EXPLICIT");
   }
-  
+
   private void checkCompressionTypesSet()
   {
     if (getCompressionType() == null
-	&& getCompressionTypes() != null)
+        && getCompressionTypes() != null)
       throw new IllegalStateException("no compression type set");
   }
 
@@ -213,9 +213,9 @@ public class ImageWriteParam extends IIOParam
   {
     if (! canWriteProgressive())
       throw new UnsupportedOperationException
-	("progressive output not supported");
+        ("progressive output not supported");
   }
-  
+
   private void checkSupportsTiling()
   {
     if (! canWriteTiles())
@@ -279,7 +279,7 @@ public class ImageWriteParam extends IIOParam
   {
     checkNotExplicitCompression();
     checkCompressionTypesSet();
-    
+
     return null;
   }
 
@@ -287,7 +287,7 @@ public class ImageWriteParam extends IIOParam
   {
     checkNotExplicitCompression();
     checkCompressionTypesSet();
-    
+
     return null;
   }
 
@@ -383,9 +383,9 @@ public class ImageWriteParam extends IIOParam
   {
     checkSupportsCompression();
     checkMode(mode);
-    
+
     compressionMode = mode;
-    
+
     if (mode == MODE_EXPLICIT)
       unsetCompression();
   }
@@ -409,17 +409,17 @@ public class ImageWriteParam extends IIOParam
 
     if (types == null)
       throw new UnsupportedOperationException("no settable compression types");
-    
+
     if (compressionType == null)
       this.compressionType = null;
 
     for (int i = types.length - 1; i >= 0; --i)
       if (types[i].equals(compressionType))
-	{
-	  this.compressionType = compressionType;
-	  return;
-	}
-    
+        {
+          this.compressionType = compressionType;
+          return;
+        }
+
     throw new IllegalArgumentException("unknown compression type");
   }
 
@@ -427,18 +427,18 @@ public class ImageWriteParam extends IIOParam
   {
     checkSupportsProgressiveEncoding();
     checkMode(mode);
-    
+
     progressiveMode = mode;
   }
 
   public void setTiling(int tileWidth, int tileHeight,
-		        int tileGridXOffset, int tileGridYOffset)
+                        int tileGridXOffset, int tileGridYOffset)
   {
     checkNotExplicitTiling();
 
     if (! canOffsetTiles
-	&& tileGridXOffset != 0
-	&& tileGridYOffset != 0)
+        && tileGridXOffset != 0
+        && tileGridYOffset != 0)
       throw new UnsupportedOperationException("tile offsets not supported");
 
     if (tileWidth < 0 || tileHeight < 0)
@@ -446,18 +446,18 @@ public class ImageWriteParam extends IIOParam
 
     if (preferredTileSizes != null)
       {
-	boolean found = false;
+        boolean found = false;
 
-	for (int i = 0; i < preferredTileSizes.length; i += 2)
-	  {
-	    if (tileWidth >= preferredTileSizes[i].width
-		&& tileWidth <= preferredTileSizes[i + 1].width
-		&& tileHeight >= preferredTileSizes[i].height
-		&& tileHeight <= preferredTileSizes[i + 1].height)
-	      found = true;
-	  }
+        for (int i = 0; i < preferredTileSizes.length; i += 2)
+          {
+            if (tileWidth >= preferredTileSizes[i].width
+                && tileWidth <= preferredTileSizes[i + 1].width
+                && tileHeight >= preferredTileSizes[i].height
+                && tileHeight <= preferredTileSizes[i + 1].height)
+              found = true;
+          }
 
-	if (! found)
+        if (! found)
           throw new IllegalArgumentException("illegal tile size");
       }
 
@@ -478,7 +478,7 @@ public class ImageWriteParam extends IIOParam
   public void unsetCompression()
   {
     checkNotExplicitCompression();
-    
+
     compressionType = null;
     compressionQuality = 1.0F;
   }
@@ -486,7 +486,7 @@ public class ImageWriteParam extends IIOParam
   public void unsetTiling()
   {
     checkNotExplicitTiling();
-    
+
     tileWidth = 0;
     tileHeight = 0;
     tileGridXOffset = 0;
diff --git a/libjava/classpath/javax/imageio/ImageWriter.java b/libjava/classpath/javax/imageio/ImageWriter.java
index 78d792c72d4..7a7f45e6f0d 100644
--- a/libjava/classpath/javax/imageio/ImageWriter.java
+++ b/libjava/classpath/javax/imageio/ImageWriter.java
@@ -76,7 +76,7 @@ public abstract class ImageWriter
   implements ImageTranscoder
 {
   private boolean aborted;
-  
+
   /**
    * All locales available for localization of warning messages, or
    * null if localization is not supported.
@@ -138,7 +138,7 @@ public abstract class ImageWriter
     if (output == null)
       throw new IllegalStateException("no output set");
   }
-  
+
   /**
    * Request that writing be aborted.  The unwritten portions of the
    * destination image will be undefined.
@@ -392,8 +392,8 @@ public abstract class ImageWriter
    * is null
    */
   public abstract IIOMetadata convertImageMetadata (IIOMetadata inData,
-		                                    ImageTypeSpecifier imageType,
-				                    ImageWriteParam param);
+                                                    ImageTypeSpecifier imageType,
+                                                    ImageWriteParam param);
 
   /**
    * Convert IIOMetadata from an input stream format, returning an
@@ -412,7 +412,7 @@ public abstract class ImageWriter
    * @exception IllegalArgumentException if inData is null
    */
   public abstract IIOMetadata convertStreamMetadata (IIOMetadata inData,
-					             ImageWriteParam param);
+                                                     ImageWriteParam param);
 
   /**
    * Releases any resources allocated to this object.  Subsequent
@@ -425,7 +425,7 @@ public abstract class ImageWriter
   {
     // The default implementation is empty. Subclasses have to overwrite it.
   }
-  
+
   /**
    * Retrieve the available locales.  Return null if no locales are
    * available or a clone of availableLocales.
@@ -504,7 +504,7 @@ public abstract class ImageWriter
    */
   public int getNumThumbnailsSupported (ImageTypeSpecifier imageType,
                                         ImageWriteParam param,
-		                        IIOMetadata streamMetadata,
+                                        IIOMetadata streamMetadata,
                                         IIOMetadata imageMetadata)
   {
     return 0;
@@ -553,9 +553,9 @@ public abstract class ImageWriter
    * if the size is unknown (insufficient information was provided)
    */
   public Dimension[] getPreferredThumbnailSizes (ImageTypeSpecifier imageType,
-		                                 ImageWriteParam param,
-						 IIOMetadata streamMetadata,
-						 IIOMetadata imageMetadata)
+                                                 ImageWriteParam param,
+                                                 IIOMetadata streamMetadata,
+                                                 IIOMetadata imageMetadata)
   {
     return null;
   }
@@ -568,14 +568,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.imageComplete(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.imageComplete(this);
+          }
       }
   }
 
@@ -591,14 +591,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.imageProgress(this, percentageDone);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.imageProgress(this, percentageDone);
+          }
       }
   }
 
@@ -614,14 +614,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.imageStarted(this, imageIndex);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.imageStarted(this, imageIndex);
+          }
       }
   }
 
@@ -634,14 +634,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.thumbnailComplete(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.thumbnailComplete(this);
+          }
       }
   }
 
@@ -657,14 +657,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.thumbnailProgress(this, percentageDone);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.thumbnailProgress(this, percentageDone);
+          }
       }
   }
 
@@ -682,14 +682,14 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
+          }
       }
   }
 
@@ -707,14 +707,14 @@ public abstract class ImageWriter
   {
      if (warningListeners != null)
       {
-	Iterator it = warningListeners.iterator();
+        Iterator it = warningListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteWarningListener listener =
-	      (IIOWriteWarningListener) it.next();
-	    listener.warningOccurred(this, imageIndex, warning);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteWarningListener listener =
+              (IIOWriteWarningListener) it.next();
+            listener.warningOccurred(this, imageIndex, warning);
+          }
       }
   }
 
@@ -741,8 +741,8 @@ public abstract class ImageWriter
    * not a String
    */
   protected void processWarningOccurred(int imageIndex,
-					String baseName,
-					String keyword)
+                                        String baseName,
+                                        String keyword)
   {
     if (baseName == null || keyword == null)
       throw new IllegalArgumentException ("null argument");
@@ -751,22 +751,22 @@ public abstract class ImageWriter
 
     try
       {
-	b = ResourceBundle.getBundle(baseName, getLocale());
+        b = ResourceBundle.getBundle(baseName, getLocale());
       }
     catch (MissingResourceException e)
       {
-	throw new IllegalArgumentException ("no resource bundle found");
+        throw new IllegalArgumentException ("no resource bundle found");
       }
 
     Object str = null;
 
     try
       {
-	str = b.getObject(keyword);
+        str = b.getObject(keyword);
       }
     catch (MissingResourceException e)
       {
-	throw new IllegalArgumentException ("no results found for keyword");
+        throw new IllegalArgumentException ("no results found for keyword");
       }
 
     if (! (str instanceof String))
@@ -776,14 +776,14 @@ public abstract class ImageWriter
 
     if (warningListeners != null)
       {
-	Iterator it = warningListeners.iterator();
+        Iterator it = warningListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteWarningListener listener =
-	      (IIOWriteWarningListener) it.next();
-	    listener.warningOccurred(this, imageIndex, warning);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteWarningListener listener =
+              (IIOWriteWarningListener) it.next();
+            listener.warningOccurred(this, imageIndex, warning);
+          }
       }
   }
 
@@ -791,18 +791,18 @@ public abstract class ImageWriter
    * Notifies all installed write progress listeners that image
    * loading has been aborted by calling their writeAborted methods.
    */
-  protected void processWriteAborted() 
+  protected void processWriteAborted()
   {
     if (progressListeners != null)
       {
-	Iterator it = progressListeners.iterator();
+        Iterator it = progressListeners.iterator();
 
-	while (it.hasNext())
-	  {
-	    IIOWriteProgressListener listener =
-	      (IIOWriteProgressListener) it.next();
-	    listener.writeAborted(this);
-	  }
+        while (it.hasNext())
+          {
+            IIOWriteProgressListener listener =
+              (IIOWriteProgressListener) it.next();
+            listener.writeAborted(this);
+          }
       }
   }
 
@@ -813,7 +813,7 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	progressListeners.clear();
+        progressListeners.clear();
       }
   }
 
@@ -824,7 +824,7 @@ public abstract class ImageWriter
   {
     if (progressListeners != null)
       {
-	progressListeners.clear();
+        progressListeners.clear();
       }
   }
 
@@ -839,7 +839,7 @@ public abstract class ImageWriter
       return;
     if (progressListeners != null)
       {
-	progressListeners.remove(listener);
+        progressListeners.remove(listener);
       }
   }
   /**
@@ -853,7 +853,7 @@ public abstract class ImageWriter
       return;
     if (warningListeners != null)
       {
-	warningListeners.remove(listener);
+        warningListeners.remove(listener);
       }
   }
   /**
@@ -867,7 +867,7 @@ public abstract class ImageWriter
     removeAllIIOWriteProgressListeners();
     clearAbortRequest();
   }
-  
+
   /**
    * Set the current locale or use the default locale.
    *
@@ -877,16 +877,16 @@ public abstract class ImageWriter
   {
     if (locale != null)
       {
-	// Check if its a valid locale.
-	boolean found = false;
+        // Check if its a valid locale.
+        boolean found = false;
 
-	if (availableLocales != null)
-	  for (int i = availableLocales.length - 1; i >= 0; --i)
-	    if (availableLocales[i].equals(locale))
-	      found = true;
+        if (availableLocales != null)
+          for (int i = availableLocales.length - 1; i >= 0; --i)
+            if (availableLocales[i].equals(locale))
+              found = true;
 
-	if (! found)
-	  throw new IllegalArgumentException("looale not available");
+        if (! found)
+          throw new IllegalArgumentException("looale not available");
       }
 
     this.locale = locale;
@@ -908,20 +908,20 @@ public abstract class ImageWriter
   {
     if (output != null)
       {
-	// Check if its a valid output object.
-	boolean found = false;
-	Class[] types = null;
+        // Check if its a valid output object.
+        boolean found = false;
+        Class[] types = null;
 
-	if (originatingProvider != null)
-	  types = originatingProvider.getOutputTypes();
-        
-	if (types != null)
-	  for (int i = types.length - 1; i >= 0; --i)
+        if (originatingProvider != null)
+          types = originatingProvider.getOutputTypes();
+
+        if (types != null)
+          for (int i = types.length - 1; i >= 0; --i)
             if (types[i].isInstance(output))
               found = true;
 
-	if (! found)
-	  throw new IllegalArgumentException("output type not available");
+        if (! found)
+          throw new IllegalArgumentException("output type not available");
       }
 
     this.output = output;
diff --git a/libjava/classpath/javax/imageio/event/IIOReadProgressListener.java b/libjava/classpath/javax/imageio/event/IIOReadProgressListener.java
index 404336c24bf..0eea6101772 100644
--- a/libjava/classpath/javax/imageio/event/IIOReadProgressListener.java
+++ b/libjava/classpath/javax/imageio/event/IIOReadProgressListener.java
@@ -46,7 +46,7 @@ public interface IIOReadProgressListener extends EventListener
 {
   /**
    * Reports that the current image read operation has completed.
-   * 
+   *
    * @param source the ImageReader object calling this method
    */
   void imageComplete(ImageReader source);
@@ -54,7 +54,7 @@ public interface IIOReadProgressListener extends EventListener
   /**
    * Reports the approximate percentage of completions of this image read
    * operation.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param percentageDone the approximate percentage of encoding completed
    */
@@ -62,7 +62,7 @@ public interface IIOReadProgressListener extends EventListener
 
   /**
    * Reports that the current image read operation has started.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param imageIndex the index of the image to read
    */
@@ -70,21 +70,21 @@ public interface IIOReadProgressListener extends EventListener
 
   /**
    * Reports that a read operation has been aborted.
-   * 
+   *
    * @param source the ImageReader object calling this method
    */
   void readAborted(ImageReader source);
 
   /**
    * Reports that a sequence of read operationshas completed.
-   * 
+   *
    * @param source the ImageReader object calling this method
    */
   void sequenceComplete(ImageReader source);
 
   /**
    * Reports that a sequence of read operations is beginning.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param minIndex the index of the first image to be read
    */
@@ -92,7 +92,7 @@ public interface IIOReadProgressListener extends EventListener
 
   /**
    * Reports that a thumbnail read operation has completed.
-   * 
+   *
    * @param source the ImageReader object calling this method
    */
   void thumbnailComplete(ImageReader source);
@@ -100,7 +100,7 @@ public interface IIOReadProgressListener extends EventListener
   /**
    * Reports the approximate percentage of completion of a thumbnail read
    * operation.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param percentageDone the approximate percentage of encoding completed
    */
@@ -108,7 +108,7 @@ public interface IIOReadProgressListener extends EventListener
 
   /**
    * Reports that a thumbnail read operation is beginning.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param imageIndex the index of the image being read
    * @param thumbnailIndex the index of the thumbnail being read
diff --git a/libjava/classpath/javax/imageio/event/IIOReadUpdateListener.java b/libjava/classpath/javax/imageio/event/IIOReadUpdateListener.java
index 77b1a4e0718..a20a99ebceb 100644
--- a/libjava/classpath/javax/imageio/event/IIOReadUpdateListener.java
+++ b/libjava/classpath/javax/imageio/event/IIOReadUpdateListener.java
@@ -47,7 +47,7 @@ public interface IIOReadUpdateListener extends EventListener
 {
   /**
    * Reports that a given region of the image has been updated.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param image the BufferedImage being updated
    * @param minX the X coordinate of the leftmost updated column of pixels
@@ -64,7 +64,7 @@ public interface IIOReadUpdateListener extends EventListener
 
   /**
    * Reports that the current read operation has completed a progressive pass.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param image the BufferedImage being updated
    */
@@ -72,7 +72,7 @@ public interface IIOReadUpdateListener extends EventListener
 
   /**
    * Reports that the current read operation is about to begin a progressive pass.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param image the BufferedImage being updated
    * @param pass the numer of the pass that is about to begin, starting with 0
@@ -90,7 +90,7 @@ public interface IIOReadUpdateListener extends EventListener
 
   /**
    * Reports that the current thumbnail read operation has completed a progressive pass.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param image the BufferedImage being updated
    */
@@ -98,7 +98,7 @@ public interface IIOReadUpdateListener extends EventListener
 
   /**
    * Reports that the current thumbnail read operation is about to begin a progressive pass.
-   * 
+   *
    * @param source the ImageReader object calling this method
    * @param image the BufferedImage being updated
    * @param pass the numer of the pass that is about to begin, starting with 0
diff --git a/libjava/classpath/javax/imageio/event/IIOWriteProgressListener.java b/libjava/classpath/javax/imageio/event/IIOWriteProgressListener.java
index 16b8891f0f2..d7597620590 100644
--- a/libjava/classpath/javax/imageio/event/IIOWriteProgressListener.java
+++ b/libjava/classpath/javax/imageio/event/IIOWriteProgressListener.java
@@ -46,7 +46,7 @@ public interface IIOWriteProgressListener extends EventListener
 {
   /**
    * Reports that an image write operation has completed.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    */
   void imageComplete(ImageWriter source);
@@ -54,7 +54,7 @@ public interface IIOWriteProgressListener extends EventListener
   /**
    * Reports the approximate percentage of completion of an image write
    * operation.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    * @param percentageDone the approximate percentage of decoding completed
    */
@@ -62,7 +62,7 @@ public interface IIOWriteProgressListener extends EventListener
 
   /**
    * Reports that a thumbnail write operation has started.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    * @param imageIndex the index of the image being written
    */
@@ -70,7 +70,7 @@ public interface IIOWriteProgressListener extends EventListener
 
   /**
    * Reports that a thumbnail write operation has completed.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    */
   void thumbnailComplete(ImageWriter source);
@@ -78,7 +78,7 @@ public interface IIOWriteProgressListener extends EventListener
   /**
    * Reports the approximate percentage of completion of a thumbnail write
    * operation.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    * @param percentageDone the approximate percentage of decoding completed
    */
@@ -86,7 +86,7 @@ public interface IIOWriteProgressListener extends EventListener
 
   /**
    * Reports that a thumbnail write operation is beginning.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    * @param imageIndex the index of the image being written
    * @param thumnailIndex the index of the thumbnail being written
@@ -95,7 +95,7 @@ public interface IIOWriteProgressListener extends EventListener
 
   /**
    * Reports that an image write operation is aborted.
-   * 
+   *
    * @param source the ImageWriter object calling this method
    */
   void writeAborted(ImageWriter source);
diff --git a/libjava/classpath/javax/imageio/metadata/IIOInvalidTreeException.java b/libjava/classpath/javax/imageio/metadata/IIOInvalidTreeException.java
index 18d5bf617b1..b79b8cf9627 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOInvalidTreeException.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOInvalidTreeException.java
@@ -55,7 +55,7 @@ public class IIOInvalidTreeException extends IIOException
   }
 
   public IIOInvalidTreeException(String message, Throwable cause,
-				 Node offendingNode)
+                                 Node offendingNode)
   {
     super(message, cause);
     this.offendingNode = offendingNode;
diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadata.java b/libjava/classpath/javax/imageio/metadata/IIOMetadata.java
index e5105de2caf..b898b994232 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOMetadata.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOMetadata.java
@@ -162,39 +162,39 @@ public abstract class IIOMetadata
   {
     if (formatName == null)
       throw new IllegalArgumentException("formatName may not be null");
-    
+
     String formatClassName = null;
 
     if (isStandardMetadataFormatSupported()
-	&& formatName.equals(nativeMetadataFormatName))
+        && formatName.equals(nativeMetadataFormatName))
       formatClassName = nativeMetadataFormatClassName;
     else
       {
-	String[] extraFormatNames = getExtraMetadataFormatNames();
-	
-	for (int i = extraFormatNames.length - 1; i >= 0; --i)
-	  if (extraFormatNames[i].equals(formatName))
-	    {
-	      formatClassName = extraFormatNames[i];
-	      break;
-	    }
+        String[] extraFormatNames = getExtraMetadataFormatNames();
+
+        for (int i = extraFormatNames.length - 1; i >= 0; --i)
+          if (extraFormatNames[i].equals(formatName))
+            {
+              formatClassName = extraFormatNames[i];
+              break;
+            }
       }
 
     if (formatClassName == null)
       throw new IllegalArgumentException("unknown format");
 
     IIOMetadataFormat format;
-    
+
     try
       {
-	format = (IIOMetadataFormat) Class.forName(formatClassName)
-					  .newInstance();
+        format = (IIOMetadataFormat) Class.forName(formatClassName)
+                                          .newInstance();
       }
     catch (Exception e)
       {
-	IllegalStateException ise = new IllegalStateException();
-	ise.initCause(e);
-	throw ise;
+        IllegalStateException ise = new IllegalStateException();
+        ise.initCause(e);
+        throw ise;
       }
 
     return format;
@@ -203,18 +203,18 @@ public abstract class IIOMetadata
   public String[] getMetadataFormatNames()
   {
     String[] formatNames = getExtraMetadataFormatNames();
-    
+
     if (isStandardMetadataFormatSupported())
       {
         // Combine native metadata format name and extra metadata format names
-	// into one String array.
-	String[] tmp = new String[formatNames.length + 1];
-	tmp[0] = getNativeMetadataFormatName();
+        // into one String array.
+        String[] tmp = new String[formatNames.length + 1];
+        tmp[0] = getNativeMetadataFormatName();
 
-	for (int i = 1; i < tmp.length; ++i)
-	  tmp[i] = formatNames[i - 1];
+        for (int i = 1; i < tmp.length; ++i)
+          tmp[i] = formatNames[i - 1];
 
-	formatNames = tmp;
+        formatNames = tmp;
       }
 
     return formatNames;
@@ -287,7 +287,7 @@ public abstract class IIOMetadata
   }
 
   private void appendChild (IIOMetadataNode node,
-			    IIOMetadataNode child)
+                            IIOMetadataNode child)
   {
     if (child != null)
       node.appendChild(child);
diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
index 444497d7dc5..efea723f9ab 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataFormatImpl.java
@@ -88,18 +88,18 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     protected String defaultValue;
 
     public IIOMetadataNodeAttr (Element owner,
-				String name,
-				String defaultValue)
+                                String name,
+                                String defaultValue)
     {
       this (owner, name, IIOMetadataFormat.DATATYPE_STRING,
             true, defaultValue);
     }
 
     public IIOMetadataNodeAttr (Element owner,
-				String name,
-				int dataType,
-				boolean required,
-				String defaultValue)
+                                String name,
+                                int dataType,
+                                boolean required,
+                                String defaultValue)
     {
       this.owner = owner;
       this.name = name;
@@ -160,11 +160,11 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     protected List enumeratedValues;
 
     public IIOMetadataNodeAttrEnumerated (Element owner,
-					  String name,
-					  int dataType,
-					  boolean required,
-					  String defaultValue,
-					  List enumeratedValues)
+                                          String name,
+                                          int dataType,
+                                          boolean required,
+                                          String defaultValue,
+                                          List enumeratedValues)
     {
       super (owner, name, dataType, required, defaultValue);
       this.enumeratedValues = new ArrayList (enumeratedValues);
@@ -184,14 +184,14 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     protected boolean maxInclusive;
 
     public IIOMetadataNodeAttrBounded (Element owner,
-				       String name,
-				       int dataType,
-				       boolean required,
-				       String defaultValue,
-				       String minValue,
-				       String maxValue,
-				       boolean minInclusive,
-				       boolean maxInclusive)
+                                       String name,
+                                       int dataType,
+                                       boolean required,
+                                       String defaultValue,
+                                       String minValue,
+                                       String maxValue,
+                                       boolean minInclusive,
+                                       boolean maxInclusive)
     {
       super (owner, name, dataType, required, defaultValue);
       this.minValue = minValue;
@@ -217,11 +217,11 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     protected int listMaxLength;
 
     public IIOMetadataNodeAttrList (Element owner,
-				    String name,
-				    int dataType,
-				    boolean required,
-				    int listMinLength,
-				    int listMaxLength)
+                                    String name,
+                                    int dataType,
+                                    boolean required,
+                                    int listMinLength,
+                                    int listMaxLength)
     {
       super (owner, name, dataType, required, null);
       this.listMinLength = listMinLength;
@@ -398,8 +398,8 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
       throw new IllegalArgumentException ("null argument");
 
     if (childPolicy < IIOMetadataFormat.CHILD_POLICY_ALL
-	|| childPolicy > IIOMetadataFormat.CHILD_POLICY_SOME
-	|| childPolicy == IIOMetadataFormat.CHILD_POLICY_REPEAT)
+        || childPolicy > IIOMetadataFormat.CHILD_POLICY_SOME
+        || childPolicy == IIOMetadataFormat.CHILD_POLICY_REPEAT)
       throw new IllegalArgumentException ("wrong child policy");
 
     nodes.put (rootName, new IIOMetadataNode (rootName));
@@ -423,8 +423,8 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
    * zero or greater than maxChildren
    */
   public IIOMetadataFormatImpl (String rootName,
-				int minChildren,
-				int maxChildren)
+                                int minChildren,
+                                int maxChildren)
   {
     if (rootName == null)
       throw new IllegalArgumentException ("null argument");
@@ -446,10 +446,10 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     node.setAttributeNode (new IIOMetadataNodeAttr (node,
-						    attrName,
-						    dataType,
-						    required,
-						    defaultValue));
+                                                    attrName,
+                                                    dataType,
+                                                    required,
+                                                    defaultValue));
   }
 
   protected void addAttribute (String elementName,
@@ -461,11 +461,11 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     node.setAttributeNode (new IIOMetadataNodeAttrEnumerated (node,
-							      attrName,
-							      dataType,
-							      required,
-							      defaultValue,
-							      enumeratedValues));
+                                                              attrName,
+                                                              dataType,
+                                                              required,
+                                                              defaultValue,
+                                                              enumeratedValues));
   }
 
   protected void addAttribute (String elementName,
@@ -480,14 +480,14 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     node.setAttributeNode (new IIOMetadataNodeAttrBounded (node,
-							   attrName,
-							   dataType,
-							   required,
-							   defaultValue,
-							   minValue,
-							   maxValue,
-							   minInclusive,
-							   maxInclusive));
+                                                           attrName,
+                                                           dataType,
+                                                           required,
+                                                           defaultValue,
+                                                           minValue,
+                                                           maxValue,
+                                                           minInclusive,
+                                                           maxInclusive));
   }
 
   protected void addAttribute (String elementName,
@@ -499,11 +499,11 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
   {
     IIOMetadataNode node = (IIOMetadataNode) nodes.get (elementName);
     node.setAttributeNode (new IIOMetadataNodeAttrList (node,
-							attrName,
-							dataType,
-							required,
-							listMinLength,
-							listMaxLength));
+                                                        attrName,
+                                                        dataType,
+                                                        required,
+                                                        listMinLength,
+                                                        listMaxLength));
   }
 
   protected void addBooleanAttribute (String elementName,
@@ -518,11 +518,11 @@ public abstract class IIOMetadataFormatImpl implements IIOMetadataFormat
     enumeratedValues.add ("FALSE");
 
     node.setAttributeNode (new IIOMetadataNodeAttrEnumerated (node,
-							      attrName,
-							      IIOMetadataFormat.DATATYPE_BOOLEAN,
-							      hasDefaultValue,
-							      defaultValue ? "TRUE" : "FALSE",
-							      enumeratedValues));
+                                                              attrName,
+                                                              IIOMetadataFormat.DATATYPE_BOOLEAN,
+                                                              hasDefaultValue,
+                                                              defaultValue ? "TRUE" : "FALSE",
+                                                              enumeratedValues));
   }
 
   protected void addChildElement (String elementName, String parentName)
diff --git a/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java b/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java
index 37269f53916..db3de234708 100644
--- a/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java
+++ b/libjava/classpath/javax/imageio/metadata/IIOMetadataNode.java
@@ -165,7 +165,7 @@ public class IIOMetadataNode
   private class IIONodeList implements NodeList
   {
     List children = new ArrayList();
-  
+
     /* (non-Javadoc)
      * @see org.w3c.dom.NodeList#item(int)
      */
@@ -187,7 +187,7 @@ public class IIOMetadataNode
   {
     // Do nothing here.
   }
-  
+
   public IIOMetadataNode(String nodename)
   {
     name = nodename;
@@ -202,7 +202,7 @@ public class IIOMetadataNode
   {
     obj = o;
   }
-  
+
   public short compareDocumentPosition(Node other)
     throws DOMException
   {
@@ -260,7 +260,7 @@ public class IIOMetadataNode
       getElementsRecurse(list, name);
     }
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#getElementsByTagName(java.lang.String)
    */
@@ -280,7 +280,7 @@ public class IIOMetadataNode
     getElementsRecurse(list, name);
     return list;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#getTagName()
    */
@@ -288,7 +288,7 @@ public class IIOMetadataNode
   {
     return name;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#hasAttribute(java.lang.String)
    */
@@ -296,7 +296,7 @@ public class IIOMetadataNode
   {
     return attrs.containsKey(name);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#hasAttributeNS(java.lang.String, java.lang.String)
    */
@@ -304,7 +304,7 @@ public class IIOMetadataNode
   {
     return attrs.containsKey(localName);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#removeAttribute(java.lang.String)
    */
@@ -320,7 +320,7 @@ public class IIOMetadataNode
   {
     return (Attr)attrs.remove(oldAttr.getName());
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#removeAttributeNS(java.lang.String, java.lang.String)
    */
@@ -328,7 +328,7 @@ public class IIOMetadataNode
   {
     removeAttribute(localName);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#setAttribute(java.lang.String, java.lang.String)
    */
@@ -340,7 +340,7 @@ public class IIOMetadataNode
     else
       attrs.put(name, new IIOMetadataNodeAttr(this, name, value));
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#setAttributeNode(org.w3c.dom.Attr)
    */
@@ -348,7 +348,7 @@ public class IIOMetadataNode
   {
     return (Attr)attrs.put(newAttr.getName(), newAttr);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#setAttributeNodeNS(org.w3c.dom.Attr)
    */
@@ -356,15 +356,15 @@ public class IIOMetadataNode
   {
     return (Attr)attrs.put(newAttr.getName(), newAttr);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Element#setAttributeNS(java.lang.String, java.lang.String, java.lang.String)
    */
   public void setAttributeNS(String namespaceURI, String qualifiedName, String value)
   {
-    setAttribute(qualifiedName, value);    
+    setAttribute(qualifiedName, value);
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.NodeList#getLength()
    */
@@ -372,7 +372,7 @@ public class IIOMetadataNode
   {
     return children.size();
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.NodeList#item(int)
    */
@@ -383,7 +383,7 @@ public class IIOMetadataNode
     else
       return null;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#appendChild(org.w3c.dom.Node)
    */
@@ -391,9 +391,9 @@ public class IIOMetadataNode
   {
     if (newChild == null)
       throw new IllegalArgumentException("Child node is null");
-    
+
     IIOMetadataNode child = (IIOMetadataNode) newChild;
-    
+
     children.add(child);
     child.parent = this;
     return this;
@@ -412,7 +412,7 @@ public class IIOMetadataNode
       for (int i=0; i < children.size(); i++)
         newnode.children.add(((Node)children.get(i)).cloneNode(deep));
     }
-    
+
     // clone attrs
     for (Iterator it = attrs.values().iterator(); it.hasNext();)
     {
@@ -452,7 +452,7 @@ public class IIOMetadataNode
   {
     return (children.size() > 0) ? (Node)children.get(0) : null;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getLastChild()
    */
@@ -469,7 +469,7 @@ public class IIOMetadataNode
   {
     return name;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getNamespaceURI()
    */
@@ -477,7 +477,7 @@ public class IIOMetadataNode
   {
     return null;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getNextSibling()
    */
@@ -497,7 +497,7 @@ public class IIOMetadataNode
   {
     return name;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getNodeType()
    */
@@ -530,7 +530,7 @@ public class IIOMetadataNode
   {
     return parent;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getPrefix()
    */
@@ -538,7 +538,7 @@ public class IIOMetadataNode
   {
     return null;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#getPreviousSibling()
    */
@@ -566,7 +566,7 @@ public class IIOMetadataNode
   {
     return null;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#hasAttributes()
    */
@@ -574,7 +574,7 @@ public class IIOMetadataNode
   {
     return !attrs.isEmpty();
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#hasChildNodes()
    */
@@ -590,14 +590,14 @@ public class IIOMetadataNode
   {
     if (newChild == null)
       throw new IllegalArgumentException();
-    
+
     int idx = children.indexOf(refChild);
     if (idx == -1)
       children.add(newChild);
     else
       children.add(idx, newChild);
     ((IIOMetadataNode)newChild).parent = this;
-    
+
     return newChild;
   }
 
@@ -610,12 +610,12 @@ public class IIOMetadataNode
   {
     return true;
   }
-  
+
   public boolean isSameNode(Node other)
   {
     return this == other;
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#isSupported(java.lang.String, java.lang.String)
    */
@@ -624,12 +624,12 @@ public class IIOMetadataNode
     // No DOM features are supported
     return false;
   }
-  
+
   public String lookupNamespaceURI(String prefix)
   {
     return null;
   }
-  
+
   public String lookupPrefix(String namespaceURI)
   {
     return null;
@@ -667,7 +667,7 @@ public class IIOMetadataNode
     ((IIOMetadataNode)oldChild).parent = null;
     return oldChild;
   }
-  
+
   public void setIdAttribute(String name, boolean isId)
     throws DOMException
   {
@@ -682,14 +682,14 @@ public class IIOMetadataNode
     throws DOMException
   {
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#setNodeValue(java.lang.String)
    */
   public void setNodeValue(String nodeValue) throws DOMException
   {
   }
-  
+
   /* (non-Javadoc)
    * @see org.w3c.dom.Node#setPrefix(java.lang.String)
    */
@@ -701,7 +701,7 @@ public class IIOMetadataNode
     throws DOMException
   {
   }
-  
+
   public Object setUserData(String key, Object data, UserDataHandler handler)
   {
     return null;
diff --git a/libjava/classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java b/libjava/classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java
index de59efba4ea..cc0e0d34cf2 100644
--- a/libjava/classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java
+++ b/libjava/classpath/javax/imageio/plugins/bmp/BMPImageWriteParam.java
@@ -1,4 +1,4 @@
-/* BMPImageWriteParam.java -- 
+/* BMPImageWriteParam.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,25 +43,25 @@ import java.util.Locale;
 import javax.imageio.ImageWriteParam;
 
 /**
- * A class to encode images in the BMP format. 
+ * A class to encode images in the BMP format.
  * By default, the data layout is bottom-up, such that the pixels are stored in
- * bottom-up order. 
- * 
- * The compression scheme can be specified by using setCompressionType() 
+ * bottom-up order.
+ *
+ * The compression scheme can be specified by using setCompressionType()
  * appropriate type string. The compression scheme specified will be honored
- * if it is compatible with the type of image being written. If the 
+ * if it is compatible with the type of image being written. If the
  * compression scheme is not compatible with the type of image being written,
- * then an IOException will be thrown by the BMP image writer. If the 
+ * then an IOException will be thrown by the BMP image writer. If the
  * compression type is not set, then getCompressionType() will return null.
- * In this case the BMP image writer will select a compression type that 
- * supports encoding of the given image without loss of the color resolution. 
- * 
- * The compression type strings and the image type each supports are: 
- * Uncompressed RLE: BI_RGB, image type: <= 8-bits/sample.  
- * 8-bit Run Length Encoding: BI_RLE8, image type: <= 8-bits/sample 
- * 4-bit Run Length Encoding: BI_RLE4, image type: <= 4-bits/sample 
+ * In this case the BMP image writer will select a compression type that
+ * supports encoding of the given image without loss of the color resolution.
+ *
+ * The compression type strings and the image type each supports are:
+ * Uncompressed RLE: BI_RGB, image type: <= 8-bits/sample.
+ * 8-bit Run Length Encoding: BI_RLE8, image type: <= 8-bits/sample
+ * 4-bit Run Length Encoding: BI_RLE4, image type: <= 4-bits/sample
  * Packed data: BI_BITFIELDS, image type: 16 or 32 bits/sample
- * 
+ *
  * @author Lillian Angel (langel at redhat dot com)
  */
 public class BMPImageWriteParam
@@ -72,7 +72,7 @@ public class BMPImageWriteParam
    * This boolean is true if the data will be written in a topdown manner.
    */
   private boolean topDown;
-  
+
   /**
    * Compression type strings.
    */
@@ -80,7 +80,7 @@ public class BMPImageWriteParam
   String rle8 = "BI_RLE8";
   String rle4 = "BI_RLE4";
   String bitfields = "BI_BITFIELDS";
-  
+
   /**
    * Constants to represent image types.
    */
@@ -88,7 +88,7 @@ public class BMPImageWriteParam
   static final int BI_RLE8 = 1;
   static final int BI_RLE4 = 2;
   static final int BI_BITFIELDS = 3;
-  
+
   /**
    * Constructs an BMPImageWriteParam object with default values
    * and a null Locale.
@@ -101,7 +101,7 @@ public class BMPImageWriteParam
   /**
    * Constructs a BMPImageWriteParam set to use a given
    * Locale and with default values for all parameters.
-   * 
+   *
    * @param locale - a Locale to be used to localize compression
    *          type names and quality descriptions, or null.
    */
@@ -110,20 +110,20 @@ public class BMPImageWriteParam
     super(locale);
     topDown = false;
     canWriteCompressed = true;
-    
+
     compressionTypes = new String[4];
     compressionTypes[BI_RGB] = rgb;
     compressionTypes[BI_RLE8] = rle8;
     compressionTypes[BI_RLE4] = rle4;
     compressionTypes[BI_BITFIELDS] = bitfields;
-    
+
     compressionType = compressionTypes[BI_RGB];
   }
 
   /**
    * If set, the data will be written out in a top-down manner, the first
    * scanline being written first.
-   * 
+   *
    * @param topDown - whether the data are written in top-down order.
    */
   public void setTopDown(boolean topDown)
@@ -134,7 +134,7 @@ public class BMPImageWriteParam
   /**
    * Returns the value of the topDown parameter. The default is
    * false.
-   * 
+   *
    * @return whether the data are written in top-down order.
    */
   public boolean isTopDown()
diff --git a/libjava/classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java b/libjava/classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
index 378e11fa617..be718d4fce5 100644
--- a/libjava/classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
+++ b/libjava/classpath/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java
@@ -162,7 +162,7 @@ public class JPEGHuffmanTable
    * the array arguments. lengths[index] stores the number of Huffman
    * values with Huffman codes of length index + 1. The values array
    * stores the Huffman values in order of increasing code length.
-   * 
+   *
    * @param lengths an array of Huffman code lengths
    * @param values a sorted array of Huffman values
    * @throws IllegalArgumentException if either parameter is null, if
@@ -266,17 +266,17 @@ public class JPEGHuffmanTable
   public String toString()
   {
     CPStringBuilder buffer = new CPStringBuilder();
-    
+
     buffer.append("JPEGHuffmanTable:\nlengths:");
-    
+
     for (int i = 0; i < lengths.length; i++)
       buffer.append(" " + lengths[i]);
-    
+
     buffer.append("\nvalues:");
-    
+
     for (int i = 0; i < values.length; i++)
       buffer.append(" " + values[i]);
-    
+
     return buffer.toString();
   }
 }
diff --git a/libjava/classpath/javax/imageio/spi/IIORegistry.java b/libjava/classpath/javax/imageio/spi/IIORegistry.java
index 101cead4ef3..faa571d6074 100644
--- a/libjava/classpath/javax/imageio/spi/IIORegistry.java
+++ b/libjava/classpath/javax/imageio/spi/IIORegistry.java
@@ -54,7 +54,7 @@ import gnu.javax.imageio.png.PNGImageReaderSpi;
 public final class IIORegistry extends ServiceRegistry
 {
   private static final HashSet defaultCategories = new HashSet();
-  
+
   private static HashMap instances = new HashMap();
 
   static
@@ -65,19 +65,19 @@ public final class IIORegistry extends ServiceRegistry
     defaultCategories.add(ImageInputStreamSpi.class);
     defaultCategories.add(ImageOutputStreamSpi.class);
   }
-  
+
   public static synchronized IIORegistry getDefaultInstance()
   {
     // XXX: This leaks memory if a ThreadGroup isn't available anymore.
     ThreadGroup group = Thread.currentThread().getThreadGroup();
     IIORegistry registry = (IIORegistry) instances.get(group);
-    
+
     if (registry == null)
       {
         registry = new IIORegistry();
         instances.put(group, registry);
       }
-    
+
     return registry;
   }
 
@@ -94,7 +94,7 @@ public final class IIORegistry extends ServiceRegistry
     Toolkit toolkit = Toolkit.getDefaultToolkit();
     if (toolkit instanceof ClasspathToolkit)
       ((ClasspathToolkit)toolkit).registerImageIOSpis(this);
-    
+
     registerApplicationClasspathSpis();
   }
 
@@ -109,11 +109,11 @@ public final class IIORegistry extends ServiceRegistry
 
     while (categories.hasNext())
       {
-	Class category = (Class) categories.next();
-	Iterator providers = ServiceFactory.lookupProviders(category, loader);
+        Class category = (Class) categories.next();
+        Iterator providers = ServiceFactory.lookupProviders(category, loader);
 
-	while (providers.hasNext())
-	  registerServiceProvider((IIOServiceProvider) providers.next());
+        while (providers.hasNext())
+          registerServiceProvider((IIOServiceProvider) providers.next());
       }
   }
 }
diff --git a/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java b/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java
index e97d23940ca..3ffa93a0b9e 100644
--- a/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java
+++ b/libjava/classpath/javax/imageio/spi/ImageReaderSpi.java
@@ -84,7 +84,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi
     if (inputTypes == null
         || inputTypes.length == 0)
       throw new IllegalArgumentException("inputTypes may not be null or empty");
-    
+
     this.inputTypes = inputTypes;
     this.writerSpiNames = writerSpiNames;
   }
@@ -115,7 +115,7 @@ public abstract class ImageReaderSpi extends ImageReaderWriterSpi
   {
     if (reader == null)
       throw new IllegalArgumentException("reader may not be null");
-    
+
     return pluginClassName.equals(reader.getClass().getName());
   }
 }
diff --git a/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java b/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java
index 3ec52c51c23..6a07348cf00 100644
--- a/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java
+++ b/libjava/classpath/javax/imageio/spi/ImageWriterSpi.java
@@ -89,9 +89,9 @@ public abstract class ImageWriterSpi extends ImageReaderWriterSpi
     if (outputTypes == null
         || outputTypes.length == 0)
       throw new IllegalArgumentException("outputTypes may not be null or empty");
-    
+
     this.outputTypes = outputTypes;
-    this.readerSpiNames = readerSpiNames;    
+    this.readerSpiNames = readerSpiNames;
   }
 
   public abstract boolean canEncodeImage(ImageTypeSpecifier type);
diff --git a/libjava/classpath/javax/imageio/spi/RegisterableService.java b/libjava/classpath/javax/imageio/spi/RegisterableService.java
index 7be5a1beace..b424e04a3fc 100644
--- a/libjava/classpath/javax/imageio/spi/RegisterableService.java
+++ b/libjava/classpath/javax/imageio/spi/RegisterableService.java
@@ -80,4 +80,3 @@ public interface RegisterableService
    */
   void onDeregistration(ServiceRegistry registry, Class category);
 }
-
diff --git a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java
index 170ea009ad7..d9235968801 100644
--- a/libjava/classpath/javax/imageio/spi/ServiceRegistry.java
+++ b/libjava/classpath/javax/imageio/spi/ServiceRegistry.java
@@ -107,11 +107,11 @@ public class ServiceRegistry
    */
   private IdentityHashMap[] constraints;
 
-  
+
   /**
    * Constructs a ServiceRegistry for the specified
    * service categories.
-   * 
+   *
    * @param categories the categories to support
    *
    * @throws IllegalArgumentException if categories is
@@ -475,8 +475,8 @@ public class ServiceRegistry
         return deregisterServiceProvider(provider, i);
     throw new IllegalArgumentException();
   }
-  
-  
+
+
   /**
    * De-registers a provider from all service categories it
    * implements.
@@ -704,7 +704,7 @@ public class ServiceRegistry
     provs = providers[catid];
     if (provs == null)
       return Collections.EMPTY_LIST.iterator();
-    
+
     result = new ArrayList(provs.size());
     for (Iterator iter = provs.iterator(); iter.hasNext();)
       {
@@ -728,7 +728,7 @@ public class ServiceRegistry
 
                 if (o1 == o2)
                   return 0;
-                
+
                 s = (Set) cons.get(o1);
                 if (s != null && s.contains(o2))
                   return -1;  // o1 < o2
@@ -749,7 +749,7 @@ public class ServiceRegistry
   /**
    * Returns one of the service providers that is a subclass of the
    * specified class.
-   * 
+   *
    * @param providerClass a class to search for.
    */
   public synchronized  T getServiceProviderByClass(Class providerClass)
@@ -764,7 +764,7 @@ public class ServiceRegistry
       {
         if (!categories[cat].isAssignableFrom(providerClass))
           continue;
-        
+
         LinkedList provs = providers[cat];
         if (provs == null)
           continue;
@@ -959,4 +959,3 @@ public class ServiceRegistry
     boolean filter(Object provider);
   }
 }
-
diff --git a/libjava/classpath/javax/imageio/stream/FileCacheImageInputStream.java b/libjava/classpath/javax/imageio/stream/FileCacheImageInputStream.java
index 40fed63af01..2717e079dfc 100644
--- a/libjava/classpath/javax/imageio/stream/FileCacheImageInputStream.java
+++ b/libjava/classpath/javax/imageio/stream/FileCacheImageInputStream.java
@@ -49,7 +49,7 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl
 {
   private InputStream stream;
   private File cacheDir;
-  
+
   public FileCacheImageInputStream(InputStream stream, File cacheDir)
     throws IOException
   {
@@ -64,8 +64,8 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl
   {
     if (stream != null)
       {
-	stream.close();
-	stream = null;
+        stream.close();
+        stream = null;
       }
   }
 
@@ -85,7 +85,7 @@ public class FileCacheImageInputStream extends ImageInputStreamImpl
   {
     return true;
   }
-  
+
   public boolean isCachedMemory()
   {
     return false;
diff --git a/libjava/classpath/javax/imageio/stream/FileCacheImageOutputStream.java b/libjava/classpath/javax/imageio/stream/FileCacheImageOutputStream.java
index 47b7bb85ace..1d73a05e5fc 100644
--- a/libjava/classpath/javax/imageio/stream/FileCacheImageOutputStream.java
+++ b/libjava/classpath/javax/imageio/stream/FileCacheImageOutputStream.java
@@ -84,12 +84,12 @@ public class FileCacheImageOutputStream extends ImageOutputStreamImpl
   {
     return true;
   }
-  
+
   public boolean isCachedMemory()
   {
     return false;
   }
-  
+
   public int read()
     throws IOException
   {
diff --git a/libjava/classpath/javax/imageio/stream/FileImageInputStream.java b/libjava/classpath/javax/imageio/stream/FileImageInputStream.java
index 4fa1ac8a3dc..abdd997ba0a 100644
--- a/libjava/classpath/javax/imageio/stream/FileImageInputStream.java
+++ b/libjava/classpath/javax/imageio/stream/FileImageInputStream.java
@@ -49,7 +49,7 @@ import java.io.RandomAccessFile;
 public class FileImageInputStream extends ImageInputStreamImpl
 {
   private RandomAccessFile file;
-  
+
   public FileImageInputStream(File file)
     throws FileNotFoundException, IOException
   {
diff --git a/libjava/classpath/javax/imageio/stream/FileImageOutputStream.java b/libjava/classpath/javax/imageio/stream/FileImageOutputStream.java
index e1ce5c25eec..7d5d8fbe033 100644
--- a/libjava/classpath/javax/imageio/stream/FileImageOutputStream.java
+++ b/libjava/classpath/javax/imageio/stream/FileImageOutputStream.java
@@ -49,7 +49,7 @@ import java.io.RandomAccessFile;
 public class FileImageOutputStream extends ImageOutputStreamImpl
 {
   private RandomAccessFile file;
-  
+
   public FileImageOutputStream(File file)
     throws FileNotFoundException, IOException
   {
@@ -92,7 +92,7 @@ public class FileImageOutputStream extends ImageOutputStreamImpl
     throws IOException
   {
     checkClosed();
-    
+
     setBitOffset(0);
     return file.read();
   }
@@ -101,7 +101,7 @@ public class FileImageOutputStream extends ImageOutputStreamImpl
     throws IOException
   {
     checkClosed();
-    
+
     setBitOffset(0);
     return file.read(data, offset, len);
   }
@@ -117,7 +117,7 @@ public class FileImageOutputStream extends ImageOutputStreamImpl
     throws IOException
   {
     checkClosed();
-    
+
     flushBits();
     file.write(data, offset, len);
   }
@@ -126,7 +126,7 @@ public class FileImageOutputStream extends ImageOutputStreamImpl
     throws IOException
   {
     checkClosed();
-    
+
     // FIXME: Flush pending bits.
     file.write(value);
   }
diff --git a/libjava/classpath/javax/imageio/stream/ImageInputStream.java b/libjava/classpath/javax/imageio/stream/ImageInputStream.java
index 4d1b5d57aa5..dd57ca611da 100644
--- a/libjava/classpath/javax/imageio/stream/ImageInputStream.java
+++ b/libjava/classpath/javax/imageio/stream/ImageInputStream.java
@@ -58,7 +58,7 @@ public interface ImageInputStream
   void setByteOrder(ByteOrder order);
 
   ByteOrder getByteOrder();
-  
+
   int read()
     throws IOException;
 
@@ -156,7 +156,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all two
    * bytes were read.
    *
@@ -178,7 +178,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * 
                  This method does the same as {@link #readChar()}.
    *
    * @throws EOFException if the input stream ends before all two
@@ -202,7 +202,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * 
                  This method does the same as {@link #readUnsignedShort()}.
    *
    * @throws EOFException if the input stream ends before all two
@@ -224,7 +224,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all four
    * bytes were read.
    *
@@ -245,7 +245,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all four
    * bytes were read.
    *
@@ -266,7 +266,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all eight
    * bytes were read.
    *
@@ -286,7 +286,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all four
    * bytes were read.
    *
@@ -306,7 +306,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @throws EOFException if the input stream ends before all eight
    * bytes were read.
    *
@@ -331,7 +331,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param b an array for storing the read values.
    *
    * @param offset the index of the first element in b
@@ -364,7 +364,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param b an array for storing the read values.
    *
    * @throws NullPointerException if b is
@@ -391,7 +391,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param s an array for storing the read values.
    *
    * @param offset the index of the first element in s
@@ -427,7 +427,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param c an array for storing the read values.
    *
    * @param offset the index of the first element in c
@@ -463,7 +463,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param i an array for storing the read values.
    *
    * @param offset the index of the first element in i
@@ -499,7 +499,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param l an array for storing the read values.
    *
    * @param offset the index of the first element in l
@@ -535,7 +535,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param d an array for storing the read values.
    *
    * @param offset the index of the first element in d
@@ -572,7 +572,7 @@ public interface ImageInputStream
    *
    * 
                  The {@linkplain #getBitOffset() bit offset} is set to zero
    * before any data is read.
-   * 
+   *
    * @param d an array for storing the read values.
    *
    * @param offset the index of the first element in d
diff --git a/libjava/classpath/javax/imageio/stream/ImageInputStreamImpl.java b/libjava/classpath/javax/imageio/stream/ImageInputStreamImpl.java
index e338f1dbe3d..72fd6de483c 100644
--- a/libjava/classpath/javax/imageio/stream/ImageInputStreamImpl.java
+++ b/libjava/classpath/javax/imageio/stream/ImageInputStreamImpl.java
@@ -53,9 +53,9 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
 {
   private boolean closed;
   private Stack markStack = new Stack();
-  
+
   byte[] buffer = new byte[8];
-  
+
   protected int bitOffset;
   protected ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
   protected long flushedPos;
@@ -79,7 +79,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     checkClosed();
     closed = true;
   }
-  
+
   protected void finalize()
     throws Throwable
   {
@@ -153,7 +153,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
   {
     try
       {
-	markStack.push(new Long(getStreamPosition()));
+        markStack.push(new Long(getStreamPosition()));
       }
     catch (IOException e)
       {
@@ -193,7 +193,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
         seek(getStreamPosition() - 1);
         data = (byte) (data >> (8 - newOffset));
       }
-    
+
     bitOffset = newOffset;
     return data & 0x1;
   }
@@ -210,8 +210,8 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
 
     for (int i = 0; i < numBits; i++)
       {
-	bits <<= 1;
-	bits |= readBit();
+        bits <<= 1;
+        bits |= readBit();
       }
     return bits;
   }
@@ -351,9 +351,9 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
 
     while (!eol)
       {
-	switch(c)
-	  {
-	  case '\r':
+        switch(c)
+          {
+          case '\r':
             // Check for following '\n'.
             long oldPosition = getStreamPosition();
             c = read();
@@ -366,14 +366,14 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
               }
             continue;
 
-	  case '\n':
-	    eol = true;
+          case '\n':
+            eol = true;
             continue;
 
-	  default:
-	    buffer.append((char) c);
-	    break;
-	  }
+          default:
+            buffer.append((char) c);
+            break;
+          }
         c = read();
         if (c == -1)
           eol = true;
@@ -454,13 +454,13 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
 
     try
       {
-	data = DataInputStream.readUTF(this);
+        data = DataInputStream.readUTF(this);
       }
     finally
       {
-	setByteOrder(old);
+        setByteOrder(old);
       }
-    
+
     return data;
   }
 
@@ -468,7 +468,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     throws IOException
   {
     checkClosed();
-    
+
     long mark = ((Long) markStack.pop()).longValue();
     seek(mark);
   }
@@ -489,7 +489,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     throws IOException
   {
     checkClosed();
-    
+
     if (bitOffset < 0 || bitOffset > 7)
       throw new IllegalArgumentException("bitOffset not between 0 and 7 inclusive");
 
@@ -505,7 +505,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     throws IOException
   {
     checkClosed();
-    
+
     seek(getStreamPosition() + num);
     bitOffset = 0;
     return num;
@@ -515,7 +515,7 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
     throws IOException
   {
     checkClosed();
-    
+
     seek(getStreamPosition() + num);
     bitOffset = 0;
     return num;
@@ -530,12 +530,12 @@ public abstract class ImageInputStreamImpl implements ImageInputStream
 
     while (len > 0)
       {
-	// read will block until some data is available.
-	int numread = read (buf, offset, len);
-	if (numread < 0)
-	  throw new EOFException ();
-	len -= numread;
-	offset += numread;
+        // read will block until some data is available.
+        int numread = read (buf, offset, len);
+        if (numread < 0)
+          throw new EOFException ();
+        len -= numread;
+        offset += numread;
       }
     bitOffset = 0;
   }
diff --git a/libjava/classpath/javax/imageio/stream/ImageOutputStreamImpl.java b/libjava/classpath/javax/imageio/stream/ImageOutputStreamImpl.java
index f23e695d0b3..5bf7e440221 100644
--- a/libjava/classpath/javax/imageio/stream/ImageOutputStreamImpl.java
+++ b/libjava/classpath/javax/imageio/stream/ImageOutputStreamImpl.java
@@ -221,20 +221,20 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
     for(int i = 0; i < len; ++len)
       writeDouble(data[offset + i]);
   }
-  
+
   public void writeFloat(float value)
     throws IOException
   {
     writeInt(Float.floatToIntBits(value));
   }
-  
+
   public void writeFloats(float[] data, int offset, int len)
     throws IOException
   {
     for(int i = 0; i < len; ++len)
       writeFloat(data[offset + i]);
   }
-  
+
   public void writeInt(int value)
     throws IOException
   {
@@ -252,17 +252,17 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
         buffer[2] = ((byte) (value >> 8));
         buffer[3] = ((byte) value);
       }
-    
+
     write(buffer, 0, 4);
   }
-  
+
   public void writeInts(int[] data, int offset, int len)
     throws IOException
   {
     for(int i = 0; i < len; ++len)
       writeInt(data[offset + i]);
   }
-  
+
   public void writeLong(long value)
     throws IOException
   {
@@ -288,17 +288,17 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
         buffer[6] = ((byte) (value >> 8));
         buffer[7] = ((byte) value);
       }
-    
+
     write(buffer, 0, 8);
   }
-  
+
   public void writeLongs(long[] data, int offset, int len)
     throws IOException
   {
     for(int i = 0; i < len; ++len)
       writeLong(data[offset + i]);
   }
-  
+
   public void writeShort(int value)
     throws IOException
   {
@@ -312,17 +312,17 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
         buffer[0] = ((byte) (value >> 8));
         buffer[1] = ((byte) value);
       }
-    
+
     write(buffer, 0, 2);
   }
-  
+
   public void writeShorts(short[] data, int offset, int len)
     throws IOException
   {
     for(int i = 0; i < len; ++len)
       writeShort(data[offset + i]);
   }
-  
+
   public void writeUTF(String value)
     throws IOException
   {
@@ -367,7 +367,7 @@ public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
             buf[pos++] = (byte) (0x80 | (0x3f & c));
           }
       }
-    
+
     writeShort (sum);
     write(buf, 0, sum);
   }
diff --git a/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java b/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java
index 72aa5e8d59f..e1ad71f5871 100644
--- a/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java
+++ b/libjava/classpath/javax/imageio/stream/MemoryCacheImageInputStream.java
@@ -51,7 +51,7 @@ public class MemoryCacheImageInputStream extends ImageInputStreamImpl
   private BufferedInputStream buffer;
 
   private int READLIMIT = 2048;
-  
+
   public MemoryCacheImageInputStream(InputStream stream)
   {
     this.stream = stream;
@@ -85,7 +85,7 @@ public class MemoryCacheImageInputStream extends ImageInputStreamImpl
   {
     return false;
   }
-  
+
   public boolean isCachedMemory()
   {
     return true;
@@ -96,7 +96,7 @@ public class MemoryCacheImageInputStream extends ImageInputStreamImpl
   {
     setBitOffset(0);
     int retval = buffer.read();
-    
+
     if (retval != -1)
       streamPos++;
 
@@ -114,9 +114,9 @@ public class MemoryCacheImageInputStream extends ImageInputStreamImpl
         streamPos += retval;
       }
 
-    return retval; 
+    return retval;
   }
-  
+
   public void seek(long position)
   throws IOException
   {
diff --git a/libjava/classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java b/libjava/classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
index 17039f544e7..84e8360900c 100644
--- a/libjava/classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
+++ b/libjava/classpath/javax/imageio/stream/MemoryCacheImageOutputStream.java
@@ -78,7 +78,7 @@ public class MemoryCacheImageOutputStream extends ImageOutputStreamImpl
   {
     return false;
   }
-  
+
   public boolean isCachedMemory()
   {
     return true;
diff --git a/libjava/classpath/javax/management/Attribute.java b/libjava/classpath/javax/management/Attribute.java
index ece949532d0..48f5db99dbc 100644
--- a/libjava/classpath/javax/management/Attribute.java
+++ b/libjava/classpath/javax/management/Attribute.java
@@ -42,9 +42,9 @@ import java.io.Serializable;
 /**
  * Represents an MBean attribute, having the name and the assigned value. The
  * MBean objects use this class to get and set attributes values.
- * 
+ *
  * @since 1.5
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class Attribute
@@ -67,7 +67,7 @@ public class Attribute
 
   /**
    * Create the attribute with the given name and value.
-   * 
+   *
    * @param name the attribute name
    * @param value the attribute value
    */
@@ -79,9 +79,9 @@ public class Attribute
 
   /**
    * Compares the attribute with another attribute.
-   * 
+   *
    * @param other the other object to compare with
-   * 
+   *
    * @return true if both value and object are equal, false otherwise.
    */
   public boolean equals(Object other)
@@ -99,7 +99,7 @@ public class Attribute
           v = oa.m_value == m_value;
         else
           v = oa.m_value.equals(m_value);
-        
+
         return n && v;
 
       }
@@ -109,7 +109,7 @@ public class Attribute
 
   /**
    * Returns the attribute name.
-   * 
+   *
    * @return the attribute name
    */
   public String getName()
@@ -119,7 +119,7 @@ public class Attribute
 
   /**
    * Returns the attribute value.
-   * 
+   *
    * @return the attribute value.
    */
   public Object getValue()
@@ -129,14 +129,14 @@ public class Attribute
 
   /**
    * Need to override as {@link #equals} is overridden.
-   * 
+   *
    * @return the expression, dependent of the object and name hashcodes.
    */
   public int hashCode()
   {
     int n = m_name == null ? 0 : m_name.hashCode();
     int v = m_value == null ? 0 : m_value.hashCode();
-    
+
     return n ^ v;
   }
 
diff --git a/libjava/classpath/javax/management/AttributeChangeNotification.java b/libjava/classpath/javax/management/AttributeChangeNotification.java
index e63671dd0f5..16dbf8647a4 100644
--- a/libjava/classpath/javax/management/AttributeChangeNotification.java
+++ b/libjava/classpath/javax/management/AttributeChangeNotification.java
@@ -67,7 +67,7 @@ public class AttributeChangeNotification
    * notifications.
    */
   public static final String ATTRIBUTE_CHANGE = "jmx.attribute.change";
-  
+
   /**
    * The name of the attribute that changed.
    */
@@ -107,14 +107,14 @@ public class AttributeChangeNotification
    * @param newVal the new value of the attribute.
    */
   public AttributeChangeNotification(Object source,
-				     long sequenceNumber,
-				     long timeStamp,
-				     String msg, String name,
-				     String type, Object oldVal,
-				     Object newVal)
+                                     long sequenceNumber,
+                                     long timeStamp,
+                                     String msg, String name,
+                                     String type, Object oldVal,
+                                     Object newVal)
   {
     super(ATTRIBUTE_CHANGE, source, sequenceNumber,
-	  timeStamp, msg);
+          timeStamp, msg);
     attributeName = name;
     attributeType = type;
     oldValue = oldVal;
@@ -162,5 +162,3 @@ public class AttributeChangeNotification
   }
 
 }
-
-
diff --git a/libjava/classpath/javax/management/AttributeChangeNotificationFilter.java b/libjava/classpath/javax/management/AttributeChangeNotificationFilter.java
index 90d19a36a5e..ef3af0d5a96 100644
--- a/libjava/classpath/javax/management/AttributeChangeNotificationFilter.java
+++ b/libjava/classpath/javax/management/AttributeChangeNotificationFilter.java
@@ -100,7 +100,7 @@ public class AttributeChangeNotificationFilter
     if (!enabledAttributes.contains(name))
       enabledAttributes.add(name);
   }
-  
+
   /**
    * Returns the list of enabled attributes for this
    * filter.
@@ -127,9 +127,9 @@ public class AttributeChangeNotificationFilter
   {
     if (notif instanceof AttributeChangeNotification)
       {
-	AttributeChangeNotification n =
-	  (AttributeChangeNotification) notif;
-	return enabledAttributes.contains(n.getAttributeName());
+        AttributeChangeNotification n =
+          (AttributeChangeNotification) notif;
+        return enabledAttributes.contains(n.getAttributeName());
       }
     return false;
   }
diff --git a/libjava/classpath/javax/management/AttributeList.java b/libjava/classpath/javax/management/AttributeList.java
index 09db9b621ba..3d240b73bad 100644
--- a/libjava/classpath/javax/management/AttributeList.java
+++ b/libjava/classpath/javax/management/AttributeList.java
@@ -119,7 +119,7 @@ public class AttributeList
    * the @link{IndexOutOfBoundsException} from the underlying
    * array list.
    * 
                  
-   * 
+   *
    * @param index the index at which to place the new attribute.
    * @param attribute the new attribute to add.
    * @throws RuntimeOperationsException if index < 0
@@ -130,11 +130,11 @@ public class AttributeList
   {
     try
       {
-	super.add(index, attribute);
+        super.add(index, attribute);
       }
     catch (IndexOutOfBoundsException e)
       {
-	throw new RuntimeOperationsException(e, "Invalid index.");
+        throw new RuntimeOperationsException(e, "Invalid index.");
       }
   }
 
@@ -171,7 +171,7 @@ public class AttributeList
    * the @link{IndexOutOfBoundsException} from the underlying
    * array list.
    * 
                  
-   * 
+   *
    * @param index the index at which to place the new attribute.
    * @param list the list of attributes to add.
    * @return true if the list changed.
@@ -183,11 +183,11 @@ public class AttributeList
   {
     try
       {
-	return super.addAll(index, list);
+        return super.addAll(index, list);
       }
     catch (IndexOutOfBoundsException e)
       {
-	throw new RuntimeOperationsException(e, "Invalid index.");
+        throw new RuntimeOperationsException(e, "Invalid index.");
       }
   }
 
@@ -209,12 +209,12 @@ public class AttributeList
   {
     try
       {
-	super.set(index, attribute);
+        super.set(index, attribute);
       }
     catch (IndexOutOfBoundsException e)
       {
-	throw new RuntimeOperationsException(e, "Invalid index.");
+        throw new RuntimeOperationsException(e, "Invalid index.");
       }
   }
-    
+
 }
diff --git a/libjava/classpath/javax/management/AttributeNotFoundException.java b/libjava/classpath/javax/management/AttributeNotFoundException.java
index 2c6c698ebae..4b1f4e69096 100644
--- a/libjava/classpath/javax/management/AttributeNotFoundException.java
+++ b/libjava/classpath/javax/management/AttributeNotFoundException.java
@@ -68,4 +68,3 @@ public class AttributeNotFoundException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/AttributeValueExp.java b/libjava/classpath/javax/management/AttributeValueExp.java
index 42e7161f8cf..6e8f5fbd207 100644
--- a/libjava/classpath/javax/management/AttributeValueExp.java
+++ b/libjava/classpath/javax/management/AttributeValueExp.java
@@ -101,7 +101,7 @@ public class AttributeValueExp
    */
   public ValueExp apply(ObjectName name)
     throws BadStringOperationException, BadBinaryOpValueExpException,
-	   BadAttributeValueExpException, InvalidApplicationException
+           BadAttributeValueExpException, InvalidApplicationException
   {
     Object val = getAttribute(name);
     if (val == null || !(val instanceof String))
@@ -123,27 +123,27 @@ public class AttributeValueExp
   {
     try
       {
-	return QueryEval.getMBeanServer().getAttribute(name, attr);
+        return QueryEval.getMBeanServer().getAttribute(name, attr);
       }
     catch (NullPointerException e)
       {
-	return null;
+        return null;
       }
     catch (MBeanException e)
       {
-	return null;
+        return null;
       }
     catch (AttributeNotFoundException e)
       {
-	return null;
+        return null;
       }
     catch (InstanceNotFoundException e)
       {
-	return null;
+        return null;
       }
     catch (ReflectionException e)
       {
-	return null;
+        return null;
       }
   }
 
diff --git a/libjava/classpath/javax/management/BadAttributeValueExpException.java b/libjava/classpath/javax/management/BadAttributeValueExpException.java
index fbdf1decad2..207a786deb2 100644
--- a/libjava/classpath/javax/management/BadAttributeValueExpException.java
+++ b/libjava/classpath/javax/management/BadAttributeValueExpException.java
@@ -83,9 +83,8 @@ public class BadAttributeValueExpException
   public String toString()
   {
     return getClass().getName()
-      + "[val=" + val 
+      + "[val=" + val
       + "]";
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/BadBinaryOpValueExpException.java b/libjava/classpath/javax/management/BadBinaryOpValueExpException.java
index 5e1f5dbbed4..082b4a7dbd6 100644
--- a/libjava/classpath/javax/management/BadBinaryOpValueExpException.java
+++ b/libjava/classpath/javax/management/BadBinaryOpValueExpException.java
@@ -94,9 +94,8 @@ public class BadBinaryOpValueExpException
   public String toString()
   {
     return getClass().getName()
-      + "[exp=" + exp 
+      + "[exp=" + exp
       + "]";
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/BadStringOperationException.java b/libjava/classpath/javax/management/BadStringOperationException.java
index 8e5949ef791..261b352cb2e 100644
--- a/libjava/classpath/javax/management/BadStringOperationException.java
+++ b/libjava/classpath/javax/management/BadStringOperationException.java
@@ -84,9 +84,8 @@ public class BadStringOperationException
   public String toString()
   {
     return getClass().getName()
-      + "[op=" + op 
+      + "[op=" + op
       + "]";
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/DefaultLoaderRepository.java b/libjava/classpath/javax/management/DefaultLoaderRepository.java
index 38f7d020652..d331552a011 100644
--- a/libjava/classpath/javax/management/DefaultLoaderRepository.java
+++ b/libjava/classpath/javax/management/DefaultLoaderRepository.java
@@ -85,18 +85,18 @@ import java.util.List;
     List servers = MBeanServerFactory.findMBeanServer(null);
     for (MBeanServer server : servers)
       {
-	try
-	  {
-	    return server.getClassLoaderRepository().loadClass(name);
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    /* Ignored; try the next server. */
-	  }
+        try
+          {
+            return server.getClassLoaderRepository().loadClass(name);
+          }
+        catch (ClassNotFoundException e)
+          {
+            /* Ignored; try the next server. */
+          }
       }
     throw new ClassNotFoundException("The class loaders of all registered " +
-				     "servers failed to load the class, " +
-				     name);
+                                     "servers failed to load the class, " +
+                                     name);
   }
 
   /**
@@ -134,19 +134,19 @@ import java.util.List;
     List servers = MBeanServerFactory.findMBeanServer(null);
     for (MBeanServer server : servers)
       {
-	try
-	  {
-	    return server.getClassLoaderRepository().loadClassWithout(exclude,
-								      name);
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    /* Ignored; try the next server. */
-	  }
+        try
+          {
+            return server.getClassLoaderRepository().loadClassWithout(exclude,
+                                                                      name);
+          }
+        catch (ClassNotFoundException e)
+          {
+            /* Ignored; try the next server. */
+          }
       }
     throw new ClassNotFoundException("The class loaders of all registered " +
-				     "servers failed to load the class, " +
-				     name);
+                                     "servers failed to load the class, " +
+                                     name);
   }
 
 }
diff --git a/libjava/classpath/javax/management/Descriptor.java b/libjava/classpath/javax/management/Descriptor.java
index 07b8f1dc719..9a50b9e4e27 100644
--- a/libjava/classpath/javax/management/Descriptor.java
+++ b/libjava/classpath/javax/management/Descriptor.java
@@ -197,7 +197,7 @@ public interface Descriptor
    * Returns a clone of this descriptor, which can then be modified
    * independently of this descriptor.  If the descriptor is
    * immutable, it is sufficient to return this instance.
-   * 
+   *
    * @return a clone of this descriptor.
    * @throws RuntimeOperationsException if creation of the new
    *                                    descriptor fails for any
@@ -224,7 +224,7 @@ public interface Descriptor
    * must return true.
    * 
                • Otherwise, {@link Object#equals(Object)} must return true.
                  • 
    * 
-   * 
+   *
    * @param obj the object to compare according to the above.
    * @return true if the above holds.
    * @see Object#equals(Object)
@@ -265,7 +265,7 @@ public interface Descriptor
   /**
    * Returns the value of the specified field, or null
    * if no value is present for the given field name.
-   * 
+   *
    * @param name the field name.
    * @return the value of the field, or null if there
    *         is no value present.
@@ -283,7 +283,7 @@ public interface Descriptor
    * being returned if the field is not present.  This applies
    * even if the given field name is null or
    * the empty string.
-   * 
+   *
    * @param names an array of field names whose values should
    *              be returned.
    * @return the values of the specified fields.
diff --git a/libjava/classpath/javax/management/DynamicMBean.java b/libjava/classpath/javax/management/DynamicMBean.java
index 80ea72cf43c..ceb47dcdc30 100644
--- a/libjava/classpath/javax/management/DynamicMBean.java
+++ b/libjava/classpath/javax/management/DynamicMBean.java
@@ -49,7 +49,7 @@ package javax.management;
  */
 public interface DynamicMBean
 {
-  
+
   /**
    * Obtains the value of the specified attribute of the
    * management bean.  The management bean should perform
@@ -73,7 +73,7 @@ public interface DynamicMBean
    */
   Object getAttribute(String name)
     throws AttributeNotFoundException, MBeanException,
-	   ReflectionException;
+           ReflectionException;
 
   /**
    * Obtains the values of each of the specified attributes
@@ -103,7 +103,7 @@ public interface DynamicMBean
    * corresponding to each parameter.  The class loader used to
    * load these classes is the same as that used for loading the
    * management bean itself.
-   * 
+   *
    * @param name the name of the action to invoke.
    * @param params the parameters used to call the action.
    * @param signature the signature of the action.
@@ -145,7 +145,7 @@ public interface DynamicMBean
    */
   void setAttribute(Attribute attribute)
     throws AttributeNotFoundException, InvalidAttributeValueException,
-	   MBeanException, ReflectionException;
+           MBeanException, ReflectionException;
 
   /**
    * Sets the value of each of the specified attributes
diff --git a/libjava/classpath/javax/management/InstanceAlreadyExistsException.java b/libjava/classpath/javax/management/InstanceAlreadyExistsException.java
index c783208cb49..954df52c65e 100644
--- a/libjava/classpath/javax/management/InstanceAlreadyExistsException.java
+++ b/libjava/classpath/javax/management/InstanceAlreadyExistsException.java
@@ -73,4 +73,3 @@ public class InstanceAlreadyExistsException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/InstanceNotFoundException.java b/libjava/classpath/javax/management/InstanceNotFoundException.java
index 4d209fc471f..22eee35fae9 100644
--- a/libjava/classpath/javax/management/InstanceNotFoundException.java
+++ b/libjava/classpath/javax/management/InstanceNotFoundException.java
@@ -73,4 +73,3 @@ public class InstanceNotFoundException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/IntrospectionException.java b/libjava/classpath/javax/management/IntrospectionException.java
index 3b9d4b1ef6c..dfca93b08fc 100644
--- a/libjava/classpath/javax/management/IntrospectionException.java
+++ b/libjava/classpath/javax/management/IntrospectionException.java
@@ -75,4 +75,3 @@ public class IntrospectionException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/InvalidApplicationException.java b/libjava/classpath/javax/management/InvalidApplicationException.java
index 0bcf2d6cb0c..b7a7e3cc676 100644
--- a/libjava/classpath/javax/management/InvalidApplicationException.java
+++ b/libjava/classpath/javax/management/InvalidApplicationException.java
@@ -84,9 +84,8 @@ public class InvalidApplicationException
   public String toString()
   {
     return getClass().getName()
-      + "[val=" + val 
+      + "[val=" + val
       + "]";
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/InvalidAttributeValueException.java b/libjava/classpath/javax/management/InvalidAttributeValueException.java
index f766eda7f3a..1ec9fad603f 100644
--- a/libjava/classpath/javax/management/InvalidAttributeValueException.java
+++ b/libjava/classpath/javax/management/InvalidAttributeValueException.java
@@ -68,4 +68,3 @@ public class InvalidAttributeValueException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/JMException.java b/libjava/classpath/javax/management/JMException.java
index d05702575af..a46ac54c97e 100644
--- a/libjava/classpath/javax/management/JMException.java
+++ b/libjava/classpath/javax/management/JMException.java
@@ -68,4 +68,3 @@ public class JMException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/JMRuntimeException.java b/libjava/classpath/javax/management/JMRuntimeException.java
index ba14a19c4ce..d8eda330ec0 100644
--- a/libjava/classpath/javax/management/JMRuntimeException.java
+++ b/libjava/classpath/javax/management/JMRuntimeException.java
@@ -68,4 +68,3 @@ public class JMRuntimeException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/JMX.java b/libjava/classpath/javax/management/JMX.java
index e5fb2586fc3..4a4958aceda 100644
--- a/libjava/classpath/javax/management/JMX.java
+++ b/libjava/classpath/javax/management/JMX.java
@@ -112,7 +112,7 @@ public class JMX
    * 
                • Its name ends in {@code "MXBean"} and it does not
    * have an {@link MXBean} annotation.
                  • 
    * 
-   * 
+   *
    * @param iface the interface class that is to be checked
    *              for {@link MXBean} status.
    * @return true if the interface represents an {@link MXBean}.
@@ -181,7 +181,7 @@ public class JMX
    *      boolean)
    */
   public static  T newMBeanProxy(MBeanServerConnection conn,
-				    ObjectName name, Class iface)
+                                    ObjectName name, Class iface)
   {
     return newMBeanProxy(conn, name, iface, false);
   }
@@ -210,11 +210,11 @@ public class JMX
    * @see #newMBeanProxy(MBeanServerConnection, ObjectName, Class)
    */
   public static  T newMBeanProxy(MBeanServerConnection conn,
-				    ObjectName name, Class iface,
-				    boolean bcast)
+                                    ObjectName name, Class iface,
+                                    boolean bcast)
   {
     return MBeanServerInvocationHandler.newProxyInstance(conn, name,
-							 iface, bcast);
+                                                         iface, bcast);
   }
 
   /**
@@ -296,7 +296,7 @@ public class JMX
    *      boolean)
    */
   public static  T newMXBeanProxy(MBeanServerConnection conn,
-				     ObjectName name, Class iface)
+                                     ObjectName name, Class iface)
   {
     return newMXBeanProxy(conn, name, iface, false);
   }
@@ -327,18 +327,18 @@ public class JMX
   // Suppress warnings as we know an instance of T will be returned.
   @SuppressWarnings("unchecked")
   public static  T newMXBeanProxy(MBeanServerConnection conn,
-				    ObjectName name, Class iface,
-				    boolean bcast)
+                                    ObjectName name, Class iface,
+                                    boolean bcast)
   {
     if (bcast)
       return (T) Proxy.newProxyInstance(iface.getClassLoader(),
-					new Class[] { iface,
-						      NotificationEmitter.class },
-					new MBeanServerInvocationHandler(conn,name,true));
+                                        new Class[] { iface,
+                                                      NotificationEmitter.class },
+                                        new MBeanServerInvocationHandler(conn,name,true));
     else
       return (T) Proxy.newProxyInstance(iface.getClassLoader(),
-					new Class[] { iface },
-					new MBeanServerInvocationHandler(conn,name,true));
+                                        new Class[] { iface },
+                                        new MBeanServerInvocationHandler(conn,name,true));
   }
 
 }
diff --git a/libjava/classpath/javax/management/ListenerNotFoundException.java b/libjava/classpath/javax/management/ListenerNotFoundException.java
index ea3cb74161b..6fd6a1609b4 100644
--- a/libjava/classpath/javax/management/ListenerNotFoundException.java
+++ b/libjava/classpath/javax/management/ListenerNotFoundException.java
@@ -72,4 +72,3 @@ public class ListenerNotFoundException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/MBeanAttributeInfo.java b/libjava/classpath/javax/management/MBeanAttributeInfo.java
index 85e4e453b0d..950e063039e 100644
--- a/libjava/classpath/javax/management/MBeanAttributeInfo.java
+++ b/libjava/classpath/javax/management/MBeanAttributeInfo.java
@@ -105,33 +105,33 @@ public class MBeanAttributeInfo
    * @throws IntrospectionException if both the accessor and mutator method
    *                                are null.
    */
-  public MBeanAttributeInfo(String name, String desc, 
-			    Method getter, Method setter)
+  public MBeanAttributeInfo(String name, String desc,
+                            Method getter, Method setter)
     throws IntrospectionException
   {
     super(name, desc);
     if (getter == null && setter == null)
       throw new IntrospectionException("Both the getter and setter methods can " +
-				       "not be null.");
+                                       "not be null.");
     if (getter == null)
       {
-	Type t = setter.getGenericParameterTypes()[0];
-	if (t instanceof Class)
-	  attributeType = ((Class) t).getName();
-	else
-	  attributeType = t.toString();
-	isRead = false;
-	is = false;
+        Type t = setter.getGenericParameterTypes()[0];
+        if (t instanceof Class)
+          attributeType = ((Class) t).getName();
+        else
+          attributeType = t.toString();
+        isRead = false;
+        is = false;
       }
     else
       {
-	Type t = getter.getGenericReturnType();
-	if (t instanceof Class)
-	  attributeType = ((Class) t).getName();
-	else
-	  attributeType = t.toString();
-	isRead = true;
-	is = getter.getName().startsWith("is");
+        Type t = getter.getGenericReturnType();
+        if (t instanceof Class)
+          attributeType = ((Class) t).getName();
+        else
+          attributeType = t.toString();
+        isRead = true;
+        is = getter.getName().startsWith("is");
       }
     if (setter != null)
       isWrite = true;
@@ -140,7 +140,7 @@ public class MBeanAttributeInfo
   /**
    * Constructs a new {@link MBeanAttributeInfo} using the specified
    * name, description and type with the given settings for the accessor
-   * and mutator methods.  
+   * and mutator methods.
    *
    * @param name the name of the attribute.
    * @param type the type of the attribute, in the form of its class name.
@@ -152,13 +152,13 @@ public class MBeanAttributeInfo
    *                                  and unwritable.
    */
   public MBeanAttributeInfo(String name, String type, String desc,
-			    boolean isReadable, boolean isWritable,
-			    boolean isIs)
+                            boolean isReadable, boolean isWritable,
+                            boolean isIs)
   {
     super(name, desc);
     if (!isReadable && !isWritable)
       throw new IllegalArgumentException("The attribute can not be both " +
-					 "unreadable and unwritable.");
+                                         "unreadable and unwritable.");
     attributeType = type;
     isRead = isReadable;
     isWrite = isWritable;
@@ -179,13 +179,13 @@ public class MBeanAttributeInfo
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This shouldn't happen; we implement Cloneable */
-	throw new IllegalStateException("clone() called on " +
-					"non-cloneable object.");
+        /* This shouldn't happen; we implement Cloneable */
+        throw new IllegalStateException("clone() called on " +
+                                        "non-cloneable object.");
       }
   }
 
@@ -200,7 +200,7 @@ public class MBeanAttributeInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanAttributeInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         description.equals(object.getDescription()),
    *         attributeType.equals(object.getType()),
@@ -216,9 +216,9 @@ public class MBeanAttributeInfo
       return false;
     MBeanAttributeInfo o = (MBeanAttributeInfo) obj;
     return (attributeType.equals(o.getType()) &&
-	    isRead == o.isReadable() &&
-	    isWrite == o.isWritable() &&
-	    is == o.isIs());
+            isRead == o.isReadable() &&
+            isWrite == o.isWritable() &&
+            is == o.isIs());
   }
 
   /**
@@ -284,8 +284,8 @@ public class MBeanAttributeInfo
    * Returns a textual representation of this instance.  This
    * is constructed using the class name
    * (javax.management.MBeanAttributeInfo),
-   * the name, description and type of the attribute and the 
-   * current settings of the {@link #isReadable()}, 
+   * the name, description and type of the attribute and the
+   * current settings of the {@link #isReadable()},
    * {@link #isWritable()} and {@link #isIs()} properties.
    * 
                  
    * 
                  
@@ -301,13 +301,13 @@ public class MBeanAttributeInfo
   {
     if (string == null)
       {
-	super.toString();
-	string = string.substring(0, string.length() - 1) 
-	  + ",type=" + attributeType
-	  + ",isReadable=" + (isRead ? "yes" : "no")
-	  + ",isWritable=" + (isWrite ? "yes" : "no")
-	  + ",isIs=" + (is ? "yes" : "no")
-	  + "]";
+        super.toString();
+        string = string.substring(0, string.length() - 1)
+          + ",type=" + attributeType
+          + ",isReadable=" + (isRead ? "yes" : "no")
+          + ",isWritable=" + (isWrite ? "yes" : "no")
+          + ",isIs=" + (is ? "yes" : "no")
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/MBeanConstructorInfo.java b/libjava/classpath/javax/management/MBeanConstructorInfo.java
index 041f3e904b6..509483f256a 100644
--- a/libjava/classpath/javax/management/MBeanConstructorInfo.java
+++ b/libjava/classpath/javax/management/MBeanConstructorInfo.java
@@ -84,13 +84,13 @@ public class MBeanConstructorInfo
     signature = new MBeanParameterInfo[paramTypes.length];
     for (int a = 0; a < paramTypes.length; ++a)
       {
-	Type t = paramTypes[a];
-	if (t instanceof Class)
-	  signature[a] = new MBeanParameterInfo(null,
-						((Class) t).getName(),
-						null);
-	else
-	  signature[a] = new MBeanParameterInfo(null, t.toString(), null);
+        Type t = paramTypes[a];
+        if (t instanceof Class)
+          signature[a] = new MBeanParameterInfo(null,
+                                                ((Class) t).getName(),
+                                                null);
+        else
+          signature[a] = new MBeanParameterInfo(null, t.toString(), null);
       }
   }
 
@@ -108,15 +108,15 @@ public class MBeanConstructorInfo
    *            each parameter.
    */
   public MBeanConstructorInfo(String name, String desc,
-			      MBeanParameterInfo[] sig)
+                              MBeanParameterInfo[] sig)
   {
     super(name, desc);
     if (sig == null)
       signature = new MBeanParameterInfo[0];
     else
       {
-	signature = new MBeanParameterInfo[sig.length];
-	System.arraycopy(sig, 0, signature, 0, sig.length);
+        signature = new MBeanParameterInfo[sig.length];
+        System.arraycopy(sig, 0, signature, 0, sig.length);
       }
   }
 
@@ -134,13 +134,13 @@ public class MBeanConstructorInfo
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This shouldn't happen; we implement Cloneable */
-	throw new IllegalStateException("clone() called on " +
-					"non-cloneable object.");
+        /* This shouldn't happen; we implement Cloneable */
+        throw new IllegalStateException("clone() called on " +
+                                        "non-cloneable object.");
       }
   }
 
@@ -155,7 +155,7 @@ public class MBeanConstructorInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanConstructorInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         description.equals(object.getDescription())
    *         and the corresponding elements of the signature arrays are
@@ -171,14 +171,14 @@ public class MBeanConstructorInfo
     MBeanParameterInfo[] sig = o.getSignature();
     for (int a = 0; a < signature.length; ++a)
       {
-	if (a == sig.length)
-	  return true;
-	if (!(signature[a].equals(sig[a])))
-	  return false;
+        if (a == sig.length)
+          return true;
+        if (!(signature[a].equals(sig[a])))
+          return false;
       }
     return true;
   }
-  
+
   /**
    * Returns the constructor's signature, in the form of
    * information on each parameter.  Each parameter is
@@ -214,7 +214,7 @@ public class MBeanConstructorInfo
    * Returns a textual representation of this instance.  This
    * is constructed using the class name
    * (javax.management.MBeanConstructorInfo),
-   * the name and description of the constructor and the 
+   * the name and description of the constructor and the
    * contents of the array of parameters.
    * 
                  
    * 
                  
@@ -230,10 +230,10 @@ public class MBeanConstructorInfo
   {
     if (string == null)
       {
-	super.toString();
-	string = string.substring(0, string.length() - 1) 
-	  + ",signature=" + Arrays.toString(signature)
-	  + "]";
+        super.toString();
+        string = string.substring(0, string.length() - 1)
+          + ",signature=" + Arrays.toString(signature)
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/MBeanException.java b/libjava/classpath/javax/management/MBeanException.java
index f082275e69b..7ce81dedb6a 100644
--- a/libjava/classpath/javax/management/MBeanException.java
+++ b/libjava/classpath/javax/management/MBeanException.java
@@ -115,4 +115,3 @@ public class MBeanException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/MBeanFeatureInfo.java b/libjava/classpath/javax/management/MBeanFeatureInfo.java
index b3d60d25d86..a459ae94688 100644
--- a/libjava/classpath/javax/management/MBeanFeatureInfo.java
+++ b/libjava/classpath/javax/management/MBeanFeatureInfo.java
@@ -106,7 +106,7 @@ public class MBeanFeatureInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanFeatureInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()) and
    *         description.equals(object.getDescription.
    */
@@ -114,13 +114,13 @@ public class MBeanFeatureInfo
   {
     if (obj instanceof MBeanFeatureInfo)
       {
-	MBeanFeatureInfo o = (MBeanFeatureInfo) obj;
-	return ((name == null ? 
-		 o.getName() == null : 
-		 name.equals(o.getName())) &&
-		(description == null ?
-		 o.getDescription() == null :
-		 description.equals(o.getDescription())));
+        MBeanFeatureInfo o = (MBeanFeatureInfo) obj;
+        return ((name == null ?
+                 o.getName() == null :
+                 name.equals(o.getName())) &&
+                (description == null ?
+                 o.getDescription() == null :
+                 description.equals(o.getDescription())));
       }
     else
       return false;
@@ -179,9 +179,9 @@ public class MBeanFeatureInfo
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + name 
-	+ ",desc=" + description 
-	+ "]";
+        + "[name=" + name
+        + ",desc=" + description
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/MBeanInfo.java b/libjava/classpath/javax/management/MBeanInfo.java
index 64e627f1b19..bf07f9ad00e 100644
--- a/libjava/classpath/javax/management/MBeanInfo.java
+++ b/libjava/classpath/javax/management/MBeanInfo.java
@@ -78,7 +78,7 @@ import java.util.Arrays;
  * instance of this class, as part of implementing the
  * {@link DynamicMBean#getMBeanInfo()} method of {@link DynamicMBean}.
  * 
                  
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -93,7 +93,7 @@ public class MBeanInfo
 
   /**
    * A description of the bean.
-   * 
+   *
    * @serial The bean's description.
    */
   private String description;
@@ -155,8 +155,8 @@ public class MBeanInfo
    *               or null.
    */
   public MBeanInfo(String name, String desc, MBeanAttributeInfo[] attribs,
-		   MBeanConstructorInfo[] cons, MBeanOperationInfo[] ops,
-		   MBeanNotificationInfo[] notifs)
+                   MBeanConstructorInfo[] cons, MBeanOperationInfo[] ops,
+                   MBeanNotificationInfo[] notifs)
   {
     className = name;
     description = desc;
@@ -199,11 +199,11 @@ public class MBeanInfo
     MBeanInfo clone = null;
     try
       {
-	clone = (MBeanInfo) super.clone();
+        clone = (MBeanInfo) super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This won't happen as we implement Cloneable */
+        /* This won't happen as we implement Cloneable */
       }
     return clone;
   }
@@ -218,7 +218,7 @@ public class MBeanInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanInfo}
-   *         instance, 
+   *         instance,
    *         className.equals(object.getClassName()),
    *         description.equals(object.getDescription())
    *         and the corresponding elements of the arrays are
@@ -234,37 +234,37 @@ public class MBeanInfo
     MBeanAttributeInfo[] attr = o.getAttributes();
     for (int a = 0; a < attributes.length; ++a)
       {
-	if (a == attr.length)
-	  return true;
-	if (!(attributes[a].equals(attr[a])))
-	  return false;
+        if (a == attr.length)
+          return true;
+        if (!(attributes[a].equals(attr[a])))
+          return false;
       }
     MBeanConstructorInfo[] cons = o.getConstructors();
     for (int a = 0; a < constructors.length; ++a)
       {
-	if (a == cons.length)
-	  return true;
-	if (!(constructors[a].equals(cons[a])))
-	  return false;
+        if (a == cons.length)
+          return true;
+        if (!(constructors[a].equals(cons[a])))
+          return false;
       }
     MBeanOperationInfo[] ops = o.getOperations();
     for (int a = 0; a < operations.length; ++a)
       {
-	if (a == ops.length)
-	  return true;
-	if (!(operations[a].equals(ops[a])))
-	  return false;
+        if (a == ops.length)
+          return true;
+        if (!(operations[a].equals(ops[a])))
+          return false;
       }
     MBeanNotificationInfo[] notifs = o.getNotifications();
     for (int a = 0; a < notifications.length; ++a)
       {
-	if (a == notifs.length)
-	  return true;
-	if (!(notifications[a].equals(notifs[a])))
-	  return false;
+        if (a == notifs.length)
+          return true;
+        if (!(notifications[a].equals(notifs[a])))
+          return false;
       }
     return (className.equals(o.getClassName()) &&
-	    description.equals(o.getDescription()));
+            description.equals(o.getDescription()));
   }
 
   /**
@@ -389,13 +389,13 @@ public class MBeanInfo
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + className 
-	+ ",desc=" + description 
-	+ ",attributes=" + Arrays.toString(attributes)
-	+ ",constructors=" + Arrays.toString(constructors)
-	+ ",operations=" + Arrays.toString(operations)
-	+ ",notifications=" + Arrays.toString(notifications)
-	+ "]";
+        + "[name=" + className
+        + ",desc=" + description
+        + ",attributes=" + Arrays.toString(attributes)
+        + ",constructors=" + Arrays.toString(constructors)
+        + ",operations=" + Arrays.toString(operations)
+        + ",notifications=" + Arrays.toString(notifications)
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/MBeanNotificationInfo.java b/libjava/classpath/javax/management/MBeanNotificationInfo.java
index ba4077e8fba..10dd956b04e 100644
--- a/libjava/classpath/javax/management/MBeanNotificationInfo.java
+++ b/libjava/classpath/javax/management/MBeanNotificationInfo.java
@@ -101,7 +101,7 @@ public class MBeanNotificationInfo
    * @throws IllegalArgumentException for some reason...
    */
   public MBeanNotificationInfo(String[] types, String name,
-			       String description)
+                               String description)
   {
     super(name, description);
     this.types = types;
@@ -121,13 +121,13 @@ public class MBeanNotificationInfo
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This shouldn't happen; we implement Cloneable */
-	throw new IllegalStateException("clone() called on " +
-					"non-cloneable object.");
+        /* This shouldn't happen; we implement Cloneable */
+        throw new IllegalStateException("clone() called on " +
+                                        "non-cloneable object.");
       }
   }
 
@@ -142,7 +142,7 @@ public class MBeanNotificationInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanNotificationInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         description.equals(object.getDescription())
    *         and the corresponding elements of the type arrays are
@@ -152,18 +152,18 @@ public class MBeanNotificationInfo
   {
     if (obj instanceof MBeanNotificationInfo)
       {
-	if (!(super.equals(obj)))
-	  return false;
-	MBeanNotificationInfo o = (MBeanNotificationInfo) obj;
-	String[] oTypes = o.getNotifTypes();
-	for (int a = 0; a < types.length; ++a)
-	  {
-	    if (a == oTypes.length)
-	      return true;
-	    if (!(types[a].equals(oTypes[a])))
-	      return false;
-	  }
-	return true;
+        if (!(super.equals(obj)))
+          return false;
+        MBeanNotificationInfo o = (MBeanNotificationInfo) obj;
+        String[] oTypes = o.getNotifTypes();
+        for (int a = 0; a < types.length; ++a)
+          {
+            if (a == oTypes.length)
+              return true;
+            if (!(types[a].equals(oTypes[a])))
+              return false;
+          }
+        return true;
       }
     else
       return false;
@@ -200,7 +200,7 @@ public class MBeanNotificationInfo
    * Returns a textual representation of this instance.  This
    * is constructed using the class name
    * (javax.management.MBeanNotificationInfo),
-   * the name and description of the notification and the 
+   * the name and description of the notification and the
    * contents of the array of types.
    * 
                  
    * 
                  
@@ -216,10 +216,10 @@ public class MBeanNotificationInfo
   {
     if (string == null)
       {
-	super.toString();
-	string = string.substring(0, string.length() - 1) 
-	  + ",types=" + Arrays.toString(types)
-	  + "]";
+        super.toString();
+        string = string.substring(0, string.length() - 1)
+          + ",types=" + Arrays.toString(types)
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/MBeanOperationInfo.java b/libjava/classpath/javax/management/MBeanOperationInfo.java
index 03220c15e10..0adc0e6bc10 100644
--- a/libjava/classpath/javax/management/MBeanOperationInfo.java
+++ b/libjava/classpath/javax/management/MBeanOperationInfo.java
@@ -118,13 +118,13 @@ public class MBeanOperationInfo
     signature = new MBeanParameterInfo[paramTypes.length];
     for (int a = 0; a < paramTypes.length; ++a)
       {
-	Type t = paramTypes[a];
-	if (t instanceof Class)
-	  signature[a] = new MBeanParameterInfo(null,
-						((Class) t).getName(),
-						 null);
-	else
-	  signature[a] = new MBeanParameterInfo(null, t.toString(), null);
+        Type t = paramTypes[a];
+        if (t instanceof Class)
+          signature[a] = new MBeanParameterInfo(null,
+                                                ((Class) t).getName(),
+                                                 null);
+        else
+          signature[a] = new MBeanParameterInfo(null, t.toString(), null);
       }
     Type retType = method.getGenericReturnType();
     if (retType instanceof Class)
@@ -133,17 +133,17 @@ public class MBeanOperationInfo
       type = retType.toString();
     if (method.getReturnType() == Void.TYPE)
       {
-	if (paramTypes.length == 0)
-	  impact = UNKNOWN;
-	else
-	  impact = ACTION;
+        if (paramTypes.length == 0)
+          impact = UNKNOWN;
+        else
+          impact = ACTION;
       }
     else
       {
-	if (paramTypes.length == 0)
-	  impact = INFO;
-	else
-	  impact = ACTION_INFO;
+        if (paramTypes.length == 0)
+          impact = INFO;
+        else
+          impact = ACTION_INFO;
       }
   }
 
@@ -163,16 +163,16 @@ public class MBeanOperationInfo
    * @param impact the impact of performing the operation.
    */
   public MBeanOperationInfo(String name, String desc,
-			    MBeanParameterInfo[] sig, String type,
-			    int impact)
+                            MBeanParameterInfo[] sig, String type,
+                            int impact)
   {
     super(name, desc);
     if (sig == null)
       signature = new MBeanParameterInfo[0];
     else
       {
-	signature = new MBeanParameterInfo[sig.length];
-	System.arraycopy(sig, 0, signature, 0, sig.length);
+        signature = new MBeanParameterInfo[sig.length];
+        System.arraycopy(sig, 0, signature, 0, sig.length);
       }
     this.type = type;
     this.impact = impact;
@@ -192,13 +192,13 @@ public class MBeanOperationInfo
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This shouldn't happen; we implement Cloneable */
-	throw new IllegalStateException("clone() called on " +
-					"non-cloneable object.");
+        /* This shouldn't happen; we implement Cloneable */
+        throw new IllegalStateException("clone() called on " +
+                                        "non-cloneable object.");
       }
   }
 
@@ -214,7 +214,7 @@ public class MBeanOperationInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanOperationInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         description.equals(object.getDescription()),
    *         type.equals(object.getReturnType()),
@@ -232,15 +232,15 @@ public class MBeanOperationInfo
     MBeanParameterInfo[] sig = o.getSignature();
     for (int a = 0; a < signature.length; ++a)
       {
-	if (a == sig.length)
-	  return true;
-	if (!(signature[a].equals(sig[a])))
-	  return false;
+        if (a == sig.length)
+          return true;
+        if (!(signature[a].equals(sig[a])))
+          return false;
       }
     return (type.equals(o.getReturnType()) &&
-	    impact == o.getImpact());
+            impact == o.getImpact());
   }
-  
+
   /**
    * 
                  
    * Returns the impact of performing this operation.
@@ -328,30 +328,30 @@ public class MBeanOperationInfo
   {
     if (string == null)
       {
-	String impactString;
-	switch (impact)
-	  {
-	  case INFO:
-	    impactString = "INFO";
-	    break;
-	  case ACTION:
-	    impactString = "ACTION";
-	    break;
-	  case ACTION_INFO:
-	    impactString = "ACTION_INFO";
-	    break;
-	  case UNKNOWN:
-	    impactString = "UNKNOWN";
-	    break;
-	  default:
-	    impactString = "ERRONEOUS VALUE";
-	  }
-	super.toString();
-	string = string.substring(0, string.length() - 1) 
-	  + ",returnType=" + type
-	  + ",impact=" + impactString 
-	  + ",signature=" + Arrays.toString(signature)
-	  + "]";
+        String impactString;
+        switch (impact)
+          {
+          case INFO:
+            impactString = "INFO";
+            break;
+          case ACTION:
+            impactString = "ACTION";
+            break;
+          case ACTION_INFO:
+            impactString = "ACTION_INFO";
+            break;
+          case UNKNOWN:
+            impactString = "UNKNOWN";
+            break;
+          default:
+            impactString = "ERRONEOUS VALUE";
+          }
+        super.toString();
+        string = string.substring(0, string.length() - 1)
+          + ",returnType=" + type
+          + ",impact=" + impactString
+          + ",signature=" + Arrays.toString(signature)
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/MBeanParameterInfo.java b/libjava/classpath/javax/management/MBeanParameterInfo.java
index ee6ef99b843..9307de46d49 100644
--- a/libjava/classpath/javax/management/MBeanParameterInfo.java
+++ b/libjava/classpath/javax/management/MBeanParameterInfo.java
@@ -63,7 +63,7 @@ public class MBeanParameterInfo
 
   /**
    * Constructs a new {@link MBeanParameterInfo} using the specified
-   * name, description and type.  
+   * name, description and type.
    *
    * @param name the name of the attribute.
    * @param type the type of the attribute, in the form of its class name.
@@ -89,13 +89,13 @@ public class MBeanParameterInfo
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	/* This shouldn't happen; we implement Cloneable */
-	throw new IllegalStateException("clone() called on " +
-					"non-cloneable object.");
+        /* This shouldn't happen; we implement Cloneable */
+        throw new IllegalStateException("clone() called on " +
+                                        "non-cloneable object.");
       }
   }
 
@@ -109,7 +109,7 @@ public class MBeanParameterInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link MBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         description.equals(object.getDescription()),
    *         and type.equals(object.getType()).
@@ -165,10 +165,10 @@ public class MBeanParameterInfo
   {
     if (string == null)
       {
-	super.toString();
-	string = string.substring(0, string.length() - 1) 
-	  + ",type=" + type
-	  + "]";
+        super.toString();
+        string = string.substring(0, string.length() - 1)
+          + ",type=" + type
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/MBeanPermission.java b/libjava/classpath/javax/management/MBeanPermission.java
index 076ac86f1af..10813e4e6ae 100644
--- a/libjava/classpath/javax/management/MBeanPermission.java
+++ b/libjava/classpath/javax/management/MBeanPermission.java
@@ -113,7 +113,7 @@ import java.util.TreeSet;
  * represent null.  When this occurs in a
  * required permission, anything may match it.  When this
  * forms part of a permission held by the user, it only
- * matches another null value. 
+ * matches another null value.
  * 
                  
  * 
                  The list of valid actions is as follows:
                  
  * 
                    
@@ -152,7 +152,7 @@ public class MBeanPermission
    * The list of actions associated with this permission.
    */
   private String actions;
-  
+
   /**
    * The list of actions as an ordered set.
    */
@@ -166,7 +166,7 @@ public class MBeanPermission
   /**
    * Initialise the set of valid actions.
    */
-  static 
+  static
   {
     validSet = new HashSet();
     validSet.add("addNotificationListener");
@@ -232,11 +232,11 @@ public class MBeanPermission
    * @param actions the actions associated with this permission.
    */
   public MBeanPermission(String className, String member,
-			 ObjectName name, String actions)
+                         ObjectName name, String actions)
   {
-    this((className == null ? "-" : className) + "#" 
-	 + (member == null ? "-" : member) + "[" 
-	 + (name == null ? "-" : name.toString()) + "]", actions);
+    this((className == null ? "-" : className) + "#"
+         + (member == null ? "-" : member) + "["
+         + (name == null ? "-" : name.toString()) + "]", actions);
   }
 
   /**
@@ -251,9 +251,9 @@ public class MBeanPermission
   {
     if (obj instanceof MBeanPermission)
       {
-	MBeanPermission p = (MBeanPermission) obj;
-	return (p.getName().equals(getName()) &&
-		p.getActions().equals(actions));
+        MBeanPermission p = (MBeanPermission) obj;
+        return (p.getName().equals(getName()) &&
+                p.getActions().equals(actions));
       }
     return false;
   }
@@ -269,9 +269,9 @@ public class MBeanPermission
     CPStringBuilder builder = new CPStringBuilder();
     while (it.hasNext())
       {
-	builder.append(it.next());
-	if (it.hasNext())
-	  builder.append(",");
+        builder.append(it.next());
+        if (it.hasNext())
+          builder.append(",");
       }
     return builder.toString();
   }
@@ -312,7 +312,7 @@ public class MBeanPermission
    * of this permission.  If the queryMBeans action is presented,
    * the queryNames action is implied.
    * 
                  
-   * 
+   *
    * @param p the permission to check that this permission implies.
    * @return true if this permission implies p.
    */
@@ -320,21 +320,21 @@ public class MBeanPermission
   {
     if (p instanceof MBeanPermission)
       {
-	MBeanPermission mp = (MBeanPermission) p;
-	NameHolder pName = new NameHolder(mp.getName());
-	NameHolder name = new NameHolder(getName());
-	if (!(name.equals(pName)))
-	  return false;
-	for (String nextAction : mp.actionSet)
-	  {
-	    boolean found = actions.contains(nextAction);
-	    if (!found)
-	      if (nextAction.equals("queryNames"))
-		found = actions.contains("queryMBeans");
-	    if (!found)
-	      return false;
-	  }
-	return true;
+        MBeanPermission mp = (MBeanPermission) p;
+        NameHolder pName = new NameHolder(mp.getName());
+        NameHolder name = new NameHolder(getName());
+        if (!(name.equals(pName)))
+          return false;
+        for (String nextAction : mp.actionSet)
+          {
+            boolean found = actions.contains(nextAction);
+            if (!found)
+              if (nextAction.equals("queryNames"))
+                found = actions.contains("queryMBeans");
+            if (!found)
+              return false;
+          }
+        return true;
       }
     return false;
   }
@@ -373,47 +373,47 @@ public class MBeanPermission
       int memberIndex = name.indexOf("#");
       int onIndex = name.indexOf("[");
       if (onIndex == -1)
-	{
-	  if (memberIndex == -1)
-	    className = name;
-	  else
-	    {
-	      className = name.substring(0, memberIndex);
-	      member = name.substring(memberIndex + 1);
-	    }
-	}
+        {
+          if (memberIndex == -1)
+            className = name;
+          else
+            {
+              className = name.substring(0, memberIndex);
+              member = name.substring(memberIndex + 1);
+            }
+        }
       else
-	{
-	  if (memberIndex == -1)
-	    {
-	      className = name.substring(0, onIndex);
-	      objectName = name.substring(onIndex + 1,
-					  name.length() - 1);
-	    }
-	  else
-	    {
-	      className = name.substring(0, memberIndex);
-	      member = name.substring(memberIndex + 1, onIndex);
-	      objectName = name.substring(onIndex + 1,
-					  name.length() - 1);
-	    }
-	}      
+        {
+          if (memberIndex == -1)
+            {
+              className = name.substring(0, onIndex);
+              objectName = name.substring(onIndex + 1,
+                                          name.length() - 1);
+            }
+          else
+            {
+              className = name.substring(0, memberIndex);
+              member = name.substring(memberIndex + 1, onIndex);
+              objectName = name.substring(onIndex + 1,
+                                          name.length() - 1);
+            }
+        }
       if (className.equals("-"))
-	className = null;
+        className = null;
       if (member.equals("-"))
-	member = null;
+        member = null;
       if (objectName == null || objectName.equals("-"))
-	this.objectName = null;
+        this.objectName = null;
       else
-	try
-	  {
-	    this.objectName = new ObjectName(objectName);
-	  }
-	catch (MalformedObjectNameException e)
-	  {
-	    throw (Error) 
-	      (new InternalError("Invalid object name.").initCause(e));
-	  }
+        try
+          {
+            this.objectName = new ObjectName(objectName);
+          }
+        catch (MalformedObjectNameException e)
+          {
+            throw (Error)
+              (new InternalError("Invalid object name.").initCause(e));
+          }
     }
 
     /**
@@ -436,46 +436,46 @@ public class MBeanPermission
      * object name of this name holder is a pattern,
      * {@link ObjectName#apply(ObjectName)} may be used as well.
      * 
-     * 
+     *
      * @param obj the object to compare with this.
      * @return true if the above holds.
      */
     public boolean equals(Object obj)
     {
       if (obj instanceof NameHolder)
-	{
-	  NameHolder nh = (NameHolder) obj;
-	  boolean cn = false;
-	  String ocn = nh.getClassName();
-	  if (ocn == null || className.equals("*"))
-	    cn = true;
-	  else
-	    {
-	      int wcIndex = className.indexOf("*");
-	      if (wcIndex != -1)
-		cn = ocn.startsWith(className.substring(0, wcIndex));
-	      else
-		cn = ocn.equals(className);
-	    }
-	  boolean m = false;
-	  String om = nh.getMember();
-	  if (om == null || member.equals("*")) 
-	    m = true;
-	  else
-	    m = om.equals(member);
-	  boolean on = false;
-	  ObjectName oon = nh.getObjectName();
-	  if (oon == null)
-	    on = true;
-	  else if (objectName.isPattern())
-	    on = objectName.apply(oon);
-	  else
-	    on = oon.equals(objectName);
-	  return (cn && m && on);    
-	}
+        {
+          NameHolder nh = (NameHolder) obj;
+          boolean cn = false;
+          String ocn = nh.getClassName();
+          if (ocn == null || className.equals("*"))
+            cn = true;
+          else
+            {
+              int wcIndex = className.indexOf("*");
+              if (wcIndex != -1)
+                cn = ocn.startsWith(className.substring(0, wcIndex));
+              else
+                cn = ocn.equals(className);
+            }
+          boolean m = false;
+          String om = nh.getMember();
+          if (om == null || member.equals("*"))
+            m = true;
+          else
+            m = om.equals(member);
+          boolean on = false;
+          ObjectName oon = nh.getObjectName();
+          if (oon == null)
+            on = true;
+          else if (objectName.isPattern())
+            on = objectName.apply(oon);
+          else
+            on = oon.equals(objectName);
+          return (cn && m && on);
+        }
       return false;
     }
-    
+
     /**
      * Returns the class name.
      */
@@ -540,11 +540,10 @@ public class MBeanPermission
   {
     for (String action : actionSet)
       {
-	if (!(validSet.contains(action)))
-	  throw new IllegalArgumentException("Invalid action " 
-					     + action + " found.");
+        if (!(validSet.contains(action)))
+          throw new IllegalArgumentException("Invalid action "
+                                             + action + " found.");
       }
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/MBeanRegistrationException.java b/libjava/classpath/javax/management/MBeanRegistrationException.java
index 9f62b9aa04f..18ed44a36a9 100644
--- a/libjava/classpath/javax/management/MBeanRegistrationException.java
+++ b/libjava/classpath/javax/management/MBeanRegistrationException.java
@@ -81,4 +81,3 @@ public class MBeanRegistrationException
 
 
 }
-
diff --git a/libjava/classpath/javax/management/MBeanServer.java b/libjava/classpath/javax/management/MBeanServer.java
index 0be5d71ad5d..4b572157012 100644
--- a/libjava/classpath/javax/management/MBeanServer.java
+++ b/libjava/classpath/javax/management/MBeanServer.java
@@ -72,7 +72,7 @@ import javax.management.loading.ClassLoaderRepository;
  * is thrown.  Note than the class name used in the exception
  * is that of the bean, and thus, as a result, an
  * {@link InstanceNotFoundException}
- * precludes these security checks, due to the class name 
+ * precludes these security checks, due to the class name
  * that would be used in the exception being unavailable.
  * 
                  
  *
@@ -113,7 +113,7 @@ public interface MBeanServer
    *                                                      Object)
    */
   void addNotificationListener(ObjectName name, NotificationListener listener,
-			       NotificationFilter filter, Object passback)
+                               NotificationFilter filter, Object passback)
     throws InstanceNotFoundException;
 
   /**
@@ -122,7 +122,7 @@ public interface MBeanServer
    * bean.  Notifications emitted by the management bean are forwarded
    * to the listener via the server, which will convert any MBean
    * references in the source to portable {@link ObjectName}
-   * instances.  The notification is otherwise unchanged.  
+   * instances.  The notification is otherwise unchanged.
    * 
                  
    * 
                  
    * The listener that receives notifications will be the one that is
@@ -159,7 +159,7 @@ public interface MBeanServer
    *                                                      Object)
    */
   void addNotificationListener(ObjectName name, ObjectName listener,
-			       NotificationFilter filter, Object passback)
+                               NotificationFilter filter, Object passback)
     throws InstanceNotFoundException;
 
   /**
@@ -168,7 +168,7 @@ public interface MBeanServer
    * using the default constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -177,7 +177,7 @@ public interface MBeanServer
    * of this interface will be used to obtain the name in this case.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, Object[], String[])
    * createMBean(className, name, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -211,8 +211,8 @@ public interface MBeanServer
    */
   ObjectInstance createMBean(String className, ObjectName name)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException;
 
   /**
    * 
                  
@@ -220,7 +220,7 @@ public interface MBeanServer
    * using the given constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -228,7 +228,7 @@ public interface MBeanServer
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                  
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -256,10 +256,10 @@ public interface MBeanServer
    *                           and registerMBean methods.
    */
   ObjectInstance createMBean(String className, ObjectName name,
-			     Object[] params, String[] sig)
+                             Object[] params, String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException;
 
   /**
    * 
                  
@@ -277,7 +277,7 @@ public interface MBeanServer
    * of this interface will be used to obtain the name in this case.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, ObjectName, Object[], String)
    * createMBean(className, name, loaderName, (Object[]) null,
    * (String) null)} with null parameters
@@ -312,11 +312,11 @@ public interface MBeanServer
    *                           and registerMBean methods.
    * @see #createMBean(String, ObjectName, ObjectName, Object[], String[])
    */
-  ObjectInstance createMBean(String className, ObjectName name, 
-			     ObjectName loaderName)
+  ObjectInstance createMBean(String className, ObjectName name,
+                             ObjectName loaderName)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException;
 
   /**
    * 
                  
@@ -325,7 +325,7 @@ public interface MBeanServer
    * under the supplied name.  The class is loaded using the
    * given class loader.  If this argument is null,
    * then the same class loader as was used to load the server
-   * is used. 
+   * is used.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -333,7 +333,7 @@ public interface MBeanServer
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                  
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -364,11 +364,11 @@ public interface MBeanServer
    *                           and registerMBean methods.
    */
   ObjectInstance createMBean(String className, ObjectName name,
-			     ObjectName loaderName, Object[] params,
-			     String[] sig)
+                             ObjectName loaderName, Object[] params,
+                             String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException;
 
   /**
    * Deserializes a byte array using the class loader of the specified
@@ -449,7 +449,7 @@ public interface MBeanServer
    */
   ObjectInputStream deserialize(String name, ObjectName loader, byte[] data)
     throws InstanceNotFoundException, ReflectionException,
-	   OperationsException;
+           OperationsException;
 
   /**
    * Returns the value of the supplied attribute from the specified
@@ -478,7 +478,7 @@ public interface MBeanServer
    */
   Object getAttribute(ObjectName bean, String name)
     throws MBeanException, AttributeNotFoundException,
-	   InstanceNotFoundException, ReflectionException;
+           InstanceNotFoundException, ReflectionException;
 
   /**
    * Returns the values of the named attributes from the specified
@@ -505,7 +505,7 @@ public interface MBeanServer
    *                           MBeanPermission(className, n, bean,
    *                           "getAttribute")} or that attribute will
    *                           not be included.
-   *                           
+   *
    * @see DynamicMBean#getAttributes(String[])
    */
   AttributeList getAttributes(ObjectName bean, String[] names)
@@ -534,7 +534,7 @@ public interface MBeanServer
    */
   ClassLoader getClassLoader(ObjectName name)
     throws InstanceNotFoundException;
- 
+
   /**
    * Returns the class loader of the specified management bean.  If
    * l is the requested class loader, and r
@@ -630,7 +630,7 @@ public interface MBeanServer
    */
   MBeanInfo getMBeanInfo(ObjectName name)
     throws InstanceNotFoundException, IntrospectionException,
-	   ReflectionException;
+           ReflectionException;
 
   /**
    * Returns the {@link ObjectInstance} created for the specified
@@ -659,7 +659,7 @@ public interface MBeanServer
    * but the instance is not yet registered with the server.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #instantiate(String, Object[], String[])
    * instantiate(name, (Object[]) null, (String[]) null)}
    * with null parameters and signature.
@@ -723,7 +723,7 @@ public interface MBeanServer
    * registered with the server.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #instantiate(String, ObjectName, Object[], String[])
    * instantiate(name, loaderName, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -751,7 +751,7 @@ public interface MBeanServer
    */
   Object instantiate(String name, ObjectName loaderName)
     throws InstanceNotFoundException, ReflectionException,
-	   MBeanException;
+           MBeanException;
 
   /**
    * Creates an instance of the specified class using the supplied
@@ -782,9 +782,9 @@ public interface MBeanServer
    *                           "instantiate")}.
    */
   Object instantiate(String name, ObjectName loaderName,
-		     Object[] params, String[] sig)
+                     Object[] params, String[] sig)
     throws InstanceNotFoundException, ReflectionException,
-	   MBeanException;
+           MBeanException;
 
   /**
    * Invokes the supplied operation on the specified management
@@ -809,7 +809,7 @@ public interface MBeanServer
    */
   Object invoke(ObjectName bean, String name, Object[] params, String[] sig)
     throws InstanceNotFoundException, MBeanException,
-	   ReflectionException;
+           ReflectionException;
 
   /**
    * 
                  
@@ -826,7 +826,7 @@ public interface MBeanServer
    * 
                • Both the class of B and C were loaded by the same class loader,
    * and B is assignable to C.
                  • 
    * 
-   * 
+   *
    * @param name the name of the management bean.
    * @param className the name of the class to test if name is
    *                  an instance of.
@@ -869,7 +869,7 @@ public interface MBeanServer
    * 
                  
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                  
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -891,7 +891,7 @@ public interface MBeanServer
    *                           case that particular bean will again be excluded.
    */
   Set queryMBeans(ObjectName name, QueryExp query);
-  
+
   /**
    * 
                  
    * Returns a set of {@link ObjectName}s matching the specified
@@ -906,7 +906,7 @@ public interface MBeanServer
    * 
                  
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                  
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -935,7 +935,7 @@ public interface MBeanServer
    * Registers the supplied instance with the server, using the specified
    * {@link ObjectName}.  If the name given is null, then
    * the bean supplied is expected to implement the {@link MBeanRegistration}
-   * interface and provide the name via the 
+   * interface and provide the name via the
    * {@link MBeanRegistration#preRegister preRegister} method
    * of this interface.
    *
@@ -971,7 +971,7 @@ public interface MBeanServer
    */
   ObjectInstance registerMBean(Object obj, ObjectName name)
     throws InstanceAlreadyExistsException, MBeanRegistrationException,
-	   NotCompliantMBeanException;
+           NotCompliantMBeanException;
 
   /**
    * Removes the specified listener from the list of recipients
@@ -997,7 +997,7 @@ public interface MBeanServer
    * @see NotificationBroadcaster#removeNotificationListener(NotificationListener)
    */
   void removeNotificationListener(ObjectName name,
-				  NotificationListener listener)
+                                  NotificationListener listener)
     throws InstanceNotFoundException, ListenerNotFoundException;
 
   /**
@@ -1029,9 +1029,9 @@ public interface MBeanServer
    *                                                     Object)
    */
   void removeNotificationListener(ObjectName name,
-				  NotificationListener listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  NotificationListener listener,
+                                  NotificationFilter filter,
+                                  Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException;
 
   /**
@@ -1091,14 +1091,14 @@ public interface MBeanServer
    *                                                     Object)
    */
   void removeNotificationListener(ObjectName name,
-				  ObjectName listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  ObjectName listener,
+                                  NotificationFilter filter,
+                                  Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException;
 
   /**
    * Sets the value of the specified attribute of the supplied
-   * management bean.  
+   * management bean.
    *
    * @param name the name of the management bean.
    * @param attribute the attribute to set.
@@ -1131,8 +1131,8 @@ public interface MBeanServer
    */
   void setAttribute(ObjectName name, Attribute attribute)
     throws InstanceNotFoundException, AttributeNotFoundException,
-	   InvalidAttributeValueException, MBeanException,
-	   ReflectionException;
+           InvalidAttributeValueException, MBeanException,
+           ReflectionException;
 
   /**
    * Sets the value of each of the specified attributes
@@ -1192,7 +1192,7 @@ public interface MBeanServer
    *                           MBeanPermission(String,String,ObjectName,String)
    *                           MBeanPermission(className, null, name,
    *                           "unregisterMBean")}.
-   */ 
+   */
   void unregisterMBean(ObjectName name)
     throws InstanceNotFoundException, MBeanRegistrationException;
 
diff --git a/libjava/classpath/javax/management/MBeanServerBuilder.java b/libjava/classpath/javax/management/MBeanServerBuilder.java
index 4e280682900..ce45915d765 100644
--- a/libjava/classpath/javax/management/MBeanServerBuilder.java
+++ b/libjava/classpath/javax/management/MBeanServerBuilder.java
@@ -73,7 +73,7 @@ public class MBeanServerBuilder
    * same as that returned by {@link #newMBeanServerDelegate()} as the factory
    * can optionally wrap the delegate before calling this method.
    * 
                  
-   * 
+   *
    * @param defaultDomain the default domain used by the new server.
    * @param outer the {@link MBeanServer} passed to the {@link MBeanRegistration}
    *              interface of management beans.
@@ -82,7 +82,7 @@ public class MBeanServerBuilder
    * @return a new instance of a server implementation.
    */
   public MBeanServer newMBeanServer(String defaultDomain, MBeanServer outer,
-				    MBeanServerDelegate delegate)
+                                    MBeanServerDelegate delegate)
   {
     return new Server(defaultDomain, outer, delegate);
   }
diff --git a/libjava/classpath/javax/management/MBeanServerConnection.java b/libjava/classpath/javax/management/MBeanServerConnection.java
index cba6dacc63c..9e44b8fce8b 100644
--- a/libjava/classpath/javax/management/MBeanServerConnection.java
+++ b/libjava/classpath/javax/management/MBeanServerConnection.java
@@ -80,7 +80,7 @@ public interface MBeanServerConnection
    *                                                      Object)
    */
   void addNotificationListener(ObjectName name, NotificationListener listener,
-			       NotificationFilter filter, Object passback)
+                               NotificationFilter filter, Object passback)
     throws InstanceNotFoundException, IOException;
 
   /**
@@ -89,7 +89,7 @@ public interface MBeanServerConnection
    * bean.  Notifications emitted by the management bean are forwarded
    * to the listener via the server, which will convert any MBean
    * references in the source to portable {@link ObjectName}
-   * instances.  The notification is otherwise unchanged.  
+   * instances.  The notification is otherwise unchanged.
    * 
                  
    * 
                  
    * The listener that receives notifications will be the one that is
@@ -123,7 +123,7 @@ public interface MBeanServerConnection
    *                                                      Object)
    */
   void addNotificationListener(ObjectName name, ObjectName listener,
-			       NotificationFilter filter, Object passback)
+                               NotificationFilter filter, Object passback)
     throws InstanceNotFoundException, RuntimeOperationsException, IOException;
 
   /**
@@ -132,7 +132,7 @@ public interface MBeanServerConnection
    * using the default constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -141,7 +141,7 @@ public interface MBeanServerConnection
    * of this interface will be used to obtain the name in this case.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, Object[], String[])
    * createMBean(className, name, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -173,8 +173,8 @@ public interface MBeanServerConnection
    */
   ObjectInstance createMBean(String className, ObjectName name)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, IOException;
 
   /**
    * 
                  
@@ -182,7 +182,7 @@ public interface MBeanServerConnection
    * using the given constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -190,7 +190,7 @@ public interface MBeanServerConnection
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                  
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -216,10 +216,10 @@ public interface MBeanServerConnection
    *                     the bean server.
    */
   ObjectInstance createMBean(String className, ObjectName name,
-			     Object[] params, String[] sig)
+                             Object[] params, String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, IOException;
 
   /**
    * 
                  
@@ -237,7 +237,7 @@ public interface MBeanServerConnection
    * of this interface will be used to obtain the name in this case.
    * 
                  
    * 
                  
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, ObjectName, Object[], String)
    * createMBean(className, name, loaderName, (Object[]) null,
    * (String) null)} with null parameters
@@ -270,12 +270,12 @@ public interface MBeanServerConnection
    *                     the bean server.
    * @see #createMBean(String, ObjectName, ObjectName, Object[], String[])
    */
-  ObjectInstance createMBean(String className, ObjectName name, 
-			     ObjectName loaderName)
+  ObjectInstance createMBean(String className, ObjectName name,
+                             ObjectName loaderName)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException,
-	   IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException,
+           IOException;
 
   /**
    * 
                  
@@ -284,7 +284,7 @@ public interface MBeanServerConnection
    * under the supplied name.  The class is loaded using the
    * given class loader.  If this argument is null,
    * then the same class loader as was used to load the server
-   * is used. 
+   * is used.
    * 
                  
    * 
                  
    * If the name supplied is null, then the bean is
@@ -292,7 +292,7 @@ public interface MBeanServerConnection
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                  
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.
@@ -321,12 +321,12 @@ public interface MBeanServerConnection
    *                     the bean server.
    */
   ObjectInstance createMBean(String className, ObjectName name,
-			     ObjectName loaderName, Object[] params,
-			     String[] sig)
+                             ObjectName loaderName, Object[] params,
+                             String[] sig)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException,
-	   IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException,
+           IOException;
 
   /**
    * Returns the value of the supplied attribute from the specified
@@ -352,8 +352,8 @@ public interface MBeanServerConnection
    */
   Object getAttribute(ObjectName bean, String name)
     throws MBeanException, AttributeNotFoundException,
-	   InstanceNotFoundException, ReflectionException,
-	   IOException;
+           InstanceNotFoundException, ReflectionException,
+           IOException;
 
   /**
    * Returns the values of the named attributes from the specified
@@ -375,7 +375,7 @@ public interface MBeanServerConnection
    */
   AttributeList getAttributes(ObjectName bean, String[] names)
     throws InstanceNotFoundException, ReflectionException,
-	   IOException;
+           IOException;
 
   /**
    * Returns the default domain this server applies to beans that have
@@ -427,7 +427,7 @@ public interface MBeanServerConnection
    */
   MBeanInfo getMBeanInfo(ObjectName name)
     throws InstanceNotFoundException, IntrospectionException,
-	   ReflectionException, IOException;
+           ReflectionException, IOException;
 
   /**
    * Returns the {@link ObjectInstance} created for the specified
@@ -463,7 +463,7 @@ public interface MBeanServerConnection
    */
   Object invoke(ObjectName bean, String name, Object[] params, String[] sig)
     throws InstanceNotFoundException, MBeanException,
-	   ReflectionException, IOException;
+           ReflectionException, IOException;
 
   /**
    * 
                  
@@ -480,7 +480,7 @@ public interface MBeanServerConnection
    * 
                • Both the class of B and C were loaded by the same class loader,
    * and B is assignable to C.
                  • 
    * 
-   * 
+   *
    * @param name the name of the management bean.
    * @param className the name of the class to test if name is
    *                  an instance of.
@@ -523,7 +523,7 @@ public interface MBeanServerConnection
    * 
                  
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                  
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -535,7 +535,7 @@ public interface MBeanServerConnection
    */
   Set queryMBeans(ObjectName name, QueryExp query)
     throws IOException;
-  
+
   /**
    * 
                  
    * Returns a set of {@link ObjectName}s matching the specified
@@ -550,7 +550,7 @@ public interface MBeanServerConnection
    * 
                  
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                  
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -584,9 +584,9 @@ public interface MBeanServerConnection
    * @see NotificationBroadcaster#removeNotificationListener(NotificationListener)
    */
   void removeNotificationListener(ObjectName name,
-				  NotificationListener listener)
+                                  NotificationListener listener)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Removes the specified listener from the list of recipients
@@ -614,11 +614,11 @@ public interface MBeanServerConnection
    *                                                     Object)
    */
   void removeNotificationListener(ObjectName name,
-				  NotificationListener listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  NotificationListener listener,
+                                  NotificationFilter filter,
+                                  Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Removes the specified listener from the list of recipients
@@ -643,7 +643,7 @@ public interface MBeanServerConnection
    */
   void removeNotificationListener(ObjectName name, ObjectName listener)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Removes the specified listener from the list of recipients
@@ -672,15 +672,15 @@ public interface MBeanServerConnection
    *                                                     Object)
    */
   void removeNotificationListener(ObjectName name,
-				  ObjectName listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  ObjectName listener,
+                                  NotificationFilter filter,
+                                  Object passback)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Sets the value of the specified attribute of the supplied
-   * management bean.  
+   * management bean.
    *
    * @param name the name of the management bean.
    * @param attribute the attribute to set.
@@ -710,8 +710,8 @@ public interface MBeanServerConnection
    */
   void setAttribute(ObjectName name, Attribute attribute)
     throws InstanceNotFoundException, AttributeNotFoundException,
-	   InvalidAttributeValueException, MBeanException,
-	   ReflectionException, IOException;
+           InvalidAttributeValueException, MBeanException,
+           ReflectionException, IOException;
 
   /**
    * Sets the value of each of the specified attributes
@@ -739,7 +739,7 @@ public interface MBeanServerConnection
    */
   AttributeList setAttributes(ObjectName name, AttributeList attributes)
     throws InstanceNotFoundException, ReflectionException,
-	   IOException;
+           IOException;
 
   /**
    * Unregisters the specified management bean.  Following this operation,
@@ -760,9 +760,9 @@ public interface MBeanServerConnection
    *                                    {@link MBeanServerDelegate} bean.
    * @throws IOException if an I/O error occurred in communicating with
    *                     the bean server.
-   */ 
+   */
   void unregisterMBean(ObjectName name)
     throws InstanceNotFoundException, MBeanRegistrationException,
-	   IOException;
+           IOException;
 
 }
diff --git a/libjava/classpath/javax/management/MBeanServerDelegate.java b/libjava/classpath/javax/management/MBeanServerDelegate.java
index c55faa3d069..5addb993295 100644
--- a/libjava/classpath/javax/management/MBeanServerDelegate.java
+++ b/libjava/classpath/javax/management/MBeanServerDelegate.java
@@ -115,8 +115,8 @@ public class MBeanServerDelegate
    * @see #removeNotificationListener(NotificationListener)
    */
   public void addNotificationListener(NotificationListener listener,
-				      NotificationFilter filter,
-				      Object passback)
+                                      NotificationFilter filter,
+                                      Object passback)
     throws IllegalArgumentException
   {
     if (listener == null)
@@ -175,15 +175,15 @@ public class MBeanServerDelegate
    */
   public MBeanNotificationInfo[] getNotificationInfo()
   {
-    return new MBeanNotificationInfo[] 
+    return new MBeanNotificationInfo[]
       {
-	new MBeanNotificationInfo(new String[]
-	  {
-	    MBeanServerNotification.REGISTRATION_NOTIFICATION,
-	    MBeanServerNotification.UNREGISTRATION_NOTIFICATION,
-	  },
-				  MBeanServerNotification.class.getName(),
-				  "Server registration notifications")
+        new MBeanNotificationInfo(new String[]
+          {
+            MBeanServerNotification.REGISTRATION_NOTIFICATION,
+            MBeanServerNotification.UNREGISTRATION_NOTIFICATION,
+          },
+                                  MBeanServerNotification.class.getName(),
+                                  "Server registration notifications")
       };
   }
 
@@ -239,15 +239,15 @@ public class MBeanServerDelegate
     boolean foundOne = false;
     while (it.hasNext())
       {
-	if (it.next().getListener() == listener)
-	  {
-	    it.remove();
-	    foundOne = true;
-	  }
+        if (it.next().getListener() == listener)
+          {
+            it.remove();
+            foundOne = true;
+          }
       }
     if (!foundOne)
       throw new ListenerNotFoundException("The specified listener, " + listener +
-					  "is not registered with this bean.");
+                                          "is not registered with this bean.");
   }
 
   /**
@@ -269,16 +269,16 @@ public class MBeanServerDelegate
    * @see #removeNotificationListener(NotificationListener)
    */
   public void removeNotificationListener(NotificationListener listener,
-					 NotificationFilter filter,
-					 Object passback)
+                                         NotificationFilter filter,
+                                         Object passback)
     throws ListenerNotFoundException
   {
     if (!(listeners.remove(new ListenerData(listener, filter, passback))))
       {
-	throw new ListenerNotFoundException("The specified listener, " + listener +
-					    " with filter " + filter + 
-					    "and passback " + passback + 
-					    ", is not registered with this bean.");
+        throw new ListenerNotFoundException("The specified listener, " + listener +
+                                            " with filter " + filter +
+                                            "and passback " + passback +
+                                            ", is not registered with this bean.");
       }
   }
 
@@ -295,9 +295,9 @@ public class MBeanServerDelegate
       notification.setSequenceNumber(++seqNo);
     for (ListenerData ldata : listeners)
       {
-	NotificationFilter filter = ldata.getFilter();
-	if (filter == null || filter.isNotificationEnabled(notification))
-	  ldata.getListener().handleNotification(notification, ldata.getPassback());
+        NotificationFilter filter = ldata.getFilter();
+        if (filter == null || filter.isNotificationEnabled(notification))
+          ldata.getListener().handleNotification(notification, ldata.getPassback());
       }
   }
 
diff --git a/libjava/classpath/javax/management/MBeanServerFactory.java b/libjava/classpath/javax/management/MBeanServerFactory.java
index d798b0c4517..f9bd4566f37 100644
--- a/libjava/classpath/javax/management/MBeanServerFactory.java
+++ b/libjava/classpath/javax/management/MBeanServerFactory.java
@@ -134,7 +134,7 @@ public class MBeanServerFactory
    * The default domain name is used when the domain name specified by
    * the user is nullserver is null.
@@ -246,7 +246,7 @@ public class MBeanServerFactory
    * used when the domain name specified by the user is nullnull value.
    *
@@ -331,42 +331,42 @@ public class MBeanServerFactory
       SystemProperties.getProperty("javax.management.builder.initial");
     if (builderClass == null)
       {
-	if (builder == null ||
-	    builder.getClass() != MBeanServerBuilder.class)
-	  builder = new MBeanServerBuilder();
+        if (builder == null ||
+            builder.getClass() != MBeanServerBuilder.class)
+          builder = new MBeanServerBuilder();
       }
     else if (!(builder != null &&
-	       builderClass.equals(builder.getClass().getName())))
+               builderClass.equals(builder.getClass().getName())))
       {
-	ClassLoader cl = Thread.currentThread().getContextClassLoader();
-	if (cl == null)
-	  cl = MBeanServerFactory.class.getClassLoader();
-	try
-	  {
-	    Class bClass = Class.forName(builderClass, true, cl);
-	    builder = (MBeanServerBuilder) bClass.newInstance();
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    throw (JMRuntimeException) (new JMRuntimeException("The builder class, " 
-							       + builderClass +
-							       ", could not be found."))
-	      .initCause(e);
-	  }
-	catch (InstantiationException e)
-	  {
-	    throw (JMRuntimeException) (new JMRuntimeException("The builder class, " 
-							       + builderClass +
-							       ", could not be instantiated."))
-	      .initCause(e);
-	  }
-	catch (IllegalAccessException e)
-	  {
-	    throw (JMRuntimeException) (new JMRuntimeException("The builder class, " 
-							       + builderClass +
-							       ", could not be accessed."))
-	      .initCause(e);
-	  }
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        if (cl == null)
+          cl = MBeanServerFactory.class.getClassLoader();
+        try
+          {
+            Class bClass = Class.forName(builderClass, true, cl);
+            builder = (MBeanServerBuilder) bClass.newInstance();
+          }
+        catch (ClassNotFoundException e)
+          {
+            throw (JMRuntimeException) (new JMRuntimeException("The builder class, "
+                                                               + builderClass +
+                                                               ", could not be found."))
+              .initCause(e);
+          }
+        catch (InstantiationException e)
+          {
+            throw (JMRuntimeException) (new JMRuntimeException("The builder class, "
+                                                               + builderClass +
+                                                               ", could not be instantiated."))
+              .initCause(e);
+          }
+        catch (IllegalAccessException e)
+          {
+            throw (JMRuntimeException) (new JMRuntimeException("The builder class, "
+                                                               + builderClass +
+                                                               ", could not be accessed."))
+              .initCause(e);
+          }
       }
     MBeanServerDelegate delegate = builder.newMBeanServerDelegate();
     if (delegate == null)
@@ -399,12 +399,12 @@ public class MBeanServerFactory
     Iterator i = servers.values().iterator();
     while (i.hasNext())
       {
-	MBeanServer s = i.next();
-	if (server == s)
-	  {
-	    i.remove();
-	    return;
-	  }
+        MBeanServer s = i.next();
+        if (server == s)
+          {
+            i.remove();
+            return;
+          }
       }
     throw new IllegalArgumentException("The server given is not referenced.");
   }
diff --git a/libjava/classpath/javax/management/MBeanServerInvocationHandler.java b/libjava/classpath/javax/management/MBeanServerInvocationHandler.java
index acc8543f11b..093e882781a 100644
--- a/libjava/classpath/javax/management/MBeanServerInvocationHandler.java
+++ b/libjava/classpath/javax/management/MBeanServerInvocationHandler.java
@@ -81,7 +81,7 @@ import java.lang.reflect.Proxy;
  * 
                • toString() returns a textual representation
  * of the proxy.
                  • 
  * 
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -129,7 +129,7 @@ public class MBeanServerInvocationHandler
    *             actual calls.
    */
   public MBeanServerInvocationHandler(MBeanServerConnection conn,
-				      ObjectName name)
+                                      ObjectName name)
   {
     this(conn, name, false);
   }
@@ -143,7 +143,7 @@ public class MBeanServerInvocationHandler
    * Class)} if you wish to make your own call to
    * {@link java.lang.reflect.Proxy#newInstance(ClassLoader,
    * Class[], java.lang.reflect.InvocationHandler)} with
-   * a different {@link ClassLoader}.  
+   * a different {@link ClassLoader}.
    *
    * @param conn the connection through which methods will
    *             be forwarded to the bean.
@@ -154,7 +154,7 @@ public class MBeanServerInvocationHandler
    * @since 1.6
    */
   public MBeanServerInvocationHandler(MBeanServerConnection conn,
-				      ObjectName name, boolean mxBean)
+                                      ObjectName name, boolean mxBean)
   {
     this.conn = conn;
     this.name = name;
@@ -164,7 +164,7 @@ public class MBeanServerInvocationHandler
   /**
    * Returns the connection through which the calls to the bean
    * will be made.
-   * 
+   *
    * @return the connection being used to forward the calls to
    *         the bean.
    * @since 1.6
@@ -207,77 +207,77 @@ public class MBeanServerInvocationHandler
     Class proxyClass = proxy.getClass();
     if (mName.equals("toString"))
       {
-	if (inInterface(mName, proxyClass))
-	  return conn.invoke(name,mName,null,null);
-	else
-	  return proxyClass.getName() + "[name=" + name 
-	    + ", conn=" + conn + "]";
+        if (inInterface(mName, proxyClass))
+          return conn.invoke(name,mName,null,null);
+        else
+          return proxyClass.getName() + "[name=" + name
+            + ", conn=" + conn + "]";
       }
     if (mName.equals("hashCode"))
       {
-	if (inInterface(mName, proxyClass))
-	  return conn.invoke(name,mName,null,null);
-	else
-	  return conn.hashCode() + name.hashCode()
-	    + (iface == null ? 0 : iface.hashCode());
+        if (inInterface(mName, proxyClass))
+          return conn.invoke(name,mName,null,null);
+        else
+          return conn.hashCode() + name.hashCode()
+            + (iface == null ? 0 : iface.hashCode());
       }
     if (mName.equals("equals"))
       {
-	if (inInterface(mName, proxyClass, Object.class))
-	  return conn.invoke(name,mName,new Object[]{args[0]},
-			     new String[]{"java.lang.Object"});
-	else
-	  {
-	    if (args[0].getClass() != proxy.getClass())
-	      return false;
-	    InvocationHandler ih = Proxy.getInvocationHandler(args[0]);
-	    if (ih instanceof MBeanServerInvocationHandler)
-	      {
-		MBeanServerInvocationHandler h =
-		  (MBeanServerInvocationHandler) ih;
-		return conn.equals(h.getMBeanServerConnection())
-		  && name.equals(h.getObjectName())
-		  && (iface == null ? h.iface == null 
-		      : iface.equals(h.iface));
-	      }
-	    return false;
-	  }
+        if (inInterface(mName, proxyClass, Object.class))
+          return conn.invoke(name,mName,new Object[]{args[0]},
+                             new String[]{"java.lang.Object"});
+        else
+          {
+            if (args[0].getClass() != proxy.getClass())
+              return false;
+            InvocationHandler ih = Proxy.getInvocationHandler(args[0]);
+            if (ih instanceof MBeanServerInvocationHandler)
+              {
+                MBeanServerInvocationHandler h =
+                  (MBeanServerInvocationHandler) ih;
+                return conn.equals(h.getMBeanServerConnection())
+                  && name.equals(h.getObjectName())
+                  && (iface == null ? h.iface == null
+                      : iface.equals(h.iface));
+              }
+            return false;
+          }
       }
     if (NotificationEmitter.class.isAssignableFrom(proxyClass))
       {
-	if (mName.equals("addNotificationListener"))
-	  {
-	    conn.addNotificationListener(name,
-					 (NotificationListener) args[0],
-					 (NotificationFilter) args[1],
-					 args[2]);
-	    return null;
-	  }
-	if (mName.equals("getNotificationInfo"))
-	  return conn.getMBeanInfo(name).getNotifications();
-	if (mName.equals("removeNotificationListener"))
-	  {
-	    if (args.length == 1)
-	      conn.removeNotificationListener(name, 
-					      (NotificationListener)
-					      args[0]);
-	    else
-	      conn.removeNotificationListener(name, 
-					      (NotificationListener)
-					      args[0],
-					      (NotificationFilter)
-					      args[1], args[2]);
-	    return null;
-	  }
+        if (mName.equals("addNotificationListener"))
+          {
+            conn.addNotificationListener(name,
+                                         (NotificationListener) args[0],
+                                         (NotificationFilter) args[1],
+                                         args[2]);
+            return null;
+          }
+        if (mName.equals("getNotificationInfo"))
+          return conn.getMBeanInfo(name).getNotifications();
+        if (mName.equals("removeNotificationListener"))
+          {
+            if (args.length == 1)
+              conn.removeNotificationListener(name,
+                                              (NotificationListener)
+                                              args[0]);
+            else
+              conn.removeNotificationListener(name,
+                                              (NotificationListener)
+                                              args[0],
+                                              (NotificationFilter)
+                                              args[1], args[2]);
+            return null;
+          }
       }
     String[] sigs;
     if (args == null)
       sigs = null;
     else
       {
-	sigs = new String[args.length];
-	for (int a = 0; a < args.length; ++a)
-	  sigs[a] = args[a].getClass().getName();
+        sigs = new String[args.length];
+        for (int a = 0; a < args.length; ++a)
+          sigs[a] = args[a].getClass().getName();
       }
     String attrib = null;
     if (mName.startsWith("get"))
@@ -286,26 +286,26 @@ public class MBeanServerInvocationHandler
       attrib = mName.substring(2);
     if (attrib != null)
       {
-	Object val = conn.getAttribute(name, attrib);
-	if (mxBean)
-	  return Translator.toJava(val, method);
-	else
-	  return val;
+        Object val = conn.getAttribute(name, attrib);
+        if (mxBean)
+          return Translator.toJava(val, method);
+        else
+          return val;
       }
     else if (mName.startsWith("set"))
       {
-	Object arg;
-	if (mxBean)
-	  arg = Translator.fromJava(args, method)[0];
-	else
-	  arg = args[0];
-	conn.setAttribute(name, new Attribute(mName.substring(3), arg));
-	return null;
+        Object arg;
+        if (mxBean)
+          arg = Translator.fromJava(args, method)[0];
+        else
+          arg = args[0];
+        conn.setAttribute(name, new Attribute(mName.substring(3), arg));
+        return null;
       }
     if (mxBean)
-      return Translator.toJava(conn.invoke(name, mName, 
-					   Translator.fromJava(args,method),
-					   sigs), method);
+      return Translator.toJava(conn.invoke(name, mName,
+                                           Translator.fromJava(args,method),
+                                           sigs), method);
     else
       return conn.invoke(name, mName, args, sigs);
   }
@@ -332,7 +332,7 @@ public class MBeanServerInvocationHandler
    * second element of the array if broadcaster is true.
    * handler refers to the invocation handler which forwards
    * calls to the connection, which is created by a call to
-   * new MBeanServerInvocationHandler(conn, name). 
+   * new MBeanServerInvocationHandler(conn, name).
    * 
                  
    * 
                  
    * Note: use of the proxy may result in
@@ -355,18 +355,18 @@ public class MBeanServerInvocationHandler
   // Suppress warnings as we know an instance of T will be returned.
   @SuppressWarnings("unchecked")
   public static  T newProxyInstance(MBeanServerConnection conn,
-				       ObjectName name, Class iface,
-				       boolean broadcaster)
+                                       ObjectName name, Class iface,
+                                       boolean broadcaster)
   {
     if (broadcaster)
       return (T) Proxy.newProxyInstance(iface.getClassLoader(),
-					new Class[] { iface,
-						      NotificationEmitter.class },
-					new MBeanServerInvocationHandler(conn,name));
+                                        new Class[] { iface,
+                                                      NotificationEmitter.class },
+                                        new MBeanServerInvocationHandler(conn,name));
     else
       return (T) Proxy.newProxyInstance(iface.getClassLoader(),
-					new Class[] { iface },
-					new MBeanServerInvocationHandler(conn,name));
+                                        new Class[] { iface },
+                                        new MBeanServerInvocationHandler(conn,name));
   }
 
   /**
@@ -380,23 +380,22 @@ public class MBeanServerInvocationHandler
    *         given method.
    */
   private boolean inInterface(String name, Class proxyClass,
-			      Class... args)
+                              Class... args)
   {
     for (Class iface : proxyClass.getInterfaces())
       {
-	try
-	  {
-	    iface.getMethod(name, args);
-	    return true;
-	  }
-	catch (NoSuchMethodException e)
-	  {
-	    /* Ignored; this interface doesn't specify
-	       the method. */
-	  }
+        try
+          {
+            iface.getMethod(name, args);
+            return true;
+          }
+        catch (NoSuchMethodException e)
+          {
+            /* Ignored; this interface doesn't specify
+               the method. */
+          }
       }
     return false;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/management/MBeanServerNotification.java b/libjava/classpath/javax/management/MBeanServerNotification.java
index 820fd61b354..e225a2939b0 100644
--- a/libjava/classpath/javax/management/MBeanServerNotification.java
+++ b/libjava/classpath/javax/management/MBeanServerNotification.java
@@ -84,7 +84,7 @@ public class MBeanServerNotification
    * @param name the name of the bean concerned by this event.
    */
   public MBeanServerNotification(String type, Object source, long seqNo,
-				 ObjectName name)
+                                 ObjectName name)
   {
     super(type, source, seqNo);
     objectName = name;
diff --git a/libjava/classpath/javax/management/MBeanServerPermission.java b/libjava/classpath/javax/management/MBeanServerPermission.java
index 045573aba02..fea4ea21064 100644
--- a/libjava/classpath/javax/management/MBeanServerPermission.java
+++ b/libjava/classpath/javax/management/MBeanServerPermission.java
@@ -161,10 +161,10 @@ public class MBeanServerPermission
     super(checkName(name), actions);
     if (actions != null && actions.length() > 0)
       throw new IllegalArgumentException("The supplied action list " +
-					 "was not equal to null or the " +
-					 "empty string.");
+                                         "was not equal to null or the " +
+                                         "empty string.");
   }
-  
+
   /**
    * Returns true if the given object is also an {@link MBeanServerPermission}
    * with the same name.
@@ -177,8 +177,8 @@ public class MBeanServerPermission
   {
     if (obj instanceof MBeanServerPermission)
       {
-	MBeanServerPermission o = (MBeanServerPermission) obj;
-	return o.getName().equals(getName());
+        MBeanServerPermission o = (MBeanServerPermission) obj;
+        return o.getName().equals(getName());
       }
     return false;
   }
@@ -209,28 +209,28 @@ public class MBeanServerPermission
   {
     if (p instanceof MBeanServerPermission)
       {
-	if (getName().equals("*"))
-	  return true;
-	MBeanServerPermission msp = (MBeanServerPermission) p;
-	String[] thisCaps = getName().split(",");
-	String[] mspCaps = msp.getName().split(",");
-	for (int a = 0; a < mspCaps.length; ++a)
-	  {
-	    boolean found = false;
-	    String mc = mspCaps[a].trim();
-	    for (int b = 0; b < thisCaps.length; ++b)
-	      {
-		String tc = thisCaps[b].trim();
-		if (tc.equals(mc))
-		  found = true;
-		if (tc.equals("createMBeanServer") &&
-		    mc.equals("newMBeanServer"))
-		  found = true;
-	      }
-	    if (!found)
-	      return false;
-	  }
-	return true;
+        if (getName().equals("*"))
+          return true;
+        MBeanServerPermission msp = (MBeanServerPermission) p;
+        String[] thisCaps = getName().split(",");
+        String[] mspCaps = msp.getName().split(",");
+        for (int a = 0; a < mspCaps.length; ++a)
+          {
+            boolean found = false;
+            String mc = mspCaps[a].trim();
+            for (int b = 0; b < thisCaps.length; ++b)
+              {
+                String tc = thisCaps[b].trim();
+                if (tc.equals(mc))
+                  found = true;
+                if (tc.equals("createMBeanServer") &&
+                    mc.equals("newMBeanServer"))
+                  found = true;
+              }
+            if (!found)
+              return false;
+          }
+        return true;
       }
     return false;
   }
@@ -246,7 +246,7 @@ public class MBeanServerPermission
   {
     return new MBeanServerPermissionCollection();
   }
-  
+
   /**
    * A collection of {@link MBeanServerPermission}s, stored
    * as a single permission with the union of the capabilities
@@ -284,46 +284,46 @@ public class MBeanServerPermission
     public void add(Permission p)
     {
       if (isReadOnly())
-	throw new SecurityException("This collection is read only.");
+        throw new SecurityException("This collection is read only.");
       if (p instanceof MBeanServerPermission)
-	{
-	  MBeanServerPermission msp = (MBeanServerPermission) p;
-	  if (collectionPermission == null)
-	    collectionPermission = msp;
-	  else
-	    {
-	      String finalString = collectionPermission.getName();
-	      String[] cp = finalString.split(",");
-	      String[] np = msp.getName().split(",");
-	      int createms = finalString.indexOf("createMBeanServer");
-	      int newms = finalString.indexOf("newMBeanServer");
-	      for (int a = 0; a < np.length; ++a)
-		{
-		  boolean found = false;
-		  String nps = np[a].trim();
-		  for (int b = 0; b < cp.length; ++b)
-		    {
-		      String cps = cp[b].trim();
-		      if (cps.equals(nps))
-			found = true;
-		      if (nps.equals("newMBeanServer") 
-			  && createms != -1)
-			found = true;
-		      if (nps.equals("createMBeanServer")
-			  && newms != -1)
-			finalString =
-			  finalString.replace("newMBeanServer",
-					      "createMBeanServer");
-		    }
-		  if (!found)
-		    finalString += "," + nps;
-		}
-	      collectionPermission =
-		new MBeanServerPermission(finalString);
-	    }
-	}
+        {
+          MBeanServerPermission msp = (MBeanServerPermission) p;
+          if (collectionPermission == null)
+            collectionPermission = msp;
+          else
+            {
+              String finalString = collectionPermission.getName();
+              String[] cp = finalString.split(",");
+              String[] np = msp.getName().split(",");
+              int createms = finalString.indexOf("createMBeanServer");
+              int newms = finalString.indexOf("newMBeanServer");
+              for (int a = 0; a < np.length; ++a)
+                {
+                  boolean found = false;
+                  String nps = np[a].trim();
+                  for (int b = 0; b < cp.length; ++b)
+                    {
+                      String cps = cp[b].trim();
+                      if (cps.equals(nps))
+                        found = true;
+                      if (nps.equals("newMBeanServer")
+                          && createms != -1)
+                        found = true;
+                      if (nps.equals("createMBeanServer")
+                          && newms != -1)
+                        finalString =
+                          finalString.replace("newMBeanServer",
+                                              "createMBeanServer");
+                    }
+                  if (!found)
+                    finalString += "," + nps;
+                }
+              collectionPermission =
+                new MBeanServerPermission(finalString);
+            }
+        }
     }
-    
+
     /**
      * Returns an enumeration over the single permission.
      *
@@ -333,7 +333,7 @@ public class MBeanServerPermission
     public Enumeration elements()
     {
       return new
-	MBeanServerPermissionEnumeration(collectionPermission);
+        MBeanServerPermissionEnumeration(collectionPermission);
     }
 
     /**
@@ -365,8 +365,8 @@ public class MBeanServerPermission
        */
       public MBeanServerPermissionEnumeration(MBeanServerPermission p)
       {
-	this.p = p;
-	done = false;
+        this.p = p;
+        done = false;
       }
 
       /**
@@ -376,7 +376,7 @@ public class MBeanServerPermission
        */
       public boolean hasMoreElements()
       {
-	return !done;
+        return !done;
       }
 
       /**
@@ -386,13 +386,13 @@ public class MBeanServerPermission
        */
       public Permission nextElement()
       {
-	if (hasMoreElements())
-	  {
-	    done = true;
-	    return p;
-	  }
-	else
-	  throw new NoSuchElementException("No more elements are available.");
+        if (hasMoreElements())
+          {
+            done = true;
+            return p;
+          }
+        else
+          throw new NoSuchElementException("No more elements are available.");
       }
 
     }
@@ -433,42 +433,38 @@ public class MBeanServerPermission
   {
     if (!(name.equals("*")))
       {
-	String[] constraints = name.split(",");
-	name = "";
-	boolean seenCreate = false;
-	boolean seenNew = false;
-	boolean start = true;
-	for (int a = 0; a < constraints.length; ++a)
-	  {
-	    String next = constraints[a].trim();
-	    if (!(next.equals("createMBeanServer") ||
-		  next.equals("findMBeanServer") ||
-		  next.equals("newMBeanServer") ||
-		  next.equals("releaseMBeanServer")))
-	      throw new IllegalArgumentException("An invalid constraint, " +
-						 next + ", was specified.");
-	    if (next.equals("newMBeanServer"))
-	      seenNew = true;
-	    else if (next.equals("createMBeanServer"))
-	      seenCreate = true;
-	    else
-	      {
-		if (!start)
-		  name += ",";
-		name += next;
-		start = false;
-	      }
-	  }
-	if (seenNew && !seenCreate)
-	  name += (start ? "" : ",") + "newMBeanServer";
-	else if (seenCreate)
-	  name += (start ? "" : ",") + "createMBeanServer";
+        String[] constraints = name.split(",");
+        name = "";
+        boolean seenCreate = false;
+        boolean seenNew = false;
+        boolean start = true;
+        for (int a = 0; a < constraints.length; ++a)
+          {
+            String next = constraints[a].trim();
+            if (!(next.equals("createMBeanServer") ||
+                  next.equals("findMBeanServer") ||
+                  next.equals("newMBeanServer") ||
+                  next.equals("releaseMBeanServer")))
+              throw new IllegalArgumentException("An invalid constraint, " +
+                                                 next + ", was specified.");
+            if (next.equals("newMBeanServer"))
+              seenNew = true;
+            else if (next.equals("createMBeanServer"))
+              seenCreate = true;
+            else
+              {
+                if (!start)
+                  name += ",";
+                name += next;
+                start = false;
+              }
+          }
+        if (seenNew && !seenCreate)
+          name += (start ? "" : ",") + "newMBeanServer";
+        else if (seenCreate)
+          name += (start ? "" : ",") + "createMBeanServer";
       }
     return name;
   }
 
 }
-
-
-
-
diff --git a/libjava/classpath/javax/management/MBeanTrustPermission.java b/libjava/classpath/javax/management/MBeanTrustPermission.java
index 57d0e6889b0..371e1295ecf 100644
--- a/libjava/classpath/javax/management/MBeanTrustPermission.java
+++ b/libjava/classpath/javax/management/MBeanTrustPermission.java
@@ -46,8 +46,8 @@ import java.security.BasicPermission;
  * It has a target, but no actions. Valid values for the target
  * are "register" and "*", the latter
  * representing both the existing "register" target
- * and any future targets.  
- *  
+ * and any future targets.
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -96,10 +96,10 @@ public class MBeanTrustPermission
   {
     super(target, actions);
     if ((!(target.equals("register"))) &&
-	(!(target.equals("*"))))
+        (!(target.equals("*"))))
       throw new IllegalArgumentException("The target must be 'register' or '*'");
     if (actions != null && !(actions.length() == 0))
-      throw new IllegalArgumentException("The actions must be null or ''");  
+      throw new IllegalArgumentException("The actions must be null or ''");
   }
-  
+
 }
diff --git a/libjava/classpath/javax/management/MalformedObjectNameException.java b/libjava/classpath/javax/management/MalformedObjectNameException.java
index e2f5774908c..9a98991938d 100644
--- a/libjava/classpath/javax/management/MalformedObjectNameException.java
+++ b/libjava/classpath/javax/management/MalformedObjectNameException.java
@@ -73,4 +73,3 @@ public class MalformedObjectNameException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/NotCompliantMBeanException.java b/libjava/classpath/javax/management/NotCompliantMBeanException.java
index f2252f28b3a..a8fa7a85211 100644
--- a/libjava/classpath/javax/management/NotCompliantMBeanException.java
+++ b/libjava/classpath/javax/management/NotCompliantMBeanException.java
@@ -75,4 +75,3 @@ public class NotCompliantMBeanException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/Notification.java b/libjava/classpath/javax/management/Notification.java
index 2bbc206a8b4..0831c297cca 100644
--- a/libjava/classpath/javax/management/Notification.java
+++ b/libjava/classpath/javax/management/Notification.java
@@ -139,7 +139,7 @@ public class Notification
 
   /**
    * Creates a new {@link Notification} object with the specified type,
-   * source, sequence number and timestamp.  
+   * source, sequence number and timestamp.
    *
    * @param type the type of the notification.
    * @param source the source of the notification.
@@ -147,14 +147,14 @@ public class Notification
    * @param timeStamp the time the notification was emitted.
    */
   public Notification(String type, Object source, long sequenceNumber,
-		      long timeStamp)
+                      long timeStamp)
   {
     this(type, source, sequenceNumber, timeStamp, "");
   }
 
   /**
    * Creates a new {@link Notification} object with the specified type,
-   * source, sequence number, timestamp and message.  
+   * source, sequence number, timestamp and message.
    *
    * @param type the type of the notification.
    * @param source the source of the notification.
@@ -163,7 +163,7 @@ public class Notification
    * @param message the message contained in the notification.
    */
   public Notification(String type, Object source, long sequenceNumber,
-		      long timeStamp, String message)
+                      long timeStamp, String message)
   {
     super(source);
     this.type = type;
@@ -184,7 +184,7 @@ public class Notification
    * @param message the message contained in the notification.
    */
   public Notification(String type, Object source, long sequenceNumber,
-		      String message)
+                      String message)
   {
     this(type, source, sequenceNumber, new Date().getTime(), message);
   }
@@ -304,15 +304,15 @@ public class Notification
 
   /**
    * A textual representation of the notification.
-   * 
+   *
    * @return the notification in {@link java.lang.String} form.
    */
   public String toString()
   {
     return getClass().getName()
-      + "[message=" + message 
-      + ", sequenceNumber=" + sequenceNumber 
-      + ", source=" + source 
+      + "[message=" + message
+      + ", sequenceNumber=" + sequenceNumber
+      + ", source=" + source
       + ", timeStamp=" + timeStamp
       + ", type=" + type
       + ", userData=" + userData
@@ -332,4 +332,3 @@ public class Notification
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/NotificationBroadcaster.java b/libjava/classpath/javax/management/NotificationBroadcaster.java
index 139d842bb41..2196e980f22 100644
--- a/libjava/classpath/javax/management/NotificationBroadcaster.java
+++ b/libjava/classpath/javax/management/NotificationBroadcaster.java
@@ -55,7 +55,7 @@ package javax.management;
  */
 public interface NotificationBroadcaster
 {
-  
+
   /**
    * Registers the specified listener as a new recipient of
    * notifications from this bean.  If non-null, the filter
@@ -77,8 +77,8 @@ public interface NotificationBroadcaster
    * @see #removeNotificationListener(NotificationListener)
    */
   void addNotificationListener(NotificationListener listener,
-			       NotificationFilter filter,
-			       Object passback)
+                               NotificationFilter filter,
+                               Object passback)
     throws IllegalArgumentException;
 
   /**
@@ -109,4 +109,3 @@ public interface NotificationBroadcaster
     throws ListenerNotFoundException;
 
 }
-
diff --git a/libjava/classpath/javax/management/NotificationBroadcasterSupport.java b/libjava/classpath/javax/management/NotificationBroadcasterSupport.java
index 7eba6eccf25..28b8148c199 100644
--- a/libjava/classpath/javax/management/NotificationBroadcasterSupport.java
+++ b/libjava/classpath/javax/management/NotificationBroadcasterSupport.java
@@ -117,7 +117,7 @@ public class NotificationBroadcasterSupport
    * thread; only calls which have successfully passed through the
    * filter are sent to the executor.  This is equivalent to calling
    * NotificationBroadcasterSupport(executor, null).
-   * 
+   *
    * @param executor the executor to use for each call to
    *                 handleNotification().
    * @since 1.6
@@ -138,7 +138,7 @@ public class NotificationBroadcasterSupport
    * calling NotificationBroadcasterSupport(null, info).
    *
    * @param info an array of {@link MBeanNotificationInfo} objects
-   *             describing the notifications delivered by this 
+   *             describing the notifications delivered by this
    *             broadcaster.  This may be null, which
    *             is taken as being equivalent to an empty array.
    */
@@ -159,17 +159,17 @@ public class NotificationBroadcasterSupport
    * information about the notifications on calls to
    * {@link #getNotificationInfo()}, where a clone will be
    * returned if the array is non-empty.
-   * 
+   *
    * @param executor the executor to use for each call to
    *                 handleNotification().
    * @param info an array of {@link MBeanNotificationInfo} objects
-   *             describing the notifications delivered by this 
+   *             describing the notifications delivered by this
    *             broadcaster.  This may be null, which
    *             is taken as being equivalent to an empty array.
    * @since 1.6
    */
   public NotificationBroadcasterSupport(Executor executor,
-					MBeanNotificationInfo... info)
+                                        MBeanNotificationInfo... info)
   {
     this.executor = executor;
     this.info = info;
@@ -196,8 +196,8 @@ public class NotificationBroadcasterSupport
    * @see #removeNotificationListener(NotificationListener)
    */
   public void addNotificationListener(NotificationListener listener,
-				      NotificationFilter filter,
-				      Object passback)
+                                      NotificationFilter filter,
+                                      Object passback)
     throws IllegalArgumentException
   {
     if (listener == null)
@@ -234,8 +234,8 @@ public class NotificationBroadcasterSupport
    * @param passback the passback object of the listener.
    */
   protected void handleNotification(NotificationListener listener,
-				    Notification notif,
-				    Object passback)
+                                    Notification notif,
+                                    Object passback)
   {
     listener.handleNotification(notif, passback);
   }
@@ -260,15 +260,15 @@ public class NotificationBroadcasterSupport
     boolean foundOne = false;
     while (it.hasNext())
       {
-	if (it.next().getListener() == listener)
-	  {
-	    it.remove();
-	    foundOne = true;
-	  }
+        if (it.next().getListener() == listener)
+          {
+            it.remove();
+            foundOne = true;
+          }
       }
     if (!foundOne)
       throw new ListenerNotFoundException("The specified listener, " + listener +
-					  "is not registered with this bean.");
+                                          "is not registered with this bean.");
   }
 
   /**
@@ -289,16 +289,16 @@ public class NotificationBroadcasterSupport
    *                               java.lang.Object)
    */
   public void removeNotificationListener(NotificationListener listener,
-					 NotificationFilter filter,
-					 Object passback)
+                                         NotificationFilter filter,
+                                         Object passback)
     throws ListenerNotFoundException
   {
     if (!(listeners.remove(new ListenerData(listener, filter, passback))))
       {
-	throw new ListenerNotFoundException("The specified listener, " + listener +
-					    " with filter " + filter + 
-					    "and passback " + passback + 
-					    ", is not registered with this bean.");
+        throw new ListenerNotFoundException("The specified listener, " + listener +
+                                            " with filter " + filter +
+                                            "and passback " + passback +
+                                            ", is not registered with this bean.");
       }
   }
 
@@ -326,19 +326,19 @@ public class NotificationBroadcasterSupport
   {
     for (ListenerData ldata : listeners)
       {
-	NotificationFilter filter = ldata.getFilter();
-	if (filter == null || filter.isNotificationEnabled(notif))
-	  {
-	    if (executor == null)
-	      try
-		{
-		  handleNotification(ldata.getListener(), notif,
-				     ldata.getPassback());
-		}
-	      catch (Exception e) { /* Ignore */ }
-	    else
-	      executor.execute(new DispatchTask(ldata, notif));
-	  }
+        NotificationFilter filter = ldata.getFilter();
+        if (filter == null || filter.isNotificationEnabled(notif))
+          {
+            if (executor == null)
+              try
+                {
+                  handleNotification(ldata.getListener(), notif,
+                                     ldata.getPassback());
+                }
+              catch (Exception e) { /* Ignore */ }
+            else
+              executor.execute(new DispatchTask(ldata, notif));
+          }
       }
   }
 
@@ -366,7 +366,7 @@ public class NotificationBroadcasterSupport
      * @param notif the notification to send.
      */
     public DispatchTask(ListenerData ldata,
-			Notification notif)
+                        Notification notif)
     {
       this.ldata = ldata;
       this.notif = notif;
@@ -378,13 +378,12 @@ public class NotificationBroadcasterSupport
     public void run()
     {
       try
-	{
-	  handleNotification(ldata.getListener(), notif,
-			     ldata.getPassback());
-	}
+        {
+          handleNotification(ldata.getListener(), notif,
+                             ldata.getPassback());
+        }
       catch (Exception e) { /* Ignore */ }
     }
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/NotificationEmitter.java b/libjava/classpath/javax/management/NotificationEmitter.java
index 002e2fe1890..7187d8cdfcb 100644
--- a/libjava/classpath/javax/management/NotificationEmitter.java
+++ b/libjava/classpath/javax/management/NotificationEmitter.java
@@ -49,7 +49,7 @@ package javax.management;
 public interface NotificationEmitter
   extends NotificationBroadcaster
 {
-  
+
   /**
    * Removes the specified listener from the list of recipients
    * of notifications from this bean.  Only the first instance with
@@ -68,9 +68,8 @@ public interface NotificationEmitter
    *                               java.lang.Object)
    */
   void removeNotificationListener(NotificationListener listener,
-				  NotificationFilter filter,
-				  Object passback)
+                                  NotificationFilter filter,
+                                  Object passback)
     throws ListenerNotFoundException;
 
 }
-
diff --git a/libjava/classpath/javax/management/NotificationFilter.java b/libjava/classpath/javax/management/NotificationFilter.java
index a8e41c93fbc..db39aad7fcb 100644
--- a/libjava/classpath/javax/management/NotificationFilter.java
+++ b/libjava/classpath/javax/management/NotificationFilter.java
@@ -51,7 +51,7 @@ import java.io.Serializable;
 public interface NotificationFilter
   extends Serializable
 {
-  
+
   /**
    * Returns true if the specified notification should be passed
    * on to the listener.
@@ -63,4 +63,3 @@ public interface NotificationFilter
   boolean isNotificationEnabled(Notification notification);
 
 }
-
diff --git a/libjava/classpath/javax/management/NotificationFilterSupport.java b/libjava/classpath/javax/management/NotificationFilterSupport.java
index 28be8718882..a71f5c717ac 100644
--- a/libjava/classpath/javax/management/NotificationFilterSupport.java
+++ b/libjava/classpath/javax/management/NotificationFilterSupport.java
@@ -108,7 +108,7 @@ public class NotificationFilterSupport
     if (!enabledTypes.contains(prefix))
       enabledTypes.add(prefix);
   }
-  
+
   /**
    * Returns the list of enabled types for this
    * filter.
@@ -132,7 +132,7 @@ public class NotificationFilterSupport
     String nType = notif.getType();
     for (String type : enabledTypes)
       if (nType.startsWith(type))
-	return true;
+        return true;
     return false;
   }
 
diff --git a/libjava/classpath/javax/management/NotificationListener.java b/libjava/classpath/javax/management/NotificationListener.java
index 69b08eee3b3..4810e918786 100644
--- a/libjava/classpath/javax/management/NotificationListener.java
+++ b/libjava/classpath/javax/management/NotificationListener.java
@@ -49,7 +49,7 @@ import java.util.EventListener;
 public interface NotificationListener
   extends EventListener
 {
-  
+
   /**
    * Invoked by the notifying bean when a notification is to
    * be delivered to the recipient.  As the transmission of
@@ -67,4 +67,3 @@ public interface NotificationListener
   void handleNotification(Notification notification, Object passback);
 
 }
-
diff --git a/libjava/classpath/javax/management/ObjectInstance.java b/libjava/classpath/javax/management/ObjectInstance.java
index df364cffc89..1328db0e2e3 100644
--- a/libjava/classpath/javax/management/ObjectInstance.java
+++ b/libjava/classpath/javax/management/ObjectInstance.java
@@ -110,7 +110,7 @@ public class ObjectInstance
       return false;
     ObjectInstance i = (ObjectInstance) obj;
     return (i.getClassName().equals(className) &&
-	    i.getObjectName().equals(name));
+            i.getObjectName().equals(name));
   }
 
   /**
diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java
index d3ccd201fbd..856d03f036d 100644
--- a/libjava/classpath/javax/management/ObjectName.java
+++ b/libjava/classpath/javax/management/ObjectName.java
@@ -101,7 +101,7 @@ import java.io.ObjectOutputStream;
  * 'domain: key1 = value1 ' has a key ' key1 ' with value
  * ' value1 '.  Newlines are disallowed, except where escaped in quoted
  * values.
- * 
                   
+ * 
                  
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -156,13 +156,13 @@ public class ObjectName
   {
     try
       {
-	WILDCARD = new ObjectName("");
+        WILDCARD = new ObjectName("");
       }
     catch (MalformedObjectNameException e)
       {
-	throw (InternalError) (new InternalError("A problem occurred " +
-						 "initializing the ObjectName " +
-						 "wildcard.").initCause(e));
+        throw (InternalError) (new InternalError("A problem occurred " +
+                                                 "initializing the ObjectName " +
+                                                 "wildcard.").initCause(e));
       }
   }
 
@@ -208,34 +208,34 @@ public class ObjectName
     String[] pairs = rest.split(",");
     if (pairs.length == 0 && !isPattern())
       throw new MalformedObjectNameException("A name that is not a " +
-					     "pattern must contain at " +
-					     "least one key-value pair.");
+                                             "pattern must contain at " +
+                                             "least one key-value pair.");
     propertyListString = "";
     for (int a = 0; a < pairs.length; ++a)
       {
-	if (pairs[a].equals("*"))
-	  {
-	    if (propertyListPattern)
-	      throw new MalformedObjectNameException("Multiple wildcards " +
-						     "in properties.");
-	    propertyListPattern = true;
-	    continue;
-	  }
-	int sep = pairs[a].indexOf('=');
-	if (sep == -1)
-	  throw new MalformedObjectNameException("A key must be " +
-						 "followed by a value.");
-	String key = pairs[a].substring(0, sep);
-	if (properties.containsKey(key))
-	  throw new MalformedObjectNameException("The same key occurs " +
-						 "more than once.");
-	String value = pairs[a].substring(sep+1);
-	properties.put(key, value);
-	propertyListString += key + "=" + value + ",";
+        if (pairs[a].equals("*"))
+          {
+            if (propertyListPattern)
+              throw new MalformedObjectNameException("Multiple wildcards " +
+                                                     "in properties.");
+            propertyListPattern = true;
+            continue;
+          }
+        int sep = pairs[a].indexOf('=');
+        if (sep == -1)
+          throw new MalformedObjectNameException("A key must be " +
+                                                 "followed by a value.");
+        String key = pairs[a].substring(0, sep);
+        if (properties.containsKey(key))
+          throw new MalformedObjectNameException("The same key occurs " +
+                                                 "more than once.");
+        String value = pairs[a].substring(sep+1);
+        properties.put(key, value);
+        propertyListString += key + "=" + value + ",";
       }
     if (propertyListString.length() > 0)
       propertyListString =
-	propertyListString.substring(0, propertyListString.length() - 1);
+        propertyListString.substring(0, propertyListString.length() - 1);
     checkComponents();
   }
 
@@ -300,48 +300,48 @@ public class ObjectName
   {
     if (domain.indexOf(':') != -1)
       throw new MalformedObjectNameException("The domain includes a ':' " +
-					     "character.");
+                                             "character.");
     if (domain.indexOf('\n') != -1)
       throw new MalformedObjectNameException("The domain includes a newline " +
-					     "character.");
+                                             "character.");
     char[] keychars = new char[] { '\n', ':', ',', '*', '?', '=' };
     char[] valchars = new char[] { '\n', ':', ',', '=' };
     for (Map.Entry entry : properties.entrySet())
       {
-	for (int a = 0; a < keychars.length; ++a)
-	  if (entry.getKey().indexOf(keychars[a]) != -1)
-	    throw new MalformedObjectNameException("A key contains a '" +
-						   keychars[a] + "' " +
-						   "character.");
-	String value = entry.getValue();
-	int quote = value.indexOf('"');
-	if (quote == 0)
-	  {
-	    try
-	      {
-		unquote(value);
-	      }
-	    catch (IllegalArgumentException e)
-	      {
-		throw (MalformedObjectNameException)
-		  new MalformedObjectNameException("The quoted value is " +
-						   "invalid.").initCause(e);
-	      }
-	  }
-	else if (quote != -1)
-	  throw new MalformedObjectNameException("A value contains " +
-						 "a '\"' character.");
-	else
-	  {
-	    for (int a = 0; a < valchars.length; ++a)
-	      if (value.indexOf(valchars[a]) != -1)
-		throw new MalformedObjectNameException("A value contains " +
-						       "a '" + valchars[a] + "' " +
-						       "character.");
-	    
-	  }
-	if (value.indexOf('*') != -1 || value.indexOf('?') != -1)
-	  propertyValuePattern = true;
+        for (int a = 0; a < keychars.length; ++a)
+          if (entry.getKey().indexOf(keychars[a]) != -1)
+            throw new MalformedObjectNameException("A key contains a '" +
+                                                   keychars[a] + "' " +
+                                                   "character.");
+        String value = entry.getValue();
+        int quote = value.indexOf('"');
+        if (quote == 0)
+          {
+            try
+              {
+                unquote(value);
+              }
+            catch (IllegalArgumentException e)
+              {
+                throw (MalformedObjectNameException)
+                  new MalformedObjectNameException("The quoted value is " +
+                                                   "invalid.").initCause(e);
+              }
+          }
+        else if (quote != -1)
+          throw new MalformedObjectNameException("A value contains " +
+                                                 "a '\"' character.");
+        else
+          {
+            for (int a = 0; a < valchars.length; ++a)
+              if (value.indexOf(valchars[a]) != -1)
+                throw new MalformedObjectNameException("A value contains " +
+                                                       "a '" + valchars[a] + "' " +
+                                                       "character.");
+
+          }
+        if (value.indexOf('*') != -1 || value.indexOf('?') != -1)
+          propertyValuePattern = true;
       }
   }
 
@@ -375,33 +375,33 @@ public class ObjectName
 
     if (isDomainPattern())
       {
-	if (!domainMatches(domain, 0, name.getDomain(), 0))
-	  return false;
+        if (!domainMatches(domain, 0, name.getDomain(), 0))
+          return false;
       }
     else
       {
-	if (!domain.equals(name.getDomain()))
-	  return false;
+        if (!domain.equals(name.getDomain()))
+          return false;
       }
 
     if (isPropertyPattern())
       {
-	Hashtable oProps = name.getKeyPropertyList();
-	for (Map.Entry entry : properties.entrySet())
-	  {
-	    String key = entry.getKey();
-	    if (!(oProps.containsKey(key)))
-	      return false;
-	    String val = entry.getValue();
-	    if (!(val.equals(oProps.get(key))))
-	      return false;
-	  }
+        Hashtable oProps = name.getKeyPropertyList();
+        for (Map.Entry entry : properties.entrySet())
+          {
+            String key = entry.getKey();
+            if (!(oProps.containsKey(key)))
+              return false;
+            String val = entry.getValue();
+            if (!(val.equals(oProps.get(key))))
+              return false;
+          }
       }
     else
       {
-	if (!getCanonicalKeyPropertyListString().equals
-	    (name.getCanonicalKeyPropertyListString()))
-	  return false;
+        if (!getCanonicalKeyPropertyListString().equals
+            (name.getCanonicalKeyPropertyListString()))
+          return false;
       }
     return true;
   }
@@ -416,29 +416,29 @@ public class ObjectName
    * @return true if the domain matches the pattern.
    */
   private static boolean domainMatches(String pattern, int patternindex,
-				       String domain, int domainindex)
+                                       String domain, int domainindex)
   {
     while (patternindex < pattern.length())
       {
-	char c = pattern.charAt(patternindex++);
-	
-	if (c == '*')
-	  {
-	    for (int i = domain.length(); i >= domainindex; i--)
-	      {
-		if (domainMatches(pattern, patternindex, domain, i))
-		  return true;
-	      }
-	    return false;
-	  }
+        char c = pattern.charAt(patternindex++);
 
-	if (domainindex >= domain.length())
-	  return false;
-	
-	if (c != '?' && c != domain.charAt(domainindex))
-	  return false;
+        if (c == '*')
+          {
+            for (int i = domain.length(); i >= domainindex; i--)
+              {
+                if (domainMatches(pattern, patternindex, domain, i))
+                  return true;
+              }
+            return false;
+          }
 
-	domainindex++;
+        if (domainindex >= domain.length())
+          return false;
+
+        if (c != '?' && c != domain.charAt(domainindex))
+          return false;
+
+        domainindex++;
       }
     return true;
   }
@@ -457,8 +457,8 @@ public class ObjectName
   {
     if (obj instanceof ObjectName)
       {
-	ObjectName o = (ObjectName) obj;
-	return getCanonicalName().equals(o.getCanonicalName());
+        ObjectName o = (ObjectName) obj;
+        return getCanonicalName().equals(o.getCanonicalName());
       }
     return false;
   }
@@ -467,7 +467,7 @@ public class ObjectName
    * Returns the property list in canonical form.  The keys
    * are ordered using the lexicographic ordering used by
    * {@link java.lang.String#compareTo(java.lang.Object)}.
-   * 
+   *
    * @return the property list, with the keys in lexicographic
    *         order.
    */
@@ -477,10 +477,10 @@ public class ObjectName
     Iterator> i = properties.entrySet().iterator();
     while (i.hasNext())
       {
-	Map.Entry entry = i.next();
-	builder.append(entry.getKey() + "=" + entry.getValue());
-	if (i.hasNext())
-	  builder.append(",");
+        Map.Entry entry = i.next();
+        builder.append(entry.getKey() + "=" + entry.getValue());
+        if (i.hasNext())
+          builder.append(",");
       }
     return builder.toString();
   }
@@ -488,7 +488,7 @@ public class ObjectName
   /**
    * 
                  
    * Returns the name as a string in canonical form.  More precisely,
-   * this returns a string of the format 
+   * this returns a string of the format
    * <domain>:<properties><wild>.  <properties>
    * is the same value as returned by
    * {@link #getCanonicalKeyPropertyListString()}.  <wild>
@@ -499,7 +499,7 @@ public class ObjectName
    * 
                • '*' if <properties> is empty.
                  • 
    * 
                • ',*' if there is at least one key-value pair.
                  • 
    * 
-   * 
+   *
    * @return the canonical string form of the object name, as specified
    *         above.
    */
@@ -539,13 +539,13 @@ public class ObjectName
   {
     try
       {
-	return new ObjectName(name.getCanonicalName());
+        return new ObjectName(name.getCanonicalName());
       }
     catch (MalformedObjectNameException e)
       {
-	throw (InternalError)
-	  (new InternalError("The canonical name of " +
-			     "the given name is invalid.").initCause(e));
+        throw (InternalError)
+          (new InternalError("The canonical name of " +
+                             "the given name is invalid.").initCause(e));
       }
   }
 
@@ -557,7 +557,7 @@ public class ObjectName
    *
    * @param name the {@link ObjectName} to provide an instance of.
    * @return a instance for the given name, which may or may not be a subclass
-   *         of {@link ObjectName}.  
+   *         of {@link ObjectName}.
    * @throws MalformedObjectNameException the domain, a key or a value
    *                                      contains an illegal
    *                                      character or a value
@@ -582,7 +582,7 @@ public class ObjectName
    * @param key the key of the property.
    * @param value the value of the property.
    * @return a instance for the given name, which may or may not be a subclass
-   *         of {@link ObjectName}.  
+   *         of {@link ObjectName}.
    * @throws MalformedObjectNameException the domain, a key or a value
    *                                      contains an illegal
    *                                      character or a value
@@ -606,7 +606,7 @@ public class ObjectName
    * @param domain the domain part of the object name.
    * @param properties the key-value property pairs.
    * @return a instance for the given name, which may or may not be a subclass
-   *         of {@link ObjectName}.  
+   *         of {@link ObjectName}.
    * @throws MalformedObjectNameException the domain, a key or a value
    *                                      contains an illegal
    *                                      character or a value
@@ -615,7 +615,7 @@ public class ObjectName
    * @throws NullPointerException if name is null.
    */
   public static ObjectName getInstance(String domain,
-				       Hashtable properties)
+                                       Hashtable properties)
     throws MalformedObjectNameException
   {
     return new ObjectName(domain, properties);
@@ -654,7 +654,7 @@ public class ObjectName
    * list.  If the object name was created using {@link
    * ObjectName(String)}, then this string will contain the properties
    * in the same order they were given in at creation.
-   * 
+   *
    * @return the property list.
    */
   public String getKeyPropertyListString()
@@ -784,8 +784,8 @@ public class ObjectName
    * 
                • Otherwise, s is used verbatim.
    * 
                  • 
    * 
                • The string is terminated with a closing quote character, '"'.
                  • 
-   *  
-   * 
+   * 
+   *
    * @param string the string to quote.
    * @return a quoted version of the supplied string.
    * @throws NullPointerException if string is null.
@@ -796,27 +796,27 @@ public class ObjectName
     builder.append('"');
     for (int a = 0; a < string.length(); ++a)
       {
-	char s = string.charAt(a);
-	switch (s)
-	  {
-	  case '"':
-	    builder.append("\\\"");
-	    break;
-	  case '*':
-	    builder.append("\\*");
-	    break;
-	  case '?':
-	    builder.append("\\?");
-	    break;
-	  case '\\':
-	    builder.append("\\\\");
-	    break;
-	  case '\n':
-	    builder.append("\\\n");
-	    break;
-	  default:
-	    builder.append(s);
-	  }
+        char s = string.charAt(a);
+        switch (s)
+          {
+          case '"':
+            builder.append("\\\"");
+            break;
+          case '*':
+            builder.append("\\*");
+            break;
+          case '?':
+            builder.append("\\?");
+            break;
+          case '\\':
+            builder.append("\\\\");
+            break;
+          case '\n':
+            builder.append("\\\n");
+            break;
+          default:
+            builder.append(s);
+          }
       }
     builder.append('"');
     return builder.toString();
@@ -881,7 +881,7 @@ public class ObjectName
    * @param in the input stream to read from.
    * @throws IOException if an I/O error occurs.
    */
-  private void readObject(ObjectInputStream in) 
+  private void readObject(ObjectInputStream in)
     throws IOException, ClassNotFoundException
    {
      in.defaultReadObject();
@@ -908,7 +908,7 @@ public class ObjectName
    * @return the unquoted string.
    * @throws NullPointerException if q is null.
    * @throws IllegalArgumentException if the string is not a valid
-   *                                  quoted string i.e. it is not 
+   *                                  quoted string i.e. it is not
    *                                  surrounded by quotation marks
    *                                  and/or characters are not properly
    *                                  escaped.
@@ -917,25 +917,25 @@ public class ObjectName
   {
     if (q.charAt(0) != '"')
       throw new IllegalArgumentException("The string does " +
-					 "not start with a quote.");
+                                         "not start with a quote.");
     if (q.charAt(q.length() - 1) != '"')
       throw new IllegalArgumentException("The string does " +
-					 "not end with a quote.");
+                                         "not end with a quote.");
     CPStringBuilder builder = new CPStringBuilder();
     for (int a = 1; a < (q.length() - 1); ++a)
       {
-	char n = q.charAt(a);
-	if (n == '\\')
-	  {
-	    n = q.charAt(++a);
-	    if (n != '"' && n != '?' && n != '*' &&
-		n != 'n' && n != '\\')
-	      throw new IllegalArgumentException("Illegal escaped character: "
-						 + n);
-	  }
-	else if (n == '"' || n == '\n') 
-	  throw new IllegalArgumentException("Illegal character: " + n);
-	builder.append(n);
+        char n = q.charAt(a);
+        if (n == '\\')
+          {
+            n = q.charAt(++a);
+            if (n != '"' && n != '?' && n != '*' &&
+                n != 'n' && n != '\\')
+              throw new IllegalArgumentException("Illegal escaped character: "
+                                                 + n);
+          }
+        else if (n == '"' || n == '\n')
+          throw new IllegalArgumentException("Illegal character: " + n);
+        builder.append(n);
       }
 
     return builder.toString();
diff --git a/libjava/classpath/javax/management/OperationsException.java b/libjava/classpath/javax/management/OperationsException.java
index cbd90d63782..b0e434de4dd 100644
--- a/libjava/classpath/javax/management/OperationsException.java
+++ b/libjava/classpath/javax/management/OperationsException.java
@@ -73,4 +73,3 @@ public class OperationsException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/PersistentMBean.java b/libjava/classpath/javax/management/PersistentMBean.java
index e47e2c5fac5..51ee4604b17 100644
--- a/libjava/classpath/javax/management/PersistentMBean.java
+++ b/libjava/classpath/javax/management/PersistentMBean.java
@@ -74,7 +74,7 @@ public interface PersistentMBean
    */
   void load()
     throws MBeanException, RuntimeOperationsException,
-	   InstanceNotFoundException;
+           InstanceNotFoundException;
 
   /**
    * 
                  
@@ -121,6 +121,6 @@ public interface PersistentMBean
    */
   void store()
     throws MBeanException, RuntimeOperationsException,
-	   InstanceNotFoundException;
+           InstanceNotFoundException;
 
 }
diff --git a/libjava/classpath/javax/management/Query.java b/libjava/classpath/javax/management/Query.java
index 80b76b1b6da..7cd02704b01 100644
--- a/libjava/classpath/javax/management/Query.java
+++ b/libjava/classpath/javax/management/Query.java
@@ -42,7 +42,7 @@ package javax.management;
  * may be used to list and enumerate management beans, via
  * the {@link MBeanServer}.  By using the methods in this class,
  * complex queries can be created from their more basic
- * components. 
+ * components.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -61,7 +61,7 @@ public class Query
    * query to be used in serialization.
    */
   public static final int MINUS = 1;
-  
+
   /**
    * A code representing the {@link #times(ValueExp, ValueExp)
    * query to be used in serialization.
@@ -133,7 +133,7 @@ public class Query
    *         {@link MatchQueryExp}.
    */
   public static QueryExp anySubString(AttributeValueExp attrib,
-				      StringValueExp string)
+                                      StringValueExp string)
   {
     return new MatchQueryExp(attrib, "*" + string.getValue() + "*");
   }
@@ -168,7 +168,7 @@ public class Query
    *         {@link QualifiedAttributeValueExp}.
    */
   public static AttributeValueExp attr(String className,
-				       String name)
+                                       String name)
   {
     return new QualifiedAttributeValueExp(className, name);
   }
@@ -189,7 +189,7 @@ public class Query
    *         {@link BetweenQueryExp}.
    */
   public static QueryExp between(ValueExp v1, ValueExp v2,
-				 ValueExp v3)
+                                 ValueExp v3)
   {
     return new BetweenQueryExp(v1, v2, v3);
   }
@@ -213,7 +213,7 @@ public class Query
 
   /**
    * Returns a value expression which evaluates to the result of
-   * dividing v1 by v2. 
+   * dividing v1 by v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -229,7 +229,7 @@ public class Query
 
   /**
    * Returns a query expression which evaluates to the result of
-   * comparing v1 to v2 for equality. 
+   * comparing v1 to v2 for equality.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -257,7 +257,7 @@ public class Query
    *         {@link MatchQueryExp}.
    */
   public static QueryExp finalSubString(AttributeValueExp attrib,
-					StringValueExp string)
+                                        StringValueExp string)
   {
     return new MatchQueryExp(attrib, "*" + string.getValue());
   }
@@ -265,7 +265,7 @@ public class Query
   /**
    * Returns a query expression which evaluates to the result of
    * comparing v1 to v2 to see if
-   * v1 is greater than or equal to v2. 
+   * v1 is greater than or equal to v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -282,7 +282,7 @@ public class Query
   /**
    * Returns a query expression which evaluates to the result of
    * comparing v1 to v2 to see if
-   * v1 is greater than v2. 
+   * v1 is greater than v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -327,7 +327,7 @@ public class Query
    *         {@link MatchQueryExp}.
    */
   public static QueryExp initialSubString(AttributeValueExp attrib,
-					  StringValueExp string)
+                                          StringValueExp string)
   {
     return new MatchQueryExp(attrib, string.getValue() + "*");
   }
@@ -357,7 +357,7 @@ public class Query
   /**
    * Returns a query expression which evaluates to the result of
    * comparing v1 to v2 to see if
-   * v1 is less than or equal to v2. 
+   * v1 is less than or equal to v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -374,7 +374,7 @@ public class Query
   /**
    * Returns a query expression which evaluates to the result of
    * comparing v1 to v2 to see if
-   * v1 is less than v2. 
+   * v1 is less than v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -422,14 +422,14 @@ public class Query
    *         as the non-public class {@link MatchQueryExp}.
    */
   public static QueryExp match(AttributeValueExp attrib,
-			       StringValueExp string)
+                               StringValueExp string)
   {
     return new MatchQueryExp(attrib, string.getValue());
   }
 
   /**
    * Returns a value expression which evaluates to the result of
-   * subtracting v2 from v1. 
+   * subtracting v2 from v1.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -474,7 +474,7 @@ public class Query
 
   /**
    * Returns a value expression which evaluates to the result of
-   * adding v1 to v2. 
+   * adding v1 to v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -490,7 +490,7 @@ public class Query
 
   /**
    * Returns a value expression which evaluates to the result of
-   * multiplying v1 by v2. 
+   * multiplying v1 by v2.
    *
    * @param v1 the left-hand operand.
    * @param v2 the right-hand operand.
@@ -505,7 +505,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the boolean value to wrap.
    * @return a value expression wrapping val.  This
@@ -518,7 +518,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the double value to wrap.
    * @return a value expression wrapping val.  This
@@ -531,7 +531,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the float value to wrap.
    * @return a value expression wrapping val.  This
@@ -544,7 +544,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the integer value to wrap.
    * @return a value expression wrapping val.  This
@@ -557,7 +557,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the long value to wrap.
    * @return a value expression wrapping val.  This
@@ -570,7 +570,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified value. 
+   * Returns a value expression wrapping the specified value.
    *
    * @param val the {@link Number} value to wrap.
    * @return a value expression wrapping val.  This
@@ -583,7 +583,7 @@ public class Query
   }
 
   /**
-   * Returns a value expression wrapping the specified string. 
+   * Returns a value expression wrapping the specified string.
    *
    * @param val the {@link String} to wrap.
    * @return a {@link StringValueExp} wrapping val.
@@ -609,7 +609,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = -1081892073854801359L;
-    
+
     /**
      * The first operand.
      */
@@ -653,7 +653,7 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       return exp1.apply(name) && exp2.apply(name);
     }
@@ -676,7 +676,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = -7156603696948215014L;
-    
+
     /**
      * The attribute to match against.
      */
@@ -695,7 +695,7 @@ public class Query
      * @param pattern the pattern.
      */
     public MatchQueryExp(AttributeValueExp exp,
-			 String pattern)
+                         String pattern)
     {
       this.exp = exp;
       this.pattern = pattern;
@@ -720,7 +720,7 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       String val = ((StringValueExp) exp.apply(name)).getValue();
       int valPos = 0;
@@ -728,83 +728,83 @@ public class Query
       int fallbackP = -1;
       boolean backslash = false;
       for (int a = 0; a < pattern.length(); ++a)
-	{
-	  boolean matched = false;
-	  int next = pattern.codePointAt(a);
-	  if (!backslash)
-	    {
-	      if (next == '?' && valPos < val.length())
-		{
-		  ++valPos;
-		  matched = true;
-		}
-	      else if (next == '*')
-		{
-		  fallback = valPos;
-		  fallbackP = a;
-		  matched = true;
-		}
-	      else if (next == '[' && valPos < val.length()) 
-		{
-		  boolean negated = false;
-		  int b = a + 1;
-		  int classChar = pattern.codePointAt(b);
-		  do
-		    {
-		      if (classChar == '!' && b == a + 1)
-			negated = true;
-		      else if (pattern.codePointAt(b + 1) == '-' &&
-			       pattern.codePointAt(b + 2) != ']')
-			{
-			  if (classChar > pattern.codePointAt(b + 2))
-			    throw new BadStringOperationException("Invalid range: " +
-								  classChar + " to " +
-								  pattern.codePointAt(b+2));
-			  for (int c = classChar; c <= pattern.codePointAt(b+2); ++c)
-			    if (val.codePointAt(valPos) == c)
-			      matched = true;
-			  b = b + 2;
-			}
-		      else if (val.codePointAt(valPos) == classChar)
-			matched = true;
-		      ++b;
-		      classChar = pattern.codePointAt(b);
-		    } while (classChar != ']');
-		  if (negated)
-		    matched = !matched;
-		  ++valPos;
-		  a = b;
-		}
-	      else if (next == '\\')
-		backslash = true;
-	      else if (valPos < val.length() && next == val.codePointAt(valPos))
-		{
-		  matched = true;
-		  ++valPos;
-		}
-	    }
-	  else
-	    {
-	      backslash = false;
-	      if (valPos < val.length() && next == val.codePointAt(valPos))
-		{
-		  matched = true;
-		  ++valPos;
-		}	
-	    }
-	  if (!matched)
-	    if (fallback != -1)
-	      {
-		++fallback;
-		valPos = fallback;
-		a = fallbackP;
-		if (valPos == val.length())
-		  return false;
-		continue;
-	      }
-	    else
-	      return false;
-	}
+        {
+          boolean matched = false;
+          int next = pattern.codePointAt(a);
+          if (!backslash)
+            {
+              if (next == '?' && valPos < val.length())
+                {
+                  ++valPos;
+                  matched = true;
+                }
+              else if (next == '*')
+                {
+                  fallback = valPos;
+                  fallbackP = a;
+                  matched = true;
+                }
+              else if (next == '[' && valPos < val.length())
+                {
+                  boolean negated = false;
+                  int b = a + 1;
+                  int classChar = pattern.codePointAt(b);
+                  do
+                    {
+                      if (classChar == '!' && b == a + 1)
+                        negated = true;
+                      else if (pattern.codePointAt(b + 1) == '-' &&
+                               pattern.codePointAt(b + 2) != ']')
+                        {
+                          if (classChar > pattern.codePointAt(b + 2))
+                            throw new BadStringOperationException("Invalid range: " +
+                                                                  classChar + " to " +
+                                                                  pattern.codePointAt(b+2));
+                          for (int c = classChar; c <= pattern.codePointAt(b+2); ++c)
+                            if (val.codePointAt(valPos) == c)
+                              matched = true;
+                          b = b + 2;
+                        }
+                      else if (val.codePointAt(valPos) == classChar)
+                        matched = true;
+                      ++b;
+                      classChar = pattern.codePointAt(b);
+                    } while (classChar != ']');
+                  if (negated)
+                    matched = !matched;
+                  ++valPos;
+                  a = b;
+                }
+              else if (next == '\\')
+                backslash = true;
+              else if (valPos < val.length() && next == val.codePointAt(valPos))
+                {
+                  matched = true;
+                  ++valPos;
+                }
+            }
+          else
+            {
+              backslash = false;
+              if (valPos < val.length() && next == val.codePointAt(valPos))
+                {
+                  matched = true;
+                  ++valPos;
+                }
+            }
+          if (!matched)
+            if (fallback != -1)
+              {
+                ++fallback;
+                valPos = fallback;
+                a = fallbackP;
+                if (valPos == val.length())
+                  return false;
+                continue;
+              }
+            else
+              return false;
+        }
       return true;
     }
   }
@@ -867,22 +867,22 @@ public class Query
      */
     public ValueExp apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       try
-	{
-	  if (!(QueryEval.getMBeanServer().getObjectInstance(name).getClassName().equals(className)))
-	    throw new BadAttributeValueExpException("The value is not from " +
-						    "the correct class.");
-	}
+        {
+          if (!(QueryEval.getMBeanServer().getObjectInstance(name).getClassName().equals(className)))
+            throw new BadAttributeValueExpException("The value is not from " +
+                                                    "the correct class.");
+        }
       catch (InstanceNotFoundException e)
-	{
-	  throw (BadAttributeValueExpException)
-	    new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
-	}
+        {
+          throw (BadAttributeValueExpException)
+            new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
+        }
       return super.apply(name);
     }
- 
+
   }
 
   /**
@@ -902,7 +902,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = -2933597532866307444L;
-    
+
     /**
      * The value to compare.
      */
@@ -928,7 +928,7 @@ public class Query
      * @param exp3 the upper bound.
      */
     public BetweenQueryExp(ValueExp exp1, ValueExp exp2,
-			   ValueExp exp3)
+                           ValueExp exp3)
     {
       this.exp1 = exp1;
       this.exp2 = exp2;
@@ -954,7 +954,7 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       String v1 = exp1.apply(name).toString();
       String v2 = exp2.apply(name).toString();
@@ -999,19 +999,19 @@ public class Query
      */
     public ValueExp apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       try
-	{
-	  return new StringValueExp(QueryEval.getMBeanServer().getObjectInstance(name).getClassName());
-	}
+        {
+          return new StringValueExp(QueryEval.getMBeanServer().getObjectInstance(name).getClassName());
+        }
       catch (InstanceNotFoundException e)
-	{
-	  throw (BadAttributeValueExpException)
-	    new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
-	}
+        {
+          throw (BadAttributeValueExpException)
+            new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
+        }
     }
- 
+
   }
 
   /**
@@ -1032,7 +1032,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = 1216286847881456786L;
-    
+
     /**
      * The operation to perform.
      */
@@ -1082,23 +1082,23 @@ public class Query
      */
     public ValueExp apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       NumericValueExp v1 = (NumericValueExp) exp1.apply(name);
       NumericValueExp v2 = (NumericValueExp) exp2.apply(name);
       switch (op)
-	{
-	case PLUS:
-	  return v1.plus(v2);
-	case MINUS:
-	  return v1.minus(v2);
-	case TIMES:
-	  return v1.times(v2);
-	case DIV:
-	  return v1.div(v2);
-	default:
-	  throw new BadBinaryOpValueExpException(this);
-	}
+        {
+        case PLUS:
+          return v1.plus(v2);
+        case MINUS:
+          return v1.minus(v2);
+        case TIMES:
+          return v1.times(v2);
+        case DIV:
+          return v1.div(v2);
+        default:
+          throw new BadBinaryOpValueExpException(this);
+        }
     }
 
     /**
@@ -1110,22 +1110,22 @@ public class Query
     {
       String opS;
       switch (op)
-	{
-	case PLUS:
-	  opS = "+";
-	  break;
-	case MINUS:
-	  opS = "-";
-	  break;
-	case TIMES:
-	  opS = "x";
-	  break;
-	case DIV:
-	  opS = "/";
-	  break;
-	default:
-	  opS = "?";
-	}
+        {
+        case PLUS:
+          opS = "+";
+          break;
+        case MINUS:
+          opS = "-";
+          break;
+        case TIMES:
+          opS = "x";
+          break;
+        case DIV:
+          opS = "/";
+          break;
+        default:
+          opS = "?";
+        }
       return exp1 + " " + opS + " " + exp2;
     }
   }
@@ -1148,7 +1148,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = -5690656271650491000L;
-    
+
     /**
      * The operation to perform.
      */
@@ -1198,25 +1198,25 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       String v1 = exp1.apply(name).toString();
       String v2 = exp2.apply(name).toString();
       switch (relOp)
-	{
-	case EQ:
-	  return v1.equals(v2);
-	case GT:
-	  return v1.compareTo(v2) > 0;
-	case GE:
-	  return v1.compareTo(v2) >= 0;
-	case LE:
-	  return v1.compareTo(v2) <= 0;
-	case LT:
-	  return v1.compareTo(v2) < 0;
-	default:
-	  throw new BadStringOperationException("Invalid operator: " + relOp);
-	}
+        {
+        case EQ:
+          return v1.equals(v2);
+        case GT:
+          return v1.compareTo(v2) > 0;
+        case GE:
+          return v1.compareTo(v2) >= 0;
+        case LE:
+          return v1.compareTo(v2) <= 0;
+        case LT:
+          return v1.compareTo(v2) < 0;
+        default:
+          throw new BadStringOperationException("Invalid operator: " + relOp);
+        }
     }
 
     /**
@@ -1228,25 +1228,25 @@ public class Query
     {
       String op;
       switch (relOp)
-	{
-	case EQ:
-	  op = "=";
-	  break;
-	case GT:
-	  op = ">";
-	  break;
-	case GE:
-	  op = ">=";
-	  break;
-	case LE:
-	  op = "<=";
-	  break;
-	case LT:
-	  op = "<";
-	  break;
-	default:
-	  op = "?";
-	}
+        {
+        case EQ:
+          op = "=";
+          break;
+        case GT:
+          op = ">";
+          break;
+        case GE:
+          op = ">=";
+          break;
+        case LE:
+          op = "<=";
+          break;
+        case LT:
+          op = "<";
+          break;
+        default:
+          op = "?";
+        }
       return exp1 + " " + op + " " + exp2;
     }
   }
@@ -1268,7 +1268,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = -5801329450358952434L;
-    
+
     /**
      * The value to look for.
      */
@@ -1312,12 +1312,12 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       String v = val.apply(name).toString();
       for (ValueExp vl : valueList)
-	if (v.equals(vl.apply(name).toString()))
-	  return true;
+        if (v.equals(vl.apply(name).toString()))
+          return true;
       return false;
     }
 
@@ -1358,7 +1358,7 @@ public class Query
 
     /**
      * Checks that the bean specified by the supplied
-     * {@link ObjectName} is of the correct class 
+     * {@link ObjectName} is of the correct class
      * using {@link MBeanServer#isInstanceOf(ObjectName,String)}.
      * where the string is obtained by evaluating
      * classNameValue.
@@ -1378,21 +1378,21 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       try
-	{
-	  String className = ((StringValueExp)
-			      classNameValue.apply(name)).getValue();
-	  return QueryEval.getMBeanServer().isInstanceOf(name, className);
-	}
+        {
+          String className = ((StringValueExp)
+                              classNameValue.apply(name)).getValue();
+          return QueryEval.getMBeanServer().isInstanceOf(name, className);
+        }
       catch (InstanceNotFoundException e)
-	{
-	  throw (BadAttributeValueExpException)
-	    new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
-	}
+        {
+          throw (BadAttributeValueExpException)
+            new BadAttributeValueExpException("The named bean is not registered.").initCause(e);
+        }
     }
- 
+
   }
 
   /**
@@ -1411,7 +1411,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = 5269643775896723397L;
-    
+
     /**
      * The expression to negate.
      */
@@ -1446,7 +1446,7 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       return !(exp.apply(name));
     }
@@ -1469,7 +1469,7 @@ public class Query
      * Compatible with JDK 1.6
      */
     private static final long serialVersionUID = 2962973084421716523L;
-    
+
     /**
      * The first operand.
      */
@@ -1513,7 +1513,7 @@ public class Query
      */
     public boolean apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       return exp1.apply(name) || exp2.apply(name);
     }
@@ -1542,7 +1542,7 @@ public class Query
      * The boolean value.
      */
     private boolean val;
-    
+
     /**
      * Constructs a new {@link BooleanValueExp} using the
      * specified value.
@@ -1572,11 +1572,11 @@ public class Query
      */
     public ValueExp apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       return this;
     }
-    
+
     /**
      * Returns the value as a string.
      *
@@ -1613,7 +1613,7 @@ public class Query
      * The numeric value.
      */
     private Number val;
-    
+
     /**
      * Constructs a new {@link NumericValueExp} using the
      * specified value.
@@ -1643,11 +1643,11 @@ public class Query
      */
     public ValueExp apply(ObjectName name)
       throws BadStringOperationException, BadBinaryOpValueExpException,
-	     BadAttributeValueExpException, InvalidApplicationException
+             BadAttributeValueExpException, InvalidApplicationException
     {
       return this;
     }
-    
+
     /**
      * Returns the value.
      */
@@ -1677,51 +1677,51 @@ public class Query
     {
       Number v = o.getValue();
       if (val instanceof Double)
-	{
-	  double d = val.doubleValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(d + v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(d + v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(d + v.longValue());
-	  else
-	    return new NumericValueExp(d + v.intValue());
-	}
+        {
+          double d = val.doubleValue();
+          if (v instanceof Double)
+            return new NumericValueExp(d + v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(d + v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(d + v.longValue());
+          else
+            return new NumericValueExp(d + v.intValue());
+        }
       else if (val instanceof Float)
-	{
-	  float f = val.floatValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(f + v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(f + v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(f + v.longValue());
-	  else
-	    return new NumericValueExp(f + v.intValue());
-	}
+        {
+          float f = val.floatValue();
+          if (v instanceof Double)
+            return new NumericValueExp(f + v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(f + v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(f + v.longValue());
+          else
+            return new NumericValueExp(f + v.intValue());
+        }
       else if (val instanceof Long)
-	{
-	  long l = val.longValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(l + v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(l + v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(l + v.longValue());
-	  else
-	    return new NumericValueExp(l + v.intValue());
-	}
+        {
+          long l = val.longValue();
+          if (v instanceof Double)
+            return new NumericValueExp(l + v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(l + v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(l + v.longValue());
+          else
+            return new NumericValueExp(l + v.intValue());
+        }
       int i = val.intValue();
       if (v instanceof Double)
-	return new NumericValueExp(i + v.doubleValue());
+        return new NumericValueExp(i + v.doubleValue());
       else if (v instanceof Float)
-	return new NumericValueExp(i + v.floatValue());
+        return new NumericValueExp(i + v.floatValue());
       else if (v instanceof Long)
-	return new NumericValueExp(i + v.longValue());
+        return new NumericValueExp(i + v.longValue());
       else
-	return new NumericValueExp(i + v.intValue());   
-    }   
+        return new NumericValueExp(i + v.intValue());
+    }
 
     /**
      * Return New NumericValueExp(the result of subtracting the specified
@@ -1734,51 +1734,51 @@ public class Query
     {
       Number v = o.getValue();
       if (val instanceof Double)
-	{
-	  double d = val.doubleValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(d - v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(d - v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(d - v.longValue());
-	  else
-	    return new NumericValueExp(d - v.intValue());
-	}
+        {
+          double d = val.doubleValue();
+          if (v instanceof Double)
+            return new NumericValueExp(d - v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(d - v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(d - v.longValue());
+          else
+            return new NumericValueExp(d - v.intValue());
+        }
       else if (val instanceof Float)
-	{
-	  float f = val.floatValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(f - v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(f - v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(f - v.longValue());
-	  else
-	    return new NumericValueExp(f - v.intValue());
-	}
+        {
+          float f = val.floatValue();
+          if (v instanceof Double)
+            return new NumericValueExp(f - v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(f - v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(f - v.longValue());
+          else
+            return new NumericValueExp(f - v.intValue());
+        }
       else if (val instanceof Long)
-	{
-	  long l = val.longValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(l - v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(l - v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(l - v.longValue());
-	  else
-	    return new NumericValueExp(l - v.intValue());
-	}
+        {
+          long l = val.longValue();
+          if (v instanceof Double)
+            return new NumericValueExp(l - v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(l - v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(l - v.longValue());
+          else
+            return new NumericValueExp(l - v.intValue());
+        }
       int i = val.intValue();
       if (v instanceof Double)
-	return new NumericValueExp(i - v.doubleValue());
+        return new NumericValueExp(i - v.doubleValue());
       else if (v instanceof Float)
-	return new NumericValueExp(i - v.floatValue());
+        return new NumericValueExp(i - v.floatValue());
       else if (v instanceof Long)
-	return new NumericValueExp(i - v.longValue());
+        return new NumericValueExp(i - v.longValue());
       else
-	return new NumericValueExp(i - v.intValue());   
-    }   
+        return new NumericValueExp(i - v.intValue());
+    }
 
     /**
      * Return New NumericValueExp(the result of multiplying the specified
@@ -1791,51 +1791,51 @@ public class Query
     {
       Number v = o.getValue();
       if (val instanceof Double)
-	{
-	  double d = val.doubleValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(d * v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(d * v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(d * v.longValue());
-	  else
-	    return new NumericValueExp(d * v.intValue());
-	}
+        {
+          double d = val.doubleValue();
+          if (v instanceof Double)
+            return new NumericValueExp(d * v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(d * v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(d * v.longValue());
+          else
+            return new NumericValueExp(d * v.intValue());
+        }
       else if (val instanceof Float)
-	{
-	  float f = val.floatValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(f * v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(f * v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(f * v.longValue());
-	  else
-	    return new NumericValueExp(f * v.intValue());
-	}
+        {
+          float f = val.floatValue();
+          if (v instanceof Double)
+            return new NumericValueExp(f * v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(f * v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(f * v.longValue());
+          else
+            return new NumericValueExp(f * v.intValue());
+        }
       else if (val instanceof Long)
-	{
-	  long l = val.longValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(l * v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(l * v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(l * v.longValue());
-	  else
-	    return new NumericValueExp(l * v.intValue());
-	}
+        {
+          long l = val.longValue();
+          if (v instanceof Double)
+            return new NumericValueExp(l * v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(l * v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(l * v.longValue());
+          else
+            return new NumericValueExp(l * v.intValue());
+        }
       int i = val.intValue();
       if (v instanceof Double)
-	return new NumericValueExp(i * v.doubleValue());
+        return new NumericValueExp(i * v.doubleValue());
       else if (v instanceof Float)
-	return new NumericValueExp(i * v.floatValue());
+        return new NumericValueExp(i * v.floatValue());
       else if (v instanceof Long)
-	return new NumericValueExp(i * v.longValue());
+        return new NumericValueExp(i * v.longValue());
       else
-	return new NumericValueExp(i * v.intValue());   
-    }   
+        return new NumericValueExp(i * v.intValue());
+    }
 
     /**
      * Return New NumericValueExp(the result of dividing this
@@ -1849,53 +1849,52 @@ public class Query
     {
       Number v = o.getValue();
       if (val instanceof Double)
-	{
-	  double d = val.doubleValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(d / v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(d / v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(d / v.longValue());
-	  else
-	    return new NumericValueExp(d / v.intValue());
-	}
+        {
+          double d = val.doubleValue();
+          if (v instanceof Double)
+            return new NumericValueExp(d / v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(d / v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(d / v.longValue());
+          else
+            return new NumericValueExp(d / v.intValue());
+        }
       else if (val instanceof Float)
-	{
-	  float f = val.floatValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(f / v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(f / v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(f / v.longValue());
-	  else
-	    return new NumericValueExp(f / v.intValue());
-	}
+        {
+          float f = val.floatValue();
+          if (v instanceof Double)
+            return new NumericValueExp(f / v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(f / v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(f / v.longValue());
+          else
+            return new NumericValueExp(f / v.intValue());
+        }
       else if (val instanceof Long)
-	{
-	  long l = val.longValue();
-	  if (v instanceof Double)
-	    return new NumericValueExp(l / v.doubleValue());
-	  else if (v instanceof Float)
-	    return new NumericValueExp(l / v.floatValue());
-	  else if (v instanceof Long)
-	    return new NumericValueExp(l / v.longValue());
-	  else
-	    return new NumericValueExp(l / v.intValue());
-	}
+        {
+          long l = val.longValue();
+          if (v instanceof Double)
+            return new NumericValueExp(l / v.doubleValue());
+          else if (v instanceof Float)
+            return new NumericValueExp(l / v.floatValue());
+          else if (v instanceof Long)
+            return new NumericValueExp(l / v.longValue());
+          else
+            return new NumericValueExp(l / v.intValue());
+        }
       int i = val.intValue();
       if (v instanceof Double)
-	return new NumericValueExp(i / v.doubleValue());
+        return new NumericValueExp(i / v.doubleValue());
       else if (v instanceof Float)
-	return new NumericValueExp(i / v.floatValue());
+        return new NumericValueExp(i / v.floatValue());
       else if (v instanceof Long)
-	return new NumericValueExp(i / v.longValue());
+        return new NumericValueExp(i / v.longValue());
       else
-	return new NumericValueExp(i / v.intValue());   
-    }   
+        return new NumericValueExp(i / v.intValue());
+    }
 
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/QueryEval.java b/libjava/classpath/javax/management/QueryEval.java
index 375270ae97e..0b9df61558a 100644
--- a/libjava/classpath/javax/management/QueryEval.java
+++ b/libjava/classpath/javax/management/QueryEval.java
@@ -57,7 +57,7 @@ public class QueryEval
   private static final long serialVersionUID = 2675899265640874796L;
 
   /**
-   * Stores the server used, on a 
+   * Stores the server used, on a
    * thread-by-thread basis.
    */
   private static InheritableThreadLocal server =
@@ -83,7 +83,7 @@ public class QueryEval
    * Sets the {@link MBeanServer} on which the query will be
    * performed.  This value is inherited automatically by
    * child threads.  This method is only non-static for historical
-   * reasons; it makes no use of instance-related values. 
+   * reasons; it makes no use of instance-related values.
    *
    * @param svr the server to use.
    */
diff --git a/libjava/classpath/javax/management/QueryExp.java b/libjava/classpath/javax/management/QueryExp.java
index 124228c784a..778e28f5ec5 100644
--- a/libjava/classpath/javax/management/QueryExp.java
+++ b/libjava/classpath/javax/management/QueryExp.java
@@ -74,7 +74,7 @@ public interface QueryExp
    */
   boolean apply(ObjectName name)
     throws BadStringOperationException, BadBinaryOpValueExpException,
-	   BadAttributeValueExpException, InvalidApplicationException;
+           BadAttributeValueExpException, InvalidApplicationException;
 
   /**
    * Changes the {@link MBeanServer} on which this query is performed.
@@ -84,4 +84,3 @@ public interface QueryExp
   void setMBeanServer(MBeanServer server);
 
 }
-
diff --git a/libjava/classpath/javax/management/ReflectionException.java b/libjava/classpath/javax/management/ReflectionException.java
index 0f19b5b349f..96b4ea526f2 100644
--- a/libjava/classpath/javax/management/ReflectionException.java
+++ b/libjava/classpath/javax/management/ReflectionException.java
@@ -115,4 +115,3 @@ public class ReflectionException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/RuntimeErrorException.java b/libjava/classpath/javax/management/RuntimeErrorException.java
index 811dc40f2fb..f361a2c1c7c 100644
--- a/libjava/classpath/javax/management/RuntimeErrorException.java
+++ b/libjava/classpath/javax/management/RuntimeErrorException.java
@@ -112,4 +112,3 @@ public class RuntimeErrorException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/RuntimeMBeanException.java b/libjava/classpath/javax/management/RuntimeMBeanException.java
index 95225a80ab7..1c8b242b537 100644
--- a/libjava/classpath/javax/management/RuntimeMBeanException.java
+++ b/libjava/classpath/javax/management/RuntimeMBeanException.java
@@ -111,4 +111,3 @@ public class RuntimeMBeanException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/RuntimeOperationsException.java b/libjava/classpath/javax/management/RuntimeOperationsException.java
index 8a830a5e708..8c134f07e30 100644
--- a/libjava/classpath/javax/management/RuntimeOperationsException.java
+++ b/libjava/classpath/javax/management/RuntimeOperationsException.java
@@ -52,12 +52,12 @@ package javax.management;
 public class RuntimeOperationsException
   extends JMRuntimeException
 {
- 
+
   /**
    * Compatible with JDK 1.5
    */
   private static final long serialVersionUID = -8408923047489133588L;
-  
+
   /* Sun re-implemented causality -- don't know why, but
      serialization demands we do too... */
 
@@ -89,7 +89,7 @@ public class RuntimeOperationsException
    * @param message the error message to give to the user.
    */
   public RuntimeOperationsException(RuntimeException e,
-				    String message)
+                                    String message)
   {
     super(message);
     runtimeException = e;
@@ -118,4 +118,3 @@ public class RuntimeOperationsException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/ServiceNotFoundException.java b/libjava/classpath/javax/management/ServiceNotFoundException.java
index 602e1490db4..1c0d7428657 100644
--- a/libjava/classpath/javax/management/ServiceNotFoundException.java
+++ b/libjava/classpath/javax/management/ServiceNotFoundException.java
@@ -72,4 +72,3 @@ public class ServiceNotFoundException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/StandardMBean.java b/libjava/classpath/javax/management/StandardMBean.java
index 13e95bd396d..8e30fc58b3b 100644
--- a/libjava/classpath/javax/management/StandardMBean.java
+++ b/libjava/classpath/javax/management/StandardMBean.java
@@ -85,7 +85,7 @@ public class StandardMBean
    * Constructs a new {@link StandardMBean} using the specified
    * interface and this as the instance.  This should
    * be used to create an instance via subclassing.
-   * 
+   *
    * @param iface the interface this bean implements, or null
    *              if the interface should be determined using the naming
    *              convention (class X has interface XMBean).
@@ -99,31 +99,31 @@ public class StandardMBean
   {
     if (iface == null)
       {
-	String className = getClass().getName();
-	try
-	  {
-	    iface = Class.forName(className + "MBean");
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    for (Class nextIface : getClass().getInterfaces())
-	    {
-	      if (JMX.isMXBeanInterface(nextIface))
-		{
-		  iface = nextIface;
-		  break;
-		}
-	    }
-	    if (iface == null)  
-	      throw (NotCompliantMBeanException) 
-		(new NotCompliantMBeanException("An interface for the class " 
-						+ className +
-						" was not found.").initCause(e));
-	  }
+        String className = getClass().getName();
+        try
+          {
+            iface = Class.forName(className + "MBean");
+          }
+        catch (ClassNotFoundException e)
+          {
+            for (Class nextIface : getClass().getInterfaces())
+            {
+              if (JMX.isMXBeanInterface(nextIface))
+                {
+                  iface = nextIface;
+                  break;
+                }
+            }
+            if (iface == null)
+              throw (NotCompliantMBeanException)
+                (new NotCompliantMBeanException("An interface for the class "
+                                                + className +
+                                                " was not found.").initCause(e));
+          }
       }
     if (!(iface.isInstance(this)))
-      throw new NotCompliantMBeanException("The instance, " + impl + 
-					   ", is not an instance of " + iface);
+      throw new NotCompliantMBeanException("The instance, " + impl +
+                                           ", is not an instance of " + iface);
     impl = this;
     this.iface = iface;
   }
@@ -131,7 +131,7 @@ public class StandardMBean
   /**
    * Constructs a new {@link StandardMBean} using the specified
    * interface and the supplied instance as the implementation.
-   * 
+   *
    * @param impl the implementation.
    * @param iface the interface the bean implements, or null
    *              if the interface should be determined using the naming
@@ -149,35 +149,35 @@ public class StandardMBean
       throw new IllegalArgumentException("The specified implementation is null.");
     if (iface == null)
       {
-	Class implClass = impl.getClass();
-	String className = implClass.getName();
-	try
-	  {
-	    this.iface = Class.forName(className + "MBean", true,
-				       implClass.getClassLoader());
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    for (Class nextIface : implClass.getInterfaces())
-	    {
-	      if (JMX.isMXBeanInterface(nextIface))
-		{
-		  this.iface = nextIface;
-		  break;
-		}
-	    }
-	    if (this.iface == null)  
-	      throw (NotCompliantMBeanException) 
-		(new NotCompliantMBeanException("An interface for the class " +
-						className +
-						" was not found.").initCause(e));
-	  }
+        Class implClass = impl.getClass();
+        String className = implClass.getName();
+        try
+          {
+            this.iface = Class.forName(className + "MBean", true,
+                                       implClass.getClassLoader());
+          }
+        catch (ClassNotFoundException e)
+          {
+            for (Class nextIface : implClass.getInterfaces())
+            {
+              if (JMX.isMXBeanInterface(nextIface))
+                {
+                  this.iface = nextIface;
+                  break;
+                }
+            }
+            if (this.iface == null)
+              throw (NotCompliantMBeanException)
+                (new NotCompliantMBeanException("An interface for the class " +
+                                                className +
+                                                " was not found.").initCause(e));
+          }
       }
     else
       this.iface = iface;
     if (!(this.iface.isInstance(impl)))
-      throw new NotCompliantMBeanException("The instance, " + impl + 
-					   ", is not an instance of " + iface);
+      throw new NotCompliantMBeanException("The instance, " + impl +
+                                           ", is not an instance of " + iface);
     this.impl = impl;
   }
 
@@ -223,44 +223,44 @@ public class StandardMBean
    */
   public Object getAttribute(String name)
     throws AttributeNotFoundException, MBeanException,
-	   ReflectionException
+           ReflectionException
   {
     Method getter;
-    try 
+    try
       {
-	getter = iface.getMethod("get" + name);
+        getter = iface.getMethod("get" + name);
       }
     catch (NoSuchMethodException e)
       {
-	try 
-	  {
-	    getter = iface.getMethod("is" + name);
-	  }
-	catch (NoSuchMethodException ex)
-	  {
-	    throw ((AttributeNotFoundException) 
-		   new AttributeNotFoundException("The attribute, " + name +
-						  ", was not found.").initCause(ex));
-	  }
+        try
+          {
+            getter = iface.getMethod("is" + name);
+          }
+        catch (NoSuchMethodException ex)
+          {
+            throw ((AttributeNotFoundException)
+                   new AttributeNotFoundException("The attribute, " + name +
+                                                  ", was not found.").initCause(ex));
+          }
       }
     Object result;
     try
       {
-	result = getter.invoke(impl);
+        result = getter.invoke(impl);
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to retrieve " + name);
+        throw new ReflectionException(e, "Failed to retrieve " + name);
       }
     catch (IllegalArgumentException e)
       {
-	throw new ReflectionException(e, "Failed to retrieve " + name);
+        throw new ReflectionException(e, "Failed to retrieve " + name);
       }
     catch (InvocationTargetException e)
       {
-	throw new MBeanException((Exception) e.getCause(),
-				 "The getter of " + name +
-				 " threw an exception");
+        throw new MBeanException((Exception) e.getCause(),
+                                 "The getter of " + name +
+                                 " threw an exception");
       }
     return result;
   }
@@ -280,23 +280,23 @@ public class StandardMBean
     AttributeList list = new AttributeList(names.length);
     for (int a = 0; a < names.length; ++a)
       {
-	try
-	  {
-	    Object value = getAttribute(names[a]);
-	    list.add(new Attribute(names[a], value));
-	  }
-	catch (AttributeNotFoundException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (ReflectionException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (MBeanException e)
-	  {
-	    /* Ignored */
-	  }
+        try
+          {
+            Object value = getAttribute(names[a]);
+            list.add(new Attribute(names[a], value));
+          }
+        catch (AttributeNotFoundException e)
+          {
+            /* Ignored */
+          }
+        catch (ReflectionException e)
+          {
+            /* Ignored */
+          }
+        catch (MBeanException e)
+          {
+            /* Ignored */
+          }
       }
     return list;
   }
@@ -349,7 +349,7 @@ public class StandardMBean
    * @return the constructor information to use.
    */
   protected MBeanConstructorInfo[] getConstructors(MBeanConstructorInfo[]
-						   constructors, Object impl)
+                                                   constructors, Object impl)
   {
     if (impl == null || impl == this)
       return constructors;
@@ -406,7 +406,7 @@ public class StandardMBean
    * @return the description to use in the instance.
    */
   protected String getDescription(MBeanConstructorInfo info,
-				  MBeanParameterInfo param, int n)
+                                  MBeanParameterInfo param, int n)
   {
     return param.getDescription();
   }
@@ -477,7 +477,7 @@ public class StandardMBean
    * @return the description to use in the instance.
    */
   protected String getDescription(MBeanOperationInfo info,
-				  MBeanParameterInfo param, int n)
+                                  MBeanParameterInfo param, int n)
   {
     return param.getDescription();
   }
@@ -533,7 +533,7 @@ public class StandardMBean
    * detailed in this class are called to allow the values used
    * to be overrided:
    * 
                    
-   * 
                  • For each attribute, 
+   * 
                  • For each attribute,
    * {@link #getDescription(MBeanAttributeInfo)} is called.
                    • 
    * 
                  • For each constructor,
    * {@link #getDescription(MBeanConstructorInfo)} is called,
@@ -573,117 +573,117 @@ public class StandardMBean
     List operations = new ArrayList();
     for (int a = 0; a < methods.length; ++a)
       {
-	String name = methods[a].getName();
-	if (((name.startsWith("get") &&
-	      methods[a].getReturnType() != Void.TYPE) ||
-	     (name.startsWith("is") &&
-	      methods[a].getReturnType() == Boolean.TYPE)) &&
-	    methods[a].getParameterTypes().length == 0)
-	  {
-	    Method[] amethods;
-	    String attrib;
-	    if (name.startsWith("is"))
-	      attrib = name.substring(2);
-	    else
-	      attrib = name.substring(3);
-	    if (attributes.containsKey(attrib))
-	      amethods = (Method[]) attributes.get(attrib);
-	    else
-	      {
-		amethods = new Method[2];
-		attributes.put(attrib, amethods);
-	      }
-	    amethods[0] = methods[a];
-	  }
-	else if (name.startsWith("set") &&
-		 methods[a].getReturnType() == Void.TYPE &&
-		 methods[a].getParameterTypes().length == 1)
-	  {
-	    Method[] amethods;
-	    String attrib = name.substring(3);
-	    if (attributes.containsKey(attrib))
-	      amethods = (Method[]) attributes.get(attrib);
-	    else
-	      {
-		amethods = new Method[2];
-		attributes.put(attrib, amethods);
-	      }
-	    amethods[1] = methods[a];
-	  }
-	else
-	  operations.add(new MBeanOperationInfo(methods[a].getName(),
-						methods[a]));
+        String name = methods[a].getName();
+        if (((name.startsWith("get") &&
+              methods[a].getReturnType() != Void.TYPE) ||
+             (name.startsWith("is") &&
+              methods[a].getReturnType() == Boolean.TYPE)) &&
+            methods[a].getParameterTypes().length == 0)
+          {
+            Method[] amethods;
+            String attrib;
+            if (name.startsWith("is"))
+              attrib = name.substring(2);
+            else
+              attrib = name.substring(3);
+            if (attributes.containsKey(attrib))
+              amethods = (Method[]) attributes.get(attrib);
+            else
+              {
+                amethods = new Method[2];
+                attributes.put(attrib, amethods);
+              }
+            amethods[0] = methods[a];
+          }
+        else if (name.startsWith("set") &&
+                 methods[a].getReturnType() == Void.TYPE &&
+                 methods[a].getParameterTypes().length == 1)
+          {
+            Method[] amethods;
+            String attrib = name.substring(3);
+            if (attributes.containsKey(attrib))
+              amethods = (Method[]) attributes.get(attrib);
+            else
+              {
+                amethods = new Method[2];
+                attributes.put(attrib, amethods);
+              }
+            amethods[1] = methods[a];
+          }
+        else
+          operations.add(new MBeanOperationInfo(methods[a].getName(),
+                                                methods[a]));
       }
     List attribs = new ArrayList(attributes.size());
     for (Map.Entry entry : attributes.entrySet())
       {
-	Method[] amethods = entry.getValue();
-	try
-	  {
-	    attribs.add(new MBeanAttributeInfo(entry.getKey(),
-					       entry.getKey(),
-					       amethods[0], amethods[1]));
-	  }
-	catch (IntrospectionException e)
-	  {
-	    /* Shouldn't happen; both shouldn't be null */
-	    throw new IllegalStateException("The two methods passed to " +
-					    "the MBeanAttributeInfo " +
-					    "constructor for " + entry +
-					    "were null.", e);
-	  }
+        Method[] amethods = entry.getValue();
+        try
+          {
+            attribs.add(new MBeanAttributeInfo(entry.getKey(),
+                                               entry.getKey(),
+                                               amethods[0], amethods[1]));
+          }
+        catch (IntrospectionException e)
+          {
+            /* Shouldn't happen; both shouldn't be null */
+            throw new IllegalStateException("The two methods passed to " +
+                                            "the MBeanAttributeInfo " +
+                                            "constructor for " + entry +
+                                            "were null.", e);
+          }
       }
     MBeanAttributeInfo[] ainfo = new MBeanAttributeInfo[attribs.size()];
     for (int a = 0; a < ainfo.length; ++a)
       {
-	MBeanAttributeInfo oldInfo = (MBeanAttributeInfo) attribs.get(a);
-	String desc = getDescription(oldInfo);
-	ainfo[a] = new MBeanAttributeInfo(oldInfo.getName(),
-					  oldInfo.getType(), desc,
-					  oldInfo.isReadable(),
-					  oldInfo.isWritable(),
-					  oldInfo.isIs());
+        MBeanAttributeInfo oldInfo = (MBeanAttributeInfo) attribs.get(a);
+        String desc = getDescription(oldInfo);
+        ainfo[a] = new MBeanAttributeInfo(oldInfo.getName(),
+                                          oldInfo.getType(), desc,
+                                          oldInfo.isReadable(),
+                                          oldInfo.isWritable(),
+                                          oldInfo.isIs());
       }
     Constructor[] cons = impl.getClass().getConstructors();
     MBeanConstructorInfo[] cinfo = new MBeanConstructorInfo[cons.length];
     for (int a = 0; a < cinfo.length; ++a)
       {
-	MBeanConstructorInfo oldInfo = new MBeanConstructorInfo(cons[a].getName(),
-								cons[a]);
-	String desc = getDescription(oldInfo);
-	MBeanParameterInfo[] params = oldInfo.getSignature();
-	MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
-	for (int b = 0; b < pinfo.length; ++b)
-	  {
-	    String pdesc = getDescription(oldInfo, params[b], b);
-	    String pname = getParameterName(oldInfo, params[b], b);
-	    pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
-					      pdesc);
-	  }
-	cinfo[a] = new MBeanConstructorInfo(oldInfo.getName(), desc,
-					    pinfo);
+        MBeanConstructorInfo oldInfo = new MBeanConstructorInfo(cons[a].getName(),
+                                                                cons[a]);
+        String desc = getDescription(oldInfo);
+        MBeanParameterInfo[] params = oldInfo.getSignature();
+        MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
+        for (int b = 0; b < pinfo.length; ++b)
+          {
+            String pdesc = getDescription(oldInfo, params[b], b);
+            String pname = getParameterName(oldInfo, params[b], b);
+            pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
+                                              pdesc);
+          }
+        cinfo[a] = new MBeanConstructorInfo(oldInfo.getName(), desc,
+                                            pinfo);
       }
     cinfo = getConstructors(cinfo, impl);
     MBeanOperationInfo[] oinfo = new MBeanOperationInfo[operations.size()];
     for (int a = 0; a < oinfo.length; ++a)
       {
-	MBeanOperationInfo oldInfo = (MBeanOperationInfo) operations.get(a);
-	String desc = getDescription(oldInfo);
-	int impact = getImpact(oldInfo);
-	MBeanParameterInfo[] params = oldInfo.getSignature();
-	MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
-	for (int b = 0; b < pinfo.length; ++b)
-	  {
-	    String pdesc = getDescription(oldInfo, params[b], b);
-	    String pname = getParameterName(oldInfo, params[b], b);
-	    pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
-					      pdesc);
-	  }
-	oinfo[a] = new MBeanOperationInfo(oldInfo.getName(), desc, pinfo,
-					  oldInfo.getReturnType(), impact);
+        MBeanOperationInfo oldInfo = (MBeanOperationInfo) operations.get(a);
+        String desc = getDescription(oldInfo);
+        int impact = getImpact(oldInfo);
+        MBeanParameterInfo[] params = oldInfo.getSignature();
+        MBeanParameterInfo[] pinfo = new MBeanParameterInfo[params.length];
+        for (int b = 0; b < pinfo.length; ++b)
+          {
+            String pdesc = getDescription(oldInfo, params[b], b);
+            String pname = getParameterName(oldInfo, params[b], b);
+            pinfo[b] = new MBeanParameterInfo(pname, params[b].getType(),
+                                              pdesc);
+          }
+        oinfo[a] = new MBeanOperationInfo(oldInfo.getName(), desc, pinfo,
+                                          oldInfo.getReturnType(), impact);
       }
     info = new MBeanInfo(impl.getClass().getName(), impl.getClass().getName(),
-			 ainfo, cinfo, oinfo, null);
+                         ainfo, cinfo, oinfo, null);
     String cname = getClassName(info);
     String desc = getDescription(info);
     MBeanNotificationInfo[] ninfo = null;
@@ -720,7 +720,7 @@ public class StandardMBean
    * @return the name to use in the instance.
    */
   protected String getParameterName(MBeanConstructorInfo info,
-				    MBeanParameterInfo param, int n)
+                                    MBeanParameterInfo param, int n)
   {
     return param.getName();
   }
@@ -741,7 +741,7 @@ public class StandardMBean
    * @return the name to use in the instance.
    */
   protected String getParameterName(MBeanOperationInfo info,
-				    MBeanParameterInfo param, int n)
+                                    MBeanParameterInfo param, int n)
   {
     return param.getName();
   }
@@ -753,7 +753,7 @@ public class StandardMBean
    * corresponding to each parameter.  The class loader used to
    * load these classes is the same as that used for loading the
    * management bean itself.
-   * 
+   *
    * @param name the name of the action to invoke.
    * @param params the parameters used to call the action.
    * @param signature the signature of the action.
@@ -771,56 +771,56 @@ public class StandardMBean
     throws MBeanException, ReflectionException
   {
     if (name.startsWith("get") || name.startsWith("is") ||
-	name.startsWith("set"))
+        name.startsWith("set"))
       throw new ReflectionException(new NoSuchMethodException(),
-				    "Invocation of an attribute " +
-				    "method is disallowed.");
+                                    "Invocation of an attribute " +
+                                    "method is disallowed.");
     ClassLoader loader = getClass().getClassLoader();
     Class[] sigTypes;
     if (signature != null)
       {
-	sigTypes = new Class[signature.length];
-	for (int a = 0; a < signature.length; ++a)
-	  try 
-	    {
-	      sigTypes[a] = Class.forName(signature[a], true, loader);
-	    }
-	  catch (ClassNotFoundException e)
-	    {
-	      throw new ReflectionException(e, "The class, " + signature[a] + 
-					    ", in the method signature " +
-					    "could not be loaded.");
-	    }
+        sigTypes = new Class[signature.length];
+        for (int a = 0; a < signature.length; ++a)
+          try
+            {
+              sigTypes[a] = Class.forName(signature[a], true, loader);
+            }
+          catch (ClassNotFoundException e)
+            {
+              throw new ReflectionException(e, "The class, " + signature[a] +
+                                            ", in the method signature " +
+                                            "could not be loaded.");
+            }
       }
     else
       sigTypes = null;
     Method method;
     try
       {
-	method = iface.getMethod(name, sigTypes);
+        method = iface.getMethod(name, sigTypes);
       }
     catch (NoSuchMethodException e)
       {
-	throw new ReflectionException(e, "The method, " + name +
-				      ", could not be found.");
+        throw new ReflectionException(e, "The method, " + name +
+                                      ", could not be found.");
       }
     Object result;
     try
       {
-	result = method.invoke(impl, params);
+        result = method.invoke(impl, params);
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to call " + name);
+        throw new ReflectionException(e, "Failed to call " + name);
       }
     catch (IllegalArgumentException e)
       {
-	throw new ReflectionException(e, "Failed to call " + name);
+        throw new ReflectionException(e, "Failed to call " + name);
       }
     catch (InvocationTargetException e)
       {
-	throw new MBeanException((Exception) e.getCause(), "The method "
-				 + name + " threw an exception");
+        throw new MBeanException((Exception) e.getCause(), "The method "
+                                 + name + " threw an exception");
       }
     return result;
   }
@@ -850,30 +850,30 @@ public class StandardMBean
    */
   public void setAttribute(Attribute attribute)
     throws AttributeNotFoundException, InvalidAttributeValueException,
-	   MBeanException, ReflectionException
+           MBeanException, ReflectionException
   {
     String name = attribute.getName();
     String attName = name.substring(0, 1).toUpperCase() + name.substring(1);
-    Object val = attribute.getValue();   
+    Object val = attribute.getValue();
     try
       {
-	getMutator(attName, val.getClass()).invoke(impl, new Object[] { val });
+        getMutator(attName, val.getClass()).invoke(impl, new Object[] { val });
       }
     catch (IllegalAccessException e)
       {
-	throw new ReflectionException(e, "Failed to set " + name);
+        throw new ReflectionException(e, "Failed to set " + name);
       }
     catch (IllegalArgumentException e)
       {
-	throw ((InvalidAttributeValueException)
-	       new InvalidAttributeValueException(attribute.getValue() +
-						  " is an invalid value for " +
-						  name).initCause(e));
+        throw ((InvalidAttributeValueException)
+               new InvalidAttributeValueException(attribute.getValue() +
+                                                  " is an invalid value for " +
+                                                  name).initCause(e));
       }
     catch (InvocationTargetException e)
       {
-	throw new MBeanException(e, "The getter of " + name +
-				 " threw an exception");
+        throw new MBeanException(e, "The getter of " + name +
+                                 " threw an exception");
       }
   }
 
@@ -893,28 +893,28 @@ public class StandardMBean
     Iterator it = attributes.iterator();
     while (it.hasNext())
       {
-	try
-	  {
-	    Attribute attrib = (Attribute) it.next();
-	    setAttribute(attrib);
-	    list.add(attrib);
-	  }
-	catch (AttributeNotFoundException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (InvalidAttributeValueException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (ReflectionException e)
-	  {
-	    /* Ignored */
-	  }
-	catch (MBeanException e)
-	  {
-	    /* Ignored */
-	  }
+        try
+          {
+            Attribute attrib = (Attribute) it.next();
+            setAttribute(attrib);
+            list.add(attrib);
+          }
+        catch (AttributeNotFoundException e)
+          {
+            /* Ignored */
+          }
+        catch (InvalidAttributeValueException e)
+          {
+            /* Ignored */
+          }
+        catch (ReflectionException e)
+          {
+            /* Ignored */
+          }
+        catch (MBeanException e)
+          {
+            /* Ignored */
+          }
       }
     return list;
   }
@@ -937,8 +937,8 @@ public class StandardMBean
     if (impl == null)
       throw new IllegalArgumentException("The specified implementation is null.");
     if (!(iface.isInstance(impl)))
-      throw new NotCompliantMBeanException("The instance, " + impl + 
-					   ", is not an instance of " + iface);
+      throw new NotCompliantMBeanException("The instance, " + impl +
+                                           ", is not an instance of " + iface);
     this.impl = impl;
   }
 
@@ -956,128 +956,128 @@ public class StandardMBean
   {
     String mutator = "set" + name;
     Exception ex = null;
-    try 
+    try
       {
-	return iface.getMethod(mutator, type);
+        return iface.getMethod(mutator, type);
       }
     catch (NoSuchMethodException e)
       {
-	/* Ignored; we'll try harder instead */
-	ex = e;
+        /* Ignored; we'll try harder instead */
+        ex = e;
       }
     /* Special cases */
     if (type == Boolean.class)
       try
-	{
-	  return iface.getMethod(mutator, Boolean.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Boolean.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Byte.class)
       try
-	{
-	  return iface.getMethod(mutator, Byte.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Byte.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Character.class)
       try
-	{
-	  return iface.getMethod(mutator, Character.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Character.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Double.class)
       try
-	{
-	  return iface.getMethod(mutator, Double.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Double.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Float.class)
       try
-	{
-	  return iface.getMethod(mutator, Float.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Float.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Integer.class)
       try
-	{
-	  return iface.getMethod(mutator, Integer.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Integer.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Long.class)
       try
-	{
-	  return iface.getMethod(mutator, Long.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Long.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     if (type == Short.class)
       try
-	{
-	  return iface.getMethod(mutator, Short.TYPE);
-	}
+        {
+          return iface.getMethod(mutator, Short.TYPE);
+        }
       catch (NoSuchMethodException e)
-	{
-	  throw ((AttributeNotFoundException) 
-		 new AttributeNotFoundException("The attribute, " + name +
-						", was not found.").initCause(e));
-	}
+        {
+          throw ((AttributeNotFoundException)
+                 new AttributeNotFoundException("The attribute, " + name +
+                                                ", was not found.").initCause(e));
+        }
     /* Superclasses and interfaces */
     for (Class i : type.getInterfaces())
       try
-	{
-	  return getMutator(name, i);
-	}
+        {
+          return getMutator(name, i);
+        }
       catch (AttributeNotFoundException e)
-	{
-	  ex = e;
-	}
+        {
+          ex = e;
+        }
     Class sclass = type.getSuperclass();
     if (sclass != null && sclass != Object.class)
       try
-	{
-	  return getMutator(name, sclass);
-	}
+        {
+          return getMutator(name, sclass);
+        }
       catch (AttributeNotFoundException e)
-	{
-	  ex = e;
-	}
+        {
+          ex = e;
+        }
     /* If we get this far, give up */
-    throw ((AttributeNotFoundException) 
-	   new AttributeNotFoundException("The attribute, " + name +
-					  ", was not found.").initCause(ex)); 
+    throw ((AttributeNotFoundException)
+           new AttributeNotFoundException("The attribute, " + name +
+                                          ", was not found.").initCause(ex));
   }
 
 }
diff --git a/libjava/classpath/javax/management/StringValueExp.java b/libjava/classpath/javax/management/StringValueExp.java
index f3ce00b53c0..0ecd06597a1 100644
--- a/libjava/classpath/javax/management/StringValueExp.java
+++ b/libjava/classpath/javax/management/StringValueExp.java
@@ -94,7 +94,7 @@ public class StringValueExp
    */
   public ValueExp apply(ObjectName name)
     throws BadStringOperationException, BadBinaryOpValueExpException,
-	   BadAttributeValueExpException, InvalidApplicationException
+           BadAttributeValueExpException, InvalidApplicationException
   {
     return this;
   }
diff --git a/libjava/classpath/javax/management/ValueExp.java b/libjava/classpath/javax/management/ValueExp.java
index 503f2322194..f9892767243 100644
--- a/libjava/classpath/javax/management/ValueExp.java
+++ b/libjava/classpath/javax/management/ValueExp.java
@@ -70,7 +70,7 @@ public interface ValueExp
    */
   ValueExp apply(ObjectName name)
     throws BadStringOperationException, BadBinaryOpValueExpException,
-	   BadAttributeValueExpException, InvalidApplicationException;
+           BadAttributeValueExpException, InvalidApplicationException;
 
   /**
    * Changes the {@link MBeanServer} on which this query is performed.
@@ -83,4 +83,3 @@ public interface ValueExp
   void setMBeanServer(MBeanServer server);
 
 }
-
diff --git a/libjava/classpath/javax/management/loading/ClassLoaderRepository.java b/libjava/classpath/javax/management/loading/ClassLoaderRepository.java
index 2526d52625d..cfd031e629a 100644
--- a/libjava/classpath/javax/management/loading/ClassLoaderRepository.java
+++ b/libjava/classpath/javax/management/loading/ClassLoaderRepository.java
@@ -136,4 +136,3 @@ public interface ClassLoaderRepository
     throws ClassNotFoundException;
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/ArrayType.java b/libjava/classpath/javax/management/openmbean/ArrayType.java
index 1a23f666f10..fc1887014b2 100644
--- a/libjava/classpath/javax/management/openmbean/ArrayType.java
+++ b/libjava/classpath/javax/management/openmbean/ArrayType.java
@@ -44,14 +44,14 @@ import java.util.Map;
 
 /**
  * The open type descriptor for arrays of open data values.
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
 public class ArrayType
   extends OpenType
 {
-  
+
   /**
    * Compatible with JDK 1.5
    */
@@ -108,8 +108,8 @@ public class ArrayType
    *                           a loadable class.
    */
   private static final String getArrayClassName(OpenType elementType,
-						int dim,
-						boolean primitive)
+                                                int dim,
+                                                boolean primitive)
     throws OpenDataException
   {
     Class type;
@@ -117,22 +117,22 @@ public class ArrayType
       type = getPrimitiveTypeClass((SimpleType) elementType);
     else
       {
-	String className = elementType.getClassName();
-	try
-	  {
-	    type = Class.forName(className);
-	  }
-	catch (ClassNotFoundException e)
-	  {
-	    throw new OpenDataException("The class name, " + className +
-					", is unavailable.");
-	  }
+        String className = elementType.getClassName();
+        try
+          {
+            type = Class.forName(className);
+          }
+        catch (ClassNotFoundException e)
+          {
+            throw new OpenDataException("The class name, " + className +
+                                        ", is unavailable.");
+          }
       }
     while (type.isArray())
       type = type.getComponentType();
     return
       Array.newInstance(type,
-			new int[getDimensions(elementType, dim)]).getClass().getName();
+                        new int[getDimensions(elementType, dim)]).getClass().getName();
   }
 
   /**
@@ -146,11 +146,11 @@ public class ArrayType
    * @throws IllegalArgumentException if dim is less than 1.
    */
   private static final int getDimensions(OpenType elementType,
-					 int dim)
+                                         int dim)
   {
     if (dim < 1)
       throw new IllegalArgumentException("Dimensions must be greater " +
-					 "than or equal to 1.");
+                                         "than or equal to 1.");
     if (elementType instanceof ArrayType)
       return dim + ((ArrayType) elementType).getDimension();
     return dim;
@@ -184,7 +184,7 @@ public class ArrayType
     if (type.equals(Long.TYPE))
       return SimpleType.LONG;
     if (type.equals(Short.TYPE))
-      return SimpleType.SHORT; 
+      return SimpleType.SHORT;
     if (type.equals(Void.TYPE))
       return SimpleType.VOID;
     throw new OpenDataException(type + " is not a primitive type.");
@@ -218,7 +218,7 @@ public class ArrayType
     if (type.equals(SimpleType.LONG))
       return Long.TYPE;
     if (type.equals(SimpleType.SHORT))
-      return Short.TYPE; 
+      return Short.TYPE;
     if (type.equals(SimpleType.VOID))
       return Void.TYPE;
     throw new OpenDataException(type + " is not a primitive type.");
@@ -257,7 +257,7 @@ public class ArrayType
   {
     OpenType trueElemType = getElementType(elemType);
     if (elemType instanceof ArrayType &&
-	((ArrayType) elemType).isPrimitiveArray())
+        ((ArrayType) elemType).isPrimitiveArray())
       return getPrimitiveTypeClass((SimpleType) trueElemType).getName();
     return trueElemType.getClassName();
   }
@@ -309,21 +309,21 @@ public class ArrayType
   public ArrayType(int dim, OpenType elementType)
     throws OpenDataException
   {
-    super(getArrayClassName(elementType, dim, false), 
-	  getArrayClassName(elementType, dim, false), 
-	  getDimensions(elementType, dim) + "-dimension array of " 
-	  + getElementTypeName(elementType));
+    super(getArrayClassName(elementType, dim, false),
+          getArrayClassName(elementType, dim, false),
+          getDimensions(elementType, dim) + "-dimension array of "
+          + getElementTypeName(elementType));
     if (!(elementType instanceof SimpleType ||
-	  elementType instanceof CompositeType ||
-	  elementType instanceof TabularType ||
-	  elementType instanceof ArrayType))
+          elementType instanceof CompositeType ||
+          elementType instanceof TabularType ||
+          elementType instanceof ArrayType))
       throw new OpenDataException("The element type must be a simple " +
-				  "type, an array type, a composite type " +
-				  "or a tabular type.");
+                                  "type, an array type, a composite type " +
+                                  "or a tabular type.");
     dimension = getDimensions(elementType, dim);
     this.elementType = getElementType(elementType);
     primitiveArray = (elementType instanceof ArrayType &&
-		      ((ArrayType) elementType).isPrimitiveArray());
+                      ((ArrayType) elementType).isPrimitiveArray());
   }
 
   /**
@@ -377,10 +377,10 @@ public class ArrayType
     throws OpenDataException
   {
     super(getArrayClassName(elementType, 1, primitiveArray),
-	  getArrayClassName(elementType, 1, primitiveArray), 
-	  "1-dimension array of " + 
-	  (primitiveArray ? getPrimitiveTypeClass(elementType).getName() 
-	   : elementType.getClassName()));
+          getArrayClassName(elementType, 1, primitiveArray),
+          "1-dimension array of " +
+          (primitiveArray ? getPrimitiveTypeClass(elementType).getName()
+           : elementType.getClassName()));
     dimension = 1;
     this.elementType = elementType;
     this.primitiveArray = primitiveArray;
@@ -400,7 +400,7 @@ public class ArrayType
    * 
                  • The primitive array flag is set the same in both
    * instances.
                    • 
    * 
-   * 
+   *
    * @param obj the object to compare with.
    * @return true if the conditions above hold.
    */
@@ -410,8 +410,8 @@ public class ArrayType
       return false;
     ArrayType atype = (ArrayType) obj;
     return (atype.getDimension() == dimension &&
-	    atype.getElementOpenType().equals(elementType) &&
-	    atype.isPrimitiveArray() == primitiveArray);
+            atype.getElementOpenType().equals(elementType) &&
+            atype.isPrimitiveArray() == primitiveArray);
   }
 
   /**
@@ -438,7 +438,7 @@ public class ArrayType
    * @throws OpenDataException if the class name of {@code elementType}
    *                           is not in {@link OpenType#ALLOWED_CLASSNAMES_LIST}.
    * @since 1.6
-   */ 
+   */
   @SuppressWarnings("unchecked")
   public static  ArrayType getArrayType(OpenType elementType)
     throws OpenDataException
@@ -484,7 +484,7 @@ public class ArrayType
    * @throws IllegalArgumentException if the type is not a primitive
    *                                  array.
    * @since 1.6
-   */ 
+   */
   @SuppressWarnings("unchecked")
   public static  ArrayType getPrimitiveArrayType(Class type)
   {
@@ -495,32 +495,32 @@ public class ArrayType
     int dim = 0;
     do
       {
-	comType = comType.getComponentType();
-	++dim;
-	if (comType == null)
-	  throw new IllegalArgumentException("The given class is " +
-					     "not an array.");
+        comType = comType.getComponentType();
+        ++dim;
+        if (comType == null)
+          throw new IllegalArgumentException("The given class is " +
+                                             "not an array.");
       } while (comType.isArray());
     try
       {
-	arr = new ArrayType(getPrimitiveType(comType), true);
+        arr = new ArrayType(getPrimitiveType(comType), true);
       }
     catch (OpenDataException e)
       {
-	throw new IllegalArgumentException("The array is not of a primitive " +
-					   "type", e);
+        throw new IllegalArgumentException("The array is not of a primitive " +
+                                           "type", e);
       }
     while (dim > 1)
       try
-	{
-	  arr = new ArrayType(1, arr);
-	  --dim;
-	}
+        {
+          arr = new ArrayType(1, arr);
+          --dim;
+        }
       catch (OpenDataException e)
-	{
-	  throw (Error)
-	    new InternalError("Couldn't generate extra dimensions").initCause(e);
-	}
+        {
+          throw (Error)
+            new InternalError("Couldn't generate extra dimensions").initCause(e);
+        }
     primCache.put(type, arr);
     return arr;
   }
@@ -570,8 +570,8 @@ public class ArrayType
   {
     if (hashCode == null)
       hashCode = Integer.valueOf(dimension +
-				 elementType.hashCode() +
-				 Boolean.valueOf(primitiveArray).hashCode());
+                                 elementType.hashCode() +
+                                 Boolean.valueOf(primitiveArray).hashCode());
     return hashCode.intValue();
   }
 
@@ -619,21 +619,21 @@ public class ArrayType
     Class elementClass = null;
     try
       {
-	elementClass = Class.forName(getClassName());
+        elementClass = Class.forName(getClassName());
       }
     catch (ClassNotFoundException e)
       {
-	throw new IllegalStateException("The array type's element " +
-					"class could not be found.", e);
+        throw new IllegalStateException("The array type's element " +
+                                        "class could not be found.", e);
       }
     if (!(elementClass.isAssignableFrom(objClass)))
       return false;
     for (int a = 0; a < Array.getLength(obj); ++a)
       {
-	Object elem = Array.get(obj, a);
-	if (elem != null &&
-	    (!(elementType.isValue(elem))))
-	  return false;
+        Object elem = Array.get(obj, a);
+        if (elem != null &&
+            (!(elementType.isValue(elem))))
+          return false;
       }
     return true;
   }
@@ -661,11 +661,11 @@ public class ArrayType
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getTypeName()
-	+ ", dimension=" + dimension
-	+ ", elementType=" + elementType
-	+ ", primitiveArray=" + primitiveArray
-	+ "]";
+        + "[name=" + getTypeName()
+        + ", dimension=" + dimension
+        + ", elementType=" + elementType
+        + ", primitiveArray=" + primitiveArray
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/CompositeData.java b/libjava/classpath/javax/management/openmbean/CompositeData.java
index 3134bc4c480..c3d2b2d9d4c 100644
--- a/libjava/classpath/javax/management/openmbean/CompositeData.java
+++ b/libjava/classpath/javax/management/openmbean/CompositeData.java
@@ -151,4 +151,3 @@ public interface CompositeData
   Collection values();
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/CompositeDataInvocationHandler.java b/libjava/classpath/javax/management/openmbean/CompositeDataInvocationHandler.java
index 170ec32c7a9..4f10f6ea2d6 100644
--- a/libjava/classpath/javax/management/openmbean/CompositeDataInvocationHandler.java
+++ b/libjava/classpath/javax/management/openmbean/CompositeDataInvocationHandler.java
@@ -49,7 +49,7 @@ import java.lang.reflect.Proxy;
  * {@link CompositeData} object.  An instance of {@link CompositeData}
  * consists of a series of key-value mappings.  This handler assumes
  * these keys to be the names of attributes, and thus provides
- * accessor methods by returning the associated value.  
+ * accessor methods by returning the associated value.
  * 
                    
  * 
                    
  * As an example, consider the following interface:
@@ -110,7 +110,7 @@ public class CompositeDataInvocationHandler
   {
     if (data == null)
       throw new IllegalArgumentException("The CompositeData instance " +
-					 "must be non-null.");
+                                         "must be non-null.");
     this.data = data;
   }
 
@@ -149,18 +149,18 @@ public class CompositeDataInvocationHandler
     String mName = method.getName();
     if (mName.equals("equals"))
       {
-	if (args[0] instanceof Proxy)
-	  {
-	    InvocationHandler h = Proxy.getInvocationHandler(args[0]);
-	    if (h instanceof CompositeDataInvocationHandler)
-	      return data.equals(((CompositeDataInvocationHandler)
-				  h).getCompositeData());
-	  }
-	return false;
+        if (args[0] instanceof Proxy)
+          {
+            InvocationHandler h = Proxy.getInvocationHandler(args[0]);
+            if (h instanceof CompositeDataInvocationHandler)
+              return data.equals(((CompositeDataInvocationHandler)
+                                  h).getCompositeData());
+          }
+        return false;
       }
     if (mName.equals("hashCode"))
       {
-	return data.hashCode();
+        return data.hashCode();
       }
     String attrib = null;
     if (mName.startsWith("get"))
@@ -171,18 +171,18 @@ public class CompositeDataInvocationHandler
       throw new NoSuchMethodException(mName + " is not an accessor.");
     if (!data.containsKey(attrib))
       {
-	if (Character.isLowerCase(attrib.charAt(0)))
-	  throw new NoSuchMethodException("The attribute " +
-					  attrib + " is not available " +
-					  "in the given CompositeData " +
-					  "object");
-	attrib = Character.toLowerCase(attrib.charAt(0))
-	  + attrib.substring(1);
-	if (!data.containsKey(attrib))
-	  throw new NoSuchMethodException("The attribute " +
-					  attrib + " is not available " +
-					  "in the given CompositeData " +
-					  "object");
+        if (Character.isLowerCase(attrib.charAt(0)))
+          throw new NoSuchMethodException("The attribute " +
+                                          attrib + " is not available " +
+                                          "in the given CompositeData " +
+                                          "object");
+        attrib = Character.toLowerCase(attrib.charAt(0))
+          + attrib.substring(1);
+        if (!data.containsKey(attrib))
+          throw new NoSuchMethodException("The attribute " +
+                                          attrib + " is not available " +
+                                          "in the given CompositeData " +
+                                          "object");
       }
     return data.get(attrib);
   }
diff --git a/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java b/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java
index 6bce2672d4f..2cc6f4049db 100644
--- a/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java
+++ b/libjava/classpath/javax/management/openmbean/CompositeDataSupport.java
@@ -109,9 +109,9 @@ public class CompositeDataSupport
   public CompositeDataSupport(CompositeType type, Map items)
     throws OpenDataException
   {
-    this(type, 
-	 items.keySet().toArray(new String[items.size()]),
-	 items.values().toArray());
+    this(type,
+         items.keySet().toArray(new String[items.size()]),
+         items.values().toArray());
   }
 
   /**
@@ -157,26 +157,26 @@ public class CompositeDataSupport
     Set typeKeys = type.keySet();
     if (typeKeys.size() != names.length)
       throw new OpenDataException("The number of field names does not match " +
-				  "the type description.");
+                                  "the type description.");
     contents = new TreeMap();
     for (int a = 0; a < names.length; ++a)
       {
-	if (names[a] == null)
-	  throw new IllegalArgumentException("Element " + a + " of the names " +
-					     "array is null.");
-	if (names[a].length() == 0)
-	  throw new IllegalArgumentException("Element " + a + " of the names " +
-					     "array is an empty string.");
-	if (values[a] == null)
-	  throw new IllegalArgumentException("Element " + a + " of the values " +
-					     "array is null.");
-	if (!(typeKeys.contains(names[a])))
-	  throw new OpenDataException("The name, " + names[a] + ", is not a " +
-				      "field in the given type description.");
-	if (!(type.getType(names[a]).isValue(values[a])))
-	  throw new OpenDataException("The value, " + values[a] + ", is not a " +
-				      "valid value for the " + names[a] + " field.");
-	contents.put(names[a], values[a]);
+        if (names[a] == null)
+          throw new IllegalArgumentException("Element " + a + " of the names " +
+                                             "array is null.");
+        if (names[a].length() == 0)
+          throw new IllegalArgumentException("Element " + a + " of the names " +
+                                             "array is an empty string.");
+        if (values[a] == null)
+          throw new IllegalArgumentException("Element " + a + " of the values " +
+                                             "array is null.");
+        if (!(typeKeys.contains(names[a])))
+          throw new OpenDataException("The name, " + names[a] + ", is not a " +
+                                      "field in the given type description.");
+        if (!(type.getType(names[a]).isValue(values[a])))
+          throw new OpenDataException("The value, " + values[a] + ", is not a " +
+                                      "valid value for the " + names[a] + " field.");
+        contents.put(names[a], values[a]);
       }
   }
 
@@ -229,10 +229,10 @@ public class CompositeDataSupport
       return false;
     for (String key : contents.keySet())
       {
-	if (!(data.containsKey(key)))
-	  return false;
-	if (!(data.get(key).equals(contents.get(key))))
-	  return false;
+        if (!(data.containsKey(key)))
+          return false;
+        if (!(data.get(key).equals(contents.get(key))))
+          return false;
       }
     return true;
   }
@@ -343,4 +343,3 @@ public class CompositeDataSupport
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/CompositeType.java b/libjava/classpath/javax/management/openmbean/CompositeType.java
index 3244c6457c1..e36fed151dc 100644
--- a/libjava/classpath/javax/management/openmbean/CompositeType.java
+++ b/libjava/classpath/javax/management/openmbean/CompositeType.java
@@ -46,7 +46,7 @@ import java.util.TreeMap;
 /**
  * The open type descriptor for instances of the
  * {@link CompositeData} class.
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -109,34 +109,34 @@ public class CompositeType
    *                           before comparison.
    */
   public CompositeType(String name, String desc, String[] names,
-		       String[] descs, OpenType[] types)
+                       String[] descs, OpenType[] types)
     throws OpenDataException
   {
     super(CompositeData.class.getName(), name, desc);
-    if (names.length == 0 
-	|| names.length != descs.length
-	|| names.length != types.length)
+    if (names.length == 0
+        || names.length != descs.length
+        || names.length != types.length)
       throw new IllegalArgumentException("Arrays must be non-empty " +
-					 "and of equal size.");
+                                         "and of equal size.");
     nameToDescription = new TreeMap();
     for (int a = 0; a < names.length; ++a)
       {
-	if (names[a] == null)
-	  throw new IllegalArgumentException("Name " + a + " is null.");
-	if (descs[a] == null)
-	  throw new IllegalArgumentException("Description " + a + 
-					     " is null.");
-	String fieldName = names[a].trim();
-	if (fieldName.length() == 0)
-	  throw new IllegalArgumentException("Name " + a + " is " +
-					     "the empty string.");
-	if (descs[a].length() == 0)
-	  throw new IllegalArgumentException("Description " + a + " is " +
-					     "the empty string.");
-	if (nameToDescription.containsKey(fieldName))
-	  throw new OpenDataException(fieldName + " appears more " +
-				      "than once.");
-	nameToDescription.put(fieldName, descs[a]);
+        if (names[a] == null)
+          throw new IllegalArgumentException("Name " + a + " is null.");
+        if (descs[a] == null)
+          throw new IllegalArgumentException("Description " + a +
+                                             " is null.");
+        String fieldName = names[a].trim();
+        if (fieldName.length() == 0)
+          throw new IllegalArgumentException("Name " + a + " is " +
+                                             "the empty string.");
+        if (descs[a].length() == 0)
+          throw new IllegalArgumentException("Description " + a + " is " +
+                                             "the empty string.");
+        if (nameToDescription.containsKey(fieldName))
+          throw new OpenDataException(fieldName + " appears more " +
+                                      "than once.");
+        nameToDescription.put(fieldName, descs[a]);
       }
     nameToType = new TreeMap>();
     for (int a = 0; a < names.length; ++a)
@@ -167,7 +167,7 @@ public class CompositeType
    * 
                  • The type names are equal.
                    • 
    * 
                  • The fields and their types match.
                    • 
    * 
-   * 
+   *
    * @param obj the object to compare with.
    * @return true if the conditions above hold.
    */
@@ -184,7 +184,7 @@ public class CompositeType
     for (String key : keys)
     {
       if (!(ctype.getType(key).equals(getType(key))))
-	return false;
+        return false;
     }
     return true;
   }
@@ -222,7 +222,7 @@ public class CompositeType
   /**
    * 
                    
    * Returns the hash code of the composite data type.
-   * This is computed as the sum of the hash codes of 
+   * This is computed as the sum of the hash codes of
    * each field name and its type, together with the hash
    * code of the type name.  These are the same elements
    * of the type that are compared as part of the
@@ -242,18 +242,18 @@ public class CompositeType
   {
     if (hashCode == null)
       {
-	int elementTotal = 0;
-	for (Map.Entry> entry : nameToType.entrySet())
-	  {
-	    elementTotal += (entry.getKey().hashCode() +
-			     entry.getValue().hashCode());
-	  }
-	hashCode = Integer.valueOf(elementTotal 
-				   + getTypeName().hashCode());
+        int elementTotal = 0;
+        for (Map.Entry> entry : nameToType.entrySet())
+          {
+            elementTotal += (entry.getKey().hashCode() +
+                             entry.getValue().hashCode());
+          }
+        hashCode = Integer.valueOf(elementTotal
+                                   + getTypeName().hashCode());
       }
     return hashCode.intValue();
   }
-			       
+
   /**
    * Returns true if the specified object is a member of this
    * composite type.  The object is judged to be so if it is
@@ -268,15 +268,15 @@ public class CompositeType
   {
     if (obj instanceof CompositeData)
       {
-	CompositeData data = (CompositeData) obj;
-	return equals(data.getCompositeType());
+        CompositeData data = (CompositeData) obj;
+        return equals(data.getCompositeType());
       }
     return false;
   }
 
   /**
    * Returns an unmodifiable {@link java.util.Set}-based
-   * view of the field names that form part of this 
+   * view of the field names that form part of this
    * {@link CompositeType} instance.  The names are stored
    * in ascending alphanumeric order.
    *
@@ -311,9 +311,9 @@ public class CompositeType
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getTypeName()
-	+ ", fields=" + nameToType
-	+ "]";
+        + "[name=" + getTypeName()
+        + ", fields=" + nameToType
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/InvalidKeyException.java b/libjava/classpath/javax/management/openmbean/InvalidKeyException.java
index 5f0cf76036e..e9458ba91d8 100644
--- a/libjava/classpath/javax/management/openmbean/InvalidKeyException.java
+++ b/libjava/classpath/javax/management/openmbean/InvalidKeyException.java
@@ -74,4 +74,3 @@ public class InvalidKeyException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/InvalidOpenTypeException.java b/libjava/classpath/javax/management/openmbean/InvalidOpenTypeException.java
index 9c9ff8cfab8..b4f49ba1336 100644
--- a/libjava/classpath/javax/management/openmbean/InvalidOpenTypeException.java
+++ b/libjava/classpath/javax/management/openmbean/InvalidOpenTypeException.java
@@ -73,4 +73,3 @@ public class InvalidOpenTypeException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/KeyAlreadyExistsException.java b/libjava/classpath/javax/management/openmbean/KeyAlreadyExistsException.java
index cc6bba63621..69b22c433b5 100644
--- a/libjava/classpath/javax/management/openmbean/KeyAlreadyExistsException.java
+++ b/libjava/classpath/javax/management/openmbean/KeyAlreadyExistsException.java
@@ -74,4 +74,3 @@ public class KeyAlreadyExistsException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/OpenDataException.java b/libjava/classpath/javax/management/openmbean/OpenDataException.java
index a476cc1d4d2..5e2a0b7463f 100644
--- a/libjava/classpath/javax/management/openmbean/OpenDataException.java
+++ b/libjava/classpath/javax/management/openmbean/OpenDataException.java
@@ -76,4 +76,3 @@ public class OpenDataException
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java
index 1b276fd197f..d52130600c7 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfo.java
@@ -59,7 +59,7 @@ public interface OpenMBeanAttributeInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         openType.equals(object.getOpenType()),
    *         defaultValue.equals(object.getDefaultValue()),
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
index 6da2e95e689..098f72e71bd 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java
@@ -44,7 +44,7 @@ import java.util.Set;
 import javax.management.MBeanAttributeInfo;
 
 /**
- * Describes an attribute of an open management bean.  
+ * Describes an attribute of an open management bean.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -113,11 +113,11 @@ public class OpenMBeanAttributeInfoSupport
    *                                  the empty string.
    */
   public OpenMBeanAttributeInfoSupport(String name, String desc, OpenType type,
-				       boolean isReadable, boolean isWritable,
-				       boolean isIs)
+                                       boolean isReadable, boolean isWritable,
+                                       boolean isIs)
   {
     super(name, type == null ? null : type.getClassName(), desc, isReadable,
-	  isWritable, isIs);
+          isWritable, isIs);
     if (name == null)
       throw new IllegalArgumentException("The name may not be null.");
     if (desc == null)
@@ -128,7 +128,7 @@ public class OpenMBeanAttributeInfoSupport
       throw new IllegalArgumentException("The name may not be the empty string.");
     if (desc.length() == 0)
       throw new IllegalArgumentException("The description may not be the " +
-					 "empty string.");
+                                         "empty string.");
   }
 
   /**
@@ -158,8 +158,8 @@ public class OpenMBeanAttributeInfoSupport
    *                           of {@link ArrayType} or {@link TabularType}.
    */
   public  OpenMBeanAttributeInfoSupport(String name, String desc, OpenType type,
-					   boolean isReadable, boolean isWritable,
-					   boolean isIs, T defaultValue)
+                                           boolean isReadable, boolean isWritable,
+                                           boolean isIs, T defaultValue)
     throws OpenDataException
   {
     this(name, desc, type, isReadable, isWritable, isIs, defaultValue, null);
@@ -168,7 +168,7 @@ public class OpenMBeanAttributeInfoSupport
   /**
    * 
                    
    * Constructs a new {@link OpenMBeanAttributeInfo} using the
-   * specified name, description, open type, access properties, 
+   * specified name, description, open type, access properties,
    * default, maximum and minimum values.  The name, description
    * and open type cannot be null and the name and
    * description may not be equal to the empty string.  The
@@ -187,7 +187,7 @@ public class OpenMBeanAttributeInfoSupport
    * 
                  • The default value must be smaller than or equal to the maximum value
    * (literally, defaultValue.compareTo(maxValue) <= 0.
                    • 
    * 
-   * 
+   *
    * @param name the name of the attribute.
    * @param desc a description of the attribute.
    * @param type the open type of the attribute.
@@ -205,39 +205,39 @@ public class OpenMBeanAttributeInfoSupport
    */
   @SuppressWarnings("unchecked")
   public  OpenMBeanAttributeInfoSupport(String name, String desc, OpenType type,
-					   boolean isReadable, boolean isWritable,
-					   boolean isIs, T defaultValue,
-					   Comparable minimumValue,
-					   Comparable maximumValue)
+                                           boolean isReadable, boolean isWritable,
+                                           boolean isIs, T defaultValue,
+                                           Comparable minimumValue,
+                                           Comparable maximumValue)
     throws OpenDataException
   {
     this(name, desc, type, isReadable, isWritable, isIs);
     if (defaultValue != null && !(type.isValue(defaultValue)))
       throw new OpenDataException("The default value is not a member of the " +
-				  "open type given.");
+                                  "open type given.");
     if (minimumValue != null && !(type.isValue(minimumValue)))
       throw new OpenDataException("The minimum value is not a member of the " +
-				  "open type given.");
+                                  "open type given.");
     if (maximumValue != null && !(type.isValue(maximumValue)))
       throw new OpenDataException("The maximum value is not a member of the " +
-				  "open type given.");
-    if (defaultValue != null && (type instanceof ArrayType || 
-				 type instanceof TabularType))
+                                  "open type given.");
+    if (defaultValue != null && (type instanceof ArrayType ||
+                                 type instanceof TabularType))
       throw new OpenDataException("Default values are not applicable for " +
-				  "array or tabular types.");
-    if (minimumValue != null && maximumValue != null 
-	&& minimumValue.compareTo((T) maximumValue) > 0)
+                                  "array or tabular types.");
+    if (minimumValue != null && maximumValue != null
+        && minimumValue.compareTo((T) maximumValue) > 0)
       throw new OpenDataException("The minimum value is greater than the " +
-				  "maximum.");
-    if (minimumValue != null && defaultValue != null 
-	&& minimumValue.compareTo(defaultValue) > 0)
+                                  "maximum.");
+    if (minimumValue != null && defaultValue != null
+        && minimumValue.compareTo(defaultValue) > 0)
       throw new OpenDataException("The minimum value is greater than the " +
-				  "default.");
+                                  "default.");
     if (defaultValue != null && maximumValue != null
-	&& maximumValue.compareTo(defaultValue) < 0)
+        && maximumValue.compareTo(defaultValue) < 0)
       throw new OpenDataException("The default value is greater than the " +
-				  "maximum.");
-    
+                                  "maximum.");
+
     openType = type;
     this.defaultValue = defaultValue;
     minValue = minimumValue;
@@ -282,40 +282,40 @@ public class OpenMBeanAttributeInfoSupport
    * @throws OpenDataException if any condition in the list above is broken.
    */
   public  OpenMBeanAttributeInfoSupport(String name, String desc, OpenType type,
-					   boolean isReadable, boolean isWritable,
-					   boolean isIs, T defaultValue,
-					   T[] legalValues)
+                                           boolean isReadable, boolean isWritable,
+                                           boolean isIs, T defaultValue,
+                                           T[] legalValues)
     throws OpenDataException
   {
     this(name, desc, type, isReadable, isWritable, isIs);
     if (defaultValue != null && !(type.isValue(defaultValue)))
       throw new OpenDataException("The default value is not a member of the " +
-				  "open type given.");
-    if (defaultValue != null && (type instanceof ArrayType || 
-				 type instanceof TabularType))
+                                  "open type given.");
+    if (defaultValue != null && (type instanceof ArrayType ||
+                                 type instanceof TabularType))
       throw new OpenDataException("Default values are not applicable for " +
-				  "array or tabular types.");
-    if (legalValues != null && (type instanceof ArrayType || 
-				type instanceof TabularType))
+                                  "array or tabular types.");
+    if (legalValues != null && (type instanceof ArrayType ||
+                                type instanceof TabularType))
       throw new OpenDataException("Legal values are not applicable for " +
-				  "array or tabular types.");
+                                  "array or tabular types.");
     if (legalValues != null && legalValues.length > 0)
       {
-	Set lv = new HashSet(legalValues.length);
-	for (int a = 0; a < legalValues.length; ++a)
-	  {
-	    if (legalValues[a] != null && 
-		!(type.isValue(legalValues[a])))
-	      throw new OpenDataException("The legal value, " 
-					  + legalValues[a] + 
-					  "is not a member of the " +
-					  "open type given.");
-	    lv.add(legalValues[a]);
-	  }
-	if (defaultValue != null && !(lv.contains(defaultValue)))
-	  throw new OpenDataException("The default value is not in the set " +
-				      "of legal values.");
-	this.legalValues = Collections.unmodifiableSet(lv);
+        Set lv = new HashSet(legalValues.length);
+        for (int a = 0; a < legalValues.length; ++a)
+          {
+            if (legalValues[a] != null &&
+                !(type.isValue(legalValues[a])))
+              throw new OpenDataException("The legal value, "
+                                          + legalValues[a] +
+                                          "is not a member of the " +
+                                          "open type given.");
+            lv.add(legalValues[a]);
+          }
+        if (defaultValue != null && !(lv.contains(defaultValue)))
+          throw new OpenDataException("The default value is not in the set " +
+                                      "of legal values.");
+        this.legalValues = Collections.unmodifiableSet(lv);
       }
     openType = type;
     this.defaultValue = defaultValue;
@@ -329,7 +329,7 @@ public class OpenMBeanAttributeInfoSupport
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanAttributeInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         openType.equals(object.getOpenType()),
    *         isRead == object.isReadable(),
@@ -446,20 +446,20 @@ public class OpenMBeanAttributeInfoSupport
   public int hashCode()
   {
     if (hashCode == null)
-      hashCode = Integer.valueOf(getName().hashCode() + 
-				 openType.hashCode() +
-				 Boolean.valueOf(isReadable()).hashCode() +
-				 (2 * 
-				  Boolean.valueOf(isWritable()).hashCode()) +
-				 (4 * Boolean.valueOf(isIs()).hashCode()) +
-				 (defaultValue == null ? 0 :
-				  defaultValue.hashCode()) +
-				 (minValue == null ? 0 :
-				  minValue.hashCode()) +
-				 (maxValue == null ? 0 :
-				  maxValue.hashCode()) +
-				 (legalValues == null ? 0 :
-				  legalValues.hashCode()));
+      hashCode = Integer.valueOf(getName().hashCode() +
+                                 openType.hashCode() +
+                                 Boolean.valueOf(isReadable()).hashCode() +
+                                 (2 *
+                                  Boolean.valueOf(isWritable()).hashCode()) +
+                                 (4 * Boolean.valueOf(isIs()).hashCode()) +
+                                 (defaultValue == null ? 0 :
+                                  defaultValue.hashCode()) +
+                                 (minValue == null ? 0 :
+                                  minValue.hashCode()) +
+                                 (maxValue == null ? 0 :
+                                  maxValue.hashCode()) +
+                                 (legalValues == null ? 0 :
+                                  legalValues.hashCode()));
     return hashCode.intValue();
   }
 
@@ -531,16 +531,16 @@ public class OpenMBeanAttributeInfoSupport
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getName() 
-	+ ",openType=" + openType
-	+ ",isReadable=" + isReadable()
-	+ ",isWritable=" + isWritable()
-	+ ",isIs=" + isIs()
-	+ ",defaultValue=" + defaultValue
-	+ ",minValue=" + minValue
-	+ ",maxValue=" + maxValue
-	+ ",legalValues=" + legalValues
-	+ "]";
+        + "[name=" + getName()
+        + ",openType=" + openType
+        + ",isReadable=" + isReadable()
+        + ",isWritable=" + isWritable()
+        + ",isIs=" + isIs()
+        + ",defaultValue=" + defaultValue
+        + ",minValue=" + minValue
+        + ",maxValue=" + maxValue
+        + ",legalValues=" + legalValues
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java b/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java
index 34cef131f26..5bccdb63968 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfo.java
@@ -59,7 +59,7 @@ public interface OpenMBeanConstructorInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         and signature.equals(object.getSignature()).
    */
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
index 9dac01a596a..c187d5d130c 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java
@@ -43,7 +43,7 @@ import javax.management.MBeanConstructorInfo;
 import javax.management.MBeanParameterInfo;
 
 /**
- * Describes a constructor for an open management bean.  
+ * Describes a constructor for an open management bean.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -89,7 +89,7 @@ public class OpenMBeanConstructorInfoSupport
    *                             {@link javax.management.MBeanParameterInfo}
    */
   public OpenMBeanConstructorInfoSupport(String name, String desc,
-					 OpenMBeanParameterInfo[] sig)
+                                         OpenMBeanParameterInfo[] sig)
   {
     super(name, desc, (MBeanParameterInfo[]) sig);
     if (name == null)
@@ -100,7 +100,7 @@ public class OpenMBeanConstructorInfoSupport
       throw new IllegalArgumentException("The name may not be the empty string.");
     if (desc.length() == 0)
       throw new IllegalArgumentException("The description may not be the " +
-					 "empty string.");
+                                         "empty string.");
   }
 
   /**
@@ -110,7 +110,7 @@ public class OpenMBeanConstructorInfoSupport
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         and signature.equals(object.getSignature()).
    */
@@ -140,8 +140,8 @@ public class OpenMBeanConstructorInfoSupport
   public int hashCode()
   {
     if (hashCode == null)
-      hashCode = Integer.valueOf(getName().hashCode() + 
-				 Arrays.asList(getSignature()).hashCode());
+      hashCode = Integer.valueOf(getName().hashCode() +
+                                 Arrays.asList(getSignature()).hashCode());
     return hashCode.intValue();
   }
 
@@ -165,9 +165,9 @@ public class OpenMBeanConstructorInfoSupport
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getName() 
-	+ ",signature=" + Arrays.toString(getSignature())
-	+ "]";
+        + "[name=" + getName()
+        + ",signature=" + Arrays.toString(getSignature())
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanInfo.java b/libjava/classpath/javax/management/openmbean/OpenMBeanInfo.java
index 5aa4df4511c..98da260e793 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanInfo.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanInfo.java
@@ -66,7 +66,7 @@ public interface OpenMBeanInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanInfo}
-   *         instance, 
+   *         instance,
    *         className.equals(object.getClassName())
    *         and each info class has an equal in the other object.
    */
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java
index d67ff76a0f3..c335d751259 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanInfoSupport.java
@@ -47,7 +47,7 @@ import javax.management.MBeanNotificationInfo;
 import javax.management.MBeanOperationInfo;
 
 /**
- * Describes an open management bean. 
+ * Describes an open management bean.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -97,16 +97,16 @@ public class OpenMBeanInfoSupport
    *                             is not assignable to the equivalent
    *                             MBeanXXXInfo class.
    */
-  public OpenMBeanInfoSupport(String name, String desc, 
-			      OpenMBeanAttributeInfo[] attribs,
-			      OpenMBeanConstructorInfo[] cons, 
-			      OpenMBeanOperationInfo[] ops,
-			      MBeanNotificationInfo[] notifs)
+  public OpenMBeanInfoSupport(String name, String desc,
+                              OpenMBeanAttributeInfo[] attribs,
+                              OpenMBeanConstructorInfo[] cons,
+                              OpenMBeanOperationInfo[] ops,
+                              MBeanNotificationInfo[] notifs)
   {
     super(name, desc, (MBeanAttributeInfo[]) attribs,
-	  (MBeanConstructorInfo[]) cons,
-	  (MBeanOperationInfo[]) ops,
-	  notifs);
+          (MBeanConstructorInfo[]) cons,
+          (MBeanOperationInfo[]) ops,
+          notifs);
   }
 
   /**
@@ -116,7 +116,7 @@ public class OpenMBeanInfoSupport
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanInfo}
-   *         instance, 
+   *         instance,
    *         className.equals(object.getClassName())
    *         and each info class has an equal in the other object.
    */
@@ -149,12 +149,12 @@ public class OpenMBeanInfoSupport
   public int hashCode()
   {
     if (hashCode == null)
-      hashCode = 
-	Integer.valueOf(getClassName().hashCode() + 
-			new HashSet(Arrays.asList(getAttributes())).hashCode() +
-			new HashSet(Arrays.asList(getConstructors())).hashCode() +
-			new HashSet(Arrays.asList(getNotifications())).hashCode() +
-			new HashSet(Arrays.asList(getOperations())).hashCode());
+      hashCode =
+        Integer.valueOf(getClassName().hashCode() +
+                        new HashSet(Arrays.asList(getAttributes())).hashCode() +
+                        new HashSet(Arrays.asList(getConstructors())).hashCode() +
+                        new HashSet(Arrays.asList(getNotifications())).hashCode() +
+                        new HashSet(Arrays.asList(getOperations())).hashCode());
     return hashCode.intValue();
   }
 
@@ -179,12 +179,12 @@ public class OpenMBeanInfoSupport
   {
     if (string == null)
       string = getClass().getName()
-	+ "[className=" + getClassName() 
-	+ ",attributes=" + Arrays.toString(getAttributes())
-	+ ",constructors=" + Arrays.toString(getConstructors())
-	+ ",notifications=" + Arrays.toString(getNotifications())
-	+ ",operations=" + Arrays.toString(getOperations())
-	+ "]";
+        + "[className=" + getClassName()
+        + ",attributes=" + Arrays.toString(getAttributes())
+        + ",constructors=" + Arrays.toString(getConstructors())
+        + ",notifications=" + Arrays.toString(getNotifications())
+        + ",operations=" + Arrays.toString(getOperations())
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfo.java b/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfo.java
index e835b8d131f..3b5bf92605e 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfo.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfo.java
@@ -59,7 +59,7 @@ public interface OpenMBeanOperationInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         signature.equals(object.getSignature()),
    *         returnOpenType.equals(object.getReturnOpenType()),
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
index c01433de0fa..992df344ac2 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanOperationInfoSupport.java
@@ -43,7 +43,7 @@ import javax.management.MBeanOperationInfo;
 import javax.management.MBeanParameterInfo;
 
 /**
- * Describes a operation for an open management bean.  
+ * Describes a operation for an open management bean.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -82,7 +82,7 @@ public class OpenMBeanOperationInfoSupport
    * description may not be equal to the empty string, and neither
    * the name, description nor the open return type may be
    * null.  The value of impact must be
-   * one of the four valid values 
+   * one of the four valid values
    * ({@link javax.management.MBeanOperationInfo#INFO},
    * {@link javax.management.MBeanOperationInfo#ACTION},
    * {@link javax.management.MBeanOperationInfo#ACTION_INFO} and
@@ -107,11 +107,11 @@ public class OpenMBeanOperationInfoSupport
    *                             {@link javax.management.MBeanParameterInfo}
    */
   public OpenMBeanOperationInfoSupport(String name, String desc,
-				       OpenMBeanParameterInfo[] sig,
-				       OpenType type, int impact)
+                                       OpenMBeanParameterInfo[] sig,
+                                       OpenType type, int impact)
   {
     super(name, desc, (MBeanParameterInfo[]) sig,
-	  type == null ? null : type.getClassName(), impact);
+          type == null ? null : type.getClassName(), impact);
     if (name == null)
       throw new IllegalArgumentException("The name may not be null.");
     if (desc == null)
@@ -122,9 +122,9 @@ public class OpenMBeanOperationInfoSupport
       throw new IllegalArgumentException("The name may not be the empty string.");
     if (desc.length() == 0)
       throw new IllegalArgumentException("The description may not be the " +
-					 "empty string.");
-    if (impact != ACTION && impact != INFO && 
-	impact != ACTION_INFO && impact != UNKNOWN)
+                                         "empty string.");
+    if (impact != ACTION && impact != INFO &&
+        impact != ACTION_INFO && impact != UNKNOWN)
       throw new IllegalArgumentException("The impact factor is an invalid value.");
     returnOpenType = type;
   }
@@ -136,7 +136,7 @@ public class OpenMBeanOperationInfoSupport
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         signature.equals(object.getSignature()),
    *         returnOpenType.equals(object.getReturnOpenType()),
@@ -182,10 +182,10 @@ public class OpenMBeanOperationInfoSupport
   public int hashCode()
   {
     if (hashCode == null)
-      hashCode = Integer.valueOf(getName().hashCode() + 
-				 returnOpenType.hashCode() +
-				 Integer.valueOf(getImpact()).hashCode() +
-				 Arrays.asList(getSignature()).hashCode());
+      hashCode = Integer.valueOf(getName().hashCode() +
+                                 returnOpenType.hashCode() +
+                                 Integer.valueOf(getImpact()).hashCode() +
+                                 Arrays.asList(getSignature()).hashCode());
     return hashCode.intValue();
   }
 
@@ -209,30 +209,30 @@ public class OpenMBeanOperationInfoSupport
   {
     if (string == null)
       {
-	String impactString;
-	switch (getImpact())
-	  {
-	  case INFO:
-	    impactString = "INFO";
-	    break;
-	  case ACTION:
-	    impactString = "ACTION";
-	    break;
-	  case ACTION_INFO:
-	    impactString = "ACTION_INFO";
-	    break;
-	  case UNKNOWN:
-	    impactString = "UNKNOWN";
-	    break;
-	  default:
-	    impactString = "ERRONEOUS VALUE";
-	  }
-	string = getClass().getName()
-	  + "[name=" + getName() 
-	  + ",signature=" + Arrays.toString(getSignature())
-	  + ",returnOpenType=" + returnOpenType
-	  + ",impact=" + impactString
-	  + "]";
+        String impactString;
+        switch (getImpact())
+          {
+          case INFO:
+            impactString = "INFO";
+            break;
+          case ACTION:
+            impactString = "ACTION";
+            break;
+          case ACTION_INFO:
+            impactString = "ACTION_INFO";
+            break;
+          case UNKNOWN:
+            impactString = "UNKNOWN";
+            break;
+          default:
+            impactString = "ERRONEOUS VALUE";
+          }
+        string = getClass().getName()
+          + "[name=" + getName()
+          + ",signature=" + Arrays.toString(getSignature())
+          + ",returnOpenType=" + returnOpenType
+          + ",impact=" + impactString
+          + "]";
       }
     return string;
   }
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfo.java b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfo.java
index 75d1baf941d..0869a686f51 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfo.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfo.java
@@ -59,7 +59,7 @@ public interface OpenMBeanParameterInfo
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         openType.equals(object.getOpenType()),
    *         defaultValue.equals(object.getDefaultValue()),
diff --git a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
index 5f86bf4af96..78ad1c5a012 100644
--- a/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
+++ b/libjava/classpath/javax/management/openmbean/OpenMBeanParameterInfoSupport.java
@@ -45,7 +45,7 @@ import javax.management.MBeanParameterInfo;
 
 /**
  * Describes the parameters of a constructor or operation associated
- * with an open management bean.  
+ * with an open management bean.
  *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
@@ -122,7 +122,7 @@ public class OpenMBeanParameterInfoSupport
       throw new IllegalArgumentException("The name may not be the empty string.");
     if (desc.length() == 0)
       throw new IllegalArgumentException("The description may not be the " +
-					 "empty string.");
+                                         "empty string.");
     openType = type;
   }
 
@@ -150,7 +150,7 @@ public class OpenMBeanParameterInfoSupport
    *                           of {@link ArrayType} or {@link TabularType}.
    */
   public  OpenMBeanParameterInfoSupport(String name, String desc, OpenType type,
-					   T defaultValue)
+                                           T defaultValue)
     throws OpenDataException
   {
     this(name, desc, type, defaultValue, null);
@@ -177,7 +177,7 @@ public class OpenMBeanParameterInfoSupport
    * 
                  • The default value must be smaller than or equal to the maximum value
    * (literally, defaultValue.compareTo(maxValue) <= 0.
                    • 
    * 
-   * 
+   *
    * @param name the name of the parameter.
    * @param desc a description of the parameter.
    * @param type the open type of the parameter.
@@ -192,37 +192,37 @@ public class OpenMBeanParameterInfoSupport
    */
   @SuppressWarnings("unchecked")
   public  OpenMBeanParameterInfoSupport(String name, String desc, OpenType type,
-					   T defaultValue, Comparable minimumValue,
-					   Comparable maximumValue)
+                                           T defaultValue, Comparable minimumValue,
+                                           Comparable maximumValue)
     throws OpenDataException
   {
     this(name, desc, type);
     if (defaultValue != null && !(type.isValue(defaultValue)))
       throw new OpenDataException("The default value is not a member of the " +
-				  "open type given.");
+                                  "open type given.");
     if (minimumValue != null && !(type.isValue(minimumValue)))
       throw new OpenDataException("The minimum value is not a member of the " +
-				  "open type given.");
+                                  "open type given.");
     if (maximumValue != null && !(type.isValue(maximumValue)))
       throw new OpenDataException("The maximum value is not a member of the " +
-				  "open type given.");
-    if (defaultValue != null && (type instanceof ArrayType || 
-				 type instanceof TabularType))
+                                  "open type given.");
+    if (defaultValue != null && (type instanceof ArrayType ||
+                                 type instanceof TabularType))
       throw new OpenDataException("Default values are not applicable for " +
-				  "array or tabular types.");
-    if (minimumValue != null && maximumValue != null 
-	&& minimumValue.compareTo((T) maximumValue) > 0)
+                                  "array or tabular types.");
+    if (minimumValue != null && maximumValue != null
+        && minimumValue.compareTo((T) maximumValue) > 0)
       throw new OpenDataException("The minimum value is greater than the " +
-				  "maximum.");
-    if (minimumValue != null && defaultValue != null 
-	&& minimumValue.compareTo(defaultValue) > 0)
+                                  "maximum.");
+    if (minimumValue != null && defaultValue != null
+        && minimumValue.compareTo(defaultValue) > 0)
       throw new OpenDataException("The minimum value is greater than the " +
-				  "default.");
+                                  "default.");
     if (defaultValue != null && maximumValue != null
-	&& maximumValue.compareTo(defaultValue) < 0)
+        && maximumValue.compareTo(defaultValue) < 0)
       throw new OpenDataException("The default value is greater than the " +
-				  "maximum.");
-    
+                                  "maximum.");
+
     this.defaultValue = defaultValue;
     minValue = minimumValue;
     maxValue = maximumValue;
@@ -263,38 +263,38 @@ public class OpenMBeanParameterInfoSupport
    * @throws OpenDataException if any condition in the list above is broken.
    */
   public  OpenMBeanParameterInfoSupport(String name, String desc, OpenType type,
-					   T defaultValue, T[] legalValues)
+                                           T defaultValue, T[] legalValues)
     throws OpenDataException
   {
     this(name, desc, type);
     if (defaultValue != null && !(type.isValue(defaultValue)))
       throw new OpenDataException("The default value is not a member of the " +
-				  "open type given.");
-    if (defaultValue != null && (type instanceof ArrayType || 
-				 type instanceof TabularType))
+                                  "open type given.");
+    if (defaultValue != null && (type instanceof ArrayType ||
+                                 type instanceof TabularType))
       throw new OpenDataException("Default values are not applicable for " +
-				  "array or tabular types.");
-    if (legalValues != null && (type instanceof ArrayType || 
-				type instanceof TabularType))
+                                  "array or tabular types.");
+    if (legalValues != null && (type instanceof ArrayType ||
+                                type instanceof TabularType))
       throw new OpenDataException("Legal values are not applicable for " +
-				  "array or tabular types.");
+                                  "array or tabular types.");
     if (legalValues != null && legalValues.length > 0)
       {
-	Set lv = new HashSet(legalValues.length);
-	for (int a = 0; a < legalValues.length; ++a)
-	  {
-	    if (legalValues[a] != null && 
-		!(type.isValue(legalValues[a])))
-	      throw new OpenDataException("The legal value, " 
-					  + legalValues[a] + 
-					  "is not a member of the " +
-					  "open type given.");
-	    lv.add(legalValues[a]);
-	  }
-	if (defaultValue != null && !(lv.contains(defaultValue)))
-	  throw new OpenDataException("The default value is not in the set " +
-				      "of legal values.");
-	this.legalValues = Collections.unmodifiableSet(lv);
+        Set lv = new HashSet(legalValues.length);
+        for (int a = 0; a < legalValues.length; ++a)
+          {
+            if (legalValues[a] != null &&
+                !(type.isValue(legalValues[a])))
+              throw new OpenDataException("The legal value, "
+                                          + legalValues[a] +
+                                          "is not a member of the " +
+                                          "open type given.");
+            lv.add(legalValues[a]);
+          }
+        if (defaultValue != null && !(lv.contains(defaultValue)))
+          throw new OpenDataException("The default value is not in the set " +
+                                      "of legal values.");
+        this.legalValues = Collections.unmodifiableSet(lv);
       }
     this.defaultValue = defaultValue;
   }
@@ -307,7 +307,7 @@ public class OpenMBeanParameterInfoSupport
    *
    * @param obj the object to compare.
    * @return true if the object is a {@link OpenMBeanParameterInfo}
-   *         instance, 
+   *         instance,
    *         name.equals(object.getName()),
    *         openType.equals(object.getOpenType()),
    *         defaultValue.equals(object.getDefaultValue()),
@@ -418,16 +418,16 @@ public class OpenMBeanParameterInfoSupport
   public int hashCode()
   {
     if (hashCode == null)
-      hashCode = Integer.valueOf(getName().hashCode() + 
-				 openType.hashCode() +
-				 (defaultValue == null ? 0 :
-				  defaultValue.hashCode()) +
-				 (minValue == null ? 0 :
-				  minValue.hashCode()) +
-				 (maxValue == null ? 0 :
-				  maxValue.hashCode()) +
-				 (legalValues == null ? 0 :
-				  legalValues.hashCode()));
+      hashCode = Integer.valueOf(getName().hashCode() +
+                                 openType.hashCode() +
+                                 (defaultValue == null ? 0 :
+                                  defaultValue.hashCode()) +
+                                 (minValue == null ? 0 :
+                                  minValue.hashCode()) +
+                                 (maxValue == null ? 0 :
+                                  maxValue.hashCode()) +
+                                 (legalValues == null ? 0 :
+                                  legalValues.hashCode()));
     return hashCode.intValue();
   }
 
@@ -499,13 +499,13 @@ public class OpenMBeanParameterInfoSupport
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getName() 
-	+ ",openType=" + openType 
-	+ ",defaultValue=" + defaultValue
-	+ ",minValue=" + minValue
-	+ ",maxValue=" + maxValue
-	+ ",legalValues=" + legalValues
-	+ "]";
+        + "[name=" + getName()
+        + ",openType=" + openType
+        + ",defaultValue=" + defaultValue
+        + ",minValue=" + minValue
+        + ",maxValue=" + maxValue
+        + ",legalValues=" + legalValues
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/OpenType.java b/libjava/classpath/javax/management/openmbean/OpenType.java
index f3a97fef3f7..d8abc7cf0c3 100644
--- a/libjava/classpath/javax/management/openmbean/OpenType.java
+++ b/libjava/classpath/javax/management/openmbean/OpenType.java
@@ -47,7 +47,7 @@ import java.util.List;
  * applicable data values for open MBeans.  An open type
  * is defined by its name and description, and the name
  * of the Java class it maps to.
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -99,7 +99,7 @@ public abstract class OpenType
     "java.util.Date",
     "javax.management.ObjectName",
     CompositeData.class.getName(),
-    TabularData.class.getName() 
+    TabularData.class.getName()
   };
 
   /**
@@ -107,8 +107,8 @@ public abstract class OpenType
    * used as open types.  Note that each type is also available
    * in array form, possibly with multiple dimensions.
    */
-  public static final List ALLOWED_CLASSNAMES_LIST = 
-    Arrays.asList(ALLOWED_CLASSNAMES); 
+  public static final List ALLOWED_CLASSNAMES_LIST =
+    Arrays.asList(ALLOWED_CLASSNAMES);
 
   /**
    * Constructs a new {@link OpenType} for the specified class
@@ -136,25 +136,25 @@ public abstract class OpenType
   {
     if (name == null || name.equals(""))
       throw new IllegalArgumentException("The name can not be null " +
-					 "or the empty string.");
+                                         "or the empty string.");
     if (desc == null || desc.equals(""))
       throw new IllegalArgumentException("The description can not " +
-					 "be null or the empty string.");
+                                         "be null or the empty string.");
     Class type;
     try
       {
-	type = Class.forName(className);
+        type = Class.forName(className);
       }
     catch (ClassNotFoundException e)
       {
-	throw (OpenDataException) new OpenDataException("The class name, " + className +
-							", is unavailable.").initCause(e);
+        throw (OpenDataException) new OpenDataException("The class name, " + className +
+                                                        ", is unavailable.").initCause(e);
       }
     while (type.isArray())
       type = type.getComponentType();
     if (!(type.isPrimitive() || ALLOWED_CLASSNAMES_LIST.contains(type.getName())))
-      throw new OpenDataException("The class name, " + className + 
-				  ", does not specify a valid open type.");
+      throw new OpenDataException("The class name, " + className +
+                                  ", does not specify a valid open type.");
     this.className = className;
     typeName = name;
     description = desc;
@@ -172,7 +172,7 @@ public abstract class OpenType
   /**
    * Returns the name of the Java class this type represents.  This must
    * be one of the {@link ALLOWED_CLASSNAMES} or an array of one of them.
-   * The specification of arrays follows the standard set by 
+   * The specification of arrays follows the standard set by
    * {@link java.lang.Class#getName()} i.e. the name is the class name
    * preceded by n instances of '[' and an 'L', where n is number of
    * dimensions used by the array.
diff --git a/libjava/classpath/javax/management/openmbean/SimpleType.java b/libjava/classpath/javax/management/openmbean/SimpleType.java
index ef05e9dfe4f..81b991bdfe4 100644
--- a/libjava/classpath/javax/management/openmbean/SimpleType.java
+++ b/libjava/classpath/javax/management/openmbean/SimpleType.java
@@ -56,7 +56,7 @@ import javax.management.ObjectName;
  * basic Java types.  As a result, the valid instances of this
  * class are predefined, and no constructor is given for creating
  * new instances.
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -80,7 +80,7 @@ public final class SimpleType
    * The {@link SimpleType} representation of
    * java.lang.Boolean.
    */
-  public static final SimpleType BOOLEAN; 
+  public static final SimpleType BOOLEAN;
 
   /**
    * The {@link SimpleType} representation of
@@ -98,7 +98,7 @@ public final class SimpleType
    * The {@link SimpleType} representation of
    * java.util.Date.
    */
-  public static final SimpleType DATE; 
+  public static final SimpleType DATE;
 
   /**
    * The {@link SimpleType} representation of
@@ -171,28 +171,28 @@ public final class SimpleType
   {
     try
       {
-	BIGDECIMAL = new SimpleType("java.math.BigDecimal");
-	BIGINTEGER = new SimpleType("java.math.BigInteger");
-	BOOLEAN = new SimpleType("java.lang.Boolean");
-	BYTE = new SimpleType("java.lang.Byte");
-	CHARACTER = new SimpleType("java.lang.Character");
-	DATE = new SimpleType("java.util.Date");
-	DOUBLE = new SimpleType("java.lang.Double");
-	FLOAT = new SimpleType("java.lang.Float");
-	INTEGER = new SimpleType("java.lang.Integer");
-	LONG = new SimpleType("java.lang.Long");
-	OBJECTNAME = 
-	  new SimpleType("javax.management.ObjectName");
-	SHORT = new SimpleType("java.lang.Short");
-	STRING = new SimpleType("java.lang.String");
-	VOID = new SimpleType("java.lang.Void");
+        BIGDECIMAL = new SimpleType("java.math.BigDecimal");
+        BIGINTEGER = new SimpleType("java.math.BigInteger");
+        BOOLEAN = new SimpleType("java.lang.Boolean");
+        BYTE = new SimpleType("java.lang.Byte");
+        CHARACTER = new SimpleType("java.lang.Character");
+        DATE = new SimpleType("java.util.Date");
+        DOUBLE = new SimpleType("java.lang.Double");
+        FLOAT = new SimpleType("java.lang.Float");
+        INTEGER = new SimpleType("java.lang.Integer");
+        LONG = new SimpleType("java.lang.Long");
+        OBJECTNAME =
+          new SimpleType("javax.management.ObjectName");
+        SHORT = new SimpleType("java.lang.Short");
+        STRING = new SimpleType("java.lang.String");
+        VOID = new SimpleType("java.lang.Void");
       }
     catch (OpenDataException e)
       {
-	/* In normal circumstances, this shouldn't be possible. */
-	throw new IllegalStateException("A invalid class name " +
-					"was passed to the SimpleType " +
-					"constructor.", e);
+        /* In normal circumstances, this shouldn't be possible. */
+        throw new IllegalStateException("A invalid class name " +
+                                        "was passed to the SimpleType " +
+                                        "constructor.", e);
       }
   }
 
@@ -200,12 +200,12 @@ public final class SimpleType
    * Constructs a new {@link SimpleType} instance for the given
    * class name.  The class name is also used as the type name
    * and description of the {@link OpenType} instance.
-   * 
+   *
    * @param name the name of the class this instance should
    *             represent.
    * @throws OpenDataException if somehow the constructor of the
    *                           superclass is passed an invalid
-   *                           class name. 
+   *                           class name.
    */
   private SimpleType(String name)
     throws OpenDataException
@@ -224,7 +224,7 @@ public final class SimpleType
    * {@link SimpleType}.
    * 
                  • The class names are equal.
                    • 
    * 
-   * 
+   *
    * @param obj the object to compare with.
    * @return true if the conditions above hold.
    */
@@ -319,7 +319,7 @@ public final class SimpleType
     if (equals(VOID))
       return VOID;
     throw new InvalidObjectException("Invalid simple type instance " +
-				     "deserialized.");
+                                     "deserialized.");
   }
 
   /**
@@ -342,8 +342,8 @@ public final class SimpleType
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getClassName()
-	+ "]";
+        + "[name=" + getClassName()
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/openmbean/TabularData.java b/libjava/classpath/javax/management/openmbean/TabularData.java
index 75ab00b7ed4..8bceae85e89 100644
--- a/libjava/classpath/javax/management/openmbean/TabularData.java
+++ b/libjava/classpath/javax/management/openmbean/TabularData.java
@@ -63,7 +63,7 @@ public interface TabularData
    * this instance's tabular type.  The returned indices are the
    * values of the fields in the supplied {@link CompositeData}
    * instance that match the names given in the {@link TabularType}.
-   * 
+   *
    * @param val the {@link CompositeData} value whose index should
    *            be calculated.
    * @return the index the value would take on, if it were to be added.
@@ -154,14 +154,14 @@ public interface TabularData
   /**
    * Returns true if this {@link TabularData} instance
    * contains no {@link CompositeData} values.
-   * 
+   *
    * @return true if the instance is devoid of rows.
    */
   boolean isEmpty();
 
   /**
    * Returns a {@link java.util.Set} view of the keys or
-   * indices of this {@link TabularData} instance. 
+   * indices of this {@link TabularData} instance.
    *
    * @return a set containing the keys of this instance.
    */
@@ -174,7 +174,7 @@ public interface TabularData
    * the same index as an existing value.  The index is
    * calculated using the index names of the
    * {@link TabularType} for this instance.
-   * 
+   *
    * @param val the {@link CompositeData} value to add.
    * @throws NullPointerException if val is
    *                              null.
@@ -198,7 +198,7 @@ public interface TabularData
    * value can not be added, then none of the values should
    * be.  If the array is null or empty, the
    * method simply returns.
-   * 
+   *
    * @param vals the {@link CompositeData} values to add.
    * @throws NullPointerException if a value from the array is
    *                              null.
@@ -247,7 +247,7 @@ public interface TabularData
    *         object.
    */
   String toString();
- 
+
   /**
    * Returns the values associated with this instance.
    *
@@ -256,4 +256,3 @@ public interface TabularData
   Collection values();
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/TabularDataSupport.java b/libjava/classpath/javax/management/openmbean/TabularDataSupport.java
index 8557f5f2464..e2da1b42d58 100644
--- a/libjava/classpath/javax/management/openmbean/TabularDataSupport.java
+++ b/libjava/classpath/javax/management/openmbean/TabularDataSupport.java
@@ -115,7 +115,7 @@ public class TabularDataSupport
     tabularType = type;
     dataMap = new HashMap(cap, lf);
   }
-   
+
   /**
    * Calculates the index the specified {@link CompositeData} value
    * would have, if it was to be added to this {@link TabularData}
@@ -127,7 +127,7 @@ public class TabularDataSupport
    * this instance's tabular type.  The returned indices are the
    * values of the fields in the supplied {@link CompositeData}
    * instance that match the names given in the {@link TabularType}.
-   * 
+   *
    * @param val the {@link CompositeData} value whose index should
    *            be calculated.
    * @return the index the value would take on, if it were to be added.
@@ -139,8 +139,8 @@ public class TabularDataSupport
   {
     if (!(val.getCompositeType().equals(tabularType.getRowType())))
       throw new InvalidOpenTypeException("The type of the given value " +
-					 "does not match the row type " +
-					 "of this instance.");
+                                         "does not match the row type " +
+                                         "of this instance.");
     List indexNames = tabularType.getIndexNames();
     List matchingIndicies = new ArrayList(indexNames.size());
     for (String name : indexNames)
@@ -169,12 +169,12 @@ public class TabularDataSupport
     TabularDataSupport clone = null;
     try
       {
-	clone = (TabularDataSupport) super.clone();
-	clone.setMap((HashMap) dataMap.clone());
+        clone = (TabularDataSupport) super.clone();
+        clone.setMap((HashMap) dataMap.clone());
       }
     catch (CloneNotSupportedException e)
       {
-	/* This won't happen as we implement Cloneable */
+        /* This won't happen as we implement Cloneable */
       }
     return clone;
   }
@@ -336,7 +336,7 @@ public class TabularDataSupport
   {
     if (!(isKeyValid(key)))
       throw new InvalidKeyException("The key does not match the " +
-				    "tabular type of this instance.");
+                                    "tabular type of this instance.");
     return (CompositeData) dataMap.get(key);
   }
 
@@ -369,7 +369,7 @@ public class TabularDataSupport
   /**
    * Returns true if this {@link TabularData} instance
    * contains no {@link CompositeData} values.
-   * 
+   *
    * @return true if the instance is devoid of rows.
    */
   public boolean isEmpty()
@@ -391,9 +391,9 @@ public class TabularDataSupport
     CompositeType rowType = tabularType.getRowType();
     for (int a = 0; it.hasNext(); ++a)
       {
-	OpenType type = rowType.getType(it.next());
-	if (!(type.isValue(key[a])))
-	  return false;
+        OpenType type = rowType.getType(it.next());
+        if (!(type.isValue(key[a])))
+          return false;
       }
     return true;
   }
@@ -422,7 +422,7 @@ public class TabularDataSupport
    * the same index as an existing value.  The index is
    * calculated using the index names of the
    * {@link TabularType} for this instance.
-   * 
+   *
    * @param val the {@link CompositeData} value to add.
    * @throws NullPointerException if val is
    *                              null.
@@ -438,7 +438,7 @@ public class TabularDataSupport
     Object[] key = calculateIndex(val);
     if (dataMap.containsKey(key))
       throw new KeyAlreadyExistsException("A value with this index " +
-					  "already exists.");
+                                          "already exists.");
     dataMap.put(key, val);
   }
 
@@ -476,7 +476,7 @@ public class TabularDataSupport
    * value can not be added, then none of the values should
    * be.  If the array is null or empty, the
    * method simply returns.
-   * 
+   *
    * @param vals the {@link CompositeData} values to add.
    * @throws NullPointerException if a value from the array is
    *                              null.
@@ -496,12 +496,12 @@ public class TabularDataSupport
     Map mapToAdd = new HashMap(vals.length);
     for (int a = 0; a < vals.length; ++a)
       {
-	Object[] key = calculateIndex(vals[a]);
-	if (dataMap.containsKey(key))
-	  throw new KeyAlreadyExistsException("Element " + a + ": A " +
-					      "value with this index " +
-					      "already exists.");
-	mapToAdd.put(key, vals[a]);
+        Object[] key = calculateIndex(vals[a]);
+        if (dataMap.containsKey(key))
+          throw new KeyAlreadyExistsException("Element " + a + ": A " +
+                                              "value with this index " +
+                                              "already exists.");
+        mapToAdd.put(key, vals[a]);
       }
     dataMap.putAll(mapToAdd);
   }
@@ -541,7 +541,7 @@ public class TabularDataSupport
     Iterator it = vals.iterator();
     for (int a = 0; it.hasNext(); ++a)
       {
-	data[a] = (CompositeData) it.next();
+        data[a] = (CompositeData) it.next();
       }
     putAll(data);
   }
@@ -583,7 +583,7 @@ public class TabularDataSupport
   {
     if (!(isKeyValid(key)))
       throw new InvalidKeyException("The key does not match the " +
-				    "tabular type of this instance.");
+                                    "tabular type of this instance.");
     return (CompositeData) dataMap.remove(key);
   }
 
@@ -622,11 +622,11 @@ public class TabularDataSupport
   public String toString()
   {
     return getClass().getName()
-      + "[tabularType=" + tabularType 
+      + "[tabularType=" + tabularType
       + ",dataMap=" + dataMap
       + "]";
   }
- 
+
   /**
    * Returns a collection (or bag) view of the values in this Map.  The
    * collection is backed by the map, so that changes in one show up in
@@ -646,4 +646,3 @@ public class TabularDataSupport
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/openmbean/TabularType.java b/libjava/classpath/javax/management/openmbean/TabularType.java
index 5a861d061bd..5ea22070179 100644
--- a/libjava/classpath/javax/management/openmbean/TabularType.java
+++ b/libjava/classpath/javax/management/openmbean/TabularType.java
@@ -45,7 +45,7 @@ import java.util.List;
 /**
  * The open type descriptor for instances of the
  * {@link TabularData} class.
- * 
+ *
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  * @since 1.5
  */
@@ -92,7 +92,7 @@ public class TabularType
    * The result of TabularData.class.getName() is adopted
    * as the class name (see {@link OpenType}).  The ordering of the array
    * elements is relevant in determining the indicies of the values in the
-   * table, and thus in the use of the 
+   * table, and thus in the use of the
    * {@link TabularData#get(java.lang.Object[])} and
    * {@link TabularData#remove(java.lang.Object[])} methods of the
    * {@link TabularData} class.
@@ -108,7 +108,7 @@ public class TabularType
    *                           name in the given row type.
    */
   public TabularType(String name, String desc, CompositeType rowType,
-		     String[] indexNames)
+                     String[] indexNames)
     throws OpenDataException
   {
     super(TabularData.class.getName(), name, desc);
@@ -116,16 +116,16 @@ public class TabularType
       throw new IllegalArgumentException("A null row type was given.");
     for (int a = 0; a < indexNames.length; ++a)
       {
-	if (indexNames[a] == null)
-	  throw new IllegalArgumentException("Name " + a +
-					     " is null.");
-	if (indexNames[a].length() == 0)
-	  throw new IllegalArgumentException("Name " + a + 
-					     " is the empty string.");
-	if (!(rowType.containsKey(indexNames[a])))
-	  throw new OpenDataException("No matching key for " +
-				      indexNames[a] + " was found in " +
-				      "the supplied row type.");
+        if (indexNames[a] == null)
+          throw new IllegalArgumentException("Name " + a +
+                                             " is null.");
+        if (indexNames[a].length() == 0)
+          throw new IllegalArgumentException("Name " + a +
+                                             " is the empty string.");
+        if (!(rowType.containsKey(indexNames[a])))
+          throw new OpenDataException("No matching key for " +
+                                      indexNames[a] + " was found in " +
+                                      "the supplied row type.");
       }
     this.rowType = rowType;
     this.indexNames = Collections.unmodifiableList(Arrays.asList(indexNames));
@@ -144,7 +144,7 @@ public class TabularType
    * 
                  • The row types are equal.
                    • 
    * 
                  • The index names are equal and in the same order.
                    • 
    * 
-   * 
+   *
    * @param obj the object to compare with.
    * @return true if the conditions above hold.
    */
@@ -154,8 +154,8 @@ public class TabularType
       return false;
     TabularType ttype = (TabularType) obj;
     return  (ttype.getTypeName().equals(getTypeName())
-	     && (ttype.getRowType().equals(getRowType()))
-	     && (ttype.getIndexNames().equals(getIndexNames())));
+             && (ttype.getRowType().equals(getRowType()))
+             && (ttype.getIndexNames().equals(getIndexNames())));
   }
 
   /**
@@ -205,16 +205,16 @@ public class TabularType
   {
     if (hashCode == null)
       {
-	int elementTotal = 0;
-	for (String s : indexNames)
-	  elementTotal += s.hashCode();
-	hashCode = Integer.valueOf(elementTotal 
-				   + getTypeName().hashCode()
-				   + rowType.hashCode());
+        int elementTotal = 0;
+        for (String s : indexNames)
+          elementTotal += s.hashCode();
+        hashCode = Integer.valueOf(elementTotal
+                                   + getTypeName().hashCode()
+                                   + rowType.hashCode());
       }
     return hashCode.intValue();
   }
-			       
+
   /**
    * Returns true if the specified object is a member of this
    * tabular type.  The object is judged to be so if it is
@@ -229,8 +229,8 @@ public class TabularType
   {
     if (obj instanceof TabularData)
       {
-	TabularData data = (TabularData) obj;
-	return equals(data.getTabularType());
+        TabularData data = (TabularData) obj;
+        return equals(data.getTabularType());
       }
     return false;
   }
@@ -258,10 +258,10 @@ public class TabularType
   {
     if (string == null)
       string = getClass().getName()
-	+ "[name=" + getTypeName()
-	+ ", rowType=" + rowType
-	+ ", indexNames=" + indexNames
-	+ "]";
+        + "[name=" + getTypeName()
+        + ", rowType=" + rowType
+        + ", indexNames=" + indexNames
+        + "]";
     return string;
   }
 
diff --git a/libjava/classpath/javax/management/remote/NotificationResult.java b/libjava/classpath/javax/management/remote/NotificationResult.java
index c0b2d9ba1a6..09945f06ee7 100644
--- a/libjava/classpath/javax/management/remote/NotificationResult.java
+++ b/libjava/classpath/javax/management/remote/NotificationResult.java
@@ -101,14 +101,14 @@ public class NotificationResult
    *                                  null.
    */
   public NotificationResult(long startSeqNumber, long nextSeqNumber,
-			    TargetedNotification[] notifications)
+                            TargetedNotification[] notifications)
   {
     if (startSeqNumber < 0)
       throw new IllegalArgumentException("Starting sequence number is " +
-					 "less than 0.");
+                                         "less than 0.");
     if (nextSeqNumber < 0)
       throw new IllegalArgumentException("Next sequence number is " +
-					 "less than 0.");
+                                         "less than 0.");
     if (notifications == null)
       throw new IllegalArgumentException("The array of notifications is null.");
     earliestSequenceNumber = startSeqNumber;
@@ -158,7 +158,7 @@ public class NotificationResult
   {
     return getClass().getName() +
       "[earliestSequenceNumber=" + earliestSequenceNumber +
-      ",nextSequenceNumber=" + nextSequenceNumber + 
+      ",nextSequenceNumber=" + nextSequenceNumber +
       ",targetedNotifications=" + targetedNotifications +
       "]";
   }
diff --git a/libjava/classpath/javax/management/remote/TargetedNotification.java b/libjava/classpath/javax/management/remote/TargetedNotification.java
index c383c9184c0..07246189f37 100644
--- a/libjava/classpath/javax/management/remote/TargetedNotification.java
+++ b/libjava/classpath/javax/management/remote/TargetedNotification.java
@@ -124,4 +124,3 @@ public class TargetedNotification
   }
 
 }
-
diff --git a/libjava/classpath/javax/management/remote/rmi/RMIConnection.java b/libjava/classpath/javax/management/remote/rmi/RMIConnection.java
index 430f1c7dc97..434051d58ac 100644
--- a/libjava/classpath/javax/management/remote/rmi/RMIConnection.java
+++ b/libjava/classpath/javax/management/remote/rmi/RMIConnection.java
@@ -154,8 +154,8 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   void addNotificationListener(ObjectName name, ObjectName listener,
-			       MarshalledObject filter, MarshalledObject passback,
-			       Subject delegationSubject)
+                               MarshalledObject filter, MarshalledObject passback,
+                               Subject delegationSubject)
     throws InstanceNotFoundException, IOException;
 
   /**
@@ -226,7 +226,7 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   Integer[] addNotificationListeners(ObjectName[] names, MarshalledObject[] filters,
-				     Subject[] delegationSubjects)
+                                     Subject[] delegationSubjects)
     throws InstanceNotFoundException, IOException;
 
   /**
@@ -254,7 +254,7 @@ public interface RMIConnection
    * using the given constructor and registers it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                    
    * 
                    
    * If the name supplied is null, then the bean is
@@ -262,7 +262,7 @@ public interface RMIConnection
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                    
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.  This may
@@ -297,14 +297,14 @@ public interface RMIConnection
    *                           not have permission to invoke this operation.
    * @throws IOException if an I/O error occurred in communicating with
    *                     the bean server.
-   */  
+   */
   @SuppressWarnings("unchecked")
   ObjectInstance createMBean(String className, ObjectName name,
-			     MarshalledObject params, String[] sig,
-			     Subject delegationSubject)
+                             MarshalledObject params, String[] sig,
+                             Subject delegationSubject)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, IOException;
 
   /**
    * 
                    
@@ -320,7 +320,7 @@ public interface RMIConnection
    * under the supplied name.  The class is loaded using the
    * given class loader.  If this argument is null,
    * then the same class loader as was used to load the server
-   * is used. 
+   * is used.
    * 
                    
    * 
                    
    * If the name supplied is null, then the bean is
@@ -328,7 +328,7 @@ public interface RMIConnection
    * The {@link MBeanRegistration#preRegister preRegister} method
    * of this interface will be used to obtain the name in this case.
    * 
                    
-   * 
+   *
    * @param className the class of the management bean, of which
    *                  an instance should be created.
    * @param name the name to register the new bean with.  This may
@@ -369,12 +369,12 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   ObjectInstance createMBean(String className, ObjectName name,
-			     ObjectName loaderName, MarshalledObject params,
-			     String[] sig, Subject delegationSubject)
+                             ObjectName loaderName, MarshalledObject params,
+                             String[] sig, Subject delegationSubject)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException,
-	   IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException,
+           IOException;
 
   /**
    * 
                    
@@ -394,7 +394,7 @@ public interface RMIConnection
    * of this interface will be used to obtain the name in this case.
    * 
                    
    * 
                    
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, ObjectName, Object[], String)
    * createMBean(className, name, loaderName, (Object[]) null,
    * (String) null)} with null parameters
@@ -434,12 +434,12 @@ public interface RMIConnection
    * @see #createMBean(String, ObjectName, ObjectName, MarshalledObject,
    *                   String[], Subject)
    */
-  ObjectInstance createMBean(String className, ObjectName name, 
-			     ObjectName loaderName, Subject delegationSubject)
+  ObjectInstance createMBean(String className, ObjectName name,
+                             ObjectName loaderName, Subject delegationSubject)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, InstanceNotFoundException,
-	   IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, InstanceNotFoundException,
+           IOException;
 
   /**
    * 
                    
@@ -449,7 +449,7 @@ public interface RMIConnection
    * using the default constructor and registering it with the server
    * under the supplied name.  The class is loaded using the
    * {@link javax.management.loading.ClassLoaderRepository default
-   * loader repository} of the server. 
+   * loader repository} of the server.
    * 
                    
    * 
                    
    * If the name supplied is null, then the bean is
@@ -458,7 +458,7 @@ public interface RMIConnection
    * of this interface will be used to obtain the name in this case.
    * 
                    
    * 
                    
-   * This method is equivalent to calling {@link 
+   * This method is equivalent to calling {@link
    * #createMBean(String, ObjectName, Object[], String[])
    * createMBean(className, name, (Object[]) null,
    * (String[]) null)} with null parameters
@@ -495,10 +495,10 @@ public interface RMIConnection
    * @see #createMBean(String, ObjectName, MarshalledObject, String[], Subject)
    */
   ObjectInstance createMBean(String className, ObjectName name,
-			     Subject delegationSubject)
+                             Subject delegationSubject)
     throws ReflectionException, InstanceAlreadyExistsException,
-	   MBeanRegistrationException, MBeanException,
-	   NotCompliantMBeanException, IOException;
+           MBeanRegistrationException, MBeanException,
+           NotCompliantMBeanException, IOException;
 
   /**
    * 
                    
@@ -552,8 +552,8 @@ public interface RMIConnection
    * @throws IOException if an I/O error occurs.
    */
   NotificationResult fetchNotifications(long sequenceNumber,
-					int maxNotifications,
-					long timeout)
+                                        int maxNotifications,
+                                        long timeout)
     throws IOException;
 
   /**
@@ -587,8 +587,8 @@ public interface RMIConnection
    */
   Object getAttribute(ObjectName bean, String name, Subject delegationSubject)
     throws MBeanException, AttributeNotFoundException,
-	   InstanceNotFoundException, ReflectionException,
-	   IOException;
+           InstanceNotFoundException, ReflectionException,
+           IOException;
 
   /**
    * Handles {@link
@@ -616,13 +616,13 @@ public interface RMIConnection
    * @see DynamicMBean#getAttributes(String[])
    */
   AttributeList getAttributes(ObjectName bean, String[] names,
-			      Subject delegationSubject)
+                              Subject delegationSubject)
     throws InstanceNotFoundException, ReflectionException,
-	   IOException;
+           IOException;
 
   /**
    * Returns the unique identifier for this connection to the RMI
-   * server.  
+   * server.
    *
    * @return the connection ID.
    * @throws IOException if an I/O error occurred.
@@ -707,7 +707,7 @@ public interface RMIConnection
    */
   MBeanInfo getMBeanInfo(ObjectName name, Subject delegationSubject)
     throws InstanceNotFoundException, IntrospectionException,
-	   ReflectionException, IOException;
+           ReflectionException, IOException;
 
   /**
    * Handles {@link
@@ -769,9 +769,9 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   Object invoke(ObjectName bean, String name, MarshalledObject params,
-		String[] sig, Subject delegationSubject)
+                String[] sig, Subject delegationSubject)
     throws InstanceNotFoundException, MBeanException,
-	   ReflectionException, IOException;
+           ReflectionException, IOException;
 
   /**
    * 
                    
@@ -790,7 +790,7 @@ public interface RMIConnection
    * 
                  • Both the class of B and C were loaded by the same class loader,
    * and B is assignable to C.
                    • 
    * 
-   * 
+   *
    * @param name the name of the management bean.
    * @param className the name of the class to test if name is
    *                  an instance of.
@@ -807,7 +807,7 @@ public interface RMIConnection
    *                     the bean server.
    */
   boolean isInstanceOf(ObjectName name, String className,
-		       Subject delegationSubject)
+                       Subject delegationSubject)
     throws InstanceNotFoundException, IOException;
 
   /**
@@ -852,7 +852,7 @@ public interface RMIConnection
    * 
                    
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                    
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -873,9 +873,9 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   Set queryMBeans(ObjectName name, MarshalledObject query,
-				  Subject delegationSubject)
+                                  Subject delegationSubject)
     throws IOException;
-  
+
   /**
    * 
                    
    * Handles {@link
@@ -896,7 +896,7 @@ public interface RMIConnection
    * 
                    
    * If both the object name and the query expression are null,
    * or the object name has no domain and no key properties,
-   * no filtering will be performed and all beans are returned. 
+   * no filtering will be performed and all beans are returned.
    * 
                    
    *
    * @param name an {@link ObjectName} to use as a filter.
@@ -916,7 +916,7 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   Set queryNames(ObjectName name, MarshalledObject query,
-			     Subject delegationSubject)
+                             Subject delegationSubject)
     throws IOException;
 
   /**
@@ -962,12 +962,12 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   void removeNotificationListener(ObjectName name,
-				  ObjectName listener,
-				  MarshalledObject filter,
-				  MarshalledObject passback,
-				  Subject delegationSubject)
+                                  ObjectName listener,
+                                  MarshalledObject filter,
+                                  MarshalledObject passback,
+                                  Subject delegationSubject)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Handles {@link
@@ -998,9 +998,9 @@ public interface RMIConnection
    * @see NotificationBroadcaster#removeNotificationListener(NotificationListener)
    */
   void removeNotificationListener(ObjectName name, ObjectName listener,
-				  Subject delegationSubject)
+                                  Subject delegationSubject)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Removes one or more {@link NotificationListener}s from the specified
@@ -1014,7 +1014,7 @@ public interface RMIConnection
    * identifiers provided by the
    * {@link #addNotificationListeners(ObjectName[], MarshalledObject[],
    * Subject)} method to select the listeners to remove.
-   * 
+   *
    * @param name the name of the management bean from which the
    *             listeners should be removed.
    * @param listenerIds the identifiers of the listeners to remove.
@@ -1036,9 +1036,9 @@ public interface RMIConnection
    * @see #addNotificationListeners(ObjectName[], MarshalledObject[], Subject)
    */
   void removeNotificationListeners(ObjectName name, Integer[] listenerIds,
-				   Subject delegationSubject)
+                                   Subject delegationSubject)
     throws InstanceNotFoundException, ListenerNotFoundException,
-	   IOException;
+           IOException;
 
   /**
    * Handles {@link
@@ -1082,10 +1082,10 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   void setAttribute(ObjectName name, MarshalledObject attribute,
-		    Subject delegationSubject)
+                    Subject delegationSubject)
     throws InstanceNotFoundException, AttributeNotFoundException,
-	   InvalidAttributeValueException, MBeanException,
-	   ReflectionException, IOException;
+           InvalidAttributeValueException, MBeanException,
+           ReflectionException, IOException;
 
   /**
    * Handles {@link
@@ -1123,9 +1123,9 @@ public interface RMIConnection
    */
   @SuppressWarnings("unchecked")
   AttributeList setAttributes(ObjectName name, MarshalledObject attributes,
-			      Subject delegationSubject)
+                              Subject delegationSubject)
     throws InstanceNotFoundException, ReflectionException,
-	   IOException;
+           IOException;
 
   /**
    * Handles {@link
@@ -1153,9 +1153,9 @@ public interface RMIConnection
    *                           not have permission to invoke this operation.
    * @throws IOException if an I/O error occurred in communicating with
    *                     the bean server.
-   */ 
+   */
   void unregisterMBean(ObjectName name, Subject delegationSubject)
     throws InstanceNotFoundException, MBeanRegistrationException,
-	   IOException;
+           IOException;
 
 }
diff --git a/libjava/classpath/javax/naming/AuthenticationException.java b/libjava/classpath/javax/naming/AuthenticationException.java
index 1a6ade93055..36310d3ade2 100644
--- a/libjava/classpath/javax/naming/AuthenticationException.java
+++ b/libjava/classpath/javax/naming/AuthenticationException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class AuthenticationException extends NamingSecurityException
 {
   private static final long serialVersionUID = 3678497619904568096L;
diff --git a/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java b/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
index a1e811b44dc..9ebda40bb5a 100644
--- a/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
+++ b/libjava/classpath/javax/naming/AuthenticationNotSupportedException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class AuthenticationNotSupportedException
   extends NamingSecurityException
 {
diff --git a/libjava/classpath/javax/naming/BinaryRefAddr.java b/libjava/classpath/javax/naming/BinaryRefAddr.java
index 923c48e2368..373802a8cfe 100644
--- a/libjava/classpath/javax/naming/BinaryRefAddr.java
+++ b/libjava/classpath/javax/naming/BinaryRefAddr.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -53,7 +53,7 @@ import java.util.Arrays;
 public class BinaryRefAddr extends RefAddr
 {
   static final long serialVersionUID = -3415254970957330361L;
-	
+
   /**
    * The possibly null content of this RefAddr.
    * Set by the constructor and returned by getContent.
@@ -109,7 +109,7 @@ public class BinaryRefAddr extends RefAddr
         {
           byte[] c1 = (byte[]) this.getContent();
           byte[] c2 = (byte[]) refAddr.getContent();
-	  return Arrays.equals(c1, c2);
+          return Arrays.equals(c1, c2);
         }
       }
     return false;
@@ -133,7 +133,7 @@ public class BinaryRefAddr extends RefAddr
   }
 
   private static char[] hex = {'0', '1', '2', '3', '4', '5', '6', '7',
-			       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+                               '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
   /**
    * Returns a String representation of the RefAddr. Only the first 32 bytes
    * of the content are added as hex encoded characters.
@@ -147,8 +147,8 @@ public class BinaryRefAddr extends RefAddr
     byte[] b = (byte[]) getContent();
     for (int i=0; i < b.length && i < 32; i++)
       {
-	sb.append(hex[(b[i]&0xf0)>>4]);
-	sb.append(hex[b[i]&0x0f]);
+        sb.append(hex[(b[i]&0xf0)>>4]);
+        sb.append(hex[b[i]&0x0f]);
       }
     if (b.length > 32)
       sb.append("...");
diff --git a/libjava/classpath/javax/naming/Binding.java b/libjava/classpath/javax/naming/Binding.java
index a34f8b3292c..23bb4592e1b 100644
--- a/libjava/classpath/javax/naming/Binding.java
+++ b/libjava/classpath/javax/naming/Binding.java
@@ -39,14 +39,14 @@ exception statement from your version. */
 package javax.naming;
 
 /**
- * Binding represents the name-object mapping of a 
+ * Binding represents the name-object mapping of a
  * binding in a context.
  * 
                    
  * Bindings are mappings of a name to an object and this class is used to
  * specify such mappings. The bindings of a context are retrieved by the
  * Context#listBindings() methods.
  * 
                    
- * 
+ *
  * @author Tom Tromey (tromey@redhat.com)
  * @since 1.3
  */
@@ -56,7 +56,7 @@ public class Binding extends NameClassPair
 
   /**
    * Constructs an instance with the given name and object.
-   * 
+   *
    * @param name the name of the binding relative to the target context
    * (may not be null)
    * @param obj the bound object
@@ -68,9 +68,9 @@ public class Binding extends NameClassPair
   }
 
   /**
-   * Constructs an instance with the given name and object and a 
+   * Constructs an instance with the given name and object and a
    * flag indicating if the name is relative to the target context.
-   * 
+   *
    * @param name the name of the binding relative to the target context
    * (may not be null)
    * @param obj the bound object
@@ -84,7 +84,7 @@ public class Binding extends NameClassPair
 
   /**
    * Constructs an instance with the given name, classname and object.
-   * 
+   *
    * @param name the name of the binding relative to the target context
    * (may not be null)
    * @param className the classname to set (maybe null)
@@ -97,9 +97,9 @@ public class Binding extends NameClassPair
   }
 
   /**
-   * Constructs an instance with the given name, classname, object and a 
+   * Constructs an instance with the given name, classname, object and a
    * flag indicating if the name is relative to the target context.
-   * 
+   *
    * @param name the name of the binding relative to the target context
    * (may not be null)
    * @param className the classname to set (maybe null)
@@ -107,7 +107,7 @@ public class Binding extends NameClassPair
    * @param obj the bound object
    */
   public Binding (String name, String className, Object obj,
-		  boolean isRelative)
+                  boolean isRelative)
   {
     super (name, className, isRelative);
     boundObj = obj;
@@ -119,7 +119,7 @@ public class Binding extends NameClassPair
    * Returns the classname if set explicitly. If not and the bound object is
    * not null the classname of the bound object is used.
    * 
                    
-   * 
+   *
    * @return The fully qualified classname (may be null).
    */
   public String getClassName ()
@@ -150,7 +150,7 @@ public class Binding extends NameClassPair
 
   /**
    * Returns the string representation.
-   * @return The string as given by the NameClassPair superclass plus 
+   * @return The string as given by the NameClassPair superclass plus
    * the bound objects string representation seperated by a colon.
    */
   public String toString ()
diff --git a/libjava/classpath/javax/naming/CannotProceedException.java b/libjava/classpath/javax/naming/CannotProceedException.java
index bc2085879cc..26b1d0b0ca8 100644
--- a/libjava/classpath/javax/naming/CannotProceedException.java
+++ b/libjava/classpath/javax/naming/CannotProceedException.java
@@ -35,11 +35,11 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
 import java.util.Hashtable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 14, 2001
diff --git a/libjava/classpath/javax/naming/CommunicationException.java b/libjava/classpath/javax/naming/CommunicationException.java
index 7b11b5fac81..485e5cd1dfc 100644
--- a/libjava/classpath/javax/naming/CommunicationException.java
+++ b/libjava/classpath/javax/naming/CommunicationException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class CommunicationException extends NamingException
 {
   private static final long serialVersionUID = 3618507780299986611L;
diff --git a/libjava/classpath/javax/naming/CompositeName.java b/libjava/classpath/javax/naming/CompositeName.java
index 4593bae631a..7d4d362bd64 100644
--- a/libjava/classpath/javax/naming/CompositeName.java
+++ b/libjava/classpath/javax/naming/CompositeName.java
@@ -53,14 +53,14 @@ import java.util.Vector;
  * the composite name http://www.gnu.org/software/classpath/index.html spans
  * over three namespaces (the protocol http, the web server location
  * (www.gnu.org) and the index.html location on the server).
- * 
+ *
  * @author Tom Tromey (tromey@redhat.com)
  */
 public class CompositeName implements Name, Cloneable, Serializable
 {
   private static final long serialVersionUID = 1667768148915813118L;
-  
-  private transient Vector elts;  
+
+  private transient Vector elts;
 
   public CompositeName ()
   {
@@ -72,8 +72,8 @@ public class CompositeName implements Name, Cloneable, Serializable
     elts = new Vector ();
     try
       {
-	while (comps.hasMoreElements ())
-	  elts.add (comps.nextElement ());
+        while (comps.hasMoreElements ())
+          elts.add (comps.nextElement ());
       }
     catch (NoSuchElementException ignore)
       {
@@ -84,49 +84,49 @@ public class CompositeName implements Name, Cloneable, Serializable
   {
     elts = new Vector ();
     // Parse the string into its components.
-    final char no_quote = 'x';	// Use 'x' to mean no quoting.
+    final char no_quote = 'x';  // Use 'x' to mean no quoting.
     char quote = no_quote;
     boolean escaped = false;
     StringBuilder new_element = new StringBuilder ();
     for (int i = 0; i < n.length (); ++i)
       {
-	char c = n.charAt (i);
-	if (escaped)
-	  escaped = false;
-	else if (c == '\\')
-	  {
-	    escaped = true;
-	    continue;
-	  }
-	else if (quote != no_quote)
-	  {
-	    if (quote == c)
-	      {
-		// The quotes must surround a complete component.
-		if (i + 1 < n.length () && n.charAt (i + 1) != '/')
-		  throw new InvalidNameException ("close quote before end of component");
-		elts.add (new_element.toString ());
-		new_element.setLength (0);
-		quote = no_quote;
-		continue;
-	      }
-	    // Otherwise, fall through.
-	  }
-	// Quotes are only special at the start of a component.
-	else if (new_element.length () == 0
-		 && (c == '\'' || c == '"'))
-	  {
-	    quote = c;
-	    continue;
-	  }
-	else if (c == '/')
-	  {
-	    elts.add (new_element.toString ());
-	    new_element.setLength (0);
-	    continue;
-	  }
+        char c = n.charAt (i);
+        if (escaped)
+          escaped = false;
+        else if (c == '\\')
+          {
+            escaped = true;
+            continue;
+          }
+        else if (quote != no_quote)
+          {
+            if (quote == c)
+              {
+                // The quotes must surround a complete component.
+                if (i + 1 < n.length () && n.charAt (i + 1) != '/')
+                  throw new InvalidNameException ("close quote before end of component");
+                elts.add (new_element.toString ());
+                new_element.setLength (0);
+                quote = no_quote;
+                continue;
+              }
+            // Otherwise, fall through.
+          }
+        // Quotes are only special at the start of a component.
+        else if (new_element.length () == 0
+                 && (c == '\'' || c == '"'))
+          {
+            quote = c;
+            continue;
+          }
+        else if (c == '/')
+          {
+            elts.add (new_element.toString ());
+            new_element.setLength (0);
+            continue;
+          }
 
-	new_element.append (c);
+        new_element.append (c);
       }
 
     if (new_element.length () != 0)
@@ -156,11 +156,11 @@ public class CompositeName implements Name, Cloneable, Serializable
     Enumeration e = n.getAll ();
     try
       {
-	while (e.hasMoreElements ())
-	  {
-	    elts.add (posn, e.nextElement ());
-	    ++posn;
-	  }
+        while (e.hasMoreElements ())
+          {
+            elts.add (posn, e.nextElement ());
+            ++posn;
+          }
       }
     catch (NoSuchElementException ignore)
       {
@@ -173,8 +173,8 @@ public class CompositeName implements Name, Cloneable, Serializable
     Enumeration e = suffix.getAll ();
     try
       {
-	while (e.hasMoreElements ())
-	  elts.add (e.nextElement ());
+        while (e.hasMoreElements ())
+          elts.add (e.nextElement ());
       }
     catch (NoSuchElementException ignore)
       {
@@ -195,10 +195,10 @@ public class CompositeName implements Name, Cloneable, Serializable
     int last = Math.min (cn.elts.size (), elts.size ());
     for (int i = 0; i < last; ++i)
       {
-	String f = elts.get (i);
-	int comp = f.compareTo (cn.elts.get (i));
-	if (comp != 0)
-	  return comp;
+        String f = elts.get (i);
+        int comp = f.compareTo (cn.elts.get (i));
+        if (comp != 0)
+          return comp;
       }
     return elts.size () - cn.elts.size ();
   }
@@ -213,8 +213,8 @@ public class CompositeName implements Name, Cloneable, Serializable
     int delta = elts.size () - cn.elts.size ();
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	if (! cn.elts.get (i).equals (elts.get (delta + i)))
-	  return false;
+        if (! cn.elts.get (i).equals (elts.get (delta + i)))
+          return false;
       }
     return true;
   }
@@ -288,8 +288,8 @@ public class CompositeName implements Name, Cloneable, Serializable
       return false;
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	if (! cn.elts.get (i).equals (elts.get (i)))
-	  return false;
+        if (! cn.elts.get (i).equals (elts.get (i)))
+          return false;
       }
     return true;
   }
@@ -299,33 +299,33 @@ public class CompositeName implements Name, Cloneable, Serializable
     CPStringBuilder result = new CPStringBuilder ();
     for (int i = 0; i < elts.size (); ++i)
       {
-	// For simplicity we choose to always quote using escapes and
-	// never quotes.
-	String elt = elts.get (i);
-	if (i > 0
-	    || (i == elts.size () - 1 && elt.equals ("")))
-	  result.append ('/');
-	for (int k = 0; k < elt.length (); ++k)
-	  {
-	    char c = elt.charAt (k);
-	    // We must quote
-	    //     ... a leading quote,
-	    if ((k == 0 && (c == '"' || c == '\''))
-		// ... an escape preceding a meta character,
-		//     or at the end of a component,
-		|| (c == '\\'
-		    && (k == elt.length () - 1
-			|| "\\'\"/".indexOf (elt.charAt (k + 1)) != -1))
-		// ... or a component separator.
-		|| c == '/')
-	      result.append ('\\');
-	    result.append (c);
-	  }
+        // For simplicity we choose to always quote using escapes and
+        // never quotes.
+        String elt = elts.get (i);
+        if (i > 0
+            || (i == elts.size () - 1 && elt.equals ("")))
+          result.append ('/');
+        for (int k = 0; k < elt.length (); ++k)
+          {
+            char c = elt.charAt (k);
+            // We must quote
+            //     ... a leading quote,
+            if ((k == 0 && (c == '"' || c == '\''))
+                // ... an escape preceding a meta character,
+                //     or at the end of a component,
+                || (c == '\\'
+                    && (k == elt.length () - 1
+                        || "\\'\"/".indexOf (elt.charAt (k + 1)) != -1))
+                // ... or a component separator.
+                || c == '/')
+              result.append ('\\');
+            result.append (c);
+          }
       }
     return result.toString ();
   }
-  
-  private void readObject(ObjectInputStream s) 
+
+  private void readObject(ObjectInputStream s)
     throws IOException, ClassNotFoundException
   {
     int size = s.readInt();
diff --git a/libjava/classpath/javax/naming/CompoundName.java b/libjava/classpath/javax/naming/CompoundName.java
index 26b44c16fdb..d410f6a97ad 100644
--- a/libjava/classpath/javax/naming/CompoundName.java
+++ b/libjava/classpath/javax/naming/CompoundName.java
@@ -52,8 +52,8 @@ import java.util.Vector;
 /**
  * Represents hierarchical names from the single namespace. For instance,
  * the path /home/audriusa/classpath/file.txt is the compound name, using
- * the filesystem namespace. 
- * 
+ * the filesystem namespace.
+ *
  * @author Tom Tromey (tromey@redhat.com)
  * @date May 16, 2001
  *
@@ -82,8 +82,8 @@ public class CompoundName implements Name, Cloneable, Serializable
     initializeSyntax ();
     try
       {
-	while (comps.hasMoreElements ())
-	  elts.add (comps.nextElement ());
+        while (comps.hasMoreElements ())
+          elts.add (comps.nextElement ());
       }
     catch (NoSuchElementException ignore)
       {
@@ -104,79 +104,79 @@ public class CompoundName implements Name, Cloneable, Serializable
     String quote = null;
     while (i < n.length ())
       {
-	String special = isSpecial (n, i);
+        String special = isSpecial (n, i);
 
-	if (special == escape && escape != null)
-	  {
-	    if (n.length () == i + special.length ())
-	      {
-		// A trailing escape is treated as itself.
-		new_element.append (special);
-		i += special.length ();
-	      }
-	    else
-	      {
-		String eSpecial = isSpecial (n, i + special.length ());
-		if (eSpecial != null)
-		  {
-		    // Treat the escape as an escape.
-		    new_element.append (eSpecial);
-		    i += special.length () + eSpecial.length ();
-		  }
-		else
-		  {
-		    // Treat the escape as itself.
-		    new_element.append (special);
-		    i += special.length ();
-		  }
-		continue;
-	      }
-	  }
-	else if (quote != null)
-	  {
-	    // It is safe to use == here.
-	    if (quote == special)
-	      {
-		// Quotes must surround a complete component.
-		if (i + quote.length () < n.length ()
-		    && ! n.startsWith (separator, i + quote.length ()))
-		  throw new InvalidNameException ("close quote before end of component");
-		elts.add (new_element.toString ());
-		new_element.setLength (0);
-		i += quote.length ();
-		quote = null;
-		continue;
-	      }
-	    // Otherwise, fall through.
-	  }
-	// Quotes are only special at the start of a component.
-	else if (new_element.length () == 0
-		 && special == beginQuote
-		 && beginQuote != null)
-	  {
-	    quote = endQuote;
-	    i += special.length ();
-	    continue;
-	  }
-	else if (new_element.length () == 0
-		 && special == beginQuote2
-		 && beginQuote2 != null)
-	  {
-	    quote = endQuote2;
-	    i += special.length ();
-	    continue;
-	  }
-	else if (direction != FLAT && special == separator)
-	  {
-	    elts.add (new_element.toString ());
-	    new_element.setLength (0);
-	    i += special.length ();
-	    continue;
-	  }
+        if (special == escape && escape != null)
+          {
+            if (n.length () == i + special.length ())
+              {
+                // A trailing escape is treated as itself.
+                new_element.append (special);
+                i += special.length ();
+              }
+            else
+              {
+                String eSpecial = isSpecial (n, i + special.length ());
+                if (eSpecial != null)
+                  {
+                    // Treat the escape as an escape.
+                    new_element.append (eSpecial);
+                    i += special.length () + eSpecial.length ();
+                  }
+                else
+                  {
+                    // Treat the escape as itself.
+                    new_element.append (special);
+                    i += special.length ();
+                  }
+                continue;
+              }
+          }
+        else if (quote != null)
+          {
+            // It is safe to use == here.
+            if (quote == special)
+              {
+                // Quotes must surround a complete component.
+                if (i + quote.length () < n.length ()
+                    && ! n.startsWith (separator, i + quote.length ()))
+                  throw new InvalidNameException ("close quote before end of component");
+                elts.add (new_element.toString ());
+                new_element.setLength (0);
+                i += quote.length ();
+                quote = null;
+                continue;
+              }
+            // Otherwise, fall through.
+          }
+        // Quotes are only special at the start of a component.
+        else if (new_element.length () == 0
+                 && special == beginQuote
+                 && beginQuote != null)
+          {
+            quote = endQuote;
+            i += special.length ();
+            continue;
+          }
+        else if (new_element.length () == 0
+                 && special == beginQuote2
+                 && beginQuote2 != null)
+          {
+            quote = endQuote2;
+            i += special.length ();
+            continue;
+          }
+        else if (direction != FLAT && special == separator)
+          {
+            elts.add (new_element.toString ());
+            new_element.setLength (0);
+            i += special.length ();
+            continue;
+          }
 
-	// Nothing in particular, so try the next character.
-	new_element.append (n.charAt (i));
-	++i;
+        // Nothing in particular, so try the next character.
+        new_element.append (n.charAt (i));
+        ++i;
       }
 
     if (new_element.length () != 0)
@@ -184,13 +184,13 @@ public class CompoundName implements Name, Cloneable, Serializable
 
     if (direction == RIGHT_TO_LEFT)
       {
-	// Reverse the order of the elements.
-	int len = elts.size ();
-	for (i = 0; i < len / 2; ++i)
-	  {
-	    String t = elts.set (i, elts.get (len - i - 1));
-	    elts.set (len - i - 1, t);
-	  }
+        // Reverse the order of the elements.
+        int len = elts.size ();
+        for (i = 0; i < len / 2; ++i)
+          {
+            String t = elts.set (i, elts.get (len - i - 1));
+            elts.set (len - i - 1, t);
+          }
       }
 
     // Error checking.
@@ -215,11 +215,11 @@ public class CompoundName implements Name, Cloneable, Serializable
     Enumeration e = n.getAll ();
     try
       {
-	while (e.hasMoreElements ())
-	  {
-	    elts.add (posn, e.nextElement ());
-	    ++posn;
-	  }
+        while (e.hasMoreElements ())
+          {
+            elts.add (posn, e.nextElement ());
+            ++posn;
+          }
       }
     catch (NoSuchElementException ignore)
       {
@@ -232,8 +232,8 @@ public class CompoundName implements Name, Cloneable, Serializable
     Enumeration e = suffix.getAll ();
     try
       {
-	while (e.hasMoreElements ())
-	  elts.add (e.nextElement ());
+        while (e.hasMoreElements ())
+          elts.add (e.nextElement ());
       }
     catch (NoSuchElementException ignore)
       {
@@ -254,10 +254,10 @@ public class CompoundName implements Name, Cloneable, Serializable
     int last = Math.min (cn.elts.size (), elts.size ());
     for (int i = 0; i < last; ++i)
       {
-	String f = canonicalize (elts.get (i));
-	int comp = f.compareTo (canonicalize (cn.elts.get (i)));
-	if (comp != 0)
-	  return comp;
+        String f = canonicalize (elts.get (i));
+        int comp = f.compareTo (canonicalize (cn.elts.get (i)));
+        if (comp != 0)
+          return comp;
       }
     return elts.size () - cn.elts.size ();
   }
@@ -272,9 +272,9 @@ public class CompoundName implements Name, Cloneable, Serializable
     int delta = elts.size () - cn.elts.size ();
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	String f = canonicalize (elts.get (delta + i));
-	if (! f.equals (canonicalize (cn.elts.get (i))))
-	  return false;
+        String f = canonicalize (elts.get (delta + i));
+        if (! f.equals (canonicalize (cn.elts.get (i))))
+          return false;
       }
     return true;
   }
@@ -346,9 +346,9 @@ public class CompoundName implements Name, Cloneable, Serializable
       return false;
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	String f = canonicalize (elts.get (i));
-	if (! f.equals (canonicalize (cn.elts.get (i))))
-	  return false;
+        String f = canonicalize (elts.get (i));
+        if (! f.equals (canonicalize (cn.elts.get (i))))
+          return false;
       }
     return true;
   }
@@ -368,7 +368,7 @@ public class CompoundName implements Name, Cloneable, Serializable
     else if (endQuote != null && element.startsWith (endQuote, offset))
       special = endQuote;
     else if (beginQuote2 != null
-	     && element.startsWith (beginQuote2, offset))
+             && element.startsWith (beginQuote2, offset))
       special = beginQuote2;
     else if (endQuote2 != null && element.startsWith (endQuote2, offset))
       special = endQuote2;
@@ -382,30 +382,30 @@ public class CompoundName implements Name, Cloneable, Serializable
     int size = elts.size ();
     for (int i = 0; i < size; ++i)
       {
-	// Find the appropriate element.  FIXME: not clear what FLAT
-	// means.
-	int offset = (direction == RIGHT_TO_LEFT) ? (size - i - 1) : i;
-	String element = elts.get (offset);
-	if (i > 0
-	    || (i == size - 1 && element.equals ("")))
-	  result.append (separator);
+        // Find the appropriate element.  FIXME: not clear what FLAT
+        // means.
+        int offset = (direction == RIGHT_TO_LEFT) ? (size - i - 1) : i;
+        String element = elts.get (offset);
+        if (i > 0
+            || (i == size - 1 && element.equals ("")))
+          result.append (separator);
 
-	int k = 0;
-	while (k < element.length ())
-	  {
-	    String special = isSpecial (element, k);
-	    if (special != null)
-	      {
-		result.append (escape);
-		result.append (special);
-		k += special.length ();
-	      }
-	    else
-	      {
-		result.append (element.charAt (k));
-		++k;
-	      }
-	  }
+        int k = 0;
+        while (k < element.length ())
+          {
+            String special = isSpecial (element, k);
+            if (special != null)
+              {
+                result.append (escape);
+                result.append (special);
+                k += special.length ();
+              }
+            else
+              {
+                result.append (element.charAt (k));
+                ++k;
+              }
+          }
       }
 
     return result.toString ();
@@ -422,17 +422,17 @@ public class CompoundName implements Name, Cloneable, Serializable
 
     if (trimBlanks)
       {
-	int first = 0;
-	while (first < ret.length ()
-	       && Character.isWhitespace (ret.charAt (first)))
-	  ++first;
+        int first = 0;
+        while (first < ret.length ()
+               && Character.isWhitespace (ret.charAt (first)))
+          ++first;
 
-	int last = ret.length () - 1;
-	while (last >= first
-	       && Character.isWhitespace (ret.charAt (last)))
-	  --last;
+        int last = ret.length () - 1;
+        while (last >= first
+               && Character.isWhitespace (ret.charAt (last)))
+          --last;
 
-	ret = ret.substring (first, last);
+        ret = ret.substring (first, last);
       }
 
     return ret;
@@ -451,8 +451,8 @@ public class CompoundName implements Name, Cloneable, Serializable
       this.direction = LEFT_TO_RIGHT;
     else
       {
-	// If we don't recognize it, default to flat.
-	this.direction = FLAT;
+        // If we don't recognize it, default to flat.
+        this.direction = FLAT;
       }
 
     // This is required unless the direction is FLAT.  Unfortunately
@@ -461,18 +461,18 @@ public class CompoundName implements Name, Cloneable, Serializable
 
     this.ignoreCase
       = Boolean.valueOf (mySyntax.getProperty ("jndi.syntax.ignorecase",
-					       "false")).booleanValue ();
+                                               "false")).booleanValue ();
     this.escape = mySyntax.getProperty ("jndi.syntax.escape", null);
     this.beginQuote = mySyntax.getProperty ("jndi.syntax.beginquote", null);
     this.endQuote = mySyntax.getProperty ("jndi.syntax.endquote",
-					  this.beginQuote);
+                                          this.beginQuote);
     this.beginQuote2 = mySyntax.getProperty ("jndi.syntax.beginquote2",
-					     null);
+                                             null);
     this.endQuote2 = mySyntax.getProperty ("jndi.syntax.endquote2",
-					   this.beginQuote2);
+                                           this.beginQuote2);
     this.trimBlanks
       = Boolean.valueOf (mySyntax.getProperty ("jndi.syntax.trimblanks",
-					       "false")).booleanValue ();
+                                               "false")).booleanValue ();
   }
 
   private void readObject(ObjectInputStream s)
diff --git a/libjava/classpath/javax/naming/ConfigurationException.java b/libjava/classpath/javax/naming/ConfigurationException.java
index 1f4002aa465..eb2fbfeec2c 100644
--- a/libjava/classpath/javax/naming/ConfigurationException.java
+++ b/libjava/classpath/javax/naming/ConfigurationException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class ConfigurationException extends NamingException
 {
   private static final long serialVersionUID = - 2535156726228855704L;
diff --git a/libjava/classpath/javax/naming/Context.java b/libjava/classpath/javax/naming/Context.java
index 4b87b9e01e6..35217ffc4dc 100644
--- a/libjava/classpath/javax/naming/Context.java
+++ b/libjava/classpath/javax/naming/Context.java
@@ -127,7 +127,7 @@ public interface Context
   /**
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object.
-   * 
+   *
    * @param name the name that will be given to the object (in the scope of this
    *          context).
    * @param obj the object being named.
@@ -143,7 +143,7 @@ public interface Context
   /**
    * Give the specified name for the specified object. The passed name must not
    * be already bound to some other object.
-   * 
+   *
    * @param name the name that will be given to the object (in the scope of this
    *          context).
    * @param obj the object being named.
@@ -159,7 +159,7 @@ public interface Context
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name the name of the object being searched in this context
    * @return the named object
    * @throws NamingException if the naming fails.
@@ -169,7 +169,7 @@ public interface Context
   /**
    * Gets the previously named object by name. If the passed name is empty, the
    * method should return a cloned instance of this naming context.
-   * 
+   *
    * @param name the name of the object being searched in this context
    * @return the named object
    * @throws NamingException if the naming fails.
@@ -179,7 +179,7 @@ public interface Context
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name the name that will be given to the object (in the scope of this
    *          context).
    * @param obj the object being named.
@@ -193,7 +193,7 @@ public interface Context
   /**
    * Give the specified name for the specified object. Unlike bind, this method
    * silently replaces the existing binding for this name, if one exists.
-   * 
+   *
    * @param name the name that will be given to the object (in the scope of this
    *          context).
    * @param obj the object being named.
@@ -209,7 +209,7 @@ public interface Context
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name the name to be removed
    * @throws NameNotFoundException if one of the intermediate naming contexts
    *           does not exist. Will not be thrown if just the terminal binding
@@ -224,7 +224,7 @@ public interface Context
    * returns without action if the name is not bound to an object in the
    * terminal context, but throws {@link NameNotFoundException} if one of the
    * intermadiate contexts does not exist.
-   * 
+   *
    * @param name the name to be removed
    * @throws NameNotFoundException if one of the intermediate naming contexts
    *           does not exist. Will not be thrown if just the terminal binding
@@ -237,7 +237,7 @@ public interface Context
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName the existing name of the known object
    * @param newName the new name of the same object
    * @throws NameNotFoundException if the oldName is unknown for this context
@@ -249,7 +249,7 @@ public interface Context
   /**
    * Renames the existing binding, removing the existing and giving the new name
    * for the same object.
-   * 
+   *
    * @param oldName the existing name of the known object
    * @param newName the new name of the same object
    * @throws NameNotFoundException if the oldName is unknown for this context
@@ -265,7 +265,7 @@ public interface Context
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
    * @throws NamingException
@@ -279,7 +279,7 @@ public interface Context
    * bound object. The behaviour in the case if the bindings are added or
    * removed later is not defined. The contents of the subcontexts are not
    * included.
-   * 
+   *
    * @param name the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
    * @throws NamingException
@@ -292,7 +292,7 @@ public interface Context
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
    * @throws NamingException
@@ -305,7 +305,7 @@ public interface Context
    * {@link Binding}, providing also information about the class of the bound
    * object. The behaviour in the case if the bindings are added or removed
    * later is not defined. The contents of the subcontexts are not included.
-   * 
+   *
    * @param name the name of the subcontext
    * @return the enumeration over the names, known for the given subcontext.
    * @throws NamingException
@@ -315,7 +315,7 @@ public interface Context
   /**
    * Creates the new naming subcontext and binds it to the current (this)
    * context.
-   * 
+   *
    * @param name the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
    *         that the method has been called
@@ -329,7 +329,7 @@ public interface Context
   /**
    * Creates the new naming subcontext and binds it to the current (this)
    * context.
-   * 
+   *
    * @param name the name of the new context being created
    * @return the newly created context, bound to the instance of the context on
    *         that the method has been called
@@ -344,7 +344,7 @@ public interface Context
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param name the name of the subcontext beig removed.
    * @throws ContextNotEmptyException if the named context is not empty.
    * @throws NamingException
@@ -355,19 +355,19 @@ public interface Context
    * Removes the naming subcontext from this naming context. Returns without
    * action if such subcontext does not exist. The context being destroyed must
    * be empty.
-   * 
+   *
    * @param name the name of the subcontext beig removed.
    * @throws ContextNotEmptyException if the named context is not empty.
    * @throws NamingException
    */
   void destroySubcontext(String name) throws NamingException;
- 
+
   /**
    * Retrieves the named object, not following the link of the terminal atomic
    * component of the name. If the object, named by the passed name, is not a
    * link, returns that object itself. The intermediate links, if present, are
    * followed.
-   * 
+   *
    * @param name the name of the object that may be a link, leading to another
    *          object.
    * @return the named object, not following the terminal link (if present).
@@ -380,18 +380,18 @@ public interface Context
    * component of the name. If the object, named by the passed name, is not a
    * link, returns that object itself. The intermediate links, if present, are
    * followed.
-   * 
+   *
    * @param name the name of the object that may be a link, leading to another
    *          object.
    * @return the named object, not following the terminal link (if present).
    * @throws NamingException
    */
   Object lookupLink(String name) throws NamingException;
-  
+
   /**
    * Obtains the name parser for parsing the names of the given naming
    * subcontext.
-   * 
+   *
    * @param name the name of the subcontext for that the parser must be obtained
    * @return the parser to parse the names of that context
    * @throws NamingException
@@ -401,17 +401,17 @@ public interface Context
   /**
    * Obtains the name parser for parsing the names of the given naming
    * subcontext.
-   * 
+   *
    * @param name the name of the subcontext for that the parser must be obtained
    * @return the parser to parse the names of that context
    * @throws NamingException
    */
   NameParser getNameParser(String name) throws NamingException;
-  
+
   /**
    * Composes the name of this context together with another name, related to
    * this context.
-   * 
+   *
    * @param name a name, defined in the scope of this context
    * @param prefix a name of this context itself, defined in the scope of some
    *          ancestor
@@ -424,7 +424,7 @@ public interface Context
   /**
    * Composes the name of this context together with another name, related to
    * this context.
-   * 
+   *
    * @param name a name, defined in the scope of this context
    * @param prefix a name of this context itself, defined in the scope of some
    *          ancestor
@@ -433,12 +433,12 @@ public interface Context
    * @throws NamingException
    */
   String composeName(String name, String prefix) throws NamingException;
-  
+
   /**
    * Add new environment property to the environment of this context. Both name
    * and value of the new property must not be null. If the property is already
    * defined, is current value is replaced by the propVal.
-   * 
+   *
    * @param propName the name of the new property
    * @param propVal the value of the new property
    * @return the previous value of this property or null if the property has not
@@ -447,33 +447,33 @@ public interface Context
    */
   Object addToEnvironment(String propName, Object propVal)
       throws NamingException;
-  
+
   /**
    * Removes the property with the given name from the environment. Returns
    * without action if this property is not defined.
-   * 
+   *
    * @param propName the name of the property being removed.
    * @return the value of the property that has been removed or null if the
    *         property was not defined.
    * @throws NamingException
    */
   Object removeFromEnvironment(String propName) throws NamingException;
-  
+
   /**
    * Returns the environment, associated with this naming context. The returned
    * table should never be modified by the caller. Use {@link #addToEnvironment}
    * and {@link #removeFromEnvironment} to modify the environement, if needed.
-   * 
+   *
    * @return the table, representing the environment of this context
    * @throws NamingException
    */
   Hashtable getEnvironment() throws NamingException;
-  
+
   /**
    * Releases all resources, associated with this context. The close() method
    * can be called several times, but after it has been once invoked, it is not
    * allowed to call any other method of this context,
-   * 
+   *
    * @throws NamingException
    */
   void close() throws NamingException;
@@ -482,7 +482,7 @@ public interface Context
    * Returs the full name of this naming context. The returned string is not a
    * JNDI composite name and should not be passed directly to the methods of the
    * naming context.
-   * 
+   *
    * @return the full name of this naming context, in its own namespace.
    * @throws OperationNotSupportedException if the naming system, represented by
    *           this context, does not support the notation of the full name.
diff --git a/libjava/classpath/javax/naming/ContextNotEmptyException.java b/libjava/classpath/javax/naming/ContextNotEmptyException.java
index e856341c1a8..816e703120f 100644
--- a/libjava/classpath/javax/naming/ContextNotEmptyException.java
+++ b/libjava/classpath/javax/naming/ContextNotEmptyException.java
@@ -41,9 +41,9 @@ package javax.naming;
 /**
  * This exception is thrown in response to the attempt to destroy the non
  * empty context. Only empty contexts (without bindings) can be destroyed.
- * 
+ *
  * @see Context#destroySubcontext
- */ 
+ */
 public class ContextNotEmptyException extends NamingException
 {
   private static final long serialVersionUID = 1090963683348219877L;
diff --git a/libjava/classpath/javax/naming/InitialContext.java b/libjava/classpath/javax/naming/InitialContext.java
index a5fe5f0cf3a..c33122adf00 100644
--- a/libjava/classpath/javax/naming/InitialContext.java
+++ b/libjava/classpath/javax/naming/InitialContext.java
@@ -63,18 +63,18 @@ public class InitialContext implements Context
    * this field.
    */
   protected Context defaultInitCtx;
-  
+
   /**
    * Indicates if the initial context was obtained by calling
-   * {@link NamingManager#getInitialContext}. 
+   * {@link NamingManager#getInitialContext}.
    */
   protected boolean gotDefault = false;
-  
+
   /**
    * The environment, associated with this initial context.
    */
   protected Hashtable myProps;
-  
+
   /**
    * The list of the properties, to that the second alternative value must
    * be appended after the colon to the first possible value. Used in
@@ -87,13 +87,13 @@ public class InitialContext implements Context
       colon_list.add(Context.OBJECT_FACTORIES);
       colon_list.add(Context.URL_PKG_PREFIXES);
       colon_list.add(Context.STATE_FACTORIES);
-    }  
-    
+    }
+
    /**
     * The properties that are searched in the agreed places in the
     * {@link #init(Hashtable)} method.
     */
-    static final String[] use_properties = 
+    static final String[] use_properties =
       {
         Context.DNS_URL,
         Context.INITIAL_CONTEXT_FACTORY,
@@ -102,11 +102,11 @@ public class InitialContext implements Context
         Context.STATE_FACTORIES,
         Context.URL_PKG_PREFIXES,
       };
-    
-  
+
+
   /**
    * Creates the new initial context with the given properties.
-   * 
+   *
    * @param environment the properties, used by the initial context being
    *          created.
    * @throws NamingException
@@ -115,11 +115,11 @@ public class InitialContext implements Context
   {
     init(environment);
   }
-  
+
   /**
    * Creates the initial context with the possibility to delay its
    * initialisation.
-   * 
+   *
    * @param lazy specified if the initialization should not be performed by this
    *          constructor (true). If the valueis false, it works the same way as
    *          the parameterless constructor.
@@ -130,18 +130,18 @@ public class InitialContext implements Context
     if (! lazy)
       init(null);
   }
-  
+
   /**
    * Creates teh new initial context with no properties. Same as
    * InitialContext(null).
-   * 
+   *
    * @throws NamingException
    */
   public InitialContext() throws NamingException
   {
     init(null);
   }
- 
+
   /**
    * 
                    
    * Initialises the context, using the properties, specified in the passed
@@ -160,7 +160,7 @@ public class InitialContext implements Context
    * specified by the system property "gnu.classpath.home.url".
    * 
    * 
                    
-   * 
+   *
    * @param environment the table of the properties, may be null. The method
    *          modifies the table and stores the reference to it. The caller must
    *          not later reuse this structure for other purposes.
@@ -191,12 +191,12 @@ public class InitialContext implements Context
             if (value != null)
               pApplet.put(key, value);
           }
-        
+
         value = System.getProperty(key);
         if (value != null)
           pSystem.put(key, value);
       }
-    
+
     merge(myProps, pSystem);
     if (pApplet != null)
       merge(myProps, pApplet);
@@ -249,7 +249,7 @@ public class InitialContext implements Context
         merge(myProps, p);
       }
   }
-  
+
   /**
    * Merge the content of the two tables. If the second table contains the key
    * that is missing in the first table, this key - value pair is copied to the
@@ -257,16 +257,16 @@ public class InitialContext implements Context
    * {@link #colon_list} set also contains this key, the value from the second
    * table is appended to the value from the first table after semicolon, and
    * the resulted value replaces the value in the first table.
-   * 
+   *
    * @param primary the first table to merge. The merged result is also stored
    *          in this table.
    * @param additional the second table, from where additional values are taken
-   */  
+   */
   static void merge (Hashtable primary,
                      Hashtable additional)
   {
     Enumeration en = additional.keys();
-    
+
     while (en.hasMoreElements())
       {
         String key2 = (String) en.nextElement();
@@ -280,13 +280,13 @@ public class InitialContext implements Context
           }
       }
   }
-  
+
   /**
    * Get the default initial context. If {@link #gotDefault} == false, this
    * method obtains the initial context from the naming manager and sets
    * gotDefault to true. Otherwise the cached value ({@link #defaultInitCtx} is
    * returned.
-   * 
+   *
    * @return the default initial context
    * @throws NamingException
    */
@@ -305,7 +305,7 @@ public class InitialContext implements Context
    * the name is the URL string, this method tries to find the corressponding
    * URL naming context. If it is not an URL string, or the URL context is not
    * found, the default initial context is returned.
-   * 
+   *
    * @param name the name, for that it is required to obtain the context.
    * @return the context for resolving the name.
    * @throws NamingException
@@ -323,7 +323,7 @@ public class InitialContext implements Context
    * the name is the URL string, this method tries to find the corressponding
    * URL naming context. If it is not an URL string, or the URL context is not
    * found, the default initial context is returned.
-   * 
+   *
    * @param name the name, for that it is required to obtain the context.
    * @return the context for resolving the name.
    * @throws NamingException
@@ -348,19 +348,19 @@ public class InitialContext implements Context
     return getDefaultInitCtx();
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void bind (Name name, Object obj) throws NamingException
   {
     getURLOrDefaultInitCtx (name).bind (name, obj);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void bind (String name, Object obj) throws NamingException
   {
     getURLOrDefaultInitCtx (name).bind (name, obj);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Object lookup (Name name) throws NamingException
   {
     try
@@ -374,7 +374,7 @@ public class InitialContext implements Context
       }
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Object lookup (String name) throws NamingException
   {
       try
@@ -388,147 +388,147 @@ public class InitialContext implements Context
         }
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void rebind (Name name, Object obj) throws NamingException
   {
     getURLOrDefaultInitCtx (name).rebind (name, obj);
   }
-  
+
   /** @inheritDoc */
   public void rebind (String name, Object obj) throws NamingException
   {
     getURLOrDefaultInitCtx (name).rebind (name, obj);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void unbind (Name name) throws NamingException
   {
     getURLOrDefaultInitCtx (name).unbind (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void unbind (String name) throws NamingException
   {
     getURLOrDefaultInitCtx (name).unbind (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void rename (Name oldName, Name newName) throws NamingException
   {
     getURLOrDefaultInitCtx (oldName).rename (oldName, newName);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void rename (String oldName, String newName) throws NamingException
   {
     getURLOrDefaultInitCtx (oldName).rename (oldName, newName);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NamingEnumeration list (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NamingEnumeration list (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).list (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NamingEnumeration listBindings (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NamingEnumeration listBindings (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).listBindings (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void destroySubcontext (Name name) throws NamingException
   {
     getURLOrDefaultInitCtx (name).destroySubcontext (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void destroySubcontext (String name) throws NamingException
   {
     getURLOrDefaultInitCtx (name).destroySubcontext (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Context createSubcontext (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).createSubcontext (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Context createSubcontext (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).createSubcontext (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Object lookupLink (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).lookupLink (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Object lookupLink (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).lookupLink (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NameParser getNameParser (Name name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).getNameParser (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public NameParser getNameParser (String name) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).getNameParser (name);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Name composeName (Name name, Name prefix) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).composeName (name, prefix);
   }
 
-  /** @inheritDoc */  
-  public String composeName (String name, 
+  /** @inheritDoc */
+  public String composeName (String name,
                              String prefix) throws NamingException
   {
     return getURLOrDefaultInitCtx (name).composeName (name, prefix);
   }
-  
+
   /** @inheritDoc */
-  public Object addToEnvironment (String propName, 
+  public Object addToEnvironment (String propName,
                                   Object propVal) throws NamingException
   {
     return myProps.put (propName, propVal);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Object removeFromEnvironment (String propName) throws NamingException
   {
     return myProps.remove (propName);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public Hashtable getEnvironment () throws NamingException
   {
     return myProps;
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public void close () throws NamingException
   {
     myProps = null;
@@ -537,7 +537,7 @@ public class InitialContext implements Context
 
   /**
    * This operation is not supported for the initial naming context.
-   * 
+   *
    * @throws OperationNotSupportedException always, unless the method is
    *           overridden in the derived class.
    */
diff --git a/libjava/classpath/javax/naming/InsufficientResourcesException.java b/libjava/classpath/javax/naming/InsufficientResourcesException.java
index 7a9ebe0370c..a7bc3a85eef 100644
--- a/libjava/classpath/javax/naming/InsufficientResourcesException.java
+++ b/libjava/classpath/javax/naming/InsufficientResourcesException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class InsufficientResourcesException extends NamingException
 {
   private static final long serialVersionUID = 6227672693037844532L;
diff --git a/libjava/classpath/javax/naming/InterruptedNamingException.java b/libjava/classpath/javax/naming/InterruptedNamingException.java
index 90d6e5ec052..e42981a6d99 100644
--- a/libjava/classpath/javax/naming/InterruptedNamingException.java
+++ b/libjava/classpath/javax/naming/InterruptedNamingException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class InterruptedNamingException extends NamingException
 {
   private static final long serialVersionUID = 6404516648893194728L;
diff --git a/libjava/classpath/javax/naming/InvalidNameException.java b/libjava/classpath/javax/naming/InvalidNameException.java
index 286f0455dba..e76a152a8f2 100644
--- a/libjava/classpath/javax/naming/InvalidNameException.java
+++ b/libjava/classpath/javax/naming/InvalidNameException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/javax/naming/LimitExceededException.java b/libjava/classpath/javax/naming/LimitExceededException.java
index 8c005ac2c5d..64151193fd7 100644
--- a/libjava/classpath/javax/naming/LimitExceededException.java
+++ b/libjava/classpath/javax/naming/LimitExceededException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class LimitExceededException extends NamingException
 {
   private static final long serialVersionUID = - 776898738660207856L;
diff --git a/libjava/classpath/javax/naming/LinkException.java b/libjava/classpath/javax/naming/LinkException.java
index 8f5df8b03bf..f5c661bbbf0 100644
--- a/libjava/classpath/javax/naming/LinkException.java
+++ b/libjava/classpath/javax/naming/LinkException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 14, 2001
diff --git a/libjava/classpath/javax/naming/LinkLoopException.java b/libjava/classpath/javax/naming/LinkLoopException.java
index 0c68e01bff3..539294e8440 100644
--- a/libjava/classpath/javax/naming/LinkLoopException.java
+++ b/libjava/classpath/javax/naming/LinkLoopException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class LinkLoopException extends LinkException
 {
   private static final long serialVersionUID = - 3119189944325198009L;
diff --git a/libjava/classpath/javax/naming/MalformedLinkException.java b/libjava/classpath/javax/naming/MalformedLinkException.java
index db0753ded6c..e665b34c3a2 100644
--- a/libjava/classpath/javax/naming/MalformedLinkException.java
+++ b/libjava/classpath/javax/naming/MalformedLinkException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class MalformedLinkException extends LinkException
 {
   private static final long serialVersionUID = - 3066740437737830242L;
diff --git a/libjava/classpath/javax/naming/Name.java b/libjava/classpath/javax/naming/Name.java
index 687ebd6fbde..3b22ba5ee15 100644
--- a/libjava/classpath/javax/naming/Name.java
+++ b/libjava/classpath/javax/naming/Name.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -63,7 +63,7 @@ import java.util.Enumeration;
 public interface Name extends Cloneable, Serializable, Comparable
 {
   // This class is implemented as gnu.javax.naming.ictxImpl.trans.GnuName
-  
+
   long serialVersionUID = -3617482732056931635L;
 
   /**
@@ -96,7 +96,7 @@ public interface Name extends Cloneable, Serializable, Comparable
    * Returns the components till the given index as a Name.
    * The returned Name can be modified without changing the
    * original.
-   * 
+   *
    * @param posn the ending position, exclusive
    *
    * @exception ArrayIndexOutOfBoundsException if the given index is smaller
@@ -109,7 +109,7 @@ public interface Name extends Cloneable, Serializable, Comparable
    * Name.
    * The returned Name can be modified without changing the
    * original.
-   * 
+   *
    * @param posn the starting position, inclusive. If it is equal to the size
    *        of the name, the empty name is returned.
    *
diff --git a/libjava/classpath/javax/naming/NameAlreadyBoundException.java b/libjava/classpath/javax/naming/NameAlreadyBoundException.java
index 5ddd7d8ba88..07b92eee44b 100644
--- a/libjava/classpath/javax/naming/NameAlreadyBoundException.java
+++ b/libjava/classpath/javax/naming/NameAlreadyBoundException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class NameAlreadyBoundException extends NamingException
 {
   private static final long serialVersionUID = - 8491441000356780586L;
diff --git a/libjava/classpath/javax/naming/NameClassPair.java b/libjava/classpath/javax/naming/NameClassPair.java
index 7925d45d8b7..f4f9fda0010 100644
--- a/libjava/classpath/javax/naming/NameClassPair.java
+++ b/libjava/classpath/javax/naming/NameClassPair.java
@@ -41,14 +41,14 @@ package javax.naming;
 import java.io.Serializable;
 
 /**
- * NameClassPair represents the name-classname mapping pair 
+ * NameClassPair represents the name-classname mapping pair
  * of a binding in a context.
  * 
                    
  * Bindings are mappings of a name to an object and this class is used to
  * specify the mapping of the name to the class type of the bound object.
  * As classname the fully qualified classname is used.
  * 
                    
- * 
+ *
  * @author Tom Tromey (tromey@redhat.com)
  * @since 1.3
  */
@@ -58,7 +58,7 @@ public class NameClassPair implements Serializable
 
   /**
    * Constructs an instance with the given name and classname.
-   * 
+   *
    * @param name the name of the binding relative to the target context
    * (may not be null)
    * @param className the name of the class. If null the bound
@@ -70,9 +70,9 @@ public class NameClassPair implements Serializable
   }
 
   /**
-   * Constructs an instance with the given name and classname and a 
+   * Constructs an instance with the given name and classname and a
    * flag indicating if the name is relative to the target context.
-   * 
+   *
    * @param name the name of the binding (may not be null)
    * @param className the name of the class. If null the bound
    * object is also null
@@ -87,7 +87,7 @@ public class NameClassPair implements Serializable
 
   /**
    * Returns the classname of the binding.
-   * @return The fully qualified classname or null if the 
+   * @return The fully qualified classname or null if the
    * bound object is null.
    */
   public String getClassName ()
@@ -106,7 +106,7 @@ public class NameClassPair implements Serializable
 
   /**
    * Checks whether the name is relative to the target context or not.
-   * @return true if the name is relative, 
+   * @return true if the name is relative,
    * false otherwise.
    */
   public boolean isRelative ()
@@ -140,43 +140,43 @@ public class NameClassPair implements Serializable
   {
     this.isRel = r;
   }
-  
+
   /**
-   * Sets the full name for this binding. Setting the full name by this 
-   * method is the only way to initialize full names of bindings if 
+   * Sets the full name for this binding. Setting the full name by this
+   * method is the only way to initialize full names of bindings if
    * supported by a specific naming system.
-   * 
-   * @param fullName the full name of this binding. If not set or set to 
+   *
+   * @param fullName the full name of this binding. If not set or set to
    * null the getNameInNamespace() method will
    * throw an exception
-   * 
+   *
    * @see #getNameInNamespace()
-   * 
+   *
    * @since 1.5
    */
-  public void setNameInNamespace(String fullName) 
+  public void setNameInNamespace(String fullName)
   {
     this.fullName = fullName;
   }
-  
+
   /**
    * Returns the full name for this binding. The full name of a binding is
-   * defined as the absolute name in its own namespace and is not valid 
+   * defined as the absolute name in its own namespace and is not valid
    * outside.
-   * 
+   *
    * @return The full name in the bindings namespace.
-   * @throws UnsupportedOperationException if no full name is applicable in 
+   * @throws UnsupportedOperationException if no full name is applicable in
    * the specific naming system.
-   * 
+   *
    * @see Context#getNameInNamespace()
-   * 
+   *
    * @since 1.5
    */
   public String getNameInNamespace()
   {
     if (this.fullName == null)
       throw new UnsupportedOperationException();
-    
+
     return this.fullName;
   }
 
diff --git a/libjava/classpath/javax/naming/NameNotFoundException.java b/libjava/classpath/javax/naming/NameNotFoundException.java
index b7c24a62927..64e45f36f29 100644
--- a/libjava/classpath/javax/naming/NameNotFoundException.java
+++ b/libjava/classpath/javax/naming/NameNotFoundException.java
@@ -35,10 +35,10 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
- 
+
 public class NameNotFoundException extends NamingException
 {
   private static final long serialVersionUID = - 8007156725367842053L;
diff --git a/libjava/classpath/javax/naming/NameParser.java b/libjava/classpath/javax/naming/NameParser.java
index 004b406274f..c832003088a 100644
--- a/libjava/classpath/javax/naming/NameParser.java
+++ b/libjava/classpath/javax/naming/NameParser.java
@@ -46,10 +46,10 @@ package javax.naming;
  * @see Context#getNameParser(Name)
  */
 public interface NameParser
-{ 
+{
   /**
    * Parser the string name representation into the {@link Name} representation
-   * 
+   *
    * @param name the string representation of the name
    * @return the {@link Name} representation of the name.
    * @throws InvalidNameException if the name violates the syntax, expected by
@@ -58,5 +58,3 @@ public interface NameParser
    */
   Name parse (String name) throws NamingException;
 }
-
-
diff --git a/libjava/classpath/javax/naming/NamingEnumeration.java b/libjava/classpath/javax/naming/NamingEnumeration.java
index a7c57706f8b..cd0963d412c 100644
--- a/libjava/classpath/javax/naming/NamingEnumeration.java
+++ b/libjava/classpath/javax/naming/NamingEnumeration.java
@@ -35,7 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming;
 
 import java.util.Enumeration;
@@ -58,16 +58,16 @@ public interface NamingEnumeration extends Enumeration
    * Returns the next element in this enumeration. The naming - specific
    * exceptions are only throws after returning all still available elements of
    * the enumeration.
-   * 
+   *
    * @return the next element of this enumeration
    * @throws NamingException
    */
   T next() throws NamingException;
-  
+
   /**
    * Checks if there are more unvisited elements in the enumeration, throwing
    * exceptions if there are some unvisited, but not available elements.
-   * 
+   *
    * @return true if there are some unvisited elements, false otherwise.
    * @throws PartialResultException if the enumeration, returned by the
    *           {@link Context#list(Name)} or other similar method contains only
@@ -77,13 +77,13 @@ public interface NamingEnumeration extends Enumeration
    * @throws NamingException
    */
   boolean hasMore() throws NamingException;
-  
+
   /**
    * Immediately frees all resources, owned by this enumeration. If invoked, it
    * must be the last method called for that enumeration.
-   * 
+   *
    * @throws NamingException
-   */  
+   */
   void close() throws NamingException;
 
 }
diff --git a/libjava/classpath/javax/naming/NamingException.java b/libjava/classpath/javax/naming/NamingException.java
index 7a5c35eb57b..28b81721037 100644
--- a/libjava/classpath/javax/naming/NamingException.java
+++ b/libjava/classpath/javax/naming/NamingException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -199,9 +199,9 @@ public class NamingException extends Exception
   {
     if (name != null)
       try
-      	{
-	  remainingName.addAll(name);
-	}
+        {
+          remainingName.addAll(name);
+        }
       catch(InvalidNameException ine) { /* ignored */ }
   }
 
@@ -216,9 +216,9 @@ public class NamingException extends Exception
   {
     if (name != null)
       try
-      	{
-	  remainingName.add(name);
-	}
+        {
+          remainingName.add(name);
+        }
       catch(InvalidNameException ine) { /* ignored */ }
   }
 
@@ -243,24 +243,24 @@ public class NamingException extends Exception
     Throwable cause = getRootCause();
     if (cause != null)
       {
-	sb.append(" caused by ");
-	sb.append(cause);
+        sb.append(" caused by ");
+        sb.append(cause);
       }
     Name remaining = getRemainingName();
     if (remaining != null)
       {
-	sb.append(" [remainingName: ");
-	sb.append(remaining);
+        sb.append(" [remainingName: ");
+        sb.append(remaining);
       }
     Object resolved = getResolvedObj();
     if (objectInfo && resolved != null)
       {
-	if (remainingName == null)
-	  sb.append(" [");
-	else
-	  sb.append(", ");
-	sb.append("resolvedObj: ");
-	sb.append(resolved);
+        if (remainingName == null)
+          sb.append(" [");
+        else
+          sb.append(", ");
+        sb.append("resolvedObj: ");
+        sb.append(resolved);
       }
     if ((remaining != null) || (objectInfo && resolved != null))
       sb.append(']');
@@ -314,4 +314,3 @@ public class NamingException extends Exception
       super.printStackTrace(pw);
   }
 }
-
diff --git a/libjava/classpath/javax/naming/NamingSecurityException.java b/libjava/classpath/javax/naming/NamingSecurityException.java
index ae7f5edf649..34ad6dfa4a9 100644
--- a/libjava/classpath/javax/naming/NamingSecurityException.java
+++ b/libjava/classpath/javax/naming/NamingSecurityException.java
@@ -38,11 +38,11 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public abstract class NamingSecurityException extends NamingException
 {
   private static final long serialVersionUID = 5855287647294685775L;
-  
+
   public NamingSecurityException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/NoInitialContextException.java b/libjava/classpath/javax/naming/NoInitialContextException.java
index 5e4f6df0e16..a51f56766ff 100644
--- a/libjava/classpath/javax/naming/NoInitialContextException.java
+++ b/libjava/classpath/javax/naming/NoInitialContextException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class NoInitialContextException extends NamingException
 {
   private static final long serialVersionUID = - 3413733186901258623L;
diff --git a/libjava/classpath/javax/naming/NoPermissionException.java b/libjava/classpath/javax/naming/NoPermissionException.java
index 02764a991f2..7934e090670 100644
--- a/libjava/classpath/javax/naming/NoPermissionException.java
+++ b/libjava/classpath/javax/naming/NoPermissionException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class NoPermissionException extends NamingSecurityException
 {
   private static final long serialVersionUID = 8395332708699751775L;
diff --git a/libjava/classpath/javax/naming/NotContextException.java b/libjava/classpath/javax/naming/NotContextException.java
index a27f10f182d..a543a38e368 100644
--- a/libjava/classpath/javax/naming/NotContextException.java
+++ b/libjava/classpath/javax/naming/NotContextException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class NotContextException extends NamingException
 {
   private static final long serialVersionUID = 849752551644540417L;
diff --git a/libjava/classpath/javax/naming/PartialResultException.java b/libjava/classpath/javax/naming/PartialResultException.java
index 28f0467fe57..dd2813b4b31 100644
--- a/libjava/classpath/javax/naming/PartialResultException.java
+++ b/libjava/classpath/javax/naming/PartialResultException.java
@@ -42,7 +42,7 @@ package javax.naming;
  * Thrown from the {@link javax.naming.NamingEnumeration}, this exception
  * indicates that the enumeration represents only part of the existing
  * elements that would be an answer to the specified request.
- */ 
+ */
 public class PartialResultException extends NamingException
 {
   private static final long serialVersionUID = 2572144970049426786L;
diff --git a/libjava/classpath/javax/naming/RefAddr.java b/libjava/classpath/javax/naming/RefAddr.java
index f345c8829de..6e4de1cfc62 100644
--- a/libjava/classpath/javax/naming/RefAddr.java
+++ b/libjava/classpath/javax/naming/RefAddr.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -71,12 +71,12 @@ public abstract class RefAddr implements Serializable
    */
   protected RefAddr(String addrType)
   {
-  	if (addrType == null)
-  	  throw new NullPointerException("addrType cannot be null");
-  	  
+        if (addrType == null)
+          throw new NullPointerException("addrType cannot be null");
+
     this.addrType = addrType;
   }
-  
+
   /**
    * Returns the non-null address type given to the constructor.
    */
@@ -84,13 +84,13 @@ public abstract class RefAddr implements Serializable
   {
     return addrType;
   }
-  
+
   /**
    * Returns the possibly null content of this RefAddr.
    * The actual value is defined by the non-abstract subclass.
    */
   public abstract Object getContent();
-  
+
   /**
    * Checks if the object is a RefAddr with the same type and content.
    *
@@ -107,10 +107,10 @@ public abstract class RefAddr implements Serializable
         {
           Object c1 = this.getContent();
           Object c2 = refAddr.getContent();
-	  if (c1 == null)
-	    return c2 == null;
-	  else
-	    return c1.equals(c2);
+          if (c1 == null)
+            return c2 == null;
+          else
+            return c1.equals(c2);
         }
       }
     return false;
diff --git a/libjava/classpath/javax/naming/Reference.java b/libjava/classpath/javax/naming/Reference.java
index fedbf589b83..6a2626da097 100644
--- a/libjava/classpath/javax/naming/Reference.java
+++ b/libjava/classpath/javax/naming/Reference.java
@@ -45,37 +45,37 @@ import java.util.Vector;
 /**
  * This class represents a reference to an object that is located outside of the
  * naming/directory system.
- * 
+ *
  * @see Referenceable
- * 
+ *
  * @author Tom Tromey (tromey@redhat.com)
  */
 public class Reference implements Cloneable, Serializable
 {
   private static final long serialVersionUID = - 1673475790065791735L;
-  
+
   /**
-   * The list of addresses, stored in this reference. The object may be 
+   * The list of addresses, stored in this reference. The object may be
    * have by several different addresses.
    */
   protected Vector addrs;
-  
+
   /**
    * The name of the class factory to create an instance of the object,
    * referenced by this reference.
    */
   protected String classFactory;
-  
+
   /**
    * The location, from where the class factory should be loaded.
    */
   protected String classFactoryLocation;
-  
+
   /**
    * The name of the class of the object, to that this reference refers.
    */
   protected String className;
-  
+
   /**
    * Create a new reference that is referencting to the object of the
    * specified class.
@@ -85,7 +85,7 @@ public class Reference implements Cloneable, Serializable
     this.className = className;
     addrs = new Vector ();
   }
-  
+
   /**
    * Create a new reference that is referencing to the object of the
    * specified class with the given address.
@@ -96,17 +96,17 @@ public class Reference implements Cloneable, Serializable
     addrs = new Vector ();
     addrs.add (addr);
   }
-   
+
   /**
    * Create a new reference that is referencing to the object of the
    * specified class, specifying the class and location of the factory that
    * produces these objects.
-   * 
+   *
    * @param className the object class name
    * @param factoryClassName the object factory class name
    * @param factoryLocation the object factory location
    */
-  public Reference (String className, String factoryClassName, 
+  public Reference (String className, String factoryClassName,
                     String factoryLocation)
   {
     this.className = className;
@@ -119,14 +119,14 @@ public class Reference implements Cloneable, Serializable
    * Create a new reference that is referencing to the object of the
    * specified class, specifying the class and location of the factory that
    * produces these objects and also the address of this object.
-   * 
+   *
    * @param className the object class name
    * @param addr the address of the object
    * @param factoryClassName the object factory class name
    * @param factoryLocation the object factory location
    */
   public Reference (String className, RefAddr addr,
-		    String factoryClassName, String factoryLocation)
+                    String factoryClassName, String factoryLocation)
   {
     this.className = className;
     this.classFactory = factoryClassName;
@@ -136,14 +136,14 @@ public class Reference implements Cloneable, Serializable
   }
 
   /**
-   * Add the new address for this object at the given position of the 
+   * Add the new address for this object at the given position of the
    * address list.
    */
   public void add (int posn, RefAddr addr)
   {
     addrs.add (posn, addr);
   }
-  
+
   /**
    * Appends the new object address to the end of the address list.
    */
@@ -151,7 +151,7 @@ public class Reference implements Cloneable, Serializable
   {
     addrs.add (addr);
   }
-  
+
   /**
    * Removes all defined addresses of the object.
    */
@@ -163,7 +163,7 @@ public class Reference implements Cloneable, Serializable
   public Object clone ()
   {
     Reference r = new Reference (className, classFactory,
-				 classFactoryLocation);
+                                 classFactoryLocation);
     r.addrs = (Vector) addrs.clone ();
     return r;
   }
@@ -173,7 +173,7 @@ public class Reference implements Cloneable, Serializable
   {
     return (a == null) ? (b == null) : a.equals (b);
   }
-  
+
   /**
    * Compares two addresses for equality, by value.
    */
@@ -183,11 +183,11 @@ public class Reference implements Cloneable, Serializable
       return false;
     Reference r = (Reference) obj;
     return (equals (classFactory, r.classFactory)
-	    && equals (classFactoryLocation, r.classFactoryLocation)
-	    && equals (className, r.className)
-	    && addrs.equals (r.addrs));
+            && equals (classFactoryLocation, r.classFactoryLocation)
+            && equals (className, r.className)
+            && addrs.equals (r.addrs));
   }
-  
+
   /**
    * Get the address of this object at the given position.
    */
@@ -195,12 +195,12 @@ public class Reference implements Cloneable, Serializable
   {
     return addrs.get (posn);
   }
-  
+
   /**
    * Get the given type of address for this object.
-   * 
+   *
    * @param addrType the needed type of address
-   * 
+   *
    * @return the address of this object, having the specified type. If there
    *           is no address of such type, null is returned.
    */
@@ -208,13 +208,13 @@ public class Reference implements Cloneable, Serializable
   {
     for (int i = 0; i < addrs.size (); ++i)
       {
-	RefAddr r = addrs.get (i);
-	if (addrType.equals (r.getType ()))
-	  return r;
+        RefAddr r = addrs.get (i);
+        if (addrType.equals (r.getType ()))
+          return r;
       }
     return null;
   }
-  
+
   /**
    * Get the enumeration over all defined addresses of the object.
    */
@@ -222,20 +222,20 @@ public class Reference implements Cloneable, Serializable
   {
     return addrs.elements ();
   }
-  
+
   /**
    * Get the name of the class of the referenced object.
-   * 
+   *
    * @see #className
    */
   public String getClassName ()
   {
     return className;
   }
-  
+
   /**
    * Get the location of the factory class of the referenced object.
-   * 
+   *
    * @see #classFactoryLocation
    */
   public String getFactoryClassLocation ()
@@ -245,18 +245,18 @@ public class Reference implements Cloneable, Serializable
 
   /**
    * Get the name of the factory class of the referenced object
-   * 
+   *
    * @see #classFactory
    */
   public String getFactoryClassName ()
   {
     return classFactory;
   }
-  
+
   /**
-   * Get the hashcode of this reference. 
-   * 
-   * @return the sum of the hash codes of the addresses.  
+   * Get the hashcode of this reference.
+   *
+   * @return the sum of the hash codes of the addresses.
    */
   public int hashCode ()
   {
@@ -267,19 +267,19 @@ public class Reference implements Cloneable, Serializable
       h += addrs.get (i).hashCode ();
     return h;
   }
-  
+
   /**
    * Remove the address at the given position.
-   * 
+   *
    * @param posn the position of the address to remove
-   * 
+   *
    * @return the removed address
    */
   public Object remove (int posn)
   {
     return addrs.remove (posn);
   }
-  
+
   /**
    * Return the number of the defined addresses.
    */
@@ -287,7 +287,7 @@ public class Reference implements Cloneable, Serializable
   {
     return addrs.size ();
   }
-  
+
   /**
    * Return the string representation.
    */
@@ -296,9 +296,9 @@ public class Reference implements Cloneable, Serializable
     String x = getClass ().toString () + "[";
     for (int i = 0; i < addrs.size (); ++i)
       {
-	if (i > 0)
-	  x += ",";
-	x += addrs.get (i).toString ();
+        if (i > 0)
+          x += ",";
+        x += addrs.get (i).toString ();
       }
     return x + "]";
   }
diff --git a/libjava/classpath/javax/naming/Referenceable.java b/libjava/classpath/javax/naming/Referenceable.java
index 21c5238bc46..ed8e4d444b4 100644
--- a/libjava/classpath/javax/naming/Referenceable.java
+++ b/libjava/classpath/javax/naming/Referenceable.java
@@ -46,9 +46,9 @@ public interface Referenceable
 {
   /**
    * Get the reference about this object.
-   * 
+   *
    * @return the reference about this object, cannot be null.
-   * 
+   *
    * @throws NamingException if the naming exception has been raised while
    *           retrieving the reference.
    */
diff --git a/libjava/classpath/javax/naming/ReferralException.java b/libjava/classpath/javax/naming/ReferralException.java
index c264d637f18..b596af02ea9 100644
--- a/libjava/classpath/javax/naming/ReferralException.java
+++ b/libjava/classpath/javax/naming/ReferralException.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming;
 
 import java.util.Hashtable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 14, 2001
@@ -48,7 +48,7 @@ import java.util.Hashtable;
 public abstract class ReferralException extends NamingException
 {
   private static final long serialVersionUID = -2881363844695698876L;
-  
+
   protected ReferralException ()
   {
     super ();
diff --git a/libjava/classpath/javax/naming/ServiceUnavailableException.java b/libjava/classpath/javax/naming/ServiceUnavailableException.java
index ddb154f9e77..6a07bc61366 100644
--- a/libjava/classpath/javax/naming/ServiceUnavailableException.java
+++ b/libjava/classpath/javax/naming/ServiceUnavailableException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class ServiceUnavailableException extends NamingException
 {
   private static final long serialVersionUID = - 4996964726566773444L;
diff --git a/libjava/classpath/javax/naming/SizeLimitExceededException.java b/libjava/classpath/javax/naming/SizeLimitExceededException.java
index caffa70c3e0..8f0523fa486 100644
--- a/libjava/classpath/javax/naming/SizeLimitExceededException.java
+++ b/libjava/classpath/javax/naming/SizeLimitExceededException.java
@@ -43,7 +43,7 @@ package javax.naming;
  * indicates that there are more elements than the previously specified
  * size limit. Hence the enumeration represents only part of the existing
  * elements that would be an answer to the specified request.
- */ 
+ */
 public class SizeLimitExceededException extends LimitExceededException
 {
   private static final long serialVersionUID = 7129289564879168579L;
diff --git a/libjava/classpath/javax/naming/StringRefAddr.java b/libjava/classpath/javax/naming/StringRefAddr.java
index f40da8fd800..02f072ecf60 100644
--- a/libjava/classpath/javax/naming/StringRefAddr.java
+++ b/libjava/classpath/javax/naming/StringRefAddr.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/javax/naming/TimeLimitExceededException.java b/libjava/classpath/javax/naming/TimeLimitExceededException.java
index e3456f5bbe8..95188d2599f 100644
--- a/libjava/classpath/javax/naming/TimeLimitExceededException.java
+++ b/libjava/classpath/javax/naming/TimeLimitExceededException.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 
 package javax.naming;
 
- 
+
 public class TimeLimitExceededException extends LimitExceededException
 {
   private static final long serialVersionUID = - 3597009011385034696L;
diff --git a/libjava/classpath/javax/naming/directory/AttributeInUseException.java b/libjava/classpath/javax/naming/directory/AttributeInUseException.java
index 9be25c9a967..08f337c5c11 100644
--- a/libjava/classpath/javax/naming/directory/AttributeInUseException.java
+++ b/libjava/classpath/javax/naming/directory/AttributeInUseException.java
@@ -35,7 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
- 
+
 package javax.naming.directory;
 
 import javax.naming.NamingException;
diff --git a/libjava/classpath/javax/naming/directory/Attributes.java b/libjava/classpath/javax/naming/directory/Attributes.java
index 2dc2c610155..50df17c2dab 100644
--- a/libjava/classpath/javax/naming/directory/Attributes.java
+++ b/libjava/classpath/javax/naming/directory/Attributes.java
@@ -59,4 +59,3 @@ public interface Attributes extends Cloneable, Serializable
   Attribute remove(String attrID);
   Object clone();
 }
-
diff --git a/libjava/classpath/javax/naming/directory/BasicAttribute.java b/libjava/classpath/javax/naming/directory/BasicAttribute.java
index 2715c9672ba..65b44169eb7 100644
--- a/libjava/classpath/javax/naming/directory/BasicAttribute.java
+++ b/libjava/classpath/javax/naming/directory/BasicAttribute.java
@@ -56,7 +56,7 @@ import javax.naming.OperationNotSupportedException;
 public class BasicAttribute implements Attribute
 {
   private static final long serialVersionUID = 6743528196119291326L;
-  
+
   /** The ID of this attribute.  */
   protected String attrID;
   /** True if this attribute's values are ordered.  */
@@ -126,8 +126,8 @@ public class BasicAttribute implements Attribute
   {
     for (int i = 0; i < values.size (); ++i)
       {
-	if (equals (val, values.get (i)))
-	  return true;
+        if (equals (val, values.get (i)))
+          return true;
       }
 
     return false;
@@ -140,29 +140,29 @@ public class BasicAttribute implements Attribute
     BasicAttribute b = (BasicAttribute) obj;
 
     if (ordered != b.ordered
-	|| ! attrID.equals (b.attrID)
-	|| values.size () != b.values.size ())
+        || ! attrID.equals (b.attrID)
+        || values.size () != b.values.size ())
       return false;
 
     for (int i = 0; i < values.size (); ++i)
       {
-	boolean ok = false;
-	if (ordered)
-	  ok = equals (values.get (i), b.values.get (i));
-	else
-	  {
-	    for (int j = 0; j < b.values.size (); ++j)
-	      {
-		if (equals (values.get (i), b.values.get (j)))
-		  {
-		    ok = true;
-		    break;
-		  }
-	      }
-	  }
+        boolean ok = false;
+        if (ordered)
+          ok = equals (values.get (i), b.values.get (i));
+        else
+          {
+            for (int j = 0; j < b.values.size (); ++j)
+              {
+                if (equals (values.get (i), b.values.get (j)))
+                  {
+                    ok = true;
+                    break;
+                  }
+              }
+          }
 
-	if (! ok)
-	  return false;
+        if (! ok)
+          return false;
       }
 
     return true;
@@ -210,19 +210,19 @@ public class BasicAttribute implements Attribute
     int val = attrID.hashCode ();
     for (int i = 0; i < values.size (); ++i)
       {
-	Object o = values.get (i);
-	if (o == null)
-	  {
-	    // Nothing.
-	  }
-	else if (o instanceof Object[])
-	  {
-	    Object[] a = (Object[]) o;
-	    for (int j = 0; j < a.length; ++j)
-	      val += a[j].hashCode ();
-	  }
-	else
-	  val += o.hashCode ();
+        Object o = values.get (i);
+        if (o == null)
+          {
+            // Nothing.
+          }
+        else if (o instanceof Object[])
+          {
+            Object[] a = (Object[]) o;
+            for (int j = 0; j < a.length; ++j)
+              val += a[j].hashCode ();
+          }
+        else
+          val += o.hashCode ();
       }
 
     return val;
@@ -242,11 +242,11 @@ public class BasicAttribute implements Attribute
   {
     for (int i = 0; i < values.size (); ++i)
       {
-	if (equals (val, values.get (i)))
-	  {
-	    values.remove (i);
-	    return true;
-	  }
+        if (equals (val, values.get (i)))
+          {
+            values.remove (i);
+            return true;
+          }
       }
 
     return false;
@@ -281,27 +281,27 @@ public class BasicAttribute implements Attribute
 
     if (one instanceof Object[])
       {
-	if (! (two instanceof Object[]))
-	  return false;
+        if (! (two instanceof Object[]))
+          return false;
 
-	Object[] aone = (Object[]) one;
-	Object[] atwo = (Object[]) two;
+        Object[] aone = (Object[]) one;
+        Object[] atwo = (Object[]) two;
 
-	if (aone.length != atwo.length)
-	  return false;
+        if (aone.length != atwo.length)
+          return false;
 
-	for (int i = 0; i < aone.length; ++i)
-	  {
-	    if (! aone[i].equals (atwo[i]))
-	      return false;
-	  }
+        for (int i = 0; i < aone.length; ++i)
+          {
+            if (! aone[i].equals (atwo[i]))
+              return false;
+          }
 
-	return true;
+        return true;
       }
 
     return one.equals (two);
   }
-  
+
   private void readObject(ObjectInputStream s)
     throws IOException, ClassNotFoundException
   {
@@ -317,9 +317,9 @@ public class BasicAttribute implements Attribute
     s.defaultWriteObject();
     s.writeInt(values.size());
     for (int i=0; i < values.size(); i++)
-      s.writeObject(values.get(i));    
+      s.writeObject(values.get(i));
   }
-  
+
   // Used when enumerating this attribute.
   private class BasicAttributeEnumeration implements NamingEnumeration
   {
@@ -351,7 +351,7 @@ public class BasicAttribute implements Attribute
     public Object nextElement () throws NoSuchElementException
     {
       if (where == values.size ())
-	throw new NoSuchElementException ("no more elements");
+        throw new NoSuchElementException ("no more elements");
       return values.get (where++);
     }
   }
diff --git a/libjava/classpath/javax/naming/directory/BasicAttributes.java b/libjava/classpath/javax/naming/directory/BasicAttributes.java
index 54b1f197b0e..8b607a8cc82 100644
--- a/libjava/classpath/javax/naming/directory/BasicAttributes.java
+++ b/libjava/classpath/javax/naming/directory/BasicAttributes.java
@@ -54,7 +54,7 @@ import javax.naming.NamingException;
 public class BasicAttributes implements Attributes
 {
   private static final long serialVersionUID = 4980164073184639448L;
-  
+
   public BasicAttributes ()
   {
     this (false);
@@ -98,16 +98,16 @@ public class BasicAttributes implements Attributes
 
     Attributes bs = (Attributes) obj;
     if (ignoreCase != bs.isCaseIgnored()
-	|| attributes.size () != bs.size ())
+        || attributes.size () != bs.size ())
       return false;
 
     NamingEnumeration bas = bs.getAll();
     while (bas.hasMoreElements())
       {
-	Attribute a = (Attribute) bas.nextElement();
-	Attribute b = get(a.getID ());
-	if (! a.equals(b))
-	  return false;
+        Attribute a = (Attribute) bas.nextElement();
+        Attribute b = get(a.getID ());
+        if (! a.equals(b))
+          return false;
       }
 
     return true;
@@ -117,10 +117,10 @@ public class BasicAttributes implements Attributes
   {
     for (int i = 0; i < attributes.size (); ++i)
       {
-	Attribute at = attributes.get (i);
-	if ((ignoreCase && attrID.equalsIgnoreCase (at.getID ()))
-	    || (! ignoreCase && attrID.equals (at.getID ())))
-	  return at;
+        Attribute at = attributes.get (i);
+        if ((ignoreCase && attrID.equalsIgnoreCase (at.getID ()))
+            || (! ignoreCase && attrID.equals (at.getID ())))
+          return at;
       }
 
     return null;
@@ -139,7 +139,7 @@ public class BasicAttributes implements Attributes
       {
         return attrs.hasMore();
       }
-      
+
       public boolean hasMoreElements()
       {
         return attrs.hasMoreElements();
@@ -191,13 +191,13 @@ public class BasicAttributes implements Attributes
   {
     for (int i = 0; i < attributes.size (); ++i)
       {
-	Attribute at = (Attribute) attributes.get (i);
-	if ((ignoreCase && attrID.equalsIgnoreCase (at.getID ()))
-	    || (! ignoreCase && attrID.equals (at.getID ())))
-	  {
-	    attributes.remove (i);
-	    return at;
-	  }
+        Attribute at = (Attribute) attributes.get (i);
+        if ((ignoreCase && attrID.equalsIgnoreCase (at.getID ()))
+            || (! ignoreCase && attrID.equals (at.getID ())))
+          {
+            attributes.remove (i);
+            return at;
+          }
       }
 
     return null;
@@ -213,9 +213,9 @@ public class BasicAttributes implements Attributes
     String r = "";
     for (int i = 0; i < attributes.size (); ++i)
       {
-	if (i > 0)
-	  r += "; ";
-	r += attributes.get (i).toString ();
+        if (i > 0)
+          r += "; ";
+        r += attributes.get (i).toString ();
       }
     return r;
   }
@@ -230,7 +230,7 @@ public class BasicAttributes implements Attributes
   {
     s.defaultReadObject();
     int size = s.readInt();
-    attributes = new Vector(size);    
+    attributes = new Vector(size);
     for (int i = 0; i < size; i++)
       attributes.add((Attribute) s.readObject());
   }
@@ -275,7 +275,7 @@ public class BasicAttributes implements Attributes
     public Attribute nextElement () throws NoSuchElementException
     {
       if (where >= attributes.size ())
-	throw new NoSuchElementException ("no more elements");
+        throw new NoSuchElementException ("no more elements");
       Attribute at = attributes.get (where);
       ++where;
       return at;
diff --git a/libjava/classpath/javax/naming/directory/InitialDirContext.java b/libjava/classpath/javax/naming/directory/InitialDirContext.java
index 8c7852fbba6..68130b28c8d 100644
--- a/libjava/classpath/javax/naming/directory/InitialDirContext.java
+++ b/libjava/classpath/javax/naming/directory/InitialDirContext.java
@@ -211,7 +211,7 @@ public class InitialDirContext extends InitialContext implements DirContext
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes,
-						    attributesToReturn);
+                                                    attributesToReturn);
   }
 
   public NamingEnumeration search(String name,
@@ -220,7 +220,7 @@ public class InitialDirContext extends InitialContext implements DirContext
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, matchingAttributes,
-						    attributesToReturn);
+                                                    attributesToReturn);
   }
 
   public NamingEnumeration search(Name name,
@@ -257,7 +257,7 @@ public class InitialDirContext extends InitialContext implements DirContext
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filterExpr,
-						    filterArgs, cons);
+                                                    filterArgs, cons);
   }
 
   public NamingEnumeration search(String name,
@@ -267,6 +267,6 @@ public class InitialDirContext extends InitialContext implements DirContext
     throws NamingException
   {
     return getURLOrDefaultInitDirCtx (name).search (name, filterExpr,
-						    filterArgs, cons);
+                                                    filterArgs, cons);
   }
 }
diff --git a/libjava/classpath/javax/naming/directory/ModificationItem.java b/libjava/classpath/javax/naming/directory/ModificationItem.java
index 56a5ae60958..b7cb48e6891 100644
--- a/libjava/classpath/javax/naming/directory/ModificationItem.java
+++ b/libjava/classpath/javax/naming/directory/ModificationItem.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import java.io.Serializable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 13, 2001
@@ -57,8 +57,8 @@ public class ModificationItem implements Serializable
     if (attr == null)
       throw new IllegalArgumentException("attr is null");
     if (mod_op != DirContext.ADD_ATTRIBUTE &&
-	mod_op != DirContext.REPLACE_ATTRIBUTE &&
-	mod_op != DirContext.REMOVE_ATTRIBUTE)
+        mod_op != DirContext.REPLACE_ATTRIBUTE &&
+        mod_op != DirContext.REMOVE_ATTRIBUTE)
       throw new IllegalArgumentException("mod_op is invalid");
     this.mod_op = mod_op;
     this.attr = attr;
diff --git a/libjava/classpath/javax/naming/directory/SearchControls.java b/libjava/classpath/javax/naming/directory/SearchControls.java
index 5ba488bf78f..805e971704e 100644
--- a/libjava/classpath/javax/naming/directory/SearchControls.java
+++ b/libjava/classpath/javax/naming/directory/SearchControls.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import java.io.Serializable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 5, 2001
@@ -66,7 +66,7 @@ public class SearchControls implements Serializable
   }
 
   public SearchControls(int scope, long countlim, int timelim, String[] attrs,
-  			boolean retobj, boolean deref)
+                        boolean retobj, boolean deref)
   {
     searchScope = scope;
     timeLimit = timelim;
diff --git a/libjava/classpath/javax/naming/directory/SearchResult.java b/libjava/classpath/javax/naming/directory/SearchResult.java
index ce6bfed6ed2..5d6a2b1f8cb 100644
--- a/libjava/classpath/javax/naming/directory/SearchResult.java
+++ b/libjava/classpath/javax/naming/directory/SearchResult.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.directory;
 
 import javax.naming.Binding;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 13, 2001
@@ -58,21 +58,21 @@ public class SearchResult extends Binding
   }
 
   public SearchResult(String name, Object obj, Attributes attrs,
-  		      boolean isRelative)
+                      boolean isRelative)
   {
     super(name, obj, isRelative);
     this.attrs = attrs;
   }
 
   public SearchResult(String name, String className, Object obj,
-  		      Attributes attrs)
+                      Attributes attrs)
   {
     super(name, className, obj);
     this.attrs = attrs;
   }
 
   public SearchResult(String name, String className, Object obj,
-  		      Attributes attrs, boolean isRelative)
+                      Attributes attrs, boolean isRelative)
   {
     super(name, className, obj, isRelative);
     this.attrs = attrs;
diff --git a/libjava/classpath/javax/naming/event/EventContext.java b/libjava/classpath/javax/naming/event/EventContext.java
index 32629c04c65..fbee9718db5 100644
--- a/libjava/classpath/javax/naming/event/EventContext.java
+++ b/libjava/classpath/javax/naming/event/EventContext.java
@@ -41,7 +41,7 @@ package javax.naming.event;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
@@ -55,11 +55,11 @@ public interface EventContext extends Context
 
   void addNamingListener (Name target, int scope, NamingListener l)
     throws NamingException;
-  
+
   void addNamingListener (String target, int scope, NamingListener l)
     throws NamingException;
-  
+
   void removeNamingListener (NamingListener l) throws NamingException;
-  
+
   boolean targetMustExist() throws NamingException;
 }
diff --git a/libjava/classpath/javax/naming/event/NamespaceChangeListener.java b/libjava/classpath/javax/naming/event/NamespaceChangeListener.java
index 464b7187a9d..efe797e7a39 100644
--- a/libjava/classpath/javax/naming/event/NamespaceChangeListener.java
+++ b/libjava/classpath/javax/naming/event/NamespaceChangeListener.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.naming.event;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/event/NamingEvent.java b/libjava/classpath/javax/naming/event/NamingEvent.java
index 1bf381a4467..dcc8c89b155 100644
--- a/libjava/classpath/javax/naming/event/NamingEvent.java
+++ b/libjava/classpath/javax/naming/event/NamingEvent.java
@@ -41,7 +41,7 @@ package javax.naming.event;
 import java.util.EventObject;
 
 import javax.naming.Binding;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 5, 2001
@@ -62,7 +62,7 @@ public class NamingEvent extends EventObject
   protected Binding newBinding;
 
   public NamingEvent(EventContext source, int type, Binding newBd,
-  		     Binding oldBd, Object changeInfo)
+                     Binding oldBd, Object changeInfo)
   {
     super(source);
     this.type = type;
@@ -106,17 +106,17 @@ public class NamingEvent extends EventObject
     switch (type)
       {
         case OBJECT_ADDED:
-	  ((NamespaceChangeListener) listener).objectAdded(this);
-	  break;
+          ((NamespaceChangeListener) listener).objectAdded(this);
+          break;
         case OBJECT_REMOVED:
-	  ((NamespaceChangeListener) listener).objectRemoved(this);
-	  break;
+          ((NamespaceChangeListener) listener).objectRemoved(this);
+          break;
         case OBJECT_RENAMED:
-	  ((NamespaceChangeListener) listener).objectRenamed(this);
-	  break;
+          ((NamespaceChangeListener) listener).objectRenamed(this);
+          break;
         case OBJECT_CHANGED:
-	  ((ObjectChangeListener) listener).objectChanged(this);
-	  break;
+          ((ObjectChangeListener) listener).objectChanged(this);
+          break;
       }
   }
 }
diff --git a/libjava/classpath/javax/naming/event/NamingExceptionEvent.java b/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
index 3a9de21f5d0..27a7552d88b 100644
--- a/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
+++ b/libjava/classpath/javax/naming/event/NamingExceptionEvent.java
@@ -41,7 +41,7 @@ package javax.naming.event;
 import java.util.EventObject;
 
 import javax.naming.NamingException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 5, 2001
diff --git a/libjava/classpath/javax/naming/event/NamingListener.java b/libjava/classpath/javax/naming/event/NamingListener.java
index 4f313a35cbf..e820d55c304 100644
--- a/libjava/classpath/javax/naming/event/NamingListener.java
+++ b/libjava/classpath/javax/naming/event/NamingListener.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.event;
 
 import java.util.EventListener;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/event/ObjectChangeListener.java b/libjava/classpath/javax/naming/event/ObjectChangeListener.java
index 00e8c4cb024..63ccc5babe5 100644
--- a/libjava/classpath/javax/naming/event/ObjectChangeListener.java
+++ b/libjava/classpath/javax/naming/event/ObjectChangeListener.java
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.naming.event;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/Control.java b/libjava/classpath/javax/naming/ldap/Control.java
index 9f6409b532f..b852c00637a 100644
--- a/libjava/classpath/javax/naming/ldap/Control.java
+++ b/libjava/classpath/javax/naming/ldap/Control.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.io.Serializable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/ControlFactory.java b/libjava/classpath/javax/naming/ldap/ControlFactory.java
index b8151640fc6..05d53f9a831 100644
--- a/libjava/classpath/javax/naming/ldap/ControlFactory.java
+++ b/libjava/classpath/javax/naming/ldap/ControlFactory.java
@@ -58,8 +58,8 @@ public abstract class ControlFactory
     throws NamingException;
 
   public static Control getControlInstance (Control control,
-					    Context ctx,
-					    Hashtable env)
+                                            Context ctx,
+                                            Hashtable env)
     throws NamingException
   {
     String path = (String) env.get (LdapContext.CONTROL_FACTORIES);
@@ -74,32 +74,32 @@ public abstract class ControlFactory
     StringTokenizer tokens = new StringTokenizer (path, ":");
     while (tokens.hasMoreTokens ())
       {
-	String name = tokens.nextToken ();
-	try
-	  {
-	    Class k = Class.forName (name);
-	    ControlFactory cf = (ControlFactory) k.newInstance ();
-	    Control ctrl = cf.getControlInstance (control);
-	    if (ctrl != null)
-	      return ctrl;
-	  }
-	catch (ClassNotFoundException _1)
-	  {
-	    // Ignore it.
-	  }
-	catch (ClassCastException _2)
-	  {
-	    // Ignore it.
-	  }
-	catch (InstantiationException _3)
-	  {
-	    // If we couldn't instantiate the factory we might get
-	    // this.
-	  }
-	catch (IllegalAccessException _4)
-	  {
-	    // Another possibility when instantiating.
-	  }
+        String name = tokens.nextToken ();
+        try
+          {
+            Class k = Class.forName (name);
+            ControlFactory cf = (ControlFactory) k.newInstance ();
+            Control ctrl = cf.getControlInstance (control);
+            if (ctrl != null)
+              return ctrl;
+          }
+        catch (ClassNotFoundException _1)
+          {
+            // Ignore it.
+          }
+        catch (ClassCastException _2)
+          {
+            // Ignore it.
+          }
+        catch (InstantiationException _3)
+          {
+            // If we couldn't instantiate the factory we might get
+            // this.
+          }
+        catch (IllegalAccessException _4)
+          {
+            // Another possibility when instantiating.
+          }
       }
 
     return control;
diff --git a/libjava/classpath/javax/naming/ldap/ExtendedRequest.java b/libjava/classpath/javax/naming/ldap/ExtendedRequest.java
index e6379c0c0f2..43ddcd7d0bf 100644
--- a/libjava/classpath/javax/naming/ldap/ExtendedRequest.java
+++ b/libjava/classpath/javax/naming/ldap/ExtendedRequest.java
@@ -41,7 +41,7 @@ package javax.naming.ldap;
 import java.io.Serializable;
 
 import javax.naming.NamingException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
@@ -51,7 +51,7 @@ public interface ExtendedRequest extends Serializable
   String getID();
   byte[] getEncodedValue();
   ExtendedResponse createExtendedResponse(String id,
-  						 byte[] berValue, int offset,
-						 int length)
-						 throws NamingException;
+                                                 byte[] berValue, int offset,
+                                                 int length)
+                                                 throws NamingException;
 }
diff --git a/libjava/classpath/javax/naming/ldap/ExtendedResponse.java b/libjava/classpath/javax/naming/ldap/ExtendedResponse.java
index a3b6dd12c7e..18b2221617b 100644
--- a/libjava/classpath/javax/naming/ldap/ExtendedResponse.java
+++ b/libjava/classpath/javax/naming/ldap/ExtendedResponse.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.io.Serializable;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/HasControls.java b/libjava/classpath/javax/naming/ldap/HasControls.java
index a1698963fc8..f3b97fca488 100644
--- a/libjava/classpath/javax/naming/ldap/HasControls.java
+++ b/libjava/classpath/javax/naming/ldap/HasControls.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import javax.naming.NamingException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/InitialLdapContext.java b/libjava/classpath/javax/naming/ldap/InitialLdapContext.java
index 1a29c6ae840..011ff5ab5b0 100644
--- a/libjava/classpath/javax/naming/ldap/InitialLdapContext.java
+++ b/libjava/classpath/javax/naming/ldap/InitialLdapContext.java
@@ -69,12 +69,12 @@ public class InitialLdapContext
     Hashtable myenv = null;
     if (connControls != null)
       {
-	if (environment == null)
-	  myenv = new Hashtable ();
-	else
-	  myenv = (Hashtable) environment.clone ();
-	myenv.put ("java.naming.ldap.control.connect",
-			 connControls);
+        if (environment == null)
+          myenv = new Hashtable ();
+        else
+          myenv = (Hashtable) environment.clone ();
+        myenv.put ("java.naming.ldap.control.connect",
+                         connControls);
       }
 
     init (myenv);
diff --git a/libjava/classpath/javax/naming/ldap/LdapContext.java b/libjava/classpath/javax/naming/ldap/LdapContext.java
index 10b72f77f34..ff11259bec4 100644
--- a/libjava/classpath/javax/naming/ldap/LdapContext.java
+++ b/libjava/classpath/javax/naming/ldap/LdapContext.java
@@ -40,7 +40,7 @@ package javax.naming.ldap;
 
 import javax.naming.NamingException;
 import javax.naming.directory.DirContext;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/LdapReferralException.java b/libjava/classpath/javax/naming/ldap/LdapReferralException.java
index 87942b9fce4..faa719c367e 100644
--- a/libjava/classpath/javax/naming/ldap/LdapReferralException.java
+++ b/libjava/classpath/javax/naming/ldap/LdapReferralException.java
@@ -43,7 +43,7 @@ import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.ReferralException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/StartTlsRequest.java b/libjava/classpath/javax/naming/ldap/StartTlsRequest.java
index b0a30b54f20..42ee8d77469 100644
--- a/libjava/classpath/javax/naming/ldap/StartTlsRequest.java
+++ b/libjava/classpath/javax/naming/ldap/StartTlsRequest.java
@@ -55,7 +55,7 @@ public class StartTlsRequest
   /**
    * The assigned object identifier for this response.
    */
-  public static final String OID = "1.3.6.1.4.1.1466.20037"; 
+  public static final String OID = "1.3.6.1.4.1.1466.20037";
 
   /**
    * Create a new instance.
diff --git a/libjava/classpath/javax/naming/ldap/UnsolicitedNotification.java b/libjava/classpath/javax/naming/ldap/UnsolicitedNotification.java
index 0b6f9d7792e..ca911f5411c 100644
--- a/libjava/classpath/javax/naming/ldap/UnsolicitedNotification.java
+++ b/libjava/classpath/javax/naming/ldap/UnsolicitedNotification.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import javax.naming.NamingException;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationEvent.java b/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationEvent.java
index f9946064aaf..52e591a6151 100644
--- a/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationEvent.java
+++ b/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationEvent.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import java.util.EventObject;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 5, 2001
@@ -47,12 +47,12 @@ import java.util.EventObject;
 public class UnsolicitedNotificationEvent extends EventObject
 {
   private static final long serialVersionUID = -2382603380799883705L;
-  
+
   // Serialized fields.
   private UnsolicitedNotification notice;
 
   public UnsolicitedNotificationEvent(Object src,
-  				      UnsolicitedNotification notice)
+                                      UnsolicitedNotification notice)
   {
     super(src);
     this.notice = notice;
diff --git a/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationListener.java b/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationListener.java
index fd56f059870..f2a35da6c76 100644
--- a/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationListener.java
+++ b/libjava/classpath/javax/naming/ldap/UnsolicitedNotificationListener.java
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.naming.ldap;
 
 import javax.naming.event.NamingListener;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
diff --git a/libjava/classpath/javax/naming/spi/DirObjectFactory.java b/libjava/classpath/javax/naming/spi/DirObjectFactory.java
index 1a71c28f7df..47fb7a1e780 100644
--- a/libjava/classpath/javax/naming/spi/DirObjectFactory.java
+++ b/libjava/classpath/javax/naming/spi/DirObjectFactory.java
@@ -43,7 +43,7 @@ import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.directory.Attributes;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
@@ -51,6 +51,6 @@ import javax.naming.directory.Attributes;
 public interface DirObjectFactory extends ObjectFactory
 {
   Object getObjectInstance(Object obj, Name name, Context nameCtx,
-  				  Hashtable environment, Attributes attrs)
-				  throws Exception;
+                                  Hashtable environment, Attributes attrs)
+                                  throws Exception;
 }
diff --git a/libjava/classpath/javax/naming/spi/DirStateFactory.java b/libjava/classpath/javax/naming/spi/DirStateFactory.java
index 6ddd12f3655..1c0c21b1394 100644
--- a/libjava/classpath/javax/naming/spi/DirStateFactory.java
+++ b/libjava/classpath/javax/naming/spi/DirStateFactory.java
@@ -44,7 +44,7 @@ import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date June 1, 2001
@@ -76,8 +76,8 @@ public interface DirStateFactory extends StateFactory
   }
 
   DirStateFactory.Result getStateToBind(Object obj, Name name,
-  					       Context nameCtx,
-					       Hashtable environment,
-					       Attributes inAttrs)
-					       throws NamingException;
+                                               Context nameCtx,
+                                               Hashtable environment,
+                                               Attributes inAttrs)
+                                               throws NamingException;
 }
diff --git a/libjava/classpath/javax/naming/spi/DirectoryManager.java b/libjava/classpath/javax/naming/spi/DirectoryManager.java
index a6d91b20cfa..4abb5f1a601 100644
--- a/libjava/classpath/javax/naming/spi/DirectoryManager.java
+++ b/libjava/classpath/javax/naming/spi/DirectoryManager.java
@@ -73,28 +73,28 @@ public class DirectoryManager extends NamingManager
   // Try to create an object using the factory.  Return null on
   // failure.
   private static Object tryCreateObject (ObjectFactory factory,
-					 Object refInfo,
-					 Name name,
-					 Context nameCtx,
-					 Hashtable environment,
-					 Attributes attrs)
+                                         Object refInfo,
+                                         Name name,
+                                         Context nameCtx,
+                                         Hashtable environment,
+                                         Attributes attrs)
     throws Exception
   {
     if (factory instanceof DirObjectFactory)
       {
-	DirObjectFactory dof = (DirObjectFactory) factory;
-	return dof.getObjectInstance (refInfo, name, nameCtx,
-				      environment, attrs);
+        DirObjectFactory dof = (DirObjectFactory) factory;
+        return dof.getObjectInstance (refInfo, name, nameCtx,
+                                      environment, attrs);
       }
     else
       return factory.getObjectInstance (refInfo, name, nameCtx,
-					environment);
+                                        environment);
   }
 
   public static Object getObjectInstance (Object refInfo, Name name,
-					  Context nameCtx,
-					  Hashtable environment,
-					  Attributes attrs)
+                                          Context nameCtx,
+                                          Hashtable environment,
+                                          Attributes attrs)
     throws Exception
   {
     ObjectFactory factory = null;
@@ -103,139 +103,139 @@ public class DirectoryManager extends NamingManager
       factory = ofb.createObjectFactory (refInfo, environment);
     else
       {
-	// First see if we have a Reference or a Referenceable.  If so
-	// we do some special processing.
-	Object ref2 = refInfo;
-	if (refInfo instanceof Referenceable)
-	  ref2 = ((Referenceable) refInfo).getReference ();
-	if (ref2 instanceof Reference)
-	  {
-	    Reference ref = (Reference) ref2;
+        // First see if we have a Reference or a Referenceable.  If so
+        // we do some special processing.
+        Object ref2 = refInfo;
+        if (refInfo instanceof Referenceable)
+          ref2 = ((Referenceable) refInfo).getReference ();
+        if (ref2 instanceof Reference)
+          {
+            Reference ref = (Reference) ref2;
 
-	    // If we have a factory class name then we use that.
-	    String fClass = ref.getFactoryClassName ();
-	    if (fClass != null)
-	      {
-		// Exceptions here are passed to the caller.
-		Class k = Class.forName (fClass);
-		factory = (ObjectFactory) k.newInstance ();
-	      }
-	    else
-	      {
-		// There's no factory class name.  If the address is a
-		// StringRefAddr with address type `URL', then we try
-		// the URL's context factory.
-		Enumeration e = ref.getAll ();
-		while (e.hasMoreElements ())
-		  {
-		    RefAddr ra = (RefAddr) e.nextElement ();
-		    if (ra instanceof StringRefAddr
-			&& "URL".equals (ra.getType ()))
-		      {
-			factory
-			  = (ObjectFactory) getURLContext (refInfo,
-							   name,
-							   nameCtx,
-							   (String) ra.getContent (),
-							   environment);
-			Object obj = tryCreateObject (factory,
-						      refInfo,
-						      name,
-						      nameCtx,
-						      environment,
-						      attrs);
-			if (obj != null)
-			  return obj;
-		      }
-		  }
+            // If we have a factory class name then we use that.
+            String fClass = ref.getFactoryClassName ();
+            if (fClass != null)
+              {
+                // Exceptions here are passed to the caller.
+                Class k = Class.forName (fClass);
+                factory = (ObjectFactory) k.newInstance ();
+              }
+            else
+              {
+                // There's no factory class name.  If the address is a
+                // StringRefAddr with address type `URL', then we try
+                // the URL's context factory.
+                Enumeration e = ref.getAll ();
+                while (e.hasMoreElements ())
+                  {
+                    RefAddr ra = (RefAddr) e.nextElement ();
+                    if (ra instanceof StringRefAddr
+                        && "URL".equals (ra.getType ()))
+                      {
+                        factory
+                          = (ObjectFactory) getURLContext (refInfo,
+                                                           name,
+                                                           nameCtx,
+                                                           (String) ra.getContent (),
+                                                           environment);
+                        Object obj = tryCreateObject (factory,
+                                                      refInfo,
+                                                      name,
+                                                      nameCtx,
+                                                      environment,
+                                                      attrs);
+                        if (obj != null)
+                          return obj;
+                      }
+                  }
 
-		// Have to try the next step.
-		factory = null;
-	      }
-	  }
+                // Have to try the next step.
+                factory = null;
+              }
+          }
 
-	// Now look at OBJECT_FACTORIES to find the factory.
-	if (factory == null)
-	  {
-	    StringTokenizer tokens = getPlusPath (Context.OBJECT_FACTORIES,
-						  environment, nameCtx);
+        // Now look at OBJECT_FACTORIES to find the factory.
+        if (factory == null)
+          {
+            StringTokenizer tokens = getPlusPath (Context.OBJECT_FACTORIES,
+                                                  environment, nameCtx);
 
-	    while (tokens.hasMoreTokens ())
-	      {
-		String klassName = tokens.nextToken ();
-		Class k = Class.forName (klassName);
-		factory = (ObjectFactory) k.newInstance ();
-		Object obj = tryCreateObject (factory, refInfo, name,
-					      nameCtx, environment, attrs);
-		if (obj != null)
-		  return obj;
-	      }
+            while (tokens.hasMoreTokens ())
+              {
+                String klassName = tokens.nextToken ();
+                Class k = Class.forName (klassName);
+                factory = (ObjectFactory) k.newInstance ();
+                Object obj = tryCreateObject (factory, refInfo, name,
+                                              nameCtx, environment, attrs);
+                if (obj != null)
+                  return obj;
+              }
 
-	    // Failure.
-	    return refInfo;
-	  }
+            // Failure.
+            return refInfo;
+          }
       }
 
     if (factory == null)
       return refInfo;
     Object obj = tryCreateObject (factory, refInfo, name,
-				  nameCtx, environment, attrs);
+                                  nameCtx, environment, attrs);
     return obj == null ? refInfo : obj;
   }
 
   public static DirStateFactory.Result getStateToBind (Object obj,
-						       Name name,
-						       Context nameCtx,
-						       Hashtable environment,
-						       Attributes attrs)
+                                                       Name name,
+                                                       Context nameCtx,
+                                                       Hashtable environment,
+                                                       Attributes attrs)
     throws NamingException
   {
     StringTokenizer tokens = getPlusPath (Context.STATE_FACTORIES,
-					  environment, nameCtx);
+                                          environment, nameCtx);
     while (tokens.hasMoreTokens ())
       {
-	String klassName = tokens.nextToken ();
-	try
-	  {
-	    Class k = Class.forName (klassName);
-	    StateFactory factory = (StateFactory) k.newInstance ();
+        String klassName = tokens.nextToken ();
+        try
+          {
+            Class k = Class.forName (klassName);
+            StateFactory factory = (StateFactory) k.newInstance ();
 
-	    DirStateFactory.Result result = null;
-	    if (factory instanceof DirStateFactory)
-	      {
-		DirStateFactory dsf = (DirStateFactory) factory;
-		result = dsf.getStateToBind (obj, name, nameCtx, environment,
-					     attrs);
-	      }
-	    else
-	      {
-		Object o = factory.getStateToBind (obj, name, nameCtx,
-						   environment);
-		if (o != null)
-		  result = new DirStateFactory.Result (o, attrs);
-	      }
-	    if (result != null)
-	      return result;
-	  }
-	catch (ClassNotFoundException _1)
-	  {
-	    // Ignore it.
-	  }
-	catch (ClassCastException _2)
-	  {
-	    // This means that the class we found was not an
-	    // ObjectFactory or that the factory returned something
-	    // which was not a Context.
-	  }
-	catch (InstantiationException _3)
-	  {
-	    // If we couldn't instantiate the factory we might get
-	    // this.
-	  }
-	catch (IllegalAccessException _4)
-	  {
-	    // Another possibility when instantiating.
-	  }
+            DirStateFactory.Result result = null;
+            if (factory instanceof DirStateFactory)
+              {
+                DirStateFactory dsf = (DirStateFactory) factory;
+                result = dsf.getStateToBind (obj, name, nameCtx, environment,
+                                             attrs);
+              }
+            else
+              {
+                Object o = factory.getStateToBind (obj, name, nameCtx,
+                                                   environment);
+                if (o != null)
+                  result = new DirStateFactory.Result (o, attrs);
+              }
+            if (result != null)
+              return result;
+          }
+        catch (ClassNotFoundException _1)
+          {
+            // Ignore it.
+          }
+        catch (ClassCastException _2)
+          {
+            // This means that the class we found was not an
+            // ObjectFactory or that the factory returned something
+            // which was not a Context.
+          }
+        catch (InstantiationException _3)
+          {
+            // If we couldn't instantiate the factory we might get
+            // this.
+          }
+        catch (IllegalAccessException _4)
+          {
+            // Another possibility when instantiating.
+          }
       }
 
     return new DirStateFactory.Result (obj, attrs);
diff --git a/libjava/classpath/javax/naming/spi/InitialContextFactory.java b/libjava/classpath/javax/naming/spi/InitialContextFactory.java
index f715327ef50..bd13c6e387c 100644
--- a/libjava/classpath/javax/naming/spi/InitialContextFactory.java
+++ b/libjava/classpath/javax/naming/spi/InitialContextFactory.java
@@ -58,7 +58,7 @@ public interface InitialContextFactory
 {
   /**
    * Create a new initial context
-   * 
+   *
    * @param environment the properties, used when creating the context. The
    *          implementing class will not modify the table nor keep the
    *          reference to it. After the method returns, the caller can safely
diff --git a/libjava/classpath/javax/naming/spi/InitialContextFactoryBuilder.java b/libjava/classpath/javax/naming/spi/InitialContextFactoryBuilder.java
index 31bafe6dc06..12ee888bafb 100644
--- a/libjava/classpath/javax/naming/spi/InitialContextFactoryBuilder.java
+++ b/libjava/classpath/javax/naming/spi/InitialContextFactoryBuilder.java
@@ -47,14 +47,14 @@ import javax.naming.NamingException;
  * initial naming contexts. JNDI allows to specifiy different initial contexts
  * at runtime. The user program can install its own initial context factory
  * builder.
- * 
+ *
  * @see NamingManager#setInitialContextFactoryBuilder
  */
 public interface InitialContextFactoryBuilder
 {
   /**
    * Create the new initial context factory
-   * 
+   *
    * @param environment the properties, used for creation of the initial
    * context factory. The parameter is owned by the caller: it is safe to reuse
    * the table for other purposes after the method returns.
diff --git a/libjava/classpath/javax/naming/spi/NamingManager.java b/libjava/classpath/javax/naming/spi/NamingManager.java
index cc8d46fa497..d974513b307 100644
--- a/libjava/classpath/javax/naming/spi/NamingManager.java
+++ b/libjava/classpath/javax/naming/spi/NamingManager.java
@@ -84,16 +84,16 @@ public class NamingManager
 
   /**
    * Checks if the initial context factory builder has been set.
-   * 
+   *
    * @return true if the builder has been set
-   * 
+   *
    * @see #setInitialContextFactoryBuilder(InitialContextFactoryBuilder)
    */
   public static boolean hasInitialContextFactoryBuilder ()
   {
     return icfb != null;
   }
-  
+
   /**
    * Creates the initial context. If the initial object factory builder has
    * been set with {@link #setObjectFactoryBuilder(ObjectFactoryBuilder)},
@@ -101,54 +101,54 @@ public class NamingManager
    * for the property Context.INITIAL_CONTEXT_FACTORY first in the passed
    * table and then in the system properties. The value of this property is
    * uses as a class name to install the context factory. The corresponding
-   * class must exist, be public and have the public parameterless constructor. 
-   * 
+   * class must exist, be public and have the public parameterless constructor.
+   *
    * @param environment the properties, used to create the context.
-   * 
+   *
    * @return the created context
-   * 
+   *
    * @throws NoInitialContextException if the initial builder is not set,
    *           the property Context.INITIAL_CONTEXT_FACTORY is missing of the
-   *           class, named by this property, cannot be instantiated. 
+   *           class, named by this property, cannot be instantiated.
    * @throws NamingException if throws by the context factory
    */
   public static Context getInitialContext (Hashtable environment)
     throws NamingException
   {
     InitialContextFactory icf = null;
-    
+
     if (icfb != null)
       icf = icfb.createInitialContextFactory(environment);
     else
-      {	 
-	String java_naming_factory_initial = null;
-	if (environment != null)
-	  java_naming_factory_initial
-	    = (String) environment.get (Context.INITIAL_CONTEXT_FACTORY);
-	if (java_naming_factory_initial == null)
-	  java_naming_factory_initial =
-	    System.getProperty (Context.INITIAL_CONTEXT_FACTORY);
-	if (java_naming_factory_initial == null)
-	  throw new
-	    NoInitialContextException ("Can't find property: "
-				       + Context.INITIAL_CONTEXT_FACTORY);
+      {
+        String java_naming_factory_initial = null;
+        if (environment != null)
+          java_naming_factory_initial
+            = (String) environment.get (Context.INITIAL_CONTEXT_FACTORY);
+        if (java_naming_factory_initial == null)
+          java_naming_factory_initial =
+            System.getProperty (Context.INITIAL_CONTEXT_FACTORY);
+        if (java_naming_factory_initial == null)
+          throw new
+            NoInitialContextException ("Can't find property: "
+                                       + Context.INITIAL_CONTEXT_FACTORY);
 
-	try
-	  {
-	    icf = (InitialContextFactory)Class.forName
-		(java_naming_factory_initial, true,
-		 Thread.currentThread().getContextClassLoader())
-		.newInstance ();
-	  }
-	catch (Exception exception)
-	  {
-	    NoInitialContextException e
-	      = new NoInitialContextException
-	      ("Can't load InitialContextFactory class: "
-	       + java_naming_factory_initial);
-	    e.setRootCause(exception);
-	    throw e;
-	  }
+        try
+          {
+            icf = (InitialContextFactory)Class.forName
+                (java_naming_factory_initial, true,
+                 Thread.currentThread().getContextClassLoader())
+                .newInstance ();
+          }
+        catch (Exception exception)
+          {
+            NoInitialContextException e
+              = new NoInitialContextException
+              ("Can't load InitialContextFactory class: "
+               + java_naming_factory_initial);
+            e.setRootCause(exception);
+            throw e;
+          }
       }
 
     return icf.getInitialContext (environment);
@@ -178,7 +178,7 @@ public class NamingManager
    * After the factory is instantiated, its method
    * {@link ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)}
    * is called to create and return the object instance.
-   * 
+   *
    * @param refInfo passed to the factory
    * @param name passed to the factory
    * @param nameCtx passed to the factory
@@ -198,7 +198,7 @@ public class NamingManager
 
     // The final default location, as specified in the documentation.
     String finalPrefix = "com.sun.jndi.url";
-  
+
     CPStringBuilder allPrefixes = new CPStringBuilder();
 
     String prefixes;
@@ -208,7 +208,7 @@ public class NamingManager
         if (prefixes != null)
           allPrefixes.append(prefixes);
         }
-  
+
     prefixes = System.getProperty(Context.URL_PKG_PREFIXES);
     if (prefixes != null)
       {
@@ -224,7 +224,7 @@ public class NamingManager
     allPrefixes.append(finalPrefix);
 
       scheme = scheme + "." + scheme + "URLContextFactory";
-  
+
     StringTokenizer tokens = new StringTokenizer(allPrefixes.toString(), ":");
     while (tokens.hasMoreTokens())
         {
@@ -279,8 +279,8 @@ public class NamingManager
           {
             // Anything from getObjectInstance.
           }
-	}
-    
+        }
+
     return null;
   }
 
@@ -322,9 +322,9 @@ public class NamingManager
           }
       }
     return null;
-  }  
-  
-  
+  }
+
+
   /**
    * 
                    
    * Creates the URL context for the given URL scheme id.
@@ -345,7 +345,7 @@ public class NamingManager
    * After the factory is instantiated, its method
    * {@link ObjectFactory#getObjectInstance(Object, Name, Context, Hashtable)}
    * is called to create and return the object instance.
-   * 
+   *
    * @param scheme the url scheme that must be supported by the given context
    * @param environment the properties for creating the factory and context
    *                    (may be null)
@@ -354,7 +354,7 @@ public class NamingManager
    *                         context.
    */
   public static Context getURLContext (String scheme,
-				       Hashtable environment) 
+                                       Hashtable environment)
        throws NamingException
   {
     return getURLContext (null, null, null, scheme, environment);
@@ -362,12 +362,12 @@ public class NamingManager
 
   /**
    * Sets the initial object factory builder.
-   * 
+   *
    * @param builder the builder to set
-   * 
+   *
    * @throws SecurityException if the builder cannot be installed due
    *           security restrictions.
-   * @throws NamingException if the builder cannot be installed due other 
+   * @throws NamingException if the builder cannot be installed due other
    *           reasons
    * @throws IllegalStateException if setting the builder repeatedly
    */
@@ -385,7 +385,7 @@ public class NamingManager
   }
 
   static StringTokenizer getPlusPath (String property, Hashtable env,
-				      Context nameCtx)
+                                      Context nameCtx)
     throws NamingException
   {
     String path = (String) env.get (property);
@@ -398,12 +398,12 @@ public class NamingManager
       path += ":" + path2;
     return new StringTokenizer (path != null ? path : "", ":");
   }
-  
+
   /**
    * 
                    Creates an object for the specified name context, environment and
    * referencing context object.
                    
    * 
                    
-   * If the builder factory is set by 
+   * If the builder factory is set by
    * {@link #setObjectFactoryBuilder(ObjectFactoryBuilder)}, the call is
    * delegated to that factory. Otherwise, the object is created using the
    * following rules:
@@ -415,20 +415,20 @@ public class NamingManager
    *       are StringRefAddrs having the address type "URL", the object is
    *       created by the URL context factory. The used factory corresponds the
    *       the naming schema of the each URL. If the attempt to create
-   *       the object this way is not successful, the subsequent rule is 
+   *       the object this way is not successful, the subsequent rule is
    *       tried.
    * 
                  •   If the refInfo is not an instance of Reference or Referencable
    *       (for example, null), the object is created by the factories,
-   *       specified in the Context.OBJECT_FACTORIES property of the 
+   *       specified in the Context.OBJECT_FACTORIES property of the
    *       environment and the provider resource file, associated with the
    *       nameCtx. The value of this property is the colon separated list
    *       of the possible factories. If none of the factories can be
-   *       loaded, the refInfo is returned.            
+   *       loaded, the refInfo is returned.
    * 
    * 
                    
    * 
                    The object factory must be public and have the public parameterless
    * constructor.
                    
-   *  
+   *
    * @param refInfo the referencing object, for which the new object must be
    *          created (can be null). If not null, it is usually an instance of
    *          the {@link Reference} or {@link Referenceable}.
@@ -441,19 +441,19 @@ public class NamingManager
    * @param environment contains additional information for creating the object.
    *          This paramter can be null if there is no need to provide any
    *          additional information.
-   *        
+   *
    * @return  the created object. If the creation fails, in some cases
    *          the parameter refInfo may be returned.
-   * 
+   *
    * @throws NamingException if the attempt to name the new object has failed
    * @throws Exception if the object factory throws it. The object factory
    *           only throws an exception if it does not want other factories
    *           to be used to create the object.
    */
   public static Object getObjectInstance (Object refInfo,
-					  Name name,
-					  Context nameCtx,
-					  Hashtable environment)
+                                          Name name,
+                                          Context nameCtx,
+                                          Hashtable environment)
     throws Exception
   {
     ObjectFactory factory = null;
@@ -462,102 +462,102 @@ public class NamingManager
       factory = ofb.createObjectFactory (refInfo, environment);
     else
       {
-	// First see if we have a Reference or a Referenceable.  If so
-	// we do some special processing.
-	Object ref2 = refInfo;
-	if (refInfo instanceof Referenceable)
-	  ref2 = ((Referenceable) refInfo).getReference ();
-	if (ref2 instanceof Reference)
-	  {
-	    Reference ref = (Reference) ref2;
+        // First see if we have a Reference or a Referenceable.  If so
+        // we do some special processing.
+        Object ref2 = refInfo;
+        if (refInfo instanceof Referenceable)
+          ref2 = ((Referenceable) refInfo).getReference ();
+        if (ref2 instanceof Reference)
+          {
+            Reference ref = (Reference) ref2;
 
-	    // If we have a factory class name then we use that.
-	    String fClass = ref.getFactoryClassName ();
-	    if (fClass != null)
-	      {
-		// Exceptions here are passed to the caller.
-		Class k = Class.forName (fClass,
-					 true,
-					 Thread.currentThread().getContextClassLoader());
-		factory = (ObjectFactory) k.newInstance ();
-	      }
-	    else
-	      {
-		// There's no factory class name.  If the address is a
-		// StringRefAddr with address type `URL', then we try
-		// the URL's context factory.
-		Enumeration e = ref.getAll ();
-		while (e.hasMoreElements ())
-		  {
-		    RefAddr ra = (RefAddr) e.nextElement ();
-		    if (ra instanceof StringRefAddr
-			&& "URL".equals (ra.getType ()))
-		      {
-			factory
-			  = (ObjectFactory) getURLContext (refInfo,
-							   name,
-							   nameCtx,
-							   (String) ra.getContent (),
-							   environment);
-			Object obj = factory.getObjectInstance (refInfo,
-								name,
-								nameCtx,
-								environment);
-			if (obj != null)
-			  return obj;
-		      }
-		  }
+            // If we have a factory class name then we use that.
+            String fClass = ref.getFactoryClassName ();
+            if (fClass != null)
+              {
+                // Exceptions here are passed to the caller.
+                Class k = Class.forName (fClass,
+                                         true,
+                                         Thread.currentThread().getContextClassLoader());
+                factory = (ObjectFactory) k.newInstance ();
+              }
+            else
+              {
+                // There's no factory class name.  If the address is a
+                // StringRefAddr with address type `URL', then we try
+                // the URL's context factory.
+                Enumeration e = ref.getAll ();
+                while (e.hasMoreElements ())
+                  {
+                    RefAddr ra = (RefAddr) e.nextElement ();
+                    if (ra instanceof StringRefAddr
+                        && "URL".equals (ra.getType ()))
+                      {
+                        factory
+                          = (ObjectFactory) getURLContext (refInfo,
+                                                           name,
+                                                           nameCtx,
+                                                           (String) ra.getContent (),
+                                                           environment);
+                        Object obj = factory.getObjectInstance (refInfo,
+                                                                name,
+                                                                nameCtx,
+                                                                environment);
+                        if (obj != null)
+                          return obj;
+                      }
+                  }
 
-		// Have to try the next step.
-		factory = null;
-	      }
-	  }
+                // Have to try the next step.
+                factory = null;
+              }
+          }
 
-	// Now look at OBJECT_FACTORIES to find the factory.
-	if (factory == null)
-	  {
-	    StringTokenizer tokens = getPlusPath (Context.OBJECT_FACTORIES,
-						  environment, nameCtx);
+        // Now look at OBJECT_FACTORIES to find the factory.
+        if (factory == null)
+          {
+            StringTokenizer tokens = getPlusPath (Context.OBJECT_FACTORIES,
+                                                  environment, nameCtx);
 
-	    while (tokens.hasMoreTokens ())
-	      {
-		String klassName = tokens.nextToken ();
-		Class k = Class.forName (klassName,
-					 true,
-					 Thread.currentThread().getContextClassLoader());
-		factory = (ObjectFactory) k.newInstance ();
-		Object obj = factory.getObjectInstance (refInfo, name,
-							nameCtx, environment);
-		if (obj != null)
-		  return obj;
-	      }
+            while (tokens.hasMoreTokens ())
+              {
+                String klassName = tokens.nextToken ();
+                Class k = Class.forName (klassName,
+                                         true,
+                                         Thread.currentThread().getContextClassLoader());
+                factory = (ObjectFactory) k.newInstance ();
+                Object obj = factory.getObjectInstance (refInfo, name,
+                                                        nameCtx, environment);
+                if (obj != null)
+                  return obj;
+              }
 
-	    // Failure.
-	    return refInfo;
-	  }
+            // Failure.
+            return refInfo;
+          }
       }
 
     if (factory == null)
       return refInfo;
     Object obj = factory.getObjectInstance (refInfo, name,
-					    nameCtx, environment);
+                                            nameCtx, environment);
     return obj == null ? refInfo : obj;
   }
 
   /**
    * Sets the initial context factory builder.
-   * 
+   *
    * @param builder the builder to set
-   * 
+   *
    * @throws SecurityException if the builder cannot be installed due
    *           security restrictions.
-   * @throws NamingException if the builder cannot be installed due other 
+   * @throws NamingException if the builder cannot be installed due other
    *           reasons
    * @throws IllegalStateException if setting the builder repeatedly
-   * 
+   *
    * @see #hasInitialContextFactoryBuilder()
    */
-  public static void setInitialContextFactoryBuilder 
+  public static void setInitialContextFactoryBuilder
     (InitialContextFactoryBuilder builder)
     throws NamingException
   {
@@ -570,17 +570,17 @@ public class NamingManager
     if (builder != null)
       icfb = builder;
   }
-  
+
   /**
    * Creates a context in which the context operation must be continued.
    * This method is used by operations on names that span multiple namespaces.
-   * 
+   *
    * @param cpe the exception that triggered this continuation. This method
    * obtains the environment ({@link CannotProceedException#getEnvironment()}
    * and sets the environment property {@link #CPE} = cpe.
-   * 
+   *
    * @return a non null context for continuing the operation
-   * 
+   *
    * @throws NamingException if the naming problems have occured
    */
   public static Context getContinuationContext (CannotProceedException cpe)
@@ -593,12 +593,12 @@ public class NamingManager
     // TODO: Check if this implementation matches the API specification
     try
       {
-	Object obj = getObjectInstance (cpe.getResolvedObj(),
-					cpe.getAltName (),
-					cpe.getAltNameCtx (), 
-					env);
-	if (obj != null)
-	  return (Context) obj;
+        Object obj = getObjectInstance (cpe.getResolvedObj(),
+                                        cpe.getAltName (),
+                                        cpe.getAltNameCtx (),
+                                        env);
+        if (obj != null)
+          return (Context) obj;
       }
     catch (Exception _)
       {
@@ -609,10 +609,10 @@ public class NamingManager
 
     throw cpe;
   }
-  
+
   /**
    * Get the object state for binding.
-   * 
+   *
    * @param obj the object, for that the binding state must be retrieved. Cannot
    *          be null.
    * @param name the name of this object, related to the nameCtx. Can be null if
@@ -624,46 +624,46 @@ public class NamingManager
    * @return the object state for binding, may be null if no changes are
    *         returned by the factory
    * @throws NamingException
-   */ 
+   */
   public static Object getStateToBind (Object obj, Name name,
-				       Context nameCtx, Hashtable environment)
+                                       Context nameCtx, Hashtable environment)
     throws NamingException
   {
     StringTokenizer tokens = getPlusPath (Context.STATE_FACTORIES,
-					  environment, nameCtx);
+                                          environment, nameCtx);
     while (tokens.hasMoreTokens ())
       {
-	String klassName = tokens.nextToken ();
-	try
-	  {
-	    Class k = Class.forName (klassName,
-				     true,
-				     Thread.currentThread().getContextClassLoader());
-	    StateFactory factory = (StateFactory) k.newInstance ();
-	    Object o = factory.getStateToBind (obj, name, nameCtx,
-					       environment);
-	    if (o != null)
-	      return o;
-	  }
-	catch (ClassNotFoundException _1)
-	  {
-	    // Ignore it.
-	  }
-	catch (ClassCastException _2)
-	  {
-	    // This means that the class we found was not an
-	    // ObjectFactory or that the factory returned something
-	    // which was not a Context.
-	  }
-	catch (InstantiationException _3)
-	  {
-	    // If we couldn't instantiate the factory we might get
-	    // this.
-	  }
-	catch (IllegalAccessException _4)
-	  {
-	    // Another possibility when instantiating.
-	  }
+        String klassName = tokens.nextToken ();
+        try
+          {
+            Class k = Class.forName (klassName,
+                                     true,
+                                     Thread.currentThread().getContextClassLoader());
+            StateFactory factory = (StateFactory) k.newInstance ();
+            Object o = factory.getStateToBind (obj, name, nameCtx,
+                                               environment);
+            if (o != null)
+              return o;
+          }
+        catch (ClassNotFoundException _1)
+          {
+            // Ignore it.
+          }
+        catch (ClassCastException _2)
+          {
+            // This means that the class we found was not an
+            // ObjectFactory or that the factory returned something
+            // which was not a Context.
+          }
+        catch (InstantiationException _3)
+          {
+            // If we couldn't instantiate the factory we might get
+            // this.
+          }
+        catch (IllegalAccessException _4)
+          {
+            // Another possibility when instantiating.
+          }
       }
 
     return obj;
diff --git a/libjava/classpath/javax/naming/spi/ObjectFactory.java b/libjava/classpath/javax/naming/spi/ObjectFactory.java
index 4534481a75a..d44d2ff6513 100644
--- a/libjava/classpath/javax/naming/spi/ObjectFactory.java
+++ b/libjava/classpath/javax/naming/spi/ObjectFactory.java
@@ -54,7 +54,7 @@ public interface ObjectFactory
   /**
    * Creates the object, using the specified name and location information. The
    * call of this method must be thread safe.
-   * 
+   *
    * @param refObj may provide the reference and location information. Can be null.
    * @param name the name of the new object in the scope of the specified naming
    *          context. Can be null if the name is not specified.
@@ -67,8 +67,8 @@ public interface ObjectFactory
    * @return the newly created object or null if the object cannot be created
    * @throws Exception if this factory suggest not to try creating of this
    *           object by other alternative factories
-   *           
-   * @see NamingManager#getObjectInstance(Object, Name, Context, Hashtable)           
+   *
+   * @see NamingManager#getObjectInstance(Object, Name, Context, Hashtable)
    */
   Object getObjectInstance (Object refObj, Name name, Context nameCtx,
                             Hashtable environment)
diff --git a/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java b/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java
index 6a528b17a06..e0886d144cb 100644
--- a/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java
+++ b/libjava/classpath/javax/naming/spi/ObjectFactoryBuilder.java
@@ -43,19 +43,19 @@ import java.util.Hashtable;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 import javax.naming.Referenceable;
- 
+
 /**
  * Represents the builder that creates the object factories.
- * 
+ *
  * @see NamingManager#setObjectFactoryBuilder(ObjectFactoryBuilder)
- * 
+ *
  * @author Warren Levy (warrenl@redhat.com)
  */
 public interface ObjectFactoryBuilder
 {
   /**
    * Create a new object using the supplied environment.
-   * 
+   *
    * @param refInfo the referencing object, for which the new object must be
    *          created (can be null). If not null, it is usually an instance of
    *          the {@link Reference} or {@link Referenceable}.
@@ -65,6 +65,6 @@ public interface ObjectFactoryBuilder
    * @throws NamingException
    */
   ObjectFactory createObjectFactory(Object refInfo,
-  					   Hashtable environment)
-					   throws NamingException;
+                                           Hashtable environment)
+                                           throws NamingException;
 }
diff --git a/libjava/classpath/javax/naming/spi/ResolveResult.java b/libjava/classpath/javax/naming/spi/ResolveResult.java
index d5051a5d4da..3945b9b4301 100644
--- a/libjava/classpath/javax/naming/spi/ResolveResult.java
+++ b/libjava/classpath/javax/naming/spi/ResolveResult.java
@@ -43,12 +43,12 @@ import java.io.Serializable;
 import javax.naming.CompositeName;
 import javax.naming.InvalidNameException;
 import javax.naming.Name;
- 
+
 /**
  * Stores the partial resolution of the name. This class contains the
  * object to which part of the name has been resolved and the remaining,
- * unresolved part of this name. 
- * 
+ * unresolved part of this name.
+ *
  * @author Warren Levy (warrenl@redhat.com)
  */
 
@@ -61,22 +61,22 @@ public class ResolveResult implements Serializable
    * The object, to that part of the name has been resolved.
    */
   protected Object resolvedObj;
-  
+
   /**
    * The remaining, unresolved part of the name.
    */
   protected Name remainingName;
-  
+
   /**
    * Create the unitialised instance with both parts being null.
    */
   protected ResolveResult()
   {
   }
-  
+
   /**
    * Create the initialised instance
-   * 
+   *
    * @param resolved the object, to that the name is partially resolved
    * @param remaining the remaining unresolved part of the name.
    */
@@ -88,7 +88,7 @@ public class ResolveResult implements Serializable
     remainingName = new CompositeName ();
     try
       {
-	remainingName.add (remaining);
+        remainingName.add (remaining);
       }
     catch (InvalidNameException _)
       {
@@ -97,7 +97,7 @@ public class ResolveResult implements Serializable
 
   /**
    * Create the initialised instance
-   * 
+   *
    * @param resolved the object, to that the name is partially resolved
    * @param remaining the remaining unresolved part of the name.
    */
@@ -109,7 +109,7 @@ public class ResolveResult implements Serializable
 
   /**
    * Get the remaining unresolved part of the name
-   * 
+   *
    * @return the remaining unresolved part of the name.
    */
   public Name getRemainingName()
@@ -119,17 +119,17 @@ public class ResolveResult implements Serializable
 
   /**
    * Get the object to that the name was partially resolved
-   * 
+   *
    * @return the object, to that the name is partially resolved
    */
   public Object getResolvedObj()
   {
     return resolvedObj;
   }
-  
+
   /**
    * Set the remaining unresolved name.
-   * 
+   *
    * @param name the name being set. The passed parameter is cloned, so the
    *          caller can reuse or modify it after the method returns.
    */
@@ -137,17 +137,17 @@ public class ResolveResult implements Serializable
   {
     remainingName = (Name) name.clone();
   }
-  
+
   /**
    * Append the name to the end of the resolved name.
-   * 
+   *
    * @param name the name to append
    */
   public void appendRemainingName(Name name)
   {
     try
       {
-	remainingName.addAll(name);
+        remainingName.addAll(name);
       }
     catch (InvalidNameException _)
       {
@@ -156,14 +156,14 @@ public class ResolveResult implements Serializable
 
   /**
    * Append the name to the end of the resolved name.
-   * 
+   *
    * @param name the name to append
    */
   public void appendRemainingComponent(String name)
   {
     try
       {
-	remainingName.add(name);
+        remainingName.add(name);
       }
     catch (InvalidNameException _)
       {
@@ -172,7 +172,7 @@ public class ResolveResult implements Serializable
 
   /**
    * Set the object to that the part of the name has been resolved.
-   * 
+   *
    * @param obj the object, to that the name has been partially resolved.
    */
   public void setResolvedObj(Object obj)
diff --git a/libjava/classpath/javax/naming/spi/Resolver.java b/libjava/classpath/javax/naming/spi/Resolver.java
index 67174cfa5a5..7a009fabc04 100644
--- a/libjava/classpath/javax/naming/spi/Resolver.java
+++ b/libjava/classpath/javax/naming/spi/Resolver.java
@@ -41,19 +41,19 @@ package javax.naming.spi;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
- 
+
 /**
  * 
                    Represents the object, capable for the at least partial name resolution.
  * The object is not necessay capable for the complete name resolution and
  * need not implement the {@link Context}.
                    
  * 
                    
  * Both passed parameters and returned results are owned by the caller.
                    
- * 
+ *
  * @author Warren Levy (warrenl@redhat.com)
  */
 public interface Resolver
 {
-  ResolveResult resolveToClass(Name name, 
+  ResolveResult resolveToClass(Name name,
                                Class contextType)
     throws NamingException;
   ResolveResult resolveToClass(String name,
diff --git a/libjava/classpath/javax/naming/spi/StateFactory.java b/libjava/classpath/javax/naming/spi/StateFactory.java
index 0c48309e3d5..d674803a40f 100644
--- a/libjava/classpath/javax/naming/spi/StateFactory.java
+++ b/libjava/classpath/javax/naming/spi/StateFactory.java
@@ -43,13 +43,13 @@ import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
- 
+
 /**
  * Represents a factory, producing the object states for binding. The operation,
  * performed by this factory, is the reverse operation with related to the
  * operation, performed by the {@link ObjectFactory}. Classes, implementing
  * this interface, must be public and have public parameterless constructor.
- * 
+ *
  * @see DirStateFactory
  * @see ObjectFactory
  * @author Warren Levy (warrenl@redhat.com)
@@ -58,7 +58,7 @@ public interface StateFactory
 {
   /**
    * Get the object state for binding.
-   * 
+   *
    * @param obj the object, for that the binding state must be retrieved. Cannot
    *          be null.
    * @param name the name of this object, related to the nameCtx. Can be null if
@@ -70,10 +70,10 @@ public interface StateFactory
    * @return the object state for binding, may be null if no changes are
    *         returned by the factory
    * @throws NamingException
-   * 
+   *
    * @see NamingManager#getStateToBind
    * @see DirectoryManager#getStateToBind
    */
   Object getStateToBind(Object obj, Name name, Context nameCtx,
-  			       Hashtable environment) throws NamingException;
+                               Hashtable environment) throws NamingException;
 }
diff --git a/libjava/classpath/javax/net/ssl/CertPathTrustManagerParameters.java b/libjava/classpath/javax/net/ssl/CertPathTrustManagerParameters.java
index b6dc135e119..c23d6549040 100644
--- a/libjava/classpath/javax/net/ssl/CertPathTrustManagerParameters.java
+++ b/libjava/classpath/javax/net/ssl/CertPathTrustManagerParameters.java
@@ -1,4 +1,4 @@
-/* CertPathTrustManagerParameters.java -- 
+/* CertPathTrustManagerParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/javax/net/ssl/KeyManagerFactory.java b/libjava/classpath/javax/net/ssl/KeyManagerFactory.java
index 33f2fda9c7f..d9519512a23 100644
--- a/libjava/classpath/javax/net/ssl/KeyManagerFactory.java
+++ b/libjava/classpath/javax/net/ssl/KeyManagerFactory.java
@@ -134,7 +134,7 @@ public class KeyManagerFactory
   /**
    * Create an instance of the named key manager factory, from the first
    * provider that implements it.
-   * 
+   *
    * @param algorithm The type of key manager factory to get.
    * @return An appropriate implementation of that algoritm.
    * @throws NoSuchAlgorithmException If no provider implements the requested
@@ -164,7 +164,7 @@ public class KeyManagerFactory
   /**
    * Create an instance of the named key manager factory, from the named
    * provider.
-   * 
+   *
    * @param algorithm The type of key manager factory to get.
    * @param provider The name of the provider to get the implementation from.
    * @return An appropriate implementation of that algorithm.
@@ -190,7 +190,7 @@ public class KeyManagerFactory
   /**
    * Create an instance of the named key manager factory, from the given
    * provider.
-   * 
+   *
    * @param algorithm The type of key manager factory to get.
    * @param provider The provider to get the implementation from.
    * @return An appropriate implementation of that algorithm.
diff --git a/libjava/classpath/javax/net/ssl/KeyStoreBuilderParameters.java b/libjava/classpath/javax/net/ssl/KeyStoreBuilderParameters.java
index 2aa665ed5ea..26b61428f9d 100644
--- a/libjava/classpath/javax/net/ssl/KeyStoreBuilderParameters.java
+++ b/libjava/classpath/javax/net/ssl/KeyStoreBuilderParameters.java
@@ -1,4 +1,4 @@
-/* KeyStoreBuilderParameters.java -- 
+/* KeyStoreBuilderParameters.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/javax/net/ssl/SSLContext.java b/libjava/classpath/javax/net/ssl/SSLContext.java
index dcc85080956..9a6e9a5f089 100644
--- a/libjava/classpath/javax/net/ssl/SSLContext.java
+++ b/libjava/classpath/javax/net/ssl/SSLContext.java
@@ -94,7 +94,7 @@ public class SSLContext
   /**
    * Get an instance of a context for the specified protocol from the first
    * provider that implements it.
-   * 
+   *
    * @param protocol The name of the protocol to get a context for.
    * @return The new context.
    * @throws NoSuchAlgorithmException If no provider implements the given
@@ -124,7 +124,7 @@ public class SSLContext
   /**
    * Get an instance of a context for the specified protocol from the named
    * provider.
-   * 
+   *
    * @param protocol The name of the protocol to get a context for.
    * @param provider The name of the provider to get the implementation from.
    * @return The new context.
@@ -149,7 +149,7 @@ public class SSLContext
   /**
    * Get an instance of a context for the specified protocol from the specified
    * provider.
-   * 
+   *
    * @param protocol The name of the protocol to get a context for.
    * @param provider The name of the provider to get the implementation from.
    * @return The new context.
diff --git a/libjava/classpath/javax/net/ssl/SSLEngine.java b/libjava/classpath/javax/net/ssl/SSLEngine.java
index efab9725b59..2ba7bb63673 100644
--- a/libjava/classpath/javax/net/ssl/SSLEngine.java
+++ b/libjava/classpath/javax/net/ssl/SSLEngine.java
@@ -73,7 +73,7 @@ public abstract class SSLEngine
     this.peerPort = peerPort;
   }
 
-
+
 
   /**
    * Begin, or restart, the SSL handshake.
@@ -359,8 +359,8 @@ public abstract class SSLEngine
    * negative, or if 'length+offset' is greater than 'sinks.length'.
    */
   public abstract SSLEngineResult unwrap (ByteBuffer source,
-					  ByteBuffer[] sinks, int offset,
-					  int length)
+                                          ByteBuffer[] sinks, int offset,
+                                          int length)
     throws javax.net.ssl.SSLException;
 
   /**
@@ -436,7 +436,7 @@ public abstract class SSLEngine
    * negative, or if 'length+offset' is greater than 'sources.length'.
    */
   public abstract SSLEngineResult wrap (ByteBuffer[] sources, int offset,
-					int length, ByteBuffer sink)
+                                        int length, ByteBuffer sink)
     throws SSLException;
 
 }
diff --git a/libjava/classpath/javax/net/ssl/SSLEngineResult.java b/libjava/classpath/javax/net/ssl/SSLEngineResult.java
index 0d6a435dd87..4d15258f39c 100644
--- a/libjava/classpath/javax/net/ssl/SSLEngineResult.java
+++ b/libjava/classpath/javax/net/ssl/SSLEngineResult.java
@@ -1,4 +1,4 @@
-/* SSLEngineResult.java -- 
+/* SSLEngineResult.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -64,7 +64,7 @@ public class SSLEngineResult
    * null, or if either integer is negative.
    */
   public SSLEngineResult (Status status, HandshakeStatus handshakeStatus,
-			  int bytesConsumed, int bytesProduced)
+                          int bytesConsumed, int bytesProduced)
   {
     if (status == null)
       throw new IllegalArgumentException ("'status' may not be null");
@@ -80,7 +80,7 @@ public class SSLEngineResult
     this.bytesProduced = bytesProduced;
   }
 
-
+
 
   /**
    * An enumeration of possible general states.
@@ -143,7 +143,7 @@ public class SSLEngineResult
     NEED_UNWRAP
   }
 
-
+
 
   /**
    * Returns the number of bytes consumed by the previous operation.
@@ -188,7 +188,7 @@ public class SSLEngineResult
   public String toString ()
   {
     return (super.toString () + " [ status: " + status + "; handshakeStatus: "
-	    + handshakeStatus + "; bytesConsumed: " + bytesConsumed
-	    + "; bytesProduced: " + bytesProduced + " ]");
+            + handshakeStatus + "; bytesConsumed: " + bytesConsumed
+            + "; bytesProduced: " + bytesProduced + " ]");
   }
 }
diff --git a/libjava/classpath/javax/net/ssl/SSLException.java b/libjava/classpath/javax/net/ssl/SSLException.java
index 3213b0b458f..c72671730db 100644
--- a/libjava/classpath/javax/net/ssl/SSLException.java
+++ b/libjava/classpath/javax/net/ssl/SSLException.java
@@ -45,7 +45,7 @@ import java.io.IOException;
  * exception is thrown instead of this exception.
  *
  * @author Casey Marshall (rsdio@metastatic.org)
- * 
+ *
  * @since 1.4
  */
 public class SSLException extends IOException
@@ -64,7 +64,7 @@ public class SSLException extends IOException
   {
     super(message);
   }
-  
+
   /**
    * Create a new instance with a descriptive error message and
    * a cause.
@@ -77,7 +77,7 @@ public class SSLException extends IOException
     super(message);
     initCause(cause);
   }
-  
+
   /**
    * Create a new instance with a cause.
    * @param cause the cause
diff --git a/libjava/classpath/javax/net/ssl/TrustManagerFactory.java b/libjava/classpath/javax/net/ssl/TrustManagerFactory.java
index f868ae75b70..e08501a7b38 100644
--- a/libjava/classpath/javax/net/ssl/TrustManagerFactory.java
+++ b/libjava/classpath/javax/net/ssl/TrustManagerFactory.java
@@ -96,7 +96,7 @@ public class TrustManagerFactory
   /**
    * Returns an instance of a trust manager factory for the given algorithm from
    * the first provider that implements it.
-   * 
+   *
    * @param algorithm The name of the algorithm to get.
    * @return The instance of the trust manager factory.
    * @throws NoSuchAlgorithmException If no provider implements the given
@@ -126,7 +126,7 @@ public class TrustManagerFactory
   /**
    * Returns an instance of a trust manager factory for the given algorithm from
    * the named provider.
-   * 
+   *
    * @param algorithm The name of the algorithm to get.
    * @param provider The name of the provider to get the instance from.
    * @return The instance of the trust manager factory.
@@ -152,7 +152,7 @@ public class TrustManagerFactory
   /**
    * Returns an instance of a trust manager factory for the given algorithm from
    * the specified provider.
-   * 
+   *
    * @param algorithm The name of the algorithm to get.
    * @param provider The provider to get the instance from.
    * @return The instance of the trust manager factory.
diff --git a/libjava/classpath/javax/net/ssl/X509ExtendedKeyManager.java b/libjava/classpath/javax/net/ssl/X509ExtendedKeyManager.java
index ccd146f822c..0e7c4d48492 100644
--- a/libjava/classpath/javax/net/ssl/X509ExtendedKeyManager.java
+++ b/libjava/classpath/javax/net/ssl/X509ExtendedKeyManager.java
@@ -1,4 +1,4 @@
-/* X509ExtendedKeyManager.java -- 
+/* X509ExtendedKeyManager.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is a part of GNU Classpath.
diff --git a/libjava/classpath/javax/print/AttributeException.java b/libjava/classpath/javax/print/AttributeException.java
index 1251b00bb35..9a72c53d061 100644
--- a/libjava/classpath/javax/print/AttributeException.java
+++ b/libjava/classpath/javax/print/AttributeException.java
@@ -46,29 +46,29 @@ import javax.print.attribute.Attribute;
  * provide further information of printing errors if unsupported
  * attribute classes or values of attributes are involved.
  * 
                    
- * There exists no PrintException class implementing this 
- * interface. Providing these extensions in PrintException 
- * subclasses is left to the concrete print service implementation. 
- * 
                     
- * 
+ * There exists no PrintException class implementing this
+ * interface. Providing these extensions in PrintException
+ * subclasses is left to the concrete print service implementation.
+ * 
                    
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface AttributeException
 {
   /**
    * Returns the unsupported printing attribute classes for a print service
-   * that does not support the attribute category at all. The returned 
+   * that does not support the attribute category at all. The returned
    * class instances are sublcasses of the base interface {@link Attribute}.
-   * 
+   *
    * @return The unsupported attribute classes, or null if there
    * are no such attribute classes.
    */
   Class[] getUnsupportedAttributes();
-  
+
   /**
    * Returns the unsupported attribute values of printing attributes a specific
    * print service does support but not the particular provided value.
-   *   
+   *
    * @return The unsupported attribute values, or null if there
    * are no such attributes values.
    */
diff --git a/libjava/classpath/javax/print/CancelablePrintJob.java b/libjava/classpath/javax/print/CancelablePrintJob.java
index 39a25440e5e..60ad584aa43 100644
--- a/libjava/classpath/javax/print/CancelablePrintJob.java
+++ b/libjava/classpath/javax/print/CancelablePrintJob.java
@@ -39,18 +39,18 @@ exception statement from your version. */
 package javax.print;
 
 /**
- * CancelablePrintJob represents a print job which can be 
+ * CancelablePrintJob represents a print job which can be
  * canceled.
  * 
                    
- * It is implemented by DocPrintJobs which support to cancel 
- * a print job during processing. Clients need to explicitly test if a given 
- * DocPrintJob object from a print service implementes this 
+ * It is implemented by DocPrintJobs which support to cancel
+ * a print job during processing. Clients need to explicitly test if a given
+ * DocPrintJob object from a print service implementes this
  * interface and therefore supports cancelling.
  * 
                    
  * Implementor of java print services should implement this interface if
  * cancelling is supported by the underlying print system. If implemented the
- * corresponding print job event 
- * {@link javax.print.event.PrintJobEvent#JOB_CANCELED} should be delivered to 
+ * corresponding print job event
+ * {@link javax.print.event.PrintJobEvent#JOB_CANCELED} should be delivered to
  * registered clients. Implementations have to be thread-safe.
  * 
                    
  *
diff --git a/libjava/classpath/javax/print/Doc.java b/libjava/classpath/javax/print/Doc.java
index c489de1b64e..d8b6ff08285 100644
--- a/libjava/classpath/javax/print/Doc.java
+++ b/libjava/classpath/javax/print/Doc.java
@@ -45,29 +45,29 @@ import java.io.Reader;
 import javax.print.attribute.DocAttributeSet;
 
 /**
- * Doc specifies the interface for print services how to obtain 
- * the print data and document specific attributes for printing. 
+ * Doc specifies the interface for print services how to obtain
+ * the print data and document specific attributes for printing.
  * 
                    
- * The print data is always passed to a {@link javax.print.DocPrintJob} object 
+ * The print data is always passed to a {@link javax.print.DocPrintJob} object
  * as a Doc object which allows the print services to:
  * 
                      
  * 
                    • Determine the actual document format of the supplied print data. This
  *  is supplied as a {@link javax.print.DocFlavor} object with the MIME type
  *  and the representation class of the print data.
                      • 
  * 
                    • Obtain the print data either in its representation class or depending
- *  on the document format through convenience methods as a 
+ *  on the document format through convenience methods as a
  *  {@link java.io.Reader} or an {@link java.io.InputStream}.
                      • 
  * 
                    • Obtain the document's attribute set specifying the attributes which
  *  apply to this document instance.
                      • 
- * 
                     
+ * 
  * 
                    
- * Every method of a Doc implementation has to return always the 
- * same object on every method call. Therefore if the print job consumes the 
- * print data via a stream or a reader object it can read only once the 
- * supplied print data. Implementations of this interface have to be thread 
- * safe. 
+ * Every method of a Doc implementation has to return always the
+ * same object on every method call. Therefore if the print job consumes the
+ * print data via a stream or a reader object it can read only once the
+ * supplied print data. Implementations of this interface have to be thread
+ * safe.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface Doc
@@ -75,20 +75,20 @@ public interface Doc
   /**
    * Returns the unmodifiable view of the attributes of this doc object.
    * 
                    
-   * The attributes of this doc's attributes set overrides attributes of 
-   * the same category in the print job's attribute set. If an attribute 
+   * The attributes of this doc's attributes set overrides attributes of
+   * the same category in the print job's attribute set. If an attribute
    * is not available in this doc's attributes set or null
    * is returned the attributes of the same category of the print job are
-   * used. 
+   * used.
    * 
                    
-   * 
+   *
    * @return The unmodifiable attributes set, or null.
    */
   DocAttributeSet getAttributes();
 
   /**
    * Returns the flavor of this doc objects print data.
-   * 
+   *
    * @return The document flavor.
    */
   DocFlavor getDocFlavor();
@@ -100,7 +100,7 @@ public interface Doc
    * document flavor ({@link DocFlavor#getRepresentationClassName()})
    * and can be cast to this representation class.
    * 
                    
-   * 
+   *
    * @return The print data in the representation class.
    * @throws IOException if representation class is a stream and I/O
    * exception occures.
@@ -118,10 +118,10 @@ public interface Doc
    * 
                  • java.io.Reader
                    • 
    * 
    * otherwise this method returns null.
-   * 
                     
-   * 
+   * 
                    
+   *
    * @return The Reader object, or null.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   Reader getReaderForText() throws IOException;
@@ -136,11 +136,11 @@ public interface Doc
    * 
                  • java.io.InputStream
                    • 
    * 
    * otherwise this method returns null.
-   * 
                     
-   * 
+   * 
                    
+   *
    * @return The InputStream object, or null.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   InputStream getStreamForBytes() throws IOException;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/DocFlavor.java b/libjava/classpath/javax/print/DocFlavor.java
index 6030595254d..b95f46231c9 100644
--- a/libjava/classpath/javax/print/DocFlavor.java
+++ b/libjava/classpath/javax/print/DocFlavor.java
@@ -49,71 +49,71 @@ import java.util.Map;
 import java.util.TreeMap;
 
 /**
- * DocFlavor provides a description of the format in which the 
+ * DocFlavor provides a description of the format in which the
  * print data will be supplied in a print job to the print service.
  * 
                    
  * A doc flavor consists of two parts:
  * 
                      
  * 
                    • 
- * The MIME type (Multipurpose Internet Mail Extensions types as described 
+ * The MIME type (Multipurpose Internet Mail Extensions types as described
  * in RFC 2045/2046) specifying the media format of the print data.
  * 
                    • 
- * The representation class name which is the fully qualified name of the 
- * class providing the print data to the print job. For example if the print 
- * data is supplied as a byte array the representation class name will be 
+ * The representation class name which is the fully qualified name of the
+ * class providing the print data to the print job. For example if the print
+ * data is supplied as a byte array the representation class name will be
  * "[B" or for an input stream "java.io.InputStream".
  * 
                      • 
  * 
                    
- * The DocFlavor class is therefore used in several places in the 
- * Java Print Service API. A print service provides its supported document 
+ * The DocFlavor class is therefore used in several places in the
+ * Java Print Service API. A print service provides its supported document
  * flavors as an array of DocFlavor objects and a print job gets the flavor of
  * its data to print from the Doc object provided as a DocFlavor
  * instance.
  * 
                    
  * 
                    
- * It has to be differentiated between client formatted and service 
- * formatted print data. Client formatted print data is already provided 
- * formatted by the client e.g. in an image format or as postscript. For 
- * service formatted print data, the Java Print Service instance produces 
- * the formatted print data. Here the doc flavor's representation class name 
- * does specify an interface instead of the actual print data source. The 
+ * It has to be differentiated between client formatted and service
+ * formatted print data. Client formatted print data is already provided
+ * formatted by the client e.g. in an image format or as postscript. For
+ * service formatted print data, the Java Print Service instance produces
+ * the formatted print data. Here the doc flavor's representation class name
+ * does specify an interface instead of the actual print data source. The
  * print service will call the methods of the given implementation of this
  * interface with a special Graphics object capable of producing formatted
  * print data from the graphics routines inside the interface methods.
  * 
                    
  * 
                    
  * 
                    Client formatted print data document flavors
                    
- * The print service uses the representation class of the doc flavor to know 
- * how to retrieve the print data. If the representation class is a 
- * URL it will open the URL to read the print data from it. If it is 
- * a byte[] it will directly use the array and send it to the 
- * printer. There are predefined doc flavor as inner class for the most common 
+ * The print service uses the representation class of the doc flavor to know
+ * how to retrieve the print data. If the representation class is a
+ * URL it will open the URL to read the print data from it. If it is
+ * a byte[] it will directly use the array and send it to the
+ * printer. There are predefined doc flavor as inner class for the most common
  * representation class types:
  * 
                      
- * 
                    • Character arrays (char[]): The characters of the array 
+ * 
                    • Character arrays (char[]): The characters of the array
  * represent the print data.
                      • 
- * 
                    • Character streams (java.io.Reader): The whole characters 
+ * 
                    • Character streams (java.io.Reader): The whole characters
  * read from the stream represent the print data.
                      • 
- * 
                    • String (java.lang.String): The characters of the String 
+ * 
                    • String (java.lang.String): The characters of the String
  * represent the print data.
                      • 
- * 
                    • Byte arrays (byte[]): The bytes of the array represent the 
+ * 
                    • Byte arrays (byte[]): The bytes of the array represent the
  * print data. Encoding if text content is given in the mime type.
                      • 
- * 
                    • Byte streams (java.io.InputStream): The whole bytes read 
- * from the stream represent the print data. If text content the encoding is 
+ * 
                    • Byte streams (java.io.InputStream): The whole bytes read
+ * from the stream represent the print data. If text content the encoding is
  * specified in the mime type.
                      • 
- * 
                    • Uniform Resource Locator (java.net.URL): The bytes read 
- * from the stream through opening of the URL represent the print data. 
+ * 
                    • Uniform Resource Locator (java.net.URL): The bytes read
+ * from the stream through opening of the URL represent the print data.
  * If text content the encoding is specified in the mime type.
                      • 
  * 
                    
  * 
                    
  * 
                    
  * 
                    Service formatted print data document flavors
                    
  * The print service uses the provided object implementing the interface
- * specified by the representation class to produce the formatted print data. 
- * The mime type of service formatted data is always 
- * "application/x-java-jvm-local-objectref" to signal the local 
+ * specified by the representation class to produce the formatted print data.
+ * The mime type of service formatted data is always
+ * "application/x-java-jvm-local-objectref" to signal the local
  * reference to the print data object implementing the interface. Predefined
- * doc flavor classes exist as an inner class for the three available interface 
+ * doc flavor classes exist as an inner class for the three available interface
  * to produce print data:
  * 
                      
  * 
                    • Pageable object (java.awt.print.Pageable): A pageable object
@@ -122,13 +122,13 @@ import java.util.TreeMap;
  * 
                    • Printable object (java.awt.print.Printable): A printable object
  * is supplied to the print service. The print service will call the methods of
  * the interface with a Grahics object to produce the formatted print data.
                      • 
- * 
                    • Renderable Image object 
+ * 
                    • Renderable Image object
  * (java.awt.image.renderable.RenderableImage): A renderable image
  * object is supplied to the print service. The print service calls methods of
  * this interface to obtain the image to be printed.
                      • 
  * 
                    
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -137,9 +137,9 @@ public class DocFlavor implements Cloneable, Serializable
   /**
    * Predefined static DocFlavor objects for document
    * types which use a byte array for the print data representation.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "[B" (byte array).
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class BYTE_ARRAY
@@ -206,7 +206,7 @@ public class DocFlavor implements Cloneable, Serializable
     /**
      * Byte array doc flavor with a MIME Type of "text/plain; charset=us-ascii".
      */
-    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");    
+    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");
     /**
      * Byte array doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
@@ -223,13 +223,13 @@ public class DocFlavor implements Cloneable, Serializable
      * Byte array doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final BYTE_ARRAY TEXT_PLAIN_UTF_8 = new BYTE_ARRAY("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "[B".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -238,20 +238,20 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "[B");
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which use a char array for the print data representation.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "[C" (char array).
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class CHAR_ARRAY
     extends DocFlavor
   {
     private static final long serialVersionUID = -8720590903724405128L;
-    
+
     /**
      * Char array doc flavor with a MIME Type of "text/html; charset=utf-16".
      */
@@ -262,11 +262,11 @@ public class DocFlavor implements Cloneable, Serializable
     public static final DocFlavor.CHAR_ARRAY TEXT_PLAIN = new CHAR_ARRAY("text/plain; charset=utf-16");
 
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "[C".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -275,13 +275,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "[C");
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which use an InputStream to retrieve the print data.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "java.io.InputStream".
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class INPUT_STREAM
@@ -365,13 +365,13 @@ public class DocFlavor implements Cloneable, Serializable
      * InputStream doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final INPUT_STREAM TEXT_PLAIN_UTF_8 = new INPUT_STREAM("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.io.InputStream".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -380,13 +380,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.io.InputStream");
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which use an Reader to retrieve the print data.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "java.io.Reader".
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class READER
@@ -402,13 +402,13 @@ public class DocFlavor implements Cloneable, Serializable
      * Reader doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
     public static final DocFlavor.READER TEXT_PLAIN = new READER("text/plain; charset=utf-16");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.io.Reader".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -417,13 +417,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.io.Reader");
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which use service formatted print data.
-   * 
                    All the defined doc flavors have a MIME type of 
+   * 
                    All the defined doc flavors have a MIME type of
    * "application/x-java-jvm-local-objectref".
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class SERVICE_FORMATTED
@@ -432,28 +432,28 @@ public class DocFlavor implements Cloneable, Serializable
     private static final long serialVersionUID = 6181337766266637256L;
 
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.print.Pageable".
      */
     public static final DocFlavor.SERVICE_FORMATTED PAGEABLE = new SERVICE_FORMATTED("java.awt.print.Pageable");
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.print.Printable".
      */
     public static final DocFlavor.SERVICE_FORMATTED PRINTABLE = new SERVICE_FORMATTED("java.awt.print.Printable");
     /**
-     * Service formatted doc flavor with a representation class of 
+     * Service formatted doc flavor with a representation class of
      * "java.awt.image.renderable.RenderableImage".
      */
     public static final DocFlavor.SERVICE_FORMATTED RENDERABLE_IMAGE = new SERVICE_FORMATTED("java.awt.image.renderable.RenderableImage");
-    
+
     /**
-     * Constructor for doc flavor objects with a MIME type of 
+     * Constructor for doc flavor objects with a MIME type of
      * "application/x-java-jvm-local-objectref" and the given
      * print data representation classname.
-     * 
+     *
      * @param className the representation classname
-     * 
+     *
      * @throws NullPointerException if className is null.
      */
     public SERVICE_FORMATTED(String className)
@@ -461,13 +461,13 @@ public class DocFlavor implements Cloneable, Serializable
       super("application/x-java-jvm-local-objectref", className);
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which use a String for the print data representation.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "java.lang.String".
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class STRING
@@ -483,13 +483,13 @@ public class DocFlavor implements Cloneable, Serializable
      * String doc flavor with a MIME Type of "text/plain; charset=utf-16".
      */
     public static final DocFlavor.STRING TEXT_PLAIN = new STRING("text/plain; charset=utf-16");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.lang.String".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -498,13 +498,13 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.lang.String");
     }
   }
-  
+
   /**
    * Predefined static DocFlavor objects for document
    * types which have an URL where to retrieve the print data.
-   * 
                    All the defined doc flavors have a print data representation 
+   * 
                    All the defined doc flavors have a print data representation
    * classname of "java.net.URL".
                    
-   * 
+   *
    * @author Michael Koch (konqueror@gmx.de)
    */
   public static class URL
@@ -588,13 +588,13 @@ public class DocFlavor implements Cloneable, Serializable
      * URL doc flavor with a MIME Type of "text/plain; charset=utf-8".
      */
     public static final DocFlavor.URL TEXT_PLAIN_UTF_8 = new URL("text/plain; charset=utf-8");
-    
+
     /**
-     * Constructor for doc flavor objects with the given MIME type 
+     * Constructor for doc flavor objects with the given MIME type
      * and a print data representation class name of "java.net.URL".
-     * 
+     *
      * @param mimeType the mime type string
-     * 
+     *
      * @throws NullPointerException if mimeType is null.
      * @throws IllegalArgumentException if mimeType has the wrong syntax.
      */
@@ -603,12 +603,12 @@ public class DocFlavor implements Cloneable, Serializable
       super(mimeType, "java.net.URL");
     }
   }
-  
+
   private static final long serialVersionUID = -4512080796965449721L;
-  
+
   /**
    * The string representing the host encoding. This is the encoding
-   * used in the predefined HOST doc flavors 
+   * used in the predefined HOST doc flavors
    * (e.g. {@link BYTE_ARRAY#TEXT_HTML_HOST}).
    */
   public static final String hostEncoding = Charset.defaultCharset().name();
@@ -616,17 +616,17 @@ public class DocFlavor implements Cloneable, Serializable
   private transient String mediaSubtype;
   private transient String mediaType;
   private transient TreeMap params;
-  
+
   // name as defined in Serialized Form JDK 1.4
   private String myClassName;
-  
+
   /**
-   * Constructs a DocFlavor object with the given MIME type and 
+   * Constructs a DocFlavor object with the given MIME type and
    * representation class name.
-   * 
+   *
    * @param mimeType the MIME type string.
    * @param className the fully-qualified name of the representation class.
-   * 
+   *
    * @throws NullPointerException if mimeType or className are null.
    * @throws IllegalArgumentException if given mimeType has syntax errors.
    */
@@ -637,15 +637,15 @@ public class DocFlavor implements Cloneable, Serializable
 
     params = new TreeMap();
     parseMimeType(mimeType);
-    
+
     myClassName = className;
   }
-  
+
   /**
    * Parses the given string as MIME type.
    * The mediatype, mediasubtype and all parameter/value
    * combinations are extracted, comments are dropped.
-   *  
+   *
    * @param mimeType the string to parse
    * @throws IllegalArgumentException if not conformant.
    */
@@ -656,11 +656,11 @@ public class DocFlavor implements Cloneable, Serializable
     int PARAM_NAME = 3;
     int PARAM_VALUE = 4;
     int COMMENT_START = 5;
-    
+
     int state = 0;
     int lastState = 0; // keeps track of state before comment
     int tok;
-    
+
     try
       {
         String paramName = null;
@@ -778,7 +778,7 @@ public class DocFlavor implements Cloneable, Serializable
         throw new InternalError("IOException during parsing String " + mimeType);
       }
   }
-  
+
   /**
    * Checks if this doc flavor object is equal to the given object.
    * 
                    
@@ -787,7 +787,7 @@ public class DocFlavor implements Cloneable, Serializable
    * types has to be equal in their media type, media subtype, their
    * paramter/value combinations and the representation classname.
    * 
                    
-   * 
+   *
    * @param obj the object to test.
    * @return true if equal, false otherwise.
    */
@@ -799,14 +799,14 @@ public class DocFlavor implements Cloneable, Serializable
     DocFlavor tmp = (DocFlavor) obj;
 
     return (getMimeType().equals(tmp.getMimeType())
-	    && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
+            && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
   }
 
   /**
    * Returns the media subtype of this flavor object.
    * A mimetype of "text/html; charset=us-ascii" will
-   * return "html" as the media subtype. 
-   * 
+   * return "html" as the media subtype.
+   *
    * @return The media subtype.
    */
   public String getMediaSubtype()
@@ -818,7 +818,7 @@ public class DocFlavor implements Cloneable, Serializable
    * Returns the media type of this flavor object.
    * A mimetype of "text/html; charset=us-ascii" will
    * return "text" as the media type.
-   * 
+   *
    * @return The media type.
    */
   public String getMediaType()
@@ -830,7 +830,7 @@ public class DocFlavor implements Cloneable, Serializable
    * Returns the mime type of this flavor object.
    * The mimetype will have every parameter value
    * enclosed in quotes.
-   * 
+   *
    * @return The mime type.
    */
   public String getMimeType()
@@ -840,8 +840,8 @@ public class DocFlavor implements Cloneable, Serializable
 
     while (it.hasNext())
       {
-	Map.Entry entry = (Map.Entry) it.next();
-	mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
+        Map.Entry entry = (Map.Entry) it.next();
+        mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
       }
 
     return mimeType;
@@ -850,7 +850,7 @@ public class DocFlavor implements Cloneable, Serializable
   /**
    * Returns the value for an optional parameter of the mime type of this
    * flavor object.
-   * 
+   *
    * @param paramName the name of the parameter
    * @return The value for the parameter, or null if none bound.
    * @throws NullPointerException if paramName is null.
@@ -859,13 +859,13 @@ public class DocFlavor implements Cloneable, Serializable
   {
     if (paramName == null)
       throw new NullPointerException();
-    
+
     return (String) params.get(paramName.toLowerCase());
   }
 
   /**
    * Returns the name of the representation class of this flavor object.
-   * 
+   *
    * @return The representation classname.
    */
   public String getRepresentationClassName()
@@ -875,30 +875,30 @@ public class DocFlavor implements Cloneable, Serializable
 
   /**
    * Returns a hash code for this doc flavor object.
-   * 
+   *
    * @return The hashcode.
    */
   public int hashCode()
   {
     return ((mediaType.hashCode()
-	     * mediaSubtype.hashCode()
-	     * myClassName.hashCode()) ^ params.hashCode());
+             * mediaSubtype.hashCode()
+             * myClassName.hashCode()) ^ params.hashCode());
   }
 
   /**
    * Returns a string representation of this doc flavor object.
    * The returned string is of the form
    * getMimeType() + "; class=\"" + getRepresentationClassName() + "\"";
-   * 
+   *
    * @return The constructed string representation.
    */
   public String toString()
   {
     return getMimeType() + "; class=\"" + getRepresentationClassName() + "\"";
   }
-  
+
   // needs special treatment for serialization
-  private void readObject(ObjectInputStream stream) 
+  private void readObject(ObjectInputStream stream)
     throws IOException, ClassNotFoundException
   {
     params = new TreeMap();
diff --git a/libjava/classpath/javax/print/DocPrintJob.java b/libjava/classpath/javax/print/DocPrintJob.java
index eec4e2afca4..ffafa47a5c6 100644
--- a/libjava/classpath/javax/print/DocPrintJob.java
+++ b/libjava/classpath/javax/print/DocPrintJob.java
@@ -44,14 +44,14 @@ import javax.print.event.PrintJobAttributeListener;
 import javax.print.event.PrintJobListener;
 
 /**
- * DocPrintJob represents a print job which supports printing 
- * of a single document. 
+ * DocPrintJob represents a print job which supports printing
+ * of a single document.
  * 
                    
- * An instance can be obtained from every PrintService available 
- * by calling the {@link javax.print.PrintService#createPrintJob()} method. 
+ * An instance can be obtained from every PrintService available
+ * by calling the {@link javax.print.PrintService#createPrintJob()} method.
  * A print job is bound to the print service it is created from.
  * 
                    
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface DocPrintJob
@@ -63,62 +63,62 @@ public interface DocPrintJob
    * If the given attribute set is empty no changes will be reported.
    * If the set is null all attributes are monitored.
    * 
                    
-   * 
+   *
    * @param listener the listener to register.
    * @param attributes the attributes to observe.
-   * 
+   *
    * @see #removePrintJobAttributeListener(PrintJobAttributeListener)
    */
   void addPrintJobAttributeListener(PrintJobAttributeListener listener,
-				    PrintJobAttributeSet attributes);
+                                    PrintJobAttributeSet attributes);
 
   /**
    * Registers a listener for events occuring during processing
    * of this print job.
-   * 
+   *
    * @param listener the listener to add, if null nothing is done.
-   * 
+   *
    * @see #removePrintJobListener(PrintJobListener)
    */
   void addPrintJobListener(PrintJobListener listener);
 
   /**
-   * Returns the print job's attributes. 
+   * Returns the print job's attributes.
    * 
                    
-   * The returned set of attributes is a snapshot at the time of calling this 
+   * The returned set of attributes is a snapshot at the time of calling this
    * method and will not be updated if changes to the print job's attributes
    * happens. To monitor changes register a print job listener.
    * 
                    
-   * 
-   * @return The attributes of this print job, 
+   *
+   * @return The attributes of this print job,
    * may be empty but never null.
    */
   PrintJobAttributeSet getAttributes();
 
   /**
    * Returns the PrintService object this print job is bound to.
-   * 
+   *
    * @return The print service.
    */
   PrintService getPrintService();
 
   /**
    * Prints a document with the specified print job attributes.
-   * 
+   *
    * 
                    
-   * If the doc flavor provided by the Doc implementation is 
-   * not supported by this print service a PrintException 
+   * If the doc flavor provided by the Doc implementation is
+   * not supported by this print service a PrintException
    * implementing the FlavorException interface will be thrown.
    * 
                    
-   * 
+   *
    * @param doc the document to print
-   * @param attributes the job attributes to use. If null the 
+   * @param attributes the job attributes to use. If null the
    * default attribute values of the print service will be used.
-   * 
-   * @throws PrintException if an error occurs. The thrown exception may 
-   * implement refining print exception interface to provide more detail of 
+   *
+   * @throws PrintException if an error occurs. The thrown exception may
+   * implement refining print exception interface to provide more detail of
    * the error.
-   * 
+   *
    * @see AttributeException
    * @see FlavorException
    */
@@ -127,22 +127,22 @@ public interface DocPrintJob
   /**
    * Removes the given listener from the listeners registered for changes
    * in their provided attribute set during processing of this print job.
-   * 
+   *
    * @param listener the listener to remove, if null or not
    * registered nothing will be done.
-   * 
+   *
    * @see #addPrintJobAttributeListener(PrintJobAttributeListener, PrintJobAttributeSet)
-   */  
+   */
   void removePrintJobAttributeListener(PrintJobAttributeListener listener);
 
   /**
-   * Removes the given listener from the listeners registered for events 
+   * Removes the given listener from the listeners registered for events
    * occuring during processing of this print job.
-   * 
+   *
    * @param listener the listener to remove, if null or not
    * registered nothing will be done.
-   * 
+   *
    * @see #addPrintJobListener(PrintJobListener)
    */
   void removePrintJobListener(PrintJobListener listener);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/FlavorException.java b/libjava/classpath/javax/print/FlavorException.java
index 879f10807d7..3e2fde2f4bd 100644
--- a/libjava/classpath/javax/print/FlavorException.java
+++ b/libjava/classpath/javax/print/FlavorException.java
@@ -44,19 +44,19 @@ package javax.print;
  * provide further information of printing errors if unsupported
  * document flavors are involved.
  * 
                    
- * There exists no PrintException class implementing this 
- * interface. Providing this extension in PrintException 
+ * There exists no PrintException class implementing this
+ * interface. Providing this extension in PrintException
  * subclasses is left to the concrete print service implementation.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface FlavorException
 {
   /**
    * Returns the unsupported document flavors.
-   * 
+   *
    * @return The unsupported document flavors.
    */
   DocFlavor[] getUnsupportedFlavors();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/MultiDoc.java b/libjava/classpath/javax/print/MultiDoc.java
index 6e9ec841f3a..40a83ab0c3f 100644
--- a/libjava/classpath/javax/print/MultiDoc.java
+++ b/libjava/classpath/javax/print/MultiDoc.java
@@ -46,30 +46,30 @@ import java.io.IOException;
  * documents for use in a print job.
  * 
                    
  * Implementations of this interface are used to pass multiple documents, to be
- * printed as one print job, to the MultiDocPrintJob instance.  
+ * printed as one print job, to the MultiDocPrintJob instance.
  * 
                    
- * There exists no implementation of this interface in the Java Print Service 
+ * There exists no implementation of this interface in the Java Print Service
  * API. Implementors may assume the following usage in print jobs and the needed
- * behaviour for implementations: The print job fetches the single documents via 
- * iteration by consecutive calls of the {@link #getDoc()} method to obtain the 
- * current document follwing calls of the {@link #next()} method to get the next 
+ * behaviour for implementations: The print job fetches the single documents via
+ * iteration by consecutive calls of the {@link #getDoc()} method to obtain the
+ * current document follwing calls of the {@link #next()} method to get the next
  * multidoc object for the next getDoc() method call (if returned
- * multidoc object is not null). The print service will fetch the 
- * document object and then retrieve the print data from the document before it 
+ * multidoc object is not null). The print service will fetch the
+ * document object and then retrieve the print data from the document before it
  * proceeds with the next call for the next MultiDoc object in the sequence.
  * 
                    
  * Implementations of this interface have to be multiple thread-safe.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDoc
 {
   /**
    * Returns the current document.
-   * 
+   *
    * @return The current document.
-   * 
+   *
    * @throws IOException if an error occurs
    */
   Doc getDoc() throws IOException;
@@ -77,11 +77,11 @@ public interface MultiDoc
   /**
    * Returns the next MultiDoc object that contains the
    * next document for retrieval.
-   * 
+   *
    * @return The next MultiDoc object, or null
    * if no more documents are available.
-   * 
+   *
    * @throws IOException if an error occurs
    */
   MultiDoc next() throws IOException;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/MultiDocPrintJob.java b/libjava/classpath/javax/print/MultiDocPrintJob.java
index 36089b5d070..c030c4d647a 100644
--- a/libjava/classpath/javax/print/MultiDocPrintJob.java
+++ b/libjava/classpath/javax/print/MultiDocPrintJob.java
@@ -42,36 +42,35 @@ import javax.print.attribute.PrintRequestAttributeSet;
 
 
 /**
- * MultiDocPrintJob represents a print job which supports 
+ * MultiDocPrintJob represents a print job which supports
  * printing of multiple documents as one print job.
  * 
                    
  * An instance can be obtained from every MultiDocPrintService
- * available by calling the 
- * {@link javax.print.MultiDocPrintService#createMultiDocPrintJob()} method. 
+ * available by calling the
+ * {@link javax.print.MultiDocPrintService#createMultiDocPrintJob()} method.
  * A print job is bound to the print service it is created from.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDocPrintJob extends DocPrintJob
 {
   /**
-   * Prints the documents supplied in the given MultiDoc object 
+   * Prints the documents supplied in the given MultiDoc object
    * as one print job with the given printing attributes.
-   * 
-   * @param multiDoc the documents to print. Every document must have a 
+   *
+   * @param multiDoc the documents to print. Every document must have a
    * flavor supported by the bound print service.
-   * @param attributes the printing attributes to apply to the print job. If 
+   * @param attributes the printing attributes to apply to the print job. If
    * null the default attribute values will be used.
-   * 
-   * @throws PrintException if an error occurs. The thrown exception may 
-   * implement refining print exception interface to provide more detail of 
+   *
+   * @throws PrintException if an error occurs. The thrown exception may
+   * implement refining print exception interface to provide more detail of
    * the error.
-   * 
+   *
    * @see FlavorException
    * @see AttributeException
    */
   void print(MultiDoc multiDoc, PrintRequestAttributeSet attributes)
     throws PrintException;
 }
- 
\ No newline at end of file
diff --git a/libjava/classpath/javax/print/MultiDocPrintService.java b/libjava/classpath/javax/print/MultiDocPrintService.java
index 105e7221005..b0ebfd15a85 100644
--- a/libjava/classpath/javax/print/MultiDocPrintService.java
+++ b/libjava/classpath/javax/print/MultiDocPrintService.java
@@ -40,21 +40,21 @@ package javax.print;
 
 
 /**
- * MultiDocPrintService represents print services that are 
- * capable of printing multiple documents as one print job. It provides an 
+ * MultiDocPrintService represents print services that are
+ * capable of printing multiple documents as one print job. It provides an
  * additional method for the creation of a print job for multiple documents.
- * 
+ *
  * @see javax.print.MultiDoc
  * @see javax.print.MultiDocPrintJob
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface MultiDocPrintService extends PrintService
 {
   /**
    * Create a job that can print a MultiDoc object.
-   * 
+   *
    * @return The created print job.
    */
   MultiDocPrintJob createMultiDocPrintJob();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/PrintException.java b/libjava/classpath/javax/print/PrintException.java
index 6fd46b50625..8ff29b20ce3 100644
--- a/libjava/classpath/javax/print/PrintException.java
+++ b/libjava/classpath/javax/print/PrintException.java
@@ -42,8 +42,8 @@ package javax.print;
  * PrintException is used to report exceptions during the
  * usage of a print service implementation.
  * 
                    
- * This base class only provides the possibility to report a message as 
- * exception. A concrete print service implementation may provide 
+ * This base class only provides the possibility to report a message as
+ * exception. A concrete print service implementation may provide
  * specialised subclasses implementing one or more of the following
  * exception interfaces:
                    
  * 
                      
@@ -52,7 +52,7 @@ package javax.print;
  * 
                    • {@link javax.print.URIException}
                      • 
  * 
                    
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintException extends Exception
@@ -67,7 +67,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param e chained exception
    */
   public PrintException(Exception e)
@@ -77,7 +77,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param s detailed message, or null for no message
    */
   public PrintException(String s)
@@ -87,7 +87,7 @@ public class PrintException extends Exception
 
   /**
    * Construct a print exception.
-   * 
+   *
    * @param s detailed message, or null for no message
    * @param e chained exception
    */
@@ -95,4 +95,4 @@ public class PrintException extends Exception
   {
     super(s, e);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/PrintService.java b/libjava/classpath/javax/print/PrintService.java
index 125d27083b3..b7bd5008852 100644
--- a/libjava/classpath/javax/print/PrintService.java
+++ b/libjava/classpath/javax/print/PrintService.java
@@ -48,57 +48,57 @@ import javax.print.event.PrintServiceAttributeListener;
  * A PrintService represents a printer available for printing.
  * 
                    
  * The print service hereby may be a real physical printer device, a printer
- * group with same capabilities or a logical print service (like for example 
+ * group with same capabilities or a logical print service (like for example
  * a PDF writer). The print service is used to query the capabilities of the
  * represented printer instance. If a suitable print service is found it is
- * used to create a print job for the actual printing process. 
+ * used to create a print job for the actual printing process.
  * 
                    
  * @see javax.print.DocPrintJob
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintService
 {
   /**
-   * Creates and returns a new print job which is capable to handle all 
+   * Creates and returns a new print job which is capable to handle all
    * the document flavors supported by this print service.
-   * 
+   *
    * @return The created print job object.
    */
   DocPrintJob createPrintJob();
-  
+
   /**
    * Determines if two services refer to the same underlying service.
-   * 
+   *
    * @param obj the service to check against
-   * 
+   *
    * @return true if both services refer to the same underlying
    * service, false otherwise.
    */
   boolean equals(Object obj);
-  
+
   /**
    * Returns the value of the single specified attribute.
-   * 
+   *
    * @param category the category of a PrintServiceAttribute
-   * 
+   *
    * @return The value of the attribute, or null if the attribute
    * category is not supported by this print service implementation.
-   * 
+   *
    * @throws NullPointerException if category is null.
    * @throws IllegalArgumentException if category is not a class that
    * implements PrintServiceAttribute.
    */
    T getAttribute(Class category);
-  
+
   /**
-   * Returns the attributes describing this print service. The returned 
+   * Returns the attributes describing this print service. The returned
    * attributes set is unmodifiable and represents the current state of
-   * the print service. As some print service attributes may change 
+   * the print service. As some print service attributes may change
    * (depends on the print service implementation) a subsequent call to
-   * this method may return a different set. To monitor changes a 
-   * PrintServiceAttributeListener may be registered. 
-   * 
+   * this method may return a different set. To monitor changes a
+   * PrintServiceAttributeListener may be registered.
+   *
    * @return All the description attributes of this print service.
    * @see #addPrintServiceAttributeListener(PrintServiceAttributeListener)
    */
@@ -111,67 +111,67 @@ public interface PrintService
    * A return value of null means either that the print service
    * does not support the attribute category or there is no default value
    * available for this category. To distinguish these two case one can test
-   * with {@link #isAttributeCategorySupported(Class)} if the category is 
+   * with {@link #isAttributeCategorySupported(Class)} if the category is
    * supported.
    * 
                    
-   * 
+   *
    * @param category the category of the attribute
-   * 
+   *
    * @return The default value, or null.
-   * 
+   *
    * @throws NullPointerException if category is null
    * @throws IllegalArgumentException if category is a class
-   * not implementing Attribute 
+   * not implementing Attribute
    */
   Object getDefaultAttributeValue(Class category);
-  
+
   /**
    * Returns the name of this print service.
    * This may be the value of the PrinterName attribute.
-   * 
+   *
    * @return The print service name.
    */
   String getName();
-  
+
   /**
    * Returns a factory for UI components if supported by the print service.
-   * 
+   *
    * @return A factory for UI components or null.
    */
   ServiceUIFactory getServiceUIFactory();
-  
+
   /**
    * Returns all supported attribute categories.
-   * 
+   *
    * @return The class array of all supported attribute categories.
    */
   Class[] getSupportedAttributeCategories();
-  
+
   /**
-   * Determines and returns all supported attribute values of a given 
-   * attribute category a client can use when setting up a print job 
-   * for this print service. 
+   * Determines and returns all supported attribute values of a given
+   * attribute category a client can use when setting up a print job
+   * for this print service.
    * 
                    
    * The returned object may be one of the following types:
    * 
                      
-   * 
                    • A single instance of the attribute category to indicate that any 
+   * 
                    • A single instance of the attribute category to indicate that any
    * value will be supported.
                      • 
-   * 
                    • An array of the same type as the attribute category to test, 
+   * 
                    • An array of the same type as the attribute category to test,
    * containing all the supported values for this category.
                      • 
-   * 
                    • A single object (of any other type than the attribute category) 
-   * which indicates bounds on the supported values.
                      •  
-   * 
                     
+   * 
                  • A single object (of any other type than the attribute category)
+   * which indicates bounds on the supported values.
                    • 
+   * 
    * 
                    
-   * 
+   *
    * @param category the attribute category to test
    * @param flavor the document flavor to use, or null
-   * @param attributes set of attributes for a supposed job, 
+   * @param attributes set of attributes for a supposed job,
    * or null
-   * 
-   * @return A object (as defined above) indicating the supported values 
-   * for the given attribute category, or null if this print 
+   *
+   * @return A object (as defined above) indicating the supported values
+   * for the given attribute category, or null if this print
    * service doesn't support the given attribute category at all.
-   * 
+   *
    * @throws NullPointerException if category is null
    * @throws IllegalArgumentException if category is a class not
    * implementing Attribute, or if flavor is not
@@ -180,116 +180,116 @@ public interface PrintService
   Object getSupportedAttributeValues(Class category,
                                      DocFlavor flavor,
                                      AttributeSet attributes);
-  
+
   /**
    * Determines and returns an array of all supported document flavors which
-   * can be used to supply print data to this print service. 
+   * can be used to supply print data to this print service.
    * 
                    
    * The supported attribute categories may differ between the supported
    * document flavors. To test for supported attributes one can use the
    * {@link #getUnsupportedAttributes(DocFlavor, AttributeSet)} method with
    * the specific doc flavor and attributes set.
    * 
                    
-   * 
+   *
    * @return the supported document flavors
    */
   DocFlavor[] getSupportedDocFlavors();
-  
+
   /**
    * Identifies all the unsupported attributes of the given set of attributes
-   * in the context of the specified document flavor. 
+   * in the context of the specified document flavor.
    * 
                    
-   * The given flavor has to be supported by the print service (use 
-   * {@link #isDocFlavorSupported(DocFlavor)} to verify). The method will 
+   * The given flavor has to be supported by the print service (use
+   * {@link #isDocFlavorSupported(DocFlavor)} to verify). The method will
    * return null if all given attributes are supported. Otherwise
    * a set of unsupported attributes are returned. The attributes in the
    * returned set may be completely unsupported or only the specific requested
-   * value. If flavor is null the default document flavor of the 
+   * value. If flavor is null the default document flavor of the
    * print service is used in the identification process.
    * 
                    
-   * 
+   *
    * @param flavor document flavor to test, or null.
    * @param attributes set of printing attributes for a supposed job
-   * 
-   * @return null if this print service supports all the given 
+   *
+   * @return null if this print service supports all the given
    * attributes for the specified doc flavor. Otherwise the set of unsupported
    * attributes are returned.
-   * 
+   *
    * @throws IllegalArgumentException if flavor is unsupported
    */
   AttributeSet getUnsupportedAttributes(DocFlavor flavor, AttributeSet attributes);
 
-  
+
   /**
    * Returns a hashcode for this print service.
-   * 
+   *
    * @return The hashcode.
    */
   int hashCode();
-  
+
   /**
-   * Determines a given attribute category is supported by this 
+   * Determines a given attribute category is supported by this
    * print service implementation. This only tests for the category
    * not for any specific values of this category nor in the context
    * of a specific document flavor.
-   * 
+   *
    * @param category the category to check
-   * 
+   *
    * @return true if category is supported,
    * false otherwise.
-   * 
+   *
    * @throws NullPointerException if category is null
    * @throws IllegalArgumentException if category is a class not
    * implementing Attribute.
    */
   boolean isAttributeCategorySupported(Class category);
-  
+
   /**
-   * Determines if a given attribute value is supported when creating a print 
-   * job for this print service. 
+   * Determines if a given attribute value is supported when creating a print
+   * job for this print service.
    * 
                    
-   * If either the document flavor or the provided attributes are 
-   * null it is determined if the given attribute value is 
+   * If either the document flavor or the provided attributes are
+   * null it is determined if the given attribute value is
    * supported in some combination of the available document flavors and
    * attributes of the print service. Otherwise it is checked for the
    * specific context of the given document flavor/attributes set.
    * 
                    
-   * 
+   *
    * @param attrval the attribute value to check
    * @param flavor the document flavor to use, or null.
    * @param attributes set of attributes to use, or null.
-   * 
+   *
    * @return true if the attribute value is supported in the
    * requested context, false otherwise.
-   * 
+   *
    * @throws NullPointerException if attrval is null.
    * @throws IllegalArgumentException if flavor is not supported
    * by this print service
    */
   boolean isAttributeValueSupported(Attribute attrval, DocFlavor flavor, AttributeSet attributes);
-  
+
   /**
    * Determines if a given document flavor is supported or not.
-   * 
+   *
    * @param flavor the document flavor to check
-   * 
+   *
    * @return true if flavor is supported,
    * false otherwise.
-   * 
+   *
    * @throws NullPointerException if flavor is null.
    */
   boolean isDocFlavorSupported(DocFlavor flavor);
-  
+
   /**
    * Registers a print service attribute listener to this print service.
-   * 
+   *
    * @param listener the listener to add
    */
   void addPrintServiceAttributeListener(PrintServiceAttributeListener listener);
-  
+
   /**
    * De-registers a print service attribute listener from this print service.
-   * 
+   *
    * @param listener the listener to remove
    */
   void removePrintServiceAttributeListener(PrintServiceAttributeListener listener);
diff --git a/libjava/classpath/javax/print/PrintServiceLookup.java b/libjava/classpath/javax/print/PrintServiceLookup.java
index 57cb8dc9ffa..1ea1f954734 100644
--- a/libjava/classpath/javax/print/PrintServiceLookup.java
+++ b/libjava/classpath/javax/print/PrintServiceLookup.java
@@ -50,54 +50,54 @@ import javax.print.attribute.AttributeSet;
 
 
 /**
- * PrintServiceLookup implementations provide a way to lookup 
+ * PrintServiceLookup implementations provide a way to lookup
  * print services based on different constraints.
  * 
                    
- * Implementations are located and loaded automatically through the SPI JAR 
- * file specification. Therefore implementation classes must provide a default 
- * constructor for instantiation. Furthermore, applications are able to 
+ * Implementations are located and loaded automatically through the SPI JAR
+ * file specification. Therefore implementation classes must provide a default
+ * constructor for instantiation. Furthermore, applications are able to
  * register further instances directly at runtime.
  * 
                    
- * If an SecurityManager is installed implementors should call 
- * checkPrintJobAccess() to disable access for untrusted code. 
- * This check is to be made in every lookup service implementation for 
- * flexibility. Print services registered by applications through 
- * registerService(PrintService) are suppressed in the 
- * lookup results if a security manager is installed and disallows access. 
+ * If an SecurityManager is installed implementors should call
+ * checkPrintJobAccess() to disable access for untrusted code.
+ * This check is to be made in every lookup service implementation for
+ * flexibility. Print services registered by applications through
+ * registerService(PrintService) are suppressed in the
+ * lookup results if a security manager is installed and disallows access.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class PrintServiceLookup
 {
-  
+
   private static final CupsPrintServiceLookup systemProvider;
   private static final HashSet printServices;
   private static final HashSet printServiceLookups;
-  
+
   static
   {
     systemProvider = new CupsPrintServiceLookup();
-    
+
     printServices = new HashSet();
     printServiceLookups = new HashSet();
-    
+
     // check for service providers
     Iterator it = ServiceFactory.lookupProviders(PrintServiceLookup.class);
-    
+
     while (it.hasNext())
-      printServiceLookups.add(it.next());    
-  }  
-  
+      printServiceLookups.add(it.next());
+  }
+
   /**
    * Constructs a PrintServiceLookup object.
    */
   public PrintServiceLookup()
   {
-    // nothing to do here 
+    // nothing to do here
   }
-  
+
   /**
    * Explicitly registers the provided print service lookup implementation.
    * 
                    
@@ -106,22 +106,22 @@ public abstract class PrintServiceLookup
    * else fails.
    * 
                    
    *
-   * @param sp the print service lookup implementation to register. 
+   * @param sp the print service lookup implementation to register.
    * @return true if registered, false otherwise.
    */
   public static boolean registerServiceProvider(PrintServiceLookup sp)
-  {  
+  {
     return printServiceLookups.add(sp);
   }
-  
+
   /**
    * Explicitly registers the provided print service instance.
    * 
                    
    * The registration will silently fail (returning false) if
-   * the print service instance is already registered or the registration 
+   * the print service instance is already registered or the registration
    * somehow else fails.
    * 
                    
-   * @param service the single print service to register. 
+   * @param service the single print service to register.
    * @return true if registered, false otherwise.
    */
   public static boolean registerService(PrintService service)
@@ -143,78 +143,78 @@ public abstract class PrintServiceLookup
         return false;
       }
   }
-  
+
   /**
    * Searches print services capable of printing in the given document flavor
    * which supports the specified printing attributes.
-   * 
-   * @param flavor the document flavor to support. If null this 
+   *
+   * @param flavor the document flavor to support. If null this
    * constraint is ignored during lookup.
-   * @param attributes the printing attributes to support. If 
+   * @param attributes the printing attributes to support. If
    * null this constraint is ignored during lookup.
-   * @return The resulting available print services, or an array of length 0 
-   * if none is found. 
+   * @return The resulting available print services, or an array of length 0
+   * if none is found.
    */
   public static final PrintService[] lookupPrintServices(DocFlavor flavor,
     AttributeSet attributes)
-  {   
+  {
     ArrayList result = new ArrayList();
-    
-    PrintService[] services = 
-      systemProvider.getPrintServices(flavor, attributes);    
+
+    PrintService[] services =
+      systemProvider.getPrintServices(flavor, attributes);
     result.addAll(Arrays.asList(services));
-             
+
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         PrintServiceLookup lookup = (PrintServiceLookup) it.next();
-        services = lookup.getPrintServices(flavor, attributes);   
+        services = lookup.getPrintServices(flavor, attributes);
         result.addAll(Arrays.asList(services));
       }
-    
+
     for (Iterator it = printServices.iterator(); it.hasNext(); )
       {
         PrintService service = (PrintService) it.next();
-        if (systemProvider.checkPrintService(flavor, attributes, service)) 
+        if (systemProvider.checkPrintService(flavor, attributes, service))
           result.add(service);
       }
-    
+
     return (PrintService[]) result.toArray(new PrintService[result.size()]);
   }
-  
+
   /**
-   * Searches print services capable of multi document printing in all of the 
+   * Searches print services capable of multi document printing in all of the
    * given document flavors and supporting the specified printing attributes.
-   * 
-   * @param flavors the document flavors to support. If null this 
+   *
+   * @param flavors the document flavors to support. If null this
    * constraint is ignored during lookup.
-   * @param attributes the printing attributes to support. If 
+   * @param attributes the printing attributes to support. If
    * null this constraint is ignored during lookup.
-   * @return The resulting available multi document print services, or an 
-   * array of length 0 if none is found. 
+   * @return The resulting available multi document print services, or an
+   * array of length 0 if none is found.
    */
   public static final MultiDocPrintService[] lookupMultiDocPrintServices(
     DocFlavor[] flavors, AttributeSet attributes)
   {
     ArrayList result = new ArrayList();
-    
-    MultiDocPrintService[] services = 
-      systemProvider.getMultiDocPrintServices(flavors, attributes);    
+
+    MultiDocPrintService[] services =
+      systemProvider.getMultiDocPrintServices(flavors, attributes);
     result.addAll(Arrays.asList(services));
-             
+
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         PrintServiceLookup lookup = (PrintServiceLookup) it.next();
-        services = lookup.getMultiDocPrintServices(flavors, attributes);   
+        services = lookup.getMultiDocPrintServices(flavors, attributes);
         result.addAll(Arrays.asList(services));
       }
-    
+
     for (Iterator it = printServices.iterator(); it.hasNext(); )
       {
         PrintService service = (PrintService) it.next();
-        if (systemProvider.checkMultiDocPrintService(flavors, attributes, service))   
+        if (systemProvider.checkMultiDocPrintService(flavors, attributes, service))
           result.add(service);
       }
-    
+
     return (MultiDocPrintService[]) result.toArray(
       new MultiDocPrintService[result.size()]);
   }
@@ -224,32 +224,32 @@ public abstract class PrintServiceLookup
    * Searches the default print service in the current environment.
    * 
                    
    * If multiple lookup services are registered and each has a default
-   * print service the result is not specified. Usually the default 
+   * print service the result is not specified. Usually the default
    * print service of the native platform lookup service is returned.
    * 
                    
    * The GNU classpath implementation will return the CUPS default
    * printing service as the default print service, if available.
    * 
                    
    * The default print service may be overriden by users through
-   * the property javax.print.defaultPrinter. A service 
+   * the property javax.print.defaultPrinter. A service
    * specified must be found to be returned as the default.
    * 
                    
-   *  
+   *
    * @return The default print service, or null if none found.
    */
   public static final PrintService lookupDefaultPrintService()
   {
     // TODO Find out what the property controls and use it
     // String defaultPrinter = System.getProperty("javax.print.defaultPrinter");
-       
+
     // first test for platform specified default services
     PrintService service = systemProvider.getDefaultPrintService();
-    
-    if (service != null) 
+
+    if (service != null)
       return service;
-          
+
     // none available by systemDefaultProvider
-    // search in other registered ones and take first      
+    // search in other registered ones and take first
     for (Iterator it = printServiceLookups.iterator(); it.hasNext(); )
       {
         service = ((PrintServiceLookup) it.next()).getDefaultPrintService();
@@ -259,10 +259,10 @@ public abstract class PrintServiceLookup
 
     return null;
   }
-  
+
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @return The default lookup service of the implementing lookup service or
    * null if there is no default one.
    */
@@ -270,34 +270,34 @@ public abstract class PrintServiceLookup
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @param flavors the document flavors which have to be supported.
    * @param attributes the attributes which have to be supported.
-   * 
+   *
    * @return The multidoc print services of the implementing lookup service
    * for the given parameters, or an array of length 0 if none is available.
    */
-  public abstract MultiDocPrintService[] 
+  public abstract MultiDocPrintService[]
     getMultiDocPrintServices(DocFlavor[] flavors, AttributeSet attributes);
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @return All known print services of the implementing lookup service
-   * regardless of supported features, or an array of length 0 if none is 
+   * regardless of supported features, or an array of length 0 if none is
    * available.
    */
   public abstract PrintService[] getPrintServices();
 
   /**
    * Not to be called directly by applications.
-   * 
+   *
    * @param flavor the document flavor which has to be supported.
    * @param attributes the attributes which have to be supported.
-   * 
+   *
    * @return The print services of the implementing lookup service
    * for the given parameters, or an array of length 0 if none is available.
    */
-  public abstract PrintService[] 
+  public abstract PrintService[]
     getPrintServices(DocFlavor flavor, AttributeSet attributes);
 }
diff --git a/libjava/classpath/javax/print/ServiceUI.java b/libjava/classpath/javax/print/ServiceUI.java
index 4a7b5bd4a4e..fa5086e8500 100644
--- a/libjava/classpath/javax/print/ServiceUI.java
+++ b/libjava/classpath/javax/print/ServiceUI.java
@@ -1,4 +1,4 @@
-/* ServiceUI.java -- 
+/* ServiceUI.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,19 +48,19 @@ import java.util.Arrays;
 import javax.print.attribute.PrintRequestAttributeSet;
 
 /**
- * ServiceUI provides a method to create a graphical 
+ * ServiceUI provides a method to create a graphical
  * print dialog.
  * 
                    
  * The graphical print dialog enables the user to browse the available
- * print services on the system. It provides user interfaces to interact 
- * with the most common printing attributes likes specifying the number of 
+ * print services on the system. It provides user interfaces to interact
+ * with the most common printing attributes likes specifying the number of
  * copies to print or the page ranges.
  * 
                    
- * The initial appearance of the print dialog as shown to the user may be 
- * specified by providing the default selected print service as well as 
+ * The initial appearance of the print dialog as shown to the user may be
+ * specified by providing the default selected print service as well as
  * initial values for the printing attributes in the user interface.
  * 
                    
- * 
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class ServiceUI
@@ -73,65 +73,65 @@ public class ServiceUI
   {
     // nothing to do here - only one static method
   }
-  
+
   /**
-   * Creates a modal graphical printing dialog at the specified location on 
+   * Creates a modal graphical printing dialog at the specified location on
    * the screen.
    * 
                    
-   * The dialog will return the user selected print service and the given 
-   * attributes set will contain the modified printing attributes. If the 
-   * user cancels the printing dialog null will be returned and 
+   * The dialog will return the user selected print service and the given
+   * attributes set will contain the modified printing attributes. If the
+   * user cancels the printing dialog null will be returned and
    * the printing attributes set will be unmodified.
    * 
                    
    * The values of the given attributes set (if not empty) will be displayed
-   * initially unless the are unsupported by the print service. If a print 
+   * initially unless the are unsupported by the print service. If a print
    * service does not support a particular value it is substituted with the
    * default value of the print service.
-   * 
                     
-   * 
+   * 
                    
+   *
    * @param gc the screen to use. null is default screen.
-   * @param x the coordinate of the upper left edge of the dialog in screen 
+   * @param x the coordinate of the upper left edge of the dialog in screen
    *   coordinates (not relative to the parent frame).
-   * @param y the coordinate of the upper left edge of the dialog in screen 
+   * @param y the coordinate of the upper left edge of the dialog in screen
    *   coordinates (not relative to the parent frame).
    * @param services the print services to browse (not null).
    * @param defaultService the default service. If null
    * the first of the print services in the services array will be used.
    * @param flavor the flavours to be printed.
-   * @param attributes the attributes requested. Will be updated 
-   * by selections done by the user in the dialog. 
-   * 
+   * @param attributes the attributes requested. Will be updated
+   * by selections done by the user in the dialog.
+   *
    * @return The selected print service or null if user
    * has cancelled the printer dialog.
-   * 
+   *
    * @throws HeadlessException if GraphicsEnvironment is headless
-   * @throws IllegalArgumentException if services is null or an 
-   * empty array, attributes are null or the given default 
+   * @throws IllegalArgumentException if services is null or an
+   * empty array, attributes are null or the given default
    * PrintService is not part of the print service array.
    */
-  public static PrintService printDialog(GraphicsConfiguration gc, int x, 
+  public static PrintService printDialog(GraphicsConfiguration gc, int x,
       int y, PrintService[] services, PrintService defaultService,
       DocFlavor flavor, PrintRequestAttributeSet attributes)
     throws HeadlessException
-    {       
+    {
       if (GraphicsEnvironment.isHeadless())
         throw new HeadlessException("GraphicsEnvironment is headless.");
-      
+
       if (services == null || services.length == 0 || attributes == null)
-        throw new IllegalArgumentException("Given print service array / " 
+        throw new IllegalArgumentException("Given print service array / "
                                            + "attributes may not be null");
-      
-      if (defaultService != null && 
+
+      if (defaultService != null &&
           ! Arrays.asList(services).contains(defaultService))
-        throw new IllegalArgumentException("defaultService is not contained " 
+        throw new IllegalArgumentException("defaultService is not contained "
                                            + " in the print service array");
-      
-      PrinterDialog dialog = new PrinterDialog(gc, services, defaultService, 
+
+      PrinterDialog dialog = new PrinterDialog(gc, services, defaultService,
                                                flavor, attributes);
-      
+
       dialog.setLocation(x, y);
       dialog.show();
-      
+
       return dialog.getSelectedPrintService();
     }
 }
diff --git a/libjava/classpath/javax/print/ServiceUIFactory.java b/libjava/classpath/javax/print/ServiceUIFactory.java
index 1a5c1cfe2fb..4b660b683c4 100644
--- a/libjava/classpath/javax/print/ServiceUIFactory.java
+++ b/libjava/classpath/javax/print/ServiceUIFactory.java
@@ -39,46 +39,46 @@ exception statement from your version. */
 package javax.print;
 
 /**
- * ServiceUIFactory enables print services to provide additional 
+ * ServiceUIFactory enables print services to provide additional
  * user interface dialogs.
  * 
                    
- * A print service may provide a ServiceUIFactory implementation 
+ * A print service may provide a ServiceUIFactory implementation
  * if its getServiceUIFactory() method is called. If a factory
- * object is returned it can be queried for provided user interface dialogs. 
+ * object is returned it can be queried for provided user interface dialogs.
  * Different roles are defined to denote dialogs providing informations about
- * the print service, dialogs for administration of a print service and for 
+ * the print service, dialogs for administration of a print service and for
  * end-user browsing dialogs.
  * 
                    
- * The factory can support providing these UI roles in different dialog types 
+ * The factory can support providing these UI roles in different dialog types
  * (AWT, Swing, JComponent, Panel). The support and use of Swing interfaces is
  * however preferred.
  * 
                    
- * 
+ *
  * @author Michael Koch
  */
 public abstract class ServiceUIFactory
 {
   /** A user interface providing informations about the print service. */
   public static final int ABOUT_UIROLE = 1;
-  
+
   /** A user interface to administer the print service. */
   public static final int ADMIN_UIROLE = 2;
-  
+
   /** A user interface for end-user browsing of the print service. */
   public static final int MAIN_UIROLE = 3;
-  
+
   /** Role IDs greater than this may be used for other private roles. */
   public static final int RESERVED_UIROLE = 99;
 
   /** Identifies a UI provided as an AWT dialog. */
   public static final String DIALOG_UI = "java.awt.Dialog";
-  
+
   /** Identifies a UI provided as a Swing JComponent. */
   public static final String JCOMPONENT_UI = "javax.swing.JComponent";
-  
+
   /** Identifies a UI provided as a Swing JDialog. */
   public static final String JDIALOG_UI = "javax.swing.JDialog";
-  
+
   /** Identifies a UI provided as an AWT Panel. */
   public static final String PANEL_UI = "java.awt.Panel";
 
@@ -87,18 +87,18 @@ public abstract class ServiceUIFactory
    */
   public ServiceUIFactory()
   {
-  	// Do nothing here.
+        // Do nothing here.
   }
 
   /**
    * Returns an UI object which may be cast to the requested UI type.
-   * 
+   *
    * @param role the role requested. Must be one of the standard roles
    * or a private role supported by this factory
    * @param ui type in which the role is requested
-   * 
+   *
    * @return the UI role or null of this role is not supported by this factory
-   * 
+   *
    * @throws IllegalArgumentException if role is neither one of
    * the standard ones nor a private one supported by this factory
    */
@@ -106,13 +106,13 @@ public abstract class ServiceUIFactory
 
   /**
    * Returns the UI types supported by this factory for an UI role.
-   * 
+   *
    * @param role the role to be looked up
-   * 
+   *
    * @return an array of UI types
-   * 
+   *
    * @throws IllegalArgumentException if role is neither one of
    * the standard ones nor a private one supported by this factory
    */
   public abstract String[] getUIClassNamesForRole(int role);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/SimpleDoc.java b/libjava/classpath/javax/print/SimpleDoc.java
index a49406bcb76..16b2d822545 100644
--- a/libjava/classpath/javax/print/SimpleDoc.java
+++ b/libjava/classpath/javax/print/SimpleDoc.java
@@ -1,4 +1,4 @@
-/* SimpleDoc.java -- 
+/* SimpleDoc.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -49,23 +49,23 @@ import javax.print.attribute.AttributeSetUtilities;
 import javax.print.attribute.DocAttributeSet;
 
 /**
- * Simple implementation of the Doc interface capable of handling 
+ * Simple implementation of the Doc interface capable of handling
  * the predefined document flavors of DocFlavor.
  * 
                    
- * This implementation can construct a reader or stream for the service from 
+ * This implementation can construct a reader or stream for the service from
  * the print data and ensures that always the same object is returned on each
- * method call. It does simple checks that the supplied data matches the 
+ * method call. It does simple checks that the supplied data matches the
  * specified flavor of the doc object and supports thread safe access.
- * 
                     
- * 
+ * 
                    
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public final class SimpleDoc implements Doc
-{  
+{
   private final Object printData;
   private final DocFlavor flavor;
   private final DocAttributeSet attributes;
-  
+
   private InputStream stream;
   private Reader reader;
 
@@ -74,17 +74,17 @@ public final class SimpleDoc implements Doc
    * @param printData the object with the data to print.
    * @param flavor the document flavor of the print data.
    * @param attributes the attributes of the doc (may be null).
-   * 
+   *
    * @throws IllegalArgumentException if either printData or
    *   flavor are null, or the print data is not
    *   supplied in the document format specified by the given flavor object.
    */
-  public SimpleDoc(Object printData, DocFlavor flavor, 
+  public SimpleDoc(Object printData, DocFlavor flavor,
       DocAttributeSet attributes)
   {
     if (printData == null || flavor == null)
       throw new IllegalArgumentException("printData/flavor may not be null");
-    
+
     if (! (printData.getClass().getName().equals(
            flavor.getRepresentationClassName())
         || flavor.getRepresentationClassName().equals("java.io.Reader")
@@ -93,16 +93,16 @@ public final class SimpleDoc implements Doc
            && printData instanceof InputStream))
       {
         throw new IllegalArgumentException("data is not of declared flavor type");
-      }          
-    
+      }
+
     this.printData = printData;
     this.flavor = flavor;
-    
+
     if (attributes != null)
       this.attributes = AttributeSetUtilities.unmodifiableView(attributes);
     else
       this.attributes = null;
-    
+
     stream = null;
     reader = null;
   }
@@ -110,13 +110,13 @@ public final class SimpleDoc implements Doc
   /**
    * Returns the unmodifiable view of the attributes of this doc object.
    * 
                    
-   * The attributes of this doc's attributes set overrides attributes of 
-   * the same category in the print job's attribute set. If an attribute 
+   * The attributes of this doc's attributes set overrides attributes of
+   * the same category in the print job's attribute set. If an attribute
    * is not available in this doc's attributes set or null
    * is returned the attributes of the same category of the print job are
-   * used. 
+   * used.
    * 
                    
-   * 
+   *
    * @return The unmodifiable attributes set, or null.
    */
   public DocAttributeSet getAttributes()
@@ -126,7 +126,7 @@ public final class SimpleDoc implements Doc
 
   /**
    * Returns the flavor of this doc objects print data.
-   * 
+   *
    * @return The document flavor.
    */
   public DocFlavor getDocFlavor()
@@ -141,7 +141,7 @@ public final class SimpleDoc implements Doc
    * document flavor ({@link DocFlavor#getRepresentationClassName()})
    * and can be cast to this representation class.
    * 
                    
-   * 
+   *
    * @return The print data in the representation class.
    * @throws IOException if representation class is a stream and I/O
    * exception occures.
@@ -162,10 +162,10 @@ public final class SimpleDoc implements Doc
    * 
                  • java.io.Reader
                    • 
    * 
    * otherwise this method returns null.
-   * 
                     
-   * 
+   * 
                    
+   *
    * @return The Reader object, or null.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   public Reader getReaderForText() throws IOException
@@ -182,9 +182,9 @@ public final class SimpleDoc implements Doc
             else if (flavor instanceof DocFlavor.READER)
               reader = (Reader) printData;
           }
-        
+
         return reader;
-      }   
+      }
   }
 
   /**
@@ -197,10 +197,10 @@ public final class SimpleDoc implements Doc
    * 
                  • java.io.InputStream
                    • 
    * 
    * otherwise this method returns null.
-   * 
                     
-   * 
+   * 
                    
+   *
    * @return The InputStream object, or null.
-   * 
+   *
    * @throws IOException if an error occurs.
    */
   public InputStream getStreamForBytes() throws IOException
@@ -215,9 +215,9 @@ public final class SimpleDoc implements Doc
             else if (flavor instanceof DocFlavor.INPUT_STREAM)
               stream = (InputStream) printData;
           }
-        
+
         return stream;
-      }    
+      }
   }
 
 }
diff --git a/libjava/classpath/javax/print/StreamPrintService.java b/libjava/classpath/javax/print/StreamPrintService.java
index 8398a734ce4..4b82ef76769 100644
--- a/libjava/classpath/javax/print/StreamPrintService.java
+++ b/libjava/classpath/javax/print/StreamPrintService.java
@@ -46,21 +46,21 @@ import java.io.OutputStream;
  * printing into a supplied output stream.
  * 
                    
  * Beside providing the same functionality as a print service it additionally
- * allows to specify the output stream for the print data. A stream print 
- * service is obtained via the {@link javax.print.StreamPrintServiceFactory} 
+ * allows to specify the output stream for the print data. A stream print
+ * service is obtained via the {@link javax.print.StreamPrintServiceFactory}
  * by looking for services supporting a given output format type.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class StreamPrintService implements PrintService
 {
   private boolean disposed;
   private OutputStream out;
-  
+
   /**
    * Constructs a StreamPrintService object.
-   * 
+   *
    * @param out the OutputStream to use
    */
   protected StreamPrintService(OutputStream out)
@@ -78,16 +78,16 @@ public abstract class StreamPrintService implements PrintService
 
   /**
    * Returns the document format emitted by this print service.
-   * The returned string is a MIME type compatible with the 
+   * The returned string is a MIME type compatible with the
    * {@link DocFlavor} class.
-   * 
+   *
    * @return The document format of the output.
    */
   public abstract String getOutputFormat();
 
   /**
    * Returns the OutputStream of this object.
-   * 
+   *
    * @return The OutputStream
    */
   public OutputStream getOutputStream()
@@ -97,7 +97,7 @@ public abstract class StreamPrintService implements PrintService
 
   /**
    * Determines if this StreamPrintService object is disposed.
-   * 
+   *
    * @return true if disposed already,
    * otherwise false
    */
@@ -105,4 +105,4 @@ public abstract class StreamPrintService implements PrintService
   {
     return disposed;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/print/StreamPrintServiceFactory.java b/libjava/classpath/javax/print/StreamPrintServiceFactory.java
index 90496b36af4..44f71599639 100644
--- a/libjava/classpath/javax/print/StreamPrintServiceFactory.java
+++ b/libjava/classpath/javax/print/StreamPrintServiceFactory.java
@@ -1,4 +1,4 @@
-/* StreamPrintServiceFactory.java -- 
+/* StreamPrintServiceFactory.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,83 +46,83 @@ import java.util.HashSet;
 import java.util.Iterator;
 
 /**
- * StreamPrintServiceFactory provides a static method to lookup 
+ * StreamPrintServiceFactory provides a static method to lookup
  * registered factories to construct StreamPrintService instances.
  * 
                    
- * StreamPrintService are used to print into a provided output 
- * stream in the document format provided by the stream print service 
+ * StreamPrintService are used to print into a provided output
+ * stream in the document format provided by the stream print service
  * implementation.
  * 
                    
- * Implementations are located and loaded automatically through the SPI JAR 
- * file specification. Therefore implementation classes must provide a default 
+ * Implementations are located and loaded automatically through the SPI JAR
+ * file specification. Therefore implementation classes must provide a default
  * constructor for instantiation.
  * 
                    
- * 
+ *
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class StreamPrintServiceFactory
-{   
+{
   /**
    * Default public constructor.
-   * Used for automatic loading and instantiation through 
+   * Used for automatic loading and instantiation through
    * the SPI jar file specification.
    */
   public StreamPrintServiceFactory()
   {
     // nothing to do
   }
-  
+
   /**
-   * Searches for matching factories providing stream print services that  
-   * support the printing of documents with the given document flavor into 
+   * Searches for matching factories providing stream print services that
+   * support the printing of documents with the given document flavor into
    * the given output mime type.
-   * 
-   * @param flavor the document flavor needed, null doesn't 
+   *
+   * @param flavor the document flavor needed, null doesn't
    * constrain the lookup result.
-   * @param outputMimeType the mime type needed, null doesn't 
+   * @param outputMimeType the mime type needed, null doesn't
    * constrain the lookup result.
-   * 
+   *
    * @return The matching StreamPrintServiceFactory instances.
    */
   public static StreamPrintServiceFactory[] lookupStreamPrintServiceFactories(
     DocFlavor flavor, String outputMimeType)
   {
     HashSet set = new HashSet();
-    
-    Iterator it = 
+
+    Iterator it =
       ServiceFactory.lookupProviders(StreamPrintServiceFactory.class);
-    
+
     while (it.hasNext())
       {
         StreamPrintServiceFactory tmp = (StreamPrintServiceFactory) it.next();
         if (tmp.getOutputFormat().equals(outputMimeType)
             && Arrays.asList(tmp.getSupportedDocFlavors()).contains(flavor))
-          set.add(tmp);          
+          set.add(tmp);
       }
-    
+
     StreamPrintServiceFactory[] tmp = new StreamPrintServiceFactory[set.size()];
-    return (StreamPrintServiceFactory[]) set.toArray(tmp);  
-  } 
-  
+    return (StreamPrintServiceFactory[]) set.toArray(tmp);
+  }
+
   /**
    * Returns the output format supported by this factory.
-   * 
+   *
    * @return The mime type of the output format as string representation.
    */
   public abstract String getOutputFormat();
-  
+
   /**
    * Returns the document flavors this factory supports as flavors
    * for the input documents.
-   * 
+   *
    * @return The array of supported document flavors.
    */
   public abstract DocFlavor[] getSupportedDocFlavors();
-  
+
   /**
    * Constructs a StreamPrintService which directs its output
    * the given output stream.
-   * 
+   *
    * @param out the output stream for the produced document.
    * @return The constructed stream print service.
    */
diff --git a/libjava/classpath/javax/print/URIException.java b/libjava/classpath/javax/print/URIException.java
index 9b22bdf2ff6..cedcbaafc36 100644
--- a/libjava/classpath/javax/print/URIException.java
+++ b/libjava/classpath/javax/print/URIException.java
@@ -41,15 +41,15 @@ package javax.print;
 import java.net.URI;
 
 /**
- * URIException specifies methods a specific subclass of 
- * {@link javax.print.PrintException} may implement to provide further 
+ * URIException specifies methods a specific subclass of
+ * {@link javax.print.PrintException} may implement to provide further
  * informations of printing errors if URI problems are involved.
  * 
                    
- * There exists no PrintException class implementing this 
- * interface. Providing this extension in PrintException 
- * subclasses is left to the concrete print service implementation. 
+ * There exists no PrintException class implementing this
+ * interface. Providing this extension in PrintException
+ * subclasses is left to the concrete print service implementation.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface URIException
@@ -58,30 +58,30 @@ public interface URIException
    * Indicates that the provided URI is not accessible.
    */
   int URIInaccessible = 1;
-  
+
   /**
    * Indicates any other problem which is not defined by
    * the other reason constants.
    */
   int URIOtherProblem = -1;
-  
+
   /**
    * Indicates that the print service does not support a specific
    * uri scheme (for example the ftp scheme).
    */
   int URISchemeNotSupported = 2;
-  
+
   /**
    * Returns the reason for this exception as
    * predefined constants in this interface.
-   * 
+   *
    * @return The reason.
    */
   int getReason();
-  
+
   /**
    * Returns the unsupported URI which caused this exception.
-   * 
+   *
    * @return The unsupported URI.
    */
   URI getUnsupportedURI();
diff --git a/libjava/classpath/javax/print/attribute/Attribute.java b/libjava/classpath/javax/print/attribute/Attribute.java
index 8b98377ba22..0fc7e4df6d5 100644
--- a/libjava/classpath/javax/print/attribute/Attribute.java
+++ b/libjava/classpath/javax/print/attribute/Attribute.java
@@ -1,4 +1,4 @@
-/* Attribute.java -- 
+/* Attribute.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ import java.io.Serializable;
 
 /**
  * Base interface of every printing attribute of the Java Print Service API.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface Attribute extends Serializable
@@ -49,17 +49,17 @@ public interface Attribute extends Serializable
   /**
    * Returns the category of the printing attribute which is the specific
    * attribute class implementing this interface.
-   * 
+   *
    * @return The concrete {@link Class} instance of the attribute class.
    */
   Class< ? extends Attribute> getCategory ();
 
   /**
    * Returns the descriptive name of the attribute category.
-   * 
+   *
    * Implementations of the Attribute interfaces providing equal
    * category values have to return equal name values.
-   * 
+   *
    * @return The name of the attribute category.
    */
   String getName ();
diff --git a/libjava/classpath/javax/print/attribute/AttributeSet.java b/libjava/classpath/javax/print/attribute/AttributeSet.java
index c8130c19f14..d2111410f44 100644
--- a/libjava/classpath/javax/print/attribute/AttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/AttributeSet.java
@@ -1,4 +1,4 @@
-/* AttributeSet.java -- 
+/* AttributeSet.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,26 +57,26 @@ package javax.print.attribute;
  * 
  * 
                    
  * 
                    
- * Attribute sets may be unmodifiable depending on the context of usage. If 
- * used as read-only attribute set modifying operations throw an 
+ * Attribute sets may be unmodifiable depending on the context of usage. If
+ * used as read-only attribute set modifying operations throw an
  * {@link javax.print.attribute.UnmodifiableSetException}.
  * 
                    
  * 
                    
  * The Java Print Service API provides implementation classes for the existing
  * attribute set interfaces but applications may use their own implementations.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute to the set. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute to the set.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
    * @throws NullPointerException if the attribute is null.
@@ -86,73 +86,73 @@ public interface AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
-  
+
   /**
    * Removes all attributes from this attribute set.
-   * 
+   *
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   void clear ();
-  
+
   /**
-   * Checks if this attributes set contains an attribute with the given 
+   * Checks if this attributes set contains an attribute with the given
    * category.
-   * 
+   *
    * @param category the category to test for.
    * @return true if an attribute of the category is contained
    * in the set, false otherwise.
    */
   boolean containsKey (Class category);
-  
+
   /**
    * Checks if this attribute set contains the given attribute.
-   * 
+   *
    * @param attribute the attribute to test for.
    * @return true if the attribute is contained in the set,
    * false otherwise.
    */
   boolean containsValue (Attribute attribute);
-  
+
   /**
    * Tests this set for equality with the given object. true is
    * returned, if the given object is also of type AttributeSet
    * and the contained attributes are the same as in this set.
-   * 
+   *
    * @param obj the Object to test.
    * @return true if equal, false otherwise.
    */
   boolean equals (Object obj);
-  
+
   /**
    * Returns the attribute object contained in this set for the given attribute
-   * category. 
-   * 
-   * @param category the category of the attribute. A Class 
-   * instance of a class implementing the Attribute interface. 
-   * @return The attribute for this category or null if no 
-   * attribute is contained for the given category. 
+   * category.
+   *
+   * @param category the category of the attribute. A Class
+   * instance of a class implementing the Attribute interface.
+   * @return The attribute for this category or null if no
+   * attribute is contained for the given category.
    * @throws NullPointerException if category is null.
-   * @throws ClassCastException if category is not implementing 
+   * @throws ClassCastException if category is not implementing
    * Attribute.
    */
   Attribute get (Class category);
-  
+
   /**
    * Returns the hashcode value. The hashcode value is the sum of all hashcodes
    * of the attributes contained in this set.
-   * 
+   *
    * @return The hashcode for this attribute set.
    */
   int hashCode ();
-  
+
   /**
    * Checks if the attribute set is empty.
    *
@@ -163,30 +163,30 @@ public interface AttributeSet
   /**
    * Removes the given attribute from the set. If the given attribute is null
    * nothing is done and false is returned.
-   * 
-   * @param attribute the attribute to remove.  
-   * @return true if removed, false in all other cases. 
+   *
+   * @param attribute the attribute to remove.
+   * @return true if removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   boolean remove (Attribute attribute);
-  
+
   /**
    * Removes the attribute entry of the given category from the set. If the given
    * category is null nothing is done and false is returned.
-   * 
+   *
    * @param category the category of the entry to be removed.
-   * @return true if an attribute is removed, false in all other cases. 
+   * @return true if an attribute is removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   boolean remove (Class category);
-  
+
   /**
    * Returns the number of elements in this attribute set.
    *
    * @return The number of elements.
    */
   int size ();
-  
+
   /**
    * Returns the content of the attribute set as an array
    *
diff --git a/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java b/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
index 95c11a6ed1a..4b7378af58a 100644
--- a/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
+++ b/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
@@ -1,4 +1,4 @@
-/* AttributeSetUtilities.java -- 
+/* AttributeSetUtilities.java --
    Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ import java.io.Serializable;
  * if state changing methods are invoked.
  * 
                    
  * 
                    
- * Methods for getting a synchronized view of an attribute set are also 
+ * Methods for getting a synchronized view of an attribute set are also
  * available. This view provides synchronized (thread safe) access to the
  * underlying wrapped attribute set.
  * 
                    
@@ -60,17 +60,17 @@ import java.io.Serializable;
  * 
                      
  * 
                    • the given object is an attribute of the given interface.
                      • 
  * 
                    • the category of given attribute is equals to a given category.
                      • 
- * 
                    • the given object is a Class that implements the given 
+ * 
                    • the given object is a Class that implements the given
  * interface name.
                      • 
  * 
                    
- * 
+ *
  */
 public final class AttributeSetUtilities
 {
   /**
    * This class isn't intended to be instantiated.
    */
-  private AttributeSetUtilities() 
+  private AttributeSetUtilities()
   {
     // only static methods
   }
@@ -97,7 +97,7 @@ public final class AttributeSetUtilities
     {
       throw new UnmodifiableSetException();
     }
-    
+
     public void clear()
     {
       throw new UnmodifiableSetException();
@@ -117,7 +117,7 @@ public final class AttributeSetUtilities
     {
       return attrset.equals(obj);
     }
-    
+
     public Attribute get(Class interfaceName)
     {
       return attrset.get(interfaceName);
@@ -127,7 +127,7 @@ public final class AttributeSetUtilities
     {
       return attrset.hashCode();
     }
-    
+
     public boolean isEmpty()
     {
       return attrset.isEmpty();
@@ -216,7 +216,7 @@ public final class AttributeSetUtilities
     {
       return attrset.addAll(attributes);
     }
-    
+
     public synchronized void clear()
     {
       attrset.clear();
@@ -236,7 +236,7 @@ public final class AttributeSetUtilities
     {
       return attrset.equals(obj);
     }
-    
+
     public synchronized Attribute get(Class interfaceName)
     {
       return attrset.get(interfaceName);
@@ -246,7 +246,7 @@ public final class AttributeSetUtilities
     {
       return attrset.hashCode();
     }
-    
+
     public synchronized boolean isEmpty()
     {
       return attrset.isEmpty();
@@ -334,7 +334,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedDocAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -345,7 +345,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintJobAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -356,7 +356,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintRequestAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns a synchronized view of the given attribute set.
    *
@@ -367,7 +367,7 @@ public final class AttributeSetUtilities
   {
     return new SynchronizedPrintServiceAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -378,7 +378,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiableAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -389,7 +389,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiableDocAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -400,7 +400,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiablePrintJobAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -411,7 +411,7 @@ public final class AttributeSetUtilities
   {
     return new UnmodifiablePrintRequestAttributeSet(attributeSet);
   }
-  
+
   /**
    * Returns an unmodifiable view of the given attribute set.
    *
@@ -426,7 +426,7 @@ public final class AttributeSetUtilities
   /**
    * Verifies that the given object is a Class that
    * implements the given interface name and returns it casted.
-   * 
+   *
    * @param object the object to test.
    * @param interfaceName the Class to verify against.
    * @return object casted to Class
@@ -448,11 +448,11 @@ public final class AttributeSetUtilities
 
     throw new ClassCastException();
   }
-  
+
   /**
    * Verifies that the given object is an attribute of the given interface.
    * and returns it casted to the interface type.
-   * 
+   *
    * @param object the object to test.
    * @param interfaceName the Class to verify against.
    * @return the object casted to Attribute
@@ -475,7 +475,7 @@ public final class AttributeSetUtilities
   /**
    * Verifies that the category of attribute is equals to the given category
    * class.
-   * 
+   *
    * @param category the category to test.
    * @param attribute the attribute to verify.
    *
diff --git a/libjava/classpath/javax/print/attribute/DateTimeSyntax.java b/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
index 8cff702199d..7d587dbd844 100644
--- a/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
+++ b/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
@@ -1,4 +1,4 @@
-/* DateTimeSyntax.java -- 
+/* DateTimeSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,17 +41,17 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * DateTimeSyntax is the abstract base class of all attribute 
+ * DateTimeSyntax is the abstract base class of all attribute
  * classes having a date and a time as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class DateTimeSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -1400819079791208582L;
-  
+
   private Date value;
-  
+
   /**
    * Creates a DateTimeSyntax with a given value.
    *
@@ -79,10 +79,10 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable
 
   /**
    * Tests if the given object is equal to this one.
-   * 
+   *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
@@ -102,14 +102,14 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable
   {
     return value.hashCode();
   }
-  
+
   /**
    * Returns the string representation for this object.
    *
    * @return The string representation.
    */
-  public String toString() 
+  public String toString()
   {
-    return value.toString();    
+    return value.toString();
   }
 }
diff --git a/libjava/classpath/javax/print/attribute/DocAttribute.java b/libjava/classpath/javax/print/attribute/DocAttribute.java
index 9af3a7052af..56114f73e92 100644
--- a/libjava/classpath/javax/print/attribute/DocAttribute.java
+++ b/libjava/classpath/javax/print/attribute/DocAttribute.java
@@ -1,4 +1,4 @@
-/* DocAttribute.java -- 
+/* DocAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,20 +38,20 @@ exception statement from your version. */
 package javax.print.attribute;
 
 /**
- * Marker interface for all attribute classes describing attributes of 
- * a {@link javax.print.Doc} object. 
+ * Marker interface for all attribute classes describing attributes of
+ * a {@link javax.print.Doc} object.
  * 
                    
- * Instances of implementing attribute classes may be collected in a 
- * {@link javax.print.attribute.DocAttributeSet}. 
+ * Instances of implementing attribute classes may be collected in a
+ * {@link javax.print.attribute.DocAttributeSet}.
  * 
                    
  * Attributes attached to a {@link javax.print.Doc} instance specify how the
- * data should be printed. 
- * For example {@link javax.print.attribute.standard.Chromaticity} can be 
+ * data should be printed.
+ * For example {@link javax.print.attribute.standard.Chromaticity} can be
  * used to specify that a doc should be printed in color or monochrome.
  * 
                    
- * 
+ *
  * @see javax.print.attribute.DocAttributeSet
- * 
+ *
  * @author Michael Koch  (konqueror@gmx.de)
  */
 public interface DocAttribute extends Attribute
diff --git a/libjava/classpath/javax/print/attribute/DocAttributeSet.java b/libjava/classpath/javax/print/attribute/DocAttributeSet.java
index d8d09eb4857..35a2676b197 100644
--- a/libjava/classpath/javax/print/attribute/DocAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/DocAttributeSet.java
@@ -1,4 +1,4 @@
-/* DocAttributeSet.java -- 
+/* DocAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * DocAttributeSet specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.DocAttribute}.
  * 
                    
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * DocAttribute instances are allowed in this set.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface DocAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * DocAttribute.
    * @throws NullPointerException if the attribute is null.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface DocAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * DocAttribute.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/libjava/classpath/javax/print/attribute/EnumSyntax.java b/libjava/classpath/javax/print/attribute/EnumSyntax.java
index 9a5e62d458f..e848dfcc334 100644
--- a/libjava/classpath/javax/print/attribute/EnumSyntax.java
+++ b/libjava/classpath/javax/print/attribute/EnumSyntax.java
@@ -1,4 +1,4 @@
-/* EnumSyntax.java -- 
+/* EnumSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,16 +43,16 @@ import java.io.Serializable;
 
 /**
  * EnumSyntax is the abstract base class of all enumeration
- * classes in the Java Print Service API. 
+ * classes in the Java Print Service API.
  * 
                    
- * Every enumeration class which extends from EnumSyntax provides several 
+ * Every enumeration class which extends from EnumSyntax provides several
  * enumeration objects as singletons of its class.
  * 
                    
  * 
                    
  * Notes for implementing subclasses:
  * 
                      
  *   
                    • 
- *     The values of all enumeration singelton instances have to be in a 
+ *     The values of all enumeration singelton instances have to be in a
  *     sequence which may start at any value. See: {@link #getOffset()}
  *   
                      • 
  *   
                    • 
@@ -61,50 +61,50 @@ import java.io.Serializable;
  *   
                      • 
  * 
                    
  * 
                    
- * Example: 
- * 
                     
+ * Example:
+ * 
                      * public class PrinterState extends EnumSyntax
  * {
  *   public static final PrinterState IDLE = new PrinterState(1);
  *   public static final PrinterState PROCESSING = new PrinterState(2);
  *   public static final PrinterState STOPPED = new PrinterState(3);
- * 
+ *
  *   protected PrinterState(int value)
  *   {
  *     super(value);
  *   }
- * 
+ *
  *   // Overridden because values start not at zero !
  *   protected int getOffset()
  *   {
  *     return 1;
  *   }
- * 
- *   private static final String[] stringTable = { "idle", "processing", 
+ *
+ *   private static final String[] stringTable = { "idle", "processing",
  *                                                 "stopped" };
- * 
+ *
  *   protected String[] getStringTable()
  *   {
  *     return stringTable;
  *   }
- * 
- *   private static final PrinterState[] enumValueTable = { IDLE, 
+ *
+ *   private static final PrinterState[] enumValueTable = { IDLE,
  *                                             PROCESSING, STOPPED};
- * 
+ *
  *   protected EnumSyntax[] getEnumValueTable()
  *   {
  *     return enumValueTable;
  *   }
  * }
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public abstract class EnumSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -2739521845085831642L;
-  
+
   private int value;
 
   /**
@@ -146,7 +146,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable
   }
 
   /**
-   * Returns the hashcode for this object. 
+   * Returns the hashcode for this object.
    * The hashcode is the value of this enumeration object.
    *
    * @return The hashcode.
@@ -173,7 +173,7 @@ public abstract class EnumSyntax implements Cloneable, Serializable
         && index >= 0
         && index < table.length)
       return table[index];
-    
+
     return "" + value;
   }
 
@@ -193,12 +193,12 @@ public abstract class EnumSyntax implements Cloneable, Serializable
 
   /**
    * Needed for singelton semantics during deserialisation.
-   * 
+   *
    * Subclasses must not override this class. Subclasses have to override
-   * getEnumValueTable() and should override 
+   * getEnumValueTable() and should override
    * getStringTable() for correct serialization.
-   * 
-   * @return The Object at index value - getOffset() 
+   *
+   * @return The Object at index value - getOffset()
    *         in getEnumValueTable.
    * @throws ObjectStreamException if getEnumValueTable() returns null.
    */
@@ -227,10 +227,10 @@ public abstract class EnumSyntax implements Cloneable, Serializable
   }
 
   /**
-   * Returns the lowest used value by the enumerations of this class. 
-   * 
+   * Returns the lowest used value by the enumerations of this class.
+   *
    * The default implementation returns 0. This is enough if enumerations
-   * start with a zero value. Otherwise subclasses need to override this 
+   * start with a zero value. Otherwise subclasses need to override this
    * method for serialization and return the lowest value they use.
    * .
    * @return The lowest used value used.
diff --git a/libjava/classpath/javax/print/attribute/HashAttributeSet.java b/libjava/classpath/javax/print/attribute/HashAttributeSet.java
index 0f6b00730a8..39d00528d4c 100644
--- a/libjava/classpath/javax/print/attribute/HashAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashAttributeSet.java -- 
+/* HashAttributeSet.java --
    Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ import java.util.Iterator;
 public class HashAttributeSet implements AttributeSet, Serializable
 {
   private static final long serialVersionUID = 5311560590283707917L;
-  
+
   private Class myInterface;
   private transient HashMap attributeMap = new HashMap();
 
@@ -95,7 +95,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Creates a HashAttributeSet object with attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    */
   public HashAttributeSet(AttributeSet attributes)
@@ -114,14 +114,14 @@ public class HashAttributeSet implements AttributeSet, Serializable
   {
     if (interfaceName == null)
       throw new NullPointerException("interfaceName may not be null");
-    
+
     myInterface = interfaceName;
   }
-  
+
   /**
    * Creates a HashAttributeSet object with the given
    * attribute in it.
-   * 
+   *
    * @param attribute the attribute to put into the set.
    * @param interfaceName the interface that all members must implement.
    *
@@ -132,10 +132,10 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(Attribute attribute, Class interfaceName)
   {
     this(interfaceName);
-    
+
     if (attribute == null)
       throw new NullPointerException();
-    
+
     addInternal(attribute, interfaceName);
   }
 
@@ -154,7 +154,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(Attribute[] attributes, Class interfaceName)
   {
     this(interfaceName);
-    
+
     if (attributes != null)
       {
         for (int index = 0; index < attributes.length; index++)
@@ -166,7 +166,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Creates a HashAttributeSet object with attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    * @param interfaceName the interface that all members must implement.
    *
@@ -176,18 +176,18 @@ public class HashAttributeSet implements AttributeSet, Serializable
   protected HashAttributeSet(AttributeSet attributes, Class interfaceName)
   {
     this(interfaceName);
-    
+
     if (attributes != null)
       addAllInternal(attributes, interfaceName);
   }
 
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute to the set. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute to the set.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
    * @throws NullPointerException if the attribute is null.
@@ -214,11 +214,11 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   public boolean addAll(AttributeSet attributes)
@@ -240,7 +240,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Removes all attributes from this attribute set.
-   * 
+   *
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public void clear()
@@ -249,9 +249,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   }
 
   /**
-   * Checks if this attributes set contains an attribute with the given 
+   * Checks if this attributes set contains an attribute with the given
    * category.
-   * 
+   *
    * @param category the category to test for.
    * @return true if an attribute of the category is contained
    * in the set, false otherwise.
@@ -263,7 +263,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Checks if this attribute set contains the given attribute.
-   * 
+   *
    * @param attribute the attribute to test for.
    * @return true if the attribute is contained in the set,
    * false otherwise.
@@ -277,7 +277,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    * Tests this set for equality with the given object. true is
    * returned, if the given object is also of type AttributeSet
    * and the contained attributes are the same as in this set.
-   * 
+   *
    * @param obj the Object to test.
    * @return true if equal, false otherwise.
    */
@@ -291,28 +291,28 @@ public class HashAttributeSet implements AttributeSet, Serializable
 
   /**
    * Returns the attribute object contained in this set for the given attribute
-   * category. 
-   * 
-   * @param category the category of the attribute. A Class 
-   * instance of a class implementing the Attribute interface. 
-   * @return The attribute for this category or null if no 
-   * attribute is contained for the given category. 
+   * category.
+   *
+   * @param category the category of the attribute. A Class
+   * instance of a class implementing the Attribute interface.
+   * @return The attribute for this category or null if no
+   * attribute is contained for the given category.
    * @throws NullPointerException if category is null.
-   * @throws ClassCastException if category is not implementing 
+   * @throws ClassCastException if category is not implementing
    * Attribute.
    */
   public Attribute get(Class category)
   {
     if (category == null)
       throw new NullPointerException("category may not be null");
-    
+
     return (Attribute) attributeMap.get(category);
   }
-  
+
   /**
    * Returns the hashcode value. The hashcode value is the sum of all hashcodes
    * of the attributes contained in this set.
-   * 
+   *
    * @return The hashcode for this attribute set.
    */
   public int hashCode()
@@ -321,7 +321,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
     Iterator it = attributeMap.values().iterator();
     while (it.hasNext())
       hashcode = hashcode + it.next().hashCode();
-          
+
     return hashcode;
   }
 
@@ -338,9 +338,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   /**
    * Removes the given attribute from the set. If the given attribute is null
    * nothing is done and false is returned.
-   * 
-   * @param attribute the attribute to remove.  
-   * @return true if removed, false in all other cases. 
+   *
+   * @param attribute the attribute to remove.
+   * @return true if removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public boolean remove(Attribute attribute)
@@ -354,9 +354,9 @@ public class HashAttributeSet implements AttributeSet, Serializable
   /**
    * Removes the attribute entry of the given category from the set. If the given
    * category is null nothing is done and false is returned.
-   * 
+   *
    * @param category the category of the entry to be removed.
-   * @return true if an attribute is removed, false in all other cases. 
+   * @return true if an attribute is removed, false in all other cases.
    * @throws UnmodifiableSetException if the set does not support modification.
    */
   public boolean remove(Class category)
@@ -393,10 +393,10 @@ public class HashAttributeSet implements AttributeSet, Serializable
         array[index] = (Attribute) it.next();
         index++;
       }
-    
+
     return array;
   }
-  
+
   // Implemented as specified in serialized form
   private void readObject(ObjectInputStream s)
     throws ClassNotFoundException, IOException
@@ -407,13 +407,13 @@ public class HashAttributeSet implements AttributeSet, Serializable
     for (int i=0; i < size; i++)
       add((Attribute) s.readObject());
   }
-         
+
   private void writeObject(ObjectOutputStream s) throws IOException
   {
     s.writeObject(myInterface);
     s.writeInt(size());
     Iterator it = attributeMap.values().iterator();
     while (it.hasNext())
-      s.writeObject(it.next());    
+      s.writeObject(it.next());
   }
 }
diff --git a/libjava/classpath/javax/print/attribute/HashDocAttributeSet.java b/libjava/classpath/javax/print/attribute/HashDocAttributeSet.java
index 2317db3bc1e..73c25863e54 100644
--- a/libjava/classpath/javax/print/attribute/HashDocAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashDocAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashDocAttributeSet.java -- 
+/* HashDocAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashDocAttributeSet extends HashAttributeSet
   implements DocAttributeSet, Serializable
 {
   private static final long serialVersionUID = -1128534486061432528L;
-  
+
   /**
    * Creates an empty HashDocAttributeSet object.
    */
@@ -88,7 +88,7 @@ public class HashDocAttributeSet extends HashAttributeSet
    * Creates a HashDocAttributeSet object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of DocAttribute
diff --git a/libjava/classpath/javax/print/attribute/HashPrintJobAttributeSet.java b/libjava/classpath/javax/print/attribute/HashPrintJobAttributeSet.java
index ac4c902c332..ddeda3b4785 100644
--- a/libjava/classpath/javax/print/attribute/HashPrintJobAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashPrintJobAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintJobAttributeSet.java -- 
+/* HashPrintJobAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   implements Serializable, PrintJobAttributeSet
 {
   private static final long serialVersionUID = -4204473656070350348L;
-  
+
   /**
    * Creates an empty HashPrintJobAttributeSet object.
    */
@@ -55,7 +55,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintJobAttributeSet object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintJobAttributeSet object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintJobAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintJobAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintJobAttributeSet object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of PrintJobAttribute
diff --git a/libjava/classpath/javax/print/attribute/HashPrintRequestAttributeSet.java b/libjava/classpath/javax/print/attribute/HashPrintRequestAttributeSet.java
index e74c0e00fbe..61c2537dfd9 100644
--- a/libjava/classpath/javax/print/attribute/HashPrintRequestAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashPrintRequestAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintRequestAttributeSet.java -- 
+/* HashPrintRequestAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   implements Serializable, PrintRequestAttributeSet
 {
   private static final long serialVersionUID = 2364756266107751933L;
-  
+
   /**
    * Creates an empty HashPrintRequestAttributeSet object.
    */
@@ -55,7 +55,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintRequestAttributeSet object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintRequestAttributeSet object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintRequestAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintRequestAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintRequestAttributeSet object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of PrintRequestAttribute
diff --git a/libjava/classpath/javax/print/attribute/HashPrintServiceAttributeSet.java b/libjava/classpath/javax/print/attribute/HashPrintServiceAttributeSet.java
index 155514f2b01..bc934def23a 100644
--- a/libjava/classpath/javax/print/attribute/HashPrintServiceAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashPrintServiceAttributeSet.java
@@ -1,4 +1,4 @@
-/* HashPrintServiceAttributeSet.java -- 
+/* HashPrintServiceAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,7 +47,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   implements Serializable, PrintServiceAttributeSet
 {
   private static final long serialVersionUID = 6642904616179203070L;
-  
+
   /**
    * Creates an empty HashPrintServiceAttributeSet object.
    */
@@ -55,7 +55,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintServiceAttributeSet object with the given
    * attribute in it.
@@ -68,7 +68,7 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(attribute, PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintServiceAttributeSet object with the given
    * attributes in it.
@@ -83,12 +83,12 @@ public class HashPrintServiceAttributeSet extends HashAttributeSet
   {
     super(attributes, PrintServiceAttribute.class);
   }
-  
+
   /**
    * Creates a HashPrintServiceAttributeSet object with the attributes
    * of the given attributes set in it.
    *
-   * @param attributes the attributes set to put into the set. If 
+   * @param attributes the attributes set to put into the set. If
    * null an empty set is created.
    * @exception ClassCastException if any element of attributes is not
    * an instance of PrintServiceAttribute
diff --git a/libjava/classpath/javax/print/attribute/IntegerSyntax.java b/libjava/classpath/javax/print/attribute/IntegerSyntax.java
index c2f9224a2a2..b53faa20aa3 100644
--- a/libjava/classpath/javax/print/attribute/IntegerSyntax.java
+++ b/libjava/classpath/javax/print/attribute/IntegerSyntax.java
@@ -1,4 +1,4 @@
-/* IntegerSyntax.java -- 
+/* IntegerSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,9 +40,9 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * IntegerSyntax is the abstract base class of all attribute 
+ * IntegerSyntax is the abstract base class of all attribute
  * classes having an integer as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class IntegerSyntax implements Cloneable, Serializable
@@ -94,7 +94,7 @@ public abstract class IntegerSyntax implements Cloneable, Serializable
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/PrintJobAttribute.java b/libjava/classpath/javax/print/attribute/PrintJobAttribute.java
index fd3663496c8..5954824d096 100644
--- a/libjava/classpath/javax/print/attribute/PrintJobAttribute.java
+++ b/libjava/classpath/javax/print/attribute/PrintJobAttribute.java
@@ -1,4 +1,4 @@
-/* PrintJobAttribute.java -- 
+/* PrintJobAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,19 +39,19 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes describing attributes or the
- * status of a ({@link javax.print.DocPrintJob} object. 
+ * status of a ({@link javax.print.DocPrintJob} object.
  * 
                    
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintJobAttributeSet}.
  * 
                    
  * A print service uses attributes of this type to inform about the status
- * of a print job. 
- * For example {@link javax.print.attribute.standard.DateTimeAtProcessing} 
- * is used to report at which date and time a job has started processing. 
+ * of a print job.
+ * For example {@link javax.print.attribute.standard.DateTimeAtProcessing}
+ * is used to report at which date and time a job has started processing.
  * 
                    
- * 
+ *
  * @see javax.print.attribute.PrintJobAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttribute extends Attribute
diff --git a/libjava/classpath/javax/print/attribute/PrintJobAttributeSet.java b/libjava/classpath/javax/print/attribute/PrintJobAttributeSet.java
index 6283ae14276..232f4b36a3e 100644
--- a/libjava/classpath/javax/print/attribute/PrintJobAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/PrintJobAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeSet.java -- 
+/* PrintJobAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * PrintJobAttributeSet specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintJobAttribute}.
  * 
                    
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * PrintJobAttribute instances are allowed in this set.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * PrintJobAttribute.
    * @throws NullPointerException if the attribute is null.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintJobAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * PrintJobAttribute.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/libjava/classpath/javax/print/attribute/PrintRequestAttribute.java b/libjava/classpath/javax/print/attribute/PrintRequestAttribute.java
index 8a05b75d3cd..037838ca837 100644
--- a/libjava/classpath/javax/print/attribute/PrintRequestAttribute.java
+++ b/libjava/classpath/javax/print/attribute/PrintRequestAttribute.java
@@ -1,4 +1,4 @@
-/* PrintRequestAttribute.java -- 
+/* PrintRequestAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,14 +39,14 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes which specify a requested
- * attribute of {@link javax.print.DocPrintJob} object. 
+ * attribute of {@link javax.print.DocPrintJob} object.
  * 
                    
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintRequestAttributeSet}.
  * 
                    
- * 
+ *
  * @see javax.print.attribute.PrintRequestAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintRequestAttribute extends Attribute
diff --git a/libjava/classpath/javax/print/attribute/PrintRequestAttributeSet.java b/libjava/classpath/javax/print/attribute/PrintRequestAttributeSet.java
index 350d9a644da..60098064fd3 100644
--- a/libjava/classpath/javax/print/attribute/PrintRequestAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/PrintRequestAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintRequestAttributeSet.java -- 
+/* PrintRequestAttributeSet.java --
    Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * PrintRequestAttributeSet specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintRequestAttribute}.
  * 
                    
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * PrintRequestAttribute instances are allowed in this set.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintRequestAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * PrintRequestAttribute.
    * @throws NullPointerException if the attribute is null.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintRequestAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * PrintRequestAttribute.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/libjava/classpath/javax/print/attribute/PrintServiceAttribute.java b/libjava/classpath/javax/print/attribute/PrintServiceAttribute.java
index 213f43796bb..82d26922a40 100644
--- a/libjava/classpath/javax/print/attribute/PrintServiceAttribute.java
+++ b/libjava/classpath/javax/print/attribute/PrintServiceAttribute.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttribute.java -- 
+/* PrintServiceAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,19 +39,19 @@ package javax.print.attribute;
 
 /**
  * Marker interface for all attribute classes describing parameters
- * or the status of a {@link javax.print.PrintService}. 
+ * or the status of a {@link javax.print.PrintService}.
  * 
                    
- * Instances of implementing attribute classes may be collected in a 
+ * Instances of implementing attribute classes may be collected in a
  * {@link javax.print.attribute.PrintServiceAttributeSet}.
  * 
                    
  * A print service uses attributes of this type to inform about the status
- * or the specific capabilities of itself. 
+ * or the specific capabilities of itself.
  * For example {@link javax.print.attribute.standard.PagesPerMinute} is used
- * to specify the average printable pages per minute of the print service. 
+ * to specify the average printable pages per minute of the print service.
  * 
                    
- * 
+ *
  * @see javax.print.attribute.PrintServiceAttributeSet
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttribute extends Attribute
diff --git a/libjava/classpath/javax/print/attribute/PrintServiceAttributeSet.java b/libjava/classpath/javax/print/attribute/PrintServiceAttributeSet.java
index fa22ee0d922..418a59950e7 100644
--- a/libjava/classpath/javax/print/attribute/PrintServiceAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/PrintServiceAttributeSet.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeSet.java -- 
+/* PrintServiceAttributeSet.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,28 +39,28 @@ package javax.print.attribute;
 
 /**
  * PrintServiceAttributeSet specifies an attribute set which only
- * allows printing attributes of type 
+ * allows printing attributes of type
  * {@link javax.print.attribute.PrintServiceAttribute}.
  * 
                    
  * The methods {@link #add(Attribute)} and {@link #addAll(AttributeSet)} are
- * respecified in this interface to indicate that only 
+ * respecified in this interface to indicate that only
  * PrintServiceAttribute instances are allowed in this set.
  * 
                    
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttributeSet extends AttributeSet
 {
   /**
-   * Adds the specified attribute value to this attribute set 
+   * Adds the specified attribute value to this attribute set
    * if it is not already present.
-   * 
-   * This operation removes any existing attribute of the same category 
-   * before adding the given attribute. 
-   * 
+   *
+   * This operation removes any existing attribute of the same category
+   * before adding the given attribute.
+   *
    * @param attribute the attribute to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if attribute is not of type 
+   * @throws ClassCastException if attribute is not of type
    * PrintServiceAttribute.
    * @throws NullPointerException if the attribute is null.
    * @throws UnmodifiableSetException if the set does not support modification.
@@ -69,13 +69,13 @@ public interface PrintServiceAttributeSet extends AttributeSet
 
   /**
    * Adds all of the elements in the specified set to this attribute set.
-   * 
+   *
    * @param attributes the set of attributes to add.
    * @return true if the set is changed, false otherwise.
-   * @throws ClassCastException if one of the attributes is not of type 
+   * @throws ClassCastException if one of the attributes is not of type
    * PrintServiceAttribute.
    * @throws UnmodifiableSetException if the set does not support modification.
-   * 
+   *
    * @see #add(Attribute)
    */
   boolean addAll (AttributeSet attributes);
diff --git a/libjava/classpath/javax/print/attribute/ResolutionSyntax.java b/libjava/classpath/javax/print/attribute/ResolutionSyntax.java
index aca4c0188ec..54468d0872d 100644
--- a/libjava/classpath/javax/print/attribute/ResolutionSyntax.java
+++ b/libjava/classpath/javax/print/attribute/ResolutionSyntax.java
@@ -1,4 +1,4 @@
-/* ResolutionSyntax.java -- 
+/* ResolutionSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,11 +40,11 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * ResolutionSyntax is the abstract base class of all attribute 
+ * ResolutionSyntax is the abstract base class of all attribute
  * classes which provide a resolution as value (e.g. printer resolution).
  * 
                    
  * A ResolutionSyntax instance consists of two integer values
- * describing the resolution in feed and cross feed direction. The units of 
+ * describing the resolution in feed and cross feed direction. The units of
  * the given values is determined by two defined constants:
  * 
                      
  * 
                    • DPCM - dots per centimeter
                      • 
@@ -56,25 +56,25 @@ import java.io.Serializable;
  * one of the two constants defining the actual units of the given values.
  * 
                      
  * 
                      
- * There are different methods provided to return the resolution values in 
+ * There are different methods provided to return the resolution values in
  * either of the both units and to compare if a resolution is less than or
  * equal to a given other resolution attribute.
  * 
                      
  * 
                      
  * Internal storage:
                      
- * The resolutions are stored internally as dots per 100 inches (dphi). The 
+ * The resolutions are stored internally as dots per 100 inches (dphi). The
  * values of the provided constants for dots per inch (value 100) and dots
  * per centimeter (value 254) are used as conversion factors to the internal
  * storage units. To get the internal dphi values a multiplication of a given
- * resolution value with its units constant value is needed. Retrieving the 
- * resolution for specific units is done by dividing the internal stored 
- * value through the units constant value. Clients are therefore able to 
+ * resolution value with its units constant value is needed. Retrieving the
+ * resolution for specific units is done by dividing the internal stored
+ * value through the units constant value. Clients are therefore able to
  * provide their own resolution units by supplying other conversion factors.
  * Subclasses of ResolutionSyntax have access to the internal
- * resolution values through the protected methods 
+ * resolution values through the protected methods
  * {@link #getCrossFeedResolutionDphi()} and {@link #getFeedResolutionDphi()}.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class ResolutionSyntax
@@ -94,7 +94,7 @@ public abstract class ResolutionSyntax
 
   private int crossFeedResolution;
   private int feedResolution;
-  
+
   /**
    * Creates a ResolutionSyntax object with the given arguments.
    *
@@ -121,7 +121,7 @@ public abstract class ResolutionSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
@@ -130,7 +130,7 @@ public abstract class ResolutionSyntax
       return false;
 
     ResolutionSyntax tmp = (ResolutionSyntax) obj;
-    
+
     return (crossFeedResolution == tmp.getCrossFeedResolutionDphi()
             && feedResolution == tmp.getFeedResolutionDphi());
   }
@@ -186,7 +186,7 @@ public abstract class ResolutionSyntax
   {
     return feedResolution;
   }
-  
+
   /**
    * Returns the resolution as two field array. Index 0 is the cross feed
    * resolution, index 1 the feed resolution.
@@ -214,7 +214,7 @@ public abstract class ResolutionSyntax
   }
 
   /**
-   * Checks if the given resolution attribute is a lower or equal 
+   * Checks if the given resolution attribute is a lower or equal
    * to this resolution object.
    *
    * @param other the resolution to check against
@@ -252,7 +252,7 @@ public abstract class ResolutionSyntax
    * for the cross feed and F for the feed direction resolution.
    * U denotes the units name if one is supplied.
    * 
                      
-   * 
+   *
    * @param units the units to use
    * @param unitsName the name of the units. If null
    * it is ommitted from the string representation.
@@ -263,7 +263,7 @@ public abstract class ResolutionSyntax
   {
     if (unitsName == null)
       return getCrossFeedResolution(units) + "x" + getFeedResolution(units);
-    
+
     return ("" + getCrossFeedResolution(units)
             + "x" + getFeedResolution(units)
             + " " + unitsName);
diff --git a/libjava/classpath/javax/print/attribute/SetOfIntegerSyntax.java b/libjava/classpath/javax/print/attribute/SetOfIntegerSyntax.java
index 4c0dd2f19a9..b1e0af1a7b9 100644
--- a/libjava/classpath/javax/print/attribute/SetOfIntegerSyntax.java
+++ b/libjava/classpath/javax/print/attribute/SetOfIntegerSyntax.java
@@ -1,4 +1,4 @@
-/* SetOfIntegerSyntax.java -- 
+/* SetOfIntegerSyntax.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import java.util.Arrays;
 import java.util.Comparator;
 
 /**
- * SetOfIntegerSyntax is the abstract base class of all attribute 
+ * SetOfIntegerSyntax is the abstract base class of all attribute
  * classes which provide a set of non-negative integers as value (e.g. the
  * page ranges to print) represented as single values or ranges of values.
  * 
                      
  * A SetOfIntegerSyntax instance consists of an integer array of
  * ranges. Ranges may have the same lower and upper bound representing a single
- * integer value. Ranges with a lower bound greater than the upper bound are 
- * null ranges and discarded. Ranges may overlap in their values. In no case 
+ * integer value. Ranges with a lower bound greater than the upper bound are
+ * null ranges and discarded. Ranges may overlap in their values. In no case
  * negative integers are allowed.
  * 
                      
  * 
                      
@@ -65,21 +65,21 @@ import java.util.Comparator;
  * Constructor for an instance with one range of integer values.
  * 
                      
  * 
                    • SetOfIntegerSyntax(int[][] members)
                      
- * Flexible constructor for an instance with several single integer values 
- * and/or several ranges of integer values. The allowed array form is an 
- * array of integer arrays of length one or two. Examples are: 
+ * Flexible constructor for an instance with several single integer values
+ * and/or several ranges of integer values. The allowed array form is an
+ * array of integer arrays of length one or two. Examples are:
  * int[0][] for empty set of integers, int[][] {{1}}
  * , int[][] {{1,5}}, int[][] {{1,5},{7,9}},
  * int[][] {{3,7},{19}}.
  * 

                      • 
  * 
                    • SetOfIntegerSyntax(String s)
                      
- * Flexible constructor for an instance with several single integer values 
+ * Flexible constructor for an instance with several single integer values
  * and/or several ranges of integer values. The allowed String instance have
- * to be a String with comma separated ranges of integer values or single 
+ * to be a String with comma separated ranges of integer values or single
  * values. Ranges are represented by two integer with a hypen (-) or colon (:)
  * between the lower and upper bound value. Whitespace characters are ignored.
- * Examples are: "" for an empty set of integers, 
- * "1", "1-5", "1-5,7-9", 
+ * Examples are: "" for an empty set of integers,
+ * "1", "1-5", "1-5,7-9",
  * "3-7,19" and "1:2,4".
  * 
                      • 
  * 
                    
@@ -88,9 +88,9 @@ import java.util.Comparator;
  * Internal storage:
                    
  * The set of integers are stored internally in a normalized array form.
  * In the normalized array form the set of integer ranges are represented
- * in as few ranges as possible and overlapping ranges are merged. The ranges 
- * are always represented as an integer array of length two with ranges 
- * stored in {lower bound, upper bound} form. The ranges are stored in 
+ * in as few ranges as possible and overlapping ranges are merged. The ranges
+ * are always represented as an integer array of length two with ranges
+ * stored in {lower bound, upper bound} form. The ranges are stored in
  * ascending order, without any null ranges.
  * 
                    
  * @author Michael Koch (konqueror@gmx.de)
@@ -132,13 +132,13 @@ public abstract class SetOfIntegerSyntax
           }
         values[outIndex++] = values[save];
       }
-    
+
     int[][] result = new int[outIndex][];
     System.arraycopy(values, 0, result, 0, outIndex);
-    
+
     return result;
   }
-  
+
   /**
    * Creates a SetOfIntegerSyntax object.
    *
@@ -203,17 +203,17 @@ public abstract class SetOfIntegerSyntax
               }
           }
       }
-    
+
     this.members = normalize(newMembers, outIndex);
   }
-  
+
   private boolean skipWhitespace(StringCharacterIterator i)
   {
     while (Character.isWhitespace(i.current()))
       i.next();
     return i.current() == CharacterIterator.DONE;
   }
-  
+
   private boolean skipNumber(StringCharacterIterator i)
   {
     boolean readAny = false;
@@ -238,24 +238,24 @@ public abstract class SetOfIntegerSyntax
     if (s == null)
       this.members = normalize(new int[0][], 0);
     else
-      {      
+      {
         ArrayList vals = new ArrayList();
-        
+
         StringCharacterIterator it = new StringCharacterIterator(s);
-        
+
         while (true)
           {
             // Skip whitespace.
             if (skipWhitespace(it))
               break;
-            
+
             // Parse integer.
             int index = it.getIndex();
             if (! skipNumber(it))
               throw new IllegalArgumentException();
             int[] item = new int[2];
             item[0] = Integer.parseInt(s.substring(index, it.getIndex()));
-            
+
             if (! skipWhitespace(it))
               {
                 char c = it.current();
@@ -274,17 +274,17 @@ public abstract class SetOfIntegerSyntax
               }
             else
               item[1] = item[0];
-            
-            if (item[0] <= item[1]) 
+
+            if (item[0] <= item[1])
               vals.add(item);
-            
+
             if (skipWhitespace(it))
               break;
             if (it.current() != ',')
               throw new IllegalArgumentException();
             it.next();
           }
-        
+
         members = normalize((int[][]) vals.toArray(new int[0][]), vals.size());
       }
   }
@@ -393,7 +393,7 @@ public abstract class SetOfIntegerSyntax
    *
    * @param x an integer value
    *
-   * @return The next smallest integer value, or -1 if there 
+   * @return The next smallest integer value, or -1 if there
    * is no greater integer in the set.
    */
   public int next(int x)
diff --git a/libjava/classpath/javax/print/attribute/Size2DSyntax.java b/libjava/classpath/javax/print/attribute/Size2DSyntax.java
index 0b5c10070f1..b9e0e25db6f 100644
--- a/libjava/classpath/javax/print/attribute/Size2DSyntax.java
+++ b/libjava/classpath/javax/print/attribute/Size2DSyntax.java
@@ -1,4 +1,4 @@
-/* Size2DSyntax.java -- 
+/* Size2DSyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,12 +40,12 @@ package javax.print.attribute;
 import java.io.Serializable;
 
 /**
- * Size2DSyntax is the abstract base class of all attribute 
+ * Size2DSyntax is the abstract base class of all attribute
  * classes which provide a two dimensional size as value (e.g. the size of
  * a media like Letter or A4).
  * 
                    
  * A Size2DSyntax instance consists of two integer values
- * describing the size in the x and y dimension. The units of 
+ * describing the size in the x and y dimension. The units of
  * the given values is determined by two defined constants:
  * 
                      
  * 
                    • INCH - defines an inch
                      • 
@@ -54,7 +54,7 @@ import java.io.Serializable;
  * 
                      
  * 
                      
  * A size 2D attribute is constructed by two values for the size of the x and
- * y dimension and the actual units of the given values as defined by the 
+ * y dimension and the actual units of the given values as defined by the
  * constants.
  * 
                      
  * 
                      
@@ -64,16 +64,16 @@ import java.io.Serializable;
  * 
                      
  * 
                      
  * Internal storage:
                      
- * The size of the x,y dimensions are stored internally in micrometers. The 
+ * The size of the x,y dimensions are stored internally in micrometers. The
  * values of the provided constants for inch (value 25400) and millimeters
  * (value 1000) are used as conversion factors to the internal storage units.
  * To get the internal micrometers values a multiplication of a given
  * size value with its units constant value is done. Retrieving the size value
- * for specific units is done by dividing the internal stored value by the 
- * units constant value. Clients are therefore able to provide their own 
+ * for specific units is done by dividing the internal stored value by the
+ * units constant value. Clients are therefore able to provide their own
  * size units by supplying other conversion factors.
  * Subclasses of Size2DSyntax have access to the internal
- * size values through the protected methods 
+ * size values through the protected methods
  * {@link #getXMicrometers()} and {@link #getYMicrometers()}.
  * 
                      
  *
@@ -221,7 +221,7 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
 
     return ((float) y) / ((float) units);
   }
-  
+
   /**
    * Returns the size in y direction in mircometers.
    * To be used by sublcasses that need access to the internal storage value.
@@ -247,10 +247,10 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
    * Returns the string representation for this object.
    * 
                      
    * The returned string is in the form "XxY um" with X standing
-   * for size in x and Y for the size in y direction. The used 
+   * for size in x and Y for the size in y direction. The used
    * micrometers units is indicated by the appended "um" notation.
    * 
                      
-   * 
+   *
    * @return The string representation in micrometers.
    */
   public String toString()
@@ -262,11 +262,11 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
    * Returns the string representation for this object.
    * 
                      
    * The returned string is in the form "XxY U" with X standing
-   * for size in x and Y for the size in y direction. U denotes 
+   * for size in x and Y for the size in y direction. U denotes
    * the units name if one is supplied. The values are given as
    * floating point values.
    * 
                      
-   * 
+   *
    * @param units the units to use
    * @param unitsName the name of the units. If null
    * it is ommitted from the string representation.
@@ -277,7 +277,7 @@ public abstract class Size2DSyntax implements Cloneable, Serializable
   {
     if (unitsName == null)
       return getX(units) + "x" + getY(units);
-    
+
     return getX(units) + "x" + getY(units) + " " + unitsName;
   }
 }
diff --git a/libjava/classpath/javax/print/attribute/SupportedValuesAttribute.java b/libjava/classpath/javax/print/attribute/SupportedValuesAttribute.java
index a001e7e91ce..5380b4609a4 100644
--- a/libjava/classpath/javax/print/attribute/SupportedValuesAttribute.java
+++ b/libjava/classpath/javax/print/attribute/SupportedValuesAttribute.java
@@ -1,4 +1,4 @@
-/* SupportedValuesAttribute.java -- 
+/* SupportedValuesAttribute.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,7 @@ exception statement from your version. */
 package javax.print.attribute;
 
 /**
- * Marker interface for all attribute classes specifying the 
+ * Marker interface for all attribute classes specifying the
  * supported/allowed values for another printing attribute class.
  * 
                      
  * A {@link javax.print.PrintService} instance for example provides
@@ -46,11 +46,11 @@ package javax.print.attribute;
  * that a specific attribute type is supported and if the supported values.
  * 
                      
  * E.g. a {@link javax.print.attribute.standard.JobPrioritySupported}
- * instance indicates that the attribute class 
+ * instance indicates that the attribute class
  * {@link javax.print.attribute.standard.JobPriority} is supported and
  * provides the number of the possible priority levels.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface SupportedValuesAttribute extends Attribute
diff --git a/libjava/classpath/javax/print/attribute/TextSyntax.java b/libjava/classpath/javax/print/attribute/TextSyntax.java
index 2daab6ec325..43e3a9d30f0 100644
--- a/libjava/classpath/javax/print/attribute/TextSyntax.java
+++ b/libjava/classpath/javax/print/attribute/TextSyntax.java
@@ -1,4 +1,4 @@
-/* TextSyntax.java -- 
+/* TextSyntax.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ import java.io.Serializable;
 import java.util.Locale;
 
 /**
- * TextSyntax is the abstract base class of all attribute 
+ * TextSyntax is the abstract base class of all attribute
  * classes which provide a string as value (e.g. the location of the printer).
  * 
                      
  * A TextSyntax instance consists of a string value and a
@@ -53,7 +53,7 @@ import java.util.Locale;
 public abstract class TextSyntax implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -8130648736378144102L;
-  
+
   private String value;
   private Locale locale;
 
@@ -71,7 +71,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
   {
     if (value == null)
       throw new NullPointerException("value may not be null");
-    
+
     this.value = value;
     this.locale = (locale == null ? Locale.getDefault() : locale);
   }
@@ -119,7 +119,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
       return false;
 
     TextSyntax tmp = (TextSyntax) obj;
-    
+
     return (value.equals(tmp.getValue())
             && locale.equals(tmp.getLocale()));
   }
@@ -127,7 +127,7 @@ public abstract class TextSyntax implements Cloneable, Serializable
   /**
    * Returns a string representing the object. The returned
    * string is the underlying text value of this object.
-   * 
+   *
    * @return The string representation.
    */
   public String toString()
diff --git a/libjava/classpath/javax/print/attribute/URISyntax.java b/libjava/classpath/javax/print/attribute/URISyntax.java
index 07deb4b5741..a0903a46c4f 100644
--- a/libjava/classpath/javax/print/attribute/URISyntax.java
+++ b/libjava/classpath/javax/print/attribute/URISyntax.java
@@ -1,4 +1,4 @@
-/* URISyntax.java -- 
+/* URISyntax.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,9 +41,9 @@ import java.io.Serializable;
 import java.net.URI;
 
 /**
- * URISyntax is the abstract base class of all attribute 
+ * URISyntax is the abstract base class of all attribute
  * classes having an Uniform Resource Identifier URI as value.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class URISyntax
@@ -73,7 +73,7 @@ public abstract class URISyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/UnmodifiableSetException.java b/libjava/classpath/javax/print/attribute/UnmodifiableSetException.java
index ed1687c4cba..6712266b9e3 100644
--- a/libjava/classpath/javax/print/attribute/UnmodifiableSetException.java
+++ b/libjava/classpath/javax/print/attribute/UnmodifiableSetException.java
@@ -1,4 +1,4 @@
-/* UnmodifiableSetException.java -- 
+/* UnmodifiableSetException.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ package javax.print.attribute;
 /**
  * Exception which is thrown if an operation on an unmodifiable set
  * is invoked.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  *
  * @since 1.4
diff --git a/libjava/classpath/javax/print/attribute/standard/Chromaticity.java b/libjava/classpath/javax/print/attribute/standard/Chromaticity.java
index 3dec79893b4..619341f3176 100644
--- a/libjava/classpath/javax/print/attribute/standard/Chromaticity.java
+++ b/libjava/classpath/javax/print/attribute/standard/Chromaticity.java
@@ -49,7 +49,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * should be printed in monochrome or color.
  * 
                      
  * The attribute interacts with the document to be printed. If the document
- * to be printed is a monochrome document it will be printed monochrome 
+ * to be printed is a monochrome document it will be printed monochrome
  * regardless of the value of this attribute category. However if it is a
  * color document supplying the attribute value MONOCHROME
  * will prepare the document to be printed in monochrome instead of color.
@@ -63,20 +63,20 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * IPP Compatibility: Chromaticity is not an IPP 1.1 attribute.
  * 
                      
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class Chromaticity extends EnumSyntax
   implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
 {
   private static final long serialVersionUID = 4660543931355214012L;
-  
+
   /** Specifies monochrome printing. */
   public static final Chromaticity MONOCHROME = new Chromaticity(0);
-  
+
   /** Specifies color printing. */
   public static final Chromaticity COLOR = new Chromaticity(1);
-  
+
   private static final String[] stringTable = { "monochrome", "color" };
   private static final Chromaticity[] enumValueTable = { MONOCHROME, COLOR };
 
@@ -109,7 +109,7 @@ public final class Chromaticity extends EnumSyntax
   {
     return "chromaticity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -130,5 +130,5 @@ public final class Chromaticity extends EnumSyntax
   {
     return enumValueTable;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/print/attribute/standard/ColorSupported.java b/libjava/classpath/javax/print/attribute/standard/ColorSupported.java
index c5e251a5044..2fa8fd7289b 100644
--- a/libjava/classpath/javax/print/attribute/standard/ColorSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/ColorSupported.java
@@ -43,7 +43,7 @@ import javax.print.attribute.PrintServiceAttribute;
 
 
 /**
- * The ColorSupported printing attribute specifies if a 
+ * The ColorSupported printing attribute specifies if a
  * printing device is capable of color printing.
  * 
                      
  * This attributes just tells if a printer device supports color printing
@@ -56,7 +56,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * in the Java Print Service API. The IPP boolean value true corresponds
  * to SUPPORTED and "false" to NOT_SUPPORTED.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class ColorSupported extends EnumSyntax
@@ -66,17 +66,17 @@ public final class ColorSupported extends EnumSyntax
 
   /** The printer does not support printing in color. */
   public static final ColorSupported NOT_SUPPORTED = new ColorSupported(0);
-  
+
   /** The printer supports printing in color. */
   public static final ColorSupported SUPPORTED = new ColorSupported(1);
 
   private static final String[] stringTable = { "not-supported", "supported" };
   private static final ColorSupported[] enumValueTable = { NOT_SUPPORTED,
                                                           SUPPORTED };
-  
+
   /**
    * Constructs a ColorSupported object.
-   * 
+   *
    * @param value the enum value
    */
   protected ColorSupported(int value)
@@ -103,7 +103,7 @@ public final class ColorSupported extends EnumSyntax
   {
     return "color-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/Compression.java b/libjava/classpath/javax/print/attribute/standard/Compression.java
index f2f4f1cc142..412ed5af94a 100644
--- a/libjava/classpath/javax/print/attribute/standard/Compression.java
+++ b/libjava/classpath/javax/print/attribute/standard/Compression.java
@@ -52,7 +52,7 @@ import javax.print.attribute.EnumSyntax;
  * 
                      
  * IPP Compatibility: Compression is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class Compression extends EnumSyntax
@@ -62,24 +62,24 @@ public class Compression extends EnumSyntax
 
   /** The print data is not compressed. */
   public static final Compression NONE = new Compression(0);
-  
+
   /** The print data is ZIP compressed. */
   public static final Compression DEFLATE = new Compression(1);
-  
+
   /** The print data is GNU Zip compressed. */
   public static final Compression GZIP = new Compression(2);
-  
+
   /** The print data is UNIX compressed. */
   public static final Compression COMPRESS = new Compression(3);
-  
-  private static final String[] stringTable = { "none", "deflate", 
+
+  private static final String[] stringTable = { "none", "deflate",
                                                 "gzip", "compress" };
-  private static final Compression[] enumValueTable = { NONE, DEFLATE, 
+  private static final Compression[] enumValueTable = { NONE, DEFLATE,
                                                         GZIP, COMPRESS };
 
   /**
    * Constructs a Compression object.
-   * 
+   *
    * @param value the enum value
    */
   protected Compression(int value)
@@ -106,7 +106,7 @@ public class Compression extends EnumSyntax
   {
     return "compression";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/Copies.java b/libjava/classpath/javax/print/attribute/standard/Copies.java
index ea9a0990a31..c4bc2496ae5 100644
--- a/libjava/classpath/javax/print/attribute/standard/Copies.java
+++ b/libjava/classpath/javax/print/attribute/standard/Copies.java
@@ -1,4 +1,4 @@
-/* Copies.java -- 
+/* Copies.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,22 +46,22 @@ import javax.print.attribute.PrintRequestAttribute;
  * The Copies printing attribute specifies the number
  * of copies to be printed.
  * 
                      
- * Note: The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * Note: The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * 
                      
  * 
                      
  * IPP Compatibility: Copies is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.MultipleDocumentHandling
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class Copies extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -6426631521680023833L;
-  
+
   /**
    * Creates a Copies object.
    *
@@ -76,13 +76,13 @@ public final class Copies extends IntegerSyntax
     if (value < 1)
       throw new IllegalArgumentException("value may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/CopiesSupported.java b/libjava/classpath/javax/print/attribute/standard/CopiesSupported.java
index 1f62f48a87f..d8af8eb57a6 100644
--- a/libjava/classpath/javax/print/attribute/standard/CopiesSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/CopiesSupported.java
@@ -44,12 +44,12 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 /**
  * The CopiesSupported attribute specifies the supported
- * value or range of values for the 
- * {@link javax.print.attribute.standard.Copies} attribute. 
+ * value or range of values for the
+ * {@link javax.print.attribute.standard.Copies} attribute.
  * 
                      
  * IPP Compatibility: CopiesSupported is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -60,25 +60,25 @@ public final class CopiesSupported extends SetOfIntegerSyntax
 
   /**
    * Constructs a CopiesSupported object with
-   * the given value. This means that only this value is 
+   * the given value. This means that only this value is
    * supported for copies.
-   * 
+   *
    * @param member the member value
    * @exception IllegalArgumentException if member is < 1
    */
   public CopiesSupported(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
 
   /**
    * Constructs a CopiesSupported object with
-   * the given range of values. This means that values for 
+   * the given range of values. This means that values for
    * copies are supported inside the specified range.
-   * 
+   *
    * @param lowerBound the lower bound value
    * @param upperBound the upper bound value
    *
@@ -87,17 +87,17 @@ public final class CopiesSupported extends SetOfIntegerSyntax
   public CopiesSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java b/libjava/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java
index 324bab73b8d..285fc0d3f44 100644
--- a/libjava/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java
+++ b/libjava/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java
@@ -1,4 +1,4 @@
-/* DateTimeAtCompleted.java -- 
+/* DateTimeAtCompleted.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The DateTimeAtCompleted attribute specifies the date and 
+ * The DateTimeAtCompleted attribute specifies the date and
  * the time at which a print job completed (or was canceled or aborted).
  * 
                      
  * IPP Compatibility: DateTimeAtCompleted is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.DateTimeAtCreation
  * @see javax.print.attribute.standard.DateTimeAtProcessing
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtCompleted extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtCompleted extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/DateTimeAtCreation.java b/libjava/classpath/javax/print/attribute/standard/DateTimeAtCreation.java
index 5e975b64ae7..60b885ad194 100644
--- a/libjava/classpath/javax/print/attribute/standard/DateTimeAtCreation.java
+++ b/libjava/classpath/javax/print/attribute/standard/DateTimeAtCreation.java
@@ -1,4 +1,4 @@
-/* DateTimeAtCreation.java -- 
+/* DateTimeAtCreation.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.DateTimeSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The DateTimeAtCreation attribute specifies the 
+ * The DateTimeAtCreation attribute specifies the
  * date and the time at which a print job was created.
  * 
                      
  * IPP Compatibility: DateTimeAtCreation is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.DateTimeAtCompleted
  * @see javax.print.attribute.standard.DateTimeAtProcessing
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtCreation extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtCreation extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java b/libjava/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java
index b407d2b2aa0..733c5658908 100644
--- a/libjava/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java
+++ b/libjava/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java
@@ -1,4 +1,4 @@
-/* DateTimeAtProcessing.java -- 
+/* DateTimeAtProcessing.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import javax.print.attribute.PrintJobAttribute;
  * 
                      
  * @see javax.print.attribute.standard.DateTimeAtCompleted
  * @see javax.print.attribute.standard.DateTimeAtCreation
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DateTimeAtProcessing extends DateTimeSyntax
@@ -77,7 +77,7 @@ public final class DateTimeAtProcessing extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/Destination.java b/libjava/classpath/javax/print/attribute/standard/Destination.java
index a82aa4b369d..d37340a9e2d 100644
--- a/libjava/classpath/javax/print/attribute/standard/Destination.java
+++ b/libjava/classpath/javax/print/attribute/standard/Destination.java
@@ -49,22 +49,22 @@ import javax.print.attribute.URISyntax;
  * The Destination attribute provides a URI for an alternate
  * destination of the printing output.
  * 
                      
- * As not an IPP attribute many print services will not support this 
+ * As not an IPP attribute many print services will not support this
  * attribute and only provide the printer device as a destination.
  * An alternate output destination would be a file on the local harddisk
  * given as a file scheme URI.
  * 
                      
- * 
                       
- * If a print service does not support the destination attributes URI it 
+ * 
                      
+ * If a print service does not support the destination attributes URI it
  * will throw a PrintException. This exception may further implement the
- * interface {@link javax.print.URIException}. 
+ * interface {@link javax.print.URIException}.
  * 
                      
  * 
                      
  * IPP Compatibility: Destination is not an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.PrintException
  * @see javax.print.URIException
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,7 +75,7 @@ public final class Destination extends URISyntax
 
   /**
    * Constructs a Destination object.
-   * 
+   *
    * @param uri the URI of the output destination.
    * @throws NullPointerException if the given uri is null.
    */
@@ -83,13 +83,13 @@ public final class Destination extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/DocumentName.java b/libjava/classpath/javax/print/attribute/standard/DocumentName.java
index 6a377d5be70..f6f7927259c 100644
--- a/libjava/classpath/javax/print/attribute/standard/DocumentName.java
+++ b/libjava/classpath/javax/print/attribute/standard/DocumentName.java
@@ -1,4 +1,4 @@
-/* DocumentName.java -- 
+/* DocumentName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,15 +48,15 @@ import javax.print.attribute.TextSyntax;
  * The DocumentName printing attribute specifies a document name.
  * 
                      
  * The document name may be different than the name of the job. It must not be
- * unique across multiple documents in the same print job. Normally, an 
- * application provides the document name for the user by using e.g. the file 
+ * unique across multiple documents in the same print job. Normally, an
+ * application provides the document name for the user by using e.g. the file
  * name or a name generated automatically by the application.
  * 
                      
  * 
                      
  * IPP Compatibility: DocumentName is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.JobName
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class DocumentName extends TextSyntax
@@ -83,7 +83,7 @@ public final class DocumentName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/Fidelity.java b/libjava/classpath/javax/print/attribute/standard/Fidelity.java
index 5e25f5b882b..39d26a12770 100644
--- a/libjava/classpath/javax/print/attribute/standard/Fidelity.java
+++ b/libjava/classpath/javax/print/attribute/standard/Fidelity.java
@@ -53,20 +53,20 @@ import javax.print.attribute.PrintRequestAttribute;
  * through the client by providing this attribute to indicate the wanted
  * conflict handling mechanism:
  * 
                        
- * 
                      • {@link #FIDELITY_TRUE}: Reject the job since the job can not be 
+ * 
                      • {@link #FIDELITY_TRUE}: Reject the job since the job can not be
  * processed exactly as specified by the attributes of the client.
                        • 
- * 
                      • {@link #FIDELITY_FALSE}: The Printer may make any changes necessary 
+ * 
                      • {@link #FIDELITY_FALSE}: The Printer may make any changes necessary
  * to proceed with processing the Job as good as possible.
                        • 
  * 
                      
- * 
                       
+ * 
                      
  * 
                      
  * IPP Compatibility: Fidelity is an IPP 1.1 attribute. The IPP name
- * is "ipp-attribute-fidelity". The IPP specification treats Fidelity as a 
+ * is "ipp-attribute-fidelity". The IPP specification treats Fidelity as a
  * boolean type which is not available in the Java Print Service API. The IPP
- * boolean value "true" corresponds to FIDELITY_TRUE and "false" 
+ * boolean value "true" corresponds to FIDELITY_TRUE and "false"
  * to FIDELITY_FALSE.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,27 +75,27 @@ public final class Fidelity extends EnumSyntax
 {
   private static final long serialVersionUID = 6320827847329172308L;
 
-  /** 
-   * Requests that the job is printed exactly as specified, 
+  /**
+   * Requests that the job is printed exactly as specified,
    * or rejected otherwise.
    */
   public static final Fidelity FIDELITY_TRUE = new Fidelity(0);
-  
-  /** 
+
+  /**
    * Requests that the job is printed as exactly as reasonable. This means
-   * that the print service may choose to substitute the default value 
-   * associated with that attribute, or use some other supported value that 
-   * is similar to the unsupported requested value. 
+   * that the print service may choose to substitute the default value
+   * associated with that attribute, or use some other supported value that
+   * is similar to the unsupported requested value.
    */
   public static final Fidelity FIDELITY_FALSE = new Fidelity(1);
-  
+
   private static final String[] stringTable = { "true", "false" };
   private static final Fidelity[] enumValueTable = { FIDELITY_TRUE,
                                                      FIDELITY_FALSE };
 
   /**
    * Constructs a Fidelity object.
-   * 
+   *
    * @param value the value
    */
   protected Fidelity(int value)
@@ -122,7 +122,7 @@ public final class Fidelity extends EnumSyntax
   {
     return "ipp-attribute-fidelity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/Finishings.java b/libjava/classpath/javax/print/attribute/standard/Finishings.java
index cd8f6753b30..bb38cebc402 100644
--- a/libjava/classpath/javax/print/attribute/standard/Finishings.java
+++ b/libjava/classpath/javax/print/attribute/standard/Finishings.java
@@ -49,30 +49,30 @@ import javax.print.attribute.PrintRequestAttribute;
  * The Finishings attribute specifies the finishing operations
  * that the Printer applies to every copy of each printed document in the Job.
  * 
                      
- * Standard enum values are: NONE, STAPLE, 
+ * Standard enum values are: NONE, STAPLE,
  * COVER, BIND, SADDLE_STITCH,
  * EDGE_STITCH.
  * 

                      
- * The following values are more specific: 
- * STAPLE_TOP_LEFT, STAPLE_BOTTOM_LEFT, 
- * STAPLE_TOP_RIGHT, STAPLE_BOTTOM_RIGHT, 
- * EDGE_STITCH_LEFT, EDGE_STITCH_TOP, 
- * EDGE_STITCH_RIGHT, EDGE_STITCH_BOTTOM, 
- * STAPLE_DUAL_LEFT, STAPLE_DUAL_TOP, 
+ * The following values are more specific:
+ * STAPLE_TOP_LEFT, STAPLE_BOTTOM_LEFT,
+ * STAPLE_TOP_RIGHT, STAPLE_BOTTOM_RIGHT,
+ * EDGE_STITCH_LEFT, EDGE_STITCH_TOP,
+ * EDGE_STITCH_RIGHT, EDGE_STITCH_BOTTOM,
+ * STAPLE_DUAL_LEFT, STAPLE_DUAL_TOP,
  * STAPLE_DUAL_RIGHT, STAPLE_DUAL_BOTTOM.
- * 
                       
+ * 
                      
  * 
                      
- * Note: The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * Note: The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * 
                      
  * 
                      
- * IPP Compatibility: Finishings is an IPP 1.1 attribute. Differences 
- * to the IPP specification are that in the Java Print Service API only one 
- * enum value is supported (in IPP a set of enums). Further the enum 
+ * IPP Compatibility: Finishings is an IPP 1.1 attribute. Differences
+ * to the IPP specification are that in the Java Print Service API only one
+ * enum value is supported (in IPP a set of enums). Further the enum
  * punch is not supported.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -81,119 +81,119 @@ public class Finishings extends EnumSyntax
 {
   private static final long serialVersionUID = -627840419548391754L;
 
-  /** 
+  /**
    * Perform no finishings of the documents.
    */
   public static final Finishings NONE = new Finishings(3);
-  
-  /** 
-   * Selects binding of the documents with one or more staples.  
+
+  /**
+   * Selects binding of the documents with one or more staples.
    */
   public static final Finishings STAPLE = new Finishings(4);
-  
+
   /**
-   * Selects the use of a non-printed (or pre-printed) cover for 
+   * Selects the use of a non-printed (or pre-printed) cover for
    * the document.
    */
   public static final Finishings COVER = new Finishings(6);
-  
+
   /**
    * Selects that a binding is to be applied to the document.
    * The type and placement of the binding is site-defined.
    */
   public static final Finishings BIND = new Finishings(7);
-  
+
   /**
    * Selects binding of the documents with one or more staples
-   * along the middle fold.  
+   * along the middle fold.
    */
   public static final Finishings SADDLE_STITCH = new Finishings(8);
-  
+
   /**
-   * Selects binding of the documents with one or more staples 
-   * along one edge. 
+   * Selects binding of the documents with one or more staples
+   * along one edge.
    */
   public static final Finishings EDGE_STITCH = new Finishings(9);
-  
-  /** 
-   * Selects binding of the documents with one or more staples 
-   * in the top left corner. 
+
+  /**
+   * Selects binding of the documents with one or more staples
+   * in the top left corner.
    */
   public static final Finishings STAPLE_TOP_LEFT = new Finishings(20);
-  
-  /** 
-   * Selects binding of the documents with one or more staples in the bottom 
-   * left corner. 
+
+  /**
+   * Selects binding of the documents with one or more staples in the bottom
+   * left corner.
    */
   public static final Finishings STAPLE_BOTTOM_LEFT = new Finishings(21);
-  
+
   /**
-   * Selects binding of the documents with one or more staples in 
+   * Selects binding of the documents with one or more staples in
    * the top right corner.
    */
   public static final Finishings STAPLE_TOP_RIGHT = new Finishings(22);
-  
+
   /**
-   * Selects binding of the documents with one or more staples in 
+   * Selects binding of the documents with one or more staples in
    * the bottom right corner.
    */
   public static final Finishings STAPLE_BOTTOM_RIGHT = new Finishings(23);
-  
+
   /**
    * Selects binding of the documents with one or more staples
    * along the left edge.
    */
   public static final Finishings EDGE_STITCH_LEFT = new Finishings(24);
-  
+
   /**
-   * Selects binding of the documents with one or more staples along 
+   * Selects binding of the documents with one or more staples along
    * the top edge.
    */
   public static final Finishings EDGE_STITCH_TOP = new Finishings(25);
-  
+
   /**
-   * Selects binding of the documents with one or more staples along 
+   * Selects binding of the documents with one or more staples along
    * the right edge.
    */
   public static final Finishings EDGE_STITCH_RIGHT = new Finishings(26);
-  
+
   /**
    * Selects binding of the documents with one or more staples along
-   * the bottom edge. 
+   * the bottom edge.
    */
   public static final Finishings EDGE_STITCH_BOTTOM = new Finishings(27);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * left edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_LEFT = new Finishings(28);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * top edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_TOP = new Finishings(29);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * right edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_RIGHT = new Finishings(30);
-  
+
   /**
-   * Selects binding of the documents with two staples along the 
+   * Selects binding of the documents with two staples along the
    * bottom edge assuming a portrait document.
    */
   public static final Finishings STAPLE_DUAL_BOTTOM = new Finishings(31);
 
-  private static final String[] stringTable = { "none", "staple", null, 
+  private static final String[] stringTable = { "none", "staple", null,
                                                 "cover", "bind", "saddle-stitch",
                                                 "edge-stitch", null, null, null,
                                                 null, null, null, null, null,
                                                 null, null, "staple-top-left",
-                                                "staple-bottom-left", 
-                                                "staple-top-right", 
+                                                "staple-bottom-left",
+                                                "staple-top-right",
                                                 "staple-bottom-right",
                                                 "edge-stitch-left",
                                                 "edge-stitch-top",
@@ -203,14 +203,14 @@ public class Finishings extends EnumSyntax
                                                 "staple-dual-top",
                                                 "staple-dual-right",
                                                 "staple-dual-bottom" };
-  
-  private static final Finishings[] enumValueTable = { NONE, STAPLE, null, 
-                                                       COVER, BIND, 
+
+  private static final Finishings[] enumValueTable = { NONE, STAPLE, null,
+                                                       COVER, BIND,
                                                        SADDLE_STITCH,
-                                                       EDGE_STITCH, null, 
-                                                       null, null, null, 
-                                                       null, null, null, 
-                                                       null, null, null, 
+                                                       EDGE_STITCH, null,
+                                                       null, null, null,
+                                                       null, null, null,
+                                                       null, null, null,
                                                        STAPLE_TOP_LEFT,
                                                        STAPLE_BOTTOM_LEFT,
                                                        STAPLE_TOP_RIGHT,
@@ -223,10 +223,10 @@ public class Finishings extends EnumSyntax
                                                        STAPLE_DUAL_TOP,
                                                        STAPLE_DUAL_RIGHT,
                                                        STAPLE_DUAL_BOTTOM };
-  
+
   /**
    * Constructs a Finishings object.
-   * 
+   *
    * @param value the value
    */
   protected Finishings(int value)
@@ -253,7 +253,7 @@ public class Finishings extends EnumSyntax
   {
     return "finishings";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -283,5 +283,5 @@ public class Finishings extends EnumSyntax
   protected int getOffset()
   {
     return 3;
-  }  
+  }
 }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobHoldUntil.java b/libjava/classpath/javax/print/attribute/standard/JobHoldUntil.java
index 7c137ccd171..97d3c15ad1a 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobHoldUntil.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobHoldUntil.java
@@ -1,4 +1,4 @@
-/* JobHoldUntil.java -- 
+/* JobHoldUntil.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,17 +48,17 @@ import javax.print.attribute.PrintRequestAttribute;
 /**
  * The JobHoldUntil attribute specifies the date
  * and the time at which a print job must become a candidate
- * for printing. 
+ * for printing.
  * 
                      
  * IPP Compatibility: JobHoldUntil is an IPP 1.1 attribute.
  * However the attribute in IPP is based on keywords of named
  * time periods like day-time or evening. It will depend on the
- * concrete implementation of a print service how a mapping of the 
+ * concrete implementation of a print service how a mapping of the
  * detailed provided date and time of this attribute to the named
  * keyword or an alternate extension attribute will be done. E.g.
  * CUPS supports also a HH:MM format as extension to the keywords.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobHoldUntil extends DateTimeSyntax
@@ -83,7 +83,7 @@ public final class JobHoldUntil extends DateTimeSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobImpressions.java b/libjava/classpath/javax/print/attribute/standard/JobImpressions.java
index a2c7d4dd653..11d51cac8aa 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobImpressions.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobImpressions.java
@@ -1,4 +1,4 @@
-/* JobImpressions.java -- 
+/* JobImpressions.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,16 +45,16 @@ import javax.print.attribute.PrintRequestAttribute;
 /**
  * The JobImpressions printing attribute specifies
  * the total size in number of impressions of the documents
- * of a a print job. 
+ * of a a print job.
  * 
                      
- * An impression is specified by the IPP specification as the image 
- * (possibly many print-stream pages in different configurations) 
+ * An impression is specified by the IPP specification as the image
+ * (possibly many print-stream pages in different configurations)
  * imposed onto a single media sheet. This attribute must not include
  * a multiplication factor from the number of copies which maybe specified
  * in a Copies attribute.
  * 
                      
  * 
                      
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -67,14 +67,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobKOctets
  * @see javax.print.attribute.standard.JobMediaSheets
- * 
+ *
  * @author Michael Koch
  */
 public final class JobImpressions extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = 8225537206784322464L;
-  
+
   /**
    * Creates a JobImpressions object.
    *
@@ -89,13 +89,13 @@ public final class JobImpressions extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java b/libjava/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java
index 55d3fd6b991..d1594ea022e 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java
@@ -1,4 +1,4 @@
-/* JobImpressionsCompleted.java -- 
+/* JobImpressionsCompleted.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintJobAttribute;
  * The JobImpressionsCompleted printing attribute reports
  * the number of impressions already processed.
  * 
                      
- * An impression is specified by the IPP specification as the image imposed 
- * onto a single media sheet. This attribute will not include a multiplication 
+ * An impression is specified by the IPP specification as the image imposed
+ * onto a single media sheet. This attribute will not include a multiplication
  * factor from the number of copies.
  * 
                      
  * 
                      
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * 
                      
  * 
                      
@@ -58,14 +58,14 @@ import javax.print.attribute.PrintJobAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobMediaSheetsCompleted
  * @see javax.print.attribute.standard.JobKOctetsProcessed
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobImpressionsCompleted extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 6722648442432393294L;
-  
+
   /**
    * Creates a JobImpressionsCompleted object.
    *
@@ -80,13 +80,13 @@ public final class JobImpressionsCompleted extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobImpressionsSupported.java b/libjava/classpath/javax/print/attribute/standard/JobImpressionsSupported.java
index 5be3fc0a6f2..583db4e24da 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobImpressionsSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobImpressionsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The JobImpressionsSupported printing attribute specifies the 
- * supported range of values for the 
+ * The JobImpressionsSupported printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobImpressions} attribute.
  * 
                      
  * IPP Compatibility: JobImpressionsSupported is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,7 +59,7 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
   private static final long serialVersionUID = -4887354803843173692L;
 
   /**
-   * Constructs a JobImpressionsSupported object with the 
+   * Constructs a JobImpressionsSupported object with the
    * given range of supported job impressions values.
    *
    * @param lowerBound the lower bound value
@@ -71,24 +71,24 @@ public final class JobImpressionsSupported extends SetOfIntegerSyntax
   public JobImpressionsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobImpressionsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/JobKOctets.java b/libjava/classpath/javax/print/attribute/standard/JobKOctets.java
index ac9a7eff6ae..c4427eaa552 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobKOctets.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobKOctets.java
@@ -1,4 +1,4 @@
-/* JobKOctets.java -- 
+/* JobKOctets.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,12 +48,12 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * The supplied value has to be rounded up, so that a range between
  * 1 and 1024 octects is specified as 1 and a range between 1025 and
- * 2048 octects as 2, etc.  This attribute must not include a multiplication 
- * factor from the number of copies which maybe specified in a Copies 
+ * 2048 octects as 2, etc.  This attribute must not include a multiplication
+ * factor from the number of copies which maybe specified in a Copies
  * attribute.
  * 
                      
  * 
                      
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -66,17 +66,17 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobMediaSheets
  * @see javax.print.attribute.standard.JobImpressions
- * 
+ *
  * @author Michael Koch
  */
 public final class JobKOctets extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -8959710146498202869L;
-  
+
   /**
    * Creates a JobKOctets object.
-   * The value is in units of K (1024) octets rounded up to the next highest K. 
+   * The value is in units of K (1024) octets rounded up to the next highest K.
    *
    * @param value the number of K octets
    *
@@ -89,13 +89,13 @@ public final class JobKOctets extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java b/libjava/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java
index 34616edfeaa..55bee6a05c4 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java
@@ -1,4 +1,4 @@
-/* JobKOctetsProcessed.java -- 
+/* JobKOctetsProcessed.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,11 +46,11 @@ import javax.print.attribute.PrintJobAttribute;
  * the total number of octets already processed in K octets units.
  * 
                      
  * The supplied value will be rounded up to the next highest K octets.
- * This attribute will not include a multiplication factor from the number 
+ * This attribute will not include a multiplication factor from the number
  * of copies.
  * 
                      
  * 
                      
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * 
                      
  * 
                      
@@ -58,17 +58,17 @@ import javax.print.attribute.PrintJobAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobMediaSheetsCompleted
  * @see javax.print.attribute.standard.JobImpressionsCompleted
- * 
+ *
  * @author Michael Koch
  */
 public final class JobKOctetsProcessed extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = -6265238509657881806L;
-  
+
   /**
    * Creates a JobKOctetsProcessed object.
-   * The value is in units of K (1024) octets rounded up to the next highest K. 
+   * The value is in units of K (1024) octets rounded up to the next highest K.
    *
    * @param value the number of processed K octets
    *
@@ -81,13 +81,13 @@ public final class JobKOctetsProcessed extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobKOctetsSupported.java b/libjava/classpath/javax/print/attribute/standard/JobKOctetsSupported.java
index 4936fd49f72..6990a53eee5 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobKOctetsSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobKOctetsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The JobKOctetsSupported printing attribute specifies the 
- * supported range of values for the 
+ * The JobKOctetsSupported printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobKOctets} attribute.
  * 
                      
  * IPP Compatibility: JobKOctetsSupported is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -71,24 +71,24 @@ public final class JobKOctetsSupported extends SetOfIntegerSyntax
   public JobKOctetsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobKOctetsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java b/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
index 17cf96f33b6..c92cf3040d9 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
@@ -1,4 +1,4 @@
-/* JobMediaSheets.java -- 
+/* JobMediaSheets.java --
    Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * was specified for the job.
  * 
                      
  * 
                      
- * This attribute belongs to a group of job size attributes which are 
+ * This attribute belongs to a group of job size attributes which are
  * describing the size of a job to be printed. The values supplied by
  * these attributes are intended to be used for routing and scheduling
  * of jobs on the print service. A client may specify these attributes.
@@ -64,14 +64,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobKOctets
  * @see javax.print.attribute.standard.JobImpressions
- * 
+ *
  * @author Michael Koch
  */
 public class JobMediaSheets extends IntegerSyntax
   implements PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = 408871131531979741L;
-  
+
   /**
    * Creates a JobMediaSheets object.
    *
@@ -86,13 +86,13 @@ public class JobMediaSheets extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java b/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java
index 353c044ec1a..5ec7d8d63e1 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java
@@ -1,4 +1,4 @@
-/* JobMediaSheetsCompleted.java -- 
+/* JobMediaSheetsCompleted.java --
    Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,9 +43,9 @@ import javax.print.attribute.PrintJobAttribute;
 
 /**
  * The JobMediaSheetsCompleted printing attribute reports
- * the number of media sheets already processed. 
+ * the number of media sheets already processed.
  * 
                      
- * This attribute belongs to a group of job progress attributes which are 
+ * This attribute belongs to a group of job progress attributes which are
  * reporting on the progress of a print job.
  * 
                      
  * 
                      
@@ -53,14 +53,14 @@ import javax.print.attribute.PrintJobAttribute;
  * 
                      
  * @see javax.print.attribute.standard.JobImpressionsCompleted
  * @see javax.print.attribute.standard.JobKOctetsProcessed
- * 
+ *
  * @author Michael Koch
  */
 public final class JobMediaSheetsCompleted extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 1739595973810840475L;
-  
+
   /**
    * Creates a JobMediaSheetsCompleted object.
    *
@@ -75,13 +75,13 @@ public final class JobMediaSheetsCompleted extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsSupported.java b/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsSupported.java
index d9a0ed2dfca..32d6ac54d2f 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobMediaSheetsSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The JobMediaSheetsSupported printing attribute specifies the 
- * supported range of values for the 
+ * The JobMediaSheetsSupported printing attribute specifies the
+ * supported range of values for the
  * {@link javax.print.attribute.standard.JobMediaSheets} attribute.
  * 
                      
  * IPP Compatibility: JobMediaSheetsSupported is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,7 +59,7 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
   private static final long serialVersionUID = 2953685470388672940L;
 
   /**
-   * Constructs a JobMediaSheetsSupported object with the 
+   * Constructs a JobMediaSheetsSupported object with the
    * given range of supported job media sheets values.
    *
    * @param lowerBound the lower bound value
@@ -71,24 +71,24 @@ public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
   public JobMediaSheetsSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof JobMediaSheetsSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/JobMessageFromOperator.java b/libjava/classpath/javax/print/attribute/standard/JobMessageFromOperator.java
index f2a589af42f..bf1dedb969a 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobMessageFromOperator.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobMessageFromOperator.java
@@ -1,4 +1,4 @@
-/* JobMessageFromOperator.java -- 
+/* JobMessageFromOperator.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,15 +45,15 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The JobMessageFromOperator printing attribute provides 
+ * The JobMessageFromOperator printing attribute provides
  * a message from an operator or a system administrator related to the
  * print job. This may include information why a certain action has been
  * taken on the print job like a modification.
  * 
                      
- * IPP Compatibility: JobMessageFromOperator is an IPP 1.1 
+ * IPP Compatibility: JobMessageFromOperator is an IPP 1.1
  * attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobMessageFromOperator extends TextSyntax
@@ -80,7 +80,7 @@ public final class JobMessageFromOperator extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobName.java b/libjava/classpath/javax/print/attribute/standard/JobName.java
index 5f5310e9676..dc84cb61ee8 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobName.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobName.java
@@ -1,4 +1,4 @@
-/* JobName.java -- 
+/* JobName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,12 +46,12 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The JobName printing attribute provides the name of a 
+ * The JobName printing attribute provides the name of a
  * print job for identification.
  * 
                      
  * IPP Compatibility: JobName is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobName extends TextSyntax
@@ -78,7 +78,7 @@ public final class JobName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobOriginatingUserName.java b/libjava/classpath/javax/print/attribute/standard/JobOriginatingUserName.java
index 62073daa6db..c7246ddc5c5 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobOriginatingUserName.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobOriginatingUserName.java
@@ -1,4 +1,4 @@
-/* JobOriginatingUserName.java -- 
+/* JobOriginatingUserName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The JobOriginatingUserName attribute specifies the name of 
+ * The JobOriginatingUserName attribute specifies the name of
  * the user which submitted the print job.
  * 
                      
  * IPP Compatibility: JobOriginatingUserName is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobOriginatingUserName extends TextSyntax
@@ -77,7 +77,7 @@ public final class JobOriginatingUserName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobPriority.java b/libjava/classpath/javax/print/attribute/standard/JobPriority.java
index 88fc685b8ea..0f669a06d81 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobPriority.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobPriority.java
@@ -1,4 +1,4 @@
-/* JobPriority.java -- 
+/* JobPriority.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,14 +47,14 @@ import javax.print.attribute.PrintRequestAttribute;
  * The JobPriority printing attribute specifies
  * the priority for scheduling a job on the print service.
  * 
                      
- * A client may specify any value between 1 (lowest priority) and 100 
+ * A client may specify any value between 1 (lowest priority) and 100
  * (highest priority). A print service prints jobs with a priority
  * value of n before those with a priority value of n-1.
  * 
                      
  * 
                      
  * IPP Compatibility: JobPriority is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobPriority extends IntegerSyntax
@@ -82,7 +82,7 @@ public final class JobPriority extends IntegerSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobPrioritySupported.java b/libjava/classpath/javax/print/attribute/standard/JobPrioritySupported.java
index e7ebca2db73..b2e577283ae 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobPrioritySupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobPrioritySupported.java
@@ -1,4 +1,4 @@
-/* JobPrioritySupported.java -- 
+/* JobPrioritySupported.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ import javax.print.attribute.SupportedValuesAttribute;
  * 
                      
  * A client may specify any JobPriority value between 1 and 100. If a
  * print service supports fewer priority levels it indicates the maximum
- * levels through this attribute. The print service then automatically 
+ * levels through this attribute. The print service then automatically
  * maps the job priority value provided by the client in an even distribution
  * over the whole range of 1 to 100.
  * 
                      
@@ -56,7 +56,7 @@ import javax.print.attribute.SupportedValuesAttribute;
  * IPP Compatibility: JobPrioritySupported is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.JobPriority
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class JobPrioritySupported extends IntegerSyntax
@@ -84,7 +84,7 @@ public final class JobPrioritySupported extends IntegerSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/JobSheets.java b/libjava/classpath/javax/print/attribute/standard/JobSheets.java
index a930f63cf50..7d20692b9b8 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobSheets.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobSheets.java
@@ -45,11 +45,11 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The JobSheets printing attribute specifies if a
- * job start/end sheets should be printed. 
+ * job start/end sheets should be printed.
  * 
                      
  * IPP Compatibility: JobSheets is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,24 +59,24 @@ public class JobSheets extends EnumSyntax
   private static final long serialVersionUID = -4735258056132519759L;
 
   /**
-   * No job sheet is printed. 
+   * No job sheet is printed.
    */
   public static final JobSheets NONE = new JobSheets(0);
-  
+
   /**
-   * The standard job sheet is printed. The sheet and if it 
+   * The standard job sheet is printed. The sheet and if it
    * is printed only as start sheet or also as end sheet is
    * site specific.
    */
   public static final JobSheets STANDARD = new JobSheets(1);
 
   private static final String[] stringTable = { "none", "standard" };
-  
+
   private static final JobSheets[] enumValueTable = { NONE, STANDARD };
-  
+
   /**
    * Constructs a JobSheets object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobSheets(int value)
@@ -103,7 +103,7 @@ public class JobSheets extends EnumSyntax
   {
     return "job-sheets";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/JobState.java b/libjava/classpath/javax/print/attribute/standard/JobState.java
index fa769bbf33d..5efbe08ea6b 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobState.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobState.java
@@ -50,11 +50,11 @@ import javax.print.attribute.PrintJobAttribute;
  * attribute provides further detailed information about
  * the given job state. Detailed information about the job
  * state and job state reasons can be found in the RFC 2911.
- * 
                       
+ * 
                      
  * 
                      
  * IPP Compatibility: JobState is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -67,12 +67,12 @@ public class JobState extends EnumSyntax
    * The job state is currently unknown.
    */
   public static final JobState UNKNOWN = new JobState(0);
-  
+
   /**
    * The job is pending processing.
    */
   public static final JobState PENDING = new JobState(3);
-  
+
   /**
    * The job is currently not a candidate for printing because
    * of reasons reported by the job-state-reasons attribute. If
@@ -80,52 +80,52 @@ public class JobState extends EnumSyntax
    * pending state.
    */
   public static final JobState PENDING_HELD = new JobState(4);
-  
+
   /**
    * The job is currently processed.
    */
   public static final JobState PROCESSING = new JobState(5);
-  
+
   /**
    * The job's processing has stopped. The job-state-reasons
    * attribute may indicate the reason(s). The job will return
    * to the processing state if the reasons are no longer present.
    */
   public static final JobState PROCESSING_STOPPED = new JobState(6);
-  
+
   /**
    * The job has been canceled by the client.
    */
   public static final JobState CANCELED = new JobState(7);
-  
+
   /**
    * The job has been aborted by the system.
    */
   public static final JobState ABORTED = new JobState(8);
-  
+
   /**
    * The job has completed successfully.
    */
   public static final JobState COMPLETED = new JobState(9);
 
 
-  private static final String[] stringTable = { "unknown", null, null, 
+  private static final String[] stringTable = { "unknown", null, null,
                                                 "pending", "pending-held",
-                                                "processing", 
+                                                "processing",
                                                 "processing-stopped",
-                                                "canceled", "aborted", 
+                                                "canceled", "aborted",
                                                 "completed"};
-  
+
   private static final JobState[] enumValueTable = { UNKNOWN, null, null,
                                                      PENDING, PENDING_HELD,
                                                      PROCESSING,
                                                      PROCESSING_STOPPED,
                                                      CANCELED, ABORTED,
                                                      COMPLETED };
-  
+
   /**
    * Constructs a JobState object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobState(int value)
@@ -152,7 +152,7 @@ public class JobState extends EnumSyntax
   {
     return "job-state";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReason.java b/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
index b8420b18012..52aae156282 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
@@ -45,13 +45,13 @@ import javax.print.attribute.EnumSyntax;
  * The JobStateReason attribute provides additional
  * information about the current state of a job. Its always part
  * of the {@link javax.print.attribute.standard.JobStateReasons}
- * printing attribute. 
+ * printing attribute.
  * 
                      
- * IPP Compatibility: JobStateReason is not an IPP 1.1 
+ * IPP Compatibility: JobStateReason is not an IPP 1.1
  * attribute itself but used inside the JobStateReasons
  * attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,179 +65,179 @@ public class JobStateReason extends EnumSyntax
    * data for processing.
    */
   public static final JobStateReason JOB_INCOMING = new JobStateReason(0);
-  
+
   /**
    * The printer is expecting additional document data before it
    * can move this job into the processing state.
    */
   public static final JobStateReason JOB_DATA_INSUFFICIENT = new JobStateReason(1);
-  
+
   /**
    * The printer is unable to access one or more documents provided
    * by reference in the print job.
    */
   public static final JobStateReason DOCUMENT_ACCESS_ERROR = new JobStateReason(2);
-  
+
   /**
    * The printer has not received the whole job submission. This
    * indicates no reason for the interruption.
    */
   public static final JobStateReason SUBMISSION_INTERRUPTED = new JobStateReason(3);
-  
+
   /**
    * The printer transfers the job to the actual output device.
    */
   public static final JobStateReason JOB_OUTGOING = new JobStateReason(4);
-  
+
   /**
-   * The job was submitted with a JobHoldUntil attribute which 
-   * specifies a time period still in the future and causes the job to 
+   * The job was submitted with a JobHoldUntil attribute which
+   * specifies a time period still in the future and causes the job to
    * be on hold.
    */
   public static final JobStateReason JOB_HOLD_UNTIL_SPECIFIED = new JobStateReason(5);
-  
+
   /**
    * One or more resources needed by the job are not ready. E.g. needed
    * media type.
    */
   public static final JobStateReason RESOURCES_ARE_NOT_READY = new JobStateReason(6);
-  
+
   /**
    * The printer stopped partly.
    */
   public static final JobStateReason PRINTER_STOPPED_PARTLY = new JobStateReason(7);
-  
+
   /**
    * The printer stopped complete.
    */
   public static final JobStateReason PRINTER_STOPPED = new JobStateReason(8);
-  
+
   /**
    * The printer is currently interpreting the jobs document data.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_INTERPRETING = new JobStateReason(9);
-  
+
   /**
    * The printer has queued the document data.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_QUEUED = new JobStateReason(10);
-  
+
   /**
    * The printer is transforming the document data to another representation.
    * Detailed state of the job's processing state.
    */
   public static final JobStateReason JOB_TRANSFORMING = new JobStateReason(11);
-  
+
   /**
    * The job is queued for marking.
    */
   public static final JobStateReason JOB_QUEUED_FOR_MARKER = new JobStateReason(12);
-  
+
   /**
    * The job is currently printing.
    */
   public static final JobStateReason JOB_PRINTING = new JobStateReason(13);
-  
+
   /**
    * The job was canceled by the user (the owner of the job).
    */
   public static final JobStateReason JOB_CANCELED_BY_USER = new JobStateReason(14);
-  
+
   /**
    * The job was canceled by the operator.
    */
   public static final JobStateReason JOB_CANCELED_BY_OPERATOR = new JobStateReason(15);
-  
+
   /**
    * The job was canceled by an unidentified local user at the device.
    */
   public static final JobStateReason JOB_CANCELED_AT_DEVICE = new JobStateReason(16);
-  
+
   /**
    * The job has been aborted by the system.
    */
   public static final JobStateReason ABORTED_BY_SYSTEM = new JobStateReason(17);
-  
+
   /**
    * The printer aborted the job because of an unsupported compression while
    * trying to decompress the document data.
    */
   public static final JobStateReason UNSUPPORTED_COMPRESSION = new JobStateReason(18);
-  
+
   /**
    * The printer aborted the job because of a compression error while
    * trying to decompress the document data. If this state is given the test
    * for supported compression has already been passed.
    */
   public static final JobStateReason COMPRESSION_ERROR = new JobStateReason(19);
-  
+
   /**
    * The printer aborted the job because of the document format is not supported.
-   * This may happen if a job is specified as application/octet-stream format. 
+   * This may happen if a job is specified as application/octet-stream format.
    */
   public static final JobStateReason UNSUPPORTED_DOCUMENT_FORMAT = new JobStateReason(20);
-  
+
   /**
-   * The printer aborted the job because of an error in the document data. 
+   * The printer aborted the job because of an error in the document data.
    */
   public static final JobStateReason DOCUMENT_FORMAT_ERROR = new JobStateReason(21);
-  
+
   /**
    * The client has either canceled the job or the printer aborted the job.
-   * However the printer still performs some action on the job e.g. to cleanup. 
+   * However the printer still performs some action on the job e.g. to cleanup.
    */
   public static final JobStateReason PROCESSING_TO_STOP_POINT = new JobStateReason(22);
-  
+
   /**
    * The printer is offline and therefore is not accepting jobs.
    */
   public static final JobStateReason SERVICE_OFF_LINE = new JobStateReason(23);
-  
+
   /**
-   * The printer completed the job successfully. 
+   * The printer completed the job successfully.
    */
   public static final JobStateReason JOB_COMPLETED_SUCCESSFULLY = new JobStateReason(24);
-  
+
   /**
    * The printer completed the job with warnings.
    */
   public static final JobStateReason JOB_COMPLETED_WITH_WARNINGS = new JobStateReason(25);
-  
+
   /**
    * The printer completed the job with errors.
    */
   public static final JobStateReason JOB_COMPLETED_WITH_ERRORS = new JobStateReason(26);
-  
+
   /**
-   * The job is retained and is able to be restared. 
+   * The job is retained and is able to be restared.
    */
   public static final JobStateReason JOB_RESTARTABLE = new JobStateReason(27);
-  
+
   /**
    * The printer has forwarded the job to the actual output device. This device
    * is not capable of reporting the state back so that the job state is set
-   * to completed by the printer. 
+   * to completed by the printer.
    */
   public static final JobStateReason QUEUED_IN_DEVICE = new JobStateReason(28);
 
-  private static final String[] stringTable = 
-    { "job-incoming", "job-data-insufficient", "document-access-error", 
+  private static final String[] stringTable =
+    { "job-incoming", "job-data-insufficient", "document-access-error",
       "submission-interrupted", "job-outgoing", "job-hold-until-specified",
       "resources-are-not-ready", "printer-stopped-partly", "printer-stopped",
-      "job-interpreting", "job-queued", "job-transforming", 
+      "job-interpreting", "job-queued", "job-transforming",
       "job-queued-for-marker", "job-printing", "job-canceled-by-user",
-      "job-canceled-by-operator", "job-canceled-at-device", 
+      "job-canceled-by-operator", "job-canceled-at-device",
       "aborted-by-system", "unsupported-compression", "compression-error",
-      "unsupported-document-format", "document-format-error", 
-      "processing-to-stop-point", "service-off-line", 
-      "job-completed-successfully", "job-completed-with-warnings", 
+      "unsupported-document-format", "document-format-error",
+      "processing-to-stop-point", "service-off-line",
+      "job-completed-successfully", "job-completed-with-warnings",
       "job-completed-with-errors", "job-restartable", "queued-in-device" };
-  
-  private static final JobStateReason[] enumValueTable = 
-    { JOB_INCOMING, JOB_DATA_INSUFFICIENT, DOCUMENT_ACCESS_ERROR, 
-      SUBMISSION_INTERRUPTED, JOB_OUTGOING, JOB_HOLD_UNTIL_SPECIFIED, 
+
+  private static final JobStateReason[] enumValueTable =
+    { JOB_INCOMING, JOB_DATA_INSUFFICIENT, DOCUMENT_ACCESS_ERROR,
+      SUBMISSION_INTERRUPTED, JOB_OUTGOING, JOB_HOLD_UNTIL_SPECIFIED,
       RESOURCES_ARE_NOT_READY, PRINTER_STOPPED_PARTLY, PRINTER_STOPPED,
       JOB_INTERPRETING, JOB_QUEUED, JOB_TRANSFORMING, JOB_QUEUED_FOR_MARKER,
       JOB_PRINTING, JOB_CANCELED_BY_USER, JOB_CANCELED_BY_OPERATOR,
@@ -246,10 +246,10 @@ public class JobStateReason extends EnumSyntax
       PROCESSING_TO_STOP_POINT, SERVICE_OFF_LINE, JOB_COMPLETED_SUCCESSFULLY,
       JOB_COMPLETED_WITH_WARNINGS, JOB_COMPLETED_WITH_ERRORS, JOB_RESTARTABLE,
       QUEUED_IN_DEVICE };
-  
+
   /**
    * Constructs a JobStateReason object.
-   * 
+   *
    * @param value the enum value.
    */
   protected JobStateReason(int value)
@@ -276,7 +276,7 @@ public class JobStateReason extends EnumSyntax
   {
     return "job-state-reason";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
index 6c7a9f4aad4..af6eb5e9082 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
@@ -44,14 +44,14 @@ import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The JobStateReasons attribute provides the set of 
- * additional informations available about the current state of a print job. 
+ * The JobStateReasons attribute provides the set of
+ * additional informations available about the current state of a print job.
  * 
                      
  * IPP Compatibility: JobStateReasons is an IPP 1.1 attribute.
  * 
                      
  * @see javax.print.attribute.standard.JobState
  * @see javax.print.attribute.standard.JobStateReason
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -62,7 +62,7 @@ public final class JobStateReasons extends HashSet
 
   /**
    * Constructs an empty JobStateReasons attribute.
-   */  
+   */
   public JobStateReasons()
   {
     super();
@@ -71,10 +71,10 @@ public final class JobStateReasons extends HashSet
   /**
    * Constructs an empty JobStateReasons attribute
    * with the given initial capacity and load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
    * @param loadFactor the load factor of the underlying HashSet.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity < 0
    * @throws IllegalArgumentException if initialCapacity or loadFactor < 0
    */
@@ -86,9 +86,9 @@ public final class JobStateReasons extends HashSet
   /**
    * Constructs an empty JobStateReasons attribute
    * with the given initial capacity and the default load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity < 0
    */
   public JobStateReasons(int initialCapacity)
@@ -99,12 +99,12 @@ public final class JobStateReasons extends HashSet
   /**
    * Constructs a JobStateReasons attribute
    * with the content of the given collection.
-   * 
+   *
    * @param collection the collection for the initial values.
-   * 
-   * @throws NullPointerException if collection or any value is 
+   *
+   * @throws NullPointerException if collection or any value is
    * null.
-   * @throws ClassCastException if values of collection are not of type 
+   * @throws ClassCastException if values of collection are not of type
    * JobStateReason.
    */
   public JobStateReasons(Collection collection)
@@ -116,10 +116,10 @@ public final class JobStateReasons extends HashSet
 
   /**
    * Adds the given job state reason object to the set.
-   * 
+   *
    * @param o the reason of type JobStateReason.
    * @return true if set changed, false otherwise.
-   * 
+   *
    * @throws NullPointerException if given object is null.
    * @throws ClassCastException if given object is not an instance of
    * JobStateReason.
@@ -127,11 +127,11 @@ public final class JobStateReasons extends HashSet
   public boolean add(JobStateReason o)
   {
     if (o == null)
-      throw new NullPointerException("reason is null");  
-    
+      throw new NullPointerException("reason is null");
+
     return super.add(o);
   }
-  
+
   /**
    * Returns category of this class.
    *
diff --git a/libjava/classpath/javax/print/attribute/standard/Media.java b/libjava/classpath/javax/print/attribute/standard/Media.java
index 4c0af0ed11b..dad8d35a0af 100644
--- a/libjava/classpath/javax/print/attribute/standard/Media.java
+++ b/libjava/classpath/javax/print/attribute/standard/Media.java
@@ -50,7 +50,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * The media to be used can be specified in three ways represented
  * by the media subclasses {@link javax.print.attribute.standard.MediaTray},
- * {@link javax.print.attribute.standard.MediaName} and 
+ * {@link javax.print.attribute.standard.MediaName} and
  * {@link javax.print.attribute.standard.MediaSizeName}:
  * 
                        
  * 
                      • Selection by paper source - selection of printer tray to be used.
                        • 
@@ -59,11 +59,11 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                      
  * Each of the sublcasses represents the IPP attribute media
  * and provides predefined values to be used.
- * 
                       
+ * 
                      
  * 
                      
  * IPP Compatibility: Media is an IPP 1.1 attribute.
  * 
                      
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -74,14 +74,14 @@ public abstract class Media extends EnumSyntax
 
   /**
    * Constructs a Media object.
-   * 
+   *
    * @param value the enum value.
    */
   protected Media(int value)
   {
     super(value);
   }
-    
+
   /**
    * Tests if the given object is equal to this object.
    * The objects are considered equal if both are of the same
@@ -89,14 +89,14 @@ public abstract class Media extends EnumSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (obj == null)
       return false;
-    
+
     return (obj.getClass() == this.getClass()
             && ((Media) obj).getValue() == this.getValue());
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaName.java b/libjava/classpath/javax/print/attribute/standard/MediaName.java
index 2fa7cea0970..78a052f06f1 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaName.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaName.java
@@ -40,53 +40,53 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * MediaName is a subclass of the Media printing 
- * attribute and provides selection of media to be used by the means of 
- * defined names. The class pre-defines commonly available media names. 
- * This media type enumeration may be used in alternative to 
+ * MediaName is a subclass of the Media printing
+ * attribute and provides selection of media to be used by the means of
+ * defined names. The class pre-defines commonly available media names.
+ * This media type enumeration may be used in alternative to
  * MediaSizeName/MediaTray.
  * 
                      
  * IPP Compatibility: MediaName is not an IPP 1.1 attribute on its own.
  * It provides parts of the media attribute type values.
  * 
                      
- * 
+ *
  * @author Sven de Marothy
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class MediaName extends Media
 {
   private static final long serialVersionUID = 4653117714524155448L;
-  
+
   /**
    * The North American letter white medium.
    */
   public static final MediaName NA_LETTER_WHITE = new MediaName(0);
-  
+
   /**
    * The North American letter transparent medium.
    */
   public static final MediaName NA_LETTER_TRANSPARENT = new MediaName(1);
-  
+
   /**
    * The ISO A4 white medium.
    */
   public static final MediaName ISO_A4_WHITE = new MediaName(2);
-  
+
   /**
-   * The ISO A4 transparent medium. 
+   * The ISO A4 transparent medium.
    */
   public static final MediaName ISO_A4_TRANSPARENT = new MediaName(3);
 
-  private static final String[] stringTable = { "na-letter-white", 
-                                                "na-letter-transparent", 
+  private static final String[] stringTable = { "na-letter-white",
+                                                "na-letter-transparent",
                                                 "iso-a4-white",
                                                 "iso-a4-transparent" };
-  
-  private static final MediaName[] enumValueTable = { NA_LETTER_WHITE, 
-                                                      NA_LETTER_TRANSPARENT, 
-                                                      ISO_A4_WHITE, 
-                                                      ISO_A4_TRANSPARENT };  
-  
+
+  private static final MediaName[] enumValueTable = { NA_LETTER_WHITE,
+                                                      NA_LETTER_TRANSPARENT,
+                                                      ISO_A4_WHITE,
+                                                      ISO_A4_TRANSPARENT };
+
   /**
    * Creates a MediaName object.
    *
@@ -96,7 +96,7 @@ public class MediaName extends Media
   {
     super( i );
   }
- 
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -118,4 +118,3 @@ public class MediaName extends Media
     return enumValueTable;
   }
 }
-
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java b/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
index 84ebd61ce87..72199920470 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
@@ -1,4 +1,4 @@
-/* MediaPrintableArea.java -- 
+/* MediaPrintableArea.java --
    Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -47,10 +47,10 @@ import javax.print.attribute.PrintRequestAttribute;
  * The MediaPrintableArea attribute specifies the area
  * of a media sheet which is available for printing.
  * 
                      
- * Due to hardware limitation its not possible with most printers to use the 
- * whole area of a media sheet for printing. This attribute defines the area 
+ * Due to hardware limitation its not possible with most printers to use the
+ * whole area of a media sheet for printing. This attribute defines the area
  * for printing through the values of the upper left corner position (x,y)
- * on the sheet and the available width and height of the area. The units of 
+ * on the sheet and the available width and height of the area. The units of
  * the values are determined by two defined constants:
  * 
                        
  * 
                      • INCH - defines an inch
                        • 
@@ -59,12 +59,12 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                        
  * 
                        
  * Internal storage:
                        
- * The values of x, y, width and height are stored internally in micrometers. 
+ * The values of x, y, width and height are stored internally in micrometers.
  * The values of the provided constants for inch (value 25400) and millimeters
  * (value 1000) are used as conversion factors to the internal storage units.
  * To get the internal micrometers values a multiplication of a given
  * size value with its units constant value is done. Retrieving the size value
- * for specific units is done by dividing the internal stored value by the 
+ * for specific units is done by dividing the internal stored value by the
  * units constant value.
  * 
                        
  * 
                        
@@ -84,13 +84,13 @@ public final class MediaPrintableArea
    * The actual value is the conversion factor to micrometers.
    */
   public static final int INCH = 25400;
-  
+
   /**
    * Constant for the units of millimeters.
    * The actual value is the conversion factor to micrometers.
    */
   public static final int MM = 1000;
-  
+
   /** x in micrometers. */
   private int x;
   /** y in micrometers. */
@@ -99,17 +99,17 @@ public final class MediaPrintableArea
   private int w;
   /** height in micrometers. */
   private int h;
-  
+
   /**
    * Creates a new MediaPrintableArea object with the given
    * float values for the given units.
-   * 
+   *
    * @param x start of the printable area on the sheet in x direction.
    * @param y start of the printable area on the sheet in y direction.
    * @param w the width of the printable area.
    * @param h the height of the printable area.
    * @param units the units of the given values.
-   * 
+   *
    * @throws IllegalArgumentException if x i< 0 or y i< 0 or w i<= 0
    * or h i<= 0 or units i< 1
    */
@@ -127,13 +127,13 @@ public final class MediaPrintableArea
   /**
    * Creates a new MediaPrintableArea object with the given
    * int values for the given units.
-   * 
+   *
    * @param x start of the printable area on the sheet in x direction.
    * @param y start of the printable area on the sheet in y direction.
    * @param w the width of the printable area.
    * @param h the height of the printable area.
    * @param units the units of the given values.
-   * 
+   *
    * @throws IllegalArgumentException if x i< 0 or y i< 0 or w i<= 0
    * or h i<= 0 or units i< 1
    */
@@ -170,10 +170,10 @@ public final class MediaPrintableArea
 
   /**
    * Returns the height of the printable area for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The height.
-   * 
+   *
    * @throws IllegalArgumentException if units is < 1
    */
   public float getHeight(int units)
@@ -186,10 +186,10 @@ public final class MediaPrintableArea
 
   /**
    * Returns the width of the printable area for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The width.
-   * 
+   *
    * @throws IllegalArgumentException if units is < 1
    */
   public float getWidth(int units)
@@ -201,12 +201,12 @@ public final class MediaPrintableArea
   }
 
   /**
-   * Returns the position in x direction of the printable area 
+   * Returns the position in x direction of the printable area
    * for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The position in x direction.
-   * 
+   *
    * @throws IllegalArgumentException if units is < 1
    */
   public float getX(int units)
@@ -218,12 +218,12 @@ public final class MediaPrintableArea
   }
 
   /**
-   * Returns the position in y direction of the printable area 
+   * Returns the position in y direction of the printable area
    * for the given units.
-   * 
+   *
    * @param units the units conversion factor.
    * @return The position in y direction.
-   * 
+   *
    * @throws IllegalArgumentException if units is < 1
    */
   public float getY(int units)
@@ -233,7 +233,7 @@ public final class MediaPrintableArea
 
     return y / ((float)units);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
@@ -256,7 +256,7 @@ public final class MediaPrintableArea
    * Returns the string representation for this object in units of millimeters..
    * 
                        
    * The returned string is in the form "(x,y)->(width,height)mm".
-   * 
                         
+   * 
                        
    * @return The string representation in millimeters.
    */
   public String toString()
@@ -273,7 +273,7 @@ public final class MediaPrintableArea
   {
     return x ^ y + w ^ h;
   }
-  
+
   /**
    * Returns the string representation for this object in units of millimeters..
    * 
                        
@@ -283,30 +283,30 @@ public final class MediaPrintableArea
    * @param unitsName the name of the used units, appended to the resulting
    * string if not null.
    * @return The string representation in millimeters.
-   * 
+   *
    * @throws IllegalArgumentException if units is < 1
    */
   public String toString(int units, String unitsName)
   {
     if (units < 1)
       throw new IllegalArgumentException("units may not be less than 1");
-    
+
     String tmp = "(" + getX(units) + "," + getY(units) + ")->("
                  + getWidth(units) + "," + getHeight(units) + ")";
-    
+
     return unitsName == null ? tmp : tmp + unitsName;
   }
 
   /**
-   * Returns the printable area as an float[] with 4 values 
+   * Returns the printable area as an float[] with 4 values
    * (order x, y, width, height) in the given units.
-   * 
+   *
    * @param units the units to use.
    * @return The printable area as float array.
    */
   public float[] getPrintableArea(int units)
   {
-    return new float[] { getX(units), getY(units), 
+    return new float[] { getX(units), getY(units),
                          getWidth(units), getHeight(units) };
-  }  
+  }
 }
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaSize.java b/libjava/classpath/javax/print/attribute/standard/MediaSize.java
index f2fa100a05c..7df22cd4ccf 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaSize.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaSize.java
@@ -1,4 +1,4 @@
-/* MediaSize.java -- 
+/* MediaSize.java --
    Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,20 +45,20 @@ import javax.print.attribute.Size2DSyntax;
 
 /**
  * The MediaSize printing attribute class specifies the size
- * of a printing media. The size is defined in portrait orientation with 
+ * of a printing media. The size is defined in portrait orientation with
  * x at the bottom edge and y at the left edge.
  * 
                        
  * There are several media sizes predefined through the nested classes. Further
  * sizes may be provided by the application. MediaSize is not used
- * as a printing attribute currently. It may be used to get the actual sizes 
+ * as a printing attribute currently. It may be used to get the actual sizes
  * for a named media or to find a suitable MediaSizeName instance
  * by querying with the needed sizes.
- * 
                         
+ * 
                        
  * 
                        
  * IPP Compatibility: MediaSize is not an IPP 1.1 attribute.
  * 
                        
  * @see javax.print.attribute.standard.MediaSizeName
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -66,9 +66,9 @@ public class MediaSize extends Size2DSyntax
   implements Attribute
 {
   private static final long serialVersionUID = -1967958664615414771L;
-  
+
   private static ArrayList mediaCache;
-  
+
   static
     {
       mediaCache = new ArrayList();
@@ -76,10 +76,10 @@ public class MediaSize extends Size2DSyntax
       // We call one instance of every container class to make sure it gets
       // loaded during class initialization and therefore all other static
       // fields of this container class also.
-      
+
       // This is needed to put all MediaSize instance into the mediaCache
       // for use by the static methods in this class.
-      
+
       MediaSize tmp = MediaSize.ISO.A0;
       tmp = MediaSize.JIS.B0;
       tmp = MediaSize.Engineering.A;
@@ -88,10 +88,10 @@ public class MediaSize extends Size2DSyntax
     }
 
   private MediaSizeName mediaName;
-  
+
   /**
-   * Creates a MediaSize object. The created object will be added 
-   * to an internal cache used in the static methods of this class for lookup 
+   * Creates a MediaSize object. The created object will be added
+   * to an internal cache used in the static methods of this class for lookup
    * of available MediaSize instances.
    *
    * @param x the size in x direction
@@ -99,7 +99,7 @@ public class MediaSize extends Size2DSyntax
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y < 0 or units < 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -108,11 +108,11 @@ public class MediaSize extends Size2DSyntax
     super(x, y, units);
     mediaCache.add(this);
   }
-  
+
   /**
    * Creates a MediaSize object associated with the given
-   * media name. The created object will be added to an internal cache used 
-   * in the static methods of this class for lookup of available 
+   * media name. The created object will be added to an internal cache used
+   * in the static methods of this class for lookup of available
    * MediaSize instances.
    *
    * @param x the size in x direction
@@ -121,7 +121,7 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y < 0 or units < 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -131,10 +131,10 @@ public class MediaSize extends Size2DSyntax
     mediaName = media;
     mediaCache.add(this);
   }
-  
+
   /**
-   * Creates a MediaSize object. The created object will be added 
-   * to an internal cache used in the static methods of this class for lookup 
+   * Creates a MediaSize object. The created object will be added
+   * to an internal cache used in the static methods of this class for lookup
    * of available MediaSize instances.
    *
    * @param x the size in x direction
@@ -142,7 +142,7 @@ public class MediaSize extends Size2DSyntax
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y < 0 or units < 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -151,11 +151,11 @@ public class MediaSize extends Size2DSyntax
     super(x, y, units);
     mediaCache.add(this);
   }
-  
+
   /**
    * Creates a MediaSize object associated with the given
-   * media name. The created object will be added to an internal cache used 
-   * in the static methods of this class for lookup of available 
+   * media name. The created object will be added to an internal cache used
+   * in the static methods of this class for lookup of available
    * MediaSize instances.
    *
    * @param x the size in x direction
@@ -164,7 +164,7 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y < 0 or units < 1
-   * 
+   *
    * @see #findMedia(float, float, int)
    * @see #getMediaSizeForName(MediaSizeName)
    */
@@ -174,7 +174,7 @@ public class MediaSize extends Size2DSyntax
     mediaName = media;
     mediaCache.add(this);
   }
-  
+
   /**
    * Returns category of this class.
    *
@@ -185,13 +185,13 @@ public class MediaSize extends Size2DSyntax
     return MediaSize.class;
   }
 
-    
+
   /**
    * Searches for a MediaSize object with the given dimensions.
    * If none is found with exact dimensions, the closest match is used.
-   * Afterwards the MediaSizeName of the found MediaSize object is 
+   * Afterwards the MediaSizeName of the found MediaSize object is
    * returned - which might be null if none is specified.
-   * 
+   *
    * @param x the dimension for x
    * @param y the dimension for y
    * @param units the units to be used for comparison
@@ -202,7 +202,7 @@ public class MediaSize extends Size2DSyntax
     if (x <= 0.0f || y <= 0.0f)
       throw new IllegalArgumentException(
         "x and/or y may not be less or equal 0");
-  
+
     if (units < 1)
       throw new IllegalArgumentException("units may not be less then 1");
 
@@ -215,7 +215,7 @@ public class MediaSize extends Size2DSyntax
     for (int i = 0; i < mediaCache.size(); i++)
       {
         MediaSize size = mediaCache.get(i);
-        int dist = (Math.abs(size.getXMicrometers() - xMicro) 
+        int dist = (Math.abs(size.getXMicrometers() - xMicro)
                     + Math.abs(size.getYMicrometers() - yMicro));
 
         if (dist < bestDistance)
@@ -227,34 +227,34 @@ public class MediaSize extends Size2DSyntax
 
     return bestMatch.getMediaSizeName();
   }
-  
+
   /**
-   * Returns the associated MediaSize instance for the 
+   * Returns the associated MediaSize instance for the
    * given named media MediaSizeName instance.
-   * 
+   *
    * @param media the named media to search for.
-   * @return The corresponding MediaSize instance or 
+   * @return The corresponding MediaSize instance or
    * null if none found.
    */
   public static MediaSize getMediaSizeForName(MediaSizeName media)
   {
     for (int i = 0; i < mediaCache.size(); i++)
       {
-	MediaSize size = mediaCache.get(i);
-	
-	if (size.getMediaSizeName().equals(media))
-	  return size;
+        MediaSize size = mediaCache.get(i);
+
+        if (size.getMediaSizeName().equals(media))
+          return size;
       }
 
     return null;
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
@@ -266,10 +266,10 @@ public class MediaSize extends Size2DSyntax
     return (tmp.getXMicrometers() == this.getXMicrometers()
             && tmp.getYMicrometers() == this.getYMicrometers());
   }
-  
+
   /**
    * Returns the media name of this size.
-   * 
+   *
    * @return The media name.
    */
   public MediaSizeName getMediaSizeName()
@@ -289,28 +289,28 @@ public class MediaSize extends Size2DSyntax
 
   /**
    * Container class for predefined ISO media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class ISO 
+  public static final class ISO
   {
     private ISO()
     {
       // prevent instantiation
     }
-    
+
     /**
      * ISO A0 paper, 841 mm x 1189 mm.
      */
-    public static final MediaSize A0 = new MediaSize(841, 1189, 
-					       MediaSize.MM, 
-					       MediaSizeName.ISO_A0);
+    public static final MediaSize A0 = new MediaSize(841, 1189,
+                                               MediaSize.MM,
+                                               MediaSizeName.ISO_A0);
 
     /**
      * ISO A1 paper, 594 mm x 841 mm
      */
-    public static final MediaSize A1 = new MediaSize(594, 841, MediaSize.MM, 
-					       MediaSizeName.ISO_A1);
+    public static final MediaSize A1 = new MediaSize(594, 841, MediaSize.MM,
+                                               MediaSizeName.ISO_A1);
 
     /**
      * ISO A2 paper, 420 mm x 594 mm
@@ -412,7 +412,7 @@ public class MediaSize extends Size2DSyntax
      * ISO B10 paper, 31 mm x 44 mm
      */
     public static final MediaSize B10 = new MediaSize(31, 44, MediaSize.MM, MediaSizeName.ISO_B10);
-    
+
     /**
      * ISO C3 envelope, 324 mm x 458 mm
      */
@@ -436,13 +436,13 @@ public class MediaSize extends Size2DSyntax
     /**
      * ISO ISO Designated Long paper, 324 mm x 458 mm
      */
-    public static final MediaSize DESIGNATED_LONG = 
+    public static final MediaSize DESIGNATED_LONG =
       new MediaSize(324, 458, MediaSize.MM, MediaSizeName.ISO_DESIGNATED_LONG);
-  } 
+  }
 
   /**
    * Container class for predefined North American media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
   public static final class NA
@@ -451,170 +451,170 @@ public class MediaSize extends Size2DSyntax
     {
       // prevent instantiation
     }
-    
+
     /**
      * US Legal paper size, 8.5 inch x 14 inch
      */
-    public static final MediaSize LEGAL = new MediaSize(8.5f, 14f, MediaSize.INCH, 
-						  MediaSizeName.NA_LEGAL);
+    public static final MediaSize LEGAL = new MediaSize(8.5f, 14f, MediaSize.INCH,
+                                                  MediaSizeName.NA_LEGAL);
 
     /**
      * US Letter paper size, 8.5 inch x 11 inch
      */
     public static final MediaSize LETTER = new MediaSize(8.5f, 11f, MediaSize.INCH,
-						   MediaSizeName.NA_LETTER);
+                                                   MediaSizeName.NA_LETTER);
 
     /**
      * 5 inch x 7 inch paper size.
      */
     public static final MediaSize NA_5X7 = new MediaSize(5, 7, MediaSize.INCH,
-							 MediaSizeName.NA_5X7);
+                                                         MediaSizeName.NA_5X7);
 
     /**
      * 8 inch x 10 inch paper size.
      */
     public static final MediaSize NA_8X10 = new MediaSize(8, 10, MediaSize.INCH,
-							  MediaSizeName.NA_8X10);
+                                                          MediaSizeName.NA_8X10);
 
     /**
      * 6 inch x 9 inch envelope size.
      */
-    public static final MediaSize NA_6X9_ENVELOPE = new MediaSize(6f, 9f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_6X9_ENVELOPE);
+    public static final MediaSize NA_6X9_ENVELOPE = new MediaSize(6f, 9f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_6X9_ENVELOPE);
 
     /**
      * 7 inch x 9 inch envelope size.
      */
-    public static final MediaSize NA_7X9_ENVELOPE = new MediaSize(7f, 9f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_7X9_ENVELOPE);
+    public static final MediaSize NA_7X9_ENVELOPE = new MediaSize(7f, 9f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_7X9_ENVELOPE);
 
     /**
      * 9 inch x 11 inch envelope size.
      */
-    public static final MediaSize NA_9x11_ENVELOPE = new MediaSize(9f, 11f, 
-							     MediaSize.INCH,
-							     MediaSizeName.NA_9X11_ENVELOPE);
+    public static final MediaSize NA_9x11_ENVELOPE = new MediaSize(9f, 11f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.NA_9X11_ENVELOPE);
 
     /**
      * 9 inch x 12 inch envelope size.
      */
-    public static final MediaSize NA_9x12_ENVELOPE = new MediaSize(9f, 12f, 
-							     MediaSize.INCH,
-							     MediaSizeName.NA_9X12_ENVELOPE);
+    public static final MediaSize NA_9x12_ENVELOPE = new MediaSize(9f, 12f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.NA_9X12_ENVELOPE);
 
 
     /**
      * 10 inch x 13 inch envelope size.
      */
-    public static final MediaSize NA_10x13_ENVELOPE = new MediaSize(10f, 13f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X13_ENVELOPE);
+    public static final MediaSize NA_10x13_ENVELOPE = new MediaSize(10f, 13f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X13_ENVELOPE);
 
     /**
      * 10 inch x 14 inch envelope size.
      */
-    public static final MediaSize NA_10x14_ENVELOPE = new MediaSize(10f, 14f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X14_ENVELOPE);
+    public static final MediaSize NA_10x14_ENVELOPE = new MediaSize(10f, 14f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X14_ENVELOPE);
 
     /**
      * 10 inch x 15 inch envelope size.
      */
-    public static final MediaSize NA_10X15_ENVELOPE = new MediaSize(10f, 15f, 
-							      MediaSize.INCH,
-							      MediaSizeName.NA_10X15_ENVELOPE);
+    public static final MediaSize NA_10X15_ENVELOPE = new MediaSize(10f, 15f,
+                                                              MediaSize.INCH,
+                                                              MediaSizeName.NA_10X15_ENVELOPE);
 
     /**
      * Number 9 envelope size. 4.5 inch x 10.375 inch
      */
     public static final MediaSize NA_NUMBER_9_ENVELOPE = new MediaSize(3.875f, 8.875f,
-								 MediaSize.INCH,
-								 MediaSizeName.NA_NUMBER_9_ENVELOPE);
+                                                                 MediaSize.INCH,
+                                                                 MediaSizeName.NA_NUMBER_9_ENVELOPE);
 
     /**
      * Number 10 envelope size. 4.125 inch x 9.5 inch
      */
-    public static final MediaSize NA_NUMBER_10_ENVELOPE = 
+    public static final MediaSize NA_NUMBER_10_ENVELOPE =
       new MediaSize(4.125f, 9.5f, MediaSize.INCH, MediaSizeName.NA_NUMBER_10_ENVELOPE);
 
     /**
      * Number 11 envelope size. 4.5 inch x 10.375 inch
      */
     public static final MediaSize NA_NUMBER_11_ENVELOPE = new MediaSize(4.5f, 10.375f, MediaSize.INCH,
-								  MediaSizeName.NA_NUMBER_11_ENVELOPE);
-    
+                                                                  MediaSizeName.NA_NUMBER_11_ENVELOPE);
+
     /**
      * Number 12 envelope size. 4.75 inch x 11 inch
      */
-    public static final MediaSize NA_NUMBER_12_ENVELOPE = new MediaSize(4.75f, 11f, 
-								  MediaSize.INCH,
-								  MediaSizeName.NA_NUMBER_12_ENVELOPE);
+    public static final MediaSize NA_NUMBER_12_ENVELOPE = new MediaSize(4.75f, 11f,
+                                                                  MediaSize.INCH,
+                                                                  MediaSizeName.NA_NUMBER_12_ENVELOPE);
 
   /**
    * Number 14 envelope size. 5 inch x 11.5 inch
    */
-  public static final MediaSize NA_NUMBER_14_ENVELOPE = new MediaSize(5f, 11.5f, 
-								MediaSize.INCH,
-								MediaSizeName.NA_NUMBER_14_ENVELOPE);
+  public static final MediaSize NA_NUMBER_14_ENVELOPE = new MediaSize(5f, 11.5f,
+                                                                MediaSize.INCH,
+                                                                MediaSizeName.NA_NUMBER_14_ENVELOPE);
   }
 
   /**
    * Container class for predefined US Engineering media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class Engineering 
+  public static final class Engineering
   {
     private Engineering()
     {
       // prevent instantiation
     }
-    
+
     /**
      * ANSI A paper size. 8.5 inch x 11 inch
      */
-    public static final MediaSize A = new MediaSize(8.5f, 11f, 
-					      MediaSize.INCH, MediaSizeName.A);
+    public static final MediaSize A = new MediaSize(8.5f, 11f,
+                                              MediaSize.INCH, MediaSizeName.A);
 
     /**
      * ANSI B paper size. 11 inch x 17 inch
      */
-    public static final MediaSize B = new MediaSize(11f, 17f, 
-					      MediaSize.INCH, MediaSizeName.B);
+    public static final MediaSize B = new MediaSize(11f, 17f,
+                                              MediaSize.INCH, MediaSizeName.B);
 
     /**
      * ANSI C paper size. 17 inch x 22 inch
      */
-    public static final MediaSize C = new MediaSize(17f, 22f, 
-					      MediaSize.INCH, MediaSizeName.C);
+    public static final MediaSize C = new MediaSize(17f, 22f,
+                                              MediaSize.INCH, MediaSizeName.C);
 
     /**
      * ANSI D paper size. 22 inch x 34 inch
      */
-    public static final MediaSize D = new MediaSize(22f, 34f, 
-					      MediaSize.INCH, MediaSizeName.D);
+    public static final MediaSize D = new MediaSize(22f, 34f,
+                                              MediaSize.INCH, MediaSizeName.D);
 
     /**
      * ANSI E paper size. 33 inch x 44 inch
      */
-    public static final MediaSize E = new MediaSize(34f, 44f, 
-					      MediaSize.INCH, MediaSizeName.E);
+    public static final MediaSize E = new MediaSize(34f, 44f,
+                                              MediaSize.INCH, MediaSizeName.E);
   }
 
   /**
    * Container class for predefined Japanese JIS media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
-  public static final class JIS 
+  public static final class JIS
   {
     private JIS()
     {
       // prevent instantiation
     }
-    
+
     /**
      * JIS B0 paper. 1030 mm x 1456 mm
      * Note: The JIS B-series is not identical to the ISO B-series.
@@ -804,7 +804,7 @@ public class MediaSize extends Size2DSyntax
 
   /**
    * Container class for miscellaneous media sizes.
-   * 
+   *
    * @author Sven de Marothy (sven@physto.se)
    */
   public static final class Other
@@ -813,12 +813,12 @@ public class MediaSize extends Size2DSyntax
     {
       // prevent instantiation
     }
-    
+
     /**
      * US Executive paper size, 7.25 inch x 10.5 inch
      */
-    public static final MediaSize EXECUTIVE = new MediaSize(7.25f, 10.5f, 
-						      MediaSize.INCH, MediaSizeName.EXECUTIVE);
+    public static final MediaSize EXECUTIVE = new MediaSize(7.25f, 10.5f,
+                                                      MediaSize.INCH, MediaSizeName.EXECUTIVE);
 
     /**
      * US Folio paper size, 8.5 inch x 13 inch
@@ -829,39 +829,39 @@ public class MediaSize extends Size2DSyntax
      * US Quarto paper size, 8.5 inches by 10.83 inches.
      */
     public static final MediaSize QUARTO = new MediaSize(8.5f, 10.83f, MediaSize.INCH,
-						   MediaSizeName.QUARTO);
+                                                   MediaSizeName.QUARTO);
 
     /**
      * US Invoice size, 5.5 inch x 8.5 inch
      */
-    public static final MediaSize INVOICE = new MediaSize(5.5f, 8.5f, 
-						    MediaSize.INCH, MediaSizeName.INVOICE);
+    public static final MediaSize INVOICE = new MediaSize(5.5f, 8.5f,
+                                                    MediaSize.INCH, MediaSizeName.INVOICE);
 
     /**
      * US Ledger size, 11 inch x 17 inch
      */
-    public static final MediaSize LEDGER = new MediaSize(11, 17, MediaSize.INCH, 
-						   MediaSizeName.LEDGER);
+    public static final MediaSize LEDGER = new MediaSize(11, 17, MediaSize.INCH,
+                                                   MediaSizeName.LEDGER);
 
     /**
      * Monarch (7 3/4) envelope size, 3.87 inch x 7.5 inch
      */
-    public static final MediaSize MONARCH_ENVELOPE = new MediaSize(3.87f, 7.5f, 
-							     MediaSize.INCH,
-							     MediaSizeName.MONARCH_ENVELOPE);
+    public static final MediaSize MONARCH_ENVELOPE = new MediaSize(3.87f, 7.5f,
+                                                             MediaSize.INCH,
+                                                             MediaSizeName.MONARCH_ENVELOPE);
 
     /**
      * Personal envelope size, 3.625 inch x 6.5 inch.
      */
     public static final MediaSize PERSONAL_ENVELOPE = new MediaSize(3.625f, 6.5f, MediaSize.INCH,
-							      MediaSizeName.PERSONAL_ENVELOPE);
+                                                              MediaSizeName.PERSONAL_ENVELOPE);
 
     /**
      * Italian envelope size, 110 mm x 230 mm
      */
-    public static final MediaSize ITALY_ENVELOPE = new MediaSize(110, 230, 
-							   MediaSize.MM,
-							   MediaSizeName.ITALY_ENVELOPE);
+    public static final MediaSize ITALY_ENVELOPE = new MediaSize(110, 230,
+                                                           MediaSize.MM,
+                                                           MediaSizeName.ITALY_ENVELOPE);
 
     /**
      * Japanese postcard, 100 mm x 148 mm
@@ -872,13 +872,12 @@ public class MediaSize extends Size2DSyntax
      * Japanese double postcard, 148 mm x 200 mm
      */
     public static final MediaSize JAPANESE_DOUBLE_POSTCARD = new MediaSize(148, 200, MediaSize.MM, MediaSizeName.JAPANESE_DOUBLE_POSTCARD);
-    
+
     /**
      * Tabloid size, 11 inch x 17 inch.
      * @since 1.5
      */
-    public static final MediaSize TABLOID = 
+    public static final MediaSize TABLOID =
       new MediaSize(11, 17, Size2DSyntax.INCH, MediaSizeName.TABLOID);
   }
 }
-
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaSizeName.java b/libjava/classpath/javax/print/attribute/standard/MediaSizeName.java
index e29b1ae34c7..a6b26b1d52d 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaSizeName.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaSizeName.java
@@ -40,16 +40,16 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * MediaSizeName is a subclass of the Media printing 
- * attribute and provides selection of media to be used by the means of 
- * defined size names. The class pre-defines commonly available media sizes. 
- * This media type enumeration may be used in alternative to 
+ * MediaSizeName is a subclass of the Media printing
+ * attribute and provides selection of media to be used by the means of
+ * defined size names. The class pre-defines commonly available media sizes.
+ * This media type enumeration may be used in alternative to
  * MediaName/MediaTray.
  * 
                        
- * IPP Compatibility: MediaSizeName is not an IPP 1.1 attribute on its 
+ * IPP Compatibility: MediaSizeName is not an IPP 1.1 attribute on its
  * own. It provides parts of the media attribute type values.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -61,412 +61,412 @@ public class MediaSizeName extends Media
    * The ISO A0 size: 841 mm by 1189 mm.
    */
   public static final MediaSizeName ISO_A0 = new MediaSizeName(0);
-  
+
   /**
    * The ISO A1 size: 594 mm by 841 mm.
    */
   public static final MediaSizeName ISO_A1 = new MediaSizeName(1);
-  
+
   /**
    * The ISO A2 size: 420 mm by 594 mm.
    */
   public static final MediaSizeName ISO_A2 = new MediaSizeName(2);
-  
+
   /**
    * The ISO A3 size: 297 mm by 420 mm.
    */
   public static final MediaSizeName ISO_A3 = new MediaSizeName(3);
-  
+
   /**
    * The ISO A4 size: 210 mm by 297 mm.
    */
   public static final MediaSizeName ISO_A4 = new MediaSizeName(4);
-  
+
   /**
    * The ISO A5 size: 148 mm by 210 mm.
    */
   public static final MediaSizeName ISO_A5 = new MediaSizeName(5);
-  
+
   /**
    * The ISO A6 size: 105 mm by 148 mm.
    */
   public static final MediaSizeName ISO_A6 = new MediaSizeName(6);
-  
+
   /**
    * The ISO A7 size: 74 mm by 105 mm.
    */
   public static final MediaSizeName ISO_A7 = new MediaSizeName(7);
-  
+
   /**
    * The ISO A8 size: 52 mm by 74 mm.
    */
   public static final MediaSizeName ISO_A8 = new MediaSizeName(8);
-  
+
   /**
    * The ISO A9 size: 37 mm by 52 mm.
    */
   public static final MediaSizeName ISO_A9 = new MediaSizeName(9);
-  
+
   /**
    * The ISO A10 size: 26 mm by 37 mm.
    */
   public static final MediaSizeName ISO_A10 = new MediaSizeName(10);
-  
+
   /**
    * The ISO B0 size: 1000 mm by 1414 mm.
    */
   public static final MediaSizeName ISO_B0 = new MediaSizeName(11);
-  
+
   /**
    * The ISO B1 size: 707 mm by 1000 mm.
    */
   public static final MediaSizeName ISO_B1 = new MediaSizeName(12);
-  
+
   /**
    * The ISO B2 size: 500 mm by 707 mm.
    */
   public static final MediaSizeName ISO_B2 = new MediaSizeName(13);
-  
+
   /**
    * The ISO B3 size: 353 mm by 500 mm.
    */
   public static final MediaSizeName ISO_B3 = new MediaSizeName(14);
-  
+
   /**
    * The ISO B4 size: 250 mm by 353 mm.
    */
   public static final MediaSizeName ISO_B4 = new MediaSizeName(15);
-  
+
   /**
    * The ISO B5 size: 176 mm by 250 mm.
    */
   public static final MediaSizeName ISO_B5 = new MediaSizeName(16);
-  
+
   /**
    * The ISO B6 size: 125 mm by 176 mm.
    */
   public static final MediaSizeName ISO_B6 = new MediaSizeName(17);
-  
+
   /**
    * The ISO B7 size: 88 mm by 125 mm.
    */
   public static final MediaSizeName ISO_B7 = new MediaSizeName(18);
-  
+
   /**
    * The ISO B8 size: 62 mm by 88 mm.
    */
   public static final MediaSizeName ISO_B8 = new MediaSizeName(19);
-  
+
   /**
    * The ISO B9 size: 44 mm by 62 mm.
    */
   public static final MediaSizeName ISO_B9 = new MediaSizeName(20);
-  
+
   /**
    * The ISO B10 size: 31 mm by 44 mm.
    */
   public static final MediaSizeName ISO_B10 = new MediaSizeName(21);
-  
+
   /**
    * The JIS B0 size: 1030mm x 1456mm.
    */
   public static final MediaSizeName JIS_B0 = new MediaSizeName(22);
-  
+
   /**
    * The JIS B1 size: 728mm x 1030mm.
    */
   public static final MediaSizeName JIS_B1 = new MediaSizeName(23);
-  
+
   /**
    * The JIS B2 size: 515mm x 728mm.
    */
   public static final MediaSizeName JIS_B2 = new MediaSizeName(24);
-  
+
   /**
    * The JIS B3 size: 364mm x 515mm.
    */
   public static final MediaSizeName JIS_B3 = new MediaSizeName(25);
-  
+
   /**
    * The JIS B4 size: 257mm x 364mm.
    */
   public static final MediaSizeName JIS_B4 = new MediaSizeName(26);
-  
+
   /**
    * The JIS B5 size: 182mm x 257mm.
    */
   public static final MediaSizeName JIS_B5 = new MediaSizeName(27);
-  
+
   /**
    * The JIS B6 size: 128mm x 182mm.
    */
   public static final MediaSizeName JIS_B6 = new MediaSizeName(28);
-  
+
   /**
    * The JIS B7 size: 91mm x 128mm.
    */
   public static final MediaSizeName JIS_B7 = new MediaSizeName(29);
-  
+
   /**
    * The JIS B8 size: 64mm x 91mm.
    */
   public static final MediaSizeName JIS_B8 = new MediaSizeName(30);
-  
+
   /**
    * The JIS B9 size: 45mm x 64mm.
    */
   public static final MediaSizeName JIS_B9 = new MediaSizeName(31);
-  
+
   /**
    * The JIS B10 size: 32mm x 45mm.
    */
   public static final MediaSizeName JIS_B10 = new MediaSizeName(32);
-  
+
   /**
    * The ISO C0 size: 917 mm by 1297 mm.
    */
   public static final MediaSizeName ISO_C0 = new MediaSizeName(33);
-  
+
   /**
    * The ISO C1 size: 648 mm by 917 mm.
    */
   public static final MediaSizeName ISO_C1 = new MediaSizeName(34);
-  
+
   /**
    * The ISO C2 size: 458 mm by 648 mm.
    */
   public static final MediaSizeName ISO_C2 = new MediaSizeName(35);
-  
+
   /**
    * The ISO C3 size: 324 mm by 458 mm.
    */
   public static final MediaSizeName ISO_C3 = new MediaSizeName(36);
-  
+
   /**
    * The ISO C4 size: 229 mm by 324 mm.
    */
   public static final MediaSizeName ISO_C4 = new MediaSizeName(37);
-  
+
   /**
    * The ISO C5 size: 162 mm by 229 mm.
    */
   public static final MediaSizeName ISO_C5 = new MediaSizeName(38);
-  
+
   /**
    * The ISO C6 size: 114 mm by 162 mm.
    */
   public static final MediaSizeName ISO_C6 = new MediaSizeName(39);
-  
+
   /**
    * The North American letter size: 8.5 inches by 11 inches.
    */
   public static final MediaSizeName NA_LETTER = new MediaSizeName(40);
-  
+
   /**
    * The North American legal size: 8.5 inches by 14 inches.
    */
   public static final MediaSizeName NA_LEGAL = new MediaSizeName(41);
-  
+
   /**
    * The executive size: 7.25 inches by 10.5 inches.
    */
   public static final MediaSizeName EXECUTIVE = new MediaSizeName(42);
-  
+
   /**
    * The ledger size: 11 inches by 17 inches.
    */
   public static final MediaSizeName LEDGER = new MediaSizeName(43);
-  
+
   /**
    * The tabloid size: 11 inches by 17 inches.
    */
   public static final MediaSizeName TABLOID = new MediaSizeName(44);
-  
+
   /**
    * The invoice size: 5.5 inches by 8.5 inches.
    */
   public static final MediaSizeName INVOICE = new MediaSizeName(45);
-  
+
   /**
    * The folio size: 8.5 inches by 13 inches.
    */
   public static final MediaSizeName FOLIO = new MediaSizeName(46);
-  
+
   /**
    * The quarto size: 8.5 inches by 10.83 inches.
    */
   public static final MediaSizeName QUARTO = new MediaSizeName(47);
-  
+
   /**
    * The Japanese postcard size, 100 mm by 148 mm.
    */
   public static final MediaSizeName JAPANESE_POSTCARD = new MediaSizeName(48);
-  
+
   /**
    * The Japanese Double postcard size: 148 mm by 200 mm.
    */
   public static final MediaSizeName JAPANESE_DOUBLE_POSTCARD =
     new MediaSizeName(49);
-  
+
   /**
    * The engineering ANSI A size medium: 8.5 inches x 11 inches.
    */
   public static final MediaSizeName A = new MediaSizeName(50);
-  
+
   /**
    * The engineering ANSI B size medium: 11 inches x 17 inches.
    */
   public static final MediaSizeName B = new MediaSizeName(51);
-  
+
   /**
    * The engineering ANSI C size medium: 17 inches x 22 inches.
    */
   public static final MediaSizeName C = new MediaSizeName(52);
-  
+
   /**
    * The engineering ANSI D size medium: 22 inches x 34 inches.
    */
   public static final MediaSizeName D = new MediaSizeName(53);
-  
+
   /**
    * The engineering ANSI E size medium: 34 inches x 44 inches.
    */
   public static final MediaSizeName E = new MediaSizeName(54);
-  
+
   /**
    * The ISO Designated Long size: 110 mm by 220 mm.
    */
   public static final MediaSizeName ISO_DESIGNATED_LONG =
     new MediaSizeName(55);
-  
+
   /**
    * The Italy envelope size: 110 mm by 230 mm.
    */
   public static final MediaSizeName ITALY_ENVELOPE = new MediaSizeName(56);
-  
+
   /**
    * The Monarch envelope size: 3.87 inch by 7.5 inch.
    */
   public static final MediaSizeName MONARCH_ENVELOPE = new MediaSizeName(57);
-  
+
   /**
    * The Personal envelope size: 3.625 inch by 6.5 inch.
    */
   public static final MediaSizeName PERSONAL_ENVELOPE = new MediaSizeName(58);
-  
+
   /**
-   * The North American number 9 business envelope size: 
+   * The North American number 9 business envelope size:
    * 3.875 inches by 8.875 inches.
    */
   public static final MediaSizeName NA_NUMBER_9_ENVELOPE =
     new MediaSizeName(59);
-  
+
   /**
-   * The North American number 10 business envelope size:  
+   * The North American number 10 business envelope size:
    * 4.125 inches by 9.5 inches.
    */
   public static final MediaSizeName NA_NUMBER_10_ENVELOPE =
     new MediaSizeName(60);
-  
+
   /**
-   * The North American number 11 business envelope size: 
+   * The North American number 11 business envelope size:
    * 4.5 inches by 10.375 inches.
    */
   public static final MediaSizeName NA_NUMBER_11_ENVELOPE =
     new MediaSizeName(61);
-  
+
   /**
-   * The North American number 12 business envelope size: 
+   * The North American number 12 business envelope size:
    * 4.75 inches by 11 inches.
    */
   public static final MediaSizeName NA_NUMBER_12_ENVELOPE =
     new MediaSizeName(62);
-  
+
   /**
-   * The North American number 14 business envelope size: 
+   * The North American number 14 business envelope size:
    * 5 inches by 11.5 inches.
    */
   public static final MediaSizeName NA_NUMBER_14_ENVELOPE =
     new MediaSizeName(63);
-  
+
   /**
    * The North American 6x9 inch envelope size.
    */
   public static final MediaSizeName NA_6X9_ENVELOPE = new MediaSizeName(64);
-  
+
   /**
    * The North American 7x9 inch envelope size.
    */
   public static final MediaSizeName NA_7X9_ENVELOPE = new MediaSizeName(65);
-  
+
   /**
    * The North American 9x11 inch envelope size.
    */
   public static final MediaSizeName NA_9X11_ENVELOPE = new MediaSizeName(66);
-  
+
   /**
    * The North American 9x12 inch envelope size.
    */
   public static final MediaSizeName NA_9X12_ENVELOPE = new MediaSizeName(67);
-  
+
   /**
    * The North American 10x13 inch envelope size.
    */
   public static final MediaSizeName NA_10X13_ENVELOPE = new MediaSizeName(68);
-  
+
   /**
    * The North American 10x14 inch envelope size.
    */
   public static final MediaSizeName NA_10X14_ENVELOPE = new MediaSizeName(69);
-  
+
   /**
    * The North American 10x15 inch envelope size.
    */
   public static final MediaSizeName NA_10X15_ENVELOPE = new MediaSizeName(70);
-  
+
   /**
    * The North American 5 inches by 7 inches.
    */
   public static final MediaSizeName NA_5X7 = new MediaSizeName(71);
-  
+
   /**
    * The North American 8 inches by 10 inches.
    */
   public static final MediaSizeName NA_8X10 = new MediaSizeName(72);
 
-  private static final String[] stringTable = 
-    { "iso-a0",  "iso-a1", "iso-a2", "iso-a3", "iso-a4", "iso-a5", "iso-a6", 
-      "iso-a7", "iso-a8", "iso-a9", "iso-a10", "iso-b0", "iso-b1", "iso-b2", 
-      "iso-b3", "iso-b4", "iso-b5", "iso-b6", "iso-b7", "iso-b8", "iso-b9", 
-      "iso-b10", "jis-b0", "jis-b1", "jis-b2", "jis-b3", "jis-b4", "jis-b5", 
-      "jis-b6", "jis-b7", "jis-b8", "jis-b9", "jis-b10", "iso-c0", "iso-c1", 
-      "iso-c2", "iso-c3", "iso-c4", "iso-c5", "iso-c6", "na-letter", 
-      "na-legal", "executive", "ledger", "tabloid", "invoice", "folio", 
-      "quarto", "japanese-postcard", "oufuko-postcard", "a", "b", "c", "d", 
-      "e", "iso-designated-long", "italian-envelope", "monarch-envelope", 
-      "personal-envelope", "na-number-9-envelope", "na-number-10-envelope", 
-      "na-number-11-envelope", "na-number-12-envelope", 
-      "na-number-14-envelope", "na-6x9-envelope", "na-7x9-envelope", 
-      "na-9x11-envelope", "na-9x12-envelope", "na-10x13-envelope", 
+  private static final String[] stringTable =
+    { "iso-a0",  "iso-a1", "iso-a2", "iso-a3", "iso-a4", "iso-a5", "iso-a6",
+      "iso-a7", "iso-a8", "iso-a9", "iso-a10", "iso-b0", "iso-b1", "iso-b2",
+      "iso-b3", "iso-b4", "iso-b5", "iso-b6", "iso-b7", "iso-b8", "iso-b9",
+      "iso-b10", "jis-b0", "jis-b1", "jis-b2", "jis-b3", "jis-b4", "jis-b5",
+      "jis-b6", "jis-b7", "jis-b8", "jis-b9", "jis-b10", "iso-c0", "iso-c1",
+      "iso-c2", "iso-c3", "iso-c4", "iso-c5", "iso-c6", "na-letter",
+      "na-legal", "executive", "ledger", "tabloid", "invoice", "folio",
+      "quarto", "japanese-postcard", "oufuko-postcard", "a", "b", "c", "d",
+      "e", "iso-designated-long", "italian-envelope", "monarch-envelope",
+      "personal-envelope", "na-number-9-envelope", "na-number-10-envelope",
+      "na-number-11-envelope", "na-number-12-envelope",
+      "na-number-14-envelope", "na-6x9-envelope", "na-7x9-envelope",
+      "na-9x11-envelope", "na-9x12-envelope", "na-10x13-envelope",
       "na-10x14-envelope", "na-10x15-envelope", "na-5x7", "na-8x10" };
-  
-  private static final MediaSizeName[] enumValueTable = 
-    { ISO_A0, ISO_A1, ISO_A2, ISO_A3, ISO_A4, ISO_A5, ISO_A6, ISO_A7, ISO_A8, 
+
+  private static final MediaSizeName[] enumValueTable =
+    { ISO_A0, ISO_A1, ISO_A2, ISO_A3, ISO_A4, ISO_A5, ISO_A6, ISO_A7, ISO_A8,
       ISO_A9, ISO_A10, ISO_B0, ISO_B1, ISO_B2, ISO_B3, ISO_B4, ISO_B5, ISO_B6,
-      ISO_B7, ISO_B8, ISO_B9, ISO_B10, JIS_B0, JIS_B1, JIS_B2, JIS_B3, JIS_B4, 
+      ISO_B7, ISO_B8, ISO_B9, ISO_B10, JIS_B0, JIS_B1, JIS_B2, JIS_B3, JIS_B4,
       JIS_B5, JIS_B6, JIS_B7, JIS_B8, JIS_B9, JIS_B10, ISO_C0, ISO_C1, ISO_C2,
-      ISO_C3, ISO_C4, ISO_C5, ISO_C6, NA_LETTER, NA_LEGAL, EXECUTIVE, LEDGER, 
-      TABLOID, INVOICE, FOLIO, QUARTO, JAPANESE_POSTCARD, 
-      JAPANESE_DOUBLE_POSTCARD, A, B, C, D, E, ISO_DESIGNATED_LONG, 
-      ITALY_ENVELOPE, MONARCH_ENVELOPE, PERSONAL_ENVELOPE, 
+      ISO_C3, ISO_C4, ISO_C5, ISO_C6, NA_LETTER, NA_LEGAL, EXECUTIVE, LEDGER,
+      TABLOID, INVOICE, FOLIO, QUARTO, JAPANESE_POSTCARD,
+      JAPANESE_DOUBLE_POSTCARD, A, B, C, D, E, ISO_DESIGNATED_LONG,
+      ITALY_ENVELOPE, MONARCH_ENVELOPE, PERSONAL_ENVELOPE,
       NA_NUMBER_9_ENVELOPE, NA_NUMBER_10_ENVELOPE, NA_NUMBER_11_ENVELOPE,
       NA_NUMBER_12_ENVELOPE, NA_NUMBER_14_ENVELOPE, NA_6X9_ENVELOPE,
       NA_7X9_ENVELOPE, NA_9X11_ENVELOPE, NA_9X12_ENVELOPE, NA_10X13_ENVELOPE,
-      NA_10X14_ENVELOPE, NA_10X15_ENVELOPE, NA_5X7, NA_8X10 }; 
-  
+      NA_10X14_ENVELOPE, NA_10X15_ENVELOPE, NA_5X7, NA_8X10 };
+
   /**
    * Constructs a MediaSizeName object.
-   * 
+   *
    * @param value the enum value.
    */
   protected MediaSizeName(int value)
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaTray.java b/libjava/classpath/javax/print/attribute/standard/MediaTray.java
index 23811a0a407..836640c816c 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaTray.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaTray.java
@@ -40,7 +40,7 @@ package javax.print.attribute.standard;
 import javax.print.attribute.EnumSyntax;
 
 /**
- * MediaTray is a subclass of the Media printing 
+ * MediaTray is a subclass of the Media printing
  * attribute and provides selection of media to be used by the means of the
  * input tray of the printer. The class pre-defines commonly available types
  * of input trays in printers. This media type enumeration may be used in
@@ -49,25 +49,25 @@ import javax.print.attribute.EnumSyntax;
  * IPP Compatibility: MediaTray is not an IPP 1.1 attribute on its own.
  * It provides parts of the media attribute type values.
  * 
                        
- * 
+ *
  * @author Sven de Marothy
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
 public class MediaTray extends Media
 {
-  
+
   private static final long serialVersionUID = -982503611095214703L;
-  
+
   /**
    * Top tray
    */
   public static final MediaTray TOP = new MediaTray(0);
-  
+
   /**
    * Middle tray
    */
   public static final MediaTray MIDDLE = new MediaTray(1);
-  
+
   /**
    * Bottom tray
    */
@@ -80,9 +80,9 @@ public class MediaTray extends Media
 
   /**
    * Manual-feed tray
-   */ 
+   */
   public static final MediaTray MANUAL = new MediaTray(4);
-  
+
   /**
    * Large capacity tray
    */
@@ -92,22 +92,22 @@ public class MediaTray extends Media
    * Main tray
    */
   public static final MediaTray MAIN = new MediaTray(6);
-  
+
   /**
    * Side tray
    */
-  public static final MediaTray SIDE = new MediaTray(7);  
-  
+  public static final MediaTray SIDE = new MediaTray(7);
+
   private static final String[] stringTable = { "top", "middle", "bottom",
-                                                "envelope", "manual", 
-                                                "large-capacity", "main", 
+                                                "envelope", "manual",
+                                                "large-capacity", "main",
                                                 "side" };
-  
-  private static final MediaTray[] enumValueTable = { TOP, MIDDLE, BOTTOM, 
+
+  private static final MediaTray[] enumValueTable = { TOP, MIDDLE, BOTTOM,
                                                       ENVELOPE, MANUAL,
                                                       LARGE_CAPACITY, MAIN,
-                                                      SIDE };  
-  
+                                                      SIDE };
+
   /**
    * Creates a MediaTray object.
    *
@@ -117,7 +117,7 @@ public class MediaTray extends Media
   {
     super( i );
   }
- 
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -139,4 +139,3 @@ public class MediaTray extends Media
     return enumValueTable;
   }
 }
-
diff --git a/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java b/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
index 3ee1b4126e7..feb01ea4c58 100644
--- a/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
+++ b/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
@@ -45,13 +45,13 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The MultipleDocumentHandling printing attribute controls
- * how certain printing attributes affect printing in case of multiple 
- * documents in a print job. This attribute is only relevant if a job 
+ * how certain printing attributes affect printing in case of multiple
+ * documents in a print job. This attribute is only relevant if a job
  * has multiple documents.
  * 
                        
  * IPP Compatibility: MultipleDocumentHandling is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -60,43 +60,43 @@ public class MultipleDocumentHandling extends EnumSyntax
 {
   private static final long serialVersionUID = 8098326460746413466L;
 
-  /** 
+  /**
    * Multiple documents are treated as a single document.
    */
   public static final MultipleDocumentHandling SINGLE_DOCUMENT =
     new MultipleDocumentHandling(0);
-  
-  /** 
+
+  /**
    * Multiple documents are treated as uncollated copies.
    */
   public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_UNCOLLATED_COPIES =
     new MultipleDocumentHandling(1);
-  
-  /** 
-   * Multiple documents are treated as collated copies. 
+
+  /**
+   * Multiple documents are treated as collated copies.
    */
   public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_COLLATED_COPIES =
     new MultipleDocumentHandling(2);
-  
-  /** 
+
+  /**
    * Multiple documents are treated so that every single document starts
-   * with a new sheet. 
+   * with a new sheet.
    */
   public static final MultipleDocumentHandling SINGLE_DOCUMENT_NEW_SHEET =
     new MultipleDocumentHandling(3);
-  
-  private static final String[] stringTable = { "single-document", 
+
+  private static final String[] stringTable = { "single-document",
                                                 "separate-documents-uncollated-copies",
                                                 "separate-documents-collated-copies",
                                                 "single-document-new-sheet" };
-  
-  private static final MultipleDocumentHandling[] enumValueTable = 
+
+  private static final MultipleDocumentHandling[] enumValueTable =
     { SINGLE_DOCUMENT, SEPARATE_DOCUMENTS_UNCOLLATED_COPIES,
       SEPARATE_DOCUMENTS_COLLATED_COPIES, SINGLE_DOCUMENT_NEW_SHEET};
 
   /**
    * Constructs a MultipleDocumentHandling object.
-   * 
+   *
    * @param value the enum value
    */
   protected MultipleDocumentHandling(int value)
@@ -123,7 +123,7 @@ public class MultipleDocumentHandling extends EnumSyntax
   {
     return "multiple-document-handling";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/NumberOfDocuments.java b/libjava/classpath/javax/print/attribute/standard/NumberOfDocuments.java
index 1121a1f0f79..217df0d8725 100644
--- a/libjava/classpath/javax/print/attribute/standard/NumberOfDocuments.java
+++ b/libjava/classpath/javax/print/attribute/standard/NumberOfDocuments.java
@@ -1,4 +1,4 @@
-/* NumberOfDocuments.java -- 
+/* NumberOfDocuments.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,7 +42,7 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintJobAttribute;
 
 /**
- * The NumberOfDocuments printing attribute specifies 
+ * The NumberOfDocuments printing attribute specifies
  * the number of documents in a job.
  * 
                        
  * IPP Compatibility: NumberOfDocuments is an IPP 1.1 attribute.
@@ -54,7 +54,7 @@ public final class NumberOfDocuments extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 7891881310684461097L;
-  
+
   /**
    * Creates a NumberOfDocuments object.
    *
@@ -69,13 +69,13 @@ public final class NumberOfDocuments extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java b/libjava/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java
index b968f9a7bf1..d33d826c8cc 100644
--- a/libjava/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java
+++ b/libjava/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java
@@ -1,4 +1,4 @@
-/* NumberOfInterveningJobs.java -- 
+/* NumberOfInterveningJobs.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,19 +43,19 @@ import javax.print.attribute.PrintJobAttribute;
 
 /**
  * The NumberOfInterveningJobs printing attribute provides
- * the number of jobs ahead in the print service queue before the 
+ * the number of jobs ahead in the print service queue before the
  * requested job.
  * 
                        
  * IPP Compatibility: NumberOfInterveningJobs is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch
  */
 public final class NumberOfInterveningJobs extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 2568141124844982746L;
-  
+
   /**
    * Creates a NumberOfInterveningJobs object.
    *
@@ -70,13 +70,13 @@ public final class NumberOfInterveningJobs extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/NumberUp.java b/libjava/classpath/javax/print/attribute/standard/NumberUp.java
index 219a1c1a8b7..82779070eae 100644
--- a/libjava/classpath/javax/print/attribute/standard/NumberUp.java
+++ b/libjava/classpath/javax/print/attribute/standard/NumberUp.java
@@ -1,4 +1,4 @@
-/* NumberUp.java -- 
+/* NumberUp.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,24 +44,24 @@ import javax.print.attribute.PrintJobAttribute;
 import javax.print.attribute.PrintRequestAttribute;
 
 /**
- * The NumberUp printing attribute specifies the number of pages 
+ * The NumberUp printing attribute specifies the number of pages
  * to be arranged upon a single media sheet.
  * 
                        
- * Note: The effect of this attribute on jobs with multiple documents 
- * is controlled by the job attribute 
+ * Note: The effect of this attribute on jobs with multiple documents
+ * is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * 
                        
  * 
                        
  * IPP Compatibility: NumberUp is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch
  */
 public final class NumberUp extends IntegerSyntax
   implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
 {
   private static final long serialVersionUID = -3040436486786527811L;
-  
+
   /**
    * Creates a NumberUp object.
    *
@@ -74,13 +74,13 @@ public final class NumberUp extends IntegerSyntax
   {
     super(value);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/NumberUpSupported.java b/libjava/classpath/javax/print/attribute/standard/NumberUpSupported.java
index 20bd9c93b59..62f417b89ef 100644
--- a/libjava/classpath/javax/print/attribute/standard/NumberUpSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/NumberUpSupported.java
@@ -43,13 +43,13 @@ import javax.print.attribute.SupportedValuesAttribute;
 
 
 /**
- * The NumberUpSupported printing attribute specifies the 
- * supported value or range of values for the 
+ * The NumberUpSupported printing attribute specifies the
+ * supported value or range of values for the
  * {@link javax.print.attribute.standard.NumberUp} attribute.
  * 
                        
  * IPP Compatibility: NumberUpSupported is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -68,7 +68,7 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
   public NumberUpSupported(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
@@ -79,13 +79,13 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
    * @param members the members supported for number up.
    *
    * @exception IllegalArgumentException if any element is invalid
-   * @exception NullPointerException if members is null or any 
+   * @exception NullPointerException if members is null or any
    * element of members is null.
    */
   public NumberUpSupported(int[][] members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
@@ -103,24 +103,24 @@ public final class NumberUpSupported extends SetOfIntegerSyntax
   public NumberUpSupported(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerBound may not be less than 1");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof NumberUpSupported))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/OrientationRequested.java b/libjava/classpath/javax/print/attribute/standard/OrientationRequested.java
index 8d346855664..c24fab458d4 100644
--- a/libjava/classpath/javax/print/attribute/standard/OrientationRequested.java
+++ b/libjava/classpath/javax/print/attribute/standard/OrientationRequested.java
@@ -56,7 +56,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                        
  * IPP Compatibility: OrientationRequested is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,42 +65,42 @@ public final class OrientationRequested extends EnumSyntax
 {
   private static final long serialVersionUID = -4447437289862822276L;
 
-  /** 
-   * Orientation as portrait. 
+  /**
+   * Orientation as portrait.
    */
   public static final OrientationRequested PORTRAIT =
     new OrientationRequested(3);
-  
-  /** 
-   * Orientation as landscape. 
+
+  /**
+   * Orientation as landscape.
    */
   public static final OrientationRequested LANDSCAPE =
     new OrientationRequested(4);
-  
-  /** 
-   * Orientation as reversed landscape. 
+
+  /**
+   * Orientation as reversed landscape.
    */
   public static final OrientationRequested REVERSE_LANDSCAPE =
     new OrientationRequested(5);
-  
-  /** 
-   * Orientation as reversed portrait. 
+
+  /**
+   * Orientation as reversed portrait.
    */
   public static final OrientationRequested REVERSE_PORTRAIT =
     new OrientationRequested(6);
-  
+
 
   private static final String[] stringTable = { "portrait", "landscape",
                                                 "reverse-landscape",
                                                 "reverse-portrait" };
-  
-  private static final OrientationRequested[] 
-      enumValueTable = { PORTRAIT, LANDSCAPE, 
+
+  private static final OrientationRequested[]
+      enumValueTable = { PORTRAIT, LANDSCAPE,
                          REVERSE_LANDSCAPE, REVERSE_PORTRAIT };
 
   /**
    * Constructs a OrientationRequested object.
-   * 
+   *
    * @param value the value
    */
   protected OrientationRequested(int value)
@@ -127,7 +127,7 @@ public final class OrientationRequested extends EnumSyntax
   {
     return "orientation-requested";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -148,7 +148,7 @@ public final class OrientationRequested extends EnumSyntax
   {
     return enumValueTable;
   }
-  
+
   /**
    * Returns the lowest used value by the enumerations of this class.
    * .
@@ -157,5 +157,5 @@ public final class OrientationRequested extends EnumSyntax
   protected int getOffset()
   {
     return 3;
-  }  
+  }
 }
diff --git a/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java b/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
index df8a5453f15..769cef1e8ec 100644
--- a/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
+++ b/libjava/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java
@@ -1,4 +1,4 @@
-/* OutputDeviceAssigned.java -- 
+/* OutputDeviceAssigned.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,17 +46,17 @@ import javax.print.attribute.TextSyntax;
 
 /**
  * The OutputDeviceAssigned printing attribute specifies the
- * output printer device assigned by a print service to a print job. 
+ * output printer device assigned by a print service to a print job.
  * 
                        
  * This may be empty if a print service is embedded in a printer, e.g. is the
- * output device. However there exist print services with several physical 
+ * output device. However there exist print services with several physical
  * output devices (e.g. CUPS classes) where this attribute provides the actual
  * output device.
  * 
                        
  * 
                        
  * IPP Compatibility: OutputDeviceAssigned is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class OutputDeviceAssigned extends TextSyntax
@@ -83,7 +83,7 @@ public final class OutputDeviceAssigned extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java b/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
index 02c9c198c0b..310264a0c71 100644
--- a/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
@@ -49,7 +49,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * 
                        
  * IPP Compatibility: PDLOverrideSupported is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -64,22 +64,22 @@ public class PDLOverrideSupported extends EnumSyntax
    */
   public static final PDLOverrideSupported NOT_ATTEMPTED =
     new PDLOverrideSupported(0);
-  
+
   /**
    * Indicates that the print service is capable of
    * attempting to override document data instructions.
    */
   public static final PDLOverrideSupported ATTEMPTED =
     new PDLOverrideSupported(1);
-  
+
   private static final String[] stringTable = { "not-attempted", "attempted" };
-  
+
   private static final PDLOverrideSupported[] enumValueTable = { NOT_ATTEMPTED,
                                                                  ATTEMPTED};
 
   /**
    * Constructs a PDLOverrideSupported object.
-   * 
+   *
    * @param value the enum value
    */
   protected PDLOverrideSupported(int value)
@@ -106,7 +106,7 @@ public class PDLOverrideSupported extends EnumSyntax
   {
     return "pdl-override-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/PageRanges.java b/libjava/classpath/javax/print/attribute/standard/PageRanges.java
index 9637a917f89..2250868d789 100644
--- a/libjava/classpath/javax/print/attribute/standard/PageRanges.java
+++ b/libjava/classpath/javax/print/attribute/standard/PageRanges.java
@@ -45,17 +45,17 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.SetOfIntegerSyntax;
 
 /**
- * The PageRanges printing attribute specifies the 
+ * The PageRanges printing attribute specifies the
  * range(s) of pages to be printed in a print job.
  * 
                        
- * Note: The effect of this attribute on jobs with multiple 
- * documents is controlled by the job attribute 
+ * Note: The effect of this attribute on jobs with multiple
+ * documents is controlled by the job attribute
  * {@link javax.print.attribute.standard.MultipleDocumentHandling}.
  * 
                        
  * 
                        
  * IPP Compatibility: PageRanges is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -75,7 +75,7 @@ public final class PageRanges extends SetOfIntegerSyntax
   public PageRanges(int member)
   {
     super(member);
-    
+
     if (member < 1)
       throw new IllegalArgumentException("member may not be less than 1");
   }
@@ -87,13 +87,13 @@ public final class PageRanges extends SetOfIntegerSyntax
    * @param members the page ranges to be printed.
    *
    * @exception IllegalArgumentException if any element is invalid
-   * @exception NullPointerException if members is null or any 
+   * @exception NullPointerException if members is null or any
    * element of members is null.
    */
   public PageRanges(int[][] members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
@@ -111,11 +111,11 @@ public final class PageRanges extends SetOfIntegerSyntax
   public PageRanges(int lowerBound, int upperBound)
   {
     super(lowerBound, upperBound);
-    
+
     if (lowerBound < 1)
       throw new IllegalArgumentException("lowerbound may not be less than 1");
   }
-  
+
   /**
    * Constructs a PageRanges object with a set
    * of ranges to be printed in string array form.
@@ -123,30 +123,30 @@ public final class PageRanges extends SetOfIntegerSyntax
    * @param members the page ranges to be printed in string form.
    *
    * @exception IllegalArgumentException if any element is invalid.
-   * @exception NullPointerException if members is null or any 
+   * @exception NullPointerException if members is null or any
    * element of members is null.
    */
   public PageRanges(String members)
   {
     super(members);
-    
+
     if (members == null)
       throw new NullPointerException("members may not be null");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if (! (obj instanceof PageRanges))
       return false;
-   
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java b/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
index 6305842c010..bd086817a4f 100644
--- a/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
+++ b/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
@@ -1,4 +1,4 @@
-/* PagesPerMinute.java -- 
+/* PagesPerMinute.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,20 +43,20 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The PagesPerMinute printing attribute specifies 
+ * The PagesPerMinute printing attribute specifies
  * the nominal number of pages per minute which may be printed
- * by the printer. 
+ * by the printer.
  * 
                        
  * IPP Compatibility: PagesPerMinute is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PagesPerMinute extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = -6366403993072862015L;
-  
+
   /**
    * Creates a PagesPerMinute object.
    *
@@ -71,13 +71,13 @@ public final class PagesPerMinute extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java b/libjava/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java
index 3d5fa2ca559..f32bbdb19c0 100644
--- a/libjava/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java
+++ b/libjava/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java
@@ -1,4 +1,4 @@
-/* PagesPerMinuteColor.java -- 
+/* PagesPerMinuteColor.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,20 +42,20 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The PagesPerMinuteColor printing attribute specifies 
+ * The PagesPerMinuteColor printing attribute specifies
  * the nominal number of pages per minute which may be printed in
- * color by the printer. 
+ * color by the printer.
  * 
                        
  * IPP Compatibility: PagesPerMinuteColor is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch
  */
 public final class PagesPerMinuteColor extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = 1684993151687470944L;
-  
+
   /**
    * Creates a PagesPerMinuteColor object.
    *
@@ -70,13 +70,13 @@ public final class PagesPerMinuteColor extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PresentationDirection.java b/libjava/classpath/javax/print/attribute/standard/PresentationDirection.java
index 14d560533a6..62c19b241bd 100644
--- a/libjava/classpath/javax/print/attribute/standard/PresentationDirection.java
+++ b/libjava/classpath/javax/print/attribute/standard/PresentationDirection.java
@@ -45,13 +45,13 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The PresentationDirection attribute specifies
- * a value to be used together with the NumberUp attribute 
+ * a value to be used together with the NumberUp attribute
  * to indicate the layout of multiple pages on a single media sheet.
  * 
                        
- * IPP Compatibility: PresentationDirection is not an IPP 1.1 
+ * IPP Compatibility: PresentationDirection is not an IPP 1.1
  * attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -61,72 +61,72 @@ public final class PresentationDirection extends EnumSyntax
   private static final long serialVersionUID = 8294728067230931780L;
 
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the top left towards the bottom left.
    */
   public static final PresentationDirection TOBOTTOM_TORIGHT =
     new PresentationDirection(0);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the top right towards the bottom left.
    */
   public static final PresentationDirection TOBOTTOM_TOLEFT =
     new PresentationDirection(1);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the bottom left towards the top right.
    */
   public static final PresentationDirection TOTOP_TORIGHT =
     new PresentationDirection(2);
-  
+
   /**
-   * The single pages are arranged on the media in columns starting 
+   * The single pages are arranged on the media in columns starting
    * at the bottom right towards the top left.
    */
   public static final PresentationDirection TOTOP_TOLEFT =
     new PresentationDirection(3);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the top left towards the right bottom.
    */
   public static final PresentationDirection TORIGHT_TOBOTTOM =
     new PresentationDirection(4);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the bottom left towards the right top.
    */
   public static final PresentationDirection TORIGHT_TOTOP =
     new PresentationDirection(5);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the top right towards the left bottom.
    */
   public static final PresentationDirection TOLEFT_TOBOTTOM =
     new PresentationDirection(6);
-  
+
   /**
-   * The single pages are arranged on the media in rows starting 
+   * The single pages are arranged on the media in rows starting
    * at the bottom right towards the left top.
    */
   public static final PresentationDirection TOLEFT_TOTOP =
     new PresentationDirection(7);
 
-  private static final String[] stringTable = { "tobottom-toright", 
-    "tobottom-toleft", "totop-toright", "totop-toleft", "toright-tobottom", 
+  private static final String[] stringTable = { "tobottom-toright",
+    "tobottom-toleft", "totop-toright", "totop-toleft", "toright-tobottom",
     "toright-totop", "toleft-tobottom", "toleft-totop" };
 
-  private static final PresentationDirection[] enumValueTable = 
-    { TOBOTTOM_TORIGHT, TOBOTTOM_TOLEFT, TOTOP_TORIGHT, TOTOP_TOLEFT, 
+  private static final PresentationDirection[] enumValueTable =
+    { TOBOTTOM_TORIGHT, TOBOTTOM_TOLEFT, TOTOP_TORIGHT, TOTOP_TOLEFT,
       TORIGHT_TOBOTTOM, TORIGHT_TOTOP, TOLEFT_TOBOTTOM, TOLEFT_TOTOP };
-  
+
   /**
    * Constructs a PresentationDirection object.
-   * 
+   *
    * @param value the enum value.
    */
   private PresentationDirection(int value)
@@ -153,7 +153,7 @@ public final class PresentationDirection extends EnumSyntax
   {
     return "presentation-direction";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/PrintQuality.java b/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
index bc94d532b8b..aa65e89a707 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
@@ -50,7 +50,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                        
  * IPP Compatibility: PrintQuality is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,28 +59,28 @@ public class PrintQuality extends EnumSyntax
 {
   private static final long serialVersionUID = -3072341285225858365L;
 
-  /** 
-   * Draft quality of the printer. 
+  /**
+   * Draft quality of the printer.
    */
   public static final PrintQuality DRAFT = new PrintQuality(3);
-  
-  /** 
-   * Normal quality of the printer. 
+
+  /**
+   * Normal quality of the printer.
    */
   public static final PrintQuality NORMAL = new PrintQuality(4);
-  
-  /** 
-   * High quality of the printer. 
+
+  /**
+   * High quality of the printer.
    */
   public static final PrintQuality HIGH = new PrintQuality(5);
 
   private static final String[] stringTable = { "draft", "normal", "high" };
-  
+
   private static final PrintQuality[] enumValueTable = { DRAFT, NORMAL, HIGH };
-  
+
   /**
    * Constructs a PrintQuality object.
-   * 
+   *
    * @param value the value of the enum
    */
   protected PrintQuality(int value)
@@ -107,7 +107,7 @@ public class PrintQuality extends EnumSyntax
   {
     return "print-quality";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
@@ -127,7 +127,7 @@ public class PrintQuality extends EnumSyntax
   protected EnumSyntax[] getEnumValueTable()
   {
     return enumValueTable;
-  }  
+  }
 
   /**
    * Returns the lowest used value by the enumerations of this class.
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java b/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java
index e287f8ce9e1..01d2065bfde 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterInfo.java
@@ -1,4 +1,4 @@
-/* PrinterInfo.java -- 
+/* PrinterInfo.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The PrinterInfo printing attribute provides 
+ * The PrinterInfo printing attribute provides
  * informations about a printer device.
  * 
                        
  * IPP Compatibility: PrinterInfo is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterInfo extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterInfo extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
index 1c9c3993029..5ac6bf71da6 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
@@ -43,16 +43,16 @@ import javax.print.attribute.PrintServiceAttribute;
 
 
 /**
- * The PrinterIsAcceptingJobs printing attribute signals 
+ * The PrinterIsAcceptingJobs printing attribute signals
  * if a print services is currently accepting jobs.
  * 
                        
  * IPP Compatibility: PrinterIsAcceptingJobs is an IPP 1.1 attribute.
- * The IPP specification treats PrinterIsAcceptingJobs as boolean type which 
- * is not available in the Java Print Service API. The IPP boolean value "true" 
- * corresponds to ACCEPTING_JOBS and "false" 
+ * The IPP specification treats PrinterIsAcceptingJobs as boolean type which
+ * is not available in the Java Print Service API. The IPP boolean value "true"
+ * corresponds to ACCEPTING_JOBS and "false"
  * to NOT_ACCEPTING_JOBS.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -66,22 +66,22 @@ public final class PrinterIsAcceptingJobs extends EnumSyntax
    */
   public static final PrinterIsAcceptingJobs NOT_ACCEPTING_JOBS =
     new PrinterIsAcceptingJobs(0);
-  
+
   /**
    * The printer is accepting jobs.
    */
   public static final PrinterIsAcceptingJobs ACCEPTING_JOBS =
     new PrinterIsAcceptingJobs(1);
 
-  private static final String[] stringTable = { "not-accepting-jobs", 
+  private static final String[] stringTable = { "not-accepting-jobs",
                                                 "accepting-jobs" };
-  
-  private static final PrinterIsAcceptingJobs[] enumValueTable = 
+
+  private static final PrinterIsAcceptingJobs[] enumValueTable =
     { NOT_ACCEPTING_JOBS, ACCEPTING_JOBS };
-  
+
   /**
    * Constructs a PrinterIsAcceptingJobs object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterIsAcceptingJobs(int value)
@@ -108,7 +108,7 @@ public final class PrinterIsAcceptingJobs extends EnumSyntax
   {
     return "printer-is-accepting-jobs";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterLocation.java b/libjava/classpath/javax/print/attribute/standard/PrinterLocation.java
index 7a446adcb99..934f1bdd33d 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterLocation.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterLocation.java
@@ -1,4 +1,4 @@
-/* PrinterLocation.java -- 
+/* PrinterLocation.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The PrinterLocation printing attribute provides the location 
+ * The PrinterLocation printing attribute provides the location
  * of a printer device. This may be a room and building name for example.
  * 
                        
  * IPP Compatibility: PrinterLocation is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterLocation extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterLocation extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterMakeAndModel.java b/libjava/classpath/javax/print/attribute/standard/PrinterMakeAndModel.java
index 77fd84b4a5b..a78fe147205 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterMakeAndModel.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterMakeAndModel.java
@@ -1,4 +1,4 @@
-/* PrinterMakeAndModel.java -- 
+/* PrinterMakeAndModel.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ import javax.print.attribute.TextSyntax;
  * 
                        
  * IPP Compatibility: PrinterMakeAndModel is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterMakeAndModel extends TextSyntax
@@ -77,7 +77,7 @@ public final class PrinterMakeAndModel extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java b/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java
index 55bc7406a0e..3bd3ee41c21 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterMessageFromOperator.java
@@ -1,4 +1,4 @@
-/* PrinterMessageFromOperator.java -- 
+/* PrinterMessageFromOperator.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,15 +45,15 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The PrinterMessageFromOperator printing attribute provides 
- * a message from an operator or a system administrator related to the 
+ * The PrinterMessageFromOperator printing attribute provides
+ * a message from an operator or a system administrator related to the
  * printer. This may include informations about the status of the printer
  * or expected downtimes, etc.
  * 
                        
- * IPP Compatibility: PrinterMessageFromOperator is an IPP 1.1 
+ * IPP Compatibility: PrinterMessageFromOperator is an IPP 1.1
  * attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterMessageFromOperator extends TextSyntax
@@ -80,7 +80,7 @@ public final class PrinterMessageFromOperator extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfo.java b/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfo.java
index de330fe0bfa..4af33c664e1 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfo.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfo.java
@@ -50,11 +50,11 @@ import javax.print.attribute.URISyntax;
  * 
                        
  * The URI may for example contain a reference to a HTML page with information.
  * The information is normally intended for end users.
- * 
                         
+ * 
                        
  * 
                        
  * IPP Compatibility: PrinterMoreInfo is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,7 +65,7 @@ public final class PrinterMoreInfo extends URISyntax
 
   /**
    * Constructs a PrinterMoreInfo object.
-   * 
+   *
    * @param uri the URI of the information.
    * @throws NullPointerException if the given uri is null.
    */
@@ -73,13 +73,13 @@ public final class PrinterMoreInfo extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java b/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
index 73a627eb308..a0425d3a779 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
@@ -45,20 +45,20 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
 /**
- * The PrinterMoreInfoManufacturer attribute provides a URI that 
+ * The PrinterMoreInfoManufacturer attribute provides a URI that
  * can be used to obtain more information about the printer device type and
  * its manufacturer.
  * 
                        
- * The URI may for example contain a reference to a website of the 
- * manufacturer, containing informations and links to the latest firmware, 
- * printer drivers, manual etc. The information is normally intended for 
+ * The URI may for example contain a reference to a website of the
+ * manufacturer, containing informations and links to the latest firmware,
+ * printer drivers, manual etc. The information is normally intended for
  * end users.
- * 
                         
+ * 
                        
  * 
                        
- * IPP Compatibility: PrinterMoreInfoManufacturer is an IPP 1.1 
+ * IPP Compatibility: PrinterMoreInfoManufacturer is an IPP 1.1
  * attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -69,7 +69,7 @@ public final class PrinterMoreInfoManufacturer extends URISyntax
 
   /**
    * Constructs a PrinterMoreInfoManufacturer object.
-   * 
+   *
    * @param uri the URI of the information..
    * @throws NullPointerException if the given uri is null.
    */
@@ -77,13 +77,13 @@ public final class PrinterMoreInfoManufacturer extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterName.java b/libjava/classpath/javax/print/attribute/standard/PrinterName.java
index b084c2c0fd4..854826c6701 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterName.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterName.java
@@ -1,4 +1,4 @@
-/* PrinterName.java -- 
+/* PrinterName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,14 +45,14 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The PrinterName printing attribute provides the name of a 
+ * The PrinterName printing attribute provides the name of a
  * print service. The name may but must not be related to parts of the
  * printer URI.
  * 
                        
  * IPP Compatibility: PrinterName is an IPP 1.1 attribute.
  * 
                        
  * @see javax.print.attribute.standard.PrinterURI
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PrinterName extends TextSyntax
@@ -79,7 +79,7 @@ public final class PrinterName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterResolution.java b/libjava/classpath/javax/print/attribute/standard/PrinterResolution.java
index 7b60a0cada4..acf3a63dc29 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterResolution.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterResolution.java
@@ -45,12 +45,12 @@ import javax.print.attribute.ResolutionSyntax;
 
 
 /**
- * The PrinterResolution printing attribute specifies a 
- * resolution supported by a print service or to be used by a print job. 
+ * The PrinterResolution printing attribute specifies a
+ * resolution supported by a print service or to be used by a print job.
  * 
                        
  * IPP Compatibility: PrinterResolution is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -74,20 +74,20 @@ public final class PrinterResolution extends ResolutionSyntax
   {
     super(crossFeedResolution, feedResolution, units);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
   {
     if(! (obj instanceof PrinterResolution))
       return false;
-    
+
     return super.equals(obj);
   }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterState.java b/libjava/classpath/javax/print/attribute/standard/PrinterState.java
index 4b85c01896f..7670e144c7b 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterState.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterState.java
@@ -49,13 +49,13 @@ import javax.print.attribute.PrintServiceAttribute;
  * The {@link javax.print.attribute.standard.PrinterStateReasons}
  * attribute provides further detailed information about
  * the given printer state. Detailed information about the printer
- * state and printer state reasons attributes can be found in the 
+ * state and printer state reasons attributes can be found in the
  * RFC 2911.
- * 
                         
+ * 
                        
  * 
                        
  * IPP Compatibility: PrinterState is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -68,35 +68,35 @@ public final class PrinterState extends EnumSyntax
    * The state is unknown currently.
    */
   public static final PrinterState UNKNOWN = new PrinterState(0);
-  
+
   /**
    * The printer device is in idle state. New jobs can start
    * processing without waiting.
    */
   public static final PrinterState IDLE = new PrinterState(3);
-  
+
   /**
    * The printer device is in processing state.
    */
   public static final PrinterState PROCESSING = new PrinterState(4);
-  
+
   /**
    * The printer device has stopped. No jobs can be processed and
    * normally manual intervention is needed.
    */
   public static final PrinterState STOPPED = new PrinterState(5);
 
-  private static final String[] stringTable = { "unknown", null, null, 
-                                                "idle", "processing", 
+  private static final String[] stringTable = { "unknown", null, null,
+                                                "idle", "processing",
                                                 "stopped" };
-  
+
   private static final PrinterState[] enumValueTable = { UNKNOWN, null, null,
-                                                         IDLE, PROCESSING, 
+                                                         IDLE, PROCESSING,
                                                          STOPPED };
-  
+
   /**
    * Constructs a PrinterState object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterState(int value)
@@ -123,7 +123,7 @@ public final class PrinterState extends EnumSyntax
   {
     return "printer-state";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java b/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
index 1abb7c6aa3e..c3838b26521 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
@@ -45,13 +45,13 @@ import javax.print.attribute.EnumSyntax;
  * The PrinterStateReason attribute provides additional
  * information about the current state of the printer device. Its always part
  * of the {@link javax.print.attribute.standard.PrinterStateReasons}
- * printing attribute. 
+ * printing attribute.
  * 
                        
- * IPP Compatibility: PrinterStateReason is not an IPP 1.1 
+ * IPP Compatibility: PrinterStateReason is not an IPP 1.1
  * attribute itself but used inside the PrinterStateReasons
  * attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -64,52 +64,52 @@ public class PrinterStateReason extends EnumSyntax
    * Any state other state not listed here.
    */
   public static final PrinterStateReason OTHER = new PrinterStateReason(0);
-  
+
   /**
    * A media tray has run out of media.
    */
   public static final PrinterStateReason MEDIA_NEEDED =
     new PrinterStateReason(1);
-  
+
   /**
    * A media jam occured in the printer device.
    */
   public static final PrinterStateReason MEDIA_JAM = new PrinterStateReason(2);
-  
+
   /**
    * Indicates that the printer has been paused by the pause printer
    * operation and is currently moving to the pause state.
    */
   public static final PrinterStateReason MOVING_TO_PAUSED =
     new PrinterStateReason(3);
-  
+
   /**
    * The printer device has be paused by the pause printer operation.
    */
   public static final PrinterStateReason PAUSED = new PrinterStateReason(4);
-  
+
   /**
    * The printer device has been shutdown or removed from service.
    */
   public static final PrinterStateReason SHUTDOWN = new PrinterStateReason(5);
-  
+
   /**
    * The printer object is connecting to the device. If a printer
-   * device is on the network the printer object may be unable to connect. 
+   * device is on the network the printer object may be unable to connect.
    */
   public static final PrinterStateReason CONNECTING_TO_DEVICE =
     new PrinterStateReason(6);
-  
+
   /**
-   * The connection to the device has timed out. 
+   * The connection to the device has timed out.
    */
   public static final PrinterStateReason TIMED_OUT = new PrinterStateReason(7);
-  
+
   /**
    * The printer object is stopping the printer device.
    */
   public static final PrinterStateReason STOPPING = new PrinterStateReason(8);
-  
+
   /**
    * The printer object has stopped partly. A printer object may control
    * several physical output devices (e.g. a printer class in CUPS) and
@@ -117,170 +117,170 @@ public class PrinterStateReason extends EnumSyntax
    */
   public static final PrinterStateReason STOPPED_PARTLY =
     new PrinterStateReason(9);
-  
+
   /**
    * The printer device is low on toner.
    */
   public static final PrinterStateReason TONER_LOW =
     new PrinterStateReason(10);
-  
+
   /**
    * The printer device is out of toner.
    */
   public static final PrinterStateReason TONER_EMPTY =
     new PrinterStateReason(11);
-  
+
   /**
    * The printers spool area is currently full. The printer is
    * currently not able to accept jobs.
    */
   public static final PrinterStateReason SPOOL_AREA_FULL =
     new PrinterStateReason(12);
-  
+
   /**
    * One or more covers of the printer device are open.
    */
   public static final PrinterStateReason COVER_OPEN =
     new PrinterStateReason(13);
-  
+
   /**
    * One or more interlocks of the printer device are open.
    */
   public static final PrinterStateReason INTERLOCK_OPEN =
     new PrinterStateReason(14);
-  
+
   /**
    * One or more doors of the printer device are open.
    */
   public static final PrinterStateReason DOOR_OPEN =
     new PrinterStateReason(15);
-  
+
   /**
    * One or more input trays are missing in the printer device.
    */
   public static final PrinterStateReason INPUT_TRAY_MISSING =
     new PrinterStateReason(16);
-  
+
   /**
    * The printer device is low on media.
    */
   public static final PrinterStateReason MEDIA_LOW =
     new PrinterStateReason(17);
-  
+
   /**
    * The printer device is out of media.
    */
   public static final PrinterStateReason MEDIA_EMPTY =
     new PrinterStateReason(18);
-  
+
   /**
    * One or more output trays are missing in the printer device.
    */
   public static final PrinterStateReason OUTPUT_TRAY_MISSING =
     new PrinterStateReason(19);
-  
+
   /**
    * One or more output areas of the printer device are almost full.
    */
   public static final PrinterStateReason OUTPUT_AREA_ALMOST_FULL =
     new PrinterStateReason(20);
-  
+
   /**
    * One or more output areas of the printer device are full.
    */
   public static final PrinterStateReason OUTPUT_AREA_FULL =
     new PrinterStateReason(21);
-  
+
   /**
    * The printer device is low on marker supply.
    */
   public static final PrinterStateReason MARKER_SUPPLY_LOW =
     new PrinterStateReason(22);
-  
+
   /**
    * The printer device is out of marker supply.
    */
   public static final PrinterStateReason MARKER_SUPPLY_EMPTY =
     new PrinterStateReason(23);
-  
+
   /**
    * The marker waste bin of the printer device is almost full.
    */
   public static final PrinterStateReason MARKER_WASTE_ALMOST_FULL =
     new PrinterStateReason(24);
-  
+
   /**
    * The marker waste bin of the printer device is full.
    */
   public static final PrinterStateReason MARKER_WASTE_FULL =
     new PrinterStateReason(25);
-  
+
   /**
    * The fuser of the printer device is over temperature.
    */
   public static final PrinterStateReason FUSER_OVER_TEMP =
     new PrinterStateReason(26);
-  
+
   /**
    * The fuser of the printer device is under the needed temperature.
    */
   public static final PrinterStateReason FUSER_UNDER_TEMP =
     new PrinterStateReason(27);
-  
+
   /**
    * The optical photo conductor is near its end of life (EOL).
    */
   public static final PrinterStateReason OPC_NEAR_EOL =
     new PrinterStateReason(28);
-  
+
   /**
    * The optical photo conductor has reached its end of life.
    */
   public static final PrinterStateReason OPC_LIFE_OVER =
     new PrinterStateReason(29);
-  
+
   /**
    * The printer device is low on developer.
    */
   public static final PrinterStateReason DEVELOPER_LOW =
     new PrinterStateReason(30);
-  
+
   /**
    * The printer device is out of developer.
    */
   public static final PrinterStateReason DEVELOPER_EMPTY =
     new PrinterStateReason(31);
-  
+
   /**
    * An interpreter resource (e.g. font) is unavailable.
    */
   public static final PrinterStateReason INTERPRETER_RESOURCE_UNAVAILABLE =
     new PrinterStateReason(32);
 
-  private static final String[] stringTable = 
-    { "other", "media-needed",  "media-jam", "moving-to-paused", "paused", 
-    "shutdown", "connecting-to-device", "timed-out", "stopping", 
-    "stopped-partly", "toner-low", "toner-empty", "spool-area-full", 
-    "cover-open", "interlock-open", "door-open", "input-tray-missing", 
+  private static final String[] stringTable =
+    { "other", "media-needed",  "media-jam", "moving-to-paused", "paused",
+    "shutdown", "connecting-to-device", "timed-out", "stopping",
+    "stopped-partly", "toner-low", "toner-empty", "spool-area-full",
+    "cover-open", "interlock-open", "door-open", "input-tray-missing",
     "media-low", "media-empty", "output-tray-missing", "output-area-almost-full",
-    "output-area-full", "marker-supply-low", "marker-supply-empty", 
-    "marker-waste-almost-full", "marker-waste-full", "fuser-over-temp", 
-    "fuser-under-temp", "opc-near-eol", "opc-life-over", "developer-low", 
+    "output-area-full", "marker-supply-low", "marker-supply-empty",
+    "marker-waste-almost-full", "marker-waste-full", "fuser-over-temp",
+    "fuser-under-temp", "opc-near-eol", "opc-life-over", "developer-low",
     "developer-empty", "interpreter-resource-unavailable" };
 
-  private static final PrinterStateReason[] enumValueTable = 
+  private static final PrinterStateReason[] enumValueTable =
     { OTHER, MEDIA_NEEDED, MEDIA_JAM, MOVING_TO_PAUSED, PAUSED, SHUTDOWN,
     CONNECTING_TO_DEVICE, TIMED_OUT, STOPPING, STOPPED_PARTLY, TONER_LOW,
     TONER_EMPTY, SPOOL_AREA_FULL, COVER_OPEN, INTERLOCK_OPEN, DOOR_OPEN,
     INPUT_TRAY_MISSING, MEDIA_LOW, MEDIA_EMPTY, OUTPUT_TRAY_MISSING,
     OUTPUT_AREA_ALMOST_FULL, OUTPUT_AREA_FULL, MARKER_SUPPLY_LOW,
     MARKER_SUPPLY_EMPTY, MARKER_WASTE_ALMOST_FULL, MARKER_WASTE_FULL,
-    FUSER_OVER_TEMP, FUSER_UNDER_TEMP, OPC_NEAR_EOL, OPC_LIFE_OVER, 
+    FUSER_OVER_TEMP, FUSER_UNDER_TEMP, OPC_NEAR_EOL, OPC_LIFE_OVER,
     DEVELOPER_LOW, DEVELOPER_EMPTY, INTERPRETER_RESOURCE_UNAVAILABLE };
 
   /**
    * Constructs a PrinterStateReason object.
-   * 
+   *
    * @param value the enum value.
    */
   protected PrinterStateReason(int value)
@@ -307,7 +307,7 @@ public class PrinterStateReason extends EnumSyntax
   {
     return "printer-state-reason";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java b/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
index 3e77e181e55..5a52b8a3027 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
@@ -49,15 +49,15 @@ import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The PrinterStateReasons attribute provides the set of 
- * additional informations available about the current state of the printer 
+ * The PrinterStateReasons attribute provides the set of
+ * additional informations available about the current state of the printer
  * device.
  * 
                        
  * The attribute is basically a map with PrinterStateReason
- * objects as keys associated with their severity level as 
- * Severity instances. The IPP keyword value can be 
+ * objects as keys associated with their severity level as
+ * Severity instances. The IPP keyword value can be
  * constructed as follows: 
                        
- * reason.toString() + '-' + severity.toString() 
+ * reason.toString() + '-' + severity.toString()
  * 
                        
  * 
                        
  * IPP Compatibility: PrinterStateReasons is an IPP 1.1 attribute.
@@ -65,7 +65,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * @see javax.print.attribute.standard.PrinterState
  * @see javax.print.attribute.standard.PrinterStateReason
  * @see javax.print.attribute.standard.Severity
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -77,7 +77,7 @@ public final class PrinterStateReasons
 
   /**
    * Constructs an empty PrinterStateReasons attribute.
-   */  
+   */
   public PrinterStateReasons()
   {
     super();
@@ -86,10 +86,10 @@ public final class PrinterStateReasons
   /**
    * Constructs an empty PrinterStateReasons attribute
    * with the given initial capacity and load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
    * @param loadFactor the load factor of the underlying HashMap.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity < 0
    * @throws IllegalArgumentException if initialCapacity or loadFactor < 0
    */
@@ -101,9 +101,9 @@ public final class PrinterStateReasons
   /**
    * Constructs an empty PrinterStateReasons attribute
    * with the given initial capacity and the default load factor.
-   * 
+   *
    * @param initialCapacity the intial capacity.
-   * 
+   *
    * @throws IllegalArgumentException if initialCapacity < 0
    */
   public PrinterStateReasons(int initialCapacity)
@@ -114,13 +114,13 @@ public final class PrinterStateReasons
   /**
    * Constructs a PrinterStateReasons attribute
    * with the given content of the map.
-   * 
-   * @param map the map for the initial values with the same 
+   *
+   * @param map the map for the initial values with the same
    * PrinterStateReason to Severity mappings.
-   * 
+   *
    * @throws NullPointerException if map or any key/value is null.
-   * @throws ClassCastException if values of map are not of type 
-   * PrinterStateReason and keys are not of type 
+   * @throws ClassCastException if values of map are not of type
+   * PrinterStateReason and keys are not of type
    * Severity.
    */
   public PrinterStateReasons(Map map)
@@ -135,7 +135,7 @@ public final class PrinterStateReasons
   /**
    * Constructs an unmodifiable view of the contained printer state reasons
    * associated with the given severity level.
-   * 
+   *
    * @param severity the severity level for the constructed set.
    * @return The set of printer state reasons.
    */
@@ -143,7 +143,7 @@ public final class PrinterStateReasons
   {
     if (severity == null)
       throw new NullPointerException("severity is null");
-    
+
     HashSet set = new HashSet();
     Iterator it = entrySet().iterator();
     while (it.hasNext())
@@ -152,35 +152,35 @@ public final class PrinterStateReasons
         if (entry.getValue().equals(severity))
           set.add(entry.getKey());
       }
-    
+
     return Collections.unmodifiableSet(set);
   }
-  
+
   /**
    * Puts the given reason object associated with the given severity object
    * into the set.
-   * 
+   *
    * @param reason the reason of type PrinterStateReason.
    * @param severity the severity of the reason of type Severity.
-   * 
-   * @return The previously associated severity of the reason or 
+   *
+   * @return The previously associated severity of the reason or
    * null if the reason object was not in the map before.
-   * 
+   *
    * @throws NullPointerException if any of the values is null.
-   * @throws ClassCastException if reason is not a 
-   * PrinterStateReason and severity is not a 
+   * @throws ClassCastException if reason is not a
+   * PrinterStateReason and severity is not a
    * Severity instance.
    */
   public Severity put(PrinterStateReason reason,Severity severity)
   {
     if (reason == null)
-      throw new NullPointerException("reason is null");    
+      throw new NullPointerException("reason is null");
     if (severity == null)
       throw new NullPointerException("severity is null");
-    
+
     return super.put(reason, severity);
-  }   
-  
+  }
+
   /**
    * Returns category of this class.
    *
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterURI.java b/libjava/classpath/javax/print/attribute/standard/PrinterURI.java
index 017e6b85a39..8127a490146 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterURI.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterURI.java
@@ -45,16 +45,16 @@ import javax.print.attribute.PrintServiceAttribute;
 import javax.print.attribute.URISyntax;
 
 /**
- * The PrinterURI attribute provides the URI of a printer. 
+ * The PrinterURI attribute provides the URI of a printer.
  * 
                        
- * The URI identifies the printer against all the other print services 
- * available. This attribute is used to direct a print service request 
+ * The URI identifies the printer against all the other print services
+ * available. This attribute is used to direct a print service request
  * to this specific printer.
- * 
                         
+ * 
                        
  * 
                        
  * IPP Compatibility: PrinterURI is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -65,7 +65,7 @@ public final class PrinterURI extends URISyntax
 
   /**
    * Constructs a PrinterURI object.
-   * 
+   *
    * @param uri the URI of the print service.
    * @throws NullPointerException if the given uri is null.
    */
@@ -73,13 +73,13 @@ public final class PrinterURI extends URISyntax
   {
     super(uri);
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/QueuedJobCount.java b/libjava/classpath/javax/print/attribute/standard/QueuedJobCount.java
index d024b3dcc97..90d4d4b1a5b 100644
--- a/libjava/classpath/javax/print/attribute/standard/QueuedJobCount.java
+++ b/libjava/classpath/javax/print/attribute/standard/QueuedJobCount.java
@@ -1,4 +1,4 @@
-/* QueuedJobCount.java -- 
+/* QueuedJobCount.java --
    Copyright (C) 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,22 +42,22 @@ import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
- * The QueuedJobCount printing attribute reports 
+ * The QueuedJobCount printing attribute reports
  * the number of jobs currently in the queue. These are jobs
  * that are in 'pending', 'processing', 'pending-held' or
- * 'processing-stopped' state. 
+ * 'processing-stopped' state.
  * 
                        
  * IPP Compatibility: QueuedJobCount is an IPP 1.1 attribute.
  * 
                        
  * @see javax.print.attribute.standard.JobState
- * 
+ *
  * @author Michael Koch
  */
 public final class QueuedJobCount extends IntegerSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = 7499723077864047742L;
-  
+
   /**
    * Creates a QueuedJobCount object.
    *
@@ -72,13 +72,13 @@ public final class QueuedJobCount extends IntegerSyntax
     if (value < 0)
       throw new IllegalArgumentException("value may not be less than 0");
   }
-  
+
   /**
    * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 9d2354bd6ba..2d47c77c342 100644
--- a/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -42,14 +42,14 @@ import javax.print.attribute.EnumSyntax;
 
 
 /**
- * The ReferenceUriSchemesSupported attribute provides 
+ * The ReferenceUriSchemesSupported attribute provides
  * the supported URI schemes (e.g. ftp) which are supported by the
  * printer service to be used as uri reference for document data.
  * 
                        
- * IPP Compatibility: ReferenceUriSchemesSupported is an IPP 1.1 
+ * IPP Compatibility: ReferenceUriSchemesSupported is an IPP 1.1
  * attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -63,59 +63,59 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    */
   public static final ReferenceUriSchemesSupported FTP =
     new ReferenceUriSchemesSupported(0);
-  
+
   /**
    * The hyper text transfer protocol (HTTP).
    */
   public static final ReferenceUriSchemesSupported HTTP =
     new ReferenceUriSchemesSupported(1);
-  
+
   /**
    * The secure hyper text transfer protocol (HTTPS).
    */
   public static final ReferenceUriSchemesSupported HTTPS =
     new ReferenceUriSchemesSupported(2);
-  
+
   /**
    * The gopher protocol.
    */
   public static final ReferenceUriSchemesSupported GOPHER =
     new ReferenceUriSchemesSupported(3);
-  
+
   /**
    * The USENET news - RFC 1738.
    */
   public static final ReferenceUriSchemesSupported NEWS =
     new ReferenceUriSchemesSupported(4);
-  
+
   /**
    * The network news transfer protocol (NNTP) - RFC 1738.
    */
   public static final ReferenceUriSchemesSupported NNTP =
     new ReferenceUriSchemesSupported(5);
-  
+
   /**
    * The wide area information server protocol (WAIS) - RFC 4156.
    */
   public static final ReferenceUriSchemesSupported WAIS =
     new ReferenceUriSchemesSupported(6);
-  
+
   /**
    * A filename specific to the host.
    */
   public static final ReferenceUriSchemesSupported FILE =
     new ReferenceUriSchemesSupported(7);
 
-  private static final String[] stringTable = { "ftp", "http", "https", 
-                                                "gopher", "news", "nntp", 
+  private static final String[] stringTable = { "ftp", "http", "https",
+                                                "gopher", "news", "nntp",
                                                 "wais", "file" };
 
-  private static final ReferenceUriSchemesSupported[] enumValueTable = 
+  private static final ReferenceUriSchemesSupported[] enumValueTable =
     { FTP, HTTP, HTTPS, GOPHER, NEWS, NNTP, WAIS, FILE };
 
   /**
    * Constructs a ReferenceUriSchemeSupported object.
-   * 
+   *
    * @param value the enum value.
    */
   protected ReferenceUriSchemesSupported(int value)
@@ -142,7 +142,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
   {
     return "reference-uri-schemes-supported";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/RequestingUserName.java b/libjava/classpath/javax/print/attribute/standard/RequestingUserName.java
index b7b85abbdaa..52a13a8c0c7 100644
--- a/libjava/classpath/javax/print/attribute/standard/RequestingUserName.java
+++ b/libjava/classpath/javax/print/attribute/standard/RequestingUserName.java
@@ -1,4 +1,4 @@
-/* RequestingUserName.java -- 
+/* RequestingUserName.java --
    Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,12 +45,12 @@ import javax.print.attribute.PrintRequestAttribute;
 import javax.print.attribute.TextSyntax;
 
 /**
- * The RequestingUserName attribute provides the name of 
+ * The RequestingUserName attribute provides the name of
  * the user which requests the printing of the given job.
  * 
                        
  * IPP Compatibility: RequestingUserName is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class RequestingUserName extends TextSyntax
@@ -77,7 +77,7 @@ public final class RequestingUserName extends TextSyntax
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, 
+   * @return true if both objects are equal,
    * false otherwise.
    */
   public boolean equals(Object obj)
diff --git a/libjava/classpath/javax/print/attribute/standard/Severity.java b/libjava/classpath/javax/print/attribute/standard/Severity.java
index 019c8c6fcbb..ee0e6a17ff5 100644
--- a/libjava/classpath/javax/print/attribute/standard/Severity.java
+++ b/libjava/classpath/javax/print/attribute/standard/Severity.java
@@ -45,16 +45,16 @@ import javax.print.attribute.EnumSyntax;
  * The Severity printing attribute specifies the severity
  * for a PrinterStateReason attribute.
  * 
                        
- * This attribute does not appear in the attribute set of a print service 
- * itself. Its used inside the PrinterStateReasons 
- * attribute which contains PrinterStateReason objects which 
+ * This attribute does not appear in the attribute set of a print service
+ * itself. Its used inside the PrinterStateReasons
+ * attribute which contains PrinterStateReason objects which
  * informs about the print service's status.
  * 
                        
  * 
                        
  * IPP Compatibility: Severity is not an IPP attribute on its own
  * but used in the PrinterStateReason attribute to indicate the severity.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -67,21 +67,21 @@ public final class Severity extends EnumSyntax
    * Indicates that the reason is a report.
    */
   public static final Severity REPORT = new Severity(0);
-  
+
   /**
    * Indicates that the reason is a warning.
    */
   public static final Severity WARNING = new Severity(1);
-  
+
   /**
    * Indicates that the reason is an error.
    */
   public static final Severity ERROR = new Severity(2);
 
   private static final String[] stringTable = { "report", "warning", "error" };
-  
+
   private static final Severity[] enumValueTable = { REPORT, WARNING, ERROR };
-  
+
   /**
    * Constructs a Severity object.
    *
@@ -111,7 +111,7 @@ public final class Severity extends EnumSyntax
   {
     return "severity";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/SheetCollate.java b/libjava/classpath/javax/print/attribute/standard/SheetCollate.java
index 886b8d6c921..008a6e8452f 100644
--- a/libjava/classpath/javax/print/attribute/standard/SheetCollate.java
+++ b/libjava/classpath/javax/print/attribute/standard/SheetCollate.java
@@ -45,7 +45,7 @@ import javax.print.attribute.PrintRequestAttribute;
 
 
 /**
- * The SheetCollate printing attribute specifies 
+ * The SheetCollate printing attribute specifies
  * whether or not the sheets of each copy in a print job have to be
  * in sequence.
  * 
                        
@@ -58,7 +58,7 @@ import javax.print.attribute.PrintRequestAttribute;
  * 
                        
  * IPP Compatibility: SheetCollate is not an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -71,7 +71,7 @@ public final class SheetCollate extends EnumSyntax
    * The sheets of the different copies are uncollated.
    */
   public static final SheetCollate UNCOLLATED = new SheetCollate(0);
-  
+
   /**
    * The sheets of the different copies are collated.
    */
@@ -79,10 +79,10 @@ public final class SheetCollate extends EnumSyntax
 
 
   private static final String[] stringTable = { "uncollated", "collated" };
-  
-  private static final SheetCollate[] enumValueTable = { UNCOLLATED, 
-                                                         COLLATED };  
-  
+
+  private static final SheetCollate[] enumValueTable = { UNCOLLATED,
+                                                         COLLATED };
+
   /**
    * Creates a SheetCollate object.
    *
@@ -112,7 +112,7 @@ public final class SheetCollate extends EnumSyntax
   {
     return "sheet-collate";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/attribute/standard/Sides.java b/libjava/classpath/javax/print/attribute/standard/Sides.java
index 02fe4a1e5d1..ca2a60fc748 100644
--- a/libjava/classpath/javax/print/attribute/standard/Sides.java
+++ b/libjava/classpath/javax/print/attribute/standard/Sides.java
@@ -46,11 +46,11 @@ import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * The Sides printing attribute specifies how consecutive
- * printing pages are arranged on the media sheet. 
+ * printing pages are arranged on the media sheet.
  * 
                        
  * IPP Compatibility: Sides is an IPP 1.1 attribute.
  * 
                        
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
@@ -59,41 +59,41 @@ public final class Sides extends EnumSyntax
 {
   private static final long serialVersionUID = -6890309414893262822L;
 
-  /** 
-   * Specifies that each page should be printed on one sheet. 
+  /**
+   * Specifies that each page should be printed on one sheet.
    */
   public static final Sides ONE_SIDED = new Sides(0);
-  
-  /** 
-   * Specifies that two following pages should be printed on the 
+
+  /**
+   * Specifies that two following pages should be printed on the
    * front and back of one sheet for binding on the long edge.
    */
   public static final Sides TWO_SIDED_LONG_EDGE = new Sides(1);
-  
-  /** 
-   * Specifies that two following pages should be printed on the 
+
+  /**
+   * Specifies that two following pages should be printed on the
    * front and back of one sheet for binding on the short edge.
    */
   public static final Sides TWO_SIDED_SHORT_EDGE = new Sides(2);
-  
-  /** 
-   * An alias constant for "two sided long edge". 
+
+  /**
+   * An alias constant for "two sided long edge".
    */
   public static final Sides DUPLEX = new Sides(1);
-  
-  /** 
-   * An alias constant for "two sided short edge". 
+
+  /**
+   * An alias constant for "two sided short edge".
    */
   public static final Sides TUMBLE = new Sides(2);
 
-  private static final String[] stringTable = { "one-sided", 
+  private static final String[] stringTable = { "one-sided",
                                                 "two-sided-long-edge",
                                                 "two-sided-short-edge" };
-  
-  private static final Sides[] enumValueTable = { ONE_SIDED, 
-                                                  TWO_SIDED_LONG_EDGE, 
-                                                  TWO_SIDED_SHORT_EDGE };  
-  
+
+  private static final Sides[] enumValueTable = { ONE_SIDED,
+                                                  TWO_SIDED_LONG_EDGE,
+                                                  TWO_SIDED_SHORT_EDGE };
+
   /**
    * Creates a Sides object.
    *
@@ -123,7 +123,7 @@ public final class Sides extends EnumSyntax
   {
     return "sides";
   }
-  
+
   /**
    * Returns a table with the enumeration values represented as strings
    * for this object.
diff --git a/libjava/classpath/javax/print/event/PrintEvent.java b/libjava/classpath/javax/print/event/PrintEvent.java
index d44c2066818..4eaedceb6fc 100644
--- a/libjava/classpath/javax/print/event/PrintEvent.java
+++ b/libjava/classpath/javax/print/event/PrintEvent.java
@@ -1,4 +1,4 @@
-/* PrintEvent.java -- 
+/* PrintEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,14 +42,14 @@ import java.util.EventObject;
 
 /**
  * Superclass of all events in the Java Print Service API.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintEvent extends EventObject
 {
   /**
    * Constructs a PrintEvent object.
-   * 
+   *
    * @param source the source of this event
    */
   public PrintEvent(Object source)
@@ -59,7 +59,7 @@ public class PrintEvent extends EventObject
 
   /**
    * Returns a string representation of this object.
-   * 
+   *
    * @return The string representation
    */
   public String toString()
diff --git a/libjava/classpath/javax/print/event/PrintJobAdapter.java b/libjava/classpath/javax/print/event/PrintJobAdapter.java
index 9229d195fe4..e8e71008eea 100644
--- a/libjava/classpath/javax/print/event/PrintJobAdapter.java
+++ b/libjava/classpath/javax/print/event/PrintJobAdapter.java
@@ -1,4 +1,4 @@
-/* PrintJobAdapter.java -- 
+/* PrintJobAdapter.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,7 +43,7 @@ package javax.print.event;
  * classes. The methods in this class do nothing by default. Subclasses may
  * only implement the methods for the {@link javax.print.event.PrintJobEvent}s
  * they are interested in.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public abstract class PrintJobAdapter
@@ -56,13 +56,13 @@ public abstract class PrintJobAdapter
   {
     // Do nothing here.
   }
-  
+
   /**
    * Called to notify the client that all data has been successfully transferred
    * to the print service.
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printDataTransferCompleted(PrintJobEvent event)
   {
@@ -70,10 +70,10 @@ public abstract class PrintJobAdapter
   }
 
   /**
-   * Called to notify the client that a print job was canceled. 
+   * Called to notify the client that a print job was canceled.
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobCanceled(PrintJobEvent event)
   {
@@ -83,8 +83,8 @@ public abstract class PrintJobAdapter
   /**
    * Called to notify the client that a print job was successfully completed.
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobCompleted(PrintJobEvent event)
   {
@@ -95,8 +95,8 @@ public abstract class PrintJobAdapter
    * Called to notify the client that a print job failed to complete
    * successfully.
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobFailed(PrintJobEvent event)
   {
@@ -106,8 +106,8 @@ public abstract class PrintJobAdapter
   /**
    * Called to notify the client that no more job events will be send.
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobNoMoreEvents(PrintJobEvent event)
   {
@@ -116,11 +116,11 @@ public abstract class PrintJobAdapter
 
   /**
    * Called to notify the client that a problem occured during printing.
-   * This event signals problems a user might be able to fix 
+   * This event signals problems a user might be able to fix
    * (e.g. out of paper or paper jam).
    * 
                        The default implementation does nothing.
                        
-   * 
-   * @param event the event. 
+   *
+   * @param event the event.
    */
   public void printJobRequiresAttention(PrintJobEvent event)
   {
diff --git a/libjava/classpath/javax/print/event/PrintJobAttributeEvent.java b/libjava/classpath/javax/print/event/PrintJobAttributeEvent.java
index d401ab15152..dd242e8e6aa 100644
--- a/libjava/classpath/javax/print/event/PrintJobAttributeEvent.java
+++ b/libjava/classpath/javax/print/event/PrintJobAttributeEvent.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeEvent.java -- 
+/* PrintJobAttributeEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,21 +42,21 @@ import javax.print.attribute.PrintJobAttributeSet;
 
 
 /**
- * PrintJobAttributeEvents are generated by a 
+ * PrintJobAttributeEvents are generated by a
  * PrintService to inform registered listeners that attributes
  * associated with a {@link javax.print.DocPrintJob} instance have changed.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintJobAttributeEvent extends PrintEvent
 {
   private static final long serialVersionUID = -6534469883874742101L;
-  
+
   private PrintJobAttributeSet attributes;
-  
+
   /**
    * Constructs a PrintJobAttributeEvent object.
-   * 
+   *
    * @param source the source of this event
    * @param attributes the attribute changes being reported
    */
@@ -69,7 +69,7 @@ public class PrintJobAttributeEvent extends PrintEvent
 
   /**
    * Returns the print job generating this event.
-   * 
+   *
    * @return The print job.
    */
   public DocPrintJob getPrintJob()
@@ -79,7 +79,7 @@ public class PrintJobAttributeEvent extends PrintEvent
 
   /**
    * Returns the attributes that changed and their new values.
-   * 
+   *
    * @return The changed attributes.
    */
   public PrintJobAttributeSet getAttributes()
diff --git a/libjava/classpath/javax/print/event/PrintJobAttributeListener.java b/libjava/classpath/javax/print/event/PrintJobAttributeListener.java
index 9f96d267e9c..bd2ea2695cc 100644
--- a/libjava/classpath/javax/print/event/PrintJobAttributeListener.java
+++ b/libjava/classpath/javax/print/event/PrintJobAttributeListener.java
@@ -1,4 +1,4 @@
-/* PrintJobAttributeListener.java -- 
+/* PrintJobAttributeListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,16 +40,16 @@ package javax.print.event;
 
 /**
  * Listener interface to receive attribute changes from a print job.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.DocPrintJob} instance.
- *  
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobAttributeListener
 {
   /**
    * Notifies the listener of an attribute change.
-   * 
+   *
    * @param event the event
    */
   void attributeUpdate(PrintJobAttributeEvent event);
diff --git a/libjava/classpath/javax/print/event/PrintJobEvent.java b/libjava/classpath/javax/print/event/PrintJobEvent.java
index cc15f97535b..db885648c59 100644
--- a/libjava/classpath/javax/print/event/PrintJobEvent.java
+++ b/libjava/classpath/javax/print/event/PrintJobEvent.java
@@ -1,4 +1,4 @@
-/* PrintEvent.java -- 
+/* PrintEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,40 +44,40 @@ import javax.print.DocPrintJob;
  * PrintJobEvents are generated by a print job during
  * print job processing to inform registered listeners about the state
  * of processing.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintJobEvent extends PrintEvent
 {
   private static final long serialVersionUID = -1711656903622072997L;
-  
+
   /** Indicates that the data transfer to the print service has completed. */
   public static final int DATA_TRANSFER_COMPLETE = 106;
-  
+
   /** Indicates that the print job was canceled. */
   public static final int JOB_CANCELED = 101;
-  
+
   /** Indicates that the print job was completed (=printed). */
   public static final int JOB_COMPLETE = 102;
-  
+
   /** Indicates that the print job failed to complete. */
   public static final int JOB_FAILED = 103;
-  
+
   /** Indicates that no more job events will be send.*/
   public static final int NO_MORE_EVENTS = 105;
-  
-  /** 
+
+  /**
    * Indicates a situation where human intervention might be needed.
    * E.g. the printer run out of paper or a paper jam occured.
    */
   public static final int REQUIRES_ATTENTION = 104;
-  
+
   /** The reason (one of the defined constants). */
   private int reason;
-  
+
   /**
    * Constructs a PrintJobEvent object.
-   * 
+   *
    * @param source the source generating this event
    * @param reason the reason for this event
    */
@@ -89,7 +89,7 @@ public class PrintJobEvent extends PrintEvent
 
   /**
    * Returns the reason for this event.
-   * 
+   *
    * @return The reason.
    */
   public int getPrintEventType()
@@ -99,9 +99,9 @@ public class PrintJobEvent extends PrintEvent
 
   /**
    * Returns the print job that generated this event.
-   * 
+   *
    * @return The print job.
-   */ 
+   */
   public DocPrintJob getPrintJob()
   {
     return (DocPrintJob) getSource();
diff --git a/libjava/classpath/javax/print/event/PrintJobListener.java b/libjava/classpath/javax/print/event/PrintJobListener.java
index 96c6d411d54..8ac1a014371 100644
--- a/libjava/classpath/javax/print/event/PrintJobListener.java
+++ b/libjava/classpath/javax/print/event/PrintJobListener.java
@@ -1,4 +1,4 @@
-/* PrintJobListener.java -- 
+/* PrintJobListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,56 +40,56 @@ package javax.print.event;
 
 /**
  * Listener interface to receive processing events from a print job.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.DocPrintJob} instance.
- * 
+ *
  * @see javax.print.event.PrintJobAdapter
- *  
- * @author Michael Koch (konqueror@gmx.de) 
+ *
+ * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintJobListener
 {
   /**
    * Notifies the listener that all data has been successfully transferred
    * to the print service.
-   * 
+   *
    * @param event the event
    */
   void printDataTransferCompleted(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job got canceled.
-   * 
+   *
    * @param event the event
    */
   void printJobCanceled(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job has completed.
-   * 
+   *
    * @param event the event
    */
   void printJobCompleted(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a print job has failed to complete.
-   * 
+   *
    * @param event the event.
    */
   void printJobFailed(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that no more events will be delivered.
-   * 
+   *
    * @param event the event
    */
   void printJobNoMoreEvents(PrintJobEvent event);
-  
+
   /**
    * Notifies the listener that a problem occured during printing.
-   * This event signals problems a user might be able to fix 
+   * This event signals problems a user might be able to fix
    * (e.g. out of paper or paper jam).
-   * 
+   *
    * @param event the event
    */
   void printJobRequiresAttention(PrintJobEvent event);
diff --git a/libjava/classpath/javax/print/event/PrintServiceAttributeEvent.java b/libjava/classpath/javax/print/event/PrintServiceAttributeEvent.java
index a41e213ff7b..665db52bfa3 100644
--- a/libjava/classpath/javax/print/event/PrintServiceAttributeEvent.java
+++ b/libjava/classpath/javax/print/event/PrintServiceAttributeEvent.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeEvent.java -- 
+/* PrintServiceAttributeEvent.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,19 +42,19 @@ import javax.print.attribute.PrintServiceAttributeSet;
 
 
 /**
- * PrintServiceAttributeEvents are generated by a 
+ * PrintServiceAttributeEvents are generated by a
  * PrintService to inform registered listeners that
  * its associated attributes have changed.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public class PrintServiceAttributeEvent extends PrintEvent
 {
   private PrintServiceAttributeSet attributes;
-  
+
   /**
    * Constructs a PrintServiceAttributeEvent object.
-   * 
+   *
    * @param source the source of this event
    * @param attributes the attribute changes being reported
    */
@@ -67,7 +67,7 @@ public class PrintServiceAttributeEvent extends PrintEvent
 
   /**
    * Returns the print service that generated this event.
-   * 
+   *
    * @return The print service.
    */
   public PrintService getPrintService()
@@ -77,7 +77,7 @@ public class PrintServiceAttributeEvent extends PrintEvent
 
   /**
    * Returns the changed attributes this event reports.
-   * 
+   *
    * @return The changed attributes.
    */
   public PrintServiceAttributeSet getAttributes()
diff --git a/libjava/classpath/javax/print/event/PrintServiceAttributeListener.java b/libjava/classpath/javax/print/event/PrintServiceAttributeListener.java
index b46bf3b69d7..596d1675ed6 100644
--- a/libjava/classpath/javax/print/event/PrintServiceAttributeListener.java
+++ b/libjava/classpath/javax/print/event/PrintServiceAttributeListener.java
@@ -1,4 +1,4 @@
-/* PrintServiceAttributeListener.java -- 
+/* PrintServiceAttributeListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,16 +40,16 @@ package javax.print.event;
 
 /**
  * Listener interface to receive attribute changes from a print service.
- * Implementations of this interface can be registered with a 
+ * Implementations of this interface can be registered with a
  * {@link javax.print.PrintService} instance.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  */
 public interface PrintServiceAttributeListener
 {
   /**
    * Notifies the listener that some attributes have changed.
-   * 
+   *
    * @param event the event
    */
   void attributeUpdate(PrintServiceAttributeEvent event);
diff --git a/libjava/classpath/javax/rmi/CORBA/ClassDesc.java b/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
index c8b38ead095..831cdbe48a3 100644
--- a/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
+++ b/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
@@ -49,8 +49,8 @@ import java.io.Serializable;
  */
 public class ClassDesc implements Serializable
 {
-  /** 
-   * Use serialVersionUID (V1.4) for interoperability. 
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
    */
   private static final long serialVersionUID = -3477057297839810709L;
 
@@ -58,7 +58,7 @@ public class ClassDesc implements Serializable
    * The class repository Id.
    */
   String repid;
-  
+
   /**
    * Space separeted list of URL's from where the code can be downloaded.
    */
diff --git a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
index f376bedfe80..b8f1d06dafe 100644
--- a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
@@ -45,11 +45,11 @@ import java.rmi.RemoteException;
 /**
  * A delegate, implementing the functionality, provided by the
  * {@link PortableRemoteObject}.
- * 
+ *
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.PortableRemoteObjectClass" to the name of the alternative
  * class that must implement {@link PortableRemoteObjectDelegate}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface PortableRemoteObjectDelegate
@@ -66,12 +66,12 @@ public interface PortableRemoteObjectDelegate
    * {@link Stub#connect} if it is a stub or by associating its tie with an ORB
    * if it is an implementation object.
    * 
                        
-   * 
+   *
    * @param target the target object that may be either an RMI/IDL stub or an
    * exported RMI/IDL implementation object
    * @param source the source object may also be either an RMI/IDL stub or an
    * exported RMI/IDL implementation object.
-   * 
+   *
    * @throws RemoteException if the target is already connected to another ORB.
    */
   void connect(Remote target, Remote source)
@@ -83,9 +83,9 @@ public interface PortableRemoteObjectDelegate
    * non-daemon thread that prevents jre from terminating until all objects are
    * unexported. Also, such object cannot be collected by garbage collector.
    * This is usually impemented via {@link Util#unexportObject}
-   * 
+   *
    * @param obj the object to export.
-   * 
+   *
    * @throws RemoteException
    */
   void exportObject(Remote obj)
@@ -95,13 +95,13 @@ public interface PortableRemoteObjectDelegate
    * Narrows the passed object to conform to the given interface or IDL type.
    * This method may return different instance and cannot be replaced by the
    * direct cast.
-   * 
+   *
    * @param narrowFrom an object to narrow.
    * @param narrowTo a type to that the object must be narrowed.
-   * 
+   *
    * @return On success, an object of type narrowTo or null, if narrowFrom =
    * null.
-   * 
+   *
    * @throws ClassCastException if no narrowing is possible.
    */
   Object narrow(Object narrowFrom, Class narrowTo)
@@ -112,10 +112,10 @@ public interface PortableRemoteObjectDelegate
    * used to access that server object (target). If the target is connected, the
    * returned stub is also connected to the same ORB. If the target is
    * unconnected, the returned stub is unconnected.
-   * 
+   *
    * @param obj a server side object.
    * @return a stub object that can be used to access that server object.
-   * 
+   *
    * @throws NoSuchObjectException if a stub cannot be located for the given
    * target.
    */
@@ -126,9 +126,9 @@ public interface PortableRemoteObjectDelegate
    * Deregister a currently exported server object from the ORB runtimes. The
    * object to becomes available for garbage collection. This is usually
    * impemented via {@link Util#unexportObject}
-   * 
+   *
    * @param obj the object to unexport.
-   * 
+   *
    * @throws NoSuchObjectException if the passed object is not currently
    * exported.
    */
diff --git a/libjava/classpath/javax/rmi/CORBA/Stub.java b/libjava/classpath/javax/rmi/CORBA/Stub.java
index 190b10dad57..d9b45f77b3d 100644
--- a/libjava/classpath/javax/rmi/CORBA/Stub.java
+++ b/libjava/classpath/javax/rmi/CORBA/Stub.java
@@ -60,10 +60,10 @@ import org.omg.CORBA_2_3.portable.ObjectImpl;
  * "javax.rmi.CORBA.StubClass" to the name of the alternative class that must
  * implement {@link StubDelegate}. Hence Stub contains two delegates, one for
  * Stub-related operations and another inherited from the ObjectImpl.
- * 
+ *
  * @specnote GNU Classpath uses separate delegate per each Stub. The delegate
  * holds information about the ORB and other data, specific for the each Stub.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class Stub
@@ -118,7 +118,7 @@ public abstract class Stub
 
   /**
    * Get the string representation of this Stub.
-   * 
+   *
    * @return the CORBA IOR reference.
    */
   public String toString()
@@ -149,13 +149,13 @@ public abstract class Stub
    * It is frequently easier to call {@link PortableRemoteObject#connect} rather
    * than this method.
    * 
                        
-   * 
+   *
    * @param orb the ORB where the Stub must be connected.
-   * 
+   *
    * @throws RemoteException if the stub is already connected to some other ORB.
    * If the stub is already connected to the ORB that was passed as parameter,
    * the method returns without action.
-   * 
+   *
    * @throws BAD_PARAM if the name of this stub does not match the stub name
    * pattern, "_*_Stub" or if the Tie class, "_*Impl_Tie", does not exists or an
    * instance of this class cannot be instantiated.
@@ -200,4 +200,4 @@ public abstract class Stub
 
       delegate.writeObject(this, output);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/StubDelegate.java b/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
index cdf76e841c3..a191eb446bd 100644
--- a/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
@@ -51,7 +51,7 @@ import java.rmi.RemoteException;
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.StubClass" to the name of the alternative class that must
  * implement StubDelegate.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface StubDelegate
@@ -64,9 +64,9 @@ public interface StubDelegate
    * It is frequently easier to call {@link PortableRemoteObject#connect} rather
    * than this method.
    * 
                        
-   * 
+   *
    * @param orb the ORB where the Stub must be connected.
-   * 
+   *
    * @throws RemoteException if the stub is already connected to some other ORB.
    * If the stub is already connected to the ORB that was passed as parameter,
    * the method returns without action.
@@ -100,4 +100,4 @@ public interface StubDelegate
    * Get the string representation of this stub.
    */
   String toString(Stub self);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/Tie.java b/libjava/classpath/javax/rmi/CORBA/Tie.java
index af9ddd3d44a..90a82511e5c 100644
--- a/libjava/classpath/javax/rmi/CORBA/Tie.java
+++ b/libjava/classpath/javax/rmi/CORBA/Tie.java
@@ -61,7 +61,7 @@ import org.omg.CORBA.portable.InvokeHandler;
  * rmic compiler using -poa key. Ties can be also
  * derived from {@link org.omg.CORBA_2_3.portable.ObjectImpl}.
  * 
                        
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface Tie
@@ -69,7 +69,7 @@ public interface Tie
 {
   /**
    * Get the invocation target, where all method calls should be delegated.
-   * 
+   *
    * @return the object, implementing methods, defined in the interface being
    * served by this Tie.
    */
@@ -77,12 +77,12 @@ public interface Tie
 
   /**
    * Set the invocation target, where all method calls should be delegated.
-   * 
+   *
    * @param target the object, implementing methods, defined in the interface
    * being served by this Tie. The code, produced by a typical rmic compiler
    * usually requires the target to be an instance of the implementation from
    * that the Tie was generated.
-   * 
+   *
    * @throws ClassCastException if the passed parameter is not an instance of
    * the implementation from that the Tie was generated.
    */
@@ -90,7 +90,7 @@ public interface Tie
 
   /**
    * Get the ORB to that this Tie is connected.
-   * 
+   *
    * @see org.omg.PortableServer.Servant#_orb
    */
   ORB orb();
@@ -102,7 +102,7 @@ public interface Tie
 
   /**
    * Get the object that delegates calls to this tie.
-   * 
+   *
    * @see org.omg.PortableServer.Servant#_this_object()
    */
   org.omg.CORBA.Object thisObject();
@@ -113,13 +113,13 @@ public interface Tie
    * again. The ties that are not derived from
    * {@link org.omg.PortableServer.Servant} deactivate themselves by
    * {@link ORB#disconnect}.
-   * 
+   *
    * @throws NoSuchObjectException if there are no objects served by this Tie,
    * or if the these objects are already deactivated.
-   * 
+   *
    * @see org.omg.PortableServer.POAOperations#deactivate_object
    */
   void deactivate()
     throws NoSuchObjectException;
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/Util.java b/libjava/classpath/javax/rmi/CORBA/Util.java
index 04b6f63a6fb..9c6df60a860 100644
--- a/libjava/classpath/javax/rmi/CORBA/Util.java
+++ b/libjava/classpath/javax/rmi/CORBA/Util.java
@@ -77,7 +77,7 @@ import javax.transaction.TransactionRolledbackException;
  * The functionality is forwarded to the enclosed UtilDelegate. This delegate
  * can be altered by setting the system property "javax.rmi.CORBA.UtilClass" to
  * the name of the alternative class that must implement {@link UtilDelegate}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class Util
@@ -119,7 +119,7 @@ public class Util
   /**
    * Get the value handler that Serializes Java objects to and from CDR (GIOP)
    * streams.
-   * 
+   *
    * When using the default Util implementation, the class of the returned
    * handler can be altered by setting by setting the system property
    * "javax.rmi.CORBA.ValueHandlerClass" to the name of the alternative class
@@ -143,7 +143,7 @@ public class Util
    * pair has not been previously registered using {@link #registerTarget},
    * this method tries to locate a tie class by the name pattern. If this
    * succeeds, the tie-target pair is also registered.
-   * 
+   *
    * @return the Tie.
    */
   public static Tie getTie(Remote target)
@@ -154,10 +154,10 @@ public class Util
   /**
    * Checks if the given stub is local. The implementation it delegates call to
    * {@link ObjectImpl#_is_local().
-   * 
+   *
    * @param stub a stub to check.
    * @return true if the stub is local, false otherwise.
-   * 
+   *
    * @throws RemoteException if the {@link ObjectImpl#_is_local()} throws a
    * {@link org.omg.CORBA.SystemException}.
    */
@@ -171,7 +171,7 @@ public class Util
    * Load the class. The method uses class loaders from the call stact first. If
    * this fails, the further behaviour depends on the System Property
    * "java.rmi.server.useCodebaseOnly" with default value "false".
-   * 
+   *
    * 
                          
    * 
                        • If remoteCodebase is non-null and useCodebaseOnly is "false" then call
    * java.rmi.server.RMIClassLoader.loadClass (remoteCodebase, className)
                          • 
@@ -180,12 +180,12 @@ public class Util
    * 
                        • If a class is still not successfully loaded and the loader != null
    * then try Class.forName(className, false, loader). 
                          • 
    * 
                        
-   * 
+   *
    * @param className the name of the class.
    * @param remoteCodebase the codebase.
    * @param loader the class loader.
    * @return the loaded class.
-   * 
+   *
    * @throws ClassNotFoundException of the class cannot be loaded.
    */
   public static Class loadClass(String className, String remoteCodebase,
@@ -331,14 +331,14 @@ public class Util
    * {@link UnexpectedException}
    * 
    * 
-   * 
+   *
    * @param exception an exception that was thrown on a server side implementation.
-   * 
+   *
    * @return the corresponding RemoteException unless it is a RuntimeException.
-   * 
+   *
    * @throws RuntimeException the passed exception if it is an instance of
    * RuntimeException.
-   * 
+   *
    * @specnote It is the same behavior, as in Suns implementations 1.4.0-1.5.0.
    */
   public static RemoteException wrapException(Throwable exception)
@@ -354,10 +354,10 @@ public class Util
    * {@link #writeRemoteObject}. The written data contains discriminator,
    * defining, that was written. Another method that writes the same content is
    * {@link org.omg.CORBA_2_3.portable.OutputStream#write_abstract_interface(java.lang.Object)}.
-   * 
+   *
    * @param output a stream to write to, must be
    * {@link org.omg.CORBA_2_3.portable.OutputStream}.
-   * 
+   *
    * @param object an object to write, must be CORBA object, Remote
    */
   public static void writeAbstractObject(OutputStream output,
@@ -375,7 +375,7 @@ public class Util
    * method writes CORBA object, value type or value box. For value types Null
    * is written with the abstract interface, its typecode having repository id
    * "IDL:omg.org/CORBA/AbstractBase:1.0" and the empty string name.
-   * 
+   *
    * @param output the object to write.
    * @param object the java object that must be written in the form of the CORBA
    * {@link Any}.
@@ -384,9 +384,9 @@ public class Util
   {
     delegate.writeAny(output, object);
   }
-  
+
   /**
-   * Read Any from the input stream. 
+   * Read Any from the input stream.
    */
   public static java.lang.Object readAny(InputStream input)
   {
@@ -403,7 +403,7 @@ public class Util
    * used in write_value(..) method group in
    * {@link org.omg.CORBA_2_3.portable.OutputStream} and also may be called
    * directly from generated Stubs and Ties.
-   * 
+   *
    * @param output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param object an object to write.
@@ -413,4 +413,4 @@ public class Util
   {
     delegate.writeRemoteObject(output, object);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
index 79d740e7b0a..2454f534814 100644
--- a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
@@ -71,11 +71,11 @@ import javax.transaction.TransactionRolledbackException;
 
 /**
  * A delegate, implementing the functionality, provided by the {@link Util}.
- * 
+ *
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.UtilClass" to the name of the alternative class that must
  * implement this interface.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface UtilDelegate
@@ -195,7 +195,7 @@ public interface UtilDelegate
   /**
    * Get the Tie that handles invocations on the given target. The target/Tie
    * pair must be previously registered using {@link #registerTarget}.
-   * 
+   *
    * @return the Tie, or null if no such is known.
    */
   Tie getTie(Remote target);
@@ -242,14 +242,14 @@ public interface UtilDelegate
    * {@link UnexpectedException}
    * 
    * 
-   * 
+   *
    * @param e an exception that was thrown on a server side implementation.
-   * 
+   *
    * @return the corresponding RemoteException unless it is a RuntimeException.
-   * 
+   *
    * @throws RuntimeException the passed exception if it is an instance of
    * RuntimeException.
-   * 
+   *
    * @specnote It is the same behavior, as in Suns implementations 1.4.0-1.5.0.
    */
   RemoteException wrapException(Throwable orig);
@@ -263,7 +263,7 @@ public interface UtilDelegate
    * possible. This method is used in write_value(..) method group in
    * {@link org.omg.CORBA_2_3.portable.OutputStream} and also may be called
    * directly from generated Stubs and Ties.
-   * 
+   *
    * @param output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param obj an object to write.
@@ -278,10 +278,10 @@ public interface UtilDelegate
    * {@link #writeRemoteObject}. The written data contains discriminator,
    * defining, that was written. Another method that writes the same content is
    * {@link org.omg.CORBA_2_3.portable.OutputStream#write_abstract_interface(java.lang.Object)}.
-   * 
+   *
    * @param output a stream to write to, must be
    * {@link org.omg.CORBA_2_3.portable.OutputStream}.
-   * 
+   *
    * @param object an object to write, must be CORBA object, Remote
    */
   void writeAbstractObject(OutputStream output, Object object);
@@ -295,7 +295,7 @@ public interface UtilDelegate
    * method writes CORBA object, value type or value box. For value types Null
    * is written with the abstract interface, its typecode having repository id
    * "IDL:omg.org/CORBA/AbstractBase:1.0" and the empty string name.
-   * 
+   *
    * @param output the object to write.
    * @param object the java object that must be written in the form of the CORBA
    * {@link Any}.
@@ -303,8 +303,8 @@ public interface UtilDelegate
   void writeAny(OutputStream output, Object object);
 
   /**
-   * Read Any from the input stream. 
+   * Read Any from the input stream.
    */
   Object readAny(InputStream input);
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
index acc44aa2f4a..cc855b80826 100644
--- a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
+++ b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
@@ -51,32 +51,32 @@ import org.omg.SendingContext.RunTime;
  * of the value handler is returned by {@link Util#createValueHandler} and can
  * be altered by setting the system property "javax.rmi.CORBA.ValueHandlerClass"
  * to the name of the alternative class that must implement ValueHandler.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface ValueHandler
 {
   /**
    * Get CORBA repository Id for the given java class.
-   * 
+   *
    * The syntax of the repository ID is the initial ?RMI:?, followed by the Java
    * class name, followed by name, followed by a hash code string, followed
    * optionally by a serialization version UID string.
-   * 
+   *
    * For Java identifiers that contain illegal OMG IDL identifier characters
    * such as ?$?, any such illegal characters are replaced by ?\U? followed by
    * the 4 hexadecimal characters (in upper case) representing the Unicode
    * value.
-   * 
+   *
    * @param clz a class for that the repository Id is required.
-   * 
+   *
    * @return the class repository id.
    */
   String getRMIRepositoryID(Class clz);
 
   /**
    * Returns the CodeBase for this ValueHandler.
-   * 
+   *
    * @return the codebase.
    */
   RunTime getRunTimeCodeBase();
@@ -86,7 +86,7 @@ public interface ValueHandler
    * content to the stream. Such classes implement either {@link Streamable}
    * (default marshalling, generated by IDL-to-java compiler) or
    * {@link CustomMarshal} (the user-programmed marshalling).
-   * 
+   *
    * @param clz the class being checked.
    * @return true if the class supports custom or default marshalling, false
    * otherwise.
@@ -97,14 +97,14 @@ public interface ValueHandler
    * Read value from the CORBA input stream in the case when the value is not
    * Streamable or CustomMarshall'ed. The fields of the class being written will
    * be accessed using reflection.
-   * 
+   *
    * @param in a CORBA stream to read.
    * @param offset the current position in the input stream.
    * @param clz the type of value being read.
    * @param repositoryID the repository Id of the value being read.
    * @param sender the sending context that should provide data about the
    * message originator.
-   * 
+   *
    * @return the object, extracted from the stream.
    */
   Serializable readValue(InputStream in, int offset, Class clz,
@@ -113,18 +113,18 @@ public interface ValueHandler
   /**
    * When the value provides the writeReplace method, the result of this method
    * is written. Otherwise, the value itself is written.
-   * 
+   *
    * @param value the value that should be written to the stream.
-   * 
+   *
    * @return the value that will be actually written to the stream.
    */
   Serializable writeReplace(Serializable value);
 
   /**
    * Write value to CORBA output stream using java senmatics.
-   * 
+   *
    * @param out a stream to write into.
    * @param value a java object to write.
    */
   void writeValue(OutputStream out, Serializable value);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java b/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
index 4db65c1dbfd..6bc6ad0af90 100644
--- a/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
+++ b/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
@@ -46,9 +46,9 @@ import java.io.Serializable;
  * This interface extends the previous ValueHandler, supporting various stream
  * format versions. The {@link ValueHandler} can be casted into this interface
  * to access additional features.
- * 
+ *
  * @since 1.5
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface ValueHandlerMultiFormat
@@ -58,7 +58,7 @@ public interface ValueHandlerMultiFormat
    * Get the maximal supported version for the value types, supported by
    * this value handler. The versions are integer numbers, the currently valid
    * values being 1 and 2.
-   * 
+   *
    * These two versions differ in how the additional data, stored by the
    * writeObject method, are encoded.
    * 
                          
@@ -72,7 +72,7 @@ public interface ValueHandlerMultiFormat
    * 
                        
    * As the version number is part of the value type record, there is no need
    * to the format control during the reading.
-   * 
+   *
    * @return the maximal supported version.
    */
   byte getMaximumStreamFormatVersion();
@@ -80,13 +80,13 @@ public interface ValueHandlerMultiFormat
   /**
    * Write the value type to the output stream using the given format version.
    * The older method {@link ValueHandler#writeValue} always uses the version 1.
-   * 
+   *
    * @param output the stream, where the value should be written, must implement
    * {@link ValueOutputStream}.
    * @param value the value that should be written.
    * @param version the version of the format that must be used to write the
    * value.
-   * 
+   *
    * @throws BAD_PARAM if the version number is less than 1 or greater than the
    * maximal supported version.
    */
diff --git a/libjava/classpath/javax/rmi/PortableRemoteObject.java b/libjava/classpath/javax/rmi/PortableRemoteObject.java
index db2ea6b8069..aa7e530ecda 100644
--- a/libjava/classpath/javax/rmi/PortableRemoteObject.java
+++ b/libjava/classpath/javax/rmi/PortableRemoteObject.java
@@ -69,7 +69,7 @@ import javax.rmi.CORBA.Util;
  * the alternative class that must implement
  * {@link PortableRemoteObjectDelegate}.
  * 
                        
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class PortableRemoteObject
@@ -81,7 +81,7 @@ public class PortableRemoteObject
 
   /**
    * The protected constructor calls {@link exportObject} (this).
-   * 
+   *
    * @throws RemoteException if the exportObject(this) throws one.
    */
   protected PortableRemoteObject()
@@ -96,14 +96,14 @@ public class PortableRemoteObject
    * communication using the same communications runtime as for the passed
    * a_source parameter. The a_target is connected to the same
    * ORB (and, if applicable, to the same {@link POA}) as the a_source.
-   * 
+   *
    * @param target the target to connect to ORB, must be an instance of either
    * {@link ObjectImpl} (Stubs and old-style ties) or {@link Tie}.
-   * 
+   *
    * @param source the object, providing the connection information, must be
    * an instance of either {@link ObjectImpl} (Stubs and old-style ties) or
    * {@link Servant} (the next-generation Ties supporting {@link POA}).
-   * 
+   *
    * @throws RemoteException if the target is already connected to another ORB.
    */
   public static void connect(Remote target, Remote source)
@@ -122,9 +122,9 @@ public class PortableRemoteObject
    * This method only creates a tie object and caches it for future usage. The
    * created tie does not have a delegate or an ORB associated.
    * 
                        
-   * 
+   *
    * @param object the object to export.
-   * 
+   *
    * @throws RemoteException if export fails due any reason.
    */
   public static void exportObject(Remote object)
@@ -160,16 +160,16 @@ public class PortableRemoteObject
    * 
                      • A {@link Tie} can be narrowed into Remote, representing the
    * implementation for this Tie (if one is set).
                        • 
    * 
                      
-   * 
+   *
    * @param object the object like CORBA Object, Stub or Remote that must be
    * narrowed to the given interface.
-   * 
+   *
    * @param narrowToInstaceOf the class of the interface to that the object must
    * be narrowed.
-   * 
+   *
    * @return On success, an object of type narrowTo or null, if narrowFrom =
    * null.
-   * 
+   *
    * @throws ClassCastException if no narrowing is possible.
    */
   public static Object narrow(Object object, Class narrowToInstaceOf)
@@ -183,7 +183,7 @@ public class PortableRemoteObject
    * Takes a server implementation object (name pattern *imp) and returns a stub
    * object that can be used to access that server object (target), name
    * (pattern _*_Stub).
-   * 
+   *
    * The returned stub is not connected to any ORB and must be explicitly
    * connected using {@link #connect}.
    * 
                      
@@ -191,16 +191,16 @@ public class PortableRemoteObject
    * The method signature prevents it from returning stubs that does not
    * implement Remote (ClassCastException will be thrown).
    * 
                      
-   * 
+   *
    * @param target a server side object implementation.
    * @return a stub object that can be used to access that server object.
-   * 
+   *
    * @throws NoSuchObjectException if a stub class cannot be located by supposed
    * name pattern, or an instance of stub fails to be instantiated.
-   * 
+   *
    * @throws ClassCastException if the stub class can be located, but it does
    * not inherit from Remote.
-   * 
+   *
    * @throws BAD_PARAM if the name of the passed class does not match the
    * implementation name pattern (does not end by 'Impl').
    */
@@ -214,9 +214,9 @@ public class PortableRemoteObject
    * Deregister a currently exported server object from the ORB runtimes. The
    * object to becomes available for garbage collection. This is usually
    * impemented via {@link Util#unexportObject}
-   * 
+   *
    * @param object the object to unexport.
-   * 
+   *
    * @throws NoSuchObjectException if the passed object is not currently
    * exported.
    */
@@ -225,4 +225,4 @@ public class PortableRemoteObject
   {
     delegate.unexportObject(object);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java b/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java
index 3a4c6cebeff..12226451469 100644
--- a/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java
+++ b/libjava/classpath/javax/rmi/ssl/SslRMIClientSocketFactory.java
@@ -1,4 +1,4 @@
-/* SslRMIClientSocketFactory.java -- 
+/* SslRMIClientSocketFactory.java --
    Copyright (C) 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
@@ -52,19 +52,19 @@ import java.rmi.server.RMIClientSocketFactory;
  * This class implements an RMIClientSocketFactory for SSL sockets.
  * it uses the default SSLClientSocketFactory.
  *
- * This class can optionally use the following system properties, if set: 
+ * This class can optionally use the following system properties, if set:
  * javax.rmi.ssl.client.enabledCipherSuites
  * javax.rmi.ssl.client.enabledProtocols
  *
  * These properties will specify a list of SSL/TLS cipher suites and protocols,
- * respectively, to enable on the created sockets. 
+ * respectively, to enable on the created sockets.
  *
  * Both properties should consist of a comma-separated list.
  *
  * @author Sven de Marothy
  * @since 1.5
  */
-public class SslRMIClientSocketFactory 
+public class SslRMIClientSocketFactory
   implements RMIClientSocketFactory, Serializable
 {
 
@@ -78,11 +78,11 @@ public class SslRMIClientSocketFactory
   /**
    * The SSL Socket factory.
    */
-  private static SSLSocketFactory socketFactory = 
+  private static SSLSocketFactory socketFactory =
     (SSLSocketFactory)SSLSocketFactory.getDefault();
 
   /**
-   * Creates a new SslRMIClientSocketFactory 
+   * Creates a new SslRMIClientSocketFactory
    */
   public SslRMIClientSocketFactory()
   {
@@ -95,11 +95,11 @@ public class SslRMIClientSocketFactory
     String o;
     try
       {
-	o = System.getProperty(p);
+        o = System.getProperty(p);
       }
     catch(SecurityException se)
       {
-	return null;
+        return null;
       }
 
     if (o == null)
@@ -116,7 +116,7 @@ public class SslRMIClientSocketFactory
   }
 
   /**
-   * Creates an SSLSocket on a given port 
+   * Creates an SSLSocket on a given port
    *
    * @throws IOException if an error occurs on socket creation.
    */
@@ -133,13 +133,13 @@ public class SslRMIClientSocketFactory
 
   /**
    * Compare two SslRMIServerSocketFactor instances
-   */ 
+   */
   public boolean equals(Object obj)
   {
     if( !(obj instanceof SslRMIClientSocketFactory) )
       return false;
     SslRMIClientSocketFactory s = (SslRMIClientSocketFactory)obj;
-    
+
     if(!SslRMIServerSocketFactory.
        cmpStrArray(enabledCipherSuites, s.enabledCipherSuites))
       return false;
@@ -159,10 +159,10 @@ public class SslRMIClientSocketFactory
     int hash = 0;
     if( enabledCipherSuites != null )
       for(int i = 0; i < enabledCipherSuites.length; i++ )
-	hash = hash ^ enabledCipherSuites[i].hashCode();
+        hash = hash ^ enabledCipherSuites[i].hashCode();
     if( enabledProtocols != null )
       for(int i = 0; i < enabledProtocols.length; i++ )
-	hash = hash ^ enabledProtocols[i].hashCode();
+        hash = hash ^ enabledProtocols[i].hashCode();
     return hash;
  }
 }
diff --git a/libjava/classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java b/libjava/classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java
index 56f6de11c95..d5c5398be26 100644
--- a/libjava/classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java
+++ b/libjava/classpath/javax/rmi/ssl/SslRMIServerSocketFactory.java
@@ -1,4 +1,4 @@
-/* SslRMIServerSocketFactory.java -- 
+/* SslRMIServerSocketFactory.java --
    Copyright (C) 2006 Free Software Foundation
 
 This file is part of GNU Classpath.
@@ -60,7 +60,7 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
   /**
    * The SSL ServerSocket factory.
    */
-  private static SSLServerSocketFactory socketFactory = 
+  private static SSLServerSocketFactory socketFactory =
     (SSLServerSocketFactory)SSLServerSocketFactory.getDefault();
 
   /**
@@ -80,33 +80,33 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
    *
    * @param enabledCipherSuites - the cypher suites to enable
    * or null for the defauls.
-   * @param enabledCipherSuites - the protocols to enable, 
+   * @param enabledCipherSuites - the protocols to enable,
    * or null for the defauls.
    * @param needClientAuth - specify client authorization requirement.
    * @throws IllegalArgumentException if any of the ciphers or protocols
    *  specified are not available.
    */
-  public SslRMIServerSocketFactory(String[] enabledCipherSuites, 
-				   String[] enabledProtocols, 
-				   boolean needClientAuth)
+  public SslRMIServerSocketFactory(String[] enabledCipherSuites,
+                                   String[] enabledProtocols,
+                                   boolean needClientAuth)
   {
     this.enabledCipherSuites = enabledCipherSuites;
-    this.enabledProtocols = enabledProtocols; 
+    this.enabledProtocols = enabledProtocols;
     this.needClientAuth = needClientAuth;
-    try 
+    try
       {
-	if( enabledProtocols != null || enabledCipherSuites != null )
-	  createServerSocket( 0 ); // stupid way to test the parameters  
+        if( enabledProtocols != null || enabledCipherSuites != null )
+          createServerSocket( 0 ); // stupid way to test the parameters
       }
     catch(IOException e)
       {
-	// Can this happen? FIXME.
-	throw new IllegalArgumentException();
+        // Can this happen? FIXME.
+        throw new IllegalArgumentException();
       }
   }
 
   /**
-   * Creates an SSLServerSocket on a given port 
+   * Creates an SSLServerSocket on a given port
    *
    * @throws IOException if an error occurs on socket creation.
    */
@@ -124,7 +124,7 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
 
   /**
    * Compare two SslRMIServerSocketFactor instances
-   */ 
+   */
   public boolean equals(Object obj)
   {
     if( !(obj instanceof SslRMIServerSocketFactory) )
@@ -132,7 +132,7 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
     SslRMIServerSocketFactory s = (SslRMIServerSocketFactory)obj;
     if( needClientAuth != s.needClientAuth )
       return false;
-    
+
     if(!cmpStrArray(enabledCipherSuites, s.enabledCipherSuites))
       return false;
 
@@ -152,23 +152,23 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
 
     if( a != null )
       {
-	if( a.length != b.length )
-	  return false;
-	for( int i = 0; i < a.length; i++ )
-	  if(!a[i].equals(b[i]))
-	    return false;
+        if( a.length != b.length )
+          return false;
+        for( int i = 0; i < a.length; i++ )
+          if(!a[i].equals(b[i]))
+            return false;
       }
 
     return true;
   }
 
   /**
-   * Returns the enabled cipher suites, or null 
+   * Returns the enabled cipher suites, or null
    * if the defaults are to be used.
    * @returns a string array of cipher suite names
    */
   public String[] getEnabledCipherSuites()
-  {  
+  {
     if( enabledCipherSuites == null )
       return null;
     return (String[])enabledCipherSuites.clone();
@@ -203,11 +203,11 @@ public class SslRMIServerSocketFactory implements RMIServerSocketFactory
     int hash = 0;
     if( enabledCipherSuites != null )
       for(int i = 0; i < enabledCipherSuites.length; i++ )
-	hash = hash ^ enabledCipherSuites[i].hashCode();
+        hash = hash ^ enabledCipherSuites[i].hashCode();
     if( enabledProtocols != null )
       for(int i = 0; i < enabledProtocols.length; i++ )
-	hash = hash ^ enabledProtocols[i].hashCode();
+        hash = hash ^ enabledProtocols[i].hashCode();
     hash = ( needClientAuth ) ? (hash^0xFFFF) : hash;
     return hash;
  }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/security/auth/Subject.java b/libjava/classpath/javax/security/auth/Subject.java
index 03836345862..e9b0804a505 100644
--- a/libjava/classpath/javax/security/auth/Subject.java
+++ b/libjava/classpath/javax/security/auth/Subject.java
@@ -236,7 +236,7 @@ public final class Subject implements Serializable
    */
   public static Object doAsPrivileged (final Subject subject,
                                        final PrivilegedExceptionAction action,
-				       AccessControlContext acc)
+                                       AccessControlContext acc)
     throws PrivilegedActionException
   {
     final SecurityManager sm = System.getSecurityManager();
diff --git a/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java b/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java
index ec12a668514..30bddd55931 100644
--- a/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/ChoiceCallback.java
@@ -108,7 +108,7 @@ public class ChoiceCallback implements Callback, Serializable
    * choices.
    */
   public ChoiceCallback(String prompt, String[] choices, int defaultChoice,
-			boolean multipleSelectionsAllowed)
+                        boolean multipleSelectionsAllowed)
   {
     super();
 
@@ -116,7 +116,7 @@ public class ChoiceCallback implements Callback, Serializable
     setChoices(choices);
     if (defaultChoice < 0 || defaultChoice >= this.choices.length)
       {
-	throw new IllegalArgumentException("default choice is out of bounds");
+        throw new IllegalArgumentException("default choice is out of bounds");
       }
     this.defaultChoice = defaultChoice;
     this.multipleSelectionsAllowed = multipleSelectionsAllowed;
@@ -192,7 +192,7 @@ public class ChoiceCallback implements Callback, Serializable
   {
     if (!multipleSelectionsAllowed)
       {
-	throw new UnsupportedOperationException("not allowed");
+        throw new UnsupportedOperationException("not allowed");
       }
 
     this.selections = selections;
@@ -213,7 +213,7 @@ public class ChoiceCallback implements Callback, Serializable
   {
     if ((prompt == null) || (prompt.length() == 0))
       {
-	throw new IllegalArgumentException("invalid prompt");
+        throw new IllegalArgumentException("invalid prompt");
       }
     this.prompt = prompt;
   }
@@ -222,14 +222,14 @@ public class ChoiceCallback implements Callback, Serializable
   {
     if (choices == null || choices.length == 0)
       {
-	throw new IllegalArgumentException("invalid choices");
+        throw new IllegalArgumentException("invalid choices");
       }
     for (int i = 0; i < choices.length; i++)
       {
-	if (choices[i] == null || choices[i].length() == 0)
-	  {
-	    throw new IllegalArgumentException("invalid choice at index #"+i);
-	  }
+        if (choices[i] == null || choices[i].length() == 0)
+          {
+            throw new IllegalArgumentException("invalid choice at index #"+i);
+          }
       }
     this.choices = choices;
   }
diff --git a/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java b/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java
index 938b3017380..8f89bf5fae5 100644
--- a/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/ConfirmationCallback.java
@@ -260,7 +260,7 @@ public class ConfirmationCallback implements Callback, Serializable
    * not correspond to one of the options in optionType.
    */
   public ConfirmationCallback(String prompt, int messageType, int optionType,
-			      int defaultOption)
+                              int defaultOption)
   {
     super();
 
@@ -297,7 +297,7 @@ public class ConfirmationCallback implements Callback, Serializable
    * options.
    */
   public ConfirmationCallback(String prompt, int messageType, String[] options,
-			      int defaultOption)
+                              int defaultOption)
   {
     super();
 
@@ -352,7 +352,7 @@ public class ConfirmationCallback implements Callback, Serializable
   {
     if (options != null)
       {
-	return UNSPECIFIED_OPTION;
+        return UNSPECIFIED_OPTION;
       }
     return optionType;
   }
@@ -399,11 +399,11 @@ public class ConfirmationCallback implements Callback, Serializable
   {
     if (options != null)
       {
-	setOptions(options, selection);
+        setOptions(options, selection);
       }
     else
       {
-	setOptionType(optionType, selection);
+        setOptionType(optionType, selection);
       }
   }
 
@@ -440,35 +440,35 @@ public class ConfirmationCallback implements Callback, Serializable
     switch (optionType)
       {
       case YES_NO_OPTION:
-	this.optionType = optionType;
-	switch (selectedOption)
-	  {
-	  case YES:
-	  case NO: this.selection = selectedOption; break;
-	  default: throw new IllegalArgumentException("invalid option");
-	  }
-	break;
+        this.optionType = optionType;
+        switch (selectedOption)
+          {
+          case YES:
+          case NO: this.selection = selectedOption; break;
+          default: throw new IllegalArgumentException("invalid option");
+          }
+        break;
       case YES_NO_CANCEL_OPTION:
-	this.optionType = optionType;
-	switch (selectedOption)
-	  {
-	  case YES:
-	  case NO:
-	  case CANCEL: this.selection = selectedOption; break;
-	  default: throw new IllegalArgumentException("invalid option");
-	  }
-	break;
+        this.optionType = optionType;
+        switch (selectedOption)
+          {
+          case YES:
+          case NO:
+          case CANCEL: this.selection = selectedOption; break;
+          default: throw new IllegalArgumentException("invalid option");
+          }
+        break;
       case OK_CANCEL_OPTION:
-	this.optionType = optionType;
-	switch (selectedOption)
-	  {
-	  case OK:
-	  case CANCEL: this.selection = selectedOption; break;
-	  default: throw new IllegalArgumentException("invalid option");
-	  }
-	break;
+        this.optionType = optionType;
+        switch (selectedOption)
+          {
+          case OK:
+          case CANCEL: this.selection = selectedOption; break;
+          default: throw new IllegalArgumentException("invalid option");
+          }
+        break;
       default:
-	throw new IllegalArgumentException("illegal option type");
+        throw new IllegalArgumentException("illegal option type");
       }
   }
 
@@ -477,18 +477,18 @@ public class ConfirmationCallback implements Callback, Serializable
   {
     if ((selectedOption < 0) || (selectedOption > options.length - 1))
       {
-	throw new IllegalArgumentException("invalid selection");
+        throw new IllegalArgumentException("invalid selection");
       }
     if ((options == null) || (options.length == 0))
       {
-	throw new IllegalArgumentException("options is null or empty");
+        throw new IllegalArgumentException("options is null or empty");
       }
     for (int i = 0; i < options.length; i++)
       {
-	if ((options[i] == null) || (options[i].length() == 0))
-	  {
-	    throw new IllegalArgumentException("options[" + i + "] is null or empty");
-	  }
+        if ((options[i] == null) || (options[i].length() == 0))
+          {
+            throw new IllegalArgumentException("options[" + i + "] is null or empty");
+          }
       }
     this.options = options;
     this.selection = selectedOption;
@@ -498,7 +498,7 @@ public class ConfirmationCallback implements Callback, Serializable
   {
     if ((prompt == null) || (prompt.length() == 0))
       {
-	throw new IllegalArgumentException("prompt is null or empty");
+        throw new IllegalArgumentException("prompt is null or empty");
       }
     this.prompt = prompt;
   }
diff --git a/libjava/classpath/javax/security/auth/callback/NameCallback.java b/libjava/classpath/javax/security/auth/callback/NameCallback.java
index 0e281d1cc8b..4b8bf1c6969 100644
--- a/libjava/classpath/javax/security/auth/callback/NameCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/NameCallback.java
@@ -162,7 +162,7 @@ public class NameCallback implements Callback, Serializable
   {
     if ((prompt == null) || (prompt.length() == 0))
       {
-	throw new IllegalArgumentException("invalid prompt");
+        throw new IllegalArgumentException("invalid prompt");
       }
     this.prompt = prompt;
   }
@@ -171,7 +171,7 @@ public class NameCallback implements Callback, Serializable
   {
     if ((defaultName == null) || (defaultName.length() == 0))
       {
-	throw new IllegalArgumentException("invalid default name");
+        throw new IllegalArgumentException("invalid default name");
       }
     this.defaultName = defaultName;
   }
diff --git a/libjava/classpath/javax/security/auth/callback/PasswordCallback.java b/libjava/classpath/javax/security/auth/callback/PasswordCallback.java
index e8c862aca3e..6309aacbada 100644
--- a/libjava/classpath/javax/security/auth/callback/PasswordCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/PasswordCallback.java
@@ -149,11 +149,11 @@ public class PasswordCallback implements Callback, Serializable
   {
     if (inputPassword != null)
       {
-	for (int i = 0; i < inputPassword.length; i++)
-	  {
-	    inputPassword[i] = '\0';
-	  }
-	inputPassword = null;
+        for (int i = 0; i < inputPassword.length; i++)
+          {
+            inputPassword[i] = '\0';
+          }
+        inputPassword = null;
       }
   }
 
@@ -161,7 +161,7 @@ public class PasswordCallback implements Callback, Serializable
   {
     if ((prompt == null) || (prompt.length() == 0))
       {
-	throw new IllegalArgumentException("invalid prompt");
+        throw new IllegalArgumentException("invalid prompt");
       }
     this.prompt = prompt;
   }
diff --git a/libjava/classpath/javax/security/auth/callback/TextInputCallback.java b/libjava/classpath/javax/security/auth/callback/TextInputCallback.java
index 98b0ae3c12d..1fe07132754 100644
--- a/libjava/classpath/javax/security/auth/callback/TextInputCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/TextInputCallback.java
@@ -161,7 +161,7 @@ public class TextInputCallback implements Callback, Serializable
   {
     if ((prompt == null) || (prompt.length() == 0))
       {
-	throw new IllegalArgumentException("invalid prompt");
+        throw new IllegalArgumentException("invalid prompt");
       }
     this.prompt = prompt;
   }
@@ -170,7 +170,7 @@ public class TextInputCallback implements Callback, Serializable
   {
     if ((defaultText == null) || (defaultText.length() == 0))
       {
-	throw new IllegalArgumentException("invalid default text");
+        throw new IllegalArgumentException("invalid default text");
       }
     this.defaultText = defaultText;
   }
diff --git a/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java b/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java
index 197cece5fe9..0ab3a040fc1 100644
--- a/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java
+++ b/libjava/classpath/javax/security/auth/callback/TextOutputCallback.java
@@ -133,7 +133,7 @@ public class TextOutputCallback implements Callback, Serializable
   {
     if ((message == null) || (message.length() == 0))
       {
-	throw new IllegalArgumentException("invalid message");
+        throw new IllegalArgumentException("invalid message");
       }
     this.message = message;
   }
diff --git a/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java b/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java
index 33e1f9893b3..42bb9c73ca7 100644
--- a/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java
+++ b/libjava/classpath/javax/security/auth/kerberos/DelegationPermission.java
@@ -64,12 +64,12 @@ public final class DelegationPermission
 
   /**
    * Create a new instance with the given name and actions.
-   * 
+   *
    * The name consists of two parts: first the subordinate
    * service principal, then the target service principal.
    * Each principal is surrounded by quotes; the two are separated
    * by a space.
-   * 
+   *
    * @param name the name
    * @param actions the actions; this is ignored
    */
diff --git a/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java b/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java
index 3372a162f93..e5735fbd57b 100644
--- a/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java
+++ b/libjava/classpath/javax/security/auth/kerberos/KerberosKey.java
@@ -50,7 +50,7 @@ import javax.security.auth.Destroyable;
  * This class represents a Kerberos key.  See the Kerberos
  * authentication RFC for more information:
  * RFC 1510.
- * 
+ *
  * @since 1.4
  */
 public class KerberosKey
diff --git a/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java b/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java
index d52b5cf9e6c..4ba767226f3 100644
--- a/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java
+++ b/libjava/classpath/javax/security/auth/kerberos/KerberosPrincipal.java
@@ -107,7 +107,7 @@ public final class KerberosPrincipal
    * Create a new instance with the given name and type.  The name is
    * parsed according to the rules in the RFC.  If there is no realm,
    * then the local realm is used instead.
-   * 
+   *
    * @param name the principal's name
    * @param type the principal's type
    */
@@ -202,6 +202,6 @@ public final class KerberosPrincipal
   public String toString()
   {
     // This is what came to mind.
-    return name + ":" + type; 
+    return name + ":" + type;
   }
 }
diff --git a/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java b/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java
index 452f8e966ad..4412ea45957 100644
--- a/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java
+++ b/libjava/classpath/javax/security/auth/kerberos/ServicePermission.java
@@ -48,7 +48,7 @@ import java.util.Vector;
  * This represents permission to access to a Kerberos service principal.
  * See the Kerberos authentication RFC for more information:
  * RFC 1510.
- * 
+ *
  * @since 1.4
  */
 public final class ServicePermission
@@ -64,15 +64,15 @@ public final class ServicePermission
 
   /**
    * Create a new service permission with the indicated name and actions.
-   * 
+   *
    * The name is the name of the kerberos principal for the service.
-   * 
+   *
    * The actions are a comma-separated list of strings.  The recognized
    * actions are "initiate" and "accept".  The "initiate" action means
    * that the holder of the permission can access the service.  The
    * "accept" action means that the holder of the permission can operate
    * as this service.
-   * 
+   *
    * @param name the prinicpal's name
    * @param action the allowed actions
    */
diff --git a/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java b/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java
index a052fbf6876..e74ca016311 100644
--- a/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java
+++ b/libjava/classpath/javax/security/auth/login/AccountNotFoundException.java
@@ -40,7 +40,7 @@ package javax.security.auth.login;
 
 /**
  * An exception indicating that an account was not found.
- * @since 1.5 
+ * @since 1.5
  */
 public class AccountNotFoundException extends AccountException
 {
diff --git a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
index 3c8b64d4c99..044c9105be3 100644
--- a/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
+++ b/libjava/classpath/javax/security/auth/login/AppConfigurationEntry.java
@@ -97,7 +97,7 @@ public class AppConfigurationEntry
 
   public String toString()
   {
-    
+
     return loginModuleName + "\t"
         + String.valueOf(controlFlag) + "\t"
         + String.valueOf(options);
diff --git a/libjava/classpath/javax/security/auth/login/LoginContext.java b/libjava/classpath/javax/security/auth/login/LoginContext.java
index 17641e65b55..b2e4b97b679 100644
--- a/libjava/classpath/javax/security/auth/login/LoginContext.java
+++ b/libjava/classpath/javax/security/auth/login/LoginContext.java
@@ -230,9 +230,9 @@ public class LoginContext
     Exception cause = null;
     try
       {
-	ClassLoader cl = Thread.currentThread().getContextClassLoader();
-	Class c = Class.forName(entry.getLoginModuleName(), true, cl);
-	module = (LoginModule) c.newInstance();
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+        Class c = Class.forName(entry.getLoginModuleName(), true, cl);
+        module = (LoginModule) c.newInstance();
       }
     catch (ClassNotFoundException cnfe)
       {
diff --git a/libjava/classpath/javax/security/sasl/Sasl.java b/libjava/classpath/javax/security/sasl/Sasl.java
index 52210d971ac..402ad6edeab 100644
--- a/libjava/classpath/javax/security/sasl/Sasl.java
+++ b/libjava/classpath/javax/security/sasl/Sasl.java
@@ -1,4 +1,4 @@
-/* Sasl.java -- 
+/* Sasl.java --
    Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/sound/midi/ControllerEventListener.java b/libjava/classpath/javax/sound/midi/ControllerEventListener.java
index eb075b32f8b..8349de05767 100644
--- a/libjava/classpath/javax/sound/midi/ControllerEventListener.java
+++ b/libjava/classpath/javax/sound/midi/ControllerEventListener.java
@@ -41,9 +41,9 @@ package javax.sound.midi;
 import java.util.EventListener;
 
 /**
- * The interface defines the methods to be implemented by classes wanting 
+ * The interface defines the methods to be implemented by classes wanting
  * to be notified on MIDI controller events from a Sequencer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
diff --git a/libjava/classpath/javax/sound/midi/Instrument.java b/libjava/classpath/javax/sound/midi/Instrument.java
index f2821db6484..a8626faeb18 100644
--- a/libjava/classpath/javax/sound/midi/Instrument.java
+++ b/libjava/classpath/javax/sound/midi/Instrument.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * The abstract base class for all MIDI instruments.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -49,29 +49,29 @@ public abstract class Instrument extends SoundbankResource
 {
   // The instrument patch.
   private Patch patch;
-    
+
   /**
    * Create a new Instrument.
-   * 
+   *
    * @param soundbank the Soundbank containing the instrument.
    * @param patch the patch for this instrument
    * @param name the name of this instrument
    * @param dataClass the class used to represent sample data for this instrument
    */
-  protected Instrument(Soundbank soundbank, Patch patch, 
+  protected Instrument(Soundbank soundbank, Patch patch,
                        String name, Class dataClass)
   {
     super(soundbank, name, dataClass);
-    this.patch = patch; 
+    this.patch = patch;
   }
-  
+
   /**
    * Get the patch for this instrument.
-   * 
+   *
    * @return the patch for this instrument
    */
   public Patch getPatch()
   {
     return patch;
-  } 
+  }
 }
diff --git a/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java b/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java
index 9f5690069d5..6325b04e03e 100644
--- a/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java
+++ b/libjava/classpath/javax/sound/midi/InvalidMidiDataException.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * This exception is thrown when we encounter bad MIDI data.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -48,7 +48,7 @@ package javax.sound.midi;
 public class InvalidMidiDataException extends Exception
 {
   private static final long serialVersionUID = 2780771756789932067L;
- 
+
   /**
    * Create an InvalidMidiDataException object.
    */
@@ -59,7 +59,7 @@ public class InvalidMidiDataException extends Exception
 
   /**
    * Create an InvalidMidiDataException object.
-   * 
+   *
    * @param s the exception message string
    */
   public InvalidMidiDataException(String s)
diff --git a/libjava/classpath/javax/sound/midi/MetaEventListener.java b/libjava/classpath/javax/sound/midi/MetaEventListener.java
index dd7b8a24be8..28a7a9de487 100644
--- a/libjava/classpath/javax/sound/midi/MetaEventListener.java
+++ b/libjava/classpath/javax/sound/midi/MetaEventListener.java
@@ -41,9 +41,9 @@ package javax.sound.midi;
 import java.util.EventListener;
 
 /**
- * The interface defines the methods to be implemented by classes wanting 
+ * The interface defines the methods to be implemented by classes wanting
  * to be notified on MIDI meta events from a Sequencer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
diff --git a/libjava/classpath/javax/sound/midi/MetaMessage.java b/libjava/classpath/javax/sound/midi/MetaMessage.java
index f7c4fb4246a..4d43975c3a4 100644
--- a/libjava/classpath/javax/sound/midi/MetaMessage.java
+++ b/libjava/classpath/javax/sound/midi/MetaMessage.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * A system exclusive MIDI message.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,15 +51,15 @@ public class MetaMessage extends MidiMessage
    * The META status code.  Only valid for MIDI files, not the wire protocol.
    */
   public static final int META = 0xFF;
-  
+
   // The length of the variable length data length encoding.
   private int lengthLength = 0;
-  
+
   /**
    * Create a default valid meta message.
-   * 
+   *
    * The official specs don't specify what message is to be
-   * created.  For now, we create a zero length meta message 
+   * created.  For now, we create a zero length meta message
    * with a type code of 0.
    */
   public MetaMessage()
@@ -71,7 +71,7 @@ public class MetaMessage extends MidiMessage
     data[3] = (byte) 0; // Length
     lengthLength = 1;
   }
-  
+
   /**
    * Create a MetaMessage object.
    * @param data a complete system exclusive message
@@ -84,10 +84,10 @@ public class MetaMessage extends MidiMessage
     while ((data[index++] & 0x80) > 0)
       lengthLength++;
   }
-  
+
   /**
    * Set the meta message.
-   *  
+   *
    * @param type the meta type byte (< 128)
    * @param data the message data
    * @param length the length of the message data
@@ -101,9 +101,9 @@ public class MetaMessage extends MidiMessage
                                          + Integer.toHexString(type)
                                          + " must be less than 128");
 
-    // For a nice description of how variable length values are handled, 
+    // For a nice description of how variable length values are handled,
     // see http://www.borg.com/~jglatt/tech/midifile.htm
-    
+
     // First compute the length of the length value
     lengthLength = 0;
     int lengthValue = length;
@@ -111,13 +111,13 @@ public class MetaMessage extends MidiMessage
       lengthValue = lengthValue >> 7;
       lengthLength++;
     } while (lengthValue > 0);
-    
+
     // Now allocate our data array
     this.length = 2 + lengthLength + length;
     this.data = new byte[this.length];
     this.data[0] = (byte) META;
     this.data[1] = (byte) type;
-    
+
     // Now compute the length representation
     long buffer = length & 0x7F;
     while ((length >>= 7) > 0)
@@ -125,7 +125,7 @@ public class MetaMessage extends MidiMessage
       buffer <<= 8;
       buffer |= ((length & 0x7F) | 0x80);
     }
-    
+
     // Now store the variable length length value
     int index = 2;
     do
@@ -135,25 +135,25 @@ public class MetaMessage extends MidiMessage
         break;
       buffer >>= 8;
     } while (true);
- 
+
     // Now copy the real data.
     System.arraycopy(data, 0, this.data, index, length);
   }
-  
+
   /**
    * Get the meta message type.
-   * 
+   *
    * @return the meta message type
    */
   public int getType()
   {
     return data[1];
   }
-  
+
   /**
    * Get the data for this message, not including the status,
    * type, or length information.
-   * 
+   *
    * @return the message data, not including status, type or lenght info
    */
   public byte[] getData()
@@ -163,7 +163,7 @@ public class MetaMessage extends MidiMessage
     System.arraycopy(data, 2 + lengthLength, result, 0, dataLength);
     return result;
   }
-  
+
   /* Create a deep-copy clone of this object.
    * @see java.lang.Object#clone()
    */
@@ -171,6 +171,6 @@ public class MetaMessage extends MidiMessage
   {
     byte message[] = new byte[length];
     System.arraycopy(data, 0, message, 0, length);
-    return new MetaMessage(message); 
+    return new MetaMessage(message);
   }
 }
diff --git a/libjava/classpath/javax/sound/midi/MidiChannel.java b/libjava/classpath/javax/sound/midi/MidiChannel.java
index fe3b5111ab7..36da51d0fbc 100644
--- a/libjava/classpath/javax/sound/midi/MidiChannel.java
+++ b/libjava/classpath/javax/sound/midi/MidiChannel.java
@@ -40,22 +40,22 @@ package javax.sound.midi;
 
 /**
  * A MIDI channel.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
  */
 public interface MidiChannel
 {
-  
+
   /**
    * Start playing a note.
-   * 
+   *
    * @param noteNumber the MIDI note number
    * @param velocity the velocity at which the key was pressed
    */
   public void noteOn(int noteNumber, int velocity);
-  
+
   /**
    * Stop playing a note.
    *
@@ -63,173 +63,173 @@ public interface MidiChannel
    * @param velocity the volcity at which the ket was released
    */
   public void noteOff(int noteNumber, int velocity);
-  
+
   /**
    * Stop playing a note.
-   * 
+   *
    * @param noteNumber the MIDI note number
    */
   public void noteOff(int noteNumber);
-  
+
   /**
    * Change in a key pressure for a note.
-   * 
+   *
    * @param noteNumber the MIDI note number
    * @param pressure the key pressure
    */
   public void setPolyPressure(int noteNumber, int pressure);
-  
+
   /**
    * Get the key pressure for a note.
-   * 
+   *
    * @param noteNumber the MIDI note number
    * @return the key pressure
    */
   public int getPolyPressure(int noteNumber);
-  
+
   /**
    * Set the key pressure for the channel.
-   * 
+   *
    * @param pressure the key pressure
    */
   public void setChannelPressure(int pressure);
-  
+
   /**
    * Get the key pressure for the channel.
-   * 
+   *
    * @return the key pressure
    */
   public int getChannelPressure();
-  
+
   /**
    * Set a change in a controller's value.
-   * 
+   *
    * @param controller the MIDI controller number (0 to 127)
    * @param value the new value (0 to 127)
    */
   public void controlChange(int controller, int value);
-  
+
   /**
    * Get a controller's value.
-   * 
+   *
    * @param controller the MIDI controller number (0 to 127)
    * @return the controller's value (0 to 127)
    */
   public int getController(int controller);
-  
+
   /**
    * Change the patch for this channel.
-   * 
+   *
    * @param program the patch number to switch to (0 to 127)
    */
   public void programChange(int program);
-  
+
   /**
    * Change the bank and patch for this channel.
-   * 
+   *
    * @param bank the bank to switch to (0 to 16383)
    * @param program the patch to switch to (0 to 127)
    */
   public void programChange(int bank, int program);
-  
+
   /**
    * Get the current patch for this channel.
-   * 
+   *
    * @return current patch (0 to 127)
    */
   public int getProgram();
-  
+
   /**
    * Change the pitch bend for this channel using a positive 14-bit value.
-   * 
+   *
    * @param bend the new pitch bend value
    */
   public void setPitchBend(int bend);
-  
+
   /**
    * Get the pitch bend for this channel as a positive 14-bit value.
-   * 
+   *
    * @return the current patch bend value
    */
   public int getPitchBend();
-  
+
   /**
    * Reset all MIDI controllers to their default values.
    */
   public void resetAllControllers();
-  
+
   /**
    * Stop playing all notes.  Sound may not stop.
    */
   public void allNotesOff();
-  
+
   /**
    * Stop all sound.
    */
   public void allSoundOff();
-  
+
   /**
    * Set whether or not local controls are on or off.  They are on by
    * default.
-   * 
+   *
    * @param on true to enable local controls, false to disable
    * @return the new value
    */
   public boolean localControl(boolean on);
-  
+
   /**
    * Turns mono mode on or off.
-   * 
-   * @param on true to enable mono mode, false to disable 
+   *
+   * @param on true to enable mono mode, false to disable
    */
   public void setMono(boolean on);
-  
+
   /**
    * Get the current mono mode.
-   * 
+   *
    * @return true if mono is enabled, false otherwise
    */
   public boolean getMono();
-  
+
   /**
    * Turns omni mode on or off.
-   * 
+   *
    * @param on true to enable omni mode, false to disable
    */
   public void setOmni(boolean on);
-  
+
   /**
    * Get the current omni mode.
-   * 
+   *
    * @return true if omni is enabled, false otherwise
    */
   public boolean getOmni();
-  
+
   /**
    * Turns mute mode on or off.
-   * 
+   *
    * @param mute true to enable mute mode, false to disable
    */
   public void setMute(boolean mute);
-  
+
   /**
    * Get the current mute mode.
-   * 
+   *
    * @return true if mute is enabled, false otherwise
    */
   public boolean getMute();
-  
+
   /**
    * Turns solo mode on or off.  If any channels are soloed, then only those
    * channels make sounds, otherwise all channels will make sound.
-   * 
+   *
    * @param solo true to enable solo mode, false to disable
    */
   public void setSolo(boolean solo);
-  
+
   /**
    * Get the current solo mode.
-   * 
+   *
    * @return true is solo is enabled, false otherwise.
    */
   public boolean getSolo();
diff --git a/libjava/classpath/javax/sound/midi/MidiDevice.java b/libjava/classpath/javax/sound/midi/MidiDevice.java
index 387cceac2d8..7a0ca7f2bb8 100644
--- a/libjava/classpath/javax/sound/midi/MidiDevice.java
+++ b/libjava/classpath/javax/sound/midi/MidiDevice.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * Interface for all MIDI devices.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -52,69 +52,69 @@ public interface MidiDevice
    * @return the Info object describing this device
    */
   public Info getDeviceInfo();
-  
+
   /**
    * Open this MIDI device and allocate any system resource we need.
-   * 
+   *
    * @throws MidiUnavailableException if we're not able to open for some reason
    */
   public void open() throws MidiUnavailableException;
-  
+
   /**
    * Close this MIDI device, and release any system resources we're using.
    */
   public void close();
-  
+
   /**
    * Returns true if this MIDI device is open and false otherwise.
-   * 
+   *
    * @return true if this is open, false otherwise
    */
   public boolean isOpen();
-  
+
   /**
    * If this device supports time-stamps, then it will return the number
    * of microseconds since this device has been open, and -1 otherwise.
-   * 
+   *
    * @return -1 or the number of microseconds since this was opened
    */
   public long getMicrosecondPosition();
-  
+
   /**
    * The maximum number of MIDI IN connections we can get as Receivers,
    * or -1 if there is no maximum.
-   * 
+   *
    * @return -1 or the maximum number of Receivers we can get
    */
   public int getMaxReceivers();
-  
+
   /**
    * The maximum number of MIDI OUT connections we can get as Transmitters,
    * or -1 if there is no maximum.
-   * 
+   *
    * @return -1 or the maximum number of Transmitters we can get
    */
   public int getMaxTransmitters();
-  
+
   /**
    * Get a MIDI IN Receiver for this device.
-   * 
+   *
    * @return a MIDI IN Receiver for this device
    * @throws MidiUnavailableException if we can't get a Receiver
    */
   public Receiver getReceiver() throws MidiUnavailableException;
-  
+
   /**
    * Get a MIDI OUT Transmitter for this device.
-   * 
+   *
    * @return a MIDI OUT Transmitter for this device
    * @throws MidiUnavailableException if we can't get a Transmitter
    */
   public Transmitter getTransmitter() throws MidiUnavailableException;
-  
+
   /**
    * A MIDI device descriptor object.
-   * 
+   *
    * @author green@redhat.com
    *
    */
@@ -125,10 +125,10 @@ public interface MidiDevice
     private String vendor;
     private String description;
     private String version;
-    
+
     /**
      * Create an Info object for a MIDI device
-     * 
+     *
      * @param name the device name
      * @param vendor the vendor name
      * @param description the device description
@@ -141,11 +141,11 @@ public interface MidiDevice
       this.description = description;
       this.version = version;
     }
-    
+
     /**
      * This equals method only returns true if this object
      * is the same as obj.
-     * 
+     *
      * @param obj the object we're comparing to
      * @return true if this is the same object
      * @see java.lang.Object#equals(java.lang.Object)
@@ -154,10 +154,10 @@ public interface MidiDevice
     {
       return super.equals(obj);
     }
-  
+
     /**
      * A hash code for this object.
-     *     
+     *
      * @return the hash code for this object
      * @see java.lang.Object#hashCode()
      */
@@ -165,50 +165,50 @@ public interface MidiDevice
     {
       return super.hashCode();
     }
-  
+
     /**
      * Get the device name.
-     * 
+     *
      * @return the device name
      */
     public final String getName()
     {
       return name;
     }
-    
+
     /**
      * Get the device vendor.
-     * 
+     *
      * @return the device vendor
      */
     public final String getVendor()
     {
       return vendor;
     }
-    
+
     /**
      * Get the device description
-     * 
+     *
      * @return the device description
      */
     public final String getDescription()
     {
       return description;
     }
-    
+
     /**
      * get the device version
-     * 
+     *
      * @return the device version
      */
     public final String getVersion()
     {
       return version;
     }
-    
+
     /**
      * Simple return the name of the device.
-     * 
+     *
      * @return the device name
      * @see java.lang.Object#toString()
      */
diff --git a/libjava/classpath/javax/sound/midi/MidiEvent.java b/libjava/classpath/javax/sound/midi/MidiEvent.java
index 3ca5c21ea86..3b0072cfa6d 100644
--- a/libjava/classpath/javax/sound/midi/MidiEvent.java
+++ b/libjava/classpath/javax/sound/midi/MidiEvent.java
@@ -41,7 +41,7 @@ package javax.sound.midi;
 /**
  * A MIDI event is the combination of a MIDI message and a timestamp specified
  * in MIDI ticks.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -50,10 +50,10 @@ public class MidiEvent
 {
   private final MidiMessage message;
   private long tick;
-  
+
   /**
    * Create a MIDI event object from the given MIDI message and timestamp.
-   * 
+   *
    * @param message the MidiMessage for this event
    * @param tick the timestamp for this event
    */
@@ -62,30 +62,30 @@ public class MidiEvent
     this.message = message;
     this.tick = tick;
   }
-  
+
   /**
    * Get the MIDI message for this event.
-   * 
+   *
    * @return the MidiMessage for this event
    */
   public MidiMessage getMessage()
   {
     return message;
   }
-  
+
   /**
    * Set the timestemp for this event in MIDI ticks.
-   * 
+   *
    * @param tick the timestamp
    */
   public void setTick(long tick)
   {
     this.tick = tick;
   }
-  
+
   /**
    * Get the timestamp for this event in MIDI ticks.
-   * 
+   *
    * @return the timestamp for this even in MIDI ticks
    */
   public long getTick()
diff --git a/libjava/classpath/javax/sound/midi/MidiFileFormat.java b/libjava/classpath/javax/sound/midi/MidiFileFormat.java
index 79fa9fe2964..73744523d55 100644
--- a/libjava/classpath/javax/sound/midi/MidiFileFormat.java
+++ b/libjava/classpath/javax/sound/midi/MidiFileFormat.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * Describe a MIDI file, including specifics about its type, length and timing.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -48,44 +48,44 @@ package javax.sound.midi;
 public class MidiFileFormat
 {
   /**
-   * The MIDI file type.  This is either 0, 1 or 2.  
-   * 
+   * The MIDI file type.  This is either 0, 1 or 2.
+   *
    * Type 0 files contain a single track and represents a single song
    * performance.
    * Type 1 may contain multiple tracks for a single song performance.
    * Type 2 may contain multiple tracks, each representing a
    * separate song performance.
-   * 
+   *
    * See http://en.wikipedia.org/wiki/MIDI#MIDI_file_formats for more
    * information.
    */
   protected int type;
 
   /**
-   * The division type of the MIDI file. 
+   * The division type of the MIDI file.
    */
   protected float divisionType;
-  
+
   /**
    * The timing resolution of the MIDI file.
    */
   protected int resolution;
-  
+
   /**
-   * The size of the MIDI file in bytes. 
+   * The size of the MIDI file in bytes.
    */
   protected int byteLength = UNKNOWN_LENGTH;
-  
+
   /**
-   * The length of the MIDI file in microseconds. 
+   * The length of the MIDI file in microseconds.
    */
   protected long microsecondLength = UNKNOWN_LENGTH;
-  
+
   /**
    * A special value indicating an unknown quantity.
    */
   public static final int UNKNOWN_LENGTH = -1; // FIXME is this really -1?
-  
+
   /**
    * Create a MidiFileFormat object from the given parameters.
    *
@@ -95,8 +95,8 @@ public class MidiFileFormat
    * @param bytes the MIDI file size in bytes
    * @param microseconds the MIDI file length in microseconds
    */
-  public MidiFileFormat(int type, float divisionType, 
-			int resolution, int bytes, long microseconds)
+  public MidiFileFormat(int type, float divisionType,
+                        int resolution, int bytes, long microseconds)
   {
     this.type = type;
     this.divisionType = divisionType;
@@ -104,41 +104,41 @@ public class MidiFileFormat
     this.byteLength = bytes;
     this.microsecondLength = microseconds;
   }
-  
+
   /**
    * Get the MIDI file type (0, 1, or 2).
-   * 
+   *
    * @return the MIDI file type (0, 1, or 2)
    */
   public int getType()
   {
     return type;
   }
-  
+
   /**
    * Get the file division type.
-   * 
+   *
    * @return the file divison type
    */
   public float getDivisionType()
   {
-    return divisionType;    
+    return divisionType;
   }
-  
+
   /**
    * Get the file timing resolution.  If the division type is PPQ, then this
    * is value represents ticks per beat, otherwise it's ticks per frame (SMPTE).
-   * 
+   *
    * @return the timing resolution in ticks per beat or ticks per frame
    */
   public int getResolution()
   {
     return resolution;
   }
-  
+
   /**
    * Get the file length in bytes.
-   * 
+   *
    * @return the file length in bytes or UNKNOWN_LENGTH
    */
   public int getByteLength()
@@ -148,7 +148,7 @@ public class MidiFileFormat
 
   /**
    * Get the file length in microseconds.
-   * 
+   *
    * @return the file length in microseconds or UNKNOWN_LENGTH
    */
   public long getMicrosecondLength()
diff --git a/libjava/classpath/javax/sound/midi/MidiMessage.java b/libjava/classpath/javax/sound/midi/MidiMessage.java
index e265b5eadcc..806615199c1 100644
--- a/libjava/classpath/javax/sound/midi/MidiMessage.java
+++ b/libjava/classpath/javax/sound/midi/MidiMessage.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * The base class for all MIDI messages.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,15 +51,15 @@ public abstract class MidiMessage implements Cloneable
    * MIDI message data.
    */
   protected byte data[];
-  
+
   /**
    * The total length of the MIDI message.
    */
   protected int length;
-  
+
   /**
    * MidiMessage contructor.
-   * 
+   *
    * @param data a valid MIDI message
    */
   protected MidiMessage(byte[] data)
@@ -67,59 +67,59 @@ public abstract class MidiMessage implements Cloneable
     this.data = data;
     this.length = data.length;
   }
-  
+
   /**
    * Set the complete MIDI message.
-   * 
+   *
    * @param data The complete MIDI message.
    * @param length The length of the MIDI message.
    * @throws InvalidMidiDataException Thrown when the MIDI message is invalid.
    */
-  protected void setMessage(byte[] data, int length) 
+  protected void setMessage(byte[] data, int length)
     throws InvalidMidiDataException
   {
     this.data = new byte[length];
     System.arraycopy(data, 0, this.data, 0, length);
     this.length = length;
   }
-  
+
   /**
    * Get the MIDI message data.
-   * 
+   *
    * @return an array containing the MIDI message data
    */
   public byte[] getMessage()
   {
     byte copy[] = new byte[length];
     System.arraycopy(data, 0, copy, 0, length);
-    return copy;    
+    return copy;
   }
-  
+
   /**
    * Get the status byte of the MIDI message (as an int)
-   * 
+   *
    * @return the status byte of the MIDI message (as an int), or zero if the message length is zero.
    */
   public int getStatus()
   {
     if (length > 0)
       return (data[0] & 0xff);
-    else 
+    else
       return 0;
   }
-  
+
   /**
    * Get the length of the MIDI message.
-   * 
+   *
    * @return the length of the MIDI messsage
    */
   public int getLength()
   {
     return length;
   }
-  
+
   /* Create a clone of this object.
-   * 
+   *
    * @see java.lang.Object#clone()
    */
   public abstract Object clone();
diff --git a/libjava/classpath/javax/sound/midi/MidiSystem.java b/libjava/classpath/javax/sound/midi/MidiSystem.java
index 627dd95e950..b273b98e5ff 100644
--- a/libjava/classpath/javax/sound/midi/MidiSystem.java
+++ b/libjava/classpath/javax/sound/midi/MidiSystem.java
@@ -55,9 +55,9 @@ import javax.sound.midi.spi.MidiFileWriter;
 import javax.sound.midi.spi.SoundbankReader;
 
 /**
- * MidiSystem provides access to the computer system's MIDI resources, 
+ * MidiSystem provides access to the computer system's MIDI resources,
  * as well as utility routines for reading MIDI files and more.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -71,15 +71,15 @@ public class MidiSystem
 
   /**
    * Get an array of all available MIDI devices.
-   * 
+   *
    * @return a possibly empty array of all available MIDI devices
    */
   public static MidiDevice.Info[] getMidiDeviceInfo()
   {
-    Iterator deviceProviders = 
-	ServiceFactory.lookupProviders(MidiDeviceProvider.class);
+    Iterator deviceProviders =
+        ServiceFactory.lookupProviders(MidiDeviceProvider.class);
     List infoList = new ArrayList();
-    
+
     while (deviceProviders.hasNext())
     {
       MidiDeviceProvider provider = (MidiDeviceProvider) deviceProviders.next();
@@ -87,44 +87,44 @@ public class MidiSystem
       for (int i = infos.length; i > 0; )
         infoList.add(infos[--i]);
     }
-    
-    return (MidiDevice.Info[]) 
-	infoList.toArray(new MidiDevice.Info[infoList.size()]);
+
+    return (MidiDevice.Info[])
+        infoList.toArray(new MidiDevice.Info[infoList.size()]);
   }
-  
+
   /**
    * Get the specified MIDI device.
-   * 
+   *
    * @param info a description of the device we're looking for
    * @return the requested MIDI device
    * @throws MidiUnavailableException if no MIDI devices are configured or found
    * @throws IllegalArgumentException if the device described by info is not found
    */
-  public static MidiDevice getMidiDevice(MidiDevice.Info info) 
+  public static MidiDevice getMidiDevice(MidiDevice.Info info)
     throws MidiUnavailableException
   {
-    Iterator deviceProviders = 
-	ServiceFactory.lookupProviders(MidiDeviceProvider.class);
-    
+    Iterator deviceProviders =
+        ServiceFactory.lookupProviders(MidiDeviceProvider.class);
+
     if (! deviceProviders.hasNext())
       throw new MidiUnavailableException("No MIDI device providers available.");
-    
+
     do
     {
-      MidiDeviceProvider provider = 
+      MidiDeviceProvider provider =
         (MidiDeviceProvider) deviceProviders.next();
       if (provider.isDeviceSupported(info))
         return provider.getDevice(info);
     } while (deviceProviders.hasNext());
-    
-    throw new IllegalArgumentException("MIDI device " 
-				       + info + " not available.");
+
+    throw new IllegalArgumentException("MIDI device "
+                                       + info + " not available.");
   }
-  
+
   /**
    * Get the default Receiver instance.  This just picks the first one
    * it finds for now.
-   * 
+   *
    * @return the default Receiver instance
    * @throws MidiUnavailableException if no Receiver is found
    */
@@ -145,7 +145,7 @@ public class MidiSystem
   /**
    * Get the default Transmitter instance.  This just picks the first one
    * it finds for now.
-   * 
+   *
    * @return the default Transmitter instance
    * @throws MidiUnavailableException if no Transmitter is found
    */
@@ -166,7 +166,7 @@ public class MidiSystem
   /**
    * Get the default Synthesizer instance.  This just picks the first one
    * it finds for now.
-   * 
+   *
    * @return the default Synthesizer instance
    * @throws MidiUnavailableException if no Synthesizer is found
    */
@@ -183,11 +183,11 @@ public class MidiSystem
     }
     throw new MidiUnavailableException("No Synthesizer device available");
   }
-  
+
   /**
    * Get the default Sequencer instance.  This just picks the first one
    * it finds for now.
-   * 
+   *
    * @return the default Sequencer instance
    * @throws MidiUnavailableException if no Sequencer is found
    */
@@ -203,11 +203,11 @@ public class MidiSystem
         return (Sequencer) device;
     }
     throw new MidiUnavailableException("No Sequencer device available");
-  }  
-  
+  }
+
   /**
    * Read a Soundbank object from the given stream.
-   * 
+   *
    * @param stream the stream from which to read the Soundbank
    * @return the Soundbank object
    * @throws InvalidMidiDataException if we were unable to read the soundbank
@@ -229,7 +229,7 @@ public class MidiSystem
 
   /**
    * Read a Soundbank object from the given url.
-   * 
+   *
    * @param url the url from which to read the Soundbank
    * @return the Soundbank object
    * @throws InvalidMidiDataException if we were unable to read the soundbank
@@ -251,7 +251,7 @@ public class MidiSystem
 
   /**
    * Read a Soundbank object from the given file.
-   * 
+   *
    * @param file the file from which to read the Soundbank
    * @return the Soundbank object
    * @throws InvalidMidiDataException if we were unable to read the soundbank
@@ -268,13 +268,13 @@ public class MidiSystem
       if (sb != null)
         return sb;
     }
-    throw new InvalidMidiDataException("Cannot read soundbank from file " 
-				       + file);
-  } 
+    throw new InvalidMidiDataException("Cannot read soundbank from file "
+                                       + file);
+  }
 
   /**
    * Read a MidiFileFormat object from the given stream.
-   * 
+   *
    * @param stream the stream from which to read the MidiFileFormat
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if we were unable to read the MidiFileFormat
@@ -296,7 +296,7 @@ public class MidiSystem
 
   /**
    * Read a MidiFileFormat object from the given url.
-   * 
+   *
    * @param url the url from which to read the MidiFileFormat
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if we were unable to read the MidiFileFormat
@@ -318,7 +318,7 @@ public class MidiSystem
 
   /**
    * Read a MidiFileFormat object from the given file.
-   * 
+   *
    * @param file the file from which to read the MidiFileFormat
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if we were unable to read the MidiFileFormat
@@ -335,13 +335,13 @@ public class MidiSystem
       if (sb != null)
         return sb;
     }
-    throw new InvalidMidiDataException("Can't read MidiFileFormat from file " 
+    throw new InvalidMidiDataException("Can't read MidiFileFormat from file "
                                        + file);
-  } 
-  
+  }
+
   /**
    * Read a Sequence object from the given stream.
-   * 
+   *
    * @param stream the stream from which to read the Sequence
    * @return the Sequence object
    * @throws InvalidMidiDataException if we were unable to read the Sequence
@@ -363,7 +363,7 @@ public class MidiSystem
 
   /**
    * Read a Sequence object from the given url.
-   * 
+   *
    * @param url the url from which to read the Sequence
    * @return the Sequence object
    * @throws InvalidMidiDataException if we were unable to read the Sequence
@@ -385,7 +385,7 @@ public class MidiSystem
 
   /**
    * Read a Sequence object from the given file.
-   * 
+   *
    * @param file the file from which to read the Sequence
    * @return the Sequence object
    * @throws InvalidMidiDataException if we were unable to read the Sequence
@@ -402,13 +402,13 @@ public class MidiSystem
       if (sq != null)
         return sq;
     }
-    throw new InvalidMidiDataException("Can't read Sequence from file " 
+    throw new InvalidMidiDataException("Can't read Sequence from file "
                                        + file);
-  } 
-  
+  }
+
   /**
    * Return an array of supported MIDI file types on this system.
-   * 
+   *
    * @return the array of supported MIDI file types
    */
   public static int[] getMidiFileTypes()
@@ -443,7 +443,7 @@ public class MidiSystem
 
   /**
    * Return true if the system supports writing files of type fileType.
-   * 
+   *
    * @param fileType the MIDI file type we want to write
    * @return true if we can write fileType files, false otherwise
    */
@@ -453,17 +453,17 @@ public class MidiSystem
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
-      
+
       if (fw.isFileTypeSupported(fileType))
         return true;
     }
     return false;
   }
-  
+
   /**
    * Return an array of supported MIDI file types on this system
    * for the given sequnce.
-   * 
+   *
    * @param sequence the sequnce to write
    * @return the array of supported MIDI file types
    */
@@ -496,11 +496,11 @@ public class MidiSystem
     }
     return result;
   }
-  
+
   /**
    * Return true if the system supports writing files of type fileType
    * for the given sequence.
-   * 
+   *
    * @param fileType the MIDI file type we want to write
    * @param sequence the Sequence we want to write
    * @return true if we can write fileType files for sequence, false otherwise
@@ -511,7 +511,7 @@ public class MidiSystem
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
-      
+
       if (fw.isFileTypeSupported(fileType, sequence))
         return true;
     }
@@ -520,7 +520,7 @@ public class MidiSystem
 
   /**
    * Write a sequence to an output stream using a specific MIDI file format.
-   * 
+   *
    * @param in the sequence to write
    * @param fileType the MIDI file format to use
    * @param out the output stream to write to
@@ -535,17 +535,17 @@ public class MidiSystem
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
-    
+
       if (fw.isFileTypeSupported(fileType, in))
         return fw.write(in, fileType, out);
     }
-    throw new IllegalArgumentException("File type " 
-				       + fileType + " is not supported");
+    throw new IllegalArgumentException("File type "
+                                       + fileType + " is not supported");
   }
 
   /**
    * Write a sequence to a file using a specific MIDI file format.
-   * 
+   *
    * @param in the sequence to write
    * @param fileType the MIDI file format to use
    * @param out the file to write to
@@ -560,12 +560,11 @@ public class MidiSystem
     while (writers.hasNext())
     {
       MidiFileWriter fw = (MidiFileWriter) writers.next();
-    
+
       if (fw.isFileTypeSupported(fileType, in))
         return fw.write(in, fileType, out);
     }
-    throw new IllegalArgumentException("File type " 
-				       + fileType + " is not supported");
+    throw new IllegalArgumentException("File type "
+                                       + fileType + " is not supported");
   }
 }
-
diff --git a/libjava/classpath/javax/sound/midi/MidiUnavailableException.java b/libjava/classpath/javax/sound/midi/MidiUnavailableException.java
index a992c16a789..5403e42c34b 100644
--- a/libjava/classpath/javax/sound/midi/MidiUnavailableException.java
+++ b/libjava/classpath/javax/sound/midi/MidiUnavailableException.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * This exception is thrown when MIDI resources are not available.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -48,7 +48,7 @@ package javax.sound.midi;
 public class MidiUnavailableException extends Exception
 {
   private static final long serialVersionUID = 6093809578628944323L;
- 
+
   /**
    * Create a MidiUnavailableException.
    */
@@ -59,7 +59,7 @@ public class MidiUnavailableException extends Exception
 
   /**
    * Create an MidiUnavailableException object.
-   * 
+   *
    * @param s the exception message string
    */
   public MidiUnavailableException(String s)
diff --git a/libjava/classpath/javax/sound/midi/Patch.java b/libjava/classpath/javax/sound/midi/Patch.java
index eb9d8bc3b82..75e347f5140 100644
--- a/libjava/classpath/javax/sound/midi/Patch.java
+++ b/libjava/classpath/javax/sound/midi/Patch.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * A Patch describes where an Instrument is loaded on a Synthesizer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -50,11 +50,11 @@ public class Patch
   // Private data describing the patch
   private int bank = 0;
   private int program = 0;
-  
+
   /**
    * Create a Patch object, specifying the bank and program in which this Patch
    * is located.
-   * 
+   *
    * @param bank the bank in which this Patch is located
    * @param program the program in which this Patch is located
    */
@@ -63,20 +63,20 @@ public class Patch
     this.bank = bank;
     this.program = program;
   }
-  
+
   /**
    * Get the bank in which this Patch is located.
-   * 
+   *
    * @return the bank in which this Patch is located
    */
   public int getBank()
   {
     return bank;
   }
-  
+
   /**
    * Get the program in which this Patch is located.
-   * 
+   *
    * @return the program in which this Patch is located
    */
   public int getProgram()
diff --git a/libjava/classpath/javax/sound/midi/Receiver.java b/libjava/classpath/javax/sound/midi/Receiver.java
index 0e70b2809e9..bc660d0d62d 100644
--- a/libjava/classpath/javax/sound/midi/Receiver.java
+++ b/libjava/classpath/javax/sound/midi/Receiver.java
@@ -41,7 +41,7 @@ package javax.sound.midi;
 /**
  * This interface describes the methods required by objects receiving MIDI
  * messages.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,14 +51,14 @@ public interface Receiver
   /**
    * Send a MIDI message and timestamp.  Some receivers don't support
    * timestamps, in which case timeStamp should be -1.
-   * 
+   *
    * @param message the MIDI message to send
    * @param timeStamp time timestamp for this message in microseconds (or -1)
    * @throws IllegalStateException if the receiver is closed
    */
   public void send(MidiMessage message, long timeStamp)
     throws IllegalStateException;
-  
+
   /**
    * Close this receiver, possibly freeing system resources.
    */
diff --git a/libjava/classpath/javax/sound/midi/Sequence.java b/libjava/classpath/javax/sound/midi/Sequence.java
index 2ea201cb2a4..833150afe80 100644
--- a/libjava/classpath/javax/sound/midi/Sequence.java
+++ b/libjava/classpath/javax/sound/midi/Sequence.java
@@ -42,9 +42,9 @@ import java.util.Iterator;
 import java.util.Vector;
 
 /**
- * Objects of this type represent sequences of MIDI messages that can be 
+ * Objects of this type represent sequences of MIDI messages that can be
  * played back by a Sequencer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -52,69 +52,69 @@ import java.util.Vector;
 public class Sequence
 {
   /**
-   * The timing division type for this sequence (PPQ or SMPTE*) 
+   * The timing division type for this sequence (PPQ or SMPTE*)
    */
   protected float divisionType;
-  
+
   /**
-   * The timing resolution in ticks/beat or ticks/frame, depending on the 
-   * division type.  
+   * The timing resolution in ticks/beat or ticks/frame, depending on the
+   * division type.
    */
   protected int resolution;
-  
+
   /**
-   * The MIDI tracks used by this sequence. 
+   * The MIDI tracks used by this sequence.
    */
   protected Vector tracks;
-  
+
   /**
    * Tempo-based timing.  Resolution is specified in ticks per beat.
    */
   public static final float PPQ = 0.0f;
-  
+
   /**
    * 24 frames/second timing.  Resolution is specific in ticks per frame.
    */
   public static final float SMPTE_24 = 24.0f;
-  
+
   /**
    * 25 frames/second timing.  Resolution is specific in ticks per frame.
    */
   public static final float SMPTE_25 = 25.0f;
-  
+
   /**
    * 30 frames/second timing.  Resolution is specific in ticks per frame.
    */
   public static final float SMPTE_30 = 30.0f;
-  
+
   /**
    * 29.97 frames/second timing.  Resolution is specific in ticks per frame.
    */
   public static final float SMPTE_30DROP = 29.97f;
-  
+
   // Private helper class
   private void init(float divisionType, int resolution, int numTracks)
     throws InvalidMidiDataException
   {
     if (divisionType != PPQ
-        && divisionType != SMPTE_24 
+        && divisionType != SMPTE_24
         && divisionType != SMPTE_25
         && divisionType != SMPTE_30
         && divisionType != SMPTE_30DROP)
-      throw new InvalidMidiDataException("Invalid division type (" 
+      throw new InvalidMidiDataException("Invalid division type ("
                                          + divisionType + ")");
 
     this.divisionType = divisionType;
     this.resolution = resolution;
-    
+
     tracks = new Vector(numTracks);
     while (numTracks > 0)
       tracks.set(--numTracks, new Track());
   }
-  
+
   /**
    * Create a MIDI sequence object with no initial tracks.
-   * 
+   *
    * @param divisionType the division type (must be one of PPQ or SMPTE_*)
    * @param resolution the timing resolution
    * @throws InvalidMidiDataException if the division type is invalid
@@ -127,7 +127,7 @@ public class Sequence
 
   /**
    * Create a MIDI seqence object.
-   * 
+   *
    * @param divisionType the division type (must be one of PPQ or SMPTE_*)
    * @param resolution the timing resolution
    * @param numTracks the number of initial tracks
@@ -138,30 +138,30 @@ public class Sequence
   {
     init(divisionType, resolution, 0);
   }
-  
+
   /**
    * The division type of this sequence.
-   * 
+   *
    * @return division type of this sequence
    */
   public float getDivisionType()
   {
     return divisionType;
   }
-  
+
   /**
    * The timing resolution for this sequence, relative to the division type.
-   * 
+   *
    * @return the timing resolution for this sequence
    */
   public int getResolution()
   {
     return resolution;
   }
-  
+
   /**
    * Create a new empty MIDI track and add it to this sequence.
-   * 
+   *
    * @return the newly create MIDI track
    */
   public Track createTrack()
@@ -170,10 +170,10 @@ public class Sequence
     tracks.add(track);
     return track;
   }
-  
+
   /**
    * Remove the specified MIDI track from this sequence.
-   * 
+   *
    * @param track the track to remove
    * @return true if track was removed and false othewise
    */
@@ -181,33 +181,33 @@ public class Sequence
   {
     return tracks.remove(track);
   }
-  
+
   /**
    * Get an array of MIDI tracks used in this sequence.
-   * 
+   *
    * @return a possibly empty array of tracks
    */
   public Track[] getTracks()
   {
     return tracks.toArray(new Track[tracks.size()]);
   }
-  
+
   /**
    * The length of this sequence in microseconds.
-   * 
+   *
    * @return the length of this sequence in microseconds
    */
   public long getMicrosecondLength()
   {
     long tickLength = getTickLength();
-    
+
     if (divisionType == PPQ)
     {
       // FIXME
       // How can this possible be computed?  PPQ is pulses per quarter-note,
       // which is dependent on the tempo of the Sequencer.
-      throw new 
-	  UnsupportedOperationException("Can't compute PPQ based lengths yet");
+      throw new
+          UnsupportedOperationException("Can't compute PPQ based lengths yet");
     }
     else
     {
@@ -215,10 +215,10 @@ public class Sequence
       return (long) ((tickLength * 1000000) / (divisionType * resolution));
     }
   }
-  
+
   /**
    * The length of this sequence in MIDI ticks.
-   * 
+   *
    * @return the length of this sequence in MIDI ticks
    */
   public long getTickLength()
@@ -234,15 +234,15 @@ public class Sequence
     }
     return length;
   }
-  
+
   /**
    * Get an array of patches used in this sequence.
-   * 
+   *
    * @return an array of patches used in this sequence
    */
   public Patch[] getPatchList()
   {
-    // FIXE: not quite sure how to do this yet. 
+    // FIXE: not quite sure how to do this yet.
     throw new UnsupportedOperationException("Can't get patch list yet");
   }
 }
diff --git a/libjava/classpath/javax/sound/midi/Sequencer.java b/libjava/classpath/javax/sound/midi/Sequencer.java
index 24ee2505c56..ca9cad7797d 100644
--- a/libjava/classpath/javax/sound/midi/Sequencer.java
+++ b/libjava/classpath/javax/sound/midi/Sequencer.java
@@ -45,7 +45,7 @@ import java.io.InputStream;
  * A Sequencer object plays MIDI sequences described as Sequence objects.
  * This class provides methods for loading and unloading sequences, as well
  * as basic transport controls.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -54,46 +54,46 @@ public interface Sequencer extends MidiDevice
 {
   /**
    * Set the Sequence object for this sequencer.
-   * 
+   *
    * @param seq the Sequence to process
    * @throws InvalidMidiDataException if the sequence is invalid for any reason
    */
   public void setSequence(Sequence seq) throws InvalidMidiDataException;
-  
+
   /**
    * Set the sequence for this sequencer.  istream reads on a valid MIDI file.
-   * 
+   *
    * @param istream an input stream for a valid MIDI file
    * @throws IOException if an I/O exception happens
    * @throws InvalidMidiDataException if the MIDI file contains bad data
    */
-  public void setSequence(InputStream istream) 
+  public void setSequence(InputStream istream)
       throws IOException, InvalidMidiDataException;
-  
+
   /**
    * Get the current sequence object for this sequencer.
-   * 
+   *
    * @return the current sequence object.  May be null.
    */
   public Sequence getSequence();
-  
+
   /**
    * Start playback of the current sequence.
    */
   public void start();
-  
+
   /**
    * Stop playback of the current sequence.
    */
   public void stop();
-  
+
   /**
    * Returns true if the sequence is playing.
-   * 
+   *
    * @return true if the sequence is playing and false otherwise
    */
   public boolean isRunning();
-  
+
   /**
    * Start playback and record of MIDI events.
    * Any tracks enabled for recording will have their events replaced.
@@ -101,114 +101,114 @@ public interface Sequencer extends MidiDevice
    * will be sent to the sequencer's transmitter.
    */
   public void startRecording();
-  
+
   /**
    * Stop recording, although continue playing.
    */
   public void stopRecording();
-  
+
   /**
    * Returns true if sequence is recording.
-   * 
+   *
    * @return true if the sequence is recording and false otherwise
    */
   public boolean isRecording();
-  
+
   /**
    * Enable recording for a specific track using data from a specific channel.
-   * 
-   * @param track the track to enable for recording 
+   *
+   * @param track the track to enable for recording
    * @param channel the channel from which to record
    */
   public void recordEnable(Track track, int channel);
-  
+
   /**
    * Disable recording for a specific track.
-   * 
+   *
    * @param track the track to disable recording for
    */
   public void recordDisable(Track track);
-  
+
   /**
    * Get the current tempo in beats per minute.
-   * 
+   *
    * @return the current tempo in beats per minute
    */
   public float getTempoInBPM();
-  
+
   /**
    * Sets the current tempo in beats per minute.
-   * 
+   *
    * @param bpm the new tempo in bears per minutes
    */
   public void setTempoInBPM(float bpm);
-  
+
   /**
    * Get the current tempo in microseconds per quarter note.
-   * 
+   *
    * @return the current tempo in microseconds per quarter note.
    */
   public float getTempoInMPQ();
-  
+
   /**
    * Sets the current tempo in microseconds per quarter note.
-   * 
+   *
    * @param mpq the new tempo in microseconds per quarter note.
    */
   public void setTempoInMPQ(float mpq);
-  
+
   /**
    * Set a scaling factor for the playback tempo, which is 1.0 by default.
-   * 
+   *
    * @param factor the new tempo scaling factor
    */
   public void setTempoFactor(float factor);
-  
+
   /**
    * Get the current scaling factor for the playback tempo.
-   * 
-   * @return the current tempo scaling factor 
+   *
+   * @return the current tempo scaling factor
    */
   public float getTempoFactor();
-  
+
   /**
    * Get the length of the current sequence in MIDI ticks.
-   *  
+   *
    * @return the length of the current sequence in MIDI ticks
    */
   public long getTickLength();
-  
+
   /**
    * Get the current playback position of the sequencer in MIDI ticks.
-   * 
+   *
    * @return the current playback position of the sequencer in MIDI ticks
    */
   public long getTickPosition();
-  
+
   /**
    * Set the current playback position of the sequencer in MIDI ticks.
-   * 
+   *
    * @param tick the new playback position of the sequencer in MIDI ticks
    */
   public void setTickPosition(long tick);
 
   /**
    * Get the length of the current sequence in microseconds.
-   *  
+   *
    * @return the length of the current sequence in microseconds
    */
   public long getMicrosecondLength();
-  
+
   /**
    * Get the current playback position of the sequencer in microseconds.
-   * 
+   *
    * @return the current playback position of the sequencer in microseconds
    */
   public long getMicrosecondPosition();
-  
+
   /**
    * Set the current playback position of the sequencer in microseconds.
-   * 
+   *
    * @param microsecond the new playback position of the sequencer in microseconds
    */
   public void setMicrosecondPosition(long microsecond);
@@ -217,125 +217,125 @@ public interface Sequencer extends MidiDevice
    * Set the source of timing information.  sync must be found in the array
    * returned by getMasterSyncModes().
    * FIXME: What happens if it isn't?
-   * 
+   *
    * @param sync the new source of timing information
    */
   public void setMasterSyncMode(SyncMode sync);
-  
+
   /**
    * Get the source of timing information.
-   * 
+   *
    * @return the current source of timing information
    */
   public SyncMode getMasterSyncMode();
-  
+
   /**
    * Get an array of timing sources supported by this sequencer.
-   * 
+   *
    * @return an array of timing sources supported by this sequencer
    */
   public SyncMode[] getMasterSyncModes();
-  
+
   /**
    * Set the slave synchronization mode for this sequencer.  sync must be
    * found in the array returned by getSlaveSyncModes().
    * FIXME: What happens if it isn't?
-   * 
+   *
    * @param sync the new slave sync mode for this sequencer
    */
   public void setSlaveSyncMode(SyncMode sync);
-  
+
   /**
    * Get the current slave synchronization mode.
-   * 
+   *
    * @return the current slave synchronization mode
    */
   public SyncMode getSlaveSyncMode();
-  
+
   /**
    * Get an array of slave sync modes supported by this sequencer.
-   * 
+   *
    * @return an array of slave sync modes supported by this sequencer
    */
   public SyncMode[] getSlaveSyncModes();
-  
+
   /**
    * Sets the mute state for a specific track.
-   * 
+   *
    * @param track the track to modify
    * @param mute the new mute state
    */
   public void setTrackMute(int track, boolean mute);
-  
+
   /**
    * Get the mute state of a specific track.
-   * 
+   *
    * @param track the track to query
    * @return the mute state for track
    */
   public boolean getTrackMute(int track);
-  
+
   /**
    * Sets the solo state for a specific track.
-   * 
+   *
    * @param track the track to modify
    * @param solo the new solo state
    */
   public void setTrackSolo(int track, boolean solo);
-  
+
   /**
    * Get the solo state for a specific track.
-   * 
+   *
    * @param track the track to query
    * @return the solo state for track
    */
   public boolean getTrackSolo(int track);
-  
+
   /**
    * Add a meta event listening object to this sequencer.  It will receive
    * notification whenever the sequencer processes a meta event.
    * A listener may fail to get added if this sequencer doesn't support
    * meta events.
-   * 
+   *
    * @param listener the listener to add
    * @return true if listener was added, false othewise
    */
   public boolean addMetaEventListener(MetaEventListener listener);
-  
+
   /**
    * Remove a meta event listener from this sequencer.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeMetaEventListener(MetaEventListener listener);
-  
+
   /**
-   * Add a controller event listening object to this sequencer.  It will 
-   * receive notification whenever the sequencer processes a controller 
+   * Add a controller event listening object to this sequencer.  It will
+   * receive notification whenever the sequencer processes a controller
    * event for a specified controller number..
-   * 
+   *
    * @param listener the listener to add
    * @param controllers the conroller numbers to listen to
    * @return the controller numbers being listened to
    */
-  public int[] addControllerEventListener(ControllerEventListener listener, 
+  public int[] addControllerEventListener(ControllerEventListener listener,
                                           int controllers[]);
-  
+
   /**
    * Remove a controller listener from this sequencer for the specified
    * controller numbers.
-   * 
+   *
    * @param listener the listener to remove
    * @param controllers the controllers to unlisten
    * @return the controller numbers being unlistened
    */
   public int[] removeControllerEventListener(ControllerEventListener listener,
                                              int controllers[]);
-  
+
   /**
    * A SyncMode object represents the mechanism by which a MIDI sequencer
    * synchronizes time with a master or slave device.
-   * 
+   *
    * @author green@redhat.com
    *
    */
@@ -345,18 +345,18 @@ public interface Sequencer extends MidiDevice
      * A master sync mode indicating the use of an internal sequencer clock.
      */
     public static final SyncMode INTERNAL_CLOCK = new SyncMode("Internal Clock");
-    
+
     /**
      * A master or slave sync mode indicating the use of MIDI clock messages.
      */
     public static final SyncMode MIDI_SYNC = new SyncMode("MIDI Sync");
-    
+
     /**
-     * A master or slave sync mode indicating the use of MIDI Time Code 
+     * A master or slave sync mode indicating the use of MIDI Time Code
      * messages.
      */
     public static final SyncMode MIDI_TIME_CODE = new SyncMode("MIDI Time Code");
-    
+
     /**
      * A slave sync mode indicating that no timing info will be transmitted.
      */
@@ -364,7 +364,7 @@ public interface Sequencer extends MidiDevice
 
     // The name
     private String name;
-    
+
     /**
      * Create a new SyncMode object
      * @param name the SyncMode name
@@ -373,7 +373,7 @@ public interface Sequencer extends MidiDevice
     {
       this.name = name;
     }
-    
+
     /**
      * SyncMode objects are only equal when identical.
      */
@@ -381,7 +381,7 @@ public interface Sequencer extends MidiDevice
     {
       return super.equals(o);
     }
-    
+
     /**
      * SyncMode objects use the Object hashCode.
      */
@@ -389,7 +389,7 @@ public interface Sequencer extends MidiDevice
     {
       return super.hashCode();
     }
-    
+
     /**
      * Use the SyncMode name as the string representation.
      * @see java.lang.Object#toString()
diff --git a/libjava/classpath/javax/sound/midi/ShortMessage.java b/libjava/classpath/javax/sound/midi/ShortMessage.java
index ef01d11683e..08b873703b9 100644
--- a/libjava/classpath/javax/sound/midi/ShortMessage.java
+++ b/libjava/classpath/javax/sound/midi/ShortMessage.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * A short MIDI message that is no longer than 3 bytes long.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,91 +51,91 @@ public class ShortMessage extends MidiMessage
    * Status byte for Time Code message.
    */
   public static final int MIDI_TIME_CODE = 0xF1;
- 
+
   /**
-   * Status byte for Song Position Pointer message. 
+   * Status byte for Song Position Pointer message.
    */
   public static final int SONG_POSITION_POINTER = 0xF2;
-  
+
   /**
    * Status byte for Song Select message.
    */
   public static final int SONG_SELECT = 0xF3;
-  
+
   /**
-   * Status byte for Tune Request message. 
+   * Status byte for Tune Request message.
    */
   public static final int TUNE_REQUEST = 0xF6;
-  
+
   /**
    * Status byte for End Of Exclusive message.
    */
   public static final int END_OF_EXCLUSIVE = 0xF7;
-  
+
   /**
-   * Status byte for Timing Clock message. 
+   * Status byte for Timing Clock message.
    */
   public static final int TIMING_CLOCK = 0xF8;
-  
+
   /**
-   * Status byte for Start message. 
+   * Status byte for Start message.
    */
   public static final int START = 0xFA;
-  
+
   /**
-   * Status byte for Continue message. 
+   * Status byte for Continue message.
    */
-  public static final int CONTINUE = 0xFB; 
-  
+  public static final int CONTINUE = 0xFB;
+
   /**
-   * Status byte for Stop message. 
+   * Status byte for Stop message.
    */
-  public static final int STOP = 0xFC; 
-  
+  public static final int STOP = 0xFC;
+
   /**
    * Status byte for Active Sensing message.
    */
-  public static final int ACTIVE_SENSING = 0xFE; 
-  
+  public static final int ACTIVE_SENSING = 0xFE;
+
   /**
    * Status byte for System Reset message.
    */
-  public static final int SYSTEM_RESET = 0xFF; 
-  
+  public static final int SYSTEM_RESET = 0xFF;
+
   /**
    * Status nibble for Note Off message.
    */
-  public static final int NOTE_OFF = 0x80; 
-  
+  public static final int NOTE_OFF = 0x80;
+
   /**
    * Status nibble for Note On message.
    */
-  public static final int NOTE_ON = 0x90; 
-  
+  public static final int NOTE_ON = 0x90;
+
   /**
    * Status nibble for Poly Pressure message.
    */
-  public static final int POLY_PRESSURE = 0xA0; 
-  
+  public static final int POLY_PRESSURE = 0xA0;
+
   /**
    * Status nibble for Control Change message.
    */
-  public static final int CONTROL_CHANGE = 0xB0; 
-  
+  public static final int CONTROL_CHANGE = 0xB0;
+
   /**
    * Status nibble for Program Change message.
    */
-  public static final int PROGRAM_CHANGE = 0xC0; 
-  
+  public static final int PROGRAM_CHANGE = 0xC0;
+
   /**
    * Statue nibble for Channel Pressure message.
    */
   public static final int CHANNEL_PRESSURE = 0xD0;
-  
+
   /**
    * Status nibble for Pitch Bend message.
    */
-  public static final int PITCH_BEND = 0xE0; 
+  public static final int PITCH_BEND = 0xE0;
 
   // Create and initialize a default, arbitrary message.
   private static byte[] defaultMessage;
@@ -144,25 +144,25 @@ public class ShortMessage extends MidiMessage
     defaultMessage = new byte[1];
     defaultMessage[0] = (byte) STOP;
   }
-  
+
   /**
    * Create a short MIDI message.
-   * 
+   *
    * The spec requires that this represent a valid MIDI message, but doesn't
    * specify what it should be.  We've chosen the STOP message for our
    * implementation.
    */
   public ShortMessage()
   {
-    this(defaultMessage);   
+    this(defaultMessage);
   }
-  
+
   /**
    * Create a short MIDI message.
-   * 
+   *
    * The data argument should be a valid MIDI message.  Unfortunately the spec
    * does not allow us to throw an InvalidMidiDataException if data is invalid.
-   * 
+   *
    * @param data the message data
    */
   protected ShortMessage(byte[] data)
@@ -171,8 +171,8 @@ public class ShortMessage extends MidiMessage
   }
 
   /**
-   * Set the MIDI message. 
-   * 
+   * Set the MIDI message.
+   *
    * @param status the status byte for this message
    * @param data1 the first data byte for this message
    * @param data2 the second data byte for this message
@@ -189,19 +189,19 @@ public class ShortMessage extends MidiMessage
     if (length > 1)
     {
       if (data1 < 0 || data1 > 127)
-        throw new InvalidMidiDataException("data1 (" + data1 
+        throw new InvalidMidiDataException("data1 (" + data1
                                            + ") must be between 0 and 127.");
       data[1] = (byte) data1;
       if (length > 2)
       {
         if (data2 < 0 || data2 > 127)
-          throw new InvalidMidiDataException("data2 (" + data2 
+          throw new InvalidMidiDataException("data2 (" + data2
                                              + ") must be between 0 and 127.");
         data[2] = (byte) data2;
       }
     }
   }
-  
+
   public void setMessage(int command, int channel, int data1, int data2)
     throws InvalidMidiDataException
   {
@@ -209,10 +209,10 @@ public class ShortMessage extends MidiMessage
     // It currently assumes command and channel are valid values.
     setMessage(command + channel, data1, data2);
   }
-  
+
   /**
    * Set the MIDI message to one that requires no data bytes.
-   * 
+   *
    * @param status the status byte for this message
    * @throws InvalidMidiDataException if status is bad, or requires data
    */
@@ -227,10 +227,10 @@ public class ShortMessage extends MidiMessage
     setMessage(status, 0, 0);
   }
 
-  
+
   /**
    * Return the number of data bytes needed for a given MIDI status byte.
-   * 
+   *
    * @param status the status byte for a short MIDI message
    * @return the number of data bytes needed for this status byte
    * @throws InvalidMidiDataException if status is an invalid status byte
@@ -238,27 +238,27 @@ public class ShortMessage extends MidiMessage
   protected final int getDataLength(int status) throws InvalidMidiDataException
   {
     int originalStatus = status;
-    
+
     if ((status & 0xF0) != 0xF0)
       status &= 0xF0;
-    
+
     switch (status)
     {
-    case NOTE_OFF:  
-    case NOTE_ON:  
-    case POLY_PRESSURE:  
-    case CONTROL_CHANGE:  
+    case NOTE_OFF:
+    case NOTE_ON:
+    case POLY_PRESSURE:
+    case CONTROL_CHANGE:
     case PITCH_BEND:
     case SONG_POSITION_POINTER:
       return 2;
-        
+
     case PROGRAM_CHANGE:
     case CHANNEL_PRESSURE:
     case SONG_SELECT:
     case 0xF5:  // FIXME: unofficial bus select.  Not in spec??
       return 1;
-      
-    case TUNE_REQUEST: 
+
+    case TUNE_REQUEST:
     case END_OF_EXCLUSIVE:
     case TIMING_CLOCK:
     case START:
@@ -267,39 +267,39 @@ public class ShortMessage extends MidiMessage
     case ACTIVE_SENSING:
     case SYSTEM_RESET:
       return 0;
-      
+
     default:
-      throw new InvalidMidiDataException("Invalid status: 0x" 
+      throw new InvalidMidiDataException("Invalid status: 0x"
                                          + Integer.toHexString(originalStatus));
     }
   }
-  
+
   /**
-   * Get the channel information from this MIDI message, assuming it is a 
+   * Get the channel information from this MIDI message, assuming it is a
    * MIDI channel message.
-   * 
+   *
    * @return the MIDI channel for this message
    */
   public int getChannel()
   {
     return data[0] & 0x0F;
   }
-  
+
   /**
    * Get the command nibble from this MIDI message, assuming it is a MIDI
    * channel message.
-   * 
+   *
    * @return the MIDI command for this message
    */
   public int getCommand()
   {
     return data[0] & 0xF0;
   }
-  
+
   /**
-   * Get the first data byte from this message, assuming it exists, and 
+   * Get the first data byte from this message, assuming it exists, and
    * zero otherwise.
-   * 
+   *
    * @return the first data byte or zero if none exists.
    */
   public int getData1()
@@ -309,11 +309,11 @@ public class ShortMessage extends MidiMessage
     else
       return 0;
   }
-  
+
   /**
-   * Get the second data byte from this message, assuming it exists, and 
+   * Get the second data byte from this message, assuming it exists, and
    * zero otherwise.
-   * 
+   *
    * @return the second date byte or zero if none exists.
    */
   public int getData2()
@@ -323,7 +323,7 @@ public class ShortMessage extends MidiMessage
     else
       return 0;
   }
-  
+
   /* Create a deep-copy clone of this object.
    * @see java.lang.Object#clone()
    */
diff --git a/libjava/classpath/javax/sound/midi/Soundbank.java b/libjava/classpath/javax/sound/midi/Soundbank.java
index 16d9d79eaa6..d959cf5cd4d 100644
--- a/libjava/classpath/javax/sound/midi/Soundbank.java
+++ b/libjava/classpath/javax/sound/midi/Soundbank.java
@@ -39,9 +39,9 @@ exception statement from your version. */
 package javax.sound.midi;
 
 /**
- * A Soundbank is a container for instruments which may be loaded into 
+ * A Soundbank is a container for instruments which may be loaded into
  * a Synthesizer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -50,50 +50,50 @@ public interface Soundbank
 {
   /**
    * Get the sound bank name.
-   * 
+   *
    * @return the sound bank name
    */
   String getName();
-  
+
   /**
    * Get the sound bank version.
-   * 
+   *
    * @return the sound bank version
    */
   String getVersion();
 
   /**
    * Get the sound bank vendor.
-   * 
+   *
    * @return the sound bank vendor
    */
   String getVendor();
-  
-  
+
+
   /**
    * Get the sound bank description.
-   * 
+   *
    * @return the sound bank description
    */
   String getDescription();
-  
+
   /**
    * Get an array of non-Instrument resources in this sound bank.
-   * 
+   *
    * @return an array of non-instrument resources in this sound bank
    */
   SoundbankResource[] getResources();
-  
+
   /**
    * Get an array of Instruments in this sound bank.
-   * 
+   *
    * @return an array of instruments in this sound bank
    */
   Instrument[] getInstruments();
-  
+
   /**
    * Get the Instrument for the given Patch.
-   * 
+   *
    * @param patch the Patch to search for
    * @return the Instrument corresponding to patch
    */
diff --git a/libjava/classpath/javax/sound/midi/SoundbankResource.java b/libjava/classpath/javax/sound/midi/SoundbankResource.java
index 93f42e48e1d..0b4675b106f 100644
--- a/libjava/classpath/javax/sound/midi/SoundbankResource.java
+++ b/libjava/classpath/javax/sound/midi/SoundbankResource.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * SoundbankResource objects represent audio data stored in a sound bank.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -50,54 +50,54 @@ public abstract class SoundbankResource
   private final Soundbank soundbank;
   private final String name;
   private final Class dataClass;
-  
+
   /**
    * Create a SoundbankResource object.
-   * 
+   *
    * @param soundbank the soundbank object containing this resource
    * @param name the name of the resource
    * @param dataClass the class used to represent the audio data
    */
   protected SoundbankResource(Soundbank soundbank, String name, Class dataClass)
   {
-    this.soundbank = soundbank;   
+    this.soundbank = soundbank;
     this.name = name;
     this.dataClass = dataClass;
   }
-  
+
   /**
    * Get the sound bank containing this resource.
-   * 
+   *
    * @return the sound bank in which this resource resides
    */
   public Soundbank getSoundbank()
   {
     return soundbank;
   }
-  
+
   /**
    * Get the name of this resource.
-   * 
+   *
    * @return the name of this resource
    */
   public String getName()
   {
     return name;
   }
-  
+
   /**
    * Get the class used to represent the audio data for this resource.
-   * 
+   *
    * @return the class used to represent the audio data for this resource
    */
   public Class getDataClass()
   {
     return dataClass;
   }
-  
+
   /**
    * Get the audio data for this resource.
-   * 
+   *
    * @return the audio data object for this resource
    */
   public abstract Object getData();
diff --git a/libjava/classpath/javax/sound/midi/Synthesizer.java b/libjava/classpath/javax/sound/midi/Synthesizer.java
index 22e5e9256f4..3a7ab3c7b0c 100644
--- a/libjava/classpath/javax/sound/midi/Synthesizer.java
+++ b/libjava/classpath/javax/sound/midi/Synthesizer.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * Interface for MIDI audio synthesizer devices.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -49,122 +49,122 @@ public interface Synthesizer extends MidiDevice
 {
   /**
    * Get the maximum number of notes that the synth can play at once.
-   * 
+   *
    * @return the maximum number of notes that the synth can play at once
    */
   public int getMaxPolyphony();
-  
+
   /**
    * The processing latency for this synth in microseconds.
-   * 
+   *
    * @return the processing latency for this synth in microseconds
    */
   public long getLatency();
-  
+
   /**
    * Get the set of MIDI channels controlled by this synth.
-   * 
+   *
    * @return an array of MIDI channels controlled by this synth
    */
   public MidiChannel[] getChannels();
-  
+
   /**
    * Get the current status for the voices produced by this synth.
-   * 
+   *
    * @return an array of VoiceStatus objects, getMaxPolyphony() in length
    */
   public VoiceStatus[] getVoiceStatus();
-  
+
   /**
    * Returns true is this synth is capable of loading soundbank.
-   * 
+   *
    * @param soundbank the Soundbank to examine
    * @return true if soundbank can be loaded, false otherwise
    */
   public boolean isSoundbankSupported(Soundbank soundbank);
-  
+
   /**
    * Load an instrument into this synth.  The instrument must be part of a
    * supported soundbank.
-   * 
+   *
    * @param instrument the Instrument to load
    * @return true if the instrument was loaded and false otherwise
    * @throws IllegalArgumentException if this synth doesn't support instrument
    */
   public boolean loadInstrument(Instrument instrument);
-  
+
   /**
    * Unload an instrument from this synth.
-   * 
+   *
    * @param instrument the Instrument to unload
    * @throws IllegalArgumentException if this synth doesn't support instrument
    */
   public void unloadInstrument(Instrument instrument);
-  
+
   /**
    * Move an intrument from one place to another.  The instrument at the
    * target location is unloaded.
-   * 
+   *
    * @param from the instrument source
    * @param to the instrument target
    * @return if from was remapped
    * @throws IllegalArgumentException
    */
   public boolean remapInstrument(Instrument from, Instrument to);
-  
+
   /**
    * Get the default Soundbank for this synth.  Return null if there is no
    * default.
-   * 
+   *
    * @return the default Soundbank for this synth, possibly null.
    */
   public Soundbank getDefaultSoundbank();
-  
+
   /**
    * Get an array containing all instruments in this synthesizer.
-   * 
+   *
    * @return an array containing all instruments in this synthesizer
    */
   public Instrument[] getAvailableInstruments();
-  
+
   /**
    * Get an array containing all instruments loaded in this synthesizer.
-   * 
+   *
    * @return an array containing all instruments loaded in this synthesizer
    */
   public Instrument[] getLoadedInstruments();
-  
+
   /**
    * Load all soundbank instruments into this synthesizer.
-   * 
+   *
    * @param soundbank the Soundbank from which to load instruments
    * @return true if all instruments were loaded, false othewise
    * @throws IllegalArgumentException if the soundbank isn't supported by this
    */
   public boolean loadAllInstruments(Soundbank soundbank);
-  
+
   /**
    * Unload all soundbank instruments from this synthesizer.
-   * 
+   *
    * @param soundbank the Soundbank containing the instruments to unload
    * @throws IllegalArgumentException if the soundbank isn't supported by this
    */
   public void unloadAllInstruments(Soundbank soundbank);
-  
+
   /**
-   * Load a subset of soundbank instruments into this synthesizer.  The 
+   * Load a subset of soundbank instruments into this synthesizer.  The
    * subset is defined by an array of Patch objects.
-   * 
+   *
    * @param soundbank the Soundbank from which to load instruments
    * @param patchList the array of patches identifying instruments to load
    * @return true if instruments were loaded, false otherwise
    * @throws IllegalArgumentException if the soundbank isn't supported by this
    */
   public boolean loadInstruments(Soundbank soundbank, Patch[] patchList);
-  
+
   /**
    * Unload a subset of soundbank instruments from this synthesizer.
-   * 
+   *
    * @param soundbank the Soundbank containing the instruments to unload
    * @param patchList the array of patches identifying instruments to unload
    * @throws IllegalArgumentException if the soundbank isn't supported by this
diff --git a/libjava/classpath/javax/sound/midi/SysexMessage.java b/libjava/classpath/javax/sound/midi/SysexMessage.java
index 3744e2f6bc6..93e3b5d0945 100644
--- a/libjava/classpath/javax/sound/midi/SysexMessage.java
+++ b/libjava/classpath/javax/sound/midi/SysexMessage.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * A system exclusive MIDI message.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -48,14 +48,14 @@ package javax.sound.midi;
 public class SysexMessage extends MidiMessage
 {
   public static final int SYSTEM_EXCLUSIVE = 0xF0;
-  
+
   public static final int SPECIAL_SYSTEM_EXCLUSIVE = 0xF7;
-  
+
   /**
    * Create a default valid system exclusive message.
-   * 
+   *
    * The official specs don't specify what message is to be
-   * created.  Our implementation creates an empty 
+   * created.  Our implementation creates an empty
    * system exclusive message.
    */
   public SysexMessage()
@@ -64,20 +64,20 @@ public class SysexMessage extends MidiMessage
     data[0] = (byte) SYSTEM_EXCLUSIVE;
     data[1] = (byte) ShortMessage.END_OF_EXCLUSIVE;
   }
-  
+
   /**
    * Create a SysexMessage object.
    * @param data a complete system exclusive message
    */
   protected SysexMessage(byte[] data)
   {
-    super(data);   
+    super(data);
   }
-  
+
   /**
    * Set the sysex message.  The first data byte (status) must be
    * 0xF0 or 0xF7.
-   *  
+   *
    * @param data the message data
    * @param length the length of the message data
    * @throws InvalidMidiDataException if the status byte is not 0xF0 or 0xF7
@@ -95,7 +95,7 @@ public class SysexMessage extends MidiMessage
 
   /**
    * Set the sysex message.  status must be either 0xF0 or 0xF7.
-   *  
+   *
    * @param status the sysex statys byte (0xF0 or 0xF7)
    * @param data the message data
    * @param length the length of the message data
@@ -114,7 +114,7 @@ public class SysexMessage extends MidiMessage
     System.arraycopy(data, 0, this.data, 1, length);
     this.length = length+1;
   }
-  
+
   /**
    * Get the data for this message, not including the status byte.
    * @return the message data, not including the status byte
@@ -125,7 +125,7 @@ public class SysexMessage extends MidiMessage
     System.arraycopy(data, 1, result, 0, length - 1);
     return result;
   }
-  
+
   /* Create a deep-copy clone of this object.
    * @see java.lang.Object#clone()
    */
@@ -133,7 +133,6 @@ public class SysexMessage extends MidiMessage
   {
     byte message[] = new byte[length];
     System.arraycopy(data, 0, message, 0, length);
-    return new SysexMessage(message); 
+    return new SysexMessage(message);
   }
 }
-
diff --git a/libjava/classpath/javax/sound/midi/Track.java b/libjava/classpath/javax/sound/midi/Track.java
index eed5d4c2de0..550d2e1c4ab 100644
--- a/libjava/classpath/javax/sound/midi/Track.java
+++ b/libjava/classpath/javax/sound/midi/Track.java
@@ -42,9 +42,9 @@ import java.util.HashSet;
 import java.util.Vector;
 
 /**
- * A Track contains a list of timecoded MIDI events for processing 
+ * A Track contains a list of timecoded MIDI events for processing
  * by a Sequencer.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -52,10 +52,10 @@ import java.util.Vector;
 public class Track
 {
   /**
-   * The list of MidiEvents for this track. 
+   * The list of MidiEvents for this track.
    */
   Vector events = new Vector();
-  
+
   // A HashSet to speed processing
   private HashSet eventSet = new HashSet();
 
@@ -68,7 +68,7 @@ public class Track
    * Add a new event to this track.  Specific events may only be added once.
    * The event will be inserted into the appropriate spot in the event list
    * based on its timecode.
-   * 
+   *
    * @param event the event to add
    * @return true if the event was added, false otherwise
    */
@@ -78,7 +78,7 @@ public class Track
     {
       if (eventSet.contains(event))
         return false;
-    
+
       eventSet.add(event);
 
       long targetTick = event.getTick();
@@ -89,10 +89,10 @@ public class Track
       return true;
     }
   }
-    
+
   /**
    * Remove an event from this track.
-   * 
+   *
    * @param event the event to remove
    * @return true if the event was removed, false otherwise
    */
@@ -102,21 +102,21 @@ public class Track
     {
       if (! eventSet.remove(event))
         return false;
-          
+
       int i = events.indexOf(event);
       if (i >= 0)
         {
           events.remove(i);
           return true;
         }
-         
+
       throw new InternalError("event in set but not list");
     }
   }
-  
+
   /**
    * Get an event idetified by its order index
-   * 
+   *
    * @param index the location of the event to get
    * @return the event at index
    * @throws ArrayIndexOutOfBoundsException if index is out of bounds
@@ -131,16 +131,16 @@ public class Track
       }
       catch (IndexOutOfBoundsException e)
       {
-        throw (ArrayIndexOutOfBoundsException) 
+        throw (ArrayIndexOutOfBoundsException)
           new ArrayIndexOutOfBoundsException().initCause(e);
       }
     }
   }
-  
-  
+
+
   /**
    * Get the number events in this track.
-   * 
+   *
    * @return the number of events in this track
    */
   public int size()
@@ -150,7 +150,7 @@ public class Track
 
   /**
    * Get the length of the track in MIDI ticks.
-   * 
+   *
    * @return the length of the track in MIDI ticks
    */
   public long ticks()
@@ -162,4 +162,3 @@ public class Track
     }
   }
  }
-
diff --git a/libjava/classpath/javax/sound/midi/Transmitter.java b/libjava/classpath/javax/sound/midi/Transmitter.java
index d788725e065..ab81cc8198d 100644
--- a/libjava/classpath/javax/sound/midi/Transmitter.java
+++ b/libjava/classpath/javax/sound/midi/Transmitter.java
@@ -41,7 +41,7 @@ package javax.sound.midi;
 /**
  * This interface specifies the methods required by objects which send
  * MIDI events to Receivers, including MIDI IN ports and Sequencers.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -50,14 +50,14 @@ public interface Transmitter
 {
   /**
    * Set the Receiver to which MIDI events will be sent.
-   * 
+   *
    * @param receiver the Receiver to which MIDI events will be sent
    */
   public void setReceiver(Receiver receiver);
-  
+
   /**
    * Get the Receiver to which MIDI events will be sent (possibly null)
-   * 
+   *
    * @return the Receiver to which MIDI events will be sent (possibly null)
    */
   public Receiver getReceiver();
@@ -66,5 +66,5 @@ public interface Transmitter
    * Close this Transmitter, possibly releasing system resources.
    * FIXME: Does this mean the Receiver is closed?  I think it must.
    */
-  public void close();  
+  public void close();
 }
diff --git a/libjava/classpath/javax/sound/midi/VoiceStatus.java b/libjava/classpath/javax/sound/midi/VoiceStatus.java
index a6a9c3f87c8..2ba0c9ea1fe 100644
--- a/libjava/classpath/javax/sound/midi/VoiceStatus.java
+++ b/libjava/classpath/javax/sound/midi/VoiceStatus.java
@@ -40,7 +40,7 @@ package javax.sound.midi;
 
 /**
  * Objects of this type define the status of a Synthesizer voice.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,27 +51,27 @@ public class VoiceStatus
    * True if this voice is processing a MIDI note.
    */
   public boolean active = false;
-  
+
   /**
    * The channel for this voice when active.
    */
   public int channel = 0;
-  
+
   /**
    * The bank of the voice when active.
    */
   public int bank = 0;
-  
+
    /**
    * The program for this voice when active.
    */
   public int program = 0;
-  
+
   /**
    * The note for this voice when active.
    */
   public int note = 0;
-  
+
   /**
    * The volume for this voice when active.
    */
diff --git a/libjava/classpath/javax/sound/midi/spi/MidiDeviceProvider.java b/libjava/classpath/javax/sound/midi/spi/MidiDeviceProvider.java
index 537edb2b3d0..7119ec4a232 100644
--- a/libjava/classpath/javax/sound/midi/spi/MidiDeviceProvider.java
+++ b/libjava/classpath/javax/sound/midi/spi/MidiDeviceProvider.java
@@ -42,7 +42,7 @@ import javax.sound.midi.*;
 
 /**
  * The abstract base class for all MidiDeviceProvider types.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -51,36 +51,36 @@ public abstract class MidiDeviceProvider
 {
   /**
    * Returns true if this provider supports a specific MIDI device.
-   * 
+   *
    * @param info the MIDI device descriptor
    * @return true if this provider supports info
    */
   public boolean isDeviceSupported(MidiDevice.Info info)
   {
     MidiDevice.Info infos[] = getDeviceInfo();
-    
+
     int i = infos.length;
-    
+
     while (i > 0)
     {
       if (info.equals(infos[--i]))
         return true;
     }
-    
+
     return false;
   }
-  
+
   /**
    * Get the list descriptors for all MIDI devices supported by
    * this provider.
-   * 
+   *
    * @return an array of descriptors for all supported MIDI devices.
    */
   public abstract MidiDevice.Info[] getDeviceInfo();
-  
+
   /**
    * Get the MidiDevice for the MIDI device described by info
-   * 
+   *
    * @param info the descriptor for the MIDI device we want
    * @return the MidiDevice we're looking for
    * @throws IllegalArgumentException is this provider doesn't support info
diff --git a/libjava/classpath/javax/sound/midi/spi/MidiFileReader.java b/libjava/classpath/javax/sound/midi/spi/MidiFileReader.java
index 4342ebf5e2b..d370a8a448b 100644
--- a/libjava/classpath/javax/sound/midi/spi/MidiFileReader.java
+++ b/libjava/classpath/javax/sound/midi/spi/MidiFileReader.java
@@ -50,7 +50,7 @@ import javax.sound.midi.Sequence;
 /**
  * The MidiFileReader abstract class defines the methods to be provided
  * by a MIDI file reader.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -59,7 +59,7 @@ public abstract class MidiFileReader
 {
   /**
    * Read a MidiFileFormat from the given stream.
-   * 
+   *
    * @param stream the stream from which to read the MIDI data
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if the stream refers to invalid data
@@ -67,32 +67,32 @@ public abstract class MidiFileReader
    */
   public abstract MidiFileFormat getMidiFileFormat(InputStream stream)
     throws InvalidMidiDataException, IOException;
-  
+
   /**
    * Read a MidiFileFormat from the given stream.
-   * 
+   *
    * @param url the url from which to read the MIDI data
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if the url refers to invalid data
    * @throws IOException if an I/O exception occurs while reading
    */
   public abstract MidiFileFormat getMidiFileFormat(URL url)
-    throws InvalidMidiDataException, IOException;  
+    throws InvalidMidiDataException, IOException;
 
   /**
    * Read a MidiFileFormat from the given stream.
-   * 
+   *
    * @param file the file from which to read the MIDI data
    * @return the MidiFileFormat object
    * @throws InvalidMidiDataException if the file refers to invalid data
    * @throws IOException if an I/O exception occurs while reading
    */
   public abstract MidiFileFormat getMidiFileFormat(File file)
-    throws InvalidMidiDataException, IOException; 
-  
+    throws InvalidMidiDataException, IOException;
+
   /**
    * Read a Sequence from the given stream.
-   * 
+   *
    * @param stream the stream from which to read the MIDI data
    * @return the Sequence object
    * @throws InvalidMidiDataException if the stream refers to invalid data
@@ -100,26 +100,26 @@ public abstract class MidiFileReader
    */
   public abstract Sequence getSequence(InputStream stream)
     throws InvalidMidiDataException, IOException;
-  
+
   /**
    * Read a Sequence from the given stream.
-   * 
+   *
    * @param url the url from which to read the MIDI data
    * @return the Sequence object
    * @throws InvalidMidiDataException if the url refers to invalid data
    * @throws IOException if an I/O exception occurs while reading
    */
   public abstract Sequence getSequence(URL url)
-    throws InvalidMidiDataException, IOException;  
+    throws InvalidMidiDataException, IOException;
 
   /**
    * Read a Sequence from the given stream.
-   * 
+   *
    * @param file the file from which to read the MIDI data
    * @return the Sequence object
    * @throws InvalidMidiDataException if the file refers to invalid data
    * @throws IOException if an I/O exception occurs while reading
    */
   public abstract Sequence getSequence(File file)
-    throws InvalidMidiDataException, IOException; 
+    throws InvalidMidiDataException, IOException;
 }
diff --git a/libjava/classpath/javax/sound/midi/spi/MidiFileWriter.java b/libjava/classpath/javax/sound/midi/spi/MidiFileWriter.java
index e2a1f55c6e0..08aee36f0b5 100644
--- a/libjava/classpath/javax/sound/midi/spi/MidiFileWriter.java
+++ b/libjava/classpath/javax/sound/midi/spi/MidiFileWriter.java
@@ -45,20 +45,20 @@ import java.io.OutputStream;
 import javax.sound.midi.Sequence;
 
 /**
- * MidiFileWriter provides MIDI file writing services. 
- * 
- * There are three types of Standard MIDI File (SMF) formats, 
+ * MidiFileWriter provides MIDI file writing services.
+ *
+ * There are three types of Standard MIDI File (SMF) formats,
  * represented by integers 0, 1, and 2.
- * 
+ *
  * Type 0 files contain a single track and represents a single song
  * performance.
  * Type 1 may contain multiple tracks for a single song performance.
  * Type 2 may contain multiple tracks, each representing a
  * separate song performance.
- * 
+ *
  * See http://en.wikipedia.org/wiki/MIDI#MIDI_file_formats for more
  * information.
- *  
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -67,23 +67,23 @@ public abstract class MidiFileWriter
 {
   /**
    * Return the MIDI file types supported by this writer.
-   * 
+   *
    * @return the MIDI file types, or an empty array
    */
   public abstract int[] getMidiFileTypes();
-  
+
   /**
    * Return the MIDI file types supported by this writer for the
    * given sequence.
-   * 
+   *
    * @param sequence the sequence we'd like to write
    * @return the MIDI file types, or an empty array
    */
   public abstract int[] getMidiFileTypes(Sequence sequence);
-  
+
   /**
    * Returns true if this writer supports the given file type.
-   * 
+   *
    * @param fileType the file type we're asking about
    * @return true if this writer supports fileType, false otherwise
    */
@@ -101,7 +101,7 @@ public abstract class MidiFileWriter
   /**
    * Returns true if this writer supports the given file type for the
    * given sequence.
-   * 
+   *
    * @param fileType the file type we're asking about
    * @param sequence the sequence we'd like to write
    * @return true if this writer supports fileType, false otherwise
@@ -119,7 +119,7 @@ public abstract class MidiFileWriter
 
   /**
    * Write a sequence to a stream using the specified MIDI file type.
-   * 
+   *
    * @param in the sequence to write
    * @param fileType the MIDI file type to use
    * @param out the output stream to write to
@@ -131,7 +131,7 @@ public abstract class MidiFileWriter
 
   /**
    * Write a sequence to a file using the specified MIDI file type.
-   * 
+   *
    * @param in the sequence to write
    * @param fileType the MIDI file type to use
    * @param out the file to write to
diff --git a/libjava/classpath/javax/sound/midi/spi/SoundbankReader.java b/libjava/classpath/javax/sound/midi/spi/SoundbankReader.java
index dbf2bb0183a..948d54fd14b 100644
--- a/libjava/classpath/javax/sound/midi/spi/SoundbankReader.java
+++ b/libjava/classpath/javax/sound/midi/spi/SoundbankReader.java
@@ -49,7 +49,7 @@ import javax.sound.midi.Soundbank;
 /**
  * The SoundbankReader abstract class defines the methods to be provided
  * by a soundbank file reader.
- * 
+ *
  * @author Anthony Green (green@redhat.com)
  * @since 1.3
  *
@@ -58,37 +58,37 @@ public abstract class SoundbankReader
 {
   /**
    * Get a Soundbank from the given URL.
-   * 
+   *
    * @param url from which to read the Soundbank
-   * 
+   *
    * @return the Soundbank object
-   * 
+   *
    * @throws InvalidMidiDataException if the data provided by url cannot be recognized
    * @throws IOException if the data provided by url cannot be read
    */
   public abstract Soundbank getSoundbank(URL url)
     throws InvalidMidiDataException, IOException;
-  
+
   /**
    * Get a Soundbank from the given InputStream.
-   * 
+   *
    * @param stream from which to read the Soundbank
-   * 
+   *
    * @return the Soundbank object
-   * 
+   *
    * @throws InvalidMidiDataException if the data provided by InputStream cannot be recognized
    * @throws IOException if the data provided by InputStream cannot be read
    */
   public abstract Soundbank getSoundbank(InputStream stream)
     throws InvalidMidiDataException, IOException;
-  
+
   /**
    * Get a Soundbank from the given File.
-   * 
+   *
    * @param file from which to read the Soundbank
-   * 
+   *
    * @return the Soundbank object
-   * 
+   *
    * @throws InvalidMidiDataException if the data provided by File cannot be recognized
    * @throws IOException if the data provided by File cannot be read
    */
diff --git a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
index 899258c050b..2eeb78cf38e 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
@@ -143,7 +143,7 @@ public class AudioFileFormat
 
   /**
    * Create a new AudioFileFormat given the type, the format, the
-   * frame length, and some properties.  The new object will have an 
+   * frame length, and some properties.  The new object will have an
    * unspecified byte length.  A copy of the properties argument will
    * be made, so changes to the map passed in will not affect the
    * new AudioFileFormat.
@@ -153,7 +153,7 @@ public class AudioFileFormat
    * @param properties the properties
    */
   public AudioFileFormat(Type type, AudioFormat fmt, int frameLen,
-			 Map properties)
+                         Map properties)
   {
     this.byteLength = AudioSystem.NOT_SPECIFIED;
     this.format = fmt;
@@ -171,7 +171,7 @@ public class AudioFileFormat
    * @param frameLen the frame length
    */
   protected AudioFileFormat(Type type, int byteLen, AudioFormat fmt,
-			    int frameLen)
+                            int frameLen)
   {
     this.byteLength = byteLen;
     this.format = fmt;
@@ -237,6 +237,6 @@ public class AudioFileFormat
   public String toString()
   {
     return ("byteLength=" + byteLength + "; format=" + format
-	    + "; type=" + type + "; frameLength=" + frameLength);
+            + "; type=" + type + "; frameLength=" + frameLength);
   }
 }
diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java
index 1f31c9929d1..b4fc601f2fd 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java
@@ -140,7 +140,7 @@ public class AudioFormat
   /**
    * Create a new audio format, given various attributes of it.
    * The properties map for this format will be empty.
-   * 
+   *
    * @param encoding the encoding for this format
    * @param sampleRate the sample rate
    * @param sampleSizeInBits the sample size, in bits
@@ -150,8 +150,8 @@ public class AudioFormat
    * @param bigEndian true if the data is stored big-endian
    */
   public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits,
-		     int channels, int frameSize, float frameRate,
-		     boolean bigEndian)
+                     int channels, int frameSize, float frameRate,
+                     boolean bigEndian)
   {
     this.encoding = encoding;
     this.sampleRate = sampleRate;
@@ -178,8 +178,8 @@ public class AudioFormat
    * @param properties a map describing properties of this format
    */
   public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits,
-		     int channels, int frameSize, float frameRate,
-		     boolean bigEndian, Map properties)
+                     int channels, int frameSize, float frameRate,
+                     boolean bigEndian, Map properties)
   {
     this.encoding = encoding;
     this.sampleRate = sampleRate;
@@ -198,7 +198,7 @@ public class AudioFormat
    * bits and the number of channels, unless one of those is
    * AudioSystem#NOT_SPECIFIED.  The frame rate will be the same as the sample
    * rate, and the properties map will be empty.
-   * 
+   *
    * @param sampleRate the sample rate
    * @param sampleSizeInBits the sample size, in bits
    * @param channels the number of channels
@@ -206,7 +206,7 @@ public class AudioFormat
    * @param bigEndian true if the data is stored big-endian
    */
   public AudioFormat(float sampleRate, int sampleSizeInBits,
-		     int channels, boolean signed, boolean bigEndian)
+                     int channels, boolean signed, boolean bigEndian)
   {
     this.encoding = signed ? Encoding.PCM_SIGNED : Encoding.PCM_UNSIGNED;
     this.sampleRate = sampleRate;
@@ -257,7 +257,7 @@ public class AudioFormat
 
   /**
    * Given a key, return a property associated with this format;
-   * or null if this property is not set. 
+   * or null if this property is not set.
    * @param key the name of the property
    * @return the value of the property, or null if the property is not set
    */
@@ -318,7 +318,7 @@ public class AudioFormat
   }
 
   /**
-   * Return a read-only Map holding the properties associated with 
+   * Return a read-only Map holding the properties associated with
    * this format.
    */
   public Map properties()
@@ -332,24 +332,24 @@ public class AudioFormat
   public String toString()
   {
     CPStringBuilder result = new CPStringBuilder();
-    
+
     // usually at least encoding should be somewhat specified
     result.append(encoding);
-    
+
     if (sampleRate != AudioSystem.NOT_SPECIFIED)
       {
         result.append(" ");
         result.append(sampleRate);
         result.append(" Hz");
       }
-    
+
     if (sampleSizeInBits != AudioSystem.NOT_SPECIFIED)
       {
         result.append(" ");
         result.append(sampleSizeInBits);
         result.append(" bits");
       }
-    
+
     if (channels != AudioSystem.NOT_SPECIFIED)
       {
         result.append(" ");
@@ -357,10 +357,10 @@ public class AudioFormat
         result.append(" channel");
         if (channels > 1) result.append("s");
       }
-    
+
     if (sampleSizeInBits > 8)
       result.append(bigEndian ? " big endian" : " little endian");
-    
+
     return result.toString();
   }
 }
diff --git a/libjava/classpath/javax/sound/sampled/AudioInputStream.java b/libjava/classpath/javax/sound/sampled/AudioInputStream.java
index 863578b0b6d..526e7e192db 100644
--- a/libjava/classpath/javax/sound/sampled/AudioInputStream.java
+++ b/libjava/classpath/javax/sound/sampled/AudioInputStream.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,7 +55,7 @@ public class AudioInputStream extends InputStream
   /** The length of the audio stream in frames.  */
   protected long frameLength;
 
-  /** The current frame position, starting from frame zero.  */ 
+  /** The current frame position, starting from frame zero.  */
   protected long framePos;
 
   /** The size of a frame in bytes.  */
@@ -92,7 +92,7 @@ public class AudioInputStream extends InputStream
   public AudioInputStream(TargetDataLine line)
   {
     this(new TargetInputStream(line), line.getFormat(),
-	 AudioSystem.NOT_SPECIFIED);
+         AudioSystem.NOT_SPECIFIED);
   }
 
   /**
@@ -181,30 +181,30 @@ public class AudioInputStream extends InputStream
       result = -1;
     else
       {
-	int myFrameSize = (frameSize == AudioSystem.NOT_SPECIFIED
-			   ? 1 : frameSize);
-	// Ensure length is a multiple of frame size.
-	length -= length % myFrameSize;
+        int myFrameSize = (frameSize == AudioSystem.NOT_SPECIFIED
+                           ? 1 : frameSize);
+        // Ensure length is a multiple of frame size.
+        length -= length % myFrameSize;
 
-	result = 0;
-	while (result == 0 || result % myFrameSize != 0)
-	  {
-	    int val = input.read(buf, offset, length);
-	    if (val < 0)
-	      {
-		// This is a weird situation as we might have read a
-		// frame already.  It isn't clear at all what to do if
-		// we only found a partial frame.  For now we just
-		// return whatever we did find.
-		if (result == 0)
-		  return -1;
-		result -= result % myFrameSize;
-		break;
-	      }
-	    result += val;
-	  }
-	// assert result % myFrameSize == 0;
-	framePos += result / myFrameSize;
+        result = 0;
+        while (result == 0 || result % myFrameSize != 0)
+          {
+            int val = input.read(buf, offset, length);
+            if (val < 0)
+              {
+                // This is a weird situation as we might have read a
+                // frame already.  It isn't clear at all what to do if
+                // we only found a partial frame.  For now we just
+                // return whatever we did find.
+                if (result == 0)
+                  return -1;
+                result -= result % myFrameSize;
+                break;
+              }
+            result += val;
+          }
+        // assert result % myFrameSize == 0;
+        framePos += result / myFrameSize;
       }
     return result;
   }
@@ -212,7 +212,7 @@ public class AudioInputStream extends InputStream
   public void reset() throws IOException
   {
     input.reset();
-    framePos = markedFramePos;    
+    framePos = markedFramePos;
   }
 
   public long skip(long n) throws IOException
@@ -243,10 +243,10 @@ public class AudioInputStream extends InputStream
     public synchronized int read() throws IOException
     {
       if (buf == null)
-	buf = new byte[1];
+        buf = new byte[1];
       int count = read(buf, 0, 1);
       if (count < 0)
-	return -1;
+        return -1;
       return buf[0];
     }
 
diff --git a/libjava/classpath/javax/sound/sampled/AudioPermission.java b/libjava/classpath/javax/sound/sampled/AudioPermission.java
index 6698e35ced2..a5325c91033 100644
--- a/libjava/classpath/javax/sound/sampled/AudioPermission.java
+++ b/libjava/classpath/javax/sound/sampled/AudioPermission.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/sound/sampled/AudioSystem.java b/libjava/classpath/javax/sound/sampled/AudioSystem.java
index e858f176d6b..01133c91d3a 100644
--- a/libjava/classpath/javax/sound/sampled/AudioSystem.java
+++ b/libjava/classpath/javax/sound/sampled/AudioSystem.java
@@ -57,7 +57,7 @@ import javax.sound.sampled.spi.MixerProvider;
  * This clas is the primary interface to the audio system.  It contains
  * a number of static methods which can be used to access this package's
  * functionality.
- * 
+ *
  * @since 1.3
  */
 public class AudioSystem
@@ -77,7 +77,7 @@ public class AudioSystem
    * Return the file format of a given File.
    * @param f the file to check
    * @return the format of the file
-   * @throws UnsupportedAudioFileException if the file's format is not 
+   * @throws UnsupportedAudioFileException if the file's format is not
    * recognized
    * @throws IOException if there is an I/O error reading the file
    */
@@ -104,7 +104,7 @@ public class AudioSystem
    * Return the file format of a given input stream.
    * @param is the input stream to check
    * @return the format of the stream
-   * @throws UnsupportedAudioFileException if the stream's format is not 
+   * @throws UnsupportedAudioFileException if the stream's format is not
    * recognized
    * @throws IOException if there is an I/O error reading the stream
    */
@@ -131,7 +131,7 @@ public class AudioSystem
    * Return the file format of a given URL.
    * @param url the URL to check
    * @return the format of the URL
-   * @throws UnsupportedAudioFileException if the URL's format is not 
+   * @throws UnsupportedAudioFileException if the URL's format is not
    * recognized
    * @throws IOException if there is an I/O error reading the URL
    */
@@ -197,14 +197,14 @@ public class AudioSystem
   /**
    * Given an audio input stream, this will try to create a new audio input
    * stream whose encoding matches the given target encoding.  If no provider
-   * offers this conversion, an exception is thrown. 
+   * offers this conversion, an exception is thrown.
    * @param targ the target encoding
    * @param ais the original audio stream
    * @return a new audio stream
    * @throws IllegalArgumentException if the conversion cannot be made
    */
   public static AudioInputStream getAudioInputStream(AudioFormat.Encoding targ,
-						     AudioInputStream ais)
+                                                     AudioInputStream ais)
   {
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
@@ -220,14 +220,14 @@ public class AudioSystem
   /**
    * Given an audio input stream, this will try to create a new audio input
    * stream whose format matches the given target format.  If no provider
-   * offers this conversion, an exception is thrown. 
+   * offers this conversion, an exception is thrown.
    * @param targ the target format
    * @param ais the original audio stream
    * @return a new audio stream
    * @throws IllegalArgumentException if the conversion cannot be made
    */
   public static AudioInputStream getAudioInputStream(AudioFormat targ,
-						     AudioInputStream ais)
+                                                     AudioInputStream ais)
   {
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
@@ -457,7 +457,7 @@ public class AudioSystem
    * @since 1.5
    */
   public static SourceDataLine getSourceDataLine(AudioFormat fmt,
-						 Mixer.Info mixer)
+                                                 Mixer.Info mixer)
     throws LineUnavailableException
   {
     DataLine.Info info = new DataLine.Info(SourceDataLine.class, fmt);
@@ -489,7 +489,7 @@ public class AudioSystem
   /**
    * Find and return a target data line matching the given audio format.
    * @param fmt the format to match
-   * @throws LineUnavailableException if no matching line was found 
+   * @throws LineUnavailableException if no matching line was found
    * @since 1.5
    */
   public static TargetDataLine getTargetDataLine(AudioFormat fmt)
@@ -517,7 +517,7 @@ public class AudioSystem
    * @since 1.5
    */
   public static TargetDataLine getTargetDataLine(AudioFormat fmt,
-						 Mixer.Info mixer)
+                                                 Mixer.Info mixer)
     throws LineUnavailableException
   {
     DataLine.Info info = new DataLine.Info(TargetDataLine.class, fmt);
@@ -571,12 +571,12 @@ public class AudioSystem
 
   /**
    * Given a target encoding and a source audio format, return an array of all
-   * matching audio formats to which data in this source format can be converted. 
+   * matching audio formats to which data in this source format can be converted.
    * @param encoding the target encoding
    * @param sourceFmt the source format
    */
   public static AudioFormat[] getTargetFormats(AudioFormat.Encoding encoding,
-					       AudioFormat sourceFmt)
+                                               AudioFormat sourceFmt)
   {
     HashSet result = new HashSet();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
@@ -616,9 +616,9 @@ public class AudioSystem
    * @param source the source format
    */
   public static boolean isConversionSupported(AudioFormat.Encoding targ,
-					      AudioFormat source)
+                                              AudioFormat source)
   {
-    Iterator i 
+    Iterator i
       = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -636,9 +636,9 @@ public class AudioSystem
    * @param source the source format
    */
   public static boolean isConversionSupported(AudioFormat targ,
-					      AudioFormat source)
+                                              AudioFormat source)
   {
-    Iterator i 
+    Iterator i
       = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -672,20 +672,20 @@ public class AudioSystem
 
   /**
    * Return true if the given audio file format is supported for the
-   * given audio input stream by one of the providers installed on the 
+   * given audio input stream by one of the providers installed on the
    * system.
    * @param type the audio file format type
    * @param ais the audio input stream
    */
   public static boolean isFileTypeSupported(AudioFileFormat.Type type,
-					    AudioInputStream ais)
+                                            AudioInputStream ais)
   {
     return isFileTypeSupported(getAudioFileTypes(ais), type);
   }
 
   /**
    * Return true if some provider on the system supplies a line
-   * matching the argument. 
+   * matching the argument.
    * @param info the line to match
    */
   public static boolean isLineSupported(Line.Info info)
@@ -711,7 +711,7 @@ public class AudioSystem
    * @throws IllegalArgumentException if the file type is not supported
    */
   public static int write(AudioInputStream ais, AudioFileFormat.Type type,
-			  File out)
+                          File out)
     throws IOException
   {
     Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
@@ -736,7 +736,7 @@ public class AudioSystem
    * @throws IllegalArgumentException if the file type is not supported
    */
   public static int write(AudioInputStream ais, AudioFileFormat.Type type,
-			  OutputStream os)
+                          OutputStream os)
     throws IOException
   {
     Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
diff --git a/libjava/classpath/javax/sound/sampled/BooleanControl.java b/libjava/classpath/javax/sound/sampled/BooleanControl.java
index 0a78e493fca..37e372e7b4f 100644
--- a/libjava/classpath/javax/sound/sampled/BooleanControl.java
+++ b/libjava/classpath/javax/sound/sampled/BooleanControl.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -99,7 +99,7 @@ public abstract class BooleanControl extends Control
    * @param falseLabel the label for the false state
    */
   protected BooleanControl(Type type, boolean init, String trueLabel,
-			   String falseLabel)
+                           String falseLabel)
   {
     super(type);
     this.value = init;
diff --git a/libjava/classpath/javax/sound/sampled/Clip.java b/libjava/classpath/javax/sound/sampled/Clip.java
index 1fa769470a2..28b49796fea 100644
--- a/libjava/classpath/javax/sound/sampled/Clip.java
+++ b/libjava/classpath/javax/sound/sampled/Clip.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/sound/sampled/CompoundControl.java b/libjava/classpath/javax/sound/sampled/CompoundControl.java
index 556c805ad3b..2b8941cf3b2 100644
--- a/libjava/classpath/javax/sound/sampled/CompoundControl.java
+++ b/libjava/classpath/javax/sound/sampled/CompoundControl.java
@@ -95,9 +95,9 @@ public abstract class CompoundControl extends Control
     result.append(": ");
     for (int i = 0; i < memberControls.length; ++i)
       {
-	if (i > 0)
-	  result.append(", ");
-	result.append(memberControls[i].toString());
+        if (i > 0)
+          result.append(", ");
+        result.append(memberControls[i].toString());
       }
     return result.toString();
   }
diff --git a/libjava/classpath/javax/sound/sampled/DataLine.java b/libjava/classpath/javax/sound/sampled/DataLine.java
index 4482c9885db..5d88c6ace26 100644
--- a/libjava/classpath/javax/sound/sampled/DataLine.java
+++ b/libjava/classpath/javax/sound/sampled/DataLine.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005-2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -43,7 +43,7 @@ import gnu.java.lang.CPStringBuilder;
  * The DataLine interface adds data-related functionality to the Line
  * interface.  For example, it adds methods to start and stop the data
  * on the line.
- * @since 1.3 
+ * @since 1.3
  */
 public interface DataLine extends Line
 {
@@ -158,7 +158,7 @@ public interface DataLine extends Line
       if (minBufferSize < other.minBufferSize ||
           maxBufferSize > other.maxBufferSize)
         return false;
-      
+
       for (int i = 0; i < formats.length; ++i)
         {
           boolean ok = false;
@@ -173,7 +173,7 @@ public interface DataLine extends Line
           if (! ok)
             return false;
         }
-      
+
       return true;
     }
 
@@ -190,14 +190,14 @@ public interface DataLine extends Line
             result.append(", ");
           result.append(formats[i].toString());
         }
-      
+
       result.append("]; minBufferSize: ");
       result.append(minBufferSize);
       result.append("; maxBufferSize: ");
       result.append(maxBufferSize);
       return result.toString();
     }
-    
+
   } // end class: Info
 
   /**
@@ -237,7 +237,7 @@ public interface DataLine extends Line
   float getLevel();
 
   /**
-   * Return the current frame position. 
+   * Return the current frame position.
    * @since 1.5
    */
   long getLongFramePosition();
diff --git a/libjava/classpath/javax/sound/sampled/EnumControl.java b/libjava/classpath/javax/sound/sampled/EnumControl.java
index 1ddc8a9a838..7a032420ddd 100644
--- a/libjava/classpath/javax/sound/sampled/EnumControl.java
+++ b/libjava/classpath/javax/sound/sampled/EnumControl.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,7 +40,7 @@ package javax.sound.sampled;
 
 /**
  * An EnumControl is a Control which can take one of a specified set of
- * values. 
+ * values.
  * @since 1.3
  */
 public abstract class EnumControl extends Control
@@ -110,8 +110,8 @@ public abstract class EnumControl extends Control
   {
     for (int i = 0; i < values.length; ++i)
       {
-	if (! values[i].equals(value))
-	  throw new IllegalArgumentException("value not supported");
+        if (! values[i].equals(value))
+          throw new IllegalArgumentException("value not supported");
       }
     this.value = value;
   }
diff --git a/libjava/classpath/javax/sound/sampled/FloatControl.java b/libjava/classpath/javax/sound/sampled/FloatControl.java
index bbdb24bab23..6ae9178292c 100644
--- a/libjava/classpath/javax/sound/sampled/FloatControl.java
+++ b/libjava/classpath/javax/sound/sampled/FloatControl.java
@@ -97,7 +97,7 @@ public abstract class FloatControl extends Control
   /**
    * Create a new FloatControl given its type and various parameters.
    * The minimum, maximum, and midpoint labels will all be the empty string.
-   * 
+   *
    * @param type the type
    * @param min the minimum valuee
    * @param max the maximum value
@@ -107,7 +107,7 @@ public abstract class FloatControl extends Control
    * @param units the description of the units
    */
   protected FloatControl(Type type, float min, float max, float prec,
-			 int update, float init, String units)
+                         int update, float init, String units)
   {
     super(type);
     this.minimum = min;
@@ -123,7 +123,7 @@ public abstract class FloatControl extends Control
 
   /**
    * Create a new FloatControl given its type and various parameters.
-   * 
+   *
    * @param type the type
    * @param min the minimum valuee
    * @param max the maximum value
@@ -136,8 +136,8 @@ public abstract class FloatControl extends Control
    * @param maxLabel the label for the maximum value
    */
   protected FloatControl(Type type, float min, float max, float prec,
-			 int update, float init, String units,
-			 String minLabel, String midLabel, String maxLabel)
+                         int update, float init, String units,
+                         String minLabel, String midLabel, String maxLabel)
   {
     super(type);
     this.minimum = min;
@@ -242,7 +242,7 @@ public abstract class FloatControl extends Control
    * over the given time interval, specified in microseconds.
    * The default implementation does not do this, but instead
    * simply sets the value to the final value immediately.
-   * 
+   *
    * @param from the starting value
    * @param to the final value
    * @param ms the number of microseconds
diff --git a/libjava/classpath/javax/sound/sampled/Line.java b/libjava/classpath/javax/sound/sampled/Line.java
index 536752a1cc1..62d284bd849 100644
--- a/libjava/classpath/javax/sound/sampled/Line.java
+++ b/libjava/classpath/javax/sound/sampled/Line.java
@@ -94,7 +94,7 @@ public interface Line
    * @param listener the listener to notify
    */
   void addLineListener(LineListener listener);
-  
+
   /**
    * Close this line.
    */
diff --git a/libjava/classpath/javax/sound/sampled/LineEvent.java b/libjava/classpath/javax/sound/sampled/LineEvent.java
index dd4a9ae9a94..43a184cae14 100644
--- a/libjava/classpath/javax/sound/sampled/LineEvent.java
+++ b/libjava/classpath/javax/sound/sampled/LineEvent.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -153,15 +153,15 @@ public class LineEvent extends EventObject
   public String toString()
   {
     return ("type=" + type + "; framePosition=" + framePosition
-	    + "line=" + line);
+            + "line=" + line);
   }
-  
+
   private void readObject(ObjectInputStream ois)
     throws IOException
   {
     throw new NotSerializableException("LineEvent is not serializable");
   }
-  
+
   private void writeObject(ObjectOutputStream oos)
     throws IOException
   {
diff --git a/libjava/classpath/javax/sound/sampled/LineUnavailableException.java b/libjava/classpath/javax/sound/sampled/LineUnavailableException.java
index b203d7be213..a4655fffd2e 100644
--- a/libjava/classpath/javax/sound/sampled/LineUnavailableException.java
+++ b/libjava/classpath/javax/sound/sampled/LineUnavailableException.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/sound/sampled/Mixer.java b/libjava/classpath/javax/sound/sampled/Mixer.java
index ff657cfd1dc..dd400f94d3f 100644
--- a/libjava/classpath/javax/sound/sampled/Mixer.java
+++ b/libjava/classpath/javax/sound/sampled/Mixer.java
@@ -115,7 +115,7 @@ public interface Mixer extends Line
     public final String toString()
     {
       return ("name=" + name + "; description=" + description
-	      + "; vendor=" + vendor + "; version=" + version);
+              + "; vendor=" + vendor + "; version=" + version);
     }
   }
 
@@ -148,7 +148,7 @@ public interface Mixer extends Line
   /**
    * Return an array of Info objects describing all the source lines
    * available in this Mixer, which match the provided decsription.
-   * @param info the description of the source lines to find 
+   * @param info the description of the source lines to find
    */
   Line.Info[] getSourceLineInfo(Line.Info info);
 
@@ -166,7 +166,7 @@ public interface Mixer extends Line
   /**
    * Return an array of Info objects describing all the target lines
    * available in this Mixer, which match the provided decsription.
-   * @param info the description of the target lines to find 
+   * @param info the description of the target lines to find
    */
   Line.Info[] getTargetLineInfo(Line.Info info);
 
diff --git a/libjava/classpath/javax/sound/sampled/Port.java b/libjava/classpath/javax/sound/sampled/Port.java
index fc0bf71d9da..292e1f151be 100644
--- a/libjava/classpath/javax/sound/sampled/Port.java
+++ b/libjava/classpath/javax/sound/sampled/Port.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ package javax.sound.sampled;
 /**
  * A Port is a Line which represents an audio device, for instance
  * a microphone.
- * 
+ *
  * @since 1.3
  */
 public interface Port extends Line
@@ -56,28 +56,28 @@ public interface Port extends Line
 
     /** A CD player.  */
     public static final Info COMPACT_DISC = new Info(Port.class,
-						     "Compact Disc",
-						     true);
+                                                     "Compact Disc",
+                                                     true);
 
     /** Headphones.  */
     public static final Info HEADPHONE = new Info(Port.class, "Headphone",
-						  false);
+                                                  false);
 
     /** Generic input line.  */
     public static final Info LINE_IN = new Info(Port.class, "Line in",
-						true);
+                                                true);
 
     /** Generic output line.  */
     public static final Info LINE_OUT = new Info(Port.class, "Line out",
-						 false);
+                                                 false);
 
     /** A microphone.  */
     public static final Info MICROPHONE = new Info(Port.class, "Microphone",
-						   true);
+                                                   true);
 
     /** A speaker.  */
     public static final Info SPEAKER = new Info(Port.class, "Speaker",
-						false);
+                                                false);
 
     private String name;
     private boolean isSource;
diff --git a/libjava/classpath/javax/sound/sampled/ReverbType.java b/libjava/classpath/javax/sound/sampled/ReverbType.java
index c7cced8a75f..79a4b4945db 100644
--- a/libjava/classpath/javax/sound/sampled/ReverbType.java
+++ b/libjava/classpath/javax/sound/sampled/ReverbType.java
@@ -1,4 +1,4 @@
-/* Reverb attributes 
+/* Reverb attributes
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,7 +61,7 @@ public class ReverbType
    * @param decay the decay time in microseconds
    */
   protected ReverbType(String name, int earlyDelay, float earlyInten,
-		       int lateDelay, float lateInten, int decay)
+                       int lateDelay, float lateInten, int decay)
   {
     this.name = name;
     this.earlyReflectionDelay = earlyDelay;
@@ -136,9 +136,9 @@ public class ReverbType
   public final String toString()
   {
     return ("name=" + name + "; earlyReflectionDelay=" + earlyReflectionDelay
-	    + "; earlyReflectionIntensity=" + earlyReflectionIntensity
-	    + "; lateReflectionDelay=" + lateReflectionDelay
-	    + "; lateReflectionIntensity=" + lateReflectionIntensity
-	    + "; decayTime=" + decayTime);
+            + "; earlyReflectionIntensity=" + earlyReflectionIntensity
+            + "; lateReflectionDelay=" + lateReflectionDelay
+            + "; lateReflectionIntensity=" + lateReflectionIntensity
+            + "; decayTime=" + decayTime);
   }
 }
diff --git a/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java b/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java
index bced9c18f19..1399b61a863 100644
--- a/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java
+++ b/libjava/classpath/javax/sound/sampled/UnsupportedAudioFileException.java
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java
index 6df4cc22d43..098190f0fa6 100644
--- a/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java
+++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileReader.java
@@ -51,7 +51,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
  * This abstract class defines the interface to audio file readers.
  * A concrete provider subclass will implement the methods declared
  * here.  These methods can be used to determine the format of
- * files, and to retrieve an AudioInputStream for a file. 
+ * files, and to retrieve an AudioInputStream for a file.
  * @since 1.3
  */
 public abstract class AudioFileReader
@@ -110,36 +110,36 @@ public abstract class AudioFileReader
 
   /**
    * Return an AudioInputStream for the given file.  The file is assumed
-   * to hold valid audio data.  
+   * to hold valid audio data.
    * @param file the file to read
    * @return an AudioInputStream for the file
    * @throws UnsupportedAudioFileException if the file's type is not
    * recognized
-   * @throws IOException if there is an error while reading the file 
+   * @throws IOException if there is an error while reading the file
    */
   public abstract AudioInputStream getAudioInputStream(File file)
     throws UnsupportedAudioFileException, IOException;
 
   /**
    * Return an AudioInputStream wrapping the given input stream.  The stream
-   * is assumed to hold valid audio data.  
+   * is assumed to hold valid audio data.
    * @param is the input stream to wrap
    * @return an AudioInputStream for the stream
    * @throws UnsupportedAudioFileException if the stream's type is not
    * recognized
-   * @throws IOException if there is an error while reading the stream 
+   * @throws IOException if there is an error while reading the stream
    */
   public abstract AudioInputStream getAudioInputStream(InputStream is)
     throws UnsupportedAudioFileException, IOException;
 
   /**
    * Return an AudioInputStream for the given URL.  The URL is assumed
-   * to hold valid audio data.  
+   * to hold valid audio data.
    * @param url the URL to read
    * @return an AudioInputStream for the URL
    * @throws UnsupportedAudioFileException if the URL's type is not
    * recognized
-   * @throws IOException if there is an error while reading the URL 
+   * @throws IOException if there is an error while reading the URL
    */
   public abstract AudioInputStream getAudioInputStream(URL url)
     throws UnsupportedAudioFileException, IOException;
diff --git a/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java
index 955bb051715..82f9b31b800 100644
--- a/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java
+++ b/libjava/classpath/javax/sound/sampled/spi/AudioFileWriter.java
@@ -94,7 +94,7 @@ public abstract class AudioFileWriter
    * @param ais the audio input stream to write
    */
   public boolean isFileTypeSupported(AudioFileFormat.Type type,
-				     AudioInputStream ais)
+                                     AudioInputStream ais)
   {
     AudioFileFormat.Type[] types = getAudioFileTypes(ais);
     for (int i = 0; i < types.length; ++i)
@@ -114,7 +114,7 @@ public abstract class AudioFileWriter
    * @throws IOException if an I/O error occurs when writing
    */
   public abstract int write(AudioInputStream ais, AudioFileFormat.Type type,
-			    File out)
+                            File out)
     throws IOException;
 
   /**
@@ -126,6 +126,6 @@ public abstract class AudioFileWriter
    * @throws IOException if an I/O error occurs when writing
    */
   public abstract int write(AudioInputStream ais, AudioFileFormat.Type type,
-			    OutputStream os)
+                            OutputStream os)
     throws IOException;
 }
diff --git a/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java
index e96cc0454d1..b9d3e9d10d8 100644
--- a/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java
+++ b/libjava/classpath/javax/sound/sampled/spi/FormatConversionProvider.java
@@ -42,7 +42,7 @@ import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
 
 /**
- * A format conversion provider supplies methods for converting between 
+ * A format conversion provider supplies methods for converting between
  * different audio formats.  This abstract class defines the interface
  * to this functionality; concrete subclasses will implement the methods
  * declared here.
@@ -67,7 +67,7 @@ public abstract class FormatConversionProvider
    * @throws IllegalArgumentException if the conversion is not supported
    */
   public abstract AudioInputStream getAudioInputStream(AudioFormat.Encoding encoding,
-						       AudioInputStream source);
+                                                       AudioInputStream source);
 
   /**
    * Return an audio input stream given the desired target format and
@@ -79,7 +79,7 @@ public abstract class FormatConversionProvider
    * @throws IllegalArgumentException if the conversion is not supported
    */
   public abstract AudioInputStream getAudioInputStream(AudioFormat format,
-						       AudioInputStream source);
+                                                       AudioInputStream source);
 
   /**
    * Return an array of all the source encodings supported by this conversion
@@ -109,7 +109,7 @@ public abstract class FormatConversionProvider
    * @return an array of supported target formats
    */
   public abstract AudioFormat[] getTargetFormats(AudioFormat.Encoding targ,
-						 AudioFormat src);
+                                                 AudioFormat src);
 
   /**
    * Return true if this provider supports conversion from the given
@@ -119,13 +119,13 @@ public abstract class FormatConversionProvider
    * @return true if the conversion is supported
    */
   public boolean isConversionSupported(AudioFormat.Encoding targ,
-				       AudioFormat src)
+                                       AudioFormat src)
   {
     AudioFormat.Encoding[] encodings = getTargetEncodings(src);
     for (int i = 0; i < encodings.length; ++i)
       {
-	if (targ.equals(encodings[i]))
-	  return true;
+        if (targ.equals(encodings[i]))
+          return true;
       }
     return false;
   }
@@ -154,14 +154,14 @@ public abstract class FormatConversionProvider
     AudioFormat.Encoding[] srcs = getSourceEncodings();
     for (int i = 0; i < srcs.length; ++i)
       {
-	if (src.equals(srcs[i]))
-	  return true;
+        if (src.equals(srcs[i]))
+          return true;
       }
     return false;
   }
 
   /**
-   * Return true if an encoding matching the argument is supported as a 
+   * Return true if an encoding matching the argument is supported as a
    * target encoding by this provider.
    * @param targ the target encoding
    * @return true if it is supported
@@ -171,8 +171,8 @@ public abstract class FormatConversionProvider
     AudioFormat.Encoding[] encodings = getTargetEncodings();
     for (int i = 0; i < encodings.length; ++i)
       {
-	if (targ.equals(encodings[i]))
-	  return true;
+        if (targ.equals(encodings[i]))
+          return true;
       }
     return false;
   }
diff --git a/libjava/classpath/javax/sql/ConnectionEvent.java b/libjava/classpath/javax/sql/ConnectionEvent.java
index 0d20b1afb83..3821f4100b0 100644
--- a/libjava/classpath/javax/sql/ConnectionEvent.java
+++ b/libjava/classpath/javax/sql/ConnectionEvent.java
@@ -1,4 +1,4 @@
-/* ConnectionEvent.java 
+/* ConnectionEvent.java
    Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.util.EventObject;
 /**
  * @since 1.4
  */
-public class ConnectionEvent extends EventObject 
+public class ConnectionEvent extends EventObject
 {
   private static final long serialVersionUID = -4843217645290030002L;
 
diff --git a/libjava/classpath/javax/sql/ConnectionEventListener.java b/libjava/classpath/javax/sql/ConnectionEventListener.java
index 08011896688..b9b69d34c6f 100644
--- a/libjava/classpath/javax/sql/ConnectionEventListener.java
+++ b/libjava/classpath/javax/sql/ConnectionEventListener.java
@@ -1,4 +1,4 @@
-/* ConnectionEventListener.java 
+/* ConnectionEventListener.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.util.EventListener;
 /**
  * @since 1.4
  */
-public interface ConnectionEventListener extends EventListener 
+public interface ConnectionEventListener extends EventListener
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/javax/sql/ConnectionPoolDataSource.java b/libjava/classpath/javax/sql/ConnectionPoolDataSource.java
index 99661d7f40f..545af3fe9fa 100644
--- a/libjava/classpath/javax/sql/ConnectionPoolDataSource.java
+++ b/libjava/classpath/javax/sql/ConnectionPoolDataSource.java
@@ -1,4 +1,4 @@
-/* ConnectionPoolDataSource.java 
+/* ConnectionPoolDataSource.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface ConnectionPoolDataSource 
+public interface ConnectionPoolDataSource
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/javax/sql/DataSource.java b/libjava/classpath/javax/sql/DataSource.java
index de1bc82679f..da201749498 100644
--- a/libjava/classpath/javax/sql/DataSource.java
+++ b/libjava/classpath/javax/sql/DataSource.java
@@ -1,4 +1,4 @@
-/* DataSource.java 
+/* DataSource.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,7 +45,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface DataSource 
+public interface DataSource
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/javax/sql/PooledConnection.java b/libjava/classpath/javax/sql/PooledConnection.java
index 1fb23df1447..8a839ba7da4 100644
--- a/libjava/classpath/javax/sql/PooledConnection.java
+++ b/libjava/classpath/javax/sql/PooledConnection.java
@@ -1,4 +1,4 @@
-/* PooledConnection.java 
+/* PooledConnection.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface PooledConnection 
+public interface PooledConnection
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/javax/sql/RowSet.java b/libjava/classpath/javax/sql/RowSet.java
index 2a9ad2784ee..ca7f729871c 100644
--- a/libjava/classpath/javax/sql/RowSet.java
+++ b/libjava/classpath/javax/sql/RowSet.java
@@ -1,4 +1,4 @@
-/* RowSet.java 
+/* RowSet.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -56,7 +56,7 @@ import java.util.Map;
 /**
  * @since 1.4
  */
-public interface RowSet extends ResultSet 
+public interface RowSet extends ResultSet
 {
   String getUrl() throws SQLException;
 
diff --git a/libjava/classpath/javax/sql/RowSetEvent.java b/libjava/classpath/javax/sql/RowSetEvent.java
index 26de4e97330..dd0a9bcc40c 100644
--- a/libjava/classpath/javax/sql/RowSetEvent.java
+++ b/libjava/classpath/javax/sql/RowSetEvent.java
@@ -1,4 +1,4 @@
-/* RowSetEvent.java 
+/* RowSetEvent.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.util.EventObject;
 /**
  * @since 1.4
  */
-public class RowSetEvent extends EventObject 
+public class RowSetEvent extends EventObject
 {
   public RowSetEvent(RowSet source)
   {
diff --git a/libjava/classpath/javax/sql/RowSetInternal.java b/libjava/classpath/javax/sql/RowSetInternal.java
index 1fdacb9e766..7b3252cff14 100644
--- a/libjava/classpath/javax/sql/RowSetInternal.java
+++ b/libjava/classpath/javax/sql/RowSetInternal.java
@@ -1,4 +1,4 @@
-/* RowSetInternal.java 
+/* RowSetInternal.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,7 +45,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface RowSetInternal 
+public interface RowSetInternal
 {
   /**
    * @since 1.4
diff --git a/libjava/classpath/javax/sql/RowSetListener.java b/libjava/classpath/javax/sql/RowSetListener.java
index 86726747ffa..1a887c548d9 100644
--- a/libjava/classpath/javax/sql/RowSetListener.java
+++ b/libjava/classpath/javax/sql/RowSetListener.java
@@ -1,4 +1,4 @@
-/* RowSetListener.java 
+/* RowSetListener.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.util.EventListener;
 /**
  * @since 1.4
  */
-public interface RowSetListener extends EventListener 
+public interface RowSetListener extends EventListener
 {
   void rowSetChanged(RowSetEvent event);
 
diff --git a/libjava/classpath/javax/sql/RowSetMetaData.java b/libjava/classpath/javax/sql/RowSetMetaData.java
index 8279fee3950..72c58ac0ca5 100644
--- a/libjava/classpath/javax/sql/RowSetMetaData.java
+++ b/libjava/classpath/javax/sql/RowSetMetaData.java
@@ -1,4 +1,4 @@
-/* RowSetMetaData.java 
+/* RowSetMetaData.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface RowSetMetaData extends ResultSetMetaData 
+public interface RowSetMetaData extends ResultSetMetaData
 {
   void setColumnCount(int columnCount) throws SQLException;
 
diff --git a/libjava/classpath/javax/sql/RowSetReader.java b/libjava/classpath/javax/sql/RowSetReader.java
index fb33315b457..a6541e0e398 100644
--- a/libjava/classpath/javax/sql/RowSetReader.java
+++ b/libjava/classpath/javax/sql/RowSetReader.java
@@ -1,4 +1,4 @@
-/* RowSetReader.java 
+/* RowSetReader.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface RowSetReader 
+public interface RowSetReader
 {
   void readData(RowSetInternal caller) throws SQLException;
 }
diff --git a/libjava/classpath/javax/sql/RowSetWriter.java b/libjava/classpath/javax/sql/RowSetWriter.java
index 20c1034dd54..3d07541bcb9 100644
--- a/libjava/classpath/javax/sql/RowSetWriter.java
+++ b/libjava/classpath/javax/sql/RowSetWriter.java
@@ -1,4 +1,4 @@
-/* RowSetWriter.java 
+/* RowSetWriter.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -43,7 +43,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface RowSetWriter 
+public interface RowSetWriter
 {
   boolean writeData(RowSetInternal caller) throws SQLException;
 }
diff --git a/libjava/classpath/javax/sql/XAConnection.java b/libjava/classpath/javax/sql/XAConnection.java
index 2fadffcfece..4cb0b308669 100644
--- a/libjava/classpath/javax/sql/XAConnection.java
+++ b/libjava/classpath/javax/sql/XAConnection.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,7 +45,7 @@ import javax.transaction.xa.XAResource;
 /**
  * @since 1.4
  */
-public interface XAConnection extends PooledConnection 
+public interface XAConnection extends PooledConnection
 {
   XAResource getXAResource() throws SQLException;
 }
diff --git a/libjava/classpath/javax/sql/XADataSource.java b/libjava/classpath/javax/sql/XADataSource.java
index 724e2f08a3e..0387140d9c0 100644
--- a/libjava/classpath/javax/sql/XADataSource.java
+++ b/libjava/classpath/javax/sql/XADataSource.java
@@ -1,4 +1,4 @@
-/* XADataSource.java 
+/* XADataSource.java
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,7 +44,7 @@ import java.sql.SQLException;
 /**
  * @since 1.4
  */
-public interface XADataSource 
+public interface XADataSource
 {
   XAConnection getXAConnection() throws SQLException;
 
diff --git a/libjava/classpath/javax/swing/AbstractAction.java b/libjava/classpath/javax/swing/AbstractAction.java
index ffd122fe027..535a3e71e05 100644
--- a/libjava/classpath/javax/swing/AbstractAction.java
+++ b/libjava/classpath/javax/swing/AbstractAction.java
@@ -47,7 +47,7 @@ import javax.swing.event.SwingPropertyChangeSupport;
 
 /**
  * A base class for implementing the {@link Action} interface.
- * 
+ *
  * @author Andrew Selkirk
  */
 public abstract class AbstractAction
@@ -59,9 +59,9 @@ public abstract class AbstractAction
    * A flag that indicates whether or not the action is enabled.
    */
   protected boolean enabled = true;
-  
+
   /**
-   * Provides support for property change event notification. 
+   * Provides support for property change event notification.
    */
   protected SwingPropertyChangeSupport changeSupport =
     new SwingPropertyChangeSupport(this);
@@ -80,7 +80,7 @@ public abstract class AbstractAction
   }
 
   /**
-   * Creates a new action with the specified name.  The name is stored as a 
+   * Creates a new action with the specified name.  The name is stored as a
    * property with the key {@link Action#NAME}, and no other properties are
    * initialised.
    *
@@ -94,7 +94,7 @@ public abstract class AbstractAction
   /**
    * Creates a new action with the specified name and icon.  The name is stored
    * as a property with the key {@link Action#NAME}, the icon is stored as a
-   * property with the key {@link Action#SMALL_ICON}, and no other properties 
+   * property with the key {@link Action#SMALL_ICON}, and no other properties
    * are initialised.
    *
    * @param name  the name (null permitted).
@@ -123,12 +123,12 @@ public abstract class AbstractAction
 
   /**
    * Returns the value associated with the specified key.
-   * 
+   *
    * @param key  the key (not null).
-   * 
-   * @return The value associated with the specified key, or 
+   *
+   * @return The value associated with the specified key, or
    *         null if the key is not found.
-   *         
+   *
    * @see #putValue(String, Object)
    */
   public Object getValue(String key)
@@ -137,20 +137,20 @@ public abstract class AbstractAction
   }
 
   /**
-   * Sets the value associated with the specified key and sends a 
-   * {@link java.beans.PropertyChangeEvent} to all registered listeners.  
-   * The standard keys are: 
+   * Sets the value associated with the specified key and sends a
+   * {@link java.beans.PropertyChangeEvent} to all registered listeners.
+   * The standard keys are:
    * 
                        
    * 
                      • {@link #NAME}
                        • 
-   * 
                      • {@link #SHORT_DESCRIPTION}
                        •  
+   * 
                      • {@link #SHORT_DESCRIPTION}
                        • 
    * 
                      • {@link #LONG_DESCRIPTION}
                        • 
-   * 
                      • {@link #SMALL_ICON}
                        •  
+   * 
                      • {@link #SMALL_ICON}
                        • 
    * 
                      • {@link #ACTION_COMMAND_KEY}
                        • 
-   * 
                      • {@link #ACCELERATOR_KEY}
                        •  
+   * 
                      • {@link #ACCELERATOR_KEY}
                        • 
    * 
                      • {@link #MNEMONIC_KEY}
                        • 
    * 
                      
    * Any existing value associated with the key will be overwritten.
-   * 
+   *
    * @param key  the key (not null).
    * @param value  the value (null permitted).
    */
@@ -168,7 +168,7 @@ public abstract class AbstractAction
    * Returns the flag that indicates whether or not the action is enabled.
    *
    * @return The flag.
-   * 
+   *
    * @see #setEnabled(boolean)
    */
   public boolean isEnabled()
@@ -178,12 +178,12 @@ public abstract class AbstractAction
 
   /**
    * Sets the flag that indicates whether or not the action is enabled and, if
-   * the value of the flag changed from the previous setting, sends a 
-   * {@link java.beans.PropertyChangeEvent} to all registered listeners (using 
+   * the value of the flag changed from the previous setting, sends a
+   * {@link java.beans.PropertyChangeEvent} to all registered listeners (using
    * the property name 'enabled').
    *
    * @param enabled  the new flag value.
-   * 
+   *
    * @see #isEnabled()
    */
   public void setEnabled(boolean enabled)
@@ -196,10 +196,10 @@ public abstract class AbstractAction
   }
 
   /**
-   * Returns an array of the keys for the property values that have been 
+   * Returns an array of the keys for the property values that have been
    * defined via the {@link #putValue(String, Object)} method (or the class
    * constructor).
-   * 
+   *
    * @return An array of keys.
    */
   public Object[] getKeys()
@@ -208,7 +208,7 @@ public abstract class AbstractAction
   }
 
   /**
-   * Sends a {@link PropertyChangeEvent} for the named property to all 
+   * Sends a {@link PropertyChangeEvent} for the named property to all
    * registered listeners.
    *
    * @param propertyName  the property name.
@@ -220,17 +220,17 @@ public abstract class AbstractAction
   {
     changeSupport.firePropertyChange(propertyName, oldValue, newValue);
   }
-  
+
   /**
    * Sends a {@link PropertyChangeEvent} for the named property to all
-   * registered listeners.  This private method is called by the 
+   * registered listeners.  This private method is called by the
    * {@link #setEnabled(boolean)} method.
    *
    * @param propertyName  the property name.
    * @param oldValue  the old value of the property.
    * @param newValue  the new value of the property.
    */
-  private void firePropertyChange(String propertyName, boolean oldValue, 
+  private void firePropertyChange(String propertyName, boolean oldValue,
                                   boolean newValue)
   {
     changeSupport.firePropertyChange(propertyName, oldValue, newValue);
@@ -241,7 +241,7 @@ public abstract class AbstractAction
    * from this action.
    *
    * @param listener the listener.
-   * 
+   *
    * @see #removePropertyChangeListener(PropertyChangeListener)
    */
   public void addPropertyChangeListener(PropertyChangeListener listener)
@@ -250,11 +250,11 @@ public abstract class AbstractAction
   }
 
   /**
-   * Deregisters a listener so that it no longer receives 
+   * Deregisters a listener so that it no longer receives
    * {@link PropertyChangeEvent} notifications from this action.
    *
    * @param listener the listener.
-   * 
+   *
    * @see #addPropertyChangeListener(PropertyChangeListener)
    */
   public void removePropertyChangeListener(PropertyChangeListener listener)
@@ -266,7 +266,7 @@ public abstract class AbstractAction
    * Returns all registered listeners.
    *
    * @return An array of listeners.
-   * 
+   *
    * @since 1.4
    */
   public PropertyChangeListener[] getPropertyChangeListeners()
diff --git a/libjava/classpath/javax/swing/AbstractButton.java b/libjava/classpath/javax/swing/AbstractButton.java
index 8764f6f8c3d..6cbc7751f94 100644
--- a/libjava/classpath/javax/swing/AbstractButton.java
+++ b/libjava/classpath/javax/swing/AbstractButton.java
@@ -129,11 +129,11 @@ import javax.swing.text.View;
  *
  * 
                      The various behavioral aspects of these properties follows:
                      
  *
- * 
                         
+ * 
                          
  *
  * 
                        • When non-bound properties stored in the button change, the button
  * fires ChangeEvents to its ChangeListeners.
                          • 
- * 
+ *
  * 
                        • When bound properties stored in the button change, the button fires
  * PropertyChangeEvents to its PropertyChangeListeners
                          • 
  *
@@ -271,7 +271,7 @@ public abstract class AbstractButton extends JComponent
 
   /** Whether or not the button fills its content area. */
   boolean contentAreaFilled;
-  
+
   /** Whether rollover is enabled. */
   boolean rollOverEnabled;
 
@@ -302,7 +302,7 @@ public abstract class AbstractButton extends JComponent
 
   /**
    * Listener the button uses to receive ChangeEvents from its model.
-   */  
+   */
   protected ChangeListener changeListener;
 
   /**
@@ -317,16 +317,16 @@ public abstract class AbstractButton extends JComponent
    * ActionEvent.
    */
   long multiClickThreshhold;
-  
+
   /**
    * Listener the button uses to receive PropertyChangeEvents from its
    * Action.
    */
   PropertyChangeListener actionPropertyChangeListener;
-  
-  /** ChangeEvent that is fired to button's ChangeEventListeners  */  
+
+  /** ChangeEvent that is fired to button's ChangeEventListeners  */
   protected ChangeEvent changeEvent = new ChangeEvent(this);
-  
+
   /**
    * Indicates if the borderPainted property has been set by a client
    * program or by the UI.
@@ -367,26 +367,26 @@ public abstract class AbstractButton extends JComponent
    * Fired in a PropertyChangeEvent when the "borderPainted" property changes.
    */
   public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "contentAreaFilled" property
    * changes.
    */
   public static final String CONTENT_AREA_FILLED_CHANGED_PROPERTY =
     "contentAreaFilled";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "disabledIcon" property changes.
    */
   public static final String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "disabledSelectedIcon" property
    * changes.
    */
   public static final String DISABLED_SELECTED_ICON_CHANGED_PROPERTY =
     "disabledSelectedIcon";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "focusPainted" property changes.
    */
@@ -433,14 +433,14 @@ public abstract class AbstractButton extends JComponent
    * Fired in a PropertyChangeEvent when the "rolloverIcon" property changes.
    */
   public static final String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "rolloverSelectedIcon" property
    * changes.
    */
   public static final String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY =
     "rolloverSelectedIcon";
-  
+
   /**
    * Fired in a PropertyChangeEvent when the "selectedIcon" property changes.
    */
@@ -471,7 +471,7 @@ public abstract class AbstractButton extends JComponent
                                             AccessibleText
   {
     private static final long serialVersionUID = -5673062525319836790L;
-    
+
     protected AccessibleAbstractButton()
     {
       // Nothing to do here yet.
@@ -553,7 +553,7 @@ public abstract class AbstractButton extends JComponent
             {
               Object[] target = new Object[group.getButtonCount()];
               Enumeration els = group.getElements();
-              
+
               for (int index = 0; els.hasMoreElements(); ++index)
                 {
                   target[index] = els.nextElement();
@@ -663,7 +663,7 @@ public abstract class AbstractButton extends JComponent
     }
 
     /**
-     * Sets the current accessible value as object. If the specified number 
+     * Sets the current accessible value as object. If the specified number
      * is 0 the button will be deselected, otherwise the button will
      * be selected.
      *
@@ -942,7 +942,7 @@ public abstract class AbstractButton extends JComponent
     public AttributeSet getCharacterAttribute(int i)
     {
       AttributeSet atts = null;
-      View view = (View) getClientProperty(BasicHTML.propertyKey); 
+      View view = (View) getClientProperty(BasicHTML.propertyKey);
       if (view != null)
         {
           Document doc = view.getDocument();
@@ -1019,8 +1019,8 @@ public abstract class AbstractButton extends JComponent
     setDisplayedMnemonicIndex(-1);
     setOpaque(true);
     text = "";
-    // testing on JRE1.5 shows that the iconTextGap default value is 
-    // hard-coded here and the 'Button.iconTextGap' setting in the 
+    // testing on JRE1.5 shows that the iconTextGap default value is
+    // hard-coded here and the 'Button.iconTextGap' setting in the
     // UI defaults is ignored, at least by the MetalLookAndFeel
     iconTextGap = 4;
   }
@@ -1036,7 +1036,7 @@ public abstract class AbstractButton extends JComponent
   }
 
   /**
-   * Set the model the button is currently using. This un-registers all 
+   * Set the model the button is currently using. This un-registers all
    * listeners associated with the current model, and re-registers them
    * with the new model.
    *
@@ -1072,7 +1072,7 @@ public abstract class AbstractButton extends JComponent
     repaint();
   }
 
- protected void init(String text, Icon icon) 
+ protected void init(String text, Icon icon)
  {
     // If text is null, we fall back to the empty
     // string (which is set using AbstractButton's
@@ -1083,10 +1083,10 @@ public abstract class AbstractButton extends JComponent
 
     if (icon != null)
       default_icon = icon;
-    
+
     updateUI();
  }
- 
+
   /**
    * 
                          Returns the action command string for this button's model.
                          
    *
@@ -1140,9 +1140,9 @@ public abstract class AbstractButton extends JComponent
 
   /**
    * Returns all added ActionListener objects.
-   * 
+   *
    * @return an array of listeners
-   * 
+   *
    * @since 1.4
    */
   public ActionListener[] getActionListeners()
@@ -1175,9 +1175,9 @@ public abstract class AbstractButton extends JComponent
 
   /**
    * Returns all added ItemListener objects.
-   * 
+   *
    * @return an array of listeners
-   * 
+   *
    * @since 1.4
    */
   public ItemListener[] getItemListeners()
@@ -1188,7 +1188,7 @@ public abstract class AbstractButton extends JComponent
   /**
    * Adds a ChangeListener to the button's listener list. When the button's
    * model changes any of its (non-bound) properties, these listeners will be
-   * called. 
+   * called.
    *
    * @param l The new listener to add
    */
@@ -1209,9 +1209,9 @@ public abstract class AbstractButton extends JComponent
 
   /**
    * Returns all added ChangeListener objects.
-   * 
+   *
    * @return an array of listeners
-   * 
+   *
    * @since 1.4
    */
   public ChangeListener[] getChangeListeners()
@@ -1229,7 +1229,7 @@ public abstract class AbstractButton extends JComponent
   {
     e.setSource(this);
     ItemListener[] listeners = getItemListeners();
- 
+
     for (int i = 0; i < listeners.length; i++)
       listeners[i].itemStateChanged(e);
   }
@@ -1242,8 +1242,8 @@ public abstract class AbstractButton extends JComponent
    */
   protected void fireActionPerformed(ActionEvent e)
   {
-	// Dispatch a copy of the given ActionEvent in order to
-	// set the source and action command correctly.
+        // Dispatch a copy of the given ActionEvent in order to
+        // set the source and action command correctly.
     ActionEvent ae = new ActionEvent(
         this,
         e.getID(),
@@ -1252,7 +1252,7 @@ public abstract class AbstractButton extends JComponent
         e.getModifiers());
 
     ActionListener[] listeners = getActionListeners();
-    
+
     for (int i = 0; i < listeners.length; i++)
       listeners[i].actionPerformed(ae);
   }
@@ -1338,12 +1338,12 @@ public abstract class AbstractButton extends JComponent
       }
   }
 
-  /** 
+  /**
    * Sets the button's mnemonic index. The mnemonic index is a hint to the
    * look and feel class, suggesting which character in the button's label
    * should be underlined when drawing the label. If the mnemonic index is
-   * -1, no mnemonic will be displayed. 
-   * 
+   * -1, no mnemonic will be displayed.
+   *
    * If no mnemonic index is set, the button will choose a mnemonic index
    * by default, which will be the first occurrence of the mnemonic
    * character in the button's text.
@@ -1358,11 +1358,11 @@ public abstract class AbstractButton extends JComponent
   {
     if (index < -1 || (text != null && index >= text.length()))
       throw new IllegalArgumentException();
-  
+
     mnemonicIndex = index;
   }
-  
-  /** 
+
+  /**
    * Get the button's mnemonic index, which is an offset into the button's
    * "text" property.  The character specified by this offset should be
    * underlined when the look and feel class draws this button.
@@ -1373,7 +1373,7 @@ public abstract class AbstractButton extends JComponent
   {
     return mnemonicIndex;
   }
-  
+
 
   /**
    * Set the "rolloverEnabled" property. When rollover is enabled, and the
@@ -1450,15 +1450,15 @@ public abstract class AbstractButton extends JComponent
       mod.setEnabled(b);
   }
 
-  /** 
+  /**
    * Set the horizontal alignment of the button's text and icon. The
    * alignment is a numeric constant from {@link SwingConstants}. It must
    * be one of: RIGHT, LEFT, CENTER,
    * LEADING or TRAILING.  The default is
    * CENTER.
-   * 
+   *
    * @return The current horizontal alignment
-   * 
+   *
    * @see #setHorizontalAlignment(int)
    */
   public int getHorizontalAlignment()
@@ -1476,14 +1476,14 @@ public abstract class AbstractButton extends JComponent
    * @param a The new horizontal alignment
    * @throws IllegalArgumentException If alignment is not one of the legal
    * constants.
-   * 
+   *
    * @see #getHorizontalAlignment()
    */
   public void setHorizontalAlignment(int a)
   {
     if (horizontalAlignment == a)
       return;
-    if (a != LEFT && a != CENTER && a != RIGHT && a != LEADING 
+    if (a != LEFT && a != CENTER && a != RIGHT && a != LEADING
         && a != TRAILING)
       throw new IllegalArgumentException("Invalid alignment.");
     int old = horizontalAlignment;
@@ -1522,7 +1522,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (horizontalTextPosition == t)
       return;
-    if (t != LEFT && t != CENTER && t != RIGHT && t != LEADING 
+    if (t != LEFT && t != CENTER && t != RIGHT && t != LEADING
         && t != TRAILING)
       throw new IllegalArgumentException("Invalid alignment.");
 
@@ -1540,7 +1540,7 @@ public abstract class AbstractButton extends JComponent
    * BOTTOM. The default is CENTER.
    *
    * @return The current vertical alignment
-   * 
+   *
    * @see #setVerticalAlignment(int)
    */
   public int getVerticalAlignment()
@@ -1557,7 +1557,7 @@ public abstract class AbstractButton extends JComponent
    * @param a The new vertical alignment
    * @throws IllegalArgumentException If alignment is not one of the legal
    * constants.
-   * 
+   *
    * @see #getVerticalAlignment()
    */
   public void setVerticalAlignment(int a)
@@ -1605,7 +1605,7 @@ public abstract class AbstractButton extends JComponent
       return;
     if (t != TOP && t != CENTER && t != BOTTOM)
       throw new IllegalArgumentException("Invalid alignment.");
-    
+
     int old = verticalTextPosition;
     verticalTextPosition = t;
     firePropertyChange(VERTICAL_TEXT_POSITION_CHANGED_PROPERTY, old, t);
@@ -1645,7 +1645,7 @@ public abstract class AbstractButton extends JComponent
   }
 
   /**
-   * Get the value of the "action" property. 
+   * Get the value of the "action" property.
    *
    * @return The current value of the "action" property
    */
@@ -1664,7 +1664,7 @@ public abstract class AbstractButton extends JComponent
    * 
                          This method also configures several of the button's properties from
    * the Action, by calling {@link #configurePropertiesFromAction}, and
    * subscribes the button to the Action as a PropertyChangeListener.
-   * Subsequent changes to the Action will thus reconfigure the button 
+   * Subsequent changes to the Action will thus reconfigure the button
    * automatically.
                          
    *
    * @param a The new value of the "action" property
@@ -1687,7 +1687,7 @@ public abstract class AbstractButton extends JComponent
     configurePropertiesFromAction(action);
     if (action != null)
       {
-        actionPropertyChangeListener = createActionPropertyChangeListener(a);      
+        actionPropertyChangeListener = createActionPropertyChangeListener(a);
         action.addPropertyChangeListener(actionPropertyChangeListener);
         addActionListener(action);
       }
@@ -1713,9 +1713,9 @@ public abstract class AbstractButton extends JComponent
   {
     if (default_icon == i)
       return;
-    
-    Icon old = default_icon;      
-    default_icon = i;      
+
+    Icon old = default_icon;
+    default_icon = i;
     firePropertyChange(ICON_CHANGED_PROPERTY, old, i);
     revalidate();
     repaint();
@@ -1768,7 +1768,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (text == t)
       return;
-    
+
     String old = text;
     text = t;
     firePropertyChange(TEXT_CHANGED_PROPERTY, old, t);
@@ -1778,9 +1778,9 @@ public abstract class AbstractButton extends JComponent
 
   /**
    * Set the value of the {@link #iconTextGap} property.
-   * 
+   *
    * @param i The new value of the property
-   * 
+   *
    * @since 1.4
    */
   public void setIconTextGap(int i)
@@ -1788,7 +1788,7 @@ public abstract class AbstractButton extends JComponent
     clientIconTextGapSet = true;
     if (iconTextGap == i)
       return;
-    
+
     int old = iconTextGap;
     iconTextGap = i;
     firePropertyChange("iconTextGap", new Integer(old), new Integer(i));
@@ -1800,7 +1800,7 @@ public abstract class AbstractButton extends JComponent
    * Get the value of the {@link #iconTextGap} property.
    *
    * @return The current value of the property
-   * 
+   *
    * @since 1.4
    */
   public int getIconTextGap()
@@ -1831,7 +1831,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (margin == m)
       return;
-    
+
     Insets old = margin;
     margin = m;
     firePropertyChange(MARGIN_CHANGED_PROPERTY, old, m);
@@ -1864,7 +1864,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (pressed_icon == pressedIcon)
       return;
-    
+
     Icon old = pressed_icon;
     pressed_icon = pressedIcon;
     firePropertyChange(PRESSED_ICON_CHANGED_PROPERTY, old, pressed_icon);
@@ -1889,7 +1889,7 @@ public abstract class AbstractButton extends JComponent
         Image grayImage = GrayFilter.createDisabledImage(iconImage);
         disabledIcon = new ImageIcon(grayImage);
       }
-      
+
     return disabledIcon;
   }
 
@@ -1940,7 +1940,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (focusPainted == p)
       return;
-    
+
     boolean old = focusPainted;
     focusPainted = p;
     firePropertyChange(FOCUS_PAINTED_CHANGED_PROPERTY, old, p);
@@ -2077,7 +2077,7 @@ public abstract class AbstractButton extends JComponent
    * is changed, this listener is unsubscribed from the old model and
    * subscribed to the new one.
                          
    *
-   * @return A new ActionListener 
+   * @return A new ActionListener
    */
   protected  ActionListener createActionListener()
   {
@@ -2098,7 +2098,7 @@ public abstract class AbstractButton extends JComponent
    * button's action is changed subsequently, the listener is unsubscribed
    * from the old action and subscribed to the new one.
                          
    *
-   * @param a The Action which will be listened to, and which should be 
+   * @param a The Action which will be listened to, and which should be
    * the same as the source of any PropertyChangeEvents received by the
    * new listener returned from this method.
    *
@@ -2238,12 +2238,12 @@ public abstract class AbstractButton extends JComponent
   {
     if (disabledSelectedIcon == icon)
       return;
-    
+
     Icon old = disabledSelectedIcon;
     disabledSelectedIcon = icon;
     firePropertyChange(DISABLED_SELECTED_ICON_CHANGED_PROPERTY, old, icon);
     revalidate();
-    repaint();        
+    repaint();
   }
 
   /**
@@ -2270,7 +2270,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (rolloverIcon == r)
       return;
-    
+
     Icon old = rolloverIcon;
     rolloverIcon = r;
     firePropertyChange(ROLLOVER_ICON_CHANGED_PROPERTY, old, rolloverIcon);
@@ -2293,10 +2293,10 @@ public abstract class AbstractButton extends JComponent
   }
 
   /**
-   * Set the button's rollover selected icon and sets the 
-   * rolloverEnabled property to true. The look and 
-   * feel class should paint this icon when the "rolloverEnabled" property of 
-   * the button is true, the "selected" property of the button's 
+   * Set the button's rollover selected icon and sets the
+   * rolloverEnabled property to true. The look and
+   * feel class should paint this icon when the "rolloverEnabled" property of
+   * the button is true, the "selected" property of the button's
    * model is true, and the mouse rolls over the button.
    *
    * @param r The new rollover selected icon.
@@ -2305,7 +2305,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (rolloverSelectedIcon == r)
       return;
-    
+
     Icon old = rolloverSelectedIcon;
     rolloverSelectedIcon = r;
     firePropertyChange(ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY, old, r);
@@ -2341,7 +2341,7 @@ public abstract class AbstractButton extends JComponent
   {
     if (selectedIcon == s)
       return;
-    
+
     Icon old = selectedIcon;
     selectedIcon = s;
     firePropertyChange(SELECTED_ICON_CHANGED_PROPERTY, old, s);
@@ -2418,7 +2418,7 @@ public abstract class AbstractButton extends JComponent
     clientContentAreaFilledSet = true;
     if (contentAreaFilled == b)
       return;
-    
+
     // The JDK sets the opaque property to the value of the contentAreaFilled
     // property, so should we do.
     setOpaque(b);
@@ -2492,7 +2492,7 @@ public abstract class AbstractButton extends JComponent
   {
     super.setUI(ui);
   }
-  
+
   /**
    * Set the "UI" property of the button, which is a look and feel class
    * responsible for handling the button's input events and painting it.
@@ -2503,7 +2503,7 @@ public abstract class AbstractButton extends JComponent
   {
     return (ButtonUI) ui;
   }
-  
+
   /**
    * Set the "UI" property to a class constructed, via the {@link
    * UIManager}, from the current look and feel. This should be overridden
@@ -2520,7 +2520,7 @@ public abstract class AbstractButton extends JComponent
    * into a single ActionEvent.
    *
    * @return the time in milliseconds
-   * 
+   *
    * @since 1.4
    */
   public long getMultiClickThreshhold()
@@ -2533,7 +2533,7 @@ public abstract class AbstractButton extends JComponent
    * ActionEvent.
    *
    * @param threshhold the time in milliseconds
-   * 
+   *
    * @since 1.4
    */
   public void setMultiClickThreshhold(long threshhold)
@@ -2586,7 +2586,7 @@ public abstract class AbstractButton extends JComponent
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/AbstractCellEditor.java b/libjava/classpath/javax/swing/AbstractCellEditor.java
index e993df5cfc7..eade00c072c 100644
--- a/libjava/classpath/javax/swing/AbstractCellEditor.java
+++ b/libjava/classpath/javax/swing/AbstractCellEditor.java
@@ -69,7 +69,7 @@ public abstract class AbstractCellEditor
   /**
    * Creates a new instance of AbstractCellEditor.
    */
-  public AbstractCellEditor() 
+  public AbstractCellEditor()
   {
     listenerList = new EventListenerList();
     changeEvent = new ChangeEvent(this);
@@ -85,10 +85,10 @@ public abstract class AbstractCellEditor
    * @return true if the cell is editable using
    *     event, false if it's not
    */
-  public boolean isCellEditable(EventObject event) 
+  public boolean isCellEditable(EventObject event)
   {
     return true;
-  } 
+  }
 
   /**
    * Returns true if the editing cell should be selected,
@@ -101,7 +101,7 @@ public abstract class AbstractCellEditor
    * @return true if the editing cell should be selected,
    *     false otherwise
    */
-  public boolean shouldSelectCell(EventObject event) 
+  public boolean shouldSelectCell(EventObject event)
   {
     return true;
   }
@@ -113,7 +113,7 @@ public abstract class AbstractCellEditor
    * @return true if editing has been stopped successfully,
    *     falseotherwise
    */
-  public boolean stopCellEditing() 
+  public boolean stopCellEditing()
   {
     fireEditingStopped();
     return true;
@@ -123,10 +123,10 @@ public abstract class AbstractCellEditor
    * Stop editing the cell and do not accept any partial value that has
    * been entered into the cell.
    */
-  public void cancelCellEditing() 
+  public void cancelCellEditing()
   {
     fireEditingCanceled();
-  } 
+  }
 
   /**
    * Adds a CellEditorListener to the list of CellEditorListeners of this
@@ -149,7 +149,7 @@ public abstract class AbstractCellEditor
   {
     listenerList.remove(CellEditorListener.class, listener);
   }
-	
+
   /**
    * Returns the list of CellEditorListeners that have been registered
    * in this CellEditor.
diff --git a/libjava/classpath/javax/swing/AbstractListModel.java b/libjava/classpath/javax/swing/AbstractListModel.java
index 7d4b2bb2a87..72aefbcd59d 100644
--- a/libjava/classpath/javax/swing/AbstractListModel.java
+++ b/libjava/classpath/javax/swing/AbstractListModel.java
@@ -125,7 +125,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
   {
     ListDataEvent event =
       new ListDataEvent(source, ListDataEvent.INTERVAL_ADDED,
-			startIndex, endIndex);
+                        startIndex, endIndex);
     ListDataListener[] listeners = getListDataListeners();
 
     for (int index = 0; index < listeners.length; index++)
@@ -148,7 +148,7 @@ public abstract class AbstractListModel implements ListModel, Serializable
   {
     ListDataEvent event =
       new ListDataEvent(source, ListDataEvent.INTERVAL_REMOVED,
-			startIndex, endIndex);
+                        startIndex, endIndex);
     ListDataListener[] listeners = getListDataListeners();
 
     for (int index = 0; index < listeners.length; index++)
diff --git a/libjava/classpath/javax/swing/AbstractSpinnerModel.java b/libjava/classpath/javax/swing/AbstractSpinnerModel.java
index d247a33136a..984e52af27c 100644
--- a/libjava/classpath/javax/swing/AbstractSpinnerModel.java
+++ b/libjava/classpath/javax/swing/AbstractSpinnerModel.java
@@ -47,7 +47,7 @@ import javax.swing.event.EventListenerList;
 /**
  * Provides standard implementations for some of the methods in
  * {@link SpinnerModel}.
- * 
+ *
  * @since 1.4
  *
  * @author Ka-Hing Cheung
@@ -55,7 +55,7 @@ import javax.swing.event.EventListenerList;
 public abstract class AbstractSpinnerModel implements SpinnerModel
 {
   private ChangeEvent changeEvent = new ChangeEvent(this);
-  
+
   /** Stores the listeners registered with the model. */
   protected EventListenerList listenerList = new EventListenerList();
 
diff --git a/libjava/classpath/javax/swing/Action.java b/libjava/classpath/javax/swing/Action.java
index 3dd63539ddc..fa1925f45c8 100644
--- a/libjava/classpath/javax/swing/Action.java
+++ b/libjava/classpath/javax/swing/Action.java
@@ -44,9 +44,9 @@ import java.beans.PropertyChangeListener;
  * Provides a convenient central point of control for some task
  * that can be triggered by more than one control in a Swing user interface
  * (for example, a menu item and a toolbar button).
- * 
+ *
  * @see AbstractButton#setAction(Action)
- * 
+ *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  * @author Andrew Selkirk
  */
@@ -96,23 +96,23 @@ public interface Action extends ActionListener {
 
   /**
    * Returns the value associated with the specified key.
-   * 
+   *
    * @param key  the key (not null).
-   * 
-   * @return The value associated with the specified key, or 
+   *
+   * @return The value associated with the specified key, or
    *         null if the key is not found.
    */
   Object getValue(String key);
 
   /**
-   * Sets the value associated with the specified key and sends a 
-   * {@link java.beans.PropertyChangeEvent} to all registered listeners.  
-   * The standard keys are defined in this interface: {@link #NAME}, 
-   * {@link #SHORT_DESCRIPTION}, {@link #LONG_DESCRIPTION}, 
-   * {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY}, 
-   * {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value 
-   * associated with the key will be overwritten.  
-   * 
+   * Sets the value associated with the specified key and sends a
+   * {@link java.beans.PropertyChangeEvent} to all registered listeners.
+   * The standard keys are defined in this interface: {@link #NAME},
+   * {@link #SHORT_DESCRIPTION}, {@link #LONG_DESCRIPTION},
+   * {@link #SMALL_ICON}, {@link #ACTION_COMMAND_KEY},
+   * {@link #ACCELERATOR_KEY} and {@link #MNEMONIC_KEY}. Any existing value
+   * associated with the key will be overwritten.
+   *
    * @param key  the key (not null).
    * @param value  the value (null permitted).
    */
@@ -120,16 +120,16 @@ public interface Action extends ActionListener {
 
   /**
    * Returns the flag that indicates whether or not this action is enabled.
-   * 
+   *
    * @return The flag.
    */
   boolean isEnabled();
 
   /**
    * Sets the flag that indicates whether or not this action is enabled.  If
-   * the value changes, a {@link java.beans.PropertyChangeEvent} is sent to 
+   * the value changes, a {@link java.beans.PropertyChangeEvent} is sent to
    * all registered listeners.
-   * 
+   *
    * @param b  the new value of the flag.
    */
   void setEnabled(boolean b);
@@ -137,15 +137,15 @@ public interface Action extends ActionListener {
   /**
    * Registers a listener to receive notification whenever one of the
    * action's properties is modified.
-   * 
+   *
    * @param listener  the listener.
    */
   void addPropertyChangeListener(PropertyChangeListener listener);
 
   /**
    * Deregisters a listener so that it no longer receives notification of
-   * changes to the action's properties. 
-   * 
+   * changes to the action's properties.
+   *
    * @param listener  the listener.
    */
   void removePropertyChangeListener(PropertyChangeListener listener);
diff --git a/libjava/classpath/javax/swing/BorderFactory.java b/libjava/classpath/javax/swing/BorderFactory.java
index ca78deb1290..f5c4cbbb650 100644
--- a/libjava/classpath/javax/swing/BorderFactory.java
+++ b/libjava/classpath/javax/swing/BorderFactory.java
@@ -413,7 +413,7 @@ public class BorderFactory
    * Create a matte-look border using a solid color. (The difference between
    * this border and a line border is that you can specify the individual border
    * dimensions.)
-   * 
+   *
    * @param top
    *          An int specifying the width of the top in pixels
    * @param left
diff --git a/libjava/classpath/javax/swing/BoundedRangeModel.java b/libjava/classpath/javax/swing/BoundedRangeModel.java
index 54446acd5ea..87fec5f0fbc 100644
--- a/libjava/classpath/javax/swing/BoundedRangeModel.java
+++ b/libjava/classpath/javax/swing/BoundedRangeModel.java
@@ -42,11 +42,11 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 /**
- * The data model that represents a range that is constrained to fit 
- * within specified bounds.  The range is defined as value 
- * to value + extent, where both value and 
+ * The data model that represents a range that is constrained to fit
+ * within specified bounds.  The range is defined as value
+ * to value + extent, where both value and
  * extent are integers, and extent >= 0.   The bounds
- * are defined by integers minimum and maximum.  
+ * are defined by integers minimum and maximum.
  * 
                          
  * This type of model is used in components that display a range of values,
  * like {@link JProgressBar} and {@link JSlider}.
@@ -57,7 +57,7 @@ public interface BoundedRangeModel
 {
   /**
    * Returns the current value for the model.
-   * 
+   *
    * @return The current value for the model.
    *
    * @see #setValue(int)
@@ -68,7 +68,7 @@ public interface BoundedRangeModel
    * Sets the value for the model and sends a {@link ChangeEvent} to
    * all registered listeners.  The new value must satisfy the constraint
    * min <= value <= value + extent <= max.
-   * 
+   *
    * @param value the value
    *
    * @see #getValue()
@@ -76,9 +76,9 @@ public interface BoundedRangeModel
   void setValue(int value);
 
   /**
-   * Returns the lower bound for the model.  The start of the model's range 
+   * Returns the lower bound for the model.  The start of the model's range
    * (see {@link #getValue()}) cannot be less than this lower bound.
-   * 
+   *
    * @return The lower bound for the model.
    *
    * @see #setMinimum(int)
@@ -90,7 +90,7 @@ public interface BoundedRangeModel
    * Sets the lower bound for the model and sends a {@link ChangeEvent} to all
    * registered listeners.  The new minimum must be less than or equal to the
    * start value of the model's range (as returned by {@link #getValue()}).
-   * 
+   *
    * @param minimum the minimum value
    *
    * @see #getMinimum()
@@ -99,9 +99,9 @@ public interface BoundedRangeModel
 
   /**
    * Returns the upper bound for the model.  This sets an upper limit for the
-   * end value of the model's range ({@link #getValue()} + 
+   * end value of the model's range ({@link #getValue()} +
    * {@link #getExtent()}).
-   * 
+   *
    * @return The upper bound for the model.
    *
    * @see #setMaximum(int)
@@ -112,9 +112,9 @@ public interface BoundedRangeModel
   /**
    * Sets the upper bound for the model and sends a {@link ChangeEvent} to all
    * registered listeners.  The new maximum must be greater than or equal to the
-   * end value of the model's range (as returned by {@link #getValue()} + 
+   * end value of the model's range (as returned by {@link #getValue()} +
    * {@link #getExtent()}).
-   * 
+   *
    * @param maximum the maximum value
    *
    * @see #getMaximum()
@@ -123,7 +123,7 @@ public interface BoundedRangeModel
 
   /**
    * Returns the value of the valueIsAdjusting property.
-   * 
+   *
    * @return true if value is adjusting,
    * otherwise false
    *
@@ -133,7 +133,7 @@ public interface BoundedRangeModel
 
   /**
    * Sets the valueIsAdjusting property.
-   * 
+   *
    * @param adjusting true if adjusting,
    * false otherwise
    *
@@ -153,7 +153,7 @@ public interface BoundedRangeModel
   /**
    * Sets the extent, which is the length of the model's range, and sends a
    * {@link ChangeEvent} to all registered listeners.
-   * 
+   *
    * @param extent the extent
    *
    * @see #getExtent()
@@ -162,12 +162,12 @@ public interface BoundedRangeModel
 
   /**
    * Sets all the properties for the model in a single call.
-   * 
+   *
    * @param value the value
    * @param extent the extent
    * @param minimum the minimum value
    * @param maximum the maximum value
-   * @param adjusting a flag that indicates the model is being adjusted 
+   * @param adjusting a flag that indicates the model is being adjusted
    *                  continuously.
    */
   void setRangeProperties(int value, int extent, int minimum, int maximum,
@@ -175,16 +175,16 @@ public interface BoundedRangeModel
 
   /**
    * Adds a ChangeListener to this object.
-   * 
+   *
    * @param listener the listener to add
-   * 
+   *
    * @see #removeChangeListener(ChangeListener)
    */
   void addChangeListener(ChangeListener listener);
 
   /**
    * Removes a ChangeListener from this object.
-   * 
+   *
    * @param listener the listener to remove
    *
    * @see #addChangeListener(ChangeListener)
diff --git a/libjava/classpath/javax/swing/Box.java b/libjava/classpath/javax/swing/Box.java
index 0f984a98465..ce9cb8f20c8 100644
--- a/libjava/classpath/javax/swing/Box.java
+++ b/libjava/classpath/javax/swing/Box.java
@@ -60,19 +60,19 @@ import javax.accessibility.AccessibleRole;
 public class Box extends JComponent implements Accessible
 {
   private static final long serialVersionUID = 1525417495883046342L;
-  
+
   /**
    * Provides accessibility support for Boxes.
    */
   protected class AccessibleBox extends Container.AccessibleAWTContainer
   {
     private static final long serialVersionUID = -7775079816389931944L;
-  
+
     protected AccessibleBox()
     {
       // Nothing to do here.
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return null;
@@ -85,7 +85,7 @@ public class Box extends JComponent implements Accessible
   public static class Filler extends JComponent implements Accessible
   {
     private static final long serialVersionUID = -1204263191910183998L;
-  
+
     /**
      * Provides accessibility support for Box.Filler.
      */
@@ -93,20 +93,20 @@ public class Box extends JComponent implements Accessible
       extends Component.AccessibleAWTComponent
     {
       private static final long serialVersionUID = 164963348357479321L;
-      
+
       protected AccessibleBoxFiller()
       {
         // Nothing to do here.
       }
-      
+
       public AccessibleRole getAccessibleRole()
       {
         return null;
       }
     }
-    
+
     private transient Dimension min, pref, max;
-    
+
     /**
      * Creates a new instance of Filler.
      *
@@ -118,7 +118,7 @@ public class Box extends JComponent implements Accessible
     {
       changeShape(min, pref, max);
     }
-    
+
     /**
      * Changes the dimensions of this Filler.
      *
@@ -130,16 +130,16 @@ public class Box extends JComponent implements Accessible
     {
       this.min = min;
       this.pref = pref;
-      this.max = max;    
+      this.max = max;
     }
-    
+
     public AccessibleContext getAccessibleContext()
     {
       if (accessibleContext == null)
         accessibleContext = new AccessibleBoxFiller();
       return accessibleContext;
     }
-    
+
     /**
      * Returns the maximum size of this Filler.
      *
@@ -149,7 +149,7 @@ public class Box extends JComponent implements Accessible
     {
       return max;
     }
-    
+
     /**
      * Returns the minimum size of this Filler.
      *
@@ -159,7 +159,7 @@ public class Box extends JComponent implements Accessible
     {
       return min;
     }
-    
+
     /**
      * Returns the preferred size of this Filler.
      *
@@ -170,7 +170,7 @@ public class Box extends JComponent implements Accessible
       return pref;
     }
   }
-  
+
   /**
    * Creates a new Box component, that lays out its children according
    * to the axis parameter.
@@ -184,9 +184,9 @@ public class Box extends JComponent implements Accessible
    */
   public Box(int axis)
   {
-    super.setLayout(new BoxLayout(this, axis));	
+    super.setLayout(new BoxLayout(this, axis));
   }
-  
+
   /**
    * Creates a filler component which acts as glue between components.
    * It does not take space unless some extra space is available. If extra
@@ -200,12 +200,12 @@ public class Box extends JComponent implements Accessible
                              new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
     return glue;
   }
-  
+
   public static Box createHorizontalBox()
   {
     return new Box(BoxLayout.X_AXIS);
   }
-  
+
   /**
    * Creates a filler component which acts as glue between components.
    * It does not take space unless some extra space is available. If extra
@@ -219,7 +219,7 @@ public class Box extends JComponent implements Accessible
                              new Dimension(Short.MAX_VALUE, 0));
     return glue;
   }
-  
+
   /**
    * Creates a filler component which acts as strut between components.
    * It will fill exactly the specified horizontal size.
@@ -235,17 +235,17 @@ public class Box extends JComponent implements Accessible
                               new Dimension(width, Integer.MAX_VALUE));
     return strut;
   }
-  
+
   public static Component createRigidArea(Dimension d)
   {
     return new Filler(d, d, d);
   }
-  
+
   public static Box createVerticalBox()
   {
     return new Box(BoxLayout.Y_AXIS);
   }
-  
+
   /**
    * Creates a filler component which acts as glue between components.
    * It does not take space unless some extra space is available. If extra
@@ -257,7 +257,7 @@ public class Box extends JComponent implements Accessible
   {
     return createGlue();
   }
-  
+
   /**
    * Creates a filler component which acts as strut between components.
    * It will fill exactly the specified vertical size.
@@ -273,18 +273,18 @@ public class Box extends JComponent implements Accessible
                               new Dimension(Integer.MAX_VALUE, height));
     return strut;
   }
-  
+
   public void setLayout(LayoutManager l)
   {
     throw new AWTError("Not allowed to set layout managers for boxes.");
   }
-  
+
   public AccessibleContext getAccessibleContext()
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleBox();
     return accessibleContext;
   }
-  
-  
+
+
 }
diff --git a/libjava/classpath/javax/swing/BoxLayout.java b/libjava/classpath/javax/swing/BoxLayout.java
index a7f9dd61a6e..55c489eb94f 100644
--- a/libjava/classpath/javax/swing/BoxLayout.java
+++ b/libjava/classpath/javax/swing/BoxLayout.java
@@ -85,7 +85,7 @@ public class BoxLayout implements LayoutManager2, Serializable
    * The container given to the constructor.
    */
   private Container container;
-  
+
   /**
    * Current type of component layouting. Defaults to X_AXIS.
    */
@@ -174,14 +174,14 @@ public class BoxLayout implements LayoutManager2, Serializable
   private boolean isHorizontalIn(Container parent)
   {
     ComponentOrientation orientation = parent.getComponentOrientation();
-    return this.way == X_AXIS 
-      || (this.way == LINE_AXIS 
+    return this.way == X_AXIS
+      || (this.way == LINE_AXIS
           && orientation.isHorizontal())
       || (this.way == PAGE_AXIS
           && (!orientation.isHorizontal()));
   }
 
-  
+
 
   /**
    * Returns the preferred size of the layout.
@@ -236,7 +236,7 @@ public class BoxLayout implements LayoutManager2, Serializable
       {
         if (container != parent)
           throw new AWTError("BoxLayout can't be shared");
-      
+
         checkLayout();
         Component[] children = container.getComponents();
         Insets in = container.getInsets();
@@ -337,7 +337,7 @@ public class BoxLayout implements LayoutManager2, Serializable
         Insets i = container.getInsets();
         int xDim = xTotal.maximum + i.left + i.right;
         int yDim = yTotal.maximum + i.top + i.bottom;
-        
+
         // Check for overflow
         if (xDim < xTotal.maximum)
           xDim = Integer.MAX_VALUE;
diff --git a/libjava/classpath/javax/swing/ButtonGroup.java b/libjava/classpath/javax/swing/ButtonGroup.java
index 6a474f98d28..d4168bb9997 100644
--- a/libjava/classpath/javax/swing/ButtonGroup.java
+++ b/libjava/classpath/javax/swing/ButtonGroup.java
@@ -84,7 +84,7 @@ public class ButtonGroup implements Serializable
   /**
    * Adds a button to this group.  If the button is in the selected state, then:
    * 
                            
-   *   
                          • if the group has no current selection, the new button becomes the 
+   *   
                          • if the group has no current selection, the new button becomes the
    *     selected button for the group;
                            • 
    *   
                          • if the group already has a selected button, the new button is set to
    *     "not selected".
                            • 
@@ -103,14 +103,14 @@ public class ButtonGroup implements Serializable
           sel = b.getModel();
         else
           b.setSelected(false);
-      }    
+      }
     buttons.addElement(b);
   }
 
   /**
-   * Removes the specified button from this group.  If the button is the 
-   * selected button, the current selection is set to null.  
-   * The group for the removed button's model is set to null.  
+   * Removes the specified button from this group.  If the button is the
+   * selected button, the current selection is set to null.
+   * The group for the removed button's model is set to null.
    *
    * @param b the button to remove (null is ignored).
    */
@@ -180,13 +180,13 @@ public class ButtonGroup implements Serializable
       {
         ButtonModel old = sel;
         sel = m;
-        
+
         if (old != null)
           old.setSelected(false);
-        
+
         if (m != null)
           sel.setSelected(true);
-        
+
         AbstractButton button = findButton(old);
         if (button != null)
           button.repaint();
diff --git a/libjava/classpath/javax/swing/ButtonModel.java b/libjava/classpath/javax/swing/ButtonModel.java
index 03fac13d2fa..d48eb1e651a 100644
--- a/libjava/classpath/javax/swing/ButtonModel.java
+++ b/libjava/classpath/javax/swing/ButtonModel.java
@@ -48,7 +48,7 @@ import javax.swing.event.ChangeListener;
  * The data model that is used in all kinds of buttons.
  */
 public interface ButtonModel extends ItemSelectable
-{  
+{
 
   /**
    * Returns true if the button is armed, false
@@ -56,7 +56,7 @@ public interface ButtonModel extends ItemSelectable
    *
    * A button is armed, when the user has pressed the mouse over it, but has
    * not yet released the mouse.
-   * 
+   *
    * @return true if the button is armed, false
    *         otherwise
    *
@@ -145,7 +145,7 @@ public interface ButtonModel extends ItemSelectable
    *
    * An ActionEvent is usually fired when the user clicks on a
    * button.
-   * 
+   *
    * @param l the action listener to add
    *
    * @see #removeActionListener(ActionListener)
@@ -225,7 +225,7 @@ public interface ButtonModel extends ItemSelectable
   /**
    * Returns the keyboard mnemonic for the button. This specifies a shortcut
    * or accelerator key that can be used to activate the button.
-   * 
+   *
    * @return the keyboard mnemonic for the button
    *
    * @see #setMnemonic(int)
@@ -235,7 +235,7 @@ public interface ButtonModel extends ItemSelectable
   /**
    * Sets the keyboard mnemonic for the button. This specifies a shortcut
    * or accelerator key that can be used to activate the button.
-   * 
+   *
    * @param key the keyboard mnemonic for the button
    *
    * @see #getMnemonic()
@@ -276,7 +276,7 @@ public interface ButtonModel extends ItemSelectable
    * Some kinds of buttons (e.g. toggle buttons, check boxes, radio buttons)
    * can be in one of two states: selected or unselected. The selected state
    * is usually toggled by clicking on the button.
-   * 
+   *
    * @param b true if the button is selected, false
    *        otherwise
    *
@@ -291,7 +291,7 @@ public interface ButtonModel extends ItemSelectable
    * Some kinds of buttons (e.g. toggle buttons, check boxes, radio buttons)
    * can be in one of two states: selected or unselected. The selected state
    * is usually toggled by clicking on the button.
-   * 
+   *
    * @return true if the button is selected, false
    *         otherwise
    *
diff --git a/libjava/classpath/javax/swing/CellEditor.java b/libjava/classpath/javax/swing/CellEditor.java
index 9eb083ab25d..134c316e4d5 100644
--- a/libjava/classpath/javax/swing/CellEditor.java
+++ b/libjava/classpath/javax/swing/CellEditor.java
@@ -53,17 +53,17 @@ public interface CellEditor
 {
   /**
    * Returns the current value for the CellEditor.
-   * 
+   *
    * @return The value.
    */
   Object getCellEditorValue();
 
   /**
-   * Returns true if the specified event makes the editor 
+   * Returns true if the specified event makes the editor
    * editable, and false otherwise.
-   * 
+   *
    * @param event  the event.
-   * 
+   *
    * @return A boolean.
    */
   boolean isCellEditable(EventObject event);
@@ -76,10 +76,10 @@ public interface CellEditor
   boolean shouldSelectCell(EventObject event);
 
   /**
-   * Signals to the CellEditor that it should stop editing, 
+   * Signals to the CellEditor that it should stop editing,
    * accepting the current cell value, and returns true if the
    * editor actually stops editing, and false otherwise.
-   * 
+   *
    * @return A boolean.
    */
   boolean stopCellEditing();
@@ -90,17 +90,17 @@ public interface CellEditor
   void cancelCellEditing();
 
   /**
-   * Registers a listener to receive {@link ChangeEvent} notifications from the 
+   * Registers a listener to receive {@link ChangeEvent} notifications from the
    * CellEditor.
-   * 
+   *
    * @param listener  the listener.
    */
   void addCellEditorListener(CellEditorListener listener);
 
   /**
-   * Deregisters a listener so that it no longer receives {@link ChangeEvent} 
+   * Deregisters a listener so that it no longer receives {@link ChangeEvent}
    * notifications from the CellEditor.
-   * 
+   *
    * @param listener  the listener.
    */
   void removeCellEditorListener(CellEditorListener listener);
diff --git a/libjava/classpath/javax/swing/CellRendererPane.java b/libjava/classpath/javax/swing/CellRendererPane.java
index 764a4c500b5..0140b4c2ccc 100644
--- a/libjava/classpath/javax/swing/CellRendererPane.java
+++ b/libjava/classpath/javax/swing/CellRendererPane.java
@@ -162,7 +162,7 @@ public class CellRendererPane extends Container implements Accessible
    *        painting
    */
   public void paintComponent(Graphics graphics, Component c,
-                             Container p, int x, int y, int w, int h, 
+                             Container p, int x, int y, int w, int h,
                              boolean shouldValidate)
   {
     // reparent c
diff --git a/libjava/classpath/javax/swing/ComboBoxModel.java b/libjava/classpath/javax/swing/ComboBoxModel.java
index 61052758758..ce252faedf0 100644
--- a/libjava/classpath/javax/swing/ComboBoxModel.java
+++ b/libjava/classpath/javax/swing/ComboBoxModel.java
@@ -41,9 +41,9 @@ import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 
 /**
- * The data model for a {@link JComboBox}. This model keeps track of elements 
+ * The data model for a {@link JComboBox}. This model keeps track of elements
  * contained in the JComboBox as well as the current
- * combo box selection. Whenever the selection in the JComboBox 
+ * combo box selection. Whenever the selection in the JComboBox
  * changes, the ComboBoxModel should fire a {@link ListDataEvent}
  * to the model's {@link ListDataListener}s.
  *
@@ -52,8 +52,8 @@ import javax.swing.event.ListDataListener;
 public interface ComboBoxModel extends ListModel
 {
   /**
-   * Sets the selected item in the combo box. Classes implementing this 
-   * interface should fire a {@link ListDataEvent} to all registered 
+   * Sets the selected item in the combo box. Classes implementing this
+   * interface should fire a {@link ListDataEvent} to all registered
    * {@link ListDataListener}s to indicate that the selection has changed.
    *
    * @param item  the selected item (null permitted).
diff --git a/libjava/classpath/javax/swing/ComponentInputMap.java b/libjava/classpath/javax/swing/ComponentInputMap.java
index 28aa8e22cf6..dc4d0bfd449 100644
--- a/libjava/classpath/javax/swing/ComponentInputMap.java
+++ b/libjava/classpath/javax/swing/ComponentInputMap.java
@@ -64,7 +64,7 @@ public class ComponentInputMap extends InputMap
   {
     if (comp == null)
       throw new IllegalArgumentException();
-    
+
     this.component = comp;
   }
 
@@ -117,13 +117,13 @@ public class ComponentInputMap extends InputMap
     if (parentMap != null && !(parentMap instanceof ComponentInputMap))
       throw new IllegalArgumentException("ComponentInputMaps can only have " +
                                          "ComponentInputMaps for parents");
-    
-    if (parentMap != null && 
+
+    if (parentMap != null &&
         ((ComponentInputMap) parentMap).getComponent() != component)
-      throw new 
+      throw new
         IllegalArgumentException("ComponentInputMaps' parents must " +
                                  "be associated with the same JComponents");
-   
+
     super.setParent(parentMap);
     if (component != null)
       component.updateComponentInputMap(this);
diff --git a/libjava/classpath/javax/swing/DebugGraphics.java b/libjava/classpath/javax/swing/DebugGraphics.java
index 126309a5844..d96de4a227b 100644
--- a/libjava/classpath/javax/swing/DebugGraphics.java
+++ b/libjava/classpath/javax/swing/DebugGraphics.java
@@ -153,7 +153,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * Sets the color to draw stuff with.
-   * 
+   *
    * @param color The color
    */
   public void setColor(Color color)
@@ -301,7 +301,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * Returns the color used for drawing.
-   * 
+   *
    * @return The color.
    */
   public Color getColor()
@@ -454,7 +454,7 @@ public class DebugGraphics extends Graphics
         // Ignore this.
       }
   }
-  
+
   /**
    * Draws a rectangle.
    *
@@ -552,8 +552,8 @@ public class DebugGraphics extends Graphics
    * @param arcWidth TODO
    * @param arcHeight TODO
    */
-  public void drawRoundRect(int x, int y, int width, int height, 
-			    int arcWidth, int arcHeight)
+  public void drawRoundRect(int x, int y, int width, int height,
+                            int arcWidth, int arcHeight)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -576,8 +576,8 @@ public class DebugGraphics extends Graphics
    * @param arcWidth TODO
    * @param arcHeight TODO
    */
-  public void fillRoundRect(int x, int y, int width, int height, 
-			    int arcWidth, int arcHeight)
+  public void fillRoundRect(int x, int y, int width, int height,
+                            int arcWidth, int arcHeight)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -593,7 +593,7 @@ public class DebugGraphics extends Graphics
   /**
    * drawLine
    *
-   * @param x1 The x-position of the start 
+   * @param x1 The x-position of the start
    * @param y1 The y-position of the start
    * @param x2 The x-position of the end
    * @param y2 The y-position of the end
@@ -699,8 +699,8 @@ public class DebugGraphics extends Graphics
    * @param startAngle TODO
    * @param arcAngle TODO
    */
-  public void drawArc(int x, int y, int width, int height, 
-		      int startAngle, int arcAngle)
+  public void drawArc(int x, int y, int width, int height,
+                      int startAngle, int arcAngle)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -723,8 +723,8 @@ public class DebugGraphics extends Graphics
    * @param startAngle TODO
    * @param arcAngle TODO
    */
-  public void fillArc(int x, int y, int width, int height, 
-		      int startAngle, int arcAngle)
+  public void fillArc(int x, int y, int width, int height,
+                      int startAngle, int arcAngle)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -817,7 +817,7 @@ public class DebugGraphics extends Graphics
    * @param y the y coordinate
    */
   public void drawString(AttributedCharacterIterator iterator,
-			 int x, int y)
+                         int x, int y)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -830,7 +830,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawBytes
-   * 
+   *
    * @param data TODO
    * @param offset TODO
    * @param length TODO
@@ -838,7 +838,7 @@ public class DebugGraphics extends Graphics
    * @param y the y coordinate
    */
   public void drawBytes(byte[] data, int offset, int length,
-			int x, int y)
+                        int x, int y)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       logStream().println(prefix() + " Drawing bytes at: " + new Point(x, y));
@@ -848,15 +848,15 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawChars
-   * 
+   *
    * @param data array of characters to draw
    * @param offset offset in array
    * @param length number of characters in array to draw
    * @param x x-position
    * @param y y-position
    */
-  public void drawChars(char[] data, int offset, int length, 
-			int x, int y)
+  public void drawChars(char[] data, int offset, int length,
+                        int x, int y)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       logStream().println(prefix() + " Drawing chars at: " + new Point(x, y));
@@ -889,7 +889,7 @@ public class DebugGraphics extends Graphics
    * @return boolean
    */
   public boolean drawImage(Image image, int x, int y,
-			   ImageObserver observer)
+                           ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -902,7 +902,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawImage
-   * 
+   *
    * @param image The image to draw
    * @param x The x position
    * @param y The y position
@@ -912,8 +912,8 @@ public class DebugGraphics extends Graphics
    *
    * @return boolean
    */
-  public boolean drawImage(Image image, int x, int y, int width, 
-			   int height, ImageObserver observer)
+  public boolean drawImage(Image image, int x, int y, int width,
+                           int height, ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -926,7 +926,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawImage
-   * 
+   *
    * @param image The image to draw
    * @param x The x position
    * @param y The y position
@@ -936,8 +936,8 @@ public class DebugGraphics extends Graphics
    *
    * @return boolean
    */
-  public boolean drawImage(Image image, int x, int y, 
-			   Color background, ImageObserver observer)
+  public boolean drawImage(Image image, int x, int y,
+                           Color background, ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -951,7 +951,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawImage
-   * 
+   *
    * @param image The image to draw
    * @param x The x position
    * @param y The y position
@@ -963,8 +963,8 @@ public class DebugGraphics extends Graphics
    *
    * @return boolean
    */
-  public boolean drawImage(Image image, int x, int y, int width, int height, 
-			   Color background, ImageObserver observer)
+  public boolean drawImage(Image image, int x, int y, int width, int height,
+                           Color background, ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -978,7 +978,7 @@ public class DebugGraphics extends Graphics
 
   /**
    * drawImage
-   * 
+   *
    * @param image The image to draw
    * @param dx1 TODO
    * @param dy1 TODO
@@ -989,12 +989,12 @@ public class DebugGraphics extends Graphics
    * @param sx2 TODO
    * @param sy2 TODO
    * @param observer The image observer
-   * 
+   *
    * @return boolean
    */
   public boolean drawImage(Image image, int dx1, int dy1,
-			   int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
-			   ImageObserver observer)
+                           int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+                           ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -1025,8 +1025,8 @@ public class DebugGraphics extends Graphics
    * @return boolean
    */
   public boolean drawImage(Image image, int dx1, int dy1,
-			   int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
-			   Color background, ImageObserver observer)
+                           int dx2, int dy2, int sx1, int sy1, int sx2, int sy2,
+                           Color background, ImageObserver observer)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -1049,8 +1049,8 @@ public class DebugGraphics extends Graphics
    * @param destx The x position of the destination area
    * @param desty The y posiiton of the destination area
    */
-  public void copyArea(int x, int y, int width, int height, 
-		       int destx, int desty)
+  public void copyArea(int x, int y, int width, int height,
+                       int destx, int desty)
   {
     if ((debugOptions & LOG_OPTION) != 0)
       {
@@ -1109,7 +1109,7 @@ public class DebugGraphics extends Graphics
   /**
    * Creates and returns the prefix that should be prepended to all logging
    * messages. The prefix is made up like this:
-   * 
+   *
    * Graphics(-1) where counter is an integer number
    * saying how many DebugGraphics objects have been created so far. The second
    * number always seem to be 1 on Sun's JDK, this has to be investigated a
diff --git a/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java b/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
index 786e4ee9204..c1d0fe74a89 100644
--- a/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
+++ b/libjava/classpath/javax/swing/DefaultBoundedRangeModel.java
@@ -371,7 +371,7 @@ public class DefaultBoundedRangeModel
     this.minimum = minimum;
     this.maximum = maximum;
     this.isAdjusting = isAdjusting;
-		
+
     fireStateChanged();
   }
 
@@ -405,7 +405,7 @@ public class DefaultBoundedRangeModel
   protected void fireStateChanged()
   {
     ChangeListener[] listeners = getChangeListeners();
-    
+
     if (changeEvent == null)
       changeEvent = new ChangeEvent(this);
 
@@ -443,7 +443,7 @@ public class DefaultBoundedRangeModel
   {
     return (ChangeListener[]) getListeners(ChangeListener.class);
   }
-  
+
   /**
    * Provides serialization support.
    *
@@ -451,8 +451,8 @@ public class DefaultBoundedRangeModel
    *
    * @throws IOException  if there is an I/O error.
    */
-  private void writeObject(ObjectOutputStream stream) 
-    throws IOException 
+  private void writeObject(ObjectOutputStream stream)
+    throws IOException
   {
     stream.defaultWriteObject();
   }
diff --git a/libjava/classpath/javax/swing/DefaultButtonModel.java b/libjava/classpath/javax/swing/DefaultButtonModel.java
index c0eaea239b5..d29a23ed373 100644
--- a/libjava/classpath/javax/swing/DefaultButtonModel.java
+++ b/libjava/classpath/javax/swing/DefaultButtonModel.java
@@ -331,7 +331,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
     // if this call does not represent a CHANGE in state, then return
     if ((a && isArmed()) || (!a && !isArmed()))
       return;
-    
+
     // cannot change ARMED state unless button is enabled
     if (!isEnabled())
       return;
@@ -427,7 +427,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
     // if this call does not represent a CHANGE in state, then return
     if (r == isRollover())
       return;
-    
+
     // cannot set ROLLOVER property unless button is enabled
     if (!isEnabled())
       return;
@@ -452,7 +452,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
     // if this call does not represent a CHANGE in state, then return
     if ((s && isSelected()) || (!s && !isSelected()))
       return;
-    
+
     // make the change
     if (s)
       stateMask = stateMask | SELECTED;
@@ -556,7 +556,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
    * true at a time.
    *
    * @param g The new "group" property (null permitted).
-   * 
+   *
    * @see #getGroup()
    */
   public void setGroup(ButtonGroup g)
@@ -568,7 +568,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable
    * Returns the current value of the model's "group" property.
    *
    * @return The value of the "group" property
-   * 
+   *
    * @see #setGroup(ButtonGroup)
    */
   public ButtonGroup getGroup()
diff --git a/libjava/classpath/javax/swing/DefaultCellEditor.java b/libjava/classpath/javax/swing/DefaultCellEditor.java
index 16ed1ec6842..46f63707148 100644
--- a/libjava/classpath/javax/swing/DefaultCellEditor.java
+++ b/libjava/classpath/javax/swing/DefaultCellEditor.java
@@ -57,7 +57,7 @@ import javax.swing.tree.TreeCellEditor;
  * The default implementation of {@link TableCellEditor} and
  * {@link TreeCellEditor}. It provides editor components for
  * some standard object types.
- * 
+ *
  * @author Andrew Selkirk
  * @author Audrius Meskauskas
  */
@@ -69,12 +69,12 @@ public class DefaultCellEditor
 
   /**
    * This changeable module access the editor component in the component
-   * specific way. For instance, to set the value for JTextField, we need to 
-   * call setText(String), and for JCheckBox we need to call 
+   * specific way. For instance, to set the value for JTextField, we need to
+   * call setText(String), and for JCheckBox we need to call
    * setSelected(boolean). Each default editor has the component specific
    * derivative of this class. These derivatives are private inner classes of
    * the DefaultCellEditor.
-   * 
+   *
    * The editor delegate is also set for the editor component as the action
    * listener. It listens for the events that indicate that editing has stopped.
    */
@@ -98,7 +98,7 @@ public class DefaultCellEditor
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Set the value for the editor component. This method is normally
      * overridden to set the value in the way, specific for the text
@@ -121,12 +121,12 @@ public class DefaultCellEditor
     public Object getCellEditorValue()
     {
       return value;
-    } 
+    }
 
     /**
-     * The default method returns true for the {@link MouseEvent} and false 
+     * The default method returns true for the {@link MouseEvent} and false
      * for any other events.
-     * 
+     *
      * @param event the event to check
      *
      * @return true if the passed event is the mouse event and false otherwise.
@@ -141,10 +141,10 @@ public class DefaultCellEditor
 
     /**
      * Returns true to indicate that the editing cell can be selected.
-     * 
+     *
      * The default method returns true without action but may be overridden
      * in derived classes for more specific behavior.
-     * 
+     *
      * @param event unused in default method
      *
      * @return true always
@@ -158,8 +158,8 @@ public class DefaultCellEditor
     /**
      * Finish the cell editing session. This method notifies the registered
      * cell editor listeners (including the table) that the editing has been
-     * stopped. 
-     * 
+     * stopped.
+     *
      * @return boolean
      */
     public boolean stopCellEditing()
@@ -182,9 +182,9 @@ public class DefaultCellEditor
      * Start editing session and returns true to indicate the editing has begun.
      * The default method returns true without action but may be overridden
      * in derived classes for more specific behavior.
-     * 
+     *
      * @param event  the event.
-     * 
+     *
      * @return true, always
      */
     public boolean startCellEditing(EventObject event)
@@ -196,8 +196,8 @@ public class DefaultCellEditor
     /**
      * This event is fired by the editor component (for instance, by pressing
      * ENTER in the {@link JTextField}. The default method delegates call to
-     * the {@link #stopCellEditing}, finishing the editing session. 
-     * 
+     * the {@link #stopCellEditing}, finishing the editing session.
+     *
      * @param event unused in default method
      */
     public void actionPerformed(ActionEvent event)
@@ -207,8 +207,8 @@ public class DefaultCellEditor
 
     /**
      * This event is fired by the editor component.The default method delegates
-     * call to the {@link #stopCellEditing}, finishing the editing session. 
-     * 
+     * call to the {@link #stopCellEditing}, finishing the editing session.
+     *
      * @param event unused in default method
      */
     public void itemStateChanged(ItemEvent event)
@@ -225,9 +225,9 @@ public class DefaultCellEditor
       CellEditorListener[] listeners = getCellEditorListeners();
       for (int index = 0; index < listeners.length; index++)
         listeners[index].editingStopped(changeEvent);
-      
+
     }
-    
+
     /**
      * Notify the registered listeners (including the table) that the editing
      * has been canceled.
@@ -239,10 +239,10 @@ public class DefaultCellEditor
         listeners[index].editingCanceled(changeEvent);
     }
   } // EditorDelegate
-  
+
   /**
    * Provides getter and setter methods to work with the text component.
-   * 
+   *
    * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
    */
   private class JTextFieldDelegate extends EditorDelegate
@@ -251,7 +251,7 @@ public class DefaultCellEditor
      * Use the serial version UID for interoperability.
      */
     private static final long serialVersionUID = 1;
-    
+
     /**
      * Set the value for the editor component.
      *
@@ -268,21 +268,21 @@ public class DefaultCellEditor
     }
 
     /**
-     * Get the value for the editor component. 
+     * Get the value for the editor component.
      *
      * @return value the value of the component (String)
      */
     public Object getCellEditorValue()
     {
       JTextField f = (JTextField) editorComponent;
-      return value = f.getText();      
-    }     
+      return value = f.getText();
+    }
   }
 
   /**
    * Provides getter and setter methods to work with the combo box.
-   * 
-   * @author Audrius Meskauskas (audriusa@Bioinformatics.org) 
+   *
+   * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
    */
   private class JComboBoxDelegate extends EditorDelegate
   {
@@ -290,7 +290,7 @@ public class DefaultCellEditor
      * Use the serial version UID for interoperability.
      */
     private static final long serialVersionUID = 1;
-    
+
     /**
      * Set the value for the editor component.
      *
@@ -298,14 +298,14 @@ public class DefaultCellEditor
      */
     public void setValue(Object aValue)
     {
-      value = aValue;      
+      value = aValue;
       JComboBox c = (JComboBox) editorComponent;
       if (value != null)
         c.setSelectedItem(value);
     }
 
     /**
-     * Get the value for the editor component. 
+     * Get the value for the editor component.
      *
      * @return value the value of the component (as String)
      */
@@ -313,13 +313,13 @@ public class DefaultCellEditor
     {
       JComboBox c = (JComboBox) editorComponent;
       return value = c.getSelectedItem();
-    } 
-    
+    }
+
     /**
      * Returns true to indicate that the editing cell can be selected. If the
      * check box is not editable, expands it. If it is editable, brings
      * focus to the editor field.
-     * 
+     *
      * @param event unused in default method
      *
      * @return true always
@@ -330,13 +330,13 @@ public class DefaultCellEditor
       if (!c.isEditable)
         c.showPopup();
       return true;
-    }    
+    }
   }
 
   /**
    * Provides getter and setter methods to work with the check box.
-   * 
-   * @author Audrius Meskauskas (audriusa@Bioinformatics.org) 
+   *
+   * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
    */
   private class JCheckBoxDelegate extends EditorDelegate
   {
@@ -344,7 +344,7 @@ public class DefaultCellEditor
      * Use the serial version UID for interoperability.
      */
     private static final long serialVersionUID = 1;
-    
+
     /**
      * Set the value for the editor component.
      *
@@ -353,7 +353,7 @@ public class DefaultCellEditor
     public void setValue(Object value)
     {
       JCheckBox c = (JCheckBox) editorComponent;
-      
+
       if (value == null)
         c.setSelected(false);
       else
@@ -361,7 +361,7 @@ public class DefaultCellEditor
     }
 
     /**
-     * Get the value for the editor component. 
+     * Get the value for the editor component.
      *
      * @return value the value of the component (must be CharSequence)
      */
@@ -370,9 +370,9 @@ public class DefaultCellEditor
       JCheckBox c = (JCheckBox) editorComponent;
       value = c.isSelected() ? Boolean.TRUE : Boolean.FALSE;
       return value;
-    }     
+    }
   }
-  
+
   /**
    * The Swing JComponent, performing the editing session.
    */
@@ -392,7 +392,7 @@ public class DefaultCellEditor
   /**
    * Create the DefaultCellEditor that uses the text field as its editor
    * component (appropriate for the text content)
-   * 
+   *
    * @param textfield the text field as will be used as the editor component
    */
   public DefaultCellEditor(JTextField textfield)
@@ -406,7 +406,7 @@ public class DefaultCellEditor
   /**
    * Constructor DefaultCellEditor that uses the checkbox (appropriate
    * for boolean values)
-   * 
+   *
    * @param checkbox the checkbox that will be used with this editor.
    */
   public DefaultCellEditor(JCheckBox checkbox)
@@ -419,7 +419,7 @@ public class DefaultCellEditor
 
   /**
    * Constructor DefaultCellEditor that uses the combo box.
-   * 
+   *
    * @param combobox the combo box that will be used with this editor.
    */
   public DefaultCellEditor(JComboBox combobox)
@@ -431,19 +431,19 @@ public class DefaultCellEditor
   } // DefaultCellEditor()
 
   /**
-   * Get the component that performs the editing sessions. It is the same 
+   * Get the component that performs the editing sessions. It is the same
    * component that was passed in constructor.
-   * 
-   * @return the component, performing the editing sessions. 
+   *
+   * @return the component, performing the editing sessions.
    */
   public Component getComponent()
   {
-    return editorComponent; 
+    return editorComponent;
   } // getComponent()
 
   /**
    * Get the number of mouse clicks, required to start the editing session.
-   * 
+   *
    * @return int the number of mouse clicks, required to start the session
    */
   public int getClickCountToStart()
@@ -453,7 +453,7 @@ public class DefaultCellEditor
 
   /**
    * Set the number of mouse clicks, required to start the editing session.
-   * 
+   *
    * @param count the number of clicks, required to start the session
    */
   public void setClickCountToStart(int count)
@@ -462,9 +462,9 @@ public class DefaultCellEditor
   } // setClickCountToStart()
 
   /**
-   * Get the value, currently being displayed by the editor component. The 
+   * Get the value, currently being displayed by the editor component. The
    * call is forwarded to the {@link #delegate}.
-   * 
+   *
    * @return Object the value (class depends on the editor component)
    */
   public Object getCellEditorValue()
@@ -474,7 +474,7 @@ public class DefaultCellEditor
 
   /**
    * Forwards call to the {@link #delegate}.
-   * 
+   *
    * @param event forwarded to the delegate.
    *
    * @return boolean returned by delegate
@@ -486,7 +486,7 @@ public class DefaultCellEditor
 
   /**
    * Forwards call to the {@link #delegate}.
-   * 
+   *
    * @param event forwarded to the delegate.
    *
    * @return boolean returned by delegate
@@ -498,7 +498,7 @@ public class DefaultCellEditor
 
   /**
    * Forwards call to the {@link #delegate}.
-   * 
+   *
    * @return boolean returned by delegate
    */
   public boolean stopCellEditing()
@@ -515,14 +515,14 @@ public class DefaultCellEditor
   } // cancelCellEditing()
 
   /**
-   * Sets an initial value for the editor. 
-   * This will cause the editor to stopEditing and lose any partially 
+   * Sets an initial value for the editor.
+   * This will cause the editor to stopEditing and lose any partially
    * edited value if the editor is editing when this method is called.
-   * Returns the component that should be added to the client's Component 
-   * hierarchy. Once installed in the client's hierarchy this component will 
-   * then be able to draw and receive user input. 
-   * 
-   * @param tree - the JTree that is asking the editor to edit; this 
+   * Returns the component that should be added to the client's Component
+   * hierarchy. Once installed in the client's hierarchy this component will
+   * then be able to draw and receive user input.
+   *
+   * @param tree - the JTree that is asking the editor to edit; this
    * parameter can be null
    * @param value - the value of the cell to be edited
    * @param isSelected - true is the cell is to be renderer with selection
@@ -546,21 +546,21 @@ public class DefaultCellEditor
    * Get the cell editor component that will perform the editing session. If
    * returned once, the same component is also returned on the repetetive calls
    * again (reused).
-   * 
+   *
    * @param table the table where the editing is performed
-   * @param value the current value of the table. It is set as the initial 
+   * @param value the current value of the table. It is set as the initial
    *        component value.
    * @param isSelected if true, the cell is currently selected
    * @param row the row of the cell being edited
    * @param column the column of the cell being edited
-   * 
+   *
    * @return Component the component that will perform the editing session
    */
   public Component getTableCellEditorComponent(JTable table, Object value,
                                                boolean isSelected, int row,
                                                int column)
   {
-    // NOTE: as specified by Sun, we don't call new() everytime, we return 
+    // NOTE: as specified by Sun, we don't call new() everytime, we return
     // editorComponent on each call to getTableCellEditorComponent or
     // getTreeCellEditorComponent.
     delegate.setValue(value);
diff --git a/libjava/classpath/javax/swing/DefaultComboBoxModel.java b/libjava/classpath/javax/swing/DefaultComboBoxModel.java
index 9b5bdb60d18..a90b89d93dc 100644
--- a/libjava/classpath/javax/swing/DefaultComboBoxModel.java
+++ b/libjava/classpath/javax/swing/DefaultComboBoxModel.java
@@ -78,13 +78,13 @@ public class DefaultComboBoxModel extends AbstractListModel
   }
 
   /**
-   * Creates a new model and initializes its item list to the values in the 
-   * given array.  The selected item is set to the first item in the array, or 
+   * Creates a new model and initializes its item list to the values in the
+   * given array.  The selected item is set to the first item in the array, or
    * null if the array length is zero.
    *
    * @param items  an array containing items for the model (null
    *               not permitted).
-   * 
+   *
    * @throws NullPointerException if items is null.
    */
   public DefaultComboBoxModel(Object[] items)
@@ -95,13 +95,13 @@ public class DefaultComboBoxModel extends AbstractListModel
   }
 
   /**
-   * Creates a new model and initializes its item list to the values in the 
-   * given vector.  The selected item is set to the first item in the vector, 
+   * Creates a new model and initializes its item list to the values in the
+   * given vector.  The selected item is set to the first item in the vector,
    * or null if the vector length is zero.
    *
    * @param vector  a vector containing items for the model (null
    *                not permitted).
-   * 
+   *
    * @throws NullPointerException if vector is null.
    */
   public DefaultComboBoxModel(Vector vector)
@@ -114,7 +114,7 @@ public class DefaultComboBoxModel extends AbstractListModel
   /**
    * Adds an element to the model's item list and sends a {@link ListDataEvent}
    * to all registered listeners.  If the new element is the first item added
-   * to the list, and the selected item is null, the new element 
+   * to the list, and the selected item is null, the new element
    * is set as the selected item.
    *
    * @param object item to add to the model's item list.
@@ -131,12 +131,12 @@ public class DefaultComboBoxModel extends AbstractListModel
   /**
    * Removes the element at the specified index from the model's item list
    * and sends a {@link ListDataEvent} to all registered listeners.  If the
-   * element removed was the selected item, then the preceding element becomes 
-   * the new selected item (or the next element, if there is no preceding 
+   * element removed was the selected item, then the preceding element becomes
+   * the new selected item (or the next element, if there is no preceding
    * element).
    *
    * @param index  the index of the item to remove.
-   * 
+   *
    * @throws ArrayIndexOutOfBoundsException if index is out of
    *         bounds.
    */
@@ -147,7 +147,7 @@ public class DefaultComboBoxModel extends AbstractListModel
       {
         if (selected > 0)
           setSelectedItem(getElementAt(selected - 1));
-        else 
+        else
           setSelectedItem(getElementAt(selected + 1));
       }
     list.removeElementAt(index);
@@ -161,10 +161,10 @@ public class DefaultComboBoxModel extends AbstractListModel
    * @param object element to insert
    * @param index index specifing position in the list where given element
    *        should be inserted.
-   * 
-   * @throws ArrayIndexOutOfBoundsException if index is out of 
+   *
+   * @throws ArrayIndexOutOfBoundsException if index is out of
    *         bounds.
-   * 
+   *
    * @see #addElement(Object)
    */
   public void insertElementAt(Object object, int index)
@@ -174,7 +174,7 @@ public class DefaultComboBoxModel extends AbstractListModel
   }
 
   /**
-   * Removes an element from the model's item list and sends a 
+   * Removes an element from the model's item list and sends a
    * {@link ListDataEvent} to all registered listeners.  If the item to be
    * removed is the current selected item, a new selected item will be set.
    * If the element is not found in the model's item list, this method does
@@ -191,7 +191,7 @@ public class DefaultComboBoxModel extends AbstractListModel
 
   /**
    * Removes all the items from the model's item list, resets and selected item
-   * to null, and sends a {@link ListDataEvent} to all registered 
+   * to null, and sends a {@link ListDataEvent} to all registered
    * listeners.
    */
   public void removeAllElements()
@@ -217,7 +217,7 @@ public class DefaultComboBoxModel extends AbstractListModel
 
   /**
    * Sets the selected item for the model and sends a {@link ListDataEvent} to
-   * all registered listeners.  The start and end index of the event is set to 
+   * all registered listeners.  The start and end index of the event is set to
    * -1 to indicate the model's selection has changed, and not its contents.
    *
    * @param object  the new selected item (null permitted).
diff --git a/libjava/classpath/javax/swing/DefaultDesktopManager.java b/libjava/classpath/javax/swing/DefaultDesktopManager.java
index cad88186f22..9613449fffc 100644
--- a/libjava/classpath/javax/swing/DefaultDesktopManager.java
+++ b/libjava/classpath/javax/swing/DefaultDesktopManager.java
@@ -126,11 +126,11 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
     Container c = frame.getParent();
     if (c != null)
       {
-	if (frame.isIcon())
-	  c.remove(frame.getDesktopIcon());
-	else
-	  c.remove(frame);
-	c.repaint();
+        if (frame.isIcon())
+          c.remove(frame.getDesktopIcon());
+        else
+          c.remove(frame);
+        c.repaint();
       }
   }
 
@@ -151,25 +151,25 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
     Container p = frame.getParent();
     if (p != null)
       {
-	Rectangle pBounds = p.getBounds();
-	Insets insets = p.getInsets();
-	pBounds.width -= insets.left + insets.right;
-	pBounds.height -= insets.top + insets.bottom;
+        Rectangle pBounds = p.getBounds();
+        Insets insets = p.getInsets();
+        pBounds.width -= insets.left + insets.right;
+        pBounds.height -= insets.top + insets.bottom;
 
-	setBoundsForFrame(frame, 0, 0, pBounds.width, pBounds.height);
+        setBoundsForFrame(frame, 0, 0, pBounds.width, pBounds.height);
       }
     if (p instanceof JDesktopPane)
       ((JDesktopPane) p).setSelectedFrame(frame);
     else
       {
-	try
-	  {
-	    frame.setSelected(true);
-	  }
-	catch (PropertyVetoException e)
-	  {
-	    // Do nothing.
-	  }
+        try
+          {
+            frame.setSelected(true);
+          }
+        catch (PropertyVetoException e)
+          {
+            // Do nothing.
+          }
       }
   }
 
@@ -320,7 +320,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
           {
             p.setSelectedFrame(frame);
           }
-        
+
       }
     frame.toFront();
   }
@@ -414,7 +414,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
                           dragCache.width, dragCache.height);
         pane = null;
         dragCache = null;
-        component.repaint();        
+        component.repaint();
       }
   }
 
@@ -477,7 +477,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
                           dragCache.width, dragCache.height);
         pane = null;
         dragCache = null;
-        component.repaint();        
+        component.repaint();
       }
   }
 
@@ -527,9 +527,9 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
   protected Rectangle getBoundsForIconOf(JInternalFrame frame)
   {
     // IconRects has no order to it.
-    // The icon _must_ be placed in the first free slot (working from 
+    // The icon _must_ be placed in the first free slot (working from
     // the bottom left corner)
-    // The icon also must not be placed where another icon is placed 
+    // The icon also must not be placed where another icon is placed
     // (regardless whether that frame is an icon currently or not)
     JDesktopPane desktopPane = frame.getDesktopPane();
 
@@ -547,7 +547,7 @@ public class DefaultDesktopManager implements DesktopManager, Serializable
       if (frames[i] instanceof JDesktopIcon
           || frames[i] instanceof JInternalFrame
           && ((JInternalFrame) frames[i]).getWasIcon() && frames[i] != frame)
-	count++;
+        count++;
     iconRects = new Rectangle[count];
     for (int i = 0, j = 0; i < frames.length; i++)
       if (frames[i] instanceof JDesktopIcon)
diff --git a/libjava/classpath/javax/swing/DefaultFocusManager.java b/libjava/classpath/javax/swing/DefaultFocusManager.java
index 103a7f36c43..3c5daa0e6f9 100644
--- a/libjava/classpath/javax/swing/DefaultFocusManager.java
+++ b/libjava/classpath/javax/swing/DefaultFocusManager.java
@@ -49,7 +49,7 @@ import java.util.Stack;
  *
  * @author Andrew Selkirk
  */
-public class DefaultFocusManager extends FocusManager 
+public class DefaultFocusManager extends FocusManager
 {
 
   /**
@@ -65,9 +65,9 @@ public class DefaultFocusManager extends FocusManager
     // TODO
   } // DefaultFocusManager()
 
-	/**
+        /**
    * processKeyEvent
-   * 
+   *
    * @param component
    *          TODO
    * @param event
@@ -80,7 +80,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * focusNextComponent
-   * 
+   *
    * @param component
    *          TODO
    */
@@ -91,7 +91,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * focusPreviousComponent
-   * 
+   *
    * @param component
    *          TODO
    */
@@ -102,7 +102,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * getFirstComponent
-   * 
+   *
    * @param container
    *          TODO
    * @return Component
@@ -114,7 +114,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * getLastComponent
-   * 
+   *
    * @param container
    *          TODO
    * @return Component
@@ -126,7 +126,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * getComponentBefore
-   * 
+   *
    * @param container
    *          TODO
    * @param component
@@ -140,7 +140,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * getComponentAfter
-   * 
+   *
    * @param container
    *          TODO
    * @param component
@@ -154,7 +154,7 @@ public class DefaultFocusManager extends FocusManager
 
   /**
    * compareTabOrder
-   * 
+   *
    * @param component1
    *          TODO
    * @param component2
diff --git a/libjava/classpath/javax/swing/DefaultListModel.java b/libjava/classpath/javax/swing/DefaultListModel.java
index 674864cce3a..aa2600760cc 100644
--- a/libjava/classpath/javax/swing/DefaultListModel.java
+++ b/libjava/classpath/javax/swing/DefaultListModel.java
@@ -166,7 +166,7 @@ public class DefaultListModel extends AbstractListModel
   /**
    * Sets the list element at a particular index.
    *
-   * @param index The list index at which to set a value 
+   * @param index The list index at which to set a value
    * @param element The value to set at the specified index
    *
    * @return The value previously held at the specified index
@@ -253,7 +253,7 @@ public class DefaultListModel extends AbstractListModel
    * least as large as the list.
    *
    * @param array The array to copy the list into
-   * 
+   *
    * @throws IndexOutOfBoundsException if the array is too small to hold the
    *     elements of the list
    */
@@ -317,7 +317,7 @@ public class DefaultListModel extends AbstractListModel
   /**
    * Sets the capacity of the list to be equal to its size. The list's capacity
    * is the number of elements it can hold before it needs to be reallocated.
-   * The list's size is the number of elements it currently holds. 
+   * The list's size is the number of elements it currently holds.
    */
   public void trimToSize()
   {
@@ -360,7 +360,7 @@ public class DefaultListModel extends AbstractListModel
 
   /**
    * Gets the capacity of the list. The list's capacity is the number of
-   * elements it can hold before it needs to be reallocated. 
+   * elements it can hold before it needs to be reallocated.
    *
    * @return The capacity of the list
    */
@@ -393,7 +393,7 @@ public class DefaultListModel extends AbstractListModel
    * Sets the list element at a particular index.
    *
    * @param element The value to set at the specified index
-   * @param index The list index at which to set a value 
+   * @param index The list index at which to set a value
    *
    * @throws ArrayIndexOutOfBoundsException If the provided index is
    *     outside the bounds of the list [0, size())
diff --git a/libjava/classpath/javax/swing/DefaultListSelectionModel.java b/libjava/classpath/javax/swing/DefaultListSelectionModel.java
index d1e2da85fe8..273ca0d158a 100644
--- a/libjava/classpath/javax/swing/DefaultListSelectionModel.java
+++ b/libjava/classpath/javax/swing/DefaultListSelectionModel.java
@@ -69,7 +69,7 @@ public class DefaultListSelectionModel implements Cloneable,
   protected EventListenerList listenerList = new EventListenerList();
 
 
-  /** 
+  /**
    * The current list selection mode. Must be one of the numeric constants
    * SINGLE_SELECTION, SINGLE_INTERVAL_SELECTION
    * or MULTIPLE_INTERVAL_SELECTION from {@link
@@ -129,7 +129,7 @@ public class DefaultListSelectionModel implements Cloneable,
   boolean valueIsAdjusting = false;
 
 
-  /** 
+  /**
    * The current set of "intervals", represented simply by a {@link
    * java.util.BitSet}. A set bit indicates a selected index, whereas a
    * cleared bit indicates a non-selected index.
@@ -150,13 +150,13 @@ public class DefaultListSelectionModel implements Cloneable,
   boolean setLeadCalledFromAdd = false;
 
   /**
-   * Returns the selection mode, which is one of {@link #SINGLE_SELECTION}, 
-   * {@link #SINGLE_INTERVAL_SELECTION} and 
+   * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
+   * {@link #SINGLE_INTERVAL_SELECTION} and
    * {@link #MULTIPLE_INTERVAL_SELECTION}.  The default value is
    * {@link #MULTIPLE_INTERVAL_SELECTION}.
-   * 
+   *
    * @return The selection mode.
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   public int getSelectionMode()
@@ -171,7 +171,7 @@ public class DefaultListSelectionModel implements Cloneable,
    */
   public void setSelectionMode(int mode)
   {
-    if (mode < ListSelectionModel.SINGLE_SELECTION 
+    if (mode < ListSelectionModel.SINGLE_SELECTION
         || mode > ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
       throw new IllegalArgumentException("Unrecognised mode: " + mode);
     selectionMode = mode;
@@ -179,7 +179,7 @@ public class DefaultListSelectionModel implements Cloneable,
 
   /**
    * Gets the value of the {@link #anchorSelectionIndex} property.
-   * 
+   *
    * @return The current property value
    *
    * @see #setAnchorSelectionIndex
@@ -191,7 +191,7 @@ public class DefaultListSelectionModel implements Cloneable,
 
   /**
    * Sets the value of the {@link #anchorSelectionIndex} property.
-   * 
+   *
    * @param index The new property value
    *
    * @see #getAnchorSelectionIndex
@@ -206,10 +206,10 @@ public class DefaultListSelectionModel implements Cloneable,
           fireValueChanged(index, old);
       }
   }
-  
+
   /**
    * Gets the value of the {@link #leadSelectionIndex} property.
-   * 
+   *
    * @return The current property value
    *
    * @see #setLeadSelectionIndex
@@ -245,7 +245,7 @@ public class DefaultListSelectionModel implements Cloneable,
    * {@link ListSelectionEvent} includes only the minimum range of values
    * which changed selection status between the beginning and end of the
    * method.
                            
-   * 
+   *
    * @param leadIndex The new property value
    *
    * @see #getAnchorSelectionIndex
@@ -267,7 +267,7 @@ public class DefaultListSelectionModel implements Cloneable,
 
     if (selectionMode == SINGLE_SELECTION)
       setSelectionInterval (leadIndex, leadIndex);
-    
+
     int oldLeadIndex = leadSelectionIndex;
     if (oldLeadIndex == -1)
       oldLeadIndex = leadIndex;
@@ -276,8 +276,8 @@ public class DefaultListSelectionModel implements Cloneable,
     leadSelectionIndex = leadIndex;
 
     if (anchorSelectionIndex == -1)
-      return;    
-    
+      return;
+
     int R1 = Math.min(anchorSelectionIndex, oldLeadIndex);
     int R2 = Math.max(anchorSelectionIndex, oldLeadIndex);
     int S1 = Math.min(anchorSelectionIndex, leadIndex);
@@ -295,28 +295,28 @@ public class DefaultListSelectionModel implements Cloneable,
       {
         sel.set(R1, R2+1);
         sel.clear(S1, S2+1);
-      }    
+      }
 
     int beg = sel.nextSetBit(0), end = -1;
-    for(int i=beg; i >= 0; i=sel.nextSetBit(i+1)) 
+    for(int i=beg; i >= 0; i=sel.nextSetBit(i+1))
       end = i;
-    
+
     BitSet old = (BitSet) oldSel;
-    
+
     // The new and previous lead location requires repainting.
     old.set(oldLeadIndex, !sel.get(oldLeadIndex));
     old.set(leadSelectionIndex, !sel.get(leadSelectionIndex));
-    
+
     fireDifference(sel, old);
   }
 
   /**
-   * Moves the lead selection index to leadIndex without 
+   * Moves the lead selection index to leadIndex without
    * changing the selection values.
-   * 
+   *
    * If leadAnchorNotificationEnabled is true, send a notification covering the
    * old and new lead cells.
-   * 
+   *
    * @param leadIndex the new lead selection index
    * @since 1.5
    */
@@ -324,16 +324,16 @@ public class DefaultListSelectionModel implements Cloneable,
   {
     if (leadSelectionIndex == leadIndex)
       return;
-    
+
     leadSelectionIndex = leadIndex;
     if (isLeadAnchorNotificationEnabled())
       fireValueChanged(Math.min(leadSelectionIndex, leadIndex),
                        Math.max(leadSelectionIndex, leadIndex));
   }
-  
+
   /**
    * Gets the value of the {@link #leadAnchorNotificationEnabled} property.
-   * 
+   *
    * @return The current property value
    *
    * @see #setLeadAnchorNotificationEnabled
@@ -345,7 +345,7 @@ public class DefaultListSelectionModel implements Cloneable,
 
   /**
    * Sets the value of the {@link #leadAnchorNotificationEnabled} property.
-   * 
+   *
    * @param l The new property value
    *
    * @see #isLeadAnchorNotificationEnabled
@@ -404,7 +404,7 @@ public class DefaultListSelectionModel implements Cloneable,
   {
     if (isSelectionEmpty())
       return -1;
-    
+
     return sel.nextSetBit(0);
   }
 
@@ -424,8 +424,8 @@ public class DefaultListSelectionModel implements Cloneable,
       return -1;
 
     int mx = -1;
-    for(int i=sel.nextSetBit(0); i >= 0; i=sel.nextSetBit(i+1)) 
-      { 
+    for(int i=sel.nextSetBit(0); i >= 0; i=sel.nextSetBit(i+1))
+      {
         mx = i;
       }
     return mx;
@@ -451,12 +451,12 @@ public class DefaultListSelectionModel implements Cloneable,
   /**
    * If the {@link #selectionMode} property is equal to
    * SINGLE_SELECTION equivalent to calling
-   * setSelectionInterval(index1, index2); 
-   * If the {@link #selectionMode} property is equal to 
+   * setSelectionInterval(index1, index2);
+   * If the {@link #selectionMode} property is equal to
    * SINGLE_INTERVAL_SELECTION and the interval being
    * added is not adjacent to an already selected interval,
    * equivalent to setSelectionInterval(index1, index2).
-   * Otherwise adds the range [index0, index1] 
+   * Otherwise adds the range [index0, index1]
    * to the selection interval set.
    *
    * @param index0 The beginning of the range of indices to select
@@ -465,11 +465,11 @@ public class DefaultListSelectionModel implements Cloneable,
    * @see #setSelectionInterval
    * @see #removeSelectionInterval
    */
-  public void addSelectionInterval(int index0, int index1) 
+  public void addSelectionInterval(int index0, int index1)
   {
     if (index0 == -1 || index1 == -1)
       return;
-    
+
     if (selectionMode == SINGLE_SELECTION)
       setSelectionInterval(index0, index1);
     else
@@ -479,27 +479,27 @@ public class DefaultListSelectionModel implements Cloneable,
     oldSel = sel.clone();
 
 
-    // COMPAT: Like Sun (but not like IBM), we allow calls to 
+    // COMPAT: Like Sun (but not like IBM), we allow calls to
     // addSelectionInterval when selectionMode is
     // SINGLE_SELECTION_INTERVAL iff the interval being added
     // is adjacent to an already selected interval
     if (selectionMode == SINGLE_INTERVAL_SELECTION)
-      if (!(isSelectedIndex(index0) || 
-            isSelectedIndex(index1) || 
-            isSelectedIndex(Math.max(lo-1,0)) || 
+      if (!(isSelectedIndex(index0) ||
+            isSelectedIndex(index1) ||
+            isSelectedIndex(Math.max(lo-1,0)) ||
             isSelectedIndex(Math.min(hi+1,sel.size()))))
-        sel.clear();    
+        sel.clear();
 
     // We have to update the anchorSelectionIndex and leadSelectionIndex
     // variables
-    
+
     // The next if statements breaks down to "if this selection is adjacent
     // to the previous selection and going in the same direction"
-    if ((isSelectedIndex(leadSelectionIndex)) 
-        && ((index0 - 1 == leadSelectionIndex 
-             && (index1 >= index0) 
+    if ((isSelectedIndex(leadSelectionIndex))
+        && ((index0 - 1 == leadSelectionIndex
+             && (index1 >= index0)
              && (leadSelectionIndex >= anchorSelectionIndex))
-            || (index0 + 1 == leadSelectionIndex && (index1 <= index0) 
+            || (index0 + 1 == leadSelectionIndex && (index1 <= index0)
                 && (leadSelectionIndex <= anchorSelectionIndex)))
         && (anchorSelectionIndex != -1 || leadSelectionIndex != -1))
       {
@@ -535,24 +535,24 @@ public class DefaultListSelectionModel implements Cloneable,
   {
     if (index0 == -1 || index1 == -1)
       return;
-    
+
     oldSel = sel.clone();
     int lo = Math.min(index0, index1);
     int hi = Math.max(index0, index1);
-    
+
     // if selectionMode is SINGLE_INTERVAL_SELECTION and removing the interval
     //   (index0,index1) would leave two disjoint selection intervals, remove all
     //   selected indices from lo to the last selected index
-    if (getMinSelectionIndex() > 0 && getMinSelectionIndex() < lo && 
+    if (getMinSelectionIndex() > 0 && getMinSelectionIndex() < lo &&
         selectionMode == SINGLE_INTERVAL_SELECTION)
       hi = sel.size() - 1;
 
-    sel.clear(lo, hi+1); 
+    sel.clear(lo, hi+1);
     //update anchorSelectionIndex and leadSelectionIndex variables
     //TODO: will probably need MouseDragged to test properly and know if this works
     setAnchorSelectionIndex(index0);
     leadSelectionIndex = index1;
-    
+
     fireDifference(sel, (BitSet) oldSel);
   }
 
@@ -566,19 +566,19 @@ public class DefaultListSelectionModel implements Cloneable,
     if (from < 0)
       return; // Empty selection - nothing to do.
     int to = from;
-    
+
     int i;
 
     for (i = from; i>=0; i=sel.nextSetBit(i+1))
       to = i;
-    
+
     sel.clear();
     fireValueChanged(from, to, valueIsAdjusting);
   }
-  
+
   /**
    * Fire the change event, covering the difference between the two sets.
-   * 
+   *
    * @param current the current set
    * @param x the previous set, the object will be reused.
    */
@@ -596,12 +596,12 @@ public class DefaultListSelectionModel implements Cloneable,
 
     fireValueChanged(from, to, valueIsAdjusting);
   }
-  
+
   /**
    * Clears the current selection and marks a given interval as "selected". If
    * the current selection mode is SINGLE_SELECTION only the
    * index index2 is selected.
-   * 
+   *
    * @param anchor  the anchor selection index.
    * @param lead  the lead selection index.
    */
@@ -639,7 +639,7 @@ public class DefaultListSelectionModel implements Cloneable,
         int last = first;
         if (first >= 0)
           last += (sel.cardinality() - 1);
-        
+
         // update the selection
         int lo = Math.min(anchor, lead);
         int hi = Math.max(anchor, lead);
@@ -647,7 +647,7 @@ public class DefaultListSelectionModel implements Cloneable,
           return;  // selected interval is not being changed
         sel.clear();
         sel.set(lo, hi + 1);
-        
+
         // include the old selection in the event range
         if (first >= 0)
           lo = Math.min(lo, first);
@@ -661,7 +661,7 @@ public class DefaultListSelectionModel implements Cloneable,
         anchorSelectionIndex = anchor;
         leadSelectionIndex = lead;
         fireValueChanged(lo, hi);
-      }    
+      }
     else
     {
       BitSet oldSel = (BitSet) sel.clone();
@@ -675,7 +675,7 @@ public class DefaultListSelectionModel implements Cloneable,
       // update the anchorSelectionIndex and leadSelectionIndex variables
       setAnchorSelectionIndex(anchor);
       leadSelectionIndex = lead;
-    
+
       fireDifference(sel, oldSel);
     }
   }
@@ -697,7 +697,7 @@ public class DefaultListSelectionModel implements Cloneable,
                                   boolean before)
   {
     if (!before)
-      {        
+      {
         index++;
         length--;
       }
@@ -759,7 +759,7 @@ public class DefaultListSelectionModel implements Cloneable,
   {
     fireValueChanged(firstIndex, lastIndex, getValueIsAdjusting());
   }
-  
+
   /**
    * Fires a {@link ListSelectionEvent} to all the listeners of type {@link
    * ListSelectionListener} registered with this selection model.
@@ -770,7 +770,7 @@ public class DefaultListSelectionModel implements Cloneable,
    *     made to the selection, such as during interactive scrolling
    */
   protected void fireValueChanged(int firstIndex, int lastIndex,
-				  boolean isAdjusting)
+                                  boolean isAdjusting)
   {
     ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex,
                                                     lastIndex, isAdjusting);
diff --git a/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java b/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
index 3f79f0deed5..93d129ebb2d 100644
--- a/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
+++ b/libjava/classpath/javax/swing/DefaultSingleSelectionModel.java
@@ -82,9 +82,9 @@ public class DefaultSingleSelectionModel
 
   /**
    * Returns the selected index or -1 if there is no selection.
-   * 
+   *
    * @return The selected index.
-   * 
+   *
    * @see #setSelectedIndex(int)
    */
   public int getSelectedIndex()
@@ -93,11 +93,11 @@ public class DefaultSingleSelectionModel
   }
 
   /**
-   * Sets the selected index and, if this is different to the previous 
+   * Sets the selected index and, if this is different to the previous
    * selection, sends a {@link ChangeEvent} to all registered listeners.
-   * 
+   *
    * @param index  the index (use -1 to represent no selection).
-   * 
+   *
    * @see #getSelectedIndex()
    * @see #clearSelection
    */
@@ -113,7 +113,7 @@ public class DefaultSingleSelectionModel
   /**
    * Clears the selection by setting the selected index to -1 and
    * sends a {@link ChangeEvent} to all registered listeners.  If the selected
-   * index is already -1, this method does nothing.  
+   * index is already -1, this method does nothing.
    */
   public void clearSelection()
   {
@@ -122,8 +122,8 @@ public class DefaultSingleSelectionModel
 
   /**
    * Returns true if there is a selection, and false
-   * otherwise.  
-   * 
+   * otherwise.
+   *
    * @return A boolean.
    */
   public boolean isSelected()
diff --git a/libjava/classpath/javax/swing/FocusManager.java b/libjava/classpath/javax/swing/FocusManager.java
index 21e4482d186..b8459d4d58e 100644
--- a/libjava/classpath/javax/swing/FocusManager.java
+++ b/libjava/classpath/javax/swing/FocusManager.java
@@ -199,7 +199,7 @@ public abstract class FocusManager
     {
       wrapped.addKeyEventPostProcessor(p);
     }
- 
+
     /**
      * Wraps {@link KeyboardFocusManager#addPropertyChangeListener(PropertyChangeListener)}.
      *
@@ -366,7 +366,7 @@ public abstract class FocusManager
       return wrapped.getVetoableChangeListeners(n);
     }
 
-    
+
     /**
      * Wraps
      * {@link KeyboardFocusManager#removeKeyEventDispatcher(KeyEventDispatcher)}.
@@ -490,7 +490,7 @@ public abstract class FocusManager
   public static FocusManager getCurrentManager()
   {
     KeyboardFocusManager m =
-      KeyboardFocusManager.getCurrentKeyboardFocusManager(); 
+      KeyboardFocusManager.getCurrentKeyboardFocusManager();
     return new WrappingFocusManager(m);
   }
 
diff --git a/libjava/classpath/javax/swing/GrayFilter.java b/libjava/classpath/javax/swing/GrayFilter.java
index ef0d14718d6..a7f969386dc 100644
--- a/libjava/classpath/javax/swing/GrayFilter.java
+++ b/libjava/classpath/javax/swing/GrayFilter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -57,7 +57,7 @@ public class GrayFilter extends RGBImageFilter
   /**
    * Create a GrayFilter. If b is true then brighten. Also, indicate how much
    * gray.
-   *    
+   *
    * @param b if brighten
    * @param p percent of gray, 0 - 100
    */
@@ -79,7 +79,7 @@ public class GrayFilter extends RGBImageFilter
     return (Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(
         src.getSource(), new GrayFilter(true, 0))));
   }
-  
+
   /**
    * Filter RGB to gray
    */
diff --git a/libjava/classpath/javax/swing/Icon.java b/libjava/classpath/javax/swing/Icon.java
index c73ad2d4049..ed7f94fda25 100644
--- a/libjava/classpath/javax/swing/Icon.java
+++ b/libjava/classpath/javax/swing/Icon.java
@@ -1,4 +1,4 @@
-/* Icon.java -- 
+/* Icon.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,21 +48,21 @@ public interface Icon
 {
   /**
    * Returns the height of the icon.
-   * 
+   *
    * @return The height of the icon.
    */
   int getIconHeight();
-  
+
   /**
    * Returns the width of the icon.
-   * 
+   *
    * @return The width of the icon.
    */
   int getIconWidth();
-  
+
   /**
    * Draws the icon at the location (x, y) on the specified graphics device.
-   * 
+   *
    * @param c  a component related to the icon in some way (can be ignored by
                some implementing classes).
    * @param g  the graphics device.
diff --git a/libjava/classpath/javax/swing/ImageIcon.java b/libjava/classpath/javax/swing/ImageIcon.java
index cedf4be35a6..c78d04c5870 100644
--- a/libjava/classpath/javax/swing/ImageIcon.java
+++ b/libjava/classpath/javax/swing/ImageIcon.java
@@ -90,7 +90,7 @@ public class ImageIcon
 
     /**
      * Returns the accessible state for the ImageIcon.  To
-     * match the reference implementation, this method always returns 
+     * match the reference implementation, this method always returns
      * null.
      *
      * @return null.
@@ -138,7 +138,7 @@ public class ImageIcon
 
     /**
      * Returns the accessible child at index i, which is
-     * null in this case because an {@link ImageIcon} has no 
+     * null in this case because an {@link ImageIcon} has no
      * children.
      *
      * @param i the index of the child to be fetched
@@ -151,12 +151,12 @@ public class ImageIcon
     }
 
     /**
-     * Returns the locale of this object.  To match the reference 
+     * Returns the locale of this object.  To match the reference
      * implementation, this method always returns null.
      *
      * @return null.
      */
-    public Locale getLocale() 
+    public Locale getLocale()
       throws IllegalComponentStateException
     {
       // refer to Sun's bug report 4269253
@@ -168,7 +168,7 @@ public class ImageIcon
      * description property of the underlying {@link ImageIcon}.
      *
      * @return The description (possibly null).
-     * 
+     *
      * @see #setAccessibleIconDescription(String)
      */
     public String getAccessibleIconDescription()
@@ -177,11 +177,11 @@ public class ImageIcon
     }
 
     /**
-     * Sets the accessible icon description.  This sets the 
+     * Sets the accessible icon description.  This sets the
      * description property of the underlying {@link ImageIcon}.
      *
      * @param newDescr the description (null permitted).
-     * 
+     *
      * @see #getAccessibleIconDescription()
      */
     public void setAccessibleIconDescription(String newDescr)
@@ -190,7 +190,7 @@ public class ImageIcon
     }
 
     /**
-     * Returns the icon height. This returns the iconHeight 
+     * Returns the icon height. This returns the iconHeight
      * property of the underlying {@link ImageIcon}.
      *
      * @return The icon height.
@@ -199,9 +199,9 @@ public class ImageIcon
     {
       return getIconHeight();
     }
-    
+
     /**
-     * Returns the icon width. This returns the iconWidth property 
+     * Returns the icon width. This returns the iconWidth property
      * of the underlying {@link ImageIcon}.
      *
      * @return The icon width.
@@ -217,7 +217,7 @@ public class ImageIcon
   /** A dummy Component that is used in the MediaTracker. */
   protected static final Component component = new Component()
   {
-    // No need to implement this. 
+    // No need to implement this.
   };
 
   /** The MediaTracker used to monitor the loading of images. */
@@ -243,7 +243,7 @@ public class ImageIcon
   {
     // Nothing to do here.
   }
- 
+
   /**
    * Constructs an ImageIcon given a filename.  The icon's description
    * is initially set to the filename itself.  A filename of "" means
@@ -277,7 +277,7 @@ public class ImageIcon
   {
     this(imageData, null);
   }
-  
+
   /**
    * Creates an ImageIcon from the given byte array and sets the given
    * description.
@@ -332,7 +332,7 @@ public class ImageIcon
   {
     return observer;
   }
-  
+
   /**
    * Sets the ImageObserver that will be used for all Image
    * operations. Can be set to null (the default) when no observer is
@@ -459,7 +459,7 @@ public class ImageIcon
    * Returns the object that provides accessibility features for this
    * ImageIcon instance.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleImageIcon}).
    */
   public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/InputMap.java b/libjava/classpath/javax/swing/InputMap.java
index 19a75f4e985..40c43daa499 100644
--- a/libjava/classpath/javax/swing/InputMap.java
+++ b/libjava/classpath/javax/swing/InputMap.java
@@ -87,7 +87,7 @@ public class InputMap
    *
    * @param keystroke the key of the entry (null is ignored).
    *
-   * @return The binding associated with the specified keystroke (or 
+   * @return The binding associated with the specified keystroke (or
    *     null).
    */
   public Object get(KeyStroke keystroke)
@@ -102,11 +102,11 @@ public class InputMap
   }
 
   /**
-   * Puts a new entry into the InputMap.  If 
-   * actionMapKey is null any existing entry will be 
+   * Puts a new entry into the InputMap.  If
+   * actionMapKey is null any existing entry will be
    * removed.
    *
-   * @param keystroke the keystroke for the entry (null is 
+   * @param keystroke the keystroke for the entry (null is
    *     ignored).
    * @param actionMapKey the action (null permitted).
    */
@@ -126,7 +126,7 @@ public class InputMap
    * Removes an entry from this InputMap.  Note that this will
    * not remove any entry from the parent map, if there is one.
    *
-   * @param keystroke the key of the entry to remove (null is 
+   * @param keystroke the key of the entry to remove (null is
    *     ignored).
    */
   public void remove(KeyStroke keystroke)
@@ -140,7 +140,7 @@ public class InputMap
    * is null.
    *
    * @return The parent map (possibly null).
-   * 
+   *
    * @see #setParent(InputMap)
    */
   public InputMap getParent()
@@ -154,7 +154,7 @@ public class InputMap
    * find an entry in this map.
    *
    * @param parentMap the new parent (null permitted).
-   * 
+   *
    * @see #getParent()
    */
   public void setParent(InputMap parentMap)
@@ -163,7 +163,7 @@ public class InputMap
   }
 
   /**
-   * Returns the number of entries in this InputMap.  This count 
+   * Returns the number of entries in this InputMap.  This count
    * does not include any entries from the parent map, if there is one.
    *
    * @return The number of entries.
@@ -188,12 +188,12 @@ public class InputMap
 
   /**
    * Returns all keys of entries in this InputMap.  This does not
-   * include keys defined in the parent, if there is one (use the 
+   * include keys defined in the parent, if there is one (use the
    * {@link #allKeys()} method for that case).
    * 

                            
    * Following the behaviour of the reference implementation, this method will
-   * return null when no entries have been added to the map, 
-   * and a zero length array if entries have been added but subsequently 
+   * return null when no entries have been added to the map,
+   * and a zero length array if entries have been added but subsequently
    * removed (or cleared) from the map.
    *
    * @return An array of keys (may be null or have zero length).
@@ -209,7 +209,7 @@ public class InputMap
   }
 
   /**
-   * Returns all keys of entries in this InputMap and all its 
+   * Returns all keys of entries in this InputMap and all its
    * parents.
    *
    * @return An array of keys (may be null or have zero length).
@@ -227,7 +227,7 @@ public class InputMap
     if (inputMap != null)
       set.addAll(inputMap.keySet());
     if (set.size() == 0)
-      return null;    
+      return null;
     KeyStroke[] array = new KeyStroke[set.size()];
     return (KeyStroke[]) set.toArray(array);
   }
diff --git a/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java b/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
index 4780a67c521..9187f292458 100644
--- a/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/InternalFrameFocusTraversalPolicy.java
@@ -47,7 +47,7 @@ import java.awt.FocusTraversalPolicy;
  * when it is selected.
  *
  * @author Michael Koch
- * 
+ *
  * @since 1.4
  */
 public abstract class InternalFrameFocusTraversalPolicy
diff --git a/libjava/classpath/javax/swing/JApplet.java b/libjava/classpath/javax/swing/JApplet.java
index 68eb983dd01..d725131e628 100644
--- a/libjava/classpath/javax/swing/JApplet.java
+++ b/libjava/classpath/javax/swing/JApplet.java
@@ -79,7 +79,7 @@ public class JApplet extends Applet
   protected AccessibleContext accessibleContext;
 
   private static final long serialVersionUID = 7269359214497372587L;
-  
+
   protected JRootPane rootPane;
 
   /**
@@ -196,7 +196,7 @@ public class JApplet extends Applet
   {
     super.processKeyEvent(e);
   }
-  
+
   public void remove(Component comp)
   {
     // If we're removing the root pane, use super.remove. Otherwise
diff --git a/libjava/classpath/javax/swing/JButton.java b/libjava/classpath/javax/swing/JButton.java
index 705a8638105..40c104194b2 100644
--- a/libjava/classpath/javax/swing/JButton.java
+++ b/libjava/classpath/javax/swing/JButton.java
@@ -91,9 +91,9 @@ public class JButton extends AbstractButton
 
   /**
    * Creates a new button from the specified action.
-   * 
+   *
    * @param a  the action (null permitted).
-   * 
+   *
    * @see AbstractButton#setAction(Action)
    */
   public JButton(Action a)
@@ -105,7 +105,7 @@ public class JButton extends AbstractButton
   /**
    * Creates a new button with the specified icon (and an empty string for
    * the button text).
-   * 
+   *
    * @param icon  the icon (null permitted).
    */
   public JButton(Icon icon)
@@ -115,7 +115,7 @@ public class JButton extends AbstractButton
 
   /**
    * Creates a new button with the specified text and no icon.
-   * 
+   *
    * @param text  the button text (null permitted, will be
    *     substituted by an empty string).
    */
@@ -126,7 +126,7 @@ public class JButton extends AbstractButton
 
   /**
    * Creates a new button with the specified text and icon.
-   * 
+   *
    * @param text  the button text (null permitted, will be
    *     substituted by an empty string).
    * @param icon  the icon (null permitted).
@@ -140,7 +140,7 @@ public class JButton extends AbstractButton
   }
 
   protected void configurePropertiesFromAction(Action a)
-  { 
+  {
     super.configurePropertiesFromAction(a);
   }
 
@@ -158,8 +158,8 @@ public class JButton extends AbstractButton
   }
 
   /**
-   * Returns the suffix ("ButtonUI" in this case) used to 
-   * determine the class name for a UI delegate that can provide the look and 
+   * Returns the suffix ("ButtonUI" in this case) used to
+   * determine the class name for a UI delegate that can provide the look and
    * feel for a JButton.
    *
    * @return "ButtonUI".
@@ -167,7 +167,7 @@ public class JButton extends AbstractButton
   public String getUIClassID()
   {
     // Returns a string that specifies the name of the L&F class that renders
-    // this component.  
+    // this component.
     return "ButtonUI";
   }
 
@@ -211,7 +211,7 @@ public class JButton extends AbstractButton
   public boolean isDefaultCapable()
   {
     // Returns whether or not this button is capable of being the default
-    // button on the RootPane. 
+    // button on the RootPane.
     return defaultCapable;
   }
 
diff --git a/libjava/classpath/javax/swing/JCheckBox.java b/libjava/classpath/javax/swing/JCheckBox.java
index 26f9f6ca595..0bf871a5023 100644
--- a/libjava/classpath/javax/swing/JCheckBox.java
+++ b/libjava/classpath/javax/swing/JCheckBox.java
@@ -1,4 +1,4 @@
-/* JCheckBox.java -- 
+/* JCheckBox.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -74,7 +74,7 @@ public class JCheckBox extends JToggleButton implements Accessible
 
     /**
      * Returns the accessble role of JCheckBox,
-     * {@link AccessibleRole#CHECK_BOX}. 
+     * {@link AccessibleRole#CHECK_BOX}.
      */
     public AccessibleRole getAccessibleRole()
     {
@@ -86,7 +86,7 @@ public class JCheckBox extends JToggleButton implements Accessible
 
   public static final String BORDER_PAINTED_FLAT_CHANGED_PROPERTY =
     "borderPaintedFlat";
-  
+
   private boolean borderPaintedFlat;
 
   private void init()
@@ -94,7 +94,7 @@ public class JCheckBox extends JToggleButton implements Accessible
     borderPainted = false;
     contentAreaFilled = false;
   }
-  
+
   public JCheckBox()
   {
     this(null, null, false);
@@ -106,25 +106,25 @@ public class JCheckBox extends JToggleButton implements Accessible
   }
 
   public JCheckBox(Icon icon)
-  { 
+  {
     this(null, icon, false);
-  }    
-  
+  }
+
   public JCheckBox(Icon icon, boolean selected)
-  { 
+  {
     this(null, icon, selected);
-  }    
-  
+  }
+
   public JCheckBox(String text)
   {
     this(text, null, false);
   }
-      
+
   public JCheckBox(String text, boolean selected)
   {
     this(text, null, selected);
   }
-      
+
   public JCheckBox(String text, Icon icon)
   {
     this(text, icon, false);
@@ -145,7 +145,7 @@ public class JCheckBox extends JToggleButton implements Accessible
   {
     return "CheckBoxUI";
   }
-  
+
   protected  String paramString()
   {
     return super.paramString() + ",borderPaintedFlat=" + borderPaintedFlat;
diff --git a/libjava/classpath/javax/swing/JCheckBoxMenuItem.java b/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
index 51634c93f0b..b3045be2799 100644
--- a/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
+++ b/libjava/classpath/javax/swing/JCheckBoxMenuItem.java
@@ -49,7 +49,7 @@ import javax.accessibility.AccessibleRole;
  * {@link AbstractButton#setSelected} and {@link #setState} can be use used for
  * the same purpose. JCheckBoxMenuItem uses
  * ToggleButtonModel to keep track of its selection.
- * 
+ *
  * @author original author unknown
  */
 public class JCheckBoxMenuItem
@@ -80,7 +80,7 @@ public class JCheckBoxMenuItem
 
   /**
    * Creates a new JCheckBoxMenuItem with given icon
-   * 
+   *
    * @param icon Icon for this menu item
    */
   public JCheckBoxMenuItem(Icon icon)
@@ -90,7 +90,7 @@ public class JCheckBoxMenuItem
 
   /**
    * Creates a new JCheckBoxMenuItem with given label
-   * 
+   *
    * @param text Label for this menu item
    */
   public JCheckBoxMenuItem(String text)
@@ -100,7 +100,7 @@ public class JCheckBoxMenuItem
 
   /**
    * Creates a new JCheckBoxMenuItem using given action
-   * 
+   *
    * @param action Action for this menu item.
    */
   public JCheckBoxMenuItem(Action action)
@@ -111,7 +111,7 @@ public class JCheckBoxMenuItem
 
   /**
    * Creates a new JCheckBoxMenuItem object with given label and icon
-   * 
+   *
    * @param text Label for this menu item
    * @param icon Icon for this menu item
    */
@@ -123,7 +123,7 @@ public class JCheckBoxMenuItem
   /**
    * Creates a new JCheckBoxMenuItem object using specified label and marked as
    * checked if given 'state' is true.
-   * 
+   *
    * @param text Label for this menu item
    * @param state true if this item should be in checked state
    *          and false otherwise
@@ -136,7 +136,7 @@ public class JCheckBoxMenuItem
   /**
    * Creates a new JCheckBoxMenuItem object with given label, icon, and marked
    * as checked if given 'state' is true.
-   * 
+   *
    * @param text Label for this menu item
    * @param icon icon for this menu item
    * @param state true if this item should be in checked state
@@ -155,7 +155,7 @@ public class JCheckBoxMenuItem
   /**
    * This method returns a name to identify which look and feel class will be
    * the UI delegate for the menuItem.
-   * 
+   *
    * @return The Look and Feel classID. "JCheckBoxMenuItemUI"
    */
   public String getUIClassID()
@@ -165,7 +165,7 @@ public class JCheckBoxMenuItem
 
   /**
    * Returns checked state for this check box menu item.
-   * 
+   *
    * @return Returns true if this menu item is in checked state and false
    *         otherwise.
    */
@@ -177,7 +177,7 @@ public class JCheckBoxMenuItem
   /**
    * Sets state for this check box menu item. If given 'state' is true, then
    * mark menu item as checked, and uncheck this menu item otherwise.
-   * 
+   *
    * @param state new state for this menu item
    */
   public synchronized void setState(boolean state)
@@ -188,7 +188,7 @@ public class JCheckBoxMenuItem
   /**
    * This method returns array containing label of this menu item if it is
    * selected and null otherwise.
-   * 
+   *
    * @return Array containing label of this menu item if this menu item is
    *         selected or null otherwise.
    */
@@ -216,7 +216,7 @@ public class JCheckBoxMenuItem
    * JCheckBoxMenuItem component, for use in debugging. The
    * return value is guaranteed to be non-null, but the format
    * of the string may vary between implementations.
-   * 
+   *
    * @return A string describing the attributes of the
    *         JCheckBoxMenuItem.
    */
@@ -230,7 +230,7 @@ public class JCheckBoxMenuItem
   /**
    * Returns the object that provides accessibility features for this
    * JCheckBoxMenuItem component.
-   * 
+   *
    * @return The accessible context (an instance of
    *         {@link AccessibleJCheckBoxMenuItem}).
    */
@@ -245,7 +245,7 @@ public class JCheckBoxMenuItem
   /**
    * Provides the accessibility features for the JCheckBoxMenuItem
    * component.
-   * 
+   *
    * @see JCheckBoxMenuItem#getAccessibleContext()
    */
   protected class AccessibleJCheckBoxMenuItem
@@ -264,7 +264,7 @@ public class JCheckBoxMenuItem
     /**
      * Returns the accessible role for the JCheckBoxMenuItem
      * component.
-     * 
+     *
      * @return {@link AccessibleRole#CHECK_BOX}.
      */
     public AccessibleRole getAccessibleRole()
diff --git a/libjava/classpath/javax/swing/JComboBox.java b/libjava/classpath/javax/swing/JComboBox.java
index 74ff315eab7..0d2be0c17cb 100644
--- a/libjava/classpath/javax/swing/JComboBox.java
+++ b/libjava/classpath/javax/swing/JComboBox.java
@@ -188,8 +188,8 @@ public class JComboBox extends JComponent implements ItemSelectable,
   public JComboBox(Object[] itemArray)
   {
     this(new DefaultComboBoxModel(itemArray));
-    
-    if (itemArray.length > 0) 
+
+    if (itemArray.length > 0)
       setSelectedIndex(0);
   }
 
@@ -298,7 +298,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
         // Removes itself (as DataListener) from the to-be-replaced model.
         dataModel.removeListDataListener(this);
       }
-    
+
     /* Adds itself as a DataListener to the new model.
      * It is intentioned that this operation will fail with a NullPointerException if the
      * caller delivered a null argument.
@@ -309,7 +309,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
     ComboBoxModel oldDataModel = dataModel;
     dataModel = newDataModel;
     selectedItemReminder = newDataModel.getSelectedItem();
-    
+
     // Notifies the listeners of the model change.
     firePropertyChange("model", oldDataModel, dataModel);
   }
@@ -500,7 +500,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    */
   public void setSelectedIndex(int index)
   {
-  	if (index < -1 || index >= dataModel.getSize())
+        if (index < -1 || index >= dataModel.getSize())
       // Fails because index is out of bounds.
       throw new IllegalArgumentException("illegal index: " + index);
     else
@@ -518,7 +518,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    * DefaultComboBoxModel the complexity is O(n) where n is the
    * number of elements in the combo box.
    * 
                            
-   * 
+   *
    * @return int Index specifying location of the currently selected item in the
    *         combo box or -1 if nothing is selected in the combo box.
    */
@@ -552,12 +552,12 @@ public class JComboBox extends JComponent implements ItemSelectable,
   }
 
   /**
-   * Returns an object that is used as the display value when calculating the 
-   * preferred size for the combo box.  This value is, of course, never 
+   * Returns an object that is used as the display value when calculating the
+   * preferred size for the combo box.  This value is, of course, never
    * displayed anywhere.
-   * 
+   *
    * @return The prototype display value (possibly null).
-   * 
+   *
    * @since 1.4
    * @see #setPrototypeDisplayValue(Object)
    */
@@ -569,11 +569,11 @@ public class JComboBox extends JComponent implements ItemSelectable,
   /**
    * Sets the object that is assumed to be the displayed item when calculating
    * the preferred size for the combo box.  A {@link PropertyChangeEvent} (with
-   * the name prototypeDisplayValue) is sent to all registered 
-   * listeners. 
-   * 
+   * the name prototypeDisplayValue) is sent to all registered
+   * listeners.
+   *
    * @param value  the new value (null permitted).
-   * 
+   *
    * @since 1.4
    * @see #getPrototypeDisplayValue()
    */
@@ -593,7 +593,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    */
   public void addItem(Object element)
   {
-  	if (dataModel instanceof MutableComboBoxModel)
+        if (dataModel instanceof MutableComboBoxModel)
       ((MutableComboBoxModel) dataModel).addElement(element);
     else
       throw new RuntimeException("Unable to add the item because the data "
@@ -611,7 +611,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    */
   public void insertItemAt(Object element, int index)
   {
-	if (dataModel instanceof MutableComboBoxModel)
+        if (dataModel instanceof MutableComboBoxModel)
       ((MutableComboBoxModel) dataModel).insertElementAt(element, index);
     else
       throw new RuntimeException("Unable to insert the item because the data "
@@ -628,7 +628,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    */
   public void removeItem(Object element)
   {
-	if (dataModel instanceof MutableComboBoxModel)
+        if (dataModel instanceof MutableComboBoxModel)
       ((MutableComboBoxModel) dataModel).removeElement(element);
     else
       throw new RuntimeException("Unable to remove the item because the data "
@@ -753,7 +753,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
     action = a;
     configurePropertiesFromAction(action);
     if (action != null)
-      // FIXME: remove from old action and add to new action 
+      // FIXME: remove from old action and add to new action
       // PropertyChangeListener to listen to changes in the action
       addActionListener(action);
   }
@@ -856,7 +856,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
   }
 
   /**
-   * Fires a popupMenuWillBecomeInvisible() event to all 
+   * Fires a popupMenuWillBecomeInvisible() event to all
    * PopupMenuListeners.
    *
    * Note: This method is intended for use by plaf classes only.
@@ -870,7 +870,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
   }
 
   /**
-   * Fires a popupMenuWillBecomeVisible() event to all 
+   * Fires a popupMenuWillBecomeVisible() event to all
    * PopupMenuListeners.
    *
    * Note: This method is intended for use by plaf classes only.
@@ -892,19 +892,19 @@ public class JComboBox extends JComponent implements ItemSelectable,
   protected void selectedItemChanged()
   {
     // Fire ItemEvent to indicated that previously selected item is now
-    // deselected        
+    // deselected
     if (selectedItemReminder != null)
       fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
                                          selectedItemReminder,
                                          ItemEvent.DESELECTED));
 
-    // Fire ItemEvent to indicate that new item is selected    
+    // Fire ItemEvent to indicate that new item is selected
     Object newSelection = getSelectedItem();
     if (newSelection != null)
       fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED,
                                          newSelection, ItemEvent.SELECTED));
 
-    // Fire Action Event to JComboBox's registered listeners					 				 
+    // Fire Action Event to JComboBox's registered listeners
     fireActionEvent();
 
     selectedItemReminder = newSelection;
@@ -997,7 +997,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
   {
     // if first and last index of the given ListDataEvent are both -1,
     // then it indicates that selected item in the combo box data model
-    // have changed. 
+    // have changed.
     if (event.getIndex0() == -1 && event.getIndex1() == -1)
       selectedItemChanged();
   }
@@ -1110,7 +1110,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
     sb.append(",isEditable=").append(isEditable());
     sb.append(",lightWeightPopupEnabled=").append(isLightWeightPopupEnabled());
     sb.append(",maximumRowCount=").append(getMaximumRowCount());
-    
+
     sb.append(",selectedItemReminder=");
     if (selectedItemReminder != null)
       sb.append(selectedItemReminder);
@@ -1121,7 +1121,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
    * Returns the object that provides accessibility features for this
    * JComboBox component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *         {@link AccessibleJComboBox}).
    */
   public AccessibleContext getAccessibleContext()
@@ -1466,7 +1466,7 @@ public class JComboBox extends JComponent implements ItemSelectable,
       // Nothing to do here.
     }
   }
-  
+
   private class DefaultKeySelectionManager
       implements KeySelectionManager
   {
diff --git a/libjava/classpath/javax/swing/JComponent.java b/libjava/classpath/javax/swing/JComponent.java
index f71217867bc..365f62aa9f8 100644
--- a/libjava/classpath/javax/swing/JComponent.java
+++ b/libjava/classpath/javax/swing/JComponent.java
@@ -105,7 +105,7 @@ public abstract class JComponent extends Container implements Serializable
 {
   private static final long serialVersionUID = -7908749299918704233L;
 
-  /** 
+  /**
    * The accessible context of this JComponent.
    */
   protected AccessibleContext accessibleContext;
@@ -114,7 +114,7 @@ public abstract class JComponent extends Container implements Serializable
    * Basic accessibility support for JComponent derived
    * widgets.
    */
-  public abstract class AccessibleJComponent 
+  public abstract class AccessibleJComponent
     extends AccessibleAWTContainer
     implements AccessibleExtendedComponent
   {
@@ -123,7 +123,7 @@ public abstract class JComponent extends Container implements Serializable
      * fires appropriate PropertyChangeEvents to listeners registered with
      * the AccessibleJComponent.
      */
-    protected class AccessibleFocusHandler 
+    protected class AccessibleFocusHandler
       implements FocusListener
     {
       /**
@@ -168,7 +168,7 @@ public abstract class JComponent extends Container implements Serializable
      * from the JComponent and fires appropriate PropertyChangeEvents to
      * interested listeners on the AccessibleJComponent.
      */
-    protected class AccessibleContainerHandler 
+    protected class AccessibleContainerHandler
       implements ContainerListener
     {
       /**
@@ -464,7 +464,7 @@ public abstract class JComponent extends Container implements Serializable
       else if (border instanceof TitledBorder)
         {
           TitledBorder titled = (TitledBorder) border;
-          title = titled.getTitle(); 
+          title = titled.getTitle();
         }
       return title;
     }
@@ -489,7 +489,7 @@ public abstract class JComponent extends Container implements Serializable
      */
     public String getTitledBorderText()
     {
-      return getBorderTitle(getBorder()); 
+      return getBorderTitle(getBorder());
     }
 
     /**
@@ -536,29 +536,29 @@ public abstract class JComponent extends Container implements Serializable
    */
   float alignmentY = -1.0F;
 
-  /** 
+  /**
    * The border painted around this component.
-   * 
+   *
    * @see #paintBorder
    */
   Border border;
 
   /**
    * The popup menu for the component.
-   * 
+   *
    * @see #getComponentPopupMenu()
    * @see #setComponentPopupMenu(JPopupMenu)
    */
   JPopupMenu componentPopupMenu;
-   
+
   /**
    * A flag that controls whether the {@link #getComponentPopupMenu()} method
    * looks to the component's parent when the componentPopupMenu
    * field is null.
    */
   boolean inheritsPopupMenu;
-  
-  /** 
+
+  /**
    * 
                            Whether to double buffer this component when painting. This flag
    * should generally be true, to ensure good painting
    * performance.
                            
@@ -587,7 +587,7 @@ public abstract class JComponent extends Container implements Serializable
    */
   int debugGraphicsOptions;
 
-  /** 
+  /**
    * 
                            This property controls two independent behaviors simultaneously.
                            
    *
    * 
                            First, it controls whether to fill the background of this widget
@@ -616,9 +616,9 @@ public abstract class JComponent extends Container implements Serializable
    */
   boolean opaque = false;
 
-  /** 
+  /**
    * The user interface delegate for this component. Event delivery and
-   * repainting of the component are usually delegated to this object. 
+   * repainting of the component are usually delegated to this object.
    *
    * @see #setUI
    * @see #getUIClassID
@@ -630,7 +630,7 @@ public abstract class JComponent extends Container implements Serializable
    * A hint to the focus system that this component should or should not
    * get focus. If this is false, swing will not try to
    * request focus on this component; if true, swing might
-   * try to request focus, but the request might fail. Thus it is only 
+   * try to request focus, but the request might fail. Thus it is only
    * a hint guiding swing's behavior.
    *
    * @see #requestFocus()
@@ -653,7 +653,7 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Indicates whether the current paint call is already double buffered or
-   * not. 
+   * not.
    */
   static boolean paintingDoubleBuffered = false;
 
@@ -675,14 +675,14 @@ public abstract class JComponent extends Container implements Serializable
    */
   private VetoableChangeSupport vetoableChangeSupport;
 
-  /** 
+  /**
    * Storage for "client properties", which are key/value pairs associated
    * with this component by a "client", such as a user application or a
    * layout manager. This is lazily constructed when the component gets its
    * first client property.
    */
   private Hashtable clientProperties;
-  
+
   private InputMap inputMap_whenFocused;
   private InputMap inputMap_whenAncestorOfFocused;
   private ComponentInputMap inputMap_whenInFocusedWindow;
@@ -717,12 +717,12 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * The default locale of the component.
-   * 
+   *
    * @see #getDefaultLocale
    * @see #setDefaultLocale
    */
   private static Locale defaultLocale;
-  
+
   public static final String TOOL_TIP_TEXT_KEY = "ToolTipText";
 
   /**
@@ -734,7 +734,7 @@ public abstract class JComponent extends Container implements Serializable
   public static final int UNDEFINED_CONDITION = -1;
 
   /**
-   * Constant used to indicate that an action should be performed only when 
+   * Constant used to indicate that an action should be performed only when
    * the component has focus.
    *
    * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -742,7 +742,7 @@ public abstract class JComponent extends Container implements Serializable
   public static final int WHEN_FOCUSED = 0;
 
   /**
-   * Constant used to indicate that an action should be performed only when 
+   * Constant used to indicate that an action should be performed only when
    * the component is an ancestor of the component which has focus.
    *
    * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -750,7 +750,7 @@ public abstract class JComponent extends Container implements Serializable
   public static final int WHEN_ANCESTOR_OF_FOCUSED_COMPONENT = 1;
 
   /**
-   * Constant used to indicate that an action should be performed only when 
+   * Constant used to indicate that an action should be performed only when
    * the component is in the window which has focus.
    *
    * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
@@ -796,7 +796,7 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Helper to lazily construct and return the client properties table.
-   * 
+   *
    * @return The current client properties table
    *
    * @see #clientProperties
@@ -861,7 +861,7 @@ public abstract class JComponent extends Container implements Serializable
    * Unregister an AncestorListener.
    *
    * @param listener The listener to unregister
-   * 
+   *
    * @see #addAncestorListener
    */
   public void removeAncestorListener(AncestorListener listener)
@@ -911,22 +911,22 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Returns all registered {@link EventListener}s of the given 
+   * Returns all registered {@link EventListener}s of the given
    * listenerType.
    *
-   * @param listenerType the class of listeners to filter (null 
+   * @param listenerType the class of listeners to filter (null
    *                     not permitted).
-   *                     
+   *
    * @return An array of registered listeners.
-   * 
+   *
    * @throws ClassCastException if listenerType does not implement
    *                            the {@link EventListener} interface.
-   * @throws NullPointerException if listenerType is 
+   * @throws NullPointerException if listenerType is
    *                              null.
-   *                            
+   *
    * @see #getAncestorListeners()
    * @see #listenerList
-   * 
+   *
    * @since 1.3
    */
   public  T[] getListeners(Class listenerType)
@@ -953,14 +953,14 @@ public abstract class JComponent extends Container implements Serializable
   /**
    * Return all registered VetoableChangeListener objects.
    *
-   * @return An array of the VetoableChangeListener objects 
-   *     registered with this component (possibly empty but never 
+   * @return An array of the VetoableChangeListener objects
+   *     registered with this component (possibly empty but never
    *     null).
-   * 
+   *
    * @since 1.4
    */
   public VetoableChangeListener[] getVetoableChangeListeners()
-  {    
+  {
     return vetoableChangeSupport == null ? new VetoableChangeListener[0]
         : vetoableChangeSupport.getVetoableChangeListeners();
   }
@@ -1004,7 +1004,7 @@ public abstract class JComponent extends Container implements Serializable
   {
     super.firePropertyChange(property, oldValue, newValue);
   }
-  
+
   /**
    * Fires a property change for a primitive boolean property.
    *
@@ -1081,7 +1081,7 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Set the value of the {@link #border} property.
-   *   
+   *
    * @param newBorder The new value of the property
    *
    * @see #getBorder
@@ -1257,7 +1257,7 @@ public abstract class JComponent extends Container implements Serializable
    */
   public Dimension getMaximumSize()
   {
-    Dimension size = null; 
+    Dimension size = null;
     if (isMaximumSizeSet())
       size = super.getMaximumSize();
     else
@@ -1287,7 +1287,7 @@ public abstract class JComponent extends Container implements Serializable
    */
   public Dimension getMinimumSize()
   {
-    Dimension size = null; 
+    Dimension size = null;
     if (isMinimumSizeSet())
       size = super.getMinimumSize();
     else
@@ -1317,7 +1317,7 @@ public abstract class JComponent extends Container implements Serializable
    */
   public Dimension getPreferredSize()
   {
-    Dimension size = null; 
+    Dimension size = null;
     if (isPreferredSizeSet())
       size = super.getPreferredSize();
     else
@@ -1335,7 +1335,7 @@ public abstract class JComponent extends Container implements Serializable
    *
    * @return The current value of the property, or null
    * if none has been set.
-   * 
+   *
    * @deprecated See {@link java.awt.FocusTraversalPolicy}
    */
   public Component getNextFocusableComponent()
@@ -1362,11 +1362,11 @@ public abstract class JComponent extends Container implements Serializable
     KeyStroke[] ks2;
     if (inputMap_whenFocused != null)
       ks0 = inputMap_whenFocused.keys();
-    else 
+    else
       ks0 = new KeyStroke[0];
     if (inputMap_whenAncestorOfFocused != null)
       ks1 = inputMap_whenAncestorOfFocused.keys();
-    else 
+    else
       ks1 = new KeyStroke[0];
     if (inputMap_whenInFocusedWindow != null)
       ks2 = inputMap_whenInFocusedWindow.keys();
@@ -1428,7 +1428,7 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Return the location at which the toolTipText property should
-   * be displayed, when triggered by a particular mouse event. 
+   * be displayed, when triggered by a particular mouse event.
    *
    * @param event The event the tooltip is being presented in response to
    *
@@ -1496,31 +1496,31 @@ public abstract class JComponent extends Container implements Serializable
   {
     return getToolTipText();
   }
-  
+
   /**
    * Returns the flag that controls whether or not the component inherits its
    * parent's popup menu when no popup menu is specified for this component.
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #setInheritsPopupMenu(boolean)
    */
   public boolean getInheritsPopupMenu()
   {
-    return inheritsPopupMenu; 
+    return inheritsPopupMenu;
   }
-  
+
   /**
    * Sets the flag that controls whether or not the component inherits its
    * parent's popup menu when no popup menu is specified for this component.
    * This is a bound property with the property name 'inheritsPopupMenu'.
-   * 
+   *
    * @param inherit  the new flag value.
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #getInheritsPopupMenu()
    */
   public void setInheritsPopupMenu(boolean inherit)
@@ -1531,17 +1531,17 @@ public abstract class JComponent extends Container implements Serializable
         this.firePropertyChange("inheritsPopupMenu", ! inherit, inherit);
       }
   }
-  
+
   /**
-   * Returns the popup menu for this component.  If the popup menu is 
+   * Returns the popup menu for this component.  If the popup menu is
    * null AND the {@link #getInheritsPopupMenu()} method returns
    * true, this method will return the parent's popup menu (if it
    * has one).
-   * 
+   *
    * @return The popup menu (possibly null.
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @see #setComponentPopupMenu(JPopupMenu)
    * @see #getInheritsPopupMenu()
    */
@@ -1549,7 +1549,7 @@ public abstract class JComponent extends Container implements Serializable
   {
     if (componentPopupMenu == null && getInheritsPopupMenu())
       {
-        Container parent = getParent(); 
+        Container parent = getParent();
         if (parent instanceof JComponent)
           return ((JComponent) parent).getComponentPopupMenu();
         else
@@ -1560,13 +1560,13 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Sets the popup menu for this component (this is a bound property with 
+   * Sets the popup menu for this component (this is a bound property with
    * the property name 'componentPopupMenu').
-   * 
+   *
    * @param popup  the popup menu (null permitted).
    *
    * @since 1.5
-   * 
+   *
    * @see #getComponentPopupMenu()
    */
   public void setComponentPopupMenu(JPopupMenu popup)
@@ -1578,7 +1578,7 @@ public abstract class JComponent extends Container implements Serializable
         firePropertyChange("componentPopupMenu", old, popup);
       }
   }
-  
+
   /**
    * Return the top level ancestral container (usually a {@link
    * java.awt.Window} or {@link java.applet.Applet}) which this component is
@@ -1689,7 +1689,7 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Return the current value of the {@link #opaque} property. 
+   * Return the current value of the {@link #opaque} property.
    *
    * @return The current property value
    */
@@ -2149,7 +2149,7 @@ public abstract class JComponent extends Container implements Serializable
 
     // The component that is finally triggered for painting.
     JComponent paintRoot = this;
-    
+
     // Stores the component and all its parents. This will be used to limit
     // the actually painted components in paintChildren by setting
     // the field paintChild.
@@ -2200,7 +2200,7 @@ public abstract class JComponent extends Container implements Serializable
                     else if (jc.isPartiallyObscured(i, paintX, paintY, paintW,
                                                     paintH))
                       updatePaintRoot = true;
-                      
+
                   }
               }
             if (updatePaintRoot)
@@ -2430,27 +2430,27 @@ public abstract class JComponent extends Container implements Serializable
    * A variant of {@link
    * #registerKeyboardAction(ActionListener,String,KeyStroke,int)} which
    * provides null for the command name.
-   * 
+   *
    * @param act  the action listener to notify when the keystroke occurs.
    * @param stroke  the key stroke.
-   * @param cond  the condition (one of {@link #WHEN_FOCUSED}, 
-   *     {@link #WHEN_IN_FOCUSED_WINDOW} and 
+   * @param cond  the condition (one of {@link #WHEN_FOCUSED},
+   *     {@link #WHEN_IN_FOCUSED_WINDOW} and
    *     {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}).
    */
   public void registerKeyboardAction(ActionListener act,
-                                     KeyStroke stroke, 
+                                     KeyStroke stroke,
                                      int cond)
   {
     registerKeyboardAction(act, null, stroke, cond);
   }
 
-  /* 
+  /*
    * There is some charmingly undocumented behavior sun seems to be using
    * to simulate the old register/unregister keyboard binding API. It's not
    * clear to me why this matters, but we shall endeavour to follow suit.
    *
    * Two main thing seem to be happening when you do registerKeyboardAction():
-   * 
+   *
    *  - no actionMap() entry gets created, just an entry in inputMap()
    *
    *  - the inputMap() entry is a proxy class which invokes the the
@@ -2470,7 +2470,7 @@ public abstract class JComponent extends Container implements Serializable
     ActionListener target;
     String bindingCommandName;
 
-    public ActionListenerProxy(ActionListener li, 
+    public ActionListenerProxy(ActionListener li,
                                String cmd)
     {
       target = li;
@@ -2487,7 +2487,7 @@ public abstract class JComponent extends Container implements Serializable
     }
   }
 
-  
+
   /**
    * An obsolete method to register a keyboard action on this component.
    * You should use getInputMap and getActionMap
@@ -2507,9 +2507,9 @@ public abstract class JComponent extends Container implements Serializable
    * @see #getConditionForKeyStroke
    * @see #resetKeyboardActions
    */
-  public void registerKeyboardAction(ActionListener act, 
+  public void registerKeyboardAction(ActionListener act,
                                      String cmd,
-                                     KeyStroke stroke, 
+                                     KeyStroke stroke,
                                      int cond)
   {
     ActionListenerProxy proxy = new ActionListenerProxy(act, cmd);
@@ -2519,12 +2519,12 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Sets the input map for the given condition.
-   * 
-   * @param condition  the condition (one of {@link #WHEN_FOCUSED}, 
-   *     {@link #WHEN_IN_FOCUSED_WINDOW} and 
+   *
+   * @param condition  the condition (one of {@link #WHEN_FOCUSED},
+   *     {@link #WHEN_IN_FOCUSED_WINDOW} and
    *     {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}).
    * @param map  the map.
-   * 
+   *
    * @throws IllegalArgumentException if condition is not one of
    *     the specified values.
    */
@@ -2543,12 +2543,12 @@ public abstract class JComponent extends Container implements Serializable
 
       case WHEN_IN_FOCUSED_WINDOW:
         if (map != null && !(map instanceof ComponentInputMap))
-            throw new 
-              IllegalArgumentException("WHEN_IN_FOCUSED_WINDOW " + 
+            throw new
+              IllegalArgumentException("WHEN_IN_FOCUSED_WINDOW " +
                                        "InputMap must be a ComponentInputMap");
         inputMap_whenInFocusedWindow = (ComponentInputMap)map;
         break;
-        
+
       case UNDEFINED_CONDITION:
       default:
         throw new IllegalArgumentException();
@@ -2558,13 +2558,13 @@ public abstract class JComponent extends Container implements Serializable
   /**
    * Returns the input map associated with this component for the given
    * state/condition.
-   * 
-   * @param condition  the state (one of {@link #WHEN_FOCUSED}, 
-   *     {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT} and 
+   *
+   * @param condition  the state (one of {@link #WHEN_FOCUSED},
+   *     {@link #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT} and
    *     {@link #WHEN_IN_FOCUSED_WINDOW}).
-   * 
+   *
    * @return The input map.
-   * @throws IllegalArgumentException if condition is not one of 
+   * @throws IllegalArgumentException if condition is not one of
    *             the specified values.
    * @since 1.3
    */
@@ -2590,17 +2590,17 @@ public abstract class JComponent extends Container implements Serializable
 
       case UNDEFINED_CONDITION:
       default:
-        throw new IllegalArgumentException("Invalid 'condition' argument: " 
+        throw new IllegalArgumentException("Invalid 'condition' argument: "
                                            + condition);
       }
   }
 
   /**
-   * Returns the input map associated with this component for the 
+   * Returns the input map associated with this component for the
    * {@link #WHEN_FOCUSED} state.
-   * 
+   *
    * @return The input map.
-   * 
+   *
    * @since 1.3
    * @see #getInputMap(int)
    */
@@ -2634,19 +2634,19 @@ public abstract class JComponent extends Container implements Serializable
    *     #WHEN_ANCESTOR_OF_FOCUSED_COMPONENT}, {@link #WHEN_FOCUSED}, or {@link
    *     #WHEN_IN_FOCUSED_WINDOW}
    *
-   * @see #registerKeyboardAction(ActionListener, KeyStroke, int)   
-   * @see #unregisterKeyboardAction   
+   * @see #registerKeyboardAction(ActionListener, KeyStroke, int)
+   * @see #unregisterKeyboardAction
    * @see #resetKeyboardActions
    */
   public int getConditionForKeyStroke(KeyStroke ks)
   {
-    if (inputMap_whenFocused != null 
+    if (inputMap_whenFocused != null
         && inputMap_whenFocused.get(ks) != null)
       return WHEN_FOCUSED;
-    else if (inputMap_whenAncestorOfFocused != null 
+    else if (inputMap_whenAncestorOfFocused != null
              && inputMap_whenAncestorOfFocused.get(ks) != null)
       return WHEN_ANCESTOR_OF_FOCUSED_COMPONENT;
-    else if (inputMap_whenInFocusedWindow != null 
+    else if (inputMap_whenInFocusedWindow != null
              && inputMap_whenInFocusedWindow.get(ks) != null)
       return WHEN_IN_FOCUSED_WINDOW;
     else
@@ -2655,7 +2655,7 @@ public abstract class JComponent extends Container implements Serializable
 
   /**
    * Get the ActionListener (typically an {@link Action} object) which is
-   * associated with a particular keystroke. 
+   * associated with a particular keystroke.
    *
    * @param ks The keystroke to retrieve the action of
    *
@@ -2711,10 +2711,10 @@ public abstract class JComponent extends Container implements Serializable
     //    Note: Input maps for disabled components are skipped.
     // 4. The WHEN_IN_FOCUSED_WINDOW maps of all the enabled components in
     //    the focused window are searched.
-    
+
     KeyStroke keyStroke = KeyStroke.getKeyStrokeForEvent(e);
     boolean pressed = e.getID() == KeyEvent.KEY_PRESSED;
-    
+
     if (processKeyBinding(keyStroke, e, WHEN_FOCUSED, pressed))
       {
         // This is step 1 from above comment.
@@ -2728,37 +2728,37 @@ public abstract class JComponent extends Container implements Serializable
         e.consume();
         return;
       }
-    
+
     // This is step 3 from above comment.
-    Container current = getParent();    
+    Container current = getParent();
     while (current != null)
-      { 
+      {
         // If current is a JComponent, see if it handles the event in its
         // WHEN_ANCESTOR_OF_FOCUSED_COMPONENT maps.
-        if ((current instanceof JComponent) && 
-            ((JComponent)current).processKeyBinding 
+        if ((current instanceof JComponent) &&
+            ((JComponent)current).processKeyBinding
             (keyStroke, e,WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, pressed))
           {
             e.consume();
             return;
-          }     
-        
+          }
+
         // Stop when we've tried a top-level container and it didn't handle it
         if (current instanceof Window || current instanceof Applet)
-          break;        
-        
+          break;
+
         // Move up the hierarchy
         current = current.getParent();
       }
-    
+
     // Current being null means the JComponent does not currently have a
-    // top-level ancestor, in which case we don't need to check 
+    // top-level ancestor, in which case we don't need to check
     // WHEN_IN_FOCUSED_WINDOW bindings.
     if (current == null || e.isConsumed())
       return;
-    
+
     // This is step 4 from above comment.  KeyboardManager maintains mappings
-    // related to WHEN_IN_FOCUSED_WINDOW bindings so that we don't have to 
+    // related to WHEN_IN_FOCUSED_WINDOW bindings so that we don't have to
     // traverse the containment hierarchy each time.
     if (KeyboardManager.getManager().processKeyStroke(current, keyStroke, e))
       e.consume();
@@ -2781,7 +2781,7 @@ public abstract class JComponent extends Container implements Serializable
               {
                 if (cmd instanceof ActionListenerProxy)
                   act = (Action) cmd;
-                else 
+                else
                   act = getActionMap().get(cmd);
               }
           }
@@ -2806,7 +2806,7 @@ public abstract class JComponent extends Container implements Serializable
       }
     return false;
   }
-  
+
   /**
    * Remove a keyboard action registry.
    *
@@ -2899,7 +2899,7 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Queue a an invalidation and revalidation of this component, using 
+   * Queue a an invalidation and revalidation of this component, using
    * {@link RepaintManager#addInvalidComponent}.
    */
   public void revalidate()
@@ -2925,7 +2925,7 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Calls scrollRectToVisible on the component's parent. 
+   * Calls scrollRectToVisible on the component's parent.
    * Components which can service this call should override.
    *
    * @param r The rectangle to make visible
@@ -3069,7 +3069,7 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Set the specified component to be the next component in the 
+   * Set the specified component to be the next component in the
    * focus cycle, overriding the {@link FocusTraversalPolicy} for
    * this component.
    *
@@ -3151,7 +3151,7 @@ public abstract class JComponent extends Container implements Serializable
    * background.
    *
    * @param isOpaque if true, paint all pixels. If false, expect the clean
-   * background. 
+   * background.
    *
    * @see ComponentUI#update
    */
@@ -3192,8 +3192,8 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Call {@link #paint}. 
-   * 
+   * Call {@link #paint}.
+   *
    * @param g The graphics context to paint into
    */
   public void update(Graphics g)
@@ -3258,12 +3258,12 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Returns the locale used as the default for all new components.  The 
+   * Returns the locale used as the default for all new components.  The
    * default value is {@link Locale#getDefault()} (that is, the platform
    * default locale).
-   * 
+   *
    * @return The locale (never null).
-   * 
+   *
    * @see #setDefaultLocale(Locale)
    */
   public static Locale getDefaultLocale()
@@ -3272,19 +3272,19 @@ public abstract class JComponent extends Container implements Serializable
       defaultLocale = Locale.getDefault();
     return defaultLocale;
   }
-  
+
   /**
    * Sets the locale to be used as the default for all new components.  If this
    * is set to null, the {@link #getDefaultLocale()} method will
    * return the platform default locale.
-   * 
+   *
    * @param l  the locale (null permitted).
    */
   public static void setDefaultLocale(Locale l)
   {
     defaultLocale = l;
   }
-  
+
   /**
    * Returns the currently set input verifier for this component.
    *
@@ -3357,7 +3357,7 @@ public abstract class JComponent extends Container implements Serializable
    * by look and feel implementations.
    *
    * You should not use this method directly. Instead you are strongly
-   * encouraged to call {@link #requestFocus()} or 
+   * encouraged to call {@link #requestFocus()} or
    * {@link #requestFocusInWindow()} instead.
    *
    * @param temporary if the focus change is temporary
@@ -3406,7 +3406,7 @@ public abstract class JComponent extends Container implements Serializable
    * by look and feel implementations.
    *
    * You should not use this method directly. Instead you are strongly
-   * encouraged to call {@link #requestFocus()} or 
+   * encouraged to call {@link #requestFocus()} or
    * {@link #requestFocusInWindow()} instead.
    *
    * @param temporary if the focus change is temporary
@@ -3470,7 +3470,7 @@ public abstract class JComponent extends Container implements Serializable
    * has changed.
    *
    * This method is called before the component is actually removed from
-   * its parent, so the parent is still visible through 
+   * its parent, so the parent is still visible through
    * {@link Component#getParent}.
    */
   public void removeNotify()
@@ -3478,7 +3478,7 @@ public abstract class JComponent extends Container implements Serializable
     super.removeNotify();
 
     KeyboardManager.getManager().clearBindingsForComp(this);
-    
+
     // Notify ancestor listeners.
     fireAncestorEvent(this, AncestorEvent.ANCESTOR_REMOVED);
 
@@ -3727,7 +3727,7 @@ public abstract class JComponent extends Container implements Serializable
         jc.fireAncestorEvent(ancestor, id);
       }
   }
-  
+
   /**
    * This is the method that gets called when the WHEN_IN_FOCUSED_WINDOW map
    * is changed.
@@ -3743,26 +3743,26 @@ public abstract class JComponent extends Container implements Serializable
     InputMap curr = getInputMap(WHEN_IN_FOCUSED_WINDOW);
     while (curr != null && curr != changed)
       curr = curr.getParent();
-    
+
     // If curr is null then changed is not in the hierarchy
     if (curr == null)
       return;
-    
+
     // Now we have to update the keyboard manager's hashtable
     KeyboardManager km = KeyboardManager.getManager();
-    
-    // This is a poor strategy, should be improved.  We currently 
+
+    // This is a poor strategy, should be improved.  We currently
     // delete all the old bindings for the component and then register
     // the current bindings.
     km.clearBindingsForComp(changed.getComponent());
-    km.registerEntireMap((ComponentInputMap) 
+    km.registerEntireMap((ComponentInputMap)
                          getInputMap(WHEN_IN_FOCUSED_WINDOW));
   }
 
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/JDesktopPane.java b/libjava/classpath/javax/swing/JDesktopPane.java
index b068a2998a5..6d8b212760e 100644
--- a/libjava/classpath/javax/swing/JDesktopPane.java
+++ b/libjava/classpath/javax/swing/JDesktopPane.java
@@ -329,13 +329,13 @@ public class JDesktopPane extends JLayeredPane implements Accessible
     int count = 0;
 
     for (int i = 0; i < components.length; i++)
-	if (components[i] instanceof JInternalFrame)
-	  count++;
-	  
+        if (components[i] instanceof JInternalFrame)
+          count++;
+
     JInternalFrame[] value = new JInternalFrame[count];
     for (int i = 0, j = 0; i < components.length && j != count; i++)
       if (components[i] instanceof JInternalFrame)
-	value[j++] = (JInternalFrame) components[i];
+        value[j++] = (JInternalFrame) components[i];
     return value;
   }
 
@@ -343,7 +343,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
    * Returns the object that provides accessibility features for this
    * JDesktopPane component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJDesktopPane}).
    */
   public AccessibleContext getAccessibleContext()
@@ -357,7 +357,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/JDialog.java b/libjava/classpath/javax/swing/JDialog.java
index 495c9c791d7..04ec825bc62 100644
--- a/libjava/classpath/javax/swing/JDialog.java
+++ b/libjava/classpath/javax/swing/JDialog.java
@@ -61,7 +61,7 @@ import javax.accessibility.AccessibleContext;
  *
  * Also, unlike java.awt.Dialogs, JDialogs support the
  * Swing Pluggable Look & Feel architecture.
- * 
+ *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
 public class JDialog extends Dialog implements Accessible, WindowConstants,
@@ -94,16 +94,16 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
    * Whether checking is enabled on the RootPane.
    *
    * @specnote Should be false to comply with J2SE 5.0
-   */ 
+   */
   protected boolean rootPaneCheckingEnabled = false;
 
   /** The default action taken when closed. */
   private int closeAction = HIDE_ON_CLOSE;
-  
+
   /** Whether JDialogs are decorated by the Look and Feel. */
   private static boolean decorated;
 
-  /* Creates a new non-modal JDialog with no title 
+  /* Creates a new non-modal JDialog with no title
    * using a shared Frame as the owner.
    */
   public JDialog()
@@ -135,7 +135,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new non-modal JDialog using the 
+   * Creates a new non-modal JDialog using the
    * given title and owner.
    *
    * @param owner The owner of the JDialog.
@@ -147,7 +147,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new JDialog using the given modal 
+   * Creates a new JDialog using the given modal
    * settings, title, and owner.
    *
    * @param owner The owner of the JDialog.
@@ -160,7 +160,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new JDialog using the given modal 
+   * Creates a new JDialog using the given modal
    * settings, title, owner and graphics configuration.
    *
    * @param owner The owner of the JDialog.
@@ -199,7 +199,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new non-modal JDialog using the 
+   * Creates a new non-modal JDialog using the
    * given title and owner.
    *
    * @param owner The owner of the JDialog.
@@ -211,7 +211,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new JDialog using the given modal 
+   * Creates a new JDialog using the given modal
    * settings, title, and owner.
    *
    * @param owner The owner of the JDialog.
@@ -224,7 +224,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * Creates a new JDialog using the given modal 
+   * Creates a new JDialog using the given modal
    * settings, title, owner and graphics configuration.
    *
    * @param owner The owner of the JDialog.
@@ -240,8 +240,8 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * This method is called to initialize the 
-   * JDialog. It sets the layout used, the locale, 
+   * This method is called to initialize the
+   * JDialog. It sets the layout used, the locale,
    * and creates the RootPane.
    */
   protected void dialogInit()
@@ -283,7 +283,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * This method returns the preferred size of 
+   * This method returns the preferred size of
    * the JDialog.
    *
    * @return The preferred size.
@@ -306,7 +306,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * This method sets the JMenuBar used 
+   * This method sets the JMenuBar used
    * in this JDialog.
    *
    * @param menubar The JMenuBar to use.
@@ -318,7 +318,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
 
   /**
    * This method sets the LayoutManager used in the JDialog.
-   * This method will throw an Error if rootPaneChecking is 
+   * This method will throw an Error if rootPaneChecking is
    * enabled.
    *
    * @param manager The LayoutManager to use.
@@ -440,7 +440,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   }
 
   /**
-   * This method is called when a component is added to the 
+   * This method is called when a component is added to the
    * the JDialog. Calling this method with rootPaneCheckingEnabled
    * will cause an Error to be thrown.
    *
@@ -469,7 +469,7 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
     // pass it on to the content pane instead.
     if (comp == rootPane)
       super.remove(rootPane);
-    else 
+    else
       getContentPane().remove(comp);
   }
 
@@ -502,8 +502,8 @@ public class JDialog extends Dialog implements Accessible, WindowConstants,
   {
     paint(g);
   }
-  
-  
+
+
   /**
    * This method handles window events. This allows the JDialog
    * to honour its default close operation.
diff --git a/libjava/classpath/javax/swing/JEditorPane.java b/libjava/classpath/javax/swing/JEditorPane.java
index d6b87764fec..8ad1095eedf 100644
--- a/libjava/classpath/javax/swing/JEditorPane.java
+++ b/libjava/classpath/javax/swing/JEditorPane.java
@@ -125,7 +125,7 @@ public class JEditorPane extends JTextComponent
      */
     public String getAccessibleDescription()
     {
-      String descr = super.getAccessibleDescription(); 
+      String descr = super.getAccessibleDescription();
       if (descr == null)
         return getContentType();
       else
@@ -183,9 +183,9 @@ public class JEditorPane extends JTextComponent
     {
       super();
     }
-    
+
     /**
-     * The accessible representation of a HTML link. 
+     * The accessible representation of a HTML link.
      *
      * @author Roman Kennke (kennke@aicas.com)
      */
@@ -230,7 +230,7 @@ public class JEditorPane extends JTextComponent
        * general, link have 1 AccessibleAction associated with them. There are
        * special cases where links can have multiple actions associated, like
        * in image maps.
-       * 
+       *
        * @return the number of AccessibleActions in this link object
        */
       public int getAccessibleActionCount()
@@ -352,7 +352,7 @@ public class JEditorPane extends JTextComponent
       {
         return element.getEndOffset();
       }
-      
+
     }
 
     /**
@@ -503,7 +503,7 @@ public class JEditorPane extends JTextComponent
 
     /**
      * Creates a new EditorKitMapping object.
-     * 
+     *
      * @param cn the classname
      * @param cl the classloader
      */
@@ -655,11 +655,11 @@ public class JEditorPane extends JTextComponent
   }
 
   private static final long serialVersionUID = 3140472492599046285L;
-  
+
   private EditorKit editorKit;
-  
+
   boolean focus_root;
-  
+
   /**
    * Maps content-types to editor kit instances.
    */
@@ -684,7 +684,7 @@ public class JEditorPane extends JTextComponent
   }
 
   // A mapping between content types and used EditorKits
-  HashMap editorMap;  
+  HashMap editorMap;
 
   /**
    * The currently loading stream, if any.
@@ -715,9 +715,9 @@ public class JEditorPane extends JTextComponent
     setEditorKit(createEditorKitForContentType("text/html"));
     setPage(url);
   }
-  
+
   /**
-   * Called by the constructors to set up the default bindings for content 
+   * Called by the constructors to set up the default bindings for content
    * types and EditorKits.
    */
   void init()
@@ -731,10 +731,10 @@ public class JEditorPane extends JTextComponent
   }
 
   /**
-   * Creates and returns an EditorKit that is appropriate for the given 
+   * Creates and returns an EditorKit that is appropriate for the given
    * content type.  This is created using the default recognized types
    * plus any EditorKit types that have been registered.
-   * 
+   *
    * @see #registerEditorKitForContentType(String, String)
    * @see #registerEditorKitForContentType(String, String, ClassLoader)
    * @param type the content type
@@ -756,7 +756,7 @@ public class JEditorPane extends JTextComponent
                 e = (EditorKit) loader.loadClass(className).newInstance();
               }
             catch (Exception e2)
-              {    
+              {
                 // The reference implementation returns null when class is not
                 // loadable or instantiatable.
               }
@@ -817,7 +817,7 @@ public class JEditorPane extends JTextComponent
   /**
    * Returns the class name of the EditorKit associated with the given
    * content type.
-   * 
+   *
    * @since 1.3
    * @param type the content type
    * @return the class name of the EditorKit associated with this content type
@@ -831,13 +831,13 @@ public class JEditorPane extends JTextComponent
 
   /**
    * Returns the EditorKit to use for the given content type.  If an
-   * EditorKit has been explicitly set via 
+   * EditorKit has been explicitly set via
    * setEditorKitForContentType
    * then it will be returned.  Otherwise an attempt will be made to create
    * an EditorKit from the default recognzied content types or any
    * EditorKits that have been registered.  If none can be created, a
    * PlainEditorKit is created.
-   * 
+   *
    * @see #registerEditorKitForContentType(String, String)
    * @see #registerEditorKitForContentType(String, String, ClassLoader)
    * @param type the content type
@@ -975,7 +975,7 @@ public class JEditorPane extends JTextComponent
   }
 
   /**
-   * This method initializes from a stream. 
+   * This method initializes from a stream.
    */
   public void read(InputStream in, Object desc) throws IOException
   {
@@ -1004,9 +1004,9 @@ public class JEditorPane extends JTextComponent
   /**
    * Establishes a binding between type and classname.  This enables
    * us to create an EditorKit later for the given content type.
-   * 
+   *
    * @param type the content type
-   * @param classname the name of the class that is associated with this 
+   * @param classname the name of the class that is associated with this
    * content type
    */
   public static void registerEditorKitForContentType(String type,
@@ -1055,11 +1055,11 @@ public class JEditorPane extends JTextComponent
         type = type.substring(0, paramIndex).trim();
       }
     if (editorKit != null
-	&& editorKit.getContentType().equals(type))
+        && editorKit.getContentType().equals(type))
       return;
-    	      
+
     EditorKit kit = getEditorKitForContentType(type);
-	    	
+
     if (kit != null)
       setEditorKit(kit);
   }
@@ -1068,19 +1068,19 @@ public class JEditorPane extends JTextComponent
   {
     if (editorKit == newValue)
       return;
-    	
+
     if (editorKit != null)
       editorKit.deinstall(this);
-	    	    
+
     EditorKit oldValue = editorKit;
     editorKit = newValue;
-			    	
+
     if (editorKit != null)
       {
-	editorKit.install(this);
-	setDocument(editorKit.createDefaultDocument());
+        editorKit.install(this);
+        setDocument(editorKit.createDefaultDocument());
       }
-				    	    
+
     firePropertyChange("editorKit", oldValue, newValue);
     invalidate();
     repaint();
@@ -1099,7 +1099,7 @@ public class JEditorPane extends JTextComponent
   }
 
   /**
-   * Sets the current URL being displayed.  
+   * Sets the current URL being displayed.
    */
   public void setPage(String url) throws IOException
   {
@@ -1107,7 +1107,7 @@ public class JEditorPane extends JTextComponent
   }
 
   /**
-   * Sets the current URL being displayed.  
+   * Sets the current URL being displayed.
    */
   public void setPage(URL page) throws IOException
   {
@@ -1162,7 +1162,7 @@ public class JEditorPane extends JTextComponent
    * the content of the current document and uses the EditorKit to read in the
    * new text.  This allows the EditorKit to handle the String rather than just
    * inserting in plain text.
-   * 
+   *
    * @param t the text to display in this JEditorPane
    */
   public void setText(String t)
@@ -1174,7 +1174,7 @@ public class JEditorPane extends JTextComponent
       doc.remove(0, doc.getLength());
       if (t == null || t.equals(""))
         return;
-      
+
       // Let the EditorKit read the text into the Document.
       getEditorKit().read(new StringReader(t), doc, 0);
     }
diff --git a/libjava/classpath/javax/swing/JFileChooser.java b/libjava/classpath/javax/swing/JFileChooser.java
index b7615a58d0e..61b2fde7333 100644
--- a/libjava/classpath/javax/swing/JFileChooser.java
+++ b/libjava/classpath/javax/swing/JFileChooser.java
@@ -77,72 +77,72 @@ public class JFileChooser extends JComponent implements Accessible
 {
   private static final long serialVersionUID = 3162921138695327837L;
 
-  /** 
-   * A dialog type for selecting a file to open. 
+  /**
+   * A dialog type for selecting a file to open.
    * @see #setDialogType(int)
    */
   public static final int OPEN_DIALOG = 0;
 
-  /** 
-   * A dialog type for selecting a file to save.  
+  /**
+   * A dialog type for selecting a file to save.
    * @see #setDialogType(int)
    */
   public static final int SAVE_DIALOG = 1;
 
-  /** 
+  /**
    * A dialog type for some custom purpose.
    * @see #setDialogType(int)
    */
   public static final int CUSTOM_DIALOG = 2;
 
-  /** 
+  /**
    * A return value indicating the file chooser has been closed by cancelling.
-   * 
+   *
    * @see #showOpenDialog(Component)
-   * @see #showSaveDialog(Component) 
+   * @see #showSaveDialog(Component)
    */
   public static final int CANCEL_OPTION = 1;
 
-  /** 
+  /**
    * A return value indicating the file chooser has been closed by approving
    * the selection.
    * @see #showOpenDialog(Component)
-   * @see #showSaveDialog(Component) 
+   * @see #showSaveDialog(Component)
    */
   public static final int APPROVE_OPTION = 0;
 
-  /** 
+  /**
    * A return value indicating the file chooser has been closed by some error.
    * @see #showOpenDialog(Component)
-   * @see #showSaveDialog(Component) 
+   * @see #showSaveDialog(Component)
    */
   public static final int ERROR_OPTION = -1;
 
-  /** 
+  /**
    * A selection mode constant indicating acceptance of files only.
    * @see #setFileSelectionMode(int)
    */
   public static final int FILES_ONLY = 0;
 
-  /** 
-   * A selection mode constant indicating acceptance of directories only. 
+  /**
+   * A selection mode constant indicating acceptance of directories only.
    * @see #setFileSelectionMode(int)
    */
   public static final int DIRECTORIES_ONLY = 1;
 
-  /** 
+  /**
    * A selection mode constant indicating acceptance of files and directories.
    * @see #setFileSelectionMode(int)
    */
   public static final int FILES_AND_DIRECTORIES = 2;
 
-  /** 
+  /**
    * Action command string for cancelling the current selection.
    * @see #cancelSelection()
    */
   public static final String CANCEL_SELECTION = "CancelSelection";
 
-  /** 
+  /**
    * Action command string for approving the current selection.
    * @see #cancelSelection()
    */
@@ -150,7 +150,7 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * The name of the property for the approve button text.
-   * @see #setApproveButtonText(String) 
+   * @see #setApproveButtonText(String)
    */
   public static final String APPROVE_BUTTON_TEXT_CHANGED_PROPERTY =
     "ApproveButtonTextChangedProperty";
@@ -178,7 +178,7 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * The name of the property for the current directory.
-   * @see #setCurrentDirectory(File)  
+   * @see #setCurrentDirectory(File)
    */
   public static final String DIRECTORY_CHANGED_PROPERTY = "directoryChanged";
 
@@ -196,23 +196,23 @@ public class JFileChooser extends JComponent implements Accessible
   public static final String SELECTED_FILES_CHANGED_PROPERTY =
     "SelectedFilesChangedProperty";
 
-  /** 
+  /**
    * The name of the property for multi-selection.
-   * @see #setMultiSelectionEnabled(boolean) 
+   * @see #setMultiSelectionEnabled(boolean)
    */
   public static final String MULTI_SELECTION_ENABLED_CHANGED_PROPERTY =
     "MultiSelectionEnabledChangedProperty";
 
   /**
    * The name of the 'file system view' property.
-   * @see #setFileSystemView(FileSystemView) 
+   * @see #setFileSystemView(FileSystemView)
    */
   public static final String FILE_SYSTEM_VIEW_CHANGED_PROPERTY =
     "FileSystemViewChanged";
 
   /**
    * The name of the 'file view' property.
-   * @see #setFileView(FileView) 
+   * @see #setFileView(FileView)
    */
   public static final String FILE_VIEW_CHANGED_PROPERTY = "fileViewChanged";
 
@@ -272,13 +272,13 @@ public class JFileChooser extends JComponent implements Accessible
   public static final String CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY =
     "ChoosableFileFilterChangedProperty";
 
-  /** 
-   * The accessible context. 
+  /**
+   * The accessible context.
    * @see #getAccessibleContext()
    */
   protected AccessibleContext accessibleContext;
 
-  /** 
+  /**
    * The file system view.
    * @see #setFileSystemView(FileSystemView)
    */
@@ -353,46 +353,46 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * The file selection mode.
-   * @see #setFileSelectionMode(int) 
+   * @see #setFileSelectionMode(int)
    */
   private int fileSelectionMode = FILES_ONLY;
 
-  /** 
+  /**
    * The file view.
    * @see #setFileView(FileView)
    */
   private FileView fv = null;
 
-  /** 
-   * A flag controlling whether or not the control buttons are visible. 
-   * @see #setControlButtonsAreShown(boolean) 
+  /**
+   * A flag controlling whether or not the control buttons are visible.
+   * @see #setControlButtonsAreShown(boolean)
    */
   private boolean controlButtonsShown = true;
 
-  /** 
-   * The current directory. 
+  /**
+   * The current directory.
    * @see #setCurrentDirectory(File)
    */
   private File currentDir = null;
 
-  /** 
+  /**
    * The current file filter.
    * @see #setFileFilter(FileFilter)
    */
   private FileFilter currentFilter = null;
 
-  /** 
+  /**
    * An array of selected files.
-   * @see #setSelectedFiles(File[]) 
+   * @see #setSelectedFiles(File[])
    */
   private File[] selectedFiles;
 
-  /** 
-   * The selected file. 
+  /**
+   * The selected file.
    * @see #setSelectedFile(File)
    */
   private File selectedFile;
-  
+
   /**
    * The drag enabled property.
    * @see #setDragEnabled(boolean)
@@ -413,7 +413,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Creates a new JFileChooser object.
    *
    * @param currentDirectoryPath the directory that should initially be
-   *        shown in the filechooser (if null, the user's home 
+   *        shown in the filechooser (if null, the user's home
    *        directory is used).
    */
   public JFileChooser(String currentDirectoryPath)
@@ -422,11 +422,11 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Creates a new JFileChooser object with the specified 
+   * Creates a new JFileChooser object with the specified
    * directory and {@link FileSystemView}.
    *
    * @param currentDirectoryPath  the directory that should initially be
-   *        shown in the filechooser (if null, the user's home 
+   *        shown in the filechooser (if null, the user's home
    *        directory is used).
    * @param fsv  the file system view (if null, the default file
    *             system view is used).
@@ -444,7 +444,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Creates a new JFileChooser object.
    *
    * @param currentDirectory  the directory that should initially be
-   *        shown in the filechooser (if null, the user's home 
+   *        shown in the filechooser (if null, the user's home
    *        directory is used).
    */
   public JFileChooser(File currentDirectory)
@@ -469,7 +469,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Creates a new JFileChooser object.
    *
    * @param currentDirectory  the directory that should initially be
-   *        shown in the filechooser (if null, the user's home 
+   *        shown in the filechooser (if null, the user's home
    *        directory is used).
    * @param fsv  the file system view (if null, the default file
    *             system view is used).
@@ -485,7 +485,7 @@ public class JFileChooser extends JComponent implements Accessible
    *
    * @param view  the file system view (if null, the default file
    *              system view is used).
-   * 
+   *
    * @see FileSystemView#getFileSystemView()
    */
   protected void setup(FileSystemView view)
@@ -499,18 +499,18 @@ public class JFileChooser extends JComponent implements Accessible
   /**
    * Sets the dragEnabled property, this disables/enables automatic drag
    * handling (drag and drop) on this component. The default value of the
-   * dragEnabled property is false. 
-   * 
+   * dragEnabled property is false.
+   *
    * Some look and feels might not support automatic drag and drop; they
    * will ignore this property.
-   * 
+   *
    * @param b - the new dragEnabled value
    */
   public void setDragEnabled(boolean b)
   {
     if (b && GraphicsEnvironment.isHeadless())
       throw new HeadlessException();
-    
+
     dragEnabled = b;
   }
 
@@ -528,7 +528,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the selected file, if there is one.
    *
    * @return The selected file (possibly null).
-   * 
+   *
    * @see #setSelectedFile(File)
    */
   public File getSelectedFile()
@@ -538,7 +538,7 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * Sets the selected file and sends a {@link PropertyChangeEvent} to all
-   * registered listeners.  The property name is 
+   * registered listeners.  The property name is
    * {@link #SELECTED_FILE_CHANGED_PROPERTY}.
    *
    * @param file  the file (null permitted).
@@ -547,9 +547,9 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (selectedFile == null || !selectedFile.equals(file))
       {
-	File old = selectedFile;
-	selectedFile = file;
-	firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, old, selectedFile);
+        File old = selectedFile;
+        selectedFile = file;
+        firePropertyChange(SELECTED_FILE_CHANGED_PROPERTY, old, selectedFile);
       }
   }
 
@@ -569,9 +569,9 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the selected files and sends a {@link PropertyChangeEvent} (with the 
-   * name {@link #SELECTED_FILES_CHANGED_PROPERTY}) to all registered 
-   * listeners.  
+   * Sets the selected files and sends a {@link PropertyChangeEvent} (with the
+   * name {@link #SELECTED_FILES_CHANGED_PROPERTY}) to all registered
+   * listeners.
    *
    * @param selectedFiles  the selected files (null permitted).
    */
@@ -585,9 +585,9 @@ public class JFileChooser extends JComponent implements Accessible
       setSelectedFile(null);
     if (this.selectedFiles != selectedFiles)
       {
-	File[] old = this.selectedFiles;
-	this.selectedFiles = selectedFiles;
-	firePropertyChange(SELECTED_FILES_CHANGED_PROPERTY, old, selectedFiles);
+        File[] old = this.selectedFiles;
+        this.selectedFiles = selectedFiles;
+        firePropertyChange(SELECTED_FILES_CHANGED_PROPERTY, old, selectedFiles);
       }
 
   }
@@ -603,26 +603,26 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the current directory and fires a {@link PropertyChangeEvent} (with 
-   * the property name {@link #DIRECTORY_CHANGED_PROPERTY}) to all registered 
-   * listeners.  If dir is null, the current 
+   * Sets the current directory and fires a {@link PropertyChangeEvent} (with
+   * the property name {@link #DIRECTORY_CHANGED_PROPERTY}) to all registered
+   * listeners.  If dir is null, the current
    * directory is set to the default directory returned by the file system
    * view.
    *
    * @param dir  the new directory (null permitted).
-   * 
+   *
    * @see FileSystemView#getDefaultDirectory()
    */
   public void setCurrentDirectory(File dir)
   {
     if (currentDir != dir || dir == null)
       {
-	if (dir == null)
-	  dir = fsv.getDefaultDirectory();
+        if (dir == null)
+          dir = fsv.getDefaultDirectory();
 
-	File old = currentDir;
-	currentDir = dir;
-	firePropertyChange(DIRECTORY_CHANGED_PROPERTY, old, currentDir);
+        File old = currentDir;
+        currentDir = dir;
+        firePropertyChange(DIRECTORY_CHANGED_PROPERTY, old, currentDir);
       }
   }
 
@@ -643,7 +643,7 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Ensures the the specified file is visible (this is handled by the 
+   * Ensures the the specified file is visible (this is handled by the
    * UI delegate).
    *
    * @param f  the file.
@@ -654,13 +654,13 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Displays the file chooser in a modal dialog using the 
+   * Displays the file chooser in a modal dialog using the
    * {@link #OPEN_DIALOG} type.
    *
    * @param parent  the parent component.
    *
-   * @return A return value indicating how the dialog was closed (one of 
-   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and 
+   * @return A return value indicating how the dialog was closed (one of
+   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
    *         {@link #ERROR_OPTION}).
    *
    * @throws HeadlessException DOCUMENT ME!
@@ -681,13 +681,13 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Displays the file chooser in a modal dialog using the 
+   * Displays the file chooser in a modal dialog using the
    * {@link #SAVE_DIALOG} type.
    *
    * @param parent  the parent component.
    *
-   * @return A return value indicating how the dialog was closed (one of 
-   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and 
+   * @return A return value indicating how the dialog was closed (one of
+   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
    *         {@link #ERROR_OPTION}).
    *
    * @throws HeadlessException DOCUMENT ME!
@@ -705,13 +705,13 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Displays the file chooser in a modal dialog using the 
+   * Displays the file chooser in a modal dialog using the
    * {@link #CUSTOM_DIALOG} type.
    *
    * @param parent  the parent component.
    *
-   * @return A return value indicating how the dialog was closed (one of 
-   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and 
+   * @return A return value indicating how the dialog was closed (one of
+   *         {@link #APPROVE_OPTION}, {@link #CANCEL_OPTION} and
    *         {@link #ERROR_OPTION}).
    *
    * @throws HeadlessException DOCUMENT ME!
@@ -750,10 +750,10 @@ public class JFileChooser extends JComponent implements Accessible
     dialog.getContentPane().add(this);
     dialog.addWindowListener( new WindowAdapter()
       {
-	public void windowClosing(WindowEvent e)
-	{
-	  cancelSelection();
-	}
+        public void windowClosing(WindowEvent e)
+        {
+          cancelSelection();
+        }
       });
     dialog.setModal(true);
     dialog.invalidate();
@@ -766,7 +766,7 @@ public class JFileChooser extends JComponent implements Accessible
    * shown on the file chooser.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setControlButtonsAreShown(boolean)
    */
   public boolean getControlButtonsAreShown()
@@ -786,18 +786,18 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (controlButtonsShown != b)
       {
-	controlButtonsShown = b;
-	firePropertyChange(CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY,
-	                   ! controlButtonsShown, controlButtonsShown);
+        controlButtonsShown = b;
+        firePropertyChange(CONTROL_BUTTONS_ARE_SHOWN_CHANGED_PROPERTY,
+                           ! controlButtonsShown, controlButtonsShown);
       }
   }
 
   /**
    * Returns the type of file chooser.
    *
-   * @return {@link #OPEN_DIALOG}, {@link #SAVE_DIALOG} or 
+   * @return {@link #OPEN_DIALOG}, {@link #SAVE_DIALOG} or
    * {@link #CUSTOM_DIALOG}.
-   * 
+   *
    * @see #setDialogType(int)
    */
   public int getDialogType()
@@ -807,12 +807,12 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * Sets the dialog type and fires a {@link PropertyChangeEvent} (with the
-   * property name {@link #DIALOG_TYPE_CHANGED_PROPERTY}) to all 
+   * property name {@link #DIALOG_TYPE_CHANGED_PROPERTY}) to all
    * registered listeners.
    *
    * @param dialogType  the dialog type (one of: {@link #OPEN_DIALOG},
    * {@link #SAVE_DIALOG}, {@link #CUSTOM_DIALOG}).
-   * 
+   *
    * @throws IllegalArgumentException if dialogType is not valid.
    */
   public void setDialogType(int dialogType)
@@ -823,28 +823,28 @@ public class JFileChooser extends JComponent implements Accessible
 
     if (this.dialogType != dialogType)
       {
-	int old = this.dialogType;
-	this.dialogType = dialogType;
-	firePropertyChange(DIALOG_TYPE_CHANGED_PROPERTY, old, this.dialogType);
+        int old = this.dialogType;
+        this.dialogType = dialogType;
+        firePropertyChange(DIALOG_TYPE_CHANGED_PROPERTY, old, this.dialogType);
       }
   }
 
   /**
-   * Sets the dialog title and sends a {@link PropertyChangeEvent} (with the 
-   * property name {@link #DIALOG_TITLE_CHANGED_PROPERTY}) to all 
+   * Sets the dialog title and sends a {@link PropertyChangeEvent} (with the
+   * property name {@link #DIALOG_TITLE_CHANGED_PROPERTY}) to all
    * registered listeners.
    *
    * @param dialogTitle  the dialog title (null permitted).
-   * 
+   *
    * @see #getDialogTitle()
    */
   public void setDialogTitle(String dialogTitle)
   {
     if (this.dialogTitle != dialogTitle)
       {
-	String old = this.dialogTitle;
-	this.dialogTitle = dialogTitle;
-	firePropertyChange(DIALOG_TITLE_CHANGED_PROPERTY, old, this.dialogTitle);
+        String old = this.dialogTitle;
+        this.dialogTitle = dialogTitle;
+        firePropertyChange(DIALOG_TITLE_CHANGED_PROPERTY, old, this.dialogTitle);
       }
   }
 
@@ -852,7 +852,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the dialog title.
    *
    * @return The dialog title (possibly null).
-   * 
+   *
    * @see #setDialogTitle(String)
    */
   public String getDialogTitle()
@@ -861,9 +861,9 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the tool tip text for the approve button and sends a 
+   * Sets the tool tip text for the approve button and sends a
    * {@link PropertyChangeEvent} (with the property name
-   * {@link #APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY}) to all 
+   * {@link #APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY}) to all
    * registered listeners.
    *
    * @param toolTipText  the text.
@@ -872,10 +872,10 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (approveButtonToolTipText != toolTipText)
       {
-	String oldText = approveButtonToolTipText;
-	approveButtonToolTipText = toolTipText;
-	firePropertyChange(APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY,
-	                   oldText, approveButtonToolTipText);
+        String oldText = approveButtonToolTipText;
+        approveButtonToolTipText = toolTipText;
+        firePropertyChange(APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY,
+                           oldText, approveButtonToolTipText);
       }
   }
 
@@ -883,7 +883,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the tool tip text for the approve button.
    *
    * @return The tool tip text for the approve button.
-   * 
+   *
    * @see #setApproveButtonToolTipText(String)
    */
   public String getApproveButtonToolTipText()
@@ -895,7 +895,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the approve button mnemonic, or zero if no mnemonic has been set.
    *
    * @return The approve button mnemonic.
-   * 
+   *
    * @see #setApproveButtonMnemonic(int)
    */
   public int getApproveButtonMnemonic()
@@ -904,34 +904,34 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the mnemonic for the approve button and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
-   * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered 
+   * Sets the mnemonic for the approve button and sends a
+   * {@link PropertyChangeEvent} (with the property name
+   * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param mnemonic  the mnemonic.
-   * 
+   *
    * @see #setApproveButtonMnemonic(char)
    */
   public void setApproveButtonMnemonic(int mnemonic)
   {
     if (approveButtonMnemonic != mnemonic)
       {
-	int oldMnemonic = approveButtonMnemonic;
-	approveButtonMnemonic = mnemonic;
-	firePropertyChange(APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY,
-	                   oldMnemonic, approveButtonMnemonic);
+        int oldMnemonic = approveButtonMnemonic;
+        approveButtonMnemonic = mnemonic;
+        firePropertyChange(APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY,
+                           oldMnemonic, approveButtonMnemonic);
       }
   }
 
   /**
-   * Sets the mnemonic for the approve button and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
-   * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered 
+   * Sets the mnemonic for the approve button and sends a
+   * {@link PropertyChangeEvent} (with the property name
+   * {@link #APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param mnemonic  the mnemonic.
-   * 
+   *
    * @see #setApproveButtonMnemonic(int)
    */
   public void setApproveButtonMnemonic(char mnemonic)
@@ -940,22 +940,22 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the approve button text and fires a {@link PropertyChangeEvent} 
-   * (with the property name {@link #APPROVE_BUTTON_TEXT_CHANGED_PROPERTY}) to 
+   * Sets the approve button text and fires a {@link PropertyChangeEvent}
+   * (with the property name {@link #APPROVE_BUTTON_TEXT_CHANGED_PROPERTY}) to
    * all registered listeners.
    *
    * @param approveButtonText  the text (null permitted).
-   * 
+   *
    * @see #getApproveButtonText()
    */
   public void setApproveButtonText(String approveButtonText)
   {
     if (this.approveButtonText != approveButtonText)
       {
-	String oldText = this.approveButtonText;
-	this.approveButtonText = approveButtonText;
-	firePropertyChange(APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, oldText,
-	                   this.approveButtonText);
+        String oldText = this.approveButtonText;
+        this.approveButtonText = approveButtonText;
+        firePropertyChange(APPROVE_BUTTON_TEXT_CHANGED_PROPERTY, oldText,
+                           this.approveButtonText);
       }
   }
 
@@ -963,7 +963,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the approve button text.
    *
    * @return The approve button text (possibly null).
-   * 
+   *
    * @see #setApproveButtonText(String)
    */
   public String getApproveButtonText()
@@ -982,9 +982,9 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Adds a file filter to the list of available filters and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
-   * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered 
+   * Adds a file filter to the list of available filters and sends a
+   * {@link PropertyChangeEvent} (with the property name
+   * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param filter  the filter (null permitted).
@@ -996,21 +996,21 @@ public class JFileChooser extends JComponent implements Accessible
         FileFilter[] old = getChoosableFileFilters();
         choosableFilters.add(filter);
         FileFilter[] newFilters = getChoosableFileFilters();
-        firePropertyChange(CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY, old, 
+        firePropertyChange(CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY, old,
               newFilters);
       }
     setFileFilter(filter);
   }
 
   /**
-   * Removes a file filter from the list of available filters and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
-   * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered 
+   * Removes a file filter from the list of available filters and sends a
+   * {@link PropertyChangeEvent} (with the property name
+   * {@link #CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param f  the file filter.
    *
-   * @return true if the filter was removed and 
+   * @return true if the filter was removed and
    *         false otherwise.
    */
   public boolean removeChoosableFileFilter(FileFilter f)
@@ -1047,11 +1047,11 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns the flag that controls whether or not the 'accept all' file 
+   * Returns the flag that controls whether or not the 'accept all' file
    * filter is included in the list of filters.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setAcceptAllFileFilterUsed(boolean)
    */
   public boolean isAcceptAllFileFilterUsed()
@@ -1061,9 +1061,9 @@ public class JFileChooser extends JComponent implements Accessible
 
   /**
    * Sets the flag that controls whether or not the 'accept all' file filter
-   * is included in the list of filters, and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
-   * {@link #ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY}) to all registered 
+   * is included in the list of filters, and sends a
+   * {@link PropertyChangeEvent} (with the property name
+   * {@link #ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param b  the new value of the flag.
@@ -1072,13 +1072,13 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (isAcceptAll != b)
       {
-	isAcceptAll = b;
+        isAcceptAll = b;
         if (b)
           addChoosableFileFilter(getAcceptAllFileFilter());
-        else 
+        else
           removeChoosableFileFilter(getAcceptAllFileFilter());
-	firePropertyChange(ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY,
-	                   ! isAcceptAll, isAcceptAll);
+        firePropertyChange(ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY,
+                           ! isAcceptAll, isAcceptAll);
       }
   }
 
@@ -1087,7 +1087,7 @@ public class JFileChooser extends JComponent implements Accessible
    * value is null.
    *
    * @return The accessory component (possibly null).
-   * 
+   *
    * @see #setAccessory(JComponent)
    */
   public JComponent getAccessory()
@@ -1096,7 +1096,7 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the accessory component for the file chooser and sends a 
+   * Sets the accessory component for the file chooser and sends a
    * {@link PropertyChangeEvent} to all registered listeners.  The property
    * name is {@link #ACCESSORY_CHANGED_PROPERTY}.
    *
@@ -1106,20 +1106,20 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (accessory != newAccessory)
       {
-	JComponent old = accessory;
-	accessory = newAccessory;
-	firePropertyChange(ACCESSORY_CHANGED_PROPERTY, old, accessory);
+        JComponent old = accessory;
+        accessory = newAccessory;
+        firePropertyChange(ACCESSORY_CHANGED_PROPERTY, old, accessory);
       }
   }
 
   /**
    * Sets the file selection mode and sends a {@link PropertyChangeEvent}
-   * to all registered listeners.  The property name is 
+   * to all registered listeners.  The property name is
    * {@link #FILE_SELECTION_MODE_CHANGED_PROPERTY}.
    *
    * @param mode  the mode ({@link #FILES_ONLY}, {@link #DIRECTORIES_ONLY} or
    *              {@link #FILES_AND_DIRECTORIES}).
-   * 
+   *
    * @throws IllegalArgumentException if the mode is invalid.
    */
   public void setFileSelectionMode(int mode)
@@ -1129,20 +1129,20 @@ public class JFileChooser extends JComponent implements Accessible
       throw new IllegalArgumentException("Choose a correct file selection mode.");
     if (fileSelectionMode != mode)
       {
-	int old = fileSelectionMode;
-	fileSelectionMode = mode;
-	firePropertyChange(FILE_SELECTION_MODE_CHANGED_PROPERTY, old,
-	                   fileSelectionMode);
+        int old = fileSelectionMode;
+        fileSelectionMode = mode;
+        firePropertyChange(FILE_SELECTION_MODE_CHANGED_PROPERTY, old,
+                           fileSelectionMode);
       }
   }
 
   /**
-   * Returns the file selection mode, one of: {@link #FILES_ONLY}, 
+   * Returns the file selection mode, one of: {@link #FILES_ONLY},
    * {@link #DIRECTORIES_ONLY} or {@link #FILES_AND_DIRECTORIES}.  The
    * default is {@link #FILES_ONLY}.
    *
    * @return The file selection mode.
-   * 
+   *
    * @see #setFileSelectionMode(int)
    */
   public int getFileSelectionMode()
@@ -1151,13 +1151,13 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns true if file selection is enabled, and 
+   * Returns true if file selection is enabled, and
    * false otherwise.  File selection is enabled when the
-   * file selection mode is {@link #FILES_ONLY} or 
+   * file selection mode is {@link #FILES_ONLY} or
    * {@link #FILES_AND_DIRECTORIES}.
    *
    * @return true if file selection is enabled.
-   * 
+   *
    * @see #getFileSelectionMode()
    */
   public boolean isFileSelectionEnabled()
@@ -1167,13 +1167,13 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns true if directory selection is enabled, and 
+   * Returns true if directory selection is enabled, and
    * false otherwise.  Directory selection is enabled when the
-   * file selection mode is {@link #DIRECTORIES_ONLY} or 
+   * file selection mode is {@link #DIRECTORIES_ONLY} or
    * {@link #FILES_AND_DIRECTORIES}.
    *
    * @return true if file selection is enabled.
-   * 
+   *
    * @see #getFileSelectionMode()
    */
   public boolean isDirectorySelectionEnabled()
@@ -1183,9 +1183,9 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets the flag that controls whether multiple selections are allowed in 
-   * this filechooser and sends a {@link PropertyChangeEvent} (with the 
-   * property name {@link #MULTI_SELECTION_ENABLED_CHANGED_PROPERTY}) to all 
+   * Sets the flag that controls whether multiple selections are allowed in
+   * this filechooser and sends a {@link PropertyChangeEvent} (with the
+   * property name {@link #MULTI_SELECTION_ENABLED_CHANGED_PROPERTY}) to all
    * registered listeners.
    *
    * @param b  the new value of the flag.
@@ -1194,9 +1194,9 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (multiSelection != b)
       {
-	multiSelection = b;
-	firePropertyChange(MULTI_SELECTION_ENABLED_CHANGED_PROPERTY,
-	                   ! multiSelection, multiSelection);
+        multiSelection = b;
+        firePropertyChange(MULTI_SELECTION_ENABLED_CHANGED_PROPERTY,
+                           ! multiSelection, multiSelection);
       }
   }
 
@@ -1205,7 +1205,7 @@ public class JFileChooser extends JComponent implements Accessible
    * file chooser, and false otherwise.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setMultiSelectionEnabled(boolean)
    */
   public boolean isMultiSelectionEnabled()
@@ -1214,11 +1214,11 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns true if hidden files are to be hidden, and 
+   * Returns true if hidden files are to be hidden, and
    * false otherwise.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setFileHidingEnabled(boolean)
    */
   public boolean isFileHidingEnabled()
@@ -1237,15 +1237,15 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (fileHiding != b)
       {
-	fileHiding = b;
-	firePropertyChange(FILE_HIDING_CHANGED_PROPERTY, ! fileHiding,
-	                   fileHiding);
+        fileHiding = b;
+        firePropertyChange(FILE_HIDING_CHANGED_PROPERTY, ! fileHiding,
+                           fileHiding);
       }
   }
 
   /**
    * Sets the file filter and sends a {@link PropertyChangeEvent} (with the
-   * property name {@link #FILE_FILTER_CHANGED_PROPERTY}) to all registered 
+   * property name {@link #FILE_FILTER_CHANGED_PROPERTY}) to all registered
    * listeners.
    *
    * @param filter  the filter (null permitted).
@@ -1266,7 +1266,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the file filter.
    *
    * @return The file filter.
-   * 
+   *
    * @see #setFileFilter(FileFilter)
    */
   public FileFilter getFileFilter()
@@ -1275,7 +1275,7 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Sets a custom {@link FileView} for the file chooser and sends a 
+   * Sets a custom {@link FileView} for the file chooser and sends a
    * {@link PropertyChangeEvent} to all registered listeners.  The property
    * name is {@link #FILE_VIEW_CHANGED_PROPERTY}.
    *
@@ -1287,9 +1287,9 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (fv != fileView)
       {
-	FileView old = fv;
-	fv = fileView;
-	firePropertyChange(FILE_VIEW_CHANGED_PROPERTY, old, fv);
+        FileView old = fv;
+        fv = fileView;
+        firePropertyChange(FILE_VIEW_CHANGED_PROPERTY, old, fv);
       }
   }
 
@@ -1340,7 +1340,7 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns the type description for the file, generated by the current (or 
+   * Returns the type description for the file, generated by the current (or
    * default) {@link FileView}.
    *
    * @param f  the file.
@@ -1375,7 +1375,7 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns true if the file is traversable, and 
+   * Returns true if the file is traversable, and
    * false otherwise.
    *
    * @param f  the file or directory.
@@ -1400,14 +1400,14 @@ public class JFileChooser extends JComponent implements Accessible
     if (f == null)
       return true;
     FileFilter ff = getFileFilter();
-    if (ff != null) 
+    if (ff != null)
       return ff.accept(f);
     else
       return true;
   }
 
   /**
-   * Sets the file system view for the file chooser and sends a 
+   * Sets the file system view for the file chooser and sends a
    * {@link PropertyChangeEvent} to all registered listeners.
    *
    * @param fsv  the file system view.
@@ -1416,9 +1416,9 @@ public class JFileChooser extends JComponent implements Accessible
   {
     if (this.fsv != fsv)
       {
-	FileSystemView old = this.fsv;
-	this.fsv = fsv;
-	firePropertyChange(FILE_SYSTEM_VIEW_CHANGED_PROPERTY, old, this.fsv);
+        FileSystemView old = this.fsv;
+        this.fsv = fsv;
+        firePropertyChange(FILE_SYSTEM_VIEW_CHANGED_PROPERTY, old, this.fsv);
       }
   }
 
@@ -1426,7 +1426,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the file system view being used by this file chooser.
    *
    * @return The file system view.
-   * 
+   *
    * @see #setFileSystemView(FileSystemView)
    */
   public FileSystemView getFileSystemView()
@@ -1473,11 +1473,11 @@ public class JFileChooser extends JComponent implements Accessible
   {
     try
       {
-	listenerList.remove(ActionListener.class, l);
+        listenerList.remove(ActionListener.class, l);
       }
     catch (IllegalArgumentException e)
       {
-	e.printStackTrace();
+        e.printStackTrace();
       }
   }
 
@@ -1535,12 +1535,12 @@ public class JFileChooser extends JComponent implements Accessible
   }
 
   /**
-   * Returns a string describing the attributes for the 
-   * JFileChooser component, for use in debugging.  The return 
-   * value is guaranteed to be non-null, but the format of the 
+   * Returns a string describing the attributes for the
+   * JFileChooser component, for use in debugging.  The return
+   * value is guaranteed to be non-null, but the format of the
    * string may vary between implementations.
    *
-   * @return A string describing the attributes of the 
+   * @return A string describing the attributes of the
    *     JFileChooser.
    */
   protected String paramString()
@@ -1587,7 +1587,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Returns the object that provides accessibility features for this
    * JFileChooser component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJFileChooser}).
    */
   public AccessibleContext getAccessibleContext()
@@ -1601,7 +1601,7 @@ public class JFileChooser extends JComponent implements Accessible
    * Provides the accessibility features for the JFileChooser
    * component.
    */
-  protected class AccessibleJFileChooser 
+  protected class AccessibleJFileChooser
     extends JComponent.AccessibleJComponent
   {
     /**
@@ -1611,9 +1611,9 @@ public class JFileChooser extends JComponent implements Accessible
     {
       // Nothing to do here.
     }
-    
+
     /**
-     * Returns the accessible role for the JFileChooser 
+     * Returns the accessible role for the JFileChooser
      * component.
      *
      * @return {@link AccessibleRole#FILE_CHOOSER}.
diff --git a/libjava/classpath/javax/swing/JFormattedTextField.java b/libjava/classpath/javax/swing/JFormattedTextField.java
index 36554857ead..e4b6fec7911 100644
--- a/libjava/classpath/javax/swing/JFormattedTextField.java
+++ b/libjava/classpath/javax/swing/JFormattedTextField.java
@@ -84,18 +84,18 @@ public class JFormattedTextField extends JTextField
   public abstract static class AbstractFormatter implements Serializable
   {
     private static final long serialVersionUID = -5193212041738979680L;
-    
+
     private JFormattedTextField textField;
-    
+
     public AbstractFormatter ()
     {
       //Do nothing here.
     }
 
     /**
-     * Clones the AbstractFormatter and removes the association to any 
+     * Clones the AbstractFormatter and removes the association to any
      * particular JFormattedTextField.
-     * 
+     *
      * @return a clone of this formatter with no association to any particular
      * JFormattedTextField
      * @throws CloneNotSupportedException if the Object's class doesn't support
@@ -106,7 +106,7 @@ public class JFormattedTextField extends JTextField
     {
       // Clone this formatter.
       AbstractFormatter newFormatter = (AbstractFormatter) super.clone();
-      
+
       // And remove the association to the JFormattedTextField.
       newFormatter.textField = null;
       return newFormatter;
@@ -115,7 +115,7 @@ public class JFormattedTextField extends JTextField
     /**
      * Returns a custom set of Actions that this formatter supports.  Should
      * be subclassed by formatters that have a custom set of Actions.
-     * 
+     *
      * @return null.  Should be subclassed by formatters that want
      * to install custom Actions on the JFormattedTextField.
      */
@@ -128,13 +128,13 @@ public class JFormattedTextField extends JTextField
      * Gets the DocumentFilter for this formatter.  Should be subclassed
      * by formatters wishing to install a filter that oversees Document
      * mutations.
-     * 
+     *
      * @return null.  Should be subclassed by formatters
      * that want to restrict Document mutations.
      */
     protected DocumentFilter getDocumentFilter()
     {
-      // Subclasses should override this if they want to install a 
+      // Subclasses should override this if they want to install a
       // DocumentFilter.
       return null;
     }
@@ -142,7 +142,7 @@ public class JFormattedTextField extends JTextField
     /**
      * Returns the JFormattedTextField on which this formatter is
      * currently installed.
-     * 
+     *
      * @return the JFormattedTextField on which this formatter is currently
      * installed
      */
@@ -153,29 +153,29 @@ public class JFormattedTextField extends JTextField
 
     /**
      * Gets the NavigationFilter for this formatter.  Should be subclassed
-     * by formatters (such as {@link DefaultFormatter}) that wish to 
+     * by formatters (such as {@link DefaultFormatter}) that wish to
      * restrict where the cursor can be placed within the text field.
-     * 
+     *
      * @return null.  Subclassed by formatters that want to restrict
      * cursor location within the JFormattedTextField.
      */
     protected NavigationFilter getNavigationFilter()
     {
-      // This should be subclassed if the formatter wants to install 
+      // This should be subclassed if the formatter wants to install
       // a NavigationFilter on the JFormattedTextField.
       return null;
     }
 
     /**
-     * Installs this formatter on the specified JFormattedTextField.  This 
-     * converts the current value to a displayable String and displays it, 
+     * Installs this formatter on the specified JFormattedTextField.  This
+     * converts the current value to a displayable String and displays it,
      * and installs formatter specific Actions from getActions.
-     * It also installs a DocumentFilter and NavigationFilter on the 
-     * JFormattedTextField.  
+     * It also installs a DocumentFilter and NavigationFilter on the
+     * JFormattedTextField.
      * 
                            
-     * If there is a ParseException this sets the text to an 
+     * If there is a ParseException this sets the text to an
      * empty String and marks the text field in an invalid state.
-     * 
+     *
      * @param textField the JFormattedTextField on which to install this
      * formatter
      */
@@ -184,10 +184,10 @@ public class JFormattedTextField extends JTextField
       // Uninstall the current textfield.
       if (this.textField != null)
         uninstall();
-      
+
       this.textField = textField;
-      
-      // Install some state on the text field, including display text, 
+
+      // Install some state on the text field, including display text,
       // DocumentFilter, NavigationFilter, and formatter specific Actions.
       if (textField != null)
         {
@@ -196,16 +196,16 @@ public class JFormattedTextField extends JTextField
             // Set the text of the field.
             textField.setText(valueToString(textField.getValue()));
             Document doc = textField.getDocument();
-            
+
             // Set the DocumentFilter for the field's Document.
             if (doc instanceof AbstractDocument)
               ((AbstractDocument) doc).setDocumentFilter(getDocumentFilter());
-            
+
             // Set the NavigationFilter.
             textField.setNavigationFilter(getNavigationFilter());
-            
+
             // Set the Formatter Actions
-            // FIXME: Have to add the actions from getActions()            
+            // FIXME: Have to add the actions from getActions()
           }
           catch (ParseException pe)
           {
@@ -218,8 +218,8 @@ public class JFormattedTextField extends JTextField
 
     /**
      * Clears the state installed on the JFormattedTextField by the formatter.
-     * This resets the DocumentFilter, NavigationFilter, and any additional 
-     * Actions (returned by getActions()).     
+     * This resets the DocumentFilter, NavigationFilter, and any additional
+     * Actions (returned by getActions()).
      */
     public void uninstall()
     {
@@ -234,7 +234,7 @@ public class JFormattedTextField extends JTextField
 
     /**
      * Invoke this method when invalid values are entered.  This forwards the
-     * call to the JFormattedTextField.     
+     * call to the JFormattedTextField.
      */
     protected void invalidEdit()
     {
@@ -242,9 +242,9 @@ public class JFormattedTextField extends JTextField
     }
 
     /**
-     * This method updates the editValid property of 
+     * This method updates the editValid property of
      * JFormattedTextField.
-     * 
+     *
      * @param valid the new state for the editValid property
      */
     protected void setEditValid(boolean valid)
@@ -254,7 +254,7 @@ public class JFormattedTextField extends JTextField
 
     /**
      * Parses text to return a corresponding Object.
-     * 
+     *
      * @param text the String to parse
      * @return an Object that text represented
      * @throws ParseException if there is an error in the conversion
@@ -265,7 +265,7 @@ public class JFormattedTextField extends JTextField
     /**
      * Returns a String to be displayed, based on the Object
      * value.
-     * 
+     *
      * @param value the Object from which to generate a String
      * @return a String to be displayed
      * @throws ParseException if there is an error in the conversion
@@ -276,7 +276,7 @@ public class JFormattedTextField extends JTextField
 
   /**
    * Delivers instances of an {@link AbstractFormatter} for
-   * a specific value type for a JFormattedTextField. 
+   * a specific value type for a JFormattedTextField.
    */
   public abstract static class AbstractFormatterFactory
   {
@@ -296,22 +296,22 @@ public class JFormattedTextField extends JTextField
 
   /** The most recent valid and committed value **/
   private Object value;
-  
+
   /** The behaviour for when this text field loses focus **/
   private int focusLostBehavior = COMMIT_OR_REVERT;
-  
+
   /** The formatter factory currently being used **/
   private AbstractFormatterFactory formatterFactory;
-  
+
   /** The formatter currently being used **/
   private AbstractFormatter formatter;
-  
+
   // Package-private to avoid an accessor method.
   boolean editValid = true;
-  
+
   /**
-   * Creates a JFormattedTextField with no formatter factory.  
-   * setValue or setFormatterFactory will 
+   * Creates a JFormattedTextField with no formatter factory.
+   * setValue or setFormatterFactory will
    * properly configure this text field to edit a particular type
    * of value.
    */
@@ -321,10 +321,10 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * Creates a JFormattedTextField that can handle the specified Format.  
-   * An appopriate AbstractFormatter and AbstractFormatterFactory will 
+   * Creates a JFormattedTextField that can handle the specified Format.
+   * An appopriate AbstractFormatter and AbstractFormatterFactory will
    * be created for the specified Format.
-   * 
+   *
    * @param format the Format that this JFormattedTextField should be able
    * to handle
    */
@@ -335,10 +335,10 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * Creates a JFormattedTextField with the specified formatter.  This will 
+   * Creates a JFormattedTextField with the specified formatter.  This will
    * create a {@link DefaultFormatterFactory} with this formatter as the default
    * formatter.
-   * 
+   *
    * @param formatter the formatter to use for this JFormattedTextField
    */
   public JFormattedTextField(AbstractFormatter formatter)
@@ -348,7 +348,7 @@ public class JFormattedTextField extends JTextField
 
   /**
    * Creates a JFormattedTextField with the specified formatter factory.
-   * 
+   *
    * @param factory the formatter factory to use for this JFormattedTextField
    */
   public JFormattedTextField(AbstractFormatterFactory factory)
@@ -359,12 +359,12 @@ public class JFormattedTextField extends JTextField
   /**
    * Creates a JFormattedTextField with the specified formatter factory and
    * initial value.
-   * 
+   *
    * @param factory the initial formatter factory for this JFormattedTextField
    * @param value the initial value for the text field
    */
   public JFormattedTextField(AbstractFormatterFactory factory, Object value)
-  {    
+  {
     setFormatterFactory(factory);
     setValue(value);
   }
@@ -372,14 +372,14 @@ public class JFormattedTextField extends JTextField
   /**
    * Creates a JFormattedTextField with the specified value.  This creates a
    * formatter and formatterFactory that are appropriate for the value.
-   * 
+   *
    * @param value the initial value for this JFormattedTextField
    */
   public JFormattedTextField(Object value)
   {
     setValue(value);
   }
-  
+
   /**
    * Returns an AbstractFormatterFactory that will give an appropriate
    * AbstractFormatter for the given Format.
@@ -396,14 +396,14 @@ public class JFormattedTextField extends JTextField
       newFormatter = new NumberFormatter ((NumberFormat) format);
     else
       newFormatter = new InternationalFormatter(format);
-    
+
     return new DefaultFormatterFactory(newFormatter);
   }
 
   /**
    * Forces the current value from the editor to be set as the current
    * value.  If there is no current formatted this has no effect.
-   * 
+   *
    * @throws ParseException if the formatter cannot format the current value
    */
   public void commitEdit()
@@ -414,17 +414,17 @@ public class JFormattedTextField extends JTextField
     // Note: this code is a lot like setValue except that we don't want
     // to create a new formatter.
     Object oldValue = this.value;
-    
+
     this.value = formatter.stringToValue(getText());
     editValid = true;
-    
-    firePropertyChange("value", oldValue, this.value); 
+
+    firePropertyChange("value", oldValue, this.value);
   }
 
   /**
    * Gets the command list supplied by the UI augmented by the specific
    * Actions for JFormattedTextField.
-   * 
+   *
    * @return an array of Actions that this text field supports
    */
   public Action[] getActions()
@@ -436,8 +436,8 @@ public class JFormattedTextField extends JTextField
 
   /**
    * Returns the behaviour of this JFormattedTextField upon losing focus.  This
-   * is one of COMMIT, COMMIT_OR_REVERT, 
-   * PERSIST, or REVERT.  
+   * is one of COMMIT, COMMIT_OR_REVERT,
+   * PERSIST, or REVERT.
    * @return the behaviour upon losing focus
    */
   public int getFocusLostBehavior()
@@ -453,7 +453,7 @@ public class JFormattedTextField extends JTextField
   {
     return formatter;
   }
-  
+
   /**
    * Returns the factory currently used to generate formatters for this
    * JFormattedTextField.
@@ -470,9 +470,9 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * Returns the last valid value.  This may not be the value currently shown 
-   * in the text field depending on whether or not the formatter commits on 
-   * valid edits and allows invalid input to be temporarily displayed.  
+   * Returns the last valid value.  This may not be the value currently shown
+   * in the text field depending on whether or not the formatter commits on
+   * valid edits and allows invalid input to be temporarily displayed.
    * @return the last committed valid value
    */
   public Object getValue()
@@ -482,7 +482,7 @@ public class JFormattedTextField extends JTextField
 
   /**
    * This method is used to provide feedback to the user when an invalid value
-   * is input during editing.   
+   * is input during editing.
    */
   protected void invalidEdit()
   {
@@ -500,10 +500,10 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * Processes focus events.  This is overridden because we may want to 
-   * change the formatted depending on whether or not this field has 
+   * Processes focus events.  This is overridden because we may want to
+   * change the formatted depending on whether or not this field has
    * focus.
-   * 
+   *
    * @param evt the FocusEvent
    */
   protected void processFocusEvent(FocusEvent evt)
@@ -513,11 +513,11 @@ public class JFormattedTextField extends JTextField
     // based on whether or not it has focus.
     setFormatter (formatterFactory.getFormatter(this));
   }
-  
+
   /**
    * Associates this JFormattedTextField with a Document and propagates
    * a PropertyChange event to each listener.
-   * 
+   *
    * @param newDocument the Document to associate with this text field
    */
   public void setDocument(Document newDocument)
@@ -528,26 +528,26 @@ public class JFormattedTextField extends JTextField
 
     if (oldDocument == newDocument)
       return;
-    
+
     super.setDocument(newDocument);
   }
 
   /**
    * Sets the behaviour of this JFormattedTextField upon losing focus.
-   * This must be COMMIT, COMMIT_OR_REVERT, 
-   * PERSIST, or REVERT or an 
+   * This must be COMMIT, COMMIT_OR_REVERT,
+   * PERSIST, or REVERT or an
    * IllegalArgumentException will be thrown.
-   * 
+   *
    * @param behavior
-   * @throws IllegalArgumentException if behaviour is not 
+   * @throws IllegalArgumentException if behaviour is not
    * one of the above
    */
   public void setFocusLostBehavior(int behavior)
   {
     if (behavior != COMMIT
-	&& behavior != COMMIT_OR_REVERT
-	&& behavior != PERSIST
-	&& behavior != REVERT)
+        && behavior != COMMIT_OR_REVERT
+        && behavior != PERSIST
+        && behavior != REVERT)
       throw new IllegalArgumentException("invalid behavior");
 
     this.focusLostBehavior = behavior;
@@ -556,22 +556,22 @@ public class JFormattedTextField extends JTextField
   /**
    * Sets the formatter for this JFormattedTextField.  Normally the formatter
    * factory will take care of this, or calls to setValue will also make sure
-   * that the formatter is set appropriately.  
-   * 
+   * that the formatter is set appropriately.
+   *
    * @param formatter the AbstractFormatter to use for formatting the value for
    * this JFormattedTextField
    */
   protected void setFormatter(AbstractFormatter formatter)
   {
     AbstractFormatter oldFormatter = null;
-    
+
     oldFormatter = this.formatter;
 
     if (oldFormatter != null)
       oldFormatter.uninstall();
-    
+
     this.formatter = formatter;
-    
+
     if (formatter != null)
       formatter.install(this);
 
@@ -579,9 +579,9 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * Sets the factory from which this JFormattedTextField should obtain 
-   * its formatters.  
-   * 
+   * Sets the factory from which this JFormattedTextField should obtain
+   * its formatters.
+   *
    * @param factory the AbstractFormatterFactory that will be used to generate
    * formatters for this JFormattedTextField
    */
@@ -589,11 +589,11 @@ public class JFormattedTextField extends JTextField
   {
     if (formatterFactory == factory)
       return;
-    
+
     AbstractFormatterFactory oldFactory = formatterFactory;
     formatterFactory = factory;
     firePropertyChange("formatterFactory", oldFactory, factory);
-    
+
     // Now set the formatter according to our new factory.
     if (formatterFactory != null)
       setFormatter(formatterFactory.getFormatter(this));
@@ -603,7 +603,7 @@ public class JFormattedTextField extends JTextField
 
   /**
    * Sets the value that will be formatted and displayed.
-   *   
+   *
    * @param newValue the value to be formatted and displayed
    */
   public void setValue(Object newValue)
@@ -613,11 +613,11 @@ public class JFormattedTextField extends JTextField
 
     Object oldValue = value;
     value = newValue;
-    
+
     // If there is no formatterFactory then make one.
     if (formatterFactory == null)
       setFormatterFactory(createFormatterFactory(newValue));
-    
+
     // Set the formatter appropriately.  This is because there may be a new
     // formatterFactory from the line above, or we may want a new formatter
     // depending on the type of newValue (or if newValue is null).
@@ -626,7 +626,7 @@ public class JFormattedTextField extends JTextField
   }
 
   /**
-   * A helper method that attempts to create a formatter factory that is 
+   * A helper method that attempts to create a formatter factory that is
    * suitable to format objects of the type like value.
    *
    * @param value an object which should be formatted by the formatter factory.
@@ -642,7 +642,7 @@ public class JFormattedTextField extends JTextField
     else if (value instanceof Number)
       formatter = new NumberFormatter();
     else
-      formatter = new DefaultFormatter();        
+      formatter = new DefaultFormatter();
     return new DefaultFormatterFactory(formatter);
   }
 }
diff --git a/libjava/classpath/javax/swing/JFrame.java b/libjava/classpath/javax/swing/JFrame.java
index 0c956b3969e..074d1c7d3d0 100644
--- a/libjava/classpath/javax/swing/JFrame.java
+++ b/libjava/classpath/javax/swing/JFrame.java
@@ -64,7 +64,7 @@ import javax.accessibility.AccessibleContext;
  *
  * Also, unlike java.awt.Frames, JFrames support the
  * Swing Pluggable Look & Feel architecture.
- * 
+ *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
 public class JFrame extends Frame
@@ -100,7 +100,7 @@ public class JFrame extends Frame
   private int closeAction = HIDE_ON_CLOSE;
   protected AccessibleContext accessibleContext;
   protected JRootPane rootPane;
-  
+
   /**
    * @specnote rootPaneCheckingEnabled is false to comply with J2SE 5.0
    */
@@ -117,7 +117,7 @@ public class JFrame extends Frame
 
   /**
    * Creates a new JFrame with the specified title.
-   * 
+   *
    * @param title  the frame title (null permitted).
    */
   public JFrame(String title)
@@ -307,7 +307,7 @@ public class JFrame extends Frame
   }
 
   /**
-   * Returns the object that provides accessibility features for this 
+   * Returns the object that provides accessibility features for this
    * JFrame.
    *
    * @return The accessible context (an instance of {@link AccessibleJFrame}).
@@ -322,11 +322,11 @@ public class JFrame extends Frame
   /**
    * Returns a code for the default operation when the frame is closed.  The
    * default value is {@link WindowConstants#HIDE_ON_CLOSE}.
-   * 
+   *
    * @return One of: {@link WindowConstants#DO_NOTHING_ON_CLOSE},
-   *     {@link WindowConstants#HIDE_ON_CLOSE}, 
+   *     {@link WindowConstants#HIDE_ON_CLOSE},
    *     {@link WindowConstants#DISPOSE_ON_CLOSE}, {@link #EXIT_ON_CLOSE}.
-   * 
+   *
    * @see #setDefaultCloseOperation(int)
    */
   public int getDefaultCloseOperation()
@@ -336,9 +336,9 @@ public class JFrame extends Frame
 
   /**
    * Returns a string describing the attributes for the JFrame,
-   * for use in debugging.  The return value is guaranteed to be 
+   * for use in debugging.  The return value is guaranteed to be
    * non-null, but the format may vary between implementations.
-   * 
+   *
    * @return A string describing the attributes of the JFrame.
    */
   protected String paramString()
@@ -360,38 +360,38 @@ public class JFrame extends Frame
     if (e.getID() == WindowEvent.WINDOW_CLOSING)
       {
         switch (closeAction)
-	  {
-	  case EXIT_ON_CLOSE:
-	    System.exit(0);
-	    break;
-	  case DISPOSE_ON_CLOSE:
-	    dispose();
-	    break;
-	  case HIDE_ON_CLOSE:
-	    setVisible(false);
-	    break;
-	  case DO_NOTHING_ON_CLOSE:
-	    break;
-	  }
+          {
+          case EXIT_ON_CLOSE:
+            System.exit(0);
+            break;
+          case DISPOSE_ON_CLOSE:
+            dispose();
+            break;
+          case HIDE_ON_CLOSE:
+            setVisible(false);
+            break;
+          case DO_NOTHING_ON_CLOSE:
+            break;
+          }
       }
   }
 
   /**
    * Sets the default operation that is performed when this frame is closed.
-   * The default is HIDE_ON_CLOSE.  When 
+   * The default is HIDE_ON_CLOSE.  When
    * EXIT_ON_CLOSE is specified this method calls
    * SecurityManager.checkExit(0) which might throw a
    * SecurityException.
-   * 
-   * @param operation  a code for the operation (one of: 
-   *     {@link WindowConstants#DO_NOTHING_ON_CLOSE}, 
-   *     {@link WindowConstants#HIDE_ON_CLOSE}, 
-   *     {@link WindowConstants#DISPOSE_ON_CLOSE} and 
+   *
+   * @param operation  a code for the operation (one of:
+   *     {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+   *     {@link WindowConstants#HIDE_ON_CLOSE},
+   *     {@link WindowConstants#DISPOSE_ON_CLOSE} and
    *     {@link WindowConstants#EXIT_ON_CLOSE}).
-   * 
+   *
    * @throws IllegalArgumentException if operation is not one of
    *     the specified codes.
-   * 
+   *
    * @see #getDefaultCloseOperation()
    */
   public void setDefaultCloseOperation(int operation)
@@ -402,7 +402,7 @@ public class JFrame extends Frame
 
     if (operation != EXIT_ON_CLOSE && operation != DISPOSE_ON_CLOSE
         && operation != HIDE_ON_CLOSE && operation != DO_NOTHING_ON_CLOSE)
-      throw new IllegalArgumentException("operation must be EXIT_ON_CLOSE, " 
+      throw new IllegalArgumentException("operation must be EXIT_ON_CLOSE, "
           + "HIDE_ON_CLOSE, DISPOSE_ON_CLOSE, or DO_NOTHING_ON_CLOSE");
 
     closeAction = operation;
diff --git a/libjava/classpath/javax/swing/JInternalFrame.java b/libjava/classpath/javax/swing/JInternalFrame.java
index ff3ae1faa66..511bc6ed4ad 100644
--- a/libjava/classpath/javax/swing/JInternalFrame.java
+++ b/libjava/classpath/javax/swing/JInternalFrame.java
@@ -101,7 +101,7 @@ public class JInternalFrame extends JComponent implements Accessible,
     }
 
     /**
-     * Returns the accessible role for the JInternalFrame 
+     * Returns the accessible role for the JInternalFrame
      * component.
      *
      * @return {@link AccessibleRole#INTERNAL_FRAME}.
@@ -112,8 +112,8 @@ public class JInternalFrame extends JComponent implements Accessible,
     }
 
     /**
-     * Returns an object that provides access to the current, minimum and 
-     * maximum values for the {@link JInternalFrame}.  Since this class 
+     * Returns an object that provides access to the current, minimum and
+     * maximum values for the {@link JInternalFrame}.  Since this class
      * implements {@link AccessibleValue}, it returns itself.
      *
      * @return The accessible value.
@@ -124,7 +124,7 @@ public class JInternalFrame extends JComponent implements Accessible,
     }
 
     /**
-     * Returns the current layer for the {@link JInternalFrame} component, 
+     * Returns the current layer for the {@link JInternalFrame} component,
      * as an {@link Integer}.
      *
      * @return The layer for the {@link JInternalFrame} component.
@@ -194,7 +194,7 @@ public class JInternalFrame extends JComponent implements Accessible,
       }
 
       /**
-       * Returns the accessible role for the JDesktopIcon 
+       * Returns the accessible role for the JDesktopIcon
        * component.
        *
        * @return {@link AccessibleRole#DESKTOP_ICON}.
@@ -205,8 +205,8 @@ public class JInternalFrame extends JComponent implements Accessible,
       }
 
       /**
-       * Returns an object that provides access to the current, minimum and 
-       * maximum values for the {@link JDesktopIcon}.  Since this class 
+       * Returns an object that provides access to the current, minimum and
+       * maximum values for the {@link JDesktopIcon}.  Since this class
        * implements {@link AccessibleValue}, it returns itself.
        *
        * @return The accessible value.
@@ -248,10 +248,10 @@ public class JInternalFrame extends JComponent implements Accessible,
       }
 
       /**
-       * Sets the layer for the internal frame represented by this 
+       * Sets the layer for the internal frame represented by this
        * JDesktopIcon component.
        *
-       * @param n  the layer (see the constants defined in 
+       * @param n  the layer (see the constants defined in
        *           {@link JLayeredPane}).
        *
        * @return true if the value is set, and false
@@ -286,7 +286,7 @@ public class JInternalFrame extends JComponent implements Accessible,
    * Returns the object that provides accessibility features for this
    * JDesktopIcon component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *         {@link AccessibleJDesktopIcon}).
    */
     public AccessibleContext getAccessibleContext()
@@ -496,8 +496,8 @@ public class JInternalFrame extends JComponent implements Accessible,
   private transient boolean wasIcon = false;
 
   /**
-   * Creates a new JInternalFrame object that has an empty string for its 
-   * title, and is non-resizable, non-maximizable, non-iconifiable, and 
+   * Creates a new JInternalFrame object that has an empty string for its
+   * title, and is non-resizable, non-maximizable, non-iconifiable, and
    * non-closable.
    */
   public JInternalFrame()
@@ -672,11 +672,11 @@ public class JInternalFrame extends JComponent implements Accessible,
     switch (getDefaultCloseOperation())
       {
       case HIDE_ON_CLOSE:
-	    setVisible(false);
-	    break;
+            setVisible(false);
+            break;
       case DISPOSE_ON_CLOSE:
-	    dispose();
-	    break;
+            dispose();
+            break;
       }
   }
 
@@ -692,59 +692,59 @@ public class JInternalFrame extends JComponent implements Accessible,
     switch (id)
       {
       case InternalFrameEvent.INTERNAL_FRAME_CLOSING:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1])
-	      .internalFrameClosing(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1])
+              .internalFrameClosing(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_ACTIVATED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1])
-	      .internalFrameActivated(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1])
+              .internalFrameActivated(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_CLOSED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1]).internalFrameClosed(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1]).internalFrameClosed(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_DEACTIVATED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1])
-	      .internalFrameDeactivated(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1])
+              .internalFrameDeactivated(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1])
-	      .internalFrameDeiconified(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1])
+              .internalFrameDeiconified(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_ICONIFIED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1])
-	      .internalFrameIconified(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1])
+              .internalFrameIconified(evt);
+          }
+        break;
       case InternalFrameEvent.INTERNAL_FRAME_OPENED:
-	for (int i = ifListeners.length - 2; i >= 0; i -= 2)
-	  {
-	    if (ifListeners[i] == InternalFrameListener.class)
-	      ((InternalFrameListener) ifListeners[i + 1]).internalFrameOpened(evt);
-	  }
-	break;
+        for (int i = ifListeners.length - 2; i >= 0; i -= 2)
+          {
+            if (ifListeners[i] == InternalFrameListener.class)
+              ((InternalFrameListener) ifListeners[i + 1]).internalFrameOpened(evt);
+          }
+        break;
       }
   }
 
@@ -752,7 +752,7 @@ public class JInternalFrame extends JComponent implements Accessible,
    * Returns the object that provides accessibility features for this
    * JInternalFrame component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJInternalFrame}).
    */
   public AccessibleContext getAccessibleContext()
@@ -773,14 +773,14 @@ public class JInternalFrame extends JComponent implements Accessible,
   }
 
   /**
-   * Returns a code for the default action taken when this 
+   * Returns a code for the default action taken when this
    * JInternalFrame is closed.
    *
-   * @return The action code (usually one of 
-   *     {@link WindowConstants#DO_NOTHING_ON_CLOSE}, 
-   *     {@link WindowConstants#HIDE_ON_CLOSE}, or 
+   * @return The action code (usually one of
+   *     {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+   *     {@link WindowConstants#HIDE_ON_CLOSE}, or
    *     {@link WindowConstants#DISPOSE_ON_CLOSE}).
-   * 
+   *
    * @see #setDefaultCloseOperation(int)
    * @see #doDefaultCloseAction()
    */
@@ -790,7 +790,7 @@ public class JInternalFrame extends JComponent implements Accessible,
   }
 
   /**
-   * Returns the JDesktopIcon that represents this 
+   * Returns the JDesktopIcon that represents this
    * JInternalFrame while it is iconified.
    *
    * @return The desktop icon component.
@@ -840,12 +840,12 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (isSelected())
       {
-	Component focus = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-	if (SwingUtilities.isDescendingFrom(focus, this))
-	  {
-	    defaultFocus = focus;
-	    return focus;
-	  }
+        Component focus = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+        if (SwingUtilities.isDescendingFrom(focus, this))
+          {
+            defaultFocus = focus;
+            return focus;
+          }
       }
     return null;
   }
@@ -975,7 +975,7 @@ public class JInternalFrame extends JComponent implements Accessible,
    * Returns the frame's title.
    *
    * @return The frame's title (can be null).
-   * 
+   *
    * @see #setTitle(String)
    */
   public String getTitle()
@@ -1161,14 +1161,14 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     try
       {
-	if (isIcon())
-	  setIcon(false);
-	else if (isMaximum())
-	  setMaximum(false);
+        if (isIcon())
+          setIcon(false);
+        else if (isMaximum())
+          setMaximum(false);
       }
     catch (PropertyVetoException e)
       {
-	// Do nothing if they don't want to be restored first.
+        // Do nothing if they don't want to be restored first.
       }
     setSize(getPreferredSize());
     validate();
@@ -1186,10 +1186,10 @@ public class JInternalFrame extends JComponent implements Accessible,
   }
 
   /**
-   * An implementation dependent string describing the current state of this 
+   * An implementation dependent string describing the current state of this
    * JInternalFrame instance.
    *
-   * @return A string describing the current state of this 
+   * @return A string describing the current state of this
    *     JInternalFrame instance.
    */
   protected String paramString()
@@ -1300,22 +1300,22 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (c != getContentPane())
       {
-	Container old = getContentPane();
-	getRootPane().setContentPane(c);
-	firePropertyChange(CONTENT_PANE_PROPERTY, old, c);
+        Container old = getContentPane();
+        getRootPane().setContentPane(c);
+        firePropertyChange(CONTENT_PANE_PROPERTY, old, c);
       }
   }
 
   /**
-   * Sets a code for the action to be taken when this 
-   * JInternalFrame is closed.  Note that no validation is 
-   * performed on the operation code, any integer will be 
+   * Sets a code for the action to be taken when this
+   * JInternalFrame is closed.  Note that no validation is
+   * performed on the operation code, any integer will be
    * accepted (nevertheless, you should pass in one of the listed values).
    *
-   * @param operation  one of {@link WindowConstants#DO_NOTHING_ON_CLOSE}, 
-   *   {@link WindowConstants#HIDE_ON_CLOSE} or 
+   * @param operation  one of {@link WindowConstants#DO_NOTHING_ON_CLOSE},
+   *   {@link WindowConstants#HIDE_ON_CLOSE} or
    *   {@link WindowConstants#DISPOSE_ON_CLOSE}.
-   *   
+   *
    * @see #getDefaultCloseOperation()
    * @see #doDefaultCloseAction()
    */
@@ -1329,14 +1329,14 @@ public class JInternalFrame extends JComponent implements Accessible,
   }
 
   /**
-   * Sets the JDesktopIcon instance that represents this 
+   * Sets the JDesktopIcon instance that represents this
    * JInternalFrame while it is iconified and, if the new icon is
-   * not the same instance as the existing icon, sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * not the same instance as the existing icon, sends a
+   * {@link PropertyChangeEvent} (with the property name
    * "desktopIcon") to all registered listeners..
    *
    * @param d  the icon.
-   * 
+   *
    * @see #getDesktopIcon()
    */
   public void setDesktopIcon(JDesktopIcon d)
@@ -1374,9 +1374,9 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (icon != frameIcon)
       {
-	Icon old = frameIcon;
-	frameIcon = icon;
-	firePropertyChange(FRAME_ICON_PROPERTY, old, frameIcon);
+        Icon old = frameIcon;
+        frameIcon = icon;
+        firePropertyChange(FRAME_ICON_PROPERTY, old, frameIcon);
       }
   }
 
@@ -1389,9 +1389,9 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (glass != getGlassPane())
       {
-	Component old = getGlassPane();
-	getRootPane().setGlassPane(glass);
-	firePropertyChange(GLASS_PANE_PROPERTY, old, glass);
+        Component old = getGlassPane();
+        getRootPane().setGlassPane(glass);
+        firePropertyChange(GLASS_PANE_PROPERTY, old, glass);
       }
   }
 
@@ -1409,15 +1409,15 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (b != isIcon())
       {
-	fireVetoableChange(IS_ICON_PROPERTY, b, isIcon);
+        fireVetoableChange(IS_ICON_PROPERTY, b, isIcon);
 
-	isIcon = b;
+        isIcon = b;
 
-	firePropertyChange(IS_ICON_PROPERTY, ! isIcon, isIcon);
-	if (b)
-	  fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_ICONIFIED);
-	else
-	  fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED);
+        firePropertyChange(IS_ICON_PROPERTY, ! isIcon, isIcon);
+        if (b)
+          fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_ICONIFIED);
+        else
+          fireInternalFrameEvent(InternalFrameEvent.INTERNAL_FRAME_DEICONIFIED);
       }
   }
 
@@ -1496,9 +1496,9 @@ public class JInternalFrame extends JComponent implements Accessible,
 
     if (layered != getLayeredPane())
       {
-	JLayeredPane old = getLayeredPane();
-	getRootPane().setLayeredPane(layered);
-	firePropertyChange(LAYERED_PANE_PROPERTY, old, layered);
+        JLayeredPane old = getLayeredPane();
+        getRootPane().setLayeredPane(layered);
+        firePropertyChange(LAYERED_PANE_PROPERTY, old, layered);
       }
   }
 
@@ -1549,9 +1549,9 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (b != isMaximum)
       {
-	fireVetoableChange(IS_MAXIMUM_PROPERTY, isMaximum, b);
-	isMaximum = b;
-	firePropertyChange(IS_MAXIMUM_PROPERTY, ! isMaximum, isMaximum);
+        fireVetoableChange(IS_MAXIMUM_PROPERTY, isMaximum, b);
+        isMaximum = b;
+        firePropertyChange(IS_MAXIMUM_PROPERTY, ! isMaximum, isMaximum);
       }
   }
 
@@ -1673,12 +1673,12 @@ public class JInternalFrame extends JComponent implements Accessible,
   }
 
   /**
-   * Sets the title for the JInternalFrame and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * Sets the title for the JInternalFrame and sends a
+   * {@link PropertyChangeEvent} (with the property name
    * {@link #TITLE_PROPERTY}) to all registered listeners.
    *
    * @param title  the new title (null permitted).
-   * 
+   *
    * @see #getTitle()
    */
   public void setTitle(String title)
@@ -1767,7 +1767,7 @@ public class JInternalFrame extends JComponent implements Accessible,
     // We must go into the init stage when updating the UI, so the UI can
     // set layout and components directly on the internal frame, not its
     // content pane.
-	boolean old = isRootPaneCheckingEnabled();
+        boolean old = isRootPaneCheckingEnabled();
     setRootPaneCheckingEnabled(false);
     setUI((InternalFrameUI) UIManager.getUI(this));
     setRootPaneCheckingEnabled(old);
@@ -1785,8 +1785,8 @@ public class JInternalFrame extends JComponent implements Accessible,
   {
     if (b && ! wasIcon)
       {
-	wasIcon = b;
-	firePropertyChange(ID, ! b, b);
+        wasIcon = b;
+        firePropertyChange(ID, ! b, b);
       }
   }
 
diff --git a/libjava/classpath/javax/swing/JLabel.java b/libjava/classpath/javax/swing/JLabel.java
index 2bbd1ee5f8c..72354c56e87 100644
--- a/libjava/classpath/javax/swing/JLabel.java
+++ b/libjava/classpath/javax/swing/JLabel.java
@@ -78,10 +78,10 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
     extends JComponent.AccessibleJComponent
     implements AccessibleText, AccessibleExtendedComponent
   {
-    
+
     /**
      * Returns the accessible name.
-     * 
+     *
      * @return The accessible name.
      */
     public String getAccessibleName()
@@ -93,7 +93,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
       else
         return super.getAccessibleName();
     }
-    
+
     /**
      * Returns the accessible role for the JLabel component.
      *
@@ -103,7 +103,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
     {
       return AccessibleRole.LABEL;
     }
-    
+
     /**
      * Returns the selected text. This is null since JLabels
      * are not selectable.
@@ -456,7 +456,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Creates a new horizontally leading and vertically centered JLabel 
+   * Creates a new horizontally leading and vertically centered JLabel
    * object with no icon and the given text.
    *
    * @param text The text to use with the label, null permitted.
@@ -492,13 +492,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    */
   public JLabel(String text, Icon icon, int horizontalAlignment)
   {
-    if (horizontalAlignment != SwingConstants.LEFT  
-        && horizontalAlignment != SwingConstants.RIGHT 
-        && horizontalAlignment != SwingConstants.CENTER 
-        && horizontalAlignment != SwingConstants.LEADING 
+    if (horizontalAlignment != SwingConstants.LEFT
+        && horizontalAlignment != SwingConstants.RIGHT
+        && horizontalAlignment != SwingConstants.CENTER
+        && horizontalAlignment != SwingConstants.LEADING
         && horizontalAlignment != SwingConstants.TRAILING)
       throw new IllegalArgumentException();
-    
+
     this.text = text;
     this.icon = icon;
     this.horizontalAlignment = horizontalAlignment;
@@ -528,7 +528,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Resets the label's UI delegate to the default UI for the current look and 
+   * Resets the label's UI delegate to the default UI for the current look and
    * feel.
    */
   public void updateUI()
@@ -549,7 +549,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Returns a string describing the attributes for the JLabel
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
@@ -590,7 +590,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * Returns the text displayed by the label.
    *
    * @return The label text (possibly null).
-   * 
+   *
    * @see #setText(String)
    */
   public String getText()
@@ -600,11 +600,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the text for the label and sends a {@link PropertyChangeEvent} (with
-   * the name 'text') to all registered listeners.  This method will also 
+   * the name 'text') to all registered listeners.  This method will also
    * update the displayedMnemonicIndex, if necessary.
    *
    * @param newText The text (null permitted).
-   * 
+   *
    * @see #getText()
    * @see #getDisplayedMnemonicIndex()
    */
@@ -628,11 +628,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Returns the active icon. The active icon is painted when the label is 
+   * Returns the active icon. The active icon is painted when the label is
    * enabled.
    *
    * @return The active icon.
-   * 
+   *
    * @see #setIcon(Icon)
    * @see #getDisabledIcon()
    */
@@ -642,11 +642,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Sets the icon for the label (this is a bound property with the name 
+   * Sets the icon for the label (this is a bound property with the name
    * 'icon'). This icon will be displayed when the label is enabled.
    *
    * @param newIcon The icon (null permitted).
-   * 
+   *
    * @see #getIcon()
    * @see #setDisabledIcon(Icon)
    */
@@ -662,13 +662,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Returns the disabled icon. The disabled icon is painted when the label is 
+   * Returns the disabled icon. The disabled icon is painted when the label is
    * disabled. If the disabled icon is null and the active icon
-   * is an {@link ImageIcon}, this method returns a grayed version of the icon. 
+   * is an {@link ImageIcon}, this method returns a grayed version of the icon.
    * The grayed version of the icon becomes the disabledIcon.
    *
    * @return The disabled icon.
-   * 
+   *
    * @see #setDisabledIcon(Icon)
    */
   public Icon getDisabledIcon()
@@ -685,7 +685,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * property with the name 'disabledIcon').
    *
    * @param newIcon The disabled icon (null permitted).
-   * 
+   *
    * @see #getDisabledIcon()
    */
   public void setDisabledIcon(Icon newIcon)
@@ -700,12 +700,12 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the keycode that will be the label's mnemonic (this is a bound
-   * property with the name 'displayedMnemonic').  If the label is used as a 
-   * label for another component, the label will give focus to that component 
+   * property with the name 'displayedMnemonic').  If the label is used as a
+   * label for another component, the label will give focus to that component
    * when the mnemonic is activated.
    *
    * @param mnemonic The keycode to use for the mnemonic.
-   * 
+   *
    * @see #getDisplayedMnemonic()
    */
   public void setDisplayedMnemonic(int mnemonic)
@@ -727,7 +727,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    *
    * @param mnemonic The character to use for the mnemonic (this will be
    *     converted to the equivalent upper case character).
-   *     
+   *
    * @see #getDisplayedMnemonic()
    */
   public void setDisplayedMnemonic(char mnemonic)
@@ -739,7 +739,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * Returns the keycode that is used for the label's mnemonic.
    *
    * @return The keycode that is used for the label's mnemonic.
-   * 
+   *
    * @see #setDisplayedMnemonic(int)
    */
   public int getDisplayedMnemonic()
@@ -755,7 +755,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * character 'n', you might wish to underline the second occurrence of 'n'
    * rather than the first (which is the default).
    * 

                            
-   * Note that this method does not validate the character at the specified 
+   * Note that this method does not validate the character at the specified
    * index to ensure that it matches the key code returned by
    * {@link #getDisplayedMnemonic()}.
    *
@@ -763,7 +763,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    *
    * @throws IllegalArgumentException If index less than -1 or index is greater
    *         than or equal to the label length.
-   *         
+   *
    * @see #getDisplayedMnemonicIndex()
    * @since 1.4
    */
@@ -790,7 +790,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * character is to be underlined.
    *
    * @return The index of the character that will be underlined.
-   * 
+   *
    * @see #setDisplayedMnemonicIndex(int)
    * @since 1.4
    */
@@ -800,9 +800,9 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Checks the specified key to ensure that it is valid as a horizontal 
+   * Checks the specified key to ensure that it is valid as a horizontal
    * alignment, throwing an {@link IllegalArgumentException} if the key is
-   * invalid.  Valid keys are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, 
+   * invalid.  Valid keys are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
    * {@link #LEADING} and {@link #TRAILING}.
    *
    * @param key The key to check.
@@ -823,7 +823,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Checks the specified key to ensure that it is valid as a vertical 
+   * Checks the specified key to ensure that it is valid as a vertical
    * alignment, throwing an {@link IllegalArgumentException} if the key is
    * invalid.  Valid keys are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
    *
@@ -847,7 +847,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * Returns the gap between the icon and the text.
    *
    * @return The gap between the icon and the text.
-   * 
+   *
    * @see #setIconTextGap(int)
    */
   public int getIconTextGap()
@@ -856,19 +856,19 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Sets the gap between the icon and the text, in the case that both are 
-   * visible (this is a bound property with the name 'iconTextGap'). 
+   * Sets the gap between the icon and the text, in the case that both are
+   * visible (this is a bound property with the name 'iconTextGap').
    *
    * @param newGap The gap (in pixels).
-   * 
+   *
    * @see #getIconTextGap()
    */
   public void setIconTextGap(int newGap)
   {
     if (iconTextGap != newGap)
       {
-	firePropertyChange("iconTextGap", iconTextGap, newGap);
-	iconTextGap = newGap;
+        firePropertyChange("iconTextGap", iconTextGap, newGap);
+        iconTextGap = newGap;
       }
   }
 
@@ -878,7 +878,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
    * depends on the installed look and feel, but is usually {@link #CENTER}.
    *
    * @return The vertical alignment.
-   * 
+   *
    * @see #setVerticalAlignment(int)
    */
   public int getVerticalAlignment()
@@ -888,16 +888,16 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the vertical alignment for the label (this is a bound property with
-   * the name 'verticalAlignment').  The vertical alignment determines where 
-   * the label (icon and text) will be placed vertically within the component 
-   * bounds.  Valid alignment codes are {@link #TOP}, {@link #CENTER} and 
+   * the name 'verticalAlignment').  The vertical alignment determines where
+   * the label (icon and text) will be placed vertically within the component
+   * bounds.  Valid alignment codes are {@link #TOP}, {@link #CENTER} and
    * {@link #BOTTOM}.
    *
    * @param alignment The vertical alignment of the label.
-   * 
-   * @throws IllegalArgumentException if alignment is not one of 
+   *
+   * @throws IllegalArgumentException if alignment is not one of
    *     the specified values.
-   *     
+   *
    * @see #getVerticalAlignment()
    */
   public void setVerticalAlignment(int alignment)
@@ -911,13 +911,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Returns the horizontal alignment of the label (one of {@link #LEFT}, 
+   * Returns the horizontal alignment of the label (one of {@link #LEFT},
    * {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}).
-   * The default value depends on the installed look and feel, but is usually 
+   * The default value depends on the installed look and feel, but is usually
    * {@link #LEFT}.
    *
    * @return The horizontal alignment.
-   * 
+   *
    * @see #setHorizontalAlignment(int)
    */
   public int getHorizontalAlignment()
@@ -927,23 +927,23 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the horizontal alignment for the label (this is a bound property with
-   * the name 'horizontalAlignment').  The horizontal alignment determines where 
-   * the label (icon and text) will be placed horizontally within the 
-   * component bounds.  Valid alignment codes are {@link #LEFT}, 
+   * the name 'horizontalAlignment').  The horizontal alignment determines where
+   * the label (icon and text) will be placed horizontally within the
+   * component bounds.  Valid alignment codes are {@link #LEFT},
    * {@link #CENTER}, {@link #RIGHT}, {@link #LEADING} and {@link #TRAILING}.
    *
    * @param alignment The horizontal alignment of the label.
-   * 
-   * @throws IllegalArgumentException if alignment is not one of 
+   *
+   * @throws IllegalArgumentException if alignment is not one of
    *     the specified values.
-   *     
+   *
    * @see #getHorizontalAlignment()
    */
   public void setHorizontalAlignment(int alignment)
   {
     if (horizontalAlignment == alignment)
       return;
-    
+
     int oldAlignment = horizontalAlignment;
     horizontalAlignment = checkHorizontalKey(alignment, "horizontalAlignment");
     firePropertyChange("horizontalAlignment", oldAlignment,
@@ -951,11 +951,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   }
 
   /**
-   * Returns the vertical position of the label's text relative to the icon. 
+   * Returns the vertical position of the label's text relative to the icon.
    * This will be one of {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
-   * 
+   *
    * @return The vertical position of the label's text relative to the icon.
-   * 
+   *
    * @see #setVerticalTextPosition(int)
    */
   public int getVerticalTextPosition()
@@ -965,11 +965,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the vertical position of the label's text relative to the icon (this
-   * is a bound property with the name 'verticalTextPosition').  Valid 
+   * is a bound property with the name 'verticalTextPosition').  Valid
    * positions are {@link #TOP}, {@link #CENTER} and {@link #BOTTOM}.
    *
    * @param textPosition The vertical text position.
-   * 
+   *
    * @throws IllegalArgumentException if textPosition is not one
    *     of the specified values.
    */
@@ -979,19 +979,19 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
       {
         int oldPos = verticalTextPosition;
         verticalTextPosition = checkVerticalKey(textPosition,
-	                                            "verticalTextPosition");
-        firePropertyChange("verticalTextPosition", oldPos, 
+                                                    "verticalTextPosition");
+        firePropertyChange("verticalTextPosition", oldPos,
                            verticalTextPosition);
       }
   }
 
   /**
-   * Returns the horizontal position of the label's text relative to the icon. 
-   * This will be one of {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, 
+   * Returns the horizontal position of the label's text relative to the icon.
+   * This will be one of {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
    * {@link #LEADING} and {@link #TRAILING}.
-   * 
+   *
    * @return The horizontal position of the label's text relative to the icon.
-   * 
+   *
    * @see #setHorizontalTextPosition(int)
    */
   public int getHorizontalTextPosition()
@@ -1001,12 +1001,12 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Sets the horizontal position of the label's text relative to the icon (this
-   * is a bound property with the name 'horizontalTextPosition').  Valid 
-   * positions are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, 
+   * is a bound property with the name 'horizontalTextPosition').  Valid
+   * positions are {@link #LEFT}, {@link #CENTER}, {@link #RIGHT},
    * {@link #LEADING} and {@link #TRAILING}.
    *
    * @param textPosition The horizontal text position.
-   * 
+   *
    * @throws IllegalArgumentException if textPosition is not one
    *     of the specified values.
    */
@@ -1017,13 +1017,13 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
         int oldPos = horizontalTextPosition;
         horizontalTextPosition = checkHorizontalKey(textPosition,
                                                     "horizontalTextPosition");
-        firePropertyChange("horizontalTextPosition", oldPos, 
+        firePropertyChange("horizontalTextPosition", oldPos,
                            horizontalTextPosition);
       }
   }
 
   /**
-   * Returns false if the current icon image (current icon will depend on 
+   * Returns false if the current icon image (current icon will depend on
    * whether the label is enabled) is not equal to the passed in image.
    *
    * @param img The image to check.
@@ -1050,7 +1050,7 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
 
   /**
    * Returns the component that this JLabel is providing the label
-   * for.  This component will typically receive the focus when the label's 
+   * for.  This component will typically receive the focus when the label's
    * mnemonic key is activated via the keyboard.
    *
    * @return The component (possibly null).
@@ -1063,11 +1063,11 @@ public class JLabel extends JComponent implements Accessible, SwingConstants
   /**
    * Sets the component that this JLabel is providing the label
    * for (this is a bound property with the name 'labelFor').  This component
-   * will typically receive the focus when the label's mnemonic key is 
+   * will typically receive the focus when the label's mnemonic key is
    * activated via the keyboard.
    *
    * @param c  the component (null permitted).
-   * 
+   *
    * @see #getLabelFor()
    */
   public void setLabelFor(Component c)
diff --git a/libjava/classpath/javax/swing/JLayeredPane.java b/libjava/classpath/javax/swing/JLayeredPane.java
index d981788ec7d..9a4e31efe04 100644
--- a/libjava/classpath/javax/swing/JLayeredPane.java
+++ b/libjava/classpath/javax/swing/JLayeredPane.java
@@ -1,4 +1,4 @@
-/* JLayeredPane.java -- 
+/* JLayeredPane.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -85,7 +85,7 @@ import javax.accessibility.AccessibleRole;
  * 
                            
  *
  * 
                            To change the layer of a component that is already a child of
- * a JLayeredPane, use the {@link #setLayer(Component, int)} 
+ * a JLayeredPane, use the {@link #setLayer(Component, int)}
  * method.
                            
  *
  * 
                            The purpose of this class is to translate this view of "layers" into a
@@ -94,9 +94,9 @@ import javax.accessibility.AccessibleRole;
  *
  * 
                            There is a precise set of words we will use to refer to numbers within
  * this class:
                            
- * 
+ *
  * 
                            
- * 
                            Component Index:
                             
+ * 
                            Component Index:
                            
  * 
                            An offset into the component array held in our ancestor,
  * {@link java.awt.Container}, from [0 .. component.length). The drawing
  * rule with indices is that 0 is drawn last.
                            
@@ -106,7 +106,7 @@ import javax.accessibility.AccessibleRole;
  * numbers are drawn first, then layer 0, then positive numbered layers, in
  * ascending order.
  *
- * 
                            Position:
                             
+ * 
                            Position:
                            
  * 
                            An offset into a layer's "logical drawing order". Layer position 0
  * is drawn last. Layer position -1 is a synonym for the first layer
  * position (the logical "bottom").
                            
@@ -120,7 +120,7 @@ import javax.accessibility.AccessibleRole;
  */
 public class JLayeredPane extends JComponent implements Accessible
 {
-  
+
   /**
    * Provides accessibility support for JLayeredPane.
    */
@@ -136,7 +136,7 @@ public class JLayeredPane extends JComponent implements Accessible
 
     /**
      * Returns the accessble role of JLayeredPane,
-     * {@link AccessibleRole#LAYERED_PANE}. 
+     * {@link AccessibleRole#LAYERED_PANE}.
      */
     public AccessibleRole getAccessibleRole()
     {
@@ -145,7 +145,7 @@ public class JLayeredPane extends JComponent implements Accessible
   }
 
   private static final long serialVersionUID = 5534920399324590459L;
-  
+
   public static final String LAYER_PROPERTY = "layeredContainerLayer";
 
   public static final Integer FRAME_CONTENT_LAYER = new Integer(-30000);
@@ -164,7 +164,7 @@ public class JLayeredPane extends JComponent implements Accessible
     setLayout(null);
   }
 
-  /** 
+  /**
    * Looks up the layer a child component is currently assigned to.
    *
    * If c is an instance of {@link JComponent}, then the layer
@@ -199,7 +199,7 @@ public class JLayeredPane extends JComponent implements Accessible
    * Looks up the layer in the client property with the key
    * {@link #LAYER_PROPERTY} of comp. If no such property can be
    * found, we return 0 ({@link #DEFAULT_LAYER}).
-   * 
+   *
    * @param comp the component for which the layer is looked up
    *
    * @return the layer of comp as stored in the corresponding
@@ -313,7 +313,7 @@ public class JLayeredPane extends JComponent implements Accessible
 
   /**
    * Return the position of a component within its layer. Positions are assigned
-   * from the "front" (position 0) to the "back" (position N-1), and drawn from 
+   * from the "front" (position 0) to the "back" (position N-1), and drawn from
    * the back towards the front.
    *
    * @param c the component to get the position of
@@ -344,7 +344,7 @@ public class JLayeredPane extends JComponent implements Accessible
 
   /**
    * Change the position of a component within its layer. Positions are assigned
-   * from the "front" (position 0) to the "back" (position N-1), and drawn from 
+   * from the "front" (position 0) to the "back" (position N-1), and drawn from
    * the back towards the front.
    *
    * @param c the component to change the position of
@@ -356,7 +356,7 @@ public class JLayeredPane extends JComponent implements Accessible
   {
     setLayer(c, getLayer(c), position);
   }
-    
+
   /**
    * Return an array of all components within a layer of this
    * container. Components are ordered front-to-back, with the "front"
@@ -420,9 +420,9 @@ public class JLayeredPane extends JComponent implements Accessible
    * @param c the component to look up.
    *
    * @return the external index of the component or -1 if
-   *         c is not a child of this layered pane 
+   *         c is not a child of this layered pane
    */
-  public int getIndexOf(Component c) 
+  public int getIndexOf(Component c)
   {
     return getComponentZOrder(c);
   }
@@ -439,28 +439,28 @@ public class JLayeredPane extends JComponent implements Accessible
   protected Integer getObjectForLayer(int layer)
   {
     switch (layer)
-	    {
-	    case -30000:
+            {
+            case -30000:
         return FRAME_CONTENT_LAYER;
 
-	    case 0:
+            case 0:
         return DEFAULT_LAYER;
 
-	    case 100:
+            case 100:
         return PALETTE_LAYER;
 
-	    case 200:
+            case 200:
         return MODAL_LAYER;
 
-	    case 300:
+            case 300:
         return POPUP_LAYER;
 
-	    case 400:
+            case 400:
         return DRAG_LAYER;
 
-	    default:
+            default:
         break;
-	    }
+            }
 
     return new Integer(layer);
   }
@@ -579,8 +579,8 @@ public class JLayeredPane extends JComponent implements Accessible
    */
   public void removeAll()
   {
-	componentToLayer.clear();
-	super.removeAll();
+        componentToLayer.clear();
+        super.removeAll();
   }
 
   /**
@@ -650,7 +650,7 @@ public class JLayeredPane extends JComponent implements Accessible
    *        component to
    * @param index the position within the layer
    */
-  protected void addImpl(Component comp, Object layerConstraint, int index) 
+  protected void addImpl(Component comp, Object layerConstraint, int index)
   {
     int layer;
     if (layerConstraint != null && layerConstraint instanceof Integer)
@@ -726,14 +726,14 @@ public class JLayeredPane extends JComponent implements Accessible
     boolean result = true;
     for (int i = 0; i < numChildren; ++i)
       {
-    	Component c1 = getComponent(i);
-    	if (! c1.isVisible())
+        Component c1 = getComponent(i);
+        if (! c1.isVisible())
           continue;
-    	Rectangle r1 = c1.getBounds();
-    	if (r1.isEmpty())
+        Rectangle r1 = c1.getBounds();
+        if (r1.isEmpty())
           continue;
 
-    	for (int j = i + 1; j < numChildren; ++j)
+        for (int j = i + 1; j < numChildren; ++j)
           {
             Component c2 = getComponent(j);
             if (! c2.isVisible())
diff --git a/libjava/classpath/javax/swing/JList.java b/libjava/classpath/javax/swing/JList.java
index bd744064c39..b12fda3656c 100644
--- a/libjava/classpath/javax/swing/JList.java
+++ b/libjava/classpath/javax/swing/JList.java
@@ -115,7 +115,7 @@ import javax.swing.text.Position;
  * UIClassID                      list     no    
  * valueIsAdjusting               list     no    
  * visibleRowCount                list     no    
- *  
+ * 
  *
  * @author Graydon Hoare (graydon@redhat.com)
  */
@@ -277,7 +277,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
       /**
        * Returns the font metrics for the specified font. This method forwards
-       * to the parent JList. 
+       * to the parent JList.
        *
        * @param font the font for which the font metrics is queried
        *
@@ -539,7 +539,7 @@ public class JList extends JComponent implements Accessible, Scrollable
         // selectable. Is there a way to disable single children?
         if (parent.isEnabled())
           states.add(AccessibleState.SELECTABLE);
- 
+
         if (parent.isSelectedIndex(listIndex))
           states.add(AccessibleState.SELECTED);
 
@@ -613,10 +613,10 @@ public class JList extends JComponent implements Accessible, Scrollable
       {
         // Do nothing here.
       }
-      
+
       // TODO: Implement the remaining methods of this class.
     }
-    
+
     /**
      * Create a new AccessibleJList.
      */
@@ -854,23 +854,23 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   private static final long serialVersionUID = 4406629526391098046L;
 
-  /** 
+  /**
    * Constant value used in "layoutOrientation" property. This value means
-   * that cells are laid out in a single vertical column. This is the default. 
+   * that cells are laid out in a single vertical column. This is the default.
    */
   public static final int VERTICAL = 0;
 
-  /** 
+  /**
    * Constant value used in "layoutOrientation" property. This value means
    * that cells are laid out in multiple columns "newspaper style", filling
-   * vertically first, then horizontally. 
+   * vertically first, then horizontally.
    */
   public static final int VERTICAL_WRAP = 1;
-  
-  /** 
+
+  /**
    * Constant value used in "layoutOrientation" property. This value means
    * that cells are laid out in multiple columns "newspaper style",
-   * filling horizontally first, then vertically. 
+   * filling horizontally first, then vertically.
    */
   public static final int HORIZONTAL_WRAP = 2;
 
@@ -890,7 +890,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * the {@link #prototypeCellValue} property.
    */
   int fixedCellWidth;
-  
+
   /**
    * This property indicates an fixed height to assign to all cells in the
    * list. If its value is -1, no height has been
@@ -899,13 +899,13 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   int fixedCellHeight;
 
-  /** 
+  /**
    * This property holds the current layout orientation of the list, which
    * is one of the integer constants {@link #VERTICAL}, {@link
-   * #VERTICAL_WRAP}, or {@link #HORIZONTAL_WRAP}. 
+   * #VERTICAL_WRAP}, or {@link #HORIZONTAL_WRAP}.
    */
   int layoutOrientation;
-  
+
   /** This property holds the data elements displayed by the list. */
   ListModel model;
 
@@ -923,7 +923,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   Object prototypeCellValue;
 
-  /** 
+  /**
    * This property specifies a foreground color for the selected cells in
    * the list. When {@link ListCellRenderer#getListCellRendererComponent}
    * is called with a selected cell object, the component returned will
@@ -931,7 +931,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   Color selectionBackground;
 
-  /** 
+  /**
    * This property specifies a background color for the selected cells in
    * the list. When {@link ListCellRenderer#getListCellRendererComponent}
    * is called with a selected cell object, the component returned will
@@ -939,14 +939,14 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   Color selectionForeground;
 
-  /** 
+  /**
    * This property holds a description of which data elements in the {@link
    * #model} property should be considered "selected", when displaying and
    * interacting with the list.
    */
   ListSelectionModel selectionModel;
 
-  /** 
+  /**
    * This property indicates a preference for the number of rows
    * displayed in the list, and will scale the
    * {@link #getPreferredScrollableViewportSize} property accordingly. The actual
@@ -956,18 +956,18 @@ public class JList extends JComponent implements Accessible, Scrollable
   int visibleRowCount;
 
   /**
-   * Fire a {@link ListSelectionEvent} to all the registered 
+   * Fire a {@link ListSelectionEvent} to all the registered
    * ListSelectionListeners.
-   * 
+   *
    * @param firstIndex  the lowest index covering the selection change.
    * @param lastIndex  the highest index covering the selection change.
    * @param isAdjusting  a flag indicating if this event is one in a series
    *     of events updating the selection.
    */
-  protected void fireSelectionValueChanged(int firstIndex, int lastIndex, 
-                                           boolean isAdjusting) 
+  protected void fireSelectionValueChanged(int firstIndex, int lastIndex,
+                                           boolean isAdjusting)
   {
-    ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex, 
+    ListSelectionEvent evt = new ListSelectionEvent(this, firstIndex,
                                                     lastIndex, isAdjusting);
     ListSelectionListener listeners[] = getListSelectionListeners();
     for (int i = 0; i < listeners.length; ++i)
@@ -984,7 +984,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * class receives either type of event, it triggers repainting of the
    * list.
    */
-  private class ListListener 
+  private class ListListener
     implements ListSelectionListener, ListDataListener
   {
     // ListDataListener events
@@ -1013,7 +1013,7 @@ public class JList extends JComponent implements Accessible, Scrollable
     }
   }
 
-  /** 
+  /**
    * Shared ListListener instance, subscribed to both the current {@link
    * #model} and {@link #selectionModel} properties of the list.
    */
@@ -1053,8 +1053,8 @@ public class JList extends JComponent implements Accessible, Scrollable
    *
    * @param model  a model containing the list items (null not
    *     permitted).
-   *     
-   * @throws IllegalArgumentException if model is 
+   *
+   * @throws IllegalArgumentException if model is
    *     null.
    */
   public JList(ListModel model)
@@ -1093,7 +1093,7 @@ public class JList extends JComponent implements Accessible, Scrollable
                               (ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
       }
     setLayout(null);
-    
+
     updateUI();
   }
 
@@ -1106,15 +1106,15 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     return new DefaultListSelectionModel();
   }
-  
+
   /**
    * Gets the value of the {@link #fixedCellHeight} property. This property
    * may be -1 to indicate that no cell height has been
    * set. This property is also set implicitly when the
    * {@link #prototypeCellValue} property is set.
    *
-   * @return The current value of the property 
-   * 
+   * @return The current value of the property
+   *
    * @see #fixedCellHeight
    * @see #setFixedCellHeight
    * @see #setPrototypeCellValue
@@ -1132,7 +1132,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * overrides the height computed from {@link #prototypeCellValue}.
    *
    * @param h  the height.
-   * 
+   *
    * @see #getFixedCellHeight
    * @see #getPrototypeCellValue
    */
@@ -1153,8 +1153,8 @@ public class JList extends JComponent implements Accessible, Scrollable
    * set. This property is also set implicitly when the {@link
    * #prototypeCellValue} property is set.
    *
-   * @return The current value of the property 
-   * 
+   * @return The current value of the property
+   *
    * @see #setFixedCellWidth
    * @see #setPrototypeCellValue
    */
@@ -1171,7 +1171,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * overrides the width computed from {@link #prototypeCellValue}.
    *
    * @param w  the width.
-   * 
+   *
    * @see #getFixedCellHeight
    * @see #getPrototypeCellValue
    */
@@ -1179,18 +1179,18 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     if (fixedCellWidth == w)
       return;
-    
+
     int old = fixedCellWidth;
     fixedCellWidth = w;
     firePropertyChange("fixedCellWidth", old, w);
   }
 
-  /** 
-   * Gets the value of the {@link #visibleRowCount} property.  The default 
+  /**
+   * Gets the value of the {@link #visibleRowCount} property.  The default
    * value is 8.
    *
    * @return the current value of the property.
-   * 
+   *
    * @see #setVisibleRowCount(int)
    */
   public int getVisibleRowCount()
@@ -1199,10 +1199,10 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Sets the value of the {@link #visibleRowCount} property. 
+   * Sets the value of the {@link #visibleRowCount} property.
    *
    * @param vc The new property value
-   * 
+   *
    * @see #getVisibleRowCount()
    */
   public void setVisibleRowCount(int vc)
@@ -1245,7 +1245,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Returns an array of all ListSelectionListeners subscribed to this
-   * list. 
+   * list.
    *
    * @return The current subscribed listeners
    *
@@ -1257,20 +1257,20 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Returns the selection mode for the list (one of: 
-   * {@link ListSelectionModel#SINGLE_SELECTION}, 
-   * {@link ListSelectionModel#SINGLE_INTERVAL_SELECTION} and 
+   * Returns the selection mode for the list (one of:
+   * {@link ListSelectionModel#SINGLE_SELECTION},
+   * {@link ListSelectionModel#SINGLE_INTERVAL_SELECTION} and
    * {@link ListSelectionModel#MULTIPLE_INTERVAL_SELECTION}).
-   * 
+   *
    * @return The selection mode.
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   public int getSelectionMode()
   {
     return selectionModel.getSelectionMode();
   }
-  
+
   /**
    * Sets the list's "selectionMode" property, which simply mirrors the
    * same property on the list's {@link #selectionModel} property. This
@@ -1290,7 +1290,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * Adds the interval [a,a] to the set of selections managed
    * by this list's {@link #selectionModel} property. Depending on the
    * selection mode, this may cause existing selections to become invalid,
-   * or may simply expand the set of selections. 
+   * or may simply expand the set of selections.
    *
    * @param a A number in the half-open range [0, x) where
    * x = getModel.getSize(), indicating the index of an
@@ -1312,7 +1312,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * a, calls {@link #setSelectedIndex} on a[i].
    *
    * @param a  an array of selected indices (null not permitted).
-   * 
+   *
    * @throws NullPointerException if a is null.
    * @see #setSelectionMode
    * @see #selectionModel
@@ -1339,7 +1339,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Returns true if the model's selection is empty, otherwise
-   * false. 
+   * false.
    *
    * @return The return value of {@link ListSelectionModel#isSelectionEmpty}
    */
@@ -1362,7 +1362,7 @@ public class JList extends JComponent implements Accessible, Scrollable
     Rectangle r = getVisibleRect();
     if (or == ComponentOrientation.RIGHT_TO_LEFT)
       r.translate((int) r.getWidth() - 1, 0);
-    return getUI().locationToIndex(this, r.getLocation());      
+    return getUI().locationToIndex(this, r.getLocation());
   }
 
 
@@ -1373,18 +1373,18 @@ public class JList extends JComponent implements Accessible, Scrollable
    * -1 is returned.
    *
    * @param location for which to look for in the list
-   * 
+   *
    * @return index of the cell to which specified location is closest to.
    */
    public int locationToIndex(Point location)
    {
-     return getUI().locationToIndex(this, location);      
+     return getUI().locationToIndex(this, location);
    }
 
   /**
    * Returns location of the cell located at the specified index in the list.
    * @param index of the cell for which location will be determined
-   * 
+   *
    * @return location of the cell located at the specified index in the list.
    */
    public Point indexToLocation(int index)
@@ -1443,7 +1443,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * Indicates whether the list element at a given index value is
    * currently selected.
    *
-   * @param a The index to check 
+   * @param a The index to check
    * @return true if a is the index of a selected
    * list element
    */
@@ -1476,7 +1476,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   /**
    * Returns all the values in the list's {@link #model} property which are
    * selected, according to the list's {@link #selectionModel} property.
-   * 
+   *
    * @return An array containing all the selected values
    * @see #setSelectedValue
    */
@@ -1524,7 +1524,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     return selectionForeground;
   }
-  
+
   /**
    * Sets the value of the {@link #selectionForeground} property.
    *
@@ -1542,7 +1542,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Sets the selection to cover only the specified value, if it
-   * exists in the model. 
+   * exists in the model.
    *
    * @param obj The object to select
    * @param scroll Whether to scroll the list to make the newly selected
@@ -1595,9 +1595,9 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Returns a {@link ListModel} backed by the specified array.
-   * 
+   *
    * @param items  the list items (don't use null).
-   * 
+   *
    * @return A list model containing the specified items.
    */
   private ListModel createListModel(final Object[] items)
@@ -1614,12 +1614,12 @@ public class JList extends JComponent implements Accessible, Scrollable
         }
       };
   }
-  
+
   /**
    * Returns a {@link ListModel} backed by the specified vector.
-   * 
+   *
    * @param items  the list items (don't use null).
-   * 
+   *
    * @return A list model containing the specified items.
    */
   private ListModel createListModel(final Vector items)
@@ -1649,20 +1649,20 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     setModel(new AbstractListModel()
       {
-	public int getSize()
-	{
-	  return listData.size();
-	}
-	
-	public Object getElementAt(int i)
-	{
-	  return listData.elementAt(i);
-	}
+        public int getSize()
+        {
+          return listData.size();
+        }
+
+        public Object getElementAt(int i)
+        {
+          return listData.elementAt(i);
+        }
       });
   }
 
   /**
-   * Gets the value of the {@link #cellRenderer} property. 
+   * Gets the value of the {@link #cellRenderer} property.
    *
    * @return The current value of the property
    */
@@ -1680,7 +1680,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     if (cellRenderer == renderer)
       return;
-    
+
     ListCellRenderer old = cellRenderer;
     cellRenderer = renderer;
     firePropertyChange("cellRenderer", old, renderer);
@@ -1689,7 +1689,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Gets the value of the {@link #model} property. 
+   * Gets the value of the {@link #model} property.
    *
    * @return The current value of the property
    */
@@ -1704,26 +1704,26 @@ public class JList extends JComponent implements Accessible, Scrollable
    * and re-subscribed to the new model.
    *
    * @param model  the new model (null not permitted).
-   * 
-   * @throws IllegalArgumentException if model is 
+   *
+   * @throws IllegalArgumentException if model is
    *         null.
    */
   public void setModel(ListModel model)
   {
-    if (model == null) 
+    if (model == null)
       throw new IllegalArgumentException("Null 'model' argument.");
     if (this.model == model)
       return;
-    
+
     if (this.model != null)
       this.model.removeListDataListener(listListener);
-    
+
     ListModel old = this.model;
     this.model = model;
-    
+
     if (this.model != null)
       this.model.addListDataListener(listListener);
-    
+
     firePropertyChange("model", old, model);
     revalidate();
     repaint();
@@ -1741,7 +1741,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    *   
                          • {@link #setSelectedIndices(int[])};
                            • 
    *   
                          • {@link #setSelectionInterval(int, int)}.
                            • 
    * 
                          
-   * 
+   *
    * @return The selection model.
    */
   public ListSelectionModel getSelectionModel()
@@ -1760,16 +1760,16 @@ public class JList extends JComponent implements Accessible, Scrollable
   {
     if (selectionModel == model)
       return;
-    
+
     if (selectionModel != null)
       selectionModel.removeListSelectionListener(listListener);
-    
+
     ListSelectionModel old = selectionModel;
     selectionModel = model;
-    
+
     if (selectionModel != null)
       selectionModel.addListSelectionListener(listListener);
-    
+
     firePropertyChange("selectionModel", old, model);
     revalidate();
     repaint();
@@ -1855,7 +1855,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
     Object old = prototypeCellValue;
     Component comp = getCellRenderer()
-      .getListCellRendererComponent(this, obj, 0, false, false); 
+      .getListCellRendererComponent(this, obj, 0, false, false);
     Dimension d = comp.getPreferredSize();
     fixedCellWidth = d.width;
     fixedCellHeight = d.height;
@@ -1878,19 +1878,19 @@ public class JList extends JComponent implements Accessible, Scrollable
    */
   public Dimension getPreferredScrollableViewportSize()
   {
-    //If the layout orientation is not VERTICAL, then this will 
-    //return the value from getPreferredSize. The current ListUI is 
+    //If the layout orientation is not VERTICAL, then this will
+    //return the value from getPreferredSize. The current ListUI is
     //expected to override getPreferredSize to return an appropriate value.
     if (getLayoutOrientation() != VERTICAL)
-      return getPreferredSize();        
+      return getPreferredSize();
 
     int size = getModel().getSize();
-    
-    // Trivial case: if fixedCellWidth and fixedCellHeight were set 
+
+    // Trivial case: if fixedCellWidth and fixedCellHeight were set
     // just use them
     if (fixedCellHeight != -1 && fixedCellWidth != -1)
       return new Dimension(fixedCellWidth, size * fixedCellHeight);
-        
+
     // If the model is empty we use 16 * the number of visible rows
     // for the height and either fixedCellWidth (if set) or 256
     // for the width
@@ -1935,7 +1935,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * 
                          If the provided orientation is HORIZONTAL, the above
    * comments refer to "rightwards" for positive direction, and "leftwards"
    * for negative.
                          
-   * 
+   *
    *
    * @param visibleRect The rectangle to scroll an element into
    * @param orientation One of the numeric consants VERTICAL
@@ -2031,7 +2031,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * 
                          If the provided orientation is HORIZONTAL, the above
    * comments refer to "rightwards" for positive direction, and "leftwards"
    * for negative.
                          
-   * 
+   *
    *
    * @param visibleRect The rectangle to scroll an element into
    * @param orientation One of the numeric consants VERTICAL
@@ -2213,7 +2213,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   /**
    * Returns the index of the anchor item in the current selection, or
    * -1 if there is no anchor item.
-   * 
+   *
    * @return The item index.
    */
   public int getAnchorSelectionIndex()
@@ -2224,7 +2224,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   /**
    * Returns the index of the lead item in the current selection, or
    * -1 if there is no lead item.
-   * 
+   *
    * @return The item index.
    */
   public int getLeadSelectionIndex()
@@ -2235,9 +2235,9 @@ public class JList extends JComponent implements Accessible, Scrollable
   /**
    * Returns the lowest item index in the current selection, or -1
    * if there is no selection.
-   * 
+   *
    * @return The index.
-   * 
+   *
    * @see #getMaxSelectionIndex()
    */
   public int getMinSelectionIndex()
@@ -2246,11 +2246,11 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Returns the highest item index in the current selection, or 
+   * Returns the highest item index in the current selection, or
    * -1 if there is no selection.
-   * 
+   *
    * @return The index.
-   * 
+   *
    * @see #getMinSelectionIndex()
    */
   public int getMaxSelectionIndex()
@@ -2268,9 +2268,9 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Sets the current selection to the items in the specified range (inclusive).
-   * Note that anchor can be less than, equal to, or greater than 
+   * Note that anchor can be less than, equal to, or greater than
    * lead.
-   * 
+   *
    * @param anchor  the index of the anchor item.
    * @param lead  the index of the anchor item.
    */
@@ -2280,10 +2280,10 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Adds the specified interval to the current selection.  Note that 
-   * anchor can be less than, equal to, or greater than 
+   * Adds the specified interval to the current selection.  Note that
+   * anchor can be less than, equal to, or greater than
    * lead.
-   * 
+   *
    * @param anchor  the index of the anchor item.
    * @param lead  the index of the lead item.
    */
@@ -2293,10 +2293,10 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Removes the specified interval from the current selection.  Note that 
-   * index0 can be less than, equal to, or greater than 
+   * Removes the specified interval from the current selection.  Note that
+   * index0 can be less than, equal to, or greater than
    * index1.
-   * 
+   *
    * @param index0  an index for one end of the range.
    * @param index1  an index for the other end of the range.
    */
@@ -2317,7 +2317,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Sets the valueIsAdjusting flag in the list's selection 
+   * Sets the valueIsAdjusting flag in the list's selection
    * model.
    *
    * @param isAdjusting the new value
@@ -2331,7 +2331,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * Return the value of the dragEnabled property.
    *
    * @return the value
-   * 
+   *
    * @since 1.4
    */
   public boolean getDragEnabled()
@@ -2343,7 +2343,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    * Set the dragEnabled property.
    *
    * @param enabled new value
-   * 
+   *
    * @since 1.4
    */
   public void setDragEnabled(boolean enabled)
@@ -2352,7 +2352,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Returns the layout orientation, which will be one of {@link #VERTICAL}, 
+   * Returns the layout orientation, which will be one of {@link #VERTICAL},
    * {@link #VERTICAL_WRAP} and {@link #HORIZONTAL_WRAP}.  The default value
    * is {@link #VERTICAL}.
    *
@@ -2368,7 +2368,7 @@ public class JList extends JComponent implements Accessible, Scrollable
 
   /**
    * Sets the layout orientation (this is a bound property with the name
-   * 'layoutOrientation').  Valid orientations are {@link #VERTICAL}, 
+   * 'layoutOrientation').  Valid orientations are {@link #VERTICAL},
    * {@link #VERTICAL_WRAP} and {@link #HORIZONTAL_WRAP}.
    *
    * @param orientation the orientation.
@@ -2414,7 +2414,7 @@ public class JList extends JComponent implements Accessible, Scrollable
   }
 
   /**
-   * Returns the index of the next list element (beginning at 
+   * Returns the index of the next list element (beginning at
    * startIndex and moving in the specified direction through the
    * list, looping around if necessary) that starts with prefix
    * (ignoring case).
@@ -2433,7 +2433,7 @@ public class JList extends JComponent implements Accessible, Scrollable
    *
    * @since 1.4
    */
-  public int getNextMatch(String prefix, int startIndex, 
+  public int getNextMatch(String prefix, int startIndex,
                           Position.Bias direction)
   {
     if (prefix == null)
@@ -2455,7 +2455,7 @@ public class JList extends JComponent implements Accessible, Scrollable
     int itemCount = model.getSize();
     boolean finished = false;
     prefix = prefix.toUpperCase();
-    
+
     if (direction == Position.Bias.Forward)
       delta = 1;
     while (!finished)
@@ -2467,15 +2467,15 @@ public class JList extends JComponent implements Accessible, Scrollable
         if (current == -1)
           current += itemCount;
         else
-          current = current % itemCount; 
+          current = current % itemCount;
         finished = current == startIndex;
       }
     return result;
   }
-  
+
   /**
    * Returns a string describing the attributes for the JList
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
diff --git a/libjava/classpath/javax/swing/JMenu.java b/libjava/classpath/javax/swing/JMenu.java
index 7e627f1181d..e715ff98d7e 100644
--- a/libjava/classpath/javax/swing/JMenu.java
+++ b/libjava/classpath/javax/swing/JMenu.java
@@ -74,7 +74,7 @@ import javax.swing.plaf.MenuItemUI;
  * 
                          
  * JMenu's fires MenuEvents when this menu's selection changes. If this menu
  * is selected, then fireMenuSelectedEvent() is invoked. In case when menu is
- * deselected or cancelled, then fireMenuDeselectedEvent() or 
+ * deselected or cancelled, then fireMenuDeselectedEvent() or
  * fireMenuCancelledEvent() is invoked, respectivelly.
  * 
                          
  */
@@ -156,7 +156,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
   public JMenu(String text)
   {
     super(text);
-    popupMenu = new JPopupMenu(); 
+    popupMenu = new JPopupMenu();
     popupMenu.setInvoker(this);
     setOpaque(false);
   }
@@ -274,7 +274,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
   {
     if (index < 0 || (index > 0 && getMenuComponentCount() == 0))
       throw new IllegalArgumentException();
-  
+
     if (getMenuComponentCount() > 0)
       popupMenu.remove(index);
   }
@@ -445,7 +445,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
 
   /**
    * Returns origin point of the popup menu. This takes the screen bounds
-   * into account and places the popup where it fits best. 
+   * into account and places the popup where it fits best.
    *
    * @return the origin of the popup menu
    */
@@ -459,7 +459,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
     JPopupMenu popup = getPopupMenu();
     Dimension popupSize = popup.getSize();
     if (popupSize.width == 0 || popupSize.height == 0)
-      popupSize = popup.getPreferredSize(); 
+      popupSize = popup.getPreferredSize();
 
     // Determine screen bounds.
     Toolkit tk = Toolkit.getDefaultToolkit();
@@ -652,7 +652,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
 
     if (getItemCount() == 0)
       return null;
-    
+
     Component c = popupMenu.getComponentAtIndex(index);
 
     if (c instanceof JMenuItem)
@@ -680,7 +680,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
    */
   public boolean isTearOff()
   {
-    // NOT YET IMPLEMENTED 
+    // NOT YET IMPLEMENTED
     throw new Error("The method isTearOff() has not yet been implemented.");
   }
 
@@ -706,7 +706,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
   {
     if (getPopupMenu() == null || getMenuComponentCount() == 0)
       return null;
-    
+
     return popupMenu.getComponentAtIndex(index);
   }
 
@@ -784,7 +784,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
    * Returns all registered MenuListener objects.
    *
    * @return an array of listeners
-   * 
+   *
    * @since 1.4
    */
   public MenuListener[] getMenuListeners()
@@ -853,7 +853,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
    */
   public void menuSelectionChanged(boolean changed)
   {
-    // if this menu selection is true, then activate this menu and 
+    // if this menu selection is true, then activate this menu and
     // display popup associated with this menu
     setSelected(changed);
   }
@@ -910,11 +910,11 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
     getModel().setPressed(true);
     try
       {
-	java.lang.Thread.sleep(time);
+        java.lang.Thread.sleep(time);
       }
     catch (java.lang.InterruptedException e)
       {
-	// probably harmless
+        // probably harmless
       }
 
     getModel().setPressed(false);
@@ -1237,7 +1237,7 @@ public class JMenu extends JMenuItem implements Accessible, MenuElement
 
       Action a = menuItem.getAction();
       if (a != null)
-	a.addPropertyChangeListener(this);
+        a.addPropertyChangeListener(this);
     }
 
     /**This method is invoked when some change occures in menuItem's action*/
diff --git a/libjava/classpath/javax/swing/JMenuBar.java b/libjava/classpath/javax/swing/JMenuBar.java
index 030fc4cb87d..1c5a448a0eb 100644
--- a/libjava/classpath/javax/swing/JMenuBar.java
+++ b/libjava/classpath/javax/swing/JMenuBar.java
@@ -61,14 +61,14 @@ import javax.swing.border.Border;
  * components to container, one can use add() to add menu's to the menu bar.
  * Menu's will be displayed in the menu  bar in the order they were added.
  * The JMenuBar uses selectionModel to keep track of selected menu index.
- * JMenuBar's selectionModel will fire ChangeEvents to its registered 
+ * JMenuBar's selectionModel will fire ChangeEvents to its registered
  * listeners when the selected index changes.
  */
 public class JMenuBar extends JComponent implements Accessible, MenuElement
 {
   /**
    * Provides accessibility support for JMenuBar.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   protected class AccessibleJMenuBar extends AccessibleJComponent
@@ -289,11 +289,11 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
 
     for (int i = 0; i < comps.length; i++)
       {
-	if (comps[i].equals(c))
-	  {
-	    index = i;
-	    break;
-	  }
+        if (comps[i].equals(c))
+          {
+            index = i;
+            break;
+          }
       }
 
     return index;
@@ -306,18 +306,18 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
    */
   public JMenu getHelpMenu()
   {
-    // the following error matches the behaviour of the reference 
+    // the following error matches the behaviour of the reference
     // implementation...
     throw new Error("getHelpMenu() is not implemented");
   }
 
   /**
    * Returns the margin between the menu bar's border and its menus.  If the
-   * margin is null, this method returns 
+   * margin is null, this method returns
    * new Insets(0, 0, 0, 0).
    *
    * @return The margin (never null).
-   * 
+   *
    * @see #setMargin(Insets)
    */
   public Insets getMargin()
@@ -508,14 +508,14 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
   }
 
   /**
-   * This method overrides JComponent.processKeyBinding to allow the 
-   * JMenuBar to check all the child components (recursiveley) to see 
+   * This method overrides JComponent.processKeyBinding to allow the
+   * JMenuBar to check all the child components (recursiveley) to see
    * if they'll consume the event.
-   * 
+   *
    * @param ks the KeyStroke for the event
    * @param e the KeyEvent for the event
    * @param condition the focus condition for the binding
-   * @param pressed true if the key is pressed 
+   * @param pressed true if the key is pressed
    */
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition,
                                       boolean pressed)
@@ -523,19 +523,19 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
     // See if the regular JComponent behavior consumes the event
     if (super.processKeyBinding(ks, e, condition, pressed))
       return true;
-    
-    // If not, have to recursively check all the child menu elements to see 
-    // if they want it    
+
+    // If not, have to recursively check all the child menu elements to see
+    // if they want it
     MenuElement[] children = getSubElements();
     for (int i = 0; i < children.length; i++)
       if (processKeyBindingHelper(children[i], ks, e, condition, pressed))
         return true;
     return false;
   }
-  
+
   /**
    * This is a helper method to recursively check the children of this
-   * JMenuBar to see if they will consume a key event via key bindings.  
+   * JMenuBar to see if they will consume a key event via key bindings.
    * This is used for menu accelerators.
    * @param menuElement the menuElement to check (and check all its children)
    * @param ks the KeyStroke for the event
@@ -558,7 +558,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
         && ((JComponent) menuElement).processKeyBinding(ks, e, condition,
                                                         pressed))
       return true;
-    
+
     // If that didn't consume it, check all the children recursively
     MenuElement[] children = menuElement.getSubElements();
     for (int i = 0; i < children.length; i++)
@@ -566,7 +566,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
         return true;
     return false;
   }
-  
+
   /**
    * Process mouse events forwarded from MenuSelectionManager. This method
    * doesn't do anything. It is here to conform to the MenuElement interface.
@@ -602,11 +602,11 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
   {
     if (b != borderPainted)
       {
-	boolean old = borderPainted;
-	borderPainted = b;
-	firePropertyChange("borderPainted", old, b);
-	revalidate();
-	repaint();
+        boolean old = borderPainted;
+        borderPainted = b;
+        firePropertyChange("borderPainted", old, b);
+        revalidate();
+        repaint();
       }
   }
 
@@ -629,7 +629,7 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
    * bound property with the name 'margin').
    *
    * @param m  the margin (null permitted).
-   * 
+   *
    * @see #getMargin()
    */
   public void setMargin(Insets m)
@@ -664,9 +664,9 @@ public class JMenuBar extends JComponent implements Accessible, MenuElement
   {
     if (selectionModel != model)
       {
-	SingleSelectionModel oldModel = selectionModel;
-	selectionModel = model;
-	firePropertyChange("model", oldModel, selectionModel);
+        SingleSelectionModel oldModel = selectionModel;
+        selectionModel = model;
+        firePropertyChange("model", oldModel, selectionModel);
       }
   }
 
diff --git a/libjava/classpath/javax/swing/JMenuItem.java b/libjava/classpath/javax/swing/JMenuItem.java
index ffdccdcef1a..fea3166a962 100644
--- a/libjava/classpath/javax/swing/JMenuItem.java
+++ b/libjava/classpath/javax/swing/JMenuItem.java
@@ -123,20 +123,20 @@ public class JMenuItem extends AbstractButton implements Accessible,
     init(null, null);
     if (action != null)
       {
-	String name = (String) action.getValue(Action.NAME);
-	if (name != null)
+        String name = (String) action.getValue(Action.NAME);
+        if (name != null)
           setName(name);
 
-	KeyStroke accel = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
-	if (accel != null)
+        KeyStroke accel = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
+        if (accel != null)
           setAccelerator(accel);
 
-	Integer mnemonic = (Integer) action.getValue(Action.MNEMONIC_KEY);
-	if (mnemonic != null)
+        Integer mnemonic = (Integer) action.getValue(Action.MNEMONIC_KEY);
+        if (mnemonic != null)
           setMnemonic(mnemonic.intValue());
 
-	String command = (String) action.getValue(Action.ACTION_COMMAND_KEY);
-	if (command != null)
+        String command = (String) action.getValue(Action.ACTION_COMMAND_KEY);
+        if (command != null)
           setActionCommand(command);
       }
   }
@@ -180,7 +180,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
     super.init(text, icon);
 
     // Initializes properties for this menu item, that are different
-    // from Abstract button properties. 
+    // from Abstract button properties.
     /* NOTE: According to java specifications paint_border should be set to false,
       since menu item should not have a border. However running few java programs
       it seems that menu items and menues can have a border. Commenting
@@ -201,7 +201,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
   {
     super.setUI(ui);
   }
-  
+
   /**
    * This method sets this menuItem's UI to the UIManager's default for the
    * current look and feel.
@@ -265,11 +265,11 @@ public class JMenuItem extends AbstractButton implements Accessible,
   }
 
   /**
-   * Sets the key combination which invokes the menu item's action 
-   * listeners without navigating the menu hierarchy. Note that when the 
-   * keyboard accelerator is typed, it will work whether or not the 
+   * Sets the key combination which invokes the menu item's action
+   * listeners without navigating the menu hierarchy. Note that when the
+   * keyboard accelerator is typed, it will work whether or not the
    * menu is currently displayed.
-   * 
+   *
    * @param keystroke accelerator for this menu item.
    */
   public void setAccelerator(KeyStroke keystroke)
@@ -294,7 +294,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
       {
         setAccelerator((KeyStroke) (action.getValue(Action.ACCELERATOR_KEY)));
         if (accelerator != null)
-          super.registerKeyboardAction(action, accelerator, 
+          super.registerKeyboardAction(action, accelerator,
                                        JComponent.WHEN_IN_FOCUSED_WINDOW);
       }
   }
@@ -312,11 +312,11 @@ public class JMenuItem extends AbstractButton implements Accessible,
   {
     return new PropertyChangeListener()
       {
-	public void propertyChange(PropertyChangeEvent e)
-	{
-	  Action act = (Action) (e.getSource());
-	  configurePropertiesFromAction(act);
-	}
+        public void propertyChange(PropertyChangeEvent e)
+        {
+          Action act = (Action) (e.getSource());
+          configurePropertiesFromAction(act);
+        }
       };
   }
 
@@ -374,20 +374,20 @@ public class JMenuItem extends AbstractButton implements Accessible,
       {
       case MouseEvent.MOUSE_ENTERED:
         isDragging = false;
-	fireMenuDragMouseEntered(event);
-	break;
+        fireMenuDragMouseEntered(event);
+        break;
       case MouseEvent.MOUSE_EXITED:
         isDragging = false;
-	fireMenuDragMouseExited(event);
-	break;
+        fireMenuDragMouseExited(event);
+        break;
       case MouseEvent.MOUSE_DRAGGED:
         isDragging = true;
-	fireMenuDragMouseDragged(event);
-	break;
+        fireMenuDragMouseDragged(event);
+        break;
       case MouseEvent.MOUSE_RELEASED:
         if (isDragging)
           fireMenuDragMouseReleased(event);
-	break;
+        break;
       }
   }
 
@@ -524,17 +524,17 @@ public class JMenuItem extends AbstractButton implements Accessible,
     Component parent = this.getParent();
     if (changed)
       {
-	model.setArmed(true);
+        model.setArmed(true);
 
-	if (parent != null && parent instanceof JPopupMenu)
-	  ((JPopupMenu) parent).setSelected(this);
+        if (parent != null && parent instanceof JPopupMenu)
+          ((JPopupMenu) parent).setSelected(this);
       }
     else
       {
-	model.setArmed(false);
+        model.setArmed(false);
 
-	if (parent != null && parent instanceof JPopupMenu)
-	  ((JPopupMenu) parent).getSelectionModel().clearSelection();
+        if (parent != null && parent instanceof JPopupMenu)
+          ((JPopupMenu) parent).getSelectionModel().clearSelection();
       }
   }
 
@@ -630,7 +630,7 @@ public class JMenuItem extends AbstractButton implements Accessible,
 
   /**
    * Returns a string describing the attributes for the JMenuItem
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
@@ -646,14 +646,14 @@ public class JMenuItem extends AbstractButton implements Accessible,
    * Returns the object that provides accessibility features for this
    * JMenuItem component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJMenuItem}).
    */
   public AccessibleContext getAccessibleContext()
   {
     if (accessibleContext == null)
       {
-        AccessibleJMenuItem ctx = new AccessibleJMenuItem(); 
+        AccessibleJMenuItem ctx = new AccessibleJMenuItem();
         addChangeListener(ctx);
         accessibleContext = ctx;
       }
@@ -662,9 +662,9 @@ public class JMenuItem extends AbstractButton implements Accessible,
   }
 
   /**
-   * Provides the accessibility features for the JMenuItem 
+   * Provides the accessibility features for the JMenuItem
    * component.
-   * 
+   *
    * @see JMenuItem#getAccessibleContext()
    */
   protected class AccessibleJMenuItem extends AccessibleAbstractButton
diff --git a/libjava/classpath/javax/swing/JOptionPane.java b/libjava/classpath/javax/swing/JOptionPane.java
index 43caecd1a48..8c765ed7480 100644
--- a/libjava/classpath/javax/swing/JOptionPane.java
+++ b/libjava/classpath/javax/swing/JOptionPane.java
@@ -71,7 +71,7 @@ public class JOptionPane extends JComponent implements Accessible
   protected class AccessibleJOptionPane extends JComponent.AccessibleJComponent
   {
     private static final long serialVersionUID = 686071432213084821L;
-    
+
     /**
      * Creates a new AccessibleJOptionPane instance.
      */
@@ -477,7 +477,7 @@ public class JOptionPane extends JComponent implements Accessible
    * Returns the object that provides accessibility features for this
    * JOptionPane component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJOptionPane}).
    */
   public AccessibleContext getAccessibleContext()
@@ -700,9 +700,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (icon != newIcon)
       {
-	Icon old = icon;
-	icon = newIcon;
-	firePropertyChange(ICON_PROPERTY, old, icon);
+        Icon old = icon;
+        icon = newIcon;
+        firePropertyChange(ICON_PROPERTY, old, icon);
       }
   }
 
@@ -715,10 +715,10 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (initialSelectionValue != newValue)
       {
-	Object old = initialSelectionValue;
-	initialSelectionValue = newValue;
-	firePropertyChange(INITIAL_SELECTION_VALUE_PROPERTY, old,
-	                   initialSelectionValue);
+        Object old = initialSelectionValue;
+        initialSelectionValue = newValue;
+        firePropertyChange(INITIAL_SELECTION_VALUE_PROPERTY, old,
+                           initialSelectionValue);
       }
   }
 
@@ -731,9 +731,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (initialValue != newValue)
       {
-	Object old = initialValue;
-	initialValue = newValue;
-	firePropertyChange(INITIAL_VALUE_PROPERTY, old, initialValue);
+        Object old = initialValue;
+        initialValue = newValue;
+        firePropertyChange(INITIAL_VALUE_PROPERTY, old, initialValue);
       }
   }
 
@@ -746,9 +746,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (inputValue != newValue)
       {
-	Object old = inputValue;
-	inputValue = newValue;
-	firePropertyChange(INPUT_VALUE_PROPERTY, old, inputValue);
+        Object old = inputValue;
+        inputValue = newValue;
+        firePropertyChange(INPUT_VALUE_PROPERTY, old, inputValue);
       }
   }
 
@@ -761,9 +761,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (message != newMessage)
       {
-	Object old = message;
-	message = newMessage;
-	firePropertyChange(MESSAGE_PROPERTY, old, message);
+        Object old = message;
+        message = newMessage;
+        firePropertyChange(MESSAGE_PROPERTY, old, message);
       }
   }
 
@@ -780,9 +780,9 @@ public class JOptionPane extends JComponent implements Accessible
       throw new IllegalArgumentException("Message Type not legal value.");
     if (newType != messageType)
       {
-	int old = messageType;
-	messageType = newType;
-	firePropertyChange(MESSAGE_TYPE_PROPERTY, old, messageType);
+        int old = messageType;
+        messageType = newType;
+        firePropertyChange(MESSAGE_TYPE_PROPERTY, old, messageType);
       }
   }
 
@@ -795,9 +795,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (options != newOptions)
       {
-	Object[] old = options;
-	options = newOptions;
-	firePropertyChange(OPTIONS_PROPERTY, old, options);
+        Object[] old = options;
+        options = newOptions;
+        firePropertyChange(OPTIONS_PROPERTY, old, options);
       }
   }
 
@@ -814,9 +814,9 @@ public class JOptionPane extends JComponent implements Accessible
       throw new IllegalArgumentException("Option Type not legal value.");
     if (newType != optionType)
       {
-	int old = optionType;
-	optionType = newType;
-	firePropertyChange(OPTION_TYPE_PROPERTY, old, optionType);
+        int old = optionType;
+        optionType = newType;
+        firePropertyChange(OPTION_TYPE_PROPERTY, old, optionType);
       }
   }
 
@@ -840,11 +840,11 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (newValues != selectionValues)
       {
-	if (newValues != null)
-	  wantsInput = true;
-	Object[] old = selectionValues;
-	selectionValues = newValues;
-	firePropertyChange(SELECTION_VALUES_PROPERTY, old, selectionValues);
+        if (newValues != null)
+          wantsInput = true;
+        Object[] old = selectionValues;
+        selectionValues = newValues;
+        firePropertyChange(SELECTION_VALUES_PROPERTY, old, selectionValues);
       }
   }
 
@@ -867,9 +867,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (value != newValue)
       {
-	Object old = value;
-	value = newValue;
-	firePropertyChange(VALUE_PROPERTY, old, value);
+        Object old = value;
+        value = newValue;
+        firePropertyChange(VALUE_PROPERTY, old, value);
       }
   }
 
@@ -882,9 +882,9 @@ public class JOptionPane extends JComponent implements Accessible
   {
     if (wantsInput != newValue)
       {
-	boolean old = wantsInput;
-	wantsInput = newValue;
-	firePropertyChange(WANTS_INPUT_PROPERTY, old, wantsInput);
+        boolean old = wantsInput;
+        wantsInput = newValue;
+        firePropertyChange(WANTS_INPUT_PROPERTY, old, wantsInput);
       }
   }
 
@@ -904,7 +904,7 @@ public class JOptionPane extends JComponent implements Accessible
     JOptionPane pane = new JOptionPane(message, QUESTION_MESSAGE);
     JDialog dialog = pane.createDialog(parentComponent, "Select an Option");
     dialog.show();
-    
+
     if (pane.getValue() instanceof Integer)
       return ((Integer) pane.getValue()).intValue();
     return -1;
@@ -1011,7 +1011,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setWantsInput(true);
     JDialog dialog = pane.createDialog(parentComponent, null);
     dialog.show();
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1037,7 +1037,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setWantsInput(true);
     JDialog dialog = pane.createDialog(parentComponent, null);
     dialog.show();
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1062,7 +1062,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setWantsInput(true);
     JDialog dialog = pane.createDialog(parentComponent, title);
     dialog.show();
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1094,7 +1094,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setInitialSelectionValue(initialSelectionValue);
     JDialog dialog = pane.createDialog(parentComponent, title);
     dialog.show();
-    
+
     return pane.getInputValue();
   }
 
@@ -1114,7 +1114,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setWantsInput(true);
     JDialog dialog = pane.createDialog(null, null);
     dialog.show();
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1138,7 +1138,7 @@ public class JOptionPane extends JComponent implements Accessible
     pane.setInitialSelectionValue(initialSelectionValue);
     JDialog dialog = pane.createDialog(null, null);
     dialog.show();
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1160,7 +1160,7 @@ public class JOptionPane extends JComponent implements Accessible
     JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
 
     startModal(frame);
-    
+
     if (pane.getValue() instanceof Integer)
       return ((Integer) pane.getValue()).intValue();
     return -1;
@@ -1270,7 +1270,7 @@ public class JOptionPane extends JComponent implements Accessible
     JInternalFrame frame = pane.createInternalFrame(parentComponent, null);
 
     startModal(frame);
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1296,7 +1296,7 @@ public class JOptionPane extends JComponent implements Accessible
     JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
 
     startModal(frame);
-    
+
     return (String) pane.getInputValue();
   }
 
@@ -1331,7 +1331,7 @@ public class JOptionPane extends JComponent implements Accessible
     JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
 
     startModal(frame);
-    
+
     return pane.getInputValue();
   }
 
@@ -1424,7 +1424,7 @@ public class JOptionPane extends JComponent implements Accessible
     JInternalFrame frame = pane.createInternalFrame(parentComponent, title);
 
     startModal(frame);
- 
+
     if (pane.getValue() instanceof Integer)
       return ((Integer) pane.getValue()).intValue();
     return -1;
@@ -1441,7 +1441,7 @@ public class JOptionPane extends JComponent implements Accessible
   {
     JOptionPane pane = new JOptionPane(message, INFORMATION_MESSAGE);
     JDialog dialog = pane.createDialog(parentComponent, null);
-    dialog.show();   
+    dialog.show();
   }
 
   /**
@@ -1539,7 +1539,7 @@ public class JOptionPane extends JComponent implements Accessible
       case PLAIN_MESSAGE:
       case QUESTION_MESSAGE:
       case WARNING_MESSAGE:
-	return true;
+        return true;
       }
     return false;
   }
@@ -1559,7 +1559,7 @@ public class JOptionPane extends JComponent implements Accessible
       case OK_CANCEL_OPTION:
       case YES_NO_CANCEL_OPTION:
       case YES_NO_OPTION:
-	return true;
+        return true;
       }
     return false;
   }
diff --git a/libjava/classpath/javax/swing/JPanel.java b/libjava/classpath/javax/swing/JPanel.java
index 3bd71d1c2d5..f2ff9569051 100644
--- a/libjava/classpath/javax/swing/JPanel.java
+++ b/libjava/classpath/javax/swing/JPanel.java
@@ -91,10 +91,10 @@ public class JPanel extends JComponent implements Accessible
 
   /**
    * Creates a new panel with double-buffering enabled or disabled as
-   * specified.  The default layout manager is an instance of 
+   * specified.  The default layout manager is an instance of
    * {@link FlowLayout}.
-   * 
-   * @param isDoubleBuffered  a flag that controls whether or not 
+   *
+   * @param isDoubleBuffered  a flag that controls whether or not
    *     double-buffering is enabled.
    */
   public JPanel(boolean isDoubleBuffered)
@@ -105,7 +105,7 @@ public class JPanel extends JComponent implements Accessible
   /**
    * Creates a new panel with the specified layout manager.  Double-buffering
    * is enabled by default.
-   * 
+   *
    * @param layout  the layout manager (null permitted).
    */
   public JPanel(LayoutManager layout)
@@ -114,24 +114,24 @@ public class JPanel extends JComponent implements Accessible
   }
 
   /**
-   * Creates a new panel with the specified layout manager and 
+   * Creates a new panel with the specified layout manager and
    * double-buffering.
-   * 
+   *
    * @param layout  the layout manager (null permitted).
-   * @param isDoubleBuffered  a flag that controls whether or not 
+   * @param isDoubleBuffered  a flag that controls whether or not
    *     double-buffering is enabled.
    */
   public JPanel(LayoutManager layout, boolean isDoubleBuffered)
   {
-    setLayout(layout); 
+    setLayout(layout);
     setOpaque(true);
     setDoubleBuffered(isDoubleBuffered);
-    updateUI();	
-  } 
+    updateUI();
+  }
 
   /**
-   * Returns the suffix ("PanelUI" in this case) used to 
-   * determine the class name for a UI delegate that can provide the look and 
+   * Returns the suffix ("PanelUI" in this case) used to
+   * determine the class name for a UI delegate that can provide the look and
    * feel for a JPanel.
    *
    * @return "PanelUI".
@@ -143,9 +143,9 @@ public class JPanel extends JComponent implements Accessible
 
   /**
    * Sets the UI delegate for the JPanel component.
-   * 
+   *
    * @param ui  the UI delegate.
-   * 
+   *
    * @since 1.4
    * @see #getUI()
    */
@@ -156,9 +156,9 @@ public class JPanel extends JComponent implements Accessible
 
   /**
    * Returns the UI delegate for the JPanel component.
-   * 
+   *
    * @return The UI delegate.
-   * 
+   *
    * @since 1.4
    * @see #setUI(PanelUI)
    */
@@ -188,7 +188,7 @@ public class JPanel extends JComponent implements Accessible
       accessibleContext = new AccessibleJPanel();
     return accessibleContext;
   }
-    
+
   /**
    * Returns an implementation-dependent string describing the attributes of
    * this JPanel.
@@ -198,6 +198,6 @@ public class JPanel extends JComponent implements Accessible
    */
   protected String paramString()
   {
-	return super.paramString();
+        return super.paramString();
   }
 }
diff --git a/libjava/classpath/javax/swing/JPasswordField.java b/libjava/classpath/javax/swing/JPasswordField.java
index 11e45e8a58a..e73993f626a 100644
--- a/libjava/classpath/javax/swing/JPasswordField.java
+++ b/libjava/classpath/javax/swing/JPasswordField.java
@@ -48,7 +48,7 @@ import javax.swing.text.Document;
 
 /**
  * class JPasswordField
- * 
+ *
  * @author Andrew Selkirk
  * @author Lillian Angel
  * @version 1.0
@@ -72,7 +72,7 @@ public class JPasswordField extends JTextField
 
     /**
      * getAccessibleRole
-     * 
+     *
      * @return AccessibleRole
      */
     public AccessibleRole getAccessibleRole()
@@ -96,7 +96,7 @@ public class JPasswordField extends JTextField
 
   /**
    * Creates a JPasswordField object.
-   * 
+   *
    * @param text the initial text
    */
   public JPasswordField(String text)
@@ -106,7 +106,7 @@ public class JPasswordField extends JTextField
 
   /**
    * Creates a JPasswordField object.
-   * 
+   *
    * @param columns the number of columns
    */
   public JPasswordField(int columns)
@@ -116,7 +116,7 @@ public class JPasswordField extends JTextField
 
   /**
    * Creates a JPasswordField object.
-   * 
+   *
    * @param text the initial text
    * @param columns the number of columns
    */
@@ -127,7 +127,7 @@ public class JPasswordField extends JTextField
 
   /**
    * Creates a JPasswordField object.
-   * 
+   *
    * @param document the document to use
    * @param text the initial text
    * @param columns the number of columns
@@ -139,9 +139,9 @@ public class JPasswordField extends JTextField
 
   /**
    * writeObject
-   * 
+   *
    * @param stream the stream to write to
-   * 
+   *
    * @exception IOException if an error occurs
    */
   private void writeObject(ObjectOutputStream stream) throws IOException
@@ -151,7 +151,7 @@ public class JPasswordField extends JTextField
 
   /**
    * Returns the UIClassID
-   * 
+   *
    * @return the string "PasswordFieldUI"
    */
   public String getUIClassID()
@@ -161,7 +161,7 @@ public class JPasswordField extends JTextField
 
   /**
    * getEchoChar
-   * 
+   *
    * @return the echo char
    */
   public char getEchoChar()
@@ -171,7 +171,7 @@ public class JPasswordField extends JTextField
 
   /**
    * setEchoChar
-   * 
+   *
    * @param echo the echo char
    */
   public void setEchoChar(char echo)
@@ -180,9 +180,9 @@ public class JPasswordField extends JTextField
   }
 
   /**
-   * Returns true if this JPasswordField has a character set for echoing. 
+   * Returns true if this JPasswordField has a character set for echoing.
    * A character is considered to be set if the echo character is not 0.
-   * 
+   *
    * @return true if the echo char is set,
    * false otherwise.
    */
@@ -210,11 +210,11 @@ public class JPasswordField extends JTextField
   }
 
   /**
-   * Returns the text contained in this TextComponent. If the 
+   * Returns the text contained in this TextComponent. If the
    * underlying document is null, will give a NullPointerException.
-   * 
+   *
    * @return String
-   * 
+   *
    * @deprecated
    */
   public String getText()
@@ -231,15 +231,15 @@ public class JPasswordField extends JTextField
   }
 
   /**
-   * Fetches a portion of the text represented by the component. 
-   * Returns an empty string if length is 0. If the 
+   * Fetches a portion of the text represented by the component.
+   * Returns an empty string if length is 0. If the
    * underlying document is null, will give a NullPointerException.
-   * 
+   *
    * @param offset TODO
    * @param length TODO
-   * 
+   *
    * @return String
-   * 
+   *
    * @exception BadLocationException TODO
    *
    * @deprecated
@@ -250,11 +250,11 @@ public class JPasswordField extends JTextField
   }
 
   /**
-   * Returns the text contained in this TextComponent. If the underlying 
-   * document is null, will give a NullPointerException. 
-   * For stronger security, it is recommended that the returned character 
+   * Returns the text contained in this TextComponent. If the underlying
+   * document is null, will give a NullPointerException.
+   * For stronger security, it is recommended that the returned character
    * array be cleared after use by setting each character to zero.
-   * 
+   *
    * @return char[]
    */
   public char[] getPassword()
@@ -263,11 +263,11 @@ public class JPasswordField extends JTextField
   }
 
   /**
-   * Returns a string representation of this JPasswordField. This method is 
-   * intended to be used only for debugging purposes, 
-   * and the content and format of the returned string may vary between 
+   * Returns a string representation of this JPasswordField. This method is
+   * intended to be used only for debugging purposes,
+   * and the content and format of the returned string may vary between
    * implementations. The returned string may be empty but may not be null.
-   * 
+   *
    * @return String
    */
   protected String paramString()
@@ -284,7 +284,7 @@ public class JPasswordField extends JTextField
 
   /**
    * getAccessibleContext
-   * 
+   *
    * @return the AccessibleContext object
    */
   public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JPopupMenu.java b/libjava/classpath/javax/swing/JPopupMenu.java
index ac1a9ebf253..8f16aa2a738 100644
--- a/libjava/classpath/javax/swing/JPopupMenu.java
+++ b/libjava/classpath/javax/swing/JPopupMenu.java
@@ -79,10 +79,10 @@ import javax.swing.plaf.PopupMenuUI;
  * popupMenuBecomeInvisible() or popupMenuCancelled() methods of
  * PopupMenuListeners will be invoked.
  *
- * JPopupMenu also fires PropertyChangeEvents when its bound properties 
- * change.In addittion to inheritted bound properties, JPopupMenu has 
+ * JPopupMenu also fires PropertyChangeEvents when its bound properties
+ * change.In addittion to inheritted bound properties, JPopupMenu has
  * 'visible' bound property. When JPopupMenu becomes visible/invisible on
- * the screen it fires PropertyChangeEvents to its registered 
+ * the screen it fires PropertyChangeEvents to its registered
  * PropertyChangeListeners.
  */
 public class JPopupMenu extends JComponent implements Accessible, MenuElement
@@ -139,7 +139,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
 
   /* Field indicating if popup menu is visible or not */
   private boolean visible = false;
-  
+
   /**
    * Creates a new JPopupMenu object.
    */
@@ -326,7 +326,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
    */
   public void setSelectionModel(SingleSelectionModel model)
   {
-	selectionModel = model;
+        selectionModel = model;
   }
 
   /**
@@ -397,9 +397,9 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
   {
     if (label != this.label)
       {
-	String oldLabel = this.label;
-	this.label = label;
-	firePropertyChange("label", oldLabel, label);
+        String oldLabel = this.label;
+        this.label = label;
+        firePropertyChange("label", oldLabel, label);
       }
   }
 
@@ -408,40 +408,40 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
    */
   public void addSeparator()
   {
-    // insert separator at the end of the list of menu items    
+    // insert separator at the end of the list of menu items
     this.insert(new Separator(), -1);
   }
 
   /**
    * Adds a MenuKeyListener to the popup.
-   * 
+   *
    * @param l - the listener to add.
    */
   public void addMenuKeyListener(MenuKeyListener l)
   {
     listenerList.add(MenuKeyListener.class, l);
   }
-  
+
   /**
    * Removes a MenuKeyListener from the popup.
-   * 
+   *
    * @param l - the listener to remove.
    */
   public void removeMenuKeyListener(MenuKeyListener l)
   {
     listenerList.remove(MenuKeyListener.class, l);
   }
-  
+
   /**
    * Returns array of getMenuKeyListeners that are listening to JPopupMenu.
-   * 
+   *
    * @return array of getMenuKeyListeners that are listening to JPopupMenu
    */
   public MenuKeyListener[] getMenuKeyListeners()
   {
     return ((MenuKeyListener[]) listenerList.getListeners(MenuKeyListener.class));
   }
-  
+
   /**
    * Adds popupMenuListener to listen for PopupMenuEvents fired
    * by the JPopupMenu
@@ -691,8 +691,8 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
 
     for (int i = 0; i < items.length; i++)
       {
-	if (items[i].equals(component))
-	  return i;
+        if (items[i].equals(component))
+          return i;
       }
 
     return -1;
@@ -783,7 +783,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
   }
 
   /**
-  * Process mouse events forwarded from MenuSelectionManager. This method 
+  * Process mouse events forwarded from MenuSelectionManager. This method
   * doesn't do anything. It is here to conform to the MenuElement interface.
   *
   * @param event event forwarded from MenuSelectionManager
@@ -846,7 +846,7 @@ public class JPopupMenu extends JComponent implements Accessible, MenuElement
 
     for (int i = 0; i < items.length; i++)
       if (items[i] instanceof MenuElement)
-	subElements.add(items[i]);
+        subElements.add(items[i]);
 
     return (MenuElement[])
       subElements.toArray(new MenuElement[subElements.size()]);
diff --git a/libjava/classpath/javax/swing/JProgressBar.java b/libjava/classpath/javax/swing/JProgressBar.java
index b20b02a0606..d24a380b03c 100644
--- a/libjava/classpath/javax/swing/JProgressBar.java
+++ b/libjava/classpath/javax/swing/JProgressBar.java
@@ -57,8 +57,8 @@ import javax.swing.plaf.ProgressBarUI;
 /**
  * A component that displays a visual indicator of the progress of a task. The
  * component has two modes: determinate and indeterminate.  In determinate mode,
- * the JProgressBar fills a percentage of its bar based on its 
- * current value. In indeterminate mode, it creates box and bounces it between 
+ * the JProgressBar fills a percentage of its bar based on its
+ * current value. In indeterminate mode, it creates box and bounces it between
  * its bounds.
  * 
                          
  * This component has the following properties:
@@ -67,10 +67,10 @@ import javax.swing.plaf.ProgressBarUI;
  *  Property          Stored in    Bound? 
  *  borderPainted     progressBar  yes    
  *  changeListeners   progressBar  no     
- *  indeterminate     progressBar  yes     
+ *  indeterminate     progressBar  yes    
  *  maximum           model        no     
  *  minimum           model        no     
- *  model             progressBar  no      
+ *  model             progressBar  no     
  *  orientation       progressBar  yes    
  *  percentComplete   progressBar  no     
  *  string            progressBar  yes    
@@ -89,17 +89,17 @@ public class JProgressBar extends JComponent implements SwingConstants,
     implements AccessibleValue
   {
     private static final long serialVersionUID = -2938130009392721813L;
-  
+
     /**
      * Creates a new AccessibleJProgressBar instance.
      */
     protected AccessibleJProgressBar()
     {
       // Nothing to do here.
-    } 
+    }
 
     /**
-     * Returns a set containing the current state of the {@link JProgressBar} 
+     * Returns a set containing the current state of the {@link JProgressBar}
      * component.
      *
      * @return The accessible state set.
@@ -112,7 +112,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
       else if (orientation == JProgressBar.VERTICAL)
         result.add(AccessibleState.VERTICAL);
       return result;
-    } 
+    }
 
     /**
      * Returns the accessible role for the JProgressBar component.
@@ -122,10 +122,10 @@ public class JProgressBar extends JComponent implements SwingConstants,
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.PROGRESS_BAR;
-    } 
+    }
 
     /**
-     * Returns an object that provides access to the current, minimum and 
+     * Returns an object that provides access to the current, minimum and
      * maximum values.
      *
      * @return The accessible value.
@@ -133,7 +133,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
     public AccessibleValue getAccessibleValue()
     {
       return this;
-    } 
+    }
 
     /**
      * Returns the current value of the {@link JProgressBar} component, as an
@@ -148,14 +148,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
     /**
      * Sets the current value of the {@link JProgressBar} component and sends a
-     * {@link PropertyChangeEvent} (with the property name 
+     * {@link PropertyChangeEvent} (with the property name
      * {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
-     * listeners.  If the supplied value is null, this method 
+     * listeners.  If the supplied value is null, this method
      * does nothing and returns false.
      *
      * @param value  the new progress bar value (null permitted).
      *
-     * @return true if the slider value is updated, and 
+     * @return true if the slider value is updated, and
      *     false otherwise.
      */
     public boolean setCurrentAccessibleValue(Number value)
@@ -164,7 +164,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
         return false;
       Number oldValue = getCurrentAccessibleValue();
       setValue(value.intValue());
-      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue, 
+      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
                          new Integer(getValue()));
       return true;
     }
@@ -190,63 +190,63 @@ public class JProgressBar extends JComponent implements SwingConstants,
     {
       return new Integer(getMaximum());
     }
-  } 
+  }
 
   private static final long serialVersionUID = 1980046021813598781L;
-  
-  /** 
-   * A flag that determines the mode (true for indeterminate, 
+
+  /**
+   * A flag that determines the mode (true for indeterminate,
    * false for determinate).
    */
   private transient boolean indeterminate = false;
 
-  /** 
-   * The orientation of the JProgressBar 
-   * ({@link SwingConstants#HORIZONTAL} or {@link SwingConstants#VERTICAL}). 
+  /**
+   * The orientation of the JProgressBar
+   * ({@link SwingConstants#HORIZONTAL} or {@link SwingConstants#VERTICAL}).
    * Defaults to {@link SwingConstants#HORIZONTAL}.
    * @see #setOrientation(int)
    */
   protected int orientation;
 
-  /** 
+  /**
    * A flag the controls whether or not the component's border is painted.
-   * The default is true. 
+   * The default is true.
    * @see #setBorderPainted(boolean)
    */
   protected boolean paintBorder = true;
 
-  /** 
+  /**
    * The model defining the bounds and current value for the progress bar.
-   * @see #setModel(BoundedRangeModel) 
+   * @see #setModel(BoundedRangeModel)
    */
   protected BoundedRangeModel model;
 
-  /** 
-   * A custom string for display in the progress bar.  If this is 
-   * null, a default string will be generated. 
+  /**
+   * A custom string for display in the progress bar.  If this is
+   * null, a default string will be generated.
    * @see #setString(String)
    */
   protected String progressString;
 
-  /** 
-   * A flag that controls whether a string is displayed within the progress 
-   * bar. 
+  /**
+   * A flag that controls whether a string is displayed within the progress
+   * bar.
    * @see #setStringPainted(boolean)
    */
   protected boolean paintString = false;
 
-  /** 
+  /**
    * A single change event reused for all events.
-   * @see #fireStateChanged() 
+   * @see #fireStateChanged()
    */
   protected transient ChangeEvent changeEvent;
 
-  /** 
+  /**
    * The listener that is registered with the model. */
   protected ChangeListener changeListener;
 
   /**
-   * Creates a new JProgressBar with default attributes.  The 
+   * Creates a new JProgressBar with default attributes.  The
    * following defaults are used:
    * 
                          
    * 
                            
@@ -254,7 +254,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * 
                          • minimum: 0;
                            • 
    * 
                          • maximum: 100;
                            • 
    * 
                          • orientation: {@link SwingConstants#HORIZONTAL}.
                            • 
-   * 
                            
+   * 
                        
    */
   public JProgressBar()
   {
@@ -262,18 +262,18 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Creates a new JProgressBar with the specified 
+   * Creates a new JProgressBar with the specified
    * orientation.  The following defaults are used:
    * 
                        
    * 
                          
    * 
                        • value: 0;
                          • 
    * 
                        • minimum: 0;
                          • 
    * 
                        • maximum: 100;
                          • 
-   * 
                          
-   * 
-   * @param orientation  the orientation ({@link #HORIZONTAL} or 
+   * 
                      
+   *
+   * @param orientation  the orientation ({@link #HORIZONTAL} or
    *     {@link #VERTICAL}).
-   * 
+   *
    * @throws IllegalArgumentException if orientation is not one of
    *     the specified values.
    */
@@ -289,8 +289,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * 
                        
    * 
                      • value: minimum;
                        • 
    * 
                      • orientation: {@link SwingConstants#HORIZONTAL}.
                        • 
-   * 
                        
-   * 
+   * 
                    
+   *
    * @param minimum  the lower bound of the value range.
    * @param maximum  the upper bound of the value range.
    */
@@ -305,13 +305,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * 
                    
    * 
                      
    * 
                    • value: minimum;
                      • 
-   * 
                      
-   * 
+   * 
+   *
    * @param minimum  the lower bound of the value range.
    * @param maximum  the upper bound of the value range.
-   * @param orientation  the orientation ({@link #HORIZONTAL} or 
+   * @param orientation  the orientation ({@link #HORIZONTAL} or
    *     {@link #VERTICAL}).
-   * 
+   *
    * @throws IllegalArgumentException if orientation is not one of
    *     the specified values.
    */
@@ -320,7 +320,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
     model = new DefaultBoundedRangeModel(minimum, 0, minimum, maximum);
     if (orientation != HORIZONTAL && orientation != VERTICAL)
       throw new IllegalArgumentException(orientation
-                                         + " is not a legal orientation");    
+                                         + " is not a legal orientation");
     this.orientation = orientation;
     changeListener = createChangeListener();
     model.addChangeListener(changeListener);
@@ -333,8 +333,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * 
                    
    * 
                      
    * 
                    • orientation: {@link SwingConstants#HORIZONTAL}.
                      • 
-   * 
                      
-   * 
+   * 
+   *
    * @param model  the model (null not permitted).
    */
   public JProgressBar(BoundedRangeModel model)
@@ -343,15 +343,15 @@ public class JProgressBar extends JComponent implements SwingConstants,
     changeListener = createChangeListener();
     if (model != null)
       model.addChangeListener(changeListener);
-    updateUI();    
+    updateUI();
   }
 
   /**
-   * Returns the current value for the JProgressBar.  This value 
+   * Returns the current value for the JProgressBar.  This value
    * is fetched from the model.
    *
    * @return The current value.
-   * 
+   *
    * @see #setValue(int)
    */
   public int getValue()
@@ -361,18 +361,18 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the current value for the JProgressBar.  The value is
-   * stored in the component's model (see {@link #getModel()}).  
-   * If the new value is different to the old value, a {@link ChangeEvent} is 
-   * sent to the model's registered listeners.  In turn, this triggers a call 
-   * to {@link #fireStateChanged()} which will send a ChangeEvent 
+   * stored in the component's model (see {@link #getModel()}).
+   * If the new value is different to the old value, a {@link ChangeEvent} is
+   * sent to the model's registered listeners.  In turn, this triggers a call
+   * to {@link #fireStateChanged()} which will send a ChangeEvent
    * to this component's registered listeners.
    * 
                    
-   * If value is outside the range minimum to 
-   * maximum, it will be set to the nearest of those boundary 
+   * If value is outside the range minimum to
+   * maximum, it will be set to the nearest of those boundary
    * values.
    *
    * @param value  the new value.
-   * 
+   *
    * @see #getValue()
    */
   public void setValue(int value)
@@ -385,7 +385,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * returns true.
    *
    * @param graphics  the graphics object to paint with.
-   * 
+   *
    * @see #setBorderPainted(boolean)
    */
   protected void paintBorder(Graphics graphics)
@@ -397,12 +397,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Returns the orientation of the JProgressBar component, which
-   * is either {@link SwingConstants#HORIZONTAL} or 
-   * {@link SwingConstants#VERTICAL}.  The default orientation is 
+   * is either {@link SwingConstants#HORIZONTAL} or
+   * {@link SwingConstants#VERTICAL}.  The default orientation is
    * HORIZONTAL.
    *
    * @return The orientation.
-   * 
+   *
    * @see #setOrientation(int)
    */
   public int getOrientation()
@@ -412,22 +412,22 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the orientation for this JProgressBar component and,
-   * if the value changes, sends a {@link PropertyChangeEvent} (with the 
+   * if the value changes, sends a {@link PropertyChangeEvent} (with the
    * property name "orientation") to all registered listeners.
    *
-   * @param orientation  the orientation ({@link #HORIZONTAL} or 
+   * @param orientation  the orientation ({@link #HORIZONTAL} or
    *     {@link #VERTICAL}).
-   * 
+   *
    * @throws IllegalArgumentException if orientation is not
    *     one of the listed values.
-   *     
+   *
    * @see #getOrientation()
    */
   public void setOrientation(int orientation)
   {
     if (orientation != VERTICAL && orientation != HORIZONTAL)
       throw new IllegalArgumentException(orientation
-                                         + " is not a legal orientation");    
+                                         + " is not a legal orientation");
     if (this.orientation != orientation)
       {
         int oldOrientation = this.orientation;
@@ -438,12 +438,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Returns the flag that controls whether or not the string returned by
-   * {@link #getString()} is displayed by the JProgressBar 
+   * {@link #getString()} is displayed by the JProgressBar
    * component.
    *
-   * @return true if the string should be displayed, and 
+   * @return true if the string should be displayed, and
    *     false otherwise.
-   * 
+   *
    * @see #setStringPainted(boolean)
    */
   public boolean isStringPainted()
@@ -453,13 +453,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the flag that controls whether or not the string returned by
-   * {@link #getString()} is displayed by the JProgressBar 
-   * component.  If the flag value changes, a {@link PropertyChangeEvent} (with 
-   * the property name "stringPainted") is sent to all registered 
+   * {@link #getString()} is displayed by the JProgressBar
+   * component.  If the flag value changes, a {@link PropertyChangeEvent} (with
+   * the property name "stringPainted") is sent to all registered
    * listeners.
    *
    * @param painted  the new flag value.
-   * 
+   *
    * @see #isStringPainted()
    * @see #setString(String)
    */
@@ -474,13 +474,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the string that is painted on the JProgressBar if 
-   * {@link #isStringPainted()} returns true.  If no string has 
-   * been explicitly set, this method will return a string displaying the 
+   * Returns the string that is painted on the JProgressBar if
+   * {@link #isStringPainted()} returns true.  If no string has
+   * been explicitly set, this method will return a string displaying the
    * value of {@link #getPercentComplete()}.
    *
    * @return The string.
-   * 
+   *
    * @see #setString(String)
    * @see #setStringPainted(boolean)
    */
@@ -494,13 +494,13 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the string to display within the progress bar and, if the new value
-   * is different to the old value, sends a {@link PropertyChangeEvent} (with 
-   * the property name "string") to all registered listeners. If 
+   * is different to the old value, sends a {@link PropertyChangeEvent} (with
+   * the property name "string") to all registered listeners. If
    * the string is set to null, {@link #getString()} will return
    * a default string.
    *
    * @param string  the string (null permitted).
-   * 
+   *
    * @see #getString()
    * @see #setStringPainted(boolean)
    */
@@ -508,7 +508,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
   {
     if (((string == null || progressString == null) &&
         string != progressString) || (string != null &&
-	! string.equals(progressString)))
+        ! string.equals(progressString)))
       {
         String oldString = progressString;
         progressString = string;
@@ -517,7 +517,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the current value expressed as a percentage.  This is calculated 
+   * Returns the current value expressed as a percentage.  This is calculated
    * as (value - min) / (max - min).
    *
    * @return The percentage (a value in the range 0.0 to 1.0).
@@ -527,7 +527,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
     if (getMaximum() == getMinimum())
       return 1.0;
     else
-      return (double) (model.getValue() - model.getMinimum()) 
+      return (double) (model.getValue() - model.getMinimum())
           / (model.getMaximum() - model.getMinimum());
   }
 
@@ -537,7 +537,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
    *
    * @return true if the component's border should be painted,
    *     and false otherwise.
-   *     
+   *
    * @see #setBorderPainted(boolean)
    */
   public boolean isBorderPainted()
@@ -547,12 +547,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the flag that controls whether or not the component's border is
-   * painted.  If the flag value is changed, this method sends a 
-   * {@link PropertyChangeEvent} (with the property name "borderPainted") to 
+   * painted.  If the flag value is changed, this method sends a
+   * {@link PropertyChangeEvent} (with the property name "borderPainted") to
    * all registered listeners.
    *
    * @param painted  the new flag value.
-   * 
+   *
    * @see #isBorderPainted()
    * @see #paintBorder
    */
@@ -587,7 +587,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Sets this JProgressBar's UI delegate to the default 
+   * Sets this JProgressBar's UI delegate to the default
    * (obtained from the {@link UIManager}) for the current look and feel.
    */
   public void updateUI()
@@ -596,8 +596,8 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the suffix ("ProgressBarUI" in this case) used to 
-   * determine the class name for a UI delegate that can provide the look and 
+   * Returns the suffix ("ProgressBarUI" in this case) used to
+   * determine the class name for a UI delegate that can provide the look and
    * feel for a JProgressBar.
    *
    * @return "ProgressBarUI".
@@ -608,11 +608,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Creates a new {@link ChangeListener} that calls 
+   * Creates a new {@link ChangeListener} that calls
    * {@link #fireStateChanged()} whenever it receives a {@link ChangeEvent}
-   * (typically from the component's model).  This listener is 
-   * registered with the progress bar's model, so that changes made to the 
-   * model directly will automatically result in the progress bar's listeners 
+   * (typically from the component's model).  This listener is
+   * registered with the progress bar's model, so that changes made to the
+   * model directly will automatically result in the progress bar's listeners
    * being notified also.
    *
    * @return A new listener.
@@ -624,16 +624,16 @@ public class JProgressBar extends JComponent implements SwingConstants,
         public void stateChanged(ChangeEvent ce)
         {
           fireStateChanged();
-	    }
+            }
       };
   }
 
   /**
-   * Registers a listener with this component so that it will receive 
+   * Registers a listener with this component so that it will receive
    * notification of component state changes.
    *
    * @param listener  the listener.
-   * 
+   *
    * @see #removeChangeListener(ChangeListener)
    */
   public void addChangeListener(ChangeListener listener)
@@ -646,31 +646,31 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * component state changes.
    *
    * @param listener  the listener.
-   * 
+   *
    * @see #addChangeListener(ChangeListener)
    */
   public void removeChangeListener(ChangeListener listener)
   {
     listenerList.remove(ChangeListener.class, listener);
   }
-  
+
   /**
    * Returns an array of the listeners that are registered with this component.
    * The array may be empty, but is never null.
    *
    * @return An array of listeners.
-   * 
+   *
    * @since 1.4
    */
   public ChangeListener[] getChangeListeners()
   {
     return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
-  }  
+  }
 
   /**
    * Sends a {@link ChangeEvent} to all registered listeners to indicate that
-   * the state of the JProgressBar has changed.  
-   * 
+   * the state of the JProgressBar has changed.
+   *
    * @see #createChangeListener()
    */
   protected void fireStateChanged()
@@ -689,7 +689,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * Returns the model for the JProgressBar.
    *
    * @return The model (never null).
-   * 
+   *
    * @see #setModel(BoundedRangeModel)
    */
   public BoundedRangeModel getModel()
@@ -698,11 +698,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Sets the model for the JProgressBar and sends a 
+   * Sets the model for the JProgressBar and sends a
    * {@link ChangeEvent} to all registered listeners.
    *
    * @param model  the model (null not permitted).
-   * 
+   *
    * @see #getModel()
    */
   public void setModel(BoundedRangeModel model)
@@ -717,12 +717,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the minimum value for the JProgressBar. This defines 
-   * the lower bound for the current value, and is stored in the component's 
+   * Returns the minimum value for the JProgressBar. This defines
+   * the lower bound for the current value, and is stored in the component's
    * model.
    *
    * @return The minimum value.
-   * 
+   *
    * @see #setMinimum(int)
    */
   public int getMinimum()
@@ -732,14 +732,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the minimum value for the JProgressBar.  The value is
-   * stored in the component's model (see {@link #getModel()}).  
-   * If the new value is different to the old value, a {@link ChangeEvent} is 
-   * sent to the model's registered listeners.  In turn, this triggers a call 
-   * to {@link #fireStateChanged()} which will send a ChangeEvent 
+   * stored in the component's model (see {@link #getModel()}).
+   * If the new value is different to the old value, a {@link ChangeEvent} is
+   * sent to the model's registered listeners.  In turn, this triggers a call
+   * to {@link #fireStateChanged()} which will send a ChangeEvent
    * to this component's registered listeners.
-   * 
+   *
    * @param minimum  the minimum value.
-   * 
+   *
    * @see #getMinimum()
    */
   public void setMinimum(int minimum)
@@ -748,12 +748,12 @@ public class JProgressBar extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the maximum value for the JProgressBar.  This defines 
-   * the upper bound for the current value, and is stored in the component's 
+   * Returns the maximum value for the JProgressBar.  This defines
+   * the upper bound for the current value, and is stored in the component's
    * model.
    *
    * @return The maximum value.
-   * 
+   *
    * @see #setMaximum(int)
    */
   public int getMaximum()
@@ -763,14 +763,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Sets the maximum value for the JProgressBar.  The value is
-   * stored in the component's model (see {@link #getModel()}).  
-   * If the new value is different to the old value, a {@link ChangeEvent} is 
-   * sent to the model's registered listeners.  In turn, this triggers a call 
-   * to {@link #fireStateChanged()} which will send a ChangeEvent 
+   * stored in the component's model (see {@link #getModel()}).
+   * If the new value is different to the old value, a {@link ChangeEvent} is
+   * sent to the model's registered listeners.  In turn, this triggers a call
+   * to {@link #fireStateChanged()} which will send a ChangeEvent
    * to this component's registered listeners.
    *
    * @param maximum  the maximum value.
-   * 
+   *
    * @see #getMaximum()
    */
   public void setMaximum(int maximum)
@@ -782,7 +782,7 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * Returns an implementation-dependent string describing the attributes of
    * this JProgressBar.
    *
-   * @return A string describing the attributes of this 
+   * @return A string describing the attributes of this
    *     JProgressBar (never null).
    */
   protected String paramString()
@@ -806,17 +806,17 @@ public class JProgressBar extends JComponent implements SwingConstants,
   /**
    * Sets the flag that controls the mode for this JProgressBar
    * (true for indeterminate mode, and false for
-   * determinate mode).  If the flag value changes, this method sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * determinate mode).  If the flag value changes, this method sends a
+   * {@link PropertyChangeEvent} (with the property name
    * "indeterminate") to all registered listeners.
    * 
                    
    * If the JProgressBar is determinate, it paints a percentage
-   * of the bar described by its value. If it is indeterminate, it simply 
-   * bounces a box between the ends of the bar; the value of the 
+   * of the bar described by its value. If it is indeterminate, it simply
+   * bounces a box between the ends of the bar; the value of the
    * JProgressBar is ignored.
    *
    * @param flag  the new flag value.
-   * 
+   *
    * @see #isIndeterminate()
    * @since 1.4
    */
@@ -831,11 +831,11 @@ public class JProgressBar extends JComponent implements SwingConstants,
 
   /**
    * Returns a flag that indicates the mode for this JProgressBar
-   * (true for indeterminate mode, and false for 
-   * determinate mode).  
+   * (true for indeterminate mode, and false for
+   * determinate mode).
    *
    * @return A flag indicating the mode for the JProgressBar.
-   * 
+   *
    * @see #setIndeterminate(boolean)
    * @since 1.4
    */
@@ -848,14 +848,14 @@ public class JProgressBar extends JComponent implements SwingConstants,
    * Returns the object that provides accessibility features for this
    * JProgressBar component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJProgressBar}).
    */
   public AccessibleContext getAccessibleContext()
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleJProgressBar();
-    
+
     return accessibleContext;
-  } 
+  }
 }
diff --git a/libjava/classpath/javax/swing/JRadioButton.java b/libjava/classpath/javax/swing/JRadioButton.java
index e0593f3a501..ae42f2c0194 100644
--- a/libjava/classpath/javax/swing/JRadioButton.java
+++ b/libjava/classpath/javax/swing/JRadioButton.java
@@ -1,4 +1,4 @@
-/* JRadioButton.java -- 
+/* JRadioButton.java --
    Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -105,12 +105,12 @@ public class JRadioButton extends JToggleButton
 
   /**
    * Constructs an unselected radio button with no text or icon.
-   */ 
+   */
   public JRadioButton()
   {
     this(null, null, false);
   }
-    
+
   /**
    * Constructs a radio button using the labelling, state
    * and icon specified by the supplied action.
@@ -130,10 +130,10 @@ public class JRadioButton extends JToggleButton
    * @param icon the icon to use.
    */
   public JRadioButton(Icon icon)
-  { 
+  {
     this(null, icon, false);
-  }    
-  
+  }
+
   /**
    * Constructs a radio button with the supplied icon and state.
    *
@@ -142,10 +142,10 @@ public class JRadioButton extends JToggleButton
    *        selected state.  Otherwise, the button is unselected.
    */
   public JRadioButton(Icon icon, boolean selected)
-  { 
+  {
     this(null, icon, selected);
-  }    
-  
+  }
+
   /**
    * Constructs an unselected radio button using the supplied text
    * and no icon.
@@ -168,7 +168,7 @@ public class JRadioButton extends JToggleButton
   {
     this(text, null, selected);
   }
-      
+
   /**
    * Constructs an unselected radio button with the supplied text
    * and icon.
@@ -180,7 +180,7 @@ public class JRadioButton extends JToggleButton
   {
     this(text, icon, false);
   }
-  
+
   /**
    * Constructs a radio button with the supplied text, icon and state.
    *
@@ -195,7 +195,7 @@ public class JRadioButton extends JToggleButton
     setBorderPainted(false);
     setHorizontalAlignment(LEADING);
   }
-      
+
   /**
    * Returns the accessible context for this JRadioButton,
    * in the form of an instance of AccessibleJRadioButton.
@@ -209,23 +209,23 @@ public class JRadioButton extends JToggleButton
     if (accessibleContext == null)
       {
         /* Create the context */
-	accessibleContext = new AccessibleJRadioButton();
+        accessibleContext = new AccessibleJRadioButton();
       }
     return accessibleContext;
   }
-  
+
   /**
    * Returns a string specifying the name of the Look and Feel UI class
    * that renders this component.
    *
    * @return the Look and Feel UI class for JRadioButtons
    *         as a String.
-   */  
+   */
   public String getUIClassID()
   {
     return "RadioButtonUI";
   }
-  
+
   /**
    * Returns a string representation of this component for debugging use.
    * Users should not depend on anything as regards the content or formatting
@@ -233,19 +233,19 @@ public class JRadioButton extends JToggleButton
    * null (only empty).
    *
    * @return the component in String form for debugging.
-   */  
+   */
   protected  String paramString()
   {
     return super.paramString();
   }
-  
+
   /**
    * This method resets the radio button's UI delegate to the default UI for
    * the current look and feel.
    */
   public void updateUI()
   {
-    /* 
+    /*
        I can't see any difference between this and the superclass one,
        but Sun reimplements it... there is no RadioButtonUI class for it
        to be cast to.
@@ -254,6 +254,3 @@ public class JRadioButton extends JToggleButton
   }
 
 }
-
-
-
diff --git a/libjava/classpath/javax/swing/JRadioButtonMenuItem.java b/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
index 13ef189a514..48fc9aeb632 100644
--- a/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
+++ b/libjava/classpath/javax/swing/JRadioButtonMenuItem.java
@@ -169,12 +169,12 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
   }
 
   /**
-   * Returns a string describing the attributes for the 
-   * JRadioButtonMenuItem component, for use in debugging.  The 
-   * return value is guaranteed to be non-null, but the format of 
+   * Returns a string describing the attributes for the
+   * JRadioButtonMenuItem component, for use in debugging.  The
+   * return value is guaranteed to be non-null, but the format of
    * the string may vary between implementations.
    *
-   * @return A string describing the attributes of the 
+   * @return A string describing the attributes of the
    *     JRadioButtonMenuItem.
    */
   protected String paramString()
@@ -187,7 +187,7 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
    * Returns the object that provides accessibility features for this
    * JRadioButtonMenuItem component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJRadioButtonMenuItem}).
    */
   public AccessibleContext getAccessibleContext()
@@ -199,9 +199,9 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
   }
 
   /**
-   * Provides the accessibility features for the 
+   * Provides the accessibility features for the
    * JRadioButtonMenuItem component.
-   * 
+   *
    * @see JRadioButtonMenuItem#getAccessibleContext()
    */
   protected class AccessibleJRadioButtonMenuItem extends AccessibleJMenuItem
@@ -217,7 +217,7 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible
     }
 
     /**
-     * Returns the accessible role for the JRadioButtonMenuItem 
+     * Returns the accessible role for the JRadioButtonMenuItem
      * component.
      *
      * @return {@link AccessibleRole#RADIO_BUTTON}.
diff --git a/libjava/classpath/javax/swing/JRootPane.java b/libjava/classpath/javax/swing/JRootPane.java
index 10fdf10c0ec..c74f4f52060 100644
--- a/libjava/classpath/javax/swing/JRootPane.java
+++ b/libjava/classpath/javax/swing/JRootPane.java
@@ -93,7 +93,7 @@ public class JRootPane extends JComponent implements Accessible
     }
   }
 
-  // Custom Layout Manager for JRootPane. It positions contentPane and 
+  // Custom Layout Manager for JRootPane. It positions contentPane and
   // menuBar withing its layeredPane.
   protected class RootLayout implements LayoutManager2, Serializable
   {
@@ -125,7 +125,7 @@ public class JRootPane extends JComponent implements Accessible
      */
     protected RootLayout()
     {
-      // Nothing to do here. 
+      // Nothing to do here.
     }
 
     /**
@@ -208,7 +208,7 @@ public class JRootPane extends JComponent implements Accessible
           // 2. the layeredPane filles entire viewable region.
           // 3. the menuBar is positioned at the upper edge of layeredPane.
           // 4. the contentPane fills viewable region minus menuBar, if present.
-      
+
 
           // +-------------------------------+
           // |  JLayeredPane                 |
@@ -237,7 +237,7 @@ public class JRootPane extends JComponent implements Accessible
           else
             contentPaneBounds = new Rectangle(0, 0, containerWidth,
                                               containerHeight);
-              
+
           glassPaneBounds = new Rectangle(i.left, i.top, containerWidth, containerHeight);
           layeredPaneBounds = new Rectangle(i.left, i.top, containerWidth, containerHeight);
         }
@@ -321,7 +321,7 @@ public class JRootPane extends JComponent implements Accessible
   public static final int FILE_CHOOSER_DIALOG = 6;
   public static final int QUESTION_DIALOG = 7;
   public static final int WARNING_DIALOG = 8;
-          
+
   /** DOCUMENT ME! */
   protected Component glassPane;
 
@@ -366,7 +366,7 @@ public class JRootPane extends JComponent implements Accessible
    * @since 1.4
    */
   private int windowDecorationStyle = NONE;
-  
+
   /**
    * DOCUMENT ME!
    *
@@ -432,7 +432,7 @@ public class JRootPane extends JComponent implements Accessible
 
   /**
    * Sets the JRootPane's content pane.  The content pane should typically be
-   * opaque for painting to work properly.  This method also 
+   * opaque for painting to work properly.  This method also
    * removes the old content pane from the layered pane.
    *
    * @param p the Container that will be the content pane
@@ -505,10 +505,10 @@ public class JRootPane extends JComponent implements Accessible
   }
 
   /**
-   * Set the layered pane for the root pane. 
+   * Set the layered pane for the root pane.
    *
    * @param f The JLayeredPane to be used.
-   * 
+   *
    * @throws IllegalComponentStateException if JLayeredPane
    * parameter is null.
    */
@@ -516,10 +516,10 @@ public class JRootPane extends JComponent implements Accessible
   {
     if (f == null)
       throw new IllegalComponentStateException();
-    
+
     if (layeredPane != null)
       remove(layeredPane);
-    
+
     layeredPane = f;
     add(f, -1);
   }
@@ -628,7 +628,7 @@ public class JRootPane extends JComponent implements Accessible
   {
     return defaultButton;
   }
-  
+
   public void setDefaultButton(JButton newButton)
   {
     // We only change the default button if the new button is defaultCapable
@@ -665,7 +665,7 @@ public class JRootPane extends JComponent implements Accessible
         && style != WARNING_DIALOG
         && style != PLAIN_DIALOG)
       throw new IllegalArgumentException("invalid style");
-    
+
     int oldStyle = windowDecorationStyle;
     windowDecorationStyle = style;
     firePropertyChange("windowDecorationStyle", oldStyle, style);
diff --git a/libjava/classpath/javax/swing/JScrollBar.java b/libjava/classpath/javax/swing/JScrollBar.java
index 371bb60c65e..a6003167056 100644
--- a/libjava/classpath/javax/swing/JScrollBar.java
+++ b/libjava/classpath/javax/swing/JScrollBar.java
@@ -57,7 +57,7 @@ import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ScrollBarUI;
 
 /**
- * The JScrollBar. Two buttons control how the values that the 
+ * The JScrollBar. Two buttons control how the values that the
  * scroll bar can take. You can also drag the thumb or click the track
  * to move the scroll bar. Typically, the JScrollBar is used with
  * other components to translate the value of the bar to the viewable
@@ -73,7 +73,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
     implements AccessibleValue
   {
     private static final long serialVersionUID = -7758162392045586663L;
-    
+
     /**
      * Creates a new AccessibleJScrollBar instance.
      */
@@ -83,7 +83,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
     }
 
     /**
-     * Returns a set containing the current state of the {@link JScrollBar} 
+     * Returns a set containing the current state of the {@link JScrollBar}
      * component.
      *
      * @return The accessible state set.
@@ -109,7 +109,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
     }
 
     /**
-     * Returns an object that provides access to the current, minimum and 
+     * Returns an object that provides access to the current, minimum and
      * maximum values.
      *
      * @return The accessible value.
@@ -132,14 +132,14 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
 
     /**
      * Sets the current value of the {@link JScrollBar} component and sends a
-     * {@link PropertyChangeEvent} (with the property name 
+     * {@link PropertyChangeEvent} (with the property name
      * {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
-     * listeners.  If the supplied value is null, this method 
+     * listeners.  If the supplied value is null, this method
      * does nothing and returns false.
      *
      * @param value  the new slider value (null permitted).
      *
-     * @return true if the slider value is updated, and 
+     * @return true if the slider value is updated, and
      *     false otherwise.
      */
     public boolean setCurrentAccessibleValue(Number value)
@@ -148,7 +148,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
         return false;
       Number oldValue = getCurrentAccessibleValue();
       setValue(value.intValue());
-      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue, 
+      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
                          new Integer(getValue()));
       return true;
     }
@@ -195,11 +195,11 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
                                      m.getValueIsAdjusting());
         }
     }
-    
+
   }
 
   private static final long serialVersionUID = -8195169869225066566L;
-  
+
   /** How much the thumb moves when moving in a block. */
   protected int blockIncrement = 10;
 
@@ -218,7 +218,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
    */
   private ChangeListener sbChangeListener;
 
-  /** 
+  /**
    * Creates a new horizontal JScrollBar object with a minimum
    * of 0, a maxmium of 100, a value of 0 and an extent of 10.
    */
@@ -228,7 +228,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * Creates a new JScrollBar object with a minimum of 0, a 
+   * Creates a new JScrollBar object with a minimum of 0, a
    * maximum of 100, a value of 0, an extent of 10 and the given
    * orientation.
    *
@@ -240,7 +240,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * Creates a new JScrollBar object with the given orientation, 
+   * Creates a new JScrollBar object with the given orientation,
    * value, min, max, and extent.
    *
    * @param orientation The orientation to use.
@@ -294,7 +294,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * This method returns an identifier to 
+   * This method returns an identifier to
    * choose the correct UI delegate for the
    * scrollbar.
    *
@@ -327,15 +327,15 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
       throw new IllegalArgumentException("orientation must be one of HORIZONTAL or VERTICAL");
     if (orientation != this.orientation)
       {
-	int oldOrientation = this.orientation;
-	this.orientation = orientation;
-	firePropertyChange("orientation", oldOrientation,
-	                   this.orientation);
+        int oldOrientation = this.orientation;
+        this.orientation = orientation;
+        firePropertyChange("orientation", oldOrientation,
+                           this.orientation);
       }
   }
 
   /**
-   * This method returns the model being used with 
+   * This method returns the model being used with
    * the scrollbar.
    *
    * @return The scrollbar's model.
@@ -364,7 +364,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
 
   /**
    * This method returns how much the scrollbar's value
-   * should change for a unit increment depending on the 
+   * should change for a unit increment depending on the
    * given direction.
    *
    * @param direction The direction to scroll in.
@@ -385,10 +385,10 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   {
     if (unitIncrement != this.unitIncrement)
       {
-	int oldInc = this.unitIncrement;
-	this.unitIncrement = unitIncrement;
-	firePropertyChange("unitIncrement", oldInc,
-	                   this.unitIncrement);
+        int oldInc = this.unitIncrement;
+        this.unitIncrement = unitIncrement;
+        firePropertyChange("unitIncrement", oldInc,
+                           this.unitIncrement);
       }
   }
 
@@ -415,10 +415,10 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   {
     if (blockIncrement != this.blockIncrement)
       {
-	int oldInc = this.blockIncrement;
-	this.blockIncrement = blockIncrement;
-	firePropertyChange("blockIncrement", oldInc,
-	                   this.blockIncrement);
+        int oldInc = this.blockIncrement;
+        this.blockIncrement = blockIncrement;
+        firePropertyChange("blockIncrement", oldInc,
+                           this.blockIncrement);
       }
   }
 
@@ -463,8 +463,8 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * This method returns the visible amount (AKA extent). 
-   * The visible amount can be used by UI delegates to 
+   * This method returns the visible amount (AKA extent).
+   * The visible amount can be used by UI delegates to
    * determine the size of the thumb.
    *
    * @return The visible amount (AKA extent).
@@ -545,7 +545,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * This method sets the value, extent, minimum and 
+   * This method sets the value, extent, minimum and
    * maximum.
    *
    * @param newValue The new value.
@@ -570,7 +570,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * This method removes an AdjustmentListener from the scroll bar. 
+   * This method removes an AdjustmentListener from the scroll bar.
    *
    * @param listener The listener to remove.
    */
@@ -580,7 +580,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
   }
 
   /**
-   * This method returns an arry of all AdjustmentListeners listening to 
+   * This method returns an arry of all AdjustmentListeners listening to
    * this scroll bar.
    *
    * @return An array of AdjustmentListeners listening to this scroll bar.
@@ -594,7 +594,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
    * This method is called to fired AdjustmentEvents to the listeners
    * of this scroll bar. All AdjustmentEvents that are fired
    * will have an ID of ADJUSTMENT_VALUE_CHANGED and a type of
-   * TRACK. 
+   * TRACK.
    *
    * @param id The ID of the adjustment event.
    * @param type The Type of change.
@@ -658,14 +658,14 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
    */
   public void setEnabled(boolean x)
   {
-    // nothing special needs to be done here since we 
+    // nothing special needs to be done here since we
     // just check the enabled setting before changing the value.
     super.setEnabled(x);
   }
 
   /**
    * Returns a string describing the attributes for the JScrollBar
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
@@ -678,7 +678,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
     sb.append(",orientation=");
     if (this.orientation == JScrollBar.HORIZONTAL)
       sb.append("HORIZONTAL");
-    else 
+    else
       sb.append("VERTICAL");
     sb.append(",unitIncrement=").append(unitIncrement);
     return sb.toString();
@@ -688,7 +688,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
    * Returns the object that provides accessibility features for this
    * JScrollBar component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJScrollBar}).
    */
   public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JScrollPane.java b/libjava/classpath/javax/swing/JScrollPane.java
index f6d37c7b47d..6d17857d373 100644
--- a/libjava/classpath/javax/swing/JScrollPane.java
+++ b/libjava/classpath/javax/swing/JScrollPane.java
@@ -1,4 +1,4 @@
-/* JScrollPane.java -- 
+/* JScrollPane.java --
    Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -146,7 +146,7 @@ public class JScrollPane extends JComponent
   }
 
   private static final long serialVersionUID = 5203525440012340014L;
-  
+
   protected JViewport columnHeader;
   protected JViewport rowHeader;
 
@@ -171,9 +171,9 @@ public class JScrollPane extends JComponent
     return columnHeader;
   }
 
-  public Component getCorner(String key) 
+  public Component getCorner(String key)
   {
-    if (getComponentOrientation() 
+    if (getComponentOrientation()
         == ComponentOrientation.LEFT_TO_RIGHT)
       {
         if (key == LOWER_LEADING_CORNER)
@@ -185,7 +185,7 @@ public class JScrollPane extends JComponent
         else if (key == UPPER_TRAILING_CORNER)
           key = UPPER_RIGHT_CORNER;
       }
-    else if (getComponentOrientation() 
+    else if (getComponentOrientation()
              == ComponentOrientation.RIGHT_TO_LEFT)
       {
         if (key == LOWER_LEADING_CORNER)
@@ -261,14 +261,14 @@ public class JScrollPane extends JComponent
         else
           {
             Rectangle b = getViewport().getBounds();
-            return new Rectangle(b.x - i.left, 
+            return new Rectangle(b.x - i.left,
                                  b.y - i.top,
-                                 b.width + i.left + i.right, 
+                                 b.width + i.left + i.right,
                                  b.height + i.top + i.bottom);
           }
       }
   }
-  
+
   public boolean isWheelScrollingEnabled()
   {
     return wheelScrollingEnabled;
@@ -310,7 +310,7 @@ public class JScrollPane extends JComponent
   {
     if (columnHeader == h)
       return;
-    
+
     JViewport old = columnHeader;
     removeNonNull(old);
     columnHeader = h;
@@ -329,7 +329,7 @@ public class JScrollPane extends JComponent
 
   public void setCorner(String key, Component c)
   {
-    if (getComponentOrientation() 
+    if (getComponentOrientation()
         == ComponentOrientation.LEFT_TO_RIGHT)
       {
         if (key == LOWER_LEADING_CORNER)
@@ -341,7 +341,7 @@ public class JScrollPane extends JComponent
         else if (key == UPPER_TRAILING_CORNER)
           key = UPPER_RIGHT_CORNER;
       }
-    else if (getComponentOrientation() 
+    else if (getComponentOrientation()
              == ComponentOrientation.RIGHT_TO_LEFT)
       {
         if (key == LOWER_LEADING_CORNER)
@@ -401,11 +401,11 @@ public class JScrollPane extends JComponent
   {
     if (horizontalScrollBarPolicy == h)
       return;
-    
+
     if (h != HORIZONTAL_SCROLLBAR_AS_NEEDED
         && h != HORIZONTAL_SCROLLBAR_NEVER
         && h != HORIZONTAL_SCROLLBAR_ALWAYS)
-      throw new IllegalArgumentException("unknown horizontal scrollbar policy");    
+      throw new IllegalArgumentException("unknown horizontal scrollbar policy");
 
     int old = horizontalScrollBarPolicy;
     horizontalScrollBarPolicy = h;
@@ -428,7 +428,7 @@ public class JScrollPane extends JComponent
   {
     if (rowHeader == v)
       return;
-    
+
     JViewport old = rowHeader;
     removeNonNull(old);
     rowHeader = v;
@@ -449,7 +449,7 @@ public class JScrollPane extends JComponent
   {
     if (verticalScrollBar == v)
       return;
-    
+
     JScrollBar old = verticalScrollBar;
     removeNonNull(old);
     verticalScrollBar = v;
@@ -462,12 +462,12 @@ public class JScrollPane extends JComponent
   {
     if (verticalScrollBarPolicy == v)
       return;
-    
+
     if (v != VERTICAL_SCROLLBAR_AS_NEEDED
         && v != VERTICAL_SCROLLBAR_NEVER
         && v != VERTICAL_SCROLLBAR_ALWAYS)
-      throw new IllegalArgumentException("unknown vertical scrollbar policy");    
-    
+      throw new IllegalArgumentException("unknown vertical scrollbar policy");
+
     int old = verticalScrollBarPolicy;
     verticalScrollBarPolicy = v;
     firePropertyChange("verticalScrollBarPolicy", old, v);
@@ -479,7 +479,7 @@ public class JScrollPane extends JComponent
   {
     if (wheelScrollingEnabled == b)
       return;
-    
+
     boolean old = wheelScrollingEnabled;
     wheelScrollingEnabled = b;
     firePropertyChange("wheelScrollingEnabled", old, b);
@@ -490,7 +490,7 @@ public class JScrollPane extends JComponent
   {
     if (viewport == v)
       return;
-    
+
     JViewport old = viewport;
     removeNonNull(old);
     viewport = v;
@@ -510,20 +510,20 @@ public class JScrollPane extends JComponent
   {
     if (viewportBorder == b)
       return;
-    
+
     Border old = viewportBorder;
     viewportBorder = b;
     firePropertyChange("viewportBorder", old, b);
     sync();
   }
-    
+
   public void setViewportView(Component view)
   {
     if (getViewport() == null)
       {
         setViewport(createViewport());
       }
-	
+
     if (view != null)
       {
         getViewport().setView(view);
@@ -541,7 +541,7 @@ public class JScrollPane extends JComponent
    * policy is set to {@link #VERTICAL_SCROLLBAR_AS_NEEDED} and
    * {@link #HORIZONTAL_SCROLLBAR_AS_NEEDED}.
    */
-  public JScrollPane() 
+  public JScrollPane()
   {
     this(null);
   }
@@ -553,10 +553,10 @@ public class JScrollPane extends JComponent
    *
    * @param view the component that is embedded inside the JScrollPane
    */
-  public JScrollPane(Component view) 
+  public JScrollPane(Component view)
   {
-    this(view, 
-         VERTICAL_SCROLLBAR_AS_NEEDED, 
+    this(view,
+         VERTICAL_SCROLLBAR_AS_NEEDED,
          HORIZONTAL_SCROLLBAR_AS_NEEDED);
   }
 
@@ -574,7 +574,7 @@ public class JScrollPane extends JComponent
    * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
    * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
    */
-  public JScrollPane(int vsbPolicy, int hsbPolicy) 
+  public JScrollPane(int vsbPolicy, int hsbPolicy)
   {
     this(null, vsbPolicy, hsbPolicy);
   }
@@ -594,7 +594,7 @@ public class JScrollPane extends JComponent
    * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_AS_NEEDED
    * @see ScrollPaneConstants#VERTICAL_SCROLLBAR_NEVER
    */
-  public JScrollPane(Component view, int vsbPolicy, int hsbPolicy) 
+  public JScrollPane(Component view, int vsbPolicy, int hsbPolicy)
   {
     wheelScrollingEnabled = true;
     setVerticalScrollBarPolicy(vsbPolicy);
@@ -610,7 +610,7 @@ public class JScrollPane extends JComponent
     updateUI();
   }
 
-  
+
   public JScrollBar createHorizontalScrollBar()
   {
     return new ScrollBar(SwingConstants.HORIZONTAL);
@@ -620,7 +620,7 @@ public class JScrollPane extends JComponent
   {
     return new ScrollBar(SwingConstants.VERTICAL);
   }
-    
+
   protected JViewport createViewport()
   {
     return new JViewport();
@@ -630,11 +630,11 @@ public class JScrollPane extends JComponent
   {
     return "ScrollPaneUI";
   }
-  
+
   public void updateUI()
   {
     setUI((ScrollPaneUI) UIManager.getUI(this));
-  }  
+  }
 
   /**
    * This method returns the scrollpane's UI delegate.
@@ -656,7 +656,7 @@ public class JScrollPane extends JComponent
     super.setUI(ui);
   }
 
-  protected class ScrollBar 
+  protected class ScrollBar
     extends JScrollBar
     implements UIResource
   {
@@ -675,7 +675,7 @@ public class JScrollPane extends JComponent
       else
         {
           Scrollable s = (Scrollable) view;
-          return s.getScrollableBlockIncrement(JScrollPane.this.getViewport().getViewRect(), 
+          return s.getScrollableBlockIncrement(JScrollPane.this.getViewport().getViewRect(),
                                                this.getOrientation(),
                                                direction);
         }
@@ -689,7 +689,7 @@ public class JScrollPane extends JComponent
       else
         {
           Scrollable s = (Scrollable) view;
-          return s.getScrollableUnitIncrement(JScrollPane.this.getViewport().getViewRect(), 
+          return s.getScrollableUnitIncrement(JScrollPane.this.getViewport().getViewRect(),
                                               this.getOrientation(),
                                               direction);
         }
diff --git a/libjava/classpath/javax/swing/JSeparator.java b/libjava/classpath/javax/swing/JSeparator.java
index c87783b73eb..15d15fd8bfb 100644
--- a/libjava/classpath/javax/swing/JSeparator.java
+++ b/libjava/classpath/javax/swing/JSeparator.java
@@ -58,7 +58,7 @@ public class JSeparator extends JComponent implements SwingConstants,
   protected class AccessibleJSeparator extends AccessibleJComponent
   {
     private static final long serialVersionUID = 916332890553201095L;
-  
+
     /**
      * Creates a new AccessibleJSeparator instance.
      */
@@ -79,7 +79,7 @@ public class JSeparator extends JComponent implements SwingConstants,
   }
 
   private static final long serialVersionUID = 125301223445282357L;
-  
+
   /** The orientation of the JSeparator. */
   private transient int orientation = HORIZONTAL;
 
@@ -94,9 +94,9 @@ public class JSeparator extends JComponent implements SwingConstants,
   /**
    * Creates a new JSeparator object with the given orientation.
    *
-   * @param orientation  the orientation (either {@link #HORIZONTAL} or 
+   * @param orientation  the orientation (either {@link #HORIZONTAL} or
    *     {@link #VERTICAL}).
-   *     
+   *
    * @throws IllegalArgumentException if orientation is not
    *     one of the specified values.
    */
@@ -139,8 +139,8 @@ public class JSeparator extends JComponent implements SwingConstants,
   }
 
   /**
-   * Returns the suffix ("SeparatorUI" in this case) used to 
-   * determine the class name for a UI delegate that can provide the look and 
+   * Returns the suffix ("SeparatorUI" in this case) used to
+   * determine the class name for a UI delegate that can provide the look and
    * feel for a JSeparator.
    *
    * @return "SeparatorUI".
@@ -154,7 +154,7 @@ public class JSeparator extends JComponent implements SwingConstants,
    * Returns the orientation of the JSeparator.
    *
    * @return The orientation (one of {@link #HORIZONTAL} and {@link #VERTICAL}).
-   * 
+   *
    * @see #setOrientation(int)
    */
   public int getOrientation()
@@ -163,16 +163,16 @@ public class JSeparator extends JComponent implements SwingConstants,
   }
 
   /**
-   * Sets the orientation for the JSeparator and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * Sets the orientation for the JSeparator and sends a
+   * {@link PropertyChangeEvent} (with the property name
    * orientation) to all registered listeners.
    *
-   * @param orientation  the orientation (either {@link #HORIZONTAL} or 
+   * @param orientation  the orientation (either {@link #HORIZONTAL} or
    *     {@link #VERTICAL}).
-   *     
+   *
    * @throws IllegalArgumentException if orientation is not
    *     one of the specified values.
-   *     
+   *
    * @see #getOrientation()
    */
   public void setOrientation(int orientation)
@@ -205,14 +205,14 @@ public class JSeparator extends JComponent implements SwingConstants,
    * Returns the object that provides accessibility features for this
    * JSeparator component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJSeparator}).
    */
   public AccessibleContext getAccessibleContext()
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleJSeparator();
-    
+
     return accessibleContext;
   }
 }
diff --git a/libjava/classpath/javax/swing/JSlider.java b/libjava/classpath/javax/swing/JSlider.java
index 979707a7264..a6f51138d82 100644
--- a/libjava/classpath/javax/swing/JSlider.java
+++ b/libjava/classpath/javax/swing/JSlider.java
@@ -67,17 +67,17 @@ import javax.swing.plaf.UIResource;
  * 
                    
  * A JSlider component has the following properties:
  * 
                    
- * 
+ *
  * 
  * 
  * 
  * 
  * 
- *  
+ * 
  * 
  * 
  * 
- *  
+ * 
  * 
  * 
  * 
@@ -85,11 +85,11 @@ import javax.swing.plaf.UIResource;
  * 
  * 
  * 
                     Property          Stored in  Bound? 
                     extent            model      no     
                     inverted          slider     yes    
                     labelTable        slider     yes    
                     majorTickSpacing  slider     yes    
                     majorTickSpacing  slider     yes    
                     maximum           model      yes     
                     minimum           model      yes     
                     minorTickSpacing  slider     yes    
                     model             slider     yes    
                     model             slider     yes    
                     orientation       slider     yes    
                     paintLabels       slider     yes    
                     paintTicks        slider     yes    
                     value             model      no     
                     valueIsAdjusting  model      no     
                    
- * 
+ *
  * 
                    
  * The various behavioural aspects of these properties follows:
  * 
                    
- * 
+ *
  * 
                      
  * 
                    • 
  * When a non-bound property stored in the slider changes, the slider fires
@@ -100,11 +100,11 @@ import javax.swing.plaf.UIResource;
  * {@link PropertyChangeEvent} to its property change listeners.
  * 
                      • 
  * 
                    • 
- * If any of the model's properties change, it fires a {@link ChangeEvent} to 
+ * If any of the model's properties change, it fires a {@link ChangeEvent} to
  * its listeners, which include the slider.
  * 
                      • 
  * 
                    • 
- * If the slider receives a {@link ChangeEvent} from its model, it will 
+ * If the slider receives a {@link ChangeEvent} from its model, it will
  * propagate the event to its own change listeners, with the event's "source"
  * property set to refer to the slider, rather than the model.
  * 
                      • 
@@ -140,7 +140,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
     implements AccessibleValue
   {
     private static final long serialVersionUID = -6301740148041106789L;
-  
+
     /**
      * Creates a new AccessibleJSlider instance.
      */
@@ -150,7 +150,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
     }
 
     /**
-     * Returns a set containing the current state of the {@link JSlider} 
+     * Returns a set containing the current state of the {@link JSlider}
      * component.
      *
      * @return The accessible state set.
@@ -176,8 +176,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
     }
 
     /**
-     * Returns an object that provides access to the current, minimum and 
-     * maximum values for the {@link JSlider}.  Since this class implements 
+     * Returns an object that provides access to the current, minimum and
+     * maximum values for the {@link JSlider}.  Since this class implements
      * {@link AccessibleValue}, it returns itself.
      *
      * @return The accessible value.
@@ -200,14 +200,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
 
     /**
      * Sets the current value of the {@link JSlider} component and sends a
-     * {@link PropertyChangeEvent} (with the property name 
+     * {@link PropertyChangeEvent} (with the property name
      * {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
-     * listeners.  If the supplied value is null, this method 
+     * listeners.  If the supplied value is null, this method
      * does nothing and returns false.
      *
      * @param value  the new slider value (null permitted).
      *
-     * @return true if the slider value is updated, and 
+     * @return true if the slider value is updated, and
      *     false otherwise.
      */
     public boolean setCurrentAccessibleValue(Number value)
@@ -216,7 +216,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
         return false;
       Number oldValue = getCurrentAccessibleValue();
       setValue(value.intValue());
-      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue, 
+      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
                          new Integer(getValue()));
       return true;
     }
@@ -277,9 +277,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   /** Whether the slider is inverted. */
   private transient boolean isInverted;
 
-  /** 
+  /**
    * The listener that monitors the slider's model and forwards events to the
-   * slider's listeners (see createChangeListener()). 
+   * slider's listeners (see createChangeListener()).
    */
   protected ChangeListener changeListener;
 
@@ -287,7 +287,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   protected transient ChangeEvent changeEvent;
 
   /**
-   * Creates a new horizontal JSlider instance with a minimum of 
+   * Creates a new horizontal JSlider instance with a minimum of
    * 0, a maximum of 100, and a value of 50.
    */
   public JSlider()
@@ -296,12 +296,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a new JSlider instance with the given orientation 
+   * Creates a new JSlider instance with the given orientation
    * and a minimum of 0, a maximum of 100, and a value of 50.
    *
    * @param orientation The orientation of the slider ({@link #HORIZONTAL} or
    *                    {@link #VERTICAL}).
-   * 
+   *
    * @throws IllegalArgumentException if orientation is not one of
    *         the specified values.
    */
@@ -311,13 +311,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a new horizontal JSlider instance with the given 
+   * Creates a new horizontal JSlider instance with the given
    * maximum and minimum and a value that is halfway between the minimum and the
    * maximum.
    *
    * @param minimum The minimum value.
    * @param maximum The maximum value.
-   * 
+   *
    * @throws IllegalArgumentException if minimum is greater than
    *     maximum.
    */
@@ -327,14 +327,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a new horizontal JSlider instance with the given 
+   * Creates a new horizontal JSlider instance with the given
    * minimum, maximum, and value.
    *
    * @param minimum The minimum value.
    * @param maximum The maximum value.
    * @param value The initial value.
-   * 
-   * @throws IllegalArgumentException if value is not in the 
+   *
+   * @throws IllegalArgumentException if value is not in the
    *     specified range.
    * @throws IllegalArgumentException if minimum is greater than
    *     maximum.
@@ -345,7 +345,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a new JSlider instance with the given orientation, 
+   * Creates a new JSlider instance with the given orientation,
    * minimum, maximum, and value.
    *
    * @param orientation The orientation of the slider ({@link #HORIZONTAL} or
@@ -353,10 +353,10 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * @param minimum The minimum value of the JSlider.
    * @param maximum The maximum value of the JSlider.
    * @param value The initial value of the JSlider.
-   * 
+   *
    * @throws IllegalArgumentException if orientation is not one of
    *     the specified values.
-   * @throws IllegalArgumentException if value is not in the 
+   * @throws IllegalArgumentException if value is not in the
    *     specified range.
    * @throws IllegalArgumentException if minimum is greater than
    *     maximum.
@@ -365,7 +365,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   {
     sliderModel = new DefaultBoundedRangeModel(value, 0, minimum, maximum);
     if (orientation != HORIZONTAL && orientation != VERTICAL)
-      throw new IllegalArgumentException(orientation 
+      throw new IllegalArgumentException(orientation
                                          + " is not a legal orientation");
     this.orientation = orientation;
     changeListener = createChangeListener();
@@ -374,11 +374,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a new horizontal JSlider instance with the given 
+   * Creates a new horizontal JSlider instance with the given
    * model.
    *
    * @param model The model (null not permitted).
-   * 
+   *
    * @throws NullPointerException if model is null.
    */
   public JSlider(BoundedRangeModel model)
@@ -393,7 +393,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the slider's value (from the slider's model).
    *
    * @return The value of the slider.
-   * 
+   *
    * @see #setValue(int)
    */
   public int getValue()
@@ -402,14 +402,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the slider's value and sends a {@link ChangeEvent} to all 
+   * Sets the slider's value and sends a {@link ChangeEvent} to all
    * registered listeners.  Note that the model will fire a change event to all
    * of its registered listeners first (with the model as the event source) and
    * then the slider will fire another change event to all of its registered
    * listeners (this time with the slider as the event source).
    *
    * @param value  the new value.
-   * 
+   *
    * @see #getValue()
    */
   public void setValue(int value)
@@ -448,8 +448,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Returns the suffix ("SliderUI" in this case) used to 
-   * determine the class name for a UI delegate that can provide the look and 
+   * Returns the suffix ("SliderUI" in this case) used to
+   * determine the class name for a UI delegate that can provide the look and
    * feel for a JSlider.
    *
    * @return "SliderUI".
@@ -462,7 +462,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   /**
    * Creates a {@link ChangeListener} that is added to the slider's model and
    * forwards change events generated by the model to the listeners that are
-   * registered with the JSlider (by calling the 
+   * registered with the JSlider (by calling the
    * {@link #fireStateChanged} method).
    *
    * @return A new listener.
@@ -474,7 +474,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
         public void stateChanged(ChangeEvent ce)
         {
           // No need to trigger a repaint since the UI listens to the model
-          // as well. All we need to do is pass on the stateChanged event 
+          // as well. All we need to do is pass on the stateChanged event
           // to our listeners.
           fireStateChanged();
         }
@@ -482,13 +482,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Registers a listener with the slider so that it will receive 
+   * Registers a listener with the slider so that it will receive
    * {@link ChangeEvent} notifications.  Note that change events generated
    * by the slider's model will be forwarded automatically to the slider's
    * listeners.
    *
    * @param listener  the listener to register.
-   * 
+   *
    * @see #removeChangeListener(ChangeListener)
    */
   public void addChangeListener(ChangeListener listener)
@@ -501,7 +501,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * {@link ChangeEvent} notifications from the slider.
    *
    * @param listener The listener to remove.
-   * 
+   *
    * @see #addChangeListener(ChangeListener)
    */
   public void removeChangeListener(ChangeListener listener)
@@ -510,7 +510,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sends a {@link ChangeEvent} to all registered listeners, with this slider 
+   * Sends a {@link ChangeEvent} to all registered listeners, with this slider
    * as the source.
    */
   protected void fireStateChanged()
@@ -526,12 +526,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Returns an array containing all the {@link ChangeListener} instances 
+   * Returns an array containing all the {@link ChangeListener} instances
    * registered with this slider.  If no listeners are registered, this method
    * returns an empty array.
    *
-   * @return An array array containing all the {@link ChangeListener} instances 
-   *     registered with this slider (possibly empty, but never 
+   * @return An array array containing all the {@link ChangeListener} instances
+   *     registered with this slider (possibly empty, but never
    *     null).
    */
   public ChangeListener[] getChangeListeners()
@@ -540,11 +540,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Returns the slider's model, which stores the minimum, maximum and current 
+   * Returns the slider's model, which stores the minimum, maximum and current
    * values.
    *
    * @return The slider's model.
-   * 
+   *
    * @see #setModel(BoundedRangeModel)
    */
   public BoundedRangeModel getModel()
@@ -556,12 +556,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Sets the slider's model and sends a {@link PropertyChangeEvent} (with the
    * property name "model") to all registered listeners.   The change listener
    * that the slider registered with the original model is removed and added
-   * to the new model (this ensures that {@link ChangeEvent} notifications 
+   * to the new model (this ensures that {@link ChangeEvent} notifications
    * generated by the model are automatically forwarded to listeners that are
    * registered with the slider).
    *
    * @param model The model to use with the slider.
-   * 
+   *
    * @see #getModel()
    */
   public void setModel(BoundedRangeModel model)
@@ -583,7 +583,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the minimum value of the slider (from the slider's model).
    *
    * @return The minimum value of the slider.
-   * 
+   *
    * @see #setMinimum(int)
    */
   public int getMinimum()
@@ -592,19 +592,19 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the minimum value of the slider and fires a 
+   * Sets the minimum value of the slider and fires a
    * {@link PropertyChangeEvent} (with the property name "minimum") to all
    * registered listeners.  Note that:
    * 
                      
    * 
                        
-   * 
                      • the minimum value is stored in the slider's model (see 
+   * 
                      • the minimum value is stored in the slider's model (see
    *     {@link #getModel()});
                        • 
-   * 
                      • in addition to the property change event, the slider also fires a 
+   * 
                      • in addition to the property change event, the slider also fires a
    *     {@link ChangeEvent}.
                        • 
    * 
                      
-   * 
+   *
    * @param minimum The minimum value of the slider.
-   * 
+   *
    * @see #getMinimum()
    */
   public void setMinimum(int minimum)
@@ -619,7 +619,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the slider's maximum value (obtained from the slider's model).
    *
    * @return The maximum value of the slider.
-   * 
+   *
    * @see #setMaximum(int)
    */
   public int getMaximum()
@@ -628,19 +628,19 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the maximum value of the slider and fires a 
+   * Sets the maximum value of the slider and fires a
    * {@link PropertyChangeEvent} (with the property name "maximum") to all
    * registered listeners.  Note that:
    * 
                      
    * 
                        
-   * 
                      • the maximum value is stored in the slider's model (see 
+   * 
                      • the maximum value is stored in the slider's model (see
    *     {@link #getModel()});
                        • 
-   * 
                      • in addition to the property change event, the slider also fires a 
+   * 
                      • in addition to the property change event, the slider also fires a
    *     {@link ChangeEvent}.
                        • 
    * 
                      
    *
    * @param maximum The maximum value of the slider.
-   * 
+   *
    * @see #getMaximum()
    */
   public void setMaximum(int maximum)
@@ -655,7 +655,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the valueIsAdjusting flag from the slider's model.
    *
    * @return The valueIsAdjusting flag from the slider's model.
-   * 
+   *
    * @see #setValueIsAdjusting(boolean)
    */
   public boolean getValueIsAdjusting()
@@ -664,11 +664,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the valueIsAdjusting flag in the slider's model, and 
+   * Sets the valueIsAdjusting flag in the slider's model, and
    * sends a {@link ChangeEvent} to all registered listeners.
    *
    * @param adjusting  the new flag value.
-   * 
+   *
    * @see #getValueIsAdjusting()
    */
   public void setValueIsAdjusting(boolean adjusting)
@@ -680,7 +680,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the slider's extent value, obtained from the slider's model.
    *
    * @return The extent value.
-   * 
+   *
    * @see #setExtent(int)
    */
   public int getExtent()
@@ -689,14 +689,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the slider's extent value and sends a {@link ChangeEvent} to all 
+   * Sets the slider's extent value and sends a {@link ChangeEvent} to all
    * registered listeners.  Note that the model will fire a change event to all
    * of its registered listeners first (with the model as the event source) and
    * then the slider will fire another change event to all of its registered
    * listeners (this time with the slider as the event source).
    *
    * @param extent The extent value for this slider.
-   * 
+   *
    * @see #getExtent()
    */
   public void setExtent(int extent)
@@ -709,7 +709,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * or {@link JSlider#VERTICAL}.
    *
    * @return The orientation of the slider.
-   * 
+   *
    * @see #setOrientation(int)
    */
   public int getOrientation()
@@ -718,16 +718,16 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the orientation for the slider and sends a 
+   * Sets the orientation for the slider and sends a
    * {@link PropertyChangeEvent} (with the property name "orientation") to all
    * registered listeners.
    *
    * @param orientation  the orientation (one of {@link JSlider#HORIZONTAL} or
    *     {@link JSlider#VERTICAL}).
-   *     
+   *
    * @throws IllegalArgumentException if orientation is not one of
    *     the permitted values.
-   *     
+   *
    * @see #getOrientation()
    */
   public void setOrientation(int orientation)
@@ -748,7 +748,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the label table for the slider.
    *
    * @return The label table for the slider (possibly null).
-   * 
+   *
    * @see #setLabelTable(Dictionary)
    */
   public Dictionary getLabelTable()
@@ -757,12 +757,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the table of labels for the slider and sends a 
-   * {@link PropertyChangeEvent} (with the property name "labelTable") to all 
+   * Sets the table of labels for the slider and sends a
+   * {@link PropertyChangeEvent} (with the property name "labelTable") to all
    * registered listeners.
    *
    * @param table  the table of labels (null permitted).
-   * 
+   *
    * @see #getLabelTable()
    */
   public void setLabelTable(Dictionary table)
@@ -779,7 +779,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Resets the UI delegates for the labels in the labelTable to 
+   * Resets the UI delegates for the labels in the labelTable to
    * the default for the current look and feel.
    */
   protected void updateLabelUIs()
@@ -800,8 +800,8 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a hashtable of (Integer, JLabel) pairs that can be 
-   * used as a label table for this slider. The labels will start from the 
+   * Creates a hashtable of (Integer, JLabel) pairs that can be
+   * used as a label table for this slider. The labels will start from the
    * slider's minimum and increase by the increment. Each label will have a text
    * string indicating its integer value.
    *
@@ -818,9 +818,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Creates a hashtable of (Integer, JLabel) pairs that can be 
-   * used as a label table for this slider. The labels will start from the 
-   * given start value and increase by the increment. Each  label will have a 
+   * Creates a hashtable of (Integer, JLabel) pairs that can be
+   * used as a label table for this slider. The labels will start from the
+   * given start value and increase by the increment. Each  label will have a
    * text string indicating its integer value.
    *
    * @param increment The increment between labels (must be > 0).
@@ -834,7 +834,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    */
   public Hashtable createStandardLabels(int increment, int start)
   {
-    if (increment <= 0) 
+    if (increment <= 0)
       throw new IllegalArgumentException("Requires 'increment' > 0.");
     if (start < getMinimum() || start > getMaximum())
       throw new IllegalArgumentException("The 'start' value is out of range.");
@@ -855,7 +855,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    *
    * @return The flag that controls whether or not the value scale for the
    *     slider is inverted.
-   *     
+   *
    * @see #setInverted(boolean)
    */
   public boolean getInverted()
@@ -867,14 +867,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Sets the flag that controls whether or not the value scale for the
    * slider is inverted and, if the new flag value is different to the old flag
    * value, sends a {@link PropertyChangeEvent} to all registered listeners.
-   * Typically, a horizontal slider will display a scale that increases from 
-   * left to right, but this is reversed if the 'inverted' flag is set to 
+   * Typically, a horizontal slider will display a scale that increases from
+   * left to right, but this is reversed if the 'inverted' flag is set to
    * true.  Similarly, a vertical slider will display a scale that
    * increases from bottom to top, and this is reversed if the 'inverted' flag
    * is set to true.
    *
    * @param inverted  the new flag value.
-   * 
+   *
    * @see #getInverted()
    */
   public void setInverted(boolean inverted)
@@ -889,11 +889,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Returns the distance between major tick marks along the slider's value 
+   * Returns the distance between major tick marks along the slider's value
    * scale.
    *
    * @return The amount of units between each major tick mark.
-   * 
+   *
    * @see #setMajorTickSpacing(int)
    */
   public int getMajorTickSpacing()
@@ -902,12 +902,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the distance between major tick marks along the slider's value scale, 
-   * and sends a {@link PropertyChangeEvent} (with the property name 
+   * Sets the distance between major tick marks along the slider's value scale,
+   * and sends a {@link PropertyChangeEvent} (with the property name
    * "majorTickSpacing") to all registered listeners.
    *
    * @param spacing  the distance between major tick marks.
-   * 
+   *
    * @see #getMajorTickSpacing()
    */
   public void setMajorTickSpacing(int spacing)
@@ -925,12 +925,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Returns the distance between minor tick marks along the slider's value 
+   * Returns the distance between minor tick marks along the slider's value
    * scale.
    *
-   * @return The distance between minor tick marks along the slider's value 
+   * @return The distance between minor tick marks along the slider's value
    *     scale.
-   *     
+   *
    * @see #setMinorTickSpacing(int)
    */
   public int getMinorTickSpacing()
@@ -939,12 +939,12 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the distance between minor tick marks along the slider's value scale, 
-   * and sends a {@link PropertyChangeEvent} (with the property name 
+   * Sets the distance between minor tick marks along the slider's value scale,
+   * and sends a {@link PropertyChangeEvent} (with the property name
    * "minorTickSpacing") to all registered listeners.
    *
    * @param spacing  the distance between minor tick marks.
-   * 
+   *
    * @see #getMinorTickSpacing()
    */
   public void setMinorTickSpacing(int spacing)
@@ -961,11 +961,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
 
   /**
    * Returns the flag that controls whether the slider thumb will snap to ticks.
-   * Sliders that snap to ticks will automatically move the thumb to the 
+   * Sliders that snap to ticks will automatically move the thumb to the
    * nearest tick mark.
    *
    * @return true if the slider thumb automatically.
-   * 
+   *
    * @see #setSnapToTicks(boolean)
    */
   public boolean getSnapToTicks()
@@ -974,13 +974,13 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   }
 
   /**
-   * Sets the flag that controls whether the slider thumb will snap to ticks 
-   * and sends a {@link PropertyChangeEvent} (with the property name 
-   * 'snapToTicks') to all registered listeners. Sliders that snap to ticks 
+   * Sets the flag that controls whether the slider thumb will snap to ticks
+   * and sends a {@link PropertyChangeEvent} (with the property name
+   * 'snapToTicks') to all registered listeners. Sliders that snap to ticks
    * will automatically move the thumb to the nearest tick mark.
    *
    * @param snap  the new flag value.
-   * 
+   *
    * @see #getSnapToTicks()
    */
   public void setSnapToTicks(boolean snap)
@@ -996,9 +996,9 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the flag that controls whether or not tick marks are painted along
    * the slider's value scale.
    *
-   * @return true if tick marks should be painted, and 
+   * @return true if tick marks should be painted, and
    *     false if tick marks should not be painted.
-   *     
+   *
    * @see #setPaintTicks(boolean)
    */
   public boolean getPaintTicks()
@@ -1008,14 +1008,14 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
 
   /**
    * Sets the flag that controls whether or not tick marks are painted along
-   * the slider's value scale, and sends a {@link PropertyChangeEvent} (with 
+   * the slider's value scale, and sends a {@link PropertyChangeEvent} (with
    * the property name "paintTicks") to all registered listeners. In
    * addition to setting this property to true, one or both of the
-   * minor tick spacing and major tick spacing attributes must be set to a 
+   * minor tick spacing and major tick spacing attributes must be set to a
    * value greater than 0 in order for ticks to be painted.
    *
    * @param paint Whether ticks will be painted.
-   * 
+   *
    * @see #getPaintTicks()
    */
   public void setPaintTicks(boolean paint)
@@ -1034,7 +1034,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * Returns the flag that controls whether or not the track is painted.
    *
    * @return Whether the track will be painted.
-   * 
+   *
    * @see #setPaintTrack(boolean)
    */
   public boolean getPaintTrack()
@@ -1048,7 +1048,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * registered listeners.
    *
    * @param paint Whether the track will be painted.
-   * 
+   *
    * @see #getPaintTrack()
    */
   public void setPaintTrack(boolean paint)
@@ -1066,7 +1066,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
    * tick marks along the slider.
    *
    * @return Whether labels will be painted.
-   * 
+   *
    * @see #setPaintLabels(boolean)
    */
   public boolean getPaintLabels()
@@ -1076,11 +1076,11 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
 
   /**
    * Sets the flag that controls whether or not labels are painted for the
-   * tick marks along the slider and sends a {@link PropertyChangeEvent} (with 
+   * tick marks along the slider and sends a {@link PropertyChangeEvent} (with
    * the property name "paintLabels") to all registered listeners.
    *
    * @param paint Whether labels will be painted.
-   * 
+   *
    * @see #getPaintLabels()
    */
   public void setPaintLabels(boolean paint)
@@ -1119,7 +1119,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
     sb.append(",paintTicks=").append(getPaintTicks());
     sb.append(",paintTrack=").append(getPaintTrack());
     sb.append(",snapToTicks=").append(getSnapToTicks());
-    
+
     // the following is output by the reference implementation.  We don't
     // strictly need to replicate this. Perhaps it has some meaning, but
     // I couldn't determine it yet...
@@ -1138,7 +1138,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible,
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleJSlider();
-    
+
     return accessibleContext;
   }
 }
diff --git a/libjava/classpath/javax/swing/JSpinner.java b/libjava/classpath/javax/swing/JSpinner.java
index 16a210600cd..e942caead53 100644
--- a/libjava/classpath/javax/swing/JSpinner.java
+++ b/libjava/classpath/javax/swing/JSpinner.java
@@ -66,18 +66,18 @@ import javax.swing.text.NumberFormatter;
  * from a list.
  *
  * @author Ka-Hing Cheung
- * 
+ *
  * @since 1.4
  */
 public class JSpinner extends JComponent
 {
   /**
-   * The base class for the editor used by the {@link JSpinner} component.  
+   * The base class for the editor used by the {@link JSpinner} component.
    * The editor is in fact a panel containing a {@link JFormattedTextField}
    * component.
    */
-  public static class DefaultEditor 
-    extends JPanel 
+  public static class DefaultEditor
+    extends JPanel
     implements ChangeListener, PropertyChangeListener, LayoutManager
   {
     /** The spinner that the editor is allocated to. */
@@ -92,7 +92,7 @@ public class JSpinner extends JComponent
     private static final long serialVersionUID = -5317788736173368172L;
 
     /**
-     * Creates a new DefaultEditor object.  The editor is 
+     * Creates a new DefaultEditor object.  The editor is
      * registered with the spinner as a {@link ChangeListener} here.
      *
      * @param spinner the JSpinner associated with this editor
@@ -107,23 +107,23 @@ public class JSpinner extends JComponent
       ftf.setValue(spinner.getValue());
       ftf.addPropertyChangeListener(this);
       if (getComponentOrientation().isLeftToRight())
-	ftf.setHorizontalAlignment(JTextField.RIGHT);
+        ftf.setHorizontalAlignment(JTextField.RIGHT);
       else
-	ftf.setHorizontalAlignment(JTextField.LEFT);
+        ftf.setHorizontalAlignment(JTextField.LEFT);
       spinner.addChangeListener(this);
     }
 
     /**
      * Returns the JSpinner component that the editor is assigned
      * to.
-     * 
+     *
      * @return The spinner that the editor is assigned to.
      */
     public JSpinner getSpinner()
     {
       return spinner;
     }
-    
+
     /**
      * DOCUMENT ME!
      */
@@ -144,7 +144,7 @@ public class JSpinner extends JComponent
     }
 
     /**
-     * Returns the text field used to display and edit the current value in 
+     * Returns the text field used to display and edit the current value in
      * the spinner.
      *
      * @return The text field.
@@ -153,7 +153,7 @@ public class JSpinner extends JComponent
     {
       return ftf;
     }
-    
+
     /**
      * Sets the bounds for the child components in this container.  In this
      * case, the text field is the only component to be laid out.
@@ -168,7 +168,7 @@ public class JSpinner extends JComponent
                     size.width - insets.left - insets.right,
                     size.height - insets.top - insets.bottom);
     }
-    
+
     /**
      * Calculates the minimum size for this component.  In this case, the
      * text field is the only subcomponent, so the return value is the minimum
@@ -185,10 +185,10 @@ public class JSpinner extends JComponent
       return new Dimension(minSize.width + insets.left + insets.right,
                             minSize.height + insets.top + insets.bottom);
     }
-    
+
     /**
      * Calculates the preferred size for this component.  In this case, the
-     * text field is the only subcomponent, so the return value is the 
+     * text field is the only subcomponent, so the return value is the
      * preferred size of the text field plus the insets of this component.
      *
      * @param parent  the parent container.
@@ -202,26 +202,26 @@ public class JSpinner extends JComponent
       return new Dimension(prefSize.width + insets.left + insets.right,
                             prefSize.height + insets.top + insets.bottom);
     }
-    
+
     /**
-     * Receives notification of property changes.  If the text field's 'value' 
+     * Receives notification of property changes.  If the text field's 'value'
      * property changes, the spinner's model is updated accordingly.
      *
      * @param event the event.
      */
     public void propertyChange(PropertyChangeEvent event)
     {
-      if (event.getSource() == ftf) 
+      if (event.getSource() == ftf)
         {
           if (event.getPropertyName().equals("value"))
             spinner.getModel().setValue(event.getNewValue());
         }
     }
-    
+
     /**
      * Receives notification of changes in the state of the {@link JSpinner}
      * that the editor belongs to - the content of the text field is updated
-     * accordingly.  
+     * accordingly.
      *
      * @param event  the change event.
      */
@@ -229,12 +229,12 @@ public class JSpinner extends JComponent
     {
       ftf.setValue(spinner.getValue());
     }
-    
+
     /**
      * This method does nothing.  It is required by the {@link LayoutManager}
      * interface, but since this component has a single child, there is no
      * need to use this method.
-     * 
+     *
      * @param child  the child component to remove.
      */
     public void removeLayoutComponent(Component child)
@@ -246,7 +246,7 @@ public class JSpinner extends JComponent
      * This method does nothing.  It is required by the {@link LayoutManager}
      * interface, but since this component has a single child, there is no
      * need to use this method.
-     * 
+     *
      * @param name  the name.
      * @param child  the child component to add.
      */
@@ -260,7 +260,7 @@ public class JSpinner extends JComponent
    * A panel containing a {@link JFormattedTextField} that is configured for
    * displaying and editing numbers.  The panel is used as a subcomponent of
    * a {@link JSpinner}.
-   * 
+   *
    * @see JSpinner#createEditor(SpinnerModel)
    */
   public static class NumberEditor extends DefaultEditor
@@ -271,8 +271,8 @@ public class JSpinner extends JComponent
     private static final long serialVersionUID = 3791956183098282942L;
 
     /**
-     * Creates a new NumberEditor object for the specified 
-     * spinner.  The editor is registered with the spinner as a 
+     * Creates a new NumberEditor object for the specified
+     * spinner.  The editor is registered with the spinner as a
      * {@link ChangeListener}.
      *
      * @param spinner the component the editor will be used with.
@@ -295,7 +295,7 @@ public class JSpinner extends JComponent
     public NumberEditor(JSpinner spinner, String decimalFormatPattern)
     {
       super(spinner);
-      NumberEditorFormatter nef 
+      NumberEditorFormatter nef
           = new NumberEditorFormatter(decimalFormatPattern);
       nef.setMinimum(getModel().getMinimum());
       nef.setMaximum(getModel().getMaximum());
@@ -316,7 +316,7 @@ public class JSpinner extends JComponent
     /**
      * Returns the model used by the editor's {@link JSpinner} component,
      * cast to a {@link SpinnerNumberModel}.
-     * 
+     *
      * @return The model.
      */
     public SpinnerNumberModel getModel()
@@ -324,11 +324,11 @@ public class JSpinner extends JComponent
       return (SpinnerNumberModel) getSpinner().getModel();
     }
   }
-  
-  static class NumberEditorFormatter 
+
+  static class NumberEditorFormatter
     extends NumberFormatter
   {
-    public NumberEditorFormatter() 
+    public NumberEditorFormatter()
     {
       super(NumberFormat.getInstance());
     }
@@ -359,7 +359,7 @@ public class JSpinner extends JComponent
 
     /**
      * Returns the spinner's model cast as a {@link SpinnerListModel}.
-     * 
+     *
      * @return The spinner's model.
      */
     public SpinnerListModel getModel()
@@ -442,10 +442,10 @@ public class JSpinner extends JComponent
     }
   }
 
-  static class DateEditorFormatter 
+  static class DateEditorFormatter
     extends DateFormatter
   {
-    public DateEditorFormatter() 
+    public DateEditorFormatter()
     {
       super(DateFormat.getInstance());
     }
@@ -455,9 +455,9 @@ public class JSpinner extends JComponent
     }
   }
 
-  /** 
+  /**
    * A listener that forwards {@link ChangeEvent} notifications from the model
-   * to the {@link JSpinner}'s listeners. 
+   * to the {@link JSpinner}'s listeners.
    */
   class ModelListener implements ChangeListener
   {
@@ -468,10 +468,10 @@ public class JSpinner extends JComponent
     {
       // nothing to do here
     }
-    
+
     /**
      * Receives notification from the model that its state has changed.
-     * 
+     *
      * @param event  the event (ignored).
      */
     public void stateChanged(ChangeEvent event)
@@ -480,9 +480,9 @@ public class JSpinner extends JComponent
     }
   }
 
-  /** 
-   * The model that defines the current value and permitted values for the 
-   * spinner. 
+  /**
+   * The model that defines the current value and permitted values for the
+   * spinner.
    */
   private SpinnerModel model;
 
@@ -492,8 +492,8 @@ public class JSpinner extends JComponent
   private static final long serialVersionUID = 3412663575706551720L;
 
   /**
-   * Creates a new JSpinner with default instance of 
-   * {@link SpinnerNumberModel} (that is, a model with value 0, step size 1, 
+   * Creates a new JSpinner with default instance of
+   * {@link SpinnerNumberModel} (that is, a model with value 0, step size 1,
    * and no upper or lower limit).
    *
    * @see javax.swing.SpinnerNumberModel
@@ -504,12 +504,12 @@ public class JSpinner extends JComponent
   }
 
   /**
-   * Creates a new JSpinner with the specified model.  The 
+   * Creates a new JSpinner with the specified model.  The
    * {@link #createEditor(SpinnerModel)} method is used to create an editor
    * that is suitable for the model.
    *
    * @param model the model (null not permitted).
-   * 
+   *
    * @throws NullPointerException if model is null.
    */
   public JSpinner(SpinnerModel model)
@@ -550,7 +550,7 @@ public class JSpinner extends JComponent
    *
    * @param editor the new editor (null not permitted.
    *
-   * @throws IllegalArgumentException if editor is 
+   * @throws IllegalArgumentException if editor is
    *                                  null.
    *
    * @see #getEditor
@@ -565,7 +565,7 @@ public class JSpinner extends JComponent
       ((DefaultEditor) oldEditor).dismiss(this);
     else if (oldEditor instanceof ChangeListener)
       removeChangeListener((ChangeListener) oldEditor);
-    
+
     this.editor = editor;
     firePropertyChange("editor", oldEditor, editor);
   }
@@ -574,7 +574,7 @@ public class JSpinner extends JComponent
    * Returns the model used by the {@link JSpinner} component.
    *
    * @return The model.
-   * 
+   *
    * @see #setModel(SpinnerModel)
    */
   public SpinnerModel getModel()
@@ -593,7 +593,7 @@ public class JSpinner extends JComponent
   {
     if (newModel == null)
       throw new IllegalArgumentException();
-    
+
     if (model == newModel)
       return;
 
diff --git a/libjava/classpath/javax/swing/JSplitPane.java b/libjava/classpath/javax/swing/JSplitPane.java
index 5b6ec158e6d..856b2e5c53e 100644
--- a/libjava/classpath/javax/swing/JSplitPane.java
+++ b/libjava/classpath/javax/swing/JSplitPane.java
@@ -1,4 +1,4 @@
-/* JSplitPane.java -- 
+/* JSplitPane.java --
    Copyright (C) 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -69,7 +69,7 @@ public class JSplitPane extends JComponent implements Accessible
     implements AccessibleValue
   {
   private static final long serialVersionUID = -1788116871416305366L;
-  
+
     /**
      * Creates a new AccessibleJSplitPane instance.
      */
@@ -79,7 +79,7 @@ public class JSplitPane extends JComponent implements Accessible
     }
 
     /**
-     * Returns a set containing the current state of the {@link JSplitPane} 
+     * Returns a set containing the current state of the {@link JSplitPane}
      * component.
      *
      * @return The accessible state set.
@@ -109,8 +109,8 @@ public class JSplitPane extends JComponent implements Accessible
     }
 
     /**
-     * Returns an object that provides access to the current, minimum and 
-     * maximum values for the {@link JSplitPane}.  Since this class implements 
+     * Returns an object that provides access to the current, minimum and
+     * maximum values for the {@link JSplitPane}.  Since this class implements
      * {@link AccessibleValue}, it returns itself.
      *
      * @return The accessible value.
@@ -121,7 +121,7 @@ public class JSplitPane extends JComponent implements Accessible
     }
 
     /**
-     * Returns the current divider location for the {@link JSplitPane} 
+     * Returns the current divider location for the {@link JSplitPane}
      * component, as an {@link Integer}.
      *
      * @return The current divider location.
@@ -132,15 +132,15 @@ public class JSplitPane extends JComponent implements Accessible
     }
 
     /**
-     * Sets the divider location for the {@link JSplitPane} component and sends 
-     * a {@link PropertyChangeEvent} (with the property name 
+     * Sets the divider location for the {@link JSplitPane} component and sends
+     * a {@link PropertyChangeEvent} (with the property name
      * {@link AccessibleContext#ACCESSIBLE_VALUE_PROPERTY}) to all registered
-     * listeners.  If the supplied value is null, this method 
+     * listeners.  If the supplied value is null, this method
      * does nothing and returns false.
      *
      * @param value  the new divider location (null permitted).
      *
-     * @return true if the divider location value is updated, and 
+     * @return true if the divider location value is updated, and
      *     false otherwise.
      */
     public boolean setCurrentAccessibleValue(Number value)
@@ -149,13 +149,13 @@ public class JSplitPane extends JComponent implements Accessible
         return false;
       Number oldValue = getCurrentAccessibleValue();
       setDividerLocation(value.intValue());
-      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue, 
+      firePropertyChange(AccessibleContext.ACCESSIBLE_VALUE_PROPERTY, oldValue,
                          new Integer(value.intValue()));
       return true;
     }
 
     /**
-     * Returns the minimum divider location for the {@link JSplitPane} 
+     * Returns the minimum divider location for the {@link JSplitPane}
      * component, as an {@link Integer}.
      *
      * @return The minimum divider location.
@@ -166,7 +166,7 @@ public class JSplitPane extends JComponent implements Accessible
     }
 
     /**
-     * Returns the maximum divider location for the {@link JSplitPane} 
+     * Returns the maximum divider location for the {@link JSplitPane}
      * component, as an {@link Integer}.
      *
      * @return The maximum divider location.
@@ -178,7 +178,7 @@ public class JSplitPane extends JComponent implements Accessible
   }
 
   private static final long serialVersionUID = -5634142046175988380L;
-  
+
   /** The constraints string used to add components to the bottom. */
   public static final String BOTTOM = "bottom";
 
@@ -200,14 +200,14 @@ public class JSplitPane extends JComponent implements Accessible
   public static final int HORIZONTAL_SPLIT = 1;
 
   /** The property fired when the last divider location property changes. */
-  public static final String LAST_DIVIDER_LOCATION_PROPERTY = 
+  public static final String LAST_DIVIDER_LOCATION_PROPERTY =
     "lastDividerLocation";
 
   /** The constraints string used to add components to the left. */
   public static final String LEFT = "left";
 
   /** The property fired when the one touch expandable property changes. */
-  public static final String ONE_TOUCH_EXPANDABLE_PROPERTY = 
+  public static final String ONE_TOUCH_EXPANDABLE_PROPERTY =
     "oneTouchExpandable";
 
   /** The property fired when the orientation property changes. */
@@ -231,7 +231,7 @@ public class JSplitPane extends JComponent implements Accessible
   /** Whether the JSplitPane uses one touch expandable buttons. */
   protected boolean oneTouchExpandable = false;
 
-  // This is the master dividerSize variable and sets the 
+  // This is the master dividerSize variable and sets the
   // BasicSplitPaneDivider one accordingly
 
   /** The size of the divider. */
@@ -357,7 +357,7 @@ public class JSplitPane extends JComponent implements Accessible
    * @param constraints The constraints string to use.
    * @param index Where to place to component in the list of components.
    *
-   * @throws IllegalArgumentException When the constraints is not a known 
+   * @throws IllegalArgumentException When the constraints is not a known
    * identifier.
    */
   protected void addImpl(Component comp, Object constraints, int index)
@@ -389,7 +389,7 @@ public class JSplitPane extends JComponent implements Accessible
         else if (placement.equals(DIVIDER))
           constraints = null;
         else
-          throw new 
+          throw new
             IllegalArgumentException("Constraints is not a known identifier.");
 
         // If no dividerLocation has been set, then we need to trigger an
@@ -405,14 +405,14 @@ public class JSplitPane extends JComponent implements Accessible
    * Returns the object that provides accessibility features for this
    * JSplitPane component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *     {@link AccessibleJSplitPane}).
    */
   public AccessibleContext getAccessibleContext()
   {
     if (accessibleContext == null)
       accessibleContext = new AccessibleJSplitPane();
-    
+
     return accessibleContext;
   }
 
@@ -715,7 +715,7 @@ public class JSplitPane extends JComponent implements Accessible
 
   /**
    * This method sets the location of the divider.
-   * 
+   *
    * @param location The location of the divider. The negative value forces to
    *          compute the new location from the preferred sizes of the split
    *          pane components.
@@ -727,7 +727,7 @@ public class JSplitPane extends JComponent implements Accessible
     SplitPaneUI ui = getUI();
     if (ui != null)
       ui.setDividerLocation(this, location);
-    firePropertyChange(DIVIDER_LOCATION_PROPERTY, oldLocation, 
+    firePropertyChange(DIVIDER_LOCATION_PROPERTY, oldLocation,
                        location);
   }
 
@@ -773,7 +773,7 @@ public class JSplitPane extends JComponent implements Accessible
    * @param comp The left component.
    */
   public void setLeftComponent(Component comp)
-  {    
+  {
     if (comp != null)
       add(comp, LEFT);
     else
@@ -801,8 +801,8 @@ public class JSplitPane extends JComponent implements Accessible
   }
 
   /**
-   * Sets the orientation for the JSplitPane and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * Sets the orientation for the JSplitPane and sends a
+   * {@link PropertyChangeEvent} (with the property name
    * {@link #ORIENTATION_PROPERTY}) to all registered listeners.
    *
    * @param orientation  the orientation (either {@link #HORIZONTAL_SPLIT}
@@ -839,7 +839,7 @@ public class JSplitPane extends JComponent implements Accessible
     if (value < 0.0 || value > 1.0)
       throw new IllegalArgumentException("Value outside permitted range.");
     if (this.resizeWeight != value)
-      { 
+      {
         double old = resizeWeight;
         resizeWeight = value;
         firePropertyChange(RESIZE_WEIGHT_PROPERTY, old, value);
@@ -905,7 +905,7 @@ public class JSplitPane extends JComponent implements Accessible
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/JTabbedPane.java b/libjava/classpath/javax/swing/JTabbedPane.java
index 79521be3fec..18055e8a9a8 100644
--- a/libjava/classpath/javax/swing/JTabbedPane.java
+++ b/libjava/classpath/javax/swing/JTabbedPane.java
@@ -64,7 +64,7 @@ import javax.swing.plaf.UIResource;
  * This is a container for components where only one component is displayed at
  * a given time and the displayed component can be switched by clicking on
  * tabs.
- * 
+ *
  * 
                      
  * Tabs can be oriented in several ways. They can be above, below, left and
  * right of the component. Tabs can either wrap around (by creating multiple
@@ -185,7 +185,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     /**
      * Returns the number of selected child components of the
      * JTabbedPane. The reference implementation appears
-     * to return 1 always and we do the same. 
+     * to return 1 always and we do the same.
      *
      * @return 1
      */
@@ -195,7 +195,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     }
 
     /**
-     * Returns the selected tab, or null if there is no 
+     * Returns the selected tab, or null if there is no
      * selection.
      *
      * @param i  the selection index (ignored here).
@@ -239,7 +239,7 @@ public class JTabbedPane extends JComponent implements Serializable,
      * tabbed pane, since one tab must always be selected.
      *
      * @param i  the item index.
-     * 
+     *
      * @see #addAccessibleSelection(int)
      */
     public void removeAccessibleSelection(int i)
@@ -250,7 +250,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     /**
      * Does nothing - it makes no sense to clear the selection for
      * a tabbed pane, since one tab must always be selected.
-     * 
+     *
      * @see #addAccessibleSelection(int)
      */
     public void clearAccessibleSelection()
@@ -261,7 +261,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     /**
      * Does nothing - it makes no sense to select all for a tabbed
      * pane, since only one tab can be selected at a time.
-     * 
+     *
      * @see #addAccessibleSelection(int)
      */
     public void selectAllAccessibleSelection()
@@ -464,7 +464,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     {
       title = text;
       if (title != null && title.length() <= underlinedChar)
-	setDisplayedMnemonicIndex(title.length() - 1);
+        setDisplayedMnemonicIndex(title.length() - 1);
     }
 
     /**
@@ -495,7 +495,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     public Icon getDisabledIcon()
     {
       if (disabledIcon == null && icon instanceof ImageIcon)
-	setDisabledIcon(icon);
+        setDisabledIcon(icon);
       return disabledIcon;
     }
 
@@ -560,7 +560,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     {
       mnemonicKey = aChar;
       if (title != null)
-	setDisplayedMnemonicIndex(title.indexOf(mnemonicKey));
+        setDisplayedMnemonicIndex(title.indexOf(mnemonicKey));
     }
 
     /**
@@ -585,10 +585,10 @@ public class JTabbedPane extends JComponent implements Serializable,
       throws IllegalArgumentException
     {
       if (index < -1 || title != null && index >= title.length())
-	throw new IllegalArgumentException();
+        throw new IllegalArgumentException();
 
       if (title == null || mnemonicKey == 0 || (index > -1 && title.charAt(index) != mnemonicKey))
-	index = -1;
+        index = -1;
 
       underlinedChar = index;
     }
@@ -605,7 +605,7 @@ public class JTabbedPane extends JComponent implements Serializable,
 
     /**
      * Returns the accessible name for this tab.
-     * 
+     *
      * @return The accessible name.
      */
     public String getAccessibleName()
@@ -615,7 +615,7 @@ public class JTabbedPane extends JComponent implements Serializable,
       else
         return title;
     }
-    
+
     /**
      * Returns the accessible role of this tab, which is always
      * {@link AccessibleRole#PAGE_TAB}.
@@ -634,7 +634,7 @@ public class JTabbedPane extends JComponent implements Serializable,
      */
     public AccessibleStateSet getAccessibleStateSet()
     {
-      AccessibleContext parentCtx = JTabbedPane.this.getAccessibleContext(); 
+      AccessibleContext parentCtx = JTabbedPane.this.getAccessibleContext();
       AccessibleStateSet state = parentCtx.getAccessibleStateSet();
       state.add(AccessibleState.SELECTABLE);
       if (component == getSelectedComponent())
@@ -761,7 +761,7 @@ public class JTabbedPane extends JComponent implements Serializable,
       throw new IllegalArgumentException("tabLayoutPolicy is not valid.");
     this.tabPlacement = tabPlacement;
     layoutPolicy = tabLayoutPolicy;
-    
+
     setModel(new DefaultSingleSelectionModel());
 
     updateUI();
@@ -847,8 +847,8 @@ public class JTabbedPane extends JComponent implements Serializable,
       changeEvent = new ChangeEvent(this);
     for (int i = changeListeners.length - 2; i >= 0; i -= 2)
       {
-	if (changeListeners[i] == ChangeListener.class)
-	  ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
+        if (changeListeners[i] == ChangeListener.class)
+          ((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
       }
   }
 
@@ -881,11 +881,11 @@ public class JTabbedPane extends JComponent implements Serializable,
   {
     if (m != model)
       {
-	SingleSelectionModel oldModel = this.model;
+        SingleSelectionModel oldModel = this.model;
         if (oldModel != null && changeListener != null)
           oldModel.removeChangeListener(changeListener);
 
-	model = m;
+        model = m;
 
         if (model != null)
           {
@@ -893,7 +893,7 @@ public class JTabbedPane extends JComponent implements Serializable,
               changeListener = createChangeListener();
             model.addChangeListener(changeListener);
           }
-	firePropertyChange("model", oldModel, this.model);
+        firePropertyChange("model", oldModel, this.model);
       }
   }
 
@@ -922,9 +922,9 @@ public class JTabbedPane extends JComponent implements Serializable,
       throw new IllegalArgumentException("tabPlacement is not valid.");
     if (tabPlacement != this.tabPlacement)
       {
-	int oldPlacement = this.tabPlacement;
-	this.tabPlacement = tabPlacement;
-	firePropertyChange("tabPlacement", oldPlacement, this.tabPlacement);
+        int oldPlacement = this.tabPlacement;
+        this.tabPlacement = tabPlacement;
+        firePropertyChange("tabPlacement", oldPlacement, this.tabPlacement);
       }
   }
 
@@ -953,9 +953,9 @@ public class JTabbedPane extends JComponent implements Serializable,
       throw new IllegalArgumentException("tabLayoutPolicy is not valid.");
     if (tabLayoutPolicy != layoutPolicy)
       {
-	int oldPolicy = layoutPolicy;
-	layoutPolicy = tabLayoutPolicy;
-	firePropertyChange("tabLayoutPolicy", oldPolicy, layoutPolicy);
+        int oldPolicy = layoutPolicy;
+        layoutPolicy = tabLayoutPolicy;
+        firePropertyChange("tabLayoutPolicy", oldPolicy, layoutPolicy);
       }
   }
 
@@ -998,7 +998,7 @@ public class JTabbedPane extends JComponent implements Serializable,
       {
         // Hiding and showing the involved components
         // is done by the JTabbedPane's UI.
-	model.setSelectedIndex(index);
+        model.setSelectedIndex(index);
       }
   }
 
@@ -1051,8 +1051,8 @@ public class JTabbedPane extends JComponent implements Serializable,
     // so we don't trigger a repaint.
     if (component != null)
       {
-	component.hide();
-	super.add(component);
+        component.hide();
+        super.add(component);
       }
 
     if (getSelectedIndex() == -1)
@@ -1117,7 +1117,7 @@ public class JTabbedPane extends JComponent implements Serializable,
       super.add(component);
     else
       insertTab(component.getName(), null, component, null, tabs.size());
-    
+
     return component;
   }
 
@@ -1191,18 +1191,18 @@ public class JTabbedPane extends JComponent implements Serializable,
       super.add(component);
     else
       {
-	if (constraints instanceof String)
-	  insertTab((String) constraints, null, component, null, index);
-	else
-	  insertTab(component.getName(),
-	            (constraints instanceof Icon) ? (Icon) constraints : null,
-	            component, null, index);
+        if (constraints instanceof String)
+          insertTab((String) constraints, null, component, null, index);
+        else
+          insertTab(component.getName(),
+                    (constraints instanceof Icon) ? (Icon) constraints : null,
+                    component, null, index);
       }
   }
 
   /**
-   * Removes the tab at index. After the component associated with 
-   * index is removed, its visibility is reset to true to ensure it 
+   * Removes the tab at index. After the component associated with
+   * index is removed, its visibility is reset to true to ensure it
    * will be visible if added to other containers.
    *
    * @param index The index of the tab to remove.
@@ -1261,7 +1261,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     // Since components implementing UIResource
     // are not added as regular tabs by the add()
     // methods we have to take special care when
-    // removing these object. Especially 
+    // removing these object. Especially
     // Container.remove(Component) cannot be used
     // because it will call JTabbedPane.remove(int)
     // later which is overridden and can only
@@ -1270,7 +1270,7 @@ public class JTabbedPane extends JComponent implements Serializable,
     // situation that someone called insertTab()
     // with a component that implements UIResource.
     int index = indexOfComponent(component);
-    
+
     // If the component is not a tab component
     // find out its Container-given index
     // and call that class' implementation
@@ -1603,11 +1603,11 @@ public class JTabbedPane extends JComponent implements Serializable,
     int index = -1;
     for (int i = 0; i < tabs.size(); i++)
       {
-	if (((Page) tabs.elementAt(i)).getTitle().equals(title))
-	  {
-	    index = i;
-	    break;
-	  }
+        if (((Page) tabs.elementAt(i)).getTitle().equals(title))
+          {
+            index = i;
+            break;
+          }
       }
     return index;
   }
@@ -1624,11 +1624,11 @@ public class JTabbedPane extends JComponent implements Serializable,
     int index = -1;
     for (int i = 0; i < tabs.size(); i++)
       {
-	if (((Page) tabs.elementAt(i)).getIcon() == icon)
-	  {
-	    index = i;
-	    break;
-	  }
+        if (((Page) tabs.elementAt(i)).getIcon() == icon)
+          {
+            index = i;
+            break;
+          }
       }
     return index;
   }
@@ -1645,11 +1645,11 @@ public class JTabbedPane extends JComponent implements Serializable,
     int index = -1;
     for (int i = 0; i < tabs.size(); i++)
       {
-	if (((Page) tabs.elementAt(i)).getComponent() == component)
-	  {
-	    index = i;
-	    break;
-	  }
+        if (((Page) tabs.elementAt(i)).getComponent() == component)
+          {
+            index = i;
+            break;
+          }
       }
     return index;
   }
@@ -1684,12 +1684,12 @@ public class JTabbedPane extends JComponent implements Serializable,
   }
 
   /**
-   * Returns a string describing the attributes for the 
-   * JTabbedPane component, for use in debugging.  The return 
-   * value is guaranteed to be non-null, but the format of the 
+   * Returns a string describing the attributes for the
+   * JTabbedPane component, for use in debugging.  The return
+   * value is guaranteed to be non-null, but the format of the
    * string may vary between implementations.
    *
-   * @return A string describing the attributes of the 
+   * @return A string describing the attributes of the
    *     JTabbedPane.
    */
   protected String paramString()
@@ -1711,7 +1711,7 @@ public class JTabbedPane extends JComponent implements Serializable,
    * Returns the object that provides accessibility features for this
    * JTabbedPane component.
    *
-   * @return The accessible context (an instance of 
+   * @return The accessible context (an instance of
    *         {@link AccessibleJTabbedPane}).
    */
   public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/JTable.java b/libjava/classpath/javax/swing/JTable.java
index 42563e6a2ca..b60c67aa370 100644
--- a/libjava/classpath/javax/swing/JTable.java
+++ b/libjava/classpath/javax/swing/JTable.java
@@ -1,4 +1,4 @@
-/* JTable.java -- 
+/* JTable.java --
    Copyright (C) 2002, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -90,9 +90,9 @@ import javax.swing.table.TableModel;
  * The table component, displaying information, organized in rows and columns.
  * The table can be placed in the scroll bar and have the optional header
  * that is always visible. Cell values may be editable after double clicking
- * on the cell. Cell columns may have various data types, that are 
+ * on the cell. Cell columns may have various data types, that are
  * displayed and edited by the different renderers and editors. It is possible
- * to set different column width. The columns are also resizeable by 
+ * to set different column width. The columns are also resizeable by
  * dragging the column boundary in the header.
  */
 public class JTable
@@ -271,7 +271,7 @@ public class JTable
        * Sets the background of the cell. Since table cells cannot have
        * individual background colors, this method does nothing. Set the
        * background directly on the table instead.
-       * 
+       *
        * @param color not used
        */
       public void setBackground(Color color)
@@ -293,7 +293,7 @@ public class JTable
        * Sets the foreground of the cell. Since table cells cannot have
        * individual foreground colors, this method does nothing. Set the
        * foreground directly on the table instead.
-       * 
+       *
        * @param color not used
        */
       public void setForeground(Color color)
@@ -315,7 +315,7 @@ public class JTable
        * Sets the cursor of the cell. Since table cells cannot have
        * individual cursors, this method does nothing. Set the
        * cursor directly on the table instead.
-       * 
+       *
        * @param cursor not used
        */
       public void setCursor(Cursor cursor)
@@ -337,7 +337,7 @@ public class JTable
        * Sets the font of the cell. Since table cells cannot have
        * individual fonts, this method does nothing. Set the
        * font directly on the table instead.
-       * 
+       *
        * @param font not used
        */
       public void setFont(Font font)
@@ -568,7 +568,7 @@ public class JTable
       {
         table.removeFocusListener(listener);
       }
-        
+
     }
 
     protected class AccessibleJTableModelChange
@@ -748,7 +748,7 @@ public class JTable
       public void setAccessibleRowHeader(AccessibleTable header)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public AccessibleTable getAccessibleColumnHeader()
@@ -760,7 +760,7 @@ public class JTable
       public void setAccessibleColumnHeader(AccessibleTable header)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Accessible getAccessibleRowDescription(int r)
@@ -772,7 +772,7 @@ public class JTable
       public void setAccessibleRowDescription(int r, Accessible description)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Accessible getAccessibleColumnDescription(int c)
@@ -784,7 +784,7 @@ public class JTable
       public void setAccessibleColumnDescription(int c, Accessible description)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public boolean isAccessibleSelected(int r, int c)
@@ -816,7 +816,7 @@ public class JTable
         // TODO Auto-generated method stub
         return null;
       }
-        
+
     }
 
     /**
@@ -830,11 +830,11 @@ public class JTable
     {
 
       JTableHeader header;
-      
+
       int columnIndex;
-      
+
       /**
-       * 
+       *
        * @param h  the table header.
        * @param comp
        * @param r
@@ -849,7 +849,7 @@ public class JTable
 
       /**
        * Returns the header renderer.
-       * 
+       *
        * @return The header renderer.
        */
       Component getColumnHeaderRenderer()
@@ -858,13 +858,13 @@ public class JTable
         TableCellRenderer r = tc.getHeaderRenderer();
         if (r == null)
           r = header.getDefaultRenderer();
-        return r.getTableCellRendererComponent(header.getTable(), 
+        return r.getTableCellRendererComponent(header.getTable(),
             tc.getHeaderValue(), false, false, -1, columnIndex);
       }
-      
+
       /**
        * Returns the accessible role for the table header cell.
-       * 
+       *
        * @return The accessible role.
        */
       public AccessibleRole getAccessibleRole()
@@ -910,7 +910,7 @@ public class JTable
 
       /**
        * Returns the accessible context.
-       * 
+       *
        * @return this.
        */
       public AccessibleContext getAccessibleContext()
@@ -927,7 +927,7 @@ public class JTable
       public void setBackground(Color color)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Color getForeground()
@@ -939,7 +939,7 @@ public class JTable
       public void setForeground(Color color)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Cursor getCursor()
@@ -951,7 +951,7 @@ public class JTable
       public void setCursor(Cursor cursor)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Font getFont()
@@ -963,7 +963,7 @@ public class JTable
       public void setFont(Font font)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public FontMetrics getFontMetrics(Font font)
@@ -981,7 +981,7 @@ public class JTable
       public void setEnabled(boolean b)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public boolean isVisible()
@@ -993,7 +993,7 @@ public class JTable
       public void setVisible(boolean b)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public boolean isShowing()
@@ -1023,7 +1023,7 @@ public class JTable
       public void setLocation(Point point)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Rectangle getBounds()
@@ -1035,7 +1035,7 @@ public class JTable
       public void setBounds(Rectangle rectangle)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Dimension getSize()
@@ -1047,7 +1047,7 @@ public class JTable
       public void setSize(Dimension dimension)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public Accessible getAccessibleAt(Point point)
@@ -1065,21 +1065,21 @@ public class JTable
       public void requestFocus()
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public void addFocusListener(FocusListener listener)
       {
         // TODO Auto-generated method stub
-        
+
       }
 
       public void removeFocusListener(FocusListener listener)
       {
         // TODO Auto-generated method stub
-        
+
       }
-      
+
     }
 
     /**
@@ -1140,17 +1140,17 @@ public class JTable
     {
       return AccessibleRole.TABLE;
     }
-    
+
     /**
      * Returns the accessible table.
-     * 
+     *
      * @return this.
      */
     public AccessibleTable getAccessibleTable()
     {
       return this;
     }
-    
+
     /**
      * Returns the number of selected items in this table.
      */
@@ -1489,7 +1489,7 @@ public class JTable
      */
     public void propertyChange(PropertyChangeEvent e)
     {
-      String propName = e.getPropertyName(); 
+      String propName = e.getPropertyName();
       if (propName.equals("tableModel"))
         {
           TableModel oldModel = (TableModel) e.getOldValue();
@@ -1525,9 +1525,9 @@ public class JTable
      * index.
      *
      * @param index the index of the cell of which the row number is queried
-     * 
+     *
      * @return the row number of an accessible child (cell) with the specified
-     *         index 
+     *         index
      */
     public int getAccessibleRow(int index)
     {
@@ -1539,9 +1539,9 @@ public class JTable
      * specified index.
      *
      * @param index the index of the cell of which the column number is queried
-     * 
+     *
      * @return the column number of an accessible child (cell) with the
-     *         specified index 
+     *         specified index
      */
     public int getAccessibleColumn(int index)
     {
@@ -1629,16 +1629,16 @@ public class JTable
      * Returns the accessible child at the given index.
      *
      * @param index  the child index.
-     * 
+     *
      * @return The accessible child.
      */
     public Accessible getAccessibleChild(int index)
     {
       int r = getAccessibleRow(index);
       int c = getAccessibleColumn(index);
-      return getAccessibleAt(r, c);  
+      return getAccessibleAt(r, c);
     }
-    
+
     /**
      * Returns the accessible child (table cell) at the specified row and
      * column.
@@ -1707,7 +1707,7 @@ public class JTable
      */
     public void setAccessibleRowHeader(AccessibleTable header)
     {
-      // In the RI this seems to be a no-op.    
+      // In the RI this seems to be a no-op.
     }
 
     /**
@@ -1912,7 +1912,7 @@ public class JTable
     /**
      * Receives notification that a property of the observed TableColumns has
      * changed.
-     * 
+     *
      * @param ev the property change event
      */
     public void propertyChange(PropertyChangeEvent ev)
@@ -1943,7 +1943,7 @@ public class JTable
      * The CheckBox that is used for rendering.
      */
     private final JCheckBox checkBox;
-    
+
     /**
      * Creates a new checkbox based boolean cell renderer. The checkbox is
      * centered by default.
@@ -1953,7 +1953,7 @@ public class JTable
        checkBox = new JCheckBox();
        checkBox.setHorizontalAlignment(SwingConstants.CENTER);
     }
-   
+
     /**
      * Get the check box.
      */
@@ -1964,7 +1964,7 @@ public class JTable
 
     /**
      * Returns the component that is used for rendering the value.
-     * 
+     *
      * @param table the JTable
      * @param value the value of the object
      * @param isSelected is the cell selected?
@@ -2031,7 +2031,7 @@ public class JTable
      * @param hasFocus has the cell the focus?
      * @param row the row to render
      * @param column the cell to render
-     * 
+     *
      * @return this component (the default table cell renderer)
      */
     public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2074,7 +2074,7 @@ public class JTable
      * @param hasFocus has the cell the focus?
      * @param row the row to render
      * @param column the cell to render
-     * 
+     *
      * @return this component (the default table cell renderer)
      */
     public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2117,7 +2117,7 @@ public class JTable
      * @param hasFocus has the cell the focus?
      * @param row the row to render
      * @param column the cell to render
-     * 
+     *
      * @return this component (the default table cell renderer)
      */
     public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2162,8 +2162,8 @@ public class JTable
     {
       setHorizontalAlignment(SwingConstants.CENTER);
     }
-    
-    
+
+
     /**
      * Returns the component that is used for rendering the value.
      *
@@ -2173,7 +2173,7 @@ public class JTable
      * @param hasFocus has the cell the focus?
      * @param row the row to render
      * @param column the cell to render
-     * 
+     *
      * @return this component (the default table cell renderer)
      */
     public Component getTableCellRendererComponent(JTable table, Object value,
@@ -2196,7 +2196,7 @@ public class JTable
       return this;
     }
   }
-  
+
     /**
      * The JTable text component (used in editing) always has the table
      * as its parent. The scrollRectToVisible must be adjusted taking the
@@ -2213,11 +2213,11 @@ public class JTable
       {
         setBorder(BorderFactory.createLineBorder(getGridColor(), 2));
       }
-    }    
-  
+    }
+
 
   private static final long serialVersionUID = 3876025080382781659L;
-  
+
   /**
    * This table, for referring identically name methods from inner classes.
    */
@@ -2244,7 +2244,7 @@ public class JTable
    * n), uniformly, to provide or absorb excess space requirements.
    */
   public static final int AUTO_RESIZE_SUBSEQUENT_COLUMNS = 2;
-  
+
   /**
    * When resizing column i in a table of n
    * columns, automatically change all columns in the range [0,
@@ -2261,15 +2261,15 @@ public class JTable
   public static final int AUTO_RESIZE_LAST_COLUMN = 3;
 
   /**
-   * A table mapping {@link java.lang.Class} objects to 
-   * {@link TableCellEditor} objects. This table is consulted by the 
+   * A table mapping {@link java.lang.Class} objects to
+   * {@link TableCellEditor} objects. This table is consulted by the
    * FIXME
    */
   protected Hashtable defaultEditorsByColumnClass = new Hashtable();
 
   /**
-   * A table mapping {@link java.lang.Class} objects to 
-   * {@link TableCellEditor} objects. This table is consulted by the 
+   * A table mapping {@link java.lang.Class} objects to
+   * {@link TableCellEditor} objects. This table is consulted by the
    * FIXME
    */
   protected Hashtable defaultRenderersByColumnClass = new Hashtable();
@@ -2295,7 +2295,7 @@ public class JTable
   /**
    * Whether or not the table should automatically compute a matching
    * {@link TableColumnModel} and assign it to the {@link #columnModel}
-   * property when the {@link #dataModel} property is changed. 
+   * property when the {@link #dataModel} property is changed.
    *
    * @see #setModel(TableModel)
    * @see #createDefaultColumnsFromModel()
@@ -2310,7 +2310,7 @@ public class JTable
    * one of {@link #AUTO_RESIZE_ALL_COLUMNS} (the default), {@link
    * #AUTO_RESIZE_LAST_COLUMN}, {@link #AUTO_RESIZE_NEXT_COLUMN}, {@link
    * #AUTO_RESIZE_SUBSEQUENT_COLUMNS}, or {@link #AUTO_RESIZE_OFF}.
-   * 
+   *
    * @see #doLayout()
    * @see #setAutoResizeMode(int)
    * @see #getAutoResizeMode()
@@ -2322,7 +2322,7 @@ public class JTable
    * of uniform height. This differs from column width, which varies on a
    * per-column basis, and is stored in the individual columns of the
    * {@link #columnModel}.
-   * 
+   *
    * @see #getRowHeight()
    * @see #setRowHeight(int)
    * @see TableColumn#getWidth()
@@ -2331,8 +2331,8 @@ public class JTable
   protected int rowHeight;
 
   /**
-   * The height in pixels of the gap left between any two rows of the table. 
-   * 
+   * The height in pixels of the gap left between any two rows of the table.
+   *
    * @see #setRowMargin(int)
    * @see #getRowHeight()
    * @see #getIntercellSpacing()
@@ -2358,12 +2358,12 @@ public class JTable
   protected boolean rowSelectionAllowed;
 
   /**
-   * Obsolete. Use {@link #rowSelectionAllowed}, {@link 
+   * Obsolete. Use {@link #rowSelectionAllowed}, {@link
    * #getColumnSelectionAllowed}, or the combined methods {@link
    * #getCellSelectionEnabled} and {@link #setCellSelectionEnabled(boolean)}.
    */
   protected boolean cellSelectionEnabled;
-  
+
   /**
    * The model for data stored in the table. Confusingly, the published API
    * requires that this field be called dataModel, despite its
@@ -2393,7 +2393,7 @@ public class JTable
    * at all: setting {@link #autoCreateColumnsFromModel} will construct the
    * columnModel automatically, and the table acts as a facade for most of
    * the interesting properties of the columnModel anyways.
                      
-   * 
+   *
    * @see #setColumnModel(TableColumnModel)
    * @see #getColumnModel()
    */
@@ -2409,12 +2409,12 @@ public class JTable
    * @see #setSelectionModel(ListSelectionModel)
    * @see #getSelectionModel()
    * @see TableColumnModel#getSelectionModel()
-   * @see ListSelectionModel#addListSelectionListener(ListSelectionListener)   
+   * @see ListSelectionModel#addListSelectionListener(ListSelectionListener)
    */
   protected ListSelectionModel selectionModel;
 
   /**
-   * The current cell editor. 
+   * The current cell editor.
    */
   protected TableCellEditor cellEditor;
 
@@ -2504,7 +2504,7 @@ public class JTable
   private boolean surrendersFocusOnKeystroke = false;
 
   /**
-   * A Rectangle object to be reused in {@link #getCellRect}. 
+   * A Rectangle object to be reused in {@link #getCellRect}.
    */
   private Rectangle rectCache = new Rectangle();
 
@@ -2531,13 +2531,13 @@ public class JTable
    * @see #setRowHeight(int, int)
    */
   private SizeSequence rowHeights;
-  
+
   /**
    * This editor serves just a marker that the value must be simply changed to
    * the opposite one instead of starting the editing session.
    */
-  private transient TableCellEditor booleanInvertingEditor; 
-  
+  private transient TableCellEditor booleanInvertingEditor;
+
   /**
    * Creates a new JTable instance.
    */
@@ -2559,7 +2559,7 @@ public class JTable
   }
 
   /**
-   * Creates a new JTable instance, storing the given data 
+   * Creates a new JTable instance, storing the given data
    * array and heaving the given column names. To see the column names,
    * you must place the JTable into the {@link JScrollPane}.
    *
@@ -2576,7 +2576,7 @@ public class JTable
    * object that provides information about the table content. The table model
    * object is asked for the table size, other features and also receives
    * notifications in the case when the table has been edited by the user.
-   * 
+   *
    * @param model
    *          the table model.
    */
@@ -2592,7 +2592,7 @@ public class JTable
    * notifications in the case when the table has been edited by the user. The
    * table column model provides more detailed control on the table column
    * related features.
-   * 
+   *
    * @param dm
    *          the table data mode
    * @param cm
@@ -2618,24 +2618,24 @@ public class JTable
     TableColumnModel columnModel;
     if (cm != null)
         columnModel = cm;
-    else 
+    else
       {
         columnModel = createDefaultColumnModel();
         autoCreate = true;
       }
-    
+
     // Initialise the intercelar spacing before setting the column model to
     // avoid firing unnecessary events.
-    // The initial incellar spacing is new Dimenstion(1,1). 
+    // The initial incellar spacing is new Dimenstion(1,1).
     rowMargin = 1;
     columnModel.setColumnMargin(1);
     setColumnModel(columnModel);
-    
+
     setSelectionModel(sm == null ? createDefaultSelectionModel() : sm);
     setModel(dm == null ? createDefaultDataModel() : dm);
     setAutoCreateColumnsFromModel(autoCreate);
     initializeLocalVars();
-    
+
     // The following four lines properly set the lead selection indices.
     // After this, the UI will handle the lead selection indices.
     // FIXME: this should probably not be necessary, if the UI is installed
@@ -2649,9 +2649,9 @@ public class JTable
     // selectionModel.setLeadSelectionIndex(-1);
     // columnModel.getSelectionModel().setAnchorSelectionIndex(-1);
     // columnModel.getSelectionModel().setLeadSelectionIndex(-1);
-    updateUI(); 
+    updateUI();
   }
-  
+
   /**
    * Creates a new JTable instance that uses data and column
    * names, stored in {@link Vector}s.
@@ -2662,8 +2662,8 @@ public class JTable
   public JTable(Vector data, Vector columnNames)
   {
     this(new DefaultTableModel(data, columnNames));
-  }  
-  
+  }
+
   /**
    * Initialize local variables to default values.
    */
@@ -2678,10 +2678,10 @@ public class JTable
     setRowHeight(16);
     this.rowMargin = 1;
     this.rowSelectionAllowed = true;
-    
+
     // this.accessibleContext = new AccessibleJTable();
     this.cellEditor = null;
-    
+
     // COMPAT: Both Sun and IBM have drag enabled
     this.dragEnabled = false;
     this.preferredViewportSize = new Dimension(450,400);
@@ -2690,15 +2690,15 @@ public class JTable
     this.editingColumn = -1;
     this.editingRow = -1;
   }
-  
+
   /**
    * Add the new table column. The table column class allows to specify column
    * features more precisely, setting the preferred width, column data type
    * (column class) and table headers.
-   * 
-   * There is no need the add columns to the table if the default column 
+   *
+   * There is no need the add columns to the table if the default column
    * handling is sufficient.
-   * 
+   *
    * @param column
    *          the new column to add.
    */
@@ -2709,15 +2709,15 @@ public class JTable
         String name = dataModel.getColumnName(column.getModelIndex());
         column.setHeaderValue(name);
       }
-    
+
     columnModel.addColumn(column);
     column.addPropertyChangeListener(tableColumnPropertyChangeHandler);
   }
-  
+
   /**
    * Create the default editors for this table. The default method creates
    * the editor for Booleans.
-   * 
+   *
    * Other fields are edited as strings at the moment.
    */
   protected void createDefaultEditors()
@@ -2725,10 +2725,10 @@ public class JTable
     JCheckBox box = new BooleanCellRenderer().getCheckBox();
     box.setBorder(BorderFactory.createLineBorder(getGridColor(), 2));
     box.setBorderPainted(true);
-    booleanInvertingEditor = new DefaultCellEditor(box);    
+    booleanInvertingEditor = new DefaultCellEditor(box);
     setDefaultEditor(Boolean.class, booleanInvertingEditor);
   }
-  
+
   /**
    * Create the default renderers for this table. The default method creates
    * renderers for Boolean, Number, Double, Date, Icon and ImageIcon.
@@ -2742,9 +2742,9 @@ public class JTable
     setDefaultRenderer(Double.class, new FloatCellRenderer());
     setDefaultRenderer(Date.class, new DateCellRenderer());
     setDefaultRenderer(Icon.class, new IconCellRenderer());
-    setDefaultRenderer(ImageIcon.class, new IconCellRenderer());    
+    setDefaultRenderer(ImageIcon.class, new IconCellRenderer());
   }
-  
+
   /**
    * @deprecated 1.0.2, replaced by new JScrollPane(JTable)
    */
@@ -2752,12 +2752,12 @@ public class JTable
   {
     return new JScrollPane(table);
   }
-  
+
   /**
    * Create the default table column model that is used if the user-defined
    * column model is not provided. The default method creates
    * {@link DefaultTableColumnModel}.
-   * 
+   *
    * @return the created table column model.
    */
   protected TableColumnModel createDefaultColumnModel()
@@ -2769,7 +2769,7 @@ public class JTable
    * Create the default table data model that is used if the user-defined
    * data model is not provided. The default method creates
    * {@link DefaultTableModel}.
-   * 
+   *
    * @return the created table data model.
    */
   protected TableModel createDefaultDataModel()
@@ -2781,25 +2781,25 @@ public class JTable
    * Create the default table selection model that is used if the user-defined
    * selection model is not provided. The default method creates
    * {@link DefaultListSelectionModel}.
-   * 
+   *
    * @return the created table data model.
    */
   protected ListSelectionModel createDefaultSelectionModel()
   {
     return new DefaultListSelectionModel();
   }
-  
+
   /**
    * Create the default table header, if the user - defined table header is not
    * provided.
-   * 
+   *
    * @return the default table header.
    */
   protected JTableHeader createDefaultTableHeader()
   {
     return new JTableHeader(columnModel);
   }
-  
+
   /**
    * Invoked when the column is added. Revalidates and repains the table.
    */
@@ -2810,7 +2810,7 @@ public class JTable
   }
 
   /**
-   * Invoked when the column margin is changed. 
+   * Invoked when the column margin is changed.
    * Revalidates and repains the table.
    */
   public void columnMarginChanged (ChangeEvent event)
@@ -2838,7 +2838,7 @@ public class JTable
     revalidate();
     repaint();
   }
-  
+
   /**
    * Invoked when the the column selection changes, repaints the changed
    * columns. It is not recommended to override this method, register the
@@ -2887,7 +2887,7 @@ public class JTable
         repaint(dirty);
       }
   }
- 
+
   /**
    * Invoked when the editing is cancelled.
    */
@@ -2896,23 +2896,23 @@ public class JTable
     if (editorComp!=null)
       {
         remove(editorComp);
-        repaint(editorComp.getBounds());        
+        repaint(editorComp.getBounds());
         editorComp = null;
       }
   }
-  
+
   /**
    * Finish the current editing session and update the table with the
    * new value by calling {@link #setValueAt}.
-   * 
+   *
    * @param event the change event
    */
   public void editingStopped (ChangeEvent event)
   {
     if (editorComp!=null)
       {
-        remove(editorComp);        
-        setValueAt(cellEditor.getCellEditorValue(), editingRow, editingColumn);            
+        remove(editorComp);
+        setValueAt(cellEditor.getCellEditorValue(), editingRow, editingColumn);
         repaint(editorComp.getBounds());
         editorComp = null;
       }
@@ -3051,7 +3051,7 @@ public class JTable
         Rectangle dirty;
         if (col == TableModelEvent.ALL_COLUMNS)
           {
-            // All columns changed. 
+            // All columns changed.
             dirty = new Rectangle(0, firstRow * getRowHeight(),
                                   getColumnModel().getTotalColumnWidth(), 0);
           }
@@ -3121,7 +3121,7 @@ public class JTable
     // If we are in the editing process, end the editing session.
     if (isEditing())
       editingStopped(null);
-    
+
     // Repaint the changed region.
     int first = Math.max(0, Math.min(getRowCount() - 1, event.getFirstIndex()));
     int last = Math.max(0, Math.min(getRowCount() - 1, event.getLastIndex()));
@@ -3134,11 +3134,11 @@ public class JTable
   }
 
  /**
-   * Returns index of the column that contains specified point 
+   * Returns index of the column that contains specified point
    * or -1 if this table doesn't contain this point.
    *
    * @param point point to identify the column
-   * @return index of the column that contains specified point or 
+   * @return index of the column that contains specified point or
    * -1 if this table doesn't contain this point.
    */
   public int columnAtPoint(Point point)
@@ -3162,7 +3162,7 @@ public class JTable
   /**
    * Returns index of the row that contains specified point or -1 if this table
    * doesn't contain this point.
-   * 
+   *
    * @param point point to identify the row
    * @return index of the row that contains specified point or -1 if this table
    *         doesn't contain this point.
@@ -3191,7 +3191,7 @@ public class JTable
       return -1;
   }
 
-  /** 
+  /**
    * Calculate the visible rectangle for a particular row and column. The
    * row and column are specified in visual terms; the column may not match
    * the {@link #dataModel} column.
@@ -3272,7 +3272,7 @@ public class JTable
             cellRect.x += cMargin / 2;
             cellRect.width -= cMargin;
           }
-      } 
+      }
 
     return cellRect;
   }
@@ -3291,10 +3291,10 @@ public class JTable
    * @return The current value of the selectedRow property
    */
   public int getSelectedRow ()
-  {    
+  {
     return selectionModel.getMinSelectionIndex();
   }
-  
+
   /**
    * Get the value of the {@link #selectionModel} property.
    *
@@ -3305,7 +3305,7 @@ public class JTable
     //Neither Sun nor IBM returns null if rowSelection not allowed
     return selectionModel;
   }
-  
+
   public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction)
   {
     int block;
@@ -3334,7 +3334,7 @@ public class JTable
   {
     return false;
   }
-  
+
   /**
    * Get the value of the scrollableTracksViewportWidth property.
    *
@@ -3348,20 +3348,20 @@ public class JTable
     else
       return true;
   }
-  
+
   /**
    * Return the preferred scrolling amount (in pixels) for the given scrolling
    * direction and orientation. This method handles a partially exposed row by
    * returning the distance required to completely expose the item. When
    * scrolling the top item is completely exposed.
-   * 
+   *
    * @param visibleRect the currently visible part of the component.
    * @param orientation the scrolling orientation
    * @param direction the scrolling direction (negative - up, positive -down).
    *          The values greater than one means that more mouse wheel or similar
    *          events were generated, and hence it is better to scroll the longer
    *          distance.
-   *          
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
@@ -3403,7 +3403,7 @@ public class JTable
    * not provide the editor, the call is forwarded to the
    * {@link #getDefaultEditor(Class)} with the parameter, obtained from
    * {@link TableModel#getColumnClass(int)}.
-   * 
+   *
    * @param row the cell row
    * @param column the cell column
    * @return the editor to edit that cell
@@ -3420,13 +3420,13 @@ public class JTable
 
     return editor;
   }
-  
+
   /**
    * Get the default editor for editing values of the given type
    * (String, Boolean and so on).
-   * 
+   *
    * @param columnClass the class of the value that will be edited.
-   * 
+   *
    * @return the editor, suitable for editing this data type
    */
   public TableCellEditor getDefaultEditor(Class columnClass)
@@ -3435,7 +3435,7 @@ public class JTable
       return (TableCellEditor) defaultEditorsByColumnClass.get(columnClass);
     else
       {
-        JTextField t = new TableTextField();        
+        JTextField t = new TableTextField();
         TableCellEditor r = new DefaultCellEditor(t);
         defaultEditorsByColumnClass.put(columnClass, r);
         return r;
@@ -3444,7 +3444,7 @@ public class JTable
 
   /**
    * Get the cell renderer for rendering the given cell.
-   * 
+   *
    * @param row the cell row
    * @param column the cell column
    * @return the cell renderer to render that cell.
@@ -3464,7 +3464,7 @@ public class JTable
 
   /**
    * Set default renderer for rendering the given data type.
-   * 
+   *
    * @param columnClass the data type (String, Boolean and so on) that must be
    *          rendered.
    * @param rend the renderer that will rend this data type
@@ -3476,9 +3476,9 @@ public class JTable
 
   /**
    * Get the default renderer for rendering the given data type.
-   * 
+   *
    * @param columnClass the data that must be rendered
-   * 
+   *
    * @return the appropriate defauld renderer for rendering that data type.
    */
   public TableCellRenderer getDefaultRenderer(Class columnClass)
@@ -3492,7 +3492,7 @@ public class JTable
         return r;
       }
   }
-  
+
   /**
    * Convert the table model index into the table column number.
    * The model number need not match the real column position. The columns
@@ -3500,9 +3500,9 @@ public class JTable
    * column headers.
    *
    * @param vc the column number (0=first).
-   * 
+   *
    * @return the table column model index of this column.
-   * 
+   *
    * @see TableColumn#getModelIndex()
    */
   public int convertColumnIndexToModel(int vc)
@@ -3512,18 +3512,18 @@ public class JTable
     else
       return columnModel.getColumn(vc).getModelIndex();
   }
-  
+
   /**
    * Convert the table column number to the table column model index.
    * The model number need not match the real column position. The columns
    * may be rearranged by the user with mouse at any time by dragging the
    * column headers.
-   *  
+   *
    * @param mc the table column index (0=first).
-   * 
+   *
    * @return the table column number in the model
-   * 
-   * @see TableColumn#getModelIndex() 
+   *
+   * @see TableColumn#getModelIndex()
    */
   public int convertColumnIndexToView(int mc)
   {
@@ -3537,14 +3537,14 @@ public class JTable
       }
     return -1;
   }
-  
+
   /**
    * Prepare the renderer for rendering the given cell.
-   * 
+   *
    * @param renderer the renderer being prepared
    * @param row the row of the cell being rendered
    * @param column the column of the cell being rendered
-   * 
+   *
    * @return the component which .paint() method will paint the cell.
    */
   public Component prepareRenderer(TableCellRenderer renderer,
@@ -3569,7 +3569,7 @@ public class JTable
                        && colSel.getLeadSelectionIndex() == column;
 
     return renderer.getTableCellRendererComponent(this,
-                                                  dataModel.getValueAt(row, 
+                                                  dataModel.getValueAt(row,
                                                                        convertColumnIndexToModel(column)),
                                                   isSel,
                                                   hasFocus,
@@ -3635,7 +3635,7 @@ public class JTable
    * Get the value of the {@link #rowSelectionAllowed} property.
    *
    * @return The current value of the property
-   * 
+   *
    * @see #setRowSelectionAllowed(boolean)
    */
   public boolean getRowSelectionAllowed()
@@ -3671,7 +3671,7 @@ public class JTable
    */
   public int getColumnCount()
   {
-    return columnModel.getColumnCount();    
+    return columnModel.getColumnCount();
   }
 
   /**
@@ -3718,14 +3718,14 @@ public class JTable
           case ListSelectionModel.SINGLE_SELECTION:
             sum = 1;
             break;
-            
+
           case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
             sum = hi - lo + 1;
             break;
-            
-          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:        
+
+          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
-              if (lsm.isSelectedIndex(i))        
+              if (lsm.isSelectedIndex(i))
                 ++sum;
             break;
           }
@@ -3747,16 +3747,16 @@ public class JTable
           {
           case ListSelectionModel.SINGLE_SELECTION:
             ret[0] = lo;
-            break;      
-      
-          case ListSelectionModel.SINGLE_INTERVAL_SELECTION:            
+            break;
+
+          case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
               ret[j++] = i;
             break;
-            
-          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:        
+
+          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
-              if (lsm.isSelectedIndex(i))        
+              if (lsm.isSelectedIndex(i))
                 ret[j++] = i;
             break;
           }
@@ -3769,7 +3769,7 @@ public class JTable
    * delegation to the {@link #columnModel} field.
    *
    * @return The current value of the selectedColumnCount property
-   */  
+   */
   public int getSelectedColumnCount()
   {
     return countSelections(columnModel.getSelectionModel());
@@ -3790,7 +3790,7 @@ public class JTable
    * Get the value of the columnSelectionAllowed property.
    *
    * @return The current value of the columnSelectionAllowed property
-   * 
+   *
    * @see #setColumnSelectionAllowed(boolean)
    */
   public boolean getColumnSelectionAllowed()
@@ -3835,7 +3835,7 @@ public class JTable
         tcm.addColumnModelListener(ctx);
         tcm.getSelectionModel().addListSelectionListener(ctx);
         getSelectionModel().addListSelectionListener(ctx);
-        
+
         accessibleContext = ctx;
       }
     return accessibleContext;
@@ -3947,7 +3947,7 @@ public class JTable
    * @param column column to removed
    */
   public void removeColumn(TableColumn column)
-  {    
+  {
     columnModel.removeColumn(column);
   }
 
@@ -3956,8 +3956,8 @@ public class JTable
    *
    * @param column index of the column to move
    * @param targetColumn index specifying new location of the column
-   */ 
-  public void moveColumn(int column,int targetColumn) 
+   */
+  public void moveColumn(int column,int targetColumn)
   {
     columnModel.moveColumn(column, targetColumn);
   }
@@ -3968,7 +3968,7 @@ public class JTable
    * {@link #createDefaultColumnsFromModel()} method is called.
    *
    * @param autoCreate  the new value of the flag.
-   */ 
+   */
   public void setAutoCreateColumnsFromModel(boolean autoCreate)
   {
     if (autoCreateColumnsFromModel != autoCreate)
@@ -3983,7 +3983,7 @@ public class JTable
    * Set the value of the {@link #autoResizeMode} property.
    *
    * @param a The new value of the autoResizeMode property
-   */ 
+   */
   public void setAutoResizeMode(int a)
   {
     autoResizeMode = a;
@@ -4000,7 +4000,7 @@ public class JTable
    * @see #getRowHeight()
    * @see #setRowHeight(int, int)
    * @see #getRowHeight(int)
-   */ 
+   */
   public void setRowHeight(int r)
   {
     if (r < 1)
@@ -4013,10 +4013,10 @@ public class JTable
     revalidate();
     repaint();
   }
-  
+
   /**
    * Sets the height of a single row in the table.
-   * 
+   *
    * @param rh the new row height
    * @param row the row to change the height of
    */
@@ -4028,12 +4028,12 @@ public class JTable
       }
     rowHeights.setSize(row, rh);
   }
-  
+
   /**
    * Set the value of the {@link #rowMargin} property.
    *
    * @param r The new value of the rowMargin property
-   */ 
+   */
   public void setRowMargin(int r)
   {
     rowMargin = r;
@@ -4045,12 +4045,12 @@ public class JTable
    * Set the value of the {@link #rowSelectionAllowed} property.
    *
    * @param r The new value of the rowSelectionAllowed property
-   * 
+   *
    * @see #getRowSelectionAllowed()
-   */ 
+   */
   public void setRowSelectionAllowed(boolean r)
   {
-    if (rowSelectionAllowed != r) 
+    if (rowSelectionAllowed != r)
       {
         rowSelectionAllowed = r;
         firePropertyChange("rowSelectionAllowed", !r, r);
@@ -4062,7 +4062,7 @@ public class JTable
    * Set the value of the {@link #cellSelectionEnabled} property.
    *
    * @param c The new value of the cellSelectionEnabled property
-   */ 
+   */
   public void setCellSelectionEnabled(boolean c)
   {
     setColumnSelectionAllowed(c);
@@ -4079,13 +4079,13 @@ public class JTable
    * m.
                      
    *
    * @param m The new value of the model property
-   */ 
+   */
   public void setModel(TableModel m)
   {
     // Throw exception is m is null.
     if (m == null)
       throw new IllegalArgumentException();
-   
+
     // Don't do anything if setting the current model again.
     if (dataModel == m)
       return;
@@ -4095,7 +4095,7 @@ public class JTable
     // Remove table as TableModelListener from old model.
     if (dataModel != null)
       dataModel.removeTableModelListener(this);
-    
+
     if (m != null)
       {
         // Set property.
@@ -4129,7 +4129,7 @@ public class JTable
    * c.
                      
    *
    * @param c The new value of the columnModel property
-   */ 
+   */
   public void setColumnModel(TableColumnModel c)
   {
     if (c == null)
@@ -4146,7 +4146,7 @@ public class JTable
         TableColumn column;
         for (int i = 0; i < ncols; ++i)
           {
-            column = columnModel.getColumn(i); 
+            column = columnModel.getColumn(i);
             if (column.getHeaderValue()==null)
               column.setHeaderValue(dataModel.getColumnName(i));
           }
@@ -4165,9 +4165,9 @@ public class JTable
    * Set the value of the columnSelectionAllowed property.
    *
    * @param c The new value of the property
-   * 
+   *
    * @see #getColumnSelectionAllowed()
-   */ 
+   */
   public void setColumnSelectionAllowed(boolean c)
   {
     if (columnModel.getColumnSelectionAllowed() != c)
@@ -4186,7 +4186,7 @@ public class JTable
    * parameter s.
                      
    *
    * @param s The new value of the selectionModel property
-   */ 
+   */
   public void setSelectionModel(ListSelectionModel s)
   {
     if (s == null)
@@ -4206,12 +4206,12 @@ public class JTable
    * mode is set for row and column selection models.
    *
    * @param s The new value of the property
-   */ 
+   */
   public void setSelectionMode(int s)
-  { 
-    selectionModel.setSelectionMode(s);    
+  {
+    selectionModel.setSelectionMode(s);
     columnModel.getSelectionModel().setSelectionMode(s);
-    
+
     repaint();
   }
 
@@ -4223,7 +4223,7 @@ public class JTable
    * c.
                      
    *
    * @param c The new value of the cellEditor property
-   */ 
+   */
   public void setCellEditor(TableCellEditor c)
   {
     TableCellEditor tmp = cellEditor;
@@ -4238,7 +4238,7 @@ public class JTable
    * Set the value of the {@link #dragEnabled} property.
    *
    * @param d The new value of the dragEnabled property
-   */ 
+   */
   public void setDragEnabled(boolean d)
   {
     dragEnabled = d;
@@ -4248,7 +4248,7 @@ public class JTable
    * Set the value of the {@link #gridColor} property.
    *
    * @param g The new value of the gridColor property
-   */ 
+   */
   public void setGridColor(Color g)
   {
     gridColor = g;
@@ -4259,7 +4259,7 @@ public class JTable
    * Set the value of the intercellSpacing property.
    *
    * @param i The new value of the intercellSpacing property
-   */ 
+   */
   public void setIntercellSpacing(Dimension i)
   {
     rowMargin = i.height;
@@ -4271,7 +4271,7 @@ public class JTable
    * Set the value of the {@link #preferredViewportSize} property.
    *
    * @param p The new value of the preferredViewportSize property
-   */ 
+   */
   public void setPreferredScrollableViewportSize(Dimension p)
   {
     preferredViewportSize = p;
@@ -4287,7 +4287,7 @@ public class JTable
    * selectionBackground changed.
                      
    *
    * @param s The new value of the selectionBackground property
-   */ 
+   */
   public void setSelectionBackground(Color s)
   {
     Color tmp = selectionBackground;
@@ -4307,7 +4307,7 @@ public class JTable
    * selectionForeground changed.
                      
    *
    * @param s The new value of the selectionForeground property
-   */ 
+   */
   public void setSelectionForeground(Color s)
   {
     Color tmp = selectionForeground;
@@ -4323,7 +4323,7 @@ public class JTable
    * Set the value of the showGrid property.
    *
    * @param s The new value of the showGrid property
-   */ 
+   */
   public void setShowGrid(boolean s)
   {
     setShowVerticalLines(s);
@@ -4334,7 +4334,7 @@ public class JTable
    * Set the value of the {@link #showHorizontalLines} property.
    *
    * @param s The new value of the showHorizontalLines property
-   */ 
+   */
   public void setShowHorizontalLines(boolean s)
   {
     showHorizontalLines = s;
@@ -4345,7 +4345,7 @@ public class JTable
    * Set the value of the {@link #showVerticalLines} property.
    *
    * @param s The new value of the showVerticalLines property
-   */ 
+   */
   public void setShowVerticalLines(boolean s)
   {
     showVerticalLines = s;
@@ -4356,7 +4356,7 @@ public class JTable
    * Set the value of the {@link #tableHeader} property.
    *
    * @param t The new value of the tableHeader property
-   */ 
+   */
   public void setTableHeader(JTableHeader t)
   {
     if (tableHeader != null)
@@ -4383,7 +4383,7 @@ public class JTable
     if (jsp != null)
       {
         jsp.setColumnHeaderView(null);
-      }    
+      }
   }
 
 
@@ -4417,7 +4417,7 @@ public class JTable
           cols[i].setWidth(cols[i].getPreferredWidth() + average);
       }
   }
-  
+
   /**
    * This distributes the superfluous width in a table, setting the width of the
    * column being resized strictly to its preferred width.
@@ -4434,20 +4434,20 @@ public class JTable
           cols[i].setWidth(cols[i].getPreferredWidth() + average);
       }
     resizeIt.setWidth(resizeIt.getPreferredWidth());
-  }  
-  
+  }
+
   /**
    * Set the widths of all columns, taking they preferred widths into
    * consideration. The excess space, if any, will be distrubuted between
    * all columns. This method also handles special cases when one of the
    * collumns is currently being resized.
-   * 
+   *
    * @see TableColumn#setPreferredWidth(int)
    */
   public void doLayout()
   {
     TableColumn resizingColumn = null;
-    
+
     int ncols = columnModel.getColumnCount();
     if (ncols < 1)
       return;
@@ -4457,7 +4457,7 @@ public class JTable
 
     if (tableHeader != null)
       resizingColumn = tableHeader.getResizingColumn();
-     
+
     for (int i = 0; i < ncols; ++i)
       {
         TableColumn col = columnModel.getColumn(i);
@@ -4466,21 +4466,21 @@ public class JTable
         if (resizingColumn == col)
           rCol = i;
       }
- 
+
     int spill = getWidth() - prefSum;
 
     if (resizingColumn != null)
       {
         TableColumn col;
         TableColumn [] cols;
-        
+
         switch (getAutoResizeMode())
           {
           case AUTO_RESIZE_LAST_COLUMN:
             col = columnModel.getColumn(ncols-1);
             col.setWidth(col.getPreferredWidth() + spill);
             break;
-            
+
           case AUTO_RESIZE_NEXT_COLUMN:
             col = columnModel.getColumn(ncols-1);
             col.setWidth(col.getPreferredWidth() + spill);
@@ -4494,7 +4494,7 @@ public class JTable
             break;
 
           case AUTO_RESIZE_SUBSEQUENT_COLUMNS:
-            
+
             // Subtract the width of the non-resized columns from the spill.
             int w = 0;
             int wp = 0;
@@ -4513,7 +4513,7 @@ public class JTable
                 // If there are any columns on the right sied to resize.
                 spill = (getWidth()-w) - (prefSum-wp);
                 int average = spill / n;
-            
+
                  // For all columns right from the column being resized:
                 for (int i = rCol+1; i < ncols; i++)
                   {
@@ -4539,17 +4539,17 @@ public class JTable
 
         distributeSpill(cols, spill);
       }
-    
+
     if (editorComp!=null)
       moveToCellBeingEdited(editorComp);
-    
+
     int leftBoundary = getLeftResizingBoundary();
     int width = getWidth() - leftBoundary;
     repaint(leftBoundary, 0, width, getHeight());
     if (tableHeader != null)
       tableHeader.repaint(leftBoundary, 0, width, tableHeader.getHeight());
   }
-  
+
   /**
    * Get the left boundary of the rectangle which changes during the column
    * resizing.
@@ -4569,12 +4569,12 @@ public class JTable
 
         for (int i = 0; i < rc; i++)
           p += columnModel.getColumn(i).getWidth();
-        
+
         return p;
       }
   }
-  
-  
+
+
   /**
    * @deprecated Replaced by doLayout()
    */
@@ -4582,7 +4582,7 @@ public class JTable
   {
     doLayout();
   }
-  
+
   /**
    * Obsolete since JDK 1.4. Please use doLayout().
    */
@@ -4628,9 +4628,9 @@ public class JTable
   /**
    * Get the class (datatype) of the column. The cells are rendered and edited
    * differently, depending from they data type.
-   * 
+   *
    * @param column the column (not the model index).
-   * 
+   *
    * @return the class, defining data type of that column (String.class for
    * String, Boolean.class for boolean and so on).
    */
@@ -4638,16 +4638,16 @@ public class JTable
   {
     return getModel().getColumnClass(convertColumnIndexToModel(column));
   }
-  
+
   /**
    * Get the name of the column. If the column has the column identifier set,
    * the return value is the result of the .toString() method call on that
    * identifier. If the identifier is not explicitly set, the returned value
-   * is calculated by 
+   * is calculated by
    * {@link javax.swing.table.AbstractTableModel#getColumnName(int)}.
-   * 
+   *
    * @param column the column
-   * 
+   *
    * @return the name of that column.
    */
   public String getColumnName(int column)
@@ -4658,7 +4658,7 @@ public class JTable
 
   /**
    * Get the column, currently being edited
-   * 
+   *
    * @return the column, currently being edited.
    */
   public int getEditingColumn()
@@ -4668,17 +4668,17 @@ public class JTable
 
   /**
    * Set the column, currently being edited
-   * 
+   *
    * @param column the column, currently being edited.
    */
   public void setEditingColumn(int column)
   {
     editingColumn = column;
   }
-  
+
   /**
    * Get the row currently being edited.
-   * 
+   *
    * @return the row, currently being edited.
    */
   public int getEditingRow()
@@ -4688,17 +4688,17 @@ public class JTable
 
   /**
    * Set the row currently being edited.
-   * 
+   *
    * @param row the row, that will be edited
    */
   public void setEditingRow(int row)
   {
     editingRow = row;
   }
-  
+
   /**
    * Get the editor component that is currently editing one of the cells
-   * 
+   *
    * @return the editor component or null, if none of the cells is being
    * edited.
    */
@@ -4706,10 +4706,10 @@ public class JTable
   {
     return editorComp;
   }
-  
+
   /**
    * Check if one of the table cells is currently being edited.
-   * 
+   *
    * @return true if there is a cell being edited.
    */
   public boolean isEditing()
@@ -4721,10 +4721,10 @@ public class JTable
    * Set the default editor for the given column class (column data type).
    * By default, String is handled by text field and Boolean is handled by
    * the check box.
-   *  
+   *
    * @param columnClass the column data type
    * @param editor the editor that will edit this data type
-   * 
+   *
    * @see TableModel#getColumnClass(int)
    */
   public void setDefaultEditor(Class columnClass, TableCellEditor editor)
@@ -4734,25 +4734,25 @@ public class JTable
     else
       defaultEditorsByColumnClass.remove(columnClass);
   }
-  
+
   public void addColumnSelectionInterval(int index0, int index1)
   {
     if ((index0 < 0 || index0 > (getColumnCount()-1)
          || index1 < 0 || index1 > (getColumnCount()-1)))
       throw new IllegalArgumentException("Column index out of range.");
-    
+
     getColumnModel().getSelectionModel().addSelectionInterval(index0, index1);
   }
-  
+
   public void addRowSelectionInterval(int index0, int index1)
-  {            
+  {
     if ((index0 < 0 || index0 > (getRowCount()-1)
          || index1 < 0 || index1 > (getRowCount()-1)))
       throw new IllegalArgumentException("Row index out of range.");
-        
+
     getSelectionModel().addSelectionInterval(index0, index1);
   }
-  
+
   public void setColumnSelectionInterval(int index0, int index1)
   {
     if ((index0 < 0 || index0 > (getColumnCount()-1)
@@ -4761,17 +4761,17 @@ public class JTable
 
     getColumnModel().getSelectionModel().setSelectionInterval(index0, index1);
   }
-  
+
   public void setRowSelectionInterval(int index0, int index1)
-  {    
+  {
     if ((index0 < 0 || index0 > (getRowCount()-1)
          || index1 < 0 || index1 > (getRowCount()-1)))
       throw new IllegalArgumentException("Row index out of range.");
 
     getSelectionModel().setSelectionInterval(index0, index1);
   }
-  
-  public void removeColumnSelectionInterval(int index0, int index1)  
+
+  public void removeColumnSelectionInterval(int index0, int index1)
   {
     if ((index0 < 0 || index0 > (getColumnCount()-1)
          || index1 < 0 || index1 > (getColumnCount()-1)))
@@ -4779,7 +4779,7 @@ public class JTable
 
     getColumnModel().getSelectionModel().removeSelectionInterval(index0, index1);
   }
-  
+
   public void removeRowSelectionInterval(int index0, int index1)
   {
     if ((index0 < 0 || index0 > (getRowCount()-1)
@@ -4788,12 +4788,12 @@ public class JTable
 
     getSelectionModel().removeSelectionInterval(index0, index1);
   }
-  
+
   /**
    * Checks if the given column is selected.
-   * 
+   *
    * @param column the column
-   * 
+   *
    * @return true if the column is selected (as reported by the selection
    * model, associated with the column model), false otherwise.
    */
@@ -4801,12 +4801,12 @@ public class JTable
   {
     return getColumnModel().getSelectionModel().isSelectedIndex(column);
   }
-  
+
   /**
    * Checks if the given row is selected.
-   * 
+   *
    * @param row the row
-   * 
+   *
    * @return true if the row is selected (as reported by the selection model),
    * false otherwise.
    */
@@ -4814,21 +4814,21 @@ public class JTable
   {
     return getSelectionModel().isSelectedIndex(row);
   }
-  
+
   /**
    * Checks if the given cell is selected. The cell is selected if both
    * the cell row and the cell column are selected.
-   * 
+   *
    * @param row the cell row
    * @param column the cell column
-   * 
+   *
    * @return true if the cell is selected, false otherwise
    */
   public boolean isCellSelected(int row, int column)
   {
     return isRowSelected(row) && isColumnSelected(column);
   }
-  
+
   /**
    * Select all table.
    */
@@ -4837,7 +4837,7 @@ public class JTable
     // The table is empty - nothing to do!
     if (getRowCount() == 0 || getColumnCount() == 0)
       return;
-    
+
     // rowLead and colLead store the current lead selection indices
     int rowLead = selectionModel.getLeadSelectionIndex();
     int colLead = getColumnModel().getSelectionModel().getLeadSelectionIndex();
@@ -4850,25 +4850,25 @@ public class JTable
     addColumnSelectionInterval(colLead,colLead);
     addRowSelectionInterval(rowLead, rowLead);
   }
-  
+
   /**
    * Get the cell value at the given position.
-   * 
+   *
    * @param row the row to get the value
-   * @param column the actual column number (not the model index) 
+   * @param column the actual column number (not the model index)
    * to get the value.
-   * 
+   *
    * @return the cell value, as returned by model.
    */
   public Object getValueAt(int row, int column)
   {
     return dataModel.getValueAt(row, convertColumnIndexToModel(column));
   }
-  
+
   /**
    * Set value for the cell at the given position. The modified cell is
    * repainted.
-   * 
+   *
    * @param value the value to set
    * @param row the row of the cell being modified
    * @param column the column of the cell being modified
@@ -4876,20 +4876,20 @@ public class JTable
   public void setValueAt(Object value, int row, int column)
   {
     dataModel.setValueAt(value, row, convertColumnIndexToModel(column));
-    
+
     repaint(getCellRect(row, column, true));
   }
-  
+
   /**
    * Get table column with the given identified.
-   * 
+   *
    * @param identifier the column identifier
-   * 
+   *
    * @return the table column with this identifier
-   * 
-   * @throws IllegalArgumentException if identifier is 
+   *
+   * @throws IllegalArgumentException if identifier is
    *         null or there is no column with that identifier.
-   * 
+   *
    * @see TableColumn#setIdentifier(Object)
    */
   public TableColumn getColumn(Object identifier)
@@ -4929,7 +4929,7 @@ public class JTable
       columnModel.removeColumn(columnModel.getColumn(columnIndex));
       columnIndex--;
     }
-  
+
     // add new columns to match the TableModel
     int columnCount = dataModel.getColumnCount();
     for (int c = 0; c < columnCount; c++)
@@ -4967,7 +4967,7 @@ public class JTable
       }
     else if (extend)
       {
-        // Extend the previous selection from the anchor to the 
+        // Extend the previous selection from the anchor to the
         // specified cell, clearing all other selections
         selectionModel.setLeadSelectionIndex(rowIndex);
         getColumnModel().getSelectionModel().setLeadSelectionIndex(columnIndex);
@@ -4980,14 +4980,14 @@ public class JTable
         selectionModel.setSelectionInterval(rowIndex,rowIndex);
         getColumnModel().getSelectionModel().clearSelection();
         getColumnModel().getSelectionModel().setSelectionInterval(columnIndex, columnIndex);
-        
-        
+
+
       }
   }
 
   /**
    * Programmatically starts editing the specified cell.
-   * 
+   *
    * @param row the row of the cell to edit.
    * @param column the column of the cell to edit.
    */
@@ -4998,7 +4998,7 @@ public class JTable
       editingStopped(new ChangeEvent("editingStopped"));
 
     TableCellEditor editor = getCellEditor(row, column);
-    
+
     // The boolean values are inverted by the single click without the
     // real editing session.
     if (editor == booleanInvertingEditor && isCellEditable(row, column))
@@ -5024,16 +5024,16 @@ public class JTable
         moveToCellBeingEdited(editorComp);
         scrollRectToVisible(editorComp.getBounds());
         editorComp.requestFocusInWindow();
-        
+
         // Deliver the should select event.
-        return editor.shouldSelectCell(null);        
+        return editor.shouldSelectCell(null);
       }
   }
 
   /**
-   * Move the given component under the cell being edited. 
+   * Move the given component under the cell being edited.
    * The table must be in the editing mode.
-   * 
+   *
    * @param component the component to move.
    */
   private void moveToCellBeingEdited(Component component)
@@ -5107,7 +5107,7 @@ public class JTable
     // TODO: Implement functionality of this property (in UI impl).
     surrendersFocusOnKeystroke = value;
   }
-  
+
   /**
    * Returns whether cell editors of this table should receive keyboard focus
    * when the editor is activated by a keystroke. The default setting is
@@ -5128,7 +5128,7 @@ public class JTable
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/JTextArea.java b/libjava/classpath/javax/swing/JTextArea.java
index 9b50febe361..51921cc89dd 100644
--- a/libjava/classpath/javax/swing/JTextArea.java
+++ b/libjava/classpath/javax/swing/JTextArea.java
@@ -1,4 +1,4 @@
-/* JTextArea.java -- 
+/* JTextArea.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -126,7 +126,7 @@ public class JTextArea extends JTextComponent
    * Compatible with Sun's JDK
    */
   private static final long serialVersionUID = -6141680179310439825L;
-  
+
   /**
    * The number of rows used by the component.
    */
@@ -235,14 +235,14 @@ public class JTextArea extends JTextComponent
   public void append(String toAppend)
   {
       try
-	  {
-	      getDocument().insertString(getText().length(), toAppend, null);
-	  }
+          {
+              getDocument().insertString(getText().length(), toAppend, null);
+          }
       catch (BadLocationException exception)
-	  {
-	      /* This shouldn't happen in theory -- but, if it does...  */
-	      throw new RuntimeException("Unexpected exception occurred.", exception);
-	  }
+          {
+              /* This shouldn't happen in theory -- but, if it does...  */
+              throw new RuntimeException("Unexpected exception occurred.", exception);
+          }
       if (toAppend != null && toAppend.length() > 0)
         revalidate();
   }
@@ -337,7 +337,7 @@ public class JTextArea extends JTextComponent
   {
     return columns;
   }
-  
+
   /**
    * Sets the number of rows.
    *
@@ -349,7 +349,7 @@ public class JTextArea extends JTextComponent
   {
     if (columns < 0)
       throw new IllegalArgumentException();
-    
+
     if (columns != this.columns)
       {
         this.columns = columns;
@@ -378,7 +378,7 @@ public class JTextArea extends JTextComponent
   {
     if (rows < 0)
       throw new IllegalArgumentException();
-   
+
     if (rows != this.rows)
       {
         this.rows = rows;
@@ -423,7 +423,7 @@ public class JTextArea extends JTextComponent
   {
     return wrapStyleWord;
   }
-  
+
   /**
    * Enables/Disables word style wrapping.
    *
@@ -434,12 +434,12 @@ public class JTextArea extends JTextComponent
   {
     if (wrapStyleWord == flag)
       return;
-    
+
     boolean oldValue = wrapStyleWord;
     wrapStyleWord = flag;
     firePropertyChange("wrapStyleWord", oldValue, wrapStyleWord);
   }
-  
+
   /**
    * Returns the number of characters used for a tab.
    * This defaults to 8.
@@ -456,14 +456,14 @@ public class JTextArea extends JTextComponent
    * supplied value.  If a change to the tab size property
    * occurs (i.e. newSize != tabSize), a property change event
    * is fired.
-   * 
+   *
    * @param newSize The new number of characters to use for a tab.
    */
   public void setTabSize(int newSize)
   {
     if (tabSize == newSize)
       return;
-    
+
     int oldValue = tabSize;
     tabSize = newSize;
     firePropertyChange("tabSize", oldValue, tabSize);
@@ -484,7 +484,7 @@ public class JTextArea extends JTextComponent
      throws BadLocationException
   {
     int lineCount = getLineCount();
-    
+
     if (line < 0 || line > lineCount)
       throw new BadLocationException("Non-existing line number", line);
 
@@ -496,7 +496,7 @@ public class JTextArea extends JTextComponent
      throws BadLocationException
   {
     int lineCount = getLineCount();
-    
+
     if (line < 0 || line > lineCount)
       throw new BadLocationException("Non-existing line number", line);
 
@@ -510,7 +510,7 @@ public class JTextArea extends JTextComponent
     Document doc = getDocument();
 
     if (offset < doc.getStartPosition().getOffset()
-	|| offset >= doc.getEndPosition().getOffset())
+        || offset >= doc.getEndPosition().getOffset())
       throw new BadLocationException("offset outside of document", offset);
 
     return doc.getDefaultRootElement().getElementIndex(offset);
@@ -536,32 +536,32 @@ public class JTextArea extends JTextComponent
   {
     // Retrieve the document model.
     Document doc = getDocument();
-      
+
     // Check the model and string for validity.
     if (doc == null
-	|| string == null
-	|| string.length() == 0)
+        || string == null
+        || string.length() == 0)
       return;
 
     // Insert the text into the model.
     try
       {
-	doc.insertString(position, string, null);
+        doc.insertString(position, string, null);
       }
     catch (BadLocationException e)
       {
-	throw new IllegalArgumentException("The supplied position, "
-					   + position + ", was invalid.");
+        throw new IllegalArgumentException("The supplied position, "
+                                           + position + ", was invalid.");
       }
   }
 
   public void replaceRange(String text, int start, int end)
   {
     Document doc = getDocument();
-    
+
     if (start > end
-	|| start < doc.getStartPosition().getOffset()
-	|| end >= doc.getEndPosition().getOffset())
+        || start < doc.getStartPosition().getOffset()
+        || end >= doc.getEndPosition().getOffset())
       throw new IllegalArgumentException();
 
     try
@@ -571,7 +571,7 @@ public class JTextArea extends JTextComponent
       }
     catch (BadLocationException e)
       {
-	// This cannot happen as we check offset above.
+        // This cannot happen as we check offset above.
       }
   }
 
diff --git a/libjava/classpath/javax/swing/JTextField.java b/libjava/classpath/javax/swing/JTextField.java
index ace358f8922..69b70b0685d 100644
--- a/libjava/classpath/javax/swing/JTextField.java
+++ b/libjava/classpath/javax/swing/JTextField.java
@@ -95,7 +95,7 @@ public class JTextField extends JTextComponent
    * gets accepted.
    */
   public static final String notifyAction = "notify-field-accept";
-  
+
   static
     {
       actions = new Action[1];
@@ -108,16 +108,16 @@ public class JTextField extends JTextComponent
         }
       };
     }
-  
+
   private int columns;
   private int align;
-  
+
   /** @since 1.3 */
   private Action action;
 
   /** @since 1.3 */
   private String actionCommand;
-  
+
   private PropertyChangeListener actionPropertyChangeListener;
 
   /**
@@ -142,7 +142,7 @@ public class JTextField extends JTextComponent
   {
     this(null, text, 0);
   }
-  
+
   /**
    * Creates a new instance of JTextField.
    *
@@ -270,7 +270,7 @@ public class JTextField extends JTextComponent
    */
   protected void fireActionPerformed()
   {
-    ActionEvent event = new ActionEvent(this, 0, 
+    ActionEvent event = new ActionEvent(this, 0,
                           actionCommand == null ? getText() : actionCommand);
     ActionListener[] listeners = getActionListeners();
 
@@ -305,8 +305,8 @@ public class JTextField extends JTextComponent
   }
 
   /**
-   * Returns the horizontal alignment, which is one of: JTextField.LEFT, 
-   * JTextField.CENTER, JTextField.RIGHT, JTextField.LEADING, 
+   * Returns the horizontal alignment, which is one of: JTextField.LEFT,
+   * JTextField.CENTER, JTextField.RIGHT, JTextField.LEADING,
    * JTextField.TRAILING.
    * @return the horizontal alignment
    */
@@ -345,7 +345,7 @@ public class JTextField extends JTextComponent
   }
 
   /**
-   * Returns the preferred size.  If there is a non-zero number of columns, 
+   * Returns the preferred size.  If there is a non-zero number of columns,
    * this is the number of columns multiplied by the column width, otherwise
    * it returns super.getPreferredSize().
    */
@@ -374,7 +374,7 @@ public class JTextField extends JTextComponent
 
   /**
    * Sets the scroll offset in pixels.
-   * 
+   *
    * @param offset the scroll offset
    */
   public void setScrollOffset(int offset)
@@ -385,7 +385,7 @@ public class JTextField extends JTextComponent
                                   Math.min(horizontalVisibility.getMaximum()
                                            - horizontalVisibility.getExtent(),
                                            offset));
-    
+
   }
 
   /**
@@ -407,7 +407,7 @@ public class JTextField extends JTextComponent
     for (int index = 0; index < listeners.length; ++index)
       listeners[index].actionPerformed(event);
   }
-  
+
   /**
    * @since 1.3
    */
@@ -480,7 +480,7 @@ public class JTextField extends JTextComponent
   }
 
   /**
-   * 
+   *
    * @since 1.3
    */
   protected void configurePropertiesFromAction(Action action)
@@ -546,15 +546,15 @@ public class JTextField extends JTextComponent
   {
     return ! (getParent() instanceof JViewport);
   }
-  
+
   public void scrollRectToVisible(Rectangle r)
   {
     int v = horizontalVisibility.getValue();
-    
+
     // The extent value is the inner width of the text field.
     int e = horizontalVisibility.getExtent();
     Insets i = getInsets();
-    
+
     // The x value in the rectangle (usually) denotes the new location
     // of the caret. We check whether the location lies inside the left or
     // right border and scroll into the appropriate direction.
@@ -566,5 +566,5 @@ public class JTextField extends JTextComponent
     else if (r.x > e + i.left)
       setScrollOffset(r.x + v - e - i.left);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/JTextPane.java b/libjava/classpath/javax/swing/JTextPane.java
index 05968fc8c20..4fef0020b64 100644
--- a/libjava/classpath/javax/swing/JTextPane.java
+++ b/libjava/classpath/javax/swing/JTextPane.java
@@ -179,7 +179,7 @@ public class JTextPane
     catch (BadLocationException e)
       {
         throw new AssertionError
-          ("No BadLocationException should be thrown here");      
+          ("No BadLocationException should be thrown here");
       }
   }
 
@@ -326,7 +326,7 @@ public class JTextPane
       }
     else
       getStyledDocument().setCharacterAttributes(start, end - start, attribute,
-						 replace);
+                                                 replace);
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/JToggleButton.java b/libjava/classpath/javax/swing/JToggleButton.java
index 60c44896019..2ee4187c345 100644
--- a/libjava/classpath/javax/swing/JToggleButton.java
+++ b/libjava/classpath/javax/swing/JToggleButton.java
@@ -1,4 +1,4 @@
-/* JToggleButton.java -- 
+/* JToggleButton.java --
    Copyright (C) 2002, 2004, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -92,7 +92,7 @@ public class JToggleButton extends AbstractButton implements Accessible
     {
       return AccessibleRole.TOGGLE_BUTTON;
     }
-    
+
     /**
      * Monitors the toggle button for state changes and fires accessible
      * property change events when they occur.
@@ -106,14 +106,14 @@ public class JToggleButton extends AbstractButton implements Accessible
           {
             /* State has changed from unselected (null) to selected */
             firePropertyChange(ACCESSIBLE_STATE_PROPERTY, null, AccessibleState.SELECTED);
-          } 
+          }
         else
           {
             /* State has changed from selected to unselected (null) */
             firePropertyChange(ACCESSIBLE_STATE_PROPERTY, AccessibleState.ENABLED, null);
           }
     }
-    
+
   }
 
   /**
@@ -129,19 +129,19 @@ public class JToggleButton extends AbstractButton implements Accessible
      * Compatible with Sun's JDK.
      */
     private static final long serialVersionUID = -1589950750899943974L;
-    
+
     /**
      * Sets the pressed state of the button.  The selected state
      * of the button also changes follwing the button being pressed.
      *
      * @param p true if the button is pressed down.
      */
-    public void setPressed(boolean p)  
+    public void setPressed(boolean p)
     {
       // cannot change PRESSED state unless button is enabled
       if (! isEnabled())
         return;
-      
+
       // if this call does not represent a CHANGE in state, then return
       if ((p && isPressed()) || (!p && !isPressed()))
         return;
@@ -164,7 +164,7 @@ public class JToggleButton extends AbstractButton implements Accessible
         stateMask = stateMask | PRESSED;
       else
         stateMask = stateMask & (~PRESSED);
-      
+
       // notify interested ChangeListeners
       fireStateChanged();
 
@@ -175,36 +175,36 @@ public class JToggleButton extends AbstractButton implements Accessible
                                               actionCommand));
         }
     }
-      
+
       /**
        * Checks if the button is selected.
-       * 
+       *
        * @return true if the button is selected.
        */
       public boolean isSelected()
       {
         return super.isSelected();
       }
-      
+
       /**
        * Sets the selected state of the button.
-       * 
+       *
        * @param b true if button is selected
        */
       public void setSelected(boolean b)
       {
         super.setSelected(b);
-      }  
+      }
   }
 
   /**
    * Compatible with Sun's JDK.
    */
   private static final long serialVersionUID = -3128248873429850443L;
-    
+
   /**
    * Constructs an unselected toggle button with no text or icon.
-   */ 
+   */
   public JToggleButton()
   {
     this(null, null, false);
@@ -229,10 +229,10 @@ public class JToggleButton extends AbstractButton implements Accessible
    * @param icon the icon to use.
    */
   public JToggleButton(Icon icon)
-  { 
+  {
     this(null, icon, false);
-  }    
-  
+  }
+
   /**
    * Constructs a toggle button with the supplied icon and state.
    *
@@ -240,22 +240,22 @@ public class JToggleButton extends AbstractButton implements Accessible
    * @param selected if true, the toggle button is initially in the
    *        selected state.  Otherwise, the button is unselected.
    */
-  public JToggleButton(Icon icon, boolean selected) 
+  public JToggleButton(Icon icon, boolean selected)
   {
     this(null, icon, selected);
   }
-  
+
   /**
    * Constructs an unselected toggle button using the supplied text
    * and no icon.
    *
    * @param text the text to use.
-   */ 
+   */
   public JToggleButton(String text)
   {
     this(text, null, false);
   }
-      
+
   /**
    * Constructs a toggle button with the supplied text and state.
    *
@@ -288,10 +288,10 @@ public class JToggleButton extends AbstractButton implements Accessible
    * @param selected if true, the toggle button is initially in the
    *        selected state.  Otherwise, the button is unselected.
    */
-  public JToggleButton (String text, Icon icon, boolean selected) 
+  public JToggleButton (String text, Icon icon, boolean selected)
   {
     super();
-    setModel(new ToggleButtonModel());  
+    setModel(new ToggleButtonModel());
     init(text, icon);
     model.setSelected(selected);
     setAlignmentX(LEFT_ALIGNMENT);
@@ -309,11 +309,11 @@ public class JToggleButton extends AbstractButton implements Accessible
     if (accessibleContext == null)
       {
         /* Create the context */
-	accessibleContext = new AccessibleJToggleButton();
+        accessibleContext = new AccessibleJToggleButton();
       }
     return accessibleContext;
   }
-  
+
   /**
    * Returns a string that specifies the name of the Look and Feel
    * class that renders this component.
@@ -324,7 +324,7 @@ public class JToggleButton extends AbstractButton implements Accessible
   {
     return "ToggleButtonUI";
   }
-  
+
   /**
    * Returns a textual representation of this component for debugging.
    * Users should not depend on anything as regards the content or formatting
@@ -337,17 +337,14 @@ public class JToggleButton extends AbstractButton implements Accessible
   {
     return super.paramString();
   }
-  
+
   /**
    * This method resets the toggle button's UI delegate to the default UI for
    * the current look and feel.
    */
   public void updateUI()
-  {	
+  {
     setUI((ButtonUI)UIManager.getUI(this));
   }
 
 }
-
-
-
diff --git a/libjava/classpath/javax/swing/JToolBar.java b/libjava/classpath/javax/swing/JToolBar.java
index 33ebcfcaf89..5f4816f04ae 100644
--- a/libjava/classpath/javax/swing/JToolBar.java
+++ b/libjava/classpath/javax/swing/JToolBar.java
@@ -83,7 +83,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
     }
 
     /**
-     * Returns a set containing the current state of the {@link JToolBar} 
+     * Returns a set containing the current state of the {@link JToolBar}
      * component.  The current implementation simply calls the superclass.
      *
      * @return The accessible state set.
@@ -134,16 +134,16 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
     public void layoutContainer(Container c)
     {
       if (! (c instanceof JToolBar))
-	throw new Error("DefaultToolBarLayout can only be used on JToolBars.");
+        throw new Error("DefaultToolBarLayout can only be used on JToolBars.");
       Insets insets = getInsets();
       Insets margin = getMargin();
       int middle;
       if (margin != null)
         {
-	  insets.left += margin.left;
-	  insets.top += margin.top;
-	  insets.bottom += margin.bottom;
-	  insets.right += margin.right;
+          insets.left += margin.left;
+          insets.top += margin.top;
+          insets.bottom += margin.bottom;
+          insets.right += margin.right;
         }
       Component[] components = c.getComponents();
       Dimension tdims = c.getSize();
@@ -152,39 +152,39 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
 
       if (getOrientation() == SwingUtilities.HORIZONTAL)
         {
-	  start += insets.left;
-	  for (int i = 0; i < components.length; i++)
-	    {
-	      if (components[i] != null && components[i].isVisible())
-	        {
-		  pref = components[i].getPreferredSize();
-		  if (pref != null)
-		    {
-		      middle = (tdims.height - pref.height) / 2;
-		      components[i].setBounds(start, middle, pref.width,
-		                              pref.height);
-		      start += pref.width;
-		    }
-	        }
-	    }
+          start += insets.left;
+          for (int i = 0; i < components.length; i++)
+            {
+              if (components[i] != null && components[i].isVisible())
+                {
+                  pref = components[i].getPreferredSize();
+                  if (pref != null)
+                    {
+                      middle = (tdims.height - pref.height) / 2;
+                      components[i].setBounds(start, middle, pref.width,
+                                              pref.height);
+                      start += pref.width;
+                    }
+                }
+            }
         }
       else
         {
-	  start += insets.top;
-	  for (int i = 0; i < components.length; i++)
-	    {
-	      if (components[i] != null && components[i].isVisible())
-	        {
-		  pref = components[i].getPreferredSize();
-		  if (pref != null)
-		    {
-		      middle = (tdims.width - pref.width) / 2;
-		      components[i].setBounds(middle, start, pref.width,
-		                              pref.height);
-		      start += pref.height;
-		    }
-	        }
-	    }
+          start += insets.top;
+          for (int i = 0; i < components.length; i++)
+            {
+              if (components[i] != null && components[i].isVisible())
+                {
+                  pref = components[i].getPreferredSize();
+                  if (pref != null)
+                    {
+                      middle = (tdims.width - pref.width) / 2;
+                      components[i].setBounds(middle, start, pref.width,
+                                              pref.height);
+                      start += pref.height;
+                    }
+                }
+            }
         }
     }
 
@@ -223,33 +223,33 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
 
       if (orientation == SwingConstants.HORIZONTAL)
         {
-	  for (int i = 0; i < components.length; i++)
-	    {
-	      dims = components[i].getPreferredSize();
-	      if (dims != null)
-	        {
-		  if (dims.height > limit)
-		    limit = dims.height;
-		  total += dims.width;
-	        }
-	    }
-	  w = total;
-	  h = limit;
+          for (int i = 0; i < components.length; i++)
+            {
+              dims = components[i].getPreferredSize();
+              if (dims != null)
+                {
+                  if (dims.height > limit)
+                    limit = dims.height;
+                  total += dims.width;
+                }
+            }
+          w = total;
+          h = limit;
         }
       else
         {
-	  for (int i = 0; i < components.length; i++)
-	    {
-	      dims = components[i].getPreferredSize();
-	      if (dims != null)
-	        {
-		  if (dims.width > limit)
-		    limit = dims.width;
-		  total += dims.height;
-	        }
-	    }
-	  w = limit;
-	  h = total;
+          for (int i = 0; i < components.length; i++)
+            {
+              dims = components[i].getPreferredSize();
+              if (dims != null)
+                {
+                  if (dims.width > limit)
+                    limit = dims.width;
+                  total += dims.height;
+                }
+            }
+          w = limit;
+          h = total;
         }
 
       Insets insets = getInsets();
@@ -259,8 +259,8 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
       Insets margin = getMargin();
       if (margin != null)
         {
-	  w += margin.left + margin.right;
-	  h += margin.top + margin.bottom;
+          w += margin.left + margin.right;
+          h += margin.top + margin.bottom;
         }
 
       return new Dimension(w, h);
@@ -509,10 +509,10 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
   {
     if (b != rollover)
       {
-	rollover = b;
-	firePropertyChange("rollover", ! rollover, rollover);
-	revalidate();
-	repaint();
+        rollover = b;
+        firePropertyChange("rollover", ! rollover, rollover);
+        revalidate();
+        repaint();
       }
   }
 
@@ -541,7 +541,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
 
     for (int i = 0; i < components.length; i++)
       if (components[i] == component)
-	return i;
+        return i;
 
     return -1;
   } // getComponentIndex()
@@ -584,11 +584,11 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
         || margin.right != this.margin.right || margin.top != this.margin.top
         || margin.bottom != this.margin.bottom)))
       {
-	Insets oldMargin = this.margin;
-	this.margin = margin;
-	firePropertyChange("margin", oldMargin, this.margin);
-	revalidate();
-	repaint();
+        Insets oldMargin = this.margin;
+        this.margin = margin;
+        firePropertyChange("margin", oldMargin, this.margin);
+        revalidate();
+        repaint();
       }
   } // setMargin()
 
@@ -612,10 +612,10 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
   {
     if (painted != paintBorder)
       {
-	paintBorder = painted;
-	firePropertyChange("borderPainted", ! paintBorder,
-	                   paintBorder);
-	repaint();
+        paintBorder = painted;
+        firePropertyChange("borderPainted", ! paintBorder,
+                           paintBorder);
+        repaint();
       }
   } // setBorderPainted()
 
@@ -639,8 +639,8 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
   {
     if (floatable != this.floatable)
       {
-	this.floatable = floatable;
-	firePropertyChange("floatable", ! floatable, floatable);
+        this.floatable = floatable;
+        firePropertyChange("floatable", ! floatable, floatable);
       }
   } // setFloatable()
 
@@ -681,11 +681,11 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
                                          + " is not a legal orientation");
     if (orientation != this.orientation)
       {
-	int oldOrientation = this.orientation;
-	this.orientation = orientation;
-	firePropertyChange("orientation", oldOrientation, this.orientation);
-	revalidate();
-	repaint();
+        int oldOrientation = this.orientation;
+        this.orientation = orientation;
+        firePropertyChange("orientation", oldOrientation, this.orientation);
+        revalidate();
+        repaint();
       }
   } // setOrientation()
 
@@ -760,7 +760,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
 
   /**
    * Returns a string describing the attributes for the JToolBar
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
diff --git a/libjava/classpath/javax/swing/JToolTip.java b/libjava/classpath/javax/swing/JToolTip.java
index f59ec95fba4..6f226e780ed 100644
--- a/libjava/classpath/javax/swing/JToolTip.java
+++ b/libjava/classpath/javax/swing/JToolTip.java
@@ -117,7 +117,7 @@ public class JToolTip extends JComponent implements Accessible
    * Returns the text displayed by the tool tip.
    *
    * @return The text (possibly null).
-   * 
+   *
    * @see #setTipText(String)
    */
   public String getTipText()
@@ -142,7 +142,7 @@ public class JToolTip extends JComponent implements Accessible
    * Returns the component that the tool tip is associated with.
    *
    * @return The component (possibly null).
-   * 
+   *
    * @see #setComponent(JComponent)
    */
   public JComponent getComponent()
@@ -173,7 +173,7 @@ public class JToolTip extends JComponent implements Accessible
 
   /**
    * Returns a string describing the attributes for the JToolTip
-   * component, for use in debugging.  The return value is guaranteed to be 
+   * component, for use in debugging.  The return value is guaranteed to be
    * non-null, but the format of the string may vary between
    * implementations.
    *
@@ -189,12 +189,12 @@ public class JToolTip extends JComponent implements Accessible
   }
 
   /**
-   * Sets the component that the tool tip is associated with and sends a 
-   * {@link PropertyChangeEvent} (with the property name 'component') to all 
+   * Sets the component that the tool tip is associated with and sends a
+   * {@link PropertyChangeEvent} (with the property name 'component') to all
    * registered listeners.
    *
    * @param c  the component (null permitted).
-   * 
+   *
    * @see #getComponent()
    */
   public void setComponent(JComponent c)
@@ -205,12 +205,12 @@ public class JToolTip extends JComponent implements Accessible
   }
 
   /**
-   * Sets the text to be displayed by the tool tip and sends a 
-   * {@link PropertyChangeEvent} (with the property name 'tiptext') to all 
+   * Sets the text to be displayed by the tool tip and sends a
+   * {@link PropertyChangeEvent} (with the property name 'tiptext') to all
    * registered listeners.
    *
    * @param tipText the text (null permitted).
-   * 
+   *
    * @see #getTipText()
    */
   public void setTipText(String tipText)
diff --git a/libjava/classpath/javax/swing/JTree.java b/libjava/classpath/javax/swing/JTree.java
index c0365bc385b..d89adad5eb2 100644
--- a/libjava/classpath/javax/swing/JTree.java
+++ b/libjava/classpath/javax/swing/JTree.java
@@ -1,6 +1,6 @@
-/* JTree.java 
+/* JTree.java
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
- 
+
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -87,24 +87,24 @@ public class JTree extends JComponent implements Scrollable, Accessible
 {
 
   /**
-   * This class implements accessibility support for the JTree class. It 
-   * provides an implementation of the Java Accessibility API appropriate 
+   * This class implements accessibility support for the JTree class. It
+   * provides an implementation of the Java Accessibility API appropriate
    * to tree user-interface elements.
    */
   protected class AccessibleJTree extends JComponent.AccessibleJComponent
       implements AccessibleSelection, TreeSelectionListener, TreeModelListener,
       TreeExpansionListener
   {
-    
+
     /**
-     * This class implements accessibility support for the JTree child. It provides 
+     * This class implements accessibility support for the JTree child. It provides
      * an implementation of the Java Accessibility API appropriate to tree nodes.
      */
-    protected class AccessibleJTreeNode extends AccessibleContext 
-       implements Accessible, AccessibleComponent, AccessibleSelection, 
+    protected class AccessibleJTreeNode extends AccessibleContext
+       implements Accessible, AccessibleComponent, AccessibleSelection,
        AccessibleAction
     {
-      
+
       private JTree tree;
       private TreePath tp;
       private Accessible acc;
@@ -113,10 +113,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
       private Vector actionList;
       private TreeModel mod;
       private Cursor cursor;
-      
+
       /**
        * Constructs an AccessibleJTreeNode
-       * 
+       *
        * @param t - the current tree
        * @param p - the current path to be dealt with
        * @param ap - the accessible object to use
@@ -128,11 +128,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
         actionList = new Vector();
         mod = tree.getModel();
         cursor = JTree.this.getCursor();
-                
+
         tree = t;
         tp = p;
         acc = ap;
-        
+
         // Add all the children of this path that may already be
         // selected to the selection list.
         TreePath[] selected = tree.getSelectionPaths();
@@ -142,20 +142,20 @@ public class JTree extends JComponent implements Scrollable, Accessible
             if ((sel.getParentPath()).equals(tp))
               selectionList.add(sel);
           }
-        
-        // Add all the actions available for a node to 
+
+        // Add all the actions available for a node to
         // the action list.
         actionList.add("EXPAND");
         actionList.add("COLLAPSE");
         actionList.add("EDIT");
         actionList.add("SELECT");
         actionList.add("DESELECT");
-      }      
-      
+      }
+
       /**
        * Adds the specified selected item in the object to the object's
        * selection.
-       * 
+       *
        * @param i - the i-th child of this node.
        */
       public void addAccessibleSelection(int i)
@@ -167,47 +167,47 @@ public class JTree extends JComponent implements Scrollable, Accessible
               {
                 if (!states.contains(AccessibleState.MULTISELECTABLE))
                   clearAccessibleSelection();
-                selectionList.add(child);                  
+                selectionList.add(child);
                 tree.addSelectionPath(tp.pathByAddingChild(child));
               }
           }
       }
-      
+
       /**
-       * Adds the specified focus listener to receive focus events 
+       * Adds the specified focus listener to receive focus events
        * from this component.
-       * 
+       *
        * @param l - the new focus listener
        */
       public void addFocusListener(FocusListener l)
       {
         tree.addFocusListener(l);
       }
-      
+
       /**
        * Add a PropertyChangeListener to the listener list.
-       * 
+       *
        * @param l - the new property change listener
        */
       public void addPropertyChangeListener(PropertyChangeListener l)
       {
         // Nothing to do here.
       }
-      
+
       /**
-       * Clears the selection in the object, so that nothing in the 
+       * Clears the selection in the object, so that nothing in the
        * object is selected.
        */
       public void clearAccessibleSelection()
       {
         selectionList.clear();
       }
-      
+
       /**
-       * Checks whether the specified point is within this object's 
-       * bounds, where the point's x and y coordinates are defined to be 
-       * relative to the coordinate system of the object. 
-       * 
+       * Checks whether the specified point is within this object's
+       * bounds, where the point's x and y coordinates are defined to be
+       * relative to the coordinate system of the object.
+       *
        * @param p - the point to check
        * @return true if p is in the bounds
        */
@@ -215,10 +215,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         return getBounds().contains(p);
       }
-      
+
       /**
        * Perform the specified Action on the tree node.
-       * 
+       *
        * @param i - the i-th action to perform
        * @return true if the the action was performed; else false.
        */
@@ -226,7 +226,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         if (i >= actionList.size() || i < 0)
           return false;
-        
+
         if (actionList.get(i).equals("EXPAND"))
           tree.expandPath(tp);
         else if (actionList.get(i).equals("COLLAPSE"))
@@ -241,30 +241,30 @@ public class JTree extends JComponent implements Scrollable, Accessible
           return false;
         return true;
       }
-      
+
       /**
        * Get the AccessibleAction associated with this object.
-       * 
+       *
        * @return the action
        */
       public AccessibleAction getAccessibleAction()
       {
         return this;
       }
-      
+
       /**
        * Returns the number of accessible actions available in this tree node.
-       * 
+       *
        * @return the number of actions
        */
       public int getAccessibleActionCount()
       {
         return actionList.size();
       }
-      
+
       /**
        * Return a description of the specified action of the tree node.
-       * 
+       *
        * @param i - the i-th action's description
        * @return a description of the action
        */
@@ -274,11 +274,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
           return (actionList.get(i)).toString();
         return super.getAccessibleDescription();
       }
-      
+
       /**
-       * Returns the Accessible child, if one exists, contained at the 
+       * Returns the Accessible child, if one exists, contained at the
        * local coordinate Point.
-       * 
+       *
        * @param p - the point of the accessible
        * @return the accessible at point p if it exists
        */
@@ -289,10 +289,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
           return new AccessibleJTreeNode(tree, acc, this);
         return null;
       }
-      
+
       /**
        * Return the specified Accessible child of the object.
-       * 
+       *
        * @param i - the i-th child of the current path
        * @return the child if it exists
        */
@@ -307,10 +307,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
           }
         return null;
       }
-      
+
       /**
        * Returns the number of accessible children in the object.
-       * 
+       *
        * @return the number of children the current node has
        */
       public int getAccessibleChildrenCount()
@@ -320,40 +320,40 @@ public class JTree extends JComponent implements Scrollable, Accessible
           return mod.getChildCount(tp.getLastPathComponent());
         return 0;
       }
-      
+
       /**
        * Get the AccessibleComponent associated with this object.
-       * 
+       *
        * @return the accessible component if it is supported.
        */
       public AccessibleComponent getAccessibleComponent()
       {
         return this;
       }
-      
+
       /**
        * Get the AccessibleContext associated with this tree node.
-       * 
+       *
        * @return an instance of this class
        */
       public AccessibleContext getAccessibleContext()
       {
         return this;
       }
-      
+
       /**
        * Get the accessible description of this object.
-       * 
+       *
        * @return the accessible description
        */
       public String getAccessibleDescription()
       {
         return super.getAccessibleDescription();
       }
-      
+
       /**
        * Get the index of this object in its accessible parent.
-       * 
+       *
        * @return the index of this in the parent.
        */
       public int getAccessibleIndexInParent()
@@ -367,74 +367,74 @@ public class JTree extends JComponent implements Scrollable, Accessible
             }
         return -1;
       }
-      
+
       /**
        * Get the accessible name of this object.
-       * 
+       *
        * @return the accessible name
        */
       public String getAccessibleName()
       {
         return super.getAccessibleName();
       }
-      
+
       /**
        * Get the Accessible parent of this object.
-       * 
+       *
        * @return the accessible parent if it exists.
        */
       public Accessible getAccessibleParent()
       {
         return super.getAccessibleParent();
       }
-      
+
       /**
        * Get the role of this object.
-       * 
+       *
        * @return the accessible role
        */
       public AccessibleRole getAccessibleRole()
       {
         return AccessibleJTree.this.getAccessibleRole();
       }
-      
+
       /**
        * Get the AccessibleSelection associated with this object if one exists.
-       * 
+       *
        * @return the accessible selection for this.
        */
       public AccessibleSelection getAccessibleSelection()
       {
         return this;
       }
-      
+
       /**
-       * Returns an Accessible representing the specified selected item 
+       * Returns an Accessible representing the specified selected item
        * in the object.
-       * 
+       *
        * @return the accessible representing a certain selected item.
        */
       public Accessible getAccessibleSelection(int i)
       {
         if (i > 0 && i < getAccessibleSelectionCount())
-            return new AccessibleJTreeNode(tree, 
+            return new AccessibleJTreeNode(tree,
                   tp.pathByAddingChild(selectionList.get(i)), acc);
         return null;
       }
-      
+
       /**
        * Returns the number of items currently selected.
-       * 
+       *
        * @return the number of items selected.
        */
       public int getAccessibleSelectionCount()
       {
         return selectionList.size();
       }
-      
+
       /**
        * Get the state set of this object.
-       * 
+       *
        * @return the state set for this object
        */
       public AccessibleStateSet getAccessibleStateSet()
@@ -445,7 +445,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
           states.add(AccessibleState.COLLAPSED);
         if (tree.isEditable())
           states.add(AccessibleState.EDITABLE);
-        if (mod != null && 
+        if (mod != null &&
             !mod.isLeaf(tp.getLastPathComponent()))
           states.add(AccessibleState.EXPANDABLE);
         if (tree.isExpanded(tp))
@@ -454,7 +454,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
           states.add(AccessibleState.FOCUSABLE);
         if (hasFocus())
           states.add(AccessibleState.FOCUSED);
-        if (tree.getSelectionModel().getSelectionMode() != 
+        if (tree.getSelectionModel().getSelectionMode() !=
           TreeSelectionModel.SINGLE_TREE_SELECTION)
           states.add(AccessibleState.MULTISELECTABLE);
         if (tree.isOpaque())
@@ -467,70 +467,70 @@ public class JTree extends JComponent implements Scrollable, Accessible
         states.add(AccessibleState.SELECTABLE);
         return states;
       }
-      
+
       /**
        * Get the AccessibleText associated with this object if one exists.
-       * 
+       *
        * @return the accessible text
        */
       public AccessibleText getAccessibleText()
       {
         return super.getAccessibleText();
       }
-      
+
       /**
        * Get the AccessibleValue associated with this object if one exists.
-       * 
+       *
        * @return the accessible value if it exists
        */
       public AccessibleValue getAccessibleValue()
       {
         return super.getAccessibleValue();
       }
-      
+
       /**
        * Get the background color of this object.
-       * 
+       *
        * @return the color of the background.
        */
       public Color getBackground()
       {
         return tree.getBackground();
       }
-      
+
       /**
        * Gets the bounds of this object in the form of a Rectangle object.
-       * 
+       *
        * @return the bounds of the current node.
        */
       public Rectangle getBounds()
       {
         return tree.getPathBounds(tp);
       }
-      
+
       /**
        * Gets the Cursor of this object.
-       * 
+       *
        * @return the cursor for the current node
        */
       public Cursor getCursor()
       {
         return cursor;
       }
-      
+
       /**
        * Gets the Font of this object.
-       * 
+       *
        * @return the font for the current node
        */
       public Font getFont()
       {
         return tree.getFont();
       }
-      
+
       /**
        * Gets the FontMetrics of this object.
-       * 
+       *
        * @param f - the current font.
        * @return the font metrics for the given font.
        */
@@ -538,42 +538,42 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         return tree.getFontMetrics(f);
       }
-      
+
       /**
        * Get the foreground color of this object.
-       * 
+       *
        * @return the foreground for this object.
        */
       public Color getForeground()
       {
         return tree.getForeground();
       }
-      
+
       /**
        * Gets the locale of the component.
-       * 
+       *
        * @return the locale of the component.
        */
       public Locale getLocale()
       {
         return tree.getLocale();
       }
-      
+
       /**
-       * Gets the location of the object relative to the 
-       * parent in the form of a point specifying the object's 
-       * top-left corner in the screen's coordinate space. 
-       * 
+       * Gets the location of the object relative to the
+       * parent in the form of a point specifying the object's
+       * top-left corner in the screen's coordinate space.
+       *
        * @return the location of the current node.
        */
       public Point getLocation()
       {
         return getLocationInJTree();
       }
-      
+
       /**
        * Returns the location in the tree.
-       * 
+       *
        * @return the location in the JTree.
        */
       protected Point getLocationInJTree()
@@ -581,10 +581,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
         Rectangle bounds = tree.getPathBounds(tp);
         return new Point(bounds.x, bounds.y);
       }
-      
+
       /**
        * Returns the location of the object on the screen.
-       * 
+       *
        * @return the location of the object on the screen.
        */
       public Point getLocationOnScreen()
@@ -593,10 +593,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
         SwingUtilities.convertPointToScreen(loc, tree);
         return loc;
       }
-      
+
       /**
        * Returns the size of this object in the form of a Dimension object.
-       * 
+       *
        * @return the size of the object
        */
       public Dimension getSize()
@@ -604,10 +604,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
         Rectangle b = getBounds();
         return b.getSize();
       }
-      
+
       /**
        * Returns true if the current child of this object is selected.
-       * 
+       *
        * @param i - the child of the current node
        * @return true if the child is selected.
        */
@@ -618,30 +618,30 @@ public class JTree extends JComponent implements Scrollable, Accessible
           return tree.isPathSelected(tp.pathByAddingChild(child));
         return false;
       }
-      
+
       /**
        * Determines if the object is enabled.
-       * 
+       *
        * @return true if the tree is enabled
        */
       public boolean isEnabled()
       {
         return tree.isEnabled();
       }
-      
+
       /**
        * Returns whether this object can accept focus or not.
-       * 
+       *
        * @return true, it is always focus traversable
        */
       public boolean isFocusTraversable()
       {
         return true;
       }
-      
+
       /**
        * Determines if the object is showing.
-       * 
+       *
        * @return true if the object is visible and the
        * parent is visible.
        */
@@ -649,21 +649,21 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         return isVisible() && tree.isShowing();
       }
-      
+
       /**
        * Determines if the object is visible.
-       * 
+       *
        * @return true if the object is visible.
        */
       public boolean isVisible()
       {
         return tree.isVisible(tp);
       }
-      
+
       /**
        * Removes the specified selected item in the object from the
        * object's selection.
-       * 
+       *
        * @param i - the specified item to remove
        */
       public void removeAccessibleSelection(int i)
@@ -677,34 +677,34 @@ public class JTree extends JComponent implements Scrollable, Accessible
                   clearAccessibleSelection();
                 if (selectionList.contains(child))
                   {
-                    selectionList.remove(child);                  
+                    selectionList.remove(child);
                     tree.removeSelectionPath(tp.pathByAddingChild(child));
                   }
               }
           }
       }
-      
+
       /**
-       * Removes the specified focus listener so it no longer receives focus 
+       * Removes the specified focus listener so it no longer receives focus
        * events from this component.
-       * 
+       *
        * @param l - the focus listener to remove
        */
       public void removeFocusListener(FocusListener l)
       {
         tree.removeFocusListener(l);
       }
-      
+
       /**
        * Remove a PropertyChangeListener from the listener list.
-       * 
+       *
        * @param l - the property change listener to remove.
        */
       public void removePropertyChangeListener(PropertyChangeListener l)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Requests focus for this object.
        */
@@ -712,9 +712,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         tree.requestFocus();
       }
-      
+
       /**
-       * Causes every selected item in the object to be selected if the object 
+       * Causes every selected item in the object to be selected if the object
        * supports multiple selections.
        */
       public void selectAllAccessibleSelection()
@@ -738,110 +738,110 @@ public class JTree extends JComponent implements Scrollable, Accessible
               }
           }
       }
-      
+
       /**
        * Set the accessible description of this object.
-       * 
+       *
        * @param s - the string to set the accessible description to.
        */
       public void setAccessibleDescription(String s)
       {
         super.setAccessibleDescription(s);
       }
-      
+
       /**
        * Set the localized accessible name of this object.
-       * 
+       *
        * @param s - the string to set the accessible name to.
        */
       public void setAccessibleName(String s)
       {
         super.setAccessibleName(s);
       }
-      
+
       /**
        * Set the background color of this object.
-       * 
+       *
        * @param c - the color to set the background to.
        */
       public void setBackground(Color c)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Sets the bounds of this object in the form of a Rectangle object.
-       * 
+       *
        * @param r - the bounds to set the object o
        */
       public void setBounds(Rectangle r)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Sets the Cursor of this object.
-       * 
+       *
        * @param c - the new cursor
        */
       public void setCursor(Cursor c)
       {
         cursor = c;
       }
-      
+
       /**
        * Sets the enabled state of the object.
-       * 
+       *
        * @param b - boolean to enable or disable object
        */
       public void setEnabled(boolean b)
       {
          // Nothing to do here.
       }
-      
+
       /**
        * Sets the Font of this object.
-       * 
+       *
        * @param f - the new font.
        */
       public void setFont(Font f)
       {
          // Nothing to do here.
       }
-      
+
       /**
        * Sets the foreground color of this object.
-       * 
+       *
        * @param c - the new foreground color.
        */
       public void setForeground(Color c)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Sets the location of the object relative to the parent.
-       * 
+       *
        * @param p - the new location for the object.
        */
       public void setLocation(Point p)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Resizes this object so that it has width and height.
-       * 
+       *
        * @param d - the new size for the object.
        */
       public void setSize(Dimension d)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Sets the visible state of the object.
-       * 
+       *
        * @param b - sets the objects visibility.
        */
       public void setVisible(boolean b)
@@ -849,7 +849,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
         // Nothing to do here.
       }
     }
-    
+
     /**
      * Constructor
      */
@@ -857,17 +857,17 @@ public class JTree extends JComponent implements Scrollable, Accessible
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Adds the specified selected item in the object to the object's selection.
-     * 
+     *
      * @param i - the row to add to the tree's selection
      */
     public void addAccessibleSelection(int i)
     {
       addSelectionInterval(i, i);
     }
-    
+
     /**
      * Clears the selection in the object, so that nothing in the object is selected.
      */
@@ -875,7 +875,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
     {
       clearSelection();
     }
-    
+
     /**
      * Fire a visible data property change notification.
      */
@@ -883,11 +883,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
     {
       treeDidChange();
     }
-    
+
     /**
-     * Returns the Accessible child, if one exists, contained at the local 
+     * Returns the Accessible child, if one exists, contained at the local
      * coordinate Point.
-     * 
+     *
      * @param p - the point of the accessible to get.
      * @return the accessible at point p.
      */
@@ -898,10 +898,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
         return new AccessibleJTreeNode(JTree.this, tp, null);
       return null;
     }
-    
+
     /**
      * Return the nth Accessible child of the object.
-     * 
+     *
      * @param i - the accessible child to get
      * @return the i-th child
      */
@@ -909,10 +909,10 @@ public class JTree extends JComponent implements Scrollable, Accessible
     {
       return null;
     }
-    
+
     /**
      * Returns the number of top-level children nodes of this JTree.
-     * 
+     *
      * @return the number of top-level children
      */
     public int getAccessibleChildrenCount()
@@ -922,68 +922,68 @@ public class JTree extends JComponent implements Scrollable, Accessible
         return model.getChildCount(model.getRoot());
       return 0;
     }
-    
+
     /**
      * Get the index of this object in its accessible parent.
-     * 
+     *
      * @return the index of this object.
      */
     public int getAccessibleIndexInParent()
     {
       return 0;
     }
-    
+
     /**
      * Get the role of this object.
-     * 
+     *
      * @return the role of this object
      */
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.TREE;
     }
-    
+
     /**
      * Get the AccessibleSelection associated with this object.
-     * 
+     *
      * @return the accessible selection of the tree
      */
     public AccessibleSelection getAccessibleSelection()
     {
       TreeModel mod = getModel();
       if (mod != null)
-        return (new AccessibleJTreeNode(JTree.this, 
+        return (new AccessibleJTreeNode(JTree.this,
                   new TreePath(mod.getRoot()), null)).getAccessibleSelection();
       return null;
     }
-    
+
     /**
      * Returns an Accessible representing the specified selected item in the object.
-     * 
+     *
      * @return the i-th accessible in the selection
      */
     public Accessible getAccessibleSelection(int i)
     {
       TreeModel mod = getModel();
       if (mod != null)
-        return (new AccessibleJTreeNode(JTree.this, 
+        return (new AccessibleJTreeNode(JTree.this,
                   new TreePath(mod.getRoot()), null)).getAccessibleSelection(i);
       return null;
     }
-    
+
     /**
      * Returns the number of items currently selected.
-     * 
+     *
      * @return the number of selected accessibles.
      */
     public int getAccessibleSelectionCount()
     {
       return getSelectionCount();
     }
-    
+
     /**
      * Returns true if the current child of this object is selected.
-     * 
+     *
      * @param i - the child of this object
      * @return true if the i-th child is selected.
      */
@@ -992,92 +992,92 @@ public class JTree extends JComponent implements Scrollable, Accessible
       // Nothing to do here.
       return false;
     }
-    
+
     /**
      * Removes the specified selected item in the object from the object's
      * selection.
-     * 
+     *
      * @param i - the i-th selected item to remove
      */
     public void removeAccessibleSelection(int i)
     {
       removeSelectionInterval(i, i);
     }
-    
+
     /**
      * Causes every selected item in the object to be selected if the object
      * supports multiple selections.
      */
     public void selectAllAccessibleSelection()
     {
-      if (getSelectionModel().getSelectionMode() != 
+      if (getSelectionModel().getSelectionMode() !=
         TreeSelectionModel.SINGLE_TREE_SELECTION)
       addSelectionInterval(0, getVisibleRowCount());
     }
-    
+
     /**
      * Tree Collapsed notification
-     * 
+     *
      * @param e - the event
      */
     public void treeCollapsed(TreeExpansionEvent e)
     {
       fireTreeCollapsed(e.getPath());
     }
-   
+
     /**
      * Tree Model Expansion notification.
-     * 
+     *
      * @param e - the event
      */
     public void treeExpanded(TreeExpansionEvent e)
     {
       fireTreeExpanded(e.getPath());
     }
-    
+
     /**
      * Tree Model Node change notification.
-     * 
+     *
      * @param e - the event
      */
     public void treeNodesChanged(TreeModelEvent e)
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Tree Model Node change notification.
-     * 
+     *
      * @param e - the event
      */
     public void treeNodesInserted(TreeModelEvent e)
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Tree Model Node change notification.
-     * 
+     *
      * @param e - the event
      */
     public void treeNodesRemoved(TreeModelEvent e)
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Tree Model structure change change notification.
-     * 
+     *
      * @param e - the event
      */
     public void treeStructureChanged(TreeModelEvent e)
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Tree Selection Listener value change method.
-     * 
+     *
      * @param e - the event
      */
     public void valueChanged(TreeSelectionEvent e)
@@ -1085,7 +1085,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
       fireValueChanged(e);
     }
   }
-  
+
   public static class DynamicUtilTreeNode extends DefaultMutableTreeNode
   {
     protected Object childValue;
@@ -1129,9 +1129,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
     /**
      * Returns the child node at position pos. Subclassed
      * here to load the children if necessary.
-     * 
+     *
      * @param pos the position of the child node to fetch
-     * 
+     *
      * @return the childnode at the specified position
      */
     public TreeNode getChildAt(int pos)
@@ -1143,7 +1143,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
     public boolean isLeaf()
     {
       return childValue == null || !(childValue instanceof Hashtable
-          || childValue instanceof Vector 
+          || childValue instanceof Vector
           || childValue.getClass().isArray());
     }
 
@@ -1180,7 +1180,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   }
 
   /**
-   * Listens to the model of the JTree and updates the property 
+   * Listens to the model of the JTree and updates the property
    * expandedState if nodes are removed or changed.
    */
   protected class TreeModelHandler implements TreeModelListener
@@ -1199,9 +1199,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
      * that a node has changed its location or changed it's children. It
      * only means that some attributes of the node have changed that might
      * affect its presentation.
-     * 
+     *
      * This method is called after the actual change occured.
-     * 
+     *
      * @param ev the TreeModelEvent describing the change
      */
     public void treeNodesChanged(TreeModelEvent ev)
@@ -1211,9 +1211,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * Notifies when a node is inserted into the tree.
-     * 
+     *
      * This method is called after the actual change occured.
-     * 
+     *
      * @param ev the TreeModelEvent describing the change
      */
     public void treeNodesInserted(TreeModelEvent ev)
@@ -1223,11 +1223,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * Notifies when a node is removed from the tree.
-     * 
+     *
      * This method is called after the actual change occured.
      *
      * @param ev the TreeModelEvent describing the change
-	 */
+         */
     public void treeNodesRemoved(TreeModelEvent ev)
     {
       if (ev != null)
@@ -1260,9 +1260,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * Notifies when the structure of the tree is changed.
-     * 
+     *
      * This method is called after the actual change occured.
-     * 
+     *
      * @param ev the TreeModelEvent describing the change
      */
     public void treeStructureChanged(TreeModelEvent ev)
@@ -1324,12 +1324,12 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * Notifies when the tree selection changes.
-     * 
+     *
      * @param ev the TreeSelectionEvent that describes the change
      */
     public void valueChanged(TreeSelectionEvent ev)
     {
-      TreeSelectionEvent rewritten = 
+      TreeSelectionEvent rewritten =
         (TreeSelectionEvent) ev.cloneWithSource(JTree.this);
       fireValueChanged(rewritten);
     }
@@ -1359,7 +1359,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * Returns the shared instance of EmptySelectionModel.
-     * 
+     *
      * @return the shared instance of EmptySelectionModel
      */
     public static EmptySelectionModel sharedInstance()
@@ -1369,7 +1369,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * This catches attempts to set a selection and sets nothing instead.
-     * 
+     *
      * @param paths not used here
      */
     public void setSelectionPaths(TreePath[] paths)
@@ -1379,7 +1379,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * This catches attempts to add something to the selection.
-     * 
+     *
      * @param paths not used here
      */
     public void addSelectionPaths(TreePath[] paths)
@@ -1389,7 +1389,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     /**
      * This catches attempts to remove something from the selection.
-     * 
+     *
      * @param paths not used here
      */
     public void removeSelectionPaths(TreePath[] paths)
@@ -1431,7 +1431,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   public static final String ANCHOR_SELECTION_PATH_PROPERTY =
     "anchorSelectionPath";
 
-	/** @since 1.3 */
+        /** @since 1.3 */
   public static final String LEAD_SELECTION_PATH_PROPERTY = "leadSelectionPath";
 
   /** @since 1.3 */
@@ -1531,7 +1531,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param value the initial nodes in the tree
    */
   public JTree(Hashtable value)
@@ -1541,7 +1541,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param value the initial nodes in the tree
    */
   public JTree(Object[] value)
@@ -1551,14 +1551,14 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param model the model to use
    */
   public JTree(TreeModel model)
   {
     setRootVisible(true);
     setSelectionModel( new DefaultTreeSelectionModel() );
-    
+
     // The root node appears expanded by default.
     nodeStates = new Hashtable();
 
@@ -1575,7 +1575,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param root the root node
    */
   public JTree(TreeNode root)
@@ -1585,7 +1585,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param root the root node
    * @param asksAllowChildren if false, all nodes without children are leaf
    *        nodes. If true, only nodes that do not allow children are leaf
@@ -1598,7 +1598,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new JTree object.
-   * 
+   *
    * @param value the initial nodes in the tree
    */
   public JTree(Vector value)
@@ -1621,13 +1621,13 @@ public class JTree extends JComponent implements Scrollable, Accessible
     TreeUI ui = getUI();
     return ui != null ? ui.getPathForRow(this, row) : null;
   }
-  
+
   /**
    * Get the pathes that are displayes between the two given rows.
-   * 
+   *
    * @param index0 the starting row, inclusive
    * @param index1 the ending row, inclusive
-   * 
+   *
    * @return the array of the tree pathes
    */
   protected TreePath[] getPathBetweenRows(int index0, int index1)
@@ -1649,7 +1649,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates a new TreeModel object.
-   * 
+   *
    * @param value the values stored in the model
    */
   protected static TreeModel createTreeModel(Object value)
@@ -1659,7 +1659,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Return the UI associated with this JTree object.
-   * 
+   *
    * @return the associated TreeUI object
    */
   public TreeUI getUI()
@@ -1669,7 +1669,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Sets the UI associated with this JTree object.
-   * 
+   *
    * @param ui the TreeUI to associate
    */
   public void setUI(TreeUI ui)
@@ -1687,7 +1687,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * This method returns the String ID of the UI class of Separator.
-   * 
+   *
    * @return The UI class' String ID.
    */
   public String getUIClassID()
@@ -1698,7 +1698,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   /**
    * Gets the AccessibleContext associated with this
    * JTree.
-   * 
+   *
    * @return the associated context
    */
   public AccessibleContext getAccessibleContext()
@@ -1708,19 +1708,19 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Returns the preferred viewport size.
-   * 
+   *
    * @return the preferred size
    */
   public Dimension getPreferredScrollableViewportSize()
   {
     return getPreferredSize();
   }
-  
+
   /**
    * Return the preferred scrolling amount (in pixels) for the given scrolling
    * direction and orientation. This method handles a partially exposed row by
    * returning the distance required to completely expose the item.
-   * 
+   *
    * @param visibleRect the currently visible part of the component.
    * @param orientation the scrolling orientation
    * @param direction the scrolling direction (negative - up, positive -down).
@@ -1796,7 +1796,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Adds a TreeExpansionListener object to the tree.
-   * 
+   *
    * @param listener the listener to add
    */
   public void addTreeExpansionListener(TreeExpansionListener listener)
@@ -1806,7 +1806,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Removes a TreeExpansionListener object from the tree.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeTreeExpansionListener(TreeExpansionListener listener)
@@ -1816,7 +1816,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Returns all added TreeExpansionListener objects.
-   * 
+   *
    * @return an array of listeners
    */
   public TreeExpansionListener[] getTreeExpansionListeners()
@@ -1826,7 +1826,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Notifies all listeners that the tree was collapsed.
-   * 
+   *
    * @param path the path to the node that was collapsed
    */
   public void fireTreeCollapsed(TreePath path)
@@ -1840,7 +1840,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Notifies all listeners that the tree was expanded.
-   * 
+   *
    * @param path the path to the node that was expanded
    */
   public void fireTreeExpanded(TreePath path)
@@ -1854,7 +1854,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Adds a TreeSelctionListener object to the tree.
-   * 
+   *
    * @param listener the listener to add
    */
   public void addTreeSelectionListener(TreeSelectionListener listener)
@@ -1864,7 +1864,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Removes a TreeSelectionListener object from the tree.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeTreeSelectionListener(TreeSelectionListener listener)
@@ -1874,18 +1874,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Returns all added TreeSelectionListener objects.
-   * 
+   *
    * @return an array of listeners
    */
   public TreeSelectionListener[] getTreeSelectionListeners()
   {
-    return (TreeSelectionListener[]) 
+    return (TreeSelectionListener[])
     getListeners(TreeSelectionListener.class);
   }
 
   /**
    * Notifies all listeners when the selection of the tree changed.
-   * 
+   *
    * @param event the event to send
    */
   protected void fireValueChanged(TreeSelectionEvent event)
@@ -1898,7 +1898,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Adds a TreeWillExpandListener object to the tree.
-   * 
+   *
    * @param listener the listener to add
    */
   public void addTreeWillExpandListener(TreeWillExpandListener listener)
@@ -1908,7 +1908,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Removes a TreeWillExpandListener object from the tree.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeTreeWillExpandListener(TreeWillExpandListener listener)
@@ -1918,18 +1918,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Returns all added TreeWillExpandListener objects.
-   * 
+   *
    * @return an array of listeners
    */
   public TreeWillExpandListener[] getTreeWillExpandListeners()
   {
-    return (TreeWillExpandListener[]) 
+    return (TreeWillExpandListener[])
     getListeners(TreeWillExpandListener.class);
   }
 
   /**
    * Notifies all listeners that the tree will collapse.
-   * 
+   *
    * @param path the path to the node that will collapse
    */
   public void fireTreeWillCollapse(TreePath path) throws ExpandVetoException
@@ -1943,7 +1943,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Notifies all listeners that the tree will expand.
-   * 
+   *
    * @param path the path to the node that will expand
    */
   public void fireTreeWillExpand(TreePath path) throws ExpandVetoException
@@ -1957,7 +1957,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Returns the model of this JTree object.
-   * 
+   *
    * @return the associated TreeModel
    */
   public TreeModel getModel()
@@ -1967,7 +1967,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Sets the model to use in JTree.
-   * 
+   *
    * @param model the TreeModel to use
    */
   public void setModel(TreeModel model)
@@ -2007,7 +2007,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Checks if this JTree object is editable.
-   * 
+   *
    * @return true if this tree object is editable,
    *         false otherwise
    */
@@ -2018,7 +2018,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Sets the editable property.
-   * 
+   *
    * @param flag true to make this tree object editable,
    *        false otherwise
    */
@@ -2034,7 +2034,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Checks if the root element is visible.
-   * 
+   *
    * @return true if the root element is visible,
    *         false otherwise
    */
@@ -2056,11 +2056,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
         TreePath rootPath = getPathForRow(0);
         model.removeSelectionPath(rootPath);
       }
-    
+
     boolean oldValue = rootVisible;
     rootVisible = flag;
     firePropertyChange(ROOT_VISIBLE_PROPERTY, oldValue, flag);
-    
+
   }
 
   public boolean getShowsRootHandles()
@@ -2074,7 +2074,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     if (showsRootHandles == flag)
       return;
-    
+
     boolean oldValue = showsRootHandles;
     showsRootHandles = flag;
     firePropertyChange(SHOWS_ROOT_HANDLES_PROPERTY, oldValue, flag);
@@ -2200,7 +2200,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     boolean oldValue = invokesStopCellEditing;
     invokesStopCellEditing = invoke;
-    firePropertyChange(INVOKES_STOP_CELL_EDITING_PROPERTY, 
+    firePropertyChange(INVOKES_STOP_CELL_EDITING_PROPERTY,
                        oldValue, invoke);
   }
 
@@ -2265,11 +2265,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
     clearSelectionPathStates();
     selectionModel.setSelectionPaths(paths);
   }
-  
+
   /**
    * This method, and all calls to it, should be removed once the
    * DefaultTreeModel fires events properly.  Maintenance of the nodeStates
-   * table should really be done in the TreeModelHandler.  
+   * table should really be done in the TreeModelHandler.
    */
   private void clearSelectionPathStates()
   {
@@ -2340,12 +2340,12 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
     addSelectionPaths(paths);
   }
-  
+
   /**
    * Select all rows between the two given indexes, inclusive. The method
    * will not select the inner leaves and braches of the currently collapsed
    * nodes in this interval.
-   * 
+   *
    * @param index0 the starting row, inclusive
    * @param index1 the ending row, inclusive
    */
@@ -2422,17 +2422,17 @@ public class JTree extends JComponent implements Scrollable, Accessible
         TreePath oldValue = selectionModel.getLeadSelectionPath();
         if (path == oldValue || path != null && path.equals(oldValue))
           return;
-       
+
         // Repaint the previous and current rows with the lead selection path.
         if (path != null)
           {
             repaint(getPathBounds(path));
             selectionModel.addSelectionPath(path);
           }
-        
+
         if (oldValue != null)
           repaint(getPathBounds(oldValue));
-        
+
         firePropertyChange(LEAD_SELECTION_PATH_PROPERTY, oldValue, path);
       }
   }
@@ -2520,9 +2520,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Return the value of the dragEnabled property.
-   * 
+   *
    * @return the value
-   * 
+   *
    * @since 1.4
    */
   public boolean getDragEnabled()
@@ -2532,9 +2532,9 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Set the dragEnabled property.
-   * 
+   *
    * @param enabled new value
-   * 
+   *
    * @since 1.4
    */
   public void setDragEnabled(boolean enabled)
@@ -2722,7 +2722,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   public void cancelEditing()
   {
     TreeUI ui = getUI();
-      
+
     if (isEditing())
       if (ui != null)
         ui.cancelEditing(this);
@@ -2803,11 +2803,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   private void doExpandParents(TreePath path, boolean state)
   {
-    TreePath parent = path.getParentPath();		
+    TreePath parent = path.getParentPath();
 
     if (!isExpanded(parent) && parent != null)
       doExpandParents(parent, false);
-    
+
     nodeStates.put(path, state ? EXPANDED : COLLAPSED);
   }
 
@@ -2868,7 +2868,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   {
     if (path == null)
       return;
-    
+
     expandPath(path.getParentPath());
   }
 
@@ -2879,7 +2879,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
 
   /**
    * Creates and returns an instance of {@link TreeModelHandler}.
-   * 
+   *
    * @return an instance of {@link TreeModelHandler}
    */
   protected TreeModelListener createTreeModelListener()
@@ -2890,7 +2890,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   /**
    * Returns a sample TreeModel that can be used in a JTree. This can be used
    * in Bean- or GUI-Builders to show something interesting.
-   * 
+   *
    * @return a sample TreeModel that can be used in a JTree
    */
   protected static TreeModel getDefaultTreeModel()
@@ -2930,11 +2930,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
   /**
    * Converts the specified value to a String. This is used by the renderers
    * of this JTree and its nodes.
-   * 
+   *
    * This implementation simply returns value.toString() and
    * ignores all other parameters. Subclass this method to control the
    * conversion.
-   * 
+   *
    * @param value the value that is converted to a String
    * @param selected indicates if that value is selected or not
    * @param expanded indicates if that value is expanded or not
@@ -2952,7 +2952,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * A String representation of this JTree. This is intended to be used for
    * debugging. The returned string may be empty but may not be
    * null.
-   * 
+   *
    * @return a String representation of this JTree
    */
   protected String paramString()
@@ -2968,7 +2968,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * and are exapanded at the moment of the execution of this method. If the
    * state of any node is beeing toggled while this method is executing this
    * change may be left unaccounted.
-   * 
+   *
    * @param path The parent of this request
    *
    * @return An Enumeration containing TreePath objects
@@ -2993,18 +2993,18 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * Returns the next table element (beginning from the row
    * startingRow that starts with prefix.
    * Searching is done in the direction specified by bias.
-   * 
+   *
    * @param prefix the prefix to search for in the cell values
    * @param startingRow the index of the row where to start searching from
    * @param bias the search direction, either {@link Position.Bias#Forward} or
    *        {@link Position.Bias#Backward}
-   * 
+   *
    * @return the path to the found element or -1 if no such element has been
    *         found
-   * 
+   *
    * @throws IllegalArgumentException if prefix is null or
    *         startingRow is not valid
-   * 
+   *
    * @since 1.4
    */
   public TreePath getNextMatch(String prefix, int startingRow,
@@ -3067,14 +3067,14 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * descendants of path. If includePath is set
    * to true and path itself is selected, then
    * it will be removed too.
-   * 
+   *
    * @param path the path from which selected descendants are to be removed
    * @param includeSelected if true then path itself
    *        will also be remove if it's selected
-   * 
+   *
    * @return true if something has been removed,
    *         false otherwise
-   * 
+   *
    * @since 1.3
    */
   protected boolean removeDescendantSelectedPaths(TreePath path,
@@ -3093,11 +3093,11 @@ public class JTree extends JComponent implements Scrollable, Accessible
       }
     return removedSomething;
   }
-  
+
   /**
-   * Removes any descendants of the TreePaths in toRemove that have been 
+   * Removes any descendants of the TreePaths in toRemove that have been
    * expanded.
-   * 
+   *
    * @param toRemove - Enumeration of TreePaths that need to be removed from
    * cache of toggled tree paths.
    */
@@ -3107,7 +3107,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
       {
         TreePath current = toRemove.nextElement();
         Enumeration descendants = getDescendantToggledPaths(current);
-        
+
         while (descendants.hasMoreElements())
           {
             TreePath currentDes = (TreePath) descendants.nextElement();
@@ -3130,7 +3130,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
    * {@link DefaultTreeModel#reload()} after adding or removing nodes. Following
    * the official Java 1.5 API standard, just calling treeDidChange, repaint()
    * or revalidate() does not update the tree appearance properly.
-   * 
+   *
    * @see DefaultTreeModel#reload()
    */
   public void treeDidChange()
@@ -3141,7 +3141,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
   /**
    * Helper method for
    * {@link LookAndFeel#installProperty(JComponent, String, Object)}.
-   * 
+   *
    * @param propertyName the name of the property
    * @param value the value of the property
    *
diff --git a/libjava/classpath/javax/swing/JViewport.java b/libjava/classpath/javax/swing/JViewport.java
index 023948032fb..729fac671eb 100644
--- a/libjava/classpath/javax/swing/JViewport.java
+++ b/libjava/classpath/javax/swing/JViewport.java
@@ -1,4 +1,4 @@
-/* JViewport.java -- 
+/* JViewport.java --
    Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -62,7 +62,7 @@ import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ViewportUI;
 
 /**
- *  
+ *
  * 
                        *                                                     _
  *   +-------------------------------+    ...........Y1 \
@@ -89,7 +89,7 @@ import javax.swing.plaf.ViewportUI;
  *        \/
  *        VX = X2-X1
  *
                      
- *  
+ *
  * 
                      A viewport is, like all swing components, located at some position in
  * the swing component tree; that location is exactly the same as any other
  * components: the viewport's "bounds".
                      
@@ -226,7 +226,7 @@ public class JViewport extends JComponent implements Accessible
 
   /**
    * Stores the bounds of the area that needs to be repainted. This is a cached
-   * Rectangle object used in blitting calculations. 
+   * Rectangle object used in blitting calculations.
    */
   Rectangle cachedBlitPaint;
 
@@ -308,14 +308,14 @@ public class JViewport extends JComponent implements Accessible
    */
   public Dimension getViewSize()
   {
-    Dimension size; 
+    Dimension size;
     Component view = getView();
     if (view != null)
       {
         if (isViewSizeSet)
           size = view.getSize();
         else
-	  size = view.getPreferredSize();
+          size = view.getPreferredSize();
       }
     else
       size = new Dimension(0, 0);
@@ -409,7 +409,7 @@ public class JViewport extends JComponent implements Accessible
   {
     if (getComponentCount() == 0)
       return null;
-  
+
     return getComponents()[0];
   }
 
@@ -458,7 +458,7 @@ public class JViewport extends JComponent implements Accessible
     insets.right = 0;
     return insets;
   }
-    
+
 
   /**
    * Overridden to return false, so the JViewport's paint method
@@ -482,7 +482,7 @@ public class JViewport extends JComponent implements Accessible
     Rectangle viewBounds = view.getBounds();
     Rectangle portBounds = getBounds();
 
-    if (viewBounds.width == 0 
+    if (viewBounds.width == 0
         || viewBounds.height == 0
         || portBounds.width == 0
         || portBounds.height == 0)
@@ -515,7 +515,7 @@ public class JViewport extends JComponent implements Accessible
     listenerList.remove(ChangeListener.class, listener);
   }
 
-  public ChangeListener[] getChangeListeners() 
+  public ChangeListener[] getChangeListeners()
   {
     return (ChangeListener[]) getListeners(ChangeListener.class);
   }
@@ -536,7 +536,7 @@ public class JViewport extends JComponent implements Accessible
   public void updateUI()
   {
     setUI((ViewportUI) UIManager.getUI(this));
-  }            
+  }
 
   /**
    * This method returns the viewport's UI delegate.
@@ -573,7 +573,7 @@ public class JViewport extends JComponent implements Accessible
   {
     Component view = getView();
     if (view == null)
-      return;    
+      return;
 
     Point pos = getViewPosition();
     // We get the contentRect in the viewport coordinates. But we want to
@@ -582,7 +582,7 @@ public class JViewport extends JComponent implements Accessible
     int contentY = contentRect.y + pos.y;
     Rectangle viewBounds = getView().getBounds();
     Rectangle portBounds = getBounds();
-    
+
     if (isShowing())
       getView().validate();
 
@@ -641,7 +641,7 @@ public class JViewport extends JComponent implements Accessible
   {
     if (getComponentCount() > 0)
       remove(getComponents()[0]);
-    
+
     super.addImpl(comp, constraints, index);
   }
 
@@ -796,7 +796,7 @@ public class JViewport extends JComponent implements Accessible
         g.translate(-pos.x, -pos.y);
         translated = true;
         view.paint(g);
-      } 
+      }
     finally
       {
         if (translated)
@@ -861,7 +861,7 @@ public class JViewport extends JComponent implements Accessible
             // clip must be updated in the buffer.
             if (dx == 0 && dy == 0)
               g2.setClip(g.getClip());
-            
+
             paintSimple(g2);
           }
         g2.dispose();
diff --git a/libjava/classpath/javax/swing/JWindow.java b/libjava/classpath/javax/swing/JWindow.java
index b36b8cf2a60..91e0b50698e 100644
--- a/libjava/classpath/javax/swing/JWindow.java
+++ b/libjava/classpath/javax/swing/JWindow.java
@@ -77,7 +77,7 @@ public class JWindow extends Window implements Accessible, RootPaneContainer
   }
 
   private static final long serialVersionUID = 5420698392125238833L;
-  
+
   protected JRootPane rootPane;
 
   /**
diff --git a/libjava/classpath/javax/swing/KeyStroke.java b/libjava/classpath/javax/swing/KeyStroke.java
index b57a7119207..94bc334b07c 100644
--- a/libjava/classpath/javax/swing/KeyStroke.java
+++ b/libjava/classpath/javax/swing/KeyStroke.java
@@ -42,18 +42,18 @@ import java.awt.AWTKeyStroke;
 import java.awt.event.KeyEvent;
 import java.io.Serializable;
 
-public class KeyStroke 
+public class KeyStroke
   extends AWTKeyStroke
   implements Serializable
 {
   private static final long serialVersionUID = -9060180771037902530L;
-  
+
   // Called by java.awt.AWTKeyStroke.registerSubclass via reflection.
   private KeyStroke()
   {
     // Nothing to do here.
   }
-  
+
   private KeyStroke(char keyChar, int keyCode, int modifiers,
                     boolean onKeyRelease)
   {
@@ -65,34 +65,34 @@ public class KeyStroke
     AWTKeyStroke.registerSubclass(KeyStroke.class);
   }
 
-  public static KeyStroke getKeyStroke(char keyChar) 
+  public static KeyStroke getKeyStroke(char keyChar)
   {
     return (KeyStroke) getAWTKeyStroke(keyChar);
   }
 
-  /** 
+  /**
    * @deprecated Use {@link #getKeyStroke(char)}
    *
    * This method, unlike all the other factory methods on this object,
    * returns a non-cached, non-shared object. New code should not use it.
    */
-  public static KeyStroke getKeyStroke(char keyChar, boolean onKeyRelease) 
+  public static KeyStroke getKeyStroke(char keyChar, boolean onKeyRelease)
   {
     return new KeyStroke(keyChar, KeyEvent.VK_UNDEFINED, 0, onKeyRelease);
   }
 
-  public static KeyStroke getKeyStroke(Character keyChar, int modifiers) 
+  public static KeyStroke getKeyStroke(Character keyChar, int modifiers)
   {
     return (KeyStroke) getAWTKeyStroke(keyChar, modifiers);
   }
 
-  public static KeyStroke getKeyStroke(int keyCode, int modifiers, 
-                                       boolean onKeyRelease) 
+  public static KeyStroke getKeyStroke(int keyCode, int modifiers,
+                                       boolean onKeyRelease)
   {
     return (KeyStroke) getAWTKeyStroke(keyCode, modifiers, onKeyRelease);
   }
 
-  public static KeyStroke getKeyStroke(int keyCode, int modifiers) 
+  public static KeyStroke getKeyStroke(int keyCode, int modifiers)
   {
     return (KeyStroke) getAWTKeyStroke(keyCode, modifiers);
   }
@@ -103,19 +103,19 @@ public class KeyStroke
    * IllegalArugmentException when
    * the keystoke sequence cannot be parsed from the given string.
    */
-  public static KeyStroke getKeyStroke(String str) 
+  public static KeyStroke getKeyStroke(String str)
   {
     try
       {
-	return (KeyStroke) getAWTKeyStroke(str);
+        return (KeyStroke) getAWTKeyStroke(str);
       }
     catch (IllegalArgumentException iae)
       {
-	return null;
+        return null;
       }
   }
 
-  public static KeyStroke getKeyStrokeForEvent(KeyEvent event) 
+  public static KeyStroke getKeyStrokeForEvent(KeyEvent event)
   {
     return (KeyStroke) getAWTKeyStrokeForEvent(event);
   }
diff --git a/libjava/classpath/javax/swing/KeyboardManager.java b/libjava/classpath/javax/swing/KeyboardManager.java
index f7ac9496c30..5c1c09eab39 100644
--- a/libjava/classpath/javax/swing/KeyboardManager.java
+++ b/libjava/classpath/javax/swing/KeyboardManager.java
@@ -1,4 +1,4 @@
-/* KeyboardManager.java -- 
+/* KeyboardManager.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -49,11 +49,11 @@ import java.util.Vector;
 import java.util.WeakHashMap;
 
 /**
- * This class maintains a mapping from top-level containers to a 
- * Hashtable.  The Hashtable maps KeyStrokes to Components to be used when 
+ * This class maintains a mapping from top-level containers to a
+ * Hashtable.  The Hashtable maps KeyStrokes to Components to be used when
  * Components register keyboard actions with the condition
  * JComponent.WHEN_IN_FOCUSED_WINDOW.
- * 
+ *
  * @author Anthony Balkissoon abalkiss at redhat dot com
  *
  */
@@ -61,13 +61,13 @@ class KeyboardManager
 {
   /** Shared instance of KeyboardManager **/
   static KeyboardManager manager = new KeyboardManager();
-  
-  /** 
-   * A mapping between top level containers and Hashtables that 
+
+  /**
+   * A mapping between top level containers and Hashtables that
    * map KeyStrokes to Components.
    */
-  WeakHashMap topLevelLookup = new WeakHashMap();  
-  
+  WeakHashMap topLevelLookup = new WeakHashMap();
+
   /**
    * A mapping between top level containers and Vectors of JMenuBars
    * used to allow all the JMenuBars within a top level container
@@ -91,22 +91,22 @@ class KeyboardManager
   {
     Container topLevel = (c instanceof Container) ? (Container) c
                                                  : c.getParent();
-    while (topLevel != null && 
-           !(topLevel instanceof Window) && 
-           !(topLevel instanceof Applet) && 
+    while (topLevel != null &&
+           !(topLevel instanceof Window) &&
+           !(topLevel instanceof Applet) &&
            !(topLevel instanceof JInternalFrame))
       topLevel = topLevel.getParent();
     return topLevel;
   }
-  
+
   /**
-   * Returns the Hashtable that maps KeyStrokes to Components, for 
+   * Returns the Hashtable that maps KeyStrokes to Components, for
    * the specified top-level container c.  If no Hashtable exists
    * we create and register it here and return the newly created
    * Hashtable.
-   * 
+   *
    * @param c the top-level container whose Hashtable we want
-   * @return the Hashtable mapping KeyStrokes to Components for the 
+   * @return the Hashtable mapping KeyStrokes to Components for the
    * specified top-level container
    */
   Hashtable getHashtableForTopLevel (Container c)
@@ -119,13 +119,13 @@ class KeyboardManager
       }
     return keyToComponent;
   }
-  
+
   /**
    * Registers a KeyStroke with a Component.  This does not register
-   * the KeyStroke to a specific Action.  When searching for a 
+   * the KeyStroke to a specific Action.  When searching for a
    * WHEN_IN_FOCUSED_WINDOW binding we will first go up to the focused
-   * top-level Container, then get the Hashtable that maps KeyStrokes 
-   * to components for that particular top-level Container, then 
+   * top-level Container, then get the Hashtable that maps KeyStrokes
+   * to components for that particular top-level Container, then
    * call processKeyBindings on that component with the condition
    * JComponent.WHEN_IN_FOCUSED_WINDOW.
    * @param comp the JComponent associated with the KeyStroke
@@ -135,7 +135,7 @@ class KeyboardManager
   {
     // This method associates a KeyStroke with a particular JComponent
     // When the KeyStroke occurs, if this component's top-level ancestor
-    // has focus (one of its children is the focused Component) then 
+    // has focus (one of its children is the focused Component) then
     // comp.processKeyBindings will be called with condition
     // JComponent.WHEN_IN_FOCUSED_WINDOW.
 
@@ -143,16 +143,16 @@ class KeyboardManager
     Container topLevel = findTopLevel(comp);
     if (topLevel == null)
       return;
-    
+
     // Now get the Hashtable for this top-level container
-    Hashtable keyToComponent = getHashtableForTopLevel(topLevel);    
-    
+    Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
+
     // And add the new binding to this Hashtable
     // FIXME: should allow more than one JComponent to be associated
     // with a KeyStroke, in case one of them is disabled
     keyToComponent.put(key, comp);
   }
-  
+
   public void clearBindingsForComp(JComponent comp)
   {
     // This method clears all the WHEN_IN_FOCUSED_WINDOW bindings associated
@@ -162,9 +162,9 @@ class KeyboardManager
     // bindings from the updated ComponentInputMap.  This is only a preliminary
     // strategy and should be improved upon once the WHEN_IN_FOCUSED_WINDOW
     // bindings work.
-    
+
     // Find the top-level ancestor
-    
+
     Container topLevel = findTopLevel(comp);
     if (topLevel == null)
       return;
@@ -179,22 +179,22 @@ class KeyboardManager
       {
         temp = keys.nextElement();
         if (comp == (JComponent)keyToComponent.get(temp))
-          keyToComponent.remove(temp);          
+          keyToComponent.remove(temp);
       }
   }
-    
+
   /**
    * This method registers all the bindings in the given ComponentInputMap.
    * Rather than call registerBinding on all the keys, we do the work here
-   * so that we don't duplicate finding the top-level container and 
+   * so that we don't duplicate finding the top-level container and
    * getting its Hashtable.
-   * 
+   *
    * @param map the ComponentInputMap whose bindings we want to register
    */
   public void registerEntireMap (ComponentInputMap map)
   {
     if (map == null)
-      return;    
+      return;
     JComponent comp = map.getComponent();
     KeyStroke[] keys = map.allKeys();
     if (keys == null)
@@ -203,13 +203,13 @@ class KeyboardManager
     Container topLevel = findTopLevel(comp);
     if (topLevel == null)
       return;
-    
+
     // Register the KeyStrokes in the top-level container's Hashtable
     Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
     for (int i = 0; i < keys.length; i++)
       keyToComponent.put(keys[i], comp);
   }
-  
+
   public boolean processKeyStroke (Component comp, KeyStroke key, KeyEvent e)
   {
     boolean pressed = e.getID() == KeyEvent.KEY_PRESSED;
@@ -217,15 +217,15 @@ class KeyboardManager
     // Look for the top-level ancestor
     Container topLevel = findTopLevel(comp);
     if (topLevel == null)
-      return false;    
+      return false;
     // Now get the Hashtable for that top-level container
     Hashtable keyToComponent = getHashtableForTopLevel(topLevel);
     Enumeration keys = keyToComponent.keys();
-    JComponent target = (JComponent)keyToComponent.get(key);    
+    JComponent target = (JComponent)keyToComponent.get(key);
     if (target != null && target.processKeyBinding
         (key, e, JComponent.WHEN_IN_FOCUSED_WINDOW, pressed))
       return true;
-    
+
     // Have to give all the JMenuBars a chance to consume the event
     Vector menuBars = getVectorForTopLevel(topLevel);
     for (int i = 0; i < menuBars.size(); i++)
@@ -233,7 +233,7 @@ class KeyboardManager
         return true;
     return false;
   }
-  
+
   /**
    * Returns the Vector of JMenuBars associated with the top-level
    * @param c the top-level container whose JMenuBar Vector we want
@@ -249,11 +249,11 @@ class KeyboardManager
       }
     return result;
   }
-  
+
   /**
-   * In processKeyStroke, KeyManager must give all JMenuBars in the 
-   * focused top-level container a chance to process the event.  So, 
-   * JMenuBars must be registered in KeyManager and associated with a 
+   * In processKeyStroke, KeyManager must give all JMenuBars in the
+   * focused top-level container a chance to process the event.  So,
+   * JMenuBars must be registered in KeyManager and associated with a
    * top-level container.  That's what this method is for.
    * @param menuBar the JMenuBar to register
    */
@@ -264,9 +264,9 @@ class KeyboardManager
     if (!menuBars.contains(menuBar))
       menuBars.add(menuBar);
   }
-  
+
   /**
-   * Unregisters a JMenuBar from its top-level container.  This is 
+   * Unregisters a JMenuBar from its top-level container.  This is
    * called before the JMenuBar is actually removed from the container
    * so findTopLevel will still find us the correct top-level container.
    * @param menuBar the JMenuBar to unregister.
diff --git a/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java b/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
index 2d135157d85..335bc265dcf 100644
--- a/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/LayoutFocusTraversalPolicy.java
@@ -45,10 +45,10 @@ import java.util.Comparator;
 /**
  * @author Graydon Hoare
  * @author Michael Koch
- * 
+ *
  * @since 1.4
  */
-public class LayoutFocusTraversalPolicy 
+public class LayoutFocusTraversalPolicy
   extends SortingFocusTraversalPolicy
   implements Serializable
 {
@@ -59,7 +59,7 @@ public class LayoutFocusTraversalPolicy
     {
       // Do nothing here.
     }
-    
+
     public int compare(Object o1, Object o2)
     {
       Component comp1 = (Component) o1;
@@ -69,19 +69,19 @@ public class LayoutFocusTraversalPolicy
       int y1 = comp1.getY();
       int x2 = comp2.getX();
       int y2 = comp2.getY();
-      
+
       if (x1 == x2 && y1 == y2)
-	return 0;
-      
+        return 0;
+
       if ((y1 < y2) || ((y1 == y2) && (x1 < x2)))
-	return -1;
+        return -1;
 
       return 1;
     }
   }
 
   private static final long serialVersionUID = 4312146927238881442L;
-  
+
   public LayoutFocusTraversalPolicy()
   {
     super(new LayoutComparator());
diff --git a/libjava/classpath/javax/swing/ListCellRenderer.java b/libjava/classpath/javax/swing/ListCellRenderer.java
index e234d184dfd..0e56d5016b9 100644
--- a/libjava/classpath/javax/swing/ListCellRenderer.java
+++ b/libjava/classpath/javax/swing/ListCellRenderer.java
@@ -1,4 +1,4 @@
-/* ListCellRenderer.java -- 
+/* ListCellRenderer.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/ListSelectionModel.java b/libjava/classpath/javax/swing/ListSelectionModel.java
index 499362d045b..1cd67e9489a 100644
--- a/libjava/classpath/javax/swing/ListSelectionModel.java
+++ b/libjava/classpath/javax/swing/ListSelectionModel.java
@@ -1,4 +1,4 @@
-/* ListSelectionModel.java -- 
+/* ListSelectionModel.java --
    Copyright (C) 2002, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,19 +42,19 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 /**
- * A model that tracks the selection status of a list of items.  Each item in 
+ * A model that tracks the selection status of a list of items.  Each item in
  * the list is identified by a zero-based index only, so the model can be used
- * to track the selection status of any type of list.  The model 
+ * to track the selection status of any type of list.  The model
  * supports three modes:
  * 
                        
- * 
                      • SINGLE_SELECTION - only one item in the list may be 
+ * 
                      • SINGLE_SELECTION - only one item in the list may be
  *     selected;
                        • 
- * 
                      • SINGLE_INTERVAL_SELECTION - only one interval in the list 
+ * 
                      • SINGLE_INTERVAL_SELECTION - only one interval in the list
  *     may be selected;
                        • 
- * 
                      • MULTIPLE_INTERVAL_SELECTION - any combination of items in 
+ * 
                      • MULTIPLE_INTERVAL_SELECTION - any combination of items in
  *     the list may be selected.
                        • 
  * 
                      
- * The model uses an event notification mechanism to notify listeners (see 
+ * The model uses an event notification mechanism to notify listeners (see
  * {@link ListSelectionListener}) about updates to the selection model.
  * 
                      
  * This model is used to track row selections in the {@link JList} component,
@@ -62,10 +62,10 @@ import javax.swing.event.ListSelectionListener;
  */
 public interface ListSelectionModel
 {
-  
+
   /**
    * A selection mode in which only one item can be selected.
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   int SINGLE_SELECTION = 0;
@@ -73,14 +73,14 @@ public interface ListSelectionModel
   /**
    * A selection mode in which a single interval can be selected (an interval
    * is a range containing one or more contiguous items).
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   int SINGLE_INTERVAL_SELECTION = 1;
 
   /**
    * A selection mode in which any combination of items can be selected.
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   int MULTIPLE_INTERVAL_SELECTION = 2;
@@ -90,32 +90,32 @@ public interface ListSelectionModel
    * 
                      
    * FIXME: The spec is silent about what happens to existing selections, for
    * example when changing from an interval selection to single selection.
-   * 
-   * @param mode  one of {@link #SINGLE_SELECTION}, 
-   *     {@link #SINGLE_INTERVAL_SELECTION} and 
+   *
+   * @param mode  one of {@link #SINGLE_SELECTION},
+   *     {@link #SINGLE_INTERVAL_SELECTION} and
    *     {@link #MULTIPLE_INTERVAL_SELECTION}.
-   *     
+   *
    * @see #getSelectionMode()
-   * 
+   *
    * @throws IllegalArgumentException if mode is not one of the
    *     specified values.
    */
   void setSelectionMode(int mode);
 
   /**
-   * Returns the selection mode, which is one of {@link #SINGLE_SELECTION}, 
-   * {@link #SINGLE_INTERVAL_SELECTION} and 
+   * Returns the selection mode, which is one of {@link #SINGLE_SELECTION},
+   * {@link #SINGLE_INTERVAL_SELECTION} and
    * {@link #MULTIPLE_INTERVAL_SELECTION}.
-   * 
+   *
    * @return The selection mode.
-   * 
+   *
    * @see #setSelectionMode(int)
    */
   int getSelectionMode();
 
   /**
-   * Clears the current selection from the model.  If the selection state 
-   * changes (that is, the existing selection is non-empty) a 
+   * Clears the current selection from the model.  If the selection state
+   * changes (that is, the existing selection is non-empty) a
    * {@link ListSelectionEvent} should be sent to all registered listeners.
    * 
                      
    * FIXME: what happens to the anchor and lead selection indices (the spec
@@ -126,11 +126,11 @@ public interface ListSelectionModel
   void clearSelection();
 
   /**
-   * Returns the lowest selected index, or -1 if there is no 
+   * Returns the lowest selected index, or -1 if there is no
    * selection.
-   * 
+   *
    * @return The lowest selected index.
-   * 
+   *
    * @see #getMaxSelectionIndex()
    */
   int getMinSelectionIndex();
@@ -138,22 +138,22 @@ public interface ListSelectionModel
   /**
    * Returns the highest selected index, or -1 if there is no
    * selection.
-   * 
+   *
    * @return The highest selected index.
-   * 
+   *
    * @see #getMinSelectionIndex()
    */
   int getMaxSelectionIndex();
 
   /**
-   * Returns true if the specified item is selected, and 
-   * false otherwise.  Special note: if index is 
-   * negative, this method should return false (no exception 
+   * Returns true if the specified item is selected, and
+   * false otherwise.  Special note: if index is
+   * negative, this method should return false (no exception
    * should be thrown).
-   * 
+   *
    * @param index  the item index (zero-based).
-   * 
-   * @return true if the specified item is selected, and 
+   *
+   * @return true if the specified item is selected, and
    *     false otherwise.
    */
   boolean isSelectedIndex(int index);
@@ -161,56 +161,56 @@ public interface ListSelectionModel
   /**
    * Returns true if there is no selection, and false
    * otherwise.
-   * 
-   * @return  true if there is no selection, and 
+   *
+   * @return  true if there is no selection, and
    *     false otherwise.
    */
   boolean isSelectionEmpty();
 
   /**
-   * Sets the selection interval to the specified range (note that 
-   * anchor can be less than, equal to, or greater than 
-   * lead).  If this results in the selection being changed, 
+   * Sets the selection interval to the specified range (note that
+   * anchor can be less than, equal to, or greater than
+   * lead).  If this results in the selection being changed,
    * a {@link ListSelectionEvent} is sent to all registered listeners.
    * 
                      
-   * If the selection mode is {@link #SINGLE_SELECTION}, only the 
+   * If the selection mode is {@link #SINGLE_SELECTION}, only the
    * lead item is selected.
-   * 
+   *
    * @param anchor  the anchor index.
    * @param lead  the lead index.
    */
   void setSelectionInterval(int anchor, int lead);
 
   /**
-   * Marks the items in the specified interval as selected.  The behaviour of 
+   * Marks the items in the specified interval as selected.  The behaviour of
    * this method depends on the selection mode:
    * 
                        
-   * 
                      • SINGLE_SELECTION - only the lead item is 
+   * 
                      • SINGLE_SELECTION - only the lead item is
    *     selected;
                        • 
-   * 
                      • SINGLE_INTERVAL_SELECTION - the existing selection 
+   * 
                      • SINGLE_INTERVAL_SELECTION - the existing selection
    *     interval is replaced by the specified interval;
                        • 
-   * 
                      • MULTIPLE_INTERVAL_SELECTION - the specified interval is 
+   * 
                      • MULTIPLE_INTERVAL_SELECTION - the specified interval is
    *     merged into the currently selected intervals.
                        • 
    * 
                      
-   * Note that anchor can be less than, equal to, or greater than 
+   * Note that anchor can be less than, equal to, or greater than
    * lead.
-   * 
+   *
    * @param anchor  the index of the anchor item
    * @param lead  the index of the lead item.
    */
   void addSelectionInterval(int anchor, int lead);
 
   /**
-   * Marks the items in the specified interval as not selected.  The behaviour 
+   * Marks the items in the specified interval as not selected.  The behaviour
    * of this method depends on the selection mode:
    * 
                        
    * 
                      • SINGLE_SELECTION - XXX;
                        • 
    * 
                      • SINGLE_INTERVAL_SELECTION - XXX;
                        • 
    * 
                      • MULTIPLE_INTERVAL_SELECTION - XXX.
                        • 
    * 
                      
-   * Note that anchor can be less than, equal to, or greater than 
+   * Note that anchor can be less than, equal to, or greater than
    * lead.
-   * 
+   *
    * @param anchor  the index of the anchor item
    * @param lead  the index of the lead item.
    */
@@ -221,67 +221,67 @@ public interface ListSelectionModel
    * specified index (the before flag indicates
    * whether the range is inserted before or after the existing item at
    * index).
-   * 
+   *
    * FIXME: What is the selection status of the new items? Bug 4870694.
    * FIXME: What event is generated?
-   * 
-   * @param index  the index of the item. 
+   *
+   * @param index  the index of the item.
    * @param length  the number of items in the interval to be inserted.
-   * @param before  if true, the interval should be inserted 
+   * @param before  if true, the interval should be inserted
    *     before index, otherwise it is inserted after.
-   *     
+   *
    * @see #removeIndexInterval(int, int)
    */
   void insertIndexInterval(int index, int length, boolean before);
 
   /**
    * Removes the items in the specified range (inclusive) from the selection
-   * model.  This method should be called when an interval is deleted from 
+   * model.  This method should be called when an interval is deleted from
    * the underlying list.
-   * 
-   * FIXME: what happens to the lead and anchor indices if they are part of 
-   * the range that is removed? 
+   *
+   * FIXME: what happens to the lead and anchor indices if they are part of
+   * the range that is removed?
    * FIXME: what event is generated
-   * 
+   *
    * @param index0  XXX
    * @param index1  XXX
-   * 
+   *
    * @see #insertIndexInterval(int, int, boolean)
    */
   void removeIndexInterval(int index0, int index1);
 
   /**
-   * Returns the index of the anchor item. 
-   * 
+   * Returns the index of the anchor item.
+   *
    * @return The index of the anchor item.
-   * 
+   *
    * @see #setAnchorSelectionIndex(int)
    */
   int getAnchorSelectionIndex();
 
   /**
    * Sets the index of the anchor item.
-   * 
+   *
    * @param index  the item index.
-   * 
+   *
    * @see #getAnchorSelectionIndex()
    */
   void setAnchorSelectionIndex(int index);
 
   /**
    * Returns the index of the lead item.
-   * 
+   *
    * @return The index of the lead item.
-   * 
+   *
    * @see #setLeadSelectionIndex(int)
    */
   int getLeadSelectionIndex();
 
   /**
    * Sets the index of the lead item.
-   * 
+   *
    * @param index  the item index.
-   * 
+   *
    * @see #getLeadSelectionIndex()
    */
   void setLeadSelectionIndex(int index);
@@ -289,21 +289,21 @@ public interface ListSelectionModel
   /**
    * Sets the flag that is passed to listeners for each change notification.
    * If a sequence of changes is made to the selection model, this flag should
-   * be set to true at the start of the sequence, and 
+   * be set to true at the start of the sequence, and
    * false for the last change - this gives listeners the option
    * to ignore interim changes if that is more efficient.
-   * 
+   *
    * @param valueIsAdjusting  the flag value.
-   * 
+   *
    * @see #getValueIsAdjusting()
    */
   void setValueIsAdjusting(boolean valueIsAdjusting);
 
   /**
    * Returns a flag that is passed to registered listeners when changes are
-   * made to the model.  See the description for 
+   * made to the model.  See the description for
    * {@link #setValueIsAdjusting(boolean)} for more information.
-   *  
+   *
    * @return The flag.
    */
   boolean getValueIsAdjusting();
@@ -311,9 +311,9 @@ public interface ListSelectionModel
   /**
    * Registers a listener with the model so that it receives notification
    * of changes to the model.
-   * 
+   *
    * @param listener  the listener (null ignored).
-   * 
+   *
    * @see #removeListSelectionListener(ListSelectionListener)
    */
   void addListSelectionListener(ListSelectionListener listener);
@@ -322,9 +322,9 @@ public interface ListSelectionModel
    * Deregisters a listener so that it no longer receives notification of
    * changes to the model.  If the specified listener is not registered with
    * the model, or is null, this method does nothing.
-   * 
+   *
    * @param listener  the listener (null ignored).
-   * 
+   *
    * @see #addListSelectionListener(ListSelectionListener)
    */
   void removeListSelectionListener(ListSelectionListener listener);
diff --git a/libjava/classpath/javax/swing/LookAndFeel.java b/libjava/classpath/javax/swing/LookAndFeel.java
index d995bc9e981..aec6ebb7fab 100644
--- a/libjava/classpath/javax/swing/LookAndFeel.java
+++ b/libjava/classpath/javax/swing/LookAndFeel.java
@@ -53,18 +53,18 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
 import javax.swing.text.JTextComponent;
 
 /**
- * A look-and-feel controls most aspects of the appearance and 
- * operation of user interface components in javax.swing.  A 
+ * A look-and-feel controls most aspects of the appearance and
+ * operation of user interface components in javax.swing.  A
  * cross-platform look-and-feel (the {@link MetalLookAndFeel}) is provided.
- * 
+ *
  * @see UIManager#getInstalledLookAndFeels()
  * @see UIManager#setLookAndFeel(LookAndFeel)
  */
 public abstract class LookAndFeel
 {
   /**
-   * Creates and returns a look-and-feel specific defaults table.  This method 
-   * is called once by {@link UIManager#setLookAndFeel(LookAndFeel)} and 
+   * Creates and returns a look-and-feel specific defaults table.  This method
+   * is called once by {@link UIManager#setLookAndFeel(LookAndFeel)} and
    * shouldn't be called again (as it creates a large table of defaults).
    *
    * @return The UI defaults.
@@ -76,47 +76,47 @@ public abstract class LookAndFeel
 
   /**
    * Returns a description of the look and feel.
-   * 
+   *
    * @return A description of the look and feel.
    */
   public abstract String getDescription();
 
   /**
    * Returns the value of Toolkit.getDefaultToolkit()
-   * .getDesktopProperty(systemPropertyName), or 
+   * .getDesktopProperty(systemPropertyName)                      , or
    * fallbackValue if no such property is defined.
-   * 
+   *
    * @param systemPropertyName  the system property name.
    * @param fallbackValue  the fallback value.
-   * 
+   *
    * @return The property value or fallbackValue.
    */
-  public static Object getDesktopPropertyValue(String systemPropertyName, 
+  public static Object getDesktopPropertyValue(String systemPropertyName,
       Object fallbackValue)
   {
     Object value = Toolkit.getDefaultToolkit().getDesktopProperty(
         systemPropertyName);
     return value != null ? value : fallbackValue;
   }
-  
+
   /**
    * Returns an identifier for the look and feel.
-   * 
+   *
    * @return An identifier for the look and feel.
    */
   public abstract String getID();
 
   /**
    * Returns the name for the look and feel.
-   * 
+   *
    * @return The name for the look and feel.
    */
   public abstract String getName();
 
   /**
-   * Returns true when the look-and-feel supports window 
+   * Returns true when the look-and-feel supports window
    * decorations, and false otherwise. This default implementation
-   * always returns false and needs to be overridden when the 
+   * always returns false and needs to be overridden when the
    * derived look-and-feel supports this.
    *
    * @return false.
@@ -127,13 +127,13 @@ public abstract class LookAndFeel
   {
     return false;
   }
-  
+
   /**
-   * Initializes the look-and-feel.  The 
-   * {@link UIManager#setLookAndFeel(LookAndFeel)} method calls this method 
-   * before the first call (and typically the only call) to 
+   * Initializes the look-and-feel.  The
+   * {@link UIManager#setLookAndFeel(LookAndFeel)} method calls this method
+   * before the first call (and typically the only call) to
    * {@link #getDefaults()}.  This default implementation does nothing, but
-   * subclasses can override this behaviour. 
+   * subclasses can override this behaviour.
    */
   public void initialize()
   {
@@ -142,12 +142,12 @@ public abstract class LookAndFeel
   }
 
   /**
-   * Convenience method for installing a component's default {@link Border} 
-   * object on the specified component if either the border is currently 
-   * null or already an instance of {@link UIResource}. 
-   * 
+   * Convenience method for installing a component's default {@link Border}
+   * object on the specified component if either the border is currently
+   * null or already an instance of {@link UIResource}.
+   *
    * @param c  the component (null not permitted).
-   * @param defaultBorderName  the border name (for lookup in the UIDefaults 
+   * @param defaultBorderName  the border name (for lookup in the UIDefaults
    *     table).
    */
   public static void installBorder(JComponent c, String defaultBorderName)
@@ -160,9 +160,9 @@ public abstract class LookAndFeel
   /**
    * Convenience method for initializing a component's foreground and
    * background color properties with values from the current defaults table.
-   * 
+   *
    * @param c  the component (null not permitted).
-   * @param defaultBgName  the key for the background color in the UIDefaults 
+   * @param defaultBgName  the key for the background color in the UIDefaults
    *     table.
    * @param defaultFgName  the key for the foreground color in the UIDefaults
    *     table.
@@ -184,9 +184,9 @@ public abstract class LookAndFeel
   /**
    * Convenience method for initializing a component's foreground, background
    * and font properties with values from the current defaults table.
-   * 
+   *
    * @param component  the component (null not permitted).
-   * @param defaultBgName  the key for the background color in the UIDefaults 
+   * @param defaultBgName  the key for the background color in the UIDefaults
    *     table.
    * @param defaultFgName  the key for the foreground color in the UIDefaults
    *     table.
@@ -206,23 +206,23 @@ public abstract class LookAndFeel
   }
 
   /**
-   * Returns true if the look-and-feel is the "native" 
+   * Returns true if the look-and-feel is the "native"
    * look-and-feel for the current platform, and false otherwise.
-   * A native look-and-feel emulates the appearance and behaviour of the 
+   * A native look-and-feel emulates the appearance and behaviour of the
    * default windowing system on the host operating system.
-   * 
+   *
    * @return A flag indicating whether or not this is the native look and feel
    *         for the current platform.
    */
   public abstract boolean isNativeLookAndFeel();
 
   /**
-   * Returns true if the look-and-feel is supported on the 
-   * current operating system, and false otherwise.  This 
+   * Returns true if the look-and-feel is supported on the
+   * current operating system, and false otherwise.  This
    * mechanism is provided so that it is possible to prevent a look-and-feel
    * from being used on some operating systems (usually for legal, not
    * technical, reasons).
-   * 
+   *
    * @return A flag indicating whether or not the look-and-feel is supported
    *         on the current platform.
    */
@@ -232,9 +232,9 @@ public abstract class LookAndFeel
    * Loads the bindings in keys into retMap. Does not remove existing entries
    * from retMap.  keys describes the InputMap, every even indexed
    * item is either a KeyStroke or a String representing a KeyStroke and every
-   * odd indexed item is the Object associated with that KeyStroke in an 
+   * odd indexed item is the Object associated with that KeyStroke in an
    * ActionMap.
-   * 
+   *
    * @param retMap the InputMap into which we load bindings
    * @param keys the Object array describing the InputMap as above
    */
@@ -255,19 +255,19 @@ public abstract class LookAndFeel
   }
 
   /**
-   * Creates a ComponentInputMap from keys.  
+   * Creates a ComponentInputMap from keys.
    * keys describes the InputMap, every even indexed
    * item is either a KeyStroke or a String representing a KeyStroke and every
-   * odd indexed item is the Object associated with that KeyStroke in an 
+   * odd indexed item is the Object associated with that KeyStroke in an
    * ActionMap.
-   * 
+   *
    * @param c the JComponent associated with the ComponentInputMap
    * @param keys the Object array describing the InputMap as above
-   * 
+   *
    * @return A new input map.
    */
   public static ComponentInputMap makeComponentInputMap(JComponent c,
-							Object[] keys)
+                                                        Object[] keys)
   {
     ComponentInputMap retMap = new ComponentInputMapUIResource(c);
     loadKeyBindings(retMap, keys);
@@ -277,17 +277,17 @@ public abstract class LookAndFeel
   /**
    * Utility method that creates a UIDefaults.LazyValue that creates an
    * ImageIcon UIResource for the specified gifFile filename.
-   * 
+   *
    * @param baseClass  the base class for accessing the icon resource.
    * @param gifFile  the file name.
-   * 
-   * @return A {@link UIDefaults.LazyValue} that serves up an 
+   *
+   * @return A {@link UIDefaults.LazyValue} that serves up an
    *     {@link IconUIResource}.
    */
   public static Object makeIcon(Class baseClass, String gifFile)
   {
     final URL file = baseClass.getResource(gifFile);
-    return new UIDefaults.LazyValue() 
+    return new UIDefaults.LazyValue()
       {
         public Object createValue(UIDefaults table)
         {
@@ -297,14 +297,14 @@ public abstract class LookAndFeel
   }
 
   /**
-   * Creates a InputMap from keys. 
+   * Creates a InputMap from keys.
    * keys describes the InputMap, every even indexed
    * item is either a KeyStroke or a String representing a KeyStroke and every
-   * odd indexed item is the Object associated with that KeyStroke in an 
+   * odd indexed item is the Object associated with that KeyStroke in an
    * ActionMap.
-   * 
+   *
    * @param keys the Object array describing the InputMap as above
-   * 
+   *
    * @return A new input map.
    */
   public static InputMap makeInputMap(Object[] keys)
@@ -319,14 +319,14 @@ public abstract class LookAndFeel
    * keyBindingList is an array of KeyStroke-Action pairs where
    * even indexed elements are KeyStrokes or Strings representing KeyStrokes
    * and odd indexed elements are the associated Actions.
-   * 
+   *
    * @param keyBindingList the array of KeyStroke-Action pairs
    * @return a JTextComponent.KeyBinding array
    */
   public static JTextComponent.KeyBinding[] makeKeyBindings(
       Object[] keyBindingList)
   {
-    JTextComponent.KeyBinding[] retBindings = 
+    JTextComponent.KeyBinding[] retBindings =
       new JTextComponent.KeyBinding[keyBindingList.length / 2];
     for (int i = 0; i < keyBindingList.length - 1; i += 2)
       {
@@ -335,15 +335,15 @@ public abstract class LookAndFeel
           stroke = (KeyStroke) keyBindingList[i];
         else
           stroke = KeyStroke.getKeyStroke((String) keyBindingList[i]);
-        retBindings[i / 2] = new JTextComponent.KeyBinding(stroke, 
+        retBindings[i / 2] = new JTextComponent.KeyBinding(stroke,
             (String) keyBindingList[i + 1]);
       }
     return retBindings;
   }
 
   /**
-   * Invoked when the user attempts an invalid operation. The default 
-   * implementation just beeps. Subclasses that wish to change this need to 
+   * Invoked when the user attempts an invalid operation. The default
+   * implementation just beeps. Subclasses that wish to change this need to
    * override this method.
    *
    * @param component the component the error occured in
@@ -365,7 +365,7 @@ public abstract class LookAndFeel
 
   /**
    * UIManager.setLookAndFeel calls this method just before we're replaced by
-   * a new default look and feel. 
+   * a new default look and feel.
    */
   public void uninitialize()
   {
@@ -376,7 +376,7 @@ public abstract class LookAndFeel
   /**
    * Convenience method for un-installing a component's default border on the
    * specified component if the border is currently an instance of UIResource.
-   * 
+   *
    * @param c  the component (null not permitted).
    */
   public static void uninstallBorder(JComponent c)
diff --git a/libjava/classpath/javax/swing/MenuSelectionManager.java b/libjava/classpath/javax/swing/MenuSelectionManager.java
index beafbf44202..0b654499dc2 100644
--- a/libjava/classpath/javax/swing/MenuSelectionManager.java
+++ b/libjava/classpath/javax/swing/MenuSelectionManager.java
@@ -127,7 +127,7 @@ public class MenuSelectionManager
     // clear selected path
     selectedPath.clear();
 
-    // notify all listeners that the selected path was changed    
+    // notify all listeners that the selected path was changed
     fireStateChanged();
   }
 
@@ -146,37 +146,37 @@ public class MenuSelectionManager
   {
     // Convert sourcePoint to screen coordinates.
     Point sourcePointOnScreen = sourcePoint;
-    
+
     if (source.isShowing())
       SwingUtilities.convertPointToScreen(sourcePointOnScreen, source);
 
     Point compPointOnScreen;
     Component resultComp = null;
 
-    // For each menu element on the selected path, express its location 
-    // in terms of screen coordinates and check if there is any 
+    // For each menu element on the selected path, express its location
+    // in terms of screen coordinates and check if there is any
     // menu element on the selected path that contains given source point.
     for (int i = 0; i < selectedPath.size(); i++)
       {
-	Component comp = ((Component) selectedPath.get(i));
-	Dimension size = comp.getSize();
+        Component comp = ((Component) selectedPath.get(i));
+        Dimension size = comp.getSize();
 
-	// convert location of this menu item to screen coordinates
-	compPointOnScreen = comp.getLocationOnScreen();
+        // convert location of this menu item to screen coordinates
+        compPointOnScreen = comp.getLocationOnScreen();
+
+        if (compPointOnScreen.x <= sourcePointOnScreen.x
+            && sourcePointOnScreen.x < compPointOnScreen.x + size.width
+            && compPointOnScreen.y <= sourcePointOnScreen.y
+            && sourcePointOnScreen.y < compPointOnScreen.y + size.height)
+          {
+            Point p = sourcePointOnScreen;
 
-	if (compPointOnScreen.x <= sourcePointOnScreen.x
-	    && sourcePointOnScreen.x < compPointOnScreen.x + size.width
-	    && compPointOnScreen.y <= sourcePointOnScreen.y
-	    && sourcePointOnScreen.y < compPointOnScreen.y + size.height)
-	  {
-	    Point p = sourcePointOnScreen;
-        
         if (comp.isShowing())
           SwingUtilities.convertPointFromScreen(p, comp);
-        
-	    resultComp = SwingUtilities.getDeepestComponentAt(comp, p.x, p.y);
-	    break;
-	  }
+
+            resultComp = SwingUtilities.getDeepestComponentAt(comp, p.x, p.y);
+            break;
+          }
       }
     return resultComp;
   }
@@ -232,7 +232,7 @@ public class MenuSelectionManager
             subElements = first.getSubElements();
             for (int j = 0; j < subElements.length; j++)
               {
-                MenuElement me = subElements[j]; 
+                MenuElement me = subElements[j];
                 if (me != null
                     && (SwingUtilities.isDescendingFrom(c, me.getComponent())))
                   {
@@ -315,9 +315,9 @@ public class MenuSelectionManager
     Component source = ((Component) event.getSource());
 
     // In the case of drag event, event.getSource() returns component
-    // where drag event originated. However menu element processing this 
-    // event should be the one over which mouse is currently located, 
-    // which is not necessary the source of the drag event.     
+    // where drag event originated. However menu element processing this
+    // event should be the one over which mouse is currently located,
+    // which is not necessary the source of the drag event.
     Component mouseOverMenuComp;
 
     // find over which menu element the mouse is currently located
@@ -330,28 +330,28 @@ public class MenuSelectionManager
     // Process this event only if mouse is located over some menu element
     if (mouseOverMenuComp != null && (mouseOverMenuComp instanceof MenuElement))
       {
-	MenuElement[] path = getPath(mouseOverMenuComp);
-	((MenuElement) mouseOverMenuComp).processMouseEvent(event, path,
-	                                                    manager);
+        MenuElement[] path = getPath(mouseOverMenuComp);
+        ((MenuElement) mouseOverMenuComp).processMouseEvent(event, path,
+                                                            manager);
 
-	// FIXME: Java specification says that mouse events should be
-	// forwarded to subcomponents. The code below does it, but
-	// menu's work fine without it. This code is commented for now.	  
+        // FIXME: Java specification says that mouse events should be
+        // forwarded to subcomponents. The code below does it, but
+        // menu's work fine without it. This code is commented for now.
 
-	/*
-	MenuElement[] subComponents = ((MenuElement) mouseOverMenuComp)
-	                              .getSubElements();
+        /*
+        MenuElement[] subComponents = ((MenuElement) mouseOverMenuComp)
+                                      .getSubElements();
 
-	for (int i = 0; i < subComponents.length; i++)
-	 {
-	      subComponents[i].processMouseEvent(event, path, manager);
-	 }
-	*/
+        for (int i = 0; i < subComponents.length; i++)
+         {
+              subComponents[i].processMouseEvent(event, path, manager);
+         }
+        */
       }
     else
       {
-	if (event.getID() == MouseEvent.MOUSE_RELEASED)
-	  clearSelectedPath();
+        if (event.getID() == MouseEvent.MOUSE_RELEASED)
+          clearSelectedPath();
       }
   }
 
@@ -364,8 +364,8 @@ public class MenuSelectionManager
   {
     if (path == null)
       {
-	clearSelectedPath();
-	return;
+        clearSelectedPath();
+        return;
       }
 
     int minSize = path.length; // size of the smaller path.
@@ -412,25 +412,25 @@ public class MenuSelectionManager
   private MenuElement[] getPath(Component c)
   {
     // FIXME: There is the same method in BasicMenuItemUI. However I
-    // cannot use it here instead of this method, since I cannot assume that 
+    // cannot use it here instead of this method, since I cannot assume that
     // all the menu elements on the selected path are JMenuItem or JMenu.
-    // For now I've just duplicated it here. Please 
-    // fix me or delete me if another better approach will be found, and 
+    // For now I've just duplicated it here. Please
+    // fix me or delete me if another better approach will be found, and
     // this method will not be necessary.
     ArrayList path = new ArrayList();
 
-    // if given component is JMenu, we also need to include 
-    // it's popup menu in the path 
+    // if given component is JMenu, we also need to include
+    // it's popup menu in the path
     if (c instanceof JMenu)
       path.add(((JMenu) c).getPopupMenu());
     while (c instanceof MenuElement)
       {
-	path.add(0, (MenuElement) c);
+        path.add(0, (MenuElement) c);
 
-	if (c instanceof JPopupMenu)
-	  c = ((JPopupMenu) c).getInvoker();
-	else
-	  c = c.getParent();
+        if (c instanceof JPopupMenu)
+          c = ((JPopupMenu) c).getInvoker();
+        else
+          c = c.getParent();
       }
 
     MenuElement[] pathArray = new MenuElement[path.size()];
diff --git a/libjava/classpath/javax/swing/OverlayLayout.java b/libjava/classpath/javax/swing/OverlayLayout.java
index a2cccb9ce89..b037a09a72b 100644
--- a/libjava/classpath/javax/swing/OverlayLayout.java
+++ b/libjava/classpath/javax/swing/OverlayLayout.java
@@ -62,7 +62,7 @@ import java.io.Serializable;
  * point is in the middle, an X alignment of 1.0 means, the aligment point is
  * at the right edge. So if you have three components, the first with 0.0, the
  * second with 0.5 and the third with 1.0, then they are laid out like this:
- * 
+ *
  * 
                        *          +-------+
  *          |   1   |
@@ -300,7 +300,7 @@ public class OverlayLayout implements LayoutManager2, Serializable
    * at the right edge. So if you have three components, the first with 0.0,
    * the second with 0.5 and the third with 1.0, then they are laid out like
    * this:
-   * 
+   *
    * 
                          *          +-------+
    *          |   1   |
diff --git a/libjava/classpath/javax/swing/Popup.java b/libjava/classpath/javax/swing/Popup.java
index 5074d64186c..65be7cfe1a3 100644
--- a/libjava/classpath/javax/swing/Popup.java
+++ b/libjava/classpath/javax/swing/Popup.java
@@ -85,8 +85,8 @@ public class Popup
     // The real stuff happens in the implementation of subclasses,
     // for instance JWindowPopup.
   }
-  
-  
+
+
   /**
    * Constructs a new Popup.
    */
@@ -177,8 +177,8 @@ public class Popup
       window.setSize(contents.getSize());
       window.show();
     }
-    
-    
+
+
     /**
      * Removes the popup's JWindow from the
      * screen.  Nothing happens if it is currently not visible.
@@ -226,12 +226,12 @@ public class Popup
      * The panel that holds the content.
      */
     private JPanel panel;
-    
+
     /**
      * The layered pane of the owner.
      */
     private JLayeredPane layeredPane;
-    
+
     /**
      * Constructs a new LightweightPopup given its owner,
      * contents and the screen position where the popup
@@ -259,7 +259,7 @@ public class Popup
       this.contents = contents;
       this.x = x;
       this.y = y;
-      
+
       JRootPane rootPane = SwingUtilities.getRootPane(owner);
       JLayeredPane layeredPane = rootPane.getLayeredPane();
       this.layeredPane = layeredPane;
@@ -279,7 +279,7 @@ public class Popup
           panel = new JPanel();
           panel.setLayout(new FlowLayout(0, 0, 0));
         }
-      
+
       panel.add(contents);
       panel.setSize(contents.getSize());
       Point layeredPaneLoc = layeredPane.getLocationOnScreen();
diff --git a/libjava/classpath/javax/swing/PopupFactory.java b/libjava/classpath/javax/swing/PopupFactory.java
index b326205999c..9468c886482 100644
--- a/libjava/classpath/javax/swing/PopupFactory.java
+++ b/libjava/classpath/javax/swing/PopupFactory.java
@@ -159,7 +159,7 @@ public class PopupFactory
         Dimension rootSize = root.getSize();
         if (x >= rootLoc.x && y > rootLoc.y
             && (x - rootLoc.x) + contentsSize.width < rootSize.width
-            && (y - rootLoc.y) + contentsSize.height < rootSize.height)      
+            && (y - rootLoc.y) + contentsSize.height < rootSize.height)
           popup = new Popup.LightweightPopup(owner, contents, x, y);
         else
           popup = new Popup.JWindowPopup(owner, contents, x, y);
diff --git a/libjava/classpath/javax/swing/ProgressMonitor.java b/libjava/classpath/javax/swing/ProgressMonitor.java
index b4c3d222349..0d7ab3e2727 100644
--- a/libjava/classpath/javax/swing/ProgressMonitor.java
+++ b/libjava/classpath/javax/swing/ProgressMonitor.java
@@ -64,12 +64,12 @@ import javax.accessibility.AccessibleContext;
  */
 public class ProgressMonitor
 {
-  
+
   /**
    * The accessible content for this component
    */
   protected AccessibleContext accessibleContext;
-  
+
   /**
    * parentComponent
    */
@@ -108,13 +108,13 @@ public class ProgressMonitor
   boolean canceled;
 
   /**
-   * Creates a new ProgressMonitor instance.  This is used to 
-   * monitor a task and pops up a dialog if the task is taking a long time to 
+   * Creates a new ProgressMonitor instance.  This is used to
+   * monitor a task and pops up a dialog if the task is taking a long time to
    * run.
-   * 
-   * @param component The parent component of the progress dialog or 
+   *
+   * @param component The parent component of the progress dialog or
    *                  null.
-   * @param message A constant message object which works in the way it does 
+   * @param message A constant message object which works in the way it does
    *                in {@link JOptionPane}.
    * @param note A string message which can be changed while the operation goes
    *             on.
@@ -192,7 +192,7 @@ public class ProgressMonitor
 
   }
 
-  /** 
+  /**
    * Returns the minimum or start value of the operation.
    *
    * @return Minimum or start value of the operation.
@@ -283,9 +283,9 @@ public class ProgressMonitor
   /**
    * Returns the number of milliseconds to wait before displaying the progress
    * dialog.  The default value is 2000.
-   * 
+   *
    * @return The number of milliseconds.
-   * 
+   *
    * @see #setMillisToPopup(int)
    */
   public int getMillisToPopup()
@@ -296,9 +296,9 @@ public class ProgressMonitor
   /**
    * Sets the number of milliseconds to wait before displaying the progress
    * dialog.
-   * 
+   *
    * @param time  the number of milliseconds.
-   * 
+   *
    * @see #getMillisToPopup()
    */
   public void setMillisToPopup(int time)
@@ -336,7 +336,7 @@ public class ProgressMonitor
       }
   }
 
-  /** 
+  /**
    * Internal method that creates the progress dialog.
    */
   void createDialog()
@@ -408,9 +408,9 @@ public class ProgressMonitor
            first = false;
 
 
-           long expected = (progress - min == 0) ? 
-	     (now - timestamp) * (max - min) : 
-	     (now - timestamp) * (max - min) / (progress - min);
+           long expected = (progress - min == 0) ?
+             (now - timestamp) * (max - min) :
+             (now - timestamp) * (max - min) / (progress - min);
 
            if (expected > millisToPopup)
            {
@@ -428,7 +428,7 @@ public class ProgressMonitor
        {
          // The progress dialog is being displayed. We now calculate
          // whether setting the progress bar to the current progress
-         // value would result in a visual difference. 
+         // value would result in a visual difference.
          int delta = progress - progressBar.getValue();
 
          if ((delta * progressBar.getWidth() / (max - min)) > 0)
@@ -447,10 +447,10 @@ public class ProgressMonitor
       timestamp = now;
     }
   }
-  
+
   /**
    * Gets the accessible context.
-   * 
+   *
    * @return the accessible context.
    */
   public AccessibleContext getAccessibleContext()
diff --git a/libjava/classpath/javax/swing/ProgressMonitorInputStream.java b/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
index 90e721247b1..ba98bf68ee4 100644
--- a/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
+++ b/libjava/classpath/javax/swing/ProgressMonitorInputStream.java
@@ -47,8 +47,8 @@ import java.io.IOException;
 
 /**
  * An input stream with a {@link ProgressMonitor}.
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  * @author  Robert Schuster (robertschuster@fsfe.org)
  * @status updated to 1.2
  * @since 1.2
@@ -68,7 +68,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
 
   /**
    * Creates a new ProgressMonitorInputStream.
-   * 
+   *
    * @param component  the parent component for the progress monitor dialog.
    * @param message  the task description.
    * @param stream  the underlying input stream.
@@ -79,7 +79,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
     super(stream);
 
     int max = 0;
-	
+
     try
       {
         max = stream.available();
@@ -94,7 +94,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
 
   /**
    * Resets the input stream to the point where {@link #mark(int)} was called.
-   * 
+   *
    * @exception IOException TODO
    */
   public void reset() throws IOException
@@ -108,12 +108,12 @@ public class ProgressMonitorInputStream extends FilterInputStream
   }
 
   /**
-   * Reads an unsigned byte from the input stream and returns it as an 
-   * int in the range of 0-255.  Returns -1 if the end of the 
+   * Reads an unsigned byte from the input stream and returns it as an
+   * int in the range of 0-255.  Returns -1 if the end of the
    * stream has been reached.  The progress monitor is updated.
-   * 
+   *
    * @return int
-   * 
+   *
    * @exception IOException if there is a problem reading the stream.
    */
   public int read() throws IOException
@@ -129,14 +129,14 @@ public class ProgressMonitorInputStream extends FilterInputStream
 
   /**
    * Reads bytes from the input stream and stores them in the supplied array,
-   * and updates the progress monitor (or closes it if the end of the stream 
+   * and updates the progress monitor (or closes it if the end of the stream
    * is reached).
-   * 
+   *
    * @param data  the data array for returning bytes read from the stream.
-   * 
+   *
    * @return The number of bytes read, or -1 if there are no more bytes in the
    *         stream.
-   *         
+   *
    * @throws IOException if there is a problem reading bytes from the stream.
    */
   public int read(byte[] data) throws IOException
@@ -159,17 +159,17 @@ public class ProgressMonitorInputStream extends FilterInputStream
   }
 
   /**
-   * Reads up to length bytes from the input stream and stores 
-   * them in the supplied array at the given index, and updates the progress 
+   * Reads up to length bytes from the input stream and stores
+   * them in the supplied array at the given index, and updates the progress
    * monitor (or closes it if the end of the stream is reached).
    *
    * @param data  the data array for returning bytes read from the stream.
-   * @param offset  the offset into the array where the bytes should be written. 
+   * @param offset  the offset into the array where the bytes should be written.
    * @param length  the maximum number of bytes to read from the stream.
-   * 
+   *
    * @return The number of bytes read, or -1 if there are no more bytes in the
    *         stream.
-   *         
+   *
    * @throws IOException if there is a problem reading bytes from the stream.
    */
   public int read(byte[] data, int offset, int length) throws IOException
@@ -192,13 +192,13 @@ public class ProgressMonitorInputStream extends FilterInputStream
   }
 
   /**
-   * Skips the specified number of bytes and updates the 
+   * Skips the specified number of bytes and updates the
    * {@link ProgressMonitor}.
-   * 
+   *
    * @param length the number of bytes to skip.
    *
    * @return The actual number of bytes skipped.
-   * 
+   *
    * @throws IOException if there is a problem skipping bytes in the stream.
    */
   public long skip(long length) throws IOException
@@ -219,7 +219,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
 
   /**
    * Closes the input stream and the associated {@link ProgressMonitor}.
-   * 
+   *
    * @throws IOException if there is a problem closing the input stream.
    */
   public void close() throws IOException
@@ -230,7 +230,7 @@ public class ProgressMonitorInputStream extends FilterInputStream
 
   /**
    * Returns the {@link ProgressMonitor} used by this input stream.
-   * 
+   *
    * @return The progress monitor.
    */
   public ProgressMonitor getProgressMonitor()
diff --git a/libjava/classpath/javax/swing/Renderer.java b/libjava/classpath/javax/swing/Renderer.java
index 9a0e81a9f36..4759c5b60aa 100644
--- a/libjava/classpath/javax/swing/Renderer.java
+++ b/libjava/classpath/javax/swing/Renderer.java
@@ -46,7 +46,7 @@ import java.awt.Component;
  * javax.swing.tree.TreeCellRenderer}.
  *
  * @specnote This interface is not used and exists only for compatibility.
- *           
+ *
  * @author Andrew Selkirk
  */
 public interface Renderer
diff --git a/libjava/classpath/javax/swing/RepaintManager.java b/libjava/classpath/javax/swing/RepaintManager.java
index bb88ebfcdce..23c05a26278 100644
--- a/libjava/classpath/javax/swing/RepaintManager.java
+++ b/libjava/classpath/javax/swing/RepaintManager.java
@@ -115,7 +115,7 @@ public class RepaintManager
       super.dispatch();
     }
   }
-  
+
   /**
    * The current repaint managers, indexed by their ThreadGroups.
    */
@@ -150,7 +150,7 @@ public class RepaintManager
       live = false;
     }
 
-    public synchronized void setLive(boolean b) 
+    public synchronized void setLive(boolean b)
     {
       live = b;
     }
@@ -178,7 +178,7 @@ public class RepaintManager
 
   }
 
-  /** 
+  /**
    * A table storing the dirty regions of components.  The keys of this
    * table are components, the values are rectangles. Each component maps
    * to exactly one rectangle.  When more regions are marked as dirty on a
@@ -212,7 +212,7 @@ public class RepaintManager
    */
   private RepaintWorker repaintWorker;
 
-  /** 
+  /**
    * The set of components which need revalidation, in the "layout" sense.
    * There is no additional information about "what kind of layout" they
    * need (as there is with dirty regions), so it is just a vector rather
@@ -224,11 +224,11 @@ public class RepaintManager
    */
   private ArrayList invalidComponents;
 
-  /** 
+  /**
    * Whether or not double buffering is enabled on this repaint
    * manager. This is merely a hint to clients; the RepaintManager will
    * always return an offscreen buffer when one is requested.
-   * 
+   *
    * @see #isDoubleBufferingEnabled
    * @see #setDoubleBufferingEnabled
    */
@@ -478,7 +478,7 @@ public class RepaintManager
       dirty = new Rectangle();
     return dirty;
   }
-  
+
   /**
    * Mark a component as dirty over its entire bounds.
    *
@@ -605,7 +605,7 @@ public class RepaintManager
    * hierarchy of dirty to find the highest parent that is also
    * marked dirty and merges the dirty regions.
    *
-   * @param dirtyRegions the dirty regions 
+   * @param dirtyRegions the dirty regions
    * @param dirty the component for which to find the repaint root
    * @param roots the list to which new repaint roots get appended
    */
@@ -617,7 +617,7 @@ public class RepaintManager
 
     // This will contain the dirty region in the root coordinate system,
     // possibly clipped by ancestor's bounds.
-    Rectangle originalDirtyRect = (Rectangle) dirtyRegions.get(dirty); 
+    Rectangle originalDirtyRect = (Rectangle) dirtyRegions.get(dirty);
     rectCache.setBounds(originalDirtyRect);
 
     // The bounds of the current component.
@@ -631,7 +631,7 @@ public class RepaintManager
     if (rectCache.isEmpty())
       return;
 
-    // The cumulated offsets. 
+    // The cumulated offsets.
     int dx = 0;
     int dy = 0;
     // The actual offset for the found root.
@@ -652,7 +652,7 @@ public class RepaintManager
         dy += y;
         rectCache.x += x;
         rectCache.y += y;
-        
+
         x = current.getX();
         y = current.getY();
         w = current.getWidth();
@@ -705,8 +705,8 @@ public class RepaintManager
   {
     Component root = SwingUtilities.getWindowAncestor(component);
     Image buffer = (Image) offscreenBuffers.get(root);
-    if (buffer == null 
-        || buffer.getWidth(null) < proposedWidth 
+    if (buffer == null
+        || buffer.getWidth(null) < proposedWidth
         || buffer.getHeight(null) < proposedHeight)
       {
         int width = Math.max(proposedWidth, root.getWidth());
@@ -733,11 +733,11 @@ public class RepaintManager
   {
     Component root = comp;
     while (root != null
-	   && ! (root instanceof Window || root instanceof Applet))
+           && ! (root instanceof Window || root instanceof Applet))
       {
-	x += root.getX();
-	y += root.getY();
-	root = root.getParent();
+        x += root.getX();
+        y += root.getY();
+        root = root.getParent();
       }
 
     if (root != null)
@@ -774,8 +774,8 @@ public class RepaintManager
   {
     Component root = SwingUtilities.getWindowAncestor(comp);
     Image buffer = (Image) offscreenBuffers.get(root);
-    if (buffer == null 
-        || buffer.getWidth(null) < proposedWidth 
+    if (buffer == null
+        || buffer.getWidth(null) < proposedWidth
         || buffer.getHeight(null) < proposedHeight
         || !(buffer instanceof VolatileImage))
       {
@@ -789,7 +789,7 @@ public class RepaintManager
       }
     return buffer;
   }
-  
+
 
   /**
    * Get the value of the {@link #doubleBufferMaximumSize} property.
@@ -838,7 +838,7 @@ public class RepaintManager
   {
     return doubleBufferingEnabled;
   }
-  
+
   public String toString()
   {
     return "RepaintManager";
diff --git a/libjava/classpath/javax/swing/ScrollPaneLayout.java b/libjava/classpath/javax/swing/ScrollPaneLayout.java
index 2a16f26eae9..fa1743bedf2 100644
--- a/libjava/classpath/javax/swing/ScrollPaneLayout.java
+++ b/libjava/classpath/javax/swing/ScrollPaneLayout.java
@@ -50,15 +50,15 @@ import javax.swing.border.Border;
 
 /**
  * ScrollPaneLayout
- * @author	Andrew Selkirk
- * @version	1.0
+ * @author      Andrew Selkirk
+ * @version     1.0
  */
 public class ScrollPaneLayout
   implements LayoutManager, ScrollPaneConstants, Serializable
 {
   private static final long serialVersionUID = -4480022884523193743L;
 
-  public static class UIResource extends ScrollPaneLayout 
+  public static class UIResource extends ScrollPaneLayout
     implements javax.swing.plaf.UIResource
   {
     public UIResource()
@@ -81,10 +81,10 @@ public class ScrollPaneLayout
 
   public ScrollPaneLayout()
   {
-	// Nothing to do here.
+        // Nothing to do here.
   }
 
-  public void syncWithScrollPane(JScrollPane scrollPane) 
+  public void syncWithScrollPane(JScrollPane scrollPane)
   {
     viewport = scrollPane.getViewport();
     rowHead = scrollPane.getRowHeader();
@@ -96,7 +96,7 @@ public class ScrollPaneLayout
     lowerLeft = scrollPane.getCorner(LOWER_LEFT_CORNER);
     lowerRight = scrollPane.getCorner(LOWER_RIGHT_CORNER);
     upperLeft = scrollPane.getCorner(UPPER_LEFT_CORNER);
-    upperRight = scrollPane.getCorner(UPPER_RIGHT_CORNER);    
+    upperRight = scrollPane.getCorner(UPPER_RIGHT_CORNER);
   }
 
   /**
@@ -108,7 +108,7 @@ public class ScrollPaneLayout
    * @return the newComponent
    */
   protected Component addSingletonComponent(Component oldComponent,
-                                            Component newComponent) 
+                                            Component newComponent)
   {
     if (oldComponent != null && oldComponent != newComponent)
       oldComponent.getParent().remove(oldComponent);
@@ -116,7 +116,7 @@ public class ScrollPaneLayout
   }
 
   /**
-   * Add the specified component to the layout. 
+   * Add the specified component to the layout.
    * @param key must be one of VIEWPORT, VERTICAL_SCROLLBAR,
    * HORIZONTAL_SCROLLBAR, ROW_HEADER, COLUMN_HEADER,
    * LOWER_RIGHT_CORNER, LOWER_LEFT_CORNER, UPPER_RIGHT_CORNER,
@@ -124,7 +124,7 @@ public class ScrollPaneLayout
    * @param component the Component to add
    * @throws IllegalArgumentException if key is not as above
    */
-  public void addLayoutComponent(String key, Component component) 
+  public void addLayoutComponent(String key, Component component)
   {
     if (key == VIEWPORT)
       viewport = (JViewport) component;
@@ -148,7 +148,7 @@ public class ScrollPaneLayout
       throw new IllegalArgumentException();
   }
 
-  public void removeLayoutComponent(Component component) 
+  public void removeLayoutComponent(Component component)
   {
     if (component == viewport)
       viewport = null;
@@ -174,7 +174,7 @@ public class ScrollPaneLayout
   {
     return vsbPolicy;
   }
-  
+
   /**
    * Sets the vertical scrollbar policy.
    * @param policy must be one of VERTICAL_SCROLLBAR_AS_NEEDED,
@@ -184,7 +184,7 @@ public class ScrollPaneLayout
    */
   public void setVerticalScrollBarPolicy(int policy)
   {
-    if (policy != VERTICAL_SCROLLBAR_AS_NEEDED && 
+    if (policy != VERTICAL_SCROLLBAR_AS_NEEDED &&
         policy != VERTICAL_SCROLLBAR_NEVER &&
         policy != VERTICAL_SCROLLBAR_ALWAYS)
       throw new IllegalArgumentException("Illegal Scrollbar Policy");
@@ -200,12 +200,12 @@ public class ScrollPaneLayout
    * Sets the horizontal scrollbar policy.
    * @param policy must be one of HORIZONTAL_SCROLLBAR_AS_NEEDED,
    * HORIZONTAL_SCROLLBAR_NEVER, HORIZONTAL_SCROLLBAR_ALWAYS.
-   * @throws IllegalArgumentException if policy is not one of the valid 
+   * @throws IllegalArgumentException if policy is not one of the valid
    * JScrollbar policies.
    */
   public void setHorizontalScrollBarPolicy(int policy)
   {
-    if (policy != HORIZONTAL_SCROLLBAR_AS_NEEDED && 
+    if (policy != HORIZONTAL_SCROLLBAR_AS_NEEDED &&
         policy != HORIZONTAL_SCROLLBAR_NEVER &&
         policy != HORIZONTAL_SCROLLBAR_ALWAYS)
       throw new IllegalArgumentException("Illegal Scrollbar Policy");
@@ -256,7 +256,7 @@ public class ScrollPaneLayout
     return null;
   }
 
-  public Dimension preferredLayoutSize(Container parent) 
+  public Dimension preferredLayoutSize(Container parent)
   {
     // Sun's implementation simply throws a ClassCastException if
     // parent is no JScrollPane, so do we.
@@ -343,7 +343,7 @@ public class ScrollPaneLayout
    *     | c3 |    h scrollbar     | c4 |
    *     +----+--------------------+----+ y4
    *    x1   x2                   x3   x4
-   *   
+   *
    */
   public void layoutContainer(Container parent)
   {
@@ -352,11 +352,11 @@ public class ScrollPaneLayout
     JScrollPane sc = (JScrollPane) parent;
     JViewport viewport = sc.getViewport();
     Component view = viewport.getView();
-    
+
     // If there is no view in the viewport, there is no work to be done.
     if (view == null)
       return;
-    
+
     Dimension viewSize = viewport.getView().getPreferredSize();
 
     int x1 = 0, x2 = 0, x3 = 0, x4 = 0;
@@ -388,43 +388,43 @@ public class ScrollPaneLayout
 
     int vsbPolicy = sc.getVerticalScrollBarPolicy();
     int hsbPolicy = sc.getHorizontalScrollBarPolicy();
-    
+
     int vsWidth = 0;
     int hsHeight = 0;
 
-    boolean showVsb = 
+    boolean showVsb =
       (vsb != null)
       && ((vsbPolicy == VERTICAL_SCROLLBAR_ALWAYS)
-          || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED 
+          || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
               && viewSize.height > (y4 - y2)));
-    
+
     if (showVsb)
       vsWidth = vsb.getPreferredSize().width;
-    
+
     // The horizontal scroll bar may become necessary if the vertical scroll
     // bar appears, reducing the space, left for the component.
-    
-    boolean showHsb = 
+
+    boolean showHsb =
       (hsb != null)
       && ((hsbPolicy == HORIZONTAL_SCROLLBAR_ALWAYS)
-          || (hsbPolicy == HORIZONTAL_SCROLLBAR_AS_NEEDED 
+          || (hsbPolicy == HORIZONTAL_SCROLLBAR_AS_NEEDED
               && viewSize.width > (x4 - x2 - vsWidth)));
-    
+
     if (showHsb)
       hsHeight = hsb.getPreferredSize().height;
-    
+
     // If the horizontal scroll bar appears, and the vertical scroll bar
     // was not necessary assuming that there is no horizontal scroll bar,
     // the vertical scroll bar may become necessary because the horizontal
     // scroll bar reduces the vertical space for the component.
     if (!showVsb)
       {
-        showVsb = 
+        showVsb =
           (vsb != null)
           && ((vsbPolicy == VERTICAL_SCROLLBAR_ALWAYS)
-              || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED 
+              || (vsbPolicy == VERTICAL_SCROLLBAR_AS_NEEDED
                   && viewSize.height > (y4 - y2)));
-    
+
         if (showVsb)
           vsWidth = vsb.getPreferredSize().width;
       }
@@ -482,7 +482,7 @@ public class ScrollPaneLayout
    * @deprecated As of Swing 1.1 replaced by
    *     {@link javax.swing.JScrollPane#getViewportBorderBounds}.
    */
-  public Rectangle getViewportBorderBounds(JScrollPane scrollPane) 
+  public Rectangle getViewportBorderBounds(JScrollPane scrollPane)
   {
     return null;
   }
diff --git a/libjava/classpath/javax/swing/Scrollable.java b/libjava/classpath/javax/swing/Scrollable.java
index 396d530ede4..26fae2429aa 100644
--- a/libjava/classpath/javax/swing/Scrollable.java
+++ b/libjava/classpath/javax/swing/Scrollable.java
@@ -1,4 +1,4 @@
-/* Scrollable.java -- 
+/* Scrollable.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -54,14 +54,14 @@ public interface Scrollable
    * Return the preferred scrolling amount (in pixels) for the given
    * scrolling direction and orientation when scrolling in small amounts
    * like table lines.
-   * 
-   * @param visibleRect the currently visible part of the component. 
+   *
+   * @param visibleRect the currently visible part of the component.
    * @param orientation the scrolling orientation
    * @param direction the scrolling direction (negative - up, positive -down).
-   * The values greater than one means that more mouse wheel or similar 
+   * The values greater than one means that more mouse wheel or similar
    * events were generated, and hence it is better to scroll the longer
    * distance.
-   * 
+   *
    * @return the preferred scrolling distance, negative if up or left.
    */
   int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
@@ -71,15 +71,15 @@ public interface Scrollable
    * Return the preferred scrolling amount (in pixels) for the given
    * scrolling direction and orientation when scrolling in large amounts
    * (pages).
-   * 
-   * @param visibleRect the currently visible part of the component. 
+   *
+   * @param visibleRect the currently visible part of the component.
    * @param orientation the scrolling orientation
    * @param direction the scrolling direction (negative - up, positive -down).
-   * The values greater than one means that more mouse wheel or similar 
+   * The values greater than one means that more mouse wheel or similar
    * events were generated, and hence it is better to scroll the longer
    * distance.
-   * 
-   * @return the preferred scrolling distance, negative if up or left. 
+   *
+   * @return the preferred scrolling distance, negative if up or left.
    */
   int getScrollableBlockIncrement(Rectangle visibleRect, int orientation,
                                   int direction);
@@ -89,7 +89,7 @@ public interface Scrollable
    * view, where it is displayed, width (for instance, the text area with
    * the word wrap). In such case, the horizontal scrolling should not be
    * performed.
-   * 
+   *
    * @return true is no horizontal scrolling is assumed, faster otherwise.
    */
   boolean getScrollableTracksViewportWidth();
@@ -98,7 +98,7 @@ public interface Scrollable
    * Return true if the height of the scrollable is always equal to the view,
    * where it is displayed, height.In such case, the vertical scrolling should
    * not be performed.
-   * 
+   *
    * @return true is no horizontal scrolling is assumed, faster otherwise.
    */
   boolean getScrollableTracksViewportHeight();
diff --git a/libjava/classpath/javax/swing/SingleSelectionModel.java b/libjava/classpath/javax/swing/SingleSelectionModel.java
index 9f33e33faaa..2a76ff389bb 100644
--- a/libjava/classpath/javax/swing/SingleSelectionModel.java
+++ b/libjava/classpath/javax/swing/SingleSelectionModel.java
@@ -51,19 +51,19 @@ public interface SingleSelectionModel
 {
   /**
    * Returns the selected index or -1 if there is no selection.
-   * 
+   *
    * @return The selected index.
-   * 
+   *
    * @see #setSelectedIndex(int)
    */
   int getSelectedIndex();
 
   /**
-   * Sets the selected index and, if this is different to the previous 
+   * Sets the selected index and, if this is different to the previous
    * selection, sends a {@link ChangeEvent} to all registered listeners.
-   * 
+   *
    * @param index  the index (use -1 to represent no selection).
-   * 
+   *
    * @see #getSelectedIndex()
    * @see #clearSelection
    */
@@ -72,14 +72,14 @@ public interface SingleSelectionModel
   /**
    * Clears the selection by setting the selected index to -1 and
    * sends a {@link ChangeEvent} to all registered listeners.  If the selected
-   * index is already -1, this method does nothing.  
+   * index is already -1, this method does nothing.
    */
   void clearSelection();
 
   /**
    * Returns true if there is a selection, and false
-   * otherwise.  
-   * 
+   * otherwise.
+   *
    * @return A boolean.
    */
   boolean isSelected();
diff --git a/libjava/classpath/javax/swing/SizeRequirements.java b/libjava/classpath/javax/swing/SizeRequirements.java
index b9b5c322379..1ee0e285c3e 100644
--- a/libjava/classpath/javax/swing/SizeRequirements.java
+++ b/libjava/classpath/javax/swing/SizeRequirements.java
@@ -386,7 +386,7 @@ public class SizeRequirements implements Serializable
    *
    * The components are tiled in the forward direction, beginning with
    * an offset of 0.
-   * 
+   *
    * @param allocated the amount of allocated space
    * @param total the total size requirements of the components
    * @param children the size requirement of each component
diff --git a/libjava/classpath/javax/swing/SizeSequence.java b/libjava/classpath/javax/swing/SizeSequence.java
index cb6c8bc25df..69c7366be42 100644
--- a/libjava/classpath/javax/swing/SizeSequence.java
+++ b/libjava/classpath/javax/swing/SizeSequence.java
@@ -40,17 +40,17 @@ package javax.swing;
 import java.util.Arrays;
 
 /**
- * A sequence of values that represent the dimensions (widths or heights) of 
+ * A sequence of values that represent the dimensions (widths or heights) of
  * some collection of items (for example, the widths of the columns in a table).
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
 public class SizeSequence
 {
   // TODO: Sun's API specification for this class contains an implementation
   // note regarding the encoding for the element sizes.  We currently use the
   // simple size encoding but we should look at improving this.
-  
+
   /** Storage for the element sizes. */
   private int[] sizes;
 
@@ -63,9 +63,9 @@ public class SizeSequence
   }
 
   /**
-   * Creates a new SizeSequence instance with the specified number 
+   * Creates a new SizeSequence instance with the specified number
    * of elements, each having a size of 0.
-   * 
+   *
    * @param numEntries  the number of elements.
    */
   public SizeSequence(int numEntries)
@@ -76,7 +76,7 @@ public class SizeSequence
   /**
    * Creates a new SizeSequence instance with the specified number
    * of elements all having the same size (value).
-   * 
+   *
    * @param numEntries  the number of elements.
    * @param value  the value for each element.
    */
@@ -87,9 +87,9 @@ public class SizeSequence
   }
 
   /**
-   * Creates a new SizeSequence instance using the specified 
+   * Creates a new SizeSequence instance using the specified
    * element sizes.
-   * 
+   *
    * @param sizes  the element sizes (null not permitted).
    */
   public SizeSequence(int[] sizes)
@@ -99,7 +99,7 @@ public class SizeSequence
 
   /**
    * Sets the size of the element at the specified index.
-   * 
+   *
    * @param index  the index.
    * @param size  the size.
    */
@@ -111,16 +111,16 @@ public class SizeSequence
 
   /**
    * Returns the index of the element that contains the specified position.
-   * 
+   *
    * @param position  the position.
-   * 
+   *
    * @return The index of the element that contains the specified position.
    */
   public int getIndex(int position)
   {
     int i = 0;
-    int runningTotal = 0;  
-    while (i < sizes.length && position >= runningTotal + sizes[i]) 
+    int runningTotal = 0;
+    while (i < sizes.length && position >= runningTotal + sizes[i])
       {
         runningTotal += sizes[i];
         i++;
@@ -131,9 +131,9 @@ public class SizeSequence
   /**
    * Returns the size of the specified element, or 0 if the element index is
    * outside the defined range.
-   * 
+   *
    * @param index  the element index.
-   * 
+   *
    * @return The size of the specified element, or 0 if the element index is
    *     outside the defined range.
    */
@@ -146,7 +146,7 @@ public class SizeSequence
 
   /**
    * Sets the sizes for the elements in the sequence.
-   * 
+   *
    * @param sizes  the element sizes (null not permitted).
    */
   public void setSizes(int[] sizes)
@@ -156,7 +156,7 @@ public class SizeSequence
 
   /**
    * Returns an array containing the sizes for all the elements in the sequence.
-   * 
+   *
    * @return The element sizes.
    */
   public int[] getSizes()
@@ -166,9 +166,9 @@ public class SizeSequence
 
   /**
    * Returns the position of the specified element.
-   * 
+   *
    * @param index  the element index.
-   * 
+   *
    * @return The position.
    */
   public int getPosition(int index)
@@ -186,7 +186,7 @@ public class SizeSequence
    * Inserts new entries into the sequence at the start position.
    * There are length new entries each having the specified
    * value.
-   * 
+   *
    * @param start  the start element.
    * @param length  the number of elements to insert.
    * @param value  the size for each of the new elements.
@@ -197,7 +197,7 @@ public class SizeSequence
     System.arraycopy(sizes, 0, newSizes, 0, start);
     for (int i = start; i < start + length; i++)
       newSizes[i] = value;
-    System.arraycopy(sizes, start, newSizes, start + length, 
+    System.arraycopy(sizes, start, newSizes, start + length,
                      sizes.length - start);
     sizes = newSizes;
   }
@@ -205,7 +205,7 @@ public class SizeSequence
   /**
    * Removes the element(s) at index start (the number of elements
    * removed is length).
-   * 
+   *
    * @param start  the index of the first element to remove.
    * @param length  the number of elements to remove.
    */
@@ -218,7 +218,7 @@ public class SizeSequence
 
     int[] newSizes = new int[sizes.length - length];
     System.arraycopy(sizes, 0, newSizes, 0, start);
-    System.arraycopy(sizes, start + length, newSizes, start, 
+    System.arraycopy(sizes, start + length, newSizes, start,
                      sizes.length - start - length);
     sizes = newSizes;
   }
diff --git a/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java b/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
index d14ee1d30a4..3c07dbd93ae 100644
--- a/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
+++ b/libjava/classpath/javax/swing/SortingFocusTraversalPolicy.java
@@ -47,10 +47,10 @@ import java.util.TreeSet;
 /**
  * @author Graydon Hoare
  * @author Michael Koch
- * 
+ *
  * @since 1.4
  */
-public class SortingFocusTraversalPolicy 
+public class SortingFocusTraversalPolicy
   extends InternalFrameFocusTraversalPolicy
 {
   /**
@@ -75,7 +75,7 @@ public class SortingFocusTraversalPolicy
    * @see #getImplicitDownCycleTraversal()
    */
   boolean implicitDownCycleTraversal = true;
-  
+
   /**
    * Creates a new SortingFocusTraversalPolicy with no
    * comparator set.
@@ -97,7 +97,7 @@ public class SortingFocusTraversalPolicy
   }
 
   /**
-   * Decide whether a component is an acceptable focus owner. 
+   * Decide whether a component is an acceptable focus owner.
    *
    * @param comp The component which is a candidate for focus ownership.
    *
@@ -107,16 +107,16 @@ public class SortingFocusTraversalPolicy
   protected boolean accept(Component comp)
   {
     return (comp.isVisible()
-	    && comp.isDisplayable()
-	    && comp.isEnabled()
-	    && comp.isFocusable());
+            && comp.isDisplayable()
+            && comp.isEnabled()
+            && comp.isFocusable());
   }
 
   /**
    * Get the current value of the {@link #comparator} property.
    *
    * @return the current value of the property
-   * 
+   *
    * @see #setComparator
    */
   protected Comparator getComparator()
@@ -128,7 +128,7 @@ public class SortingFocusTraversalPolicy
    * Set the current value of the {@link #comparator} property.
    *
    * @param comparator the new value of the property
-   * 
+   *
    * @see #getComparator
    */
   protected void setComparator(Comparator comparator)
@@ -139,11 +139,11 @@ public class SortingFocusTraversalPolicy
   private TreeSet getSortedCycle(Container root, TreeSet set)
   {
     if (set == null)
-      set = (getComparator() == null 
+      set = (getComparator() == null
              ? new TreeSet()
              : new TreeSet(getComparator()));
-    
-    if (root != null) 
+
+    if (root != null)
       {
         Component[] comps = root.getComponents();
         for (int i = 0; i < comps.length; ++i)
@@ -168,23 +168,23 @@ public class SortingFocusTraversalPolicy
    * comp is a focus cycle root, an "implicit DownCycle"
    * occurs and the method returns the
    * getDefaultComponent(comp).
-   * 
+   *
    * @param root the focus cycle root to search for a successor within
    * @param comp the component to search for the successor of
    *
    * @return the component following the specified component under
    * the specified root, or null if no such component is found
-   * 
+   *
    * @throws IllegalArgumentException if either argument is null, or
    * if the root is not a focus cycle root of the component
    */
-  public Component getComponentAfter(Container root, 
+  public Component getComponentAfter(Container root,
                                      Component comp)
   {
     if (comp == null || root == null || !comp.isFocusCycleRoot(root))
       throw new IllegalArgumentException();
 
-    if (getImplicitDownCycleTraversal() 
+    if (getImplicitDownCycleTraversal()
         && comp instanceof Container
         && ((Container)comp).isFocusCycleRoot())
       {
@@ -212,17 +212,17 @@ public class SortingFocusTraversalPolicy
    * focus cycle, relative to the order imposed by {@link
    * #comparator}. Candidate components are only considered if they are
    * accepted by the {@link #accept} method.
-   * 
+   *
    * @param root the focus cycle root to search for a predecessor within
    * @param comp the component to search for the predecessor of
    *
    * @return the component preceding the specified component under the
    * specified root, or null if no such component is found
-   * 
+   *
    * @throws IllegalArgumentException if either argument is null, or
    * if the root is not a focus cycle root of the component
    */
-  public Component getComponentBefore(Container root, 
+  public Component getComponentBefore(Container root,
                                       Component comp)
   {
     if (comp == null || root == null || !comp.isFocusCycleRoot(root))
@@ -256,7 +256,7 @@ public class SortingFocusTraversalPolicy
     return getFirstComponent(root);
   }
 
-  /** 
+  /**
    * Return the first focusable component of the focus cycle root
    * comp under the ordering imposed by the {@link
    * #comparator} property. Candidate components are only considered if
@@ -279,8 +279,8 @@ public class SortingFocusTraversalPolicy
       return (Component) i.next();
     return null;
   }
-  
-  /** 
+
+  /**
    * Return the last focusable component of the focus cycle root
    * comp under the ordering imposed by the {@link
    * #comparator} property. Candidate components are only considered if
@@ -310,7 +310,7 @@ public class SortingFocusTraversalPolicy
    * property.
    *
    * @return the current value of the property
-   * 
+   *
    * @see #setImplicitDownCycleTraversal
    */
   public boolean getImplicitDownCycleTraversal()
@@ -323,7 +323,7 @@ public class SortingFocusTraversalPolicy
    * property.
    *
    * @param down the new value of the property
-   * 
+   *
    * @see #getImplicitDownCycleTraversal
    */
   public void setImplicitDownCycleTraversal(boolean down)
diff --git a/libjava/classpath/javax/swing/SpinnerDateModel.java b/libjava/classpath/javax/swing/SpinnerDateModel.java
index e5ff76f1adf..f0e9d1ec4ab 100644
--- a/libjava/classpath/javax/swing/SpinnerDateModel.java
+++ b/libjava/classpath/javax/swing/SpinnerDateModel.java
@@ -45,8 +45,8 @@ import java.util.Date;
 import javax.swing.event.ChangeEvent;
 
 /**
- * A date model used by the {@link JSpinner} component.  This implements a 
- * spinner model for dates, rotating a calendar field such as  month, year, 
+ * A date model used by the {@link JSpinner} component.  This implements a
+ * spinner model for dates, rotating a calendar field such as  month, year,
  * day, week, hour, minute.
  *
  * @author Sven de Marothy
@@ -57,21 +57,21 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 {
   /** The current date. */
   private Calendar date;
-  
-  /** 
-   * A constraint on the start or earliest permitted date (null 
-   * for no minimum). 
+
+  /**
+   * A constraint on the start or earliest permitted date (null
+   * for no minimum).
    */
   private Comparable start;
 
-  /** 
-   * A constraint on the end or latest permitted date (null for no 
-   * maximum). 
+  /**
+   * A constraint on the end or latest permitted date (null for no
+   * maximum).
    */
   private Comparable end;
-  
+
   /**
-   * The calendar field used to calculate the previous or next date. 
+   * The calendar field used to calculate the previous or next date.
    */
   private int calendarField;
 
@@ -82,7 +82,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 
   /**
    * Constructs a SpinnerDateModel using the current date,
-   * no start or end limit, and {@link Calendar#DAY_OF_MONTH} as the calendar 
+   * no start or end limit, and {@link Calendar#DAY_OF_MONTH} as the calendar
    * field.
    */
   public SpinnerDateModel()
@@ -92,15 +92,15 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 
   /**
    * Constructs a SpinnerDateModel with the specified value, lower
-   * and upper bounds, and which spins the specified calendar field. 
+   * and upper bounds, and which spins the specified calendar field.
    * 
                      
    * The start and end limits must have a
    * compareTo method that supports instances of {@link Date}, but
    * do not themselves need to be instances of {@link Date} (although typically
    * they are).
-   * 
+   *
    * @param value  the initial value/date (null not permitted).
-   * @param start  a constraint that specifies the earliest permitted date 
+   * @param start  a constraint that specifies the earliest permitted date
    *     value, or null for no lower limit.
    * @param end  a constraint that specifies the latest permitted date value,
    *     or null for no upper limit.
@@ -110,7 +110,7 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   public SpinnerDateModel(Date value, Comparable start, Comparable end,
                           int calendarField)
   {
-    if (value == null) 
+    if (value == null)
       throw new IllegalArgumentException("Null 'value' argument.");
     if (start != null && start.compareTo(value) > 0)
       throw new IllegalArgumentException("Require value on or after start.");
@@ -124,9 +124,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Returns the {@link Calendar} field used to calculate the previous and 
+   * Returns the {@link Calendar} field used to calculate the previous and
    * next dates in the sequence.
-   * 
+   *
    * @return The date field code.
    */
   public int getCalendarField()
@@ -136,9 +136,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 
   /**
    * Returns the current date/time.
-   * 
+   *
    * @return The current date/time (never null).
-   * 
+   *
    * @see #getValue()
    */
   public Date getDate()
@@ -147,11 +147,11 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Returns the lower limit on the date/time value, or null if 
+   * Returns the lower limit on the date/time value, or null if
    * there is no minimum date/time.
-   * 
+   *
    * @return The lower limit.
-   * 
+   *
    * @see #setStart(Comparable)
    */
   public Comparable getStart()
@@ -160,11 +160,11 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Returns the upper limit on the date/time value, or null if 
+   * Returns the upper limit on the date/time value, or null if
    * there is no maximum date/time.
-   * 
+   *
    * @return The upper limit.
-   * 
+   *
    * @see #setEnd(Comparable)
    */
   public Comparable getEnd()
@@ -173,9 +173,9 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Returns the current date in the sequence (this method returns the same as 
+   * Returns the current date in the sequence (this method returns the same as
    * {@link #getDate()}).
-   * 
+   *
    * @return The current date (never null).
    */
   public Object getValue()
@@ -185,12 +185,12 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 
   /**
    * Returns the next date in the sequence, or null if the
-   * next date is past the upper limit (if one is specified).  The current date 
+   * next date is past the upper limit (if one is specified).  The current date
    * is not changed.
-   * 
+   *
    * @return The next date, or null if the current value is
    *         the latest date represented by the model.
-   *         
+   *
    * @see #getEnd()
    */
   public Object getNextValue()
@@ -207,12 +207,12 @@ public class SpinnerDateModel extends AbstractSpinnerModel
 
   /**
    * Returns the previous date in the sequence, or null if the
-   * previous date is prior to the lower limit (if one is specified).  The 
+   * previous date is prior to the lower limit (if one is specified).  The
    * current date is not changed.
-   * 
+   *
    * @return The previous date, or null if the current value is
    *         the earliest date represented by the model.
-   *         
+   *
    * @see #getStart()
    */
   public Object getPreviousValue()
@@ -228,13 +228,13 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Sets the date field to change when calculating the next and previous 
-   * values. It must be a valid {@link Calendar} field, excluding 
+   * Sets the date field to change when calculating the next and previous
+   * values. It must be a valid {@link Calendar} field, excluding
    * {@link Calendar#ZONE_OFFSET} and {@link Calendar#DST_OFFSET}.
-   * 
+   *
    * @param calendarField  the calendar field to set.
-   * 
-   * @throws IllegalArgumentException if calendarField is not 
+   *
+   * @throws IllegalArgumentException if calendarField is not
    *         a valid code.
    */
   public void setCalendarField(int calendarField)
@@ -252,15 +252,15 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Sets the lower limit for the date/time value and, if the new limit is 
-   * different to the old limit, sends a {@link ChangeEvent} to all registered 
-   * listeners.  A null value is interpreted as "no lower limit".  
-   * No check is made to ensure that the current date/time is on or after the 
-   * new lower limit - the caller is responsible for ensuring that this 
+   * Sets the lower limit for the date/time value and, if the new limit is
+   * different to the old limit, sends a {@link ChangeEvent} to all registered
+   * listeners.  A null value is interpreted as "no lower limit".
+   * No check is made to ensure that the current date/time is on or after the
+   * new lower limit - the caller is responsible for ensuring that this
    * relationship holds.  In addition, the caller should ensure that
    * start is {@link Serializable}.
-   * 
-   * @param start  the new lower limit for the date/time value 
+   *
+   * @param start  the new lower limit for the date/time value
    *     (null permitted).
    */
   public void setStart(Comparable start)
@@ -273,14 +273,14 @@ public class SpinnerDateModel extends AbstractSpinnerModel
   }
 
   /**
-   * Sets the upper limit for the date/time value and, if the new limit is 
-   * different to the old limit, sends a {@link ChangeEvent} to all registered 
-   * listeners.  A null value is interpreted as "no upper limit".  
-   * No check is made to ensure that the current date/time is on or before the 
-   * new upper limit - the caller is responsible for ensuring that this 
+   * Sets the upper limit for the date/time value and, if the new limit is
+   * different to the old limit, sends a {@link ChangeEvent} to all registered
+   * listeners.  A null value is interpreted as "no upper limit".
+   * No check is made to ensure that the current date/time is on or before the
+   * new upper limit - the caller is responsible for ensuring that this
    * relationship holds.  In addition, the caller should ensure that
    * end is {@link Serializable}.
-   * 
+   *
    * @param end  the new upper limit for the date/time value (null
    *     permitted).
    */
@@ -297,18 +297,18 @@ public class SpinnerDateModel extends AbstractSpinnerModel
    * Sets the current date and, if the new value is different to the old
    * value, sends a {@link ChangeEvent} to all registered listeners.
    *
-   * @param value  the new date (null not permitted, must be an 
+   * @param value  the new date (null not permitted, must be an
    *               instance of Date).
-   *               
-   * @throws IllegalArgumentException if value is not an instance 
+   *
+   * @throws IllegalArgumentException if value is not an instance
    *         of Date.
    */
   public void setValue(Object value)
   {
     if (! (value instanceof Date) || value == null)
       throw new IllegalArgumentException("Value not a date.");
-    
-    if (!date.getTime().equals(value)) 
+
+    if (!date.getTime().equals(value))
       {
         date.setTime((Date) value);
         fireStateChanged();
diff --git a/libjava/classpath/javax/swing/SpinnerListModel.java b/libjava/classpath/javax/swing/SpinnerListModel.java
index 52ac360e924..de4926afdad 100644
--- a/libjava/classpath/javax/swing/SpinnerListModel.java
+++ b/libjava/classpath/javax/swing/SpinnerListModel.java
@@ -111,13 +111,13 @@ public class SpinnerListModel extends AbstractSpinnerModel
    * to getValue() returns the same as list.get(0).
    *
    * @param list The list to use for this model.
-   * 
+   *
    * @throws IllegalArgumentException if the list is null or contains no
    *         elements.
    *
    * @see SpinnerListModel#getNextValue()
    * @see SpinnerListModel#getValue()
-   */ 
+   */
   public SpinnerListModel(List list)
   {
     // Retain a reference to the valid list.
@@ -151,9 +151,9 @@ public class SpinnerListModel extends AbstractSpinnerModel
         throw new IllegalArgumentException("The supplied array was invalid.");
       }
 
-	// Retain a reference to a wrapper around the valid array. 
-	// The array, in list form, will be tested again here, but we can't really
-	// avoid this -- a null value to Arrays.asList will throw a
+        // Retain a reference to a wrapper around the valid array.
+        // The array, in list form, will be tested again here, but we can't really
+        // avoid this -- a null value to Arrays.asList will throw a
     // NullPointerException.
     setList(Arrays.asList(array));
   }
@@ -167,7 +167,7 @@ public class SpinnerListModel extends AbstractSpinnerModel
   {
     return list;
   }
-    
+
   /**
    * Returns the next value from the list, which is the same as the element
    * stored at the current index + 1.  Null is returned if there are no more
@@ -200,10 +200,10 @@ public class SpinnerListModel extends AbstractSpinnerModel
   public Object getPreviousValue()
   {
     // Check for a previous value.
-    if (index > 0) 
+    if (index > 0)
       // Return the element at the previous position.
       return list.get(index - 1);
-	else
+        else
       // Return null as this is the start of the list.
       return null;
     }
@@ -266,7 +266,7 @@ public class SpinnerListModel extends AbstractSpinnerModel
    * the backing list.  Listeners are notified of this change.
    * Following the change, getNextValue() and
    * getPreviousValue() return the objects following
-   * and prior to the supplied value, respectively. 
+   * and prior to the supplied value, respectively.
    *
    * @param value The requested new value of the list.
    *
diff --git a/libjava/classpath/javax/swing/SpinnerModel.java b/libjava/classpath/javax/swing/SpinnerModel.java
index 4ad962bbf79..6cab34da2e0 100644
--- a/libjava/classpath/javax/swing/SpinnerModel.java
+++ b/libjava/classpath/javax/swing/SpinnerModel.java
@@ -1,4 +1,4 @@
-/* SpinnerModel.java -- 
+/* SpinnerModel.java --
    Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -107,5 +107,5 @@ public interface SpinnerModel
    * @param listener The listener to remove.
    */
   void removeChangeListener(ChangeListener listener);
-    
+
 }
diff --git a/libjava/classpath/javax/swing/SpinnerNumberModel.java b/libjava/classpath/javax/swing/SpinnerNumberModel.java
index 1abbbe377be..af3fea65f31 100644
--- a/libjava/classpath/javax/swing/SpinnerNumberModel.java
+++ b/libjava/classpath/javax/swing/SpinnerNumberModel.java
@@ -83,7 +83,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
    * @param minimum the minimum value
    * @param maximum the maximum value
    * @param stepSize the step size
-   * @throws IllegalArgumentException if minimum <= value <= maximum does 
+   * @throws IllegalArgumentException if minimum <= value <= maximum does
    *         not hold.
    */
   public SpinnerNumberModel(double value, double minimum, double maximum,
@@ -100,7 +100,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
    * @param minimum the minimum value
    * @param maximum the maximum value
    * @param stepSize the step size
-   * @throws IllegalArgumentException if minimum <= value <= maximum does 
+   * @throws IllegalArgumentException if minimum <= value <= maximum does
    *         not hold.
    */
   public SpinnerNumberModel(int value, int minimum, int maximum, int stepSize)
@@ -111,7 +111,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Creates a SpinnerNumberModel with the given attributes.  The
-   * caller should ensure that both minimum and 
+   * caller should ensure that both minimum and
    * maximum are serializable.
    *
    * @param value the initial value (null not permitted).
@@ -121,9 +121,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
    *
    * @throws IllegalArgumentException if minimum <= value <= maximum
    *         does not hold
-   * @throws IllegalArgumentException if value is 
+   * @throws IllegalArgumentException if value is
    *         null.
-   * @throws IllegalArgumentException if stepSize is 
+   * @throws IllegalArgumentException if stepSize is
    *         null.
    */
   public SpinnerNumberModel(Number value, Comparable minimum,
@@ -165,7 +165,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
     if (! (value instanceof Number))
       throw new IllegalArgumentException("value must be a Number");
 
-    if (!this.value.equals(value)) 
+    if (!this.value.equals(value))
       {
         this.value = (Number) value;
         fireStateChanged();
@@ -177,7 +177,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
    * {@link Number}.
    *
    * @return The current value.
-   * 
+   *
    * @see #getNumber()
    */
   public Object getValue()
@@ -187,10 +187,10 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Returns the next value, or null if adding the step size to
-   * the current value results in a value greater than the maximum value.  
+   * the current value results in a value greater than the maximum value.
    * The current value is not changed.
    *
-   * @return The next value, or null if the current value is the 
+   * @return The next value, or null if the current value is the
    *         maximum value represented by this model.
    */
   public Object getNextValue()
@@ -209,11 +209,11 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
       num = new Short((short) (value.shortValue() + stepSize.shortValue()));
     else
       num = new Byte((byte) (value.byteValue() + stepSize.byteValue()));
-    
+
     // check upper bound if set
     if ((maximum != null) && maximum.compareTo(num) < 0)
       num = null;
-    
+
     return num;
   }
 
@@ -241,7 +241,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
       num = new Short((short) (value.shortValue() - stepSize.shortValue()));
     else
       num = new Byte((byte) (value.byteValue() - stepSize.byteValue()));
-    
+
     // check lower bound if set
     if ((minimum != null) && minimum.compareTo(num) > 0)
       num = null;
@@ -261,9 +261,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Returns the minimum value, or null if there is no minimum.
-   * 
+   *
    * @return The minimum value.
-   * 
+   *
    * @see #setMinimum(Comparable)
    */
   public Comparable getMinimum()
@@ -273,15 +273,15 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Sets the minimum value and, if the new value is different to the old
-   * value, sends a {@link ChangeEvent} to all registered listeners.  A 
+   * value, sends a {@link ChangeEvent} to all registered listeners.  A
    * null value is interpreted as "no minimum value".  No check
-   * is made to ensure that the new minimum is less than or equal to the 
-   * current value, the caller is responsible for ensuring that this 
+   * is made to ensure that the new minimum is less than or equal to the
+   * current value, the caller is responsible for ensuring that this
    * relationship holds.  In addition, the caller should ensure that
    * newMinimum is {@link Serializable}.
-   * 
+   *
    * @param newMinimum  the new minimum value (null permitted).
-   * 
+   *
    * @see #getMinimum()
    */
   public void setMinimum(Comparable newMinimum)
@@ -295,9 +295,9 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Returns the maximum value, or null if there is no maximum.
-   * 
+   *
    * @return The maximum value.
-   * 
+   *
    * @see #getMinimum()
    * @see #setMaximum(Comparable)
    */
@@ -308,15 +308,15 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Sets the maximum value and, if the new value is different to the old
-   * value, sends a {@link ChangeEvent} to all registered listeners.  A 
+   * value, sends a {@link ChangeEvent} to all registered listeners.  A
    * null value is interpreted as "no maximum value".  No check
-   * is made to ensure that the new maximum is greater than or equal to the 
-   * current value, the caller is responsible for ensuring that this 
+   * is made to ensure that the new maximum is greater than or equal to the
+   * current value, the caller is responsible for ensuring that this
    * relationship holds. In addition, the caller should ensure that
    * newMaximum is {@link Serializable}.
-   * 
+   *
    * @param newMaximum  the new maximum (null permitted).
-   * 
+   *
    * @see #getMaximum()
    */
   public void setMaximum(Comparable newMaximum)
@@ -330,7 +330,7 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
 
   /**
    * Returns the step size.
-   * 
+   *
    * @return The step size (never null).
    */
   public Number getStepSize()
@@ -341,10 +341,10 @@ public class SpinnerNumberModel extends AbstractSpinnerModel
   /**
    * Sets the step size and, if the new step size is different to the old
    * step size, sends a {@link ChangeEvent} to all registered listeners.
-   * 
+   *
    * @param newStepSize  the new step size (null not permitted).
-   * 
-   * @throws IllegalArgumentException if newStepSize is 
+   *
+   * @throws IllegalArgumentException if newStepSize is
    *         null.
    */
   public void setStepSize(Number newStepSize)
diff --git a/libjava/classpath/javax/swing/Spring.java b/libjava/classpath/javax/swing/Spring.java
index 477525960a2..4cc06e539b4 100644
--- a/libjava/classpath/javax/swing/Spring.java
+++ b/libjava/classpath/javax/swing/Spring.java
@@ -1,4 +1,4 @@
-/* Spring.java -- 
+/* Spring.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -156,12 +156,12 @@ public abstract class Spring
    */
   public abstract void setValue(int value);
 
-  private int getShrinkRange() 
+  private int getShrinkRange()
   {
     return (getPreferredValue() - getMinimumValue());
   }
 
-  private int getExpandRange() 
+  private int getExpandRange()
   {
     return (getMaximumValue() - getPreferredValue());
   }
@@ -176,7 +176,7 @@ public abstract class Spring
     return (double)(v - p) / r;
   }
 
-  void setStrain(double strain) 
+  void setStrain(double strain)
   {
     int r = (strain < 0) ? getShrinkRange() : getExpandRange();
     int v = (getPreferredValue() + (int)(strain * r));
@@ -411,7 +411,7 @@ public abstract class Spring
           return pref;
       return value;
     }
-	
+
     /**
      * Sets the current value.
      *
@@ -536,7 +536,7 @@ public abstract class Spring
       int remainder = val - s1.getValue();
       s2.setValue(remainder);
     }
-	
+
   }
 
 
@@ -735,7 +735,7 @@ public abstract class Spring
         s1.setValue(Math.min(val, p1));
         s2.setValue(val);
       }
-      else 
+      else
       {
         s1.setValue(val);
         s2.setValue(Math.min(val, p2));
diff --git a/libjava/classpath/javax/swing/SpringLayout.java b/libjava/classpath/javax/swing/SpringLayout.java
index 2595b196703..2be5189b5ab 100644
--- a/libjava/classpath/javax/swing/SpringLayout.java
+++ b/libjava/classpath/javax/swing/SpringLayout.java
@@ -1,4 +1,4 @@
-/* SpringLayout.java -- 
+/* SpringLayout.java --
    Copyright (C) 2004, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -110,10 +110,10 @@ public class SpringLayout implements LayoutManager2
     /** The Spring for the bottom edge. */
     private Spring south;
 
-    /** 
+    /**
      In each axis the user can set three values, i.e. x, width, east, if all
-     three are set, then there's no room for manoeuvre so in those cases the 
-     third will be described by the below spring which is calculated in terms 
+     three are set, then there's no room for manoeuvre so in those cases the
+     third will be described by the below spring which is calculated in terms
      of the other two
     */
     private Spring v;
@@ -189,7 +189,7 @@ public class SpringLayout implements LayoutManager2
     {
       Spring retVal = null;
       if (edgeName.equals(SpringLayout.NORTH))
-	retVal = getY();
+        retVal = getY();
       else if (edgeName.equals(SpringLayout.WEST))
         retVal = getX();
       else if (edgeName.equals(SpringLayout.SOUTH))
@@ -202,7 +202,7 @@ public class SpringLayout implements LayoutManager2
     /**
      * Returns the constraint for the height of the component.
      *
-     * @return the height constraint. 
+     * @return the height constraint.
      */
     public Spring getHeight()
     {
@@ -294,7 +294,7 @@ public class SpringLayout implements LayoutManager2
      */
     public void setConstraint(String edgeName, Spring s)
     {
-    
+
       if (edgeName.equals(SpringLayout.WEST))
         setX(s);
       else if (edgeName.equals(SpringLayout.NORTH))
@@ -394,7 +394,7 @@ public class SpringLayout implements LayoutManager2
         width.setValue(Spring.UNSET);
       if (height != null)
         height.setValue(Spring.UNSET);
-      if (east != null) 
+      if (east != null)
         east.setValue(Spring.UNSET);
       if (south != null)
         south.setValue(Spring.UNSET);
@@ -444,16 +444,16 @@ public class SpringLayout implements LayoutManager2
    * The trick to SpringLayout is that the network of Springs needs to
    * completely created before the positioning results are generated.
    *
-   * Using the springs directly during network creation will set their values 
-   * before the network is completed, Using Deferred Springs during creation of 
-   * the network allows all the edges to be connected together and the network 
-   * to be created without resolving the Springs until their results need to be 
-   * known, at which point the network is complete and the spring addition and 
+   * Using the springs directly during network creation will set their values
+   * before the network is completed, Using Deferred Springs during creation of
+   * the network allows all the edges to be connected together and the network
+   * to be created without resolving the Springs until their results need to be
+   * known, at which point the network is complete and the spring addition and
    * and substitution calculations will work on a complete and valid network.
    *
    * @author Caolan McNamara (caolanm@redhat.com)
    */
-  private static class DeferredSpring extends Spring 
+  private static class DeferredSpring extends Spring
   {
     private SpringLayout sl;
     private String edgeName;
@@ -471,27 +471,27 @@ public class SpringLayout implements LayoutManager2
         c = component;
     }
 
-    private Spring resolveSpring() 
+    private Spring resolveSpring()
     {
         return sl.getConstraints(c).getConstraint(edgeName);
     }
 
-    public int getMaximumValue() 
+    public int getMaximumValue()
     {
         return resolveSpring().getMaximumValue();
     }
 
-    public int getMinimumValue() 
+    public int getMinimumValue()
     {
         return resolveSpring().getMinimumValue();
     }
 
-    public int getPreferredValue() 
+    public int getPreferredValue()
     {
         return resolveSpring().getPreferredValue();
     }
 
-    public int getValue() 
+    public int getValue()
     {
         int nRet = resolveSpring().getValue();
         if (nRet == Spring.UNSET)
@@ -499,7 +499,7 @@ public class SpringLayout implements LayoutManager2
         return nRet;
     }
 
-    public void setValue(int size) 
+    public void setValue(int size)
     {
         resolveSpring().setValue(size);
     }
@@ -543,18 +543,18 @@ public class SpringLayout implements LayoutManager2
     }
 
     //clip max to a value we can do meaningful calculation with
-    public int getMaximumValue() 
+    public int getMaximumValue()
     {
         int widget_width = c.getMaximumSize().width;
         return Math.min(Short.MAX_VALUE, widget_width);
     }
 
-    public int getMinimumValue() 
+    public int getMinimumValue()
     {
         return c.getMinimumSize().width;
     }
 
-    public int getPreferredValue() 
+    public int getPreferredValue()
     {
         return c.getPreferredSize().width;
     }
@@ -575,18 +575,18 @@ public class SpringLayout implements LayoutManager2
     }
 
     //clip max to a value we can do meaningful calculations with it
-    public int getMaximumValue() 
+    public int getMaximumValue()
     {
         int widget_height = c.getMaximumSize().height;
         return Math.min(Short.MAX_VALUE, widget_height);
     }
 
-    public int getMinimumValue() 
+    public int getMinimumValue()
     {
         return c.getMinimumSize().height;
     }
 
-    public int getPreferredValue() 
+    public int getPreferredValue()
     {
         return c.getPreferredSize().height;
     }
@@ -635,7 +635,7 @@ public class SpringLayout implements LayoutManager2
 
   /**
    * Returns the X alignment of the Container p.
-   * 
+   *
    * @param p
    *          the {@link java.awt.Container} for which to determine the X
    *          alignment.
@@ -676,7 +676,7 @@ public class SpringLayout implements LayoutManager2
     c.setHeight(null);
     if (c.getEast() == null)
       c.setEast(Spring.constant(0, 0, Integer.MAX_VALUE));
-    if (c.getSouth() == null) 
+    if (c.getSouth() == null)
       c.setSouth(Spring.constant(0, 0, Integer.MAX_VALUE));
 
     return c;
@@ -715,12 +715,12 @@ public class SpringLayout implements LayoutManager2
       Component c = components[index];
 
       Constraints constraints = getConstraints(c);
-      
+
       int x = constraints.getX().getValue();
       int y = constraints.getY().getValue();
       int width = constraints.getWidth().getValue();
       int height = constraints.getHeight().getValue();
-      
+
       c.setBounds(x + offsetX, y + offsetY, width, height);
     }
   }
@@ -794,7 +794,7 @@ public class SpringLayout implements LayoutManager2
    * @param e2 the edge of component 2.
    * @param c2 the component 2.
    */
-  public void putConstraint(String e1, Component c1, int pad, String e2, 
+  public void putConstraint(String e1, Component c1, int pad, String e2,
                             Component c2)
   {
     putConstraint(e1, c1, Spring.constant(pad), e2, c2);
@@ -811,7 +811,7 @@ public class SpringLayout implements LayoutManager2
    * @param e2 the edge of component 2.
    * @param c2 the component 2.
    */
-  public void putConstraint(String e1, Component c1, Spring s, String e2, 
+  public void putConstraint(String e1, Component c1, Spring s, String e2,
                             Component c2)
   {
     Constraints constraints1 = getConstraints(c1);
diff --git a/libjava/classpath/javax/swing/SwingConstants.java b/libjava/classpath/javax/swing/SwingConstants.java
index bed8a467b15..fccf2ea9535 100644
--- a/libjava/classpath/javax/swing/SwingConstants.java
+++ b/libjava/classpath/javax/swing/SwingConstants.java
@@ -1,4 +1,4 @@
-/* SwingConstants.java -- 
+/* SwingConstants.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,7 +48,7 @@ public interface SwingConstants
   int LEFT         = 2;
   int BOTTOM       = 3;
   int RIGHT        = 4;
-    
+
   int NORTH        = 1;
   int NORTH_EAST   = 2;
   int EAST         = 3;
@@ -57,10 +57,10 @@ public interface SwingConstants
   int SOUTH_WEST   = 6;
   int WEST         = 7;
   int NORTH_WEST   = 8;
-    
+
   int HORIZONTAL   = 0;
-  int VERTICAL     = 1; 
-    
+  int VERTICAL     = 1;
+
   int LEADING      = 10;
   int TRAILING     = 11;
 
@@ -74,4 +74,3 @@ public interface SwingConstants
    */
   int PREVIOUS     = 13;
 }
-
diff --git a/libjava/classpath/javax/swing/SwingUtilities.java b/libjava/classpath/javax/swing/SwingUtilities.java
index 6ff0b3346df..61047323f3e 100644
--- a/libjava/classpath/javax/swing/SwingUtilities.java
+++ b/libjava/classpath/javax/swing/SwingUtilities.java
@@ -74,8 +74,8 @@ import javax.swing.text.View;
 public class SwingUtilities
   implements SwingConstants
 {
-  /** 
-   * This frame should be used as parent for JWindow or JDialog 
+  /**
+   * This frame should be used as parent for JWindow or JDialog
    * that doesn't an owner
    */
   private static OwnerFrame ownerFrame;
@@ -92,7 +92,7 @@ public class SwingUtilities
    * of the component's coordinate system, where (0,0) is the
    * upper left corner of the component's bounds.
    *
-   * @param c  the component to measure the bounds of (if null, 
+   * @param c  the component to measure the bounds of (if null,
    *     this method returns null).
    * @param r  a carrier to store the return value in (if null, a
    *     new Rectangle instance is created).
@@ -115,11 +115,11 @@ public class SwingUtilities
   /**
    * Returns the focus owner or null if comp is not
    * the focus owner or a parent of it.
-   * 
+   *
    * @param comp the focus owner or a parent of it
-   * 
+   *
    * @return the focus owner, or null
-   * 
+   *
    * @deprecated 1.4 Replaced by
    * KeyboardFocusManager.getFocusOwner().
    */
@@ -127,22 +127,22 @@ public class SwingUtilities
   {
     // Get real focus owner.
     Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager()
-					       .getFocusOwner();
+                                               .getFocusOwner();
 
     // Check if comp is the focus owner or a parent of it.
     Component tmp = focusOwner;
-    
+
     while (tmp != null)
       {
-	if (tmp == comp)
-	  return focusOwner;
+        if (tmp == comp)
+          return focusOwner;
 
-	tmp = tmp.getParent();
+        tmp = tmp.getParent();
       }
-    
+
     return null;
   }
-  
+
   /**
    * Returns the Accessible child of the specified component
    * which appears at the supplied Point.  If there is no
@@ -280,7 +280,7 @@ public class SwingUtilities
    * @param comp The component to get the JRootPane of
    *
    * @return a suitable JRootPane for comp, or null
-   * 
+   *
    * @see javax.swing.RootPaneContainer#getRootPane
    * @see #getAncestorOfClass
    */
@@ -354,7 +354,7 @@ public class SwingUtilities
   /**
    * Equivalent to calling getAncestorOfClass(Window, comp).
    *
-   * @param comp The component to search for an ancestor window 
+   * @param comp The component to search for an ancestor window
    *
    * @return An ancestral window, or null if none exists
    */
@@ -387,7 +387,7 @@ public class SwingUtilities
           app = (Applet) comp;
         comp = comp.getParent();
       }
-    
+
     if (win != null)
       return win;
     return app;
@@ -395,7 +395,7 @@ public class SwingUtilities
 
   /**
    * Return true if a descends from b, in other words if b is an ancestor of a.
-   * 
+   *
    * @param a The child to search the ancestry of
    * @param b The potential ancestor to search for
    * @return true if a is a descendent of b, false otherwise
@@ -419,7 +419,7 @@ public class SwingUtilities
    * (x,y). Returns null when either
    * (x,y) is outside the bounds of parent, or parent is
    * null.
-   * 
+   *
    * @param parent The component to search the descendents of
    * @param x Horizontal coordinate to search for
    * @param y Vertical coordinate to search for
@@ -520,7 +520,7 @@ public class SwingUtilities
 
     return pt;
   }
-  
+
   public static Point convertPoint(Component source, Point aPoint, Component destination)
   {
     return convertPoint(source, aPoint.x, aPoint.y, destination);
@@ -704,17 +704,17 @@ public class SwingUtilities
    * which is laid out in this label
    */
 
-  public static String layoutCompoundLabel(JComponent c, 
+  public static String layoutCompoundLabel(JComponent c,
                                            FontMetrics fm,
-                                           String text, 
-                                           Icon icon, 
+                                           String text,
+                                           Icon icon,
                                            int verticalAlignment,
-                                           int horizontalAlignment, 
+                                           int horizontalAlignment,
                                            int verticalTextPosition,
-                                           int horizontalTextPosition, 
+                                           int horizontalTextPosition,
                                            Rectangle viewR,
-                                           Rectangle iconR, 
-                                           Rectangle textR, 
+                                           Rectangle iconR,
+                                           Rectangle textR,
                                            int textIconGap)
   {
 
@@ -921,8 +921,8 @@ public class SwingUtilities
     if (text == null || text.equals(""))
       {
         textIconGap = 0;
-	textR.width = 0;
-	textR.height = 0;
+        textR.width = 0;
+        textR.height = 0;
         text = "";
       }
     else
@@ -1070,18 +1070,18 @@ public class SwingUtilities
     return clipped;
   }
 
-  /** 
+  /**
    * Calls {@link java.awt.EventQueue#invokeLater} with the
-   * specified {@link Runnable}. 
+   * specified {@link Runnable}.
    */
   public static void invokeLater(Runnable doRun)
   {
     java.awt.EventQueue.invokeLater(doRun);
   }
 
-  /** 
+  /**
    * Calls {@link java.awt.EventQueue#invokeAndWait} with the
-   * specified {@link Runnable}. 
+   * specified {@link Runnable}.
    */
   public static void invokeAndWait(Runnable doRun)
     throws InterruptedException,
@@ -1090,21 +1090,21 @@ public class SwingUtilities
     java.awt.EventQueue.invokeAndWait(doRun);
   }
 
-  /** 
+  /**
    * Calls {@link java.awt.EventQueue#isDispatchThread()}.
-   * 
-   * @return true if the current thread is the current AWT event 
+   *
+   * @return true if the current thread is the current AWT event
    * dispatch thread.
    */
   public static boolean isEventDispatchThread()
   {
     return java.awt.EventQueue.isDispatchThread();
   }
-  
+
   /**
    * This method paints the given component at the given position and size.
    * The component will be reparented to the container given.
-   * 
+   *
    * @param g The Graphics object to draw with.
    * @param c The Component to draw
    * @param p The Container to reparent to.
@@ -1113,22 +1113,22 @@ public class SwingUtilities
    * @param w The width of the drawing area.
    * @param h The height of the drawing area.
    */
-  public static void paintComponent(Graphics g, Component c, Container p, 
+  public static void paintComponent(Graphics g, Component c, Container p,
                                     int x, int y, int w, int h)
-  {       
+  {
     Container parent = c.getParent();
     if (parent != null)
       parent.remove(c);
     if (p != null)
       p.add(c);
-    
+
     Shape savedClip = g.getClip();
-    
+
     g.setClip(x, y, w, h);
     g.translate(x, y);
 
     c.paint(g);
-    
+
     g.translate(-x, -y);
     g.setClip(savedClip);
   }
@@ -1136,23 +1136,23 @@ public class SwingUtilities
   /**
    * This method paints the given component in the given rectangle.
    * The component will be reparented to the container given.
-   * 
+   *
    * @param g The Graphics object to draw with.
    * @param c The Component to draw
    * @param p The Container to reparent to.
    * @param r The rectangle that describes the drawing area.
-   */  
-  public static void paintComponent(Graphics g, Component c, 
+   */
+  public static void paintComponent(Graphics g, Component c,
                                     Container p, Rectangle r)
   {
     paintComponent(g, c, p, r.x, r.y, r.width, r.height);
   }
-  
+
   /**
    * This method returns the common Frame owner used in JDialogs or
    * JWindow when no owner is provided.
    *
-   * @return The common Frame 
+   * @return The common Frame
    */
   static Window getOwnerFrame(Window owner)
   {
@@ -1188,7 +1188,7 @@ public class SwingUtilities
   public static boolean isMiddleMouseButton(MouseEvent event)
   {
     return ((event.getModifiersEx() & InputEvent.BUTTON2_DOWN_MASK)
-	     == InputEvent.BUTTON2_DOWN_MASK);
+             == InputEvent.BUTTON2_DOWN_MASK);
   }
 
   /**
@@ -1201,9 +1201,9 @@ public class SwingUtilities
   public static boolean isRightMouseButton(MouseEvent event)
   {
     return ((event.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK)
-	     == InputEvent.BUTTON3_DOWN_MASK);
+             == InputEvent.BUTTON3_DOWN_MASK);
   }
-  
+
   /**
    * This frame should be used when constructing a Window/JDialog without
    * a parent. In this case, we are forced to use this frame as a window's
@@ -1214,9 +1214,9 @@ public class SwingUtilities
   {
     public void setVisible(boolean b)
     {
-      // Do nothing here. 
+      // Do nothing here.
     }
-    
+
     public boolean isShowing()
     {
       return true;
@@ -1251,9 +1251,9 @@ public class SwingUtilities
    * parent-pointer chain, as illustrated:
                      
    *
    * 
                      -   *  [{@link javax.swing.JComponent#getActionMap()}] 
-   *          --> [{@link javax.swing.ActionMap}] 
-   *     parent --> [{@link javax.swing.text.JTextComponent.KeymapActionMap}] 
+   *  [{@link javax.swing.JComponent#getActionMap()}]
+   *          --> [{@link javax.swing.ActionMap}]
+   *     parent --> [{@link javax.swing.text.JTextComponent.KeymapActionMap}]
    *       parent --> [{@link javax.swing.plaf.ActionMapUIResource}]
    * 
                      
    *
@@ -1266,7 +1266,7 @@ public class SwingUtilities
    * call as a request to remove the UI-managed ActionMap from the
    * component's ActionMap parent chain.
                      
    */
-  public static void replaceUIActionMap(JComponent component, 
+  public static void replaceUIActionMap(JComponent component,
                                         ActionMap uiActionMap)
   {
     ActionMap child = component.getActionMap();
@@ -1294,9 +1294,9 @@ public class SwingUtilities
    * end of the parent-pointer chain, as illustrated:
                      
    *
    * 
                      -   *  [{@link javax.swing.JComponent#getInputMap()}] 
-   *          --> [{@link javax.swing.InputMap}] 
-   *     parent --> [{@link javax.swing.text.JTextComponent.KeymapWrapper}] 
+   *  [{@link javax.swing.JComponent#getInputMap()}]
+   *          --> [{@link javax.swing.InputMap}]
+   *     parent --> [{@link javax.swing.text.JTextComponent.KeymapWrapper}]
    *       parent --> [{@link javax.swing.plaf.InputMapUIResource}]
    * 
                      
    *
@@ -1309,8 +1309,8 @@ public class SwingUtilities
    * call as a request to remove the UI-managed InputMap from the
    * component's InputMap parent chain.
                      
    */
-  public static void replaceUIInputMap(JComponent component, 
-                                       int condition, 
+  public static void replaceUIInputMap(JComponent component,
+                                       int condition,
                                        InputMap uiInputMap)
   {
     InputMap child = component.getInputMap(condition);
@@ -1357,7 +1357,7 @@ public class SwingUtilities
     int h2 = rectB.height;
 
     // (outer box = rectA)
-    // ------------- 
+    // -------------
     // |_____0_____|
     // |  |rectB|  |
     // |_1|_____|_2|
@@ -1393,11 +1393,11 @@ public class SwingUtilities
     int n = 0;
     for (int i = 0; i < 4; i++)
       if (r[i] != null)
-	n++;
+        n++;
     Rectangle[] out = new Rectangle[n];
     for (int i = 3; i >= 0; i--)
       if (r[i] != null)
-	out[--n] = r[i];
+        out[--n] = r[i];
 
     return out;
   }
@@ -1441,13 +1441,13 @@ public class SwingUtilities
 
     return rect;
   }
-  
+
   /**
    * Calculates the width of a given string.
    *
    * @param fm the FontMetrics object to use
    * @param str the string
-   * 
+   *
    * @return the width of the the string.
    */
   public static int computeStringWidth(FontMetrics fm, String str)
@@ -1551,7 +1551,7 @@ public class SwingUtilities
   }
 
   /**
-   * Processes key bindings for the component that is associated with the 
+   * Processes key bindings for the component that is associated with the
    * key event. Note that this method does not make sense for
    * JComponent-derived components, except when
    * {@link JComponent#processKeyEvent(KeyEvent)} is overridden and super is
@@ -1575,7 +1575,7 @@ public class SwingUtilities
     KeyboardManager km = KeyboardManager.getManager();
     return km.processKeyStroke(c, s, ev);
   }
-  
+
   /**
    * Returns a string representing one of the horizontal alignment codes
    * defined in the {@link SwingConstants} interface.  The following table
@@ -1609,16 +1609,16 @@ public class SwingUtilities
    * 
                      
    * If the supplied code is not one of those listed, this methods will throw
    * an {@link IllegalArgumentException}.
-   * 
+   *
    * @param code  the code.
-   * 
+   *
    * @return A string representing the given code.
    */
   static String convertHorizontalAlignmentCodeToString(int code)
   {
-    switch (code) 
+    switch (code)
     {
-      case SwingConstants.CENTER: 
+      case SwingConstants.CENTER:
         return "CENTER";
       case SwingConstants.LEFT:
         return "LEFT";
@@ -1632,7 +1632,7 @@ public class SwingUtilities
         throw new IllegalArgumentException("Unrecognised code: " + code);
     }
   }
-  
+
   /**
    * Returns a string representing one of the vertical alignment codes
    * defined in the {@link SwingConstants} interface.  The following table
@@ -1658,9 +1658,9 @@ public class SwingUtilities
    * 
                      
    * If the supplied code is not one of those listed, this methods will throw
    * an {@link IllegalArgumentException}.
-   * 
+   *
    * @param code  the code.
-   * 
+   *
    * @return A string representing the given code.
    */
   static String convertVerticalAlignmentCodeToString(int code)
@@ -1677,7 +1677,7 @@ public class SwingUtilities
         throw new IllegalArgumentException("Unrecognised code: " + code);
     }
   }
-  
+
   /**
    * Returns a string representing one of the default operation codes
    * defined in the {@link WindowConstants} interface.  The following table
@@ -1707,12 +1707,12 @@ public class SwingUtilities
    * 
                      
    * If the supplied code is not one of those listed, this method will throw
    * an {@link IllegalArgumentException}.
-   * 
+   *
    * @param code  the code.
-   * 
+   *
    * @return A string representing the given code.
    */
-  static String convertWindowConstantToString(int code) 
+  static String convertWindowConstantToString(int code)
   {
     switch (code)
     {
diff --git a/libjava/classpath/javax/swing/Timer.java b/libjava/classpath/javax/swing/Timer.java
index acd1eb49359..e9954b4b1e6 100644
--- a/libjava/classpath/javax/swing/Timer.java
+++ b/libjava/classpath/javax/swing/Timer.java
@@ -51,7 +51,7 @@ import javax.swing.event.EventListenerList;
  * firing ActionEvents. All Timers share one (daemon)
  * Thread (or java.util.Timer). All events are fired from the event
  * queue.
- * 
+ *
  * @author Ronald Veldema
  * @author Audrius Meskauskas (audriusa@Bionformatics.org) - bug fixes
  * and documentation comments
@@ -99,7 +99,7 @@ public class Timer
    * running, even if there's no task scheduled in it.
    */
   private static java.util.Timer timer = new java.util.Timer("swing.Timer",
-							     true);
+                                                             true);
 
   /**
    * If true, the timer prints a message to
@@ -264,12 +264,12 @@ public class Timer
    * firing the first event.
    *
    * @param d The time gap between the subsequent events, in milliseconds
-   * 
+   *
    * @throws IllegalArgumentException if d is less than zero.
    */
   public void setDelay(int d)
   {
-    if (d < 0) 
+    if (d < 0)
       throw new IllegalArgumentException("Invalid delay: " + d);
     delay = d;
   }
@@ -291,7 +291,7 @@ public class Timer
    * subsequent events.
    *
    * @param i the initial delay, in milliseconds
-   * 
+   *
    * @throws IllegalArgumentException if i is less than zero.
    */
   public void setInitialDelay(int i)
@@ -387,12 +387,12 @@ public class Timer
     Task t = task;
     if (t == null)
       {
-	t = new Task();
-	if (isRepeats())
-	  timer.schedule(t, getInitialDelay(), getDelay());
-	else
-	  timer.schedule(t, getInitialDelay());
-	task = t;
+        t = new Task();
+        if (isRepeats())
+          timer.schedule(t, getInitialDelay(), getDelay());
+        else
+          timer.schedule(t, getInitialDelay());
+        task = t;
       }
   }
 
@@ -404,8 +404,8 @@ public class Timer
     Task t = task;
     if (t != null)
       {
-	t.cancel();
-	task = null;
+        t.cancel();
+        task = null;
       }
   }
 
@@ -468,9 +468,9 @@ public class Timer
   {
     synchronized(queueLock)
       {
-	queue++;
-	if (queue == 1)
-	  SwingUtilities.invokeLater(drainer);
+        queue++;
+        if (queue == 1)
+          SwingUtilities.invokeLater(drainer);
       }
   }
 }
diff --git a/libjava/classpath/javax/swing/ToolTipManager.java b/libjava/classpath/javax/swing/ToolTipManager.java
index 152fc03430f..8a31f79f636 100644
--- a/libjava/classpath/javax/swing/ToolTipManager.java
+++ b/libjava/classpath/javax/swing/ToolTipManager.java
@@ -219,9 +219,9 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
   {
     if (! enabled)
       {
-	enterTimer.stop();
-	exitTimer.stop();
-	insideTimer.stop();
+        enterTimer.stop();
+        exitTimer.stop();
+        insideTimer.stop();
       }
 
     this.enabled = enabled;
@@ -276,7 +276,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
    * mouse enters a Component.
    *
    * @param delay The initial delay before the ToolTip is shown.
-   * 
+   *
    * @throws IllegalArgumentException if delay is less than zero.
    */
   public void setInitialDelay(int delay)
@@ -299,7 +299,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
    * Sets the time the ToolTip will be shown before being hidden.
    *
    * @param delay  the delay (in milliseconds) before tool tips are hidden.
-   * 
+   *
    * @throws IllegalArgumentException if delay is less than zero.
    */
   public void setDismissDelay(int delay)
@@ -323,7 +323,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
    * Component, the tooltip will be shown immediately.
    *
    * @param delay The reshow delay (in milliseconds).
-   * 
+   *
    * @throws IllegalArgumentException if delay is less than zero.
    */
   public void setReshowDelay(int delay)
@@ -386,7 +386,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
    * This method is called when the mouse exits a JComponent registered with the
    * ToolTipManager. When the mouse exits, the tooltip should be hidden
    * immediately.
-   * 
+   *
    * @param event
    *          The MouseEvent.
    */
@@ -421,8 +421,8 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
       enterTimer.restart();
     else if (insideTimer.isRunning())
       {
-	insideTimer.stop();
-	hideTip();
+        insideTimer.stop();
+        hideTip();
       }
   }
 
@@ -517,7 +517,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
     Point p = currentPoint;
     Point cP = currentComponent.getLocationOnScreen();
     Dimension dims = currentTip.getPreferredSize();
-    
+
     JLayeredPane pane = null;
     JRootPane r = ((JRootPane) SwingUtilities.getAncestorOfClass(JRootPane.class,
                                                                  currentComponent));
@@ -525,12 +525,12 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
       pane = r.getLayeredPane();
     if (pane == null)
       return;
-    
+
     p.translate(cP.x, cP.y);
     adjustLocation(p, pane, dims);
-    
+
     currentTip.setBounds(0, 0, dims.width, dims.height);
-    
+
     PopupFactory factory = PopupFactory.getSharedInstance();
     popup = factory.getPopup(currentComponent, currentTip, p.x, p.y);
     popup.show();
@@ -539,7 +539,7 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
   /**
    * Adjusts the point to a new location on the component,
    * using the currentTip's dimensions.
-   * 
+   *
    * @param p - the point to convert.
    * @param c - the component the point is on.
    * @param d - the dimensions of the currentTip.
@@ -554,10 +554,10 @@ public class ToolTipManager extends MouseAdapter implements MouseMotionListener
       p.y += d.height;
     if (p.y + d.height > c.getHeight())
       p.y -= d.height;
-    
+
     return p;
   }
-  
+
   /**
    * This method hides the ToolTip.
    * This is package-private to avoid an accessor method.
diff --git a/libjava/classpath/javax/swing/TransferHandler.java b/libjava/classpath/javax/swing/TransferHandler.java
index 276697475f0..abf6e8c2ee5 100644
--- a/libjava/classpath/javax/swing/TransferHandler.java
+++ b/libjava/classpath/javax/swing/TransferHandler.java
@@ -172,7 +172,7 @@ public class TransferHandler implements Serializable
       super(command);
       this.command = command;
     }
-    
+
     public void actionPerformed(ActionEvent event)
     {
       JComponent component = (JComponent) event.getSource();
@@ -180,42 +180,42 @@ public class TransferHandler implements Serializable
       Clipboard clipboard = getClipboard(component);
 
       if (clipboard == null)
-	{
-	  // Access denied!
-	  Toolkit.getDefaultToolkit().beep();
-	  return;
-	}
+        {
+          // Access denied!
+          Toolkit.getDefaultToolkit().beep();
+          return;
+        }
 
       if (command.equals(COMMAND_COPY))
-	transferHandler.exportToClipboard(component, clipboard, COPY);
+        transferHandler.exportToClipboard(component, clipboard, COPY);
       else if (command.equals(COMMAND_CUT))
-	transferHandler.exportToClipboard(component, clipboard, MOVE);
+        transferHandler.exportToClipboard(component, clipboard, MOVE);
       else if (command.equals(COMMAND_PASTE))
-	{
-	  Transferable transferable = clipboard.getContents(null);
+        {
+          Transferable transferable = clipboard.getContents(null);
 
-	  if (transferable != null)
-	    transferHandler.importData(component, transferable);
-	}
+          if (transferable != null)
+            transferHandler.importData(component, transferable);
+        }
     }
-  
+
     /**
      * Get the system cliboard or null if the caller isn't allowed to
      * access the system clipboard.
-     * 
+     *
      * @param component a component, used to get the toolkit.
      * @return the clipboard
      */
     private static Clipboard getClipboard(JComponent component)
     {
       try
-	{
-	  return component.getToolkit().getSystemClipboard();
-	}
+        {
+          return component.getToolkit().getSystemClipboard();
+        }
       catch (SecurityException se)
-	{
-	  return null;
-	}
+        {
+          return null;
+        }
     }
   }
 
@@ -244,7 +244,7 @@ public class TransferHandler implements Serializable
     {
       // Nothing to do here.
     }
-    
+
   }
 
   private static class SwingDragHandler
@@ -310,7 +310,7 @@ public class TransferHandler implements Serializable
     {
       // Nothing to do here.
     }
-    
+
   }
 
   private static final long serialVersionUID = -967749805571669910L;
@@ -318,7 +318,7 @@ public class TransferHandler implements Serializable
   private static final String COMMAND_COPY = "copy";
   private static final String COMMAND_CUT = "cut";
   private static final String COMMAND_PASTE = "paste";
-  
+
   public static final int NONE = 0;
   public static final int COPY = 1;
   public static final int MOVE = 2;
@@ -327,13 +327,13 @@ public class TransferHandler implements Serializable
   private static Action copyAction = new TransferAction(COMMAND_COPY);
   private static Action cutAction = new TransferAction(COMMAND_CUT);
   private static Action pasteAction = new TransferAction(COMMAND_PASTE);
-  
+
   private int sourceActions;
   private Icon visualRepresentation;
 
   /**
    * The name of the property into/from which this TransferHandler
-   * imports/exports. 
+   * imports/exports.
    */
   private String propertyName;
 
@@ -426,7 +426,7 @@ public class TransferHandler implements Serializable
    *         from the specified component, or null if the component doesn't
    *         have a readable property like the transfer handler
    */
-  protected Transferable createTransferable(JComponent c) 
+  protected Transferable createTransferable(JComponent c)
   {
     Transferable transferable = null;
     if (propertyName != null)
@@ -499,7 +499,7 @@ public class TransferHandler implements Serializable
    *
    * @throws IllegalStateException when the clipboard is not available
    */
-  public void exportToClipboard(JComponent c, Clipboard clip, int action) 
+  public void exportToClipboard(JComponent c, Clipboard clip, int action)
     throws IllegalStateException
   {
     action &= getSourceActions(c);
@@ -519,7 +519,7 @@ public class TransferHandler implements Serializable
       }
     else
       exportDone(c, null, NONE);
-  } 
+  }
 
   public int getSourceActions(JComponent c)
   {
@@ -536,7 +536,7 @@ public class TransferHandler implements Serializable
    * component c by setting the property of this TransferHandler
    * on that component. If this succeeds, this method returns
    * true, otherwise false.
-   * 
+   *
    *
    * @param c the component to import into
    * @param t the transfer data to import
@@ -544,7 +544,7 @@ public class TransferHandler implements Serializable
    * @return true if the transfer succeeds, false
    *         otherwise
    */
-  public boolean importData(JComponent c, Transferable t) 
+  public boolean importData(JComponent c, Transferable t)
   {
     boolean ok = false;
     PropertyDescriptor prop = getPropertyDescriptor(c);
diff --git a/libjava/classpath/javax/swing/UIDefaults.java b/libjava/classpath/javax/swing/UIDefaults.java
index 9766cb05cec..904b4c2b851 100644
--- a/libjava/classpath/javax/swing/UIDefaults.java
+++ b/libjava/classpath/javax/swing/UIDefaults.java
@@ -129,8 +129,8 @@ public class UIDefaults extends Hashtable
     {
       final String className = s;
       inner = new LazyValue()
-        { 
-          public Object createValue(UIDefaults table) 
+        {
+          public Object createValue(UIDefaults table)
           {
             try
               {
@@ -152,11 +152,11 @@ public class UIDefaults extends Hashtable
       final String className = c;
       final String methodName = m;
       inner = new LazyValue()
-        { 
-          public Object createValue(UIDefaults table) 
+        {
+          public Object createValue(UIDefaults table)
           {
-            try 
-              {                
+            try
+              {
                 return Class
                   .forName(className)
                   .getMethod(methodName, new Class[] {})
@@ -169,7 +169,7 @@ public class UIDefaults extends Hashtable
           }
         };
     }
-    
+
     public ProxyLazyValue(String c, Object[] os)
     {
       final String className = c;
@@ -178,20 +178,20 @@ public class UIDefaults extends Hashtable
       for (int i = 0; i < objs.length; ++i)
         {
           clss[i] = objs[i].getClass();
-        }      
+        }
       inner = new LazyValue()
-        { 
-          public Object createValue(UIDefaults table) 
-          {            
+        {
+          public Object createValue(UIDefaults table)
+          {
             try
               {
                 return Class
                   .forName(className)
                   .getConstructor(clss)
                   .newInstance(objs);
-	      }
+              }
             catch (Exception e)
-	      {
+              {
                 return null;
               }
           }
@@ -205,14 +205,14 @@ public class UIDefaults extends Hashtable
       final Object[] objs = os;
       final Class[] clss = new Class[objs.length];
       for (int i = 0; i < objs.length; ++i)
-	{
+        {
           clss[i] = objs[i].getClass();
-	}
+        }
       inner = new LazyValue()
-        { 
-	  public Object createValue(UIDefaults table)
-	  {
-            try 
+        {
+          public Object createValue(UIDefaults table)
+          {
+            try
               {
                 return Class
                   .forName(className)
@@ -226,7 +226,7 @@ public class UIDefaults extends Hashtable
           }
         };
     }
-    
+
     public Object createValue(UIDefaults table)
     {
       return inner.createValue(table);
@@ -257,7 +257,7 @@ public class UIDefaults extends Hashtable
   public UIDefaults(Object[] entries)
   {
     this();
-    
+
     for (int i = 0; (2 * i + 1) < entries.length; ++i)
       put(entries[2 * i], entries[2 * i + 1]);
   }
@@ -293,14 +293,14 @@ public class UIDefaults extends Hashtable
         String keyString = (String) key;
         ListIterator i = bundles.listIterator(0);
         while (i.hasNext())
-	  {
+          {
             String bundle_name = (String) i.next();
             ResourceBundle res =
               ResourceBundle.getBundle(bundle_name, loc);
             if (res != null)
               {
-                try 
-                  {                    
+                try
+                  {
                     obj = res.getObject(keyString);
                     break;
                   }
@@ -329,7 +329,7 @@ public class UIDefaults extends Hashtable
     else if (obj instanceof ActiveValue)
       {
         return ((ActiveValue) obj).createValue(this);
-      }    
+      }
 
     return obj;
   }
@@ -582,7 +582,7 @@ public class UIDefaults extends Hashtable
    *
    * @param key the key to the requested entry
    *
-   * @return The boolean entry for key or false if no 
+   * @return The boolean entry for key or false if no
    *         such entry exists.
    */
   public boolean getBoolean(Object key)
@@ -612,7 +612,7 @@ public class UIDefaults extends Hashtable
    * @return the insets entry for key or null if no such entry
    *     exists
    */
-  public Insets getInsets(Object key) 
+  public Insets getInsets(Object key)
   {
     Object o = get(key);
     return o instanceof Insets ? (Insets) o : null;
@@ -627,7 +627,7 @@ public class UIDefaults extends Hashtable
    * @return the boolean entry for key or null if no such entry
    *     exists
    */
-  public Insets getInsets(Object key, Locale locale) 
+  public Insets getInsets(Object key, Locale locale)
   {
     Object o = get(key, locale);
     return o instanceof Insets ? (Insets) o : null;
@@ -641,7 +641,7 @@ public class UIDefaults extends Hashtable
    * @return the dimension entry for key or null if no such entry
    *     exists
    */
-  public Dimension getDimension(Object key) 
+  public Dimension getDimension(Object key)
   {
     Object o = get(key);
     return o instanceof Dimension ? (Dimension) o : null;
@@ -656,7 +656,7 @@ public class UIDefaults extends Hashtable
    * @return the boolean entry for key or null if no such entry
    *     exists
    */
-  public Dimension getDimension(Object key, Locale locale) 
+  public Dimension getDimension(Object key, Locale locale)
   {
     Object o = get(key, locale);
     return o instanceof Dimension ? (Dimension) o : null;
@@ -677,7 +677,7 @@ public class UIDefaults extends Hashtable
     String className = (String) get(id);
     if (className == null)
       return null;
-    try 
+    try
       {
         if (loader == null)
           loader = ClassLoader.getSystemClassLoader();
@@ -733,7 +733,7 @@ public class UIDefaults extends Hashtable
 
     Method factory;
 
-    try 
+    try
       {
         factory = cls.getMethod ("createUI", new Class[] { JComponent.class } );
       }
@@ -749,14 +749,14 @@ public class UIDefaults extends Hashtable
       }
     catch (java.lang.reflect.InvocationTargetException ite)
       {
-        getUIError ("InvocationTargetException ("+ ite.getTargetException() 
-		    +") calling createUI(...) on " + cls.toString ());
-        return null;        
+        getUIError ("InvocationTargetException ("+ ite.getTargetException()
+                    +") calling createUI(...) on " + cls.toString ());
+        return null;
       }
     catch (Exception e)
       {
         getUIError ("exception calling createUI(...) on " + cls.toString ());
-        return null;        
+        return null;
       }
   }
 
@@ -800,7 +800,7 @@ public class UIDefaults extends Hashtable
    * @param newValue the new value
    */
   protected void firePropertyChange(String property,
-				    Object oldValue, Object newValue)
+                                    Object oldValue, Object newValue)
   {
     propertyChangeSupport.firePropertyChange(property, oldValue, newValue);
   }
diff --git a/libjava/classpath/javax/swing/UIManager.java b/libjava/classpath/javax/swing/UIManager.java
index 0369b6514ae..05a3fcedaaa 100644
--- a/libjava/classpath/javax/swing/UIManager.java
+++ b/libjava/classpath/javax/swing/UIManager.java
@@ -1,4 +1,4 @@
-/* UIManager.java -- 
+/* UIManager.java --
    Copyright (C) 2002, 2003, 2004, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,22 +61,22 @@ import javax.swing.plaf.metal.MetalLookAndFeel;
 public class UIManager implements Serializable
 {
   /**
-   * Represents the basic information about a {@link LookAndFeel} (LAF), so 
-   * that a list of installed LAFs can be presented without actually loading 
+   * Represents the basic information about a {@link LookAndFeel} (LAF), so
+   * that a list of installed LAFs can be presented without actually loading
    * the LAF class(es).
    */
   public static class LookAndFeelInfo
   {
     String name, clazz;
-	
+
     /**
      * Creates a new instance.
-     * 
+     *
      * @param name  the look and feel name.
      * @param clazz  the look and feel class name.
      */
-    public LookAndFeelInfo(String name, 
-			   String clazz)
+    public LookAndFeelInfo(String name,
+                           String clazz)
     {
       this.name  = name;
       this.clazz = clazz;
@@ -84,17 +84,17 @@ public class UIManager implements Serializable
 
     /**
      * Returns the name of the look and feel.
-     * 
+     *
      * @return The name of the look and feel.
      */
     public String getName()
     {
       return name;
     }
-    
+
     /**
      * Returns the fully qualified class name for the {@link LookAndFeel}.
-     * 
+     *
      * @return The fully qualified class name for the {@link LookAndFeel}.
      */
     public String getClassName()
@@ -151,20 +151,20 @@ public class UIManager implements Serializable
           i++;
         return val;
       }
-        
+
     }
 
     UIDefaults fallback;
 
     /**
-     * Creates a new MultiplexUIDefaults instance with 
+     * Creates a new MultiplexUIDefaults instance with
      * d as the fallback defaults.
-     * 
+     *
      * @param d  the fallback defaults (null not permitted).
      */
     MultiplexUIDefaults(UIDefaults d)
     {
-      if (d == null) 
+      if (d == null)
         throw new NullPointerException();
       fallback = d;
     }
@@ -219,10 +219,10 @@ public class UIManager implements Serializable
 
   /** The installed auxiliary look and feels. */
   static LookAndFeel[] auxLookAndFeels;
-  
+
   /** The current look and feel. */
   static LookAndFeel currentLookAndFeel;
-  
+
   static MultiplexUIDefaults currentUIDefaults;
 
   static UIDefaults lookAndFeelDefaults;
@@ -234,7 +234,7 @@ public class UIManager implements Serializable
   static
   {
     String defaultlaf = System.getProperty("swing.defaultlaf");
-    try 
+    try
       {
         if (defaultlaf != null)
           {
@@ -288,7 +288,7 @@ public class UIManager implements Serializable
    *
    * @param listener the listener to remove
    */
-  public static void removePropertyChangeListener(PropertyChangeListener 
+  public static void removePropertyChangeListener(PropertyChangeListener
           listener)
   {
     listeners.removePropertyChangeListener(listener);
@@ -308,11 +308,11 @@ public class UIManager implements Serializable
 
   /**
    * Add a {@link LookAndFeel} to the list of auxiliary look and feels.
-   * 
+   *
    * @param laf  the auxiliary look and feel (null not permitted).
-   * 
+   *
    * @throws NullPointerException if laf is null.
-   * 
+   *
    * @see #getAuxiliaryLookAndFeels()
    */
   public static void addAuxiliaryLookAndFeel(LookAndFeel laf)
@@ -325,18 +325,18 @@ public class UIManager implements Serializable
         auxLookAndFeels[0] = laf;
         return;
       }
-	
+
     LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length + 1];
-    System.arraycopy(auxLookAndFeels, 0, temp, 0, auxLookAndFeels.length);			 
+    System.arraycopy(auxLookAndFeels, 0, temp, 0, auxLookAndFeels.length);
     auxLookAndFeels = temp;
     auxLookAndFeels[auxLookAndFeels.length - 1] = laf;
   }
-    
+
   /**
    * Removes a {@link LookAndFeel} (LAF) from the list of auxiliary LAFs.
-   * 
+   *
    * @param laf  the LAF to remove.
-   * 
+   *
    * @return true if the LAF was removed, and false
    *         otherwise.
    */
@@ -357,32 +357,32 @@ public class UIManager implements Serializable
             LookAndFeel[] temp = new LookAndFeel[auxLookAndFeels.length - 1];
             if (i == 0)
               {
-                System.arraycopy(auxLookAndFeels, 1, temp, 0, count - 1);  
+                System.arraycopy(auxLookAndFeels, 1, temp, 0, count - 1);
               }
             else if (i == count - 1)
               {
                 System.arraycopy(auxLookAndFeels, 0, temp, 0, count - 1);
               }
-            else 
+            else
               {
                 System.arraycopy(auxLookAndFeels, 0, temp, 0, i);
-                System.arraycopy(auxLookAndFeels, i + 1, temp, i, 
+                System.arraycopy(auxLookAndFeels, i + 1, temp, i,
                         count - i - 1);
               }
             auxLookAndFeels = temp;
             return true;
-          }		
+          }
       }
     return false;
   }
 
   /**
    * Returns an array (possibly null) containing the auxiliary
-   * {@link LookAndFeel}s that are in use.  These are used by the 
+   * {@link LookAndFeel}s that are in use.  These are used by the
    * {@link javax.swing.plaf.multi.MultiLookAndFeel} class.
-   * 
+   *
    * @return The auxiliary look and feels (possibly null).
-   * 
+   *
    * @see #addAuxiliaryLookAndFeel(LookAndFeel)
    */
   public static LookAndFeel[] getAuxiliaryLookAndFeels()
@@ -393,9 +393,9 @@ public class UIManager implements Serializable
   /**
    * Returns an object from the {@link UIDefaults} table for the current
    * {@link LookAndFeel}.
-   * 
+   *
    * @param key  the key.
-   * 
+   *
    * @return The object.
    */
   public static Object get(Object key)
@@ -406,11 +406,11 @@ public class UIManager implements Serializable
   /**
    * Returns an object from the {@link UIDefaults} table for the current
    * {@link LookAndFeel}.
-   * 
+   *
    * @param key  the key.
-   * 
+   *
    * @return The object.
-   * 
+   *
    * @since 1.4
    */
   public static Object get(Object key, Locale locale)
@@ -422,70 +422,70 @@ public class UIManager implements Serializable
    * Returns a boolean value from the defaults table.  If there is no value
    * for the specified key, or the value is not an instance of {@link Boolean},
    * this method returns false.
-   * 
+   *
    * @param key  the key (null not permitted).
    *
    * @return The boolean value associated with the specified key.
-   * 
+   *
    * @throws NullPointerException if key is null.
-   * 
+   *
    * @since 1.4
    */
   public static boolean getBoolean(Object key)
   {
     Object value = get(key);
-    if (value instanceof Boolean) 
+    if (value instanceof Boolean)
       return ((Boolean) value).booleanValue();
     return false;
   }
-  
+
   /**
    * Returns a boolean value from the defaults table.  If there is no value
    * for the specified key, or the value is not an instance of {@link Boolean},
    * this method returns false.
-   * 
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
    *
    * @return The boolean value associated with the specified key.
-   * 
+   *
    * @throws NullPointerException if key is null.
-   * 
+   *
    * @since 1.4
    */
   public static boolean getBoolean(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Boolean) 
+    if (value instanceof Boolean)
       return ((Boolean) value).booleanValue();
     return false;
   }
-    
+
   /**
-   * Returns a border from the defaults table. 
-   * 
+   * Returns a border from the defaults table.
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The border associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    */
   public static Border getBorder(Object key)
   {
     Object value = get(key);
-    if (value instanceof Border) 
+    if (value instanceof Border)
       return (Border) value;
     return null;
   }
-    
+
   /**
-   * Returns a border from the defaults table. 
-   * 
+   * Returns a border from the defaults table.
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The border associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    *
    * @since 1.4
@@ -493,44 +493,44 @@ public class UIManager implements Serializable
   public static Border getBorder(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Border) 
+    if (value instanceof Border)
       return (Border) value;
     return null;
   }
-    
+
   /**
-   * Returns a drawing color from the defaults table. 
-   * 
+   * Returns a drawing color from the defaults table.
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The color associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    */
   public static Color getColor(Object key)
   {
     Object value = get(key);
-    if (value instanceof Color) 
+    if (value instanceof Color)
       return (Color) value;
     return null;
   }
 
   /**
-   * Returns a drawing color from the defaults table. 
-   * 
+   * Returns a drawing color from the defaults table.
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The color associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
-   * 
+   *
    * @since 1.4
    */
   public static Color getColor(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Color) 
+    if (value instanceof Color)
       return (Color) value;
     return null;
   }
@@ -538,17 +538,17 @@ public class UIManager implements Serializable
   /**
    * The fully qualified class name of the cross platform (Metal) look and feel.
    * This string can be passed to Class.forName()
-   * 
+   *
    * @return "javax.swing.plaf.metal.MetalLookAndFeel"
    */
   public static String getCrossPlatformLookAndFeelClassName()
-  {	
+  {
     return "javax.swing.plaf.metal.MetalLookAndFeel";
   }
 
   /**
-   * Returns the default values for this look and feel. 
-   * 
+   * Returns the default values for this look and feel.
+   *
    * @return The {@link UIDefaults} for the current {@link LookAndFeel}.
    */
   public static UIDefaults getDefaults()
@@ -559,37 +559,37 @@ public class UIManager implements Serializable
   }
 
   /**
-   * Returns a dimension from the defaults table. 
-   * 
+   * Returns a dimension from the defaults table.
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The color associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    */
   public static Dimension getDimension(Object key)
   {
     Object value = get(key);
-    if (value instanceof Dimension) 
+    if (value instanceof Dimension)
       return (Dimension) value;
     return null;
   }
 
   /**
-   * Returns a dimension from the defaults table. 
-   * 
+   * Returns a dimension from the defaults table.
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The color associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    * @since 1.4
    */
   public static Dimension getDimension(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Dimension) 
+    if (value instanceof Dimension)
       return (Dimension) value;
     return null;
   }
@@ -601,15 +601,15 @@ public class UIManager implements Serializable
    * @param key an Object that specifies the font. Typically,
    *        this is a String such as
    *        TitledBorder.font.
-   *        
+   *
    * @return The font associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    */
   public static Font getFont(Object key)
   {
     Object value = get(key);
-    if (value instanceof Font) 
+    if (value instanceof Font)
       return (Font) value;
     return null;
   }
@@ -622,65 +622,65 @@ public class UIManager implements Serializable
    *        this is a String such as
    *        TitledBorder.font.
    * @param locale  the locale.
-   *        
+   *
    * @return The font associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
-   *        
+   *
    * @since 1.4
    */
   public static Font getFont(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Font) 
+    if (value instanceof Font)
       return (Font) value;
     return null;
   }
 
   /**
-   * Returns an icon from the defaults table. 
-   * 
+   * Returns an icon from the defaults table.
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The icon associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    */
   public static Icon getIcon(Object key)
   {
     Object value = get(key);
-    if (value instanceof Icon) 
+    if (value instanceof Icon)
       return (Icon) value;
     return null;
   }
-  
+
   /**
-   * Returns an icon from the defaults table. 
-   * 
+   * Returns an icon from the defaults table.
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The icon associated with the given key, or null.
-   * 
+   *
    * @throws NullPointerException if key is null.
    * @since 1.4
    */
   public static Icon getIcon(Object key, Locale locale)
   {
     Object value = get(key, locale);
-    if (value instanceof Icon) 
+    if (value instanceof Icon)
       return (Icon) value;
     return null;
   }
-  
+
   /**
    * Returns an Insets object from the defaults table.
-   * 
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The insets associated with the given key, or null.
-   * 
-   * @throws NullPointerException if key is null.   
+   *
+   * @throws NullPointerException if key is null.
    */
   public static Insets getInsets(Object key)
   {
@@ -693,13 +693,13 @@ public class UIManager implements Serializable
 
   /**
    * Returns an Insets object from the defaults table.
-   * 
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The insets associated with the given key, or null.
-   * 
-   * @throws NullPointerException if key is null.   
+   *
+   * @throws NullPointerException if key is null.
    * @since 1.4
    */
   public static Insets getInsets(Object key, Locale locale)
@@ -714,7 +714,7 @@ public class UIManager implements Serializable
   /**
    * Returns an array containing information about the {@link LookAndFeel}s
    * that are installed.
-   * 
+   *
    * @return A list of the look and feels that are available (installed).
    */
   public static LookAndFeelInfo[] getInstalledLookAndFeels()
@@ -726,9 +726,9 @@ public class UIManager implements Serializable
    * Returns the integer value of the {@link Integer} associated with the
    * given key.  If there is no value, or the value is not an instance of
    * {@link Integer}, this method returns 0.
-   * 
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The integer value associated with the given key, or 0.
    */
   public static int getInt(Object key)
@@ -743,12 +743,12 @@ public class UIManager implements Serializable
    * Returns the integer value of the {@link Integer} associated with the
    * given key.  If there is no value, or the value is not an instance of
    * {@link Integer}, this method returns 0.
-   * 
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The integer value associated with the given key, or 0.
-   * 
+   *
    * @since 1.4
    */
   public static int getInt(Object key, Locale locale)
@@ -761,9 +761,9 @@ public class UIManager implements Serializable
 
   /**
    * Returns the current look and feel (which may be null).
-   * 
+   *
    * @return The current look and feel.
-   * 
+   *
    * @see #setLookAndFeel(LookAndFeel)
    */
   public static LookAndFeel getLookAndFeel()
@@ -774,7 +774,7 @@ public class UIManager implements Serializable
   /**
    * Returns the UIDefaults table of the currently active
    * look and feel.
-   * 
+   *
    * @return The {@link UIDefaults} for the current {@link LookAndFeel}.
    */
   public static UIDefaults getLookAndFeelDefaults()
@@ -783,11 +783,11 @@ public class UIManager implements Serializable
   }
 
   /**
-   * Returns the {@link String} associated with the given key.  If the value 
+   * Returns the {@link String} associated with the given key.  If the value
    * is not a {@link String}, this method returns null.
-   * 
+   *
    * @param key  the key (null not permitted).
-   * 
+   *
    * @return The string associated with the given key, or null.
    */
   public static String getString(Object key)
@@ -797,16 +797,16 @@ public class UIManager implements Serializable
       return (String) s;
     return null;
   }
-  
+
   /**
-   * Returns the {@link String} associated with the given key.  If the value 
+   * Returns the {@link String} associated with the given key.  If the value
    * is not a {@link String}, this method returns null.
-   * 
+   *
    * @param key  the key (null not permitted).
    * @param locale  the locale.
-   * 
+   *
    * @return The string associated with the given key, or null.
-   * 
+   *
    * @since 1.4
    */
   public static String getString(Object key, Locale locale)
@@ -816,14 +816,14 @@ public class UIManager implements Serializable
       return (String) s;
     return null;
   }
-  
+
   /**
    * Returns the name of the {@link LookAndFeel} class that implements the
    * native systems look and feel if there is one, otherwise the name
    * of the default cross platform LookAndFeel class.
-   * 
+   *
    * @return The fully qualified class name for the system look and feel.
-   * 
+   *
    * @see #getCrossPlatformLookAndFeelClassName()
    */
   public static String getSystemLookAndFeelClassName()
@@ -832,9 +832,9 @@ public class UIManager implements Serializable
   }
 
   /**
-   * Returns UI delegate from the current {@link LookAndFeel} that renders the 
+   * Returns UI delegate from the current {@link LookAndFeel} that renders the
    * target component.
-   * 
+   *
    * @param target  the target component.
    */
   public static ComponentUI getUI(JComponent target)
@@ -844,7 +844,7 @@ public class UIManager implements Serializable
 
   /**
    * Creates a new look and feel and adds it to the current array.
-   * 
+   *
    * @param name  the look and feel name.
    * @param className  the fully qualified name of the class that implements the
    *                   look and feel.
@@ -868,7 +868,7 @@ public class UIManager implements Serializable
 
   /**
    * Stores an object in the defaults table.
-   * 
+   *
    * @param key  the key.
    * @param value  the value.
    */
@@ -884,15 +884,15 @@ public class UIManager implements Serializable
   {
     installed = infos;
   }
-  
+
   /**
    * Sets the current {@link LookAndFeel}.
-   * 
+   *
    * @param newLookAndFeel  the new look and feel (null permitted).
-   * 
-   * @throws UnsupportedLookAndFeelException if the look and feel is not 
+   *
+   * @throws UnsupportedLookAndFeelException if the look and feel is not
    *         supported on the current platform.
-   * 
+   *
    * @see LookAndFeel#isSupportedLookAndFeel()
    */
   public static void setLookAndFeel(LookAndFeel newLookAndFeel)
@@ -905,7 +905,7 @@ public class UIManager implements Serializable
     if (oldLookAndFeel != null)
       oldLookAndFeel.uninitialize();
 
-    // Set the current default look and feel using a LookAndFeel object. 
+    // Set the current default look and feel using a LookAndFeel object.
     currentLookAndFeel = newLookAndFeel;
     if (newLookAndFeel != null)
       {
@@ -919,7 +919,7 @@ public class UIManager implements Serializable
       }
     else
       {
-        currentUIDefaults = null;    
+        currentUIDefaults = null;
       }
     listeners.firePropertyChange("lookAndFeel", oldLookAndFeel, newLookAndFeel);
     //revalidate();
@@ -928,12 +928,12 @@ public class UIManager implements Serializable
 
   /**
    * Set the current default look and feel using a class name.
-   * 
+   *
    * @param className  the look and feel class name.
-   * 
-   * @throws UnsupportedLookAndFeelException if the look and feel is not 
+   *
+   * @throws UnsupportedLookAndFeelException if the look and feel is not
    *         supported on the current platform.
-   * 
+   *
    * @see LookAndFeel#isSupportedLookAndFeel()
    */
   public static void setLookAndFeel(String className)
diff --git a/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java b/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
index b65119a00bc..74c6ac8bddc 100644
--- a/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
+++ b/libjava/classpath/javax/swing/UnsupportedLookAndFeelException.java
@@ -1,4 +1,4 @@
-/* UnsupportedLookAndFeelException.java -- 
+/* UnsupportedLookAndFeelException.java --
    Copyright (C) 2002, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,14 +40,14 @@ package javax.swing;
 /**
  * Thrown by the {@link UIManager#setLookAndFeel(LookAndFeel)} method when the
  * specified look and feel is not supported on the current platform.
- * 
+ *
  * @see LookAndFeel#isSupportedLookAndFeel()
  */
 public class UnsupportedLookAndFeelException extends Exception
 {
   /**
    * Creates a new exception instance with the specified message.
-   * 
+   *
    * @param s  the exception message.
    */
   public UnsupportedLookAndFeelException(String s)
diff --git a/libjava/classpath/javax/swing/ViewportLayout.java b/libjava/classpath/javax/swing/ViewportLayout.java
index b61834e9e50..02f9626ad28 100644
--- a/libjava/classpath/javax/swing/ViewportLayout.java
+++ b/libjava/classpath/javax/swing/ViewportLayout.java
@@ -46,13 +46,13 @@ import java.awt.Rectangle;
 import java.io.Serializable;
 
 /**
- * The default layout for {@link JViewport}. The viewport makes its view the 
- * same size as itself, but not smaller than its minimum size. 
- * 
+ * The default layout for {@link JViewport}. The viewport makes its view the
+ * same size as itself, but not smaller than its minimum size.
+ *
  * If the port extends extends into space past the edge of the view,
  * this layout manager moves the port up or to the left, in view space, by the
  * amount of empty space (keep the lower and right edges lined up).
- * 
+ *
  * @author  Andrew Selkirk
  * @author  Graydon Hoare
  * @author  Audrius Meskauskas (audriusa@Bioinformatics.org)
@@ -61,15 +61,7 @@ public class ViewportLayout implements LayoutManager, Serializable
 {
   private static final long serialVersionUID = -788225906076097229L;
 
-  public ViewportLayout() 
-  {
-    // Nothing to do here.
-  }
-  
-  /**
-   * The method is not used with this manager.
-   */
-  public void addLayoutComponent(String name, Component c) 
+  public ViewportLayout()
   {
     // Nothing to do here.
   }
@@ -77,20 +69,28 @@ public class ViewportLayout implements LayoutManager, Serializable
   /**
    * The method is not used with this manager.
    */
-  public void removeLayoutComponent(Component c) 
+  public void addLayoutComponent(String name, Component c)
   {
     // Nothing to do here.
   }
-  
+
+  /**
+   * The method is not used with this manager.
+   */
+  public void removeLayoutComponent(Component c)
+  {
+    // Nothing to do here.
+  }
+
   /**
    * Get the preferred layout size. If the view implements
-   * {@link Scrollable}, this method returns 
+   * {@link Scrollable}, this method returns
    * {@link Scrollable#getPreferredScrollableViewportSize}.
    * Otherwise, it returns {@link Component#getPreferredSize()}.
-   * 
+   *
    * @return the preferred layout size, as described about.
    */
-  public Dimension preferredLayoutSize(Container parent) 
+  public Dimension preferredLayoutSize(Container parent)
   {
     JViewport vp = (JViewport)parent;
     Component view = vp.getView();
@@ -107,13 +107,13 @@ public class ViewportLayout implements LayoutManager, Serializable
   /**
    * Get the minimum layout size. Normally this method returns the value,
    * returned by the view method {@link Component#getMinimumSize()}.
-   * 
-   * If the view is not set, the zero size is returned. 
+   *
+   * If the view is not set, the zero size is returned.
    *
    * @param parent the viewport
    * @return the minimum layout size.
    */
-  public Dimension minimumLayoutSize(Container parent) 
+  public Dimension minimumLayoutSize(Container parent)
   {
     // These values have been determined by the Mauve test for this method.
     return new Dimension(4, 4);
@@ -132,7 +132,7 @@ public class ViewportLayout implements LayoutManager, Serializable
    * 
                    • In {@link JViewport#setViewSize(Dimension)}, the view size is never
    * set smaller that its minimum size.
                      • 
    * 
-   * 
+   *
    * @see JViewport#getViewSize
    * @see JViewport#setViewSize
    * @see JViewport#getViewPosition
diff --git a/libjava/classpath/javax/swing/WindowConstants.java b/libjava/classpath/javax/swing/WindowConstants.java
index 598a61e149b..63ec2cbb579 100644
--- a/libjava/classpath/javax/swing/WindowConstants.java
+++ b/libjava/classpath/javax/swing/WindowConstants.java
@@ -38,14 +38,14 @@ exception statement from your version. */
 package javax.swing;
 
 /**
- * Defines some constants that are used in Swing's top-level containers.  See 
+ * Defines some constants that are used in Swing's top-level containers.  See
  * the following methods:
  * 
                        
  * 
                      • {@link JFrame#setDefaultCloseOperation(int)};
                        • 
  * 
                      • {@link JInternalFrame#setDefaultCloseOperation(int)};
                        • 
  * 
                      • {@link JDialog#setDefaultCloseOperation(int)};
                        • 
  * 
                      
- * 
+ *
  * @author Andrew Selkirk
  */
 public interface WindowConstants
@@ -62,16 +62,16 @@ public interface WindowConstants
 
   /**
    * Dispose the container when it is closed.
-   * 
+   *
    * @see Window#dispose()
    */
   int DISPOSE_ON_CLOSE = 2;
 
   /**
    * Exit the application when the container is closed.
-   * 
+   *
    * @see System#exit(int)
-   * 
+   *
    * @since 1.4
    */
   int EXIT_ON_CLOSE = 3;
diff --git a/libjava/classpath/javax/swing/border/AbstractBorder.java b/libjava/classpath/javax/swing/border/AbstractBorder.java
index 16bb238c374..f75bcbbc279 100644
--- a/libjava/classpath/javax/swing/border/AbstractBorder.java
+++ b/libjava/classpath/javax/swing/border/AbstractBorder.java
@@ -1,4 +1,4 @@
-/* AbstractBorder.java -- 
+/* AbstractBorder.java --
    Copyright (C) 2003, 2006, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -87,10 +87,10 @@ public abstract class AbstractBorder implements Border, Serializable
   }
 
   /**
-   * Returns the insets required for drawing this border around the specified 
+   * Returns the insets required for drawing this border around the specified
    * component.
    *
-   * @param c  the component that the border applies to (ignored here, 
+   * @param c  the component that the border applies to (ignored here,
    *     subclasses may use it).
    *
    * @return an Insets object whose left, right,
@@ -106,25 +106,25 @@ public abstract class AbstractBorder implements Border, Serializable
   }
 
   /**
-   * Returns the insets required for drawing this border around the specified 
-   * component.  The default implementation provided here sets the 
-   * left, right, top and 
-   * bottom fields of the passed insets parameter to 
+   * Returns the insets required for drawing this border around the specified
+   * component.  The default implementation provided here sets the
+   * left, right, top and
+   * bottom fields of the passed insets parameter to
    * zero.
    *
-   * @param c  the component that the border applies to (ignored here, 
+   * @param c  the component that the border applies to (ignored here,
    *     subclasses may use it).
-   * @param insets  an instance that will be overwritten and returned as the 
-   *     result (null not permitted).  
+   * @param insets  an instance that will be overwritten and returned as the
+   *     result (null not permitted).
    *
-   * @return The border insets (the same object that was passed as the 
+   * @return The border insets (the same object that was passed as the
    *     insets argument).
    *
    * @see #getBorderInsets(Component)
-   * 
+   *
    * @throws NullPointerException if insets is null.
    */
-  public Insets getBorderInsets(Component c, Insets insets) 
+  public Insets getBorderInsets(Component c, Insets insets)
   {
     insets.left = insets.right = insets.top = insets.bottom = 0;
     return insets;
@@ -139,14 +139,14 @@ public abstract class AbstractBorder implements Border, Serializable
    *
    * @return false.
    */
-  public boolean isBorderOpaque() 
+  public boolean isBorderOpaque()
   {
     return false;
   }
 
   /**
-   * Returns a rectangle that covers the specified area minus the insets 
-   * required to draw this border.  Components that wish to determine an area 
+   * Returns a rectangle that covers the specified area minus the insets
+   * required to draw this border.  Components that wish to determine an area
    * into which they can safely draw without intersecting with a border might
    * want to use this helper method.
    *
@@ -155,7 +155,7 @@ public abstract class AbstractBorder implements Border, Serializable
    * @param y the vertical position of the border.
    * @param width the width of the available area for the border.
    * @param height the height of the available area for the border.
-   * 
+   *
    * @return The interior rectangle.
    */
   public Rectangle getInteriorRectangle(Component c, int x, int y, int width,
@@ -163,12 +163,12 @@ public abstract class AbstractBorder implements Border, Serializable
   {
     return getInteriorRectangle(c, this, x, y, width, height);
   }
-  
+
   /**
-   * Returns a rectangle that covers the specified area minus the insets 
+   * Returns a rectangle that covers the specified area minus the insets
    * required to draw the specified border (if the border is null,
-   * zero insets are assumed).  Components that wish to determine an area into 
-   * which they can safely draw without intersecting with a border might want 
+   * zero insets are assumed).  Components that wish to determine an area into
+   * which they can safely draw without intersecting with a border might want
    * to use this helper method.
    *
    * @param c the component in the center of this border.
@@ -177,7 +177,7 @@ public abstract class AbstractBorder implements Border, Serializable
    * @param y the vertical position of the border.
    * @param width the width of the available area for the border.
    * @param height the height of the available area for the border.
-   * 
+   *
    * @return The interior rectangle.
    */
   public static Rectangle getInteriorRectangle(Component c, Border b, int x,
diff --git a/libjava/classpath/javax/swing/border/BevelBorder.java b/libjava/classpath/javax/swing/border/BevelBorder.java
index 5b4761e9ec8..b91961d6689 100644
--- a/libjava/classpath/javax/swing/border/BevelBorder.java
+++ b/libjava/classpath/javax/swing/border/BevelBorder.java
@@ -1,4 +1,4 @@
-/* BevelBorder.java -- 
+/* BevelBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -76,12 +76,12 @@ public class BevelBorder extends AbstractBorder
    * pressed into the screen.
    */
   public static final int LOWERED = 1;
-  
+
 
   /**
    * The type of this BevelBorder, which is either {@link #RAISED}
    * or {@link #LOWERED}.
-   */  
+   */
   protected int bevelType;
 
 
@@ -296,7 +296,7 @@ public class BevelBorder extends AbstractBorder
     return insets;
   }
 
-  
+
   /**
    * Determines the color that will be used for the outer side of
    * highlighted edges when painting the border.  If a highlight color
@@ -306,7 +306,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see #getHighlightInnerColor(java.awt.Component)
    * @see java.awt.Color#brighter()
    */
@@ -329,7 +329,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#brighter()
    */
@@ -352,7 +352,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#darker()
    */
@@ -374,7 +374,7 @@ public class BevelBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see #getShadowInnerColor(java.awt.Component)
    * @see java.awt.Color#darker()
    */
@@ -392,7 +392,7 @@ public class BevelBorder extends AbstractBorder
    * highlighted edges when painting the border, or null
    * if that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly null).
    */
   public Color getHighlightOuterColor()
@@ -406,7 +406,7 @@ public class BevelBorder extends AbstractBorder
    * highlighted edges when painting the border, or null
    * if that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly null).
    */
   public Color getHighlightInnerColor()
@@ -420,7 +420,7 @@ public class BevelBorder extends AbstractBorder
    * shadowed edges when painting the border, or null if
    * that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly null).
    */
   public Color getShadowInnerColor()
@@ -434,19 +434,19 @@ public class BevelBorder extends AbstractBorder
    * shadowed edges when painting the border, or null if
    * that color will be derived from the background of the enclosed
    * Component.
-   * 
+   *
    * @return The color (possibly null).
    */
   public Color getShadowOuterColor()
   {
     return shadowOuter;
   }
-  
-  
+
+
   /**
    * Returns the appearance of this border, which is either {@link
    * #RAISED} or {@link #LOWERED}.
-   * 
+   *
    * @return The bevel type ({@link #RAISED} or {@link #LOWERED}).
    */
   public int getBevelType()
@@ -475,7 +475,7 @@ public class BevelBorder extends AbstractBorder
      * because Color.brighten() and Color.darken() always return an
      * opaque color.
      */
-    return 
+    return
       ((highlightOuter == null) || (highlightOuter.getAlpha() == 255))
       && ((highlightInner == null) || (highlightInner.getAlpha() == 255))
       && ((shadowInner == null) || (shadowInner.getAlpha() == 255))
@@ -523,7 +523,7 @@ public class BevelBorder extends AbstractBorder
 
   /**
    * Paints a two-pixel bevel in four colors.
-   * 
+   *
    * 
                          * ++++++++++++
    * +..........#    + = color a
@@ -582,4 +582,3 @@ public class BevelBorder extends AbstractBorder
     }
   }
 }
-
diff --git a/libjava/classpath/javax/swing/border/Border.java b/libjava/classpath/javax/swing/border/Border.java
index f4af3fb38bb..da25832ad92 100644
--- a/libjava/classpath/javax/swing/border/Border.java
+++ b/libjava/classpath/javax/swing/border/Border.java
@@ -1,4 +1,4 @@
-/* Border.java -- 
+/* Border.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,7 +79,7 @@ public interface Border
    */
   void paintBorder(Component c, Graphics g, int x, int y, int width,
                    int height);
-  
+
   /**
    * Measures the width of this border.
    *
@@ -90,7 +90,7 @@ public interface Border
    *         width of the border at the respective edge.
    */
   Insets getBorderInsets(Component c);
-  
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
diff --git a/libjava/classpath/javax/swing/border/CompoundBorder.java b/libjava/classpath/javax/swing/border/CompoundBorder.java
index ba2e745aab5..d811150ba70 100644
--- a/libjava/classpath/javax/swing/border/CompoundBorder.java
+++ b/libjava/classpath/javax/swing/border/CompoundBorder.java
@@ -1,4 +1,4 @@
-/* CompoundBorder.java -- 
+/* CompoundBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -115,7 +115,7 @@ public class CompoundBorder extends AbstractBorder
    */
   public boolean isBorderOpaque()
   {
-    // Although the API specification states that this method 
+    // Although the API specification states that this method
     // returns true if both the inside and outside borders are non-null
     // and opaque, and false otherwise, a mauve test shows that if both
     // the inside or outside borders are null, then true is returned.
@@ -137,7 +137,7 @@ public class CompoundBorder extends AbstractBorder
 
   /**
    * Paints the compound border by first painting the outside border,
-   * then painting the inside border tightly nested into the outside. 
+   * then painting the inside border tightly nested into the outside.
    *
    * @param c the component whose border is to be painted.
    * @param g the graphics for painting.
@@ -233,7 +233,7 @@ public class CompoundBorder extends AbstractBorder
    * Returns the outside border, which is painted outside both the
    * bordered Component and the inside border. It is valid for the
    * result to be null.
-   * 
+   *
    * @return The outside border (possibly null).
    */
   public Border getOutsideBorder()
@@ -245,7 +245,7 @@ public class CompoundBorder extends AbstractBorder
    * Returns the inside border, which is painted between the bordered
    * Component and the outside border. It is valid for the result to
    * be null.
-   * 
+   *
    * @return The inside border (possibly null).
    */
   public Border getInsideBorder()
diff --git a/libjava/classpath/javax/swing/border/EmptyBorder.java b/libjava/classpath/javax/swing/border/EmptyBorder.java
index c8e9c604469..da66511632c 100644
--- a/libjava/classpath/javax/swing/border/EmptyBorder.java
+++ b/libjava/classpath/javax/swing/border/EmptyBorder.java
@@ -1,4 +1,4 @@
-/* EmptyBorder.java -- 
+/* EmptyBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -202,8 +202,8 @@ public class EmptyBorder extends AbstractBorder
   {
     return getBorderInsets(null, null);
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting. Since an empty border does not paint any pixels
diff --git a/libjava/classpath/javax/swing/border/EtchedBorder.java b/libjava/classpath/javax/swing/border/EtchedBorder.java
index cd48b18dad3..e9ee9e218d9 100644
--- a/libjava/classpath/javax/swing/border/EtchedBorder.java
+++ b/libjava/classpath/javax/swing/border/EtchedBorder.java
@@ -1,4 +1,4 @@
-/* EtchedBorder.java -- 
+/* EtchedBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,8 +63,8 @@ public class EtchedBorder extends AbstractBorder
    * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 4001244046866360638L;
-  
-  
+
+
   /**
    * Indicates that the border appears as coming out of the
    * background.
@@ -78,13 +78,13 @@ public class EtchedBorder extends AbstractBorder
    */
   public static final int LOWERED = 1;
 
-  
+
   /**
    * The type of this EtchedBorder, which is either {@link #RAISED}
    * or {@link #LOWERED}.
    */
   protected int etchType;
-  
+
 
   /**
    * The highlight color, or null to indicate that the
@@ -139,8 +139,8 @@ public class EtchedBorder extends AbstractBorder
      * assign a value here.
      */
   }
-  
-  
+
+
   /**
    * Constructs a lowered EtchedBorder, explicitly selecting the
    * colors that will be used for highlight and shadow.
@@ -157,8 +157,8 @@ public class EtchedBorder extends AbstractBorder
   {
     this(LOWERED, highlight, shadow);
   }
-  
-  
+
+
   /**
    * Constructs an EtchedBorder with the specified appearance,
    * explicitly selecting the colors that will be used for
@@ -186,8 +186,8 @@ public class EtchedBorder extends AbstractBorder
     this.highlight = highlight;
     this.shadow = shadow;
   }
-  
-  
+
+
   /**
    * Paints the border for a given component.
    *
@@ -214,8 +214,8 @@ public class EtchedBorder extends AbstractBorder
       break;
     }
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -277,11 +277,11 @@ public class EtchedBorder extends AbstractBorder
       ((highlight == null) || (highlight.getAlpha() == 255))
       && ((shadow == null) || (shadow.getAlpha() == 255));
   }
-  
+
   /**
    * Returns the appearance of this EtchedBorder, which is either
    * {@link #RAISED} or {@link #LOWERED}.
-   * 
+   *
    * @return The type ({@link #RAISED} or {@link #LOWERED}).
    */
   public int getEtchType()
@@ -300,7 +300,7 @@ public class EtchedBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#brighter()
    */
@@ -316,7 +316,7 @@ public class EtchedBorder extends AbstractBorder
    * Returns the color that will be used for highlighted parts when
    * painting the border, or null if that color will be
    * derived from the background of the enclosed Component.
-   * 
+   *
    * @return The highlight color (possibly null).
    */
   public Color getHighlightColor()
@@ -335,7 +335,7 @@ public class EtchedBorder extends AbstractBorder
    * @param c the component enclosed by this border.
    *
    * @return The shadow color.
-   * 
+   *
    * @see java.awt.Component#getBackground()
    * @see java.awt.Color#darker()
    */
@@ -346,13 +346,13 @@ public class EtchedBorder extends AbstractBorder
     else
       return c.getBackground().darker();
   }
-  
-  
+
+
   /**
    * Returns the color that will be used for shadowed parts when
    * painting the border, or null if that color will be
    * derived from the background of the enclosed Component.
-   * 
+   *
    * @return The shadow color (possibly null).
    */
   public Color getShadowColor()
diff --git a/libjava/classpath/javax/swing/border/LineBorder.java b/libjava/classpath/javax/swing/border/LineBorder.java
index 31e19fe1f2e..e78bbee3b9b 100644
--- a/libjava/classpath/javax/swing/border/LineBorder.java
+++ b/libjava/classpath/javax/swing/border/LineBorder.java
@@ -1,4 +1,4 @@
-/* LineBorder.java -- 
+/* LineBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -121,12 +121,12 @@ public class LineBorder extends AbstractBorder
   {
     this (color, thickness, /* roundedCorners */ false);
   }
-  
-  
+
+
   /**
    * Constructs a LineBorder given its color, thickness, and whether
    * it has rounded corners.
-   * 
+   *
    * 
                      [An illustration of two LineBorders]
    *
@@ -159,12 +159,12 @@ public class LineBorder extends AbstractBorder
     this.thickness = thickness;
     this.roundedCorners = roundedCorners;
   }
-  
-  
+
+
   /**
    * Returns a black, one pixel thick, plain {@link LineBorder}. The method
    * may always return the same (singleton) {@link LineBorder} instance.
-   * 
+   *
    * @return The border.
    */
   public static Border createBlackLineBorder()
@@ -174,15 +174,15 @@ public class LineBorder extends AbstractBorder
      */
     if (blackLineBorder == null)
       blackLineBorder = new LineBorder(Color.black);
-    
+
     return blackLineBorder;
   }
-  
-  
+
+
   /**
    * Returns a gray, one pixel thick, plain {@link LineBorder}. The method
    * may always return the same (singleton) {@link LineBorder} instance.
-   * 
+   *
    * @return The border.
    */
   public static Border createGrayLineBorder()
@@ -192,11 +192,11 @@ public class LineBorder extends AbstractBorder
      */
     if (grayLineBorder == null)
       grayLineBorder = new LineBorder(Color.gray);
-    
+
     return grayLineBorder;
   }
-  
-  
+
+
   /**
    * Paints the line border around a given Component.
    *
@@ -255,8 +255,8 @@ public class LineBorder extends AbstractBorder
       g.setColor(oldColor);
     }
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -273,8 +273,8 @@ public class LineBorder extends AbstractBorder
   {
     return new Insets(thickness, thickness, thickness, thickness);
   }
-  
-  
+
+
   /**
    * Measures the width of this border, storing the results into a
    * pre-existing Insets object.
@@ -295,30 +295,30 @@ public class LineBorder extends AbstractBorder
     insets.left = insets.right = insets.top = insets.bottom = thickness;
     return insets;
   }
-  
-  
+
+
   /**
    * Returns the color of the line.
-   * 
+   *
    * @return The line color (never null).
    */
   public Color getLineColor()
   {
     return lineColor;
   }
-  
-  
+
+
   /**
    * Returns the thickness of the line in pixels.
-   * 
+   *
    * @return The line thickness (in pixels).
    */
   public int getThickness()
   {
     return thickness;
   }
-  
-  
+
+
   /**
    * Returns whether this LineBorder os drawm with rounded
    * or with plain corners.
@@ -330,8 +330,8 @@ public class LineBorder extends AbstractBorder
   {
     return roundedCorners;
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
diff --git a/libjava/classpath/javax/swing/border/MatteBorder.java b/libjava/classpath/javax/swing/border/MatteBorder.java
index 944cd2866db..c0c2d776053 100644
--- a/libjava/classpath/javax/swing/border/MatteBorder.java
+++ b/libjava/classpath/javax/swing/border/MatteBorder.java
@@ -1,4 +1,4 @@
-/* MatteBorder.java -- 
+/* MatteBorder.java --
    Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,8 +61,8 @@ public class MatteBorder extends EmptyBorder
    * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 4422248989617298224L;
-  
-  
+
+
   /**
    * The color that is used for filling the border, or
    * null if the border is filled with repetitions of a
@@ -71,8 +71,8 @@ public class MatteBorder extends EmptyBorder
    * @see #tileIcon
    */
   protected Color color;
-  
-  
+
+
   /**
    * The icon is used for filling the border with a tile, or
    * null if the border is filled with a solid
@@ -81,8 +81,8 @@ public class MatteBorder extends EmptyBorder
    * @see #color
    */
   protected Icon tileIcon;
-  
-  
+
+
   /**
    * Constructs a MatteBorder given the width on each side
    * and a fill color.
@@ -171,8 +171,8 @@ public class MatteBorder extends EmptyBorder
          borderInsets.bottom, borderInsets.right,
          tileIcon);
   }
-  
-  
+
+
   /**
    * Constructs a MatteBorder given an icon for tiling the
    * border area. The icon width is used for the border insets
@@ -188,8 +188,8 @@ public class MatteBorder extends EmptyBorder
   {
     this(-1, -1, -1, -1, tileIcon);
   }
-  
-  
+
+
   /**
    * Paints the border for a given component.
    *
@@ -215,8 +215,8 @@ public class MatteBorder extends EmptyBorder
               i.right, height - i.bottom,
               width - i.right, i.top);
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -236,8 +236,8 @@ public class MatteBorder extends EmptyBorder
      */
     return this.getBorderInsets(c, null);
   }
-  
-  
+
+
   /**
    * Measures the width of this border, storing the results into a
    * pre-existing Insets object.
@@ -271,8 +271,8 @@ public class MatteBorder extends EmptyBorder
      */
     return super.getBorderInsets(c, insets);
   }
-  
-  
+
+
   /**
    * Measures the width of this border.
    *
@@ -290,34 +290,34 @@ public class MatteBorder extends EmptyBorder
      */
     return this.getBorderInsets(null, null);
   }
-  
-  
+
+
   /**
    * Returns the color that is used for filling the border, or
    * null if the border is filled with repetitions of a
    * tile icon.
-   * 
+   *
    * @return The color (possibly null).
    */
   public Color getMatteColor()
   {
     return color;
   }
-  
-  
+
+
   /**
    * Returns the icon is used for tiling the border, or
    * null if the border is filled with a color instead of
    * an icon.
-   * 
+   *
    * @return The icon (possibly null).
    */
   public Icon getTileIcon()
   {
     return tileIcon;
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
@@ -330,7 +330,7 @@ public class MatteBorder extends EmptyBorder
   {
     return (color != null) && (color.getAlpha() == 255);
   }
-  
+
 
   /**
    * Paints a rectangular area of the border. This private helper
@@ -372,7 +372,7 @@ public class MatteBorder extends EmptyBorder
       }
       return;
     }
-    
+
     // If this border has no icon end painting here.
     if (tileIcon == null)
       return;
diff --git a/libjava/classpath/javax/swing/border/SoftBevelBorder.java b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
index 028fd00e021..c0c9ae811dd 100644
--- a/libjava/classpath/javax/swing/border/SoftBevelBorder.java
+++ b/libjava/classpath/javax/swing/border/SoftBevelBorder.java
@@ -1,4 +1,4 @@
-/* SoftBevelBorder.java -- 
+/* SoftBevelBorder.java --
    Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -242,7 +242,7 @@ public class SoftBevelBorder extends BevelBorder
     return insets;
   }
 
-  
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting.
@@ -261,7 +261,7 @@ public class SoftBevelBorder extends BevelBorder
 
   /**
    * Paints a soft bevel in four colors.
-   * 
+   *
    * 
                          * +++++++++++.
    * ++.........#    + = color a
diff --git a/libjava/classpath/javax/swing/border/TitledBorder.java b/libjava/classpath/javax/swing/border/TitledBorder.java
index 38ccd720f16..4d4f3af7d26 100644
--- a/libjava/classpath/javax/swing/border/TitledBorder.java
+++ b/libjava/classpath/javax/swing/border/TitledBorder.java
@@ -1,4 +1,4 @@
-/* TitledBorder.java -- 
+/* TitledBorder.java --
    Copyright (C) 2003, 2004, 2005, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -241,7 +241,7 @@ public class TitledBorder extends AbstractBorder
    * on MacOS X 10.1.5.
    */
   static final long serialVersionUID = 8012999415147721601L;
-  
+
 
   /**
    * The title, or null to display no title.
@@ -257,7 +257,7 @@ public class TitledBorder extends AbstractBorder
    */
   protected Border border;
 
-  
+
   /**
    * The vertical position of the title text relative to the border,
    * which is one of {@link #ABOVE_TOP}, {@link #TOP}, {@link
@@ -318,7 +318,7 @@ public class TitledBorder extends AbstractBorder
     this(border, /* title */ "", LEADING, TOP,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border and title text.
@@ -334,7 +334,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, LEADING, TOP,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -350,7 +350,7 @@ public class TitledBorder extends AbstractBorder
    *        text in relation to the border. The value must be one of
    *        {@link #LEFT}, {@link #CENTER}, {@link #RIGHT}, {@link #LEADING},
    *        {@link #TRAILING}, or {@link #DEFAULT_JUSTIFICATION}.
-   
+
    * @param titlePosition the vertical position of the title text
    *        in relation to the border. The value must be one of
    *        {@link #ABOVE_TOP}, {@link #TOP}, {@link #BELOW_TOP},
@@ -366,7 +366,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, titleJustification, titlePosition,
          /* titleFont */ null, /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -401,7 +401,7 @@ public class TitledBorder extends AbstractBorder
     this(border, title, titleJustification, titlePosition, titleFont,
          /* titleColor */ null);
   }
-  
+
 
   /**
    * Constructs a TitledBorder given its border, title text, horizontal
@@ -448,8 +448,8 @@ public class TitledBorder extends AbstractBorder
     this.titleFont = titleFont;
     this.titleColor = titleColor;
   }
-  
-  
+
+
   /**
    * Paints the border and the title text.
    *
@@ -460,7 +460,7 @@ public class TitledBorder extends AbstractBorder
    * @param width the width of the available area for painting the border.
    * @param height the height of the available area for painting the border.
    */
-  public void paintBorder(Component c, Graphics  g, 
+  public void paintBorder(Component c, Graphics  g,
                           int x, int y, int width, int height)
   {
     Rectangle borderRect = new Rectangle(x + EDGE_SPACING, y + EDGE_SPACING,
@@ -666,7 +666,7 @@ public class TitledBorder extends AbstractBorder
                                   borderRect.width,
                                   borderRect.height);
                   }
-	                
+
               }
             else
               {
@@ -683,7 +683,7 @@ public class TitledBorder extends AbstractBorder
                                   borderRect.width,
                                   borderRect.height);
                   }
-	                
+
               }
             g.setClip(saved);
           }
@@ -710,7 +710,7 @@ public class TitledBorder extends AbstractBorder
   {
     return getBorderInsets(c, new Insets(0, 0, 0, 0));
   }
-  
+
 
   /**
    * Measures the width of this border, storing the results into a
@@ -795,8 +795,8 @@ public class TitledBorder extends AbstractBorder
       }
     return insets;
   }
-  
-  
+
+
   /**
    * Returns false, indicating that there are pixels inside
    * the area of this border where the background shines through.
@@ -961,7 +961,7 @@ public class TitledBorder extends AbstractBorder
   public void setTitlePosition(int titlePosition)
   {
     if ((titlePosition < DEFAULT_POSITION) || (titlePosition > BELOW_BOTTOM))
-      throw new IllegalArgumentException(titlePosition 
+      throw new IllegalArgumentException(titlePosition
           + " is not a valid title position.");
 
     // Swing borders are not JavaBeans, thus no need to fire an event.
@@ -983,7 +983,7 @@ public class TitledBorder extends AbstractBorder
   {
     if ((titleJustification < DEFAULT_JUSTIFICATION)
         || (titleJustification > TRAILING))
-      throw new IllegalArgumentException(titleJustification 
+      throw new IllegalArgumentException(titleJustification
           + " is not a valid title justification.");
 
     // Swing borders are not JavaBeans, thus no need to fire an event.
@@ -1027,7 +1027,7 @@ public class TitledBorder extends AbstractBorder
    *
    * @param c the Component for which this TitledBorder constitutes
    *        a border.
-   *        
+   *
    * @return The minimum size.
    */
   public Dimension getMinimumSize(Component c)
diff --git a/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
index efb527725fa..a554208ad18 100644
--- a/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -77,9 +77,9 @@ public abstract class AbstractColorChooserPanel extends JPanel
   /**
    * Returns the key code for the mnemonic for this panel.  This method returns
    * zero to indicate no mnemonic, subclasses can override this.
-   * 
+   *
    * @return 0, to indicate no mnemonic key code.
-   * 
+   *
    * @see #getDisplayedMnemonicIndex()
    * @since 1.4
    */
@@ -87,14 +87,14 @@ public abstract class AbstractColorChooserPanel extends JPanel
   {
     return 0;
   }
-  
+
   /**
-   * Returns the index of the character in the display name that is the 
+   * Returns the index of the character in the display name that is the
    * mnemonic.  This method returns -1 to indicate no mnemonic,
    * subclasses can override.
-   * 
+   *
    * @return -1, to indicate no mnemonic.
-   * 
+   *
    * @see #getDisplayName()
    * @see #getMnemonic()
    * @since 1.4
@@ -103,7 +103,7 @@ public abstract class AbstractColorChooserPanel extends JPanel
   {
     return -1;
   }
-  
+
   /**
    * This method updates the chooser panel when the JColorChooser's color has
    * changed.
diff --git a/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java b/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
index 923ea531ffb..ef8ea21f15c 100644
--- a/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/libjava/classpath/javax/swing/colorchooser/ColorChooserComponentFactory.java
@@ -64,7 +64,7 @@ public class ColorChooserComponentFactory
    */
   public static AbstractColorChooserPanel[] getDefaultChooserPanels()
   {
-    AbstractColorChooserPanel[] values = 
+    AbstractColorChooserPanel[] values =
                                          {
                                            new DefaultSwatchChooserPanel(),
                                            new DefaultHSBChooserPanel(),
diff --git a/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java b/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
index b660505fc17..7831e4790e1 100644
--- a/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
+++ b/libjava/classpath/javax/swing/colorchooser/ColorSelectionModel.java
@@ -47,22 +47,22 @@ import javax.swing.event.ChangeListener;
 /**
  * A model that is used by the {@link JColorChooser} component to represent the
  * selected color.
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
-public interface ColorSelectionModel 
+public interface ColorSelectionModel
 {
 
   /**
    * Returns the selected color.
-   * 
+   *
    * @return The selected color.
    */
   Color getSelectedColor();
 
   /**
    * Sets the selected color.
-   * 
+   *
    * @param color  the selected color.
    */
   void setSelectedColor(Color color);
@@ -70,13 +70,13 @@ public interface ColorSelectionModel
   /**
    * Registers a listener to receive {@link ChangeEvent} notifications
    * from this model.
-   * 
+   *
    * @param listener  the listener.
    */
   void addChangeListener(ChangeListener listener);
 
   /**
-   * Deregisters a listener so that it no longer receives {@link ChangeEvent} 
+   * Deregisters a listener so that it no longer receives {@link ChangeEvent}
    * notifications from this action.
    *
    * @param listener  the listener.
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java b/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
index aae2bed68e5..07493f6d672 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultColorSelectionModel.java
@@ -113,8 +113,8 @@ public class DefaultColorSelectionModel implements ColorSelectionModel,
       throw new Error("ColorSelectionModel cannot be set to have null color.");
     if (color != selectedColor)
       {
-	this.selectedColor = color;
-	fireStateChanged();
+        this.selectedColor = color;
+        fireStateChanged();
       }
   }
 
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
index 112d02166b1..d035fe194b3 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultHSBChooserPanel.java
@@ -206,7 +206,7 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     {
       Point p = e.getPoint();
       if (p.x < 0 || p.y < 0 || p.y > imgHeight || p.x > imgWidth)
-	return;
+        return;
 
       gradientPoint = p;
       update(p);
@@ -231,11 +231,11 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     {
       handlingMouse = true;
       if (hSpinner.isEnabled())
-	updateH(p);
+        updateH(p);
       else if (sSpinner.isEnabled())
-	updateS(p);
+        updateS(p);
       else
-	updateB(p);
+        updateB(p);
       handlingMouse = false;
     }
 
@@ -309,21 +309,21 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     public void stateChanged(ChangeEvent e)
     {
       if (internalChange)
-	return;
+        return;
 
       Integer value = new Integer(slider.getValue());
 
       switch (locked)
         {
-	case HLOCKED:
-	  hSpinner.setValue(value);
-	  break;
-	case SLOCKED:
-	  sSpinner.setValue(value);
-	  break;
-	case BLOCKED:
-	  bSpinner.setValue(value);
-	  break;
+        case HLOCKED:
+          hSpinner.setValue(value);
+          break;
+        case SLOCKED:
+          sSpinner.setValue(value);
+          break;
+        case BLOCKED:
+          bSpinner.setValue(value);
+          break;
         }
     }
   }
@@ -344,18 +344,18 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
       JSpinner change;
       if (e.getSource() == hRadio)
         {
-	  locked = HLOCKED;
-	  change = hSpinner;
+          locked = HLOCKED;
+          change = hSpinner;
         }
       else if (e.getSource() == sRadio)
         {
-	  locked = SLOCKED;
-	  change = sSpinner;
+          locked = SLOCKED;
+          change = sSpinner;
         }
       else
         {
-	  locked = BLOCKED;
-	  change = bSpinner;
+          locked = BLOCKED;
+          change = bSpinner;
         }
 
       change.setEnabled(((AbstractButton) e.getSource()).isSelected());
@@ -380,7 +380,7 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     public void stateChanged(ChangeEvent e)
     {
       if (internalChange)
-	return;
+        return;
 
       float h = ((Number) hSpinner.getValue()).intValue() / 360f;
       float s = ((Number) sSpinner.getValue()).intValue() / 100f;
@@ -393,8 +393,8 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
       if (! handlingMouse && slider != null && ! slider.getValueIsAdjusting())
         {
-	  updateImage();
-	  updateTrack();
+          updateImage();
+          updateTrack();
         }
       repaint();
     }
@@ -435,44 +435,44 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
     if (! spinnerTrigger)
       {
-	hSpinner.setValue(new Integer((int) (hsbVals[0] * 360)));
-	sSpinner.setValue(new Integer((int) (hsbVals[1] * 100)));
-	bSpinner.setValue(new Integer((int) (hsbVals[2] * 100)));
+        hSpinner.setValue(new Integer((int) (hsbVals[0] * 360)));
+        sSpinner.setValue(new Integer((int) (hsbVals[1] * 100)));
+        bSpinner.setValue(new Integer((int) (hsbVals[2] * 100)));
       }
 
     switch (locked)
       {
       case HLOCKED:
-	if (slider != null)
-	  slider.setValue(((Number) hSpinner.getValue()).intValue());
-	if (! handlingMouse)
-	  {
-	    gradientPoint.x = (int) ((1
-	                      - ((Number) sSpinner.getValue()).intValue() / 100f) * imgWidth);
-	    gradientPoint.y = (int) ((1
-	                      - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
-	  }
-	break;
+        if (slider != null)
+          slider.setValue(((Number) hSpinner.getValue()).intValue());
+        if (! handlingMouse)
+          {
+            gradientPoint.x = (int) ((1
+                              - ((Number) sSpinner.getValue()).intValue() / 100f) * imgWidth);
+            gradientPoint.y = (int) ((1
+                              - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
+          }
+        break;
       case SLOCKED:
-	if (slider != null)
-	  slider.setValue(((Number) sSpinner.getValue()).intValue());
-	if (! handlingMouse)
-	  {
-	    gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
-	    gradientPoint.y = (int) ((1
-	                      - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
-	  }
-	break;
+        if (slider != null)
+          slider.setValue(((Number) sSpinner.getValue()).intValue());
+        if (! handlingMouse)
+          {
+            gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
+            gradientPoint.y = (int) ((1
+                              - ((Number) bSpinner.getValue()).intValue() / 100f) * imgHeight);
+          }
+        break;
       case BLOCKED:
-	if (slider != null)
-	  slider.setValue(((Number) bSpinner.getValue()).intValue());
-	if (! handlingMouse)
-	  {
-	    gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
-	    gradientPoint.y = (int) ((1
-	                      - ((Number) sSpinner.getValue()).intValue() / 100f) * imgHeight);
-	  }
-	break;
+        if (slider != null)
+          slider.setValue(((Number) bSpinner.getValue()).intValue());
+        if (! handlingMouse)
+          {
+            gradientPoint.x = (int) (((Number) hSpinner.getValue()).intValue() / 360f * imgWidth);
+            gradientPoint.y = (int) ((1
+                              - ((Number) sSpinner.getValue()).intValue() / 100f) * imgHeight);
+          }
+        break;
       }
     internalChange = false;
 
@@ -498,21 +498,21 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
     gradientPanel = new JPanel()
         {
-	  public Dimension getPreferredSize()
-	  {
-	    return new Dimension(imgWidth, imgHeight);
-	  }
+          public Dimension getPreferredSize()
+          {
+            return new Dimension(imgWidth, imgHeight);
+          }
 
-	  public void paint(Graphics g)
-	  {
-	    if (gradientImage != null)
-	      g.drawImage(gradientImage, 0, 0, this);
+          public void paint(Graphics g)
+          {
+            if (gradientImage != null)
+              g.drawImage(gradientImage, 0, 0, this);
 
-	    Color saved = g.getColor();
-	    g.setColor(Color.WHITE);
-	    g.drawOval(gradientPoint.x - 3, gradientPoint.y - 3, 6, 6);
-	    g.setColor(saved);
-	  }
+            Color saved = g.getColor();
+            g.setColor(Color.WHITE);
+            g.drawOval(gradientPoint.x - 3, gradientPoint.y - 3, 6, 6);
+            g.setColor(saved);
+          }
         };
 
     MouseAdapter ml = new MainGradientMouseListener();
@@ -521,16 +521,16 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
     trackPanel = new JPanel()
         {
-	  public Dimension getPreferredSize()
-	  {
-	    return new Dimension(trackWidth, imgHeight);
-	  }
+          public Dimension getPreferredSize()
+          {
+            return new Dimension(trackWidth, imgHeight);
+          }
 
-	  public void paint(Graphics g)
-	  {
-	    if (trackImage != null)
-	      g.drawImage(trackImage, 0, 0, this);
-	  }
+          public void paint(Graphics g)
+          {
+            if (trackImage != null)
+              g.drawImage(trackImage, 0, 0, this);
+          }
         };
 
     slider = new JSlider();
@@ -682,9 +682,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < imgWidth; i++)
-	pix[index++] = Color.HSBtoRGB(hValue, (imgWidth - i * 1f) / imgWidth,
-	                              (imgHeight - j * 1f) / imgHeight)
-	               | (255 << 24);
+        pix[index++] = Color.HSBtoRGB(hValue, (imgWidth - i * 1f) / imgWidth,
+                                      (imgHeight - j * 1f) / imgHeight)
+                       | (255 << 24);
 
     gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
                                                       pix, 0, imgWidth));
@@ -702,9 +702,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     int index = 0;
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < imgWidth; i++)
-	pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth,
-	                              (imgHeight - j * 1f) / imgHeight, bValue)
-	               | (255 << 24);
+        pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth,
+                                      (imgHeight - j * 1f) / imgHeight, bValue)
+                       | (255 << 24);
 
     gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
                                                       pix, 0, imgWidth));
@@ -722,9 +722,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     int index = 0;
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < imgWidth; i++)
-	pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth, sValue,
-	                              (imgHeight - j * 1f) / imgHeight)
-	               | (255 << 24);
+        pix[index++] = Color.HSBtoRGB(i * 1f / imgWidth, sValue,
+                                      (imgHeight - j * 1f) / imgHeight)
+                       | (255 << 24);
     gradientImage = createImage(new MemoryImageSource(imgWidth, imgHeight,
                                                       pix, 0, imgWidth));
   }
@@ -739,14 +739,14 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     switch (locked)
       {
       case HLOCKED:
-	updateHLockImage();
-	break;
+        updateHLockImage();
+        break;
       case SLOCKED:
-	updateSLockImage();
-	break;
+        updateSLockImage();
+        break;
       case BLOCKED:
-	updateBLockImage();
-	break;
+        updateBLockImage();
+        break;
       }
   }
 
@@ -777,18 +777,18 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     slider.setMinimum(0);
     if (locked == HLOCKED)
       {
-	slider.setMaximum(359);
-	slider.setValue(((Number) hSpinner.getValue()).intValue());
-	slider.setInverted(true);
+        slider.setMaximum(359);
+        slider.setValue(((Number) hSpinner.getValue()).intValue());
+        slider.setInverted(true);
       }
     else
       {
-	slider.setMaximum(100);
-	slider.setInverted(false);
-	if (sRadio.isSelected())
-	  slider.setValue(((Number) sSpinner.getValue()).intValue());
-	else
-	  slider.setValue(((Number) bSpinner.getValue()).intValue());
+        slider.setMaximum(100);
+        slider.setInverted(false);
+        if (sRadio.isSelected())
+          slider.setValue(((Number) sSpinner.getValue()).intValue());
+        else
+          slider.setValue(((Number) bSpinner.getValue()).intValue());
       }
     repaint();
   }
@@ -803,14 +803,14 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     switch (locked)
       {
       case HLOCKED:
-	updateHTrack();
-	break;
+        updateHTrack();
+        break;
       case SLOCKED:
-	updateSTrack();
-	break;
+        updateSTrack();
+        break;
       case BLOCKED:
-	updateBTrack();
-	break;
+        updateBTrack();
+        break;
       }
   }
 
@@ -825,8 +825,8 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
 
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < trackWidth; i++)
-	trackPix[trackIndex++] = Color.HSBtoRGB(j * 1f / imgHeight, 1f, 1f)
-	                         | (255 << 24);
+        trackPix[trackIndex++] = Color.HSBtoRGB(j * 1f / imgHeight, 1f, 1f)
+                                 | (255 << 24);
 
     trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
                                                    trackPix, 0, trackWidth));
@@ -846,9 +846,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     int trackIndex = 0;
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < trackWidth; i++)
-	trackPix[trackIndex++] = Color.HSBtoRGB(hValue,
-	                                        (imgHeight - j * 1f) / imgHeight,
-	                                        bValue) | (255 << 24);
+        trackPix[trackIndex++] = Color.HSBtoRGB(hValue,
+                                                (imgHeight - j * 1f) / imgHeight,
+                                                bValue) | (255 << 24);
 
     trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
                                                    trackPix, 0, trackWidth));
@@ -868,9 +868,9 @@ class DefaultHSBChooserPanel extends AbstractColorChooserPanel
     int trackIndex = 0;
     for (int j = 0; j < imgHeight; j++)
       for (int i = 0; i < trackWidth; i++)
-	trackPix[trackIndex++] = Color.HSBtoRGB(hValue, sValue,
-	                                        (imgHeight - j * 1f) / imgHeight)
-	                         | (255 << 24);
+        trackPix[trackIndex++] = Color.HSBtoRGB(hValue, sValue,
+                                                (imgHeight - j * 1f) / imgHeight)
+                                 | (255 << 24);
 
     trackImage = createImage(new MemoryImageSource(trackWidth, imgHeight,
                                                    trackPix, 0, trackWidth));
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
index 39a1732502d..24f0a9a71a8 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultRGBChooserPanel.java
@@ -72,7 +72,7 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
     public void stateChanged(ChangeEvent e)
     {
       if (updateChange)
-	return;
+        return;
 
       int color = R.getValue() << 16 | G.getValue() << 8 | B.getValue();
 
@@ -95,7 +95,7 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
     public void stateChanged(ChangeEvent e)
     {
       if (updateChange)
-	return;
+        return;
 
       int red = ((Number) RSpinner.getValue()).intValue();
       int green = ((Number) GSpinner.getValue()).intValue();
@@ -198,21 +198,21 @@ class DefaultRGBChooserPanel extends AbstractColorChooserPanel
 
     if (! sliderChange)
       {
-	if (R != null)
-	  R.setValue(red);
-	if (G != null)
-	  G.setValue(green);
-	if (B != null)
-	  B.setValue(blue);
+        if (R != null)
+          R.setValue(red);
+        if (G != null)
+          G.setValue(green);
+        if (B != null)
+          B.setValue(blue);
       }
     if (! spinnerChange)
       {
-	if (GSpinner != null)
-	  GSpinner.setValue(new Integer(green));
-	if (RSpinner != null)
-	  RSpinner.setValue(new Integer(red));
-	if (BSpinner != null)
-	  BSpinner.setValue(new Integer(blue));
+        if (GSpinner != null)
+          GSpinner.setValue(new Integer(green));
+        if (RSpinner != null)
+          RSpinner.setValue(new Integer(red));
+        if (BSpinner != null)
+          BSpinner.setValue(new Integer(blue));
       }
 
     updateChange = false;
diff --git a/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
index ff3436808ec..99b7157898b 100644
--- a/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/libjava/classpath/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
@@ -213,7 +213,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
     /** The color (255, 153, 153). */
     public static final Color C255153153 = new Color(255, 153, 153);
-    static Color[] colors = 
+    static Color[] colors =
                             {
                               // Row 1
     Color.WHITE, new Color(204, 255, 255), C204255255, C204255255, C204255255,
@@ -224,7 +224,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               C255204204, new Color(255, 255, 204), C204255204,
                               C204255204, C204255204, C204255204, C204255204,
                               C204255204, C204255204, C204255204, C204255204,
-                              
+
     // Row 2
     C204204204, new Color(153, 255, 255), new Color(153, 204, 255), C153153255,
                               C153153255, C153153255, C153153255, C153153255,
@@ -237,7 +237,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               new Color(204, 255, 153), C153255153, C153255153,
                               C153255153, C153255153, C153255153, C153255153,
                               C153255153, new Color(153, 255, 204),
-                              
+
     // Row 3
     C204204204, new Color(102, 255, 255), new Color(102, 204, 255),
                               new Color(102, 153, 255), C102102255, C102102255,
@@ -256,7 +256,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               C102255102, C102255102, C102255102,
                               new Color(102, 255, 153),
                               new Color(102, 255, 204),
-                              
+
     // Row 4
     new Color(153, 153, 153), new Color(51, 255, 255), new Color(51, 204, 255),
                               new Color(51, 153, 255), new Color(51, 102, 255),
@@ -272,7 +272,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               C051255051, C051255051, C051255051,
                               new Color(51, 255, 102), new Color(51, 255, 153),
                               new Color(51, 255, 204),
-                              
+
     // Row 5
     new Color(153, 153, 153), new Color(0, 255, 255), new Color(0, 204, 255),
                               new Color(0, 153, 255), new Color(0, 102, 255),
@@ -289,7 +289,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               new Color(51, 255, 0), new Color(0, 255, 0),
                               new Color(0, 255, 51), new Color(0, 255, 102),
                               new Color(0, 255, 153), new Color(0, 255, 204),
-                              
+
     // Row 6
     new Color(102, 102, 102), C000204204, C000204204, new Color(0, 153, 204),
                               new Color(0, 102, 204), new Color(0, 51, 204),
@@ -305,7 +305,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               new Color(0, 204, 0), new Color(0, 204, 51),
                               new Color(0, 204, 102), new Color(0, 204, 153),
                               new Color(0, 204, 204),
-                              
+
     // Row 7
     new Color(102, 102, 102), C000153153, C000153153, C000153153,
                               new Color(0, 102, 153), new Color(0, 51, 153),
@@ -319,7 +319,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               new Color(102, 153, 0), new Color(51, 153, 0),
                               new Color(0, 153, 0), new Color(0, 153, 51),
                               new Color(0, 153, 102), C000153153, C000153153,
-                              
+
     // Row 8
     new Color(51, 51, 51), C000102102, C000102102, C000102102, C000102102,
                               new Color(0, 51, 102), new Color(0, 0, 102),
@@ -332,7 +332,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
                               new Color(51, 102, 0), new Color(0, 102, 0),
                               new Color(0, 102, 51), C000102102, C000102102,
                               C000102102,
-                              
+
     // Row 9.
     Color.BLACK, C000051051, C000051051, C000051051, C000051051, C000051051,
                               new Color(0, 0, 51), C051000051, C051000051,
@@ -369,8 +369,8 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     {
       if (x % (cellWidth + gap) > cellWidth
           || y % (cellHeight + gap) > cellHeight)
-	// position is located in gap.
-	return null;
+        // position is located in gap.
+        return null;
 
       int row = y / (cellHeight + gap);
       int col = x / (cellWidth + gap);
@@ -401,14 +401,14 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < numRows; i++)
         {
-	  for (int j = 0; j < numCols; j++)
-	    {
-	      graphics.setColor(colors[index++]);
-	      graphics.fill3DRect(currX, currY, cellWidth, cellHeight, true);
-	      currX += gap + cellWidth;
-	    }
-	  currX = insets.left;
-	  currY += gap + cellHeight;
+          for (int j = 0; j < numCols; j++)
+            {
+              graphics.setColor(colors[index++]);
+              graphics.fill3DRect(currX, currY, cellWidth, cellHeight, true);
+              currX += gap + cellWidth;
+            }
+          currX = insets.left;
+          currY += gap + cellHeight;
         }
       graphics.setColor(saved);
     }
@@ -424,7 +424,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     {
       Color c = getColorForPosition(e.getX(), e.getY());
       if (c == null)
-	return null;
+        return null;
       return (c.getRed() + "," + c.getGreen() + "," + c.getBlue());
     }
   }
@@ -467,8 +467,8 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     {
       if (x % (cellWidth + gap) > cellWidth
           || y % (cellHeight + gap) > cellHeight)
-	// position is located in gap.
-	return null;
+        // position is located in gap.
+        return null;
 
       int row = y / (cellHeight + gap);
       int col = x / (cellWidth + gap);
@@ -483,7 +483,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     {
       colors = new Color[numRows * numCols];
       for (int i = 0; i < colors.length; i++)
-	colors[i] = defaultColor;
+        colors[i] = defaultColor;
     }
 
     /**
@@ -508,7 +508,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     void addColorToQueue(Color c)
     {
       if (--start == -1)
-	start = numRows * numCols - 1;
+        start = numRows * numCols - 1;
 
       colors[start] = c;
     }
@@ -527,14 +527,14 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < numRows; i++)
         {
-	  for (int j = 0; j < numCols; j++)
-	    {
-	      g.setColor(colors[getIndexForCell(i, j)]);
-	      g.fill3DRect(currX, currY, cellWidth, cellHeight, true);
-	      currX += cellWidth + gap;
-	    }
-	  currX = insets.left;
-	  currY += cellWidth + gap;
+          for (int j = 0; j < numCols; j++)
+            {
+              g.setColor(colors[getIndexForCell(i, j)]);
+              g.fill3DRect(currX, currY, cellWidth, cellHeight, true);
+              currX += cellWidth + gap;
+            }
+          currX = insets.left;
+          currY += cellWidth + gap;
         }
     }
 
@@ -549,7 +549,7 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
     {
       Color c = getColorForPosition(e.getX(), e.getY());
       if (c == null)
-	return null;
+        return null;
       return c.getRed() + "," + c.getGreen() + "," + c.getBlue();
     }
   }
@@ -609,11 +609,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < comps.length; i++)
         {
-	  pref[i] = comps[i].getPreferredSize();
-	  if (pref[i] == null)
-	    return;
-	  maxHeight = Math.max(maxHeight, pref[i].height);
-	  totalWidth += pref[i].width;
+          pref[i] = comps[i].getPreferredSize();
+          if (pref[i] == null)
+            return;
+          maxHeight = Math.max(maxHeight, pref[i].height);
+          totalWidth += pref[i].width;
         }
 
       ypos = (parent.getSize().height - maxHeight) / 2 + insets.top;
@@ -621,10 +621,10 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < comps.length; i++)
         {
-	  if (pref[i] == null)
-	    continue;
-	  comps[i].setBounds(xpos, ypos, pref[i].width, pref[i].height);
-	  xpos += pref[i].width;
+          if (pref[i] == null)
+            continue;
+          comps[i].setBounds(xpos, ypos, pref[i].width, pref[i].height);
+          xpos += pref[i].width;
         }
     }
 
@@ -667,11 +667,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < comps.length; i++)
         {
-	  pref = comps[i].getPreferredSize();
-	  if (pref == null)
-	    continue;
-	  xmax += pref.width;
-	  ymax = Math.max(ymax, pref.height);
+          pref = comps[i].getPreferredSize();
+          if (pref == null)
+            continue;
+          xmax += pref.width;
+          ymax = Math.max(ymax, pref.height);
         }
 
       Insets insets = parent.getInsets();
@@ -713,11 +713,11 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
 
       for (int i = 0; i < comps.length; i++)
         {
-	  pref = comps[i].getPreferredSize();
-	  if (pref == null)
-	    continue;
-	  comps[i].setBounds(insets.left, currY, pref.width, pref.height);
-	  currY += pref.height;
+          pref = comps[i].getPreferredSize();
+          if (pref == null)
+            continue;
+          comps[i].setBounds(insets.left, currY, pref.width, pref.height);
+          currY += pref.height;
         }
     }
 
@@ -750,12 +750,12 @@ class DefaultSwatchChooserPanel extends AbstractColorChooserPanel
       Dimension pref;
       for (int i = 0; i < comps.length; i++)
         {
-	  pref = comps[i].getPreferredSize();
-	  if (pref != null)
-	    {
-	      width = Math.max(width, pref.width);
-	      height += pref.height;
-	    }
+          pref = comps[i].getPreferredSize();
+          if (pref != null)
+            {
+              width = Math.max(width, pref.width);
+              height += pref.height;
+            }
         }
 
       return new Dimension(width + insets.left + insets.right,
diff --git a/libjava/classpath/javax/swing/event/AncestorEvent.java b/libjava/classpath/javax/swing/event/AncestorEvent.java
index d06c6e39612..27b469a8f0b 100644
--- a/libjava/classpath/javax/swing/event/AncestorEvent.java
+++ b/libjava/classpath/javax/swing/event/AncestorEvent.java
@@ -50,7 +50,7 @@ import javax.swing.JComponent;
 public class AncestorEvent extends AWTEvent
 {
   private static final long serialVersionUID = -8079801679695605002L;
-  
+
   public static final int ANCESTOR_ADDED = 1;
   public static final int ANCESTOR_REMOVED = 2;
   public static final int ANCESTOR_MOVED = 3;
@@ -66,7 +66,7 @@ public class AncestorEvent extends AWTEvent
    * @param ancestorParent parent ancestor
    */
   public AncestorEvent(JComponent source, int id, Container ancestor,
-		       Container ancestorParent)
+                       Container ancestorParent)
   {
     super(source, id);
     this.sourceComponent = source;
diff --git a/libjava/classpath/javax/swing/event/AncestorListener.java b/libjava/classpath/javax/swing/event/AncestorListener.java
index 61d5aedb7c9..623956f6ebb 100644
--- a/libjava/classpath/javax/swing/event/AncestorListener.java
+++ b/libjava/classpath/javax/swing/event/AncestorListener.java
@@ -47,23 +47,23 @@ import java.util.EventListener;
  */
 public interface AncestorListener extends EventListener {
 
-	/**
-	 * Ancestor Added
-	 * @param event Ancestor Event
-	 */
-	void ancestorAdded(AncestorEvent event);
+        /**
+         * Ancestor Added
+         * @param event Ancestor Event
+         */
+        void ancestorAdded(AncestorEvent event);
 
-	/**
-	 * Ancestor Removed
-	 * @param event Ancestor Event
-	 */
-	void ancestorRemoved(AncestorEvent event);
+        /**
+         * Ancestor Removed
+         * @param event Ancestor Event
+         */
+        void ancestorRemoved(AncestorEvent event);
 
-	/**
-	 * Ancestor Moved
-	 * @param event Ancestor Event
-	 */
-	void ancestorMoved(AncestorEvent event);
+        /**
+         * Ancestor Moved
+         * @param event Ancestor Event
+         */
+        void ancestorMoved(AncestorEvent event);
 
 
 } // AncestorListener
diff --git a/libjava/classpath/javax/swing/event/CaretEvent.java b/libjava/classpath/javax/swing/event/CaretEvent.java
index 7de05a81b74..ef0436d1cd9 100644
--- a/libjava/classpath/javax/swing/event/CaretEvent.java
+++ b/libjava/classpath/javax/swing/event/CaretEvent.java
@@ -43,14 +43,14 @@ import java.util.EventObject;
  * CaretEvent
  * @author Andrew Selkirk
  */
-public abstract class CaretEvent extends EventObject 
+public abstract class CaretEvent extends EventObject
 {
 
   /**
    * CaretEvent constructor
    * @param source Source object
    */
-  public CaretEvent(Object source) 
+  public CaretEvent(Object source)
   {
     super(source);
   }
@@ -67,4 +67,4 @@ public abstract class CaretEvent extends EventObject
    */
   public abstract int getMark();
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/CaretListener.java b/libjava/classpath/javax/swing/event/CaretListener.java
index aeee434e50b..ab7305d5e1b 100644
--- a/libjava/classpath/javax/swing/event/CaretListener.java
+++ b/libjava/classpath/javax/swing/event/CaretListener.java
@@ -46,11 +46,11 @@ import java.util.EventListener;
  */
 public interface CaretListener extends EventListener {
 
-	/**
-	 * Caret position has been updated
-	 * @param event Caret Event
-	 */
-	void caretUpdate(CaretEvent event);
+        /**
+         * Caret position has been updated
+         * @param event Caret Event
+         */
+        void caretUpdate(CaretEvent event);
 
 
 } // CaretListener
diff --git a/libjava/classpath/javax/swing/event/CellEditorListener.java b/libjava/classpath/javax/swing/event/CellEditorListener.java
index d2dd5bab8ec..4252c2712de 100644
--- a/libjava/classpath/javax/swing/event/CellEditorListener.java
+++ b/libjava/classpath/javax/swing/event/CellEditorListener.java
@@ -46,17 +46,17 @@ import java.util.EventListener;
  */
 public interface CellEditorListener extends EventListener {
 
-	/**
-	 * Editing has been canceled
-	 * @param event Change Event
-	 */
-	void editingCanceled(ChangeEvent event);
+        /**
+         * Editing has been canceled
+         * @param event Change Event
+         */
+        void editingCanceled(ChangeEvent event);
 
-	/**
-	 * Editing has been stopped
-	 * @param event Change Event
-	 */
-	void editingStopped(ChangeEvent event);
+        /**
+         * Editing has been stopped
+         * @param event Change Event
+         */
+        void editingStopped(ChangeEvent event);
 
 
 } // CellEditorListener
diff --git a/libjava/classpath/javax/swing/event/ChangeEvent.java b/libjava/classpath/javax/swing/event/ChangeEvent.java
index 8854282a9fc..86834128d41 100644
--- a/libjava/classpath/javax/swing/event/ChangeEvent.java
+++ b/libjava/classpath/javax/swing/event/ChangeEvent.java
@@ -41,24 +41,24 @@ import java.util.EventObject;
 
 /**
  * An event used to signal a state change for an object.
- * 
+ *
  * @see ChangeListener
  * @see CellEditorListener
  * @see TableColumnModelListener
- * 
+ *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class ChangeEvent 
-  extends EventObject 
+public class ChangeEvent
+  extends EventObject
 {
 
   /**
    * Creates a new ChangeEvent instance for the specified source.
-   * 
+   *
    * @param source  the source for the event (null not permitted).
    */
-  public ChangeEvent(Object source) 
+  public ChangeEvent(Object source)
   {
     super(source);
   }
diff --git a/libjava/classpath/javax/swing/event/ChangeListener.java b/libjava/classpath/javax/swing/event/ChangeListener.java
index 75809707bd4..0f9d0877458 100644
--- a/libjava/classpath/javax/swing/event/ChangeListener.java
+++ b/libjava/classpath/javax/swing/event/ChangeListener.java
@@ -40,22 +40,22 @@ package javax.swing.event;
 import java.util.EventListener;
 
 /**
- * A ChangeListener can register with an object to receive 
+ * A ChangeListener can register with an object to receive
  * notification of state changes (for objects that support this mechanism).
- * 
+ *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public interface ChangeListener 
-  extends EventListener 
+public interface ChangeListener
+  extends EventListener
 {
 
   /**
    * Called by an object to notify the listener that the object's state has
-   * changed.  The incoming event identifies the 
+   * changed.  The incoming event identifies the
    * source of the event, allowing the listener to differentiate
    * when it is listening for changes in multiple sources.
-   * 
+   *
    * @param event  the change event.
    */
   void stateChanged(ChangeEvent event);
diff --git a/libjava/classpath/javax/swing/event/DocumentEvent.java b/libjava/classpath/javax/swing/event/DocumentEvent.java
index 82230492520..4e1235542d3 100644
--- a/libjava/classpath/javax/swing/event/DocumentEvent.java
+++ b/libjava/classpath/javax/swing/event/DocumentEvent.java
@@ -75,7 +75,7 @@ public interface DocumentEvent
      * @return Element[]
      */
     Element[] getChildrenAdded();
-    
+
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/event/DocumentListener.java b/libjava/classpath/javax/swing/event/DocumentListener.java
index df5e784e40f..28a7d9d0a76 100644
--- a/libjava/classpath/javax/swing/event/DocumentListener.java
+++ b/libjava/classpath/javax/swing/event/DocumentListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
  */
 public interface DocumentListener extends EventListener {
 
-	/**
-	 * Changed update
-	 * @param event Document Event
-	 */
-	void changedUpdate(DocumentEvent event);
+        /**
+         * Changed update
+         * @param event Document Event
+         */
+        void changedUpdate(DocumentEvent event);
 
-	/**
-	 * Insert update
-	 * @param event Document Event
-	 */
-	void insertUpdate(DocumentEvent event);
+        /**
+         * Insert update
+         * @param event Document Event
+         */
+        void insertUpdate(DocumentEvent event);
 
-	/**
-	 * Remove update
-	 * @param event Document Event
-	 */
-	void removeUpdate(DocumentEvent event);
+        /**
+         * Remove update
+         * @param event Document Event
+         */
+        void removeUpdate(DocumentEvent event);
 
 
 } // DocumentListener
diff --git a/libjava/classpath/javax/swing/event/EventListenerList.java b/libjava/classpath/javax/swing/event/EventListenerList.java
index 8c76f7f87e6..940d1574c0a 100644
--- a/libjava/classpath/javax/swing/event/EventListenerList.java
+++ b/libjava/classpath/javax/swing/event/EventListenerList.java
@@ -107,8 +107,8 @@ public class EventListenerList
    * have no listeners.
    */
   private static final Object[] NO_LISTENERS = new Object[0];
-  
-  
+
+
   /**
    * An array with all currently registered listeners.  The array has
    * twice as many elements as there are listeners.  For an even
@@ -118,7 +118,7 @@ public class EventListenerList
    */
   protected transient Object[] listenerList = NO_LISTENERS;
 
-  
+
   /**
    * EventListenerList constructor
    */
@@ -194,7 +194,7 @@ public class EventListenerList
   /**
    * Returns an array containing a sequence of listenerType/listener pairs, one
    * for each listener.
-   * 
+   *
    * @return An array containing the listener types and references.
    */
   public Object[] getListenerList()
@@ -240,7 +240,7 @@ public class EventListenerList
     for (int i = listenerList.length - 2; i >= 0; i -= 2)
       if (listenerList[i] == c)
         result[f++] = (EventListener) listenerList[i + 1];
-    
+
     return (T[]) result;
   }
 
diff --git a/libjava/classpath/javax/swing/event/HyperlinkEvent.java b/libjava/classpath/javax/swing/event/HyperlinkEvent.java
index 4afa009f4f9..75092b51aa0 100644
--- a/libjava/classpath/javax/swing/event/HyperlinkEvent.java
+++ b/libjava/classpath/javax/swing/event/HyperlinkEvent.java
@@ -54,12 +54,12 @@ public class HyperlinkEvent extends EventObject
     public static final EventType ENTERED = new EventType("ENTERED"); // TODO
     public static final EventType EXITED = new EventType("EXITED"); // TODO
     public static final EventType ACTIVATED = new EventType("ACTIVATED"); // TODO
-    
+
     private String type;
 
     /**
      * Creates a new Event type.
-     * 
+     *
      * @param type String representing the event type.
      */
     private EventType(String type)
@@ -77,7 +77,7 @@ public class HyperlinkEvent extends EventObject
   }
 
   private static final long serialVersionUID = -2054640811732867012L;
-  
+
   private EventType type;
   private URL url;
   private String description;
@@ -85,7 +85,7 @@ public class HyperlinkEvent extends EventObject
 
   /**
    * Creates a new HyperlinkEvent with the given arguments.
-   * 
+   *
    * @param source The object this link is associated to.
    * @param type The type of event.
    * @param url The URL this link pointing too.
@@ -97,21 +97,21 @@ public class HyperlinkEvent extends EventObject
 
   /**
    * Creates a new HyperlinkEvent with the given arguments.
-   * 
+   *
    * @param source The object this link is associated to.
    * @param type The type of event.
    * @param url The URL this link pointing too.
    * @param description The description for this link.
    */
   public HyperlinkEvent(Object source, EventType type, URL url,
-			String description)
+                        String description)
   {
     this (source, type, url, description, null);
   }
-  
+
   /**
    * Creates a new HyperlinkEvent with the given arguments.
-   * 
+   *
    * @param source The object this link is associated to.
    * @param type The type of event.
    * @param url The URL this link pointing too.
@@ -119,7 +119,7 @@ public class HyperlinkEvent extends EventObject
    * @param element The element in the document representing the anchor.
    */
   public HyperlinkEvent(Object source, EventType type, URL url,
-			String description, Element element)
+                        String description, Element element)
   {
     super(source);
     this.type = type;
@@ -135,7 +135,7 @@ public class HyperlinkEvent extends EventObject
   {
     return element;
   }
-  
+
   /**
    * Returns the URL of this event.
    */
diff --git a/libjava/classpath/javax/swing/event/HyperlinkListener.java b/libjava/classpath/javax/swing/event/HyperlinkListener.java
index 5dede993fc0..0e01ba7edd0 100644
--- a/libjava/classpath/javax/swing/event/HyperlinkListener.java
+++ b/libjava/classpath/javax/swing/event/HyperlinkListener.java
@@ -47,11 +47,11 @@ import java.util.EventListener;
  */
 public interface HyperlinkListener extends EventListener {
 
-	/**
-	 * Hyperlink updated
-	 * @param event Hyperlink Event
-	 */
-	void hyperlinkUpdate(HyperlinkEvent event);
+        /**
+         * Hyperlink updated
+         * @param event Hyperlink Event
+         */
+        void hyperlinkUpdate(HyperlinkEvent event);
 
 
 } // HyperlinkListener
diff --git a/libjava/classpath/javax/swing/event/InternalFrameAdapter.java b/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
index dfa88c3d4fd..da893c76d0f 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameAdapter.java
@@ -52,7 +52,7 @@ public abstract class InternalFrameAdapter implements InternalFrameListener
   {
     // Nothing to do here.
   }
-	
+
   /**
    * Internal frame activated.
    *
diff --git a/libjava/classpath/javax/swing/event/InternalFrameEvent.java b/libjava/classpath/javax/swing/event/InternalFrameEvent.java
index 4e289bfb71c..1d7145d31c8 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameEvent.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameEvent.java
@@ -44,7 +44,7 @@ import javax.swing.JInternalFrame;
 
 /**
  * An event that indicates a change to a {@link JInternalFrame} component.
- * 
+ *
  * @author Andrew Selkirk
  */
 public class InternalFrameEvent extends AWTEvent
@@ -98,12 +98,12 @@ public class InternalFrameEvent extends AWTEvent
 
   /**
    * Creates a new JInternalFrameEvent instance.
-   * 
+   *
    * @param source  the source of this event (null not permitted).
    * @param id  the event ID of this event (see the constants defined by this
    *     class).
-   *     
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *     null.
    */
   public InternalFrameEvent(JInternalFrame source, int id)
@@ -114,23 +114,23 @@ public class InternalFrameEvent extends AWTEvent
   /**
    * Returns the JInternalFrame component that is the source for
    * this event.
-   * 
+   *
    * @return The source.
-   * 
+   *
    * @since 1.3
    */
   public JInternalFrame getInternalFrame()
   {
     return (JInternalFrame) source;
   }
-  
+
   /**
-   * Returns a string that indicates the event id.  This is used by the 
+   * Returns a string that indicates the event id.  This is used by the
    * {@link #toString()} method.
-   * 
+   *
    * @return A string that indicates the event id.
    */
-  public String paramString() 
+  public String paramString()
   {
     switch (id) {
       case INTERNAL_FRAME_ACTIVATED:
diff --git a/libjava/classpath/javax/swing/event/InternalFrameListener.java b/libjava/classpath/javax/swing/event/InternalFrameListener.java
index d1b2812a86f..36874d216a7 100644
--- a/libjava/classpath/javax/swing/event/InternalFrameListener.java
+++ b/libjava/classpath/javax/swing/event/InternalFrameListener.java
@@ -46,47 +46,47 @@ import java.util.EventListener;
  */
 public interface InternalFrameListener extends EventListener {
 
-	/**
-	 * Internal frame activated
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameActivated(InternalFrameEvent event);
+        /**
+         * Internal frame activated
+         * @param event Internal Frame Event
+         */
+        void internalFrameActivated(InternalFrameEvent event);
 
-	/**
-	 * Internal frame closed
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameClosed(InternalFrameEvent event);
+        /**
+         * Internal frame closed
+         * @param event Internal Frame Event
+         */
+        void internalFrameClosed(InternalFrameEvent event);
 
-	/**
-	 * Internal frame closing
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameClosing(InternalFrameEvent event);
+        /**
+         * Internal frame closing
+         * @param event Internal Frame Event
+         */
+        void internalFrameClosing(InternalFrameEvent event);
 
-	/**
-	 * Internal frame deactivated
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameDeactivated(InternalFrameEvent event);
+        /**
+         * Internal frame deactivated
+         * @param event Internal Frame Event
+         */
+        void internalFrameDeactivated(InternalFrameEvent event);
 
-	/**
-	 * Internal frame deiconified
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameDeiconified(InternalFrameEvent event);
+        /**
+         * Internal frame deiconified
+         * @param event Internal Frame Event
+         */
+        void internalFrameDeiconified(InternalFrameEvent event);
 
-	/**
-	 * Internal frame iconified
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameIconified(InternalFrameEvent event);
+        /**
+         * Internal frame iconified
+         * @param event Internal Frame Event
+         */
+        void internalFrameIconified(InternalFrameEvent event);
 
-	/**
-	 * Internal frame opened
-	 * @param event Internal Frame Event
-	 */
-	void internalFrameOpened(InternalFrameEvent event);
+        /**
+         * Internal frame opened
+         * @param event Internal Frame Event
+         */
+        void internalFrameOpened(InternalFrameEvent event);
 
 
 } // InternalFrameListener
diff --git a/libjava/classpath/javax/swing/event/ListDataEvent.java b/libjava/classpath/javax/swing/event/ListDataEvent.java
index 897fc128f20..51fa887f8ce 100644
--- a/libjava/classpath/javax/swing/event/ListDataEvent.java
+++ b/libjava/classpath/javax/swing/event/ListDataEvent.java
@@ -43,40 +43,40 @@ import java.util.EventObject;
 /**
  * An event that contains information about a modification to the content of
  * a list.
- * 
+ *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
 public class ListDataEvent extends EventObject
 {
   private static final long serialVersionUID = 2510353260071004774L;
-  
+
   /** An event type indicating that the list content has been modified. */
   public static final int CONTENTS_CHANGED = 0;
-  
+
   /** An event type indicating that an interval has been added to the list. */
   public static final int INTERVAL_ADDED = 1;
-  
-  /** 
-   * An event type indicating that an interval has been removed from the 
-   * list. 
+
+  /**
+   * An event type indicating that an interval has been removed from the
+   * list.
    */
   public static final int INTERVAL_REMOVED = 2;
 
   private int type;
   private int index0;
   private int index1;
-	
+
   /**
    * Creates a ListDataEvent object.
-   * 
+   *
    * @param source  the source of the event (null not permitted).
-   * @param type  the type of the event (should be one of 
-   *     {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or 
+   * @param type  the type of the event (should be one of
+   *     {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
    *     {@link #INTERVAL_REMOVED}, although this is not enforced).
-   * @param index0  the index for one end of the modified range of list 
+   * @param index0  the index for one end of the modified range of list
    *     elements.
-   * @param index1  the index for the other end of the modified range of list 
+   * @param index1  the index for the other end of the modified range of list
    *     elements.
    */
   public ListDataEvent(Object source, int type, int index0, int index1)
@@ -86,10 +86,10 @@ public class ListDataEvent extends EventObject
     this.index0 = Math.min(index0, index1);
     this.index1 = Math.max(index0, index1);
   }
-	
+
   /**
    * Returns the index of the first item in the range of modified list items.
-   * 
+   *
    * @return The index of the first item in the range of modified list items.
    */
   public int getIndex0()
@@ -99,7 +99,7 @@ public class ListDataEvent extends EventObject
 
   /**
    * Returns the index of the last item in the range of modified list items.
-   * 
+   *
    * @return The index of the last item in the range of modified list items.
    */
   public int getIndex1()
@@ -109,24 +109,24 @@ public class ListDataEvent extends EventObject
 
   /**
    * Returns a code representing the type of this event, which is usually one
-   * of {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or 
+   * of {@link #CONTENTS_CHANGED}, {@link #INTERVAL_ADDED} or
    * {@link #INTERVAL_REMOVED}.
-   * 
+   *
    * @return The event type.
    */
   public int getType()
   {
     return type;
   }
-  
+
   /**
    * Returns a string representing the state of this event.
-   * 
+   *
    * @return A string.
    */
   public String toString()
   {
-    return getClass().getName() + "[type=" + type + ",index0=" + index0 
+    return getClass().getName() + "[type=" + type + ",index0=" + index0
         + ",index1=" + index1 + "]";
   }
 }
diff --git a/libjava/classpath/javax/swing/event/ListDataListener.java b/libjava/classpath/javax/swing/event/ListDataListener.java
index f42777d09d6..4bbe1e5e483 100644
--- a/libjava/classpath/javax/swing/event/ListDataListener.java
+++ b/libjava/classpath/javax/swing/event/ListDataListener.java
@@ -44,11 +44,11 @@ import javax.swing.ListModel;
 /**
  * A ListDataListener can register with a {@link ListModel} and
  * receive notification of updates to the model.
- * 
+ *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public interface ListDataListener extends EventListener 
+public interface ListDataListener extends EventListener
 {
 
   /**
@@ -56,7 +56,7 @@ public interface ListDataListener extends EventListener
    * in some way.  This method will be called if the change cannot be
    * notified via the {@link #intervalAdded(ListDataEvent)} or the
    * {@link #intervalRemoved(ListDataEvent)} methods.
-   * 
+   *
    * @param event  the event.
    */
   void contentsChanged(ListDataEvent event);
@@ -65,16 +65,16 @@ public interface ListDataListener extends EventListener
    * Notifies the listener that one or more items have been added to the
    * list.  The event argument can supply the indices for the
    * range of items added.
-   * 
+   *
    * @param event  the event.
    */
   void intervalAdded(ListDataEvent event);
 
   /**
    * Notifies the listener that one or more items have been removed from
-   * the list.  The event argument can supply the indices for 
+   * the list.  The event argument can supply the indices for
    * the range of items removed.
-   * 
+   *
    * @param event  the event.
    */
   void intervalRemoved(ListDataEvent event);
diff --git a/libjava/classpath/javax/swing/event/ListSelectionEvent.java b/libjava/classpath/javax/swing/event/ListSelectionEvent.java
index d79cbfa507f..97555d17ac3 100644
--- a/libjava/classpath/javax/swing/event/ListSelectionEvent.java
+++ b/libjava/classpath/javax/swing/event/ListSelectionEvent.java
@@ -45,22 +45,22 @@ import javax.swing.ListSelectionModel;
  * An event that indicates a change to a list selection, including the source
  * of the change (a {@link ListSelectionModel}) and the range of items in the
  * list that have potentially changed their selection status.
- * 
+ *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class ListSelectionEvent extends EventObject 
+public class ListSelectionEvent extends EventObject
 {
 
-  /** 
-   * The index of the first list item in the range of items that has 
-   * potentially had its selection status modified. 
+  /**
+   * The index of the first list item in the range of items that has
+   * potentially had its selection status modified.
    */
   private int firstIndex = 0;
 
-  /** 
-   * The index of the last list item in the range of items that has 
-   * potentially had its selection status modified. 
+  /**
+   * The index of the last list item in the range of items that has
+   * potentially had its selection status modified.
    */
   private int lastIndex = 0;
 
@@ -69,52 +69,52 @@ public class ListSelectionEvent extends EventObject
 
   /**
    * Creates a new ListSelectionEvent.
-   * 
+   *
    * @param source  the event source (null not permitted).
    * @param firstIndex  the first index.
    * @param lastIndex  the last index.
-   * @param isAdjusting  a flag indicating that this event is one in a series 
+   * @param isAdjusting  a flag indicating that this event is one in a series
    *                     of events updating a selection.
-   * 
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *         null.
    */
   public ListSelectionEvent(Object source, int firstIndex,
-      int lastIndex, boolean isAdjusting) 
+      int lastIndex, boolean isAdjusting)
   {
     super(source);
     this.firstIndex = firstIndex;
     this.lastIndex = lastIndex;
     this.isAdjusting = isAdjusting;
   }
- 
+
   /**
    * Returns the first index.
-   * 
+   *
    * @return The first index.
    */
-  public int getFirstIndex() 
+  public int getFirstIndex()
   {
     return firstIndex;
   }
 
   /**
    * Returns the last index.
-   * 
+   *
    * @return The last index.
    */
-  public int getLastIndex() 
+  public int getLastIndex()
   {
     return lastIndex;
   }
 
   /**
-   * Returns the flag that indicates that this event is one in a series of 
+   * Returns the flag that indicates that this event is one in a series of
    * events updating a selection.
-   * 
+   *
    * @return A boolean.
    */
-  public boolean getValueIsAdjusting() 
+  public boolean getValueIsAdjusting()
   {
     return isAdjusting;
   }
@@ -122,13 +122,13 @@ public class ListSelectionEvent extends EventObject
   /**
    * Returns a string representation of the event, typically used for debugging
    * purposes.
-   * 
+   *
    * @return A string representation of the event.
    */
-  public String toString() 
+  public String toString()
   {
-    return this.getClass().toString() + "[ source=" + source.toString() 
-        + " firstIndex= " + firstIndex + " lastIndex= " + lastIndex 
+    return this.getClass().toString() + "[ source=" + source.toString()
+        + " firstIndex= " + firstIndex + " lastIndex= " + lastIndex
         + " isAdjusting= " + isAdjusting + " ]";
   }
 
diff --git a/libjava/classpath/javax/swing/event/ListSelectionListener.java b/libjava/classpath/javax/swing/event/ListSelectionListener.java
index a21dc7365bc..20e40da58e4 100644
--- a/libjava/classpath/javax/swing/event/ListSelectionListener.java
+++ b/libjava/classpath/javax/swing/event/ListSelectionListener.java
@@ -42,20 +42,20 @@ import java.util.EventListener;
 import javax.swing.ListSelectionModel;
 
 /**
- * A listener that receives {@link ListSelectionEvent} notifications, 
+ * A listener that receives {@link ListSelectionEvent} notifications,
  * typically from a {@link ListSelectionModel} when it is modified.
  *
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public interface ListSelectionListener extends EventListener 
+public interface ListSelectionListener extends EventListener
 {
 
   /**
    * Receives notification of a {@link ListSelectionEvent}.
-   * 
+   *
    * @param event  the event.
    */
   void valueChanged(ListSelectionEvent event);
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java b/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
index 6be11bcca71..952d99e39a0 100644
--- a/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuDragMouseEvent.java
@@ -48,14 +48,14 @@ import javax.swing.MenuSelectionManager;
  * MenuDragMouseEvent
  * @author Andrew Selkirk
  */
-public class MenuDragMouseEvent extends MouseEvent 
+public class MenuDragMouseEvent extends MouseEvent
 {
 
   /**
    * path
    */
   private MenuElement[] path = null;
-	
+
   /**
    * manager
    */
@@ -76,29 +76,29 @@ public class MenuDragMouseEvent extends MouseEvent
    */
   public MenuDragMouseEvent(Component source, int id, long when, int modifiers,
       int x, int y, int clickCount, boolean popupTrigger,
-      MenuElement[] path, MenuSelectionManager manager) 
+      MenuElement[] path, MenuSelectionManager manager)
   {
     super(source, id, when, modifiers, x, y, clickCount, popupTrigger);
     this.path = path;
     this.manager = manager;
-  } 
+  }
 
   /**
    * Get path
    * @return path
    */
-  public MenuElement[] getPath() 
+  public MenuElement[] getPath()
   {
     return path;
-  } 
+  }
 
   /**
    * Get menu selection manager
    * @return manager
    */
-  public MenuSelectionManager getMenuSelectionManager() 
+  public MenuSelectionManager getMenuSelectionManager()
   {
     return manager;
   }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/MenuDragMouseListener.java b/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
index bfca315e333..d0cd0530f47 100644
--- a/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
+++ b/libjava/classpath/javax/swing/event/MenuDragMouseListener.java
@@ -46,29 +46,29 @@ import java.util.EventListener;
  */
 public interface MenuDragMouseListener extends EventListener {
 
-	/**
-	 * Menu drag mouse dragged
-	 * @param event Menu Drag Mouse Event
-	 */
-	void menuDragMouseDragged(MenuDragMouseEvent event);
+        /**
+         * Menu drag mouse dragged
+         * @param event Menu Drag Mouse Event
+         */
+        void menuDragMouseDragged(MenuDragMouseEvent event);
 
-	/**
-	 * Menu drag mouse entered
-	 * @param event Menu Drag Mouse Event
-	 */
-	void menuDragMouseEntered(MenuDragMouseEvent event);
+        /**
+         * Menu drag mouse entered
+         * @param event Menu Drag Mouse Event
+         */
+        void menuDragMouseEntered(MenuDragMouseEvent event);
 
-	/**
-	 * Menu drag mouse exited
-	 * @param event Menu Drag Mouse Event
-	 */
-	void menuDragMouseExited(MenuDragMouseEvent event);
+        /**
+         * Menu drag mouse exited
+         * @param event Menu Drag Mouse Event
+         */
+        void menuDragMouseExited(MenuDragMouseEvent event);
 
-	/**
-	 * Menu drag mouse released
-	 * @param event Menu Drag Mouse Event
-	 */
-	void menuDragMouseReleased(MenuDragMouseEvent event);
+        /**
+         * Menu drag mouse released
+         * @param event Menu Drag Mouse Event
+         */
+        void menuDragMouseReleased(MenuDragMouseEvent event);
 
 
 } // MenuDragMouseListener
diff --git a/libjava/classpath/javax/swing/event/MenuEvent.java b/libjava/classpath/javax/swing/event/MenuEvent.java
index 8ba32929e2d..6a7e0215f4e 100644
--- a/libjava/classpath/javax/swing/event/MenuEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuEvent.java
@@ -44,14 +44,14 @@ import java.util.EventObject;
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class MenuEvent extends EventObject 
+public class MenuEvent extends EventObject
 {
 
   /**
    * Constructor MenuEvent
    * @param source Source object
    */
-  public MenuEvent(Object source) 
+  public MenuEvent(Object source)
   {
     super(source);
   }
diff --git a/libjava/classpath/javax/swing/event/MenuKeyEvent.java b/libjava/classpath/javax/swing/event/MenuKeyEvent.java
index 3335850bced..937089ec257 100644
--- a/libjava/classpath/javax/swing/event/MenuKeyEvent.java
+++ b/libjava/classpath/javax/swing/event/MenuKeyEvent.java
@@ -48,14 +48,14 @@ import javax.swing.MenuSelectionManager;
  * MenuKeyEvent
  * @author Andrew Selkirk
  */
-public class MenuKeyEvent extends KeyEvent 
+public class MenuKeyEvent extends KeyEvent
 {
 
   /**
    * path
    */
   private MenuElement[] path = null;
-	
+
   /**
    * manager
    */
@@ -74,18 +74,18 @@ public class MenuKeyEvent extends KeyEvent
    */
   public MenuKeyEvent(Component source, int id, long when, int modifiers,
       int keyCode, char keyChar, MenuElement[] path,
-      MenuSelectionManager manager) 
+      MenuSelectionManager manager)
   {
     super(source, id, when, modifiers, keyCode, keyChar);
     this.path = path;
     this.manager = manager;
-  } 
+  }
 
   /**
    * getPath
    * @return path
    */
-  public MenuElement[] getPath() 
+  public MenuElement[] getPath()
   {
     return path;
   }
@@ -94,9 +94,9 @@ public class MenuKeyEvent extends KeyEvent
    * getMenuSelectionManager
    * @return MenuSelectionManager
    */
-  public MenuSelectionManager getMenuSelectionManager() 
+  public MenuSelectionManager getMenuSelectionManager()
   {
     return manager;
   }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/MenuKeyListener.java b/libjava/classpath/javax/swing/event/MenuKeyListener.java
index 7a1eb89b428..36d6ecdd46d 100644
--- a/libjava/classpath/javax/swing/event/MenuKeyListener.java
+++ b/libjava/classpath/javax/swing/event/MenuKeyListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
  */
 public interface MenuKeyListener extends EventListener {
 
-	/**
-	 * Menu key pressed
-	 * @param event Menu Key Event
-	 */
-	void menuKeyPressed(MenuKeyEvent event);
+        /**
+         * Menu key pressed
+         * @param event Menu Key Event
+         */
+        void menuKeyPressed(MenuKeyEvent event);
 
-	/**
-	 * Menu key released
-	 * @param event Menu Key Event
-	 */
-	void menuKeyReleased(MenuKeyEvent event);
+        /**
+         * Menu key released
+         * @param event Menu Key Event
+         */
+        void menuKeyReleased(MenuKeyEvent event);
 
-	/**
-	 * Menu key typed
-	 * @param event Menu Key Event
-	 */
-	void menuKeyTyped(MenuKeyEvent event);
+        /**
+         * Menu key typed
+         * @param event Menu Key Event
+         */
+        void menuKeyTyped(MenuKeyEvent event);
 
 
 } // MenuKeyListener
diff --git a/libjava/classpath/javax/swing/event/MenuListener.java b/libjava/classpath/javax/swing/event/MenuListener.java
index dba704a8ee1..10a18f21554 100644
--- a/libjava/classpath/javax/swing/event/MenuListener.java
+++ b/libjava/classpath/javax/swing/event/MenuListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
  */
 public interface MenuListener extends EventListener {
 
-	/**
-	 * Menu canceled
-	 * @param event Menu Event
-	 */
-	void menuCanceled(MenuEvent event);
+        /**
+         * Menu canceled
+         * @param event Menu Event
+         */
+        void menuCanceled(MenuEvent event);
 
-	/**
-	 * Menu deselected
-	 * @param event Menu Event
-	 */
-	void menuDeselected(MenuEvent event);
+        /**
+         * Menu deselected
+         * @param event Menu Event
+         */
+        void menuDeselected(MenuEvent event);
 
-	/**
-	 * Menu selected
-	 * @param event Menu Event
-	 */
-	void menuSelected(MenuEvent event);
+        /**
+         * Menu selected
+         * @param event Menu Event
+         */
+        void menuSelected(MenuEvent event);
 
 
 } // MenuListener
diff --git a/libjava/classpath/javax/swing/event/MouseInputListener.java b/libjava/classpath/javax/swing/event/MouseInputListener.java
index 3d879b9e746..fc9261533ce 100644
--- a/libjava/classpath/javax/swing/event/MouseInputListener.java
+++ b/libjava/classpath/javax/swing/event/MouseInputListener.java
@@ -46,7 +46,7 @@ import java.awt.event.MouseMotionListener;
  * @author Andrew Selkirk
  */
 public interface MouseInputListener extends MouseListener,
-											MouseMotionListener
+                                                                                        MouseMotionListener
 {
   // This interface only pulls together MouseListener and MouseMotionListener
   // without adding any methods on its own.
diff --git a/libjava/classpath/javax/swing/event/PopupMenuEvent.java b/libjava/classpath/javax/swing/event/PopupMenuEvent.java
index 055555086ef..640b900ade1 100644
--- a/libjava/classpath/javax/swing/event/PopupMenuEvent.java
+++ b/libjava/classpath/javax/swing/event/PopupMenuEvent.java
@@ -46,13 +46,13 @@ import java.util.EventObject;
  */
 public class PopupMenuEvent extends EventObject {
 
-	/**
-	 * Constructor PopupMenuEvent
-	 * @param source Source
-	 */
-	public PopupMenuEvent(Object source) {
-		super(source);
-	} // PopupMenuEvent()
+        /**
+         * Constructor PopupMenuEvent
+         * @param source Source
+         */
+        public PopupMenuEvent(Object source) {
+                super(source);
+        } // PopupMenuEvent()
 
 
 } // PopupMenuEvent
diff --git a/libjava/classpath/javax/swing/event/PopupMenuListener.java b/libjava/classpath/javax/swing/event/PopupMenuListener.java
index dc917d2414c..18d68f406a8 100644
--- a/libjava/classpath/javax/swing/event/PopupMenuListener.java
+++ b/libjava/classpath/javax/swing/event/PopupMenuListener.java
@@ -46,23 +46,23 @@ import java.util.EventListener;
  */
 public interface PopupMenuListener extends EventListener {
 
-	/**
-	 * Popup Menu Canceled
-	 * @param event Popup Menu Event
-	 */
-	void popupMenuCanceled(PopupMenuEvent event);
+        /**
+         * Popup Menu Canceled
+         * @param event Popup Menu Event
+         */
+        void popupMenuCanceled(PopupMenuEvent event);
 
-	/**
-	 * Popup Menu will become invisible
-	 * @param event Popup Menu Event
-	 */
-	void popupMenuWillBecomeInvisible(PopupMenuEvent event);
+        /**
+         * Popup Menu will become invisible
+         * @param event Popup Menu Event
+         */
+        void popupMenuWillBecomeInvisible(PopupMenuEvent event);
 
-	/**
-	 * Popup Menu will become visible
-	 * @param event Popup Menu Event
-	 */
-	void popupMenuWillBecomeVisible(PopupMenuEvent event);
+        /**
+         * Popup Menu will become visible
+         * @param event Popup Menu Event
+         */
+        void popupMenuWillBecomeVisible(PopupMenuEvent event);
 
 
 } // PopupMenuListener
diff --git a/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java b/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
index 7fb8aa67d7a..5228b3d572f 100644
--- a/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
+++ b/libjava/classpath/javax/swing/event/SwingPropertyChangeSupport.java
@@ -51,19 +51,19 @@ import java.beans.PropertyChangeSupport;
  * @author Andrew Selkirk
  */
 public final class SwingPropertyChangeSupport
-  extends PropertyChangeSupport 
+  extends PropertyChangeSupport
 {
 
   private static final long serialVersionUID = 7162625831330845068L;
 
   /**
    * Creates a new instance.
-   * 
+   *
    * @param source  the source (null not permitted).
-   * 
+   *
    * @throws NullPointerException if source is null.
    */
-  public SwingPropertyChangeSupport(Object source) 
+  public SwingPropertyChangeSupport(Object source)
   {
     super(source);
   }
diff --git a/libjava/classpath/javax/swing/event/TableColumnModelEvent.java b/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
index cff49130e35..70bd7d0501e 100644
--- a/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TableColumnModelEvent.java
@@ -46,7 +46,7 @@ import javax.swing.table.TableColumnModel;
  * TableColumnModelEvent
  * @author Andrew Selkirk
  */
-public class TableColumnModelEvent extends EventObject 
+public class TableColumnModelEvent extends EventObject
 {
 
   /**
@@ -65,7 +65,7 @@ public class TableColumnModelEvent extends EventObject
    * @param from From index
    * @param to To index
    */
-  public TableColumnModelEvent(TableColumnModel source, int from, int to) 
+  public TableColumnModelEvent(TableColumnModel source, int from, int to)
   {
     super(source);
     fromIndex = from;
@@ -76,18 +76,18 @@ public class TableColumnModelEvent extends EventObject
    * getFromIndex.
    * @return From index
    */
-  public int getFromIndex() 
+  public int getFromIndex()
   {
     return fromIndex;
-  } 
+  }
 
   /**
-   * getToIndex. 
+   * getToIndex.
    * @return To index
    */
-  public int getToIndex() 
+  public int getToIndex()
   {
     return toIndex;
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/event/TableColumnModelListener.java b/libjava/classpath/javax/swing/event/TableColumnModelListener.java
index 522e0a8c6ae..362a4d9cd76 100644
--- a/libjava/classpath/javax/swing/event/TableColumnModelListener.java
+++ b/libjava/classpath/javax/swing/event/TableColumnModelListener.java
@@ -44,25 +44,25 @@ import javax.swing.table.TableColumnModel;
 /**
  * A TableColumnModelListener can register with a
  * {@link TableColumnModel} to receive notification of changes to the model.
- * 
+ *
  * @author Andrew Selkirk
  */
-public interface TableColumnModelListener 
-  extends EventListener 
+public interface TableColumnModelListener
+  extends EventListener
 {
 
   /**
    * Called by the {@link TableColumnModel} to indicate that a column has been
    * added to the model.
-   * 
+   *
    * @param event  information about the column addition.
    */
   void columnAdded(TableColumnModelEvent event);
 
   /**
-   * Called by the {@link TableColumnModel} to indicate that the model's 
+   * Called by the {@link TableColumnModel} to indicate that the model's
    * column margin has changed.
-   * 
+   *
    * @param event  the event (identifies the source).
    */
   void columnMarginChanged(ChangeEvent event);
@@ -70,7 +70,7 @@ public interface TableColumnModelListener
   /**
    * Called by the {@link TableColumnModel} to indicate that a column has been
    * moved.
-   * 
+   *
    * @param event  information about the column move.
    */
   void columnMoved(TableColumnModelEvent event);
@@ -78,15 +78,15 @@ public interface TableColumnModelListener
   /**
    * Called by the {@link TableColumnModel} to indicate that a column has been
    * removed from the model.
-   * 
+   *
    * @param event  information about the column removal.
    */
   void columnRemoved(TableColumnModelEvent event);
 
   /**
-   * Called by the {@link TableColumnModel} to indicate that the column 
+   * Called by the {@link TableColumnModel} to indicate that the column
    * selection state has changed.
-   * 
+   *
    * @param event  information about the column selection state.
    */
   void columnSelectionChanged(ListSelectionEvent event);
diff --git a/libjava/classpath/javax/swing/event/TableModelEvent.java b/libjava/classpath/javax/swing/event/TableModelEvent.java
index e15174cc6c2..b75a78a1c6a 100644
--- a/libjava/classpath/javax/swing/event/TableModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TableModelEvent.java
@@ -44,58 +44,58 @@ import javax.swing.table.TableModel;
 
 /**
  * An event that describes changes to a {@link TableModel}.
- * 
+ *
  * @see javax.swing.event.TableModelListener
- * 
+ *
  * @author Andrew Selkirk
  */
 public class TableModelEvent extends EventObject
 {
   private static final long serialVersionUID = -7849342674552212824L;
-  
+
   /** A column index representing all columns. */
   public static final int ALL_COLUMNS = -1;
-  
-  /** 
-   * An event type indicating that one or more rows have been deleted from the 
-   * model. 
+
+  /**
+   * An event type indicating that one or more rows have been deleted from the
+   * model.
    */
   public static final int DELETE = -1;
-  
+
   /** A row index representing the header row. */
   public static final int HEADER_ROW = -1;
-  
-  /** 
-   * An event type indicating that one or more rows have been inserted into the 
-   * model. 
+
+  /**
+   * An event type indicating that one or more rows have been inserted into the
+   * model.
    */
   public static final int INSERT = 1;
-  
+
   /** An event type indicating that data has been updated in the model. */
   public static final int UPDATE = 0;
 
   /** The column in the table model that the event relates to. */
   protected int column = 0;
-  
+
   /** The first row in the table model that the event relates to. */
   protected int firstRow = 0;
-  
+
   /** The last row in the table model that the event relates to. */
   protected int lastRow = 0;
-  
-  /** 
-   * The event type (one of {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}). 
+
+  /**
+   * The event type (one of {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}).
    */
   protected int type = 0;
 
   /**
-   * Creates a new TableModelEvent indicating an {@link #UPDATE} 
+   * Creates a new TableModelEvent indicating an {@link #UPDATE}
    * to the data in all columns and rows.
-   * 
+   *
    * @param source  the source object (null not permitted).
-   * 
-   * @throws IllegalArgumentException if source is 
-   *         null. 
+   *
+   * @throws IllegalArgumentException if source is
+   *         null.
    */
   public TableModelEvent(TableModel source)
   {
@@ -105,11 +105,11 @@ public class TableModelEvent extends EventObject
   /**
    * Creates a new TableModelEvent indicating an {@link #UPDATE}
    * to the data in a single row across all columns.
-   * 
+   *
    * @param source  the source object (null not permitted).
    * @param row  the updated row.
-   * 
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *         null.
    */
   public TableModelEvent(TableModel source, int row)
@@ -120,12 +120,12 @@ public class TableModelEvent extends EventObject
   /**
    * Creates a new TableModelEvent indicating an {@link #UPDATE}
    * to the data in the specified rows across all columns.
-   * 
+   *
    * @param source  the source object (null not permitted).
    * @param firstRow  the first row of update.
    * @param lastRow  the last row of update.
-   * 
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *         null.
    */
   public TableModelEvent(TableModel source, int firstRow, int lastRow)
@@ -135,18 +135,18 @@ public class TableModelEvent extends EventObject
 
   /**
    * Creates a new TableModelEvent indicating an {@link #UPDATE}
-   * to the data in the specified rows and column.  Use {@link #ALL_COLUMNS} 
+   * to the data in the specified rows and column.  Use {@link #ALL_COLUMNS}
    * for the column argument to indicate all columns.
-   * 
+   *
    * @param source  the source object (null not permitted).
    * @param firstRow  the first row of update.
    * @param lastRow  the last row of update.
    * @param column  the affected column.
-   *    
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *         null.
    */
-  public TableModelEvent(TableModel source, int firstRow, int lastRow, 
+  public TableModelEvent(TableModel source, int firstRow, int lastRow,
                          int column)
   {
     this(source, firstRow, lastRow, column, UPDATE);
@@ -157,17 +157,17 @@ public class TableModelEvent extends EventObject
    * the specified type on the data in the specified rows and
    * column.  The event type is usually one of {@link #UPDATE}, {@link #INSERT},
    * and {@link #DELETE}.
-   * 
+   *
    * @param source  the source object (null not permitted).
    * @param firstRow  the first row of update.
    * @param lastRow  the last row of update.
    * @param column  the affected column.
    * @param type  the type of change.
-   * 
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *         null.
    */
-  public TableModelEvent(TableModel source, int firstRow, int lastRow, 
+  public TableModelEvent(TableModel source, int firstRow, int lastRow,
                          int column, int type)
   {
     super(source);
@@ -179,7 +179,7 @@ public class TableModelEvent extends EventObject
 
   /**
    * Returns the affected column of this event.
-   * 
+   *
    * @return The column index.
    */
   public int getColumn()
@@ -189,7 +189,7 @@ public class TableModelEvent extends EventObject
 
   /**
    * Returns the first affected row of this event.
-   * 
+   *
    * @return The row index.
    */
   public int getFirstRow()
@@ -199,7 +199,7 @@ public class TableModelEvent extends EventObject
 
   /**
    * Returns the last affected row of this event.
-   * 
+   *
    * @return The row index.
    */
   public int getLastRow()
@@ -208,9 +208,9 @@ public class TableModelEvent extends EventObject
   }
 
   /**
-   * Returns the type of change indicated by this event (usually one of 
+   * Returns the type of change indicated by this event (usually one of
    * {@link #UPDATE}, {@link #INSERT}, {@link #DELETE}).
-   * 
+   *
    * @return The type.
    */
   public int getType()
diff --git a/libjava/classpath/javax/swing/event/TableModelListener.java b/libjava/classpath/javax/swing/event/TableModelListener.java
index 21e5ea0474e..612712f853c 100644
--- a/libjava/classpath/javax/swing/event/TableModelListener.java
+++ b/libjava/classpath/javax/swing/event/TableModelListener.java
@@ -40,21 +40,21 @@ package javax.swing.event;
 import java.util.EventListener;
 
 /**
- * A TableModelListener can register with a 
+ * A TableModelListener can register with a
  * {@link javax.swing.table.TableModel} and receive notification of updates to
  * the model.
- * 
+ *
  * @author Andrew Selkirk
  */
-public interface TableModelListener extends EventListener 
+public interface TableModelListener extends EventListener
 {
 
   /**
-   * Called to notify the listener that the 
+   * Called to notify the listener that the
    * {@link javax.swing.table.TableModel} has been updated.
-   * 
+   *
    * @param event  contains details of the update.
    */
   void tableChanged(TableModelEvent event);
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/TreeExpansionEvent.java b/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
index 5820b339172..99e1666770c 100644
--- a/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeExpansionEvent.java
@@ -46,7 +46,7 @@ import javax.swing.tree.TreePath;
  * TreeExpansionEvent
  * @author Andrew Selkirk
  */
-public class TreeExpansionEvent extends EventObject 
+public class TreeExpansionEvent extends EventObject
 {
 
   /**
@@ -59,7 +59,7 @@ public class TreeExpansionEvent extends EventObject
    * @param source Source object
    * @param path Path
    */
-  public TreeExpansionEvent(Object source, TreePath path) 
+  public TreeExpansionEvent(Object source, TreePath path)
   {
     super(source);
     this.path = path;
@@ -69,9 +69,9 @@ public class TreeExpansionEvent extends EventObject
    * getPath
    * @return Tree path
    */
-  public TreePath getPath() 
+  public TreePath getPath()
   {
     return path;
-  } 
+  }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/TreeExpansionListener.java b/libjava/classpath/javax/swing/event/TreeExpansionListener.java
index 45a5ef93c6d..3461f2ce485 100644
--- a/libjava/classpath/javax/swing/event/TreeExpansionListener.java
+++ b/libjava/classpath/javax/swing/event/TreeExpansionListener.java
@@ -43,7 +43,7 @@ import java.util.EventListener;
  * TreeExpansionListener public interface
  * @author Andrew Selkirk
  */
-public interface TreeExpansionListener extends EventListener 
+public interface TreeExpansionListener extends EventListener
 {
 
   /**
diff --git a/libjava/classpath/javax/swing/event/TreeModelEvent.java b/libjava/classpath/javax/swing/event/TreeModelEvent.java
index 2d562a5c4a8..490126f4d38 100644
--- a/libjava/classpath/javax/swing/event/TreeModelEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeModelEvent.java
@@ -46,7 +46,7 @@ import javax.swing.tree.TreePath;
  * TreeModelEvent
  * @author Andrew Selkirk
  */
-public class TreeModelEvent extends EventObject 
+public class TreeModelEvent extends EventObject
 {
 
   /**
@@ -63,17 +63,17 @@ public class TreeModelEvent extends EventObject
    * path
    */
   protected TreePath path = null;
-	
+
   /**
    * Constructor TreeModelEvent
    * @param source Source object
    * @param path
    */
-  public TreeModelEvent(Object source, Object[] path) 
+  public TreeModelEvent(Object source, Object[] path)
   {
     super(source);
     this.path = new TreePath(path);
-  } 
+  }
 
   /**
    * Constructor TreeModelEvent
@@ -83,24 +83,24 @@ public class TreeModelEvent extends EventObject
    * @param children Children
    */
   public TreeModelEvent(Object source, Object[] path,
-      int[] childIndices, Object[] children) 
+      int[] childIndices, Object[] children)
   {
     super(source);
     this.path = new TreePath(path);
     this.childIndices = childIndices;
     this.children = children;
-  } 
+  }
 
   /**
    * Constructor TreeModelEvent
    * @param source Source object
    * @param path Path
    */
-  public TreeModelEvent(Object source, TreePath path) 
+  public TreeModelEvent(Object source, TreePath path)
   {
     super(source);
     this.path = path;
-  } 
+  }
 
   /**
    * Constructor TreeModelEvent
@@ -110,59 +110,59 @@ public class TreeModelEvent extends EventObject
    * @param children Children
    */
   public TreeModelEvent(Object source, TreePath path,
-      int[] childIndices, Object[] children) 
+      int[] childIndices, Object[] children)
   {
     super(source);
     this.path = path;
     this.childIndices = childIndices;
     this.children = children;
-  } 
+  }
 
   /**
    * getChildIndices
    * @return child indices
    */
-  public int[] getChildIndices()  
+  public int[] getChildIndices()
   {
     return childIndices;
-  } 
+  }
 
   /**
    * getChildren
    * @return children
    */
-  public Object[] getChildren()  
+  public Object[] getChildren()
   {
     return children;
-  } 
+  }
 
   /**
    * getPath
    * @return path
    */
-  public Object[] getPath() 
+  public Object[] getPath()
   {
     return path.getPath();
-  } 
+  }
 
   /**
    * getTreePath
    * @return TreePath
    */
-  public TreePath getTreePath() 
+  public TreePath getTreePath()
   {
     return path;
-  } 
+  }
 
-  /**  
+  /**
    * String representation
    * @return String representation
    */
-  public String toString() 
+  public String toString()
   {
-    return getClass() + " [Source: " + getSource() + ", TreePath: " 
-        + getTreePath() + ", Child Indicies: " + getChildIndices() 
+    return getClass() + " [Source: " + getSource() + ", TreePath: "
+        + getTreePath() + ", Child Indicies: " + getChildIndices()
         + ", Children: " + getChildren() + ", Path: " + getPath() +"]";
-  } 
+  }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/TreeModelListener.java b/libjava/classpath/javax/swing/event/TreeModelListener.java
index 57b5c511b8b..780410588f4 100644
--- a/libjava/classpath/javax/swing/event/TreeModelListener.java
+++ b/libjava/classpath/javax/swing/event/TreeModelListener.java
@@ -46,29 +46,29 @@ import java.util.EventListener;
  */
 public interface TreeModelListener extends EventListener {
 
-	/**
-	 * Tree nodes changed
-	 * @param event Tree Model Event
-	 */
-	void treeNodesChanged(TreeModelEvent event);
+        /**
+         * Tree nodes changed
+         * @param event Tree Model Event
+         */
+        void treeNodesChanged(TreeModelEvent event);
 
-	/**
-	 * Tree nodes inserted
-	 * @param event Tree Model Event
-	 */
-	void treeNodesInserted(TreeModelEvent event);
+        /**
+         * Tree nodes inserted
+         * @param event Tree Model Event
+         */
+        void treeNodesInserted(TreeModelEvent event);
 
-	/**
-	 * Tree nodes removed
-	 * @param event Tree Model Event
-	 */
-	void treeNodesRemoved(TreeModelEvent event);
+        /**
+         * Tree nodes removed
+         * @param event Tree Model Event
+         */
+        void treeNodesRemoved(TreeModelEvent event);
 
-	/**
-	 * Tree structured changed
-	 * @param event Tree Model Event
-	 */
-	void treeStructureChanged(TreeModelEvent event);
+        /**
+         * Tree structured changed
+         * @param event Tree Model Event
+         */
+        void treeStructureChanged(TreeModelEvent event);
 
 
 } // TreeModelListener
diff --git a/libjava/classpath/javax/swing/event/TreeSelectionEvent.java b/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
index 532a1dbf6d6..830170d9ff3 100644
--- a/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
+++ b/libjava/classpath/javax/swing/event/TreeSelectionEvent.java
@@ -44,14 +44,14 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 /**
- * An event that carries information about a change to a 
+ * An event that carries information about a change to a
  * {@link TreeSelectionModel}.
- * 
+ *
  * @see TreeSelectionListener
- * 
+ *
  * @author Andrew Selkirk
  */
-public class TreeSelectionEvent extends EventObject 
+public class TreeSelectionEvent extends EventObject
 {
 
   /**
@@ -77,112 +77,112 @@ public class TreeSelectionEvent extends EventObject
 
   /**
    * Creates a new TreeSelectionEvent.
-   * 
-   * @param source  the source (usually a {@link TreeSelectionModel}, 
+   *
+   * @param source  the source (usually a {@link TreeSelectionModel},
    *                null not permitted).
-   * @param paths  an array of the paths that have been added to or removed 
+   * @param paths  an array of the paths that have been added to or removed
    *     from the selection.
    * @param areNew  a flag for each path where true indicates the
-   *     corresponding path has been added to the selection and 
+   *     corresponding path has been added to the selection and
    *     false indicates the path has been removed.
    * @param oldLeadSelectionPath  the old lead selection path (null
    *     permitted).
    * @param newLeadSelectionPath  the new lead selection path (null
    *     permitted).
    *
-   * @throws IllegalArgumentException if source is 
+   * @throws IllegalArgumentException if source is
    *     null.
    */
   public TreeSelectionEvent(Object source, TreePath[] paths,
-			    boolean[] areNew, TreePath oldLeadSelectionPath,
-			    TreePath newLeadSelectionPath)
+                            boolean[] areNew, TreePath oldLeadSelectionPath,
+                            TreePath newLeadSelectionPath)
   {
     super(source);
-    this.paths					= paths;
-    this.areNew					= areNew;
-    this.oldLeadSelectionPath	= oldLeadSelectionPath;
-    this.newLeadSelectionPath	= newLeadSelectionPath;
+    this.paths                                  = paths;
+    this.areNew                                 = areNew;
+    this.oldLeadSelectionPath   = oldLeadSelectionPath;
+    this.newLeadSelectionPath   = newLeadSelectionPath;
   }
 
   /**
    * Creates a new TreeSelectionEvent.
-   * 
+   *
    * @param source  the event source (usually a {@link TreeSelectionModel},
    *     null not permitted).
    * @param path  the path.
-   * @param isNew true indicates that path has been 
-   *     added to the selection, and false indicates that it has 
+   * @param isNew true indicates that path has been
+   *     added to the selection, and false indicates that it has
    *     been removed.
    * @param oldLeadSelectionPath  the old lead selection path (null
    *     permitted).
    * @param newLeadSelectionPath  the new lead selection path (null
    *     permitted).
-   *                              
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *     null.
    */
   public TreeSelectionEvent(Object source, TreePath path,
-			    boolean isNew, TreePath oldLeadSelectionPath,
-			    TreePath newLeadSelectionPath)
+                            boolean isNew, TreePath oldLeadSelectionPath,
+                            TreePath newLeadSelectionPath)
   {
     super(source);
     this.paths = new TreePath[]{path};
     this.areNew = new boolean[]{isNew};
-    this.oldLeadSelectionPath	= oldLeadSelectionPath;
-    this.newLeadSelectionPath	= newLeadSelectionPath;
+    this.oldLeadSelectionPath   = oldLeadSelectionPath;
+    this.newLeadSelectionPath   = newLeadSelectionPath;
   }
 
   /**
    * Returns the first path element.
-   * 
+   *
    * @return The first path element.
-   * 
+   *
    * @see #getPaths()
    */
   public TreePath getPath()
   {
     return paths[0];
-  } 
+  }
 
   /**
    * Returns an array of the paths that changed in the selection.
-   * 
+   *
    * @return The paths that changed in the selection.
-   * 
+   *
    * @see #isAddedPath(TreePath)
    */
   public TreePath[] getPaths()
   {
     return (TreePath[]) paths.clone();
-  } 
+  }
 
   /**
    * Returns true if the path returned by {@link #getPath()} has
    * been added to the selection, and false if it has been
    * removed.
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @see #isAddedPath(int)
    */
   public boolean isAddedPath()
   {
     return areNew[0];
-  } 
+  }
 
   /**
-   * Returns true if path has been added to the 
+   * Returns true if path has been added to the
    * selection, and false if the path has been removed from the
    * selection.
-   * 
+   *
    * @param path  the path to check.
-   * 
+   *
    * @return A flag indicating whether the path has been added to, or removed
    *     from, the selection.
-   *     
+   *
    * @throw IllegalArgumentException if path is not one of the
    *     paths in {@link #getPaths()}.
-   *     
+   *
    * @see #isAddedPath(int)
    */
   public boolean isAddedPath(TreePath path)
@@ -192,20 +192,20 @@ public class TreeSelectionEvent extends EventObject
         return areNew[i];
 
     throw new IllegalArgumentException("Unknown 'path' argument.");
-  } 
+  }
 
   /**
-   * Returns true if the path at the specified index has been 
-   * added to the selection, and false if the path has been 
+   * Returns true if the path at the specified index has been
+   * added to the selection, and false if the path has been
    * removed from the selection.
-   * 
+   *
    * @param index  the path index.
-   * 
+   *
    * @return A flag indicating whether the path has been added to, or removed
    *     from, the selection.
-   *     
+   *
    * @since 1.3
-   * 
+   *
    * @see #isAddedPath(TreePath)
    */
   public boolean isAddedPath(int index)
@@ -215,21 +215,21 @@ public class TreeSelectionEvent extends EventObject
 
   /**
    * Returns the old lead selection path.
-   * 
+   *
    * @return The old lead selection path (possibly null).
-   * 
+   *
    * @see #getNewLeadSelectionPath()
    */
   public TreePath getOldLeadSelectionPath()
   {
     return oldLeadSelectionPath;
-  } 
+  }
 
   /**
    * Returns the new lead selection path.
-   * 
+   *
    * @return The new lead selection path (possibly null).
-   * 
+   *
    * @see #getOldLeadSelectionPath()
    */
   public TreePath getNewLeadSelectionPath()
@@ -240,18 +240,18 @@ public class TreeSelectionEvent extends EventObject
   /**
    * Creates a shallow copy of this TreeSelectionEvent, replacing
    * the source with source.
-   * 
+   *
    * @param source  the new event source (null not permitted).
-   * 
+   *
    * @return A cloned event with another event source.
-   * 
-   * @throws IllegalArgumentException if source is 
+   *
+   * @throws IllegalArgumentException if source is
    *     null.
    */
   public Object cloneWithSource(Object source)
   {
     return new TreeSelectionEvent (source, paths, areNew, oldLeadSelectionPath,
         newLeadSelectionPath);
-  } 
+  }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/TreeSelectionListener.java b/libjava/classpath/javax/swing/event/TreeSelectionListener.java
index 2171e39d69f..8f8711d3a33 100644
--- a/libjava/classpath/javax/swing/event/TreeSelectionListener.java
+++ b/libjava/classpath/javax/swing/event/TreeSelectionListener.java
@@ -44,17 +44,17 @@ import javax.swing.tree.TreeSelectionModel;
 /**
  * A listener that receives {@link TreeSelectionEvent} notifications from a
  * source (such as a {@link TreeSelectionModel}).
- * 
+ *
  * @author Andrew Selkirk
  */
-public interface TreeSelectionListener extends EventListener 
+public interface TreeSelectionListener extends EventListener
 {
 
   /**
    * Receives notification of a change to a tree selection model.
-   * 
+   *
    * @param event  information about the event.
    */
   void valueChanged(TreeSelectionEvent event);
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/event/TreeWillExpandListener.java b/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
index 89d3764f3bd..7bdcbe48dca 100644
--- a/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
+++ b/libjava/classpath/javax/swing/event/TreeWillExpandListener.java
@@ -49,7 +49,7 @@ public interface TreeWillExpandListener extends EventListener
 {
   /**
    * Invoked whenever a node in the tree is about to be collapsed.
-   * 
+   *
    * @param event The tree expansion Event
    */
   void treeWillCollapse(TreeExpansionEvent event)
@@ -57,9 +57,9 @@ public interface TreeWillExpandListener extends EventListener
 
   /**
    * Invoked whenever a node in the tree is about to be expanded.
-   * 
+   *
    * @param event The tree expansion Event
    */
   void treeWillExpand(TreeExpansionEvent event)
     throws ExpandVetoException;
-}  
+}
diff --git a/libjava/classpath/javax/swing/event/UndoableEditEvent.java b/libjava/classpath/javax/swing/event/UndoableEditEvent.java
index b59ceadc9c2..b889bb656f0 100644
--- a/libjava/classpath/javax/swing/event/UndoableEditEvent.java
+++ b/libjava/classpath/javax/swing/event/UndoableEditEvent.java
@@ -47,7 +47,7 @@ import javax.swing.undo.UndoableEdit;
  * @author Andrew Selkirk
  * @author Ronald Veldema
  */
-public class UndoableEditEvent extends EventObject 
+public class UndoableEditEvent extends EventObject
 {
 
   private static final long serialVersionUID = 4418044561759134484L;
@@ -62,19 +62,19 @@ public class UndoableEditEvent extends EventObject
    * @param source TODO
    * @param edit TODO
    */
-  public UndoableEditEvent(Object source, UndoableEdit edit) 
+  public UndoableEditEvent(Object source, UndoableEdit edit)
   {
     super(source);
     this.edit = edit;
-  } 
+  }
 
   /**
    * getEdit
    * @return UndoableEdit
    */
-  public UndoableEdit getEdit() 
+  public UndoableEdit getEdit()
   {
     return edit;
   }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/filechooser/FileFilter.java b/libjava/classpath/javax/swing/filechooser/FileFilter.java
index de11525a2bd..68bcb65319c 100644
--- a/libjava/classpath/javax/swing/filechooser/FileFilter.java
+++ b/libjava/classpath/javax/swing/filechooser/FileFilter.java
@@ -45,12 +45,12 @@ import javax.swing.JFileChooser;
 /**
  * The base class for filters that control the visibility of files in the
  * {@link JFileChooser} component.
- * 
+ *
  * @see JFileChooser#addChoosableFileFilter(FileFilter)
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
-public abstract class FileFilter 
+public abstract class FileFilter
 {
 
   /**
@@ -64,20 +64,20 @@ public abstract class FileFilter
   /**
    * Returns true if the specified file matches the filter, and
    * false otherwise.
-   * 
+   *
    * @param file  the file.
-   * 
+   *
    * @return A boolean.
    */
   public abstract boolean accept(File file);
 
   /**
-   * Returns a description of the files that will be selected by the filter 
-   * (for example, "Java source files").  This description will usually be 
+   * Returns a description of the files that will be selected by the filter
+   * (for example, "Java source files").  This description will usually be
    * displayed on the {@link JFileChooser} component, often in a combo box that
    * is used to select the appropriate filter (in cases where more than one
    * filter is available).
-   * 
+   *
    * @return A description of the filter.
    */
   public abstract String getDescription();
diff --git a/libjava/classpath/javax/swing/filechooser/FileSystemView.java b/libjava/classpath/javax/swing/filechooser/FileSystemView.java
index 41d865a964b..5c3c0b8eea9 100644
--- a/libjava/classpath/javax/swing/filechooser/FileSystemView.java
+++ b/libjava/classpath/javax/swing/filechooser/FileSystemView.java
@@ -46,14 +46,14 @@ import javax.swing.JFileChooser;
 
 
 /**
- * The base class providing a view of the file system for use by the 
+ * The base class providing a view of the file system for use by the
  * {@link JFileChooser} component.
  */
 public abstract class FileSystemView
 {
   /** The instance returned by {@link #getFileSystemView()}. */
   private static FileSystemView defaultFileSystemView;
-  
+
   /**
    * Creates a new file object with the given name in the specified directory.
    *
@@ -101,12 +101,12 @@ public abstract class FileSystemView
    * Creates a new folder with a unique name in the specified directory and
    * returns a {@link File} object representing the new directory.
    *
-   * @param containingDir  the directory to contain the new folder 
+   * @param containingDir  the directory to contain the new folder
    *                       (null not permitted).
    *
    * @return A {@link File} object representing the new directory.
    *
-   * @throws IOException if an exception occurs while creating the new 
+   * @throws IOException if an exception occurs while creating the new
    *                     directory.
    */
   public abstract File createNewFolder(File containingDir)
@@ -137,8 +137,8 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns an array containing the files in the given directory.  The 
-   * useFileHiding controls whether or not hidden files are 
+   * Returns an array containing the files in the given directory.  The
+   * useFileHiding controls whether or not hidden files are
    * included in the result.
    *
    * @param dir  the directory (if null
@@ -158,7 +158,7 @@ public abstract class FileSystemView
     ArrayList trim = new ArrayList();
     for (int i = 0; i < files.length; i++)
       if (! files[i].isHidden())
-	trim.add(files[i]);
+        trim.add(files[i]);
     File[] value = (File[]) trim.toArray(new File[trim.size()]);
     return value;
   }
@@ -220,12 +220,12 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns the name of a file as it would be displayed by the underlying 
+   * Returns the name of a file as it would be displayed by the underlying
    * system.
    *
    * @param f  the file.
    *
-   * @return the name of a file as it would be displayed by the underlying 
+   * @return the name of a file as it would be displayed by the underlying
    *         system
    *
    * @specnote The specification suggests that the information here is
@@ -242,8 +242,8 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns the icon that would be displayed for the given file by the 
-   * underlying system.  This implementation returns null, 
+   * Returns the icon that would be displayed for the given file by the
+   * underlying system.  This implementation returns null,
    * subclasses must override.
    *
    * @param f  the file.
@@ -256,8 +256,8 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns the type description of a file that would be displayed by the 
-   * underlying system.  This implementation returns null, 
+   * Returns the type description of a file that would be displayed by the
+   * underlying system.  This implementation returns null,
    * subclasses must override.
    *
    * @param f  the file.
@@ -282,7 +282,7 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns true if the given directory represents a disk 
+   * Returns true if the given directory represents a disk
    * drive, and false otherwise.  This default implementation
    * always returns false.
    *
@@ -326,12 +326,12 @@ public abstract class FileSystemView
     String filename = dir.getAbsolutePath();
     for (int i = 0; i < roots.length; i++)
       if (roots[i].getAbsolutePath().equals(filename))
-	return true;
+        return true;
     return false;
   }
 
   /**
-   * Returns true if the given directory represents a floppy 
+   * Returns true if the given directory represents a floppy
    * drive, and false otherwise.  This default implementation
    * always returns false.
    *
@@ -345,12 +345,12 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns true if the given file is hidden, and 
+   * Returns true if the given file is hidden, and
    * false otherwise.
    *
    * @param f  the file.
    *
-   * @return true if the given file is hidden, and 
+   * @return true if the given file is hidden, and
    *         false otherwise.
    */
   public boolean isHiddenFile(File f)
@@ -359,13 +359,13 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns true if folder is the parent of 
+   * Returns true if folder is the parent of
    * file, and false otherwise.
    *
    * @param folder  the folder (null not permitted).
    * @param file  the file (null not permitted).
    *
-   * @return true if folder is the parent of 
+   * @return true if folder is the parent of
    *         file, and false otherwise.
    */
   public boolean isParent(File folder, File file)
@@ -390,13 +390,13 @@ public abstract class FileSystemView
   }
 
   /**
-   * Returns true if the file is traversable, and 
+   * Returns true if the file is traversable, and
    * false otherwise.  Here, all directories are considered
-   * traversable, and files are considered non-traversable. 
+   * traversable, and files are considered non-traversable.
    *
    * @param f  the file or directory (null not permitted).
    *
-   * @return true if the file is traversable, and 
+   * @return true if the file is traversable, and
    *         false otherwise.
    */
   public Boolean isTraversable(File f)
diff --git a/libjava/classpath/javax/swing/filechooser/FileView.java b/libjava/classpath/javax/swing/filechooser/FileView.java
index 8c2be32ef51..cfa39996b8f 100644
--- a/libjava/classpath/javax/swing/filechooser/FileView.java
+++ b/libjava/classpath/javax/swing/filechooser/FileView.java
@@ -43,86 +43,86 @@ import java.io.File;
 import javax.swing.Icon;
 
 /**
- * An abstract class that provides presentation information about files and 
+ * An abstract class that provides presentation information about files and
  * directories.  .
- * 
+ *
  * @author  Andrew Selkirk
  */
-public abstract class FileView 
+public abstract class FileView
 {
 
   /**
    * Creates a new FileView instance.
    */
-  public FileView() 
+  public FileView()
   {
     // Nothing to do here.
-  } 
+  }
 
   /**
    * Returns the name for the specified file.  This method always returns
    * null and should be overridden by subclasses.
-   * 
+   *
    * @param file  the file.
-   * 
+   *
    * @return Always null.
    */
-  public String getName(File file) 
+  public String getName(File file)
   {
     return null;
-  } 
+  }
 
   /**
    * Returns a description for the specified file.  This method always returns
    * null and should be overridden by subclasses.
-   * 
+   *
    * @param file  the file.
-   * 
+   *
    * @return Always null.
    */
-  public String getDescription(File file) 
+  public String getDescription(File file)
   {
     return null;
-  } 
+  }
 
   /**
-   * Returns a description for the type of the specified file.  This method 
+   * Returns a description for the type of the specified file.  This method
    * always returns null and should be overridden by subclasses.
-   * 
+   *
    * @param file  the file.
-   * 
+   *
    * @return Always null.
    */
-  public String getTypeDescription(File file) 
+  public String getTypeDescription(File file)
   {
     return null;
-  } 
+  }
 
   /**
-   * Returns an {@link Icon} to represent the specified file.  This method 
+   * Returns an {@link Icon} to represent the specified file.  This method
    * always returns null and should be overridden by subclasses.
-   * 
+   *
    * @param file  the file.
-   * 
+   *
    * @return Always null.
    */
-  public Icon getIcon(File file) 
+  public Icon getIcon(File file)
   {
     return null;
-  } 
+  }
 
   /**
    * Returns {@link Boolean#TRUE} if the given directory is traversable, and
-   * {@link Boolean#FALSE} if it is not.  This method always returns 
+   * {@link Boolean#FALSE} if it is not.  This method always returns
    * null and should be overridden by subclasses.
-   * 
+   *
    * @param directory  the directory.
-   * 
+   *
    * @return Always null.
    */
-  public Boolean isTraversable(File directory) 
+  public Boolean isTraversable(File directory)
   {
     return null;
-  } 
+  }
 
 }
diff --git a/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java b/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
index f8d71e1df33..13417683abc 100644
--- a/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
+++ b/libjava/classpath/javax/swing/filechooser/UnixFileSystemView.java
@@ -48,7 +48,7 @@ import javax.swing.Icon;
 /**
  * A concrete implementation of {@link FileSystemView} that is appropriate for
  * Unix-like systems.
- * 
+ *
  * @see FileSystemView#getFileSystemView()
  */
 class UnixFileSystemView extends FileSystemView
@@ -58,18 +58,18 @@ class UnixFileSystemView extends FileSystemView
 
   /**
    * Creates a new folder with a unique name in the specified directory and
-   * returns a {@link File} object representing the new directory.  The name 
-   * of the new folder is NewFolder or, if a directory or file 
-   * with that name already exists, NewFolder.n where 
-   * n is the lowest integer greater than zero that results in 
+   * returns a {@link File} object representing the new directory.  The name
+   * of the new folder is NewFolder or, if a directory or file
+   * with that name already exists, NewFolder.n where
+   * n is the lowest integer greater than zero that results in
    * a unique directory name.
    *
-   * @param containingDir  the directory to contain the new folder 
+   * @param containingDir  the directory to contain the new folder
    *                       (null not permitted).
    *
    * @return A {@link File} object representing the new directory.
    *
-   * @throws IOException if an exception occurs while creating the new 
+   * @throws IOException if an exception occurs while creating the new
    *                     directory.
    */
   public File createNewFolder(File containingDir) throws IOException
@@ -80,22 +80,22 @@ class UnixFileSystemView extends FileSystemView
                       + NEW_FOLDER_NAME;
     while (f == null)
       {
-	String full = filename;
-	if (count > 0)
-	  full += "." + (count++);
-	f = new File(full);
-	if (f.isDirectory() || f.isFile())
-	  {
-	    count++;
-	    f = null;
-	  }
+        String full = filename;
+        if (count > 0)
+          full += "." + (count++);
+        f = new File(full);
+        if (f.isDirectory() || f.isFile())
+          {
+            count++;
+            f = null;
+          }
       }
     f.mkdir();
     return f;
   }
 
   /**
-   * Returns an array containing the file system root. 
+   * Returns an array containing the file system root.
    *
    * @return An array containing the file system root.
    */
@@ -105,12 +105,12 @@ class UnixFileSystemView extends FileSystemView
   }
 
   /**
-   * Returns the name of a file as it would be displayed by the underlying 
+   * Returns the name of a file as it would be displayed by the underlying
    * system.
    *
    * @param f  the file.
    *
-   * @return the name of a file as it would be displayed by the underlying 
+   * @return the name of a file as it would be displayed by the underlying
    *         system
    */
   public String getSystemDisplayName(File f)
@@ -137,7 +137,7 @@ class UnixFileSystemView extends FileSystemView
   }
 
   /**
-   * Returns the icon that would be displayed for the given file by the 
+   * Returns the icon that would be displayed for the given file by the
    * underlying system.  This method is NOT YET IMPLEMENTED.
    *
    * @param f  the file.
@@ -152,7 +152,7 @@ class UnixFileSystemView extends FileSystemView
   }
 
   /**
-   * Returns the description of a file that would be displayed by the 
+   * Returns the description of a file that would be displayed by the
    * underlying system.  This method is NOT YET IMPLEMENTED.
    *
    * @param f  the file.
diff --git a/libjava/classpath/javax/swing/plaf/BorderUIResource.java b/libjava/classpath/javax/swing/plaf/BorderUIResource.java
index 317cb09ac57..17424944c9d 100644
--- a/libjava/classpath/javax/swing/plaf/BorderUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/BorderUIResource.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -96,8 +96,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
    * called.
    */
   private static Border loweredBevelBorderUIResource;
-  
-  
+
+
   /**
    * A shared instance of a {@link BevelBorderUIResource} whose
    * bevelType is {@link
@@ -106,8 +106,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
    * called.
    */
   private static Border raisedBevelBorderUIResource;
-  
-  
+
+
   /**
    * A shared instance of a {@link LineBorderUIResource} for
    * a one-pixel thick black line, or null if
@@ -132,7 +132,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
       etchedBorderUIResource = new EtchedBorderUIResource();
     return etchedBorderUIResource;
   }
-  
+
 
   /**
    * Returns a shared instance of {@link BevelBorderUIResource} whose
@@ -170,8 +170,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
         BevelBorder.RAISED);
     return raisedBevelBorderUIResource;
   }
-  
-  
+
+
   /**
    * Returns a shared instance of {@link LineBorderUIResource} for
    * a black, one-pixel width border.
@@ -193,23 +193,23 @@ public class BorderUIResource implements Border, UIResource, Serializable
    * The wrapped border.
    */
   private Border delegate;
-  
-  
+
+
   /**
    * Constructs a BorderUIResource for wrapping
    * a Border object.
-   * 
+   *
    * @param delegate the border to be wrapped.
    */
   public BorderUIResource(Border delegate)
   {
     if (delegate == null)
       throw new IllegalArgumentException();
-    
+
     this.delegate = delegate;
   }
 
-  
+
   /**
    * Paints the border around an enclosed component by calling
    * the paintBorder method of the wrapped delegate.
@@ -226,8 +226,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
   {
     delegate.paintBorder(c, g, x, y, width, height);
   }
-  
-  
+
+
   /**
    * Measures the width of this border by calling the
    * getBorderInsets method of the wrapped
@@ -240,11 +240,11 @@ public class BorderUIResource implements Border, UIResource, Serializable
    *         width of the border at the respective edge.
    */
   public Insets getBorderInsets(Component c)
-  { 
+  {
     return delegate.getBorderInsets(c);
   }
-  
-  
+
+
   /**
    * Determines whether this border fills every pixel in its area
    * when painting by calling the isBorderOpaque
@@ -255,7 +255,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
    *         can shine through the border.
    */
   public boolean isBorderOpaque()
-  { 
+  {
     return delegate.isBorderOpaque();
   }
 
@@ -272,12 +272,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
    */
-  public static class BevelBorderUIResource 
+  public static class BevelBorderUIResource
     extends BevelBorder
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = -1275542891108351642L;
-    
+
     /**
      * Constructs a BevelBorderUIResource whose colors will be derived
      * from the background of the enclosed component. The background
@@ -296,12 +296,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
      * @throws IllegalArgumentException if bevelType has
      *         an unsupported value.
      */
-    public BevelBorderUIResource(int bevelType) 
-    { 
+    public BevelBorderUIResource(int bevelType)
+    {
       super(bevelType);
     }
-    
-    
+
+
     /**
      * Constructs a BevelBorderUIResource given its appearance type
      * and two colors for its highlight and shadow.
@@ -334,9 +334,9 @@ public class BorderUIResource implements Border, UIResource, Serializable
      * @throws NullPointerException if highlight or
      *         shadow is null.
      */
-    public BevelBorderUIResource(int bevelType, 
-                                 Color highlight, 
-                                 Color shadow) 
+    public BevelBorderUIResource(int bevelType,
+                                 Color highlight,
+                                 Color shadow)
     {
       super(bevelType, highlight, shadow);
     }
@@ -382,15 +382,15 @@ public class BorderUIResource implements Border, UIResource, Serializable
                                  Color highlightOuter,
                                  Color highlightInner,
                                  Color shadowOuter,
-                                 Color shadowInner) 
+                                 Color shadowInner)
     {
       super(bevelType,
             highlightOuter, highlightInner,
             shadowOuter, shadowInner);
     }
   }
-  
-  
+
+
   /**
    * A {@link javax.swing.border.CompoundBorder} that also implements the
    * {@link UIResource} marker interface.  This is useful for
@@ -408,7 +408,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = 7550017084975167341L;
-    
+
     /**
      * Constructs a CompoundBorderUIResource with the specified inside
      * and outside borders.
@@ -429,8 +429,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
       super(outsideBorder, insideBorder);
     }
   }
-  
-  
+
+
   /**
    * An {@link javax.swing.border.EmptyBorder} that also implements the
    * {@link UIResource} marker interface.  This is useful for
@@ -447,12 +447,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
    */
-  public static class EmptyBorderUIResource 
+  public static class EmptyBorderUIResource
     extends EmptyBorder
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = -4914187529340071708L;
-    
+
     /**
      * Constructs an empty border given the number of pixels required
      * on each side.
@@ -473,8 +473,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(top, left, bottom, right);
     }
-    
-    
+
+
     /**
      * Constructs an empty border given the number of pixels required
      * on each side, passed in an Insets object.
@@ -486,8 +486,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
       super(insets);
     }
   }
-  
-  
+
+
   /**
    * An {@link javax.swing.border.EtchedBorder} that also implements the
    * {@link UIResource} marker interface.  This is useful for
@@ -509,7 +509,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = -8186391754165296656L;
-    
+
     /**
      * Constructs an EtchedBorderUIResource that appears lowered into
      * the surface. The colors will be derived from the background
@@ -519,8 +519,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super();
     }
-    
-    
+
+
     /**
      * Constructs an EtchedBorderUIResource with the specified
      * appearance. The colors will be derived from the background
@@ -537,12 +537,12 @@ public class BorderUIResource implements Border, UIResource, Serializable
      * @throws IllegalArgumentException if etchType has
      *         an unsupported value.
      */
-    public EtchedBorderUIResource(int etchType) 
+    public EtchedBorderUIResource(int etchType)
     {
       super(etchType);
     }
-    
-    
+
+
     /**
      * Constructs a lowered EtchedBorderUIResource, explicitly
      * selecting the colors that will be used for highlight and
@@ -560,8 +560,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(highlight, shadow);
     }
-    
-    
+
+
     /**
      * Constructs an EtchedBorderUIResource with the specified
      * appearance, explicitly selecting the colors that will be used
@@ -590,8 +590,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
       super(etchType, highlight, shadow);
     }
   }
-  
-  
+
+
   /**
    * A {@link javax.swing.border.LineBorder} that also implements the
    * {@link UIResource} marker interface.  This is useful for
@@ -612,7 +612,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = -6171232338180172310L;
-    
+
     /**
      * Constructs a LineBorderUIResource given its color.  The border
      * will be one pixel thick and have plain corners.
@@ -621,10 +621,10 @@ public class BorderUIResource implements Border, UIResource, Serializable
      */
     public LineBorderUIResource(Color color)
     {
-      super(color); 
+      super(color);
     }
-    
-    
+
+
     /**
      * Constructs a LineBorder given its color and thickness.  The
      * border will have plain corners.
@@ -636,13 +636,13 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(color, thickness);
     }
-    
-    
+
+
     /* Note: Since JDK1.3, javax.swing.border.LineBorder also has a
      * constructor which accepts a value for the roundedCorners
      * property. However, as of JDK1.4.1, the LineBorderUIResource
      * subclass does not have a corresponding constructor.
-     * 
+     *
      * A request for enhancing the Swing API has been filed with Sun:
      * http://developer.java.sun.com/developer/bugParade/bugs/4879999.html
      */
@@ -669,7 +669,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = -8107923147541851122L;
-    
+
     /**
      * Constructs a MatteBorderUIResource given the width on each side
      * and a fill color.
@@ -690,8 +690,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(top, left, bottom, right, color);
     }
-    
-    
+
+
     /**
      * Constructs a MatteBorderUIResource given the width on each side
      * and an icon for tiling the border area.
@@ -712,8 +712,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(top, left, bottom, right, tileIcon);
     }
-    
-    
+
+
     /**
      * Constructs a MatteBorderUIResource given an icon for tiling the
      * border area. The icon width is used for the border insets at
@@ -724,15 +724,15 @@ public class BorderUIResource implements Border, UIResource, Serializable
      * height="150" alt="[A picture of a MatteBorder made by this
      * constructor]" />
                      
      *
-     * @param tileIcon an icon for tiling the border area. 
+     * @param tileIcon an icon for tiling the border area.
      */
     public MatteBorderUIResource(Icon tileIcon)
     {
       super(tileIcon);
     }
   }
-  
-  
+
+
   /**
    * A {@link javax.swing.border.TitledBorder} that also implements the
    * {@link UIResource} marker interface.  This is useful for
@@ -750,7 +750,7 @@ public class BorderUIResource implements Border, UIResource, Serializable
     implements UIResource, Serializable
   {
     private static final long serialVersionUID = 7667113547406407427L;
-    
+
     /**
      * Constructs a TitledBorderUIResource given the text of its title.
      *
@@ -761,8 +761,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(title);
     }
-    
-    
+
+
     /**
      * Constructs an initially untitled TitledBorderUIResource
      * given another border.
@@ -775,8 +775,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
     {
       super(border);
     }
-    
-    
+
+
     /**
      * Constructs a TitledBorder given its border and title text.
      *
@@ -878,8 +878,8 @@ public class BorderUIResource implements Border, UIResource, Serializable
       super(border, title, titleJustification, titlePosition,
             titleFont);
     }
-    
-    
+
+
     /**
      * Constructs a TitledBorder given its border, title text,
      * horizontal alignment, vertical position, font, and color.
@@ -928,4 +928,3 @@ public class BorderUIResource implements Border, UIResource, Serializable
     }
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/ColorChooserUI.java b/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
index 16091416a32..e9cb32caafc 100644
--- a/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/ColorChooserUI.java
@@ -56,4 +56,3 @@ public abstract class ColorChooserUI extends ComponentUI
     /* The constructor does not do anything. */
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/ColorUIResource.java b/libjava/classpath/javax/swing/plaf/ColorUIResource.java
index 36e10f2d186..3c9db2ec893 100644
--- a/libjava/classpath/javax/swing/plaf/ColorUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/ColorUIResource.java
@@ -62,7 +62,7 @@ public class ColorUIResource extends Color implements UIResource
    * @param g the green intensity, which must be in the range [0 .. 255].
    * @param b the blue intensity, which must be in the range [0 .. 255].
    *
-   * @throws IllegalArgumentException if any of the values is outside the 
+   * @throws IllegalArgumentException if any of the values is outside the
    *         specified range.
    */
   public ColorUIResource(int r, int g, int b)
@@ -95,7 +95,7 @@ public class ColorUIResource extends Color implements UIResource
    * @param g the green intensity, which must be in the range [0.0 .. 1.0].
    * @param b the blue intensity, which must be in the range [0.0 .. 1.0].
    *
-   * @throws IllegalArgumentException if any of the values is outside the 
+   * @throws IllegalArgumentException if any of the values is outside the
    *         specified range.
    */
   public ColorUIResource(float r, float g, float b)
diff --git a/libjava/classpath/javax/swing/plaf/ComboBoxUI.java b/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
index 58f6e815cb3..0a06d263e3a 100644
--- a/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/ComboBoxUI.java
@@ -55,7 +55,7 @@ public abstract class ComboBoxUI extends ComponentUI
   {
     // Nothing to do here.
   }
-    
+
   /**
    * Sets the visibility of the popup button.
    *
@@ -77,7 +77,7 @@ public abstract class ComboBoxUI extends ComponentUI
    *         visible, false otherwise.
    */
   public abstract boolean isPopupVisible(JComboBox c);
-  
+
   /**
    * Determines whether the combo box can receive input focus.
    *
@@ -88,5 +88,5 @@ public abstract class ComboBoxUI extends ComponentUI
    *          input focus, false otherwise.
    */
   public abstract boolean isFocusTraversable(JComboBox c);
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java b/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
index cfc43e4fc78..4553562e9d0 100644
--- a/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/ComponentInputMapUIResource.java
@@ -66,4 +66,3 @@ public class ComponentInputMapUIResource extends ComponentInputMap
     super(component);
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/ComponentUI.java b/libjava/classpath/javax/swing/plaf/ComponentUI.java
index be7b68a440c..35f2de3ed45 100644
--- a/libjava/classpath/javax/swing/plaf/ComponentUI.java
+++ b/libjava/classpath/javax/swing/plaf/ComponentUI.java
@@ -80,7 +80,7 @@ import javax.swing.JComponent;
  *
  * @author Sascha Brawer (brawer@dandelis.ch)
  */
-public abstract class ComponentUI 
+public abstract class ComponentUI
 {
   /**
    * Constructs a new UI delegate.
@@ -89,8 +89,8 @@ public abstract class ComponentUI
   {
     // Nothing to do here.
   }
-  
-  
+
+
   /**
    * Sets up the specified component so it conforms the the design
    * guidelines of the implemented look and feel. When the look and
@@ -145,8 +145,8 @@ public abstract class ComponentUI
   {
     // The default implementation does not change any properties.
   }
-  
-  
+
+
   /**
    * Paints the component according to the design guidelines
    * of the look and feel. Most subclasses will want to override
@@ -162,8 +162,8 @@ public abstract class ComponentUI
     // Nothing is done here. This method is meant to be overridden by
     // subclasses.
   }
-  
-  
+
+
   /**
    * Fills the specified component with its background color
    * (unless the opaque property is false)
@@ -192,7 +192,7 @@ public abstract class ComponentUI
       }
     paint(g, c);
   }
-   
+
   /**
    * Determines the preferred size of a component. The default
    * implementation returns null, which means that
@@ -209,8 +209,8 @@ public abstract class ComponentUI
   {
     return null;
   }
-  
-  
+
+
   /**
    * Determines the minimum size of a component. The default
    * implementation calls {@link #getPreferredSize}, but subclasses
@@ -265,7 +265,7 @@ public abstract class ComponentUI
    *        inside its parent.
    */
   public boolean contains(JComponent c, int x, int y)
-  {    
+  {
     /* JComponent.contains calls the ui delegate for hit
      * testing. Therefore, endless mutual recursion would result if we
      * called c.contains(x, y) here.
@@ -282,8 +282,8 @@ public abstract class ComponentUI
     return (x >= 0) && (x < c.getWidth())
       && (y >= 0) && (y < c.getHeight());
   }
-  
-  
+
+
   /**
    * Creates a delegate object for the specified component.  Users
    * should use the createUI method of a suitable
@@ -298,7 +298,7 @@ public abstract class ComponentUI
       "javax.swing.plaf.ComponentUI does not implement createUI; call "
       + "createUI on a subclass.");
   }
-  
+
 
   /**
    * Counts the number of accessible children in the component.  The
diff --git a/libjava/classpath/javax/swing/plaf/FileChooserUI.java b/libjava/classpath/javax/swing/plaf/FileChooserUI.java
index e9be8f2ba49..fafd21d2a16 100644
--- a/libjava/classpath/javax/swing/plaf/FileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/FileChooserUI.java
@@ -63,7 +63,7 @@ public abstract class FileChooserUI extends ComponentUI
     // Nothing to do here.
   }
 
-  
+
   /**
    * Returns a FileFilter that accepts every file.  While
    * the filtering itself is not specific to any look and feel, the
diff --git a/libjava/classpath/javax/swing/plaf/IconUIResource.java b/libjava/classpath/javax/swing/plaf/IconUIResource.java
index 8ac9e0875ae..48503f8a06b 100644
--- a/libjava/classpath/javax/swing/plaf/IconUIResource.java
+++ b/libjava/classpath/javax/swing/plaf/IconUIResource.java
@@ -63,7 +63,7 @@ public class IconUIResource implements Icon, UIResource, Serializable
 
 
   /**
-   * The icon that is wrapped by this IconUIResource (never 
+   * The icon that is wrapped by this IconUIResource (never
    * null).
    */
   private Icon delegate;
diff --git a/libjava/classpath/javax/swing/plaf/SplitPaneUI.java b/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
index 59ededf5847..faf17cb08f3 100644
--- a/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/SplitPaneUI.java
@@ -93,8 +93,8 @@ public abstract class SplitPaneUI extends ComponentUI
    * @return the current location of the divider.
    */
   public abstract int getDividerLocation(JSplitPane pane);
-  
-  
+
+
   /**
    * Determines the minimum location of the divider.
    *
diff --git a/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
index 01a7720148f..59136e04c0e 100644
--- a/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/TabbedPaneUI.java
@@ -60,8 +60,8 @@ public abstract class TabbedPaneUI extends ComponentUI
   {
     // Nothing to do here.
   }
-  
-  
+
+
   /**
    * Determines which tab lies at a given position.
    *
@@ -79,7 +79,7 @@ public abstract class TabbedPaneUI extends ComponentUI
    */
   public abstract int tabForCoordinate(JTabbedPane pane,
                                        int x, int y);
-  
+
 
   /**
    * Calculates the bounding box of a tab.
@@ -108,4 +108,3 @@ public abstract class TabbedPaneUI extends ComponentUI
    */
   public abstract int getTabRunCount(JTabbedPane pane);
 }
-                       
diff --git a/libjava/classpath/javax/swing/plaf/TextUI.java b/libjava/classpath/javax/swing/plaf/TextUI.java
index 9f2737cc26f..424cee92de2 100644
--- a/libjava/classpath/javax/swing/plaf/TextUI.java
+++ b/libjava/classpath/javax/swing/plaf/TextUI.java
@@ -61,7 +61,7 @@ public abstract class TextUI extends ComponentUI
 {
   /**
    * Constructs a new TextUI.
-   */  
+   */
   public TextUI()
   {
     // Nothing to do here.
@@ -155,7 +155,7 @@ public abstract class TextUI extends ComponentUI
    */
   public abstract int viewToModel(JTextComponent tc, Point loc,
                                   Position.Bias[] outBias);
- 
+
 
 
   /**
@@ -235,7 +235,7 @@ public abstract class TextUI extends ComponentUI
                                    Position.Bias startBias,
                                    Position.Bias endBias);
 
-  
+
   /**
    * Retrieves the EditorKit managing policies and
    * persistent state.
@@ -246,8 +246,8 @@ public abstract class TextUI extends ComponentUI
    * @return the EditorKit used by tc.
    */
   public abstract EditorKit getEditorKit(JTextComponent tc);
-  
-  
+
+
   /**
    * Retrieves the root of the view tree that visually presents
    * the text.
diff --git a/libjava/classpath/javax/swing/plaf/UIResource.java b/libjava/classpath/javax/swing/plaf/UIResource.java
index fe398fe5474..511aaa70f4f 100644
--- a/libjava/classpath/javax/swing/plaf/UIResource.java
+++ b/libjava/classpath/javax/swing/plaf/UIResource.java
@@ -1,4 +1,4 @@
-/* UIResource.java 
+/* UIResource.java
    Copyright (C) 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -44,14 +44,14 @@ package javax.swing.plaf;
  * renderer with ComponentUI.uninstallUI() the renderer
  * property is set to null.
  * 
                      
- * A comparison against null can be used with all properties except for 
- * the java.awt.Component properties font, foreground, and 
+ * A comparison against null can be used with all properties except for
+ * the java.awt.Component properties font, foreground, and
  * background.  The container can provide the value of the properties if
  * they are initialized or set to null.
- * 
+ *
  * @author Brian Jones
  *
- * @see ComponentUI 
+ * @see ComponentUI
  */
 public interface UIResource
 {
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java b/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
index 781269b2adf..1d6e8874dd3 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicArrowButton.java
@@ -51,15 +51,15 @@ import javax.swing.SwingConstants;
  * A button that displays an arrow (triangle) that points {@link #NORTH},
  * {@link #SOUTH}, {@link #EAST} or {@link #WEST}.  This button is used by
  * the {@link BasicComboBoxUI} class.
- * 
+ *
  * @see BasicComboBoxUI#createArrowButton
  */
 public class BasicArrowButton extends JButton implements SwingConstants
 {
 
-  /** 
-   * The direction that the arrow points. 
-   * 
+  /**
+   * The direction that the arrow points.
+   *
    * @see #getDirection()
    */
   protected int direction;
@@ -89,7 +89,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * in the specified direction.  If the direction is not one of
    * the specified constants, no arrow is drawn.
    *
-   * @param direction The direction the arrow points in (one of: 
+   * @param direction The direction the arrow points in (one of:
    * {@link #NORTH}, {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
    */
   public BasicArrowButton(int direction)
@@ -103,7 +103,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * Creates a new BasicArrowButton object with the given colors and
    * direction.
    *
-   * @param direction The direction to point in (one of: 
+   * @param direction The direction to point in (one of:
    * {@link #NORTH}, {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
    * @param background The background color.
    * @param shadow The shadow color.
@@ -133,7 +133,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
   }
 
   /**
-   * Returns the direction of the arrow (one of: {@link #NORTH}, 
+   * Returns the direction of the arrow (one of: {@link #NORTH},
    * {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
    *
    * @return The direction of the arrow.
@@ -146,7 +146,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
   /**
    * Sets the direction of the arrow.
    *
-   * @param dir The new direction of the arrow (one of: {@link #NORTH}, 
+   * @param dir The new direction of the arrow (one of: {@link #NORTH},
    *            {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
    */
   public void setDirection(int dir)
@@ -163,23 +163,23 @@ public class BasicArrowButton extends JButton implements SwingConstants
   public void paint(Graphics g)
   {
     super.paint(g);
-    
+
     int height = getHeight();
     int size = height / 4;
-    
+
     int x = (getWidth() - size) / 2;
     int y = (height - size) / 2;
-    
+
     ButtonModel m = getModel();
     if (m.isArmed())
       {
         x++;
         y++;
       }
-    
+
     paintTriangle(g, x, y, size, direction, isEnabled());
   }
-  
+
   /**
    * Returns the preferred size of the arrow button.
    *
@@ -220,17 +220,17 @@ public class BasicArrowButton extends JButton implements SwingConstants
   }
 
   /**
-   * Paints a triangle with the given size, location and direction.  It is 
+   * Paints a triangle with the given size, location and direction.  It is
    * difficult to explain the rationale behind the positioning of the triangle
-   * relative to the given (x, y) position - by trial and error we seem to 
-   * match the behaviour of the reference implementation (which is missing a 
+   * relative to the given (x, y) position - by trial and error we seem to
+   * match the behaviour of the reference implementation (which is missing a
    * specification for this method).
    *
    * @param g  the graphics device.
    * @param x  the x-coordinate for the triangle's location.
    * @param y  the y-coordinate for the triangle's location.
    * @param size  the arrow size (depth).
-   * @param direction  the direction of the arrow (one of: {@link #NORTH}, 
+   * @param direction  the direction of the arrow (one of: {@link #NORTH},
    *            {@link #SOUTH}, {@link #EAST} and {@link #WEST}).
    * @param isEnabled  if true the arrow is drawn in the enabled
    *                   state, otherwise it is drawn in the disabled state.
@@ -258,11 +258,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
       }
     g.setColor(savedColor);
   }
-  
+
   /**
-   * Paints an upward-pointing triangle.  This method is called by the 
+   * Paints an upward-pointing triangle.  This method is called by the
    * {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
-   * 
+   *
    * @param g  the graphics device.
    * @param x  the x-coordinate for the anchor point.
    * @param y  the y-coordinate for the anchor point.
@@ -270,7 +270,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * @param isEnabled  if true the arrow is drawn in the enabled
    *                   state, otherwise it is drawn in the disabled state.
    */
-  private void paintTriangleNorth(Graphics g, int x, int y, int size, 
+  private void paintTriangleNorth(Graphics g, int x, int y, int size,
           boolean isEnabled)
   {
     int tipX = x + (size - 2) / 2;
@@ -297,11 +297,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
        g.drawLine(baseX1 + 1, baseY + 1, baseX2 + 1, baseY + 1);
      }
   }
-  
+
   /**
-   * Paints an downward-pointing triangle.  This method is called by the 
+   * Paints an downward-pointing triangle.  This method is called by the
    * {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
-   * 
+   *
    * @param g  the graphics device.
    * @param x  the x-coordinate for the anchor point.
    * @param y  the y-coordinate for the anchor point.
@@ -309,7 +309,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * @param isEnabled  if true the arrow is drawn in the enabled
    *                   state, otherwise it is drawn in the disabled state.
    */
-  private void paintTriangleSouth(Graphics g, int x, int y, int size, 
+  private void paintTriangleSouth(Graphics g, int x, int y, int size,
           boolean isEnabled)
   {
     int tipX = x + (size - 2) / 2;
@@ -337,11 +337,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
        g.drawLine(tipX + 1, tipY + 1, baseX2 + 1, baseY + 1);
      }
   }
-  
+
   /**
-   * Paints a right-pointing triangle.  This method is called by the 
+   * Paints a right-pointing triangle.  This method is called by the
    * {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
-   * 
+   *
    * @param g  the graphics device.
    * @param x  the x-coordinate for the anchor point.
    * @param y  the y-coordinate for the anchor point.
@@ -349,7 +349,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * @param isEnabled  if true the arrow is drawn in the enabled
    *                   state, otherwise it is drawn in the disabled state.
    */
-  private void paintTriangleEast(Graphics g, int x, int y, int size, 
+  private void paintTriangleEast(Graphics g, int x, int y, int size,
           boolean isEnabled)
   {
     int tipX = x + (size - 1);
@@ -357,7 +357,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
     int baseX = x;
     int baseY1 = tipY - (size - 1);
     int baseY2 = tipY + (size - 1);
-    
+
     Polygon triangle = new Polygon();
     triangle.addPoint(tipX, tipY);
     triangle.addPoint(baseX, baseY1);
@@ -378,11 +378,11 @@ public class BasicArrowButton extends JButton implements SwingConstants
        g.drawLine(baseX + 1, baseY2 + 1, tipX + 1, tipY + 1);
      }
   }
-  
+
   /**
-   * Paints a left-pointing triangle.  This method is called by the 
+   * Paints a left-pointing triangle.  This method is called by the
    * {@link #paintTriangle(Graphics, int, int, int, int, boolean)} method.
-   * 
+   *
    * @param g  the graphics device.
    * @param x  the x-coordinate for the anchor point.
    * @param y  the y-coordinate for the anchor point.
@@ -390,7 +390,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
    * @param isEnabled  if true the arrow is drawn in the enabled
    *                   state, otherwise it is drawn in the disabled state.
    */
-  private void paintTriangleWest(Graphics g, int x, int y, int size, 
+  private void paintTriangleWest(Graphics g, int x, int y, int size,
           boolean isEnabled)
   {
     int tipX = x;
@@ -398,7 +398,7 @@ public class BasicArrowButton extends JButton implements SwingConstants
     int baseX = x + (size - 1);
     int baseY1 = tipY - (size - 1);
     int baseY2 = tipY + (size - 1);
-    
+
     Polygon triangle = new Polygon();
     triangle.addPoint(tipX, tipY);
     triangle.addPoint(baseX, baseY1);
@@ -418,5 +418,5 @@ public class BasicArrowButton extends JButton implements SwingConstants
        g.drawLine(baseX + 1, baseY1 + 1, baseX + 1, baseY2 + 1);
      }
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
index 5e2cf2e48ca..83afc33a23d 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicBorders.java
@@ -252,7 +252,7 @@ public class BasicBorders
    * UIDefaults of the currently active look and feel
    * using the keys “SplitPane.darkShadow” and
    * “SplitPane.highlight”.
-   *   
+   *
    * 
                      [A screen shot for JSplitPane.HORIZONTAL_SPLIT]
    *
@@ -284,7 +284,7 @@ public class BasicBorders
    * other two edges is the background color of the divider.
    *
    * 
                      +
    *
    * @return an instance of SplitPaneDividerBorder, which is
@@ -332,7 +332,7 @@ public class BasicBorders
       UIManager.getColor("TextField.light"),
       UIManager.getColor("TextField.highlight"));
   }
-  
+
 
   /**
    * Returns a two-pixel thick, green
@@ -407,8 +407,8 @@ public class BasicBorders
 
     return sharedMarginBorder;
   }
-  
-  
+
+
   /**
    * A border whose appearance depends on the state of
    * the enclosed button.
@@ -429,36 +429,36 @@ public class BasicBorders
      * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
      */
     static final long serialVersionUID = -157053874580739687L;
-    
-    
+
+
     /**
      * The color for drawing the shaded parts of the border.
      * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
      */
     protected Color shadow;
-    
-    
+
+
     /**
      * The color for drawing the dark shaded parts of the border.
      * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
      */
     protected Color darkShadow;
-    
-    
+
+
     /**
      * The color for drawing the highlighted parts of the border.
      * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
      */
     protected Color highlight;
-    
-    
+
+
     /**
      * The color for drawing the bright highlighted parts of the border.
      * @see javax.swing.plaf.basic.BasicGraphicsUtils#drawBezel
      */
     protected Color lightHighlight;
-    
-    
+
+
     /**
      * Constructs a new border for drawing a button in the Basic
      * look and feel.
@@ -485,7 +485,7 @@ public class BasicBorders
         ? lightHighlight
         : Color.white;
     }
-    
+
 
     /**
      * Paints the ButtonBorder around a given component.
@@ -503,10 +503,10 @@ public class BasicBorders
                             int x, int y, int width, int height)
     {
       ButtonModel bmodel = null;
-      
+
       if (c instanceof AbstractButton)
         bmodel = ((AbstractButton) c).getModel();
-      
+
       BasicGraphicsUtils.drawBezel(
         g, x, y, width, height,
         /* pressed */ (bmodel != null)
@@ -516,8 +516,8 @@ public class BasicBorders
                         && ((JButton) c).isDefaultButton(),
         shadow, darkShadow, highlight, lightHighlight);
     }
-    
-    
+
+
     /**
      * Measures the width of this border.
      *
@@ -534,7 +534,7 @@ public class BasicBorders
      *         bottom fields indicate the width of the
      *         border at the respective edge.
      *
-     * @see #getBorderInsets(java.awt.Component, java.awt.Insets) 
+     * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
      */
     public Insets getBorderInsets(Component c)
     {
@@ -545,7 +545,7 @@ public class BasicBorders
       return getBorderInsets(c, null);
     }
 
-    
+
     /**
      * Measures the width of this border, storing the results into a
      * pre-existing Insets object.
@@ -583,8 +583,8 @@ public class BasicBorders
       return insets;
     }
   }
-  
-  
+
+
   /**
    * A border that makes its enclosed component appear as lowered
    * into the surface. Typically used for text fields.
@@ -668,7 +668,7 @@ public class BasicBorders
         ? lightHighlight : Color.white;
     }
 
-    
+
     /**
      * Paints the FieldBorder around a given component.
      *
@@ -688,8 +688,8 @@ public class BasicBorders
                                         shadow, darkShadow,
                                         highlight, lightHighlight);
     }
-    
-    
+
+
     /**
      * Measures the width of this border.
      *
@@ -749,8 +749,8 @@ public class BasicBorders
       return insets;
     }
   }
-  
-  
+
+
   /**
    * An invisible, but spacing border whose margin is determined
    * by calling the getMargin() method of the enclosed
@@ -772,8 +772,8 @@ public class BasicBorders
      * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
      */
     static final long serialVersionUID = -3035848353448896090L;
-    
-    
+
+
     /**
      * Constructs a new MarginBorder.
      */
@@ -781,7 +781,7 @@ public class BasicBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Measures the width of this border.
      *
@@ -797,8 +797,8 @@ public class BasicBorders
     {
       return getBorderInsets(c, new Insets(0, 0, 0, 0));
     }
-    
-    
+
+
     /**
      * Determines the insets of this border by calling the
      * getMargin() method of the enclosed component.  The
@@ -839,7 +839,7 @@ public class BasicBorders
         margin = ((JToolBar) c).getMargin();
       else if (c instanceof JTextComponent)
         margin = ((JTextComponent) c).getMargin();
-      
+
       if (margin == null)
         insets.top = insets.left = insets.bottom = insets.right = 0;
       else
@@ -853,7 +853,7 @@ public class BasicBorders
       return insets;
     }
   }
-  
+
 
   /**
    * A border for drawing a separator line below JMenuBar.
@@ -872,8 +872,8 @@ public class BasicBorders
      * of Apple/Sun JDK 1.3.1 on MacOS X 10.1.5.
      */
     static final long serialVersionUID = -6909056571935227506L;
-    
-    
+
+
     /**
      * The shadow color, which is used for the upper line of the
      * two-pixel thick bottom edge.
@@ -949,7 +949,7 @@ public class BasicBorders
 
         g.setColor(highlight);
         g.drawLine(x + 1, y + 1, x + width - 3, y + 1);
-        g.drawLine(x + width - 1, y, x + width - 1, y + 1);        
+        g.drawLine(x + width - 1, y, x + width - 1, y + 1);
       }
       finally
       {
@@ -1098,7 +1098,7 @@ public class BasicBorders
       {
         lowered = button.isSelected()
           || (/* mouse inside */ bmodel.isArmed() && bmodel.isPressed());
-        focused = button.hasFocus() && button.isFocusPainted();        
+        focused = button.hasFocus() && button.isFocusPainted();
       }
 
       if (lowered)
@@ -1112,8 +1112,8 @@ public class BasicBorders
                                      shadow, darkShadow,
                                      highlight, lightHighlight);
     }
-    
-    
+
+
     /**
      * Measures the width of this border.
      *
@@ -1124,7 +1124,7 @@ public class BasicBorders
      *         bottom fields indicate the width of the
      *         border at the respective edge.
      *
-     * @see #getBorderInsets(java.awt.Component, java.awt.Insets) 
+     * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
      */
     public Insets getBorderInsets(Component c)
     {
@@ -1135,7 +1135,7 @@ public class BasicBorders
       return getBorderInsets(c, null);
     }
 
-    
+
     /**
      * Measures the width of this border, storing the results into a
      * pre-existing Insets object.
@@ -1439,7 +1439,7 @@ public class BasicBorders
       y += rect.y - 1;
       int right = x + rect.width + 1;
       int bottom = y + rect.height + 1;
-      
+
       Color oldColor = g.getColor();
       try
       {
@@ -1466,7 +1466,7 @@ public class BasicBorders
       }
     }
 
-    
+
     /**
      * Measures the width of this border.
      *
@@ -1616,7 +1616,7 @@ public class BasicBorders
       return true;
     }
 
-    
+
     /**
      * Determines the JSplitPane whose divider is being painted.
      *
@@ -1661,7 +1661,7 @@ public class BasicBorders
      */
     static final long serialVersionUID = -3528666548001058394L;
 
-    
+
     /**
      * Constructs a new border for drawing a JToggleButton in
      * the Basic look and feel.
@@ -1708,7 +1708,7 @@ public class BasicBorders
        * is selected or not.
        */
       BasicGraphicsUtils.drawBezel(g, x, y, width, height,
-                                   /* pressed */ false, 
+                                   /* pressed */ false,
                                    /* default */ false,
                                    shadow, darkShadow,
                                    highlight, lightHighlight);
@@ -1725,7 +1725,7 @@ public class BasicBorders
      *         bottom fields indicate the width of the
      *         border at the respective edge.
      *
-     * @see #getBorderInsets(java.awt.Component, java.awt.Insets) 
+     * @see #getBorderInsets(java.awt.Component, java.awt.Insets)
      */
     public Insets getBorderInsets(Component c)
     {
@@ -1736,7 +1736,7 @@ public class BasicBorders
       return getBorderInsets(c, null);
     }
 
-    
+
     /**
      * Measures the width of this border, storing the results into a
      * pre-existing Insets object.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java b/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
index c99de2c708c..22033b6ad26 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicButtonListener.java
@@ -131,7 +131,7 @@ public class BasicButtonListener
   {
     // Do nothing here.
   }
-  
+
   public void propertyChange(PropertyChangeEvent e)
   {
     // Store the TextLayout for this in a client property for speed-up
@@ -166,31 +166,31 @@ public class BasicButtonListener
    *
    * @param b the button to check
    */
-  protected void checkOpacity(AbstractButton b) 
-  {    
+  protected void checkOpacity(AbstractButton b)
+  {
     b.setOpaque(b.isContentAreaFilled());
   }
-  
-  public void focusGained(FocusEvent e) 
-  {    
+
+  public void focusGained(FocusEvent e)
+  {
     if (e.getSource() instanceof AbstractButton)
       {
         AbstractButton button = (AbstractButton) e.getSource();
         if (button.isFocusPainted())
-          button.repaint();   
+          button.repaint();
       }
   }
-  
+
   public void focusLost(FocusEvent e)
   {
     if (e.getSource() instanceof AbstractButton)
       {
         AbstractButton button = (AbstractButton) e.getSource();
         if (button.isFocusPainted())
-          button.repaint();   
+          button.repaint();
       }
   }
-  
+
   public void installKeyboardActions(JComponent c)
   {
     ButtonUI ui = ((AbstractButton) c).getUI();
@@ -198,7 +198,7 @@ public class BasicButtonListener
       {
         // Install InputMap.
         BasicButtonUI basicUI = (BasicButtonUI) ui;
-        String prefix = basicUI.getPropertyPrefix(); 
+        String prefix = basicUI.getPropertyPrefix();
         InputMap focusInputMap =
           (InputMap) UIManager.get(prefix + "focusInputMap");
         SwingUtilities.replaceUIInputMap(c, JComponent.WHEN_FOCUSED,
@@ -212,11 +212,11 @@ public class BasicButtonListener
           }
         SwingUtilities.replaceUIActionMap(c, am);
       }
-    
-    c.getActionMap().put("pressed", 
-                         new AbstractAction() 
+
+    c.getActionMap().put("pressed",
+                         new AbstractAction()
                          {
-                           public void actionPerformed(ActionEvent e)          
+                           public void actionPerformed(ActionEvent e)
                            {
                              AbstractButton button = (AbstractButton) e.getSource();
                              ButtonModel model = button.getModel();
@@ -225,11 +225,11 @@ public class BasicButtonListener
                              model.setPressed(true);
                            }
                          });
-    
-    c.getActionMap().put("released", 
-                         new AbstractAction() 
+
+    c.getActionMap().put("released",
+                         new AbstractAction()
                          {
-                           public void actionPerformed(ActionEvent e)          
+                           public void actionPerformed(ActionEvent e)
                            {
                              AbstractButton button = (AbstractButton) e.getSource();
                              ButtonModel model = button.getModel();
@@ -237,7 +237,7 @@ public class BasicButtonListener
                              model.setPressed(false);
                              model.setArmed(false);
                            }
-                       });    
+                       });
   }
 
   /**
@@ -259,23 +259,23 @@ public class BasicButtonListener
     SwingUtilities.replaceUIActionMap(c, null);
     SwingUtilities.replaceUIInputMap(c, JComponent.WHEN_FOCUSED, null);
   }
-  
+
   public void stateChanged(ChangeEvent e)
   {
     // Need to repaint when the button state changes.
     ((AbstractButton) e.getSource()).repaint();
   }
-  
+
   public void mouseMoved(MouseEvent e)
   {
     // Nothing to do here.
   }
-  
+
   public void mouseDragged(MouseEvent e)
   {
     // Nothing to do here.
   }
-  
+
   public void mouseClicked(MouseEvent e)
   {
     // Nothing to do here.
@@ -305,7 +305,7 @@ public class BasicButtonListener
   }
 
   /**
-   * Accept a mouse release event and set the button's 
+   * Accept a mouse release event and set the button's
    * "pressed" property to true, if the model
    * is armed. If the model is not armed, ignore the event.
    *
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
index 9f685bb7bfd..1697c24d926 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicButtonUI.java
@@ -120,7 +120,7 @@ public class BasicButtonUI extends ButtonUI
    *
    * @return A new UI capable of drawing the component
    */
-  public static ComponentUI createUI(final JComponent c) 
+  public static ComponentUI createUI(final JComponent c)
   {
     if (sharedUI == null)
       sharedUI = new BasicButtonUI();
@@ -129,9 +129,9 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Returns the default gap between the button's text and icon (in pixels).
-   * 
+   *
    * @param b  the button (ignored).
-   * 
+   *
    * @return The gap.
    */
   public int getDefaultTextIconGap(AbstractButton b)
@@ -141,19 +141,19 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Sets the text shift offset to zero.
-   * 
+   *
    * @see #setTextShiftOffset()
    */
   protected void clearTextShiftOffset()
   {
     textShiftOffset = 0;
   }
-  
+
   /**
    * Returns the text shift offset.
-   * 
+   *
    * @return The text shift offset.
-   * 
+   *
    * @see #clearTextShiftOffset()
    * @see #setTextShiftOffset()
    */
@@ -164,7 +164,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Sets the text shift offset to the value in {@link #defaultTextShiftOffset}.
-   * 
+   *
    * @see #clearTextShiftOffset()
    */
   protected void setTextShiftOffset()
@@ -185,7 +185,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Installs the default settings.
-   * 
+   *
    * @param b  the button (null not permitted).
    */
   protected void installDefaults(AbstractButton b)
@@ -218,7 +218,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Removes the defaults added by {@link #installDefaults(AbstractButton)}.
-   * 
+   *
    * @param b  the button (null not permitted).
    */
   protected void uninstallDefaults(AbstractButton b)
@@ -229,11 +229,11 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Creates and returns a new instance of {@link BasicButtonListener}.  This
-   * method provides a hook to make it easy for subclasses to install a 
+   * method provides a hook to make it easy for subclasses to install a
    * different listener.
-   * 
+   *
    * @param b  the button.
-   * 
+   *
    * @return A new listener.
    */
   protected BasicButtonListener createButtonListener(AbstractButton b)
@@ -249,7 +249,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Installs listeners for the button.
-   * 
+   *
    * @param b  the button (null not permitted).
    */
   protected void installListeners(AbstractButton b)
@@ -259,7 +259,7 @@ public class BasicButtonUI extends ButtonUI
       {
         b.addChangeListener(listener);
         b.addPropertyChangeListener(listener);
-        b.addFocusListener(listener);    
+        b.addFocusListener(listener);
         b.addMouseListener(listener);
         b.addMouseMotionListener(listener);
       }
@@ -271,7 +271,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Uninstalls listeners for the button.
-   * 
+   *
    * @param b  the button (null not permitted).
    */
   protected void uninstallListeners(AbstractButton b)
@@ -281,7 +281,7 @@ public class BasicButtonUI extends ButtonUI
       {
         b.removeChangeListener(listener);
         b.removePropertyChangeListener(listener);
-        b.removeFocusListener(listener);    
+        b.removeFocusListener(listener);
         b.removeMouseListener(listener);
         b.removeMouseMotionListener(listener);
       }
@@ -304,12 +304,12 @@ public class BasicButtonUI extends ButtonUI
   /**
    * Install the BasicButtonUI as the UI for a particular component.
    * This means registering all the UI's listeners with the component,
-   * and setting any properties of the button which are particular to 
+   * and setting any properties of the button which are particular to
    * this look and feel.
    *
    * @param c The component to install the UI into
    */
-  public void installUI(final JComponent c) 
+  public void installUI(final JComponent c)
   {
     super.installUI(c);
     if (c instanceof AbstractButton)
@@ -395,7 +395,7 @@ public class BasicButtonUI extends ButtonUI
    *
    * @return The preferred dimensions of the component
    */
-  public Dimension getPreferredSize(JComponent c) 
+  public Dimension getPreferredSize(JComponent c)
   {
     AbstractButton b = (AbstractButton) c;
     Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b,
@@ -417,7 +417,7 @@ public class BasicButtonUI extends ButtonUI
           i = b.getRolloverSelectedIcon();
         else if (b.getRolloverIcon() != null)
           i = b.getRolloverIcon();
-      }    
+      }
 
     else if (b.isSelected() && b.isEnabled())
       {
@@ -434,7 +434,7 @@ public class BasicButtonUI extends ButtonUI
   }
 
   /**
-   * Paint the component, which is an {@link AbstractButton}, according to 
+   * Paint the component, which is an {@link AbstractButton}, according to
    * its current state.
    *
    * @param g The graphics context to paint with
@@ -462,13 +462,13 @@ public class BasicButtonUI extends ButtonUI
     g.setFont(f);
     Icon icon = b.getIcon();
     String text = b.getText();
-    text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
+    text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
                                               text, icon,
-                                              b.getVerticalAlignment(), 
+                                              b.getVerticalAlignment(),
                                               b.getHorizontalAlignment(),
-                                              b.getVerticalTextPosition(), 
+                                              b.getVerticalTextPosition(),
                                               b.getHorizontalTextPosition(),
-                                              viewR, iconR, textR, 
+                                              viewR, iconR, textR,
                                               text == null ? 0
                                                          : b.getIconTextGap());
 
@@ -541,7 +541,7 @@ public class BasicButtonUI extends ButtonUI
 
   /**
    * Paints the background area of an {@link AbstractButton} in the pressed
-   * state.  This means filling the supplied area with a darker than normal 
+   * state.  This means filling the supplied area with a darker than normal
    * background.
    *
    * @param g The graphics context to paint with
@@ -557,7 +557,7 @@ public class BasicButtonUI extends ButtonUI
         g.fillRect(area.x, area.y, area.width, area.height);
       }
   }
-    
+
   /**
    * Paints the "text" property of an {@link AbstractButton}.
    *
@@ -567,8 +567,8 @@ public class BasicButtonUI extends ButtonUI
    * @param text The text to paint
    */
   protected void paintText(Graphics g, JComponent c, Rectangle textRect,
-                           String text) 
-  {	
+                           String text)
+  {
     AbstractButton b = (AbstractButton) c;
     Font f = b.getFont();
     g.setFont(f);
@@ -602,10 +602,10 @@ public class BasicButtonUI extends ButtonUI
    * @since 1.4
    */
   protected void paintText(Graphics g, AbstractButton b, Rectangle textRect,
-			   String text)
+                           String text)
   {
     paintText(g, (JComponent) b, textRect, text);
-  } 
+  }
 
   /**
    * A helper method that finds the BasicButtonListener for the specified
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
index e45970ed02c..79ce7b83411 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
@@ -52,7 +52,7 @@ import javax.swing.plaf.ComponentUI;
  */
 public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI
 {
-  
+
   /**
    * Creates a new BasicCheckBoxMenuItemUI object.
    */
@@ -60,7 +60,7 @@ public class BasicCheckBoxMenuItemUI extends BasicMenuItemUI
   {
     super();
   }
-  
+
   /**
    * Factory method to create a BasicCheckBoxMenuItemUI for the given {@link
    * JComponent}, which should be a JCheckBoxMenuItem
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
index 43001b8dbfc..0a4da00b2af 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -47,14 +47,14 @@ import javax.swing.plaf.ComponentUI;
  * A UI delegate for the {@link JCheckBox} component.
  */
 public class BasicCheckBoxUI extends BasicRadioButtonUI
-{  
-  
+{
+
   /**
-   * Returns a UI delegate (that is, an instance of this class) for the 
+   * Returns a UI delegate (that is, an instance of this class) for the
    * specified component.
-   * 
+   *
    * @param c  the component (this should be a {@link JCheckBox}).
-   *     
+   *
    * @return A new instance of BasicCheckBoxUI.
    */
   public static ComponentUI createUI(JComponent c)
@@ -63,7 +63,7 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI
   }
 
   /**
-   * Returns the prefix for entries in the {@link UIManager} defaults table 
+   * Returns the prefix for entries in the {@link UIManager} defaults table
    * ("CheckBox." in this case).
    *
    * @return "CheckBox."
@@ -73,7 +73,3 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI
     return "CheckBox.";
   }
 }
-
-
-
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
index f37cbd7b838..10b56431ae2 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicColorChooserUI.java
@@ -74,12 +74,12 @@ public class BasicColorChooserUI extends ColorChooserUI
     public void propertyChange(PropertyChangeEvent e)
     {
       if (e.getPropertyName() == JColorChooser.CHOOSER_PANELS_PROPERTY)
-	makeTabs(chooser.getChooserPanels());
+        makeTabs(chooser.getChooserPanels());
       else if (e.getPropertyName() == JColorChooser.PREVIEW_PANEL_PROPERTY)
-	updatePreviewPanel(chooser.getPreviewPanel());
+        updatePreviewPanel(chooser.getPreviewPanel());
       else if (e.getPropertyName() == JColorChooser.SELECTION_MODEL_PROPERTY)
-	((AbstractColorChooserPanel) pane.getSelectedComponent())
-	.updateChooser();
+        ((AbstractColorChooserPanel) pane.getSelectedComponent())
+        .updateChooser();
 
       chooser.repaint();
     }
@@ -100,10 +100,10 @@ public class BasicColorChooserUI extends ColorChooserUI
     {
       if (pane != null)
         {
-	  AbstractColorChooserPanel panel = (AbstractColorChooserPanel) pane
-	                                    .getSelectedComponent();
-	  if (panel != null)
-	    panel.updateChooser();
+          AbstractColorChooserPanel panel = (AbstractColorChooserPanel) pane
+                                            .getSelectedComponent();
+          if (panel != null)
+            panel.updateChooser();
         }
       chooser.repaint();
     }
@@ -190,30 +190,30 @@ public class BasicColorChooserUI extends ColorChooserUI
   {
     if (c instanceof JColorChooser)
       {
-	chooser = (JColorChooser) c;
-	chooser.setLayout(new BorderLayout());
+        chooser = (JColorChooser) c;
+        chooser.setLayout(new BorderLayout());
 
-	// Do this first, so we avoid doing work for property change events.
-	defaultChoosers = createDefaultChoosers();
-	chooser.setChooserPanels(defaultChoosers);
-	pane = new JTabbedPane();
+        // Do this first, so we avoid doing work for property change events.
+        defaultChoosers = createDefaultChoosers();
+        chooser.setChooserPanels(defaultChoosers);
+        pane = new JTabbedPane();
 
-	pane.addChangeListener(new ChangeListener()
-	    {
-	      public void stateChanged(ChangeEvent e)
-	      {
-		pane.repaint();
-	      }
-	    });
+        pane.addChangeListener(new ChangeListener()
+            {
+              public void stateChanged(ChangeEvent e)
+              {
+                pane.repaint();
+              }
+            });
 
-	makeTabs(defaultChoosers);
+        makeTabs(defaultChoosers);
 
-	chooser.add(pane, BorderLayout.NORTH);
+        chooser.add(pane, BorderLayout.NORTH);
 
-	installPreviewPanel();
+        installPreviewPanel();
 
-	installDefaults();
-	installListeners();
+        installDefaults();
+        installListeners();
       }
   }
 
@@ -274,9 +274,9 @@ public class BasicColorChooserUI extends ColorChooserUI
   {
     if (prevContainer == null)
       {
-	prevContainer = new JPanel();
-	prevContainer.setLayout(new BorderLayout());
-	chooser.add(prevContainer, BorderLayout.CENTER);
+        prevContainer = new JPanel();
+        prevContainer.setLayout(new BorderLayout());
+        chooser.add(prevContainer, BorderLayout.CENTER);
       }
     prevContainer.removeAll();
     prevContainer.add(preview, BorderLayout.CENTER);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
index d8792619656..b04f3fa014a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -69,7 +69,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
   }
 
   /**
-   * Returns the component that will be used by the combo box to display and 
+   * Returns the component that will be used by the combo box to display and
    * edit the currently selected item in the combo box.
    *
    * @return The editor component, which is a {@link JTextField} in this case.
@@ -138,7 +138,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
   }
 
   /**
-   * Adds an {@link ActionListener} to the editor component.  If the user will 
+   * Adds an {@link ActionListener} to the editor component.  If the user will
    * edit currently selected item in the textfield and pressEnter, then action
    * will be performed. The actionPerformed of this ActionListener should
    * change the selected item of the comboBox to the newly editted  selected
@@ -163,7 +163,7 @@ public class BasicComboBoxEditor extends Object implements ComboBoxEditor,
   }
 
   /**
-   * A subclass of {@link BasicComboBoxEditor} that implements the 
+   * A subclass of {@link BasicComboBoxEditor} that implements the
    * {@link UIResource} interface.
    */
   public static class UIResource extends BasicComboBoxEditor
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index 3c8d1e8c589..761d7d11f5d 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -51,12 +51,12 @@ import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 
 /**
- * A renderer for a {@link JComboBox}. 
+ * A renderer for a {@link JComboBox}.
  *
  * @author Olga Rodimina
  */
-public class BasicComboBoxRenderer 
-  extends JLabel 
+public class BasicComboBoxRenderer
+  extends JLabel
   implements ListCellRenderer, Serializable
 {
   /**
@@ -75,7 +75,7 @@ public class BasicComboBoxRenderer
 
   /**
    * Returns preferredSize of the renderer
-   * 
+   *
    * @return preferredSize of the renderer
    */
   public Dimension getPreferredSize()
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
index ff636d684c1..07d4f42cdbd 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboBoxUI.java
@@ -100,9 +100,9 @@ public class BasicComboBoxUI extends ComboBoxUI
   protected JComboBox comboBox;
 
   /**
-   * The component that is responsible for displaying/editing the selected 
-   * item of the combo box. 
-   * 
+   * The component that is responsible for displaying/editing the selected
+   * item of the combo box.
+   *
    * @see BasicComboBoxEditor#getEditorComponent()
    */
   protected Component editor;
@@ -144,11 +144,11 @@ public class BasicComboBoxUI extends ComboBoxUI
    * Popup list containing the combo box's menu items.
    */
   protected ComboPopup popup;
-  
+
   protected KeyListener popupKeyListener;
-  
+
   protected MouseListener popupMouseListener;
-  
+
   protected MouseMotionListener popupMouseMotionListener;
 
   /**
@@ -187,7 +187,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * A factory method to create a UI delegate for the given 
+   * A factory method to create a UI delegate for the given
    * {@link JComponent}, which should be a {@link JComboBox}.
    *
    * @param c The {@link JComponent} a UI is being created for.
@@ -203,7 +203,7 @@ public class BasicComboBoxUI extends ComboBoxUI
    * Installs the UI for the given {@link JComponent}.
    *
    * @param c  the JComponent to install a UI for.
-   * 
+   *
    * @see #uninstallUI(JComponent)
    */
   public void installUI(JComponent c)
@@ -230,7 +230,7 @@ public class BasicComboBoxUI extends ComboBoxUI
           {
             currentEditor = createEditor();
             comboBox.setEditor(currentEditor);
-          } 
+          }
 
         installComponents();
         installListeners();
@@ -246,7 +246,7 @@ public class BasicComboBoxUI extends ComboBoxUI
    * Uninstalls the UI for the given {@link JComponent}.
    *
    * @param c The JComponent that is having this UI removed.
-   * 
+   *
    * @see #installUI(JComponent)
    */
   public void uninstallUI(JComponent c)
@@ -262,9 +262,9 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Installs the defaults that are defined in the {@link BasicLookAndFeel} 
+   * Installs the defaults that are defined in the {@link BasicLookAndFeel}
    * for this {@link JComboBox}.
-   * 
+   *
    * @see #uninstallDefaults()
    */
   protected void installDefaults()
@@ -276,7 +276,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Creates and installs the listeners for this UI.
-   * 
+   *
    * @see #uninstallListeners()
    */
   protected void installListeners()
@@ -312,7 +312,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   /**
    * Uninstalls the defaults and sets any objects created during
    * install to null.
-   * 
+   *
    * @see #installDefaults()
    */
   protected void uninstallDefaults()
@@ -322,7 +322,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
     if (comboBox.getForeground() instanceof UIResource)
       comboBox.setForeground(null);
-    
+
     if (comboBox.getBackground() instanceof UIResource)
       comboBox.setBackground(null);
 
@@ -331,7 +331,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Detaches all the listeners we attached in {@link #installListeners}.
-   * 
+   *
    * @see #installListeners()
    */
   protected void uninstallListeners()
@@ -429,7 +429,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Creates and returns a layout manager for the combo box.  Subclasses can 
+   * Creates and returns a layout manager for the combo box.  Subclasses can
    * override this method to provide a different layout.
    *
    * @return a layout manager for the combo box.
@@ -452,7 +452,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Creates the component that will be responsible for displaying/editing
-   * the selected item in the combo box. This editor is used only when combo 
+   * the selected item in the combo box. This editor is used only when combo
    * box is editable.
    *
    * @return A new component that will be responsible for displaying/editing
@@ -484,7 +484,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Uninstalls components from this {@link JComboBox}.
-   * 
+   *
    * @see #installComponents()
    */
   protected void uninstallComponents()
@@ -546,7 +546,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Unconfigures the editor for this combo box. 
+   * Unconfigures the editor for this combo box.
    */
   protected void unconfigureEditor()
   {
@@ -558,7 +558,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Configures the arrow button.
-   * 
+   *
    * @see #configureArrowButton()
    */
   public void configureArrowButton()
@@ -569,7 +569,7 @@ public class BasicComboBoxUI extends ComboBoxUI
         arrowButton.setFocusable(false);
         arrowButton.addMouseListener(popup.getMouseListener());
         arrowButton.addMouseMotionListener(popup.getMouseMotionListener());
-        
+
         // Mark the button as not closing the popup, we handle this ourselves.
         arrowButton.putClientProperty(BasicLookAndFeel.DONT_CANCEL_POPUP,
                                       Boolean.TRUE);
@@ -578,7 +578,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
   /**
    * Unconfigures the arrow button.
-   * 
+   *
    * @see #configureArrowButton()
    *
    * @specnote The specification says this method is implementation specific
@@ -613,7 +613,7 @@ public class BasicComboBoxUI extends ComboBoxUI
    *
    * @param c The JComboBox to check
    *
-   * @return true if popup part of the JComboBox is visible and 
+   * @return true if popup part of the JComboBox is visible and
    *         false otherwise.
    */
   public boolean isPopupVisible(JComboBox c)
@@ -917,12 +917,12 @@ public class BasicComboBoxUI extends ComboBoxUI
     = new DefaultListCellRenderer();
 
   /**
-   * Returns the default size for the display area of a combo box that does 
+   * Returns the default size for the display area of a combo box that does
    * not contain any elements.  This method returns the width and height of
-   * a single space in the current font, plus a margin of 1 pixel. 
+   * a single space in the current font, plus a margin of 1 pixel.
    *
    * @return The default display size.
-   * 
+   *
    * @see #getDisplaySize()
    */
   protected Dimension getDefaultSize()
@@ -937,7 +937,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Returns the size of the display area for the combo box. This size will be 
+   * Returns the size of the display area for the combo box. This size will be
    * the size of the combo box, not including the arrowButton.
    *
    * @return The size of the display area for the combo box.
@@ -950,11 +950,11 @@ public class BasicComboBoxUI extends ComboBoxUI
       {
         renderer = DEFAULT_RENDERER;
       }
-    
+
     Object prototype = comboBox.getPrototypeDisplayValue();
     if (prototype != null)
       {
-        Component comp = renderer.getListCellRendererComponent(listBox, 
+        Component comp = renderer.getListCellRendererComponent(listBox,
             prototype, -1, false, false);
         currentValuePane.add(comp);
         comp.setFont(comboBox.getFont());
@@ -971,7 +971,7 @@ public class BasicComboBoxUI extends ComboBoxUI
           {
             for (int i = 0; i < size; ++i)
               {
-                Component comp = renderer.getListCellRendererComponent(listBox, 
+                Component comp = renderer.getListCellRendererComponent(listBox,
                     model.getElementAt(i), -1, false, false);
                 currentValuePane.add(comp);
                 comp.setFont(comboBox.getFont());
@@ -1009,7 +1009,7 @@ public class BasicComboBoxUI extends ComboBoxUI
         (InputMap) UIManager.get("ComboBox.ancestorInputMap"));
     // Install any action maps here.
   }
-  
+
   /**
    * Uninstalls the keyboard actions for the {@link JComboBox} there were
    * installed by in {@link #installListeners}.
@@ -1024,7 +1024,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   /**
    * A {@link LayoutManager} used to position the sub-components of the
    * {@link JComboBox}.
-   * 
+   *
    * @see BasicComboBoxUI#createLayoutManager()
    */
   public class ComboBoxLayoutManager implements LayoutManager
@@ -1040,7 +1040,7 @@ public class BasicComboBoxUI extends ComboBoxUI
     /**
      * Adds a component to the layout.  This method does nothing, since the
      * layout manager doesn't need to track the components.
-     * 
+     *
      * @param name  the name to associate the component with (ignored).
      * @param comp  the component (ignored).
      */
@@ -1052,7 +1052,7 @@ public class BasicComboBoxUI extends ComboBoxUI
     /**
      * Removes a component from the layout.  This method does nothing, since
      * the layout manager doesn't need to track the components.
-     * 
+     *
      * @param comp  the component.
      */
     public void removeLayoutComponent(Component comp)
@@ -1063,7 +1063,7 @@ public class BasicComboBoxUI extends ComboBoxUI
     /**
      * Returns preferred layout size of the JComboBox.
      *
-     * @param parent  the Container for which the preferred size should be 
+     * @param parent  the Container for which the preferred size should be
      *                calculated.
      *
      * @return The preferred size for the given container
@@ -1075,9 +1075,9 @@ public class BasicComboBoxUI extends ComboBoxUI
 
     /**
      * Returns the minimum layout size.
-     * 
+     *
      * @param parent  the container.
-     * 
+     *
      * @return The minimum size.
      */
     public Dimension minimumLayoutSize(Container parent)
@@ -1095,7 +1095,7 @@ public class BasicComboBoxUI extends ComboBoxUI
      */
     public void layoutContainer(Container parent)
     {
-      // Position editor component to the left of arrow button if combo box is 
+      // Position editor component to the left of arrow button if combo box is
       // editable
       Insets i = getInsets();
       int arrowSize = comboBox.getHeight() - (i.top + i.bottom);
@@ -1152,7 +1152,7 @@ public class BasicComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Handles {@link ItemEvent}s fired by the {@link JComboBox} when its 
+   * Handles {@link ItemEvent}s fired by the {@link JComboBox} when its
    * selected item changes.
    */
   public class ItemHandler extends Object implements ItemListener
@@ -1297,7 +1297,7 @@ public class BasicComboBoxUI extends ComboBoxUI
                 }
             }
         }
-      
+
     }
 
     /**
@@ -1328,7 +1328,7 @@ public class BasicComboBoxUI extends ComboBoxUI
 
     /**
      * Invoked whenever bound property of JComboBox changes.
-     * 
+     *
      * @param e  the event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -1404,7 +1404,7 @@ public class BasicComboBoxUI extends ComboBoxUI
           isMinimumSizeDirty = true;
           comboBox.revalidate();
         }
-      // FIXME: Need to handle changes in other bound properties.       
+      // FIXME: Need to handle changes in other bound properties.
     }
   }
 }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java b/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
index 11f832ae890..3e54ca7c62a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicComboPopup.java
@@ -483,7 +483,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
    */
   protected void installListListeners()
   {
-    // mouse listener listening to mouse events occuring in the 
+    // mouse listener listening to mouse events occuring in the
     // combo box's list of items.
     listMouseListener = createListMouseListener();
     list.addMouseListener(listMouseListener);
@@ -613,7 +613,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
    */
   protected void autoScrollUp()
   {
-    // scroll up the scroll bar to make the item above visible    
+    // scroll up the scroll bar to make the item above visible
     JScrollBar scrollbar = scroller.getVerticalScrollBar();
     int scrollToNext = list.getScrollableUnitIncrement(super.getBounds(),
                                                        SwingConstants.VERTICAL,
@@ -621,8 +621,8 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
 
     scrollbar.setValue(scrollbar.getValue() - scrollToNext);
 
-    // If we haven't reached the begging of the combo box's list of items, 
-    // then highlight next element above currently highlighted element	
+    // If we haven't reached the begging of the combo box's list of items,
+    // then highlight next element above currently highlighted element
     if (list.getSelectedIndex() != 0)
       list.setSelectedIndex(list.getSelectedIndex() - 1);
   }
@@ -633,7 +633,7 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
    */
   protected void autoScrollDown()
   {
-    // scroll scrollbar down to make next item visible    
+    // scroll scrollbar down to make next item visible
     JScrollBar scrollbar = scroller.getVerticalScrollBar();
     int scrollToNext = list.getScrollableUnitIncrement(super.getBounds(),
                                                        SwingConstants.VERTICAL,
@@ -713,12 +713,12 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
 
     for (int i = 0; i < maxRowCount; i++)
       {
-	Component comp = rend.getListCellRendererComponent(list,
-	                                                   comboBox.getModel()
-	                                                           .getElementAt(i),
-	                                                   -1, false, false);
-	Dimension dim = comp.getPreferredSize();
-	totalHeight += dim.height;
+        Component comp = rend.getListCellRendererComponent(list,
+                                                           comboBox.getModel()
+                                                                   .getElementAt(i),
+                                                           -1, false, false);
+        Dimension dim = comp.getPreferredSize();
+        totalHeight += dim.height;
       }
 
     return totalHeight == 0 ? 100 : totalHeight;
@@ -995,9 +995,9 @@ public class BasicComboPopup extends JPopupMenu implements ComboPopup
     {
       if (e.getPropertyName().equals("renderer"))
         {
-	  list.setCellRenderer(comboBox.getRenderer());
-	  if (isVisible())
-	    hide();
+          list.setCellRenderer(comboBox.getRenderer());
+          if (isVisible())
+            hide();
         }
       if (e.getPropertyName().equals("model"))
         {
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
index 3f8730249da..e522938121a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopIconUI.java
@@ -118,7 +118,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
       yOffset = e.getY();
       pane = frame.getDesktopPane();
       if (pane != null)
-	pane.getDesktopManager().beginDraggingFrame(desktopIcon);
+        pane.getDesktopManager().beginDraggingFrame(desktopIcon);
     }
 
     /**
@@ -129,7 +129,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
     public void mouseReleased(MouseEvent e)
     {
       if (pane != null)
-	pane.getDesktopManager().endDraggingFrame(desktopIcon);
+        pane.getDesktopManager().endDraggingFrame(desktopIcon);
       xOffset = 0;
       yOffset = 0;
     }
@@ -147,9 +147,9 @@ public class BasicDesktopIconUI extends DesktopIconUI
                                int newHeight)
     {
       if (pane != null)
-	pane.getDesktopManager().dragFrame(f, newX, newY);
+        pane.getDesktopManager().dragFrame(f, newX, newY);
       else
-	desktopIcon.setBounds(newX, newY, newWidth, newHeight);
+        desktopIcon.setBounds(newX, newY, newWidth, newHeight);
     }
   }
 
@@ -308,7 +308,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
 
   /** The PropertyChangeListener listening to the JDesktopIcon. */
   private transient PropertyChangeListener propertyHandler;
-  
+
   /** The default icon used when no frame icon is given by the JInternalFrame. */
   static Icon defaultIcon = new InternalFrameDefaultMenuIcon();
 
@@ -389,15 +389,15 @@ public class BasicDesktopIconUI extends DesktopIconUI
   {
     if (c instanceof JDesktopIcon)
       {
-	desktopIcon = (JDesktopIcon) c;
-	desktopIcon.setLayout(new BorderLayout());
-	frame = desktopIcon.getInternalFrame();
+        desktopIcon = (JDesktopIcon) c;
+        desktopIcon.setLayout(new BorderLayout());
+        frame = desktopIcon.getInternalFrame();
 
-	installDefaults();
-	installComponents();
-	installListeners();
+        installDefaults();
+        installComponents();
+        installListeners();
 
-	desktopIcon.setOpaque(true);
+        desktopIcon.setOpaque(true);
       }
   }
 
@@ -409,11 +409,11 @@ public class BasicDesktopIconUI extends DesktopIconUI
   public void uninstallUI(JComponent c)
   {
     desktopIcon.setOpaque(false);
-    
+
     uninstallListeners();
     uninstallComponents();
     uninstallDefaults();
-    
+
     frame = null;
     desktopIcon.setLayout(null);
     desktopIcon = null;
@@ -444,7 +444,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
   protected void uninstallComponents()
   {
     desktopIcon.remove(button);
-    
+
     button = null;
   }
 
@@ -460,29 +460,29 @@ public class BasicDesktopIconUI extends DesktopIconUI
 
     propertyHandler = new PropertyChangeListener()
         {
-	  public void propertyChange(PropertyChangeEvent e)
-	  {
-	    if (e.getPropertyName().equals(JInternalFrame.TITLE_PROPERTY))
-	      button.setText(desktopIcon.getInternalFrame().getTitle());
-	    else if (e.getPropertyName().equals(JInternalFrame.FRAME_ICON_PROPERTY))
-	      {
-		Icon use = desktopIcon.getInternalFrame().getFrameIcon();
-		if (use == null)
-		  use = defaultIcon;
-		button.setIcon(use);
-	      }
-	    desktopIcon.revalidate();
-	    desktopIcon.repaint();
-	  }
+          public void propertyChange(PropertyChangeEvent e)
+          {
+            if (e.getPropertyName().equals(JInternalFrame.TITLE_PROPERTY))
+              button.setText(desktopIcon.getInternalFrame().getTitle());
+            else if (e.getPropertyName().equals(JInternalFrame.FRAME_ICON_PROPERTY))
+              {
+                Icon use = desktopIcon.getInternalFrame().getFrameIcon();
+                if (use == null)
+                  use = defaultIcon;
+                button.setIcon(use);
+              }
+            desktopIcon.revalidate();
+            desktopIcon.repaint();
+          }
         };
     frame.addPropertyChangeListener(propertyHandler);
 
     button.addActionListener(new ActionListener()
         {
-	  public void actionPerformed(ActionEvent e)
-	  {
+          public void actionPerformed(ActionEvent e)
+          {
             deiconize();
-	  }
+          }
         });
   }
 
@@ -492,10 +492,10 @@ public class BasicDesktopIconUI extends DesktopIconUI
   protected void uninstallListeners()
   {
     // button is nulled so no need to remove it.
-    
+
     frame.removePropertyChangeListener(propertyHandler);
     propertyHandler = null;
-    
+
     desktopIcon.removeMouseMotionListener(mouseHandler);
     desktopIcon.removeMouseListener(mouseHandler);
   }
@@ -506,7 +506,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
   protected void installDefaults()
   {
     // FIXME: Move border to defaults.
-    desktopIcon.setBorder(new DesktopIconBorder());  
+    desktopIcon.setBorder(new DesktopIconBorder());
   }
 
   /**
@@ -578,7 +578,7 @@ public class BasicDesktopIconUI extends DesktopIconUI
   /**
    * This method deiconizes the JInternalFrame associated with the JDesktopIcon.
    */
-  public void deiconize() 
+  public void deiconize()
   {
     try
     {
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
index 4116858da9d..cbc3f9f8952 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDesktopPaneUI.java
@@ -94,7 +94,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
     public boolean isEnabled()
     {
       if (desktop.getSelectedFrame() != null)
-	return desktop.getSelectedFrame().isClosable();
+        return desktop.getSelectedFrame().isClosable();
       return false;
     }
   }
@@ -133,7 +133,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
     public boolean isEnabled()
     {
       if (desktop.getSelectedFrame() != null)
-	return desktop.getSelectedFrame().isMaximizable();
+        return desktop.getSelectedFrame().isMaximizable();
       return false;
     }
   }
@@ -172,7 +172,7 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
     public boolean isEnabled()
     {
       if (desktop.getSelectedFrame() != null)
-	return desktop.getSelectedFrame().isIconifiable();
+        return desktop.getSelectedFrame().isIconifiable();
       return false;
     }
   }
@@ -191,23 +191,23 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
      */
     public void actionPerformed(ActionEvent e)
     {
-      // This is supposed to set the next selected frame. 
+      // This is supposed to set the next selected frame.
       JInternalFrame[] frames = desktop.getAllFrames();
       if (frames.length == 0)
-	return;
+        return;
 
       JInternalFrame sFrame = frames[0];
       if (desktop.getSelectedFrame() != null)
-	sFrame = desktop.getSelectedFrame();
+        sFrame = desktop.getSelectedFrame();
 
       int i = 0;
       for (; i < frames.length; i++)
-	if (frames[i] == sFrame)
-	  break;
+        if (frames[i] == sFrame)
+          break;
 
-      // FIXME: Navigate actions go reverse too.	  
+      // FIXME: Navigate actions go reverse too.
       if (i == frames.length)
-	i = 0;
+        i = 0;
 
       desktop.setSelectedFrame(frames[i]);
     }
@@ -399,11 +399,11 @@ public class BasicDesktopPaneUI extends DesktopPaneUI
   {
     if (c instanceof JDesktopPane)
       {
-	desktop = (JDesktopPane) c;
+        desktop = (JDesktopPane) c;
 
-	installDefaults();
-	installDesktopManager();
-	installKeyboardActions();
+        installDefaults();
+        installDesktopManager();
+        installKeyboardActions();
       }
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
index b1fb727feeb..62657ad8660 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
@@ -54,7 +54,7 @@ import javax.swing.filechooser.FileSystemView;
 
 /**
  * Implements an AbstractListModel for directories where the source
- * of the files is a JFileChooser object. 
+ * of the files is a JFileChooser object.
  *
  * This class is used for sorting and ordering the file list in
  * a JFileChooser L&F object.
@@ -188,7 +188,7 @@ public class BasicDirectoryModel extends AbstractListModel
           if (filechooser.accept(files[i]))
             accepted.add(files[i]);
         }
-      
+
       // Occasional check if we have been interrupted.
       if (isInterrupted())
         return;
@@ -286,7 +286,7 @@ public class BasicDirectoryModel extends AbstractListModel
 
               List added = newCache.subList(start, end);
               UpdateSwingRequest r = new UpdateSwingRequest(added, start,
-                                                            null, 0); 
+                                                            null, 0);
               invokeLater(r);
               newCache = null;
             }
@@ -332,10 +332,10 @@ public class BasicDirectoryModel extends AbstractListModel
     {
       public int compare(Object o1, Object o2)
       {
-	if (lt((File) o1, (File) o2))
-	  return -1;
-	else
-	  return 1;
+        if (lt((File) o1, (File) o2))
+          return -1;
+        else
+          return 1;
       }
     };
 
@@ -366,7 +366,7 @@ public class BasicDirectoryModel extends AbstractListModel
   }
 
   /**
-   * Fires a content change event. 
+   * Fires a content change event.
    */
   public void fireContentsChanged()
   {
@@ -397,7 +397,7 @@ public class BasicDirectoryModel extends AbstractListModel
   }
 
   /**
-   * Returns the (java.io.File) object at 
+   * Returns the (java.io.File) object at
    * an index in the list.
    *
    * @param index The list index
@@ -441,7 +441,7 @@ public class BasicDirectoryModel extends AbstractListModel
   }
 
   /**
-   * Returns the size of the list, which only includes directories 
+   * Returns the size of the list, which only includes directories
    * if the JFileChooser is set to DIRECTORIES_ONLY.
    *
    * Otherwise, both directories and files are included in the count.
@@ -537,12 +537,12 @@ public class BasicDirectoryModel extends AbstractListModel
         || property.equals(JFileChooser.FILE_VIEW_CHANGED_PROPERTY)
         )
       {
-	validateFileCache();
+        validateFileCache();
       }
   }
 
   /**
-   * Renames a file - However, does not re-sort the list 
+   * Renames a file - However, does not re-sort the list
    * or replace the old file with the new one in the list.
    *
    * @param oldFile The old file
@@ -584,4 +584,3 @@ public class BasicDirectoryModel extends AbstractListModel
       }
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
index d514a87c8ee..6ddd2513b9a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicEditorPaneUI.java
@@ -1,4 +1,4 @@
-/* BasicEditorPaneUI.java -- 
+/* BasicEditorPaneUI.java --
    Copyright (C) 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
index 4b6e2f79856..347686d6ea8 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicFileChooserUI.java
@@ -72,7 +72,7 @@ import javax.swing.plaf.metal.MetalIconFactory;
 
 
 /**
- * A UI delegate for the {@link JFileChooser} component under the 
+ * A UI delegate for the {@link JFileChooser} component under the
  * {@link BasicLookAndFeel}.
  */
 public class BasicFileChooserUI extends FileChooserUI
@@ -89,7 +89,7 @@ public class BasicFileChooserUI extends FileChooserUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns true always, as all files are accepted by this
      * filter.
@@ -116,7 +116,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * Handles a user action to approve the dialog selection.
-   * 
+   *
    * @see BasicFileChooserUI#getApproveSelectionAction()
    */
   protected class ApproveSelectionAction extends AbstractAction
@@ -131,7 +131,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
     /**
      * Sets the current selection and closes the dialog.
-     * 
+     *
      * @param e  the action event.
      */
     public void actionPerformed(ActionEvent e)
@@ -159,8 +159,8 @@ public class BasicFileChooserUI extends FileChooserUI
       else
         {
           File f = new File(filechooser.getCurrentDirectory(), getFileName());
-	  if ( selectedDir != null )
-	    f = selectedDir;
+          if ( selectedDir != null )
+            f = selectedDir;
           if (filechooser.isTraversable(f))
             {
               filechooser.setCurrentDirectory(f);
@@ -212,7 +212,7 @@ public class BasicFileChooserUI extends FileChooserUI
     }
 
     /**
-     * Retrieves the icon associated with the specified file/directory, if 
+     * Retrieves the icon associated with the specified file/directory, if
      * there is one.
      *
      * @param f  the file/directory.
@@ -225,8 +225,8 @@ public class BasicFileChooserUI extends FileChooserUI
     }
 
     /**
-     * Returns a description of the given file/directory.  In this 
-     * implementation, the description is the same as the name returned by 
+     * Returns a description of the given file/directory.  In this
+     * implementation, the description is the same as the name returned by
      * {@link #getName(File)}.
      *
      * @param f  the file/directory.
@@ -249,11 +249,11 @@ public class BasicFileChooserUI extends FileChooserUI
     {
       Icon val = getCachedIcon(f);
       if (val != null)
-	return val;
+        return val;
       if (filechooser.isTraversable(f))
-	val = directoryIcon;
+        val = directoryIcon;
       else
-	val = fileIcon;
+        val = fileIcon;
       cacheIcon(f, val);
       return val;
     }
@@ -287,9 +287,9 @@ public class BasicFileChooserUI extends FileChooserUI
     public String getTypeDescription(File f)
     {
       if (filechooser.isTraversable(f))
-	return dirDescText;
+        return dirDescText;
       else
-	return fileDescText;
+        return fileDescText;
     }
 
     /**
@@ -308,7 +308,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * Handles an action to cancel the file chooser.
-   * 
+   *
    * @see BasicFileChooserUI#getCancelSelectionAction()
    */
   protected class CancelSelectionAction extends AbstractAction
@@ -338,7 +338,7 @@ public class BasicFileChooserUI extends FileChooserUI
   /**
    * An action to handle changes to the parent directory (for example, via
    * a click on the "up folder" button).
-   * 
+   *
    * @see BasicFileChooserUI#getChangeToParentDirectoryAction()
    */
   protected class ChangeToParentDirectoryAction extends AbstractAction
@@ -366,7 +366,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * A mouse listener that handles double-click events.
-   * 
+   *
    * @see BasicFileChooserUI#createDoubleClickListener(JFileChooser, JList)
    */
   protected class DoubleClickListener extends MouseAdapter
@@ -392,7 +392,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
     /**
      * Handles a mouse click event.
-     * 
+     *
      * @param e  the event.
      */
     public void mouseClicked(MouseEvent e)
@@ -422,7 +422,7 @@ public class BasicFileChooserUI extends FileChooserUI
           String path = p.toString();
           File f = fsv.createFileObject(path);
           filechooser.setSelectedFile(f);
-          
+
           if (filechooser.isMultiSelectionEnabled())
             {
               int[] inds = list.getSelectedIndices();
@@ -431,7 +431,7 @@ public class BasicFileChooserUI extends FileChooserUI
                 allFiles[i] = (File) list.getModel().getElementAt(inds[i]);
               filechooser.setSelectedFiles(allFiles);
             }
-          
+
           if (filechooser.isTraversable(f))
             {
               setDirectorySelected(true);
@@ -444,18 +444,18 @@ public class BasicFileChooserUI extends FileChooserUI
             }
           lastSelected = path;
           parentPath = f.getParent();
-	    
+
           if (f.isFile())
             setFileName(f.getName());
-          else if (filechooser.getFileSelectionMode() != 
-		   JFileChooser.FILES_ONLY)
+          else if (filechooser.getFileSelectionMode() !=
+                   JFileChooser.FILES_ONLY)
             setFileName(path);
         }
     }
 
     /**
      * Handles a mouse entered event (NOT IMPLEMENTED).
-     * 
+     *
      * @param e  the mouse event.
      */
     public void mouseEntered(MouseEvent e)
@@ -465,9 +465,9 @@ public class BasicFileChooserUI extends FileChooserUI
   }
 
   /**
-   * An action that changes the file chooser to display the user's home 
-   * directory. 
-   * 
+   * An action that changes the file chooser to display the user's home
+   * directory.
+   *
    * @see BasicFileChooserUI#getGoHomeAction()
    */
   protected class GoHomeAction extends AbstractAction
@@ -497,7 +497,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * An action that handles the creation of a new folder/directory.
-   * 
+   *
    * @see BasicFileChooserUI#getNewFolderAction()
    */
   protected class NewFolderAction extends AbstractAction
@@ -519,12 +519,12 @@ public class BasicFileChooserUI extends FileChooserUI
     {
       try
         {
-	  filechooser.getFileSystemView().createNewFolder(filechooser
-	                                                  .getCurrentDirectory());
+          filechooser.getFileSystemView().createNewFolder(filechooser
+                                                          .getCurrentDirectory());
         }
       catch (IOException ioe)
         {
-	  return;
+          return;
         }
       filechooser.rescanCurrentDirectory();
       filechooser.repaint();
@@ -533,7 +533,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * A listener for selection events in the file list.
-   * 
+   *
    * @see BasicFileChooserUI#createListSelectionListener(JFileChooser)
    */
   protected class SelectionListener implements ListSelectionListener
@@ -556,24 +556,24 @@ public class BasicFileChooserUI extends FileChooserUI
       JList list = (JList) e.getSource();
       Object f = list.getSelectedValue();
       if (f == null)
-	return;
+        return;
       File file = filechooser.getFileSystemView().createFileObject(f.toString());
       if (! filechooser.isTraversable(file))
-	{
-	  selectedDir = null;
-	  filechooser.setSelectedFile(file);
-	}
+        {
+          selectedDir = null;
+          filechooser.setSelectedFile(file);
+        }
       else
-	{
-	  selectedDir = file;
-	  filechooser.setSelectedFile(null);
-	}
+        {
+          selectedDir = file;
+          filechooser.setSelectedFile(null);
+        }
     }
   }
 
   /**
    * DOCUMENT ME!
-   * 
+   *
    * @see BasicFileChooserUI#getUpdateAction()
    */
   protected class UpdateAction extends AbstractAction
@@ -722,46 +722,46 @@ public class BasicFileChooserUI extends FileChooserUI
   // FIXME: describe what is contained in the bottom panel
   /** The bottom panel. */
   JPanel bottomPanel;
-  
+
   /** The close panel. */
   JPanel closePanel;
 
   /** Text box that displays file name */
   JTextField entry;
-    
+
   /** Current parent path */
   String parentPath;
-  
+
   /**
    * The action for the 'approve' button.
    * @see #getApproveSelectionAction()
    */
   private ApproveSelectionAction approveSelectionAction;
-  
+
   /**
    * The action for the 'cancel' button.
    * @see #getCancelSelectionAction()
    */
   private CancelSelectionAction cancelSelectionAction;
-  
+
   /**
    * The action for the 'go home' control button.
    * @see #getGoHomeAction()
    */
   private GoHomeAction goHomeAction;
-  
+
   /**
    * The action for the 'up folder' control button.
    * @see #getChangeToParentDirectoryAction()
    */
   private ChangeToParentDirectoryAction changeToParentDirectoryAction;
-  
+
   /**
    * The action for the 'new folder' control button.
    * @see #getNewFolderAction()
    */
   private NewFolderAction newFolderAction;
-  
+
   /**
    * The action for ???.  // FIXME: what is this?
    * @see #getUpdateAction()
@@ -774,7 +774,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * the directory on "Open" when in that mode.
    */
   private File selectedDir;
-  
+
   // -- end private --
 
   /**
@@ -810,7 +810,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * Installs the UI for the specified component.
-   * 
+   *
    * @param c  the component (should be a {@link JFileChooser}).
    */
   public void installUI(JComponent c)
@@ -825,7 +825,7 @@ public class BasicFileChooserUI extends FileChooserUI
         installDefaults(fc);
         installComponents(fc);
         installListeners(fc);
-        
+
         File path = filechooser.getCurrentDirectory();
         if (path != null)
           parentPath = path.getParent();
@@ -834,7 +834,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * Uninstalls this UI from the given component.
-   * 
+   *
    * @param c  the component (should be a {@link JFileChooser}).
    */
   public void uninstallUI(JComponent c)
@@ -868,7 +868,7 @@ public class BasicFileChooserUI extends FileChooserUI
     if (parentFiles.size() == 0)
       return;
 
-  }  
+  }
 
   /**
    * Creates and install the subcomponents for the file chooser.
@@ -996,9 +996,9 @@ public class BasicFileChooserUI extends FileChooserUI
 
     directoryOpenButtonText = "Open";
     directoryOpenButtonToolTipText = "Open selected directory";
-    directoryOpenButtonMnemonic 
+    directoryOpenButtonMnemonic
         = new Integer((String) UIManager.get("FileChooser.directoryOpenButtonMnemonic")).intValue();
-    
+
     helpButtonText = "Help";
     helpButtonToolTipText = "FileChooser help";
     helpButtonMnemonic = new Integer((String) UIManager.get("FileChooser.helpButtonMnemonic")).intValue();
@@ -1010,7 +1010,7 @@ public class BasicFileChooserUI extends FileChooserUI
     saveButtonText = "Save";
     saveButtonToolTipText = "Save selected file";
     saveButtonMnemonic = new Integer((String) UIManager.get("FileChooser.saveButtonMnemonic")).intValue();
-  
+
     updateButtonText = "Update";
     updateButtonToolTipText = "Update directory listing";
     updateButtonMnemonic = new Integer((String) UIManager.get("FileChooser.updateButtonMnemonic")).intValue();
@@ -1041,7 +1041,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
     saveButtonText = null;
     saveButtonToolTipText = null;
-    
+
     updateButtonText = null;
     updateButtonToolTipText = null;
   }
@@ -1067,9 +1067,9 @@ public class BasicFileChooserUI extends FileChooserUI
   /**
    * Creates a listener to handle changes to the properties of the given
    * file chooser component.
-   * 
+   *
    * @param fc  the file chooser component.
-   * 
+   *
    * @return A new listener.
    */
   public PropertyChangeListener createPropertyChangeListener(JFileChooser fc)
@@ -1080,7 +1080,7 @@ public class BasicFileChooserUI extends FileChooserUI
 
   /**
    * Returns the current file name.
-   * 
+   *
    * @return The current file name.
    */
   public String getFileName()
@@ -1092,7 +1092,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * Returns the current directory name.
    *
    * @return The directory name.
-   * 
+   *
    * @see #setDirectoryName(String)
    */
   public String getDirectoryName()
@@ -1105,12 +1105,12 @@ public class BasicFileChooserUI extends FileChooserUI
    * Sets the file name.
    *
    * @param filename  the file name.
-   * 
+   *
    * @see #getFileName()
    */
   public void setFileName(String filename)
   {
-    // FIXME:  it might be the case that this method provides an access 
+    // FIXME:  it might be the case that this method provides an access
     // point for the JTextField (or whatever) a subclass is using...
     //this.filename = filename;
   }
@@ -1119,7 +1119,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * Sets the directory name (NOT IMPLEMENTED).
    *
    * @param dirname  the directory name.
-   * 
+   *
    * @see #getDirectoryName()
    */
   public void setDirectoryName(String dirname)
@@ -1149,7 +1149,7 @@ public class BasicFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Returns the {@link JFileChooser} component that this UI delegate 
+   * Returns the {@link JFileChooser} component that this UI delegate
    * represents.
    *
    * @return The component represented by this UI delegate.
@@ -1184,7 +1184,7 @@ public class BasicFileChooserUI extends FileChooserUI
   /**
    * Returns the tool tip text for the approve (open/save) button.  This first
    * checks the file chooser to see if a value has been explicitly set - if
-   * not, a default value appropriate for the type of file chooser is 
+   * not, a default value appropriate for the type of file chooser is
    * returned.
    *
    * @param fc  the file chooser.
@@ -1236,7 +1236,7 @@ public class BasicFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Returns true if a directory is selected, and 
+   * Returns true if a directory is selected, and
    * false otherwise.
    *
    * @return A boolean.
@@ -1295,7 +1295,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * @param fc  the file chooser component.
    *
    * @return The file view.
-   * 
+   *
    * @see JFileChooser#getFileView()
    */
   public FileView getFileView(JFileChooser fc)
@@ -1309,7 +1309,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * @param fc  the file chooser (null not permitted).
    *
    * @return The dialog title.
-   * 
+   *
    * @see JFileChooser#getDialogTitle()
    */
   public String getDialogTitle(JFileChooser fc)
@@ -1326,7 +1326,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * @param fc  the file chooser (null not permitted).
    *
    * @return The approve button mnemonic.
-   * 
+   *
    * @see JFileChooser#getApproveButtonMnemonic()
    */
   public int getApproveButtonMnemonic(JFileChooser fc)
@@ -1345,7 +1345,7 @@ public class BasicFileChooserUI extends FileChooserUI
    * @param fc  the file chooser (null not permitted).
    *
    * @return The approve button text.
-   * 
+   *
    * @see JFileChooser#getApproveButtonText()
    */
   public String getApproveButtonText(JFileChooser fc)
@@ -1362,7 +1362,7 @@ public class BasicFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Creates and returns a new action that will be used with the "new folder" 
+   * Creates and returns a new action that will be used with the "new folder"
    * button.
    *
    * @return A new instance of {@link NewFolderAction}.
@@ -1375,7 +1375,7 @@ public class BasicFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Creates and returns a new action that will be used with the "home folder" 
+   * Creates and returns a new action that will be used with the "home folder"
    * button.
    *
    * @return A new instance of {@link GoHomeAction}.
@@ -1426,7 +1426,7 @@ public class BasicFileChooserUI extends FileChooserUI
   /**
    * Returns the update action (an instance of {@link UpdateAction}).
    *
-   * @return An action. 
+   * @return An action.
    */
   public Action getUpdateAction()
   {
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
index 9c7f1c4c5d1..5559214358e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java
@@ -66,4 +66,4 @@ public class BasicFormattedTextFieldUI extends BasicTextFieldUI
   {
     return "FormattedTextField";
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java b/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
index e73c39bf6ac..f270d3335d8 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java
@@ -142,7 +142,7 @@ public class BasicGraphicsUtils
       g.setColor(darkShadow);
       g.drawLine(x + 1, y + 1, x2 - 2, y + 1);         // top, inner
       g.drawLine(x + 1, y + 2, x + 1, y2 - 2);         // left, inner
-      
+
       g.setColor(highlight);
       g.drawLine(x + 1, y2 - 1, x2 - 1, y2 - 1);       // bottom, inner
       g.drawLine(x2 - 1, y + 1, x2 - 1, y2 - 2);       // right, inner
@@ -156,8 +156,8 @@ public class BasicGraphicsUtils
       g.setColor(oldColor);
     }
   }
-  
-  
+
+
   /**
    * Determines the width of the border that gets painted by
    * {@link #drawEtchedRect}.
@@ -229,7 +229,7 @@ public class BasicGraphicsUtils
   {
     return new Insets(2, 2, 2, 2);
   }
-  
+
 
   /**
    * Draws a border that is suitable for buttons of the Basic look and
@@ -310,8 +310,8 @@ public class BasicGraphicsUtils
       g.setColor(oldColor);
     }
   }
-  
-  
+
+
   /**
    * Draws a rectangle that appears lowered into the surface, given
    * four colors that are used for drawing.
@@ -363,8 +363,8 @@ public class BasicGraphicsUtils
                    darkShadow, shadow,
                    highlight, lightHighlight);
   }
-  
-  
+
+
   /**
    * Draws a String at the given location, underlining the first
    * occurence of a specified character. The algorithm for determining
@@ -390,7 +390,7 @@ public class BasicGraphicsUtils
    *        the GNU Classpath implementation does not underline
    *        anything if underlinedChar is outside
    *        the range of char.
-   *        
+   *
    * @param x the x coordinate of the text, as it would be passed to
    *        {@link java.awt.Graphics#drawString(java.lang.String,
    *        int, int)}.
@@ -436,7 +436,7 @@ public class BasicGraphicsUtils
    *        text.  If underlinedIndex falls
    *        outside the range [0, text.length() - 1], the
    *        text will be drawn without underlining anything.
-   *        
+   *
    * @param x the x coordinate of the text, as it would be passed to
    *        {@link java.awt.Graphics#drawString(java.lang.String,
    *        int, int)}.
@@ -518,7 +518,7 @@ public class BasicGraphicsUtils
       underline.width = underlineX1 - underlineX2;
     }
 
-    
+
     underline.height = lineMetrics.getUnderlineThickness();
     underline.y = lineMetrics.getUnderlineOffset();
     if (underline.y == 0)
@@ -597,7 +597,7 @@ public class BasicGraphicsUtils
    *        text.  If underlinedIndex falls
    *        outside the range [0, text.length() - 1], the
    *        text will be drawn without underlining anything.
-   *        
+   *
    * @param x the x coordinate of the text, as it would be passed to
    *        {@link java.awt.Graphics#drawString(java.lang.String,
    *        int, int)}.
@@ -683,7 +683,7 @@ public class BasicGraphicsUtils
       underline.width = underlineX1 - underlineX2;
     }
 
-    
+
     underline.height = lineMetrics.getUnderlineThickness();
     underline.y = lineMetrics.getUnderlineOffset();
     if (underline.y == 0)
@@ -761,8 +761,8 @@ public class BasicGraphicsUtils
    *         and height fields indicate the preferred
    *         extent in pixels.
    *
-   * @see javax.swing.SwingUtilities#layoutCompoundLabel(JComponent, 
-   *      FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle, 
+   * @see javax.swing.SwingUtilities#layoutCompoundLabel(JComponent,
+   *      FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle,
    *      Rectangle, int)
    */
   public static Dimension getPreferredButtonSize(AbstractButton b,
@@ -795,7 +795,7 @@ public class BasicGraphicsUtils
       b.getFontMetrics(b.getFont()), // see comment above
       b.getText(),
       b.getIcon(),
-      b.getVerticalAlignment(), 
+      b.getVerticalAlignment(),
       b.getHorizontalAlignment(),
       b.getVerticalTextPosition(),
       b.getHorizontalTextPosition(),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java b/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
index 6e26d5355a2..a7ce8b15b81 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicHTML.java
@@ -145,7 +145,7 @@ public class BasicHTML
     {
       if (view != null)
         view.setParent(null);
-      
+
       if (v != null)
         v.setParent(this);
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java b/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
index cad0d0e8abe..1b5afa7f16e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicIconFactory.java
@@ -53,16 +53,16 @@ public class BasicIconFactory implements Serializable
 {
   static final long serialVersionUID = 5605588811185324383L;
 
-  private static class DummyIcon 
+  private static class DummyIcon
     implements Icon
-  {    
-    public int getIconHeight() 
-    { 
-      return 10; 
+  {
+    public int getIconHeight()
+    {
+      return 10;
     }
-    public int getIconWidth() 
-    { 
-      return 10; 
+    public int getIconWidth()
+    {
+      return 10;
     }
     public void paintIcon(Component c, Graphics g, int x, int y)
     {
@@ -118,7 +118,7 @@ public class BasicIconFactory implements Serializable
   }
 
   /**
-   * The icon used for {@link JCheckBoxMenuItem}s in the 
+   * The icon used for {@link JCheckBoxMenuItem}s in the
    * {@link BasicLookAndFeel}. This icon has a size of 9x9 pixels.
    */
   static class CheckBoxMenuItemIcon
@@ -155,14 +155,14 @@ public class BasicIconFactory implements Serializable
     public void paintIcon(Component c, Graphics g, int x, int y)
     {
       JCheckBoxMenuItem item = (JCheckBoxMenuItem) c;
-      if (item.isSelected()) 
+      if (item.isSelected())
         {
           // paint the check...
           g.setColor(Color.black);
           g.drawLine(x + 1, y + 3, x + 1, y + 4);
           g.drawLine(x + 2, y + 4, x + 2, y + 5);
           for (int i = 0; i < 5; i++)
-            g.drawLine(x + 3 + i, y + 5 - i, x + 3 + i, y + 6 - i);    
+            g.drawLine(x + 3 + i, y + 5 - i, x + 3 + i, y + 6 - i);
         }
     }
   }
@@ -212,7 +212,7 @@ public class BasicIconFactory implements Serializable
   }
   /** The cached CheckBoxIcon instance. */
   private static CheckBoxIcon checkBoxIcon;
-  
+
   /** The cached RadioButtonIcon instance. */
   private static RadioButtonIcon radioButtonIcon;
 
@@ -246,34 +246,34 @@ public class BasicIconFactory implements Serializable
   {
     return new DummyIcon();
   }
-  
+
   /**
    * Returns a new instance of a 4 x 8 icon showing a small black triangle that
-   * points to the right.  This is displayed in menu items that have a 
+   * points to the right.  This is displayed in menu items that have a
    * sub menu.
-   * 
+   *
    * @return The icon.
    */
   public static Icon getMenuArrowIcon()
   {
     return new Icon()
       {
-	public int getIconHeight()
-	{
-	  return 8;
-	}
-	public int getIconWidth()
-	{
-	  return 4;
-	}
-	public void paintIcon(Component c, Graphics g, int x, int y)
-	{
-	  Color saved = g.getColor();
-	  g.setColor(Color.BLACK);
+        public int getIconHeight()
+        {
+          return 8;
+        }
+        public int getIconWidth()
+        {
+          return 4;
+        }
+        public void paintIcon(Component c, Graphics g, int x, int y)
+        {
+          Color saved = g.getColor();
+          g.setColor(Color.BLACK);
           for (int i = 0; i < 4; i++)
             g.drawLine(x + i, y + i, x + i, y + 7 - i);
-	  g.setColor(saved);
-	}
+          g.setColor(saved);
+        }
       };
   }
 
@@ -308,19 +308,19 @@ public class BasicIconFactory implements Serializable
   /**
    * Creates and returns an icon used when rendering {@link JCheckBoxMenuItem}
    * components.
-   * 
+   *
    * @return An icon.
    */
   public static Icon getCheckBoxMenuItemIcon()
   {
     return new CheckBoxMenuItemIcon();
   }
-  
+
   public static Icon getRadioButtonMenuItemIcon()
   {
     return getRadioButtonIcon();
   }
-  
+
   public static Icon createEmptyFrameIcon()
   {
     return new DummyIcon();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
index ea8b4603691..48466050143 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
@@ -89,7 +89,7 @@ public class BasicInternalFrameTitlePane extends JComponent
     {
       super("Close");
     }
-    
+
     /**
      * This method is called when something closes the JInternalFrame.
      *
@@ -371,7 +371,7 @@ public class BasicInternalFrameTitlePane extends JComponent
     {
       Icon frameIcon = frame.getFrameIcon();
       if (frameIcon == null)
-	frameIcon = BasicDesktopIconUI.defaultIcon;
+        frameIcon = BasicDesktopIconUI.defaultIcon;
       frameIcon.paintIcon(this, g, 0, 0);
     }
 
@@ -453,8 +453,8 @@ public class BasicInternalFrameTitlePane extends JComponent
         }
 
       if (title != null)
-	title.setBounds(insets.left + menupref.width, insets.top,
-	                loc - menupref.width - insets.left, height);
+        title.setBounds(insets.left + menupref.width, insets.top,
+                        loc - menupref.width - insets.left, height);
     }
 
     /**
@@ -581,7 +581,7 @@ public class BasicInternalFrameTitlePane extends JComponent
 
   /** The icon displayed in the close button. */
   protected Icon closeIcon;
-  
+
   /** The JInternalFrame that this TitlePane is used in. */
   protected JInternalFrame frame;
 
@@ -620,7 +620,7 @@ public class BasicInternalFrameTitlePane extends JComponent
    * This is package-private to avoid an accessor method.
    */
   transient JLabel title;
-  
+
   static
     {
       // not constants in JDK
@@ -739,7 +739,7 @@ public class BasicInternalFrameTitlePane extends JComponent
     selectedTitleColor = UIManager.getColor("InternalFrame.activeTitleBackground");
     notSelectedTextColor = UIManager.getColor("InternalFrame.inactiveTitleForeground");
     notSelectedTitleColor = UIManager.getColor("InternalFrame.inactiveTitleBackground");
-  
+
     closeIcon = UIManager.getIcon("InternalFrame.closeIcon");
     iconIcon = UIManager.getIcon("InternalFrame.iconifyIcon");
     maxIcon = UIManager.getIcon("InternalFrame.maximizeIcon");
@@ -755,7 +755,7 @@ public class BasicInternalFrameTitlePane extends JComponent
     selectedTitleColor = null;
     notSelectedTextColor = null;
     notSelectedTitleColor = null;
-    
+
     closeIcon = null;
     iconIcon = null;
     maxIcon = null;
@@ -894,17 +894,17 @@ public class BasicInternalFrameTitlePane extends JComponent
     paintTitleBackground(g);
     if (frame.getTitle() != null && title != null)
       {
-	Color saved = g.getColor();
+        Color saved = g.getColor();
         Font f = title.getFont();
         g.setFont(f);
         FontMetrics fm = g.getFontMetrics(f);
-	if (frame.isSelected())
-	  g.setColor(selectedTextColor);
-	else
-	  g.setColor(notSelectedTextColor);
-	title.setText(getTitle(frame.getTitle(), fm, title.getBounds().width));
-	SwingUtilities.paintComponent(g, title, null, title.getBounds());
-	g.setColor(saved);
+        if (frame.isSelected())
+          g.setColor(selectedTextColor);
+        else
+          g.setColor(notSelectedTextColor);
+        title.setText(getTitle(frame.getTitle(), fm, title.getBounds().width));
+        SwingUtilities.paintComponent(g, title, null, title.getBounds());
+        g.setColor(saved);
       }
   }
 
@@ -964,7 +964,7 @@ public class BasicInternalFrameTitlePane extends JComponent
   {
     // FIXME: Implement postClosingEvent when I figure out what
     // it's supposed to do.
-    // It says that this fires an WINDOW_CLOSING like event. 
+    // It says that this fires an WINDOW_CLOSING like event.
     // So the closest thing is some kind of InternalFrameEvent.
     // But none is fired.
     // Can't see it called or anything.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
index 87c5268c8c7..da37e2bd810 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -170,10 +170,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
     implements SwingConstants
   {
     /**
-     * The current shape of the cursor. 
+     * The current shape of the cursor.
      */
     transient int showingCursor;
-    
+
     /** FIXME: Use for something. */
     protected final int RESIZE_NONE = 0;
 
@@ -188,7 +188,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /** Cache rectangle that can be reused. */
     private transient Rectangle cacheRect = new Rectangle();
-    
+
     /**
      * This method is called when the mouse is clicked.
      *
@@ -209,7 +209,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
           {
             // We do nothing if the attempt has been vetoed.
           }
-        
+
       // There is nothing to do when the mouse is clicked
       // on the border.
     }
@@ -288,7 +288,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse exits the JInternalFrame.
-     * 
+     *
      * @param e The MouseEvent.
      */
     public void mouseExited(MouseEvent e)
@@ -302,7 +302,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is moved inside the JInternalFrame.
-     * 
+     *
      * @param e The MouseEvent.
      */
     public void mouseMoved(MouseEvent e)
@@ -318,10 +318,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
           setCursor(e);
         }
     }
-    
+
     /**
      * Set the mouse cursor, how applicable.
-     * 
+     *
      * @param e the current mouse event.
      */
     void setCursor(MouseEvent e)
@@ -337,7 +337,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is pressed.
-     * 
+     *
      * @param e The MouseEvent.
      */
     public void mousePressed(MouseEvent e)
@@ -381,7 +381,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
           dm.endDraggingFrame(frame);
           frame.putClientProperty("bufferedDragging", null);
         }
-      
+
       setCursor(e);
     }
 
@@ -398,7 +398,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     {
       Rectangle b = frame.getBounds();
       int corner = InternalFrameBorder.cornerSize;
-      
+
       if (x < corner && y < corner)
         return Cursor.NW_RESIZE_CURSOR;
       else if (x > b.width - corner && y < corner)
@@ -429,7 +429,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
   {
     /**
      * This method is called when the JDesktopPane is hidden.
-     * 
+     *
      * @param e
      *          The ComponentEvent fired.
      */
@@ -440,7 +440,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the JDesktopPane is moved.
-     * 
+     *
      * @param e
      *          The ComponentEvent fired.
      */
@@ -451,7 +451,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the JDesktopPane is resized.
-     * 
+     *
      * @param e
      *          The ComponentEvent fired.
      */
@@ -469,7 +469,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the JDesktopPane is shown.
-     * 
+     *
      * @param e
      *          The ComponentEvent fired.
      */
@@ -487,7 +487,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     /**
      * This method is called when the given Component is added to the
      * JInternalFrame.
-     * 
+     *
      * @param name
      *          The name of the Component.
      * @param c
@@ -501,7 +501,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     /**
      * This method is used to set the bounds of the children of the
      * JInternalFrame.
-     * 
+     *
      * @param c
      *          The Container to lay out.
      */
@@ -562,7 +562,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method returns the minimum layout size.
-     * 
+     *
      * @param c
      *          The Container to find a minimum layout size for.
      * @return The minimum dimensions for the JInternalFrame.
@@ -574,7 +574,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * Th8is method returns the preferred layout size.
-     * 
+     *
      * @param c
      *          The Container to find a preferred layout size for.
      * @return The preferred dimensions for the JInternalFrame.
@@ -586,7 +586,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * DOCUMENT ME!
-     * 
+     *
      * @param c
      *          DOCUMENT ME!
      * @param min
@@ -694,7 +694,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse enters the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -705,7 +705,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is clicked on the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -716,7 +716,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is dragged in the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -727,7 +727,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse exits the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -738,7 +738,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is moved in the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -749,7 +749,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is pressed in the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -764,7 +764,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when the mouse is released in the glass pane.
-     * 
+     *
      * @param e
      *          The MouseEvent.
      */
@@ -776,7 +776,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     /**
      * This is a helper method that dispatches the GlassPane MouseEvents to the
      * proper component.
-     * 
+     *
      * @param e the mouse event to be dispatched
      */
     private void handleEvent(MouseEvent e)
@@ -885,7 +885,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method is called when one of the JInternalFrame's properties change.
-     * 
+     *
      * @param evt
      *          The PropertyChangeEvent.
      */
@@ -971,8 +971,8 @@ public class BasicInternalFrameUI extends InternalFrameUI
   class InternalFrameBorder extends AbstractBorder implements
       UIResource
   {
-    /** 
-     * The width of the border. 
+    /**
+     * The width of the border.
      */
     static final int bSize = 5;
 
@@ -983,7 +983,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method returns whether the border is opaque.
-     * 
+     *
      * @return Whether the border is opaque.
      */
     public boolean isBorderOpaque()
@@ -993,7 +993,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method returns the insets of the border.
-     * 
+     *
      * @param c
      *          The Component to find border insets for.
      * @return The border insets.
@@ -1005,7 +1005,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
     /**
      * This method paints the border.
-     * 
+     *
      * @param c
      *          The Component that owns the border.
      * @param g
@@ -1051,9 +1051,9 @@ public class BasicInternalFrameUI extends InternalFrameUI
 
       g.fill3DRect(0, cornerSize, bSize, b.height - 2 * cornerSize, false);
       g.fill3DRect(cornerSize, 0, b.width - 2 * cornerSize, bSize, false);
-      g.fill3DRect(cornerSize, b.height - bSize, b.width - 2 * cornerSize, 
+      g.fill3DRect(cornerSize, b.height - bSize, b.width - 2 * cornerSize,
                    bSize, false);
-      g.fill3DRect(b.width - bSize, cornerSize, bSize, 
+      g.fill3DRect(b.width - bSize, cornerSize, bSize,
                    b.height - 2 * cornerSize, false);
 
       g.translate(-x, -y);
@@ -1595,7 +1595,7 @@ public class BasicInternalFrameUI extends InternalFrameUI
     replacePane(northPane, c);
     northPane = c;
     // the following is needed to make internal frames draggable when using
-    // the JGoodies PlasticLookAndFeel, because it overrides the 
+    // the JGoodies PlasticLookAndFeel, because it overrides the
     // createNorthPane() method and doesn't assign anything to the titlePane
     // field.  It is possible there is another way to make this work, but
     // I didn't find it...
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
index 045740df609..9469b5695e7 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicLabelUI.java
@@ -114,7 +114,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
 
   /**
    * Returns the preferred size of this component as calculated by the
-   * {@link #layoutCL(JLabel, FontMetrics, String, Icon, Rectangle, Rectangle, 
+   * {@link #layoutCL(JLabel, FontMetrics, String, Icon, Rectangle, Rectangle,
    * Rectangle)} method.
    *
    * @param c This {@link JComponent} to get a preferred size for.
@@ -188,7 +188,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
 
   /**
    * The method that paints the label according to its current state.
-   * 
+   *
    * @param g The {@link Graphics} object to paint with.
    * @param c The {@link JComponent} to paint.
    */
@@ -217,7 +217,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
         text = layoutCL(b, fm, text, icon, vr, ir, tr);
 
         if (icon != null)
-          icon.paintIcon(b, g, ir.x, ir.y);       
+          icon.paintIcon(b, g, ir.x, ir.y);
 
         if (text != null && ! text.equals(""))
           {
@@ -239,7 +239,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
 
   /**
    * This method is simply calls SwingUtilities's layoutCompoundLabel.
-   * 
+   *
    * @param label The label to lay out.
    * @param fontMetrics The FontMetrics for the font used.
    * @param text The text to paint.
@@ -247,7 +247,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
    * @param viewR The entire viewable rectangle.
    * @param iconR The icon bounds rectangle.
    * @param textR The text bounds rectangle.
-   * 
+   *
    * @return A possibly clipped version of the text.
    */
   protected String layoutCL(JLabel label, FontMetrics fontMetrics, String text,
@@ -421,11 +421,11 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
           {
             // add a keystroke for the given mnemonic mapping to 'press';
             InputMap keyMap = new InputMap();
-            keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.VK_ALT), 
+            keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.VK_ALT),
                 "press");
-            SwingUtilities.replaceUIInputMap(l, 
+            SwingUtilities.replaceUIInputMap(l,
                 JComponent.WHEN_IN_FOCUSED_WINDOW, keyMap);
-            
+
             // add an action to focus the component when 'press' happens
             ActionMap map = new ActionMap();
             map.put("press", new AbstractAction() {
@@ -439,7 +439,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
             });
             SwingUtilities.replaceUIActionMap(l, map);
           }
-      }   
+      }
   }
 
   /**
@@ -450,7 +450,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
   protected void uninstallKeyboardActions(JLabel l)
   {
     SwingUtilities.replaceUIActionMap(l, null);
-    SwingUtilities.replaceUIInputMap(l, JComponent.WHEN_IN_FOCUSED_WINDOW, 
+    SwingUtilities.replaceUIInputMap(l, JComponent.WHEN_IN_FOCUSED_WINDOW,
                                      null);
   }
 
@@ -500,9 +500,9 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
             int newMnemonic = ((Integer) e.getNewValue()).intValue();
             InputMap keyMap = label.getInputMap(
                 JComponent.WHEN_IN_FOCUSED_WINDOW);
-            keyMap.put(KeyStroke.getKeyStroke(oldMnemonic, 
+            keyMap.put(KeyStroke.getKeyStroke(oldMnemonic,
                 KeyEvent.ALT_DOWN_MASK), null);
-            keyMap.put(KeyStroke.getKeyStroke(newMnemonic, 
+            keyMap.put(KeyStroke.getKeyStroke(newMnemonic,
                 KeyEvent.ALT_DOWN_MASK), "press");
           }
       }
@@ -512,8 +512,8 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
         InputMap keyMap = label.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
         int mnemonic = label.getDisplayedMnemonic();
         if (mnemonic > 0)
-          keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.ALT_DOWN_MASK), 
-              "press");       
+          keyMap.put(KeyStroke.getKeyStroke(mnemonic, KeyEvent.ALT_DOWN_MASK),
+              "press");
       }
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
index befc227364a..0e33957f43e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicListUI.java
@@ -78,7 +78,7 @@ import javax.swing.plaf.ListUI;
 import javax.swing.plaf.UIResource;
 
 /**
- * The Basic Look and Feel UI delegate for the 
+ * The Basic Look and Feel UI delegate for the
  * JList.
  */
 public class BasicListUI extends ListUI
@@ -111,7 +111,7 @@ public class BasicListUI extends ListUI
     }
 
     /**
-     * Helper method to repaint the focused cell's 
+     * Helper method to repaint the focused cell's
      * lost or acquired focus state.
      */
     protected void repaintCellFocus()
@@ -170,7 +170,7 @@ public class BasicListUI extends ListUI
   public class ListSelectionHandler implements ListSelectionListener
   {
     /**
-     * Called when the list selection changes.  
+     * Called when the list selection changes.
      *
      * @param e The event representing the change
      */
@@ -197,7 +197,7 @@ public class BasicListUI extends ListUI
     ActionListener target;
     String bindingCommandName;
 
-    public ActionListenerProxy(ActionListener li, 
+    public ActionListenerProxy(ActionListener li,
                                String cmd)
     {
       target = li;
@@ -237,13 +237,13 @@ public class BasicListUI extends ListUI
     {
       int lead = list.getLeadSelectionIndex();
       int max = list.getModel().getSize() - 1;
-      DefaultListSelectionModel selModel 
+      DefaultListSelectionModel selModel
           = (DefaultListSelectionModel) list.getSelectionModel();
       String command = e.getActionCommand();
       // Do nothing if list is empty
       if (max == -1)
         return;
-      
+
       if (command.equals("selectNextRow"))
         {
           selectNextIndex();
@@ -265,7 +265,7 @@ public class BasicListUI extends ListUI
         }
       else if (command.equals("selectLastRow"))
         {
-          list.setSelectedIndex(list.getModel().getSize() - 1); 
+          list.setSelectedIndex(list.getModel().getSize() - 1);
         }
       else if (command.equals("selectLastRowChangeLead"))
         {
@@ -276,7 +276,7 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getLastVisibleIndex())
             {
-              target = Math.min(max, lead + (list.getLastVisibleIndex() 
+              target = Math.min(max, lead + (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
@@ -288,7 +288,7 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getLastVisibleIndex())
             {
-              target = Math.min(max, lead + (list.getLastVisibleIndex() 
+              target = Math.min(max, lead + (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
@@ -300,7 +300,7 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getFirstVisibleIndex())
             {
-              target = Math.max(0, lead - (list.getLastVisibleIndex() 
+              target = Math.max(0, lead - (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
@@ -312,7 +312,7 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getFirstVisibleIndex())
             {
-              target = Math.max(0, lead - (list.getLastVisibleIndex() 
+              target = Math.max(0, lead - (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
@@ -344,12 +344,12 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getFirstVisibleIndex())
             {
-              target = Math.max(0, lead - (list.getLastVisibleIndex() 
+              target = Math.max(0, lead - (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
             target = list.getFirstVisibleIndex();
-          list.setSelectedIndex(target);          
+          list.setSelectedIndex(target);
         }
       else if (command.equals("selectLastRowExtendSelection"))
         {
@@ -360,7 +360,7 @@ public class BasicListUI extends ListUI
           int target;
           if (lead == list.getLastVisibleIndex())
             {
-              target = Math.min(max, lead + (list.getLastVisibleIndex() 
+              target = Math.min(max, lead + (list.getLastVisibleIndex()
                   - list.getFirstVisibleIndex() + 1));
             }
           else
@@ -384,7 +384,7 @@ public class BasicListUI extends ListUI
             {
               selModel.moveLeadSelectionIndex(Math.max(0, lead - 1));
             }
-        }      
+        }
       else if (command.equals("addToSelection"))
         {
           list.addSelectionInterval(lead, lead);
@@ -402,20 +402,20 @@ public class BasicListUI extends ListUI
             list.removeSelectionInterval(lead, lead);
           selModel.setAnchorSelectionIndex(lead);
         }
-      else 
+      else
         {
-          // DEBUG: uncomment the following line to print out 
+          // DEBUG: uncomment the following line to print out
           // key bindings that aren't implemented yet
-          
+
           // System.out.println ("not implemented: "+e.getActionCommand());
         }
-      
+
       list.ensureIndexIsVisible(list.getLeadSelectionIndex());
     }
   }
 
   /**
-   * A helper class which listens for {@link MouseEvent}s 
+   * A helper class which listens for {@link MouseEvent}s
    * from the {@link JList}.
    */
   public class MouseInputHandler implements MouseInputListener
@@ -436,20 +436,20 @@ public class BasicListUI extends ListUI
         {
           if (list.getSelectionMode() == ListSelectionModel.SINGLE_SELECTION)
             list.setSelectedIndex(index);
-          else if (list.getSelectionMode() == 
+          else if (list.getSelectionMode() ==
                    ListSelectionModel.SINGLE_INTERVAL_SELECTION)
             // COMPAT: the IBM VM is compatible with the following line of code.
-            // However, compliance with Sun's VM would correspond to replacing 
-            // getAnchorSelectionIndex() with getLeadSelectionIndex().This is 
-            // both unnatural and contradictory to the way they handle other 
+            // However, compliance with Sun's VM would correspond to replacing
+            // getAnchorSelectionIndex() with getLeadSelectionIndex().This is
+            // both unnatural and contradictory to the way they handle other
             // similar UI interactions.
             list.setSelectionInterval(list.getAnchorSelectionIndex(), index);
           else
             // COMPAT: both Sun and IBM are compatible instead with:
             // list.setSelectionInterval
             //     (list.getLeadSelectionIndex(),index);
-            // Note that for IBM this is contradictory to what they did in 
-            // the above situation for SINGLE_INTERVAL_SELECTION.  
+            // Note that for IBM this is contradictory to what they did in
+            // the above situation for SINGLE_INTERVAL_SELECTION.
             // The most natural thing to do is the following:
             if (list.isSelectedIndex(list.getAnchorSelectionIndex()))
               list.getSelectionModel().setLeadSelectionIndex(index);
@@ -467,7 +467,7 @@ public class BasicListUI extends ListUI
         }
       else
         list.setSelectedIndex(index);
-      
+
       list.ensureIndexIsVisible(list.getLeadSelectionIndex());
     }
 
@@ -530,7 +530,7 @@ public class BasicListUI extends ListUI
         return;
       if (!event.isShiftDown() && !event.isControlDown())
         list.setSelectedIndex(index);
-      
+
       list.ensureIndexIsVisible(list.getLeadSelectionIndex());
     }
 
@@ -664,7 +664,7 @@ public class BasicListUI extends ListUI
   /** The width of a single cell in the list. */
   protected int cellWidth;
 
-  /** 
+  /**
    * An array of varying heights of cells in the list, in cases where each
    * cell might have a different height. This field is used when the
    * fixedCellHeight property of the list is not set. Otherwise
@@ -692,7 +692,7 @@ public class BasicListUI extends ListUI
    * The {@link CellRendererPane} that is used for painting.
    */
   protected CellRendererPane rendererPane;
-  
+
   /** The action bound to KeyStrokes. */
   ListAction action;
 
@@ -729,7 +729,7 @@ public class BasicListUI extends ListUI
    * @param index1 The first row to include in the bounds
    * @param index2 The last row to incude in the bounds
    *
-   * @return A rectangle encompassing the range of rows between 
+   * @return A rectangle encompassing the range of rows between
    * index1 and index2 inclusive, or null
    * such a rectangle couldn't be calculated for the given indexes.
    */
@@ -953,7 +953,7 @@ public class BasicListUI extends ListUI
   }
 
   /**
-   * Resets to null those defaults which were installed in 
+   * Resets to null those defaults which were installed in
    * {@link #installDefaults}
    */
   protected void uninstallDefaults()
@@ -1002,7 +1002,7 @@ public class BasicListUI extends ListUI
     list.removeMouseMotionListener(mouseInputListener);
     list.removePropertyChangeListener(propertyChangeListener);
   }
-  
+
   /**
    * Installs keyboard actions for this UI in the {@link JList}.
    */
@@ -1125,7 +1125,7 @@ public class BasicListUI extends ListUI
    * Gets the size this list would prefer to assume. This is calculated by
    * calling {@link #getCellBounds} over the entire list.
    *
-   * @param c Ignored; uses the saved {@link JList} reference 
+   * @param c Ignored; uses the saved {@link JList} reference
    *
    * @return DOCUMENT ME!
    */
@@ -1150,7 +1150,7 @@ public class BasicListUI extends ListUI
           {
             // We cast to double here to force double divisions.
             double modelSize = size;
-            int neededColumns = (int) Math.ceil(modelSize / visibleRows); 
+            int neededColumns = (int) Math.ceil(modelSize / visibleRows);
             int adjustedRows = (int) Math.ceil(modelSize / neededColumns);
             h = maxCellHeight * adjustedRows;
             w = cellWidth * neededColumns;
@@ -1220,7 +1220,7 @@ public class BasicListUI extends ListUI
    * cell in the list.
    *
    * @param g The graphics context to paint with
-   * @param c Ignored; uses the saved {@link JList} reference 
+   * @param c Ignored; uses the saved {@link JList} reference
    */
   public void paint(Graphics g, JComponent c)
   {
@@ -1238,7 +1238,7 @@ public class BasicListUI extends ListUI
     int startIndex = locationToIndex(list, new Point(clip.x, clip.y));
     int endIndex = locationToIndex(list, new Point(clip.x + clip.width,
                                              clip.y + clip.height));
-    
+
     for (int row = startIndex; row <= endIndex; ++row)
       {
         Rectangle bounds = getCellBounds(list, row, row);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java b/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
index 15430945468..9a1f544f68a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -96,7 +96,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
    * are targetted at a menu/submenu/menubar or not. If not,
    * the MenuSelectionManager is messaged to close the currently opened menus,
    * if any.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   private class PopupHelper implements AWTEventListener
@@ -227,9 +227,9 @@ public abstract class BasicLookAndFeel extends LookAndFeel
   }
 
   /**
-   * Creates and returns a new instance of the default resources for this look 
+   * Creates and returns a new instance of the default resources for this look
    * and feel.
-   * 
+   *
    * @return The UI defaults.
    */
   public UIDefaults getDefaults()
@@ -247,9 +247,9 @@ public abstract class BasicLookAndFeel extends LookAndFeel
   }
 
   /**
-   * Populates the defaults table with mappings between class IDs 
+   * Populates the defaults table with mappings between class IDs
    * and fully qualified class names for the UI delegates.
-   * 
+   *
    * @param defaults  the defaults table (null not permitted).
    */
   protected void initClassDefaults(UIDefaults defaults)
@@ -314,7 +314,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
    * {@link #loadSystemColors(UIDefaults, String[], boolean)}. If the
    * look and feel is a native look and feel, these defaults may be overridden
    * by the corresponding SystemColor constants.
-   * 
+   *
    * @param defaults  the defaults table (null not permitted).
    */
   protected void initSystemColorDefaults(UIDefaults defaults)
@@ -365,7 +365,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
    *        false
    * @param useNative when true, installs the values of the
    *        SystemColor constants, when false, install the values
-   *        from systemColors 
+   *        from systemColors
    */
   protected void loadSystemColors(UIDefaults defaults, String[] systemColors,
                                   boolean useNative)
@@ -479,19 +479,19 @@ public abstract class BasicLookAndFeel extends LookAndFeel
   protected void initComponentDefaults(UIDefaults defaults)
   {
     Object[] uiDefaults;
-    
+
     Color highLight = new Color(249, 247, 246);
     Color light = new Color(239, 235, 231);
     Color shadow = new Color(139, 136, 134);
     Color darkShadow = new Color(16, 16, 16);
-    
+
     uiDefaults = new Object[] {
 
       "AbstractUndoableEdit.undoText", "Undo",
       "AbstractUndoableEdit.redoText", "Redo",
       "Button.background", new ColorUIResource(Color.LIGHT_GRAY),
       "Button.border",
-      new UIDefaults.LazyValue() 
+      new UIDefaults.LazyValue()
       {
         public Object createValue(UIDefaults table)
         {
@@ -528,7 +528,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
           return BasicIconFactory.getCheckBoxIcon();
         }
       },
-      "CheckBox.checkIcon", 
+      "CheckBox.checkIcon",
       new UIDefaults.LazyValue()
       {
         public Object createValue(UIDefaults def)
@@ -549,7 +549,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
       "CheckBoxMenuItem.background", new ColorUIResource(light),
       "CheckBoxMenuItem.border", new BasicBorders.MarginBorder(),
       "CheckBoxMenuItem.borderPainted", Boolean.FALSE,
-      "CheckBoxMenuItem.checkIcon", 
+      "CheckBoxMenuItem.checkIcon",
       new UIDefaults.LazyValue()
       {
         public Object createValue(UIDefaults def)
@@ -637,7 +637,7 @@ public abstract class BasicLookAndFeel extends LookAndFeel
       "EditorPane.font", new FontUIResource("Serif", Font.PLAIN, 12),
       "EditorPane.foreground", new ColorUIResource(Color.black),
       "EditorPane.inactiveForeground", new ColorUIResource(Color.gray),
-      "EditorPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {            
+      "EditorPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
                 KeyStroke.getKeyStroke("shift UP"), "selection-up",
                 KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word",
                 KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word",
@@ -782,21 +782,21 @@ public abstract class BasicLookAndFeel extends LookAndFeel
       "InternalFrame.border",
       new UIDefaults.LazyValue()
       {
-	public Object createValue(UIDefaults table)
-	{
-	  Color lineColor = new Color(238, 238, 238);
-	  Border inner = BorderFactory.createLineBorder(lineColor, 1);
-	  Color shadowInner = new Color(184, 207, 229);
-	  Color shadowOuter = new Color(122, 138, 153);
-	  Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
-							 Color.WHITE,
-							 Color.WHITE,
-							 shadowOuter,
-							 shadowInner);
-	  Border border = new BorderUIResource.CompoundBorderUIResource(outer,
-									inner);
-	  return border;
-	}
+        public Object createValue(UIDefaults table)
+        {
+          Color lineColor = new Color(238, 238, 238);
+          Border inner = BorderFactory.createLineBorder(lineColor, 1);
+          Color shadowInner = new Color(184, 207, 229);
+          Color shadowOuter = new Color(122, 138, 153);
+          Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
+                                                         Color.WHITE,
+                                                         Color.WHITE,
+                                                         shadowOuter,
+                                                         shadowInner);
+          Border border = new BorderUIResource.CompoundBorderUIResource(outer,
+                                                                        inner);
+          return border;
+        }
       },
       "InternalFrame.borderColor", new ColorUIResource(light),
       "InternalFrame.borderDarkShadow", new ColorUIResource(Color.BLACK),
@@ -1459,60 +1459,60 @@ public abstract class BasicLookAndFeel extends LookAndFeel
       "TextPane.foreground", new ColorUIResource(Color.black),
       "TextPane.inactiveForeground", new ColorUIResource(Color.gray),
       "TextPane.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
-          KeyStroke.getKeyStroke("shift UP"), "selection-up", 
-          KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word", 
-          KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word", 
-          KeyStroke.getKeyStroke("shift KP_UP"), "selection-up", 
-          KeyStroke.getKeyStroke("DOWN"), "caret-down", 
-          KeyStroke.getKeyStroke("shift ctrl T"), "previous-link-action", 
-          KeyStroke.getKeyStroke("ctrl LEFT"), "caret-previous-word", 
-          KeyStroke.getKeyStroke("CUT"), "cut-to-clipboard", 
-          KeyStroke.getKeyStroke("END"), "caret-end-line", 
-          KeyStroke.getKeyStroke("shift PAGE_UP"), "selection-page-up", 
-          KeyStroke.getKeyStroke("KP_UP"), "caret-up", 
-          KeyStroke.getKeyStroke("DELETE"), "delete-next", 
-          KeyStroke.getKeyStroke("ctrl HOME"), "caret-begin", 
-          KeyStroke.getKeyStroke("shift LEFT"), "selection-backward", 
-          KeyStroke.getKeyStroke("ctrl END"), "caret-end", 
-          KeyStroke.getKeyStroke("BACK_SPACE"), "delete-previous", 
-          KeyStroke.getKeyStroke("shift ctrl RIGHT"), "selection-next-word", 
-          KeyStroke.getKeyStroke("LEFT"), "caret-backward", 
-          KeyStroke.getKeyStroke("KP_LEFT"), "caret-backward", 
-          KeyStroke.getKeyStroke("shift KP_RIGHT"), "selection-forward", 
-          KeyStroke.getKeyStroke("ctrl SPACE"), "activate-link-action", 
-          KeyStroke.getKeyStroke("ctrl H"), "delete-previous", 
-          KeyStroke.getKeyStroke("ctrl BACK_SLASH"), "unselect", 
-          KeyStroke.getKeyStroke("ENTER"), "insert-break", 
-          KeyStroke.getKeyStroke("shift HOME"), "selection-begin-line", 
-          KeyStroke.getKeyStroke("RIGHT"), "caret-forward", 
-          KeyStroke.getKeyStroke("shift ctrl PAGE_UP"), "selection-page-left", 
-          KeyStroke.getKeyStroke("shift DOWN"), "selection-down", 
-          KeyStroke.getKeyStroke("PAGE_DOWN"), "page-down", 
-          KeyStroke.getKeyStroke("shift KP_LEFT"), "selection-backward", 
-          KeyStroke.getKeyStroke("shift ctrl O"), "toggle-componentOrientation", 
-          KeyStroke.getKeyStroke("ctrl X"), "cut-to-clipboard", 
-          KeyStroke.getKeyStroke("shift ctrl PAGE_DOWN"), "selection-page-right", 
-          KeyStroke.getKeyStroke("ctrl C"), "copy-to-clipboard", 
-          KeyStroke.getKeyStroke("ctrl KP_RIGHT"), "caret-next-word", 
-          KeyStroke.getKeyStroke("shift END"), "selection-end-line", 
-          KeyStroke.getKeyStroke("ctrl KP_LEFT"), "caret-previous-word", 
-          KeyStroke.getKeyStroke("HOME"), "caret-begin-line", 
-          KeyStroke.getKeyStroke("ctrl V"), "paste-from-clipboard", 
-          KeyStroke.getKeyStroke("KP_DOWN"), "caret-down", 
-          KeyStroke.getKeyStroke("ctrl A"), "select-all", 
-          KeyStroke.getKeyStroke("shift RIGHT"), "selection-forward", 
-          KeyStroke.getKeyStroke("shift ctrl END"), "selection-end", 
-          KeyStroke.getKeyStroke("COPY"), "copy-to-clipboard", 
-          KeyStroke.getKeyStroke("shift ctrl KP_LEFT"), "selection-previous-word", 
-          KeyStroke.getKeyStroke("ctrl T"), "next-link-action", 
-          KeyStroke.getKeyStroke("shift KP_DOWN"), "selection-down", 
-          KeyStroke.getKeyStroke("TAB"), "insert-tab", 
-          KeyStroke.getKeyStroke("UP"), "caret-up", 
-          KeyStroke.getKeyStroke("shift ctrl HOME"), "selection-begin", 
-          KeyStroke.getKeyStroke("shift PAGE_DOWN"), "selection-page-down", 
-          KeyStroke.getKeyStroke("KP_RIGHT"), "caret-forward", 
-          KeyStroke.getKeyStroke("shift ctrl KP_RIGHT"), "selection-next-word", 
-          KeyStroke.getKeyStroke("PAGE_UP"), "page-up", 
+          KeyStroke.getKeyStroke("shift UP"), "selection-up",
+          KeyStroke.getKeyStroke("ctrl RIGHT"), "caret-next-word",
+          KeyStroke.getKeyStroke("shift ctrl LEFT"), "selection-previous-word",
+          KeyStroke.getKeyStroke("shift KP_UP"), "selection-up",
+          KeyStroke.getKeyStroke("DOWN"), "caret-down",
+          KeyStroke.getKeyStroke("shift ctrl T"), "previous-link-action",
+          KeyStroke.getKeyStroke("ctrl LEFT"), "caret-previous-word",
+          KeyStroke.getKeyStroke("CUT"), "cut-to-clipboard",
+          KeyStroke.getKeyStroke("END"), "caret-end-line",
+          KeyStroke.getKeyStroke("shift PAGE_UP"), "selection-page-up",
+          KeyStroke.getKeyStroke("KP_UP"), "caret-up",
+          KeyStroke.getKeyStroke("DELETE"), "delete-next",
+          KeyStroke.getKeyStroke("ctrl HOME"), "caret-begin",
+          KeyStroke.getKeyStroke("shift LEFT"), "selection-backward",
+          KeyStroke.getKeyStroke("ctrl END"), "caret-end",
+          KeyStroke.getKeyStroke("BACK_SPACE"), "delete-previous",
+          KeyStroke.getKeyStroke("shift ctrl RIGHT"), "selection-next-word",
+          KeyStroke.getKeyStroke("LEFT"), "caret-backward",
+          KeyStroke.getKeyStroke("KP_LEFT"), "caret-backward",
+          KeyStroke.getKeyStroke("shift KP_RIGHT"), "selection-forward",
+          KeyStroke.getKeyStroke("ctrl SPACE"), "activate-link-action",
+          KeyStroke.getKeyStroke("ctrl H"), "delete-previous",
+          KeyStroke.getKeyStroke("ctrl BACK_SLASH"), "unselect",
+          KeyStroke.getKeyStroke("ENTER"), "insert-break",
+          KeyStroke.getKeyStroke("shift HOME"), "selection-begin-line",
+          KeyStroke.getKeyStroke("RIGHT"), "caret-forward",
+          KeyStroke.getKeyStroke("shift ctrl PAGE_UP"), "selection-page-left",
+          KeyStroke.getKeyStroke("shift DOWN"), "selection-down",
+          KeyStroke.getKeyStroke("PAGE_DOWN"), "page-down",
+          KeyStroke.getKeyStroke("shift KP_LEFT"), "selection-backward",
+          KeyStroke.getKeyStroke("shift ctrl O"), "toggle-componentOrientation",
+          KeyStroke.getKeyStroke("ctrl X"), "cut-to-clipboard",
+          KeyStroke.getKeyStroke("shift ctrl PAGE_DOWN"), "selection-page-right",
+          KeyStroke.getKeyStroke("ctrl C"), "copy-to-clipboard",
+          KeyStroke.getKeyStroke("ctrl KP_RIGHT"), "caret-next-word",
+          KeyStroke.getKeyStroke("shift END"), "selection-end-line",
+          KeyStroke.getKeyStroke("ctrl KP_LEFT"), "caret-previous-word",
+          KeyStroke.getKeyStroke("HOME"), "caret-begin-line",
+          KeyStroke.getKeyStroke("ctrl V"), "paste-from-clipboard",
+          KeyStroke.getKeyStroke("KP_DOWN"), "caret-down",
+          KeyStroke.getKeyStroke("ctrl A"), "select-all",
+          KeyStroke.getKeyStroke("shift RIGHT"), "selection-forward",
+          KeyStroke.getKeyStroke("shift ctrl END"), "selection-end",
+          KeyStroke.getKeyStroke("COPY"), "copy-to-clipboard",
+          KeyStroke.getKeyStroke("shift ctrl KP_LEFT"), "selection-previous-word",
+          KeyStroke.getKeyStroke("ctrl T"), "next-link-action",
+          KeyStroke.getKeyStroke("shift KP_DOWN"), "selection-down",
+          KeyStroke.getKeyStroke("TAB"), "insert-tab",
+          KeyStroke.getKeyStroke("UP"), "caret-up",
+          KeyStroke.getKeyStroke("shift ctrl HOME"), "selection-begin",
+          KeyStroke.getKeyStroke("shift PAGE_DOWN"), "selection-page-down",
+          KeyStroke.getKeyStroke("KP_RIGHT"), "caret-forward",
+          KeyStroke.getKeyStroke("shift ctrl KP_RIGHT"), "selection-next-word",
+          KeyStroke.getKeyStroke("PAGE_UP"), "page-up",
           KeyStroke.getKeyStroke("PASTE"), "paste-from-clipboard"
       }),
       "TextPane.margin", new InsetsUIResource(3, 3, 3, 3),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
index cd25a3baf77..b9e29128abe 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuBarUI.java
@@ -109,20 +109,20 @@ public class BasicMenuBarUI extends MenuBarUI
           defaultManager.setSelectedPath(me);
         }
     }
-    
+
   }
 
   protected ChangeListener changeListener;
 
   /*ContainerListener that listens to the ContainerEvents fired from menu bar*/
   protected ContainerListener containerListener;
-  
+
   /*Property change listeners that listener to PropertyChangeEvent from menu bar*/
   private PropertyChangeListener propertyChangeListener;
 
   /* menu bar for which this UI delegate is for*/
   protected JMenuBar menuBar;
-  
+
   /* MouseListener that listens to the mouseEvents fired from menu bar*/
   private MouseInputListener mouseListener;
 
@@ -398,7 +398,7 @@ public class BasicMenuBarUI extends MenuBarUI
         menuBar.repaint();
     }
   }
-  
+
   private class MouseInputHandler implements MouseInputListener
   {
     /**
@@ -409,7 +409,7 @@ public class BasicMenuBarUI extends MenuBarUI
     public void mouseClicked(MouseEvent e)
     {
       MenuElement[] me = menuBar.getSubElements();
-      
+
       for (int i = 0; i < me.length; i++)
         {
           JMenu menu = menuBar.getMenu(i);
@@ -417,7 +417,7 @@ public class BasicMenuBarUI extends MenuBarUI
             menu.setSelected(false);
         }
     }
-    
+
     /**
      * Handles mouse pressed event
      *
@@ -427,7 +427,7 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       // TODO: What should be done here, if anything?
     }
-    
+
     /**
      * Handles mouse released event
      *
@@ -437,7 +437,7 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       // TODO: What should be done here, if anything?
     }
-    
+
     /**
      * Handles mouse exited event
      *
@@ -447,7 +447,7 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       // TODO: What should be done here, if anything?
     }
-    
+
     /**
      * Handles mouse dragged event
      *
@@ -457,7 +457,7 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       // TODO: What should be done here, if anything?
     }
-    
+
     /**
      * Handles mouse moved event
      *
@@ -467,7 +467,7 @@ public class BasicMenuBarUI extends MenuBarUI
     {
       // TODO: What should be done here, if anything?
     }
-    
+
     /**
      * Handles mouse entered event
      *
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
index 5fafb4108b2..40b539378ca 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -128,7 +128,7 @@ public class BasicMenuItemUI extends MenuItemUI
    * Number of spaces between icon and text.
    */
   protected int defaultTextIconGap = 4;
-  
+
   /**
    * Color of the text when menu item is disabled
    */
@@ -222,14 +222,14 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * A class to handle PropertChangeEvents for the JMenuItem
-   * @author Anthony Balkissoon abalkiss at redhat dot com.   
+   * @author Anthony Balkissoon abalkiss at redhat dot com.
    */
   class PropertyChangeHandler implements PropertyChangeListener
   {
     /**
      * This method is called when a property of the menuItem is changed.
      * Currently it is only used to update the accelerator key bindings.
-     * 
+     *
      * @param e
      *          the PropertyChangeEvent
      */
@@ -238,7 +238,7 @@ public class BasicMenuItemUI extends MenuItemUI
       String property = e.getPropertyName();
       if (property.equals("accelerator"))
         {
-          InputMap map = SwingUtilities.getUIInputMap(menuItem, 
+          InputMap map = SwingUtilities.getUIInputMap(menuItem,
               JComponent.WHEN_IN_FOCUSED_WINDOW);
           if (map != null)
             map.remove((KeyStroke) e.getOldValue());
@@ -266,7 +266,7 @@ public class BasicMenuItemUI extends MenuItemUI
         }
     }
   }
-  
+
   /**
    * A class to handle accelerator keys.  This is the Action we will
    * perform when the accelerator key for this JMenuItem is pressed.
@@ -282,9 +282,9 @@ public class BasicMenuItemUI extends MenuItemUI
     public void actionPerformed(ActionEvent event)
     {
       doClick(MenuSelectionManager.defaultManager());
-    }    
+    }
   }
-  
+
   /**
    * Creates a new BasicMenuItemUI object.
    */
@@ -308,7 +308,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Create MenuDragMouseListener to listen for mouse dragged events.
-   * 
+   *
    * @param c
    *          menu item to listen to
    * @return The MenuDragMouseListener
@@ -321,7 +321,7 @@ public class BasicMenuItemUI extends MenuItemUI
   /**
    * Creates MenuKeyListener to listen to key events occuring when menu item is
    * visible on the screen.
-   * 
+   *
    * @param c
    *          menu item to listen to
    * @return The MenuKeyListener
@@ -333,7 +333,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Handles mouse input events occuring for this menu item
-   * 
+   *
    * @param c
    *          menu item to listen to
    * @return The MouseInputListener
@@ -346,7 +346,7 @@ public class BasicMenuItemUI extends MenuItemUI
   /**
    * Factory method to create a BasicMenuItemUI for the given {@link
    * JComponent}, which should be a {@link JMenuItem}.
-   * 
+   *
    * @param c
    *          The {@link JComponent} a UI is being created for.
    * @return A BasicMenuItemUI for the {@link JComponent}.
@@ -358,7 +358,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Programatically clicks menu item.
-   * 
+   *
    * @param msm
    *          MenuSelectionManager for the menu hierarchy
    */
@@ -370,7 +370,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Returns maximum size for the specified menu item
-   * 
+   *
    * @param c
    *          component for which to get maximum size
    * @return Maximum size for the specified menu item.
@@ -382,7 +382,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Returns minimum size for the specified menu item
-   * 
+   *
    * @param c
    *          component for which to get minimum size
    * @return Minimum size for the specified menu item.
@@ -394,7 +394,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Returns path to this menu item.
-   * 
+   *
    * @return $MenuElement[]$ Returns array of menu elements that constitute a
    *         path to this menu item.
    */
@@ -420,7 +420,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Returns preferred size for the given menu item.
-   * 
+   *
    * @param c
    *          menu item for which to get preferred size
    * @param checkIcon
@@ -504,20 +504,20 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Returns preferred size of the given component
-   * 
+   *
    * @param c
    *          component for which to return preferred size
    * @return $Dimension$ preferred size for the given component
    */
   public Dimension getPreferredSize(JComponent c)
   {
-    return getPreferredMenuItemSize(c, checkIcon, arrowIcon, 
+    return getPreferredMenuItemSize(c, checkIcon, arrowIcon,
                                     defaultTextIconGap);
   }
 
   /**
    * Returns the prefix for entries in the {@link UIDefaults} table.
-   * 
+   *
    * @return "MenuItem"
    */
   protected String getPropertyPrefix()
@@ -527,7 +527,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * This method installs the components for this {@link JMenuItem}.
-   * 
+   *
    * @param menuItem
    *          The {@link JMenuItem} to install components for.
    */
@@ -548,15 +548,15 @@ public class BasicMenuItemUI extends MenuItemUI
                                      prefix + ".foreground", prefix + ".font");
     menuItem.setMargin(UIManager.getInsets(prefix + ".margin"));
     acceleratorFont = UIManager.getFont(prefix + ".acceleratorFont");
-    acceleratorForeground = UIManager.getColor(prefix 
+    acceleratorForeground = UIManager.getColor(prefix
         + ".acceleratorForeground");
-    acceleratorSelectionForeground = UIManager.getColor(prefix 
+    acceleratorSelectionForeground = UIManager.getColor(prefix
         + ".acceleratorSelectionForeground");
     selectionBackground = UIManager.getColor(prefix + ".selectionBackground");
     selectionForeground = UIManager.getColor(prefix + ".selectionForeground");
     acceleratorDelimiter = UIManager.getString(prefix + ".acceleratorDelimiter");
     checkIcon = UIManager.getIcon(prefix + ".checkIcon");
-    
+
     menuItem.setHorizontalTextPosition(SwingConstants.TRAILING);
     menuItem.setHorizontalAlignment(SwingConstants.LEADING);
   }
@@ -566,16 +566,16 @@ public class BasicMenuItemUI extends MenuItemUI
    */
   protected void installKeyboardActions()
   {
-    InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem, 
+    InputMap focusedWindowMap = SwingUtilities.getUIInputMap(menuItem,
         JComponent.WHEN_IN_FOCUSED_WINDOW);
     if (focusedWindowMap == null)
       focusedWindowMap = new ComponentInputMapUIResource(menuItem);
     KeyStroke accelerator = menuItem.getAccelerator();
     if (accelerator != null)
       focusedWindowMap.put(accelerator, "doClick");
-    SwingUtilities.replaceUIInputMap(menuItem, 
+    SwingUtilities.replaceUIInputMap(menuItem,
         JComponent.WHEN_IN_FOCUSED_WINDOW, focusedWindowMap);
-    
+
     ActionMap UIActionMap = SwingUtilities.getUIActionMap(menuItem);
     if (UIActionMap == null)
       UIActionMap = new ActionMapUIResource();
@@ -605,7 +605,7 @@ public class BasicMenuItemUI extends MenuItemUI
    * Installs and initializes all fields for this UI delegate. Any properties of
    * the UI that need to be initialized and/or set to defaults will be done now.
    * It will also install any listeners necessary.
-   * 
+   *
    * @param c
    *          The {@link JComponent} that is having this UI installed.
    */
@@ -621,7 +621,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Paints given menu item using specified graphics context
-   * 
+   *
    * @param g
    *          The graphics context used to paint this menu item
    * @param c
@@ -635,7 +635,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Paints background of the menu item
-   * 
+   *
    * @param g
    *          The graphics context used to paint this menu item
    * @param menuItem
@@ -664,7 +664,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Paints specified menu item
-   * 
+   *
    * @param g
    *          The graphics context used to paint this menu item
    * @param c
@@ -808,7 +808,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * Paints label for the given menu item
-   * 
+   *
    * @param g
    *          The graphics context used to paint this menu item
    * @param menuItem
@@ -864,7 +864,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * This method uninstalls the components for this {@link JMenuItem}.
-   * 
+   *
    * @param menuItem
    *          The {@link JMenuItem} to uninstall components for.
    */
@@ -901,7 +901,7 @@ public class BasicMenuItemUI extends MenuItemUI
    * Uninstalls any keyboard actions.
    */
   protected void uninstallKeyboardActions()
-  {   
+  {
     SwingUtilities.replaceUIInputMap(menuItem,
                                      JComponent.WHEN_IN_FOCUSED_WINDOW, null);
   }
@@ -922,7 +922,7 @@ public class BasicMenuItemUI extends MenuItemUI
    * Performs the opposite of installUI. Any properties or resources that need
    * to be cleaned up will be done now. It will also uninstall any listeners it
    * has. In addition, any properties of this UI will be nulled.
-   * 
+   *
    * @param c
    *          The {@link JComponent} that is having this UI uninstalled.
    */
@@ -937,7 +937,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
   /**
    * This method calls paint.
-   * 
+   *
    * @param g
    *          The graphics context used to paint this menu item
    * @param c
@@ -966,7 +966,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is called when mouse is clicked on the menu item. It forwards
      * this event to MenuSelectionManager.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -979,7 +979,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is called when mouse is dragged inside the menu item. It
      * forwards this event to MenuSelectionManager.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -994,7 +994,7 @@ public class BasicMenuItemUI extends MenuItemUI
      * item is considered to be selected and selection path in
      * MenuSelectionManager is set. This event is also forwarded to
      * MenuSelection Manager for further processing.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -1012,7 +1012,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is called when mouse exits menu item. The event is forwarded
      * to MenuSelectionManager for processing.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -1025,7 +1025,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is called when mouse is inside the menu item. This event is
      * forwarder to MenuSelectionManager for further processing.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -1038,7 +1038,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is called when mouse is pressed. This event is forwarded to
      * MenuSelectionManager for further processing.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -1052,7 +1052,7 @@ public class BasicMenuItemUI extends MenuItemUI
      * This method is called when mouse is released. If the mouse is released
      * inside this menuItem, then this menu item is considered to be chosen and
      * the menu hierarchy should be closed.
-     * 
+     *
      * @param e
      *          A {@link MouseEvent}.
      */
@@ -1078,7 +1078,7 @@ public class BasicMenuItemUI extends MenuItemUI
   {
     /**
      * Tbis method is invoked when mouse is dragged over the menu item.
-     * 
+     *
      * @param e
      *          The MenuDragMouseEvent
      */
@@ -1091,7 +1091,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * Tbis method is invoked when mouse enters the menu item while it is being
      * dragged.
-     * 
+     *
      * @param e
      *          The MenuDragMouseEvent
      */
@@ -1104,7 +1104,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * Tbis method is invoked when mouse exits the menu item while it is being
      * dragged
-     * 
+     *
      * @param e the MenuDragMouseEvent
      */
     public void menuDragMouseExited(MenuDragMouseEvent e)
@@ -1115,7 +1115,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * Tbis method is invoked when mouse was dragged and released inside the
      * menu item.
-     * 
+     *
      * @param e
      *          The MenuDragMouseEvent
      */
@@ -1140,7 +1140,7 @@ public class BasicMenuItemUI extends MenuItemUI
   {
     /**
      * This method is invoked when key has been pressed
-     * 
+     *
      * @param e
      *          A {@link MenuKeyEvent}.
      */
@@ -1151,7 +1151,7 @@ public class BasicMenuItemUI extends MenuItemUI
 
     /**
      * This method is invoked when key has been pressed
-     * 
+     *
      * @param e
      *          A {@link MenuKeyEvent}.
      */
@@ -1163,7 +1163,7 @@ public class BasicMenuItemUI extends MenuItemUI
     /**
      * This method is invoked when key has been typed It handles the mnemonic
      * key for the menu item.
-     * 
+     *
      * @param e
      *          A {@link MenuKeyEvent}.
      */
@@ -1172,7 +1172,7 @@ public class BasicMenuItemUI extends MenuItemUI
       // TODO: What should be done here, if anything?
     }
   }
-  
+
   /**
    * Helper class that listens for item changes to the properties of the {@link
    * JMenuItem}.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
index 355e0435ec8..4897ee4a067 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuUI.java
@@ -98,7 +98,7 @@ public class BasicMenuUI extends BasicMenuItemUI
           defaultManager.setSelectedPath(newPath);
       }
     }
-    
+
   }
 
   protected ChangeListener changeListener;
@@ -233,7 +233,7 @@ public class BasicMenuUI extends BasicMenuItemUI
    */
   protected void installDefaults()
   {
-    
+
     LookAndFeel.installBorder(menuItem, "Menu.border");
     LookAndFeel.installColorsAndFont(menuItem, "Menu.background",
                                      "Menu.foreground", "Menu.font");
@@ -502,9 +502,9 @@ public class BasicMenuUI extends BasicMenuItemUI
     {
       JMenu menu = (JMenu) menuItem;
       if (menu.isTopLevelMenu())
-	((JMenuBar) menu.getParent()).setSelected(menu);
+        ((JMenuBar) menu.getParent()).setSelected(menu);
       else
-	((JPopupMenu) menu.getParent()).setSelected(menu);
+        ((JPopupMenu) menu.getParent()).setSelected(menu);
     }
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
index e2380858098..a03d224d21f 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -100,7 +100,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
       JOptionPane op = (JOptionPane) event.getSource();
       op.setValue(new Integer(JOptionPane.CLOSED_OPTION));
     }
-    
+
   }
 
   /**
@@ -136,18 +136,18 @@ public class BasicOptionPaneUI extends OptionPaneUI
       Object value = new Integer(JOptionPane.CLOSED_OPTION);
       Object[] options = optionPane.getOptions();
       if (options != null)
-	value = new Integer(buttonIndex);
+        value = new Integer(buttonIndex);
       else
         {
-	  String text = ((JButton) e.getSource()).getText();
-	  if (text.equals(OK_STRING))
-	    value = new Integer(JOptionPane.OK_OPTION);
-	  if (text.equals(CANCEL_STRING))
-	    value = new Integer(JOptionPane.CANCEL_OPTION);
-	  if (text.equals(YES_STRING))
-	    value = new Integer(JOptionPane.YES_OPTION);
-	  if (text.equals(NO_STRING))
-	    value = new Integer(JOptionPane.NO_OPTION);
+          String text = ((JButton) e.getSource()).getText();
+          if (text.equals(OK_STRING))
+            value = new Integer(JOptionPane.OK_OPTION);
+          if (text.equals(CANCEL_STRING))
+            value = new Integer(JOptionPane.CANCEL_OPTION);
+          if (text.equals(YES_STRING))
+            value = new Integer(JOptionPane.YES_OPTION);
+          if (text.equals(NO_STRING))
+            value = new Integer(JOptionPane.NO_OPTION);
         }
       optionPane.setValue(value);
       resetInputValue();
@@ -155,7 +155,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
       Window owner = SwingUtilities.windowForComponent(optionPane);
 
       if (owner instanceof JDialog)
-	((JDialog) owner).dispose();
+        ((JDialog) owner).dispose();
 
       //else we probably have some kind of internal frame.
       JInternalFrame inf = (JInternalFrame) SwingUtilities.getAncestorOfClass(
@@ -265,21 +265,21 @@ public class BasicOptionPaneUI extends OptionPaneUI
       Component[] buttonList = container.getComponents();
       int x = container.getInsets().left;
       if (getCentersChildren())
-	x += (int) ((double) (container.getSize().width) / 2
-	- (double) (buttonRowLength(container)) / 2);
+        x += (int) ((double) (container.getSize().width) / 2
+        - (double) (buttonRowLength(container)) / 2);
       for (int i = 0; i < buttonList.length; i++)
         {
-	  Dimension dims = buttonList[i].getPreferredSize();
-	  if (syncAllWidths)
-	    {
-	      buttonList[i].setBounds(x, 0, widthOfWidestButton, dims.height);
-	      x += widthOfWidestButton + getPadding();
-	    }
-	  else
-	    {
-	      buttonList[i].setBounds(x, 0, dims.width, dims.height);
-	      x += dims.width + getPadding();
-	    }
+          Dimension dims = buttonList[i].getPreferredSize();
+          if (syncAllWidths)
+            {
+              buttonList[i].setBounds(x, 0, widthOfWidestButton, dims.height);
+              x += widthOfWidestButton + getPadding();
+            }
+          else
+            {
+              buttonList[i].setBounds(x, 0, dims.width, dims.height);
+              x += dims.width + getPadding();
+            }
         }
     }
 
@@ -301,10 +301,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
 
       for (int i = 0; i < buttonList.length; i++)
         {
-	  Dimension dims = buttonList[i].getPreferredSize();
-	  buttonLength += dims.width + getPadding();
-	  widest = Math.max(widest, dims.width);
-	  tallest = Math.max(tallest, dims.height);
+          Dimension dims = buttonList[i].getPreferredSize();
+          buttonLength += dims.width + getPadding();
+          widest = Math.max(widest, dims.width);
+          tallest = Math.max(tallest, dims.height);
         }
 
       widthOfWidestButton = widest;
@@ -312,10 +312,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
 
       int width;
       if (getSyncAllWidths())
-	width = widest * buttonList.length
-	        + getPadding() * (buttonList.length - 1);
+        width = widest * buttonList.length
+                + getPadding() * (buttonList.length - 1);
       else
-	width = buttonLength;
+        width = buttonLength;
 
       Insets insets = c.getInsets();
       width += insets.left + insets.right;
@@ -438,10 +438,10 @@ public class BasicOptionPaneUI extends OptionPaneUI
   /** Whether the JOptionPane contains custom components. */
   protected boolean hasCustomComponents;
 
-  // The initialFocusComponent seems to always be set to a button (even if 
-  // I try to set initialSelectionValue). This is different from what the 
-  // javadocs state (which should switch this reference to the input component 
-  // if one is present since that is what's going to get focus). 
+  // The initialFocusComponent seems to always be set to a button (even if
+  // I try to set initialSelectionValue). This is different from what the
+  // javadocs state (which should switch this reference to the input component
+  // if one is present since that is what's going to get focus).
 
   /**
    * The button that will receive focus based on initialValue when no input
@@ -531,20 +531,20 @@ public class BasicOptionPaneUI extends OptionPaneUI
     {
       public void paintIcon(Component c, Graphics g, int x, int y)
       {
-	Polygon oct = new Polygon(new int[] { 0, 0, 9, 27, 36, 36, 27, 9 },
-	                          new int[] { 9, 27, 36, 36, 27, 9, 0, 0 }, 8);
-	g.translate(x, y);
+        Polygon oct = new Polygon(new int[] { 0, 0, 9, 27, 36, 36, 27, 9 },
+                                  new int[] { 9, 27, 36, 36, 27, 9, 0, 0 }, 8);
+        g.translate(x, y);
 
-	Color saved = g.getColor();
-	g.setColor(Color.RED);
+        Color saved = g.getColor();
+        g.setColor(Color.RED);
 
-	g.fillPolygon(oct);
+        g.fillPolygon(oct);
 
-	g.setColor(Color.BLACK);
-	g.drawRect(13, 16, 10, 4);
+        g.setColor(Color.BLACK);
+        g.drawRect(13, 16, 10, 4);
 
-	g.setColor(saved);
-	g.translate(-x, -y);
+        g.setColor(saved);
+        g.translate(-x, -y);
       }
     };
 
@@ -553,24 +553,24 @@ public class BasicOptionPaneUI extends OptionPaneUI
     {
       public void paintIcon(Component c, Graphics g, int x, int y)
       {
-	g.translate(x, y);
-	Color saved = g.getColor();
+        g.translate(x, y);
+        Color saved = g.getColor();
 
-	// Should be purple.
-	g.setColor(Color.RED);
+        // Should be purple.
+        g.setColor(Color.RED);
 
-	g.fillOval(0, 0, ICON_SIZE, ICON_SIZE);
+        g.fillOval(0, 0, ICON_SIZE, ICON_SIZE);
 
-	g.setColor(Color.BLACK);
-	g.drawOval(16, 6, 4, 4);
+        g.setColor(Color.BLACK);
+        g.drawOval(16, 6, 4, 4);
 
-	Polygon bottomI = new Polygon(new int[] { 15, 15, 13, 13, 23, 23, 21, 21 },
-	                              new int[] { 12, 28, 28, 30, 30, 28, 28, 12 },
-	                              8);
-	g.drawPolygon(bottomI);
+        Polygon bottomI = new Polygon(new int[] { 15, 15, 13, 13, 23, 23, 21, 21 },
+                                      new int[] { 12, 28, 28, 30, 30, 28, 28, 12 },
+                                      8);
+        g.drawPolygon(bottomI);
 
-	g.setColor(saved);
-	g.translate(-x, -y);
+        g.setColor(saved);
+        g.translate(-x, -y);
       }
     };
 
@@ -579,23 +579,23 @@ public class BasicOptionPaneUI extends OptionPaneUI
     {
       public void paintIcon(Component c, Graphics g, int x, int y)
       {
-	g.translate(x, y);
-	Color saved = g.getColor();
-	g.setColor(Color.YELLOW);
+        g.translate(x, y);
+        Color saved = g.getColor();
+        g.setColor(Color.YELLOW);
 
-	Polygon triangle = new Polygon(new int[] { 0, 18, 36 },
-	                               new int[] { 36, 0, 36 }, 3);
-	g.fillPolygon(triangle);
+        Polygon triangle = new Polygon(new int[] { 0, 18, 36 },
+                                       new int[] { 36, 0, 36 }, 3);
+        g.fillPolygon(triangle);
 
-	g.setColor(Color.BLACK);
+        g.setColor(Color.BLACK);
 
-	Polygon excl = new Polygon(new int[] { 15, 16, 20, 21 },
-	                           new int[] { 8, 26, 26, 8 }, 4);
-	g.drawPolygon(excl);
-	g.drawOval(16, 30, 4, 4);
+        Polygon excl = new Polygon(new int[] { 15, 16, 20, 21 },
+                                   new int[] { 8, 26, 26, 8 }, 4);
+        g.drawPolygon(excl);
+        g.drawOval(16, 30, 4, 4);
 
-	g.setColor(saved);
-	g.translate(-x, -y);
+        g.setColor(saved);
+        g.translate(-x, -y);
       }
     };
 
@@ -604,32 +604,32 @@ public class BasicOptionPaneUI extends OptionPaneUI
     {
       public void paintIcon(Component c, Graphics g, int x, int y)
       {
-	g.translate(x, y);
-	Color saved = g.getColor();
-	g.setColor(Color.GREEN);
+        g.translate(x, y);
+        Color saved = g.getColor();
+        g.setColor(Color.GREEN);
 
-	g.fillRect(0, 0, ICON_SIZE, ICON_SIZE);
+        g.fillRect(0, 0, ICON_SIZE, ICON_SIZE);
 
-	g.setColor(Color.BLACK);
+        g.setColor(Color.BLACK);
 
-	g.drawOval(11, 2, 16, 16);
-	g.drawOval(14, 5, 10, 10);
+        g.drawOval(11, 2, 16, 16);
+        g.drawOval(14, 5, 10, 10);
 
-	g.setColor(Color.GREEN);
-	g.fillRect(0, 10, ICON_SIZE, ICON_SIZE - 10);
+        g.setColor(Color.GREEN);
+        g.fillRect(0, 10, ICON_SIZE, ICON_SIZE - 10);
 
-	g.setColor(Color.BLACK);
+        g.setColor(Color.BLACK);
 
-	g.drawLine(11, 10, 14, 10);
+        g.drawLine(11, 10, 14, 10);
 
-	g.drawLine(24, 10, 17, 22);
-	g.drawLine(27, 10, 20, 22);
-	g.drawLine(17, 22, 20, 22);
+        g.drawLine(24, 10, 17, 22);
+        g.drawLine(27, 10, 20, 22);
+        g.drawLine(17, 22, 20, 22);
 
-	g.drawOval(17, 25, 3, 3);
+        g.drawOval(17, 25, 3, 3);
 
-	g.setColor(saved);
-	g.translate(-x, -y);
+        g.setColor(saved);
+        g.translate(-x, -y);
       }
     };
 
@@ -659,25 +659,25 @@ public class BasicOptionPaneUI extends OptionPaneUI
       return;
     for (int i = 0; i < buttons.length; i++)
       {
-	if (buttons[i] != null)
-	  {
-	    Component toAdd;
-	    if (buttons[i] instanceof Component)
-	      toAdd = (Component) buttons[i];
-	    else
-	      {
-		if (buttons[i] instanceof Icon)
-		  toAdd = new JButton((Icon) buttons[i]);
-		else
-		  toAdd = new JButton(buttons[i].toString());
-		hasCustomComponents = true;
-	      }
-	    if (toAdd instanceof JButton)
-	      ((JButton) toAdd).addActionListener(createButtonActionListener(i));
-	    if (i == initialIndex)
-	      initialFocusComponent = toAdd;
-	    container.add(toAdd);
-	  }
+        if (buttons[i] != null)
+          {
+            Component toAdd;
+            if (buttons[i] instanceof Component)
+              toAdd = (Component) buttons[i];
+            else
+              {
+                if (buttons[i] instanceof Icon)
+                  toAdd = new JButton((Icon) buttons[i]);
+                else
+                  toAdd = new JButton(buttons[i].toString());
+                hasCustomComponents = true;
+              }
+            if (toAdd instanceof JButton)
+              ((JButton) toAdd).addActionListener(createButtonActionListener(i));
+            if (i == initialIndex)
+              initialFocusComponent = toAdd;
+            container.add(toAdd);
+          }
       }
     selectInitialValue(optionPane);
   }
@@ -693,9 +693,9 @@ public class BasicOptionPaneUI extends OptionPaneUI
     Icon icon = getIcon();
     if (icon != null)
       {
-	iconLabel = new JLabel(icon);
+        iconLabel = new JLabel(icon);
         configureLabel(iconLabel);
-	top.add(iconLabel, BorderLayout.WEST);
+        top.add(iconLabel, BorderLayout.WEST);
       }
   }
 
@@ -743,38 +743,38 @@ public class BasicOptionPaneUI extends OptionPaneUI
     hasCustomComponents = internallyCreated;
     if (msg instanceof Object[])
       {
-	Object[] arr = (Object[]) msg;
-	for (int i = 0; i < arr.length; i++)
-	  addMessageComponents(container, cons, arr[i], maxll,
-	                       internallyCreated);
-	return;
+        Object[] arr = (Object[]) msg;
+        for (int i = 0; i < arr.length; i++)
+          addMessageComponents(container, cons, arr[i], maxll,
+                               internallyCreated);
+        return;
       }
     else if (msg instanceof Component)
       {
-	container.add((Component) msg, cons);
-	cons.gridy++;
+        container.add((Component) msg, cons);
+        cons.gridy++;
       }
     else if (msg instanceof Icon)
       {
         JLabel label = new JLabel((Icon) msg);
         configureLabel(label);
-	container.add(label, cons);
-	cons.gridy++;
+        container.add(label, cons);
+        cons.gridy++;
       }
     else
       {
-	// Undocumented behaviour.
-	// if msg.toString().length greater than maxll
-	// it will create a box and burst the string.
-	// otherwise, it will just create a label and re-call 
-	// this method with the label o.O
-	if (msg.toString().length() > maxll || msg.toString().contains("\n"))
-	  {
-	    Box tmp = new Box(BoxLayout.Y_AXIS);
-	    burstStringInto(tmp, msg.toString(), maxll);
-	    addMessageComponents(container, cons, tmp, maxll, true);
-	  }
-	else
+        // Undocumented behaviour.
+        // if msg.toString().length greater than maxll
+        // it will create a box and burst the string.
+        // otherwise, it will just create a label and re-call
+        // this method with the label o.O
+        if (msg.toString().length() > maxll || msg.toString().contains("\n"))
+          {
+            Box tmp = new Box(BoxLayout.Y_AXIS);
+            burstStringInto(tmp, msg.toString(), maxll);
+            addMessageComponents(container, cons, tmp, maxll, true);
+          }
+        else
           {
             JLabel label = new JLabel(msg.toString());
             configureLabel(label);
@@ -817,7 +817,7 @@ public class BasicOptionPaneUI extends OptionPaneUI
     if (remainder.length() == 0)
       return;
 
-    // Recursively call ourselves to burst the remainder of the string, 
+    // Recursively call ourselves to burst the remainder of the string,
     if (remainder.length() > maxll || remainder.contains("\n"))
       burstStringInto(c, remainder, maxll);
     else
@@ -901,27 +901,27 @@ public class BasicOptionPaneUI extends OptionPaneUI
     rightSide.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
     rightSide.setLayout(new GridBagLayout());
     GridBagConstraints con = createConstraints();
-    
+
     addMessageComponents(rightSide, con, getMessage(),
                          getMaxCharactersPerLineCount(), false);
 
     if (optionPane.getWantsInput())
       {
-	Object[] selection = optionPane.getSelectionValues();
+        Object[] selection = optionPane.getSelectionValues();
 
-	if (selection == null)
+        if (selection == null)
           inputComponent = new JTextField(15);
-	else if (selection.length < 20)
+        else if (selection.length < 20)
           inputComponent = new JComboBox(selection);
-	else
-	  inputComponent = new JList(selection);
-	if (inputComponent != null)
-	  {
-	    addMessageComponents(rightSide, con, inputComponent,
+        else
+          inputComponent = new JList(selection);
+        if (inputComponent != null)
+          {
+            addMessageComponents(rightSide, con, inputComponent,
                                  getMaxCharactersPerLineCount(), false);
-	    resetSelectedValue();
-	    selectInitialValue(optionPane);
-	  }
+            resetSelectedValue();
+            selectInitialValue(optionPane);
+          }
       }
 
     messageArea.add(rightSide, BorderLayout.CENTER);
@@ -979,11 +979,11 @@ public class BasicOptionPaneUI extends OptionPaneUI
     switch (optionPane.getOptionType())
       {
       case JOptionPane.YES_NO_OPTION:
-	return new Object[] { YES_STRING, NO_STRING };
+        return new Object[] { YES_STRING, NO_STRING };
       case JOptionPane.YES_NO_CANCEL_OPTION:
-	return new Object[] { YES_STRING, NO_STRING, CANCEL_STRING };
+        return new Object[] { YES_STRING, NO_STRING, CANCEL_STRING };
       case JOptionPane.OK_CANCEL_OPTION:
-	return new Object[] { OK_STRING, CANCEL_STRING };
+        return new Object[] { OK_STRING, CANCEL_STRING };
       case JOptionPane.DEFAULT_OPTION:
         return (optionPane.getWantsInput()) ?
                new Object[] { OK_STRING, CANCEL_STRING } :
@@ -1022,17 +1022,17 @@ public class BasicOptionPaneUI extends OptionPaneUI
     switch (messageType)
       {
       case JOptionPane.ERROR_MESSAGE:
-	tmp = errorIcon;
-	break;
+        tmp = errorIcon;
+        break;
       case JOptionPane.INFORMATION_MESSAGE:
-	tmp = infoIcon;
-	break;
+        tmp = infoIcon;
+        break;
       case JOptionPane.WARNING_MESSAGE:
-	tmp = warningIcon;
-	break;
+        tmp = warningIcon;
+        break;
       case JOptionPane.QUESTION_MESSAGE:
-	tmp = questionIcon;
-	break;
+        tmp = questionIcon;
+        break;
       }
     return tmp;
     // FIXME: Don't cast till the default icons are in.
@@ -1055,8 +1055,8 @@ public class BasicOptionPaneUI extends OptionPaneUI
 
     for (int i = 0; i < buttons.length; i++)
       {
-	if (select == buttons[i])
-	  return i;
+        if (select == buttons[i])
+          return i;
       }
     return 0;
   }
@@ -1251,12 +1251,12 @@ public class BasicOptionPaneUI extends OptionPaneUI
   {
     if (c instanceof JOptionPane)
       {
-	optionPane = (JOptionPane) c;
+        optionPane = (JOptionPane) c;
 
-	installDefaults();
-	installComponents();
-	installListeners();
-	installKeyboardActions();
+        installDefaults();
+        installComponents();
+        installListeners();
+        installKeyboardActions();
       }
   }
 
@@ -1268,16 +1268,16 @@ public class BasicOptionPaneUI extends OptionPaneUI
   {
     if (optionPane.getWantsInput() && inputComponent != null)
       {
-	Object output = null;
-	if (inputComponent instanceof JTextField)
-	  output = ((JTextField) inputComponent).getText();
-	else if (inputComponent instanceof JComboBox)
-	  output = ((JComboBox) inputComponent).getSelectedItem();
-	else if (inputComponent instanceof JList)
-	  output = ((JList) inputComponent).getSelectedValue();
+        Object output = null;
+        if (inputComponent instanceof JTextField)
+          output = ((JTextField) inputComponent).getText();
+        else if (inputComponent instanceof JComboBox)
+          output = ((JComboBox) inputComponent).getSelectedItem();
+        else if (inputComponent instanceof JList)
+          output = ((JList) inputComponent).getSelectedValue();
 
-	if (output != null)
-	  optionPane.setInputValue(output);
+        if (output != null)
+          optionPane.setInputValue(output);
       }
   }
 
@@ -1291,8 +1291,8 @@ public class BasicOptionPaneUI extends OptionPaneUI
   {
     if (inputComponent != null)
       {
-	inputComponent.requestFocus();
-	return;
+        inputComponent.requestFocus();
+        return;
       }
     if (initialFocusComponent != null)
       initialFocusComponent.requestFocus();
@@ -1307,17 +1307,17 @@ public class BasicOptionPaneUI extends OptionPaneUI
   {
     if (inputComponent != null)
       {
-	Object init = optionPane.getInitialSelectionValue();
-	if (init == null)
-	  return;
-	if (inputComponent instanceof JTextField)
-	  ((JTextField) inputComponent).setText((String) init);
-	else if (inputComponent instanceof JComboBox)
-	  ((JComboBox) inputComponent).setSelectedItem(init);
-	else if (inputComponent instanceof JList)
-	  {
-	    //  ((JList) inputComponent).setSelectedValue(init, true);
-	  }
+        Object init = optionPane.getInitialSelectionValue();
+        if (init == null)
+          return;
+        if (inputComponent instanceof JTextField)
+          ((JTextField) inputComponent).setText((String) init);
+        else if (inputComponent instanceof JComboBox)
+          ((JComboBox) inputComponent).setSelectedItem(init);
+        else if (inputComponent instanceof JList)
+          {
+            //  ((JList) inputComponent).setSelectedValue(init, true);
+          }
       }
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
index 458f10204f0..959462a783c 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPanelUI.java
@@ -54,13 +54,13 @@ public class BasicPanelUI extends PanelUI
    * stateless).
    */
   static BasicPanelUI sharedUI;
-  
+
   /**
    * Returns a UI delegate for the specified component.
-   * 
+   *
    * @param panel  the panel.
    */
-  public static ComponentUI createUI(JComponent panel) 
+  public static ComponentUI createUI(JComponent panel)
   {
     if (sharedUI == null)
       sharedUI = new BasicPanelUI();
@@ -69,7 +69,7 @@ public class BasicPanelUI extends PanelUI
 
   /**
    * Installs this UI delegate in the specified component.
-   * 
+   *
    * @param c  the component (should be a {@link JPanel}, null not
    *     permitted).
    */
@@ -85,19 +85,19 @@ public class BasicPanelUI extends PanelUI
 
   /**
    * Installs the defaults for this UI delegate in the specified panel.
-   * 
+   *
    * @param p  the panel (null not permitted).
    */
   protected void installDefaults(JPanel p)
   {
     LookAndFeel.installColorsAndFont(p, "Panel.background", "Panel.foreground",
                                      "Panel.font");
-    
+
     // A test against the reference implementation shows that this method will
     // install a border if one is defined in the UIDefaults table (even though
     // the BasicLookAndFeel doesn't actually define a "Panel.border").  This
-    // test was written after discovering that a null argument to 
-    // uninstallDefaults throws a NullPointerException in 
+    // test was written after discovering that a null argument to
+    // uninstallDefaults throws a NullPointerException in
     // LookAndFeel.uninstallBorder()...
     LookAndFeel.installBorder(p, "Panel.border");
   }
@@ -123,10 +123,10 @@ public class BasicPanelUI extends PanelUI
     // (1) doesn't actually remove the installed colors and font installed
     //     by installDefaults(), it isn't necessary;
     // (2) throws a NullPointerException in LookAndFeel.uninstallBorder() if
-    //     p is null.  Strangely, no border is installed by the 
+    //     p is null.  Strangely, no border is installed by the
     //     BasicLookAndFeel - perhaps this is needed by another LAF?
-    
+
     LookAndFeel.uninstallBorder(p);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
index 76dcfc43559..cc839179fc2 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPasswordFieldUI.java
@@ -56,7 +56,7 @@ public class BasicPasswordFieldUI extends BasicTextFieldUI
   {
     return new PasswordView(elem);
   }
-  
+
   public static ComponentUI createUI(JComponent c)
   {
     return new BasicPasswordFieldUI();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
index 8c0fe6757e3..6cd433b334a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicPopupMenuUI.java
@@ -255,7 +255,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
 
     /**
      * Finds the next child element that is enabled and visible.
-     * 
+     *
      * @param children the children to search through
      * @param start the start index
      * @param end the end index
@@ -282,7 +282,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
 
     /**
      * Finds the previous child element that is enabled and visible.
-     * 
+     *
      * @param children the children to search through
      * @param start the start index
      * @param end the end index
@@ -349,7 +349,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
       else
         {
           int popupIndex = len-1;
-          if (len > 2 
+          if (len > 2
               && (path[popupIndex] instanceof JPopupMenu
                   || path[--popupIndex] instanceof JPopupMenu)
                   && ! ((JMenu) path[popupIndex - 1]).isTopLevelMenu())
@@ -773,7 +773,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
     am.put(action.getValue(Action.NAME), action);
     action = new NavigateAction("cancel");
     am.put(action.getValue(Action.NAME), action);
-    
+
     return am;
   }
 
@@ -916,7 +916,7 @@ public class BasicPopupMenuUI extends PopupMenuUI
      */
     public void popupMenuWillBecomeInvisible(PopupMenuEvent event)
     {
-      // remove listener that listens to component events fired 
+      // remove listener that listens to component events fired
       // by the top - level window that this popup belongs to.
       Component invoker = popupMenu.getInvoker();
       Component rootContainer = SwingUtilities.getRoot(invoker);
@@ -931,30 +931,30 @@ public class BasicPopupMenuUI extends PopupMenuUI
      */
     public void popupMenuWillBecomeVisible(PopupMenuEvent event)
     {
-      // Adds topWindowListener to top-level window to listener to 
+      // Adds topWindowListener to top-level window to listener to
       // ComponentEvents fired by it. We need to cancel this popup menu
       // if topWindow to which this popup belongs was resized or moved.
-      Component invoker = popupMenu.getInvoker();            
+      Component invoker = popupMenu.getInvoker();
       Component rootContainer = SwingUtilities.getRoot(invoker);
       if (rootContainer != null)
         rootContainer.addComponentListener(topWindowListener);
 
       // if this popup menu is a free floating popup menu,
       // then by default its first element should be always selected when
-      // this popup menu becomes visible. 
+      // this popup menu becomes visible.
       MenuSelectionManager manager = MenuSelectionManager.defaultManager();
 
       if (manager.getSelectedPath().length == 0)
         {
-	  // Set selected path to point to the first item in the popup menu
-	  MenuElement[] path = new MenuElement[2];
-	  path[0] = popupMenu;
-	  Component[] comps = popupMenu.getComponents();
-	  if (comps.length != 0 && comps[0] instanceof MenuElement)
-	    {
-	      path[1] = (MenuElement) comps[0];
-	      manager.setSelectedPath(path);
-	    }
+          // Set selected path to point to the first item in the popup menu
+          MenuElement[] path = new MenuElement[2];
+          path[0] = popupMenu;
+          Component[] comps = popupMenu.getComponents();
+          if (comps.length != 0 && comps[0] instanceof MenuElement)
+            {
+              path[1] = (MenuElement) comps[0];
+              manager.setSelectedPath(path);
+            }
         }
     }
   }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
index 12bbe013c5e..bff6385ea6e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicProgressBarUI.java
@@ -71,13 +71,13 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ProgressBarUI;
 
 /**
- * The Basic Look and Feel UI delegate for the 
+ * The Basic Look and Feel UI delegate for the
  * JProgressBar.
  */
 public class BasicProgressBarUI extends ProgressBarUI
 {
   /**
-   * A helper class that listens for ChangeEvents 
+   * A helper class that listens for ChangeEvents
    * from the progressBar's model.
    *
    * @specnote Apparently this class was intended to be protected,
@@ -99,13 +99,13 @@ public class BasicProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * This helper class is used to listen for 
+   * This helper class is used to listen for
    * PropertyChangeEvents from the progressBar.
    */
   private class PropertyChangeHandler implements PropertyChangeListener
   {
     /**
-     * Called every time the properties of the 
+     * Called every time the properties of the
      * progressBar change.
      *
      * @param e The PropertyChangeEvent given by the progressBar.
@@ -163,11 +163,11 @@ public class BasicProgressBarUI extends ProgressBarUI
     {
       // Nothing to do here.
     }
-    
+
   }
 
   /**
-   * This helper class is used to listen for 
+   * This helper class is used to listen for
    * the animationTimer's intervals. On every interval,
    * the bouncing box should move.
    */
@@ -215,7 +215,7 @@ public class BasicProgressBarUI extends ProgressBarUI
    * Holds the value of the bouncing box that is returned by {@link #getBox}.
    *
    * @since 1.5
-   */ 
+   */
   protected Rectangle boxRect;
 
   /** The timer used to move the bouncing box. */
@@ -230,7 +230,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   // | frame0 | frame1 | frame2 | frame 3 | frame 4  |
   // |        | frame7 | frame6 | frame 5 |          |
   // +-----------------------------------------------+
-  
+
   /** The current animation index. */
   private transient int animationIndex;
 
@@ -260,7 +260,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   /**
    * The size of the box returned by {@link #getBox} against the orientation
    * direction of the progress bar. This is package private to avoid accessor
-   * method. 
+   * method.
    */
   transient int boxIndependent = - 1;
 
@@ -346,7 +346,7 @@ public class BasicProgressBarUI extends ProgressBarUI
 
   /**
    * This method returns the size and position of the bouncing box
-   * for the current animation index. It stores the values in the 
+   * for the current animation index. It stores the values in the
    * given rectangle and returns it. It returns null if no box should
    * be drawn.
    *
@@ -487,7 +487,7 @@ public class BasicProgressBarUI extends ProgressBarUI
    * rectangle (the bounds without the insets) if the
    * progressBar is horizontal.
    *
-   * @return The preferred size of the progressBar minus 
+   * @return The preferred size of the progressBar minus
    *         insets if it's horizontal.
    */
   protected Dimension getPreferredInnerHorizontal()
@@ -512,7 +512,7 @@ public class BasicProgressBarUI extends ProgressBarUI
 
   /**
    * This method returns the preferred size of the inner
-   * rectangle (the bounds without insets) if the 
+   * rectangle (the bounds without insets) if the
    * progressBar is vertical.
    *
    * @return The preferred size of the progressBar minus
@@ -539,7 +539,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * This method returns the preferred size of the 
+   * This method returns the preferred size of the
    * given JComponent. If it returns null, then it
    * is up to the LayoutManager to give it a size.
    *
@@ -585,7 +585,7 @@ public class BasicProgressBarUI extends ProgressBarUI
 
   /**
    * This method returns the point (the top left of the bounding box)
-   * where the text should be painted. 
+   * where the text should be painted.
    *
    * @param g The Graphics object to measure FontMetrics with.
    * @param progressString The string to paint.
@@ -602,7 +602,7 @@ public class BasicProgressBarUI extends ProgressBarUI
     Rectangle tr = new Rectangle();
     Rectangle vr = new Rectangle();
     Rectangle ir = new Rectangle();
-    
+
     if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
       vr.setBounds(x, y, width, height);
     else
@@ -616,7 +616,7 @@ public class BasicProgressBarUI extends ProgressBarUI
                                        SwingConstants.CENTER,
                                        SwingConstants.CENTER,
                                        SwingConstants.CENTER, vr, ir, tr, 0);
-    
+
     if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
       return new Point(tr.x, tr.y);
     else
@@ -651,7 +651,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * This method is called if the painting to be done is 
+   * This method is called if the painting to be done is
    * for a determinate progressBar.
    *
    * @param g The Graphics object to paint with.
@@ -672,17 +672,17 @@ public class BasicProgressBarUI extends ProgressBarUI
 
     int amountFull = getAmountFull(insets, or.width, or.height);
 
-	if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
-	  {
-	    g.setColor(c.getForeground());
-	    g.fillRect(vr.x, vr.y, amountFull, vr.height);
-	  }
-	else
-	  {
-	    g.setColor(c.getForeground());
-	    g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width, 
+        if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
+          {
+            g.setColor(c.getForeground());
+            g.fillRect(vr.x, vr.y, amountFull, vr.height);
+          }
+        else
+          {
+            g.setColor(c.getForeground());
+            g.fillRect(vr.x, vr.y + vr.height - amountFull, vr.width,
                        amountFull);
-	  }
+          }
 
     if (progressBar.isStringPainted() && !progressBar.getString().equals(""))
       paintString(g, 0, 0, or.width, or.height, amountFull, insets);
@@ -739,13 +739,13 @@ public class BasicProgressBarUI extends ProgressBarUI
     String str = progressBar.getString();
     int full = getAmountFull(b, width, height);
     Point placement = getStringPlacement(g, progressBar.getString(),
-                                         x + b.left, y + b.top, 
+                                         x + b.left, y + b.top,
                                          width - b.left - b.right,
                                          height - b.top - b.bottom);
     Color savedColor = g.getColor();
     Shape savedClip = g.getClip();
     FontMetrics fm = g.getFontMetrics(progressBar.getFont());
-    
+
     if (progressBar.getOrientation() == JProgressBar.VERTICAL)
       {
         AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2);
@@ -756,7 +756,7 @@ public class BasicProgressBarUI extends ProgressBarUI
       {
         placement.y += fm.getAscent();
       }
-    
+
     g.setColor(getSelectionForeground());
     g.setClip(0, 0, full + b.left, height);
     g.drawString(str, placement.x, placement.y);
@@ -770,7 +770,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   /**
    * This method sets the current animation index. If the index is greater than
    * the number of frames, it resets to 0.
-   * 
+   *
    * @param newValue The new animation index.
    */
   protected void setAnimationIndex(int newValue)
@@ -849,10 +849,10 @@ public class BasicProgressBarUI extends ProgressBarUI
     if (cycleTime % repaintInterval != 0
         && (cycleTime / repaintInterval) % 2 != 0)
       {
-	int div = (cycleTime / repaintInterval) + 2;
-	div /= 2;
-	div *= 2;
-	cycleTime = div * repaintInterval;
+        int div = (cycleTime / repaintInterval) + 2;
+        div /= 2;
+        div *= 2;
+        cycleTime = div * repaintInterval;
       }
     setAnimationIndex(0);
     numFrames = cycleTime / repaintInterval;
@@ -874,7 +874,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * This method registers listeners to all the 
+   * This method registers listeners to all the
    * components that this UI delegate needs to listen to.
    */
   protected void installListeners()
@@ -895,7 +895,7 @@ public class BasicProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * This method unregisters listeners to all the 
+   * This method unregisters listeners to all the
    * components that were listened to.
    */
   protected void uninstallListeners()
@@ -930,13 +930,13 @@ public class BasicProgressBarUI extends ProgressBarUI
     super.installUI(c);
     if (c instanceof JProgressBar)
       {
-	progressBar = (JProgressBar) c;
+        progressBar = (JProgressBar) c;
 
-	animationTimer = new Timer(200, null);
-	animationTimer.setRepeats(true);
+        animationTimer = new Timer(200, null);
+        animationTimer.setRepeats(true);
 
-	installDefaults();
-	installListeners();
+        installDefaults();
+        installListeners();
       }
     if (progressBar.isIndeterminate())
       startAnimationTimer();
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
index 3cea0d926d2..ff374d1ab8b 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java
@@ -72,7 +72,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
    *
    * @return a new instance of BasicRadioButtonUI
    */
-  public static ComponentUI createUI(final JComponent c)  
+  public static ComponentUI createUI(final JComponent c)
   {
     return new BasicRadioButtonUI();
   }
@@ -158,7 +158,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
     Icon currentIcon = getCurrentIcon(b);
 
     // Do the layout.
-    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
+    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
        b.getText(), currentIcon == null ? getDefaultIcon() : currentIcon,
        b.getVerticalAlignment(), b.getHorizontalAlignment(),
        b.getVerticalTextPosition(), b.getHorizontalTextPosition(),
@@ -184,13 +184,13 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
           paintFocus(g, textR, size);
       }
   }
-  
-  /**                                                                                  
-   * Determines the icon to be displayed for the specified radio button.               
-   *                                                                                   
-   * @param b the radio button                                                         
-   *                                                                                   
-   * @return the icon                                                                  
+
+  /**
+   * Determines the icon to be displayed for the specified radio button.
+   *
+   * @param b the radio button
+   *
+   * @return the icon
    */
   private Icon getCurrentIcon(AbstractButton b)
   {
@@ -246,14 +246,14 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
     // one will be used for layout calculations and painting instead.
     // The other icon properties are ignored.
     AbstractButton b = (AbstractButton) c;
-    
+
     Insets insets = b.getInsets();
 
     String text = b.getText();
     Icon i = b.getIcon();
     if (i == null)
-      i = getDefaultIcon(); 
-    
+      i = getDefaultIcon();
+
     textR.x = 0;
     textR.y = 0;
     textR.width = 0;
@@ -269,7 +269,7 @@ public class BasicRadioButtonUI extends BasicToggleButtonUI
 
     SwingUtilities.layoutCompoundLabel(b, // for the component orientation
                                        b.getFontMetrics(b.getFont()),
-                                       text, i, b.getVerticalAlignment(), 
+                                       text, i, b.getVerticalAlignment(),
                                        b.getHorizontalAlignment(),
                                        b.getVerticalTextPosition(),
                                        b.getHorizontalTextPosition(),
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
index e20bc2bb3db..26c7a532dcc 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java
@@ -130,7 +130,7 @@ public class BasicRootPaneUI extends RootPaneUI
     }
   }
 
-  public static ComponentUI createUI(JComponent x) 
+  public static ComponentUI createUI(JComponent x)
   {
     return new BasicRootPaneUI();
   }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
index 400ede03ce9..9f24f8acae0 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java
@@ -85,7 +85,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
    */
   protected class ArrowButtonListener extends MouseAdapter
   {
-   
+
     /**
      * Move the thumb in the direction specified by the  button's arrow. If
      * this button is held down, then it should keep moving the thumb.
@@ -285,13 +285,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       currentMouseY = e.getY();
       if (scrollbar.getValueIsAdjusting())
         {
-	  int value;
-	  if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
-	    value = valueForXPosition(currentMouseX) - offset;
-	  else
-	    value = valueForYPosition(currentMouseY) - offset;
+          int value;
+          if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+            value = valueForXPosition(currentMouseX) - offset;
+          else
+            value = valueForYPosition(currentMouseY) - offset;
 
-	  scrollbar.setValue(value);
+          scrollbar.setValue(value);
         }
     }
 
@@ -321,38 +321,38 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 
       int value;
       if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
-	value = valueForXPosition(currentMouseX);
+        value = valueForXPosition(currentMouseX);
       else
-	value = valueForYPosition(currentMouseY);
+        value = valueForYPosition(currentMouseY);
 
       if (! thumbRect.contains(e.getPoint()))
         {
-	  scrollTimer.stop();
-	  scrollListener.setScrollByBlock(true);
-	  if (value > scrollbar.getValue())
-	    {
-	      trackHighlight = INCREASE_HIGHLIGHT;
-	      scrollListener.setDirection(POSITIVE_SCROLL);
-	    }
-	  else
-	    {
-	      trackHighlight = DECREASE_HIGHLIGHT;
-	      scrollListener.setDirection(NEGATIVE_SCROLL);
-	    }
+          scrollTimer.stop();
+          scrollListener.setScrollByBlock(true);
+          if (value > scrollbar.getValue())
+            {
+              trackHighlight = INCREASE_HIGHLIGHT;
+              scrollListener.setDirection(POSITIVE_SCROLL);
+            }
+          else
+            {
+              trackHighlight = DECREASE_HIGHLIGHT;
+              scrollListener.setDirection(NEGATIVE_SCROLL);
+            }
       scrollTimer.setDelay(100);
-	  scrollTimer.start();
+          scrollTimer.start();
         }
       else
         {
-	  // We'd like to keep track of where the cursor
-	  // is inside the thumb.
-	  // This works because the scrollbar's value represents 
-	  // "lower" edge of the thumb. The value at which
-	  // the cursor is at must be greater or equal
-	  // to that value.
+          // We'd like to keep track of where the cursor
+          // is inside the thumb.
+          // This works because the scrollbar's value represents
+          // "lower" edge of the thumb. The value at which
+          // the cursor is at must be greater or equal
+          // to that value.
 
       scrollListener.setScrollByBlock(false);
-	  scrollbar.setValueIsAdjusting(true);
+          scrollbar.setValueIsAdjusting(true);
       offset = value - scrollbar.getValue();
         }
       scrollbar.repaint();
@@ -394,17 +394,17 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     {
       int value;
       if (scrollbar.getOrientation() == HORIZONTAL)
-	value = valueForXPosition(currentMouseX);
+        value = valueForXPosition(currentMouseX);
       else
-	value = valueForYPosition(currentMouseY);
+        value = valueForYPosition(currentMouseY);
 
       if (thumbRect.contains(currentMouseX, currentMouseY))
         return false;
-      
+
       if (direction == POSITIVE_SCROLL)
-	return value > scrollbar.getValue();
+        return value > scrollbar.getValue();
       else
-	return value < scrollbar.getValue();
+        return value < scrollbar.getValue();
     }
   }
 
@@ -488,7 +488,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 
   /** The scrollbar this UI is acting for. */
   protected JScrollBar scrollbar;
-  
+
   /** True if the mouse is over the thumb. */
   boolean thumbRollover;
 
@@ -767,7 +767,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   }
 
   /**
-   * Installs the input map from the look and feel defaults, and a 
+   * Installs the input map from the look and feel defaults, and a
    * corresponding action map.  Note the the keyboard bindings will only
    * work when the {@link JScrollBar} component has the focus, which is rare.
    */
@@ -775,7 +775,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   {
     InputMap keyMap = getInputMap(
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-    SwingUtilities.replaceUIInputMap(scrollbar, 
+    SwingUtilities.replaceUIInputMap(scrollbar,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
     ActionMap map = getActionMap();
     SwingUtilities.replaceUIActionMap(scrollbar, map);
@@ -788,25 +788,25 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   protected void uninstallKeyboardActions()
   {
     SwingUtilities.replaceUIActionMap(scrollbar, null);
-    SwingUtilities.replaceUIInputMap(scrollbar, 
+    SwingUtilities.replaceUIInputMap(scrollbar,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
   }
 
-  InputMap getInputMap(int condition) 
+  InputMap getInputMap(int condition)
   {
     if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
       return (InputMap) UIManager.get("ScrollBar.focusInputMap");
     return null;
   }
-  
+
   /**
-   * Returns the action map for the {@link JScrollBar}.  All scroll bars 
-   * share a single action map which is created the first time this method is 
+   * Returns the action map for the {@link JScrollBar}.  All scroll bars
+   * share a single action map which is created the first time this method is
    * called, then stored in the UIDefaults table for subsequent access.
-   * 
+   *
    * @return The shared action map.
    */
-  ActionMap getActionMap() 
+  ActionMap getActionMap()
   {
     ActionMap map = (ActionMap) UIManager.get("ScrollBar.actionMap");
 
@@ -821,23 +821,23 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 
   /**
    * Creates the action map shared by all {@link JSlider} instances.
-   * This method is called once by {@link #getActionMap()} when it 
-   * finds no action map in the UIDefaults table...after the map is 
-   * created, it gets added to the defaults table so that subsequent 
-   * calls to {@link #getActionMap()} will return the same shared 
+   * This method is called once by {@link #getActionMap()} when it
+   * finds no action map in the UIDefaults table...after the map is
+   * created, it gets added to the defaults table so that subsequent
+   * calls to {@link #getActionMap()} will return the same shared
    * instance.
-   * 
+   *
    * @return The action map.
    */
   ActionMap createActionMap()
   {
     ActionMap map = new ActionMapUIResource();
-    map.put("positiveUnitIncrement", 
+    map.put("positiveUnitIncrement",
             new AbstractAction("positiveUnitIncrement") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -845,12 +845,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
               }
             }
     );
-    map.put("positiveBlockIncrement", 
+    map.put("positiveBlockIncrement",
             new AbstractAction("positiveBlockIncrement") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -858,12 +858,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
               }
             }
     );
-    map.put("negativeUnitIncrement", 
+    map.put("negativeUnitIncrement",
             new AbstractAction("negativeUnitIncrement") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -871,12 +871,12 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
               }
             }
     );
-    map.put("negativeBlockIncrement", 
+    map.put("negativeBlockIncrement",
             new AbstractAction("negativeBlockIncrement") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -884,24 +884,24 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
               }
             }
     );
-    map.put("minScroll", 
+    map.put("minScroll",
             new AbstractAction("minScroll") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     sb.setValue(sb.getMinimum());
                   }
               }
             }
     );
-    map.put("maxScroll", 
+    map.put("maxScroll",
             new AbstractAction("maxScroll") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollBar sb = (JScrollBar) event.getSource();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     sb.setValue(sb.getMaximum());
                   }
@@ -910,7 +910,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     );
     return map;
   }
-  
+
   /**
    * This method installs any listeners for the scrollbar. This method also
    * installs listeners for things such as the JButtons and the timer.
@@ -973,10 +973,10 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
   {
     if (scrollbarContainer instanceof JScrollBar)
       {
-	if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
-	  layoutHScrollbar((JScrollBar) scrollbarContainer);
-	else
-	  layoutVScrollbar((JScrollBar) scrollbarContainer);
+        if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
+          layoutHScrollbar((JScrollBar) scrollbarContainer);
+        else
+          layoutVScrollbar((JScrollBar) scrollbarContainer);
       }
   }
 
@@ -992,7 +992,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 
     Dimension incrDims = incrButton.getPreferredSize();
     Dimension decrDims = decrButton.getPreferredSize();
-    
+
     // calculate and update the track bounds
     SwingUtilities.calculateInnerArea(scrollbar, trackRect);
     trackRect.width -= incrDims.getWidth();
@@ -1000,7 +1000,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
     trackRect.x += decrDims.getWidth();
 
     updateThumbRect();
-    
+
     decrButton.setBounds(vr.x, vr.y, decrDims.width, trackRect.height);
     incrButton.setBounds(trackRect.x + trackRect.width, vr.y, incrDims.width,
                          trackRect.height);
@@ -1018,13 +1018,13 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
 
     Dimension incrDims = incrButton.getPreferredSize();
     Dimension decrDims = decrButton.getPreferredSize();
-    
+
     // Update rectangles
     SwingUtilities.calculateInnerArea(scrollbar, trackRect);
     trackRect.height -= incrDims.getHeight();
     trackRect.height -= decrDims.getHeight();
     trackRect.y += decrDims.getHeight();
-    
+
     updateThumbRect();
 
     decrButton.setBounds(vr.x, vr.y, trackRect.width, decrDims.height);
@@ -1076,14 +1076,14 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
             thumbRect.height = Math.max(extent * trackRect.height / (max - min),
                     getMinimumThumbSize().height);
             int availableHeight = trackRect.height - thumbRect.height;
-            thumbRect.y = trackRect.y 
+            thumbRect.y = trackRect.y
               + (value - min) * availableHeight / (max - min - extent);
             thumbRect.width = trackRect.width;
           }
       }
 
   }
-  
+
   /**
    * This method returns the minimum size required for the layout.
    *
@@ -1367,7 +1367,7 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       decrButton.removeMouseListener(buttonListener);
     if (incrButton != null)
       incrButton.removeMouseListener(buttonListener);
-    
+
     propertyChangeListener = null;
     modelListener = null;
     buttonListener = null;
@@ -1469,39 +1469,39 @@ public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
       value = min;
     return value;
   }
-  
+
   /**
    * Returns true if the mouse is over the thumb.
-   * 
+   *
    * @return true if the mouse is over the thumb.
-   * 
+   *
    * @since 1.5
    */
   public boolean isThumbRollover()
   {
-   return thumbRollover; 
+   return thumbRollover;
   }
-  
+
   /**
    * Set thumbRollover to active. This indicates
    * whether or not the mouse is over the thumb.
-   * 
+   *
    * @param active - true if the mouse is over the thumb.
-   * 
+   *
    * @since 1.5
    */
   protected void setThumbRollover(boolean active)
   {
     thumbRollover = active;
   }
-  
+
   /**
-   * Indicates whether the user can position the thumb with 
+   * Indicates whether the user can position the thumb with
    * a mouse click (i.e. middle button).
-   * 
+   *
    * @return true if the user can position the thumb with a mouse
    * click.
-   * 
+   *
    * @since 1.5
    */
   public boolean getSupportsAbsolutePositioning()
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
index a7194284050..712394830cc 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java
@@ -127,7 +127,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
       viewPosition.y = vsb.getValue();
       vp.setViewPosition(viewPosition);
     }
- 
+
   }
 
   /**
@@ -144,7 +144,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
      * changes. When the extents size has changed, this method calls
      * {@link BasicScrollPaneUI#syncScrollPaneWithViewport()} to adjust the
      * scrollbars extents as well.
-     * 
+     *
      * @param event the change event
      */
     public void stateChanged(ChangeEvent event)
@@ -221,7 +221,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
 
     /**
      * Scroll with the mouse wheel.
-     * 
+     *
      * @author Audrius Meskauskas (audriusa@Bioinformatics.org)
      */
     public void mouseWheelMoved(MouseWheelEvent e)
@@ -245,11 +245,11 @@ public class BasicScrollPaneUI extends ScrollPaneUI
         }
     }
   }
-  
+
   /**
    * Adds/removes the mouse wheel listener when the component is added/removed
    * to/from the scroll pane view port.
-   * 
+   *
    * @author Audrius Meskauskas (audriusa@bioinformatics.org)
    */
   class ViewportContainerListener implements ContainerListener
@@ -261,7 +261,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     {
       e.getChild().addMouseWheelListener(mouseWheelListener);
     }
-    
+
     /**
      * Remove the mouse wheel listener.
      */
@@ -270,18 +270,18 @@ public class BasicScrollPaneUI extends ScrollPaneUI
       e.getChild().removeMouseWheelListener(mouseWheelListener);
     }
   }
-  
+
   /**
    * The number of pixels by that we should scroll the content that does
    * not implement Scrollable.
    */
   static int SCROLL_NON_SCROLLABLES = 10;
-  
+
   /**
    * The number of rows to scroll per mouse wheel click. From impression,
    * Sun seems using the value 3.
    */
-  static int ROWS_PER_WHEEL_CLICK = 3;     
+  static int ROWS_PER_WHEEL_CLICK = 3;
 
   /** The Scrollpane for which the UI is provided by this class. */
   protected JScrollPane scrollpane;
@@ -310,14 +310,14 @@ public class BasicScrollPaneUI extends ScrollPaneUI
    * The mousewheel listener for the scrollpane.
    */
   MouseWheelListener mouseWheelListener;
-  
+
   /**
    * The listener to add and remove the mouse wheel listener to/from
    * the component container.
    */
   ContainerListener containerListener;
 
-  public static ComponentUI createUI(final JComponent c) 
+  public static ComponentUI createUI(final JComponent c)
   {
     return new BasicScrollPaneUI();
   }
@@ -348,8 +348,8 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     if (vpBorder != null && vpBorder instanceof UIResource)
       p.setViewportBorder(null);
   }
-    
-  public void installUI(final JComponent c) 
+
+  public void installUI(final JComponent c)
   {
     super.installUI(c);
     installDefaults((JScrollPane) c);
@@ -371,31 +371,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     if (hsbChangeListener == null)
       hsbChangeListener = createHSBChangeListener();
     sp.getHorizontalScrollBar().getModel().addChangeListener(hsbChangeListener);
-    
+
     if (vsbChangeListener == null)
       vsbChangeListener = createVSBChangeListener();
     sp.getVerticalScrollBar().getModel().addChangeListener(vsbChangeListener);
 
     if (viewportChangeListener == null)
       viewportChangeListener = createViewportChangeListener();
-    
+
     if (mouseWheelListener == null)
       mouseWheelListener = createMouseWheelListener();
-    
+
     if (containerListener == null)
       containerListener = new ViewportContainerListener();
-    
+
     JViewport v = sp.getViewport();
     v.addChangeListener(viewportChangeListener);
     v.addContainerListener(containerListener);
-    
+
     // Add mouse wheel listeners to the componets that are probably already
     // in the view port.
     for (int i = 0; i < v.getComponentCount(); i++)
       v.getComponent(i).addMouseWheelListener(mouseWheelListener);
   }
 
-  InputMap getInputMap(int condition) 
+  InputMap getInputMap(int condition)
   {
     if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
       return (InputMap) UIManager.get("ScrollPane.ancestorInputMap");
@@ -403,13 +403,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
   }
 
   /**
-   * Returns the action map for the {@link JScrollPane}.  All scroll panes 
-   * share a single action map which is created the first time this method is 
+   * Returns the action map for the {@link JScrollPane}.  All scroll panes
+   * share a single action map which is created the first time this method is
    * called, then stored in the UIDefaults table for subsequent access.
-   * 
+   *
    * @return The shared action map.
    */
-  ActionMap getActionMap() 
+  ActionMap getActionMap()
   {
     ActionMap map = (ActionMap) UIManager.get("ScrollPane.actionMap");
 
@@ -424,24 +424,24 @@ public class BasicScrollPaneUI extends ScrollPaneUI
 
   /**
    * Creates the action map shared by all {@link JSlider} instances.
-   * This method is called once by {@link #getActionMap()} when it 
-   * finds no action map in the UIDefaults table...after the map is 
-   * created, it gets added to the defaults table so that subsequent 
-   * calls to {@link #getActionMap()} will return the same shared 
+   * This method is called once by {@link #getActionMap()} when it
+   * finds no action map in the UIDefaults table...after the map is
+   * created, it gets added to the defaults table so that subsequent
+   * calls to {@link #getActionMap()} will return the same shared
    * instance.
-   * 
+   *
    * @return The action map.
    */
   ActionMap createActionMap()
   {
     ActionMap map = new ActionMapUIResource();
-    map.put("scrollLeft", 
+    map.put("scrollLeft",
             new AbstractAction("scrollLeft") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getHorizontalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -449,31 +449,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("scrollEnd", 
+    map.put("scrollEnd",
             new AbstractAction("scrollEnd") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb1 = sp.getHorizontalScrollBar();
-                if (sb1.isVisible()) 
+                if (sb1.isVisible())
                   {
                     sb1.setValue(sb1.getMaximum());
                   }
                 JScrollBar sb2 = sp.getVerticalScrollBar();
-                if (sb2.isVisible()) 
+                if (sb2.isVisible())
                   {
                     sb2.setValue(sb2.getMaximum());
                   }
               }
             }
     );
-    map.put("unitScrollUp", 
+    map.put("unitScrollUp",
             new AbstractAction("unitScrollUp") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getVerticalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -481,13 +481,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("unitScrollLeft", 
+    map.put("unitScrollLeft",
             new AbstractAction("unitScrollLeft") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getHorizontalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -495,13 +495,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("scrollUp", 
+    map.put("scrollUp",
             new AbstractAction("scrollUp") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getVerticalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(-1);
                     sb.setValue(sb.getValue() + delta);
@@ -509,13 +509,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("scrollRight", 
+    map.put("scrollRight",
             new AbstractAction("scrollRight") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getHorizontalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -523,31 +523,31 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("scrollHome", 
+    map.put("scrollHome",
             new AbstractAction("scrollHome") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb1 = sp.getHorizontalScrollBar();
-                if (sb1.isVisible()) 
+                if (sb1.isVisible())
                   {
                     sb1.setValue(sb1.getMinimum());
                   }
                 JScrollBar sb2 = sp.getVerticalScrollBar();
-                if (sb2.isVisible()) 
+                if (sb2.isVisible())
                   {
                     sb2.setValue(sb2.getMinimum());
                   }
               }
             }
     );
-    map.put("scrollDown", 
+    map.put("scrollDown",
             new AbstractAction("scrollDown") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getVerticalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getBlockIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -555,13 +555,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("unitScrollDown", 
+    map.put("unitScrollDown",
             new AbstractAction("unitScrollDown") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getVerticalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -569,13 +569,13 @@ public class BasicScrollPaneUI extends ScrollPaneUI
               }
             }
     );
-    map.put("unitScrollRight", 
+    map.put("unitScrollRight",
             new AbstractAction("unitScrollRight") {
               public void actionPerformed(ActionEvent event)
               {
                 JScrollPane sp = (JScrollPane) event.getSource();
                 JScrollBar sb = sp.getHorizontalScrollBar();
-                if (sb.isVisible()) 
+                if (sb.isVisible())
                   {
                     int delta = sb.getUnitIncrement(1);
                     sb.setValue(sb.getValue() + delta);
@@ -585,7 +585,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     );
     return map;
   }
-  
+
   /**
    * Installs additional keyboard actions on the scrollpane. This is a hook
    * method provided to subclasses in order to install their own keyboard
@@ -597,7 +597,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
   {
     InputMap keyMap = getInputMap(
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-    SwingUtilities.replaceUIInputMap(sp, 
+    SwingUtilities.replaceUIInputMap(sp,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
     ActionMap map = getActionMap();
     SwingUtilities.replaceUIActionMap(sp, map);
@@ -613,10 +613,10 @@ public class BasicScrollPaneUI extends ScrollPaneUI
   protected void uninstallKeyboardActions(JScrollPane sp)
   {
     SwingUtilities.replaceUIActionMap(sp, null);
-    SwingUtilities.replaceUIInputMap(sp, 
+    SwingUtilities.replaceUIInputMap(sp,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
   }
-  
+
   /**
    * Creates and returns the change listener for the horizontal scrollbar.
    *
@@ -661,7 +661,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
    * Creates and returns the mouse wheel listener for the scrollpane.
    *
    * @return the mouse wheel listener for the scrollpane
-   * 
+   *
    * @since 1.4
    */
   protected MouseWheelListener createMouseWheelListener()
@@ -669,7 +669,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     return new MouseWheelHandler();
   }
 
-  public void uninstallUI(final JComponent c) 
+  public void uninstallUI(final JComponent c)
   {
     uninstallDefaults((JScrollPane) c);
     uninstallListeners(c);
@@ -680,7 +680,7 @@ public class BasicScrollPaneUI extends ScrollPaneUI
    * Uninstalls all the listeners that have been installed in
    * {@link #installListeners(JScrollPane)}.
    *
-   * @param c the scrollpane from which to uninstall the listeners 
+   * @param c the scrollpane from which to uninstall the listeners
    */
   protected void uninstallListeners(JComponent c)
   {
@@ -690,17 +690,17 @@ public class BasicScrollPaneUI extends ScrollPaneUI
                                .removeChangeListener(hsbChangeListener);
     sp.getVerticalScrollBar().getModel()
                              .removeChangeListener(vsbChangeListener);
-    
+
     JViewport v = sp.getViewport();
     v.removeChangeListener(viewportChangeListener);
     v.removeContainerListener(containerListener);
- 
+
     for (int i = 0; i < v.getComponentCount(); i++)
       v.getComponent(i).removeMouseWheelListener(mouseWheelListener);
 
   }
 
-  public Dimension getMinimumSize(JComponent c) 
+  public Dimension getMinimumSize(JComponent c)
   {
     JScrollPane p = (JScrollPane) c;
     ScrollPaneLayout sl = (ScrollPaneLayout) p.getLayout();
@@ -821,15 +821,3 @@ public class BasicScrollPaneUI extends ScrollPaneUI
     syncScrollPaneWithViewport();
   }
 }
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
index 97caa3af7bd..2c80822a486 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSeparatorUI.java
@@ -86,10 +86,10 @@ public class BasicSeparatorUI extends SeparatorUI
 
     if (c instanceof JSeparator)
       {
-	JSeparator s = (JSeparator) c;
+        JSeparator s = (JSeparator) c;
 
-	installDefaults(s);
-	installListeners(s);
+        installDefaults(s);
+        installListeners(s);
       }
   }
 
@@ -104,10 +104,10 @@ public class BasicSeparatorUI extends SeparatorUI
   {
     if (c instanceof JSeparator)
       {
-	JSeparator s = (JSeparator) c;
+        JSeparator s = (JSeparator) c;
 
-	uninstallListeners(s);
-	uninstallDefaults(s);
+        uninstallListeners(s);
+        uninstallDefaults(s);
       }
   }
 
@@ -138,7 +138,7 @@ public class BasicSeparatorUI extends SeparatorUI
 
   /**
    * This method installs any listeners that need
-   * to be attached to the JSeparator or any of its 
+   * to be attached to the JSeparator or any of its
    * components.
    *
    * @param s The JSeparator that is being installed.
@@ -156,15 +156,15 @@ public class BasicSeparatorUI extends SeparatorUI
    */
   protected void uninstallListeners(JSeparator s)
   {
-    // Separators don't receive events.  
+    // Separators don't receive events.
   }
 
   /**
-   * The separator is made of two lines. The top line will be 
-   * the shadow color (or left line if it's vertical). The bottom 
-   * or right line will be the highlight color. The two lines will 
-   * be centered inside the bounds box. If the separator is horizontal, 
-   * then it will be vertically centered, or if it's vertical, it will 
+   * The separator is made of two lines. The top line will be
+   * the shadow color (or left line if it's vertical). The bottom
+   * or right line will be the highlight color. The two lines will
+   * be centered inside the bounds box. If the separator is horizontal,
+   * then it will be vertically centered, or if it's vertical, it will
    * be horizontally centered.
    *
    * @param g The Graphics object to paint with
@@ -175,15 +175,15 @@ public class BasicSeparatorUI extends SeparatorUI
     Rectangle r = new Rectangle();
     SwingUtilities.calculateInnerArea(c, r);
     Color saved = g.getColor();
-    
+
     JSeparator s;
     if (c instanceof JSeparator)
       s = (JSeparator) c;
     else
       return;
-      
+
     if (s.getOrientation() == JSeparator.HORIZONTAL)
-      {    
+      {
         int midAB = r.height / 2;
         g.setColor(shadow);
         g.drawLine(r.x, r.y + midAB - 1, r.x + r.width, r.y + midAB - 1);
@@ -204,7 +204,7 @@ public class BasicSeparatorUI extends SeparatorUI
   }
 
   /**
-   * This method returns the preferred size of the 
+   * This method returns the preferred size of the
    * JComponent.
    *
    * @param c The JComponent to measure.
@@ -216,8 +216,8 @@ public class BasicSeparatorUI extends SeparatorUI
     Dimension pref = new Dimension(2, 0);
     if (c instanceof JSeparator)
       {
-	JSeparator s = (JSeparator) c;
-	if (s.getOrientation() == JSeparator.HORIZONTAL)
+        JSeparator s = (JSeparator) c;
+        if (s.getOrientation() == JSeparator.HORIZONTAL)
           pref = new Dimension(0, 2);
       }
     return pref;
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
index 474a4225640..b9d5643725a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSliderUI.java
@@ -81,12 +81,12 @@ import javax.swing.plaf.SliderUI;
  * BasicSliderUI.java This is the UI delegate in the Basic look and feel that
  * paints JSliders.
  * 
                      
- * 
+ *
  * 
                      
  * The UI delegate keeps track of 6 rectangles that place the various parts of
  * the JSlider inside the component.
  * 
                      
- * 
+ *
  * 
                      
  * The rectangles are organized as follows:
  * 
                      
@@ -110,27 +110,27 @@ import javax.swing.plaf.SliderUI;
  *     |  |  |                                           |  |  |
  *     |  |                                              |  |  |
  * 
                      
- * 
+ *
  * 
                      
  * The space between the contentRect and the focusRect are the FocusInsets.
  * 
                      
- * 
+ *
  * 
                      
  * The space between the focusRect and the component bounds is the insetCache
  * which are the component's insets.
  * 
                      
- * 
+ *
  * 
                      
  * The top of the thumb is the top of the contentRect. The trackRect has to be
  * as tall as the thumb.
  * 
                      
- * 
+ *
  * 
                      
  * The trackRect and tickRect do not start from the left edge of the
  * focusRect. They are trackBuffer away from each side of the focusRect. This
  * is so that the thumb has room to move.
  * 
                      
- * 
+ *
  * 
                      
  * The labelRect does start right against the contentRect's left and right
  * edges and it gets all remaining space.
@@ -420,8 +420,8 @@ public class BasicSliderUI extends SliderUI
           if (slider.getSnapToTicks())
             value = findClosestTick(value);
 
-          // If the thumb is hit, then we don't need to set the timers to 
-          // move it. 
+          // If the thumb is hit, then we don't need to set the timers to
+          // move it.
           if (! thumbRect.contains(e.getPoint()))
             {
               // The mouse has hit some other part of the slider.
@@ -605,16 +605,16 @@ public class BasicSliderUI extends SliderUI
 
   /**
    * Returns true if the user is dragging the slider.
-   * 
+   *
    * @return true if the slider is being dragged.
-   * 
+   *
    * @since 1.5
    */
   protected boolean isDragging()
   {
     return dragging;
   }
-  
+
   /**
    * Gets the shadow color to be used for this slider. The shadow color is the
    * color used for drawing the top and left edges of the track.
@@ -1099,15 +1099,15 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Updates the contentRect field to an area inside the 
-   * focusRect. This method does not need to be called if the 
+   * Updates the contentRect field to an area inside the
+   * focusRect. This method does not need to be called if the
    * orientation changes.
    */
   protected void calculateContentRect()
   {
     contentRect.x = focusRect.x + focusInsets.left;
     contentRect.y = focusRect.y + focusInsets.top;
-    
+
     contentRect.width = focusRect.width - focusInsets.left - focusInsets.right;
     contentRect.height = focusRect.height - focusInsets.top
                          - focusInsets.bottom;
@@ -1134,9 +1134,9 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Calculates the gap size between the edge of the contentRect 
+   * Calculates the gap size between the edge of the contentRect
    * and the edge of the trackRect, storing the result in the
-   * trackBuffer field.  Sufficient space needs to be reserved 
+   * trackBuffer field.  Sufficient space needs to be reserved
    * for the slider thumb and/or the labels at each end of the slider track.
    */
   protected void calculateTrackBuffer()
@@ -1145,11 +1145,11 @@ public class BasicSliderUI extends SliderUI
       {
         int w = Math.max(getWidthOfLowValueLabel(), getWidthOfHighValueLabel());
         trackBuffer = Math.max(thumbRect.width / 2, w / 2);
-        
+
       }
     else
       {
-        int h = Math.max(getHeightOfLowValueLabel(), 
+        int h = Math.max(getHeightOfLowValueLabel(),
                          getHeightOfHighValueLabel());
         trackBuffer = Math.max(thumbRect.height / 2, h / 2);
       }
@@ -1157,10 +1157,10 @@ public class BasicSliderUI extends SliderUI
 
   /**
    * Returns the size of the slider's thumb.  The size is hard coded to
-   * 11 x 20 for horizontal sliders, and 20 x 11 for 
-   * vertical sliders. Note that a new instance of {@link Dimension} is 
-   * returned for every call to this method (this seems wasteful, but 
-   * {@link Dimension} instances are not immutable, so this is probably 
+   * 11 x 20 for horizontal sliders, and 20 x 11 for
+   * vertical sliders. Note that a new instance of {@link Dimension} is
+   * returned for every call to this method (this seems wasteful, but
+   * {@link Dimension} instances are not immutable, so this is probably
    * unavoidable).
    *
    * @return The size of the slider's thumb.
@@ -1232,7 +1232,7 @@ public class BasicSliderUI extends SliderUI
         tickRect.y = trackRect.y + trackRect.height;
         tickRect.width = trackRect.width;
         tickRect.height = getTickLength();
-        
+
         // this makes our Mauve tests pass...can't explain it!
         if (!slider.getPaintTicks())
           {
@@ -1257,7 +1257,7 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Calculates the labelRect field, taking into account the 
+   * Calculates the labelRect field, taking into account the
    * orientation of the slider.
    */
   protected void calculateLabelRect()
@@ -1353,7 +1353,7 @@ public class BasicSliderUI extends SliderUI
    * there are no labels.
    *
    * @return The width of the label whose key has the highest value.
-   * 
+   *
    * @see #getHighestValueLabel()
    */
   protected int getWidthOfHighValueLabel()
@@ -1370,7 +1370,7 @@ public class BasicSliderUI extends SliderUI
    * there are no labels.
    *
    * @return The width of the label whose key has the lowest value.
-   * 
+   *
    * @see #getLowestValueLabel()
    */
   protected int getWidthOfLowValueLabel()
@@ -1455,7 +1455,7 @@ public class BasicSliderUI extends SliderUI
   /**
    * Returns the label whose key has the highest value.
    *
-   * @return The label whose key has the highest value or null if 
+   * @return The label whose key has the highest value or null if
    *     no label table exists.
    */
   protected Component getHighestValueLabel()
@@ -1527,7 +1527,7 @@ public class BasicSliderUI extends SliderUI
   protected void recalculateIfOrientationChanged()
   {
     // Examining a test program shows that either Sun calls private
-    // methods that we don't know about, or these don't do anything.  
+    // methods that we don't know about, or these don't do anything.
     calculateThumbSize();
     calculateTrackBuffer();
     calculateTrackRect();
@@ -1549,7 +1549,7 @@ public class BasicSliderUI extends SliderUI
     Color saved_color = g.getColor();
 
     g.setColor(getFocusColor());
-    
+
     g.drawRect(focusRect.x, focusRect.y, focusRect.width, focusRect.height);
 
     g.setColor(saved_color);
@@ -1564,16 +1564,16 @@ public class BasicSliderUI extends SliderUI
    * with the highlight color.
    * 
                      
    * 
                      -   *    a---d   
-   *    |   |   
+   *    a---d
+   *    |   |
    *    |   |   a------------------------d
    *    |   |   |                        |
    *    |   |   b------------------------c
    *    |   |
-   *    |   |   
+   *    |   |
    *    b---c
    * 
                      
-   * 
+   *
    * 
                      
    * The b-a-d path needs to be drawn with the shadow color and the b-c-d path
    * needs to be drawn with the highlight color.
@@ -1676,7 +1676,7 @@ public class BasicSliderUI extends SliderUI
       }
   }
 
-  /* Minor ticks start at 1/4 of the height (or width) of the tickRect and 
+  /* Minor ticks start at 1/4 of the height (or width) of the tickRect and
      extend to 1/2 of the tickRect.
 
      Major ticks start at 1/4 of the height and extend to 3/4.
@@ -1849,7 +1849,7 @@ public class BasicSliderUI extends SliderUI
    *     \ /             |      /
    *      d              e-----d
    *  
                      
-   * 
+   *
    * 
                      
    * In the case of vertical thumbs, we highlight the path b-a-e-d and shadow
    * the path b-c-d. In the case of horizontal thumbs, we highlight the path
@@ -1958,10 +1958,10 @@ public class BasicSliderUI extends SliderUI
 
   /**
    * Moves the thumb one block in the direction specified (a block is 1/10th
-   * of the slider range).   If the slider snaps to ticks, this method is 
+   * of the slider range).   If the slider snaps to ticks, this method is
    * responsible for snapping it to a tick after the thumb has been moved.
    *
-   * @param direction  the direction (positive values increment the thumb 
+   * @param direction  the direction (positive values increment the thumb
    *   position by one block, zero/negative values decrement the thumb position
    *   by one block).
    */
@@ -1981,11 +1981,11 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Moves the thumb one unit in the specified direction. If the slider snaps 
-   * to ticks, this method is responsible for snapping it to a tick after the 
+   * Moves the thumb one unit in the specified direction. If the slider snaps
+   * to ticks, this method is responsible for snapping it to a tick after the
    * thumb has been moved.
    *
-   * @param direction  the direction (positive values increment the thumb 
+   * @param direction  the direction (positive values increment the thumb
    *   position by one, zero/negative values decrement the thumb position by
    *   one).
    */
@@ -2021,7 +2021,7 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Returns the x-coordinate (relative to the component) for the given slider 
+   * Returns the x-coordinate (relative to the component) for the given slider
    * value.  This method assumes that the trackRect field is
    * set up.
    *
@@ -2049,8 +2049,8 @@ public class BasicSliderUI extends SliderUI
   }
 
   /**
-   * Returns the y-coordinate (relative to the component) for the given slider 
-   * value.  This method assumes that the trackRect field is 
+   * Returns the y-coordinate (relative to the component) for the given slider
+   * value.  This method assumes that the trackRect field is
    * set up.
    *
    * @param value  the slider value.
@@ -2093,8 +2093,8 @@ public class BasicSliderUI extends SliderUI
 
     int value;
 
-    // If the length is 0, you shouldn't be able to even see where the slider 
-    // is.  This really shouldn't ever happen, but just in case, we'll return 
+    // If the length is 0, you shouldn't be able to even see where the slider
+    // is.  This really shouldn't ever happen, but just in case, we'll return
     // the middle.
     if (len == 0)
       return (max - min) / 2;
@@ -2129,8 +2129,8 @@ public class BasicSliderUI extends SliderUI
 
     int value;
 
-    // If the length is 0, you shouldn't be able to even see where the slider 
-    // is.  This really shouldn't ever happen, but just in case, we'll return 
+    // If the length is 0, you shouldn't be able to even see where the slider
+    // is.  This really shouldn't ever happen, but just in case, we'll return
     // the middle.
     if (len == 0)
       return (max - min) / 2;
@@ -2164,14 +2164,14 @@ public class BasicSliderUI extends SliderUI
     int minorSpace = slider.getMinorTickSpacing();
 
     // The default value to return is value + minor or
-    // value + major. 
+    // value + major.
     // Initializing at min - value leaves us with a default
     // return value of min, which always has tick marks
     // (if ticks are painted).
     int minor = min - value;
     int major = min - value;
 
-    // If there are no major tick marks or minor tick marks 
+    // If there are no major tick marks or minor tick marks
     // e.g. snap is set to true but no ticks are set, then
     // we can just return the value.
     if (majorSpace <= 0 && minorSpace <= 0)
@@ -2208,8 +2208,8 @@ public class BasicSliderUI extends SliderUI
     else
       return value + minor;
   }
-  
-  InputMap getInputMap(int condition) 
+
+  InputMap getInputMap(int condition)
   {
     if (condition == JComponent.WHEN_FOCUSED)
       return (InputMap) UIManager.get("Slider.focusInputMap");
@@ -2218,12 +2218,12 @@ public class BasicSliderUI extends SliderUI
 
   /**
    * Returns the action map for the {@link JSlider}.  All sliders share
-   * a single action map which is created the first time this method is 
+   * a single action map which is created the first time this method is
    * called, then stored in the UIDefaults table for subsequent access.
-   * 
+   *
    * @return The shared action map.
    */
-  ActionMap getActionMap() 
+  ActionMap getActionMap()
   {
     ActionMap map = (ActionMap) UIManager.get("Slider.actionMap");
 
@@ -2238,18 +2238,18 @@ public class BasicSliderUI extends SliderUI
 
   /**
    * Creates the action map shared by all {@link JSlider} instances.
-   * This method is called once by {@link #getActionMap()} when it 
-   * finds no action map in the UIDefaults table...after the map is 
-   * created, it gets added to the defaults table so that subsequent 
-   * calls to {@link #getActionMap()} will return the same shared 
+   * This method is called once by {@link #getActionMap()} when it
+   * finds no action map in the UIDefaults table...after the map is
+   * created, it gets added to the defaults table so that subsequent
+   * calls to {@link #getActionMap()} will return the same shared
    * instance.
-   * 
+   *
    * @return The action map.
    */
   ActionMap createActionMap()
   {
     ActionMap map = new ActionMapUIResource();
-    map.put("positiveUnitIncrement", 
+    map.put("positiveUnitIncrement",
             new AbstractAction("positiveUnitIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2262,7 +2262,7 @@ public class BasicSliderUI extends SliderUI
               }
             }
     );
-    map.put("negativeUnitIncrement", 
+    map.put("negativeUnitIncrement",
             new AbstractAction("negativeUnitIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2275,7 +2275,7 @@ public class BasicSliderUI extends SliderUI
               }
             }
     );
-    map.put("positiveBlockIncrement", 
+    map.put("positiveBlockIncrement",
             new AbstractAction("positiveBlockIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2288,7 +2288,7 @@ public class BasicSliderUI extends SliderUI
               }
             }
     );
-    map.put("negativeBlockIncrement", 
+    map.put("negativeBlockIncrement",
             new AbstractAction("negativeBlockIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2301,7 +2301,7 @@ public class BasicSliderUI extends SliderUI
               }
             }
     );
-    map.put("minScroll", 
+    map.put("minScroll",
             new AbstractAction("minScroll") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2309,11 +2309,11 @@ public class BasicSliderUI extends SliderUI
                 if (slider.getInverted())
                   slider.setValue(slider.getMaximum());
                 else
-                  slider.setValue(slider.getMinimum());   
+                  slider.setValue(slider.getMinimum());
               }
             }
     );
-    map.put("maxScroll", 
+    map.put("maxScroll",
             new AbstractAction("maxScroll") {
               public void actionPerformed(ActionEvent event)
               {
@@ -2321,7 +2321,7 @@ public class BasicSliderUI extends SliderUI
                 if (slider.getInverted())
                   slider.setValue(slider.getMinimum());
                 else
-                  slider.setValue(slider.getMaximum());                  
+                  slider.setValue(slider.getMaximum());
               }
             }
     );
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
index 254a9a4fa2b..00c8537cce6 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSpinnerUI.java
@@ -173,7 +173,7 @@ public class BasicSpinnerUI extends SpinnerUI
     if (e instanceof JSpinner.DefaultEditor)
       {
         JSpinner.DefaultEditor de = (JSpinner.DefaultEditor) e;
-        de.getTextField().setBorder(null);  
+        de.getTextField().setBorder(null);
       }
     spinner.setLayout(createLayout());
     spinner.setOpaque(true);
@@ -199,36 +199,36 @@ public class BasicSpinnerUI extends SpinnerUI
   {
     c.addMouseListener(new MouseAdapter()
         {
-	  public void mousePressed(MouseEvent evt)
-	  {
-	    if (! spinner.isEnabled())
-	      return;
-	    increment();
-	    timer.setInitialDelay(500);
-	    timer.start();
-	  }
+          public void mousePressed(MouseEvent evt)
+          {
+            if (! spinner.isEnabled())
+              return;
+            increment();
+            timer.setInitialDelay(500);
+            timer.start();
+          }
 
-	  public void mouseReleased(MouseEvent evt)
-	  {
-	    timer.stop();
-	  }
+          public void mouseReleased(MouseEvent evt)
+          {
+            timer.stop();
+          }
 
-	  void increment()
-	  {
-	    Object next = BasicSpinnerUI.this.spinner.getNextValue();
-	    if (next != null)
-	      BasicSpinnerUI.this.spinner.getModel().setValue(next);
-	  }
+          void increment()
+          {
+            Object next = BasicSpinnerUI.this.spinner.getNextValue();
+            if (next != null)
+              BasicSpinnerUI.this.spinner.getModel().setValue(next);
+          }
 
-	  volatile boolean mouseDown;
-	  Timer timer = new Timer(50,
-	                          new ActionListener()
-	      {
-		public void actionPerformed(ActionEvent event)
-		{
-		  increment();
-		}
-	      });
+          volatile boolean mouseDown;
+          Timer timer = new Timer(50,
+                                  new ActionListener()
+              {
+                public void actionPerformed(ActionEvent event)
+                {
+                  increment();
+                }
+              });
         });
   }
 
@@ -239,36 +239,36 @@ public class BasicSpinnerUI extends SpinnerUI
   {
     c.addMouseListener(new MouseAdapter()
         {
-	  public void mousePressed(MouseEvent evt)
-	  {
-	    if (! spinner.isEnabled())
-	      return;
-	    decrement();
-	    timer.setInitialDelay(500);
-	    timer.start();
-	  }
+          public void mousePressed(MouseEvent evt)
+          {
+            if (! spinner.isEnabled())
+              return;
+            decrement();
+            timer.setInitialDelay(500);
+            timer.start();
+          }
 
-	  public void mouseReleased(MouseEvent evt)
-	  {
-	    timer.stop();
-	  }
+          public void mouseReleased(MouseEvent evt)
+          {
+            timer.stop();
+          }
 
-	  void decrement()
-	  {
-	    Object prev = BasicSpinnerUI.this.spinner.getPreviousValue();
-	    if (prev != null)
-	      BasicSpinnerUI.this.spinner.getModel().setValue(prev);
-	  }
+          void decrement()
+          {
+            Object prev = BasicSpinnerUI.this.spinner.getPreviousValue();
+            if (prev != null)
+              BasicSpinnerUI.this.spinner.getModel().setValue(prev);
+          }
 
-	  volatile boolean mouseDown;
-	  Timer timer = new Timer(50,
-	                          new ActionListener()
-	      {
-		public void actionPerformed(ActionEvent event)
-		{
-		  decrement();
-		}
-	      });
+          volatile boolean mouseDown;
+          Timer timer = new Timer(50,
+                                  new ActionListener()
+              {
+                public void actionPerformed(ActionEvent event)
+                {
+                  decrement();
+                }
+              });
         });
   }
 
@@ -384,7 +384,7 @@ public class BasicSpinnerUI extends SpinnerUI
           Dimension e = prefSize(editor);
           Dimension n = prefSize(next);
           Dimension p = prefSize(previous);
-	  Dimension s = parent.getSize();
+          Dimension s = parent.getSize();
 
           int x = l2r ? i.left : i.right;
           int y = i.top;
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
index 95468caa972..53f7db6e794 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneDivider.java
@@ -61,7 +61,7 @@ import javax.swing.border.Border;
 /**
  * The divider that separates the two parts of a JSplitPane in the Basic look
  * and feel.
- * 
+ *
  * 
                      
  * Implementation status: We do not have a real implementation yet. Currently,
  * it is mostly a stub to allow compiling other parts of the
@@ -138,62 +138,62 @@ public class BasicSplitPaneDivider extends Container
     public void paint(Graphics g)
     {
       if (splitPane != null)
-	{
-	  // Fill background.
-	  g.setColor(splitPane.getBackground());
-	  g.fillRect(0, 0, getWidth(), getHeight());
+        {
+          // Fill background.
+          g.setColor(splitPane.getBackground());
+          g.fillRect(0, 0, getWidth(), getHeight());
 
-	  // Draw arrow.
-	  int size;
-	  if (direction == LEFT)
-	    {
-	      if (orientation == JSplitPane.VERTICAL_SPLIT)
-		{
-		  size = Math.min(getHeight(), ONE_TOUCH_SIZE);
-		  xpoints[0] = 0;
-		  xpoints[1] = size / 2;
-		  xpoints[2] = size;
-		  ypoints[0] = size;
-		  ypoints[1] = 0;
-		  ypoints[2] = size;
-		}
-	      else
-		{
-		  size = Math.min(getWidth(), ONE_TOUCH_SIZE);
-		  xpoints[0] = size;
-		  xpoints[1] = 0;
-		  xpoints[2] = size;
-		  ypoints[0] = 0;
-		  ypoints[1] = size / 2;
-		  ypoints[2] = size;
-		}
-	    }
-	  else
-	    {
-	      if (orientation == JSplitPane.VERTICAL_SPLIT)
-		{
-		  size = Math.min(getHeight(), ONE_TOUCH_SIZE);
-		  xpoints[0] = 0;
-		  xpoints[1] = size / 2;
-		  xpoints[2] = size;
-		  ypoints[0] = 0;
-		  ypoints[1] = size;
-		  ypoints[2] = 0;
-		}
-	      else
-		{
-		  size = Math.min(getWidth(), ONE_TOUCH_SIZE);
-		  xpoints[0] = 0;
-		  xpoints[1] = size;
-		  xpoints[2] = 0;
-		  ypoints[0] = 0;
-		  ypoints[1] = size / 2;
-		  ypoints[2] = size;
-		}
-	    }
-	  g.setColor(Color.BLACK);
-	  g.fillPolygon(xpoints, ypoints, 3);
-	}
+          // Draw arrow.
+          int size;
+          if (direction == LEFT)
+            {
+              if (orientation == JSplitPane.VERTICAL_SPLIT)
+                {
+                  size = Math.min(getHeight(), ONE_TOUCH_SIZE);
+                  xpoints[0] = 0;
+                  xpoints[1] = size / 2;
+                  xpoints[2] = size;
+                  ypoints[0] = size;
+                  ypoints[1] = 0;
+                  ypoints[2] = size;
+                }
+              else
+                {
+                  size = Math.min(getWidth(), ONE_TOUCH_SIZE);
+                  xpoints[0] = size;
+                  xpoints[1] = 0;
+                  xpoints[2] = size;
+                  ypoints[0] = 0;
+                  ypoints[1] = size / 2;
+                  ypoints[2] = size;
+                }
+            }
+          else
+            {
+              if (orientation == JSplitPane.VERTICAL_SPLIT)
+                {
+                  size = Math.min(getHeight(), ONE_TOUCH_SIZE);
+                  xpoints[0] = 0;
+                  xpoints[1] = size / 2;
+                  xpoints[2] = size;
+                  ypoints[0] = 0;
+                  ypoints[1] = size;
+                  ypoints[2] = 0;
+                }
+              else
+                {
+                  size = Math.min(getWidth(), ONE_TOUCH_SIZE);
+                  xpoints[0] = 0;
+                  xpoints[1] = size;
+                  xpoints[2] = 0;
+                  ypoints[0] = 0;
+                  ypoints[1] = size / 2;
+                  ypoints[2] = size;
+                }
+            }
+          g.setColor(Color.BLACK);
+          g.fillPolygon(xpoints, ypoints, 3);
+        }
     }
   }
 
@@ -212,66 +212,66 @@ public class BasicSplitPaneDivider extends Container
       int newLoc;
 
       if (ev.getSource() == leftButton)
-	{
-	  if (orientation == JSplitPane.VERTICAL_SPLIT)
-	    {
-	      if (currentLoc
-		  >= splitPane.getHeight() - insets.bottom - getHeight())
-		{
-		  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
-				    lastLoc);
-		}
-	      else
-		{
-		  newLoc = insets.top;
-		}
-	    }
-	  else
-	    {
-	      if (currentLoc
-		  >= splitPane.getWidth() - insets.right - getWidth())
-		{
-		  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
-				    lastLoc);
-		}
-	      else
-		{
-		  newLoc = insets.left;
-		}
-	    }
-	}
+        {
+          if (orientation == JSplitPane.VERTICAL_SPLIT)
+            {
+              if (currentLoc
+                  >= splitPane.getHeight() - insets.bottom - getHeight())
+                {
+                  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+                                    lastLoc);
+                }
+              else
+                {
+                  newLoc = insets.top;
+                }
+            }
+          else
+            {
+              if (currentLoc
+                  >= splitPane.getWidth() - insets.right - getWidth())
+                {
+                  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+                                    lastLoc);
+                }
+              else
+                {
+                  newLoc = insets.left;
+                }
+            }
+        }
       else
-	{
-	  if (orientation == JSplitPane.VERTICAL_SPLIT)
-	    {
-	      if (currentLoc == insets.top)
-		{
-		  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
-				    lastLoc);
-		}
-	      else
-		{
-		  newLoc = splitPane.getHeight() - insets.top - getHeight();
-		}
-	    }
-	  else
-	    {
-	      if (currentLoc == insets.left)
-		{
-		  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
-				    lastLoc);
-		}
-	      else
-		{
-		  newLoc = splitPane.getWidth() - insets.left - getWidth();
-		}
-	    }
-	}
+        {
+          if (orientation == JSplitPane.VERTICAL_SPLIT)
+            {
+              if (currentLoc == insets.top)
+                {
+                  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+                                    lastLoc);
+                }
+              else
+                {
+                  newLoc = splitPane.getHeight() - insets.top - getHeight();
+                }
+            }
+          else
+            {
+              if (currentLoc == insets.left)
+                {
+                  newLoc = Math.min(splitPane.getMaximumDividerLocation(),
+                                    lastLoc);
+                }
+              else
+                {
+                  newLoc = splitPane.getWidth() - insets.left - getWidth();
+                }
+            }
+        }
       if (currentLoc != newLoc)
-	{
-	  splitPane.setDividerLocation(newLoc);
-	  splitPane.setLastDividerLocation(currentLoc);
-	}
+        {
+          splitPane.setDividerLocation(newLoc);
+          splitPane.setLastDividerLocation(currentLoc);
+        }
     }
   }
 
@@ -315,7 +315,7 @@ public class BasicSplitPaneDivider extends Container
   /**
    * The listener for handling mouse events from both the divider and the
    * containing JSplitPane.
-   * 
+   *
    * 
                      
    * The reason for also handling MouseEvents from the containing
    * JSplitPane is that users should be able to start a drag
@@ -398,11 +398,11 @@ public class BasicSplitPaneDivider extends Container
     /* Remove the connection to the existing JSplitPane. */
     if (splitPane != null)
       {
-	splitPane.removePropertyChangeListener(this);
-	removeMouseListener(mouseHandler);
-	removeMouseMotionListener(mouseHandler);
-	splitPane = null;
-	hiddenDivider = null;
+        splitPane.removePropertyChangeListener(this);
+        removeMouseListener(mouseHandler);
+        removeMouseMotionListener(mouseHandler);
+        splitPane = null;
+        hiddenDivider = null;
       }
 
     /* Establish the connection to the new JSplitPane. */
@@ -411,11 +411,11 @@ public class BasicSplitPaneDivider extends Container
       splitPane = newUI.getSplitPane();
     if (splitPane != null)
       {
-	splitPane.addPropertyChangeListener(this);
-	addMouseListener(mouseHandler);
-	addMouseMotionListener(mouseHandler);
-	hiddenDivider = splitPaneUI.getNonContinuousLayoutDivider();
-	orientation = splitPane.getOrientation();
+        splitPane.addPropertyChangeListener(this);
+        addMouseListener(mouseHandler);
+        addMouseMotionListener(mouseHandler);
+        hiddenDivider = splitPaneUI.getNonContinuousLayoutDivider();
+        orientation = splitPane.getOrientation();
         if (splitPane.isOneTouchExpandable())
           oneTouchExpandableChanged();
       }
@@ -465,9 +465,9 @@ public class BasicSplitPaneDivider extends Container
   {
     if (border != this.border)
       {
-	Border oldValue = this.border;
-	this.border = border;
-	firePropertyChange("border", oldValue, border);
+        Border oldValue = this.border;
+        this.border = border;
+        firePropertyChange("border", oldValue, border);
       }
   }
 
@@ -539,7 +539,7 @@ public class BasicSplitPaneDivider extends Container
       oneTouchExpandableChanged();
     else if (e.getPropertyName().equals(JSplitPane.ORIENTATION_PROPERTY))
       {
-	orientation = splitPane.getOrientation();
+        orientation = splitPane.getOrientation();
         invalidate();
         if (splitPane != null)
           splitPane.revalidate();
@@ -560,8 +560,8 @@ public class BasicSplitPaneDivider extends Container
     super.paint(g);
     if (border != null)
       {
-	dividerSize = getSize();
-	border.paintBorder(this, g, 0, 0, dividerSize.width, dividerSize.height);
+        dividerSize = getSize();
+        border.paintBorder(this, g, 0, 0, dividerSize.width, dividerSize.height);
       }
   }
 
@@ -573,20 +573,20 @@ public class BasicSplitPaneDivider extends Container
   {
     if (splitPane.isOneTouchExpandable())
       {
-	leftButton = createLeftOneTouchButton();
-	if (leftButton != null)
-	  leftButton.addActionListener(new OneTouchAction());
+        leftButton = createLeftOneTouchButton();
+        if (leftButton != null)
+          leftButton.addActionListener(new OneTouchAction());
 
-	rightButton = createRightOneTouchButton();
-	if (rightButton != null)
-	  rightButton.addActionListener(new OneTouchAction());
+        rightButton = createRightOneTouchButton();
+        if (rightButton != null)
+          rightButton.addActionListener(new OneTouchAction());
 
-	// Only add them when both are non-null.
-	if (leftButton != null && rightButton != null)
+        // Only add them when both are non-null.
+        if (leftButton != null && rightButton != null)
           {
             add(leftButton);
             add(rightButton);
-	  }
+          }
       }
     invalidate();
     if (splitPane != null)
@@ -678,28 +678,28 @@ public class BasicSplitPaneDivider extends Container
     switch (locationIndex)
       {
       case 1:
-	splitPane.setDividerLocation(splitPane.getLastDividerLocation());
-	break;
+        splitPane.setDividerLocation(splitPane.getLastDividerLocation());
+        break;
       case 0:
-	int top = (orientation == JSplitPane.HORIZONTAL_SPLIT) ? insets.left
-	                                                       : insets.top;
-	splitPane.setDividerLocation(top);
-	break;
+        int top = (orientation == JSplitPane.HORIZONTAL_SPLIT) ? insets.left
+                                                               : insets.top;
+        splitPane.setDividerLocation(top);
+        break;
       case 2:
-	int bottom;
-	if (orientation == JSplitPane.HORIZONTAL_SPLIT)
-	  bottom = splitPane.getBounds().width - insets.right - dividerSize;
-	else
-	  bottom = splitPane.getBounds().height - insets.bottom - dividerSize;
-	splitPane.setDividerLocation(bottom);
-	break;
+        int bottom;
+        if (orientation == JSplitPane.HORIZONTAL_SPLIT)
+          bottom = splitPane.getBounds().width - insets.right - dividerSize;
+        else
+          bottom = splitPane.getBounds().height - insets.bottom - dividerSize;
+        splitPane.setDividerLocation(bottom);
+        break;
       }
   }
 
   /**
    * The listener for handling mouse events from both the divider and the
    * containing JSplitPane.
-   * 
+   *
    * 
                      
    * The reason for also handling MouseEvents from the containing
    * JSplitPane is that users should be able to start a drag
@@ -724,9 +724,9 @@ public class BasicSplitPaneDivider extends Container
       isDragging = true;
       currentDividerLocation = 1;
       if (orientation == JSplitPane.HORIZONTAL_SPLIT)
-	dragger = new DragController(e);
+        dragger = new DragController(e);
       else
-	dragger = new VerticalDragController(e);
+        dragger = new VerticalDragController(e);
       prepareForDragging();
     }
 
@@ -836,7 +836,7 @@ public class BasicSplitPaneDivider extends Container
     protected void continueDrag(int newX, int newY)
     {
       if (isValid())
-	dragDividerTo(adjust(newX, newY));
+        dragDividerTo(adjust(newX, newY));
     }
 
     /**
@@ -848,7 +848,7 @@ public class BasicSplitPaneDivider extends Container
     protected void continueDrag(MouseEvent e)
     {
       if (isValid())
-	dragDividerTo(positionForMouseEvent(e));
+        dragDividerTo(positionForMouseEvent(e));
     }
 
     /**
@@ -1000,7 +1000,7 @@ public class BasicSplitPaneDivider extends Container
                       x = insets.left;
                       y = 0;
                     }
-                  
+
                   leftButton.setBounds(x, y + ONE_TOUCH_OFFSET, size,
                                        size * 2);
                   rightButton.setBounds(x, y + ONE_TOUCH_OFFSET
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
index b7cc425482d..ca960751538 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicSplitPaneUI.java
@@ -89,7 +89,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
     // 3 components at a time.
     // LEFT/TOP = 0
     // RIGHT/BOTTOM = 1
-    // DIVIDER = 2    
+    // DIVIDER = 2
 
     /**
      * This array contains the components in the JSplitPane. The  left/top
@@ -338,7 +338,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
           // Layout divider.
           loc += sizes[0];
           setComponentToSize(components[2], sizes[2], loc, insets, dims);
-          // Layout component#2. 
+          // Layout component#2.
           loc += sizes[2];
           setComponentToSize(components[1], sizes[1], loc, insets, dims);
         }
@@ -483,7 +483,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
      */
     protected void setComponentToSize(Component c, int size, int location,
                                       Insets insets, Dimension containerSize)
-    { 
+    {
       if (insets != null)
         {
           if (axis == SwingConstants.HORIZONTAL)
@@ -752,7 +752,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
           tmpSizes[0] += newSpace / 2;
           tmpSizes[1] += newSpace / 2;
-      
+
           layoutManager.setSizes(tmpSizes);
         }
       else if (e.getPropertyName().equals(JSplitPane.ORIENTATION_PROPERTY))
@@ -986,12 +986,12 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
   /**
    * Returns the input map for the specified condition.
-   * 
+   *
    * @param condition  the condition.
-   * 
+   *
    * @return The input map.
    */
-  InputMap getInputMap(int condition) 
+  InputMap getInputMap(int condition)
   {
     if (condition == JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
       return (InputMap) UIManager.get("SplitPane.ancestorInputMap");
@@ -1000,12 +1000,12 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
   /**
    * Returns the action map for the {@link JSplitPane}.  All sliders share
-   * a single action map which is created the first time this method is 
+   * a single action map which is created the first time this method is
    * called, then stored in the UIDefaults table for subsequent access.
-   * 
+   *
    * @return The shared action map.
    */
-  ActionMap getActionMap() 
+  ActionMap getActionMap()
   {
     ActionMap map = (ActionMap) UIManager.get("SplitPane.actionMap");
 
@@ -1020,18 +1020,18 @@ public class BasicSplitPaneUI extends SplitPaneUI
 
   /**
    * Creates the action map shared by all {@link JSlider} instances.
-   * This method is called once by {@link #getActionMap()} when it 
-   * finds no action map in the UIDefaults table...after the map is 
-   * created, it gets added to the defaults table so that subsequent 
-   * calls to {@link #getActionMap()} will return the same shared 
+   * This method is called once by {@link #getActionMap()} when it
+   * finds no action map in the UIDefaults table...after the map is
+   * created, it gets added to the defaults table so that subsequent
+   * calls to {@link #getActionMap()} will return the same shared
    * instance.
-   * 
+   *
    * @return The action map.
    */
   ActionMap createActionMap()
   {
     ActionMap map = new ActionMapUIResource();
-    map.put("toggleFocus", 
+    map.put("toggleFocus",
             new AbstractAction("toggleFocus") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1039,7 +1039,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
               }
             }
     );
-    map.put("startResize", 
+    map.put("startResize",
             new AbstractAction("startResize") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1047,7 +1047,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
               }
             }
     );
-    map.put("selectMax", 
+    map.put("selectMax",
             new AbstractAction("selectMax") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1055,7 +1055,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
               }
             }
     );
-    map.put("selectMin", 
+    map.put("selectMin",
             new AbstractAction("selectMin") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1063,7 +1063,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
               }
             }
     );
-    map.put("negativeIncrement", 
+    map.put("negativeIncrement",
             new AbstractAction("negativeIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1074,7 +1074,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
               }
             }
     );
-    map.put("positiveIncrement", 
+    map.put("positiveIncrement",
             new AbstractAction("positiveIncrement") {
               public void actionPerformed(ActionEvent event)
               {
@@ -1092,7 +1092,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
                 // FIXME: implement this
               }
             }
-    );    
+    );
     map.put("focusOutForward",
             new AbstractAction("focusOutForward") {
               public void actionPerformed(ActionEvent event)
@@ -1100,7 +1100,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
                 // FIXME: implement this
               }
             }
-    );    
+    );
     return map;
   }
 
@@ -1112,7 +1112,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
   {
     InputMap keyMap = getInputMap(
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-    SwingUtilities.replaceUIInputMap(splitPane, 
+    SwingUtilities.replaceUIInputMap(splitPane,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, keyMap);
     ActionMap map = getActionMap();
     SwingUtilities.replaceUIActionMap(splitPane, map);
@@ -1124,7 +1124,7 @@ public class BasicSplitPaneUI extends SplitPaneUI
   protected void uninstallKeyboardActions()
   {
     SwingUtilities.replaceUIActionMap(splitPane, null);
-    SwingUtilities.replaceUIInputMap(splitPane, 
+    SwingUtilities.replaceUIInputMap(splitPane,
         JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index fe360214c2f..c42f9caed99 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -82,7 +82,7 @@ import javax.swing.text.View;
 
 /**
  * This is the Basic Look and Feel's UI delegate for JTabbedPane.
- * 
+ *
  * @author Lillian Angel (langel@redhat.com)
  * @author Kim Ho (kho@redhat.com)
  * @author Roman Kennke (kennke@aicas.com)
@@ -90,11 +90,11 @@ import javax.swing.text.View;
  */
 public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
 {
-  
+
   static class NavigateAction extends AbstractAction
   {
     int direction;
-    
+
     NavigateAction(String name, int dir)
     {
       super(name);
@@ -108,9 +108,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
 
       ui.navigateSelectedTab(direction);
     }
-  
+
   }
-  
+
   static class NavigatePageDownAction extends AbstractAction
   {
 
@@ -123,17 +123,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     {
       JTabbedPane tp = (JTabbedPane) event.getSource();
       BasicTabbedPaneUI ui = (BasicTabbedPaneUI) tp.getUI();
-      
+
       int i = tp.getSelectedIndex();
-      
+
       if (i < 0)
         i = 0;
-      
+
       ui.selectNextTabInRun(i);
     }
-    
+
   }
-  
+
   static class NavigatePageUpAction extends AbstractAction
   {
 
@@ -146,17 +146,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     {
       JTabbedPane tp = (JTabbedPane) event.getSource();
       BasicTabbedPaneUI ui = (BasicTabbedPaneUI) tp.getUI();
-      
+
       int i = tp.getSelectedIndex();
-      
+
       if (i < 0)
         i = 0;
-      
+
       ui.selectPreviousTabInRun(i);
 
-    }    
+    }
   }
-  
+
   static class RequestFocusAction extends AbstractAction
   {
 
@@ -169,7 +169,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     {
       ((JTabbedPane) event.getSource()).requestFocus();
     }
-    
+
   }
 
   static class RequestFocusForVisibleComponentAction extends AbstractAction
@@ -183,18 +183,18 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     public void actionPerformed(ActionEvent event)
     {
       JTabbedPane tp = (JTabbedPane) event.getSource();
-      
+
       // FIXME: This should select a suitable component within
       // the tab content. However I dont know whether we have
       // to search for this component or wether the called is
       // supposed to do that.
       tp.getSelectedComponent().requestFocus();
     }
-    
+
   }
 
   /**
-   * A helper class that handles focus. 
+   * A helper class that handles focus.
    * 
                      The purpose of this class is to implement a more flexible focus
    * handling for the tabbed pane, which is used to determine whether the
    * focus indicator should be painted or not. When in scrolling layout
@@ -262,7 +262,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           e.setSource(s);
         }
     }
-    
+
     /**
      * This method is called when the mouse is pressed. The index cannot
      * change to a tab that is  not enabled.
@@ -281,9 +281,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           redispatchEvent(e);
           e.setSource(s);
         }
-      
+
       int placement = tabPane.getTabPlacement();
-    
+
       if (s == incrButton)
         {
           if(!incrButton.isEnabled())
@@ -294,7 +294,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           switch (placement)
             {
               case JTabbedPane.TOP:
-              case JTabbedPane.BOTTOM: 
+              case JTabbedPane.BOTTOM:
                 currentScrollOffset = getTabAreaInsets(placement).left;
                 for (int i = 0; i < currentScrollLocation; i++)
                   currentScrollOffset += rects[i].width;
@@ -305,30 +305,30 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                   currentScrollOffset += rects[i].height;
                 break;
             }
-            
+
           updateViewPosition();
           updateButtons();
-        
+
           tabPane.repaint();
         }
       else if (s == decrButton)
         {
           if(!decrButton.isEnabled())
             return;
-        
+
            // The scroll location may be zero but the offset
            // greater than zero because of an adjustement to
            // make a partially visible tab completely visible.
            if (currentScrollLocation > 0)
              currentScrollLocation--;
-        
+
            // Set the offset back to 0 and recompute it.
            currentScrollOffset = 0;
 
            switch (placement)
              {
                case JTabbedPane.TOP:
-               case JTabbedPane.BOTTOM: 
+               case JTabbedPane.BOTTOM:
                  // Take the tab area inset into account.
                  if (currentScrollLocation > 0)
                    currentScrollOffset = getTabAreaInsets(placement).left;
@@ -340,14 +340,14 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                  // Take the tab area inset into account.
                  if (currentScrollLocation > 0)
                    currentScrollOffset = getTabAreaInsets(placement).top;
-                
+
                  for (int i = 0; i < currentScrollLocation; i++)
                    currentScrollOffset += rects[i].height;
-             }          
-        
+             }
+
            updateViewPosition();
            updateButtons();
-        
+
            tabPane.repaint();
         }
       else if (tabPane.isEnabled())
@@ -355,12 +355,12 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           int index = tabForCoordinate(tabPane, e.getX(), e.getY());
           if (!tabPane.isEnabledAt(index))
             return;
-          
+
           if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT
               && s == panel)
             {
               scrollTab(index, placement);
-              
+
               tabPane.setSelectedIndex(index);
               tabPane.repaint();
             }
@@ -370,9 +370,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               tabPane.revalidate();
               tabPane.repaint();
             }
-          
+
         }
-      
+
     }
 
     /**
@@ -393,7 +393,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           redispatchEvent(e);
           e.setSource(s);
         }
-      
+
       int tabIndex = tabForCoordinate(tabPane, e.getX(), e.getY());
       setRolloverTab(tabIndex);
     }
@@ -416,7 +416,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           redispatchEvent(e);
           e.setSource(s);
         }
-      
+
       setRolloverTab(-1);
     }
 
@@ -434,17 +434,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         {
           ev.setSource(tabPane);
           tabPane.dispatchEvent(ev);
-          
+
           ev.setSource(s);
         }
 
       int tabIndex = tabForCoordinate(tabPane, ev.getX(), ev.getY());
       setRolloverTab(tabIndex);
     }
-    
-    /** Modifies the mouse event to originate from 
+
+    /** Modifies the mouse event to originate from
      * the tabbed pane and redispatches it.
-     * 
+     *
      * @param me
      */
     void redispatchEvent(MouseEvent me)
@@ -455,10 +455,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       viewPos.y -= viewport.getY();
       me.translatePoint(-viewPos.x, -viewPos.y);
       tabPane.dispatchEvent(me);
-      
+
       me.translatePoint(viewPos.x, viewPos.y);
     }
-    
+
   }
 
   /**
@@ -483,18 +483,18 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           if (e.getPropertyName().equals("tabLayoutPolicy"))
             {
               currentScrollLocation = currentScrollOffset = 0;
-              
+
               layoutManager = createLayoutManager();
-              
+
               tabPane.setLayout(layoutManager);
             }
           else if (e.getPropertyName().equals("tabPlacement")
-                   && tabPane.getTabLayoutPolicy() 
+                   && tabPane.getTabLayoutPolicy()
                    == JTabbedPane.SCROLL_TAB_LAYOUT)
             {
               incrButton = createIncreaseButton();
               decrButton = createDecreaseButton();
-              
+
               // If the tab placement value was changed of a tabbed pane
               // in SCROLL_TAB_LAYOUT mode we investigate the change to
               // implement the following behavior which was observed in
@@ -502,7 +502,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               // The scrolling offset will be reset if we change to
               // a direction which is orthogonal to the current
               // direction and stays the same if it is parallel.
-              
+
               int oldPlacement = ((Integer) e.getOldValue()).intValue();
               int newPlacement = ((Integer) e.getNewValue()).intValue();
               switch (newPlacement)
@@ -512,22 +512,22 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                     if (oldPlacement == JTabbedPane.TOP
                         || oldPlacement == JTabbedPane.BOTTOM)
                       break out;
-                  
+
                     currentScrollOffset = getTabAreaInsets(newPlacement).left;
                     break;
                   default:
                     if (oldPlacement == JTabbedPane.LEFT
                        || oldPlacement == JTabbedPane.RIGHT)
                       break out;
-                  
+
                     currentScrollOffset = getTabAreaInsets(newPlacement).top;
                 }
-              
+
               updateViewPosition();
               updateButtons();
             }
         }
-    
+
       tabPane.revalidate();
       tabPane.repaint();
     }
@@ -592,7 +592,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           c = tabPane.getComponentAt(i);
           if (c == null)
             continue;
-          dims = minimum ? c.getMinimumSize() : c.getPreferredSize(); 
+          dims = minimum ? c.getMinimumSize() : c.getPreferredSize();
           if (dims != null)
             {
               height = Math.max(height, dims.height);
@@ -605,7 +605,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           || tabPlacement == SwingConstants.BOTTOM)
         {
           width = Math.max(calculateMaxTabWidth(tabPlacement), width);
-          
+
           height += preferredTabAreaHeight(tabPlacement,
                                            width - tabAreaInsets.left
                                            - tabAreaInsets.right);
@@ -613,7 +613,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       else
         {
           height = Math.max(calculateMaxTabHeight(tabPlacement), height);
-          
+
           width += preferredTabAreaWidth(tabPlacement,
                                          height - tabAreaInsets.top
                                          - tabAreaInsets.bottom);
@@ -648,7 +648,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       Insets insets = tabPane.getInsets();
       Insets tabAreaInsets = getTabAreaInsets(tabPlacement);
       Dimension size = tabPane.getSize();
-      
+
       // The coordinates of the upper left corner of the tab area.
       int x;
       int y;
@@ -787,11 +787,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               rotateTabRuns(tabPlacement, selectedRun);
             }
         }
-      
+
       // Suppress padding if we have only one tab run.
       if (runCount == 1)
         return;
-      
+
       // Pad the runs.
       int tabRunOverlay = getTabRunOverlay(tabPlacement);
       for (int i = runCount - 1; i >= 0; --i)
@@ -838,7 +838,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                 x -= maxTabWidth - tabRunOverlay;
               else
                 x += maxTabWidth - tabRunOverlay;
-              
+
             }
         }
       padSelectedTab(tabPlacement, selectedIndex);
@@ -859,13 +859,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       Insets insets = tabPane.getInsets();
 
       int selectedIndex = tabPane.getSelectedIndex();
-      
+
       Component selectedComponent = null;
       if (selectedIndex >= 0)
         selectedComponent = tabPane.getComponentAt(selectedIndex);
       // The RI doesn't seem to change the component if the new selected
       // component == null. This is probably so that applications can add
-      // one single component for every tab. 
+      // one single component for every tab.
       if (selectedComponent != null)
         {
           setVisibleComponent(selectedComponent);
@@ -892,7 +892,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               compX = insets.left + contentBorderInsets.left;
               compY = insets.top + contentBorderInsets.top;
               break;
-            case BOTTOM: 
+            case BOTTOM:
               tabAreaHeight = calculateTabAreaHeight(tabPlacement, runCount,
                                                      maxTabHeight);
               compX = insets.left + contentBorderInsets.left;
@@ -902,7 +902,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             default:
               tabAreaHeight = calculateTabAreaHeight(tabPlacement, runCount,
                                                      maxTabHeight);
-            
+
               compX = insets.left + contentBorderInsets.left;
               compY = tabAreaHeight + insets.top + contentBorderInsets.top;
           }
@@ -938,9 +938,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     // If there is more free space in an adjacent run AND the tab
     // in the run can fit in the adjacent run, move it. This method
     // is not perfect, it is merely an approximation.
-    // If you play around with Sun's JTabbedPane, you'll see that 
-    // it does do some pretty strange things with regards to not moving tabs 
-    // that should be moved. 
+    // If you play around with Sun's JTabbedPane, you'll see that
+    // it does do some pretty strange things with regards to not moving tabs
+    // that should be moved.
     // start = the x position where the tabs will begin
     // max = the maximum position of where the tabs can go to
     // (tabAreaInsets.left + the width of the tab area)
@@ -1046,7 +1046,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           int runWidth = rects[end].x + rects[end].width;
           int spaceRemaining = max - runWidth;
           int numTabs = end - start + 1;
-          
+
           // now divvy up the space.
           int spaceAllocated = spaceRemaining / numTabs;
           int currX = rects[start].x;
@@ -1054,13 +1054,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             {
               rects[i].x = currX;
               rects[i].width += spaceAllocated;
-              
+
               currX += rects[i].width;
-              // This is used because since the spaceAllocated 
+              // This is used because since the spaceAllocated
               // variable is an int, it rounds down. Sometimes,
               // we don't fill an entire row, so we make it do
               // so now.
-              
+
               if (i == end && rects[i].x + rects[i].width != max)
                 rects[i].width = max - rects[i].x;
             }
@@ -1332,11 +1332,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           for (int i = 0; i < tabCount; i++)
             {
               width = calculateTabWidth(tabPlacement, i, fm);
-              
+
               // The proper instances should exists because
               //  assureRectsCreated() was being run already.
               rects[i].setBounds(runWidth, top, width, maxHeight);
-              
+
               runWidth += width;
             }
           tabAreaRect.width = tabPane.getWidth() - insets.left - insets.right;
@@ -1396,7 +1396,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               tabAreaRect.x = contentRect.x + contentRect.width;
             }
         }
-      
+
       // Unlike the behavior in the WRAP_TAB_LAYOUT the selected
       // tab is not padded specially.
     }
@@ -1415,7 +1415,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       if (tabCount == 0)
         return;
       int tabPlacement = tabPane.getTabPlacement();
-      
+
       if (tabPlacement == SwingConstants.TOP
           || tabPlacement == SwingConstants.BOTTOM)
         {
@@ -1452,11 +1452,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                                        - incrDims.height,
                                        incrDims.width, incrDims.height);
                 }
-              
+
               tabAreaRect.width -= decrDims.width + incrDims.width;
-              
+
               updateButtons();
-              
+
               incrButton.setVisible(true);
               decrButton.setVisible(true);
             }
@@ -1464,7 +1464,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             {
               incrButton.setVisible(false);
               decrButton.setVisible(false);
-              
+
               currentScrollOffset = 0;
               currentScrollLocation = 0;
             }
@@ -1524,9 +1524,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         }
       viewport.setBounds(tabAreaRect.x, tabAreaRect.y, tabAreaRect.width,
                          tabAreaRect.height);
-      
+
       updateViewPosition();
-      
+
       viewport.repaint();
     }
   }
@@ -1550,7 +1550,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     {
       selectedRun = getRunForTab(tabPane.getTabCount(),
                                  tabPane.getSelectedIndex());
-      
+
       if (tabPane.getTabLayoutPolicy() == JTabbedPane.WRAP_TAB_LAYOUT)
         tabPane.revalidate();
       tabPane.repaint();
@@ -1587,7 +1587,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         else
           g.fillRect(0, currentScrollOffset,
                      tabAreaRect.width, tabAreaRect.height);
-    
+
         paintTabArea(g, placement, tabPane.getSelectedIndex());
       }
     }
@@ -1649,7 +1649,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   /** The starting visible tab in the run in SCROLL_TAB_MODE.
    * This is package-private to avoid an accessor method.  */
   transient int currentScrollLocation;
-  
+
   transient int currentScrollOffset;
 
   /** A reusable rectangle. */
@@ -1789,13 +1789,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
    * The currently visible component.
    */
   private Component visibleComponent;
-  
+
   private Color selectedColor;
-  
+
   private Rectangle tempTextRect = new Rectangle();
-  
+
   private Rectangle tempIconRect = new Rectangle();
-  
+
   /**
    * Creates a new BasicTabbedPaneUI object.
    */
@@ -1884,10 +1884,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     Point p = new Point(w, h);
     return p;
   }
-  
+
   /** TabbedPanes in scrolling mode should use this method to
    * scroll properly to the tab given by the index argument.
-   * 
+   *
    * @param index The tab to scroll to.
    * @param placement The tab's placement.
    */
@@ -1902,7 +1902,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         switch (placement)
           {
             case JTabbedPane.TOP:
-            case JTabbedPane.BOTTOM:                   
+            case JTabbedPane.BOTTOM:
               if ((diff = rects[index].x
                   + rects[index].width
                   - decrButton.getX() - currentScrollOffset) > 0)
@@ -1930,17 +1930,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                   else
                     currentScrollOffset += diff;
                 }
-  
+
               currentScrollLocation = tabForCoordinate(tabPane,
                                                        rects[index].x,
                                                        currentScrollOffset);
           }
-    
+
         updateViewPosition();
         updateButtons();
       }
   }
-  
+
   /** Sets the enabled state of the increase and decrease button
    * according to the current scrolling offset and tab pane width
    * (or height in TOP/BOTTOM placement).
@@ -1948,7 +1948,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   final void updateButtons()
   {
     int tc = tabPane.getTabCount();
-    
+
     // The increase button should be enabled as long as the
     // right/bottom border of the last tab is under the left/top
     // border of the decrease button.
@@ -1978,7 +1978,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   final void updateViewPosition()
   {
     Point p = viewport.getViewPosition();
-    
+
     // The unneeded coordinate must be set to zero
     // in order to correctly handle placement changes.
     switch (tabPane.getTabPlacement())
@@ -1992,10 +1992,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         p.x = currentScrollOffset;
         p.y = 0;
     }
-    
+
     viewport.setViewPosition(p);
   }
-  
+
   /**
    * This method creates a new BasicTabbedPaneUI.
    *
@@ -2019,12 +2019,12 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     if (c instanceof JTabbedPane)
       {
         tabPane = (JTabbedPane) c;
-        
+
         installComponents();
         installDefaults();
         installListeners();
         installKeyboardActions();
-        
+
         layoutManager = createLayoutManager();
         tabPane.setLayout(layoutManager);
       }
@@ -2063,7 +2063,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       {
         runCount = 1;
         tabRuns[0] = 0;
-        
+
         incrButton = createIncreaseButton();
         incrButton.addMouseListener(mouseListener);
 
@@ -2075,16 +2075,16 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         panel.setSize(Integer.MAX_VALUE, Integer.MAX_VALUE);
         panel.addMouseListener(mouseListener);
         panel.addFocusListener(focusListener);
-        
+
         viewport = new ScrollingViewport();
         viewport.setBackground(Color.LIGHT_GRAY);
         viewport.setView(panel);
         viewport.setLayout(null);
-        
+
         tabPane.add(incrButton);
         tabPane.add(decrButton);
         tabPane.add(viewport);
-        
+
         return new TabbedPaneScrollLayout();
       }
   }
@@ -2104,7 +2104,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   {
     if (incrButton != null)
       tabPane.remove(incrButton);
-    
+
     if (decrButton != null)
       tabPane.remove(decrButton);
 
@@ -2140,7 +2140,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     contentBorderInsets
       = UIManager.getInsets("TabbedPane.contentBorderInsets");
     tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
-    
+
     // Although 'TabbedPane.contentAreaColor' is not defined in the defaults
     // of BasicLookAndFeel it is used by this class.
     selectedColor = UIManager.getColor("TabbedPane.contentAreaColor");
@@ -2162,7 +2162,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     tabAreaRect = null;
     contentRect = null;
     tabRuns = null;
-    
+
     tempIconRect = null;
     tempTextRect = null;
 
@@ -2176,7 +2176,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     shadow = null;
     lightHighlight = null;
     highlight = null;
-    
+
     selectedColor = null;
   }
 
@@ -2205,13 +2205,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     tabPane.removePropertyChangeListener(propertyChangeListener);
     tabPane.removeChangeListener(tabChangeListener);
     tabPane.removeMouseListener(mouseListener);
-    
+
     if (incrButton != null)
       incrButton.removeMouseListener(mouseListener);
-    
+
     if (decrButton != null)
       decrButton.removeMouseListener(mouseListener);
-    
+
     if (panel != null)
       {
         panel.removeMouseListener(mouseListener);
@@ -2277,7 +2277,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       .replaceUIInputMap(tabPane,
                          JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT,
                          keyMap);
-    
+
     ActionMap map = getActionMap();
     SwingUtilities.replaceUIActionMap(tabPane, map);
   }
@@ -2332,11 +2332,11 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
 
     if (tabPane.getTabCount() == 0)
       return;
-    
+
     int index = tabPane.getSelectedIndex();
     if (index < 0)
       index = 0;
-    
+
     int tabPlacement = tabPane.getTabPlacement();
 
     // Paint the tab area only in WRAP_TAB_LAYOUT Mode from this method
@@ -2349,7 +2349,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                    tabAreaRect.width, tabAreaRect.height);
         paintTabArea(g, tabPlacement, index);
       }
-    
+
     paintContentBorder(g, tabPlacement, index);
   }
 
@@ -2363,9 +2363,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
    */
   protected void paintTabArea(Graphics g, int tabPlacement, int selectedIndex)
   {
-    // Please note: the ordering of the painting is important. 
+    // Please note: the ordering of the painting is important.
     // we WANT to paint the outermost run first and then work our way in.
-    
+
     // The following drawing code works for both tab layouts.
     int tabCount = tabPane.getTabCount();
 
@@ -2387,7 +2387,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
               }
           }
       }
-    
+
     // Paint selected tab in front of every other tab.
     if (selectedIndex >= 0)
       paintTab(g, tabPlacement, rects, selectedIndex,
@@ -2430,10 +2430,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     // Paint the text.
     paintText(g, tabPlacement, tabPane.getFont(), fm, tabIndex, title,
               textRect, isSelected);
-    
+
     // Paint icon if necessary.
     paintIcon(g, tabPlacement, tabIndex, icon, iconRect, isSelected);
-    
+
     // Paint focus indicator.
     paintFocusIndicator(g, tabPlacement, rects, tabIndex, iconRect, textRect,
                         isSelected);
@@ -2675,7 +2675,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
             w = rect.width - 6;
             h = rect.height - 5;
           }
-        
+
         BasicGraphicsUtils.drawDashedRect(g, x, y, w, h);
       }
   }
@@ -2707,44 +2707,44 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         // Outer right line.
         g.drawLine(x + w - 1, y + 2, x + w - 1, y + h);
-        
+
         // Upper right corner.
         g.drawLine(x + w - 2, y + 1, x + w - 1, y + 2);
-            
+
         g.setColor(lightHighlight);
-        
+
         // Left line.
         g.drawLine(x, y + 3, x, y + h);
-            
+
         // Upper line.
         g.drawLine(x + 3, y, x + w - 3, y);
-            
+
         // Upper left corner.
         g.drawLine(x, y + 2, x + 2, y);
-        
+
         break;
       case SwingConstants.LEFT:
         g.setColor(lightHighlight);
         // Top line.
         g.drawLine(x + 3, y, x + w - 1, y);
-        
+
         // Top left border.
         g.drawLine(x + 2, y, x, y + 2);
-        
+
         // Left line.
         g.drawLine(x, y + 3, x, y + h - 4);
-        
+
         // Bottom left corner.
         g.drawLine(x, y + h - 3, x + 1, y + h - 2);
-        
+
         g.setColor(darkShadow);
         // Outer bottom line.
         g.drawLine(x + 2, y + h - 1, x + w - 1, y + h - 1);
-        
+
         g.setColor(shadow);
         // Inner bottom line.
         g.drawLine(x + 2, y + h - 2,  x + w - 1, y + h - 2);
-        
+
         break;
       case SwingConstants.BOTTOM:
         g.setColor(shadow);
@@ -2757,17 +2757,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         // Outer right line.
         g.drawLine(x + w - 1, y, x + w - 1, y + h - 3);
-            
+
         // Bottom right corner.
         g.drawLine(x + w - 1, y + h - 2, x + w - 3, y + h);
-            
+
         // Bottom line.
         g.drawLine(x + 2, y + h, x + w - 4, y + h);
-            
+
         g.setColor(lightHighlight);
         // Left line.
         g.drawLine(x, y, x, y + h - 3);
-            
+
         // Bottom left corner.
         g.drawLine(x, y + h - 2, x + 1, y + h - 1);
         break;
@@ -2775,31 +2775,31 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(lightHighlight);
         // Top line.
         g.drawLine(x, y, x + w - 3, y);
-        
+
         g.setColor(darkShadow);
         // Top right corner.
         g.drawLine(x + w - 2, y + 1, x + w - 1, y + 2);
-        
+
         // Outer right line.
         g.drawLine(x + w - 1, y + 3, x + w - 1, y + h - 3);
-        
+
         // Bottom right corner.
         g.drawLine(x + w - 2, y + h - 2, x + w - 3, y + h - 1);
-        
+
         // Bottom line.
         g.drawLine(x, y + h - 1, x + w - 4, y + h - 1);
-        
+
         g.setColor(shadow);
-        
+
         // Inner right line.
         g.drawLine(x + w - 2, y + 2, x + w - 2, y + h - 3);
-        
+
         // Inner bottom line.
         g.drawLine(x, y + h - 2, x + w - 3, y + h - 2);
-        
+
         break;
     }
-    
+
     g.setColor(saved);
   }
 
@@ -2820,7 +2820,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
                                     boolean isSelected)
   {
     Color saved = g.getColor();
-    
+
     if (isSelected)
       g.setColor(selectedColor);
     else
@@ -2931,17 +2931,17 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       {
         g.drawLine(x, y, startgap, y);
         g.drawLine(endgap, y, x + w - 1, y);
-        
+
         g.setColor(selectedColor);
         g.drawLine(startgap, y, endgap - 1, y);
       }
     else
       g.drawLine(x, y, x + w, y);
-    
+
     g.setColor(selectedColor);
     g.drawLine(x, y + 1, x + w - 1, y + 1);
     g.drawLine(x, y + 2, x + w - 1, y + 2);
-    
+
     g.setColor(saved);
   }
 
@@ -2971,13 +2971,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       {
         g.drawLine(x, y, x, startgap);
         g.drawLine(x, endgap, x, y + h - 1);
-        
+
         g.setColor(selectedColor);
         g.drawLine(x, startgap, x, endgap - 1);
       }
     else
       g.drawLine(x, y, x, y + h - 1);
-    
+
     g.setColor(selectedColor);
     g.drawLine(x + 1, y + 1, x + 1, y + h - 4);
 
@@ -3014,7 +3014,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         g.drawLine(x, y + h - 1, startgap , y + h - 1);
         g.drawLine(endgap, y + h - 1, x + w - 1, y + h - 1);
-        
+
         g.setColor(selectedColor);
         g.drawLine(startgap, y + h - 1, endgap - 1, y + h - 1);
         g.drawLine(startgap, y + h - 2, endgap - 1, y + h - 2);
@@ -3026,7 +3026,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
       }
-    
+
     g.setColor(selectedColor);
     g.drawLine(x + 1, y + h - 3, x + w - 2, y + h - 3);
 
@@ -3062,7 +3062,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         g.drawLine(x + w - 1, y, x + w - 1, startgap);
         g.drawLine(x + w - 1, endgap, x + w - 1, y + h - 2);
-        
+
         g.setColor(selectedColor);
         g.drawLine(x + w - 2, startgap, x + w - 2, endgap - 1);
         g.drawLine(x + w - 1, startgap, x + w - 1, endgap - 1);
@@ -3074,7 +3074,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
         g.setColor(darkShadow);
         g.drawLine(x + w - 1, y, x + w - 1, y + h - 2);
       }
-    
+
     g.setColor(selectedColor);
     g.drawLine(x + w - 3, y + 1, x + w - 3, y + h - 4);
 
@@ -3085,10 +3085,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
    * 
                      This method returns the bounds of a tab for the given index
    * and shifts it by the current scrolling offset if the tabbed
    * pane is in scrolling tab layout mode.
                      
-   * 
+   *
    * 
                      Subclassses should retrievs a tab's bounds by this method
    * if they want to find out whether the tab is currently visible.
                      
-   * 
+   *
    * @param pane The JTabbedPane.
    * @param i The index to look for.
    *
@@ -3099,13 +3099,13 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     // Need to re-layout container if tab does not exist.
     if (i >= rects.length)
       layoutManager.layoutContainer(pane);
-    
+
     // Properly shift coordinates if scrolling has taken
     // place.
     if (pane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
       {
         Rectangle r = new Rectangle(rects[i]);
-        
+
         switch(pane.getTabPlacement())
         {
           case SwingConstants.TOP:
@@ -3115,10 +3115,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
           default:
             r.y -= currentScrollOffset;
         }
-        
+
         return r;
       }
-    
+
     return rects[i];
   }
 
@@ -3148,9 +3148,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     // Note: This code is tab layout mode agnostic.
     if (! tabPane.isValid())
       tabPane.validate();
-    
+
     int tabCount = tabPane.getTabCount();
-    
+
     // If the user clicked outside of any tab rect the
     // selection should not change.
     int index = tabPane.getSelectedIndex();
@@ -3168,7 +3168,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
 
   /**
    * 
                      This method returns the tab bounds in the given rectangle.
                      
-   * 
+   *
    * 
                      The returned rectangle will be shifted by the current scroll
    * offset if the tabbed pane is in scrolling tab layout mode.
                      .
    *
@@ -3652,7 +3652,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   {
     current = getNextTabIndexInRun(tabPane.getTabCount(),
                                    current);
-    
+
     if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
       scrollTab(current, tabPane.getTabPlacement());
 
@@ -3668,7 +3668,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   {
     current = getPreviousTabIndexInRun(tabPane.getTabCount(),
                                        current);
-    
+
     if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
       scrollTab(current, tabPane.getTabPlacement());
 
@@ -3698,7 +3698,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   protected void selectPreviousTab(int current)
   {
     current = getPreviousTabIndex(current);
-    
+
     if (tabPane.getTabLayoutPolicy() == JTabbedPane.SCROLL_TAB_LAYOUT)
       scrollTab(current, tabPane.getTabPlacement());
 
@@ -3825,10 +3825,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     int index = getNextTabIndex(base);
     int run = getRunForTab(tabCount, base);
     if (base == lastTabInRun(tabCount, run))
-      index = (run > 0) 
+      index = (run > 0)
               ? lastTabInRun(tabCount, getPreviousTabRun(run)) + 1
               : 0;
-    
+
     return index;
   }
 
@@ -3847,7 +3847,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
     int run = getRunForTab(tabCount, base);
     if (index == lastTabInRun(tabCount, getPreviousTabRun(run)))
       index = lastTabInRun(tabCount, run);
-    
+
     return index;
   }
 
@@ -3933,8 +3933,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
       break;
     }
   }
-  
-  ActionMap getActionMap() 
+
+  ActionMap getActionMap()
   {
     ActionMap map = (ActionMap) UIManager.get("TabbedPane.actionMap");
 
@@ -3950,25 +3950,25 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants
   ActionMap createActionMap()
   {
     ActionMap map = new ActionMapUIResource();
-    
+
     map.put("navigatePageDown", new NavigatePageDownAction());
     map.put("navigatePageUp", new NavigatePageUpAction());
     map.put("navigateDown",
             new NavigateAction("navigateDown", SwingConstants.SOUTH));
-    
+
     map.put("navigateUp",
             new NavigateAction("navigateUp", SwingConstants.NORTH));
-    
+
     map.put("navigateLeft",
             new NavigateAction("navigateLeft", SwingConstants.WEST));
-    
+
     map.put("navigateRight",
             new NavigateAction("navigateRight", SwingConstants.EAST));
-    
+
     map.put("requestFocusForVisibleComponent",
             new RequestFocusForVisibleComponentAction());
     map.put("requestFocus", new RequestFocusAction());
-    
+
     return map;
   }
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
index 8a8eeb837fe..7ff234e6d44 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java
@@ -71,28 +71,28 @@ public class BasicTableHeaderUI extends TableHeaderUI
    * where mouse cursor changes shape into "resize"
    */
   static int COLUMN_BOUNDARY_TOLERANCE = 3;
-  
+
   public static ComponentUI createUI(JComponent h)
   {
     return new BasicTableHeaderUI();
   }
-  
+
   /**
    * The table header that is using this interface.
    */
   protected JTableHeader header;
-  
+
   /**
    * The mouse input listener, responsible for mouse manipulations with
    * the table header.
    */
   protected MouseInputListener mouseInputListener;
-  
+
   /**
    * Paint the header cell.
    */
   protected CellRendererPane rendererPane;
-  
+
   /**
    * The header cell border.
    */
@@ -102,12 +102,12 @@ public class BasicTableHeaderUI extends TableHeaderUI
    * Original mouse cursor prior to resizing.
    */
   private Cursor originalCursor;
-  
+
   /**
    * If not null, one of the columns is currently being dragged.
    */
   Rectangle draggingHeaderRect;
-  
+
   /**
    * Handles column movement and rearrangement by mouse. The same instance works
    * both as mouse listener and the mouse motion listner.
@@ -117,7 +117,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
   {
     /**
      * If true, the cursor is being already shown in the alternative "resize"
-     * shape. 
+     * shape.
      */
     boolean showingResizeCursor;
 
@@ -127,11 +127,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
      * column dragging).
      */
     int draggingFrom = - 1;
-    
+
     /**
      * The number of the column being dragged.
      */
-    int draggingColumnNumber;    
+    int draggingColumnNumber;
 
     /**
      * The previous preferred width of the column.
@@ -245,7 +245,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
               if (onBoundary)
                 {
 
-		  originalCursor = header.getCursor();
+                  originalCursor = header.getCursor();
                   if (p < x)
                     header.setCursor(Cursor.getPredefinedCursor(
                         Cursor.W_RESIZE_CURSOR));
@@ -351,7 +351,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
 
     /**
      * Stop the dragging session.
-     * 
+     *
      * @param e the "mouse release" mouse event, needed to determing the final
      *          location for the dragged column.
      */
@@ -365,11 +365,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
       // Find where have we dragged the column.
       int x = e.getX();
       int p = 0;
-      
+
       int col = model.getColumnCount() - 1;
       int n = model.getColumnCount();
 
-      // This loop does not find the column if the mouse if out of the 
+      // This loop does not find the column if the mouse if out of the
       // right boundary of the table header. Then we make this column the
       // rightmost column.
       Scan: for (int i = 0; i < n; i++)
@@ -385,17 +385,17 @@ public class BasicTableHeaderUI extends TableHeaderUI
       header.getTable().moveColumn(draggingColumnNumber, col);
     }
   }
- 
+
   /**
    * Create and return the mouse input listener.
-   * 
+   *
    * @return the mouse listener ({@link MouseInputHandler}, if not overridden.
    */
   protected MouseInputListener createMouseInputListener()
   {
     return new MouseInputHandler();
   }
-  
+
   /**
    * Construct a new BasicTableHeaderUI, create mouse listeners.
    */
@@ -448,7 +448,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
   {
     // AFAICS, the RI does nothing here.
   }
-  
+
   /**
    * Remove the previously installed listeners.
    */
@@ -464,9 +464,9 @@ public class BasicTableHeaderUI extends TableHeaderUI
     uninstallKeyboardActions();
     uninstallDefaults();
   }
-  
+
   /**
-   * Repaint the table header. 
+   * Repaint the table header.
    */
   public void paint(Graphics gfx, JComponent c)
   {
@@ -474,7 +474,7 @@ public class BasicTableHeaderUI extends TableHeaderUI
     int ncols = cmod.getColumnCount();
     if (ncols == 0)
       return;
-    
+
     Rectangle clip = gfx.getClipBounds();
     TableCellRenderer defaultRend = header.getDefaultRenderer();
 
@@ -505,38 +505,38 @@ public class BasicTableHeaderUI extends TableHeaderUI
                                         bounds.width, bounds.height);
           }
       }
-    
+
     // This displays a running rectangle that is much simplier than the total
     // animation, as it is seen in Sun's application.
     // TODO animate the collumn dragging like in Sun's jre.
     if (draggingHeaderRect != null)
       {
-        gfx.setColor(header.getForeground()); 
+        gfx.setColor(header.getForeground());
         gfx.drawRect(draggingHeaderRect.x, draggingHeaderRect.y + 2,
             draggingHeaderRect.width - 1, draggingHeaderRect.height - 6);
       }
   }
-  
+
   /**
    * Get the preferred header size.
-   * 
+   *
    * @param ignored unused
-   * 
+   *
    * @return the preferred size of the associated header.
    */
   public Dimension getPreferredSize(JComponent ignored)
   {
     TableColumnModel cmod = header.getColumnModel();
     TableCellRenderer defaultRend = header.getDefaultRenderer();
-    int ncols = cmod.getColumnCount();    
+    int ncols = cmod.getColumnCount();
     Dimension ret = new Dimension(0, 0);
     int spacing = 0;
 
-    if (header.getTable() != null 
+    if (header.getTable() != null
         && header.getTable().getIntercellSpacing() != null)
       spacing = header.getTable().getIntercellSpacing().width;
-    
-    for (int i = 0; i < ncols; ++i)      
+
+    for (int i = 0; i < ncols; ++i)
       {
         TableColumn col = cmod.getColumn(i);
         TableCellRenderer rend = col.getHeaderRenderer();
@@ -556,11 +556,11 @@ public class BasicTableHeaderUI extends TableHeaderUI
 
         Dimension d = comp.getPreferredSize();
         ret.width += spacing;
-        ret.height = Math.max(d.height, ret.height);        
+        ret.height = Math.max(d.height, ret.height);
       }
     ret.width = cmod.getTotalColumnWidth();
     return ret;
   }
-  
-  
+
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
index a672173c725..f5a4bcb670d 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTableUI.java
@@ -82,15 +82,15 @@ import javax.swing.table.TableModel;
 
 public class BasicTableUI extends TableUI
 {
-  public static ComponentUI createUI(JComponent comp) 
+  public static ComponentUI createUI(JComponent comp)
   {
     return new BasicTableUI();
   }
 
-  protected FocusListener focusListener;  
-  protected KeyListener keyListener;   
-  protected MouseInputListener  mouseInputListener;   
-  protected CellRendererPane rendererPane;   
+  protected FocusListener focusListener;
+  protected KeyListener keyListener;
+  protected MouseInputListener  mouseInputListener;
+  protected CellRendererPane rendererPane;
   protected JTable table;
 
   /** The normal cell border. */
@@ -108,7 +108,7 @@ public class BasicTableUI extends TableUI
    * Handles key events for the JTable. Key events should be handled through
    * the InputMap/ActionMap mechanism since JDK1.3. This class is only there
    * for backwards compatibility.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   public class KeyHandler implements KeyListener
@@ -125,7 +125,7 @@ public class BasicTableUI extends TableUI
     {
       // Key events should be handled through the InputMap/ActionMap mechanism
       // since JDK1.3. This class is only there for backwards compatibility.
-      
+
       // Editor activation is a specific kind of response to ''any''
       // character key. Hence it is handled here.
       if (!table.isEditing() && table.isEnabled())
@@ -208,13 +208,13 @@ public class BasicTableUI extends TableUI
       ListSelectionModel rowModel = table.getSelectionModel();
       if (lo_row != -1 && hi_row != -1)
         {
-          if (controlPressed && rowModel.getSelectionMode() 
+          if (controlPressed && rowModel.getSelectionMode()
               != ListSelectionModel.SINGLE_SELECTION)
             rowModel.addSelectionInterval(lo_row, hi_row);
           else
             rowModel.setSelectionInterval(lo_row, hi_row);
         }
-      
+
       // Update the columns
       int lo_col = table.columnAtPoint(begin);
       int hi_col = table.columnAtPoint(curr);
@@ -222,14 +222,14 @@ public class BasicTableUI extends TableUI
         getSelectionModel();
       if (lo_col != -1 && hi_col != -1)
         {
-          if (controlPressed && colModel.getSelectionMode() != 
+          if (controlPressed && colModel.getSelectionMode() !=
               ListSelectionModel.SINGLE_SELECTION)
             colModel.addSelectionInterval(lo_col, hi_col);
           else
             colModel.setSelectionInterval(lo_col, hi_col);
         }
     }
-    
+
     /**
      * For the double click, start the cell editor.
      */
@@ -254,7 +254,7 @@ public class BasicTableUI extends TableUI
         }
     }
 
-    public void mouseDragged(MouseEvent e) 
+    public void mouseDragged(MouseEvent e)
     {
       if (table.isEnabled())
         {
@@ -278,7 +278,7 @@ public class BasicTableUI extends TableUI
       // Nothing to do here.
     }
 
-    public void mousePressed(MouseEvent e) 
+    public void mousePressed(MouseEvent e)
     {
       if (table.isEnabled())
         {
@@ -292,12 +292,12 @@ public class BasicTableUI extends TableUI
           //if control is pressed and the cell is already selected, deselect it
           if (e.isControlDown() && table.isCellSelected(
               table.rowAtPoint(begin), table.columnAtPoint(begin)))
-            {                                       
+            {
               table.getSelectionModel().
-              removeSelectionInterval(table.rowAtPoint(begin), 
+              removeSelectionInterval(table.rowAtPoint(begin),
                                       table.rowAtPoint(begin));
               table.getColumnModel().getSelectionModel().
-              removeSelectionInterval(table.columnAtPoint(begin), 
+              removeSelectionInterval(table.columnAtPoint(begin),
                                       table.columnAtPoint(begin));
             }
           else
@@ -314,7 +314,7 @@ public class BasicTableUI extends TableUI
         }
     }
 
-    public void mouseReleased(MouseEvent e) 
+    public void mouseReleased(MouseEvent e)
     {
       if (table.isEnabled())
         {
@@ -374,12 +374,12 @@ public class BasicTableUI extends TableUI
     }
   }
 
-  protected FocusListener createFocusListener() 
+  protected FocusListener createFocusListener()
   {
     return new FocusHandler();
   }
 
-  protected MouseInputListener createMouseInputListener() 
+  protected MouseInputListener createMouseInputListener()
   {
     return new MouseInputHandler();
   }
@@ -396,16 +396,16 @@ public class BasicTableUI extends TableUI
   }
 
   /**
-   * Return the maximum size of the table. The maximum height is the row 
-    * height times the number of rows. The maximum width is the sum of 
+   * Return the maximum size of the table. The maximum height is the row
+    * height times the number of rows. The maximum width is the sum of
     * the maximum widths of each column.
-    * 
+    *
     *  @param comp the component whose maximum size is being queried,
     *  this is ignored.
     *  @return a Dimension object representing the maximum size of the table,
     *  or null if the table has no elements.
    */
-  public Dimension getMaximumSize(JComponent comp) 
+  public Dimension getMaximumSize(JComponent comp)
   {
     int maxTotalColumnWidth = 0;
     for (int i = 0; i < table.getColumnCount(); i++)
@@ -415,16 +415,16 @@ public class BasicTableUI extends TableUI
   }
 
   /**
-   * Return the minimum size of the table. The minimum height is the row 
-    * height times the number of rows. The minimum width is the sum of 
+   * Return the minimum size of the table. The minimum height is the row
+    * height times the number of rows. The minimum width is the sum of
     * the minimum widths of each column.
-    * 
+    *
     *  @param comp the component whose minimum size is being queried,
     *  this is ignored.
     *  @return a Dimension object representing the minimum size of the table,
     *  or null if the table has no elements.
    */
-  public Dimension getMinimumSize(JComponent comp) 
+  public Dimension getMinimumSize(JComponent comp)
   {
     int minTotalColumnWidth = 0;
     for (int i = 0; i < table.getColumnCount(); i++)
@@ -440,7 +440,7 @@ public class BasicTableUI extends TableUI
    *
    * @return the preferred size for the table of that UI
    */
-  public Dimension getPreferredSize(JComponent comp) 
+  public Dimension getPreferredSize(JComponent comp)
   {
     int prefTotalColumnWidth = 0;
     TableColumnModel tcm = table.getColumnModel();
@@ -458,13 +458,13 @@ public class BasicTableUI extends TableUI
    * Returns the table height. This helper method is used by
    * {@link #getMinimumSize(JComponent)}, {@link #getPreferredSize(JComponent)}
    * and {@link #getMaximumSize(JComponent)} to determine the table height.
-   * 
+   *
    * @return the table height
    */
   private int getHeight()
   {
     int height = 0;
-    int rowCount = table.getRowCount(); 
+    int rowCount = table.getRowCount();
     if (rowCount > 0 && table.getColumnCount() > 0)
       {
         Rectangle r = table.getCellRect(rowCount - 1, 0, true);
@@ -473,7 +473,7 @@ public class BasicTableUI extends TableUI
     return height;
   }
 
-  protected void installDefaults() 
+  protected void installDefaults()
   {
     LookAndFeel.installColorsAndFont(table, "Table.background",
                                      "Table.foreground", "Table.font");
@@ -486,7 +486,7 @@ public class BasicTableUI extends TableUI
   /**
    * Installs keyboard actions on the table.
    */
-  protected void installKeyboardActions() 
+  protected void installKeyboardActions()
   {
     // Install the input map.
     InputMap inputMap =
@@ -597,14 +597,14 @@ public class BasicTableUI extends TableUI
     {
       JTable table = (JTable) e.getSource();
 
-      DefaultListSelectionModel rowModel 
+      DefaultListSelectionModel rowModel
           = (DefaultListSelectionModel) table.getSelectionModel();
-      DefaultListSelectionModel colModel 
+      DefaultListSelectionModel colModel
           = (DefaultListSelectionModel) table.getColumnModel().getSelectionModel();
 
       int rowLead = rowModel.getLeadSelectionIndex();
       int rowMax = table.getModel().getRowCount() - 1;
-      
+
       int colLead = colModel.getLeadSelectionIndex();
       int colMax = table.getModel().getColumnCount() - 1;
 
@@ -626,7 +626,7 @@ public class BasicTableUI extends TableUI
             table.editCellAt(rowLead, colLead);
         }
       else if (command.equals("selectFirstRowExtendSelection"))
-        {              
+        {
           rowModel.setLeadSelectionIndex(0);
         }
       else if (command.equals("selectFirstColumn"))
@@ -636,7 +636,7 @@ public class BasicTableUI extends TableUI
       else if (command.equals("selectFirstColumnExtendSelection"))
         {
           colModel.setLeadSelectionIndex(0);
-        }      
+        }
       else if (command.equals("selectLastRow"))
         {
           rowModel.setSelectionInterval(rowMax, rowMax);
@@ -670,11 +670,11 @@ public class BasicTableUI extends TableUI
         {
           int target;
           if (rowLead == getFirstVisibleRowIndex(table))
-            target = Math.max(0, rowLead - (getLastVisibleRowIndex(table) 
+            target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
                 - getFirstVisibleRowIndex(table) + 1));
           else
             target = getFirstVisibleRowIndex(table);
-          
+
           rowModel.setLeadSelectionIndex(target);
           colModel.setLeadSelectionIndex(colLead);
         }
@@ -692,7 +692,7 @@ public class BasicTableUI extends TableUI
                               - getFirstVisibleColumnIndex(table) + 1));
           else
             target = getLastVisibleColumnIndex(table);
-          
+
           colModel.setSelectionInterval(target, target);
           rowModel.setSelectionInterval(rowLead, rowLead);
         }
@@ -705,11 +705,11 @@ public class BasicTableUI extends TableUI
         {
           int target;
           if (colLead == getFirstVisibleColumnIndex(table))
-            target = Math.max(0, colLead - (getLastVisibleColumnIndex(table) 
+            target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
                                  - getFirstVisibleColumnIndex(table) + 1));
           else
             target = getFirstVisibleColumnIndex(table);
-          
+
           colModel.setSelectionInterval(target, target);
           rowModel.setSelectionInterval(rowLead, rowLead);
         }
@@ -731,71 +731,71 @@ public class BasicTableUI extends TableUI
                || command.equals("selectPreviousColumnCell"))
         {
           // If nothing is selected, select the first cell in the table
-          if (table.getSelectedRowCount() == 0 && 
+          if (table.getSelectedRowCount() == 0 &&
               table.getSelectedColumnCount() == 0)
             {
               rowModel.setSelectionInterval(0, 0);
               colModel.setSelectionInterval(0, 0);
               return;
             }
-          
+
           // If the lead selection index isn't selected (ie a remove operation
           // happened, then set the lead to the first selected cell in the
           // table
           if (!table.isCellSelected(rowLead, colLead))
             {
-              rowModel.addSelectionInterval(rowModel.getMinSelectionIndex(), 
+              rowModel.addSelectionInterval(rowModel.getMinSelectionIndex(),
                                             rowModel.getMinSelectionIndex());
-              colModel.addSelectionInterval(colModel.getMinSelectionIndex(), 
+              colModel.addSelectionInterval(colModel.getMinSelectionIndex(),
                                             colModel.getMinSelectionIndex());
               return;
             }
-          
+
           // multRowsSelected and multColsSelected tell us if multiple rows or
           // columns are selected, respectively
           boolean multRowsSelected, multColsSelected;
           multRowsSelected = table.getSelectedRowCount() > 1 &&
             table.getRowSelectionAllowed();
-          
+
           multColsSelected = table.getSelectedColumnCount() > 1 &&
             table.getColumnSelectionAllowed();
-          
+
           // If there is just one selection, select the next cell, and wrap
           // when you get to the edges of the table.
           if (!multColsSelected && !multRowsSelected)
             {
-              if (command.indexOf("Column") != -1) 
-                advanceSingleSelection(colModel, colMax, rowModel, rowMax, 
+              if (command.indexOf("Column") != -1)
+                advanceSingleSelection(colModel, colMax, rowModel, rowMax,
                     command.equals("selectPreviousColumnCell"));
               else
-                advanceSingleSelection(rowModel, rowMax, colModel, colMax, 
+                advanceSingleSelection(rowModel, rowMax, colModel, colMax,
                     command.equals("selectPreviousRowCell"));
               return;
             }
-          
-          
+
+
           // rowMinSelected and rowMaxSelected are the minimum and maximum
           // values respectively of selected cells in the row selection model
           // Similarly for colMinSelected and colMaxSelected.
-          int rowMaxSelected = table.getRowSelectionAllowed() ? 
+          int rowMaxSelected = table.getRowSelectionAllowed() ?
             rowModel.getMaxSelectionIndex() : table.getModel().getRowCount() - 1;
-          int rowMinSelected = table.getRowSelectionAllowed() ? 
-            rowModel.getMinSelectionIndex() : 0; 
-          int colMaxSelected = table.getColumnSelectionAllowed() ? 
-            colModel.getMaxSelectionIndex() : 
+          int rowMinSelected = table.getRowSelectionAllowed() ?
+            rowModel.getMinSelectionIndex() : 0;
+          int colMaxSelected = table.getColumnSelectionAllowed() ?
+            colModel.getMaxSelectionIndex() :
             table.getModel().getColumnCount() - 1;
-          int colMinSelected = table.getColumnSelectionAllowed() ? 
+          int colMinSelected = table.getColumnSelectionAllowed() ?
             colModel.getMinSelectionIndex() : 0;
-          
+
           // If there are multiple rows and columns selected, select the next
-          // cell and wrap at the edges of the selection.  
-          if (command.indexOf("Column") != -1) 
+          // cell and wrap at the edges of the selection.
+          if (command.indexOf("Column") != -1)
             advanceMultipleSelection(table, colModel, colMinSelected,
                                      colMaxSelected, rowModel, rowMinSelected,
                                      rowMaxSelected,
                                     command.equals("selectPreviousColumnCell"),
                                     true);
-          
+
           else
             advanceMultipleSelection(table, rowModel, rowMinSelected,
                                      rowMaxSelected, colModel, colMinSelected,
@@ -812,11 +812,11 @@ public class BasicTableUI extends TableUI
         {
           int target;
           if (colLead == getFirstVisibleColumnIndex(table))
-            target = Math.max(0, colLead - (getLastVisibleColumnIndex(table) 
+            target = Math.max(0, colLead - (getLastVisibleColumnIndex(table)
                                  - getFirstVisibleColumnIndex(table) + 1));
           else
             target = getFirstVisibleColumnIndex(table);
-          
+
           colModel.setLeadSelectionIndex(target);
           rowModel.setLeadSelectionIndex(rowLead);
         }
@@ -828,7 +828,7 @@ public class BasicTableUI extends TableUI
                                       - getFirstVisibleRowIndex(table) + 1));
           else
             target = getLastVisibleRowIndex(table);
-          
+
           rowModel.setSelectionInterval(target, target);
           colModel.setSelectionInterval(colLead, colLead);
         }
@@ -836,11 +836,11 @@ public class BasicTableUI extends TableUI
         {
           int target;
           if (colLead == getLastVisibleColumnIndex(table))
-            target = Math.min(colMax, colLead + (getLastVisibleColumnIndex(table) 
+            target = Math.min(colMax, colLead + (getLastVisibleColumnIndex(table)
                 - getFirstVisibleColumnIndex(table) + 1));
           else
             target = getLastVisibleColumnIndex(table);
-          
+
           colModel.setLeadSelectionIndex(target);
           rowModel.setLeadSelectionIndex(rowLead);
         }
@@ -857,29 +857,29 @@ public class BasicTableUI extends TableUI
         {
           int target;
           if (rowLead == getLastVisibleRowIndex(table))
-            target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex(table) 
+            target = Math.min(rowMax, rowLead + (getLastVisibleRowIndex(table)
                 - getFirstVisibleRowIndex(table) + 1));
           else
             target = getLastVisibleRowIndex(table);
-          
+
           rowModel.setLeadSelectionIndex(target);
           colModel.setLeadSelectionIndex(colLead);
-        }      
+        }
       else if (command.equals("scrollUpChangeSelection"))
         {
           int target;
           if (rowLead == getFirstVisibleRowIndex(table))
-            target = Math.max(0, rowLead - (getLastVisibleRowIndex(table) 
+            target = Math.max(0, rowLead - (getLastVisibleRowIndex(table)
                 - getFirstVisibleRowIndex(table) + 1));
           else
             target = getFirstVisibleRowIndex(table);
-          
+
           rowModel.setSelectionInterval(target, target);
           colModel.setSelectionInterval(colLead, colLead);
         }
       else if (command.equals("selectNextRowChangeLead"))
           {
-            if (rowModel.getSelectionMode() 
+            if (rowModel.getSelectionMode()
                 != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
               {
                 // just "selectNextRow"
@@ -892,7 +892,7 @@ public class BasicTableUI extends TableUI
           }
       else if (command.equals("selectPreviousRowChangeLead"))
         {
-          if (rowModel.getSelectionMode() 
+          if (rowModel.getSelectionMode()
               != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
             {
               // just selectPreviousRow
@@ -905,8 +905,8 @@ public class BasicTableUI extends TableUI
         }
       else if (command.equals("selectNextColumnChangeLead"))
         {
-          if (colModel.getSelectionMode() 
-              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
+          if (colModel.getSelectionMode()
+              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
             {
               // just selectNextColumn
               rowModel.setSelectionInterval(rowLead, rowLead);
@@ -918,14 +918,14 @@ public class BasicTableUI extends TableUI
         }
       else if (command.equals("selectPreviousColumnChangeLead"))
         {
-          if (colModel.getSelectionMode() 
-              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)            
+          if (colModel.getSelectionMode()
+              != ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
             {
               // just selectPreviousColumn
               rowModel.setSelectionInterval(rowLead, rowLead);
               colModel.setSelectionInterval(Math.max(colLead - 1, 0),
                                             Math.max(colLead - 1, 0));
-              
+
             }
           else
             colModel.moveLeadSelectionIndex(Math.max(colLead - 1, 0));
@@ -955,12 +955,12 @@ public class BasicTableUI extends TableUI
             rowModel.removeSelectionInterval(rowLead, rowLead);
           else
             rowModel.addSelectionInterval(rowLead, rowLead);
-          
+
           if (colModel.isSelectedIndex(colLead))
             colModel.removeSelectionInterval(colLead, colLead);
           else
             colModel.addSelectionInterval(colLead, colLead);
-          
+
           rowModel.setAnchorSelectionIndex(rowLead);
           colModel.setAnchorSelectionIndex(colLead);
         }
@@ -968,31 +968,31 @@ public class BasicTableUI extends TableUI
         {
           table.editingStopped(new ChangeEvent(command));
         }
-      else 
+      else
         {
           // If we're here that means we bound this TableAction class
           // to a keyboard input but we either want to ignore that input
           // or we just haven't implemented its action yet.
-          
+
           // Uncomment the following line to print the names of unused bindings
           // when their keys are pressed
-          
+
           // System.out.println ("not implemented: "+e.getActionCommand());
         }
 
       // Any commands whose keyStrokes should be used by the Editor should not
-      // cause editing to be stopped: ie, the SPACE sends "addToSelection" but 
+      // cause editing to be stopped: ie, the SPACE sends "addToSelection" but
       // if the table is in editing mode, the space should not cause us to stop
       // editing because it should be used by the Editor.
       if (table.isEditing() && command != "startEditing"
           && command != "addToSelection")
         table.editingStopped(new ChangeEvent("update"));
-            
+
       table.scrollRectToVisible(table.getCellRect(
-          rowModel.getLeadSelectionIndex(), colModel.getLeadSelectionIndex(), 
+          rowModel.getLeadSelectionIndex(), colModel.getLeadSelectionIndex(),
           false));
     }
-    
+
     /**
      * Returns the column index of the first visible column.
      * @return the column index of the first visible column.
@@ -1005,7 +1005,7 @@ public class BasicTableUI extends TableUI
         r.translate((int) r.getWidth() - 1, 0);
       return table.columnAtPoint(r.getLocation());
     }
-    
+
     /**
      * Returns the column index of the last visible column.
      *
@@ -1016,9 +1016,9 @@ public class BasicTableUI extends TableUI
       Rectangle r = table.getVisibleRect();
       if (or.isLeftToRight())
         r.translate((int) r.getWidth() - 1, 0);
-      return table.columnAtPoint(r.getLocation());      
+      return table.columnAtPoint(r.getLocation());
     }
-    
+
     /**
      * Returns the row index of the first visible row.
      *
@@ -1031,7 +1031,7 @@ public class BasicTableUI extends TableUI
         r.translate((int) r.getWidth() - 1, 0);
       return table.rowAtPoint(r.getLocation());
     }
-    
+
     /**
      * Returns the row index of the last visible row.
      *
@@ -1067,7 +1067,7 @@ public class BasicTableUI extends TableUI
      * rows (ENTER)
      * @param firstMin the first selected index in firstModel
      * @param firstMax the last selected index in firstModel
-     * @param secondModel the ListSelectionModel for rows (TAB) or 
+     * @param secondModel the ListSelectionModel for rows (TAB) or
      * columns (ENTER)
      * @param secondMin the first selected index in secondModel
      * @param secondMax the last selected index in secondModel
@@ -1076,41 +1076,41 @@ public class BasicTableUI extends TableUI
      */
     void advanceMultipleSelection(JTable table, ListSelectionModel firstModel,
                                   int firstMin,
-                                  int firstMax, ListSelectionModel secondModel, 
+                                  int firstMax, ListSelectionModel secondModel,
                                   int secondMin, int secondMax, boolean reverse,
                                   boolean eventIsTab)
     {
-      // If eventIsTab, all the "firsts" correspond to columns, otherwise, to 
+      // If eventIsTab, all the "firsts" correspond to columns, otherwise, to
       // rows "seconds" correspond to the opposite
       int firstLead = firstModel.getLeadSelectionIndex();
       int secondLead = secondModel.getLeadSelectionIndex();
-      int numFirsts = eventIsTab ? 
+      int numFirsts = eventIsTab ?
         table.getModel().getColumnCount() : table.getModel().getRowCount();
-      int numSeconds = eventIsTab ? 
+      int numSeconds = eventIsTab ?
         table.getModel().getRowCount() : table.getModel().getColumnCount();
 
       // check if we have to wrap the "firsts" around, going to the other side
-      if ((firstLead == firstMax && !reverse) || 
+      if ((firstLead == firstMax && !reverse) ||
           (reverse && firstLead == firstMin))
         {
-          firstModel.addSelectionInterval(reverse ? firstMax : firstMin, 
+          firstModel.addSelectionInterval(reverse ? firstMax : firstMin,
                                           reverse ? firstMax : firstMin);
-          
+
           // check if we have to wrap the "seconds"
-          if ((secondLead == secondMax && !reverse) || 
+          if ((secondLead == secondMax && !reverse) ||
               (reverse && secondLead == secondMin))
-            secondModel.addSelectionInterval(reverse ? secondMax : secondMin, 
+            secondModel.addSelectionInterval(reverse ? secondMax : secondMin,
                                              reverse ? secondMax : secondMin);
 
           // if we're not wrapping the seconds, we have to find out where we
-          // are within the secondModel and advance to the next cell (or 
+          // are within the secondModel and advance to the next cell (or
           // go back to the previous cell if reverse == true)
           else
             {
               int[] secondsSelected;
-              if (eventIsTab && table.getRowSelectionAllowed() || 
+              if (eventIsTab && table.getRowSelectionAllowed() ||
                   !eventIsTab && table.getColumnSelectionAllowed())
-                secondsSelected = eventIsTab ? 
+                secondsSelected = eventIsTab ?
                   table.getSelectedRows() : table.getSelectedColumns();
               else
                 {
@@ -1129,9 +1129,9 @@ public class BasicTableUI extends TableUI
               else
                 while (secondsSelected[secondIndex] >= secondLead)
                   secondIndex--;
-              
+
               // and select it - updating the lead selection index
-              secondModel.addSelectionInterval(secondsSelected[secondIndex], 
+              secondModel.addSelectionInterval(secondsSelected[secondIndex],
                                                secondsSelected[secondIndex]);
             }
         }
@@ -1140,9 +1140,9 @@ public class BasicTableUI extends TableUI
       else
         {
           int[] firstsSelected;
-          if (eventIsTab && table.getColumnSelectionAllowed() || 
+          if (eventIsTab && table.getColumnSelectionAllowed() ||
               !eventIsTab && table.getRowSelectionAllowed())
-            firstsSelected = eventIsTab ? 
+            firstsSelected = eventIsTab ?
               table.getSelectedColumns() : table.getSelectedRows();
           else
             {
@@ -1155,16 +1155,16 @@ public class BasicTableUI extends TableUI
           if (!reverse)
             while (firstsSelected[firstIndex] <= firstLead)
               firstIndex++;
-          else 
+          else
             while (firstsSelected[firstIndex] >= firstLead)
               firstIndex--;
-          firstModel.addSelectionInterval(firstsSelected[firstIndex], 
+          firstModel.addSelectionInterval(firstsSelected[firstIndex],
                                           firstsSelected[firstIndex]);
           secondModel.addSelectionInterval(secondLead, secondLead);
         }
     }
-    
-    /** 
+
+    /**
      * A helper method for the key  bindings. Used because the actions
      * for TAB, SHIFT-TAB, ENTER, and SHIFT-ENTER are very similar.
      *
@@ -1180,15 +1180,15 @@ public class BasicTableUI extends TableUI
      * @param reverse true if SHIFT was pressed for the event
      */
 
-    void advanceSingleSelection(ListSelectionModel firstModel, int firstMax, 
-                                ListSelectionModel secondModel, int secondMax, 
+    void advanceSingleSelection(ListSelectionModel firstModel, int firstMax,
+                                ListSelectionModel secondModel, int secondMax,
                                 boolean reverse)
     {
       // for TABs, "first" corresponds to columns and "seconds" to rows.
       // the opposite is true for ENTERs
       int firstLead = firstModel.getLeadSelectionIndex();
       int secondLead = secondModel.getLeadSelectionIndex();
-      
+
       // if we are going backwards subtract 2 because we later add 1
       // for a net change of -1
       if (reverse && (firstLead == 0))
@@ -1198,15 +1198,15 @@ public class BasicTableUI extends TableUI
             secondLead += secondMax + 1;
           secondLead -= 2;
         }
-      
+
       // do we have to wrap the "seconds"?
       if (reverse && (firstLead == 0) || !reverse && (firstLead == firstMax))
-        secondModel.setSelectionInterval((secondLead + 1) % (secondMax + 1), 
+        secondModel.setSelectionInterval((secondLead + 1) % (secondMax + 1),
                                          (secondLead + 1) % (secondMax + 1));
       // if not, just reselect the current lead
       else
         secondModel.setSelectionInterval(secondLead, secondLead);
-      
+
       // if we are going backwards, subtract 2  because we add 1 later
       // for net change of -1
       if (reverse)
@@ -1217,12 +1217,12 @@ public class BasicTableUI extends TableUI
           firstLead -= 2;
         }
       // select the next "first"
-      firstModel.setSelectionInterval((firstLead + 1) % (firstMax + 1), 
+      firstModel.setSelectionInterval((firstLead + 1) % (firstMax + 1),
                                       (firstLead + 1) % (firstMax + 1));
     }
   }
 
-  protected void installListeners() 
+  protected void installListeners()
   {
     if (focusListener == null)
       focusListener = createFocusListener();
@@ -1232,7 +1232,7 @@ public class BasicTableUI extends TableUI
     table.addKeyListener(keyListener);
     if (mouseInputListener == null)
       mouseInputListener = createMouseInputListener();
-    table.addMouseListener(mouseInputListener);    
+    table.addMouseListener(mouseInputListener);
     table.addMouseMotionListener(mouseInputListener);
     if (propertyChangeListener == null)
       propertyChangeListener = new PropertyChangeHandler();
@@ -1259,17 +1259,17 @@ public class BasicTableUI extends TableUI
     SwingUtilities.replaceUIActionMap(table, null);
   }
 
-  protected void uninstallListeners() 
+  protected void uninstallListeners()
   {
-    table.removeFocusListener(focusListener);  
+    table.removeFocusListener(focusListener);
     table.removeKeyListener(keyListener);
-    table.removeMouseListener(mouseInputListener);    
+    table.removeMouseListener(mouseInputListener);
     table.removeMouseMotionListener(mouseInputListener);
     table.removePropertyChangeListener(propertyChangeListener);
     propertyChangeListener = null;
   }
 
-  public void installUI(JComponent comp) 
+  public void installUI(JComponent comp)
   {
     table = (JTable) comp;
     rendererPane = new CellRendererPane();
@@ -1280,11 +1280,11 @@ public class BasicTableUI extends TableUI
     installListeners();
   }
 
-  public void uninstallUI(JComponent c) 
+  public void uninstallUI(JComponent c)
   {
     uninstallListeners();
     uninstallKeyboardActions();
-    uninstallDefaults(); 
+    uninstallDefaults();
 
     table.remove(rendererPane);
     rendererPane = null;
@@ -1308,11 +1308,11 @@ public class BasicTableUI extends TableUI
     Component comp = table.prepareRenderer(rend, row, col);
     rendererPane.paintComponent(g, comp, table, bounds);
   }
-  
+
   /**
    * Paint the associated table.
    */
-  public void paint(Graphics gfx, JComponent ignored) 
+  public void paint(Graphics gfx, JComponent ignored)
   {
     int ncols = table.getColumnCount();
     int nrows = table.getRowCount();
@@ -1346,19 +1346,19 @@ public class BasicTableUI extends TableUI
       {
         widths[i] = cmodel.getColumn(i).getWidth() - columnMargin;
       }
-    
+
     Rectangle bounds = table.getCellRect(r0, c0, false);
     // The left boundary of the area being repainted.
     int left = bounds.x;
-    
+
     // The top boundary of the area being repainted.
     int top = bounds.y;
-    
+
     // The bottom boundary of the area being repainted.
     int bottom;
-    
+
     // paint the cell contents
-    Color grid = table.getGridColor();    
+    Color grid = table.getGridColor();
     for (int r = r0; r <= rn; ++r)
       {
         for (int c = c0; c <= cn; ++c)
@@ -1372,18 +1372,18 @@ public class BasicTableUI extends TableUI
         // Update row height for tables with custom heights.
         bounds.height = table.getRowHeight(r + 1) - rowMargin;
       }
-    
+
     bottom = bounds.y - rowMargin;
 
     // paint vertical grid lines
     if (grid != null && table.getShowVerticalLines())
-      {    
+      {
         Color save = gfx.getColor();
         gfx.setColor(grid);
         int x = left - columnMargin;
         for (int c = c0; c <= cn; ++c)
           {
-            // The vertical grid is draw right from the cells, so we 
+            // The vertical grid is draw right from the cells, so we
             // add before drawing.
             x += widths[c] + columnMargin;
             gfx.drawLine(x, top, x, bottom);
@@ -1391,15 +1391,15 @@ public class BasicTableUI extends TableUI
         gfx.setColor(save);
       }
 
-    // paint horizontal grid lines    
+    // paint horizontal grid lines
     if (grid != null && table.getShowHorizontalLines())
-      {    
+      {
         Color save = gfx.getColor();
         gfx.setColor(grid);
         int y = top - rowMargin;
         for (int r = r0; r <= rn; ++r)
           {
-            // The horizontal grid is draw below the cells, so we 
+            // The horizontal grid is draw below the cells, so we
             // add before drawing.
             y += table.getRowHeight(r);
             gfx.drawLine(left, y, p2.x, y);
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
index 3f5aa27cf40..b2541b453c6 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextAreaUI.java
@@ -1,4 +1,4 @@
-/* BasicTextAreaUI.java -- 
+/* BasicTextAreaUI.java --
    Copyright (C) 2004, 2006,  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -65,9 +65,9 @@ public class BasicTextAreaUI extends BasicTextUI
   /**
    * Create the view.  Returns a WrappedPlainView if the text area
    * has lineWrap set to true, otherwise returns a PlainView.  If
-   * lineWrap is true has to check whether the wrap style is word 
+   * lineWrap is true has to check whether the wrap style is word
    * or character and return an appropriate WrappedPlainView.
-   * 
+   *
    * @param elem the element to create a View for
    * @return an appropriate View for the element
    */
@@ -94,11 +94,11 @@ public class BasicTextAreaUI extends BasicTextUI
   {
     return "TextArea";
   }
-  
+
   /**
    * Receives notification whenever one of the text component's bound
    * properties changes. This changes the view to WrappedPlainView
-   * if setLineWrap(true) is called, and back to PlainView if 
+   * if setLineWrap(true) is called, and back to PlainView if
    * setLineWrap(false) is called.
    *
    * @param ev the property change event
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
index 6792aa065da..5f6a9275788 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -60,7 +60,7 @@ public class BasicTextFieldUI extends BasicTextUI
   {
     return new FieldView(elem);
   }
-  
+
   public static ComponentUI createUI(JComponent c)
   {
     return new BasicTextFieldUI();
@@ -85,7 +85,7 @@ public class BasicTextFieldUI extends BasicTextUI
    * Receives notification whenever one of the text component's bound
    * properties changes. Here we check for the editable and enabled
    * properties and adjust the background color accordingly.
-   * 
+   *
    * 
                      The colors are only changed if they are not a
    * ColorUIResource.
                      
    *
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
index a988c5a63c8..507e0a1697a 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextPaneUI.java
@@ -1,4 +1,4 @@
-/* BasicTextPaneUI.java -- 
+/* BasicTextPaneUI.java --
    Copyright (C) 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
index e152a3034d5..bd7cc48b94e 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTextUI.java
@@ -126,7 +126,7 @@ public abstract class BasicTextUI extends TextUI
   private static class FocusHandler
     implements FocusListener
   {
-    public void focusGained(FocusEvent e) 
+    public void focusGained(FocusEvent e)
     {
       // Nothing to do here.
     }
@@ -147,7 +147,7 @@ public abstract class BasicTextUI extends TextUI
             {
               if (sm != null)
                 sm.checkSystemClipboardAccess();
-              
+
               Clipboard cb = Toolkit.getDefaultToolkit().getSystemSelection();
               if (cb != null)
                 {
@@ -291,7 +291,7 @@ public abstract class BasicTextUI extends TextUI
       EditorKit editorKit = BasicTextUI.this.getEditorKit(getComponent());
       factory = editorKit.getViewFactory();
       if (factory == null)
-	factory = BasicTextUI.this;
+        factory = BasicTextUI.this;
       return factory;
     }
 
@@ -317,7 +317,7 @@ public abstract class BasicTextUI extends TextUI
     {
       if (view != null)
         view.setParent(null);
-      
+
       if (v != null)
         v.setParent(this);
 
@@ -718,7 +718,7 @@ public abstract class BasicTextUI extends TextUI
     if (color == null || color instanceof UIResource)
       {
         color = UIManager.getColor(prefix  + ".selectionBackground");
-        textComponent.setSelectionColor(color);    
+        textComponent.setSelectionColor(color);
       }
 
     Insets margin = textComponent.getMargin();
@@ -756,7 +756,7 @@ public abstract class BasicTextUI extends TextUI
    */
   protected void installListeners()
   {
-    // 
+    //
     if (SystemProperties.getProperty("gnu.swing.text.no-xlike-clipboard")
         == null)
       {
@@ -768,11 +768,11 @@ public abstract class BasicTextUI extends TextUI
 
   /**
    * Returns the name of the keymap for this type of TextUI.
-   * 
+   *
    * This is implemented so that the classname of this TextUI
    * without the package prefix is returned. This way subclasses
    * don't have to override this method.
-   * 
+   *
    * @return the name of the keymap for this TextUI
    */
   protected String getKeymapName()
@@ -822,10 +822,10 @@ public abstract class BasicTextUI extends TextUI
                                      getInputMap());
     SwingUtilities.replaceUIActionMap(textComponent, getActionMap());
   }
-  
+
   /**
    * Creates an ActionMap to be installed on the text component.
-   * 
+   *
    * @return an ActionMap to be installed on the text component
    */
   private ActionMap getActionMap()
@@ -963,7 +963,7 @@ public abstract class BasicTextUI extends TextUI
    */
   protected void uninstallKeyboardActions()
   {
-    SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED, 
+    SwingUtilities.replaceUIInputMap(textComponent, JComponent.WHEN_FOCUSED,
                                      null);
     SwingUtilities.replaceUIActionMap(textComponent, null);
   }
@@ -1150,7 +1150,7 @@ public abstract class BasicTextUI extends TextUI
         highlighter.paint(g);
         g.setColor(oldColor);
       }
-      
+
     rootView.paint(g, getVisibleEditorRect());
 
     if (caret != null && textComponent.hasFocus())
@@ -1482,11 +1482,11 @@ public abstract class BasicTextUI extends TextUI
     // Return null if the component has no valid size.
     if (width <= 0 || height <= 0)
       return null;
-	
+
     Insets insets = textComponent.getInsets(cachedInsets);
     return new Rectangle(insets.left, insets.top,
-			 width - insets.left - insets.right,
-			 height - insets.top - insets.bottom);
+                         width - insets.left - insets.right,
+                         height - insets.top - insets.bottom);
   }
 
   /**
@@ -1507,10 +1507,10 @@ public abstract class BasicTextUI extends TextUI
    */
   protected void modelChanged()
   {
-    if (textComponent == null || rootView == null) 
+    if (textComponent == null || rootView == null)
       return;
     ViewFactory factory = rootView.getViewFactory();
-    if (factory == null) 
+    if (factory == null)
       return;
     Document doc = textComponent.getDocument();
     if (doc == null)
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
index 921648670df..4550f08e6dd 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java
@@ -54,22 +54,22 @@ import javax.swing.plaf.ComponentUI;
  */
 public class BasicToggleButtonUI extends BasicButtonUI
 {
-  
+
   /**
    * Returns a UI delegate for the specified component.
-   * 
-   * @param component  the component (should be an instance of 
+   *
+   * @param component  the component (should be an instance of
    *     {@link JToggleButton}).
-   *     
+   *
    * @return An instance of BasicToggleButtonUI.
    */
   public static ComponentUI createUI(JComponent component)
   {
     return new BasicToggleButtonUI();
-  }    
+  }
 
   /**
-   * Returns the prefix for entries in the {@link UIManager} defaults table 
+   * Returns the prefix for entries in the {@link UIManager} defaults table
    * ("ToggleButton." in this case).
    *
    * @return "ToggleButton."
@@ -80,14 +80,14 @@ public class BasicToggleButtonUI extends BasicButtonUI
   }
 
   /**
-   * Paint the component, which is an {@link AbstractButton}, according to 
+   * Paint the component, which is an {@link AbstractButton}, according to
    * its current state.
    *
    * @param g The graphics context to paint with
    * @param c The component to paint the state of
    */
   public void paint(Graphics g, JComponent c)
-  {      
+  {
     AbstractButton b = (AbstractButton) c;
 
     Rectangle tr = new Rectangle();
@@ -102,13 +102,13 @@ public class BasicToggleButtonUI extends BasicButtonUI
       SwingUtilities.calculateInnerArea(b, vr);
     else
       vr = SwingUtilities.getLocalBounds(b);
-    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
-        b.getText(), currentIcon(b), b.getVerticalAlignment(), 
-        b.getHorizontalAlignment(), b.getVerticalTextPosition(), 
-        b.getHorizontalTextPosition(), vr, ir, tr, b.getIconTextGap() 
+    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f),
+        b.getText(), currentIcon(b), b.getVerticalAlignment(),
+        b.getHorizontalAlignment(), b.getVerticalTextPosition(),
+        b.getHorizontalTextPosition(), vr, ir, tr, b.getIconTextGap()
         + defaultTextShiftOffset);
 
-    if ((b.getModel().isArmed() && b.getModel().isPressed()) 
+    if ((b.getModel().isArmed() && b.getModel().isPressed())
         || b.isSelected())
       paintButtonPressed(g, b);
 
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
index 7be69ec2576..f5b2b2d1e01 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToolBarUI.java
@@ -345,7 +345,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
   protected Border createNonRolloverBorder()
   {
     Border b = UIManager.getBorder("ToolBar.nonrolloverBorder");
-    
+
     if (b == null)
       {
         b = new CompoundBorder(
@@ -355,7 +355,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
                              UIManager.getColor("Button.highlight")),
             BasicBorders.getMarginBorder());
       }
-    
+
     return b;  }
 
   /**
@@ -377,7 +377,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
   protected Border createRolloverBorder()
   {
     Border b = UIManager.getBorder("ToolBar.rolloverBorder");
-    
+
     if (b == null)
       {
         b = new CompoundBorder(
@@ -387,7 +387,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
                              UIManager.getColor("Button.highlight")),
             BasicBorders.getMarginBorder());
       }
-    
+
     return b;
   }
 
@@ -438,13 +438,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
     if (loc != -1)
       {
-	dragWindow.setBorderColor(dockingBorderColor);
-	dragWindow.setBackground(dockingColor);
+        dragWindow.setBorderColor(dockingBorderColor);
+        dragWindow.setBackground(dockingColor);
       }
     else
       {
-	dragWindow.setBorderColor(floatingBorderColor);
-	dragWindow.setBackground(floatingColor);
+        dragWindow.setBorderColor(floatingBorderColor);
+        dragWindow.setBackground(floatingColor);
       }
 
     int w = 0;
@@ -458,13 +458,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     if (((cachedOrientation == SwingConstants.HORIZONTAL) && tmp)
         || ((cachedOrientation == VERTICAL) && ! tmp))
       {
-	w = cachedBounds.width;
-	h = cachedBounds.height;
+        w = cachedBounds.width;
+        h = cachedBounds.height;
       }
     else
       {
-	w = cachedBounds.height;
-	h = cachedBounds.width;
+        w = cachedBounds.height;
+        h = cachedBounds.width;
       }
 
     Point p = dragWindow.getOffset();
@@ -507,28 +507,28 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
       newParent = ((RootPaneContainer) floatFrame).getContentPane();
     else
       {
-	floatFrame.hide();
-	newParent = origParent;
+        floatFrame.hide();
+        newParent = origParent;
       }
 
     String constraint;
     switch (aoc)
       {
       case SwingConstants.EAST:
-	constraint = BorderLayout.EAST;
-	break;
+        constraint = BorderLayout.EAST;
+        break;
       case SwingConstants.NORTH:
-	constraint = BorderLayout.NORTH;
-	break;
+        constraint = BorderLayout.NORTH;
+        break;
       case SwingConstants.SOUTH:
-	constraint = BorderLayout.SOUTH;
-	break;
+        constraint = BorderLayout.SOUTH;
+        break;
       case SwingConstants.WEST:
-	constraint = BorderLayout.WEST;
-	break;
+        constraint = BorderLayout.WEST;
+        break;
       default:
-	constraint = BorderLayout.CENTER;
-	break;
+        constraint = BorderLayout.CENTER;
+        break;
       }
 
     int newOrientation = SwingConstants.HORIZONTAL;
@@ -538,8 +538,8 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
     if (aoc != -1)
       {
-	constraintBeforeFloating = constraint;
-	lastGoodOrientation = newOrientation;
+        constraintBeforeFloating = constraint;
+        lastGoodOrientation = newOrientation;
       }
 
     newParent.add(toolBar, constraint);
@@ -557,10 +557,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
     if (aoc == -1)
       {
-	floatFrame.pack();
-	floatFrame.setSize(dims.width + insets.left + insets.right,
-	                   dims.height + insets.top + insets.bottom);
-	floatFrame.show();
+        floatFrame.pack();
+        floatFrame.setSize(dims.width + insets.left + insets.right,
+                           dims.height + insets.top + insets.bottom);
+        floatFrame.show();
       }
 
     newParent.invalidate();
@@ -776,14 +776,14 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
     for (int i = 0; i < c.length; i++)
       {
-	if (c[i] instanceof JButton)
-	  {
-	    // Don't really care about anything other than JButtons
-	    JButton b = (JButton) c[i];
+        if (c[i] instanceof JButton)
+          {
+            // Don't really care about anything other than JButtons
+            JButton b = (JButton) c[i];
 
-	    if (b.getBorder() != null)
-	      borders.put(b, b.getBorder());
-	  }
+            if (b.getBorder() != null)
+              borders.put(b, b.getBorder());
+          }
       }
   }
 
@@ -798,11 +798,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
     if (c instanceof JToolBar)
       {
-	toolBar = (JToolBar) c;
+        toolBar = (JToolBar) c;
     installDefaults();
     installComponents();
-	installListeners();
-	installKeyboardActions();
+        installListeners();
+        installKeyboardActions();
       }
   }
 
@@ -894,14 +894,14 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
   {
     if (c instanceof AbstractButton)
       {
-	AbstractButton b = (AbstractButton) c;
-	b.setRolloverEnabled(false);
+        AbstractButton b = (AbstractButton) c;
+        b.setRolloverEnabled(false);
 
         // Save old border in hashtable.
-	if (b.getBorder() != null)
+        if (b.getBorder() != null)
           borders.put(b, b.getBorder());
-        
-	b.setBorder(nonRolloverBorder);
+
+        b.setBorder(nonRolloverBorder);
       }
   }
 
@@ -931,11 +931,11 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
       {
         AbstractButton b = (AbstractButton) c;
         b.setRolloverEnabled(false);
-        
+
         // Save old border in hashtable.
         if (b.getBorder() != null)
-	  borders.put(b, b.getBorder());
-        
+          borders.put(b, b.getBorder());
+
         b.setBorder(rolloverBorder);
       }
   }
@@ -1139,7 +1139,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     public void mouseDragged(MouseEvent e)
     {
       if (isDragging)
-	dragTo(e.getPoint(), origin);
+        dragTo(e.getPoint(), origin);
     }
 
     /**
@@ -1182,7 +1182,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     public void mousePressed(MouseEvent e)
     {
       if (! toolBar.isFloatable())
-	return;
+        return;
 
       Point ssd = e.getPoint();
       Insets insets = toolBar.getInsets();
@@ -1190,13 +1190,13 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
       // Verify that this click occurs in the top inset.
       if (toolBar.getOrientation() == SwingConstants.HORIZONTAL)
         {
-	  if (e.getX() > insets.left)
-	    return;
+          if (e.getX() > insets.left)
+            return;
         }
       else
         {
-	  if (e.getY() > insets.top)
-	    return;
+          if (e.getY() > insets.top)
+            return;
         }
 
       origin = new Point(0, 0);
@@ -1204,16 +1204,16 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
         SwingUtilities.convertPointToScreen(ssd, toolBar);
 
       if (! (SwingUtilities.getAncestorOfClass(Window.class, toolBar) instanceof UIResource))
-	// Need to know who keeps the toolBar if it gets dragged back into it.
-	origParent = toolBar.getParent();
-      
+        // Need to know who keeps the toolBar if it gets dragged back into it.
+        origParent = toolBar.getParent();
+
       if (toolBar.isShowing())
         SwingUtilities.convertPointToScreen(origin, toolBar);
 
       isDragging = true;
 
       if (dragWindow != null)
-	dragWindow.setOffset(new Point(cachedBounds.width / 2, 
+        dragWindow.setOffset(new Point(cachedBounds.width / 2,
             cachedBounds.height / 2));
 
       dragTo(e.getPoint(), origin);
@@ -1227,7 +1227,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     public void mouseReleased(MouseEvent e)
     {
       if (! isDragging || ! toolBar.isFloatable())
-	return;
+        return;
 
       isDragging = false;
       floatAt(e.getPoint(), origin);
@@ -1267,7 +1267,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     public Color getBorderColor()
     {
       if (borderColor == null)
-	return Color.BLACK;
+        return Color.BLACK;
 
       return borderColor;
     }
@@ -1341,7 +1341,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     public void setOrientation(int o)
     {
       toolBar.setOrientation(o);
-      if (dragWindow != null) 
+      if (dragWindow != null)
         dragWindow.setOrientation(o);
     }
   }
@@ -1364,10 +1364,10 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
 
       if (origParent != null)
         {
-	  origParent.add(toolBar,
-	                 (constraintBeforeFloating != null)
-	                 ? constraintBeforeFloating : BorderLayout.NORTH);
-	  toolBar.setOrientation(lastGoodOrientation);
+          origParent.add(toolBar,
+                         (constraintBeforeFloating != null)
+                         ? constraintBeforeFloating : BorderLayout.NORTH);
+          toolBar.setOrientation(lastGoodOrientation);
         }
 
       origParent.invalidate();
@@ -1410,16 +1410,16 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     {
       if (e.getChild() instanceof JButton)
         {
-	  JButton b = (JButton) e.getChild();
+          JButton b = (JButton) e.getChild();
 
-	  if (b.getBorder() != null)
-	    borders.put(b, b.getBorder());
+          if (b.getBorder() != null)
+            borders.put(b, b.getBorder());
         }
 
       if (isRolloverBorders())
-	setBorderToRollover(e.getChild());
+        setBorderToRollover(e.getChild());
       else
-	setBorderToNonRollover(e.getChild());
+        setBorderToNonRollover(e.getChild());
 
       cachedBounds = toolBar.getPreferredSize();
       cachedOrientation = toolBar.getOrientation();
@@ -1479,7 +1479,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     /**
      * Receives notification when the toolbar or one of it's component
      * receives the keyboard input focus.
-     * 
+     *
      * @param e the focus event
      */
     public void focusGained(FocusEvent e)
@@ -1491,7 +1491,7 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     /**
      * Receives notification when the toolbar or one of it's component
      * looses the keyboard input focus.
-     * 
+     *
      * @param e the focus event
      */
     public void focusLost(FocusEvent e)
@@ -1522,15 +1522,15 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     {
       if (c instanceof JToolBar)
         {
-	  JToolBar tb = (JToolBar) c;
-	  int orientation = tb.getOrientation();
+          JToolBar tb = (JToolBar) c;
+          int orientation = tb.getOrientation();
 
-	  if (! tb.isFloatable())
-	    return new Insets(regular, regular, regular, regular);
-	  else if (orientation == SwingConstants.HORIZONTAL)
-	    return new Insets(regular, offset, regular, regular);
-	  else
-	    return new Insets(offset, regular, regular, regular);
+          if (! tb.isFloatable())
+            return new Insets(regular, regular, regular, regular);
+          else if (orientation == SwingConstants.HORIZONTAL)
+            return new Insets(regular, offset, regular, regular);
+          else
+            return new Insets(offset, regular, regular, regular);
         }
 
       return new Insets(0, 0, 0, 0);
@@ -1568,9 +1568,9 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
       int count = 0;
 
       for (int i = x; i < (w + x); i += hgap)
-	for (int j = ((count++ % 2) == 0) ? y : (y + (2 * size)); j < (h + y);
-	     j += vgap)
-	  g.fillRect(i, j, size, size);
+        for (int j = ((count++ % 2) == 0) ? y : (y + (2 * size)); j < (h + y);
+             j += vgap)
+          g.fillRect(i, j, size, size);
 
       g.setColor(saved);
     }
@@ -1590,20 +1590,20 @@ public class BasicToolBarUI extends ToolBarUI implements SwingConstants
     {
       if (c instanceof JToolBar)
         {
-	  JToolBar tb = (JToolBar) c;
+          JToolBar tb = (JToolBar) c;
 
-	  int orientation = tb.getOrientation();
+          int orientation = tb.getOrientation();
 
-	  if (orientation == SwingConstants.HORIZONTAL)
-	    {
-	      paintBumps(g, x, y, offset, height, 1, Color.WHITE);
-	      paintBumps(g, x + 1, y + 1, offset - 1, height - 1, 1, Color.GRAY);
-	    }
-	  else
-	    {
-	      paintBumps(g, x, y, width, offset, 1, Color.WHITE);
-	      paintBumps(g, x + 1, y + 1, width - 1, offset - 1, 1, Color.GRAY);
-	    }
+          if (orientation == SwingConstants.HORIZONTAL)
+            {
+              paintBumps(g, x, y, offset, height, 1, Color.WHITE);
+              paintBumps(g, x + 1, y + 1, offset - 1, height - 1, 1, Color.GRAY);
+            }
+          else
+            {
+              paintBumps(g, x, y, width, offset, 1, Color.WHITE);
+              paintBumps(g, x + 1, y + 1, width - 1, offset - 1, 1, Color.GRAY);
+            }
         }
     }
   }
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
index 94e7bc322f6..37c084bb89f 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicToolTipUI.java
@@ -80,7 +80,7 @@ public class BasicToolTipUI extends ToolTipUI
           BasicHTML.updateRenderer(tip, text);
         }
     }
-    
+
   }
 
   /** The shared instance of BasicToolTipUI used for all ToolTips. */
@@ -103,7 +103,7 @@ public class BasicToolTipUI extends ToolTipUI
   }
 
   /**
-   * This method creates a new BasicToolTip UI for the given 
+   * This method creates a new BasicToolTip UI for the given
    * JComponent.
    *
    * @param c The JComponent to create a UI for.
@@ -245,10 +245,10 @@ public class BasicToolTipUI extends ToolTipUI
     if (view != null)
       view.paint(g, paintR);
     else
-      g.drawString(text, paintR.x + 3, paintR.y + ascent); 
+      g.drawString(text, paintR.x + 3, paintR.y + ascent);
 
     g.setFont(oldFont);
-    g.setColor(saved);   
+    g.setColor(saved);
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
index 1c28a5f961d..af61a422a5f 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicTreeUI.java
@@ -109,7 +109,7 @@ import javax.swing.tree.VariableHeightLayoutCache;
 /**
  * A delegate providing the user interface for JTree according to
  * the Basic look and feel.
- * 
+ *
  * @see javax.swing.JTree
  * @author Lillian Angel (langel@redhat.com)
  * @author Sascha Brawer (brawer@dandelis.ch)
@@ -174,7 +174,7 @@ public class BasicTreeUI
    * Set to false when editing and shouldSelectCall() returns true meaning the
    * node should be selected before editing, used in completeEditing.
    * GNU Classpath editing is implemented differently, so this value is not
-   * actually read anywhere. However it is always set correctly to maintain 
+   * actually read anywhere. However it is always set correctly to maintain
    * interoperability with the derived classes that read this field.
    */
   protected boolean stopEditingInCompleteEditing;
@@ -248,7 +248,7 @@ public class BasicTreeUI
 
   /** The max height of the nodes in the tree. */
   int maxHeight;
-  
+
   /** The hash color. */
   Color hashColor;
 
@@ -294,7 +294,7 @@ public class BasicTreeUI
 
   /**
    * Returns an instance of the UI delegate for the specified component.
-   * 
+   *
    * @param c the JComponent for which we need a UI delegate for.
    * @return the ComponentUI for c.
    */
@@ -305,7 +305,7 @@ public class BasicTreeUI
 
   /**
    * Returns the Hash color.
-   * 
+   *
    * @return the Color of the Hash.
    */
   protected Color getHashColor()
@@ -315,7 +315,7 @@ public class BasicTreeUI
 
   /**
    * Sets the Hash color.
-   * 
+   *
    * @param color the Color to set the Hash to.
    */
   protected void setHashColor(Color color)
@@ -325,7 +325,7 @@ public class BasicTreeUI
 
   /**
    * Sets the left child's indent value.
-   * 
+   *
    * @param newAmount is the new indent value for the left child.
    */
   public void setLeftChildIndent(int newAmount)
@@ -335,7 +335,7 @@ public class BasicTreeUI
 
   /**
    * Returns the indent value for the left child.
-   * 
+   *
    * @return the indent value for the left child.
    */
   public int getLeftChildIndent()
@@ -345,7 +345,7 @@ public class BasicTreeUI
 
   /**
    * Sets the right child's indent value.
-   * 
+   *
    * @param newAmount is the new indent value for the right child.
    */
   public void setRightChildIndent(int newAmount)
@@ -355,7 +355,7 @@ public class BasicTreeUI
 
   /**
    * Returns the indent value for the right child.
-   * 
+   *
    * @return the indent value for the right child.
    */
   public int getRightChildIndent()
@@ -365,7 +365,7 @@ public class BasicTreeUI
 
   /**
    * Sets the expanded icon.
-   * 
+   *
    * @param newG is the new expanded icon.
    */
   public void setExpandedIcon(Icon newG)
@@ -375,7 +375,7 @@ public class BasicTreeUI
 
   /**
    * Returns the current expanded icon.
-   * 
+   *
    * @return the current expanded icon.
    */
   public Icon getExpandedIcon()
@@ -385,7 +385,7 @@ public class BasicTreeUI
 
   /**
    * Sets the collapsed icon.
-   * 
+   *
    * @param newG is the new collapsed icon.
    */
   public void setCollapsedIcon(Icon newG)
@@ -395,7 +395,7 @@ public class BasicTreeUI
 
   /**
    * Returns the current collapsed icon.
-   * 
+   *
    * @return the current collapsed icon.
    */
   public Icon getCollapsedIcon()
@@ -405,7 +405,7 @@ public class BasicTreeUI
 
   /**
    * Updates the componentListener, if necessary.
-   * 
+   *
    * @param largeModel sets this.largeModel to it.
    */
   protected void setLargeModel(boolean largeModel)
@@ -421,7 +421,7 @@ public class BasicTreeUI
 
   /**
    * Returns true if largeModel is set
-   * 
+   *
    * @return true if largeModel is set, otherwise false.
    */
   protected boolean isLargeModel()
@@ -431,7 +431,7 @@ public class BasicTreeUI
 
   /**
    * Sets the row height.
-   * 
+   *
    * @param rowHeight is the height to set this.rowHeight to.
    */
   protected void setRowHeight(int rowHeight)
@@ -444,7 +444,7 @@ public class BasicTreeUI
 
   /**
    * Returns the current row height.
-   * 
+   *
    * @return current row height.
    */
   protected int getRowHeight()
@@ -455,7 +455,7 @@ public class BasicTreeUI
   /**
    * Sets the TreeCellRenderer to tcr. This invokes
    * updateRenderer.
-   * 
+   *
    * @param tcr is the new TreeCellRenderer.
    */
   protected void setCellRenderer(TreeCellRenderer tcr)
@@ -469,15 +469,15 @@ public class BasicTreeUI
     // Refresh the layout if necessary.
     if (treeState != null)
       {
-	treeState.invalidateSizes();
-	updateSize();
+        treeState.invalidateSizes();
+        updateSize();
       }
   }
 
   /**
    * Return currentCellRenderer, which will either be the trees renderer, or
    * defaultCellRenderer, which ever was not null.
-   * 
+   *
    * @return the current Cell Renderer
    */
   protected TreeCellRenderer getCellRenderer()
@@ -490,7 +490,7 @@ public class BasicTreeUI
 
   /**
    * Sets the tree's model.
-   * 
+   *
    * @param model to set the treeModel to.
    */
   protected void setModel(TreeModel model)
@@ -515,7 +515,7 @@ public class BasicTreeUI
 
   /**
    * Returns the tree's model
-   * 
+   *
    * @return treeModel
    */
   protected TreeModel getModel()
@@ -525,7 +525,7 @@ public class BasicTreeUI
 
   /**
    * Sets the root to being visible.
-   * 
+   *
    * @param newValue sets the visibility of the root
    */
   protected void setRootVisible(boolean newValue)
@@ -536,7 +536,7 @@ public class BasicTreeUI
 
   /**
    * Returns true if the root is visible.
-   * 
+   *
    * @return true if the root is visible.
    */
   protected boolean isRootVisible()
@@ -546,7 +546,7 @@ public class BasicTreeUI
 
   /**
    * Determines whether the node handles are to be displayed.
-   * 
+   *
    * @param newValue sets whether or not node handles should be displayed.
    */
   protected void setShowsRootHandles(boolean newValue)
@@ -562,7 +562,7 @@ public class BasicTreeUI
 
   /**
    * Returns true if the node handles are to be displayed.
-   * 
+   *
    * @return true if the node handles are to be displayed.
    */
   protected boolean getShowsRootHandles()
@@ -572,7 +572,7 @@ public class BasicTreeUI
 
   /**
    * Sets the cell editor.
-   * 
+   *
    * @param editor to set the cellEditor to.
    */
   protected void setCellEditor(TreeCellEditor editor)
@@ -582,7 +582,7 @@ public class BasicTreeUI
 
   /**
    * Returns the TreeCellEditor for this tree.
-   * 
+   *
    * @return the cellEditor for this tree.
    */
   protected TreeCellEditor getCellEditor()
@@ -592,7 +592,7 @@ public class BasicTreeUI
 
   /**
    * Configures the receiver to allow, or not allow, editing.
-   * 
+   *
    * @param newValue sets the receiver to allow editing if true.
    */
   protected void setEditable(boolean newValue)
@@ -602,7 +602,7 @@ public class BasicTreeUI
 
   /**
    * Returns true if the receiver allows editing.
-   * 
+   *
    * @return true if the receiver allows editing.
    */
   protected boolean isEditable()
@@ -613,7 +613,7 @@ public class BasicTreeUI
   /**
    * Resets the selection model. The appropriate listeners are installed on the
    * model.
-   * 
+   *
    * @param newLSM resets the selection model.
    */
   protected void setSelectionModel(TreeSelectionModel newLSM)
@@ -628,7 +628,7 @@ public class BasicTreeUI
 
   /**
    * Returns the current selection model.
-   * 
+   *
    * @return the current selection model.
    */
   protected TreeSelectionModel getSelectionModel()
@@ -640,7 +640,7 @@ public class BasicTreeUI
    * Returns the Rectangle enclosing the label portion that the last item in
    * path will be drawn to. Will return null if any component in path is
    * currently valid.
-   * 
+   *
    * @param tree is the current tree the path will be drawn to.
    * @param path is the current path the tree to draw to.
    * @return the Rectangle enclosing the label portion that the last item in the
@@ -664,7 +664,7 @@ public class BasicTreeUI
 
   /**
    * Returns the max height of all the nodes in the tree.
-   * 
+   *
    * @param tree - the current tree
    * @return the max height.
    */
@@ -690,11 +690,11 @@ public class BasicTreeUI
 
         maxHeight = Math.max(maxHeight, iconHeight + gap);
       }
-     
+
     treeState.setRowHeight(maxHeight);
     return maxHeight;
   }
-  
+
   /**
    * Get the tree node icon.
    */
@@ -711,7 +711,7 @@ public class BasicTreeUI
 
   /**
    * Returns the path for passed in row. If row is not visible null is returned.
-   * 
+   *
    * @param tree is the current tree to return path for.
    * @param row is the row number of the row to return.
    * @return the path for passed in row. If row is not visible null is returned.
@@ -724,7 +724,7 @@ public class BasicTreeUI
   /**
    * Returns the row that the last item identified in path is visible at. Will
    * return -1 if any of the elments in the path are not currently visible.
-   * 
+   *
    * @param tree is the current tree to return the row for.
    * @param path is the path used to find the row.
    * @return the row that the last item identified in path is visible at. Will
@@ -738,7 +738,7 @@ public class BasicTreeUI
 
   /**
    * Returns the number of rows that are being displayed.
-   * 
+   *
    * @param tree is the current tree to return the number of rows for.
    * @return the number of rows being displayed.
    */
@@ -752,7 +752,7 @@ public class BasicTreeUI
    * currently visible this will return null, otherwise it'll always return a
    * valid path. If you need to test if the returned object is exactly at x,y
    * you should get the bounds for the returned path and test x,y against that.
-   * 
+   *
    * @param tree the tree to search for the closest path
    * @param x is the x coordinate of the location to search
    * @param y is the y coordinate of the location to search
@@ -766,7 +766,7 @@ public class BasicTreeUI
   /**
    * Returns true if the tree is being edited. The item that is being edited can
    * be returned by getEditingPath().
-   * 
+   *
    * @param tree is the tree to check for editing.
    * @return true if the tree is being edited.
    */
@@ -779,7 +779,7 @@ public class BasicTreeUI
    * Stops the current editing session. This has no effect if the tree is not
    * being edited. Returns true if the editor allows the editing session to
    * stop.
-   * 
+   *
    * @param tree is the tree to stop the editing on
    * @return true if the editor allows the editing session to stop.
    */
@@ -796,7 +796,7 @@ public class BasicTreeUI
 
   /**
    * Cancels the current editing session.
-   * 
+   *
    * @param tree is the tree to cancel the editing session on.
    */
   public void cancelEditing(JTree tree)
@@ -811,7 +811,7 @@ public class BasicTreeUI
   /**
    * Selects the last item in path and tries to edit it. Editing will fail if
    * the CellEditor won't allow it for the selected item.
-   * 
+   *
    * @param tree is the tree to edit on.
    * @param path is the path in tree to edit on.
    */
@@ -824,7 +824,7 @@ public class BasicTreeUI
 
   /**
    * Returns the path to the element that is being editted.
-   * 
+   *
    * @param tree is the tree to get the editing path from.
    * @return the path that is being edited.
    */
@@ -858,7 +858,7 @@ public class BasicTreeUI
     updateDepthOffset();
     setSelectionModel(tree.getSelectionModel());
     configureLayoutCache();
-    treeState.setRootVisible(tree.isRootVisible()); 
+    treeState.setRootVisible(tree.isRootVisible());
     treeSelectionModel.setRowMapper(treeState);
     updateSize();
   }
@@ -887,7 +887,7 @@ public class BasicTreeUI
    * Creates an instance of NodeDimensions that is able to determine the size of
    * a given node in the tree. The node dimensions must be created before
    * configuring the layout cache.
-   * 
+   *
    * @return the NodeDimensions of a given node in the tree
    */
   protected AbstractLayoutCache.NodeDimensions createNodeDimensions()
@@ -898,7 +898,7 @@ public class BasicTreeUI
   /**
    * Creates a listener that is reponsible for the updates the UI based on how
    * the tree changes.
-   * 
+   *
    * @return the PropertyChangeListener that is reposnsible for the updates
    */
   protected PropertyChangeListener createPropertyChangeListener()
@@ -909,7 +909,7 @@ public class BasicTreeUI
   /**
    * Creates the listener responsible for updating the selection based on mouse
    * events.
-   * 
+   *
    * @return the MouseListener responsible for updating.
    */
   protected MouseListener createMouseListener()
@@ -920,7 +920,7 @@ public class BasicTreeUI
   /**
    * Creates the listener that is responsible for updating the display when
    * focus is lost/grained.
-   * 
+   *
    * @return the FocusListener responsible for updating.
    */
   protected FocusListener createFocusListener()
@@ -930,7 +930,7 @@ public class BasicTreeUI
 
   /**
    * Creates the listener reponsible for getting key events from the tree.
-   * 
+   *
    * @return the KeyListener responsible for getting key events.
    */
   protected KeyListener createKeyListener()
@@ -941,7 +941,7 @@ public class BasicTreeUI
   /**
    * Creates the listener responsible for getting property change events from
    * the selection model.
-   * 
+   *
    * @returns the PropertyChangeListener reponsible for getting property change
    *          events from the selection model.
    */
@@ -953,7 +953,7 @@ public class BasicTreeUI
   /**
    * Creates the listener that updates the display based on selection change
    * methods.
-   * 
+   *
    * @return the TreeSelectionListener responsible for updating.
    */
   protected TreeSelectionListener createTreeSelectionListener()
@@ -963,7 +963,7 @@ public class BasicTreeUI
 
   /**
    * Creates a listener to handle events from the current editor
-   * 
+   *
    * @return the CellEditorListener that handles events from the current editor
    */
   protected CellEditorListener createCellEditorListener()
@@ -975,7 +975,7 @@ public class BasicTreeUI
    * Creates and returns a new ComponentHandler. This is used for the large
    * model to mark the validCachedPreferredSize as invalid when the component
    * moves.
-   * 
+   *
    * @return a new ComponentHandler.
    */
   protected ComponentListener createComponentListener()
@@ -986,7 +986,7 @@ public class BasicTreeUI
   /**
    * Creates and returns the object responsible for updating the treestate when
    * a nodes expanded state changes.
-   * 
+   *
    * @return the TreeExpansionListener responsible for updating the treestate
    */
   protected TreeExpansionListener createTreeExpansionListener()
@@ -997,7 +997,7 @@ public class BasicTreeUI
   /**
    * Creates the object responsible for managing what is expanded, as well as
    * the size of nodes.
-   * 
+   *
    * @return the object responsible for managing what is expanded.
    */
   protected AbstractLayoutCache createLayoutCache()
@@ -1007,7 +1007,7 @@ public class BasicTreeUI
 
   /**
    * Returns the renderer pane that renderer components are placed in.
-   * 
+   *
    * @return the rendererpane that render components are placed in.
    */
   protected CellRendererPane createCellRendererPane()
@@ -1017,7 +1017,7 @@ public class BasicTreeUI
 
   /**
    * Creates a default cell editor.
-   * 
+   *
    * @return the default cell editor.
    */
   protected TreeCellEditor createDefaultCellEditor()
@@ -1035,7 +1035,7 @@ public class BasicTreeUI
   /**
    * Returns the default cell renderer that is used to do the stamping of each
    * node.
-   * 
+   *
    * @return the default cell renderer that is used to do the stamping of each
    *         node.
    */
@@ -1046,7 +1046,7 @@ public class BasicTreeUI
 
   /**
    * Returns a listener that can update the tree when the model changes.
-   * 
+   *
    * @return a listener that can update the tree when the model changes.
    */
   protected TreeModelListener createTreeModelListener()
@@ -1099,7 +1099,7 @@ public class BasicTreeUI
   /**
    * The vertical element of legs between nodes starts at the bottom of the
    * parent node by default. This method makes the leg start below that.
-   * 
+   *
    * @return the vertical leg buffer
    */
   protected int getVerticalLegBuffer()
@@ -1111,7 +1111,7 @@ public class BasicTreeUI
    * The horizontal element of legs between nodes starts at the right of the
    * left-hand side of the child node by default. This method makes the leg end
    * before that.
-   * 
+   *
    * @return the horizontal leg buffer
    */
   protected int getHorizontalLegBuffer()
@@ -1133,7 +1133,7 @@ public class BasicTreeUI
    * Updates the expanded state of all the descendants of the path
    * by getting the expanded descendants from the tree and forwarding to the
    * tree state.
-   * 
+   *
    * @param path the path used to update the expanded states
    */
   protected void updateExpandedDescendants(TreePath path)
@@ -1146,7 +1146,7 @@ public class BasicTreeUI
 
   /**
    * Returns a path to the last child of parent
-   * 
+   *
    * @param parent is the topmost path to specified
    * @return a path to the last child of parent
    */
@@ -1206,24 +1206,24 @@ public class BasicTreeUI
   {
     if (tree != null)
       {
-	TreeCellRenderer rend = tree.getCellRenderer();
-	if (rend != null)
-	  {
-	    createdRenderer = false;
-	    currentCellRenderer = rend;
-	    if (createdCellEditor)
-	      tree.setCellEditor(null);
-	  }
-	else
-	  {
-	    tree.setCellRenderer(createDefaultCellRenderer());
-	    createdRenderer = true;
-	  }
+        TreeCellRenderer rend = tree.getCellRenderer();
+        if (rend != null)
+          {
+            createdRenderer = false;
+            currentCellRenderer = rend;
+            if (createdCellEditor)
+              tree.setCellEditor(null);
+          }
+        else
+          {
+            tree.setCellRenderer(createDefaultCellRenderer());
+            createdRenderer = true;
+          }
       }
     else
       {
-	currentCellRenderer = null;
-	createdRenderer = false;
+        currentCellRenderer = null;
+        createdRenderer = false;
       }
 
     updateCellEditor();
@@ -1262,7 +1262,7 @@ public class BasicTreeUI
 
   /**
    * Messaged from the VisibleTreeNode after it has been expanded.
-   * 
+   *
    * @param path is the path that has been expanded.
    */
   protected void pathWasExpanded(TreePath path)
@@ -1289,11 +1289,11 @@ public class BasicTreeUI
   {
     LookAndFeel.installColorsAndFont(tree, "Tree.background",
                                      "Tree.foreground", "Tree.font");
-    
+
     hashColor = UIManager.getColor("Tree.hash");
     if (hashColor == null)
       hashColor = Color.black;
-    
+
     tree.setOpaque(true);
 
     rightChildIndent = UIManager.getInt("Tree.rightChildIndent");
@@ -1383,7 +1383,7 @@ public class BasicTreeUI
     am.put(action.getValue(Action.NAME), action);
     action = new TreeTraverseAction(1, "selectChild");
     am.put(action.getValue(Action.NAME), action);
-    
+
     // TreeToggleAction.
     action = new TreeToggleAction("toggleAndAnchor");
     am.put(action.getValue(Action.NAME), action);
@@ -1401,20 +1401,20 @@ public class BasicTreeUI
     am.put(action.getValue(Action.NAME), action);
     action = new TreePageAction(1, "scrollDownChangeLead");
     am.put(action.getValue(Action.NAME), action);
-    
+
     // Tree editing actions
     action = new TreeStartEditingAction("startEditing");
     am.put(action.getValue(Action.NAME), action);
     action = new TreeCancelEditingAction("cancel");
     am.put(action.getValue(Action.NAME), action);
-    
+
 
     return am;
   }
 
   /**
    * Converts the modifiers.
-   * 
+   *
    * @param mod - modifier to convert
    * @returns the new modifier
    */
@@ -1492,7 +1492,7 @@ public class BasicTreeUI
 
   /**
    * Install the UI for the component
-   * 
+   *
    * @param c the component to install UI for
    */
   public void installUI(JComponent c)
@@ -1506,7 +1506,7 @@ public class BasicTreeUI
     installListeners();
     completeUIInstall();
   }
-  
+
   /**
    * Uninstall the defaults for the tree
    */
@@ -1519,7 +1519,7 @@ public class BasicTreeUI
 
   /**
    * Uninstall the UI for the component
-   * 
+   *
    * @param c the component to uninstall UI for
    */
   public void uninstallUI(JComponent c)
@@ -1539,7 +1539,7 @@ public class BasicTreeUI
    * method is invoked from the ComponentUI.update method when the specified
    * component is being painted. Subclasses should override this method and use
    * the specified Graphics object to render the content of the component.
-   * 
+   *
    * @param g the Graphics context in which to paint
    * @param c the component being painted; this argument is often ignored, but
    *          might be used if the UI object is stateless and shared by multiple
@@ -1548,9 +1548,9 @@ public class BasicTreeUI
   public void paint(Graphics g, JComponent c)
   {
     JTree tree = (JTree) c;
-    
+
     int rows = treeState.getRowCount();
-    
+
     if (rows == 0)
       // There is nothing to do if the tree is empty.
       return;
@@ -1639,7 +1639,7 @@ public class BasicTreeUI
 
   /**
    * Ensures that the rows identified by beginRow through endRow are visible.
-   * 
+   *
    * @param beginRow is the first row
    * @param endRow is the last row
    */
@@ -1662,7 +1662,7 @@ public class BasicTreeUI
 
   /**
    * Sets the preferred minimum size.
-   * 
+   *
    * @param newSize is the new preferred minimum size.
    */
   public void setPreferredMinSize(Dimension newSize)
@@ -1672,7 +1672,7 @@ public class BasicTreeUI
 
   /**
    * Gets the preferred minimum size.
-   * 
+   *
    * @returns the preferred minimum size.
    */
   public Dimension getPreferredMinSize()
@@ -1686,7 +1686,7 @@ public class BasicTreeUI
   /**
    * Returns the preferred size to properly display the tree, this is a cover
    * method for getPreferredSize(c, false).
-   * 
+   *
    * @param c the component whose preferred size is being queried; this argument
    *          is often ignored but might be used if the UI object is stateless
    *          and shared by multiple components
@@ -1700,7 +1700,7 @@ public class BasicTreeUI
   /**
    * Returns the preferred size to represent the tree in c. If checkConsistancy
    * is true, checkConsistancy is messaged first.
-   * 
+   *
    * @param c the component whose preferred size is being queried.
    * @param checkConsistancy if true must check consistancy
    * @return the preferred size
@@ -1721,7 +1721,7 @@ public class BasicTreeUI
   /**
    * Returns the minimum size for this component. Which will be the min
    * preferred size or (0,0).
-   * 
+   *
    * @param c the component whose min size is being queried.
    * @returns the preferred size or null
    */
@@ -1733,7 +1733,7 @@ public class BasicTreeUI
   /**
    * Returns the maximum size for the component, which will be the preferred
    * size if the instance is currently in JTree or (0,0).
-   * 
+   *
    * @param c the component whose preferred size is being queried
    * @return the max size or null
    */
@@ -1763,7 +1763,7 @@ public class BasicTreeUI
    * with stopEditing, if messageCancel is true the editor is messaged with
    * cancelEditing. If messageTree is true, the treeModel is messaged with
    * valueForPathChanged.
-   * 
+   *
    * @param messageStop message to stop editing
    * @param messageCancel message to cancel editing
    * @param messageTree message to treeModel
@@ -1808,7 +1808,7 @@ public class BasicTreeUI
   /**
    * Will start editing for node if there is a cellEditor and shouldSelectCall
    * returns true. This assumes that path is valid and visible.
-   * 
+   *
    * @param path is the path to start editing
    * @param event is the MouseEvent performed on the path
    * @return true if successful
@@ -1826,7 +1826,7 @@ public class BasicTreeUI
       {
         if (ed.isCellEditable(event))
           {
-            editingRow = getRowForPath(tree, path); 
+            editingRow = getRowForPath(tree, path);
             Object value = path.getLastPathComponent();
             boolean isSelected = tree.isPathSelected(path);
             boolean isExpanded = tree.isExpanded(editingPath);
@@ -1852,7 +1852,7 @@ public class BasicTreeUI
               }
             else
               editorHasDifferentSize = false;
-            
+
             // The editing component must be added to its container. We add the
             // container, not the editing component itself.
             tree.add(editingComponent);
@@ -1880,7 +1880,7 @@ public class BasicTreeUI
                 if (active != null)
                   {
                     MouseInputHandler ih = new MouseInputHandler(tree, active, event);
-                    
+
                   }
               }
 
@@ -1910,13 +1910,13 @@ public class BasicTreeUI
       }
     else if (c.isFocusable())
       c.requestFocus();
-      
+
   }
 
   /**
    * If the mouseX and mouseY are in the expand or
    * collapse region of the row, this will toggle the row.
-   * 
+   *
    * @param path the path we are concerned with
    * @param mouseX is the cursor's x position
    * @param mouseY is the cursor's y position
@@ -1932,7 +1932,7 @@ public class BasicTreeUI
    * Returns true if the mouseX and mouseY fall in
    * the area of row that is used to expand/collpse the node and the node at row
    * does not represent a leaf.
-   * 
+   *
    * @param path the path we are concerned with
    * @param mouseX is the cursor's x position
    * @param mouseY is the cursor's y position
@@ -1956,13 +1956,13 @@ public class BasicTreeUI
           width = 18;
 
         Insets i = tree.getInsets();
-        
+
         int depth;
         if (isRootVisible())
           depth = path.getPathCount()-1;
         else
           depth = path.getPathCount()-2;
-        
+
         int left = getRowX(tree.getRowForPath(path), depth)
                    - width + i.left;
         cntlClick = mouseX >= left && mouseX <= left + width;
@@ -1973,7 +1973,7 @@ public class BasicTreeUI
   /**
    * Messaged when the user clicks the particular row, this invokes
    * toggleExpandState.
-   * 
+   *
    * @param path the path we are concerned with
    * @param mouseX is the cursor's x position
    * @param mouseY is the cursor's y position
@@ -1988,7 +1988,7 @@ public class BasicTreeUI
    * expanding a path and JTree scroll on expand, ensureRowsAreVisible is
    * invoked to scroll as many of the children to visible as possible (tries to
    * scroll to last visible descendant of path).
-   * 
+   *
    * @param path the path we are concerned with
    */
   protected void toggleExpandState(TreePath path)
@@ -2006,17 +2006,17 @@ public class BasicTreeUI
    * event as "toggle selection event" if the CTRL button was pressed while
    * clicking. The event is not counted as toggle event if the associated
    * tree does not support the multiple selection.
-   * 
+   *
    * @param event is the MouseEvent performed on the row.
    * @return true signifies a mouse event on the node should toggle the
    *         selection of only the row under the mouse.
    */
   protected boolean isToggleSelectionEvent(MouseEvent event)
   {
-    return 
-      (tree.getSelectionModel().getSelectionMode() != 
+    return
+      (tree.getSelectionModel().getSelectionMode() !=
         TreeSelectionModel.SINGLE_TREE_SELECTION) &&
-      ((event.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0);  
+      ((event.getModifiersEx() & InputEvent.CTRL_DOWN_MASK) != 0);
   }
 
   /**
@@ -2025,24 +2025,24 @@ public class BasicTreeUI
    * event" if the SHIFT button was pressed while clicking. The event is not
    * counted as multiple selection event if the associated tree does not support
    * the multiple selection.
-   * 
+   *
    * @param event is the MouseEvent performed on the node.
    * @return true signifies a mouse event on the node should select from the
    *         anchor point.
    */
   protected boolean isMultiSelectEvent(MouseEvent event)
   {
-    return 
-      (tree.getSelectionModel().getSelectionMode() != 
+    return
+      (tree.getSelectionModel().getSelectionMode() !=
         TreeSelectionModel.SINGLE_TREE_SELECTION) &&
-      ((event.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0);  
+      ((event.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0);
   }
 
   /**
    * Returning true indicates the row under the mouse should be toggled based on
    * the event. This is invoked after checkForClickInExpandControl, implying the
    * location is not in the expand (toggle) control.
-   * 
+   *
    * @param event is the MouseEvent performed on the row.
    * @return true indicates the row under the mouse should be toggled based on
    *         the event.
@@ -2065,10 +2065,10 @@ public class BasicTreeUI
    * or deselected. If the event identifies a multi selection event, the
    * selection is updated from the anchor point. Otherwise, the row is selected,
    * and the previous selection is cleared.
                      
-   * 
+   *
    * @param path is the path selected for an event
    * @param event is the MouseEvent performed on the path.
-   * 
+   *
    * @see #isToggleSelectionEvent(MouseEvent)
    * @see #isMultiSelectEvent(MouseEvent)
    */
@@ -2108,7 +2108,7 @@ public class BasicTreeUI
 
   /**
    * Returns true if the node at row is a leaf.
-   * 
+   *
    * @param row is the row we are concerned with.
    * @return true if the node at row is a leaf.
    */
@@ -2121,7 +2121,7 @@ public class BasicTreeUI
     Object node = pathForRow.getLastPathComponent();
     return treeModel.isLeaf(node);
   }
-  
+
   /**
    * The action to start editing at the current lead selection path.
    */
@@ -2130,26 +2130,26 @@ public class BasicTreeUI
   {
     /**
      * Creates the new tree cancel editing action.
-     * 
+     *
      * @param name the name of the action (used in toString).
      */
     public TreeStartEditingAction(String name)
     {
       super(name);
-    }    
-    
+    }
+
     /**
      * Start editing at the current lead selection path.
-     * 
+     *
      * @param e the ActionEvent that caused this action.
      */
     public void actionPerformed(ActionEvent e)
     {
       TreePath lead = tree.getLeadSelectionPath();
-      if (!tree.isEditing()) 
+      if (!tree.isEditing())
         tree.startEditingAtPath(lead);
     }
-  }  
+  }
 
   /**
    * Updates the preferred size when scrolling, if necessary.
@@ -2176,7 +2176,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when the component's position changes.
-     * 
+     *
      * @param e the event that occurs when moving the component
      */
     public void componentMoved(ComponentEvent e)
@@ -2225,7 +2225,7 @@ public class BasicTreeUI
 
     /**
      * Returns the JScrollPane housing the JTree, or null if one isn't found.
-     * 
+     *
      * @return JScrollPane housing the JTree, or null if one isn't found.
      */
     protected JScrollPane getScrollPane()
@@ -2242,7 +2242,7 @@ public class BasicTreeUI
     /**
      * Public as a result of Timer. If the scrollBar is null, or not adjusting,
      * this stops the timer and updates the sizing.
-     * 
+     *
      * @param ae is the action performed
      */
     public void actionPerformed(ActionEvent ae)
@@ -2276,7 +2276,7 @@ public class BasicTreeUI
     /**
      * Messaged when editing has stopped in the tree. Tells the listeners
      * editing has stopped.
-     * 
+     *
      * @param e is the notification event
      */
     public void editingStopped(ChangeEvent e)
@@ -2287,7 +2287,7 @@ public class BasicTreeUI
     /**
      * Messaged when editing has been canceled in the tree. This tells the
      * listeners the editor has canceled editing.
-     * 
+     *
      * @param e is the notification event
      */
     public void editingCanceled(ChangeEvent e)
@@ -2315,7 +2315,7 @@ public class BasicTreeUI
      * row. Invoked when a component gains the keyboard focus. The method
      * repaints the lead row that is shown differently when the tree is in
      * focus.
-     * 
+     *
      * @param e is the focus event that is activated
      */
     public void focusGained(FocusEvent e)
@@ -2328,7 +2328,7 @@ public class BasicTreeUI
      * row. Invoked when a component loses the keyboard focus. The method
      * repaints the lead row that is shown differently when the tree is in
      * focus.
-     * 
+     *
      * @param e is the focus event that is deactivated
      */
     public void focusLost(FocusEvent e)
@@ -2373,7 +2373,7 @@ public class BasicTreeUI
      * element whose first letter matches the alphanumeric key pressed by the
      * user. Subsequent same key presses move the keyboard focus to the next
      * object that starts with the same letter.
-     * 
+     *
      * @param e the key typed
      */
     public void keyTyped(KeyEvent e)
@@ -2389,22 +2389,22 @@ public class BasicTreeUI
                return;
              }
         }
-      
+
       // Not found below, search above:
       for (int row = 0; row < tree.getLeadSelectionRow(); row++)
         {
            if (checkMatch(row, typed))
              {
                tree.setSelectionRow(row);
-               tree.scrollRowToVisible(row);               
+               tree.scrollRowToVisible(row);
                return;
              }
         }
     }
-    
+
     /**
      * Check if the given tree row starts with this character
-     * 
+     *
      * @param row the tree row
      * @param typed the typed char, must be converted to lowercase
      * @return true if the given tree row starts with this character
@@ -2424,7 +2424,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a key has been pressed.
-     * 
+     *
      * @param e the key pressed
      */
     public void keyPressed(KeyEvent e)
@@ -2434,7 +2434,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a key has been released
-     * 
+     *
      * @param e the key released
      */
     public void keyReleased(KeyEvent e)
@@ -2451,7 +2451,7 @@ public class BasicTreeUI
     extends MouseAdapter
     implements MouseMotionListener
   {
-    
+
     /**
      * If the cell has been selected on mouse press.
      */
@@ -2467,7 +2467,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a mouse button has been pressed on a component.
-     * 
+     *
      * @param e is the mouse event that occured
      */
     public void mousePressed(MouseEvent e)
@@ -2488,7 +2488,7 @@ public class BasicTreeUI
      * MOUSE_DRAGGED events will continue to be delivered to the component where
      * the drag originated until the mouse button is released (regardless of
      * whether the mouse position is within the bounds of the component).
-     * 
+     *
      * @param e is the mouse event that occured
      */
     public void mouseDragged(MouseEvent e)
@@ -2499,7 +2499,7 @@ public class BasicTreeUI
     /**
      * Invoked when the mouse button has been moved on a component (with no
      * buttons no down).
-     * 
+     *
      * @param e the mouse event that occured
      */
     public void mouseMoved(MouseEvent e)
@@ -2509,7 +2509,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a mouse button has been released on a component.
-     * 
+     *
      * @param e is the mouse event that occured
      */
     public void mouseReleased(MouseEvent e)
@@ -2572,7 +2572,7 @@ public class BasicTreeUI
 
     /**
      * Constructor
-     * 
+     *
      * @param source that events are coming from
      * @param destination that receives all events
      * @param e is the event received
@@ -2590,7 +2590,7 @@ public class BasicTreeUI
     /**
      * Invoked when the mouse button has been clicked (pressed and released) on
      * a component.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseClicked(MouseEvent e)
@@ -2600,7 +2600,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a mouse button has been pressed on a component.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mousePressed(MouseEvent e)
@@ -2610,7 +2610,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when a mouse button has been released on a component.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseReleased(MouseEvent e)
@@ -2621,7 +2621,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when the mouse enters a component.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseEntered(MouseEvent e)
@@ -2632,7 +2632,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when the mouse exits a component.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseExited(MouseEvent e)
@@ -2646,7 +2646,7 @@ public class BasicTreeUI
      * MOUSE_DRAGGED events will continue to be delivered to the component where
      * the drag originated until the mouse button is released (regardless of
      * whether the mouse position is within the bounds of the component).
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseDragged(MouseEvent e)
@@ -2657,7 +2657,7 @@ public class BasicTreeUI
     /**
      * Invoked when the mouse cursor has been moved onto a component but no
      * buttons have been pushed.
-     * 
+     *
      * @param e mouse event that occured
      */
     public void mouseMoved(MouseEvent e)
@@ -2716,7 +2716,7 @@ public class BasicTreeUI
      * The calling method is responsible for determining the Y location. If
      * bounds is null, a newly created Rectangle should be returned, otherwise
      * the value should be placed in bounds and returned.
-     * 
+     *
      * @param cell the value to be represented
      * @param row row being queried
      * @param depth the depth of the row
@@ -2762,13 +2762,13 @@ public class BasicTreeUI
         // FIXME: The y should be handled by the layout cache.
         size = new Rectangle(getRowX(row, depth), prefSize.height * row, prefSize.width,
                              prefSize.height);
-      
+
       return size;
     }
 
     /**
      * Returns the amount to indent the given row
-     * 
+     *
      * @return amount to indent the given row.
      */
     protected int getRowX(int row, int depth)
@@ -2795,7 +2795,7 @@ public class BasicTreeUI
 
     /**
      * This method gets called when a bound property is changed.
-     * 
+     *
      * @param event A PropertyChangeEvent object describing the event source and
      *          the property that has changed.
      */
@@ -2826,7 +2826,7 @@ public class BasicTreeUI
         }
       else if (property.equals(JTree.EDITABLE_PROPERTY))
         setEditable(((Boolean) event.getNewValue()).booleanValue());
-        
+
     }
   }
 
@@ -2848,7 +2848,7 @@ public class BasicTreeUI
 
     /**
      * This method gets called when a bound property is changed.
-     * 
+     *
      * @param event A PropertyChangeEvent object describing the event source and
      *          the property that has changed.
      */
@@ -2866,7 +2866,7 @@ public class BasicTreeUI
   {
     /**
      * Creates the new tree cancel editing action.
-     * 
+     *
      * @param name the name of the action (used in toString).
      */
     public TreeCancelEditingAction(String name)
@@ -2876,8 +2876,8 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs, cancels the cell editing (if the
-     * tree cell is being edited). 
-     * 
+     * tree cell is being edited).
+     *
      * @param e event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -2904,7 +2904,7 @@ public class BasicTreeUI
 
     /**
      * Called whenever an item in the tree has been expanded.
-     * 
+     *
      * @param event is the event that occured
      */
     public void treeExpanded(TreeExpansionEvent event)
@@ -2919,7 +2919,7 @@ public class BasicTreeUI
 
     /**
      * Called whenever an item in the tree has been collapsed.
-     * 
+     *
      * @param event is the event that occured
      */
     public void treeCollapsed(TreeExpansionEvent event)
@@ -2947,7 +2947,7 @@ public class BasicTreeUI
 
     /**
      * Creates a new TreeHomeAction instance.
-     * 
+     *
      * @param dir the direction to go to, -1 for home,
      *        1 for end
      * @param name the name of the action
@@ -2960,7 +2960,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs.
-     * 
+     *
      * @param e is the event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -3027,7 +3027,7 @@ public class BasicTreeUI
 
     /**
      * Returns true if the action is enabled.
-     * 
+     *
      * @return true if the action is enabled.
      */
     public boolean isEnabled()
@@ -3051,7 +3051,7 @@ public class BasicTreeUI
 
     /**
      * Creates a new TreeIncrementAction.
-     * 
+     *
      * @param dir up or down, -1 for up, 1 for down
      * @param name is the name of the direction
      */
@@ -3063,7 +3063,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs.
-     * 
+     *
      * @param e is the event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -3138,14 +3138,14 @@ public class BasicTreeUI
           tree.setAnchorSelectionPath(newPath);
           tree.setLeadSelectionPath(newPath);
         }
-      
+
       // Ensure that the lead path is visible after the increment action.
       tree.scrollPathToVisible(tree.getLeadSelectionPath());
     }
 
     /**
      * Returns true if the action is enabled.
-     * 
+     *
      * @return true if the action is enabled.
      */
     public boolean isEnabled()
@@ -3177,7 +3177,7 @@ public class BasicTreeUI
      * children will be null. Use e.getPath() to get the parent of the changed
      * node(s). e.getChildIndices() returns the index(es) of the changed
      * node(s).
-     * 
+     *
      * @param e is the event that occured
      */
     public void treeNodesChanged(TreeModelEvent e)
@@ -3191,7 +3191,7 @@ public class BasicTreeUI
      * Invoked after nodes have been inserted into the tree. Use e.getPath() to
      * get the parent of the new node(s). e.getChildIndices() returns the
      * index(es) of the new node(s) in ascending order.
-     * 
+     *
      * @param e is the event that occured
      */
     public void treeNodesInserted(TreeModelEvent e)
@@ -3208,7 +3208,7 @@ public class BasicTreeUI
      * siblings removed. Use e.getPath() to get the former parent of the deleted
      * node(s). e.getChildIndices() returns, in ascending order, the index(es)
      * the node(s) had before being deleted.
-     * 
+     *
      * @param e is the event that occured
      */
     public void treeNodesRemoved(TreeModelEvent e)
@@ -3224,7 +3224,7 @@ public class BasicTreeUI
      * first element does not identify the current root node the first element
      * should become the new root of the tree. Use e.getPath() to get the path
      * to the node. e.getChildIndices() returns null.
-     * 
+     *
      * @param e is the event that occured
      */
     public void treeStructureChanged(TreeModelEvent e)
@@ -3249,7 +3249,7 @@ public class BasicTreeUI
 
     /**
      * Constructor
-     * 
+     *
      * @param direction up or down
      * @param name is the name of the direction
      */
@@ -3261,7 +3261,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs.
-     * 
+     *
      * @param e is the event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -3358,7 +3358,7 @@ public class BasicTreeUI
 
     /**
      * Returns true if the action is enabled.
-     * 
+     *
      * @return true if the action is enabled.
      */
     public boolean isEnabled()
@@ -3385,7 +3385,7 @@ public class BasicTreeUI
     /**
      * Messaged when the selection changes in the tree we're displaying for.
      * Stops editing, messages super and displays the changed paths.
-     * 
+     *
      * @param event the event that characterizes the change.
      */
     public void valueChanged(TreeSelectionEvent event)
@@ -3394,15 +3394,15 @@ public class BasicTreeUI
 
       TreePath op = event.getOldLeadSelectionPath();
       TreePath np = event.getNewLeadSelectionPath();
-      
+
       // Repaint of the changed lead selection path.
       if (op != np)
         {
-          Rectangle o = treeState.getBounds(event.getOldLeadSelectionPath(), 
+          Rectangle o = treeState.getBounds(event.getOldLeadSelectionPath(),
                                            new Rectangle());
-          Rectangle n = treeState.getBounds(event.getNewLeadSelectionPath(), 
+          Rectangle n = treeState.getBounds(event.getNewLeadSelectionPath(),
                                            new Rectangle());
-          
+
           if (o != null)
             tree.repaint(o);
           if (n != null)
@@ -3419,7 +3419,7 @@ public class BasicTreeUI
   {
     /**
      * Creates a new TreeToggleAction.
-     * 
+     *
      * @param name is the name of Action field
      */
     public TreeToggleAction(String name)
@@ -3429,7 +3429,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs.
-     * 
+     *
      * @param e the event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -3452,7 +3452,7 @@ public class BasicTreeUI
 
     /**
      * Returns true if the action is enabled.
-     * 
+     *
      * @return true if the action is enabled, false otherwise
      */
     public boolean isEnabled()
@@ -3475,7 +3475,7 @@ public class BasicTreeUI
 
     /**
      * Constructor
-     * 
+     *
      * @param direction to traverse
      * @param name is the name of the direction
      */
@@ -3487,7 +3487,7 @@ public class BasicTreeUI
 
     /**
      * Invoked when an action occurs.
-     * 
+     *
      * @param e the event that occured
      */
     public void actionPerformed(ActionEvent e)
@@ -3512,7 +3512,7 @@ public class BasicTreeUI
               // we just select the parent. We do not select the root if it
               // is not visible.
               TreePath parent = current.getParentPath();
-              if (parent != null && 
+              if (parent != null &&
                   ! (parent.getPathCount() == 1 && ! tree.isRootVisible()))
                 tree.setSelectionPath(parent);
             }
@@ -3534,14 +3534,14 @@ public class BasicTreeUI
               tree.expandPath(current);
             }
         }
-      
+
       // Ensure that the lead path is visible after the increment action.
       tree.scrollPathToVisible(tree.getLeadSelectionPath());
     }
 
     /**
      * Returns true if the action is enabled.
-     * 
+     *
      * @return true if the action is enabled, false otherwise
      */
     public boolean isEnabled()
@@ -3553,7 +3553,7 @@ public class BasicTreeUI
   /**
    * Returns true if the LookAndFeel implements the control icons. Package
    * private for use in inner classes.
-   * 
+   *
    * @returns true if there are control icons
    */
   boolean hasControlIcons()
@@ -3566,7 +3566,7 @@ public class BasicTreeUI
   /**
    * Returns control icon. It is null if the LookAndFeel does not implements the
    * control icons. Package private for use in inner classes.
-   * 
+   *
    * @return control icon if it exists.
    */
   Icon getCurrentControlIcon(TreePath path)
@@ -3604,7 +3604,7 @@ public class BasicTreeUI
 
   /**
    * Returns the parent of the current node
-   * 
+   *
    * @param root is the root of the tree
    * @param node is the current node
    * @return is the parent of the current node
@@ -3621,7 +3621,7 @@ public class BasicTreeUI
 
   /**
    * Recursively checks the tree for the specified node, starting at the root.
-   * 
+   *
    * @param root is starting node to start searching at.
    * @param node is the node to search for
    * @return the parent node of node
@@ -3648,7 +3648,7 @@ public class BasicTreeUI
   /**
    * Selects the specified path in the tree depending on modes. Package private
    * for use in inner classes.
-   * 
+   *
    * @param tree is the tree we are selecting the path in
    * @param path is the path we are selecting
    */
@@ -3657,7 +3657,7 @@ public class BasicTreeUI
     if (path != null)
       {
         tree.setSelectionPath(path);
-        tree.setLeadSelectionPath(path);        
+        tree.setLeadSelectionPath(path);
         tree.makeVisible(path);
         tree.scrollPathToVisible(path);
       }
@@ -3666,7 +3666,7 @@ public class BasicTreeUI
   /**
    * Returns the path from node to the root. Package private for use in inner
    * classes.
-   * 
+   *
    * @param node the node to get the path to
    * @param depth the depth of the tree to return a path for
    * @return an array of tree nodes that represent the path to node.
@@ -3689,7 +3689,7 @@ public class BasicTreeUI
 
   /**
    * Draws a vertical line using the given graphic context
-   * 
+   *
    * @param g is the graphic context
    * @param c is the component the new line will belong to
    * @param x is the horizonal position
@@ -3706,7 +3706,7 @@ public class BasicTreeUI
 
   /**
    * Draws a horizontal line using the given graphic context
-   * 
+   *
    * @param g is the graphic context
    * @param c is the component the new line will belong to
    * @param y is the vertical position
@@ -3723,7 +3723,7 @@ public class BasicTreeUI
 
   /**
    * Draws an icon at around a specific position
-   * 
+   *
    * @param c is the component the new line will belong to
    * @param g is the graphic context
    * @param icon is the icon which will be drawn
@@ -3745,7 +3745,7 @@ public class BasicTreeUI
 
   /**
    * Draws a dashed horizontal line.
-   * 
+   *
    * @param g - the graphics configuration.
    * @param y - the y location to start drawing at
    * @param x1 - the x location to start drawing at
@@ -3760,7 +3760,7 @@ public class BasicTreeUI
 
   /**
    * Draws a dashed vertical line.
-   * 
+   *
    * @param g - the graphics configuration.
    * @param x - the x location to start drawing at
    * @param y1 - the y location to start drawing at
@@ -3776,7 +3776,7 @@ public class BasicTreeUI
   /**
    * Paints the expand (toggle) part of a row. The receiver should NOT modify
    * clipBounds, or insets.
-   * 
+   *
    * @param g - the graphics configuration
    * @param clipBounds -
    * @param insets -
@@ -3806,7 +3806,7 @@ public class BasicTreeUI
    * Paints the horizontal part of the leg. The receiver should NOT modify
    * clipBounds, or insets. NOTE: parentRow can be -1 if the root is not
    * visible.
-   * 
+   *
    * @param g - the graphics configuration
    * @param clipBounds -
    * @param insets -
@@ -3834,7 +3834,7 @@ public class BasicTreeUI
   /**
    * Paints the vertical part of the leg. The receiver should NOT modify
    * clipBounds, insets.
-   * 
+   *
    * @param g - the graphics configuration.
    * @param clipBounds -
    * @param insets -
@@ -3845,7 +3845,7 @@ public class BasicTreeUI
   {
     Rectangle bounds = getPathBounds(tree, path);
     TreePath parent = path.getParentPath();
-    
+
     boolean paintLine;
     if (isRootVisible())
       paintLine = parent != null;
@@ -3854,7 +3854,7 @@ public class BasicTreeUI
     if (paintLine)
       {
         Rectangle parentBounds = getPathBounds(tree, parent);
-        paintVerticalLine(g, tree, parentBounds.x + 2 * gap, 
+        paintVerticalLine(g, tree, parentBounds.x + 2 * gap,
                           parentBounds.y + parentBounds.height / 2,
                           bounds.y + bounds.height / 2);
       }
@@ -3863,7 +3863,7 @@ public class BasicTreeUI
   /**
    * Paints the renderer part of a row. The receiver should NOT modify
    * clipBounds, or insets.
-   * 
+   *
    * @param g - the graphics configuration
    * @param clipBounds -
    * @param insets -
@@ -3911,7 +3911,7 @@ public class BasicTreeUI
   /**
    * Returns true if the expand (toggle) control should be drawn for the
    * specified row.
-   * 
+   *
    * @param path - current path to check for.
    * @param row - current row to check for.
    * @param isExpanded - true if the path is expanded
@@ -3929,7 +3929,7 @@ public class BasicTreeUI
 
   /**
    * Returns the amount to indent the given row
-   * 
+   *
    * @return amount to indent the given row.
    */
   protected int getRowX(int row, int depth)
diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
index 51b902d6443..11c7d639084 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicViewportUI.java
@@ -43,7 +43,7 @@ import javax.swing.LookAndFeel;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ViewportUI;
 
-public class BasicViewportUI extends ViewportUI 
+public class BasicViewportUI extends ViewportUI
 {
   protected void installDefaults(JComponent c)
   {
@@ -61,13 +61,13 @@ public class BasicViewportUI extends ViewportUI
     return new BasicViewportUI();
   }
 
-  public void installUI(JComponent c) 
+  public void installUI(JComponent c)
   {
     super.installUI(c);
     installDefaults(c);
   }
 
-  public void uninstallUI(JComponent c) 
+  public void uninstallUI(JComponent c)
   {
     super.uninstallUI(c);
     uninstallDefaults(c);
diff --git a/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java b/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
index 672676fa081..27c569f0308 100644
--- a/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java
@@ -48,7 +48,7 @@ import javax.swing.plaf.FontUIResource;
 
 /**
  * The default theme for the {@link MetalLookAndFeel}.
- * 
+ *
  * @see MetalLookAndFeel#setCurrentTheme(MetalTheme)
  */
 public class DefaultMetalTheme extends MetalTheme
@@ -57,15 +57,15 @@ public class DefaultMetalTheme extends MetalTheme
     new ColorUIResource(102, 102, 153);
   private static final ColorUIResource PRIMARY2 =
     new ColorUIResource(153, 153, 204);
-  private static final ColorUIResource PRIMARY3 = 
+  private static final ColorUIResource PRIMARY3 =
     new ColorUIResource(204, 204, 255);
-  private static final ColorUIResource SECONDARY1 = 
+  private static final ColorUIResource SECONDARY1 =
     new ColorUIResource(102, 102, 102);
-  private static final ColorUIResource SECONDARY2 = 
+  private static final ColorUIResource SECONDARY2 =
     new ColorUIResource(153, 153, 153);
-  private static final ColorUIResource SECONDARY3 = 
+  private static final ColorUIResource SECONDARY3 =
     new ColorUIResource(204, 204, 204);
-  
+
   private static final FontUIResource SUB_TEXT_FONT =
     new FontUIResource("Dialog", Font.PLAIN, 10);
   private static final FontUIResource SYSTEM_TEXT_FONT =
@@ -74,7 +74,7 @@ public class DefaultMetalTheme extends MetalTheme
     new FontUIResource("Dialog", Font.PLAIN, 12);
   private static final FontUIResource WINDOW_TITLE_FONT =
     new FontUIResource("Dialog", Font.BOLD, 12);
-  
+
   /**
    * The control text font for swing.boldMetal=false.
    */
@@ -108,7 +108,7 @@ public class DefaultMetalTheme extends MetalTheme
    * Indicates the menu text font.
    */
   static final int MENU_TEXT_FONT = 2;
-  
+
   /**
    * Creates a new instance of this theme.
    */
@@ -119,7 +119,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the name of the theme.
-   * 
+   *
    * @return "Steel".
    */
   public String getName()
@@ -129,7 +129,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the first primary color for this theme.
-   * 
+   *
    * @return The first primary color.
    */
   protected ColorUIResource getPrimary1()
@@ -139,7 +139,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the second primary color for this theme.
-   * 
+   *
    * @return The second primary color.
    */
   protected ColorUIResource getPrimary2()
@@ -149,7 +149,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the third primary color for this theme.
-   * 
+   *
    * @return The third primary color.
    */
   protected ColorUIResource getPrimary3()
@@ -159,7 +159,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the first secondary color for this theme.
-   * 
+   *
    * @return The first secondary color.
    */
   protected ColorUIResource getSecondary1()
@@ -169,7 +169,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the second secondary color for this theme.
-   * 
+   *
    * @return The second secondary color.
    */
   protected ColorUIResource getSecondary2()
@@ -179,7 +179,7 @@ public class DefaultMetalTheme extends MetalTheme
 
   /**
    * Returns the third secondary color for this theme.
-   * 
+   *
    * @return The third secondary color.
    */
   protected ColorUIResource getSecondary3()
@@ -190,66 +190,66 @@ public class DefaultMetalTheme extends MetalTheme
   /**
    * Returns the font used for text on controls.  In this case, the font is
    * FontUIResource("Dialog", Font.BOLD, 12), unless the
-   * swing.boldMetal UI default is set to {@link Boolean#FALSE} 
+   * swing.boldMetal UI default is set to {@link Boolean#FALSE}
    * in which case it is FontUIResource("Dialog", Font.PLAIN, 12).
-   * 
+   *
    * @return The font.
    */
   public FontUIResource getControlTextFont()
   {
     return getFont(CONTROL_TEXT_FONT);
   }
-  
+
   /**
    * Returns the font used for text in menus.  In this case, the font is
    * FontUIResource("Dialog", Font.BOLD, 12), unless the
-   * swing.boldMetal UI default is set to {@link Boolean#FALSE} 
+   * swing.boldMetal UI default is set to {@link Boolean#FALSE}
    * in which case it is FontUIResource("Dialog", Font.PLAIN, 12).
-   * 
+   *
    * @return The font used for text in menus.
    */
   public FontUIResource getMenuTextFont()
   {
     return getFont(MENU_TEXT_FONT);
   }
-  
+
   /**
    * Returns the font used for sub text.  In this case, the font is
    * FontUIResource("Dialog", Font.PLAIN, 10).
-   * 
+   *
    * @return The font used for sub text.
    */
   public FontUIResource getSubTextFont()
   {
     return SUB_TEXT_FONT;
   }
-  
+
   /**
    * Returns the font used for system text.  In this case, the font is
    * FontUIResource("Dialog", Font.PLAIN, 12).
-   * 
+   *
    * @return The font used for system text.
    */
   public FontUIResource getSystemTextFont()
   {
     return SYSTEM_TEXT_FONT;
   }
-  
+
   /**
    * Returns the font used for user text.  In this case, the font is
    * FontUIResource("Dialog", Font.PLAIN, 12).
-   * 
-   * @return The font used for user text. 
+   *
+   * @return The font used for user text.
    */
   public FontUIResource getUserTextFont()
   {
     return USER_TEXT_FONT;
   }
-  
+
   /**
-   * Returns the font used for window titles.  In this case, the font is 
+   * Returns the font used for window titles.  In this case, the font is
    * FontUIResource("Dialog", Font.BOLD, 12).
-   * 
+   *
    * @return The font used for window titles.
    */
   public FontUIResource getWindowTitleFont()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java b/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
index d4e3a849781..253629998c2 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalBorders.java
@@ -104,15 +104,15 @@ public class MetalBorders
 
   /**
    * 
                      A border used for {@link JButton} components.
                      
-   * 
+   *
    * 
                      This {@link Border} implementation can handle only instances of
    * {@link AbstractButton} and their subclasses.
                      
-   * 
+   *
    * 
                      If the Metal Look and Feel's current theme is 'Ocean' the border
    * will be painted with a special highlight when the mouse cursor if
    * over the button (ie. the property rollover of the
    * button's model is true) and is not a direct
-   * child of a {@link JToolBar}.
                       
+   * child of a {@link JToolBar}.
                      
    */
   public static class ButtonBorder extends AbstractBorder implements UIResource
   {
@@ -230,7 +230,7 @@ public class MetalBorders
                   g.setColor(middle);
                   g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
                   g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
- 
+
                   // draw crossing pixels of both borders
                   g.setColor(shadow);
                   g.drawRect(x + 1, y + h - 2, 0, 0);
@@ -238,11 +238,11 @@ public class MetalBorders
                 }
             }
         }
-      else 
+      else
         {
           // draw disabled border
           g.setColor(MetalLookAndFeel.getInactiveControlTextColor());
-          g.drawRect(x, y, w - 2, h - 2);          
+          g.drawRect(x, y, w - 2, h - 2);
         }
     }
 
@@ -260,7 +260,7 @@ public class MetalBorders
                                         int y, int w, int h)
     {
       ButtonModel bmodel = null;
-      
+
       // The RI will fail with a ClassCastException in such a situation.
       // This code tries to be more helpful.
       if (c instanceof AbstractButton)
@@ -304,11 +304,11 @@ public class MetalBorders
               g.drawRect(x, y, w - 1, h - 1);
             }
         }
-      else 
+      else
         {
           // draw disabled border
           g.setColor(MetalLookAndFeel.getInactiveControlTextColor());
-          g.drawRect(x, y, w - 2, h - 2);          
+          g.drawRect(x, y, w - 2, h - 2);
         }
     }
 
@@ -325,7 +325,7 @@ public class MetalBorders
     }
 
     /**
-     * Returns the insets of the ButtonBorder in the specified 
+     * Returns the insets of the ButtonBorder in the specified
      * newInsets object.
      *
      * @param c the component for which the border is used (ignored).
@@ -357,22 +357,22 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return getBorderInsets(c, null);
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @return The border insets.
      */
@@ -387,12 +387,12 @@ public class MetalBorders
           newInsets.bottom = 2;
           newInsets.right = 3;
         }
-      return newInsets;  
+      return newInsets;
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -400,13 +400,13 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
-      g.setColor(MetalLookAndFeel.getControlDarkShadow());      
-      g.drawRect(x, y, w - 1, h - 1); 
+      g.setColor(MetalLookAndFeel.getControlDarkShadow());
+      g.drawRect(x, y, w - 1, h - 1);
     }
-    
+
   }
 
   /**
@@ -416,7 +416,7 @@ public class MetalBorders
     implements UIResource
   {
     private static final Insets borderInsets = new Insets(2, 2, 2, 2);
-    
+
     /**
      * Creates a new border instance.
      */
@@ -424,27 +424,27 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return borderInsets;
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @param newInsets  an existing insets instance, that will be populated
      *                   with the border insets and returned as the result
      *                   (null not permitted).
-     *                   
+     *
      * @return The newInsets reference.
      */
     public Insets getBorderInsets(Component c, Insets newInsets)
@@ -453,12 +453,12 @@ public class MetalBorders
       newInsets.left = borderInsets.left;
       newInsets.bottom = borderInsets.bottom;
       newInsets.right = borderInsets.right;
-      return newInsets;  
+      return newInsets;
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -466,9 +466,9 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
-    {              
+    {
       Color savedColor = g.getColor();
       g.setColor(MetalLookAndFeel.getControlDarkShadow());
       g.drawRect(x, y, w - 2, h - 2);
@@ -479,13 +479,13 @@ public class MetalBorders
       g.drawLine(x + w - 2, y + 1, x + w - 2, y + 1);
       g.setColor(savedColor);
     }
-    
+
   }
-    
+
   /**
-   * A border used for a {@link JInternalFrame} when it is being used as a 
+   * A border used for a {@link JInternalFrame} when it is being used as a
    * palette.
-   * 
+   *
    * @since 1.3
    */
   public static class PaletteBorder extends AbstractBorder
@@ -500,12 +500,12 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
@@ -515,26 +515,26 @@ public class MetalBorders
 
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @param newInsets  an existing insets instance, that will be populated
      *                   with the border insets and returned as the result
      *                   (null not permitted).
-     *                   
+     *
      * @return The newInsets reference.
      */
     public Insets getBorderInsets(Component c, Insets newInsets)
-    {        
+    {
       newInsets.top = borderInsets.top;
       newInsets.left = borderInsets.left;
       newInsets.bottom = borderInsets.bottom;
       newInsets.right = borderInsets.right;
-      return newInsets;  
+      return newInsets;
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -542,26 +542,26 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
             int h)
     {
       Color savedColor = g.getColor();
-      
+
       // draw the outline
       g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       g.drawRect(x, y, w - 1, h - 1);
-      
+
       // put a dot in each corner
       g.setColor(MetalLookAndFeel.getControl());
       g.fillRect(x, y, 1, 1);
       g.fillRect(x + w - 1, y, 1, 1);
       g.fillRect(x + w - 1, y + h - 1, 1, 1);
-      g.fillRect(x, y + h - 1, 1, 1);      
+      g.fillRect(x, y + h - 1, 1, 1);
       g.setColor(savedColor);
     }
 
   }
-    
+
   /**
    * A border used for the {@link JTextField} component.
    */
@@ -575,10 +575,10 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -586,7 +586,7 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
       boolean enabledTextBorder;
@@ -608,7 +608,7 @@ public class MetalBorders
           g.setColor(savedColor);
         }
     }
-    
+
   }
 
   /**
@@ -626,27 +626,27 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return borderInsets;
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @param newInsets  an existing insets instance, that will be populated
      *                   with the border insets and returned as the result
      *                   (null not permitted).
-     *                   
+     *
      * @return The newInsets reference.
      */
     public Insets getBorderInsets(Component c, Insets newInsets)
@@ -655,12 +655,12 @@ public class MetalBorders
       newInsets.left = borderInsets.left;
       newInsets.bottom = borderInsets.bottom;
       newInsets.right = borderInsets.right;
-      return newInsets;  
+      return newInsets;
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -668,47 +668,47 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
-        
+
       JInternalFrame f = (JInternalFrame) c;
       if (f.isSelected())
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       else
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
-      
+
       // fill the border background
       g.fillRect(x, y, w, 5);
       g.fillRect(x, y, 5, h);
       g.fillRect(x + w - 5, y, 5, h);
       g.fillRect(x, y + h - 5, w, 5);
-      
+
       // draw a dot in each corner
       g.setColor(MetalLookAndFeel.getControl());
       g.fillRect(x, y, 1, 1);
       g.fillRect(x + w - 1, y, 1, 1);
       g.fillRect(x + w - 1, y + h - 1, 1, 1);
       g.fillRect(x, y + h - 1, 1, 1);
-      
+
       // draw the lines
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 14, y + 2, x + w - 15, y + 2);
       g.drawLine(x + 14, y + h - 3, x + w - 15, y + h - 3);
       g.drawLine(x + 2, y + 14, x + 2, y + h - 15);
       g.drawLine(x + w - 3, y + 14, x + w - 3, y + h - 15);
-      
+
       // draw the line highlights
       if (f.isSelected())
         g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
-      else 
+      else
         g.setColor(MetalLookAndFeel.getControlShadow());
       g.drawLine(x + 15, y + 3, x + w - 14, y + 3);
       g.drawLine(x + 15, y + h - 2, x + w - 14, y + h - 2);
       g.drawLine(x + 3, y + 15, x + 3, y + h - 14);
       g.drawLine(x + w - 2, y + 15, x + w - 2, y + h - 14);
     }
-    
+
   }
 
   /**
@@ -718,7 +718,7 @@ public class MetalBorders
   public static class OptionDialogBorder extends AbstractBorder
     implements UIResource
   {
-      
+
     /**
      * Creates a new border instance.
      */
@@ -726,22 +726,22 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return getBorderInsets(c, null);
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @return The border insets.
      */
@@ -756,12 +756,12 @@ public class MetalBorders
           newInsets.bottom = 3;
           newInsets.right = 3;
         }
-      return newInsets;  
+      return newInsets;
     }
-        
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -769,10 +769,10 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
-        
+
       JInternalFrame f = (JInternalFrame) c;
       g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       if (f.getContentPane() instanceof JOptionPane)
@@ -791,32 +791,32 @@ public class MetalBorders
               Color bc = UIManager.getColor(
                   "OptionPane.warningDialog.border.background");
               if (bc != null)
-                g.setColor(bc);              
+                g.setColor(bc);
             }
           else if (type == JOptionPane.ERROR_MESSAGE)
             {
               Color bc = UIManager.getColor(
                   "OptionPane.errorDialog.border.background");
               if (bc != null)
-                g.setColor(bc);              
+                g.setColor(bc);
             }
         }
-      
+
       // fill the border background
       g.fillRect(x, y, w, 3);
       g.fillRect(x, y, 3, h);
       g.fillRect(x + w - 3, y, 3, h);
       g.fillRect(x, y + h - 3, w, 3);
-      
+
       // draw a dot in each corner
       g.setColor(MetalLookAndFeel.getControl());
       g.fillRect(x, y, 1, 1);
       g.fillRect(x + w - 1, y, 1, 1);
       g.fillRect(x + w - 1, y + h - 1, 1, 1);
       g.fillRect(x, y + h - 1, 1, 1);
-      
+
     }
-    
+
   }
 
   /**
@@ -827,7 +827,7 @@ public class MetalBorders
   {
     /** The border insets. */
     protected static Insets borderInsets = new Insets(2, 2, 2, 2);
-    
+
     /**
      * Creates a new border instance.
      */
@@ -835,11 +835,11 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the border for the component.  A border is painted only if the
      * component is a selected {@link JMenu} or an armed {@link JMenuItem}.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate of the border area.
@@ -852,7 +852,7 @@ public class MetalBorders
     {
       Color dark = MetalLookAndFeel.getPrimaryControlDarkShadow();
       Color light = MetalLookAndFeel.getPrimaryControlHighlight();
-      if (c instanceof JMenu) 
+      if (c instanceof JMenu)
         {
           JMenu menu = (JMenu) c;
           if (menu.isSelected())
@@ -868,7 +868,7 @@ public class MetalBorders
       else if (c instanceof JMenuItem)
         {
           JMenuItem item = (JMenuItem) c;
-          if (item.isArmed()) 
+          if (item.isArmed())
             {
               g.setColor(dark);
               g.drawLine(x, y, x + w, y);
@@ -883,27 +883,27 @@ public class MetalBorders
             }
         }
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return borderInsets;
     }
-    
+
     /**
      * Populates insets with the border insets, then returns it.
-     * 
+     *
      * @param c  the component (ignored).
      * @param insets  the object to populate with the border insets.
-     * 
+     *
      * @return The border insets.
-     * 
+     *
      * @throws NullPointerException if insets is null.
      */
     public Insets getBorderInsets(Component c, Insets insets)
@@ -925,18 +925,18 @@ public class MetalBorders
   {
     /** The border insets. */
     protected static Insets borderInsets = new Insets(1, 0, 1, 0);
-    
+
     /**
      * Creates a new border instance.
      */
     public MenuBarBorder()
     {
     }
-    
+
     /**
      * Paints the border for the component.  A border is painted only if the
      * component is a selected {@link JMenu} or an armed {@link JMenuItem}.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate of the border area.
@@ -957,30 +957,30 @@ public class MetalBorders
         g.setColor(UIManager.getColor("MenuBar.borderColor"));
       else
         g.setColor(MetalLookAndFeel.getControlShadow());
-      
+
       g.drawLine(x, y + h - 1, x + w, y + h - 1);
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return borderInsets;
     }
-    
+
     /**
      * Populates insets with the border insets, then returns it.
-     * 
+     *
      * @param c  the component (ignored).
      * @param insets  the object to populate with the border insets.
-     * 
+     *
      * @return The border insets.
-     * 
+     *
      * @throws NullPointerException if insets is null.
      */
     public Insets getBorderInsets(Component c, Insets insets)
@@ -1002,7 +1002,7 @@ public class MetalBorders
   {
     /** The border insets. */
     private static Insets insets = new Insets(1, 1, 2, 2);
-    
+
     /**
      * Constructs a new ScrollPaneBorder.
      */
@@ -1010,7 +1010,7 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the insets of the border for the Component c.
      *
@@ -1045,7 +1045,7 @@ public class MetalBorders
 
       // paint left border line
       g.drawLine(x, y, x, y + h - 2);
- 
+
       // paint right inner border line
       g.drawLine(x + w - 2, y, x + w - 2, y + h + 1);
 
@@ -1067,11 +1067,11 @@ public class MetalBorders
       g.drawLine(x + 1, y + h - 2, x + 1, y + h - 2);
 
     }
-    
+
   }
-  
+
   /**
-   * A button border that is only visible when the mouse pointer is within 
+   * A button border that is only visible when the mouse pointer is within
    * the button's bounds.
    */
   public static class RolloverButtonBorder
@@ -1084,10 +1084,10 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the border.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -1095,7 +1095,7 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
             int h)
     {
       // TODO: What should be done here? Obviously the ButtonBorder already
@@ -1104,7 +1104,7 @@ public class MetalBorders
       super.paintBorder(c, g, x, y, w, h);
     }
   }
-  
+
   /**
    * This border is used in Toolbar buttons as inner border.
    */
@@ -1120,7 +1120,7 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the insets of the RolloverBorder.
      *
@@ -1175,7 +1175,7 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the insets of the border, creating a new Insets instance
      * with each call.
@@ -1187,7 +1187,7 @@ public class MetalBorders
     {
       return getBorderInsets(c, null);
     }
-    
+
     /**
      * Returns the insets of the border, using the supplied Insets instance.
      *
@@ -1209,7 +1209,7 @@ public class MetalBorders
           insets.bottom = borderInsets.bottom;
           insets.right = borderInsets.right;
         }
-      
+
       return insets;
     }
 
@@ -1234,21 +1234,21 @@ public class MetalBorders
       // draw dark outer border
       g.setColor(darkShadow);
       g.drawRect(x, y, w - 1, h - 1);
-      
+
       // draw highlighted inner border (only top and left)
       g.setColor(light);
       g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
     }
-    
+
   }
 
   /**
    * A border used for the {@link JToggleButton} component.
-   * 
+   *
    * @since 1.3
    */
   public static class ToggleButtonBorder
-    extends ButtonBorder 
+    extends ButtonBorder
   {
     /**
      * Creates a new border instance.
@@ -1257,7 +1257,7 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the toggle button border.
      *
@@ -1272,7 +1272,7 @@ public class MetalBorders
                             int h)
     {
       ButtonModel bmodel = null;
-      
+
       if (c instanceof AbstractButton)
         bmodel = ((AbstractButton) c).getModel();
 
@@ -1314,23 +1314,23 @@ public class MetalBorders
               g.setColor(shadow);
               g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
               g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
- 
+
               // draw crossing pixels of both borders
               g.setColor(shadow);
               g.drawLine(x + 1, y + h - 2, x + 1, y + h - 2);
               g.drawLine(x + w - 2, y + 1, x + w - 2, y + 1);
-              
+
             }
           // draw corners
           g.setColor(middle);
           g.drawLine(x, y + h - 1, x, y + h - 1);
           g.drawLine(x + w - 1, y, x + w - 1, y);
         }
-      else 
+      else
         {
           // draw disabled border
           g.setColor(MetalLookAndFeel.getControlDisabled());
-          g.drawRect(x, y, w - 2, h - 2);          
+          g.drawRect(x, y, w - 2, h - 2);
         }
     }
   }
@@ -1348,22 +1348,22 @@ public class MetalBorders
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
-     * 
+     *
      * @return The border insets.
      */
     public Insets getBorderInsets(Component c)
     {
       return getBorderInsets(c, null);
     }
-    
+
     /**
      * Returns the border insets.
-     * 
+     *
      * @param c  the component (ignored).
      * @return The border insets.
      */
@@ -1371,7 +1371,7 @@ public class MetalBorders
     {
       JToolBar tb = (JToolBar) c;
       if (tb.getOrientation() == JToolBar.HORIZONTAL)
-        {   
+        {
           if (newInsets == null)
             newInsets = new Insets(2, 16, 2, 2);
           else
@@ -1381,10 +1381,10 @@ public class MetalBorders
               newInsets.bottom = 2;
               newInsets.right = 2;
             }
-          return newInsets;  
+          return newInsets;
         }
       else // assume JToolBar.VERTICAL
-        { 
+        {
           if (newInsets == null)
             newInsets = new Insets(16, 2, 2, 2);
           else
@@ -1394,14 +1394,14 @@ public class MetalBorders
               newInsets.bottom = 2;
               newInsets.right = 2;
             }
-          return newInsets;  
+          return newInsets;
         }
 
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -1409,27 +1409,27 @@ public class MetalBorders
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
-        
+
       JToolBar tb = (JToolBar) c;
       if (tb.getOrientation() == JToolBar.HORIZONTAL)
         {
-           MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + 11, y + h - 5, 
-                  MetalLookAndFeel.getControlHighlight(), 
+           MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + 11, y + h - 5,
+                  MetalLookAndFeel.getControlHighlight(),
                   MetalLookAndFeel.getControlDarkShadow());
         }
       else
-        { 
-          MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + w - 5, y + 11, 
-                  MetalLookAndFeel.getControlHighlight(), 
+        {
+          MetalUtils.fillMetalPattern(tb, g, x + 2, y + 2, x + w - 5, y + 11,
+                  MetalLookAndFeel.getControlHighlight(),
                   MetalLookAndFeel.getControlDarkShadow());
         }
     }
-    
+
   }
-  
+
   /**
    * A border for table header cells.
    *
@@ -1499,17 +1499,17 @@ public class MetalBorders
       {
         Border outer = new ButtonBorder();
         Border inner = getMarginBorder();
-        buttonBorder = new BorderUIResource.CompoundBorderUIResource(outer, 
+        buttonBorder = new BorderUIResource.CompoundBorderUIResource(outer,
             inner);
       }
     return buttonBorder;
   }
-  
+
   /**
    * Returns a border for use with {@link JToggleButton} components.
    *
    * @return A border.
-   * 
+   *
    * @since 1.3
    */
   public static Border getToggleButtonBorder()
@@ -1527,23 +1527,23 @@ public class MetalBorders
   /**
    * Returns a border instance that is used with a {@link JInternalFrame} when
    * it is in the iconified state.
-   * 
+   *
    * @return A border.
-   * 
+   *
    * @since 1.3
    */
   public static Border getDesktopIconBorder()
   {
     if (desktopIconBorder == null)
       desktopIconBorder = new DesktopIconBorder();
-    return desktopIconBorder;      
+    return desktopIconBorder;
   }
 
   /**
    * Returns a border for use by the {@link JTextField} component.
-   * 
+   *
    * @return A border.
-   * 
+   *
    * @since 1.3
    */
   public static Border getTextFieldBorder()
@@ -1608,7 +1608,7 @@ public class MetalBorders
 
   /**
    * Returns a shared instance of a compound border for rollover buttons.
-   * 
+   *
    * @return A shared border instance.
    */
   static Border getRolloverBorder()
@@ -1617,7 +1617,7 @@ public class MetalBorders
       {
         Border outer = new MetalBorders.RolloverButtonBorder();
         Border inner = MetalBorders.getMarginBorder();
-        rolloverBorder = new BorderUIResource.CompoundBorderUIResource(outer, 
+        rolloverBorder = new BorderUIResource.CompoundBorderUIResource(outer,
             inner);
       }
     return rolloverBorder;
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java b/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
index f2f778f95a7..7cf84e5f69e 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalButtonListener.java
@@ -45,25 +45,25 @@ import javax.swing.plaf.basic.BasicButtonListener;
 
 /**
  * A listener for buttons under the {@link MetalLookAndFeel}.
- * 
+ *
  * @see MetalButtonUI#createButtonListener
  */
-class MetalButtonListener extends BasicButtonListener 
+class MetalButtonListener extends BasicButtonListener
 {
-  
+
   /**
    * Creates a new instance.
-   * 
+   *
    * @param button  the button.
    */
   public MetalButtonListener(AbstractButton button)
   {
     super(button);
   }
-  
+
   /**
    * Handles property change events.
-   * 
+   *
    * @param e  the event.
    */
   public void propertyChange(PropertyChangeEvent e)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
index 108b3b225de..974f0a85a68 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalButtonUI.java
@@ -74,7 +74,7 @@ public class MetalButtonUI
    * The color used to draw the focus rectangle around the text and/or icon.
    */
   protected Color focusColor;
-    
+
   /**
    * The background color for the button when it is pressed.
    */
@@ -87,12 +87,12 @@ public class MetalButtonUI
 
   /**
    * Returns a UI delegate for the specified component.
-   * 
+   *
    * @param c  the component (should be a subclass of {@link AbstractButton}).
-   * 
+   *
    * @return A new instance of MetalButtonUI.
    */
-  public static ComponentUI createUI(JComponent c) 
+  public static ComponentUI createUI(JComponent c)
   {
     if (sharedUI == null)
       sharedUI = new MetalButtonUI();
@@ -143,9 +143,9 @@ public class MetalButtonUI
 
   /**
    * Installs the default settings for the specified button.
-   * 
+   *
    * @param button  the button.
-   * 
+   *
    * @see #uninstallDefaults(AbstractButton)
    */
   public void installDefaults(AbstractButton button)
@@ -157,7 +157,7 @@ public class MetalButtonUI
   /**
    * Removes the defaults added by {@link #installDefaults(AbstractButton)}.
    */
-  public void uninstallDefaults(AbstractButton button) 
+  public void uninstallDefaults(AbstractButton button)
   {
     // This is overridden to be public, for whatever reason.
     super.uninstallDefaults(button);
@@ -166,22 +166,22 @@ public class MetalButtonUI
   /**
    * Paints the background of the button to indicate that it is in the
    * "pressed" state.
-   * 
+   *
    * @param g  the graphics context.
    * @param b  the button.
    */
-  protected void paintButtonPressed(Graphics g, AbstractButton b) 
-  { 
+  protected void paintButtonPressed(Graphics g, AbstractButton b)
+  {
     if (b.isContentAreaFilled())
     {
       g.setColor(getSelectColor());
       g.fillRect(0, 0, b.getWidth(), b.getHeight());
     }
   }
-    
-  /** 
+
+  /**
    * Paints the focus rectangle around the button text and/or icon.
-   * 
+   *
    * @param g  the graphics context.
    * @param b  the button.
    * @param viewRect  the button bounds.
@@ -189,7 +189,7 @@ public class MetalButtonUI
    * @param iconRect  the icon bounds.
    */
   protected void paintFocus(Graphics g, AbstractButton b, Rectangle viewRect,
-          Rectangle textRect, Rectangle iconRect) 
+          Rectangle textRect, Rectangle iconRect)
   {
     if (b.isEnabled() && b.hasFocus() && b.isFocusPainted())
     {
@@ -201,17 +201,17 @@ public class MetalButtonUI
       g.setColor(savedColor);
     }
   }
-    
+
   /**
    * Paints the button text.
-   * 
+   *
    * @param g  the graphics context.
    * @param c  the button.
    * @param textRect  the text bounds.
    * @param text  the text to display.
    */
   protected void paintText(Graphics g, JComponent c, Rectangle textRect,
-          String text) 
+          String text)
   {
     AbstractButton b = (AbstractButton) c;
     Font f = b.getFont();
@@ -227,7 +227,7 @@ public class MetalButtonUI
       {
         g.setColor(getDisabledTextColor());
         g.drawString(text, textRect.x, textRect.y + fm.getAscent());
-      }  
+      }
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
index 30ee93162a9..5e0ac066c1e 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxIcon.java
@@ -134,7 +134,7 @@ public class MetalCheckBoxIcon
       MetalUtils.paintGradient(g, x, y, getIconWidth(), getIconHeight(),
                                SwingConstants.VERTICAL, "CheckBox.gradient");
     border.paintBorder(c, g, x, y, getIconWidth(), getIconHeight());
-    
+
     AbstractButton b = (AbstractButton) c;
     if (b.isSelected())
       drawCheck(b, g, x, y);
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
index c7941642e67..11979e170e3 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalCheckBoxUI.java
@@ -75,10 +75,10 @@ public class MetalCheckBoxUI
       instance = new MetalCheckBoxUI();
     return instance;
   }
-  
+
   /**
    * Returns the prefix for properties defined in the {@link UIDefaults} table.
-   * 
+   *
    * @return The property prefix ("CheckBox.").
    */
   public String getPropertyPrefix()
@@ -86,4 +86,3 @@ public class MetalCheckBoxUI
     return "CheckBox.";
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
index 265ea7ef6ae..8ec8bad72a1 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxButton.java
@@ -63,22 +63,22 @@ public class MetalComboBoxButton
 
   /** A reference to the JList. */
   protected JList listBox;
-  
+
   /**
    * Used for rendering the selected item.
    */
   protected CellRendererPane rendererPane;
-  
+
   /** The button icon. */
   protected Icon comboIcon;
-  
+
   /** Display just the icon, or the icon plus the label. */
   protected boolean iconOnly;
-  
+
   /**
    * Creates a new button.
-   * 
-   * @param cb  the combo that the button is used for (null not 
+   *
+   * @param cb  the combo that the button is used for (null not
    *            permitted).
    * @param i  the icon displayed on the button.
    * @param pane  the rendering pane.
@@ -87,13 +87,13 @@ public class MetalComboBoxButton
   public MetalComboBoxButton(JComboBox cb, Icon i, CellRendererPane pane,
       JList list)
   {
-    this(cb, i, cb.isEditable(), pane, list);  
+    this(cb, i, cb.isEditable(), pane, list);
   }
-  
+
   /**
    * Creates a new button.
-   * 
-   * @param cb  the combo that the button is used for (null not 
+   *
+   * @param cb  the combo that the button is used for (null not
    *            permitted).
    * @param i  the icon displayed on the button.
    * @param onlyIcon  a flag that specifies whether the button displays only an
@@ -116,84 +116,84 @@ public class MetalComboBoxButton
     setEnabled(comboBox.isEnabled());
     setFocusable(comboBox.isEnabled());
   }
-  
+
   /**
    * Returns the combo box that the button is used with.
-   * 
+   *
    * @return The combo box.
    */
   public final JComboBox getComboBox()
   {
     return comboBox;
   }
-  
+
   /**
    * Sets the combo box that the button is used with.
-   * 
+   *
    * @param cb  the combo box.
    */
   public final void setComboBox(JComboBox cb)
   {
     comboBox = cb;
   }
-  
+
   /**
    * Returns the icon displayed by the button.  By default, this will be an
    * instance of {@link MetalComboBoxIcon}.
-   * 
+   *
    * @return The icon displayed by the button.
    */
   public final Icon getComboIcon()
   {
     return comboIcon;
   }
-  
+
   /**
    * Sets the icon displayed by the button.
-   * 
+   *
    * @param i  the icon.
    */
   public final void setComboIcon(Icon i)
   {
     comboIcon = i;
   }
-  
+
   /**
    * Returns a flag that controls whether the button displays an icon only,
    * or text as well.
-   * 
+   *
    * @return A boolean.
    */
   public final boolean isIconOnly()
   {
     return iconOnly;
   }
-  
+
   /**
    * Sets the flag that controls whether the button displays an icon only,
    * or text as well.
-   * 
+   *
    * @param isIconOnly  the flag.
    */
   public final void setIconOnly(boolean isIconOnly)
   {
     iconOnly = isIconOnly;
   }
-  
+
   /**
    * Returns false, to indicate that this component is not part
    * of the focus traversal group.
-   * 
+   *
    * @return false
    */
   public boolean isFocusTraversable()
   {
     return false;
   }
-  
+
   /**
    * Enables or disables the button.
-   * 
+   *
    * @param enabled  the new status.
    */
   public void setEnabled(boolean enabled)
@@ -210,10 +210,10 @@ public class MetalComboBoxButton
         setForeground(UIManager.getColor("ComboBox.disabledForeground"));
       }
   }
-  
+
   /**
    * Paints the component.
-   * 
+   *
    * @param g  the graphics device.
    */
   public void paintComponent(Graphics g)
@@ -259,7 +259,7 @@ public class MetalComboBoxButton
             Component comp = renderer.getListCellRendererComponent(listBox,
                 comboBox.getSelectedItem(), -1, false, false);
             comp.setFont(rendererPane.getFont());
-            
+
             if ((model.isArmed() && model.isPressed())
                 || (comboBox.isFocusOwner() && !comboBox.isPopupVisible()))
               {
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
index 11e41510377..8872d74e20f 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxEditor.java
@@ -65,10 +65,10 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate.
@@ -76,7 +76,7 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
      * @param w  the width.
      * @param h  the height.
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
         int h)
     {
       g.translate(x, y);
@@ -123,11 +123,11 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
     public Insets getBorderInsets(Component c)
     {
       return editorBorderInsets;
-    }    
+    }
   }
-    
+
   /**
-   * A subclass of {@link MetalComboBoxEditor} that implements the 
+   * A subclass of {@link MetalComboBoxEditor} that implements the
    * {@link javax.swing.plaf.UIResource} interface.
    */
   public static class UIResource extends MetalComboBoxEditor
@@ -177,7 +177,7 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
 
   /** The editor's border insets. */
   protected static Insets editorBorderInsets = new Insets(2, 2, 2, 0);
-  
+
   /**
    * Creates a new editor.
    */
@@ -186,5 +186,5 @@ public class MetalComboBoxEditor extends BasicComboBoxEditor
     editor = new EditorTextField("", 9);
     editor.setBorder(new MetalComboBoxEditorBorder());
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
index 944ce394405..45c8eadc55d 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxIcon.java
@@ -48,20 +48,20 @@ import javax.swing.Icon;
 /**
  * An icon used by the {@link MetalComboBoxUI} class.
  */
-public class MetalComboBoxIcon implements Icon, Serializable 
+public class MetalComboBoxIcon implements Icon, Serializable
 {
-  
+
   /**
    * Creates a new icon.
    */
-  public MetalComboBoxIcon() 
+  public MetalComboBoxIcon()
   {
     // nothing required.
   }
-  
+
   /**
    * Returns the icon width, which for this icon is 10 pixels.
-   * 
+   *
    * @return 10.
    */
   public int getIconWidth()
@@ -71,7 +71,7 @@ public class MetalComboBoxIcon implements Icon, Serializable
 
   /**
    * Returns the icon height, which for this icon is 5 pixels.
-   * 
+   *
    * @return 5.
    */
   public int getIconHeight()
@@ -81,7 +81,7 @@ public class MetalComboBoxIcon implements Icon, Serializable
 
   /**
    * Paints the icon at the location (x, y).
-   * 
+   *
    * @param c  the combo box (ignored here).
    * @param g  the graphics device.
    * @param x  the x coordinate.
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
index 53d49c3dc4f..b9019b70dc1 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalComboBoxUI.java
@@ -78,22 +78,22 @@ public class MetalComboBoxUI extends BasicComboBoxUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Arranges the editor (if visible) and button that comprise the combo
      * box.
-     * 
+     *
      * @param parent  the parent.
      */
     public void layoutContainer(Container parent)
     {
       layoutComboBox(parent, this);
     }
-    
+
     /**
-     * Calls the layoutContainer(Container) method in the super 
+     * Calls the layoutContainer(Container) method in the super
      * class.
-     * 
+     *
      * @param parent  the container.
      */
     public void superLayout(Container parent)
@@ -101,9 +101,9 @@ public class MetalComboBoxUI extends BasicComboBoxUI
       super.layoutContainer(parent);
     }
   }
-  
+
   /**
-   * A listener used to handle property changes in the {@link JComboBox} 
+   * A listener used to handle property changes in the {@link JComboBox}
    * component, to ensure that the UI delegate accurately reflects the current
    * state in the rendering onscreen.
    */
@@ -117,11 +117,11 @@ public class MetalComboBoxUI extends BasicComboBoxUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Handles a property change event, updating the UI components as
      * appropriate.
-     * 
+     *
      * @param e  the event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -156,7 +156,7 @@ public class MetalComboBoxUI extends BasicComboBoxUI
 
   /**
    * A popup menu for the combo-box.
-   * 
+   *
    * @see #createPopup()
    *
    * @deprecated 1.4
@@ -165,20 +165,20 @@ public class MetalComboBoxUI extends BasicComboBoxUI
   {
     /**
      * Creates a new popup.
-     * 
+     *
      * @param cBox  the combo box.
      */
     public MetalComboPopup(JComboBox cBox)
     {
-      super(cBox); 
+      super(cBox);
     }
-    
+
     public void delegateFocus(MouseEvent e)
     {
       super.delegateFocus(e);
     }
   }
-  
+
   /**
    * Constructs a new instance of MetalComboBoxUI.
    */
@@ -198,61 +198,61 @@ public class MetalComboBoxUI extends BasicComboBoxUI
   {
     return new MetalComboBoxUI();
   }
-  
+
   /**
    * Creates an editor for the combo box.
-   * 
+   *
    * @return An editor.
    */
   protected ComboBoxEditor createEditor()
   {
-    return new MetalComboBoxEditor.UIResource();   
+    return new MetalComboBoxEditor.UIResource();
   }
-  
+
   /**
    * Creates a popup for the combo box.
-   * 
+   *
    * @return A popup.
    */
   protected ComboPopup createPopup()
   {
     return super.createPopup();
   }
-  
+
   /**
    * Creates a new button for use in rendering the JComboBox.
-   * 
+   *
    * @return A button.
    */
   protected JButton createArrowButton()
   {
-    JButton button = new MetalComboBoxButton(comboBox, new MetalComboBoxIcon(), 
-            currentValuePane, listBox);  
+    JButton button = new MetalComboBoxButton(comboBox, new MetalComboBoxIcon(),
+            currentValuePane, listBox);
     button.setMargin(new Insets(0, 1, 1, 3));
     return button;
   }
-  
+
   /**
    * Creates a new property change listener.
-   * 
+   *
    * @return A new property change listener.
    */
   public PropertyChangeListener createPropertyChangeListener()
   {
     return new MetalPropertyChangeListener();
   }
-  
+
   public void paint(Graphics g, JComponent c)
   {
     // do nothing, the button and text field are painted elsewhere
   }
-  
+
   /**
    * Updates the button and text field to reflect a change in the 'editable'
    * property.
-   * 
+   *
    * @param e  the event.
-   * 
+   *
    * @deprecated 1.4
    */
   protected void editablePropertyChanged(PropertyChangeEvent e)
@@ -265,32 +265,32 @@ public class MetalComboBoxUI extends BasicComboBoxUI
         comboBox.repaint();
       }
   }
-  
+
   /**
    * Creates a new layout manager for the UI delegate.
-   * 
+   *
    * @return A new layout manager.
    */
   protected LayoutManager createLayoutManager()
   {
     return new MetalComboBoxLayoutManager();
   }
-  
+
   /**
    * Not used in Classpath.
-   * 
+   *
    * @deprecated 1.4
    */
   protected void removeListeners()
   {
-    // no longer used in JDK 1.4 
+    // no longer used in JDK 1.4
   }
-  
+
   /**
    * Returns the minimum size for the combo.
-   * 
+   *
    * @param c  the component
-   * 
+   *
    * @return The minimum size for the combo box.
    */
   public Dimension getMinimumSize(JComponent c)
@@ -328,7 +328,7 @@ public class MetalComboBoxUI extends BasicComboBoxUI
     isMinimumSizeDirty = false;
     return new Dimension(cachedMinimumSize);
   }
-  
+
   /**
    * Configures the editor for this combo box.
    */
@@ -350,8 +350,8 @@ public class MetalComboBoxUI extends BasicComboBoxUI
     if (focusListener != null)
       editor.removeFocusListener(focusListener);
   }
-  
-  /** 
+
+  /**
    * Lays out the ComboBox
    */
   public void layoutComboBox(Container parent,
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
index 9bded823204..df49edf61e2 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalFileChooserUI.java
@@ -100,17 +100,17 @@ import javax.swing.table.DefaultTableModel;
  * A UI delegate for the {@link JFileChooser} component.  This class is only
  * partially implemented and is not usable yet.
  */
-public class MetalFileChooserUI 
+public class MetalFileChooserUI
   extends BasicFileChooserUI
 {
-  
+
   /**
    * A renderer for the files and directories in the file chooser table.
    */
   class TableFileRenderer
     extends DefaultTableCellRenderer
   {
-    
+
     /**
      * Creates a new renderer.
      */
@@ -118,17 +118,17 @@ public class MetalFileChooserUI
     {
       super();
     }
-    
+
     /**
      * Returns a component that can render the specified value.
-     * 
+     *
      * @param table  the table
      * @param value  the string value of the cell
      * @param isSelected  is the item selected?
      * @param hasFocus  does the item have the focus?
      * @param row  the row
      * @param column  the column
-     * 
+     *
      * @return The renderer.
      */
     public Component getTableCellRendererComponent(JTable table, Object value,
@@ -143,12 +143,12 @@ public class MetalFileChooserUI
         }
       else
         setIcon(null);
-      
+
       setText(value.toString());
       setOpaque(true);
       setEnabled(table.isEnabled());
       setFont(fileList.getFont());
-      
+
       if (startEditing && column == 0 || !isSelected)
         {
           setBackground(table.getBackground());
@@ -164,20 +164,20 @@ public class MetalFileChooserUI
         setBorder(UIManager.getBorder("Table.focusCellHighlightBorder"));
       else
         setBorder(noFocusBorder);
-      
+
       return this;
     }
   }
-  
+
   /**
    * ActionListener for the list view.
    */
   class ListViewActionListener implements ActionListener
   {
-    
+
     /**
      * This method is invoked when an action occurs.
-     * 
+     *
      * @param e -
      *          the ActionEvent that occurred
      */
@@ -195,23 +195,23 @@ public class MetalFileChooserUI
           if (index.length > 0)
               for (int i = 0; i < index.length; i++)
                 fileList.getSelectionModel().addSelectionInterval(index[i], index[i]);
-          
+
           fc.add(fileListPanel, BorderLayout.CENTER);
           fc.revalidate();
           fc.repaint();
         }
     }
   }
-  
+
   /**
    * ActionListener for the details view.
    */
   class DetailViewActionListener implements ActionListener
   {
-    
+
     /**
      * This method is invoked when an action occurs.
-     * 
+     *
      * @param e -
      *          the ActionEvent that occurred
      */
@@ -223,7 +223,7 @@ public class MetalFileChooserUI
           JFileChooser fc = getFileChooser();
           listView = false;
           fc.remove(fileListPanel);
-          
+
           if (fileTable == null)
             createDetailsView(fc);
           else
@@ -235,18 +235,18 @@ public class MetalFileChooserUI
               for (int i = 0; i < index.length; i++)
                 fileTable.getSelectionModel().addSelectionInterval(index[i], index[i]);
             }
-          
+
           fc.add(fileTablePanel, BorderLayout.CENTER);
           fc.revalidate();
           fc.repaint();
         }
     }
   }
-  
+
   /**
    * A property change listener.
    */
-  class MetalFileChooserPropertyChangeListener 
+  class MetalFileChooserPropertyChangeListener
     implements PropertyChangeListener
   {
     /**
@@ -255,25 +255,25 @@ public class MetalFileChooserUI
     public MetalFileChooserPropertyChangeListener()
     {
     }
-    
+
     /**
      * Handles a property change event.
-     * 
+     *
      * @param e  the event.
      */
     public void propertyChange(PropertyChangeEvent e)
     {
       JFileChooser filechooser = getFileChooser();
-      
+
       String n = e.getPropertyName();
       if (n.equals(JFileChooser.MULTI_SELECTION_ENABLED_CHANGED_PROPERTY))
         {
-          int mode = -1; 
+          int mode = -1;
           if (filechooser.isMultiSelectionEnabled())
             mode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION;
           else
             mode = ListSelectionModel.SINGLE_SELECTION;
-          
+
           if (listView)
             fileList.setSelectionMode(mode);
           else
@@ -282,7 +282,7 @@ public class MetalFileChooserUI
       else if (n.equals(JFileChooser.SELECTED_FILE_CHANGED_PROPERTY))
         {
           File file = filechooser.getSelectedFile();
-          
+
           if (file != null
               && filechooser.getDialogType() == JFileChooser.SAVE_DIALOG)
             {
@@ -301,12 +301,12 @@ public class MetalFileChooserUI
                   filechooser.setApproveButtonToolTipText(saveButtonToolTipText);
                 }
             }
-            
+
           if (file == null)
             setFileName(null);
-          else if (file.isFile() || filechooser.getFileSelectionMode() 
-		   != JFileChooser.FILES_ONLY)
-	    setFileName(file.getName());
+          else if (file.isFile() || filechooser.getFileSelectionMode()
+                   != JFileChooser.FILES_ONLY)
+            setFileName(file.getName());
           int index = -1;
           index = getModel().indexOf(file);
           if (index >= 0)
@@ -327,7 +327,7 @@ public class MetalFileChooserUI
                 }
             }
         }
-      
+
       else if (n.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY))
         {
           if (listView)
@@ -349,7 +349,7 @@ public class MetalFileChooserUI
           boolean hasParent = currentDirectory.getParentFile() != null;
           getChangeToParentDirectoryAction().setEnabled(hasParent);
         }
-      
+
       else if (n.equals(JFileChooser.CHOOSABLE_FILE_FILTER_CHANGED_PROPERTY))
         {
           filterModel.propertyChange(e);
@@ -369,14 +369,14 @@ public class MetalFileChooserUI
                   getApproveButtonToolTipText(filechooser));
           approveButton.setMnemonic(getApproveButtonMnemonic(filechooser));
         }
-      
+
       else if (n.equals(JFileChooser.APPROVE_BUTTON_TEXT_CHANGED_PROPERTY))
         approveButton.setText(getApproveButtonText(filechooser));
-      
+
       else if (n.equals(
               JFileChooser.APPROVE_BUTTON_TOOL_TIP_TEXT_CHANGED_PROPERTY))
         approveButton.setToolTipText(getApproveButtonToolTipText(filechooser));
-      
+
       else if (n.equals(JFileChooser.APPROVE_BUTTON_MNEMONIC_CHANGED_PROPERTY))
         approveButton.setMnemonic(getApproveButtonMnemonic(filechooser));
 
@@ -393,7 +393,7 @@ public class MetalFileChooserUI
           topPanel.repaint();
           topPanel.doLayout();
         }
-      
+
       else if (n.equals(
               JFileChooser.ACCEPT_ALL_FILE_FILTER_USED_CHANGED_PROPERTY))
         {
@@ -404,7 +404,7 @@ public class MetalFileChooserUI
             filechooser.removeChoosableFileFilter(
                     getAcceptAllFileFilter(filechooser));
         }
-      
+
       else if (n.equals(JFileChooser.ACCESSORY_CHANGED_PROPERTY))
         {
           JComponent old = (JComponent) e.getOldValue();
@@ -414,7 +414,7 @@ public class MetalFileChooserUI
           if (newval != null)
             getAccessoryPanel().add(newval);
         }
-      
+
       if (n.equals(JFileChooser.DIRECTORY_CHANGED_PROPERTY)
           || n.equals(JFileChooser.FILE_FILTER_CHANGED_PROPERTY)
           || n.equals(JFileChooser.FILE_HIDING_CHANGED_PROPERTY))
@@ -425,7 +425,7 @@ public class MetalFileChooserUI
           if (fileList != null)
             fileList.removeAll();
           startEditing = false;
-          
+
           // Set text on button back to original.
           if (filechooser.getDialogType() == JFileChooser.SAVE_DIALOG)
             {
@@ -434,16 +434,16 @@ public class MetalFileChooserUI
               filechooser.setApproveButtonText(saveButtonText);
               filechooser.setApproveButtonToolTipText(saveButtonToolTipText);
             }
-          
+
           rescanCurrentDirectory(filechooser);
         }
-      
+
       filechooser.revalidate();
       filechooser.repaint();
     }
   }
-  
-  /** 
+
+  /**
    * A combo box model containing the selected directory and all its parent
    * directories.
    */
@@ -453,46 +453,46 @@ public class MetalFileChooserUI
   {
     /** Storage for the items in the model. */
     private List items;
-    
+
     /** The index of the selected item. */
     private int selectedIndex;
-    
+
     /**
      * Creates a new model.
      */
-    public DirectoryComboBoxModel() 
+    public DirectoryComboBoxModel()
     {
       items = new java.util.ArrayList();
       selectedIndex = -1;
     }
-    
+
     /**
      * Returns the number of items in the model.
-     * 
+     *
      * @return The number of items in the model.
      */
     public int getSize()
     {
       return items.size();
     }
-    
+
     /**
      * Returns the item at the specified index.
-     * 
+     *
      * @param index  the item index.
-     * 
+     *
      * @return The item.
      */
     public Object getElementAt(int index)
     {
       return items.get(index);
     }
-    
+
     /**
      * Returns the depth of the item at the given index.
-     * 
+     *
      * @param index  the item index.
-     * 
+     *
      * @return The depth.
      */
     public int getDepth(int index)
@@ -502,22 +502,22 @@ public class MetalFileChooserUI
 
     /**
      * Returns the selected item, or null if no item is selected.
-     * 
+     *
      * @return The selected item, or null.
      */
     public Object getSelectedItem()
     {
-      if (selectedIndex >= 0) 
+      if (selectedIndex >= 0)
         return items.get(selectedIndex);
       else
         return null;
     }
-    
+
     /**
      * Sets the selected item.  This clears all the directories from the
      * existing list, and repopulates it with the new selected directory
      * and all its parent directories.
-     * 
+     *
      * @param selectedDirectory  the selected directory.
      */
     public void setSelectedItem(Object selectedDirectory)
@@ -533,7 +533,7 @@ public class MetalFileChooserUI
       selectedIndex = items.indexOf(selectedDirectory);
       fireContentsChanged(this, 0, items.size() - 1);
     }
-    
+
   }
 
   /**
@@ -549,10 +549,10 @@ public class MetalFileChooserUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Handles the action event.
-     * 
+     *
      * @param e  the event.
      */
     public void actionPerformed(ActionEvent e)
@@ -581,17 +581,17 @@ public class MetalFileChooserUI
     {
       indentIcon = new IndentIcon();
     }
-    
+
     /**
-     * Returns a component that can be used to paint the given value within 
+     * Returns a component that can be used to paint the given value within
      * the list.
-     * 
+     *
      * @param list  the list.
      * @param value  the value (a {@link File}).
      * @param index  the item index.
      * @param isSelected  is the item selected?
      * @param cellHasFocus  does the list cell have focus?
-     * 
+     *
      * @return The list cell renderer.
      */
     public Component getListCellRendererComponent(JList list, Object value,
@@ -671,7 +671,7 @@ public class MetalFileChooserUI
     {
       icon.paintIcon(c, g, x + depth * INDENT, y);
     }
-      
+
   }
 
   /**
@@ -680,7 +680,7 @@ public class MetalFileChooserUI
   protected class FileRenderer
     extends DefaultListCellRenderer
   {
-    
+
     /**
      * Creates a new renderer.
      */
@@ -688,16 +688,16 @@ public class MetalFileChooserUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns a component that can render the specified value.
-     * 
+     *
      * @param list  the list.
      * @param value  the value (a {@link File}).
      * @param index  the index.
      * @param isSelected  is the item selected?
      * @param cellHasFocus  does the item have the focus?
-     * 
+     *
      * @return The renderer.
      */
     public Component getListCellRendererComponent(JList list, Object value,
@@ -751,7 +751,7 @@ public class MetalFileChooserUI
 
     /** The index of the selected file filter. */
     private Object selected;
-    
+
     /**
      * Creates a new model.
      */
@@ -761,10 +761,10 @@ public class MetalFileChooserUI
       filters[0] = getAcceptAllFileFilter(getFileChooser());
       selected = filters[0];
     }
-    
+
     /**
      * Handles property changes.
-     * 
+     *
      * @param e  the property change event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -788,10 +788,10 @@ public class MetalFileChooserUI
           fireContentsChanged(this, 0, filters.length);
         }
     }
-    
+
     /**
      * Sets the selected filter.
-     * 
+     *
      * @param filter  the filter (null ignored).
      */
     public void setSelectedItem(Object filter)
@@ -802,39 +802,39 @@ public class MetalFileChooserUI
           fireContentsChanged(this, -1, -1);
       }
     }
-    
+
     /**
      * Returns the selected file filter.
-     * 
+     *
      * @return The selected file filter.
      */
     public Object getSelectedItem()
     {
       return selected;
     }
-    
+
     /**
      * Returns the number of items in the model.
-     * 
+     *
      * @return The number of items in the model.
      */
     public int getSize()
     {
       return filters.length;
     }
-    
+
     /**
      * Returns the item at the specified index.
-     * 
+     *
      * @param index  the item index.
-     * 
+     *
      * @return The item at the specified index.
      */
     public Object getElementAt(int index)
     {
       return filters[index];
     }
-    
+
   }
 
   /**
@@ -850,23 +850,23 @@ public class MetalFileChooserUI
     {
       // Nothing to do here.
     }
-    
+
     /**
-     * Returns a component that can be used to paint the given value within 
+     * Returns a component that can be used to paint the given value within
      * the list.
-     * 
+     *
      * @param list  the list.
      * @param value  the value (a {@link FileFilter}).
      * @param index  the item index.
      * @param isSelected  is the item selected?
      * @param cellHasFocus  does the list cell have focus?
-     * 
+     *
      * @return This component as the renderer.
      */
     public Component getListCellRendererComponent(JList list, Object value,
         int index, boolean isSelected, boolean cellHasFocus)
     {
-      super.getListCellRendererComponent(list, value, index, isSelected, 
+      super.getListCellRendererComponent(list, value, index, isSelected,
                                          cellHasFocus);
       FileFilter filter = (FileFilter) value;
       setText(filter.getDescription());
@@ -876,10 +876,10 @@ public class MetalFileChooserUI
 
   /**
    * A listener for selection events in the file list.
-   * 
+   *
    * @see #createListSelectionListener(JFileChooser)
    */
-  class MetalFileChooserSelectionListener 
+  class MetalFileChooserSelectionListener
     implements ListSelectionListener
   {
     /**
@@ -916,28 +916,28 @@ public class MetalFileChooserUI
   protected class SingleClickListener
     extends MouseAdapter
   {
-    
+
     /** Stores instance of the list */
     JList list;
-    
-    /** 
+
+    /**
      * Stores the current file that is being edited.
      * It is null if nothing is currently being edited.
      */
     File editFile;
-    
+
     /** The current file chooser. */
     JFileChooser fc;
-    
+
     /** The last file selected. */
     Object lastSelected;
-    
+
     /** The textfield used for editing. */
     JTextField editField;
-    
+
     /**
      * Creates a new listener.
-     * 
+     *
      * @param list  the directory/file list.
      */
     public SingleClickListener(JList list)
@@ -948,10 +948,10 @@ public class MetalFileChooserUI
       lastSelected = null;
       startEditing = false;
     }
-    
+
     /**
      * Receives notification of a mouse click event.
-     * 
+     *
      * @param e  the event.
      */
     public void mouseClicked(MouseEvent e)
@@ -974,10 +974,10 @@ public class MetalFileChooserUI
       else
         completeEditing();
     }
-    
+
     /**
      * Sets up the text editor for the current file.
-     * 
+     *
      * @param index -
      *          the current index of the item in the list to be edited.
      */
@@ -991,7 +991,7 @@ public class MetalFileChooserUI
           startEditing = true;
           editField = new JTextField(editFile.getName());
           editField.addActionListener(new EditingActionListener());
-          
+
           Icon icon = getFileView(fc).getIcon(editFile);
           if (icon != null)
             {
@@ -1000,9 +1000,9 @@ public class MetalFileChooserUI
               bounds.width -= padding;
             }
           editField.setBounds(bounds);
-          
+
           list.add(editField);
-          
+
           editField.requestFocus();
           editField.selectAll();
         }
@@ -1010,8 +1010,8 @@ public class MetalFileChooserUI
         completeEditing();
       list.repaint();
     }
-    
-    /** 
+
+    /**
      * Completes the editing.
      */
     void completeEditing()
@@ -1020,12 +1020,12 @@ public class MetalFileChooserUI
         {
           String text = editField.getText();
           if (text != null && text != "" && !text.equals(fc.getName(editFile)))
-	    {
-	      File f = fc.getFileSystemView().
-		createFileObject(fc.getCurrentDirectory(), text);
+            {
+              File f = fc.getFileSystemView().
+                createFileObject(fc.getCurrentDirectory(), text);
               if ( editFile.renameTo(f) )
                 rescanCurrentDirectory(fc);
-	    }
+            }
           list.remove(editField);
         }
       startEditing = false;
@@ -1034,22 +1034,22 @@ public class MetalFileChooserUI
       editField = null;
       list.repaint();
     }
-    
+
     /**
      * ActionListener for the editing text field.
      */
     class EditingActionListener implements ActionListener
     {
-      
+
       /**
        * This method is invoked when an action occurs.
-       * 
+       *
        * @param e -
        *          the ActionEvent that occurred
        */
       public void actionPerformed(ActionEvent e)
       {
-	if (editField != null)
+        if (editField != null)
           completeEditing();
       }
     }
@@ -1070,19 +1070,19 @@ public class MetalFileChooserUI
 
     /** The last selected file. */
     Object lastSelected;
-    
-    /** 
+
+    /**
      * Stores the current file that is being edited.
      * It is null if nothing is currently being edited.
      */
     File editFile;
-    
+
     /** The textfield used for editing. */
     JTextField editField;
 
     /**
      * Creates a new listener.
-     * 
+     *
      * @param table the directory/file table
      * @param fc the JFileChooser
      */
@@ -1099,7 +1099,7 @@ public class MetalFileChooserUI
 
     /**
      * Receives notification of a mouse click event.
-     * 
+     *
      * @param e the event.
      */
     public void mouseClicked(MouseEvent e)
@@ -1167,7 +1167,7 @@ public class MetalFileChooserUI
 
     /**
      * Sets up the text editor for the current file.
-     * 
+     *
      * @param row -
      *          the current row of the item in the list to be edited.
      */
@@ -1184,9 +1184,9 @@ public class MetalFileChooserUI
           // Need to adjust y pos
           bounds.y = row * table.getRowHeight();
           editField.setBounds(bounds);
-          
+
           table.add(editField);
-          
+
           editField.requestFocus();
           editField.selectAll();
         }
@@ -1194,8 +1194,8 @@ public class MetalFileChooserUI
         completeEditing();
       table.repaint();
     }
-    
-    /** 
+
+    /**
      * Completes the editing.
      */
     void completeEditing()
@@ -1214,26 +1214,26 @@ public class MetalFileChooserUI
       editField = null;
       table.repaint();
     }
-    
+
     /**
      * ActionListener for the editing text field.
      */
     class EditingActionListener implements ActionListener
     {
-      
+
       /**
        * This method is invoked when an action occurs.
-       * 
+       *
        * @param e -
        *          the ActionEvent that occurred
        */
       public void actionPerformed(ActionEvent e)
       {
-	if (editField != null)
+        if (editField != null)
           completeEditing();
       }
     }
-    
+
     /**
      * Closes the dialog.
      */
@@ -1243,91 +1243,91 @@ public class MetalFileChooserUI
       if (owner instanceof JDialog)
         ((JDialog) owner).dispose();
     }
-  } 
-  
+  }
+
   /** The text for a label describing the directory combo box. */
   private String directoryLabel;
-  
+
   private JComboBox directoryComboBox;
-  
+
   /** The model for the directory combo box. */
   DirectoryComboBoxModel directoryModel;
-  
+
   /** The text for a label describing the file text field. */
   private String fileLabel;
-  
+
   /** The file name text field. */
   private JTextField fileTextField;
-  
+
   /** The text for a label describing the filter combo box. */
   private String filterLabel;
 
-  /** 
-   * The top panel (contains the directory combo box and the control buttons). 
+  /**
+   * The top panel (contains the directory combo box and the control buttons).
    */
   private JPanel topPanel;
-  
+
   /** A panel containing the control buttons ('up', 'home' etc.). */
   private JPanel controls;
 
-  /** 
-   * The panel that contains the filename field and the filter combobox. 
+  /**
+   * The panel that contains the filename field and the filter combobox.
    */
   private JPanel bottomPanel;
 
-  /** 
-   * The panel that contains the 'Open' (or 'Save') and 'Cancel' buttons. 
+  /**
+   * The panel that contains the 'Open' (or 'Save') and 'Cancel' buttons.
    */
   private JPanel buttonPanel;
-  
+
   private JButton approveButton;
-  
+
   /** The file list. */
   JList fileList;
-  
+
   /** The file table. */
   JTable fileTable;
-  
+
   /** The panel containing the file list. */
   JPanel fileListPanel;
-  
+
   /** The panel containing the file table. */
   JPanel fileTablePanel;
-  
+
   /** The filter combo box model. */
   private FilterComboBoxModel filterModel;
 
   /** The action map. */
   private ActionMap actionMap;
-  
+
   /** True if currently in list view. */
   boolean listView;
-  
+
   /** True if we can or have started editing a cell. */
   boolean startEditing;
-  
+
   /** The scrollpane used for the table and list. */
   JScrollPane scrollPane;
-  
+
   /** The text for the label when saving. */
   String save;
-  
+
   /** The text for the label when opening a directory. */
   String look;
-  
+
   /** The label for the file combo box. */
   JLabel dirLabel;
-  
+
   /** Listeners. */
   ListSelectionListener listSelList;
   MouseListener doubleClickList;
   SingleClickListener singleClickList;
   TableClickListener tableClickList;
-  
+
   /**
    * A factory method that returns a UI delegate for the specified
    * component.
-   * 
+   *
    * @param c  the component (which should be a {@link JFileChooser}).
    */
   public static ComponentUI createUI(JComponent c)
@@ -1338,7 +1338,7 @@ public class MetalFileChooserUI
 
   /**
    * Creates a new instance of this UI delegate.
-   * 
+   *
    * @param filechooser  the file chooser component.
    */
   public MetalFileChooserUI(JFileChooser filechooser)
@@ -1353,16 +1353,16 @@ public class MetalFileChooserUI
     super.installUI(c);
     actionMap = createActionMap();
   }
-  
+
   public void uninstallUI(JComponent c)
   {
     super.uninstallUI(c);
     actionMap = null;
   }
-  
+
   /**
    * Installs the sub-components of the file chooser.
-   * 
+   *
    * @param fc  the file chooser component.
    */
   public void installComponents(JFileChooser fc)
@@ -1373,7 +1373,7 @@ public class MetalFileChooserUI
     topPanel.add(dirLabel, BorderLayout.WEST);
     this.controls = new JPanel();
     addControlButtons();
-    
+
     JPanel dirPanel = new JPanel(new VerticalMidLayout());
     directoryModel = createDirectoryComboBoxModel(fc);
     directoryComboBox = new JComboBox(directoryModel);
@@ -1383,16 +1383,16 @@ public class MetalFileChooserUI
     topPanel.add(controls, BorderLayout.EAST);
     topPanel.setBorder(BorderFactory.createEmptyBorder(8, 8, 0, 8));
     fc.add(topPanel, BorderLayout.NORTH);
-    
+
     JPanel list = createList(fc);
     list.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
     fc.add(list, BorderLayout.CENTER);
-    
+
     JPanel bottomPanel = getBottomPanel();
     filterModel = createFilterComboBoxModel();
     JComboBox fileFilterCombo = new JComboBox(filterModel);
     fileFilterCombo.setRenderer(createFilterComboBoxRenderer());
-    
+
     fileTextField = new JTextField();
     JPanel fileNamePanel = new JPanel(new VerticalMidLayout());
     fileNamePanel.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 5));
@@ -1401,21 +1401,21 @@ public class MetalFileChooserUI
     row1.add(new JLabel(this.fileLabel), BorderLayout.WEST);
     row1.add(fileNamePanel);
     bottomPanel.add(row1);
-    
+
     JPanel row2 = new JPanel(new BorderLayout());
     row2.add(new JLabel(this.filterLabel), BorderLayout.WEST);
     row2.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
     row2.add(fileFilterCombo);
     bottomPanel.add(row2);
     JPanel buttonPanel = new JPanel(new ButtonLayout());
-    
+
     approveButton = new JButton(getApproveSelectionAction());
     approveButton.setText(getApproveButtonText(fc));
     approveButton.setToolTipText(getApproveButtonToolTipText(fc));
     approveButton.setMnemonic(getApproveButtonMnemonic(fc));
     buttonPanel.add(approveButton);
     buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
-    
+
     JButton cancelButton = new JButton(getCancelSelectionAction());
     cancelButton.setText(cancelButtonText);
     cancelButton.setToolTipText(cancelButtonToolTipText);
@@ -1424,14 +1424,14 @@ public class MetalFileChooserUI
     bottomPanel.add(buttonPanel, BorderLayout.SOUTH);
     bottomPanel.setBorder(BorderFactory.createEmptyBorder(0, 8, 8, 8));
     fc.add(bottomPanel, BorderLayout.SOUTH);
-    
+
     fc.add(getAccessoryPanel(), BorderLayout.EAST);
   }
-  
+
   /**
-   * Uninstalls the components added by 
+   * Uninstalls the components added by
    * {@link #installComponents(JFileChooser)}.
-   * 
+   *
    * @param fc  the file chooser.
    */
   public void uninstallComponents(JFileChooser fc)
@@ -1444,27 +1444,27 @@ public class MetalFileChooserUI
     fileListPanel = null;
     fc.remove(topPanel);
     topPanel = null;
-    
+
     directoryModel = null;
     fileTextField = null;
     directoryComboBox = null;
   }
-  
+
   /**
-   * Returns the panel that contains the 'Open' (or 'Save') and 'Cancel' 
+   * Returns the panel that contains the 'Open' (or 'Save') and 'Cancel'
    * buttons.
-   * 
+   *
    * @return The panel.
    */
   protected JPanel getButtonPanel()
   {
-    return buttonPanel;    
+    return buttonPanel;
   }
-  
+
   /**
    * Creates and returns a new panel that will be used for the controls at
    * the bottom of the file chooser.
-   * 
+   *
    * @return A new panel.
    */
   protected JPanel getBottomPanel()
@@ -1473,15 +1473,15 @@ public class MetalFileChooserUI
       bottomPanel = new JPanel(new GridLayout(3, 2));
     return bottomPanel;
   }
-  
+
   /**
    * Fetches localised strings for use by the labels and buttons on the
    * file chooser.
-   * 
+   *
    * @param fc  the file chooser.
    */
   protected void installStrings(JFileChooser fc)
-  { 
+  {
      super.installStrings(fc);
      look = "Look In: ";
      save = "Save In: ";
@@ -1489,38 +1489,38 @@ public class MetalFileChooserUI
        directoryLabel = save;
      else
        directoryLabel = look;
-     
+
      fileLabel = "File Name: ";
      filterLabel = "Files of Type: ";
-     
+
      this.cancelButtonMnemonic = 0;
      this.cancelButtonText = "Cancel";
      this.cancelButtonToolTipText = "Abort file chooser dialog";
-     
+
      this.directoryOpenButtonMnemonic = 0;
      this.directoryOpenButtonText = "Open";
      this.directoryOpenButtonToolTipText = "Open selected directory";
-     
+
      this.helpButtonMnemonic = 0;
      this.helpButtonText = "Help";
      this.helpButtonToolTipText = "Filechooser help";
-     
+
      this.openButtonMnemonic = 0;
      this.openButtonText = "Open";
      this.openButtonToolTipText = "Open selected file";
-     
+
      this.saveButtonMnemonic = 0;
      this.saveButtonText = "Save";
      this.saveButtonToolTipText = "Save selected file";
-     
+
      this.updateButtonMnemonic = 0;
      this.updateButtonText = "Update";
-     this.updateButtonToolTipText = "Update directory listing";   
+     this.updateButtonToolTipText = "Update directory listing";
   }
-  
+
   /**
    * Installs the listeners required.
-   * 
+   *
    * @param fc  the file chooser.
    */
   protected void installListeners(JFileChooser fc)
@@ -1535,8 +1535,8 @@ public class MetalFileChooserUI
     fileList.addMouseListener(singleClickList);
     super.installListeners(fc);
   }
-  
-  protected void uninstallListeners(JFileChooser fc) 
+
+  protected void uninstallListeners(JFileChooser fc)
   {
     super.uninstallListeners(fc);
     fc.removePropertyChangeListener(filterModel);
@@ -1544,21 +1544,21 @@ public class MetalFileChooserUI
     fileList.removeListSelectionListener(listSelList);
     fileList.removeMouseListener(doubleClickList);
     fileList.removeMouseListener(singleClickList);
-    
+
     if (fileTable != null)
       fileTable.removeMouseListener(tableClickList);
   }
-  
+
   protected ActionMap getActionMap()
   {
     if (actionMap == null)
       actionMap = createActionMap();
     return actionMap;
   }
-  
+
   /**
    * Creates and returns an action map.
-   * 
+   *
    * @return The action map.
    */
   protected ActionMap createActionMap()
@@ -1572,9 +1572,9 @@ public class MetalFileChooserUI
 
   /**
    * Creates a panel containing a list of files.
-   * 
+   *
    * @param fc  the file chooser.
-   * 
+   *
    * @return A panel.
    */
   protected JPanel createList(JFileChooser fc)
@@ -1600,41 +1600,41 @@ public class MetalFileChooserUI
     fileListPanel.setPreferredSize(new Dimension(405, 135));
     return fileListPanel;
   }
-  
+
   /**
    * Creates a panel containing a table within a scroll pane.
-   * 
+   *
    * @param fc  the file chooser.
-   * 
+   *
    * @return The details view.
    */
   protected JPanel createDetailsView(JFileChooser fc)
   {
     fileTablePanel = new JPanel(new BorderLayout());
-    
+
     Object[] cols = new Object[] {"Name", "Size", "Modified"};
     Object[][] rows = new Object[fileList.getModel().getSize()][3];
-    
+
     fileTable = new JTable(new DefaultTableModel(rows, cols));
-    
+
     if (fc.isMultiSelectionEnabled())
       fileTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     else
       fileTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-    
+
     fileTable.setShowGrid(false);
     fileTable.setColumnSelectionAllowed(false);
     fileTable.setDefaultRenderer(Object.class, new TableFileRenderer());
 
     tableClickList = new TableClickListener(fileTable, fc);
     fileTable.addMouseListener(tableClickList);
-    
-    return updateTable();  
+
+    return updateTable();
   }
-  
+
   /**
    * Sets the values in the table, and puts it in the panel.
-   * 
+   *
    * @return the panel containing the table.
    */
   JPanel updateTable()
@@ -1671,10 +1671,10 @@ public class MetalFileChooserUI
 
     return fileTablePanel;
   }
-  
+
   /**
    * Formats bytes into the appropriate size.
-   * 
+   *
    * @param bytes the number of bytes to convert
    * @return a string representation of the size
    */
@@ -1686,7 +1686,7 @@ public class MetalFileChooserUI
     long gb = (long) Math.pow(2, 30);
     double size = 0;
     String id = "";
-    
+
     if ((bytes / gb) >= 1)
       {
         size = (double) bytes / (double) gb;
@@ -1707,27 +1707,27 @@ public class MetalFileChooserUI
         size = bytes;
         id = "Bytes";
       }
-    
+
     return nf.format(size) + " " + id;
   }
   /**
    * Creates a listener that monitors selections in the directory/file list
    * and keeps the {@link JFileChooser} component up to date.
-   * 
+   *
    * @param fc  the file chooser.
-   * 
+   *
    * @return The listener.
-   * 
+   *
    * @see #installListeners(JFileChooser)
    */
   public ListSelectionListener createListSelectionListener(JFileChooser fc)
   {
     return new MetalFileChooserSelectionListener();
   }
-  
+
   /**
    * Returns the preferred size for the file chooser component.
-   * 
+   *
    * @return The preferred size.
    */
   public Dimension getPreferredSize(JComponent c)
@@ -1740,7 +1740,7 @@ public class MetalFileChooserUI
 
   /**
    * Returns the minimum size for the file chooser component.
-   * 
+   *
    * @return The minimum size.
    */
   public Dimension getMinimumSize(JComponent c)
@@ -1750,25 +1750,25 @@ public class MetalFileChooserUI
     Dimension fl = fileListPanel.getMinimumSize();
     return new Dimension(fl.width, tp.height + bp.height + fl.height);
   }
-  
+
   /**
    * Returns the maximum size for the file chooser component.
-   * 
+   *
    * @return The maximum size.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
   }
-  
+
   /**
    * Creates a property change listener that monitors the {@link JFileChooser}
    * for property change events and updates the component display accordingly.
-   * 
+   *
    * @param fc  the file chooser.
-   * 
+   *
    * @return The property change listener.
-   * 
+   *
    * @see #installListeners(JFileChooser)
    */
   public PropertyChangeListener createPropertyChangeListener(JFileChooser fc)
@@ -1778,10 +1778,10 @@ public class MetalFileChooserUI
 
   /**
    * Creates and returns a new instance of {@link DirectoryComboBoxModel}.
-   * 
+   *
    * @return A new instance of {@link DirectoryComboBoxModel}.
    */
-  protected MetalFileChooserUI.DirectoryComboBoxModel 
+  protected MetalFileChooserUI.DirectoryComboBoxModel
       createDirectoryComboBoxModel(JFileChooser fc)
   {
     return new DirectoryComboBoxModel();
@@ -1790,9 +1790,9 @@ public class MetalFileChooserUI
   /**
    * Creates a new instance of the renderer used in the directory
    * combo box.
-   * 
+   *
    * @param fc  the file chooser.
-   * 
+   *
    * @return The renderer.
    */
   protected DirectoryComboBoxRenderer createDirectoryComboBoxRenderer(
@@ -1803,23 +1803,23 @@ public class MetalFileChooserUI
 
   /**
    * Creates and returns a new instance of {@link FilterComboBoxModel}.
-   * 
+   *
    * @return A new instance of {@link FilterComboBoxModel}.
    */
   protected FilterComboBoxModel createFilterComboBoxModel()
   {
-    return new FilterComboBoxModel();  
+    return new FilterComboBoxModel();
   }
 
   /**
    * Creates and returns a new instance of {@link FilterComboBoxRenderer}.
-   * 
+   *
    * @return A new instance of {@link FilterComboBoxRenderer}.
    */
-  protected MetalFileChooserUI.FilterComboBoxRenderer 
+  protected MetalFileChooserUI.FilterComboBoxRenderer
       createFilterComboBoxRenderer()
   {
-    return new FilterComboBoxRenderer(); 
+    return new FilterComboBoxRenderer();
   }
 
   /**
@@ -1832,26 +1832,26 @@ public class MetalFileChooserUI
     upButton.setIcon(this.upFolderIcon);
     upButton.setMargin(new Insets(0, 0, 0, 0));
     controls.add(upButton);
-    
+
     JButton homeButton = new JButton(getGoHomeAction());
     homeButton.setText(null);
     homeButton.setIcon(this.homeFolderIcon);
     homeButton.setMargin(new Insets(0, 0, 0, 0));
     controls.add(homeButton);
-    
+
     JButton newFolderButton = new JButton(getNewFolderAction());
     newFolderButton.setText(null);
     newFolderButton.setIcon(this.newFolderIcon);
     newFolderButton.setMargin(new Insets(0, 0, 0, 0));
     controls.add(newFolderButton);
-    
+
     JToggleButton listButton = new JToggleButton(this.listViewIcon);
     listButton.setMargin(new Insets(0, 0, 0, 0));
     listButton.addActionListener(new ListViewActionListener());
     listButton.setSelected(true);
-    listView = true; 
+    listView = true;
     controls.add(listButton);
-    
+
     JToggleButton detailButton = new JToggleButton(this.detailsViewIcon);
     detailButton.setMargin(new Insets(0, 0, 0, 0));
     detailButton.addActionListener(new DetailViewActionListener());
@@ -1862,7 +1862,7 @@ public class MetalFileChooserUI
     buttonGroup.add(listButton);
     buttonGroup.add(detailButton);
   }
-  
+
   /**
    * Removes all the buttons from the control panel.
    */
@@ -1872,10 +1872,10 @@ public class MetalFileChooserUI
     controls.revalidate();
     controls.repaint();
   }
-  
+
   /**
    * Updates the current directory.
-   * 
+   *
    * @param fc  the file chooser to update.
    */
   public void rescanCurrentDirectory(JFileChooser fc)
@@ -1887,43 +1887,43 @@ public class MetalFileChooserUI
     else
       createList(fc);
   }
-  
+
   /**
    * Returns the file name in the text field.
-   * 
+   *
    * @return The file name.
    */
   public String getFileName()
   {
     String result = null;
-    if (fileTextField != null) 
+    if (fileTextField != null)
       result = fileTextField.getText();
     return result;
   }
-  
+
   /**
    * Sets the file name in the text field.
-   * 
+   *
    * @param filename  the file name.
    */
   public void setFileName(String filename)
   {
     fileTextField.setText(filename);
   }
-  
+
   /**
    * DOCUMENT ME!!
-   * 
+   *
    * @param e - DOCUMENT ME!
    */
   public void valueChanged(ListSelectionEvent e)
   {
     // FIXME: Not sure what we should be doing here, if anything.
   }
-  
+
   /**
    * Returns the approve button.
-   * 
+   *
    * @return The approve button.
    */
   protected JButton getApproveButton(JFileChooser fc)
@@ -1939,10 +1939,10 @@ public class MetalFileChooserUI
   {
     /**
      * Performs the layout.
-     * 
+     *
      * @param parent  the container.
      */
-    public void layoutContainer(Container parent) 
+    public void layoutContainer(Container parent)
     {
       int count = parent.getComponentCount();
       if (count > 0)
@@ -1952,32 +1952,32 @@ public class MetalFileChooserUI
           Dimension prefSize = c.getPreferredSize();
           int h = parent.getHeight() - insets.top - insets.bottom;
           int adj = Math.max(0, (h - prefSize.height) / 2);
-          c.setBounds(insets.left, insets.top + adj, parent.getWidth() 
-              - insets.left - insets.right, 
+          c.setBounds(insets.left, insets.top + adj, parent.getWidth()
+              - insets.left - insets.right,
               (int) Math.min(prefSize.getHeight(), h));
         }
     }
-    
+
     /**
      * Returns the minimum layout size.
-     * 
+     *
      * @param parent  the container.
-     * 
+     *
      * @return The minimum layout size.
      */
-    public Dimension minimumLayoutSize(Container parent) 
+    public Dimension minimumLayoutSize(Container parent)
     {
       return preferredLayoutSize(parent);
     }
-    
+
     /**
      * Returns the preferred layout size.
-     * 
+     *
      * @param parent  the container.
-     * 
+     *
      * @return The preferred layout size.
      */
-    public Dimension preferredLayoutSize(Container parent) 
+    public Dimension preferredLayoutSize(Container parent)
     {
       if (parent.getComponentCount() > 0)
         {
@@ -1985,26 +1985,26 @@ public class MetalFileChooserUI
         }
       else return null;
     }
-    
+
     /**
-     * This layout manager does not need to track components, so this 
+     * This layout manager does not need to track components, so this
      * method does nothing.
-     * 
+     *
      * @param name  the name the component is associated with.
      * @param component  the component.
      */
-    public void addLayoutComponent(String name, Component component) 
+    public void addLayoutComponent(String name, Component component)
     {
       // do nothing
     }
-    
+
     /**
-     * This layout manager does not need to track components, so this 
+     * This layout manager does not need to track components, so this
      * method does nothing.
-     * 
+     *
      * @param component  the component.
      */
-    public void removeLayoutComponent(Component component) 
+    public void removeLayoutComponent(Component component)
     {
       // do nothing
     }
@@ -2017,13 +2017,13 @@ public class MetalFileChooserUI
   class ButtonLayout implements LayoutManager
   {
     static final int GAP = 4;
-      
+
     /**
      * Performs the layout.
-     * 
+     *
      * @param parent  the container.
      */
-    public void layoutContainer(Container parent) 
+    public void layoutContainer(Container parent)
     {
       int count = parent.getComponentCount();
       if (count > 0)
@@ -2036,7 +2036,7 @@ public class MetalFileChooserUI
               Dimension prefSize = c.getPreferredSize();
               maxW = Math.max(prefSize.width, maxW);
             }
-  
+
           // then position the buttons
           Insets insets = parent.getInsets();
           int availableH = parent.getHeight() - insets.top - insets.bottom;
@@ -2044,42 +2044,42 @@ public class MetalFileChooserUI
           for (int i = count - 1; i >= 0; i--)
             {
               Component c = parent.getComponent(i);
-              Dimension prefSize = c.getPreferredSize();      
+              Dimension prefSize = c.getPreferredSize();
               int adj = Math.max(0, (availableH - prefSize.height) / 2);
               currentX = currentX - prefSize.width;
-              c.setBounds(currentX, insets.top + adj, prefSize.width, 
+              c.setBounds(currentX, insets.top + adj, prefSize.width,
                   (int) Math.min(prefSize.getHeight(), availableH));
               currentX = currentX - GAP;
             }
         }
     }
-    
+
     /**
      * Returns the minimum layout size.
-     * 
+     *
      * @param parent  the container.
-     * 
+     *
      * @return The minimum layout size.
      */
-    public Dimension minimumLayoutSize(Container parent) 
+    public Dimension minimumLayoutSize(Container parent)
     {
       return preferredLayoutSize(parent);
     }
-    
+
     /**
      * Returns the preferred layout size.
-     * 
+     *
      * @param parent  the container.
-     * 
+     *
      * @return The preferred layout size.
      */
-    public Dimension preferredLayoutSize(Container parent) 
+    public Dimension preferredLayoutSize(Container parent)
     {
       Insets insets = parent.getInsets();
       int maxW = 0;
       int maxH = 0;
       int count = parent.getComponentCount();
-      if (count > 0) 
+      if (count > 0)
         {
           for (int i = 0; i < count; i++)
             {
@@ -2089,29 +2089,29 @@ public class MetalFileChooserUI
               maxH = Math.max(d.height, maxH);
             }
         }
-      return new Dimension(maxW * count + GAP * (count - 1) + insets.left 
+      return new Dimension(maxW * count + GAP * (count - 1) + insets.left
               + insets.right, maxH + insets.top + insets.bottom);
     }
-    
+
     /**
-     * This layout manager does not need to track components, so this 
+     * This layout manager does not need to track components, so this
      * method does nothing.
-     * 
+     *
      * @param name  the name the component is associated with.
      * @param component  the component.
      */
-    public void addLayoutComponent(String name, Component component) 
+    public void addLayoutComponent(String name, Component component)
     {
       // do nothing
     }
-    
+
     /**
-     * This layout manager does not need to track components, so this 
+     * This layout manager does not need to track components, so this
      * method does nothing.
-     * 
+     *
      * @param component  the component.
      */
-    public void removeLayoutComponent(Component component) 
+    public void removeLayoutComponent(Component component)
     {
       // do nothing
     }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java b/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
index 2817336a8f1..5382577c376 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalIconFactory.java
@@ -60,67 +60,67 @@ import javax.swing.plaf.UIResource;
 /**
  * Creates icons for the {@link MetalLookAndFeel}.
  */
-public class MetalIconFactory implements Serializable 
+public class MetalIconFactory implements Serializable
 {
 
   /** A constant representing "dark". */
   public static final boolean DARK = false;
-    
+
   /** A constant representing "light". */
   public static final boolean LIGHT = true;
-  
+
   /** A shared instance of the MenuArrowIcon. */
   private static Icon menuArrow;
-  
+
   /** A shared instance of the MenuItemArrowIcon. */
   private static Icon menuItemArrow;
-    
+
   /**
    * An icon displayed for {@link JCheckBoxMenuItem} components.
    */
-  private static class CheckBoxMenuItemIcon 
-    implements Icon, UIResource, Serializable 
+  private static class CheckBoxMenuItemIcon
+    implements Icon, UIResource, Serializable
   {
     /**
      * Creates a new icon instance.
      */
-    public CheckBoxMenuItemIcon() 
+    public CheckBoxMenuItemIcon()
     {
       // Nothing to do here.
     }
-      
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon (10 pixels).
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 10;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon (10 pixels).
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 10;
     }
-    
+
     /**
      * Paints the icon.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
      * @param y  the y-coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       JCheckBoxMenuItem item = (JCheckBoxMenuItem) c;
-        
+
       if (item.isArmed())
         g.setColor(MetalLookAndFeel.getBlack());
       else
@@ -129,7 +129,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x, y + 1, x, y + 8);
       g.drawLine(x + 2, y + 8, x + 8, y + 8);
       g.drawLine(x + 8, y + 2, x + 8, y + 7);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.drawLine(x + 1, y + 1, x + 7, y + 1);
       g.drawLine(x + 1, y + 2, x + 1, y + 7);
@@ -145,56 +145,56 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 8 - i, y + i, x + 9 - i, y + i);
       }
 
-    }        
+    }
   }
 
   /**
    * An icon used for the "detail view" button on a {@link JFileChooser} under
    * the {@link MetalLookAndFeel}.
-   * 
+   *
    * @see MetalIconFactory#getFileChooserDetailViewIcon()
    */
-  private static class FileChooserDetailViewIcon 
+  private static class FileChooserDetailViewIcon
     implements Icon, UIResource, Serializable
   {
 
     /**
      * Creates a new icon.
      */
-    public FileChooserDetailViewIcon() 
+    public FileChooserDetailViewIcon()
     {
       // Nothing to do here.
     }
-      
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 18;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 18;
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
       g.setColor(MetalLookAndFeel.getBlack());
@@ -204,7 +204,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 6, y + 3, x + 6, y + 7);
       g.drawLine(x + 2, y + 7, x + 6, y + 7);
       g.drawLine(x + 2, y + 2, x + 2, y + 7);
-      
+
       // file 2 outline
       g.drawLine(x + 2, y + 10, x + 5, y + 10);
       g.drawLine(x + 6, y + 11, x + 6, y + 15);
@@ -214,157 +214,157 @@ public class MetalIconFactory implements Serializable
       // detail lines
       g.drawLine(x + 8, y + 5, x + 15, y + 5);
       g.drawLine(x + 8, y + 13, x + 15, y + 13);
-      
+
       // fill files
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 3, y + 3, 3, 4);
       g.fillRect(x + 3, y + 11, 3, 4);
-      
+
       // highlight files
       g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
       g.drawLine(x + 4, y + 4, x + 4, y + 5);
       g.drawLine(x + 4, y + 12, x + 4, y + 13);
-      
+
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * An icon used for the "home folder" button on a {@link JFileChooser} under
    * the {@link MetalLookAndFeel}.
-   * 
+   *
    * @see MetalIconFactory#getFileChooserHomeFolderIcon()
    */
-  private static class FileChooserHomeFolderIcon 
+  private static class FileChooserHomeFolderIcon
     implements Icon, UIResource, Serializable
   {
 
     /**
      * Creates a new icon.
      */
-    public FileChooserHomeFolderIcon() 
+    public FileChooserHomeFolderIcon()
     {
       // Nothing to do here.
     }
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 18;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 18;
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
-    {   
+    public void paintIcon(Component c, Graphics g, int x, int y)
+    {
       Color savedColor = g.getColor();
       g.setColor(MetalLookAndFeel.getBlack());
-      
+
       // roof
       g.drawLine(x + 1, y + 8, x + 8, y + 1);
       g.drawLine(x + 8, y + 1, x + 15, y + 8);
-      
+
       // base of house
       g.drawLine(x + 3, y + 6, x + 3, y + 15);
       g.drawLine(x + 3, y + 15, x + 13, y + 15);
       g.drawLine(x + 13, y + 6, x + 13, y + 15);
-      
+
       // door frame
       g.drawLine(x + 6, y + 9, x + 6, y + 15);
       g.drawLine(x + 6, y + 9, x + 10, y + 9);
       g.drawLine(x + 10, y + 9, x + 10, y + 15);
-      
+
       // chimney
       g.drawLine(x + 11, y + 2, x + 11, y + 4);
       g.drawLine(x + 12, y + 2, x + 12, y + 5);
-      
+
       g.setColor(MetalLookAndFeel.getControlDarkShadow());
-      
+
       // roof paint
       int xx = x + 8;
       for (int i = 0; i < 4; i++)
         g.drawLine(xx - i, y + 2 + i, xx + i, y + 2 + i);
       g.fillRect(x + 4, y + 6, 9, 2);
-      
+
       // door knob
       g.drawLine(x + 9, y + 12, x + 9, y + 12);
-      
+
       // house paint
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.drawLine(x + 4, y + 8, x + 12, y + 8);
       g.fillRect(x + 4, y + 9, 2, 6);
       g.fillRect(x + 11, y + 9, 2, 6);
-      
+
       g.setColor(savedColor);
-    }        
+    }
   }
-    
+
   /**
    * An icon used for the "list view" button on a {@link JFileChooser} under
    * the {@link MetalLookAndFeel}.
-   * 
+   *
    * @see MetalIconFactory#getFileChooserListViewIcon()
    */
-  private static class FileChooserListViewIcon 
-    implements Icon, UIResource, Serializable 
+  private static class FileChooserListViewIcon
+    implements Icon, UIResource, Serializable
   {
     /**
      * Creates a new icon.
      */
-    public FileChooserListViewIcon() 
+    public FileChooserListViewIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 18;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 18;
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
       g.setColor(MetalLookAndFeel.getBlack());
@@ -374,37 +374,37 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 6, y + 3, x + 6, y + 7);
       g.drawLine(x + 2, y + 7, x + 6, y + 7);
       g.drawLine(x + 2, y + 2, x + 2, y + 7);
-      
+
       // file 2 outline
       g.drawLine(x + 2, y + 10, x + 5, y + 10);
       g.drawLine(x + 6, y + 11, x + 6, y + 15);
       g.drawLine(x + 2, y + 15, x + 6, y + 15);
       g.drawLine(x + 2, y + 10, x + 2, y + 15);
-      
+
       // file 3 outline
       g.drawLine(x + 10, y + 2, x + 13, y + 2);
       g.drawLine(x + 14, y + 3, x + 14, y + 7);
       g.drawLine(x + 10, y + 7, x + 14, y + 7);
       g.drawLine(x + 10, y + 2, x + 10, y + 7);
-      
+
       // file 4 outline
       g.drawLine(x + 10, y + 10, x + 13, y + 10);
       g.drawLine(x + 14, y + 11, x + 14, y + 15);
       g.drawLine(x + 10, y + 15, x + 14, y + 15);
       g.drawLine(x + 10, y + 10, x + 10, y + 15);
-      
+
       g.drawLine(x + 8, y + 5, x + 8, y + 5);
       g.drawLine(x + 8, y + 13, x + 8, y + 13);
       g.drawLine(x + 16, y + 5, x + 16, y + 5);
       g.drawLine(x + 16, y + 13, x + 16, y + 13);
-      
+
       // fill files
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 3, y + 3, 3, 4);
       g.fillRect(x + 3, y + 11, 3, 4);
       g.fillRect(x + 11, y + 3, 3, 4);
       g.fillRect(x + 11, y + 11, 3, 4);
-      
+
       // highlight files
       g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
       g.drawLine(x + 4, y + 4, x + 4, y + 5);
@@ -413,113 +413,113 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 12, y + 12, x + 12, y + 13);
 
       g.setColor(savedColor);
-    }        
+    }
   }
-    
+
   /**
    * An icon used for the "new folder" button on a {@link JFileChooser} under
    * the {@link MetalLookAndFeel}.
-   * 
+   *
    * @see MetalIconFactory#getFileChooserNewFolderIcon()
    */
-  private static class FileChooserNewFolderIcon 
+  private static class FileChooserNewFolderIcon
     implements Icon, UIResource, Serializable
   {
-    /** 
+    /**
      * Creates a new icon.
      */
-    public FileChooserNewFolderIcon() 
+    public FileChooserNewFolderIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 18;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 18;
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
-    {      
+    public void paintIcon(Component c, Graphics g, int x, int y)
+    {
       Color savedColor = g.getColor();
       g.setColor(MetalLookAndFeel.getBlack());
-      
+
       g.drawLine(x + 2, y + 5, x + 9, y + 5);
       g.drawLine(x + 10, y + 6, x + 15, y + 6);
       g.drawLine(x + 15, y + 5, x + 15, y + 14);
       g.drawLine(x + 2, y + 14, x + 15, y + 14);
       g.drawLine(x + 1, y + 6, x + 1, y + 14);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       g.drawLine(x + 11, y + 3, x + 15, y + 3);
       g.drawLine(x + 10, y + 4, x + 15, y + 4);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 3, y + 7, 7, 7);
       g.fillRect(x + 10, y + 8, 5, 6);
       g.drawLine(x + 10, y + 5, x + 14, y + 5);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControlHighlight());
       g.drawLine(x + 10, y + 7, x + 14, y + 7);
       g.drawLine(x + 2, y + 6, x + 9, y + 6);
       g.drawLine(x + 2, y + 6, x + 2, y + 13);
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * An icon used for the "up folder" button on a {@link JFileChooser} under
    * the {@link MetalLookAndFeel}.
-   * 
+   *
    * @see MetalIconFactory#getFileChooserNewFolderIcon()
    */
-  private static class FileChooserUpFolderIcon extends FileChooserNewFolderIcon 
+  private static class FileChooserUpFolderIcon extends FileChooserNewFolderIcon
   {
     /**
      * Creates a new icon.
      */
-    public FileChooserUpFolderIcon() 
+    public FileChooserUpFolderIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
 
       // draw the folder
       super.paintIcon(c, g, x, y);
-      
+
       // now draw the up arrow
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 8, y + 9, x + 8, y + 16);
@@ -527,128 +527,128 @@ public class MetalIconFactory implements Serializable
       for (int i = 0; i < 4; i++)
         g.drawLine(xx - i, y + 9 + i, xx + i, y + 9 + i);
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * An icon representing a file (drawn as a piece of paper with the top-right
    * corner turned down).
    */
-  public static class FileIcon16 implements Icon, Serializable 
+  public static class FileIcon16 implements Icon, Serializable
   {
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
 
     /**
-     * Returns the height of the icon, in pixels.  The height returned is 
-     * 16 plus the value returned by 
+     * Returns the height of the icon, in pixels.  The height returned is
+     * 16 plus the value returned by
      * {@link #getAdditionalHeight()}.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16 + getAdditionalHeight();
     }
-    
+
     /**
      * Paints the icon at the location (x, y).
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics context.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       y = y + getShift();
       g.setColor(MetalLookAndFeel.getBlack());
-      g.drawLine(x, y, x + 9, y);            
-      g.drawLine(x, y + 1, x, y + 15);            
-      g.drawLine(x, y + 15, x + 12, y + 15);            
-      g.drawLine(x + 12, y + 15, x + 12, y + 6);            
-      g.drawLine(x + 12, y + 6, x + 9, y);           
+      g.drawLine(x, y, x + 9, y);
+      g.drawLine(x, y + 1, x, y + 15);
+      g.drawLine(x, y + 15, x + 12, y + 15);
+      g.drawLine(x + 12, y + 15, x + 12, y + 6);
+      g.drawLine(x + 12, y + 6, x + 9, y);
 
       g.drawLine(x + 7, y + 2, x + 11, y + 6);
       g.drawLine(x + 8, y + 1, x + 9, y + 1);
 
       g.setColor(MetalLookAndFeel.getPrimaryControl());
-      g.drawLine(x + 1, y + 1, x + 7, y + 1);            
-      g.drawLine(x + 1, y + 1, x + 1, y + 14);            
-      g.drawLine(x + 1, y + 14, x + 11, y + 14);            
-      g.drawLine(x + 11, y + 14, x + 11, y + 7);            
+      g.drawLine(x + 1, y + 1, x + 7, y + 1);
+      g.drawLine(x + 1, y + 1, x + 1, y + 14);
+      g.drawLine(x + 1, y + 14, x + 11, y + 14);
+      g.drawLine(x + 11, y + 14, x + 11, y + 7);
       g.drawLine(x + 8, y + 2, x + 10, y + 4);
     }
-    
+
     /**
-     * Returns the additional height for the icon.  The 
+     * Returns the additional height for the icon.  The
      * {@link #getIconHeight()} method adds this value to the icon height it
      * returns.  Subclasses can override this method to adjust the icon height.
-     * 
+     *
      * @return The additional height (0 unless overridden).
      */
-    public int getAdditionalHeight() 
+    public int getAdditionalHeight()
     {
       return 0;
     }
-        
+
     /**
-     * Returns the vertical shift, in pixels, applied when painting the icon.  
-     * The default value is zero, but subclasses may override this (for 
+     * Returns the vertical shift, in pixels, applied when painting the icon.
+     * The default value is zero, but subclasses may override this (for
      * example, see {@link TreeLeafIcon}).
-     * 
+     *
      * @return The shift.
      */
-    public int getShift() 
+    public int getShift()
     {
       return 0;
     }
-        
+
   }
-    
+
   /**
    * An icon representing a folder.
    */
-  public static class FolderIcon16 implements Icon, Serializable 
+  public static class FolderIcon16 implements Icon, Serializable
   {
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
-    
+
     /**
-     * Returns the height of the icon, in pixels.  The height returned is 
-     * 16 plus the value returned by 
+     * Returns the height of the icon, in pixels.  The height returned is
+     * 16 plus the value returned by
      * {@link #getAdditionalHeight()}.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16 + getAdditionalHeight();
     }
 
     /**
      * Paints the icon at the location (x, y).
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       y = y + getShift();
       g.setColor(MetalLookAndFeel.getBlack());
@@ -666,37 +666,37 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 9, y + 4, x + 15, y + 4);
       g.drawLine(x + 10, y + 3, x + 15, y + 3);
     }
-    
+
     /**
-     * Returns the additional height for the icon.  The 
+     * Returns the additional height for the icon.  The
      * {@link #getIconHeight()} method adds this value to the icon height it
      * returns.  Subclasses can override this method to adjust the icon height.
-     * 
+     *
      * @return The additional height (0 unless overridden).
      */
-    public int getAdditionalHeight() 
+    public int getAdditionalHeight()
     {
       return 0;
     }
-    
+
     /**
-     * Returns the vertical shift, in pixels, applied when painting the icon.  
-     * The default value is zero, but subclasses may override this (for 
+     * Returns the vertical shift, in pixels, applied when painting the icon.
+     * The default value is zero, but subclasses may override this (for
      * example, see {@link TreeFolderIcon}).
-     * 
+     *
      * @return The shift.
      */
-    public int getShift() 
+    public int getShift()
     {
       return 0;
     }
-        
+
   }
 
   /**
    * An icon used by the {@link MetalInternalFrameUI} class when the frame
    * is displayed as a palette.
-   * 
+   *
    * @since 1.3
    */
   public static class PaletteCloseIcon
@@ -704,33 +704,33 @@ public class MetalIconFactory implements Serializable
   {
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 7;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 7;
     }
-    
+
     /**
      * Paints the icon using colors from the {@link MetalLookAndFeel}.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
       AbstractButton button = (AbstractButton) c;
@@ -752,9 +752,9 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 5, y + 3, x + 6, y + 2);
       g.drawLine(x + 6, y + 6, x + 6, y + 6);
       g.setColor(savedColor);
-    }        
+    }
   }
-  
+
   /**
    * An {@link Icon} implementation for {@link JCheckBox}es in the
    * Metal Look & Feel.
@@ -799,13 +799,13 @@ public class MetalIconFactory implements Serializable
      * Paints the icon, taking into account whether or not the component is
      * enabled, selected and/or armed.
      *
-     * @param c the Component to draw on (must be an instance of 
+     * @param c the Component to draw on (must be an instance of
      *          {@link JRadioButton})
      * @param g the Graphics context to draw with
      * @param x the X position
      * @param y the Y position
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       if (UIManager.get("RadioButton.gradient") != null)
         MetalUtils.paintGradient(g, x + 2, y + 2, 8, 8,
@@ -842,13 +842,13 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 10, y + 4, x + 10, y + 7);
           g.fillRect(x + 2, y + 2, 8, 8);
         }
-      else 
+      else
         {
           // only draw inner highlight if not filled
           if (b.isEnabled())
             {
               g.setColor(MetalLookAndFeel.getWhite());
-          
+
               g.drawLine(x + 2, y + 8, x + 2, y + 9);
               g.drawLine(x + 1, y + 4, x + 1, y + 7);
               g.drawLine(x + 2, y + 2, x + 2, y + 3);
@@ -862,7 +862,7 @@ public class MetalIconFactory implements Serializable
       if (b.isEnabled())
         {
           g.setColor(MetalLookAndFeel.getWhite());
-          
+
           // outer
           g.drawLine(x + 10, y + 1, x + 10, y + 1);
           g.drawLine(x + 11, y + 2, x + 11, y + 3);
@@ -873,7 +873,7 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 4, y + 12, x + 7, y + 12);
           g.drawLine(x + 2, y + 11, x + 3, y + 11);
         }
-      
+
       if (b.isSelected())
         {
           if (b.isEnabled())
@@ -885,52 +885,52 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 4, y + 8, x + 7, y + 8);
         }
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * An icon displayed for {@link JRadioButtonMenuItem} components.
    */
-  private static class RadioButtonMenuItemIcon 
-    implements Icon, UIResource, Serializable 
+  private static class RadioButtonMenuItemIcon
+    implements Icon, UIResource, Serializable
   {
     /**
      * Creates a new icon instance.
      */
-    public RadioButtonMenuItemIcon() 
+    public RadioButtonMenuItemIcon()
     {
       // Nothing to do here.
     }
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 10;
     }
 
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight()   
+    public int getIconHeight()
     {
       return 10;
     }
 
     /**
      * Paints the icon.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
      * @param y  the y-coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
       JRadioButtonMenuItem item = (JRadioButtonMenuItem) c;
@@ -943,7 +943,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 1, y + 7, x + 1, y + 7);
       g.drawLine(x, y + 2, x, y + 6);
       g.drawLine(x + 1, y + 1, x + 1, y + 1);
-      
+
       if (item.isSelected())
         {
           g.drawLine(x + 3, y + 2, x + 5, y + 2);
@@ -962,14 +962,14 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 1, y + 3, x + 1, y + 6);
       g.drawLine(x + 2, y + 2, x + 2, y + 2);
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * The icon used to display the thumb control on a horizontally oriented
    * {@link JSlider} component.
    */
-  private static class HorizontalSliderThumbIcon 
+  private static class HorizontalSliderThumbIcon
     implements Icon, UIResource, Serializable
   {
 
@@ -984,52 +984,52 @@ public class MetalIconFactory implements Serializable
     /**
      * Creates a new instance.
      */
-    public HorizontalSliderThumbIcon() 
+    public HorizontalSliderThumbIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 15;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16;
     }
-    
+
     /**
-     * Paints the icon, taking into account whether or not the component has 
+     * Paints the icon, taking into account whether or not the component has
      * the focus.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
      * @param y  the y-coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       boolean enabled = false;
       boolean focus = false;
       if (c != null)
         {
           enabled = c.isEnabled();
-          focus = c.hasFocus();    
+          focus = c.hasFocus();
         }
-      
+
       // draw the outline
-      if (enabled) 
+      if (enabled)
         g.setColor(MetalLookAndFeel.getBlack());
       else
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
@@ -1038,8 +1038,8 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 14, y + 8, x + 7, y + 15);
       g.drawLine(x + 6, y + 14, x, y + 8);
       g.drawLine(x, y + 7, x, y + 1);
-      
-// The following is commented out until the masking for the gradient painting 
+
+// The following is commented out until the masking for the gradient painting
 // is working correctly
 //      // Fill the icon.
 //      if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme
@@ -1098,7 +1098,7 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 2, y + 2, x + 2, y + 2);
           g.drawLine(x + 6, y + 2, x + 6, y + 2);
           g.drawLine(x + 10, y + 2, x + 10, y + 2);
-          
+
           g.drawLine(x + 4, y + 4, x + 4, y + 4);
           g.drawLine(x + 8, y + 4, x + 8, y + 4);
 
@@ -1107,62 +1107,62 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 10, y + 6, x + 10, y + 6);
         }
 
-    }        
+    }
   }
-  
+
   /**
-   * An icon used for the 'close' button in the title frame of a 
+   * An icon used for the 'close' button in the title frame of a
    * {@link JInternalFrame}.
    */
-  private static class InternalFrameCloseIcon 
+  private static class InternalFrameCloseIcon
     implements Icon, UIResource, Serializable
   {
     /** The icon size in pixels. */
     private int size;
-    
+
     /**
      * Creates a new icon.
-     * 
+     *
      * @param size  the icon size (width and height) in pixels.
      */
-    public InternalFrameCloseIcon(int size) 
+    public InternalFrameCloseIcon(int size)
     {
       this.size = size;
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return size;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return size;
     }
-    
+
     /**
      * Paints the icon.
-     * 
+     *
      * @param c  the component (an {@link JInternalFrame} is expected).
      * @param g  the graphics device.
      * @param x  the x-coordinate.
      * @param y  the y-coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
       AbstractButton b = (AbstractButton) c;
-      
+
       // fill the interior
       if (b.getModel().isPressed())
         // FIXME: also need to take into account whether the internal frame is
@@ -1171,7 +1171,7 @@ public class MetalIconFactory implements Serializable
       else
         g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 2, y + 2, 10, 10);
-      
+
       // draw the outline box and the cross
       if (b.getModel().isPressed())
         g.setColor(MetalLookAndFeel.getBlack());
@@ -1191,7 +1191,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 13, y + 2, x + 13, y + 12);
       g.drawLine(x + 2, y + 12, x + 2, y + 12);
       g.drawLine(x + 12, y + 2, x + 12, y + 2);
-      
+
       g.fillRect(x + 4, y + 4, 2, 2);
       g.fillRect(x + 5, y + 5, 4, 4);
       g.drawLine(x + 9, y + 4, x + 10, y + 4);
@@ -1200,21 +1200,21 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 4, y + 9, x + 5, y + 9);
       g.drawLine(x + 9, y + 8, x + 9, y + 10);
       g.drawLine(x + 8, y + 9, x + 10, y + 9);
-      
+
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x, y, x + 13, y);
       g.drawLine(x, y + 1, x, y + 13);
       g.drawLine(x + 3, y + 4, x + 4, y + 3);
       g.drawLine(x + 3, y + 9, x + 5, y + 7);
       g.drawLine(x + 7, y + 5, x + 9, y + 3);
-      
+
       g.drawLine(x + 12, y + 3, x + 12, y + 11);
       g.drawLine(x + 3, y + 12, x + 12, y + 12);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.drawLine(x + 1, y + 14, x + 14, y + 14);
       g.drawLine(x + 14, y + 1, x + 14, y + 14);
-      
+
       if (!b.getModel().isPressed())
         {
           g.drawLine(x + 5, y + 10, x + 5, y + 10);
@@ -1225,53 +1225,53 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 10, y + 11, x + 10, y + 11);
         }
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * The icon displayed at the top-left corner of a {@link JInternalFrame}.
    */
   private static class InternalFrameDefaultMenuIcon
-    implements Icon, UIResource, Serializable 
+    implements Icon, UIResource, Serializable
   {
-       
+
     /**
      * Creates a new instance.
      */
-    public InternalFrameDefaultMenuIcon() 
+    public InternalFrameDefaultMenuIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16;
     }
-    
+
     /**
      * Paints the icon at the specified location.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       g.fillRect(x + 1, y, 14, 2);
@@ -1279,10 +1279,10 @@ public class MetalIconFactory implements Serializable
       g.fillRect(x + 1, y + 14, 14, 2);
       g.fillRect(x + 14, y + 1, 2, 14);
       g.drawLine(x + 2, y + 5, x + 14, y + 5);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 2, y + 2, 12, 3);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       g.drawLine(x + 3, y + 3, x + 3, y + 3);
       g.drawLine(x + 6, y + 3, x + 6, y + 3);
@@ -1295,59 +1295,59 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 5, y + 2, x + 5, y + 2);
       g.drawLine(x + 8, y + 2, x + 8, y + 2);
       g.drawLine(x + 11, y + 2, x + 11, y + 2);
-    }        
+    }
   }
 
   /**
-   * An icon used in the title frame of a {@link JInternalFrame}.  When you 
+   * An icon used in the title frame of a {@link JInternalFrame}.  When you
    * maximise an internal frame, this icon will replace the 'maximise' icon to
    * provide a 'restore' option.
    */
   private static class InternalFrameAltMaximizeIcon
-    implements Icon, UIResource, Serializable 
+    implements Icon, UIResource, Serializable
   {
     /** The icon size in pixels. */
     private int size;
-    
+
     /**
      * Creates a new icon.
-     * 
+     *
      * @param size  the icon size in pixels.
      */
-    public InternalFrameAltMaximizeIcon(int size) 
+    public InternalFrameAltMaximizeIcon(int size)
     {
       this.size = size;
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return size;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return size;
     }
-    
+
     /**
      * Paints the icon at the specified location.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
 
@@ -1359,27 +1359,27 @@ public class MetalIconFactory implements Serializable
       else
         g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 2, y + 6, 7, 7);
-      
-      
+
+
       if (b.getModel().isPressed())
         g.setColor(MetalLookAndFeel.getBlack());
       else
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-        
+
       g.drawLine(x + 12, y + 1, x + 13, y + 1);
       g.drawLine(x + 11, y + 2, x + 12, y + 2);
       g.drawLine(x + 10, y + 3, x + 11, y + 3);
       g.drawLine(x + 8, y + 2, x + 8, y + 3);
       g.fillRect(x + 8, y + 4, 3, 3);
       g.drawLine(x + 11, y + 6, x + 12, y + 6);
-      
+
       g.drawLine(x + 1, y + 5, x + 5, y + 5);
       g.drawLine(x + 1, y + 6, x + 1, y + 12);
       g.drawLine(x + 9, y + 9, x + 9, y + 12);
       g.drawLine(x + 1, y + 13, x + 9, y + 13);
-      
+
       g.drawLine(x + 2, y + 12, x + 2, y + 12);
-      
+
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 12, y, x + 9, y + 3);
       g.drawLine(x + 7, y + 1, x + 8, y + 1);
@@ -1390,7 +1390,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 3, y + 12, x + 8, y + 12);
       g.drawLine(x + 8, y + 8, x + 8, y + 11);
       g.drawLine(x + 9, y + 8, x + 9, y + 8);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.drawLine(x + 9, y + 2, x + 9, y + 2);
       g.drawLine(x + 11, y + 4, x + 13, y + 2);
@@ -1399,67 +1399,67 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 6, y + 5, x + 6, y + 5);
       g.drawLine(x + 10, y + 8, x + 10, y + 13);
       g.drawLine(x + 1, y + 14, x + 10, y + 14);
-      
+
       if (!b.getModel().isPressed())
         {
           g.drawLine(x + 2, y + 6, x + 6, y + 6);
           g.drawLine(x + 2, y + 6, x + 2, y + 11);
         }
-      
+
       g.setColor(savedColor);
-    }        
+    }
   }
-  
+
   /**
-   * An icon used for the 'maximize' button in the title frame of a 
+   * An icon used for the 'maximize' button in the title frame of a
    * {@link JInternalFrame}.
    */
-  private static class InternalFrameMaximizeIcon 
+  private static class InternalFrameMaximizeIcon
     implements Icon, UIResource, Serializable
   {
-    
+
     /**
      * Creates a new instance.
      */
-    public InternalFrameMaximizeIcon() 
+    public InternalFrameMaximizeIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16;
     }
-    
+
     /**
      * Paints the icon at the specified location.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
-      
+
       AbstractButton b = (AbstractButton) c;
-      
+
       // fill the interior
       if (b.getModel().isPressed())
         g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
@@ -1471,7 +1471,7 @@ public class MetalIconFactory implements Serializable
         g.setColor(MetalLookAndFeel.getBlack());
       else
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-          
+
       g.drawLine(x + 9, y + 1, x + 10, y + 1);
       g.fillRect(x + 11, y + 1, 3, 3);
       g.fillRect(x + 12, y + 4, 2, 2);
@@ -1481,7 +1481,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 1, y + 6, x + 1, y + 12);
       g.drawLine(x + 9, y + 6, x + 9, y + 12);
       g.drawLine(x + 1, y + 13, x + 9, y + 13);
-      
+
       // fill
       g.drawLine(x + 7, y + 6, x + 8, y + 6);
       g.drawLine(x + 6, y + 7, x + 8, y + 7);
@@ -1491,7 +1491,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 2, y + 11, x + 3, y + 11);
       g.drawLine(x + 2, y + 12, x + 4, y + 12);
       g.drawLine(x + 8, y + 8, x + 8, y + 8);
-      
+
       // draw black
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 8, y, x + 13, y);
@@ -1499,11 +1499,11 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 10, y + 2, x + 9, y + 3);
       g.drawLine(x, y + 4, x + 8, y + 4);
       g.drawLine(x, y + 5, x, y + 13);
-      
+
       g.drawLine(x + 2, y + 10, x + 6, y + 6);
       g.drawLine(x + 8, y + 9, x + 8, y + 11);
       g.drawLine(x + 5, y + 12, x + 8, y + 12);
-      
+
       // draw white
       g.setColor(MetalLookAndFeel.getWhite());
       if (!b.getModel().isPressed())
@@ -1512,89 +1512,89 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 2, y + 7, x + 2, y + 9);
           g.drawLine(x + 4, y + 11, x + 7, y + 8);
         }
-      
+
       g.drawLine(x + 1, y + 14, x + 10, y + 14);
       g.drawLine(x + 10, y + 5, x + 10, y + 13);
-      
+
       g.drawLine(x + 9, y + 2, x + 9, y + 2);
       g.drawLine(x + 11, y + 4, x + 11, y + 5);
       g.drawLine(x + 13, y + 6, x + 14, y + 6);
       g.drawLine(x + 14, y + 1, x + 14, y + 5);
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * An icon used in the title frame of a {@link JInternalFrame}.
    */
-  private static class InternalFrameMinimizeIcon 
+  private static class InternalFrameMinimizeIcon
     implements Icon, UIResource, Serializable
   {
-  
+
     /**
      * Creates a new instance.
      */
-    public InternalFrameMinimizeIcon() 
+    public InternalFrameMinimizeIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 16;
     }
-    
+
     /**
      * Paints the icon at the specified location.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color savedColor = g.getColor();
-      
+
       AbstractButton b = (AbstractButton) c;
-      
+
       if (b.getModel().isPressed())
         g.setColor(MetalLookAndFeel.getBlack());
       else
-        // FIXME: here the color depends on whether or not the internal frame 
-        // is selected 
+        // FIXME: here the color depends on whether or not the internal frame
+        // is selected
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
-      
+
       g.drawLine(x + 12, y + 1, x + 13, y + 1);
       g.drawLine(x + 11, y + 2, x + 12, y + 2);
       g.drawLine(x + 10, y + 3, x + 11, y + 3);
       g.drawLine(x + 8, y + 2, x + 8, y + 3);
       g.fillRect(x + 8, y + 4, 3, 3);
       g.drawLine(x + 11, y + 6, x + 12, y + 6);
-      
+
       g.drawLine(x + 1, y + 8, x + 6, y + 8);
       g.drawLine(x + 1, y + 9, x + 1, y + 12);
       g.drawLine(x + 6, y + 9, x + 6, y + 12);
       g.drawLine(x + 1, y + 13, x + 6, y + 13);
-      
+
       g.drawLine(x + 5, y + 9, x + 5, y + 9);
       g.drawLine(x + 2, y + 12, x + 2, y + 12);
-      
+
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 12, y, x + 9, y + 3);
       g.drawLine(x + 7, y + 1, x + 8, y + 1);
@@ -1604,7 +1604,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 3, y + 12, x + 5, y + 12);
       g.drawLine(x + 5, y + 10, x + 5, y + 11);
       g.drawLine(x + 11, y + 5, x + 12, y + 5);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.drawLine(x + 9, y + 2, x + 9, y + 2);
       g.drawLine(x + 11, y + 4, x + 13, y + 2);
@@ -1625,14 +1625,14 @@ public class MetalIconFactory implements Serializable
         }
 
       g.setColor(savedColor);
-    }        
+    }
   }
 
   /**
    * The icon used to display the thumb control on a horizontally oriented
    * {@link JSlider} component.
    */
-  private static class VerticalSliderThumbIcon 
+  private static class VerticalSliderThumbIcon
     implements Icon, UIResource, Serializable
   {
     /**
@@ -1646,53 +1646,53 @@ public class MetalIconFactory implements Serializable
     /**
      * Creates a new instance.
      */
-    public VerticalSliderThumbIcon() 
+    public VerticalSliderThumbIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 16;
     }
-    
+
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 15;
     }
-    
+
     /**
      * Paints the icon taking into account whether the slider control has the
      * focus or not.
-     * 
+     *
      * @param c  the slider (must be a non-null instance of
      *           {@link JSlider}.
      * @param g  the graphics device.
      * @param x  the x-coordinate.
      * @param y  the y-coordinate.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       boolean enabled = false;
       boolean focus = false;
       if (c != null)
         {
           enabled = c.isEnabled();
-          focus = c.hasFocus();    
+          focus = c.hasFocus();
         }
-      
+
       // draw the outline
-      if (enabled) 
+      if (enabled)
         g.setColor(MetalLookAndFeel.getBlack());
       else
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
@@ -1701,8 +1701,8 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 14, y + 8, x + 8, y + 14);
       g.drawLine(x + 8, y + 14, x + 1, y + 14);
       g.drawLine(x, y + 13, x, y + 1);
-      
-//    The following is commented out until the masking for the gradient painting 
+
+//    The following is commented out until the masking for the gradient painting
 //    is working correctly
 //      // Fill the icon.
 //      if (MetalLookAndFeel.getCurrentTheme() instanceof OceanTheme
@@ -1768,57 +1768,57 @@ public class MetalIconFactory implements Serializable
           g.drawLine(x + 6, y + 2, x + 6, y + 2);
           g.drawLine(x + 6, y + 6, x + 6, y + 6);
           g.drawLine(x + 6, y + 10, x + 6, y + 10);
-        
+
         }
-    }        
+    }
   }
-    
+
   /**
    * A tree control icon.  This icon can be in one of two states: expanded and
    * collapsed.
    */
   public static class TreeControlIcon implements Icon, Serializable
   {
-    
+
     /** ???. */
     protected boolean isLight;
-    
+
     /** A flag that controls whether or not the icon is collapsed. */
     private boolean collapsed;
-    
+
     /**
      * Creates a new icon.
-     * 
+     *
      * @param isCollapsed  a flag that controls whether the icon is in the
      *                     collapsed state or the expanded state.
      */
-    public TreeControlIcon(boolean isCollapsed) 
+    public TreeControlIcon(boolean isCollapsed)
     {
       collapsed = isCollapsed;
     }
-    
+
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return The width of the icon.
      */
-    public int getIconWidth() 
+    public int getIconWidth()
     {
       return 18;
     }
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return The height of the icon.
      */
-    public int getIconHeight() 
+    public int getIconHeight()
     {
       return 18;
     }
-    
+
     /**
      * Paints the icon at the location (x, y).
-     * 
+     *
      * @param c the component.
      * @param g the graphics device.
      * @param x the x coordinate.
@@ -1840,31 +1840,31 @@ public class MetalIconFactory implements Serializable
       g.drawOval(x, y, w, w);
       g.setColor(dark);
       g.fillOval(x + 1, y + 1, w - 1, w - 1);
-      
+
       if (collapsed)
         g.fillRect(x + w, y + wHalf + 1, w, 2);
       else
         g.fillRect(x + wHalf + 1, y + w, 2, w);
-      
+
       g.setColor(white);
       g.fillRect(x + wHalf + 1, y + wHalf + 1, 2, 2);
 
-    } 
-    
+    }
+
     /**
      * Simply calls {@link #paintIcon(Component, Graphics, int, int)}.
-     * 
+     *
      * @param c  the component.
      * @param g  the graphics device.
      * @param x  the x coordinate.
      * @param y  the y coordinate.
      */
-    public void paintMe(Component c, Graphics g, int x, int y) 
+    public void paintMe(Component c, Graphics g, int x, int y)
     {
-      paintIcon(c, g, x, y);  
+      paintIcon(c, g, x, y);
     }
   }
-    
+
   /**
    * A tree folder icon.
    */
@@ -1873,34 +1873,34 @@ public class MetalIconFactory implements Serializable
     /**
      * Creates a new instance.
      */
-    public TreeFolderIcon() 
+    public TreeFolderIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the additional height for this icon, in this case 2
      * pixels.
-     * 
+     *
      * @return 2.
      */
-    public int getAdditionalHeight() 
+    public int getAdditionalHeight()
     {
       return 2;
     }
-    
+
     /**
-     * Returns the vertical shift, in pixels, applied when painting the icon.  
+     * Returns the vertical shift, in pixels, applied when painting the icon.
      * This overridden method returns -1.
-     * 
+     *
      * @return The shift.
      */
-    public int getShift() 
+    public int getShift()
     {
       return -1;
     }
   }
-    
+
   /**
    * A tree leaf icon.
    */
@@ -1909,29 +1909,29 @@ public class MetalIconFactory implements Serializable
     /**
      * Creates a new instance.
      */
-    public TreeLeafIcon() 
+    public TreeLeafIcon()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Returns the additional height for this icon, in this case 4
      * pixels.
-     * 
+     *
      * @return 4.
      */
-    public int getAdditionalHeight() 
+    public int getAdditionalHeight()
     {
       return 4;
     }
-    
+
     /**
-     * Returns the vertical shift, in pixels, applied when painting the icon.  
+     * Returns the vertical shift, in pixels, applied when painting the icon.
      * This overridden method returns 2.
-     * 
+     *
      * @return The shift.
      */
-    public int getShift() 
+    public int getShift()
     {
       return 2;
     }
@@ -1939,51 +1939,51 @@ public class MetalIconFactory implements Serializable
 
   /**
    * An icon representing a hard disk.
-   * 
+   *
    * @see MetalIconFactory#getTreeHardDriveIcon()
    */
-  private static class TreeHardDriveIcon 
+  private static class TreeHardDriveIcon
     implements Icon, UIResource, Serializable
   {
 
     /**
      * Creates a new icon instance.
      */
-    public TreeHardDriveIcon() 
+    public TreeHardDriveIcon()
     {
       // Nothing to do here.
     }
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return 16.
      */
-    public int getIconWidth() 
-    { 
-      return 16;
-    }
-
-    /**
-     * Returns the height of the icon, in pixels.
-     * 
-     * @return 16.
-     */
-    public int getIconHeight()   
+    public int getIconWidth()
     {
       return 16;
     }
 
     /**
-     * Paints the icon at the specified location, using colors from the 
+     * Returns the height of the icon, in pixels.
+     *
+     * @return 16.
+     */
+    public int getIconHeight()
+    {
+      return 16;
+    }
+
+    /**
+     * Paints the icon at the specified location, using colors from the
      * current theme.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color saved = g.getColor();
       g.setColor(MetalLookAndFeel.getBlack());
@@ -1993,7 +1993,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 14, y + 7, x + 14, y + 8);
       g.drawLine(x + 1, y + 10, x + 1, y + 11);
       g.drawLine(x + 14, y + 10, x + 14, y + 11);
-      
+
       g.drawLine(x + 2, y + 3, x + 3, y + 3);
       g.drawLine(x + 12, y + 3, x + 13, y + 3);
       g.drawLine(x + 2, y + 6, x + 3, y + 6);
@@ -2002,25 +2002,25 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 12, y + 9, x + 13, y + 9);
       g.drawLine(x + 2, y + 12, x + 3, y + 12);
       g.drawLine(x + 12, y + 12, x + 13, y + 12);
-      
+
       g.drawLine(x + 4, y + 2, x + 11, y + 2);
       g.drawLine(x + 4, y + 7, x + 11, y + 7);
       g.drawLine(x + 4, y + 10, x + 11, y + 10);
       g.drawLine(x + 4, y + 13, x + 11, y + 13);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.fillRect(x + 4, y + 3, 2, 2);
       g.drawLine(x + 6, y + 4, x + 6, y + 4);
       g.drawLine(x + 7, y + 3, x + 9, y + 3);
       g.drawLine(x + 8, y + 4, x + 8, y + 4);
       g.drawLine(x + 11, y + 3, x + 11, y + 3);
-      g.fillRect(x + 2, y + 4, 2, 2); 
-      g.fillRect(x + 2, y + 7, 2, 2); 
-      g.fillRect(x + 2, y + 10, 2, 2); 
+      g.fillRect(x + 2, y + 4, 2, 2);
+      g.fillRect(x + 2, y + 7, 2, 2);
+      g.fillRect(x + 2, y + 10, 2, 2);
       g.drawLine(x + 4, y + 6, x + 4, y + 6);
       g.drawLine(x + 4, y + 9, x + 4, y + 9);
       g.drawLine(x + 4, y + 12, x + 4, y + 12);
-      
+
       g.setColor(MetalLookAndFeel.getControlShadow());
       g.drawLine(x + 13, y + 4, x + 13, y + 4);
       g.drawLine(x + 12, y + 5, x + 13, y + 5);
@@ -2028,7 +2028,7 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 12, y + 8, x + 13, y + 8);
       g.drawLine(x + 13, y + 10, x + 13, y + 10);
       g.drawLine(x + 12, y + 11, x + 13, y + 11);
-      
+
       g.drawLine(x + 10, y + 5, x + 10, y + 5);
       g.drawLine(x + 7, y + 6, x + 7, y + 6);
       g.drawLine(x + 9, y + 6, x + 9, y + 6);
@@ -2045,136 +2045,136 @@ public class MetalIconFactory implements Serializable
       g.drawLine(x + 11, y + 12, x + 11, y + 12);
 
       g.setColor(saved);
-    }        
-  }  
-  
+    }
+  }
+
   /**
    * An icon representing a floppy disk.
-   * 
+   *
    * @see MetalIconFactory#getTreeFloppyDriveIcon()
    */
-  private static class TreeFloppyDriveIcon 
+  private static class TreeFloppyDriveIcon
     implements Icon, UIResource, Serializable
   {
 
     /**
      * Creates a new icon instance.
      */
-    public TreeFloppyDriveIcon() 
+    public TreeFloppyDriveIcon()
     {
       // Nothing to do here.
     }
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return 16.
      */
-    public int getIconWidth() 
-    { 
+    public int getIconWidth()
+    {
       return 16;
     }
 
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return 16.
      */
-    public int getIconHeight()   
+    public int getIconHeight()
     {
       return 16;
     }
 
     /**
-     * Paints the icon at the specified location, using colors from the 
+     * Paints the icon at the specified location, using colors from the
      * current theme.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color saved = g.getColor();
-      
+
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 1, y + 1, x + 13, y + 1);
       g.drawLine(x + 1, y + 1, x + 1, y + 14);
       g.drawLine(x + 1, y + 14, x + 14, y + 14);
       g.drawLine(x + 14, y + 2, x + 14, y + 14);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 2, y + 2, 12, 12);
-      
+
       g.setColor(MetalLookAndFeel.getControlShadow());
       g.fillRect(x + 5, y + 2, 6, 5);
       g.drawLine(x + 4, y + 8, x + 11, y + 8);
       g.drawLine(x + 3, y + 9, x + 3, y + 13);
       g.drawLine(x + 12, y + 9, x + 12, y + 13);
-      
+
       g.setColor(MetalLookAndFeel.getWhite());
       g.fillRect(x + 8, y + 3, 2, 3);
       g.fillRect(x + 4, y + 9, 8, 5);
-      
+
       g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
       g.drawLine(x + 5, y + 10, x + 9, y + 10);
       g.drawLine(x + 5, y + 12, x + 8, y + 12);
 
       g.setColor(saved);
-    }        
-  }  
+    }
+  }
 
   /**
    * An icon representing a computer.
-   * 
+   *
    * @see MetalIconFactory#getTreeComputerIcon()
    */
-  private static class TreeComputerIcon 
+  private static class TreeComputerIcon
     implements Icon, UIResource, Serializable
   {
 
     /**
      * Creates a new icon instance.
      */
-    public TreeComputerIcon() 
+    public TreeComputerIcon()
     {
       // Nothing to do here.
     }
 
     /**
      * Returns the width of the icon, in pixels.
-     * 
+     *
      * @return 16.
      */
-    public int getIconWidth() 
-    { 
+    public int getIconWidth()
+    {
       return 16;
     }
 
     /**
      * Returns the height of the icon, in pixels.
-     * 
+     *
      * @return 16.
      */
-    public int getIconHeight()   
+    public int getIconHeight()
     {
       return 16;
     }
 
     /**
-     * Paints the icon at the specified location, using colors from the 
+     * Paints the icon at the specified location, using colors from the
      * current theme.
-     * 
+     *
      * @param c  the component (ignored).
      * @param g  the graphics device.
      * @param x  the x-coordinate for the top-left of the icon.
      * @param y  the y-coordinate for the top-left of the icon.
      */
-    public void paintIcon(Component c, Graphics g, int x, int y) 
+    public void paintIcon(Component c, Graphics g, int x, int y)
     {
       Color saved = g.getColor();
-      
+
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 3, y + 1, x + 12, y + 1);
       g.drawLine(x + 2, y + 2, x + 2, y + 8);
@@ -2189,20 +2189,20 @@ public class MetalIconFactory implements Serializable
 
       g.setColor(MetalLookAndFeel.getPrimaryControl());
       g.fillRect(x + 5, y + 4, 6, 4);
-      
+
       g.setColor(MetalLookAndFeel.getControlShadow());
       g.drawLine(x + 6, y + 12, x + 8, y + 12);
       g.drawLine(x + 10, y + 12, x + 12, y + 12);
       g.setColor(saved);
-    }        
-  }  
-    
+    }
+  }
+
   /** The icon returned by {@link #getCheckBoxIcon()}. */
   private static Icon checkBoxIcon;
-  
+
   /** The icon returned by {@link #getCheckBoxMenuItemIcon()}. */
   private static Icon checkBoxMenuItemIcon;
-  
+
   /** The icon returned by {@link #getFileChooserDetailViewIcon()}. */
   private static Icon fileChooserDetailViewIcon;
 
@@ -2229,49 +2229,49 @@ public class MetalIconFactory implements Serializable
 
   /** The icon returned by {@link #getTreeComputerIcon()}. */
   private static Icon treeComputerIcon;
-  
+
   /** The icon instance returned by {@link #getTreeFloppyDriveIcon()}. */
   private static Icon treeFloppyDriveIcon;
-  
+
   /** The icon instance returned by {@link #getTreeHardDriveIcon()}. */
   private static Icon treeHardDriveIcon;
-  
+
   /** The icon instance returned by {@link #getHorizontalSliderThumbIcon()}. */
   private static Icon horizontalSliderThumbIcon;
 
   /** The icon instance returned by {@link #getVerticalSliderThumbIcon()}. */
   private static Icon verticalSliderThumbIcon;
-  
+
   /**
-   * Creates a new instance.  All the methods are static, so creating an 
+   * Creates a new instance.  All the methods are static, so creating an
    * instance isn't necessary.
    */
-  public MetalIconFactory() 
+  public MetalIconFactory()
   {
     // Nothing to do here.
   }
 
   /**
    * Returns an icon for use when rendering the {@link JCheckBox} component.
-   * 
+   *
    * @return A check box icon.
-   * 
+   *
    * @since 1.3
    */
-  public static Icon getCheckBoxIcon() 
+  public static Icon getCheckBoxIcon()
   {
     if (checkBoxIcon == null)
       checkBoxIcon = new MetalCheckBoxIcon();
     return checkBoxIcon;
   }
-  
+
   /**
-   * Returns an icon for use when rendering the {@link JCheckBoxMenuItem} 
+   * Returns an icon for use when rendering the {@link JCheckBoxMenuItem}
    * component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getCheckBoxMenuItemIcon() 
+  public static Icon getCheckBoxMenuItemIcon()
   {
     if (checkBoxMenuItemIcon == null)
       checkBoxMenuItemIcon = new CheckBoxMenuItemIcon();
@@ -2280,58 +2280,58 @@ public class MetalIconFactory implements Serializable
 
   /**
    * Returns an icon for use by the {@link JFileChooser} component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getFileChooserDetailViewIcon() 
+  public static Icon getFileChooserDetailViewIcon()
   {
     if (fileChooserDetailViewIcon == null)
       fileChooserDetailViewIcon = new FileChooserDetailViewIcon();
     return fileChooserDetailViewIcon;
   }
-    
+
   /**
    * Returns an icon for use by the {@link JFileChooser} component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getFileChooserHomeFolderIcon() 
+  public static Icon getFileChooserHomeFolderIcon()
   {
     if (fileChooserHomeFolderIcon == null)
       fileChooserHomeFolderIcon = new FileChooserHomeFolderIcon();
-    return fileChooserHomeFolderIcon;        
+    return fileChooserHomeFolderIcon;
   }
-    
+
   /**
    * Returns an icon for use by the {@link JFileChooser} component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getFileChooserListViewIcon() 
+  public static Icon getFileChooserListViewIcon()
   {
     if (fileChooserListViewIcon == null)
       fileChooserListViewIcon = new FileChooserListViewIcon();
     return fileChooserListViewIcon;
   }
-    
+
   /**
    * Returns an icon for use by the {@link JFileChooser} component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getFileChooserNewFolderIcon() 
+  public static Icon getFileChooserNewFolderIcon()
   {
     if (fileChooserNewFolderIcon == null)
       fileChooserNewFolderIcon = new FileChooserNewFolderIcon();
     return fileChooserNewFolderIcon;
   }
-    
+
   /**
    * Returns an icon for use by the {@link JFileChooser} component.
-   * 
+   *
    * @return An icon.
    */
-  public static Icon getFileChooserUpFolderIcon() 
+  public static Icon getFileChooserUpFolderIcon()
   {
     if (fileChooserUpFolderIcon == null)
       fileChooserUpFolderIcon = new FileChooserUpFolderIcon();
@@ -2352,10 +2352,10 @@ public class MetalIconFactory implements Serializable
 
   /**
    * Creates a new instance of the icon used in a {@link JRadioButtonMenuItem}.
-   * 
+   *
    * @return A new icon instance.
    */
-  public static Icon getRadioButtonMenuItemIcon() 
+  public static Icon getRadioButtonMenuItemIcon()
   {
     if (radioButtonMenuItemIcon == null)
       radioButtonMenuItemIcon = new RadioButtonMenuItemIcon();
@@ -2365,25 +2365,25 @@ public class MetalIconFactory implements Serializable
   /**
    * Returns the icon used to display the thumb for a horizontally oriented
    * {@link JSlider}.
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getHorizontalSliderThumbIcon() 
+  public static Icon getHorizontalSliderThumbIcon()
   {
     if (horizontalSliderThumbIcon == null)
       horizontalSliderThumbIcon = new HorizontalSliderThumbIcon();
     return horizontalSliderThumbIcon;
   }
-    
+
   /**
    * Creates a new icon used to represent the 'close' button in the title
    * pane of a {@link JInternalFrame}.
-   * 
+   *
    * @param size  the icon size.
-   * 
+   *
    * @return A close icon.
    */
-  public static Icon getInternalFrameCloseIcon(int size) 
+  public static Icon getInternalFrameCloseIcon(int size)
   {
     return new InternalFrameCloseIcon(size);
   }
@@ -2391,39 +2391,39 @@ public class MetalIconFactory implements Serializable
   /**
    * Creates a new icon for the menu in a {@link JInternalFrame}.  This is the
    * icon displayed at the top left of the frame.
-   * 
+   *
    * @return A menu icon.
    */
-  public static Icon getInternalFrameDefaultMenuIcon() 
+  public static Icon getInternalFrameDefaultMenuIcon()
   {
     if (internalFrameDefaultMenuIcon == null)
       internalFrameDefaultMenuIcon = new InternalFrameDefaultMenuIcon();
     return internalFrameDefaultMenuIcon;
   }
-  
+
   /**
    * Creates a new icon for the 'maximize' button in a {@link JInternalFrame}.
-   * 
+   *
    * @param size  the icon size in pixels.
-   * 
+   *
    * @return The icon.
-   * 
+   *
    * @see #getInternalFrameAltMaximizeIcon(int)
    */
-  public static Icon getInternalFrameMaximizeIcon(int size) 
+  public static Icon getInternalFrameMaximizeIcon(int size)
   {
     return new InternalFrameMaximizeIcon();
   }
-    
+
   /**
    * Returns the icon used for the minimize button in the frame title for a
    * {@link JInternalFrame}.
-   * 
+   *
    * @param size  the icon size in pixels (ignored by this implementation).
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getInternalFrameMinimizeIcon(int size) 
+  public static Icon getInternalFrameMinimizeIcon(int size)
   {
     return new InternalFrameMinimizeIcon();
   }
@@ -2431,94 +2431,94 @@ public class MetalIconFactory implements Serializable
   /**
    * Creates a new icon for the 'restore' button in a {@link JInternalFrame}
    * that has been maximised.
-   * 
+   *
    * @param size  the icon size in pixels.
-   * 
+   *
    * @return The icon.
-   * 
+   *
    * @see #getInternalFrameMaximizeIcon(int)
    */
-  public static Icon getInternalFrameAltMaximizeIcon(int size) 
+  public static Icon getInternalFrameAltMaximizeIcon(int size)
   {
     return new InternalFrameAltMaximizeIcon(size);
   }
-  
+
   /**
    * Returns the icon used to display the thumb for a vertically oriented
    * {@link JSlider}.
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getVerticalSliderThumbIcon() 
+  public static Icon getVerticalSliderThumbIcon()
   {
     if (verticalSliderThumbIcon == null)
       verticalSliderThumbIcon = new VerticalSliderThumbIcon();
     return verticalSliderThumbIcon;
   }
-    
+
   /**
    * Creates and returns a new tree folder icon.
-   * 
+   *
    * @return A new tree folder icon.
-   */  
-  public static Icon getTreeFolderIcon() 
+   */
+  public static Icon getTreeFolderIcon()
   {
     return new TreeFolderIcon();
   }
-    
+
   /**
    * Creates and returns a new tree leaf icon.
-   * 
+   *
    * @return A new tree leaf icon.
    */
-  public static Icon getTreeLeafIcon() 
+  public static Icon getTreeLeafIcon()
   {
     return new TreeLeafIcon();
   }
-  
+
   /**
    * Creates and returns a tree control icon.
-   * 
-   * @param isCollapsed  a flag that controls whether the icon is in the 
+   *
+   * @param isCollapsed  a flag that controls whether the icon is in the
    *                     collapsed or expanded state.
-   * 
+   *
    * @return A tree control icon.
    */
-  public static Icon getTreeControlIcon(boolean isCollapsed) 
+  public static Icon getTreeControlIcon(boolean isCollapsed)
   {
     return new TreeControlIcon(isCollapsed);
   }
 
   /**
    * Returns a 16x16 icon representing a computer.
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getTreeComputerIcon() 
+  public static Icon getTreeComputerIcon()
   {
     if (treeComputerIcon == null)
       treeComputerIcon = new TreeComputerIcon();
-    return treeComputerIcon;        
+    return treeComputerIcon;
   }
-    
+
   /**
    * Returns a 16x16 icon representing a floppy disk.
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getTreeFloppyDriveIcon() 
+  public static Icon getTreeFloppyDriveIcon()
   {
     if (treeFloppyDriveIcon == null)
       treeFloppyDriveIcon = new TreeFloppyDriveIcon();
     return treeFloppyDriveIcon;
   }
-    
+
   /**
    * Returns a 16x16 icon representing a hard disk.
-   * 
+   *
    * @return The icon.
    */
-  public static Icon getTreeHardDriveIcon() 
+  public static Icon getTreeHardDriveIcon()
   {
     if (treeHardDriveIcon == null)
       treeHardDriveIcon = new TreeHardDriveIcon();
@@ -2527,9 +2527,9 @@ public class MetalIconFactory implements Serializable
 
   /**
    * Returns a new instance of a 4 x 8 icon showing a small black triangle that
-   * points to the right.  This is displayed in menu items that have a 
+   * points to the right.  This is displayed in menu items that have a
    * sub menu.
-   * 
+   *
    * @return The icon.
    */
   public static Icon getMenuArrowIcon()
@@ -2558,11 +2558,11 @@ public class MetalIconFactory implements Serializable
       };
     return menuArrow;
   }
-  
+
   /**
    * Returns a new instance of a 4 x 8 icon showing a small black triangle that
    * points to the right. This is displayed in menu items that have a sub menu.
-   * 
+   *
    * @return The icon.
    */
   public static Icon getMenuItemArrowIcon()
@@ -2591,10 +2591,10 @@ public class MetalIconFactory implements Serializable
       };
     return menuItemArrow;
   }
-  
+
   /**
    * Returns a new instance of a 13 x 13 icon showing a small black check mark.
-   * 
+   *
    * @return The icon.
    */
   public static Icon getMenuItemCheckIcon()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
index dd0c486396b..08de7744656 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java
@@ -60,16 +60,16 @@ import javax.swing.plaf.basic.BasicInternalFrameTitlePane;
 
 
 /**
- * The title pane for a {@link JInternalFrame} (see 
- * {@link MetalInternalFrameUI#createNorthPane(JInternalFrame)}).  This can 
- * be displayed in two styles: one for regular internal frames, and the other 
+ * The title pane for a {@link JInternalFrame} (see
+ * {@link MetalInternalFrameUI#createNorthPane(JInternalFrame)}).  This can
+ * be displayed in two styles: one for regular internal frames, and the other
  * for "palette" style internal frames.
  */
-public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane 
+public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
 {
- 
+
   /**
-   * A property change handler that listens for changes to the 
+   * A property change handler that listens for changes to the
    * JInternalFrame.isPalette property and updates the title
    * pane as appropriate.
    */
@@ -83,11 +83,11 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     {
       super();
     }
-    
+
     /**
      * Handles JInternalFrame.isPalette property changes, with all
      * other property changes being passed to the superclass.
-     * 
+     *
      * @param e  the event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -111,7 +111,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
 
   /**
    * A layout manager for the title pane.
-   * 
+   *
    * @see #createLayout()
    */
   private class MetalTitlePaneLayout implements LayoutManager
@@ -176,8 +176,8 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
         }
 
       Dimension titlePreferredSize = title.getPreferredSize();
-      title.setBounds(insets.left + 5, insets.top, 
-              Math.min(titlePreferredSize.width, loc - insets.left - 10), 
+      title.setBounds(insets.left + 5, insets.top,
+              Math.min(titlePreferredSize.width, loc - insets.left - 10),
               height);
 
     }
@@ -224,26 +224,26 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
 
   /** A flag indicating whether the title pane uses the palette style. */
   protected boolean isPalette;
-  
-  /** 
+
+  /**
    * The icon used for the close button - this is fetched from the look and
-   * feel defaults using the key InternalFrame.paletteCloseIcon. 
+   * feel defaults using the key InternalFrame.paletteCloseIcon.
    */
   protected Icon paletteCloseIcon;
-  
+
   /**
-   * The height of the title pane when isPalette is 
-   * true.  This value is fetched from the look and feel defaults 
+   * The height of the title pane when isPalette is
+   * true.  This value is fetched from the look and feel defaults
    * using the key InternalFrame.paletteTitleHeight.
    */
   protected int paletteTitleHeight;
-   
+
   /** The label used to display the title for the internal frame. */
   JLabel title;
-  
+
   /**
    * Creates a new title pane for the specified frame.
-   * 
+   *
    * @param f  the internal frame.
    */
   public MetalInternalFrameTitlePane(JInternalFrame f)
@@ -251,7 +251,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     super(f);
     isPalette = false;
   }
-  
+
   /**
    * Fetches the colors used in the title pane.
    */
@@ -262,21 +262,21 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     selectedTitleColor = MetalLookAndFeel.getWindowTitleBackground();
     notSelectedTextColor = MetalLookAndFeel.getInactiveControlTextColor();
     notSelectedTitleColor = MetalLookAndFeel.getWindowTitleInactiveBackground();
-    
+
     paletteTitleHeight = UIManager.getInt("InternalFrame.paletteTitleHeight");
     paletteCloseIcon = UIManager.getIcon("InternalFrame.paletteCloseIcon");
     minIcon = MetalIconFactory.getInternalFrameAltMaximizeIcon(16);
 
-    title = new JLabel(frame.getTitle(), 
-            MetalIconFactory.getInternalFrameDefaultMenuIcon(), 
+    title = new JLabel(frame.getTitle(),
+            MetalIconFactory.getInternalFrameDefaultMenuIcon(),
             SwingConstants.LEFT);
   }
-  
+
   /**
    * Clears the colors used for the title pane.
    */
   protected void uninstallDefaults()
-  {  
+  {
     super.uninstallDefaults();
     selectedTextColor = null;
     selectedTitleColor = null;
@@ -286,14 +286,14 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     minIcon = null;
     title = null;
   }
-  
+
   /**
    * Calls the super class to create the buttons, then calls
-   * setBorderPainted(false) and 
+   * setBorderPainted(false) and
    * setContentAreaFilled(false) for each button.
    */
   protected void createButtons()
-  { 
+  {
     super.createButtons();
     closeButton.setBorderPainted(false);
     closeButton.setContentAreaFilled(false);
@@ -302,7 +302,7 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     maxButton.setBorderPainted(false);
     maxButton.setContentAreaFilled(false);
   }
-  
+
   /**
    * Overridden to do nothing.
    */
@@ -310,21 +310,21 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
   {
     // do nothing
   }
-  
+
   /**
    * Overridden to do nothing.
    */
   protected void showSystemMenu()
   {
-      // do nothing    
+      // do nothing
   }
-  
+
   /**
    * Adds the sub components of the title pane.
    */
   protected void addSubComponents()
   {
-    // FIXME:  this method is probably overridden to only add the required 
+    // FIXME:  this method is probably overridden to only add the required
     // buttons
     add(title);
     add(closeButton);
@@ -335,19 +335,19 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
   /**
    * Creates a new instance of MetalTitlePaneLayout (not part of
    * the public API).
-   * 
+   *
    * @return A new instance of MetalTitlePaneLayout.
    */
   protected LayoutManager createLayout()
   {
     return new MetalTitlePaneLayout();
   }
-  
+
   /**
    * Draws the title pane in the palette style.
-   * 
+   *
    * @param g  the graphics device.
-   * 
+   *
    * @see #paintComponent(Graphics)
    */
   public void paintPalette(Graphics g)
@@ -362,22 +362,22 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
                                  SwingConstants.VERTICAL,
                                  "InternalFrame.activeTitleGradient");
       }
-    MetalUtils.fillMetalPattern(this, g, b.x + 4, b.y + 2, b.width 
+    MetalUtils.fillMetalPattern(this, g, b.x + 4, b.y + 2, b.width
             - paletteCloseIcon.getIconWidth() - 13, b.height - 5,
-            MetalLookAndFeel.getPrimaryControlHighlight(), 
+            MetalLookAndFeel.getPrimaryControlHighlight(),
             MetalLookAndFeel.getBlack());
-    
+
     // draw a line separating the title pane from the frame content
     Dimension d = getSize();
     g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
     g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-    
+
     g.setColor(savedColor);
   }
 
   /**
    * Paints a representation of the current state of the internal frame.
-   * 
+   *
    * @param g  the graphics device.
    */
   public void paintComponent(Graphics g)
@@ -394,13 +394,13 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
           g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
         else
           g.setColor(MetalLookAndFeel.getControlDarkShadow());
-        
+
         // put a dot in each of the top corners
         g.drawLine(0, 0, 0, 0);
         g.drawLine(d.width - 1, 0, d.width - 1, 0);
-        
+
         g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-        
+
         // draw the metal pattern
         if (UIManager.get("InternalFrame.activeTitleGradient") != null
             && frame.isSelected())
@@ -415,22 +415,22 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
         int endX = startX;
         if (iconButton.isVisible())
           endX = Math.max(iconButton.getX(), endX);
-        else if (maxButton.isVisible()) 
+        else if (maxButton.isVisible())
           endX = Math.max(maxButton.getX(), endX);
         else if (closeButton.isVisible())
           endX = Math.max(closeButton.getX(), endX);
         endX -= 7;
         if (endX > startX)
-          MetalUtils.fillMetalPattern(this, g, startX, 3, endX - startX, 
+          MetalUtils.fillMetalPattern(this, g, startX, 3, endX - startX,
               getHeight() - 6, Color.white, Color.gray);
       }
     g.setColor(savedColor);
   }
-  
+
   /**
-   * Sets the flag that controls whether the title pane is drawn in the 
+   * Sets the flag that controls whether the title pane is drawn in the
    * palette style or the regular style.
-   *  
+   *
    * @param b  the new value of the flag.
    */
   public void setPalette(boolean b)
@@ -444,15 +444,14 @@ public class MetalInternalFrameTitlePane extends BasicInternalFrameTitlePane
     else
       closeButton.setIcon(closeIcon);
   }
-  
+
   /**
    * Creates and returns a property change handler for the title pane.
-   * 
+   *
    * @return The property change handler.
    */
   protected PropertyChangeListener createPropertyChangeListener()
   {
-    return new MetalInternalFrameTitlePanePropertyChangeHandler();   
+    return new MetalInternalFrameTitlePanePropertyChangeHandler();
   }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
index abe6a2817e1..5eda2ff5eba 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalInternalFrameUI.java
@@ -54,16 +54,16 @@ import javax.swing.plaf.basic.BasicInternalFrameUI;
 public class MetalInternalFrameUI
   extends BasicInternalFrameUI
 {
-  /** 
-   * The key (JInternalFrame.isPalette) for the client property 
-   * that controls whether the internal frame is displayed using the palette 
-   * style. 
+  /**
+   * The key (JInternalFrame.isPalette) for the client property
+   * that controls whether the internal frame is displayed using the palette
+   * style.
    */
   protected static String IS_PALETTE = "JInternalFrame.isPalette";
 
   /**
    * Constructs a new instance of MetalInternalFrameUI.
-   * 
+   *
    * @param frame  the frame.
    */
   public MetalInternalFrameUI(JInternalFrame frame)
@@ -82,10 +82,10 @@ public class MetalInternalFrameUI
   {
     return new MetalInternalFrameUI((JInternalFrame) component);
   }
-  
+
   /**
    * Sets the fields and properties for the component.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -101,23 +101,23 @@ public class MetalInternalFrameUI
 
   /**
    * Creates and returns the component that will be used for the north pane
-   * of the {@link JInternalFrame}.  
-   * 
+   * of the {@link JInternalFrame}.
+   *
    * @param w  the internal frame.
-   * 
+   *
    * @return A new instance of {@link MetalInternalFrameTitlePane}.
    */
   protected JComponent createNorthPane(JInternalFrame w)
   {
     titlePane = new MetalInternalFrameTitlePane(w);
-    return titlePane;  
+    return titlePane;
   }
-  
+
   /**
    * Sets the state of the {@link JInternalFrame} to reflect whether or not
    * it is using the palette style.  When a frame is displayed as a palette,
    * it uses a different border and the title pane is drawn differently.
-   * 
+   *
    * @param isPalette  use the palette style?
    */
   public void setPalette(boolean isPalette)
@@ -129,17 +129,17 @@ public class MetalInternalFrameUI
     else
       frame.setBorder(new MetalBorders.InternalFrameBorder());
   }
- 
+
   /** A listener that is used to handle IS_PALETTE property changes. */
   private PropertyChangeListener paletteListener;
-  
+
   /**
    * Adds the required listeners.
    */
   protected void installListeners()
   {
-    super.installListeners(); 
-    paletteListener = new PropertyChangeListener() 
+    super.installListeners();
+    paletteListener = new PropertyChangeListener()
     {
       public void propertyChange(PropertyChangeEvent e)
       {
@@ -154,7 +154,7 @@ public class MetalInternalFrameUI
     };
     frame.addPropertyChangeListener(paletteListener);
   }
-  
+
   /**
    * Removes the listeners used.
    */
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
index 12b858e0a93..915e5016d91 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalLabelUI.java
@@ -79,12 +79,12 @@ public class MetalLabelUI
       metalLabelUI = new MetalLabelUI();
     return metalLabelUI;
   }
-  
+
   /**
-   * Draws the text for a disabled label, using the color defined in the 
+   * Draws the text for a disabled label, using the color defined in the
    * {@link UIManager} defaults with the key
    * Label.disabledForeground.
-   * 
+   *
    * @param l  the label.
    * @param g  the graphics device.
    * @param s  the label text.
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java b/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
index 25c624b7427..acc3fedde19 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -56,7 +56,7 @@ import javax.swing.plaf.basic.BasicLookAndFeel;
 
 /**
  * A custom look and feel that is designed to look similar across different
- * operating systems.  To install this look and feel, add the following code 
+ * operating systems.  To install this look and feel, add the following code
  * (or something similar) near the start of your application:
                      
  * 
                        * try
@@ -69,12 +69,12 @@ import javax.swing.plaf.basic.BasicLookAndFeel;
  * }
                      
  */
 public class MetalLookAndFeel extends BasicLookAndFeel
-{          
+{
   private static final long serialVersionUID = 6680646159193457980L;
-  
+
   /** The current theme. */
   private static MetalTheme theme;
-  
+
   /**
    * Creates a new instance of the Metal look and feel.
    */
@@ -95,7 +95,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
    * Returns false to indicate that this look and feel does not
    * attempt to emulate the look and feel of native applications on the host
    * platform.
-   * 
+   *
    * @return false.
    */
   public boolean isNativeLookAndFeel()
@@ -106,7 +106,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns true to indicate that this look and feel is supported
    * on all platforms.
-   * 
+   *
    * @return true.
    */
   public boolean isSupportedLookAndFeel()
@@ -117,7 +117,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns a string describing the look and feel.  In this case, the method
    * returns "Metal look and feel".
-   * 
+   *
    * @return A string describing the look and feel.
    */
   public String getDescription()
@@ -127,7 +127,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the look and feel identifier.
-   * 
+   *
    * @return "MetalLookAndFeel".
    */
   public String getID()
@@ -137,7 +137,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the look and feel name.
-   * 
+   *
    * @return "MetalLookAndFeel".
    */
   public String getName()
@@ -156,7 +156,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the accelerator foreground color from the installed theme.
-   * 
+   *
    * @return The accelerator foreground color.
    */
   public static ColorUIResource getAcceleratorForeground()
@@ -167,9 +167,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the accelerator selected foreground color from the installed 
+   * Returns the accelerator selected foreground color from the installed
    * theme.
-   * 
+   *
    * @return The accelerator selected foreground color.
    */
   public static ColorUIResource getAcceleratorSelectedForeground()
@@ -181,7 +181,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color black from the installed theme.
-   * 
+   *
    * @return The color black.
    */
   public static ColorUIResource getBlack()
@@ -193,7 +193,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the control color from the installed theme.
-   * 
+   *
    * @return The control color.
    */
   public static ColorUIResource getControl()
@@ -206,7 +206,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used for dark shadows on controls, from the installed
    * theme.
-   * 
+   *
    * @return The color used for dark shadows on controls.
    */
   public static ColorUIResource getControlDarkShadow()
@@ -218,7 +218,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used for disabled controls, from the installed theme.
-   * 
+   *
    * @return The color used for disabled controls.
    */
   public static ColorUIResource getControlDisabled()
@@ -231,7 +231,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used to draw highlights for controls, from the installed
    * theme.
-   * 
+   *
    * @return The color used to draw highlights for controls.
    */
   public static ColorUIResource getControlHighlight()
@@ -242,9 +242,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the color used to display control info, from the installed 
+   * Returns the color used to display control info, from the installed
    * theme.
-   * 
+   *
    * @return The color used to display control info.
    */
   public static ColorUIResource getControlInfo()
@@ -257,7 +257,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used to draw shadows for controls, from the installed
    * theme.
-   * 
+   *
    * @return The color used to draw shadows for controls.
    */
   public static ColorUIResource getControlShadow()
@@ -269,7 +269,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used for text on controls, from the installed theme.
-   * 
+   *
    * @return The color used for text on controls.
    */
   public static ColorUIResource getControlTextColor()
@@ -281,7 +281,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the font used for text on controls, from the installed theme.
-   * 
+   *
    * @return The font used for text on controls.
    */
   public static FontUIResource getControlTextFont()
@@ -292,9 +292,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the color used for the desktop background, from the installed 
+   * Returns the color used for the desktop background, from the installed
    * theme.
-   * 
+   *
    * @return The color used for the desktop background.
    */
   public static ColorUIResource getDesktopColor()
@@ -305,9 +305,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the color used to draw focus highlights, from the installed 
+   * Returns the color used to draw focus highlights, from the installed
    * theme.
-   * 
+   *
    * @return The color used to draw focus highlights.
    */
   public static ColorUIResource getFocusColor()
@@ -320,7 +320,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used to draw highlighted text, from the installed
    * theme.
-   * 
+   *
    * @return The color used to draw highlighted text.
    */
   public static ColorUIResource getHighlightedTextColor()
@@ -333,7 +333,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used to draw text on inactive controls, from the
    * installed theme.
-   * 
+   *
    * @return The color used to draw text on inactive controls.
    */
   public static ColorUIResource getInactiveControlTextColor()
@@ -346,7 +346,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the color used to draw inactive system text, from the installed
    * theme.
-   * 
+   *
    * @return The color used to draw inactive system text.
    */
   public static ColorUIResource getInactiveSystemTextColor()
@@ -358,9 +358,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the background color for menu items, from the installed theme.
-   * 
+   *
    * @return The background color for menu items.
-   * 
+   *
    * @see #getMenuSelectedBackground()
    */
   public static ColorUIResource getMenuBackground()
@@ -373,9 +373,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the foreground color for disabled menu items, from the installed
    * theme.
-   * 
+   *
    * @return The foreground color for disabled menu items.
-   * 
+   *
    * @see #getMenuForeground()
    */
   public static ColorUIResource getMenuDisabledForeground()
@@ -387,9 +387,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the foreground color for menu items, from the installed theme.
-   * 
+   *
    * @return The foreground color for menu items.
-   * 
+   *
    * @see #getMenuDisabledForeground()
    * @see #getMenuSelectedForeground()
    */
@@ -403,9 +403,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the background color for selected menu items, from the installed
    * theme.
-   * 
+   *
    * @return The background color for selected menu items.
-   * 
+   *
    * @see #getMenuBackground()
    */
   public static ColorUIResource getMenuSelectedBackground()
@@ -418,9 +418,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the foreground color for selected menu items, from the installed
    * theme.
-   * 
+   *
    * @return The foreground color for selected menu items.
-   * 
+   *
    * @see #getMenuForeground()
    */
   public static ColorUIResource getMenuSelectedForeground()
@@ -432,7 +432,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the font used for text in menus, from the installed theme.
-   * 
+   *
    * @return The font used for text in menus.
    */
   public static FontUIResource getMenuTextFont()
@@ -444,7 +444,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the primary color for controls, from the installed theme.
-   * 
+   *
    * @return The primary color for controls.
    */
   public static ColorUIResource getPrimaryControl()
@@ -455,9 +455,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the primary color for the dark shadow on controls, from the 
+   * Returns the primary color for the dark shadow on controls, from the
    * installed theme.
-   * 
+   *
    * @return The primary color for the dark shadow on controls.
    */
   public static ColorUIResource getPrimaryControlDarkShadow()
@@ -468,9 +468,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the primary color for the highlight on controls, from the 
+   * Returns the primary color for the highlight on controls, from the
    * installed theme.
-   * 
+   *
    * @return The primary color for the highlight on controls.
    */
   public static ColorUIResource getPrimaryControlHighlight()
@@ -481,9 +481,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the primary color for the information on controls, from the 
+   * Returns the primary color for the information on controls, from the
    * installed theme.
-   * 
+   *
    * @return The primary color for the information on controls.
    */
   public static ColorUIResource getPrimaryControlInfo()
@@ -496,7 +496,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   /**
    * Returns the primary color for the shadow on controls, from the installed
    * theme.
-   * 
+   *
    * @return The primary color for the shadow on controls.
    */
   public static ColorUIResource getPrimaryControlShadow()
@@ -508,7 +508,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the background color for separators, from the installed theme.
-   * 
+   *
    * @return The background color for separators.
    */
   public static ColorUIResource getSeparatorBackground()
@@ -520,7 +520,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the foreground color for separators, from the installed theme.
-   * 
+   *
    * @return The foreground color for separators.
    */
   public static ColorUIResource getSeparatorForeground()
@@ -532,7 +532,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the font used for sub text, from the installed theme.
-   * 
+   *
    * @return The font used for sub text.
    */
   public static FontUIResource getSubTextFont()
@@ -544,7 +544,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used for system text, from the installed theme.
-   * 
+   *
    * @return The color used for system text.
    */
   public static ColorUIResource getSystemTextColor()
@@ -556,7 +556,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the font used for system text, from the installed theme.
-   * 
+   *
    * @return The font used for system text.
    */
   public static FontUIResource getSystemTextFont()
@@ -568,7 +568,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used to highlight text, from the installed theme.
-   * 
+   *
    * @return The color used to highlight text.
    */
   public static ColorUIResource getTextHighlightColor()
@@ -580,7 +580,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used to display user text, from the installed theme.
-   * 
+   *
    * @return The color used to display user text.
    */
   public static ColorUIResource getUserTextColor()
@@ -592,7 +592,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the font used for user text, obtained from the current theme.
-   * 
+   *
    * @return The font used for user text.
    */
   public static FontUIResource getUserTextFont()
@@ -604,7 +604,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the color used for white, from the installed theme.
-   * 
+   *
    * @return The color used for white.
    */
   public static ColorUIResource getWhite()
@@ -616,7 +616,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the window background color, from the installed theme.
-   * 
+   *
    * @return The window background color.
    */
   public static ColorUIResource getWindowBackground()
@@ -628,7 +628,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the window title background color, from the installed theme.
-   * 
+   *
    * @return The window title background color.
    */
   public static ColorUIResource getWindowTitleBackground()
@@ -640,9 +640,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the window title font from the current theme.
-   * 
+   *
    * @return The window title font.
-   * 
+   *
    * @see MetalTheme
    */
   public static FontUIResource getWindowTitleFont()
@@ -654,7 +654,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
 
   /**
    * Returns the window title foreground color, from the installed theme.
-   * 
+   *
    * @return The window title foreground color.
    */
   public static ColorUIResource getWindowTitleForeground()
@@ -665,9 +665,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the background color for an inactive window title, from the 
+   * Returns the background color for an inactive window title, from the
    * installed theme.
-   * 
+   *
    * @return The background color for an inactive window title.
    */
   public static ColorUIResource getWindowTitleInactiveBackground()
@@ -678,9 +678,9 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Returns the foreground color for an inactive window title, from the 
+   * Returns the foreground color for an inactive window title, from the
    * installed theme.
-   * 
+   *
    * @return The foreground color for an inactive window title.
    */
   public static ColorUIResource getWindowTitleInactiveForeground()
@@ -691,17 +691,17 @@ public class MetalLookAndFeel extends BasicLookAndFeel
   }
 
   /**
-   * Sets the current theme for the look and feel.  Note that the theme must be 
-   * set before the look and feel is installed.  To change the theme 
-   * for an already running application that is using the 
-   * {@link MetalLookAndFeel}, first set the theme with this method, then 
-   * create a new instance of {@link MetalLookAndFeel} and install it in the 
+   * Sets the current theme for the look and feel.  Note that the theme must be
+   * set before the look and feel is installed.  To change the theme
+   * for an already running application that is using the
+   * {@link MetalLookAndFeel}, first set the theme with this method, then
+   * create a new instance of {@link MetalLookAndFeel} and install it in the
    * usual way (see {@link UIManager#setLookAndFeel(LookAndFeel)}).
-   * 
+   *
    * @param theme  the theme (null not permitted).
-   * 
+   *
    * @throws NullPointerException if theme is null.
-   * 
+   *
    * @see #getCurrentTheme()
    */
   public static void setCurrentTheme(MetalTheme theme)
@@ -934,7 +934,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "EditorPane.inactiveForeground",  getInactiveSystemTextColor(),
       "EditorPane.selectionBackground", getTextHighlightColor(),
       "EditorPane.selectionForeground", getHighlightedTextColor(),
-      
+
       "FormattedTextField.background", getWindowBackground(),
       "FormattedTextField.border",
       new BorderUIResource(MetalBorders.getTextFieldBorder()),
@@ -946,15 +946,15 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "FormattedTextField.selectionBackground", getTextHighlightColor(),
       "FormattedTextField.selectionForeground", getHighlightedTextColor(),
 
-      "FileChooser.upFolderIcon", 
+      "FileChooser.upFolderIcon",
           MetalIconFactory.getFileChooserUpFolderIcon(),
-      "FileChooser.listViewIcon", 
+      "FileChooser.listViewIcon",
           MetalIconFactory.getFileChooserListViewIcon(),
-      "FileChooser.newFolderIcon", 
+      "FileChooser.newFolderIcon",
           MetalIconFactory.getFileChooserNewFolderIcon(),
-      "FileChooser.homeFolderIcon", 
+      "FileChooser.homeFolderIcon",
           MetalIconFactory.getFileChooserHomeFolderIcon(),
-      "FileChooser.detailsViewIcon", 
+      "FileChooser.detailsViewIcon",
           MetalIconFactory.getFileChooserDetailViewIcon(),
       "FileChooser.fileNameLabelMnemonic", new Integer(78),
       "FileChooser.filesOfTypeLabelMnemonic", new Integer(84),
@@ -974,15 +974,15 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "InternalFrame.borderLight", getControlHighlight(),
       "InternalFrame.borderShadow", getControlShadow(),
       "InternalFrame.icon", MetalIconFactory.getInternalFrameDefaultMenuIcon(),
-      "InternalFrame.closeIcon", 
+      "InternalFrame.closeIcon",
         MetalIconFactory.getInternalFrameCloseIcon(16),
       "InternalFrame.closeSound", "sounds/FrameClose.wav",
       "InternalFrame.inactiveTitleBackground", getWindowTitleInactiveBackground(),
       "InternalFrame.inactiveTitleForeground", getWindowTitleInactiveForeground(),
-      "InternalFrame.maximizeIcon", 
+      "InternalFrame.maximizeIcon",
         MetalIconFactory.getInternalFrameMaximizeIcon(16),
       "InternalFrame.maximizeSound", "sounds/FrameMaximize.wav",
-      "InternalFrame.iconifyIcon", 
+      "InternalFrame.iconifyIcon",
         MetalIconFactory.getInternalFrameMinimizeIcon(16),
       "InternalFrame.minimizeSound", "sounds/FrameMinimize.wav",
       "InternalFrame.paletteBorder", new MetalBorders.PaletteBorder(),
@@ -1002,7 +1002,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "List.foreground", getUserTextColor(),
       "List.selectionBackground", getTextHighlightColor(),
       "List.selectionForeground", getHighlightedTextColor(),
-      "List.focusCellHighlightBorder", 
+      "List.focusCellHighlightBorder",
         new LineBorderUIResource(MetalLookAndFeel.getFocusColor()),
 
       "Menu.acceleratorFont", new FontUIResource("Dialog", Font.PLAIN, 10),
@@ -1047,7 +1047,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "OptionPane.informationSound", "sounds/OptionPaneInformation.wav",
       "OptionPane.questionSound", "sounds/OptionPaneQuestion.wav",
       "OptionPane.warningSound", "sounds/OptionPaneWarning.wav",
-      "OptionPane.errorDialog.border.background", new ColorUIResource(153, 51, 51), 
+      "OptionPane.errorDialog.border.background", new ColorUIResource(153, 51, 51),
       "OptionPane.errorDialog.titlePane.background", new ColorUIResource(255, 153, 153),
       "OptionPane.errorDialog.titlePane.foreground", new ColorUIResource(51, 0, 0),
       "OptionPane.errorDialog.titlePane.shadow", new ColorUIResource(204, 102, 102),
@@ -1114,16 +1114,16 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "RadioButtonMenuItem.background", getMenuBackground(),
       "RadioButtonMenuItem.border", new MetalBorders.MenuItemBorder(),
       "RadioButtonMenuItem.borderPainted", Boolean.TRUE,
-      "RadioButtonMenuItem.checkIcon", 
+      "RadioButtonMenuItem.checkIcon",
         MetalIconFactory.getRadioButtonMenuItemIcon(),
       "RadioButtonMenuItem.commandSound", "sounds/MenuItemCommand.wav",
       "RadioButtonMenuItem.disabledForeground", getMenuDisabledForeground(),
       "RadioButtonMenuItem.font", getMenuTextFont(),
       "RadioButtonMenuItem.foreground", getMenuForeground(),
       "RadioButtonMenuItem.margin", new InsetsUIResource(2, 2, 2, 2),
-      "RadioButtonMenuItem.selectionBackground", 
+      "RadioButtonMenuItem.selectionBackground",
         MetalLookAndFeel.getMenuSelectedBackground(),
-      "RadioButtonMenuItem.selectionForeground", 
+      "RadioButtonMenuItem.selectionForeground",
         MetalLookAndFeel.getMenuSelectedForeground(),
 
       "ScrollBar.allowsAbsolutePositioning", Boolean.TRUE,
@@ -1154,12 +1154,12 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "Slider.focusInsets", new InsetsUIResource(0, 0, 0, 0),
       "Slider.foreground", getPrimaryControlShadow(),
       "Slider.highlight", getControlHighlight(),
-      "Slider.horizontalThumbIcon", 
+      "Slider.horizontalThumbIcon",
       MetalIconFactory.getHorizontalSliderThumbIcon(),
       "Slider.majorTickLength", new Integer(6),
       "Slider.shadow", getControlShadow(),
       "Slider.trackWidth", new Integer(7),
-      "Slider.verticalThumbIcon", 
+      "Slider.verticalThumbIcon",
       MetalIconFactory.getVerticalSliderThumbIcon(),
 
       "Spinner.arrowButtonInsets", new InsetsUIResource(0, 0, 0, 0),
@@ -1197,7 +1197,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       // new properties in OceanTheme:
       // TabbedPane.contentAreaColor
       // TabbedPane.unselectedBackground
-      
+
       "Table.background", getWindowBackground(),
       "Table.focusCellBackground", getWindowBackground(),
       "Table.focusCellForeground", getControlTextColor(),
@@ -1235,7 +1235,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
       "TextField.selectionBackground", getTextHighlightColor(),
       "TextField.selectionForeground", getHighlightedTextColor(),
       "TextField.shadow", getControlShadow(),
-     
+
       "TextPane.background", getWindowBackground(),
       "TextPane.caretForeground", getUserTextColor(),
       "TextPane.font", new FontUIResource("Dialog", Font.PLAIN, 12),
@@ -1341,7 +1341,7 @@ public class MetalLookAndFeel extends BasicLookAndFeel
    * an instance of {@link OceanTheme}.
    *
    * @return The current theme (never null).
-   * 
+   *
    * @see #setCurrentTheme(MetalTheme)
    */
   public static MetalTheme getCurrentTheme()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
index 2cc52ed7389..35f2b05c0ee 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalMenuBarUI.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.basic.BasicMenuBarUI;
 
 /**
  * A UI implementation for MenuBar in the Metal Look & Feel.
- * 
+ *
  * @author Roman Kennke (kennke@aicas.com)
  *
  * @since 1.5
@@ -84,7 +84,7 @@ public class MetalMenuBarUI extends BasicMenuBarUI
       {
         MetalUtils.paintGradient(g, 0, 0, c.getWidth(), height,
                                  SwingConstants.VERTICAL, "MenuBar.gradient");
-        
+
         paint(g, c);
       }
     else
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
index 0f28818b96c..005c5f0d846 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalProgressBarUI.java
@@ -51,7 +51,7 @@ import javax.swing.plaf.basic.BasicProgressBarUI;
  * A UI delegate for the {@link JProgressBar} component.
  */
 public class MetalProgressBarUI extends BasicProgressBarUI
-{  
+{
   /**
    * Constructs a new instance of MetalProgressBarUI.
    */
@@ -88,7 +88,7 @@ public class MetalProgressBarUI extends BasicProgressBarUI
     int w = progressBar.getWidth();
     int h = progressBar.getHeight();
     int orientation = progressBar.getOrientation();
-    
+
     Color shadow = MetalLookAndFeel.getControlShadow();
     g.setColor(shadow);
 
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
index 57f5bbe3e0a..0f7f3b10192 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalRadioButtonUI.java
@@ -60,13 +60,13 @@ public class MetalRadioButtonUI
 
   /** Used to draw the focus rectangle. */
   protected Color focusColor;
-  
+
   /** Used to fill the icon when the button is pressed. */
   protected Color selectColor;
-  
+
   /** Used to draw disabled text. */
   protected Color disabledTextColor;
-  
+
   /**
    * Constructs a new instance of MetalRadioButtonUI.
    */
@@ -86,10 +86,10 @@ public class MetalRadioButtonUI
   {
     return new MetalRadioButtonUI();
   }
-  
+
   /**
    * Sets the default values for the specified button.
-   * 
+   *
    * @param b  the button.
    */
   public void installDefaults(AbstractButton b)
@@ -100,10 +100,10 @@ public class MetalRadioButtonUI
     focusColor = UIManager.getColor(prefix + "focus");
     selectColor = UIManager.getColor(prefix + "select");
   }
-  
+
   /**
    * Clears any defaults set in the installDefaults() method.
-   * 
+   *
    * @param b  the {@link JRadioButton}.
    */
   protected void uninstallDefaults(AbstractButton b)
@@ -113,50 +113,50 @@ public class MetalRadioButtonUI
     focusColor = null;
     selectColor = null;
   }
-  
+
   /**
    * Returns the color used to fill the {@link JRadioButton}'s icon when the
-   * button is pressed.  The default color is obtained from the 
-   * {@link UIManager} defaults via an entry with the key 
+   * button is pressed.  The default color is obtained from the
+   * {@link UIManager} defaults via an entry with the key
    * RadioButton.select.
-   * 
+   *
    * @return The select color.
    */
   protected Color getSelectColor()
   {
-    return selectColor;    
+    return selectColor;
   }
-  
+
   /**
    * Returns the color for the {@link JRadioButton}'s text when the button is
    * disabled.  The default color is obtained from the {@link UIManager}
    * defaults via an entry with the key RadioButton.disabledText.
-   * 
+   *
    * @return The disabled text color.
    */
   protected Color getDisabledTextColor()
   {
     return disabledTextColor;
   }
-  
+
   /**
-   * Returns the color used to draw the focus rectangle when the 
-   * {@link JRadioButton} has the focus.  The default color is obtained from 
-   * the {@link UIManager} defaults via an entry with the key 
+   * Returns the color used to draw the focus rectangle when the
+   * {@link JRadioButton} has the focus.  The default color is obtained from
+   * the {@link UIManager} defaults via an entry with the key
    * RadioButton.focus.
-   * 
+   *
    * @return The color used to draw the focus rectangle.
-   * 
+   *
    * @see #paintFocus(Graphics, Rectangle, Dimension)
    */
   protected Color getFocusColor()
   {
     return focusColor;
   }
-  
+
   /**
    * Paints the {@link JRadioButton}.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component (an instance of {@link JRadioButton}).
    */
@@ -166,10 +166,10 @@ public class MetalRadioButtonUI
     // FIXME:  disabled text isn't being drawn correctly, it's possible that
     // it could be done here...
   }
-  
+
   /**
    * Paints the focus rectangle for the {@link JRadioButton}.
-   * 
+   *
    * @param g  the graphics device.
    * @param t  the bounding rectangle for the text.
    * @param d  ???
@@ -179,5 +179,5 @@ public class MetalRadioButtonUI
     g.setColor(focusColor);
     g.drawRect(t.x - 1, t.y - 1, t.width + 1, t.height + 1);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
index eaee5bf929e..84f1303f67e 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalRootPaneUI.java
@@ -76,8 +76,8 @@ import javax.swing.plaf.basic.BasicRootPaneUI;
 
 /**
  * A UI delegate for the {@link JRootPane} component. This implementation
- * supports the JRootPane windowDecorationStyle property.  
- * 
+ * supports the JRootPane windowDecorationStyle property.
+ *
  * @author Roman Kennke (kennke@aicas.com)
  *
  * @since 1.4
@@ -115,7 +115,7 @@ public class MetalRootPaneUI
           newInsets.bottom = 5;
           newInsets.right = 5;
         }
-      return newInsets;  
+      return newInsets;
     }
 
     /**
@@ -132,7 +132,7 @@ public class MetalRootPaneUI
 
     /**
      * Paints the border for the specified component.
-     * 
+     *
      * @param c  the component
      * @param g  the graphics device
      * @param x  the x-coordinate
@@ -140,7 +140,7 @@ public class MetalRootPaneUI
      * @param w  the width
      * @param h  the height
      */
-    public void paintBorder(Component c, Graphics g, int x, int y, int w, 
+    public void paintBorder(Component c, Graphics g, int x, int y, int w,
                             int h)
     {
       JRootPane f = (JRootPane) c;
@@ -149,31 +149,31 @@ public class MetalRootPaneUI
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       else
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
-      
+
       // Fill the border background.
       g.fillRect(x, y, w, 5);
       g.fillRect(x, y, 5, h);
       g.fillRect(x + w - 5, y, 5, h);
       g.fillRect(x, y + h - 5, w, 5);
-      
+
       // Draw a dot in each corner.
       g.setColor(MetalLookAndFeel.getControl());
       g.fillRect(x, y, 1, 1);
       g.fillRect(x + w - 1, y, 1, 1);
       g.fillRect(x + w - 1, y + h - 1, 1, 1);
       g.fillRect(x, y + h - 1, 1, 1);
-      
+
       // Draw the lines.
       g.setColor(MetalLookAndFeel.getBlack());
       g.drawLine(x + 14, y + 2, x + w - 15, y + 2);
       g.drawLine(x + 14, y + h - 3, x + w - 15, y + h - 3);
       g.drawLine(x + 2, y + 14, x + 2, y + h - 15);
       g.drawLine(x + w - 3, y + 14, x + w - 3, y + h - 15);
-      
+
       // Draw the line highlights.
       if (frame.isActive())
         g.setColor(MetalLookAndFeel.getPrimaryControlShadow());
-      else 
+      else
         g.setColor(MetalLookAndFeel.getControlShadow());
       g.drawLine(x + 15, y + 3, x + w - 14, y + 3);
       g.drawLine(x + 15, y + h - 2, x + w - 14, y + h - 2);
@@ -248,7 +248,7 @@ public class MetalRootPaneUI
       {
         super("Close");
       }
-      
+
       /**
        * This method is called when something closes the frame.
        *
@@ -316,7 +316,7 @@ public class MetalRootPaneUI
             f.setExtendedState(Frame.ICONIFIED);
           }
       }
-        
+
     }
 
     /**
@@ -437,8 +437,8 @@ public class MetalRootPaneUI
           }
 
         Dimension titlePreferredSize = title.getPreferredSize();
-        title.setBounds(insets.left + 5, insets.top, 
-                Math.min(titlePreferredSize.width, loc - insets.left - 10), 
+        title.setBounds(insets.left + 5, insets.top,
+                Math.min(titlePreferredSize.width, loc - insets.left - 10),
                 height);
 
       }
@@ -501,7 +501,7 @@ public class MetalRootPaneUI
 
     /** The icon displayed in the close button. */
     Icon closeIcon;
-    
+
     /**
      * The background color of the TitlePane when the JInternalFrame is not
      * selected.
@@ -653,7 +653,7 @@ public class MetalRootPaneUI
 
     /**
      * Paints a representation of the current state of the internal frame.
-     * 
+     *
      * @param g  the graphics device.
      */
     public void paintComponent(Graphics g)
@@ -667,13 +667,13 @@ public class MetalRootPaneUI
         g.setColor(MetalLookAndFeel.getPrimaryControlDarkShadow());
       else
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
-          
+
       // put a dot in each of the top corners
       g.drawLine(0, 0, 0, 0);
       g.drawLine(d.width - 1, 0, d.width - 1, 0);
-          
+
       g.drawLine(0, d.height - 1, d.width - 1, d.height - 1);
-          
+
       // draw the metal pattern
       if (UIManager.get("InternalFrame.activeTitleGradient") != null
           && frame.isActive())
@@ -688,7 +688,7 @@ public class MetalRootPaneUI
       int endX = startX;
       if (iconButton.isVisible())
         endX = Math.max(iconButton.getX(), endX);
-      else if (maxButton.isVisible()) 
+      else if (maxButton.isVisible())
         endX = Math.max(maxButton.getX(), endX);
       else if (closeButton.isVisible())
         endX = Math.max(closeButton.getX(), endX);
@@ -709,10 +709,10 @@ public class MetalRootPaneUI
 
       if (!isOpaque())
         return;
-      
+
       Color saved = g.getColor();
       Dimension dims = getSize();
-      
+
       Color bg = getBackground();
       if (frame.isActive())
         bg = selectedTitleColor;
@@ -736,8 +736,8 @@ public class MetalRootPaneUI
       maxIcon = UIManager.getIcon("InternalFrame.maximizeIcon");
       minIcon = MetalIconFactory.getInternalFrameAltMaximizeIcon(16);
       Frame frame = (Frame) SwingUtilities.getWindowAncestor(rootPane);
-      title = new JLabel(frame.getTitle(), 
-              MetalIconFactory.getInternalFrameDefaultMenuIcon(), 
+      title = new JLabel(frame.getTitle(),
+              MetalIconFactory.getInternalFrameDefaultMenuIcon(),
               SwingConstants.LEFT);
     }
   }
@@ -770,7 +770,7 @@ public class MetalRootPaneUI
      * The cached layout info for the title pane.
      */
     private Rectangle titlePaneBounds;
-    
+
     /**
      * The cached preferred size.
      */
@@ -832,7 +832,7 @@ public class MetalRootPaneUI
     public void removeLayoutComponent(Component component)
     {
       // TODO Auto-generated method stub
-      
+
     }
 
     public Dimension preferredLayoutSize(Container parent)
@@ -894,7 +894,7 @@ public class MetalRootPaneUI
           // 4. The menuBar is positioned at the upper edge of layeredPane.
           // 5. The contentPane fills viewable region minus menuBar minus
           //    titlePane, if present.
-      
+
           // +-------------------------------+
           // |  JLayeredPane                 |
           // |  +--------------------------+ |
@@ -952,7 +952,7 @@ public class MetalRootPaneUI
       contentPane.setBounds(contentPaneBounds);
       titlePane.setBounds(titlePaneBounds);
     }
-      
+
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
index 4c75fcb4f14..5f0cbe4becd 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollBarUI.java
@@ -59,30 +59,30 @@ import javax.swing.plaf.basic.BasicScrollBarUI;
  */
 public class MetalScrollBarUI extends BasicScrollBarUI
 {
-  
+
   /**
    * A property change handler for the UI delegate that monitors for
    * changes to the "JScrollBar.isFreeStanding" property, and updates
    * the buttons and track rendering as appropriate.
    */
-  class MetalScrollBarPropertyChangeHandler 
+  class MetalScrollBarPropertyChangeHandler
     extends BasicScrollBarUI.PropertyChangeHandler
   {
     /**
      * Creates a new handler.
-     * 
+     *
      * @see #createPropertyChangeListener()
      */
     public MetalScrollBarPropertyChangeHandler()
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Handles a property change event.  If the event name is
-     * JSlider.isFreeStanding, this method updates the 
+     * JSlider.isFreeStanding, this method updates the
      * delegate, otherwise the event is passed up to the super class.
-     * 
+     *
      * @param e  the property change event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -100,7 +100,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         super.propertyChange(e);
     }
   }
-  
+
   /** The name for the 'free standing' property. */
   public static final String FREE_STANDING_PROP = "JScrollBar.isFreeStanding";
 
@@ -108,34 +108,34 @@ public class MetalScrollBarUI extends BasicScrollBarUI
   private static final Dimension MIN_THUMB_SIZE = new Dimension(15, 15);
 
   /** The minimum thumb size for a scroll bar that is free standing. */
-  private static final Dimension MIN_THUMB_SIZE_FREE_STANDING 
+  private static final Dimension MIN_THUMB_SIZE_FREE_STANDING
     = new Dimension(17, 17);
-  
+
   /** The button that increases the value in the scroll bar. */
   protected MetalScrollButton increaseButton;
-  
+
   /** The button that decreases the value in the scroll bar. */
   protected MetalScrollButton decreaseButton;
-  
-  /** 
-   * The scroll bar width. 
+
+  /**
+   * The scroll bar width.
    */
   protected int scrollBarWidth;
-  
-  /** 
-   * A flag that indicates whether the scroll bar is "free standing", which 
-   * means it has complete borders and can be used anywhere in the UI.  A 
+
+  /**
+   * A flag that indicates whether the scroll bar is "free standing", which
+   * means it has complete borders and can be used anywhere in the UI.  A
    * scroll bar which is not free standing has borders missing from one
    * side, and relies on being part of another container with its own borders
    * to look right visually. */
   protected boolean isFreeStanding = true;
-  
-  /** 
-   * The color for the scroll bar shadow (this is read from the UIDefaults in 
+
+  /**
+   * The color for the scroll bar shadow (this is read from the UIDefaults in
    * the installDefaults() method).
    */
   Color scrollBarShadowColor;
-  
+
   /**
    * Constructs a new instance of MetalScrollBarUI, with no
    * specific initialisation.
@@ -161,9 +161,9 @@ public class MetalScrollBarUI extends BasicScrollBarUI
    * Installs the defaults.
    */
   protected void installDefaults()
-  {    
-    // need to initialise isFreeStanding before calling the super class, 
-    // so that the value is set when createIncreaseButton() and 
+  {
+    // need to initialise isFreeStanding before calling the super class,
+    // so that the value is set when createIncreaseButton() and
     // createDecreaseButton() are called (unless there is somewhere earlier
     // that we can do this).
     Boolean prop = (Boolean) scrollbar.getClientProperty(FREE_STANDING_PROP);
@@ -172,35 +172,35 @@ public class MetalScrollBarUI extends BasicScrollBarUI
     scrollBarWidth = UIManager.getInt("ScrollBar.width");
     super.installDefaults();
   }
-    
+
   /**
    * Creates a property change listener for the delegate to use.  This
-   * overrides the method to provide a custom listener for the 
-   * {@link MetalLookAndFeel} that can handle the 
+   * overrides the method to provide a custom listener for the
+   * {@link MetalLookAndFeel} that can handle the
    * JScrollBar.isFreeStanding property.
-   * 
+   *
    * @return A property change listener.
    */
   protected PropertyChangeListener createPropertyChangeListener()
   {
     return new MetalScrollBarPropertyChangeHandler();
   }
-  
+
   /**
    * Creates a new button to use as the control at the lower end of the
    * {@link JScrollBar}.  This method assigns the new button (an instance of
-   * {@link MetalScrollButton} to the {@link #decreaseButton} field, and also 
-   * returns the button.  The button width is determined by the 
+   * {@link MetalScrollButton} to the {@link #decreaseButton} field, and also
+   * returns the button.  The button width is determined by the
    * ScrollBar.width setting in the UI defaults.
-   * 
+   *
    * @param orientation  the orientation of the button ({@link #NORTH},
    *                     {@link #SOUTH}, {@link #EAST} or {@link #WEST}).
-   * 
+   *
    * @return The button.
    */
   protected JButton createDecreaseButton(int orientation)
   {
-    decreaseButton = new MetalScrollButton(orientation, scrollBarWidth, 
+    decreaseButton = new MetalScrollButton(orientation, scrollBarWidth,
             isFreeStanding);
     return decreaseButton;
   }
@@ -208,25 +208,25 @@ public class MetalScrollBarUI extends BasicScrollBarUI
   /**
    * Creates a new button to use as the control at the upper end of the
    * {@link JScrollBar}.  This method assigns the new button (an instance of
-   * {@link MetalScrollButton} to the {@link #increaseButton} field, and also 
-   * returns the button.  The button width is determined by the 
+   * {@link MetalScrollButton} to the {@link #increaseButton} field, and also
+   * returns the button.  The button width is determined by the
    * ScrollBar.width setting in the UI defaults.
-   * 
+   *
    * @param orientation  the orientation of the button ({@link #NORTH},
    *                     {@link #SOUTH}, {@link #EAST} or {@link #WEST}).
-   * 
+   *
    * @return The button.
    */
   protected JButton createIncreaseButton(int orientation)
   {
-    increaseButton = new MetalScrollButton(orientation, scrollBarWidth, 
+    increaseButton = new MetalScrollButton(orientation, scrollBarWidth,
             isFreeStanding);
     return increaseButton;
   }
-  
+
   /**
    * Paints the track for the scrollbar.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    * @param trackBounds  the track bounds.
@@ -234,20 +234,20 @@ public class MetalScrollBarUI extends BasicScrollBarUI
   protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds)
   {
     g.setColor(MetalLookAndFeel.getControl());
-    g.fillRect(trackBounds.x, trackBounds.y, trackBounds.width, 
+    g.fillRect(trackBounds.x, trackBounds.y, trackBounds.width,
             trackBounds.height);
-    if (scrollbar.getOrientation() == HORIZONTAL) 
-      paintTrackHorizontal(g, c, trackBounds.x, trackBounds.y, 
+    if (scrollbar.getOrientation() == HORIZONTAL)
+      paintTrackHorizontal(g, c, trackBounds.x, trackBounds.y,
           trackBounds.width, trackBounds.height);
-    else 
-      paintTrackVertical(g, c, trackBounds.x, trackBounds.y, 
+    else
+      paintTrackVertical(g, c, trackBounds.x, trackBounds.y,
           trackBounds.width, trackBounds.height);
-    
+
   }
-  
+
   /**
    * Paints the track for a horizontal scrollbar.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    * @param x  the x-coordinate for the track bounds.
@@ -255,7 +255,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
    * @param w  the width for the track bounds.
    * @param h  the height for the track bounds.
    */
-  private void paintTrackHorizontal(Graphics g, JComponent c, 
+  private void paintTrackHorizontal(Graphics g, JComponent c,
       int x, int y, int w, int h)
   {
     if (c.isEnabled())
@@ -264,12 +264,12 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x, y, x, y + h - 1);
         g.drawLine(x, y, x + w - 1, y);
         g.drawLine(x + w - 1, y, x + w - 1, y + h - 1);
-        
+
         g.setColor(scrollBarShadowColor);
         g.drawLine(x + 1, y + 1, x + 1, y + h - 1);
         g.drawLine(x + 1, y + 1, x + w - 2, y + 1);
-        
-        if (isFreeStanding) 
+
+        if (isFreeStanding)
           {
             g.setColor(MetalLookAndFeel.getControlDarkShadow());
             g.drawLine(x, y + h - 2, x + w - 1, y + h - 2);
@@ -290,10 +290,10 @@ public class MetalScrollBarUI extends BasicScrollBarUI
           }
       }
   }
-    
+
   /**
    * Paints the track for a vertical scrollbar.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    * @param x  the x-coordinate for the track bounds.
@@ -301,7 +301,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
    * @param w  the width for the track bounds.
    * @param h  the height for the track bounds.
    */
-  private void paintTrackVertical(Graphics g, JComponent c, 
+  private void paintTrackVertical(Graphics g, JComponent c,
       int x, int y, int w, int h)
   {
     if (c.isEnabled())
@@ -310,12 +310,12 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x, y, x, y + h - 1);
         g.drawLine(x, y, x + w - 1, y);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
-        
+
         g.setColor(scrollBarShadowColor);
         g.drawLine(x + 1, y + 1, x + w - 1, y + 1);
         g.drawLine(x + 1, y + 1, x + 1, y + h - 2);
-        
-        if (isFreeStanding) 
+
+        if (isFreeStanding)
           {
             g.setColor(MetalLookAndFeel.getControlDarkShadow());
             g.drawLine(x + w - 2, y, x + w - 2, y + h - 1);
@@ -351,7 +351,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
       return;
     if (scrollbar.getOrientation() == HORIZONTAL)
       paintThumbHorizontal(g, c, thumbBounds);
-    else 
+    else
       paintThumbVertical(g, c, thumbBounds);
 
     // Draw the pattern when the theme is not Ocean.
@@ -367,19 +367,19 @@ public class MetalScrollBarUI extends BasicScrollBarUI
 
   /**
    * Paints the thumb for a horizontal scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the scroll bar component.
    * @param thumbBounds  the thumb bounds.
    */
-  private void paintThumbHorizontal(Graphics g, JComponent c, 
-          Rectangle thumbBounds) 
+  private void paintThumbHorizontal(Graphics g, JComponent c,
+          Rectangle thumbBounds)
   {
     int x = thumbBounds.x;
     int y = thumbBounds.y;
     int w = thumbBounds.width;
     int h = thumbBounds.height;
-    
+
     // First we fill the background.
     MetalTheme theme = MetalLookAndFeel.getCurrentTheme();
     if (theme instanceof OceanTheme
@@ -408,7 +408,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x, y, x, y + h - 1);
         g.drawLine(x + w - 1, y, x + w - 1, y + h - 1);
       }
-    
+
     // then the highlight
     g.setColor(thumbHighlightColor);
     if (isFreeStanding)
@@ -421,7 +421,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x + 1, y + 1, x + w - 3, y + 1);
         g.drawLine(x + 1, y + 1, x + 1, y + h - 1);
       }
-    
+
     // draw the shadow line
     g.setColor(UIManager.getColor("ScrollBar.shadow"));
     g.drawLine(x + w, y + 1, x + w, y + h - 1);
@@ -440,22 +440,22 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(middle + 3, y + 5, middle + 3, y + h - 4);
       }
   }
-  
+
   /**
    * Paints the thumb for a vertical scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the scroll bar component.
    * @param thumbBounds  the thumb bounds.
    */
-  private void paintThumbVertical(Graphics g, JComponent c, 
+  private void paintThumbVertical(Graphics g, JComponent c,
           Rectangle thumbBounds)
   {
     int x = thumbBounds.x;
     int y = thumbBounds.y;
     int w = thumbBounds.width;
     int h = thumbBounds.height;
-    
+
     // First we fill the background.
     MetalTheme theme = MetalLookAndFeel.getCurrentTheme();
     if (theme instanceof OceanTheme
@@ -484,7 +484,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x, y, x, y + h - 1);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
       }
-    
+
     // then the highlight
     g.setColor(thumbHighlightColor);
     if (isFreeStanding)
@@ -497,7 +497,7 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x + 1, y + 1, x + w - 1, y + 1);
         g.drawLine(x + 1, y + 1, x + 1, y + h - 3);
       }
-    
+
     // draw the shadow line
     g.setColor(UIManager.getColor("ScrollBar.shadow"));
     g.drawLine(x + 1, y + h, x + w - 2, y + h);
@@ -516,10 +516,10 @@ public class MetalScrollBarUI extends BasicScrollBarUI
         g.drawLine(x + 5, middle + 3, x + w - 4, middle + 3);
       }
   }
-  
+
   /**
-   * Returns the minimum thumb size.  For a free standing scroll bar the 
-   * minimum size is 17 x 17 pixels, whereas for a non free 
+   * Returns the minimum thumb size.  For a free standing scroll bar the
+   * minimum size is 17 x 17 pixels, whereas for a non free
    * standing scroll bar the minimum size is 15 x 15 pixels.
    *
    * @return The minimum thumb size.
@@ -580,6 +580,5 @@ public class MetalScrollBarUI extends BasicScrollBarUI
     width += insets.left + insets.right;
 
     return new Dimension(width, height);
-  } 
+  }
 }
-
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
index 8678f680d33..3273908b3de 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollButton.java
@@ -47,32 +47,32 @@ import javax.swing.plaf.basic.BasicArrowButton;
 
 /**
  * A button used by the {@link MetalScrollBarUI}.  The button appearance
- * varies according to the button direction, whether or not it is part of a 
- * "free standing" scroll bar, and the current state of the button. 
+ * varies according to the button direction, whether or not it is part of a
+ * "free standing" scroll bar, and the current state of the button.
  */
-public class MetalScrollButton extends BasicArrowButton 
+public class MetalScrollButton extends BasicArrowButton
 {
-  
-  /** 
+
+  /**
    * The maximum size for buttons.
    * @see #getMaximumSize()
    */
-  private static Dimension maximumSize;     
-  
+  private static Dimension maximumSize;
+
   /** The width of the button. */
   private int buttonWidth;
-  
-  /** 
-   * A flag that indicates whether the button is part of a free standing 
+
+  /**
+   * A flag that indicates whether the button is part of a free standing
    * scroll bar.  This affects how the border is drawn.
    */
   private boolean freeStanding;
-  
+
   /**
    * Creates a new button.
-   * 
-   * @param direction  the direction (this should be one of {@link #NORTH}, 
-   *                   {@link #SOUTH}, {@link #EAST} and {@link #WEST}, but 
+   *
+   * @param direction  the direction (this should be one of {@link #NORTH},
+   *                   {@link #SOUTH}, {@link #EAST} and {@link #WEST}, but
    *                   this is not enforced).
    * @param width  the button width.
    * @param freeStanding  a flag indicating whether the scroll button is free
@@ -85,31 +85,31 @@ public class MetalScrollButton extends BasicArrowButton
     this.freeStanding = freeStanding;
     setFocusable(false);
   }
-  
+
   /**
    * Returns the button width.
-   * 
+   *
    * @return The button width.
    */
   public int getButtonWidth()
   {
-    return buttonWidth;   
+    return buttonWidth;
   }
 
   /**
    * Sets the free standing flag.  This controls how the button border is
    * drawn.
-   * 
+   *
    * @param freeStanding  the new value of the flag.
    */
   public void setFreeStanding(boolean freeStanding)
   {
     this.freeStanding = freeStanding;
   }
-  
+
   /**
    * Paints the button.
-   * 
+   *
    * @param g  the graphics device.
    */
   public void paint(Graphics g)
@@ -122,16 +122,16 @@ public class MetalScrollButton extends BasicArrowButton
     else
       g.setColor(MetalLookAndFeel.getControl());
     g.fillRect(0, 0, bounds.width, bounds.height);
-    
+
     paintArrow(g, bounds.width, bounds.height);
-    
+
     // paint a border manually - I tried using a real (custom) Border
-    // but couldn't get it to stay set for the button, something was 
+    // but couldn't get it to stay set for the button, something was
     // overwriting it...
-    if (freeStanding) 
+    if (freeStanding)
       {
         if (direction == WEST)
-          paintWestBorderFreeStanding(g, bounds.width, bounds.height);        
+          paintWestBorderFreeStanding(g, bounds.width, bounds.height);
         else if (direction == EAST)
           paintEastBorderFreeStanding(g, bounds.width, bounds.height);
         else if (direction == SOUTH)
@@ -142,7 +142,7 @@ public class MetalScrollButton extends BasicArrowButton
     else
       {
         if (direction == WEST)
-          paintWestBorder(g, bounds.width, bounds.height);        
+          paintWestBorder(g, bounds.width, bounds.height);
         else if (direction == EAST)
           paintEastBorder(g, bounds.width, bounds.height);
         else if (direction == SOUTH)
@@ -151,14 +151,14 @@ public class MetalScrollButton extends BasicArrowButton
           paintNorthBorder(g, bounds.width, bounds.height);
       }
   }
-  
+
   private void paintArrow(Graphics g, int w, int h)
   {
     if (isEnabled())
       g.setColor(MetalLookAndFeel.getBlack());
     else
       g.setColor(MetalLookAndFeel.getControlDisabled());
-    
+
     if (direction == SOUTH)
       {
         int x = w / 2;
@@ -178,7 +178,7 @@ public class MetalScrollButton extends BasicArrowButton
         int x = w / 2 - 3;
         int y = h / 2;
         for (int i = 1; i < 5; i++)
-          g.drawLine(x + i, y - i, x + i, y + i - 1);        
+          g.drawLine(x + i, y - i, x + i, y + i - 1);
       }
     else // assume NORTH
       {
@@ -191,12 +191,12 @@ public class MetalScrollButton extends BasicArrowButton
   /**
    * Paints the border for a button with a {@link #NORTH} direction that
    * belongs to a free standing scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
    */
-  private void paintNorthBorderFreeStanding(Graphics g, int w, int h) 
+  private void paintNorthBorderFreeStanding(Graphics g, int w, int h)
   {
     if (isEnabled())
       {
@@ -205,12 +205,12 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, 0, h - 1);
         g.drawLine(2, h - 1, w - 2, h - 1);
         g.drawLine(w - 2, 2, w - 2, h - 1);
-        
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(1, 1, 1, h - 2);
         g.drawLine(1, 1, w - 3, 1);
         g.drawLine(w - 1, 1, w - 1, h - 1);
-      
+
         g.setColor(MetalLookAndFeel.getControl());
         g.drawLine(1, h - 1, 1, h - 1);
         g.drawLine(w - 2, 1, w - 2, 1);
@@ -223,11 +223,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, 0, h - 1);
       }
   }
-  
+
   /**
    * Paints the border for a button with a {@link #SOUTH} direction that
    * belongs to a free standing scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -241,12 +241,12 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, 0, h - 1);
         g.drawLine(2, h - 1, w - 2, h - 1);
         g.drawLine(w - 2, 2, w - 2, h - 1);
-        
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(1, 1, 1, h - 1);
         g.drawLine(1, 1, w - 1, 1);
         g.drawLine(w - 1, 1, w - 1, h - 1);
-      
+
         g.setColor(MetalLookAndFeel.getControl());
         g.drawLine(1, h - 1, 1, h - 1);
         g.drawLine(w - 1, 1, w - 1, 1);
@@ -259,11 +259,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, 0, h - 1);
       }
   }
-  
+
   /**
    * Paints the border for a button with an {@link #EAST} direction that
    * belongs to a free standing scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -276,12 +276,12 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, w - 2, 0);
         g.drawLine(w - 2, 0, w - 2, h - 2);
         g.drawLine(0, h - 2, w - 2, h - 2);
-        
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(0, 1, w - 1, 1);
         g.drawLine(w - 1, 1, w - 1, h - 1);
         g.drawLine(0, h - 1, w - 1, h - 1);
-      
+
         g.setColor(MetalLookAndFeel.getControl());
         g.drawLine(w - 2, 1, w - 2, 1);
       }
@@ -293,11 +293,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, h - 1, w - 1, h - 1);
       }
   }
-  
+
   /**
    * Paints the border for a button with a {@link #WEST} direction that
    * belongs to a free standing scroll bar.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -310,12 +310,12 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, w - 1, 0);
         g.drawLine(0, 0, 0, h - 2);
         g.drawLine(0, h - 2, w - 1, h - 2);
-        
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(1, 1, w - 1, 1);
         g.drawLine(1, 1, 1, h - 1);
         g.drawLine(1, h - 1, w - 1, h - 1);
-      
+
         g.setColor(MetalLookAndFeel.getControl());
         g.drawLine(1, h - 2, 1, h - 2);
       }
@@ -327,22 +327,22 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, h - 1, w - 1, h - 1);
       }
   }
-  
+
   /**
    * Paints the border for a button with a {@link #NORTH} direction that
    * belongs to a scroll bar that is not free standing.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
    */
-  private void paintNorthBorder(Graphics g, int w, int h) 
+  private void paintNorthBorder(Graphics g, int w, int h)
   {
     if (isEnabled())
       {
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
         g.drawLine(0, 0, 0, h - 1);
-         
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(1, 0, 1, h - 1);
         g.drawLine(1, 0, w - 1, 0);
@@ -353,11 +353,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, 0, h - 1);
       }
   }
-  
+
   /**
    * Paints the border for a button with a {@link #SOUTH} direction that
    * belongs to a scroll bar that is not free standing.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -369,11 +369,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.setColor(MetalLookAndFeel.getControlDarkShadow());
         g.drawLine(0, 0, 0, h - 1);
         g.drawLine(0, h - 1, w - 1, h - 1);
-         
+
         g.setColor(MetalLookAndFeel.getControlHighlight());
         g.drawLine(1, 0, 1, h - 1);
         g.drawLine(1, 0, w - 1, 0);
-        
+
         g.setColor(MetalLookAndFeel.getControl());
         g.drawLine(1, h - 1, 1, h - 1);
       }
@@ -387,7 +387,7 @@ public class MetalScrollButton extends BasicArrowButton
   /**
    * Paints the border for a button with an {@link #EAST} direction that
    * belongs to a scroll bar that is not free standing.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -409,11 +409,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, w - 1, 0);
       }
   }
-  
+
   /**
    * Paints the border for a button with a {@link #WEST} direction that
    * belongs to a scroll bar that is not free standing.
-   * 
+   *
    * @param g  the graphics device.
    * @param w  the button width.
    * @param h  the button height.
@@ -435,11 +435,11 @@ public class MetalScrollButton extends BasicArrowButton
         g.drawLine(0, 0, bounds.width - 1, 0);
       }
   }
-    
+
   /**
-   * Returns the preferred size for the button, which varies depending on 
+   * Returns the preferred size for the button, which varies depending on
    * the direction of the button and whether or not it is free standing.
-   * 
+   *
    * @return The preferred size.
    */
   public Dimension getPreferredSize()
@@ -447,9 +447,9 @@ public class MetalScrollButton extends BasicArrowButton
     int adj = 1;
     if (!freeStanding)
       adj = 2;
-    
+
     if (direction == EAST)
-      return new Dimension(buttonWidth - adj, buttonWidth);    
+      return new Dimension(buttonWidth - adj, buttonWidth);
     else if (direction == WEST)
       return new Dimension(buttonWidth - 2, buttonWidth);
     else if (direction == SOUTH)
@@ -457,27 +457,27 @@ public class MetalScrollButton extends BasicArrowButton
     else // assume NORTH
       return new Dimension(buttonWidth, buttonWidth - 2);
   }
-  
+
   /**
    * Returns the minimum size for the button.
-   * 
+   *
    * @return The minimum size for the button.
    */
   public Dimension getMinimumSize()
   {
     return getPreferredSize();
   }
- 
+
   /**
    * Returns the maximum size for the button.
-   * 
+   *
    * @return Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE).
    */
   public Dimension getMaximumSize()
   {
     if (maximumSize == null)
       maximumSize = new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    return maximumSize; 
+    return maximumSize;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
index ae14af3cae9..09a47c300a0 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalScrollPaneUI.java
@@ -71,12 +71,12 @@ public class MetalScrollPaneUI
   {
     return new MetalScrollPaneUI();
   }
-  
+
   /**
-   * Configures the specified component appropriate for the look and feel. 
-   * This method is invoked when the ComponentUI instance is being installed 
-   * as the UI delegate on the specified component. This method should 
-   * completely configure the component for the look and feel, 
+   * Configures the specified component appropriate for the look and feel.
+   * This method is invoked when the ComponentUI instance is being installed
+   * as the UI delegate on the specified component. This method should
+   * completely configure the component for the look and feel,
    * including the following:
    * 1. Install any default property values for color, fonts, borders,
    * icons, opacity, etc. on the component. Whenever possible, property
@@ -87,8 +87,8 @@ public class MetalScrollPaneUI
    * 5. Create/install a PropertyChangeListener on the component in order
    * to detect and respond to component property changes appropriately.
    * 6. Install keyboard UI (mnemonics, traversal, etc.) on the component.
-   * 7. Initialize any appropriate instance data. 
-   * 
+   * 7. Initialize any appropriate instance data.
+   *
    * @param c - the component to install the ui on
    */
   public void installUI(JComponent c)
@@ -101,11 +101,11 @@ public class MetalScrollPaneUI
   }
 
   /**
-   * Reverses configuration which was done on the specified component 
-   * during installUI. This method is invoked when this UIComponent 
-   * instance is being removed as the UI delegate for the specified 
-   * component. This method should undo the configuration performed in 
-   * installUI, being careful to leave the JComponent instance in a 
+   * Reverses configuration which was done on the specified component
+   * during installUI. This method is invoked when this UIComponent
+   * instance is being removed as the UI delegate for the specified
+   * component. This method should undo the configuration performed in
+   * installUI, being careful to leave the JComponent instance in a
    * clean state (no extraneous listeners, look-and-feel-specific property
    *  objects, etc.). This should include the following:
    *  1. Remove any UI-set borders from the component.
@@ -113,8 +113,8 @@ public class MetalScrollPaneUI
    *  3. Remove any UI-added sub-components from the component.
    *  4. Remove any UI-added event/property listeners from the component.
    *  5. Remove any UI-installed keyboard UI from the component.
-   *  6. Nullify any allocated instance data objects to allow for GC. 
-   *  
+   *  6. Nullify any allocated instance data objects to allow for GC.
+   *
    *  @param c - the component to uninstall the ui on
    */
   public void uninstallUI(JComponent c)
@@ -128,17 +128,17 @@ public class MetalScrollPaneUI
 
   /**
    * Installs listeners on scrollPane
-   * 
+   *
    * @param scrollPane - the component to install the listeners on
    */
   public void installListeners(JScrollPane scrollPane)
   {
     super.installListeners(scrollPane);
   }
-  
+
   /**
    * Uninstalls listeners on scrollPane
-   * 
+   *
    * @param scrollPane - the component to uninstall the listeners on
    */
   public void uninstallListeners(JScrollPane scrollPane)
@@ -148,7 +148,7 @@ public class MetalScrollPaneUI
 
   /**
    * TODO
-   * 
+   *
    * @return TODO
    */
   protected PropertyChangeListener createScrollBarSwapListener()
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
index 6d7818f8b22..8afa98c975c 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSeparatorUI.java
@@ -83,13 +83,13 @@ public class MetalSeparatorUI
   }
 
   /**
-   * The separator is made of two lines. The top line will be 
+   * The separator is made of two lines. The top line will be
    * the Metal theme color separatorForeground (or left line if it's vertical).
    * The bottom or right line will be the Metal theme color
    * separatorBackground.
-   * The two lines will 
-   * be centered inside the bounds box. If the separator is horizontal, 
-   * then it will be vertically centered, or if it's vertical, it will 
+   * The two lines will
+   * be centered inside the bounds box. If the separator is horizontal,
+   * then it will be vertically centered, or if it's vertical, it will
    * be horizontally centered.
    *
    * @param g The Graphics object to paint with
@@ -107,9 +107,9 @@ public class MetalSeparatorUI
       s = (JSeparator) c;
     else
       return;
-      
+
     if (s.getOrientation() == JSeparator.HORIZONTAL)
-      {    
+      {
         int midAB = r.height / 2;
         g.setColor(c1);
         g.drawLine(r.x, r.y + midAB - 1, r.x + r.width, r.y + midAB - 1);
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
index b3e8707c94d..e85c32462a4 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSliderUI.java
@@ -74,11 +74,11 @@ public class MetalSliderUI extends BasicSliderUI
     {
       // Nothing to do here.
     }
-    
+
     /**
      * Handles property change events.  Events with the name "JSlider.isFilled"
      * are handled here, and other events are passed to the superclass.
-     * 
+     *
      * @param e  the property change event.
      */
     public void propertyChange(PropertyChangeEvent e)
@@ -89,38 +89,38 @@ public class MetalSliderUI extends BasicSliderUI
         if (b == null)
           filledSlider = false;
         else
-          filledSlider = b.booleanValue();   
+          filledSlider = b.booleanValue();
       }
       else
         super.propertyChange(e);
     }
   }
-  
+
   /** The thumb color (unused, because an icon is used to draw the thumb). */
   protected static Color thumbColor;
-  
-  /** 
+
+  /**
    * The highlight color used for drawing the track rect when the slider is
    * enabled.
    */
   protected static Color highlightColor;
-  
+
   /**
    * The shadow color used for drawing the track rect when the slider is
    * enabled.
    */
   protected static Color darkShadowColor;
-  
+
   /** The track width. */
   protected static int trackWidth = UIManager.getInt("Slider.trackWidth");
-  
+
   /** The length of the major tick marks. */
   protected static int tickLength = UIManager.getInt("Slider.majorTickLength");
-  
+
   /** The icon used for the thumb control of horizontally oriented sliders. */
   protected static Icon horizThumbIcon = UIManager.getIcon(
           "Slider.horizontalThumbIcon");
-  
+
   /** The icon used for the thumb control of vertically oriented sliders. */
   protected static Icon vertThumbIcon = UIManager.getIcon(
           "Slider.verticalThumbIcon");
@@ -130,8 +130,8 @@ public class MetalSliderUI extends BasicSliderUI
 
   /** A key to look up the filledSlider setting in the {@link UIManager}. */
   protected final String SLIDER_FILL = "JSlider.isFilled";
-  
-  /** 
+
+  /**
    * A flag that controls whether or not the track is filled up to the value
    * of the slider.
    */
@@ -159,38 +159,38 @@ public class MetalSliderUI extends BasicSliderUI
   {
     return new MetalSliderUI();
   }
-  
+
   /**
    * Installs the default for this UI delegate in the supplied component.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
   {
     super.installUI(c);
     Boolean b = (Boolean) c.getClientProperty(SLIDER_FILL);
-    if (b != null) 
+    if (b != null)
       filledSlider = b.booleanValue();
   }
 
   /**
-   * Creates a property change listener for the slider.  
-   * 
+   * Creates a property change listener for the slider.
+   *
    * @param slider  the slider.
-   * 
+   *
    * @return A new instance of {@link MetalPropertyListener}.
    */
   protected PropertyChangeListener createPropertyChangeListener(JSlider slider)
   {
-    return new MetalPropertyListener();    
+    return new MetalPropertyListener();
   }
-  
+
   /**
    * Paints the thumb icon for the slider.
-   * 
+   *
    * @param g  the graphics device.
    */
-  public void paintThumb(Graphics g) 
+  public void paintThumb(Graphics g)
   {
     Color save = g.getColor();
     g.setColor(thumbColor);
@@ -200,10 +200,10 @@ public class MetalSliderUI extends BasicSliderUI
       vertThumbIcon.paintIcon(slider, g, thumbRect.x, thumbRect.y);
     g.setColor(save);
   }
-  
+
   /**
    * Paints the track along which the thumb control moves.
-   * 
+   *
    * @param g  the graphics device.
    */
   public void paintTrack(Graphics g)
@@ -215,10 +215,10 @@ public class MetalSliderUI extends BasicSliderUI
         int trackY = trackRect.y + (trackRect.height - getTrackWidth()) / 2;
         int trackW = trackRect.width;
         int trackH = getTrackWidth();
-        
+
         // draw border
         if (slider.isEnabled())
-          BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH, 
+          BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
               darkShadowColor, shadowColor, darkShadowColor, highlightColor);
         else
           {
@@ -233,7 +233,7 @@ public class MetalSliderUI extends BasicSliderUI
               {
                 int xPos = xPositionForValue(slider.getValue());
                 int x = slider.getInverted() ? xPos : trackRect.x;
-                int w = slider.getInverted() ? trackX + trackW - xPos 
+                int w = slider.getInverted() ? trackX + trackW - xPos
                                              : xPos - trackRect.x;
                 g.setColor(MetalLookAndFeel.getWhite());
                 g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
@@ -245,11 +245,11 @@ public class MetalSliderUI extends BasicSliderUI
                 g.drawLine(x + 1, trackY + 4, x + w - 3, trackY + 4);
               }
           }
-        else if (filledSlider) 
+        else if (filledSlider)
           {
             int xPos = xPositionForValue(slider.getValue());
             int x = slider.getInverted() ? xPos : trackRect.x;
-            int w = slider.getInverted() ? trackX + trackW - xPos 
+            int w = slider.getInverted() ? trackX + trackW - xPos
                                          : xPos - trackRect.x;
             g.setColor(MetalLookAndFeel.getControlShadow());
             g.fillRect(x + 1, trackY + 1, w - 3, getTrackWidth() - 3);
@@ -257,7 +257,7 @@ public class MetalSliderUI extends BasicSliderUI
               {
                 g.setColor(MetalLookAndFeel.getControl());
                 g.drawLine(x + 1, trackY + 1, x + w - 3, trackY + 1);
-                g.drawLine(x + 1, trackY + 1, x + 1, 
+                g.drawLine(x + 1, trackY + 1, x + 1,
                            trackY + getTrackWidth() - 3);
               }
           }
@@ -269,7 +269,7 @@ public class MetalSliderUI extends BasicSliderUI
         int trackW = getTrackWidth();
         int trackH = trackRect.height;
         if (slider.isEnabled())
-          BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH, 
+          BasicGraphicsUtils.drawEtchedRect(g, trackX, trackY, trackW, trackH,
               darkShadowColor, shadowColor, darkShadowColor, highlightColor);
         else
           {
@@ -284,9 +284,9 @@ public class MetalSliderUI extends BasicSliderUI
               {
                 int yPos = yPositionForValue(slider.getValue());
                 int y = slider.getInverted() ? trackY : yPos;
-                int h = slider.getInverted() ? yPos - trackY 
+                int h = slider.getInverted() ? yPos - trackY
                         : trackY + trackH - yPos;
-                
+
                 g.setColor(MetalLookAndFeel.getWhite());
                 g.drawLine(trackX + 1, y + 1, trackX + 1, y + h - 3);
                 g.setColor(UIManager.getColor("Slider.altTrackColor"));
@@ -297,11 +297,11 @@ public class MetalSliderUI extends BasicSliderUI
                 g.drawLine(trackX + 4, y + 1, trackX + 4, y + h - 3);
               }
           }
-        else if (filledSlider) 
+        else if (filledSlider)
           {
           int yPos = yPositionForValue(slider.getValue());
           int y = slider.getInverted() ? trackY : yPos;
-          int h = slider.getInverted() ? yPos - trackY 
+          int h = slider.getInverted() ? yPos - trackY
                   : trackY + trackH - yPos;
           g.setColor(MetalLookAndFeel.getControlShadow());
           g.fillRect(trackX + 1, y + 1, getTrackWidth() - 3, h - 3);
@@ -314,14 +314,14 @@ public class MetalSliderUI extends BasicSliderUI
           }
       }
   }
-  
+
   /**
-   * Draws the focus rectangle for the slider.  The Metal look and feel 
-   * indicates that the {@link JSlider} has the focus by changing the color of 
-   * the thumb control - this is handled elsewhere and so this method is empty 
+   * Draws the focus rectangle for the slider.  The Metal look and feel
+   * indicates that the {@link JSlider} has the focus by changing the color of
+   * the thumb control - this is handled elsewhere and so this method is empty
    * (it overrides the method in the {@link BasicSliderUI} class to prevent
    * a default focus highlight from being drawn).
-   * 
+   *
    * @param g  the graphics device.
    */
   public void paintFocus(Graphics g)
@@ -329,25 +329,25 @@ public class MetalSliderUI extends BasicSliderUI
     thumbColor = getFocusColor();
     paintThumb(g);
   }
-  
+
   /**
    * Returns the size of the thumb icon.
-   * 
+   *
    * @return The size of the thumb icon.
    */
   protected Dimension getThumbSize()
   {
     if (slider.getOrientation() == JSlider.HORIZONTAL)
-      return new Dimension(horizThumbIcon.getIconWidth(), 
+      return new Dimension(horizThumbIcon.getIconWidth(),
               horizThumbIcon.getIconHeight());
     else
-      return new Dimension(vertThumbIcon.getIconWidth(), 
+      return new Dimension(vertThumbIcon.getIconWidth(),
               vertThumbIcon.getIconHeight());
   }
-  
+
   /**
    * Returns the length of the major tick marks.
-   * 
+   *
    * @return The length of the major tick marks.
    */
   public int getTickLength()
@@ -357,31 +357,31 @@ public class MetalSliderUI extends BasicSliderUI
       len += 2;
     return len;
   }
-  
+
   /**
    * Returns the track width.
-   * 
+   *
    * @return The track width.
    */
   protected int getTrackWidth()
   {
     return trackWidth;
   }
-  
+
   /**
    * Returns the track length.
-   * 
+   *
    * @return The track length.
    */
   protected int getTrackLength()
   {
-    return slider.getOrientation() == JSlider.HORIZONTAL 
+    return slider.getOrientation() == JSlider.HORIZONTAL
            ? tickRect.width : tickRect.height;
   }
-  
+
   /**
    * Returns the thumb overhang.
-   * 
+   *
    * @return The thumb overhang.
    */
   protected int getThumbOverhang()
@@ -389,16 +389,16 @@ public class MetalSliderUI extends BasicSliderUI
     // FIXME:  for what might this method be used?
     return 0;
   }
-  
+
   protected void scrollDueToClickInTrack(int dir)
   {
     // FIXME:  for what might this method be overridden?
     super.scrollDueToClickInTrack(dir);
   }
-  
+
   /**
    * Paints the minor ticks for a slider with a horizontal orientation.
-   * 
+   *
    * @param g  the graphics device.
    * @param tickBounds  the tick bounds.
    * @param x  the x value for the tick.
@@ -406,7 +406,7 @@ public class MetalSliderUI extends BasicSliderUI
   protected void paintMinorTickForHorizSlider(Graphics g, Rectangle tickBounds,
                                               int x)
   {
-    // Note the incoming 'g' has a translation in place to get us to the 
+    // Note the incoming 'g' has a translation in place to get us to the
     // start of the tick rect already...
     if (slider.isEnabled())
       g.setColor(slider.getForeground());
@@ -414,10 +414,10 @@ public class MetalSliderUI extends BasicSliderUI
       g.setColor(MetalLookAndFeel.getControlShadow());
     g.drawLine(x, TICK_BUFFER, x, TICK_BUFFER + tickLength / 2);
   }
- 
+
   /**
    * Paints the major ticks for a slider with a horizontal orientation.
-   * 
+   *
    * @param g  the graphics device.
    * @param tickBounds  the tick bounds.
    * @param x  the x value for the tick.
@@ -425,7 +425,7 @@ public class MetalSliderUI extends BasicSliderUI
   protected void paintMajorTickForHorizSlider(Graphics g, Rectangle tickBounds,
                                               int x)
   {
-    // Note the incoming 'g' has a translation in place to get us to the 
+    // Note the incoming 'g' has a translation in place to get us to the
     // start of the tick rect already...
     if (slider.isEnabled())
       g.setColor(slider.getForeground());
@@ -433,10 +433,10 @@ public class MetalSliderUI extends BasicSliderUI
       g.setColor(MetalLookAndFeel.getControlShadow());
     g.drawLine(x, TICK_BUFFER, x, TICK_BUFFER + tickLength - 1);
   }
-  
+
   /**
    * Paints the minor ticks for a slider with a vertical orientation.
-   * 
+   *
    * @param g  the graphics device.
    * @param tickBounds  the tick bounds.
    * @param y  the y value for the tick.
@@ -444,7 +444,7 @@ public class MetalSliderUI extends BasicSliderUI
   protected void paintMinorTickForVertSlider(Graphics g, Rectangle tickBounds,
                                              int y)
   {
-    // Note the incoming 'g' has a translation in place to get us to the 
+    // Note the incoming 'g' has a translation in place to get us to the
     // start of the tick rect already...
     if (slider.isEnabled())
       g.setColor(slider.getForeground());
@@ -452,10 +452,10 @@ public class MetalSliderUI extends BasicSliderUI
       g.setColor(MetalLookAndFeel.getControlShadow());
     g.drawLine(TICK_BUFFER, y, TICK_BUFFER + tickLength / 2, y);
   }
-  
+
   /**
    * Paints the major ticks for a slider with a vertical orientation.
-   * 
+   *
    * @param g  the graphics device.
    * @param tickBounds  the tick bounds.
    * @param y  the y value for the tick.
@@ -463,7 +463,7 @@ public class MetalSliderUI extends BasicSliderUI
   protected void paintMajorTickForVertSlider(Graphics g, Rectangle tickBounds,
                                              int y)
   {
-    // Note the incoming 'g' has a translation in place to get us to the 
+    // Note the incoming 'g' has a translation in place to get us to the
     // start of the tick rect already...
     if (slider.isEnabled())
       g.setColor(slider.getForeground());
@@ -471,5 +471,5 @@ public class MetalSliderUI extends BasicSliderUI
       g.setColor(MetalLookAndFeel.getControlShadow());
     g.drawLine(TICK_BUFFER, y, TICK_BUFFER + tickLength, y);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
index a3069daa9c5..05149983480 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneDivider.java
@@ -197,13 +197,13 @@ class MetalSplitPaneDivider extends BasicSplitPaneDivider
 
   /** The light color in the pattern. */
   Color light;
-  
+
   /** The JSplitPane the divider is on. */
   JSplitPane splitPane;
 
   /** The split pane orientation. */
   int orientation;
-  
+
   /**
    * Creates a new instance of MetalSplitPaneDivider.
    *
@@ -232,7 +232,7 @@ class MetalSplitPaneDivider extends BasicSplitPaneDivider
         g.setColor(UIManager.getColor("SplitPane.dividerFocusColor"));
         g.fillRect(0, 0, s.width, s.height);
       }
-    
+
     // Paint border if one exists.
     Border border = getBorder();
     if (border != null)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
index dbcc0910d46..5b8f2127e1f 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalSplitPaneUI.java
@@ -78,7 +78,7 @@ public class MetalSplitPaneUI extends BasicSplitPaneUI
    * The divider returned by this method is a {@link BasicSplitPaneDivider}
    * that is drawn using the Metal look.
    *
-   * @return the default divider to use for JSplitPanes. 
+   * @return the default divider to use for JSplitPanes.
    */
   public BasicSplitPaneDivider createDefaultDivider()
   {
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
index 53eaa3cac5a..77705ba0eaf 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTabbedPaneUI.java
@@ -57,15 +57,15 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
 {
 
   /**
-   * A {@link LayoutManager} responsible for placing all the tabs and the 
-   * visible component inside the {@link JTabbedPane}. This class is only used 
+   * A {@link LayoutManager} responsible for placing all the tabs and the
+   * visible component inside the {@link JTabbedPane}. This class is only used
    * for {@link JTabbedPane#WRAP_TAB_LAYOUT}.
    *
    * @specnote Apparently this class was intended to be protected,
    *           but was made public by a compiler bug and is now
    *           public for compatibility.
    */
-  public class TabbedPaneLayout 
+  public class TabbedPaneLayout
     extends BasicTabbedPaneUI.TabbedPaneLayout
   {
     /**
@@ -75,12 +75,12 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
     {
       // Nothing to do here.
     }
-    
+
     /**
-     * Overridden to do nothing, because tab runs are not rotated in the 
+     * Overridden to do nothing, because tab runs are not rotated in the
      * {@link MetalLookAndFeel}.
-     * 
-     * @param tabPlacement  the tab placement (one of {@link #TOP}, 
+     *
+     * @param tabPlacement  the tab placement (one of {@link #TOP},
      *        {@link #BOTTOM}, {@link #LEFT} or {@link #RIGHT}).
      * @param selectedRun  the index of the selected run.
      */
@@ -88,18 +88,18 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
     {
       // do nothing, because tab runs are not rotated in the MetalLookAndFeel
     }
-    
+
     /**
      * Overridden to do nothing, because the selected tab does not have extra
      * padding in the {@link MetalLookAndFeel}.
-     * 
-     * @param tabPlacement  the tab placement (one of {@link #TOP}, 
+     *
+     * @param tabPlacement  the tab placement (one of {@link #TOP},
      *        {@link #BOTTOM}, {@link #LEFT} or {@link #RIGHT}).
      * @param selectedIndex  the index of the selected tab.
      */
     protected void padSelectedTab(int tabPlacement, int selectedIndex)
     {
-      // do nothing, because the selected tab does not have extra padding in 
+      // do nothing, because the selected tab does not have extra padding in
       // the MetalLookAndFeel
     }
 
@@ -162,10 +162,10 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
   {
     return new MetalTabbedPaneUI();
   }
-  
+
   /**
    * Creates and returns an instance of {@link TabbedPaneLayout}.
-   * 
+   *
    * @return A layout manager used by this UI delegate.
    */
   protected LayoutManager createLayoutManager()
@@ -174,12 +174,12 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
            ? new MetalTabbedPaneUI.TabbedPaneLayout()
            : super.createLayoutManager();
   }
-  
+
   /**
    * Paints the border for a single tab.
-   * 
+   *
    * @param g  the graphics device.
-   * @param tabPlacement  the tab placement ({@link #TOP}, {@link #LEFT}, 
+   * @param tabPlacement  the tab placement ({@link #TOP}, {@link #LEFT},
    *        {@link #BOTTOM} or {@link #RIGHT}).
    * @param tabIndex  the index of the tab to draw the border for.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -188,15 +188,15 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
    * @param h  the height for the tab's bounding rectangle.
    * @param isSelected  indicates whether or not the tab is selected.
    */
-  protected void paintTabBorder(Graphics g, int tabPlacement, int tabIndex, 
-          int x, int y, int w, int h, boolean isSelected) 
+  protected void paintTabBorder(Graphics g, int tabPlacement, int tabIndex,
+          int x, int y, int w, int h, boolean isSelected)
   {
     int bottom = y + h - 1;
     int right = x + w - 1;
 
     switch (tabPlacement)
     {
-    case LEFT: 
+    case LEFT:
       paintLeftTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
       break;
     case BOTTOM:
@@ -206,7 +206,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
       paintRightTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
       break;
     case TOP:
-    default: 
+    default:
       paintTopTabBorder(tabIndex, g, x, y, w, h, bottom, right, isSelected);
     }
   }
@@ -214,7 +214,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
   /**
    * Paints the border for a tab assuming that the tab position is at the top
    * ({@link #TOP}).
-   * 
+   *
    * @param tabIndex  the tab index.
    * @param g  the graphics device.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -306,11 +306,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
 
     g.translate(-x, -y);
   }
-  
+
   /**
    * Paints the border for a tab assuming that the tab position is at the left
    * ({@link #LEFT}).
-   * 
+   *
    * @param tabIndex  the tab index.
    * @param g  the graphics device.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -436,11 +436,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
 
     g.translate(-x, -y);
   }
-  
+
   /**
    * Paints the border for a tab assuming that the tab position is at the right
    * ({@link #RIGHT}).
-   * 
+   *
    * @param tabIndex  the tab index.
    * @param g  the graphics device.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -545,11 +545,11 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
       }
     g.translate(-x, -y);
   }
-  
+
   /**
    * Paints the border for a tab assuming that the tab position is at the bottom
    * ({@link #BOTTOM}).
-   * 
+   *
    * @param tabIndex  the tab index.
    * @param g  the graphics device.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -606,7 +606,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
     if (isOcean && isSelected)
       {
         g.drawLine(0, 0, 0, bottom - 5);
-        
+
         // Paint a connecting line to the tab below for all
         // but the first tab in the last run.
         if (tabIndex != tabRuns[runCount-1])
@@ -657,9 +657,9 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
 
   /**
    * Paints the background for a tab.
-   * 
+   *
    * @param g  the graphics device.
-   * @param tabPlacement  the tab placement ({@link #TOP}, {@link #LEFT}, 
+   * @param tabPlacement  the tab placement ({@link #TOP}, {@link #LEFT},
    *        {@link #BOTTOM} or {@link #RIGHT}).
    * @param tabIndex  the index of the tab to draw the border for.
    * @param x  the x-coordinate for the tab's bounding rectangle.
@@ -696,7 +696,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
         g.fillRect(x + 2, y + 5, 2, h - 5);
     }
   }
-  
+
   /**
    * This method paints the focus rectangle around the selected tab.
    *
@@ -719,19 +719,19 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
 
         g.setColor(focus);
         g.translate(rect.x, rect.y);
-        
+
         switch (tabPlacement)
           {
           case LEFT:
             // Top line
             g.drawLine(7, 2, rect.width-2, 2);
-            
+
             // Right line
             g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-            
+
             // Bottom line
             g.drawLine(rect.width-2, rect.height-2, 3, rect.height-2);
-            
+
             // Left line
             g.drawLine(2, rect.height-3, 2, 7);
 
@@ -741,13 +741,13 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
           case RIGHT:
             // Top line
             g.drawLine(1, 2, rect.width-8, 2);
-            
+
             // Slant
             g.drawLine(rect.width-7, 2, rect.width-3, 6);
-            
+
             // Right line
             g.drawLine(rect.width-3, 7, rect.width-3, rect.height-3);
-            
+
             // Bottom line
             g.drawLine(rect.width-3, rect.height-2, 2, rect.height-2);
 
@@ -757,51 +757,51 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
           case BOTTOM:
             // Top line
             g.drawLine(2, 1, rect.width-2, 1);
-            
+
             // Right line
             g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-            
+
             // Bottom line
             g.drawLine(7, rect.height-3, rect.width-2, rect.height-3);
-            
+
             // Slant
             g.drawLine(6, rect.height-3, 2, rect.height-7);
-            
+
             // Left line
             g.drawLine(2, rect.height-8, 2, 2);
-            
+
             break;
           case TOP:
           default:
             // Top line
             g.drawLine(6, 2, rect.width-2, 2);
-            
+
             // Right line
             g.drawLine(rect.width-1, 2, rect.width-1, rect.height-3);
-            
+
             // Bottom line
             g.drawLine(3, rect.height-3, rect.width-2, rect.height-3);
-            
+
             // Left line
             g.drawLine(2, rect.height-3, 2, 7);
-            
+
             // Slant
             g.drawLine(2, 6, 6, 2);
-            
+
           }
-        
+
         g.translate(-rect.x, -rect.y);
       }
   }
-  
+
   /**
-   * Returns true if the tabs in the specified run should be 
+   * Returns true if the tabs in the specified run should be
    * padded to make the run fill the width/height of the {@link JTabbedPane}.
-   * 
+   *
    * @param tabPlacement  the tab placement for the {@link JTabbedPane} (one of
    *        {@link #TOP}, {@link #BOTTOM}, {@link #LEFT} and {@link #RIGHT}).
    * @param run  the run index.
-   * 
+   *
    * @return A boolean.
    */
   protected boolean shouldPadTabRun(int tabPlacement, int run)
@@ -824,14 +824,14 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
     tabsOpaque = UIManager.getBoolean("TabbedPane.tabsOpaque");
     minTabWidth = 0;
   }
-  
+
   /**
    * Returns the color for the gap.
-   * 
+   *
    * @param currentRun - The current run to return the color for
    * @param x - The x position of the current run
    * @param y - The y position of the current run
-   * 
+   *
    * @return the color for the gap in the current run.
    */
   protected Color getColorForGap(int currentRun, int x, int y)
@@ -842,23 +842,23 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
       return selectColor;
     return tabAreaBackground;
   }
-  
+
   /**
    * Returns true if the gap should be filled in.
-   * 
+   *
    * @param currentRun - The current run
    * @param tabIndex - The current tab
    * @param x - The x position of the tab
    * @param y - The y position of the tab
-   * 
-   * @return true if the gap at the current run should be filled 
+   *
+   * @return true if the gap at the current run should be filled
    */
   protected boolean shouldFillGap(int currentRun, int tabIndex, int x, int y)
   {
     // As far as I can tell, the gap is never filled in.
     return false;
   }
-  
+
   /**
    * Paints the highlight below the tab, if there is one.
    */
@@ -867,14 +867,14 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
     int selected = tabPane.getSelectedIndex();
     int tabPlacement = tabPane.getTabPlacement();
     Rectangle bounds = getTabBounds(tabPane, selected);
-    
+
     hg.setColor(selectColor);
     int x = bounds.x;
     int y = bounds.y;
     int w = bounds.width;
     int h = bounds.height;
 
-    if (tabPlacement == TOP) 
+    if (tabPlacement == TOP)
         hg.fillRect(x, y + h - 2, w, 30);
     else if (tabPlacement == LEFT)
         hg.fillRect(x + w - 1, y, 20, h);
@@ -882,17 +882,17 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
         hg.fillRect(x, y - h + 2, w, 30);
     else if (tabPlacement == RIGHT)
         hg.fillRect(x - 18, y, 20, h);
-    else 
+    else
       throw new AssertionError("Unrecognised 'tabPlacement' argument.");
     hg = null;
   }
-  
+
   /**
-   * Returns true if we should rotate the tab runs. 
-   * 
+   * Returns true if we should rotate the tab runs.
+   *
    * @param tabPlacement - The current tab placement.
    * @param selectedRun - The selected run.
-   * 
+   *
    * @return true if the tab runs should be rotated.
    */
   protected boolean shouldRotateTabRuns(int tabPlacement,
@@ -1052,7 +1052,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
                                               int w, int h)
   {
     g.setColor(darkShadow);
-    
+
     // If tabs are not placed on BOTTOM, or if the selected tab is not in the
     // run directly below the content or the selected tab is not visible,
     // then we draw an unbroken line.
@@ -1144,7 +1144,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
           {
             g.setColor(MetalLookAndFeel.getWhite());
             g.drawLine(x, y + 1, x, y + h - 2);
-          }       
+          }
       }
     else
       {
@@ -1163,7 +1163,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
               }
           }
       }
-    
+
   }
 
   /**
@@ -1251,7 +1251,7 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
       bg = unselectedBackground;
     return bg;
   }
-  
+
   protected int getTabLabelShiftX(int tabPlacement,
                                   int index,
                                   boolean isSelected)
@@ -1265,5 +1265,5 @@ public class MetalTabbedPaneUI extends BasicTabbedPaneUI
   {
     return 0;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
index 30738b37c72..f7b18dbd407 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTextFieldUI.java
@@ -69,10 +69,10 @@ public class MetalTextFieldUI extends BasicTextFieldUI
   {
     return new MetalTextFieldUI();
   }
-  
+
   /**
    * This method gets called when a bound property is changed on the associated
-   * JTextComponent. This is a hook which UI implementations may change to 
+   * JTextComponent. This is a hook which UI implementations may change to
    * reflect how the UI displays bound properties of JTextComponent subclasses.
    */
   public void propertyChange(PropertyChangeEvent evt)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java b/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
index d5131af2e29..209cbbe5e27 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTheme.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.FontUIResource;
  * The base class for themes used by the {@link MetalLookAndFeel}.  A default
  * theme ({@link DefaultMetalTheme}) is provided, or you can create and use
  * your own.
- * 
+ *
  * @see MetalLookAndFeel#setCurrentTheme(MetalTheme)
  */
 public abstract class MetalTheme
@@ -67,14 +67,14 @@ public abstract class MetalTheme
 
   /**
    * Returns the name of the theme.
-   * 
+   *
    * @return The name of the theme.
    */
   public abstract String getName();
 
   /**
    * Adds custom entries to the UI defaults table.  This method is empty.
-   * 
+   *
    * @param table  the table.
    */
   public void addCustomEntriesToTable(UIDefaults table)
@@ -87,7 +87,7 @@ public abstract class MetalTheme
   /**
    * Returns the accelerator foreground color.  The default implementation
    * returns the color from {@link #getPrimary1()}.
-   * 
+   *
    * @return The accelerator foreground color.
    */
   public ColorUIResource getAcceleratorForeground()
@@ -96,20 +96,20 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the accelerator selected foreground color.  The default 
+   * Returns the accelerator selected foreground color.  The default
    * implementation returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The accelerator selected foreground color.
    */
   public ColorUIResource getAcceleratorSelectedForeground()
   {
     return getBlack();
   }
-  
+
   /**
-   * Returns the control color.  The default implementation returns the color 
+   * Returns the control color.  The default implementation returns the color
    * from {@link #getSecondary3()}.
-   * 
+   *
    * @return The control color.
    */
   public ColorUIResource getControl()
@@ -118,9 +118,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used for dark shadows on controls.  The default 
+   * Returns the color used for dark shadows on controls.  The default
    * implementation returns the color from  {@link #getSecondary1()}.
-   * 
+   *
    * @return The color used for dark shadows on controls.
    */
   public ColorUIResource getControlDarkShadow()
@@ -131,7 +131,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used for disabled controls.  The default implementation
    * returns the color from {@link #getSecondary1()}.
-   * 
+   *
    * @return The color used for disabled controls.
    */
   public ColorUIResource getControlDisabled()
@@ -140,9 +140,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used to draw highlights for controls.  The default 
+   * Returns the color used to draw highlights for controls.  The default
    * implementation returns the color from {@link #getWhite()}.
-   * 
+   *
    * @return The color used to draw highlights for controls.
    */
   public ColorUIResource getControlHighlight()
@@ -151,9 +151,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used to display control info.  The default 
+   * Returns the color used to display control info.  The default
    * implementation returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The color used to display control info.
    */
   public ColorUIResource getControlInfo()
@@ -162,9 +162,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used to draw shadows for controls.  The default 
+   * Returns the color used to draw shadows for controls.  The default
    * implementation returns the color from {@link #getSecondary2()}.
-   * 
+   *
    * @return The color used to draw shadows for controls.
    */
   public ColorUIResource getControlShadow()
@@ -175,7 +175,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used for text on controls.  The default implementation
    * returns the color from {@link #getControlInfo()}.
-   * 
+   *
    * @return The color used for text on controls.
    */
   public ColorUIResource getControlTextColor()
@@ -184,9 +184,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used for the desktop background.  The default 
+   * Returns the color used for the desktop background.  The default
    * implementation returns the color from {@link #getPrimary2()}.
-   * 
+   *
    * @return The color used for the desktop background.
    */
   public ColorUIResource getDesktopColor()
@@ -195,9 +195,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used to draw focus highlights.  The default 
+   * Returns the color used to draw focus highlights.  The default
    * implementation returns the color from {@link #getPrimary2()}.
-   * 
+   *
    * @return The color used to draw focus highlights.
    */
   public ColorUIResource getFocusColor()
@@ -208,7 +208,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used to draw highlighted text.  The default
    * implementation returns the color from {@link #getHighlightedTextColor()}.
-   * 
+   *
    * @return The color used to draw highlighted text.
    */
   public ColorUIResource getHighlightedTextColor()
@@ -219,7 +219,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used to draw text on inactive controls.  The default
    * implementation returns the color from {@link #getControlDisabled()}.
-   * 
+   *
    * @return The color used to draw text on inactive controls.
    */
   public ColorUIResource getInactiveControlTextColor()
@@ -230,7 +230,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used to draw inactive system text.  The default
    * implementation returns the color from {@link #getSecondary2()}.
-   * 
+   *
    * @return The color used to draw inactive system text.
    */
   public ColorUIResource getInactiveSystemTextColor()
@@ -241,9 +241,9 @@ public abstract class MetalTheme
   /**
    * Returns the background color for menu items.  The default implementation
    * returns the color from {@link #getSecondary3()}.
-   * 
+   *
    * @return The background color for menu items.
-   * 
+   *
    * @see #getMenuSelectedBackground()
    */
   public ColorUIResource getMenuBackground()
@@ -252,11 +252,11 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the foreground color for disabled menu items.  The default 
+   * Returns the foreground color for disabled menu items.  The default
    * implementation returns the color from {@link #getSecondary2()}.
-   * 
+   *
    * @return The foreground color for disabled menu items.
-   * 
+   *
    * @see #getMenuForeground()
    */
   public ColorUIResource getMenuDisabledForeground()
@@ -267,9 +267,9 @@ public abstract class MetalTheme
   /**
    * Returns the foreground color for menu items.  The default implementation
    * returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The foreground color for menu items.
-   * 
+   *
    * @see #getMenuDisabledForeground()
    * @see #getMenuSelectedForeground()
    */
@@ -279,11 +279,11 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the background color for selected menu items.  The default 
+   * Returns the background color for selected menu items.  The default
    * implementation returns the color from {@link #getPrimary2()}.
-   * 
+   *
    * @return The background color for selected menu items.
-   * 
+   *
    * @see #getMenuBackground()
    */
   public ColorUIResource getMenuSelectedBackground()
@@ -292,11 +292,11 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the foreground color for selected menu items.  The default 
+   * Returns the foreground color for selected menu items.  The default
    * implementation returns the value from {@link #getBlack()}.
-   * 
+   *
    * @return The foreground color for selected menu items.
-   * 
+   *
    * @see #getMenuForeground()
    */
   public ColorUIResource getMenuSelectedForeground()
@@ -307,7 +307,7 @@ public abstract class MetalTheme
   /**
    * Returns the primary color for controls.  The default implementation
    * returns the color from {@link #getPrimary3()}.
-   * 
+   *
    * @return The primary color for controls.
    */
   public ColorUIResource getPrimaryControl()
@@ -316,9 +316,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the primary color for the dark shadow on controls.  The default 
+   * Returns the primary color for the dark shadow on controls.  The default
    * implementation returns the color from {@link #getPrimary1()}.
-   * 
+   *
    * @return The primary color for the dark shadow on controls.
    */
   public ColorUIResource getPrimaryControlDarkShadow()
@@ -327,9 +327,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the primary color for the highlight on controls.  The default 
+   * Returns the primary color for the highlight on controls.  The default
    * implementation returns the color from {@link #getWhite()}.
-   * 
+   *
    * @return The primary color for the highlight on controls.
    */
   public ColorUIResource getPrimaryControlHighlight()
@@ -338,9 +338,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the primary color for the information on controls.  The default 
+   * Returns the primary color for the information on controls.  The default
    * implementation returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The primary color for the information on controls.
    */
   public ColorUIResource getPrimaryControlInfo()
@@ -349,9 +349,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the primary color for the shadow on controls.  The default 
+   * Returns the primary color for the shadow on controls.  The default
    * implementation returns the color from {@link #getPrimary2()}.
-   * 
+   *
    * @return The primary color for the shadow on controls.
    */
   public ColorUIResource getPrimaryControlShadow()
@@ -362,7 +362,7 @@ public abstract class MetalTheme
   /**
    * Returns the background color for separators.  The default implementation
    * returns the color from {@link #getWhite()}.
-   * 
+   *
    * @return The background color for separators.
    */
   public ColorUIResource getSeparatorBackground()
@@ -373,7 +373,7 @@ public abstract class MetalTheme
   /**
    * Returns the foreground color for separators.  The default implementation
    * returns the value from {@link #getPrimary1()}.
-   * 
+   *
    * @return The foreground color for separators.
    */
   public ColorUIResource getSeparatorForeground()
@@ -382,9 +382,9 @@ public abstract class MetalTheme
   }
 
   /**
-   * Returns the color used for system text.  The default implementation 
+   * Returns the color used for system text.  The default implementation
    * returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The color used for system text.
    */
   public ColorUIResource getSystemTextColor()
@@ -395,7 +395,7 @@ public abstract class MetalTheme
   /**
    * Returns the color used to highlight text.  The default implementation
    * returns the color from {@link #getPrimary3()}.
-   * 
+   *
    * @return The color used to highlight text.
    */
   public ColorUIResource getTextHighlightColor()
@@ -406,18 +406,18 @@ public abstract class MetalTheme
   /**
    * Returns the color used to display user text.  The default implementation
    * returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The color used to display user text.
    */
   public ColorUIResource getUserTextColor()
   {
     return getBlack();
   }
-  
+
   /**
    * Returns the window background color.  The default implementation returns
    * the color from {@link #getWhite()}.
-   * 
+   *
    * @return The window background color.
    */
   public ColorUIResource getWindowBackground()
@@ -428,7 +428,7 @@ public abstract class MetalTheme
   /**
    * Returns the window title background color.  The default implementation
    * returns the color from {@link #getPrimary3()}.
-   * 
+   *
    * @return The window title background color.
    */
   public ColorUIResource getWindowTitleBackground()
@@ -439,7 +439,7 @@ public abstract class MetalTheme
   /**
    * Returns the window title foreground color.  The default implementation
    * returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The window title foreground color.
    */
   public ColorUIResource getWindowTitleForeground()
@@ -450,7 +450,7 @@ public abstract class MetalTheme
   /**
    * Returns the background color for an inactive window title.  The default
    * implementation returns the color from {@link #getSecondary3()}.
-   * 
+   *
    * @return The background color for an inactive window title.
    */
   public ColorUIResource getWindowTitleInactiveBackground()
@@ -461,7 +461,7 @@ public abstract class MetalTheme
   /**
    * Returns the foreground color for an inactive window title.  The default
    * implementation returns the color from {@link #getBlack()}.
-   * 
+   *
    * @return The foreground color for an inactive window title.
    */
   public ColorUIResource getWindowTitleInactiveForeground()
@@ -471,7 +471,7 @@ public abstract class MetalTheme
 
   /**
    * Returns the color used for black.
-   * 
+   *
    * @return The color used for black.
    */
   protected ColorUIResource getBlack()
@@ -481,7 +481,7 @@ public abstract class MetalTheme
 
   /**
    * Returns the color used for white.
-   * 
+   *
    * @return The color used for white.
    */
   protected ColorUIResource getWhite()
@@ -491,86 +491,86 @@ public abstract class MetalTheme
 
   /**
    * Returns the first primary color for this theme.
-   * 
+   *
    * @return The first primary color.
    */
   protected abstract ColorUIResource getPrimary1();
-  
+
   /**
    * Returns the second primary color for this theme.
-   * 
+   *
    * @return The second primary color.
    */
   protected abstract ColorUIResource getPrimary2();
 
   /**
    * Returns the third primary color for this theme.
-   * 
+   *
    * @return The third primary color.
    */
   protected abstract ColorUIResource getPrimary3();
-  
+
   /**
    * Returns the first secondary color for this theme.
-   * 
+   *
    * @return The first secondary color.
    */
   protected abstract ColorUIResource getSecondary1();
 
   /**
    * Returns the second secondary color for this theme.
-   * 
+   *
    * @return The second secondary color.
    */
   protected abstract ColorUIResource getSecondary2();
 
   /**
    * Returns the third secondary color for this theme.
-   * 
+   *
    * @return The third secondary color.
    */
   protected abstract ColorUIResource getSecondary3();
 
   /**
    * Returns the font used for text on controls.
-   * 
+   *
    * @return The font used for text on controls.
    */
   public abstract FontUIResource getControlTextFont();
 
   /**
    * Returns the font used for text in menus.
-   * 
+   *
    * @return The font used for text in menus.
    */
   public abstract FontUIResource getMenuTextFont();
 
   /**
    * Returns the font used for sub text.
-   * 
+   *
    * @return The font used for sub text.
    */
   public abstract FontUIResource getSubTextFont();
-  
+
   /**
    * Returns the font used for system text.
-   * 
+   *
    * @return The font used for system text.
    */
   public abstract FontUIResource getSystemTextFont();
-  
+
   /**
    * Returns the font used for user text.
-   * 
+   *
    * @return The font used for user text.
    */
   public abstract FontUIResource getUserTextFont();
 
   /**
    * Returns the font used for window titles.
-   * 
+   *
    * @return The font used for window titles.
    */
   public abstract FontUIResource getWindowTitleFont();
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
index 8c7a46e3a86..2dacd7fec72 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToggleButtonUI.java
@@ -113,9 +113,9 @@ public class MetalToggleButtonUI
   }
 
   /**
-   * Returns the color for the text label of disabled buttons.  The value 
+   * Returns the color for the text label of disabled buttons.  The value
    * is initialised in the {@link #installDefaults(AbstractButton)} method
-   * by reading the ToggleButton.disabledText item from the UI 
+   * by reading the ToggleButton.disabledText item from the UI
    * defaults.
    *
    * @return The color for the text label of disabled buttons.
@@ -127,7 +127,7 @@ public class MetalToggleButtonUI
 
   /**
    * Updates the button with the defaults for this look and feel.
-   * 
+   *
    * @param b  the button.
    */
   public void installDefaults(AbstractButton b)
@@ -137,10 +137,10 @@ public class MetalToggleButtonUI
     selectColor = UIManager.getColor(getPropertyPrefix() + "select");
     disabledTextColor = UIManager.getColor(getPropertyPrefix() + "disabledText");
   }
-  
+
   /**
-   * Paints the button background when it is pressed/selected. 
-   * 
+   * Paints the button background when it is pressed/selected.
+   *
    * @param g  the graphics device.
    * @param b  the button.
    */
@@ -155,19 +155,19 @@ public class MetalToggleButtonUI
         g.setColor(saved);
       }
   }
-  
+
   /**
    * Paints the text for the button.
-   * 
+   *
    * As of JDK 1.4 this method is obsolete.
-   * Use {@link BasicButtonUI#paintText(java.awt.Graphics, 
+   * Use {@link BasicButtonUI#paintText(java.awt.Graphics,
    * javax.swing.AbstractButton, java.awt.Rectangle, java.lang.String)}.
    *
    * @param g  the graphics device.
    * @param c  the component.
    * @param textRect  the bounds for the text.
    * @param text  the text.
-   * 
+   *
    */
   protected void paintText(Graphics g, JComponent c, Rectangle textRect,
                            String text)
@@ -185,10 +185,10 @@ public class MetalToggleButtonUI
     g.setFont(savedFont);
     g.setColor(savedColor);
   }
-  
+
   /**
    * Draws the focus highlight around the text and icon.
-   * 
+   *
    * @param g  the graphics device.
    * @param b  the button.
    */
@@ -201,7 +201,7 @@ public class MetalToggleButtonUI
     g.setColor(focusColor);
     Rectangle fr = iconRect.union(textRect);
     g.drawRect(fr.x - 1, fr.y - 1, fr.width + 1, fr.height + 1);
-    g.setColor(saved);    
+    g.setColor(saved);
   }
 
   /**
@@ -226,5 +226,5 @@ public class MetalToggleButtonUI
     else
       super.update(g, c);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
index 1848c1f162d..64e679c6783 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToolBarUI.java
@@ -59,12 +59,12 @@ import javax.swing.plaf.basic.BasicToolBarUI;
  */
 public class MetalToolBarUI extends BasicToolBarUI
 {
-  
+
   /**
-   * A listener (no longer used) that responds when components are added to or 
+   * A listener (no longer used) that responds when components are added to or
    * removed from the {@link JToolBar}.  The required behaviour is now
-   * handled in the super class. 
-   * 
+   * handled in the super class.
+   *
    * @see MetalToolBarUI#createContainerListener()
    */
   protected class MetalContainerListener
@@ -81,9 +81,9 @@ public class MetalToolBarUI extends BasicToolBarUI
 
   /**
    * A listener (no longer used) that responds to property change events in a
-   * {@link JToolBar} component.  The required behaviour is now handled in the 
-   * super class. 
-   * 
+   * {@link JToolBar} component.  The required behaviour is now handled in the
+   * super class.
+   *
    * @see MetalToolBarUI#createRolloverListener()
    */
   protected class MetalRolloverListener
@@ -97,16 +97,16 @@ public class MetalToolBarUI extends BasicToolBarUI
       // Nothing to do here.
     }
   }
-  
-  /** 
+
+  /**
    * The container listener (an implementation specific field, according to the
    * spec, and not used in GNU Classpath).
    */
   protected ContainerListener contListener;
-  
-  /** 
+
+  /**
    * The rollover listener (an implementation specific field, according to the
-   * spec, and not used in GNU Classpath). 
+   * spec, and not used in GNU Classpath).
    */
   protected PropertyChangeListener rolloverListener;
 
@@ -129,43 +129,43 @@ public class MetalToolBarUI extends BasicToolBarUI
   {
     return new MetalToolBarUI();
   }
-  
+
   /**
    * Returns null as permitted by recent versions of the API
-   * specification.  Originally it seems this method returned a new instance of 
+   * specification.  Originally it seems this method returned a new instance of
    * {@link MetalRolloverListener}, but this is now redundant.
-   * 
+   *
    * @return null.
    */
   protected PropertyChangeListener createRolloverListener()
   {
     return null;
   }
-  
+
   /**
    * Returns null as permitted by recent versions of the API
-   * specification.  Originally it seems this method returned a new instance of 
+   * specification.  Originally it seems this method returned a new instance of
    * {@link MetalContainerListener}, but this is now redundant.
-   * 
+   *
    * @return null.
    */
   protected ContainerListener createContainerListener()
   {
     return null;
   }
-  
+
   /**
    * Returns a border with no rollover effect for buttons in the tool bar.
-   * 
+   *
    * @return A border.
-   * 
+   *
    * @see MetalBorders#getToolbarButtonBorder()
    */
   protected Border createNonRolloverBorder()
   {
-    return MetalBorders.getToolbarButtonBorder();   
+    return MetalBorders.getToolbarButtonBorder();
   }
-  
+
   /**
    * Sets the offset for the window used for dragging the toolbar.
    * It is set as long as the window is not null (it has been installed).
@@ -175,23 +175,23 @@ public class MetalToolBarUI extends BasicToolBarUI
     if (dragWindow != null)
       dragWindow.setOffset(p);
   }
-  
-  /** 
+
+  /**
    * Creates and returns an instance of MetalDockingListener.
-   * 
+   *
    * @return an instance of MetalDockingListener.
    */
   protected MouseInputListener createDockingListener()
   {
     return new MetalDockingListener(toolBar);
   }
-  
+
   /**
    * This is the MouseHandler class that allows the user to drag the JToolBar
    * in and out of the parent and dock it if it can.
    */
   protected class MetalDockingListener extends BasicToolBarUI.DockingListener
-  {    
+  {
     /**
      * Creates a new DockingListener object.
      *
@@ -201,7 +201,7 @@ public class MetalToolBarUI extends BasicToolBarUI
     {
       super(t);
     }
-    
+
     /**
      * This method is called when the mouse is pressed in the JToolBar. If the
      * press doesn't occur in a place where it causes the JToolBar to be
@@ -214,7 +214,7 @@ public class MetalToolBarUI extends BasicToolBarUI
       super.mousePressed(e);
       setDragOffset(new Point(e.getX(), e.getY()));
     }
-    
+
     /**
      * This method is called when the mouse is dragged. It delegates the drag
      * painting to the dragTo method.
@@ -223,7 +223,7 @@ public class MetalToolBarUI extends BasicToolBarUI
      */
     public void mouseDragged(MouseEvent e)
     {
-      // Does not do anything differently than dragging 
+      // Does not do anything differently than dragging
       // BasicToolBarUI.DockingListener
       super.mouseDragged(e);
     }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
index 6647cc02d16..742ff220489 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalToolTipUI.java
@@ -63,38 +63,38 @@ import javax.swing.plaf.basic.BasicToolTipUI;
 public class MetalToolTipUI
   extends BasicToolTipUI
 {
-  /** 
-   * The amount of space between the tool tip text and the accelerator 
-   * description (if visible). 
+  /**
+   * The amount of space between the tool tip text and the accelerator
+   * description (if visible).
    */
   public static final int padSpaceBetweenStrings = 12;
 
   /** The shared UI instance. */
   private static MetalToolTipUI instance;
-  
+
   /** A flag controlling the visibility of the accelerator (if there is one). */
   private boolean isAcceleratorHidden;
-  
+
   /** A string representing the accelerator key for the component. */
   private String acceleratorString;
-  
-  /** 
+
+  /**
    * The delimiter for the accelerator string.
    */
   private String acceleratorDelimiter;
-  
+
   /** The font for the accelerator string. */
   private Font acceleratorFont;
-  
+
   /** The color for the accelerator string. */
   private Color acceleratorForeground;
-  
+
   /** The active border. */
   private Border activeBorder;
-  
+
   /** The inactive border. */
   private Border inactiveBorder;
-  
+
   /**
    * Constructs a new instance of MetalToolTipUI.
    */
@@ -124,21 +124,21 @@ public class MetalToolTipUI
       instance = new MetalToolTipUI();
     return instance;
   }
-  
+
   /**
-   * Returns a string representing the accelerator key (if there is one) for 
+   * Returns a string representing the accelerator key (if there is one) for
    * the component that the tool tip belongs to.
-   * 
+   *
    * @return A string representing the accelerator key.
    */
   public String getAcceleratorString()
   {
-    return acceleratorString;   
+    return acceleratorString;
   }
-  
+
   /**
    * Installs the UI for the specified component (a {@link JToolTip}).
-   * 
+   *
    * @param c  the {@link JToolTip} component.
    */
   public void installUI(JComponent c)
@@ -151,12 +151,12 @@ public class MetalToolTipUI
           c.setBorder(activeBorder);
         else
           c.setBorder(inactiveBorder);
-      }   
+      }
   }
-  
+
   /**
    * Clears the defaults set in {@link #installUI(JComponent)}.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -165,7 +165,7 @@ public class MetalToolTipUI
     if (c.getBorder() instanceof UIResource)
       c.setBorder(null);
   }
-  
+
   /**
    * Returns true if the accelerator string is hidden, and
    * false otherwise.  This setting is controlled by the
@@ -177,12 +177,12 @@ public class MetalToolTipUI
   {
     return isAcceleratorHidden;
   }
-  
+
   /**
    * Returns the preferred size for the {@link JToolTip} component.
-   * 
+   *
    * @param c  the component (a {@link JToolTip}).
-   * 
+   *
    * @return The preferred size.
    */
   public Dimension getPreferredSize(JComponent c)
@@ -196,10 +196,10 @@ public class MetalToolTipUI
       }
     return d;
   }
-  
+
   /**
    * Paints the tool tip.
-   * 
+   *
    * @param g  the graphics context.
    * @param c  the {@link JToolTip} component.
    */
@@ -208,14 +208,14 @@ public class MetalToolTipUI
     super.paint(g, c);
     // Somehow paint accelerator. Keep care for possible HTML rendering.
   }
-  
+
   /**
-   * Returns a string representing the accelerator for the component, or 
+   * Returns a string representing the accelerator for the component, or
    * null if the component has no accelerator.
-   * 
+   *
    * @param c  the component.
-   * 
-   * @return A string representing the accelerator (possibly 
+   *
+   * @return A string representing the accelerator (possibly
    *         null).
    */
   private String fetchAcceleratorString(JComponent c)
@@ -240,19 +240,19 @@ public class MetalToolTipUI
             mne = button.getMnemonic();
           }
         if (mne > 0)
-          ks = KeyStroke.getKeyStroke(Character.toUpperCase((char) mne), 
+          ks = KeyStroke.getKeyStroke(Character.toUpperCase((char) mne),
                 InputEvent.ALT_MASK, false);
         if (ks != null)
           result = acceleratorToString(ks);
       }
     return result;
   }
-  
+
   /**
    * Returns a string representing an accelerator.
-   * 
+   *
    * @param accelerator  the accelerator (null not permitted).
-   * 
+   *
    * @return A string representing an accelerator.
    */
   private String acceleratorToString(KeyStroke accelerator)
@@ -262,9 +262,9 @@ public class MetalToolTipUI
     int modifiers = accelerator.getModifiers();
     char keyChar = accelerator.getKeyChar();
     int keyCode = accelerator.getKeyCode();
-    
+
     if (modifiers != 0)
-      modifiersText = KeyEvent.getKeyModifiersText(modifiers) 
+      modifiersText = KeyEvent.getKeyModifiersText(modifiers)
           + acceleratorDelimiter;
 
     if (keyCode == KeyEvent.VK_UNDEFINED)
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java b/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
index ed1e5b4d825..bdfa2d4f68c 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalTreeUI.java
@@ -69,7 +69,7 @@ public class MetalTreeUI extends BasicTreeUI
       if (e.getPropertyName().equals(LINE_STYLE_PROPERTY))
         decodeLineStyle(e.getNewValue());
     }
-      
+
   }
 
   /**
@@ -137,7 +137,7 @@ public class MetalTreeUI extends BasicTreeUI
   {
     return new MetalTreeUI();
   }
-  
+
   /**
    * The horizontal element of legs between nodes starts at the right of the
    * left-hand side of the child node by default. This method makes the
@@ -150,19 +150,19 @@ public class MetalTreeUI extends BasicTreeUI
 
   /**
    * Configures the specified component appropriate for the look and feel.
-   * This method is invoked when the ComponentUI instance is being installed 
-   * as the UI delegate on the specified component. This method should completely 
+   * This method is invoked when the ComponentUI instance is being installed
+   * as the UI delegate on the specified component. This method should completely
    * configure the component for the look and feel, including the following:
-   * 1. Install any default property values for color, fonts, borders, icons, 
+   * 1. Install any default property values for color, fonts, borders, icons,
    *    opacity, etc. on the component. Whenever possible, property values
    *    initialized by the client program should not be overridden.
    * 2. Install a LayoutManager on the component if necessary.
    * 3. Create/add any required sub-components to the component.
    * 4. Create/install event listeners on the component.
-   * 5. Create/install a PropertyChangeListener on the component in order 
+   * 5. Create/install a PropertyChangeListener on the component in order
    *    to detect and respond to component property changes appropriately.
    * 6. Install keyboard UI (mnemonics, traversal, etc.) on the component.
-   * 7. Initialize any appropriate instance data. 
+   * 7. Initialize any appropriate instance data.
    */
   public void installUI(JComponent c)
   {
@@ -174,21 +174,21 @@ public class MetalTreeUI extends BasicTreeUI
       lineStyleListener = new LineStyleListener();
     c.addPropertyChangeListener(lineStyleListener);
   }
-  
+
   /**
-   * Reverses configuration which was done on the specified component during 
-   * installUI. This method is invoked when this UIComponent instance is being 
-   * removed as the UI delegate for the specified component. This method should 
-   * undo the configuration performed in installUI, being careful to leave the 
-   * JComponent instance in a clean state (no extraneous listeners, 
-   * look-and-feel-specific property objects, etc.). This should include 
+   * Reverses configuration which was done on the specified component during
+   * installUI. This method is invoked when this UIComponent instance is being
+   * removed as the UI delegate for the specified component. This method should
+   * undo the configuration performed in installUI, being careful to leave the
+   * JComponent instance in a clean state (no extraneous listeners,
+   * look-and-feel-specific property objects, etc.). This should include
    * the following:
    * 1. Remove any UI-set borders from the component.
    * 2. Remove any UI-set layout managers on the component.
    * 3. Remove any UI-added sub-components from the component.
    * 4. Remove any UI-added event/property listeners from the component.
    * 5. Remove any UI-installed keyboard UI from the component.
-   * 6. Nullify any allocated instance data objects to allow for GC. 
+   * 6. Nullify any allocated instance data objects to allow for GC.
    */
   public void uninstallUI(JComponent c)
   {
@@ -197,13 +197,13 @@ public class MetalTreeUI extends BasicTreeUI
       c.removePropertyChangeListener(lineStyleListener);
     lineStyleListener = null;
   }
-  
+
   /**
    * This function converts between the string passed into the client
    * property and the internal representation (currently an int).
-   * 
+   *
    * @param lineStyleFlag - String representation
-   */     
+   */
   protected void decodeLineStyle(Object lineStyleFlag)
   {
     if (lineStyleFlag == null || lineStyleFlag.equals(LINE_STYLE_VALUE_ANGLED))
@@ -218,7 +218,7 @@ public class MetalTreeUI extends BasicTreeUI
 
   /**
    * Checks if the location is in expand control.
-   * 
+   *
    * @param row - current row
    * @param rowLevel - current level
    * @param mouseX - current x location of the mouse click
@@ -227,33 +227,33 @@ public class MetalTreeUI extends BasicTreeUI
   protected boolean isLocationInExpandControl(int row, int rowLevel,
                                           int mouseX, int mouseY)
   {
-    return super.isLocationInExpandControl(tree.getPathForRow(row), 
+    return super.isLocationInExpandControl(tree.getPathForRow(row),
                                            mouseX, mouseY);
   }
-  
+
   /**
-   * Paints the specified component appropriate for the look and feel. 
-   * This method is invoked from the ComponentUI.update method when the 
-   * specified component is being painted. Subclasses should override this 
-   * method and use the specified Graphics object to render the content of 
+   * Paints the specified component appropriate for the look and feel.
+   * This method is invoked from the ComponentUI.update method when the
+   * specified component is being painted. Subclasses should override this
+   * method and use the specified Graphics object to render the content of
    * the component.
-   * 
+   *
    * @param g - the current graphics configuration.
    * @param c - the current component to draw
    */
   public void paint(Graphics g, JComponent c)
   {
     // Calls BasicTreeUI's paint since it takes care of painting all
-    // types of icons. 
+    // types of icons.
     super.paint(g, c);
 
     if (lineStyle == LINE_STYLE_HORIZONTAL)
       paintHorizontalSeparators(g, c);
   }
-  
+
   /**
    * Paints the horizontal separators.
-   * 
+   *
    * @param g - the current graphics configuration.
    * @param c - the current component to draw
    */
@@ -282,14 +282,14 @@ public class MetalTreeUI extends BasicTreeUI
       }
   }
 
-  
+
   /**
-   * Paints the vertical part of the leg. The receiver should NOT modify 
+   * Paints the vertical part of the leg. The receiver should NOT modify
    * clipBounds, insets.
-   * 
+   *
    * @param g - the current graphics configuration.
    * @param clipBounds -
-   * @param insets - 
+   * @param insets -
    * @param path - the current path
    */
   protected void paintVerticalPartOfLeg(Graphics g, Rectangle clipBounds,
@@ -311,7 +311,7 @@ public class MetalTreeUI extends BasicTreeUI
                                         boolean isLeaf)
   {
     if (lineStyle == LINE_STYLE_ANGLED)
-      super.paintHorizontalPartOfLeg(g, clipBounds, insets, bounds, path, row, 
+      super.paintHorizontalPartOfLeg(g, clipBounds, insets, bounds, path, row,
                                      isExpanded, hasBeenExpanded, isLeaf);
   }
 }
diff --git a/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java b/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
index 0c3a38d5cc3..247f92265f1 100644
--- a/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
+++ b/libjava/classpath/javax/swing/plaf/metal/MetalUtils.java
@@ -180,7 +180,7 @@ class MetalUtils
   {
     paintGradient(g, x, y, w, h, dir, uiProp, null);
   }
-  
+
   /**
    * Paints the typical Metal gradient. See {@link #paintGradient(Graphics,
    * int, int, int, int, float, float, Color, Color, Color, int, int[][])}
@@ -216,14 +216,14 @@ class MetalUtils
   /**
    * Paints the typical Metal gradient. The gradient is painted as follows:
    * 
                      -   * 
+   *
    * +-------+--------+--------+-----------------------------+
    * |       |        |        |                             |
    * +-------+--------+--------+-----------------------------+
    * c1  ->  c2  --   c2  ->   c1         -------->          c3
    * < -g1- > < -g2- > < -g1- >
    * 
                      
-   * 
+   *
    * There are 4 distinct areas in this gradient:
    * 
                        
    * 
                      1. A gradient from color 1 to color 2 with the relative width specified
@@ -306,7 +306,7 @@ class MetalUtils
                                       float g1, float g2, Color c1, Color c2,
                                       Color c3, int[][] mask)
   {
-    
+
     if (g instanceof Graphics2D
         && SystemProperties.getProperty("gnu.javax.swing.noGraphics2D") == null)
       {
diff --git a/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java b/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
index 1ea0bc24385..6a6a3f5aae7 100644
--- a/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
+++ b/libjava/classpath/javax/swing/plaf/metal/OceanTheme.java
@@ -130,19 +130,19 @@ public class OceanTheme extends DefaultMetalTheme
 
   /**
    * Returns the OceanTheme's color for disabled menu foreground,
-   * 
+   *
    */
   public ColorUIResource getMenuDisabledForeground()
   {
     return INACTIVE_CONTROL_TEXT;
   }
 
-  
+
   /**
    * Returns the OceanTheme's color for black, the RGB value
    * (51, 51, 51).
    *
-   * @return Returns the OceanTheme's value for black 
+   * @return Returns the OceanTheme's value for black
    */
   protected ColorUIResource getBlack()
   {
@@ -157,7 +157,7 @@ public class OceanTheme extends DefaultMetalTheme
   {
     return PRIMARY1;
   }
-  
+
   /**
    * Return the OceanTheme's value for primary 2, the RGB value
    * (163, 184, 204).
@@ -166,7 +166,7 @@ public class OceanTheme extends DefaultMetalTheme
   {
     return PRIMARY2;
   }
-  
+
   /**
    * Return the OceanTheme's value for primary 1, the RGB value
    * (184, 207, 229).
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
index ac2a5fa918a..044f6514161 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiButtonUI.java
@@ -53,32 +53,32 @@ import javax.swing.plaf.ComponentUI;
  * A UI delegate that that coordinates multiple {@link ButtonUI} instances, one
  * from the primary look and feel, and one or more from the auxiliary look and
  * feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiButtonUI extends ButtonUI 
+public class MultiButtonUI extends ButtonUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiButtonUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiButtonUI() 
+  public MultiButtonUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiButtonUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiButtonUI extends ButtonUI
     MultiButtonUI mui = new MultiButtonUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiButtonUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiButtonUI extends ButtonUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiButtonUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiButtonUI extends ButtonUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiButtonUI.  The first item in the array is always 
+   * MultiButtonUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiButtonUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiButtonUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiButtonUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiButtonUI extends ButtonUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiButtonUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiButtonUI extends ButtonUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiButtonUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiButtonUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiButtonUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiButtonUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiButtonUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiButtonUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiButtonUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiButtonUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiButtonUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiButtonUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiButtonUI extends ButtonUI
       }
     return result;
   }
-  
-}
\ No newline at end of file
+
+}
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
index 8adb9500bb0..1a968492896 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiColorChooserUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ColorChooserUI;
 import javax.swing.plaf.ComponentUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ColorChooserUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ColorChooserUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiColorChooserUI extends ColorChooserUI 
+public class MultiColorChooserUI extends ColorChooserUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiColorChooserUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiColorChooserUI() 
+  public MultiColorChooserUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
-   * look and feels support this component, a MultiColorChooserUI 
+   * Creates a delegate object for the specified component.  If any auxiliary
+   * look and feels support this component, a MultiColorChooserUI
    * is returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiColorChooserUI extends ColorChooserUI
     MultiColorChooserUI mui = new MultiColorChooserUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-    
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiColorChooserUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiColorChooserUI extends ColorChooserUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiColorChooserUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiColorChooserUI extends ColorChooserUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiColorChooserUI.  The first item in the array is always 
+   * MultiColorChooserUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiColorChooserUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiColorChooserUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiColorChooserUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiColorChooserUI extends ColorChooserUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiColorChooserUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiColorChooserUI extends ColorChooserUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiColorChooserUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiColorChooserUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiColorChooserUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiColorChooserUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiColorChooserUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiColorChooserUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiColorChooserUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiColorChooserUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiColorChooserUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiColorChooserUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiColorChooserUI extends ColorChooserUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
index 33b432152bf..f1698739911 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiComboBoxUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComboBoxUI;
 import javax.swing.plaf.ComponentUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ComboBoxUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ComboBoxUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiComboBoxUI extends ComboBoxUI 
+public class MultiComboBoxUI extends ComboBoxUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiComboBoxUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiComboBoxUI() 
+  public MultiComboBoxUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
-   * look and feels support this component, a MultiComboBoxUI 
+   * Creates a delegate object for the specified component.  If any auxiliary
+   * look and feels support this component, a MultiComboBoxUI
    * is returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiComboBoxUI extends ComboBoxUI
     MultiComboBoxUI mui = new MultiComboBoxUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-    
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiComboBoxUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiComboBoxUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiComboBoxUI extends ComboBoxUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiComboBoxUI.  The first item in the array is always 
+   * MultiComboBoxUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiComboBoxUI extends ComboBoxUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiComboBoxUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -183,9 +183,9 @@ public class MultiComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiComboBoxUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -198,24 +198,24 @@ public class MultiComboBoxUI extends ComboBoxUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,25 +227,25 @@ public class MultiComboBoxUI extends ComboBoxUI
         /* Dimension ignored = */ ui.getPreferredSize(c);
       }
     return result;
-  } 
-  
+  }
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiComboBoxUI extends ComboBoxUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiComboBoxUI extends ComboBoxUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiComboBoxUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiComboBoxUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiComboBoxUI extends ComboBoxUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiComboBoxUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiComboBoxUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -349,15 +349,15 @@ public class MultiComboBoxUI extends ComboBoxUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComboBoxUI#setPopupVisible(JComboBox, boolean)} method 
+   * Calls the {@link ComboBoxUI#setPopupVisible(JComboBox, boolean)} method
    * for all the UI delegates managed by this MultiComboBoxUI.
-   * 
+   *
    * @param c  the component.
    * @param visible  the visible state.
    */
-  public void setPopupVisible(JComboBox c, boolean visible) 
+  public void setPopupVisible(JComboBox c, boolean visible)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -368,21 +368,21 @@ public class MultiComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Calls the {@link ComboBoxUI#isPopupVisible(JComboBox)} method for all 
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComboBoxUI#isPopupVisible(JComboBox)} method for all
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The result for the UI delegate from the primary look and feel.  
+   *
+   * @return The result for the UI delegate from the primary look and feel.
    */
-  public boolean isPopupVisible(JComboBox c) 
+  public boolean isPopupVisible(JComboBox c)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComboBoxUI ui = (ComboBoxUI) iterator.next();
         result = ui.isPopupVisible(c);
@@ -397,23 +397,23 @@ public class MultiComboBoxUI extends ComboBoxUI
   }
 
   /**
-   * Calls the {@link ComboBoxUI#isFocusTraversable(JComboBox)} method for all 
-   * the UI delegates managed by this MultiComboBoxUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComboBoxUI#isFocusTraversable(JComboBox)} method for all
+   * the UI delegates managed by this MultiComboBoxUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
+   *
    * @return true if the combo box is traversable according to the
-   *         UI delegate in the primary look and feel, and false 
-   *         otherwise. 
+   *         UI delegate in the primary look and feel, and false
+   *         otherwise.
    */
-  public boolean isFocusTraversable(JComboBox c) 
+  public boolean isFocusTraversable(JComboBox c)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComboBoxUI ui = (ComboBoxUI) iterator.next();
         result = ui.isFocusTraversable(c);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
index 186ce32fe24..091566ecfa7 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopIconUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.DesktopIconUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link DesktopIconUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link DesktopIconUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiDesktopIconUI extends DesktopIconUI 
+public class MultiDesktopIconUI extends DesktopIconUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiDesktopIconUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiDesktopIconUI() 
+  public MultiDesktopIconUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiDesktopIconUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiDesktopIconUI extends DesktopIconUI
     MultiDesktopIconUI mui = new MultiDesktopIconUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiDesktopIconUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiDesktopIconUI extends DesktopIconUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiDesktopIconUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiDesktopIconUI extends DesktopIconUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiDesktopIconUI.  The first item in the array is always 
+   * MultiDesktopIconUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiDesktopIconUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiDesktopIconUI extends DesktopIconUI
       }
     return result;
   }
-    
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiDesktopIconUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiDesktopIconUI extends DesktopIconUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiDesktopIconUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopIconUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -226,25 +226,25 @@ public class MultiDesktopIconUI extends DesktopIconUI
         /* Dimension ignored = */ ui.getPreferredSize(c);
       }
     return result;
-  }  
-  
+  }
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopIconUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopIconUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiDesktopIconUI extends DesktopIconUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiDesktopIconUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiDesktopIconUI extends DesktopIconUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiDesktopIconUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiDesktopIconUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiDesktopIconUI extends DesktopIconUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
index d48fb2b0185..fb62257b81c 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiDesktopPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.DesktopPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link DesktopPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link DesktopPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiDesktopPaneUI extends DesktopPaneUI 
+public class MultiDesktopPaneUI extends DesktopPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiDesktopPaneUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiDesktopPaneUI() 
+  public MultiDesktopPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiDesktopPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
     MultiDesktopPaneUI mui = new MultiDesktopPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiDesktopPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiDesktopPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiDesktopPaneUI.  The first item in the array is always 
+   * MultiDesktopPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiDesktopPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiDesktopPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiDesktopPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiDesktopPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiDesktopPaneUI extends DesktopPaneUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
index 719f0437497..2ab8841f9ec 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiFileChooserUI.java
@@ -54,35 +54,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.FileChooserUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link FileChooserUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link FileChooserUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiFileChooserUI extends FileChooserUI 
+public class MultiFileChooserUI extends FileChooserUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiFileChooserUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiFileChooserUI() 
+  public MultiFileChooserUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiFileChooserUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -90,11 +90,11 @@ public class MultiFileChooserUI extends FileChooserUI
     MultiFileChooserUI mui = new MultiFileChooserUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiFileChooserUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -108,9 +108,9 @@ public class MultiFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiFileChooserUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -122,39 +122,39 @@ public class MultiFileChooserUI extends FileChooserUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiFileChooserUI.  The first item in the array is always 
+   * MultiFileChooserUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiFileChooserUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiFileChooserUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -167,11 +167,11 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiFileChooserUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -186,9 +186,9 @@ public class MultiFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiFileChooserUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -201,24 +201,24 @@ public class MultiFileChooserUI extends FileChooserUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiFileChooserUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiFileChooserUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -231,24 +231,24 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiFileChooserUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiFileChooserUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -261,24 +261,24 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiFileChooserUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiFileChooserUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -291,24 +291,24 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -321,25 +321,25 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -352,24 +352,24 @@ public class MultiFileChooserUI extends FileChooserUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link FileChooserUI#getAcceptAllFileFilter(JFileChooser)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the filter for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the filter for the UI delegate from the primary look and
+   * feel.
+   *
    * @param chooser  the file chooser.
-   * 
-   * @return The filter returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The filter returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public FileFilter getAcceptAllFileFilter(JFileChooser chooser) 
+  public FileFilter getAcceptAllFileFilter(JFileChooser chooser)
   {
     FileFilter result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         FileChooserUI ui = (FileChooserUI) iterator.next();
         result = ui.getAcceptAllFileFilter(chooser);
@@ -385,21 +385,21 @@ public class MultiFileChooserUI extends FileChooserUI
 
   /**
    * Calls the {@link FileChooserUI#getFileView(JFileChooser)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the view for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the view for the UI delegate from the primary look and
+   * feel.
+   *
    * @param chooser  the file chooser.
-   * 
-   * @return The view returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The view returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public FileView getFileView(JFileChooser chooser) 
+  public FileView getFileView(JFileChooser chooser)
   {
     FileView result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         FileChooserUI ui = (FileChooserUI) iterator.next();
         result = ui.getFileView(chooser);
@@ -415,21 +415,21 @@ public class MultiFileChooserUI extends FileChooserUI
 
   /**
    * Calls the {@link FileChooserUI#getApproveButtonText(JFileChooser)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the text for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the text for the UI delegate from the primary look and
+   * feel.
+   *
    * @param chooser  the file chooser.
-   * 
-   * @return The text returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The text returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public String getApproveButtonText(JFileChooser chooser) 
+  public String getApproveButtonText(JFileChooser chooser)
   {
     String result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         FileChooserUI ui = (FileChooserUI) iterator.next();
         result = ui.getApproveButtonText(chooser);
@@ -445,21 +445,21 @@ public class MultiFileChooserUI extends FileChooserUI
 
   /**
    * Calls the {@link FileChooserUI#getDialogTitle(JFileChooser)} method
-   * for all the UI delegates managed by this MultiFileChooserUI, 
-   * returning the title for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiFileChooserUI,
+   * returning the title for the UI delegate from the primary look and
+   * feel.
+   *
    * @param chooser  the file chooser.
-   * 
-   * @return The title returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The title returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public String getDialogTitle(JFileChooser chooser) 
+  public String getDialogTitle(JFileChooser chooser)
   {
     String result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         FileChooserUI ui = (FileChooserUI) iterator.next();
         result = ui.getDialogTitle(chooser);
@@ -474,13 +474,13 @@ public class MultiFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Calls the {@link FileChooserUI#rescanCurrentDirectory(JFileChooser)} 
-   * method for all the UI delegates managed by this 
+   * Calls the {@link FileChooserUI#rescanCurrentDirectory(JFileChooser)}
+   * method for all the UI delegates managed by this
    * MultiFileChooserUI.
-   * 
+   *
    * @param chooser  the file chooser.
    */
-  public void rescanCurrentDirectory(JFileChooser chooser) 
+  public void rescanCurrentDirectory(JFileChooser chooser)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -491,14 +491,14 @@ public class MultiFileChooserUI extends FileChooserUI
   }
 
   /**
-   * Calls the {@link FileChooserUI#ensureFileIsVisible(JFileChooser, File)} 
-   * method for all the UI delegates managed by this 
+   * Calls the {@link FileChooserUI#ensureFileIsVisible(JFileChooser, File)}
+   * method for all the UI delegates managed by this
    * MultiFileChooserUI.
-   * 
+   *
    * @param chooser  the file chooser.
    * @param file  the file.
    */
-  public void ensureFileIsVisible(JFileChooser chooser, File file) 
+  public void ensureFileIsVisible(JFileChooser chooser, File file)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
index 01d1df6a124..37b2ee3af26 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiInternalFrameUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.InternalFrameUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link InternalFrameUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link InternalFrameUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiInternalFrameUI extends InternalFrameUI 
+public class MultiInternalFrameUI extends InternalFrameUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiInternalFrameUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiInternalFrameUI() 
+  public MultiInternalFrameUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
-   * look and feels support this component, a MultiInternalFrameUI 
+   * Creates a delegate object for the specified component.  If any auxiliary
+   * look and feels support this component, a MultiInternalFrameUI
    * is returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,12 +86,12 @@ public class MultiInternalFrameUI extends InternalFrameUI
     MultiInternalFrameUI mui = new MultiInternalFrameUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
-  
+
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiInternalFrameUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiInternalFrameUI extends InternalFrameUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiInternalFrameUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiInternalFrameUI extends InternalFrameUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiInternalFrameUI.  The first item in the array is always 
+   * MultiInternalFrameUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiInternalFrameUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiInternalFrameUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -183,9 +183,9 @@ public class MultiInternalFrameUI extends InternalFrameUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiInternalFrameUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -198,24 +198,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiInternalFrameUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -228,24 +228,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiInternalFrameUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiInternalFrameUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiInternalFrameUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiInternalFrameUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiInternalFrameUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -349,5 +349,5 @@ public class MultiInternalFrameUI extends InternalFrameUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
index ba5b9d47380..2f0e7d06ec6 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiLabelUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.LabelUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link LabelUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link LabelUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiLabelUI extends LabelUI 
+public class MultiLabelUI extends LabelUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiLabelUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiLabelUI() 
+  public MultiLabelUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiLabelUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiLabelUI extends LabelUI
     MultiLabelUI mui = new MultiLabelUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiLabelUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiLabelUI extends LabelUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiLabelUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiLabelUI extends LabelUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiLabelUI.  The first item in the array is always 
+   * MultiLabelUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiLabelUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiLabelUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiLabelUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiLabelUI extends LabelUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiLabelUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiLabelUI extends LabelUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiLabelUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiLabelUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiLabelUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiLabelUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiLabelUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiLabelUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiLabelUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiLabelUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiLabelUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiLabelUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiLabelUI extends LabelUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
index 78c22419f34..d6b77f5b42f 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiListUI.java
@@ -53,35 +53,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ListUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ListUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ListUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiListUI extends ListUI 
+public class MultiListUI extends ListUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiListUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiListUI() 
+  public MultiListUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiListUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -89,11 +89,11 @@ public class MultiListUI extends ListUI
     MultiListUI mui = new MultiListUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-    
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiListUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -107,9 +107,9 @@ public class MultiListUI extends ListUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiListUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -121,39 +121,39 @@ public class MultiListUI extends ListUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiListUI.  The first item in the array is always 
+   * MultiListUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiListUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiListUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -166,11 +166,11 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiListUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -185,9 +185,9 @@ public class MultiListUI extends ListUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiListUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -200,24 +200,24 @@ public class MultiListUI extends ListUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -230,24 +230,24 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -260,24 +260,24 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -290,24 +290,24 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiListUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiListUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -320,25 +320,25 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiListUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiListUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -351,25 +351,25 @@ public class MultiListUI extends ListUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ListUI#locationToIndex(JList, Point)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the index for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the index for the UI delegate from the primary look and
+   * feel.
+   *
    * @param list  the list.
    * @param location  the location.
-   * 
-   * @return The index returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The index returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int locationToIndex(JList list, Point location) 
+  public int locationToIndex(JList list, Point location)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ListUI ui = (ListUI) iterator.next();
         result = ui.locationToIndex(list, location);
@@ -385,22 +385,22 @@ public class MultiListUI extends ListUI
 
   /**
    * Calls the {@link ListUI#indexToLocation(JList, int)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the location for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the location for the UI delegate from the primary look and
+   * feel.
+   *
    * @param list  the list.
    * @param index  the index.
-   * 
-   * @return The location returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The location returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public Point indexToLocation(JList list, int index) 
+  public Point indexToLocation(JList list, int index)
   {
     Point result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ListUI ui = (ListUI) iterator.next();
         result = ui.indexToLocation(list, index);
@@ -416,23 +416,23 @@ public class MultiListUI extends ListUI
 
   /**
    * Calls the {@link ListUI#getCellBounds(JList, int, int)} method for all
-   * the UI delegates managed by this MultiListUI, 
-   * returning the bounds for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiListUI,
+   * returning the bounds for the UI delegate from the primary look and
+   * feel.
+   *
    * @param list  the list.
    * @param index1  the first index.
    * @param index2  the second index.
-   * 
-   * @return The bounds returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The bounds returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public Rectangle getCellBounds(JList list, int index1, int index2) 
+  public Rectangle getCellBounds(JList list, int index1, int index2)
   {
     Rectangle result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ListUI ui = (ListUI) iterator.next();
         result = ui.getCellBounds(list, index1, index2);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java b/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
index 12351655a04..4e81fd0546c 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiLookAndFeel.java
@@ -49,7 +49,7 @@ import javax.swing.plaf.ComponentUI;
  * A look and feel that provides the ability to use auxiliary look and feels
  * in addition to the primary look and feel.
  */
-public class MultiLookAndFeel extends LookAndFeel 
+public class MultiLookAndFeel extends LookAndFeel
 {
 
   /**
@@ -59,62 +59,62 @@ public class MultiLookAndFeel extends LookAndFeel
   {
     // Nothing to do here.
   }
-  
+
   /**
    * Returns the name for the look and feel.
-   * 
+   *
    * @return "Multiplexing Look and Feel".
    */
   public String getName()
   {
     return "Multiplexing Look and Feel";
   }
-  
+
   /**
    * Returns an identifier for the look and feel.
-   * 
+   *
    * @return "Multiplex".
    */
   public String getID()
   {
-    return "Multiplex"; 
+    return "Multiplex";
   }
-  
+
   /**
    * Returns a description of the look and feel.
-   * 
+   *
    * @return A description of the look and feel.
    */
   public String getDescription()
   {
-    return "Allows multiple UI instances per component instance";    
+    return "Allows multiple UI instances per component instance";
   }
-  
+
   /**
-   * Returns false to indicate that this look and feel is not 
+   * Returns false to indicate that this look and feel is not
    * native to any platform.
-   * 
+   *
    * @return false.
    */
   public boolean isNativeLookAndFeel()
   {
-    return false;    
+    return false;
   }
 
   /**
    * Returns true always, since this look and feel is supported on
    * all platforms.
-   * 
+   *
    * @return true.
    */
   public boolean isSupportedLookAndFeel()
   {
     return true;
   }
-  
+
   /**
    * Creates and returns the UI defaults for this look and feel.
-   * 
+   *
    * @return The UI defaults.
    */
   public UIDefaults getDefaults()
@@ -123,7 +123,7 @@ public class MultiLookAndFeel extends LookAndFeel
     defaults.put("ButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
     defaults.put("CheckBoxUI", "javax.swing.plaf.multi.MultiButtonUI");
     defaults.put("CheckBoxMenuItemUI", "javax.swing.plaf.multi.MultiMenuItemUI");
-    defaults.put("ColorChooserUI", 
+    defaults.put("ColorChooserUI",
         "javax.swing.plaf.multi.MultiColorChooserUI");
     defaults.put("ComboBoxUI", "javax.swing.plaf.multi.MultiComboBoxUI");
     defaults.put("DesktopPaneUI", "javax.swing.plaf.multi.MultiDesktopPaneUI");
@@ -131,7 +131,7 @@ public class MultiLookAndFeel extends LookAndFeel
     defaults.put("EditorPaneUI", "javax.swing.plaf.multi.MultiTextUI");
     defaults.put("FileChooserUI", "javax.swing.plaf.multi.MultiFileChooserUI");
     defaults.put("FormattedTextFieldUI", "javax.swing.plaf.multi.MultiTextUI");
-    defaults.put("InternalFrameUI", 
+    defaults.put("InternalFrameUI",
         "javax.swing.plaf.multi.MultiInternalFrameUI");
     defaults.put("LabelUI", "javax.swing.plaf.multi.MultiLabelUI");
     defaults.put("ListUI", "javax.swing.plaf.multi.MultiListUI");
@@ -142,11 +142,11 @@ public class MultiLookAndFeel extends LookAndFeel
     defaults.put("PanelUI", "javax.swing.plaf.multi.MultiPanelUI");
     defaults.put("PasswordFieldUI", "javax.swing.plaf.multi.MultiTextUI");
     defaults.put("PopupMenuUI", "javax.swing.plaf.multi.MultiPopupMenuUI");
-    defaults.put("PopupMenuSeparatorUI", 
+    defaults.put("PopupMenuSeparatorUI",
         "javax.swing.plaf.multi.MultiSeparatorUI");
     defaults.put("ProgressBarUI", "javax.swing.plaf.multi.MultiProgressBarUI");
     defaults.put("RadioButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
-    defaults.put("RadioButtonMenuItemUI", 
+    defaults.put("RadioButtonMenuItemUI",
         "javax.swing.plaf.multi.MultiMenuItemUI");
     defaults.put("RootPaneUI", "javax.swing.plaf.multi.MultiRootPaneUI");
     defaults.put("ScrollBarUI", "javax.swing.plaf.multi.MultiScrollBarUI");
@@ -162,43 +162,43 @@ public class MultiLookAndFeel extends LookAndFeel
     defaults.put("TextFieldUI", "javax.swing.plaf.multi.MultiTextUI");
     defaults.put("TextPaneUI", "javax.swing.plaf.multi.MultiTextUI");
     defaults.put("ToggleButtonUI", "javax.swing.plaf.multi.MultiButtonUI");
-    defaults.put("ToolBarSeparatorUI", 
+    defaults.put("ToolBarSeparatorUI",
         "javax.swing.plaf.multi.MultiSeparatorUI");
     defaults.put("ToolBarUI", "javax.swing.plaf.multi.MultiToolBarUI");
     defaults.put("ToolTipUI", "javax.swing.plaf.multi.MultiToolTipUI");
     defaults.put("ViewportUI", "javax.swing.plaf.multi.MultiViewportUI");
     return defaults;
   }
-  
+
   /**
    * Creates the UI delegates for the target component and
    * returns a multiplexing UI delegate (mui) if there are
    * multiple delegates.
-   * 
+   *
    * @param mui  a multiplexing UI delegate appropriate for the component.
    * @param uis  a vector into which the UI delegates will be added.
    * @param target  the target component.
-   * 
+   *
    * @return A UI delegate.
    */
-  public static ComponentUI createUIs(ComponentUI mui, Vector uis, 
+  public static ComponentUI createUIs(ComponentUI mui, Vector uis,
                                       JComponent target)
   {
     // get primary UI delegate for 'target', and add it to uis
     ComponentUI ui = null;
     LookAndFeel primary = UIManager.getLookAndFeel();
-    if (primary != null) 
+    if (primary != null)
     {
       ui = UIManager.getUI(target);
       uis.add(ui);
     }
-    // for any auxiliary look and feels in use, get the UI delegate and add 
+    // for any auxiliary look and feels in use, get the UI delegate and add
     // it to uis
     LookAndFeel[] auxlafs = UIManager.getAuxiliaryLookAndFeels();
     for (int i = 0; i < auxlafs.length; i++)
     {
       LookAndFeel auxlaf = auxlafs[i];
-      // FIXME: here I call getDefaults() to get the UI delegate from the 
+      // FIXME: here I call getDefaults() to get the UI delegate from the
       // auxiliary look and feel.  But getDefaults() creates a new set of
       // defaults every time it is called, which is wasteful.  Unfortunately
       // I cannot find another way to get the UI delegate, so I'm doing it
@@ -208,36 +208,36 @@ public class MultiLookAndFeel extends LookAndFeel
       if (ui != null)
         uis.add(ui);
     }
-    // if uis contains more than 1 delegate, return mui, otherwise return 
+    // if uis contains more than 1 delegate, return mui, otherwise return
     // the primary delegate
     if (uis.size() > 1)
       return mui;
     else
-      return ui;    
+      return ui;
   }
-  
+
   /**
    * Returns an array containing the same {@link ComponentUI} instances as
    * uis.  If uis is null, a zero-length
    * array is returned.
-   * 
-   * @param uis  a list of {@link ComponentUI} references (null 
+   *
+   * @param uis  a list of {@link ComponentUI} references (null
    *             permitted).
-   * 
+   *
    * @return An array containing the same {@link ComponentUI} instances as
    *         uis, or null if uis is
-   *         empty.  
+   *         empty.
    */
   protected static ComponentUI[] uisToArray(Vector uis)
   {
-    if (uis == null) 
+    if (uis == null)
       return new ComponentUI[0];
     int size = uis.size();
-    if (size == 0) 
+    if (size == 0)
       return null;
     ComponentUI[] result = new ComponentUI[size];
     uis.copyInto(result);
-    return result;    
+    return result;
   }
 
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
index a8e805af1d4..5b43f6bd87c 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiMenuBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.MenuBarUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link MenuBarUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link MenuBarUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiMenuBarUI extends MenuBarUI 
+public class MultiMenuBarUI extends MenuBarUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiMenuBarUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiMenuBarUI() 
+  public MultiMenuBarUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiMenuBarUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiMenuBarUI extends MenuBarUI
     MultiMenuBarUI mui = new MultiMenuBarUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiMenuBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiMenuBarUI extends MenuBarUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiMenuBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiMenuBarUI extends MenuBarUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiMenuBarUI.  The first item in the array is always 
+   * MultiMenuBarUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiMenuBarUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiMenuBarUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiMenuBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiMenuBarUI extends MenuBarUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiMenuBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiMenuBarUI extends MenuBarUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuBarUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuBarUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuBarUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuBarUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuBarUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuBarUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiMenuBarUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiMenuBarUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiMenuBarUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiMenuBarUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiMenuBarUI extends MenuBarUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
index ccab5feec9f..6d361b08601 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiMenuItemUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.MenuItemUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link MenuItemUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link MenuItemUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiMenuItemUI extends MenuItemUI 
+public class MultiMenuItemUI extends MenuItemUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiMenuItemUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiMenuItemUI() 
+  public MultiMenuItemUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiItemUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiMenuItemUI extends MenuItemUI
     MultiMenuItemUI mui = new MultiMenuItemUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiMenuItemUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiMenuItemUI extends MenuItemUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiMenuItemUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiMenuItemUI extends MenuItemUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiMenuItemUI.  The first item in the array is always 
+   * MultiMenuItemUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiMenuItemUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiMenuItemUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiMenuItemUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiMenuItemUI extends MenuItemUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiMenuItemUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiMenuItemUI extends MenuItemUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuItemUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuItemUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuItemUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuItemUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiMenuItemUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiMenuItemUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiMenuItemUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiMenuItemUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiMenuItemUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiMenuItemUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiMenuItemUI extends MenuItemUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
index 8d6f3861cff..eaa4a4257f0 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiOptionPaneUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.OptionPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link OptionPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link OptionPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiOptionPaneUI extends OptionPaneUI 
+public class MultiOptionPaneUI extends OptionPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiOptionPaneUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiOptionPaneUI() 
+  public MultiOptionPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiOptionPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiOptionPaneUI extends OptionPaneUI
     MultiOptionPaneUI mui = new MultiOptionPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiOptionPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiOptionPaneUI extends OptionPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiOptionPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiOptionPaneUI extends OptionPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiOptionPaneUI.  The first item in the array is always 
+   * MultiOptionPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiOptionPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiOptionPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -183,9 +183,9 @@ public class MultiOptionPaneUI extends OptionPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiOptionPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -198,24 +198,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiOptionPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -228,24 +228,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiOptionPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiOptionPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiOptionPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiOptionPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiOptionPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -349,14 +349,14 @@ public class MultiOptionPaneUI extends OptionPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link OptionPaneUI#selectInitialValue(JOptionPane)} method for
    * all the UI delegates managed by this MultiOptionPaneUI.
-   * 
+   *
    * @param pane  the option pane.
    */
-  public void selectInitialValue(JOptionPane pane) 
+  public void selectInitialValue(JOptionPane pane)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -367,21 +367,21 @@ public class MultiOptionPaneUI extends OptionPaneUI
   }
 
   /**
-   * Calls the {@link OptionPaneUI#containsCustomComponents(JOptionPane)} 
-   * method for all the UI delegates managed by this 
-   * MultiOptionPaneUI, returning the result for the UI delegate 
-   * from the primary look and feel. 
-   * 
+   * Calls the {@link OptionPaneUI#containsCustomComponents(JOptionPane)}
+   * method for all the UI delegates managed by this
+   * MultiOptionPaneUI, returning the result for the UI delegate
+   * from the primary look and feel.
+   *
    * @param pane  the option pane.
-   * 
-   * @return The result for the UI delegate from the primary look and feel. 
+   *
+   * @return The result for the UI delegate from the primary look and feel.
    */
-  public boolean containsCustomComponents(JOptionPane pane) 
+  public boolean containsCustomComponents(JOptionPane pane)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         OptionPaneUI ui = (OptionPaneUI) iterator.next();
         result = ui.containsCustomComponents(pane);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
index 67629b2feba..7b84599d010 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiPanelUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.PanelUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link PanelUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link PanelUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiPanelUI extends PanelUI 
+public class MultiPanelUI extends PanelUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiPanelUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiPanelUI() 
+  public MultiPanelUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiPanelUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiPanelUI extends PanelUI
     MultiPanelUI mui = new MultiPanelUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiPanelUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiPanelUI extends PanelUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiPanelUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiPanelUI extends PanelUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiPanelUI.  The first item in the array is always 
+   * MultiPanelUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiPanelUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiPanelUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiPanelUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiPanelUI extends PanelUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiPanelUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiPanelUI extends PanelUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPanelUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPanelUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPanelUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPanelUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPanelUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPanelUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiPanelUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiPanelUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiPanelUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiPanelUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiPanelUI extends PanelUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
index 161429d296f..0afaaf74ee5 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiPopupMenuUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.PopupMenuUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link PopupMenuUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link PopupMenuUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiPopupMenuUI extends PopupMenuUI 
+public class MultiPopupMenuUI extends PopupMenuUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiPopupMenuUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiPopupMenuUI() 
+  public MultiPopupMenuUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiPopupMenuUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiPopupMenuUI extends PopupMenuUI
     MultiPopupMenuUI mui = new MultiPopupMenuUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiPopupMenuUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiPopupMenuUI extends PopupMenuUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiPopupMenuUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiPopupMenuUI extends PopupMenuUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiPopupMenuUI.  The first item in the array is always 
+   * MultiPopupMenuUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiPopupMenuUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiPopupMenuUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiPopupMenuUI extends PopupMenuUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiPopupMenuUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPopupMenuUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPopupMenuUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiPopupMenuUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiPopupMenuUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiPopupMenuUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiPopupMenuUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiPopupMenuUI extends PopupMenuUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
index c5dbbe815ae..0395bdd2d3f 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiProgressBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ProgressBarUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ProgressBarUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ProgressBarUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiProgressBarUI extends ProgressBarUI 
+public class MultiProgressBarUI extends ProgressBarUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiProgressBarUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiProgressBarUI() 
+  public MultiProgressBarUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiProgressBarUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiProgressBarUI extends ProgressBarUI
     MultiProgressBarUI mui = new MultiProgressBarUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiProgressBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiProgressBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiProgressBarUI extends ProgressBarUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiProgressBarUI.  The first item in the array is always 
+   * MultiProgressBarUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiProgressBarUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiProgressBarUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiProgressBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiProgressBarUI extends ProgressBarUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiProgressBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiProgressBarUI extends ProgressBarUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiProgressBarUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiProgressBarUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiProgressBarUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiProgressBarUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiProgressBarUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiProgressBarUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiProgressBarUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiProgressBarUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiProgressBarUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiProgressBarUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiProgressBarUI extends ProgressBarUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
index bd0cb5c1d1a..69c7ffe1bb4 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiRootPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.RootPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link RootPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link RootPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiRootPaneUI extends RootPaneUI 
+public class MultiRootPaneUI extends RootPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiRootPanelUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiRootPaneUI() 
+  public MultiRootPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiRootPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiRootPaneUI extends RootPaneUI
     MultiRootPaneUI mui = new MultiRootPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiRootPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiRootPaneUI extends RootPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiRootPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiRootPaneUI extends RootPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiRootPaneUI.  The first item in the array is always 
+   * MultiRootPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiRootPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiRootPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiRootPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiRootPaneUI extends RootPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiRootPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiRootPaneUI extends RootPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiRootPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiRootPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
- 
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiRootPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiRootPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiRootPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiRootPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiRootPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiRootPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiRootPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiRootPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiRootPaneUI extends RootPaneUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
index 1a993b840b6..4ec8b3fca67 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiScrollBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ScrollBarUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ScrollBarUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ScrollBarUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiScrollBarUI extends ScrollBarUI 
+public class MultiScrollBarUI extends ScrollBarUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiScrollBarUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiScrollBarUI() 
+  public MultiScrollBarUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiScrollBarUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiScrollBarUI extends ScrollBarUI
     MultiScrollBarUI mui = new MultiScrollBarUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiScrollBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiScrollBarUI extends ScrollBarUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiScrollBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiScrollBarUI extends ScrollBarUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiScrollBarUI.  The first item in the array is always 
+   * MultiScrollBarUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiScrollBarUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiScrollBarUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiScrollBarUI extends ScrollBarUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiScrollBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiScrollBarUI extends ScrollBarUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiScrollBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiScrollBarUI extends ScrollBarUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollBarUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollBarUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -230,21 +230,21 @@ public class MultiScrollBarUI extends ScrollBarUI
 
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollBarUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollBarUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiScrollBarUI extends ScrollBarUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollBarUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollBarUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiScrollBarUI extends ScrollBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiScrollBarUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiScrollBarUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiScrollBarUI extends ScrollBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiScrollBarUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiScrollBarUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiScrollBarUI extends ScrollBarUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
index a50c3ba7f18..5a0bc1ebfe8 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiScrollPaneUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ScrollPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ScrollPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ScrollPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiScrollPaneUI extends ScrollPaneUI 
+public class MultiScrollPaneUI extends ScrollPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiScrollPaneUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiScrollPaneUI() 
+  public MultiScrollPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiScrollPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiScrollPaneUI extends ScrollPaneUI
     MultiScrollPaneUI mui = new MultiScrollPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiScrollPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiScrollPaneUI extends ScrollPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiScrollPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiScrollPaneUI.  The first item in the array is always 
+   * MultiScrollPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiScrollPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiScrollPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiScrollPaneUI extends ScrollPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiScrollPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiScrollPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiScrollPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiScrollPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiScrollPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiScrollPaneUI extends ScrollPaneUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
index f8e4feae7f3..fbd9712fe84 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSeparatorUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.SeparatorUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link MultiSeparatorUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link MultiSeparatorUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiSeparatorUI extends SeparatorUI 
+public class MultiSeparatorUI extends SeparatorUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiSeparatorUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiSeparatorUI() 
+  public MultiSeparatorUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiSeparatorUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSeparatorUI extends SeparatorUI
     MultiSeparatorUI mui = new MultiSeparatorUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiSeparatorUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSeparatorUI extends SeparatorUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiSeparatorUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSeparatorUI extends SeparatorUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiSeparatorUI.  The first item in the array is always 
+   * MultiSeparatorUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiSeparatorUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiSeparatorUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiSeparatorUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiSeparatorUI extends SeparatorUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiSeparatorUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiSeparatorUI extends SeparatorUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSeparatorUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSeparatorUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
- 
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSeparatorUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSeparatorUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSeparatorUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSeparatorUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiSeparatorUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSeparatorUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiSeparatorUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSeparatorUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSeparatorUI extends SeparatorUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
index 8a4aab6e041..cb896c54797 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSliderUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.SliderUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link SliderUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link SliderUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiSliderUI extends SliderUI 
+public class MultiSliderUI extends SliderUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiSliderUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiSliderUI() 
+  public MultiSliderUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiSliderUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSliderUI extends SliderUI
     MultiSliderUI mui = new MultiSliderUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-    
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiSliderUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSliderUI extends SliderUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiSliderUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSliderUI extends SliderUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiSliderUI.  The first item in the array is always 
+   * MultiSliderUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiSliderUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiSliderUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiSliderUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiSliderUI extends SliderUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiSliderUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiSliderUI extends SliderUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSliderUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSliderUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSliderUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSliderUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSliderUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSliderUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiSliderUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSliderUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiSliderUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSliderUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSliderUI extends SliderUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
index 70068e82a56..fd805f9cb01 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSpinnerUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.SpinnerUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link SpinnerUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link SpinnerUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiSpinnerUI extends SpinnerUI 
+public class MultiSpinnerUI extends SpinnerUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiSpinnerUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiSpinnerUI() 
+  public MultiSpinnerUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiSpinnerUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiSpinnerUI extends SpinnerUI
     MultiSpinnerUI mui = new MultiSpinnerUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiSpinnerUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiSpinnerUI extends SpinnerUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiSpinnerUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiSpinnerUI extends SpinnerUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiSpinnerUI.  The first item in the array is always 
+   * MultiSpinnerUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiSpinnerUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiSpinnerUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiSpinnerUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiSpinnerUI extends SpinnerUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiSpinnerUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiSpinnerUI extends SpinnerUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSpinnerUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSpinnerUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSpinnerUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSpinnerUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSpinnerUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSpinnerUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiSpinnerUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSpinnerUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiSpinnerUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSpinnerUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiSpinnerUI extends SpinnerUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
index 70ea4f13be1..1eb2e41f54e 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiSplitPaneUI.java
@@ -51,35 +51,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.SplitPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link SplitPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link SplitPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiSplitPaneUI extends SplitPaneUI 
+public class MultiSplitPaneUI extends SplitPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiSplitPaneUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiSplitPaneUI() 
+  public MultiSplitPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiSplitPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -87,11 +87,11 @@ public class MultiSplitPaneUI extends SplitPaneUI
     MultiSplitPaneUI mui = new MultiSplitPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -105,9 +105,9 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -119,39 +119,39 @@ public class MultiSplitPaneUI extends SplitPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiSplitPaneUI.  The first item in the array is always 
+   * MultiSplitPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiSplitPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -164,11 +164,11 @@ public class MultiSplitPaneUI extends SplitPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -183,9 +183,9 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -198,24 +198,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSplitPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -231,21 +231,21 @@ public class MultiSplitPaneUI extends SplitPaneUI
 
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSplitPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -258,24 +258,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSplitPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -288,24 +288,24 @@ public class MultiSplitPaneUI extends SplitPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSplitPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -318,25 +318,25 @@ public class MultiSplitPaneUI extends SplitPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiSplitPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -349,14 +349,14 @@ public class MultiSplitPaneUI extends SplitPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link SplitPaneUI#resetToPreferredSizes(JSplitPane)} method 
+   * Calls the {@link SplitPaneUI#resetToPreferredSizes(JSplitPane)} method
    * for all the UI delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param pane  the component.
    */
-  public void resetToPreferredSizes(JSplitPane pane) 
+  public void resetToPreferredSizes(JSplitPane pane)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -367,13 +367,13 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the {@link SplitPaneUI#setDividerLocation(JSplitPane, int)} method 
+   * Calls the {@link SplitPaneUI#setDividerLocation(JSplitPane, int)} method
    * for all the UI delegates managed by this MultiSplitPaneUI.
-   * 
+   *
    * @param pane  the component.
    * @param location  the location.
    */
-  public void setDividerLocation(JSplitPane pane, int location) 
+  public void setDividerLocation(JSplitPane pane, int location)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -385,21 +385,21 @@ public class MultiSplitPaneUI extends SplitPaneUI
 
   /**
    * Calls the {@link SplitPaneUI#getDividerLocation(JSplitPane)} method for all
-   * the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the location for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiSplitPaneUI,
+   * returning the location for the UI delegate from the primary look and
+   * feel.
+   *
    * @param pane  the component.
-   * 
-   * @return The location returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The location returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getDividerLocation(JSplitPane pane) 
+  public int getDividerLocation(JSplitPane pane)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         SplitPaneUI ui = (SplitPaneUI) iterator.next();
         result = ui.getDividerLocation(pane);
@@ -414,22 +414,22 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the {@link SplitPaneUI#getMinimumDividerLocation(JSplitPane)} method 
-   * for all the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the location for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link SplitPaneUI#getMinimumDividerLocation(JSplitPane)} method
+   * for all the UI delegates managed by this MultiSplitPaneUI,
+   * returning the location for the UI delegate from the primary look and
+   * feel.
+   *
    * @param pane  the component.
-   * 
-   * @return The location returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The location returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getMinimumDividerLocation(JSplitPane pane) 
+  public int getMinimumDividerLocation(JSplitPane pane)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         SplitPaneUI ui = (SplitPaneUI) iterator.next();
         result = ui.getMinimumDividerLocation(pane);
@@ -444,22 +444,22 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the {@link SplitPaneUI#getMaximumDividerLocation(JSplitPane)} method 
-   * for all the UI delegates managed by this MultiSplitPaneUI, 
-   * returning the location for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link SplitPaneUI#getMaximumDividerLocation(JSplitPane)} method
+   * for all the UI delegates managed by this MultiSplitPaneUI,
+   * returning the location for the UI delegate from the primary look and
+   * feel.
+   *
    * @param pane  the component.
-   * 
-   * @return The location returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The location returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getMaximumDividerLocation(JSplitPane pane) 
+  public int getMaximumDividerLocation(JSplitPane pane)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         SplitPaneUI ui = (SplitPaneUI) iterator.next();
         result = ui.getMaximumDividerLocation(pane);
@@ -474,14 +474,14 @@ public class MultiSplitPaneUI extends SplitPaneUI
   }
 
   /**
-   * Calls the {@link SplitPaneUI#finishedPaintingChildren(JSplitPane, 
-   * Graphics)} method for all the UI delegates managed by this 
+   * Calls the {@link SplitPaneUI#finishedPaintingChildren(JSplitPane,
+   * Graphics)} method for all the UI delegates managed by this
    * MultiSplitPaneUI.
-   * 
+   *
    * @param pane  the component.
    * @param g  the graphics device.
    */
-  public void finishedPaintingChildren(JSplitPane pane, Graphics g) 
+  public void finishedPaintingChildren(JSplitPane pane, Graphics g)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
index 2a2599bde1b..3f9d22af4ee 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTabbedPaneUI.java
@@ -52,35 +52,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.TabbedPaneUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link TabbedPaneUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link TabbedPaneUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiTabbedPaneUI extends TabbedPaneUI 
+public class MultiTabbedPaneUI extends TabbedPaneUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiTabbedPaneUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiTabbedPaneUI() 
+  public MultiTabbedPaneUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiTabbedPaneUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -88,11 +88,11 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
     MultiTabbedPaneUI mui = new MultiTabbedPaneUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiTabbedPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -106,9 +106,9 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiTabbedPaneUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -120,39 +120,39 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiTabbedPaneUI.  The first item in the array is always 
+   * MultiTabbedPaneUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -165,11 +165,11 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiTabbedPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -184,9 +184,9 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiTabbedPaneUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -199,24 +199,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -232,21 +232,21 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
 
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -259,24 +259,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -289,24 +289,24 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -319,25 +319,25 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiTabbedPaneUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTabbedPaneUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -350,26 +350,26 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link TabbedPaneUI#tabForCoordinate(JTabbedPane, int, int)} 
-   * method for all the UI delegates managed by this 
-   * MultiTabbedPaneUI, returning the tab index for the UI 
-   * delegate from the primary look and feel. 
-   * 
+   * Calls the {@link TabbedPaneUI#tabForCoordinate(JTabbedPane, int, int)}
+   * method for all the UI delegates managed by this
+   * MultiTabbedPaneUI, returning the tab index for the UI
+   * delegate from the primary look and feel.
+   *
    * @param pane  the tabbed pane.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
-   * @return The tab index returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The tab index returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int tabForCoordinate(JTabbedPane pane, int x, int y) 
+  public int tabForCoordinate(JTabbedPane pane, int x, int y)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
         result = ui.tabForCoordinate(pane, x, y);
@@ -384,23 +384,23 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
   }
 
   /**
-   * Calls the {@link TabbedPaneUI#getTabBounds(JTabbedPane, int)} 
-   * method for all the UI delegates managed by this 
-   * MultiTabbedPaneUI, returning the bounds for the UI 
-   * delegate from the primary look and feel. 
-   * 
+   * Calls the {@link TabbedPaneUI#getTabBounds(JTabbedPane, int)}
+   * method for all the UI delegates managed by this
+   * MultiTabbedPaneUI, returning the bounds for the UI
+   * delegate from the primary look and feel.
+   *
    * @param pane  the tabbed pane.
    * @param index  the index.
-   * 
-   * @return The bounds returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The bounds returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public Rectangle getTabBounds(JTabbedPane pane, int index) 
+  public Rectangle getTabBounds(JTabbedPane pane, int index)
   {
     Rectangle result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
         result = ui.getTabBounds(pane, index);
@@ -415,22 +415,22 @@ public class MultiTabbedPaneUI extends TabbedPaneUI
   }
 
   /**
-   * Calls the {@link TabbedPaneUI#getTabRunCount(JTabbedPane)} 
-   * method for all the UI delegates managed by this 
-   * MultiTabbedPaneUI, returning the nt for the UI 
-   * delegate from the primary look and feel. 
-   * 
+   * Calls the {@link TabbedPaneUI#getTabRunCount(JTabbedPane)}
+   * method for all the UI delegates managed by this
+   * MultiTabbedPaneUI, returning the nt for the UI
+   * delegate from the primary look and feel.
+   *
    * @param pane  the tabbed pane.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getTabRunCount(JTabbedPane pane) 
+  public int getTabRunCount(JTabbedPane pane)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TabbedPaneUI ui = (TabbedPaneUI) iterator.next();
         result = ui.getTabRunCount(pane);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
index 6c59cef6c96..972303bec43 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTableHeaderUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.TableHeaderUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link TableHeaderUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link TableHeaderUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiTableHeaderUI extends TableHeaderUI 
+public class MultiTableHeaderUI extends TableHeaderUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiTableHeaderUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiTableHeaderUI() 
+  public MultiTableHeaderUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiTableHeaderUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiTableHeaderUI extends TableHeaderUI
     MultiTableHeaderUI mui = new MultiTableHeaderUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiTableHeaderUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiTableHeaderUI extends TableHeaderUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiTableHeaderUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiTableHeaderUI extends TableHeaderUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiTableHeaderUI.  The first item in the array is always 
+   * MultiTableHeaderUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiTableHeaderUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiTableHeaderUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiTableHeaderUI extends TableHeaderUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiTableHeaderUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableHeaderUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableHeaderUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableHeaderUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTableHeaderUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiTableHeaderUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTableHeaderUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiTableHeaderUI extends TableHeaderUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
index 2e5b5bcf532..1cd1a4c88e8 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTableUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.TableUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link TableUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link TableUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiTableUI extends TableUI 
+public class MultiTableUI extends TableUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiTableUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiTableUI() 
+  public MultiTableUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiTableUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiTableUI extends TableUI
     MultiTableUI mui = new MultiTableUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiTableUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiTableUI extends TableUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiTableUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiTableUI extends TableUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiTableUI.  The first item in the array is always 
+   * MultiTableUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiTableUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiTableUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiTableUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiTableUI extends TableUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiTableUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiTableUI extends TableUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTableUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTableUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiTableUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTableUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiTableUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTableUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiTableUI extends TableUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
index c5dee247dd3..392fd981177 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTextUI.java
@@ -58,35 +58,35 @@ import javax.swing.text.View;
 import javax.swing.text.Position.Bias;
 
 /**
- * A UI delegate that that coordinates multiple {@link TextUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link TextUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiTextUI extends TextUI 
+public class MultiTextUI extends TextUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiTextUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiTextUI() 
+  public MultiTextUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiTextUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -94,11 +94,11 @@ public class MultiTextUI extends TextUI
     MultiTextUI mui = new MultiTextUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiTextUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -112,9 +112,9 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiTextUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -126,39 +126,39 @@ public class MultiTextUI extends TextUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiTextUI.  The first item in the array is always 
+   * MultiTextUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiTextUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -171,11 +171,11 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiTextUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -190,9 +190,9 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiTextUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -205,24 +205,24 @@ public class MultiTextUI extends TextUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -235,24 +235,24 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -265,24 +265,24 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -295,24 +295,24 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiTextUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTextUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -325,25 +325,25 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiTextUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTextUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -356,25 +356,25 @@ public class MultiTextUI extends TextUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link TextUI#modelToView(JTextComponent, int)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the bounds for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the bounds for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The bounds returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The bounds returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Rectangle modelToView(JTextComponent tc, int pos)
-      throws BadLocationException 
+      throws BadLocationException
   {
     Rectangle result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.modelToView(tc, pos);
@@ -389,23 +389,23 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the {@link TextUI#modelToView(JTextComponent, int, Position.Bias)} 
-   * method for all the UI delegates managed by this MultiTextUI, 
-   * returning the bounds for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link TextUI#modelToView(JTextComponent, int, Position.Bias)}
+   * method for all the UI delegates managed by this MultiTextUI,
+   * returning the bounds for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The bounds returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The bounds returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Rectangle modelToView(JTextComponent tc, int pos, Bias bias)
-          throws BadLocationException 
+          throws BadLocationException
   {
     Rectangle result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.modelToView(tc, pos, bias);
@@ -421,22 +421,22 @@ public class MultiTextUI extends TextUI
 
   /**
    * Calls the {@link TextUI#viewToModel(JTextComponent, Point)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the position for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the position for the UI delegate from the primary look and
+   * feel.
+   *
    * @param t  the text component.
    * @param pt  the point.
-   * 
-   * @return The position returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The position returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int viewToModel(JTextComponent t, Point pt) 
+  public int viewToModel(JTextComponent t, Point pt)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.viewToModel(t, pt);
@@ -451,22 +451,22 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the {@link TextUI#viewToModel(JTextComponent, Point, Bias[])} method 
-   * for all the UI delegates managed by this MultiTextUI, 
-   * returning the position for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link TextUI#viewToModel(JTextComponent, Point, Bias[])} method
+   * for all the UI delegates managed by this MultiTextUI,
+   * returning the position for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The position returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The position returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int viewToModel(JTextComponent tc, Point loc, Bias[] outBias) 
+  public int viewToModel(JTextComponent tc, Point loc, Bias[] outBias)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.viewToModel(tc, loc, outBias);
@@ -481,48 +481,48 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the {@link TextUI#getNextVisualPositionFrom(JTextComponent, int, 
+   * Calls the {@link TextUI#getNextVisualPositionFrom(JTextComponent, int,
    * Position.Bias, int, Position.Bias[])} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the position for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the position for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The position returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The position returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getNextVisualPositionFrom(JTextComponent tc, int pos, Bias bias,
-          int direction, Bias[] outBias) throws BadLocationException 
+          int direction, Bias[] outBias) throws BadLocationException
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
-        result = ui.getNextVisualPositionFrom(tc, pos, bias, direction, 
+        result = ui.getNextVisualPositionFrom(tc, pos, bias, direction,
                 outBias);
       }
     // return values from auxiliary UI delegates are ignored
     while (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
-        /* int ignored = */ ui.getNextVisualPositionFrom(tc, pos, bias, 
+        /* int ignored = */ ui.getNextVisualPositionFrom(tc, pos, bias,
             direction, outBias);
       }
     return result;
   }
 
   /**
-   * Calls the {@link TextUI#damageRange(JTextComponent, int, int)} method for 
+   * Calls the {@link TextUI#damageRange(JTextComponent, int, int)} method for
    * all the UI delegates managed by this MultiTextUI.
-   * 
+   *
    * @param tc  the component.
    * @param start  the start position.
    * @param end  the end position.
    */
-  public void damageRange(JTextComponent tc, int start, int end) 
+  public void damageRange(JTextComponent tc, int start, int end)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -533,10 +533,10 @@ public class MultiTextUI extends TextUI
   }
 
   /**
-   * Calls the {@link TextUI#damageRange(JTextComponent, int, int, 
-   * Position.Bias, Position.Bias)} method for all the UI delegates managed by 
+   * Calls the {@link TextUI#damageRange(JTextComponent, int, int,
+   * Position.Bias, Position.Bias)} method for all the UI delegates managed by
    * this MultiTextUI.
-   * 
+   *
    * @param tc  the component.
    * @param start  the start position.
    * @param end  the end position.
@@ -544,7 +544,7 @@ public class MultiTextUI extends TextUI
    * @param endBias  the end bias.
    */
   public void damageRange(JTextComponent tc, int start, int end,
-        Bias startBias, Bias endBias) 
+        Bias startBias, Bias endBias)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -556,21 +556,21 @@ public class MultiTextUI extends TextUI
 
   /**
    * Calls the {@link TextUI#getEditorKit(JTextComponent)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the editor kit for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the editor kit for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The editor kit returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The editor kit returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public EditorKit getEditorKit(JTextComponent tc) 
+  public EditorKit getEditorKit(JTextComponent tc)
   {
     EditorKit result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.getEditorKit(tc);
@@ -586,21 +586,21 @@ public class MultiTextUI extends TextUI
 
   /**
    * Calls the {@link TextUI#getRootView(JTextComponent)} method for all
-   * the UI delegates managed by this MultiTextUI, 
-   * returning the view for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTextUI,
+   * returning the view for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tc  the text component.
-   * 
-   * @return The view returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The view returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public View getRootView(JTextComponent tc) 
+  public View getRootView(JTextComponent tc)
   {
     View result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TextUI ui = (TextUI) iterator.next();
         result = ui.getRootView(tc);
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
index afe63bf358f..5f308d99121 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiToolBarUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ToolBarUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ToolBarUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ToolBarUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiToolBarUI extends ToolBarUI 
+public class MultiToolBarUI extends ToolBarUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiToolBarUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiToolBarUI() 
+  public MultiToolBarUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiToolBarUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiToolBarUI extends ToolBarUI
     MultiToolBarUI mui = new MultiToolBarUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiToolBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiToolBarUI extends ToolBarUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiToolBarUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiToolBarUI extends ToolBarUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiToolBarUI.  The first item in the array is always 
+   * MultiToolBarUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiToolBarUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiToolBarUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiToolBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiToolBarUI extends ToolBarUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiToolBarUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiToolBarUI extends ToolBarUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolBarUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolBarUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolBarUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolBarUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolBarUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolBarUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiToolBarUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiToolBarUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiToolBarUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiToolBarUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiToolBarUI extends ToolBarUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
index fcd622dd8d3..9db9efb6981 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiToolTipUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ToolTipUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ToolTipUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ToolTipUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiToolTipUI extends ToolTipUI 
+public class MultiToolTipUI extends ToolTipUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiToolTipUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiToolTipUI() 
+  public MultiToolTipUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiToolTipUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiToolTipUI extends ToolTipUI
     MultiToolTipUI mui = new MultiToolTipUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiToolTipUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiToolTipUI extends ToolTipUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiToolTipUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiToolTipUI extends ToolTipUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiToolTipUI.  The first item in the array is always 
+   * MultiToolTipUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiToolTipUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiToolTipUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiToolTipUI extends ToolTipUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiToolTipUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiToolTipUI extends ToolTipUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiToolTipUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiToolTipUI extends ToolTipUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolTipUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolTipUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -230,21 +230,21 @@ public class MultiToolTipUI extends ToolTipUI
 
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolTipUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolTipUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiToolTipUI extends ToolTipUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiToolTipUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiToolTipUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiToolTipUI extends ToolTipUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiToolTipUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiToolTipUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiToolTipUI extends ToolTipUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiToolTipUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiToolTipUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiToolTipUI extends ToolTipUI
       }
     return result;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
index de1dc6cc773..f70decc6938 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiTreeUI.java
@@ -53,35 +53,35 @@ import javax.swing.plaf.TreeUI;
 import javax.swing.tree.TreePath;
 
 /**
- * A UI delegate that that coordinates multiple {@link TreeUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link TreeUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiTreeUI extends TreeUI 
+public class MultiTreeUI extends TreeUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiTreeUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiTreeUI() 
+  public MultiTreeUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiTreeUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -89,11 +89,11 @@ public class MultiTreeUI extends TreeUI
     MultiTreeUI mui = new MultiTreeUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -107,9 +107,9 @@ public class MultiTreeUI extends TreeUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -121,39 +121,39 @@ public class MultiTreeUI extends TreeUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiTreeUI.  The first item in the array is always 
+   * MultiTreeUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -166,11 +166,11 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -185,9 +185,9 @@ public class MultiTreeUI extends TreeUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -200,24 +200,24 @@ public class MultiTreeUI extends TreeUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -230,24 +230,24 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
- 
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -260,24 +260,24 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -290,24 +290,24 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -320,25 +320,25 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -351,24 +351,24 @@ public class MultiTreeUI extends TreeUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link TreeUI#getPathBounds(JTree, TreePath)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the bounds for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the bounds for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The bounds returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The bounds returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public Rectangle getPathBounds(JTree tree, TreePath path) 
+  public Rectangle getPathBounds(JTree tree, TreePath path)
   {
     Rectangle result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getPathBounds(tree, path);
@@ -384,21 +384,21 @@ public class MultiTreeUI extends TreeUI
 
   /**
    * Calls the {@link TreeUI#getPathForRow(JTree, int)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the path for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the path for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The path returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The path returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public TreePath getPathForRow(JTree tree, int row) 
+  public TreePath getPathForRow(JTree tree, int row)
   {
     TreePath result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getPathForRow(tree, row);
@@ -414,21 +414,21 @@ public class MultiTreeUI extends TreeUI
 
   /**
    * Calls the {@link TreeUI#getRowForPath(JTree, TreePath)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the row index for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the row index for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The row index returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The row index returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getRowForPath(JTree tree, TreePath path) 
+  public int getRowForPath(JTree tree, TreePath path)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getRowForPath(tree, path);
@@ -439,26 +439,26 @@ public class MultiTreeUI extends TreeUI
         TreeUI ui = (TreeUI) iterator.next();
         /* int ignored = */ ui.getRowForPath(tree, path);
       }
-    return result;  
+    return result;
   }
 
   /**
    * Calls the {@link TreeUI#getRowCount(JTree)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public int getRowCount(JTree tree) 
+  public int getRowCount(JTree tree)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getRowCount(tree);
@@ -469,26 +469,26 @@ public class MultiTreeUI extends TreeUI
         TreeUI ui = (TreeUI) iterator.next();
         /* int ignored = */ ui.getRowCount(tree);
       }
-    return result;  
+    return result;
   }
 
   /**
    * Calls the {@link TreeUI#getClosestPathForLocation(JTree, int, int)} method
-   * for all the UI delegates managed by this MultiTreeUI, 
-   * returning the path for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiTreeUI,
+   * returning the path for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The path returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The path returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public TreePath getClosestPathForLocation(JTree tree, int x, int y) 
+  public TreePath getClosestPathForLocation(JTree tree, int x, int y)
   {
     TreePath result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getClosestPathForLocation(tree, x, y);
@@ -499,26 +499,26 @@ public class MultiTreeUI extends TreeUI
         TreeUI ui = (TreeUI) iterator.next();
         /* TreePath ignored = */ ui.getClosestPathForLocation(tree, x, y);
       }
-    return result;  
+    return result;
   }
 
   /**
    * Calls the {@link TreeUI#isEditing(JTree)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The result returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The result returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public boolean isEditing(JTree tree) 
+  public boolean isEditing(JTree tree)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.isEditing(tree);
@@ -534,21 +534,21 @@ public class MultiTreeUI extends TreeUI
 
   /**
    * Calls the {@link TreeUI#stopEditing(JTree)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The result returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The result returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public boolean stopEditing(JTree tree) 
+  public boolean stopEditing(JTree tree)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.stopEditing(tree);
@@ -563,12 +563,12 @@ public class MultiTreeUI extends TreeUI
   }
 
   /**
-   * Calls the {@link TreeUI#cancelEditing(JTree)} method for 
+   * Calls the {@link TreeUI#cancelEditing(JTree)} method for
    * all the UI delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param tree  the tree component.
    */
-  public void cancelEditing(JTree tree) 
+  public void cancelEditing(JTree tree)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -579,13 +579,13 @@ public class MultiTreeUI extends TreeUI
   }
 
   /**
-   * Calls the {@link TreeUI#startEditingAtPath(JTree, TreePath)} method for 
+   * Calls the {@link TreeUI#startEditingAtPath(JTree, TreePath)} method for
    * all the UI delegates managed by this MultiTreeUI.
-   * 
+   *
    * @param tree  the tree component.
    * @param path  the path.
    */
-  public void startEditingAtPath(JTree tree, TreePath path) 
+  public void startEditingAtPath(JTree tree, TreePath path)
   {
     Iterator iterator = uis.iterator();
     while (iterator.hasNext())
@@ -597,21 +597,21 @@ public class MultiTreeUI extends TreeUI
 
   /**
    * Calls the {@link TreeUI#getEditingPath(JTree)} method for all
-   * the UI delegates managed by this MultiTreeUI, 
-   * returning the path for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiTreeUI,
+   * returning the path for the UI delegate from the primary look and
+   * feel.
+   *
    * @param tree  the tree component.
-   * 
-   * @return The path returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The path returned by the UI delegate from the primary
+   *         look and feel.
    */
-  public TreePath getEditingPath(JTree tree) 
+  public TreePath getEditingPath(JTree tree)
   {
     TreePath result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         TreeUI ui = (TreeUI) iterator.next();
         result = ui.getEditingPath(tree);
@@ -622,7 +622,7 @@ public class MultiTreeUI extends TreeUI
         TreeUI ui = (TreeUI) iterator.next();
         /* TreePath ignored = */ ui.getEditingPath(tree);
       }
-    return result;  
+    return result;
   }
 
 }
diff --git a/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java b/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
index 33bbc3b7f75..55f9cba70ac 100644
--- a/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
+++ b/libjava/classpath/javax/swing/plaf/multi/MultiViewportUI.java
@@ -50,35 +50,35 @@ import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.ViewportUI;
 
 /**
- * A UI delegate that that coordinates multiple {@link ViewportUI} 
- * instances, one from the primary look and feel, and one or more from the 
+ * A UI delegate that that coordinates multiple {@link ViewportUI}
+ * instances, one from the primary look and feel, and one or more from the
  * auxiliary look and feel(s).
- * 
+ *
  * @see UIManager#addAuxiliaryLookAndFeel(LookAndFeel)
  */
-public class MultiViewportUI extends ViewportUI 
+public class MultiViewportUI extends ViewportUI
 {
 
   /** A list of references to the actual component UIs. */
   protected Vector uis;
-    
+
   /**
    * Creates a new MultiViewPortUI instance.
-   * 
+   *
    * @see #createUI(JComponent)
    */
-  public MultiViewportUI() 
+  public MultiViewportUI()
   {
     uis = new Vector();
   }
-  
+
   /**
-   * Creates a delegate object for the specified component.  If any auxiliary 
+   * Creates a delegate object for the specified component.  If any auxiliary
    * look and feels support this component, a MultiViewportUI is
    * returned, otherwise the UI from the default look and feel is returned.
-   * 
+   *
    * @param target  the component.
-   * 
+   *
    * @see MultiLookAndFeel#createUIs(ComponentUI, Vector, JComponent)
    */
   public static ComponentUI createUI(JComponent target)
@@ -86,11 +86,11 @@ public class MultiViewportUI extends ViewportUI
     MultiViewportUI mui = new MultiViewportUI();
     return MultiLookAndFeel.createUIs(mui, mui.uis, target);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#installUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#installUI(JComponent)} method for all
    * the UI delegates managed by this MultiViewportUI.
-   * 
+   *
    * @param c  the component.
    */
   public void installUI(JComponent c)
@@ -104,9 +104,9 @@ public class MultiViewportUI extends ViewportUI
   }
 
   /**
-   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all 
+   * Calls the {@link ComponentUI#uninstallUI(JComponent)} method for all
    * the UI delegates managed by this MultiViewportUI.
-   * 
+   *
    * @param c  the component.
    */
   public void uninstallUI(JComponent c)
@@ -118,39 +118,39 @@ public class MultiViewportUI extends ViewportUI
       ui.uninstallUI(c);
     }
   }
-  
+
   /**
    * Returns an array containing the UI delegates managed by this
-   * MultiViewportUI.  The first item in the array is always 
+   * MultiViewportUI.  The first item in the array is always
    * the UI delegate from the installed default look and feel.
-   * 
+   *
    * @return An array of UI delegates.
    */
   public ComponentUI[] getUIs()
   {
     return MultiLookAndFeel.uisToArray(uis);
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all 
-   * the UI delegates managed by this MultiViewportUI, 
-   * returning the result for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * Calls the {@link ComponentUI#contains(JComponent, int, int)} method for all
+   * the UI delegates managed by this MultiViewportUI,
+   * returning the result for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
    * @param x  the x-coordinate.
    * @param y  the y-coordinate.
-   * 
+   *
    * @return true if the specified (x, y) coordinate falls within
    *         the bounds of the component as rendered by the UI delegate in the
-   *         primary look and feel, and false otherwise. 
+   *         primary look and feel, and false otherwise.
    */
-  public boolean contains(JComponent c, int x, int y) 
+  public boolean contains(JComponent c, int x, int y)
   {
     boolean result = false;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.contains(c, x, y);
@@ -163,11 +163,11 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-  
+
   /**
-   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all 
+   * Calls the {@link ComponentUI#update(Graphics, JComponent)} method for all
    * the UI delegates managed by this MultiViewportUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -182,9 +182,9 @@ public class MultiViewportUI extends ViewportUI
   }
 
   /**
-   * Calls the paint(Graphics, JComponent) method for all the UI 
+   * Calls the paint(Graphics, JComponent) method for all the UI
    * delegates managed by this MultiViewportUI.
-   * 
+   *
    * @param g  the graphics device.
    * @param c  the component.
    */
@@ -197,24 +197,24 @@ public class MultiViewportUI extends ViewportUI
       ui.paint(g, c);
     }
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getPreferredSize(JComponent)} method for all
-   * the UI delegates managed by this MultiViewportUI, 
-   * returning the preferred size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiViewportUI,
+   * returning the preferred size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The preferred size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The preferred size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getPreferredSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getPreferredSize(c);
@@ -227,24 +227,24 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getMinimumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiViewportUI, 
-   * returning the minimum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiViewportUI,
+   * returning the minimum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The minimum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The minimum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMinimumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMinimumSize(c);
@@ -257,24 +257,24 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-    
+
   /**
    * Calls the {@link ComponentUI#getMaximumSize(JComponent)} method for all
-   * the UI delegates managed by this MultiViewportUI, 
-   * returning the maximum size for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * the UI delegates managed by this MultiViewportUI,
+   * returning the maximum size for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The maximum size returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The maximum size returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Dimension getMaximumSize(JComponent c)
   {
     Dimension result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getMaximumSize(c);
@@ -287,24 +287,24 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChildrenCount(JComponent)} method
-   * for all the UI delegates managed by this MultiViewportUI, 
-   * returning the count for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiViewportUI,
+   * returning the count for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component.
-   * 
-   * @return The count returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The count returned by the UI delegate from the primary
+   *         look and feel.
    */
   public int getAccessibleChildrenCount(JComponent c)
   {
     int result = 0;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChildrenCount(c);
@@ -317,25 +317,25 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-  
+
   /**
    * Calls the {@link ComponentUI#getAccessibleChild(JComponent, int)} method
-   * for all the UI delegates managed by this MultiViewportUI, 
-   * returning the child for the UI delegate from the primary look and 
-   * feel. 
-   * 
+   * for all the UI delegates managed by this MultiViewportUI,
+   * returning the child for the UI delegate from the primary look and
+   * feel.
+   *
    * @param c  the component
    * @param i  the child index.
-   * 
-   * @return The child returned by the UI delegate from the primary 
-   *         look and feel. 
+   *
+   * @return The child returned by the UI delegate from the primary
+   *         look and feel.
    */
   public Accessible getAccessibleChild(JComponent c, int i)
   {
     Accessible result = null;
     Iterator iterator = uis.iterator();
     // first UI delegate provides the return value
-    if (iterator.hasNext()) 
+    if (iterator.hasNext())
       {
         ComponentUI ui = (ComponentUI) iterator.next();
         result = ui.getAccessibleChild(c, i);
@@ -348,5 +348,5 @@ public class MultiViewportUI extends ViewportUI
       }
     return result;
   }
-   
+
 }
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java b/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
index 1907d754f63..76a46cb2164 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthGraphicsUtils.java
@@ -91,10 +91,10 @@ public class SynthGraphicsUtils
    * Lays out a label and (if non-null) an icon. The calculated coordinates are
    * then stored in viewR, iconR and
    * textR.
-   *   
+   *
    * The alignment and position parameters may be one of the alignment or
    * position constants defined in {@link javax.swing.SwingConstants}.
-   * 
+   *
    * @param ctx the synth context, identifies the current region
    * @param fm the font metrics to use to fetch the text measures
    * @param text the text to lay out, may be null
@@ -123,7 +123,7 @@ public class SynthGraphicsUtils
   /**
    * Returns the width of the string text for the specified font
    * and font metrics.
-   * 
+   *
    * @param ctx identifies the current region
    * @param font the font
    * @param fm the font metrics to use
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java b/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
index 46a95f09860..ac24dd48d2d 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthLookAndFeel.java
@@ -73,7 +73,7 @@ public class SynthLookAndFeel
    * Creates a new instance of SynthLookAndFeel. In order to use
    * the Synth look and feel you either need to call {@link #load} to load a
    * set of styles from an XML file, or you need to call
-   * {@link #setStyleFactory} to provide your own style factory. 
+   * {@link #setStyleFactory} to provide your own style factory.
    */
   public SynthLookAndFeel()
   {
diff --git a/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java b/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
index fa1f6f572ce..6a57dadcabc 100644
--- a/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
+++ b/libjava/classpath/javax/swing/plaf/synth/SynthPainter.java
@@ -68,7 +68,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param dir the orientation of the arrow
@@ -86,7 +86,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param dir the orientation of the progress bar
@@ -105,7 +105,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param dir the orientation of the separator
@@ -124,7 +124,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param dir the orientation of the divider
@@ -143,7 +143,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param dir the orientation of the divider
@@ -162,7 +162,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -179,7 +179,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -196,7 +196,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -213,7 +213,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -230,7 +230,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -247,7 +247,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -264,7 +264,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -281,7 +281,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -298,7 +298,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -315,7 +315,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -332,7 +332,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -349,7 +349,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -366,7 +366,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -383,7 +383,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -400,7 +400,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -417,7 +417,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -434,7 +434,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -451,7 +451,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -468,7 +468,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -485,7 +485,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -502,7 +502,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -519,7 +519,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -536,7 +536,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -553,7 +553,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -570,7 +570,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -587,7 +587,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -604,7 +604,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -621,7 +621,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -638,7 +638,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -655,7 +655,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -672,7 +672,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -689,7 +689,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -706,7 +706,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -723,7 +723,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -740,7 +740,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -757,7 +757,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -774,7 +774,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -791,7 +791,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -808,7 +808,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -825,7 +825,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -842,7 +842,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -859,7 +859,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -876,7 +876,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -893,7 +893,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -910,7 +910,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -927,7 +927,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -944,7 +944,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -961,7 +961,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -978,7 +978,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -995,7 +995,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1012,7 +1012,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1029,7 +1029,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1046,7 +1046,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1063,7 +1063,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1080,7 +1080,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1097,7 +1097,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param orientation orientation of the scrollbar
@@ -1115,7 +1115,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param orientation orientation of the scrollbar
@@ -1133,7 +1133,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1150,7 +1150,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1167,7 +1167,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1184,7 +1184,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1201,7 +1201,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1218,7 +1218,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1235,7 +1235,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1252,7 +1252,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1269,7 +1269,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param orientation orientation of the slider
@@ -1287,7 +1287,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param orientation orientation of the slider
@@ -1305,7 +1305,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1322,7 +1322,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1339,7 +1339,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1356,7 +1356,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1373,7 +1373,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1390,7 +1390,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1407,7 +1407,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1424,7 +1424,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1441,7 +1441,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1458,7 +1458,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1475,7 +1475,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1492,7 +1492,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1509,7 +1509,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1526,7 +1526,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param index the index of the tab to paint
@@ -1544,7 +1544,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    * @param index the index of the tab to paint
@@ -1562,7 +1562,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1579,7 +1579,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1596,7 +1596,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1613,7 +1613,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1630,7 +1630,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1647,7 +1647,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1664,7 +1664,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1681,7 +1681,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1698,7 +1698,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1715,7 +1715,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1732,7 +1732,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1749,7 +1749,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1766,7 +1766,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1783,7 +1783,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1800,7 +1800,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1817,7 +1817,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1834,7 +1834,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1851,7 +1851,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1868,7 +1868,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1885,7 +1885,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1902,7 +1902,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1919,7 +1919,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1936,7 +1936,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1953,7 +1953,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1970,7 +1970,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
@@ -1987,7 +1987,7 @@ public abstract class SynthPainter
    *        painting
    * @param g the graphics context to use for painting
    * @param x the X coordinate of the area to paint
-   * @param y the Y coordinate of the area to paint 
+   * @param y the Y coordinate of the area to paint
    * @param w the width of the area to paint
    * @param h the height of the area to paint
    */
diff --git a/libjava/classpath/javax/swing/table/AbstractTableModel.java b/libjava/classpath/javax/swing/table/AbstractTableModel.java
index 743e5d4dc21..7e9886d30ba 100644
--- a/libjava/classpath/javax/swing/table/AbstractTableModel.java
+++ b/libjava/classpath/javax/swing/table/AbstractTableModel.java
@@ -48,9 +48,9 @@ import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 
 /**
- * A base class that can be used to create implementations of the 
+ * A base class that can be used to create implementations of the
  * {@link TableModel} interface.
- * 
+ *
  * @author Andrew Selkirk
  */
 public abstract class AbstractTableModel implements TableModel, Serializable
@@ -71,10 +71,10 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   }
 
   /**
-   * Returns the name of the specified column.  This method generates default 
-   * names in a sequence (starting with column 0):  A, B, C, ..., Z, AA, AB, 
+   * Returns the name of the specified column.  This method generates default
+   * names in a sequence (starting with column 0):  A, B, C, ..., Z, AA, AB,
    * AC, ..., AZ, BA, BB, BC, and so on.  Subclasses may override this method
-   * to allow column names to be specified on some other basis. 
+   * to allow column names to be specified on some other basis.
    *
    * @param columnIndex  the column index.
    *
@@ -98,19 +98,19 @@ public abstract class AbstractTableModel implements TableModel, Serializable
    * @param columnName  the name of the column (null not permitted).
    *
    * @return The index of the column, -1 if not found.
-   * 
+   *
    * @see #getColumnName(int)
-   * @throws NullPointerException if columnName is 
+   * @throws NullPointerException if columnName is
    *         null.
    */
   public int findColumn(String columnName)
   {
     int count = getColumnCount();
-    
+
     for (int index = 0; index < count; index++)
       {
         String name = getColumnName(index);
-        
+
         if (columnName.equals(name))
           return index;
     }
@@ -121,10 +121,10 @@ public abstract class AbstractTableModel implements TableModel, Serializable
 
   /**
    * Returns the Class for all Object instances
-   * in the specified column.  
-   * 
+   * in the specified column.
+   *
    * @param columnIndex the column index.
-   * 
+   *
    * @return The class.
    */
   public Class getColumnClass(int columnIndex)
@@ -133,9 +133,9 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   }
 
   /**
-   * Returns true if the specified cell is editable, and 
-   * false if it is not.  This implementation returns 
-   * false for all arguments, subclasses should override the 
+   * Returns true if the specified cell is editable, and
+   * false if it is not.  This implementation returns
+   * false for all arguments, subclasses should override the
    * method if necessary.
    *
    * @param rowIndex  the row index of the cell.
@@ -149,8 +149,8 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   }
 
   /**
-   * Sets the value of the given cell.  This implementation ignores all 
-   * arguments and does nothing, subclasses should override the 
+   * Sets the value of the given cell.  This implementation ignores all
+   * arguments and does nothing, subclasses should override the
    * method if necessary.
    *
    * @param value  the new value (null permitted).
@@ -219,7 +219,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   /**
    * Sends a {@link TableModelEvent} to all registered listeners to inform
    * them that some rows have been inserted into the model.
-   * 
+   *
    * @param firstRow  the index of the first row.
    * @param lastRow  the index of the last row.
    */
@@ -233,7 +233,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   /**
    * Sends a {@link TableModelEvent} to all registered listeners to inform
    * them that some rows have been updated.
-   * 
+   *
    * @param firstRow  the index of the first row.
    * @param lastRow  the index of the last row.
    */
@@ -247,7 +247,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   /**
    * Sends a {@link TableModelEvent} to all registered listeners to inform
    * them that some rows have been deleted from the model.
-   * 
+   *
    * @param firstRow  the index of the first row.
    * @param lastRow  the index of the last row.
    */
@@ -261,7 +261,7 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   /**
    * Sends a {@link TableModelEvent} to all registered listeners to inform
    * them that a single cell has been updated.
-   * 
+   *
    * @param row  the row index.
    * @param column  the column index.
    */
@@ -272,15 +272,15 @@ public abstract class AbstractTableModel implements TableModel, Serializable
 
   /**
    * Sends the specified event to all registered listeners.
-   * 
+   *
    * @param event  the event to send.
    */
   public void fireTableChanged(TableModelEvent event)
   {
-    int	index;
+    int index;
     TableModelListener listener;
     Object[] list = listenerList.getListenerList();
- 
+
     for (index = 0; index < list.length; index += 2)
       {
         listener = (TableModelListener) list [index + 1];
@@ -291,9 +291,9 @@ public abstract class AbstractTableModel implements TableModel, Serializable
   /**
    * Returns an array of listeners of the given type that are registered with
    * this model.
-   * 
+   *
    * @param listenerType  the listener class.
-   * 
+   *
    * @return An array of listeners (possibly empty).
    */
   public  T[] getListeners(Class listenerType)
diff --git a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
index 7fecefe0b4c..5d4a1602442 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableCellRenderer.java
@@ -131,7 +131,7 @@ public class DefaultTableCellRenderer extends JLabel
    * @param hasFocus has the cell the focus?
    * @param row the row to render
    * @param column the cell to render
-   * 
+   *
    * @return this component (the default table cell renderer)
    */
   public Component getTableCellRendererComponent(JTable table, Object value,
@@ -180,8 +180,8 @@ public class DefaultTableCellRenderer extends JLabel
     // can avoid filling the background by setting the renderer opaque.
     Color back = getBackground();
     setOpaque(back != null && back.equals(table.getBackground()));
-    
-    return this;    
+
+    return this;
   }
 
   /**
@@ -254,14 +254,14 @@ public class DefaultTableCellRenderer extends JLabel
    * do something.
                        
    */
   public void firePropertyChange(String propertyName, boolean oldValue,
-		                 boolean newValue)
+                                 boolean newValue)
   {
     // Does nothing.
   }
 
   /**
    * Sets the String for this cell.
-   * 
+   *
    * @param value the string value for this cell; if value is null it
    * sets the text value to an empty string
    */
diff --git a/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java b/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
index 717ea98684a..532b513a9cc 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableColumnModel.java
@@ -57,10 +57,10 @@ import javax.swing.event.TableColumnModelListener;
 
 /**
  * A model that stores information about the columns used in a {@link JTable}.
- * 
+ *
  * @see JTable#setColumnModel(TableColumnModel)
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
 public class DefaultTableColumnModel
   implements TableColumnModel, PropertyChangeListener, ListSelectionListener,
@@ -89,15 +89,15 @@ public class DefaultTableColumnModel
   protected EventListenerList listenerList = new EventListenerList();
 
   /**
-   * A change event used when notifying listeners of a change to the 
+   * A change event used when notifying listeners of a change to the
    * columnMargin field.  This single event is reused for all
-   * notifications (it is lazily instantiated within the 
+   * notifications (it is lazily instantiated within the
    * {@link #fireColumnMarginChanged()} method).
    */
   protected transient ChangeEvent changeEvent;
 
   /**
-   * A flag that indicates whether or not columns can be selected. 
+   * A flag that indicates whether or not columns can be selected.
    */
   protected boolean columnSelectionAllowed;
 
@@ -107,10 +107,10 @@ public class DefaultTableColumnModel
   protected int totalColumnWidth;
 
   /**
-   * Creates a new table column model with zero columns.  A default column 
+   * Creates a new table column model with zero columns.  A default column
    * selection model is created by calling {@link #createSelectionModel()}.
    * The default value for columnMargin is 1 and
-   * the default value for columnSelectionAllowed is 
+   * the default value for columnSelectionAllowed is
    * false.
    */
   public DefaultTableColumnModel()
@@ -123,17 +123,17 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Adds a column to the model then calls 
+   * Adds a column to the model then calls
    * {@link #fireColumnAdded(TableColumnModelEvent)} to notify the registered
    * listeners.  The model registers itself with the column as a
    * {@link PropertyChangeListener} so that changes to the column width will
    * invalidate the cached {@link #totalColumnWidth} value.
    *
    * @param column  the column (null not permitted).
-   * 
-   * @throws IllegalArgumentException if column is 
+   *
+   * @throws IllegalArgumentException if column is
    *     null.
-   * 
+   *
    * @see #removeColumn(TableColumn)
    */
   public void addColumn(TableColumn column)
@@ -143,18 +143,18 @@ public class DefaultTableColumnModel
     tableColumns.add(column);
     column.addPropertyChangeListener(this);
     invalidateWidthCache();
-    fireColumnAdded(new TableColumnModelEvent(this, 0, 
+    fireColumnAdded(new TableColumnModelEvent(this, 0,
                                               tableColumns.size() - 1));
   }
 
   /**
    * Removes a column from the model then calls
    * {@link #fireColumnRemoved(TableColumnModelEvent)} to notify the registered
-   * listeners.  If the specified column does not belong to the model, or is 
+   * listeners.  If the specified column does not belong to the model, or is
    * null, this method does nothing.
    *
    * @param column the column to be removed (null permitted).
-   * 
+   *
    * @see #addColumn(TableColumn)
    */
   public void removeColumn(TableColumn column)
@@ -163,21 +163,21 @@ public class DefaultTableColumnModel
     if (index < 0)
       return;
     tableColumns.remove(column);
-    fireColumnRemoved(new TableColumnModelEvent(this, index, 0));    
+    fireColumnRemoved(new TableColumnModelEvent(this, index, 0));
     column.removePropertyChangeListener(this);
     invalidateWidthCache();
   }
 
   /**
-   * Moves the column at index i to the position specified by index j, then 
+   * Moves the column at index i to the position specified by index j, then
    * calls {@link #fireColumnMoved(TableColumnModelEvent)} to notify registered
    * listeners.
    *
    * @param i index of the column that will be moved.
    * @param j index of the column's new location.
-   * 
+   *
    * @throws IllegalArgumentException if i or j are
-   *     outside the range 0 to N-1, where 
+   *     outside the range 0 to N-1, where
    *     N is the column count.
    */
   public void moveColumn(int i, int j)
@@ -195,9 +195,9 @@ public class DefaultTableColumnModel
   /**
    * Sets the column margin then calls {@link #fireColumnMarginChanged()} to
    * notify the registered listeners.
-   * 
+   *
    * @param margin  the column margin.
-   * 
+   *
    * @see #getColumnMargin()
    */
   public void setColumnMargin(int margin)
@@ -208,7 +208,7 @@ public class DefaultTableColumnModel
 
   /**
    * Returns the number of columns in the model.
-   * 
+   *
    * @return The column count.
    */
   public int getColumnCount()
@@ -218,7 +218,7 @@ public class DefaultTableColumnModel
 
   /**
    * Returns an enumeration of the columns in the model.
-   * 
+   *
    * @return An enumeration of the columns in the model.
    */
   public Enumeration getColumns()
@@ -230,10 +230,10 @@ public class DefaultTableColumnModel
    * Returns the index of the {@link TableColumn} with the given identifier.
    *
    * @param identifier  the identifier (null not permitted).
-   * 
+   *
    * @return The index of the {@link TableColumn} with the given identifier.
-   * 
-   * @throws IllegalArgumentException if identifier is 
+   *
+   * @throws IllegalArgumentException if identifier is
    *         null or there is no column with that identifier.
    */
   public int getColumnIndex(Object identifier)
@@ -241,7 +241,7 @@ public class DefaultTableColumnModel
     if (identifier == null)
       throw new IllegalArgumentException("Null identifier.");
     int columnCount = tableColumns.size();
-    for (int i = 0; i < columnCount; i++) 
+    for (int i = 0; i < columnCount; i++)
     {
       TableColumn tc = tableColumns.get(i);
       if (identifier.equals(tc.getIdentifier()))
@@ -252,13 +252,13 @@ public class DefaultTableColumnModel
 
   /**
    * Returns the column at the specified index.
-   * 
-   * @param columnIndex  the column index (in the range from 0 to 
-   *     N-1, where N is the number of columns in 
+   *
+   * @param columnIndex  the column index (in the range from 0 to
+   *     N-1, where N is the number of columns in
    *     the model).
-   * 
+   *
    * @return The column at the specified index.
-   * 
+   *
    * @throws ArrayIndexOutOfBoundsException if i is not within
    *     the specified range.
    */
@@ -269,9 +269,9 @@ public class DefaultTableColumnModel
 
   /**
    * Returns the column margin.
-   * 
+   *
    * @return The column margin.
-   * 
+   *
    * @see #setColumnMargin(int)
    */
   public int getColumnMargin()
@@ -288,15 +288,15 @@ public class DefaultTableColumnModel
    * 
                      2. individual column widths are taken into account, but the column margin
    *     is ignored.
                        3. 
    * 
                    
-   * If no column contains the specified position, this method returns 
+   * If no column contains the specified position, this method returns
    * -1.
-   * 
+   *
    * @param x  the x-position.
-   * 
+   *
    * @return The column index, or -1.
    */
   public int getColumnIndexAtX(int x)
-  {    
+  {
     for (int i = 0; i < tableColumns.size(); ++i)
       {
         int w = (tableColumns.get(i)).getWidth();
@@ -322,21 +322,21 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Sets the selection model that will be used to keep track of the selected 
+   * Sets the selection model that will be used to keep track of the selected
    * columns.
    *
    * @param model  the selection model (null not permitted).
-   * 
-   * @throws IllegalArgumentException if model is 
+   *
+   * @throws IllegalArgumentException if model is
    *     null.
-   *     
+   *
    * @see #getSelectionModel()
    */
   public void setSelectionModel(ListSelectionModel model)
   {
     if (model == null)
       throw new IllegalArgumentException();
-    
+
     selectionModel.removeListSelectionListener(this);
     selectionModel = model;
     selectionModel.addListSelectionListener(this);
@@ -344,9 +344,9 @@ public class DefaultTableColumnModel
 
   /**
    * Returns the selection model used to track table column selections.
-   * 
+   *
    * @return The selection model.
-   * 
+   *
    * @see #setSelectionModel(ListSelectionModel)
    */
   public ListSelectionModel getSelectionModel()
@@ -358,7 +358,7 @@ public class DefaultTableColumnModel
    * Sets the flag that indicates whether or not column selection is allowed.
    *
    * @param flag  the new flag value.
-   * 
+   *
    * @see #getColumnSelectionAllowed()
    */
   public void setColumnSelectionAllowed(boolean flag)
@@ -367,11 +367,11 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Returns true if column selection is allowed, and 
+   * Returns true if column selection is allowed, and
    * false if column selection is not allowed.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setColumnSelectionAllowed(boolean)
    */
   public boolean getColumnSelectionAllowed()
@@ -386,12 +386,12 @@ public class DefaultTableColumnModel
    */
   public int[] getSelectedColumns()
   {
-    // FIXME: Implementation of this method was taken from private method 
+    // FIXME: Implementation of this method was taken from private method
     // JTable.getSelections(), which is used in various places in JTable
     // including selected row calculations and cannot be simply removed.
     // This design should be improved to illuminate duplication of code.
-    
-    ListSelectionModel lsm = this.selectionModel;    
+
+    ListSelectionModel lsm = this.selectionModel;
     int sz = getSelectedColumnCount();
     int [] ret = new int[sz];
 
@@ -405,16 +405,16 @@ public class DefaultTableColumnModel
           {
           case ListSelectionModel.SINGLE_SELECTION:
             ret[0] = lo;
-            break;      
-      
-          case ListSelectionModel.SINGLE_INTERVAL_SELECTION:            
+            break;
+
+          case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
               ret[j++] = i;
             break;
-            
-          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:        
+
+          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
-              if (lsm.isSelectedIndex(i))        
+              if (lsm.isSelectedIndex(i))
                 ret[j++] = i;
             break;
           }
@@ -424,23 +424,23 @@ public class DefaultTableColumnModel
 
   /**
    * Returns the number of selected columns in the model.
-   * 
+   *
    * @return The selected column count.
-   * 
+   *
    * @see #getSelectionModel()
    */
   public int getSelectedColumnCount()
   {
-    // FIXME: Implementation of this method was taken from private method 
+    // FIXME: Implementation of this method was taken from private method
     // JTable.countSelections(), which is used in various places in JTable
     // including selected row calculations and cannot be simply removed.
     // This design should be improved to illuminate duplication of code.
-   
+
     ListSelectionModel lsm = this.selectionModel;
     int lo = lsm.getMinSelectionIndex();
     int hi = lsm.getMaxSelectionIndex();
     int sum = 0;
-    
+
     if (lo != -1 && hi != -1)
       {
         switch (lsm.getSelectionMode())
@@ -448,19 +448,19 @@ public class DefaultTableColumnModel
           case ListSelectionModel.SINGLE_SELECTION:
             sum = 1;
             break;
-            
+
           case ListSelectionModel.SINGLE_INTERVAL_SELECTION:
             sum = hi - lo + 1;
             break;
-            
-          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:        
+
+          case ListSelectionModel.MULTIPLE_INTERVAL_SELECTION:
             for (int i = lo; i <= hi; ++i)
-              if (lsm.isSelectedIndex(i))        
+              if (lsm.isSelectedIndex(i))
                 ++sum;
             break;
           }
       }
-     
+
      return sum;
   }
 
@@ -476,7 +476,7 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Deregisters a listener so that it no longer receives notification of 
+   * Deregisters a listener so that it no longer receives notification of
    * changes to this model.
    *
    * @param listener  the listener to remove
@@ -489,10 +489,10 @@ public class DefaultTableColumnModel
   /**
    * Returns an array containing the listeners that are registered with the
    * model.  If there are no listeners, an empty array is returned.
-   * 
+   *
    * @return An array containing the listeners that are registered with the
    *     model.
-   *     
+   *
    * @see #addColumnModelListener(TableColumnModelListener)
    * @since 1.4
    */
@@ -500,34 +500,34 @@ public class DefaultTableColumnModel
   {
     return (TableColumnModelListener[])
       listenerList.getListeners(TableColumnModelListener.class);
-  }	  
-
-  /**
-   * Sends the specified {@link TableColumnModelEvent} to all registered 
-   * listeners, to indicate that a column has been added to the model.  The
-   * event's toIndex attribute should contain the index of the
-   * added column.  
-   * 
-   * @param e  the event.
-   * 
-   * @see #addColumn(TableColumn)
-   */
-  protected void fireColumnAdded(TableColumnModelEvent e)
-  {    
-    TableColumnModelListener[] listeners = getColumnModelListeners();
-
-    for (int i = 0; i < listeners.length; i++)
-      listeners[i].columnAdded(e);        
   }
 
   /**
-   * Sends the specified {@link TableColumnModelEvent} to all registered 
+   * Sends the specified {@link TableColumnModelEvent} to all registered
+   * listeners, to indicate that a column has been added to the model.  The
+   * event's toIndex attribute should contain the index of the
+   * added column.
+   *
+   * @param e  the event.
+   *
+   * @see #addColumn(TableColumn)
+   */
+  protected void fireColumnAdded(TableColumnModelEvent e)
+  {
+    TableColumnModelListener[] listeners = getColumnModelListeners();
+
+    for (int i = 0; i < listeners.length; i++)
+      listeners[i].columnAdded(e);
+  }
+
+  /**
+   * Sends the specified {@link TableColumnModelEvent} to all registered
    * listeners, to indicate that a column has been removed from the model.  The
    * event's fromIndex attribute should contain the index of the
-   * removed column.  
-   * 
+   * removed column.
+   *
    * @param e  the event.
-   * 
+   *
    * @see #removeColumn(TableColumn)
    */
   protected void fireColumnRemoved(TableColumnModelEvent e)
@@ -535,18 +535,18 @@ public class DefaultTableColumnModel
     TableColumnModelListener[] listeners = getColumnModelListeners();
 
     for (int i = 0; i < listeners.length; i++)
-      listeners[i].columnRemoved(e);        
+      listeners[i].columnRemoved(e);
   }
 
   /**
-   * Sends the specified {@link TableColumnModelEvent} to all registered 
+   * Sends the specified {@link TableColumnModelEvent} to all registered
    * listeners, to indicate that a column in the model has been moved.  The
    * event's fromIndex attribute should contain the old column
    * index, and the toIndex attribute should contain the new
-   * column index.  
-   * 
+   * column index.
+   *
    * @param e  the event.
-   * 
+   *
    * @see #moveColumn(int, int)
    */
   protected void fireColumnMoved(TableColumnModelEvent e)
@@ -554,7 +554,7 @@ public class DefaultTableColumnModel
     TableColumnModelListener[] listeners = getColumnModelListeners();
 
     for (int i = 0; i < listeners.length; i++)
-      listeners[i].columnMoved(e);        
+      listeners[i].columnMoved(e);
   }
 
   /**
@@ -562,7 +562,7 @@ public class DefaultTableColumnModel
    * to indicate that the column selections have changed.
    *
    * @param e  the event.
-   * 
+   *
    * @see #valueChanged(ListSelectionEvent)
    */
   protected void fireColumnSelectionChanged(ListSelectionEvent e)
@@ -573,9 +573,9 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Sends a {@link ChangeEvent} to the model's registered listeners to 
-   * indicate that the column margin was changed.  
-   * 
+   * Sends a {@link ChangeEvent} to the model's registered listeners to
+   * indicate that the column margin was changed.
+   *
    * @see #setColumnMargin(int)
    */
   protected void fireColumnMarginChanged()
@@ -588,13 +588,13 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Returns an array containing the listeners (of the specified type) that 
+   * Returns an array containing the listeners (of the specified type) that
    * are registered with this model.
-   * 
-   * @param listenerType  the listener type (must indicate a subclass of 
+   *
+   * @param listenerType  the listener type (must indicate a subclass of
    *     {@link EventListener}, null not permitted).
    *
-   * @return An array containing the listeners (of the specified type) that 
+   * @return An array containing the listeners (of the specified type) that
    *     are registered with this model.
    */
   public  T[] getListeners(Class listenerType)
@@ -605,23 +605,23 @@ public class DefaultTableColumnModel
   /**
    * Receives notification of property changes for the columns in the model.
    * If the width property for any column changes, we invalidate
-   * the {@link #totalColumnWidth} value here. 
+   * the {@link #totalColumnWidth} value here.
    *
    * @param event  the event.
    */
   public void propertyChange(PropertyChangeEvent event)
   {
     if (event.getPropertyName().equals("width"))
-	  invalidateWidthCache(); 
+          invalidateWidthCache();
   }
 
   /**
-   * Receives notification of the change to the list selection model, and 
-   * responds by calling 
+   * Receives notification of the change to the list selection model, and
+   * responds by calling
    * {@link #fireColumnSelectionChanged(ListSelectionEvent)}.
-   * 
+   *
    * @param e  the list selection event.
-   * 
+   *
    * @see #getSelectionModel()
    */
   public void valueChanged(ListSelectionEvent e)
@@ -630,21 +630,21 @@ public class DefaultTableColumnModel
   }
 
   /**
-   * Creates a default selection model to track the currently selected 
+   * Creates a default selection model to track the currently selected
    * column(s).  This method is called by the constructor and returns a new
    * instance of {@link DefaultListSelectionModel}.
    *
    * @return A new default column selection model.
    */
   protected ListSelectionModel createSelectionModel()
-  {    
+  {
     return new DefaultListSelectionModel();
   }
 
   /**
    * Recalculates the total width of the columns, if the cached value is
    * -1.  Otherwise this method does nothing.
-   * 
+   *
    * @see #getTotalColumnWidth()
    */
   protected void recalcWidthCache()
@@ -661,7 +661,7 @@ public class DefaultTableColumnModel
 
   /**
    * Sets the {@link #totalColumnWidth} field to -1.
-   * 
+   *
    * @see #recalcWidthCache()
    */
   private void invalidateWidthCache()
diff --git a/libjava/classpath/javax/swing/table/DefaultTableModel.java b/libjava/classpath/javax/swing/table/DefaultTableModel.java
index 1b68ce2be81..e1d5e68888c 100644
--- a/libjava/classpath/javax/swing/table/DefaultTableModel.java
+++ b/libjava/classpath/javax/swing/table/DefaultTableModel.java
@@ -44,10 +44,10 @@ import java.util.Vector;
 import javax.swing.event.TableModelEvent;
 
 /**
- * A two dimensional data structure used to store Object 
+ * A two dimensional data structure used to store Object
  * instances, usually for display in a JTable component.
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
 public class DefaultTableModel extends AbstractTableModel
   implements Serializable
@@ -55,7 +55,7 @@ public class DefaultTableModel extends AbstractTableModel
   static final long serialVersionUID = 6680042567037222321L;
 
   /**
-   * Storage for the rows in the table (each row is itself 
+   * Storage for the rows in the table (each row is itself
    * a Vector).
    */
   protected Vector dataVector;
@@ -68,27 +68,27 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Creates an empty table with zero rows and zero columns.
    */
-  public DefaultTableModel() 
+  public DefaultTableModel()
   {
     this(0, 0);
   }
-  
+
   /**
    * Creates a new table with the specified number of rows and columns.
    * All cells in the table are initially empty (set to null).
-   * 
+   *
    * @param numRows  the number of rows.
    * @param numColumns  the number of columns.
    */
-  public DefaultTableModel(int numRows, int numColumns) 
+  public DefaultTableModel(int numRows, int numColumns)
   {
     Vector defaultNames = new Vector(numColumns);
     Vector data = new Vector(numRows);
-    for (int i = 0; i < numColumns; i++) 
+    for (int i = 0; i < numColumns; i++)
       {
         defaultNames.add(super.getColumnName(i));
-      }          
-    for (int r = 0; r < numRows; r++) 
+      }
+    for (int r = 0; r < numRows; r++)
       {
         Vector tmp = new Vector(numColumns);
         tmp.setSize(numColumns);
@@ -96,16 +96,16 @@ public class DefaultTableModel extends AbstractTableModel
       }
     setDataVector(data, defaultNames);
   }
-  
+
   /**
    * Creates a new table with the specified column names and number of
    * rows.  The number of columns is determined by the number of column
    * names supplied.
-   *   
+   *
    * @param columnNames the column names.
    * @param numRows the number of rows.
    */
-  public DefaultTableModel(Vector columnNames, int numRows) 
+  public DefaultTableModel(Vector columnNames, int numRows)
   {
     if (numRows < 0)
       throw new IllegalArgumentException("numRows < 0");
@@ -114,8 +114,8 @@ public class DefaultTableModel extends AbstractTableModel
 
     if (columnNames != null)
       numColumns = columnNames.size();
-    
-    while (0 < numRows--) 
+
+    while (0 < numRows--)
       {
         Vector rowData = new Vector();
         rowData.setSize(numColumns);
@@ -126,43 +126,43 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Creates a new table with the specified column names and row count.
-   * 
+   *
    * @param columnNames the column names.
    * @param numRows the number of rows.
    */
-  public DefaultTableModel(Object[] columnNames, int numRows) 
+  public DefaultTableModel(Object[] columnNames, int numRows)
   {
     this(convertToVector(columnNames), numRows);
   }
-  
+
   /**
    * Creates a new table with the specified data values and column names.
-   * 
+   *
    * @param data the data values.
    * @param columnNames the column names.
    */
-  public DefaultTableModel(Vector data, Vector columnNames) 
+  public DefaultTableModel(Vector data, Vector columnNames)
   {
     setDataVector(data, columnNames);
   }
 
   /**
    * Creates a new table with the specified data values and column names.
-   * 
+   *
    * @param data the data values.
    * @param columnNames the column names.
    */
-  public DefaultTableModel(Object[][] data, Object[] columnNames) 
+  public DefaultTableModel(Object[][] data, Object[] columnNames)
   {
     this(convertToVector(data), convertToVector(columnNames));
   }
 
   /**
    * Returns the vector containing the row data for the table.
-   * 
+   *
    * @return The data vector.
    */
-  public Vector getDataVector() 
+  public Vector getDataVector()
   {
     return dataVector;
   }
@@ -173,13 +173,13 @@ public class DefaultTableModel extends AbstractTableModel
    * number of objects in each row does not match the number of column
    * names specified, the row data is truncated or expanded (by adding
    * null values) as required.
-   * 
+   *
    * @param data the data for the table (a vector of row vectors).
    * @param columnNames the column names.
-   * 
+   *
    * @throws NullPointerException if either argument is null.
    */
-  public void setDataVector(Vector data, Vector columnNames) 
+  public void setDataVector(Vector data, Vector columnNames)
   {
     if (data == null)
       dataVector = new Vector();
@@ -190,87 +190,87 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Sets the data and column identifiers for the table.
-   * 
+   *
    * @param data the data for the table.
    * @param columnNames the column names.
-   * 
+   *
    * @throws NullPointerException if either argument is null.
    */
-  public void setDataVector(Object[][] data, Object[] columnNames) 
+  public void setDataVector(Object[][] data, Object[] columnNames)
   {
-    setDataVector(convertToVector(data), 
+    setDataVector(convertToVector(data),
                   convertToVector(columnNames));
   }
-  
+
   /**
    * Sends the specified event to all registered listeners.
-   * This method is equivalent to 
+   * This method is equivalent to
    * {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
-   * 
+   *
    * @param event the event.
    */
-  public void newDataAvailable(TableModelEvent event) 
+  public void newDataAvailable(TableModelEvent event)
   {
     fireTableChanged(event);
   }
 
   /**
    * Sends the specified event to all registered listeners.
-   * This method is equivalent to 
+   * This method is equivalent to
    * {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
-   * 
+   *
    * @param event the event.
    */
-  public void newRowsAdded(TableModelEvent event) 
+  public void newRowsAdded(TableModelEvent event)
   {
     fireTableChanged(event);
   }
 
   /**
    * Sends the specified event to all registered listeners.
-   * This method is equivalent to 
+   * This method is equivalent to
    * {@link AbstractTableModel#fireTableChanged(TableModelEvent)}.
-   * 
+   *
    * @param event the event.
    */
-  public void rowsRemoved(TableModelEvent event) 
+  public void rowsRemoved(TableModelEvent event)
   {
     fireTableChanged(event);
   }
 
   /**
    * Sets the column identifiers, updates the data rows (truncating
-   * or padding each row with null values) to match the 
+   * or padding each row with null values) to match the
    * number of columns, and sends a {@link TableModelEvent} to all
    * registered listeners.
-   * 
+   *
    * @param columnIdentifiers the column identifiers.
    */
-  public void setColumnIdentifiers(Vector columnIdentifiers) 
+  public void setColumnIdentifiers(Vector columnIdentifiers)
   {
     this.columnIdentifiers = columnIdentifiers;
     setColumnCount(columnIdentifiers == null ? 0 : columnIdentifiers.size());
   }
-  
+
   /**
    * Sets the column identifiers, updates the data rows (truncating
-   * or padding each row with null values) to match the 
+   * or padding each row with null values) to match the
    * number of columns, and sends a {@link TableModelEvent} to all
    * registered listeners.
-   * 
+   *
    * @param columnIdentifiers the column identifiers.
    */
-  public void setColumnIdentifiers(Object[] columnIdentifiers) 
+  public void setColumnIdentifiers(Object[] columnIdentifiers)
   {
     setColumnIdentifiers(convertToVector(columnIdentifiers));
   }
 
   /**
    * This method is obsolete, use {@link #setRowCount(int)} instead.
-   * 
+   *
    * @param numRows the number of rows.
    */
-  public void setNumRows(int numRows) 
+  public void setNumRows(int numRows)
   {
     setRowCount(numRows);
   }
@@ -280,18 +280,18 @@ public class DefaultTableModel extends AbstractTableModel
    * than the current number of rows in the table, rows are discarded.
    * If rowCount is greater than the current number of rows in
    * the table, new (empty) rows are added.
-   * 
+   *
    * @param rowCount the row count.
    */
-  public void setRowCount(int rowCount) 
+  public void setRowCount(int rowCount)
   {
     int existingRowCount = dataVector.size();
-    if (rowCount < existingRowCount) 
+    if (rowCount < existingRowCount)
     {
       dataVector.setSize(rowCount);
-      fireTableRowsDeleted(rowCount, existingRowCount - 1);      
+      fireTableRowsDeleted(rowCount, existingRowCount - 1);
     }
-    else 
+    else
     {
       int rowsToAdd = rowCount - existingRowCount;
       addExtraRows(rowsToAdd, columnIdentifiers.size());
@@ -303,16 +303,16 @@ public class DefaultTableModel extends AbstractTableModel
    * Sets the number of columns in the table.  Existing rows are truncated
    * or padded with null values to match the new column count.
    * A {@link TableModelEvent} is sent to all registered listeners.
-   * 
+   *
    * @param columnCount the column count.
    */
-  public void setColumnCount(int columnCount) 
+  public void setColumnCount(int columnCount)
   {
     for (int i = 0; i < dataVector.size(); ++i)
       {
         ((Vector) dataVector.get(i)).setSize(columnCount);
       }
-    if (columnIdentifiers != null)  
+    if (columnIdentifiers != null)
       columnIdentifiers.setSize(columnCount);
     fireTableStructureChanged();
   }
@@ -320,24 +320,24 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Adds a column with the specified name to the table.  All cell values
    * for the column are initially set to null.
-   * 
+   *
    * @param columnName the column name (null permitted).
    */
-  public void addColumn(Object columnName) 
+  public void addColumn(Object columnName)
   {
     addColumn(columnName, (Object[]) null);
   }
 
   /**
-   * Adds a column with the specified name and data values to the table.  
-   * 
+   * Adds a column with the specified name and data values to the table.
+   *
    * @param columnName the column name (null permitted).
    * @param columnData the column data.
    */
-  public void addColumn(Object columnName, Vector columnData) 
+  public void addColumn(Object columnName, Vector columnData)
   {
     Object[] dataArray = null;
-    if (columnData != null) 
+    if (columnData != null)
     {
       int rowCount = dataVector.size();
       if (columnData.size() < rowCount)
@@ -349,17 +349,17 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Adds a column with the specified name and data values to the table.
-   * 
+   *
    * @param columnName the column name (null permitted).
    * @param columnData the column data.
    */
-  public void addColumn(Object columnName, Object[] columnData) 
+  public void addColumn(Object columnName, Object[] columnData)
   {
     if (columnData != null)
     {
       // check columnData array for cases where the number of items
       // doesn't match the number of rows in the existing table
-      if (columnData.length > dataVector.size()) 
+      if (columnData.length > dataVector.size())
       {
         int rowsToAdd = columnData.length - dataVector.size();
         addExtraRows(rowsToAdd, columnIdentifiers.size());
@@ -382,10 +382,10 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Adds a new row containing the specified data to the table and sends a
    * {@link TableModelEvent} to all registered listeners.
-   * 
+   *
    * @param rowData the row data (null permitted).
    */
-  public void addRow(Vector rowData) 
+  public void addRow(Vector rowData)
   {
     int rowIndex = dataVector.size();
     dataVector.add(rowData);
@@ -397,21 +397,21 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Adds a new row containing the specified data to the table and sends a
    * {@link TableModelEvent} to all registered listeners.
-   * 
+   *
    * @param rowData the row data (null permitted).
    */
-  public void addRow(Object[] rowData) 
+  public void addRow(Object[] rowData)
   {
     addRow(convertToVector(rowData));
   }
 
   /**
    * Inserts a new row into the table.
-   * 
+   *
    * @param row the row index.
    * @param rowData the row data.
    */
-  public void insertRow(int row, Vector rowData) 
+  public void insertRow(int row, Vector rowData)
   {
     dataVector.add(row, rowData);
     fireTableRowsInserted(row, row);
@@ -419,11 +419,11 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Inserts a new row into the table.
-   * 
+   *
    * @param row the row index.
    * @param rowData the row data.
    */
-  public void insertRow(int row, Object[] rowData) 
+  public void insertRow(int row, Object[] rowData)
   {
     insertRow(row, convertToVector(rowData));
   }
@@ -431,21 +431,21 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Moves the rows from startIndex to endIndex
    * (inclusive) to the specified row.
-   * 
+   *
    * @param startIndex the start row.
    * @param endIndex the end row.
    * @param toIndex the row to move to.
    */
-  public void moveRow(int startIndex, int endIndex, int toIndex) 
+  public void moveRow(int startIndex, int endIndex, int toIndex)
   {
     Vector removed = new Vector();
     for (int i = endIndex; i >= startIndex; i--)
     {
       removed.add(this.dataVector.remove(i));
     }
-    for (int i = 0; i <= endIndex - startIndex; i++) 
+    for (int i = 0; i <= endIndex - startIndex; i++)
     {
-      dataVector.insertElementAt(removed.get(i), toIndex);  
+      dataVector.insertElementAt(removed.get(i), toIndex);
     }
     int firstRow = Math.min(startIndex, toIndex);
     int lastRow = Math.max(endIndex, toIndex + (endIndex - startIndex));
@@ -455,10 +455,10 @@ public class DefaultTableModel extends AbstractTableModel
   /**
    * Removes a row from the table and sends a {@link TableModelEvent} to
    * all registered listeners.
-   * 
+   *
    * @param row the row index.
    */
-  public void removeRow(int row) 
+  public void removeRow(int row)
   {
     dataVector.remove(row);
     fireTableRowsDeleted(row, row);
@@ -466,20 +466,20 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Returns the number of rows in the model.
-   * 
+   *
    * @return The row count.
    */
-  public int getRowCount() 
+  public int getRowCount()
   {
     return dataVector.size();
   }
 
   /**
    * Returns the number of columns in the model.
-   * 
+   *
    * @return The column count.
    */
-  public int getColumnCount() 
+  public int getColumnCount()
   {
     return columnIdentifiers == null ? 0 : columnIdentifiers.size();
   }
@@ -489,23 +489,23 @@ public class DefaultTableModel extends AbstractTableModel
    * the return value is the result of the .toString() method call on that
    * identifier. If the identifier is not explicitly set, the returned value
    * is calculated by {@link AbstractTableModel#getColumnName(int)}.
-   * 
+   *
    * @param column the column index.
-   * 
+   *
    * @return The column name.
    */
   public String getColumnName(int column)
   {
     String result = "";
-    if (columnIdentifiers == null) 
+    if (columnIdentifiers == null)
       result = super.getColumnName(column);
-    else 
+    else
     {
       if (column < getColumnCount())
       {
         checkSize();
         Object id = columnIdentifiers.get(column);
-        if (id != null) 
+        if (id != null)
           result = id.toString();
         else
           result = super.getColumnName(column);
@@ -520,40 +520,40 @@ public class DefaultTableModel extends AbstractTableModel
    * Returns true if the specified cell can be modified, and
    * false otherwise.  For this implementation, the method
    * always returns true.
-   * 
+   *
    * @param row the row index.
    * @param column the column index.
-   * 
+   *
    * @return true in all cases.
    */
-  public boolean isCellEditable(int row, int column) 
+  public boolean isCellEditable(int row, int column)
   {
     return true;
   }
 
   /**
    * Returns the value at the specified cell in the table.
-   * 
+   *
    * @param row the row index.
    * @param column the column index.
-   * 
-   * @return The value (Object, possibly null) at 
+   *
+   * @return The value (Object, possibly null) at
    *         the specified cell in the table.
    */
-  public Object getValueAt(int row, int column) 
+  public Object getValueAt(int row, int column)
   {
     return ((Vector) dataVector.get(row)).get(column);
   }
 
   /**
-   * Sets the value for the specified cell in the table and sends a 
+   * Sets the value for the specified cell in the table and sends a
    * {@link TableModelEvent} to all registered listeners.
-   * 
+   *
    * @param value the value (Object, null permitted).
    * @param row the row index.
    * @param column the column index.
    */
-  public void setValueAt(Object value, int row, int column) 
+  public void setValueAt(Object value, int row, int column)
   {
     ((Vector) dataVector.get(row)).set(column, value);
     fireTableCellUpdated(row, column);
@@ -561,31 +561,31 @@ public class DefaultTableModel extends AbstractTableModel
 
   /**
    * Converts the data array to a Vector.
-   * 
+   *
    * @param data the data array (null permitted).
-   * 
-   * @return A vector (or null if the data array 
+   *
+   * @return A vector (or null if the data array
    *         is null).
    */
-  protected static Vector convertToVector(Object[] data) 
+  protected static Vector convertToVector(Object[] data)
   {
     if (data == null)
       return null;
     Vector vector = new Vector(data.length);
-    for (int i = 0; i < data.length; i++) 
+    for (int i = 0; i < data.length; i++)
       vector.add(data[i]);
-    return vector;          
+    return vector;
   }
-  
+
   /**
    * Converts the data array to a Vector of rows.
-   * 
+   *
    * @param data the data array (null permitted).
-   * 
-   * @return A vector (or null if the data array 
+   *
+   * @return A vector (or null if the data array
    *         is null.
    */
-  protected static Vector convertToVector(Object[][] data) 
+  protected static Vector convertToVector(Object[][] data)
   {
     if (data == null)
       return null;
@@ -603,12 +603,12 @@ public class DefaultTableModel extends AbstractTableModel
    */
   private void addExtraRows(int rowsToAdd, int nbColumns)
   {
-    for (int i = 0; i < rowsToAdd; i++) 
+    for (int i = 0; i < rowsToAdd; i++)
       {
         Vector tmp = new Vector();
         tmp.setSize(columnIdentifiers.size());
         dataVector.add(tmp);
-      } 
+      }
   }
 
   /**
@@ -621,10 +621,10 @@ public class DefaultTableModel extends AbstractTableModel
   {
     int columnCount = getColumnCount();
     int rowCount = getRowCount();
-    
+
     if (columnCount > columnIdentifiers.size())
       columnIdentifiers.setSize(columnCount);
-           
+
     if (dataVector != null && rowCount > dataVector.size())
       {
         int rowsToAdd = rowCount - dataVector.size();
diff --git a/libjava/classpath/javax/swing/table/JTableHeader.java b/libjava/classpath/javax/swing/table/JTableHeader.java
index 4661748d0a8..4eb91156b86 100644
--- a/libjava/classpath/javax/swing/table/JTableHeader.java
+++ b/libjava/classpath/javax/swing/table/JTableHeader.java
@@ -81,23 +81,23 @@ public class JTableHeader extends JComponent
     protected class AccessibleJTableHeaderEntry extends AccessibleContext
       implements Accessible, AccessibleComponent
     {
-      
+
       private int columnIndex;
-      
+
       private JTableHeader parent;
-      
+
       private JTable table;
-      
+
       public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t)
       {
         columnIndex = c;
         parent = p;
         table = t;
       }
-      
+
       /**
        * Returns the column header renderer.
-       * 
+       *
        * @return The column header renderer.
        */
       Component getColumnHeaderRenderer()
@@ -106,14 +106,14 @@ public class JTableHeader extends JComponent
         TableCellRenderer r = tc.getHeaderRenderer();
         if (r == null)
           r = parent.getDefaultRenderer();
-        return r.getTableCellRendererComponent(table, tc.headerValue, 
+        return r.getTableCellRendererComponent(table, tc.headerValue,
             false, false, -1, columnIndex);
       }
-      
+
       /**
-       * Returns the accessible context for the column header renderer, or 
+       * Returns the accessible context for the column header renderer, or
        * null.
-       * 
+       *
        * @return The accessible context.
        */
       AccessibleContext getAccessibleColumnHeaderRenderer()
@@ -123,7 +123,7 @@ public class JTableHeader extends JComponent
           return c.getAccessibleContext();
         return null;
       }
-      
+
       /**
        * @see #removeFocusListener(FocusListener)
        */
@@ -134,7 +134,7 @@ public class JTableHeader extends JComponent
         if (c != null)
           c.addFocusListener(l);
       }
-      
+
       /**
        * @see #removePropertyChangeListener(PropertyChangeListener)
        */
@@ -146,26 +146,26 @@ public class JTableHeader extends JComponent
         if (ac != null)
           ac.addPropertyChangeListener(l);
       }
-      
+
       public boolean contains(Point p)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         AccessibleComponent c = ac.getAccessibleComponent();
         if (c != null)
           return c.contains(p);
-        else 
+        else
           return false;
       }
-      
+
       public AccessibleAction getAccessibleAction()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         if (ac instanceof AccessibleAction)
           return (AccessibleAction) ac;
-        else 
+        else
           return null;
       }
-      
+
       public Accessible getAccessibleAt(Point p)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -175,53 +175,53 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       /**
        * Returns null as the header entry has no accessible
        * children.
-       * 
+       *
        * @return null.
        */
       public Accessible getAccessibleChild(int i)
       {
         return null;
       }
-      
+
       /**
        * Returns the number of accessible children, zero in this case.
-       * 
+       *
        * @return 0
        */
       public int getAccessibleChildrenCount()
       {
         return 0;
       }
-      
+
       /**
        * Returns the accessible component for this header entry.
-       * 
+       *
        * @return this.
        */
       public AccessibleComponent getAccessibleComponent()
       {
         return this;
       }
-      
+
       /**
        * Returns the accessible context for this header entry.
-       * 
+       *
        * @return this.
        */
       public AccessibleContext getAccessibleContext()
       {
         return this;
       }
-      
+
       /**
        * Returns the accessible description.
-       * 
+       *
        * @return The accessible description.
-       * 
+       *
        * @see #setAccessibleDescription(String)
        */
       public String getAccessibleDescription()
@@ -231,22 +231,22 @@ public class JTableHeader extends JComponent
           return ac.getAccessibleDescription();
         return accessibleDescription;
       }
-      
+
       /**
        * Returns the index of this header entry.
-       * 
+       *
        * @return The index of this header entry.
        */
       public int getAccessibleIndexInParent()
       {
         return columnIndex;
       }
-      
+
       /**
        * Returns the accessible name.
-       * 
+       *
        * @return The accessible name.
-       * 
+       *
        * @see #setAccessibleName(String)
        */
       public String getAccessibleName()
@@ -256,10 +256,10 @@ public class JTableHeader extends JComponent
           return ac.getAccessibleName();
         return accessibleName;
       }
-      
+
       /**
        * Returns the accessible role for the header entry.
-       * 
+       *
        * @return The accessible role.
        */
       public AccessibleRole getAccessibleRole()
@@ -270,43 +270,43 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public AccessibleSelection getAccessibleSelection()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         if (ac instanceof AccessibleValue)
           return (AccessibleSelection) ac;
-        else 
+        else
           return null;
       }
-      
+
       public AccessibleStateSet getAccessibleStateSet()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         if (ac != null)
           return ac.getAccessibleStateSet();
-        else 
+        else
           return null;
       }
-      
+
       public AccessibleText getAccessibleText()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         if (ac != null)
           return ac.getAccessibleText();
-        else 
+        else
           return null;
       }
-      
+
       public AccessibleValue getAccessibleValue()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
         if (ac instanceof AccessibleValue)
           return (AccessibleValue) ac;
-        else 
+        else
           return null;
       }
-      
+
       public Color getBackground()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -316,7 +316,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Rectangle getBounds()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -326,7 +326,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Cursor getCursor()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -336,7 +336,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Font getFont()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -346,7 +346,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public FontMetrics getFontMetrics(Font f)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -356,7 +356,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Color getForeground()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -366,7 +366,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Locale getLocale()
       {
         Component c = getColumnHeaderRenderer();
@@ -374,7 +374,7 @@ public class JTableHeader extends JComponent
           return c.getLocale();
         return null;
       }
-      
+
       public Point getLocation()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -384,7 +384,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Point getLocationOnScreen()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -394,7 +394,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public Dimension getSize()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -404,7 +404,7 @@ public class JTableHeader extends JComponent
         else
           return null;
       }
-      
+
       public boolean isEnabled()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -414,7 +414,7 @@ public class JTableHeader extends JComponent
         else
           return false;
       }
-      
+
       public boolean isFocusTraversable()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -424,7 +424,7 @@ public class JTableHeader extends JComponent
         else
           return false;
       }
-      
+
       public boolean isShowing()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -434,7 +434,7 @@ public class JTableHeader extends JComponent
         else
           return false;
       }
-      
+
       public boolean isVisible()
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -444,7 +444,7 @@ public class JTableHeader extends JComponent
         else
           return false;
       }
-      
+
       /**
        * @see #addFocusListener(FocusListener)
        */
@@ -455,7 +455,7 @@ public class JTableHeader extends JComponent
         if (c != null)
           c.removeFocusListener(l);
       }
-      
+
       /**
        * @see #addPropertyChangeListener(PropertyChangeListener)
        */
@@ -465,7 +465,7 @@ public class JTableHeader extends JComponent
         if (ac != null)
           ac.removePropertyChangeListener(l);
       }
-      
+
       /**
        * @see #addFocusListener(FocusListener)
        */
@@ -476,7 +476,7 @@ public class JTableHeader extends JComponent
         if (c != null)
           c.requestFocus();
       }
-      
+
       /**
        * @see #getAccessibleDescription()
        */
@@ -488,7 +488,7 @@ public class JTableHeader extends JComponent
         else
           accessibleDescription = s;
       }
-      
+
       /**
        * @see #getAccessibleName()
        */
@@ -498,7 +498,7 @@ public class JTableHeader extends JComponent
         if (ac != null)
           ac.setAccessibleName(s);
       }
-      
+
       public void setBackground(Color c)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -506,7 +506,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setBackground(c);
       }
-      
+
       public void setBounds(Rectangle r)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -514,7 +514,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setBounds(r);
       }
-      
+
       public void setCursor(Cursor c)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -522,7 +522,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setCursor(c);
       }
-      
+
       public void setEnabled(boolean b)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -530,7 +530,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setEnabled(b);
       }
-      
+
       public void setFont(Font f)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -538,7 +538,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setFont(f);
       }
-      
+
       public void setForeground(Color c)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -546,7 +546,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setForeground(c);
       }
-      
+
       public void setLocation(Point p)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -554,7 +554,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setLocation(p);
       }
-      
+
       public void setSize(Dimension d)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -562,7 +562,7 @@ public class JTableHeader extends JComponent
         if (comp != null)
           comp.setSize(d);
       }
-      
+
       public void setVisible(boolean b)
       {
         AccessibleContext ac = getAccessibleColumnHeaderRenderer();
@@ -571,28 +571,28 @@ public class JTableHeader extends JComponent
           comp.setVisible(b);
       }
     }
-    
+
     public AccessibleRole getAccessibleRole()
     {
       return AccessibleRole.PANEL;
     }
-    
+
     public int getAccessibleChildrenCount()
     {
       return table.getColumnCount();
     }
-    
+
     public Accessible getAccessibleChild(int i)
     {
       return new AccessibleJTableHeaderEntry(i, JTableHeader.this, table);
     }
-    
+
     public Accessible getAccessibleAt(Point p)
     {
       return getAccessibleChild(columnAtPoint(p));
     }
   }
-  
+
   /**
    * Use serialVersionUid for interoperability.
    */
@@ -643,7 +643,7 @@ public class JTableHeader extends JComponent
    */
   protected boolean updateTableInRealTime;
 
-  TableCellRenderer cellRenderer; 
+  TableCellRenderer cellRenderer;
 
   /**
    * Creates a new default instance.
@@ -655,21 +655,21 @@ public class JTableHeader extends JComponent
 
   /**
    * Creates a new header.  If cm is null, a new
-   * table column model is created by calling 
+   * table column model is created by calling
    * {@link #createDefaultColumnModel()}.
-   * 
+   *
    * @param cm  the table column model (null permitted).
    */
   public JTableHeader(TableColumnModel cm)
   {
-    columnModel = cm == null ? createDefaultColumnModel() : cm; 
+    columnModel = cm == null ? createDefaultColumnModel() : cm;
     initializeLocalVars();
     updateUI();
   }
 
   /**
    * Creates a default table column model.
-   * 
+   *
    * @return A default table column model.
    */
   protected TableColumnModel createDefaultColumnModel()
@@ -724,7 +724,7 @@ public class JTableHeader extends JComponent
    * disabled with {@link #setReorderingAllowed(boolean)}.
    *
    * @return true if reordering is allowed, false otherwise.
-   */ 
+   */
   public boolean getReorderingAllowed()
   {
     return reorderingAllowed;
@@ -736,7 +736,7 @@ public class JTableHeader extends JComponent
    * by default, but can be disabled with {@link #setResizingAllowed(boolean)}.
    *
    * @return true if resizing is allowed, false otherwise.
-   */ 
+   */
   public boolean getResizingAllowed()
   {
     return resizingAllowed;
@@ -787,7 +787,7 @@ public class JTableHeader extends JComponent
    * Set the value of the {@link #columnModel} property.
    *
    * @param c The new value of the property
-   */ 
+   */
   public void setColumnModel(TableColumnModel c)
   {
     columnModel.removeColumnModelListener(this);
@@ -797,11 +797,11 @@ public class JTableHeader extends JComponent
 
   /**
    * Set the column that is currently being dragged. This is used when
-   * dragging the column with mouse. Setting to null will stop the 
+   * dragging the column with mouse. Setting to null will stop the
    * dragging session immediately.
    *
    * @param draggingIt the column being currently dragged, null if none.
-   */ 
+   */
   public void setDraggedColumn(TableColumn draggingIt)
   {
     draggedColumn = draggingIt;
@@ -811,7 +811,7 @@ public class JTableHeader extends JComponent
    * Set the value of the {@link #draggedDistance} property.
    *
    * @param d The new value of the property
-   */ 
+   */
   public void setDraggedDistance(int d)
   {
     draggedDistance = d;
@@ -821,7 +821,7 @@ public class JTableHeader extends JComponent
    * Set the value of the {@link #opaque} property.
    *
    * @param o The new value of the property
-   */ 
+   */
   public void setOpaque(boolean o)
   {
     opaque = o;
@@ -833,7 +833,7 @@ public class JTableHeader extends JComponent
    * disabled with this method.
    *
    * @param allowed true if reordering is allowed, false otherwise.
-   */ 
+   */
   public void setReorderingAllowed(boolean allowed)
   {
     reorderingAllowed = allowed;
@@ -845,7 +845,7 @@ public class JTableHeader extends JComponent
    * by default, but can be disabled using this method.
    *
    * @param allowed true if resizing is allowed, false otherwise.
-   */ 
+   */
   public void setResizingAllowed(boolean allowed)
   {
     resizingAllowed = allowed;
@@ -857,7 +857,7 @@ public class JTableHeader extends JComponent
    * the resizing session immediately.
    *
    * @param resizingIt the column being currently resized
-   */ 
+   */
   public void setResizingColumn(TableColumn resizingIt)
   {
     resizingColumn = resizingIt;
@@ -867,7 +867,7 @@ public class JTableHeader extends JComponent
    * Set the value of the {@link #table} property.
    *
    * @param t The new value of the property
-   */ 
+   */
   public void setTable(JTable t)
   {
     table = t;
@@ -877,7 +877,7 @@ public class JTableHeader extends JComponent
    * Set the value of the {@link #updateTableInRealTime} property.
    *
    * @param u The new value of the property
-   */ 
+   */
   public void setUpdateTableInRealTime(boolean u)
   {
     updateTableInRealTime = u;
@@ -885,17 +885,17 @@ public class JTableHeader extends JComponent
 
   /**
    * Creates a default renderer.
-   * 
+   *
    * @return A default renderer.
    */
   protected TableCellRenderer createDefaultRenderer()
   {
     return new DefaultTableCellRenderer();
   }
-  
+
   /**
    * Returns the default table cell renderer.
-   * 
+   *
    * @return The default table cell renderer.
    */
   public TableCellRenderer getDefaultRenderer()
@@ -905,19 +905,19 @@ public class JTableHeader extends JComponent
 
   /**
    * Sets the default table cell renderer.
-   * 
+   *
    * @param cellRenderer  the renderer.
    */
   public void setDefaultRenderer(TableCellRenderer cellRenderer)
   {
     this.cellRenderer = cellRenderer;
   }
-  
+
   /**
    * Get the rectangle, occupied by the header of the given column.
-   * 
+   *
    * @param column the column, for that the header area is requested.
-   * 
+   *
    * @return the column header area.
    */
   public Rectangle getHeaderRect(int column)
@@ -956,16 +956,16 @@ public class JTableHeader extends JComponent
 
   /**
    * Returns the index of the column at the specified point.
-   * 
+   *
    * @param point  the point.
-   * 
+   *
    * @return The column index, or -1.
    */
   public int columnAtPoint(Point point)
   {
     if (getBounds().contains(point))
       return columnModel.getColumnIndexAtX(point.x);
-    
+
     return -1;
   }
 
diff --git a/libjava/classpath/javax/swing/table/TableCellEditor.java b/libjava/classpath/javax/swing/table/TableCellEditor.java
index 15070a7555f..933eb9ed74d 100644
--- a/libjava/classpath/javax/swing/table/TableCellEditor.java
+++ b/libjava/classpath/javax/swing/table/TableCellEditor.java
@@ -47,7 +47,7 @@ import javax.swing.JTable;
  * TableCellEditor public interface
  * @author Andrew Selkirk
  */
-public interface TableCellEditor extends CellEditor 
+public interface TableCellEditor extends CellEditor
 {
 
   /**
@@ -59,7 +59,7 @@ public interface TableCellEditor extends CellEditor
    * @param column Column of cell
    * @return Component
    */
-  Component getTableCellEditorComponent(JTable table, Object value, 
+  Component getTableCellEditorComponent(JTable table, Object value,
       boolean isSelected, int row, int column);
 
 }
diff --git a/libjava/classpath/javax/swing/table/TableCellRenderer.java b/libjava/classpath/javax/swing/table/TableCellRenderer.java
index 6c1fecf560b..da7296de808 100644
--- a/libjava/classpath/javax/swing/table/TableCellRenderer.java
+++ b/libjava/classpath/javax/swing/table/TableCellRenderer.java
@@ -46,7 +46,7 @@ import javax.swing.JTable;
  * TableCellRenderer public interface
  * @author Andrew Selkirk
  */
-public interface TableCellRenderer 
+public interface TableCellRenderer
 {
 
   /**
@@ -59,7 +59,7 @@ public interface TableCellRenderer
    * @param column Column of cell
    * @return Component
    */
-  Component getTableCellRendererComponent(JTable table, Object value, 
+  Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column);
 
 
diff --git a/libjava/classpath/javax/swing/table/TableColumn.java b/libjava/classpath/javax/swing/table/TableColumn.java
index fbb877d977d..8db4bf6d00b 100644
--- a/libjava/classpath/javax/swing/table/TableColumn.java
+++ b/libjava/classpath/javax/swing/table/TableColumn.java
@@ -49,8 +49,8 @@ import javax.swing.event.SwingPropertyChangeSupport;
 /**
  * Represents the attributes of a column in a table, including the column index,
  * width, minimum width, preferred width and maximum width.
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  */
 public class TableColumn
   implements Serializable
@@ -59,7 +59,7 @@ public class TableColumn
 
   /**
    * The name for the columnWidth property (this field is
-   * obsolete and no longer used).  Note also that the typo in the value 
+   * obsolete and no longer used).  Note also that the typo in the value
    * string is deliberate, to match the specification.
    */
   public static final String COLUMN_WIDTH_PROPERTY = "columWidth";
@@ -158,9 +158,9 @@ public class TableColumn
   }
 
   /**
-   * Creates a new TableColumn that maps to the specified column 
+   * Creates a new TableColumn that maps to the specified column
    * in the related table model.  The default width is 75 units.
-   * 
+   *
    * @param modelIndex the index of the column in the model
    */
   public TableColumn(int modelIndex)
@@ -169,9 +169,9 @@ public class TableColumn
   }
 
   /**
-   * Creates a new TableColumn that maps to the specified column 
+   * Creates a new TableColumn that maps to the specified column
    * in the related table model, and has the specified width.
-   * 
+   *
    * @param modelIndex the index of the column in the model
    * @param width the width
    */
@@ -181,10 +181,10 @@ public class TableColumn
   }
 
   /**
-   * Creates a new TableColumn that maps to the specified column 
+   * Creates a new TableColumn that maps to the specified column
    * in the related table model, and has the specified width,
    * cellRenderer and cellEditor.
-   * 
+   *
    * @param modelIndex the index of the column in the model
    * @param width the width
    * @param cellRenderer the cell renderer (null permitted).
@@ -206,9 +206,9 @@ public class TableColumn
    * Sets the index of the column in the related {@link TableModel} that this
    * TableColumn maps to, and sends a {@link PropertyChangeEvent}
    * (with the property name 'modelIndex') to all registered listeners.
-   * 
+   *
    * @param modelIndex the column index in the model.
-   * 
+   *
    * @see #getModelIndex()
    */
   public void setModelIndex(int modelIndex)
@@ -224,9 +224,9 @@ public class TableColumn
   /**
    * Returns the index of the column in the related {@link TableModel} that
    * this TableColumn maps to.
-   * 
+   *
    * @return the model index.
-   * 
+   *
    * @see #setModelIndex(int)
    */
   public int getModelIndex()
@@ -237,15 +237,15 @@ public class TableColumn
   /**
    * Sets the identifier for the column and sends a {@link PropertyChangeEvent}
    * (with the property name 'identifier') to all registered listeners.
-   * 
+   *
    * @param identifier the identifier (null permitted).
-   * 
+   *
    * @see #getIdentifier()
    */
   public void setIdentifier(Object identifier)
   {
     if (this.identifier != identifier)
-      {       
+      {
         Object oldValue = this.identifier;
         this.identifier = identifier;
         changeSupport.firePropertyChange("identifier", oldValue, identifier);
@@ -253,10 +253,10 @@ public class TableColumn
   }
 
   /**
-   * Returns the identifier for the column, or {@link #getHeaderValue()} if the 
+   * Returns the identifier for the column, or {@link #getHeaderValue()} if the
    * identifier is null.
-   * 
-   * @return The identifier (or {@link #getHeaderValue()} if the identifier is 
+   *
+   * @return The identifier (or {@link #getHeaderValue()} if the identifier is
    *         null).
    */
   public Object getIdentifier()
@@ -267,29 +267,29 @@ public class TableColumn
   }
 
   /**
-   * Sets the header value and sends a {@link PropertyChangeEvent} (with the 
+   * Sets the header value and sends a {@link PropertyChangeEvent} (with the
    * property name {@link #HEADER_VALUE_PROPERTY}) to all registered listeners.
-   * 
+   *
    * @param headerValue the value of the header (null permitted).
-   * 
+   *
    * @see #getHeaderValue()
    */
   public void setHeaderValue(Object headerValue)
   {
     if (this.headerValue == headerValue)
       return;
-    
+
     Object oldValue = this.headerValue;
     this.headerValue = headerValue;
-    changeSupport.firePropertyChange(HEADER_VALUE_PROPERTY, oldValue, 
+    changeSupport.firePropertyChange(HEADER_VALUE_PROPERTY, oldValue,
                                      headerValue);
   }
 
   /**
    * Returns the header value.
-   * 
+   *
    * @return the value of the header.
-   * 
+   *
    * @see #getHeaderValue()
    */
   public Object getHeaderValue()
@@ -298,30 +298,30 @@ public class TableColumn
   }
 
   /**
-   * Sets the renderer for the column header and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * Sets the renderer for the column header and sends a
+   * {@link PropertyChangeEvent} (with the property name
    * {@link #HEADER_RENDERER_PROPERTY}) to all registered listeners.
-   * 
+   *
    * @param renderer the header renderer (null permitted).
-   * 
+   *
    * @see #getHeaderRenderer()
    */
   public void setHeaderRenderer(TableCellRenderer renderer)
   {
     if (headerRenderer == renderer)
       return;
-    
+
     TableCellRenderer oldRenderer = headerRenderer;
     headerRenderer = renderer;
-    changeSupport.firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer, 
+    changeSupport.firePropertyChange(HEADER_RENDERER_PROPERTY, oldRenderer,
                                      headerRenderer);
   }
 
   /**
    * Returns the renderer for the column header.
-   * 
+   *
    * @return The renderer for the column header (possibly null).
-   * 
+   *
    * @see #setHeaderRenderer(TableCellRenderer)
    */
   public TableCellRenderer getHeaderRenderer()
@@ -330,30 +330,30 @@ public class TableColumn
   }
 
   /**
-   * Sets the renderer for cells in this column and sends a 
-   * {@link PropertyChangeEvent} (with the property name 
+   * Sets the renderer for cells in this column and sends a
+   * {@link PropertyChangeEvent} (with the property name
    * {@link #CELL_RENDERER_PROPERTY}) to all registered listeners.
-   * 
+   *
    * @param renderer the cell renderer (null permitted).
-   * 
+   *
    * @see #getCellRenderer()
    */
   public void setCellRenderer(TableCellRenderer renderer)
   {
     if (cellRenderer == renderer)
       return;
-    
+
     TableCellRenderer oldRenderer = cellRenderer;
     cellRenderer = renderer;
-    changeSupport.firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer, 
+    changeSupport.firePropertyChange(CELL_RENDERER_PROPERTY, oldRenderer,
                                      cellRenderer);
   }
 
   /**
    * Returns the renderer for the table cells in this column.
-   * 
+   *
    * @return The cell renderer (possibly null).
-   * 
+   *
    * @see #setCellRenderer(TableCellRenderer)
    */
   public TableCellRenderer getCellRenderer()
@@ -364,9 +364,9 @@ public class TableColumn
   /**
    * Sets the cell editor for the column and sends a {@link PropertyChangeEvent}
    * (with the property name 'cellEditor') to all registered listeners.
-   * 
+   *
    * @param cellEditor the cell editor (null permitted).
-   * 
+   *
    * @see #getCellEditor()
    */
   public void setCellEditor(TableCellEditor cellEditor)
@@ -380,11 +380,11 @@ public class TableColumn
   }
 
   /**
-   * Returns the cell editor for the column (the default value is 
+   * Returns the cell editor for the column (the default value is
    * null).
-   * 
+   *
    * @return The cell editor (possibly null).
-   * 
+   *
    * @see #setCellEditor(TableCellEditor)
    */
   public TableCellEditor getCellEditor()
@@ -393,18 +393,18 @@ public class TableColumn
   }
 
   /**
-   * Sets the width for the column and sends a {@link PropertyChangeEvent} 
+   * Sets the width for the column and sends a {@link PropertyChangeEvent}
    * (with the property name 'width') to all registered listeners.  If the new
-   * width falls outside the range getMinWidth() to getMaxWidth() it is 
+   * width falls outside the range getMinWidth() to getMaxWidth() it is
    * adjusted to the appropriate boundary value.
-   * 
+   *
    * @param newWidth the width.
-   * 
+   *
    * @see #getWidth()
    */
   public void setWidth(int newWidth)
   {
-    int	oldWidth = width;
+    int oldWidth = width;
 
     if (newWidth < minWidth)
       width = minWidth;
@@ -425,7 +425,7 @@ public class TableColumn
 
   /**
    * Returns the width for the column (the default value is 75).
-   * 
+   *
    * @return The width.
    *
    * @see #setWidth(int)
@@ -436,14 +436,14 @@ public class TableColumn
   }
 
   /**
-   * Sets the preferred width for the column and sends a 
-   * {@link PropertyChangeEvent} (with the property name 'preferredWidth') to 
-   * all registered listeners.  If necessary, the supplied value will be 
-   * adjusted to fit in the range {@link #getMinWidth()} to 
+   * Sets the preferred width for the column and sends a
+   * {@link PropertyChangeEvent} (with the property name 'preferredWidth') to
+   * all registered listeners.  If necessary, the supplied value will be
+   * adjusted to fit in the range {@link #getMinWidth()} to
    * {@link #getMaxWidth()}.
-   * 
+   *
    * @param preferredWidth  the preferred width.
-   * 
+   *
    * @see #getPreferredWidth()
    */
   public void setPreferredWidth(int preferredWidth)
@@ -457,16 +457,16 @@ public class TableColumn
     else
       this.preferredWidth = preferredWidth;
 
-    changeSupport.firePropertyChange("preferredWidth", oldPrefWidth, 
+    changeSupport.firePropertyChange("preferredWidth", oldPrefWidth,
                                      this.preferredWidth);
   }
 
   /**
-   * Returns the preferred width for the column (the default value is 
+   * Returns the preferred width for the column (the default value is
    * 75).
-   * 
+   *
    * @return The preferred width.
-   * 
+   *
    * @see #setPreferredWidth(int)
    */
   public int getPreferredWidth()
@@ -475,14 +475,14 @@ public class TableColumn
   }
 
   /**
-   * Sets the minimum width for the column and sends a 
+   * Sets the minimum width for the column and sends a
    * {@link PropertyChangeEvent} (with the property name 'minWidth') to all
-   * registered listeners.  If the current width and/or 
+   * registered listeners.  If the current width and/or
    * preferredWidth are less than the new minimum width, they are
    * adjusted accordingly.
-   * 
+   *
    * @param minWidth  the minimum width (negative values are treated as 0).
-   * 
+   *
    * @see #getMinWidth()
    */
   public void setMinWidth(int minWidth)
@@ -504,9 +504,9 @@ public class TableColumn
   /**
    * Returns the TableColumn's minimum width (the default value
    * is 15).
-   * 
+   *
    * @return The minimum width.
-   * 
+   *
    * @see #setMinWidth(int)
    */
   public int getMinWidth()
@@ -515,14 +515,14 @@ public class TableColumn
   }
 
   /**
-   * Sets the maximum width for the column and sends a 
+   * Sets the maximum width for the column and sends a
    * {@link PropertyChangeEvent} (with the property name 'maxWidth') to all
-   * registered listeners.  If the current width and/or 
-   * preferredWidth are greater than the new maximum width, they 
+   * registered listeners.  If the current width and/or
+   * preferredWidth are greater than the new maximum width, they
    * are adjusted accordingly.
-   * 
+   *
    * @param maxWidth the maximum width.
-   * 
+   *
    * @see #getMaxWidth()
    */
   public void setMaxWidth(int maxWidth)
@@ -542,9 +542,9 @@ public class TableColumn
   /**
    * Returns the maximum width for the column (the default value is
    * {@link Integer#MAX_VALUE}).
-   * 
+   *
    * @return The maximum width for the column.
-   * 
+   *
    * @see #setMaxWidth(int)
    */
   public int getMaxWidth()
@@ -556,10 +556,10 @@ public class TableColumn
    * Sets the flag that controls whether or not the column is resizable, and
    * sends a {@link PropertyChangeEvent} (with the property name 'isResizable')
    * to all registered listeners.
-   * 
+   *
    * @param isResizable true if this column is resizable,
    * false otherwise.
-   * 
+   *
    * @see #getResizable()
    */
   public void setResizable(boolean isResizable)
@@ -567,17 +567,17 @@ public class TableColumn
     if (this.isResizable != isResizable)
       {
         this.isResizable = isResizable;
-        changeSupport.firePropertyChange("isResizable", !this.isResizable, 
+        changeSupport.firePropertyChange("isResizable", !this.isResizable,
             isResizable);
       }
   }
 
   /**
    * Returns the flag that controls whether or not the column is resizable.
-   * 
+   *
    * @return true if this column is resizable,
    * false otherwise.
-   * 
+   *
    * @see #setResizable(boolean)
    */
   public boolean getResizable()
@@ -594,7 +594,7 @@ public class TableColumn
   {
     if (headerRenderer == null)
       return;
-    Component c = headerRenderer.getTableCellRendererComponent(null, 
+    Component c = headerRenderer.getTableCellRendererComponent(null,
         getHeaderValue(), false, false, 0, 0);
     Dimension min = c.getMinimumSize();
     Dimension max = c.getMaximumSize();
@@ -624,27 +624,27 @@ public class TableColumn
   }
 
   /**
-   * Adds a listener so that it receives {@link PropertyChangeEvent} 
+   * Adds a listener so that it receives {@link PropertyChangeEvent}
    * notifications from this column.  The properties defined by the column are:
    * 
                      
    * 
                    • width - see {@link #setWidth(int)};
                      • 
    * 
                    • preferredWidth - see {@link #setPreferredWidth(int)};
                      • 
-   * 
                    • minWidth - see {@link #setMinWidth(int)};
                      •  
+   * 
                    • minWidth - see {@link #setMinWidth(int)};
                      • 
    * 
                    • maxWidth - see {@link #setMaxWidth(int)};
                      • 
    * 
                    • modelIndex - see {@link #setModelIndex(int)};
                      • 
    * 
                    • isResizable - see {@link #setResizable(boolean)};
                      • 
-   * 
                    • cellRenderer - see 
+   * 
                    • cellRenderer - see
    *   {@link #setCellRenderer(TableCellRenderer)};
                      • 
-   * 
                    • cellEditor - see 
+   * 
                    • cellEditor - see
    *   {@link #setCellEditor(TableCellEditor)};
                      • 
-   * 
                    • headerRenderer - see 
+   * 
                    • headerRenderer - see
    *   {@link #setHeaderRenderer(TableCellRenderer)};
                      • 
    * 
                    • headerValue - see {@link #setHeaderValue(Object)};
                      • 
    * 
                    • identifier - see {@link #setIdentifier(Object)}.
                      • 
    * 
                    
-   * 
+   *
    * @param listener the listener to add (null is ignored).
-   * 
+   *
    * @see #removePropertyChangeListener(PropertyChangeListener)
    */
   public synchronized void addPropertyChangeListener(
@@ -654,11 +654,11 @@ public class TableColumn
   }
 
   /**
-   * Removes a listener so that it no longer receives 
-   * {@link PropertyChangeEvent} notifications from this column.  If 
-   * listener is not registered with the column, or is 
+   * Removes a listener so that it no longer receives
+   * {@link PropertyChangeEvent} notifications from this column.  If
+   * listener is not registered with the column, or is
    * null, this method does nothing.
-   * 
+   *
    * @param listener the listener to remove (null is ignored).
    */
   public synchronized void removePropertyChangeListener(
@@ -670,9 +670,9 @@ public class TableColumn
   /**
    * Returns the property change listeners for this TableColumn.
    * An empty array is returned if there are currently no listeners registered.
-   * 
+   *
    * @return The property change listeners registered with this column.
-   * 
+   *
    * @since 1.4
    */
   public PropertyChangeListener[] getPropertyChangeListeners()
@@ -683,7 +683,7 @@ public class TableColumn
   /**
    * Creates and returns a default renderer for the column header (in this case,
    * a new instance of {@link DefaultTableCellRenderer}).
-   * 
+   *
    * @return A default renderer for the column header.
    */
   protected TableCellRenderer createDefaultHeaderRenderer()
diff --git a/libjava/classpath/javax/swing/table/TableColumnModel.java b/libjava/classpath/javax/swing/table/TableColumnModel.java
index 7e8a70c3a5b..9a95f92cc0b 100644
--- a/libjava/classpath/javax/swing/table/TableColumnModel.java
+++ b/libjava/classpath/javax/swing/table/TableColumnModel.java
@@ -49,17 +49,17 @@ import javax.swing.event.TableColumnModelListener;
 /**
  * The interface used by {@link JTable} to access the columns in the table
  * view.
- * 
+ *
  * @author Andrew Selkirk
  */
 public interface TableColumnModel
 {
   /**
    * Adds a column to the model.
-   * 
+   *
    * @param column  the new column (null not permitted).
-   * 
-   * @throws IllegalArgumentException if column is 
+   *
+   * @throws IllegalArgumentException if column is
    *         null.
    */
   void addColumn(TableColumn column);
@@ -67,14 +67,14 @@ public interface TableColumnModel
   /**
    * Removes a column from the model.  If column is not defined
    * in the model, this method does nothing.
-   * 
+   *
    * @param column TableColumn
    */
   void removeColumn(TableColumn column);
 
   /**
    * Moves a column.
-   * 
+   *
    * @param columnIndex Index of column to move
    * @param newIndex New index of column
    */
@@ -83,23 +83,23 @@ public interface TableColumnModel
   /**
    * Sets the column margin and sends a {@link ChangeEvent} to all registered
    * {@link TableColumnModelListener}s registered with the model.
-   * 
+   *
    * @param margin  the column margin.
-   * 
+   *
    * @see #getColumnMargin()
    */
   void setColumnMargin(int margin);
 
   /**
    * Returns the number of columns in the model.
-   * 
+   *
    * @return The column count.
    */
   int getColumnCount();
 
   /**
    * Returns an enumeration of the columns in the model.
-   * 
+   *
    * @return An enumeration of the columns in the model.
    */
   Enumeration getColumns();
@@ -108,28 +108,28 @@ public interface TableColumnModel
    * Returns the index of the {@link TableColumn} with the given identifier.
    *
    * @param identifier  the identifier (null not permitted).
-   * 
+   *
    * @return The index of the {@link TableColumn} with the given identifier.
-   * 
-   * @throws IllegalArgumentException if identifier is 
+   *
+   * @throws IllegalArgumentException if identifier is
    *         null or there is no column with that identifier.
    */
   int getColumnIndex(Object identifier);
 
   /**
    * Returns the TableColumn at the specified index.
-   * 
+   *
    * @param columnIndex  the column index.
-   * 
+   *
    * @return The table column.
    */
   TableColumn getColumn(int columnIndex);
 
   /**
    * Returns the column margin.
-   * 
+   *
    * @return The column margin.
-   * 
+   *
    * @see #setColumnMargin(int)
    */
   int getColumnMargin();
@@ -143,11 +143,11 @@ public interface TableColumnModel
    * 
                  • individual column widths are taken into account, but the column margin
    *     is ignored.
                    • 
    * 
-   * If no column contains the specified position, this method returns 
+   * If no column contains the specified position, this method returns
    * -1.
-   * 
+   *
    * @param xPosition  the x-position.
-   * 
+   *
    * @return The column index, or -1.
    */
   int getColumnIndexAtX(int xPosition);
@@ -164,17 +164,17 @@ public interface TableColumnModel
    * Sets the flag that indicates whether or not column selection is allowed.
    *
    * @param allowed  the new flag value.
-   * 
+   *
    * @see #getColumnSelectionAllowed()
    */
   void setColumnSelectionAllowed(boolean allowed);
 
   /**
-   * Returns true if column selection is allowed, and 
+   * Returns true if column selection is allowed, and
    * false if column selection is not allowed.
    *
    * @return A boolean.
-   * 
+   *
    * @see #setColumnSelectionAllowed(boolean)
    */
   boolean getColumnSelectionAllowed();
@@ -187,29 +187,29 @@ public interface TableColumnModel
 
   /**
    * Returns the number of selected columns in the model.
-   * 
+   *
    * @return The selected column count.
-   * 
+   *
    * @see #getSelectionModel()
    */
   int getSelectedColumnCount();
 
   /**
-   * Sets the selection model that will be used to keep track of the selected 
+   * Sets the selection model that will be used to keep track of the selected
    * columns.
    *
    * @param model  the selection model (null not permitted).
-   * 
-   * @throws IllegalArgumentException if model is 
+   *
+   * @throws IllegalArgumentException if model is
    *     null.
    */
   void setSelectionModel(ListSelectionModel model);
 
   /**
    * Returns the selection model used to track table column selections.
-   * 
+   *
    * @return The selection model.
-   * 
+   *
    * @see #setSelectionModel(ListSelectionModel)
    */
   ListSelectionModel getSelectionModel();
@@ -223,9 +223,9 @@ public interface TableColumnModel
   void addColumnModelListener(TableColumnModelListener listener);
 
   /**
-   * Deregisters a listener, so that it will no longer receive 
+   * Deregisters a listener, so that it will no longer receive
    * {@link TableColumnModelEvent} notifications.
-   * 
+   *
    * @param listener  the listener.
    */
   void removeColumnModelListener(TableColumnModelListener listener);
diff --git a/libjava/classpath/javax/swing/table/TableModel.java b/libjava/classpath/javax/swing/table/TableModel.java
index 7629fa4e404..d8fb7131fe9 100644
--- a/libjava/classpath/javax/swing/table/TableModel.java
+++ b/libjava/classpath/javax/swing/table/TableModel.java
@@ -40,48 +40,48 @@ package javax.swing.table;
 import javax.swing.event.TableModelListener;
 
 /**
- * A TableModel is a two dimensional data structure that 
+ * A TableModel is a two dimensional data structure that
  * can store arbitrary Object instances, usually for the
- * purpose of display in a {@link javax.swing.JTable} component.  Individual 
- * objects can be accessed by specifying the row index and column index for 
+ * purpose of display in a {@link javax.swing.JTable} component.  Individual
+ * objects can be accessed by specifying the row index and column index for
  * the object.  Each column in the model has a name associated with it.
  * 
                    
  * The {@link DefaultTableModel} class provides one implementation of
  * this interface.
- * 
+ *
  * @author Andrew Selkirk
  */
 public interface TableModel
 {
   /**
    * Returns the number of rows in the model.
-   * 
+   *
    * @return The row count.
    */
   int getRowCount();
 
   /**
    * Returns the number of columns in the model.
-   * 
+   *
    * @return The column count
    */
   int getColumnCount();
 
   /**
    * Returns the name of a column in the model.
-   * 
+   *
    * @param columnIndex the column index.
-   * 
+   *
    * @return The column name.
    */
   String getColumnName(int columnIndex);
 
   /**
    * Returns the Class for all Object instances
-   * in the specified column.  
-   * 
+   * in the specified column.
+   *
    * @param columnIndex the column index.
-   * 
+   *
    * @return The class.
    */
   Class getColumnClass(int columnIndex);
@@ -89,10 +89,10 @@ public interface TableModel
   /**
    * Returns true if the cell is editable, and false
    * otherwise.
-   * 
+   *
    * @param rowIndex the row index.
    * @param columnIndex the column index.
-   * 
+   *
    * @return true if editable, false otherwise.
    */
   boolean isCellEditable(int rowIndex, int columnIndex);
@@ -100,17 +100,17 @@ public interface TableModel
   /**
    * Returns the value (Object) at a particular cell in the
    * table.
-   * 
+   *
    * @param rowIndex the row index.
    * @param columnIndex the column index.
-   * 
+   *
    * @return The value at the specified cell.
    */
   Object getValueAt(int rowIndex, int columnIndex);
 
   /**
-   * Sets the value at a particular cell in the table.  
-   * 
+   * Sets the value at a particular cell in the table.
+   *
    * @param aValue the value (null permitted).
    * @param rowIndex the row index.
    * @param columnIndex the column index.
@@ -120,14 +120,14 @@ public interface TableModel
   /**
    * Adds a listener to the model.  The listener will receive notification
    * of updates to the model.
-   * 
+   *
    * @param listener the listener.
    */
   void addTableModelListener(TableModelListener listener);
 
   /**
    * Removes a listener from the model.
-   * 
+   *
    * @param listener the listener.
    */
   void removeTableModelListener(TableModelListener listener);
diff --git a/libjava/classpath/javax/swing/text/AbstractDocument.java b/libjava/classpath/javax/swing/text/AbstractDocument.java
index 29b20b321fb..25915bb5a23 100644
--- a/libjava/classpath/javax/swing/text/AbstractDocument.java
+++ b/libjava/classpath/javax/swing/text/AbstractDocument.java
@@ -149,22 +149,22 @@ public abstract class AbstractDocument implements Document, Serializable
    * Manages event listeners for this Document.
    */
   protected EventListenerList listenerList = new EventListenerList();
-  
+
   /**
    * Stores the current writer thread.  Used for locking.
-   */ 
+   */
   private Thread currentWriter = null;
-  
+
   /**
    * The number of readers.  Used for locking.
    */
   private int numReaders = 0;
-  
+
   /**
    * The number of current writers. If this is > 1 then the same thread entered
    * the write lock more than once.
    */
-  private int numWriters = 0;  
+  private int numWriters = 0;
 
   /** An instance of a DocumentFilter.FilterBypass which allows calling
    * the insert, remove and replace method without checking for an installed
@@ -234,17 +234,17 @@ public abstract class AbstractDocument implements Document, Serializable
         writeUnlock();
       }
   }
-  
+
   /** Returns the DocumentFilter.FilterBypass instance for this
    * document and create it if it does not exist yet.
-   *  
+   *
    * @return This document's DocumentFilter.FilterBypass instance.
    */
   private DocumentFilter.FilterBypass getBypass()
   {
     if (bypass == null)
       bypass = new Bypass();
-    
+
     return bypass;
   }
 
@@ -283,7 +283,7 @@ public abstract class AbstractDocument implements Document, Serializable
    * @see BranchElement
    */
   protected Element createBranchElement(Element parent,
-					AttributeSet attributes)
+                                        AttributeSet attributes)
   {
     return new BranchElement(parent, attributes);
   }
@@ -303,7 +303,7 @@ public abstract class AbstractDocument implements Document, Serializable
    * @see LeafElement
    */
   protected Element createLeafElement(Element parent, AttributeSet attributes,
-				      int start, int end)
+                                      int start, int end)
   {
     return new LeafElement(parent, attributes, start, end);
   }
@@ -413,7 +413,7 @@ public abstract class AbstractDocument implements Document, Serializable
     Object val = getProperty(AsyncLoadPriority);
     int prio = -1;
     if (val != null)
-      prio = ((Integer) val).intValue(); 
+      prio = ((Integer) val).intValue();
     return prio;
   }
 
@@ -621,13 +621,13 @@ public abstract class AbstractDocument implements Document, Serializable
   /**
    * Inserts a String into this Document at the specified
    * position and assigning the specified attributes to it.
-   * 
+   *
    * 
                    If a {@link DocumentFilter} is installed in this document, the
    * corresponding method of the filter object is called.
                    
-   * 
+   *
    * 
                    The method has no effect when text is null
    * or has a length of zero.
                    
-   * 
+   *
    *
    * @param offset the location at which the string should be inserted
    * @param text the content to be inserted
@@ -665,7 +665,7 @@ public abstract class AbstractDocument implements Document, Serializable
       return;
     DefaultDocumentEvent event =
       new DefaultDocumentEvent(offset, text.length(),
-			       DocumentEvent.EventType.INSERT);
+                               DocumentEvent.EventType.INSERT);
 
     UndoableEdit undo = content.insertString(offset, text);
     if (undo != null)
@@ -1078,14 +1078,14 @@ public abstract class AbstractDocument implements Document, Serializable
     // balance by using a finally block:
     // readLock()
     // try
-    // { 
-    //   doSomethingHere 
+    // {
+    //   doSomethingHere
     // }
     // finally
     // {
     //   readUnlock();
     // }
-    
+
     // All that the JDK seems to check for is that you don't call unlock
     // more times than you've previously called lock, but it doesn't make
     // sure that the threads calling unlock were the same ones that called lock
@@ -1096,13 +1096,13 @@ public abstract class AbstractDocument implements Document, Serializable
     if (currentWriter == Thread.currentThread())
       return;
 
-    // FIXME: the reference implementation throws a 
+    // FIXME: the reference implementation throws a
     // javax.swing.text.StateInvariantError here
     if (numReaders <= 0)
       throw new IllegalStateException("document lock failure");
-    
-    // If currentWriter is not null, the application code probably had a 
-    // writeLock and then tried to obtain a readLock, in which case 
+
+    // If currentWriter is not null, the application code probably had a
+    // writeLock and then tried to obtain a readLock, in which case
     // numReaders wasn't incremented
     numReaders--;
     notify();
@@ -1110,16 +1110,16 @@ public abstract class AbstractDocument implements Document, Serializable
 
   /**
    * Removes a piece of content from this Document.
-   * 
+   *
    * 
                    If a {@link DocumentFilter} is installed in this document, the
    * corresponding method of the filter object is called. The
    * DocumentFilter is called even if length
    * is zero. This is different from {@link #replace}.
                    
-   * 
+   *
    * 
                    Note: When length is zero or below the call is not
    * forwarded to the underlying {@link AbstractDocument.Content} instance
    * of this document and no exception is thrown.
                    
-   * 
+   *
    * @param offset the start offset of the fragment to be removed
    * @param length the length of the fragment to be removed
    *
@@ -1159,8 +1159,8 @@ public abstract class AbstractDocument implements Document, Serializable
         DefaultDocumentEvent event =
           new DefaultDocumentEvent(offset, length,
                                    DocumentEvent.EventType.REMOVE);
-    
-        // The order of the operations below is critical!        
+
+        // The order of the operations below is critical!
         removeUpdate(event);
         UndoableEdit temp = content.remove(offset, length);
 
@@ -1172,10 +1172,10 @@ public abstract class AbstractDocument implements Document, Serializable
   /**
    * Replaces a piece of content in this Document with
    * another piece of content.
-   * 
+   *
    * 
                    If a {@link DocumentFilter} is installed in this document, the
    * corresponding method of the filter object is called.
                    
-   * 
+   *
    * 
                    The method has no effect if length is zero (and
    * only zero) and, at the same time, text is
    * null or has zero length.
                    
@@ -1196,7 +1196,7 @@ public abstract class AbstractDocument implements Document, Serializable
     throws BadLocationException
   {
     // Bail out if we have a bogus replacement (Behavior observed in RI).
-    if (length == 0 
+    if (length == 0
         && (text == null || text.length() == 0))
       return;
 
@@ -1222,9 +1222,9 @@ public abstract class AbstractDocument implements Document, Serializable
         writeUnlock();
       }
   }
-  
+
   void replaceImpl(int offset, int length, String text,
-		      AttributeSet attributes)
+                      AttributeSet attributes)
     throws BadLocationException
   {
     removeImpl(offset, length);
@@ -1356,7 +1356,7 @@ public abstract class AbstractDocument implements Document, Serializable
   }
 
   /**
-   * Blocks until a write lock can be obtained.  Must wait if there are 
+   * Blocks until a write lock can be obtained.  Must wait if there are
    * readers currently reading or another thread is currently writing.
    */
   protected synchronized final void writeLock()
@@ -1882,7 +1882,7 @@ public abstract class AbstractDocument implements Document, Serializable
     /**
      * Returns the resolve parent of this element.
      * This is taken from the AttributeSet, but if this is null,
-     * this method instead returns the Element's parent's 
+     * this method instead returns the Element's parent's
      * AttributeSet
      *
      * @return the resolve parent of this element
@@ -1919,7 +1919,7 @@ public abstract class AbstractDocument implements Document, Serializable
      *         is equal to this element's AttributeSet,
      *         false otherwise
      */
-    public boolean isEqual(AttributeSet attrs) 
+    public boolean isEqual(AttributeSet attrs)
     {
       return attributes.isEqual(attrs);
     }
@@ -2066,7 +2066,7 @@ public abstract class AbstractDocument implements Document, Serializable
                                                       + "must not be thrown "
                                                       + "here.");
               err.initCause(ex);
-	      throw err;
+              throw err;
             }
           b.append("]\n");
         }
@@ -2137,7 +2137,7 @@ public abstract class AbstractDocument implements Document, Serializable
 
       for (int index = 0; index < numChildren; ++index)
         tmp.add(children[index]);
-      
+
       return tmp.elements();
     }
 
@@ -2337,11 +2337,11 @@ public abstract class AbstractDocument implements Document, Serializable
       // as beginning from first element each time.
       for (int index = 0; index < numChildren; ++index)
         {
-	  Element elem = children[index];
+          Element elem = children[index];
 
-	  if ((elem.getStartOffset() <= position)
-	      && (position < elem.getEndOffset()))
-	    return elem;
+          if ((elem.getStartOffset() <= position)
+              && (position < elem.getEndOffset()))
+            return elem;
         }
 
       return null;
@@ -2359,7 +2359,7 @@ public abstract class AbstractDocument implements Document, Serializable
       int delta = elements.length - length;
       int copyFrom = offset + length; // From where to copy.
       int copyTo = copyFrom + delta;    // Where to copy to.
-      int numMove = numChildren - copyFrom; // How many elements are moved. 
+      int numMove = numChildren - copyFrom; // How many elements are moved.
       if (numChildren + delta > children.length)
         {
           // Gotta grow the array.
@@ -2386,7 +2386,7 @@ public abstract class AbstractDocument implements Document, Serializable
     public String toString()
     {
       return ("BranchElement(" + getName() + ") "
-	      + getStartOffset() + "," + getEndOffset() + "\n");
+              + getStartOffset() + "," + getEndOffset() + "\n");
     }
   }
 
@@ -2403,7 +2403,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * The threshold that indicates when we switch to using a Hashtable.
      */
     private static final int THRESHOLD = 10;
-    
+
     /** The starting offset of the change. */
     private int offset;
 
@@ -2417,7 +2417,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * Maps Element to their change records. This is only
      * used when the changes array gets too big. We can use an
      * (unsync'ed) HashMap here, since changes to this are (should) always
-     * be performed inside a write lock. 
+     * be performed inside a write lock.
      */
     private HashMap changes;
 
@@ -2435,7 +2435,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * @param type the type of change
      */
     public DefaultDocumentEvent(int offset, int length,
-				DocumentEvent.EventType type)
+                                DocumentEvent.EventType type)
     {
       this.offset = offset;
       this.length = length;
@@ -2548,7 +2548,7 @@ public abstract class AbstractDocument implements Document, Serializable
         }
       return change;
     }
-    
+
     /**
      * Returns a String description of the change event.  This returns the
      * toString method of the Vector of edits.
@@ -2558,7 +2558,7 @@ public abstract class AbstractDocument implements Document, Serializable
       return edits.toString();
     }
   }
-  
+
   /**
    * An implementation of {@link DocumentEvent.ElementChange} to be added
    * to {@link DefaultDocumentEvent}s.
@@ -2588,7 +2588,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * The added elements.
      */
     private Element[] added;
-    
+
     /**
      * Creates a new ElementEdit.
      *
@@ -2598,7 +2598,7 @@ public abstract class AbstractDocument implements Document, Serializable
      * @param added the added elements
      */
     public ElementEdit(Element elem, int index,
-		       Element[] removed, Element[] added)
+                       Element[] removed, Element[] added)
     {
       this.elem = elem;
       this.index = index;
@@ -2811,7 +2811,7 @@ public abstract class AbstractDocument implements Document, Serializable
     public String toString()
     {
       return ("LeafElement(" + getName() + ") "
-	      + getStartOffset() + "," + getEndOffset() + "\n");
+              + getStartOffset() + "," + getEndOffset() + "\n");
     }
   }
 
@@ -2900,7 +2900,7 @@ public abstract class AbstractDocument implements Document, Serializable
     {
       AbstractDocument.this.replaceImpl(offset, length, string, attrs);
     }
-    
+
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/text/AbstractWriter.java b/libjava/classpath/javax/swing/text/AbstractWriter.java
index 8d5a6075df4..e7df26e9e09 100644
--- a/libjava/classpath/javax/swing/text/AbstractWriter.java
+++ b/libjava/classpath/javax/swing/text/AbstractWriter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -66,7 +66,7 @@ public abstract class AbstractWriter
   // Number of characters we have currently written.
   private int lineLength;
   // True if we can apply line wrapping.
-  private boolean canWrapLines;	// FIXME default?
+  private boolean canWrapLines; // FIXME default?
   // The number of spaces per indentation level.
   private int indentSpace = 2;
   // The current indentation level.
@@ -167,7 +167,7 @@ public abstract class AbstractWriter
   /**
    * This method must be overridden by a concrete subclass.  It is
    * responsible for iterating over the Elements of the Document and
-   * writing them out. 
+   * writing them out.
    */
   protected abstract void write() throws IOException, BadLocationException;
 
@@ -182,9 +182,9 @@ public abstract class AbstractWriter
   {
     if (! elt.isLeaf())
       throw new BadLocationException("Element is not a leaf",
-				     elt.getStartOffset());
-    return document.getText(elt.getStartOffset(), 
-			    elt.getEndOffset() - elt.getStartOffset());
+                                     elt.getStartOffset());
+    return document.getText(elt.getStartOffset(),
+                            elt.getEndOffset() - elt.getStartOffset());
   }
 
   /**
@@ -239,37 +239,37 @@ public abstract class AbstractWriter
   {
     if (getCanWrapLines())
       {
-	// FIXME: should we be handling newlines specially here?
-	for (int i = 0; i < len; )
-	  {
-	    int start_i = i;
-	    // Find next space.
-	    while (i < len && data[start + i] != ' ')
-	      ++i;
-	    if (i < len && lineLength + i - start_i >= maxLineLength)
-	      writeLineSeparator();
-	    else if (i < len)
-	      {
-		// Write the trailing space.
-		++i;
-	      }
-	    // Write out the text.
-	    output(data, start + start_i, start + i - start_i);
-	  }
+        // FIXME: should we be handling newlines specially here?
+        for (int i = 0; i < len; )
+          {
+            int start_i = i;
+            // Find next space.
+            while (i < len && data[start + i] != ' ')
+              ++i;
+            if (i < len && lineLength + i - start_i >= maxLineLength)
+              writeLineSeparator();
+            else if (i < len)
+              {
+                // Write the trailing space.
+                ++i;
+              }
+            // Write out the text.
+            output(data, start + start_i, start + i - start_i);
+          }
       }
     else
       {
-	int saved_i = start;
-	for (int i = start; i < start + len; ++i)
-	  {
-	    if (data[i] == NEWLINE)
-	      {
-		output(data, saved_i, i - saved_i);
-		writeLineSeparator();
-	      }
-	  }
-	if (saved_i < start + len - 1)
-	  output(data, saved_i, start + len - saved_i);
+        int saved_i = start;
+        for (int i = start; i < start + len; ++i)
+          {
+            if (data[i] == NEWLINE)
+              {
+                output(data, saved_i, i - saved_i);
+                writeLineSeparator();
+              }
+          }
+        if (saved_i < start + len - 1)
+          output(data, saved_i, start + len - saved_i);
       }
   }
 
@@ -284,9 +284,9 @@ public abstract class AbstractWriter
     int spaces = indentLevel * indentSpace;
     if (spaces > 0)
       {
-	char[] v = new char[spaces];
-	Arrays.fill(v, ' ');
-	write(v, 0, v.length);
+        char[] v = new char[spaces];
+        Arrays.fill(v, ' ');
+        write(v, 0, v.length);
       }
     indented = true;
   }
@@ -318,7 +318,7 @@ public abstract class AbstractWriter
     int eltStart = elt.getStartOffset();
     int eltEnd = elt.getEndOffset();
     return ((eltStart >= startOffset && eltStart < endOffset)
-	    || (eltEnd >= startOffset && eltEnd < endOffset));
+            || (eltEnd >= startOffset && eltEnd < endOffset));
   }
 
   /**
@@ -472,10 +472,10 @@ public abstract class AbstractWriter
     Enumeration e = attrs.getAttributeNames();
     while (e.hasMoreElements())
       {
-	Object name = e.nextElement();
-	Object val = attrs.getAttribute(name);
-	write(name + "=" + val);
-	writeLineSeparator();
+        Object name = e.nextElement();
+        Object val = attrs.getAttribute(name);
+        write(name + "=" + val);
+        writeLineSeparator();
       }
   }
 }
diff --git a/libjava/classpath/javax/swing/text/AsyncBoxView.java b/libjava/classpath/javax/swing/text/AsyncBoxView.java
index 327c2b895d9..aca77aa3ba1 100644
--- a/libjava/classpath/javax/swing/text/AsyncBoxView.java
+++ b/libjava/classpath/javax/swing/text/AsyncBoxView.java
@@ -160,7 +160,7 @@ public class AsyncBoxView
      *
      * @param index the index of the child view
      * @param a the current allocation of this view
-     * 
+     *
      * @return the current allocation for a child view
      */
     public synchronized Shape getChildAllocation(int index, Shape a)
@@ -216,7 +216,7 @@ public class AsyncBoxView
     /**
      * Returns the current allocation of the child view with the specified
      * index. Note that this will not update any location information.
-     * 
+     *
      * @param index the index of the requested child view
      *
      * @return the current allocation of the child view with the specified
@@ -428,7 +428,7 @@ public class AsyncBoxView
      * Returns the child view for which this ChildState represents
      * the layout state.
      *
-     * @return the child view for this child state object 
+     * @return the child view for this child state object
      */
     public View getChildView()
     {
@@ -1002,7 +1002,7 @@ public class AsyncBoxView
         replace(0, 0, added);
       }
   }
-  
+
   /**
    * Returns the span along an axis that is taken up by the insets.
    *
@@ -1355,14 +1355,14 @@ public class AsyncBoxView
                 return;
               }
           }
-        int index = getViewIndexAtPosition(view.getStartOffset(), 
+        int index = getViewIndexAtPosition(view.getStartOffset(),
                                            Position.Bias.Forward);
         ChildState cs = getChildState(index);
         cs.preferenceChanged(width, height);
         LayoutQueue q = getLayoutQueue();
         q.addTask(cs);
         q.addTask(flushTask);
-      }    
+      }
   }
 
   /**
@@ -1375,7 +1375,7 @@ public class AsyncBoxView
    * @param e the document event
    * @param a the current allocation of this view
    */
-  protected void updateLayout(DocumentEvent.ElementChange ec, 
+  protected void updateLayout(DocumentEvent.ElementChange ec,
                               DocumentEvent e, Shape a)
   {
     if (ec != null)
@@ -1385,8 +1385,8 @@ public class AsyncBoxView
         locator.childChanged(cs);
       }
   }
-  
-  
+
+
   /**
    * Returns the ChildState object associated with the child view
    * at the specified index.
@@ -1416,7 +1416,7 @@ public class AsyncBoxView
   /**
    * Returns the child view index of the view that represents the specified
    * position in the document model.
-   * 
+   *
    * @param pos the position in the model
    * @param b the bias
    *
diff --git a/libjava/classpath/javax/swing/text/AttributeSet.java b/libjava/classpath/javax/swing/text/AttributeSet.java
index 2d39881c28b..a596cd4c33b 100644
--- a/libjava/classpath/javax/swing/text/AttributeSet.java
+++ b/libjava/classpath/javax/swing/text/AttributeSet.java
@@ -1,4 +1,4 @@
-/* AttributeSet.java -- 
+/* AttributeSet.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ import java.util.Enumeration;
  * @author Roman Kennke (roman@kennke.org)
  */
 public interface AttributeSet
-{ 
+{
   /**
    * Used as keys to identify character-run attributes.
    */
@@ -191,5 +191,5 @@ public interface AttributeSet
    *         are equal to the attributes in this AttributeSet,
    *         false otherwise
    */
-  boolean isEqual(AttributeSet attr);     
+  boolean isEqual(AttributeSet attr);
 }
diff --git a/libjava/classpath/javax/swing/text/BoxView.java b/libjava/classpath/javax/swing/text/BoxView.java
index 0754d9b9b8b..325364d2b9a 100644
--- a/libjava/classpath/javax/swing/text/BoxView.java
+++ b/libjava/classpath/javax/swing/text/BoxView.java
@@ -155,8 +155,8 @@ public class BoxView
    * automatically when any of the child view changes its preferences
    * via {@link #preferenceChanged(View, boolean, boolean)}.
    *
-   * The layout will be updated the next time when 
-   * {@link #setSize(float, float)} is called, typically from within the 
+   * The layout will be updated the next time when
+   * {@link #setSize(float, float)} is called, typically from within the
    * {@link #paint(Graphics, Shape)} method.
    *
    * Valid values for the axis are {@link View#X_AXIS} and
@@ -387,7 +387,7 @@ public class BoxView
     int totalDescentMin = 0;
     int totalDescentPref = 0;
     int totalDescentMax = 0;
-    
+
     int count = getViewCount();
     for (int i = 0; i < count; i++)
       {
@@ -578,7 +578,7 @@ public class BoxView
 
     return res;
   }
-  
+
 
   /**
    * Returns true if the specified point lies before the
@@ -699,7 +699,7 @@ public class BoxView
    * Computes the allocation for a child View. The parameter
    * a stores the allocation of this CompositeView
    * and is then adjusted to hold the allocation of the child view.
-   * 
+   *
    * @param index
    *          the index of the child View
    * @param a
@@ -957,13 +957,13 @@ public class BoxView
      updateRequirements(axis);
      return requirements[axis].alignment;
   }
-  
+
   /**
    * Called by a child View when its preferred span has changed.
-   * 
+   *
    * @param width indicates that the preferred width of the child changed.
    * @param height indicates that the preferred height of the child changed.
-   * @param child the child View. 
+   * @param child the child View.
    */
   public void preferenceChanged(View child, boolean width, boolean height)
   {
@@ -979,7 +979,7 @@ public class BoxView
       }
     super.preferenceChanged(child, width, height);
   }
-  
+
   /**
    * Maps the document model position pos to a Shape
    * in the view coordinate space.  This method overrides CompositeView's
diff --git a/libjava/classpath/javax/swing/text/Caret.java b/libjava/classpath/javax/swing/text/Caret.java
index d6411905dda..06972f904f0 100644
--- a/libjava/classpath/javax/swing/text/Caret.java
+++ b/libjava/classpath/javax/swing/text/Caret.java
@@ -1,4 +1,4 @@
-/* Caret.java -- 
+/* Caret.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -77,7 +77,7 @@ public interface Caret
    * @param c the text component to install this caret to
    */
   void install(JTextComponent c);
-  
+
   /**
    * Deinstalls this Caret from the specified text component.
    * This usually involves removing listeners from the text component.
@@ -105,7 +105,7 @@ public interface Caret
    * @param rate the new blink rate to set
    */
   void setBlinkRate(int rate);
-  
+
   /**
    * Returns the current position of this Caret within the
    * Document.
@@ -125,7 +125,7 @@ public interface Caret
    * @see #moveDot(int)
    */
   void setDot(int dot);
-  
+
   /**
    * Moves the dot location without touching the
    * mark. This is used when making a selection.
@@ -135,7 +135,7 @@ public interface Caret
    * @see #setDot(int)
    */
   void moveDot(int dot);
-  
+
   /**
    * Returns the current position of the mark. The
    * mark marks the location in the Document that
@@ -145,7 +145,7 @@ public interface Caret
    * @return the current position of the mark
    */
   int getMark();
-  
+
   /**
    * Returns the current visual position of this Caret.
    *
@@ -194,7 +194,7 @@ public interface Caret
    * Caret, false hides it.
    *
    * @param v the visibility to set
-   */  
+   */
   void setVisible(boolean v);
 
   /**
@@ -203,5 +203,5 @@ public interface Caret
    *
    * @param g the graphics context to render to
    */
-  void paint(Graphics g);  
+  void paint(Graphics g);
 }
diff --git a/libjava/classpath/javax/swing/text/ComponentView.java b/libjava/classpath/javax/swing/text/ComponentView.java
index 8de4de60fa3..3680b424561 100644
--- a/libjava/classpath/javax/swing/text/ComponentView.java
+++ b/libjava/classpath/javax/swing/text/ComponentView.java
@@ -1,4 +1,4 @@
-/* ComponentView.java -- 
+/* ComponentView.java --
    Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -459,7 +459,7 @@ public class ComponentView extends View
           }
       }
   }
-    
+
   /**
    * Maps coordinates from the View's space into a position
    * in the document model.
diff --git a/libjava/classpath/javax/swing/text/CompositeView.java b/libjava/classpath/javax/swing/text/CompositeView.java
index 570fc955c88..ae3c79d2f71 100644
--- a/libjava/classpath/javax/swing/text/CompositeView.java
+++ b/libjava/classpath/javax/swing/text/CompositeView.java
@@ -309,7 +309,7 @@ public abstract class CompositeView
    *         listed valid values
    */
   public Shape modelToView(int p1, Position.Bias b1,
-			   int p2, Position.Bias b2, Shape a)
+                           int p2, Position.Bias b2, Shape a)
     throws BadLocationException
   {
     // TODO: This is most likely not 100% ok, figure out what else is to
@@ -346,7 +346,7 @@ public abstract class CompositeView
    * of the caret when navigating around the document with the arrow keys. This
    * is a convenience method for {@link #getNextNorthSouthVisualPositionFrom}
    * and {@link #getNextEastWestVisualPositionFrom}.
-   * 
+   *
    * @param pos
    *          the model position to start search from
    * @param b
@@ -662,7 +662,7 @@ public abstract class CompositeView
     // This limitation is described as PR 27345.
     int index = getViewIndex(pos, b);
     View v = null;
-    
+
     if (index == -1)
       return pos;
 
@@ -673,7 +673,7 @@ public abstract class CompositeView
         // provided.
         if (index <= 0)
           return pos;
-        
+
         v = getView(index - 1);
         break;
       case SOUTH:
@@ -681,13 +681,13 @@ public abstract class CompositeView
         // provided.
         if (index >= getViewCount() - 1)
           return pos;
-        
+
         v = getView(index + 1);
         break;
       default:
           throw new IllegalArgumentException();
     }
-    
+
     return v.getNextVisualPositionFrom(pos, b, a, direction, biasRet);
   }
 
@@ -738,9 +738,9 @@ public abstract class CompositeView
     //
     // This limitation is described as PR 27346.
     int index;
-    
+
     View v = null;
-    
+
     switch (direction)
     {
       case EAST:
@@ -749,7 +749,7 @@ public abstract class CompositeView
         // provided.
         if (index == -1)
           return pos;
-        
+
         v  = getView(index);
         break;
       case WEST:
@@ -758,13 +758,13 @@ public abstract class CompositeView
         // provided.
         if (index == -1)
           return pos;
-        
+
         v  = getView(index);
         break;
       default:
         throw new IllegalArgumentException();
     }
-    
+
     return v.getNextVisualPositionFrom(pos,
                                        b,
                                        a,
diff --git a/libjava/classpath/javax/swing/text/DefaultCaret.java b/libjava/classpath/javax/swing/text/DefaultCaret.java
index c4c2580c398..acfcdb36825 100644
--- a/libjava/classpath/javax/swing/text/DefaultCaret.java
+++ b/libjava/classpath/javax/swing/text/DefaultCaret.java
@@ -70,15 +70,15 @@ import javax.swing.text.Position.Bias;
 public class DefaultCaret extends Rectangle
   implements Caret, FocusListener, MouseListener, MouseMotionListener
 {
-  
+
   /** A text component in the current VM which currently has a
    * text selection or null.
-   */ 
+   */
   static JTextComponent componentWithSelection;
 
   /** An implementation of NavigationFilter.FilterBypass which delegates
-   * to the corresponding methods of the DefaultCaret. 
-   * 
+   * to the corresponding methods of the DefaultCaret.
+   *
    * @author Robert Schuster (robertschuster@fsfe.org)
    */
   class Bypass extends NavigationFilter.FilterBypass
@@ -98,9 +98,9 @@ public class DefaultCaret extends Rectangle
     {
       DefaultCaret.this.setDotImpl(dot);
     }
-    
+
   }
-  
+
   /**
    * Controls the blinking of the caret.
    *
@@ -116,11 +116,11 @@ public class DefaultCaret extends Rectangle
      * the caret visible one iteration longer.
      */
     boolean ignoreNextEvent;
-    
+
     /**
      * Receives notification when the blink timer fires and updates the visible
      * state of the caret.
-     * 
+     *
      * @param event the action event
      */
     public void actionPerformed(ActionEvent event)
@@ -138,7 +138,7 @@ public class DefaultCaret extends Rectangle
   /**
    * Listens for changes in the text component's document and updates the
    * caret accordingly.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   private class DocumentHandler implements DocumentListener
@@ -162,10 +162,10 @@ public class DefaultCaret extends Rectangle
      */
     public void insertUpdate(DocumentEvent event)
     {
-      if (policy == ALWAYS_UPDATE || 
-          (SwingUtilities.isEventDispatchThread() && 
+      if (policy == ALWAYS_UPDATE ||
+          (SwingUtilities.isEventDispatchThread() &&
            policy == UPDATE_WHEN_ON_EDT))
-        {        
+        {
           int dot = getDot();
           setDot(dot + event.getLength());
         }
@@ -216,14 +216,14 @@ public class DefaultCaret extends Rectangle
      */
     public void propertyChange(PropertyChangeEvent e)
     {
-      String name = e.getPropertyName(); 
-      
+      String name = e.getPropertyName();
+
       if (name.equals("document"))
         {
           Document oldDoc = (Document) e.getOldValue();
           if (oldDoc != null)
             oldDoc.removeDocumentListener(documentListener);
-          
+
           Document newDoc = (Document) e.getNewValue();
           if (newDoc != null)
             newDoc.addDocumentListener(documentListener);
@@ -238,19 +238,19 @@ public class DefaultCaret extends Rectangle
           active = (((Boolean) e.getNewValue()).booleanValue()
                    && textComponent.isEditable());
         }
-      
+
     }
-    
+
   }
 
   /** The serialization UID (compatible with JDK1.5). */
   private static final long serialVersionUID = 4325555698756477346L;
-  
+
   /**
    * Indicates the Caret position should always be updated after Document
    * changes even if the updates are not performed on the Event Dispatching
    * thread.
-   * 
+   *
    * @since 1.5
    */
   public static final int ALWAYS_UPDATE = 2;
@@ -259,22 +259,22 @@ public class DefaultCaret extends Rectangle
    * Indicates the Caret position should not be changed unless the Document
    * length becomes less than the Caret position, in which case the Caret
    * is moved to the end of the Document.
-   * 
+   *
    * @since 1.5
    */
   public static final int NEVER_UPDATE = 1;
-  
-  /** 
+
+  /**
    * Indicates the Caret position should be updated only if Document changes
    * are made on the Event Dispatcher thread.
-   *  
+   *
    * @since 1.5
    */
   public static final int UPDATE_WHEN_ON_EDT = 0;
-  
+
   /** Keeps track of the current update policy **/
   int policy = UPDATE_WHEN_ON_EDT;
-    
+
   /**
    * The ChangeEvent that is fired by {@link #fireStateChanged()}.
    */
@@ -297,7 +297,7 @@ public class DefaultCaret extends Rectangle
 
   /**
    * The text component in which this caret is installed.
-   * 
+   *
    * (Package private to avoid synthetic accessor method.)
    */
   JTextComponent textComponent;
@@ -332,11 +332,11 @@ public class DefaultCaret extends Rectangle
    * package private to avoid an accessor method.
    */
   boolean visible = false;
-  
+
   /** Indicates whether the text component where the caret is installed is
    * editable and enabled. If either of these properties is false
    * the caret is not drawn.
-   */ 
+   */
   boolean active = true;
 
   /**
@@ -345,7 +345,7 @@ public class DefaultCaret extends Rectangle
   private Object highlightEntry;
 
   private Timer blinkTimer;
-  
+
   private BlinkTimerListener blinkListener;
 
   /**
@@ -362,10 +362,10 @@ public class DefaultCaret extends Rectangle
   {
     // Nothing to do here.
   }
-  
+
   /** Returns the caret's NavigationFilter.FilterBypass instance
    * and creates it if it does not yet exist.
-   * 
+   *
    * @return The caret's NavigationFilter.FilterBypass instance.
    */
   private NavigationFilter.FilterBypass getBypass()
@@ -375,17 +375,17 @@ public class DefaultCaret extends Rectangle
 
   /**
    * Sets the Caret update policy.
-   *    
+   *
    * @param policy the new policy.  Valid values are:
    * ALWAYS_UPDATE: always update the Caret position, even when Document
    * updates don't occur on the Event Dispatcher thread.
    * NEVER_UPDATE: don't update the Caret position unless the Document
    * length becomes less than the Caret position (then update the
    * Caret to the end of the Document).
-   * UPDATE_WHEN_ON_EDT: update the Caret position when the 
-   * Document updates occur on the Event Dispatcher thread.  This is the 
+   * UPDATE_WHEN_ON_EDT: update the Caret position when the
+   * Document updates occur on the Event Dispatcher thread.  This is the
    * default.
-   * 
+   *
    * @since 1.5
    * @throws IllegalArgumentException if policy is not one of the above.
    */
@@ -393,15 +393,15 @@ public class DefaultCaret extends Rectangle
   {
     if (policy != ALWAYS_UPDATE && policy != NEVER_UPDATE
         && policy != UPDATE_WHEN_ON_EDT)
-      throw new 
+      throw new
         IllegalArgumentException
         ("policy must be ALWAYS_UPDATE, NEVER__UPDATE, or UPDATE_WHEN_ON_EDT");
     this.policy = policy;
   }
-  
+
   /**
    * Gets the caret update policy.
-   * 
+   *
    * @return the caret update policy.
    * @since 1.5
    */
@@ -409,11 +409,11 @@ public class DefaultCaret extends Rectangle
   {
     return policy;
   }
-  
+
   /**
    * Moves the caret position when the mouse is dragged over the text
    * component, modifying the selectiony.
-   * 
+   *
    * 
                    When the text component where the caret is installed is disabled,
    * the selection is not change but you can still scroll the text and
    * update the caret's location.
                    
@@ -462,9 +462,9 @@ public class DefaultCaret extends Rectangle
     // Do not modify selection if component is disabled.
     if (!textComponent.isEnabled())
       return;
-    
+
     int count = event.getClickCount();
-    
+
     if (event.getButton() == MouseEvent.BUTTON1 && count >= 2)
       {
         int newDot = getComponent().viewToModel(event.getPoint());
@@ -480,7 +480,7 @@ public class DefaultCaret extends Rectangle
             else
               {
                 int wordStart = Utilities.getWordStart(t, newDot);
-                
+
                 // When the mouse points at the offset of the first character
                 // in a word Utilities().getPreviousWord will not return that
                 // word but we want to select that. We have to use
@@ -495,7 +495,7 @@ public class DefaultCaret extends Rectangle
                     int nextWord = Utilities.getNextWord(t, newDot);
                     int previousWord = Utilities.getPreviousWord(t, newDot);
                     int previousWordEnd = Utilities.getWordEnd(t, previousWord);
-                    
+
                     // If the user clicked in the space between two words,
                     // then select the space.
                     if (newDot >= previousWordEnd && newDot <= nextWord)
@@ -517,7 +517,7 @@ public class DefaultCaret extends Rectangle
             // TODO: Swallowing ok here?
           }
       }
-    
+
   }
 
   /**
@@ -552,7 +552,7 @@ public class DefaultCaret extends Rectangle
    */
   public void mousePressed(MouseEvent event)
   {
-    
+
     // The implementation assumes that consuming the event makes the AWT event
     // mechanism forget about this event instance and not transfer focus.
     // By observing how the RI reacts the following behavior has been
@@ -617,14 +617,14 @@ public class DefaultCaret extends Rectangle
   {
     if (textComponent.isEditable())
       {
-        setVisible(true);    
+        setVisible(true);
         updateTimerStatus();
       }
   }
 
   /**
    * Sets the caret to invisible.
-   * 
+   *
    * @param event the FocusEvent
    */
   public void focusLost(FocusEvent event)
@@ -632,13 +632,13 @@ public class DefaultCaret extends Rectangle
     if (textComponent.isEditable() && event.isTemporary() == false)
       {
         setVisible(false);
-        
+
         // Stop the blinker, if running.
         if (blinkTimer != null && blinkTimer.isRunning())
           blinkTimer.stop();
       }
   }
-  
+
   /**
    * Install (if not present) and start the timer, if the caret must blink. The
    * caret does not blink if it is invisible, or the component is disabled or
@@ -724,11 +724,11 @@ public class DefaultCaret extends Rectangle
     propertyChangeListener = new PropertyChangeHandler();
     textComponent.addPropertyChangeListener(propertyChangeListener);
     documentListener = new DocumentHandler();
-    
+
     Document doc = textComponent.getDocument();
     if (doc != null)
       doc.addDocumentListener(documentListener);
-    
+
     active = textComponent.isEditable() && textComponent.isEnabled();
 
     repaint();
@@ -769,21 +769,21 @@ public class DefaultCaret extends Rectangle
   {
     return mark;
   }
-  
+
   private void clearHighlight()
   {
     Highlighter highlighter = textComponent.getHighlighter();
-    
+
     if (highlighter == null)
       return;
-    
+
     if (selectionVisible)
       {
     try
       {
         if (highlightEntry != null)
           highlighter.changeHighlight(highlightEntry, 0, 0);
-        
+
         // Free the global variable which stores the text component with an active
         // selection.
         if (componentWithSelection == textComponent)
@@ -808,22 +808,22 @@ public class DefaultCaret extends Rectangle
   private void handleHighlight()
   {
     Highlighter highlighter = textComponent.getHighlighter();
-    
+
     if (highlighter == null)
       return;
-    
+
     int p0 = Math.min(dot, mark);
     int p1 = Math.max(dot, mark);
-    
+
     if (selectionVisible)
       {
-	try
-	  {
-	    if (highlightEntry == null)
-	      highlightEntry = highlighter.addHighlight(p0, p1, getSelectionPainter());
-	    else
-	      highlighter.changeHighlight(highlightEntry, p0, p1);
-            
+        try
+          {
+            if (highlightEntry == null)
+              highlightEntry = highlighter.addHighlight(p0, p1, getSelectionPainter());
+            else
+              highlighter.changeHighlight(highlightEntry, p0, p1);
+
             // If another component currently has a text selection clear that selection
             // first.
             if (componentWithSelection != null)
@@ -833,21 +833,21 @@ public class DefaultCaret extends Rectangle
                   c.setDot(c.getDot());
                 }
             componentWithSelection = textComponent;
-            
-	  }
-	catch (BadLocationException e)
-	  {
-	    // This should never happen.
-	    throw new InternalError();
-	  }
+
+          }
+        catch (BadLocationException e)
+          {
+            // This should never happen.
+            throw new InternalError();
+          }
       }
     else
       {
-	if (highlightEntry != null)
-	  {
-	    highlighter.removeHighlight(highlightEntry);
-	    highlightEntry = null;
-	  }
+        if (highlightEntry != null)
+          {
+            highlighter.removeHighlight(highlightEntry);
+            highlightEntry = null;
+          }
       }
   }
 
@@ -861,7 +861,7 @@ public class DefaultCaret extends Rectangle
   {
     if (selectionVisible == v)
       return;
-    
+
     selectionVisible = v;
     handleHighlight();
     repaint();
@@ -1049,7 +1049,7 @@ public class DefaultCaret extends Rectangle
    *
    * 
                    If the underlying text component has a {@link NavigationFilter}
    * installed the caret will call the corresponding method of that object.
                    
-   * 
+   *
    * @param dot the location where to move the dot
    *
    * @see #setDot(int)
@@ -1062,7 +1062,7 @@ public class DefaultCaret extends Rectangle
     else
       moveDotImpl(dot);
   }
-  
+
   void moveDotImpl(int dot)
   {
     if (dot >= 0)
@@ -1071,7 +1071,7 @@ public class DefaultCaret extends Rectangle
         if (doc != null)
           this.dot = Math.min(dot, doc.getLength());
         this.dot = Math.max(this.dot, 0);
-        
+
         handleHighlight();
 
         appear();
@@ -1082,10 +1082,10 @@ public class DefaultCaret extends Rectangle
    * Sets the current position of this Caret within the
    * Document. This also sets the mark to the new
    * location.
-   * 
+   *
    * 
                    If the underlying text component has a {@link NavigationFilter}
    * installed the caret will call the corresponding method of that object.
                    
-   * 
+   *
    * @param dot
    *          the new position to be set
    * @see #moveDot(int)
@@ -1098,27 +1098,27 @@ public class DefaultCaret extends Rectangle
     else
       setDotImpl(dot);
   }
-  
+
   void setDotImpl(int dot)
   {
     if (dot >= 0)
-      {        
+      {
         Document doc = textComponent.getDocument();
         if (doc != null)
           this.dot = Math.min(dot, doc.getLength());
         this.dot = Math.max(this.dot, 0);
         this.mark = this.dot;
-        
+
         clearHighlight();
-        
+
         appear();
       }
   }
-  
+
   /**
    * Show the caret (may be hidden due blinking) and adjust the timer not to
    * hide it (possibly immediately).
-   * 
+   *
    * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
    */
   void appear()
@@ -1137,7 +1137,7 @@ public class DefaultCaret extends Rectangle
         visible = true;
 
         Rectangle area = null;
-	int dot = getDot();
+        int dot = getDot();
         try
           {
             area = getComponent().modelToView(dot);
@@ -1158,7 +1158,7 @@ public class DefaultCaret extends Rectangle
           }
       }
     repaint();
-  }  
+  }
 
   /**
    * Returns true if this Caret is blinking,
@@ -1195,7 +1195,7 @@ public class DefaultCaret extends Rectangle
    * Caret, false hides it.
    *
    * @param v the visibility to set
-   */  
+   */
   public void setVisible(boolean v)
   {
     if (v != visible)
@@ -1203,17 +1203,17 @@ public class DefaultCaret extends Rectangle
         visible = v;
         updateTimerStatus();
         Rectangle area = null;
-	int dot = getDot();
+        int dot = getDot();
         try
-          {            
+          {
             area = getComponent().modelToView(dot);
           }
         catch (BadLocationException e)
           {
-	    AssertionError ae;
-	    ae = new AssertionError("Unexpected bad caret location: " + dot);
-	    ae.initCause(e);
-	    throw ae;
+            AssertionError ae;
+            ae = new AssertionError("Unexpected bad caret location: " + dot);
+            ae.initCause(e);
+            throw ae;
           }
         if (area != null)
           damage(area);
@@ -1258,7 +1258,7 @@ public class DefaultCaret extends Rectangle
           // Should not happen.
           throw new InternalError("Caret location not within document range.");
         }
-      
+
     repaint();
   }
 
@@ -1283,5 +1283,5 @@ public class DefaultCaret extends Rectangle
     blinkTimer = new Timer(getBlinkRate(), blinkListener);
     blinkTimer.setRepeats(true);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/text/DefaultEditorKit.java b/libjava/classpath/javax/swing/text/DefaultEditorKit.java
index 0d999a38096..b3b7e6077ef 100644
--- a/libjava/classpath/javax/swing/text/DefaultEditorKit.java
+++ b/libjava/classpath/javax/swing/text/DefaultEditorKit.java
@@ -79,11 +79,11 @@ public class DefaultEditorKit extends EditorKit
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getPreviousWord(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.moveDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -109,11 +109,11 @@ public class DefaultEditorKit extends EditorKit
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getNextWord(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.moveDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -132,17 +132,17 @@ public class DefaultEditorKit extends EditorKit
     {
       super(selectionBeginWordAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getWordStart(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.moveDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -154,24 +154,24 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class SelectionEndWordAction extends TextAction
   {
     SelectionEndWordAction()
     {
       super(selectionEndWordAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getWordEnd(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.moveDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -183,24 +183,24 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class BeginWordAction extends TextAction
   {
     BeginWordAction()
     {
       super(beginWordAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getWordStart(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.setDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -212,24 +212,24 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class EndWordAction extends TextAction
   {
     EndWordAction()
     {
       super(endWordAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getWordEnd(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.setDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -255,11 +255,11 @@ public class DefaultEditorKit extends EditorKit
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getPreviousWord(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.setDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -285,11 +285,11 @@ public class DefaultEditorKit extends EditorKit
       try
         {
           JTextComponent t = getTextComponent(event);
-      
+
           if (t != null)
             {
               int offs = Utilities.getNextWord(t, t.getCaretPosition());
-      
+
               Caret c = t.getCaret();
               c.setDot(offs);
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
@@ -320,7 +320,7 @@ public class DefaultEditorKit extends EditorKit
           c.setDot(0);
           c.moveDot(offs);
           try
-            {   
+            {
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
             }
           catch(BadLocationException ble)
@@ -347,7 +347,7 @@ public class DefaultEditorKit extends EditorKit
           Caret c = t.getCaret();
           c.moveDot(0);
           try
-            {   
+            {
               c.setMagicCaretPosition(t.modelToView(0).getLocation());
             }
           catch(BadLocationException ble)
@@ -375,7 +375,7 @@ public class DefaultEditorKit extends EditorKit
           Caret c = t.getCaret();
           c.moveDot(offs);
           try
-            {   
+            {
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
             }
           catch(BadLocationException ble)
@@ -385,11 +385,11 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class SelectionBeginLineAction
     extends TextAction
   {
-    
+
     SelectionBeginLineAction()
     {
       super(selectionBeginLineAction);
@@ -440,14 +440,14 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class SelectLineAction extends TextAction
   {
     SelectLineAction()
     {
       super(selectLineAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       JTextComponent t = getTextComponent(event);
@@ -469,14 +469,14 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   static class SelectWordAction extends TextAction
   {
     SelectWordAction()
     {
       super(selectWordAction);
     }
-  
+
     public void actionPerformed(ActionEvent event)
     {
       JTextComponent t = getTextComponent(event);
@@ -497,11 +497,11 @@ public class DefaultEditorKit extends EditorKit
               else
                 {
                   // Current cursor position is not on the first character
-                  // in a word. 
+                  // in a word.
                   int nextWord = Utilities.getNextWord(t, dot);
                   int previousWord = Utilities.getPreviousWord(t, dot);
                   int previousWordEnd = Utilities.getWordEnd(t, previousWord);
-                  
+
                   // Cursor position is in the space between two words. In such a
                   // situation just select the space.
                   if (dot >= previousWordEnd && dot <= nextWord)
@@ -542,7 +542,7 @@ public class DefaultEditorKit extends EditorKit
     {
       c.moveDot(offs);
     }
-    
+
   }
 
   static class SelectionUpAction
@@ -614,7 +614,7 @@ public class DefaultEditorKit extends EditorKit
     {
       c.setDot(offs);
     }
-    
+
   }
 
   static class ForwardAction
@@ -629,7 +629,7 @@ public class DefaultEditorKit extends EditorKit
     {
       c.setDot(offs);
     }
-    
+
   }
 
   static class BackwardAction
@@ -644,7 +644,7 @@ public class DefaultEditorKit extends EditorKit
     {
       c.setDot(offs);
     }
-    
+
   }
 
   static class DeletePrevCharAction
@@ -664,7 +664,7 @@ public class DefaultEditorKit extends EditorKit
             {
               int pos = t.getSelectionStart();
               int len = t.getSelectionEnd() - pos;
-              
+
               if (len > 0)
                   t.getDocument().remove(pos, len);
               else if (pos > 0)
@@ -701,12 +701,12 @@ public class DefaultEditorKit extends EditorKit
             {
               int pos = t.getSelectionStart();
               int len = t.getSelectionEnd() - pos;
-              
+
               if (len > 0)
                   t.getDocument().remove(pos, len);
               else if (pos < t.getDocument().getLength())
                   t.getDocument().remove(pos, 1);
-    
+
               Caret c = t.getCaret();
               c.setDot(pos);
               c.setMagicCaretPosition(t.modelToView(pos).getLocation());
@@ -783,7 +783,7 @@ public class DefaultEditorKit extends EditorKit
 
   static class BeginAction extends TextAction
   {
-    
+
     BeginAction()
     {
       super(beginAction);
@@ -810,7 +810,7 @@ public class DefaultEditorKit extends EditorKit
 
   static class EndAction extends TextAction
   {
-      
+
     EndAction()
     {
       super(endAction);
@@ -825,7 +825,7 @@ public class DefaultEditorKit extends EditorKit
           Caret c = t.getCaret();
           c.setDot(offs);
           try
-            {   
+            {
               c.setMagicCaretPosition(t.modelToView(offs).getLocation());
             }
           catch(BadLocationException ble)
@@ -835,7 +835,7 @@ public class DefaultEditorKit extends EditorKit
         }
     }
   }
-  
+
   /**
    * Creates a beep on the PC speaker.
    *
@@ -962,12 +962,12 @@ public class DefaultEditorKit extends EditorKit
    * event is received and no keymap entry exists for that. The purpose
    * of this action is to filter out a couple of characters. This includes
    * the control characters and characters with the ALT-modifier.
-   * 
+   *
    * If an event does not get filtered, it is inserted into the document
    * of the text component. If there is some text selected in the text
    * component, this text will be replaced.
    */
-  public static class DefaultKeyTypedAction 
+  public static class DefaultKeyTypedAction
     extends TextAction
   {
 
@@ -1008,7 +1008,7 @@ public class DefaultEditorKit extends EditorKit
                 }
             }
         }
-    }    
+    }
   }
 
   /**
@@ -1481,9 +1481,9 @@ public class DefaultEditorKit extends EditorKit
    * The Actions that are supported by the
    * DefaultEditorKit.
    */
-  private static Action[] defaultActions = 
+  private static Action[] defaultActions =
   new Action[] {
-    // These classes are public because they are so in the RI.            
+    // These classes are public because they are so in the RI.
     new BeepAction(),
     new CopyAction(),
     new CutAction(),
@@ -1492,29 +1492,29 @@ public class DefaultEditorKit extends EditorKit
     new InsertContentAction(),
     new InsertTabAction(),
     new PasteAction(),
-    
+
     // These are (package-)private inner classes.
     new DeleteNextCharAction(),
     new DeletePrevCharAction(),
 
     new BeginLineAction(),
     new SelectionBeginLineAction(),
-    
+
     new EndLineAction(),
     new SelectionEndLineAction(),
-    
+
     new BackwardAction(),
     new SelectionBackwardAction(),
 
     new ForwardAction(),
     new SelectionForwardAction(),
-    
+
     new UpAction(),
     new SelectionUpAction(),
 
     new DownAction(),
     new SelectionDownAction(),
-    
+
     new NextWordAction(),
     new SelectionNextWordAction(),
 
@@ -1523,16 +1523,16 @@ public class DefaultEditorKit extends EditorKit
 
     new BeginAction(),
     new SelectionBeginAction(),
-    
+
     new EndAction(),
     new SelectionEndAction(),
-    
+
     new BeginWordAction(),
     new SelectionBeginWordAction(),
-    
+
     new EndWordAction(),
     new SelectionEndWordAction(),
-    
+
     new SelectAllAction(),
     new SelectLineAction(),
     new SelectWordAction()
@@ -1640,12 +1640,12 @@ public class DefaultEditorKit extends EditorKit
 
     while ((line = reader.readLine()) != null)
       {
-	content.append(line);
-	content.append("\n");
+        content.append(line);
+        content.append("\n");
       }
-    
+
     document.insertString(offset, content.substring(0, content.length() - 1),
-			  SimpleAttributeSet.EMPTY);
+                          SimpleAttributeSet.EMPTY);
   }
 
   /**
@@ -1680,7 +1680,7 @@ public class DefaultEditorKit extends EditorKit
    * @param offset the beginning offset from where to write
    * @param len the length of the fragment to write
    *
-   * @throws BadLocationException if offset is an 
+   * @throws BadLocationException if offset is an
    * invalid location inside document.
    * @throws IOException if something goes wrong while writing to
    *        out
diff --git a/libjava/classpath/javax/swing/text/DefaultFormatter.java b/libjava/classpath/javax/swing/text/DefaultFormatter.java
index bf7c02a004d..cd9829d11bc 100644
--- a/libjava/classpath/javax/swing/text/DefaultFormatter.java
+++ b/libjava/classpath/javax/swing/text/DefaultFormatter.java
@@ -54,7 +54,7 @@ import javax.swing.JFormattedTextField;
  * a value, the value class must provide a single argument constructor that
  * takes a String object as argument value. If no such constructor is found,
  * the String itself is passed back by #stringToValue.
- *  
+ *
  * @author Roman Kennke (roman@kennke.org)
  */
 public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
@@ -89,7 +89,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
       checkValidInput();
       commitIfAllowed();
     }
-    
+
     /**
      * Invoked when text is inserted into a text component.
      *
@@ -115,7 +115,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
 
     /**
      * Invoked when text is replaced in a text component.
-     * 
+     *
      * @param bypass the FilterBypass to use to mutate the document
      * @param offset the start position of the modification
      * @param length the length of the removed text
@@ -176,9 +176,9 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
                 {
                   // if that happens, something serious must be wrong
                   AssertionError ae;
-		  ae = new AssertionError("values must be parseable");
-		  ae.initCause(pe);
-		  throw ae;
+                  ae = new AssertionError("values must be parseable");
+                  ae.initCause(pe);
+                  throw ae;
                 }
             }
         }
@@ -238,7 +238,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
    * one of the mentioned methods in order to customize behaviour.
    *
    * @param ftf the {@link JFormattedTextField} in which this formatter
-   *     is installed 
+   *     is installed
    */
   public void install(JFormattedTextField ftf)
   {
@@ -287,7 +287,7 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter
 
   /**
    * Sets the value of the overwriteMode property.
-   * 
+   *
    * If that is set to true then newly inserted characters
    * overwrite existing values, otherwise the characters are inserted like
    * normal. The default is true.
diff --git a/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java b/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
index 84a1676d2dc..a6a9defafcd 100644
--- a/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
+++ b/libjava/classpath/javax/swing/text/DefaultFormatterFactory.java
@@ -45,19 +45,19 @@ import javax.swing.JFormattedTextField.AbstractFormatter;
 import javax.swing.JFormattedTextField.AbstractFormatterFactory;
 
 /**
- * This class is Swing's only concrete implementation of 
+ * This class is Swing's only concrete implementation of
  * JFormattedTextField.AbstractFormatterFactory.  It holds several
- * formatters and determines the best one to be used based on the 
+ * formatters and determines the best one to be used based on the
  * passed-in value from the text field.
- * 
+ *
  * @author Anthony Balkissoon abalkiss at redhat dot com
  * @since 1.4
  */
 public class DefaultFormatterFactory extends AbstractFormatterFactory implements
     Serializable
 {
-  /** 
-   * The default formatter. 
+  /**
+   * The default formatter.
    **/
   AbstractFormatter defaultFormatter;
 
@@ -69,14 +69,14 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   AbstractFormatter editFormatter;
 
   /**
-   * The formatter to use when the JFormattedTextField doesn't havefocus and 
-   * either the value isn't null or the value is null but no 
+   * The formatter to use when the JFormattedTextField doesn't havefocus and
+   * either the value isn't null or the value is null but no
    * nullFormatter has been specified.
    */
   AbstractFormatter displayFormatter;
 
   /**
-   * The formatter to use when the value of the JFormattedTextField is null.   
+   * The formatter to use when the value of the JFormattedTextField is null.
    */
   AbstractFormatter nullFormatter;
 
@@ -102,7 +102,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
    * Creates a new DefaultFormatterFactory with the specified formatters.
    * @param defaultFormat the formatter to use if no other appropriate non-null
    * formatted can be found.
-   * @param displayFormat the formatter to use if the JFormattedTextField 
+   * @param displayFormat the formatter to use if the JFormattedTextField
    * doesn't have focus and either the value is not null or the value is null
    * but no nullFormatter has been specified.
    */
@@ -117,7 +117,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
    * Creates a new DefaultFormatterFactory with the specified formatters.
    * @param defaultFormat the formatter to use if no other appropriate non-null
    * formatted can be found.
-   * @param displayFormat the formatter to use if the JFormattedTextField 
+   * @param displayFormat the formatter to use if the JFormattedTextField
    * doesn't have focus and either the value is not null or the value is null
    * but no nullFormatter has been specified.
    * @param editFormat the formatter to use if the JFormattedTextField has
@@ -137,13 +137,13 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
    * Creates a new DefaultFormatterFactory with the specified formatters.
    * @param defaultFormat the formatter to use if no other appropriate non-null
    * formatted can be found.
-   * @param displayFormat the formatter to use if the JFormattedTextField 
+   * @param displayFormat the formatter to use if the JFormattedTextField
    * doesn't have focus and either the value is not null or the value is null
    * but no nullFormatter has been specified.
    * @param editFormat the formatter to use if the JFormattedTextField has
    * focus and either the value is not null or the value is null but not
    * nullFormatter has been specified.
-   * @param nullFormat the formatter to use when the value of the 
+   * @param nullFormat the formatter to use when the value of the
    * JFormattedTextField is null.
    */
   public DefaultFormatterFactory(AbstractFormatter defaultFormat,
@@ -158,9 +158,9 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   }
 
   /**
-   * Returns the formatted to be used if no other appropriate non-null 
+   * Returns the formatted to be used if no other appropriate non-null
    * formatter can be found.
-   * @return the formatted to be used if no other appropriate non-null 
+   * @return the formatted to be used if no other appropriate non-null
    * formatter can be found.
    */
   public AbstractFormatter getDefaultFormatter()
@@ -169,7 +169,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   }
 
   /**
-   * Sets the formatted to be used if no other appropriate non-null formatter 
+   * Sets the formatted to be used if no other appropriate non-null formatter
    * can be found.
    * @param defaultFormatter the formatted to be used if no other appropriate
    * non-null formatter can be found.
@@ -180,13 +180,13 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   }
 
   /**
-   * Gets the displayFormatter.  This is the formatter to use if 
-   * the JFormattedTextField is not being edited and either the value is not 
-   * null or the value is null and no nullFormatter has been 
+   * Gets the displayFormatter.  This is the formatter to use if
+   * the JFormattedTextField is not being edited and either the value is not
+   * null or the value is null and no nullFormatter has been
    * specified.
-   * @return the formatter to use if 
-   * the JFormattedTextField is not being edited and either the value is not 
-   * null or the value is null and no nullFormatter has been 
+   * @return the formatter to use if
+   * the JFormattedTextField is not being edited and either the value is not
+   * null or the value is null and no nullFormatter has been
    * specified.
    */
   public AbstractFormatter getDisplayFormatter()
@@ -195,9 +195,9 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   }
 
   /**
-   * Sets the displayFormatter.  This is the formatter to use if 
-   * the JFormattedTextField is not being edited and either the value is not 
-   * null or the value is null and no nullFormatter has been 
+   * Sets the displayFormatter.  This is the formatter to use if
+   * the JFormattedTextField is not being edited and either the value is not
+   * null or the value is null and no nullFormatter has been
    * specified.
    * @param displayFormatter the formatter to use.
    */
@@ -208,10 +208,10 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
 
   /**
    * Gets the editFormatter.  This is the formatter to use if the
-   * JFormattedTextField is being edited and either the value is not null or 
+   * JFormattedTextField is being edited and either the value is not null or
    * the value is null and no nullFormatter has been specified.
    * @return the formatter to use if the JFormattedTextField is being edited
-   * and the value is not null or the value is null but no nullFormatted has 
+   * and the value is not null or the value is null but no nullFormatted has
    * been specified.
    */
   public AbstractFormatter getEditFormatter()
@@ -221,7 +221,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
 
   /**
    * Sets the editFormatter.  This is the formatter to use if the
-   * JFormattedTextField is being edited and either the value is not null or 
+   * JFormattedTextField is being edited and either the value is not null or
    * the value is null and no nullFormatter has been specified.
    * @param editFormatter the formatter to use.
    */
@@ -250,11 +250,11 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   }
 
   /**
-   * Returns the appropriate formatter based on the state of 
+   * Returns the appropriate formatter based on the state of
    * tf. If tf is null we return null, otherwise
    * we return one of the following:
-   * 1. Returns nullFormatter if tf.getValue() is 
-   * null and nullFormatter is not.  
+   * 1. Returns nullFormatter if tf.getValue() is
+   * null and nullFormatter is not.
    * 2. Returns editFormatter if tf.hasFocus() is
    * true and editFormatter is not null.
    * 3. Returns displayFormatter if tf.hasFocus() is
@@ -265,7 +265,7 @@ public class DefaultFormatterFactory extends AbstractFormatterFactory implements
   {
     if (tf == null)
       return null;
-    
+
     if (tf.getValue() == null && nullFormatter != null)
       return nullFormatter;
 
diff --git a/libjava/classpath/javax/swing/text/DefaultHighlighter.java b/libjava/classpath/javax/swing/text/DefaultHighlighter.java
index 69563e473ac..a4264d31a0d 100644
--- a/libjava/classpath/javax/swing/text/DefaultHighlighter.java
+++ b/libjava/classpath/javax/swing/text/DefaultHighlighter.java
@@ -51,7 +51,7 @@ import javax.swing.plaf.TextUI;
 
 /**
  * The default highlight for Swing text components. It highlights text
- * by filling the background with a rectangle. 
+ * by filling the background with a rectangle.
  */
 public class DefaultHighlighter extends LayeredHighlighter
 {
@@ -59,7 +59,7 @@ public class DefaultHighlighter extends LayeredHighlighter
     extends LayerPainter
   {
     private Color color;
-    
+
     public DefaultHighlightPainter(Color c)
     {
       super();
@@ -72,11 +72,11 @@ public class DefaultHighlighter extends LayeredHighlighter
     }
 
     public void paint(Graphics g, int p0, int p1, Shape bounds,
-		      JTextComponent t)
+                      JTextComponent t)
     {
       if (p0 == p1)
         return;
-      
+
       Rectangle rect = bounds.getBounds();
 
       Color col = getColor();
@@ -85,13 +85,13 @@ public class DefaultHighlighter extends LayeredHighlighter
       g.setColor(col);
 
       TextUI ui = t.getUI();
-      
+
       try
         {
 
           Rectangle l0 = ui.modelToView(t, p0, null);
           Rectangle l1 = ui.modelToView(t, p1, null);
-        
+
           // Note: The computed locations may lie outside of the allocation
           // area if the text is scrolled.
 
@@ -101,8 +101,8 @@ public class DefaultHighlighter extends LayeredHighlighter
 
             // Paint only inside the allocation area.
             SwingUtilities.computeIntersection(rect.x, rect.y, rect.width,
-					       rect.height, l1);
-        
+                                               rect.height, l1);
+
             g.fillRect(l1.x, l1.y, l1.width, l1.height);
           }
         else
@@ -115,62 +115,62 @@ public class DefaultHighlighter extends LayeredHighlighter
             // 3. The final line is painted from the left border to the
             // position of p1.
 
-	    int firstLineWidth = rect.x + rect.width - l0.x;
-	    g.fillRect(l0.x, l0.y, firstLineWidth, l0.height);
-	    if (l0.y + l0.height != l1.y)
-	      {
-		g.fillRect(rect.x, l0.y + l0.height, rect.width,
-			   l1.y - l0.y - l0.height);
-	      }
-	    g.fillRect(rect.x, l1.y, l1.x - rect.x, l1.height);
-	  }
+            int firstLineWidth = rect.x + rect.width - l0.x;
+            g.fillRect(l0.x, l0.y, firstLineWidth, l0.height);
+            if (l0.y + l0.height != l1.y)
+              {
+                g.fillRect(rect.x, l0.y + l0.height, rect.width,
+                           l1.y - l0.y - l0.height);
+              }
+            g.fillRect(rect.x, l1.y, l1.x - rect.x, l1.height);
+          }
       }
     catch (BadLocationException ex)
       {
-	// Can't render. Comment out for debugging.
-	// ex.printStackTrace();
+        // Can't render. Comment out for debugging.
+        // ex.printStackTrace();
       }
     }
 
     public Shape paintLayer(Graphics g, int p0, int p1, Shape bounds,
-			    JTextComponent c, View view)
+                            JTextComponent c, View view)
     {
       Color col = getColor();
       if (col == null)
-	col = c.getSelectionColor();
+        col = c.getSelectionColor();
       g.setColor(col);
 
       Rectangle rect = null;
       if (p0 == view.getStartOffset() && p1 == view.getEndOffset())
-	{
-	  // Paint complete bounds region.
+        {
+          // Paint complete bounds region.
           rect = bounds instanceof Rectangle ? (Rectangle) bounds
-	                                     : bounds.getBounds();
-	}
+                                             : bounds.getBounds();
+        }
       else
-	{
-	  // Only partly inside the view.
+        {
+          // Only partly inside the view.
           try
-	    {
+            {
               Shape s = view.modelToView(p0, Position.Bias.Forward,
-					 p1, Position.Bias.Backward,
-					 bounds);
-	      rect = s instanceof Rectangle ? (Rectangle) s : s.getBounds();
-	    }
-	  catch (BadLocationException ex)
-	    {
-	      // Can't render the highlight.
-	    }
-	}
+                                         p1, Position.Bias.Backward,
+                                         bounds);
+              rect = s instanceof Rectangle ? (Rectangle) s : s.getBounds();
+            }
+          catch (BadLocationException ex)
+            {
+              // Can't render the highlight.
+            }
+        }
 
       if (rect != null)
-	{
+        {
           g.fillRect(rect.x, rect.y, rect.width, rect.height);
-	}
+        }
       return rect;
     }
   }
-  
+
   private class HighlightEntry implements Highlighter.Highlight
   {
     Position p0;
@@ -228,28 +228,28 @@ public class DefaultHighlighter extends LayeredHighlighter
      * and manages the paint rectangle.
      */
     void paintLayeredHighlight(Graphics g, int p0, int p1, Shape bounds,
-			       JTextComponent tc, View view)
+                               JTextComponent tc, View view)
     {
       p0 = Math.max(getStartOffset(), p0);
       p1 = Math.min(getEndOffset(), p1);
 
       Highlighter.HighlightPainter painter = getPainter();
       if (painter instanceof LayerPainter)
-	{
-	  LayerPainter layerPainter = (LayerPainter) painter;
-	  Shape area = layerPainter.paintLayer(g, p0, p1, bounds, tc, view);
-	  Rectangle rect;
-	  if (area instanceof Rectangle && paintRect != null)
-	    rect = (Rectangle) area;
-	  else
-	    rect = area.getBounds();
+        {
+          LayerPainter layerPainter = (LayerPainter) painter;
+          Shape area = layerPainter.paintLayer(g, p0, p1, bounds, tc, view);
+          Rectangle rect;
+          if (area instanceof Rectangle && paintRect != null)
+            rect = (Rectangle) area;
+          else
+            rect = area.getBounds();
 
-	  if (paintRect.width == 0 || paintRect.height == 0)
-	    paintRect = rect.getBounds();
-	  else
-	    paintRect = SwingUtilities.computeUnion(rect.x, rect.y, rect.width,
-						    rect.height, paintRect);
-	}
+          if (paintRect.width == 0 || paintRect.height == 0)
+            paintRect = rect.getBounds();
+          else
+            paintRect = SwingUtilities.computeUnion(rect.x, rect.y, rect.width,
+                                                    rect.height, paintRect);
+        }
     }
   }
 
@@ -258,11 +258,11 @@ public class DefaultHighlighter extends LayeredHighlighter
    */
   public static final LayeredHighlighter.LayerPainter DefaultPainter =
     new DefaultHighlightPainter(null);
-  
+
   private JTextComponent textComponent;
   private ArrayList highlights = new ArrayList();
   private boolean drawsLayeredHighlights = true;
-  
+
   public DefaultHighlighter()
   {
     // Nothing to do here.
@@ -277,13 +277,13 @@ public class DefaultHighlighter extends LayeredHighlighter
   {
     drawsLayeredHighlights = newValue;
   }
-  
+
   private void checkPositions(int p0, int p1)
     throws BadLocationException
   {
     if (p0 < 0)
       throw new BadLocationException("DefaultHighlighter", p0);
-    
+
     if (p1 < p0)
       throw new BadLocationException("DefaultHighlighter", p1);
   }
@@ -313,9 +313,9 @@ public class DefaultHighlighter extends LayeredHighlighter
     else
       entry = new HighlightEntry(pos0, pos1, painter);
     highlights.add(entry);
-    
+
     textComponent.getUI().damageRange(textComponent, p0, p1);
-    
+
     return entry;
   }
 
@@ -324,16 +324,16 @@ public class DefaultHighlighter extends LayeredHighlighter
     HighlightEntry entry = (HighlightEntry) tag;
     if (entry instanceof LayerHighlightEntry)
       {
-	LayerHighlightEntry lEntry = (LayerHighlightEntry) entry;
-	Rectangle paintRect = lEntry.paintRect;
-	textComponent.repaint(paintRect.x, paintRect.y, paintRect.width,
-			      paintRect.height);
+        LayerHighlightEntry lEntry = (LayerHighlightEntry) entry;
+        Rectangle paintRect = lEntry.paintRect;
+        textComponent.repaint(paintRect.x, paintRect.y, paintRect.width,
+                              paintRect.height);
       }
     else
       {
-	textComponent.getUI().damageRange(textComponent,
-					  entry.getStartOffset(),
-					  entry.getEndOffset());
+        textComponent.getUI().damageRange(textComponent,
+                                          entry.getStartOffset(),
+                                          entry.getEndOffset());
       }
     highlights.remove(tag);
 
@@ -380,14 +380,14 @@ public class DefaultHighlighter extends LayeredHighlighter
             TextUI ui = textComponent.getUI();
             ui.damageRange(textComponent, p0, p1);
           }
-        
+
       }
     highlights.clear();
   }
 
   public Highlighter.Highlight[] getHighlights()
   {
-    return (Highlighter.Highlight[]) 
+    return (Highlighter.Highlight[])
       highlights.toArray(new Highlighter.Highlight[highlights.size()]);
   }
 
@@ -439,22 +439,22 @@ public class DefaultHighlighter extends LayeredHighlighter
   {
     for (Iterator i = highlights.iterator(); i.hasNext();)
       {
-	Object o = i.next();
-	if (o instanceof LayerHighlightEntry)
-	  {
-	    LayerHighlightEntry entry = (LayerHighlightEntry) o;
-	    int start = entry.getStartOffset();
-	    int end = entry.getEndOffset();
-	    if ((p0 < start && p1 > start) || (p0 >= start && p0 < end))
-	      entry.paintLayeredHighlight(g, p0, p1, viewBounds, editor, view);
-	  }
+        Object o = i.next();
+        if (o instanceof LayerHighlightEntry)
+          {
+            LayerHighlightEntry entry = (LayerHighlightEntry) o;
+            int start = entry.getStartOffset();
+            int end = entry.getEndOffset();
+            if ((p0 < start && p1 > start) || (p0 >= start && p0 < end))
+              entry.paintLayeredHighlight(g, p0, p1, viewBounds, editor, view);
+          }
       }
   }
 
   public void paint(Graphics g)
   {
     int size = highlights.size();
-    
+
     // Check if there are any highlights.
     if (size == 0)
       return;
@@ -466,11 +466,11 @@ public class DefaultHighlighter extends LayeredHighlighter
                     insets.top,
                     textComponent.getWidth() - insets.left - insets.right,
                     textComponent.getHeight() - insets.top - insets.bottom);
-    
+
     for (int index = 0; index < size; ++index)
       {
-	HighlightEntry entry = (HighlightEntry) highlights.get(index);
-	if (! (entry instanceof LayerHighlightEntry))
+        HighlightEntry entry = (HighlightEntry) highlights.get(index);
+        if (! (entry instanceof LayerHighlightEntry))
           entry.painter.paint(g, entry.getStartOffset(), entry.getEndOffset(),
                               bounds, textComponent);
       }
diff --git a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
index 8c70a8a3bfd..9021a199039 100644
--- a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
+++ b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
@@ -62,7 +62,7 @@ import javax.swing.undo.UndoableEdit;
  * single root, which has one or more {@link AbstractDocument.BranchElement}s
  * as paragraph nodes and each paragraph node having one or more
  * {@link AbstractDocument.LeafElement}s as content nodes.
- * 
+ *
  * @author Michael Koch (konqueror@gmx.de)
  * @author Roman Kennke (roman@kennke.org)
  */
@@ -72,7 +72,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * An {@link UndoableEdit} that can undo attribute changes to an element.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   public static class AttributeUndoableEdit extends AbstractUndoableEdit
@@ -100,7 +100,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Creates a new AttributeUndoableEdit.
-     * 
+     *
      * @param el
      *          the element that changes attributes
      * @param newAtts
@@ -233,7 +233,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     /**
      * Creates a new ElementSpec with no content, length or
      * offset. This is most useful for start and end tags.
-     * 
+     *
      * @param a
      *          the attributes for the element to be created
      * @param type
@@ -248,7 +248,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
      * Creates a new ElementSpec that specifies the length but
      * not the offset of an element. Such ElementSpecs are
      * processed sequentially from a known starting point.
-     * 
+     *
      * @param a
      *          the attributes for the element to be created
      * @param type
@@ -263,7 +263,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Creates a new ElementSpec with document content.
-     * 
+     *
      * @param a
      *          the attributes for the element to be created
      * @param type
@@ -287,7 +287,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Sets the type of the element.
-     * 
+     *
      * @param type
      *          the type of the element to be set
      */
@@ -298,7 +298,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the type of the element.
-     * 
+     *
      * @return the type of the element
      */
     public short getType()
@@ -308,7 +308,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Sets the direction of the element.
-     * 
+     *
      * @param dir
      *          the direction of the element to be set
      */
@@ -319,7 +319,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the direction of the element.
-     * 
+     *
      * @return the direction of the element
      */
     public short getDirection()
@@ -329,7 +329,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the attributes of the element.
-     * 
+     *
      * @return the attributes of the element
      */
     public AttributeSet getAttributes()
@@ -339,7 +339,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the actual content of the element.
-     * 
+     *
      * @return the actual content of the element
      */
     public char[] getArray()
@@ -349,7 +349,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the offset of the content.
-     * 
+     *
      * @return the offset of the content
      */
     public int getOffset()
@@ -359,7 +359,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the length of the content.
-     * 
+     *
      * @return the length of the content
      */
     public int getLength()
@@ -371,7 +371,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
      * Returns a String representation of this ElementSpec
      * describing the type, direction and length of this
      * ElementSpec.
-     * 
+     *
      * @return a String representation of this ElementSpec
      */
     public String toString()
@@ -534,7 +534,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     /**
      * Creates a new ElementBuffer for the specified
      * root element.
-     * 
+     *
      * @param root
      *          the root element for this ElementBuffer
      */
@@ -545,7 +545,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Returns the root element of this ElementBuffer.
-     * 
+     *
      * @return the root element of this ElementBuffer
      */
     public Element getRootElement()
@@ -556,7 +556,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     /**
      * Removes the content. This method sets some internal parameters and
      * delegates the work to {@link #removeUpdate}.
-     * 
+     *
      * @param offs
      *          the offset from which content is remove
      * @param len
@@ -583,7 +583,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     private boolean removeElements(Element elem, int rmOffs0, int rmOffs1)
     {
-      boolean ret = false; 
+      boolean ret = false;
       if (! elem.isLeaf())
         {
           // Update stack for changes.
@@ -874,7 +874,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
      * created as necessary. This also updates the
      * DefaultDocumentEvent to reflect the structural changes.
      * The bulk work is delegated to {@link #changeUpdate()}.
-     * 
+     *
      * @param offset
      *          the start index of the interval to be changed
      * @param length
@@ -967,7 +967,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
      * Inserts new Element in the document at the specified
      * position. Most of the work is done by {@link #insertUpdate}, after some
      * fields have been prepared for it.
-     * 
+     *
      * @param offset
      *          the location in the document at which the content is inserted
      * @param length
@@ -982,11 +982,11 @@ public class DefaultStyledDocument extends AbstractDocument implements
                        DefaultDocumentEvent ev)
     {
       if (length > 0)
-	{
-	  prepareEdit(offset, length);
-	  insertUpdate(data);
-	  finishEdit(ev);
-	}
+        {
+          prepareEdit(offset, length);
+          insertUpdate(data);
+          finishEdit(ev);
+        }
     }
 
     /**
@@ -1003,14 +1003,14 @@ public class DefaultStyledDocument extends AbstractDocument implements
       this.length = length;
 
       if (edits == null)
-	edits = new ArrayList();
+        edits = new ArrayList();
       else
-	edits.clear();
+        edits.clear();
 
       if (elementStack == null)
-	elementStack = new Stack();
+        elementStack = new Stack();
       else
-	elementStack.clear();
+        elementStack.clear();
 
       fracturedParent = null;
       fracturedChild = null;
@@ -1029,7 +1029,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
       // This for loop applies all the changes that were made and updates the
       // DocumentEvent.
       for (Iterator i = edits.iterator(); i.hasNext();)
-	{
+        {
           Edit edits = (Edit) i.next();
           Element[] removed = new Element[edits.removed.size()];
           removed = (Element[]) edits.removed.toArray(removed);
@@ -1040,14 +1040,14 @@ public class DefaultStyledDocument extends AbstractDocument implements
           parent.replace(index, removed.length, added);
           ElementEdit ee = new ElementEdit(parent, index, removed, added);
           ev.addEdit(ee);
-	}
+        }
       edits.clear();
       elementStack.clear();
     }
 
     /**
      * Inserts new content.
-     * 
+     *
      * @param data the element specifications for the elements to be inserted
      */
     protected void insertUpdate(ElementSpec[] data)
@@ -1130,7 +1130,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
                p < data.length && data[p].getType() == ElementSpec.EndTagType;
                p++)
             ;
-          
+
           Edit edit = insertPath[insertPath.length - p - 1];
           edit.index--;
           edit.removed.add(0, edit.e.getElement(edit.index));
@@ -1162,7 +1162,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     {
       if (elementStack.isEmpty())
         return;
-      
+
       Edit edit = (Edit) elementStack.peek();
       switch (spec.getType())
         {
@@ -1223,7 +1223,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Inserts the first tag into the document.
-     * 
+     *
      * @param data -
      *          the data to be inserted.
      */
@@ -1301,7 +1301,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
     /**
      * Inserts a content element into the document structure.
-     * 
+     *
      * @param tag -
      *          the element spec
      */
@@ -1342,7 +1342,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
               edit.removed.add(first);
             }
         }
-      else 
+      else
         {
           Element leaf = createLeafElement(edit.e, tag.getAttributes(), pos,
                                            pos + len);
@@ -1350,13 +1350,13 @@ public class DefaultStyledDocument extends AbstractDocument implements
         }
 
       pos += len;
-      
+
     }
 
     /**
      * This method fractures bottomost leaf in the elementStack. This
      * happens when the first inserted tag is not content.
-     * 
+     *
      * @param data
      *          the ElementSpecs used for the entire insertion
      */
@@ -1644,12 +1644,12 @@ public class DefaultStyledDocument extends AbstractDocument implements
               ec.added.add(e);
               e = createLeafElement(ec.e, child.getAttributes(),
                                     pos, child.getEndOffset());
-              
+
               ec.added.add(e);
             }
         }
       return splitEnd;
-      
+
     }
 
   }
@@ -1672,7 +1672,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     /**
      * Returns the name of the element. This method always returns
      * "section".
-     * 
+     *
      * @return the name of the element
      */
     public String getName()
@@ -1684,7 +1684,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Receives notification when any of the document's style changes and calls
    * {@link DefaultStyledDocument#styleChanged(Style)}.
-   * 
+   *
    * @author Roman Kennke (kennke@aicas.com)
    */
   private class StyleChangeListener implements ChangeListener
@@ -1693,7 +1693,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
     /**
      * Receives notification when any of the document's style changes and calls
      * {@link DefaultStyledDocument#styleChanged(Style)}.
-     * 
+     *
      * @param event
      *          the change event
      */
@@ -1734,7 +1734,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Creates a new DefaultStyledDocument that uses the specified
    * {@link StyleContext}.
-   * 
+   *
    * @param context
    *          the StyleContext to use
    */
@@ -1746,7 +1746,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Creates a new DefaultStyledDocument that uses the specified
    * {@link StyleContext} and {@link Content} buffer.
-   * 
+   *
    * @param content
    *          the Content buffer to use
    * @param context
@@ -1790,7 +1790,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Create the default root element for this kind of Document.
-   * 
+   *
    * @return the default root element for this kind of Document
    */
   protected AbstractDocument.AbstractElement createDefaultRoot()
@@ -1814,7 +1814,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Returns the Element that corresponds to the character at the
    * specified position.
-   * 
+   *
    * @param position
    *          the position of which we query the corresponding
    *          Element
@@ -1836,7 +1836,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Extracts a background color from a set of attributes.
-   * 
+   *
    * @param attributes
    *          the attributes from which to get a background color
    * @return the background color that correspond to the attributes
@@ -1849,7 +1849,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Returns the default root element.
-   * 
+   *
    * @return the default root element
    */
   public Element getDefaultRootElement()
@@ -1859,7 +1859,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Extracts a font from a set of attributes.
-   * 
+   *
    * @param attributes
    *          the attributes from which to get a font
    * @return the font that correspond to the attributes
@@ -1872,7 +1872,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Extracts a foreground color from a set of attributes.
-   * 
+   *
    * @param attributes
    *          the attributes from which to get a foreground color
    * @return the foreground color that correspond to the attributes
@@ -1885,7 +1885,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Returns the logical Style for the specified position.
-   * 
+   *
    * @param position
    *          the position from which to query to logical style
    * @return the logical Style for the specified position
@@ -1907,7 +1907,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
    * element is returned. That is the last paragraph if
    * position >= endIndex or the first paragraph if
    * position < startIndex.
-   * 
+   *
    * @param position
    *          the position for which to query the paragraph element
    * @return the paragraph element for the specified position
@@ -1925,7 +1925,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Looks up and returns a named Style.
-   * 
+   *
    * @param nm
    *          the name of the Style
    * @return the found Style of null if no such
@@ -1939,7 +1939,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Removes a named Style from the style hierarchy.
-   * 
+   *
    * @param nm
    *          the name of the Style to be removed
    */
@@ -1952,7 +1952,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Sets text attributes for the fragment specified by offset
    * and length.
-   * 
+   *
    * @param offset
    *          the start offset of the fragment
    * @param length
@@ -2015,7 +2015,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Sets the logical style for the paragraph at the specified position.
-   * 
+   *
    * @param position
    *          the position at which the logical style is added
    * @param style
@@ -2056,7 +2056,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Sets text attributes for the paragraph at the specified fragment.
-   * 
+   *
    * @param offset
    *          the beginning of the fragment
    * @param length
@@ -2115,7 +2115,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Called in response to content insert actions. This is used to update the
    * element structure.
-   * 
+   *
    * @param ev
    *          the DocumentEvent describing the change
    * @param attr
@@ -2310,7 +2310,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
           }
 
         if (e != null)
-       
+
           {
             // e is now the common parent.
             // Insert the end tags.
@@ -2342,7 +2342,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * A helper method to set up the ElementSpec buffer for the special case of an
    * insertion occurring immediately after a newline.
-   * 
+   *
    * @param specs
    *          the ElementSpec buffer to initialize.
    */
@@ -2369,7 +2369,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
    * forwarded to the {@link ElementBuffer} of this document. Any changes to the
    * document structure are added to the specified document event and sent to
    * registered listeners.
-   * 
+   *
    * @param ev
    *          the document event that records the changes to the document
    */
@@ -2381,7 +2381,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Returns an enumeration of all style names.
-   * 
+   *
    * @return an enumeration of all style names
    */
   public Enumeration getStyleNames()
@@ -2392,7 +2392,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Called when any of this document's styles changes.
-   * 
+   *
    * @param style
    *          the style that changed
    */
@@ -2403,7 +2403,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
 
   /**
    * Inserts a bulk of structured content at once.
-   * 
+   *
    * @param offset
    *          the offset at which the content should be inserted
    * @param data
@@ -2469,7 +2469,7 @@ public class DefaultStyledDocument extends AbstractDocument implements
   /**
    * Initializes the DefaultStyledDocument with the specified
    * data.
-   * 
+   *
    * @param data
    *          the specification of the content with which the document is
    *          initialized
diff --git a/libjava/classpath/javax/swing/text/DocumentFilter.java b/libjava/classpath/javax/swing/text/DocumentFilter.java
index f86f41ca6c0..1f7e8a68917 100644
--- a/libjava/classpath/javax/swing/text/DocumentFilter.java
+++ b/libjava/classpath/javax/swing/text/DocumentFilter.java
@@ -48,21 +48,21 @@ public class DocumentFilter
     }
 
     public abstract Document getDocument();
-    
+
     public abstract void insertString(int offset, String string,
-				      AttributeSet attr)
+                                      AttributeSet attr)
       throws BadLocationException;
-    
+
     public abstract void remove(int offset, int length)
       throws BadLocationException;
-    
+
     public abstract void replace(int offset, int length, String string,
-				 AttributeSet attrs)
+                                 AttributeSet attrs)
       throws BadLocationException;
   }
-  
+
   public void insertString(DocumentFilter.FilterBypass fb, int offset,
-			   String string, AttributeSet attr)
+                           String string, AttributeSet attr)
     throws BadLocationException
   {
     fb.insertString(offset, string, attr);
@@ -75,7 +75,7 @@ public class DocumentFilter
   }
 
   public void replace(DocumentFilter.FilterBypass fb, int offset, int length,
-		      String text, AttributeSet attr)
+                      String text, AttributeSet attr)
     throws BadLocationException
   {
     fb.replace(offset, length, text, attr);
diff --git a/libjava/classpath/javax/swing/text/EditorKit.java b/libjava/classpath/javax/swing/text/EditorKit.java
index 8719aee595f..62b4a64862c 100644
--- a/libjava/classpath/javax/swing/text/EditorKit.java
+++ b/libjava/classpath/javax/swing/text/EditorKit.java
@@ -51,7 +51,7 @@ import javax.swing.JEditorPane;
 public abstract class EditorKit implements Cloneable, Serializable
 {
   private static final long serialVersionUID = -5044124649345887822L;
-  
+
   public EditorKit()
   {
     // Nothing to do here.
diff --git a/libjava/classpath/javax/swing/text/Element.java b/libjava/classpath/javax/swing/text/Element.java
index eb53ee9d3e1..83d88356571 100644
--- a/libjava/classpath/javax/swing/text/Element.java
+++ b/libjava/classpath/javax/swing/text/Element.java
@@ -1,4 +1,4 @@
-/* Element.java -- 
+/* Element.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/ElementIterator.java b/libjava/classpath/javax/swing/text/ElementIterator.java
index 112d55e96d0..141137e2ce7 100644
--- a/libjava/classpath/javax/swing/text/ElementIterator.java
+++ b/libjava/classpath/javax/swing/text/ElementIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -49,7 +49,7 @@ import java.util.Stack;
 public class ElementIterator implements Cloneable
 {
   /**
-   * Uses to track the iteration on the stack. 
+   * Uses to track the iteration on the stack.
    */
   private class ElementRef
   {
@@ -110,12 +110,12 @@ public class ElementIterator implements Cloneable
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException _)
       {
-	// Can't happen.
-	return null;
+        // Can't happen.
+        return null;
       }
   }
 
diff --git a/libjava/classpath/javax/swing/text/EmptyAttributeSet.java b/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
index 98fb8828c89..92263bc1a55 100644
--- a/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/EmptyAttributeSet.java
@@ -108,7 +108,7 @@ final class EmptyAttributeSet
       {
         throw new NoSuchElementException("No more elements");
       }
-      
+
     };
   }
 
diff --git a/libjava/classpath/javax/swing/text/FieldView.java b/libjava/classpath/javax/swing/text/FieldView.java
index e357a1e056b..c47bef9f7b6 100644
--- a/libjava/classpath/javax/swing/text/FieldView.java
+++ b/libjava/classpath/javax/swing/text/FieldView.java
@@ -1,4 +1,4 @@
-/* FieldView.java -- 
+/* FieldView.java --
    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,36 +56,36 @@ import javax.swing.event.DocumentEvent;
 public class FieldView extends PlainView
 {
   BoundedRangeModel horizontalVisibility;
-  
+
   /** Caches the preferred span of the X axis. It is invalidated by
    * setting it to -1f. This is done when text in the document
    * is inserted, removed or changed. The value is corrected as
-   * soon as calculateHorizontalSpan() is called. 
+   * soon as calculateHorizontalSpan() is called.
    */
   float cachedSpan = -1f;
 
   public FieldView(Element elem)
   {
     super(elem);
-    
+
   }
-  
+
   /** Checks whether the given container is a JTextField. If so
    * it retrieves the textfield's horizontalVisibility instance.
-   * 
+   *
    * 
                    This method should be only called when the view's container
    * is valid. Naturally that would be the setParent() method however
    * that method is not overridden in the RI and that is why we chose
    * paint() instead.
                    
-   */ 
+   */
   private void checkContainer()
   {
     Container c = getContainer();
-    
+
     if (c instanceof JTextField)
       {
         horizontalVisibility = ((JTextField) c).getHorizontalVisibility();
-        
+
         // Provokes a repaint when the BoundedRangeModel's values change
         // (which is what the RI does).
         horizontalVisibility.addChangeListener(new ChangeListener(){
@@ -98,25 +98,25 @@ public class FieldView extends PlainView
         // and needs to be recalculated (e.g. a different font setting is
         // not taken into account).
         calculateHorizontalSpan();
-        
+
         // Initializes the BoundedRangeModel properly.
         updateVisibility();
       }
-    
+
   }
-  
+
   private void updateVisibility()
   {
     JTextField tf = (JTextField) getContainer();
     Insets insets = tf.getInsets();
 
     int width = tf.getWidth() - insets.left - insets.right;
-        
+
     horizontalVisibility.setMaximum(Math.max((int) ((cachedSpan != -1f)
                                                  ? cachedSpan
                                                  : calculateHorizontalSpan()),
                                              width));
-        
+
     horizontalVisibility.setExtent(width - 1);
   }
 
@@ -140,7 +140,7 @@ public class FieldView extends PlainView
     // Return null when the original allocation is null (like the RI).
     if (shape == null)
       return null;
-    
+
     Rectangle rectIn = shape.getBounds();
     // vertical adjustment
     int height = (int) getPreferredSpan(Y_AXIS);
@@ -177,7 +177,7 @@ public class FieldView extends PlainView
           x = rectIn.x;
           break;
         }
-    
+
     return new Rectangle(x, y, width, height);
   }
 
@@ -192,13 +192,13 @@ public class FieldView extends PlainView
 
     if (cachedSpan != -1f)
       return cachedSpan;
-    
+
     return calculateHorizontalSpan();
   }
-  
+
   /** Calculates and sets the horizontal span and stores the value
    * in cachedSpan.
-   */ 
+   */
   private float calculateHorizontalSpan()
   {
     Segment s = getLineBuffer();
@@ -209,15 +209,15 @@ public class FieldView extends PlainView
         elem.getDocument().getText(elem.getStartOffset(),
                                           elem.getEndOffset() - 1,
                                           s);
-        
+
         return cachedSpan = Utilities.getTabbedTextWidth(s, getFontMetrics(), 0, this, s.offset);
       }
     catch (BadLocationException e)
       {
-	// Should never happen
-	AssertionError ae = new AssertionError();
-	ae.initCause(e);
-	throw ae;
+        // Should never happen
+        AssertionError ae = new AssertionError();
+        ae.initCause(e);
+        throw ae;
       }
   }
 
@@ -225,21 +225,21 @@ public class FieldView extends PlainView
   {
     return axis == X_AXIS ? 1 : 0;
   }
-  
+
   public Shape modelToView(int pos, Shape a, Position.Bias bias)
     throws BadLocationException
   {
     Shape newAlloc = adjustAllocation(a);
     return super.modelToView(pos, newAlloc, bias);
   }
-  
+
   public void paint(Graphics g, Shape s)
   {
     if (horizontalVisibility == null)
       checkContainer();
 
     Shape newAlloc = adjustAllocation(s);
-    
+
     Shape clip = g.getClip();
     if (clip != null)
       {
@@ -262,18 +262,18 @@ public class FieldView extends PlainView
 
     super.paint(g, newAlloc);
     g.setClip(clip);
-    
+
   }
 
   public void insertUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
   {
     cachedSpan = -1f;
-    
+
     if (horizontalVisibility != null)
       updateVisibility();
-    
+
     Shape newAlloc = adjustAllocation(shape);
-    
+
     super.insertUpdate(ev, newAlloc, vf);
     getContainer().repaint();
   }
@@ -281,7 +281,7 @@ public class FieldView extends PlainView
   public void removeUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
   {
     cachedSpan = -1f;
-    
+
     if (horizontalVisibility != null)
       updateVisibility();
 
@@ -293,7 +293,7 @@ public class FieldView extends PlainView
   public void changedUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
   {
     cachedSpan = -1f;
-    
+
     if (horizontalVisibility != null)
       updateVisibility();
 
@@ -306,5 +306,5 @@ public class FieldView extends PlainView
   {
     return super.viewToModel(fx, fy, adjustAllocation(a), bias);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/text/FlowView.java b/libjava/classpath/javax/swing/text/FlowView.java
index c2bed399f3a..a9a80833a3b 100644
--- a/libjava/classpath/javax/swing/text/FlowView.java
+++ b/libjava/classpath/javax/swing/text/FlowView.java
@@ -216,7 +216,7 @@ public abstract class FlowView extends BoxView
      * the logical view. If the available space is exhausted,
      * {@link #adjustRow(FlowView, int, int, int)} is called to fit the row into
      * the available span.
-     * 
+     *
      * @param fv the flow view for which we perform the layout
      * @param rowIndex the index of the row
      * @param pos the model position for the beginning of the row
@@ -616,7 +616,7 @@ public abstract class FlowView extends BoxView
   {
     int axis = getAxis();
     int flowAxis;
- 
+
     if (axis == X_AXIS)
       flowAxis = Y_AXIS;
     else
@@ -697,7 +697,7 @@ public abstract class FlowView extends BoxView
   protected void layout(int width, int height)
   {
     int flowAxis = getFlowAxis();
-    int span; 
+    int span;
     if (flowAxis == X_AXIS)
       span = (int) width;
     else
diff --git a/libjava/classpath/javax/swing/text/GapContent.java b/libjava/classpath/javax/swing/text/GapContent.java
index 08a318d8bb4..2e68fb5fefa 100644
--- a/libjava/classpath/javax/swing/text/GapContent.java
+++ b/libjava/classpath/javax/swing/text/GapContent.java
@@ -64,7 +64,7 @@ import javax.swing.undo.UndoableEdit;
 public class GapContent
     implements AbstractDocument.Content, Serializable
 {
-  
+
   /**
    * A {@link Position} implementation for GapContent.
    */
@@ -80,7 +80,7 @@ public class GapContent
 
     /**
      * Returns the current offset of this Position within the content.
-     * 
+     *
      * @return the current offset of this Position within the content.
      */
     public int getOffset()
@@ -94,7 +94,7 @@ public class GapContent
    * the actual offset of the position. This is pulled out of the
    * GapContentPosition object so that the mark and position can be handled
    * independently, and most important, so that the GapContentPosition can
-   * be garbage collected while we still hold a reference to the Mark object. 
+   * be garbage collected while we still hold a reference to the Mark object.
    */
   private class Mark
     extends WeakReference
@@ -149,7 +149,7 @@ public class GapContent
 
   /**
    * Stores a reference to a mark that can be resetted to the original value
-   * after a mark has been moved. This is used for undoing actions. 
+   * after a mark has been moved. This is used for undoing actions.
    */
   private class UndoPosRef
   {
@@ -213,7 +213,7 @@ public class GapContent
           throw new CannotUndoException();
         }
     }
-    
+
     public void redo () throws CannotUndoException
     {
       super.redo();
@@ -231,9 +231,9 @@ public class GapContent
           throw new CannotRedoException();
         }
     }
-    
+
   }
-  
+
   private class UndoRemove extends AbstractUndoableEdit
   {
     public int where;
@@ -265,7 +265,7 @@ public class GapContent
         throw new CannotUndoException();
       }
     }
-    
+
     public void redo () throws CannotUndoException
     {
       super.redo();
@@ -280,7 +280,7 @@ public class GapContent
           throw new CannotRedoException();
         }
     }
-    
+
   }
 
   /** The serialization UID (compatible with JDK1.5). */
@@ -348,7 +348,7 @@ public class GapContent
 
   /**
    * Creates a new GapContent object with a specified initial size.
-   * 
+   *
    * @param size the initial size of the buffer
    */
   public GapContent(int size)
@@ -365,9 +365,9 @@ public class GapContent
   /**
    * Allocates an array of the specified length that can then be used as
    * buffer.
-   * 
+   *
    * @param size the size of the array to be allocated
-   * 
+   *
    * @return the allocated array
    */
   protected Object allocateArray(int size)
@@ -377,7 +377,7 @@ public class GapContent
 
   /**
    * Returns the length of the allocated buffer array.
-   * 
+   *
    * @return the length of the allocated buffer array
    */
   protected int getArrayLength()
@@ -387,7 +387,7 @@ public class GapContent
 
   /**
    * Returns the length of the content.
-   * 
+   *
    * @return the length of the content
    */
   public int length()
@@ -397,12 +397,12 @@ public class GapContent
 
   /**
    * Inserts a string at the specified position.
-   * 
+   *
    * @param where the position where the string is inserted
    * @param str the string that is to be inserted
-   * 
+   *
    * @return an UndoableEdit object
-   * 
+   *
    * @throws BadLocationException if where is not a valid
    *         location in the buffer
    */
@@ -429,12 +429,12 @@ public class GapContent
 
   /**
    * Removes a piece of content at th specified position.
-   * 
+   *
    * @param where the position where the content is to be removed
    * @param nitems number of characters to be removed
-   * 
+   *
    * @return an UndoableEdit object
-   * 
+   *
    * @throws BadLocationException if where is not a valid
    *         location in the buffer
    */
@@ -442,11 +442,11 @@ public class GapContent
   {
     // check arguments
     int length = length();
-    
+
     if ((where + nitems) >= length)
       throw new BadLocationException("where + nitems cannot be greater"
           + " than the content length", where + nitems);
-    
+
     String removedText = getString(where, nitems);
     UndoRemove undoRemove = new UndoRemove(where, removedText);
     replace(where, nitems, null, 0);
@@ -456,10 +456,10 @@ public class GapContent
 
   /**
    * Returns a piece of content as String.
-   * 
+   *
    * @param where the start location of the fragment
    * @param len the length of the fragment
-   * 
+   *
    * @throws BadLocationException if where or
    *         where + len are no valid locations in the buffer
    */
@@ -487,15 +487,15 @@ public class GapContent
 
   /**
    * Fetches a piece of content and stores it in a {@link Segment} object.
-   * 
+   *
    * If the requested piece of text spans the gap, the content is copied into a
    * new array. If it doesn't then it is contiguous and the actual content
    * store is returned.
-   * 
+   *
    * @param where the start location of the fragment
    * @param len the length of the fragment
    * @param txt the Segment object to store the fragment in
-   * 
+   *
    * @throws BadLocationException if where or
    *         where + len are no valid locations in the buffer
    */
@@ -515,7 +515,7 @@ public class GapContent
     if (len < 0)
       throw new BadLocationException("negative length not allowed: ", len);
 
-    // Optimized to copy only when really needed. 
+    // Optimized to copy only when really needed.
     if (where + len <= gapStart)
       {
         // Simple case: completely before gap.
@@ -556,11 +556,11 @@ public class GapContent
 
   /**
    * Creates and returns a mark at the specified position.
-   * 
+   *
    * @param offset the position at which to create the mark
-   * 
+   *
    * @return the create Position object for the mark
-   * 
+   *
    * @throws BadLocationException if the offset is not a valid position in the
    *         buffer
    */
@@ -597,7 +597,7 @@ public class GapContent
         marks.add(insertIndex, m);
       }
     // Otherwise use the found position.
-      
+
     return pos;
   }
 
@@ -606,7 +606,7 @@ public class GapContent
    * segment before the gap as it is and the segment after the gap at the end
    * of the new buffer array. This does change the gapEnd mark but not the
    * gapStart mark.
-   * 
+   *
    * @param newSize the new size of the gap
    */
   protected void shiftEnd(int newSize)
@@ -641,7 +641,7 @@ public class GapContent
 
   /**
    * Shifts the gap to the specified position.
-   * 
+   *
    * @param newGapStart the new start position of the gap
    */
   protected void shiftGap(int newGapStart)
@@ -746,14 +746,14 @@ public class GapContent
         m.mark = newGapEnd;
       }
 
-    
+
     gapEnd = newGapEnd;
     resetMarksAtZero();
   }
 
   /**
    * Returns the allocated buffer array.
-   * 
+   *
    * @return the allocated buffer array
    */
   protected final Object getArray()
@@ -763,7 +763,7 @@ public class GapContent
 
   /**
    * Replaces a portion of the storage with the specified items.
-   * 
+   *
    * @param position the position at which to remove items
    * @param rmSize the number of items to remove
    * @param addItems the items to add at location
@@ -915,7 +915,7 @@ public class GapContent
       }
     return v;
   }
-  
+
   /**
    * Resets all Position that have an offset of 0,
    * to also have an array index of 0. This might be necessary
diff --git a/libjava/classpath/javax/swing/text/GlyphView.java b/libjava/classpath/javax/swing/text/GlyphView.java
index 6bc2a382c52..3f4ccf9c269 100644
--- a/libjava/classpath/javax/swing/text/GlyphView.java
+++ b/libjava/classpath/javax/swing/text/GlyphView.java
@@ -110,7 +110,7 @@ public class GlyphView extends View implements TabableView, Cloneable
     /**
      * Determines the model offset, so that the text between p0
      * and this offset fits within the span starting at x with
-     * the length of len. 
+     * the length of len.
      *
      * @param v the glyph view
      * @param p0 the starting offset in the model
@@ -403,7 +403,7 @@ public class GlyphView extends View implements TabableView, Cloneable
                                        : Position.Bias.Backward;
       return pos + v.getStartOffset();
     }
-    
+
   }
 
   /**
@@ -424,7 +424,7 @@ public class GlyphView extends View implements TabableView, Cloneable
       float height = fontMetrics.getHeight();
       return height;
     }
-    
+
     /**
      * Paints the glyphs.
      *
@@ -562,7 +562,7 @@ public class GlyphView extends View implements TabableView, Cloneable
     /**
      * Determines the model offset, so that the text between p0
      * and this offset fits within the span starting at x with
-     * the length of len. 
+     * the length of len.
      *
      * @param v the glyph view
      * @param p0 the starting offset in the model
@@ -739,7 +739,7 @@ public class GlyphView extends View implements TabableView, Cloneable
         g.fillRect(r.x, r.y, r.width, r.height);
       }
 
-    
+
     // Paint layered highlights if there are any.
     if (tc != null)
       {
@@ -972,11 +972,11 @@ public class GlyphView extends View implements TabableView, Cloneable
       }
     catch (BadLocationException ex)
       {
-	AssertionError ae;
+        AssertionError ae;
         ae = new AssertionError("BadLocationException should not be "
-				+ "thrown here. p0 = " + p0 + ", p1 = " + p1);
-	ae.initCause(ex);
-	throw ae;
+                                + "thrown here. p0 = " + p0 + ", p1 = " + p1);
+        ae.initCause(ex);
+        throw ae;
       }
 
     return cached;
diff --git a/libjava/classpath/javax/swing/text/Highlighter.java b/libjava/classpath/javax/swing/text/Highlighter.java
index 91f3b7903d0..b4b671ac4f6 100644
--- a/libjava/classpath/javax/swing/text/Highlighter.java
+++ b/libjava/classpath/javax/swing/text/Highlighter.java
@@ -57,7 +57,7 @@ public interface Highlighter
   {
     void paint(Graphics g, int p0, int p1, Shape bounds, JTextComponent c);
   }
-  
+
   void install(JTextComponent c);
 
   void deinstall(JTextComponent c);
@@ -76,4 +76,3 @@ public interface Highlighter
 
   void paint(Graphics g);
 }
-
diff --git a/libjava/classpath/javax/swing/text/InternationalFormatter.java b/libjava/classpath/javax/swing/text/InternationalFormatter.java
index 1de5ca27126..8dcd03a3f84 100644
--- a/libjava/classpath/javax/swing/text/InternationalFormatter.java
+++ b/libjava/classpath/javax/swing/text/InternationalFormatter.java
@@ -206,7 +206,7 @@ public class InternationalFormatter
    * one of the mentioned methods in order to customize behaviour.
    *
    * @param ftf the {@link JFormattedTextField} in which this formatter
-   *     is installed 
+   *     is installed
    */
   public void install(JFormattedTextField ftf)
   {
diff --git a/libjava/classpath/javax/swing/text/JTextComponent.java b/libjava/classpath/javax/swing/text/JTextComponent.java
index 24035e35ac2..a118cf86df6 100644
--- a/libjava/classpath/javax/swing/text/JTextComponent.java
+++ b/libjava/classpath/javax/swing/text/JTextComponent.java
@@ -246,7 +246,7 @@ public abstract class JTextComponent extends JComponent
     {
       return this;
     }
-    
+
     /**
      * Handle a text insertion event and fire an
      * AccessibleContext.ACCESSIBLE_TEXT_PROPERTY property change
@@ -313,7 +313,7 @@ public abstract class JTextComponent extends JComponent
     public Rectangle getCharacterBounds(int index)
     {
       // This is basically the same as BasicTextUI.modelToView().
-      
+
       Rectangle bounds = null;
       if (index >= 0 && index < doc.getLength() - 1)
         {
@@ -368,12 +368,12 @@ public abstract class JTextComponent extends JComponent
       return JTextComponent.this.getText().length();
     }
 
-   /** 
+   /**
     * Gets the character attributes of the character at index. If
     * the index is out of bounds, null is returned.
     *
     * @param index - index of the character
-    * 
+    *
     * @return the character's attributes
     */
     public AttributeSet getCharacterAttribute(int index)
@@ -402,24 +402,24 @@ public abstract class JTextComponent extends JComponent
     /**
      * Gets the text located at index. null is returned if the index
      * or part is invalid.
-     * 
+     *
      * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
      * @param index - index of the part
-     * 
+     *
      * @return the part of text at that index, or null
      */
     public String getAtIndex(int part, int index)
     {
       return getAtIndexImpl(part, index, 0);
     }
-    
+
     /**
      * Gets the text located after index. null is returned if the index
      * or part is invalid.
-     * 
+     *
      * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
      * @param index - index after the part
-     * 
+     *
      * @return the part of text after that index, or null
      */
     public String getAfterIndex(int part, int index)
@@ -430,10 +430,10 @@ public abstract class JTextComponent extends JComponent
     /**
      * Gets the text located before index. null is returned if the index
      * or part is invalid.
-     * 
+     *
      * @param part - {@link #CHARACTER}, {@link #WORD}, or {@link #SENTENCE}
      * @param index - index before the part
-     * 
+     *
      * @return the part of text before that index, or null
      */
     public String getBeforeIndex(int part, int index)
@@ -518,20 +518,20 @@ public abstract class JTextComponent extends JComponent
     /**
      * Returns the number of actions for this object. The zero-th
      * object represents the default action.
-     * 
+     *
      * @return the number of actions (0-based).
      */
     public int getAccessibleActionCount()
     {
       return getActions().length;
     }
-    
+
     /**
      * Returns the description of the i-th action. Null is returned if
      * i is out of bounds.
-     * 
+     *
      * @param i - the action to get the description for
-     * 
+     *
      * @return description of the i-th action
      */
     public String getAccessibleActionDescription(int i)
@@ -542,13 +542,13 @@ public abstract class JTextComponent extends JComponent
         desc = (String) actions[i].getValue(Action.NAME);
       return desc;
     }
-    
+
     /**
-     * Performs the i-th action. Nothing happens if i is 
+     * Performs the i-th action. Nothing happens if i is
      * out of bounds.
      *
      * @param i - the action to perform
-     * 
+     *
      * @return true if the action was performed successfully
      */
     public boolean doAccessibleAction(int i)
@@ -564,7 +564,7 @@ public abstract class JTextComponent extends JComponent
         }
       return ret;
     }
-    
+
     /**
      * Sets the text contents.
      *
@@ -727,7 +727,7 @@ public abstract class JTextComponent extends JComponent
    * objects, by delegation to the underlying {@link Keymap}.
    *
    * 
                  • KeymapActionMap extends {@link ActionMap} also holds a reference to
-   * the underlying {@link Keymap} but only appears to use it for listing 
+   * the underlying {@link Keymap} but only appears to use it for listing
    * its keys. 
                    • 
    *
    * 
                  • KeymapActionMap maps all {@link Action} objects to
@@ -774,7 +774,7 @@ public abstract class JTextComponent extends JComponent
     public KeyStroke[] keys()
     {
       KeyStroke[] superKeys = super.keys();
-      KeyStroke[] mapKeys = map.getBoundKeyStrokes(); 
+      KeyStroke[] mapKeys = map.getBoundKeyStrokes();
       KeyStroke[] bothKeys = new KeyStroke[superKeys.length + mapKeys.length];
       for (int i = 0; i < superKeys.length; ++i)
         bothKeys[i] = superKeys[i];
@@ -824,22 +824,22 @@ public abstract class JTextComponent extends JComponent
       return map.getBoundKeyStrokes().length + super.size();
     }
 
-    public Object[] keys() 
+    public Object[] keys()
     {
       Object[] superKeys = super.keys();
-      Object[] mapKeys = map.getBoundKeyStrokes(); 
+      Object[] mapKeys = map.getBoundKeyStrokes();
       Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
       for (int i = 0; i < superKeys.length; ++i)
         bothKeys[i] = superKeys[i];
       for (int i = 0; i < mapKeys.length; ++i)
         bothKeys[i + superKeys.length] = mapKeys[i];
-      return bothKeys;      
+      return bothKeys;
     }
 
     public Object[] allKeys()
     {
       Object[] superKeys = super.allKeys();
-      Object[] mapKeys = map.getBoundKeyStrokes(); 
+      Object[] mapKeys = map.getBoundKeyStrokes();
       Object[] bothKeys = new Object[superKeys.length + mapKeys.length];
       for (int i = 0; i < superKeys.length; ++i)
         bothKeys[i] = superKeys[i];
@@ -929,10 +929,10 @@ public abstract class JTextComponent extends JComponent
       i = 0;
       e = map.keys();
       while (e.hasMoreElements())
-        {          
+        {
           KeyStroke k = (KeyStroke) e.nextElement();
           if (map.get(k).equals(a))
-            ret[i++] = k;            
+            ret[i++] = k;
         }
       return ret;
     }
@@ -978,21 +978,21 @@ public abstract class JTextComponent extends JComponent
     public boolean canImport(JComponent component, DataFlavor[] flavors)
     {
       JTextComponent textComponent = (JTextComponent) component;
-      
+
       if (! (textComponent.isEnabled()
-	     && textComponent.isEditable()
-	     && flavors != null))
+             && textComponent.isEditable()
+             && flavors != null))
         return false;
 
       for (int i = 0; i < flavors.length; ++i)
-	if (flavors[i].equals(DataFlavor.stringFlavor))
-	   return true;
+        if (flavors[i].equals(DataFlavor.stringFlavor))
+           return true;
 
       return false;
     }
-    
+
     public void exportToClipboard(JComponent component, Clipboard clipboard,
-				  int action)
+                                  int action)
     {
       JTextComponent textComponent = (JTextComponent) component;
       int start = textComponent.getSelectionStart();
@@ -1017,7 +1017,7 @@ public abstract class JTextComponent extends JComponent
           // Ignore this and do nothing.
         }
     }
-    
+
     public int getSourceActions()
     {
       return NONE;
@@ -1034,7 +1034,7 @@ public abstract class JTextComponent extends JComponent
       for (int i = 0; i < flavors.length; ++i)
         if (flavors[i].equals(DataFlavor.stringFlavor))
           flavor = flavors[i];
-      
+
       if (flavor == null)
         return false;
 
@@ -1059,10 +1059,10 @@ public abstract class JTextComponent extends JComponent
   }
 
   private static final long serialVersionUID = -8796518220218978795L;
-  
+
   public static final String DEFAULT_KEYMAP = "default";
   public static final String FOCUS_ACCELERATOR_KEY = "focusAcceleratorKey";
-  
+
   private static DefaultTransferHandler defaultTransferHandler;
   private static Hashtable keymaps = new Hashtable();
   private Keymap keymap;
@@ -1096,7 +1096,7 @@ public abstract class JTextComponent extends JComponent
    * @see #addKeymap
    * @see #getKeymap()
    * @see #keymaps
-   */  
+   */
   public static Keymap removeKeymap(String n)
   {
     Keymap km = (Keymap) keymaps.get(n);
@@ -1110,7 +1110,7 @@ public abstract class JTextComponent extends JComponent
    * in which case the new Keymap will not be added to the global
    * Keymap table. The parent may also be null, which is
    * harmless.
-   * 
+   *
    * @param n The name of the new Keymap, or null
    * @param parent The parent of the new Keymap, or null
    *
@@ -1137,7 +1137,7 @@ public abstract class JTextComponent extends JComponent
    * @see #setKeymap
    * @see #keymap
    */
-  public Keymap getKeymap() 
+  public Keymap getKeymap()
   {
     return keymap;
   }
@@ -1151,26 +1151,26 @@ public abstract class JTextComponent extends JComponent
    * @see #getKeymap()
    * @see #keymap
    */
-  public void setKeymap(Keymap k) 
+  public void setKeymap(Keymap k)
   {
 
     // phase 1: replace the KeymapWrapper entry in the InputMap chain.
     // the goal here is to always maintain the following ordering:
     //
     //   [InputMap]? -> [KeymapWrapper]? -> [InputMapUIResource]*
-    // 
+    //
     // that is to say, component-specific InputMaps need to remain children
     // of Keymaps, and Keymaps need to remain children of UI-installed
     // InputMaps (and the order of each group needs to be preserved, of
     // course).
-    
+
     KeymapWrapper kw = (k == null ? null : new KeymapWrapper(k));
     InputMap childInputMap = getInputMap(JComponent.WHEN_FOCUSED);
     if (childInputMap == null)
       setInputMap(JComponent.WHEN_FOCUSED, kw);
     else
       {
-        while (childInputMap.getParent() != null 
+        while (childInputMap.getParent() != null
                && !(childInputMap.getParent() instanceof KeymapWrapper)
                && !(childInputMap.getParent() instanceof InputMapUIResource))
           childInputMap = childInputMap.getParent();
@@ -1178,7 +1178,7 @@ public abstract class JTextComponent extends JComponent
         // option 1: there is nobody to replace at the end of the chain
         if (childInputMap.getParent() == null)
           childInputMap.setParent(kw);
-        
+
         // option 2: there is already a KeymapWrapper in the chain which
         // needs replacing (possibly with its own parents, possibly without)
         else if (childInputMap.getParent() instanceof KeymapWrapper)
@@ -1212,7 +1212,7 @@ public abstract class JTextComponent extends JComponent
       setActionMap(kam);
     else
       {
-        while (childActionMap.getParent() != null 
+        while (childActionMap.getParent() != null
                && !(childActionMap.getParent() instanceof KeymapActionMap)
                && !(childActionMap.getParent() instanceof ActionMapUIResource))
           childActionMap = childActionMap.getParent();
@@ -1220,7 +1220,7 @@ public abstract class JTextComponent extends JComponent
         // option 1: there is nobody to replace at the end of the chain
         if (childActionMap.getParent() == null)
           childActionMap.setParent(kam);
-        
+
         // option 2: there is already a KeymapActionMap in the chain which
         // needs replacing (possibly with its own parents, possibly without)
         else if (childActionMap.getParent() instanceof KeymapActionMap)
@@ -1269,8 +1269,8 @@ public abstract class JTextComponent extends JComponent
    * @see Action#getValue
    * @see KeyBinding#actionName
    */
-  public static void loadKeymap(Keymap map, 
-                                JTextComponent.KeyBinding[] bindings, 
+  public static void loadKeymap(Keymap map,
+                                JTextComponent.KeyBinding[] bindings,
                                 Action[] actions)
   {
     Hashtable acts = new Hashtable(actions.length);
@@ -1298,12 +1298,12 @@ public abstract class JTextComponent extends JComponent
   {
     return getUI().getEditorKit(this).getActions();
   }
-    
+
   // These are package-private to avoid an accessor method.
   Document doc;
   Caret caret;
   boolean editable;
-  
+
   private Highlighter highlighter;
   private Color caretColor;
   private Color disabledTextColor;
@@ -1445,10 +1445,10 @@ public abstract class JTextComponent extends JComponent
   {
     int start = getSelectionStart();
     int offset = getSelectionEnd() - start;
-    
+
     if (offset <= 0)
       return null;
-    
+
     try
       {
         return doc.getText(start, offset);
@@ -1565,7 +1565,7 @@ public abstract class JTextComponent extends JComponent
   {
     if (editable == newValue)
       return;
-    
+
     boolean oldValue = editable;
     editable = newValue;
     firePropertyChange("editable", oldValue, newValue);
@@ -1590,13 +1590,13 @@ public abstract class JTextComponent extends JComponent
   {
     if (caret != null)
       caret.deinstall(this);
-    
+
     Caret oldCaret = caret;
     caret = newCaret;
 
     if (caret != null)
       caret.install(this);
-    
+
     firePropertyChange("caret", oldCaret, newCaret);
   }
 
@@ -1698,13 +1698,13 @@ public abstract class JTextComponent extends JComponent
   {
     if (highlighter != null)
       highlighter.deinstall(this);
-    
+
     Highlighter oldHighlighter = highlighter;
     highlighter = newHighlighter;
 
     if (highlighter != null)
       highlighter.install(this);
-    
+
     firePropertyChange("highlighter", oldHighlighter, newHighlighter);
   }
 
@@ -1757,7 +1757,7 @@ public abstract class JTextComponent extends JComponent
   public void select(int start, int end)
   {
     int length = doc.getLength();
-    
+
     start = Math.max(start, 0);
     start = Math.min(start, length);
 
@@ -1803,7 +1803,7 @@ public abstract class JTextComponent extends JComponent
         // Set dot to new position,
         dot = start + content.length();
         setCaretPosition(dot);
-        
+
         // and update it's magic position.
         caret.setMagicCaretPosition(modelToView(dot).getLocation());
       }
@@ -1969,7 +1969,7 @@ public abstract class JTextComponent extends JComponent
     focusAccelerator = newKey;
     firePropertyChange(FOCUS_ACCELERATOR_KEY, oldKey, newKey);
   }
-  
+
   public char getFocusAccelerator()
   {
     return focusAccelerator;
@@ -1990,7 +1990,7 @@ public abstract class JTextComponent extends JComponent
   {
     navigationFilter = filter;
   }
-  
+
   /**
    * Read and set the content this component. If not overridden, the
    * method reads the component content as a plain text.
diff --git a/libjava/classpath/javax/swing/text/Keymap.java b/libjava/classpath/javax/swing/text/Keymap.java
index c3f61d88e07..e1b305f5fa1 100644
--- a/libjava/classpath/javax/swing/text/Keymap.java
+++ b/libjava/classpath/javax/swing/text/Keymap.java
@@ -1,4 +1,4 @@
-/* Keymap.java -- 
+/* Keymap.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,19 +42,17 @@ import javax.swing.KeyStroke;
 
 public interface Keymap
 {
-    void addActionForKeyStroke(KeyStroke key, Action a); 
-    Action getAction(KeyStroke key); 
-    Action[] getBoundActions(); 
-    KeyStroke[] getBoundKeyStrokes(); 
-    Action getDefaultAction(); 
-    KeyStroke[] getKeyStrokesForAction(Action a); 
-    String getName(); 
-    Keymap getResolveParent(); 
-    boolean isLocallyDefined(KeyStroke key); 
-    void removeBindings(); 
-    void removeKeyStrokeBinding(KeyStroke keys); 
-    void setDefaultAction(Action a); 
+    void addActionForKeyStroke(KeyStroke key, Action a);
+    Action getAction(KeyStroke key);
+    Action[] getBoundActions();
+    KeyStroke[] getBoundKeyStrokes();
+    Action getDefaultAction();
+    KeyStroke[] getKeyStrokesForAction(Action a);
+    String getName();
+    Keymap getResolveParent();
+    boolean isLocallyDefined(KeyStroke key);
+    void removeBindings();
+    void removeKeyStrokeBinding(KeyStroke keys);
+    void setDefaultAction(Action a);
     void setResolveParent(Keymap parent);
 }
-
-
diff --git a/libjava/classpath/javax/swing/text/LayeredHighlighter.java b/libjava/classpath/javax/swing/text/LayeredHighlighter.java
index dcaf1c504c6..3eac26b38e2 100644
--- a/libjava/classpath/javax/swing/text/LayeredHighlighter.java
+++ b/libjava/classpath/javax/swing/text/LayeredHighlighter.java
@@ -47,10 +47,10 @@ public abstract class LayeredHighlighter
     implements Highlighter.HighlightPainter
   {
     public abstract Shape paintLayer(Graphics g, int p0, int p1,
-				     Shape viewBounds, JTextComponent editor,
-				     View view);
+                                     Shape viewBounds, JTextComponent editor,
+                                     View view);
   }
-  
+
   public abstract void paintLayeredHighlights(Graphics g, int p0, int p1,
                                               Shape viewBounds,
                                               JTextComponent editor, View view);
diff --git a/libjava/classpath/javax/swing/text/LayoutQueue.java b/libjava/classpath/javax/swing/text/LayoutQueue.java
index b0c84b972b2..10fadd55e13 100644
--- a/libjava/classpath/javax/swing/text/LayoutQueue.java
+++ b/libjava/classpath/javax/swing/text/LayoutQueue.java
@@ -67,8 +67,8 @@ public class LayoutQueue
   {
     synchronized (list)
       {
-	list.addLast(task);
-	list.notify();
+        list.addLast(task);
+        list.notify();
       }
   }
 
@@ -81,20 +81,20 @@ public class LayoutQueue
   {
     synchronized (list)
       {
-	while (list.size() == 0)
-	  {
-	    try
-	      {
-		list.wait();
-	      }
-	    catch (InterruptedException _)
-	      {
-		// This seemed like a good idea, but it has not been
-		// tested on the JDK.
-		return null;
-	      }
-	  }
-	return (Runnable) list.removeFirst();
+        while (list.size() == 0)
+          {
+            try
+              {
+                list.wait();
+              }
+            catch (InterruptedException _)
+              {
+                // This seemed like a good idea, but it has not been
+                // tested on the JDK.
+                return null;
+              }
+          }
+        return (Runnable) list.removeFirst();
       }
   }
 
diff --git a/libjava/classpath/javax/swing/text/MaskFormatter.java b/libjava/classpath/javax/swing/text/MaskFormatter.java
index 4ebf65b9332..c8f631ae3e5 100644
--- a/libjava/classpath/javax/swing/text/MaskFormatter.java
+++ b/libjava/classpath/javax/swing/text/MaskFormatter.java
@@ -1,4 +1,4 @@
-/* MaskFormatter.java -- 
+/* MaskFormatter.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59,53 +59,53 @@ public class MaskFormatter extends DefaultFormatter
   private static final char LETTER_CHAR = '?';
   private static final char ANYTHING_CHAR = '*';
   private static final char HEX_CHAR = 'H';
-  
+
   /** The mask for this MaskFormatter **/
   private String mask;
-  
-  /** 
-   * A String made up of the characters that are not valid for input for 
-   * this MaskFormatter. 
+
+  /**
+   * A String made up of the characters that are not valid for input for
+   * this MaskFormatter.
    */
   private String invalidChars;
-  
-  /** 
-   * A String made up of the characters that are valid for input for 
-   * this MaskFormatter. 
+
+  /**
+   * A String made up of the characters that are valid for input for
+   * this MaskFormatter.
    */
   private String validChars;
-  
-  /** A String used in place of missing chracters if the value does not 
+
+  /** A String used in place of missing chracters if the value does not
    * completely fill in the spaces in the mask.
    */
   private String placeHolder;
-  
-  /** A character used in place of missing characters if the value does 
+
+  /** A character used in place of missing characters if the value does
    * not completely fill in the spaces in the mask.
    */
   private char placeHolderChar = ' ';
-  
+
   /**
    * Whether or not stringToValue should return literal characters in the mask.
    */
   private boolean valueContainsLiteralCharacters = true;
-  
+
   /** A String used for easy access to valid HEX characters **/
   private static String hexString = "0123456789abcdefABCDEF";
-  
+
   /** An int to hold the length of the mask, accounting for escaped characters **/
   int maskLength = 0;
-  
+
   public MaskFormatter ()
   {
     // Override super's default behaviour, in MaskFormatter the default
     // is not to allow invalid values
     setAllowsInvalid(false);
   }
-  
+
   /**
    * Creates a MaskFormatter with the specified mask.
-   * @specnote doesn't actually throw a ParseException although it 
+   * @specnote doesn't actually throw a ParseException although it
    * is declared to do so
    * @param mask
    * @throws java.text.ParseException
@@ -115,7 +115,7 @@ public class MaskFormatter extends DefaultFormatter
     this();
     setMask (mask);
   }
-  
+
   /**
    * Returns the mask used in this MaskFormatter.
    * @return the mask used in this MaskFormatter.
@@ -124,7 +124,7 @@ public class MaskFormatter extends DefaultFormatter
   {
     return mask;
   }
-  
+
   /**
    * Returns a String containing the characters that are not valid for input
    * for this MaskFormatter.
@@ -134,19 +134,19 @@ public class MaskFormatter extends DefaultFormatter
   {
     return invalidChars;
   }
-  
+
   /**
    * Sets characters that are not valid for input. If
    * invalidCharacters is non-null then no characters contained
    * in it will be allowed to be input.
-   * 
+   *
    * @param invalidCharacters the String specifying invalid characters.
    */
   public void setInvalidCharacters (String invalidCharacters)
   {
     this.invalidChars = invalidCharacters;
   }
-  
+
   /**
    * Returns a String containing the characters that are valid for input
    * for this MaskFormatter.
@@ -156,12 +156,12 @@ public class MaskFormatter extends DefaultFormatter
   {
     return validChars;
   }
-  
+
   /**
    * Sets characters that are valid for input. If
    * validCharacters is non-null then no characters that are
    * not contained in it will be allowed to be input.
-   * 
+   *
    * @param validCharacters the String specifying valid characters.
    */
   public void setValidCharacters (String validCharacters)
@@ -170,7 +170,7 @@ public class MaskFormatter extends DefaultFormatter
   }
 
   /**
-   * Returns the place holder String that is used in place of missing 
+   * Returns the place holder String that is used in place of missing
    * characters when the value doesn't completely fill in the spaces
    * in the mask.
    * @return the place holder String.
@@ -179,18 +179,18 @@ public class MaskFormatter extends DefaultFormatter
   {
     return placeHolder;
   }
-  
+
   /**
    * Sets the string to use if the value does not completely fill in the mask.
    * If this is null, the place holder character will be used instead.
-   * @param placeholder the String to use if the value doesn't completely 
+   * @param placeholder the String to use if the value doesn't completely
    * fill in the mask.
    */
   public void setPlaceholder (String placeholder)
   {
     this.placeHolder = placeholder;
   }
-  
+
   /**
    * Returns the character used in place of missing characters when the
    * value doesn't completely fill the mask.
@@ -200,42 +200,42 @@ public class MaskFormatter extends DefaultFormatter
   {
     return placeHolderChar;
   }
-  
+
   /**
    * Sets the char  to use if the value does not completely fill in the mask.
-   * This is only used if the place holder String has not been set or does 
+   * This is only used if the place holder String has not been set or does
    * not completely fill in the mask.
-   * @param placeholder the char to use if the value doesn't completely 
+   * @param placeholder the char to use if the value doesn't completely
    * fill in the mask.
    */
   public void setPlaceholderCharacter (char placeholder)
   {
     this.placeHolderChar = placeholder;
   }
-  
+
   /**
-   * Returns true if stringToValue should return the literal 
+   * Returns true if stringToValue should return the literal
    * characters in the mask.
-   * @return true if stringToValue should return the literal 
+   * @return true if stringToValue should return the literal
    * characters in the mask
    */
   public boolean getValueContainsLiteralCharacters()
   {
     return valueContainsLiteralCharacters;
   }
-  
+
   /**
    * Determines whether stringToValue will return literal characters or not.
-   * @param containsLiteralChars if true, stringToValue will return the 
+   * @param containsLiteralChars if true, stringToValue will return the
    * literal characters in the mask, otherwise it will not.
    */
   public void setValueContainsLiteralCharacters (boolean containsLiteralChars)
   {
     this.valueContainsLiteralCharacters = containsLiteralChars;
   }
-  
+
   /**
-   * Sets the mask for this MaskFormatter.  
+   * Sets the mask for this MaskFormatter.
    * @specnote doesn't actually throw a ParseException even though it is
    * declared to do so
    * @param mask the new mask for this MaskFormatter
@@ -247,14 +247,14 @@ public class MaskFormatter extends DefaultFormatter
 
     // Update the cached maskLength.
     int end = mask.length() - 1;
-    maskLength = 0;    
+    maskLength = 0;
     for (int i = 0; i <= end; i++)
       {
         // Handle escape characters properly - they don't add to the maskLength
         // but 2 escape characters in a row is really one escape character and
         // one literal single quote, so that does add 1 to the maskLength.
         if (mask.charAt(i) == '\'')
-          {            
+          {
             // Escape characters at the end of the mask don't do anything.
             if (i != end)
               maskLength++;
@@ -264,14 +264,14 @@ public class MaskFormatter extends DefaultFormatter
           maskLength++;
       }
   }
-  
+
   /**
    * Installs this MaskFormatter on the JFormattedTextField.
-   * Invokes valueToString to convert the current value from the 
+   * Invokes valueToString to convert the current value from the
    * JFormattedTextField to a String, then installs the Actions from
-   * getActions, the DocumentFilter from getDocumentFilter, and the 
+   * getActions, the DocumentFilter from getDocumentFilter, and the
    * NavigationFilter from getNavigationFilter.
-   * 
+   *
    * If valueToString throws a ParseException, this method sets the text
    * to an empty String and marks the JFormattedTextField as invalid.
    */
@@ -293,14 +293,14 @@ public class MaskFormatter extends DefaultFormatter
         }
       }
   }
-  
+
   /**
    * Parses the text using the mask, valid characters, and invalid characters
    * to determine the appropriate Object to return.  This strips the literal
    * characters if necessary and invokes super.stringToValue.  If the paramter
-   * is invalid for the current mask and valid/invalid character sets this 
+   * is invalid for the current mask and valid/invalid character sets this
    * method will throw a ParseException.
-   * 
+   *
    * @param value the String to parse
    * @throws ParseException if value doesn't match the mask and valid/invalid
    * character sets
@@ -309,7 +309,7 @@ public class MaskFormatter extends DefaultFormatter
   {
     return super.stringToValue(convertStringToValue(value));
   }
-  
+
   private String convertStringToValue(String value)
     throws ParseException
   {
@@ -347,7 +347,7 @@ public class MaskFormatter extends DefaultFormatter
             valueChar = placeHolderChar;
           }
 
-        // This switch block on the mask character checks that the character 
+        // This switch block on the mask character checks that the character
         // within value at that point is valid according to the
         // mask and also converts to upper/lowercase as needed.
         switch (maskChar)
@@ -393,7 +393,7 @@ public class MaskFormatter extends DefaultFormatter
             i++;
             break;
           case ESCAPE_CHAR:
-            // Escape character, check the next character to make sure that 
+            // Escape character, check the next character to make sure that
             // the literals match
             j++;
             if (j < length)
@@ -427,7 +427,7 @@ public class MaskFormatter extends DefaultFormatter
 
   /**
    * Returns a String representation of the Object value based on the mask.
-   * 
+   *
    * @param value the value to convert
    * @throws ParseException if value is invalid for this mask and valid/invalid
    * character sets
@@ -437,7 +437,7 @@ public class MaskFormatter extends DefaultFormatter
     String string = value != null ? value.toString() : "";
     return convertValueToString(string);
   }
-  
+
   /**
    * This method takes in a String and runs it through the mask to make
    * sure that it is valid.  If convert is true, it also
@@ -483,7 +483,7 @@ public class MaskFormatter extends DefaultFormatter
             valueChar = placeHolderChar;
           }
 
-        // This switch block on the mask character checks that the character 
+        // This switch block on the mask character checks that the character
         // within value at that point is valid according to the
         // mask and also converts to upper/lowercase as needed.
         switch (maskChar)
@@ -529,7 +529,7 @@ public class MaskFormatter extends DefaultFormatter
             i++;
             break;
           case ESCAPE_CHAR:
-            // Escape character, check the next character to make sure that 
+            // Escape character, check the next character to make sure that
             // the literals match
             j++;
             if (j < length)
diff --git a/libjava/classpath/javax/swing/text/MutableAttributeSet.java b/libjava/classpath/javax/swing/text/MutableAttributeSet.java
index 5dd2406a3a9..eb52be5c8bc 100644
--- a/libjava/classpath/javax/swing/text/MutableAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/MutableAttributeSet.java
@@ -40,10 +40,10 @@ package javax.swing.text;
 import java.util.Enumeration;
 
 /**
- * An {@link AttributeSet} that supports modification of the stored 
+ * An {@link AttributeSet} that supports modification of the stored
  * attributes.
- * 
- * @author	Andrew Selkirk
+ *
+ * @author      Andrew Selkirk
  * @since 1.2
  */
 public interface MutableAttributeSet extends AttributeSet
@@ -52,54 +52,54 @@ public interface MutableAttributeSet extends AttributeSet
    * Adds an attribute with the given name and value
    * to the set.  If the set already contains an attribute with the given
    * name, the attribute value is updated.
-   * 
+   *
    * @param name  the attribute name (null not permitted).
    * @param value  the value (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
    */
   void addAttribute(Object name, Object value);
 
   /**
    * Adds all the attributes from attributes to this set.
-   * 
+   *
    * @param attributes  the set of attributes to add (null not
    *                    permitted).
-   *                    
-   * @throws NullPointerException if attributes is 
+   *
+   * @throws NullPointerException if attributes is
    *         null.
    */
   void addAttributes(AttributeSet attributes);
 
   /**
-   * Removes the attribute with the specified name, if this 
+   * Removes the attribute with the specified name, if this
    * attribute is defined.  This method will only remove an attribute from
    * this set, not from the resolving parent.
-   * 
+   *
    * @param name  the attribute name (null not permitted).
-   * 
+   *
    * @throws NullPointerException if name is null.
    */
   void removeAttribute(Object name);
 
   /**
    * Removes the attributes listed in names.
-   * 
+   *
    * @param names  the attribute names (null not permitted).
-   * 
-   * @throws NullPointerException if names is null 
+   *
+   * @throws NullPointerException if names is null
    *         or contains any null values.
    */
   void removeAttributes(Enumeration names);
 
   /**
-   * Removes attributes from this set if they are found in the 
+   * Removes attributes from this set if they are found in the
    * given set.  Only attributes whose key AND value are removed.
-   * Removes attributes only from this set, not from the resolving parent.  
-   * Since the resolving parent is stored as an attribute, if 
+   * Removes attributes only from this set, not from the resolving parent.
+   * Since the resolving parent is stored as an attribute, if
    * attributes has the same resolving parent as this set, the
    * parent will be removed from this set.
-   * 
+   *
    * @param attributes  the attributes (null not permitted).
    */
   void removeAttributes(AttributeSet attributes);
@@ -107,10 +107,10 @@ public interface MutableAttributeSet extends AttributeSet
   /**
    * Sets the reolving parent for this set.  When looking up an attribute, if
    * it is not found in this set, then the resolving parent is also used for
-   * the lookup. 
-   * 
+   * the lookup.
+   *
    * @param parent  the parent attribute set (null not permitted).
-   * 
+   *
    * @throws NullPointerException if parent is null.
    */
   void setResolveParent(AttributeSet parent);
diff --git a/libjava/classpath/javax/swing/text/NavigationFilter.java b/libjava/classpath/javax/swing/text/NavigationFilter.java
index ea9b29db837..647ac70bf92 100644
--- a/libjava/classpath/javax/swing/text/NavigationFilter.java
+++ b/libjava/classpath/javax/swing/text/NavigationFilter.java
@@ -51,20 +51,20 @@ public class NavigationFilter
     public abstract void moveDot(int dot, Position.Bias bias);
     public abstract void setDot(int dot, Position.Bias bias);
   }
-  
+
   public NavigationFilter()
   {
     // Do nothing here.
   }
 
   public void moveDot(NavigationFilter.FilterBypass fb, int dot,
-		      Position.Bias bias)
+                      Position.Bias bias)
   {
     fb.moveDot(dot, bias);
   }
 
   public void setDot(NavigationFilter.FilterBypass fb, int dot,
-		     Position.Bias bias)
+                     Position.Bias bias)
   {
     fb.setDot(dot, bias);
   }
diff --git a/libjava/classpath/javax/swing/text/NumberFormatter.java b/libjava/classpath/javax/swing/text/NumberFormatter.java
index a858ff4961a..ce5eef99073 100644
--- a/libjava/classpath/javax/swing/text/NumberFormatter.java
+++ b/libjava/classpath/javax/swing/text/NumberFormatter.java
@@ -1,4 +1,4 @@
-/* NumberFormatter.java -- 
+/* NumberFormatter.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,22 +45,22 @@ import java.text.NumberFormat;
  * NumberFormatter is an {@link InternationalFormatter}
  * that implements value to string and string to value conversion via
  * an instance of {@link NumberFormat}.
- * 
+ *
  * @author Anthony Balkissoon abalkiss at redhat dot com
  * @since 1.4
  */
 public class NumberFormatter extends InternationalFormatter
 {
-  
+
   /**
-   * Creates a NumberFormatter with the default NumberFormat from 
-   * NumberFormat.getNumberInstance().   
+   * Creates a NumberFormatter with the default NumberFormat from
+   * NumberFormat.getNumberInstance().
    */
   public NumberFormatter ()
   {
     this (NumberFormat.getNumberInstance());
   }
-  
+
   /**
    * Creates a NumberFormatter with the specified NumberFormat.
    * @param format the NumberFormat to use for this NumberFormatter.
@@ -70,11 +70,11 @@ public class NumberFormatter extends InternationalFormatter
     super(format);
     setFormat(format);
   }
-  
+
   /**
    * Sets the NumberFormat that this NumberFormatter will use to determine
    * legal values for editing and displaying.
-   * 
+   *
    * @param format the Format to use to determine legal values.
    */
   public void setFormat (Format format)
diff --git a/libjava/classpath/javax/swing/text/ParagraphView.java b/libjava/classpath/javax/swing/text/ParagraphView.java
index f2795e2c38a..4d4c7a044eb 100644
--- a/libjava/classpath/javax/swing/text/ParagraphView.java
+++ b/libjava/classpath/javax/swing/text/ParagraphView.java
@@ -297,7 +297,7 @@ public class ParagraphView extends FlowView implements TabExpander
   /**
    * Sets the justification of the paragraph.
    *
-   * @param j the justification to set 
+   * @param j the justification to set
    */
   protected void setJustification(int j)
   {
diff --git a/libjava/classpath/javax/swing/text/PasswordView.java b/libjava/classpath/javax/swing/text/PasswordView.java
index 9d4c86a8388..62b1419320c 100644
--- a/libjava/classpath/javax/swing/text/PasswordView.java
+++ b/libjava/classpath/javax/swing/text/PasswordView.java
@@ -1,4 +1,4 @@
-/* PasswordView.java -- 
+/* PasswordView.java --
  Copyright (C) 2004 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
@@ -155,7 +155,7 @@ public class PasswordView
 
   /**
    * Determines the preferred span for this view along an axis.
-   * 
+   *
    * @param axis to get the preferred span of
    * @return the preferred span of the axis
    */
@@ -196,7 +196,7 @@ public class PasswordView
    * @param a - the allocated region to render into
    * @param b - typesafe enumeration to indicate bias to a position in the model.
    * @return the bounding box of the given position
-   * @throws BadLocationException if the given position does not 
+   * @throws BadLocationException if the given position does not
    * represent a valid location in the associated document
    */
   public Shape modelToView(int pos, Shape a, Position.Bias b)
@@ -206,7 +206,7 @@ public class PasswordView
 
     // Ensure metrics are up-to-date.
     updateMetrics();
-    
+
     // Get rectangle of the line containing position.
     int lineIndex = getElement().getElementIndex(pos);
     Rectangle rect = lineToRect(newAlloc, lineIndex);
@@ -234,16 +234,16 @@ public class PasswordView
   }
 
   /**
-   * Provides a mapping from the view coordinate space to the logical 
+   * Provides a mapping from the view coordinate space to the logical
    * coordinate space of the model.
-   * 
+   *
    * @param fx - the X coordinate >= 0.0f
    * @param fy - the Y coordinate >= 0.0f
-   * @param a - the allocated region to render into 
+   * @param a - the allocated region to render into
    * @param bias - typesafe enumeration to indicate bias to a position in the model.
-   * @return the location within the model that best represents 
+   * @return the location within the model that best represents
    * the given point in the view
-   * 
+   *
    */
   public int viewToModel(float fx, float fy, Shape a, Position.Bias[] bias)
   {
diff --git a/libjava/classpath/javax/swing/text/PlainDocument.java b/libjava/classpath/javax/swing/text/PlainDocument.java
index 730a619da9f..070c760c077 100644
--- a/libjava/classpath/javax/swing/text/PlainDocument.java
+++ b/libjava/classpath/javax/swing/text/PlainDocument.java
@@ -52,7 +52,7 @@ import java.util.ArrayList;
 public class PlainDocument extends AbstractDocument
 {
   private static final long serialVersionUID = 4758290289196893664L;
-    
+
   public static final String lineLimitAttribute = "lineLimit";
   public static final String tabSizeAttribute = "tabSize";
 
@@ -62,7 +62,7 @@ public class PlainDocument extends AbstractDocument
    * createDefaultRoot() (when overridden by a subclass).
    */
   private Element rootElement;
-  
+
   public PlainDocument()
   {
     this(new GapContent());
@@ -80,7 +80,7 @@ public class PlainDocument extends AbstractDocument
   private void reindex()
   {
     Element[] lines;
-    try 
+    try
       {
         String str = content.getString(0, content.length());
 
@@ -91,10 +91,10 @@ public class PlainDocument extends AbstractDocument
             elts.add(createLeafElement(rootElement, SimpleAttributeSet.EMPTY, j, i + 1));
             j = i + 1;
           }
-        
+
         if (j < content.length())
           elts.add(createLeafElement(rootElement, SimpleAttributeSet.EMPTY, j, content.length()));
-        
+
         lines = new Element[elts.size()];
         for (int i = 0; i < elts.size(); ++i)
           lines[i] = (Element) elts.get(i);
@@ -116,7 +116,7 @@ public class PlainDocument extends AbstractDocument
     Element[] array = new Element[1];
     array[0] = createLeafElement(root, null, 0, 1);
     root.replace(0, 0, array);
-    
+
     return root;
   }
 
@@ -239,9 +239,9 @@ public class PlainDocument extends AbstractDocument
         removed = new Element [i2 - i1 + 1];
         for (int i = i1; i <= i2; i++)
           removed[i-i1] = rootElement.getElement(i);
-        
+
         int start = rootElement.getElement(i1).getStartOffset();
-        int end = rootElement.getElement(i2).getEndOffset();        
+        int end = rootElement.getElement(i2).getEndOffset();
         added[0] = createLeafElement(rootElement,
                                           SimpleAttributeSet.EMPTY,
                                           start, end);
diff --git a/libjava/classpath/javax/swing/text/PlainView.java b/libjava/classpath/javax/swing/text/PlainView.java
index e048d5f7168..16112fdb1eb 100644
--- a/libjava/classpath/javax/swing/text/PlainView.java
+++ b/libjava/classpath/javax/swing/text/PlainView.java
@@ -1,4 +1,4 @@
-/* PlainView.java -- 
+/* PlainView.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59,7 +59,7 @@ public class PlainView extends View implements TabExpander
    * The color that is used to draw disabled text fields.
    */
   Color disabledColor;
-  
+
   /**
    * While painting this is the textcomponent's current start index
    * of the selection.
@@ -73,13 +73,13 @@ public class PlainView extends View implements TabExpander
   int selectionEnd;
 
   Font font;
-  
+
   /** The length of the longest line in the Document **/
   float maxLineLength = -1;
-  
+
   /** The longest line in the Document **/
   Element longestLine = null;
-  
+
   protected FontMetrics metrics;
 
   /**
@@ -112,12 +112,12 @@ public class PlainView extends View implements TabExpander
 
     if (this.font != font)
       {
-	this.font = font;
-	metrics = component.getFontMetrics(font);
+        this.font = font;
+        metrics = component.getFontMetrics(font);
         tabSize = getTabSize() * metrics.charWidth('m');
       }
   }
-  
+
   /**
    * @since 1.4
    */
@@ -125,11 +125,11 @@ public class PlainView extends View implements TabExpander
   {
     // Ensure metrics are up-to-date.
     updateMetrics();
-    
+
     Rectangle rect = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
     int fontHeight = metrics.getHeight();
     return new Rectangle(rect.x, rect.y + (line * fontHeight),
-			 rect.width, fontHeight);
+                         rect.width, fontHeight);
   }
 
   public Shape modelToView(int position, Shape a, Position.Bias b)
@@ -137,7 +137,7 @@ public class PlainView extends View implements TabExpander
   {
     // Ensure metrics are up-to-date.
     updateMetrics();
-    
+
     Document document = getDocument();
 
     // Get rectangle of the line containing position.
@@ -151,7 +151,7 @@ public class PlainView extends View implements TabExpander
     Segment segment = getLineBuffer();
     document.getText(lineStart, position - lineStart, segment);
     int xoffset = Utilities.getTabbedTextWidth(segment, metrics, tabBase,
-					       this, lineStart);
+                                               this, lineStart);
 
     // Calc the real rectangle.
     rect.x += xoffset;
@@ -160,7 +160,7 @@ public class PlainView extends View implements TabExpander
 
     return rect;
   }
-  
+
   /**
    * Draws a line of text. The X and Y coordinates specify the start of
    * the baseline of the line.
@@ -177,7 +177,7 @@ public class PlainView extends View implements TabExpander
         Element line = getElement().getElement(lineIndex);
         int startOffset = line.getStartOffset();
         int endOffset = line.getEndOffset() - 1;
-        
+
         if (selectionStart <= startOffset)
           // Selection starts before the line ...
           if (selectionEnd <= startOffset)
@@ -265,7 +265,7 @@ public class PlainView extends View implements TabExpander
   {
     // Ensure metrics are up-to-date.
     updateMetrics();
-    
+
     JTextComponent textComponent = (JTextComponent) getContainer();
 
     selectedColor = textComponent.getSelectedTextColor();
@@ -324,7 +324,7 @@ public class PlainView extends View implements TabExpander
    * Returns the tab size of a tab.  Checks the Document's
    * properties for PlainDocument.tabSizeAttribute and returns it if it is
    * defined, otherwise returns 8.
-   * 
+   *
    * @return the tab size.
    */
   protected int getTabSize()
@@ -339,7 +339,7 @@ public class PlainView extends View implements TabExpander
    * Returns the next tab stop position after a given reference position.
    *
    * This implementation ignores the tabStop argument.
-   * 
+   *
    * @param x the current x position in pixels
    * @param tabStop the position within the text stream that the tab occured at
    */
@@ -351,7 +351,7 @@ public class PlainView extends View implements TabExpander
         int numTabs = (((int) x) - tabBase) / tabSize;
         next = tabBase + (numTabs + 1) * tabSize;
       }
-    return next; 
+    return next;
   }
 
   /**
@@ -363,7 +363,7 @@ public class PlainView extends View implements TabExpander
     // if the longest line is cached, return the cached value
     if (maxLineLength != -1)
       return maxLineLength;
-    
+
     // otherwise we have to go through all the lines and find it
     Element el = getElement();
     Segment seg = getLineBuffer();
@@ -380,13 +380,13 @@ public class PlainView extends View implements TabExpander
         catch (BadLocationException ex)
           {
             AssertionError ae = new AssertionError("Unexpected bad location");
-	    ae.initCause(ex);
-	    throw ae;
+            ae.initCause(ex);
+            throw ae;
           }
-        
+
         if (seg == null || seg.array == null || seg.count == 0)
           continue;
-        
+
         int width = metrics.charsWidth(seg.array, seg.offset, seg.count);
         if (width > span)
           {
@@ -397,7 +397,7 @@ public class PlainView extends View implements TabExpander
     maxLineLength = span;
     return maxLineLength;
   }
-  
+
   public float getPreferredSpan(int axis)
   {
     if (axis != X_AXIS && axis != Y_AXIS)
@@ -419,7 +419,7 @@ public class PlainView extends View implements TabExpander
         span = metrics.getHeight() * el.getElementCount();
         break;
       }
-    
+
     return span;
   }
 
@@ -483,14 +483,14 @@ public class PlainView extends View implements TabExpander
                     pos = -1;
                   }
               }
-            
+
           }
       }
     // Bias is always forward.
     b[0] = Position.Bias.Forward;
     return pos;
-  }     
-  
+  }
+
   /**
    * Since insertUpdate and removeUpdate each deal with children
    * Elements being both added and removed, they both have to perform
@@ -592,7 +592,7 @@ public class PlainView extends View implements TabExpander
   /**
    * This method is called when something is inserted into the Document
    * that this View is displaying.
-   * 
+   *
    * @param changes the DocumentEvent for the changes.
    * @param a the allocation of the View
    * @param f the ViewFactory used to rebuild
@@ -605,7 +605,7 @@ public class PlainView extends View implements TabExpander
   /**
    * This method is called when something is removed from the Document
    * that this View is displaying.
-   * 
+   *
    * @param changes the DocumentEvent for the changes.
    * @param a the allocation of the View
    * @param f the ViewFactory used to rebuild
@@ -614,28 +614,28 @@ public class PlainView extends View implements TabExpander
   {
     updateDamage(changes, a, f);
   }
-  
+
   /**
-   * This method is called when attributes were changed in the 
+   * This method is called when attributes were changed in the
    * Document in a location that this view is responsible for.
    */
   public void changedUpdate (DocumentEvent changes, Shape a, ViewFactory f)
   {
     updateDamage(changes, a, f);
   }
-  
+
   /**
    * Repaint the given line range.  This is called from insertUpdate,
-   * changedUpdate, and removeUpdate when no new lines were added 
-   * and no lines were removed, to repaint the line that was 
+   * changedUpdate, and removeUpdate when no new lines were added
+   * and no lines were removed, to repaint the line that was
    * modified.
-   * 
+   *
    * @param line0 the start of the range
    * @param line1 the end of the range
    * @param a the rendering region of the host
    * @param host the Component that uses this View (used to call repaint
    * on that Component)
-   * 
+   *
    * @since 1.4
    */
   protected void damageLineRange (int line0, int line1, Shape a, Component host)
@@ -656,7 +656,7 @@ public class PlainView extends View implements TabExpander
                                                            rec0.height, rec1);
         host.repaint(repaintRec.x, repaintRec.y, repaintRec.width,
                      repaintRec.height);
-      }    
+      }
   }
 
   /**
@@ -722,4 +722,3 @@ public class PlainView extends View implements TabExpander
                                         lineEl.getStartOffset());
   }
 }
-
diff --git a/libjava/classpath/javax/swing/text/Position.java b/libjava/classpath/javax/swing/text/Position.java
index d02eb834dd9..56c8b6e68e7 100644
--- a/libjava/classpath/javax/swing/text/Position.java
+++ b/libjava/classpath/javax/swing/text/Position.java
@@ -1,4 +1,4 @@
-/* Position.java -- 
+/* Position.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -46,7 +46,7 @@ public interface Position
     public static final Bias Forward = new Bias("Forward");
 
     private String name;
-    
+
     private Bias(String n)
     {
       name = n;
@@ -57,6 +57,6 @@ public interface Position
       return name;
     }
   }
-    
+
   int getOffset();
 }
diff --git a/libjava/classpath/javax/swing/text/Segment.java b/libjava/classpath/javax/swing/text/Segment.java
index 63c5fa09dbc..7486ab33810 100644
--- a/libjava/classpath/javax/swing/text/Segment.java
+++ b/libjava/classpath/javax/swing/text/Segment.java
@@ -45,16 +45,16 @@ import java.text.CharacterIterator;
 public class Segment implements Cloneable, CharacterIterator
 {
   private boolean partialReturn;
-  
+
   /** The current index. */
   private int current;
-  
+
   /** Storage for the characters (may contain additional characters). */
   public char[] array;
-  
+
   /** The number of characters in the segment. */
   public int count;
-  
+
   /** The offset of the first character in the segment. */
   public int offset;
 
@@ -68,7 +68,7 @@ public class Segment implements Cloneable, CharacterIterator
 
   /**
    * Creates a new Segment.
-   * 
+   *
    * @param array  the underlying character data.
    * @param offset  the offset of the first character in the segment.
    * @param count  the number of characters in the segment.
@@ -79,38 +79,38 @@ public class Segment implements Cloneable, CharacterIterator
     this.offset = offset;
     this.count = count;
   }
-  
+
   /**
    * Clones the segment (note that the underlying character array is not cloned,
    * just the reference to it).
-   * 
+   *
    * @return A clone of the segment.
    */
   public Object clone()
   {
     try
       {
-	return super.clone();
+        return super.clone();
       }
     catch (CloneNotSupportedException e)
       {
-	return null;
+        return null;
       }
   }
 
   /**
    * Returns the character at the current index.  If the segment consists of
-   * zero characters, or the current index has passed the end of the 
+   * zero characters, or the current index has passed the end of the
    * characters in the segment, this method returns {@link #DONE}.
-   * 
+   *
    * @return The character at the current index.
    */
   public char current()
   {
     if (count == 0
-	|| current >= getEndIndex())
+        || current >= getEndIndex())
       return DONE;
-    
+
     return array[current];
   }
 
@@ -118,8 +118,8 @@ public class Segment implements Cloneable, CharacterIterator
    * Sets the current index to the first character in the segment and returns
    * that character.  If the segment contains zero characters, this method
    * returns {@link #DONE}.
-   * 
-   * @return The first character in the segment, or {@link #DONE} if the 
+   *
+   * @return The first character in the segment, or {@link #DONE} if the
    *         segment contains zero characters.
    */
   public char first()
@@ -133,7 +133,7 @@ public class Segment implements Cloneable, CharacterIterator
 
   /**
    * Returns the index of the first character in the segment.
-   * 
+   *
    * @return The index of the first character.
    */
   public int getBeginIndex()
@@ -142,10 +142,10 @@ public class Segment implements Cloneable, CharacterIterator
   }
 
   /**
-   * Returns the end index for the segment (one position beyond the last 
-   * character in the segment - note that this can be outside the range of the 
+   * Returns the end index for the segment (one position beyond the last
+   * character in the segment - note that this can be outside the range of the
    * underlying character array).
-   * 
+   *
    * @return The end index for the segment.
    */
   public int getEndIndex()
@@ -155,7 +155,7 @@ public class Segment implements Cloneable, CharacterIterator
 
   /**
    * Returns the index of the current character in the segment.
-   * 
+   *
    * @return The index of the current character.
    */
   public int getIndex()
@@ -164,12 +164,12 @@ public class Segment implements Cloneable, CharacterIterator
   }
 
   /**
-   * Sets the current index to point to the last character in the segment and 
-   * returns that character.  If the segment contains zero characters, the 
-   * current index is set to {@link #getEndIndex()} and this method returns 
+   * Sets the current index to point to the last character in the segment and
+   * returns that character.  If the segment contains zero characters, the
+   * current index is set to {@link #getEndIndex()} and this method returns
    * {@link #DONE}.
-   * 
-   * @return The last character in the segment, or {@link #DONE} if the 
+   *
+   * @return The last character in the segment, or {@link #DONE} if the
    *         segment contains zero characters.
    */
   public char last()
@@ -179,20 +179,20 @@ public class Segment implements Cloneable, CharacterIterator
         current = getEndIndex();
         return DONE;
       }
-    
+
     current = getEndIndex() - 1;
     return array[current];
   }
 
   /**
-   * Sets the current index to point to the next character in the segment and 
+   * Sets the current index to point to the next character in the segment and
    * returns that character.  If the next character position is past the end of
    * the segment, the index is set to {@link #getEndIndex()} and the method
-   * returns {@link #DONE}.  If the segment contains zero characters, this 
+   * returns {@link #DONE}.  If the segment contains zero characters, this
    * method returns {@link #DONE}.
-   * 
+   *
    * @return The next character in the segment or {@link #DONE} (if the next
-   *         character position is past the end of the segment or if the 
+   *         character position is past the end of the segment or if the
    *         segment contains zero characters).
    */
   public char next()
@@ -202,30 +202,30 @@ public class Segment implements Cloneable, CharacterIterator
 
     if ((current + 1) >= getEndIndex())
       {
-	current = getEndIndex();
-	return DONE;
+        current = getEndIndex();
+        return DONE;
       }
-    
+
     current++;
     return array[current];
   }
 
   /**
-   * Sets the current index to point to the previous character in the segment 
-   * and returns that character.  If the current index is equal to 
-   * {@link #getBeginIndex()}, or if the segment contains zero characters, this 
+   * Sets the current index to point to the previous character in the segment
+   * and returns that character.  If the current index is equal to
+   * {@link #getBeginIndex()}, or if the segment contains zero characters, this
    * method returns {@link #DONE}.
-   * 
-   * @return The previous character in the segment or {@link #DONE} (if the 
-   *         current character position is at the beginning of the segment or 
+   *
+   * @return The previous character in the segment or {@link #DONE} (if the
+   *         current character position is at the beginning of the segment or
    *         if the segment contains zero characters).
    */
   public char previous()
   {
     if (count == 0
-	|| current == getBeginIndex())
+        || current == getBeginIndex())
       return DONE;
-    
+
     current--;
     return array[current];
   }
@@ -233,20 +233,20 @@ public class Segment implements Cloneable, CharacterIterator
   /**
    * Sets the current index and returns the character at that position (or
    * {@link #DONE} if the index is equal to {@link #getEndIndex()}.
-   * 
+   *
    * @param position  the current position.
-   * 
+   *
    * @return The character at the specified position, or
-   *         {@link #DONE} if position is equal to 
+   *         {@link #DONE} if position is equal to
    *         {@link #getEndIndex()}.
-   *         
+   *
    * @throws IllegalArgumentException if position is not in the
    *         range {@link #getBeginIndex()} to {@link #getEndIndex()}.
    */
   public char setIndex(int position)
   {
     if (position < getBeginIndex()
-	|| position > getEndIndex())
+        || position > getEndIndex())
       throw new IllegalArgumentException("position: " + position
                                          + ", beginIndex: " + getBeginIndex()
                                          + ", endIndex: " + getEndIndex()
@@ -256,15 +256,15 @@ public class Segment implements Cloneable, CharacterIterator
 
     if (position == getEndIndex())
       return DONE;
-    
+
     return array[current];
   }
 
   /**
-   * Returns a String containing the same characters as this 
+   * Returns a String containing the same characters as this
    * Segment.
-   * 
-   * @return A String containing the same characters as this 
+   *
+   * @return A String containing the same characters as this
    *         Segment.
    */
   public String toString()
@@ -274,19 +274,19 @@ public class Segment implements Cloneable, CharacterIterator
 
   /**
    * Sets the partial return flag.
-   * 
+   *
    * @param p  the new value of the flag.
-   * 
+   *
    * @since 1.4
    */
   public void setPartialReturn(boolean p)
   {
     partialReturn = p;
   }
-  
+
   /**
    * Returns the partial return flag.
-   * 
+   *
    * @return The partial return flag.
    * @since 1.4
    */
diff --git a/libjava/classpath/javax/swing/text/SimpleAttributeSet.java b/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
index 701fa8a7c90..02299019b63 100644
--- a/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/SimpleAttributeSet.java
@@ -66,13 +66,13 @@ public class SimpleAttributeSet
   {
     tab = new Hashtable();
   }
-  
+
   /**
    * Creates a new SimpleAttributeSet with the same attributes
    * and resolve parent as the specified set.
-   * 
+   *
    * @param a  the attributes (null not permitted).
-   * 
+   *
    * @throws NullPointerException if a is null.
    */
   public SimpleAttributeSet(AttributeSet a)
@@ -85,10 +85,10 @@ public class SimpleAttributeSet
    * Adds an attribute with the given name and value
    * to the set.  If the set already contains an attribute with the given
    * name, the attribute value is updated.
-   * 
+   *
    * @param name  the attribute name (null not permitted).
    * @param value  the value (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
    */
   public void addAttribute(Object name, Object value)
@@ -98,11 +98,11 @@ public class SimpleAttributeSet
 
   /**
    * Adds all the attributes from attributes to this set.
-   * 
+   *
    * @param attributes  the set of attributes to add (null not
    *                    permitted).
-   *                    
-   * @throws NullPointerException if attributes is 
+   *
+   * @throws NullPointerException if attributes is
    *         null.
    */
   public void addAttributes(AttributeSet attributes)
@@ -118,7 +118,7 @@ public class SimpleAttributeSet
 
   /**
    * Returns a clone of the attribute set.
-   * 
+   *
    * @return A clone of the attribute set.
    */
   public Object clone()
@@ -159,7 +159,7 @@ public class SimpleAttributeSet
           return false;
       }
   }
-  
+
   /**
    * Returns true if the given name and value are found in this AttributeSet.
    * Does not check the resolve parent.
@@ -169,7 +169,7 @@ public class SimpleAttributeSet
    */
   boolean containsAttributeLocally(Object name, Object value)
   {
-    return tab.containsKey(name) 
+    return tab.containsKey(name)
       && tab.get(name).equals(value);
   }
 
@@ -190,7 +190,7 @@ public class SimpleAttributeSet
         Object name = e.nextElement();
         Object val = attributes.getAttribute(name);
         if (! containsAttribute(name, val))
-          return false;		
+          return false;
       }
     return true;
   }
@@ -207,33 +207,33 @@ public class SimpleAttributeSet
 
   /**
    * Checks this set for equality with an arbitrary object.
-   * 
+   *
    * @param obj  the object (null permitted).
-   * 
+   *
    * @return true if this set is equal to obj, and
-   *         false otherwise. 
+   *         false otherwise.
    */
   public boolean equals(Object obj)
   {
-    return 
+    return
       (obj instanceof AttributeSet)
       && this.isEqual((AttributeSet) obj);
   }
 
   /**
-   * Returns the value of the specified attribute, or null if 
+   * Returns the value of the specified attribute, or null if
    * there is no attribute with that name.  If the attribute is not defined
    * directly in this set, the parent hierarchy (if there is one) will be
    * used.
-   * 
+   *
    * @param name  the attribute (null not permitted).
-   * 
+   *
    * @throws NullPointerException if name is null.
    */
   public Object getAttribute(Object name)
   {
     Object val = tab.get(name);
-    if (val != null) 
+    if (val != null)
       return val;
 
     AttributeSet p = getResolveParent();
@@ -245,10 +245,10 @@ public class SimpleAttributeSet
 
   /**
    * Returns the number of attributes stored in this set, plus 1 if a parent
-   * has been specified (the reference to the parent is stored as a special 
+   * has been specified (the reference to the parent is stored as a special
    * attribute).  The attributes stored in the parent do NOT contribute
    * to the count.
-   * 
+   *
    * @return The attribute count.
    */
   public int getAttributeCount()
@@ -258,7 +258,7 @@ public class SimpleAttributeSet
 
   /**
    * Returns an enumeration of the attribute names.
-   * 
+   *
    * @return An enumeration of the attribute names.
    */
   public Enumeration getAttributeNames()
@@ -268,9 +268,9 @@ public class SimpleAttributeSet
 
   /**
    * Returns the resolving parent.
-   * 
+   *
    * @return The resolving parent (possibly null).
-   * 
+   *
    * @see #setResolveParent(AttributeSet)
    */
   public AttributeSet getResolveParent()
@@ -280,7 +280,7 @@ public class SimpleAttributeSet
 
   /**
    * Returns a hash code for this instance.
-   * 
+   *
    * @return A hash code.
    */
   public int hashCode()
@@ -292,7 +292,7 @@ public class SimpleAttributeSet
    * Returns true if the given attribute is defined in this set,
    * and false otherwise.  The parent attribute set is not
    * checked.
-   * 
+   *
    * @param attrName  the attribute name (null not permitted).
    */
   public boolean isDefined(Object attrName)
@@ -301,28 +301,28 @@ public class SimpleAttributeSet
   }
 
   /**
-   * Returns true if the set contains no attributes, and 
-   * false otherwise.  Note that the resolving parent is 
-   * stored as an attribute, so this method will return false if 
+   * Returns true if the set contains no attributes, and
+   * false otherwise.  Note that the resolving parent is
+   * stored as an attribute, so this method will return false if
    * a resolving parent is set.
-   * 
-   * @return true if the set contains no attributes, and 
+   *
+   * @return true if the set contains no attributes, and
    * false otherwise.
    */
   public boolean isEmpty()
   {
-    return tab.isEmpty();	
+    return tab.isEmpty();
   }
 
   /**
    * Returns true if the given set has the same number of attributes
    * as this set and containsAttributes(attr) returns
    * true.
-   * 
+   *
    * @param attr  the attribute set (null not permitted).
-   * 
+   *
    * @return A boolean.
-   * 
+   *
    * @throws NullPointerException if attr is null.
    */
   public boolean isEqual(AttributeSet attr)
@@ -330,14 +330,14 @@ public class SimpleAttributeSet
     return getAttributeCount() == attr.getAttributeCount()
       && this.containsAttributes(attr);
   }
-    
+
   /**
-   * Removes the attribute with the specified name, if this 
+   * Removes the attribute with the specified name, if this
    * attribute is defined.  This method will only remove an attribute from
    * this set, not from the resolving parent.
-   * 
+   *
    * @param name  the attribute name (null not permitted).
-   * 
+   *
    * @throws NullPointerException if name is null.
    */
   public void removeAttribute(Object name)
@@ -346,13 +346,13 @@ public class SimpleAttributeSet
   }
 
   /**
-   * Removes attributes from this set if they are found in the 
+   * Removes attributes from this set if they are found in the
    * given set.  Only attributes whose key AND value are removed.
-   * Removes attributes only from this set, not from the resolving parent.  
-   * Since the resolving parent is stored as an attribute, if 
+   * Removes attributes only from this set, not from the resolving parent.
+   * Since the resolving parent is stored as an attribute, if
    * attributes has the same resolving parent as this set, the
    * parent will be removed from this set.
-   * 
+   *
    * @param attributes  the attributes (null not permitted).
    */
   public void removeAttributes(AttributeSet attributes)
@@ -363,16 +363,16 @@ public class SimpleAttributeSet
         Object name = e.nextElement();
         Object val = attributes.getAttribute(name);
         if (containsAttributeLocally(name, val))
-          removeAttribute(name);     
+          removeAttribute(name);
       }
   }
 
   /**
    * Removes the attributes listed in names.
-   * 
+   *
    * @param names  the attribute names (null not permitted).
-   * 
-   * @throws NullPointerException if names is null 
+   *
+   * @throws NullPointerException if names is null
    *         or contains any null values.
    */
   public void removeAttributes(Enumeration names)
@@ -380,7 +380,7 @@ public class SimpleAttributeSet
     while (names.hasMoreElements())
       {
         removeAttribute(names.nextElement());
-      }	
+      }
   }
 
   /**
@@ -388,28 +388,28 @@ public class SimpleAttributeSet
    * it is not found in this set, then the resolving parent is also used for
    * the lookup.
    * 
                    
-   * Note that the parent is stored as an attribute, and will contribute 1 to 
-   * the count returned by {@link #getAttributeCount()}. 
-   * 
+   * Note that the parent is stored as an attribute, and will contribute 1 to
+   * the count returned by {@link #getAttributeCount()}.
+   *
    * @param parent  the parent attribute set (null not permitted).
-   * 
+   *
    * @throws NullPointerException if parent is null.
-   * 
+   *
    * @see #setResolveParent(AttributeSet)
    */
   public void setResolveParent(AttributeSet parent)
   {
     addAttribute(ResolveAttribute, parent);
   }
-  
+
   /**
    * Returns a string representation of this instance, typically used for
    * debugging purposes.
-   * 
+   *
    * @return A string representation of this instance.
    */
   public String toString()
   {
     return tab.toString();
-  }    
+  }
 }
diff --git a/libjava/classpath/javax/swing/text/StringContent.java b/libjava/classpath/javax/swing/text/StringContent.java
index 4a3f9d75222..a017de1c910 100644
--- a/libjava/classpath/javax/swing/text/StringContent.java
+++ b/libjava/classpath/javax/swing/text/StringContent.java
@@ -54,15 +54,15 @@ import javax.swing.undo.UndoableEdit;
  * An implementation of the AbstractDocument.Content
  * interface useful for small documents or debugging. The character
  * content is a simple character array. It's not really efficient.
- * 
+ *
  * 
                    Do not use this class for large size.
                    
  */
-public final class StringContent 
+public final class StringContent
   implements AbstractDocument.Content, Serializable
 {
   /**
    * Stores a reference to a mark that can be resetted to the original value
-   * after a mark has been moved. This is used for undoing actions. 
+   * after a mark has been moved. This is used for undoing actions.
    */
   private class UndoPosRef
   {
@@ -102,7 +102,7 @@ public final class StringContent
    * the actual offset of the position. This is pulled out of the
    * GapContentPosition object so that the mark and position can be handled
    * independently, and most important, so that the StickyPosition can
-   * be garbage collected while we still hold a reference to the Mark object. 
+   * be garbage collected while we still hold a reference to the Mark object.
    */
   private class Mark
   {
@@ -148,7 +148,7 @@ public final class StringContent
   private class InsertUndo extends AbstractUndoableEdit
   {
     private int start;
-    
+
     private int length;
 
     private String redoContent;
@@ -177,7 +177,7 @@ public final class StringContent
           throw new CannotUndoException();
         }
     }
-    
+
     public void redo()
     {
       super.redo();
@@ -303,8 +303,8 @@ public final class StringContent
 
   /**
    * Creates a new instance containing the string "\n".
-   * 
-   * @param initialLength  the initial length of the underlying character 
+   *
+   * @param initialLength  the initial length of the underlying character
    *                       array used to store the content.
    */
   public StringContent(int initialLength)
@@ -337,10 +337,10 @@ public final class StringContent
    * Creates a position reference for the character at the given offset.  The
    * position offset will be automatically updated when new characters are
    * inserted into or removed from the content.
-   * 
+   *
    * @param offset  the character offset.
-   * 
-   * @throws BadLocationException if offset is outside the bounds of the 
+   *
+   * @throws BadLocationException if offset is outside the bounds of the
    *         content.
    */
   public Position createPosition(int offset) throws BadLocationException
@@ -351,26 +351,26 @@ public final class StringContent
     StickyPosition sp = new StickyPosition(offset);
     return sp;
   }
-  
+
   /**
    * Returns the length of the string content, including the '\n' character at
    * the end.
-   * 
+   *
    * @return The length of the string content.
    */
   public int length()
   {
     return count;
   }
-  
+
   /**
-   * Inserts str at the given position and returns an 
+   * Inserts str at the given position and returns an
    * {@link UndoableEdit} that enables undo/redo support.
-   * 
-   * @param where  the insertion point (must be less than 
+   *
+   * @param where  the insertion point (must be less than
    *               length()).
    * @param str  the string to insert (null not permitted).
-   * 
+   *
    * @return An object that can undo the insertion.
    */
   public UndoableEdit insertString(int where, String str)
@@ -402,23 +402,23 @@ public final class StringContent
     InsertUndo iundo = new InsertUndo(where, insert.length);
     return iundo;
   }
-  
+
   /**
-   * Removes the specified range of characters and returns an 
+   * Removes the specified range of characters and returns an
    * {@link UndoableEdit} that enables undo/redo support.
-   * 
+   *
    * @param where  the starting index.
    * @param nitems  the number of characters.
-   * 
+   *
    * @return An object that can undo the removal.
-   * 
+   *
    * @throws BadLocationException if the character range extends outside the
    *         bounds of the content OR includes the last character.
    */
   public UndoableEdit remove(int where, int nitems) throws BadLocationException
   {
     checkLocation(where, nitems + 1);
-    RemoveUndo rundo = new RemoveUndo(where, new String(this.content, where, 
+    RemoveUndo rundo = new RemoveUndo(where, new String(this.content, where,
         nitems));
 
     replace(where, nitems, EMPTY);
@@ -464,15 +464,15 @@ public final class StringContent
   }
 
   /**
-   * Returns a new String containing the characters in the 
+   * Returns a new String containing the characters in the
    * specified range.
-   * 
+   *
    * @param where  the start index.
    * @param len  the number of characters.
-   * 
+   *
    * @return A string.
-   * 
-   * @throws BadLocationException if the requested range of characters extends 
+   *
+   * @throws BadLocationException if the requested range of characters extends
    *         outside the bounds of the content.
    */
   public String getString(int where, int len) throws BadLocationException
@@ -482,21 +482,21 @@ public final class StringContent
     checkLocation(where, len);
     return new String(this.content, where, len);
   }
-  
+
   /**
-   * Updates txt to contain a direct reference to the underlying 
+   * Updates txt to contain a direct reference to the underlying
    * character array.
-   * 
+   *
    * @param where  the index of the first character.
    * @param len  the number of characters.
-   * @param txt  a carrier for the return result (null not 
+   * @param txt  a carrier for the return result (null not
    *             permitted).
-   *             
-   * @throws BadLocationException if the requested character range is not 
+   *
+   * @throws BadLocationException if the requested character range is not
    *                              within the bounds of the content.
    * @throws NullPointerException if txt is null.
    */
-  public void getChars(int where, int len, Segment txt) 
+  public void getChars(int where, int len, Segment txt)
     throws BadLocationException
   {
     if (where + len > count)
@@ -523,13 +523,13 @@ public final class StringContent
       }
   }
 
-  /** 
+  /**
    * A utility method that checks the validity of the specified character
    * range.
-   * 
+   *
    * @param where  the first character in the range.
    * @param len  the number of characters in the range.
-   * 
+   *
    * @throws BadLocationException if the specified range is not within the
    *         bounds of the content.
    */
@@ -567,4 +567,3 @@ public final class StringContent
       }
   }
 }
-
diff --git a/libjava/classpath/javax/swing/text/Style.java b/libjava/classpath/javax/swing/text/Style.java
index 851ac021947..80108287447 100644
--- a/libjava/classpath/javax/swing/text/Style.java
+++ b/libjava/classpath/javax/swing/text/Style.java
@@ -1,4 +1,4 @@
-/* Style.java -- 
+/* Style.java --
    Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/StyleConstants.java b/libjava/classpath/javax/swing/text/StyleConstants.java
index 4e5005c6bb2..bdc63719d33 100644
--- a/libjava/classpath/javax/swing/text/StyleConstants.java
+++ b/libjava/classpath/javax/swing/text/StyleConstants.java
@@ -45,35 +45,35 @@ import java.util.ArrayList;
 import javax.swing.Icon;
 
 /**
- * Represents standard attribute keys.  This class also contains a set of 
- * useful static utility methods for querying and populating an 
+ * Represents standard attribute keys.  This class also contains a set of
+ * useful static utility methods for querying and populating an
  * {@link AttributeSet}.
- * 
+ *
  * @since 1.2
  */
 public class StyleConstants
 {
-  /** 
-   * A value representing left alignment for the 
-   * {@link ParagraphConstants#Alignment} attribute. 
+  /**
+   * A value representing left alignment for the
+   * {@link ParagraphConstants#Alignment} attribute.
    */
   public static final int ALIGN_LEFT = 0;
 
-  /** 
-   * A value representing center alignment for the 
-   * {@link ParagraphConstants#Alignment} attribute. 
+  /**
+   * A value representing center alignment for the
+   * {@link ParagraphConstants#Alignment} attribute.
    */
   public static final int ALIGN_CENTER = 1;
 
-  /** 
-   * A value representing right alignment for the 
-   * {@link ParagraphConstants#Alignment} attribute. 
+  /**
+   * A value representing right alignment for the
+   * {@link ParagraphConstants#Alignment} attribute.
    */
   public static final int ALIGN_RIGHT = 2;
 
-  /** 
-   * A value representing ful justification for the 
-   * {@link ParagraphConstants#Alignment} attribute. 
+  /**
+   * A value representing ful justification for the
+   * {@link ParagraphConstants#Alignment} attribute.
    */
   public static final int ALIGN_JUSTIFIED = 3;
 
@@ -82,72 +82,72 @@ public class StyleConstants
 
   /** An alias for {@link CharacterConstants#BidiLevel}. */
   public static final Object BidiLevel = CharacterConstants.BidiLevel;
-  
+
   /** An alias for {@link CharacterConstants#Bold}. */
   public static final Object Bold = CharacterConstants.Bold;
-  
+
   /** An alias for {@link CharacterConstants#ComponentAttribute}. */
-  public static final Object ComponentAttribute 
+  public static final Object ComponentAttribute
       = CharacterConstants.ComponentAttribute;
-  
+
   /** An alias for {@link CharacterConstants#Family}. */
   public static final Object Family = CharacterConstants.Family;
-  
+
   /** An alias for {@link CharacterConstants#Family}. */
-  public static final Object FontFamily = CharacterConstants.Family;  
-  
+  public static final Object FontFamily = CharacterConstants.Family;
+
   /** An alias for {@link CharacterConstants#Size}. */
   public static final Object FontSize = CharacterConstants.Size;
-  
+
   /** An alias for {@link CharacterConstants#Foreground}. */
   public static final Object Foreground = CharacterConstants.Foreground;
-  
+
   /** An alias for {@link CharacterConstants#IconAttribute}. */
   public static final Object IconAttribute = CharacterConstants.IconAttribute;
-  
+
   /** An alias for {@link CharacterConstants#Italic}. */
   public static final Object Italic = CharacterConstants.Italic;
-  
+
   /** An alias for {@link CharacterConstants#Size}. */
   public static final Object Size = CharacterConstants.Size;
-  
+
   /** An alias for {@link CharacterConstants#StrikeThrough}. */
   public static final Object StrikeThrough = CharacterConstants.StrikeThrough;
-  
+
   /** An alias for {@link CharacterConstants#Subscript}. */
   public static final Object Subscript = CharacterConstants.Subscript;
-  
+
   /** An alias for {@link CharacterConstants#Superscript}. */
   public static final Object Superscript = CharacterConstants.Superscript;
-  
+
   /** An alias for {@link CharacterConstants#Underline}. */
   public static final Object Underline = CharacterConstants.Underline;
 
   /** An alias for {@link ParagraphConstants#Alignment}. */
   public static final Object Alignment = ParagraphConstants.Alignment;
-  
+
   /** An alias for {@link ParagraphConstants#FirstLineIndent}. */
-  public static final Object FirstLineIndent 
+  public static final Object FirstLineIndent
       = ParagraphConstants.FirstLineIndent;
-  
+
   /** An alias for {@link ParagraphConstants#LeftIndent}. */
   public static final Object LeftIndent = ParagraphConstants.LeftIndent;
-  
+
   /** An alias for {@link ParagraphConstants#LineSpacing}. */
   public static final Object LineSpacing = ParagraphConstants.LineSpacing;
-  
+
   /** An alias for {@link ParagraphConstants#Orientation}. */
   public static final Object Orientation = ParagraphConstants.Orientation;
-  
+
   /** An alias for {@link ParagraphConstants#RightIndent}. */
   public static final Object RightIndent = ParagraphConstants.RightIndent;
-  
+
   /** An alias for {@link ParagraphConstants#SpaceAbove}. */
   public static final Object SpaceAbove = ParagraphConstants.SpaceAbove;
-  
+
   /** An alias for {@link ParagraphConstants#SpaceBelow}. */
   public static final Object SpaceBelow = ParagraphConstants.SpaceBelow;
-  
+
   /** An alias for {@link ParagraphConstants#TabSet}. */
   public static final Object TabSet = ParagraphConstants.TabSet;
 
@@ -155,13 +155,13 @@ public class StyleConstants
 
   public static final String IconElementName = "icon";
 
-  public static final Object ComposedTextAttribute 
+  public static final Object ComposedTextAttribute
       = new StyleConstants("composed text");
-  
+
   public static final Object ModelAttribute = new StyleConstants("model");
-  
+
   public static final Object NameAttribute = new StyleConstants("name");
-  
+
   public static final Object ResolveAttribute = new StyleConstants("resolver");
 
   /**
@@ -174,7 +174,7 @@ public class StyleConstants
 
   // Package-private to avoid accessor constructor for use by
   // subclasses.
-  StyleConstants(String k) 
+  StyleConstants(String k)
   {
     keyname = k;
     if (keys == null)
@@ -184,7 +184,7 @@ public class StyleConstants
 
   /**
    * Returns a string representation of the attribute key.
-   * 
+   *
    * @return A string representation of the attribute key.
    */
   public String toString()
@@ -193,15 +193,15 @@ public class StyleConstants
   }
 
   /**
-   * Returns the alignment specified in the given attributes, or 
+   * Returns the alignment specified in the given attributes, or
    * {@link #ALIGN_LEFT} if no alignment is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
-   * @return The alignment (typically one of {@link #ALIGN_LEFT}, 
-   *         {@link #ALIGN_RIGHT}, {@link #ALIGN_CENTER} or 
+   *
+   * @return The alignment (typically one of {@link #ALIGN_LEFT},
+   *         {@link #ALIGN_RIGHT}, {@link #ALIGN_CENTER} or
    *         {@link #ALIGN_JUSTIFIED}).
-   *         
+   *
    * @see #setAlignment(MutableAttributeSet, int)
    */
   public static int getAlignment(AttributeSet a)
@@ -210,38 +210,38 @@ public class StyleConstants
     if (i != null)
       return i.intValue();
     else
-      return ALIGN_LEFT;      
-  } 
+      return ALIGN_LEFT;
+  }
 
   /**
    * Returns the background color specified in the given attributes, or
    * {@link Color#BLACK} if no background color is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The background color.
-   * 
+   *
    * @see #setBackground(MutableAttributeSet, Color)
    */
   public static Color getBackground(AttributeSet a)
   {
     Color c = (Color) a.getAttribute(Background);
-    if (c != null) 
+    if (c != null)
       return c;
     else
       return Color.BLACK;
-  } 
+  }
 
   /**
-   * Returns the bidi level specified in the given attributes, or 
+   * Returns the bidi level specified in the given attributes, or
    * 0 if no bidi level is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The bidi level.
-   * 
+   *
    * @see #setBidiLevel(MutableAttributeSet, int)
-   */  
+   */
   public static int getBidiLevel(AttributeSet a)
   {
     Integer i = (Integer) a.getAttribute(BidiLevel);
@@ -249,18 +249,18 @@ public class StyleConstants
       return i.intValue();
     else
       return 0;
-  } 
+  }
 
   /**
-   * Returns the component specified in the given attributes, or 
+   * Returns the component specified in the given attributes, or
    * null if no component is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The component (possibly null).
-   * 
+   *
    * @see #setComponent(MutableAttributeSet, Component)
-   */    
+   */
   public static Component getComponent(AttributeSet a)
   {
     Component c = (Component) a.getAttribute(ComponentAttribute);
@@ -268,18 +268,18 @@ public class StyleConstants
       return c;
     else
       return null;
-  } 
+  }
 
   /**
-   * Returns the indentation specified in the given attributes, or 
+   * Returns the indentation specified in the given attributes, or
    * 0.0f if no indentation is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The indentation.
-   * 
+   *
    * @see #setFirstLineIndent(MutableAttributeSet, float)
-   */    
+   */
   public static float getFirstLineIndent(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(FirstLineIndent);
@@ -287,18 +287,18 @@ public class StyleConstants
       return f.floatValue();
     else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the font family specified in the given attributes, or 
+   * Returns the font family specified in the given attributes, or
    * Monospaced if no font family is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The font family.
-   * 
+   *
    * @see #setFontFamily(MutableAttributeSet, String)
-   */    
+   */
   public static String getFontFamily(AttributeSet a)
   {
     String ff = (String) a.getAttribute(FontFamily);
@@ -306,18 +306,18 @@ public class StyleConstants
       return ff;
     else
       return "Monospaced";
-  } 
+  }
 
   /**
-   * Returns the font size specified in the given attributes, or 
+   * Returns the font size specified in the given attributes, or
    * 12 if no font size is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The font size.
-   * 
+   *
    * @see #setFontSize(MutableAttributeSet, int)
-   */  
+   */
   public static int getFontSize(AttributeSet a)
   {
     Integer i = (Integer) a.getAttribute(FontSize);
@@ -325,16 +325,16 @@ public class StyleConstants
       return i.intValue();
     else
       return 12;
-  } 
+  }
 
   /**
    * Returns the foreground color specified in the given attributes, or
    * {@link Color#BLACK} if no foreground color is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The foreground color.
-   * 
+   *
    * @see #setForeground(MutableAttributeSet, Color)
    */
   public static Color getForeground(AttributeSet a)
@@ -344,33 +344,33 @@ public class StyleConstants
       return c;
     else
       return Color.BLACK;
-  } 
+  }
 
   /**
-   * Returns the icon specified in the given attributes, or 
+   * Returns the icon specified in the given attributes, or
    * null if no icon is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The icon (possibly null).
-   * 
+   *
    * @see #setIcon(MutableAttributeSet, Icon)
-   */    
+   */
   public static Icon getIcon(AttributeSet a)
   {
     return (Icon) a.getAttribute(IconAttribute);
-  } 
+  }
 
   /**
-   * Returns the left indentation specified in the given attributes, or 
+   * Returns the left indentation specified in the given attributes, or
    * 0.0f if no left indentation is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The left indentation.
-   * 
+   *
    * @see #setLeftIndent(MutableAttributeSet, float)
-   */    
+   */
   public static float getLeftIndent(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(LeftIndent);
@@ -378,18 +378,18 @@ public class StyleConstants
       return f.floatValue();
     else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the line spacing specified in the given attributes, or 
+   * Returns the line spacing specified in the given attributes, or
    * 0.0f if no line spacing is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The line spacing.
-   * 
+   *
    * @see #setLineSpacing(MutableAttributeSet, float)
-   */    
+   */
   public static float getLineSpacing(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(LineSpacing);
@@ -397,18 +397,18 @@ public class StyleConstants
       return f.floatValue();
     else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the right indentation specified in the given attributes, or 
+   * Returns the right indentation specified in the given attributes, or
    * 0.0f if no right indentation is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The right indentation.
-   * 
+   *
    * @see #setRightIndent(MutableAttributeSet, float)
-   */    
+   */
   public static float getRightIndent(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(RightIndent);
@@ -416,37 +416,37 @@ public class StyleConstants
       return f.floatValue();
     else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the 'space above' specified in the given attributes, or 
+   * Returns the 'space above' specified in the given attributes, or
    * 0.0f if no 'space above' is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The 'space above'.
-   * 
+   *
    * @see #setSpaceAbove(MutableAttributeSet, float)
-   */    
+   */
   public static float getSpaceAbove(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(SpaceAbove);
     if (f != null)
       return f.floatValue();
-    else 
+    else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the 'space below' specified in the given attributes, or 
+   * Returns the 'space below' specified in the given attributes, or
    * 0.0f if no 'space below' is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The 'space below'.
-   * 
+   *
    * @see #setSpaceBelow(MutableAttributeSet, float)
-   */    
+   */
   public static float getSpaceBelow(AttributeSet a)
   {
     Float f = (Float) a.getAttribute(SpaceBelow);
@@ -454,34 +454,34 @@ public class StyleConstants
       return f.floatValue();
     else
       return 0.0f;
-  } 
+  }
 
   /**
-   * Returns the tab set specified in the given attributes, or 
+   * Returns the tab set specified in the given attributes, or
    * null if no tab set is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The tab set.
-   * 
+   *
    * @see #setTabSet(MutableAttributeSet, javax.swing.text.TabSet)
-   */    
+   */
   public static javax.swing.text.TabSet getTabSet(AttributeSet a)
   {
     // I'm guessing that the fully qualified class name is to differentiate
     // between the TabSet class and the TabSet (attribute) instance on some
     // compiler...
     return (javax.swing.text.TabSet) a.getAttribute(StyleConstants.TabSet);
-  } 
+  }
 
   /**
-   * Returns the value of the bold flag in the given attributes, or 
+   * Returns the value of the bold flag in the given attributes, or
    * false if no bold flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The bold flag.
-   * 
+   *
    * @see #setBold(MutableAttributeSet, boolean)
    */
   public static boolean isBold(AttributeSet a)
@@ -491,16 +491,16 @@ public class StyleConstants
       return b.booleanValue();
     else
       return false;
-  } 
+  }
 
   /**
-   * Returns the value of the italic flag in the given attributes, or 
+   * Returns the value of the italic flag in the given attributes, or
    * false if no italic flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The italic flag.
-   * 
+   *
    * @see #setItalic(MutableAttributeSet, boolean)
    */
   public static boolean isItalic(AttributeSet a)
@@ -510,16 +510,16 @@ public class StyleConstants
       return b.booleanValue();
     else
       return false;
-  } 
+  }
 
   /**
-   * Returns the value of the strike-through flag in the given attributes, or 
+   * Returns the value of the strike-through flag in the given attributes, or
    * false if no strike-through flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The strike-through flag.
-   * 
+   *
    * @see #setStrikeThrough(MutableAttributeSet, boolean)
    */
   public static boolean isStrikeThrough(AttributeSet a)
@@ -529,16 +529,16 @@ public class StyleConstants
       return b.booleanValue();
     else
       return false;
-  } 
+  }
 
   /**
-   * Returns the value of the subscript flag in the given attributes, or 
+   * Returns the value of the subscript flag in the given attributes, or
    * false if no subscript flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The subscript flag.
-   * 
+   *
    * @see #setSubscript(MutableAttributeSet, boolean)
    */
   public static boolean isSubscript(AttributeSet a)
@@ -548,16 +548,16 @@ public class StyleConstants
       return b.booleanValue();
     else
       return false;
-  } 
+  }
 
   /**
-   * Returns the value of the superscript flag in the given attributes, or 
+   * Returns the value of the superscript flag in the given attributes, or
    * false if no superscript flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The superscript flag.
-   * 
+   *
    * @see #setSuperscript(MutableAttributeSet, boolean)
    */
   public static boolean isSuperscript(AttributeSet a)
@@ -565,18 +565,18 @@ public class StyleConstants
     Boolean b = (Boolean) a.getAttribute(Superscript);
     if (b != null)
       return b.booleanValue();
-    else 
+    else
       return false;
-  } 
+  }
 
   /**
-   * Returns the value of the underline flag in the given attributes, or 
+   * Returns the value of the underline flag in the given attributes, or
    * false if no underline flag is specified.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * 
+   *
    * @return The underline flag.
-   * 
+   *
    * @see #setUnderline(MutableAttributeSet, boolean)
    */
   public static boolean isUnderline(AttributeSet a)
@@ -586,140 +586,140 @@ public class StyleConstants
       return b.booleanValue();
     else
       return false;
-  } 
+  }
 
   /**
    * Adds an alignment attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
-   * @param align  the alignment (typically one of 
-   *               {@link StyleConstants#ALIGN_LEFT}, 
-   *               {@link StyleConstants#ALIGN_RIGHT}, 
-   *               {@link StyleConstants#ALIGN_CENTER} or 
+   * @param align  the alignment (typically one of
+   *               {@link StyleConstants#ALIGN_LEFT},
+   *               {@link StyleConstants#ALIGN_RIGHT},
+   *               {@link StyleConstants#ALIGN_CENTER} or
    *               {@link StyleConstants#ALIGN_JUSTIFIED}).
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getAlignment(AttributeSet)
    */
   public static void setAlignment(MutableAttributeSet a, int align)
   {
     a.addAttribute(Alignment, new Integer(align));
-  } 
+  }
 
   /**
    * Adds a background attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param bg  the background (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getBackground(AttributeSet)
    */
   public static void setBackground(MutableAttributeSet a, Color bg)
   {
     a.addAttribute(Background, bg);
-  } 
+  }
 
   /**
    * Adds a bidi-level attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param lev  the level.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getBidiLevel(AttributeSet)
    */
   public static void setBidiLevel(MutableAttributeSet a, int lev)
   {
     a.addAttribute(BidiLevel, new Integer(lev));
-  } 
+  }
 
   /**
    * Adds a bold attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the new value of the bold attribute.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isBold(AttributeSet)
    */
   public static void setBold(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(Bold, Boolean.valueOf(b));
-  } 
-  
+  }
+
   /**
    * Adds a component attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param c  the component (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getComponent(AttributeSet)
    */
   public static void setComponent(MutableAttributeSet a, Component c)
   {
     a.addAttribute(ComponentAttribute, c);
-  } 
+  }
 
   /**
    * Adds a first line indentation attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the indentation.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getFirstLineIndent(AttributeSet)
    */
   public static void setFirstLineIndent(MutableAttributeSet a, float i)
   {
     a.addAttribute(FirstLineIndent, new Float(i));
-  } 
+  }
 
   /**
    * Adds a font family attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param fam  the font family name (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getFontFamily(AttributeSet)
    */
   public static void setFontFamily(MutableAttributeSet a, String fam)
   {
     a.addAttribute(FontFamily, fam);
-  } 
+  }
 
   /**
    * Adds a font size attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param s  the font size (in points).
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getFontSize(AttributeSet)
    */
   public static void setFontSize(MutableAttributeSet a, int s)
   {
     a.addAttribute(FontSize, new Integer(s));
-  } 
+  }
 
   /**
    * Adds a foreground color attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param fg  the foreground color (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getForeground(AttributeSet)
    */
   public static void setForeground(MutableAttributeSet a, Color fg)
@@ -729,12 +729,12 @@ public class StyleConstants
 
   /**
    * Adds an icon attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param c  the icon (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getIcon(AttributeSet)
    */
   public static void setIcon(MutableAttributeSet a, Icon c)
@@ -742,174 +742,174 @@ public class StyleConstants
     a.addAttribute(AbstractDocument.ElementNameAttribute, IconElementName);
     a.addAttribute(IconAttribute, c);
   }
- 
+
   /**
    * Adds an italic attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the new value of the italic attribute.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isItalic(AttributeSet)
    */
   public static void setItalic(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(Italic, Boolean.valueOf(b));
   }
- 
+
   /**
    * Adds a left indentation attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the indentation.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getLeftIndent(AttributeSet)
    */
   public static void setLeftIndent(MutableAttributeSet a, float i)
   {
     a.addAttribute(LeftIndent, new Float(i));
-  } 
+  }
 
   /**
    * Adds a line spacing attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the line spacing.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getLineSpacing(AttributeSet)
    */
   public static void setLineSpacing(MutableAttributeSet a, float i)
   {
     a.addAttribute(LineSpacing, new Float(i));
-  } 
+  }
 
   /**
    * Adds a right indentation attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the right indentation.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getRightIndent(AttributeSet)
    */
   public static void setRightIndent(MutableAttributeSet a, float i)
   {
     a.addAttribute(RightIndent, new Float(i));
-  } 
+  }
 
   /**
    * Adds a 'space above' attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the space above attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getSpaceAbove(AttributeSet)
    */
   public static void setSpaceAbove(MutableAttributeSet a, float i)
   {
     a.addAttribute(SpaceAbove, new Float(i));
-  } 
+  }
 
   /**
    * Adds a 'space below' attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param i  the space below attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #getSpaceBelow(AttributeSet)
    */
   public static void setSpaceBelow(MutableAttributeSet a, float i)
   {
     a.addAttribute(SpaceBelow, new Float(i));
-  } 
+  }
 
   /**
    * Adds a strike-through attribue to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the strike-through attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isStrikeThrough(AttributeSet)
    */
   public static void setStrikeThrough(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(StrikeThrough, Boolean.valueOf(b));
-  } 
+  }
 
   /**
    * Adds a subscript attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the subscript attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isSubscript(AttributeSet)
    */
   public static void setSubscript(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(Subscript, Boolean.valueOf(b));
-  } 
+  }
 
   /**
    * Adds a superscript attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the superscript attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isSuperscript(AttributeSet)
    */
   public static void setSuperscript(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(Superscript, Boolean.valueOf(b));
-  } 
+  }
 
   /**
    * Adds a {@link TabSet} attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param tabs  the tab set (null not permitted).
-   * 
+   *
    * @throws NullPointerException if either argument is null.
-   * 
+   *
    * @see #getTabSet(AttributeSet)
    */
-  public static void setTabSet(MutableAttributeSet a, 
+  public static void setTabSet(MutableAttributeSet a,
                                javax.swing.text.TabSet tabs)
   {
     a.addAttribute(StyleConstants.TabSet, tabs);
-  } 
+  }
 
   /**
    * Adds an underline attribute to the specified set.
-   * 
+   *
    * @param a  the attribute set (null not permitted).
    * @param b  the underline attribute value.
-   * 
+   *
    * @throws NullPointerException if a is null.
-   * 
+   *
    * @see #isUnderline(AttributeSet)
    */
   public static void setUnderline(MutableAttributeSet a, boolean b)
   {
     a.addAttribute(Underline, Boolean.valueOf(b));
-  } 
+  }
 
-  // The remainder are so-called "typesafe enumerations" which 
+  // The remainder are so-called "typesafe enumerations" which
   // alias subsets of the above constants.
 
   /**
@@ -921,56 +921,56 @@ public class StyleConstants
   {
     /**
      * Private constructor prevents new instances being created.
-     * 
+     *
      * @param k  the key name.
      */
-    private CharacterConstants(String k) 
+    private CharacterConstants(String k)
     {
       super(k);
     }
-    
+
     /** An alias for {@link ColorConstants#Background}. */
     public static final Object Background = ColorConstants.Background;
-    
+
     /** A key for the bidi level character attribute. */
     public static final Object BidiLevel = new CharacterConstants("bidiLevel");
-    
+
     /** An alias for {@link FontConstants#Bold}. */
     public static final Object Bold = FontConstants.Bold;
-    
+
     /** A key for the component character attribute. */
-    public static final Object ComponentAttribute 
+    public static final Object ComponentAttribute
         = new CharacterConstants("component");
-    
+
     /** An alias for {@link FontConstants#Family}. */
     public static final Object Family = FontConstants.Family;
-    
+
     /** An alias for {@link FontConstants#Size}. */
     public static final Object Size = FontConstants.Size;
-    
+
     /** An alias for {@link ColorConstants#Foreground}. */
     public static final Object Foreground = ColorConstants.Foreground;
-    
+
     /** A key for the icon character attribute. */
     public static final Object IconAttribute = new CharacterConstants("icon");
-    
+
     /** A key for the italic character attribute. */
     public static final Object Italic = FontConstants.Italic;
-    
+
     /** A key for the strike through character attribute. */
-    public static final Object StrikeThrough 
+    public static final Object StrikeThrough
         = new CharacterConstants("strikethrough");
-    
+
     /** A key for the subscript character attribute. */
     public static final Object Subscript = new CharacterConstants("subscript");
-    
+
     /** A key for the superscript character attribute. */
-    public static final Object Superscript 
+    public static final Object Superscript
         = new CharacterConstants("superscript");
-    
+
     /** A key for the underline character attribute. */
     public static final Object Underline = new CharacterConstants("underline");
-  
+
   }
 
   /**
@@ -982,14 +982,14 @@ public class StyleConstants
   {
     /**
      * Private constructor prevents new instances being created.
-     * 
+     *
      * @param k  the key name.
      */
-    private ColorConstants(String k) 
+    private ColorConstants(String k)
     {
       super(k);
     }
-    
+
     /** A key for the foreground color attribute. */
     public static final Object Foreground = new ColorConstants("foreground");
 
@@ -1006,23 +1006,23 @@ public class StyleConstants
   {
     /**
      * Private constructor prevents new instances being created.
-     * 
+     *
      * @param k  the key name.
      */
-    private FontConstants(String k) 
+    private FontConstants(String k)
     {
       super(k);
     }
-    
+
     /** A key for the bold font attribute. */
     public static final Object Bold = new FontConstants("bold");
 
     /** A key for the family font attribute. */
     public static final Object Family = new FontConstants("family");
-    
+
     /** A key for the italic font attribute. */
     public static final Object Italic = new FontConstants("italic");
-    
+
     /** A key for the size font attribute. */
     public static final Object Size = new FontConstants("size");
   }
@@ -1036,48 +1036,48 @@ public class StyleConstants
   {
     /**
      * Private constructor prevents new instances being created.
-     * 
+     *
      * @param k  the key name.
      */
-    private ParagraphConstants(String k) 
+    private ParagraphConstants(String k)
     {
       super(k);
     }
-    
+
     /** A key for the alignment paragraph attribute. */
     public static final Object Alignment = new ParagraphConstants("Alignment");
 
     /** A key for the first line indentation paragraph attribute. */
-    public static final Object FirstLineIndent 
+    public static final Object FirstLineIndent
         = new ParagraphConstants("FirstLineIndent");
-    
+
     /** A key for the left indentation paragraph attribute. */
-    public static final Object LeftIndent 
+    public static final Object LeftIndent
         = new ParagraphConstants("LeftIndent");
-    
+
     /** A key for the line spacing paragraph attribute. */
-    public static final Object LineSpacing 
+    public static final Object LineSpacing
         = new ParagraphConstants("LineSpacing");
-    
+
     /** A key for the orientation paragraph attribute. */
-    public static final Object Orientation 
+    public static final Object Orientation
         = new ParagraphConstants("Orientation");
-    
+
     /** A key for the right indentation paragraph attribute. */
-    public static final Object RightIndent 
+    public static final Object RightIndent
         = new ParagraphConstants("RightIndent");
-    
+
     /** A key for the 'space above' paragraph attribute. */
-    public static final Object SpaceAbove 
+    public static final Object SpaceAbove
         = new ParagraphConstants("SpaceAbove");
-    
+
     /** A key for the 'space below' paragraph attribute. */
-    public static final Object SpaceBelow 
+    public static final Object SpaceBelow
         = new ParagraphConstants("SpaceBelow");
-    
+
     /** A key for the tabset paragraph attribute. */
     public static final Object TabSet = new ParagraphConstants("TabSet");
-    
+
   }
 
 }
diff --git a/libjava/classpath/javax/swing/text/StyleContext.java b/libjava/classpath/javax/swing/text/StyleContext.java
index 4dded0d0402..295398835dd 100644
--- a/libjava/classpath/javax/swing/text/StyleContext.java
+++ b/libjava/classpath/javax/swing/text/StyleContext.java
@@ -60,7 +60,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
 
-public class StyleContext 
+public class StyleContext
   implements Serializable, AbstractDocument.AttributeContext
 {
   /** The serialization UID (compatible with JDK1.5). */
@@ -74,7 +74,7 @@ public class StyleContext
 
     protected transient ChangeEvent changeEvent;
     protected EventListenerList listenerList;
-      
+
     private transient AttributeSet attributes;
 
     public NamedStyle()
@@ -115,12 +115,12 @@ public class StyleContext
     {
       listenerList.add(ChangeListener.class, l);
     }
-      
+
     public void removeChangeListener(ChangeListener l)
     {
       listenerList.remove(ChangeListener.class, l);
     }
-      
+
     public  T[] getListeners(Class listenerType)
     {
       return listenerList.getListeners(listenerType);
@@ -159,7 +159,7 @@ public class StyleContext
     {
       return attributes.containsAttribute(name, value);
     }
-      
+
     public boolean containsAttributes(AttributeSet attrs)
     {
       return attributes.containsAttributes(attrs);
@@ -172,7 +172,7 @@ public class StyleContext
       copy.attributes = attributes.copyAttributes();
       return copy;
     }
-            
+
     public Object getAttribute(Object attrName)
     {
       return attributes.getAttribute(attrName);
@@ -187,10 +187,10 @@ public class StyleContext
     {
       return attributes.getAttributeNames();
     }
-      
+
     public boolean isDefined(Object attrName)
     {
-      return attributes.isDefined(attrName);        
+      return attributes.isDefined(attrName);
     }
 
     public boolean isEqual(AttributeSet attr)
@@ -219,7 +219,7 @@ public class StyleContext
 
     public AttributeSet getResolveParent()
     {
-      return attributes.getResolveParent();        
+      return attributes.getResolveParent();
     }
 
     public void setResolveParent(AttributeSet parent)
@@ -229,7 +229,7 @@ public class StyleContext
       else
         removeAttribute(StyleConstants.ResolveAttribute);
     }
-      
+
     public String toString()
     {
       return "NamedStyle:" + getName() + " " + attributes;
@@ -250,7 +250,7 @@ public class StyleContext
       readAttributeSet(s, this);
     }
   }
-  
+
   public class SmallAttributeSet
     implements AttributeSet
   {
@@ -321,7 +321,7 @@ public class StyleContext
         }
       return eq;
     }
- 
+
     public Object getAttribute(Object key)
     {
       Object att = null;
@@ -334,7 +334,7 @@ public class StyleContext
             att = attrs[i + 1];
         }
 
-      // Check the resolve parent, unless we're looking for the 
+      // Check the resolve parent, unless we're looking for the
       // ResolveAttribute, which must not be looked up
       if (att == null)
           {
@@ -342,7 +342,7 @@ public class StyleContext
             if (parent != null)
               att = parent.getAttribute(key);
           }
-      
+
       return att;
     }
 
@@ -352,18 +352,18 @@ public class StyleContext
     }
 
     public Enumeration getAttributeNames()
-    {      
-      return new Enumeration() 
+    {
+      return new Enumeration()
         {
           int i = 0;
-          public boolean hasMoreElements() 
-          { 
-            return i < attrs.length; 
+          public boolean hasMoreElements()
+          {
+            return i < attrs.length;
           }
-          public Object nextElement() 
-          { 
-            i += 2; 
-            return attrs[i-2]; 
+          public Object nextElement()
+          {
+            i += 2;
+            return attrs[i-2];
           }
         };
     }
@@ -387,7 +387,7 @@ public class StyleContext
         }
       return false;
     }
-	
+
     public boolean isEqual(AttributeSet attr)
     {
       boolean eq;
@@ -400,7 +400,7 @@ public class StyleContext
              && this.containsAttributes(attr);
       return eq;
     }
-	
+
     public String toString()
     {
       StringBuilder sb = new StringBuilder();
@@ -446,7 +446,7 @@ public class StyleContext
    * The name of the default style.
    */
   public static final String DEFAULT_STYLE = "default";
-  
+
   static Hashtable sharedAttributeSets = new Hashtable();
   static Hashtable sharedFonts = new Hashtable();
 
@@ -486,7 +486,7 @@ public class StyleContext
   {
     return new SmallAttributeSet(a);
   }
-  
+
   protected MutableAttributeSet createLargeAttributeSet(AttributeSet a)
   {
     return new SimpleAttributeSet(a);
@@ -506,7 +506,7 @@ public class StyleContext
   {
     return styles.getChangeListeners();
   }
-    
+
   public Style addStyle(String name, Style parent)
   {
     Style newStyle = new NamedStyle(name, parent);
@@ -534,7 +534,7 @@ public class StyleContext
   {
     return (Style) styles.getAttribute(name);
   }
-  
+
   /**
    * Get the names of the style. The returned enumeration always
    * contains at least one member, the default style.
@@ -572,7 +572,7 @@ public class StyleContext
   //
   // We keep a static cache mapping SimpleFontSpecs to java.awt.Fonts, so
   // that we reuse Fonts between styles and style contexts.
-  // 
+  //
 
   private static class SimpleFontSpec
   {
@@ -600,7 +600,7 @@ public class StyleContext
       return family.hashCode() + style + size;
     }
   }
-  
+
   public Font getFont(AttributeSet attr)
   {
     String family = StyleConstants.getFontFamily(attr);
@@ -608,7 +608,7 @@ public class StyleContext
     if (StyleConstants.isBold(attr))
       style += Font.BOLD;
     if (StyleConstants.isItalic(attr))
-      style += Font.ITALIC;      
+      style += Font.ITALIC;
     int size = StyleConstants.getFontSize(attr);
     return getFont(family, style, size);
   }
@@ -625,7 +625,7 @@ public class StyleContext
         return tmp;
       }
   }
-  
+
   public FontMetrics getFontMetrics(Font f)
   {
     return Toolkit.getDefaultToolkit().getFontMetrics(f);
@@ -641,7 +641,7 @@ public class StyleContext
     return StyleConstants.getBackground(a);
   }
 
-  protected int getCompressionThreshold() 
+  protected int getCompressionThreshold()
   {
     return compressionThreshold;
   }
@@ -749,7 +749,7 @@ public class StyleContext
   }
 
   public synchronized AttributeSet removeAttributes(AttributeSet old,
-						    Enumeration names)
+                                                    Enumeration names)
   {
     AttributeSet ret;
     if (old.getAttributeCount() <= getCompressionThreshold())
@@ -771,7 +771,7 @@ public class StyleContext
 
   /**
    * Gets the object previously registered with registerStaticAttributeKey.
-   * 
+   *
    * @param key - the key that was registered.
    * @return the object previously registered with registerStaticAttributeKey.
    */
@@ -781,11 +781,11 @@ public class StyleContext
       return null;
     return readAttributeKeys.get(key);
   }
-  
+
   /**
    * Returns the String that key will be registered with
    * registerStaticAttributeKey.
-   * 
+   *
    * @param key - the key that will be registered.
    * @return the string the key will be registered with.
    */
@@ -799,7 +799,7 @@ public class StyleContext
    * attempt to restore keys that were static objects by considering only the
    * keys that have were registered with registerStaticAttributeKey. The
    * attributes retrieved will be placed into the given set.
-   * 
+   *
    * @param in - the stream to read from
    * @param a - the set of attributes
    * @throws ClassNotFoundException - may be encountered when reading from
@@ -827,12 +827,12 @@ public class StyleContext
         a.addAttribute(key, val);
       }
   }
-  
+
   /**
    * Serialize an attribute set in a way that is compatible with it
    * being read in again by {@link #readAttributeSet(ObjectInputStream, MutableAttributeSet)}.
    * In particular registered static keys are transformed properly.
-   * 
+   *
    * @param out - stream to write to
    * @param a - the attribute set
    * @throws IOException - any I/O error
@@ -872,9 +872,9 @@ public class StyleContext
   }
 
   /**
-   * Handles reading in the attributes. 
+   * Handles reading in the attributes.
    * @see #readAttributeSet(ObjectInputStream, MutableAttributeSet)
-   * 
+   *
    * @param in - the stream to read from
    * @param a - the set of attributes
    * @throws ClassNotFoundException - may be encountered when reading from stream
@@ -889,7 +889,7 @@ public class StyleContext
   /**
    * Handles writing of the given attributes.
    * @see #writeAttributeSet(ObjectOutputStream, AttributeSet)
-   * 
+   *
    * @param out - stream to write to
    * @param a - the attribute set
    * @throws IOException - any I/O error
diff --git a/libjava/classpath/javax/swing/text/StyledDocument.java b/libjava/classpath/javax/swing/text/StyledDocument.java
index 168e1b116f3..49e471c9ce1 100644
--- a/libjava/classpath/javax/swing/text/StyledDocument.java
+++ b/libjava/classpath/javax/swing/text/StyledDocument.java
@@ -42,8 +42,8 @@ import java.awt.Font;
 
 /**
  * StyledDocument
- * @author	Andrew Selkirk
- * @version	1.0
+ * @author      Andrew Selkirk
+ * @version     1.0
  */
 public interface StyledDocument extends Document
 {
diff --git a/libjava/classpath/javax/swing/text/StyledEditorKit.java b/libjava/classpath/javax/swing/text/StyledEditorKit.java
index 568694387f3..744585f0852 100644
--- a/libjava/classpath/javax/swing/text/StyledEditorKit.java
+++ b/libjava/classpath/javax/swing/text/StyledEditorKit.java
@@ -364,8 +364,8 @@ public class StyledEditorKit extends DefaultEditorKit
     {
       Document doc = editor.getDocument();
       if (!(doc instanceof StyledDocument))
-	throw new AssertionError("The Document for StyledEditorKits is "
-				 + "expected to be a StyledDocument.");
+        throw new AssertionError("The Document for StyledEditorKits is "
+                                 + "expected to be a StyledDocument.");
 
       return (StyledDocument) doc;
     }
@@ -382,8 +382,8 @@ public class StyledEditorKit extends DefaultEditorKit
     {
       EditorKit kit = editor.getEditorKit();
       if (!(kit instanceof StyledEditorKit))
-	throw new AssertionError("The EditorKit for StyledDocuments is "
-				 + "expected to be a StyledEditorKit.");
+        throw new AssertionError("The EditorKit for StyledDocuments is "
+                                 + "expected to be a StyledEditorKit.");
 
       return (StyledEditorKit) kit;
     }
@@ -406,33 +406,33 @@ public class StyledEditorKit extends DefaultEditorKit
     {
       Document doc = editor.getDocument();
       if (doc instanceof StyledDocument)
-	{
-	  StyledDocument styleDoc = (StyledDocument) editor.getDocument();
-	  EditorKit kit = editor.getEditorKit();
-	  if (!(kit instanceof StyledEditorKit))
-	    {
-	      StyledEditorKit styleKit = (StyledEditorKit) kit;
-	      int start = editor.getSelectionStart();
-	      int end = editor.getSelectionEnd();
-	      int dot = editor.getCaret().getDot();
-	      if (start == dot && end == dot)
-		{
-		  // If there is no selection, then we only update the
-		  // input attributes.
-		  MutableAttributeSet inputAttributes =
-		    styleKit.getInputAttributes();
-		  inputAttributes.addAttributes(atts);
-		}
-	      else
-		styleDoc.setParagraphAttributes(start, end, atts, replace);
-	    }
-	  else
-	    throw new AssertionError("The EditorKit for StyledTextActions "
-				     + "is expected to be a StyledEditorKit");
-	}
+        {
+          StyledDocument styleDoc = (StyledDocument) editor.getDocument();
+          EditorKit kit = editor.getEditorKit();
+          if (!(kit instanceof StyledEditorKit))
+            {
+              StyledEditorKit styleKit = (StyledEditorKit) kit;
+              int start = editor.getSelectionStart();
+              int end = editor.getSelectionEnd();
+              int dot = editor.getCaret().getDot();
+              if (start == dot && end == dot)
+                {
+                  // If there is no selection, then we only update the
+                  // input attributes.
+                  MutableAttributeSet inputAttributes =
+                    styleKit.getInputAttributes();
+                  inputAttributes.addAttributes(atts);
+                }
+              else
+                styleDoc.setParagraphAttributes(start, end, atts, replace);
+            }
+          else
+            throw new AssertionError("The EditorKit for StyledTextActions "
+                                     + "is expected to be a StyledEditorKit");
+        }
       else
-	throw new AssertionError("The Document for StyledTextActions is "
-				 + "expected to be a StyledDocument.");
+        throw new AssertionError("The Document for StyledTextActions is "
+                                 + "expected to be a StyledDocument.");
     }
   }
 
@@ -466,15 +466,15 @@ public class StyledEditorKit extends DefaultEditorKit
       String name = element.getName();
       View view = null;
       if (name.equals(AbstractDocument.ContentElementName))
-	view = new LabelView(element);
+        view = new LabelView(element);
       else if (name.equals(AbstractDocument.ParagraphElementName))
-	view = new ParagraphView(element);
+        view = new ParagraphView(element);
       else if (name.equals(AbstractDocument.SectionElementName))
-	view = new BoxView(element, View.Y_AXIS);
+        view = new BoxView(element, View.Y_AXIS);
       else if (name.equals(StyleConstants.ComponentElementName))
-	view = new ComponentView(element);
+        view = new ComponentView(element);
       else if (name.equals(StyleConstants.IconElementName))
-	view = new IconView(element);
+        view = new IconView(element);
       else
         throw new AssertionError("Unknown Element type: "
                                  + element.getClass().getName() + " : "
@@ -499,14 +499,14 @@ public class StyledEditorKit extends DefaultEditorKit
     {
       Object source = ev.getSource();
       if (!(source instanceof JTextComponent))
-	throw new AssertionError("CaretEvents are expected to come from a"
-				 + "JTextComponent.");
+        throw new AssertionError("CaretEvents are expected to come from a"
+                                 + "JTextComponent.");
 
       JTextComponent text = (JTextComponent) source;
       Document doc = text.getDocument();
       if (!(doc instanceof StyledDocument))
-	throw new AssertionError("The Document used by StyledEditorKits is"
-				 + "expected to be a StyledDocument");
+        throw new AssertionError("The Document used by StyledEditorKits is"
+                                 + "expected to be a StyledDocument");
 
       StyledDocument styleDoc = (StyledDocument) doc;
       currentRun = styleDoc.getCharacterElement(ev.getDot());
@@ -571,7 +571,7 @@ public class StyledEditorKit extends DefaultEditorKit
   public Action[] getActions()
   {
     Action[] actions1 = super.getActions();
-    Action[] myActions = new Action[] { 
+    Action[] myActions = new Action[] {
       new FontSizeAction("font-size-8", 8),
       new FontSizeAction("font-size-10", 10),
       new FontSizeAction("font-size-12", 12),
@@ -698,7 +698,7 @@ public class StyledEditorKit extends DefaultEditorKit
    * @param set the inputAttributes to copy the attributes to
    */
   protected void createInputAttributes(Element element,
-				       MutableAttributeSet set)
+                                       MutableAttributeSet set)
   {
     // FIXME: Filter out component, icon and element name attributes.
     set.removeAttributes(set);
diff --git a/libjava/classpath/javax/swing/text/TabExpander.java b/libjava/classpath/javax/swing/text/TabExpander.java
index d70dd4604e5..a1e4571cf67 100644
--- a/libjava/classpath/javax/swing/text/TabExpander.java
+++ b/libjava/classpath/javax/swing/text/TabExpander.java
@@ -40,4 +40,4 @@ package javax.swing.text;
 public interface TabExpander
 {
   float nextTabStop(float x, int tabOffset);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/text/TabSet.java b/libjava/classpath/javax/swing/text/TabSet.java
index c08a650fb11..c32596536c4 100644
--- a/libjava/classpath/javax/swing/text/TabSet.java
+++ b/libjava/classpath/javax/swing/text/TabSet.java
@@ -54,28 +54,28 @@ public class TabSet implements Serializable
 
   /**
    * Creates a new TabSet containing the specified tab stops.
-   * 
+   *
    * @param t  the tab stops (null permitted).
    */
-  public TabSet(TabStop[] t) 
+  public TabSet(TabStop[] t)
   {
     if (t != null)
       tabs = (TabStop[]) t.clone();
-    else 
+    else
       tabs = new TabStop[0];
   }
- 
+
   /**
    * Returns the tab stop with the specified index.
-   * 
+   *
    * @param i  the index.
-   * 
+   *
    * @return The tab stop.
-   * 
-   * @throws IllegalArgumentException if i is not in the range 
+   *
+   * @throws IllegalArgumentException if i is not in the range
    *     0 to getTabCount() - 1.
    */
-  public TabStop getTab(int i) 
+  public TabStop getTab(int i)
   {
     if (i < 0 || i >= tabs.length)
       throw new IllegalArgumentException("Index out of bounds.");
@@ -84,38 +84,38 @@ public class TabSet implements Serializable
 
   /**
    * Returns the tab following the specified location.
-   * 
+   *
    * @param location  the location.
-   * 
+   *
    * @return The tab following the specified location (or null).
    */
-  public TabStop getTabAfter(float location) 
+  public TabStop getTabAfter(float location)
   {
     int idx = getTabIndexAfter(location);
     if (idx == -1)
       return null;
     else
-      return tabs[idx];        
+      return tabs[idx];
   }
 
   /**
    * Returns the number of tab stops in this tab set.
-   * 
+   *
    * @return The number of tab stops in this tab set.
    */
-  public int getTabCount() 
+  public int getTabCount()
   {
     return tabs.length;
   }
 
   /**
    * Returns the index of the specified tab, or -1 if the tab is not found.
-   * 
+   *
    * @param tab  the tab (null permitted).
-   * 
+   *
    * @return The index of the specified tab, or -1.
    */
-  public int getTabIndex(TabStop tab) 
+  public int getTabIndex(TabStop tab)
   {
     for (int i = 0; i < tabs.length; ++i)
       if (tabs[i] == tab)
@@ -125,12 +125,12 @@ public class TabSet implements Serializable
 
   /**
    * Returns the index of the tab at or after the specified location.
-   * 
+   *
    * @param location  the tab location.
-   * 
+   *
    * @return The index of the tab stop, or -1.
    */
-  public int getTabIndexAfter(float location) 
+  public int getTabIndexAfter(float location)
   {
     for (int i = 0; i < tabs.length; i++)
       {
@@ -139,15 +139,15 @@ public class TabSet implements Serializable
       }
     return -1;
   }
-  
+
   /**
    * Tests this TabSet for equality with an arbitrary object.
-   * 
+   *
    * @param obj  the object (null permitted).
-   * 
+   *
    * @return true if this TabSet is equal to
    *     obj, and false otherwise.
-   *     
+   *
    * @since 1.5
    */
   public boolean equals(Object obj)
@@ -167,15 +167,15 @@ public class TabSet implements Serializable
       }
     return true;
   }
-  
+
   /**
    * Returns a hash code for this TabSet.
-   * 
+   *
    * @return A hash code.
-   * 
+   *
    * @since 1.5
    */
-  public int hashCode() 
+  public int hashCode()
   {
     // this hash code won't match Sun's, but that shouldn't matter...
     int result = 193;
@@ -191,7 +191,7 @@ public class TabSet implements Serializable
 
   /**
    * Returns a string representation of this TabSet.
-   * 
+   *
    * @return A string representation of this TabSet.
    */
   public String toString()
diff --git a/libjava/classpath/javax/swing/text/TabStop.java b/libjava/classpath/javax/swing/text/TabStop.java
index f4c3f851406..03a56116fc1 100644
--- a/libjava/classpath/javax/swing/text/TabStop.java
+++ b/libjava/classpath/javax/swing/text/TabStop.java
@@ -66,23 +66,23 @@ public class TabStop implements Serializable
 
   /**
    * Creates a new TabStop for the specified tab position.
-   * 
+   *
    * @param pos  the tab position.
    */
-  public TabStop(float pos) 
+  public TabStop(float pos)
   {
     this(pos, ALIGN_LEFT, LEAD_NONE);
   }
-  
+
   /**
    * Creates a new TabStop with the specified attributes.
-   * 
+   *
    * @param pos  the tab position.
-   * @param align  the alignment (one of {@link #ALIGN_LEFT}, 
-   *     {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL} 
+   * @param align  the alignment (one of {@link #ALIGN_LEFT},
+   *     {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL}
    *     or {@link #ALIGN_BAR}).
-   * @param leader  the leader (one of {@link #LEAD_NONE}, {@link #LEAD_DOTS}, 
-   *     {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS}, {@link #LEAD_THICKLINE} 
+   * @param leader  the leader (one of {@link #LEAD_NONE}, {@link #LEAD_DOTS},
+   *     {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS}, {@link #LEAD_THICKLINE}
    *     or {@link #LEAD_UNDERLINE}).
    */
   public TabStop(float pos, int align, int leader)
@@ -91,16 +91,16 @@ public class TabStop implements Serializable
     this.align = align;
     this.leader = leader;
   }
-  
+
   /**
    * Tests this TabStop for equality with an arbitrary object.
-   * 
+   *
    * @param other  the other object (null permitted).
-   * 
-   * @return true if this TabStop is equal to 
+   *
+   * @return true if this TabStop is equal to
    *     the specified object, and false otherwise.
    */
-  public boolean equals(Object other) 
+  public boolean equals(Object other)
   {
     return (other != null)
       && (other instanceof TabStop)
@@ -110,55 +110,55 @@ public class TabStop implements Serializable
   }
 
   /**
-   * Returns the tab alignment.  This should be one of {@link #ALIGN_LEFT}, 
-   * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL} or 
+   * Returns the tab alignment.  This should be one of {@link #ALIGN_LEFT},
+   * {@link #ALIGN_CENTER}, {@link #ALIGN_RIGHT}, {@link #ALIGN_DECIMAL} or
    * {@link #ALIGN_BAR}.
-   * 
+   *
    * @return The tab alignment.
    */
-  public int getAlignment() 
+  public int getAlignment()
   {
     return align;
   }
 
   /**
-   * Returns the leader type.  This should be one of {@link #LEAD_NONE}, 
-   * {@link #LEAD_DOTS}, {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS}, 
+   * Returns the leader type.  This should be one of {@link #LEAD_NONE},
+   * {@link #LEAD_DOTS}, {@link #LEAD_EQUALS}, {@link #LEAD_HYPHENS},
    * {@link #LEAD_THICKLINE} or {@link #LEAD_UNDERLINE}.
-   * 
+   *
    * @return The leader type.
    */
-  public int getLeader() 
+  public int getLeader()
   {
     return leader;
   }
 
   /**
    * Returns the tab position.
-   * 
+   *
    * @return The tab position.
    */
-  public float getPosition() 
+  public float getPosition()
   {
     return pos;
   }
 
   /**
    * Returns a hash code for this TabStop.
-   * 
+   *
    * @return A hash code.
    */
-  public int hashCode() 
+  public int hashCode()
   {
     return (int) pos + (int) leader + (int) align;
   }
 
   /**
    * Returns a string describing this TabStop.
-   * 
+   *
    * @return A string describing this TabStop.
    */
-  public String toString() 
+  public String toString()
   {
     String prefix = "";
     switch (align)
@@ -174,7 +174,7 @@ public class TabStop implements Serializable
       case ALIGN_DECIMAL:
         prefix = "decimal ";
         break;
-        
+
       case ALIGN_BAR:
         prefix = "bar ";
         break;
@@ -182,8 +182,8 @@ public class TabStop implements Serializable
       default:
         break;
       }
-    
-    return prefix + "tab @" + pos 
+
+    return prefix + "tab @" + pos
         + ((leader == LEAD_NONE) ? "" : " (w/leaders)");
   }
 
diff --git a/libjava/classpath/javax/swing/text/TabableView.java b/libjava/classpath/javax/swing/text/TabableView.java
index 2a96ea94d81..e50270bb6b9 100644
--- a/libjava/classpath/javax/swing/text/TabableView.java
+++ b/libjava/classpath/javax/swing/text/TabableView.java
@@ -1,4 +1,4 @@
-/* TabableView.java -- 
+/* TabableView.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/TableView.java b/libjava/classpath/javax/swing/text/TableView.java
index 2dcb9ebf7b3..bdf5004a96b 100644
--- a/libjava/classpath/javax/swing/text/TableView.java
+++ b/libjava/classpath/javax/swing/text/TableView.java
@@ -51,7 +51,7 @@ import javax.swing.event.DocumentEvent;
  * horizontal boxes containing the actuall cells of the table. These cells
  * can be arbitrary view implementations and are fetched via the
  * {@link ViewFactory} returned by {@link View#getViewFactory}.
- * 
+ *
  * @author Roman Kennke (kennke@aicas.com)
  */
 public abstract class TableView
@@ -416,7 +416,7 @@ public abstract class TableView
   /**
    * Calculates the requirements of this view for the minor (== horizontal)
    * axis.
-   * 
+   *
    * This is reimplemented to calculate the requirements as the sum of the
    * size requirements of the columns.
    *
diff --git a/libjava/classpath/javax/swing/text/TextAction.java b/libjava/classpath/javax/swing/text/TextAction.java
index 49c49cb9d7f..70e19ef1dfc 100644
--- a/libjava/classpath/javax/swing/text/TextAction.java
+++ b/libjava/classpath/javax/swing/text/TextAction.java
@@ -67,9 +67,9 @@ public abstract class TextAction extends AbstractAction
    * Returns the JTextComponent object associated with the given
    * ActionEvent. If the source of the event is not a
    * JTextComponent the currently focused text component is returned.
-   * 
+   *
    * @param event the action event
-   * 
+   *
    * @return the JTextComponent
    */
   protected final JTextComponent getTextComponent(ActionEvent event)
@@ -88,7 +88,7 @@ public abstract class TextAction extends AbstractAction
 
   /**
    * Creates a new array of Action containing both given arrays.
-   * 
+   *
    * @param list1 the first action array
    * @param list2 the second action array
    *
@@ -112,7 +112,7 @@ public abstract class TextAction extends AbstractAction
         actions.put(name != null ? name : "", a);
       }
     Action[] augmented = new Action[actions.size()];
-    
+
     int i = 0;
     for (Iterator it = actions.values().iterator(); it.hasNext(); i++)
       augmented[i] = it.next();
@@ -122,7 +122,7 @@ public abstract class TextAction extends AbstractAction
 
   /**
    * Returns the current focused JTextComponent object.
-   * 
+   *
    * @return the JTextComponent
    */
   protected final JTextComponent getFocusedComponent()
@@ -135,21 +135,21 @@ public abstract class TextAction extends AbstractAction
       textComp = (JTextComponent) focused;
     return textComp;
   }
-  
+
   /** Abstract helper class which implements everything needed for an
    * Action implementation in DefaultEditorKit which
-   * does horizontal movement (and selection).  
+   * does horizontal movement (and selection).
    */
   abstract static class HorizontalMovementAction extends TextAction
   {
     int dir;
-    
+
     HorizontalMovementAction(String name, int direction)
     {
       super(name);
       dir = direction;
     }
-    
+
     public void actionPerformed(ActionEvent event)
     {
       JTextComponent t = getTextComponent(event);
@@ -161,34 +161,34 @@ public abstract class TextAction extends AbstractAction
               = Utilities.getNextVisualPositionFrom(t,
                                                     t.getCaretPosition(),
                                                     dir);
-              
+
             Caret c = t.getCaret();
-            
+
             actionPerformedImpl(c, offs);
-            
+
             c.setMagicCaretPosition(t.modelToView(offs).getLocation());
           }
       }
     catch(BadLocationException ble)
       {
-        throw 
+        throw
           (InternalError) new InternalError("Illegal offset").initCause(ble);
       }
-    
+
     }
-    
+
     protected abstract void actionPerformedImpl(Caret c, int offs)
       throws BadLocationException;
   }
-  
+
   /** Abstract helper class which implements everything needed for an
    * Action implementation in DefaultEditorKit which
    * does vertical movement (and selection).
-   */  
+   */
   abstract static class VerticalMovementAction extends TextAction
   {
     int dir;
-    
+
     VerticalMovementAction(String name, int direction)
     {
       super(name);
@@ -215,26 +215,26 @@ public abstract class TextAction extends AbstractAction
                 }
               else
                 pos = c.getDot();
-        
+
               pos = Utilities.getNextVisualPositionFrom(t,
                                                         t.getCaretPosition(),
                                                         dir);
-        
+
               if (pos > -1)
                 actionPerformedImpl(c, pos);
             }
         }
-      catch(BadLocationException ble) 
+      catch(BadLocationException ble)
       {
-        throw 
+        throw
           (InternalError) new InternalError("Illegal offset").initCause(ble);
       }
     }
-    
+
     protected abstract void actionPerformedImpl(Caret c, int offs)
     throws BadLocationException;
-    
+
   }
-  
-  
+
+
 }
diff --git a/libjava/classpath/javax/swing/text/Utilities.java b/libjava/classpath/javax/swing/text/Utilities.java
index d49d806cfa3..6221392321f 100644
--- a/libjava/classpath/javax/swing/text/Utilities.java
+++ b/libjava/classpath/javax/swing/text/Utilities.java
@@ -97,7 +97,7 @@ public class Utilities
 
     int pos = s.offset;
     int len = 0;
-    
+
     int end = s.offset + s.count;
 
     for (int offset = s.offset; offset < end; ++offset)
@@ -138,7 +138,7 @@ public class Utilities
         g.drawChars(buffer, pos, len, pixelX, y);
         pixelX += metrics.charsWidth(buffer, pos, len);
       }
-    
+
     return pixelX;
   }
 
@@ -171,21 +171,21 @@ public class Utilities
     int count = 0;
     for (int offset = s.offset; offset < end; offset++)
       {
-	switch (buffer[offset])
-	  {
-	  case '\t':
-	    // In case we have a tab, we just 'jump' over the tab.
-	    // When we have no tab expander we just use the width of 'm'.
-	    if (e != null)
-	      pixelX = (int) e.nextTabStop(pixelX,
-					   startOffset + offset - s.offset);
-	    else
-	      pixelX += metrics.charWidth(' ');
-	    break;
-	  case '\n':
-	    // In case we have a newline, we must 'draw'
-	    // the buffer and jump on the next line.
-	    pixelX += metrics.charsWidth(buffer, offset - count, count);
+        switch (buffer[offset])
+          {
+          case '\t':
+            // In case we have a tab, we just 'jump' over the tab.
+            // When we have no tab expander we just use the width of 'm'.
+            if (e != null)
+              pixelX = (int) e.nextTabStop(pixelX,
+                                           startOffset + offset - s.offset);
+            else
+              pixelX += metrics.charWidth(' ');
+            break;
+          case '\n':
+            // In case we have a newline, we must 'draw'
+            // the buffer and jump on the next line.
+            pixelX += metrics.charsWidth(buffer, offset - count, count);
             count = 0;
             break;
           default:
@@ -234,12 +234,12 @@ public class Utilities
     int found = s.count;
     int currentX = x0;
     int nextX = currentX;
-    
+
     int end = s.offset + s.count;
     for (int pos = s.offset; pos < end && found == s.count; pos++)
       {
         char nextChar = s.array[pos];
-        
+
         if (nextChar != '\t')
           nextX += fm.charWidth(nextChar);
         else
@@ -249,7 +249,7 @@ public class Utilities
             else
               nextX += ((int) te.nextTabStop(nextX, p0 + pos - s.offset));
           }
-        
+
         if (x >= currentX && x < nextX)
           {
             // Found position.
@@ -295,10 +295,10 @@ public class Utilities
   {
     return getTabbedTextOffset(s, fm, x0, x, te, p0, true);
   }
-  
+
   /**
    * Finds the start of the next word for the given offset.
-   * 
+   *
    * @param c
    *          the text component
    * @param offs
@@ -315,7 +315,7 @@ public class Utilities
     String text = c.getText();
     BreakIterator wb = BreakIterator.getWordInstance();
     wb.setText(text);
-        
+
     int last = wb.following(offs);
     int current = wb.next();
     int cp;
@@ -325,7 +325,7 @@ public class Utilities
         for (int i = last; i < current; i++)
           {
             cp = text.codePointAt(i);
-            
+
             // Return the last found bound if there is a letter at the current
             // location or is not whitespace (meaning it is a number or
             // punctuation). The first case means that 'last' denotes the
@@ -338,13 +338,13 @@ public class Utilities
         last = current;
         current = wb.next();
       }
-    
+
     throw new BadLocationException("no more words", offs);
   }
 
   /**
    * Finds the start of the previous word for the given offset.
-   * 
+   *
    * @param c
    *          the text component
    * @param offs
@@ -357,10 +357,10 @@ public class Utilities
       throws BadLocationException
   {
     String text = c.getText();
-    
+
     if (offs <= 0 || offs > text.length())
       throw new BadLocationException("invalid offset specified", offs);
-    
+
     BreakIterator wb = BreakIterator.getWordInstance();
     wb.setText(text);
     int last = wb.preceding(offs);
@@ -372,7 +372,7 @@ public class Utilities
         for (int i = last; i < offs; i++)
           {
             cp = text.codePointAt(i);
-            
+
             // Return the last found bound if there is a letter at the current
             // location or is not whitespace (meaning it is a number or
             // punctuation). The first case means that 'last' denotes the
@@ -385,10 +385,10 @@ public class Utilities
         last = current;
         current = wb.previous();
       }
-    
+
     return 0;
   }
-  
+
   /**
    * Finds the start of a word for the given location.
    * @param c the text component
@@ -400,10 +400,10 @@ public class Utilities
       throws BadLocationException
   {
     String text = c.getText();
-    
+
     if (offs < 0 || offs > text.length())
       throw new BadLocationException("invalid offset specified", offs);
-    
+
     BreakIterator wb = BreakIterator.getWordInstance();
     wb.setText(text);
 
@@ -412,7 +412,7 @@ public class Utilities
 
     return wb.preceding(offs);
   }
-  
+
   /**
    * Finds the end of a word for the given location.
    * @param c the text component
@@ -425,20 +425,20 @@ public class Utilities
   {
     if (offs < 0 || offs >= c.getText().length())
       throw new BadLocationException("invalid offset specified", offs);
-    
+
     String text = c.getText();
     BreakIterator wb = BreakIterator.getWordInstance();
     wb.setText(text);
     return wb.following(offs);
   }
-  
+
   /**
-   * Get the model position of the end of the row that contains the 
+   * Get the model position of the end of the row that contains the
    * specified model position.  Return null if the given JTextComponent
    * does not have a size.
    * @param c the JTextComponent
    * @param offs the model position
-   * @return the model position of the end of the row containing the given 
+   * @return the model position of the end of the row containing the given
    * offset
    * @throws BadLocationException if the offset is invalid
    */
@@ -473,12 +473,12 @@ public class Utilities
           }
       }
   }
-      
+
   /**
    * Get the model position of the start of the row that contains the specified
    * model position. Return null if the given JTextComponent does not have a
    * size.
-   * 
+   *
    * @param c the JTextComponent
    * @param offs the model position
    * @return the model position of the start of the row containing the given
@@ -516,7 +516,7 @@ public class Utilities
           }
       }
   }
-  
+
   /**
    * Determine where to break the text in the given Segment, attempting to find
    * a word boundary.
@@ -612,23 +612,23 @@ public class Utilities
     throws BadLocationException
   {
     int offs = getRowStart(c, offset);
-    
+
     if(offs == -1)
       return -1;
 
     // Effectively calculates the y value of the previous line.
     Point pt = c.modelToView(offs-1).getLocation();
-    
+
     pt.x = x;
-    
+
     // Calculate a simple fitting offset.
     offs = c.viewToModel(pt);
-    
+
     // Find out the real x positions of the calculated character and its
     // neighbour.
     int offsX = c.modelToView(offs).getLocation().x;
     int offsXNext = c.modelToView(offs+1).getLocation().x;
-    
+
     // Chose the one which is nearer to us and return its offset.
     if (Math.abs(offsX-x) <= Math.abs(offsXNext-x))
       return offs;
@@ -653,12 +653,12 @@ public class Utilities
     throws BadLocationException
   {
     int offs = getRowEnd(c, offset);
-    
+
     if(offs == -1)
       return -1;
 
     Point pt = null;
-    
+
     // Note: Some views represent the position after the last
     // typed character others do not. Converting offset 3 in "a\nb"
     // in a PlainView will return a valid rectangle while in a
@@ -673,12 +673,12 @@ public class Utilities
       {
         return offset;
       }
-    
+
     pt.x = x;
-    
+
     // Calculate a simple fitting offset.
     offs = c.viewToModel(pt);
-    
+
     if (offs == c.getDocument().getLength())
       return offs;
 
@@ -686,29 +686,29 @@ public class Utilities
     // neighbour.
     int offsX = c.modelToView(offs).getLocation().x;
     int offsXNext = c.modelToView(offs+1).getLocation().x;
-    
+
     // Chose the one which is nearer to us and return its offset.
     if (Math.abs(offsX-x) <= Math.abs(offsXNext-x))
       return offs;
     else
       return offs+1;
     }
-  
+
   /** This is an internal helper method which is used by the
    * javax.swing.text package. It simply delegates the
    * call to a method with the same name on the NavigationFilter
    * of the provided JTextComponent (if it has one) or its UI.
-   * 
+   *
    * If the underlying method throws a BadLocationException it
    * will be swallowed and the initial offset is returned.
    */
   static int getNextVisualPositionFrom(JTextComponent t, int offset, int direction)
   {
     NavigationFilter nf = t.getNavigationFilter();
-    
+
     try
       {
-        return (nf != null) 
+        return (nf != null)
           ? nf.getNextVisualPositionFrom(t,
                                          offset,
                                          Bias.Forward,
@@ -724,7 +724,7 @@ public class Utilities
     {
       return offset;
     }
-    
+
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/text/View.java b/libjava/classpath/javax/swing/text/View.java
index c63ddbce776..e3c795735eb 100644
--- a/libjava/classpath/javax/swing/text/View.java
+++ b/libjava/classpath/javax/swing/text/View.java
@@ -1,4 +1,4 @@
-/* View.java -- 
+/* View.java --
    Copyright (C) 2002, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,7 +56,7 @@ public abstract class View implements SwingConstants
 
   public static final int X_AXIS = 0;
   public static final int Y_AXIS = 1;
-    
+
   private Element elt;
   private View parent;
 
@@ -104,12 +104,12 @@ public abstract class View implements SwingConstants
 
     this.parent = parent;
   }
-    
+
   public View getParent()
   {
     return parent;
   }
-    
+
   public Container getContainer()
   {
     View parent = getParent();
@@ -118,12 +118,12 @@ public abstract class View implements SwingConstants
     else
       return parent.getContainer();
   }
-  
+
   public Document getDocument()
   {
     return getElement().getDocument();
   }
-    
+
   public Element getElement()
   {
     return elt;
@@ -189,12 +189,12 @@ public abstract class View implements SwingConstants
       min = getPreferredSpan(axis);
     return min;
   }
-  
+
   public void setSize(float width, float height)
   {
     // The default implementation does nothing.
   }
-  
+
   /**
    * Returns the alignment of this view along the baseline of the parent view.
    * An alignment of 0.0 will align this view with the left edge
@@ -218,7 +218,7 @@ public abstract class View implements SwingConstants
   {
     return getElement().getAttributes();
   }
-  
+
   public boolean isVisible()
   {
     return true;
@@ -228,7 +228,7 @@ public abstract class View implements SwingConstants
   {
     return 0;
   }
-  
+
   public View getView(int index)
   {
     return null;
@@ -274,7 +274,7 @@ public abstract class View implements SwingConstants
 
   public void remove(int index)
   {
-    replace(index, 1, null); 
+    replace(index, 1, null);
   }
 
   public View createFragment(int p0, int p1)
@@ -297,7 +297,7 @@ public abstract class View implements SwingConstants
   {
     return null;
   }
-  
+
   /**
    * @since 1.4
    */
@@ -305,7 +305,7 @@ public abstract class View implements SwingConstants
   {
     return -1;
   }
-  
+
   /**
    * @since 1.4
    */
@@ -674,15 +674,15 @@ public abstract class View implements SwingConstants
    *         listed valid values
    */
   public Shape modelToView(int p1, Position.Bias b1,
-			   int p2, Position.Bias b2, Shape a)
+                           int p2, Position.Bias b2, Shape a)
     throws BadLocationException
   {
     if (b1 != Position.Bias.Forward && b1 != Position.Bias.Backward)
       throw new IllegalArgumentException
-	("b1 must be either Position.Bias.Forward or Position.Bias.Backward");
+        ("b1 must be either Position.Bias.Forward or Position.Bias.Backward");
     if (b2 != Position.Bias.Forward && b2 != Position.Bias.Backward)
       throw new IllegalArgumentException
-	("b2 must be either Position.Bias.Forward or Position.Bias.Backward");
+        ("b2 must be either Position.Bias.Forward or Position.Bias.Backward");
 
     Shape s1 = modelToView(p1, a, b1);
     // Special case for p2 == end index.
@@ -867,7 +867,7 @@ public abstract class View implements SwingConstants
         ret = parent.viewToModel(r.x, r.y - 1, a, biasRet);
         break;
       case SOUTH:
-        // Try to find a suitable offset by examining the area below. 
+        // Try to find a suitable offset by examining the area below.
         parent = getParent();
         r =  parent.modelToView(pos, a, b).getBounds();
         ret = parent.viewToModel(r.x + r.width, r.y + r.height, a, biasRet);
@@ -875,7 +875,7 @@ public abstract class View implements SwingConstants
       default:
         throw new IllegalArgumentException("Illegal value for d");
     }
-    
+
     return ret;
   }
 }
diff --git a/libjava/classpath/javax/swing/text/ViewFactory.java b/libjava/classpath/javax/swing/text/ViewFactory.java
index 079488017b6..cb57bd80184 100644
--- a/libjava/classpath/javax/swing/text/ViewFactory.java
+++ b/libjava/classpath/javax/swing/text/ViewFactory.java
@@ -1,4 +1,4 @@
-/* ViewFactory.java -- 
+/* ViewFactory.java --
    Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/WrappedPlainView.java b/libjava/classpath/javax/swing/text/WrappedPlainView.java
index 00e12b1129e..f2a6c92d888 100644
--- a/libjava/classpath/javax/swing/text/WrappedPlainView.java
+++ b/libjava/classpath/javax/swing/text/WrappedPlainView.java
@@ -1,4 +1,4 @@
-/* WrappedPlainView.java -- 
+/* WrappedPlainView.java --
    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -56,31 +56,31 @@ public class WrappedPlainView extends BoxView implements TabExpander
 {
   /** The color for selected text **/
   Color selectedColor;
-  
+
   /** The color for unselected text **/
   Color unselectedColor;
-  
+
   /** The color for disabled components **/
   Color disabledColor;
-  
+
   /**
    * Stores the font metrics. This is package private to avoid synthetic
    * accessor method.
    */
   FontMetrics metrics;
-  
+
   /** Whether or not to wrap on word boundaries **/
   boolean wordWrap;
-  
+
   /** A ViewFactory that creates WrappedLines **/
   ViewFactory viewFactory = new WrappedLineCreator();
-  
+
   /** The start of the selected text **/
   int selectionStart;
-  
+
   /** The end of the selected text **/
   int selectionEnd;
-  
+
   /** The height of the line (used while painting) **/
   int lineHeight;
 
@@ -98,18 +98,18 @@ public class WrappedPlainView extends BoxView implements TabExpander
    * The instance returned by {@link #getLineBuffer()}.
    */
   private transient Segment lineBuffer;
-  
+
   public WrappedPlainView (Element elem)
   {
     this (elem, false);
   }
-  
+
   public WrappedPlainView (Element elem, boolean wordWrap)
   {
     super (elem, Y_AXIS);
-    this.wordWrap = wordWrap;    
-  }  
-  
+    this.wordWrap = wordWrap;
+  }
+
   /**
    * Provides access to the Segment used for retrievals from the Document.
    * @return the Segment.
@@ -120,12 +120,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
       lineBuffer = new Segment();
     return lineBuffer;
   }
-  
+
   /**
    * Returns the next tab stop position after a given reference position.
    *
    * This implementation ignores the tabStop argument.
-   * 
+   *
    * @param x the current x position in pixels
    * @param tabStop the position within the text stream that the tab occured at
    */
@@ -139,12 +139,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
       }
     return next;
   }
-  
+
   /**
-   * Returns the tab size for the Document based on 
+   * Returns the tab size for the Document based on
    * PlainDocument.tabSizeAttribute, defaulting to 8 if this property is
    * not defined
-   * 
+   *
    * @return the tab size.
    */
   protected int getTabSize()
@@ -154,7 +154,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
       return 8;
     return ((Integer)tabSize).intValue();
   }
-  
+
   /**
    * Draws a line of text, suppressing white space at the end and expanding
    * tabs.  Calls drawSelectedText and drawUnselectedText.
@@ -175,37 +175,37 @@ public class WrappedPlainView extends BoxView implements TabExpander
       //  - start of range is selected, end of range is unselected
       //  - start of range is unselected, end of range is selected
       //  - middle of range is selected, start and end of range is unselected
-      
-      // entire range unselected:      
-      if ((selectionStart == selectionEnd) || 
+
+      // entire range unselected:
+      if ((selectionStart == selectionEnd) ||
           (p0 > selectionEnd || p1 < selectionStart))
         drawUnselectedText(g, x, y, p0, p1);
-      
+
       // entire range selected
       else if (p0 >= selectionStart && p1 <= selectionEnd)
         drawSelectedText(g, x, y, p0, p1);
-      
+
       // start of range selected, end of range unselected
       else if (p0 >= selectionStart)
         {
           x = drawSelectedText(g, x, y, p0, selectionEnd);
           drawUnselectedText(g, x, y, selectionEnd, p1);
         }
-      
+
       // start of range unselected, end of range selected
       else if (selectionStart > p0 && selectionEnd > p1)
         {
           x = drawUnselectedText(g, x, y, p0, selectionStart);
           drawSelectedText(g, x, y, selectionStart, p1);
         }
-      
+
       // middle of range selected
       else if (selectionStart > p0)
         {
           x = drawUnselectedText(g, x, y, p0, selectionStart);
           x = drawSelectedText(g, x, y, selectionStart, selectionEnd);
           drawUnselectedText(g, x, y, selectionEnd, p1);
-        }        
+        }
     }
     catch (BadLocationException ble)
     {
@@ -214,14 +214,14 @@ public class WrappedPlainView extends BoxView implements TabExpander
   }
 
   /**
-   * Renders the range of text as selected text.  Just paints the text 
+   * Renders the range of text as selected text.  Just paints the text
    * in the color specified by the host component.  Assumes the highlighter
    * will render the selected background.
    * @param g the graphics context
    * @param x the starting X coordinate
    * @param y the starting Y coordinate
    * @param p0 the starting model location
-   * @param p1 the ending model location 
+   * @param p1 the ending model location
    * @return the X coordinate of the end of the text
    * @throws BadLocationException if the given range is invalid
    */
@@ -246,7 +246,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
    */
   protected int drawUnselectedText(Graphics g, int x, int y, int p0, int p1)
       throws BadLocationException
-  {    
+  {
     JTextComponent textComponent = (JTextComponent) getContainer();
     if (textComponent.isEnabled())
       g.setColor(unselectedColor);
@@ -256,8 +256,8 @@ public class WrappedPlainView extends BoxView implements TabExpander
     Segment segment = getLineBuffer();
     getDocument().getText(p0, p1 - p0, segment);
     return Utilities.drawTabbedText(segment, x, y, g, this, p0);
-  }  
-  
+  }
+
   /**
    * Loads the children to initiate the view.  Called by setParent.
    * Creates a WrappedLine for each child Element.
@@ -268,17 +268,17 @@ public class WrappedPlainView extends BoxView implements TabExpander
     int numChildren = root.getElementCount();
     if (numChildren == 0)
       return;
-    
+
     View[] children = new View[numChildren];
     for (int i = 0; i < numChildren; i++)
       children[i] = new WrappedLine(root.getElement(i));
     replace(0, 0, children);
   }
-  
+
   /**
    * Calculates the break position for the text between model positions
    * p0 and p1.  Will break on word boundaries or character boundaries
-   * depending on the break argument given in construction of this 
+   * depending on the break argument given in construction of this
    * WrappedPlainView.  Used by the nested WrappedLine class to determine
    * when to start the next logical line.
    * @param p0 the start model position
@@ -307,16 +307,16 @@ public class WrappedPlainView extends BoxView implements TabExpander
                                                false);
     return pos;
   }
-  
+
   void updateMetrics()
   {
     Container component = getContainer();
     metrics = component.getFontMetrics(component.getFont());
     tabSize = getTabSize()* metrics.charWidth('m');
   }
-  
+
   /**
-   * Determines the preferred span along the given axis.  Implemented to 
+   * Determines the preferred span along the given axis.  Implemented to
    * cache the font metrics and then call the super classes method.
    */
   public float getPreferredSpan (int axis)
@@ -324,9 +324,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
     updateMetrics();
     return super.getPreferredSpan(axis);
   }
-  
+
   /**
-   * Determines the minimum span along the given axis.  Implemented to 
+   * Determines the minimum span along the given axis.  Implemented to
    * cache the font metrics and then call the super classes method.
    */
   public float getMinimumSpan (int axis)
@@ -334,9 +334,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
     updateMetrics();
     return super.getMinimumSpan(axis);
   }
-  
+
   /**
-   * Determines the maximum span along the given axis.  Implemented to 
+   * Determines the maximum span along the given axis.  Implemented to
    * cache the font metrics and then call the super classes method.
    */
   public float getMaximumSpan (int axis)
@@ -344,7 +344,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
     updateMetrics();
     return super.getMaximumSpan(axis);
   }
-  
+
   /**
    * Called when something was inserted.  Overridden so that
    * the view factory creates WrappedLine views.
@@ -361,7 +361,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
     if (v != null)
       v.insertUpdate(e, r, f);
   }
-  
+
   /**
    * Called when something is removed.  Overridden so that
    * the view factory creates WrappedLine views.
@@ -378,7 +378,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
     if (v != null)
       v.removeUpdate(e, r, f);
   }
-  
+
   /**
    * Called when the portion of the Document that this View is responsible
    * for changes.  Overridden so that the view factory creates
@@ -425,9 +425,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
     public View create(Element elem)
     {
       return new WrappedLine(elem);
-    }    
+    }
   }
-  
+
   /**
    * Renders the Element that is associated with this
    * View.  Caches the metrics and then calls
@@ -444,7 +444,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
     JTextComponent comp = (JTextComponent)getContainer();
     // Ensure metrics are up-to-date.
     updateMetrics();
-    
+
     selectionStart = comp.getSelectionStart();
     selectionEnd = comp.getSelectionEnd();
 
@@ -457,7 +457,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
 
     super.paint(g, a);
   }
-  
+
   /**
    * Sets the size of the View.  Implemented to update the metrics
    * and then call super method.
@@ -469,12 +469,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
       preferenceChanged(null, true, true);
     super.setSize(width, height);
   }
-  
+
   class WrappedLine extends View
-  { 
+  {
     /** Used to cache the number of lines for this View **/
     int numLines = 1;
-    
+
     public WrappedLine(Element elem)
     {
       super(elem);
@@ -518,26 +518,26 @@ public class WrappedPlainView extends BoxView implements TabExpander
                                           this);
               else
                 lh.paintLayeredHighlights(g, currStart, currEnd, s, tc, this);
-                
+
             }
           drawLine(currStart, currEnd, g, rect.x, rect.y + metrics.getAscent());
-          
-          rect.y += lineHeight;          
+
+          rect.y += lineHeight;
           if (currEnd == currStart)
             currStart ++;
           else
             currStart = currEnd;
-          
+
           count++;
-          
+
         }
-      
+
       if (count != numLines)
         {
           numLines = count;
           preferenceChanged(this, false, true);
         }
-      
+
     }
 
     /**
@@ -546,7 +546,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
      * accordingly.
      */
     private int determineNumLines()
-    {      
+    {
       int nLines = 0;
       int end = getEndOffset();
       for (int i = getStartOffset(); i < end;)
@@ -555,7 +555,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
           // careful: check that there's no off-by-one problem here
           // depending on which position calculateBreakPosition returns
           int breakPoint = calculateBreakPosition(i, end);
-          
+
           if (breakPoint == i)
             i = breakPoint + 1;
           else
@@ -563,12 +563,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
         }
       return nLines;
     }
-    
+
     /**
      * Determines the preferred span for this view along the given axis.
-     * 
+     *
      * @param axis the axis (either X_AXIS or Y_AXIS)
-     * 
+     *
      * @return the preferred span along the given axis.
      * @throws IllegalArgumentException if axis is not X_AXIS or Y_AXIS
      */
@@ -582,19 +582,19 @@ public class WrappedPlainView extends BoxView implements TabExpander
             updateMetrics();
           return numLines * metrics.getHeight();
         }
-      
+
       throw new IllegalArgumentException("Invalid axis for getPreferredSpan: "
                                          + axis);
     }
-    
+
     /**
      * Provides a mapping from model space to view space.
-     * 
+     *
      * @param pos the position in the model
      * @param a the region into which the view is rendered
      * @param b the position bias (forward or backward)
-     * 
-     * @return a box in view space that represents the given position 
+     *
+     * @return a box in view space that represents the given position
      * in model space
      * @throws BadLocationException if the given model position is invalid
      */
@@ -602,26 +602,26 @@ public class WrappedPlainView extends BoxView implements TabExpander
         throws BadLocationException
     {
       Rectangle rect = a.getBounds();
-      
+
       // Throwing a BadLocationException is an observed behavior of the RI.
       if (rect.isEmpty())
         throw new BadLocationException("Unable to calculate view coordinates "
                                        + "when allocation area is empty.", pos);
-      
+
       Segment s = getLineBuffer();
       int lineHeight = metrics.getHeight();
-      
-      // Return a rectangle with width 1 and height equal to the height 
+
+      // Return a rectangle with width 1 and height equal to the height
       // of the text
       rect.height = lineHeight;
       rect.width = 1;
 
       int currLineStart = getStartOffset();
       int end = getEndOffset();
-      
+
       if (pos < currLineStart || pos >= end)
         throw new BadLocationException("invalid offset", pos);
-           
+
       while (true)
         {
           int currLineEnd = calculateBreakPosition(currLineStart, end);
@@ -629,7 +629,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
           // the width of the text from currLineStart to pos and add that
           // to rect.x
           if (pos >= currLineStart && pos < currLineEnd)
-            {             
+            {
               try
                 {
                   getDocument().getText(currLineStart, pos - currLineStart, s);
@@ -645,7 +645,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
             }
           // Increment rect.y so we're checking the next logical line
           rect.y += lineHeight;
-          
+
           // Increment currLineStart to the model position of the start
           // of the next logical line
           if (currLineEnd == currLineStart)
@@ -658,12 +658,12 @@ public class WrappedPlainView extends BoxView implements TabExpander
 
     /**
      * Provides a mapping from view space to model space.
-     * 
+     *
      * @param x the x coordinate in view space
      * @param y the y coordinate in view space
      * @param a the region into which the view is rendered
      * @param b the position bias (forward or backward)
-     * 
+     *
      * @return the location in the model that best represents the
      * given point in view space
      */
@@ -672,19 +672,19 @@ public class WrappedPlainView extends BoxView implements TabExpander
       Segment s = getLineBuffer();
       Rectangle rect = a.getBounds();
       int currLineStart = getStartOffset();
-      
+
       // Although calling modelToView with the last possible offset will
       // cause a BadLocationException in CompositeView it is allowed
       // to return that offset in viewToModel.
       int end = getEndOffset();
-      
+
       int lineHeight = metrics.getHeight();
       if (y < rect.y)
         return currLineStart;
 
       if (y > rect.y + rect.height)
         return end - 1;
-      
+
       // Note: rect.x and rect.width do not represent the width of painted
       // text but the area where text *may* be painted. This means the width
       // is most of the time identical to the component's width.
@@ -705,7 +705,7 @@ public class WrappedPlainView extends BoxView implements TabExpander
                 {
                   // Shouldn't happen
                 }
-              
+
               int offset = Utilities.getTabbedTextOffset(s, metrics, rect.x,
                                                    (int) x,
                                                    WrappedPlainView.this,
@@ -719,27 +719,27 @@ public class WrappedPlainView extends BoxView implements TabExpander
             }
           // Increment rect.y so we're checking the next logical line
           rect.y += lineHeight;
-          
+
           // Increment currLineStart to the model position of the start
           // of the next logical line.
           currLineStart = currLineEnd;
 
         }
-      
+
       return end;
-    }    
-    
+    }
+
     /**
      * 
                    This method is called from insertUpdate and removeUpdate.
                    
-     * 
+     *
      * 
                    If the number of lines in the document has changed, just repaint
-     * the whole thing (note, could improve performance by not repainting 
-     * anything above the changes).  If the number of lines hasn't changed, 
+     * the whole thing (note, could improve performance by not repainting
+     * anything above the changes).  If the number of lines hasn't changed,
      * just repaint the given Rectangle.
                    
-     * 
+     *
      * 
                    Note that the Rectangle argument may be null
-     * when the allocation area is empty. 
-     * 
+     * when the allocation area is empty.
+     *
      * @param a the Rectangle to repaint if the number of lines hasn't changed
      */
     void updateDamage (Rectangle a)
@@ -754,11 +754,11 @@ public class WrappedPlainView extends BoxView implements TabExpander
       else if (a != null)
         getContainer().repaint(a.x, a.y, a.width, a.height);
     }
-    
+
     /**
      * This method is called when something is inserted into the Document
      * that this View is displaying.
-     * 
+     *
      * @param changes the DocumentEvent for the changes.
      * @param a the allocation of the View
      * @param f the ViewFactory used to rebuild
@@ -766,13 +766,13 @@ public class WrappedPlainView extends BoxView implements TabExpander
     public void insertUpdate (DocumentEvent changes, Shape a, ViewFactory f)
     {
       Rectangle r = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
-      updateDamage(r); 
+      updateDamage(r);
     }
-    
+
     /**
      * This method is called when something is removed from the Document
      * that this View is displaying.
-     * 
+     *
      * @param changes the DocumentEvent for the changes.
      * @param a the allocation of the View
      * @param f the ViewFactory used to rebuild
@@ -787,9 +787,9 @@ public class WrappedPlainView extends BoxView implements TabExpander
       // makes View.forwardUpdate() skip this method call.
       // However this seems to cause no trouble and as it reduces the
       // number of method calls it can stay this way.
-      
+
       Rectangle r = a instanceof Rectangle ? (Rectangle) a : a.getBounds();
-      updateDamage(r); 
+      updateDamage(r);
     }
   }
 }
diff --git a/libjava/classpath/javax/swing/text/html/BRView.java b/libjava/classpath/javax/swing/text/html/BRView.java
index 7d0d5164d49..6f465c9d170 100644
--- a/libjava/classpath/javax/swing/text/html/BRView.java
+++ b/libjava/classpath/javax/swing/text/html/BRView.java
@@ -48,14 +48,14 @@ class BRView
 {
   /**
    * Creates the new BR view.
-   * 
+   *
    * @param elem the HTML element, representing the view.
    */
   public BRView(Element elem)
   {
     super(elem);
   }
-  
+
   /**
    * Always return ForcedBreakWeight for the X_AXIS, BadBreakWeight for the
    * Y_AXIS.
diff --git a/libjava/classpath/javax/swing/text/html/BlockView.java b/libjava/classpath/javax/swing/text/html/BlockView.java
index b05c983e922..1c3397126ed 100644
--- a/libjava/classpath/javax/swing/text/html/BlockView.java
+++ b/libjava/classpath/javax/swing/text/html/BlockView.java
@@ -1,4 +1,4 @@
-/* BlockView.java -- 
+/* BlockView.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -159,9 +159,9 @@ public class BlockView extends BoxView
   private HashMap positionInfo;
 
   /**
-   * Creates a new view that represents an html box. 
+   * Creates a new view that represents an html box.
    * This can be used for a number of elements.
-   * 
+   *
    * @param elem - the element to create a view for
    * @param axis - either View.X_AXIS or View.Y_AXIS
    */
@@ -176,26 +176,26 @@ public class BlockView extends BoxView
    * Creates the parent view for this. It is called before
    * any other methods, if the parent view is working properly.
    * Implemented to forward to the superclass and call
-   * setPropertiesFromAttributes to set the paragraph 
+   * setPropertiesFromAttributes to set the paragraph
    * properties.
-   * 
+   *
    * @param parent - the new parent, or null if the view
-   * is being removed from a parent it was added to. 
+   * is being removed from a parent it was added to.
    */
   public void setParent(View parent)
   {
     super.setParent(parent);
-    
+
     if (parent != null)
       setPropertiesFromAttributes();
   }
-  
+
   /**
    * Calculates the requirements along the major axis.
    * This is implemented to call the superclass and then
    * adjust it if the CSS width or height attribute is specified
    * and applicable.
-   * 
+   *
    * @param axis - the axis to check the requirements for.
    * @param r - the SizeRequirements. If null, one is created.
    * @return the new SizeRequirements object.
@@ -205,7 +205,7 @@ public class BlockView extends BoxView
   {
     if (r == null)
       r = new SizeRequirements();
-    
+
     if (setCSSSpan(r, axis))
       {
         // If we have set the span from CSS, then we need to adjust
@@ -229,7 +229,7 @@ public class BlockView extends BoxView
    * This is implemented to call the superclass and then
    * adjust it if the CSS width or height attribute is specified
    * and applicable.
-   * 
+   *
    * @param axis - the axis to check the requirements for.
    * @param r - the SizeRequirements. If null, one is created.
    * @return the new SizeRequirements object.
@@ -239,7 +239,7 @@ public class BlockView extends BoxView
   {
     if (r == null)
       r = new SizeRequirements();
-    
+
     if (setCSSSpan(r, axis))
       {
         // If we have set the span from CSS, then we need to adjust
@@ -277,7 +277,7 @@ public class BlockView extends BoxView
   /**
    * Sets the span on the SizeRequirements object according to the
    * according CSS span value, when it is set.
-   * 
+   *
    * @param r the size requirements
    * @param axis the axis
    *
@@ -325,14 +325,14 @@ public class BlockView extends BoxView
    * perpendicular to the axis that it represents). The results
    * of the layout are placed in the given arrays which are
    * the allocations to the children along the minor axis.
-   * 
-   * @param targetSpan - the total span given to the view, also 
+   *
+   * @param targetSpan - the total span given to the view, also
    * used to layout the children.
    * @param axis - the minor axis
    * @param offsets - the offsets from the origin of the view for
    * all the child views. This is a return value and is filled in by this
    * function.
-   * @param spans - the span of each child view. This is a return value and is 
+   * @param spans - the span of each child view. This is a return value and is
    * filled in by this function.
    */
   protected void layoutMinorAxis(int targetSpan, int axis,
@@ -469,7 +469,7 @@ public class BlockView extends BoxView
    * Paints using the given graphics configuration and shape.
    * This delegates to the css box painter to paint the
    * border and background prior to the interior.
-   * 
+   *
    * @param g - Graphics configuration
    * @param a - the Shape to render into.
    */
@@ -487,7 +487,7 @@ public class BlockView extends BoxView
 
   /**
    * Fetches the attributes to use when painting.
-   * 
+   *
    * @return the attributes of this model.
    */
   public AttributeSet getAttributes()
@@ -496,10 +496,10 @@ public class BlockView extends BoxView
       attributes = getStyleSheet().getViewAttributes(this);
     return attributes;
   }
-  
+
   /**
    * Gets the resize weight.
-   * 
+   *
    * @param axis - the axis to get the resize weight for.
    * @return the resize weight.
    * @throws IllegalArgumentException - for an invalid axis
@@ -513,10 +513,10 @@ public class BlockView extends BoxView
       return 1;
     throw new IllegalArgumentException("Invalid Axis");
   }
-  
+
   /**
    * Gets the alignment.
-   * 
+   *
    * @param axis - the axis to get the alignment for.
    * @return the alignment.
    */
@@ -537,11 +537,11 @@ public class BlockView extends BoxView
       }
     throw new IllegalArgumentException("Invalid Axis");
   }
-  
+
   /**
    * Gives notification from the document that attributes were
    * changed in a location that this view is responsible for.
-   * 
+   *
    * @param ev - the change information
    * @param a - the current shape of the view
    * @param f - the factory to use to rebuild if the view has children.
@@ -550,7 +550,7 @@ public class BlockView extends BoxView
                             Shape a, ViewFactory f)
   {
     super.changedUpdate(ev, a, f);
-    
+
     // If more elements were added, then need to set the properties for them
     int currPos = ev.getOffset();
     if (currPos <= getStartOffset()
@@ -560,10 +560,10 @@ public class BlockView extends BoxView
 
   /**
    * Determines the preferred span along the axis.
-   * 
+   *
    * @param axis - the view to get the preferred span for.
    * @return the span the view would like to be painted into >=0/
-   * The view is usually told to paint into the span that is returned, 
+   * The view is usually told to paint into the span that is returned,
    * although the parent may choose to resize or break the view.
    * @throws IllegalArgumentException - for an invalid axis
    */
@@ -573,13 +573,13 @@ public class BlockView extends BoxView
       return super.getPreferredSpan(axis);
     throw new IllegalArgumentException("Invalid Axis");
   }
-  
+
   /**
    * Determines the minimum span along the axis.
-   * 
+   *
    * @param axis - the axis to get the minimum span for.
    * @return the span the view would like to be painted into >=0/
-   * The view is usually told to paint into the span that is returned, 
+   * The view is usually told to paint into the span that is returned,
    * although the parent may choose to resize or break the view.
    * @throws IllegalArgumentException - for an invalid axis
    */
@@ -589,13 +589,13 @@ public class BlockView extends BoxView
       return super.getMinimumSpan(axis);
     throw new IllegalArgumentException("Invalid Axis");
   }
-  
+
   /**
    * Determines the maximum span along the axis.
-   * 
+   *
    * @param axis - the axis to get the maximum span for.
    * @return the span the view would like to be painted into >=0/
-   * The view is usually told to paint into the span that is returned, 
+   * The view is usually told to paint into the span that is returned,
    * although the parent may choose to resize or break the view.
    * @throws IllegalArgumentException - for an invalid axis
    */
@@ -605,7 +605,7 @@ public class BlockView extends BoxView
       return super.getMaximumSpan(axis);
     throw new IllegalArgumentException("Invalid Axis");
   }
-  
+
   /**
    * Updates any cached values that come from attributes.
    */
@@ -640,7 +640,7 @@ public class BlockView extends BoxView
 
   /**
    * Gets the default style sheet.
-   * 
+   *
    * @return the style sheet
    */
   protected StyleSheet getStyleSheet()
diff --git a/libjava/classpath/javax/swing/text/html/CSS.java b/libjava/classpath/javax/swing/text/html/CSS.java
index 77f94a60878..0a77bdff916 100644
--- a/libjava/classpath/javax/swing/text/html/CSS.java
+++ b/libjava/classpath/javax/swing/text/html/CSS.java
@@ -455,7 +455,7 @@ public class CSS implements Serializable
      *
      * @param attr the attribute string
      * @param inherited if the attribute should be inherited or not
-     * @param def a default value; may be null 
+     * @param def a default value; may be null
      */
     Attribute(String attr, boolean inherited, String def)
     {
@@ -463,7 +463,7 @@ public class CSS implements Serializable
       isInherited = inherited;
       defaultValue = def;
       if( attributeMap == null)
-	attributeMap = new HashMap();
+        attributeMap = new HashMap();
       attributeMap.put( attr, this );
     }
 
diff --git a/libjava/classpath/javax/swing/text/html/CSSBorder.java b/libjava/classpath/javax/swing/text/html/CSSBorder.java
index fff6b01a170..23fcdccc6e6 100644
--- a/libjava/classpath/javax/swing/text/html/CSSBorder.java
+++ b/libjava/classpath/javax/swing/text/html/CSSBorder.java
@@ -308,7 +308,7 @@ class CSSBorder
     // Right border.
     paintBorderLine(g, x + width - right / 2, y, x + width - right / 2,
                     y + height, topStyle, right, rightColor, true);
-    
+
   }
 
   private void paintBorderLine(Graphics g, int x1, int y1, int x2, int y2,
diff --git a/libjava/classpath/javax/swing/text/html/CSSParser.java b/libjava/classpath/javax/swing/text/html/CSSParser.java
index d49ac3a6fc9..5024c7b595d 100644
--- a/libjava/classpath/javax/swing/text/html/CSSParser.java
+++ b/libjava/classpath/javax/swing/text/html/CSSParser.java
@@ -43,18 +43,18 @@ import java.io.*;
 /**
  * Parses a CSS document. This works by way of a delegate that implements the
  * CSSParserCallback interface. The delegate is notified of the following
- * events: 
- * - Import statement: handleImport 
- * - Selectors handleSelector. This is invoked for each string. For example if 
- * the Reader contained p, bar , a {}, the delegate would be notified 4 times, 
- * for 'p,' 'bar' ',' and 'a'. 
- * - When a rule starts, startRule 
+ * events:
+ * - Import statement: handleImport
+ * - Selectors handleSelector. This is invoked for each string. For example if
+ * the Reader contained p, bar , a {}, the delegate would be notified 4 times,
+ * for 'p,' 'bar' ',' and 'a'.
+ * - When a rule starts, startRule
  * - Properties in the rule via the handleProperty. This
  * is invoked one per property/value key, eg font size: foo;, would cause the
- * delegate to be notified once with a value of 'font size'. 
- * - Values in the rule via the handleValue, this is notified for the total value. 
+ * delegate to be notified once with a value of 'font size'.
+ * - Values in the rule via the handleValue, this is notified for the total value.
  * - When a rule ends, endRule
- * 
+ *
  * @author Lillian Angel (langel@redhat.com)
  */
 class CSSParser
@@ -68,7 +68,7 @@ class CSSParser
   {
     /**
      * Handles the import statment in the document.
-     * 
+     *
      * @param imp - the import string
      */
     public abstract void handleImport(String imp);
@@ -85,21 +85,21 @@ class CSSParser
 
     /**
      * Handles the selector of a rule.
-     * 
+     *
      * @param selector - the selector in the rule
      */
     public abstract void handleSelector(String selector);
 
     /**
      * Handles the properties in the document.
-     * 
+     *
      * @param property - the property in the document.
      */
     public abstract void handleProperty(String property);
 
     /**
      * Handles the values in the document.
-     * 
+     *
      * @param value - the value to handle.
      */
     public abstract void handleValue(String value);
@@ -212,7 +212,7 @@ class CSSParser
 
   /**
    * Appends a character to the token buffer.
-   * 
+   *
    * @param c - the character to append
    */
   private void append(char c)
@@ -233,7 +233,7 @@ class CSSParser
 
   /**
    * Fetches the next token.
-   * 
+   *
    * @param c - the character to fetch.
    * @return the location
    * @throws IOException - any i/o error encountered while reading
@@ -276,7 +276,7 @@ class CSSParser
 
   /**
    * Reads a character from the stream.
-   * 
+   *
    * @return the number of characters read or -1 if end of stream is reached.
    * @throws IOException - any i/o encountered while reading
    */
@@ -293,19 +293,19 @@ class CSSParser
   /**
    * Parses the the contents of the reader using the
    * callback.
-   * 
+   *
    * @param reader - the reader to read from
    * @param callback - the callback instance
    * @param parsingDeclaration - true if parsing a declaration
    * @throws IOException - any i/o error from the reader
    */
-  void parse(Reader reader, CSSParser.CSSParserCallback callback, 
+  void parse(Reader reader, CSSParser.CSSParserCallback callback,
              boolean parsingDeclaration)
       throws IOException
   {
     this.reader = reader;
     this.callback = callback;
-    
+
     try
     {
       if (!parsingDeclaration)
@@ -322,7 +322,7 @@ class CSSParser
 
   /**
    * Skips any white space, returning the character after the white space.
-   * 
+   *
    * @return the character after the whitespace
    * @throws IOException - any i/o error from the reader
    */
@@ -337,7 +337,7 @@ class CSSParser
           return next;
         next = tempNext;
       }
-    
+
     // Its all whitespace
     return END;
   }
@@ -345,7 +345,7 @@ class CSSParser
   /**
    * Gets the next statement, returning false if the end is reached.
    * A statement is either an At-rule, or a ruleset.
-   * 
+   *
    * @return false if the end is reached
    * @throws IOException - any i/o error from the reader
    */
@@ -368,7 +368,7 @@ class CSSParser
             parseAtRule();
           else
             parseRuleSet();
-          break;  
+          break;
         case END:
           return false;
       }
@@ -377,28 +377,28 @@ class CSSParser
 
   /**
    * Parses an @ rule, stopping at a matching brace pair, or ;.
-   * 
+   *
    * @throws IOException - any i/o error from the reader
    */
   private void parseAtRule() throws IOException
-  {    
-    // An At-Rule begins with the "@" character followed immediately by a keyword. 
-    // Following the keyword separated by a space is an At-rule statement appropriate 
-    // to the At-keyword used. If the At-Rule is a simple declarative statement 
-    // (charset, import, fontdef), it is terminated by a semi-colon (";".) 
-    // If the At-Rule is a conditional or informative statement (media, page, font-face), 
-    // it is followed by optional arguments and then a style declaration block inside matching 
-    // curly braces ("{", "}".) At-Rules are sometimes nestable, depending on the context. 
+  {
+    // An At-Rule begins with the "@" character followed immediately by a keyword.
+    // Following the keyword separated by a space is an At-rule statement appropriate
+    // to the At-keyword used. If the At-Rule is a simple declarative statement
+    // (charset, import, fontdef), it is terminated by a semi-colon (";".)
+    // If the At-Rule is a conditional or informative statement (media, page, font-face),
+    // it is followed by optional arguments and then a style declaration block inside matching
+    // curly braces ("{", "}".) At-Rules are sometimes nestable, depending on the context.
     // If any part of an At-Rule is not understood, it should be ignored.
-    
+
     // FIXME: Not Implemented
-    // call handleimport 
+    // call handleimport
   }
 
   /**
-   * Parses the next rule set, which is a selector followed by a declaration 
+   * Parses the next rule set, which is a selector followed by a declaration
    * block.
-   * 
+   *
    * @throws IOException - any i/o error from the reader
    */
   private void parseRuleSet() throws IOException
@@ -411,9 +411,9 @@ class CSSParser
   }
 
   /**
-   * Parses a set of selectors, returning false if the end of the stream is 
+   * Parses a set of selectors, returning false if the end of the stream is
    * reached.
-   * 
+   *
    * @return false if the end of stream is reached
    * @throws IOException - any i/o error from the reader
    */
@@ -421,13 +421,13 @@ class CSSParser
   {
     // FIXME: Not Implemented
     // call handleselector
-    return false; 
+    return false;
   }
 
   /**
    * Parses a declaration block. Which a number of declarations followed by a
    * })].
-   * 
+   *
    * @throws IOException - any i/o error from the reader
    */
   private void parseDeclarationBlock() throws IOException
@@ -439,7 +439,7 @@ class CSSParser
   /**
    * Parses a single declaration, which is an identifier a : and another identifier.
    * This returns the last token seen.
-   * 
+   *
    * @returns the last token
    * @throws IOException - any i/o error from the reader
    */
@@ -447,13 +447,13 @@ class CSSParser
   {
     // call handleValue
     // FIXME: Not Implemented
-    return 0; 
+    return 0;
   }
 
   /**
    * Parses identifiers until c is encountered, returning the ending token,
    * which will be IDENTIFIER if c is found.
-   * 
+   *
    * @param c - the stop character
    * @param wantsBlocks - true if blocks are wanted
    * @return the ending token
@@ -469,7 +469,7 @@ class CSSParser
   /**
    * Parses till a matching block close is encountered. This is only appropriate
    * to be called at the top level (no nesting).
-   * 
+   *
    * @param i - FIXME
    * @throws IOException - any i/o error from the reader
    */
@@ -481,7 +481,7 @@ class CSSParser
   /**
    * Gets an identifier, returning true if the length of the string is greater
    * than 0, stopping when c, whitespace, or one of {}()[] is hit.
-   * 
+   *
    * @param c - the stop character
    * @return returns true if the length of the string > 0
    * @throws IOException - any i/o error from the reader
@@ -494,7 +494,7 @@ class CSSParser
 
   /**
    * Reads till c is encountered, escaping characters as necessary.
-   * 
+   *
    * @param c - the stop character
    * @throws IOException - any i/o error from the reader
    */
@@ -505,7 +505,7 @@ class CSSParser
 
   /**
    * Parses a comment block.
-   * 
+   *
    * @throws IOException - any i/o error from the reader
    */
   private void readComment() throws IOException
@@ -516,7 +516,7 @@ class CSSParser
 
   /**
    * Called when a block start is encountered ({[.
-   * 
+   *
    * @param start of block
    */
   private void startBlock(int start)
@@ -526,7 +526,7 @@ class CSSParser
 
   /**
    * Called when an end block is encountered )]}
-   * 
+   *
    * @param end of block
    */
   private void endBlock(int end)
@@ -536,18 +536,18 @@ class CSSParser
 
   /**
    * Checks if currently in a block.
-   * 
+   *
    * @return true if currently in a block.
    */
   private boolean inBlock()
   {
     // FIXME: Not Implemented
-    return false; 
+    return false;
   }
 
   /**
    * Supports one character look ahead, this will throw if called twice in a row.
-   * 
+   *
    * @param c - the character to push.
    * @throws IOException - if called twice in a row
    */
@@ -559,5 +559,3 @@ class CSSParser
     pushedChar = c;
   }
 }
-
- 
diff --git a/libjava/classpath/javax/swing/text/html/FormView.java b/libjava/classpath/javax/swing/text/html/FormView.java
index ef362bd3d9b..61c568f026a 100644
--- a/libjava/classpath/javax/swing/text/html/FormView.java
+++ b/libjava/classpath/javax/swing/text/html/FormView.java
@@ -96,7 +96,7 @@ import javax.swing.text.StyleConstants;
  * JList in JScrollPane
  * select, size unspecified or == 1JComboBox
  * textarea, textJTextArea in JScrollPane
- * input, fileJTextField 
+ * input, fileJTextField
  * 
  *
  * @author Roman Kennke (kennke@aicas.com)
@@ -352,7 +352,7 @@ public class FormView
   /**
    * If the value attribute of an <input type="submit">>
    * tag is not specified, then this string is used.
-   * 
+   *
    * @deprecated As of JDK1.3 the value is fetched from the UIManager property
    *             FormView.submitButtonText.
    */
@@ -362,7 +362,7 @@ public class FormView
   /**
    * If the value attribute of an <input type="reset">>
    * tag is not specified, then this string is used.
-   * 
+   *
    * @deprecated As of JDK1.3 the value is fetched from the UIManager property
    *             FormView.resetButtonText.
    */
@@ -638,7 +638,7 @@ public class FormView
       }
     else
       {
-        data = name + ".x=" + p.x + "&" + name + ".y=" + p.y; 
+        data = name + ".x=" + p.x + "&" + name + ".y=" + p.y;
       }
     return data;
   }
diff --git a/libjava/classpath/javax/swing/text/html/HRuleView.java b/libjava/classpath/javax/swing/text/html/HRuleView.java
index 3bae5eb8e83..9be1efff3bd 100644
--- a/libjava/classpath/javax/swing/text/html/HRuleView.java
+++ b/libjava/classpath/javax/swing/text/html/HRuleView.java
@@ -55,15 +55,15 @@ class HRuleView extends InlineView
 {
   /**
    * The null view, indicating, that nothing should be painted ahead the
-   * breaking point. 
+   * breaking point.
    */
   View nullView;
-  
+
   /**
    * The height of the horizontal dash area.
    */
   static int HEIGHT = 4;
-  
+
   /**
    * The imaginary invisible view that stays after end of line after the
    * breaking procedure. It occupies on character.
@@ -74,7 +74,7 @@ class HRuleView extends InlineView
      * The break offset that becomes the views start offset.
      */
     int breakOffset;
-    
+
     /**
      * Return the end offset that is always one char after the break offset.
      */
@@ -82,7 +82,7 @@ class HRuleView extends InlineView
     {
       return breakOffset + 1;
     }
-    
+
     /**
      * Return the start offset that has been passed in a constructor.
      */
@@ -90,10 +90,10 @@ class HRuleView extends InlineView
     {
       return breakOffset;
     }
-     
+
     /**
      * Create the new instance of this view.
-     * 
+     *
      * @param element the element (inherited from the HR view)
      * @param offset the position where the HR view has been broken
      */
@@ -103,7 +103,7 @@ class HRuleView extends InlineView
       breakOffset = offset;
     }
   }
-  
+
   /**
    * Creates the new HR view.
    */
@@ -120,11 +120,11 @@ class HRuleView extends InlineView
   public int getBreakWeight(int axis, float pos, float len)
   {
     if (axis == X_AXIS && ((getEndOffset() - getStartOffset()) > 1))
-      return ForcedBreakWeight;      
+      return ForcedBreakWeight;
     else
-      return BadBreakWeight;      
+      return BadBreakWeight;
   }
-  
+
   /**
    * Draws the double line, upped black and the lower light gray.
    */
@@ -143,7 +143,7 @@ class HRuleView extends InlineView
 
     g.setColor(Color.black);
     g.drawLine(x, y++, w, h++);
-    g.setColor(Color.lightGray);    
+    g.setColor(Color.lightGray);
     g.drawLine(x, y, w, h);
   }
 
@@ -160,7 +160,7 @@ class HRuleView extends InlineView
     else
       return this;
   }
-  
+
   /**
    * Returns the width of the container for the horizontal axis and the
    * thickness of the dash area for the vertical axis.
@@ -176,7 +176,7 @@ class HRuleView extends InlineView
           return 640;
       }
     else
-      return HEIGHT;     
+      return HEIGHT;
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/text/html/HTMLDocument.java b/libjava/classpath/javax/swing/text/html/HTMLDocument.java
index f3d3ce3faaf..9545be4e8f3 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLDocument.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLDocument.java
@@ -76,7 +76,7 @@ import javax.swing.text.html.HTML.Tag;
  * data structure when it is needed to parse HTML and then obtain the content of
  * the certain types of tags. This class also has methods for modifying the HTML
  * content.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  * @author Anthony Balkissoon (abalkiss@redhat.com)
  * @author Lillian Angel (langel@redhat.com)
@@ -85,7 +85,7 @@ public class HTMLDocument extends DefaultStyledDocument
 {
   /** A key for document properies.  The value for the key is
    * a Vector of Strings of comments not found in the body.
-   */  
+   */
   public static final String AdditionalComments = "AdditionalComments";
   URL baseURL = null;
   boolean preservesUnknownTags = true;
@@ -110,22 +110,22 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     this(new GapContent(BUFFER_SIZE_DEFAULT), new StyleSheet());
   }
-  
+
   /**
-   * Constructs an HTML document with the default content storage 
+   * Constructs an HTML document with the default content storage
    * implementation and the specified style/attribute storage mechanism.
-   * 
+   *
    * @param styles - the style sheet
    */
   public HTMLDocument(StyleSheet styles)
   {
    this(new GapContent(BUFFER_SIZE_DEFAULT), styles);
   }
-  
+
   /**
-   * Constructs an HTML document with the given content storage implementation 
+   * Constructs an HTML document with the given content storage implementation
    * and the given style/attribute storage mechanism.
-   * 
+   *
    * @param c - the document's content
    * @param styles - the style sheet
    */
@@ -133,21 +133,21 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     super(c, styles);
   }
-  
+
   /**
-   * Gets the style sheet with the document display rules (CSS) that were specified 
+   * Gets the style sheet with the document display rules (CSS) that were specified
    * in the HTML document.
-   * 
+   *
    * @return - the style sheet
    */
   public StyleSheet getStyleSheet()
   {
     return (StyleSheet) getAttributeContext();
   }
-  
+
   /**
    * This method creates a root element for the new document.
-   * 
+   *
    * @return the new default root
    */
   protected AbstractElement createDefaultRoot()
@@ -180,12 +180,12 @@ public class HTMLDocument extends DefaultStyledDocument
 
     return html;
   }
-  
+
   /**
    * This method returns an HTMLDocument.RunElement object attached to
-   * parent representing a run of text from p0 to p1. The run has 
+   * parent representing a run of text from p0 to p1. The run has
    * attributes described by a.
-   * 
+   *
    * @param parent - the parent element
    * @param a - the attributes for the element
    * @param p0 - the beginning of the range >= 0
@@ -202,7 +202,7 @@ public class HTMLDocument extends DefaultStyledDocument
   /**
    * This method returns an HTMLDocument.BlockElement object representing the
    * attribute set a and attached to parent.
-   * 
+   *
    * @param parent - the parent element
    * @param a - the attributes for the element
    *
@@ -212,20 +212,20 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     return new BlockElement(parent, a);
   }
-  
+
   /**
    * Returns the parser used by this HTMLDocument to insert HTML.
-   * 
+   *
    * @return the parser used by this HTMLDocument to insert HTML.
    */
   public HTMLEditorKit.Parser getParser()
   {
-    return parser; 
+    return parser;
   }
-  
+
   /**
    * Sets the parser used by this HTMLDocument to insert HTML.
-   * 
+   *
    * @param p the parser to use
    */
   public void setParser (HTMLEditorKit.Parser p)
@@ -235,25 +235,25 @@ public class HTMLDocument extends DefaultStyledDocument
   /**
    * Sets the number of tokens to buffer before trying to display the
    * Document.
-   * 
+   *
    * @param n the number of tokens to buffer
    */
   public void setTokenThreshold (int n)
   {
     tokenThreshold = n;
   }
-  
+
   /**
    * Returns the number of tokens that are buffered before the document
    * is rendered.
-   * 
+   *
    * @return the number of tokens buffered
    */
   public int getTokenThreshold ()
   {
     return tokenThreshold;
   }
-  
+
   /**
    * Returns the location against which to resolve relative URLs.
    * This is the document's URL if the document was loaded from a URL.
@@ -264,7 +264,7 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     return baseURL;
   }
-  
+
   /**
    * Sets the location against which to resolve relative URLs.
    * @param u the new base URL
@@ -274,7 +274,7 @@ public class HTMLDocument extends DefaultStyledDocument
     baseURL = u;
     getStyleSheet().setBase(u);
   }
-  
+
   /**
    * Returns whether or not the parser preserves unknown HTML tags.
    * @return true if the parser preserves unknown tags
@@ -283,7 +283,7 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     return preservesUnknownTags;
   }
-  
+
   /**
    * Sets the behaviour of the parser when it encounters unknown HTML tags.
    * @param preservesTags true if the parser should preserve unknown tags.
@@ -292,7 +292,7 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     preservesUnknownTags = preservesTags;
   }
-  
+
   /**
    * An iterator to iterate through LeafElements in the document.
    */
@@ -308,7 +308,7 @@ public class HTMLDocument extends DefaultStyledDocument
       tag = t;
       it = new ElementIterator(doc);
     }
-    
+
     /**
      * Return the attributes for the tag associated with this iteartor
      * @return the AttributeSet
@@ -464,7 +464,7 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     int start = el.getStartOffset();
     int end = el.getEndOffset();
-    
+
     StringBuilder html = new StringBuilder();
     html.append("AttributeSet (null if none found).
      */
     public abstract AttributeSet getAttributes();
-    
+
     /**
      * Get the end of the range for the current occurrence of the tag
      * being defined and having the same attributes.
      * @return the end of the range
      */
     public abstract int getEndOffset();
-    
+
     /**
      * Get the start of the range for the current occurrence of the tag
      * being defined and having the same attributes.
      * @return the start of the range (-1 if it can't be found).
      */
     public abstract int getStartOffset();
-    
+
     /**
      * Move the iterator forward.
      */
     public abstract void next();
-    
+
     /**
      * Indicates whether or not the iterator currently represents an occurrence
      * of the tag.
@@ -537,33 +537,33 @@ public class HTMLDocument extends DefaultStyledDocument
      * tag.
      */
     public abstract boolean isValid();
-    
+
     /**
      * Type of tag this iterator represents.
      * @return the tag.
      */
     public abstract HTML.Tag getTag();
   }
-  
+
   public class BlockElement extends AbstractDocument.BranchElement
   {
     public BlockElement (Element parent, AttributeSet a)
     {
       super(parent, a);
     }
-    
+
     /**
-     * Gets the resolving parent.  Since HTML attributes are not 
+     * Gets the resolving parent.  Since HTML attributes are not
      * inherited at the model level, this returns null.
      */
     public AttributeSet getResolveParent()
     {
       return null;
     }
-    
+
     /**
      * Gets the name of the element.
-     * 
+     *
      * @return the name of the element if it exists, null otherwise.
      */
     public String getName()
@@ -579,29 +579,29 @@ public class HTMLDocument extends DefaultStyledDocument
   }
 
   /**
-   * RunElement represents a section of text that has a set of 
+   * RunElement represents a section of text that has a set of
    * HTML character level attributes assigned to it.
    */
   public class RunElement extends AbstractDocument.LeafElement
   {
-    
+
     /**
      * Constructs an element that has no children. It represents content
      * within the document.
-     * 
+     *
      * @param parent - parent of this
      * @param a - elements attributes
      * @param start - the start offset >= 0
-     * @param end - the end offset 
+     * @param end - the end offset
      */
     public RunElement(Element parent, AttributeSet a, int start, int end)
     {
       super(parent, a, start, end);
     }
-    
+
     /**
      * Gets the name of the element.
-     * 
+     *
      * @return the name of the element if it exists, null otherwise.
      */
     public String getName()
@@ -614,11 +614,11 @@ public class HTMLDocument extends DefaultStyledDocument
         name = super.getName();
       return name;
     }
-    
+
     /**
      * Gets the resolving parent. HTML attributes do not inherit at the
      * model level, so this method returns null.
-     * 
+     *
      * @return null
      */
     public AttributeSet getResolveParent()
@@ -626,10 +626,10 @@ public class HTMLDocument extends DefaultStyledDocument
       return null;
     }
   }
-  
+
   /**
    * A reader to load an HTMLDocument with HTML structure.
-   * 
+   *
    * @author Anthony Balkissoon abalkiss at redhat dot com
    */
   public class HTMLReader extends HTMLEditorKit.ParserCallback
@@ -648,51 +648,51 @@ public class HTMLDocument extends DefaultStyledDocument
      * Holds the current character attribute set *
      */
     protected MutableAttributeSet charAttr = new SimpleAttributeSet();
-    
-    protected Vector parseBuffer = new Vector();   
+
+    protected Vector parseBuffer = new Vector();
 
     /**
      * The parse stack. It holds the current element tree path.
      */
     private Stack parseStack = new Stack();
 
-    /** 
+    /**
      * A stack for character attribute sets *
      */
     Stack charAttrStack = new Stack();
-   
+
     /** A mapping between HTML.Tag objects and the actions that handle them **/
     HashMap tagToAction;
-    
+
     /** Tells us whether we've received the '' tag yet **/
     boolean endHTMLEncountered = false;
-    
-    /** 
-     * Related to the constructor with explicit insertTag 
-     */
-    int popDepth;
-    
+
     /**
      * Related to the constructor with explicit insertTag
-     */    
-    int pushDepth;
-    
-    /** 
+     */
+    int popDepth;
+
+    /**
      * Related to the constructor with explicit insertTag
-     */    
+     */
+    int pushDepth;
+
+    /**
+     * Related to the constructor with explicit insertTag
+     */
     int offset;
-    
+
     /**
      * The tag (inclusve), after that the insertion should start.
      */
     HTML.Tag insertTag;
-    
+
     /**
      * This variable becomes true after the insert tag has been encountered.
      */
     boolean insertTagEncountered;
 
-    
+
     /** A temporary variable that helps with the printing out of debug information **/
     boolean debug = false;
 
@@ -767,7 +767,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.  By default does nothing.
@@ -779,7 +779,7 @@ public class HTMLDocument extends DefaultStyledDocument
     }
 
     public class BlockAction extends TagAction
-    {      
+    {
       /**
        * This method is called when a start tag is seen for one of the types
        * of tags associated with this Action.
@@ -789,7 +789,7 @@ public class HTMLDocument extends DefaultStyledDocument
         // Tell the parse buffer to open a new block for this tag.
         blockOpen(t, a);
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -800,7 +800,7 @@ public class HTMLDocument extends DefaultStyledDocument
         blockClose(t);
       }
     }
-    
+
     public class CharacterAction extends TagAction
     {
       /**
@@ -827,7 +827,7 @@ public class HTMLDocument extends DefaultStyledDocument
       public void end(HTML.Tag t)
       {
         popCharacterStyle();
-      } 
+      }
     }
 
     /**
@@ -909,7 +909,7 @@ public class HTMLDocument extends DefaultStyledDocument
             super.start(t, a);
           }
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1012,7 +1012,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         super.end(t);
         buttonGroups = null;
-      } 
+      }
     }
 
     /**
@@ -1035,7 +1035,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         blockOpen(t, a);
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1043,7 +1043,7 @@ public class HTMLDocument extends DefaultStyledDocument
       public void end(HTML.Tag t)
       {
         blockClose(t);
-      } 
+      }
     }
 
     /**
@@ -1062,7 +1062,7 @@ public class HTMLDocument extends DefaultStyledDocument
         blockClose(HTML.Tag.IMPLIED);
       }
     }
-    
+
     public class ParagraphAction extends BlockAction
     {
       /**
@@ -1073,7 +1073,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         super.start(t, a);
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1081,7 +1081,7 @@ public class HTMLDocument extends DefaultStyledDocument
       public void end(HTML.Tag t)
       {
         super.end(t);
-      } 
+      }
     }
 
     /**
@@ -1100,7 +1100,7 @@ public class HTMLDocument extends DefaultStyledDocument
         a.addAttribute(CSS.Attribute.WHITE_SPACE, "pre");
         blockOpen(HTML.Tag.IMPLIED, a);
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1110,11 +1110,11 @@ public class HTMLDocument extends DefaultStyledDocument
         blockClose(HTML.Tag.IMPLIED);
         inPreTag = false;
         blockClose(t);
-      } 
+      }
     }
-    
+
     /**
-     * Inserts the elements that are represented by ths single tag with 
+     * Inserts the elements that are represented by ths single tag with
      * attributes (only). The closing tag, even if present, mut follow
      * immediately after the starting tag without providing any additional
      * information. Hence the {@link TagAction#end} method need not be
@@ -1130,7 +1130,7 @@ public class HTMLDocument extends DefaultStyledDocument
         addSpecialElement(t, a);
       }
     }
-    
+
     class AreaAction extends TagAction
     {
       /**
@@ -1142,7 +1142,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         // FIXME: Implement.
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1151,7 +1151,7 @@ public class HTMLDocument extends DefaultStyledDocument
         throws NotImplementedException
       {
         // FIXME: Implement.
-      } 
+      }
     }
 
     /**
@@ -1200,7 +1200,7 @@ public class HTMLDocument extends DefaultStyledDocument
         baseTarget = (String) a.getAttribute(HTML.Attribute.TARGET);
       }
     }
-    
+
     class HeadAction extends BlockAction
     {
       /**
@@ -1213,7 +1213,7 @@ public class HTMLDocument extends DefaultStyledDocument
         // FIXME: Implement.
         super.start(t, a);
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1234,7 +1234,7 @@ public class HTMLDocument extends DefaultStyledDocument
         super.end(t);
       }
     }
-    
+
     class LinkAction extends HiddenAction
     {
       /**
@@ -1295,13 +1295,13 @@ public class HTMLDocument extends DefaultStyledDocument
                             ex.printStackTrace();
                           }
                       }
-                  }                  
+                  }
               }
           }
       }
-      
+
     }
-    
+
     class MapAction extends TagAction
     {
       /**
@@ -1313,7 +1313,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         // FIXME: Implement.
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1322,9 +1322,9 @@ public class HTMLDocument extends DefaultStyledDocument
         throws NotImplementedException
       {
         // FIXME: Implement.
-      } 
+      }
     }
-    
+
     class MetaAction extends TagAction
     {
       /**
@@ -1336,7 +1336,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         // FIXME: Implement.
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1345,7 +1345,7 @@ public class HTMLDocument extends DefaultStyledDocument
         throws NotImplementedException
       {
         // FIXME: Implement.
-      } 
+      }
     }
 
     class StyleAction extends TagAction
@@ -1358,7 +1358,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         inStyleTag = true;
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1366,9 +1366,9 @@ public class HTMLDocument extends DefaultStyledDocument
       public void end(HTML.Tag t)
       {
         inStyleTag = false;
-      } 
+      }
     }
-    
+
     class TitleAction extends TagAction
     {
       /**
@@ -1380,7 +1380,7 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         // FIXME: Implement.
       }
-      
+
       /**
        * Called when an end tag is seen for one of the types of tags associated
        * with this Action.
@@ -1389,14 +1389,14 @@ public class HTMLDocument extends DefaultStyledDocument
         throws NotImplementedException
       {
         // FIXME: Implement.
-      } 
-    }    
-    
+      }
+    }
+
     public HTMLReader(int offset)
     {
       this (offset, 0, 0, null);
     }
-    
+
     public HTMLReader(int offset, int popDepth, int pushDepth,
                       HTML.Tag insertTag)
     {
@@ -1407,7 +1407,7 @@ public class HTMLDocument extends DefaultStyledDocument
       threshold = getTokenThreshold();
       initTags();
     }
-    
+
     void initTags()
     {
       tagToAction = new HashMap(72);
@@ -1427,7 +1427,7 @@ public class HTMLDocument extends DefaultStyledDocument
       MetaAction metaAction = new MetaAction();
       StyleAction styleAction = new StyleAction();
       TitleAction titleAction = new TitleAction();
-      
+
       ConvertAction convertAction = new ConvertAction();
       tagToAction.put(HTML.Tag.A, characterAction);
       tagToAction.put(HTML.Tag.ADDRESS, characterAction);
@@ -1486,7 +1486,7 @@ public class HTMLDocument extends DefaultStyledDocument
       tagToAction.put(HTML.Tag.SELECT, formAction);
       tagToAction.put(HTML.Tag.SMALL, characterAction);
       tagToAction.put(HTML.Tag.STRIKE, characterAction);
-      tagToAction.put(HTML.Tag.S, characterAction);      
+      tagToAction.put(HTML.Tag.S, characterAction);
       tagToAction.put(HTML.Tag.STRONG, characterAction);
       tagToAction.put(HTML.Tag.STYLE, styleAction);
       tagToAction.put(HTML.Tag.SUB, characterAction);
@@ -1502,7 +1502,7 @@ public class HTMLDocument extends DefaultStyledDocument
       tagToAction.put(HTML.Tag.UL, blockAction);
       tagToAction.put(HTML.Tag.VAR, characterAction);
     }
-    
+
     /**
      * Pushes the current character style onto the stack.
      *
@@ -1511,9 +1511,9 @@ public class HTMLDocument extends DefaultStyledDocument
     {
       charAttrStack.push(charAttr.copyAttributes());
     }
-    
+
     /**
-     * Pops a character style off of the stack and uses it as the 
+     * Pops a character style off of the stack and uses it as the
      * current character style.
      *
      */
@@ -1522,12 +1522,12 @@ public class HTMLDocument extends DefaultStyledDocument
       if (!charAttrStack.isEmpty())
         charAttr = (MutableAttributeSet) charAttrStack.pop();
     }
-    
+
     /**
      * Registers a given tag with a given Action.  All of the well-known tags
      * are registered by default, but this method can change their behaviour
      * or add support for custom or currently unsupported tags.
-     * 
+     *
      * @param t the Tag to register
      * @param a the Action for the Tag
      */
@@ -1535,7 +1535,7 @@ public class HTMLDocument extends DefaultStyledDocument
     {
       tagToAction.put (t, a);
     }
-    
+
     /**
      * This is the last method called on the HTMLReader, allowing any pending
      * changes to be flushed to the HTMLDocument.
@@ -1565,9 +1565,9 @@ public class HTMLDocument extends DefaultStyledDocument
     }
 
     /**
-     * This method is called by the parser to indicate a block of 
+     * This method is called by the parser to indicate a block of
      * text was encountered.  Should insert the text appropriately.
-     * 
+     *
      * @param data the text that was inserted
      * @param pos the position at which the text was inserted
      */
@@ -1589,15 +1589,15 @@ public class HTMLDocument extends DefaultStyledDocument
             }
           else
             addContent(data, 0, data.length);
-            
+
         }
     }
-    
+
     /**
      * Checks if the HTML tag should be inserted. The tags before insert tag (if
      * specified) are not inserted. Also, the tags after the end of the html are
      * not inserted.
-     * 
+     *
      * @return true if the tag should be inserted, false otherwise.
      */
     private boolean shouldInsert()
@@ -1605,11 +1605,11 @@ public class HTMLDocument extends DefaultStyledDocument
       return ! endHTMLEncountered
              && (insertTagEncountered || insertTag == null);
     }
-    
+
     /**
      * This method is called by the parser and should route the call to the
      * proper handler for the tag.
-     * 
+     *
      * @param t the HTML.Tag
      * @param a the attribute set
      * @param pos the position at which the tag was encountered
@@ -1626,10 +1626,10 @@ public class HTMLDocument extends DefaultStyledDocument
             action.start(t, a);
         }
     }
-    
+
     /**
      * This method called by parser to handle a comment block.
-     * 
+     *
      * @param data the comment
      * @param pos the position at which the comment was encountered
      */
@@ -1645,11 +1645,11 @@ public class HTMLDocument extends DefaultStyledDocument
             }
         }
     }
-    
+
     /**
      * This method is called by the parser and should route the call to the
      * proper handler for the tag.
-     * 
+     *
      * @param t the HTML.Tag
      * @param pos the position at which the tag was encountered
      */
@@ -1666,11 +1666,11 @@ public class HTMLDocument extends DefaultStyledDocument
             action.end(t);
         }
     }
-    
+
     /**
      * This is a callback from the parser that should be routed to the
      * appropriate handler for the tag.
-     * 
+     *
      * @param t the HTML.Tag that was encountered
      * @param a the attribute set
      * @param pos the position at which the tag was encountered
@@ -1690,12 +1690,12 @@ public class HTMLDocument extends DefaultStyledDocument
             }
         }
     }
-    
+
     /**
      * This is invoked after the stream has been parsed but before it has been
      * flushed.
-     * 
-     * @param eol one of \n, \r, or \r\n, whichever was encountered the most in 
+     *
+     * @param eol one of \n, \r, or \r\n, whichever was encountered the most in
      * parsing the stream
      * @since 1.3
      */
@@ -1703,11 +1703,11 @@ public class HTMLDocument extends DefaultStyledDocument
     {
       // FIXME: Implement.
     }
-    
+
     /**
      * Adds the given text to the textarea document.  Called only when we are
-     * within a textarea.  
-     * 
+     * within a textarea.
+     *
      * @param data the text to add to the textarea
      */
     protected void textAreaContent(char[] data)
@@ -1726,7 +1726,7 @@ public class HTMLDocument extends DefaultStyledDocument
           assert false;
         }
     }
-    
+
     /**
      * Adds the given text that was encountered in a 
                     element.
      * This adds synthesized lines to hold the text runs.
@@ -1754,11 +1754,11 @@ public class HTMLDocument extends DefaultStyledDocument
           addContent(data, start, data.length - start);
         }
     }
-    
+
     /**
-     * Instructs the parse buffer to create a block element with the given 
+     * Instructs the parse buffer to create a block element with the given
      * attributes.
-     * 
+     *
      * @param t the tag that requires opening a new block
      * @param attr the attribute set for the new block
      */
@@ -1809,9 +1809,9 @@ public class HTMLDocument extends DefaultStyledDocument
     }
 
     /**
-     * Instructs the parse buffer to close the block element associated with 
+     * Instructs the parse buffer to close the block element associated with
      * the given HTML.Tag
-     * 
+     *
      * @param t the HTML.Tag that is closing its block
      */
     protected void blockClose(HTML.Tag t)
@@ -1837,14 +1837,14 @@ public class HTMLDocument extends DefaultStyledDocument
         }
 
       element = new DefaultStyledDocument.ElementSpec(null,
-				DefaultStyledDocument.ElementSpec.EndTagType);
+                                DefaultStyledDocument.ElementSpec.EndTagType);
       parseBuffer.addElement(element);
     }
-    
+
     /**
      * Adds text to the appropriate context using the current character
      * attribute set.
-     * 
+     *
      * @param data the text to add
      * @param offs the offset at which to add it
      * @param length the length of the text to add
@@ -1853,11 +1853,11 @@ public class HTMLDocument extends DefaultStyledDocument
     {
       addContent(data, offs, length, true);
     }
-    
+
     /**
      * Adds text to the appropriate context using the current character
      * attribute set, and possibly generating an IMPLIED Tag if necessary.
-     * 
+     *
      * @param data the text to add
      * @param offs the offset at which to add it
      * @param length the length of the text to add
@@ -1876,7 +1876,7 @@ public class HTMLDocument extends DefaultStyledDocument
       DefaultStyledDocument.ElementSpec element;
       AttributeSet attributes = null;
 
-      // Copy the attribute set, don't use the same object because 
+      // Copy the attribute set, don't use the same object because
       // it may change
       if (charAttr != null)
         attributes = charAttr.copyAttributes();
@@ -1887,7 +1887,7 @@ public class HTMLDocument extends DefaultStyledDocument
       element = new DefaultStyledDocument.ElementSpec(attributes,
                                 DefaultStyledDocument.ElementSpec.ContentType,
                                 data, offs, length);
-      
+
       // Add the element to the buffer
       parseBuffer.addElement(element);
 
@@ -1905,10 +1905,10 @@ public class HTMLDocument extends DefaultStyledDocument
             }
         }
     }
-    
+
     /**
      * Adds content that is specified in the attribute set.
-     * 
+     *
      * @param t the HTML.Tag
      * @param a the attribute set specifying the special content
      */
@@ -1920,37 +1920,37 @@ public class HTMLDocument extends DefaultStyledDocument
         }
 
       a.addAttribute(StyleConstants.NameAttribute, t);
-      
+
       // The two spaces are required because some special elements like HR
       // must be broken. At least two characters are needed to break into the
       // two parts.
       DefaultStyledDocument.ElementSpec spec =
         new DefaultStyledDocument.ElementSpec(a.copyAttributes(),
-	  DefaultStyledDocument.ElementSpec.ContentType, 
+          DefaultStyledDocument.ElementSpec.ContentType,
           new char[] {' '}, 0, 1 );
       parseBuffer.add(spec);
     }
-    
+
   }
-  
+
   /**
-   * Gets the reader for the parser to use when loading the document with HTML. 
-   * 
+   * Gets the reader for the parser to use when loading the document with HTML.
+   *
    * @param pos - the starting position
    * @return - the reader
    */
   public HTMLEditorKit.ParserCallback getReader(int pos)
   {
     return new HTMLReader(pos);
-  }  
-  
+  }
+
   /**
-   * Gets the reader for the parser to use when loading the document with HTML. 
-   * 
+   * Gets the reader for the parser to use when loading the document with HTML.
+   *
    * @param pos - the starting position
    * @param popDepth - the number of EndTagTypes to generate before inserting
-   * @param pushDepth - the number of StartTagTypes with a direction 
-   * of JoinNextDirection that should be generated before inserting, 
+   * @param pushDepth - the number of StartTagTypes with a direction
+   * of JoinNextDirection that should be generated before inserting,
    * but after the end tags have been generated.
    * @param insertTag - the first tag to start inserting into document
    * @return - the reader
@@ -1962,13 +1962,13 @@ public class HTMLDocument extends DefaultStyledDocument
   {
     return new HTMLReader(pos, popDepth, pushDepth, insertTag);
   }
-  
+
   /**
    * Gets the reader for the parser to use when inserting the HTML fragment into
    * the document. Checks if the parser is present, sets the parent in the
    * element stack and removes any actions for BODY (it can be only one body in
    * a HTMLDocument).
-   * 
+   *
    * @param pos - the starting position
    * @param popDepth - the number of EndTagTypes to generate before inserting
    * @param pushDepth - the number of StartTagTypes with a direction of
@@ -2009,14 +2009,14 @@ public class HTMLDocument extends DefaultStyledDocument
           super.handleEndTag(t, pos);
       }
     };
-      
+
     return reader;
-  }   
-  
+  }
+
   /**
    * Gets the child element that contains the attribute with the value or null.
    * Not thread-safe.
-   * 
+   *
    * @param e - the element to begin search at
    * @param attribute - the desired attribute
    * @param value - the desired value
@@ -2029,14 +2029,14 @@ public class HTMLDocument extends DefaultStyledDocument
       {
         if (e.getAttributes().containsAttribute(attribute, value))
           return e;
-        
+
         int count = e.getElementCount();
         for (int j = 0; j < count; j++)
           {
             Element child = e.getElement(j);
             if (child.getAttributes().containsAttribute(attribute, value))
               return child;
-            
+
             Element grandChild = getElement(child, attribute, value);
             if (grandChild != null)
               return grandChild;
@@ -2044,13 +2044,13 @@ public class HTMLDocument extends DefaultStyledDocument
       }
     return null;
   }
-  
+
   /**
    * Returns the element that has the given id Attribute (for instance, <p id
    * ='my paragraph >'). If it is not found, null is returned. The HTML tag,
    * having this attribute, is not checked by this method and can be any. The
    * method is not thread-safe.
-   * 
+   *
    * @param attrId - the value of the attribute id to look for
    * @return the element that has the given id.
    */
@@ -2059,25 +2059,25 @@ public class HTMLDocument extends DefaultStyledDocument
     return getElement(getDefaultRootElement(), HTML.Attribute.ID,
                       attrId);
   }
-  
+
   /**
    * Replaces the children of the given element with the contents of
    * the string. The document must have an HTMLEditorKit.Parser set.
    * This will be seen as at least two events, n inserts followed by a remove.
-   * 
+   *
    * @param elem - the brance element whose children will be replaced
    * @param htmlText - the string to be parsed and assigned to element.
    * @throws BadLocationException
    * @throws IOException
-   * @throws IllegalArgumentException - if elem is a leaf 
+   * @throws IllegalArgumentException - if elem is a leaf
    * @throws IllegalStateException - if an HTMLEditorKit.Parser has not been set
    */
-  public void setInnerHTML(Element elem, String htmlText) 
+  public void setInnerHTML(Element elem, String htmlText)
     throws BadLocationException, IOException
   {
     if (elem.isLeaf())
       throw new IllegalArgumentException("Element is a leaf");
-    
+
     int start = elem.getStartOffset();
     int end = elem.getEndOffset();
 
@@ -2086,18 +2086,18 @@ public class HTMLDocument extends DefaultStyledDocument
 
     // TODO charset
     getParser().parse(new StringReader(htmlText), reader, true);
-    
+
     // Remove the previous content
     remove(start, end - start);
   }
-  
+
   /**
    * Replaces the given element in the parent with the string. When replacing a
    * leaf, this will attempt to make sure there is a newline present if one is
    * needed. This may result in an additional element being inserted. This will
    * be seen as at least two events, n inserts followed by a remove. The
    * HTMLEditorKit.Parser must be set.
-   * 
+   *
    * @param elem - the branch element whose parent will be replaced
    * @param htmlText - the string to be parsed and assigned to elem
    * @throws BadLocationException
@@ -2112,18 +2112,18 @@ public void setOuterHTML(Element elem, String htmlText)
     int end = elem.getEndOffset();
 
     remove(start, end-start);
-       
+
     HTMLEditorKit.ParserCallback reader = getInsertingReader(
       start, 0, 0, HTML.Tag.BODY, elem);
 
     // TODO charset
     getParser().parse(new StringReader(htmlText), reader, true);
   }
-  
+
   /**
    * Inserts the string before the start of the given element. The parser must
    * be set.
-   * 
+   *
    * @param elem - the element to be the root for the new text.
    * @param htmlText - the string to be parsed and assigned to elem
    * @throws BadLocationException
@@ -2139,12 +2139,12 @@ public void setOuterHTML(Element elem, String htmlText)
     // TODO charset
     getParser().parse(new StringReader(htmlText), reader, true);
   }
-  
+
   /**
    * Inserts the string at the end of the element. If elem's children are
    * leaves, and the character at elem.getEndOffset() - 1 is a newline, then it
    * will be inserted before the newline. The parser must be set.
-   * 
+   *
    * @param elem - the element to be the root for the new text
    * @param htmlText - the text to insert
    * @throws BadLocationException
@@ -2161,11 +2161,11 @@ public void setOuterHTML(Element elem, String htmlText)
     getParser().parse(new StringReader(htmlText), reader, true);
 
   }
-  
+
   /**
    * Inserts the string after the end of the given element.
    * The parser must be set.
-   * 
+   *
    * @param elem - the element to be the root for the new text
    * @param htmlText - the text to insert
    * @throws BadLocationException
@@ -2181,11 +2181,11 @@ public void setOuterHTML(Element elem, String htmlText)
     // TODO charset
     getParser().parse(new StringReader(htmlText), reader, true);
   }
-  
+
   /**
    * Inserts the string at the start of the element.
    * The parser must be set.
-   * 
+   *
    * @param elem - the element to be the root for the new text
    * @param htmlText - the text to insert
    * @throws BadLocationException
diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
index 45381d60e87..e3505d3c21f 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
@@ -89,7 +89,7 @@ public class HTMLEditorKit
   extends StyledEditorKit
   implements Serializable, Cloneable, Accessible
 {
-  
+
   /**
    * Fires the hyperlink events on the associated component
    * when needed.
@@ -107,16 +107,16 @@ public class HTMLEditorKit
       /**
        * Constructor
        */
-      public LinkController() 
+      public LinkController()
       {
         super();
       }
-      
+
       /**
        * Dispatched when the mouse is clicked. If the component
        * is read-only, then the clicked event is used to drive an
        * attempt to follow the reference specified by a link
-       * 
+       *
        * @param e - the mouse event
        */
       public void mouseClicked(MouseEvent e)
@@ -130,20 +130,20 @@ public class HTMLEditorKit
               activateLink(pos, editor, e.getX(), e.getY());
           }
       }
-      
+
       /**
        * Dispatched when the mouse is dragged on a component.
-       * 
+       *
        * @param e - the mouse event.
        */
       public void mouseDragged(MouseEvent e)
       {
         // Nothing to do here.
       }
-      
+
       /**
        * Dispatched when the mouse cursor has moved into the component.
-       * 
+       *
        * @param e - the mouse event.
        */
       public void mouseMoved(MouseEvent e)
@@ -248,7 +248,7 @@ public class HTMLEditorKit
             if (event != null)
               editor.fireHyperlinkUpdate(event);
           }
-        
+
       }
 
       /**
@@ -275,7 +275,7 @@ public class HTMLEditorKit
           {
             URL base = doc.getBase();
             url = new URL(base, href);
-            
+
           }
         catch (MalformedURLException ex)
           {
@@ -303,11 +303,11 @@ public class HTMLEditorKit
         return ev;
       }
     }
-  
+
   /**
    * This class is used to insert a string of HTML into an existing
    * document. At least 2 HTML.Tags need to be supplied. The first Tag (parentTag)
-   * identifies the parent in the document to add the elements to. The second, (addTag), 
+   * identifies the parent in the document to add the elements to. The second, (addTag),
    * identifies that the first tag should be added to the document as seen in the string.
    * The parser will generate all appropriate (opening/closing tags_ even if they are not
    * in the HTML string passed in.
@@ -315,28 +315,28 @@ public class HTMLEditorKit
   public static class InsertHTMLTextAction
     extends HTMLTextAction
     {
-      
+
       /**
        * Tag in HTML to start adding tags from.
        */
       protected HTML.Tag addTag;
-      
+
       /**
        * Alternate tag in HTML to start adding tags from if parentTag is
        * not found and alternateParentTag is not found.
-       */      
+       */
       protected HTML.Tag alternateAddTag;
-      
+
       /**
        * Alternate tag to check if parentTag is not found.
        */
       protected HTML.Tag alternateParentTag;
-      
+
       /**
        * HTML to insert.
        */
       protected String html;
-      
+
       /**
        * Tag to check for in the document.
        */
@@ -344,21 +344,21 @@ public class HTMLEditorKit
 
       /**
        * Initializes all fields.
-       * 
+       *
        * @param name - the name of the document.
        * @param html - the html to insert
        * @param parentTag - the parent tag to check for
        * @param addTag - the tag to start adding from
        */
-      public InsertHTMLTextAction(String name, String html, 
+      public InsertHTMLTextAction(String name, String html,
                                   HTML.Tag parentTag, HTML.Tag addTag)
       {
         this(name, html, parentTag, addTag, null, null);
       }
-      
+
       /**
        * Initializes all fields and calls super
-       * 
+       *
        * @param name - the name of the document.
        * @param html - the html to insert
        * @param parentTag - the parent tag to check for
@@ -366,9 +366,9 @@ public class HTMLEditorKit
        * @param alternateParentTag - the alternate parent tag
        * @param alternateAddTag - the alternate add tag
        */
-      public InsertHTMLTextAction(String name, String html, HTML.Tag parentTag, 
-                                  HTML.Tag addTag, HTML.Tag alternateParentTag, 
-                                  HTML.Tag alternateAddTag) 
+      public InsertHTMLTextAction(String name, String html, HTML.Tag parentTag,
+                                  HTML.Tag addTag, HTML.Tag alternateParentTag,
+                                  HTML.Tag alternateAddTag)
       {
         super(name);
         // Fields are for easy access when the action is applied to an actual
@@ -379,11 +379,11 @@ public class HTMLEditorKit
         this.alternateParentTag = alternateParentTag;
         this.alternateAddTag = alternateAddTag;
       }
-      
+
       /**
        * HTMLEditorKit.insertHTML is called. If an exception is
        * thrown, it is wrapped in a RuntimeException and thrown.
-       * 
+       *
        * @param editor - the editor to use to get the editorkit
        * @param doc -
        *          the Document to insert the HTML into.
@@ -419,12 +419,12 @@ public class HTMLEditorKit
                                               + offset).initCause(ex);
           }
       }
-      
+
       /**
        * Invoked when inserting at a boundary. Determines the number of pops,
        * and then the number of pushes that need to be performed. The it calls
        * insertHTML.
-       * 
+       *
        * @param editor -
        *          the editor to use to get the editorkit
        * @param doc -
@@ -449,12 +449,12 @@ public class HTMLEditorKit
         insertAtBoundry(editor, doc, offset, insertElement,
                         html, parentTag, addTag);
       }
-      
+
       /**
-       * Invoked when inserting at a boundary. Determines the number of pops, 
+       * Invoked when inserting at a boundary. Determines the number of pops,
        * and then the number of pushes that need to be performed. The it calls
        * insertHTML.
-       * 
+       *
        * @param editor - the editor to use to get the editorkit
        * @param doc -
        *          the Document to insert the HTML into.
@@ -464,7 +464,7 @@ public class HTMLEditorKit
        * @param html - the html to insert
        * @param parentTag - the parent tag
        * @param addTag - the first tag
-       * 
+       *
        * @deprecated as of v1.3, use insertAtBoundary
        */
       protected void insertAtBoundry(JEditorPane editor,
@@ -518,10 +518,10 @@ public class HTMLEditorKit
             insertHTML(editor, doc, offset, html, pops, pushes, addTag);
           }
       }
-      
+
       /**
        * Inserts the HTML.
-       * 
+       *
        * @param ae - the action performed
        */
       public void actionPerformed(ActionEvent ae)
@@ -619,25 +619,25 @@ public class HTMLEditorKit
           }
       }
   }
-  
+
   /**
    * Abstract Action class that helps inserting HTML into an existing document.
    */
   public abstract static class HTMLTextAction
     extends StyledEditorKit.StyledTextAction
     {
-      
+
       /**
        * Constructor
        */
-      public HTMLTextAction(String name) 
+      public HTMLTextAction(String name)
       {
         super(name);
       }
-      
+
       /**
        * Gets the HTMLDocument from the JEditorPane.
-       * 
+       *
        * @param e - the editor pane
        * @return the html document.
        */
@@ -648,25 +648,25 @@ public class HTMLEditorKit
           return (HTMLDocument) d;
         throw new IllegalArgumentException("Document is not a HTMLDocument.");
       }
-      
+
       /**
        * Gets the HTMLEditorKit
-       *  
+       *
        * @param e - the JEditorPane to get the HTMLEditorKit from.
        * @return the HTMLEditorKit
        */
-      protected HTMLEditorKit getHTMLEditorKit(JEditorPane e) 
+      protected HTMLEditorKit getHTMLEditorKit(JEditorPane e)
       {
         EditorKit d = e.getEditorKit();
         if (d instanceof HTMLEditorKit)
           return (HTMLEditorKit) d;
         throw new IllegalArgumentException("EditorKit is not a HTMLEditorKit.");
       }
-      
+
       /**
        * Returns an array of Elements that contain the offset.
        * The first elements corresponds to the roots of the doc.
-       * 
+       *
        * @param doc - the document to get the Elements from.
        * @param offset - the offset the Elements must contain
        * @return an array of all the elements containing the offset.
@@ -676,7 +676,7 @@ public class HTMLEditorKit
       {
         return getElementsAt(doc.getDefaultRootElement(), offset, 0);
       }
-      
+
       /**
        * Helper function to get all elements using recursion.
        */
@@ -697,12 +697,12 @@ public class HTMLEditorKit
           }
         return elements;
       }
-      
+
       /**
        * Returns the number of elements, starting at the deepest point, needed
        * to get an element representing tag. -1 if no elements are found, 0 if
        * the parent of the leaf at offset represents the tag.
-       * 
+       *
        * @param doc -
        *          the document to search
        * @param offset -
@@ -718,7 +718,7 @@ public class HTMLEditorKit
         Element root = doc.getDefaultRootElement();
         int num = -1;
         Element next = root.getElement(root.getElementIndex(offset));
-        
+
         while (!next.isLeaf())
           {
             num++;
@@ -729,11 +729,11 @@ public class HTMLEditorKit
           }
         return num;
       }
-      
+
       /**
        * Gets the deepest element at offset with the
        * matching tag.
-       * 
+       *
        * @param doc - the document to search
        * @param offset - the offset to check for
        * @param tag - the tag to match
@@ -744,7 +744,7 @@ public class HTMLEditorKit
       {
         Element element = doc.getDefaultRootElement();
         Element tagElement = null;
-        
+
         while (element != null)
           {
             Object otag = element.getAttributes().getAttribute(
@@ -753,11 +753,11 @@ public class HTMLEditorKit
               tagElement = element;
             element = element.getElement(element.getElementIndex(offset));
           }
-        
+
         return tagElement;
       }
     }
-  
+
   /**
    * A {@link ViewFactory} that is able to create {@link View}s for
    * the Elements that are supported.
@@ -765,7 +765,7 @@ public class HTMLEditorKit
   public static class HTMLFactory
     implements ViewFactory
   {
-    
+
     /**
      * Constructor
      */
@@ -773,7 +773,7 @@ public class HTMLEditorKit
     {
       // Do Nothing here.
     }
-    
+
     /**
      * Creates a {@link View} for the specified Element.
      *
@@ -815,7 +815,7 @@ public class HTMLEditorKit
             view = new BlockView(element, View.X_AXIS);
           else if (tag == HTML.Tag.IMG)
             view = new ImageView(element);
-          
+
           else if (tag == HTML.Tag.CONTENT)
             view = new InlineView(element);
           else if (tag == HTML.Tag.HEAD)
@@ -847,7 +847,7 @@ public class HTMLEditorKit
       return view;
     }
   }
-  
+
   /**
    * The abstract HTML parser declaration.
    */
@@ -888,7 +888,7 @@ public class HTMLEditorKit
     {
       // Nothing to do here.
     }
-    
+
     /**
      * The parser calls this method after it finishes parsing the document.
      */
@@ -1048,9 +1048,9 @@ public class HTMLEditorKit
    * The "ident paragraph right" action.
    */
   public static final String PARA_INDENT_RIGHT = "html-para-indent-right";
-  
+
   /**
-   * Actions for HTML 
+   * Actions for HTML
    */
   private static final Action[] defaultActions =
   {
@@ -1083,43 +1083,43 @@ public class HTMLEditorKit
                              "
                    ", HTML.Tag.BODY, HTML.Tag.PRE)
     // TODO: The reference impl has an InsertHRAction too.
   };
-  
+
   /**
    * The current style sheet.
    */
   private StyleSheet styleSheet;
-  
+
   /**
    * The ViewFactory for HTMLFactory.
    */
   HTMLFactory viewFactory;
-  
+
   /**
    * The Cursor for links.
    */
   Cursor linkCursor;
-  
+
   /**
    * The default cursor.
    */
   Cursor defaultCursor;
-  
+
   /**
    * The parser.
    */
   Parser parser;
-  
+
   /**
    * The mouse listener used for links.
    */
   private LinkController linkController;
-  
+
   /** The content type */
   String contentType = "text/html";
-  
+
   /** The input attributes defined by default.css */
   MutableAttributeSet inputAttributes;
-  
+
   /** The editor pane used. */
   JEditorPane editorPane;
 
@@ -1139,11 +1139,11 @@ public class HTMLEditorKit
     linkController = new LinkController();
     autoFormSubmission = true;
   }
-  
+
   /**
-   * Gets a factory suitable for producing views of any 
+   * Gets a factory suitable for producing views of any
    * models that are produced by this kit.
-   * 
+   *
    * @return the view factory suitable for producing views.
    */
   public ViewFactory getViewFactory()
@@ -1152,7 +1152,7 @@ public class HTMLEditorKit
       viewFactory = new HTMLFactory();
     return viewFactory;
   }
-  
+
   /**
    * Create a text storage model for this type of editor.
    *
@@ -1175,7 +1175,7 @@ public class HTMLEditorKit
   /**
    * Get the parser that this editor kit uses for reading HTML streams. This
    * method can be overridden to use the alternative parser.
-   * 
+   *
    * @return the HTML parser (by default, {@link ParserDelegator}).
    */
   protected Parser getParser()
@@ -1186,17 +1186,17 @@ public class HTMLEditorKit
       }
     return parser;
   }
-  
+
   /**
    * Inserts HTML into an existing document.
-   * 
+   *
    * @param doc - the Document to insert the HTML into.
    * @param offset - where to begin inserting the HTML.
    * @param html - the String to insert
-   * @param popDepth - the number of ElementSpec.EndTagTypes 
+   * @param popDepth - the number of ElementSpec.EndTagTypes
    * to generate before inserting
-   * @param pushDepth - the number of ElementSpec.StartTagTypes 
-   * with a direction of ElementSpec.JoinNextDirection that 
+   * @param pushDepth - the number of ElementSpec.StartTagTypes
+   * with a direction of ElementSpec.JoinNextDirection that
    * should be generated before
    * @param insertTag - the first tag to start inserting into document
    * @throws IOException - on any I/O error
@@ -1216,18 +1216,18 @@ public class HTMLEditorKit
     ParserCallback pc = doc.getReader(offset, popDepth, pushDepth, insertTag);
 
     // FIXME: What should ignoreCharSet be set to?
-    
+
     // parser.parse inserts html into the buffer
     parser.parse(new StringReader(html), pc, false);
     pc.flush();
   }
-  
+
   /**
-   * Inserts content from the given stream. Inserting HTML into a non-empty 
-   * document must be inside the body Element, if you do not insert into 
-   * the body an exception will be thrown. When inserting into a non-empty 
+   * Inserts content from the given stream. Inserting HTML into a non-empty
+   * document must be inside the body Element, if you do not insert into
+   * the body an exception will be thrown. When inserting into a non-empty
    * document all tags outside of the body (head, title) will be dropped.
-   * 
+   *
    * @param in - the stream to read from
    * @param doc - the destination for the insertion
    * @param pos - the location in the document to place the content
@@ -1245,14 +1245,14 @@ public class HTMLEditorKit
           throw new BadLocationException("Bad location", pos);
         if (parser == null)
           throw new IOException("Parser is null.");
-        
+
         HTMLDocument hd = ((HTMLDocument) doc);
         if (editorPane != null)
           hd.setBase(editorPane.getPage());
         ParserCallback pc = hd.getReader(pos);
-        
+
         // FIXME: What should ignoreCharSet be set to?
-        
+
         // parser.parse inserts html into the buffer
         parser.parse(in, pc, false);
         pc.flush();
@@ -1262,11 +1262,11 @@ public class HTMLEditorKit
       // the string is inserted in the document as usual.
       super.read(in, doc, pos);
   }
-  
+
   /**
-   * Writes content from a document to the given stream in 
+   * Writes content from a document to the given stream in
    * an appropriate format.
-   * 
+   *
    * @param out - the stream to write to
    * @param doc - the source for the write
    * @param pos - the location in the document to get the content.
@@ -1293,21 +1293,21 @@ public class HTMLEditorKit
     else
       super.write(out, doc, pos, len);
   }
-  
+
   /**
    * Gets the content type that the kit supports.
    * This kit supports the type text/html.
-   * 
+   *
    * @returns the content type supported.
    */
   public String getContentType()
   {
     return contentType;
-  } 
-  
+  }
+
   /**
    * Creates a copy of the editor kit.
-   * 
+   *
    * @return a copy of this.
    */
   public Object clone()
@@ -1317,12 +1317,12 @@ public class HTMLEditorKit
     copy.linkController = new LinkController();
     return copy;
   }
-  
+
   /**
-   * Copies the key/values in elements AttributeSet into set. 
+   * Copies the key/values in elements AttributeSet into set.
    * This does not copy component, icon, or element names attributes.
-   * This is called anytime the caret moves over a different location. 
-   * 
+   * This is called anytime the caret moves over a different location.
+   *
    * @param element - the element to create the input attributes for.
    * @param set - the set to copy the values into.
    */
@@ -1333,10 +1333,10 @@ public class HTMLEditorKit
     set.addAttributes(element.getAttributes());
     // FIXME: Not fully implemented.
   }
-  
+
   /**
    * Called when this is installed into the JEditorPane.
-   * 
+   *
    * @param c - the JEditorPane installed into.
    */
   public void install(JEditorPane c)
@@ -1346,11 +1346,11 @@ public class HTMLEditorKit
     c.addMouseMotionListener(linkController);
     editorPane = c;
   }
-  
+
   /**
    * Called when the this is removed from the JEditorPane.
    * It unregisters any listeners.
-   * 
+   *
    * @param c - the JEditorPane being removed from.
    */
   public void deinstall(JEditorPane c)
@@ -1360,35 +1360,35 @@ public class HTMLEditorKit
     c.removeMouseMotionListener(linkController);
     editorPane = null;
   }
-  
+
   /**
    * Gets the AccessibleContext associated with this.
-   * 
+   *
    * @return the AccessibleContext for this.
    */
   public AccessibleContext getAccessibleContext()
   {
-    // FIXME: Should return an instance of 
+    // FIXME: Should return an instance of
     // javax.swing.text.html.AccessibleHTML$RootHTMLAccessibleContext
     // Not implemented yet.
     return null;
   }
-  
+
   /**
    * Gets the action list. This list is supported by the superclass
    * augmented by the collection of actions defined locally for style
    * operations.
-   * 
+   *
    * @return an array of all the actions
    */
   public Action[] getActions()
   {
     return TextAction.augmentList(super.getActions(), defaultActions);
   }
-  
+
   /**
    * Returns the default cursor.
-   * 
+   *
    * @return the default cursor
    */
   public Cursor getDefaultCursor()
@@ -1397,10 +1397,10 @@ public class HTMLEditorKit
       defaultCursor = Cursor.getDefaultCursor();
     return defaultCursor;
   }
-  
+
   /**
    * Returns the cursor for links.
-   * 
+   *
    * @return the cursor for links.
    */
   public Cursor getLinkCursor()
@@ -1409,42 +1409,42 @@ public class HTMLEditorKit
       linkCursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
     return linkCursor;
   }
-  
+
   /**
    * Sets the Cursor for links.
-   * 
+   *
    * @param cursor - the new cursor for links.
    */
   public void setLinkCursor(Cursor cursor)
   {
     linkCursor = cursor;
   }
-  
+
   /**
    * Sets the default cursor.
-   * 
+   *
    * @param cursor - the new default cursor.
    */
   public void setDefaultCursor(Cursor cursor)
   {
     defaultCursor = cursor;
   }
-  
+
   /**
    * Gets the input attributes used for the styled editing actions.
-   * 
+   *
    * @return the attribute set
    */
   public MutableAttributeSet getInputAttributes()
   {
     return inputAttributes;
   }
-  
+
   /**
-   * Get the set of styles currently being used to render the HTML elements. 
-   * By default the resource specified by DEFAULT_CSS gets loaded, and is 
+   * Get the set of styles currently being used to render the HTML elements.
+   * By default the resource specified by DEFAULT_CSS gets loaded, and is
    * shared by all HTMLEditorKit instances.
-   * 
+   *
    * @return the style sheet.
    */
   public StyleSheet getStyleSheet()
@@ -1467,14 +1467,14 @@ public class HTMLEditorKit
       }
     return styleSheet;
   }
-  
+
   /**
-   * Set the set of styles to be used to render the various HTML elements. 
-   * These styles are specified in terms of CSS specifications. Each document 
-   * produced by the kit will have a copy of the sheet which it can add the 
-   * document specific styles to. By default, the StyleSheet specified is shared 
-   * by all HTMLEditorKit instances. 
-   * 
+   * Set the set of styles to be used to render the various HTML elements.
+   * These styles are specified in terms of CSS specifications. Each document
+   * produced by the kit will have a copy of the sheet which it can add the
+   * document specific styles to. By default, the StyleSheet specified is shared
+   * by all HTMLEditorKit instances.
+   *
    * @param s - the new style sheet
    */
   public void setStyleSheet(StyleSheet s)
@@ -1505,7 +1505,7 @@ public class HTMLEditorKit
 
   /**
    * Sets whether or not the editor kit should automatically submit forms.
-   *  
+   *
    * @param auto true when the editor kit should handle form
    *        submission, false otherwise
    *
diff --git a/libjava/classpath/javax/swing/text/html/HTMLWriter.java b/libjava/classpath/javax/swing/text/html/HTMLWriter.java
index 6a5e6ed58fe..55d25ccbb63 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLWriter.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLWriter.java
@@ -1,4 +1,4 @@
-/* HTMLWriter.java -- 
+/* HTMLWriter.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -76,7 +76,7 @@ public class HTMLWriter
   /**
    * We keep a reference of the HTMLDocument passed by the construct.
    */
-  private HTMLDocument htmlDoc = null; 
+  private HTMLDocument htmlDoc = null;
 
   /**
    * Used to keep track of which embedded has been written out.
@@ -84,10 +84,10 @@ public class HTMLWriter
   private HashSet openEmbeddedTagHashSet = null;
 
   private String new_line_str = "" + NEWLINE;
-    
+
   private char[] html_entity_char_arr = {'<',    '>',    '&',     '"'};
 
-  private String[] html_entity_escape_str_arr = {"<", ">", "&", 
+  private String[] html_entity_escape_str_arr = {"<", ">", "&",
                                                  """};
 
   // variables used to output Html Fragment
@@ -137,7 +137,7 @@ public class HTMLWriter
     doc_len_remaining = len;
     htmlFragmentParentHashSet = new HashSet();
   } // public HTMLWriter(Writer writer, HTMLDocument doc, int pos, int len)
-    
+
   /**
    * Call this method to start outputing HTML.
    *
@@ -155,7 +155,7 @@ public class HTMLWriter
         // Normal traversal.
         traverse(rootElem);
       } // if(doc_pos == -1 && doc_len == -1)
-    else    
+    else
       {
         // Html fragment traversal.
         if (doc_pos == -1 || doc_len == -1)
@@ -164,7 +164,7 @@ public class HTMLWriter
 
         startElem = htmlDoc.getCharacterElement(doc_pos);
 
-        int start_offset = startElem.getStartOffset(); 
+        int start_offset = startElem.getStartOffset();
 
         // Positions before start_offset will not be traversed, and thus
         // will not be counted.
@@ -206,7 +206,7 @@ public class HTMLWriter
       } // for(int i = 0; i < tag_arr.length; i++)
 
   } // public void write() throws IOException, BadLocationException
-  
+
   /**
    * Writes all the attributes in the attrSet, except for attrbutes with
    * keys of javax.swing.text.html.HTML.Tag,
@@ -226,7 +226,7 @@ public class HTMLWriter
       {
         Object key = attrNameEnum.nextElement();
         Object value = attrSet.getAttribute(key);
-            
+
         // HTML.Attribute.ENDTAG is an instance, not a class.
         if (!((key instanceof HTML.Tag) || (key instanceof StyleConstants)
           || (key == HTML.Attribute.ENDTAG)))
@@ -240,7 +240,7 @@ public class HTMLWriter
           } // if(!((key instanceof HTML.Tag) || (key instanceof
             //   StyleConstants) || (key == HTML.Attribute.ENDTAG)))
       } // while(attrNameEnum.hasMoreElements())
-        
+
   } // protected void writeAttributes(AttributeSet attrSet) throws IOException
 
   /**
@@ -266,10 +266,10 @@ public class HTMLWriter
       {
         writeRaw("");
       } // if(isBlockTag(attrSet))
-        
+
   } // protected void emptyTag(Element paramElem)
     //   throws IOException, BadLocationException
-    
+
   /**
    * Determines if it is a block tag or not.
    *
@@ -326,7 +326,7 @@ public class HTMLWriter
     writeAttributes(attrSet);
     writeRaw(">");
 
-    Document tempDocument = 
+    Document tempDocument =
       (Document) attrSet.getAttribute(StyleConstants.ModelAttribute);
 
     writeRaw(tempDocument.getText(0, tempDocument.getLength()));
@@ -528,9 +528,9 @@ public class HTMLWriter
   /**
    * Closes out an unwanted embedded tag. The tags from the
    *  openEmbededTagHashSet not found in attrSet will be written out.
-   * 
+   *
    *  @param attrSet the AttributeSet of the element to write out
-   * 
+   *
    *  @throws IOException on any I/O exceptions
    */
   protected void closeOutUnwantedEmbeddedTags(AttributeSet attrSet)
@@ -542,7 +542,7 @@ public class HTMLWriter
     for (int i = 0; i < tag_arr.length; i++)
       {
         HTML.Tag key = tag_arr[i];
-            
+
         if (!attrSet.isDefined(key))
           {
             writeRaw("");
@@ -592,10 +592,10 @@ public class HTMLWriter
 
   } // protected void output(char[] chars, int off, int len)
     //   throws IOException
- 
+
   //-------------------------------------------------------------------------
   // private methods
-  
+
   /**
    * The main method used to traverse through the elements.
    *
@@ -627,7 +627,7 @@ public class HTMLWriter
         else if (matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
           {
             int child_elem_count = currElem.getElementCount();
-                
+
             if (child_elem_count > 0)
               {
                 for (int i = 0; i < child_elem_count; i++)
@@ -665,7 +665,7 @@ public class HTMLWriter
                 indent();
                 writeRaw("");
 
-                String title_str = 
+                String title_str =
                   (String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
 
                 if (title_str != null)
@@ -726,7 +726,7 @@ public class HTMLWriter
             else
               {
                 emptyTag(currElem);
-              } // else 
+              } // else
             } // else
           } // else
 
@@ -842,7 +842,7 @@ public class HTMLWriter
             } // else if(matchNameAttribute(attrSet, HTML.Tag.IMPLIED))
         } // if(synthesizedElement(paramElem))
       else
-        { 
+        {
             // NOTE: 20061030 - fchoong - the isLeaf() condition seems to
             // generate the closest behavior to the RI.
             if (paramElem.isLeaf())
@@ -880,7 +880,7 @@ public class HTMLWriter
                   indent();
                   writeRaw("<title>");
 
-                  String title_str = 
+                  String title_str =
                     (String) htmlDoc.getProperty(HTMLDocument.TitleProperty);
 
                   if (title_str != null)
@@ -941,7 +941,7 @@ public class HTMLWriter
               else
                 {
                   emptyTag(currElem);
-                } // else 
+                } // else
             } // else
         } // else
 
diff --git a/libjava/classpath/javax/swing/text/html/ImageView.java b/libjava/classpath/javax/swing/text/html/ImageView.java
index bb6af4f451f..bdbe9b3bb99 100644
--- a/libjava/classpath/javax/swing/text/html/ImageView.java
+++ b/libjava/classpath/javax/swing/text/html/ImageView.java
@@ -26,8 +26,8 @@ import javax.swing.text.html.HTML.Attribute;
 
 /**
  * A view, representing a single image, represented by the HTML IMG tag.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class ImageView extends View
 {
@@ -51,7 +51,7 @@ public class ImageView extends View
       boolean ret = (flags & ALLBITS) != 0;
       return ret;
     }
-    
+
   }
 
   /**
@@ -64,7 +64,7 @@ public class ImageView extends View
    * The image icon, wrapping the image,
    */
   Image image;
- 
+
   /**
    * The image state.
    */
@@ -124,7 +124,7 @@ public class ImageView extends View
 
   /**
    * Creates the image view that represents the given element.
-   * 
+   *
    * @param element the element, represented by this image view.
    */
   public ImageView(Element element)
@@ -136,7 +136,7 @@ public class ImageView extends View
     reloadImage = true;
     loadOnDemand = false;
   }
- 
+
   /**
    * Load or reload the image. This method initiates the image reloading. After
    * the image is ready, the repaint event will be scheduled. The current image,
@@ -161,13 +161,13 @@ public class ImageView extends View
         loading = false;
       }
   }
-  
+
   /**
    * Get the image alignment. This method works handling standart alignment
    * attributes in the HTML IMG tag (align = top bottom middle left right).
    * Depending from the parameter, either horizontal or vertical alingment
    * information is returned.
-   * 
+   *
    * @param axis -
    *          either X_AXIS or Y_AXIS
    */
@@ -175,7 +175,7 @@ public class ImageView extends View
   {
     AttributeSet attrs = getAttributes();
     Object al = attrs.getAttribute(Attribute.ALIGN);
-    
+
     // Default is top left aligned.
     if (al == null)
       return 0.0f;
@@ -207,7 +207,7 @@ public class ImageView extends View
     else
       throw new IllegalArgumentException("axis " + axis);
   }
-  
+
   /**
    * Get the text that should be shown as the image replacement and also as the
    * image tool tip text. The method returns the value of the attribute, having
@@ -229,7 +229,7 @@ public class ImageView extends View
           return u.getFile();
       }
   }
-  
+
   /**
    * Returns the combination of the document and the style sheet attributes.
    */
@@ -239,7 +239,7 @@ public class ImageView extends View
       attributes = getStyleSheet().getViewAttributes(this);
     return attributes;
   }
-  
+
   /**
    * Get the image to render. May return null if the image is not yet loaded.
    */
@@ -248,13 +248,13 @@ public class ImageView extends View
     updateState();
     return image;
   }
-  
+
   /**
    * Get the URL location of the image to render. If this method returns null,
    * the "no image" icon is rendered instead. By defaul, url must be present as
    * the "src" property of the IMG tag. If it is missing, null is returned and
    * the "no image" icon is rendered.
-   * 
+   *
    * @return the URL location of the image to render.
    */
   public URL getImageURL()
@@ -280,17 +280,17 @@ public class ImageView extends View
   /**
    * Get the icon that should be displayed while the image is loading and hence
    * not yet available.
-   * 
+   *
    * @return an icon, showing a non broken sheet of paper with image.
    */
   public Icon getLoadingImageIcon()
   {
     return ImageViewIconFactory.getLoadingImageIcon();
   }
-  
+
   /**
    * Get the image loading strategy.
-   * 
+   *
    * @return false (default) if the image is loaded when the view is
    *         constructed, true if the image is only loaded on demand when
    *         rendering.
@@ -302,21 +302,21 @@ public class ImageView extends View
 
   /**
    * Get the icon that should be displayed when the image is not available.
-   * 
+   *
    * @return an icon, showing a broken sheet of paper with image.
    */
   public Icon getNoImageIcon()
   {
     return ImageViewIconFactory.getNoImageIcon();
   }
-  
+
   /**
    * Get the preferred span of the image along the axis. The image size is first
    * requested to the attributes {@link Attribute#WIDTH} and
    * {@link Attribute#HEIGHT}. If they are missing, and the image is already
    * loaded, the image size is returned. If there are no attributes, and the
    * image is not loaded, zero is returned.
-   * 
+   *
    * @param axis -
    *          either X_AXIS or Y_AXIS
    * @return either width of height of the image, depending on the axis.
@@ -346,10 +346,10 @@ public class ImageView extends View
     else
       throw new IllegalArgumentException("axis " + axis);
   }
-  
+
   /**
    * Get the associated style sheet from the document.
-   * 
+   *
    * @return the associated style sheet.
    */
   protected StyleSheet getStyleSheet()
@@ -361,7 +361,7 @@ public class ImageView extends View
   /**
    * Get the tool tip text. This is overridden to return the value of the
    * {@link #getAltText()}. The parameters are ignored.
-   * 
+   *
    * @return that is returned by getAltText().
    */
   public String getToolTipText(float x, float y, Shape shape)
@@ -373,7 +373,7 @@ public class ImageView extends View
    * Paints the image or one of the two image state icons. The image is resized
    * to the shape bounds. If there is no image available, the alternative text
    * is displayed besides the image state icon.
-   * 
+   *
    * @param g
    *          the Graphics, used for painting.
    * @param bounds
@@ -407,7 +407,7 @@ public class ImageView extends View
   {
     loadOnDemand = load_on_demand;
   }
- 
+
   /**
    * Update all cached properties from the attribute set, returned by the
    * {@link #getAttributes}.
@@ -429,7 +429,7 @@ public class ImageView extends View
         spans[Y_AXIS].setFontBases(emBase, exBase);
       }
   }
-  
+
   /**
    * Maps the picture co-ordinates into the image position in the model. As the
    * image is not divideable, this is currently implemented always to return the
@@ -439,15 +439,15 @@ public class ImageView extends View
   {
     return getStartOffset();
   }
-  
+
   /**
    * This is currently implemented always to return the area of the image view,
    * as the image is not divideable by character positions.
-   * 
+   *
    * @param pos character position
    * @param area of the image view
    * @param bias bias
-   * 
+   *
    * @return the shape, where the given character position should be mapped.
    */
   public Shape modelToView(int pos, Shape area, Bias bias)
@@ -455,7 +455,7 @@ public class ImageView extends View
   {
     return area;
   }
-  
+
   /**
    * Starts loading the image asynchronuosly. If the image must be loaded
    * synchronuosly instead, the {@link #setLoadsSynchronously} must be
@@ -465,7 +465,7 @@ public class ImageView extends View
   {
     updateState();
     // TODO: Implement this when we have an alt view for the alt=... attribute.
-  }  
+  }
 
   /**
    * This makes sure that the image and properties have been loaded.
@@ -504,7 +504,7 @@ public class ImageView extends View
               {
                 Thread.interrupted();
               }
-            
+
           }
       }
     image = newImage;
diff --git a/libjava/classpath/javax/swing/text/html/InlineView.java b/libjava/classpath/javax/swing/text/html/InlineView.java
index 58edc738526..5376c6b9de2 100644
--- a/libjava/classpath/javax/swing/text/html/InlineView.java
+++ b/libjava/classpath/javax/swing/text/html/InlineView.java
@@ -158,7 +158,7 @@ public class InlineView
     return attributes;
   }
 
-  
+
   public int getBreakWeight(int axis, float pos, float len)
   {
     int weight;
diff --git a/libjava/classpath/javax/swing/text/html/ListView.java b/libjava/classpath/javax/swing/text/html/ListView.java
index 3e809bbd209..f05051a4d52 100644
--- a/libjava/classpath/javax/swing/text/html/ListView.java
+++ b/libjava/classpath/javax/swing/text/html/ListView.java
@@ -1,4 +1,4 @@
-/* ListView.java -- 
+/* ListView.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
index 9f5f019fa37..3dddfc3deb3 100644
--- a/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
+++ b/libjava/classpath/javax/swing/text/html/MinimalHTMLWriter.java
@@ -1,4 +1,4 @@
-/* MinimalHTMLWriter.java -- 
+/* MinimalHTMLWriter.java --
    Copyright (C) 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59,7 +59,7 @@ import java.awt.Color;
  *
  * @author Sven de Marothy
  */
-public class MinimalHTMLWriter extends AbstractWriter 
+public class MinimalHTMLWriter extends AbstractWriter
 {
   private StyledDocument doc;
   private Deque<String> tagStack;
@@ -114,7 +114,7 @@ public class MinimalHTMLWriter extends AbstractWriter
    * Ends a span tag.
    */
   protected void endFontTag() throws IOException
-  {    
+  {
     writeEndTag("</span>");
     inFontTag = false;
   }
@@ -153,7 +153,7 @@ public class MinimalHTMLWriter extends AbstractWriter
   /**
    * Write the HTML header.
    */
-  protected void writeHeader() throws IOException 
+  protected void writeHeader() throws IOException
   {
     writeStartTag("<head>");
     writeStartTag("<style>");
@@ -168,7 +168,7 @@ public class MinimalHTMLWriter extends AbstractWriter
    * Write a paragraph start tag.
    */
   protected void writeStartParagraph(Element elem) throws IOException
-  {      
+  {
     indent();
     write("<p class=default>"+NEWLINE); // FIXME: Class value = ?
     incrIndent();
@@ -185,7 +185,7 @@ public class MinimalHTMLWriter extends AbstractWriter
 
   /**
    * Writes the body of the HTML document.
-   */ 
+   */
   protected void writeBody() throws IOException, BadLocationException
   {
     writeStartTag("<body>");
@@ -195,27 +195,27 @@ public class MinimalHTMLWriter extends AbstractWriter
     boolean inParagraph = false;
     do
       {
-	if( e.isLeaf() )
-	  {
-	    boolean hasNL = (getText(e).indexOf(NEWLINE) != -1);
-	    if( !inParagraph && hasText( e ) )
-	      {
-		writeStartParagraph(e);
-		inParagraph = true;
-	      }
+        if( e.isLeaf() )
+          {
+            boolean hasNL = (getText(e).indexOf(NEWLINE) != -1);
+            if( !inParagraph && hasText( e ) )
+              {
+                writeStartParagraph(e);
+                inParagraph = true;
+              }
 
-	    if( hasText( e ) )
-	      writeContent(e, true);
+            if( hasText( e ) )
+              writeContent(e, true);
 
-	    if( hasNL && inParagraph )
-	      {
-		writeEndParagraph();
-		inParagraph = false;
-	      }
-	    else
-	      endOpenTags();
-	  }
-      } 
+            if( hasNL && inParagraph )
+              {
+                writeEndParagraph();
+                inParagraph = false;
+              }
+            else
+              endOpenTags();
+          }
+      }
     while((e = ei.next()) != null);
 
     writeEndTag("</body>");
@@ -233,28 +233,28 @@ public class MinimalHTMLWriter extends AbstractWriter
   {
     if(attr.getAttribute(StyleConstants.Bold) != null)
       if(((Boolean)attr.getAttribute(StyleConstants.Bold)).booleanValue())
-	{
-	  write("<b>");
-	  tagStack.push("</b>");
-	}
+        {
+          write("<b>");
+          tagStack.push("</b>");
+        }
     if(attr.getAttribute(StyleConstants.Italic) != null)
       if(((Boolean)attr.getAttribute(StyleConstants.Italic)).booleanValue())
-	{
-	  write("<i>");
-	  tagStack.push("</i>");
-	}
+        {
+          write("<i>");
+          tagStack.push("</i>");
+        }
     if(attr.getAttribute(StyleConstants.Underline) != null)
       if(((Boolean)attr.getAttribute(StyleConstants.Underline)).booleanValue())
-	{
-	  write("<u>");
-	  tagStack.push("</u>");
-	}
+        {
+          write("<u>");
+          tagStack.push("</u>");
+        }
   }
 
   /**
    * Returns whether the element contains text or not.
    */
-  protected boolean isText(Element elem) 
+  protected boolean isText(Element elem)
   {
     return (elem.getEndOffset() != elem.getStartOffset());
   }
@@ -271,7 +271,7 @@ public class MinimalHTMLWriter extends AbstractWriter
     writeHTMLTags(elem.getAttributes());
     if( isText(elem) )
       text(elem);
-    else 
+    else
       writeLeaf(elem);
 
     endOpenTags();
@@ -285,12 +285,12 @@ public class MinimalHTMLWriter extends AbstractWriter
     // NOTE: Haven't tested if this is correct.
     if(e.getName().equals(StyleConstants.IconElementName))
       writeImage(e);
-    else 
+    else
       writeComponent(e);
   }
 
   /**
-   * Write the HTML attributes which do not have tag equivalents, 
+   * Write the HTML attributes which do not have tag equivalents,
    * e.g. attributes other than bold/italic/underlined.
    */
   protected void writeNonHTMLAttributes(AttributeSet attr) throws IOException
@@ -300,8 +300,8 @@ public class MinimalHTMLWriter extends AbstractWriter
     // Alignment? Background?
 
     if( StyleConstants.getForeground(attr) != null )
-      style = style + "color: " + 
-	getColor(StyleConstants.getForeground(attr)) + "; ";
+      style = style + "color: " +
+        getColor(StyleConstants.getForeground(attr)) + "; ";
 
     style = style + "font-size: "+StyleConstants.getFontSize(attr)+"pt; ";
     style = style + "font-family: "+StyleConstants.getFontFamily(attr);
@@ -316,15 +316,15 @@ public class MinimalHTMLWriter extends AbstractWriter
   {
     if(doc instanceof DefaultStyledDocument)
       {
-	Enumeration<?> styles = ((DefaultStyledDocument)doc).getStyleNames();
-	while(styles.hasMoreElements())
-	  writeStyle(doc.getStyle((String)styles.nextElement()));
+        Enumeration<?> styles = ((DefaultStyledDocument)doc).getStyleNames();
+        while(styles.hasMoreElements())
+          writeStyle(doc.getStyle((String)styles.nextElement()));
       }
     else
       { // What else to do here?
-	Style s = doc.getStyle("default");
-	if(s != null)
-	  writeStyle( s );
+        Style s = doc.getStyle("default");
+        if(s != null)
+          writeStyle( s );
       }
   }
 
@@ -336,28 +336,28 @@ public class MinimalHTMLWriter extends AbstractWriter
     Enumeration<?> attribs = attr.getAttributeNames();
     while(attribs.hasMoreElements())
       {
-	Object attribName = attribs.nextElement();
-	String name = attribName.toString();
-	String output = getAttribute(name, attr.getAttribute(attribName));
-	if( output != null )
-	  {
-	    indent();
-	    write( output + NEWLINE );
-	  }
+        Object attribName = attribs.nextElement();
+        String name = attribName.toString();
+        String output = getAttribute(name, attr.getAttribute(attribName));
+        if( output != null )
+          {
+            indent();
+            write( output + NEWLINE );
+          }
       }
   }
 
   /**
    * Deliberately unimplemented, handles component elements.
-   */ 
+   */
   protected void writeComponent(Element elem) throws IOException
   {
   }
 
   /**
-   * Deliberately unimplemented. 
+   * Deliberately unimplemented.
    * Writes StyleConstants.IconElementName elements.
-   */ 
+   */
   protected void writeImage(Element elem) throws IOException
   {
   }
@@ -381,24 +381,24 @@ public class MinimalHTMLWriter extends AbstractWriter
       return "family:" + a + ";";
     if(name.equals("size"))
       {
-	int size = ((Integer)a).intValue();
-	int htmlSize;
-	if( size > 24 )
-	  htmlSize = 7;
-	else if( size > 18 )
-	  htmlSize = 6;
-	else if( size > 14 )
-	  htmlSize = 5;
-	else if( size > 12 )
-	  htmlSize = 4;
-	else if( size > 10 )
-	  htmlSize = 3;
-	else if( size > 8 )
-	  htmlSize = 2;
-	else
-	  htmlSize = 1;
+        int size = ((Integer)a).intValue();
+        int htmlSize;
+        if( size > 24 )
+          htmlSize = 7;
+        else if( size > 18 )
+          htmlSize = 6;
+        else if( size > 14 )
+          htmlSize = 5;
+        else if( size > 12 )
+          htmlSize = 4;
+        else if( size > 10 )
+          htmlSize = 3;
+        else if( size > 8 )
+          htmlSize = 2;
+        else
+          htmlSize = 1;
 
-	return "size:" + htmlSize + ";";
+        return "size:" + htmlSize + ";";
       }
 
     return null;
@@ -428,8 +428,8 @@ public class MinimalHTMLWriter extends AbstractWriter
 
     if( inFontTag() )
       {
-	write(""+NEWLINE);
-	endFontTag();
+        write(""+NEWLINE);
+        endFontTag();
       }
   }
 
diff --git a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
index 296144460ac..e7fa9f373d9 100644
--- a/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/html/MultiAttributeSet.java
@@ -97,7 +97,7 @@ class MultiAttributeSet
         }
       return current.nextElement();
     }
-    
+
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/text/html/MultiStyle.java b/libjava/classpath/javax/swing/text/html/MultiStyle.java
index 2f43a19c282..eb62150350f 100644
--- a/libjava/classpath/javax/swing/text/html/MultiStyle.java
+++ b/libjava/classpath/javax/swing/text/html/MultiStyle.java
@@ -48,7 +48,7 @@ import javax.swing.text.Style;
 /**
  * A Style implementation that is able to multiplex between several other
  * Styles. This is used for CSS style resolving.
- * 
+ *
  * @author Roman Kennke (kennke@aicas.com)
  */
 class MultiStyle
diff --git a/libjava/classpath/javax/swing/text/html/ParagraphView.java b/libjava/classpath/javax/swing/text/html/ParagraphView.java
index d149627ff1c..cab8edb28e0 100644
--- a/libjava/classpath/javax/swing/text/html/ParagraphView.java
+++ b/libjava/classpath/javax/swing/text/html/ParagraphView.java
@@ -208,7 +208,7 @@ public class ParagraphView
   /**
    * Sets the span on the SizeRequirements object according to the
    * according CSS span value, when it is set.
-   * 
+   *
    * @param r the size requirements
    * @param axis the axis
    *
diff --git a/libjava/classpath/javax/swing/text/html/StyleSheet.java b/libjava/classpath/javax/swing/text/html/StyleSheet.java
index c4ddddb7395..5cf015bc520 100644
--- a/libjava/classpath/javax/swing/text/html/StyleSheet.java
+++ b/libjava/classpath/javax/swing/text/html/StyleSheet.java
@@ -1,4 +1,4 @@
-/* StyleSheet.java -- 
+/* StyleSheet.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -86,17 +86,17 @@ import javax.swing.text.View;
 /**
  * This class adds support for defining the visual characteristics of HTML views
  * being rendered. This enables views to be customized by a look-and-feel, mulitple
- * views over the same model can be rendered differently. Each EditorPane has its 
+ * views over the same model can be rendered differently. Each EditorPane has its
  * own StyleSheet, but by default one sheet will be shared by all of the HTMLEditorKit
  * instances. An HTMLDocument can also have a StyleSheet, which holds specific CSS
- * specs. 
- * 
- *  In order for Views to store less state and therefore be more lightweight, 
- *  the StyleSheet can act as a factory for painters that handle some of the 
+ * specs.
+ *
+ *  In order for Views to store less state and therefore be more lightweight,
+ *  the StyleSheet can act as a factory for painters that handle some of the
  *  rendering tasks. Since the StyleSheet may be used by views over multiple
  *  documents the HTML attributes don't effect the selector being used.
- *  
- *  The rules are stored as named styles, and other information is stored to 
+ *
+ *  The rules are stored as named styles, and other information is stored to
  *  translate the context of an element to a rule.
  *
  * @author Lillian Angel (langel@redhat.com)
@@ -234,15 +234,15 @@ public class StyleSheet extends StyleContext
       return other.precedence + other.selector.getSpecificity()
              - precedence - selector.getSpecificity();
     }
-    
+
   }
 
   /** The base URL */
   URL base;
-  
+
   /** Base font size (int) */
   int baseFontSize;
-  
+
   /**
    * The linked style sheets stored.
    */
@@ -273,7 +273,7 @@ public class StyleSheet extends StyleContext
    * Gets the style used to render the given tag. The element represents the tag
    * and can be used to determine the nesting, where the attributes will differ
    * if there is nesting inside of elements.
-   * 
+   *
    * @param t - the tag to translate to visual attributes
    * @param e - the element representing the tag
    * @return the set of CSS attributes to use to render the tag.
@@ -362,7 +362,7 @@ public class StyleSheet extends StyleContext
    * Fetches a resolved style. If there is no resolved style for the
    * specified selector, the resolve the style using
    * {@link #resolveStyle(String, List, HTML.Tag)}.
-   * 
+   *
    * @param selector the selector for which to resolve the style
    * @param path the Element path, used in the resolving algorithm
    * @param tag the tag for which to resolve
@@ -435,7 +435,7 @@ public class StyleSheet extends StyleContext
    * @return the resolved style
    */
   private Style resolveStyle(String selector, String[] tags,
-			     List<Map<String,String>> attributes)
+                             List<Map<String,String>> attributes)
   {
     // FIXME: This style resolver is not correct. But it works good enough for
     // the default.css.
@@ -471,9 +471,9 @@ public class StyleSheet extends StyleContext
 
   /**
    * Gets the rule that best matches the selector. selector is a space
-   * separated String of element names. The attributes of the returned 
+   * separated String of element names. The attributes of the returned
    * Style will change as rules are added and removed.
-   * 
+   *
    * @param selector - the element names separated by spaces
    * @return the set of CSS attributes to use to render
    */
@@ -488,11 +488,11 @@ public class StyleSheet extends StyleContext
       }
     return best;
   }
-  
+
   /**
    * Adds a set of rules to the sheet. The rules are expected to be in valid
    * CSS format. This is called as a result of parsing a <style> tag
-   * 
+   *
    * @param rule - the rule to add to the sheet
    */
   public void addRule(String rule)
@@ -514,11 +514,11 @@ public class StyleSheet extends StyleContext
     // on next stylesheet request.
     resolvedStyles.clear();
   }
-  
+
   /**
    * Translates a CSS declaration into an AttributeSet. This is called
    * as a result of encountering an HTML style attribute.
-   * 
+   *
    * @param decl - the declaration to get
    * @return the AttributeSet representing the declaration
    */
@@ -527,13 +527,13 @@ public class StyleSheet extends StyleContext
     if (decl == null)
       return SimpleAttributeSet.EMPTY;
     // FIXME: Not implemented.
-    return null;     
+    return null;
   }
-  
+
   /**
    * Loads a set of rules that have been specified in terms of CSS grammar.
    * If there are any conflicts with existing rules, the new rule is added.
-   * 
+   *
    * @param in - the stream to read the CSS grammar from.
    * @param ref - the reference URL. It is the location of the stream, it may
    * be null. All relative URLs specified in the stream will be based upon this
@@ -549,11 +549,11 @@ public class StyleSheet extends StyleContext
     CSSParser parser = new CSSParser(in, cb);
     parser.parse();
   }
-  
+
   /**
    * Gets a set of attributes to use in the view. This is a set of
    * attributes that can be used for View.getAttributes
-   * 
+   *
    * @param v - the view to get the set for
    * @return the AttributeSet to use in the view.
    */
@@ -561,10 +561,10 @@ public class StyleSheet extends StyleContext
   {
     return new ViewAttributeSet(v, this);
   }
-  
+
   /**
    * Removes a style previously added.
-   * 
+   *
    * @param nm - the name of the style to remove
    */
   public void removeStyle(String nm)
@@ -572,12 +572,12 @@ public class StyleSheet extends StyleContext
     // FIXME: Not implemented.
     super.removeStyle(nm);
   }
-  
+
   /**
    * Adds the rules from ss to those of the receiver. ss's rules will
    * override the old rules. An added StyleSheet will never override the rules
    * of the receiving style sheet.
-   * 
+   *
    * @param ss - the new StyleSheet.
    */
   public void addStyleSheet(StyleSheet ss)
@@ -586,10 +586,10 @@ public class StyleSheet extends StyleContext
       linked = new ArrayList<StyleSheet>();
     linked.add(ss);
   }
-  
+
   /**
    * Removes ss from those of the receiver
-   * 
+   *
    * @param ss - the StyleSheet to remove.
    */
   public void removeStyleSheet(StyleSheet ss)
@@ -599,10 +599,10 @@ public class StyleSheet extends StyleContext
         linked.remove(ss);
       }
   }
-  
+
   /**
    * Returns an array of the linked StyleSheets. May return null.
-   * 
+   *
    * @return - An array of the linked StyleSheets.
    */
   public StyleSheet[] getStyleSheets()
@@ -619,12 +619,12 @@ public class StyleSheet extends StyleContext
       }
     return linkedSS;
   }
-  
+
   /**
    * Imports a style sheet from the url. The rules are directly added to the
    * receiver. This is usually called when a <link> tag is resolved in an
    * HTML document.
-   * 
+   *
    * @param url the URL to import the StyleSheet from
    */
   public void importStyleSheet(URL url)
@@ -643,11 +643,11 @@ public class StyleSheet extends StyleContext
         // We can't do anything about it I guess.
       }
   }
-  
+
   /**
    * Sets the base url. All import statements that are relative, will be
    * relative to base.
-   * 
+   *
    * @param base -
    *          the base URL.
    */
@@ -655,20 +655,20 @@ public class StyleSheet extends StyleContext
   {
     this.base = base;
   }
-  
+
   /**
    * Gets the base url.
-   * 
+   *
    * @return - the base
    */
   public URL getBase()
   {
     return base;
   }
-  
+
   /**
    * Adds a CSS attribute to the given set.
-   * 
+   *
    * @param attr - the attribute set
    * @param key - the attribute to add
    * @param value - the value of the key
@@ -680,13 +680,13 @@ public class StyleSheet extends StyleContext
     CSS.addInternal(attr, key, value);
     attr.addAttribute(key, val);
   }
-  
+
   /**
    * Adds a CSS attribute to the given set.
-   * This method parses the value argument from HTML based on key. 
-   * Returns true if it finds a valid value for the given key, 
+   * This method parses the value argument from HTML based on key.
+   * Returns true if it finds a valid value for the given key,
    * and false otherwise.
-   * 
+   *
    * @param attr - the attribute set
    * @param key - the attribute to add
    * @param value - the value of the key
@@ -699,10 +699,10 @@ public class StyleSheet extends StyleContext
     attr.addAttribute(key, value);
     return attr.containsAttribute(key, value);
   }
-  
+
   /**
    * Converts a set of HTML attributes to an equivalent set of CSS attributes.
-   * 
+   *
    * @param htmlAttrSet - the set containing the HTML attributes.
    * @return the set of CSS attributes
    */
@@ -772,7 +772,7 @@ public class StyleSheet extends StyleContext
    * Translates a HTML border attribute to a corresponding set of CSS
    * attributes.
    *
-   * @param cssAttr the original set of CSS attributes to add to 
+   * @param cssAttr the original set of CSS attributes to add to
    * @param o the value of the border attribute
    *
    * @return the new set of CSS attributes
@@ -799,24 +799,24 @@ public class StyleSheet extends StyleContext
    * to convert StyleConstants attributes to CSS before forwarding them to the superclass.
    * The StyleConstants attribute do not have corresponding CSS entry, the attribute
    * is stored (but will likely not be used).
-   * 
+   *
    * @param old - the old set
    * @param key - the non-null attribute key
    * @param value - the attribute value
-   * @return the updated set 
+   * @return the updated set
    */
   public AttributeSet addAttribute(AttributeSet old, Object key,
                                    Object value)
   {
     // FIXME: Not implemented.
-    return super.addAttribute(old, key, value);       
+    return super.addAttribute(old, key, value);
   }
-  
+
   /**
    * Adds a set of attributes to the element. If any of these attributes are
-   * StyleConstants, they will be converted to CSS before forwarding to the 
+   * StyleConstants, they will be converted to CSS before forwarding to the
    * superclass.
-   * 
+   *
    * @param old - the old set
    * @param attr - the attributes to add
    * @return the updated attribute set
@@ -824,44 +824,44 @@ public class StyleSheet extends StyleContext
   public AttributeSet addAttributes(AttributeSet old, AttributeSet attr)
   {
     // FIXME: Not implemented.
-    return super.addAttributes(old, attr);           
+    return super.addAttributes(old, attr);
   }
-  
+
   /**
    * Removes an attribute from the set. If the attribute is a
-   * StyleConstants, it will be converted to CSS before forwarding to the 
+   * StyleConstants, it will be converted to CSS before forwarding to the
    * superclass.
-   * 
+   *
    * @param old - the old set
    * @param key - the non-null attribute key
-   * @return the updated set 
+   * @return the updated set
    */
   public AttributeSet removeAttribute(AttributeSet old, Object key)
   {
     // FIXME: Not implemented.
-    return super.removeAttribute(old, key);    
+    return super.removeAttribute(old, key);
   }
-  
+
   /**
    * Removes an attribute from the set. If any of the attributes are
-   * StyleConstants, they will be converted to CSS before forwarding to the 
+   * StyleConstants, they will be converted to CSS before forwarding to the
    * superclass.
-   * 
+   *
    * @param old - the old set
    * @param attrs - the attributes to remove
-   * @return the updated set 
+   * @return the updated set
    */
   public AttributeSet removeAttributes(AttributeSet old, AttributeSet attrs)
   {
     // FIXME: Not implemented.
-    return super.removeAttributes(old, attrs);    
+    return super.removeAttributes(old, attrs);
   }
-  
+
   /**
    * Removes a set of attributes for the element. If any of the attributes is a
-   * StyleConstants, they will be converted to CSS before forwarding to the 
+   * StyleConstants, they will be converted to CSS before forwarding to the
    * superclass.
-   * 
+   *
    * @param old - the old attribute set
    * @param names - the attribute names
    * @return the update attribute set
@@ -871,35 +871,35 @@ public class StyleSheet extends StyleContext
     // FIXME: Not implemented.
     return super.removeAttributes(old, names);
   }
-  
+
   /**
    * Creates a compact set of attributes that might be shared. This is a hook
    * for subclasses that want to change the behaviour of SmallAttributeSet.
-   * 
+   *
    * @param a - the set of attributes to be represented in the compact form.
    * @return the set of attributes created
    */
   protected StyleContext.SmallAttributeSet createSmallAttributeSet(AttributeSet a)
   {
-    return super.createSmallAttributeSet(a);     
+    return super.createSmallAttributeSet(a);
   }
-  
+
   /**
    * Creates a large set of attributes. This set is not shared. This is a hook
    * for subclasses that want to change the behaviour of the larger attribute
    * storage format.
-   * 
+   *
    * @param a - the set of attributes to be represented in the larger form.
    * @return the large set of attributes.
    */
   protected MutableAttributeSet createLargeAttributeSet(AttributeSet a)
   {
-    return super.createLargeAttributeSet(a);     
+    return super.createLargeAttributeSet(a);
   }
-  
+
   /**
    * Gets the font to use for the given set.
-   * 
+   *
    * @param a - the set to get the font for.
    * @return the font for the set
    */
@@ -978,7 +978,7 @@ public class StyleSheet extends StyleContext
             AttributeSet resolver = atts.getResolveParent();
             if (resolver != null)
               parSize = getFontSize(resolver);
-            size = fs.getValue(parSize); 
+            size = fs.getValue(parSize);
           }
         else
           {
@@ -998,7 +998,7 @@ public class StyleSheet extends StyleContext
    * Takes a set of attributes and turns it into a foreground
    * color specification. This is used to specify things like, brigher, more hue
    * etc.
-   * 
+   *
    * @param a - the set to get the foreground color for
    * @return the foreground color for the set
    */
@@ -1008,14 +1008,14 @@ public class StyleSheet extends StyleContext
     Color color = null;
     if (c != null)
       color = c.getValue();
-    return color;     
+    return color;
   }
-  
+
   /**
    * Takes a set of attributes and turns it into a background
    * color specification. This is used to specify things like, brigher, more hue
    * etc.
-   * 
+   *
    * @param a - the set to get the background color for
    * @return the background color for the set
    */
@@ -1025,34 +1025,34 @@ public class StyleSheet extends StyleContext
     Color color = null;
     if (c != null)
       color = c.getValue();
-    return color;     
+    return color;
   }
-  
+
   /**
    * Gets the box formatter to use for the given set of CSS attributes.
-   * 
+   *
    * @param a - the given set
    * @return the box formatter
    */
   public BoxPainter getBoxPainter(AttributeSet a)
   {
-    return new BoxPainter(a, this);     
+    return new BoxPainter(a, this);
   }
-  
+
   /**
    * Gets the list formatter to use for the given set of CSS attributes.
-   * 
+   *
    * @param a - the given set
    * @return the list formatter
    */
   public ListPainter getListPainter(AttributeSet a)
   {
-    return new ListPainter(a, this);         
+    return new ListPainter(a, this);
   }
-  
+
   /**
    * Sets the base font size between 1 and 7.
-   * 
+   *
    * @param sz - the new font size for the base.
    */
   public void setBaseFontSize(int sz)
@@ -1060,12 +1060,12 @@ public class StyleSheet extends StyleContext
     if (sz <= 7 && sz >= 1)
       baseFontSize = sz;
   }
-  
+
   /**
    * Sets the base font size from the String. It can either identify
    * a specific font size (between 1 and 7) or identify a relative
    * font size such as +1 or -2.
-   * 
+   *
    * @param size - the new font size as a String.
    */
   public void setBaseFontSize(String size)
@@ -1093,10 +1093,10 @@ public class StyleSheet extends StyleContext
         // Do nothing here
       }
   }
-  
+
   /**
    * TODO
-   * 
+   *
    * @param pt - TODO
    * @return TODO
    */
@@ -1105,35 +1105,35 @@ public class StyleSheet extends StyleContext
     // FIXME: Not implemented.
     return 0;
   }
-  
+
   /**
    * Gets the point size, given a size index.
-   * 
+   *
    * @param index - the size index
    * @return the point size.
    */
   public float getPointSize(int index)
   {
     // FIXME: Not implemented.
-    return 0;    
+    return 0;
   }
-  
+
   /**
    * Given the string of the size, returns the point size value.
-   * 
+   *
    * @param size - the string representation of the size.
    * @return - the point size value.
    */
   public float getPointSize(String size)
   {
     // FIXME: Not implemented.
-    return 0;    
+    return 0;
   }
-  
+
   /**
    * Convert the color string represenation into java.awt.Color. The valid
    * values are like "aqua" , "#00FFFF" or "rgb(1,6,44)".
-   * 
+   *
    * @param colorName the color to convert.
    * @return the matching java.awt.color
    */
@@ -1141,14 +1141,14 @@ public class StyleSheet extends StyleContext
   {
     return CSSColor.convertValue(colorName);
   }
-  
+
   /**
    * This class carries out some of the duties of CSS formatting. This enables views
    * to present the CSS formatting while not knowing how the CSS values are cached.
-   * 
+   *
    * This object is reponsible for the insets of a View and making sure
    * the background is maintained according to the CSS attributes.
-   * 
+   *
    * @author Lillian Angel (langel@redhat.com)
    */
   public static class BoxPainter extends Object implements Serializable
@@ -1191,7 +1191,7 @@ public class StyleSheet extends StyleContext
 
     /**
      * Package-private constructor.
-     * 
+     *
      * @param as - AttributeSet for painter
      */
     BoxPainter(AttributeSet as, StyleSheet ss)
@@ -1257,12 +1257,12 @@ public class StyleSheet extends StyleContext
       background = ss.getBackground(as);
 
     }
-    
-    
+
+
     /**
      * Gets the inset needed on a given side to account for the margin, border
      * and padding.
-     * 
+     *
      * @param size - the size of the box to get the inset for. View.TOP, View.LEFT,
      * View.BOTTOM or View.RIGHT.
      * @param v - the view making the request. This is used to get the AttributeSet,
@@ -1304,11 +1304,11 @@ public class StyleSheet extends StyleContext
       }
       return inset;
     }
-    
+
     /**
      * Paints the CSS box according to the attributes given. This should
      * paint the border, padding and background.
-     * 
+     *
      * @param g - the graphics configuration
      * @param x - the x coordinate
      * @param y - the y coordinate
@@ -1333,12 +1333,12 @@ public class StyleSheet extends StyleContext
         }
     }
   }
-  
+
   /**
    * This class carries out some of the CSS list formatting duties. Implementations
    * of this class enable views to present the CSS formatting while not knowing anything
    * about how the CSS values are being cached.
-   * 
+   *
    * @author Lillian Angel (langel@redhat.com)
    */
   public static class ListPainter implements Serializable
@@ -1361,7 +1361,7 @@ public class StyleSheet extends StyleContext
 
     /**
      * Package-private constructor.
-     * 
+     *
      * @param as - AttributeSet for painter
      */
     ListPainter(AttributeSet as, StyleSheet ss)
@@ -1378,7 +1378,7 @@ public class StyleSheet extends StyleContext
 
     /**
      * Paints the CSS list decoration according to the attributes given.
-     * 
+     *
      * @param g - the graphics configuration
      * @param x - the x coordinate
      * @param y - the y coordinate
@@ -1410,7 +1410,7 @@ public class StyleSheet extends StyleContext
             {
               View v1 = itemView.getView(0);
               if (v1 instanceof ParagraphView && v1.getViewCount() > 0)
-                {             
+                {
                   Shape a1 = itemView.getChildAllocation(0, tmpRect);
                   Rectangle r1 = a1 instanceof Rectangle ? (Rectangle) a1
                                                          : a1.getBounds();
diff --git a/libjava/classpath/javax/swing/text/html/TableView.java b/libjava/classpath/javax/swing/text/html/TableView.java
index 912240c28c4..2ad1b6d38b9 100644
--- a/libjava/classpath/javax/swing/text/html/TableView.java
+++ b/libjava/classpath/javax/swing/text/html/TableView.java
@@ -477,7 +477,7 @@ class TableView
    * Overridden to perform the table layout before calling the super
    * implementation.
    */
-  protected void layoutMinorAxis(int targetSpan, int axis, int[] offsets, 
+  protected void layoutMinorAxis(int targetSpan, int axis, int[] offsets,
                                  int[] spans)
   {
     updateGrid();
diff --git a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
index 8838646d5f5..fb57872ce3f 100644
--- a/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
+++ b/libjava/classpath/javax/swing/text/html/ViewAttributeSet.java
@@ -109,7 +109,7 @@ class ViewAttributeSet
       {
         HTML.Tag tag =
           (HTML.Tag) elAtts.getAttribute(StyleConstants.NameAttribute);
-        AttributeSet rule = styleSheet.getRule(tag, el); 
+        AttributeSet rule = styleSheet.getRule(tag, el);
         if (rule != null)
           atts.add(rule);
       }
diff --git a/libjava/classpath/javax/swing/text/html/parser/Entity.java b/libjava/classpath/javax/swing/text/html/parser/Entity.java
index 1d59df237b8..d40fb94f3d4 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Entity.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Entity.java
@@ -170,14 +170,14 @@ public final class Entity
 
     return sdata;
   }
-  
+
   /**
    * Get the entity type.
    * @return the value of the {@link #type}.
    */
-  public int getType() 
+  public int getType()
   {
     return type;
-  }  
-          
+  }
+
 }
diff --git a/libjava/classpath/javax/swing/text/html/parser/Parser.java b/libjava/classpath/javax/swing/text/html/parser/Parser.java
index a88e9ce1953..f3faa252433 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Parser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Parser.java
@@ -73,7 +73,7 @@ import javax.swing.text.SimpleAttributeSet;
  * </p>
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
-public class Parser 
+public class Parser
   implements DTDConstants
 {
   /**
diff --git a/libjava/classpath/javax/swing/text/rtf/RTFParser.java b/libjava/classpath/javax/swing/text/rtf/RTFParser.java
index de1b1c6ff15..3306056ff0f 100644
--- a/libjava/classpath/javax/swing/text/rtf/RTFParser.java
+++ b/libjava/classpath/javax/swing/text/rtf/RTFParser.java
@@ -139,7 +139,7 @@ class RTFParser
 
     parseHeader();
     parseDocument();
-  
+
     Token t2 = scanner.peekToken();
     if (t2.type == Token.RCURLY)
       {
diff --git a/libjava/classpath/javax/swing/text/rtf/RTFScanner.java b/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
index 060e087eb67..2eca159c49c 100644
--- a/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
+++ b/libjava/classpath/javax/swing/text/rtf/RTFScanner.java
@@ -50,7 +50,7 @@ import java.io.Reader;
  *
  * This scanner is based upon the RTF specification 1.6
  * available at:
- * 
+ *
  * <a
  * href="http://msdn.microsoft.com/library/en-us/dnrtfspec/html/rtfspec.asp">
  * RTF specification at MSDN</a>
diff --git a/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java b/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
index 4a6899fbeae..29ce165a940 100644
--- a/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/AbstractLayoutCache.java
@@ -45,7 +45,7 @@ import javax.swing.event.TreeModelEvent;
 
 /**
  * class AbstractLayoutCache
- * 
+ *
  * @author Andrew Selkirk
  */
 public abstract class AbstractLayoutCache
@@ -69,7 +69,7 @@ public abstract class AbstractLayoutCache
     * the method is overridden, like if {@link FixedHeightLayoutCache}. If the
     * method is not overridden and the property is not set, the InternalError is
     * thrown.
-    * 
+    *
     * @param value the last node in the path
     * @param row the node row
     * @param depth the indentation depth
@@ -116,7 +116,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * setNodeDimensions
-   * 
+   *
    * @param dimensions TODO
    */
   public void setNodeDimensions(NodeDimensions dimensions)
@@ -126,7 +126,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * getNodeDimensions
-   * 
+   *
    * @return NodeDimensions
    */
   public NodeDimensions getNodeDimensions()
@@ -139,7 +139,7 @@ public abstract class AbstractLayoutCache
   * (unless the method is overridden, like if
   * {@link FixedHeightLayoutCache}. If the method is not overridden and
   * the property is not set, the InternalError is thrown.
-  * 
+  *
   * @param value the last node in the path
   * @param row the node row
   * @param depth the indentation depth
@@ -152,13 +152,13 @@ public abstract class AbstractLayoutCache
     Rectangle d = null;
     if (nodeDimensions != null)
       d = nodeDimensions.getNodeDimensions(value, row, depth, expanded,
-					   bounds);
+                                           bounds);
     return d;
   }
 
   /**
    * Sets the model that provides the tree data.
-   * 
+   *
    * @param model the model
    */
   public void setModel(TreeModel model)
@@ -168,7 +168,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * Returns the model that provides the tree data.
-   * 
+   *
    * @return the model
    */
   public TreeModel getModel()
@@ -178,7 +178,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * setRootVisible
-   * 
+   *
    * @param visible <code>true</code> if root should be visible,
    * <code>false</code> otherwise
    */
@@ -189,7 +189,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * isRootVisible
-   * 
+   *
    * @return <code>true</code> if root is visible,
    * <code>false</code> otherwise
    */
@@ -200,7 +200,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * setRowHeight
-   * 
+   *
    * @param height the row height
    */
   public void setRowHeight(int height)
@@ -211,7 +211,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * getRowHeight
-   * 
+   *
    * @return the row height
    */
   public int getRowHeight()
@@ -221,7 +221,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * setSelectionModel
-   * 
+   *
    * @param model the model
    */
   public void setSelectionModel(TreeSelectionModel model)
@@ -231,12 +231,12 @@ public abstract class AbstractLayoutCache
     treeSelectionModel = model;
     if (treeSelectionModel != null)
       treeSelectionModel.setRowMapper(this);
-    
+
   }
 
   /**
    * getSelectionModel
-   * 
+   *
    * @return the model
    */
   public TreeSelectionModel getSelectionModel()
@@ -246,7 +246,7 @@ public abstract class AbstractLayoutCache
 
   /**
    * Get the sum of heights for all rows. This class provides a general not
-   * optimized implementation that is overridded in derived classes 
+   * optimized implementation that is overridded in derived classes
    * ({@link VariableHeightLayoutCache}, {@link FixedHeightLayoutCache}) for
    * the better performance.
    */
@@ -265,10 +265,10 @@ public abstract class AbstractLayoutCache
 
   /**
    * Get the maximal width. This class provides a general not
-   * optimized implementation that is overridded in derived classes 
+   * optimized implementation that is overridded in derived classes
    * ({@link VariableHeightLayoutCache}, {@link FixedHeightLayoutCache}) for
    * the better performance.
-   * 
+   *
    * @param rect the rectangle that is used during the method work
    */
   public int getPreferredWidth(Rectangle rect)
@@ -279,7 +279,7 @@ public abstract class AbstractLayoutCache
     for (int i = 0; i < n; i++)
       {
         TreePath path = getPathForRow(i);
-        r.setBounds(0, 0, 0, 0);        
+        r.setBounds(0, 0, 0, 0);
         r = getBounds(path, r);
         if (r.x + r.width > maximalWidth)
           maximalWidth = r.x + r.width;
@@ -292,90 +292,90 @@ public abstract class AbstractLayoutCache
   }
   /**
    * isExpanded
-   * 
+   *
    * @param value0 TODO
-   * 
+   *
    * @return boolean
    */
   public abstract boolean isExpanded(TreePath value0);
 
   /**
    * getBounds
-   * 
+   *
    * @param value0 TODO
    * @param value1 TODO
-   * 
+   *
    * @return Rectangle
    */
   public abstract Rectangle getBounds(TreePath value0, Rectangle value1);
 
   /**
    * getPathForRow
-   * 
+   *
    * @param row the row
-   * 
+   *
    * @return the tree path
    */
   public abstract TreePath getPathForRow(int row);
 
   /**
    * getRowForPath
-   * 
+   *
    * @param path the tree path
-   * 
+   *
    * @return the row
    */
   public abstract int getRowForPath(TreePath path);
 
   /**
    * getPathClosestTo
-   * 
+   *
    * @param value0 TODO
    * @param value1 TODO
-   * 
+   *
    * @return the tree path
    */
   public abstract TreePath getPathClosestTo(int value0, int value1);
 
   /**
    * getVisiblePathsFrom
-   * 
+   *
    * @param path the tree path
-   * 
+   *
    * @return Enumeration
    */
   public abstract Enumeration<TreePath> getVisiblePathsFrom(TreePath path);
 
   /**
    * getVisibleChildCount
-   * 
+   *
    * @param path the tree path
-   * 
+   *
    * @return int
    */
   public abstract int getVisibleChildCount(TreePath path);
 
   /**
    * setExpandedState
-   * 
+   *
    * @param value0 TODO
-   * 
+   *
    * @param value1 TODO
    */
   public abstract void setExpandedState(TreePath value0, boolean value1);
 
   /**
    * getExpandedState
-   * 
+   *
    * @param path the tree path
-   * 
+   *
    * @return boolean
    */
   public abstract boolean getExpandedState(TreePath path);
 
   /**
    * getRowCount
-   * 
+   *
    * @return the number of rows
    */
   public abstract int getRowCount();
@@ -387,35 +387,35 @@ public abstract class AbstractLayoutCache
 
   /**
    * invalidatePathBounds
-   * 
+   *
    * @param path the tree path
    */
   public abstract void invalidatePathBounds(TreePath path);
 
   /**
    * treeNodesChanged
-   * 
+   *
    * @param event the event to send
    */
   public abstract void treeNodesChanged(TreeModelEvent event);
 
   /**
    * treeNodesInserted
-   * 
+   *
    * @param event the event to send
    */
   public abstract void treeNodesInserted(TreeModelEvent event);
 
   /**
    * treeNodesRemoved
-   * 
+   *
    * @param event the event to send
    */
   public abstract void treeNodesRemoved(TreeModelEvent event);
 
   /**
    * treeStructureChanged
-   * 
+   *
    * @param event the event to send
    */
   public abstract void treeStructureChanged(TreeModelEvent event);
@@ -426,7 +426,7 @@ public abstract class AbstractLayoutCache
    * one. To have the benefit from the bulk conversion, the method must be
    * overridden in the derived classes. The default method delegates work
    * to the {@link #getRowForPath(TreePath)}.
-   * 
+   *
    * @param paths the tree paths the array of the tree pathes.
    * @return the array of the matching tree rows.
    */
@@ -445,7 +445,7 @@ public abstract class AbstractLayoutCache
   /**
    * Returns true if this layout supposes that all rows have the fixed
    * height.
-   * 
+   *
    * @return boolean true if all rows in the tree must have the fixed
    * height (false by default).
    */
diff --git a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
index e4cc97838a9..260c385aa3e 100644
--- a/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/libjava/classpath/javax/swing/tree/DefaultMutableTreeNode.java
@@ -101,7 +101,7 @@ public class DefaultMutableTreeNode
 
   /**
    * Creates a <code>DefaultMutableTreeNode</code> object with the given
-   * user object attached to it. This is equivalent to 
+   * user object attached to it. This is equivalent to
    * <code>DefaultMutableTreeNode(userObject, true)</code>.
    *
    * @param userObject the user object (<code>null</code> permitted).
@@ -126,7 +126,7 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns a clone of the node.  The clone contains a shallow copy of the 
+   * Returns a clone of the node.  The clone contains a shallow copy of the
    * user object, and does not copy the parent node or the child nodes.
    *
    * @return A clone of the node.
@@ -159,24 +159,24 @@ public class DefaultMutableTreeNode
    *
    * @param child the child node (<code>null</code> not permitted).
    *
-   * @throws IllegalStateException if {@link #getAllowsChildren()} returns 
+   * @throws IllegalStateException if {@link #getAllowsChildren()} returns
    *     <code>false</code>.
    * @throws IllegalArgumentException if {@link #isNodeAncestor} returns
-   *     <code>true</code>. 
-   * @throws IllegalArgumentException if <code>child</code> is 
+   *     <code>true</code>.
+   * @throws IllegalArgumentException if <code>child</code> is
    *     <code>null</code>.
    */
   public void add(MutableTreeNode child)
   {
     if (! allowsChildren)
       throw new IllegalStateException();
-    
+
     if (child == null)
       throw new IllegalArgumentException();
 
     if (isNodeAncestor(child))
       throw new IllegalArgumentException("Cannot add ancestor node.");
-    
+
     children.add(child);
     child.setParent(this);
   }
@@ -194,10 +194,10 @@ public class DefaultMutableTreeNode
   /**
    * Removes the child with the given index from this node.
    *
-   * @param index the index (in the range <code>0</code> to 
+   * @param index the index (in the range <code>0</code> to
    *     <code>getChildCount() - 1</code>).
-   *     
-   * @throws ArrayIndexOutOfBoundsException if <code>index</code> is outside 
+   *
+   * @throws ArrayIndexOutOfBoundsException if <code>index</code> is outside
    *         the valid range.
    */
   public void remove(int index)
@@ -207,12 +207,12 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Removes the given child from this node and sets its parent to 
+   * Removes the given child from this node and sets its parent to
    * <code>null</code>.
    *
    * @param node the child node (<code>null</code> not permitted).
-   * 
-   * @throws IllegalArgumentException if <code>node</code> is not a child of 
+   *
+   * @throws IllegalArgumentException if <code>node</code> is not a child of
    *     this node.
    * @throws IllegalArgumentException if <code>node</code> is null.
    */
@@ -259,8 +259,8 @@ public class DefaultMutableTreeNode
    *
    * @param node the child node (<code>null</code> not permitted).
    * @param index the index.
-   * 
-   * @throws IllegalArgumentException if <code>node</code> is 
+   *
+   * @throws IllegalArgumentException if <code>node</code> is
    *     </code>null</code>.
    */
   public void insert(MutableTreeNode node, int index)
@@ -270,7 +270,7 @@ public class DefaultMutableTreeNode
 
     if (node == null)
       throw new IllegalArgumentException("Null 'node' argument.");
-    
+
     if (isNodeAncestor(node))
       throw new IllegalArgumentException("Cannot insert ancestor node.");
 
@@ -298,7 +298,7 @@ public class DefaultMutableTreeNode
   {
     if (children.size() == 0)
       return EMPTY_ENUMERATION;
-    
+
     return children.elements();
   }
 
@@ -337,11 +337,11 @@ public class DefaultMutableTreeNode
   /**
    * Returns the index of the specified child node, or -1 if the node is not
    * in fact a child of this node.
-   * 
+   *
    * @param node  the node (<code>null</code> not permitted).
-   * 
+   *
    * @return The index of the specified child node, or -1.
-   * 
+   *
    * @throws IllegalArgumentException if <code>node</code> is <code>null</code>.
    */
   public int getIndex(TreeNode node)
@@ -352,7 +352,7 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Sets the flag that controls whether or not this node allows the addition / 
+   * Sets the flag that controls whether or not this node allows the addition /
    * insertion of child nodes.  If the flag is set to <code>false</code>, any
    * existing children are removed.
    *
@@ -422,9 +422,9 @@ public class DefaultMutableTreeNode
    * <li>the parent node (if there is one);</li>
    * <li>any ancestor of the parent node;</li>
    * </ul>
-   * If <code>node</code> is <code>null</code>, this method returns 
+   * If <code>node</code> is <code>null</code>, this method returns
    * <code>false</code>.
-   * 
+   *
    * @param node  the node (<code>null</code> permitted).
    *
    * @return A boolean.
@@ -450,9 +450,9 @@ public class DefaultMutableTreeNode
    * <li>the child nodes belonging to this tree node, if there are any;</li>
    * <li>any descendants of the child nodes;</li>
    * </ul>
-   * If <code>node</code> is <code>null</code>, this method returns 
+   * If <code>node</code> is <code>null</code>, this method returns
    * <code>false</code>.
-   * 
+   *
    * @param node  the node (<code>null</code> permitted).
    *
    * @return A boolean.
@@ -463,7 +463,7 @@ public class DefaultMutableTreeNode
       return false;
 
     TreeNode current = node;
-    
+
     while (current != null
            && current != this)
       current = current.getParent();
@@ -533,7 +533,7 @@ public class DefaultMutableTreeNode
     TreeNode node = getChildAt(0);
     int depth = 0;
     int current = 1;
-    
+
     while (! stack.empty())
       {
         if (node.getChildCount() != 0)
@@ -549,7 +549,7 @@ public class DefaultMutableTreeNode
 
             int size;
             int index;
-            
+
             do
               {
                 node = node.getParent();
@@ -606,7 +606,7 @@ public class DefaultMutableTreeNode
       {
         if (depth == 0)
           return null;
-        
+
         return new TreeNode[depth];
       }
 
@@ -624,7 +624,7 @@ public class DefaultMutableTreeNode
   {
     TreeNode[] path = getPathToRoot(this, 0);
     Object[] object = new Object[path.length];
-    
+
     for (int index = 0; index < path.length; ++index)
       object[index] = ((DefaultMutableTreeNode) path[index]).getUserObject();
 
@@ -640,7 +640,7 @@ public class DefaultMutableTreeNode
   {
     TreeNode current = this;
     TreeNode check = current.getParent();
-    
+
     while (check != null)
       {
         current = check;
@@ -675,7 +675,7 @@ public class DefaultMutableTreeNode
     // Return next sibling (if needed the sibling of some parent).
     DefaultMutableTreeNode node = this;
     DefaultMutableTreeNode sibling;
-    
+
     do
       {
         sibling = node.getNextSibling();
@@ -683,7 +683,7 @@ public class DefaultMutableTreeNode
       }
     while (sibling == null &&
            node != null);
-    
+
     // Return sibling.
     return sibling;
   }
@@ -698,7 +698,7 @@ public class DefaultMutableTreeNode
     // Return null if no parent.
     if (parent == null)
       return null;
-    
+
     DefaultMutableTreeNode sibling = getPreviousSibling();
 
     // Return parent if no sibling.
@@ -769,7 +769,7 @@ public class DefaultMutableTreeNode
   {
     if (node == null)
       throw new IllegalArgumentException();
-    
+
     TreeNode parent = this;
     Vector<TreeNode> nodes = new Vector<TreeNode>();
     nodes.add(this);
@@ -782,13 +782,13 @@ public class DefaultMutableTreeNode
 
     if (parent != node)
       throw new IllegalArgumentException();
-    
+
     return nodes.elements();
   }
 
   /**
-   * Returns <code>true</code> if <code>node</code> is a child of this tree 
-   * node, and <code>false</code> otherwise.  If <code>node</code> is 
+   * Returns <code>true</code> if <code>node</code> is a child of this tree
+   * node, and <code>false</code> otherwise.  If <code>node</code> is
    * <code>null</code>, this method returns <code>false</code>.
    *
    * @param node  the node (<code>null</code> permitted).
@@ -807,7 +807,7 @@ public class DefaultMutableTreeNode
    * Returns the first child node belonging to this tree node.
    *
    * @return The first child node.
-   * 
+   *
    * @throws NoSuchElementException if this tree node has no children.
    */
   public TreeNode getFirstChild()
@@ -819,7 +819,7 @@ public class DefaultMutableTreeNode
    * Returns the last child node belonging to this tree node.
    *
    * @return The last child node.
-   * 
+   *
    * @throws NoSuchElementException if this tree node has no children.
    */
   public TreeNode getLastChild()
@@ -828,15 +828,15 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the next child after the specified <code>node</code>, or 
-   * <code>null</code> if there is no child after the specified 
+   * Returns the next child after the specified <code>node</code>, or
+   * <code>null</code> if there is no child after the specified
    * <code>node</code>.
    *
    * @param node  a child of this node (<code>null</code> not permitted).
    *
    * @return The next child, or <code>null</code>.
-   * 
-   * @throws IllegalArgumentException if <code>node</code> is not a child of 
+   *
+   * @throws IllegalArgumentException if <code>node</code> is not a child of
    *     this node, or is <code>null</code>.
    */
   public TreeNode getChildAfter(TreeNode node)
@@ -853,15 +853,15 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the previous child before the specified <code>node</code>, or 
-   * <code>null</code> if there is no child before the specified 
+   * Returns the previous child before the specified <code>node</code>, or
+   * <code>null</code> if there is no child before the specified
    * <code>node</code>.
    *
    * @param node  a child of this node (<code>null</code> not permitted).
    *
    * @return The previous child, or <code>null</code>.
-   * 
-   * @throws IllegalArgumentException if <code>node</code> is not a child of 
+   *
+   * @throws IllegalArgumentException if <code>node</code> is not a child of
    *     this node, or is <code>null</code>.
    */
   public TreeNode getChildBefore(TreeNode node)
@@ -913,8 +913,8 @@ public class DefaultMutableTreeNode
 
   /**
    * Returns the next sibling for this tree node.  If this node has no parent,
-   * or this node is the last child of its parent, this method returns 
-   * <code>null</code>.  
+   * or this node is the last child of its parent, this method returns
+   * <code>null</code>.
    *
    * @return The next sibling, or <code>null</code>.
    */
@@ -924,7 +924,7 @@ public class DefaultMutableTreeNode
       return null;
 
     int index = parent.getIndex(this) + 1;
-    
+
     if (index == parent.getChildCount())
       return null;
 
@@ -932,9 +932,9 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the previous sibling for this tree node.  If this node has no 
-   * parent, or this node is the first child of its parent, this method returns 
-   * <code>null</code>.  
+   * Returns the previous sibling for this tree node.  If this node has no
+   * parent, or this node is the first child of its parent, this method returns
+   * <code>null</code>.
    *
    * @return The previous sibling, or <code>null</code>.
    */
@@ -952,7 +952,7 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns <code>true</code> if this tree node is a lead node (that is, it 
+   * Returns <code>true</code> if this tree node is a lead node (that is, it
    * has no children), and <code>false</otherwise>.
    *
    * @return A boolean.
@@ -963,8 +963,8 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the first leaf node that is a descendant of this node.  Recall 
-   * that a node is its own descendant, so if this node has no children then 
+   * Returns the first leaf node that is a descendant of this node.  Recall
+   * that a node is its own descendant, so if this node has no children then
    * it is returned as the first leaf.
    *
    * @return The first leaf node.
@@ -972,7 +972,7 @@ public class DefaultMutableTreeNode
   public DefaultMutableTreeNode getFirstLeaf()
   {
     TreeNode current = this;
-    
+
     while (current.getChildCount() > 0)
       current = current.getChildAt(0);
 
@@ -980,8 +980,8 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the last leaf node that is a descendant of this node.  Recall 
-   * that a node is its own descendant, so if this node has no children then 
+   * Returns the last leaf node that is a descendant of this node.  Recall
+   * that a node is its own descendant, so if this node has no children then
    * it is returned as the last leaf.
    *
    * @return The first leaf node.
@@ -990,7 +990,7 @@ public class DefaultMutableTreeNode
   {
     TreeNode current = this;
     int size = current.getChildCount();
-    
+
     while (size > 0)
       {
         current = current.getChildAt(size - 1);
@@ -1001,7 +1001,7 @@ public class DefaultMutableTreeNode
   }
 
   /**
-   * Returns the next leaf node after this tree node. 
+   * Returns the next leaf node after this tree node.
    *
    * @return The next leaf node, or <code>null</code>.
    */
@@ -1047,7 +1047,7 @@ public class DefaultMutableTreeNode
     while (e.hasMoreElements())
       {
         TreeNode current = (TreeNode) e.nextElement();
-        
+
         if (current.isLeaf())
           count++;
       }
@@ -1082,7 +1082,7 @@ public class DefaultMutableTreeNode
           TreeNode node = queue.removeFirst();
 
           Enumeration<TreeNode> children =
-	    (Enumeration<TreeNode>) node.children();
+            (Enumeration<TreeNode>) node.children();
           while (children.hasMoreElements())
               queue.add(children.nextElement());
 
@@ -1095,10 +1095,10 @@ public class DefaultMutableTreeNode
    */
   static class PreorderEnumeration implements Enumeration<TreeNode>
   {
-	  TreeNode next;
+          TreeNode next;
 
       Stack<Enumeration<TreeNode>> childrenEnums =
-	new Stack<Enumeration<TreeNode>>();
+        new Stack<Enumeration<TreeNode>>();
 
       @SuppressWarnings("unchecked")
       PreorderEnumeration(TreeNode node)
@@ -1138,7 +1138,7 @@ public class DefaultMutableTreeNode
 
               return child;
           }
-          
+
           // If no children are left, we return to a higher level.
           childrenEnums.pop();
 
@@ -1161,7 +1161,7 @@ public class DefaultMutableTreeNode
 
        Stack<TreeNode> nodes = new Stack<TreeNode>();
        Stack<Enumeration<TreeNode>> childrenEnums =
-	 new Stack<Enumeration<TreeNode>>();
+         new Stack<Enumeration<TreeNode>>();
 
        @SuppressWarnings("unchecked")
        PostorderEnumeration(TreeNode node)
@@ -1194,7 +1194,7 @@ public class DefaultMutableTreeNode
                nodes.push(node);
 
                Enumeration<TreeNode> newChildren =
-		 (Enumeration<TreeNode>) node.children();
+                 (Enumeration<TreeNode>) node.children();
                childrenEnums.push(newChildren);
 
                return traverse(newChildren);
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
index 04897986d49..9ee0a14ba22 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
@@ -68,7 +68,7 @@ import javax.swing.event.TreeSelectionListener;
 
 /**
  * Participates in the tree cell editing.
- * 
+ *
  * @author Andrew Selkirk
  * @author Audrius Meskauskas
  */
@@ -77,8 +77,8 @@ public class DefaultTreeCellEditor
 {
   /**
    * This container that appears on the tree during editing session.
-   * It contains the editing component displays various other editor - 
-   * specific parts like editing icon. 
+   * It contains the editing component displays various other editor -
+   * specific parts like editing icon.
    */
   public class EditorContainer extends Container
   {
@@ -86,7 +86,7 @@ public class DefaultTreeCellEditor
     * Use v 1.5 serial version UID for interoperability.
     */
     static final long serialVersionUID = 6470339600449699810L;
-    
+
     /**
      * Creates an <code>EditorContainer</code> object.
      */
@@ -103,11 +103,11 @@ public class DefaultTreeCellEditor
     {
       // Do nothing here.
     }
-   
+
     /**
      * Overrides Container.paint to paint the node's icon and use the selection
      * color for the background.
-     * 
+     *
      * @param g -
      *          the specified Graphics window
      */
@@ -175,8 +175,8 @@ public class DefaultTreeCellEditor
    /**
     * Use v 1.5 serial version UID for interoperability.
     */
-    static final long serialVersionUID = -6629304544265300143L; 
-    
+    static final long serialVersionUID = -6629304544265300143L;
+
     /**
      * The border of the text field.
      */
@@ -194,9 +194,9 @@ public class DefaultTreeCellEditor
 
     /**
      * Gets the font of this component.
-     * @return this component's font; if a font has not been set for 
+     * @return this component's font; if a font has not been set for
      * this component, the font of its parent is returned (if the parent
-     * is not null, otherwise null is returned). 
+     * is not null, otherwise null is returned).
      */
     public Font getFont()
     {
@@ -222,9 +222,9 @@ public class DefaultTreeCellEditor
     }
 
     /**
-     * Overrides JTextField.getPreferredSize to return the preferred size 
+     * Overrides JTextField.getPreferredSize to return the preferred size
      * based on current font, if set, or else use renderer's font.
-     * 
+     *
      * @return the Dimension of this textfield.
      */
     public Dimension getPreferredSize()
@@ -237,9 +237,9 @@ public class DefaultTreeCellEditor
       return renderer.getPreferredSize();
     }
   }
-  
+
   private EventListenerList listenerList = new EventListenerList();
-  
+
   /**
    * Editor handling the editing.
    */
@@ -261,8 +261,8 @@ public class DefaultTreeCellEditor
   protected transient Component editingComponent;
 
   /**
-   * As of Java 2 platform v1.4 this field should no longer be used. 
-   * If you wish to provide similar behavior you should directly 
+   * As of Java 2 platform v1.4 this field should no longer be used.
+   * If you wish to provide similar behavior you should directly
    * override isCellEditable.
    */
   protected boolean canEdit;
@@ -306,12 +306,12 @@ public class DefaultTreeCellEditor
    * Font to paint with, null indicates font of renderer is to be used.
    */
   protected Font font;
-      
+
   /**
-   * Constructs a DefaultTreeCellEditor object for a JTree using the 
-   * specified renderer and a default editor. (Use this constructor 
+   * Constructs a DefaultTreeCellEditor object for a JTree using the
+   * specified renderer and a default editor. (Use this constructor
    * for normal editing.)
-   * 
+   *
    * @param tree - a JTree object
    * @param renderer - a DefaultTreeCellRenderer object
    */
@@ -321,10 +321,10 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * Constructs a DefaultTreeCellEditor  object for a JTree using the specified 
-   * renderer and the specified editor. (Use this constructor 
+   * Constructs a DefaultTreeCellEditor  object for a JTree using the specified
+   * renderer and the specified editor. (Use this constructor
    * for specialized editing.)
-   * 
+   *
    * @param tree - a JTree object
    * @param renderer - a DefaultTreeCellRenderer object
    * @param editor - a TreeCellEditor object
@@ -341,10 +341,10 @@ public class DefaultTreeCellEditor
     Color c = UIManager.getColor("Tree.editorBorderSelectionColor");
     setBorderSelectionColor(c);
   }
-  
+
   /**
    * writeObject
-   * 
+   *
    * @param value0
    *          TODO
    * @exception IOException
@@ -386,12 +386,12 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * Sets the font to edit with. null indicates the renderers 
-   * font should be used. This will NOT override any font you have 
-   * set in the editor the receiver was instantied with. If null for 
-   * an editor was passed in, a default editor will be created that 
+   * Sets the font to edit with. null indicates the renderers
+   * font should be used. This will NOT override any font you have
+   * set in the editor the receiver was instantied with. If null for
+   * an editor was passed in, a default editor will be created that
    * will pick up this font.
-   * 
+   *
    * @param font - the editing Font
    */
   public void setFont(Font font)
@@ -404,7 +404,7 @@ public class DefaultTreeCellEditor
 
   /**
    * Gets the font used for editing.
-   * 
+   *
    * @return the editing font
    */
   public Font getFont()
@@ -414,20 +414,20 @@ public class DefaultTreeCellEditor
 
   /**
    * Configures the editor. Passed onto the realEditor.
-   * Sets an initial value for the editor. This will cause 
-   * the editor to stopEditing and lose any partially edited value 
-   * if the editor is editing when this method is called. 
-   * Returns the component that should be added to the client's Component 
-   * hierarchy. Once installed in the client's hierarchy this component will 
-   * then be able to draw and receive user input. 
-   * 
+   * Sets an initial value for the editor. This will cause
+   * the editor to stopEditing and lose any partially edited value
+   * if the editor is editing when this method is called.
+   * Returns the component that should be added to the client's Component
+   * hierarchy. Once installed in the client's hierarchy this component will
+   * then be able to draw and receive user input.
+   *
    * @param tree - the JTree that is asking the editor to edit; this parameter can be null
    * @param value - the value of the cell to be edited
    * @param isSelected - true is the cell is to be rendered with selection highlighting
    * @param expanded - true if the node is expanded
    * @param leaf - true if the node is a leaf node
    * @param row - the row index of the node being edited
-   * 
+   *
    * @return the component for editing
    */
   public Component getTreeCellEditorComponent(JTree tree, Object value,
@@ -461,19 +461,19 @@ public class DefaultTreeCellEditor
   /**
    * Returns the value currently being edited (requests it from the
    * {@link #realEditor}.
-   * 
+   *
    * @return the value currently being edited
    */
   public Object getCellEditorValue()
   {
     return realEditor.getCellEditorValue();
   }
-  
+
   /**
-   * If the realEditor returns true to this message, prepareForEditing  
+   * If the realEditor returns true to this message, prepareForEditing
    * is messaged and true is returned.
-   * 
-   * @param event - the event the editor should use to consider whether to 
+   *
+   * @param event - the event the editor should use to consider whether to
    * begin editing or not
    * @return true if editing can be started
    */
@@ -507,7 +507,7 @@ public class DefaultTreeCellEditor
       }
     if (! realEditor.isCellEditable(event))
       ret = false;
-    else 
+    else
       {
         if (canEditImmediately(event))
           ret = true;
@@ -519,12 +519,12 @@ public class DefaultTreeCellEditor
     if (ret)
       prepareForEditing();
     return ret;
-        
+
   }
 
   /**
    * Messages the realEditor for the return value.
-   * 
+   *
    * @param event -
    *          the event the editor should use to start editing
    * @return true if the editor would like the editing cell to be selected;
@@ -570,7 +570,7 @@ public class DefaultTreeCellEditor
 
   /**
    * Adds a <code>CellEditorListener</code> object to this editor.
-   * 
+   *
    * @param listener
    *          the listener to add
    */
@@ -603,7 +603,7 @@ public class DefaultTreeCellEditor
 
   /**
    * Resets lastPath.
-   * 
+   *
    * @param e - the event that characterizes the change.
    */
   public void valueChanged(TreeSelectionEvent e)
@@ -621,10 +621,10 @@ public class DefaultTreeCellEditor
 //    if (timer != null)
 //      timer.stop();
   }
-  
+
   /**
    * Messaged when the timer fires.
-   * 
+   *
    * @param e the event that characterizes the action.
    */
   public void actionPerformed(ActionEvent e)
@@ -636,7 +636,7 @@ public class DefaultTreeCellEditor
   /**
    * Sets the tree currently editing for. This is needed to add a selection
    * listener.
-   * 
+   *
    * @param newTree -
    *          the new tree to be edited
    */
@@ -657,7 +657,7 @@ public class DefaultTreeCellEditor
 
   /**
    * Returns true if event is a MouseEvent and the click count is 1.
-   * 
+   *
    * @param event - the event being studied
    * @return true if editing should start
    */
@@ -674,7 +674,7 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * Starts the editing timer (if one installed). 
+   * Starts the editing timer (if one installed).
    */
   protected void startEditingTimer()
   {
@@ -687,33 +687,33 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * Returns true if event is null, or it is a MouseEvent with 
+   * Returns true if event is null, or it is a MouseEvent with
    * a click count > 2 and inHitRegion returns true.
-   * 
+   *
    * @param event - the event being studied
-   * @return true if event is null, or it is a MouseEvent with 
-   * a click count > 2 and inHitRegion returns true 
+   * @return true if event is null, or it is a MouseEvent with
+   * a click count > 2 and inHitRegion returns true
    */
   protected boolean canEditImmediately(EventObject event)
   {
     if (event == null || !(event instanceof MouseEvent) || (((MouseEvent) event).
-        getClickCount() > 2 && inHitRegion(((MouseEvent) event).getX(), 
+        getClickCount() > 2 && inHitRegion(((MouseEvent) event).getX(),
                                          ((MouseEvent) event).getY())))
       return true;
     return false;
   }
 
   /**
-   * Returns true if the passed in location is a valid mouse location 
+   * Returns true if the passed in location is a valid mouse location
    * to start editing from. This is implemented to return false if x is
-   * less than or equal to the width of the icon and icon 
-   * gap displayed by the renderer. In other words this returns true if 
-   * the user clicks over the text part displayed by the renderer, and 
+   * less than or equal to the width of the icon and icon
+   * gap displayed by the renderer. In other words this returns true if
+   * the user clicks over the text part displayed by the renderer, and
    * false otherwise.
-   * 
+   *
    * @param x - the x-coordinate of the point
    * @param y - the y-coordinate of the point
-   * 
+   *
    * @return true if the passed in location is a valid mouse location
    */
   protected boolean inHitRegion(int x, int y)
@@ -725,11 +725,11 @@ public class DefaultTreeCellEditor
   /**
    * determineOffset
    * @param tree -
-   * @param value - 
-   * @param isSelected - 
-   * @param expanded - 
-   * @param leaf - 
-   * @param row - 
+   * @param value -
+   * @param isSelected -
+   * @param expanded -
+   * @param leaf -
+   * @param row -
    */
   protected void determineOffset(JTree tree, Object value, boolean isSelected,
                                  boolean expanded, boolean leaf, int row)
@@ -755,7 +755,7 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * Invoked just before editing is to start. Will add the 
+   * Invoked just before editing is to start. Will add the
    * editingComponent to the editingContainer.
    */
   protected void prepareForEditing()
@@ -766,7 +766,7 @@ public class DefaultTreeCellEditor
 
   /**
    * Creates the container to manage placement of editingComponent.
-   * 
+   *
    * @return the container to manage the placement of the editingComponent.
    */
   protected Container createContainer()
@@ -775,9 +775,9 @@ public class DefaultTreeCellEditor
   }
 
   /**
-   * This is invoked if a TreeCellEditor is not supplied in the constructor. 
+   * This is invoked if a TreeCellEditor is not supplied in the constructor.
    * It returns a TextField editor.
-   * 
+   *
    * @return a new TextField editor
    */
   protected TreeCellEditor createTreeCellEditor()
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
index b9c84013d16..a2c8fc204ef 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -1,6 +1,6 @@
-/* DefaultTreeCellRenderer.java 
+/* DefaultTreeCellRenderer.java
  Copyright (C) 2002, 2004, 2006, Free Software Foundation, Inc.
- 
+
  This file is part of GNU Classpath.
 
  GNU Classpath is free software; you can redistribute it and/or modify
@@ -54,7 +54,7 @@ import javax.swing.plaf.UIResource;
 
 /**
  * A default implementation of the {@link TreeCellRenderer} interface.
- * 
+ *
  * @author Andrew Selkirk
  */
 public class DefaultTreeCellRenderer
@@ -79,62 +79,62 @@ public class DefaultTreeCellRenderer
 
   /**
    * The icon used to represent non-leaf nodes that are closed.
-   * 
+   *
    * @see #setClosedIcon(Icon)
    */
   protected transient Icon closedIcon;
 
   /**
    * The icon used to represent leaf nodes.
-   * 
+   *
    * @see #setLeafIcon(Icon)
    */
   protected transient Icon leafIcon;
 
   /**
    * The icon used to represent non-leaf nodes that are open.
-   * 
+   *
    * @see #setOpenIcon(Icon)
    */
   protected transient Icon openIcon;
 
   /**
    * The color used for text in selected cells.
-   * 
+   *
    * @see #setTextSelectionColor(Color)
    */
   protected Color textSelectionColor;
 
   /**
    * The color used for text in non-selected cells.
-   * 
+   *
    * @see #setTextNonSelectionColor(Color)
    */
   protected Color textNonSelectionColor;
 
   /**
    * The background color for selected cells.
-   * 
+   *
    * @see #setBackgroundSelectionColor(Color)
    */
   protected Color backgroundSelectionColor;
 
   /**
    * The background color for non-selected cells.
-   * 
+   *
    * @see #setBackgroundNonSelectionColor(Color)
    */
   protected Color backgroundNonSelectionColor;
 
   /**
    * The border color for selected tree cells.
-   * 
+   *
    * @see #setBorderSelectionColor(Color)
    */
   protected Color borderSelectionColor;
 
   /**
-   * Creates a new tree cell renderer with defaults appropriate for the 
+   * Creates a new tree cell renderer with defaults appropriate for the
    * current {@link LookAndFeel}.
    */
   public DefaultTreeCellRenderer()
@@ -154,9 +154,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Returns the default icon for non-leaf tree cells that are open (expanded).
-   * The icon is fetched from the defaults table for the current 
+   * The icon is fetched from the defaults table for the current
    * {@link LookAndFeel} using the key <code>Tree.openIcon</code>.
-   * 
+   *
    * @return The default icon.
    */
   public Icon getDefaultOpenIcon()
@@ -165,10 +165,10 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Returns the default icon for non-leaf tree cells that are closed (not 
-   * expanded).  The icon is fetched from the defaults table for the current 
+   * Returns the default icon for non-leaf tree cells that are closed (not
+   * expanded).  The icon is fetched from the defaults table for the current
    * {@link LookAndFeel} using the key <code>Tree.closedIcon</code>.
-   * 
+   *
    * @return The default icon.
    */
   public Icon getDefaultClosedIcon()
@@ -177,10 +177,10 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Returns the default icon for leaf tree cells.  The icon is fetched from 
-   * the defaults table for the current {@link LookAndFeel} using the key 
+   * Returns the default icon for leaf tree cells.  The icon is fetched from
+   * the defaults table for the current {@link LookAndFeel} using the key
    * <code>Tree.leafIcon</code>.
-   * 
+   *
    * @return The default icon.
    */
   public Icon getDefaultLeafIcon()
@@ -191,9 +191,9 @@ public class DefaultTreeCellRenderer
   /**
    * Sets the icon to be displayed for non-leaf nodes that are open (expanded).
    * Set this to <code>null</code> if no icon is required.
-   * 
+   *
    * @param icon  the icon (<code>null</code> permitted).
-   * 
+   *
    * @see #getOpenIcon()
    */
   public void setOpenIcon(Icon icon)
@@ -202,11 +202,11 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Returns the icon displayed for non-leaf nodes that are open (expanded).  
+   * Returns the icon displayed for non-leaf nodes that are open (expanded).
    * The default value is initialised from the {@link LookAndFeel}.
-   * 
+   *
    * @return The open icon (possibly <code>null</code>).
-   * 
+   *
    * @see #setOpenIcon(Icon)
    */
   public Icon getOpenIcon()
@@ -215,11 +215,11 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Sets the icon to be displayed for non-leaf nodes that are closed.  Set 
+   * Sets the icon to be displayed for non-leaf nodes that are closed.  Set
    * this to <code>null</code> if no icon is required.
-   * 
+   *
    * @param icon  the icon (<code>null</code> permitted).
-   * 
+   *
    * @see #getClosedIcon()
    */
   public void setClosedIcon(Icon icon)
@@ -228,11 +228,11 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Returns the icon displayed for non-leaf nodes that are closed.  The 
+   * Returns the icon displayed for non-leaf nodes that are closed.  The
    * default value is initialised from the {@link LookAndFeel}.
-   * 
+   *
    * @return The closed icon (possibly <code>null</code>).
-   * 
+   *
    * @see #setClosedIcon(Icon)
    */
   public Icon getClosedIcon()
@@ -241,11 +241,11 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Sets the icon to be displayed for leaf nodes.  Set this to 
+   * Sets the icon to be displayed for leaf nodes.  Set this to
    * <code>null</code> if no icon is required.
-   * 
+   *
    * @param icon  the icon (<code>null</code> permitted).
-   * 
+   *
    * @see #getLeafIcon()
    */
   public void setLeafIcon(Icon icon)
@@ -254,11 +254,11 @@ public class DefaultTreeCellRenderer
   }
 
   /**
-   * Returns the icon displayed for leaf nodes.  The default value is 
+   * Returns the icon displayed for leaf nodes.  The default value is
    * initialised from the {@link LookAndFeel}.
-   * 
+   *
    * @return The leaf icon (possibly <code>null</code>).
-   * 
+   *
    * @see #setLeafIcon(Icon)
    */
   public Icon getLeafIcon()
@@ -268,9 +268,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the text color for tree cells that are selected.
-   * 
+   *
    * @param c  the color (<code>null</code> permitted).
-   * 
+   *
    * @see #getTextSelectionColor()
    */
   public void setTextSelectionColor(Color c)
@@ -282,9 +282,9 @@ public class DefaultTreeCellRenderer
    * Returns the text color for tree cells that are selected.
    * The default value is obtained from the {@link LookAndFeel} defaults
    * table using the key <code>Tree.selectionForeground</code>.
-   * 
+   *
    * @return The text color for tree cells that are selected.
-   * 
+   *
    * @see #setTextSelectionColor(Color)
    */
   public Color getTextSelectionColor()
@@ -294,9 +294,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the text color for tree cells that are not selected.
-   * 
+   *
    * @param c  the color (<code>null</code> permitted).
-   * 
+   *
    * @see #getTextNonSelectionColor()
    */
   public void setTextNonSelectionColor(Color c)
@@ -308,9 +308,9 @@ public class DefaultTreeCellRenderer
    * Returns the text color for tree cells that are not selected.
    * The default value is obtained from the {@link LookAndFeel} defaults
    * table using the key <code>Tree.selectionForeground</code>.
-   * 
+   *
    * @return The background color for tree cells that are not selected.
-   * 
+   *
    * @see #setTextgroundNonSelectionColor(Color)
    */
   public Color getTextNonSelectionColor()
@@ -320,9 +320,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the background color for tree cells that are selected.
-   * 
+   *
    * @param c  the color (<code>null</code> permitted).
-   * 
+   *
    * @see #getBackgroundSelectionColor()
    */
   public void setBackgroundSelectionColor(Color c)
@@ -334,9 +334,9 @@ public class DefaultTreeCellRenderer
    * Returns the background color for tree cells that are selected.
    * The default value is obtained from the {@link LookAndFeel} defaults
    * table using the key <code>Tree.selectionBackground</code>.
-   * 
+   *
    * @return The background color for tree cells that are selected.
-   * 
+   *
    * @see #setBackgroundSelectionColor(Color)
    */
   public Color getBackgroundSelectionColor()
@@ -346,9 +346,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the background color for tree cells that are not selected.
-   * 
+   *
    * @param c  the color (<code>null</code> permitted).
-   * 
+   *
    * @see #getBackgroundNonSelectionColor()
    */
   public void setBackgroundNonSelectionColor(Color c)
@@ -360,9 +360,9 @@ public class DefaultTreeCellRenderer
    * Returns the background color for tree cells that are not selected.
    * The default value is obtained from the {@link LookAndFeel} defaults
    * table using the key <code>Tree.textBackground</code>.
-   * 
+   *
    * @return The background color for tree cells that are not selected.
-   * 
+   *
    * @see #setBackgroundNonSelectionColor(Color)
    */
   public Color getBackgroundNonSelectionColor()
@@ -372,9 +372,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the border color for tree cells that are selected.
-   * 
+   *
    * @param c  the color (<code>null</code> permitted).
-   * 
+   *
    * @see #getBorderSelectionColor()
    */
   public void setBorderSelectionColor(Color c)
@@ -386,9 +386,9 @@ public class DefaultTreeCellRenderer
    * Returns the border color for tree cells that are selected.
    * The default value is obtained from the {@link LookAndFeel} defaults
    * table using the key <code>Tree.selectionBorderColor</code>.
-   * 
+   *
    * @return The border color for tree cells that are selected.
-   * 
+   *
    * @see #setBorderSelectionColor(Color)
    */
   public Color getBorderSelectionColor()
@@ -398,9 +398,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the font.
-   * 
+   *
    * @param f the font.
-   * 
+   *
    * @see #getFont()
    */
   public void setFont(Font f)
@@ -412,7 +412,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * Sets the background color.
-   * 
+   *
    * @param c the color.
    */
   public void setBackground(Color c)
@@ -425,7 +425,7 @@ public class DefaultTreeCellRenderer
   /**
    * Returns a component (in fact <code>this</code>) that can be used to
    * render a tree cell with the specified state.
-   * 
+   *
    * @param tree  the tree that the cell belongs to.
    * @param val  the cell value.
    * @param selected  indicates whether or not the cell is selected.
@@ -433,7 +433,7 @@ public class DefaultTreeCellRenderer
    * @param leaf  indicates whether or not the cell is a leaf in the tree.
    * @param row  the row index.
    * @param hasFocus  indicates whether or not the cell has the focus.
-   * 
+   *
    * @return <code>this</code>.
    */
   public Component getTreeCellRendererComponent(JTree tree, Object val,
@@ -461,7 +461,7 @@ public class DefaultTreeCellRenderer
       {
         super.setBackground(getBackgroundSelectionColor());
         setForeground(getTextSelectionColor());
-        
+
         if (hasFocus)
           setBorderSelectionColor(UIManager.getLookAndFeelDefaults().
                                   getColor("Tree.selectionBorderColor"));
@@ -480,9 +480,9 @@ public class DefaultTreeCellRenderer
 
   /**
    * Returns the current font.
-   * 
+   *
    * @return The current font.
-   * 
+   *
    * @see #setFont(Font)
    */
   public Font getFont()
@@ -492,7 +492,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * Paints the value. The background is filled based on selected.
-   * 
+   *
    * @param g the graphics device.
    */
   public void paint(Graphics g)
@@ -504,25 +504,25 @@ public class DefaultTreeCellRenderer
     else
       {
         bgColor = getBackgroundNonSelectionColor();
-	if (bgColor == null)
+        if (bgColor == null)
           bgColor = getBackground();
       }
     // Paint background.
     int xOffset = -1;
     if (bgColor != null)
       {
-	xOffset = getXOffset();
-	g.setColor(bgColor);
-	g.fillRect(xOffset, 0, getWidth() - xOffset, getHeight());
+        xOffset = getXOffset();
+        g.setColor(bgColor);
+        g.fillRect(xOffset, 0, getWidth() - xOffset, getHeight());
       }
 
     if (hasFocus)
       {
         if (drawsFocusBorderAroundIcon)
           xOffset = 0;
-	else if (xOffset == -1)
+        else if (xOffset == -1)
           xOffset = getXOffset();
-	paintFocus(g, xOffset, 0, getWidth() - xOffset, getHeight());
+        paintFocus(g, xOffset, 0, getWidth() - xOffset, getHeight());
       }
     super.paint(g);
   }
@@ -536,7 +536,7 @@ public class DefaultTreeCellRenderer
     if (col != null)
       {
         g.setColor(col);
-	g.drawRect(x, y, w - 1, h - 1);
+        g.drawRect(x, y, w - 1, h - 1);
       }
   }
 
@@ -557,7 +557,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * Returns the preferred size of the cell.
-   * 
+   *
    * @return The preferred size of the cell.
    */
   public Dimension getPreferredSize()
@@ -565,7 +565,7 @@ public class DefaultTreeCellRenderer
     Dimension size = super.getPreferredSize();
     size.width += 3;
     return size;
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
@@ -573,7 +573,7 @@ public class DefaultTreeCellRenderer
   public void validate()
   {
     // Overridden for performance reasons.
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
@@ -581,11 +581,11 @@ public class DefaultTreeCellRenderer
   public void revalidate()
   {
     // Overridden for performance reasons.
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param tm ignored
    * @param x coordinate of the region to mark as dirty
    * @param y coordinate of the region to mark as dirty
@@ -595,26 +595,26 @@ public class DefaultTreeCellRenderer
   public void repaint(long tm, int x, int y, int width, int height)
   {
     // Overridden for performance reasons.
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param area  the area to repaint.
    */
   public void repaint(Rectangle area)
   {
     // Overridden for performance reasons.
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
    */
-  protected void firePropertyChange(String name, Object oldValue, 
+  protected void firePropertyChange(String name, Object oldValue,
                                     Object newValue)
   {
     // Overridden for performance reasons.
@@ -622,7 +622,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -634,7 +634,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -646,7 +646,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -654,11 +654,11 @@ public class DefaultTreeCellRenderer
   public void firePropertyChange(String name, short oldValue, short newValue)
   {
     // Overridden for performance reasons.
-  } 
+  }
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -670,7 +670,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -682,7 +682,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -694,7 +694,7 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
@@ -706,15 +706,15 @@ public class DefaultTreeCellRenderer
 
   /**
    * For performance reasons, this method is overridden to do nothing.
-   * 
+   *
    * @param name  the property name.
    * @param oldValue  the old value.
    * @param newValue  the new value.
    */
-  public void firePropertyChange(String name, boolean oldValue, 
+  public void firePropertyChange(String name, boolean oldValue,
                                  boolean newValue)
   {
     //  Overridden for performance reasons.
-  } 
+  }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
index afee7ea22fa..0fa44458661 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeModel.java
@@ -1,6 +1,6 @@
-/* DefaultTreeModel.java -- 
+/* DefaultTreeModel.java --
    Copyright (C) 2002, 2004, 2005, 2006, Free Software Foundation, Inc.
- 
+
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@ import javax.swing.event.TreeModelListener;
 
 /**
  * DefaultTreeModel
- * 
+ *
  * @author Andrew Selkirk
  */
 public class DefaultTreeModel
@@ -74,7 +74,7 @@ public class DefaultTreeModel
 
   /**
    * Constructor DefaultTreeModel where any node can have children.
-   * 
+   *
    * @param root the tree root.
    */
   public DefaultTreeModel(TreeNode root)
@@ -85,9 +85,9 @@ public class DefaultTreeModel
   /**
    * Create the DefaultTreeModel that may check if the nodes can have
    * children or not.
-   * 
+   *
    * @param aRoot the tree root.
-   * @param asksAllowsChildren if true, each node is asked if it can have 
+   * @param asksAllowsChildren if true, each node is asked if it can have
    * children. If false, the model does not care about this, supposing, that
    * any node can have children.
    */
@@ -101,7 +101,7 @@ public class DefaultTreeModel
 
   /**
    * writeObject
-   * 
+   *
    * @param obj the object.
    * @exception IOException TODO
    */
@@ -112,7 +112,7 @@ public class DefaultTreeModel
 
   /**
    * readObject
-   * 
+   *
    * @param value0 TODO
    * @exception IOException TODO
    * @exception ClassNotFoundException TODO
@@ -125,7 +125,7 @@ public class DefaultTreeModel
 
   /**
    * asksAllowsChildren
-   * 
+   *
    * @return boolean
    */
   public boolean asksAllowsChildren()
@@ -135,7 +135,7 @@ public class DefaultTreeModel
 
   /**
    * setAsksAllowsChildren
-   * 
+   *
    * @param value TODO
    */
   public void setAsksAllowsChildren(boolean value)
@@ -145,7 +145,7 @@ public class DefaultTreeModel
 
   /**
    * setRoot
-   * 
+   *
    * @param root the root node.
    */
   public void setRoot(TreeNode root)
@@ -155,7 +155,7 @@ public class DefaultTreeModel
 
   /**
    * getRoot
-   * 
+   *
    * @return Object
    */
   public Object getRoot()
@@ -165,7 +165,7 @@ public class DefaultTreeModel
 
   /**
    * getIndexOfChild
-   * 
+   *
    * @param parent TODO
    * @param child TODO
    * @return int
@@ -182,7 +182,7 @@ public class DefaultTreeModel
 
   /**
    * getChild
-   * 
+   *
    * @param node TODO
    * @param idx TODO
    * @return Object
@@ -197,7 +197,7 @@ public class DefaultTreeModel
 
   /**
    * getChildCount
-   * 
+   *
    * @param node TODO
    * @return int
    */
@@ -214,7 +214,7 @@ public class DefaultTreeModel
    * {@link #asksAllowsChildren} is true, then this checks if the TreeNode
    * allows children, otherwise it returns the TreeNode's <code>leaf</code>
    * property.
-   * 
+   *
    * @param node the node to check
    *
    * @return boolean <code>true</code> if the node is a leaf node,
@@ -275,7 +275,7 @@ public class DefaultTreeModel
    * changed. It will fire the events, necessary to update the layout caches and
    * repaint the tree. The tree will <i>not</i> be properly refreshed if you
    * call the JTree.repaint instead.
-   * 
+   *
    * @param node - the tree node, from which the tree nodes have changed
    *          (inclusive). If you do not know this node, call {@link #reload()}
    *          instead.
@@ -296,14 +296,14 @@ public class DefaultTreeModel
   }
 
   /**
-   * Messaged when the user has altered the value for the item 
-   * identified by path to newValue. If newValue signifies a truly new 
+   * Messaged when the user has altered the value for the item
+   * identified by path to newValue. If newValue signifies a truly new
    * value the model should post a treeNodesChanged event.
-   * This sets the user object of the TreeNode identified by 
-   * path and posts a node changed. If you use custom user objects 
-   * in the TreeModel you're going to need to subclass this and set 
+   * This sets the user object of the TreeNode identified by
+   * path and posts a node changed. If you use custom user objects
+   * in the TreeModel you're going to need to subclass this and set
    * the user object of the changed node to something meaningful.
-   * 
+   *
    * @param path - path to the node that the user has altered
    * @param newValue - the new value from the TreeCellEditor
    */
@@ -314,7 +314,7 @@ public class DefaultTreeModel
       {
         ((MutableTreeNode) node).setUserObject(newValue);
         int[] ci = null;
-        Object[] c = null; 
+        Object[] c = null;
         Object[] parentPath = path.getPath();
         if (path.getPathCount() > 1)
           {
@@ -327,17 +327,17 @@ public class DefaultTreeModel
             c[0] = node;
             parentPath = path.getParentPath().getPath();
           }
-        
+
         fireTreeNodesChanged(this, parentPath, ci, c);
       }
     }
 
   /**
    * Invoked this to insert newChild at location index in parents children.
-   * This will then message nodesWereInserted to create the appropriate event. 
-   * This is the preferred way to add children as it will create the 
+   * This will then message nodesWereInserted to create the appropriate event.
+   * This is the preferred way to add children as it will create the
    * appropriate event.
-   * 
+   *
    * @param newChild is the node to add to the parent's children
    * @param parent is the parent of the newChild
    * @param index is the index of the newChild
@@ -353,10 +353,10 @@ public class DefaultTreeModel
   }
 
   /**
-   * Message this to remove node from its parent. This will message 
-   * nodesWereRemoved to create the appropriate event. This is the preferred 
+   * Message this to remove node from its parent. This will message
+   * nodesWereRemoved to create the appropriate event. This is the preferred
    * way to remove a node as it handles the event creation for you.
-   * 
+   *
    * @param node to be removed
    */
   public void removeNodeFromParent(MutableTreeNode node)
@@ -373,7 +373,7 @@ public class DefaultTreeModel
   /**
    * Invoke this method after you've changed how node is to be represented
    * in the tree.
-   * 
+   *
    * @param node that was changed
    */
   public void nodeChanged(TreeNode node)
@@ -387,10 +387,10 @@ public class DefaultTreeModel
   }
 
   /**
-   * Invoke this method after you've inserted some TreeNodes 
-   * into node. childIndices should be the index of the new elements and must 
+   * Invoke this method after you've inserted some TreeNodes
+   * into node. childIndices should be the index of the new elements and must
    * be sorted in ascending order.
-   * 
+   *
    * @param parent that had a child added to
    * @param childIndices of the children added
    */
@@ -403,26 +403,26 @@ public class DefaultTreeModel
   }
 
   /**
-   * Invoke this method after you've removed some TreeNodes from node. 
-   * childIndices should be the index of the removed elements and 
-   * must be sorted in ascending order. And removedChildren should be the 
+   * Invoke this method after you've removed some TreeNodes from node.
+   * childIndices should be the index of the removed elements and
+   * must be sorted in ascending order. And removedChildren should be the
    * array of the children objects that were removed.
-   * 
+   *
    * @param parent that had a child added to
    * @param childIndices of the children added
    * @param removedChildren are all the children removed from parent.
    */
-  public void nodesWereRemoved(TreeNode parent, int[] childIndices, 
+  public void nodesWereRemoved(TreeNode parent, int[] childIndices,
                                Object[] removedChildren)
   {
-    fireTreeNodesRemoved(this, getPathToRoot(parent), childIndices, 
+    fireTreeNodesRemoved(this, getPathToRoot(parent), childIndices,
                          removedChildren);
   }
 
   /**
-   * Invoke this method after you've changed how the children identified by 
+   * Invoke this method after you've changed how the children identified by
    * childIndices are to be represented in the tree.
-   * 
+   *
    * @param node that is the parent of the children that changed in a tree.
    * @param childIndices are the child nodes that changed.
    */
@@ -435,9 +435,9 @@ public class DefaultTreeModel
   }
 
   /**
-   * Invoke this method if you've totally changed the children of node and 
+   * Invoke this method if you've totally changed the children of node and
    * its childrens children. This will post a treeStructureChanged event.
-   * 
+   *
    * @param node that had its children and grandchildren changed.
    */
   public void nodeStructureChanged(TreeNode node)
@@ -456,10 +456,10 @@ public class DefaultTreeModel
   }
 
   /**
-   * Builds the parents of node up to and including the root node, where 
-   * the original node is the last element in the returned array. The 
+   * Builds the parents of node up to and including the root node, where
+   * the original node is the last element in the returned array. The
    * length of the returned array gives the node's depth in the tree.
-   * 
+   *
    * @param node - the TreeNode to get the path for
    * @return TreeNode[] - the path from node to the root
    */
@@ -469,14 +469,14 @@ public class DefaultTreeModel
   }
 
   /**
-   * Builds the parents of node up to and including the root node, where 
-   * the original node is the last element in the returned array. The 
+   * Builds the parents of node up to and including the root node, where
+   * the original node is the last element in the returned array. The
    * length of the returned array gives the node's depth in the tree.
-   * 
+   *
    * @param node - the TreeNode to get the path for
-   * @param depth - an int giving the number of steps already taken 
+   * @param depth - an int giving the number of steps already taken
    * towards the root (on recursive calls), used to size the returned array
-   * @return an array of TreeNodes giving the path from the root to the 
+   * @return an array of TreeNodes giving the path from the root to the
    * specified node
    */
   protected TreeNode[] getPathToRoot(TreeNode node, int depth)
@@ -485,7 +485,7 @@ public class DefaultTreeModel
       {
         if (depth == 0)
           return null;
-        
+
         return new TreeNode[depth];
       }
 
@@ -496,7 +496,7 @@ public class DefaultTreeModel
 
   /**
    * Registers a listere to the model.
-   * 
+   *
    * @param listener the listener to add
    */
   public void addTreeModelListener(TreeModelListener listener)
@@ -506,7 +506,7 @@ public class DefaultTreeModel
 
   /**
    * Removes a listener from the model.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeTreeModelListener(TreeModelListener listener)
@@ -516,9 +516,9 @@ public class DefaultTreeModel
 
   /**
    * Returns all registered <code>TreeModelListener</code> listeners.
-   * 
+   *
    * @return an array of listeners.
-   * 
+   *
    * @since 1.4
    */
   public TreeModelListener[] getTreeModelListeners()
@@ -528,10 +528,10 @@ public class DefaultTreeModel
   }
 
   /**
-   * Notifies all listeners that have registered interest for notification 
-   * on this event type. The event instance is lazily created using the parameters 
+   * Notifies all listeners that have registered interest for notification
+   * on this event type. The event instance is lazily created using the parameters
    * passed into the fire method.
-   * 
+   *
    * @param source the node being changed
    * @param path the path to the root node
    * @param childIndices the indices of the changed elements
@@ -551,7 +551,7 @@ public class DefaultTreeModel
 
   /**
    * fireTreeNodesInserted
-   * 
+   *
    * @param source the node where new nodes got inserted
    * @param path the path to the root node
    * @param childIndices the indices of the new elements
@@ -570,7 +570,7 @@ public class DefaultTreeModel
 
   /**
    * fireTreeNodesRemoved
-   * 
+   *
    * @param source the node where nodes got removed-
    * @param path the path to the root node
    * @param childIndices the indices of the removed elements
@@ -589,7 +589,7 @@ public class DefaultTreeModel
 
   /**
    * fireTreeStructureChanged
-   * 
+   *
    * @param source the node where the model has changed
    * @param path the path to the root node
    * @param childIndices the indices of the affected elements
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
index b2806f2728b..29add0e7bfb 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -1,6 +1,6 @@
-/* DefaultTreeSelectionModel.java 
+/* DefaultTreeSelectionModel.java
    Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
-   
+
 This file is part of GNU Classpath.
 
 GNU Classpath is free software; you can redistribute it and/or modify
@@ -63,7 +63,7 @@ import javax.swing.event.TreeSelectionListener;
  * listeners are notified about the path and not the row changes. If you
  * specifically need to track the row changes, register the listener for the
  * expansion events.
- * 
+ *
  * @author Andrew Selkirk
  * @author Audrius Meskauskas
  */
@@ -195,13 +195,13 @@ public class DefaultTreeSelectionModel
    * Creates a clone of this DefaultTreeSelectionModel with the same selection.
    * The cloned instance will have the same registered listeners, the listeners
    * themselves will not be cloned. The selection will be cloned.
-   * 
+   *
    * @exception CloneNotSupportedException should not be thrown here
    * @return a copy of this DefaultTreeSelectionModel
    */
   public Object clone() throws CloneNotSupportedException
   {
-    DefaultTreeSelectionModel cloned = 
+    DefaultTreeSelectionModel cloned =
       (DefaultTreeSelectionModel) super.clone();
     cloned.changeSupport = null;
     cloned.selection = (TreePath[]) selection.clone();
@@ -217,10 +217,10 @@ public class DefaultTreeSelectionModel
   /**
    * Returns a string that shows this object's properties.
    * The returned string lists the selected tree rows, if any.
-   * 
+   *
    * @return a string that shows this object's properties
    */
-  public String toString() 
+  public String toString()
   {
     if (isSelectionEmpty())
       return "[selection empty]";
@@ -239,7 +239,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * writeObject
-   * 
+   *
    * @param value0 TODO
    * @exception IOException TODO
    */
@@ -250,7 +250,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * readObject
-   * 
+   *
    * @param value0 TODO
    * @exception IOException TODO
    * @exception ClassNotFoundException TODO
@@ -263,7 +263,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Sets the RowMapper that should be used to map between paths and their rows.
-   * 
+   *
    * @param mapper the RowMapper to set
    * @see RowMapper
    */
@@ -276,7 +276,7 @@ public class DefaultTreeSelectionModel
   /**
    * Returns the RowMapper that is currently used to map between paths and their
    * rows.
-   * 
+   *
    * @return the current RowMapper
    * @see RowMapper
    */
@@ -289,7 +289,7 @@ public class DefaultTreeSelectionModel
    * Sets the current selection mode. Possible values are
    * {@link #SINGLE_TREE_SELECTION}, {@link #CONTIGUOUS_TREE_SELECTION} and
    * {@link #DISCONTIGUOUS_TREE_SELECTION}.
-   * 
+   *
    * @param mode the selection mode to be set
    * @see #getSelectionMode
    * @see #SINGLE_TREE_SELECTION
@@ -314,7 +314,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the current selection mode.
-   * 
+   *
    * @return the current selection mode
    * @see #setSelectionMode
    * @see #SINGLE_TREE_SELECTION
@@ -329,7 +329,7 @@ public class DefaultTreeSelectionModel
   /**
    * Sets this path as the only selection. If this changes the selection the
    * registered TreeSelectionListeners are notified.
-   * 
+   *
    * @param path the path to set as selection
    */
   public void setSelectionPath(TreePath path)
@@ -339,10 +339,10 @@ public class DefaultTreeSelectionModel
       paths = new TreePath[]{ path };
     setSelectionPaths(paths);
   }
-  
+
   /**
    * Get the number of the tree row for the given path.
-   * 
+   *
    * @param path the tree path
    * @return the tree row for this path or -1 if the path is not visible.
    */
@@ -373,7 +373,7 @@ public class DefaultTreeSelectionModel
    * Sets the paths as selection. This method checks for duplicates and removes
    * them. If this changes the selection the registered TreeSelectionListeners
    * are notified.
-   * 
+   *
    * @param paths the paths to set as selection
    */
   public void setSelectionPaths(TreePath[] paths)
@@ -468,10 +468,10 @@ public class DefaultTreeSelectionModel
    * Adds a path to the list of selected paths. This method checks if the path
    * is already selected and doesn't add the same path twice. If this changes
    * the selection the registered TreeSelectionListeners are notified.
-   * 
-   * The lead path is changed to the added path. This also happen if the 
+   *
+   * The lead path is changed to the added path. This also happen if the
    * passed path was already selected before.
-   * 
+   *
    * @param path the path to add to the selection
    */
   public void addSelectionPath(TreePath path)
@@ -487,7 +487,7 @@ public class DefaultTreeSelectionModel
    * Adds the paths to the list of selected paths. This method checks if the
    * paths are already selected and doesn't add the same path twice. If this
    * changes the selection the registered TreeSelectionListeners are notified.
-   * 
+   *
    * @param paths the paths to add to the selection
    */
   public void addSelectionPaths(TreePath[] paths)
@@ -568,7 +568,7 @@ public class DefaultTreeSelectionModel
   /**
    * Removes the path from the selection. If this changes the selection the
    * registered TreeSelectionListeners are notified.
-   * 
+   *
    * @param path the path to remove
    */
   public void removeSelectionPath(TreePath path)
@@ -580,7 +580,7 @@ public class DefaultTreeSelectionModel
   /**
    * Removes the paths from the selection. If this changes the selection the
    * registered TreeSelectionListeners are notified.
-   * 
+   *
    * @param paths the paths to remove
    */
   public void removeSelectionPaths(TreePath[] paths)
@@ -639,7 +639,7 @@ public class DefaultTreeSelectionModel
   /**
    * Returns the first path in the selection. This is especially useful when the
    * selectionMode is {@link #SINGLE_TREE_SELECTION}.
-   * 
+   *
    * @return the first path in the selection
    */
   public TreePath getSelectionPath()
@@ -652,7 +652,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the complete selection.
-   * 
+   *
    * @return the complete selection
    */
   public TreePath[] getSelectionPaths()
@@ -662,7 +662,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the number of paths in the selection.
-   * 
+   *
    * @return the number of paths in the selection
    */
   public int getSelectionCount()
@@ -675,7 +675,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Checks if a given path is in the selection.
-   * 
+   *
    * @param path the path to check
    * @return <code>true</code> if the path is in the selection,
    *         <code>false</code> otherwise
@@ -695,7 +695,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Checks if the selection is empty.
-   * 
+   *
    * @return <code>true</code> if the selection is empty, <code>false</code>
    *         otherwise
    */
@@ -729,7 +729,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Adds a <code>TreeSelectionListener</code> object to this model.
-   * 
+   *
    * @param listener the listener to add
    */
   public void addTreeSelectionListener(TreeSelectionListener listener)
@@ -739,7 +739,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Removes a <code>TreeSelectionListener</code> object from this model.
-   * 
+   *
    * @param listener the listener to remove
    */
   public void removeTreeSelectionListener(TreeSelectionListener listener)
@@ -749,7 +749,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns all <code>TreeSelectionListener</code> added to this model.
-   * 
+   *
    * @return an array of listeners
    * @since 1.4
    */
@@ -760,7 +760,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * fireValueChanged
-   * 
+   *
    * @param event the event to fire.
    */
   protected void fireValueChanged(TreeSelectionEvent event)
@@ -773,7 +773,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns all added listeners of a special type.
-   * 
+   *
    * @param listenerType the listener type
    * @return an array of listeners
    * @since 1.3
@@ -785,7 +785,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the currently selected rows.
-   * 
+   *
    * @return the currently selected rows
    */
   public int[] getSelectionRows()
@@ -802,7 +802,7 @@ public class DefaultTreeSelectionModel
               {
                 if (rows[i] == -1)
                   invisible++;
-                
+
               }
             // Clean up invisible rows.
             if (invisible > 0)
@@ -831,7 +831,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the smallest row index from the selection.
-   * 
+   *
    * @return the smallest row index from the selection
    */
   public int getMinSelectionRow()
@@ -841,7 +841,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns the largest row index from the selection.
-   * 
+   *
    * @return the largest row index from the selection
    */
   public int getMaxSelectionRow()
@@ -851,7 +851,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Checks if a particular row is selected.
-   * 
+   *
    * @param row the index of the row to check
    * @return <code>true</code> if the row is in this selection,
    *         <code>false</code> otherwise
@@ -899,7 +899,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * getLeadSelectionRow
-   * 
+   *
    * @return int
    */
   public int getLeadSelectionRow()
@@ -909,7 +909,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * getLeadSelectionPath
-   * 
+   *
    * @return TreePath
    */
   public TreePath getLeadSelectionPath()
@@ -919,7 +919,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Adds a <code>PropertyChangeListener</code> object to this model.
-   * 
+   *
    * @param listener the listener to add.
    */
   public void addPropertyChangeListener(PropertyChangeListener listener)
@@ -931,7 +931,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Removes a <code>PropertyChangeListener</code> object from this model.
-   * 
+   *
    * @param listener the listener to remove.
    */
   public void removePropertyChangeListener(PropertyChangeListener listener)
@@ -942,7 +942,7 @@ public class DefaultTreeSelectionModel
 
   /**
    * Returns all added <code>PropertyChangeListener</code> objects.
-   * 
+   *
    * @return an array of listeners.
    * @since 1.4
    */
@@ -1000,12 +1000,12 @@ public class DefaultTreeSelectionModel
         && selection.length > 1)
       setSelectionPath(selection[0]);
   }
-  
+
   /**
    * Returns <code>true</code> if the paths are contiguous (take subsequent
    * rows in the diplayed tree view. The method returns <code>true</code> if
    * we have no RowMapper assigned.
-   * 
+   *
    * @param paths the paths to check for continuity
    * @return <code>true</code> if the paths are contiguous or we have no
    *         RowMapper assigned
@@ -1038,7 +1038,7 @@ public class DefaultTreeSelectionModel
                 selected.set(row);
                 valid++;
               }
-            
+
           }
       }
     int max = valid + min;
@@ -1057,7 +1057,7 @@ public class DefaultTreeSelectionModel
    * <li>selectionMode is {@link #DISCONTIGUOUS_TREE_SELECTION}</li>
    * <li>adding the paths to the selection still results in a contiguous set of
    * paths</li>
-   * 
+   *
    * @param paths the paths to check
    * @return <code>true</code> if the paths can be added with respect to the
    *         selectionMode
@@ -1107,11 +1107,11 @@ public class DefaultTreeSelectionModel
         return false;
     return true;
   }
-  
+
   /**
    * Checks if the paths can be removed without breaking the continuity of the
    * selection according to selectionMode.
-   * 
+   *
    * @param paths the paths to check
    * @return <code>true</code> if the paths can be removed with respect to the
    *         selectionMode
@@ -1121,20 +1121,20 @@ public class DefaultTreeSelectionModel
     if (rowMapper == null || isSelectionEmpty()
         || selectionMode == DISCONTIGUOUS_TREE_SELECTION)
       return true;
-    
+
     HashSet<TreePath> set = new HashSet<TreePath>();
     for (int i = 0; i < selection.length; i++)
       set.add(selection[i]);
-    
+
     for (int i = 0; i < paths.length; i++)
       set.remove(paths[i]);
-    
+
     TreePath[] remaining = new TreePath[set.size()];
     Iterator<TreePath> iter = set.iterator();
-    
+
     for (int i = 0; i < remaining.length; i++)
       remaining[i] = iter.next();
-    
+
     return arePathsContiguous(remaining);
   }
 
@@ -1142,12 +1142,12 @@ public class DefaultTreeSelectionModel
    * Notify the installed listeners that the given patches have changed. This
    * method will call listeners if invoked, but it is not called from the
    * implementation of this class.
-   * 
+   *
    * @param vPaths the vector of the changed patches
    * @param oldLeadSelection the old selection index
    */
   protected void notifyPathChange(Vector<PathPlaceHolder> vPaths,
-				  TreePath oldLeadSelection)
+                                  TreePath oldLeadSelection)
   {
 
     int numChangedPaths = vPaths.size();
diff --git a/libjava/classpath/javax/swing/tree/ExpandVetoException.java b/libjava/classpath/javax/swing/tree/ExpandVetoException.java
index 57531d54200..fd6330cf74f 100644
--- a/libjava/classpath/javax/swing/tree/ExpandVetoException.java
+++ b/libjava/classpath/javax/swing/tree/ExpandVetoException.java
@@ -43,7 +43,7 @@ import javax.swing.event.TreeExpansionEvent;
  * ExpandVetoException
  * @author Andrew Selkirk
  */
-public class ExpandVetoException extends Exception 
+public class ExpandVetoException extends Exception
 {
 
   /**
@@ -56,21 +56,21 @@ public class ExpandVetoException extends Exception
    * Constructor ExpandVetoException
    * @param event Tree Expansion Event
    */
-  public ExpandVetoException(TreeExpansionEvent event) 
+  public ExpandVetoException(TreeExpansionEvent event)
   {
     super();
     this.event = event;
-  } 
+  }
 
   /**
    * Constructor ExpandVetoException
    * @param event Tree Expansion Event
    * @param message Message
    */
-  public ExpandVetoException(TreeExpansionEvent event, String message) 
+  public ExpandVetoException(TreeExpansionEvent event, String message)
   {
     super(message);
     this.event = event;
-  } 
+  }
 
-} 
+}
diff --git a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
index 89f05d31c01..6ff2e35950b 100644
--- a/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/FixedHeightLayoutCache.java
@@ -55,13 +55,13 @@ import javax.swing.event.TreeModelEvent;
  * have the same fixed height. This may be not the case, for instance, if leaves
  * and branches have different height, of if the tree rows may have arbitrary
  * variable height. This class will also work if the NodeDimensions are not
- * set.  
- * 
+ * set.
+ *
  * @author Audrius Meskauskas
- * @author Andrew Selkirk 
+ * @author Andrew Selkirk
  */
 public class FixedHeightLayoutCache
-		extends VariableHeightLayoutCache
+                extends VariableHeightLayoutCache
 {
   /**
    * The cached node record.
@@ -74,47 +74,47 @@ public class FixedHeightLayoutCache
       depth = aDepth;
       parent = aParent;
       node = aNode;
-      
-      isExpanded = expanded.contains(aNode); 
+
+      isExpanded = expanded.contains(aNode);
     }
-    
+
     /**
      * The row, where the tree node is displayed.
      */
-    final int row;    
-    
+    final int row;
+
     /**
      * The nesting depth
      */
     final int depth;
-    
+
     /**
      * The parent of the given node, null for the root node.
      */
     final Object parent;
-    
+
     /**
      * This node.
      */
     final Object node;
-    
+
     /**
      * True for the expanded nodes. The value is calculated in constructor.
      * Using this field saves one hashtable access operation.
      */
     final boolean isExpanded;
-    
+
     /**
      * The cached bounds of the tree row.
      */
     Rectangle bounds;
-    
+
     /**
      * The path from the tree top to the given node (computed under first
      * demand)
      */
     private TreePath path;
-    
+
     /**
      * Get the path for this node. The derived class is returned,
      * making check for the last child of some parent easier.
@@ -155,7 +155,7 @@ public class FixedHeightLayoutCache
         }
       return path;
     }
-    
+
     /**
      * Get the rectangle bounds (compute, if required).
      */
@@ -164,37 +164,37 @@ public class FixedHeightLayoutCache
       // This method may be called in the context when the tree rectangle is
       // not known. To work around this, it is assumed near infinitely large.
       if (bounds == null)
-        bounds = getNodeDimensions(node, row, depth, isExpanded, 
+        bounds = getNodeDimensions(node, row, depth, isExpanded,
                                    new Rectangle());
-      return bounds;      
+      return bounds;
     }
   }
-  
+
   /**
    * The set of all expanded tree nodes.
    */
   Set<Object> expanded = new HashSet<Object>();
-  
+
   /**
    * Maps nodes to the row numbers.
    */
   Hashtable<Object,NodeRecord> nodes = new Hashtable<Object,NodeRecord>();
-  
+
   /**
    * Maps row numbers to nodes.
    */
   Hashtable<Integer,Object> row2node = new Hashtable<Integer,Object>();
-  
+
   /**
    * If true, the row map must be recomputed before using.
    */
   boolean dirty;
-  
+
   /**
    * The cumulative height of all rows.
    */
   int totalHeight;
-  
+
   /**
    * The maximal width.
    */
@@ -208,21 +208,21 @@ public class FixedHeightLayoutCache
   public FixedHeightLayoutCache()
   {
     // Nothing to do here.
-  } 
+  }
 
   /**
    * Get the total number of rows in the tree. Every displayed node occupies the
    * single row. The root node row is included if the root node is set as
    * visible (false by default).
-   * 
+   *
    * @return int the number of the displayed rows.
    */
   public int getRowCount()
   {
     if (dirty) update();
     return row2node.size();
-  } 
-  
+  }
+
   /**
    * Refresh the row map.
    */
@@ -230,7 +230,7 @@ public class FixedHeightLayoutCache
   {
     nodes.clear();
     row2node.clear();
-    
+
     totalHeight = maximalWidth = 0;
 
     Object root = treeModel.getRoot();
@@ -250,7 +250,7 @@ public class FixedHeightLayoutCache
       }
     dirty = false;
   }
-  
+
   /**
    * Recursively counts all rows in the tree.
    */
@@ -258,10 +258,10 @@ public class FixedHeightLayoutCache
   {
     Integer n = new Integer(row2node.size());
     row2node.put(n, node);
-    
+
     NodeRecord nr = new NodeRecord(n.intValue(), depth, node, parent);
     nodes.put(node, nr);
-     
+
     // For expanded nodes and for the root node.
     if (expanded.contains(node))
       {
@@ -277,7 +277,7 @@ public class FixedHeightLayoutCache
 
   /**
    * Discard the bound information for the given path.
-   * 
+   *
    * @param path the path, for that the bound information must be recomputed.
    */
   public void invalidatePathBounds(TreePath path)
@@ -285,7 +285,7 @@ public class FixedHeightLayoutCache
     NodeRecord r = (NodeRecord) nodes.get(path.getLastPathComponent());
     if (r != null)
       r.bounds = null;
-  } 
+  }
 
   /**
    * Mark all cached information as invalid.
@@ -293,11 +293,11 @@ public class FixedHeightLayoutCache
   public void invalidateSizes()
   {
     dirty = true;
-  } 
+  }
 
   /**
    * Set the expanded state of the given path. The expansion states must be
-   * always updated when expanding and colapsing the tree nodes. Otherwise 
+   * always updated when expanding and colapsing the tree nodes. Otherwise
    * other methods will not work correctly after the nodes are collapsed or
    * expanded.
    *
@@ -310,23 +310,23 @@ public class FixedHeightLayoutCache
       expanded.add(path.getLastPathComponent());
     else
       expanded.remove(path.getLastPathComponent());
-    
+
     dirty = true;
   }
-  
+
   /**
    * Get the expanded state for the given tree path.
-   * 
+   *
    * @return true if the given path is expanded, false otherwise.
    */
   public boolean isExpanded(TreePath path)
   {
     return expanded.contains(path.getLastPathComponent());
-  } 
+  }
 
   /**
    * Get bounds for the given tree path.
-   * 
+   *
    * @param path the tree path
    * @param rect the rectangle that will be reused to return the result.
    * @return Rectangle the bounds of the last line, defined by the given path.
@@ -356,11 +356,11 @@ public class FixedHeightLayoutCache
         rect.setRect(r.bounds);
       }
     return rect;
-  } 
+  }
 
   /**
    * Get the path, the last element of that is displayed in the given row.
-   * 
+   *
    * @param row the row
    * @return TreePath the path
    */
@@ -376,11 +376,11 @@ public class FixedHeightLayoutCache
         NodeRecord r = nodes.get(last);
         return r.getPath();
       }
-  } 
+  }
 
   /**
    * Get the row, displaying the last node of the given path.
-   * 
+   *
    * @param path the path
    * @return int the row number or -1 if the end of the path is not visible.
    */
@@ -388,7 +388,7 @@ public class FixedHeightLayoutCache
   {
     if (path == null)
       return -1;
-    
+
     if (dirty) update();
 
     NodeRecord r = nodes.get(path.getLastPathComponent());
@@ -396,11 +396,11 @@ public class FixedHeightLayoutCache
       return - 1;
     else
       return r.row;
-  } 
+  }
 
   /**
    * Get the path, closest to the given point.
-   * 
+   *
    * @param x the point x coordinate
    * @param y the point y coordinate
    * @return the tree path, closest to the the given point
@@ -414,7 +414,7 @@ public class FixedHeightLayoutCache
     NodeRecord best = null;
     NodeRecord r;
     Enumeration<NodeRecord> en = nodes.elements();
-    
+
     int dist = Integer.MAX_VALUE;
 
     while (en.hasMoreElements() && dist > 0)
@@ -440,8 +440,8 @@ public class FixedHeightLayoutCache
       return null;
     else
       return best.getPath();
-  } 
-  
+  }
+
   /**
    * Get the closest distance from this point till the given rectangle. Only
    * vertical distance is taken into consideration.
@@ -461,22 +461,22 @@ public class FixedHeightLayoutCache
    * is not expanded, 0 is returned. Otherwise, the number of children is
    * obtained from the model as the number of children for the last path
    * component.
-   * 
+   *
    * @param path the tree path
    * @return int the number of the visible childs (for row).
    */
-  public int getVisibleChildCount(TreePath path)  
+  public int getVisibleChildCount(TreePath path)
   {
     if (isExpanded(path))
-      return 0; 
+      return 0;
     else
       return treeModel.getChildCount(path.getLastPathComponent());
-  } 
+  }
 
   /**
    * Get the enumeration over all visible paths that start from the given
    * parent path.
-   * 
+   *
    * @param parentPath the parent path
    * @return the enumeration over pathes
    */
@@ -500,9 +500,9 @@ public class FixedHeightLayoutCache
 
   /**
    * Return the expansion state of the given tree path. The expansion state
-   * must be previously set with the 
+   * must be previously set with the
    * {@link #setExpandedState(TreePath, boolean)}
-   * 
+   *
    * @param path the path being checked
    * @return true if the last node of the path is expanded, false otherwise.
    */
@@ -513,44 +513,44 @@ public class FixedHeightLayoutCache
 
   /**
    * The listener method, called when the tree nodes are changed.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesChanged(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
    * The listener method, called when the tree nodes are inserted.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesInserted(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
    * The listener method, called when the tree nodes are removed.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesRemoved(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
-   * Called when the tree structure has been changed. 
-   * 
+   * Called when the tree structure has been changed.
+   *
    * @param event the change event
    */
   public void treeStructureChanged(TreeModelEvent event)
   {
     dirty = true;
-  } 
-  
+  }
+
   /**
    * Set the tree model that will provide the data.
    */
@@ -561,11 +561,11 @@ public class FixedHeightLayoutCache
     expanded.add(treeModel.getRoot());
     dirty = true;
   }
-  
+
   /**
    * Inform the instance if the tree root node is visible. If this method
    * is not called, it is assumed that the tree root node is not visible.
-   * 
+   *
    * @param visible true if the tree root node is visible, false
    * otherwise.
    */
@@ -600,7 +600,7 @@ public class FixedHeightLayoutCache
   {
     if (dirty)
       update();
-    
+
     maximalWidth = 0;
     Enumeration<NodeRecord> en = nodes.elements();
     while (en.hasMoreElements())
@@ -612,17 +612,17 @@ public class FixedHeightLayoutCache
       }
     return maximalWidth;
   }
-  
+
   /**
    * Returns true if this layout supposes that all rows have the fixed
    * height.
-   * 
+   *
    * @return boolean true if all rows in the tree must have the fixed
    * height (true by default).
    */
   protected boolean isFixedRowHeight()
   {
-    return true; 
+    return true;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/swing/tree/MutableTreeNode.java b/libjava/classpath/javax/swing/tree/MutableTreeNode.java
index 9f0ff4ded81..4a0f4b69fa1 100644
--- a/libjava/classpath/javax/swing/tree/MutableTreeNode.java
+++ b/libjava/classpath/javax/swing/tree/MutableTreeNode.java
@@ -39,7 +39,7 @@ package javax.swing.tree;
 
 /**
  * MutableTreeNode public interface
- 
+
  * @author Andrew Selkirk
  */
 public interface MutableTreeNode extends TreeNode
@@ -79,7 +79,7 @@ public interface MutableTreeNode extends TreeNode
   void remove(MutableTreeNode node);
 
   /**
-   * Sets a user object, the data represented by the node. 
+   * Sets a user object, the data represented by the node.
    *
    * @param object the data
    */
diff --git a/libjava/classpath/javax/swing/tree/RowMapper.java b/libjava/classpath/javax/swing/tree/RowMapper.java
index 59eb1e3a9fa..d62b703c6a4 100644
--- a/libjava/classpath/javax/swing/tree/RowMapper.java
+++ b/libjava/classpath/javax/swing/tree/RowMapper.java
@@ -41,7 +41,7 @@ package javax.swing.tree;
  * RowMapper public interface
  * @author Andrew Selkirk
  */
-public interface RowMapper 
+public interface RowMapper
 {
 
   /**
@@ -51,4 +51,4 @@ public interface RowMapper
    */
   int[] getRowsForPaths(TreePath[] path);
 
-} 
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/swing/tree/TreeCellEditor.java b/libjava/classpath/javax/swing/tree/TreeCellEditor.java
index 8951f313798..614f98df8fd 100644
--- a/libjava/classpath/javax/swing/tree/TreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/TreeCellEditor.java
@@ -46,26 +46,26 @@ import javax.swing.JTree;
 /**
  * A <code>TreeCellEditor</code> is used by the {@link JTree} component to
  * edit individual tree elements (nodes).
- * 
+ *
  * @author Andrew Selkirk
  */
 public interface TreeCellEditor extends CellEditor
 {
   /**
-   * Returns a component that has been configured to edit one element (or 
+   * Returns a component that has been configured to edit one element (or
    * node) in a {@link JTree} component.  The arguments to this method are used
    * to pass in the value and state of the element to be edited.
-   * 
+   *
    * @param tree  the tree.
    * @param value  the value to render.
    * @param isSelected  is the tree element selected?
    * @param expanded  is the tree element expanded?
    * @param leaf  is the tree element a leaf node?
    * @param row  the row index.
-   * 
+   *
    * @return A component that is configured for editing the tree element.
    */
   Component getTreeCellEditorComponent(JTree tree, Object value,
-				       boolean isSelected, boolean expanded,
-				       boolean leaf, int row);
+                                       boolean isSelected, boolean expanded,
+                                       boolean leaf, int row);
 }
diff --git a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
index b7eeb9c6ca4..fdfc0a116a7 100644
--- a/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/TreeCellRenderer.java
@@ -45,16 +45,16 @@ import javax.swing.JTree;
 /**
  * A <code>TreeCellRenderer</code> is used by the {@link JTree} component to
  * paint individual tree elements (nodes).
- * 
+ *
  * @author Andrew Selkirk
  */
 public interface TreeCellRenderer
 {
   /**
-   * Returns a component that has been configured to display one element (or 
+   * Returns a component that has been configured to display one element (or
    * node) in a {@link JTree} component.  The arguments to this method are used
    * to pass in the value and state of the element to be rendered.
-   * 
+   *
    * @param tree  the tree.
    * @param value  the value to render.
    * @param selected  is the tree element selected?
@@ -62,7 +62,7 @@ public interface TreeCellRenderer
    * @param leaf  is the tree element a leaf node?
    * @param row  the row index.
    * @param hasFocus  does the tree element have the focus?
-   * 
+   *
    * @return A component that is configured for rendering the tree element.
    */
   Component getTreeCellRendererComponent(JTree tree, Object value,
diff --git a/libjava/classpath/javax/swing/tree/TreeNode.java b/libjava/classpath/javax/swing/tree/TreeNode.java
index 53d52f0a7cb..b68b498a7b3 100644
--- a/libjava/classpath/javax/swing/tree/TreeNode.java
+++ b/libjava/classpath/javax/swing/tree/TreeNode.java
@@ -42,16 +42,16 @@ import java.util.Enumeration;
 
 /**
  * A tree node.
- * 
+ *
  * @author Andrew Selkirk
  */
-public interface TreeNode 
+public interface TreeNode
 {
 
   /**
    * Returns the parent node for this tree node, or <code>null</code> if this
    * node has no parent.
-   * 
+   *
    * @return The parent node (possibly <code>null</code>).
    */
   TreeNode getParent();
@@ -59,56 +59,55 @@ public interface TreeNode
   /**
    * Returns the index of the specified child node, or -1 if the node is not
    * in fact a child of this node.
-   * 
+   *
    * @param node  the node (<code>null</code> not permitted).
-   * 
+   *
    * @return The index of the specified child node, or -1.
-   * 
+   *
    * @throws IllegalArgumentException if <code>node</code> is <code>null</code>.
    */
   int getIndex(TreeNode node);
 
   /**
    * Returns the child node at the given index.
-   * 
-   * @param index  the index (in the range <code>0</code> to 
+   *
+   * @param index  the index (in the range <code>0</code> to
    *     <code>getChildCount() - 1</code>).
-   *     
+   *
    * @return The child node at the given index.
    */
   TreeNode getChildAt(int index);
 
   /**
    * Returns the number of children for this node.
-   * 
+   *
    * @return The number of children for this node.
    */
   int getChildCount();
 
   /**
-   * Returns <code>true</code> if this node allows children, and 
+   * Returns <code>true</code> if this node allows children, and
    * <code>false</code> otherwise.
-   * 
+   *
    * @return A boolean.
    */
   boolean getAllowsChildren();
 
   /**
-   * Returns <code>true</code> if this node is a leaf node, and 
+   * Returns <code>true</code> if this node is a leaf node, and
    * <code>false</code> otherwise.
-   * 
+   *
    * @return A boolean.
    */
   boolean isLeaf();
 
   /**
-   * Returns an enumeration of the children of this node, or an empty 
+   * Returns an enumeration of the children of this node, or an empty
    * enumeration if this node has no children.
-   * 
+   *
    * @return An enumeration of the children of this node.
    */
   @SuppressWarnings("unchecked") // Required for API compatibility
   Enumeration children();
 
-} 
-
+}
diff --git a/libjava/classpath/javax/swing/tree/TreePath.java b/libjava/classpath/javax/swing/tree/TreePath.java
index 1c4d78787f4..764970696d9 100644
--- a/libjava/classpath/javax/swing/tree/TreePath.java
+++ b/libjava/classpath/javax/swing/tree/TreePath.java
@@ -45,7 +45,7 @@ import java.util.Arrays;
  * A <code>TreePath</code> represents a sequence of tree elements that form
  * a path starting from the root of a tree.  A tree element can be represented
  * by any {@link Object}.
- * 
+ *
  * @author Andrew Selkirk
  */
 public class TreePath implements Serializable
@@ -57,7 +57,7 @@ public class TreePath implements Serializable
    * assumes that the TreePath is immutable, so it is marked final here.
    */
   private final Object[] path;
-  
+
   /**
    * The parent path (to be reused).
    */
@@ -68,9 +68,9 @@ public class TreePath implements Serializable
    * Creates a path from the list of objects representing tree elements.  The
    * incoming array is copied so that subsequent changes do not affect this
    * tree path.
-   * 
+   *
    * @param path  the elements in the path (<code>null</code> not permitted).
-   * 
+   *
    * @throws IllegalArgumentException if <code>path</code> is <code>null</code>.
    */
   public TreePath(Object[] path)
@@ -83,10 +83,10 @@ public class TreePath implements Serializable
 
   /**
    * Creates a new path from a single element.
-   * 
+   *
    * @param element the element (<code>null</code> not permitted).
-   * 
-   * @throws IllegalArgumentException if <code>element</code> is 
+   *
+   * @throws IllegalArgumentException if <code>element</code> is
    *         <code>null</code>.
    */
   public TreePath(Object element)
@@ -98,7 +98,7 @@ public class TreePath implements Serializable
   /**
    * Creates a new tree path by adding the specified <code>element</code> to
    * the <code>path</code>.
-   * 
+   *
    * @param path  a tree path.
    * @param element  a path element.
    */
@@ -117,7 +117,7 @@ public class TreePath implements Serializable
   /**
    * Creates a new tree path using the first <code>length</code> elements
    * from the given array.
-   * 
+   *
    * @param path  the path elements.
    * @param length  the path length.
    */
@@ -139,7 +139,7 @@ public class TreePath implements Serializable
 
   /**
    * Returns a hashcode for the path.
-   * 
+   *
    * @return A hashcode.
    */
   public int hashCode()
@@ -148,7 +148,7 @@ public class TreePath implements Serializable
   }
 
   /**
-   * Tests this path for equality with an arbitrary object.  An object is 
+   * Tests this path for equality with an arbitrary object.  An object is
    * considered equal to this path if and only if:
    * <ul>
    * <li>the object is not <code>null</code>;</li>
@@ -156,9 +156,9 @@ public class TreePath implements Serializable
    * <li>the object contains the same elements in the same order as this
    * {@link TreePath};</li>
    * </ul>
-   * 
+   *
    * @param object  the object (<code>null</code> permitted).
-   * 
+   *
    * @return <code>true</code> if <code>obj</code> is equal to this tree path,
    *         and <code>false</code> otherwise.
    */
@@ -188,7 +188,7 @@ public class TreePath implements Serializable
 
   /**
    * Returns a string representation of this path.
-   * 
+   *
    * @return A string representation of this path.
    */
   public String toString()
@@ -201,7 +201,7 @@ public class TreePath implements Serializable
 
   /**
    * Returns an array containing the path elements.
-   * 
+   *
    * @return An array containing the path elements.
    */
   public Object[] getPath()
@@ -211,7 +211,7 @@ public class TreePath implements Serializable
 
   /**
    * Returns the last object in the path.
-   * 
+   *
    * @return The last object in the path.
    */
   public Object getLastPathComponent()
@@ -221,7 +221,7 @@ public class TreePath implements Serializable
 
   /**
    * Returns the number of elements in the path.
-   * 
+   *
    * @return The number of elements in the path.
    */
   public int getPathCount()
@@ -231,29 +231,29 @@ public class TreePath implements Serializable
 
   /**
    * Returns the element at the specified position in the path.
-   * 
-   * @param position the element position (<code>0 < N - 1</code>, where 
+   *
+   * @param position the element position (<code>0 < N - 1</code>, where
    *                 <code>N</code> is the number of elements in the path).
-   * 
+   *
    * @return The element at the specified position.
-   * 
+   *
    * @throws IllegalArgumentException if <code>position</code> is outside the
    *         valid range.
    */
   public Object getPathComponent(int position)
   {
-    if (position < 0 || position >= getPathCount()) 
+    if (position < 0 || position >= getPathCount())
       throw new IllegalArgumentException("Invalid position: " + position);
     return path[position];
   }
 
   /**
    * Returns <code>true</code> if <code>path</code> is a descendant of this
-   * path, and <code>false</code> otherwise.  If <code>path</code> is 
+   * path, and <code>false</code> otherwise.  If <code>path</code> is
    * <code>null</code>, this method returns <code>false</code>.
-   * 
+   *
    * @param path  the path to check (<code>null</code> permitted).
-   * 
+   *
    * @return <code>true</code> if <code>path</code> is a descendant of this
    *         path, and <code>false</code> otherwise
    */
@@ -270,16 +270,16 @@ public class TreePath implements Serializable
         otherPathLength--;
         path = path.getParentPath();
       }
-    
+
     return equals(path);
   }
 
   /**
    * Creates a new path that is equivalent to this path plus the specified
    * element.
-   * 
+   *
    * @param element  the element.
-   * 
+   *
    * @return A tree path.
    */
   public TreePath pathByAddingChild(Object element)
@@ -291,7 +291,7 @@ public class TreePath implements Serializable
    * Returns the parent path, which is a path containing all the same elements
    * as this path, except for the last one.  If this path contains only one
    * element, the method returns <code>null</code>.
-   * 
+   *
    * @return The parent path, or <code>null</code> if this path has only one
    *         element.
    */
@@ -301,12 +301,12 @@ public class TreePath implements Serializable
     // is what the JDK does.
     if (path.length <= 1)
       return null;
-    
+
     // Reuse the parent path, if possible. The parent path is requested
     // during the tree repainting, so reusing generates a lot less garbage.
     if (parentPath == null)
       parentPath = new TreePath(this.getPath(), path.length - 1);
-    
+
     return parentPath;
   }
 }
diff --git a/libjava/classpath/javax/swing/tree/TreeSelectionModel.java b/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
index 9bdc99be350..f2ba02a17af 100644
--- a/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
+++ b/libjava/classpath/javax/swing/tree/TreeSelectionModel.java
@@ -46,7 +46,7 @@ import javax.swing.event.TreeSelectionListener;
  * TreeSelectionModel public interface
  * @author Andrew Selkirk
  */
-public interface TreeSelectionModel 
+public interface TreeSelectionModel
 {
 
   int SINGLE_TREE_SELECTION = 1;
diff --git a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
index aac68692edc..0887061b330 100644
--- a/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/libjava/classpath/javax/swing/tree/VariableHeightLayoutCache.java
@@ -53,11 +53,11 @@ import javax.swing.event.TreeModelEvent;
 /**
  * The fixed height tree layout. This class requires the NodeDimensions to be
  * set and ignores the row height property.
- * 
+ *
  * @specnote the methods, of this class, returning TreePath, actually returns
  * the derived class GnuPath that provides additional information for optimized
  * painting. See the GnuPath code for details.
- * 
+ *
  * @author Audrius Meskauskas
  */
 public class VariableHeightLayoutCache
@@ -80,27 +80,27 @@ public class VariableHeightLayoutCache
       isExpanded = expanded.contains(aNode);
       bounds = new Rectangle(0, -1, 0, 0);
     }
-    
+
     /**
      * The row, where the tree node is displayed.
      */
-    final int row;    
-    
+    final int row;
+
     /**
      * The nesting depth
      */
     final int depth;
-    
+
     /**
      * The parent of the given node, null for the root node.
      */
     final Object parent;
-    
+
     /**
      * This node.
      */
     final Object node;
-    
+
     /**
      * True for the expanded nodes. The value is calculated in constructor.
      * Using this field saves one hashtable access operation.
@@ -111,13 +111,13 @@ public class VariableHeightLayoutCache
      * The cached bounds of the tree row.
      */
     Rectangle bounds;
-    
+
     /**
      * The path from the tree top to the given node (computed under first
      * demand)
      */
     private TreePath path;
-    
+
     /**
      * Get the path for this node. The derived class is returned, making check
      * for the last child of some parent easier.
@@ -158,41 +158,41 @@ public class VariableHeightLayoutCache
         }
       return path;
     }
-    
+
     /**
      * Get the rectangle bounds (compute, if required).
      */
     Rectangle getBounds()
     {
-      return bounds;      
+      return bounds;
     }
   }
-  
+
   /**
    * The set of all expanded tree nodes.
    */
   Set<Object> expanded = new HashSet<Object>();
-  
+
   /**
    * Maps nodes to the row numbers.
    */
   Hashtable<Object,NodeRecord> nodes = new Hashtable<Object,NodeRecord>();
-  
+
   /**
    * Maps row numbers to nodes.
    */
   ArrayList<Object> row2node = new ArrayList<Object>();
-  
+
   /**
    * If true, the row map must be recomputed before using.
    */
   boolean dirty;
-  
+
   /**
    * The cumulative height of all rows.
    */
   int totalHeight;
-  
+
   /**
    * The maximal width.
    */
@@ -206,21 +206,21 @@ public class VariableHeightLayoutCache
   public VariableHeightLayoutCache()
   {
     // Nothing to do here.
-  } 
+  }
 
   /**
    * Get the total number of rows in the tree. Every displayed node occupies the
    * single row. The root node row is included if the root node is set as
    * visible (false by default).
-   * 
+   *
    * @return int the number of the displayed rows.
    */
   public int getRowCount()
   {
     if (dirty) update();
     return row2node.size();
-  } 
-  
+  }
+
   /**
    * Refresh the row map.
    */
@@ -228,7 +228,7 @@ public class VariableHeightLayoutCache
   {
     nodes.clear();
     row2node.clear();
-    
+
     totalHeight = maximalWidth = 0;
 
     if (treeModel == null)
@@ -238,7 +238,7 @@ public class VariableHeightLayoutCache
     countRows(root, null, 0, 0);
     dirty = false;
   }
-  
+
   /**
    * Recursively counts all rows in the tree.
    */
@@ -287,7 +287,7 @@ public class VariableHeightLayoutCache
 
   /**
    * Discard the bound information for the given path.
-   * 
+   *
    * @param path the path, for that the bound information must be recomputed.
    */
   public void invalidatePathBounds(TreePath path)
@@ -295,7 +295,7 @@ public class VariableHeightLayoutCache
     NodeRecord r = nodes.get(path.getLastPathComponent());
     if (r != null)
       r.bounds = null;
-  } 
+  }
 
   /**
    * Mark all cached information as invalid.
@@ -303,11 +303,11 @@ public class VariableHeightLayoutCache
   public void invalidateSizes()
   {
     dirty = true;
-  } 
+  }
 
   /**
    * Set the expanded state of the given path. The expansion states must be
-   * always updated when expanding and colapsing the tree nodes. Otherwise 
+   * always updated when expanding and colapsing the tree nodes. Otherwise
    * other methods will not work correctly after the nodes are collapsed or
    * expanded.
    *
@@ -327,20 +327,20 @@ public class VariableHeightLayoutCache
 
     dirty = true;
   }
-  
+
   /**
    * Get the expanded state for the given tree path.
-   * 
+   *
    * @return true if the given path is expanded, false otherwise.
    */
   public boolean isExpanded(TreePath path)
   {
     return expanded.contains(path.getLastPathComponent());
-  } 
+  }
 
   /**
    * Get bounds for the given tree path.
-   * 
+   *
    * @param path the tree path
    * @param rect the rectangle that will be reused to return the result.
    * @return Rectangle the bounds of the last line, defined by the given path.
@@ -366,11 +366,11 @@ public class VariableHeightLayoutCache
           result.setBounds(r.bounds);
       }
     return result;
-  } 
+  }
 
   /**
    * Get the path, the last element of that is displayed in the given row.
-   * 
+   *
    * @param row the row
    * @return TreePath the path
    */
@@ -389,11 +389,11 @@ public class VariableHeightLayoutCache
           path = record.getPath();
       }
     return path;
-  } 
+  }
 
   /**
    * Get the row, displaying the last node of the given path.
-   * 
+   *
    * @param path the path
    * @return int the row number or -1 if the end of the path is not visible.
    */
@@ -410,11 +410,11 @@ public class VariableHeightLayoutCache
       return - 1;
     else
       return r.row;
-  } 
+  }
 
   /**
    * Get the path, closest to the given point.
-   * 
+   *
    * @param x the point x coordinate
    * @param y the point y coordinate
    * @return the tree path, closest to the the given point
@@ -428,7 +428,7 @@ public class VariableHeightLayoutCache
     NodeRecord best = null;
     NodeRecord r;
     Enumeration<NodeRecord> en = nodes.elements();
-    
+
     int dist = Integer.MAX_VALUE;
 
     while (en.hasMoreElements() && dist > 0)
@@ -454,8 +454,8 @@ public class VariableHeightLayoutCache
       return null;
     else
       return best.getPath();
-  } 
-  
+  }
+
   /**
    * Get the closest distance from this point till the given rectangle. Only
    * vertical distance is taken into consideration.
@@ -475,22 +475,22 @@ public class VariableHeightLayoutCache
    * is not expanded, 0 is returned. Otherwise, the number of children is
    * obtained from the model as the number of children for the last path
    * component.
-   * 
+   *
    * @param path the tree path
    * @return int the number of the visible childs (for row).
    */
-  public int getVisibleChildCount(TreePath path)  
+  public int getVisibleChildCount(TreePath path)
   {
     if (! isExpanded(path) || treeModel == null)
-      return 0; 
+      return 0;
     else
       return treeModel.getChildCount(path.getLastPathComponent());
-  } 
+  }
 
   /**
    * Get the enumeration over all visible paths that start from the given
    * parent path.
-   * 
+   *
    * @param parentPath the parent path
    * @return the enumeration over pathes
    */
@@ -514,9 +514,9 @@ public class VariableHeightLayoutCache
 
   /**
    * Return the expansion state of the given tree path. The expansion state
-   * must be previously set with the 
+   * must be previously set with the
    * {@link #setExpandedState(TreePath, boolean)}
-   * 
+   *
    * @param path the path being checked
    * @return true if the last node of the path is expanded, false otherwise.
    */
@@ -527,44 +527,44 @@ public class VariableHeightLayoutCache
 
   /**
    * The listener method, called when the tree nodes are changed.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesChanged(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
    * The listener method, called when the tree nodes are inserted.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesInserted(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
    * The listener method, called when the tree nodes are removed.
-   * 
+   *
    * @param event the change event
    */
   public void treeNodesRemoved(TreeModelEvent event)
   {
     dirty = true;
-  } 
+  }
 
   /**
-   * Called when the tree structure has been changed. 
-   * 
+   * Called when the tree structure has been changed.
+   *
    * @param event the change event
    */
   public void treeStructureChanged(TreeModelEvent event)
   {
     dirty = true;
-  } 
-  
+  }
+
   /**
    * Set the tree model that will provide the data.
    */
@@ -578,11 +578,11 @@ public class VariableHeightLayoutCache
         expanded.add(treeModel.getRoot());
       }
   }
-  
+
   /**
    * Inform the instance if the tree root node is visible. If this method
    * is not called, it is assumed that the tree root node is not visible.
-   * 
+   *
    * @param visible true if the tree root node is visible, false
    * otherwise.
    */
@@ -616,7 +616,7 @@ public class VariableHeightLayoutCache
   {
     if (dirty)
       update();
-    
+
     maximalWidth = 0;
     Enumeration<NodeRecord> en = nodes.elements();
     while (en.hasMoreElements())
diff --git a/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java b/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
index 34c41aea274..fc586604a7e 100644
--- a/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
+++ b/libjava/classpath/javax/swing/undo/AbstractUndoableEdit.java
@@ -130,8 +130,8 @@ public class AbstractUndoableEdit
       throw new CannotUndoException();
     hasBeenDone = false;
   }
-  
-  
+
+
   /**
    * Determines whether it would be possible to undo this editing
    * action.
@@ -146,8 +146,8 @@ public class AbstractUndoableEdit
   {
     return alive && hasBeenDone;
   }
-  
-  
+
+
   /**
    * Redoes this editing action.
    *
@@ -165,8 +165,8 @@ public class AbstractUndoableEdit
       throw new CannotRedoException();
     hasBeenDone = true;
   }
-  
-  
+
+
   /**
    * Determines whether it would be possible to redo this editing
    * action.
@@ -208,8 +208,8 @@ public class AbstractUndoableEdit
   {
     return false;
   }
-  
-  
+
+
   /**
    * Incorporates another editing action into this one, thus forming a
    * combined action that replaces the argument action.
@@ -223,8 +223,8 @@ public class AbstractUndoableEdit
   {
     return false;
   }
-  
-  
+
+
   /**
    * Determines whether this editing action is significant enough for
    * being seperately undoable by the user. A typical significant
@@ -242,8 +242,8 @@ public class AbstractUndoableEdit
   {
     return true;
   }
-  
-  
+
+
   /**
    * Returns a human-readable, localized name that describes this
    * editing action and can be displayed to the user.
diff --git a/libjava/classpath/javax/swing/undo/CompoundEdit.java b/libjava/classpath/javax/swing/undo/CompoundEdit.java
index fbff2a26418..64e51740d0a 100644
--- a/libjava/classpath/javax/swing/undo/CompoundEdit.java
+++ b/libjava/classpath/javax/swing/undo/CompoundEdit.java
@@ -82,7 +82,7 @@ public class CompoundEdit
    * Indicates whether the creation of this CompoundEdit is still in
    * progress. Initially, the value of this flag is
    * <code>true</code>. The {@link #end()} method changes the flag to
-   * <code>false</code>. 
+   * <code>false</code>.
    */
   private boolean inProgress;
 
@@ -95,7 +95,7 @@ public class CompoundEdit
     edits = new Vector<UndoableEdit>();
     inProgress = true;
   }
-  
+
 
   /**
    * Undoes all edits that are part of of this
@@ -146,7 +146,7 @@ public class CompoundEdit
       edits.elementAt(i).redo();
   }
 
-  
+
   /**
    * Returns the the <code>UndoableEdit</code> that was last added to
    * this compound.
@@ -191,7 +191,7 @@ public class CompoundEdit
    * UndoableEdit#replaceEdit(UndoableEdit) replace} the last added
    * edit.  If this fails as well, <code>edit</code> gets added as a
    * new compound to {@link #edits}.
-   * 
+   *
    * @param edit the editing action being added.
    *
    * @return <code>true</code> if <code>edit</code> could somehow be
@@ -321,7 +321,7 @@ public class CompoundEdit
 
     return false;
   }
-  
+
 
   /**
    * Returns a human-readable, localized name that describes this
@@ -386,8 +386,8 @@ public class CompoundEdit
     else
       return last.getRedoPresentationName();
   }
-  
-  
+
+
   /**
    * Calculates a string that may be useful for debugging.
    */
diff --git a/libjava/classpath/javax/swing/undo/StateEdit.java b/libjava/classpath/javax/swing/undo/StateEdit.java
index a032d02cdb8..819d052c5ae 100644
--- a/libjava/classpath/javax/swing/undo/StateEdit.java
+++ b/libjava/classpath/javax/swing/undo/StateEdit.java
@@ -251,15 +251,15 @@ public class StateEdit
     Iterator<Object> i = preState.keySet().iterator();
     while (i.hasNext())
       {
-	Object key = i.next();
-	if (postState.containsKey(key))
-	  {
-	    if (preState.get(key).equals(postState.get(key)))
-	      {
-		i.remove();
-		postState.remove(key);
-	      }
-	  }
+        Object key = i.next();
+        if (postState.containsKey(key))
+          {
+            if (preState.get(key).equals(postState.get(key)))
+              {
+                i.remove();
+                postState.remove(key);
+              }
+          }
       }
   }
 }
diff --git a/libjava/classpath/javax/swing/undo/UndoManager.java b/libjava/classpath/javax/swing/undo/UndoManager.java
index 1f47d51706e..9b10cc575d1 100644
--- a/libjava/classpath/javax/swing/undo/UndoManager.java
+++ b/libjava/classpath/javax/swing/undo/UndoManager.java
@@ -356,7 +356,7 @@ public class UndoManager
       }
   }
 
-  
+
   /**
    * Undoes or redoes the last action. If the last action has already
    * been undone, it will be re-done, and vice versa.
@@ -598,8 +598,8 @@ public class UndoManager
     else
       return edit.getRedoPresentationName();
   }
-  
-  
+
+
   /**
    * Registers the edit action of an {@link UndoableEditEvent}
    * with this UndoManager.
diff --git a/libjava/classpath/javax/swing/undo/UndoableEdit.java b/libjava/classpath/javax/swing/undo/UndoableEdit.java
index 9938af751c7..1a08ecaa52e 100644
--- a/libjava/classpath/javax/swing/undo/UndoableEdit.java
+++ b/libjava/classpath/javax/swing/undo/UndoableEdit.java
@@ -39,10 +39,10 @@ package javax.swing.undo;
 
 /**
  * An editing operation that supports undo/redoability.
- * 
+ *
  * @author Andrew Selkirk
  */
-public interface UndoableEdit 
+public interface UndoableEdit
 {
 
   /**
@@ -50,8 +50,8 @@ public interface UndoableEdit
    * combined action.
    *
    * @param edit the editing action to be incorporated.
-   * 
-   * @return <code>true</code> if the edit was combined successfully, and 
+   *
+   * @return <code>true</code> if the edit was combined successfully, and
    *         <code>false</code> if it could not be combined.
    */
   boolean addEdit(UndoableEdit edit);
@@ -98,14 +98,14 @@ public interface UndoableEdit
 
   /**
    * Returns the redo presentation name.
-   * 
+   *
    * @return The redo presentation name.
    */
   String getRedoPresentationName();
 
   /**
    * Returns the undo presentation name.
-   * 
+   *
    * @return The undo presentation name.
    */
   String getUndoPresentationName();
@@ -138,8 +138,8 @@ public interface UndoableEdit
    * combined action that replaces the argument action.
    *
    * @param edit the editing action to be replaced.
-   * 
-   * @return <code>true</code> if the edit is successfully replaced, and 
+   *
+   * @return <code>true</code> if the edit is successfully replaced, and
    *         <code>false</code> otherwise.
    */
   boolean replaceEdit(UndoableEdit edit);
diff --git a/libjava/classpath/javax/tools/FileObject.java b/libjava/classpath/javax/tools/FileObject.java
index a1d65c64250..e04c056c7c5 100644
--- a/libjava/classpath/javax/tools/FileObject.java
+++ b/libjava/classpath/javax/tools/FileObject.java
@@ -116,7 +116,7 @@ public interface FileObject
    * that cannot be decoded will be replaced by the default replacement
    * character. A diagnostic may be reported, unless
    * <code>ignoreEncodingErrors</code> is <code>true</code>.
-   * 
+   *
    * @param ignoreEncodingErrors <code>true</code> when encoding errors should be ignored
    *                             <code>false</code> otherwise
    * @return the character content, or <code>null</code> if not available
diff --git a/libjava/classpath/javax/transaction/HeuristicCommitException.java b/libjava/classpath/javax/transaction/HeuristicCommitException.java
index 60ac7756aa3..e6af0d4ff52 100644
--- a/libjava/classpath/javax/transaction/HeuristicCommitException.java
+++ b/libjava/classpath/javax/transaction/HeuristicCommitException.java
@@ -1,4 +1,4 @@
-/* HeuristicCommitException.java -- 
+/* HeuristicCommitException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/HeuristicMixedException.java b/libjava/classpath/javax/transaction/HeuristicMixedException.java
index b5e89fb1a10..3b38cb9f81e 100644
--- a/libjava/classpath/javax/transaction/HeuristicMixedException.java
+++ b/libjava/classpath/javax/transaction/HeuristicMixedException.java
@@ -1,4 +1,4 @@
-/* HeuristicMixedException.java -- 
+/* HeuristicMixedException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/HeuristicRollbackException.java b/libjava/classpath/javax/transaction/HeuristicRollbackException.java
index 3ad34fa47bb..ebd0db78fb0 100644
--- a/libjava/classpath/javax/transaction/HeuristicRollbackException.java
+++ b/libjava/classpath/javax/transaction/HeuristicRollbackException.java
@@ -1,4 +1,4 @@
-/* HeuristicRollbackException.java -- 
+/* HeuristicRollbackException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/InvalidTransactionException.java b/libjava/classpath/javax/transaction/InvalidTransactionException.java
index 82eefe67eb2..e7a8b23d73b 100644
--- a/libjava/classpath/javax/transaction/InvalidTransactionException.java
+++ b/libjava/classpath/javax/transaction/InvalidTransactionException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction;
- 
+
 import java.rmi.RemoteException;
 
 /**
diff --git a/libjava/classpath/javax/transaction/NotSupportedException.java b/libjava/classpath/javax/transaction/NotSupportedException.java
index a416d133aa4..15fe8a06b65 100644
--- a/libjava/classpath/javax/transaction/NotSupportedException.java
+++ b/libjava/classpath/javax/transaction/NotSupportedException.java
@@ -1,4 +1,4 @@
-/* NotSupportedException.java -- 
+/* NotSupportedException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/RollbackException.java b/libjava/classpath/javax/transaction/RollbackException.java
index 4fd51cf6e2c..1be0604ada8 100644
--- a/libjava/classpath/javax/transaction/RollbackException.java
+++ b/libjava/classpath/javax/transaction/RollbackException.java
@@ -1,4 +1,4 @@
-/* RollbackException.java -- 
+/* RollbackException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/Status.java b/libjava/classpath/javax/transaction/Status.java
index 6bbbffbf00a..59df5036b71 100644
--- a/libjava/classpath/javax/transaction/Status.java
+++ b/libjava/classpath/javax/transaction/Status.java
@@ -1,4 +1,4 @@
-/* Status.java -- 
+/* Status.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/Synchronization.java b/libjava/classpath/javax/transaction/Synchronization.java
index eea50277cb1..504436aa26d 100644
--- a/libjava/classpath/javax/transaction/Synchronization.java
+++ b/libjava/classpath/javax/transaction/Synchronization.java
@@ -1,4 +1,4 @@
-/* Synchronization.java -- 
+/* Synchronization.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/SystemException.java b/libjava/classpath/javax/transaction/SystemException.java
index d614fb3c5ab..79e64433565 100644
--- a/libjava/classpath/javax/transaction/SystemException.java
+++ b/libjava/classpath/javax/transaction/SystemException.java
@@ -1,4 +1,4 @@
-/* SystemException.java -- 
+/* SystemException.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/Transaction.java b/libjava/classpath/javax/transaction/Transaction.java
index b5b7108f069..060bb10e7ce 100644
--- a/libjava/classpath/javax/transaction/Transaction.java
+++ b/libjava/classpath/javax/transaction/Transaction.java
@@ -1,4 +1,4 @@
-/* Transaction.java -- 
+/* Transaction.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ exception statement from your version. */
 package javax.transaction;
 
 import javax.transaction.xa.XAResource;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/TransactionManager.java b/libjava/classpath/javax/transaction/TransactionManager.java
index 85a4da9f5df..c2eb4321063 100644
--- a/libjava/classpath/javax/transaction/TransactionManager.java
+++ b/libjava/classpath/javax/transaction/TransactionManager.java
@@ -1,4 +1,4 @@
-/* TransactionManager.java -- 
+/* TransactionManager.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/TransactionRequiredException.java b/libjava/classpath/javax/transaction/TransactionRequiredException.java
index 6c889481005..91e3332cd2a 100644
--- a/libjava/classpath/javax/transaction/TransactionRequiredException.java
+++ b/libjava/classpath/javax/transaction/TransactionRequiredException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction;
- 
+
 import java.rmi.RemoteException;
 
 /**
diff --git a/libjava/classpath/javax/transaction/TransactionRolledbackException.java b/libjava/classpath/javax/transaction/TransactionRolledbackException.java
index 49c22a70e22..e8aa033a22a 100644
--- a/libjava/classpath/javax/transaction/TransactionRolledbackException.java
+++ b/libjava/classpath/javax/transaction/TransactionRolledbackException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction;
- 
+
 import java.rmi.RemoteException;
 
 /**
diff --git a/libjava/classpath/javax/transaction/UserTransaction.java b/libjava/classpath/javax/transaction/UserTransaction.java
index 86922932ed3..e31953b5ab0 100644
--- a/libjava/classpath/javax/transaction/UserTransaction.java
+++ b/libjava/classpath/javax/transaction/UserTransaction.java
@@ -1,4 +1,4 @@
-/* UserTransaction.java -- 
+/* UserTransaction.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@ exception statement from your version. */
 
 
 package javax.transaction;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/xa/XAException.java b/libjava/classpath/javax/transaction/xa/XAException.java
index ceb76f0907f..c7aa9e08a69 100644
--- a/libjava/classpath/javax/transaction/xa/XAException.java
+++ b/libjava/classpath/javax/transaction/xa/XAException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction.xa;
- 
+
 /**
  * @author Tom Tromey (tromey@redhat.com)
  * @date April 18, 2001
diff --git a/libjava/classpath/javax/transaction/xa/XAResource.java b/libjava/classpath/javax/transaction/xa/XAResource.java
index 39406344166..09098d5a699 100644
--- a/libjava/classpath/javax/transaction/xa/XAResource.java
+++ b/libjava/classpath/javax/transaction/xa/XAResource.java
@@ -1,4 +1,4 @@
-/* XAResource.java -- 
+/* XAResource.java --
    Copyright (C) 2001, 2002, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction.xa;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/transaction/xa/Xid.java b/libjava/classpath/javax/transaction/xa/Xid.java
index 51e3102b6b4..12c2fbb8eac 100644
--- a/libjava/classpath/javax/transaction/xa/Xid.java
+++ b/libjava/classpath/javax/transaction/xa/Xid.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -36,7 +36,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 package javax.transaction.xa;
- 
+
 /**
  * @author Warren Levy (warrenl@redhat.com)
  * @date May 25, 2001
diff --git a/libjava/classpath/javax/xml/XMLConstants.java b/libjava/classpath/javax/xml/XMLConstants.java
index 0d4a65ff981..82485c8df14 100644
--- a/libjava/classpath/javax/xml/XMLConstants.java
+++ b/libjava/classpath/javax/xml/XMLConstants.java
@@ -1,4 +1,4 @@
-/* XMLConstants.java -- 
+/* XMLConstants.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,7 +45,7 @@ package javax.xml;
  */
 public final class XMLConstants
 {
-  
+
   private XMLConstants()
   {
     // to prevent instantiation
@@ -68,7 +68,7 @@ public final class XMLConstants
    * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
    */
   public static final String XML_NS_URI =
-	 	"http://www.w3.org/XML/1998/namespace";
+                "http://www.w3.org/XML/1998/namespace";
 
   /**
    * The XML Namespace prefix.
@@ -81,7 +81,7 @@ public final class XMLConstants
    * @see http://www.w3.org/TR/REC-xml-names/#ns-qualnames
    */
   public static final String XMLNS_ATTRIBUTE_NS_URI =
-	 	"http://www.w3.org/2000/xmlns/";
+                "http://www.w3.org/2000/xmlns/";
 
   /**
    * The XML Namespace declaration attribute.
@@ -94,21 +94,21 @@ public final class XMLConstants
    * @see http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions
    */
   public static final String W3C_XML_SCHEMA_NS_URI =
-	 	"http://www.w3.org/2001/XMLSchema";
+                "http://www.w3.org/2001/XMLSchema";
 
   /**
    * The XML Schema Instance (XSI) namespace URI.
    * @see http://www.w3.org/TR/xmlschema-1/#Instance_Document_Constructions
    */
   public static final String W3C_XML_SCHEMA_INSTANCE_NS_URI =
-	 	"http://www.w3.org/2001/XMLSchema-instance";
+                "http://www.w3.org/2001/XMLSchema-instance";
 
   /**
    * The XPath 2.0 datatypes namespace URI.
    * @see http://www.w3.org/TR/xpath-datamodel
    */
   public static final String W3C_XPATH_DATATYPE_NS_URI =
-	 	"http://www.w3.org/2003/11/xpath-datatypes";
+                "http://www.w3.org/2003/11/xpath-datatypes";
 
   /**
    * The XML DTD namespace URI.
@@ -120,12 +120,12 @@ public final class XMLConstants
    * @see http://relaxng.org/spec-20011203.html
    */
   public static final String RELAXNG_NS_URI =
-	 	"http://relaxng.org/ns/structure/1.0";
+                "http://relaxng.org/ns/structure/1.0";
 
   /**
    * DOM feature for secure processing.
    */
   public static final String FEATURE_SECURE_PROCESSING =
-	 	"http://javax.xml.XMLConstants/feature/secure-processing";
-  
+                "http://javax.xml.XMLConstants/feature/secure-processing";
+
 }
diff --git a/libjava/classpath/javax/xml/datatype/DatatypeConfigurationException.java b/libjava/classpath/javax/xml/datatype/DatatypeConfigurationException.java
index c17a89a7d2f..642cdcaf3c6 100644
--- a/libjava/classpath/javax/xml/datatype/DatatypeConfigurationException.java
+++ b/libjava/classpath/javax/xml/datatype/DatatypeConfigurationException.java
@@ -1,4 +1,4 @@
-/* DatatypeConfigurationException.java -- 
+/* DatatypeConfigurationException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -61,10 +61,10 @@ public class DatatypeConfigurationException
   {
     super(message, cause);
   }
-  
+
   public DatatypeConfigurationException(Throwable cause)
   {
     super(cause);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/datatype/DatatypeConstants.java b/libjava/classpath/javax/xml/datatype/DatatypeConstants.java
index 6098e084b7b..1fe439e00b2 100644
--- a/libjava/classpath/javax/xml/datatype/DatatypeConstants.java
+++ b/libjava/classpath/javax/xml/datatype/DatatypeConstants.java
@@ -1,4 +1,4 @@
-/* DatatypeConstants.java -- 
+/* DatatypeConstants.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -52,7 +52,7 @@ public final class DatatypeConstants
   {
     // to prevent instantiation
   }
-  
+
   /**
    * Typesafe enumerated class representing the six fields of the
    * <a href='Duration.html'>Duration</a> class.
@@ -73,94 +73,94 @@ public final class DatatypeConstants
     {
       return id;
     }
-    
+
     public String toString()
     {
       return name;
     }
-    
+
   }
 
   /**
    * Value for January.
    */
   public static final int JANUARY = 1;
-  
+
   /**
    * Value for February.
    */
   public static final int FEBRUARY = 2;
-  
+
   /**
    * Value for March.
    */
   public static final int MARCH = 3;
-  
+
   /**
    * Value for April.
    */
   public static final int APRIL = 4;
-  
+
   /**
    * Value for May.
    */
   public static final int MAY = 5;
-  
+
   /**
    * Value for June.
    */
   public static final int JUNE = 6;
-  
+
   /**
    * Value for July.
    */
   public static final int JULY = 7;
-  
+
   /**
    * Value for August.
    */
   public static final int AUGUST = 8;
-  
+
   /**
    * Value for September.
    */
   public static final int SEPTEMBER = 9;
-  
+
   /**
    * Value for October.
    */
   public static final int OCTOBER = 10;
-  
+
   /**
    * Value for November.
    */
   public static final int NOVEMBER = 11;
-  
+
   /**
    * Value for December.
    */
   public static final int DECEMBER = 12;
-  
+
   /**
    * Comparison result.
    */
   public static final int LESSER = -1;
-  
+
   /**
    * Comparison result.
    */
   public static final int EQUAL = 0;
-  
+
   /**
    * Comparison result.
    */
   public static final int GREATER = 1;
-  
+
   /**
    * Comparison result.
    */
   public static final int INDETERMINATE = 2;
-  
+
   /**
    * Comparison result.
    */
@@ -170,27 +170,27 @@ public final class DatatypeConstants
    * Constant that represents the years field.
    */
   public static final Field YEARS = new Field(1, "YEARS");
-  
+
   /**
    * Constant that represents the months field.
    */
   public static final Field MONTHS = new Field(2, "MONTHS");
-  
+
   /**
    * Constant that represents the days field.
    */
   public static final Field DAYS = new Field(3, "DAYS");
-  
+
   /**
    * Constant that represents the hours field.
    */
   public static final Field HOURS = new Field(4, "HOURS");
-  
+
   /**
    * Constant that represents the minutes field.
    */
   public static final Field MINUTES = new Field(5, "MINUTES");
-  
+
   /**
    * Constant that represents the seconds field.
    */
@@ -200,52 +200,52 @@ public final class DatatypeConstants
    * The qualified-name for the <code>dateTime</code> data type.
    */
   public static final QName DATETIME = new QName ("http://www.w3.org/2001/XMLSchema#dateTime", "");
-  
+
   /**
    * The qualified-name for the <code>time</code> data type.
    */
   public static final QName TIME = new QName ("http://www.w3.org/2001/XMLSchema#time", "");
-  
+
   /**
    * The qualified-name for the <code>date</code> data type.
    */
   public static final QName DATE = new QName ("http://www.w3.org/2001/XMLSchema#date", "");
-  
+
   /**
    * The qualified-name for the <code>gYearMonth</code> data type.
    */
   public static final QName GYEARMONTH = new QName ("http://www.w3.org/2001/XMLSchema#gYearMonth", "");
-  
+
   /**
    * The qualified-name for the <code>gMonthDay</code> data type.
    */
   public static final QName GMONTHDAY = new QName ("http://www.w3.org/2001/XMLSchema#gMonthDay", "");
-  
+
   /**
    * The qualified-name for the <code>gYear</code> data type.
    */
   public static final QName GYEAR = new QName ("http://www.w3.org/2001/XMLSchema#gYear", "");
-  
+
   /**
    * The qualified-name for the <code>gMonth</code> data type.
    */
   public static final QName GMONTH = new QName ("http://www.w3.org/2001/XMLSchema#gMonth", "");
-  
+
   /**
    * The qualified-name for the <code>gDay</code> data type.
    */
   public static final QName GDAY = new QName ("http://www.w3.org/2001/XMLSchema#gDay", "");
-  
+
   /**
    * The qualified-name for the <code>duration</code> data type.
    */
   public static final QName DURATION = new QName ("http://www.w3.org/2001/XMLSchema#duration", "");
-  
+
   /**
    * The qualified-name for the <code>dayTimeDuration</code> data type.
    */
   public static final QName DURATION_DAYTIME = new QName ("http://www.w3.org/2001/XMLSchema#dayTimeDuration", "");
-  
+
   /**
    * The qualified-name for the <code>yearMonthDuration</code> data type.
    */
@@ -255,10 +255,10 @@ public final class DatatypeConstants
    * XML Schema maximum timezone offset, in minutes.
    */
   public static final int MAX_TIMEZONE_OFFSET = -840;
-  
+
   /**
    * XML Schema minimum timezone offset, in minutes.
    */
   public static final int MIN_TIMEZONE_OFFSET = 840;
-  
+
 }
diff --git a/libjava/classpath/javax/xml/datatype/DatatypeFactory.java b/libjava/classpath/javax/xml/datatype/DatatypeFactory.java
index 386d5b85286..924a610c1e2 100644
--- a/libjava/classpath/javax/xml/datatype/DatatypeFactory.java
+++ b/libjava/classpath/javax/xml/datatype/DatatypeFactory.java
@@ -1,4 +1,4 @@
-/* DatatypeFactory.java -- 
+/* DatatypeFactory.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -303,7 +303,7 @@ public abstract class DatatypeFactory
    * XML Schema 1.0 Part 2, section 3.2.[7-14].1.
    */
   public abstract XMLGregorianCalendar newXMLGregorianCalendar(String lexicalRepresentation);
-  
+
   /**
    * Returns a new XMLGregorianCalendar based on the specified Gregorian
    * calendar.
@@ -417,5 +417,5 @@ public abstract class DatatypeFactory
                                    new BigDecimal(((double) milliseconds) / 1000.0),
                                    timezone);
   }
-    
+
 }
diff --git a/libjava/classpath/javax/xml/datatype/Duration.java b/libjava/classpath/javax/xml/datatype/Duration.java
index 96390fde467..7f53021cefc 100644
--- a/libjava/classpath/javax/xml/datatype/Duration.java
+++ b/libjava/classpath/javax/xml/datatype/Duration.java
@@ -1,4 +1,4 @@
-/* Duration.java -- 
+/* Duration.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -91,7 +91,7 @@ public abstract class Duration
     Number val = getField(DatatypeConstants.YEARS);
     return (val == null) ? 0 : val.intValue();
   }
-  
+
   /**
    * Returns the months in this duration as an int, or 0 if not present.
    */
@@ -100,7 +100,7 @@ public abstract class Duration
     Number val = getField(DatatypeConstants.MONTHS);
     return (val == null) ? 0 : val.intValue();
   }
-  
+
   /**
    * Returns the days in this duration as an int, or 0 if not present.
    */
@@ -109,7 +109,7 @@ public abstract class Duration
     Number val = getField(DatatypeConstants.DAYS);
     return (val == null) ? 0 : val.intValue();
   }
-  
+
   /**
    * Returns the hours in this duration as an int, or 0 if not present.
    */
@@ -118,7 +118,7 @@ public abstract class Duration
     Number val = getField(DatatypeConstants.HOURS);
     return (val == null) ? 0 : val.intValue();
   }
-  
+
   /**
    * Returns the minutes in this duration as an int, or 0 if not present.
    */
@@ -127,7 +127,7 @@ public abstract class Duration
     Number val = getField(DatatypeConstants.MINUTES);
     return (val == null) ? 0 : val.intValue();
   }
-  
+
   /**
    * Returns the seconds in this duration as an int, or 0 if not present.
    */
@@ -207,7 +207,7 @@ public abstract class Duration
         calendar.add(Calendar.SECOND, getSeconds());
       }
   }*/
-  
+
   /**
    * Adds this duration to the specified date.
    */
@@ -246,7 +246,7 @@ public abstract class Duration
    * Returns the unary negative of this duration.
    */
   public abstract Duration negate();
-  
+
   /**
    * Converts the years and months fields into the days field using a
    * specific time instant as the reference point.
@@ -276,7 +276,7 @@ public abstract class Duration
     // TODO
     throw new UnsupportedOperationException();
   }
-  
+
   public abstract int hashCode();
 
   /**
@@ -287,5 +287,5 @@ public abstract class Duration
     // TODO
     throw new UnsupportedOperationException();
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/datatype/XMLGregorianCalendar.java b/libjava/classpath/javax/xml/datatype/XMLGregorianCalendar.java
index c0b68681c22..a8a9272e06a 100644
--- a/libjava/classpath/javax/xml/datatype/XMLGregorianCalendar.java
+++ b/libjava/classpath/javax/xml/datatype/XMLGregorianCalendar.java
@@ -1,4 +1,4 @@
-/* XMLGregorianCalendar.java -- 
+/* XMLGregorianCalendar.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -213,5 +213,5 @@ public abstract class XMLGregorianCalendar
   public abstract TimeZone getTimeZone(int defaultZoneoffset);
 
   public abstract Object clone();
-  
+
 }
diff --git a/libjava/classpath/javax/xml/namespace/NamespaceContext.java b/libjava/classpath/javax/xml/namespace/NamespaceContext.java
index b9722a47a53..b3e1e1f61d0 100644
--- a/libjava/classpath/javax/xml/namespace/NamespaceContext.java
+++ b/libjava/classpath/javax/xml/namespace/NamespaceContext.java
@@ -1,4 +1,4 @@
-/* NamespaceContext.java -- 
+/* NamespaceContext.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,5 +63,5 @@ public interface NamespaceContext
    */
   @SuppressWarnings("unchecked")
   public Iterator getPrefixes(String namespaceURI);
-  
+
 }
diff --git a/libjava/classpath/javax/xml/namespace/QName.java b/libjava/classpath/javax/xml/namespace/QName.java
index 3c756237895..4033febfcea 100644
--- a/libjava/classpath/javax/xml/namespace/QName.java
+++ b/libjava/classpath/javax/xml/namespace/QName.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -128,20 +128,20 @@ public class QName implements Serializable
   {
     if (qName == null)
       {
-	CPStringBuilder buf = new CPStringBuilder();
-	if (namespaceURI.length() > 0)
-	  {
-	    buf.append('{');
-	    buf.append(namespaceURI);
-	    buf.append('}');
-	  }
-	if (prefix.length() > 0)
-	  {
-	    buf.append(prefix);
-	    buf.append(':');
-	  }
-	buf.append(localPart);
-	qName = buf.toString();
+        CPStringBuilder buf = new CPStringBuilder();
+        if (namespaceURI.length() > 0)
+          {
+            buf.append('{');
+            buf.append(namespaceURI);
+            buf.append('}');
+          }
+        if (prefix.length() > 0)
+          {
+            buf.append(prefix);
+            buf.append(':');
+          }
+        buf.append(localPart);
+        qName = buf.toString();
       }
     return qName;
   }
@@ -150,7 +150,7 @@ public class QName implements Serializable
   {
     if (qNameAsString == null)
       throw new IllegalArgumentException("qNameAsString can't be null");
-    
+
     String namespaceUri = "", prefix = null;
     int start = qNameAsString.indexOf('{');
     int end = qNameAsString.indexOf('}');
@@ -169,5 +169,5 @@ public class QName implements Serializable
       }
     return new QName(namespaceUri, qNameAsString, prefix);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/parsers/DocumentBuilder.java b/libjava/classpath/javax/xml/parsers/DocumentBuilder.java
index a574c98d410..8e4eccbb0c6 100644
--- a/libjava/classpath/javax/xml/parsers/DocumentBuilder.java
+++ b/libjava/classpath/javax/xml/parsers/DocumentBuilder.java
@@ -1,4 +1,4 @@
-/* DocumentBuilder.java -- 
+/* DocumentBuilder.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -70,7 +70,7 @@ public abstract class DocumentBuilder
    * @param is an XML input stream
    * @exception IllegalArgumentException if the input stream is null
    */
-  public Document parse(InputStream is) 
+  public Document parse(InputStream is)
     throws SAXException, IOException
   {
     if (is == null)
@@ -86,7 +86,7 @@ public abstract class DocumentBuilder
    * @param systemId the system ID of the XML document
    * @exception IllegalArgumentException if the input stream is null
    */
-  public Document parse(InputStream is, String systemId) 
+  public Document parse(InputStream is, String systemId)
     throws SAXException, IOException
   {
     if (is == null)
@@ -103,7 +103,7 @@ public abstract class DocumentBuilder
    * @param uri an XML system ID
    * @exception IllegalArgumentException if the URI is null
    */
-  public Document parse(String uri) 
+  public Document parse(String uri)
     throws SAXException, IOException
   {
     if (uri == null)
@@ -118,7 +118,7 @@ public abstract class DocumentBuilder
    * @param f the XML file
    * @exception IllegalArgumentException if the file is null
    */
-  public Document parse(File f) 
+  public Document parse(File f)
     throws SAXException, IOException
   {
     if (f == null)
@@ -135,7 +135,7 @@ public abstract class DocumentBuilder
    * @param source the input source
    * @exception IllegalArgumentException if the input source is null
    */
-  public abstract Document parse(InputSource source) 
+  public abstract Document parse(InputSource source)
     throws SAXException, IOException;
 
   /**
@@ -175,7 +175,7 @@ public abstract class DocumentBuilder
   public abstract DOMImplementation getDOMImplementation();
 
   // -- JAXP 1.3 methods --
-  
+
   /**
    * Reset this document builder to its original configuration.
    * @since 1.3
@@ -199,5 +199,5 @@ public abstract class DocumentBuilder
   {
     return false;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java b/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java
index a1350c54920..5f8b49d7c44 100644
--- a/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java
+++ b/libjava/classpath/javax/xml/parsers/DocumentBuilderFactory.java
@@ -1,4 +1,4 @@
-/* DocumentBuilderFactory.java -- 
+/* DocumentBuilderFactory.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -111,13 +111,13 @@ public abstract class DocumentBuilderFactory
               {
                 throw new FactoryConfigurationError(e,
                     "error instantiating class " + className);
-              } 
+              }
           }
       }
     while (className == null && count < 3);
     return new gnu.xml.dom.DomDocumentBuilderFactory();
   }
-  
+
   private static String getFactoryClassName(ClassLoader loader, int attempt)
   {
     final String propertyName = "javax.xml.parsers.DocumentBuilderFactory";
@@ -141,7 +141,7 @@ public abstract class DocumentBuilderFactory
             {
               return null;
             }
-        case 2: 
+        case 2:
           try
             {
               String serviceKey = "/META-INF/services/" + propertyName;
@@ -293,7 +293,7 @@ public abstract class DocumentBuilderFactory
    * @param value the new value
    * @exception IllegalArgumentException if the attribute is not recognized
    */
-  public abstract void setAttribute(String name, Object value) 
+  public abstract void setAttribute(String name, Object value)
     throws IllegalArgumentException;
 
   /**
@@ -301,7 +301,7 @@ public abstract class DocumentBuilderFactory
    * @param name the name of the attribute
    * @exception IllegalArgumentException if the attribute is not recognized
    */
-  public abstract Object getAttribute(String name) 
+  public abstract Object getAttribute(String name)
     throws IllegalArgumentException;
 
   // -- JAXP 1.3 methods --
@@ -365,5 +365,5 @@ public abstract class DocumentBuilderFactory
    */
   public abstract boolean getFeature(String name)
     throws ParserConfigurationException;
-  
+
 }
diff --git a/libjava/classpath/javax/xml/parsers/FactoryConfigurationError.java b/libjava/classpath/javax/xml/parsers/FactoryConfigurationError.java
index 96d0fc08289..6e2ebfadbb8 100644
--- a/libjava/classpath/javax/xml/parsers/FactoryConfigurationError.java
+++ b/libjava/classpath/javax/xml/parsers/FactoryConfigurationError.java
@@ -1,4 +1,4 @@
-/* FactoryConfigurationError.java -- 
+/* FactoryConfigurationError.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package javax.xml.parsers;
 
 /**
  * An error occurred during configuration of the parser factory.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public class FactoryConfigurationError
diff --git a/libjava/classpath/javax/xml/parsers/ParserConfigurationException.java b/libjava/classpath/javax/xml/parsers/ParserConfigurationException.java
index 412872f17de..a58decedbee 100644
--- a/libjava/classpath/javax/xml/parsers/ParserConfigurationException.java
+++ b/libjava/classpath/javax/xml/parsers/ParserConfigurationException.java
@@ -1,4 +1,4 @@
-/* ParserConfigurationException.java -- 
+/* ParserConfigurationException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package javax.xml.parsers;
 
 /**
  * An exception occurred during configuration of the XML parser.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public class ParserConfigurationException
diff --git a/libjava/classpath/javax/xml/parsers/SAXParser.java b/libjava/classpath/javax/xml/parsers/SAXParser.java
index d38c6579e25..e53558760ee 100644
--- a/libjava/classpath/javax/xml/parsers/SAXParser.java
+++ b/libjava/classpath/javax/xml/parsers/SAXParser.java
@@ -1,4 +1,4 @@
-/* SAXParser.java -- 
+/* SAXParser.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -59,7 +59,7 @@ import org.xml.sax.helpers.DefaultHandler;
  */
 public abstract class SAXParser
 {
-  
+
   protected SAXParser()
   {
   }
@@ -76,7 +76,7 @@ public abstract class SAXParser
    * @exception IllegalArgumentException if the input stream is null
    * @see #parse(java.io.InputStream,org.xml.sax.helpers.DefaultHandler)
    */
-  public void parse(InputStream is, HandlerBase hb) 
+  public void parse(InputStream is, HandlerBase hb)
     throws SAXException, IOException
   {
     if (is == null)
@@ -118,7 +118,7 @@ public abstract class SAXParser
    * @param dh the SAX2 handler
    * @exception IllegalArgumentException if the input stream is null
    */
-  public void parse(InputStream is, DefaultHandler dh) 
+  public void parse(InputStream is, DefaultHandler dh)
     throws SAXException, IOException
   {
     if (is == null)
@@ -158,7 +158,7 @@ public abstract class SAXParser
    * @exception IllegalArgumentException if the URI is null
    * @see #parse(java.lang.String,org.xml.sax.helpers.DefaultHandler)
    */
-  public void parse(String uri, HandlerBase hb) 
+  public void parse(String uri, HandlerBase hb)
     throws SAXException, IOException
   {
     if (uri == null)
@@ -175,7 +175,7 @@ public abstract class SAXParser
    * @param dh the SAX2 handler
    * @exception IllegalArgumentException if the URI is null
    */
-  public void parse(String uri, DefaultHandler dh) 
+  public void parse(String uri, DefaultHandler dh)
     throws SAXException, IOException
   {
     if (uri == null)
@@ -195,7 +195,7 @@ public abstract class SAXParser
    * @exception IllegalArgumentException if the file is null
    * @see #parse(java.io.File,org.xml.sax.helpers.DefaultHandler)
    */
-  public void parse(File f, HandlerBase hb) 
+  public void parse(File f, HandlerBase hb)
     throws SAXException, IOException
   {
     if (f == null)
@@ -214,7 +214,7 @@ public abstract class SAXParser
    * @param dh the SAX2 handler
    * @exception IllegalArgumentException if the file is null
    */
-  public void parse(File f, DefaultHandler dh) 
+  public void parse(File f, DefaultHandler dh)
     throws SAXException, IOException
   {
     if (f == null)
@@ -236,7 +236,7 @@ public abstract class SAXParser
    * @exception IllegalArgumentException if the input source is null
    * @see #parse(org.xml.sax.InputSource,org.xml.sax.helpers.DefaultHandler)
    */
-  public void parse(InputSource is, HandlerBase hb) 
+  public void parse(InputSource is, HandlerBase hb)
     throws SAXException, IOException
   {
     if (is == null)
@@ -258,7 +258,7 @@ public abstract class SAXParser
    * @param dh the SAX2 handler
    * @exception IllegalArgumentException if the input source is null
    */
-  public void parse(InputSource is, DefaultHandler dh) 
+  public void parse(InputSource is, DefaultHandler dh)
     throws SAXException, IOException
   {
     if (is == null)
@@ -299,14 +299,14 @@ public abstract class SAXParser
    * @param name the name of the property
    * @param value the value of the property
    */
-  public abstract void setProperty(String name, Object value) 
+  public abstract void setProperty(String name, Object value)
     throws SAXNotRecognizedException, SAXNotSupportedException;
 
   /**
    * Returns the value of the specified SAX2 parser property.
    * @param name the name of the property
    */
-  public abstract Object getProperty(String name) 
+  public abstract Object getProperty(String name)
     throws SAXNotRecognizedException, SAXNotSupportedException;
 
   // -- JAXP 1.3 methods --
@@ -336,5 +336,5 @@ public abstract class SAXParser
   {
     return false;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/parsers/SAXParserFactory.java b/libjava/classpath/javax/xml/parsers/SAXParserFactory.java
index 9f8f7bafee9..13aca0f2b2c 100644
--- a/libjava/classpath/javax/xml/parsers/SAXParserFactory.java
+++ b/libjava/classpath/javax/xml/parsers/SAXParserFactory.java
@@ -1,4 +1,4 @@
-/* SAXParserFactory.java -- 
+/* SAXParserFactory.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -216,8 +216,8 @@ public abstract class SAXParserFactory
    * @param name the feature name
    * @param value the featurevalue
    */
-  public abstract void setFeature(String name, boolean value) 
-    throws ParserConfigurationException, SAXNotRecognizedException, 
+  public abstract void setFeature(String name, boolean value)
+    throws ParserConfigurationException, SAXNotRecognizedException,
            SAXNotSupportedException;
 
   /**
@@ -225,8 +225,8 @@ public abstract class SAXParserFactory
    * factory.
    * @param name the feature name
    */
-  public abstract boolean getFeature(String name) 
-    throws ParserConfigurationException, SAXNotRecognizedException, 
+  public abstract boolean getFeature(String name)
+    throws ParserConfigurationException, SAXNotRecognizedException,
            SAXNotSupportedException;
 
   // -- JAXP 1.3 methods --
diff --git a/libjava/classpath/javax/xml/stream/EventFilter.java b/libjava/classpath/javax/xml/stream/EventFilter.java
index 6d0cb65521e..eed54f8a927 100644
--- a/libjava/classpath/javax/xml/stream/EventFilter.java
+++ b/libjava/classpath/javax/xml/stream/EventFilter.java
@@ -1,4 +1,4 @@
-/* EventFilter.java -- 
+/* EventFilter.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -49,6 +49,5 @@ public interface EventFilter
    * Indicates whether this filter can accept the specified event.
    */
   boolean accept(XMLEvent event);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/FactoryConfigurationError.java b/libjava/classpath/javax/xml/stream/FactoryConfigurationError.java
index d04e71a8cf6..104b160cd93 100644
--- a/libjava/classpath/javax/xml/stream/FactoryConfigurationError.java
+++ b/libjava/classpath/javax/xml/stream/FactoryConfigurationError.java
@@ -1,4 +1,4 @@
-/* FactoryConfigurationError.java -- 
+/* FactoryConfigurationError.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -81,6 +81,5 @@ public class FactoryConfigurationError
   {
     return super.getMessage();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/Location.java b/libjava/classpath/javax/xml/stream/Location.java
index 8f9f807e0f2..6e3483a5c2a 100644
--- a/libjava/classpath/javax/xml/stream/Location.java
+++ b/libjava/classpath/javax/xml/stream/Location.java
@@ -1,4 +1,4 @@
-/* Location.java -- 
+/* Location.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -71,6 +71,5 @@ public interface Location
    * Returns the system identifier for the underlying source.
    */
   String getSystemId();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/StreamFilter.java b/libjava/classpath/javax/xml/stream/StreamFilter.java
index 376bd940a89..a0ff2c8f32b 100644
--- a/libjava/classpath/javax/xml/stream/StreamFilter.java
+++ b/libjava/classpath/javax/xml/stream/StreamFilter.java
@@ -1,4 +1,4 @@
-/* StreamFilter.java -- 
+/* StreamFilter.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,6 +48,5 @@ public interface StreamFilter
    * this stream.
    */
   boolean accept(XMLStreamReader reader);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLEventFactory.java b/libjava/classpath/javax/xml/stream/XMLEventFactory.java
index 7e7a98140a7..fc2d493d5d4 100644
--- a/libjava/classpath/javax/xml/stream/XMLEventFactory.java
+++ b/libjava/classpath/javax/xml/stream/XMLEventFactory.java
@@ -1,4 +1,4 @@
-/* XMLEventFactory.java -- 
+/* XMLEventFactory.java --
    Copyright (C) 2005,2006,2009  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -199,7 +199,7 @@ public abstract class XMLEventFactory
    */
   public abstract Attribute createAttribute(String prefix, String namespaceURI,
                                             String localName, String value);
-  
+
   /**
    * Create an attribute event.
    */
@@ -255,7 +255,7 @@ public abstract class XMLEventFactory
                                                   Iterator attributes,
                                                   Iterator namespaces,
                                                   NamespaceContext context);
-  
+
   /**
    * Create an end-element event.
    */
@@ -348,6 +348,5 @@ public abstract class XMLEventFactory
    * Create a DOCTYPE declaration event.
    */
   public abstract DTD createDTD(String dtd);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLEventReader.java b/libjava/classpath/javax/xml/stream/XMLEventReader.java
index ee0354f94f3..d5c76b6b192 100644
--- a/libjava/classpath/javax/xml/stream/XMLEventReader.java
+++ b/libjava/classpath/javax/xml/stream/XMLEventReader.java
@@ -1,4 +1,4 @@
-/* XMLEventReader.java -- 
+/* XMLEventReader.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,7 +58,7 @@ public interface XMLEventReader
    * Indicates whether there are more XML events to be read.
    */
   boolean hasNext();
-  
+
   /**
    * Looks at the next XML event without advancing the cursor in the stream.
    * Returns <code>null</code> if there are no more events to read.
@@ -100,4 +100,3 @@ public interface XMLEventReader
     throws XMLStreamException;
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/XMLEventWriter.java b/libjava/classpath/javax/xml/stream/XMLEventWriter.java
index fe85f236ebb..5eb18760ac6 100644
--- a/libjava/classpath/javax/xml/stream/XMLEventWriter.java
+++ b/libjava/classpath/javax/xml/stream/XMLEventWriter.java
@@ -1,4 +1,4 @@
-/* XMLEventWriter.java -- 
+/* XMLEventWriter.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -104,6 +104,5 @@ public interface XMLEventWriter
    * Returns the namespace context.
    */
   NamespaceContext getNamespaceContext();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLInputFactory.java b/libjava/classpath/javax/xml/stream/XMLInputFactory.java
index e57449d7716..39ba8e3b431 100644
--- a/libjava/classpath/javax/xml/stream/XMLInputFactory.java
+++ b/libjava/classpath/javax/xml/stream/XMLInputFactory.java
@@ -1,4 +1,4 @@
-/* XMLInputFactory.java -- 
+/* XMLInputFactory.java --
    Copyright (C) 2005,2006,2009  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -132,7 +132,7 @@ public abstract class XMLInputFactory
   /**
    * Property used to control namespace support.
    */
-  public static final String IS_NAMESPACE_AWARE = 
+  public static final String IS_NAMESPACE_AWARE =
     "javax.xml.stream.isNamespaceAware";
 
   /**
@@ -352,7 +352,7 @@ public abstract class XMLInputFactory
   public abstract XMLEventReader createXMLEventReader(String systemId,
                                                       Reader reader)
     throws XMLStreamException;
-  
+
   /**
    * Creates a new event reader.
    */
@@ -449,4 +449,3 @@ public abstract class XMLInputFactory
   public abstract XMLEventAllocator getEventAllocator();
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/XMLOutputFactory.java b/libjava/classpath/javax/xml/stream/XMLOutputFactory.java
index ef89b6497bd..a8579aa3134 100644
--- a/libjava/classpath/javax/xml/stream/XMLOutputFactory.java
+++ b/libjava/classpath/javax/xml/stream/XMLOutputFactory.java
@@ -1,4 +1,4 @@
-/* XMLOutputFactory.java -- 
+/* XMLOutputFactory.java --
    Copyright (C) 2005,2006,2009  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -77,7 +77,7 @@ public abstract class XMLOutputFactory
    * If true, the writer will create a namespace declaration for any
    * attribute that doesn't have a namespace declaration in scope.
    */
-  public static final java.lang.String IS_REPAIRING_NAMESPACES = 
+  public static final java.lang.String IS_REPAIRING_NAMESPACES =
     "javax.xml.stream.isRepairingNamespaces";
 
   protected XMLOutputFactory()
@@ -229,7 +229,7 @@ public abstract class XMLOutputFactory
    */
   public abstract XMLStreamWriter createXMLStreamWriter(Result result)
     throws XMLStreamException;
-  
+
   /**
    * Creates a new event writer.
    * @exception UnsupportedOperationException if this method is not
@@ -277,4 +277,3 @@ public abstract class XMLOutputFactory
   public abstract boolean isPropertySupported(String name);
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/XMLReporter.java b/libjava/classpath/javax/xml/stream/XMLReporter.java
index d545656813c..389437542f6 100644
--- a/libjava/classpath/javax/xml/stream/XMLReporter.java
+++ b/libjava/classpath/javax/xml/stream/XMLReporter.java
@@ -1,4 +1,4 @@
-/* XMLReporter.java -- 
+/* XMLReporter.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,6 +53,5 @@ public interface XMLReporter
   void report(String message, String errorType,
               Object relatedInformation, Location location)
     throws XMLStreamException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLResolver.java b/libjava/classpath/javax/xml/stream/XMLResolver.java
index 2dabaeea407..e537bb74c51 100644
--- a/libjava/classpath/javax/xml/stream/XMLResolver.java
+++ b/libjava/classpath/javax/xml/stream/XMLResolver.java
@@ -1,4 +1,4 @@
-/* XMLResolver.java -- 
+/* XMLResolver.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -63,4 +63,3 @@ public interface XMLResolver
     throws XMLStreamException;
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/XMLStreamConstants.java b/libjava/classpath/javax/xml/stream/XMLStreamConstants.java
index e41627dd601..60541344e64 100644
--- a/libjava/classpath/javax/xml/stream/XMLStreamConstants.java
+++ b/libjava/classpath/javax/xml/stream/XMLStreamConstants.java
@@ -1,4 +1,4 @@
-/* XMLStreamConstants.java -- 
+/* XMLStreamConstants.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -117,6 +117,5 @@ public interface XMLStreamConstants
    * An entity declaration event.
    */
   static final int ENTITY_DECLARATION = 15;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLStreamException.java b/libjava/classpath/javax/xml/stream/XMLStreamException.java
index 0e91ed7a99e..929afbb75f5 100644
--- a/libjava/classpath/javax/xml/stream/XMLStreamException.java
+++ b/libjava/classpath/javax/xml/stream/XMLStreamException.java
@@ -1,4 +1,4 @@
-/* XMLStreamException.java -- 
+/* XMLStreamException.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -94,6 +94,5 @@ public class XMLStreamException
   {
     return location;
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLStreamReader.java b/libjava/classpath/javax/xml/stream/XMLStreamReader.java
index f8648b1adce..10bc4a5a58d 100644
--- a/libjava/classpath/javax/xml/stream/XMLStreamReader.java
+++ b/libjava/classpath/javax/xml/stream/XMLStreamReader.java
@@ -1,4 +1,4 @@
-/* XMLStreamReader.java -- 
+/* XMLStreamReader.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -281,7 +281,7 @@ public interface XMLStreamReader
    * Indicates whether the standalone flag was set in the document.
    */
   boolean standaloneSet();
-  
+
   /**
    * Returns the encoding declared in the XML declaration.
    */
@@ -296,6 +296,5 @@ public interface XMLStreamReader
    * Returns the data of the current processing instruction event.
    */
   String getPIData();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/XMLStreamWriter.java b/libjava/classpath/javax/xml/stream/XMLStreamWriter.java
index 5fe9e9f70f4..d7d739660b8 100644
--- a/libjava/classpath/javax/xml/stream/XMLStreamWriter.java
+++ b/libjava/classpath/javax/xml/stream/XMLStreamWriter.java
@@ -1,4 +1,4 @@
-/* XMLStreamWriter.java -- 
+/* XMLStreamWriter.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,7 +44,7 @@ import javax.xml.namespace.NamespaceContext;
  */
 public interface XMLStreamWriter
 {
-  
+
   /**
    * Write the start of a tag.
    */
@@ -178,7 +178,7 @@ public interface XMLStreamWriter
    */
   void writeStartDocument()
     throws XMLStreamException;
-  
+
   /**
    * Write an XML declaration with the specified XML version.
    */
@@ -239,6 +239,5 @@ public interface XMLStreamWriter
    */
   Object getProperty(String name)
     throws IllegalArgumentException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/Attribute.java b/libjava/classpath/javax/xml/stream/events/Attribute.java
index 6e6d0274c4a..1824a9c02b1 100644
--- a/libjava/classpath/javax/xml/stream/events/Attribute.java
+++ b/libjava/classpath/javax/xml/stream/events/Attribute.java
@@ -1,4 +1,4 @@
-/* Attribute.java -- 
+/* Attribute.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -66,6 +66,5 @@ public interface Attribute
    * just defaulted by the DTD.
    */
   boolean isSpecified();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/Characters.java b/libjava/classpath/javax/xml/stream/events/Characters.java
index 3728a997c34..d82009247cb 100644
--- a/libjava/classpath/javax/xml/stream/events/Characters.java
+++ b/libjava/classpath/javax/xml/stream/events/Characters.java
@@ -1,4 +1,4 @@
-/* Characters.java -- 
+/* Characters.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,11 +58,10 @@ public interface Characters
    * Indicates whether this is a CDATA section.
    */
   boolean isCData();
-  
+
   /**
    * Indicates whether this text is all ignorable whitespace.
    */
   boolean isIgnorableWhiteSpace();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/Comment.java b/libjava/classpath/javax/xml/stream/events/Comment.java
index 300e32c9266..4419e58f283 100644
--- a/libjava/classpath/javax/xml/stream/events/Comment.java
+++ b/libjava/classpath/javax/xml/stream/events/Comment.java
@@ -1,4 +1,4 @@
-/* Comment.java -- 
+/* Comment.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,6 +48,5 @@ public interface Comment
    * Returns the comment text.
    */
   String getText();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/DTD.java b/libjava/classpath/javax/xml/stream/events/DTD.java
index 943572ef32f..b1a906919f5 100644
--- a/libjava/classpath/javax/xml/stream/events/DTD.java
+++ b/libjava/classpath/javax/xml/stream/events/DTD.java
@@ -1,4 +1,4 @@
-/* DTD.java -- 
+/* DTD.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -68,6 +68,5 @@ public interface DTD
    */
   @SuppressWarnings("unchecked")
   List getEntities();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/EndDocument.java b/libjava/classpath/javax/xml/stream/events/EndDocument.java
index 57d93af928d..fd7e3fa4f48 100644
--- a/libjava/classpath/javax/xml/stream/events/EndDocument.java
+++ b/libjava/classpath/javax/xml/stream/events/EndDocument.java
@@ -1,4 +1,4 @@
-/* EndDocument.java -- 
+/* EndDocument.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,4 +44,3 @@ public interface EndDocument
   extends XMLEvent
 {
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/EndElement.java b/libjava/classpath/javax/xml/stream/events/EndElement.java
index 3bde8f8ad9e..a6b5c3fa281 100644
--- a/libjava/classpath/javax/xml/stream/events/EndElement.java
+++ b/libjava/classpath/javax/xml/stream/events/EndElement.java
@@ -1,4 +1,4 @@
-/* EndElement.java -- 
+/* EndElement.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,6 +57,5 @@ public interface EndElement
    */
   @SuppressWarnings("unchecked")
   Iterator getNamespaces();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
index a0120ddb0de..61fa177f995 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
@@ -1,4 +1,4 @@
-/* EntityDeclaration.java -- 
+/* EntityDeclaration.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,4 +75,3 @@ public interface EntityDeclaration
   String getBaseURI();
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/EntityReference.java b/libjava/classpath/javax/xml/stream/events/EntityReference.java
index 460433c1690..27bcb040fbb 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityReference.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityReference.java
@@ -1,4 +1,4 @@
-/* EntityReference.java -- 
+/* EntityReference.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,4 +55,3 @@ public interface EntityReference
   String getName();
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/Namespace.java b/libjava/classpath/javax/xml/stream/events/Namespace.java
index 13dd92fdaf7..05de86c9660 100644
--- a/libjava/classpath/javax/xml/stream/events/Namespace.java
+++ b/libjava/classpath/javax/xml/stream/events/Namespace.java
@@ -1,4 +1,4 @@
-/* Namespace.java -- 
+/* Namespace.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,6 +58,5 @@ public interface Namespace
    * Indicates whether this event declares the default namespace.
    */
   boolean isDefaultNamespaceDeclaration();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java b/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
index 9ac29e9cc2c..708beb5f576 100644
--- a/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
+++ b/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
@@ -1,4 +1,4 @@
-/* NotationDeclaration.java -- 
+/* NotationDeclaration.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,6 +58,5 @@ public interface NotationDeclaration
    * Returns the system identifier of the notation.
    */
   String getSystemId();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java b/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
index 861dd30be68..34020230038 100644
--- a/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
+++ b/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
@@ -1,4 +1,4 @@
-/* ProcessingInstruction.java -- 
+/* ProcessingInstruction.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,6 +53,5 @@ public interface ProcessingInstruction
    * Returns the processing instruction data.
    */
   String getData();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/StartDocument.java b/libjava/classpath/javax/xml/stream/events/StartDocument.java
index 2bd251e4adb..7a543462455 100644
--- a/libjava/classpath/javax/xml/stream/events/StartDocument.java
+++ b/libjava/classpath/javax/xml/stream/events/StartDocument.java
@@ -1,4 +1,4 @@
-/* StartDocument.java -- 
+/* StartDocument.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,6 +75,5 @@ public interface StartDocument
    * Returns the XML version of the document.
    */
   String getVersion();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/StartElement.java b/libjava/classpath/javax/xml/stream/events/StartElement.java
index 0916368c92b..359b57eefd7 100644
--- a/libjava/classpath/javax/xml/stream/events/StartElement.java
+++ b/libjava/classpath/javax/xml/stream/events/StartElement.java
@@ -1,4 +1,4 @@
-/* StartElement.java -- 
+/* StartElement.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,6 +79,5 @@ public interface StartElement
    * Returns the namespace URI associated with the given prefix.
    */
   String getNamespaceURI(String prefix);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/XMLEvent.java b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
index 7c427da87d2..90f354667b2 100644
--- a/libjava/classpath/javax/xml/stream/events/XMLEvent.java
+++ b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
@@ -1,4 +1,4 @@
-/* XMLEvent.java -- 
+/* XMLEvent.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -125,12 +125,11 @@ public interface XMLEvent
    * not available.
    */
   QName getSchemaType();
-  
+
   /**
    * Writes this event to the specified writer.
    */
   void writeAsEncodedUnicode(Writer writer)
     throws XMLStreamException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/util/EventReaderDelegate.java b/libjava/classpath/javax/xml/stream/util/EventReaderDelegate.java
index be943e465e1..2c04c09de8b 100644
--- a/libjava/classpath/javax/xml/stream/util/EventReaderDelegate.java
+++ b/libjava/classpath/javax/xml/stream/util/EventReaderDelegate.java
@@ -1,4 +1,4 @@
-/* EventReaderDelegate.java -- 
+/* EventReaderDelegate.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -149,4 +149,3 @@ public class EventReaderDelegate
   }
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java b/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java
index 1c407a2454b..75a7ca597a6 100644
--- a/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java
+++ b/libjava/classpath/javax/xml/stream/util/StreamReaderDelegate.java
@@ -1,4 +1,4 @@
-/* StreamReaderDelegate.java -- 
+/* StreamReaderDelegate.java --
    Copyright (C) 2005,2006,2009  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -404,6 +404,5 @@ public class StreamReaderDelegate
       return parent.getProperty(name);
     throw new IllegalArgumentException();
   }
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/util/XMLEventAllocator.java b/libjava/classpath/javax/xml/stream/util/XMLEventAllocator.java
index d66bcbe52e5..b8a7ddab8be 100644
--- a/libjava/classpath/javax/xml/stream/util/XMLEventAllocator.java
+++ b/libjava/classpath/javax/xml/stream/util/XMLEventAllocator.java
@@ -1,4 +1,4 @@
-/* XMLEventAllocator.java -- 
+/* XMLEventAllocator.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,7 +51,7 @@ public interface XMLEventAllocator
    * Creates a new allocator.
    */
   XMLEventAllocator newInstance();
-  
+
   /**
    * Allocates an event based on the current state of the stream reader.
    */
@@ -64,6 +64,5 @@ public interface XMLEventAllocator
    */
   void allocate(XMLStreamReader reader, XMLEventConsumer consumer)
     throws XMLStreamException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/util/XMLEventConsumer.java b/libjava/classpath/javax/xml/stream/util/XMLEventConsumer.java
index c9deaf199ac..3a825f9dee6 100644
--- a/libjava/classpath/javax/xml/stream/util/XMLEventConsumer.java
+++ b/libjava/classpath/javax/xml/stream/util/XMLEventConsumer.java
@@ -1,4 +1,4 @@
-/* XMLEventConsumer.java -- 
+/* XMLEventConsumer.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,6 +51,5 @@ public interface XMLEventConsumer
    */
   void add(XMLEvent event)
     throws XMLStreamException;
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/transform/ErrorListener.java b/libjava/classpath/javax/xml/transform/ErrorListener.java
index 5a9eee81f97..ac236642a0c 100644
--- a/libjava/classpath/javax/xml/transform/ErrorListener.java
+++ b/libjava/classpath/javax/xml/transform/ErrorListener.java
@@ -1,4 +1,4 @@
-/* ErrorListener.java -- 
+/* ErrorListener.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/OutputKeys.java b/libjava/classpath/javax/xml/transform/OutputKeys.java
index 8a86c13695e..09cf96cb9b5 100644
--- a/libjava/classpath/javax/xml/transform/OutputKeys.java
+++ b/libjava/classpath/javax/xml/transform/OutputKeys.java
@@ -1,4 +1,4 @@
-/* OutputKeys.java -- 
+/* OutputKeys.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package javax.xml.transform;
 
 /**
  * Constants for XSLT output attributes.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public class OutputKeys
@@ -49,53 +49,53 @@ public class OutputKeys
    * The output method (xml, html, or text).
    */
   public static final String METHOD = "method";
-  
+
   /**
    * The version of the output method.
    */
   public static final String VERSION = "version";
-  
+
   /**
    * The preferred output character encoding.
    */
   public static final String ENCODING = "encoding";
-  
+
   /**
    * Whether not to output an XML declaration (yes or no).
    */
   public static final String OMIT_XML_DECLARATION = "omit-xml-declaration";
-  
+
   /**
    * Whether to output a standalone document declaration (yes or no).
    */
   public static final String STANDALONE = "standalone";
- 
+
    /**
    * The public ID to output in the doctype declaration.
    */
   public static final String DOCTYPE_PUBLIC = "doctype-public";
-  
+
   /**
    * The system ID to output in the doctype declaration.
    */
   public static final String DOCTYPE_SYSTEM = "doctype-system";
-  
+
   /**
    * Whitespace-separated list of element names for which text children
    * should be output as CDATA sections.
    */
   public static final String CDATA_SECTION_ELEMENTS = "cdata-section-elements";
-  
+
   /**
    * Whether to indent the result tree (yes or no).
    */
   public static final String INDENT = "indent";
-  
+
   /**
    * The MIME content type of the output data.
    */
   public static final String MEDIA_TYPE = "media-type";
-  
+
   private OutputKeys()
   {
   }
diff --git a/libjava/classpath/javax/xml/transform/Result.java b/libjava/classpath/javax/xml/transform/Result.java
index 58afebafe97..8f4d6c714eb 100644
--- a/libjava/classpath/javax/xml/transform/Result.java
+++ b/libjava/classpath/javax/xml/transform/Result.java
@@ -1,4 +1,4 @@
-/* Result.java -- 
+/* Result.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,7 +38,7 @@ package javax.xml.transform;
 
 /**
  * The result of an XSL transformation.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public interface Result
diff --git a/libjava/classpath/javax/xml/transform/Source.java b/libjava/classpath/javax/xml/transform/Source.java
index 2143b4ec459..f109dcc359d 100644
--- a/libjava/classpath/javax/xml/transform/Source.java
+++ b/libjava/classpath/javax/xml/transform/Source.java
@@ -1,4 +1,4 @@
-/* Source.java -- 
+/* Source.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/SourceLocator.java b/libjava/classpath/javax/xml/transform/SourceLocator.java
index 5304d25479e..190a3b1657c 100644
--- a/libjava/classpath/javax/xml/transform/SourceLocator.java
+++ b/libjava/classpath/javax/xml/transform/SourceLocator.java
@@ -1,4 +1,4 @@
-/* SourceLocator.java -- 
+/* SourceLocator.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package javax.xml.transform;
 /**
  * The location in an XML resource at which an event occurred.
  * Tis is equivalent to the SAX Locator.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public interface SourceLocator
diff --git a/libjava/classpath/javax/xml/transform/Templates.java b/libjava/classpath/javax/xml/transform/Templates.java
index b4d1fbe686b..34d953327b0 100644
--- a/libjava/classpath/javax/xml/transform/Templates.java
+++ b/libjava/classpath/javax/xml/transform/Templates.java
@@ -1,4 +1,4 @@
-/* Templates.java -- 
+/* Templates.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,7 +42,7 @@ import java.util.Properties;
 /**
  * A compiled, reusable XSL transformation.
  * Implementations of this class are guaranteed to be thread safe.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public interface Templates
diff --git a/libjava/classpath/javax/xml/transform/Transformer.java b/libjava/classpath/javax/xml/transform/Transformer.java
index 905412559e0..316675b419e 100644
--- a/libjava/classpath/javax/xml/transform/Transformer.java
+++ b/libjava/classpath/javax/xml/transform/Transformer.java
@@ -1,4 +1,4 @@
-/* Transformer.java -- 
+/* Transformer.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,9 +58,9 @@ public abstract class Transformer
    * @param xmlSource the XML source
    * @param outputTarget the result of the transformation
    */
-  public abstract void transform(Source xmlSource, Result outputTarget) 
+  public abstract void transform(Source xmlSource, Result outputTarget)
     throws TransformerException;
-  
+
   /**
    * Sets a parameter value for the transformation.
    * Parameters may be referenced in the XSLT stylesheet.
@@ -104,7 +104,7 @@ public abstract class Transformer
    * @param oformat a set of output properties, or null to reset all the
    * properties to their default values
    */
-  public abstract void setOutputProperties(Properties oformat) 
+  public abstract void setOutputProperties(Properties oformat)
     throws IllegalArgumentException;
 
   /**
@@ -125,7 +125,7 @@ public abstract class Transformer
    * @param value the string value of the property
    * @exception IllegalArgumentException if the property is not supported
    */
-  public abstract void setOutputProperty(String name, String value) 
+  public abstract void setOutputProperty(String name, String value)
     throws IllegalArgumentException;
 
   /**
@@ -136,7 +136,7 @@ public abstract class Transformer
    * XML Name of the form <code>{<i>namespaceURI</i>}<i>localName</i></code>
    * @exception IllegalArgumentException if the property is not supported
    */
-  public abstract String getOutputProperty(String name) 
+  public abstract String getOutputProperty(String name)
     throws IllegalArgumentException;
 
   /**
@@ -145,7 +145,7 @@ public abstract class Transformer
    */
   public abstract void setErrorListener(ErrorListener listener)
     throws IllegalArgumentException;
-  
+
   /**
    * Returns the callback used to report errors during the transformation.
    */
diff --git a/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java b/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
index 81db3bed913..3343a8041a2 100644
--- a/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
+++ b/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
@@ -1,4 +1,4 @@
-/* TransformerConfigurationException.java -- 
+/* TransformerConfigurationException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -96,6 +96,6 @@ public class TransformerConfigurationException
                                            Throwable e)
   {
     super(message, locator, e);
-  }  
+  }
 
 }
diff --git a/libjava/classpath/javax/xml/transform/TransformerException.java b/libjava/classpath/javax/xml/transform/TransformerException.java
index 7a0b5ad9888..ac83e969c71 100644
--- a/libjava/classpath/javax/xml/transform/TransformerException.java
+++ b/libjava/classpath/javax/xml/transform/TransformerException.java
@@ -1,4 +1,4 @@
-/* TransformerException.java -- 
+/* TransformerException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -91,7 +91,7 @@ public class TransformerException
   /**
    * Constructor with detail message, locator and underlying cause.
    */
-  public TransformerException(String msg, SourceLocator locator, 
+  public TransformerException(String msg, SourceLocator locator,
                               Throwable cause)
   {
     super(msg);
diff --git a/libjava/classpath/javax/xml/transform/TransformerFactory.java b/libjava/classpath/javax/xml/transform/TransformerFactory.java
index e3e6c0cbdc3..0bcc486274e 100644
--- a/libjava/classpath/javax/xml/transform/TransformerFactory.java
+++ b/libjava/classpath/javax/xml/transform/TransformerFactory.java
@@ -1,4 +1,4 @@
-/* TransformerFactory.java -- 
+/* TransformerFactory.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -72,7 +72,7 @@ public abstract class TransformerFactory
    * <li>the default factory class</li>
    * </ol>
    */
-  public static TransformerFactory newInstance() 
+  public static TransformerFactory newInstance()
     throws TransformerFactoryConfigurationError
   {
     ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -98,10 +98,10 @@ public abstract class TransformerFactory
                 className = null;
               }
             catch (Exception e)
-              { 
+              {
                 throw new TransformerFactoryConfigurationError(e,
                     "error instantiating class " + className);
-              } 
+              }
           }
       }
     while (className == null && count < 3);
@@ -116,7 +116,7 @@ public abstract class TransformerFactory
         throw new TransformerFactoryConfigurationError(e);
       }
   }
-  
+
   private static String getFactoryClassName(ClassLoader loader, int attempt)
   {
     final String propertyName = "javax.xml.transform.TransformerFactory";
@@ -140,7 +140,7 @@ public abstract class TransformerFactory
             {
               return null;
             }
-        case 2: 
+        case 2:
           try
             {
               String serviceKey = "/META-INF/services/" + propertyName;
@@ -164,19 +164,19 @@ public abstract class TransformerFactory
           return null;
       }
   }
-  
+
   /**
    * Creates a new transformer using the specified stylesheet.
    * @param source the source of an <a href='http://www.w3.org/TR/xslt'>XSLT
    * stylesheet</a> specifying the transformation to apply
    */
-  public abstract Transformer newTransformer(Source source) 
+  public abstract Transformer newTransformer(Source source)
     throws TransformerConfigurationException;
 
   /**
    * Creates a new transformer that applies the identity transform.
    */
-  public abstract Transformer newTransformer() 
+  public abstract Transformer newTransformer()
     throws TransformerConfigurationException;
 
   /**
@@ -184,7 +184,7 @@ public abstract class TransformerFactory
    * @param source the source of an <a href='http://www.w3.org/TR/xslt'>XSLT
    * stylesheet</a> specifying the transformation to apply
    */
-  public abstract Templates newTemplates(Source source) 
+  public abstract Templates newTemplates(Source source)
     throws TransformerConfigurationException;
 
   /**
@@ -201,10 +201,10 @@ public abstract class TransformerFactory
    * @param charset the charset attribute to match, or <code>null</code> to
    * match any
    */
-  public abstract Source getAssociatedStylesheet(Source source, 
+  public abstract Source getAssociatedStylesheet(Source source,
                                                  String media,
                                                  String title,
-                                                 String charset) 
+                                                 String charset)
     throws TransformerConfigurationException;
 
   /**
@@ -265,14 +265,14 @@ public abstract class TransformerFactory
    * @param name the attribute name
    * @exception IllegalArgumentException if the attribute is not supported
    */
-  public abstract Object getAttribute(String name) 
+  public abstract Object getAttribute(String name)
     throws IllegalArgumentException;
 
   /**
    * Sets the callback to be used by transformers obtained from this factory
    * to report transformation errors.
    */
-  public abstract void setErrorListener(ErrorListener listener) 
+  public abstract void setErrorListener(ErrorListener listener)
     throws IllegalArgumentException;
 
   /**
diff --git a/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java b/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
index 82afeeac750..45e3d3928bf 100644
--- a/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
+++ b/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
@@ -1,4 +1,4 @@
-/* TransformerFactoryConfigurationError.java -- 
+/* TransformerFactoryConfigurationError.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -45,7 +45,7 @@ public class TransformerFactoryConfigurationError
   extends Error
 {
   private static final long serialVersionUID = -6527718720676281516L;
-  
+
   // Name is fixed by the serialization spec.
   private final Exception  exception;
 
@@ -102,5 +102,5 @@ public class TransformerFactoryConfigurationError
   {
     return exception;
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/transform/URIResolver.java b/libjava/classpath/javax/xml/transform/URIResolver.java
index a3d8e8f41ce..e6315bba490 100644
--- a/libjava/classpath/javax/xml/transform/URIResolver.java
+++ b/libjava/classpath/javax/xml/transform/URIResolver.java
@@ -1,4 +1,4 @@
-/* URIResolver.java -- 
+/* URIResolver.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,7 @@ package javax.xml.transform;
 /**
  * Callback that can resolve a URI into source XML for transformation.
  * Equivalent to the SAX EntityResolver.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public interface URIResolver
diff --git a/libjava/classpath/javax/xml/transform/dom/DOMLocator.java b/libjava/classpath/javax/xml/transform/dom/DOMLocator.java
index 7f237065968..acea08e5776 100644
--- a/libjava/classpath/javax/xml/transform/dom/DOMLocator.java
+++ b/libjava/classpath/javax/xml/transform/dom/DOMLocator.java
@@ -1,4 +1,4 @@
-/* DOMLocator.java -- 
+/* DOMLocator.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/dom/DOMResult.java b/libjava/classpath/javax/xml/transform/dom/DOMResult.java
index 6656f42d4f3..7577f2d98a5 100644
--- a/libjava/classpath/javax/xml/transform/dom/DOMResult.java
+++ b/libjava/classpath/javax/xml/transform/dom/DOMResult.java
@@ -1,4 +1,4 @@
-/* DOMResult.java -- 
+/* DOMResult.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -87,7 +87,7 @@ public class DOMResult
   {
     this(node, nextSibling, null);
   }
-  
+
   /**
    * Constructor with the node to append to and the system ID.
    */
@@ -95,7 +95,7 @@ public class DOMResult
   {
     this(node, null, systemID);
   }
-  
+
   /**
    * Constructor with the node to append to, the child node before which
    * the result should be appended, and the system ID.
diff --git a/libjava/classpath/javax/xml/transform/dom/DOMSource.java b/libjava/classpath/javax/xml/transform/dom/DOMSource.java
index 2321496dd23..5922665a0e3 100644
--- a/libjava/classpath/javax/xml/transform/dom/DOMSource.java
+++ b/libjava/classpath/javax/xml/transform/dom/DOMSource.java
@@ -1,4 +1,4 @@
-/* DOMSource.java -- 
+/* DOMSource.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,7 +42,7 @@ import org.w3c.dom.Node;
 
 /**
  * An XML source specified as a W3C DOM node context.
- * 
+ *
  * @author (a href='mailto:dog@gnu.org'>Chris Burdess</a)
  */
 public class DOMSource
diff --git a/libjava/classpath/javax/xml/transform/sax/SAXResult.java b/libjava/classpath/javax/xml/transform/sax/SAXResult.java
index ea6b8dd4bbf..265b9512c3b 100644
--- a/libjava/classpath/javax/xml/transform/sax/SAXResult.java
+++ b/libjava/classpath/javax/xml/transform/sax/SAXResult.java
@@ -1,4 +1,4 @@
-/* SAXResult.java -- 
+/* SAXResult.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -49,7 +49,7 @@ import org.xml.sax.ext.LexicalHandler;
  */
 public class SAXResult implements Result
 {
-  
+
   /**
    * Factory feature indicating that SAX results are supported.
    */
@@ -102,7 +102,7 @@ public class SAXResult implements Result
   {
     lexicalHandler = handler;
   }
-  
+
   /**
    * Returns the lexical handler to which lexical events will be propagated.
    * If a lexical handler is not set, the transformer should attempt to cast
diff --git a/libjava/classpath/javax/xml/transform/sax/SAXSource.java b/libjava/classpath/javax/xml/transform/sax/SAXSource.java
index 4b1f5ee2a26..1ef4b73910a 100644
--- a/libjava/classpath/javax/xml/transform/sax/SAXSource.java
+++ b/libjava/classpath/javax/xml/transform/sax/SAXSource.java
@@ -1,4 +1,4 @@
-/* SAXSource.java -- 
+/* SAXSource.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/sax/SAXTransformerFactory.java b/libjava/classpath/javax/xml/transform/sax/SAXTransformerFactory.java
index 8508777d2b4..2e371376050 100644
--- a/libjava/classpath/javax/xml/transform/sax/SAXTransformerFactory.java
+++ b/libjava/classpath/javax/xml/transform/sax/SAXTransformerFactory.java
@@ -1,4 +1,4 @@
-/* SAXTransformerFactory.java -- 
+/* SAXTransformerFactory.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/sax/TemplatesHandler.java b/libjava/classpath/javax/xml/transform/sax/TemplatesHandler.java
index ae8e6640ea2..86d46aceb1d 100644
--- a/libjava/classpath/javax/xml/transform/sax/TemplatesHandler.java
+++ b/libjava/classpath/javax/xml/transform/sax/TemplatesHandler.java
@@ -1,4 +1,4 @@
-/* TemplatesHandler.java -- 
+/* TemplatesHandler.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/sax/TransformerHandler.java b/libjava/classpath/javax/xml/transform/sax/TransformerHandler.java
index f31c3f8defe..aae56e2a9dc 100644
--- a/libjava/classpath/javax/xml/transform/sax/TransformerHandler.java
+++ b/libjava/classpath/javax/xml/transform/sax/TransformerHandler.java
@@ -1,4 +1,4 @@
-/* TransformerHandler.java -- 
+/* TransformerHandler.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -51,12 +51,12 @@ import org.xml.sax.ext.LexicalHandler;
 public interface TransformerHandler
   extends ContentHandler, LexicalHandler, DTDHandler
 {
-  
+
   /**
    * Sets the result sink to be used as the output of the transformation.
    * @exception IllegalArgumentException if the result is not a valid target
    */
-  public void setResult(Result result) 
+  public void setResult(Result result)
     throws IllegalArgumentException;
 
   /**
diff --git a/libjava/classpath/javax/xml/transform/stream/StreamResult.java b/libjava/classpath/javax/xml/transform/stream/StreamResult.java
index 8fbf3a3653d..b44e6ce5869 100644
--- a/libjava/classpath/javax/xml/transform/stream/StreamResult.java
+++ b/libjava/classpath/javax/xml/transform/stream/StreamResult.java
@@ -1,4 +1,4 @@
-/* StreamResult.java -- 
+/* StreamResult.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/transform/stream/StreamSource.java b/libjava/classpath/javax/xml/transform/stream/StreamSource.java
index 65e2c70789d..def73d8c0a9 100644
--- a/libjava/classpath/javax/xml/transform/stream/StreamSource.java
+++ b/libjava/classpath/javax/xml/transform/stream/StreamSource.java
@@ -1,4 +1,4 @@
-/* StreamSource.java -- 
+/* StreamSource.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/validation/Schema.java b/libjava/classpath/javax/xml/validation/Schema.java
index 46926c8c89a..1329eabf242 100644
--- a/libjava/classpath/javax/xml/validation/Schema.java
+++ b/libjava/classpath/javax/xml/validation/Schema.java
@@ -1,4 +1,4 @@
-/* Schema.java -- 
+/* Schema.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,5 +57,5 @@ public abstract class Schema
   public abstract Validator newValidator();
 
   public abstract ValidatorHandler newValidatorHandler();
-  
+
 }
diff --git a/libjava/classpath/javax/xml/validation/SchemaFactory.java b/libjava/classpath/javax/xml/validation/SchemaFactory.java
index 0b83b6f4d4d..1c099bbe284 100644
--- a/libjava/classpath/javax/xml/validation/SchemaFactory.java
+++ b/libjava/classpath/javax/xml/validation/SchemaFactory.java
@@ -1,4 +1,4 @@
-/* SchemaFactory.java -- 
+/* SchemaFactory.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -188,33 +188,33 @@ public abstract class SchemaFactory
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setFeature(String name, boolean value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public Object getProperty(String name)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setProperty(String name, Object value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public abstract ErrorHandler getErrorHandler();
-  
+
   public abstract void setErrorHandler(ErrorHandler errorHandler);
 
   public abstract LSResourceResolver getResourceResolver();
 
   public abstract void setResourceResolver(LSResourceResolver resourceResolver);
-  
+
   /**
    * Returns a schema based on the specified source resource.
    * @param schema the source resource
@@ -234,7 +234,7 @@ public abstract class SchemaFactory
   {
     return newSchema(new StreamSource(schema));
   }
-  
+
   /**
    * Returns a schema based on the specified URL.
    * @param schema the source resource
@@ -244,7 +244,7 @@ public abstract class SchemaFactory
   {
     return newSchema(new StreamSource(schema.toString()));
   }
-  
+
   /**
    * Parses the specified sources, and combine them into a single schema.
    * The exact procedure and semantics of this depends on the schema
@@ -253,12 +253,12 @@ public abstract class SchemaFactory
    */
   public abstract Schema newSchema(Source[] schemata)
     throws SAXException;
-  
+
   /**
    * Creates a special schema.
    * The exact semantics of this depends on the schema language.
    */
   public abstract Schema newSchema()
     throws SAXException;
-  
+
 }
diff --git a/libjava/classpath/javax/xml/validation/SchemaFactoryLoader.java b/libjava/classpath/javax/xml/validation/SchemaFactoryLoader.java
index dc80a33ccab..7d60138351e 100644
--- a/libjava/classpath/javax/xml/validation/SchemaFactoryLoader.java
+++ b/libjava/classpath/javax/xml/validation/SchemaFactoryLoader.java
@@ -1,4 +1,4 @@
-/* SchemaFactory.java -- 
+/* SchemaFactory.java --
    Copyright (C) 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,5 +48,5 @@ public abstract class SchemaFactoryLoader
   }
 
   public abstract SchemaFactory newFactory(String schemaLanguage);
-  
+
 }
diff --git a/libjava/classpath/javax/xml/validation/TypeInfoProvider.java b/libjava/classpath/javax/xml/validation/TypeInfoProvider.java
index 99bf2832fb6..c8bb227ec90 100644
--- a/libjava/classpath/javax/xml/validation/TypeInfoProvider.java
+++ b/libjava/classpath/javax/xml/validation/TypeInfoProvider.java
@@ -1,4 +1,4 @@
-/* TypeInfoProvider.java -- 
+/* TypeInfoProvider.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,5 +79,5 @@ public abstract class TypeInfoProvider
    * the startElement callback
    */
   public abstract boolean isSpecified(int index);
-  
+
 }
diff --git a/libjava/classpath/javax/xml/validation/Validator.java b/libjava/classpath/javax/xml/validation/Validator.java
index 4a96fc13a1f..f12401a687c 100644
--- a/libjava/classpath/javax/xml/validation/Validator.java
+++ b/libjava/classpath/javax/xml/validation/Validator.java
@@ -1,4 +1,4 @@
-/* Validator.java -- 
+/* Validator.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -81,7 +81,7 @@ public abstract class Validator
    */
   public abstract void validate(Source source, Result result)
     throws SAXException, IOException;
-  
+
   public abstract void setErrorHandler(ErrorHandler errorHandler);
 
   public abstract ErrorHandler getErrorHandler();
@@ -95,23 +95,23 @@ public abstract class Validator
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setFeature(String name, boolean value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public Object getProperty(String name)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setProperty(String name, Object value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
 }
diff --git a/libjava/classpath/javax/xml/validation/ValidatorHandler.java b/libjava/classpath/javax/xml/validation/ValidatorHandler.java
index 50cd1516542..639086bbfad 100644
--- a/libjava/classpath/javax/xml/validation/ValidatorHandler.java
+++ b/libjava/classpath/javax/xml/validation/ValidatorHandler.java
@@ -1,4 +1,4 @@
-/* ValidatorHandler.java -- 
+/* ValidatorHandler.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -73,7 +73,7 @@ public abstract class ValidatorHandler
   public abstract void setErrorHandler(ErrorHandler errorHandler);
 
   public abstract ErrorHandler getErrorHandler();
-  
+
   public abstract void setResourceResolver(LSResourceResolver resourceResolver);
 
   public abstract LSResourceResolver getResourceResolver();
@@ -89,7 +89,7 @@ public abstract class ValidatorHandler
       }
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setFeature(String name, boolean value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
@@ -99,17 +99,17 @@ public abstract class ValidatorHandler
       }
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public Object getProperty(String name)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-  
+
   public void setProperty(String name, Object value)
     throws SAXNotRecognizedException, SAXNotSupportedException
   {
     throw new SAXNotRecognizedException(name);
   }
-    
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPath.java b/libjava/classpath/javax/xml/xpath/XPath.java
index 1bcfa63d22c..eb652b1aec7 100644
--- a/libjava/classpath/javax/xml/xpath/XPath.java
+++ b/libjava/classpath/javax/xml/xpath/XPath.java
@@ -1,4 +1,4 @@
-/* XPath.java -- 
+/* XPath.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -111,5 +111,5 @@ public interface XPath
   String evaluate(String expression,
                   InputSource source)
     throws XPathExpressionException;
-  
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPathConstants.java b/libjava/classpath/javax/xml/xpath/XPathConstants.java
index fbfb9998118..9c39db9f3bd 100644
--- a/libjava/classpath/javax/xml/xpath/XPathConstants.java
+++ b/libjava/classpath/javax/xml/xpath/XPathConstants.java
@@ -1,4 +1,4 @@
-/* XPathConstants.java -- 
+/* XPathConstants.java --
    Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,25 +57,25 @@ public class XPathConstants
    */
   public static final QName NUMBER =
     new QName("http://java.sun.com/jaxp/xpath/dom#number", "");
-  
+
   /**
    * The XPath 1.0 string data type.
    */
   public static final QName STRING =
     new QName("http://java.sun.com/jaxp/xpath/dom#string", "");
-  
+
   /**
    * The XPath 1.0 boolean data type.
    */
   public static final QName BOOLEAN =
     new QName("http://java.sun.com/jaxp/xpath/dom#boolean", "");
-  
+
   /**
    * The XPath 1.0 node-set data type.
    */
   public static final QName NODESET =
     new QName("http://java.sun.com/jaxp/xpath/dom#node-set", "");
-  
+
   /**
    * The XPath 1.0 node data type.
    */
@@ -87,5 +87,5 @@ public class XPathConstants
    */
   public static final String DOM_OBJECT_MODEL =
     "http://java.sun.com/jaxp/xpath/dom";
-  
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPathException.java b/libjava/classpath/javax/xml/xpath/XPathException.java
index cf004c1791e..7d45fa747d1 100644
--- a/libjava/classpath/javax/xml/xpath/XPathException.java
+++ b/libjava/classpath/javax/xml/xpath/XPathException.java
@@ -1,4 +1,4 @@
-/* XPathException.java -- 
+/* XPathException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,7 +58,7 @@ public class XPathException
   {
     super(message);
   }
-  
+
   public XPathException(Throwable cause)
   {
     super(cause);
diff --git a/libjava/classpath/javax/xml/xpath/XPathExpression.java b/libjava/classpath/javax/xml/xpath/XPathExpression.java
index 9ead27b8f26..89c6494c22b 100644
--- a/libjava/classpath/javax/xml/xpath/XPathExpression.java
+++ b/libjava/classpath/javax/xml/xpath/XPathExpression.java
@@ -1,4 +1,4 @@
-/* XPathExpression.java -- 
+/* XPathExpression.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/xpath/XPathExpressionException.java b/libjava/classpath/javax/xml/xpath/XPathExpressionException.java
index 6257adb474b..5435704853c 100644
--- a/libjava/classpath/javax/xml/xpath/XPathExpressionException.java
+++ b/libjava/classpath/javax/xml/xpath/XPathExpressionException.java
@@ -1,4 +1,4 @@
-/* XPathExpressionException.java -- 
+/* XPathExpressionException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/xpath/XPathFactory.java b/libjava/classpath/javax/xml/xpath/XPathFactory.java
index 76a88a10cec..62c17154ace 100644
--- a/libjava/classpath/javax/xml/xpath/XPathFactory.java
+++ b/libjava/classpath/javax/xml/xpath/XPathFactory.java
@@ -1,4 +1,4 @@
-/* XPathFactory.java -- 
+/* XPathFactory.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,7 +58,7 @@ public abstract class XPathFactory
    * The default property name according to the JAXP specification.
    */
   public static final String DEFAULT_PROPERTY_NAME =
-	 	"javax.xml.xpath.XPathFactory";
+                "javax.xml.xpath.XPathFactory";
 
   /**
    * The default object model URI.
@@ -223,5 +223,5 @@ public abstract class XPathFactory
    * Returns a new XPath evaluation environment.
    */
   public abstract XPath newXPath();
-  
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java b/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java
index 0fc68a7634b..929cbe64bb2 100644
--- a/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java
+++ b/libjava/classpath/javax/xml/xpath/XPathFactoryConfigurationException.java
@@ -1,4 +1,4 @@
-/* XPathFactoryConfigurationException.java -- 
+/* XPathFactoryConfigurationException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunction.java b/libjava/classpath/javax/xml/xpath/XPathFunction.java
index dbda11bfe6c..4406e318c89 100644
--- a/libjava/classpath/javax/xml/xpath/XPathFunction.java
+++ b/libjava/classpath/javax/xml/xpath/XPathFunction.java
@@ -1,4 +1,4 @@
-/* XPathFunction.java -- 
+/* XPathFunction.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,5 +55,5 @@ public interface XPathFunction
   @SuppressWarnings("unchecked")
   Object evaluate(List args)
     throws XPathFunctionException;
-  
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunctionException.java b/libjava/classpath/javax/xml/xpath/XPathFunctionException.java
index db680ae65da..c1d3b98cd0a 100644
--- a/libjava/classpath/javax/xml/xpath/XPathFunctionException.java
+++ b/libjava/classpath/javax/xml/xpath/XPathFunctionException.java
@@ -1,4 +1,4 @@
-/* XPathFunctionException.java -- 
+/* XPathFunctionException.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
diff --git a/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java b/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java
index 208f432166e..e896690e6ab 100644
--- a/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java
+++ b/libjava/classpath/javax/xml/xpath/XPathFunctionResolver.java
@@ -1,4 +1,4 @@
-/* XPathFunctionResolver.java -- 
+/* XPathFunctionResolver.java --
    Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,5 +55,5 @@ public interface XPathFunctionResolver
    */
   XPathFunction resolveFunction(QName functionName,
                                 int arity);
-  
+
 }
diff --git a/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java b/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java
index 35226894aad..2da4a6e635b 100644
--- a/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java
+++ b/libjava/classpath/javax/xml/xpath/XPathVariableResolver.java
@@ -1,4 +1,4 @@
-/* XPathVariableResolver.java -- 
+/* XPathVariableResolver.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,5 +48,5 @@ public interface XPathVariableResolver
 {
 
   Object resolveVariable(QName variableName);
-  
+
 }
diff --git a/libjava/classpath/org/omg/CORBA/ARG_IN.java b/libjava/classpath/org/omg/CORBA/ARG_IN.java
index 582a3cf4c07..1c652166a2f 100644
--- a/libjava/classpath/org/omg/CORBA/ARG_IN.java
+++ b/libjava/classpath/org/omg/CORBA/ARG_IN.java
@@ -1,4 +1,4 @@
-/* ARG_IN.java -- 
+/* ARG_IN.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,10 +39,10 @@ package org.omg.CORBA;
 
 /**
  * This simple interface defines just one constant, normally used
- * to mark the parameter as an "input parameter". 
- * 
+ * to mark the parameter as an "input parameter".
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
- * 
+ *
  * @see NamedValue
  */
 public interface ARG_IN
diff --git a/libjava/classpath/org/omg/CORBA/ARG_INOUT.java b/libjava/classpath/org/omg/CORBA/ARG_INOUT.java
index bcdc17a6910..247c6182673 100644
--- a/libjava/classpath/org/omg/CORBA/ARG_INOUT.java
+++ b/libjava/classpath/org/omg/CORBA/ARG_INOUT.java
@@ -1,4 +1,4 @@
-/* ARG_IN.java -- 
+/* ARG_IN.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,12 +39,12 @@ package org.omg.CORBA;
 
 /**
  * This simple interface defines just one constant, normally used
- * to mark that the the parameter is used both to pass and to 
+ * to mark that the the parameter is used both to pass and to
  * return some value. It is a similar conception like passing a
  * parameter "by reference" in C or Pascal.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
- * 
+ *
  * @see NamedValue
  */
 public interface ARG_INOUT
diff --git a/libjava/classpath/org/omg/CORBA/ARG_OUT.java b/libjava/classpath/org/omg/CORBA/ARG_OUT.java
index 1ccf243c28f..4f874882976 100644
--- a/libjava/classpath/org/omg/CORBA/ARG_OUT.java
+++ b/libjava/classpath/org/omg/CORBA/ARG_OUT.java
@@ -1,4 +1,4 @@
-/* ARG_IN.java -- 
+/* ARG_IN.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,10 +39,10 @@ package org.omg.CORBA;
 
 /**
  * This simple interface defines just one constant, normally used
- * to mark the parameter as an "output parameter". 
- * 
+ * to mark the parameter as an "output parameter".
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
- * 
+ *
  * @see NamedValue
  */
 public interface ARG_OUT
diff --git a/libjava/classpath/org/omg/CORBA/AnySeqHolder.java b/libjava/classpath/org/omg/CORBA/AnySeqHolder.java
index 0d21ed3bba9..294966446f3 100644
--- a/libjava/classpath/org/omg/CORBA/AnySeqHolder.java
+++ b/libjava/classpath/org/omg/CORBA/AnySeqHolder.java
@@ -74,7 +74,7 @@ public final class AnySeqHolder
   }
 
   /**
-   * Constructs an instance of AnySeqHolder,  
+   * Constructs an instance of AnySeqHolder,
    * initializing {@link #value} to the given array
    */
   public AnySeqHolder(Any [] a_value)
diff --git a/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java b/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
index 398da9e5957..b4dae0e8a2c 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_CONTEXT.java
@@ -43,15 +43,15 @@ import java.io.Serializable;
 /**
  * Means that the operation is invoked by a client but the passed
  * context has no values required by this operation.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class BAD_CONTEXT
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -5025677944847478264L;
 
diff --git a/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java b/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
index 9390600b73d..ca907094b30 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_INV_ORDER.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that the caller has invoked operations in the wrong order.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class BAD_INV_ORDER
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 7273325995832240406L;
 
diff --git a/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java b/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
index b8489072481..dfa870fe600 100755
--- a/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_OPERATION.java
@@ -43,9 +43,9 @@ import java.io.Serializable;
 /**
  * Means that the object exists but does not support the operation that was
  * invoked on it.
- * 
+ *
  * In GNU Classpath, this exception may have the following Minor codes:
- * 
+ *
  * <table border="1">
  * <tr>
  * <th>Hex</th>
@@ -111,7 +111,7 @@ import java.io.Serializable;
  * policies for the given policy type. </td>
  * </tr>
  * </table>
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class BAD_OPERATION
@@ -126,7 +126,7 @@ public final class BAD_OPERATION
   /**
    * Creates a BAD_OPERATION with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
-   * 
+   *
    * @param message the explaining message.
    */
   public BAD_OPERATION(String message)
@@ -146,7 +146,7 @@ public final class BAD_OPERATION
   /**
    * Creates a BAD_OPERATION exception with the specified minor code and
    * completion status.
-   * 
+   *
    * @param minor additional error code.
    * @param completed the method completion status.
    */
@@ -157,7 +157,7 @@ public final class BAD_OPERATION
 
   /**
    * Created BAD_OPERATION exception, providing full information.
-   * 
+   *
    * @param reason explaining message.
    * @param minor additional error code (the "minor").
    * @param completed the method completion status.
diff --git a/libjava/classpath/org/omg/CORBA/BAD_PARAM.java b/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
index 2102193e5d2..b3e46db7719 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_PARAM.java
@@ -59,8 +59,8 @@ public final class BAD_PARAM
     super(message, 0, CompletionStatus.COMPLETED_NO);
   }
 
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 1917109334939470379L;
 
diff --git a/libjava/classpath/org/omg/CORBA/BAD_POLICY.java b/libjava/classpath/org/omg/CORBA/BAD_POLICY.java
index 98998587c13..43724bf4a73 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_POLICY.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_POLICY.java
@@ -1,4 +1,4 @@
-/* BAD_POLICY.java -- 
+/* BAD_POLICY.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,16 +40,16 @@ package org.omg.CORBA;
 /**
  * Holds a single constant, specifying, that
  * the requested {@link Policy} is not valid. One of the PolicyErrorCodes,
- * others being {@link UNSUPPORTED_POLICY}, 
+ * others being {@link UNSUPPORTED_POLICY},
  * {@link UNSUPPORTED_POLICY_VALUE},
  * {@link BAD_POLICY_TYPE}, {@link BAD_POLICY_VALUE}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface BAD_POLICY
 {
   /**
-   * States that the requested {@link Policy} is not valid. 
+   * States that the requested {@link Policy} is not valid.
    */
   short value = 0;
 }
diff --git a/libjava/classpath/org/omg/CORBA/BAD_POLICY_TYPE.java b/libjava/classpath/org/omg/CORBA/BAD_POLICY_TYPE.java
index fa3f01ee16d..c90832d7232 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_POLICY_TYPE.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_POLICY_TYPE.java
@@ -1,4 +1,4 @@
-/* BAD_POLICY_TYPE.java -- 
+/* BAD_POLICY_TYPE.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,11 +39,11 @@ package org.omg.CORBA;
 
 /**
  * Holds a single constant, specifying, that
- * the requested {@link Policy} type is not valid. One of the 
+ * the requested {@link Policy} type is not valid. One of the
  * PolicyErrorCodes, others being {@link UNSUPPORTED_POLICY},
  * {@link UNSUPPORTED_POLICY_VALUE}, {@link BAD_POLICY},
  * {@link BAD_POLICY_VALUE}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface BAD_POLICY_TYPE
diff --git a/libjava/classpath/org/omg/CORBA/BAD_POLICY_VALUE.java b/libjava/classpath/org/omg/CORBA/BAD_POLICY_VALUE.java
index b0153a8a7fd..a92c9a8b49b 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_POLICY_VALUE.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_POLICY_VALUE.java
@@ -1,4 +1,4 @@
-/* BAD_POLICY_VALUE.java -- 
+/* BAD_POLICY_VALUE.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,17 +39,17 @@ package org.omg.CORBA;
 
 /**
  * Holds a single constant, specifying, that
- * the requested {@link Policy} value is not valid. One of the 
+ * the requested {@link Policy} value is not valid. One of the
  * PolicyErrorCodes, others being {@link UNSUPPORTED_POLICY},
  * {@link BAD_POLICY}, {@link BAD_POLICY_TYPE},
  * {@link BAD_POLICY_VALUE}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface BAD_POLICY_VALUE
 {
   /**
-   * States that the requested {@link Policy} value is not valid. 
+   * States that the requested {@link Policy} value is not valid.
    */
   short value = 3;
 }
diff --git a/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java b/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
index 8aa5eb59ca5..1336711a861 100644
--- a/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
+++ b/libjava/classpath/org/omg/CORBA/BAD_TYPECODE.java
@@ -43,7 +43,7 @@ import java.io.Serializable;
 /**
  * Means that the some TypeCode has been realized to be invalid
  * (for example, has an invalid TCKind value).
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class BAD_TYPECODE
@@ -51,7 +51,7 @@ public final class BAD_TYPECODE
   implements Serializable
 {
   /**
-   *  Use serialVersionUID for interoperability. 
+   *  Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 6193364410915696901L;
 
diff --git a/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java b/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
index 047d20e6c11..eab23eb7530 100644
--- a/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
+++ b/libjava/classpath/org/omg/CORBA/COMM_FAILURE.java
@@ -41,17 +41,17 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means that the communication has been lost while an operation 
+ * Means that the communication has been lost while an operation
  * was in progress
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class COMM_FAILURE
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 294856734784364267L;
 
diff --git a/libjava/classpath/org/omg/CORBA/CTX_RESTRICT_SCOPE.java b/libjava/classpath/org/omg/CORBA/CTX_RESTRICT_SCOPE.java
index 12b9747fccf..de00deffd34 100644
--- a/libjava/classpath/org/omg/CORBA/CTX_RESTRICT_SCOPE.java
+++ b/libjava/classpath/org/omg/CORBA/CTX_RESTRICT_SCOPE.java
@@ -1,4 +1,4 @@
-/* CTX_RESTRICT_SCOPE.java -- 
+/* CTX_RESTRICT_SCOPE.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,7 +41,7 @@ package org.omg.CORBA;
  * This simple interface defines just one constant, normally used
  * to restrict the property search in the {@link Context} by
  * the current context.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface CTX_RESTRICT_SCOPE
diff --git a/libjava/classpath/org/omg/CORBA/CompletionStatus.java b/libjava/classpath/org/omg/CORBA/CompletionStatus.java
index 52f6f078d00..e60b937cef5 100644
--- a/libjava/classpath/org/omg/CORBA/CompletionStatus.java
+++ b/libjava/classpath/org/omg/CORBA/CompletionStatus.java
@@ -110,7 +110,7 @@ public final class CompletionStatus
 
   /**
    * Returns the CompletionStatus, matching the given integer constant
-   * 
+   *
    * @param completion one of COMPLETED_YES, COMPLETED_NO or COMPLEED_MAYBE.
    * @return one of COMPLETED_YES, COMPLETED_NO or COMPLEED_MAYBE.
    * @throws BAD_PARAM if the parameter is not one of these three valid values.
diff --git a/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java b/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
index bf1c375324d..280a902e5bb 100644
--- a/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
+++ b/libjava/classpath/org/omg/CORBA/CompletionStatusHelper.java
@@ -122,10 +122,10 @@ public abstract class CompletionStatusHelper
   {
     String[] members =
       new String[] { "COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE" };
-    
+
     return
       OrbRestricted.Singleton.create_enum_tc(id(), "CompletionStatus",
                                              members
       );
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/Context.java b/libjava/classpath/org/omg/CORBA/Context.java
index 01a7e9944b7..16a47f84b25 100644
--- a/libjava/classpath/org/omg/CORBA/Context.java
+++ b/libjava/classpath/org/omg/CORBA/Context.java
@@ -85,7 +85,7 @@ public abstract class Context
    * Search the values.
    *
    * @param start_scope the context at which to initiate the search.
-   * @param flags the search operation flags. 
+   * @param flags the search operation flags.
    * The flag {@link CTX_RESTRICT_SCOPE} means
    * that search is restricted to the start_scope.
    * @param pattern the property being searched, can be
@@ -109,14 +109,14 @@ public abstract class Context
    * @param value the property value (the {@link Any} must hold string).
    */
   public abstract void set_one_value(String name, Any value);
-  
+
   /**
    * Set multiple properties.
-   * 
-   * @param values a list of properties, the {@link Any}'s 
+   *
+   * @param values a list of properties, the {@link Any}'s
    * in the list components must hold strings.
    */
   public abstract void set_values(NVList values);
-  
-  
+
+
 }
diff --git a/libjava/classpath/org/omg/CORBA/Current.java b/libjava/classpath/org/omg/CORBA/Current.java
index f6f89a16f7b..fbf5e0c4698 100644
--- a/libjava/classpath/org/omg/CORBA/Current.java
+++ b/libjava/classpath/org/omg/CORBA/Current.java
@@ -56,4 +56,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface Current
   extends org.omg.CORBA.Object, IDLEntity, CurrentOperations
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/CurrentHelper.java b/libjava/classpath/org/omg/CORBA/CurrentHelper.java
index 36c5f186329..80c5855ef7b 100644
--- a/libjava/classpath/org/omg/CORBA/CurrentHelper.java
+++ b/libjava/classpath/org/omg/CORBA/CurrentHelper.java
@@ -170,4 +170,4 @@ public abstract class CurrentHelper
   {
     output.write_Object(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/CurrentHolder.java b/libjava/classpath/org/omg/CORBA/CurrentHolder.java
index c7c1b32d291..fa01a41eabf 100644
--- a/libjava/classpath/org/omg/CORBA/CurrentHolder.java
+++ b/libjava/classpath/org/omg/CORBA/CurrentHolder.java
@@ -100,4 +100,4 @@ public final class CurrentHolder
   {
     return CurrentHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/CustomMarshal.java b/libjava/classpath/org/omg/CORBA/CustomMarshal.java
index d0e47a9fc31..5adbf31973a 100644
--- a/libjava/classpath/org/omg/CORBA/CustomMarshal.java
+++ b/libjava/classpath/org/omg/CORBA/CustomMarshal.java
@@ -65,4 +65,4 @@ public interface CustomMarshal
    * @param from_stream a stream to write into.
    */
   public void unmarshal(DataInputStream from_stream);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/CustomValue.java b/libjava/classpath/org/omg/CORBA/CustomValue.java
index 6814ab3c59d..0c080fb84b0 100644
--- a/libjava/classpath/org/omg/CORBA/CustomValue.java
+++ b/libjava/classpath/org/omg/CORBA/CustomValue.java
@@ -58,4 +58,4 @@ import org.omg.CORBA.portable.ValueBase;
 public interface CustomValue
   extends ValueBase, CustomMarshal
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java b/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
index 7ca83f3c2d6..a7dd4d728f4 100644
--- a/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
+++ b/libjava/classpath/org/omg/CORBA/DATA_CONVERSION.java
@@ -43,9 +43,9 @@ import java.io.Serializable;
 /**
  * Means that the ORB cannot convert between the marshalled and
  * native data representation.
- * 
+ *
  * In GNU Classpath, this exception may have the following minor codes:
- * 
+ *
  * <table border="1">
  * <tr>
  * <td>Hex</td>
@@ -62,16 +62,16 @@ import java.io.Serializable;
  * local or remote resource (file or network), but this resource is not
  * reacheable.</td>
  * </tr>
- * </table> 
- * 
+ * </table>
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class DATA_CONVERSION
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 1874869932271600956L;
 
diff --git a/libjava/classpath/org/omg/CORBA/DataInputStream.java b/libjava/classpath/org/omg/CORBA/DataInputStream.java
index bb9fa3df82a..70a0b2c4790 100644
--- a/libjava/classpath/org/omg/CORBA/DataInputStream.java
+++ b/libjava/classpath/org/omg/CORBA/DataInputStream.java
@@ -273,4 +273,4 @@ public interface DataInputStream
    * .value field of the passed holder.
    */
   void read_double_array(DoubleSeqHolder seq, int offset, int length);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/DataOutputStream.java b/libjava/classpath/org/omg/CORBA/DataOutputStream.java
index 20f1afbe21f..e1a417fce88 100644
--- a/libjava/classpath/org/omg/CORBA/DataOutputStream.java
+++ b/libjava/classpath/org/omg/CORBA/DataOutputStream.java
@@ -278,4 +278,4 @@ public interface DataOutputStream
    * @param seq a value to write.
    */
   void write_double_array(double[] seq, int offset, int length);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/DefinitionKind.java b/libjava/classpath/org/omg/CORBA/DefinitionKind.java
index ac185bdacea..09100b59892 100644
--- a/libjava/classpath/org/omg/CORBA/DefinitionKind.java
+++ b/libjava/classpath/org/omg/CORBA/DefinitionKind.java
@@ -422,4 +422,4 @@ public class DefinitionKind
     table [ _dk_Native ] = dk_Native;
     table [ _dk_AbstractInterface ] = dk_AbstractInterface;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
index 05fe992872f..2a6c97dc15c 100644
--- a/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
+++ b/libjava/classpath/org/omg/CORBA/DefinitionKindHelper.java
@@ -85,7 +85,7 @@ public abstract class DefinitionKindHelper
                   "dk_Wstring", "dk_Fixed", "dk_Value", "dk_ValueBox",
                   "dk_ValueMember", "dk_Native"
                  };
-    
+
     return
     OrbRestricted.Singleton.create_enum_tc(id(), "DefinitionKind",
                                            members
@@ -122,4 +122,4 @@ public abstract class DefinitionKindHelper
   {
     ostream.write_long(value.value());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/DynamicImplementation.java b/libjava/classpath/org/omg/CORBA/DynamicImplementation.java
index 24e6319fec5..40c80079851 100644
--- a/libjava/classpath/org/omg/CORBA/DynamicImplementation.java
+++ b/libjava/classpath/org/omg/CORBA/DynamicImplementation.java
@@ -62,9 +62,9 @@ public class DynamicImplementation
   /**
    * Invoke the method of the CORBA object. After converting the parameters,
    * this method delegates call to the {@link ObjectImpl#_invoke}.
-   * 
+   *
    * @deprecated since 1.4.
-   * 
+   *
    * @param request the container for both passing and returing the parameters,
    * also contains the method name and thrown exceptions.
    */
@@ -93,13 +93,13 @@ public class DynamicImplementation
                   out = v.value().create_output_stream();
                   v.value().write_value(out);
                   n = r.add_named_in_arg(v.name());
-                  n.read_value(out.create_input_stream(), v.value().type());                  
+                  n.read_value(out.create_input_stream(), v.value().type());
                   break;
                 case ARG_INOUT.value:
                   out = v.value().create_output_stream();
                   v.value().write_value(out);
                   n = r.add_named_inout_arg(v.name());
-                  n.read_value(out.create_input_stream(), v.value().type());                  
+                  n.read_value(out.create_input_stream(), v.value().type());
                   break;
                 case ARG_OUT.value:
                   r.add_named_out_arg(v.name());
@@ -117,10 +117,10 @@ public class DynamicImplementation
 
     // Set context.
     r.ctx(request.ctx());
-    
+
     // Set the return type (expects that the ServerRequest will initialise
     // the passed Any.
-    
+
     gnuAny g = new gnuAny();
     request.result(g);
     r.set_return_type(g.type());
@@ -135,7 +135,7 @@ public class DynamicImplementation
       {
         // API states that the ServerRequest.arguments must be called only
         // once. Hence we assume we can just modify the previously returned
-        // value <code>args</code>, and the ServerRequest will preserve the 
+        // value <code>args</code>, and the ServerRequest will preserve the
         // reference.
         for (i = 0; i < args.count(); i++)
           {
diff --git a/libjava/classpath/org/omg/CORBA/FREE_MEM.java b/libjava/classpath/org/omg/CORBA/FREE_MEM.java
index ec1aa082928..ac656c0fae7 100644
--- a/libjava/classpath/org/omg/CORBA/FREE_MEM.java
+++ b/libjava/classpath/org/omg/CORBA/FREE_MEM.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means errors, related to freeing the allocated memory.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class FREE_MEM
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -1333559476995791982L;
 
diff --git a/libjava/classpath/org/omg/CORBA/FieldNameHelper.java b/libjava/classpath/org/omg/CORBA/FieldNameHelper.java
index 1f884d72821..276105eec04 100644
--- a/libjava/classpath/org/omg/CORBA/FieldNameHelper.java
+++ b/libjava/classpath/org/omg/CORBA/FieldNameHelper.java
@@ -113,4 +113,4 @@ public abstract class FieldNameHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java b/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
index ff874947f5e..fa8d71dd347 100644
--- a/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/IDLTypeHelper.java
@@ -125,4 +125,4 @@ public abstract class IDLTypeHelper
         return new _IDLTypeStub(delegate);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java b/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
index b36d69e0ca6..5fda9276dce 100644
--- a/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
+++ b/libjava/classpath/org/omg/CORBA/IMP_LIMIT.java
@@ -43,15 +43,15 @@ import java.io.Serializable;
 /**
  * Means that the server has reached some implementation limit
  * (too many clients, too many references, too long parameters and so on).
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class IMP_LIMIT
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -8086463494577448422L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INITIALIZE.java b/libjava/classpath/org/omg/CORBA/INITIALIZE.java
index b42739accc1..ac07b3f5c65 100644
--- a/libjava/classpath/org/omg/CORBA/INITIALIZE.java
+++ b/libjava/classpath/org/omg/CORBA/INITIALIZE.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that the server cannot be initialized because of the some reason.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INITIALIZE
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -3753094599663690309L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INTERNAL.java b/libjava/classpath/org/omg/CORBA/INTERNAL.java
index b8be638359e..74478e7c661 100644
--- a/libjava/classpath/org/omg/CORBA/INTERNAL.java
+++ b/libjava/classpath/org/omg/CORBA/INTERNAL.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means an internal failure in the ORB.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INTERNAL
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 3771336866139357605L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INTF_REPOS.java b/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
index b7b6fe3fd98..7c65dc1f25f 100644
--- a/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
+++ b/libjava/classpath/org/omg/CORBA/INTF_REPOS.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means errors, related to the interface repository.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INTF_REPOS
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 722572694720671863L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java b/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
index 08082d1f52c..ed39311cf33 100644
--- a/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
+++ b/libjava/classpath/org/omg/CORBA/INVALID_TRANSACTION.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that request carried an invalid transaction context.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INVALID_TRANSACTION
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -4265126403821571697L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INV_FLAG.java b/libjava/classpath/org/omg/CORBA/INV_FLAG.java
index 92b1cd12fee..6f6f6333ed9 100644
--- a/libjava/classpath/org/omg/CORBA/INV_FLAG.java
+++ b/libjava/classpath/org/omg/CORBA/INV_FLAG.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means invalid flag, passed during operation.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INV_FLAG
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -4863924749863817671L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INV_IDENT.java b/libjava/classpath/org/omg/CORBA/INV_IDENT.java
index 89a59448d5e..ae1de4fe88c 100644
--- a/libjava/classpath/org/omg/CORBA/INV_IDENT.java
+++ b/libjava/classpath/org/omg/CORBA/INV_IDENT.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that some IDL identifier has a wrong syntax.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INV_IDENT
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 4399295047946553530L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INV_OBJREF.java b/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
index 8b6368b7726..ef12b3cdc20 100644
--- a/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
+++ b/libjava/classpath/org/omg/CORBA/INV_OBJREF.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that some object reference is internally malformed.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INV_OBJREF
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -7238811948257685034L;
 
diff --git a/libjava/classpath/org/omg/CORBA/INV_POLICY.java b/libjava/classpath/org/omg/CORBA/INV_POLICY.java
index 5b74e500aa4..45ef7ab0703 100644
--- a/libjava/classpath/org/omg/CORBA/INV_POLICY.java
+++ b/libjava/classpath/org/omg/CORBA/INV_POLICY.java
@@ -41,18 +41,18 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * This exception is thrown when an invocation cannot be made because of 
- * an incompatibility between Policy overrides that apply to the 
+ * This exception is thrown when an invocation cannot be made because of
+ * an incompatibility between Policy overrides that apply to the
  * particular invocation.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class INV_POLICY
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -7823113107689030975L;
 
diff --git a/libjava/classpath/org/omg/CORBA/IRObject.java b/libjava/classpath/org/omg/CORBA/IRObject.java
index 8c9cde19d39..b0750089c81 100644
--- a/libjava/classpath/org/omg/CORBA/IRObject.java
+++ b/libjava/classpath/org/omg/CORBA/IRObject.java
@@ -50,4 +50,4 @@ import java.io.Serializable;
 public interface IRObject
   extends IRObjectOperations, org.omg.CORBA.Object, Serializable, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/IRObjectOperations.java b/libjava/classpath/org/omg/CORBA/IRObjectOperations.java
index c7c89ae557d..40e93694743 100644
--- a/libjava/classpath/org/omg/CORBA/IRObjectOperations.java
+++ b/libjava/classpath/org/omg/CORBA/IRObjectOperations.java
@@ -65,4 +65,4 @@ public interface IRObjectOperations {
    */
   void destroy() throws BAD_INV_ORDER;
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/IdentifierHelper.java b/libjava/classpath/org/omg/CORBA/IdentifierHelper.java
index deff909690e..644a3eb4e8f 100644
--- a/libjava/classpath/org/omg/CORBA/IdentifierHelper.java
+++ b/libjava/classpath/org/omg/CORBA/IdentifierHelper.java
@@ -113,4 +113,4 @@ public abstract class IdentifierHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/LocalObject.java b/libjava/classpath/org/omg/CORBA/LocalObject.java
index c4f095f21d9..60436ee3540 100644
--- a/libjava/classpath/org/omg/CORBA/LocalObject.java
+++ b/libjava/classpath/org/omg/CORBA/LocalObject.java
@@ -250,21 +250,21 @@ public class LocalObject
   {
     throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
+
   /**
    * This method is called from <code>rmic</code> generated stubs if the
    * {@link Util#isLocal}, called passing <code>this</code> as parameter,
    * returns true. If the method returns null, the requested method is then
    * invoked on <code>this</code>. Else it is invoked on the returned object,
    * casting it into the interface that the local object implements. In this
-   * case, the generated stub also later calls 
+   * case, the generated stub also later calls
    * {@link #_servant_postinvoke(ServantObject)}, passing that returned target
    * as parameter.
-   * 
+   *
    * @param operation the name of the method being invoked.
-   * @param expectedType the interface that the returned servant 
+   * @param expectedType the interface that the returned servant
    * object must implement.
-   * 
+   *
    * @throws NO_IMPLEMENT always. If used, the method must be overridden.
    */
   @SuppressWarnings("unchecked") // Needed for API compatibility
@@ -272,28 +272,28 @@ public class LocalObject
   {
     throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
-  
+
+
   /**
    * This method is called from <code>rmic</code> generated stubs if the
    * {@link Util#isLocal}, called passing <code>this</code> as parameter,
    * returns true, and the {@link #_servant_preinvoke} return non-null object.
    * The stub then invokes the requrested method on that returned object and
    * later calls _servant_postinvoke, passing that returned target as parameter.
-   * 
+   *
    * @param servant the object that has served as the invocation target for the
    * current operation.
    */
   public void _servant_postinvoke(ServantObject servant)
   {
   }
-  
+
   /**
-   * Invokes the operation. This method takes the OutputStream that was previously 
-   * returned by a {@link #_request(String)} and returns an InputStream which 
+   * Invokes the operation. This method takes the OutputStream that was previously
+   * returned by a {@link #_request(String)} and returns an InputStream which
    * contains the reply. Up till jdk 1.5 inclusive this method is marked as
    * unimplemented.
-   * 
+   *
    * @throws NO_IMPLEMENT always.
    */
   public InputStream _invoke(OutputStream output)
@@ -301,23 +301,23 @@ public class LocalObject
   {
     throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
+
   /**
    * While it may look that this should return true, the jdk 1.5 API states
    * that it must throw NO_IMPLEMENT instead. The rmi stubs do not call this
    * method to check if the object is local; they call {@link Util#isLocal}
-   * instead (passing <code>this</code> as parameter).  
-   * 
+   * instead (passing <code>this</code> as parameter).
+   *
    * @return never.
-   * 
+   *
    * @throws NO_IMPLEMENT always.
    */
   public boolean _is_local()
   {
     throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
-  
+
+
   /**
    * This method is not appropriate for the local objects and just
    * throws an exception.
@@ -326,31 +326,31 @@ public class LocalObject
    */
   public ORB _orb()
   {
-    throw new NO_IMPLEMENT(INAPPROPRIATE);    
+    throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
+
   /**
    * This method is not appropriate for the local objects and just
    * throws an exception.
    *
    * @throws NO_IMPLEMENT, always.
    */
-  public void _releaseReply(InputStream input) 
+  public void _releaseReply(InputStream input)
   {
-    throw new NO_IMPLEMENT(INAPPROPRIATE);    
+    throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
+
   /**
    * This method is not appropriate for the local objects and just
    * throws an exception.
    *
    * @throws NO_IMPLEMENT, always.
    */
-  public OutputStream _request(String operation, boolean responseExpected) 
+  public OutputStream _request(String operation, boolean responseExpected)
   {
-    throw new NO_IMPLEMENT(INAPPROPRIATE);    
+    throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-  
+
   /**
    * This method is not appropriate for the local objects and just
    * throws an exception.
@@ -361,4 +361,4 @@ public class LocalObject
   {
     throw new NO_IMPLEMENT(INAPPROPRIATE);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/LongSeqHolder.java b/libjava/classpath/org/omg/CORBA/LongSeqHolder.java
index 79e94382d3d..8ecf96cc6f4 100644
--- a/libjava/classpath/org/omg/CORBA/LongSeqHolder.java
+++ b/libjava/classpath/org/omg/CORBA/LongSeqHolder.java
@@ -46,8 +46,8 @@ import org.omg.CORBA.portable.Streamable;
 
 /**
  * A sequence holder for CORBA <code>LongSeq</code> that is mapped into
- * java <code>int[]</code>. 
- * 
+ * java <code>int[]</code>.
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class LongSeqHolder
@@ -56,27 +56,27 @@ public final class LongSeqHolder
   /**
    * The type code for this holder. Each holder has a different instance.
    */
-  private final ArrayTypeCode typecode = 
+  private final ArrayTypeCode typecode =
     new ArrayTypeCode(TCKind.tk_long);
-  
+
   /**
    * The <code>int[]</code> (CORBA <code>LongSeq</code>) value,
    * held by this LongSeqHolder.
    */
   public int[] value;
-  
+
   /**
    * Constructs an instance of LongSeqHolder,
    * initializing {@link #value} to <code>null</code>.
    */
   public LongSeqHolder()
   {
-  }  
-  
+  }
+
   /**
    * Constructs an instance of LongSeqHolder,
    * initializing {@link #value} to the given <code>int</code>.
-   * 
+   *
    * @param initial_value a value that will be assigned to the
    * {@link #value} field.
    */
@@ -85,13 +85,13 @@ public final class LongSeqHolder
     value = initial_value;
     typecode.setLength(value.length);
   }
-  
+
   /**
    * Fill in the {@link #value } field by reading the required data
    * from the given stream. This method first reads the array size
    * (as CORBA <code>long</code>and then calls the
    * {@link org.omg.CORBA.portable.InputStream#read_long_array }.
-   * 
+   *
    * @param input the input stream to read from.
    */
   public void _read(InputStream input)
@@ -99,22 +99,22 @@ public final class LongSeqHolder
     value = new int[ input.read_long() ];
     input.read_long_array(value, 0, value.length);
     typecode.setLength(value.length);
-  }  
-  
+  }
+
   /**
    * Write the {@link #value } field to the given stream.
    * This method first writes the array size
    * (as CORBA <code>long</code>and then calls the
-   * {@link org.omg.CORBA.portable.OutputStream#write_long_array }.    
-   * 
+   * {@link org.omg.CORBA.portable.OutputStream#write_long_array }.
+   *
    * @param output the output stream to write into.
    */
   public void _write(OutputStream output)
   {
     output.write_long(value.length);
     output.write_long_array(value, 0, value.length);
-  }  
-  
+  }
+
   /**
    * Returns the TypeCode, corresponding the CORBA type that is stored
    * using this holder.
@@ -122,7 +122,7 @@ public final class LongSeqHolder
   public TypeCode _type()
   {
     return typecode;
-  }  
-  
-  
+  }
+
+
 }
diff --git a/libjava/classpath/org/omg/CORBA/MARSHAL.java b/libjava/classpath/org/omg/CORBA/MARSHAL.java
index b031acfd328..d5d86db4e94 100644
--- a/libjava/classpath/org/omg/CORBA/MARSHAL.java
+++ b/libjava/classpath/org/omg/CORBA/MARSHAL.java
@@ -44,7 +44,7 @@ import java.io.Serializable;
  * Means that some request or reply from the network has a wrong size or is
  * structurally invalid. In GNU Classpath, this exception may have the following
  * minor codes (the high 20 bits being Classpath VMCID):
- * 
+ *
  * <table border="1">
  * <tr>
  * <th>Hex</th>
@@ -216,7 +216,7 @@ import java.io.Serializable;
  * <td>No means are provided to read or write this value type (not Streamable,
  * not CustomMarshal, not Serializable, no factory, no helper.</td>
  * </tr>
- * <tr> 
+ * <tr>
  * <td>47430017</td>
  * <td>1195573271</td>
  * <td>23</td>
@@ -228,7 +228,7 @@ import java.io.Serializable;
  * <td>47430018</td>
  * <td>1195573272</td>
  * <td>24</td>
- * 
+ *
  * <td>UnsupportedAddressing</td>
  * <td>Unsupported object addressing method in GIOP request header.</td>
  * </tr>
@@ -246,7 +246,7 @@ import java.io.Serializable;
  * <td>TargetConversion</td>
  * <td>Problems with converting between stubs, ties, interfaces and
  * implementations.</td>
- * 
+ *
  * </tr>
  * <tr>
  * <td>4743001b</td>
@@ -265,7 +265,7 @@ import java.io.Serializable;
  * serializable</td>
  * </tr>
  * </table>
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class MARSHAL
@@ -280,7 +280,7 @@ public final class MARSHAL
   /**
    * Creates a MARSHAL with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
-   * 
+   *
    * @param message the explaining message.
    */
   public MARSHAL(String message)
@@ -300,7 +300,7 @@ public final class MARSHAL
   /**
    * Creates a MARSHAL exception with the specified minor code and completion
    * status.
-   * 
+   *
    * @param minor_code additional error code.
    * @param is_completed the method completion status.
    */
@@ -311,7 +311,7 @@ public final class MARSHAL
 
   /**
    * Created MARSHAL exception, providing full information.
-   * 
+   *
    * @param reason explaining message.
    * @param minor_code additional error code (the "minor").
    * @param is_completed the method completion status.
diff --git a/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java b/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
index 1041f200702..97caa1af0f4 100644
--- a/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
+++ b/libjava/classpath/org/omg/CORBA/NO_IMPLEMENT.java
@@ -50,8 +50,8 @@ public final class NO_IMPLEMENT
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 3519190655657192112L;
 
diff --git a/libjava/classpath/org/omg/CORBA/NO_MEMORY.java b/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
index 276cb54f5a5..04bf3ff61dd 100644
--- a/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
+++ b/libjava/classpath/org/omg/CORBA/NO_MEMORY.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that the server has runned out of memory.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class NO_MEMORY
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -4591569617929689285L;
 
diff --git a/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java b/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
index 8e781842d71..cdce9c82099 100644
--- a/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
+++ b/libjava/classpath/org/omg/CORBA/NO_PERMISSION.java
@@ -42,15 +42,15 @@ import java.io.Serializable;
 
 /**
  * Means that the caller has no rights to invoke the operation.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class NO_PERMISSION
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -1533969523582458479L;
 
diff --git a/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java b/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
index 14981b3aa77..a58279fbd07 100644
--- a/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
+++ b/libjava/classpath/org/omg/CORBA/NO_RESOURCES.java
@@ -43,9 +43,9 @@ import java.io.Serializable;
 /**
  * Means that the ORB has reached some general resource limitation like maximal
  * number of the opened connections.
- * 
+ *
  * In GNU Classpath, this exception may have the following minor codes:
- * 
+ *
  * <table border="1">
  * <tr>
  * <td>Hex</td>
@@ -72,8 +72,8 @@ import java.io.Serializable;
  * if turned on, prevents malicios client from knocking the server out by
  * suddenly submitting a very large number of requests. </td>
  * </tr>
- * </table> 
- * 
+ * </table>
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public final class NO_RESOURCES
@@ -88,7 +88,7 @@ public final class NO_RESOURCES
   /**
    * Creates a NO_RESOURCES with the default minor code of 0, completion state
    * COMPLETED_NO and the given explaining message.
-   * 
+   *
    * @param message the explaining message.
    */
   public NO_RESOURCES(String message)
@@ -108,7 +108,7 @@ public final class NO_RESOURCES
   /**
    * Creates a NO_RESOURCES exception with the specified minor code and
    * completion status.
-   * 
+   *
    * @param a_minor additional error code.
    * @param a_completed the method completion status.
    */
@@ -119,7 +119,7 @@ public final class NO_RESOURCES
 
   /**
    * Created NO_RESOURCES exception, providing full information.
-   * 
+   *
    * @param a_reason explaining message.
    * @param a_minor additional error code (the "minor").
    * @param a_completed the method completion status.
diff --git a/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java b/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
index afed988526d..140a39c9a89 100644
--- a/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
+++ b/libjava/classpath/org/omg/CORBA/NO_RESPONSE.java
@@ -50,8 +50,8 @@ public final class NO_RESPONSE
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 1971973765161647047L;
 
diff --git a/libjava/classpath/org/omg/CORBA/NVList.java b/libjava/classpath/org/omg/CORBA/NVList.java
index af1241ada7d..f446d600793 100644
--- a/libjava/classpath/org/omg/CORBA/NVList.java
+++ b/libjava/classpath/org/omg/CORBA/NVList.java
@@ -55,10 +55,10 @@ public abstract class NVList
    * Create and add a new named value object with null name,
    * null value and having given flags.
    * @param a_flags the flags, the normally expected values are
-   * {@link org.omg.CORBA.ARG_IN#value}, 
-   * {@link org.omg.CORBA.ARG_OUT#value} and 
+   * {@link org.omg.CORBA.ARG_IN#value},
+   * {@link org.omg.CORBA.ARG_OUT#value} and
    * {@link org.omg.CORBA.ARG_INOUT#value} or 0.
-   * 
+   *
    * @return the created and added value.
    */
   public abstract NamedValue add(int a_flags);
@@ -71,7 +71,7 @@ public abstract class NVList
    * {@link org.omg.CORBA.ARG_IN#value},
    * {@link org.omg.CORBA.ARG_OUT#value} and
    * {@link org.omg.CORBA.ARG_INOUT#value} or 0.
-   * 
+   *
    * @return the created and added value.
    */
   public abstract NamedValue add_item(String a_name, int a_flags);
@@ -85,14 +85,14 @@ public abstract class NVList
    * {@link org.omg.CORBA.ARG_IN#value},
    * {@link org.omg.CORBA.ARG_OUT#value} and
    * {@link org.omg.CORBA.ARG_INOUT#value} or 0.
-   * 
+   *
    * @return the created object.
    */
   public abstract NamedValue add_value(String a_name, Any a_value, int a_flags);
 
   /**
    * Get the number of the present named value pairs.
-   * 
+   *
    * @return the number of objects in the list.
    */
   public abstract int count();
@@ -100,7 +100,7 @@ public abstract class NVList
   /**
    * Get the item at the given index
    * @param at the index.
-   * 
+   *
    * @return the item at the index
    * @throws Bounds if the index is out of bounds.
    */
diff --git a/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java b/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
index 549ac64d1bf..97ca3197e94 100644
--- a/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
+++ b/libjava/classpath/org/omg/CORBA/OBJECT_NOT_EXIST.java
@@ -48,8 +48,8 @@ public final class OBJECT_NOT_EXIST
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 7226958015420512389L;
 
diff --git a/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java b/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
index f1b25a4c4dc..8ec07fd4de0 100644
--- a/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
+++ b/libjava/classpath/org/omg/CORBA/OBJ_ADAPTER.java
@@ -49,8 +49,8 @@ public final class OBJ_ADAPTER
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -1516541344234786928L;
 
diff --git a/libjava/classpath/org/omg/CORBA/OMGVMCID.java b/libjava/classpath/org/omg/CORBA/OMGVMCID.java
index 2b2bd4bc3ef..127706bf0f7 100644
--- a/libjava/classpath/org/omg/CORBA/OMGVMCID.java
+++ b/libjava/classpath/org/omg/CORBA/OMGVMCID.java
@@ -1,4 +1,4 @@
-/* OMGVMCID.java -- 
+/* OMGVMCID.java --
  Copyright (C) 2005 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
@@ -56,11 +56,11 @@ package org.omg.CORBA;
  * assigned space, the assignment of values to minor codes is left to the
  * vendor.
  * </p>
- * 
+ *
  * <p>
  * The VMCID 0 and 0xFFFFF0000 are reserved for experimental use.
  * </p>
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface OMGVMCID
diff --git a/libjava/classpath/org/omg/CORBA/ORB.java b/libjava/classpath/org/omg/CORBA/ORB.java
index 71e63d45621..d40007d2ce4 100644
--- a/libjava/classpath/org/omg/CORBA/ORB.java
+++ b/libjava/classpath/org/omg/CORBA/ORB.java
@@ -62,12 +62,12 @@ import java.util.Properties;
  * A central class in CORBA implementation, responsible for sending and handling
  * remote invocations. ORB also works as a factory for creating instances of
  * certain CORBA classes.
- * 
+ *
  * Despite the core library contains the fully working CORBA implementation, it
  * also provides a simple way to plug-in the alternative CORBA support. This is
  * done by replacing the ORB. The alternative ORB can be specified via
  * properties, passed to ORB.Init(...).
- * 
+ *
  * When creating an ORB instance, the class name is searched in the following
  * locations:
  * <p>
@@ -77,7 +77,7 @@ import java.util.Properties;
  * 4. The orb.properties file located in the user.home directory (if any).<br>
  * 5. The orb.properties file located in the java.home/lib directory (if any).
  * </p>
- * 
+ *
  * The supported properties are: <table border="1">
  * <tr>
  * <td> org.omg.CORBA.ORBClass</td>
@@ -99,7 +99,7 @@ import java.util.Properties;
  * <td>org.omg.CORBA.ORBid</td>
  * <td>Specifies the name (ORB Id) of this ORB. The ORB Id is later accessible
  * by {@link ObjectReferenceTemplate#orb_id}. The default value includes the
- * hashcode of the ORB instance that is normally different for each ORB. 
+ * hashcode of the ORB instance that is normally different for each ORB.
  * </td>
  * </tr>
  * <tr>
@@ -126,16 +126,16 @@ import java.util.Properties;
  * currently instantiated. Serves as a replacement of the proprietary
  * property com.sun.CORBA.connection.ORBSocketFactoryClass. To have multiple
  * types of sockets, instantiate several ORB's with this property each time
- * set to the different value. 
+ * set to the different value.
  * The factory must implement gnu.CORBA.interfaces.SocketFactory.
  * </td>
  * </tr>
- * </table> 
+ * </table>
  * <p>The command line accepts the same properties as a keys. When
  * specifying in the command line, the prefix org.omg.CORBA can be omitted, for
  * instance<code> -ORBInitRef NameService=IOR:aabbccdd....</code>
  * </p>
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class ORB
@@ -155,20 +155,20 @@ public abstract class ORB
    */
   private static final String RESTRICTED_ORB =
     "org.omg.CORBA.ORBSingletonClass";
-  
+
   private static final String LISTENER_PORT =
     OrbFocused.LISTENER_PORT;
-  
+
   /**
    * The class, implementing the default fully functional ORB.
    */
   private static final String DEFAULT_FUNCTIONAL_ORB =
     gnu.CORBA.Poa.ORB_1_4.class.getName();
-  
+
   private static final String DEFAULT_FOCUSED_ORB =
     gnu.CORBA.OrbFocused.class.getName();
-  
-  // There is no need for name of the default restricted ORB as it is 
+
+  // There is no need for name of the default restricted ORB as it is
   // singleton and it is more effectively referred directly.
 
   /**
@@ -282,7 +282,7 @@ public abstract class ORB
   {
     throw new NO_IMPLEMENT();
   }
-  
+
   /**
    * The support for {@link DynAny} and derived interfaces
    * has never been implemented in Sun's java releases,
@@ -371,7 +371,7 @@ public abstract class ORB
   {
     throw new NO_IMPLEMENT();
   }
-  
+
   /**
    * The support for {@link DynUnion} and derived interfaces
    * has never been implemented in Sun's java releases,
@@ -529,7 +529,7 @@ public abstract class ORB
    */
   public abstract Request get_next_response()
                                      throws WrongTransaction;
- 
+
   /**
    * Create a new CDR output stream, where the parameter values can be written
    * during the method invocation.
@@ -844,10 +844,10 @@ public abstract class ORB
   {
     String ocn = applet.getParameter(FUNCTIONAL_ORB);
     String lp = applet.getParameter(LISTENER_PORT);
-    
+
     if (ocn==null && lp!=null)
       ocn = DEFAULT_FOCUSED_ORB;
-    
+
     ORB orb = createORB(props, ocn);
     orb.set_parameters(applet, props);
 
@@ -856,18 +856,18 @@ public abstract class ORB
 
   /**
    * Creates the working instance of ORB for a standalone application.
-   * 
+   *
    * By default the built-in fully functional ORB is returned. The ORB class is
    * found as described in the header of this class.
-   * 
+   *
    * @param args the parameters, passed to the applications
    * <code>main(String[] args)</code> method, may be <code>null</code>. The
    * parameter -org.omg.CORBA.ORBClass <class name> if present, defines the used
    * ORB implementation class. If this property is not present, the ORB class is
    * found as described in the class header.
-   * 
+   *
    * @param props application specific properties, may be <code>null</code>.
-   * 
+   *
    * @return a newly created functional derivative of this abstract class.
    */
   public static ORB init(String[] args, Properties props)
@@ -901,9 +901,9 @@ public abstract class ORB
 
   /**
    * List the initially available CORBA objects (services).
-   * 
+   *
    * @return a list of services.
-   * 
+   *
    * @see #resolve_initial_references(String)
    */
   public abstract String[] list_initial_services();
@@ -1018,28 +1018,28 @@ public abstract class ORB
    * using the <code>narrow(Object)</code> method of its helper.
    * </p><p>
    * This function supports the following input formats:<br>
-   * 1. IOR reference (<b>ior:</b>nnnnn ..), usually computer generated.<br> 
+   * 1. IOR reference (<b>ior:</b>nnnnn ..), usually computer generated.<br>
    * 2. <b>corbaloc:</b>[<b>iiop</b>][version.subversion<b>@</b>]<b>:</b>host[<b>:</b>port]<b>/</b><i>key</i>
    * defines similar information as IOR reference, but is more human readable.
    * This type of reference may also contain multiple addresses (see
    * OMG documentation for complete format).<br>
    * 3. <b>corbaloc:rir:/</b><i>name</i> defines internal reference on this
-   * ORB that is resolved using {@link #resolve_initial_references}, passing 
+   * ORB that is resolved using {@link #resolve_initial_references}, passing
    * the given <i>name</i> as parameter.<br>
    * 4. <b>corbaname:rir:#</b><i>name</i> states that the given <i>name</i>
    * must be resolved using the naming service, default for this ORB.<br>
    * 5. <b>corbaname:</b>[<b>iiop</b>][version.subversion<b>@</b>]<b>:</b>host[<b>:</b>port]<b>#</b><i>name</i>
    * states that the <i>name</i> must be resolved using the naming service
-   * that runs on the given host at the given port. The ORB expects to find 
-   * there the {@link org.omg.CosNaming.NamingContext} under the key 
+   * that runs on the given host at the given port. The ORB expects to find
+   * there the {@link org.omg.CosNaming.NamingContext} under the key
    * "NameService.<br>
-   * 7. file://[file name] Read the object definition string from the 
+   * 7. file://[file name] Read the object definition string from the
    * file system<br>
    * 8. http://[url] Read the object definition string from the provided
    * url.<br>
    * 9. ftp://[url] Read the object definition string from the provided
    * url.<br>
-   * 
+   *
    * <p>The default port is always 2809. The default iiop version is 1.0
    * that now may not always be supported, so we would recommend to specify
    * the version explicitly.</p>
@@ -1047,29 +1047,29 @@ public abstract class ORB
    * The examples of the corbaloc and corbaname addresses:<br>
    * corbaname:rir:#xobj - ask local naming service for "xobj".<br>
    * corbaname:rir:/NameService#xobj - same (long form).<br>
-   * corbaname:iiop:1.2@localhost:900#xobj - same, assuming that the naming 
+   * corbaname:iiop:1.2@localhost:900#xobj - same, assuming that the naming
    * service runs at port 900 on the local host and supports iiop 1.2.<br>
-   * corbaname:iiop:localhost#xobj - same, assuming that the naming 
+   * corbaname:iiop:localhost#xobj - same, assuming that the naming
    * service runs at port 2809 on the local host and supports iiop 1.0.<br>
    * corbaloc::gnu.xxx.yy/Prod/TradingService - the object exists on the
-   * host gnu.xxx.yy, port 2809 having the key "Prod/TradingService". Its ORB 
+   * host gnu.xxx.yy, port 2809 having the key "Prod/TradingService". Its ORB
    * supports iiop 1.0.<br>
    * corbaloc::gnu.xxx.yy/Prod/TradingService:801 - the object exists on the
-   * host gnu.xxx.yy, port 801 having the key "Prod/TradingService". Its ORB 
+   * host gnu.xxx.yy, port 801 having the key "Prod/TradingService". Its ORB
    * supports iiop 1.0 (iiop keyword ommitted).<br>
    * corbaloc:iiop:1.1@gnu.xxx.yy/Prod/TradingService - the object exists on the
-   * host gnu.xxx.yy, port 801 having the key "Prod/TradingService". Its ORB 
+   * host gnu.xxx.yy, port 801 having the key "Prod/TradingService". Its ORB
    * supports iiop 1.1.<br>
    * corbaloc:rir:/NameService - the default naming service.
    *
    * @param IOR the object IOR representation string.
    *
    * @return the found CORBA object.
-   * 
+   *
    * @throws BAD_PARAM if the string being parsed is invalid.
    * @throws DATA_CONVERSION if the string being parsed contains unsupported
    * prefix or protocol.
-   * 
+   *
    * @see #object_to_string(org.omg.CORBA.Object)
    */
   public abstract Object string_to_object(String IOR);
@@ -1146,7 +1146,7 @@ public abstract class ORB
 
     if (orb_cn == null)
       orb_cn = checkFile(property, "java.home", "lib");
-    
+
     return orb_cn;
   }
 
@@ -1189,7 +1189,7 @@ public abstract class ORB
 
   /**
    * Create ORB when its name is possibly known.
-   * 
+   *
    * @param props properties, possibly containing the ORB name.
    * @param orbClassName the direct ORB class name, overriding other possible
    * locations, or null if not specified.
diff --git a/libjava/classpath/org/omg/CORBA/ObjectHelper.java b/libjava/classpath/org/omg/CORBA/ObjectHelper.java
index dbf43308029..fd1211ade44 100644
--- a/libjava/classpath/org/omg/CORBA/ObjectHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ObjectHelper.java
@@ -64,7 +64,7 @@ public abstract class ObjectHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("CORBA object expected");
         bad.minor = Minor.Any;
-        throw bad;        
+        throw bad;
       }
   }
 
diff --git a/libjava/classpath/org/omg/CORBA/ObjectHolder.java b/libjava/classpath/org/omg/CORBA/ObjectHolder.java
index 235f1e66fcd..65eaeae9a26 100644
--- a/libjava/classpath/org/omg/CORBA/ObjectHolder.java
+++ b/libjava/classpath/org/omg/CORBA/ObjectHolder.java
@@ -130,4 +130,4 @@ public final class ObjectHolder
   {
     output.write_Object(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java b/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
index 1fdddf1d04c..99acf543b0c 100644
--- a/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
+++ b/libjava/classpath/org/omg/CORBA/PERSIST_STORE.java
@@ -49,8 +49,8 @@ public final class PERSIST_STORE
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -6835478548864681965L;
 
diff --git a/libjava/classpath/org/omg/CORBA/ParameterMode.java b/libjava/classpath/org/omg/CORBA/ParameterMode.java
index 931a2e92780..cdda82547a5 100644
--- a/libjava/classpath/org/omg/CORBA/ParameterMode.java
+++ b/libjava/classpath/org/omg/CORBA/ParameterMode.java
@@ -139,4 +139,4 @@ public class ParameterMode
         throw new BAD_PARAM("Invalid parameter mode: " + p_mode);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java b/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
index c96ce94ac21..c0948d4b74d 100644
--- a/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ParameterModeHelper.java
@@ -113,4 +113,4 @@ public abstract class ParameterModeHelper
   {
     ostream.write_long(value.value());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
index ecb9821dc35..75709e801cb 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorCodeHelper.java
@@ -49,7 +49,7 @@ import org.omg.CORBA.portable.OutputStream;
 /**
  * A helper operations for the policy error code as an alias of
  * <code>short</code>.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class PolicyErrorCodeHelper
@@ -66,7 +66,7 @@ public abstract class PolicyErrorCodeHelper
 
   /**
    * Returns policy error code repository id.
-   * 
+   *
    * @return "IDL:omg.org/CORBA/PolicyErrorCode:1.0", always.
    */
   public static String id()
@@ -93,7 +93,7 @@ public abstract class PolicyErrorCodeHelper
   /**
    * Returns a typecode of the policy error code, stating it is an alias of
    * <code>short</code>, named "PolicyErrorCode".
-   * 
+   *
    * @return a typecode of synchronization scope.
    */
   public static TypeCode type()
@@ -112,4 +112,4 @@ public abstract class PolicyErrorCodeHelper
   {
     ostream.write_short(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
index e665197b107..4d949fae42a 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHelper.java
@@ -59,16 +59,16 @@ public abstract class PolicyErrorHelper
 {
   /**
    * Create the PolicyError typecode. The typecode defines a structure, named
-   * "PolicyError", containing the PolicyErrorCode (alias int, see 
+   * "PolicyError", containing the PolicyErrorCode (alias int, see
    * {@link PolicyErrorCodeHelper}) field, named "reason".
    */
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
     StructMember[] members = new StructMember[ 1 ];
-    
+
     TypeCode field;
-    
+
     field =
       orb.create_alias_tc("IDL:omg.org/CORBA/PolicyErrorCode:1.0",
                           "PolicyErrorCode", orb.get_primitive_tc(TCKind.tk_short)
diff --git a/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java b/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
index cc3cf68681a..c3e8e8237b2 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyErrorHolder.java
@@ -100,4 +100,4 @@ public final class PolicyErrorHolder implements Streamable
   {
     return PolicyErrorHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyHelper.java b/libjava/classpath/org/omg/CORBA/PolicyHelper.java
index 4f88cd78396..eb4332f642e 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyHelper.java
@@ -156,4 +156,4 @@ public abstract class PolicyHelper
   {
     output.write_Object(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyHolder.java b/libjava/classpath/org/omg/CORBA/PolicyHolder.java
index 7dafbca6f60..cc2cfcfe2cc 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyHolder.java
@@ -103,4 +103,4 @@ public final class PolicyHolder
   {
     return PolicyHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
index 54f2036759a..c3ca36369ec 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyListHelper.java
@@ -136,4 +136,4 @@ public abstract class PolicyListHelper
         PolicyHelper.write(output, value [ i ]);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyListHolder.java b/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
index 1b1d9da727c..fd3815afad4 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyListHolder.java
@@ -103,4 +103,4 @@ public final class PolicyListHolder
   {
     return PolicyListHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/PolicyOperations.java b/libjava/classpath/org/omg/CORBA/PolicyOperations.java
index 06ca2734d8d..141eb1cbaa4 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyOperations.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyOperations.java
@@ -63,7 +63,7 @@ public interface PolicyOperations
    * Return an integer number, corresponding the type of this policy.
    * The values, defining the different policy types, are allocated
    * by OMG (request AT omg DOT org).
-   * 
+   *
    * @return the integer policy code.
    */
   int policy_type();
diff --git a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
index 575fe4aa309..dc92d77074a 100644
--- a/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/PolicyTypeHelper.java
@@ -120,4 +120,4 @@ public abstract class PolicyTypeHelper
   {
     output.write_ulong(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java b/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java
index 033a96819d3..843958b229e 100644
--- a/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java
+++ b/libjava/classpath/org/omg/CORBA/RepositoryIdHelper.java
@@ -113,4 +113,4 @@ public abstract class RepositoryIdHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/Request.java b/libjava/classpath/org/omg/CORBA/Request.java
index beec7869185..cca242d6c86 100644
--- a/libjava/classpath/org/omg/CORBA/Request.java
+++ b/libjava/classpath/org/omg/CORBA/Request.java
@@ -41,9 +41,9 @@ package org.omg.CORBA;
 
 /**
  * An object, containing the information, needed to invoke the method of
- * the local or remote CORBA object. The Request is used in 
+ * the local or remote CORBA object. The Request is used in
  * Dynamic Invocation Interface (DII) which allows dynamic creation of
- * requests. 
+ * requests.
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
@@ -127,11 +127,11 @@ public abstract class Request
    * @return the list of parameters.
    */
   public abstract NVList arguments();
-  
+
   /**
    * Get the context list object for this request.
-   * 
-   * @return a list of strings that must be resolved and sent with the 
+   *
+   * @return a list of strings that must be resolved and sent with the
    * invocation.
    */
   public abstract ContextList contexts();
diff --git a/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java b/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
index 76fbda610e6..4c17a99ceba 100644
--- a/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ServiceDetailHelper.java
@@ -134,19 +134,19 @@ public abstract class ServiceDetailHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
-    
+
     TypeCode type =
       orb.create_alias_tc(_id, "ServiceDetailType",
                           orb.get_primitive_tc(TCKind.tk_ulong)
       );
     members [ 0 ] = new StructMember("service_detail_type", type, null);
-    
+
     TypeCode data =
       orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
     members [ 1 ] = new StructMember("service_detail", data, null);
-    
+
     return orb.create_struct_tc(id(), "ServiceDetail", members);
   }
 
@@ -166,4 +166,4 @@ public abstract class ServiceDetailHelper
       value.service_detail.length
     );
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java b/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
index f77378fd79c..1da4358a6e3 100644
--- a/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ServiceInformationHelper.java
@@ -107,17 +107,17 @@ public abstract class ServiceInformationHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
     TypeCode member;
-    
+
     member =
       orb.create_alias_tc("IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
                           "ServiceOptionSeq", LongSeqHelper.type()
       );
-    
+
     members [ 0 ] = new StructMember("service_options", member, null);
-    
+
     member = ServiceDetailHelper.type();
     member = orb.create_sequence_tc(0, member);
     member =
@@ -125,7 +125,7 @@ public abstract class ServiceInformationHelper
                           "ServiceDetailSeq", member
       );
     members [ 1 ] = new StructMember("service_details", member, null);
-    
+
     return
     orb.create_struct_tc(ServiceInformationHelper.id(),
                          "ServiceInformation", members
diff --git a/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java b/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
index fb2c8235a91..84c2a016df9 100644
--- a/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
+++ b/libjava/classpath/org/omg/CORBA/SetOverrideTypeHelper.java
@@ -77,9 +77,9 @@ public abstract class SetOverrideTypeHelper
     String[] members =
       new String[]
                  {
-                  "SET_OVERRIDE" ,"ADD_OVERRIDE" 
+                  "SET_OVERRIDE" ,"ADD_OVERRIDE"
                  };
-    
+
     return
     OrbRestricted.Singleton.create_enum_tc(id(), "SetOverrideType",
                                            members
diff --git a/libjava/classpath/org/omg/CORBA/StringValueHelper.java b/libjava/classpath/org/omg/CORBA/StringValueHelper.java
index 5273f5cfb9d..197957a0861 100644
--- a/libjava/classpath/org/omg/CORBA/StringValueHelper.java
+++ b/libjava/classpath/org/omg/CORBA/StringValueHelper.java
@@ -190,4 +190,4 @@ public class StringValueHelper
   {
     out.write_string(a_string);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/StructMember.java b/libjava/classpath/org/omg/CORBA/StructMember.java
index 9e05a2260d1..09245b40400 100644
--- a/libjava/classpath/org/omg/CORBA/StructMember.java
+++ b/libjava/classpath/org/omg/CORBA/StructMember.java
@@ -69,7 +69,7 @@ public final class StructMember
    * The typecode of the structure member.
    */
   public TypeCode type;
-  
+
   /**
    * Creates a structure member with all fields
    * left with the default value <code>null</code>.
@@ -77,10 +77,10 @@ public final class StructMember
   public StructMember()
   {
   }
-  
+
   /**
    * Creates a structure member.
-   * 
+   *
    * @param a_name member name.
    * @param a_type member type code.
    * @param a_type_def member IDL type definition.
diff --git a/libjava/classpath/org/omg/CORBA/StructMemberHelper.java b/libjava/classpath/org/omg/CORBA/StructMemberHelper.java
index 01445129b67..9a310cffe7a 100644
--- a/libjava/classpath/org/omg/CORBA/StructMemberHelper.java
+++ b/libjava/classpath/org/omg/CORBA/StructMemberHelper.java
@@ -177,4 +177,4 @@ public abstract class StructMemberHelper
         throw m;
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/SystemException.java b/libjava/classpath/org/omg/CORBA/SystemException.java
index 127b918d37a..6c5c5f968e4 100644
--- a/libjava/classpath/org/omg/CORBA/SystemException.java
+++ b/libjava/classpath/org/omg/CORBA/SystemException.java
@@ -42,7 +42,7 @@ import java.io.Serializable;
 
 /**
  * The root class for all CORBA standard exceptions.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class SystemException
@@ -69,16 +69,16 @@ public abstract class SystemException
    * The Classpath specifice minor exception codes are documented in the headers
    * of the corresponding exceptions (for instance, {@link MARSHAL}).
    * </p>
-   * 
-   * The VMCID 0 and 0xfffff are reserved for experimental use. 
-   * 
+   *
+   * The VMCID 0 and 0xfffff are reserved for experimental use.
+   *
    * @see OMGVMCID
    */
   public int minor;
 
   /**
    * Constructs an instance of the CORBA standard exception.
-   * 
+   *
    * @param a_reason a string, explaining the reason why the exceptions has been
    * thrown.
    * @param a_minor an additional error code (known as the "minor")
diff --git a/libjava/classpath/org/omg/CORBA/TCKind.java b/libjava/classpath/org/omg/CORBA/TCKind.java
index 0ad2d528421..62b90536707 100644
--- a/libjava/classpath/org/omg/CORBA/TCKind.java
+++ b/libjava/classpath/org/omg/CORBA/TCKind.java
@@ -449,9 +449,9 @@ public class TCKind
 
   /**
    * The array of all tk_... instances, sorted by the kind number.
-   * 
+   *
    * As long as the kind numbers make the continuos sequence, starting from 0,
-   * the members can be found just by direct indexing. 
+   * the members can be found just by direct indexing.
    */
   private static final TCKind[] tk =
     new TCKind[]
@@ -500,5 +500,5 @@ public class TCKind
       throw new BAD_PARAM("Invalid _tk_ code "+_tk_nnn);
     }
   }
-  
+
 }
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
index 3d6c55c526a..6cfc6182a58 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_REQUIRED.java
@@ -41,7 +41,7 @@ package org.omg.CORBA;
 import java.io.Serializable;
 
 /**
- * Means that request carried a null transaction context, but an 
+ * Means that request carried a null transaction context, but an
  * active transaction is required.
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
@@ -49,8 +49,8 @@ public final class TRANSACTION_REQUIRED
   extends SystemException
   implements Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -1900254548742148576L;
 
diff --git a/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java b/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
index f7f4aabf2d5..14edc2cb796 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSACTION_ROLLEDBACK.java
@@ -50,7 +50,7 @@ public final class TRANSACTION_ROLLEDBACK
   extends SystemException
   implements Serializable
 {
-  /** 
+  /**
    * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -343903462439281571L;
diff --git a/libjava/classpath/org/omg/CORBA/TRANSIENT.java b/libjava/classpath/org/omg/CORBA/TRANSIENT.java
index 1dad9a1c4e7..081eabf3a8a 100644
--- a/libjava/classpath/org/omg/CORBA/TRANSIENT.java
+++ b/libjava/classpath/org/omg/CORBA/TRANSIENT.java
@@ -94,4 +94,4 @@ public final class TRANSIENT
   {
     super(reason, minor, completed);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/TypeCode.java b/libjava/classpath/org/omg/CORBA/TypeCode.java
index a1ad3db9e61..6a72f5a1d61 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCode.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCode.java
@@ -268,4 +268,4 @@ public abstract class TypeCode
    */
   public abstract short type_modifier()
                                throws BadKind;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java b/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
index d7f0ce5236e..2da316e265d 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCodePackage/BadKind.java
@@ -53,11 +53,11 @@ public final class BadKind
   extends UserException
   implements IDLEntity, Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = 1030443154456771956L;
-  
+
   /**
    * Constructs a the exception.
    */
diff --git a/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java b/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
index 364447cd9ca..fda440f1668 100644
--- a/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
+++ b/libjava/classpath/org/omg/CORBA/TypeCodePackage/Bounds.java
@@ -46,18 +46,18 @@ import org.omg.CORBA.portable.IDLEntity;
 /**
  * The {@link org.omg.CORBA.TypeCode#member_name(int) },
  * {@link org.omg.CORBA.TypeCode#member_type(int) } and
- * {@link org.omg.CORBA.TypeCode#member_label(int) } raise Bounds when 
+ * {@link org.omg.CORBA.TypeCode#member_label(int) } raise Bounds when
  * the parameter is larger than the index of the last member,
  * constituting the type.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public final class Bounds
   extends UserException
   implements IDLEntity, Serializable
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
   private static final long serialVersionUID = -5418177951071152101L;
 
diff --git a/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY.java b/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY.java
index 007df5c8c7f..e07f9e08b31 100644
--- a/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY.java
+++ b/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY.java
@@ -1,4 +1,4 @@
-/* UNSUPPORTED_POLICY.java -- 
+/* UNSUPPORTED_POLICY.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,17 +39,17 @@ package org.omg.CORBA;
 
 /**
  * Holds a single constant, specifying, that
- * while the requested {@link Policy} is valid, it is not supported by 
- * this ORB. One of the PolicyErrorCodes, others being 
+ * while the requested {@link Policy} is valid, it is not supported by
+ * this ORB. One of the PolicyErrorCodes, others being
  * {@link UNSUPPORTED_POLICY_VALUE}, {@link BAD_POLICY},
  * {@link BAD_POLICY_TYPE}, {@link BAD_POLICY_VALUE}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface UNSUPPORTED_POLICY
 {
   /**
-   * States that while the requested {@link Policy} is valid, 
+   * States that while the requested {@link Policy} is valid,
    * it is not supported by this ORB.
    */
   short value = 1;
diff --git a/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java b/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java
index a05dd9d3467..6da7238b7dc 100644
--- a/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java
+++ b/libjava/classpath/org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java
@@ -1,4 +1,4 @@
-/* UNSUPPORTED_POLICY_VALUE.java -- 
+/* UNSUPPORTED_POLICY_VALUE.java --
    Copyright (C) 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,18 +39,18 @@ package org.omg.CORBA;
 
 /**
  * Holds a single constant, specifying, that
- * while the requested {@link Policy} value is valid, it is not 
- * supported by this ORB. One of the PolicyErrorCodes, others being 
+ * while the requested {@link Policy} value is valid, it is not
+ * supported by this ORB. One of the PolicyErrorCodes, others being
  * {@link UNSUPPORTED_POLICY}, {@link BAD_POLICY}, {@link BAD_POLICY_TYPE} ,
  * {@link BAD_POLICY_VALUE}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface UNSUPPORTED_POLICY_VALUE
 {
   /**
-   * States that while the requested {@link Policy} value is valid, 
-   * it is not supported by this ORB. 
+   * States that while the requested {@link Policy} value is valid,
+   * it is not supported by this ORB.
    */
   short value = 4;
 }
diff --git a/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java b/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
index ef69329b7ab..d0622e8a962 100644
--- a/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
+++ b/libjava/classpath/org/omg/CORBA/UnionMemberHelper.java
@@ -174,9 +174,9 @@ public abstract class UnionMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
-        m.minor = Minor.UserException;        
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserException.java b/libjava/classpath/org/omg/CORBA/UnknownUserException.java
index 3b33ffd337a..170f2d5d293 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserException.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserException.java
@@ -84,4 +84,4 @@ public final class UnknownUserException
   {
     except = an_exception;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
index 0fa966982ec..816cdeebaf3 100644
--- a/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
+++ b/libjava/classpath/org/omg/CORBA/UnknownUserExceptionHolder.java
@@ -100,4 +100,4 @@ public final class UnknownUserExceptionHolder implements Streamable
   {
     return UnknownUserExceptionHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java b/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java
index 644666971ac..4fdb452b3d5 100644
--- a/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ValueBaseHelper.java
@@ -134,4 +134,4 @@ public abstract class ValueBaseHelper
   {
     Vio.write(output, value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java b/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java
index 58f48536ff2..ed9f1af5cae 100644
--- a/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java
+++ b/libjava/classpath/org/omg/CORBA/ValueBaseHolder.java
@@ -107,4 +107,4 @@ public class ValueBaseHolder
   {
     ValueBaseHelper.write(output, value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/ValueMemberHelper.java b/libjava/classpath/org/omg/CORBA/ValueMemberHelper.java
index 3150af2aaf4..b62f04d3cbd 100644
--- a/libjava/classpath/org/omg/CORBA/ValueMemberHelper.java
+++ b/libjava/classpath/org/omg/CORBA/ValueMemberHelper.java
@@ -178,7 +178,7 @@ public abstract class ValueMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
-        m.minor = Minor.UserException;        
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
@@ -202,9 +202,9 @@ public abstract class ValueMemberHelper
     catch (UserException ex)
       {
         MARSHAL m = new MARSHAL();
-        m.minor = Minor.UserException;        
+        m.minor = Minor.UserException;
         m.initCause(ex);
         throw m;
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java b/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java
index 74bdb7b7a16..b6e57f1d7be 100644
--- a/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java
+++ b/libjava/classpath/org/omg/CORBA/VersionSpecHelper.java
@@ -113,4 +113,4 @@ public abstract class VersionSpecHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/VisibilityHelper.java b/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
index a00f96e140e..7fd5d91a782 100644
--- a/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
+++ b/libjava/classpath/org/omg/CORBA/VisibilityHelper.java
@@ -115,4 +115,4 @@ public abstract class VisibilityHelper
   {
     ostream.write_short(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/WStringValueHelper.java b/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
index 17f23214cf6..a2b67ffec82 100644
--- a/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
+++ b/libjava/classpath/org/omg/CORBA/WStringValueHelper.java
@@ -140,7 +140,7 @@ public class WStringValueHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("WString value type expected");
         bad.minor = Minor.Any;
-        throw bad;        
+        throw bad;
       }
   }
 
@@ -190,4 +190,4 @@ public class WStringValueHelper
   {
     out.write_wstring(a_string);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
index 96673fd5792..2854faaa0b2 100644
--- a/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
+++ b/libjava/classpath/org/omg/CORBA/WrongTransactionHelper.java
@@ -139,4 +139,4 @@ public abstract class WrongTransactionHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java b/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
index 1ea3e025f94..db47b5dfce6 100644
--- a/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
+++ b/libjava/classpath/org/omg/CORBA/WrongTransactionHolder.java
@@ -100,4 +100,4 @@ public final class WrongTransactionHolder implements Streamable
   {
     return WrongTransactionHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java b/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java
index de09b89a7b0..89f95d3c661 100644
--- a/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java
+++ b/libjava/classpath/org/omg/CORBA/_IDLTypeStub.java
@@ -196,4 +196,4 @@ public class _IDLTypeStub
              "IDL:omg.org/CORBA/IDLType:1.0", "IDL:omg.org/CORBA/IRObject:1.0"
            };
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/_PolicyStub.java b/libjava/classpath/org/omg/CORBA/_PolicyStub.java
index f633ccbaf65..ebff735dca3 100644
--- a/libjava/classpath/org/omg/CORBA/_PolicyStub.java
+++ b/libjava/classpath/org/omg/CORBA/_PolicyStub.java
@@ -171,4 +171,4 @@ public class _PolicyStub
         _releaseReply(input);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/portable/CustomValue.java b/libjava/classpath/org/omg/CORBA/portable/CustomValue.java
index 89701c73a02..dc46e8e2589 100644
--- a/libjava/classpath/org/omg/CORBA/portable/CustomValue.java
+++ b/libjava/classpath/org/omg/CORBA/portable/CustomValue.java
@@ -54,4 +54,4 @@ import org.omg.CORBA.CustomMarshal;
 public interface CustomValue
   extends ValueBase, CustomMarshal
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/portable/Delegate.java b/libjava/classpath/org/omg/CORBA/portable/Delegate.java
index 2c716f57e86..33812abe22e 100644
--- a/libjava/classpath/org/omg/CORBA/portable/Delegate.java
+++ b/libjava/classpath/org/omg/CORBA/portable/Delegate.java
@@ -375,7 +375,7 @@ public abstract class Delegate
    *
    * @return the servant or null if the servant is not an expected type
    * of the method is not supported, for example, due security reasons.
-   */ 
+   */
   @SuppressWarnings("unchecked") // Needed for API compatibility
   public ServantObject servant_preinvoke(org.omg.CORBA.Object self,
                                          String operation, Class expectedType
diff --git a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java
index c121ac1bd3d..c7ee707f3ae 100644
--- a/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java
+++ b/libjava/classpath/org/omg/CORBA/portable/ObjectImpl.java
@@ -398,4 +398,4 @@ public abstract class ObjectImpl
   {
     return delegate.toString(this);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java b/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java
index 7ab61a6d470..13dbad210fa 100644
--- a/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java
+++ b/libjava/classpath/org/omg/CORBA/portable/StreamableValue.java
@@ -54,4 +54,4 @@ import java.io.Serializable;
 public interface StreamableValue
   extends Streamable, Serializable, ValueBase, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA/portable/ValueBase.java b/libjava/classpath/org/omg/CORBA/portable/ValueBase.java
index b89d5c544ce..167f532ac29 100644
--- a/libjava/classpath/org/omg/CORBA/portable/ValueBase.java
+++ b/libjava/classpath/org/omg/CORBA/portable/ValueBase.java
@@ -71,4 +71,4 @@ public interface ValueBase
    * basic types this value base can be truncated.
    */
   String[] _truncatable_ids();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA_2_3/ORB.java b/libjava/classpath/org/omg/CORBA_2_3/ORB.java
index 0895b803788..e45f03e2e5d 100644
--- a/libjava/classpath/org/omg/CORBA_2_3/ORB.java
+++ b/libjava/classpath/org/omg/CORBA_2_3/ORB.java
@@ -126,4 +126,4 @@ public abstract class ORB
   {
     throw new NO_IMPLEMENT();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/Delegate.java b/libjava/classpath/org/omg/CORBA_2_3/portable/Delegate.java
index d20a88544a6..a3d8ea933d5 100644
--- a/libjava/classpath/org/omg/CORBA_2_3/portable/Delegate.java
+++ b/libjava/classpath/org/omg/CORBA_2_3/portable/Delegate.java
@@ -64,4 +64,4 @@ public abstract class Delegate
   {
     return "";
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java
index a59c33eba4e..b457abe98b5 100644
--- a/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java
+++ b/libjava/classpath/org/omg/CORBA_2_3/portable/InputStream.java
@@ -83,7 +83,7 @@ public abstract class InputStream
     if (isObject)
       return read_Object();
     else
-      return read_value();      
+      return read_value();
   }
 
   /**
@@ -206,4 +206,4 @@ public abstract class InputStream
   {
     return Vio.read(this, helper);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java b/libjava/classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java
index 49d92df3b19..5524391893c 100644
--- a/libjava/classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java
+++ b/libjava/classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java
@@ -79,4 +79,4 @@ public abstract class ObjectImpl
     else
       throw new BAD_OPERATION("The delegate not set.");
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java
index 818c718d25e..e9496ffce4d 100644
--- a/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java
+++ b/libjava/classpath/org/omg/CORBA_2_3/portable/OutputStream.java
@@ -69,11 +69,11 @@ public abstract class OutputStream
    * Writes an abstract interface to the stream. An abstract interface can be
    * eithe CORBA object or value type and is written as a union with the boolean
    * discriminator (false for objects, true for value types).
-   * 
+   *
    * The object from value is separated by fact that all values implement the
    * {@link ValueBase} interface. Also, the passed parameter is treated as value
    * it it does not implement CORBA Object.
-   * 
+   *
    * @param an_interface an abstract interface to write.
    */
   public void write_abstract_interface(java.lang.Object an_interface)
@@ -92,14 +92,14 @@ public abstract class OutputStream
 
   /**
    * Writes a value type into the output stream.
-   * 
+   *
    * The value type must implement either {@link CustomValue} (for user-defined
    * writing method) or {@link StreamableValue} (for standard writing using code,
    * generated by IDL compiler).
-   * 
+   *
    * The written record will have a repository id, matching the class of the
    * passed object. The codebase will not be written.
-   * 
+   *
    * @param value a value type object to write.
    */
   public void write_value(Serializable value)
@@ -145,17 +145,17 @@ public abstract class OutputStream
   /**
    * Writes a value type into the output stream, stating it has the given
    * repository id.
-   * 
+   *
    * The value type must implement either {@link CustomValue} (for user-defined
    * writing method) or {@link StreamableValue} (for standard writing using code,
    * generated by IDL compiler).
-   * 
+   *
    * @param repository_id a repository id of the value type.
-   * 
+   *
    * @param value a value type object to write.
    */
   public void write_value(Serializable value, String repository_id)
   {
     Vio.write(this, value, repository_id);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/BindingHelper.java b/libjava/classpath/org/omg/CosNaming/BindingHelper.java
index 86b0770162a..ebd9144c8de 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingHelper.java
@@ -112,7 +112,7 @@ public abstract class BindingHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
     TypeCode member;
     member = NameComponentHelper.type();
diff --git a/libjava/classpath/org/omg/CosNaming/BindingIterator.java b/libjava/classpath/org/omg/CosNaming/BindingIterator.java
index 6627a8f8279..ef2aca4ab82 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingIterator.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingIterator.java
@@ -84,4 +84,4 @@ public interface BindingIterator
    * @specnote since 1.3 this method has moved into BindingIteratorOperations.
    */
   boolean next_one(BindingHolder a_binding);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java
index 5430905e5a0..676cffea0a7 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorHelper.java
@@ -119,19 +119,19 @@ public abstract class BindingIteratorHelper
         return new _BindingIteratorStub(delegate);
       }
   }
-  
+
   /**
    * Narrow the given object to the BindingIterator. No type-checking is
    * performed to verify that the object actually supports the requested type.
    * The {@link BAD_OPERATION} will be thrown if unsupported operations are
    * invoked on the new returned reference, but no failure is expected at the
    * time of the unchecked_narrow. See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted binding iterator.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static BindingIterator unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -144,7 +144,7 @@ public abstract class BindingIteratorHelper
         // Do not call the _is_a(..).
         Delegate delegate = ((ObjectImpl) obj)._get_delegate();
         return new _BindingIteratorStub(delegate);
-      }    
+      }
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorOperations.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorOperations.java
index c775b11ec0c..b9995c210bc 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingIteratorOperations.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorOperations.java
@@ -75,4 +75,4 @@ public interface BindingIteratorOperations
    * otherwise.
    */
   boolean next_one(BindingHolder a_binding);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java b/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java
index 988c4ee9126..9adc884b8dd 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingIteratorPOA.java
@@ -52,8 +52,8 @@ import org.omg.PortableServer.Servant;
 /**
  * The binding iterator servant, used in POA-based naming service
  * implementations.
- * 
- * @since 1.4 
+ *
+ * @since 1.4
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
@@ -105,7 +105,7 @@ public abstract class BindingIteratorPOA
         out = rh.createReply();
       }
     else
-      throw new BAD_OPERATION(method, Minor.Method, 
+      throw new BAD_OPERATION(method, Minor.Method,
         CompletionStatus.COMPLETED_MAYBE);
 
     return out;
diff --git a/libjava/classpath/org/omg/CosNaming/BindingType.java b/libjava/classpath/org/omg/CosNaming/BindingType.java
index 480e7bb33ed..cbcb3cd99ba 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingType.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingType.java
@@ -126,4 +126,4 @@ public class BindingType
   {
     return type;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java
index 542f3e0e97b..3bbb683e6e2 100644
--- a/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/BindingTypeHelper.java
@@ -71,7 +71,7 @@ public abstract class BindingTypeHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("Binding type expected");
         bad.initCause(ex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
diff --git a/libjava/classpath/org/omg/CosNaming/IstringHelper.java b/libjava/classpath/org/omg/CosNaming/IstringHelper.java
index df680f43627..f0cc43bbea2 100644
--- a/libjava/classpath/org/omg/CosNaming/IstringHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/IstringHelper.java
@@ -117,4 +117,4 @@ public abstract class IstringHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java
index 0f7e73b45bd..c93b451e408 100644
--- a/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NameComponentHelper.java
@@ -74,7 +74,7 @@ public abstract class NameComponentHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("Name component expected");
         bad.initCause(ex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -113,7 +113,7 @@ public abstract class NameComponentHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
     TypeCode member;
     member = orb.create_string_tc(0);
diff --git a/libjava/classpath/org/omg/CosNaming/NameHelper.java b/libjava/classpath/org/omg/CosNaming/NameHelper.java
index d1dafb96064..aef422de874 100644
--- a/libjava/classpath/org/omg/CosNaming/NameHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NameHelper.java
@@ -74,7 +74,7 @@ public abstract class NameHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("Name expected");
         bad.initCause(ex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContext.java b/libjava/classpath/org/omg/CosNaming/NamingContext.java
index dc4b002000c..edd298a190c 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContext.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContext.java
@@ -194,4 +194,4 @@ public interface NamingContext
    */
   void unbind(NameComponent[] a_name)
        throws NotFound, CannotProceed, InvalidName;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java
index 98d0b4a8c42..b5b2f70206b 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtHelper.java
@@ -75,7 +75,7 @@ public abstract class NamingContextExtHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("NamingContextExt expected");
         bad.initCause(ex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -120,19 +120,19 @@ public abstract class NamingContextExtHelper
         return new _NamingContextExtStub(delegate);
       }
   }
-  
+
   /**
    * Narrow the given object to the NamingContextExt. No type-checking is
    * performed to verify that the object actually supports the requested type.
    * The {@link BAD_OPERATION} will be thrown if unsupported operations are
    * invoked on the new returned reference, but no failure is expected at the
    * time of the unchecked_narrow. See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted NamingContextExt
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static NamingContextExt unchecked_narrow(org.omg.CORBA.Object obj)
   {
@@ -145,7 +145,7 @@ public abstract class NamingContextExtHelper
         // Do not call the _is_a(..).
         Delegate delegate = ((ObjectImpl) obj)._get_delegate();
         return new _NamingContextExtStub(delegate);
-      }    
+      }
   }
 
   /**
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
index f3c93aab344..c6e7eaf81c5 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPOA.java
@@ -65,7 +65,7 @@ import org.omg.PortableServer.Servant;
 /**
  * The extended naming service servant. After implementing the abstract methods the
  * instance of this class can be connected to an ORB using POA.
- * 
+ *
  * @since 1.4
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java
index 7b2866d065e..e68d8a4834a 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java
@@ -73,4 +73,4 @@ public final class InvalidAddress
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java
index 6bbd0729f7e..61cc4c79e5f 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextHelper.java
@@ -75,7 +75,7 @@ public abstract class NamingContextHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("Naming context expected");
         bad.initCause(ex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -128,16 +128,16 @@ public abstract class NamingContextHelper
     else
       throw new BAD_PARAM();
   }
-  
+
   /**
    * Narrow the given object to the NamingContext. No type-checking is performed
    * to verify that the object actually supports the requested type. The
    * {@link BAD_OPERATION} will be thrown if unsupported operations are invoked
    * on the new returned reference, but no failure is expected at the time of
    * the unchecked_narrow. See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted NamingContext.
    */
   public static NamingContext unchecked_narrow(org.omg.CORBA.Object obj)
@@ -151,8 +151,8 @@ public abstract class NamingContextHelper
         // Do not call the _is_a(..).
         Delegate delegate = ((ObjectImpl) obj)._get_delegate();
         return new _NamingContextStub(delegate);
-      }    
-  }  
+      }
+  }
 
   /**
    * Read the naming context from the given CDR input stream.
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
index a4f8b1cb6d9..ea38b1e74ff 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPOA.java
@@ -63,8 +63,8 @@ import org.omg.PortableServer.Servant;
 /**
  * The naming service servant. After implementing the abstract methods the
  * instance of this class can be connected to an ORB using POA.
- * 
- * @since 1.4 
+ *
+ * @since 1.4
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java
index 2013f10f847..de154684027 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/AlreadyBound.java
@@ -72,4 +72,4 @@ public final class AlreadyBound
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceed.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceed.java
index 67855113418..8239c621c53 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceed.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceed.java
@@ -99,4 +99,4 @@ public final class CannotProceed
     cxt = _cxt;
     rest_of_name = _rest_of_name;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
index 85e391cf8c3..34fc6ae989a 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java
@@ -119,7 +119,7 @@ public abstract class CannotProceedHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
     TypeCode member;
     member = NamingContextHelper.type();
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java
index 59784ea1b86..7ca488ac541 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidName.java
@@ -72,4 +72,4 @@ public final class InvalidName
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
index b5a428cac2e..f1fb608d820 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java
@@ -112,7 +112,7 @@ public abstract class InvalidNameHelper
    */
   public static TypeCode type()
   {
-    return OrbRestricted.Singleton.create_struct_tc(id(), 
+    return OrbRestricted.Singleton.create_struct_tc(id(),
       "InvalidName", new StructMember[0]);
   }
 
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
index c4e06c39c16..c235205cd7f 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java
@@ -112,7 +112,7 @@ public abstract class NotEmptyHelper
    */
   public static TypeCode type()
   {
-    return OrbRestricted.Singleton.create_struct_tc(id(), 
+    return OrbRestricted.Singleton.create_struct_tc(id(),
       "NotEmpty", new StructMember[0]);
   }
 
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFound.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFound.java
index a8c9472d6ee..4cbe7097d3a 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFound.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFound.java
@@ -98,4 +98,4 @@ public final class NotFound
     why = _why;
     rest_of_name = _rest_of_name;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
index 0be9b75bc0b..034534a2878 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java
@@ -118,7 +118,7 @@ public abstract class NotFoundHelper
   public static TypeCode type()
   {
     ORB orb = OrbRestricted.Singleton;
-    
+
     StructMember[] members = new StructMember[ 2 ];
     TypeCode member = null;
     member = NotFoundReasonHelper.type();
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java
index 5f6af26daa6..4bb5bdbf3e6 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReason.java
@@ -131,4 +131,4 @@ public class NotFoundReason
   {
     return value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
index ddc7701a58b..2648ae4a9be 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java
@@ -111,8 +111,8 @@ public abstract class NotFoundReasonHelper
     OrbRestricted.Singleton.create_enum_tc(id(), "NotFoundReason",
                               new String[]
                                          {
-                                          "missing_node", 
-                                          "not_context", 
+                                          "missing_node",
+                                          "not_context",
                                           "not_object"
                                          }
     );
diff --git a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
index a18801c66cb..b4958499e1f 100644
--- a/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
+++ b/libjava/classpath/org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java
@@ -81,7 +81,7 @@ public final class NotFoundReasonHolder
 
   /**
    * Get the type code of {@link NotFoundReason}.
-   * 
+   *
    * @return the typecode of enumeration, allowed value names being
    *         "missing_node", "not_context" and "not_object"
    */
diff --git a/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java b/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java
index 9c7e1b34728..3e7f7356c9d 100644
--- a/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java
+++ b/libjava/classpath/org/omg/CosNaming/_BindingIteratorImplBase.java
@@ -116,7 +116,7 @@ public abstract class _BindingIteratorImplBase
         out = rh.createReply();
       }
     else
-      throw new BAD_OPERATION(method, Minor.Method, 
+      throw new BAD_OPERATION(method, Minor.Method,
         CompletionStatus.COMPLETED_MAYBE);
 
     return out;
@@ -136,4 +136,4 @@ public abstract class _BindingIteratorImplBase
       request.operation().equals("destroy") ? null : new BooleanHolder();
     gnu.CORBA.ServiceRequestAdapter.invoke(request, this, result);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/_BindingIteratorStub.java b/libjava/classpath/org/omg/CosNaming/_BindingIteratorStub.java
index b5400c4a1df..593a0cd6849 100644
--- a/libjava/classpath/org/omg/CosNaming/_BindingIteratorStub.java
+++ b/libjava/classpath/org/omg/CosNaming/_BindingIteratorStub.java
@@ -200,4 +200,4 @@ public class _BindingIteratorStub
     destroy();
     super.finalize();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java b/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java
index 067b3cf3cc5..620c06b0be8 100644
--- a/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java
+++ b/libjava/classpath/org/omg/CosNaming/_NamingContextExtStub.java
@@ -207,4 +207,4 @@ public class _NamingContextExtStub
         _releaseReply(in);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/CosNaming/_NamingContextStub.java b/libjava/classpath/org/omg/CosNaming/_NamingContextStub.java
index 2b21e71b62f..d348c81ab2e 100644
--- a/libjava/classpath/org/omg/CosNaming/_NamingContextStub.java
+++ b/libjava/classpath/org/omg/CosNaming/_NamingContextStub.java
@@ -451,4 +451,4 @@ public class _NamingContextStub
     else
       throw4(in, id);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/Dynamic/Parameter.java b/libjava/classpath/org/omg/Dynamic/Parameter.java
index 6e243a430cb..a1a5c8374d4 100644
--- a/libjava/classpath/org/omg/Dynamic/Parameter.java
+++ b/libjava/classpath/org/omg/Dynamic/Parameter.java
@@ -87,4 +87,4 @@ public final class Parameter
     argument = an_argument;
     mode = a_mode;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java b/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java
index 31ed2ba0253..5dd08096dd0 100644
--- a/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/AnySeqHelper.java
@@ -113,4 +113,4 @@ public abstract class AnySeqHelper
   {
     org.omg.CORBA.AnySeqHelper.write(output, value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAny.java b/libjava/classpath/org/omg/DynamicAny/DynAny.java
index fd233631066..cdb7a42853e 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAny.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAny.java
@@ -68,4 +68,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface DynAny
   extends DynAnyOperations, IDLEntity, org.omg.CORBA.Object, Serializable
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java
index 612ba71c3f8..2720656cc3a 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryHelper.java
@@ -55,10 +55,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynAnyFactory is always a local object, so the two methods of
  * this helper ({@link #read} and {@link #write} are not in use, always
  * throwing {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynAnyFactoryHelper
@@ -66,7 +66,7 @@ public abstract class DynAnyFactoryHelper
   /**
    * Cast the passed object into the DynAnyFactory. As DynAnyFactory is a local
    * object, the method just uses java final_type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynAnyFactory.
@@ -83,23 +83,23 @@ public abstract class DynAnyFactoryHelper
                             + " is not a DynAnyFactory");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynAnyFactory. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See also OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynAnyFactory.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynAnyFactory unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the final_type code of the {@link DynAnyFactory}.
@@ -111,9 +111,9 @@ public abstract class DynAnyFactoryHelper
 
   /**
    * Insert the DynAnyFactory into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynAnyFactory to insert.
    */
   public static void insert(Any any, DynAnyFactory that)
@@ -123,7 +123,7 @@ public abstract class DynAnyFactoryHelper
 
   /**
    * Extract the DynAnyFactory from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynAnyFactory.
    */
   public static DynAnyFactory extract(Any any)
@@ -133,7 +133,7 @@ public abstract class DynAnyFactoryHelper
 
   /**
    * Get the DynAnyFactory repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynAnyFactory:1.0", always.
    */
   public static String id()
@@ -145,11 +145,11 @@ public abstract class DynAnyFactoryHelper
    * This should read DynAnyFactory from the CDR input stream, but (following
    * the JDK 1.5 API) it does not. The factory can only be obtained from the
    * ORB.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynAnyFactory read(InputStream input)
@@ -160,11 +160,11 @@ public abstract class DynAnyFactoryHelper
   /**
    * This should read DynAnyFactory from the CDR input stream, but (following
    * the JDK 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynAnyFactory value)
@@ -175,7 +175,7 @@ public abstract class DynAnyFactoryHelper
   /**
    * The package level method for throwing exception, explaining that the
    * operation is not applicable.
-   * 
+   *
    * @param Id the Id for the typecode for that the operations was attempted to
    * perform.
    */
@@ -185,4 +185,4 @@ public abstract class DynAnyFactoryHelper
     m.minor = Minor.Inappropriate;
     throw m;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java
index fced4f704e8..bf1d2e97c42 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java
@@ -79,4 +79,4 @@ public final class InconsistentTypeCode
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
index 0184172265d..70313004f78 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java
@@ -70,7 +70,7 @@ public abstract class InconsistentTypeCodeHelper
 
   /**
    * Insert the InconsistentTypeCode into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the InconsistentTypeCode to insert.
    */
@@ -97,7 +97,7 @@ public abstract class InconsistentTypeCodeHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("InconsistentTypeCode expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -137,4 +137,4 @@ public abstract class InconsistentTypeCodeHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java
index 315cddbd2dc..e376367ef3f 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyHelper.java
@@ -54,10 +54,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynAny is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynAnyHelper
@@ -65,7 +65,7 @@ public abstract class DynAnyHelper
   /**
    * Cast the passed object into the DynAny. As DynAny is a local object, the
    * method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynAny.
@@ -81,23 +81,23 @@ public abstract class DynAnyHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynAny");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynAny. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See also OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynAny.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynAny unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynAny}.
@@ -109,9 +109,9 @@ public abstract class DynAnyHelper
 
   /**
    * Insert the DynAny into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynAny to insert.
    */
   public static void insert(Any any, DynAny that)
@@ -121,7 +121,7 @@ public abstract class DynAnyHelper
 
   /**
    * Extract the DynAny from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynAny.
    */
   public static DynAny extract(Any any)
@@ -131,7 +131,7 @@ public abstract class DynAnyHelper
 
   /**
    * Get the DynAny repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynAny:1.0", always.
    */
   public static String id()
@@ -142,11 +142,11 @@ public abstract class DynAnyHelper
   /**
    * This should read DynAny from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynAny read(InputStream input)
@@ -157,15 +157,15 @@ public abstract class DynAnyHelper
   /**
    * This should read DynAny from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynAny value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java
index c19eb76cd8f..7bae38c55c7 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValue.java
@@ -78,4 +78,4 @@ public final class InvalidValue
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
index d27ad6a6b8b..cc880ba34a3 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java
@@ -98,7 +98,7 @@ public abstract class InvalidValueHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidValue expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -138,4 +138,4 @@ public abstract class InvalidValueHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java
index 3934abd2f37..810d9205842 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java
@@ -78,4 +78,4 @@ public final class TypeMismatch
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
index 7d4fc878938..92644515c1d 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java
@@ -98,7 +98,7 @@ public abstract class TypeMismatchHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -138,4 +138,4 @@ public abstract class TypeMismatchHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java
index f7550fd7969..468083afe5e 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynAnySeqHelper.java
@@ -99,7 +99,7 @@ public abstract class DynAnySeqHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("DynAnySeq expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -143,4 +143,4 @@ public abstract class DynAnySeqHelper
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java
index 4cd3e3a52cf..d9e76eb0633 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynArrayHelper.java
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynArray is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynArrayHelper
@@ -64,7 +64,7 @@ public abstract class DynArrayHelper
   /**
    * Cast the passed object into the DynArray. As DynArray is a local object,
    * the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynArray.
@@ -80,23 +80,23 @@ public abstract class DynArrayHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynArray");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynArray. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynArray.
-   * 
-   * @since 1.5 
-   */ 
+   *
+   * @since 1.5
+   */
   public static DynArray unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynArray}.
@@ -108,9 +108,9 @@ public abstract class DynArrayHelper
 
   /**
    * Insert the DynArray into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynArray to insert.
    */
   public static void insert(Any any, DynArray that)
@@ -120,7 +120,7 @@ public abstract class DynArrayHelper
 
   /**
    * Extract the DynArray from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynArray.
    */
   public static DynArray extract(Any any)
@@ -130,7 +130,7 @@ public abstract class DynArrayHelper
 
   /**
    * Get the DynArray repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynArray:1.0", always.
    */
   public static String id()
@@ -141,11 +141,11 @@ public abstract class DynArrayHelper
   /**
    * This should read DynArray from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynArray read(InputStream input)
@@ -156,15 +156,15 @@ public abstract class DynArrayHelper
   /**
    * This should read DynArray from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynArray value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java
index da63e844f91..9599d72b581 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynEnumHelper.java
@@ -54,10 +54,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynEnum is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynEnumHelper
@@ -65,7 +65,7 @@ public abstract class DynEnumHelper
   /**
    * Cast the passed object into the DynEnum. As DynEnum is a local object, the
    * method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynEnum.
@@ -81,23 +81,23 @@ public abstract class DynEnumHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynEnum");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynEnum. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynEnum.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynEnum unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynEnum}.
@@ -109,9 +109,9 @@ public abstract class DynEnumHelper
 
   /**
    * Insert the DynEnum into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynEnum to insert.
    */
   public static void insert(Any any, DynEnum that)
@@ -121,7 +121,7 @@ public abstract class DynEnumHelper
 
   /**
    * Extract the DynEnum from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynEnum.
    */
   public static DynEnum extract(Any any)
@@ -131,7 +131,7 @@ public abstract class DynEnumHelper
 
   /**
    * Get the DynEnum repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynEnum:1.0", always.
    */
   public static String id()
@@ -142,11 +142,11 @@ public abstract class DynEnumHelper
   /**
    * This should read DynEnum from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynEnum read(InputStream input)
@@ -157,15 +157,15 @@ public abstract class DynEnumHelper
   /**
    * This should read DynEnum from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynEnum value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java
index e730d43bb85..213eb031845 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynFixedHelper.java
@@ -54,10 +54,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynFixed is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynFixedHelper
@@ -65,7 +65,7 @@ public abstract class DynFixedHelper
   /**
    * Cast the passed object into the DynFixed. As DynFixed is a local object,
    * the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynFixed.
@@ -81,23 +81,23 @@ public abstract class DynFixedHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynFixed");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynFixed. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynFixed.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynFixed unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynFixed}.
@@ -109,9 +109,9 @@ public abstract class DynFixedHelper
 
   /**
    * Insert the DynFixed into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynFixed to insert.
    */
   public static void insert(Any any, DynFixed that)
@@ -121,7 +121,7 @@ public abstract class DynFixedHelper
 
   /**
    * Extract the DynFixed from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynFixed.
    */
   public static DynFixed extract(Any any)
@@ -131,7 +131,7 @@ public abstract class DynFixedHelper
 
   /**
    * Get the DynFixed repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynFixed:1.0", always.
    */
   public static String id()
@@ -142,11 +142,11 @@ public abstract class DynFixedHelper
   /**
    * This should read DynFixed from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynFixed read(InputStream input)
@@ -157,15 +157,15 @@ public abstract class DynFixedHelper
   /**
    * This should read DynFixed from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynFixed value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java
index f330108b0eb..e2a859b63d4 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynSequenceHelper.java
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynSequence is always a local object, so the two methods of
  * this helper ({@link #read} and {@link #write} are not in use, always
  * throwing {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynSequenceHelper
@@ -64,7 +64,7 @@ public abstract class DynSequenceHelper
   /**
    * Cast the passed object into the DynSequence. As DynSequence is a local
    * object, the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynSequence.
@@ -80,23 +80,23 @@ public abstract class DynSequenceHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynSequence");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynSequence. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynSequence.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynSequence unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynSequence}.
@@ -108,9 +108,9 @@ public abstract class DynSequenceHelper
 
   /**
    * Insert the DynSequence into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynSequence to insert.
    */
   public static void insert(Any any, DynSequence that)
@@ -120,7 +120,7 @@ public abstract class DynSequenceHelper
 
   /**
    * Extract the DynSequence from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynSequence.
    */
   public static DynSequence extract(Any any)
@@ -130,7 +130,7 @@ public abstract class DynSequenceHelper
 
   /**
    * Get the DynSequence repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynSequence:1.0", always.
    */
   public static String id()
@@ -141,11 +141,11 @@ public abstract class DynSequenceHelper
   /**
    * This should read DynSequence from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynSequence read(InputStream input)
@@ -156,15 +156,15 @@ public abstract class DynSequenceHelper
   /**
    * This should read DynSequence from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynSequence value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java
index 077b7d09824..ed049a10535 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynStructHelper.java
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynStruct is always a local object, so the two methods of
  * this helper ({@link #read} and {@link #write} are not in use, always
  * throwing {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynStructHelper
@@ -64,7 +64,7 @@ public abstract class DynStructHelper
   /**
    * Cast the passed object into the DynStruct. As DynStruct is a local object,
    * the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynStruct.
@@ -80,23 +80,23 @@ public abstract class DynStructHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynStruct");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynStruct. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynStruct.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynStruct unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynStruct}.
@@ -108,9 +108,9 @@ public abstract class DynStructHelper
 
   /**
    * Insert the DynStruct into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynStruct to insert.
    */
   public static void insert(Any any, DynStruct that)
@@ -120,7 +120,7 @@ public abstract class DynStructHelper
 
   /**
    * Extract the DynStruct from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynStruct.
    */
   public static DynStruct extract(Any any)
@@ -130,7 +130,7 @@ public abstract class DynStructHelper
 
   /**
    * Get the DynStruct repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynStruct:1.0", always.
    */
   public static String id()
@@ -141,11 +141,11 @@ public abstract class DynStructHelper
   /**
    * This should read DynStruct from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynStruct read(InputStream input)
@@ -156,15 +156,15 @@ public abstract class DynStructHelper
   /**
    * This should read DynStruct from the CDR input stream, but (following the
    * JDK 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynStruct value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java
index f1016d078af..f39ff664123 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynUnionHelper.java
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynUnion is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynUnionHelper
@@ -64,7 +64,7 @@ public abstract class DynUnionHelper
   /**
    * Cast the passed object into the DynUnion. As DynUnion is a local object,
    * the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynUnion.
@@ -80,23 +80,23 @@ public abstract class DynUnionHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynUnion");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynUnion. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynUnion.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynUnion unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynUnion}.
@@ -108,9 +108,9 @@ public abstract class DynUnionHelper
 
   /**
    * Insert the DynUnion into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynUnion to insert.
    */
   public static void insert(Any any, DynUnion that)
@@ -120,7 +120,7 @@ public abstract class DynUnionHelper
 
   /**
    * Extract the DynUnion from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynUnion.
    */
   public static DynUnion extract(Any any)
@@ -130,7 +130,7 @@ public abstract class DynUnionHelper
 
   /**
    * Get the DynUnion repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynUnion:1.0", always.
    */
   public static String id()
@@ -141,11 +141,11 @@ public abstract class DynUnionHelper
   /**
    * This should read DynUnion from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynUnion read(InputStream input)
@@ -156,15 +156,15 @@ public abstract class DynUnionHelper
   /**
    * This should read DynUnion from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynUnion value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynValueBox.java b/libjava/classpath/org/omg/DynamicAny/DynValueBox.java
index bd758b50caa..15ff131a9d8 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynValueBox.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynValueBox.java
@@ -52,4 +52,4 @@ public interface DynValueBox
   extends DynValueBoxOperations, DynValueCommon, DynAny, IDLEntity,
     org.omg.CORBA.Object, Serializable
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/DynValueCommonOperations.java b/libjava/classpath/org/omg/DynamicAny/DynValueCommonOperations.java
index 31c31678e60..e16e42888a5 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynValueCommonOperations.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynValueCommonOperations.java
@@ -41,7 +41,7 @@ package org.omg.DynamicAny;
 /**
  * Provides operations, applicable to {@link DynAny}s that may hold CORBA
  * <code>null</code>.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface DynValueCommonOperations
@@ -49,7 +49,7 @@ public interface DynValueCommonOperations
 {
   /**
    * Check if this {@link DynAny} is holding the <code>null</code>.
-   * 
+   *
    * @return true if this {@link DynAny} is holding the <code>null</code>,
    * false otherwise.
    */
diff --git a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java
index 17d9bbc5a8b..b8debb15f15 100644
--- a/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/DynValueHelper.java
@@ -53,10 +53,10 @@ import org.omg.CORBA.portable.OutputStream;
  * specifications, DynValue is always a local object, so the two methods of this
  * helper ({@link #read} and {@link #write} are not in use, always throwing
  * {@link MARSHAL}.
- * 
+ *
  * @specnote always throwing MARSHAL in read and write ensures compatibility
  * with other popular implementations like Sun's.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class DynValueHelper
@@ -64,7 +64,7 @@ public abstract class DynValueHelper
   /**
    * Cast the passed object into the DynValue. As DynValue is a local object,
    * the method just uses java type cast.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a DynValue.
@@ -80,23 +80,23 @@ public abstract class DynValueHelper
         throw new BAD_PARAM(obj.getClass().getName() + " is not a DynValue");
       }
   }
-  
+
   /**
    * Narrow the given object to the DynValue. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted DynValue.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static DynValue unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Get the type code of the {@link DynValue}.
@@ -108,9 +108,9 @@ public abstract class DynValueHelper
 
   /**
    * Insert the DynValue into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
-   * 
+   *
    * @param that the DynValue to insert.
    */
   public static void insert(Any any, DynValue that)
@@ -120,7 +120,7 @@ public abstract class DynValueHelper
 
   /**
    * Extract the DynValue from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain DynValue.
    */
   public static DynValue extract(Any any)
@@ -130,7 +130,7 @@ public abstract class DynValueHelper
 
   /**
    * Get the DynValue repository id.
-   * 
+   *
    * @return "IDL:omg.org/DynamicAny/DynValue:1.0", always.
    */
   public static String id()
@@ -141,11 +141,11 @@ public abstract class DynValueHelper
   /**
    * This should read DynValue from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static DynValue read(InputStream input)
@@ -156,15 +156,15 @@ public abstract class DynValueHelper
   /**
    * This should read DynValue from the CDR input stream, but (following the JDK
    * 1.5 API) it does not.
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream to write into.
-   * 
+   *
    * @specenote Sun throws the same exception.
-   * 
+   *
    * @throws MARSHAL always.
    */
   public static void write(OutputStream output, DynValue value)
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java
index fb5ea1c7fc7..dcc667b4296 100644
--- a/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/FieldNameHelper.java
@@ -117,4 +117,4 @@ public abstract class FieldNameHelper
   {
     ostream.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java
index 4e133a51344..edf51fa5eef 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairHelper.java
@@ -80,7 +80,7 @@ public abstract class NameDynAnyPairHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPair expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -105,16 +105,16 @@ public abstract class NameDynAnyPairHelper
   {
     ORB orb = OrbRestricted.Singleton;
     StructMember[] members = new StructMember[ 2 ];
-    
+
     TypeCode field;
-    
+
     field =
       orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
                           "FieldName",
                           orb.get_primitive_tc(TCKind.tk_string)
       );
     members [ 0 ] = new StructMember("id", field, null);
-    
+
     field = DynAnyHelper.type();
     members [ 1 ] = new StructMember("value", field, null);
     return orb.create_struct_tc(id(), "NameDynAnyPair", members);
@@ -161,4 +161,4 @@ public abstract class NameDynAnyPairHelper
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
index 817ed8a70cc..067d01a3c38 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/NameDynAnyPairSeqHelper.java
@@ -98,7 +98,7 @@ public abstract class NameDynAnyPairSeqHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("NameDynAnyPairSeq expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -142,4 +142,4 @@ public abstract class NameDynAnyPairSeqHelper
   {
     throw new MARSHAL(DynAnyFactoryHelper.not_applicable(id()));
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePair.java b/libjava/classpath/org/omg/DynamicAny/NameValuePair.java
index e0ce752a57f..359fac3847b 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameValuePair.java
+++ b/libjava/classpath/org/omg/DynamicAny/NameValuePair.java
@@ -87,4 +87,4 @@ public final class NameValuePair
     id = aName;
     value = aValue;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java b/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java
index 75bbf9a7433..e62074d83b9 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/NameValuePairHelper.java
@@ -68,16 +68,16 @@ public abstract class NameValuePairHelper
   {
     ORB orb = OrbRestricted.Singleton;
     StructMember[] members = new StructMember[ 2 ];
-    
+
     TypeCode field;
-    
+
     field =
       orb.create_alias_tc("IDL:omg.org/DynamicAny/FieldName:1.0",
                           "FieldName",
                           orb.get_primitive_tc(TCKind.tk_string)
       );
     members [ 0 ] = new StructMember("id", field, null);
-    
+
     field = orb.get_primitive_tc(TCKind.tk_any);
     members [ 1 ] = new StructMember("value", field, null);
     return orb.create_struct_tc(id(), "NameValuePair", members);
@@ -111,7 +111,7 @@ public abstract class NameValuePairHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("NameValuePair expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -150,4 +150,4 @@ public abstract class NameValuePairHelper
     output.write_string(value.id);
     output.write_any(value.value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java b/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java
index 018ee7d2d9c..4bcd7f8b51c 100644
--- a/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java
+++ b/libjava/classpath/org/omg/DynamicAny/NameValuePairSeqHelper.java
@@ -91,7 +91,7 @@ public abstract class NameValuePairSeqHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("NameValuePairSeq expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
   }
@@ -138,4 +138,4 @@ public abstract class NameValuePairSeqHelper
         NameValuePairHelper.write(output, value [ i0 ]);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java
index d72ebabbd79..dcfb9b59e3c 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynAnyFactoryStub.java
@@ -117,4 +117,4 @@ public class _DynAnyFactoryStub
   static String NOT_APPLICABLE =
     "DynAnyFactory is always local objects. " +
     "It is never accessed on remote side via stub.";
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java b/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java
index fa19da14463..1a81be30613 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynAnyStub.java
@@ -625,4 +625,4 @@ public class _DynAnyStub
   static String NOT_APPLICABLE =
     "DynAnys are always local objects. " +
     "They and are never accessed on remote side via stubs.";
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java b/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java
index fc7ba978b3f..74e763b3784 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynArrayStub.java
@@ -125,7 +125,7 @@ public class _DynArrayStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
- 
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -664,4 +664,4 @@ public class _DynArrayStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java b/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java
index fd3e9db7eb1..e56ed75175e 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynEnumStub.java
@@ -125,7 +125,7 @@ public class _DynEnumStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
-  
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -664,4 +664,4 @@ public class _DynEnumStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java b/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java
index 5fab8b1b2e7..759b48a4e2f 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynFixedStub.java
@@ -643,4 +643,4 @@ public class _DynFixedStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java b/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java
index 0fdc19d63ea..488a7de9cf1 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynSequenceStub.java
@@ -149,7 +149,7 @@ public class _DynSequenceStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
-  
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -688,4 +688,4 @@ public class _DynSequenceStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java b/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java
index 73e7650b343..907f3c83468 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynStructStub.java
@@ -151,7 +151,7 @@ public class _DynStructStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
-  
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -690,4 +690,4 @@ public class _DynStructStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java b/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java
index 8328b5e8694..6789a34e8a1 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynUnionStub.java
@@ -183,7 +183,7 @@ public class _DynUnionStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
-  
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -722,4 +722,4 @@ public class _DynUnionStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java b/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java
index a781772c560..fffccfe0e8e 100644
--- a/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java
+++ b/libjava/classpath/org/omg/DynamicAny/_DynValueStub.java
@@ -183,7 +183,7 @@ public class _DynValueStub
   {
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
-  
+
   /**
    * The remote call of DynAny methods is not possible.
    *
@@ -722,4 +722,4 @@ public class _DynValueStub
     throw new MARSHAL(_DynAnyStub.NOT_APPLICABLE);
   }
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/Codec.java b/libjava/classpath/org/omg/IOP/Codec.java
index 575cc05d2dc..580485804aa 100644
--- a/libjava/classpath/org/omg/IOP/Codec.java
+++ b/libjava/classpath/org/omg/IOP/Codec.java
@@ -68,4 +68,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface Codec
   extends CodecOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecFactory.java b/libjava/classpath/org/omg/IOP/CodecFactory.java
index da62b488099..a1ac84a8b82 100644
--- a/libjava/classpath/org/omg/IOP/CodecFactory.java
+++ b/libjava/classpath/org/omg/IOP/CodecFactory.java
@@ -64,4 +64,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface CodecFactory
   extends CodecFactoryOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java
index d3dc40935ae..3b1cf43ab89 100644
--- a/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java
+++ b/libjava/classpath/org/omg/IOP/CodecFactoryHelper.java
@@ -115,23 +115,23 @@ public abstract class CodecFactoryHelper
         throw bad;
       }
   }
-  
+
   /**
    * Narrow the given object to the CodecFactory. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted CodecFactory.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static CodecFactory unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * This should read the CodecFactory from the CDR intput stream,
@@ -161,4 +161,4 @@ public abstract class CodecFactoryHelper
 
   private static String UNSUPPORTED =
     "The operation is unsupported for CodecFactory because it is a local object";
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryOperations.java b/libjava/classpath/org/omg/IOP/CodecFactoryOperations.java
index a2b87d55724..022cac44776 100644
--- a/libjava/classpath/org/omg/IOP/CodecFactoryOperations.java
+++ b/libjava/classpath/org/omg/IOP/CodecFactoryOperations.java
@@ -60,4 +60,4 @@ public interface CodecFactoryOperations
    */
   Codec create_codec(Encoding for_encoding)
               throws UnknownEncoding;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java
index c1988bfd0d9..e79b3bcd561 100644
--- a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java
+++ b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java
@@ -75,4 +75,4 @@ public final class UnknownEncoding
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
index 2110f0d5b86..f518bc27880 100644
--- a/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
+++ b/libjava/classpath/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java
@@ -59,7 +59,7 @@ import org.omg.CORBA.BAD_OPERATION;
 public abstract class UnknownEncodingHelper
 {
   /**
-   * Create the UnknownEncoding typecode (structure, 
+   * Create the UnknownEncoding typecode (structure,
    * named "UnknownEncoding").
    */
   public static TypeCode type()
@@ -68,11 +68,11 @@ public abstract class UnknownEncodingHelper
     StructMember[] members = new StructMember[0];
     return
     orb.create_exception_tc (id(), "UnknownEncoding", members);
-        
-  } 
+
+  }
 
   /* Every user exception with no user defined fields can use EmptyExceptionHolder */
-  
+
   /**
    * Insert the UnknownEncoding into the given Any.
    *
@@ -100,10 +100,10 @@ public abstract class UnknownEncodingHelper
       {
         BAD_OPERATION bad = new BAD_OPERATION("UnknownEncoding expected");
         bad.initCause(cex);
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         throw bad;
       }
-  }  
+  }
 
   /**
    * Get the UnknownEncoding repository id.
@@ -113,7 +113,7 @@ public abstract class UnknownEncodingHelper
   public static String id()
   {
     return "IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0";
-  }  
+  }
 
   /**
    * Read the exception from the CDR intput stream.
@@ -123,10 +123,10 @@ public abstract class UnknownEncodingHelper
   public static UnknownEncoding read(InputStream input)
   {
     // Read the exception repository id.
-    String id = input.read_string();    
+    String id = input.read_string();
     UnknownEncoding value = new UnknownEncoding(id);
-    
-    return value;  	  
+
+    return value;
   }
 
   /**
@@ -140,4 +140,4 @@ public abstract class UnknownEncodingHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecOperations.java b/libjava/classpath/org/omg/IOP/CodecOperations.java
index 873f546072a..a9ff9539d2f 100644
--- a/libjava/classpath/org/omg/IOP/CodecOperations.java
+++ b/libjava/classpath/org/omg/IOP/CodecOperations.java
@@ -123,4 +123,4 @@ public interface CodecOperations
    */
   Any decode_value(byte[] them, TypeCode type)
             throws FormatMismatch, TypeMismatch;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatch.java b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatch.java
index b4cb1366668..7e2fc1a1f09 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatch.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatch.java
@@ -78,4 +78,4 @@ public final class FormatMismatch
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
index 02097561747..5d5f154d726 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/FormatMismatchHelper.java
@@ -95,7 +95,7 @@ public abstract class FormatMismatchHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("FormatMismatch expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -136,4 +136,4 @@ public abstract class FormatMismatchHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java
index 5a23fdccda8..4df69d476ef 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java
@@ -78,4 +78,4 @@ public final class InvalidTypeForEncoding
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
index 246a1b93ff0..96dcbd81789 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java
@@ -70,7 +70,7 @@ public abstract class InvalidTypeForEncodingHelper
 
   /**
    * Insert the InvalidTypeForEncoding into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the InvalidTypeForEncoding to insert.
    */
@@ -97,7 +97,7 @@ public abstract class InvalidTypeForEncodingHelper
       {
         BAD_OPERATION bad =
           new BAD_OPERATION("InvalidTypeForEncoding expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -138,4 +138,4 @@ public abstract class InvalidTypeForEncodingHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatch.java b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatch.java
index 7751c3eb663..d388588b81d 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatch.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatch.java
@@ -76,4 +76,4 @@ public final class TypeMismatch
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
index 88e00a243cb..ed65c9bf546 100644
--- a/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
+++ b/libjava/classpath/org/omg/IOP/CodecPackage/TypeMismatchHelper.java
@@ -95,7 +95,7 @@ public abstract class TypeMismatchHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("TypeMismatch expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -136,4 +136,4 @@ public abstract class TypeMismatchHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ComponentIdHelper.java b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java
index f94187698a4..5ceb6d46e56 100644
--- a/libjava/classpath/org/omg/IOP/ComponentIdHelper.java
+++ b/libjava/classpath/org/omg/IOP/ComponentIdHelper.java
@@ -120,4 +120,4 @@ public abstract class ComponentIdHelper
   {
     output.write_ulong(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/Encoding.java b/libjava/classpath/org/omg/IOP/Encoding.java
index cbf1e9e401a..90debf98066 100644
--- a/libjava/classpath/org/omg/IOP/Encoding.java
+++ b/libjava/classpath/org/omg/IOP/Encoding.java
@@ -95,4 +95,4 @@ public final class Encoding
     major_version = _major_version;
     minor_version = _minor_version;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/IOR.java b/libjava/classpath/org/omg/IOP/IOR.java
index 12c47a1ca33..47245acef6e 100644
--- a/libjava/classpath/org/omg/IOP/IOR.java
+++ b/libjava/classpath/org/omg/IOP/IOR.java
@@ -53,7 +53,7 @@ import java.io.Serializable;
  * The IOR is a standard structure, transferred when sending an object with
  * {@link org.omg.CORBA.portable.OutputStream#write_Object(org.omg.CORBA.Object)}
  * and receiving with {@link org.omg.CORBA.portable.InputStream#read_Object()}.
- * The stringified object references, managed by 
+ * The stringified object references, managed by
  * {@link org.omg.CORBA.ORB#string_to_object}
  * and {@link org.omg.CORBA.ORB#object_to_string} are also IORs, where the
  * initially binary data are encoded as strings using hexadecimal notation.
@@ -110,4 +110,4 @@ public final class IOR
     type_id = _type_id;
     profiles = _profiles;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/IORHelper.java b/libjava/classpath/org/omg/IOP/IORHelper.java
index 197e15a1203..b4cd3a3d9a9 100644
--- a/libjava/classpath/org/omg/IOP/IORHelper.java
+++ b/libjava/classpath/org/omg/IOP/IORHelper.java
@@ -78,7 +78,7 @@ public abstract class IORHelper
 
   /**
    * Insert the IOR into the given Any. This method uses the IORHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the IOR to insert.
    */
@@ -102,7 +102,7 @@ public abstract class IORHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("IOR expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -152,4 +152,4 @@ public abstract class IORHelper
     for (int i0 = 0; i0 < value.profiles.length; i0++)
       TaggedProfileHelper.write(output, value.profiles [ i0 ]);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/IORHolder.java b/libjava/classpath/org/omg/IOP/IORHolder.java
index 144c7993a59..f490c77c5ff 100644
--- a/libjava/classpath/org/omg/IOP/IORHolder.java
+++ b/libjava/classpath/org/omg/IOP/IORHolder.java
@@ -100,4 +100,4 @@ public final class IORHolder
   {
     return IORHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java
index 6a941dee6ad..887e4e5bc21 100644
--- a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java
+++ b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHelper.java
@@ -65,7 +65,7 @@ public abstract class MultipleComponentProfileHelper
   /**
    * Insert the MultipleComponentProfile into the given Any. This method uses
    * the MultipleComponentProfileHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param those the TaggedComponent[] to insert.
    */
@@ -89,7 +89,7 @@ public abstract class MultipleComponentProfileHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("MultipleComponentProfile expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -135,4 +135,4 @@ public abstract class MultipleComponentProfileHelper
     for (int i0 = 0; i0 < value.length; i0++)
       TaggedComponentHelper.write(output, value[i0]);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHolder.java b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHolder.java
index 2be0e714b3f..1fe69ba0389 100644
--- a/libjava/classpath/org/omg/IOP/MultipleComponentProfileHolder.java
+++ b/libjava/classpath/org/omg/IOP/MultipleComponentProfileHolder.java
@@ -42,7 +42,7 @@ import org.omg.CORBA.portable.Streamable;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
 
- 
+
 /**
  * A holder for the sequence of {@link TaggedComponent}
  * ({@link org.omg.IOP.MultipleComponentProfileHelper}).
@@ -63,8 +63,8 @@ public final class MultipleComponentProfileHolder
    */
   public MultipleComponentProfileHolder()
   {
-  }  
-  
+  }
+
   /**
    * Create the initialised instance.
    * @param initialValue the array that will be assigned to
@@ -78,7 +78,7 @@ public final class MultipleComponentProfileHolder
   /**
    * Read the {@link #value} array from the CDR stream.
    *
-   * @param input the org.omg.CORBA.portable stream to read. 
+   * @param input the org.omg.CORBA.portable stream to read.
    */
   public void _read(InputStream input)
   {
@@ -87,14 +87,14 @@ public final class MultipleComponentProfileHolder
 
   /**
    * Write the stored value into the CDR stream.
-   * 
-   * @param output the org.omg.CORBA.portable stream to write. 
+   *
+   * @param output the org.omg.CORBA.portable stream to write.
    */
   public void _write(OutputStream output)
   {
     MultipleComponentProfileHelper.write(output, value);
   }
-  
+
   /**
    * Get the typecode of the TaggedComponent.
    */
diff --git a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java
index 362b2dff35b..2e546f46362 100644
--- a/libjava/classpath/org/omg/IOP/ProfileIdHelper.java
+++ b/libjava/classpath/org/omg/IOP/ProfileIdHelper.java
@@ -120,4 +120,4 @@ public abstract class ProfileIdHelper
   {
     output.write_ulong(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceContext.java b/libjava/classpath/org/omg/IOP/ServiceContext.java
index e011a4e9e57..a2b7119ce4e 100644
--- a/libjava/classpath/org/omg/IOP/ServiceContext.java
+++ b/libjava/classpath/org/omg/IOP/ServiceContext.java
@@ -92,4 +92,4 @@ public final class ServiceContext
     this.context_id = a_context_id;
     this.context_data = a_context_data;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceContextHelper.java b/libjava/classpath/org/omg/IOP/ServiceContextHelper.java
index d6549fa5405..6eab887cabd 100644
--- a/libjava/classpath/org/omg/IOP/ServiceContextHelper.java
+++ b/libjava/classpath/org/omg/IOP/ServiceContextHelper.java
@@ -81,7 +81,7 @@ public abstract class ServiceContextHelper
   /**
    * Insert the ServiceContext into the given Any. This method uses the
    * ServiceContextHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the ServiceContext to insert.
    */
@@ -105,7 +105,7 @@ public abstract class ServiceContextHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServiceContext expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -151,4 +151,4 @@ public abstract class ServiceContextHelper
     for (int i0 = 0; i0 < value.context_data.length; i0++)
       output.write_octet(value.context_data [ i0 ]);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceContextHolder.java b/libjava/classpath/org/omg/IOP/ServiceContextHolder.java
index 1b9896d034b..d6a95b313cb 100644
--- a/libjava/classpath/org/omg/IOP/ServiceContextHolder.java
+++ b/libjava/classpath/org/omg/IOP/ServiceContextHolder.java
@@ -100,4 +100,4 @@ public final class ServiceContextHolder
   {
     return ServiceContextHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java
index 9de0b6ffd0d..7072ac0792b 100644
--- a/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java
+++ b/libjava/classpath/org/omg/IOP/ServiceContextListHelper.java
@@ -91,7 +91,7 @@ public abstract class ServiceContextListHelper
     catch (ClassCastException ex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServiceContext[] expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(ex);
         throw bad;
       }
@@ -138,4 +138,4 @@ public abstract class ServiceContextListHelper
         ServiceContextHelper.write(output, value [ i ]);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceContextListHolder.java b/libjava/classpath/org/omg/IOP/ServiceContextListHolder.java
index 95fd091dfa3..b4266777ec3 100644
--- a/libjava/classpath/org/omg/IOP/ServiceContextListHolder.java
+++ b/libjava/classpath/org/omg/IOP/ServiceContextListHolder.java
@@ -100,4 +100,4 @@ public final class ServiceContextListHolder
   {
     return ServiceContextListHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java
index 9c4cbbe4a3d..ab9789e223c 100644
--- a/libjava/classpath/org/omg/IOP/ServiceIdHelper.java
+++ b/libjava/classpath/org/omg/IOP/ServiceIdHelper.java
@@ -121,4 +121,4 @@ public abstract class ServiceIdHelper
   {
     output.write_ulong(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TaggedComponent.java b/libjava/classpath/org/omg/IOP/TaggedComponent.java
index 66437e701bd..038fcd84478 100644
--- a/libjava/classpath/org/omg/IOP/TaggedComponent.java
+++ b/libjava/classpath/org/omg/IOP/TaggedComponent.java
@@ -90,4 +90,4 @@ public final class TaggedComponent
     this.tag = a_tag;
     this.component_data = a_component_data;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
index bc4445fcd57..e35849a70f9 100644
--- a/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
+++ b/libjava/classpath/org/omg/IOP/TaggedComponentHelper.java
@@ -66,14 +66,14 @@ public abstract class TaggedComponentHelper
   {
     ORB orb = OrbRestricted.Singleton;
     StructMember[] members = new StructMember[2];
-    
+
     TypeCode field;
-    
+
     field = orb.create_alias_tc("IDL:omg.org/IOP/ComponentId:1.0",
                                 "ComponentId",
                                 orb.get_primitive_tc(TCKind.tk_ulong));
     members[0] = new StructMember("tag", field, null);
-    
+
     field = orb.create_sequence_tc(0, orb.get_primitive_tc(TCKind.tk_octet));
     members[1] = new StructMember("component_data", field, null);
     return orb.create_struct_tc(id(), "TaggedComponent", members);
@@ -106,7 +106,7 @@ public abstract class TaggedComponentHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("TaggedComponent expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -153,4 +153,4 @@ public abstract class TaggedComponentHelper
     output.write_long(value.component_data.length);
     output.write_octet_array(value.component_data, 0, value.component_data.length);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TaggedComponentHolder.java b/libjava/classpath/org/omg/IOP/TaggedComponentHolder.java
index b233591f23c..1b19be6089e 100644
--- a/libjava/classpath/org/omg/IOP/TaggedComponentHolder.java
+++ b/libjava/classpath/org/omg/IOP/TaggedComponentHolder.java
@@ -61,8 +61,8 @@ public final class TaggedComponentHolder
    */
   public TaggedComponentHolder()
   {
-  }  
-  
+  }
+
   /**
    * Create the initialised instance.
    * @param initialValue the value that will be assigned to
@@ -76,7 +76,7 @@ public final class TaggedComponentHolder
   /**
    * Fill in the {@link #value} by data from the CDR stream.
    *
-   * @param input the org.omg.CORBA.portable stream to read. 
+   * @param input the org.omg.CORBA.portable stream to read.
    */
   public void _read(InputStream input)
   {
@@ -85,14 +85,14 @@ public final class TaggedComponentHolder
 
   /**
    * Write the stored value into the CDR stream.
-   * 
-   * @param output the org.omg.CORBA.portable stream to write. 
+   *
+   * @param output the org.omg.CORBA.portable stream to write.
    */
   public void _write(OutputStream output)
   {
     TaggedComponentHelper .write(output, value);
   }
-  
+
   /**
    * Get the typecode of the TaggedComponent.
    */
diff --git a/libjava/classpath/org/omg/IOP/TaggedProfile.java b/libjava/classpath/org/omg/IOP/TaggedProfile.java
index 669b73a5956..564066a3b7f 100644
--- a/libjava/classpath/org/omg/IOP/TaggedProfile.java
+++ b/libjava/classpath/org/omg/IOP/TaggedProfile.java
@@ -107,4 +107,4 @@ public final class TaggedProfile
     tag = a_tag;
     profile_data = a_profile_data;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java b/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java
index 9dbbfdaff1d..95e404c2bbe 100644
--- a/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java
+++ b/libjava/classpath/org/omg/IOP/TaggedProfileHelper.java
@@ -86,7 +86,7 @@ public abstract class TaggedProfileHelper
   /**
    * Insert the TaggedProfile into the given Any. This method uses the
    * TaggedProfileHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the TaggedProfile to insert.
    */
@@ -110,7 +110,7 @@ public abstract class TaggedProfileHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("TaggedProfile expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -183,4 +183,4 @@ public abstract class TaggedProfileHelper
           output.write_octet(value.profile_data[i0]);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TaggedProfileHolder.java b/libjava/classpath/org/omg/IOP/TaggedProfileHolder.java
index f739097e35b..9ee3aab2d5c 100644
--- a/libjava/classpath/org/omg/IOP/TaggedProfileHolder.java
+++ b/libjava/classpath/org/omg/IOP/TaggedProfileHolder.java
@@ -100,4 +100,4 @@ public final class TaggedProfileHolder
   {
     return TaggedProfileHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/IOP/TransactionService.java b/libjava/classpath/org/omg/IOP/TransactionService.java
index 2d987316c97..ce7f7bfa3e6 100644
--- a/libjava/classpath/org/omg/IOP/TransactionService.java
+++ b/libjava/classpath/org/omg/IOP/TransactionService.java
@@ -53,4 +53,4 @@ public interface TransactionService
    * Specifies the TransactionService value, 0.
    */
   int value = 0;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java b/libjava/classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java
index 0c31480b341..7a0a5df0ec8 100644
--- a/libjava/classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java
+++ b/libjava/classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java
@@ -71,4 +71,4 @@ public interface SYNC_WITH_TRANSPORT
    * send a reply message.
    */
   short value = 1;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/Messaging/SyncScopeHelper.java b/libjava/classpath/org/omg/Messaging/SyncScopeHelper.java
index f716edfaf48..a71b6f36fe6 100644
--- a/libjava/classpath/org/omg/Messaging/SyncScopeHelper.java
+++ b/libjava/classpath/org/omg/Messaging/SyncScopeHelper.java
@@ -114,4 +114,4 @@ public abstract class SyncScopeHelper
   {
     ostream.write_short(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
index 936e6bc1b81..df4bd3e7254 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java
@@ -117,4 +117,4 @@ public abstract class AdapterManagerIdHelper
   {
     output.write_long(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
index 05844560a9a..0f37a6a3003 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterNameHelper.java
@@ -52,14 +52,14 @@ import org.omg.CORBA.portable.OutputStream;
  * Provides static helper methods for working with the adapter name helper.
  * The adapter name helper is an array of strings, so {@link StringSeqHelper}
  * could be used for io operations. The separate helper is provided anyway.
- * 
+ *
  * @since 1.5
  *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class AdapterNameHelper
 {
-  
+
   /**
    * Extract the adapter name (<code>String[]</code>) from the given {@link Any}.
    *
@@ -75,8 +75,8 @@ public abstract class AdapterNameHelper
 
   /**
    * Returns the agreed Id.
-   * 
-   * @return "IDL:omg.org/PortableInterceptor/AdapterName:1.0", always. 
+   *
+   * @return "IDL:omg.org/PortableInterceptor/AdapterName:1.0", always.
    */
   public static String id()
   {
@@ -85,7 +85,7 @@ public abstract class AdapterNameHelper
 
   /**
    * Insert into the given adapter name (<code>String[]</code>) into the
-   * given {@link Any}. 
+   * given {@link Any}.
    *
    * @param into the target Any.
    * @param that the array to insert.
@@ -111,7 +111,7 @@ public abstract class AdapterNameHelper
   /**
    * Creates and returns a new instance of the TypeCode, corresponding the
    * adapter name.
-   * 
+   *
    * @return the alias of the string sequence, named "AdapterName".
    */
   public static TypeCode type()
@@ -124,7 +124,7 @@ public abstract class AdapterNameHelper
 
   /**
    * Writes the <code>String[]</code> into the given stream.
-   * 
+   *
    * @param output the CORBA output stream to write.
    * @param value the value that must be written.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java b/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
index f0522caac0f..ea208474b4a 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/AdapterStateHelper.java
@@ -118,4 +118,4 @@ public abstract class AdapterStateHelper
   {
     output.write_short(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfo.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfo.java
index dd3cd5808f3..d25fe6163bc 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfo.java
@@ -51,4 +51,4 @@ public interface ClientRequestInfo extends ClientRequestInfoOperations,
   IDLEntity,
   RequestInfo
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
index e4d70211a13..3b7ed24f382 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInfoOperations.java
@@ -324,4 +324,4 @@ public interface ClientRequestInfoOperations extends RequestInfoOperations
   void add_request_service_context(ServiceContext service_context,
     boolean replace
   );
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptor.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptor.java
index 9fdf2f12065..210ac7b02d0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptor.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptor.java
@@ -51,4 +51,4 @@ public interface ClientRequestInterceptor extends Interceptor,
   org.omg.CORBA.Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
index efd98707bd6..5b1ab84c57f 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java
@@ -127,4 +127,4 @@ public interface ClientRequestInterceptorOperations
    * status of this exception must be COMPLETED_NO.
    */
   void send_poll(ClientRequestInfo info);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/Current.java b/libjava/classpath/org/omg/PortableInterceptor/Current.java
index d53d5c33a79..5f609b61e95 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/Current.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/Current.java
@@ -82,4 +82,4 @@ public interface Current extends CurrentOperations,
   org.omg.CORBA.Current,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
index 88ab0e2708d..881c592a8a2 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/CurrentHelper.java
@@ -117,23 +117,23 @@ public abstract class CurrentHelper
         throw new BAD_PARAM("Not a Current");
       }
   }
-  
+
   /**
    * Narrow the given object to the Current. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See also OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted Current.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static Current unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * Not supported for compatibility reasons.
@@ -162,4 +162,4 @@ public abstract class CurrentHelper
     m.minor = Minor.Inappropriate;
     throw m;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/CurrentOperations.java b/libjava/classpath/org/omg/PortableInterceptor/CurrentOperations.java
index 63515678e38..347b040d086 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/CurrentOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/CurrentOperations.java
@@ -84,4 +84,4 @@ public interface CurrentOperations
    *
    */
   void set_slot(int slot_id, Any data) throws InvalidSlot, BAD_INV_ORDER;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
index 7202f23440a..1018b2722ea 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequest.java
@@ -94,4 +94,4 @@ public final class ForwardRequest extends UserException implements IDLEntity,
   {
     this.forward = a_forward;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
index 8aa19a991a1..1d44e9c0fdd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ForwardRequestHelper.java
@@ -75,7 +75,7 @@ public abstract class ForwardRequestHelper
   /**
    * Insert the ForwardRequest into the given Any. This method uses the
    * ForwardRequestHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the ForwardRequest to insert.
    */
@@ -99,7 +99,7 @@ public abstract class ForwardRequestHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION(id() + " expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -143,4 +143,4 @@ public abstract class ForwardRequestHelper
     output.write_string(id());
     output.write_Object(value.forward);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java b/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
index ec7235102c8..489818456a4 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInfo.java
@@ -55,4 +55,4 @@ public interface IORInfo extends IORInfoOperations,
   org.omg.CORBA.Object,
   Serializable
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/IORInfoOperations.java
index fdeb2973b8a..9ff8d0e2792 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInfoOperations.java
@@ -86,53 +86,53 @@ public interface IORInfoOperations
    */
   Policy get_effective_policy(int policy_type);
 
-  /** 
+  /**
    * Get the adapter template that is associated with the object POA.
    * The template is also a reference factory and can produce the new object
    * references.
-   * 
+   *
    * @since 1.5
    */
   public ObjectReferenceTemplate adapter_template();
-  
+
   /**
-   * The current_factory is the factory, used by the adapter to create 
-   * object references. This factory is initially the same as the 
+   * The current_factory is the factory, used by the adapter to create
+   * object references. This factory is initially the same as the
    * adapter_template.
-   * 
+   *
    * @since 1.5
    */
   public ObjectReferenceFactory current_factory();
 
   /**
    * Set the current object reference factory, used to produce the new objects.
-   * 
-   * The current factory can only be set during the call to the 
+   *
+   * The current factory can only be set during the call to the
    * {@link IORInterceptor_3_0Operations#components_established(IORInfo)}.
-   * 
+   *
    * @since 1.5
    */
   public void current_factory(ObjectReferenceFactory factory);
 
   /**
-   * Get the POA manager Id. 
-   * 
+   * Get the POA manager Id.
+   *
    * @return Id that uniquely refers to the poa manager, used by this POA.
-   * 
-   * @since 1.5 
-   * 
+   *
+   * @since 1.5
+   *
    * @see IORInterceptor_3_0Operations#adapter_manager_state_changed
    */
   public int manager_id();
-  
+
   /**
    * Get the state of the adapter manager.
-   * 
+   *
    * @since 1.5
-   * 
+   *
    * @return the state of the adapters to that the IOR being created belongs.
    * One of the {@link HOLDING#value}, {@link DISCARDING#value},
    * {@link INACTIVE#value} or {@link NON_EXISTENT#value}.
    */
-  short state(); 
-}
\ No newline at end of file
+  short state();
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor.java
index e78fbf2c32b..d654f3998f7 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor.java
@@ -58,4 +58,4 @@ public interface IORInterceptor extends IDLEntity,
   org.omg.CORBA.Object,
   Serializable
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptorOperations.java
index 746d139cf6f..f955576b585 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptorOperations.java
@@ -52,7 +52,7 @@ public interface IORInterceptorOperations extends InterceptorOperations
    * to add additional tags to the IOR being created.
    *
    * @param info the interface class providing methods to insert additional tags
-   * into IOR being constructed. 
+   * into IOR being constructed.
    */
   public void establish_components(IORInfo info);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0.java
index 4b2093d40c6..e77d34694d9 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0.java
@@ -44,16 +44,16 @@ import org.omg.CORBA.portable.IDLEntity;
  * The IORInterceptor_3_0 adds to {@link Interceptor} functionality, available
  * since CORBA 3.0. These new operations are defined separately in
  * {@link IORInterceptor_3_0Operations}.
- * 
- * IORInterceptor_3_0 is registered exactly in the same way as the 
+ *
+ * IORInterceptor_3_0 is registered exactly in the same way as the
  * {@link IORInterceptor}. The ORB calls the additional methods to all
  * IOR interceptors that implement this extended interface.
- * 
+ *
  * @since 1.5
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface IORInterceptor_3_0
   extends IORInterceptor_3_0Operations, IDLEntity, IORInterceptor
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
index 71fb928f791..97875deb2e4 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java
@@ -52,9 +52,9 @@ import org.omg.CORBA.portable.OutputStream;
 
 /**
  * The helper operations for the CORBA object {@link IORInterceptor_3_0}.
- * 
- * @since 1.5 
- * 
+ *
+ * @since 1.5
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public abstract class IORInterceptor_3_0Helper
@@ -64,13 +64,13 @@ public abstract class IORInterceptor_3_0Helper
    */
   public static TypeCode type()
   {
-    return OrbRestricted.Singleton.create_interface_tc(id(), 
+    return OrbRestricted.Singleton.create_interface_tc(id(),
       "IORInterceptor_3_0");
   }
 
   /**
    * Insert the IORInterceptor_3_0 into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the IORInterceptor_3_0 to insert.
    */
@@ -81,7 +81,7 @@ public abstract class IORInterceptor_3_0Helper
 
   /**
    * Extract the IORInterceptor_3_0 from given Any.
-   * 
+   *
    * @throws BAD_OPERATION if the passed Any does not contain
    * IORInterceptor_3_0.
    */
@@ -89,7 +89,7 @@ public abstract class IORInterceptor_3_0Helper
   {
     try
       {
-        IORInterceptor_3_0Holder holder = (IORInterceptor_3_0Holder) 
+        IORInterceptor_3_0Holder holder = (IORInterceptor_3_0Holder)
           any.extract_Streamable();
         return holder.value;
       }
@@ -104,7 +104,7 @@ public abstract class IORInterceptor_3_0Helper
 
   /**
    * Get the IORInterceptor_3_0 repository id.
-   * 
+   *
    * @return "IDL:omg.org/PortableInterceptor/IORInterceptor_3_0:1.0", always.
    */
   public static String id()
@@ -117,7 +117,7 @@ public abstract class IORInterceptor_3_0Helper
    * different java type, create an instance of the _IORInterceptor_3_0Stub,
    * using the same delegate, as for the passed parameter. Hence, unlike java
    * type cast, this method may return a different object, than has been passed.
-   * 
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a IORInterceptor_3_0.
@@ -136,17 +136,17 @@ public abstract class IORInterceptor_3_0Helper
         return new _IORInterceptor_3_0Stub(delegate);
       }
   }
-  
+
   /**
    * Narrow the passed object into the IORInterceptor_3_0. No type-checking is
    * performed to verify that the object actually supports the requested type.
    * The {@link BAD_OPERATION} will be thrown if unsupported operations are
    * invoked on the new returned reference, but no failure is expected at the
-   * time of the unchecked_narrow. For instance, the narrowing of the 
+   * time of the unchecked_narrow. For instance, the narrowing of the
    * remote instance of the {@link IORInterceptor} will work as long as only the
    * methods, inherited from this parent, are invoked.
-   * 
-   * 
+   *
+   *
    * @param obj the object to narrow.
    * @return narrowed instance.
    * @throws BAD_PARAM if the passed object is not a IORInterceptor_3_0.
@@ -163,12 +163,12 @@ public abstract class IORInterceptor_3_0Helper
         return new _IORInterceptor_3_0Stub(delegate);
       }
   }
-  
+
 
   /**
    * Read the IORInterceptor_3_0 from the CDR intput stream (IOR profile
    * expected).
-   * 
+   *
    * @param input a org.omg.CORBA.portable stream to read from.
    */
   public static IORInterceptor_3_0 read(InputStream input)
@@ -178,7 +178,7 @@ public abstract class IORInterceptor_3_0Helper
 
   /**
    * Write the IORInterceptor_3_0 to the CDR output stream (as IOR profile).
-   * 
+   *
    * @param output a org.omg.CORBA.portable stream stream to write into.
    * @param value a value to write.
    */
@@ -186,4 +186,4 @@ public abstract class IORInterceptor_3_0Helper
   {
     output.write_Object(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
index f4830a2e1c6..42462eab959 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java
@@ -44,9 +44,9 @@ import org.omg.CORBA.portable.Streamable;
 
 /**
  * A holder for the object {@link IORInterceptor_3_0}.
- * 
+ *
  * @since 1.5
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public final class IORInterceptor_3_0Holder
@@ -67,7 +67,7 @@ public final class IORInterceptor_3_0Holder
 
   /**
    * Create the initialised instance.
-   * 
+   *
    * @param initialValue the value that will be assigned to the
    * <code>value</code> field.
    */
@@ -78,7 +78,7 @@ public final class IORInterceptor_3_0Holder
 
   /**
    * Fill in the {@link #value} by data from the CDR stream.
-   * 
+   *
    * @param input the org.omg.CORBA.portable stream to read.
    */
   public void _read(InputStream input)
@@ -88,7 +88,7 @@ public final class IORInterceptor_3_0Holder
 
   /**
    * Write the stored value into the CDR stream.
-   * 
+   *
    * @param output the org.omg.CORBA.portable stream to write.
    */
   public void _write(OutputStream output)
@@ -103,4 +103,4 @@ public final class IORInterceptor_3_0Holder
   {
     return IORInterceptor_3_0Helper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java
index ce6575a4ce0..56e19a5be76 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java
@@ -40,9 +40,9 @@ package org.omg.PortableInterceptor;
 
 /**
  * Defines the operations, applicable to the IORInterceptor_3_0.
- * 
- * @since 1.5 
- * 
+ *
+ * @since 1.5
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface IORInterceptor_3_0Operations
@@ -50,12 +50,12 @@ public interface IORInterceptor_3_0Operations
 {
   /**
    * This method is invoked on all registered IORInterceptor_3_0 instances when
-   * the state of the adapter manager changes. 
-   * 
+   * the state of the adapter manager changes.
+   *
    * @param adapterManagerId the Id of the adapter manager that has changed the
-   * state. The same value is returned by 
+   * state. The same value is returned by
    * {@link IORInfoOperations#manager_id()}.
-   * 
+   *
    * @param adapterState the new state of the adapter manager, one of the
    * {@link HOLDING#value}, {@link DISCARDING#value}, {@link INACTIVE#value}
    * or {@link NON_EXISTENT#value}.
@@ -69,7 +69,7 @@ public interface IORInterceptor_3_0Operations
    * is when POA is destroyed. In this case, the method is invoked passing the
    * single element array witn the reference template of the POA being destroyed
    * and the {@link NON_EXISTENT#value} state.
-   * 
+   *
    * @param adapters identifies the object adapters that have changed they
    * state.
    * @param adaptersState the new state of the adapters, one of the
@@ -87,4 +87,4 @@ public interface IORInterceptor_3_0Operations
    * {@link IORInfo#current_factory(ObjectReferenceFactory )}.
    */
   void components_established(IORInfo info);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/Interceptor.java b/libjava/classpath/org/omg/PortableInterceptor/Interceptor.java
index 8ec375c9a7d..4dcb2162a78 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/Interceptor.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/Interceptor.java
@@ -55,4 +55,4 @@ public interface Interceptor extends InterceptorOperations,
   Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/InterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/InterceptorOperations.java
index da08c90dbfd..3758ab01a9f 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/InterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/InterceptorOperations.java
@@ -74,4 +74,4 @@ public interface InterceptorOperations
    * @return the name of the interceptor.
    */
   String name();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
index 30cb1a1dc49..e166e063164 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlot.java
@@ -73,4 +73,4 @@ public final class InvalidSlot extends UserException implements IDLEntity,
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
index 28558a000db..36e23a90c74 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/InvalidSlotHelper.java
@@ -99,7 +99,7 @@ public abstract class InvalidSlotHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidSlot expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -140,4 +140,4 @@ public abstract class InvalidSlotHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/LOCATION_FORWARD.java b/libjava/classpath/org/omg/PortableInterceptor/LOCATION_FORWARD.java
index bbd23f03f62..f0d90788ed1 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/LOCATION_FORWARD.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/LOCATION_FORWARD.java
@@ -51,4 +51,4 @@ public interface LOCATION_FORWARD
    * Specifies the LOCATION_FORWARD value, 3.
    */
   short value = 3;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
index 6b73b115133..f80e71a9ab0 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBIdHelper.java
@@ -50,7 +50,7 @@ import org.omg.CORBA.portable.OutputStream;
  * The ORB Id is defined in OMG specification just as a narrow (not wide)
  * string. As such, the ORB Id needs no helper, but one is included in
  * the API anyway.
- * 
+ *
  * @since 1.5
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
@@ -116,4 +116,4 @@ public abstract class ORBIdHelper
   {
     output.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfo.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfo.java
index d13dacdd6f4..a74b1e79d00 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfo.java
@@ -51,4 +51,4 @@ public interface ORBInitInfo extends ORBInitInfoOperations,
   Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
index 16710a08ab0..cacae3dce9b 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoOperations.java
@@ -69,9 +69,9 @@ public interface ORBInitInfoOperations
    * interceptor implements the extended {@link IORInterceptor_3_0} interface,
    * ORB will call its additional methods, defined in the
    * {@link IORInterceptor_3_0Operations}.
-   * 
+   *
    * @param interceptor the interceptor to register.
-   * 
+   *
    * @throws DuplicateName if the interceptor name is not an empty string and an
    * interceptor with this name is already registered with the ORB being
    * created.
@@ -171,4 +171,4 @@ public interface ORBInitInfoOperations
    * the registered factory in this ORB.
    */
   void register_policy_factory(int policy_type, PolicyFactory policy_factory);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
index 610cec1d020..bad7f8baaa8 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java
@@ -98,4 +98,4 @@ public final class DuplicateName extends UserException implements IDLEntity,
   {
     this.name = a_name;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
index 37d66a6d75f..962da93c823 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java
@@ -75,7 +75,7 @@ public abstract class DuplicateNameHelper
   /**
    * Insert the DuplicateName into the given Any. This method uses the
    * DuplicateNameHolder.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the DuplicateName to insert.
    */
@@ -99,7 +99,7 @@ public abstract class DuplicateNameHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("DuplicateName expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
index ff940dafc7e..7a7e23cc0da 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java
@@ -76,4 +76,4 @@ public final class InvalidName extends UserException implements IDLEntity,
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
index 329fcf56462..c7daf46b91c 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java
@@ -69,7 +69,7 @@ public abstract class InvalidNameHelper
 
   /**
    * Insert the InvalidName into the given Any.
-   * 
+   *
    * @param any the Any to insert into.
    * @param that the InvalidName to insert.
    */
@@ -94,7 +94,7 @@ public abstract class InvalidNameHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidName expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -135,4 +135,4 @@ public abstract class InvalidNameHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
index 5d9812d9f2b..b61720c568b 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java
@@ -114,4 +114,4 @@ public abstract class ObjectIdHelper
   {
     output.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializer.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializer.java
index 47191820c99..84ddfd9fe41 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializer.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializer.java
@@ -129,4 +129,4 @@ public interface ORBInitializer extends ORBInitializerOperations,
   Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
index d5dd771fd98..04bc387d152 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ORBInitializerOperations.java
@@ -70,4 +70,4 @@ public interface ORBInitializerOperations
    * @see ORBInitInfoOperations#register_initial_reference
    */
   void post_init(ORBInitInfo info);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectIdHelper.java
index 600d0a0fb94..19fc05dafc9 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectIdHelper.java
@@ -51,8 +51,8 @@ import org.omg.CORBA.portable.OutputStream;
 /**
  * The Object Id of this package is defined in OMG specification as a byte array.
  * As such, the Object Id needs no helper, but one is included in the API anyway.
- * 
- * @since 1.5 
+ *
+ * @since 1.5
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
@@ -72,7 +72,7 @@ public abstract class ObjectIdHelper
 
   /**
    * Extract the Object Id from Any.
-   * 
+   *
    * @param a the Any to extract from.
    */
   public static byte[] extract(Any a)
@@ -118,4 +118,4 @@ public abstract class ObjectIdHelper
   {
     OctetSeqHelper.write(output, value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
index 83f3da652c0..7b669799ad7 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactory.java
@@ -60,16 +60,16 @@ public interface ObjectReferenceFactory
    * activated. The derived {@link ObjectReferenceTemplate} interface assumes
    * the object must be connected to the POA that is specific to that
    * template (name can be obtained).
-   * 
-   * If the object with this objectId already exists in the given context, it 
+   *
+   * If the object with this objectId already exists in the given context, it
    * is found and returned; a new object is <i>not</i> created.
-   * 
+   *
    * @param repositoryId the repository id of the object being created, defines
    * the type of the object.
-   * 
+   *
    * @param objectId the byte array, defining the identity of the object.
-   * 
+   *
    * @return The created corba object.
    */
   Object make_object(String repositoryId, byte[] objectId);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
index b9a237dce77..8f5af656eff 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java
@@ -61,7 +61,7 @@ public abstract class ObjectReferenceFactoryHelper
 {
   /**
    * Get the type code of the {@link ObjectReferenceFactory}.
-   * 
+   *
    * @return value type code with the agreed id, named "ObjectReferenceFactory",
    *         abstract, no members, no base type.
    */
@@ -139,4 +139,4 @@ public abstract class ObjectReferenceFactoryHelper
   {
     Vio.write(output, value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
index c662977a2de..07be73a1db8 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java
@@ -102,4 +102,4 @@ public final class ObjectReferenceFactoryHolder
   {
     return ObjectReferenceFactoryHelper.type();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
index 666735e7636..42ffdfd7e37 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplate.java
@@ -75,4 +75,4 @@ public interface ObjectReferenceTemplate
    * @return the server id, represented in the form of string.
    */
   String server_id();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
index 0ea54ea5f30..86b00c50ad1 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java
@@ -59,7 +59,7 @@ public abstract class ObjectReferenceTemplateHelper
 {
   /**
    * Get the type code of the {@link ObjectReferenceTemplate}.
-   * 
+   *
    * @return value type type code, named ObjectReferenceTemplate, no members,
    *         abstract.
    */
@@ -133,4 +133,4 @@ public abstract class ObjectReferenceTemplateHelper
     ((org.omg.CORBA_2_3.portable.OutputStream) output).
       write_value(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
index d76ef43f1e0..32b769eb6fd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java
@@ -61,8 +61,8 @@ public final class ObjectReferenceTemplateHolder
    */
   public ObjectReferenceTemplateHolder()
   {
-  }  
-  
+  }
+
   /**
    * Create the initialised instance.
    * @param initialValue the value that will be assigned to
@@ -76,7 +76,7 @@ public final class ObjectReferenceTemplateHolder
   /**
    * Fill in the {@link #value} by data from the CDR stream.
    *
-   * @param input the org.omg.CORBA.portable stream to read. 
+   * @param input the org.omg.CORBA.portable stream to read.
    */
   public void _read(InputStream input)
   {
@@ -85,14 +85,14 @@ public final class ObjectReferenceTemplateHolder
 
   /**
    * Write the stored value into the CDR stream.
-   * 
-   * @param output the org.omg.CORBA.portable stream to write. 
+   *
+   * @param output the org.omg.CORBA.portable stream to write.
    */
   public void _write(OutputStream output)
   {
     ObjectReferenceTemplateHelper .write(output, value);
   }
-  
+
   /**
    * Get the typecode of the ObjectReferenceTemplate.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
index e84f3e6be5d..c16638fdf08 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java
@@ -51,7 +51,7 @@ import org.omg.CORBA.portable.Streamable;
 /**
  * Provides static helper methods for working with the array of object reference
  * templates.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class ObjectReferenceTemplateSeqHelper
@@ -61,11 +61,11 @@ public abstract class ObjectReferenceTemplateSeqHelper
    * {@link Any}. This implementation expects the {@link Any} to hold the
    * instance of {@link ObjectReferenceTemplateSeqHolder} that is returned by
    * {@link Any#extract_Streamable() }.
-   * 
+   *
    * @param a an Any to extract the array from.
-   * 
+   *
    * @return the extracted array.
-   * 
+   *
    * @throws BAD_OPERATION if the Any contains something other than the the
    * {@link ObjectReferenceTemplateSeqHolder}.
    */
@@ -73,7 +73,7 @@ public abstract class ObjectReferenceTemplateSeqHelper
   {
     try
       {
-        ObjectReferenceTemplateSeqHolder h = (ObjectReferenceTemplateSeqHolder) 
+        ObjectReferenceTemplateSeqHolder h = (ObjectReferenceTemplateSeqHolder)
           a.extract_Streamable();
         return h.value;
       }
@@ -89,7 +89,7 @@ public abstract class ObjectReferenceTemplateSeqHelper
 
   /**
    * Returns the object reference template sequence repository Id.
-   * 
+   *
    * @return "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0",
    * always.
    */
@@ -103,13 +103,13 @@ public abstract class ObjectReferenceTemplateSeqHelper
    * given {@link Any}. This implementation first creates a
    * {@link ObjectReferenceTemplateSeqHolder} and then calls
    * {@link Any#insert_Streamable(Streamable)}.
-   * 
+   *
    * @param into the target Any.
    * @param that the array to insert.
    */
   public static void insert(Any into, ObjectReferenceTemplate[] that)
   {
-    ObjectReferenceTemplateSeqHolder holder = 
+    ObjectReferenceTemplateSeqHolder holder =
       new ObjectReferenceTemplateSeqHolder(that);
     into.insert_Streamable(holder);
   }
@@ -117,13 +117,13 @@ public abstract class ObjectReferenceTemplateSeqHelper
   /**
    * Reads the <code>ObjectReferenceTemplate[]</code> from the CORBA input
    * stream.
-   * 
+   *
    * @param input the CORBA (not java.io) stream to read from.
    * @return the value from the stream.
    */
   public static ObjectReferenceTemplate[] read(InputStream input)
   {
-    ObjectReferenceTemplate[] value = 
+    ObjectReferenceTemplate[] value =
       new ObjectReferenceTemplate[input.read_long()];
     for (int i = 0; i < value.length; i++)
       value[i] = ObjectReferenceTemplateHelper.read(input);
@@ -146,7 +146,7 @@ public abstract class ObjectReferenceTemplateSeqHelper
 
   /**
    * Writes the <code>ObjectReferenceTemplate[]</code> into the given stream.
-   * 
+   *
    * @param output the CORBA (not java.io) output stream to write.
    * @param value the value that must be written.
    */
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
index 3fdc2bfe8c0..5f175d42944 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java
@@ -44,7 +44,7 @@ import org.omg.CORBA.portable.OutputStream;
 
 /**
  * A holder for the array of {@link ObjectReferenceTemplate}s.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public final class ObjectReferenceTemplateSeqHolder
@@ -65,7 +65,7 @@ public final class ObjectReferenceTemplateSeqHolder
 
   /**
    * Create the initialised instance.
-   * 
+   *
    * @param initialValue the value that will be assigned to the
    * <code>value</code> field.
    */
@@ -76,7 +76,7 @@ public final class ObjectReferenceTemplateSeqHolder
 
   /**
    * Fill in the {@link #value} by data from the CDR stream.
-   * 
+   *
    * @param input the org.omg.CORBA.portable stream to read.
    */
   public void _read(InputStream input)
@@ -86,7 +86,7 @@ public final class ObjectReferenceTemplateSeqHolder
 
   /**
    * Write the stored value into the CDR stream.
-   * 
+   *
    * @param output the org.omg.CORBA.portable stream to write.
    */
   public void _write(OutputStream output)
diff --git a/libjava/classpath/org/omg/PortableInterceptor/PolicyFactory.java b/libjava/classpath/org/omg/PortableInterceptor/PolicyFactory.java
index 6478e408c80..dcb110185e1 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/PolicyFactory.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/PolicyFactory.java
@@ -54,4 +54,4 @@ public interface PolicyFactory extends PolicyFactoryOperations,
   org.omg.CORBA.Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/PolicyFactoryOperations.java b/libjava/classpath/org/omg/PortableInterceptor/PolicyFactoryOperations.java
index 4e5a54ef754..49940e83deb 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/PolicyFactoryOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/PolicyFactoryOperations.java
@@ -66,4 +66,4 @@ public interface PolicyFactoryOperations
    */
   Policy create_policy(int policy_type, Any policy_value)
     throws PolicyError;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/RequestInfo.java b/libjava/classpath/org/omg/PortableInterceptor/RequestInfo.java
index 0285a80636a..22f108a4856 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/RequestInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/RequestInfo.java
@@ -52,4 +52,4 @@ public interface RequestInfo extends RequestInfoOperations,
   org.omg.CORBA.Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
index 10b9662a634..851f4660292 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/RequestInfoOperations.java
@@ -188,4 +188,4 @@ public interface RequestInfoOperations
    * @specnote as defined in the Suns 1.5 JDK API.
    */
   short sync_scope();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/SUCCESSFUL.java b/libjava/classpath/org/omg/PortableInterceptor/SUCCESSFUL.java
index d26e032ab14..64ff72ab3cd 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/SUCCESSFUL.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/SUCCESSFUL.java
@@ -51,4 +51,4 @@ public interface SUCCESSFUL
    * Specifies the SUCCESSFUL value, 0.
    */
   short value = 0;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java b/libjava/classpath/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java
index 9edf2ba2136..10f8dcea097 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java
@@ -52,4 +52,4 @@ public interface SYSTEM_EXCEPTION
    * Specifies the SYSTEM_EXCEPTION value, 1.
    */
   short value = 1;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java b/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
index 84ffdfa8e66..34240e81aaf 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerIdHelper.java
@@ -50,7 +50,7 @@ import org.omg.CORBA.portable.OutputStream;
  * The Server Id is defined in OMG specification just as a narrow (not wide)
  * string. As such, the Server Id needs no helper, but one is included in
  * the API anyway.
- * 
+ *
  * @since 1.5
  *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
@@ -116,4 +116,4 @@ public abstract class ServerIdHelper
   {
     output.write_string(value);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfo.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfo.java
index 2aeba2b419c..9136ca7e0b6 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfo.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfo.java
@@ -51,4 +51,4 @@ public interface ServerRequestInfo extends ServerRequestInfoOperations,
   IDLEntity,
   RequestInfo
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
index 52de9d824c0..e03145e863c 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInfoOperations.java
@@ -305,7 +305,7 @@ public interface ServerRequestInfoOperations
   /**
    * Returns the name of the adapter that is handling the current request.
    * The name is returned as a string array, representing full path from
-   * the root poa till the current poa, for instance 
+   * the root poa till the current poa, for instance
    * {"RootPOA", "childPOA","grandchildPOA"}.
    */
   public String[] adapter_name();
@@ -313,15 +313,15 @@ public interface ServerRequestInfoOperations
   /**
    * Returns the id of the ORB that is handling the current request. The ORB
    * id can be specified as the property org.omg.CORBA.ORBid when creating
-   * the ORB. 
+   * the ORB.
    */
   public String orb_id();
 
   /**
    * Returs the id of the server that is handling the current request. The server
-   * id is the same for all POAs and ORBs in the current virtual machine and 
+   * id is the same for all POAs and ORBs in the current virtual machine and
    * can be set as the property org.omg.CORBA.ServerId when creating one of the
    * ORBs.
    */
   public String server_id();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java
index e74872f6b33..db6c7a7d67c 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java
@@ -51,4 +51,4 @@ public interface ServerRequestInterceptor extends Interceptor,
   org.omg.CORBA.Object,
   IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
index ccba1a76efa..e6af9503d8e 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java
@@ -54,7 +54,7 @@ public interface ServerRequestInterceptorOperations
    * ORB calls this method before invoking the servant manager. Operation
    * parameters are not available at this point. The interceptor has possibility
    * to forward the request by throwing {@link ForwardRequest}.
-   * 
+   *
    * @throws SystemException if it does, the receive_request_service_contexts is
    *           not called for the subsequent interceptors, calling
    *           send_exception instead. The completion status of such exception
@@ -133,4 +133,4 @@ public interface ServerRequestInterceptorOperations
    * successive interceptors receive on their calls to send_other.
    */
   void send_other(ServerRequestInfo info) throws ForwardRequest;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java b/libjava/classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java
index 115cad2fc4f..047ed20e912 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java
@@ -52,4 +52,4 @@ public interface TRANSPORT_RETRY
    * Specifies the TRANSPORT_RETRY value, 4.
    */
   short value = 4;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java b/libjava/classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java
index 02c9535b4f3..44c3018a9d9 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java
@@ -52,4 +52,4 @@ public interface USER_EXCEPTION
    * Specifies the USER_EXCEPTION value, 2.
    */
   short value = 2;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java b/libjava/classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java
index 52856407a54..9e8fa0399a6 100644
--- a/libjava/classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java
+++ b/libjava/classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java
@@ -53,20 +53,20 @@ import java.io.Serializable;
  * {@link IORInterceptor_3_0} methods contain the code for remote invocaton. The
  * stub is required by {@link IORInterceptor_3_0Helper} .read, .narrow and
  * .unchecked_narrow methods.
- * 
+ *
  * @specnote Being not specified in 1.5 API, this class is package private.
  * From that happened to some other stubs, it will likely to appear in the 1.6
- * or later. Because of this, it is placed here. 
- * 
+ * or later. Because of this, it is placed here.
+ *
  * @specnote The stub and the helper support the existence of the interceptor
- * on the remote side only. To support the corresponding support on the side 
+ * on the remote side only. To support the corresponding support on the side
  * where the ORB is registered with this interceptor, you also need
  * _IORInfoStub, IORInfoHelper and either servants or implementation bases
  * for both POA and IORInfo. These classes are not defined in the 1.5 API,
  * hence they are not included. You may need to generate the manually from
- * the IDL descriptions, available from 
+ * the IDL descriptions, available from
  * http://www.omg.org/docs/formal/04-03-12.pdf.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 class _IORInterceptor_3_0Stub
@@ -269,4 +269,4 @@ class _IORInterceptor_3_0Stub
         _releaseReply(input);
       }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/AdapterActivator.java b/libjava/classpath/org/omg/PortableServer/AdapterActivator.java
index 9898c437a6f..278f3920776 100644
--- a/libjava/classpath/org/omg/PortableServer/AdapterActivator.java
+++ b/libjava/classpath/org/omg/PortableServer/AdapterActivator.java
@@ -59,4 +59,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface AdapterActivator
   extends AdapterActivatorOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java b/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java
index d1091852e7a..f2065252d02 100644
--- a/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/AdapterActivatorOperations.java
@@ -65,4 +65,4 @@ public interface AdapterActivatorOperations
   * the remote exception ({@link OBJECT_NOT_EXIST}, minor code 2).
   */
   boolean unknown_adapter(POA parent, String child_name);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/Current.java b/libjava/classpath/org/omg/PortableServer/Current.java
index 842086746af..7bce10e043d 100644
--- a/libjava/classpath/org/omg/PortableServer/Current.java
+++ b/libjava/classpath/org/omg/PortableServer/Current.java
@@ -60,4 +60,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface Current
   extends CurrentOperations, org.omg.CORBA.Current, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/CurrentHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentHelper.java
index f201e38bc1b..a81e839d052 100644
--- a/libjava/classpath/org/omg/PortableServer/CurrentHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/CurrentHelper.java
@@ -141,4 +141,4 @@ public abstract class CurrentHelper
   {
     throw new NO_IMPLEMENT();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/CurrentOperations.java b/libjava/classpath/org/omg/PortableServer/CurrentOperations.java
index b2f23f2004d..58bc3141dc7 100644
--- a/libjava/classpath/org/omg/PortableServer/CurrentOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/CurrentOperations.java
@@ -78,4 +78,4 @@ public interface CurrentOperations
    */
   POA get_POA()
        throws NoContext;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java
index c2305ffd8dd..9d42174bf78 100644
--- a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java
+++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContext.java
@@ -79,4 +79,4 @@ public final class NoContext
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
index 4a2a9a6a096..2aa9268ae7e 100644
--- a/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/CurrentPackage/NoContextHelper.java
@@ -99,7 +99,7 @@ public abstract class NoContextHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("NoContext expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -140,4 +140,4 @@ public abstract class NoContextHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/DynamicImplementation.java b/libjava/classpath/org/omg/PortableServer/DynamicImplementation.java
index 6a333e18e17..f43fbf92196 100644
--- a/libjava/classpath/org/omg/PortableServer/DynamicImplementation.java
+++ b/libjava/classpath/org/omg/PortableServer/DynamicImplementation.java
@@ -55,4 +55,4 @@ public abstract class DynamicImplementation
    * and return results of the invocation.
    */
   public abstract void invoke(ServerRequest request);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ForwardRequest.java b/libjava/classpath/org/omg/PortableServer/ForwardRequest.java
index 3976de64fc4..c9d20b34544 100644
--- a/libjava/classpath/org/omg/PortableServer/ForwardRequest.java
+++ b/libjava/classpath/org/omg/PortableServer/ForwardRequest.java
@@ -105,4 +105,4 @@ public final class ForwardRequest
   {
     this.forward_reference = a_forward_reference;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
index 0ebbc7e41b1..83e5707c604 100644
--- a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java
@@ -78,7 +78,7 @@ public abstract class ForwardRequestHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ForwardRequest expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
index a283ce6bb99..f70660d76a4 100644
--- a/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
+++ b/libjava/classpath/org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java
@@ -50,4 +50,4 @@ public interface ID_ASSIGNMENT_POLICY_ID
    * Specifies the ID_ASSIGNMENT_POLICY_ID value, 19.
    */
   int value = 19;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
index 8518831d686..f69defcaa18 100644
--- a/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
+++ b/libjava/classpath/org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java
@@ -50,4 +50,4 @@ public interface ID_UNIQUENESS_POLICY_ID
    * Specifies the ID_UNIQUENESS_POLICY_ID value, 18.
    */
   int value = 18;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java b/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
index c46e79881bd..c76e1801cd7 100644
--- a/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
+++ b/libjava/classpath/org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java
@@ -50,4 +50,4 @@ public interface IMPLICIT_ACTIVATION_POLICY_ID
    * Specifies the IMPLICIT_ACTIVATION_POLICY_ID value, 20.
    */
   int value = 20;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicy.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicy.java
index cde9e11af78..15ccf4f6ea0 100644
--- a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicy.java
@@ -55,4 +55,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface IdAssignmentPolicy
   extends Policy, IdAssignmentPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyOperations.java
index 993a7804ae2..88c39d73d11 100644
--- a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyOperations.java
@@ -52,4 +52,4 @@ public interface IdAssignmentPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   IdAssignmentPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
index cc6f3962a08..9e52b9889fa 100644
--- a/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/IdAssignmentPolicyValue.java
@@ -155,4 +155,4 @@ public class IdAssignmentPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicy.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicy.java
index f78e87e0d3e..ba2894c7ce9 100644
--- a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicy.java
@@ -54,4 +54,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface IdUniquenessPolicy
   extends Policy, IdUniquenessPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyOperations.java
index 3019396b5df..1295f88f39c 100644
--- a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyOperations.java
@@ -52,4 +52,4 @@ public interface IdUniquenessPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   IdUniquenessPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
index 0294ee20997..848671d1da8 100644
--- a/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/IdUniquenessPolicyValue.java
@@ -155,4 +155,4 @@ public class IdUniquenessPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicy.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicy.java
index c3859d203d8..786e5fa7257 100644
--- a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicy.java
@@ -54,4 +54,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface ImplicitActivationPolicy
   extends Policy, ImplicitActivationPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
index d855ec82e6b..9b6136a1cf6 100644
--- a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyOperations.java
@@ -52,4 +52,4 @@ public interface ImplicitActivationPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   ImplicitActivationPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
index 6631424c47d..3e4049bb3f9 100644
--- a/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ImplicitActivationPolicyValue.java
@@ -155,4 +155,4 @@ public class ImplicitActivationPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicy.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicy.java
index 2e77bbe6f36..2b96bf185e5 100644
--- a/libjava/classpath/org/omg/PortableServer/LifespanPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicy.java
@@ -55,4 +55,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface LifespanPolicy
   extends Policy, LifespanPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicyOperations.java
index 20eda700e19..5eac1599ebe 100644
--- a/libjava/classpath/org/omg/PortableServer/LifespanPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicyOperations.java
@@ -52,4 +52,4 @@ public interface LifespanPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   LifespanPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
index e1ab856b031..2be37fb37e3 100644
--- a/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/LifespanPolicyValue.java
@@ -152,4 +152,4 @@ public class LifespanPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POA.java b/libjava/classpath/org/omg/PortableServer/POA.java
index 624d658da74..cddeac63f02 100644
--- a/libjava/classpath/org/omg/PortableServer/POA.java
+++ b/libjava/classpath/org/omg/PortableServer/POA.java
@@ -63,4 +63,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface POA
   extends POAOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAHelper.java b/libjava/classpath/org/omg/PortableServer/POAHelper.java
index 122cfb304c0..6eb5ab54296 100644
--- a/libjava/classpath/org/omg/PortableServer/POAHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAHelper.java
@@ -151,4 +151,4 @@ public abstract class POAHelper
     m.minor = Minor.Inappropriate;
     throw m;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAManager.java b/libjava/classpath/org/omg/PortableServer/POAManager.java
index 6d93eb31ec1..72aa22f9d19 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManager.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManager.java
@@ -60,4 +60,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface POAManager
   extends POAManagerOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerOperations.java b/libjava/classpath/org/omg/PortableServer/POAManagerOperations.java
index 90206d452d8..251bbe4b174 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerOperations.java
@@ -138,4 +138,4 @@ public interface POAManagerOperations
    */
   void hold_requests(boolean wait_for_completion)
               throws AdapterInactive;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
index 55115c259aa..f0f729920a0 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactive.java
@@ -76,4 +76,4 @@ public final class AdapterInactive
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
index e6a3068af0a..d7d0336b763 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java
@@ -98,7 +98,7 @@ public abstract class AdapterInactiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("AdapterInactive expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -139,4 +139,4 @@ public abstract class AdapterInactiveHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
index b32d420a85c..72a09703846 100644
--- a/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
+++ b/libjava/classpath/org/omg/PortableServer/POAManagerPackage/State.java
@@ -144,7 +144,7 @@ public class State
 
   /**
    * Returns the State, matching the given integer constant.
-   * 
+   *
    * @param code one of _HOLDING, _ACTIVE, _DISCARDING, _INACTIVE.
    * @return one of HOLDING, ACTIVE, DISCARDING, INACTIVE.
    * @throws BAD_PARAM if the parameter is not one of the valid values.
@@ -165,7 +165,7 @@ public class State
 
   /**
    * Returns a short string representation.
-   * 
+   *
    * @return the name of the current enumeration value.
    */
   public String toString()
@@ -181,4 +181,4 @@ public class State
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAOperations.java b/libjava/classpath/org/omg/PortableServer/POAOperations.java
index 58d062d2bc6..f989d26819e 100644
--- a/libjava/classpath/org/omg/PortableServer/POAOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/POAOperations.java
@@ -526,4 +526,4 @@ public interface POAOperations
   */
   IdAssignmentPolicy create_id_assignment_policy(IdAssignmentPolicyValue value);
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
index c7e43f01db3..602ce1dba32 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java
@@ -76,4 +76,4 @@ public final class AdapterAlreadyExists
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
index 6476eeaa5ac..ccb3fa584c6 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java
@@ -149,4 +149,4 @@ public abstract class AdapterAlreadyExistsHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
index a7ad6184856..c7f87bccf16 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistent.java
@@ -76,4 +76,4 @@ public final class AdapterNonExistent
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
index 1c007fb43b9..65842b756f0 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java
@@ -107,7 +107,7 @@ public abstract class AdapterNonExistentHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("AdapterNonExistent expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class AdapterNonExistentHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java
index 470d9af4a0c..43ea544d3f2 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicy.java
@@ -106,4 +106,4 @@ public final class InvalidPolicy
   {
     return super.getMessage() + " at index " + index;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
index cb3c6702442..64cdaadbf55 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java
@@ -112,7 +112,7 @@ public abstract class InvalidPolicyHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("InvalidPolicy expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java
index cc786a3ea14..a3d7b043772 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServant.java
@@ -76,4 +76,4 @@ public final class NoServant
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
index 56e8c4d16d9..cfb63ed2673 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/NoServantHelper.java
@@ -107,7 +107,7 @@ public abstract class NoServantHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("NoServant expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class NoServantHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
index f14e5c91bad..9a80b95f8d1 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java
@@ -75,4 +75,4 @@ public final class ObjectAlreadyActive
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
index 7f2e1484c08..48070eade1d 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java
@@ -108,7 +108,7 @@ public abstract class ObjectAlreadyActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ObjectAlreadyActive expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -149,4 +149,4 @@ public abstract class ObjectAlreadyActiveHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java
index 823c8ead5fd..e8f0bc6bb52 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActive.java
@@ -76,4 +76,4 @@ public final class ObjectNotActive
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
index 4cdf80891cd..492040dd2fa 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java
@@ -107,7 +107,7 @@ public abstract class ObjectNotActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ObjectNotActive expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class ObjectNotActiveHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
index 4f2b1586a6b..a6fd5da24f1 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActive.java
@@ -80,4 +80,4 @@ public final class ServantAlreadyActive
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
index 30b0b52d021..8fdb1ec157d 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java
@@ -108,7 +108,7 @@ public abstract class ServantAlreadyActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServantAlreadyActive expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -149,4 +149,4 @@ public abstract class ServantAlreadyActiveHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java
index 2383b278612..584459939e5 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActive.java
@@ -76,4 +76,4 @@ public final class ServantNotActive
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
index f77ecfc50a6..99110e51114 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java
@@ -107,7 +107,7 @@ public abstract class ServantNotActiveHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("ServantNotActive expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class ServantNotActiveHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java
index 81b4ffb9788..8e28e84308e 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapter.java
@@ -77,4 +77,4 @@ public final class WrongAdapter
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
index f1181fe61e5..69ffda747fc 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongAdapterHelper.java
@@ -107,7 +107,7 @@ public abstract class WrongAdapterHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("WrongAdapter expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class WrongAdapterHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java
index b2102dcbcc0..e0dbc990281 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicy.java
@@ -76,4 +76,4 @@ public final class WrongPolicy
   {
     super(why);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
index bd09c2e9643..9122b06e432 100644
--- a/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/POAPackage/WrongPolicyHelper.java
@@ -107,7 +107,7 @@ public abstract class WrongPolicyHelper
     catch (ClassCastException cex)
       {
         BAD_OPERATION bad = new BAD_OPERATION("WrongPolicy expected");
-        bad.minor = Minor.Any;        
+        bad.minor = Minor.Any;
         bad.initCause(cex);
         throw bad;
       }
@@ -148,4 +148,4 @@ public abstract class WrongPolicyHelper
     // Write the exception repository id.
     output.write_string(id());
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicy.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicy.java
index 1b37d9f1566..9d3237d7dee 100644
--- a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicy.java
@@ -56,4 +56,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface RequestProcessingPolicy
   extends Policy, RequestProcessingPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyOperations.java
index 672ba1846e6..5a8963b3024 100644
--- a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyOperations.java
@@ -52,4 +52,4 @@ public interface RequestProcessingPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   RequestProcessingPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
index 2f22e309082..e946d5cf6bf 100644
--- a/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/RequestProcessingPolicyValue.java
@@ -178,4 +178,4 @@ public class RequestProcessingPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/Servant.java b/libjava/classpath/org/omg/PortableServer/Servant.java
index fcb2cdd6a3c..53b05f1e5bb 100644
--- a/libjava/classpath/org/omg/PortableServer/Servant.java
+++ b/libjava/classpath/org/omg/PortableServer/Servant.java
@@ -112,7 +112,7 @@ public abstract class Servant
   {
     if (delegate == null) {
       throw new BAD_INV_ORDER
-	("The Servant has not been associated with an ORBinstance");
+        ("The Servant has not been associated with an ORBinstance");
     }
     return delegate;
   }
@@ -293,4 +293,4 @@ public abstract class Servant
       }
     throw new OBJECT_NOT_EXIST();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivator.java b/libjava/classpath/org/omg/PortableServer/ServantActivator.java
index 244fedf5f4c..82cfbda0dc5 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantActivator.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantActivator.java
@@ -56,4 +56,4 @@ public interface ServantActivator
   extends ServantManager, ServantActivatorOperations, IDLEntity,
           org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
index 48598aa20e0..d0fe8732cf3 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantActivatorHelper.java
@@ -115,24 +115,24 @@ public abstract class ServantActivatorHelper
         throw bad;
       }
   }
-  
+
   /**
    * Narrow the given object to the ServantActivator. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted ServantActivator.
-   * 
-   * @since 1.5 
+   *
+   * @since 1.5
    */
   public static ServantActivator unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }  
-  
+  }
+
 
   /**
    * This should read the servant activator, but it cannot be transferred
@@ -167,4 +167,4 @@ public abstract class ServantActivatorHelper
     m.minor = Minor.Inappropriate;
     throw m;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivatorOperations.java b/libjava/classpath/org/omg/PortableServer/ServantActivatorOperations.java
index 6437f356329..22fba9d9e0b 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantActivatorOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantActivatorOperations.java
@@ -91,4 +91,4 @@ public interface ServantActivatorOperations
    */
   Servant incarnate(byte[] Object_Id, POA poa)
              throws ForwardRequest;
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantActivatorPOA.java b/libjava/classpath/org/omg/PortableServer/ServantActivatorPOA.java
index c94866ab259..a6460fa1445 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantActivatorPOA.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantActivatorPOA.java
@@ -58,7 +58,7 @@ import org.omg.CORBA.portable.ResponseHandler;
  * You do not need to derive your servant activator from this stub,
  * it is enough to implement the {@link ServantActivator} interface.
  * But you may choose to do this if you need the functional
- * {@link #_all_interfaces(POA, byte[])} method or want to keep default 
+ * {@link #_all_interfaces(POA, byte[])} method or want to keep default
  * behavior during the incarnation or etherialization.
  * </p>
  */
@@ -134,4 +134,4 @@ public abstract class ServantActivatorPOA
   {
     return new delegator(this);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocator.java b/libjava/classpath/org/omg/PortableServer/ServantLocator.java
index 9989fd49b2a..564048d4575 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocator.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocator.java
@@ -56,4 +56,4 @@ public interface ServantLocator
   extends ServantManager, ServantLocatorOperations, IDLEntity,
           org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java
index 467464791da..f22fff9ebd5 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorHelper.java
@@ -116,23 +116,23 @@ public abstract class ServantLocatorHelper
         throw bad;
       }
   }
-  
+
   /**
    * Narrow the given object to the ServantLocator. For the objects that are
    * always local, this operation does not differ from the ordinary
    * {@link #narrow} (ClassCastException will be thrown if narrowing something
    * different). See OMG issue 4158.
-   * 
+   *
    * @param obj the object to cast.
-   * 
+   *
    * @return the casted ServantLocator.
-   * 
+   *
    * @since 1.5
    */
   public static ServantLocator unchecked_narrow(org.omg.CORBA.Object obj)
   {
     return narrow(obj);
-  }    
+  }
 
   /**
    * This should read the servant locator, but it cannot be transferred
@@ -167,4 +167,4 @@ public abstract class ServantLocatorHelper
     m.minor = Minor.Inappropriate;
     throw m;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java
index 58448c1af03..4f357576af1 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorOperations.java
@@ -93,4 +93,4 @@ public interface ServantLocatorOperations
   void postinvoke(byte[] Object_Id, POA poa, String operation,
                   java.lang.Object cookie, Servant servant
                  );
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorPOA.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorPOA.java
index 8e9c7aeb59a..c598aa8bdf1 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocatorPOA.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorPOA.java
@@ -59,7 +59,7 @@ import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
  * You do not need to derive your servant locator from this stub,
  * it is enough to implement the {@link ServantLocator} interface.
  * But you may choose to do this if you need its functional
- * {@link org.omg.PortableServer.ServantActivatorPOA.delegator#_ids()} 
+ * {@link org.omg.PortableServer.ServantActivatorPOA.delegator#_ids()}
  * method or want to keep default behaviour during pre- or post- invokcations.
  * </p>
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
@@ -143,4 +143,4 @@ public abstract class ServantLocatorPOA
       return THIS._all_interfaces(null, null);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
index ebae51b605c..ff23e7fd123 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java
@@ -111,4 +111,4 @@ public final class CookieHolder
   {
     throw new NO_IMPLEMENT();
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantManager.java b/libjava/classpath/org/omg/PortableServer/ServantManager.java
index 082aea34ea6..f361f04308d 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantManager.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantManager.java
@@ -53,4 +53,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface ServantManager
   extends ServantManagerOperations, IDLEntity, org.omg.CORBA.Object
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantManagerOperations.java b/libjava/classpath/org/omg/PortableServer/ServantManagerOperations.java
index b7c3b753bb9..374b791a199 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantManagerOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantManagerOperations.java
@@ -51,4 +51,4 @@ package org.omg.PortableServer;
  */
 public interface ServantManagerOperations
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicy.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicy.java
index ee47af517e3..3da47d3d87c 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicy.java
@@ -55,4 +55,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface ServantRetentionPolicy
   extends Policy, ServantRetentionPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyOperations.java
index 2ef0ab55405..3a9ee0a7cfd 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyOperations.java
@@ -52,4 +52,4 @@ public interface ServantRetentionPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   ServantRetentionPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
index 607df1293a1..4dffe7d7f8b 100644
--- a/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ServantRetentionPolicyValue.java
@@ -152,4 +152,4 @@ public class ServantRetentionPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ThreadPolicy.java b/libjava/classpath/org/omg/PortableServer/ThreadPolicy.java
index b16ac17371c..77fe0a67c63 100644
--- a/libjava/classpath/org/omg/PortableServer/ThreadPolicy.java
+++ b/libjava/classpath/org/omg/PortableServer/ThreadPolicy.java
@@ -54,4 +54,4 @@ import org.omg.CORBA.portable.IDLEntity;
 public interface ThreadPolicy
   extends Policy, ThreadPolicyOperations, IDLEntity
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ThreadPolicyOperations.java b/libjava/classpath/org/omg/PortableServer/ThreadPolicyOperations.java
index b3662881653..09835614f76 100644
--- a/libjava/classpath/org/omg/PortableServer/ThreadPolicyOperations.java
+++ b/libjava/classpath/org/omg/PortableServer/ThreadPolicyOperations.java
@@ -52,4 +52,4 @@ public interface ThreadPolicyOperations
    * Return the value of this policy type, stated by the current instance.
    */
   ThreadPolicyValue value();
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
index 2ba1b8e821d..4e1422dcd5a 100644
--- a/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
+++ b/libjava/classpath/org/omg/PortableServer/ThreadPolicyValue.java
@@ -165,4 +165,4 @@ public class ThreadPolicyValue
   {
     return _value;
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java
index 3cc4be9909a..658ac683c30 100644
--- a/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java
+++ b/libjava/classpath/org/omg/PortableServer/_ServantActivatorStub.java
@@ -121,4 +121,4 @@ public class _ServantActivatorStub
                          )
   {
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java
index 9bbd58f8848..039140ebc25 100644
--- a/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java
+++ b/libjava/classpath/org/omg/PortableServer/_ServantLocatorStub.java
@@ -130,4 +130,4 @@ public class _ServantLocatorStub
                         )
   {
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/PortableServer/portable/Delegate.java b/libjava/classpath/org/omg/PortableServer/portable/Delegate.java
index 3c61122b70c..32697fdfb87 100644
--- a/libjava/classpath/org/omg/PortableServer/portable/Delegate.java
+++ b/libjava/classpath/org/omg/PortableServer/portable/Delegate.java
@@ -109,4 +109,4 @@ public interface Delegate
   * given servant.
   */
   org.omg.CORBA.Object this_object(Servant a_servant);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/SendingContext/RunTime.java b/libjava/classpath/org/omg/SendingContext/RunTime.java
index 09d3d505b54..ac0b888b29b 100644
--- a/libjava/classpath/org/omg/SendingContext/RunTime.java
+++ b/libjava/classpath/org/omg/SendingContext/RunTime.java
@@ -57,4 +57,4 @@ import java.io.Serializable;
 public interface RunTime
   extends IDLEntity, Object, RunTimeOperations, Serializable
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/org/omg/SendingContext/RunTimeOperations.java b/libjava/classpath/org/omg/SendingContext/RunTimeOperations.java
index dabcb74c04d..413364575e0 100644
--- a/libjava/classpath/org/omg/SendingContext/RunTimeOperations.java
+++ b/libjava/classpath/org/omg/SendingContext/RunTimeOperations.java
@@ -54,4 +54,4 @@ package org.omg.SendingContext;
  */
 public interface RunTimeOperations
 {
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/sun/misc/Service.java b/libjava/classpath/sun/misc/Service.java
index bdcbbfe2ff2..88ff509de7a 100644
--- a/libjava/classpath/sun/misc/Service.java
+++ b/libjava/classpath/sun/misc/Service.java
@@ -54,13 +54,12 @@ public class Service
    * implemented by any loaded service providers.
    * @param cl the class loader that will be used to load the
    * service providers, or <code>null</code> for the system class
-   * loader. 
+   * loader.
    * @return an iterator over the service providers.
-   */  
+   */
   public static <P> Iterator<P> providers(Class<P> c, ClassLoader cl)
   {
     return (Iterator<P>) ServiceFactory.lookupProviders(c, cl);
   }
 
 }
-
diff --git a/libjava/classpath/sun/misc/ServiceConfigurationError.java b/libjava/classpath/sun/misc/ServiceConfigurationError.java
index 9c29d6e8c1e..e66aad7ffa4 100644
--- a/libjava/classpath/sun/misc/ServiceConfigurationError.java
+++ b/libjava/classpath/sun/misc/ServiceConfigurationError.java
@@ -61,4 +61,3 @@ public class ServiceConfigurationError
 
 
 }
-
diff --git a/libjava/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java b/libjava/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java
index f132d81bad8..909e7ae1f2d 100644
--- a/libjava/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java
+++ b/libjava/classpath/sun/reflect/annotation/AnnotationInvocationHandler.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -79,19 +79,19 @@ public final class AnnotationInvocationHandler
     public static Annotation create(Class type, Map memberValues)
     {
       for (Method m : type.getDeclaredMethods())
-	{
-	  String name = m.getName();
-	  if (! memberValues.containsKey(name))
-	    {
-	      // FIXME: what to do about exceptions here?
-	      memberValues.put(name, m.getDefaultValue());
-	    }
-	}
+        {
+          String name = m.getName();
+          if (! memberValues.containsKey(name))
+            {
+              // FIXME: what to do about exceptions here?
+              memberValues.put(name, m.getDefaultValue());
+            }
+        }
       AnnotationInvocationHandler handler
-	= new AnnotationInvocationHandler(type, memberValues);
+        = new AnnotationInvocationHandler(type, memberValues);
       return (Annotation) Proxy.newProxyInstance(type.getClassLoader(),
-						 new Class[] { type },
-						 handler);
+                                                 new Class[] { type },
+                                                 handler);
     }
 
     /**
@@ -318,31 +318,31 @@ public final class AnnotationInvocationHandler
     private Object arrayClone(Object obj)
     {
         if (obj instanceof boolean[])
-	    return ((boolean[]) obj).clone();
+            return ((boolean[]) obj).clone();
 
         if (obj instanceof byte[])
-	    return ((byte[]) obj).clone();
+            return ((byte[]) obj).clone();
 
         if (obj instanceof char[])
-	    return ((char[]) obj).clone();
+            return ((char[]) obj).clone();
 
         if (obj instanceof short[])
-	    return ((short[]) obj).clone();
+            return ((short[]) obj).clone();
 
         if (obj instanceof int[])
-	    return ((int[]) obj).clone();
+            return ((int[]) obj).clone();
 
         if (obj instanceof float[])
-	    return ((float[]) obj).clone();
+            return ((float[]) obj).clone();
 
         if (obj instanceof long[])
-	    return ((long[]) obj).clone();
+            return ((long[]) obj).clone();
 
         if (obj instanceof double[])
-	    return ((double[]) obj).clone();
+            return ((double[]) obj).clone();
 
         if (obj instanceof Object[])
-	    return ((Object[]) obj).clone();
+            return ((Object[]) obj).clone();
 
         return obj;
     }
@@ -377,10 +377,10 @@ public final class AnnotationInvocationHandler
                     throw new AnnotationTypeMismatchException(method,
                         val.getClass().getName());
                 }
-		if (val.getClass().isArray())
-		{
-		    val = arrayClone(val);
-		}
+                if (val.getClass().isArray())
+                {
+                    val = arrayClone(val);
+                }
                 return val;
             }
         }
diff --git a/libjava/classpath/sun/reflect/annotation/AnnotationParser.java b/libjava/classpath/sun/reflect/annotation/AnnotationParser.java
index a5452d09014..bce3057c4ab 100644
--- a/libjava/classpath/sun/reflect/annotation/AnnotationParser.java
+++ b/libjava/classpath/sun/reflect/annotation/AnnotationParser.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -48,7 +48,7 @@ public class AnnotationParser
 {
 
   public static Annotation annotationForMap(Class<? extends Annotation> annoType,
-					    Map<String, Object> map)
+                                            Map<String, Object> map)
     throws NotImplementedException
   {
     return null;
diff --git a/libjava/classpath/sun/reflect/annotation/AnnotationType.java b/libjava/classpath/sun/reflect/annotation/AnnotationType.java
index 38d8aa8603c..6bd231bdb17 100644
--- a/libjava/classpath/sun/reflect/annotation/AnnotationType.java
+++ b/libjava/classpath/sun/reflect/annotation/AnnotationType.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java b/libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
index 33b0daefa35..c2f28561eb6 100644
--- a/libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
+++ b/libjava/classpath/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/sun/reflect/annotation/ExceptionProxy.java b/libjava/classpath/sun/reflect/annotation/ExceptionProxy.java
index 97556c71051..c79070482c4 100644
--- a/libjava/classpath/sun/reflect/annotation/ExceptionProxy.java
+++ b/libjava/classpath/sun/reflect/annotation/ExceptionProxy.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
diff --git a/libjava/classpath/tools/com/sun/javadoc/ClassDoc.java b/libjava/classpath/tools/com/sun/javadoc/ClassDoc.java
index a4fa40a7cf7..6309f9472cc 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ClassDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ClassDoc.java
@@ -319,4 +319,3 @@ TypeVariable[]
 typeParameters();
 
 } // interface ClassDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/ConstructorDoc.java b/libjava/classpath/tools/com/sun/javadoc/ConstructorDoc.java
index e9db4591c79..88c8d3ddbd3 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ConstructorDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ConstructorDoc.java
@@ -54,4 +54,3 @@ public abstract String
 qualifiedName();
 
 } // interface ConstructorDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/Doc.java b/libjava/classpath/tools/com/sun/javadoc/Doc.java
index 425c85718f2..554720d69d5 100644
--- a/libjava/classpath/tools/com/sun/javadoc/Doc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/Doc.java
@@ -262,4 +262,3 @@ public abstract SourcePosition
 position();
 
 } // interface Doc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/DocErrorReporter.java b/libjava/classpath/tools/com/sun/javadoc/DocErrorReporter.java
index c4d05e7006d..2e801b848bf 100644
--- a/libjava/classpath/tools/com/sun/javadoc/DocErrorReporter.java
+++ b/libjava/classpath/tools/com/sun/javadoc/DocErrorReporter.java
@@ -74,4 +74,3 @@ public abstract void
 printNotice(String notice);
 
 } // interface DocErrorReporter
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/Doclet.java b/libjava/classpath/tools/com/sun/javadoc/Doclet.java
index 7ce4b29ef96..172387ebb1b 100644
--- a/libjava/classpath/tools/com/sun/javadoc/Doclet.java
+++ b/libjava/classpath/tools/com/sun/javadoc/Doclet.java
@@ -96,4 +96,3 @@ validOptions(String[][] opts, DocErrorReporter logger)
 }
 
 } // class Doclet
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java b/libjava/classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java
index 8d4ddab6694..ac0ca06f787 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ExecutableMemberDoc.java
@@ -135,4 +135,3 @@ public abstract String
 flatSignature();
 
 } // interface ExecutableMemberDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/FieldDoc.java b/libjava/classpath/tools/com/sun/javadoc/FieldDoc.java
index a5e48c4c147..1fd0c7b83e9 100644
--- a/libjava/classpath/tools/com/sun/javadoc/FieldDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/FieldDoc.java
@@ -110,4 +110,3 @@ constantValueExpression();
 
 
 } // interface FieldDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/MemberDoc.java b/libjava/classpath/tools/com/sun/javadoc/MemberDoc.java
index 8448f12c594..9e755bbd64e 100644
--- a/libjava/classpath/tools/com/sun/javadoc/MemberDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/MemberDoc.java
@@ -57,4 +57,3 @@ public abstract boolean
 isSynthetic();
 
 } // interface MemberDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/MethodDoc.java b/libjava/classpath/tools/com/sun/javadoc/MethodDoc.java
index a24b8ec09eb..87129ef4430 100644
--- a/libjava/classpath/tools/com/sun/javadoc/MethodDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/MethodDoc.java
@@ -77,4 +77,3 @@ public abstract ClassDoc
 overriddenClass();
 
 } // interface MethodDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/PackageDoc.java b/libjava/classpath/tools/com/sun/javadoc/PackageDoc.java
index d544acf5bb9..4518b4ebaf3 100644
--- a/libjava/classpath/tools/com/sun/javadoc/PackageDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/PackageDoc.java
@@ -106,4 +106,3 @@ public abstract ClassDoc
 findClass(String cls);
 
 } // interface PackageDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/ParamTag.java b/libjava/classpath/tools/com/sun/javadoc/ParamTag.java
index 94358637e66..9c060e901e0 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ParamTag.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ParamTag.java
@@ -63,4 +63,3 @@ public abstract String
 parameterName();
 
 } // interface ParamTag
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/Parameter.java b/libjava/classpath/tools/com/sun/javadoc/Parameter.java
index a359a5d9e36..300a3355abd 100644
--- a/libjava/classpath/tools/com/sun/javadoc/Parameter.java
+++ b/libjava/classpath/tools/com/sun/javadoc/Parameter.java
@@ -85,4 +85,3 @@ public abstract String
 toString();
 
 } // interaface Parameter
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/ProgramElementDoc.java b/libjava/classpath/tools/com/sun/javadoc/ProgramElementDoc.java
index 0d6dd464018..061e327e190 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ProgramElementDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ProgramElementDoc.java
@@ -167,4 +167,3 @@ public abstract boolean
 isFinal();
 
 } // interface ProgramElementDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/RootDoc.java b/libjava/classpath/tools/com/sun/javadoc/RootDoc.java
index 0642154087d..18be71dde50 100644
--- a/libjava/classpath/tools/com/sun/javadoc/RootDoc.java
+++ b/libjava/classpath/tools/com/sun/javadoc/RootDoc.java
@@ -48,7 +48,7 @@ public interface RootDoc extends Doc, DocErrorReporter
   /**
    * This method returns the command line element used to invoke this instance
    * of javadoc.
-   * 
+   *
    * @return The command line arguments for this run.
    */
   public abstract String[][] options();
@@ -58,7 +58,7 @@ public interface RootDoc extends Doc, DocErrorReporter
   /**
    * This method returns the list of packages that were specified on the command
    * line.
-   * 
+   *
    * @return The packages specified on the command line.
    */
   public abstract PackageDoc[] specifiedPackages();
@@ -68,7 +68,7 @@ public interface RootDoc extends Doc, DocErrorReporter
   /**
    * This method returns the list of classes that were specified on the command
    * line.
-   * 
+   *
    * @return The classes specified on the command line.
    */
   public abstract ClassDoc[] specifiedClasses();
@@ -77,7 +77,7 @@ public interface RootDoc extends Doc, DocErrorReporter
 
   /**
    * This method returns the list of classes and interfaces to be documented.
-   * 
+   *
    * @return The list of classes and interfaces to be documented.
    */
   public abstract ClassDoc[] classes();
@@ -87,7 +87,7 @@ public interface RootDoc extends Doc, DocErrorReporter
   /**
    * This method returns a <code>ClassDoc</code> instance for the name class
    * or interface.
-   * 
+   *
    * @param name
    *          The class or interface to look up.
    * @return The requested <code>ClassDoc</code>, or null if the specified
@@ -100,7 +100,7 @@ public interface RootDoc extends Doc, DocErrorReporter
   /**
    * This method returns a <code>PackageDoc</code> instance for the named
    * package.
-   * 
+   *
    * @param name
    *          The package to look up.
    * @return The requested <code>PackageDoc</code>, or null if the specified
@@ -109,4 +109,3 @@ public interface RootDoc extends Doc, DocErrorReporter
   public abstract PackageDoc packageNamed(String name);
 
 } // interface RootDoc
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/SeeTag.java b/libjava/classpath/tools/com/sun/javadoc/SeeTag.java
index 12a2e934b28..7e5b305ae07 100644
--- a/libjava/classpath/tools/com/sun/javadoc/SeeTag.java
+++ b/libjava/classpath/tools/com/sun/javadoc/SeeTag.java
@@ -106,4 +106,3 @@ public abstract MemberDoc
 referencedMember();
 
 } // interface SeeTag
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/SerialFieldTag.java b/libjava/classpath/tools/com/sun/javadoc/SerialFieldTag.java
index 9f5fa9accc9..ef692834c96 100644
--- a/libjava/classpath/tools/com/sun/javadoc/SerialFieldTag.java
+++ b/libjava/classpath/tools/com/sun/javadoc/SerialFieldTag.java
@@ -99,4 +99,3 @@ public abstract int
 compareTo(Object obj);
 
 } // interface SerialFieldTag
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/Tag.java b/libjava/classpath/tools/com/sun/javadoc/Tag.java
index f0322127325..88745cb9880 100644
--- a/libjava/classpath/tools/com/sun/javadoc/Tag.java
+++ b/libjava/classpath/tools/com/sun/javadoc/Tag.java
@@ -104,4 +104,3 @@ public abstract Tag[]
 firstSentenceTags();
 
 } // interface Tag
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/ThrowsTag.java b/libjava/classpath/tools/com/sun/javadoc/ThrowsTag.java
index 72a43949e42..0d5a98e8566 100644
--- a/libjava/classpath/tools/com/sun/javadoc/ThrowsTag.java
+++ b/libjava/classpath/tools/com/sun/javadoc/ThrowsTag.java
@@ -73,4 +73,3 @@ public abstract ClassDoc
 exception();
 
 } // interface ThrowsTag
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/Type.java b/libjava/classpath/tools/com/sun/javadoc/Type.java
index 8d0bd145c94..0aabe0e784e 100644
--- a/libjava/classpath/tools/com/sun/javadoc/Type.java
+++ b/libjava/classpath/tools/com/sun/javadoc/Type.java
@@ -117,4 +117,3 @@ TypeVariable
 asTypeVariable();
 
 } // interface Type
-
diff --git a/libjava/classpath/tools/com/sun/javadoc/TypeVariable.java b/libjava/classpath/tools/com/sun/javadoc/TypeVariable.java
index 4f847d26bc7..94da505070c 100644
--- a/libjava/classpath/tools/com/sun/javadoc/TypeVariable.java
+++ b/libjava/classpath/tools/com/sun/javadoc/TypeVariable.java
@@ -48,8 +48,8 @@ package com.sun.javadoc;
  *
  * @since 1.5
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
- */ 
-public interface TypeVariable 
+ */
+public interface TypeVariable
   extends Type
 {
 
diff --git a/libjava/classpath/tools/com/sun/tools/javadoc/Main.java b/libjava/classpath/tools/com/sun/tools/javadoc/Main.java
index 7f0fc108805..0082d411e25 100644
--- a/libjava/classpath/tools/com/sun/tools/javadoc/Main.java
+++ b/libjava/classpath/tools/com/sun/tools/javadoc/Main.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -39,8 +39,8 @@ package com.sun.tools.javadoc;
 
 public class Main
 {
-	 public static void main(String[] args)
-	 {
-	 	gnu.classpath.tools.gjdoc.Main.main(args);
-	 }
+         public static void main(String[] args)
+         {
+                gnu.classpath.tools.gjdoc.Main.main(args);
+         }
 }
diff --git a/libjava/classpath/tools/com/sun/tools/javah/Main.java b/libjava/classpath/tools/com/sun/tools/javah/Main.java
index 7eb0f37a85c..7faab594e88 100644
--- a/libjava/classpath/tools/com/sun/tools/javah/Main.java
+++ b/libjava/classpath/tools/com/sun/tools/javah/Main.java
@@ -47,12 +47,12 @@ public class Main
   {
     try
       {
-	gnu.classpath.tools.javah.Main.main(args);
+        gnu.classpath.tools.javah.Main.main(args);
       }
     catch (IOException e)
       {
-	throw new IllegalArgumentException("An I/O error occurred " +
-					   "in executing javah", e);
+        throw new IllegalArgumentException("An I/O error occurred " +
+                                           "in executing javah", e);
       }
   }
 }
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java
index 8226ae8cd7f..835b3e0ca89 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationVisitor.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * A visitor to visit a Java annotation. The methods of this interface must be
- * called in the following order: (<tt>visit<tt> | <tt>visitEnum<tt> | 
+ * called in the following order: (<tt>visit<tt> | <tt>visitEnum<tt> |
  * <tt>visitAnnotation<tt> | <tt>visitArray<tt>)* <tt>visitEnd<tt>.
  *
  * @author Eric Bruneton
@@ -41,7 +41,7 @@ public interface AnnotationVisitor {
 
     /**
      * Visits a primitive value of the annotation.
-     * 
+     *
      * @param name the value name.
      * @param value the actual value, whose type must be {@link Byte},
      *        {@link Boolean}, {@link Character}, {@link Short},
@@ -52,7 +52,7 @@ public interface AnnotationVisitor {
 
     /**
      * Visits an enumeration value of the annotation.
-     * 
+     *
      * @param name the value name.
      * @param desc the class descriptor of the enumeration class.
      * @param value the actual enumeration value.
@@ -61,7 +61,7 @@ public interface AnnotationVisitor {
 
     /**
      * Visits a nested annotation value of the annotation.
-     * 
+     *
      * @param name the value name.
      * @param desc the class descriptor of the nested annotation class.
      * @return a non null visitor to visit the actual nested annotation value.
@@ -72,7 +72,7 @@ public interface AnnotationVisitor {
 
     /**
      * Visits an array value of the annotation.
-     * 
+     *
      * @param name the value name.
      * @return a non null visitor to visit the actual array value elements. The
      *         'name' parameters passed to the methods of this visitor are
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationWriter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationWriter.java
index 918e23419bf..bf06bc95b57 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationWriter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/AnnotationWriter.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * An {@link AnnotationVisitor} that generates annotations in bytecode form.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -48,7 +48,7 @@ final class AnnotationWriter implements AnnotationVisitor {
     private int size;
 
     /**
-     * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation 
+     * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation
      * writers used for annotation default and annotation arrays use unnamed
      * values.
      */
@@ -89,12 +89,12 @@ final class AnnotationWriter implements AnnotationVisitor {
 
     /**
      * Constructs a new {@link AnnotationWriter}.
-     * 
+     *
      * @param cw the class writer to which this annotation must be added.
      * @param named <tt>true<tt> if values are named, <tt>false</tt> otherwise.
      * @param bv where the annotation values must be stored.
      * @param parent where the number of annotation values must be stored.
-     * @param offset where in <tt>parent</tt> the number of annotation values must 
+     * @param offset where in <tt>parent</tt> the number of annotation values must
      *      be stored.
      */
     AnnotationWriter(
@@ -236,7 +236,7 @@ final class AnnotationWriter implements AnnotationVisitor {
 
     /**
      * Returns the size of this annotation writer list.
-     * 
+     *
      * @return the size of this annotation writer list.
      */
     int getSize() {
@@ -252,7 +252,7 @@ final class AnnotationWriter implements AnnotationVisitor {
     /**
      * Puts the annotations of this annotation writer list into the given byte
      * vector.
-     * 
+     *
      * @param out where the annotations must be put.
      */
     void put(final ByteVector out) {
@@ -279,7 +279,7 @@ final class AnnotationWriter implements AnnotationVisitor {
 
     /**
      * Puts the given annotation lists into the given byte vector.
-     * 
+     *
      * @param panns an array of annotation writer lists.
      * @param out where the annotations must be put.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Attribute.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Attribute.java
index c55eb9324d0..897a33c797d 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Attribute.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Attribute.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * A non standard class, field, method or code attribute.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -46,7 +46,7 @@ public class Attribute {
      * The raw value of this attribute, used only for unknown attributes.
      */
     byte[] value;
-    
+
     /**
      * The next attribute in this attribute list. May be <tt>null</tt>.
      */
@@ -54,7 +54,7 @@ public class Attribute {
 
     /**
      * Constructs a new empty attribute.
-     * 
+     *
      * @param type the type of the attribute.
      */
     protected Attribute(final String type) {
@@ -64,7 +64,7 @@ public class Attribute {
     /**
      * Returns <tt>true</tt> if this type of attribute is unknown. The default
      * implementation of this method always returns <tt>true</tt>.
-     * 
+     *
      * @return <tt>true</tt> if this type of attribute is unknown.
      */
     public boolean isUnknown() {
@@ -73,7 +73,7 @@ public class Attribute {
 
     /**
      * Returns <tt>true</tt> if this type of attribute is a code attribute.
-     * 
+     *
      * @return <tt>true</tt> if this type of attribute is a code attribute.
      */
     public boolean isCodeAttribute() {
@@ -82,7 +82,7 @@ public class Attribute {
 
     /**
      * Returns the labels corresponding to this attribute.
-     * 
+     *
      * @return the labels corresponding to this attribute, or <tt>null</tt> if
      *         this attribute is not a code attribute that contains labels.
      */
@@ -95,7 +95,7 @@ public class Attribute {
      * {@link Attribute} object, of type {@link #type type}, corresponding to
      * the <tt>len</tt> bytes starting at the given offset, in the given class
      * reader.
-     * 
+     *
      * @param cr the class that contains the attribute to be read.
      * @param off index of the first byte of the attribute's content in {@link
      *        ClassReader#b cr.b}. The 6 attribute header bytes, containing the
@@ -132,7 +132,7 @@ public class Attribute {
 
     /**
      * Returns the byte array form of this attribute.
-     * 
+     *
      * @param cw the class to which this attribute must be added. This parameter
      *        can be used to add to the constant pool of this class the items
      *        that corresponds to this attribute.
@@ -165,7 +165,7 @@ public class Attribute {
 
     /**
      * Returns the length of the attribute list that begins with this attribute.
-     * 
+     *
      * @return the length of the attribute list that begins with this attribute.
      */
     final int getCount() {
@@ -180,7 +180,7 @@ public class Attribute {
 
     /**
      * Returns the size of all the attributes in this attribute list.
-     * 
+     *
      * @param cw the class writer to be used to convert the attributes into byte
      *        arrays, with the {@link #write write} method.
      * @param code the bytecode of the method corresponding to these code
@@ -218,7 +218,7 @@ public class Attribute {
     /**
      * Writes all the attributes of this attribute list in the given byte
      * vector.
-     * 
+     *
      * @param cw the class writer to be used to convert the attributes into byte
      *        arrays, with the {@link #write write} method.
      * @param code the bytecode of the method corresponding to these code
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/ByteVector.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/ByteVector.java
index 270778b860e..a1bc3251789 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/ByteVector.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/ByteVector.java
@@ -32,7 +32,7 @@ package org.objectweb.asm;
 /**
  * A dynamically extensible vector of bytes. This class is roughly equivalent to
  * a DataOutputStream on top of a ByteArrayOutputStream, but is more efficient.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ByteVector {
@@ -58,7 +58,7 @@ public class ByteVector {
     /**
      * Constructs a new {@link ByteVector ByteVector} with the given initial
      * size.
-     * 
+     *
      * @param initialSize the initial size of the byte vector to be constructed.
      */
     public ByteVector(final int initialSize) {
@@ -68,7 +68,7 @@ public class ByteVector {
     /**
      * Puts a byte into this byte vector. The byte vector is automatically
      * enlarged if necessary.
-     * 
+     *
      * @param b a byte.
      * @return this byte vector.
      */
@@ -85,7 +85,7 @@ public class ByteVector {
     /**
      * Puts two bytes into this byte vector. The byte vector is automatically
      * enlarged if necessary.
-     * 
+     *
      * @param b1 a byte.
      * @param b2 another byte.
      * @return this byte vector.
@@ -105,7 +105,7 @@ public class ByteVector {
     /**
      * Puts a short into this byte vector. The byte vector is automatically
      * enlarged if necessary.
-     * 
+     *
      * @param s a short.
      * @return this byte vector.
      */
@@ -124,7 +124,7 @@ public class ByteVector {
     /**
      * Puts a byte and a short into this byte vector. The byte vector is
      * automatically enlarged if necessary.
-     * 
+     *
      * @param b a byte.
      * @param s a short.
      * @return this byte vector.
@@ -145,7 +145,7 @@ public class ByteVector {
     /**
      * Puts an int into this byte vector. The byte vector is automatically
      * enlarged if necessary.
-     * 
+     *
      * @param i an int.
      * @return this byte vector.
      */
@@ -166,7 +166,7 @@ public class ByteVector {
     /**
      * Puts a long into this byte vector. The byte vector is automatically
      * enlarged if necessary.
-     * 
+     *
      * @param l a long.
      * @return this byte vector.
      */
@@ -193,7 +193,7 @@ public class ByteVector {
     /**
      * Puts an UTF8 string into this byte vector. The byte vector is
      * automatically enlarged if necessary.
-     * 
+     *
      * @param s a String.
      * @return this byte vector.
      */
@@ -258,7 +258,7 @@ public class ByteVector {
     /**
      * Puts an array of bytes into this byte vector. The byte vector is
      * automatically enlarged if necessary.
-     * 
+     *
      * @param b an array of bytes. May be <tt>null</tt> to put <tt>len</tt>
      *        null bytes into this byte vector.
      * @param off index of the fist byte of b that must be copied.
@@ -279,7 +279,7 @@ public class ByteVector {
 
     /**
      * Enlarge this byte vector so that it can receive n more bytes.
-     * 
+     *
      * @param size number of additional bytes that this byte vector should be
      *        able to receive.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassAdapter.java
index 5f12b08d542..24e34bb99c1 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassAdapter.java
@@ -33,7 +33,7 @@ package org.objectweb.asm;
  * An empty {@link ClassVisitor} that delegates to another {@link ClassVisitor}.
  * This class can be used as a super class to quickly implement usefull class
  * adapter classes, just by overriding the necessary methods.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ClassAdapter implements ClassVisitor {
@@ -45,7 +45,7 @@ public class ClassAdapter implements ClassVisitor {
 
     /**
      * Constructs a new {@link ClassAdapter} object.
-     * 
+     *
      * @param cv the class visitor to which this adapter must delegate calls.
      */
     public ClassAdapter(final ClassVisitor cv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassReader.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassReader.java
index 6924b57dc6d..9d94a42d46e 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassReader.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassReader.java
@@ -37,7 +37,7 @@ import java.io.IOException;
  * This class parses a byte array conforming to the Java class file format and
  * calls the appropriate visit methods of a given class visitor for each field,
  * method and bytecode instruction encountered.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -85,7 +85,7 @@ public class ClassReader {
 
     /**
      * Constructs a new {@link ClassReader} object.
-     * 
+     *
      * @param b the bytecode of the class to be read.
      */
     public ClassReader(final byte[] b) {
@@ -94,7 +94,7 @@ public class ClassReader {
 
     /**
      * Constructs a new {@link ClassReader} object.
-     * 
+     *
      * @param b the bytecode of the class to be read.
      * @param off the start offset of the class data.
      * @param len the length of the class data.
@@ -147,7 +147,7 @@ public class ClassReader {
     /**
      * Copies the constant pool data into the given {@link ClassWriter}. Should
      * be called before the {@link #accept(ClassVisitor,boolean)} method.
-     * 
+     *
      * @param classWriter the {@link ClassWriter} to copy constant pool into.
      */
     void copyPool(final ClassWriter classWriter) {
@@ -228,7 +228,7 @@ public class ClassReader {
 
     /**
      * Constructs a new {@link ClassReader} object.
-     * 
+     *
      * @param is an input stream from which to read the class.
      * @throws IOException if a problem occurs during reading.
      */
@@ -238,7 +238,7 @@ public class ClassReader {
 
     /**
      * Constructs a new {@link ClassReader} object.
-     * 
+     *
      * @param name the fully qualified name of the class to be read.
      * @throws IOException if an exception occurs during reading.
      */
@@ -249,7 +249,7 @@ public class ClassReader {
 
     /**
      * Reads the bytecode of a class.
-     * 
+     *
      * @param is an input stream from which to read the class.
      * @return the bytecode read from the given input stream.
      * @throws IOException if a problem occurs during reading.
@@ -287,7 +287,7 @@ public class ClassReader {
      * Makes the given visitor visit the Java class of this {@link ClassReader}.
      * This class is the one specified in the constructor (see
      * {@link #ClassReader(byte[]) ClassReader}).
-     * 
+     *
      * @param classVisitor the visitor that must visit this class.
      * @param skipDebug <tt>true</tt> if the debug information of the class
      *        must not be visited. In this case the
@@ -304,7 +304,7 @@ public class ClassReader {
      * Makes the given visitor visit the Java class of this {@link ClassReader}.
      * This class is the one specified in the constructor (see
      * {@link #ClassReader(byte[]) ClassReader}).
-     * 
+     *
      * @param classVisitor the visitor that must visit this class.
      * @param attrs prototypes of the attributes that must be parsed during the
      *        visit of the class. Any attribute whose type is not equal to the
@@ -861,7 +861,7 @@ public class ClassReader {
                     if (handler == null) {
                         labels[label] = handler = new Label();
                     }
-                    
+
                     int type = readUnsignedShort(v + 6);
                     if (type == 0) {
                         mv.visitTryCatchBlock(start, end, handler, null);
@@ -1149,7 +1149,7 @@ public class ClassReader {
 
     /**
      * Reads parameter annotations and makes the given visitor visit them.
-     * 
+     *
      * @param v start offset in {@link #b b} of the annotations to be read.
      * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
      *        {@link #readClass(int,char[]) readClass} or
@@ -1181,7 +1181,7 @@ public class ClassReader {
 
     /**
      * Reads the values of an annotation and makes the given visitor visit them.
-     * 
+     *
      * @param v the start offset in {@link #b b} of the values to be read
      *        (including the unsigned short that gives the number of values).
      * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
@@ -1208,7 +1208,7 @@ public class ClassReader {
 
     /**
      * Reads a value of an annotation and makes the given visitor visit it.
-     * 
+     *
      * @param v the start offset in {@link #b b} of the value to be read (<i>not
      *        including the value name constant pool index</i>).
      * @param buf buffer to be used to call {@link #readUTF8 readUTF8},
@@ -1364,7 +1364,7 @@ public class ClassReader {
 
     /**
      * Reads an attribute in {@link #b b}.
-     * 
+     *
      * @param attrs prototypes of the attributes that must be parsed during the
      *        visit of the class. Any attribute whose type is not equal to the
      *        type of one the prototypes is ignored (i.e. an empty
@@ -1412,7 +1412,7 @@ public class ClassReader {
      * Returns the start index of the constant pool item in {@link #b b}, plus
      * one. <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param item the index a constant pool item.
      * @return the start index of the constant pool item in {@link #b b}, plus
      *         one.
@@ -1425,7 +1425,7 @@ public class ClassReader {
      * Reads a byte value in {@link #b b}. <i>This method is intended for
      * {@link Attribute} sub classes, and is normally not needed by class
      * generators or adapters.</i>
-     * 
+     *
      * @param index the start index of the value to be read in {@link #b b}.
      * @return the read value.
      */
@@ -1437,7 +1437,7 @@ public class ClassReader {
      * Reads an unsigned short value in {@link #b b}. <i>This method is
      * intended for {@link Attribute} sub classes, and is normally not needed by
      * class generators or adapters.</i>
-     * 
+     *
      * @param index the start index of the value to be read in {@link #b b}.
      * @return the read value.
      */
@@ -1450,7 +1450,7 @@ public class ClassReader {
      * Reads a signed short value in {@link #b b}. <i>This method is intended
      * for {@link Attribute} sub classes, and is normally not needed by class
      * generators or adapters.</i>
-     * 
+     *
      * @param index the start index of the value to be read in {@link #b b}.
      * @return the read value.
      */
@@ -1463,7 +1463,7 @@ public class ClassReader {
      * Reads a signed int value in {@link #b b}. <i>This method is intended for
      * {@link Attribute} sub classes, and is normally not needed by class
      * generators or adapters.</i>
-     * 
+     *
      * @param index the start index of the value to be read in {@link #b b}.
      * @return the read value.
      */
@@ -1477,7 +1477,7 @@ public class ClassReader {
      * Reads a signed long value in {@link #b b}. <i>This method is intended
      * for {@link Attribute} sub classes, and is normally not needed by class
      * generators or adapters.</i>
-     * 
+     *
      * @param index the start index of the value to be read in {@link #b b}.
      * @return the read value.
      */
@@ -1491,7 +1491,7 @@ public class ClassReader {
      * Reads an UTF8 string constant pool item in {@link #b b}. <i>This method
      * is intended for {@link Attribute} sub classes, and is normally not needed
      * by class generators or adapters.</i>
-     * 
+     *
      * @param index the start index of an unsigned short value in {@link #b b},
      *        whose value is the index of an UTF8 constant pool item.
      * @param buf buffer to be used to read the item. This buffer must be
@@ -1510,7 +1510,7 @@ public class ClassReader {
 
     /**
      * Reads UTF8 string in {@link #b b}.
-     * 
+     *
      * @param index start offset of the UTF8 string to be read.
      * @param utfLen length of the UTF8 string to be read.
      * @param buf buffer to be used to read the string. This buffer must be
@@ -1558,7 +1558,7 @@ public class ClassReader {
      * Reads a class constant pool item in {@link #b b}. <i>This method is
      * intended for {@link Attribute} sub classes, and is normally not needed by
      * class generators or adapters.</i>
-     * 
+     *
      * @param index the start index of an unsigned short value in {@link #b b},
      *        whose value is the index of a class constant pool item.
      * @param buf buffer to be used to read the item. This buffer must be
@@ -1576,7 +1576,7 @@ public class ClassReader {
      * Reads a numeric or string constant pool item in {@link #b b}. <i>This
      * method is intended for {@link Attribute} sub classes, and is normally not
      * needed by class generators or adapters.</i>
-     * 
+     *
      * @param item the index of a constant pool item.
      * @param buf buffer to be used to read the item. This buffer must be
      *        sufficiently large. It is not automatically resized.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassVisitor.java
index 749c4256b7a..edeb587654f 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassVisitor.java
@@ -35,14 +35,14 @@ package org.objectweb.asm;
  * <tt>visitOuterClass</tt> ] ( <tt>visitAnnotation</tt> |
  * <tt>visitAttribute</tt> )* (<tt>visitInnerClass</tt> |
  * <tt>visitField</tt> | <tt>visitMethod</tt> )* <tt>visitEnd</tt>.
- * 
+ *
  * @author Eric Bruneton
  */
 public interface ClassVisitor {
 
     /**
      * Visits the header of the class.
-     * 
+     *
      * @param version the class version.
      * @param access the class's access flags (see {@link Opcodes}). This
      *        parameter also indicates if the class is deprecated.
@@ -69,7 +69,7 @@ public interface ClassVisitor {
 
     /**
      * Visits the source of the class.
-     * 
+     *
      * @param source the name of the source file from which the class was
      *        compiled. May be <tt>null</tt>.
      * @param debug additional debug information to compute the correspondance
@@ -81,7 +81,7 @@ public interface ClassVisitor {
     /**
      * Visits the enclosing class of the class. This method must be called only
      * if the class has an enclosing class.
-     * 
+     *
      * @param owner internal name of the enclosing class of the class.
      * @param name the name of the method that contains the class, or
      *        <tt>null</tt> if the class is not enclosed in a method of its
@@ -94,7 +94,7 @@ public interface ClassVisitor {
 
     /**
      * Visits an annotation of the class.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a non null visitor to visit the annotation values.
@@ -103,7 +103,7 @@ public interface ClassVisitor {
 
     /**
      * Visits a non standard attribute of the class.
-     * 
+     *
      * @param attr an attribute.
      */
     void visitAttribute(Attribute attr);
@@ -111,7 +111,7 @@ public interface ClassVisitor {
     /**
      * Visits information about an inner class. This inner class is not
      * necessarily a member of the class being visited.
-     * 
+     *
      * @param name the internal name of an inner class (see
      *        {@link Type#getInternalName() getInternalName}).
      * @param outerName the internal name of the class to which the inner class
@@ -131,7 +131,7 @@ public interface ClassVisitor {
 
     /**
      * Visits a field of the class.
-     * 
+     *
      * @param access the field's access flags (see {@link Opcodes}). This
      *        parameter also indicates if the field is synthetic and/or
      *        deprecated.
@@ -163,7 +163,7 @@ public interface ClassVisitor {
      * Visits a method of the class. This method <i>must</i> return a new
      * {@link MethodVisitor} instance (or <tt>null</tt>) each time it is
      * called, i.e., it should not return a previously returned visitor.
-     * 
+     *
      * @param access the method's access flags (see {@link Opcodes}). This
      *        parameter also indicates if the method is synthetic and/or
      *        deprecated.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassWriter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassWriter.java
index 22f4e5245dd..81eeeb7d671 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassWriter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/ClassWriter.java
@@ -35,7 +35,7 @@ package org.objectweb.asm;
  * file format. It can be used alone, to generate a Java class "from scratch",
  * or with one or more {@link ClassReader ClassReader} and adapter class visitor
  * to generate a modified class from one or more existing Java classes.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ClassWriter implements ClassVisitor {
@@ -442,7 +442,7 @@ public class ClassWriter implements ClassVisitor {
 
     /**
      * Constructs a new {@link ClassWriter ClassWriter} object.
-     * 
+     *
      * @param computeMaxs <tt>true</tt> if the maximum stack size and the
      *        maximum number of local variables must be automatically computed.
      *        If this flag is <tt>true</tt>, then the arguments of the
@@ -458,7 +458,7 @@ public class ClassWriter implements ClassVisitor {
 
     /**
      * Constructs a new {@link ClassWriter} object.
-     * 
+     *
      * @param computeMaxs <tt>true</tt> if the maximum stack size and the
      *        maximum number of local variables must be automatically computed.
      *        If this flag is <tt>true</tt>, then the arguments of the
@@ -488,7 +488,7 @@ public class ClassWriter implements ClassVisitor {
      * Constructs a new {@link ClassWriter} object and enables optimizations for
      * "mostly add" bytecode transformations. These optimizations are the
      * following:
-     * 
+     *
      * <ul> <li>The constant pool from the original class is copied as is in
      * the new class, which saves time. New constant pool entries will be added
      * at the end if necessary, but unused constant pool entries <i>won't be
@@ -500,7 +500,7 @@ public class ClassWriter implements ClassVisitor {
      * that come from a {@link ClassWriter} (and not from a custom
      * {@link ClassAdapter} or any other {@link ClassVisitor} instance).</li>
      * </ul>
-     * 
+     *
      * @param classReader the {@link ClassReader} used to read the original
      *        class. It will be used to copy the entire constant pool from the
      *        original class and also to copy other fragments of original
@@ -642,7 +642,7 @@ public class ClassWriter implements ClassVisitor {
 
     /**
      * Returns the bytecode of the class that was build with this class writer.
-     * 
+     *
      * @return the bytecode of the class that was build with this class writer.
      */
     public byte[] toByteArray() {
@@ -807,7 +807,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a number or string constant to the constant pool of the class being
      * build. Does nothing if the constant pool already contains a similar item.
-     * 
+     *
      * @param cst the value of the constant to be added to the constant pool.
      *        This parameter must be an {@link Integer}, a {@link Float}, a
      *        {@link Long}, a {@link Double}, a {@link String} or a
@@ -856,7 +856,7 @@ public class ClassWriter implements ClassVisitor {
      * build. Does nothing if the constant pool already contains a similar item.
      * <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param cst the value of the constant to be added to the constant pool.
      *        This parameter must be an {@link Integer}, a {@link Float}, a
      *        {@link Long}, a {@link Double} or a {@link String}.
@@ -872,7 +872,7 @@ public class ClassWriter implements ClassVisitor {
      * nothing if the constant pool already contains a similar item. <i>This
      * method is intended for {@link Attribute} sub classes, and is normally not
      * needed by class generators or adapters.</i>
-     * 
+     *
      * @param value the String value.
      * @return the index of a new or already existing UTF8 item.
      */
@@ -892,7 +892,7 @@ public class ClassWriter implements ClassVisitor {
      * Does nothing if the constant pool already contains a similar item.
      * <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param value the internal name of the class.
      * @return the index of a new or already existing class reference item.
      */
@@ -905,7 +905,7 @@ public class ClassWriter implements ClassVisitor {
      * Does nothing if the constant pool already contains a similar item.
      * <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param value the internal name of the class.
      * @return a new or already existing class reference item.
      */
@@ -925,7 +925,7 @@ public class ClassWriter implements ClassVisitor {
      * Does nothing if the constant pool already contains a similar item.
      * <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param owner the internal name of the field's owner class.
      * @param name the field's name.
      * @param desc the field's descriptor.
@@ -946,7 +946,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a method reference to the constant pool of the class being build.
      * Does nothing if the constant pool already contains a similar item.
-     * 
+     *
      * @param owner the internal name of the method's owner class.
      * @param name the method's name.
      * @param desc the method's descriptor.
@@ -975,7 +975,7 @@ public class ClassWriter implements ClassVisitor {
      * Does nothing if the constant pool already contains a similar item.
      * <i>This method is intended for {@link Attribute} sub classes, and is
      * normally not needed by class generators or adapters.</i>
-     * 
+     *
      * @param owner the internal name of the method's owner class.
      * @param name the method's name.
      * @param desc the method's descriptor.
@@ -994,7 +994,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds an integer to the constant pool of the class being build. Does
      * nothing if the constant pool already contains a similar item.
-     * 
+     *
      * @param value the int value.
      * @return a new or already existing int item.
      */
@@ -1012,7 +1012,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a float to the constant pool of the class being build. Does nothing
      * if the constant pool already contains a similar item.
-     * 
+     *
      * @param value the float value.
      * @return a new or already existing float item.
      */
@@ -1030,7 +1030,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a long to the constant pool of the class being build. Does nothing
      * if the constant pool already contains a similar item.
-     * 
+     *
      * @param value the long value.
      * @return a new or already existing long item.
      */
@@ -1049,7 +1049,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a double to the constant pool of the class being build. Does nothing
      * if the constant pool already contains a similar item.
-     * 
+     *
      * @param value the double value.
      * @return a new or already existing double item.
      */
@@ -1068,7 +1068,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Adds a string to the constant pool of the class being build. Does nothing
      * if the constant pool already contains a similar item.
-     * 
+     *
      * @param value the String value.
      * @return a new or already existing string item.
      */
@@ -1088,7 +1088,7 @@ public class ClassWriter implements ClassVisitor {
      * nothing if the constant pool already contains a similar item. <i>This
      * method is intended for {@link Attribute} sub classes, and is normally not
      * needed by class generators or adapters.</i>
-     * 
+     *
      * @param name a name.
      * @param desc a type descriptor.
      * @return the index of a new or already existing name and type item.
@@ -1107,7 +1107,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Returns the constant pool's hash table item which is equal to the given
      * item.
-     * 
+     *
      * @param key a constant pool item.
      * @return the constant pool's hash table item which is equal to the given
      *         item, or <tt>null</tt> if there is no such item.
@@ -1123,7 +1123,7 @@ public class ClassWriter implements ClassVisitor {
     /**
      * Puts the given item in the constant pool's hash table. The hash table
      * <i>must</i> not already contains this item.
-     * 
+     *
      * @param i the item to be added to the constant pool's hash table.
      */
     private void put(final Item i) {
@@ -1151,7 +1151,7 @@ public class ClassWriter implements ClassVisitor {
 
     /**
      * Puts one byte and two shorts into the constant pool.
-     * 
+     *
      * @param b a byte.
      * @param s1 a short.
      * @param s2 another short.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Edge.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Edge.java
index c0bf108cee2..5bada4e9aca 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Edge.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Edge.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * An edge in the control flow graph of a method body. See {@link Label Label}.
- * 
+ *
  * @author Eric Bruneton
  */
 class Edge {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldVisitor.java
index 0005034ca69..a05cb5a3c16 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldVisitor.java
@@ -33,14 +33,14 @@ package org.objectweb.asm;
  * A visitor to visit a Java field. The methods of this interface must be called
  * in the following order: ( <tt>visitAnnotation</tt> |
  * <tt>visitAttribute</tt> )* <tt>visitEnd</tt>.
- * 
+ *
  * @author Eric Bruneton
  */
 public interface FieldVisitor {
 
     /**
      * Visits an annotation of the field.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a non null visitor to visit the annotation values.
@@ -49,7 +49,7 @@ public interface FieldVisitor {
 
     /**
      * Visits a non standard attribute of the field.
-     * 
+     *
      * @param attr an attribute.
      */
     void visitAttribute(Attribute attr);
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldWriter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldWriter.java
index 7eb3ed4fc60..0adbea91ad8 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldWriter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/FieldWriter.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * An {@link FieldVisitor} that generates Java fields in bytecode form.
- * 
+ *
  * @author Eric Bruneton
  */
 final class FieldWriter implements FieldVisitor {
@@ -96,7 +96,7 @@ final class FieldWriter implements FieldVisitor {
 
     /**
      * Constructs a new {@link FieldWriter}.
-     * 
+     *
      * @param cw the class writer to which this field must be added.
      * @param access the field's access flags (see {@link Opcodes}).
      * @param name the field's name.
@@ -166,7 +166,7 @@ final class FieldWriter implements FieldVisitor {
 
     /**
      * Returns the size of this field.
-     * 
+     *
      * @return the size of this field.
      */
     int getSize() {
@@ -209,7 +209,7 @@ final class FieldWriter implements FieldVisitor {
 
     /**
      * Puts the content of this field into the given byte vector.
-     * 
+     *
      * @param out where the content of this field must be put.
      */
     void put(final ByteVector out) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Handler.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Handler.java
index 8bef8453114..a1211ae2d40 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Handler.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Handler.java
@@ -31,7 +31,7 @@ package org.objectweb.asm;
 
 /**
  * Information about an exception handler block.
- * 
+ *
  * @author Eric Bruneton
  */
 class Handler {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Item.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Item.java
index 4c5285f2f2c..fc67b019486 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Item.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Item.java
@@ -32,7 +32,7 @@ package org.objectweb.asm;
 /**
  * A constant pool item. Constant pool items can be created with the 'newXXX'
  * methods in the {@link ClassWriter} class.
- * 
+ *
  * @author Eric Bruneton
  */
 final class Item {
@@ -115,7 +115,7 @@ final class Item {
 
     /**
      * Constructs a copy of the given item.
-     * 
+     *
      * @param index index of the item to be constructed.
      * @param i the item that must be copied into the item to be constructed.
      */
@@ -134,7 +134,7 @@ final class Item {
 
     /**
      * Sets this item to an integer item.
-     * 
+     *
      * @param intVal the value of this item.
      */
     void set(final int intVal) {
@@ -145,7 +145,7 @@ final class Item {
 
     /**
      * Sets this item to a long item.
-     * 
+     *
      * @param longVal the value of this item.
      */
     void set(final long longVal) {
@@ -156,7 +156,7 @@ final class Item {
 
     /**
      * Sets this item to a float item.
-     * 
+     *
      * @param floatVal the value of this item.
      */
     void set(final float floatVal) {
@@ -167,7 +167,7 @@ final class Item {
 
     /**
      * Sets this item to a double item.
-     * 
+     *
      * @param doubleVal the value of this item.
      */
     void set(final double doubleVal) {
@@ -178,7 +178,7 @@ final class Item {
 
     /**
      * Sets this item to an item that do not hold a primitive value.
-     * 
+     *
      * @param type the type of this item.
      * @param strVal1 first part of the value of this item.
      * @param strVal2 second part of the value of this item.
@@ -206,7 +206,7 @@ final class Item {
                 return;
             // ClassWriter.FIELD:
             // ClassWriter.METH:
-            // ClassWriter.IMETH:                    
+            // ClassWriter.IMETH:
             default:
                 hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()
                         * strVal2.hashCode() * strVal3.hashCode());
@@ -215,7 +215,7 @@ final class Item {
 
     /**
      * Indicates if the given item is equal to this one.
-     * 
+     *
      * @param i the item to be compared to this one.
      * @return <tt>true</tt> if the given item if equal to this one,
      *         <tt>false</tt> otherwise.
@@ -240,7 +240,7 @@ final class Item {
                             && i.strVal2.equals(strVal2);
                 // ClassWriter.FIELD:
                 // ClassWriter.METH:
-                // ClassWriter.IMETH:                    
+                // ClassWriter.IMETH:
                 default:
                     return i.strVal1.equals(strVal1)
                             && i.strVal2.equals(strVal2)
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Label.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Label.java
index 79291f27cd1..3998e5a8640 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Label.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Label.java
@@ -32,7 +32,7 @@ package org.objectweb.asm;
 /**
  * A label represents a position in the bytecode of a method. Labels are used
  * for jump, goto, and switch instructions, and for try catch blocks.
- * 
+ *
  * @author Eric Bruneton
  */
 public class Label {
@@ -136,7 +136,7 @@ public class Label {
      * from the start of the method's bytecode. <i>This method is intended for
      * {@link Attribute} sub classes, and is normally not needed by class
      * generators or adapters.</i>
-     * 
+     *
      * @return the offset corresponding to this label.
      * @throws IllegalStateException if this label is not resolved yet.
      */
@@ -152,7 +152,7 @@ public class Label {
      * position of the label is known, the offset is computed and written
      * directly. Otherwise, a null offset is written and a new forward reference
      * is declared for this label.
-     * 
+     *
      * @param owner the code writer that calls this method.
      * @param out the bytecode of the method.
      * @param source the position of first byte of the bytecode instruction that
@@ -190,7 +190,7 @@ public class Label {
      * for a true forward reference, i.e. only if this label is not resolved
      * yet. For backward references, the offset of the reference can be, and
      * must be, computed and stored directly.
-     * 
+     *
      * @param sourcePosition the position of the referencing instruction. This
      *        position will be used to compute the offset of this forward
      *        reference.
@@ -222,7 +222,7 @@ public class Label {
      * when this label is added to the bytecode of the method, i.e. when its
      * position becomes known. This method fills in the blanks that where left
      * in the bytecode by each forward reference previously added to this label.
-     * 
+     *
      * @param owner the code writer that calls this method.
      * @param position the position of this label in the bytecode.
      * @param data the bytecode of the method.
@@ -290,7 +290,7 @@ public class Label {
 
     /**
      * Returns a string representation of this label.
-     * 
+     *
      * @return a string representation of this label.
      */
     public String toString() {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodAdapter.java
index c7e127de793..a038ac713f4 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodAdapter.java
@@ -34,7 +34,7 @@ package org.objectweb.asm;
  * {@link MethodVisitor}. This class can be used as a super class to quickly
  * implement usefull method adapter classes, just by overriding the necessary
  * methods.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MethodAdapter implements MethodVisitor {
@@ -46,7 +46,7 @@ public class MethodAdapter implements MethodVisitor {
 
     /**
      * Constructs a new {@link MethodAdapter} object.
-     * 
+     *
      * @param mv the code visitor to which this adapter must delegate calls.
      */
     public MethodAdapter(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodVisitor.java
index 3fccbdf1456..d56b3bd1c59 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodVisitor.java
@@ -41,7 +41,7 @@ package org.objectweb.asm;
  * of the visited code, and the <tt>visitLocalVariable</tt> and <tt>visitLineNumber</tt>
  * methods must be called <i>after</i> the labels passed as arguments have been
  * visited.
- * 
+ *
  * @author Eric Bruneton
  */
 public interface MethodVisitor {
@@ -52,7 +52,7 @@ public interface MethodVisitor {
 
     /**
      * Visits the default value of this annotation interface method.
-     * 
+     *
      * @return a non null visitor to the visit the actual default value of this
      *         annotation interface method. The 'name' parameters passed to the
      *         methods of this annotation visitor are ignored. Moreover, exacly
@@ -63,7 +63,7 @@ public interface MethodVisitor {
 
     /**
      * Visits an annotation of this method.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a non null visitor to visit the annotation values.
@@ -72,7 +72,7 @@ public interface MethodVisitor {
 
     /**
      * Visits an annotation of a parameter this method.
-     * 
+     *
      * @param parameter the parameter index.
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
@@ -85,7 +85,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a non standard attribute of this method.
-     * 
+     *
      * @param attr an attribute.
      */
     void visitAttribute(Attribute attr);
@@ -101,7 +101,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a zero operand instruction.
-     * 
+     *
      * @param opcode the opcode of the instruction to be visited. This opcode is
      *        either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2,
      *        ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1, FCONST_0,
@@ -121,7 +121,7 @@ public interface MethodVisitor {
 
     /**
      * Visits an instruction with a single int operand.
-     * 
+     *
      * @param opcode the opcode of the instruction to be visited. This opcode is
      *        either BIPUSH, SIPUSH or NEWARRAY.
      * @param operand the operand of the instruction to be visited.<br>
@@ -140,7 +140,7 @@ public interface MethodVisitor {
     /**
      * Visits a local variable instruction. A local variable instruction is an
      * instruction that loads or stores the value of a local variable.
-     * 
+     *
      * @param opcode the opcode of the local variable instruction to be visited.
      *        This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE,
      *        LSTORE, FSTORE, DSTORE, ASTORE or RET.
@@ -152,7 +152,7 @@ public interface MethodVisitor {
     /**
      * Visits a type instruction. A type instruction is an instruction that
      * takes a type descriptor as parameter.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be visited. This
      *        opcode is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
      * @param desc the operand of the instruction to be visited. This operand is
@@ -164,7 +164,7 @@ public interface MethodVisitor {
     /**
      * Visits a field instruction. A field instruction is an instruction that
      * loads or stores the value of a field of an object.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be visited. This
      *        opcode is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
      * @param owner the internal name of the field's owner class (see {@link
@@ -177,7 +177,7 @@ public interface MethodVisitor {
     /**
      * Visits a method instruction. A method instruction is an instruction that
      * invokes a method.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be visited. This
      *        opcode is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
      *        INVOKEINTERFACE.
@@ -191,7 +191,7 @@ public interface MethodVisitor {
     /**
      * Visits a jump instruction. A jump instruction is an instruction that may
      * jump to another instruction.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be visited. This
      *        opcode is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
      *        IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ,
@@ -205,7 +205,7 @@ public interface MethodVisitor {
     /**
      * Visits a label. A label designates the instruction that will be visited
      * just after it.
-     * 
+     *
      * @param label a {@link Label Label} object.
      */
     void visitLabel(Label label);
@@ -216,7 +216,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a LDC instruction.
-     * 
+     *
      * @param cst the constant to be loaded on the stack. This parameter must be
      *        a non null {@link Integer}, a {@link Float}, a {@link Long}, a
      *        {@link Double} a {@link String} (or a {@link Type} for
@@ -227,7 +227,7 @@ public interface MethodVisitor {
 
     /**
      * Visits an IINC instruction.
-     * 
+     *
      * @param var index of the local variable to be incremented.
      * @param increment amount to increment the local variable by.
      */
@@ -235,7 +235,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a TABLESWITCH instruction.
-     * 
+     *
      * @param min the minimum key value.
      * @param max the maximum key value.
      * @param dflt beginning of the default handler block.
@@ -246,7 +246,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a LOOKUPSWITCH instruction.
-     * 
+     *
      * @param dflt beginning of the default handler block.
      * @param keys the values of the keys.
      * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
@@ -256,7 +256,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a MULTIANEWARRAY instruction.
-     * 
+     *
      * @param desc an array type descriptor (see {@link Type Type}).
      * @param dims number of dimensions of the array to allocate.
      */
@@ -269,7 +269,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a try catch block.
-     * 
+     *
      * @param start beginning of the exception handler's scope (inclusive).
      * @param end end of the exception handler's scope (exclusive).
      * @param handler beginning of the exception handler's code.
@@ -281,7 +281,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a local variable declaration.
-     * 
+     *
      * @param name the name of a local variable.
      * @param desc the type descriptor of this local variable.
      * @param signature the type signature of this local variable. May be
@@ -306,7 +306,7 @@ public interface MethodVisitor {
 
     /**
      * Visits a line number declaration.
-     * 
+     *
      * @param line a line number. This number refers to the source file from
      *        which the class was compiled.
      * @param start the first instruction corresponding to this line number.
@@ -319,7 +319,7 @@ public interface MethodVisitor {
     /**
      * Visits the maximum stack size and the maximum number of local variables
      * of the method.
-     * 
+     *
      * @param maxStack maximum stack size of the method.
      * @param maxLocals maximum number of local variables for the method.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodWriter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodWriter.java
index e131c69abb9..5b841d5fc9a 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodWriter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/MethodWriter.java
@@ -33,7 +33,7 @@ package org.objectweb.asm;
  * A {@link MethodVisitor} that generates methods in bytecode form. Each visit
  * method of this class appends the bytecode corresponding to the visited
  * instruction to a byte vector, in the order these methods are called.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -500,7 +500,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Constructs a new {@link MethodWriter}.
-     * 
+     *
      * @param cw the class writer in which the method must be added.
      * @param access the method's access flags (see {@link Opcodes}).
      * @param name the method's name.
@@ -1056,7 +1056,7 @@ class MethodWriter implements MethodVisitor {
                 .putShort(cw.newUTF8(name))
                 .putShort(cw.newUTF8(desc))
                 .putShort(index);
-        
+
         if(computeMaxs) {
             // updates max locals
             char c = desc.charAt(0);
@@ -1136,7 +1136,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Computes the size of the arguments and of the return value of a method.
-     * 
+     *
      * @param desc the descriptor of a method.
      * @return the size of the arguments of the method (plus one for the
      *         implicit this argument), argSize, and the size of its return
@@ -1174,7 +1174,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Adds a successor to the {@link #currentBlock currentBlock} block.
-     * 
+     *
      * @param stackSize the current (relative) stack size in the current block.
      * @param successor the successor block to be added to the current block.
      */
@@ -1194,7 +1194,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Returns the size of the bytecode of this method.
-     * 
+     *
      * @return the size of the bytecode of this method.
      */
     final int getSize() {
@@ -1292,7 +1292,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Puts the bytecode of this method in the given byte vector.
-     * 
+     *
      * @param out the byte vector into which the bytecode of this method must be
      *        copied.
      */
@@ -1484,7 +1484,7 @@ class MethodWriter implements MethodVisitor {
      * that is being built has been visited</i>. In particular, the
      * {@link Label Label} objects used to construct the method are no longer
      * valid after this method has been called.
-     * 
+     *
      * @param indexes current positions of the instructions to be resized. Each
      *        instruction must be designated by the index of its <i>last</i>
      *        byte, plus one (or, in other words, by the index of the <i>first</i>
@@ -1518,17 +1518,17 @@ class MethodWriter implements MethodVisitor {
          * so on. The first step of the algorithm consists in finding all the
          * instructions that need to be resized, without modifying the code.
          * This is done by the following "fix point" algorithm:
-         * 
+         *
          * Parse the code to find the jump instructions whose offset will need
          * more than 2 bytes to be stored (the future offset is computed from
          * the current offset and from the number of bytes that will be inserted
          * or removed between the source and target instructions). For each such
          * instruction, adds an entry in (a copy of) the indexes and sizes
          * arrays (if this has not already been done in a previous iteration!).
-         * 
+         *
          * If at least one entry has been added during the previous step, go
          * back to the beginning, otherwise stop.
-         * 
+         *
          * In fact the real algorithm is complicated by the fact that the size
          * of TABLESWITCH and LOOKUPSWITCH instructions depends on their
          * position in the bytecode (because of padding). In order to ensure the
@@ -1909,7 +1909,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Reads an unsigned short value in the given byte array.
-     * 
+     *
      * @param b a byte array.
      * @param index the start index of the value to be read.
      * @return the read value.
@@ -1920,7 +1920,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Reads a signed short value in the given byte array.
-     * 
+     *
      * @param b a byte array.
      * @param index the start index of the value to be read.
      * @return the read value.
@@ -1931,7 +1931,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Reads a signed int value in the given byte array.
-     * 
+     *
      * @param b a byte array.
      * @param index the start index of the value to be read.
      * @return the read value.
@@ -1943,7 +1943,7 @@ class MethodWriter implements MethodVisitor {
 
     /**
      * Writes a short value in the given byte array.
-     * 
+     *
      * @param b a byte array.
      * @param index where the first byte of the short value must be written.
      * @param s the value to be written in the given byte array.
@@ -1958,7 +1958,7 @@ class MethodWriter implements MethodVisitor {
      * to have several entries for the same instruction in the <tt>indexes</tt>
      * and <tt>sizes</tt>: two entries (index=a,size=b) and (index=a,size=b')
      * are equivalent to a single entry (index=a,size=b+b').
-     * 
+     *
      * @param indexes current positions of the instructions to be resized. Each
      *        instruction must be designated by the index of its <i>last</i>
      *        byte, plus one (or, in other words, by the index of the <i>first</i>
@@ -1992,10 +1992,10 @@ class MethodWriter implements MethodVisitor {
         }
         return offset;
     }
-    
+
     /**
      * Updates the offset of the given label.
-     * 
+     *
      * @param indexes current positions of the instructions to be resized. Each
      *        instruction must be designated by the index of its <i>last</i>
      *        byte, plus one (or, in other words, by the index of the <i>first</i>
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Opcodes.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Opcodes.java
index 94359a3c22d..2728d96b5c0 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Opcodes.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Opcodes.java
@@ -37,7 +37,7 @@ package org.objectweb.asm;
  * opcodes are therefore not defined in this interface. Likewise for LDC,
  * automatically replaced by LDC_W or LDC2_W when necessary, WIDE, GOTO_W and
  * JSR_W.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/Type.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/Type.java
index cf8dbbf9930..ae314e8cda4 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/Type.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/Type.java
@@ -34,7 +34,7 @@ import java.lang.reflect.Method;
 /**
  * A Java type. This class can be used to make it easier to manipulate type and
  * method descriptors.
- * 
+ *
  * @author Eric Bruneton
  * @author Chris Nokleberg
  */
@@ -172,7 +172,7 @@ public class Type {
 
     /**
      * Constructs a primitive type.
-     * 
+     *
      * @param sort the sort of the primitive type to be constructed.
      */
     private Type(final int sort) {
@@ -182,7 +182,7 @@ public class Type {
 
     /**
      * Constructs a reference type.
-     * 
+     *
      * @param sort the sort of the reference type to be constructed.
      * @param buf a buffer containing the descriptor of the previous type.
      * @param off the offset of this descriptor in the previous buffer.
@@ -198,7 +198,7 @@ public class Type {
 
     /**
      * Returns the Java type corresponding to the given type descriptor.
-     * 
+     *
      * @param typeDescriptor a type descriptor.
      * @return the Java type corresponding to the given type descriptor.
      */
@@ -208,7 +208,7 @@ public class Type {
 
     /**
      * Returns the Java type corresponding to the given class.
-     * 
+     *
      * @param c a class.
      * @return the Java type corresponding to the given class.
      */
@@ -241,7 +241,7 @@ public class Type {
     /**
      * Returns the Java types corresponding to the argument types of the given
      * method descriptor.
-     * 
+     *
      * @param methodDescriptor a method descriptor.
      * @return the Java types corresponding to the argument types of the given
      *         method descriptor.
@@ -276,7 +276,7 @@ public class Type {
     /**
      * Returns the Java types corresponding to the argument types of the given
      * method.
-     * 
+     *
      * @param method a method.
      * @return the Java types corresponding to the argument types of the given
      *         method.
@@ -293,7 +293,7 @@ public class Type {
     /**
      * Returns the Java type corresponding to the return type of the given
      * method descriptor.
-     * 
+     *
      * @param methodDescriptor a method descriptor.
      * @return the Java type corresponding to the return type of the given
      *         method descriptor.
@@ -306,7 +306,7 @@ public class Type {
     /**
      * Returns the Java type corresponding to the return type of the given
      * method.
-     * 
+     *
      * @param method a method.
      * @return the Java type corresponding to the return type of the given
      *         method.
@@ -317,7 +317,7 @@ public class Type {
 
     /**
      * Returns the Java type corresponding to the given type descriptor.
-     * 
+     *
      * @param buf a buffer containing a type descriptor.
      * @param off the offset of this descriptor in the previous buffer.
      * @return the Java type corresponding to the given type descriptor.
@@ -371,7 +371,7 @@ public class Type {
 
     /**
      * Returns the sort of this Java type.
-     * 
+     *
      * @return {@link #VOID VOID}, {@link #BOOLEAN BOOLEAN},
      *         {@link #CHAR CHAR}, {@link #BYTE BYTE}, {@link #SHORT SHORT},
      *         {@link #INT INT}, {@link #FLOAT FLOAT}, {@link #LONG LONG},
@@ -385,7 +385,7 @@ public class Type {
     /**
      * Returns the number of dimensions of this array type. This method should
      * only be used for an array type.
-     * 
+     *
      * @return the number of dimensions of this array type.
      */
     public int getDimensions() {
@@ -399,7 +399,7 @@ public class Type {
     /**
      * Returns the type of the elements of this array type. This method should
      * only be used for an array type.
-     * 
+     *
      * @return Returns the type of the elements of this array type.
      */
     public Type getElementType() {
@@ -408,7 +408,7 @@ public class Type {
 
     /**
      * Returns the name of the class corresponding to this type.
-     * 
+     *
      * @return the fully qualified name of the class corresponding to this type.
      */
     public String getClassName() {
@@ -447,7 +447,7 @@ public class Type {
      * Returns the internal name of the class corresponding to this object type.
      * The internal name of a class is its fully qualified name, where '.' are
      * replaced by '/'. This method should only be used for an object type.
-     * 
+     *
      * @return the internal name of the class corresponding to this object type.
      */
     public String getInternalName() {
@@ -460,7 +460,7 @@ public class Type {
 
     /**
      * Returns the descriptor corresponding to this Java type.
-     * 
+     *
      * @return the descriptor corresponding to this Java type.
      */
     public String getDescriptor() {
@@ -472,7 +472,7 @@ public class Type {
     /**
      * Returns the descriptor corresponding to the given argument and return
      * types.
-     * 
+     *
      * @param returnType the return type of the method.
      * @param argumentTypes the argument types of the method.
      * @return the descriptor corresponding to the given argument and return
@@ -495,7 +495,7 @@ public class Type {
     /**
      * Appends the descriptor corresponding to this Java type to the given
      * string buffer.
-     * 
+     *
      * @param buf the string buffer to which the descriptor must be appended.
      */
     private void getDescriptor(final StringBuffer buf) {
@@ -542,7 +542,7 @@ public class Type {
     /**
      * Returns the internal name of the given class. The internal name of a
      * class is its fully qualified name, where '.' are replaced by '/'.
-     * 
+     *
      * @param c an object class.
      * @return the internal name of the given class.
      */
@@ -552,7 +552,7 @@ public class Type {
 
     /**
      * Returns the descriptor corresponding to the given Java type.
-     * 
+     *
      * @param c an object class, a primitive class or an array class.
      * @return the descriptor corresponding to the given class.
      */
@@ -564,7 +564,7 @@ public class Type {
 
     /**
      * Returns the descriptor corresponding to the given method.
-     * 
+     *
      * @param m a {@link Method Method} object.
      * @return the descriptor of the given method.
      */
@@ -582,7 +582,7 @@ public class Type {
 
     /**
      * Appends the descriptor of the given class to the given string buffer.
-     * 
+     *
      * @param buf the string buffer to which the descriptor must be appended.
      * @param c the class whose descriptor must be computed.
      */
@@ -635,7 +635,7 @@ public class Type {
 
     /**
      * Returns the size of values of this type.
-     * 
+     *
      * @return the size of values of this type, i.e., 2 for <tt>long</tt> and
      *         <tt>double</tt>, and 1 otherwise.
      */
@@ -645,7 +645,7 @@ public class Type {
 
     /**
      * Returns a JVM instruction opcode adapted to this Java type.
-     * 
+     *
      * @param opcode a JVM instruction opcode. This opcode must be one of ILOAD,
      *        ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG, ISHL,
      *        ISHR, IUSHR, IAND, IOR, IXOR and IRETURN.
@@ -706,7 +706,7 @@ public class Type {
 
     /**
      * Tests if the given object is equal to this type.
-     * 
+     *
      * @param o the object to be compared to this type.
      * @return <tt>true</tt> if the given object is equal to this type.
      */
@@ -736,7 +736,7 @@ public class Type {
 
     /**
      * Returns a hash code value for this type.
-     * 
+     *
      * @return a hash code value for this type.
      */
     public int hashCode() {
@@ -751,7 +751,7 @@ public class Type {
 
     /**
      * Returns a string representation of this type.
-     * 
+     *
      * @return the descriptor of this type.
      */
     public String toString() {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java
index 4df2f7ddec1..f3594748583 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapAttribute.java
@@ -56,7 +56,7 @@ import org.objectweb.asm.Label;
  * represents the type u4.</li> <li>If the maximum size of the operand stack
  * is 65535 or less, then <tt>ustack</tt> represents the type u2; otherwise
  * ustack represents the type u4.</li> </ul>
- * 
+ *
  * <pre>
  * stack_map { // attribute StackMap
  *   u2 attribute_name_index;
@@ -65,9 +65,9 @@ import org.objectweb.asm.Label;
  *   stack_map_frame entries[number_of_entries];
  * }
  * </pre>
- * 
+ *
  * Each stack map frame has the following format:
- * 
+ *
  * <pre>
  * stack_map_frame {
  *   uoffset offset;
@@ -77,12 +77,12 @@ import org.objectweb.asm.Label;
  *   verification_type_info stack[number_of_stack_items];
  * }
  * </pre>
- * 
+ *
  * The <tt>verification_type_info</tt> structure consists of a one-byte tag
  * followed by zero or more bytes, giving more information about the tag. Each
  * <tt>verification_type_info</tt> structure specifies the verification type
  * of one or two locations.
- * 
+ *
  * <pre>
  * union verification_type_info {
  *   Top_variable_info;
@@ -95,49 +95,49 @@ import org.objectweb.asm.Label;
  *   Object_variable_info;
  *   Uninitialized_variable_info;
  * }
- *      
+ *
  * Top_variable_info {
  *   u1 tag = ITEM_Top; // 0
  * }
- *      
+ *
  * Integer_variable_info {
  *   u1 tag = ITEM_Integer; // 1
  * }
- *      
+ *
  * Float_variable_info {
  *   u1 tag = ITEM_Float; // 2
  * }
- *      
+ *
  * Long_variable_info {
  *   u1 tag = ITEM_Long; // 4
  * }
- *      
+ *
  * Double_variable_info {
  *   u1 tag = ITEM_Double; // 3
  * }
- *      
+ *
  * Null_variable_info {
  *  u1 tag = ITEM_Null; // 5
  * }
- *      
+ *
  * UninitializedThis_variable_info {
  *   u1 tag = ITEM_UninitializedThis; // 6
  * }
- *      
+ *
  * Object_variable_info {
  *   u1 tag = ITEM_Object; // 7
  *   u2 cpool_index;
  * }
- *      
+ *
  * Uninitialized_variable_info {
  *   u1 tag = ITEM_Uninitialized // 8
  *   uoffset offset;
  * }
  * </pre>
- * 
+ *
  * @see <a href="http://www.jcp.org/en/jsr/detail?id=139">JSR 139 : Connected
  *      Limited Device Configuration 1.1</a>
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class StackMapAttribute extends Attribute {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java
index bdd464179aa..d91d8e707e0 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapFrame.java
@@ -36,15 +36,15 @@ import org.objectweb.asm.Label;
 /**
  * Holds the state of the stack and local variables for a single execution
  * branch.
- * 
+ *
  * <i>Note that Long and Double types are represented by two entries in locals
  * and stack. Second entry should be always of type Top.</i>
- * 
+ *
  * @see <a href="http://www.jcp.org/en/jsr/detail?id=139">JSR 139 : Connected
  *      Limited Device Configuration 1.1</a>
- * 
+ *
  * @see "ClassFileFormat-Java6.fm Page 138 Friday, April 15, 2005 3:22 PM"
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class StackMapFrame {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java
index c0aa9c8a818..032adf62b9c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapTableAttribute.java
@@ -67,7 +67,7 @@ import org.objectweb.asm.Type;
  * represents the type u2; otherwise ulocalvar represents the type u4. If the
  * maximum size of the operand stack is 65535 or less, then <code>ustack</code>
  * represents the type u2; otherwise ustack represents the type u4.
- * 
+ *
  * <pre>
  * stack_map { // attribute StackMapTable
  *   u2 attribute_name_index;
@@ -76,7 +76,7 @@ import org.objectweb.asm.Type;
  *   stack_map_frame entries[number_of_entries];
  * }
  * </pre>
- * 
+ *
  * Each stack_map_frame structure specifies the type state at a particular byte
  * code offset. Each frame type specifies (explicitly or implicitly) a value,
  * offset_delta, that is used to calulate the actual byte code offset at which
@@ -97,7 +97,7 @@ import org.objectweb.asm.Type;
  * <br> <br> The stack_map_frame structure consists of a one-byte tag followed
  * by zero or more bytes, giving more information, depending upon the tag. <br>
  * <br> A stack map frame may belong to one of several frame types
- * 
+ *
  * <pre>
  * union stack_map_frame {
  *   same_frame;
@@ -108,65 +108,65 @@ import org.objectweb.asm.Type;
  *   full_frame;
  * }
  * </pre>
- * 
+ *
  * The frame type same_frame is represented by tags in the range [0-63]. If the
  * frame type is same_frame, it means the frame has exactly the same locals as
  * the previous stack map frame and that the number of stack items is zero. The
  * offset_delta value for the frame is the value of the tag field, frame_type.
  * The form of such a frame is then:
- * 
+ *
  * <pre>
  * same_frame {
  *   u1 frame_type = SAME;  // 0-63
  * }
  * </pre>
- * 
+ *
  * The frame type same_locals_1_stack_item_frame is represented by tags in the
  * range [64, 127]. If the frame_type is same_locals_1_stack_item_frame, it
  * means the frame has exactly the same locals as the previous stack map frame
  * and that the number of stack items is 1. The offset_delta value for the frame
  * is the value (frame_type - 64). There is a verification_type_info following
  * the frame_type for the one stack item. The form of such a frame is then:
- * 
+ *
  * <pre>
  * same_locals_1_stack_item_frame {
  *   u1 frame_type = SAME_LOCALS_1_STACK_ITEM;  // 64-127
  *    verification_type_info stack[1];
  * }
  * </pre>
- * 
+ *
  * Tags in the range [128-247] are reserved for future use. <br> <br> The frame
  * type chop_frame is represented by tags in the range [248-250]. If the
  * frame_type is chop_frame, it means that the current locals are the same as
  * the locals in the previous frame, except that the k last locals are absent.
  * The value of k is given by the formula 251-frame_type. <br> <br> The form of
  * such a frame is then:
- * 
+ *
  * <pre>
  * chop_frame {
  *   u1 frame_type=CHOP;  // 248-250
  *   uoffset offset_delta;
  * }
  * </pre>
- * 
+ *
  * The frame type same_frame_extended is represented by the tag value 251. If
  * the frame type is same_frame_extended, it means the frame has exactly the
  * same locals as the previous stack map frame and that the number of stack
  * items is zero. The form of such a frame is then:
- * 
+ *
  * <pre>
  * same_frame_extended {
  *   u1 frame_type = SAME_FRAME_EXTENDED;  // 251
  *   uoffset offset_delta;
  * }
  * </pre>
- * 
+ *
  * The frame type append_frame is represented by tags in the range [252-254]. If
  * the frame_type is append_frame, it means that the current locals are the same
  * as the locals in the previous frame, except that k additional locals are
  * defined. The value of k is given by the formula frame_type-251. <br> <br> The
  * form of such a frame is then:
- * 
+ *
  * <pre>
  * append_frame {
  *   u1 frame_type =APPEND;  // 252-254
@@ -174,7 +174,7 @@ import org.objectweb.asm.Type;
  *   verification_type_info locals[frame_type -251];
  * }
  * </pre>
- * 
+ *
  * The 0th entry in locals represents the type of the first additional local
  * variable. If locals[M] represents local variable N, then locals[M+1]
  * represents local variable N+1 if locals[M] is one of Top_variable_info,
@@ -185,7 +185,7 @@ import org.objectweb.asm.Type;
  * variable whose index is greater than the maximum number of local variables
  * for the method. <br> <br> The frame type full_frame is represented by the tag
  * value 255. The form of such a frame is then:
- * 
+ *
  * <pre>
  * full_frame {
  *   u1 frame_type = FULL_FRAME;  // 255
@@ -196,7 +196,7 @@ import org.objectweb.asm.Type;
  *   verification_type_info stack[number_of_stack_items];
  * }
  * </pre>
- * 
+ *
  * The 0th entry in locals represents the type of local variable 0. If locals[M]
  * represents local variable N, then locals[M+1] represents local variable N+1
  * if locals[M] is one of Top_variable_info, Integer_variable_info,
@@ -222,7 +222,7 @@ import org.objectweb.asm.Type;
  * or more bytes, giving more information about the tag. Each
  * verification_type_info structure specifies the verification type of one or
  * two locations.
- * 
+ *
  * <pre>
  * union verification_type_info {
  *   Top_variable_info;
@@ -236,119 +236,119 @@ import org.objectweb.asm.Type;
  *   Uninitialized_variable_info;
  * }
  * </pre>
- * 
+ *
  * The Top_variable_info type indicates that the local variable has the
  * verification type top (T.)
- * 
+ *
  * <pre>
  * Top_variable_info {
  *   u1 tag = ITEM_Top; // 0
  * }
  * </pre>
- * 
+ *
  * The Integer_variable_info type indicates that the location contains the
  * verification type int.
- * 
+ *
  * <pre>
  * Integer_variable_info {
  *   u1 tag = ITEM_Integer; // 1
  * }
  * </pre>
- * 
+ *
  * The Float_variable_info type indicates that the location contains the
  * verification type float.
- * 
+ *
  * <pre>
  * Float_variable_info {
  *   u1 tag = ITEM_Float; // 2
  * }
  * </pre>
- * 
+ *
  * The Long_variable_info type indicates that the location contains the
  * verification type long. If the location is a local variable, then:
- * 
+ *
  * <ul> <li>It must not be the local variable with the highest index.</li>
  * <li>The next higher numbered local variable contains the verification type
  * T.</li> </ul>
- * 
+ *
  * If the location is an operand stack entry, then:
- * 
+ *
  * <ul> <li>The current location must not be the topmost location of the
  * operand stack.</li> <li>the next location closer to the top of the operand
  * stack contains the verification type T.</li> </ul>
- * 
+ *
  * This structure gives the contents of two locations in the operand stack or in
  * the local variables.
- * 
+ *
  * <pre>
  * Long_variable_info {
  *   u1 tag = ITEM_Long; // 4
  * }
  * </pre>
- * 
+ *
  * The Double_variable_info type indicates that the location contains the
  * verification type double. If the location is a local variable, then:
- * 
+ *
  * <ul> <li>It must not be the local variable with the highest index.</li>
  * <li>The next higher numbered local variable contains the verification type
  * T. <li> </ul>
- * 
+ *
  * If the location is an operand stack entry, then:
- * 
+ *
  * <ul> <li>The current location must not be the topmost location of the
  * operand stack.</li> <li>the next location closer to the top of the operand
  * stack contains the verification type T.</li> </ul>
- * 
+ *
  * This structure gives the contents of two locations in in the operand stack or
  * in the local variables.
- * 
+ *
  * <pre>
  * Double_variable_info {
  *   u1 tag = ITEM_Double; // 3
  * }
  * </pre>
- * 
+ *
  * The Null_variable_info type indicates that location contains the verification
  * type null.
- * 
+ *
  * <pre>
  * Null_variable_info {
  *   u1 tag = ITEM_Null; // 5
  * }
  * </pre>
- * 
+ *
  * The UninitializedThis_variable_info type indicates that the location contains
  * the verification type uninitializedThis.
- * 
+ *
  * <pre>
  * UninitializedThis_variable_info {
  *   u1 tag = ITEM_UninitializedThis; // 6
  * }
  * </pre>
- * 
+ *
  * The Object_variable_info type indicates that the location contains an
  * instance of the class referenced by the constant pool entry.
- * 
+ *
  * <pre>
  * Object_variable_info {
  *   u1 tag = ITEM_Object; // 7
  *   u2 cpool_index;
  * }
  * </pre>
- * 
+ *
  * The Uninitialized_variable_info indicates that the location contains the
  * verification type uninitialized(offset). The offset item indicates the offset
  * of the new instruction that created the object being stored in the location.
- * 
+ *
  * <pre>
  * Uninitialized_variable_info {
  *   u1 tag = ITEM_Uninitialized // 8
  *   uoffset offset;
  * }
  * </pre>
- * 
+ *
  * @see "ClassFileFormat-Java6.fm Page 138 Friday, April 15, 2005 3:22 PM"
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class StackMapTableAttribute extends Attribute {
@@ -786,7 +786,7 @@ public class StackMapTableAttribute extends Attribute {
 
     /**
      * Use method signature and access flags to resolve initial locals state.
-     * 
+     *
      * @param className name of the method's owner class.
      * @param access access flags of the method.
      * @param methodName name of the method.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java
index ae3b8cee7e4..30cadf1fcea 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/attrs/StackMapType.java
@@ -34,12 +34,12 @@ import org.objectweb.asm.Label;
 
 /**
  * Verification type info used by {@link StackMapAttribute}.
- * 
+ *
  * @see <a href="http://www.jcp.org/en/jsr/detail?id=139">JSR 139 : Connected
  *      Limited Device Configuration 1.1</a>
- * 
+ *
  * @see "ClassFileFormat-Java6.fm Page 138 Friday, April 15, 2005 3:22 PM"
- * 
+ *
  * @author Eugene Kuleshov
  */
 
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java
index 141c8e2113c..13fbaa68cbc 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/AdviceAdapter.java
@@ -42,16 +42,16 @@ import org.objectweb.asm.Type;
  * <p>
  * The behavior is like this:
  * <ol>
- * 
+ *
  * <li>as long as the INVOKESPECIAL for the object initialization has not been
  *     reached, every bytecode instruction is dispatched in the ctor code visitor</li>
- * 
+ *
  * <li>when this one is reached, it is only added in the ctor code visitor and
  *     a JP invoke is added</li>
  * <li>after that, only the other code visitor receives the instructions</li>
- * 
+ *
  * </ol>
- * 
+ *
  * @author Eugene Kuleshov
  * @author Eric Bruneton
  */
@@ -61,16 +61,16 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
 
     protected int methodAccess;
     protected String methodDesc;
-    
+
     private boolean constructor;
     private boolean superInitialized;
     private ArrayList stackFrame;
     private HashMap branches;
 
-    
+
     /**
      * Creates a new {@link AdviceAdapter}.
-     * 
+     *
      * @param mv the method visitor to which this adapter delegates calls.
      * @param access the method's access flags (see {@link Opcodes}).
      * @param name the method's name.
@@ -484,8 +484,8 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
                     if (type == THIS && !superInitialized) {
                         onMethodEnter();
                         superInitialized = true;
-                        // once super has been initialized it is no longer 
-                        // necessary to keep track of stack state                        
+                        // once super has been initialized it is no longer
+                        // necessary to keep track of stack state
                         constructor = false;
                     }
                     break;
@@ -583,16 +583,16 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
     private Object peekValue() {
         return stackFrame.get(stackFrame.size()-1);
     }
-    
+
     private void pushValue(Object o) {
         stackFrame.add(o);
     }
-    
+
     /**
-     * Called at the beginning of the method or after super 
+     * Called at the beginning of the method or after super
      * class class call in the constructor.
      * <br><br>
-     * 
+     *
      * <i>Custom code can use or change all the local variables,
      * but should not change state of the stack.</i>
      */
@@ -600,9 +600,9 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
 
     /**
      * Called before explicit exit from the method using either
-     * return or throw. Top element on the stack contains the 
+     * return or throw. Top element on the stack contains the
      * return value or exception instance. For example:
-     * 
+     *
      * <pre>
      *   public void onMethodExit(int opcode) {
      *     if(opcode==RETURN) {
@@ -625,19 +625,18 @@ public abstract class AdviceAdapter extends GeneratorAdapter implements Opcodes
      *   public static void onExit(int opcode, Object param) {
      *     ...
      * </pre>
-     * 
+     *
      * <br><br>
-     * 
+     *
      * <i>Custom code can use or change all the local variables,
      * but should not change state of the stack.</i>
-     * 
-     * @param opcode one of the RETURN, IRETURN, FRETURN, 
+     *
+     * @param opcode one of the RETURN, IRETURN, FRETURN,
      *   ARETURN, LRETURN, DRETURN or ATHROW
-     * 
+     *
      */
     protected abstract void onMethodExit(int opcode);
 
     // TODO onException, onMethodCall
-    
-}
 
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java
index de7cdc4bf64..d979659bd2b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/EmptyVisitor.java
@@ -38,7 +38,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * An empty implementation of the ASM visitor interfaces.
- * 
+ *
  * @author Eric Bruneton
  */
 public class EmptyVisitor implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java
index 40b4db57779..aacb27cf52c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/GeneratorAdapter.java
@@ -42,7 +42,7 @@ import org.objectweb.asm.Type;
 /**
  * A {@link org.objectweb.asm.MethodAdapter} with convenient methods to generate
  * code. For example, using this adapter, the class below
- * 
+ *
  * <pre>
  * public class Example {
  *     public static void main(String[] args) {
@@ -50,20 +50,20 @@ import org.objectweb.asm.Type;
  *     }
  * }
  * </pre>
- * 
+ *
  * can be generated as follows:
- * 
+ *
  * <pre>
  * ClassWriter cw = new ClassWriter(true);
  * cw.visit(V1_1, ACC_PUBLIC, "Example", null, "java/lang/Object", null);
- * 
+ *
  * Method m = Method.getMethod("void <init> ()");
  * GeneratorAdapter mg = new GeneratorAdapter(ACC_PUBLIC, m, null, null, cw);
  * mg.loadThis();
  * mg.invokeConstructor(Type.getType(Object.class), m);
  * mg.returnValue();
  * mg.endMethod();
- * 
+ *
  * m = Method.getMethod("void main (String[])");
  * mg = new GeneratorAdapter(ACC_PUBLIC + ACC_STATIC, m, null, null, cw);
  * mg.getStatic(Type.getType(System.class), "out", Type.getType(PrintStream.class));
@@ -71,10 +71,10 @@ import org.objectweb.asm.Type;
  * mg.invokeVirtual(Type.getType(PrintStream.class), Method.getMethod("void println (String)"));
  * mg.returnValue();
  * mg.endMethod();
- * 
+ *
  * cw.visitEnd();
  * </pre>
- * 
+ *
  * @author Juozas Baliuka
  * @author Chris Nokleberg
  * @author Eric Bruneton
@@ -225,7 +225,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Creates a new {@link GeneratorAdapter}.
-     * 
+     *
      * @param mv the method visitor to which this adapter delegates calls.
      * @param access the method's access flags (see {@link Opcodes}).
      * @param name the method's name.
@@ -246,7 +246,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Creates a new {@link GeneratorAdapter}.
-     * 
+     *
      * @param access access flags of the adapted method.
      * @param method the adapted method.
      * @param mv the method visitor to which this adapter delegates calls.
@@ -265,7 +265,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Creates a new {@link GeneratorAdapter}.
-     * 
+     *
      * @param access access flags of the adapted method.
      * @param method the adapted method.
      * @param signature the signature of the adapted method (may be
@@ -290,7 +290,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Returns the internal names of the given types.
-     * 
+     *
      * @param types a set of types.
      * @return the internal names of the given types.
      */
@@ -311,7 +311,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final boolean value) {
@@ -320,7 +320,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final int value) {
@@ -337,7 +337,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final long value) {
@@ -350,7 +350,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final float value) {
@@ -364,7 +364,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final double value) {
@@ -378,7 +378,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack. May be <tt>null</tt>.
      */
     public void push(final String value) {
@@ -391,7 +391,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push the given value on the stack.
-     * 
+     *
      * @param value the value to be pushed on the stack.
      */
     public void push(final Type value) {
@@ -409,7 +409,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Returns the index of the given method argument in the frame's local
      * variables array.
-     * 
+     *
      * @param arg the index of a method argument.
      * @return the index of the given method argument in the frame's local
      *         variables array.
@@ -424,7 +424,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to push a local variable on the stack.
-     * 
+     *
      * @param type the type of the local variable to be loaded.
      * @param index an index in the frame's local variables array.
      */
@@ -435,7 +435,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store the top stack value in a local
      * variable.
-     * 
+     *
      * @param type the type of the local variable to be stored.
      * @param index an index in the frame's local variables array.
      */
@@ -455,7 +455,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to load the given method argument on the stack.
-     * 
+     *
      * @param arg the index of a method argument.
      */
     public void loadArg(final int arg) {
@@ -465,7 +465,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to load the given method arguments on the
      * stack.
-     * 
+     *
      * @param arg the index of the first method argument to be loaded.
      * @param count the number of method arguments to be loaded.
      */
@@ -504,7 +504,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store the top stack value in the given
      * method argument.
-     * 
+     *
      * @param arg the index of a method argument.
      */
     public void storeArg(final int arg) {
@@ -517,7 +517,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Creates a new local variable of the given type.
-     * 
+     *
      * @param type the type of the local variable to be created.
      * @return the identifier of the newly created local variable.
      */
@@ -529,7 +529,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Returns the type of the given local variable.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      * @return the type of the given local variable.
@@ -540,7 +540,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Sets the current type of the given local variable.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      * @param type the type of the value being stored in the local variable
@@ -554,7 +554,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to load the given local variable on the stack.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      */
@@ -564,7 +564,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to load the given local variable on the stack.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      * @param type the type of this local variable.
@@ -577,7 +577,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store the top stack value in the given local
      * variable.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      */
@@ -588,7 +588,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store the top stack value in the given local
      * variable.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      * @param type the type of this local variable.
@@ -600,7 +600,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to load an element from an array.
-     * 
+     *
      * @param type the type of the array element to be loaded.
      */
     public void arrayLoad(final Type type) {
@@ -609,7 +609,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to store an element in an array.
-     * 
+     *
      * @param type the type of the array element to be stored.
      */
     public void arrayStore(final Type type) {
@@ -685,7 +685,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instructions to swap the top two stack values.
-     * 
+     *
      * @param prev type of the top - 1 stack value.
      * @param type type of the top stack value.
      */
@@ -715,7 +715,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to do the specified mathematical or logical
      * operation.
-     * 
+     *
      * @param op a mathematical or logical operation. Must be one of ADD, SUB,
      *        MUL, DIV, REM, NEG, SHL, SHR, USHR, AND, OR, XOR.
      * @param type the type of the operand(s) for this operation.
@@ -735,7 +735,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to increment the given local variable.
-     * 
+     *
      * @param local the local variable to be incremented.
      * @param amount the amount by which the local variable must be incremented.
      */
@@ -746,7 +746,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to cast a numerical value from one type to
      * another.
-     * 
+     *
      * @param from the type of the top stack value
      * @param to the type into which this value must be cast.
      */
@@ -804,7 +804,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to box the top stack value. This value is
      * replaced by its boxed equivalent on top of the stack.
-     * 
+     *
      * @param type the type of the top stack value.
      */
     public void box(final Type type) {
@@ -861,7 +861,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to unbox the top stack value. This value is
      * replaced by its unboxed equivalent on top of the stack.
-     * 
+     *
      * @param type the type of the top stack value.
      */
     public void unbox(final Type type) {
@@ -906,7 +906,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Creates a new {@link Label}.
-     * 
+     *
      * @return a new {@link Label}.
      */
     public Label newLabel() {
@@ -915,7 +915,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Marks the current code position with the given label.
-     * 
+     *
      * @param label a label.
      */
     public void mark(final Label label) {
@@ -924,7 +924,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Marks the current code position with a new label.
-     * 
+     *
      * @return the label that was created to mark the current code position.
      */
     public Label mark() {
@@ -936,7 +936,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to jump to a label based on the comparison of
      * the top two stack values.
-     * 
+     *
      * @param type the type of the top two stack values.
      * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
      *        LE.
@@ -1005,7 +1005,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to jump to a label based on the comparison of
      * the top two integer stack values.
-     * 
+     *
      * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
      *        LE.
      * @param label where to jump if the comparison result is <tt>true</tt>.
@@ -1017,7 +1017,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to jump to a label based on the comparison of
      * the top integer stack value with zero.
-     * 
+     *
      * @param mode how these values must be compared. One of EQ, NE, LT, GE, GT,
      *        LE.
      * @param label where to jump if the comparison result is <tt>true</tt>.
@@ -1029,7 +1029,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to jump to the given label if the top stack
      * value is null.
-     * 
+     *
      * @param label where to jump if the condition is <tt>true</tt>.
      */
     public void ifNull(final Label label) {
@@ -1039,7 +1039,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to jump to the given label if the top stack
      * value is not null.
-     * 
+     *
      * @param label where to jump if the condition is <tt>true</tt>.
      */
     public void ifNonNull(final Label label) {
@@ -1048,7 +1048,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to jump to the given label.
-     * 
+     *
      * @param label where to jump if the condition is <tt>true</tt>.
      */
     public void goTo(final Label label) {
@@ -1057,7 +1057,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates a RET instruction.
-     * 
+     *
      * @param local a local variable identifier, as returned by {@link #newLocal
      *        newLocal}.
      */
@@ -1067,7 +1067,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instructions for a switch statement.
-     * 
+     *
      * @param keys the switch case keys.
      * @param generator a generator to generate the code for the switch cases.
      */
@@ -1087,7 +1087,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instructions for a switch statement.
-     * 
+     *
      * @param keys the switch case keys.
      * @param generator a generator to generate the code for the switch cases.
      * @param useTable <tt>true</tt> to use a TABLESWITCH instruction, or
@@ -1154,7 +1154,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates a get field or set field instruction.
-     * 
+     *
      * @param opcode the instruction's opcode.
      * @param ownerType the class in which the field is defined.
      * @param name the name of the field.
@@ -1175,7 +1175,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the value of a static field on the
      * stack.
-     * 
+     *
      * @param owner the class in which the field is defined.
      * @param name the name of the field.
      * @param type the type of the field.
@@ -1187,7 +1187,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to store the top stack value in a static field.
-     * 
+     *
      * @param owner the class in which the field is defined.
      * @param name the name of the field.
      * @param type the type of the field.
@@ -1200,7 +1200,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to push the value of a non static field on the
      * stack.
-     * 
+     *
      * @param owner the class in which the field is defined.
      * @param name the name of the field.
      * @param type the type of the field.
@@ -1212,7 +1212,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to store the top stack value in a non static
      * field.
-     * 
+     *
      * @param owner the class in which the field is defined.
      * @param name the name of the field.
      * @param type the type of the field.
@@ -1227,7 +1227,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates an invoke method instruction.
-     * 
+     *
      * @param opcode the instruction's opcode.
      * @param type the class in which the method is defined.
      * @param method the method to be invoked.
@@ -1248,7 +1248,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to invoke a normal method.
-     * 
+     *
      * @param owner the class in which the method is defined.
      * @param method the method to be invoked.
      */
@@ -1258,7 +1258,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to invoke a constructor.
-     * 
+     *
      * @param type the class in which the constructor is defined.
      * @param method the constructor to be invoked.
      */
@@ -1268,7 +1268,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to invoke a static method.
-     * 
+     *
      * @param owner the class in which the method is defined.
      * @param method the method to be invoked.
      */
@@ -1278,7 +1278,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to invoke an interface method.
-     * 
+     *
      * @param owner the class in which the method is defined.
      * @param method the method to be invoked.
      */
@@ -1292,7 +1292,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates a type dependent instruction.
-     * 
+     *
      * @param opcode the instruction's opcode.
      * @param type the instruction's operand.
      */
@@ -1308,7 +1308,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to create a new object.
-     * 
+     *
      * @param type the class of the object to be created.
      */
     public void newInstance(final Type type) {
@@ -1317,7 +1317,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Generates the instruction to create a new array.
-     * 
+     *
      * @param type the type of the array elements.
      */
     public void newArray(final Type type) {
@@ -1375,7 +1375,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instructions to create and throw an exception. The
      * exception class must have a constructor with a single String argument.
-     * 
+     *
      * @param type the class of the exception to be thrown.
      * @param msg the detailed message of the exception.
      */
@@ -1390,7 +1390,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to check that the top stack value is of the
      * given type.
-     * 
+     *
      * @param type a class or interface type.
      */
     public void checkCast(final Type type) {
@@ -1402,7 +1402,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
     /**
      * Generates the instruction to test if the top stack value is of the given
      * type.
-     * 
+     *
      * @param type a class or interface type.
      */
     public void instanceOf(final Type type) {
@@ -1438,7 +1438,7 @@ public class GeneratorAdapter extends LocalVariablesSorter {
 
     /**
      * Marks the start of an exception handler.
-     * 
+     *
      * @param start beginning of the exception handler's scope (inclusive).
      * @param end end of the exception handler's scope (exclusive).
      * @param exception internal name of the type of exceptions handled by the
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
index 1253a0b5170..bfc87324721 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/LocalVariablesSorter.java
@@ -39,7 +39,7 @@ import org.objectweb.asm.Type;
  * A {@link MethodAdapter} that renumbers local variables in their order of
  * appearance. This adapter allows one to easily add new local variables to a
  * method.
- * 
+ *
  * @author Chris Nokleberg
  * @author Eric Bruneton
  */
@@ -132,5 +132,5 @@ public class LocalVariablesSorter extends MethodAdapter {
         }
         return value - 1;
     }
-    
+
 }
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/Method.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/Method.java
index 741e7b5be26..c5ce3140721 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/Method.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/Method.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.Type;
 
 /**
  * A named method descriptor.
- * 
+ *
  * @author Juozas Baliuka
  * @author Chris Nokleberg
  * @author Eric Bruneton
@@ -73,7 +73,7 @@ public class Method {
 
     /**
      * Creates a new {@link Method}.
-     * 
+     *
      * @param name the method's name.
      * @param desc the method's descriptor.
      */
@@ -84,7 +84,7 @@ public class Method {
 
     /**
      * Creates a new {@link Method}.
-     * 
+     *
      * @param name the method's name.
      * @param returnType the method's return type.
      * @param argumentTypes the method's argument types.
@@ -100,7 +100,7 @@ public class Method {
     /**
      * Returns a {@link Method} corresponding to the given Java method
      * declaration.
-     * 
+     *
      * @param method a Java method declaration, without argument names, of the
      *        form "returnType name (argumentType1, ... argumentTypeN)", where
      *        the types are in plain Java (e.g. "int", "float",
@@ -168,7 +168,7 @@ public class Method {
 
     /**
      * Returns the name of the method described by this object.
-     * 
+     *
      * @return the name of the method described by this object.
      */
     public String getName() {
@@ -177,7 +177,7 @@ public class Method {
 
     /**
      * Returns the descriptor of the method described by this object.
-     * 
+     *
      * @return the descriptor of the method described by this object.
      */
     public String getDescriptor() {
@@ -186,7 +186,7 @@ public class Method {
 
     /**
      * Returns the return type of the method described by this object.
-     * 
+     *
      * @return the return type of the method described by this object.
      */
     public Type getReturnType() {
@@ -195,7 +195,7 @@ public class Method {
 
     /**
      * Returns the argument types of the method described by this object.
-     * 
+     *
      * @return the argument types of the method described by this object.
      */
     public Type[] getArgumentTypes() {
@@ -217,4 +217,4 @@ public class Method {
     public int hashCode() {
         return name.hashCode() ^ desc.hashCode();
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
index 800ad4b3cd2..3932a01adbc 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/SerialVersionUIDAdder.java
@@ -46,18 +46,18 @@ import org.objectweb.asm.Opcodes;
 /**
  * A {@link ClassAdapter} that adds a serial version unique identifier to a
  * class if missing. Here is typical usage of this class:
- * 
+ *
  * <pre>
  *   ClassWriter cw = new ClassWriter(...);
  *   ClassVisitor sv = new SerialVersionUIDAdder(cw);
  *   ClassVisitor ca = new MyClassAdapter(sv);
  *   new ClassReader(orginalClass).accept(ca, false);
  * </pre>
- * 
+ *
  * The SVUID algorithm can be found <a href=
  * "http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html"
  * >http://java.sun.com/j2se/1.4.2/docs/guide/serialization/spec/class.html</a>:
- * 
+ *
  * <pre>
  * The serialVersionUID is computed using the signature of a stream of bytes
  * that reflect the class definition. The National Institute of Standards and
@@ -93,9 +93,9 @@ import org.objectweb.asm.Opcodes;
  * 8. The SHA-1 algorithm is executed on the stream of bytes produced by
  * DataOutputStream and produces five 32-bit values sha[0..4].
  *
- * 9. The hash value is assembled from the first and second 32-bit values of 
+ * 9. The hash value is assembled from the first and second 32-bit values of
  * the SHA-1 message digest. If the result of the message digest, the five
- * 32-bit words H0 H1 H2 H3 H4, is in an array of five int values named 
+ * 32-bit words H0 H1 H2 H3 H4, is in an array of five int values named
  * sha, the hash value would be computed as follows:
  *
  * long hash = ((sha[0] >>> 24) & 0xFF) |
@@ -107,7 +107,7 @@ import org.objectweb.asm.Opcodes;
  * ((sha[1] >>> 8) & 0xFF) << 48 |
  * ((sha[1] >>> 0) & 0xFF) << 56;
  * </pre>
- * 
+ *
  * @author Rajendra Inamdar, Vishal Vishnoi
  */
 public class SerialVersionUIDAdder extends ClassAdapter {
@@ -160,7 +160,7 @@ public class SerialVersionUIDAdder extends ClassAdapter {
 
     /**
      * Creates a new {@link SerialVersionUIDAdder}.
-     * 
+     *
      * @param cv a {@link ClassVisitor} to which this visitor will delegate
      *        calls.
      */
@@ -306,7 +306,7 @@ public class SerialVersionUIDAdder extends ClassAdapter {
      * Returns the value of SVUID if the class doesn't have one already. Please
      * note that 0 is returned if the class already has SVUID, thus use
      * <code>isHasSVUID</code> to determine if the class already had an SVUID.
-     * 
+     *
      * @return Returns the serial version UID
      * @throws IOException
      */
@@ -347,11 +347,11 @@ public class SerialVersionUIDAdder extends ClassAdapter {
             /*
              * 4. For each field of the class sorted by field name (except
              * private static and private transient fields):
-             * 
+             *
              * 1. The name of the field in UTF encoding. 2. The modifiers of the
              * field written as a 32-bit integer. 3. The descriptor of the field
              * in UTF encoding
-             * 
+             *
              * Note that field signatutes are not dot separated. Method and
              * constructor signatures are dot separated. Go figure...
              */
@@ -401,7 +401,7 @@ public class SerialVersionUIDAdder extends ClassAdapter {
              * digest, the five 32-bit words H0 H1 H2 H3 H4, is in an array of
              * five int values named sha, the hash value would be computed as
              * follows:
-             * 
+             *
              * long hash = ((sha[0] >>> 24) & 0xFF) | ((sha[0] >>> 16) & 0xFF) <<
              * 8 | ((sha[0] >>> 8) & 0xFF) << 16 | ((sha[0] >>> 0) & 0xFF) <<
              * 24 | ((sha[1] >>> 24) & 0xFF) << 32 | ((sha[1] >>> 16) & 0xFF) <<
@@ -423,7 +423,7 @@ public class SerialVersionUIDAdder extends ClassAdapter {
 
     /**
      * Returns the SHA-1 message digest of the given value.
-     * 
+     *
      * @param value the value whose SHA message digest must be computed.
      * @return the SHA-1 message digest of the given value.
      */
@@ -437,7 +437,7 @@ public class SerialVersionUIDAdder extends ClassAdapter {
 
     /**
      * Sorts the items in the collection and writes it to the data output stream
-     * 
+     *
      * @param itemCollection collection of items
      * @param dos a <code>DataOutputStream</code> value
      * @param dotted a <code>boolean</code> value
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java
index 9aabe44cad2..2af409e8786 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/StaticInitMerger.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.Opcodes;
 
 /**
  * A {@link ClassAdapter} that merges clinit methods into a single one.
- * 
+ *
  * @author Eric Bruneton
  */
 public class StaticInitMerger extends ClassAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
index 73d8d926bb7..c90a9cabf81 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/commons/TableSwitchGenerator.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.Label;
 
 /**
  * A code generator for switch statements.
- * 
+ *
  * @author Juozas Baliuka
  * @author Chris Nokleberg
  * @author Eric Bruneton
@@ -42,7 +42,7 @@ public interface TableSwitchGenerator {
 
     /**
      * Generates the code for a switch case.
-     * 
+     *
      * @param key the switch case key.
      * @param end a label that corresponds to the end of the switch statement.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java
index e35fead24cb..5bceca1576b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/AnnotationConstantsCollector.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.Type;
 /**
  * An {@link AnnotationVisitor} that collects the {@link Constant}s of the
  * annotations it visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class AnnotationConstantsCollector implements AnnotationVisitor {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java
index 9cfc6de31ee..4a6efe5d08f 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassConstantsCollector.java
@@ -40,7 +40,7 @@ import org.objectweb.asm.Opcodes;
 /**
  * A {@link ClassVisitor} that collects the {@link Constant}s of the classes it
  * visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ClassConstantsCollector extends ClassAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java
index 153b07ac286..b9a1a421cf0 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ClassOptimizer.java
@@ -40,7 +40,7 @@ import org.objectweb.asm.Opcodes;
 /**
  * A {@link ClassAdapter} that renames fields and methods, and removes debug
  * info.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ClassOptimizer extends ClassAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Constant.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Constant.java
index b07b7c2d3f5..c07599dea6b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Constant.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Constant.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.ClassWriter;
 
 /**
  * A constant pool item.
- * 
+ *
  * @author Eric Bruneton
  */
 class Constant {
@@ -108,7 +108,7 @@ class Constant {
 
     /**
      * Sets this item to an integer item.
-     * 
+     *
      * @param intVal the value of this item.
      */
     void set(final int intVal) {
@@ -119,7 +119,7 @@ class Constant {
 
     /**
      * Sets this item to a long item.
-     * 
+     *
      * @param longVal the value of this item.
      */
     void set(final long longVal) {
@@ -130,7 +130,7 @@ class Constant {
 
     /**
      * Sets this item to a float item.
-     * 
+     *
      * @param floatVal the value of this item.
      */
     void set(final float floatVal) {
@@ -141,7 +141,7 @@ class Constant {
 
     /**
      * Sets this item to a double item.
-     * 
+     *
      * @param doubleVal the value of this item.
      */
     void set(final double doubleVal) {
@@ -152,7 +152,7 @@ class Constant {
 
     /**
      * Sets this item to an item that do not hold a primitive value.
-     * 
+     *
      * @param type the type of this item.
      * @param strVal1 first part of the value of this item.
      * @param strVal2 second part of the value of this item.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java
index c918bef0f8e..dff17dec691 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/ConstantPool.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.Type;
 
 /**
  * A constant pool.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ConstantPool extends HashMap {
@@ -195,4 +195,4 @@ public class ConstantPool extends HashMap {
     private void put(final Constant cst) {
         put(cst, cst);
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java
index e5e9b7682ff..ac5d0d31774 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/FieldConstantsCollector.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.FieldVisitor;
 /**
  * A {@link FieldVisitor} that collects the {@link Constant}s of the fields it
  * visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class FieldConstantsCollector implements FieldVisitor {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java
index 8302d99f75f..994b4584ef1 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/JarOptimizer.java
@@ -40,7 +40,7 @@ import java.util.zip.ZipOutputStream;
 
 /**
  * A Jar file optimizer.
- * 
+ *
  * @author Eric Bruneton
  */
 public class JarOptimizer {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java
index dc7b1c1d6ac..33d82e952dd 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodConstantsCollector.java
@@ -38,7 +38,7 @@ import org.objectweb.asm.Opcodes;
 /**
  * An {@link MethodVisitor} that collects the {@link Constant}s of the methods
  * it visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MethodConstantsCollector extends MethodAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java
index 91fa98b2a2f..ea2927498cf 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/MethodOptimizer.java
@@ -37,7 +37,7 @@ import org.objectweb.asm.MethodVisitor;
 /**
  * A {@link MethodAdapter} that renames fields and methods, and removes debug
  * info.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MethodOptimizer extends MethodAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java
index 9cefb1ffe18..77a856b46a5 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/NameMapping.java
@@ -39,13 +39,13 @@ import org.objectweb.asm.Type;
 
 /**
  * A mapping from names to names, used to rename classes, fields and methods.
- * 
+ *
  * @author Eric Bruneton
  */
 public class NameMapping extends Properties {
 
     public final Set unused;
-    
+
     public NameMapping(final String file) throws IOException {
         load(new FileInputStream(file));
         unused = new HashSet(keySet());
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java
index 94e4068f0e5..86da30779b2 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/optimizer/Shrinker.java
@@ -44,7 +44,7 @@ import org.objectweb.asm.ClassWriter;
 
 /**
  * A class file shrinker utility.
- * 
+ *
  * @author Eric Bruneton
  */
 public class Shrinker {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java
index 363692d8607..a2f31f39ed2 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureReader.java
@@ -32,7 +32,7 @@ package org.objectweb.asm.signature;
 /**
  * A type signature parser to make a signature visitor visit an existing
  * signature.
- * 
+ *
  * @author Thomas Hallgren
  * @author Eric Bruneton
  */
@@ -45,7 +45,7 @@ public class SignatureReader {
 
     /**
      * Constructs a {@link SignatureReader} for the given signature.
-     * 
+     *
      * @param signature A <i>ClassSignature</i>, <i>MethodTypeSignature</i>,
      *        or <i>FieldTypeSignature</i>.
      */
@@ -65,7 +65,7 @@ public class SignatureReader {
      * parameter of the
      * {@link org.objectweb.asm.ClassVisitor#visitMethod ClassVisitor.visitMethod}
      * method).
-     * 
+     *
      * @param v the visitor that must visit this signature.
      */
     public void accept(final SignatureVisitor v) {
@@ -122,11 +122,11 @@ public class SignatureReader {
      * method is intended to be called on a {@link SignatureReader} that was
      * created using a <i>FieldTypeSignature</i>, such as the
      * <code>signature</code> parameter of the
-     * {@link org.objectweb.asm.ClassVisitor#visitField 
-     * ClassVisitor.visitField} or {@link 
+     * {@link org.objectweb.asm.ClassVisitor#visitField
+     * ClassVisitor.visitField} or {@link
      * org.objectweb.asm.MethodVisitor#visitLocalVariable
      * MethodVisitor.visitLocalVariable} methods.
-     * 
+     *
      * @param v the visitor that must visit this signature.
      */
     public void acceptType(final SignatureVisitor v) {
@@ -135,7 +135,7 @@ public class SignatureReader {
 
     /**
      * Parses a field type signature and makes the given visitor visit it.
-     * 
+     *
      * @param signature a string containing the signature that must be parsed.
      * @param pos index of the first character of the signature to parsed.
      * @param v the visitor that must visit this signature.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java
index 8f087bd2ef7..46df8c939a6 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureVisitor.java
@@ -34,21 +34,21 @@ package org.objectweb.asm.signature;
  * called in one of the three following orders (the last one is the only valid
  * order for a {@link SignatureVisitor} that is returned by a method of this
  * interface): <ul> <li><i>ClassSignature</i> = (
- * <tt>visitFormalTypeParameter</tt> 
+ * <tt>visitFormalTypeParameter</tt>
  *   <tt>visitClassBound</tt>?
- * <tt>visitInterfaceBound</tt>* )* ( <tt>visitSuperClass</tt> 
+ * <tt>visitInterfaceBound</tt>* )* ( <tt>visitSuperClass</tt>
  *   <tt>visitInterface</tt>* )</li>
- * <li><i>MethodSignature</i> = ( <tt>visitFormalTypeParameter</tt> 
+ * <li><i>MethodSignature</i> = ( <tt>visitFormalTypeParameter</tt>
  *   <tt>visitClassBound</tt>?
  * <tt>visitInterfaceBound</tt>* )* ( <tt>visitParameterType</tt>*
- * <tt>visitReturnType</tt> 
+ * <tt>visitReturnType</tt>
  *   <tt>visitExceptionType</tt>* )</li> <li><i>TypeSignature</i> =
  * <tt>visitBaseType</tt> | <tt>visitTypeVariable</tt> |
  * <tt>visitArrayType</tt> | (
  * <tt>visitClassType</tt> <tt>visitTypeArgument</tt>* (
  * <tt>visitInnerClassType</tt> <tt>visitTypeArgument</tt>* )*
  * <tt>visitEnd</tt> ) )</li> </ul>
- * 
+ *
  * @author Thomas Hallgren
  * @author Eric Bruneton
  */
@@ -71,28 +71,28 @@ public interface SignatureVisitor {
 
     /**
      * Visits a formal type parameter.
-     * 
+     *
      * @param name the name of the formal parameter.
      */
     void visitFormalTypeParameter(String name);
 
     /**
      * Visits the class bound of the last visited formal type parameter.
-     * 
+     *
      * @return a non null visitor to visit the signature of the class bound.
      */
     SignatureVisitor visitClassBound();
 
     /**
      * Visits an interface bound of the last visited formal type parameter.
-     * 
+     *
      * @return a non null visitor to visit the signature of the interface bound.
      */
     SignatureVisitor visitInterfaceBound();
 
     /**
      * Visits the type of the super class.
-     * 
+     *
      * @return a non null visitor to visit the signature of the super class
      *         type.
      */
@@ -100,35 +100,35 @@ public interface SignatureVisitor {
 
     /**
      * Visits the type of an interface implemented by the class.
-     * 
+     *
      * @return a non null visitor to visit the signature of the interface type.
      */
     SignatureVisitor visitInterface();
 
     /**
      * Visits the type of a method parameter.
-     * 
+     *
      * @return a non null visitor to visit the signature of the parameter type.
      */
     SignatureVisitor visitParameterType();
 
     /**
      * Visits the return type of the method.
-     * 
+     *
      * @return a non null visitor to visit the signature of the return type.
      */
     SignatureVisitor visitReturnType();
 
     /**
      * Visits the type of a method exception.
-     * 
+     *
      * @return a non null visitor to visit the signature of the exception type.
      */
     SignatureVisitor visitExceptionType();
 
     /**
      * Visits a signature corresponding to a primitive type.
-     * 
+     *
      * @param descriptor the descriptor of the primitive type, or 'V' for
      *        <tt>void</tt>.
      */
@@ -136,14 +136,14 @@ public interface SignatureVisitor {
 
     /**
      * Visits a signature corresponding to a type variable.
-     * 
+     *
      * @param name the name of the type variable.
      */
     void visitTypeVariable(String name);
 
     /**
      * Visits a signature corresponding to an array type.
-     * 
+     *
      * @return a non null visitor to visit the signature of the array element
      *         type.
      */
@@ -152,14 +152,14 @@ public interface SignatureVisitor {
     /**
      * Starts the visit of a signature corresponding to a class or interface
      * type.
-     * 
+     *
      * @param name the internal name of the class or interface.
      */
     void visitClassType(String name);
 
     /**
      * Visits an inner class.
-     * 
+     *
      * @param name the local name of the inner class in its enclosing class.
      */
     void visitInnerClassType(String name);
@@ -172,7 +172,7 @@ public interface SignatureVisitor {
 
     /**
      * Visits a type argument of the last visited class or inner class type.
-     * 
+     *
      * @param wildcard '+', '-' or '='.
      * @return a non null visitor to visit the signature of the type argument.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java
index b78d666a59c..833d688b8c5 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/signature/SignatureWriter.java
@@ -31,7 +31,7 @@ package org.objectweb.asm.signature;
 
 /**
  * A signature visitor that generates signatures in string format.
- * 
+ *
  * @author Thomas Hallgren
  * @author Eric Bruneton
  */
@@ -174,7 +174,7 @@ public class SignatureWriter implements SignatureVisitor {
 
     /**
      * Returns the signature that was built by this signature writer.
-     * 
+     *
      * @return the signature that was built by this signature writer.
      */
     public String toString() {
@@ -204,4 +204,4 @@ public class SignatureWriter implements SignatureVisitor {
         }
         argumentStack /= 2;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java
index 1f695e00ef9..e0009da9865 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AbstractInsnNode.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents a bytecode instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public abstract class AbstractInsnNode {
@@ -110,7 +110,7 @@ public abstract class AbstractInsnNode {
 
     /**
      * Constructs a new {@link AbstractInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the instruction to be constructed.
      */
     protected AbstractInsnNode(final int opcode) {
@@ -119,7 +119,7 @@ public abstract class AbstractInsnNode {
 
     /**
      * Returns the opcode of this instruction.
-     * 
+     *
      * @return the opcode of this instruction.
      */
     public int getOpcode() {
@@ -128,7 +128,7 @@ public abstract class AbstractInsnNode {
 
     /**
      * Returns the type of this instruction.
-     * 
+     *
      * @return the type of this instruction, i.e. one the constants defined in
      *         this class.
      */
@@ -136,7 +136,7 @@ public abstract class AbstractInsnNode {
 
     /**
      * Makes the given code visitor visit this instruction.
-     * 
+     *
      * @param cv a code visitor.
      */
     public abstract void accept(final MethodVisitor cv);
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java
index 4911e3e6e57..c9c1cb98f0e 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/AnnotationNode.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.AnnotationVisitor;
 
 /**
  * A node that represents an annotationn.
- * 
+ *
  * @author Eric Bruneton
  */
 public class AnnotationNode implements AnnotationVisitor {
@@ -61,7 +61,7 @@ public class AnnotationNode implements AnnotationVisitor {
 
     /**
      * Constructs a new {@link AnnotationNode}.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      */
     public AnnotationNode(final String desc) {
@@ -70,7 +70,7 @@ public class AnnotationNode implements AnnotationVisitor {
 
     /**
      * Constructs a new {@link AnnotationNode} to visit an array value.
-     * 
+     *
      * @param values where the visited values must be stored.
      */
     AnnotationNode(final List values) {
@@ -141,7 +141,7 @@ public class AnnotationNode implements AnnotationVisitor {
 
     /**
      * Makes the given visitor visit this annotation.
-     * 
+     *
      * @param av an annotation visitor.
      */
     public void accept(final AnnotationVisitor av) {
@@ -157,7 +157,7 @@ public class AnnotationNode implements AnnotationVisitor {
 
     /**
      * Makes the given visitor visit a given annotation value.
-     * 
+     *
      * @param av an annotation visitor.
      * @param name the value name.
      * @param value the actual value.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/ClassNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/ClassNode.java
index 0771c87dc85..85134e3a546 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/ClassNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/ClassNode.java
@@ -40,7 +40,7 @@ import java.util.Arrays;
 
 /**
  * A node that represents a class.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ClassNode extends MemberNode implements ClassVisitor {
@@ -115,7 +115,7 @@ public class ClassNode extends MemberNode implements ClassVisitor {
     /**
      * Informations about the inner classes of this class. This list is a list
      * of {@link InnerClassNode} objects.
-     * 
+     *
      * @associates org.objectweb.asm.tree.InnerClassNode
      */
     public List innerClasses;
@@ -123,7 +123,7 @@ public class ClassNode extends MemberNode implements ClassVisitor {
     /**
      * The fields of this class. This list is a list of {@link FieldNode}
      * objects.
-     * 
+     *
      * @associates org.objectweb.asm.tree.FieldNode
      */
     public List fields;
@@ -131,7 +131,7 @@ public class ClassNode extends MemberNode implements ClassVisitor {
     /**
      * The methods of this class. This list is a list of {@link MethodNode}
      * objects.
-     * 
+     *
      * @associates org.objectweb.asm.tree.MethodNode
      */
     public List methods;
@@ -233,7 +233,7 @@ public class ClassNode extends MemberNode implements ClassVisitor {
 
     /**
      * Makes the given class visitor visit this class.
-     * 
+     *
      * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java
index 4399e3a25e1..2ae5388b11c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 /**
  * A node that represents a field instruction. A field instruction is an
  * instruction that loads or stores the value of a field of an object.
- * 
+ *
  * @author Eric Bruneton
  */
 public class FieldInsnNode extends AbstractInsnNode {
@@ -57,7 +57,7 @@ public class FieldInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link FieldInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be constructed. This
      *        opcode must be GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD.
      * @param owner the internal name of the field's owner class (see
@@ -79,7 +79,7 @@ public class FieldInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be GETSTATIC,
      *        PUTSTATIC, GETFIELD or PUTFIELD.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldNode.java
index c13ac9e22f1..8a97b1cbc38 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/FieldNode.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.FieldVisitor;
 
 /**
  * A node that represents a field.
- * 
+ *
  * @author Eric Bruneton
  */
 public class FieldNode extends MemberNode implements FieldVisitor {
@@ -70,7 +70,7 @@ public class FieldNode extends MemberNode implements FieldVisitor {
 
     /**
      * Constructs a new {@link FieldNode}.
-     * 
+     *
      * @param access the field's access flags (see
      *        {@link org.objectweb.asm.Opcodes}). This parameter also indicates
      *        if the field is synthetic and/or deprecated.
@@ -98,7 +98,7 @@ public class FieldNode extends MemberNode implements FieldVisitor {
 
     /**
      * Makes the given class visitor visit this field.
-     * 
+     *
      * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java
index e7e79dc5145..b5399b07d30 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IincInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.Opcodes;
 
 /**
  * A node that represents an IINC instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class IincInsnNode extends AbstractInsnNode {
@@ -51,7 +51,7 @@ public class IincInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link IincInsnNode}.
-     * 
+     *
      * @param var index of the local variable to be incremented.
      * @param incr increment amount to increment the local variable by.
      */
@@ -68,4 +68,4 @@ public class IincInsnNode extends AbstractInsnNode {
     public int getType() {
         return IINC_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java
index a325317b46e..6af060ee8d8 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InnerClassNode.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.ClassVisitor;
 
 /**
  * A node that represents an inner class.
- * 
+ *
  * @author Eric Bruneton
  */
 public class InnerClassNode {
@@ -65,7 +65,7 @@ public class InnerClassNode {
 
     /**
      * Constructs a new {@link InnerClassNode}.
-     * 
+     *
      * @param name the internal name of an inner class (see
      *        {@link org.objectweb.asm.Type#getInternalName() getInternalName}).
      * @param outerName the internal name of the class to which the inner class
@@ -92,7 +92,7 @@ public class InnerClassNode {
 
     /**
      * Makes the given class visitor visit this inner class.
-     * 
+     *
      * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InsnNode.java
index 434dd5b313d..718272600d7 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/InsnNode.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents a zero operand instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class InsnNode extends AbstractInsnNode {
@@ -49,9 +49,9 @@ public class InsnNode extends AbstractInsnNode {
 
     /**
      * Returns the {@link InsnNode} corresponding to the given opcode.
-     * 
+     *
      * @deprecated uses the constructor instead.
-     * 
+     *
      * @param opcode an instruction opcode.
      * @return the {@link InsnNode} corresponding to the given opcode.
      */
@@ -61,7 +61,7 @@ public class InsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link InsnNode}.
-     * 
+     *
      * @param opcode the opcode of the instruction to be constructed. This
      *        opcode must be NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1,
      *        ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1,
@@ -83,7 +83,7 @@ public class InsnNode extends AbstractInsnNode {
 
     /**
      * Makes the given visitor visit this instruction.
-     * 
+     *
      * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java
index 2c200a58567..b9b02e382fb 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/IntInsnNode.java
@@ -33,7 +33,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents an instruction with a single int operand.
- * 
+ *
  * @author Eric Bruneton
  */
 public class IntInsnNode extends AbstractInsnNode {
@@ -45,7 +45,7 @@ public class IntInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link IntInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the instruction to be constructed. This
      *        opcode must be BIPUSH, SIPUSH or NEWARRAY.
      * @param operand the operand of the instruction to be constructed.
@@ -57,7 +57,7 @@ public class IntInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be BIPUSH,
      *        SIPUSH or NEWARRAY.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java
index 5ab6e11ee53..7dccf32beb6 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/JumpInsnNode.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.MethodVisitor;
 /**
  * A node that represents a jump instruction. A jump instruction is an
  * instruction that may jump to another instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class JumpInsnNode extends AbstractInsnNode {
@@ -48,7 +48,7 @@ public class JumpInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link JumpInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be constructed. This
      *        opcode must be IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ,
      *        IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ,
@@ -64,7 +64,7 @@ public class JumpInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be IFEQ, IFNE,
      *        IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT,
      *        IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, IF_ACMPEQ, IF_ACMPNE, GOTO, JSR,
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LabelNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LabelNode.java
index 5eead6e3380..0f8c933512f 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LabelNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LabelNode.java
@@ -51,4 +51,4 @@ public class LabelNode extends AbstractInsnNode {
     public int getType() {
         return LABEL;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java
index ef955137109..234b41fe3f5 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LdcInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.Opcodes;
 
 /**
  * A node that represents an LDC instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class LdcInsnNode extends AbstractInsnNode {
@@ -48,7 +48,7 @@ public class LdcInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link LdcInsnNode}.
-     * 
+     *
      * @param cst the constant to be loaded on the stack. This parameter must be
      *        a non null {@link Integer}, a {@link Float}, a {@link Long}, a
      *        {@link Double} or a {@link String}.
@@ -65,4 +65,4 @@ public class LdcInsnNode extends AbstractInsnNode {
     public int getType() {
         return LDC_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java
index 0d4974749b6..2a34988445c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LineNumberNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents a line number declaration.
- * 
+ *
  * @author Eric Bruneton
  */
 public class LineNumberNode {
@@ -52,7 +52,7 @@ public class LineNumberNode {
 
     /**
      * Constructs a new {@link LineNumberNode}.
-     * 
+     *
      * @param line a line number. This number refers to the source file from
      *        which the class was compiled.
      * @param start the first instruction corresponding to this line number.
@@ -64,7 +64,7 @@ public class LineNumberNode {
 
     /**
      * Makes the given visitor visit this line number declaration.
-     * 
+     *
      * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java
index b9efe44e314..511dcf96493 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LocalVariableNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.Label;
 
 /**
  * A node that represents a local variable declaration.
- * 
+ *
  * @author Eric Bruneton
  */
 public class LocalVariableNode {
@@ -73,7 +73,7 @@ public class LocalVariableNode {
 
     /**
      * Constructs a new {@link LocalVariableNode}.
-     * 
+     *
      * @param name the name of a local variable.
      * @param desc the type descriptor of this local variable.
      * @param signature the signature of this local variable. May be
@@ -102,7 +102,7 @@ public class LocalVariableNode {
 
     /**
      * Makes the given visitor visit this local variable declaration.
-     * 
+     *
      * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
index 1c8e69fcc60..31eb234e8f4 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/LookupSwitchInsnNode.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
 
 /**
  * A node that represents a LOOKUPSWITCH instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class LookupSwitchInsnNode extends AbstractInsnNode {
@@ -62,7 +62,7 @@ public class LookupSwitchInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link LookupSwitchInsnNode}.
-     * 
+     *
      * @param dflt beginning of the default handler block.
      * @param keys the values of the keys.
      * @param labels beginnings of the handler blocks. <tt>labels[i]</tt> is
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MemberNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MemberNode.java
index 86b1c5c7bf8..11dfad8622c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MemberNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MemberNode.java
@@ -37,7 +37,7 @@ import org.objectweb.asm.Attribute;
 
 /**
  * An abstract class, field or method node.
- * 
+ *
  * @author Eric Bruneton
  */
 public abstract class MemberNode {
@@ -45,7 +45,7 @@ public abstract class MemberNode {
     /**
      * The runtime visible annotations of this class, field or method. This list
      * is a list of {@link AnnotationNode} objects. May be <tt>null</tt>.
-     * 
+     *
      * @associates org.objectweb.asm.tree.AnnotationNode
      * @label visible
      */
@@ -54,7 +54,7 @@ public abstract class MemberNode {
     /**
      * The runtime invisible annotations of this class, field or method. This
      * list is a list of {@link AnnotationNode} objects. May be <tt>null</tt>.
-     * 
+     *
      * @associates org.objectweb.asm.tree.AnnotationNode
      * @label invisible
      */
@@ -63,7 +63,7 @@ public abstract class MemberNode {
     /**
      * The non standard attributes of this class, field or method. This list is
      * a list of {@link Attribute} objects. May be <tt>null</tt>.
-     * 
+     *
      * @associates org.objectweb.asm.Attribute
      */
     public List attrs;
@@ -76,7 +76,7 @@ public abstract class MemberNode {
 
     /**
      * Visits an annotation of this class, field or method.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a visitor to visit the annotation values.
@@ -102,7 +102,7 @@ public abstract class MemberNode {
 
     /**
      * Visits a non standard attribute of this class, field or method.
-     * 
+     *
      * @param attr an attribute.
      */
     public void visitAttribute(final Attribute attr) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java
index 714aabe6e9b..f227447069b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 /**
  * A node that represents a method instruction. A method instruction is an
  * instruction that invokes a method.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MethodInsnNode extends AbstractInsnNode {
@@ -57,7 +57,7 @@ public class MethodInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link MethodInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be constructed. This
      *        opcode must be INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or
      *        INVOKEINTERFACE.
@@ -80,7 +80,7 @@ public class MethodInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be
      *        INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or INVOKEINTERFACE.
      */
@@ -95,4 +95,4 @@ public class MethodInsnNode extends AbstractInsnNode {
     public int getType() {
         return METHOD_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodNode.java
index f746bfa3ffd..9d0b2e9cf52 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MethodNode.java
@@ -43,7 +43,7 @@ import java.util.Arrays;
 
 /**
  * A node that represents a method.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MethodNode extends MemberNode implements MethodVisitor {
@@ -89,7 +89,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The runtime visible parameter annotations of this method. These lists are
      * lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
-     * 
+     *
      * @associates org.objectweb.asm.tree.AnnotationNode
      * @label invisible parameters
      */
@@ -98,7 +98,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The runtime invisible parameter annotations of this method. These lists
      * are lists of {@link AnnotationNode} objects. May be <tt>null</tt>.
-     * 
+     *
      * @associates org.objectweb.asm.tree.AnnotationNode
      * @label visible parameters
      */
@@ -107,7 +107,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The instructions of this method. This list is a list of
      * {@link AbstractInsnNode} objects.
-     * 
+     *
      * @associates org.objectweb.asm.tree.AbstractInsnNode
      * @label instructions
      */
@@ -116,7 +116,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The try catch blocks of this method. This list is a list of
      * {@link TryCatchBlockNode} objects.
-     * 
+     *
      * @associates org.objectweb.asm.tree.TryCatchBlockNode
      */
     public List tryCatchBlocks;
@@ -134,7 +134,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The local variables of this method. This list is a list of
      * {@link LocalVariableNode} objects. May be <tt>null</tt>
-     * 
+     *
      * @associates org.objectweb.asm.tree.LocalVariableNode
      */
     public List localVariables;
@@ -142,14 +142,14 @@ public class MethodNode extends MemberNode implements MethodVisitor {
     /**
      * The line numbers of this method. This list is a list of
      * {@link LineNumberNode} objects. May be <tt>null</tt>
-     * 
+     *
      * @associates org.objectweb.asm.tree.LineNumberNode
      */
     public List lineNumbers;
 
     /**
      * Constructs a new {@link MethodNode}.
-     * 
+     *
      * @param access the method's access flags (see {@link Opcodes}). This
      *        parameter also indicates if the method is synthetic and/or
      *        deprecated.
@@ -341,7 +341,7 @@ public class MethodNode extends MemberNode implements MethodVisitor {
 
     /**
      * Makes the given class visitor visit this method.
-     * 
+     *
      * @param cv a class visitor.
      */
     public void accept(final ClassVisitor cv) {
@@ -356,10 +356,10 @@ public class MethodNode extends MemberNode implements MethodVisitor {
             accept(mv);
         }
     }
-    
+
     /**
      * Makes the given method visitor visit this method.
-     * 
+     *
      * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
index a9cb3c14a1c..ed81347dcd6 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/MultiANewArrayInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents a MULTIANEWARRAY instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class MultiANewArrayInsnNode extends AbstractInsnNode {
@@ -51,7 +51,7 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link MultiANewArrayInsnNode}.
-     * 
+     *
      * @param desc an array type descriptor (see {@link org.objectweb.asm.Type}).
      * @param dims number of dimensions of the array to allocate.
      */
@@ -68,4 +68,4 @@ public class MultiANewArrayInsnNode extends AbstractInsnNode {
     public int getType() {
         return MULTIANEWARRAY_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
index fa5e3f8207b..840309dd69b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TableSwitchInsnNode.java
@@ -39,7 +39,7 @@ import java.util.List;
 
 /**
  * A node that represents a TABLESWITCH instruction.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TableSwitchInsnNode extends AbstractInsnNode {
@@ -67,7 +67,7 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link TableSwitchInsnNode}.
-     * 
+     *
      * @param min the minimum key value.
      * @param max the maximum key value.
      * @param dflt beginning of the default handler block.
@@ -99,4 +99,4 @@ public class TableSwitchInsnNode extends AbstractInsnNode {
     public int getType() {
         return TABLESWITCH_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
index 18cd3102240..56b146574ed 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TryCatchBlockNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * A node that represents a try catch block.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TryCatchBlockNode {
@@ -62,7 +62,7 @@ public class TryCatchBlockNode {
 
     /**
      * Constructs a new {@link TryCatchBlockNode}.
-     * 
+     *
      * @param start beginning of the exception handler's scope (inclusive).
      * @param end end of the exception handler's scope (exclusive).
      * @param handler beginning of the exception handler's code.
@@ -84,7 +84,7 @@ public class TryCatchBlockNode {
 
     /**
      * Makes the given visitor visit this try catch block.
-     * 
+     *
      * @param mv a method visitor.
      */
     public void accept(final MethodVisitor mv) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java
index 67c6b841eae..9f830b4ddf9 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/TypeInsnNode.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.MethodVisitor;
 /**
  * A node that represents a type instruction. A type instruction is an
  * instruction that takes a type descriptor as parameter.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TypeInsnNode extends AbstractInsnNode {
@@ -47,7 +47,7 @@ public class TypeInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link TypeInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the type instruction to be constructed. This
      *        opcode must be NEW, ANEWARRAY, CHECKCAST or INSTANCEOF.
      * @param desc the operand of the instruction to be constructed. This
@@ -60,7 +60,7 @@ public class TypeInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be NEW,
      *        ANEWARRAY, CHECKCAST or INSTANCEOF.
      */
@@ -75,4 +75,4 @@ public class TypeInsnNode extends AbstractInsnNode {
     public int getType() {
         return TYPE_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java
index 2fe3a952a50..92e28ded0fd 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/VarInsnNode.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.MethodVisitor;
  * A node that represents a local variable instruction. A local variable
  * instruction is an instruction that loads or stores the value of a local
  * variable.
- * 
+ *
  * @author Eric Bruneton
  */
 public class VarInsnNode extends AbstractInsnNode {
@@ -48,7 +48,7 @@ public class VarInsnNode extends AbstractInsnNode {
 
     /**
      * Constructs a new {@link VarInsnNode}.
-     * 
+     *
      * @param opcode the opcode of the local variable instruction to be
      *        constructed. This opcode must be ILOAD, LLOAD, FLOAD, DLOAD,
      *        ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET.
@@ -62,7 +62,7 @@ public class VarInsnNode extends AbstractInsnNode {
 
     /**
      * Sets the opcode of this instruction.
-     * 
+     *
      * @param opcode the new instruction opcode. This opcode must be ILOAD,
      *        LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE, ASTORE
      *        or RET.
@@ -78,4 +78,4 @@ public class VarInsnNode extends AbstractInsnNode {
     public int getType() {
         return VAR_INSN;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java
index 9fd402831cc..cfd48149c3b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Analyzer.java
@@ -47,7 +47,7 @@ import org.objectweb.asm.tree.VarInsnNode;
 
 /**
  * A semantic bytecode analyzer.
- * 
+ *
  * @author Eric Bruneton
  */
 public class Analyzer implements Opcodes {
@@ -74,7 +74,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Constructs a new {@link Analyzer}.
-     * 
+     *
      * @param interpreter the interpreter to be used to symbolically interpret
      *        the bytecode instructions.
      */
@@ -84,7 +84,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Analyzes the given method.
-     * 
+     *
      * @param owner the internal name of the class to which the method belongs.
      * @param m the method to be analyzed.
      * @return the symbolic state of the execution stack frame at each bytecode
@@ -263,7 +263,7 @@ public class Analyzer implements Opcodes {
     /**
      * Returns the symbolic stack frame for each instruction of the last
      * recently analyzed method.
-     * 
+     *
      * @return the symbolic state of the execution stack frame at each bytecode
      *         instruction of the method. The size of the returned array is
      *         equal to the number of instructions (and labels) of the method. A
@@ -277,7 +277,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Returns the index of the given instruction.
-     * 
+     *
      * @param insn a {@link Label} or {@link AbstractInsnNode} of the last
      *        recently analyzed method.
      * @return the index of the given instruction of the last recently analyzed
@@ -289,7 +289,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Returns the exception handlers for the given instruction.
-     * 
+     *
      * @param insn the index of an instruction of the last recently analyzed
      *        method.
      * @return a list of {@link TryCatchBlockNode} objects.
@@ -300,7 +300,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Constructs a new frame with the given size.
-     * 
+     *
      * @param nLocals the maximum number of local variables of the frame.
      * @param nStack the maximum stack size of the frame.
      * @return the created frame.
@@ -311,7 +311,7 @@ public class Analyzer implements Opcodes {
 
     /**
      * Constructs a new frame that is identical to the given frame.
-     * 
+     *
      * @param src a frame.
      * @return the created frame.
      */
@@ -324,7 +324,7 @@ public class Analyzer implements Opcodes {
      * method does nothing. It can be overriden in order to construct the
      * control flow graph of a method (this method is called by the
      * {@link #analyze analyze} method during its visit of the method's code).
-     * 
+     *
      * @param frame the frame corresponding to an instruction.
      * @param successor the frame corresponding to a successor instruction.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
index 3e0afac9797..c024fbade75 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/AnalyzerException.java
@@ -31,7 +31,7 @@ package org.objectweb.asm.tree.analysis;
 
 /**
  * Thrown if a problem occurs during the analysis of a method.
- * 
+ *
  * @author Bing Ran
  * @author Eric Bruneton
  */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
index b92b57c2fee..5e0c70277c9 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicInterpreter.java
@@ -43,7 +43,7 @@ import org.objectweb.asm.tree.TypeInsnNode;
 
 /**
  * An {@link Interpreter} for {@link BasicValue} values.
- * 
+ *
  * @author Eric Bruneton
  * @author Bing Ran
  */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java
index 19cdb33a959..46b8cf49a4a 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicValue.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.Type;
  * A {@link Value} that is represented by its type in a seven types type sytem.
  * This type system distinguishes the UNINITIALZED, INT, FLOAT, LONG, DOUBLE,
  * REFERENCE and RETURNADDRESS types.
- * 
+ *
  * @author Eric Bruneton
  */
 public class BasicValue implements Value {
@@ -102,4 +102,4 @@ public class BasicValue implements Value {
             return type.getDescriptor();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
index 0a797d493e7..f65b56d8ec7 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/BasicVerifier.java
@@ -39,7 +39,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
 /**
  * An extended {@link BasicInterpreter} that checks that bytecode instructions
  * are correctly used.
- * 
+ *
  * @author Eric Bruneton
  * @author Bing Ran
  */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java
index 07edd74f920..3847d494948 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowInterpreter.java
@@ -42,7 +42,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
 
 /**
  * An {@link Interpreter} for {@link DataflowValue} values.
- * 
+ *
  * @author Eric Bruneton
  */
 public class DataflowInterpreter implements Opcodes, Interpreter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java
index 0019d7f2c5d..7b7756f7864 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/DataflowValue.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.tree.AbstractInsnNode;
 /**
  * A {@link Value} that is represented by its type in a two types type system.
  * This type system distinguishes the ONEWORD and TWOWORDS types.
- * 
+ *
  * @author Eric Bruneton
  */
 public class DataflowValue implements Value {
@@ -50,7 +50,7 @@ public class DataflowValue implements Value {
      * The instructions that can produce this value. For example, for the Java
      * code below, the instructions that can produce the value of <tt>i</tt>
      * at line 5 are the txo ISTORE instructions at line 1 and 3:
-     * 
+     *
      * <pre>
      * 1: i = 0;
      * 2: if (...) {
@@ -58,7 +58,7 @@ public class DataflowValue implements Value {
      * 4: }
      * 5: return i;
      * </pre>
-     * 
+     *
      * This field is a set of {@link AbstractInsnNode} objects.
      */
     public final Set insns;
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java
index bc2d873e94d..1edf40c3da6 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Frame.java
@@ -45,7 +45,7 @@ import org.objectweb.asm.tree.VarInsnNode;
  * variable slots, and an operand stack. Warning: long and double values are
  * represented by <i>two</i> slots in local variables, and by <i>one</i> slot
  * in the operand stack.
- * 
+ *
  * @author Eric Bruneton
  */
 public class Frame {
@@ -67,7 +67,7 @@ public class Frame {
 
     /**
      * Constructs a new frame with the given size.
-     * 
+     *
      * @param nLocals the maximum number of local variables of the frame.
      * @param nStack the maximum stack size of the frame.
      */
@@ -78,7 +78,7 @@ public class Frame {
 
     /**
      * Constructs a new frame that is identical to the given frame.
-     * 
+     *
      * @param src a frame.
      */
     public Frame(final Frame src) {
@@ -88,7 +88,7 @@ public class Frame {
 
     /**
      * Copies the state of the given frame into this frame.
-     * 
+     *
      * @param src a frame.
      * @return this frame.
      */
@@ -100,7 +100,7 @@ public class Frame {
 
     /**
      * Returns the maximum number of local variables of this frame.
-     * 
+     *
      * @return the maximum number of local variables of this frame.
      */
     public int getLocals() {
@@ -109,7 +109,7 @@ public class Frame {
 
     /**
      * Returns the value of the given local variable.
-     * 
+     *
      * @param i a local variable index.
      * @return the value of the given local variable.
      * @throws IndexOutOfBoundsException if the variable does not exist.
@@ -123,7 +123,7 @@ public class Frame {
 
     /**
      * Sets the value of the given local variable.
-     * 
+     *
      * @param i a local variable index.
      * @param value the new value of this local variable.
      * @throws IndexOutOfBoundsException if the variable does not exist.
@@ -140,7 +140,7 @@ public class Frame {
     /**
      * Returns the number of values in the operand stack of this frame. Long and
      * double values are treated as single values.
-     * 
+     *
      * @return the number of values in the operand stack of this frame.
      */
     public int getStackSize() {
@@ -149,7 +149,7 @@ public class Frame {
 
     /**
      * Returns the value of the given operand stack slot.
-     * 
+     *
      * @param i the index of an operand stack slot.
      * @return the value of the given operand stack slot.
      * @throws IndexOutOfBoundsException if the operand stack slot does not
@@ -171,7 +171,7 @@ public class Frame {
 
     /**
      * Pops a value from the operand stack of this frame.
-     * 
+     *
      * @return the value that has been popped from the stack.
      * @throws IndexOutOfBoundsException if the operand stack is empty.
      */
@@ -184,7 +184,7 @@ public class Frame {
 
     /**
      * Pushes a value into the operand stack of this frame.
-     * 
+     *
      * @param value the value that must be pushed into the stack.
      * @throws IndexOutOfBoundsException if the operand stack is full.
      */
@@ -607,7 +607,7 @@ public class Frame {
 
     /**
      * Merges this frame with the given frame.
-     * 
+     *
      * @param frame a frame.
      * @param interpreter the interpreter used to merge values.
      * @return <tt>true</tt> if this frame has been changed as a result of the
@@ -633,7 +633,7 @@ public class Frame {
 
     /**
      * Merges this frame with the given frame (case of a RET instruction).
-     * 
+     *
      * @param frame a frame
      * @param access the local variables that have been accessed by the
      *        subroutine to which the RET instruction corresponds.
@@ -653,7 +653,7 @@ public class Frame {
 
     /**
      * Returns a string representation of this frame.
-     * 
+     *
      * @return a string representation of this frame.
      */
     public String toString() {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java
index 9528482e727..cac091cb717 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/IntMap.java
@@ -31,7 +31,7 @@ package org.objectweb.asm.tree.analysis;
 
 /**
  * A fixed size map of integer values.
- * 
+ *
  * @author Eric Bruneton
  */
 class IntMap {
@@ -50,7 +50,7 @@ class IntMap {
 
     public int get(final Object key) {
         int n = size;
-        int h = (key.hashCode() & 0x7FFFFFFF) % n; 
+        int h = (key.hashCode() & 0x7FFFFFFF) % n;
         int i = h;
         while (keys[i] != key) {
             i = (i + 1) % n;
@@ -70,4 +70,4 @@ class IntMap {
         keys[i] = key;
         values[i] = value;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java
index f7a2f5301c3..f989f4baf45 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Interpreter.java
@@ -41,18 +41,18 @@ import org.objectweb.asm.tree.AbstractInsnNode;
  * This separation allows a generic bytecode {@link Analyzer} to work with
  * various semantic interpreters, without needing to duplicate the code to
  * simulate the transfer of values.
- * 
+ *
  * @author Eric Bruneton
  */
 public interface Interpreter {
 
     /**
      * Creates a new value that represents the given type.
-     * 
+     *
      * Called for method parameters (including <code>this</code>),
-     * exception handler variable and with <code>null</code> type 
+     * exception handler variable and with <code>null</code> type
      * for variables reserved by long and double types.
-     * 
+     *
      * @param type a primitive or reference type, or <tt>null</tt> to
      *        represent an uninitialized value.
      * @return a value that represents the given type. The size of the returned
@@ -63,11 +63,11 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction without arguments. This method is
      * called for the following opcodes:
-     * 
+     *
      * ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4,
      * ICONST_5, LCONST_0, LCONST_1, FCONST_0, FCONST_1, FCONST_2, DCONST_0,
      * DCONST_1, BIPUSH, SIPUSH, LDC, JSR, GETSTATIC, NEW
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @return the result of the interpretation of the given instruction.
      * @throws AnalyzerException if an error occured during the interpretation.
@@ -77,10 +77,10 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction that moves a value on the stack or to
      * or from local variables. This method is called for the following opcodes:
-     * 
+     *
      * ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, ISTORE, LSTORE, FSTORE, DSTORE,
      * ASTORE, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, DUP2_X2, SWAP
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @param value the value that must be moved by the instruction.
      * @return the result of the interpretation of the given instruction. The
@@ -93,13 +93,13 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction with a single argument. This method is
      * called for the following opcodes:
-     * 
+     *
      * INEG, LNEG, FNEG, DNEG, IINC, I2L, I2F, I2D, L2I, L2F, L2D, F2I, F2L,
      * F2D, D2I, D2L, D2F, I2B, I2C, I2S, IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE,
      * TABLESWITCH, LOOKUPSWITCH, IRETURN, LRETURN, FRETURN, DRETURN, ARETURN,
      * PUTSTATIC, GETFIELD, NEWARRAY, ANEWARRAY, ARRAYLENGTH, ATHROW, CHECKCAST,
      * INSTANCEOF, MONITORENTER, MONITOREXIT, IFNULL, IFNONNULL
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @param value the argument of the instruction to be interpreted.
      * @return the result of the interpretation of the given instruction.
@@ -111,14 +111,14 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction with two arguments. This method is
      * called for the following opcodes:
-     * 
+     *
      * IALOAD, LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, IADD,
      * LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB, IMUL, LMUL, FMUL, DMUL, IDIV,
      * LDIV, FDIV, DDIV, IREM, LREM, FREM, DREM, ISHL, LSHL, ISHR, LSHR, IUSHR,
      * LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, LCMP, FCMPL, FCMPG, DCMPL,
      * DCMPG, IF_ICMPEQ, IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE,
      * IF_ACMPEQ, IF_ACMPNE, PUTFIELD
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @param value1 the first argument of the instruction to be interpreted.
      * @param value2 the second argument of the instruction to be interpreted.
@@ -131,9 +131,9 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction with three arguments. This method is
      * called for the following opcodes:
-     * 
+     *
      * IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, SASTORE
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @param value1 the first argument of the instruction to be interpreted.
      * @param value2 the second argument of the instruction to be interpreted.
@@ -150,10 +150,10 @@ public interface Interpreter {
     /**
      * Interprets a bytecode instruction with a variable number of arguments.
      * This method is called for the following opcodes:
-     * 
+     *
      * INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC, INVOKEINTERFACE,
      * MULTIANEWARRAY
-     * 
+     *
      * @param insn the bytecode instruction to be interpreted.
      * @param values the arguments of the instruction to be interpreted.
      * @return the result of the interpretation of the given instruction.
@@ -168,7 +168,7 @@ public interface Interpreter {
      * the merged value must be a common super type of the two types. If the two
      * values are integer intervals, the merged value must be an interval that
      * contains the previous ones. Likewise for other types of values).
-     * 
+     *
      * @param v a value.
      * @param w another value.
      * @return the merged value. If the merged value is equal to <tt>v</tt>,
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
index 808b3f41cba..1329f77b89c 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SimpleVerifier.java
@@ -37,7 +37,7 @@ import org.objectweb.asm.Type;
  * An extended {@link BasicVerifier} that performs more precise verifications.
  * This verifier computes exact class types, instead of using a single "object
  * reference" type (as done in the {@link BasicVerifier}).
- * 
+ *
  * @author Eric Bruneton
  * @author Bing Ran
  */
@@ -73,7 +73,7 @@ public class SimpleVerifier extends BasicVerifier {
     /**
      * Constructs a new {@link SimpleVerifier} to verify a specific class. This
      * class will not be loaded into the JVM since it may be incorrect.
-     * 
+     *
      * @param currentClass the class that is verified.
      * @param currentSuperClass the super class of the class that is verified.
      * @param isInterface if the class that is verified is an interface.
@@ -89,7 +89,7 @@ public class SimpleVerifier extends BasicVerifier {
     /**
      * Constructs a new {@link SimpleVerifier} to verify a specific class. This
      * class will not be loaded into the JVM since it may be incorrect.
-     * 
+     *
      * @param currentClass the class that is verified.
      * @param currentSuperClass the super class of the class that is verified.
      * @param currentClassInterfaces the interfaces implemented by the class
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java
index 74bd590ef1c..3049d5a7852 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/SmallSet.java
@@ -36,7 +36,7 @@ import java.util.Set;
 
 /**
  * A set of at most two elements.
- * 
+ *
  * @author Eric Bruneton
  */
 class SmallSet extends AbstractSet implements Iterator {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java
index 44120a7217b..5ae01090599 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Subroutine.java
@@ -37,7 +37,7 @@ import org.objectweb.asm.tree.JumpInsnNode;
 
 /**
  * A method subroutine (corresponds to a JSR instruction).
- * 
+ *
  * @author Eric Bruneton
  */
 class Subroutine {
@@ -93,4 +93,4 @@ class Subroutine {
         }
         return changes;
     }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java
index 6578b798665..4baf1b4b364 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/tree/analysis/Value.java
@@ -31,14 +31,14 @@ package org.objectweb.asm.tree.analysis;
 
 /**
  * An immutable symbolic value for semantic interpretation of bytecode.
- * 
+ *
  * @author Eric Bruneton
  */
 public interface Value {
 
     /**
      * Returns the size of this value in words.
-     * 
+     *
      * @return either 1 or 2.
      */
     int getSize();
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java
index 4ebc7fc097c..940bc112ccb 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAbstractVisitor.java
@@ -38,7 +38,7 @@ import org.objectweb.asm.util.attrs.ASMifiable;
 
 /**
  * An abstract ASMifier visitor.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ASMifierAbstractVisitor extends AbstractVisitor {
@@ -56,7 +56,7 @@ public class ASMifierAbstractVisitor extends AbstractVisitor {
 
     /**
      * Constructs a new {@link ASMifierAbstractVisitor}.
-     * 
+     *
      * @param name the name of the variable for this visitor in the produced
      *        code.
      */
@@ -66,7 +66,7 @@ public class ASMifierAbstractVisitor extends AbstractVisitor {
 
     /**
      * Prints the ASM code that generates the given annotation.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a visitor to visit the annotation values.
@@ -91,7 +91,7 @@ public class ASMifierAbstractVisitor extends AbstractVisitor {
 
     /**
      * Prints the ASM code that generates the given attribute.
-     * 
+     *
      * @param attr an attribute.
      */
     public void visitAttribute(final Attribute attr) {
@@ -121,7 +121,7 @@ public class ASMifierAbstractVisitor extends AbstractVisitor {
     /**
      * Appends a string representation of the given constant to the given
      * buffer.
-     * 
+     *
      * @param cst an {@link Integer}, {@link Float}, {@link Long},
      *        {@link Double} or {@link String} object. May be <tt>null</tt>.
      */
@@ -132,7 +132,7 @@ public class ASMifierAbstractVisitor extends AbstractVisitor {
     /**
      * Appends a string representation of the given constant to the given
      * buffer.
-     * 
+     *
      * @param buf a string buffer.
      * @param cst an {@link Integer}, {@link Float}, {@link Long},
      *        {@link Double} or {@link String} object. May be <tt>null</tt>.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java
index bb48e2cdffb..0f766b32e9b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierAnnotationVisitor.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.AnnotationVisitor;
 /**
  * An {@link AnnotationVisitor} that prints the ASM code that generates the
  * annotations it visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ASMifierAnnotationVisitor extends AbstractVisitor implements
@@ -48,7 +48,7 @@ public class ASMifierAnnotationVisitor extends AbstractVisitor implements
 
     /**
      * Constructs a new {@link ASMifierAnnotationVisitor}.
-     * 
+     *
      * @param id identifier of the annotation visitor variable in the produced
      *        code.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java
index 222325f0f1d..d7b73fb75f9 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierClassVisitor.java
@@ -49,28 +49,28 @@ import org.objectweb.asm.Type;
  * {@link #main main} method);</li> <li>edit the generated source code, if
  * necessary.</li> </ul> The source code printed when visiting the
  * <tt>Hello</tt> class is the following: <p> <blockquote>
- * 
+ *
  * <pre>
  * import org.objectweb.asm.*;
- * 
+ *
  * public class HelloDump implements Opcodes {
- * 
+ *
  *     public static byte[] dump() throws Exception {
- * 
+ *
  *         ClassWriter cw = new ClassWriter(false);
  *         FieldVisitor fv;
  *         MethodVisitor mv;
  *         AnnotationVisitor av0;
- * 
+ *
  *         cw.visit(49,
  *                 ACC_PUBLIC + ACC_SUPER,
  *                 "Hello",
  *                 null,
  *                 "java/lang/Object",
  *                 null);
- * 
+ *
  *         cw.visitSource("Hello.java", null);
- * 
+ *
  *         {
  *             mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
  *             mv.visitVarInsn(ALOAD, 0);
@@ -102,26 +102,26 @@ import org.objectweb.asm.Type;
  *             mv.visitEnd();
  *         }
  *         cw.visitEnd();
- * 
+ *
  *         return cw.toByteArray();
  *     }
  * }
- * 
+ *
  * </pre>
- * 
+ *
  * </blockquote> where <tt>Hello</tt> is defined by: <p> <blockquote>
- * 
+ *
  * <pre>
  * public class Hello {
- * 
+ *
  *     public static void main(String[] args) {
  *         System.out.println("hello");
  *     }
  * }
  * </pre>
- * 
+ *
  * </blockquote>
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -153,9 +153,9 @@ public class ASMifierClassVisitor extends ASMifierAbstractVisitor implements
      * Prints the ASM source code to generate the given class to the standard
      * output. <p> Usage: ASMifierClassVisitor [-debug] <fully qualified
      * class name or class file name>
-     * 
+     *
      * @param args the command line arguments.
-     * 
+     *
      * @throws Exception if the class cannot be found, or if an IO exception
      *         occurs.
      */
@@ -194,7 +194,7 @@ public class ASMifierClassVisitor extends ASMifierAbstractVisitor implements
 
     /**
      * Constructs a new {@link ASMifierClassVisitor} object.
-     * 
+     *
      * @param pw the print writer to be used to print the class.
      */
     public ASMifierClassVisitor(final PrintWriter pw) {
@@ -423,7 +423,7 @@ public class ASMifierClassVisitor extends ASMifierAbstractVisitor implements
     /**
      * Appends a string representation of the given access modifiers to {@link
      * #buf buf}.
-     * 
+     *
      * @param access some access modifiers.
      */
     void appendAccess(final int access) {
@@ -578,7 +578,7 @@ public class ASMifierClassVisitor extends ASMifierAbstractVisitor implements
     /**
      * Appends a string representation of the given constant to the given
      * buffer.
-     * 
+     *
      * @param buf a string buffer.
      * @param cst an {@link java.lang.Integer Integer}, {@link java.lang.Float
      *        Float}, {@link java.lang.Long Long},
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java
index 9da152ca357..67321790971 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierFieldVisitor.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.FieldVisitor;
 /**
  * A {@link FieldVisitor} that prints the ASM code that generates the fields it
  * visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class ASMifierFieldVisitor extends ASMifierAbstractVisitor implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java
index 33404d97525..57c55ee2163 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/ASMifierMethodVisitor.java
@@ -39,7 +39,7 @@ import java.util.HashMap;
 /**
  * A {@link MethodVisitor} that prints the ASM code that generates the methods
  * it visits.
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -322,7 +322,7 @@ public class ASMifierMethodVisitor extends ASMifierAbstractVisitor implements
      * Appends a declaration of the given label to {@link #buf buf}. This
      * declaration is of the form "Label lXXX = new Label();". Does nothing if
      * the given label has already been declared.
-     * 
+     *
      * @param l a label.
      */
     private void declareLabel(final Label l) {
@@ -338,7 +338,7 @@ public class ASMifierMethodVisitor extends ASMifierAbstractVisitor implements
      * Appends the name of the given label to {@link #buf buf}. The given label
      * <i>must</i> already have a name. One way to ensure this is to always
      * call {@link #declareLabel declared} before calling this method.
-     * 
+     *
      * @param l a label.
      */
     private void appendLabel(final Label l) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java
index 3e329f7fe4e..557d5c82f0b 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/AbstractVisitor.java
@@ -39,7 +39,7 @@ import org.objectweb.asm.util.attrs.ASMStackMapTableAttribute;
 
 /**
  * An abstract visitor.
- * 
+ *
  * @author Eric Bruneton
  */
 public abstract class AbstractVisitor {
@@ -124,7 +124,7 @@ public abstract class AbstractVisitor {
 
     /**
      * Returns the text printed by this visitor.
-     * 
+     *
      * @return the text printed by this visitor.
      */
     public List getText() {
@@ -133,7 +133,7 @@ public abstract class AbstractVisitor {
 
     /**
      * Appends a quoted string to a given buffer.
-     * 
+     *
      * @param buf the buffer where the string must be added.
      * @param s the string to be added.
      */
@@ -168,7 +168,7 @@ public abstract class AbstractVisitor {
 
     /**
      * Prints the given string tree.
-     * 
+     *
      * @param pw the writer to be used to print the tree.
      * @param l a string tree, i.e., a string list that can contain other string
      *        lists, and so on recursively.
@@ -186,7 +186,7 @@ public abstract class AbstractVisitor {
 
     /**
      * Returns the default {@link ASMifiable} prototypes.
-     * 
+     *
      * @return the default {@link ASMifiable} prototypes.
      */
     public static Attribute[] getDefaultAttributes() {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
index d00933ca528..228ff04ca05 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckAnnotationAdapter.java
@@ -34,7 +34,7 @@ import org.objectweb.asm.Type;
 
 /**
  * An {@link AnnotationVisitor} that checks that its methods are properly used.
- * 
+ *
  * @author Eric Bruneton
  */
 public class CheckAnnotationAdapter implements AnnotationVisitor {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java
index 640e8b08308..1ca97ad6e47 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckClassAdapter.java
@@ -58,7 +58,7 @@ import org.objectweb.asm.tree.analysis.Frame;
  * <tt>visitField(ACC_PUBLIC, "i", "I", null)</tt> <tt>visitField(ACC_PUBLIC,
  * "i", "D", null)</tt>
  * will <i>not</i> be detected by this class adapter.
- * 
+ *
  * @author Eric Bruneton
  */
 public class CheckClassAdapter extends ClassAdapter {
@@ -86,9 +86,9 @@ public class CheckClassAdapter extends ClassAdapter {
     /**
      * Checks a given class. <p> Usage: CheckClassAdapter <fully qualified
      * class name or class file name>
-     * 
+     *
      * @param args the command line arguments.
-     * 
+     *
      * @throws Exception if the class cannot be found, or if an IO exception
      *         occurs.
      */
@@ -111,8 +111,8 @@ public class CheckClassAdapter extends ClassAdapter {
 
     /**
      * Checks a given class
-     * 
-     * @param cr a <code>ClassReader</code> that contains bytecode for the analysis. 
+     *
+     * @param cr a <code>ClassReader</code> that contains bytecode for the analysis.
      * @param dump true if bytecode should be printed out not only when errors are found.
      * @param pw write where results going to be printed
      */
@@ -143,7 +143,7 @@ public class CheckClassAdapter extends ClassAdapter {
                 pw.println(method.name + method.desc);
                 for (int j = 0; j < method.instructions.size(); ++j) {
                     ((AbstractInsnNode) method.instructions.get(j)).accept(mv);
-                    
+
                     StringBuffer s = new StringBuffer();
                     Frame f = frames[j];
                     if (f == null) {
@@ -184,7 +184,7 @@ public class CheckClassAdapter extends ClassAdapter {
 
     /**
      * Constructs a new {@link CheckClassAdapter}.
-     * 
+     *
      * @param cv the class visitor to which this adapter must delegate calls.
      */
     public CheckClassAdapter(final ClassVisitor cv) {
@@ -390,7 +390,7 @@ public class CheckClassAdapter extends ClassAdapter {
      * Checks that the given access flags do not contain invalid flags. This
      * method also checks that mutually incompatible flags are not set
      * simultaneously.
-     * 
+     *
      * @param access the access flags to be checked
      * @param possibleAccess the valid access flags.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java
index 1cd77c676ad..0123eeeb859 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/CheckMethodAdapter.java
@@ -48,7 +48,7 @@ import java.util.HashMap;
  * in a method whose signature is <tt>void m ()</tt>, the invalid instruction
  * IRETURN, or the invalid sequence IADD L2I will <i>not</i> be detected by
  * this code adapter.
- * 
+ *
  * @author Eric Bruneton
  */
 public class CheckMethodAdapter extends MethodAdapter {
@@ -304,7 +304,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Constructs a new {@link CheckMethodAdapter} object.
-     * 
+     *
      * @param cv the code visitor to which this adapter must delegate calls.
      */
     public CheckMethodAdapter(final MethodVisitor cv) {
@@ -622,7 +622,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the type of the given opcode is equal to the given type.
-     * 
+     *
      * @param opcode the opcode to be checked.
      * @param type the expected opcode type.
      */
@@ -634,7 +634,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given value is a signed byte.
-     * 
+     *
      * @param value the value to be checked.
      * @param msg an message to be used in case of error.
      */
@@ -647,7 +647,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given value is a signed short.
-     * 
+     *
      * @param value the value to be checked.
      * @param msg an message to be used in case of error.
      */
@@ -660,7 +660,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given value is an unsigned short.
-     * 
+     *
      * @param value the value to be checked.
      * @param msg an message to be used in case of error.
      */
@@ -674,7 +674,7 @@ public class CheckMethodAdapter extends MethodAdapter {
     /**
      * Checks that the given value is an {@link Integer}, a{@link Float}, a
      * {@link Long}, a {@link Double} or a {@link String}.
-     * 
+     *
      * @param cst the value to be checked.
      */
     static void checkConstant(final Object cst) {
@@ -688,7 +688,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given string is a valid Java identifier.
-     * 
+     *
      * @param name the string to be checked.
      * @param msg a message to be used in case of error.
      */
@@ -698,7 +698,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given substring is a valid Java identifier.
-     * 
+     *
      * @param name the string to be checked.
      * @param start index of the first character of the identifier (inclusive).
      * @param end index of the last character of the identifier (exclusive). -1
@@ -733,7 +733,7 @@ public class CheckMethodAdapter extends MethodAdapter {
     /**
      * Checks that the given string is a valid Java identifier or is equal to
      * '<init>' or '<clinit>'.
-     * 
+     *
      * @param name the string to be checked.
      * @param msg a message to be used in case of error.
      */
@@ -763,7 +763,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given string is a valid internal class name.
-     * 
+     *
      * @param name the string to be checked.
      * @param msg a message to be used in case of error.
      */
@@ -773,7 +773,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given substring is a valid internal class name.
-     * 
+     *
      * @param name the string to be checked.
      * @param start index of the first character of the identifier (inclusive).
      * @param end index of the last character of the identifier (exclusive). -1
@@ -813,7 +813,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given string is a valid type descriptor.
-     * 
+     *
      * @param desc the string to be checked.
      * @param canBeVoid <tt>true</tt> if <tt>V</tt> can be considered valid.
      */
@@ -826,7 +826,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that a the given substring is a valid type descriptor.
-     * 
+     *
      * @param desc the string to be checked.
      * @param start index of the first character of the identifier (inclusive).
      * @param canBeVoid <tt>true</tt> if <tt>V</tt> can be considered valid.
@@ -890,7 +890,7 @@ public class CheckMethodAdapter extends MethodAdapter {
 
     /**
      * Checks that the given string is a valid method descriptor.
-     * 
+     *
      * @param desc the string to be checked.
      */
     static void checkMethodDesc(final String desc) {
@@ -919,7 +919,7 @@ public class CheckMethodAdapter extends MethodAdapter {
     /**
      * Checks that the given label is not null. This method can also check that
      * the label has been visited.
-     * 
+     *
      * @param label the label to be checked.
      * @param checkVisited <tt>true</tt> to check that the label has been
      *        visited.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java
index 4250c815c9a..8a3d4d022b2 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAbstractVisitor.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.util.attrs.Traceable;
 
 /**
  * An abstract trace visitor.
- * 
+ *
  * @author Eric Bruneton
  */
 public abstract class TraceAbstractVisitor extends AbstractVisitor {
@@ -102,7 +102,7 @@ public abstract class TraceAbstractVisitor extends AbstractVisitor {
 
     /**
      * Prints a disassembled view of the given annotation.
-     * 
+     *
      * @param desc the class descriptor of the annotation class.
      * @param visible <tt>true</tt> if the annotation is visible at runtime.
      * @return a visitor to visit the annotation values.
@@ -124,7 +124,7 @@ public abstract class TraceAbstractVisitor extends AbstractVisitor {
 
     /**
      * Prints a disassembled view of the given attribute.
-     * 
+     *
      * @param attr an attribute.
      */
     public void visitAttribute(final Attribute attr) {
@@ -159,7 +159,7 @@ public abstract class TraceAbstractVisitor extends AbstractVisitor {
     /**
      * Appends an internal name, a type descriptor or a type signature to
      * {@link #buf buf}.
-     * 
+     *
      * @param type indicates if desc is an internal name, a field descriptor, a
      *        method descriptor, a class signature, ...
      * @param desc an internal name, type descriptor, or type signature. May be
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
index 827225b1ca3..ae812d896aa 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceAnnotationVisitor.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.Type;
 /**
  * An {@link AnnotationVisitor} that prints a disassembled view of the
  * annotations it visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TraceAnnotationVisitor extends TraceAbstractVisitor implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java
index 9a727e50f38..bbadc911d76 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceClassVisitor.java
@@ -48,7 +48,7 @@ import org.objectweb.asm.signature.SignatureReader;
  * visitor chain to trace the class that is visited at a given point in this
  * chain. This may be uselful for debugging purposes. <p> The trace printed when
  * visiting the <tt>Hello</tt> class is the following: <p> <blockquote>
- * 
+ *
  * <pre>
  * // class version 49.0 (49)
  * // access flags 33
@@ -74,9 +74,9 @@ import org.objectweb.asm.signature.SignatureReader;
  *     MAXLOCALS = 1
  * }
  * </pre>
- * 
+ *
  * </blockquote> where <tt>Hello</tt> is defined by: <p> <blockquote>
- * 
+ *
  * <pre>
  * public class Hello {
  *
@@ -85,9 +85,9 @@ import org.objectweb.asm.signature.SignatureReader;
  *     }
  * }
  * </pre>
- * 
+ *
  * </blockquote>
- * 
+ *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
@@ -110,9 +110,9 @@ public class TraceClassVisitor extends TraceAbstractVisitor implements
      * Prints a disassembled view of the given class to the standard output. <p>
      * Usage: TraceClassVisitor [-debug] <fully qualified class name or class
      * file name >
-     * 
+     *
      * @param args the command line arguments.
-     * 
+     *
      * @throws Exception if the class cannot be found, or if an IO exception
      *         occurs.
      */
@@ -152,7 +152,7 @@ public class TraceClassVisitor extends TraceAbstractVisitor implements
 
     /**
      * Constructs a new {@link TraceClassVisitor}.
-     * 
+     *
      * @param pw the print writer to be used to print the class.
      */
     public TraceClassVisitor(final PrintWriter pw) {
@@ -161,7 +161,7 @@ public class TraceClassVisitor extends TraceAbstractVisitor implements
 
     /**
      * Constructs a new {@link TraceClassVisitor}.
-     * 
+     *
      * @param cv the {@link ClassVisitor} to which this visitor delegates calls.
      *        May be <tt>null</tt>.
      * @param pw the print writer to be used to print the class.
@@ -490,7 +490,7 @@ public class TraceClassVisitor extends TraceAbstractVisitor implements
     /**
      * Appends a string representation of the given access modifiers to {@link
      * #buf buf}.
-     * 
+     *
      * @param access some access modifiers.
      */
     private void appendAccess(final int access) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java
index 7546a3c925e..4d20efd8ba3 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceFieldVisitor.java
@@ -36,7 +36,7 @@ import org.objectweb.asm.FieldVisitor;
 /**
  * A {@link FieldVisitor} that prints a disassembled view of the fields it
  * visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TraceFieldVisitor extends TraceAbstractVisitor implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java
index 899f52ea79d..73a511bc379 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceMethodVisitor.java
@@ -43,7 +43,7 @@ import java.util.HashMap;
 /**
  * A {@link MethodVisitor} that prints a disassembled view of the methods it
  * visits.
- * 
+ *
  * @author Eric Bruneton
  */
 public class TraceMethodVisitor extends TraceAbstractVisitor implements
@@ -85,7 +85,7 @@ public class TraceMethodVisitor extends TraceAbstractVisitor implements
 
     /**
      * Constructs a new {@link TraceMethodVisitor}.
-     * 
+     *
      * @param mv the {@link MethodVisitor} to which this visitor delegates
      *        calls. May be <tt>null</tt>.
      */
@@ -472,7 +472,7 @@ public class TraceMethodVisitor extends TraceAbstractVisitor implements
     /**
      * Appends the name of the given label to {@link #buf buf}. Creates a new
      * label name if the given label does not yet have one.
-     * 
+     *
      * @param l a label.
      */
     public void appendLabel(final Label l) {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
index c7145c0e86c..e8346c63326 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/TraceSignatureVisitor.java
@@ -35,7 +35,7 @@ import org.objectweb.asm.signature.SignatureVisitor;
 /**
  * A {@link SignatureVisitor} that prints a disassembled view of the signature
  * it visits.
- * 
+ *
  * @author Eugene Kuleshov
  * @author Eric Bruneton
  */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java
index 88c7af89900..e71e116fe8d 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapAttribute.java
@@ -41,7 +41,7 @@ import org.objectweb.asm.attrs.StackMapType;
 
 /**
  * An {@link ASMifiable} {@link StackMapAttribute} sub class.
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class ASMStackMapAttribute extends StackMapAttribute implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java
index b878357d6b5..e591cb935fb 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMStackMapTableAttribute.java
@@ -41,7 +41,7 @@ import org.objectweb.asm.attrs.StackMapType;
 
 /**
  * An {@link ASMifiable} {@link StackMapTableAttribute} sub class.
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class ASMStackMapTableAttribute extends StackMapTableAttribute implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java
index 149d7daeeb1..f9067bfe1a0 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/ASMifiable.java
@@ -33,17 +33,17 @@ import java.util.Map;
 
 /**
  * An attribute that can print the ASM code to create an equivalent attribute.
- * 
+ *
  * Implementation should print the ASM code that generates attribute data
  * structures for current attribute state.
- * 
+ *
  * @author Eugene Kuleshov
  */
 public interface ASMifiable {
 
     /**
      * Prints the ASM code to create an attribute equal to this attribute.
-     * 
+     *
      * @param buf A buffer used for printing Java code.
      * @param varName name of the variable in a printed code used to store
      *        attribute instance.
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java
index c40d2a62c3b..44680b57e09 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/util/attrs/Traceable.java
@@ -33,18 +33,18 @@ import java.util.Map;
 
 /**
  * An attribute that can print eadable representation of the attribute.
- * 
+ *
  * Implementation should construct readable output from an attribute data
  * structures for current attribute state. Such representation could be used in
  * unit test assertions.
- * 
+ *
  * @author Eugene Kuleshov
  */
 public interface Traceable {
 
     /**
      * Build a human readable representation of the attribute.
-     * 
+     *
      * @param buf A buffer used for printing Java code.
      * @param labelNames map of label instances to their names.
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
index 466b93cffca..826a7fe7f31 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/ASMContentHandler.java
@@ -54,10 +54,10 @@ import org.xml.sax.helpers.DefaultHandler;
  * A {@link org.xml.sax.ContentHandler ContentHandler} that transforms XML
  * document into Java class file. This class can be feeded by any kind of SAX
  * 2.0 event producers, e.g. XML parser, XSLT or XPath engines, or custom code.
- * 
+ *
  * @see org.objectweb.asm.xml.SAXClassAdapter
  * @see org.objectweb.asm.xml.Processor
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class ASMContentHandler extends DefaultHandler implements Opcodes {
@@ -321,7 +321,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
     /**
      * Constructs a new {@link ASMContentHandler ASMContentHandler} object.
-     * 
+     *
      * @param os output stream to write generated class.
      * @param computeMax <tt>true</tt> if the maximum stack size and the
      *        maximum number of local variables must be automatically computed.
@@ -335,7 +335,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Returns the bytecode of the class that was build with underneath class
      * writer.
-     * 
+     *
      * @return the bytecode of the class that was build with underneath class
      *         writer or null if there are no classwriter created.
      */
@@ -345,7 +345,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
     /**
      * Process notification of the start of an XML element being reached.
-     * 
+     *
      * @param ns - The Namespace URI, or the empty string if the element has no
      *        Namespace URI or if Namespace processing is not being performed.
      * @param localName - The local name (without prefix), or the empty string
@@ -385,14 +385,14 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
     /**
      * Process notification of the end of an XML element being reached.
-     * 
+     *
      * @param ns - The Namespace URI, or the empty string if the element has no
      *        Namespace URI or if Namespace processing is not being performed.
      * @param localName - The local name (without prefix), or the empty string
      *        if Namespace processing is not being performed.
      * @param qName - The qualified XML 1.0 name (with prefix), or the empty
      *        string if qualified names are not available.
-     * 
+     *
      * @exception SAXException if a parsing error is to be reported
      */
     public final void endElement(String ns, String localName, String qName)
@@ -422,7 +422,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Process notification of the end of a document and write generated
      * bytecode into output stream.
-     * 
+     *
      * @exception SAXException if parsing or writing error is to be reported.
      */
     public final void endDocument() throws SAXException {
@@ -436,7 +436,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Return the top object on the stack without removing it. If there are no
      * objects on the stack, return <code>null</code>.
-     * 
+     *
      * @return the top object on the stack without removing it.
      */
     final Object peek() {
@@ -447,7 +447,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
      * Return the n'th object down the stack, where 0 is the top element and
      * [getCount()-1] is the bottom element. If the specified index is out of
      * range, return <code>null</code>.
-     * 
+     *
      * @param n Index of the desired element, where 0 is the top of the stack, 1
      *        is the next element down, and so on.
      * @return the n'th object down the stack.
@@ -459,7 +459,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
     /**
      * Pop the top object off of the stack, and return it. If there are no
      * objects on the stack, return <code>null</code>.
-     * 
+     *
      * @return the top object off of the stack.
      */
     final Object pop() {
@@ -468,7 +468,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
 
     /**
      * Push a new object onto the top of the object stack.
-     * 
+     *
      * @param object The new object
      */
     final void push(Object object) {
@@ -653,7 +653,7 @@ public class ASMContentHandler extends DefaultHandler implements Opcodes {
         protected final MethodVisitor getCodeVisitor() {
             return (MethodVisitor) peek();
         }
-        
+
         protected final int getAccess(String s) {
             int access = 0;
             if (s.indexOf("public") != -1)
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/Processor.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/Processor.java
index 2baeb0f36fe..28bf2ec9534 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/Processor.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/Processor.java
@@ -71,20 +71,20 @@ import org.xml.sax.helpers.XMLReaderFactory;
  * directed by XSL transformation. <p> In order to use a concrete XSLT engine,
  * system property <tt>javax.xml.transform.TransformerFactory</tt> must be set
  * to one of the following values.
- * 
+ *
  * <blockquote> <table border="1" cellspacing="0" cellpadding="3"> <tr> <td>jd.xslt</td>
  * <td>jd.xml.xslt.trax.TransformerFactoryImpl</td> </tr>
- * 
+ *
  * <tr> <td>Saxon</td> <td>net.sf.saxon.TransformerFactoryImpl</td> </tr>
- * 
+ *
  * <tr> <td>Caucho</td> <td>com.caucho.xsl.Xsl</td> </tr>
- * 
+ *
  * <tr> <td>Xalan interpeter</td> <td>org.apache.xalan.processor.TransformerFactory</td>
  * </tr>
- * 
+ *
  * <tr> <td>Xalan xsltc</td> <td>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</td>
  * </tr> </table> </blockquote>
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class Processor {
@@ -358,7 +358,7 @@ public class Processor {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see java.util.Observer#update(java.util.Observable, java.lang.Object)
      */
     protected void update(Object arg, int n) {
@@ -479,7 +479,7 @@ public class Processor {
 
         /**
          * Creates an instance of the content handler.
-         * 
+         *
          * @return content handler
          */
         ContentHandler createContentHandler();
@@ -583,7 +583,7 @@ public class Processor {
      * A {@link org.xml.sax.ContentHandler ContentHandler} and
      * {@link org.xml.sax.ext.LexicalHandler LexicalHandler} that serializes XML
      * from SAX 2.0 events into {@link java.io.Writer Writer}.
-     * 
+     *
      * <i><blockquote> This implementation does not support namespaces, entity
      * definitions (uncluding DTD), CDATA and text elements. </blockquote></i>
      */
@@ -602,7 +602,7 @@ public class Processor {
 
         /**
          * Creates <code>SAXWriter</code>.
-         * 
+         *
          * @param w writer
          * @param optimizeEmptyElements if set to <code>true</code>, short
          *        XML syntax will be used for empty elements
@@ -720,7 +720,7 @@ public class Processor {
 
         /**
          * Encode string with escaping.
-         * 
+         *
          * @param str string to encode.
          * @return encoded string
          */
@@ -804,7 +804,7 @@ public class Processor {
         /**
          * Constructs a new {@link InputSlicingHandler SubdocumentHandler}
          * object.
-         * 
+         *
          * @param subdocumentRoot name/path to the root element of the
          *        subdocument
          * @param rootHandler content handler for the entire document
@@ -914,7 +914,7 @@ public class Processor {
         /**
          * Constructs a new {@link OutputSlicingHandler SubdocumentHandler}
          * object.
-         * 
+         *
          * @param subdocumentHandlerFactory a
          *        {@link ContentHandlerFactory ContentHandlerFactory} used to
          *        create {@link ContentHandler ContentHandler} instances for
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java
index c8f6ecb994b..5168fb57477 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAdapter.java
@@ -35,7 +35,7 @@ import org.xml.sax.SAXException;
 
 /**
  * SAXAdapter
- * 
+ *
  * @author Eugene Kuleshov
  */
 public abstract class SAXAdapter {
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
index e7382414b2c..6e9605c9335 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXAnnotationAdapter.java
@@ -36,7 +36,7 @@ import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * SAXAnnotationAdapter
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class SAXAnnotationAdapter extends SAXAdapter implements
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java
index ba362d0606d..55b9effe77f 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXClassAdapter.java
@@ -43,10 +43,10 @@ import org.xml.sax.helpers.AttributesImpl;
  * events from the visited class. It can feed any kind of
  * {@link org.xml.sax.ContentHandler ContentHandler}, e.g. XML serializer, XSLT
  * or XQuery engines.
- * 
+ *
  * @see org.objectweb.asm.xml.Processor
  * @see org.objectweb.asm.xml.ASMContentHandler
- * 
+ *
  * @author Eugene Kuleshov
  */
 public final class SAXClassAdapter extends SAXAdapter implements ClassVisitor {
@@ -54,7 +54,7 @@ public final class SAXClassAdapter extends SAXAdapter implements ClassVisitor {
 
     /**
      * Constructs a new {@link SAXClassAdapter SAXClassAdapter} object.
-     * 
+     *
      * @param h content handler that will be used to send SAX 2.0 events.
      * @param singleDocument if <tt>true</tt> adapter will not produce
      *        {@link ContentHandler#startDocument() startDocument()} and
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
index abea7fbf41f..decb492ff77 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXCodeAdapter.java
@@ -45,10 +45,10 @@ import org.xml.sax.helpers.AttributesImpl;
 /**
  * A {@link MethodVisitor} that generates SAX 2.0 events from the visited
  * method.
- * 
+ *
  * @see org.objectweb.asm.xml.SAXClassAdapter
  * @see org.objectweb.asm.xml.Processor
- * 
+ *
  * @author Eugene Kuleshov
  */
 public final class SAXCodeAdapter extends SAXAdapter implements MethodVisitor {
@@ -56,7 +56,7 @@ public final class SAXCodeAdapter extends SAXAdapter implements MethodVisitor {
 
     /**
      * Constructs a new {@link SAXCodeAdapter SAXCodeAdapter} object.
-     * 
+     *
      * @param h content handler that will be used to send SAX 2.0 events.
      * @param access
      */
diff --git a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
index eabf00dfc66..edfba0401c5 100644
--- a/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
+++ b/libjava/classpath/tools/external/asm/org/objectweb/asm/xml/SAXFieldAdapter.java
@@ -38,7 +38,7 @@ import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * SAXFieldAdapter
- * 
+ *
  * @author Eugene Kuleshov
  */
 public class SAXFieldAdapter implements FieldVisitor {
diff --git a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java
index 053f122f0b6..58d7b3f8aa7 100644
--- a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java
+++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java
@@ -1,6 +1,6 @@
 // $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaLexer.java"$
- 
-   package gnu.classpath.tools.gjdoc.expr; 
+
+   package gnu.classpath.tools.gjdoc.expr;
 
 import java.io.InputStream;
 import antlr.TokenStreamException;
@@ -29,1934 +29,1934 @@ import antlr.SemanticException;
 public class JavaLexer extends antlr.CharScanner implements JavaTokenTypes, TokenStream
  {
 public JavaLexer(InputStream in) {
-	this(new ByteBuffer(in));
+        this(new ByteBuffer(in));
 }
 public JavaLexer(Reader in) {
-	this(new CharBuffer(in));
+        this(new CharBuffer(in));
 }
 public JavaLexer(InputBuffer ib) {
-	this(new LexerSharedInputState(ib));
+        this(new LexerSharedInputState(ib));
 }
 public JavaLexer(LexerSharedInputState state) {
-	super(state);
-	caseSensitiveLiterals = true;
-	setCaseSensitive(true);
-	literals = new Hashtable();
-	literals.put(new ANTLRHashString("String", this), new Integer(55));
-	literals.put(new ANTLRHashString("final", this), new Integer(39));
-	literals.put(new ANTLRHashString("false", this), new Integer(84));
-	literals.put(new ANTLRHashString("true", this), new Integer(83));
-	literals.put(new ANTLRHashString("void", this), new Integer(46));
-	literals.put(new ANTLRHashString("float", this), new Integer(52));
-	literals.put(new ANTLRHashString("boolean", this), new Integer(47));
-	literals.put(new ANTLRHashString("long", this), new Integer(53));
-	literals.put(new ANTLRHashString("null", this), new Integer(85));
-	literals.put(new ANTLRHashString("short", this), new Integer(50));
-	literals.put(new ANTLRHashString("char", this), new Integer(49));
-	literals.put(new ANTLRHashString("abstract", this), new Integer(40));
-	literals.put(new ANTLRHashString("byte", this), new Integer(48));
-	literals.put(new ANTLRHashString("int", this), new Integer(51));
-	literals.put(new ANTLRHashString("double", this), new Integer(54));
-	literals.put(new ANTLRHashString("strictfp", this), new Integer(41));
+        super(state);
+        caseSensitiveLiterals = true;
+        setCaseSensitive(true);
+        literals = new Hashtable();
+        literals.put(new ANTLRHashString("String", this), new Integer(55));
+        literals.put(new ANTLRHashString("final", this), new Integer(39));
+        literals.put(new ANTLRHashString("false", this), new Integer(84));
+        literals.put(new ANTLRHashString("true", this), new Integer(83));
+        literals.put(new ANTLRHashString("void", this), new Integer(46));
+        literals.put(new ANTLRHashString("float", this), new Integer(52));
+        literals.put(new ANTLRHashString("boolean", this), new Integer(47));
+        literals.put(new ANTLRHashString("long", this), new Integer(53));
+        literals.put(new ANTLRHashString("null", this), new Integer(85));
+        literals.put(new ANTLRHashString("short", this), new Integer(50));
+        literals.put(new ANTLRHashString("char", this), new Integer(49));
+        literals.put(new ANTLRHashString("abstract", this), new Integer(40));
+        literals.put(new ANTLRHashString("byte", this), new Integer(48));
+        literals.put(new ANTLRHashString("int", this), new Integer(51));
+        literals.put(new ANTLRHashString("double", this), new Integer(54));
+        literals.put(new ANTLRHashString("strictfp", this), new Integer(41));
 }
 
 public Token nextToken() throws TokenStreamException {
-	Token theRetToken=null;
+        Token theRetToken=null;
 tryAgain:
-	for (;;) {
-		Token _token = null;
-		int _ttype = Token.INVALID_TYPE;
-		resetText();
-		try {   // for char stream error handling
-			try {   // for lexical error handling
-				switch ( LA(1)) {
-				case '?':
-				{
-					mQUESTION(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '(':
-				{
-					mLPAREN(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case ')':
-				{
-					mRPAREN(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '[':
-				{
-					mLBRACK(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case ']':
-				{
-					mRBRACK(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '{':
-				{
-					mLCURLY(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '}':
-				{
-					mRCURLY(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case ':':
-				{
-					mCOLON(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case ',':
-				{
-					mCOMMA(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '~':
-				{
-					mBNOT(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case ';':
-				{
-					mSEMI(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '\t':  case '\n':  case '\u000c':  case '\r':
-				case ' ':
-				{
-					mWS(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '\'':
-				{
-					mCHAR_LITERAL(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '"':
-				{
-					mSTRING_LITERAL(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '$':  case 'A':  case 'B':  case 'C':
-				case 'D':  case 'E':  case 'F':  case 'G':
-				case 'H':  case 'I':  case 'J':  case 'K':
-				case 'L':  case 'M':  case 'N':  case 'O':
-				case 'P':  case 'Q':  case 'R':  case 'S':
-				case 'T':  case 'U':  case 'V':  case 'W':
-				case 'X':  case 'Y':  case 'Z':  case '_':
-				case 'a':  case 'b':  case 'c':  case 'd':
-				case 'e':  case 'f':  case 'g':  case 'h':
-				case 'i':  case 'j':  case 'k':  case 'l':
-				case 'm':  case 'n':  case 'o':  case 'p':
-				case 'q':  case 'r':  case 's':  case 't':
-				case 'u':  case 'v':  case 'w':  case 'x':
-				case 'y':  case 'z':
-				{
-					mIDENT(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				case '.':  case '0':  case '1':  case '2':
-				case '3':  case '4':  case '5':  case '6':
-				case '7':  case '8':  case '9':
-				{
-					mNUM_INT(true);
-					theRetToken=_returnToken;
-					break;
-				}
-				default:
-					if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='>') && (LA(4)=='=')) {
-						mBSR_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='=')) {
-						mSR_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='>') && (true)) {
-						mBSR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='<') && (LA(2)=='<') && (LA(3)=='=')) {
-						mSL_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='=') && (LA(2)=='=')) {
-						mEQUAL(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='!') && (LA(2)=='=')) {
-						mNOT_EQUAL(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='/') && (LA(2)=='=')) {
-						mDIV_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='+') && (LA(2)=='=')) {
-						mPLUS_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='+') && (LA(2)=='+')) {
-						mINC(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='-') && (LA(2)=='=')) {
-						mMINUS_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='-') && (LA(2)=='-')) {
-						mDEC(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='*') && (LA(2)=='=')) {
-						mSTAR_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='%') && (LA(2)=='=')) {
-						mMOD_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='>') && (LA(2)=='>') && (true)) {
-						mSR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='>') && (LA(2)=='=')) {
-						mGE(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='<') && (LA(2)=='<') && (true)) {
-						mSL(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='<') && (LA(2)=='=')) {
-						mLE(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='^') && (LA(2)=='=')) {
-						mBXOR_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='|') && (LA(2)=='=')) {
-						mBOR_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='|') && (LA(2)=='|')) {
-						mLOR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='&') && (LA(2)=='=')) {
-						mBAND_ASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='&') && (LA(2)=='&')) {
-						mLAND(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='/') && (LA(2)=='/')) {
-						mSL_COMMIT(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='/') && (LA(2)=='*')) {
-						mML_COMMENT(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='=') && (true)) {
-						mASSIGN(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='!') && (true)) {
-						mLNOT(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='/') && (true)) {
-						mDIV(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='+') && (true)) {
-						mPLUS(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='-') && (true)) {
-						mMINUS(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='*') && (true)) {
-						mSTAR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='%') && (true)) {
-						mMOD(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='>') && (true)) {
-						mGT(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='<') && (true)) {
-						mLT(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='^') && (true)) {
-						mBXOR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='|') && (true)) {
-						mBOR(true);
-						theRetToken=_returnToken;
-					}
-					else if ((LA(1)=='&') && (true)) {
-						mBAND(true);
-						theRetToken=_returnToken;
-					}
-				else {
-					if (LA(1)==EOF_CHAR) {uponEOF(); _returnToken = makeToken(Token.EOF_TYPE);}
-				else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-				}
-				}
-				if ( _returnToken==null ) continue tryAgain; // found SKIP token
-				_ttype = _returnToken.getType();
-				_returnToken.setType(_ttype);
-				return _returnToken;
-			}
-			catch (RecognitionException e) {
-				throw new TokenStreamRecognitionException(e);
-			}
-		}
-		catch (CharStreamException cse) {
-			if ( cse instanceof CharStreamIOException ) {
-				throw new TokenStreamIOException(((CharStreamIOException)cse).io);
-			}
-			else {
-				throw new TokenStreamException(cse.getMessage());
-			}
-		}
-	}
+        for (;;) {
+                Token _token = null;
+                int _ttype = Token.INVALID_TYPE;
+                resetText();
+                try {   // for char stream error handling
+                        try {   // for lexical error handling
+                                switch ( LA(1)) {
+                                case '?':
+                                {
+                                        mQUESTION(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '(':
+                                {
+                                        mLPAREN(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case ')':
+                                {
+                                        mRPAREN(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '[':
+                                {
+                                        mLBRACK(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case ']':
+                                {
+                                        mRBRACK(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '{':
+                                {
+                                        mLCURLY(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '}':
+                                {
+                                        mRCURLY(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case ':':
+                                {
+                                        mCOLON(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case ',':
+                                {
+                                        mCOMMA(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '~':
+                                {
+                                        mBNOT(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case ';':
+                                {
+                                        mSEMI(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '\t':  case '\n':  case '\u000c':  case '\r':
+                                case ' ':
+                                {
+                                        mWS(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '\'':
+                                {
+                                        mCHAR_LITERAL(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '"':
+                                {
+                                        mSTRING_LITERAL(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '$':  case 'A':  case 'B':  case 'C':
+                                case 'D':  case 'E':  case 'F':  case 'G':
+                                case 'H':  case 'I':  case 'J':  case 'K':
+                                case 'L':  case 'M':  case 'N':  case 'O':
+                                case 'P':  case 'Q':  case 'R':  case 'S':
+                                case 'T':  case 'U':  case 'V':  case 'W':
+                                case 'X':  case 'Y':  case 'Z':  case '_':
+                                case 'a':  case 'b':  case 'c':  case 'd':
+                                case 'e':  case 'f':  case 'g':  case 'h':
+                                case 'i':  case 'j':  case 'k':  case 'l':
+                                case 'm':  case 'n':  case 'o':  case 'p':
+                                case 'q':  case 'r':  case 's':  case 't':
+                                case 'u':  case 'v':  case 'w':  case 'x':
+                                case 'y':  case 'z':
+                                {
+                                        mIDENT(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                case '.':  case '0':  case '1':  case '2':
+                                case '3':  case '4':  case '5':  case '6':
+                                case '7':  case '8':  case '9':
+                                {
+                                        mNUM_INT(true);
+                                        theRetToken=_returnToken;
+                                        break;
+                                }
+                                default:
+                                        if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='>') && (LA(4)=='=')) {
+                                                mBSR_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='=')) {
+                                                mSR_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='>') && (LA(2)=='>') && (LA(3)=='>') && (true)) {
+                                                mBSR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='<') && (LA(2)=='<') && (LA(3)=='=')) {
+                                                mSL_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='=') && (LA(2)=='=')) {
+                                                mEQUAL(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='!') && (LA(2)=='=')) {
+                                                mNOT_EQUAL(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='/') && (LA(2)=='=')) {
+                                                mDIV_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='+') && (LA(2)=='=')) {
+                                                mPLUS_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='+') && (LA(2)=='+')) {
+                                                mINC(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='-') && (LA(2)=='=')) {
+                                                mMINUS_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='-') && (LA(2)=='-')) {
+                                                mDEC(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='*') && (LA(2)=='=')) {
+                                                mSTAR_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='%') && (LA(2)=='=')) {
+                                                mMOD_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='>') && (LA(2)=='>') && (true)) {
+                                                mSR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='>') && (LA(2)=='=')) {
+                                                mGE(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='<') && (LA(2)=='<') && (true)) {
+                                                mSL(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='<') && (LA(2)=='=')) {
+                                                mLE(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='^') && (LA(2)=='=')) {
+                                                mBXOR_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='|') && (LA(2)=='=')) {
+                                                mBOR_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='|') && (LA(2)=='|')) {
+                                                mLOR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='&') && (LA(2)=='=')) {
+                                                mBAND_ASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='&') && (LA(2)=='&')) {
+                                                mLAND(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='/') && (LA(2)=='/')) {
+                                                mSL_COMMIT(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='/') && (LA(2)=='*')) {
+                                                mML_COMMENT(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='=') && (true)) {
+                                                mASSIGN(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='!') && (true)) {
+                                                mLNOT(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='/') && (true)) {
+                                                mDIV(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='+') && (true)) {
+                                                mPLUS(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='-') && (true)) {
+                                                mMINUS(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='*') && (true)) {
+                                                mSTAR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='%') && (true)) {
+                                                mMOD(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='>') && (true)) {
+                                                mGT(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='<') && (true)) {
+                                                mLT(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='^') && (true)) {
+                                                mBXOR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='|') && (true)) {
+                                                mBOR(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                        else if ((LA(1)=='&') && (true)) {
+                                                mBAND(true);
+                                                theRetToken=_returnToken;
+                                        }
+                                else {
+                                        if (LA(1)==EOF_CHAR) {uponEOF(); _returnToken = makeToken(Token.EOF_TYPE);}
+                                else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                }
+                                }
+                                if ( _returnToken==null ) continue tryAgain; // found SKIP token
+                                _ttype = _returnToken.getType();
+                                _returnToken.setType(_ttype);
+                                return _returnToken;
+                        }
+                        catch (RecognitionException e) {
+                                throw new TokenStreamRecognitionException(e);
+                        }
+                }
+                catch (CharStreamException cse) {
+                        if ( cse instanceof CharStreamIOException ) {
+                                throw new TokenStreamIOException(((CharStreamIOException)cse).io);
+                        }
+                        else {
+                                throw new TokenStreamException(cse.getMessage());
+                        }
+                }
+        }
 }
 
-	public final void mQUESTION(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = QUESTION;
-		int _saveIndex;
-		
-		match('?');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLPAREN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LPAREN;
-		int _saveIndex;
-		
-		match('(');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mRPAREN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = RPAREN;
-		int _saveIndex;
-		
-		match(')');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLBRACK(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LBRACK;
-		int _saveIndex;
-		
-		match('[');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mRBRACK(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = RBRACK;
-		int _saveIndex;
-		
-		match(']');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLCURLY(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LCURLY;
-		int _saveIndex;
-		
-		match('{');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mRCURLY(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = RCURLY;
-		int _saveIndex;
-		
-		match('}');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mCOLON(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = COLON;
-		int _saveIndex;
-		
-		match(':');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mCOMMA(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = COMMA;
-		int _saveIndex;
-		
-		match(',');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = ASSIGN;
-		int _saveIndex;
-		
-		match('=');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mEQUAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = EQUAL;
-		int _saveIndex;
-		
-		match("==");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLNOT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LNOT;
-		int _saveIndex;
-		
-		match('!');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBNOT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BNOT;
-		int _saveIndex;
-		
-		match('~');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mNOT_EQUAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = NOT_EQUAL;
-		int _saveIndex;
-		
-		match("!=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mDIV(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = DIV;
-		int _saveIndex;
-		
-		match('/');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mDIV_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = DIV_ASSIGN;
-		int _saveIndex;
-		
-		match("/=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mPLUS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = PLUS;
-		int _saveIndex;
-		
-		match('+');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mPLUS_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = PLUS_ASSIGN;
-		int _saveIndex;
-		
-		match("+=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mINC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = INC;
-		int _saveIndex;
-		
-		match("++");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mMINUS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = MINUS;
-		int _saveIndex;
-		
-		match('-');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mMINUS_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = MINUS_ASSIGN;
-		int _saveIndex;
-		
-		match("-=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mDEC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = DEC;
-		int _saveIndex;
-		
-		match("--");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSTAR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = STAR;
-		int _saveIndex;
-		
-		match('*');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSTAR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = STAR_ASSIGN;
-		int _saveIndex;
-		
-		match("*=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mMOD(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = MOD;
-		int _saveIndex;
-		
-		match('%');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mMOD_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = MOD_ASSIGN;
-		int _saveIndex;
-		
-		match("%=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SR;
-		int _saveIndex;
-		
-		match(">>");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SR_ASSIGN;
-		int _saveIndex;
-		
-		match(">>=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBSR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BSR;
-		int _saveIndex;
-		
-		match(">>>");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBSR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BSR_ASSIGN;
-		int _saveIndex;
-		
-		match(">>>=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mGE(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = GE;
-		int _saveIndex;
-		
-		match(">=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mGT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = GT;
-		int _saveIndex;
-		
-		match(">");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SL;
-		int _saveIndex;
-		
-		match("<<");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSL_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SL_ASSIGN;
-		int _saveIndex;
-		
-		match("<<=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLE(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LE;
-		int _saveIndex;
-		
-		match("<=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LT;
-		int _saveIndex;
-		
-		match('<');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBXOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BXOR;
-		int _saveIndex;
-		
-		match('^');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBXOR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BXOR_ASSIGN;
-		int _saveIndex;
-		
-		match("^=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BOR;
-		int _saveIndex;
-		
-		match('|');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBOR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BOR_ASSIGN;
-		int _saveIndex;
-		
-		match("|=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LOR;
-		int _saveIndex;
-		
-		match("||");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBAND(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BAND;
-		int _saveIndex;
-		
-		match('&');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mBAND_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = BAND_ASSIGN;
-		int _saveIndex;
-		
-		match("&=");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mLAND(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = LAND;
-		int _saveIndex;
-		
-		match("&&");
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSEMI(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SEMI;
-		int _saveIndex;
-		
-		match(';');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mWS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = WS;
-		int _saveIndex;
-		
-		{
-		int _cnt105=0;
-		_loop105:
-		do {
-			switch ( LA(1)) {
-			case ' ':
-			{
-				match(' ');
-				break;
-			}
-			case '\t':
-			{
-				match('\t');
-				break;
-			}
-			case '\u000c':
-			{
-				match('\f');
-				break;
-			}
-			case '\n':  case '\r':
-			{
-				{
-				if ((LA(1)=='\r') && (LA(2)=='\n') && (true) && (true)) {
-					match("\r\n");
-				}
-				else if ((LA(1)=='\r') && (true) && (true) && (true)) {
-					match('\r');
-				}
-				else if ((LA(1)=='\n')) {
-					match('\n');
-				}
-				else {
-					throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-				}
-				
-				}
-				if ( inputState.guessing==0 ) {
-					newline();
-				}
-				break;
-			}
-			default:
-			{
-				if ( _cnt105>=1 ) { break _loop105; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-			}
-			}
-			_cnt105++;
-		} while (true);
-		}
-		if ( inputState.guessing==0 ) {
-			_ttype = Token.SKIP;
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSL_COMMIT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = SL_COMMIT;
-		int _saveIndex;
-		
-		match("//");
-		{
-		_loop109:
-		do {
-			if ((_tokenSet_0.member(LA(1)))) {
-				{
-				match(_tokenSet_0);
-				}
-			}
-			else {
-				break _loop109;
-			}
-			
-		} while (true);
-		}
-		{
-		switch ( LA(1)) {
-		case '\n':
-		{
-			match('\n');
-			break;
-		}
-		case '\r':
-		{
-			match('\r');
-			{
-			if ((LA(1)=='\n')) {
-				match('\n');
-			}
-			else {
-			}
-			
-			}
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		if ( inputState.guessing==0 ) {
-			_ttype = Token.SKIP; newline();
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mML_COMMENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = ML_COMMENT;
-		int _saveIndex;
-		
-		match("/*");
-		{
-		_loop115:
-		do {
-			if ((LA(1)=='\r') && (LA(2)=='\n') && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')) && ((LA(4) >= '\u0003' && LA(4) <= '\uffff'))) {
-				match('\r');
-				match('\n');
-				if ( inputState.guessing==0 ) {
-					newline();
-				}
-			}
-			else if (((LA(1)=='*') && ((LA(2) >= '\u0003' && LA(2) <= '\uffff')) && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')))&&( LA(2)!='/' )) {
-				match('*');
-			}
-			else if ((LA(1)=='\r') && ((LA(2) >= '\u0003' && LA(2) <= '\uffff')) && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')) && (true)) {
-				match('\r');
-				if ( inputState.guessing==0 ) {
-					newline();
-				}
-			}
-			else if ((LA(1)=='\n')) {
-				match('\n');
-				if ( inputState.guessing==0 ) {
-					newline();
-				}
-			}
-			else if ((_tokenSet_1.member(LA(1)))) {
-				{
-				match(_tokenSet_1);
-				}
-			}
-			else {
-				break _loop115;
-			}
-			
-		} while (true);
-		}
-		match("*/");
-		if ( inputState.guessing==0 ) {
-			_ttype = Token.SKIP;
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mCHAR_LITERAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = CHAR_LITERAL;
-		int _saveIndex;
-		
-		match('\'');
-		{
-		if ((LA(1)=='\\')) {
-			mESC(false);
-		}
-		else if ((_tokenSet_2.member(LA(1)))) {
-			{
-			match(_tokenSet_2);
-			}
-		}
-		else {
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		
-		}
-		match('\'');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	protected final void mESC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = ESC;
-		int _saveIndex;
-		
-		match('\\');
-		{
-		switch ( LA(1)) {
-		case 'n':
-		{
-			match('n');
-			break;
-		}
-		case 'r':
-		{
-			match('r');
-			break;
-		}
-		case 't':
-		{
-			match('t');
-			break;
-		}
-		case 'b':
-		{
-			match('b');
-			break;
-		}
-		case 'f':
-		{
-			match('f');
-			break;
-		}
-		case '"':
-		{
-			match('"');
-			break;
-		}
-		case '\'':
-		{
-			match('\'');
-			break;
-		}
-		case '\\':
-		{
-			match('\\');
-			break;
-		}
-		case 'u':
-		{
-			{
-			int _cnt126=0;
-			_loop126:
-			do {
-				if ((LA(1)=='u')) {
-					match('u');
-				}
-				else {
-					if ( _cnt126>=1 ) { break _loop126; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-				}
-				
-				_cnt126++;
-			} while (true);
-			}
-			mHEX_DIGIT(false);
-			mHEX_DIGIT(false);
-			mHEX_DIGIT(false);
-			mHEX_DIGIT(false);
-			break;
-		}
-		case '0':  case '1':  case '2':  case '3':
-		{
-			matchRange('0','3');
-			{
-			if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
-				matchRange('0','7');
-				{
-				if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
-					matchRange('0','7');
-				}
-				else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
-				}
-				else {
-					throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-				}
-				
-				}
-			}
-			else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
-			}
-			else {
-				throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-			}
-			
-			}
-			break;
-		}
-		case '4':  case '5':  case '6':  case '7':
-		{
-			matchRange('4','7');
-			{
-			if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
-				matchRange('0','7');
-			}
-			else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
-			}
-			else {
-				throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-			}
-			
-			}
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mSTRING_LITERAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = STRING_LITERAL;
-		int _saveIndex;
-		
-		match('"');
-		{
-		_loop122:
-		do {
-			if ((LA(1)=='\\')) {
-				mESC(false);
-			}
-			else if ((_tokenSet_3.member(LA(1)))) {
-				{
-				match(_tokenSet_3);
-				}
-			}
-			else {
-				break _loop122;
-			}
-			
-		} while (true);
-		}
-		match('"');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	protected final void mHEX_DIGIT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = HEX_DIGIT;
-		int _saveIndex;
-		
-		{
-		switch ( LA(1)) {
-		case '0':  case '1':  case '2':  case '3':
-		case '4':  case '5':  case '6':  case '7':
-		case '8':  case '9':
-		{
-			matchRange('0','9');
-			break;
-		}
-		case 'A':  case 'B':  case 'C':  case 'D':
-		case 'E':  case 'F':
-		{
-			matchRange('A','F');
-			break;
-		}
-		case 'a':  case 'b':  case 'c':  case 'd':
-		case 'e':  case 'f':
-		{
-			matchRange('a','f');
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	protected final void mVOCAB(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = VOCAB;
-		int _saveIndex;
-		
-		matchRange('\3','\377');
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mIDENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = IDENT;
-		int _saveIndex;
-		
-		{
-		switch ( LA(1)) {
-		case 'a':  case 'b':  case 'c':  case 'd':
-		case 'e':  case 'f':  case 'g':  case 'h':
-		case 'i':  case 'j':  case 'k':  case 'l':
-		case 'm':  case 'n':  case 'o':  case 'p':
-		case 'q':  case 'r':  case 's':  case 't':
-		case 'u':  case 'v':  case 'w':  case 'x':
-		case 'y':  case 'z':
-		{
-			matchRange('a','z');
-			break;
-		}
-		case 'A':  case 'B':  case 'C':  case 'D':
-		case 'E':  case 'F':  case 'G':  case 'H':
-		case 'I':  case 'J':  case 'K':  case 'L':
-		case 'M':  case 'N':  case 'O':  case 'P':
-		case 'Q':  case 'R':  case 'S':  case 'T':
-		case 'U':  case 'V':  case 'W':  case 'X':
-		case 'Y':  case 'Z':
-		{
-			matchRange('A','Z');
-			break;
-		}
-		case '_':
-		{
-			match('_');
-			break;
-		}
-		case '$':
-		{
-			match('$');
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		{
-		_loop136:
-		do {
-			switch ( LA(1)) {
-			case 'a':  case 'b':  case 'c':  case 'd':
-			case 'e':  case 'f':  case 'g':  case 'h':
-			case 'i':  case 'j':  case 'k':  case 'l':
-			case 'm':  case 'n':  case 'o':  case 'p':
-			case 'q':  case 'r':  case 's':  case 't':
-			case 'u':  case 'v':  case 'w':  case 'x':
-			case 'y':  case 'z':
-			{
-				matchRange('a','z');
-				break;
-			}
-			case 'A':  case 'B':  case 'C':  case 'D':
-			case 'E':  case 'F':  case 'G':  case 'H':
-			case 'I':  case 'J':  case 'K':  case 'L':
-			case 'M':  case 'N':  case 'O':  case 'P':
-			case 'Q':  case 'R':  case 'S':  case 'T':
-			case 'U':  case 'V':  case 'W':  case 'X':
-			case 'Y':  case 'Z':
-			{
-				matchRange('A','Z');
-				break;
-			}
-			case '_':
-			{
-				match('_');
-				break;
-			}
-			case '0':  case '1':  case '2':  case '3':
-			case '4':  case '5':  case '6':  case '7':
-			case '8':  case '9':
-			{
-				matchRange('0','9');
-				break;
-			}
-			case '$':
-			{
-				match('$');
-				break;
-			}
-			default:
-			{
-				break _loop136;
-			}
-			}
-		} while (true);
-		}
-		_ttype = testLiteralsTable(_ttype);
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	public final void mNUM_INT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = NUM_INT;
-		int _saveIndex;
-		Token f1=null;
-		Token f2=null;
-		Token f3=null;
-		Token f4=null;
-		boolean isDecimal=false; Token t=null;
-		
-		switch ( LA(1)) {
-		case '.':
-		{
-			match('.');
-			if ( inputState.guessing==0 ) {
-				_ttype = DOT;
-			}
-			{
-			if (((LA(1) >= '0' && LA(1) <= '9'))) {
-				{
-				int _cnt140=0;
-				_loop140:
-				do {
-					if (((LA(1) >= '0' && LA(1) <= '9'))) {
-						matchRange('0','9');
-					}
-					else {
-						if ( _cnt140>=1 ) { break _loop140; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-					}
-					
-					_cnt140++;
-				} while (true);
-				}
-				{
-				if ((LA(1)=='E'||LA(1)=='e')) {
-					mEXPONENT(false);
-				}
-				else {
-				}
-				
-				}
-				{
-				if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
-					mFLOAT_SUFFIX(true);
-					f1=_returnToken;
-					if ( inputState.guessing==0 ) {
-						t=f1;
-					}
-				}
-				else {
-				}
-				
-				}
-				if ( inputState.guessing==0 ) {
-					
-									if (t != null && t.getText().toUpperCase().indexOf('F')>=0) {
-						_ttype = NUM_FLOAT;
-									}
-									else {
-						_ttype = NUM_DOUBLE; // assume double
-									}
-									
-				}
-			}
-			else {
-			}
-			
-			}
-			break;
-		}
-		case '0':  case '1':  case '2':  case '3':
-		case '4':  case '5':  case '6':  case '7':
-		case '8':  case '9':
-		{
-			{
-			switch ( LA(1)) {
-			case '0':
-			{
-				match('0');
-				if ( inputState.guessing==0 ) {
-					isDecimal = true;
-				}
-				{
-				if ((LA(1)=='X'||LA(1)=='x')) {
-					{
-					switch ( LA(1)) {
-					case 'x':
-					{
-						match('x');
-						break;
-					}
-					case 'X':
-					{
-						match('X');
-						break;
-					}
-					default:
-					{
-						throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-					}
-					}
-					}
-					{
-					int _cnt147=0;
-					_loop147:
-					do {
-						if ((_tokenSet_4.member(LA(1))) && (true) && (true) && (true)) {
-							mHEX_DIGIT(false);
-						}
-						else {
-							if ( _cnt147>=1 ) { break _loop147; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-						}
-						
-						_cnt147++;
-					} while (true);
-					}
-				}
-				else {
-					boolean synPredMatched152 = false;
-					if ((((LA(1) >= '0' && LA(1) <= '9')) && (true) && (true) && (true))) {
-						int _m152 = mark();
-						synPredMatched152 = true;
-						inputState.guessing++;
-						try {
-							{
-							{
-							int _cnt150=0;
-							_loop150:
-							do {
-								if (((LA(1) >= '0' && LA(1) <= '9'))) {
-									matchRange('0','9');
-								}
-								else {
-									if ( _cnt150>=1 ) { break _loop150; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-								}
-								
-								_cnt150++;
-							} while (true);
-							}
-							{
-							switch ( LA(1)) {
-							case '.':
-							{
-								match('.');
-								break;
-							}
-							case 'E':  case 'e':
-							{
-								mEXPONENT(false);
-								break;
-							}
-							case 'D':  case 'F':  case 'd':  case 'f':
-							{
-								mFLOAT_SUFFIX(false);
-								break;
-							}
-							default:
-							{
-								throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-							}
-							}
-							}
-							}
-						}
-						catch (RecognitionException pe) {
-							synPredMatched152 = false;
-						}
-						rewind(_m152);
+        public final void mQUESTION(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = QUESTION;
+                int _saveIndex;
+
+                match('?');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLPAREN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LPAREN;
+                int _saveIndex;
+
+                match('(');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mRPAREN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = RPAREN;
+                int _saveIndex;
+
+                match(')');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLBRACK(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LBRACK;
+                int _saveIndex;
+
+                match('[');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mRBRACK(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = RBRACK;
+                int _saveIndex;
+
+                match(']');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLCURLY(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LCURLY;
+                int _saveIndex;
+
+                match('{');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mRCURLY(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = RCURLY;
+                int _saveIndex;
+
+                match('}');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mCOLON(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = COLON;
+                int _saveIndex;
+
+                match(':');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mCOMMA(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = COMMA;
+                int _saveIndex;
+
+                match(',');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = ASSIGN;
+                int _saveIndex;
+
+                match('=');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mEQUAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = EQUAL;
+                int _saveIndex;
+
+                match("==");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLNOT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LNOT;
+                int _saveIndex;
+
+                match('!');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBNOT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BNOT;
+                int _saveIndex;
+
+                match('~');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mNOT_EQUAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = NOT_EQUAL;
+                int _saveIndex;
+
+                match("!=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mDIV(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = DIV;
+                int _saveIndex;
+
+                match('/');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mDIV_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = DIV_ASSIGN;
+                int _saveIndex;
+
+                match("/=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mPLUS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = PLUS;
+                int _saveIndex;
+
+                match('+');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mPLUS_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = PLUS_ASSIGN;
+                int _saveIndex;
+
+                match("+=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mINC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = INC;
+                int _saveIndex;
+
+                match("++");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mMINUS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = MINUS;
+                int _saveIndex;
+
+                match('-');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mMINUS_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = MINUS_ASSIGN;
+                int _saveIndex;
+
+                match("-=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mDEC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = DEC;
+                int _saveIndex;
+
+                match("--");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSTAR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = STAR;
+                int _saveIndex;
+
+                match('*');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSTAR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = STAR_ASSIGN;
+                int _saveIndex;
+
+                match("*=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mMOD(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = MOD;
+                int _saveIndex;
+
+                match('%');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mMOD_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = MOD_ASSIGN;
+                int _saveIndex;
+
+                match("%=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SR;
+                int _saveIndex;
+
+                match(">>");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SR_ASSIGN;
+                int _saveIndex;
+
+                match(">>=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBSR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BSR;
+                int _saveIndex;
+
+                match(">>>");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBSR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BSR_ASSIGN;
+                int _saveIndex;
+
+                match(">>>=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mGE(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = GE;
+                int _saveIndex;
+
+                match(">=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mGT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = GT;
+                int _saveIndex;
+
+                match(">");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SL;
+                int _saveIndex;
+
+                match("<<");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSL_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SL_ASSIGN;
+                int _saveIndex;
+
+                match("<<=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLE(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LE;
+                int _saveIndex;
+
+                match("<=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LT;
+                int _saveIndex;
+
+                match('<');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBXOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BXOR;
+                int _saveIndex;
+
+                match('^');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBXOR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BXOR_ASSIGN;
+                int _saveIndex;
+
+                match("^=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BOR;
+                int _saveIndex;
+
+                match('|');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBOR_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BOR_ASSIGN;
+                int _saveIndex;
+
+                match("|=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLOR(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LOR;
+                int _saveIndex;
+
+                match("||");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBAND(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BAND;
+                int _saveIndex;
+
+                match('&');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mBAND_ASSIGN(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = BAND_ASSIGN;
+                int _saveIndex;
+
+                match("&=");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mLAND(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = LAND;
+                int _saveIndex;
+
+                match("&&");
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSEMI(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SEMI;
+                int _saveIndex;
+
+                match(';');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mWS(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = WS;
+                int _saveIndex;
+
+                {
+                int _cnt105=0;
+                _loop105:
+                do {
+                        switch ( LA(1)) {
+                        case ' ':
+                        {
+                                match(' ');
+                                break;
+                        }
+                        case '\t':
+                        {
+                                match('\t');
+                                break;
+                        }
+                        case '\u000c':
+                        {
+                                match('\f');
+                                break;
+                        }
+                        case '\n':  case '\r':
+                        {
+                                {
+                                if ((LA(1)=='\r') && (LA(2)=='\n') && (true) && (true)) {
+                                        match("\r\n");
+                                }
+                                else if ((LA(1)=='\r') && (true) && (true) && (true)) {
+                                        match('\r');
+                                }
+                                else if ((LA(1)=='\n')) {
+                                        match('\n');
+                                }
+                                else {
+                                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                }
+
+                                }
+                                if ( inputState.guessing==0 ) {
+                                        newline();
+                                }
+                                break;
+                        }
+                        default:
+                        {
+                                if ( _cnt105>=1 ) { break _loop105; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                        }
+                        }
+                        _cnt105++;
+                } while (true);
+                }
+                if ( inputState.guessing==0 ) {
+                        _ttype = Token.SKIP;
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSL_COMMIT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = SL_COMMIT;
+                int _saveIndex;
+
+                match("//");
+                {
+                _loop109:
+                do {
+                        if ((_tokenSet_0.member(LA(1)))) {
+                                {
+                                match(_tokenSet_0);
+                                }
+                        }
+                        else {
+                                break _loop109;
+                        }
+
+                } while (true);
+                }
+                {
+                switch ( LA(1)) {
+                case '\n':
+                {
+                        match('\n');
+                        break;
+                }
+                case '\r':
+                {
+                        match('\r');
+                        {
+                        if ((LA(1)=='\n')) {
+                                match('\n');
+                        }
+                        else {
+                        }
+
+                        }
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                if ( inputState.guessing==0 ) {
+                        _ttype = Token.SKIP; newline();
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mML_COMMENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = ML_COMMENT;
+                int _saveIndex;
+
+                match("/*");
+                {
+                _loop115:
+                do {
+                        if ((LA(1)=='\r') && (LA(2)=='\n') && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')) && ((LA(4) >= '\u0003' && LA(4) <= '\uffff'))) {
+                                match('\r');
+                                match('\n');
+                                if ( inputState.guessing==0 ) {
+                                        newline();
+                                }
+                        }
+                        else if (((LA(1)=='*') && ((LA(2) >= '\u0003' && LA(2) <= '\uffff')) && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')))&&( LA(2)!='/' )) {
+                                match('*');
+                        }
+                        else if ((LA(1)=='\r') && ((LA(2) >= '\u0003' && LA(2) <= '\uffff')) && ((LA(3) >= '\u0003' && LA(3) <= '\uffff')) && (true)) {
+                                match('\r');
+                                if ( inputState.guessing==0 ) {
+                                        newline();
+                                }
+                        }
+                        else if ((LA(1)=='\n')) {
+                                match('\n');
+                                if ( inputState.guessing==0 ) {
+                                        newline();
+                                }
+                        }
+                        else if ((_tokenSet_1.member(LA(1)))) {
+                                {
+                                match(_tokenSet_1);
+                                }
+                        }
+                        else {
+                                break _loop115;
+                        }
+
+                } while (true);
+                }
+                match("*/");
+                if ( inputState.guessing==0 ) {
+                        _ttype = Token.SKIP;
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mCHAR_LITERAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = CHAR_LITERAL;
+                int _saveIndex;
+
+                match('\'');
+                {
+                if ((LA(1)=='\\')) {
+                        mESC(false);
+                }
+                else if ((_tokenSet_2.member(LA(1)))) {
+                        {
+                        match(_tokenSet_2);
+                        }
+                }
+                else {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+
+                }
+                match('\'');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        protected final void mESC(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = ESC;
+                int _saveIndex;
+
+                match('\\');
+                {
+                switch ( LA(1)) {
+                case 'n':
+                {
+                        match('n');
+                        break;
+                }
+                case 'r':
+                {
+                        match('r');
+                        break;
+                }
+                case 't':
+                {
+                        match('t');
+                        break;
+                }
+                case 'b':
+                {
+                        match('b');
+                        break;
+                }
+                case 'f':
+                {
+                        match('f');
+                        break;
+                }
+                case '"':
+                {
+                        match('"');
+                        break;
+                }
+                case '\'':
+                {
+                        match('\'');
+                        break;
+                }
+                case '\\':
+                {
+                        match('\\');
+                        break;
+                }
+                case 'u':
+                {
+                        {
+                        int _cnt126=0;
+                        _loop126:
+                        do {
+                                if ((LA(1)=='u')) {
+                                        match('u');
+                                }
+                                else {
+                                        if ( _cnt126>=1 ) { break _loop126; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                }
+
+                                _cnt126++;
+                        } while (true);
+                        }
+                        mHEX_DIGIT(false);
+                        mHEX_DIGIT(false);
+                        mHEX_DIGIT(false);
+                        mHEX_DIGIT(false);
+                        break;
+                }
+                case '0':  case '1':  case '2':  case '3':
+                {
+                        matchRange('0','3');
+                        {
+                        if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
+                                matchRange('0','7');
+                                {
+                                if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
+                                        matchRange('0','7');
+                                }
+                                else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
+                                }
+                                else {
+                                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                }
+
+                                }
+                        }
+                        else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
+                        }
+                        else {
+                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                        }
+
+                        }
+                        break;
+                }
+                case '4':  case '5':  case '6':  case '7':
+                {
+                        matchRange('4','7');
+                        {
+                        if (((LA(1) >= '0' && LA(1) <= '7')) && (_tokenSet_0.member(LA(2))) && (true) && (true)) {
+                                matchRange('0','7');
+                        }
+                        else if ((_tokenSet_0.member(LA(1))) && (true) && (true) && (true)) {
+                        }
+                        else {
+                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                        }
+
+                        }
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mSTRING_LITERAL(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = STRING_LITERAL;
+                int _saveIndex;
+
+                match('"');
+                {
+                _loop122:
+                do {
+                        if ((LA(1)=='\\')) {
+                                mESC(false);
+                        }
+                        else if ((_tokenSet_3.member(LA(1)))) {
+                                {
+                                match(_tokenSet_3);
+                                }
+                        }
+                        else {
+                                break _loop122;
+                        }
+
+                } while (true);
+                }
+                match('"');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        protected final void mHEX_DIGIT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = HEX_DIGIT;
+                int _saveIndex;
+
+                {
+                switch ( LA(1)) {
+                case '0':  case '1':  case '2':  case '3':
+                case '4':  case '5':  case '6':  case '7':
+                case '8':  case '9':
+                {
+                        matchRange('0','9');
+                        break;
+                }
+                case 'A':  case 'B':  case 'C':  case 'D':
+                case 'E':  case 'F':
+                {
+                        matchRange('A','F');
+                        break;
+                }
+                case 'a':  case 'b':  case 'c':  case 'd':
+                case 'e':  case 'f':
+                {
+                        matchRange('a','f');
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        protected final void mVOCAB(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = VOCAB;
+                int _saveIndex;
+
+                matchRange('\3','\377');
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mIDENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = IDENT;
+                int _saveIndex;
+
+                {
+                switch ( LA(1)) {
+                case 'a':  case 'b':  case 'c':  case 'd':
+                case 'e':  case 'f':  case 'g':  case 'h':
+                case 'i':  case 'j':  case 'k':  case 'l':
+                case 'm':  case 'n':  case 'o':  case 'p':
+                case 'q':  case 'r':  case 's':  case 't':
+                case 'u':  case 'v':  case 'w':  case 'x':
+                case 'y':  case 'z':
+                {
+                        matchRange('a','z');
+                        break;
+                }
+                case 'A':  case 'B':  case 'C':  case 'D':
+                case 'E':  case 'F':  case 'G':  case 'H':
+                case 'I':  case 'J':  case 'K':  case 'L':
+                case 'M':  case 'N':  case 'O':  case 'P':
+                case 'Q':  case 'R':  case 'S':  case 'T':
+                case 'U':  case 'V':  case 'W':  case 'X':
+                case 'Y':  case 'Z':
+                {
+                        matchRange('A','Z');
+                        break;
+                }
+                case '_':
+                {
+                        match('_');
+                        break;
+                }
+                case '$':
+                {
+                        match('$');
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                {
+                _loop136:
+                do {
+                        switch ( LA(1)) {
+                        case 'a':  case 'b':  case 'c':  case 'd':
+                        case 'e':  case 'f':  case 'g':  case 'h':
+                        case 'i':  case 'j':  case 'k':  case 'l':
+                        case 'm':  case 'n':  case 'o':  case 'p':
+                        case 'q':  case 'r':  case 's':  case 't':
+                        case 'u':  case 'v':  case 'w':  case 'x':
+                        case 'y':  case 'z':
+                        {
+                                matchRange('a','z');
+                                break;
+                        }
+                        case 'A':  case 'B':  case 'C':  case 'D':
+                        case 'E':  case 'F':  case 'G':  case 'H':
+                        case 'I':  case 'J':  case 'K':  case 'L':
+                        case 'M':  case 'N':  case 'O':  case 'P':
+                        case 'Q':  case 'R':  case 'S':  case 'T':
+                        case 'U':  case 'V':  case 'W':  case 'X':
+                        case 'Y':  case 'Z':
+                        {
+                                matchRange('A','Z');
+                                break;
+                        }
+                        case '_':
+                        {
+                                match('_');
+                                break;
+                        }
+                        case '0':  case '1':  case '2':  case '3':
+                        case '4':  case '5':  case '6':  case '7':
+                        case '8':  case '9':
+                        {
+                                matchRange('0','9');
+                                break;
+                        }
+                        case '$':
+                        {
+                                match('$');
+                                break;
+                        }
+                        default:
+                        {
+                                break _loop136;
+                        }
+                        }
+                } while (true);
+                }
+                _ttype = testLiteralsTable(_ttype);
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        public final void mNUM_INT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = NUM_INT;
+                int _saveIndex;
+                Token f1=null;
+                Token f2=null;
+                Token f3=null;
+                Token f4=null;
+                boolean isDecimal=false; Token t=null;
+
+                switch ( LA(1)) {
+                case '.':
+                {
+                        match('.');
+                        if ( inputState.guessing==0 ) {
+                                _ttype = DOT;
+                        }
+                        {
+                        if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                {
+                                int _cnt140=0;
+                                _loop140:
+                                do {
+                                        if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                                matchRange('0','9');
+                                        }
+                                        else {
+                                                if ( _cnt140>=1 ) { break _loop140; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                        }
+
+                                        _cnt140++;
+                                } while (true);
+                                }
+                                {
+                                if ((LA(1)=='E'||LA(1)=='e')) {
+                                        mEXPONENT(false);
+                                }
+                                else {
+                                }
+
+                                }
+                                {
+                                if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
+                                        mFLOAT_SUFFIX(true);
+                                        f1=_returnToken;
+                                        if ( inputState.guessing==0 ) {
+                                                t=f1;
+                                        }
+                                }
+                                else {
+                                }
+
+                                }
+                                if ( inputState.guessing==0 ) {
+
+                                                                        if (t != null && t.getText().toUpperCase().indexOf('F')>=0) {
+                                                _ttype = NUM_FLOAT;
+                                                                        }
+                                                                        else {
+                                                _ttype = NUM_DOUBLE; // assume double
+                                                                        }
+
+                                }
+                        }
+                        else {
+                        }
+
+                        }
+                        break;
+                }
+                case '0':  case '1':  case '2':  case '3':
+                case '4':  case '5':  case '6':  case '7':
+                case '8':  case '9':
+                {
+                        {
+                        switch ( LA(1)) {
+                        case '0':
+                        {
+                                match('0');
+                                if ( inputState.guessing==0 ) {
+                                        isDecimal = true;
+                                }
+                                {
+                                if ((LA(1)=='X'||LA(1)=='x')) {
+                                        {
+                                        switch ( LA(1)) {
+                                        case 'x':
+                                        {
+                                                match('x');
+                                                break;
+                                        }
+                                        case 'X':
+                                        {
+                                                match('X');
+                                                break;
+                                        }
+                                        default:
+                                        {
+                                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                        }
+                                        }
+                                        }
+                                        {
+                                        int _cnt147=0;
+                                        _loop147:
+                                        do {
+                                                if ((_tokenSet_4.member(LA(1))) && (true) && (true) && (true)) {
+                                                        mHEX_DIGIT(false);
+                                                }
+                                                else {
+                                                        if ( _cnt147>=1 ) { break _loop147; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                                }
+
+                                                _cnt147++;
+                                        } while (true);
+                                        }
+                                }
+                                else {
+                                        boolean synPredMatched152 = false;
+                                        if ((((LA(1) >= '0' && LA(1) <= '9')) && (true) && (true) && (true))) {
+                                                int _m152 = mark();
+                                                synPredMatched152 = true;
+                                                inputState.guessing++;
+                                                try {
+                                                        {
+                                                        {
+                                                        int _cnt150=0;
+                                                        _loop150:
+                                                        do {
+                                                                if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                                                        matchRange('0','9');
+                                                                }
+                                                                else {
+                                                                        if ( _cnt150>=1 ) { break _loop150; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                                                }
+
+                                                                _cnt150++;
+                                                        } while (true);
+                                                        }
+                                                        {
+                                                        switch ( LA(1)) {
+                                                        case '.':
+                                                        {
+                                                                match('.');
+                                                                break;
+                                                        }
+                                                        case 'E':  case 'e':
+                                                        {
+                                                                mEXPONENT(false);
+                                                                break;
+                                                        }
+                                                        case 'D':  case 'F':  case 'd':  case 'f':
+                                                        {
+                                                                mFLOAT_SUFFIX(false);
+                                                                break;
+                                                        }
+                                                        default:
+                                                        {
+                                                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                                        }
+                                                        }
+                                                        }
+                                                        }
+                                                }
+                                                catch (RecognitionException pe) {
+                                                        synPredMatched152 = false;
+                                                }
+                                                rewind(_m152);
 inputState.guessing--;
-					}
-					if ( synPredMatched152 ) {
-						{
-						int _cnt154=0;
-						_loop154:
-						do {
-							if (((LA(1) >= '0' && LA(1) <= '9'))) {
-								matchRange('0','9');
-							}
-							else {
-								if ( _cnt154>=1 ) { break _loop154; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-							}
-							
-							_cnt154++;
-						} while (true);
-						}
-					}
-					else if (((LA(1) >= '0' && LA(1) <= '7')) && (true) && (true) && (true)) {
-						{
-						int _cnt156=0;
-						_loop156:
-						do {
-							if (((LA(1) >= '0' && LA(1) <= '7'))) {
-								matchRange('0','7');
-							}
-							else {
-								if ( _cnt156>=1 ) { break _loop156; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-							}
-							
-							_cnt156++;
-						} while (true);
-						}
-					}
-					else {
-					}
-					}
-					}
-					break;
-				}
-				case '1':  case '2':  case '3':  case '4':
-				case '5':  case '6':  case '7':  case '8':
-				case '9':
-				{
-					{
-					matchRange('1','9');
-					}
-					{
-					_loop159:
-					do {
-						if (((LA(1) >= '0' && LA(1) <= '9'))) {
-							matchRange('0','9');
-						}
-						else {
-							break _loop159;
-						}
-						
-					} while (true);
-					}
-					if ( inputState.guessing==0 ) {
-						isDecimal=true;
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-				}
-				}
-				}
-				{
-				if ((LA(1)=='L'||LA(1)=='l')) {
-					{
-					switch ( LA(1)) {
-					case 'l':
-					{
-						match('l');
-						break;
-					}
-					case 'L':
-					{
-						match('L');
-						break;
-					}
-					default:
-					{
-						throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-					}
-					}
-					}
-					if ( inputState.guessing==0 ) {
-						_ttype = NUM_LONG;
-					}
-				}
-				else if (((LA(1)=='.'||LA(1)=='D'||LA(1)=='E'||LA(1)=='F'||LA(1)=='d'||LA(1)=='e'||LA(1)=='f'))&&(isDecimal)) {
-					{
-					switch ( LA(1)) {
-					case '.':
-					{
-						match('.');
-						{
-						_loop164:
-						do {
-							if (((LA(1) >= '0' && LA(1) <= '9'))) {
-								matchRange('0','9');
-							}
-							else {
-								break _loop164;
-							}
-							
-						} while (true);
-						}
-						{
-						if ((LA(1)=='E'||LA(1)=='e')) {
-							mEXPONENT(false);
-						}
-						else {
-						}
-						
-						}
-						{
-						if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
-							mFLOAT_SUFFIX(true);
-							f2=_returnToken;
-							if ( inputState.guessing==0 ) {
-								t=f2;
-							}
-						}
-						else {
-						}
-						
-						}
-						break;
-					}
-					case 'E':  case 'e':
-					{
-						mEXPONENT(false);
-						{
-						if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
-							mFLOAT_SUFFIX(true);
-							f3=_returnToken;
-							if ( inputState.guessing==0 ) {
-								t=f3;
-							}
-						}
-						else {
-						}
-						
-						}
-						break;
-					}
-					case 'D':  case 'F':  case 'd':  case 'f':
-					{
-						mFLOAT_SUFFIX(true);
-						f4=_returnToken;
-						if ( inputState.guessing==0 ) {
-							t=f4;
-						}
-						break;
-					}
-					default:
-					{
-						throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-					}
-					}
-					}
-					if ( inputState.guessing==0 ) {
-						
-									if (t != null && t.getText().toUpperCase() .indexOf('F') >= 0) {
-						_ttype = NUM_FLOAT;
-									}
-						else {
-							           	_ttype = NUM_DOUBLE; // assume double
-									}
-									
-					}
-				}
-				else {
-				}
-				
-				}
-				break;
-			}
-			default:
-			{
-				throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-			}
-			}
-			if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-				_token = makeToken(_ttype);
-				_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-			}
-			_returnToken = _token;
-		}
-		
-	protected final void mEXPONENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = EXPONENT;
-		int _saveIndex;
-		
-		{
-		switch ( LA(1)) {
-		case 'e':
-		{
-			match('e');
-			break;
-		}
-		case 'E':
-		{
-			match('E');
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		{
-		switch ( LA(1)) {
-		case '+':
-		{
-			match('+');
-			break;
-		}
-		case '-':
-		{
-			match('-');
-			break;
-		}
-		case '0':  case '1':  case '2':  case '3':
-		case '4':  case '5':  case '6':  case '7':
-		case '8':  case '9':
-		{
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		}
-		{
-		int _cnt172=0;
-		_loop172:
-		do {
-			if (((LA(1) >= '0' && LA(1) <= '9'))) {
-				matchRange('0','9');
-			}
-			else {
-				if ( _cnt172>=1 ) { break _loop172; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
-			}
-			
-			_cnt172++;
-		} while (true);
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	protected final void mFLOAT_SUFFIX(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
-		int _ttype; Token _token=null; int _begin=text.length();
-		_ttype = FLOAT_SUFFIX;
-		int _saveIndex;
-		
-		switch ( LA(1)) {
-		case 'f':
-		{
-			match('f');
-			break;
-		}
-		case 'F':
-		{
-			match('F');
-			break;
-		}
-		case 'd':
-		{
-			match('d');
-			break;
-		}
-		case 'D':
-		{
-			match('D');
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
-		}
-		}
-		if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
-			_token = makeToken(_ttype);
-			_token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
-		}
-		_returnToken = _token;
-	}
-	
-	
-	private static final long[] mk_tokenSet_0() {
-		long[] data = new long[2048];
-		data[0]=-9224L;
-		for (int i = 1; i<=1023; i++) { data[i]=-1L; }
-		return data;
-	}
-	public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
-	private static final long[] mk_tokenSet_1() {
-		long[] data = new long[2048];
-		data[0]=-4398046520328L;
-		for (int i = 1; i<=1023; i++) { data[i]=-1L; }
-		return data;
-	}
-	public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
-	private static final long[] mk_tokenSet_2() {
-		long[] data = new long[2048];
-		data[0]=-549755823112L;
-		data[1]=-268435457L;
-		for (int i = 2; i<=1023; i++) { data[i]=-1L; }
-		return data;
-	}
-	public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
-	private static final long[] mk_tokenSet_3() {
-		long[] data = new long[2048];
-		data[0]=-17179878408L;
-		data[1]=-268435457L;
-		for (int i = 2; i<=1023; i++) { data[i]=-1L; }
-		return data;
-	}
-	public static final BitSet _tokenSet_3 = new BitSet(mk_tokenSet_3());
-	private static final long[] mk_tokenSet_4() {
-		long[] data = new long[1025];
-		data[0]=287948901175001088L;
-		data[1]=541165879422L;
-		return data;
-	}
-	public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
-	
-	}
+                                        }
+                                        if ( synPredMatched152 ) {
+                                                {
+                                                int _cnt154=0;
+                                                _loop154:
+                                                do {
+                                                        if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                                                matchRange('0','9');
+                                                        }
+                                                        else {
+                                                                if ( _cnt154>=1 ) { break _loop154; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                                        }
+
+                                                        _cnt154++;
+                                                } while (true);
+                                                }
+                                        }
+                                        else if (((LA(1) >= '0' && LA(1) <= '7')) && (true) && (true) && (true)) {
+                                                {
+                                                int _cnt156=0;
+                                                _loop156:
+                                                do {
+                                                        if (((LA(1) >= '0' && LA(1) <= '7'))) {
+                                                                matchRange('0','7');
+                                                        }
+                                                        else {
+                                                                if ( _cnt156>=1 ) { break _loop156; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                                                        }
+
+                                                        _cnt156++;
+                                                } while (true);
+                                                }
+                                        }
+                                        else {
+                                        }
+                                        }
+                                        }
+                                        break;
+                                }
+                                case '1':  case '2':  case '3':  case '4':
+                                case '5':  case '6':  case '7':  case '8':
+                                case '9':
+                                {
+                                        {
+                                        matchRange('1','9');
+                                        }
+                                        {
+                                        _loop159:
+                                        do {
+                                                if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                                        matchRange('0','9');
+                                                }
+                                                else {
+                                                        break _loop159;
+                                                }
+
+                                        } while (true);
+                                        }
+                                        if ( inputState.guessing==0 ) {
+                                                isDecimal=true;
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                }
+                                }
+                                }
+                                {
+                                if ((LA(1)=='L'||LA(1)=='l')) {
+                                        {
+                                        switch ( LA(1)) {
+                                        case 'l':
+                                        {
+                                                match('l');
+                                                break;
+                                        }
+                                        case 'L':
+                                        {
+                                                match('L');
+                                                break;
+                                        }
+                                        default:
+                                        {
+                                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                        }
+                                        }
+                                        }
+                                        if ( inputState.guessing==0 ) {
+                                                _ttype = NUM_LONG;
+                                        }
+                                }
+                                else if (((LA(1)=='.'||LA(1)=='D'||LA(1)=='E'||LA(1)=='F'||LA(1)=='d'||LA(1)=='e'||LA(1)=='f'))&&(isDecimal)) {
+                                        {
+                                        switch ( LA(1)) {
+                                        case '.':
+                                        {
+                                                match('.');
+                                                {
+                                                _loop164:
+                                                do {
+                                                        if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                                                matchRange('0','9');
+                                                        }
+                                                        else {
+                                                                break _loop164;
+                                                        }
+
+                                                } while (true);
+                                                }
+                                                {
+                                                if ((LA(1)=='E'||LA(1)=='e')) {
+                                                        mEXPONENT(false);
+                                                }
+                                                else {
+                                                }
+
+                                                }
+                                                {
+                                                if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
+                                                        mFLOAT_SUFFIX(true);
+                                                        f2=_returnToken;
+                                                        if ( inputState.guessing==0 ) {
+                                                                t=f2;
+                                                        }
+                                                }
+                                                else {
+                                                }
+
+                                                }
+                                                break;
+                                        }
+                                        case 'E':  case 'e':
+                                        {
+                                                mEXPONENT(false);
+                                                {
+                                                if ((LA(1)=='D'||LA(1)=='F'||LA(1)=='d'||LA(1)=='f')) {
+                                                        mFLOAT_SUFFIX(true);
+                                                        f3=_returnToken;
+                                                        if ( inputState.guessing==0 ) {
+                                                                t=f3;
+                                                        }
+                                                }
+                                                else {
+                                                }
+
+                                                }
+                                                break;
+                                        }
+                                        case 'D':  case 'F':  case 'd':  case 'f':
+                                        {
+                                                mFLOAT_SUFFIX(true);
+                                                f4=_returnToken;
+                                                if ( inputState.guessing==0 ) {
+                                                        t=f4;
+                                                }
+                                                break;
+                                        }
+                                        default:
+                                        {
+                                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                                        }
+                                        }
+                                        }
+                                        if ( inputState.guessing==0 ) {
+
+                                                                        if (t != null && t.getText().toUpperCase() .indexOf('F') >= 0) {
+                                                _ttype = NUM_FLOAT;
+                                                                        }
+                                                else {
+                                                                        _ttype = NUM_DOUBLE; // assume double
+                                                                        }
+
+                                        }
+                                }
+                                else {
+                                }
+
+                                }
+                                break;
+                        }
+                        default:
+                        {
+                                throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                        }
+                        }
+                        if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                                _token = makeToken(_ttype);
+                                _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                        }
+                        _returnToken = _token;
+                }
+
+        protected final void mEXPONENT(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = EXPONENT;
+                int _saveIndex;
+
+                {
+                switch ( LA(1)) {
+                case 'e':
+                {
+                        match('e');
+                        break;
+                }
+                case 'E':
+                {
+                        match('E');
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                {
+                switch ( LA(1)) {
+                case '+':
+                {
+                        match('+');
+                        break;
+                }
+                case '-':
+                {
+                        match('-');
+                        break;
+                }
+                case '0':  case '1':  case '2':  case '3':
+                case '4':  case '5':  case '6':  case '7':
+                case '8':  case '9':
+                {
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                }
+                {
+                int _cnt172=0;
+                _loop172:
+                do {
+                        if (((LA(1) >= '0' && LA(1) <= '9'))) {
+                                matchRange('0','9');
+                        }
+                        else {
+                                if ( _cnt172>=1 ) { break _loop172; } else {throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());}
+                        }
+
+                        _cnt172++;
+                } while (true);
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+        protected final void mFLOAT_SUFFIX(boolean _createToken) throws RecognitionException, CharStreamException, TokenStreamException {
+                int _ttype; Token _token=null; int _begin=text.length();
+                _ttype = FLOAT_SUFFIX;
+                int _saveIndex;
+
+                switch ( LA(1)) {
+                case 'f':
+                {
+                        match('f');
+                        break;
+                }
+                case 'F':
+                {
+                        match('F');
+                        break;
+                }
+                case 'd':
+                {
+                        match('d');
+                        break;
+                }
+                case 'D':
+                {
+                        match('D');
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltForCharException((char)LA(1), getFilename(), getLine(), getColumn());
+                }
+                }
+                if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
+                        _token = makeToken(_ttype);
+                        _token.setText(new String(text.getBuffer(), _begin, text.length()-_begin));
+                }
+                _returnToken = _token;
+        }
+
+
+        private static final long[] mk_tokenSet_0() {
+                long[] data = new long[2048];
+                data[0]=-9224L;
+                for (int i = 1; i<=1023; i++) { data[i]=-1L; }
+                return data;
+        }
+        public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
+        private static final long[] mk_tokenSet_1() {
+                long[] data = new long[2048];
+                data[0]=-4398046520328L;
+                for (int i = 1; i<=1023; i++) { data[i]=-1L; }
+                return data;
+        }
+        public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
+        private static final long[] mk_tokenSet_2() {
+                long[] data = new long[2048];
+                data[0]=-549755823112L;
+                data[1]=-268435457L;
+                for (int i = 2; i<=1023; i++) { data[i]=-1L; }
+                return data;
+        }
+        public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
+        private static final long[] mk_tokenSet_3() {
+                long[] data = new long[2048];
+                data[0]=-17179878408L;
+                data[1]=-268435457L;
+                for (int i = 2; i<=1023; i++) { data[i]=-1L; }
+                return data;
+        }
+        public static final BitSet _tokenSet_3 = new BitSet(mk_tokenSet_3());
+        private static final long[] mk_tokenSet_4() {
+                long[] data = new long[1025];
+                data[0]=287948901175001088L;
+                data[1]=541165879422L;
+                return data;
+        }
+        public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
+
+        }
diff --git a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java
index 9dfc9db38a5..bd43bf3b636 100644
--- a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java
+++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java
@@ -1,6 +1,6 @@
 // $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaRecognizer.java"$
- 
-   package gnu.classpath.tools.gjdoc.expr; 
+
+   package gnu.classpath.tools.gjdoc.expr;
 
 import antlr.TokenBuffer;
 import antlr.TokenStreamException;
@@ -53,1354 +53,1354 @@ public JavaRecognizer(ParserSharedInputState state) {
   astFactory = new ASTFactory(getTokenTypeToASTClassMap());
 }
 
-	public final Type  builtInTypeSpec(
-		boolean addImagNode
-	) throws RecognitionException, TokenStreamException {
-		Type t = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST builtInTypeSpec_AST = null;
-		Token  lb = null;
-		AST lb_AST = null;
-		
-		t=builtInType();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop3:
-		do {
-			if ((LA(1)==LBRACK)) {
-				lb = LT(1);
-				lb_AST = astFactory.create(lb);
-				astFactory.makeASTRoot(currentAST, lb_AST);
-				match(LBRACK);
-				if ( inputState.guessing==0 ) {
-					lb_AST.setType(ARRAY_DECLARATOR);
-				}
-				match(RBRACK);
-			}
-			else {
-				break _loop3;
-			}
-			
-		} while (true);
-		}
-		if ( inputState.guessing==0 ) {
-			builtInTypeSpec_AST = (AST)currentAST.root;
-			
-						if ( addImagNode ) {
-							builtInTypeSpec_AST = (AST)astFactory.make( (new ASTArray(2)).add(astFactory.create(TYPE,"TYPE")).add(builtInTypeSpec_AST));
-						}
-					
-			currentAST.root = builtInTypeSpec_AST;
-			currentAST.child = builtInTypeSpec_AST!=null &&builtInTypeSpec_AST.getFirstChild()!=null ?
-				builtInTypeSpec_AST.getFirstChild() : builtInTypeSpec_AST;
-			currentAST.advanceChildToEnd();
-		}
-		builtInTypeSpec_AST = (AST)currentAST.root;
-		returnAST = builtInTypeSpec_AST;
-		return t;
-	}
-	
-	public final Type  builtInType() throws RecognitionException, TokenStreamException {
-		Type t = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST builtInType_AST = null;
-		
-		switch ( LA(1)) {
-		case LITERAL_void:
-		{
-			AST tmp2_AST = null;
-			tmp2_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp2_AST);
-			match(LITERAL_void);
-			if ( inputState.guessing==0 ) {
-				t=Type.VOID;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_boolean:
-		{
-			AST tmp3_AST = null;
-			tmp3_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp3_AST);
-			match(LITERAL_boolean);
-			if ( inputState.guessing==0 ) {
-				t=Type.BOOLEAN;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_byte:
-		{
-			AST tmp4_AST = null;
-			tmp4_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp4_AST);
-			match(LITERAL_byte);
-			if ( inputState.guessing==0 ) {
-				t=Type.BYTE;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_char:
-		{
-			AST tmp5_AST = null;
-			tmp5_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp5_AST);
-			match(LITERAL_char);
-			if ( inputState.guessing==0 ) {
-				t=Type.CHAR;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_short:
-		{
-			AST tmp6_AST = null;
-			tmp6_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp6_AST);
-			match(LITERAL_short);
-			if ( inputState.guessing==0 ) {
-				t=Type.SHORT;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_int:
-		{
-			AST tmp7_AST = null;
-			tmp7_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp7_AST);
-			match(LITERAL_int);
-			if ( inputState.guessing==0 ) {
-				t=Type.INTEGER;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_float:
-		{
-			AST tmp8_AST = null;
-			tmp8_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp8_AST);
-			match(LITERAL_float);
-			if ( inputState.guessing==0 ) {
-				t=Type.FLOAT;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_long:
-		{
-			AST tmp9_AST = null;
-			tmp9_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp9_AST);
-			match(LITERAL_long);
-			if ( inputState.guessing==0 ) {
-				t=Type.LONG;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_double:
-		{
-			AST tmp10_AST = null;
-			tmp10_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp10_AST);
-			match(LITERAL_double);
-			if ( inputState.guessing==0 ) {
-				t=Type.DOUBLE;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_String:
-		{
-			AST tmp11_AST = null;
-			tmp11_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp11_AST);
-			match(LITERAL_String);
-			if ( inputState.guessing==0 ) {
-				t=Type.STRING;
-			}
-			builtInType_AST = (AST)currentAST.root;
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		returnAST = builtInType_AST;
-		return t;
-	}
-	
-	public final Type  type() throws RecognitionException, TokenStreamException {
-		Type t;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST type_AST = null;
-		
-		t=builtInType();
-		astFactory.addASTChild(currentAST, returnAST);
-		type_AST = (AST)currentAST.root;
-		returnAST = type_AST;
-		return t;
-	}
-	
-	public final String  identifier() throws RecognitionException, TokenStreamException {
-		String s = null;;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST identifier_AST = null;
-		Token  i = null;
-		AST i_AST = null;
-		Token  i2 = null;
-		AST i2_AST = null;
-		
-		i = LT(1);
-		i_AST = astFactory.create(i);
-		astFactory.addASTChild(currentAST, i_AST);
-		match(IDENT);
-		if ( inputState.guessing==0 ) {
-			s=i.getText();
-		}
-		{
-		_loop8:
-		do {
-			if ((LA(1)==DOT)) {
-				AST tmp12_AST = null;
-				tmp12_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp12_AST);
-				match(DOT);
-				i2 = LT(1);
-				i2_AST = astFactory.create(i2);
-				astFactory.addASTChild(currentAST, i2_AST);
-				match(IDENT);
-				if ( inputState.guessing==0 ) {
-					s+="."+i2.getText();
-				}
-			}
-			else {
-				break _loop8;
-			}
-			
-		} while (true);
-		}
-		identifier_AST = (AST)currentAST.root;
-		returnAST = identifier_AST;
-		return s;
-	}
-	
-	public final Expression  expression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST expression_AST = null;
-		
-		e=conditionalExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		match(Token.EOF_TYPE);
-		expression_AST = (AST)currentAST.root;
-		returnAST = expression_AST;
-		return e;
-	}
-	
-	public final Expression  conditionalExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST conditionalExpression_AST = null;
-		Expression a,b,c;
-		
-		e=logicalOrExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		switch ( LA(1)) {
-		case QUESTION:
-		{
-			AST tmp14_AST = null;
-			tmp14_AST = astFactory.create(LT(1));
-			astFactory.makeASTRoot(currentAST, tmp14_AST);
-			match(QUESTION);
-			b=conditionalExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			match(COLON);
-			c=conditionalExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			if ( inputState.guessing==0 ) {
-				e=new ConditionalExpression(e,b,c);
-			}
-			break;
-		}
-		case EOF:
-		case COLON:
-		case RPAREN:
-		{
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		}
-		conditionalExpression_AST = (AST)currentAST.root;
-		returnAST = conditionalExpression_AST;
-		return e;
-	}
-	
-	public final Expression  logicalOrExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST logicalOrExpression_AST = null;
-		Expression a,b;
-		
-		e=logicalAndExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop14:
-		do {
-			if ((LA(1)==LOR)) {
-				AST tmp16_AST = null;
-				tmp16_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp16_AST);
-				match(LOR);
-				b=logicalAndExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new LogicalOrExpression(e,b);
-				}
-			}
-			else {
-				break _loop14;
-			}
-			
-		} while (true);
-		}
-		logicalOrExpression_AST = (AST)currentAST.root;
-		returnAST = logicalOrExpression_AST;
-		return e;
-	}
-	
-	public final Expression  logicalAndExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST logicalAndExpression_AST = null;
-		Expression a,b;
-		
-		e=inclusiveOrExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop17:
-		do {
-			if ((LA(1)==LAND)) {
-				AST tmp17_AST = null;
-				tmp17_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp17_AST);
-				match(LAND);
-				b=inclusiveOrExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new LogicalAndExpression(e,b);
-				}
-			}
-			else {
-				break _loop17;
-			}
-			
-		} while (true);
-		}
-		logicalAndExpression_AST = (AST)currentAST.root;
-		returnAST = logicalAndExpression_AST;
-		return e;
-	}
-	
-	public final Expression  inclusiveOrExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST inclusiveOrExpression_AST = null;
-		Expression a,b;
-		
-		e=exclusiveOrExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop20:
-		do {
-			if ((LA(1)==BOR)) {
-				AST tmp18_AST = null;
-				tmp18_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp18_AST);
-				match(BOR);
-				b=exclusiveOrExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new InclusiveOrExpression(e,b);
-				}
-			}
-			else {
-				break _loop20;
-			}
-			
-		} while (true);
-		}
-		inclusiveOrExpression_AST = (AST)currentAST.root;
-		returnAST = inclusiveOrExpression_AST;
-		return e;
-	}
-	
-	public final Expression  exclusiveOrExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST exclusiveOrExpression_AST = null;
-		Expression a,b;
-		
-		e=andExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop23:
-		do {
-			if ((LA(1)==BXOR)) {
-				AST tmp19_AST = null;
-				tmp19_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp19_AST);
-				match(BXOR);
-				b=andExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new ExclusiveOrExpression(e,b);
-				}
-			}
-			else {
-				break _loop23;
-			}
-			
-		} while (true);
-		}
-		exclusiveOrExpression_AST = (AST)currentAST.root;
-		returnAST = exclusiveOrExpression_AST;
-		return e;
-	}
-	
-	public final Expression  andExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST andExpression_AST = null;
-		Expression a,b;
-		
-		e=equalityExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop26:
-		do {
-			if ((LA(1)==BAND)) {
-				AST tmp20_AST = null;
-				tmp20_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp20_AST);
-				match(BAND);
-				b=equalityExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new AndExpression(e,b);
-				}
-			}
-			else {
-				break _loop26;
-			}
-			
-		} while (true);
-		}
-		andExpression_AST = (AST)currentAST.root;
-		returnAST = andExpression_AST;
-		return e;
-	}
-	
-	public final Expression  equalityExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST equalityExpression_AST = null;
-		Expression a,b;
-		
-		e=relationalExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop30:
-		do {
-			if ((LA(1)==NOT_EQUAL||LA(1)==EQUAL)) {
-				{
-				switch ( LA(1)) {
-				case NOT_EQUAL:
-				{
-					AST tmp21_AST = null;
-					tmp21_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp21_AST);
-					match(NOT_EQUAL);
-					a=relationalExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new NotEqualExpression(e,a);
-					}
-					break;
-				}
-				case EQUAL:
-				{
-					AST tmp22_AST = null;
-					tmp22_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp22_AST);
-					match(EQUAL);
-					a=relationalExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new EqualExpression(e,a);
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltException(LT(1), getFilename());
-				}
-				}
-				}
-			}
-			else {
-				break _loop30;
-			}
-			
-		} while (true);
-		}
-		equalityExpression_AST = (AST)currentAST.root;
-		returnAST = equalityExpression_AST;
-		return e;
-	}
-	
-	public final Expression  relationalExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST relationalExpression_AST = null;
-		Expression a,b;
-		
-		e=shiftExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		{
-		_loop35:
-		do {
-			if (((LA(1) >= LT && LA(1) <= GE))) {
-				{
-				switch ( LA(1)) {
-				case LT:
-				{
-					AST tmp23_AST = null;
-					tmp23_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp23_AST);
-					match(LT);
-					a=shiftExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new LessThanExpression(e,a);
-					}
-					break;
-				}
-				case GT:
-				{
-					AST tmp24_AST = null;
-					tmp24_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp24_AST);
-					match(GT);
-					a=shiftExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new GreaterThanExpression(e,a);
-					}
-					break;
-				}
-				case LE:
-				{
-					AST tmp25_AST = null;
-					tmp25_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp25_AST);
-					match(LE);
-					a=shiftExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new LessThanOrEqualExpression(e,a);
-					}
-					break;
-				}
-				case GE:
-				{
-					AST tmp26_AST = null;
-					tmp26_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp26_AST);
-					match(GE);
-					a=shiftExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new GreaterThanOrEqualExpression(e,a);
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltException(LT(1), getFilename());
-				}
-				}
-				}
-			}
-			else {
-				break _loop35;
-			}
-			
-		} while (true);
-		}
-		}
-		relationalExpression_AST = (AST)currentAST.root;
-		returnAST = relationalExpression_AST;
-		return e;
-	}
-	
-	public final Expression  shiftExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST shiftExpression_AST = null;
-		Expression a,b;
-		
-		e=additiveExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop39:
-		do {
-			if (((LA(1) >= SL && LA(1) <= BSR))) {
-				{
-				switch ( LA(1)) {
-				case SL:
-				{
-					AST tmp27_AST = null;
-					tmp27_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp27_AST);
-					match(SL);
-					a=additiveExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new ShiftLeftExpression(e,a);
-					}
-					break;
-				}
-				case SR:
-				{
-					AST tmp28_AST = null;
-					tmp28_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp28_AST);
-					match(SR);
-					a=additiveExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new ShiftRightExpression(e,a);
-					}
-					break;
-				}
-				case BSR:
-				{
-					AST tmp29_AST = null;
-					tmp29_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp29_AST);
-					match(BSR);
-					a=additiveExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new BitShiftRightExpression(e,a);
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltException(LT(1), getFilename());
-				}
-				}
-				}
-			}
-			else {
-				break _loop39;
-			}
-			
-		} while (true);
-		}
-		shiftExpression_AST = (AST)currentAST.root;
-		returnAST = shiftExpression_AST;
-		return e;
-	}
-	
-	public final Expression  additiveExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST additiveExpression_AST = null;
-		Expression a,b;
-		
-		e=multiplicativeExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop43:
-		do {
-			if ((LA(1)==PLUS||LA(1)==MINUS)) {
-				{
-				switch ( LA(1)) {
-				case PLUS:
-				{
-					AST tmp30_AST = null;
-					tmp30_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp30_AST);
-					match(PLUS);
-					a=multiplicativeExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new AdditionExpression(e,a);
-					}
-					break;
-				}
-				case MINUS:
-				{
-					AST tmp31_AST = null;
-					tmp31_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp31_AST);
-					match(MINUS);
-					a=multiplicativeExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new SubtractionExpression(e,a);
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltException(LT(1), getFilename());
-				}
-				}
-				}
-			}
-			else {
-				break _loop43;
-			}
-			
-		} while (true);
-		}
-		additiveExpression_AST = (AST)currentAST.root;
-		returnAST = additiveExpression_AST;
-		return e;
-	}
-	
-	public final Expression  multiplicativeExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST multiplicativeExpression_AST = null;
-		Expression a,b;
-		
-		e=unaryExpression();
-		astFactory.addASTChild(currentAST, returnAST);
-		{
-		_loop47:
-		do {
-			if (((LA(1) >= STAR && LA(1) <= MOD))) {
-				{
-				switch ( LA(1)) {
-				case STAR:
-				{
-					AST tmp32_AST = null;
-					tmp32_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp32_AST);
-					match(STAR);
-					a=unaryExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new MultiplicationExpression(e,a);
-					}
-					break;
-				}
-				case DIV:
-				{
-					AST tmp33_AST = null;
-					tmp33_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp33_AST);
-					match(DIV);
-					a=unaryExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new DivisionExpression(e,a);
-					}
-					break;
-				}
-				case MOD:
-				{
-					AST tmp34_AST = null;
-					tmp34_AST = astFactory.create(LT(1));
-					astFactory.makeASTRoot(currentAST, tmp34_AST);
-					match(MOD);
-					a=unaryExpression();
-					astFactory.addASTChild(currentAST, returnAST);
-					if ( inputState.guessing==0 ) {
-						e=new ModuloExpression(e,a);
-					}
-					break;
-				}
-				default:
-				{
-					throw new NoViableAltException(LT(1), getFilename());
-				}
-				}
-				}
-			}
-			else {
-				break _loop47;
-			}
-			
-		} while (true);
-		}
-		multiplicativeExpression_AST = (AST)currentAST.root;
-		returnAST = multiplicativeExpression_AST;
-		return e;
-	}
-	
-	public final Expression  unaryExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST unaryExpression_AST = null;
-		Expression a,b;
-		
-		switch ( LA(1)) {
-		case MINUS:
-		{
-			AST tmp35_AST = null;
-			tmp35_AST = astFactory.create(LT(1));
-			astFactory.makeASTRoot(currentAST, tmp35_AST);
-			match(MINUS);
-			if ( inputState.guessing==0 ) {
-				tmp35_AST.setType(UNARY_MINUS);
-			}
-			a=unaryExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			if ( inputState.guessing==0 ) {
-				e=new NegateExpression(a);
-			}
-			unaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case PLUS:
-		{
-			AST tmp36_AST = null;
-			tmp36_AST = astFactory.create(LT(1));
-			astFactory.makeASTRoot(currentAST, tmp36_AST);
-			match(PLUS);
-			if ( inputState.guessing==0 ) {
-				tmp36_AST.setType(UNARY_PLUS);
-			}
-			e=unaryExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			unaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case IDENT:
-		case BNOT:
-		case LNOT:
-		case LPAREN:
-		case LITERAL_true:
-		case LITERAL_false:
-		case LITERAL_null:
-		case NUM_INT:
-		case CHAR_LITERAL:
-		case STRING_LITERAL:
-		case NUM_FLOAT:
-		case NUM_LONG:
-		case NUM_DOUBLE:
-		{
-			e=unaryExpressionNotPlusMinus();
-			astFactory.addASTChild(currentAST, returnAST);
-			unaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		returnAST = unaryExpression_AST;
-		return e;
-	}
-	
-	public final Expression  unaryExpressionNotPlusMinus() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST unaryExpressionNotPlusMinus_AST = null;
-		Token  lpb = null;
-		AST lpb_AST = null;
-		Expression a; Type t;
-		
-		switch ( LA(1)) {
-		case BNOT:
-		{
-			AST tmp37_AST = null;
-			tmp37_AST = astFactory.create(LT(1));
-			astFactory.makeASTRoot(currentAST, tmp37_AST);
-			match(BNOT);
-			a=unaryExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			if ( inputState.guessing==0 ) {
-				e=new NotExpression(a);
-			}
-			unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
-			break;
-		}
-		case LNOT:
-		{
-			AST tmp38_AST = null;
-			tmp38_AST = astFactory.create(LT(1));
-			astFactory.makeASTRoot(currentAST, tmp38_AST);
-			match(LNOT);
-			a=unaryExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			if ( inputState.guessing==0 ) {
-				e=new LogicalNotExpression(a);
-			}
-			unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
-			break;
-		}
-		default:
-			boolean synPredMatched51 = false;
-			if (((LA(1)==LPAREN) && ((LA(2) >= LITERAL_void && LA(2) <= LITERAL_String)))) {
-				int _m51 = mark();
-				synPredMatched51 = true;
-				inputState.guessing++;
-				try {
-					{
-					match(LPAREN);
-					builtInTypeSpec(true);
-					match(RPAREN);
-					}
-				}
-				catch (RecognitionException pe) {
-					synPredMatched51 = false;
-				}
-				rewind(_m51);
+        public final Type  builtInTypeSpec(
+                boolean addImagNode
+        ) throws RecognitionException, TokenStreamException {
+                Type t = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST builtInTypeSpec_AST = null;
+                Token  lb = null;
+                AST lb_AST = null;
+
+                t=builtInType();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop3:
+                do {
+                        if ((LA(1)==LBRACK)) {
+                                lb = LT(1);
+                                lb_AST = astFactory.create(lb);
+                                astFactory.makeASTRoot(currentAST, lb_AST);
+                                match(LBRACK);
+                                if ( inputState.guessing==0 ) {
+                                        lb_AST.setType(ARRAY_DECLARATOR);
+                                }
+                                match(RBRACK);
+                        }
+                        else {
+                                break _loop3;
+                        }
+
+                } while (true);
+                }
+                if ( inputState.guessing==0 ) {
+                        builtInTypeSpec_AST = (AST)currentAST.root;
+
+                                                if ( addImagNode ) {
+                                                        builtInTypeSpec_AST = (AST)astFactory.make( (new ASTArray(2)).add(astFactory.create(TYPE,"TYPE")).add(builtInTypeSpec_AST));
+                                                }
+
+                        currentAST.root = builtInTypeSpec_AST;
+                        currentAST.child = builtInTypeSpec_AST!=null &&builtInTypeSpec_AST.getFirstChild()!=null ?
+                                builtInTypeSpec_AST.getFirstChild() : builtInTypeSpec_AST;
+                        currentAST.advanceChildToEnd();
+                }
+                builtInTypeSpec_AST = (AST)currentAST.root;
+                returnAST = builtInTypeSpec_AST;
+                return t;
+        }
+
+        public final Type  builtInType() throws RecognitionException, TokenStreamException {
+                Type t = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST builtInType_AST = null;
+
+                switch ( LA(1)) {
+                case LITERAL_void:
+                {
+                        AST tmp2_AST = null;
+                        tmp2_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp2_AST);
+                        match(LITERAL_void);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.VOID;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_boolean:
+                {
+                        AST tmp3_AST = null;
+                        tmp3_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp3_AST);
+                        match(LITERAL_boolean);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.BOOLEAN;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_byte:
+                {
+                        AST tmp4_AST = null;
+                        tmp4_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp4_AST);
+                        match(LITERAL_byte);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.BYTE;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_char:
+                {
+                        AST tmp5_AST = null;
+                        tmp5_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp5_AST);
+                        match(LITERAL_char);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.CHAR;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_short:
+                {
+                        AST tmp6_AST = null;
+                        tmp6_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp6_AST);
+                        match(LITERAL_short);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.SHORT;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_int:
+                {
+                        AST tmp7_AST = null;
+                        tmp7_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp7_AST);
+                        match(LITERAL_int);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.INTEGER;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_float:
+                {
+                        AST tmp8_AST = null;
+                        tmp8_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp8_AST);
+                        match(LITERAL_float);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.FLOAT;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_long:
+                {
+                        AST tmp9_AST = null;
+                        tmp9_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp9_AST);
+                        match(LITERAL_long);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.LONG;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_double:
+                {
+                        AST tmp10_AST = null;
+                        tmp10_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp10_AST);
+                        match(LITERAL_double);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.DOUBLE;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_String:
+                {
+                        AST tmp11_AST = null;
+                        tmp11_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp11_AST);
+                        match(LITERAL_String);
+                        if ( inputState.guessing==0 ) {
+                                t=Type.STRING;
+                        }
+                        builtInType_AST = (AST)currentAST.root;
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                returnAST = builtInType_AST;
+                return t;
+        }
+
+        public final Type  type() throws RecognitionException, TokenStreamException {
+                Type t;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST type_AST = null;
+
+                t=builtInType();
+                astFactory.addASTChild(currentAST, returnAST);
+                type_AST = (AST)currentAST.root;
+                returnAST = type_AST;
+                return t;
+        }
+
+        public final String  identifier() throws RecognitionException, TokenStreamException {
+                String s = null;;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST identifier_AST = null;
+                Token  i = null;
+                AST i_AST = null;
+                Token  i2 = null;
+                AST i2_AST = null;
+
+                i = LT(1);
+                i_AST = astFactory.create(i);
+                astFactory.addASTChild(currentAST, i_AST);
+                match(IDENT);
+                if ( inputState.guessing==0 ) {
+                        s=i.getText();
+                }
+                {
+                _loop8:
+                do {
+                        if ((LA(1)==DOT)) {
+                                AST tmp12_AST = null;
+                                tmp12_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp12_AST);
+                                match(DOT);
+                                i2 = LT(1);
+                                i2_AST = astFactory.create(i2);
+                                astFactory.addASTChild(currentAST, i2_AST);
+                                match(IDENT);
+                                if ( inputState.guessing==0 ) {
+                                        s+="."+i2.getText();
+                                }
+                        }
+                        else {
+                                break _loop8;
+                        }
+
+                } while (true);
+                }
+                identifier_AST = (AST)currentAST.root;
+                returnAST = identifier_AST;
+                return s;
+        }
+
+        public final Expression  expression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST expression_AST = null;
+
+                e=conditionalExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                match(Token.EOF_TYPE);
+                expression_AST = (AST)currentAST.root;
+                returnAST = expression_AST;
+                return e;
+        }
+
+        public final Expression  conditionalExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST conditionalExpression_AST = null;
+                Expression a,b,c;
+
+                e=logicalOrExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                switch ( LA(1)) {
+                case QUESTION:
+                {
+                        AST tmp14_AST = null;
+                        tmp14_AST = astFactory.create(LT(1));
+                        astFactory.makeASTRoot(currentAST, tmp14_AST);
+                        match(QUESTION);
+                        b=conditionalExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        match(COLON);
+                        c=conditionalExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConditionalExpression(e,b,c);
+                        }
+                        break;
+                }
+                case EOF:
+                case COLON:
+                case RPAREN:
+                {
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                }
+                conditionalExpression_AST = (AST)currentAST.root;
+                returnAST = conditionalExpression_AST;
+                return e;
+        }
+
+        public final Expression  logicalOrExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST logicalOrExpression_AST = null;
+                Expression a,b;
+
+                e=logicalAndExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop14:
+                do {
+                        if ((LA(1)==LOR)) {
+                                AST tmp16_AST = null;
+                                tmp16_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp16_AST);
+                                match(LOR);
+                                b=logicalAndExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new LogicalOrExpression(e,b);
+                                }
+                        }
+                        else {
+                                break _loop14;
+                        }
+
+                } while (true);
+                }
+                logicalOrExpression_AST = (AST)currentAST.root;
+                returnAST = logicalOrExpression_AST;
+                return e;
+        }
+
+        public final Expression  logicalAndExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST logicalAndExpression_AST = null;
+                Expression a,b;
+
+                e=inclusiveOrExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop17:
+                do {
+                        if ((LA(1)==LAND)) {
+                                AST tmp17_AST = null;
+                                tmp17_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp17_AST);
+                                match(LAND);
+                                b=inclusiveOrExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new LogicalAndExpression(e,b);
+                                }
+                        }
+                        else {
+                                break _loop17;
+                        }
+
+                } while (true);
+                }
+                logicalAndExpression_AST = (AST)currentAST.root;
+                returnAST = logicalAndExpression_AST;
+                return e;
+        }
+
+        public final Expression  inclusiveOrExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST inclusiveOrExpression_AST = null;
+                Expression a,b;
+
+                e=exclusiveOrExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop20:
+                do {
+                        if ((LA(1)==BOR)) {
+                                AST tmp18_AST = null;
+                                tmp18_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp18_AST);
+                                match(BOR);
+                                b=exclusiveOrExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new InclusiveOrExpression(e,b);
+                                }
+                        }
+                        else {
+                                break _loop20;
+                        }
+
+                } while (true);
+                }
+                inclusiveOrExpression_AST = (AST)currentAST.root;
+                returnAST = inclusiveOrExpression_AST;
+                return e;
+        }
+
+        public final Expression  exclusiveOrExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST exclusiveOrExpression_AST = null;
+                Expression a,b;
+
+                e=andExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop23:
+                do {
+                        if ((LA(1)==BXOR)) {
+                                AST tmp19_AST = null;
+                                tmp19_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp19_AST);
+                                match(BXOR);
+                                b=andExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new ExclusiveOrExpression(e,b);
+                                }
+                        }
+                        else {
+                                break _loop23;
+                        }
+
+                } while (true);
+                }
+                exclusiveOrExpression_AST = (AST)currentAST.root;
+                returnAST = exclusiveOrExpression_AST;
+                return e;
+        }
+
+        public final Expression  andExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST andExpression_AST = null;
+                Expression a,b;
+
+                e=equalityExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop26:
+                do {
+                        if ((LA(1)==BAND)) {
+                                AST tmp20_AST = null;
+                                tmp20_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp20_AST);
+                                match(BAND);
+                                b=equalityExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new AndExpression(e,b);
+                                }
+                        }
+                        else {
+                                break _loop26;
+                        }
+
+                } while (true);
+                }
+                andExpression_AST = (AST)currentAST.root;
+                returnAST = andExpression_AST;
+                return e;
+        }
+
+        public final Expression  equalityExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST equalityExpression_AST = null;
+                Expression a,b;
+
+                e=relationalExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop30:
+                do {
+                        if ((LA(1)==NOT_EQUAL||LA(1)==EQUAL)) {
+                                {
+                                switch ( LA(1)) {
+                                case NOT_EQUAL:
+                                {
+                                        AST tmp21_AST = null;
+                                        tmp21_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp21_AST);
+                                        match(NOT_EQUAL);
+                                        a=relationalExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new NotEqualExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case EQUAL:
+                                {
+                                        AST tmp22_AST = null;
+                                        tmp22_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp22_AST);
+                                        match(EQUAL);
+                                        a=relationalExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new EqualExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltException(LT(1), getFilename());
+                                }
+                                }
+                                }
+                        }
+                        else {
+                                break _loop30;
+                        }
+
+                } while (true);
+                }
+                equalityExpression_AST = (AST)currentAST.root;
+                returnAST = equalityExpression_AST;
+                return e;
+        }
+
+        public final Expression  relationalExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST relationalExpression_AST = null;
+                Expression a,b;
+
+                e=shiftExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                {
+                _loop35:
+                do {
+                        if (((LA(1) >= LT && LA(1) <= GE))) {
+                                {
+                                switch ( LA(1)) {
+                                case LT:
+                                {
+                                        AST tmp23_AST = null;
+                                        tmp23_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp23_AST);
+                                        match(LT);
+                                        a=shiftExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new LessThanExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case GT:
+                                {
+                                        AST tmp24_AST = null;
+                                        tmp24_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp24_AST);
+                                        match(GT);
+                                        a=shiftExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new GreaterThanExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case LE:
+                                {
+                                        AST tmp25_AST = null;
+                                        tmp25_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp25_AST);
+                                        match(LE);
+                                        a=shiftExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new LessThanOrEqualExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case GE:
+                                {
+                                        AST tmp26_AST = null;
+                                        tmp26_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp26_AST);
+                                        match(GE);
+                                        a=shiftExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new GreaterThanOrEqualExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltException(LT(1), getFilename());
+                                }
+                                }
+                                }
+                        }
+                        else {
+                                break _loop35;
+                        }
+
+                } while (true);
+                }
+                }
+                relationalExpression_AST = (AST)currentAST.root;
+                returnAST = relationalExpression_AST;
+                return e;
+        }
+
+        public final Expression  shiftExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST shiftExpression_AST = null;
+                Expression a,b;
+
+                e=additiveExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop39:
+                do {
+                        if (((LA(1) >= SL && LA(1) <= BSR))) {
+                                {
+                                switch ( LA(1)) {
+                                case SL:
+                                {
+                                        AST tmp27_AST = null;
+                                        tmp27_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp27_AST);
+                                        match(SL);
+                                        a=additiveExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new ShiftLeftExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case SR:
+                                {
+                                        AST tmp28_AST = null;
+                                        tmp28_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp28_AST);
+                                        match(SR);
+                                        a=additiveExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new ShiftRightExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case BSR:
+                                {
+                                        AST tmp29_AST = null;
+                                        tmp29_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp29_AST);
+                                        match(BSR);
+                                        a=additiveExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new BitShiftRightExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltException(LT(1), getFilename());
+                                }
+                                }
+                                }
+                        }
+                        else {
+                                break _loop39;
+                        }
+
+                } while (true);
+                }
+                shiftExpression_AST = (AST)currentAST.root;
+                returnAST = shiftExpression_AST;
+                return e;
+        }
+
+        public final Expression  additiveExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST additiveExpression_AST = null;
+                Expression a,b;
+
+                e=multiplicativeExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop43:
+                do {
+                        if ((LA(1)==PLUS||LA(1)==MINUS)) {
+                                {
+                                switch ( LA(1)) {
+                                case PLUS:
+                                {
+                                        AST tmp30_AST = null;
+                                        tmp30_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp30_AST);
+                                        match(PLUS);
+                                        a=multiplicativeExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new AdditionExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case MINUS:
+                                {
+                                        AST tmp31_AST = null;
+                                        tmp31_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp31_AST);
+                                        match(MINUS);
+                                        a=multiplicativeExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new SubtractionExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltException(LT(1), getFilename());
+                                }
+                                }
+                                }
+                        }
+                        else {
+                                break _loop43;
+                        }
+
+                } while (true);
+                }
+                additiveExpression_AST = (AST)currentAST.root;
+                returnAST = additiveExpression_AST;
+                return e;
+        }
+
+        public final Expression  multiplicativeExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST multiplicativeExpression_AST = null;
+                Expression a,b;
+
+                e=unaryExpression();
+                astFactory.addASTChild(currentAST, returnAST);
+                {
+                _loop47:
+                do {
+                        if (((LA(1) >= STAR && LA(1) <= MOD))) {
+                                {
+                                switch ( LA(1)) {
+                                case STAR:
+                                {
+                                        AST tmp32_AST = null;
+                                        tmp32_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp32_AST);
+                                        match(STAR);
+                                        a=unaryExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new MultiplicationExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case DIV:
+                                {
+                                        AST tmp33_AST = null;
+                                        tmp33_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp33_AST);
+                                        match(DIV);
+                                        a=unaryExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new DivisionExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                case MOD:
+                                {
+                                        AST tmp34_AST = null;
+                                        tmp34_AST = astFactory.create(LT(1));
+                                        astFactory.makeASTRoot(currentAST, tmp34_AST);
+                                        match(MOD);
+                                        a=unaryExpression();
+                                        astFactory.addASTChild(currentAST, returnAST);
+                                        if ( inputState.guessing==0 ) {
+                                                e=new ModuloExpression(e,a);
+                                        }
+                                        break;
+                                }
+                                default:
+                                {
+                                        throw new NoViableAltException(LT(1), getFilename());
+                                }
+                                }
+                                }
+                        }
+                        else {
+                                break _loop47;
+                        }
+
+                } while (true);
+                }
+                multiplicativeExpression_AST = (AST)currentAST.root;
+                returnAST = multiplicativeExpression_AST;
+                return e;
+        }
+
+        public final Expression  unaryExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST unaryExpression_AST = null;
+                Expression a,b;
+
+                switch ( LA(1)) {
+                case MINUS:
+                {
+                        AST tmp35_AST = null;
+                        tmp35_AST = astFactory.create(LT(1));
+                        astFactory.makeASTRoot(currentAST, tmp35_AST);
+                        match(MINUS);
+                        if ( inputState.guessing==0 ) {
+                                tmp35_AST.setType(UNARY_MINUS);
+                        }
+                        a=unaryExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        if ( inputState.guessing==0 ) {
+                                e=new NegateExpression(a);
+                        }
+                        unaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case PLUS:
+                {
+                        AST tmp36_AST = null;
+                        tmp36_AST = astFactory.create(LT(1));
+                        astFactory.makeASTRoot(currentAST, tmp36_AST);
+                        match(PLUS);
+                        if ( inputState.guessing==0 ) {
+                                tmp36_AST.setType(UNARY_PLUS);
+                        }
+                        e=unaryExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        unaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case IDENT:
+                case BNOT:
+                case LNOT:
+                case LPAREN:
+                case LITERAL_true:
+                case LITERAL_false:
+                case LITERAL_null:
+                case NUM_INT:
+                case CHAR_LITERAL:
+                case STRING_LITERAL:
+                case NUM_FLOAT:
+                case NUM_LONG:
+                case NUM_DOUBLE:
+                {
+                        e=unaryExpressionNotPlusMinus();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        unaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                returnAST = unaryExpression_AST;
+                return e;
+        }
+
+        public final Expression  unaryExpressionNotPlusMinus() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST unaryExpressionNotPlusMinus_AST = null;
+                Token  lpb = null;
+                AST lpb_AST = null;
+                Expression a; Type t;
+
+                switch ( LA(1)) {
+                case BNOT:
+                {
+                        AST tmp37_AST = null;
+                        tmp37_AST = astFactory.create(LT(1));
+                        astFactory.makeASTRoot(currentAST, tmp37_AST);
+                        match(BNOT);
+                        a=unaryExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        if ( inputState.guessing==0 ) {
+                                e=new NotExpression(a);
+                        }
+                        unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LNOT:
+                {
+                        AST tmp38_AST = null;
+                        tmp38_AST = astFactory.create(LT(1));
+                        astFactory.makeASTRoot(currentAST, tmp38_AST);
+                        match(LNOT);
+                        a=unaryExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        if ( inputState.guessing==0 ) {
+                                e=new LogicalNotExpression(a);
+                        }
+                        unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
+                        break;
+                }
+                default:
+                        boolean synPredMatched51 = false;
+                        if (((LA(1)==LPAREN) && ((LA(2) >= LITERAL_void && LA(2) <= LITERAL_String)))) {
+                                int _m51 = mark();
+                                synPredMatched51 = true;
+                                inputState.guessing++;
+                                try {
+                                        {
+                                        match(LPAREN);
+                                        builtInTypeSpec(true);
+                                        match(RPAREN);
+                                        }
+                                }
+                                catch (RecognitionException pe) {
+                                        synPredMatched51 = false;
+                                }
+                                rewind(_m51);
 inputState.guessing--;
-			}
-			if ( synPredMatched51 ) {
-				lpb = LT(1);
-				lpb_AST = astFactory.create(lpb);
-				astFactory.makeASTRoot(currentAST, lpb_AST);
-				match(LPAREN);
-				if ( inputState.guessing==0 ) {
-					lpb_AST.setType(TYPECAST);
-				}
-				t=builtInTypeSpec(true);
-				astFactory.addASTChild(currentAST, returnAST);
-				match(RPAREN);
-				a=unaryExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				if ( inputState.guessing==0 ) {
-					e=new TypeCastExpression(t,a);
-				}
-				unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
-			}
-			else if ((_tokenSet_0.member(LA(1))) && (_tokenSet_1.member(LA(2)))) {
-				e=primaryExpression();
-				astFactory.addASTChild(currentAST, returnAST);
-				unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
-			}
-		else {
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		returnAST = unaryExpressionNotPlusMinus_AST;
-		return e;
-	}
-	
-	public final Expression  primaryExpression() throws RecognitionException, TokenStreamException {
-		Expression e = null; String i = null;;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST primaryExpression_AST = null;
-		
-		switch ( LA(1)) {
-		case NUM_INT:
-		case CHAR_LITERAL:
-		case STRING_LITERAL:
-		case NUM_FLOAT:
-		case NUM_LONG:
-		case NUM_DOUBLE:
-		{
-			e=constant();
-			astFactory.addASTChild(currentAST, returnAST);
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case IDENT:
-		{
-			i=identifier();
-			astFactory.addASTChild(currentAST, returnAST);
-			if ( inputState.guessing==0 ) {
-				e=new IdentifierExpression(i);
-			}
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_true:
-		{
-			AST tmp40_AST = null;
-			tmp40_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp40_AST);
-			match(LITERAL_true);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantBoolean(true);
-			}
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_false:
-		{
-			AST tmp41_AST = null;
-			tmp41_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp41_AST);
-			match(LITERAL_false);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantBoolean(false);
-			}
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case LITERAL_null:
-		{
-			AST tmp42_AST = null;
-			tmp42_AST = astFactory.create(LT(1));
-			astFactory.addASTChild(currentAST, tmp42_AST);
-			match(LITERAL_null);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantNull();
-			}
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		case LPAREN:
-		{
-			match(LPAREN);
-			e=conditionalExpression();
-			astFactory.addASTChild(currentAST, returnAST);
-			match(RPAREN);
-			primaryExpression_AST = (AST)currentAST.root;
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		returnAST = primaryExpression_AST;
-		return e;
-	}
-	
-	public final Expression  constant() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST constant_AST = null;
-		Token  l1 = null;
-		AST l1_AST = null;
-		Token  l2 = null;
-		AST l2_AST = null;
-		Token  l3 = null;
-		AST l3_AST = null;
-		Token  l4 = null;
-		AST l4_AST = null;
-		Token  l5 = null;
-		AST l5_AST = null;
-		Token  l6 = null;
-		AST l6_AST = null;
-		
-		switch ( LA(1)) {
-		case NUM_INT:
-		{
-			l1 = LT(1);
-			l1_AST = astFactory.create(l1);
-			astFactory.addASTChild(currentAST, l1_AST);
-			match(NUM_INT);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantInteger(l1.getText());
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		case CHAR_LITERAL:
-		{
-			l2 = LT(1);
-			l2_AST = astFactory.create(l2);
-			astFactory.addASTChild(currentAST, l2_AST);
-			match(CHAR_LITERAL);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantChar(l2.getText());
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		case STRING_LITERAL:
-		{
-			l3 = LT(1);
-			l3_AST = astFactory.create(l3);
-			astFactory.addASTChild(currentAST, l3_AST);
-			match(STRING_LITERAL);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantString(l3.getText().substring(1, l3.getText().length()-1));
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		case NUM_FLOAT:
-		{
-			l4 = LT(1);
-			l4_AST = astFactory.create(l4);
-			astFactory.addASTChild(currentAST, l4_AST);
-			match(NUM_FLOAT);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantFloat(l4.getText());
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		case NUM_LONG:
-		{
-			l5 = LT(1);
-			l5_AST = astFactory.create(l5);
-			astFactory.addASTChild(currentAST, l5_AST);
-			match(NUM_LONG);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantLong(l5.getText());
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		case NUM_DOUBLE:
-		{
-			l6 = LT(1);
-			l6_AST = astFactory.create(l6);
-			astFactory.addASTChild(currentAST, l6_AST);
-			match(NUM_DOUBLE);
-			if ( inputState.guessing==0 ) {
-				e=new ConstantDouble(l6.getText());
-			}
-			constant_AST = (AST)currentAST.root;
-			break;
-		}
-		default:
-		{
-			throw new NoViableAltException(LT(1), getFilename());
-		}
-		}
-		returnAST = constant_AST;
-		return e;
-	}
-	
+                        }
+                        if ( synPredMatched51 ) {
+                                lpb = LT(1);
+                                lpb_AST = astFactory.create(lpb);
+                                astFactory.makeASTRoot(currentAST, lpb_AST);
+                                match(LPAREN);
+                                if ( inputState.guessing==0 ) {
+                                        lpb_AST.setType(TYPECAST);
+                                }
+                                t=builtInTypeSpec(true);
+                                astFactory.addASTChild(currentAST, returnAST);
+                                match(RPAREN);
+                                a=unaryExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                if ( inputState.guessing==0 ) {
+                                        e=new TypeCastExpression(t,a);
+                                }
+                                unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
+                        }
+                        else if ((_tokenSet_0.member(LA(1))) && (_tokenSet_1.member(LA(2)))) {
+                                e=primaryExpression();
+                                astFactory.addASTChild(currentAST, returnAST);
+                                unaryExpressionNotPlusMinus_AST = (AST)currentAST.root;
+                        }
+                else {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                returnAST = unaryExpressionNotPlusMinus_AST;
+                return e;
+        }
+
+        public final Expression  primaryExpression() throws RecognitionException, TokenStreamException {
+                Expression e = null; String i = null;;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST primaryExpression_AST = null;
+
+                switch ( LA(1)) {
+                case NUM_INT:
+                case CHAR_LITERAL:
+                case STRING_LITERAL:
+                case NUM_FLOAT:
+                case NUM_LONG:
+                case NUM_DOUBLE:
+                {
+                        e=constant();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case IDENT:
+                {
+                        i=identifier();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        if ( inputState.guessing==0 ) {
+                                e=new IdentifierExpression(i);
+                        }
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_true:
+                {
+                        AST tmp40_AST = null;
+                        tmp40_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp40_AST);
+                        match(LITERAL_true);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantBoolean(true);
+                        }
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_false:
+                {
+                        AST tmp41_AST = null;
+                        tmp41_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp41_AST);
+                        match(LITERAL_false);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantBoolean(false);
+                        }
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LITERAL_null:
+                {
+                        AST tmp42_AST = null;
+                        tmp42_AST = astFactory.create(LT(1));
+                        astFactory.addASTChild(currentAST, tmp42_AST);
+                        match(LITERAL_null);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantNull();
+                        }
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                case LPAREN:
+                {
+                        match(LPAREN);
+                        e=conditionalExpression();
+                        astFactory.addASTChild(currentAST, returnAST);
+                        match(RPAREN);
+                        primaryExpression_AST = (AST)currentAST.root;
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                returnAST = primaryExpression_AST;
+                return e;
+        }
+
+        public final Expression  constant() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST constant_AST = null;
+                Token  l1 = null;
+                AST l1_AST = null;
+                Token  l2 = null;
+                AST l2_AST = null;
+                Token  l3 = null;
+                AST l3_AST = null;
+                Token  l4 = null;
+                AST l4_AST = null;
+                Token  l5 = null;
+                AST l5_AST = null;
+                Token  l6 = null;
+                AST l6_AST = null;
+
+                switch ( LA(1)) {
+                case NUM_INT:
+                {
+                        l1 = LT(1);
+                        l1_AST = astFactory.create(l1);
+                        astFactory.addASTChild(currentAST, l1_AST);
+                        match(NUM_INT);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantInteger(l1.getText());
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                case CHAR_LITERAL:
+                {
+                        l2 = LT(1);
+                        l2_AST = astFactory.create(l2);
+                        astFactory.addASTChild(currentAST, l2_AST);
+                        match(CHAR_LITERAL);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantChar(l2.getText());
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                case STRING_LITERAL:
+                {
+                        l3 = LT(1);
+                        l3_AST = astFactory.create(l3);
+                        astFactory.addASTChild(currentAST, l3_AST);
+                        match(STRING_LITERAL);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantString(l3.getText().substring(1, l3.getText().length()-1));
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                case NUM_FLOAT:
+                {
+                        l4 = LT(1);
+                        l4_AST = astFactory.create(l4);
+                        astFactory.addASTChild(currentAST, l4_AST);
+                        match(NUM_FLOAT);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantFloat(l4.getText());
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                case NUM_LONG:
+                {
+                        l5 = LT(1);
+                        l5_AST = astFactory.create(l5);
+                        astFactory.addASTChild(currentAST, l5_AST);
+                        match(NUM_LONG);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantLong(l5.getText());
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                case NUM_DOUBLE:
+                {
+                        l6 = LT(1);
+                        l6_AST = astFactory.create(l6);
+                        astFactory.addASTChild(currentAST, l6_AST);
+                        match(NUM_DOUBLE);
+                        if ( inputState.guessing==0 ) {
+                                e=new ConstantDouble(l6.getText());
+                        }
+                        constant_AST = (AST)currentAST.root;
+                        break;
+                }
+                default:
+                {
+                        throw new NoViableAltException(LT(1), getFilename());
+                }
+                }
+                returnAST = constant_AST;
+                return e;
+        }
+
 /** Match a, a.b.c refs
  */
-	public final Expression  identPrimary() throws RecognitionException, TokenStreamException {
-		Expression e = null;
-		
-		returnAST = null;
-		ASTPair currentAST = new ASTPair();
-		AST identPrimary_AST = null;
-		
-		AST tmp45_AST = null;
-		tmp45_AST = astFactory.create(LT(1));
-		astFactory.addASTChild(currentAST, tmp45_AST);
-		match(IDENT);
-		{
-		_loop55:
-		do {
-			if ((LA(1)==DOT)) {
-				AST tmp46_AST = null;
-				tmp46_AST = astFactory.create(LT(1));
-				astFactory.makeASTRoot(currentAST, tmp46_AST);
-				match(DOT);
-				AST tmp47_AST = null;
-				tmp47_AST = astFactory.create(LT(1));
-				astFactory.addASTChild(currentAST, tmp47_AST);
-				match(IDENT);
-			}
-			else {
-				break _loop55;
-			}
-			
-		} while (true);
-		}
-		identPrimary_AST = (AST)currentAST.root;
-		returnAST = identPrimary_AST;
-		return e;
-	}
-	
-	
-	public static final String[] _tokenNames = {
-		"<0>",
-		"EOF",
-		"<2>",
-		"NULL_TREE_LOOKAHEAD",
-		"BLOCK",
-		"MODIFIERS",
-		"OBJBLOCK",
-		"SLIST",
-		"CTOR_DEF",
-		"METHOD_DEF",
-		"VARIABLE_DEF",
-		"INSTANCE_INIT",
-		"STATIC_INIT",
-		"TYPE",
-		"CLASS_DEF",
-		"INTERFACE_DEF",
-		"PACKAGE_DEF",
-		"ARRAY_DECLARATOR",
-		"EXTENDS_CLAUSE",
-		"IMPLEMENTS_CLAUSE",
-		"PARAMETERS",
-		"PARAMETER_DEF",
-		"LABELED_STAT",
-		"TYPECAST",
-		"INDEX_OP",
-		"POST_INC",
-		"POST_DEC",
-		"METHOD_CALL",
-		"EXPR",
-		"ARRAY_INIT",
-		"IMPORT",
-		"UNARY_MINUS",
-		"UNARY_PLUS",
-		"CASE_GROUP",
-		"ELIST",
-		"FOR_INIT",
-		"FOR_CONDITION",
-		"FOR_ITERATOR",
-		"EMPTY_STAT",
-		"\"final\"",
-		"\"abstract\"",
-		"\"strictfp\"",
-		"SUPER_CTOR_CALL",
-		"CTOR_CALL",
-		"LBRACK",
-		"RBRACK",
-		"\"void\"",
-		"\"boolean\"",
-		"\"byte\"",
-		"\"char\"",
-		"\"short\"",
-		"\"int\"",
-		"\"float\"",
-		"\"long\"",
-		"\"double\"",
-		"\"String\"",
-		"IDENT",
-		"DOT",
-		"QUESTION",
-		"COLON",
-		"LOR",
-		"LAND",
-		"BOR",
-		"BXOR",
-		"BAND",
-		"NOT_EQUAL",
-		"EQUAL",
-		"LT",
-		"GT",
-		"LE",
-		"GE",
-		"SL",
-		"SR",
-		"BSR",
-		"PLUS",
-		"MINUS",
-		"STAR",
-		"DIV",
-		"MOD",
-		"BNOT",
-		"LNOT",
-		"LPAREN",
-		"RPAREN",
-		"\"true\"",
-		"\"false\"",
-		"\"null\"",
-		"NUM_INT",
-		"CHAR_LITERAL",
-		"STRING_LITERAL",
-		"NUM_FLOAT",
-		"NUM_LONG",
-		"NUM_DOUBLE",
-		"LCURLY",
-		"RCURLY",
-		"COMMA",
-		"ASSIGN",
-		"DIV_ASSIGN",
-		"PLUS_ASSIGN",
-		"INC",
-		"MINUS_ASSIGN",
-		"DEC",
-		"STAR_ASSIGN",
-		"MOD_ASSIGN",
-		"SR_ASSIGN",
-		"BSR_ASSIGN",
-		"SL_ASSIGN",
-		"BXOR_ASSIGN",
-		"BOR_ASSIGN",
-		"BAND_ASSIGN",
-		"SEMI",
-		"WS",
-		"SL_COMMIT",
-		"ML_COMMENT",
-		"ESC",
-		"HEX_DIGIT",
-		"VOCAB",
-		"EXPONENT",
-		"FLOAT_SUFFIX"
-	};
-	
-	protected void buildTokenTypeASTClassMap() {
-		tokenTypeToASTClassMap=null;
-	};
-	
-	private static final long[] mk_tokenSet_0() {
-		long[] data = { 72057594037927936L, 268042240L, 0L, 0L};
-		return data;
-	}
-	public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
-	private static final long[] mk_tokenSet_1() {
-		long[] data = { -72057594037927934L, 268435455L, 0L, 0L};
-		return data;
-	}
-	public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
-	
-	}
+        public final Expression  identPrimary() throws RecognitionException, TokenStreamException {
+                Expression e = null;
+
+                returnAST = null;
+                ASTPair currentAST = new ASTPair();
+                AST identPrimary_AST = null;
+
+                AST tmp45_AST = null;
+                tmp45_AST = astFactory.create(LT(1));
+                astFactory.addASTChild(currentAST, tmp45_AST);
+                match(IDENT);
+                {
+                _loop55:
+                do {
+                        if ((LA(1)==DOT)) {
+                                AST tmp46_AST = null;
+                                tmp46_AST = astFactory.create(LT(1));
+                                astFactory.makeASTRoot(currentAST, tmp46_AST);
+                                match(DOT);
+                                AST tmp47_AST = null;
+                                tmp47_AST = astFactory.create(LT(1));
+                                astFactory.addASTChild(currentAST, tmp47_AST);
+                                match(IDENT);
+                        }
+                        else {
+                                break _loop55;
+                        }
+
+                } while (true);
+                }
+                identPrimary_AST = (AST)currentAST.root;
+                returnAST = identPrimary_AST;
+                return e;
+        }
+
+
+        public static final String[] _tokenNames = {
+                "<0>",
+                "EOF",
+                "<2>",
+                "NULL_TREE_LOOKAHEAD",
+                "BLOCK",
+                "MODIFIERS",
+                "OBJBLOCK",
+                "SLIST",
+                "CTOR_DEF",
+                "METHOD_DEF",
+                "VARIABLE_DEF",
+                "INSTANCE_INIT",
+                "STATIC_INIT",
+                "TYPE",
+                "CLASS_DEF",
+                "INTERFACE_DEF",
+                "PACKAGE_DEF",
+                "ARRAY_DECLARATOR",
+                "EXTENDS_CLAUSE",
+                "IMPLEMENTS_CLAUSE",
+                "PARAMETERS",
+                "PARAMETER_DEF",
+                "LABELED_STAT",
+                "TYPECAST",
+                "INDEX_OP",
+                "POST_INC",
+                "POST_DEC",
+                "METHOD_CALL",
+                "EXPR",
+                "ARRAY_INIT",
+                "IMPORT",
+                "UNARY_MINUS",
+                "UNARY_PLUS",
+                "CASE_GROUP",
+                "ELIST",
+                "FOR_INIT",
+                "FOR_CONDITION",
+                "FOR_ITERATOR",
+                "EMPTY_STAT",
+                "\"final\"",
+                "\"abstract\"",
+                "\"strictfp\"",
+                "SUPER_CTOR_CALL",
+                "CTOR_CALL",
+                "LBRACK",
+                "RBRACK",
+                "\"void\"",
+                "\"boolean\"",
+                "\"byte\"",
+                "\"char\"",
+                "\"short\"",
+                "\"int\"",
+                "\"float\"",
+                "\"long\"",
+                "\"double\"",
+                "\"String\"",
+                "IDENT",
+                "DOT",
+                "QUESTION",
+                "COLON",
+                "LOR",
+                "LAND",
+                "BOR",
+                "BXOR",
+                "BAND",
+                "NOT_EQUAL",
+                "EQUAL",
+                "LT",
+                "GT",
+                "LE",
+                "GE",
+                "SL",
+                "SR",
+                "BSR",
+                "PLUS",
+                "MINUS",
+                "STAR",
+                "DIV",
+                "MOD",
+                "BNOT",
+                "LNOT",
+                "LPAREN",
+                "RPAREN",
+                "\"true\"",
+                "\"false\"",
+                "\"null\"",
+                "NUM_INT",
+                "CHAR_LITERAL",
+                "STRING_LITERAL",
+                "NUM_FLOAT",
+                "NUM_LONG",
+                "NUM_DOUBLE",
+                "LCURLY",
+                "RCURLY",
+                "COMMA",
+                "ASSIGN",
+                "DIV_ASSIGN",
+                "PLUS_ASSIGN",
+                "INC",
+                "MINUS_ASSIGN",
+                "DEC",
+                "STAR_ASSIGN",
+                "MOD_ASSIGN",
+                "SR_ASSIGN",
+                "BSR_ASSIGN",
+                "SL_ASSIGN",
+                "BXOR_ASSIGN",
+                "BOR_ASSIGN",
+                "BAND_ASSIGN",
+                "SEMI",
+                "WS",
+                "SL_COMMIT",
+                "ML_COMMENT",
+                "ESC",
+                "HEX_DIGIT",
+                "VOCAB",
+                "EXPONENT",
+                "FLOAT_SUFFIX"
+        };
+
+        protected void buildTokenTypeASTClassMap() {
+                tokenTypeToASTClassMap=null;
+        };
+
+        private static final long[] mk_tokenSet_0() {
+                long[] data = { 72057594037927936L, 268042240L, 0L, 0L};
+                return data;
+        }
+        public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
+        private static final long[] mk_tokenSet_1() {
+                long[] data = { -72057594037927934L, 268435455L, 0L, 0L};
+                return data;
+        }
+        public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
+
+        }
diff --git a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java
index 2962388f402..9387c93f926 100644
--- a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java
+++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java
@@ -1,122 +1,122 @@
 // $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaLexer.java"$
- 
-   package gnu.classpath.tools.gjdoc.expr; 
+
+   package gnu.classpath.tools.gjdoc.expr;
 
 public interface JavaTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int BLOCK = 4;
-	int MODIFIERS = 5;
-	int OBJBLOCK = 6;
-	int SLIST = 7;
-	int CTOR_DEF = 8;
-	int METHOD_DEF = 9;
-	int VARIABLE_DEF = 10;
-	int INSTANCE_INIT = 11;
-	int STATIC_INIT = 12;
-	int TYPE = 13;
-	int CLASS_DEF = 14;
-	int INTERFACE_DEF = 15;
-	int PACKAGE_DEF = 16;
-	int ARRAY_DECLARATOR = 17;
-	int EXTENDS_CLAUSE = 18;
-	int IMPLEMENTS_CLAUSE = 19;
-	int PARAMETERS = 20;
-	int PARAMETER_DEF = 21;
-	int LABELED_STAT = 22;
-	int TYPECAST = 23;
-	int INDEX_OP = 24;
-	int POST_INC = 25;
-	int POST_DEC = 26;
-	int METHOD_CALL = 27;
-	int EXPR = 28;
-	int ARRAY_INIT = 29;
-	int IMPORT = 30;
-	int UNARY_MINUS = 31;
-	int UNARY_PLUS = 32;
-	int CASE_GROUP = 33;
-	int ELIST = 34;
-	int FOR_INIT = 35;
-	int FOR_CONDITION = 36;
-	int FOR_ITERATOR = 37;
-	int EMPTY_STAT = 38;
-	int FINAL = 39;
-	int ABSTRACT = 40;
-	int STRICTFP = 41;
-	int SUPER_CTOR_CALL = 42;
-	int CTOR_CALL = 43;
-	int LBRACK = 44;
-	int RBRACK = 45;
-	int LITERAL_void = 46;
-	int LITERAL_boolean = 47;
-	int LITERAL_byte = 48;
-	int LITERAL_char = 49;
-	int LITERAL_short = 50;
-	int LITERAL_int = 51;
-	int LITERAL_float = 52;
-	int LITERAL_long = 53;
-	int LITERAL_double = 54;
-	int LITERAL_String = 55;
-	int IDENT = 56;
-	int DOT = 57;
-	int QUESTION = 58;
-	int COLON = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int NOT_EQUAL = 65;
-	int EQUAL = 66;
-	int LT = 67;
-	int GT = 68;
-	int LE = 69;
-	int GE = 70;
-	int SL = 71;
-	int SR = 72;
-	int BSR = 73;
-	int PLUS = 74;
-	int MINUS = 75;
-	int STAR = 76;
-	int DIV = 77;
-	int MOD = 78;
-	int BNOT = 79;
-	int LNOT = 80;
-	int LPAREN = 81;
-	int RPAREN = 82;
-	int LITERAL_true = 83;
-	int LITERAL_false = 84;
-	int LITERAL_null = 85;
-	int NUM_INT = 86;
-	int CHAR_LITERAL = 87;
-	int STRING_LITERAL = 88;
-	int NUM_FLOAT = 89;
-	int NUM_LONG = 90;
-	int NUM_DOUBLE = 91;
-	int LCURLY = 92;
-	int RCURLY = 93;
-	int COMMA = 94;
-	int ASSIGN = 95;
-	int DIV_ASSIGN = 96;
-	int PLUS_ASSIGN = 97;
-	int INC = 98;
-	int MINUS_ASSIGN = 99;
-	int DEC = 100;
-	int STAR_ASSIGN = 101;
-	int MOD_ASSIGN = 102;
-	int SR_ASSIGN = 103;
-	int BSR_ASSIGN = 104;
-	int SL_ASSIGN = 105;
-	int BXOR_ASSIGN = 106;
-	int BOR_ASSIGN = 107;
-	int BAND_ASSIGN = 108;
-	int SEMI = 109;
-	int WS = 110;
-	int SL_COMMIT = 111;
-	int ML_COMMENT = 112;
-	int ESC = 113;
-	int HEX_DIGIT = 114;
-	int VOCAB = 115;
-	int EXPONENT = 116;
-	int FLOAT_SUFFIX = 117;
+        int EOF = 1;
+        int NULL_TREE_LOOKAHEAD = 3;
+        int BLOCK = 4;
+        int MODIFIERS = 5;
+        int OBJBLOCK = 6;
+        int SLIST = 7;
+        int CTOR_DEF = 8;
+        int METHOD_DEF = 9;
+        int VARIABLE_DEF = 10;
+        int INSTANCE_INIT = 11;
+        int STATIC_INIT = 12;
+        int TYPE = 13;
+        int CLASS_DEF = 14;
+        int INTERFACE_DEF = 15;
+        int PACKAGE_DEF = 16;
+        int ARRAY_DECLARATOR = 17;
+        int EXTENDS_CLAUSE = 18;
+        int IMPLEMENTS_CLAUSE = 19;
+        int PARAMETERS = 20;
+        int PARAMETER_DEF = 21;
+        int LABELED_STAT = 22;
+        int TYPECAST = 23;
+        int INDEX_OP = 24;
+        int POST_INC = 25;
+        int POST_DEC = 26;
+        int METHOD_CALL = 27;
+        int EXPR = 28;
+        int ARRAY_INIT = 29;
+        int IMPORT = 30;
+        int UNARY_MINUS = 31;
+        int UNARY_PLUS = 32;
+        int CASE_GROUP = 33;
+        int ELIST = 34;
+        int FOR_INIT = 35;
+        int FOR_CONDITION = 36;
+        int FOR_ITERATOR = 37;
+        int EMPTY_STAT = 38;
+        int FINAL = 39;
+        int ABSTRACT = 40;
+        int STRICTFP = 41;
+        int SUPER_CTOR_CALL = 42;
+        int CTOR_CALL = 43;
+        int LBRACK = 44;
+        int RBRACK = 45;
+        int LITERAL_void = 46;
+        int LITERAL_boolean = 47;
+        int LITERAL_byte = 48;
+        int LITERAL_char = 49;
+        int LITERAL_short = 50;
+        int LITERAL_int = 51;
+        int LITERAL_float = 52;
+        int LITERAL_long = 53;
+        int LITERAL_double = 54;
+        int LITERAL_String = 55;
+        int IDENT = 56;
+        int DOT = 57;
+        int QUESTION = 58;
+        int COLON = 59;
+        int LOR = 60;
+        int LAND = 61;
+        int BOR = 62;
+        int BXOR = 63;
+        int BAND = 64;
+        int NOT_EQUAL = 65;
+        int EQUAL = 66;
+        int LT = 67;
+        int GT = 68;
+        int LE = 69;
+        int GE = 70;
+        int SL = 71;
+        int SR = 72;
+        int BSR = 73;
+        int PLUS = 74;
+        int MINUS = 75;
+        int STAR = 76;
+        int DIV = 77;
+        int MOD = 78;
+        int BNOT = 79;
+        int LNOT = 80;
+        int LPAREN = 81;
+        int RPAREN = 82;
+        int LITERAL_true = 83;
+        int LITERAL_false = 84;
+        int LITERAL_null = 85;
+        int NUM_INT = 86;
+        int CHAR_LITERAL = 87;
+        int STRING_LITERAL = 88;
+        int NUM_FLOAT = 89;
+        int NUM_LONG = 90;
+        int NUM_DOUBLE = 91;
+        int LCURLY = 92;
+        int RCURLY = 93;
+        int COMMA = 94;
+        int ASSIGN = 95;
+        int DIV_ASSIGN = 96;
+        int PLUS_ASSIGN = 97;
+        int INC = 98;
+        int MINUS_ASSIGN = 99;
+        int DEC = 100;
+        int STAR_ASSIGN = 101;
+        int MOD_ASSIGN = 102;
+        int SR_ASSIGN = 103;
+        int BSR_ASSIGN = 104;
+        int SL_ASSIGN = 105;
+        int BXOR_ASSIGN = 106;
+        int BOR_ASSIGN = 107;
+        int BAND_ASSIGN = 108;
+        int SEMI = 109;
+        int WS = 110;
+        int SL_COMMIT = 111;
+        int ML_COMMENT = 112;
+        int ESC = 113;
+        int HEX_DIGIT = 114;
+        int VOCAB = 115;
+        int EXPONENT = 116;
+        int FLOAT_SUFFIX = 117;
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java b/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java
index 3a21fe96e43..a6bd728317c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/FileSystemClassLoader.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -134,7 +134,7 @@ public class FileSystemClassLoader extends ClassLoader {
       }
    }
 
-   private byte[] readFromStream(InputStream in, long size) 
+   private byte[] readFromStream(InputStream in, long size)
       throws IOException
    {
       byte[] result = new byte[(int)size];
@@ -232,7 +232,7 @@ public class FileSystemClassLoader extends ClassLoader {
          return new URL(urlString);
       }
    }
-   
+
    private StreamInfo getResourceStream(String path)
    {
       for (int i = 0; i < pathComponents.length; ++i) {
@@ -258,8 +258,8 @@ public class FileSystemClassLoader extends ClassLoader {
       return null;
    }
 
-   private byte[] loadClassData(String className) 
-      throws ClassNotFoundException 
+   private byte[] loadClassData(String className)
+      throws ClassNotFoundException
    {
       String classFileName = className.replace('.', File.separatorChar) + ".class";
       StreamInfo streamInfo = getResourceStream(classFileName);
@@ -310,4 +310,3 @@ public class FileSystemClassLoader extends ClassLoader {
       return null;
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java b/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java
index 8b6b9542c95..e0ee7ba4ff3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/IOToolkit.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -90,7 +90,7 @@ public class IOToolkit
     *  @param out the Writer to which to write character data
     */
    public static void copyStream(Reader in, Writer out)
-      throws IOException 
+      throws IOException
    {
       char[] buf = new char[256];
       int nread;
@@ -114,10 +114,10 @@ public class IOToolkit
     *  subdirectory of the source directory which should be excluded
     *  from recursive copying.
     */
-   public static void copyDirectory(File sourceDir, File targetDir, 
+   public static void copyDirectory(File sourceDir, File targetDir,
                                     boolean recursive,
-                                    Set excludeDirs) 
-      throws IOException 
+                                    Set excludeDirs)
+      throws IOException
    {
       if (!targetDir.exists() && !targetDir.mkdirs()) {
          throw new IOException("Cannot create directory " + targetDir);
@@ -126,9 +126,9 @@ public class IOToolkit
       File[] sourceFiles = sourceDir.listFiles();
       for (int i=0; i<sourceFiles.length; ++i) {
          if (sourceFiles[i].isDirectory()) {
-            if (recursive && (null == excludeDirs 
+            if (recursive && (null == excludeDirs
                               || !excludeDirs.contains(sourceFiles[i].getName()))) {
-               File targetSubDir = new File(targetDir, 
+               File targetSubDir = new File(targetDir,
                                             sourceFiles[i].getName());
                if (targetSubDir.exists() || targetSubDir.mkdir()) {
                   copyDirectory(sourceFiles[i], targetSubDir, recursive, null);
@@ -151,8 +151,8 @@ public class IOToolkit
     *  @param sourceFile  specifies the file to copy
     *  @param targetFile  specifies the file to create
     */
-   public static void copyFile(File sourceFile, File targetFile) 
-      throws IOException 
+   public static void copyFile(File sourceFile, File targetFile)
+      throws IOException
    {
       InputStream in = new FileInputStream(sourceFile);
       OutputStream out = new FileOutputStream(targetFile);
@@ -180,7 +180,7 @@ public class IOToolkit
       char[] chunk = new char[readBufferSize];
       int nread;
       while ((nread=reader.read(chunk))>=0) {
-	 writer.write(chunk,0,nread);
+         writer.write(chunk,0,nread);
       }
       StringBuffer buffer = writer.getBuffer();
       char[] result = new char[buffer.length()];
diff --git a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java
index 9afcf047656..951766f6a9b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputEvent.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java
index caa471ec54b..53f806bf887 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/MalformedInputListener.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java b/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java
index 03121ddab13..70e19b1d346 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/NotifyingInputStreamReader.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -81,7 +81,7 @@ import java.util.Set;
  *
  *  @author Julian Scheid
  */
-public class NotifyingInputStreamReader 
+public class NotifyingInputStreamReader
    extends Reader
 {
    /**
@@ -121,7 +121,7 @@ public class NotifyingInputStreamReader
     *  read().
     */
    private CharBuffer charBuffer;
-   
+
    /**
     *  This is the primitive byte array wrapped in byteBuffer for
     *  passing to to InputStream.read().
@@ -299,7 +299,7 @@ public class NotifyingInputStreamReader
                   byteBuffer.get(readBuffer, 0, nRemainingBytes);
                }
                byteBuffer.rewind();
-               int nread = in.read(readBuffer, nRemainingBytes, 
+               int nread = in.read(readBuffer, nRemainingBytes,
                                    readBuffer.length - nRemainingBytes);
                if (nread < 0) {
                   allInputConsumed = true;
@@ -353,7 +353,7 @@ public class NotifyingInputStreamReader
          listener.malformedInputEncountered(event);
       }
    }
-   
+
    public int read(char[] cbuf, int offset, int length)
       throws IOException
    {
@@ -364,7 +364,7 @@ public class NotifyingInputStreamReader
          int nread = 0;
          while (nread < length && !flushed) {
             while (charBuffer.hasRemaining() && nread < length) {
-               int copyLen = Math.min(length - nread, 
+               int copyLen = Math.min(length - nread,
                                       charBuffer.remaining());
                charBuffer.get(cbuf, offset + nread, copyLen);
                nread += copyLen;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java b/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java
index d70ea931bdb..dbb5527075f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/StringToolkit.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java
index 32ab31639ca..6522a9ec10e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletSecurityManager.java
@@ -46,7 +46,7 @@ import java.util.PropertyPermission;
 class AppletSecurityManager extends SecurityManager
 {
   private boolean plugin;
-  
+
   AppletSecurityManager(boolean plugin)
   {
     this.plugin = plugin;
@@ -63,19 +63,19 @@ class AppletSecurityManager extends SecurityManager
     // to be able to execute "addr2line" to get proper stack traces.
     if (permission instanceof FilePermission)
       return;
-    
+
     // FIXME: we need to restrict this.
     if (permission instanceof SecurityPermission)
       return;
-    
+
     // FIXME: is this really needed ?
     if (permission instanceof PropertyPermission)
       return;
-    
+
     // Needed to allow to access AWT event queue.
     if (permission.getName().equals("accessEventQueue"))
       return;
-    
+
     // Needed to create a class loader for each codebase.
     if (permission.getName().equals("createClassLoader"))
       return;
@@ -83,12 +83,12 @@ class AppletSecurityManager extends SecurityManager
     // FIXME: we need to allow access to codebase here.
 
     if (permission instanceof SocketPermission      // for net access
-	|| permission instanceof RuntimePermission) // for checkWrite(FileDescriptor)
+        || permission instanceof RuntimePermission) // for checkWrite(FileDescriptor)
       return;
 
     if (! plugin && permission.getName().equals("exitVM"))
       return;
-    
+
     // Reject all other permissions.
     throw new SecurityException();
   }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java
index 80d572857ca..d3910a2a64c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/AppletTag.java
@@ -62,37 +62,37 @@ import java.util.Locale;
  */
 class AppletTag
 {
-  
+
   /**
    * The document base of this applet.
    */
   URL documentbase;
-  
+
   /**
-   * name of applet tag. 
+   * name of applet tag.
    */
   String name = "";
-  
+
   /**
    * code of applet tag.
    */
   String code = "";
-  
+
   /**
    * codebase of applet tag.
    */
   String codebase = "";
-  
+
   /**
    * The archives.
    */
   ArrayList archives = new ArrayList();
-  
+
   /**
    * The parameters.
    */
   HashMap parameters = new HashMap();
-    
+
   /**
    * The screen size.
    */
@@ -105,14 +105,14 @@ class AppletTag
   {
     // Do nothing.
   }
-  
+
   /**
    * Constructs an AppletTag and parses the given applet element.
-   * 
+   *
    * @param appElement - the Applet element to parse.
    */
   AppletTag(DomHTMLAppletElement appElement)
-  {    
+  {
     name = appElement.getName();
     parameters.put("name", name);
 
@@ -123,9 +123,9 @@ class AppletTag
     parameters.put("hspace", Integer.toString(appElement.getHspace()));
     parameters.put("vspace", Integer.toString(appElement.getVspace()));
     parameters.put("width", appElement.getWidth());
-    
+
     TagParser.parseParams(appElement, this);
-    
+
     if (code.equals(""))
       {
         code = appElement.getCode();
@@ -140,26 +140,26 @@ class AppletTag
         if (codebase.equals(""))
           codebase = appElement.getSrc();
       }
-    
+
     if (archives.size() == 0)
       {
         String arcs = "";
         String arch = appElement.getArchive();
-        
+
         if (code.indexOf(".") < 0)
           arcs = code + ".jar";
-        
+
         if (!arch.equals(""))
           arcs += "," + arch;
-        
+
         if (!arcs.equals(""))
           archives = TagParser.parseArchives(arcs, this);
       }
   }
-  
+
   /**
    * Constructs an AppletTag and parses the given embed element.
-   * 
+   *
    * @param embElement - the Embed element to parse.
    */
   AppletTag(DomHTMLEmbedElement embElement)
@@ -172,10 +172,10 @@ class AppletTag
     // should be interpreted as a parameter. For example if "java_code"
     // and "code" attributes are present in the EMBED tag then the
     // "code" attribute is interpreted as a parameter.
-    
+
     name = embElement.getName();
     parameters.put("name", name);
-    
+
     String jobj = embElement.getJavaObject();
     if (!jobj.equals(""))
       parameters.put("java_object", jobj);
@@ -193,7 +193,7 @@ class AppletTag
     parameters.put("type", embElement.getType());
     parameters.put("java_type", embElement.getJavaType());
     parameters.put("vspace", Integer.toString(embElement.getVspace()));
-    
+
     TagParser.parseParams(embElement, this);
 
     // Must initialize codebase before archives
@@ -212,23 +212,23 @@ class AppletTag
         if (!jcode.equals(""))
           code = jcode;
         else
-          code = embElement.getCode(); 
+          code = embElement.getCode();
       }
-    
+
     if (archives.size() == 0)
       {
         String arcs = "";
         String jarch = embElement.getJavaArchive();
         String arch = embElement.getArchive();
-        
+
         if (code.indexOf(".") < 0)
           arcs = code + ".jar";
-        
+
         if (!jarch.equals(""))
           arcs += "," + jarch;
         else if (!arch.equals(""))
           arcs += "," + arch;
-        
+
         if (!arcs.equals(""))
           archives = TagParser.parseArchives(arcs, this);
       }
@@ -236,7 +236,7 @@ class AppletTag
 
   /**
    * Constructs an AppletTag and parses the given object element.
-   * 
+   *
    * @param objElement - the Object element to parse.
    */
   AppletTag(DomHTMLObjectElement objElement)
@@ -294,31 +294,31 @@ class AppletTag
         if (!jcode.equals(""))
           code = jcode;
         else
-          code = objElement.getCode(); 
+          code = objElement.getCode();
       }
-    
+
     if (archives.size() == 0)
       {
         String arcs = "";
         String jarch = objElement.getJavaArchive();
         String arch = objElement.getArchive();
-        
+
         if (code.indexOf(".") < 0)
           arcs = code + ".jar";
-        
+
         if (!jarch.equals(""))
           arcs += "," + jarch;
         else if (!arch.equals(""))
           arcs += "," + arch;
-        
+
         if (!arcs.equals(""))
           archives = TagParser.parseArchives(arcs, this);
       }
   }
-  
+
   /**
    * String representation of the tag.
-   * 
+   *
    * @return the string representation.
    */
   public String toString()
@@ -327,10 +327,10 @@ class AppletTag
             + codebase + "\n" + "  archive=" + archives + "\n" + "  parameters="
             + parameters + "\n" + "  documentbase=" + documentbase + "\n");
   }
-  
+
   /**
    * Returns the size of the applet.
-   * 
+   *
    * @return the size.
    */
   Dimension getSize()
@@ -340,7 +340,7 @@ class AppletTag
     try
       {
         String widthStr = (String) parameters.get("width");
-        
+
         if (widthStr != null && ! widthStr.equals(""))
           {
             if (widthStr.charAt(widthStr.length() - 1) == '%')
@@ -379,50 +379,50 @@ class AppletTag
 
     return size;
   }
-  
+
   /**
    * Gets the code base.
-   *  
+   *
    * @return the codebase.
    */
   String getCodeBase()
   {
     return codebase;
   }
-  
+
   /**
    * Gets the archive list.
-   *  
+   *
    * @return the archive list.
    */
   ArrayList getArchives()
   {
     return archives;
   }
-  
+
   /**
    * Gets the code.
-   * 
+   *
    * @return the code.
    */
   String getCode()
   {
     return code;
   }
-  
+
   /**
    * Gets the document base.
-   *  
+   *
    * @return the document base.
    */
   URL getDocumentBase()
   {
     return documentbase;
   }
-  
+
   /**
    * Gets the specified parameter.
-   * 
+   *
    * @param name - the specified parameter.
    * @return the parameter.
    */
@@ -430,17 +430,17 @@ class AppletTag
   {
     return (String) parameters.get(name.toLowerCase());
   }
-  
+
   /**
    * Prepends the base to the codebase.
-   * 
+   *
    * @return the new URL.
    */
   URL prependCodeBase(String base) throws MalformedURLException
   {
     if (documentbase == null)
       documentbase = TagParser.db;
-        
+
     URL fullcodebase;
 
     //If no codebase was specified, default to documentbase.
@@ -470,7 +470,7 @@ class AppletTag
       {
         // codebase was specified.
         URL codebaseURL = new URL(documentbase, codebase);
-        
+
         if ("file".equals(codebaseURL.getProtocol()))
           {
             if (new File(codebaseURL.getFile()).isDirectory() && !codebase.endsWith(File.separator))
@@ -483,7 +483,7 @@ class AppletTag
         else
           fullcodebase = new URL(documentbase, codebase + File.separator);
       }
-    
+
     return new URL(fullcodebase, base);
   }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java
index 7e118e93162..ebdd3592214 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletContext.java
@@ -90,11 +90,11 @@ abstract class CommonAppletContext
 
     while (i.hasNext())
       {
-	a = (Applet) i.next();
+        a = (Applet) i.next();
 
-	appletName = a.getParameter("name");
-	if (a != null && appletName != null && appletName.equals(name))
-	  return a;
+        appletName = a.getParameter("name");
+        if (a != null && appletName != null && appletName.equals(name))
+          return a;
       }
     return null;
   }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
index 24b305a224f..bf14db57315 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/CommonAppletStub.java
@@ -61,7 +61,7 @@ class CommonAppletStub
   ////////////////////////////////
   ////// AppletStub Methods //////
   ////////////////////////////////
-  
+
   /**
    * Tests whether or not this applet is currently active. An applet
    * becomes active just before the browser invokes start (), and
@@ -94,7 +94,7 @@ class CommonAppletStub
   {
     try
       {
-	return tag.prependCodeBase("");
+        return tag.prependCodeBase("");
       }
     catch (MalformedURLException e)
       {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java
index 4eff8f53ebb..f6e02dbaa23 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/Main.java
@@ -60,7 +60,7 @@ import java.util.List;
 class Main
 {
   private static HashMap classLoaderCache = new HashMap();
-  
+
   private static ClassLoader getClassLoader(URL codebase, ArrayList archives)
   {
     // Should load class loader each time. It is possible that there
@@ -70,7 +70,7 @@ class Main
 
     return loader;
   }
-  
+
   private static String code = null;
   private static String codebase = null;
   private static String archive = null;
@@ -254,13 +254,13 @@ class Main
     if (pluginMode)
       {
         // Plugin will warn user about missing security manager.
-	InputStream in;
-	OutputStream out;
+        InputStream in;
+        OutputStream out;
 
         in = new FileInputStream(pipeInName);
         out = new FileOutputStream(pipeOutName);
 
-	PluginAppletViewer.start(in, out);
+        PluginAppletViewer.start(in, out);
       }
     else
       {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java
index d77aad39223..da8399b6ba4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletViewer.java
@@ -82,55 +82,55 @@ class PluginAppletViewer
 
     while (true)
       {
-	if (message.startsWith("instance"))
-	  {
-	    // Read applet instance identifier.
-	    String key = message.substring(9);
+        if (message.startsWith("instance"))
+          {
+            // Read applet instance identifier.
+            String key = message.substring(9);
 
-	    if (appletWindows.get(key) == null)
-	      appletWindows.put(key, new PluginAppletWindow());
+            if (appletWindows.get(key) == null)
+              appletWindows.put(key, new PluginAppletWindow());
 
-	    currentWindow = (PluginAppletWindow) appletWindows.get(key);
-	  }
-	else if (message.startsWith("tag"))
-	  {
-	    int pos = message.indexOf(' ', 4);
-	    String documentbase = message.substring(4, pos);
+            currentWindow = (PluginAppletWindow) appletWindows.get(key);
+          }
+        else if (message.startsWith("tag"))
+          {
+            int pos = message.indexOf(' ', 4);
+            String documentbase = message.substring(4, pos);
         String tag = message.substring(pos + 1);
         currentWindow.setParser(tag, documentbase);
-	  }
-	else if (message.startsWith("handle"))
-	  {
-	    long handle = Long.parseLong(message.substring(7));
+          }
+        else if (message.startsWith("handle"))
+          {
+            long handle = Long.parseLong(message.substring(7));
 
-	    currentWindow.setHandle(handle);
-	  }
-	else if (message.startsWith("width"))
-	  {
-	    int width = Integer.parseInt(message.substring(6));
+            currentWindow.setHandle(handle);
+          }
+        else if (message.startsWith("width"))
+          {
+            int width = Integer.parseInt(message.substring(6));
 
-	    currentWindow.setSize(width, currentWindow.getHeight());
-	  }
-	else if (message.startsWith("height"))
-	  {
-	    int height = Integer.parseInt(message.substring(7));
+            currentWindow.setSize(width, currentWindow.getHeight());
+          }
+        else if (message.startsWith("height"))
+          {
+            int height = Integer.parseInt(message.substring(7));
 
-	    currentWindow.setSize(currentWindow.getWidth(), height);
-	  }
-	else if (message.startsWith("destroy"))
-	  {
-	    appletWindows.remove(currentWindow);
-	    currentWindow.dispose();
-	  }
+            currentWindow.setSize(currentWindow.getWidth(), height);
+          }
+        else if (message.startsWith("destroy"))
+          {
+            appletWindows.remove(currentWindow);
+            currentWindow.dispose();
+          }
 
-	// Read next message.
-	message = read();
+        // Read next message.
+        message = read();
       }
   }
 
   /**
    * Write string to plugin.
-   * 
+   *
    * @param message the message to write
    *
    * @exception IOException if an error occurs
@@ -163,14 +163,14 @@ class PluginAppletViewer
 
     if (message == null || message.equals("shutdown"))
       {
-	// Close input/output channels to plugin.
-	pluginInputStream.close();
-	pluginOutputStream.close();
+        // Close input/output channels to plugin.
+        pluginInputStream.close();
+        pluginOutputStream.close();
 
-	System.err.println
+        System.err.println
           (Messages.getString("PluginAppletViewer.AppletViewerExiting"));
 
-	System.exit(0);
+        System.exit(0);
       }
 
     return message;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
index bcf57808c01..bc44a73d857 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/PluginAppletWindow.java
@@ -68,12 +68,12 @@ class PluginAppletWindow
     MouseMotionListener, InputMethodListener, HierarchyListener,
     HierarchyBoundsListener
 {
-  
+
   // This class implements various listeners because the author of an applet
-  // may attach listeners to it, unaware of the applet's parent (this class). 
+  // may attach listeners to it, unaware of the applet's parent (this class).
   // So, we must pass all listener events on this plugin applet window to the
   // actual applet.
-  
+
   private static HashMap contexts = new HashMap();
   private Applet applet;
   private TagParser parser;
@@ -89,15 +89,15 @@ class PluginAppletWindow
     addInputMethodListener(this);
     addHierarchyListener(this);
     addHierarchyBoundsListener(this);
-  }  
-  
+  }
+
   ///////////////////////////////////
   /// ContainerListener Methods /////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when a component is added to the container.
-   * 
+   *
    * @param event the <code>ContainerEvent</code> indicating component
    *          addition
    */
@@ -113,7 +113,7 @@ class PluginAppletWindow
 
   /**
    * This method is called when a component is removed from the container.
-   * 
+   *
    * @param event the <code>ContainerEvent</code> indicating component removal
    */
   public void componentRemoved(ContainerEvent event)
@@ -125,11 +125,11 @@ class PluginAppletWindow
           l[i].componentRemoved(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// ComponentListener Methods /////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the component is resized.
    *
@@ -189,11 +189,11 @@ class PluginAppletWindow
           l[i].componentHidden(event);
       }
   }
-     
+
   ///////////////////////////////////
   ////// MouseListener Methods //////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the mouse is clicked (pressed and released
    * in short succession) on a component.
@@ -255,7 +255,7 @@ class PluginAppletWindow
       }
   }
 
-  /** 
+  /**
    * This method is called when the mouse exits a component.
    *
    * @param event the <code>MouseEvent</code> for the exit
@@ -269,11 +269,11 @@ class PluginAppletWindow
           l[i].mouseExited(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// MouseMotionListener Methods ///
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the mouse is moved over a component
    * while a button has been pressed.
@@ -305,11 +305,11 @@ class PluginAppletWindow
           l[i].mouseMoved(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// InputMethodListener Methods ///
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the text is changed.
    *
@@ -339,11 +339,11 @@ class PluginAppletWindow
           l[i].caretPositionChanged(event);
       }
   }
-  
+
   ///////////////////////////////////
   //// HierarchyListener Methods ////
   ///////////////////////////////////
-  
+
   /**
    * Called when the hierarchy of this component changes. Use
    * <code>getChangeFlags()</code> on the event to see what exactly changed.
@@ -359,11 +359,11 @@ class PluginAppletWindow
           l[i].hierarchyChanged(event);
       }
   }
-  
+
   /////////////////////////////////////////
   //// HierarchyBoundsListener Methods ////
   /////////////////////////////////////////
-  
+
   /**
    * Called when an ancestor component of the source is moved.
    *
@@ -393,7 +393,7 @@ class PluginAppletWindow
           l[i].ancestorResized(e);
       }
   }
-  
+
   void setParser(String tag, String documentbase) throws MalformedURLException, IOException
   {
     URL documentbaseURL = TagParser.getLocationToURL(documentbase);
@@ -407,7 +407,7 @@ class PluginAppletWindow
 
   /**
    * Set the native handle of the window system to embed the window in.
-   * 
+   *
    * @param handle the native handle.
    */
   public void setHandle(long handle)
@@ -435,8 +435,8 @@ class PluginAppletWindow
         Dimension size = getSize();
         if (size.width == 0 || size.height == 0)
           size = tag.getSize();
-        applet.setSize(size);          
-        
+        applet.setSize(size);
+
         // Initialize the applet before showing this window so that
         // the applet doesn't receive events before it has been
         // initialized.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java
index cc3a65cd72c..a59b03bfd39 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletViewer.java
@@ -83,7 +83,7 @@ class StandaloneAppletViewer extends Main
             (Messages.getString("StandaloneAppletViewer.CodeOptionError"));
           System.exit(1);
         }
-      
+
       String tagString =
         "<EMBED"
         + " CODE=\"" + code + "\""
@@ -102,7 +102,7 @@ class StandaloneAppletViewer extends Main
             "<PARAM NAME=" + paramTokenizer.nextToken().trim() + " VALUE="
             + paramTokenizer.nextToken().trim() + ">";
         }
-      
+
       tagString += "</EMBED>";
 
       StringReader reader = new StringReader(tagString);
@@ -139,7 +139,7 @@ class StandaloneAppletViewer extends Main
     for (int i = 0; i < appletTags.size(); i++)
       {
         AppletTag tag = (AppletTag) appletTags.get(i);
-          
+
         // Create a StandaloneAppletWindow and add it to the
         // appletWindows list.
         new StandaloneAppletWindow(tag, appletWindows);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
index b92dc50f5eb..64d3007f3b6 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/StandaloneAppletWindow.java
@@ -72,12 +72,12 @@ class StandaloneAppletWindow
     MouseListener, MouseMotionListener, InputMethodListener, HierarchyListener,
     HierarchyBoundsListener
 {
-  
+
   // This class implements various listeners because the author of an applet
-  // may attach listeners to it, unaware of the applet's parent (this class). 
+  // may attach listeners to it, unaware of the applet's parent (this class).
   // So, we must pass all listener events on this plugin applet window to the
   // actual applet.
-  
+
   private static int testWindowCount;
   private static HashMap contexts = new HashMap();
   private Applet applet;
@@ -112,14 +112,14 @@ class StandaloneAppletWindow
 
     addWindowListener(new WindowAdapter()
         {
-	  public void windowClosing(WindowEvent event)
-	  {
-	    applet.stop();
-	    StandaloneAppletWindow.this.hide();
-	    System.exit(0);
-	  }
+          public void windowClosing(WindowEvent event)
+          {
+            applet.stop();
+            StandaloneAppletWindow.this.hide();
+            System.exit(0);
+          }
         });
-    
+
     addContainerListener(this);
     addComponentListener(this);
     addMouseListener(this);
@@ -127,7 +127,7 @@ class StandaloneAppletWindow
     addInputMethodListener(this);
     addHierarchyListener(this);
     addHierarchyBoundsListener(this);
-    
+
     restartItem = new MenuItem(Messages.getString("StandaloneAppletWindow.MenuRestart"));
     restartItem.setEnabled(false);
     restartItem.addActionListener(this);
@@ -240,11 +240,11 @@ class StandaloneAppletWindow
       }
     else if (e.getSource() == closeItem)
       {
-	// Close current window.
-	closeWindow();
-	
-	// Exit if there are other windows left.
-	if (StandaloneAppletViewer.appletWindows.isEmpty())
+        // Close current window.
+        closeWindow();
+
+        // Exit if there are other windows left.
+        if (StandaloneAppletViewer.appletWindows.isEmpty())
           System.exit(0);
       }
   }
@@ -253,15 +253,15 @@ class StandaloneAppletWindow
   {
     this.status.setText(status);
   }
-  
+
 
   ///////////////////////////////////
   /// ContainerListener Methods /////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when a component is added to the container.
-   * 
+   *
    * @param event the <code>ContainerEvent</code> indicating component
    *          addition
    */
@@ -277,7 +277,7 @@ class StandaloneAppletWindow
 
   /**
    * This method is called when a component is removed from the container.
-   * 
+   *
    * @param event the <code>ContainerEvent</code> indicating component removal
    */
   public void componentRemoved(ContainerEvent event)
@@ -289,11 +289,11 @@ class StandaloneAppletWindow
           l[i].componentRemoved(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// ComponentListener Methods /////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the component is resized.
    *
@@ -353,11 +353,11 @@ class StandaloneAppletWindow
           l[i].componentHidden(event);
       }
   }
-     
+
   ///////////////////////////////////
   ////// MouseListener Methods //////
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the mouse is clicked (pressed and released
    * in short succession) on a component.
@@ -419,7 +419,7 @@ class StandaloneAppletWindow
       }
   }
 
-  /** 
+  /**
    * This method is called when the mouse exits a component.
    *
    * @param event the <code>MouseEvent</code> for the exit
@@ -433,11 +433,11 @@ class StandaloneAppletWindow
           l[i].mouseExited(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// MouseMotionListener Methods ///
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the mouse is moved over a component
    * while a button has been pressed.
@@ -469,11 +469,11 @@ class StandaloneAppletWindow
           l[i].mouseMoved(event);
       }
   }
-  
+
   ///////////////////////////////////
   /// InputMethodListener Methods ///
   ///////////////////////////////////
-  
+
   /**
    * This method is called when the text is changed.
    *
@@ -503,11 +503,11 @@ class StandaloneAppletWindow
           l[i].caretPositionChanged(event);
       }
   }
-  
+
   ///////////////////////////////////
   //// HierarchyListener Methods ////
   ///////////////////////////////////
-  
+
   /**
    * Called when the hierarchy of this component changes. Use
    * <code>getChangeFlags()</code> on the event to see what exactly changed.
@@ -523,11 +523,11 @@ class StandaloneAppletWindow
           l[i].hierarchyChanged(event);
       }
   }
-  
+
   /////////////////////////////////////////
   //// HierarchyBoundsListener Methods ////
   /////////////////////////////////////////
-  
+
   /**
    * Called when an ancestor component of the source is moved.
    *
diff --git a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java
index c1e5cac524b..711b26ee58c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/appletviewer/TagParser.java
@@ -64,27 +64,27 @@ import org.w3c.dom.NodeList;
 
 public class TagParser
 {
-    
+
   /**
    * Parsed document.
    */
   DomHTMLDocument document;
-  
+
   /**
    * The document base of this applet.
    */
   URL documentbase;
-  
+
   /**
    * The document base of all the applets.
    */
   static URL db;
-  
-  /** 
+
+  /**
    * The tags in the document.
    */
   Vector tags = new Vector();
-  
+
   /**
    * Default constructor.
    */
@@ -95,7 +95,7 @@ public class TagParser
 
   /**
    * Constructs and parses document using the given location.
-   * 
+   *
    * @param location - location of applet
    */
   TagParser(String location) throws IOException
@@ -108,7 +108,7 @@ public class TagParser
 
   /**
    * Constructs and parses document.
-   * 
+   *
    * @param in - Reader to parse document from.
    * @param documentBase - the URL of the applet
    * @throws IOException - is thrown if any IO error occurs.
@@ -119,19 +119,19 @@ public class TagParser
     db = documentbase;
     document = (DomHTMLDocument) (new DomHTMLParser(HTML_401F.getInstance()).parseDocument(in));
   }
-  
+
   /**
    * Parses all applet tags in document.
-   * 
+   *
    * @return a list of AppletTag objects representing the applet tags
    * in document
    */
   ArrayList parseAppletTags()
-  {    
+  {
     ArrayList allTags = new ArrayList();
     if (document == null)
       return null;
-    
+
     recurseDocument(document.getChildNodes());
 
     int sz = tags.size();
@@ -151,13 +151,13 @@ public class TagParser
         a.documentbase = documentbase;
         allTags.add(a);
       }
-    
+
     return allTags;
   }
-  
+
   /**
    * Recurses the document in search for the appropriate tags.
-   * 
+   *
    * @param list - the Node list.
    */
   private void recurseDocument(NodeList list)
@@ -167,17 +167,17 @@ public class TagParser
     for (int i = 0; i < length; i++)
       {
         DomNode curr = (DomNode) list.item(i);
-        if ((curr instanceof DomHTMLEmbedElement) || 
+        if ((curr instanceof DomHTMLEmbedElement) ||
             (curr instanceof DomHTMLAppletElement) ||
             (curr instanceof DomHTMLObjectElement))
           tags.add(curr);
         recurseDocument(curr.getChildNodes());
       }
   }
-  
+
   /**
    * Parses the param elements for a given node.
-   * 
+   *
    * @param node - the node element to parse.
    */
   static void parseParams(DomNode node, AppletTag t)
@@ -187,7 +187,7 @@ public class TagParser
     boolean jc = false;
     NodeList l = node.getChildNodes();
     int size = l.getLength();
-    
+
     if (size != 0)
       for (int i = 0; i < size; i++)
         {
@@ -197,7 +197,7 @@ public class TagParser
           DomHTMLParamElement curr = (DomHTMLParamElement) c;
           String key = curr.getName();
           String val = curr.getValue();
-          
+
           if (key.equals("java_code"))
             {
               jc = true;
@@ -234,10 +234,10 @@ public class TagParser
           t.parameters.put(key.toLowerCase(), val);
         }
   }
-  
+
   /**
    * This method does the same thing as the g_strcompress function in glib.
-   * 
+   *
    * @param value
    * @return value in its original one-byte equivalence.
    */
@@ -288,10 +288,10 @@ public class TagParser
       }
     return unescVal;
   }
-  
+
   /**
    * Parses the archive string and returns a list.
-   * 
+   *
    * @param arcs the list of archives (comma-separated) in a String.
    */
   static ArrayList parseArchives(String arcs, AppletTag t)
@@ -311,10 +311,10 @@ public class TagParser
       }
     return null;
   }
-  
+
   /**
    * Gets the location to the URL, given a location.
-   * 
+   *
    * @param location - the given location.
    * @return the URL.
    */
@@ -323,10 +323,10 @@ public class TagParser
     URL tmpDocumentBase = null;
 
     try
-      {        
+      {
         // Try parsing location as a URL.
         tmpDocumentBase = new URL(location);
-        
+
         // If no file was specified in the URL the assume the user
         // meant the root page.
         String f = tmpDocumentBase.getFile();
@@ -346,11 +346,11 @@ public class TagParser
                           + location).getCanonicalPath();
 
         tmpDocumentBase = new URL("file", "", path);
-        
+
         if (new File(tmpDocumentBase.getFile()).isDirectory())
           tmpDocumentBase = new URL("file", "", path + File.separator);
       }
-    
+
     return tmpDocumentBase;
   }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/CallbackUtil.java b/libjava/classpath/tools/gnu/classpath/tools/common/CallbackUtil.java
index 398bb6cae9e..838d7403abe 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/common/CallbackUtil.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/common/CallbackUtil.java
@@ -66,7 +66,7 @@ public abstract class CallbackUtil
    * <p>
    * If no <i>Security Provider</i> for this type of callback was found, this
    * method returns the default GNU implementation.
-   * 
+   *
    * @return a console {@link CallbackHandler} implementation.
    */
   public static final CallbackHandler getConsoleHandler()
@@ -89,7 +89,7 @@ public abstract class CallbackUtil
    * the handler from those providers. As soon as one provider returns a non-
    * null instance of the callback handler, the search stops and that instance
    * is returned.
-   * 
+   *
    * @return a {@link CallbackHandler} of the designated type, or
    *         <code>null</code> if no provider was found for theis type of
    *         callback.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java b/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java
index b2e50872920..d740646e53f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/common/ClasspathToolParser.java
@@ -63,7 +63,7 @@ public class ClasspathToolParser
   private static String getVersionString(String programName)
   {
     String fmt = (Messages.getString("ClasspathToolParser.VersionFormat")); //$NON-NLS-1$
-    return MessageFormat.format(fmt, 
+    return MessageFormat.format(fmt,
                                 new Object[]
                                   {
                                     programName,
@@ -93,15 +93,15 @@ public class ClasspathToolParser
   }
 
   public void parse(String[] inArgs, FileArgumentCallback files,
-		    boolean handleFileLists)
+                    boolean handleFileLists)
   {
     FileArgumentCallback cb;
-    
+
     if (handleFileLists)
       cb = new AtFileArgumentCallback(files);
     else
       cb = files;
-    
+
     parse(inArgs, cb);
   }
 
@@ -111,22 +111,22 @@ public class ClasspathToolParser
 
     final FileArgumentCallback cb = new FileArgumentCallback()
       {
-    	public void notifyFile(String fileArgument)
-    	{
-    	  fileResult.add(fileArgument);
-    	}
+        public void notifyFile(String fileArgument)
+        {
+          fileResult.add(fileArgument);
+        }
       };
-    
+
     if (handleFileLists)
       parse(inArgs, new AtFileArgumentCallback(cb));
     else
       parse(inArgs, cb);
-    
+
     return fileResult.toArray(new String[fileResult.size()]);
   }
 
 
-  /** 
+  /**
    * Simple function that takes the given {@link Reader}, treats it like
    * a textfile and reads all the whitespace separated entries from it
    * and adds them to the @{link FileArgumentCallback} instance.
@@ -136,7 +136,7 @@ public class ClasspathToolParser
    * @throws OptionException if an error occurs reading the list.
    */
   public void parseFileList(Reader reader, FileArgumentCallback cb)
-	throws OptionException
+        throws OptionException
   {
     BufferedReader breader = new BufferedReader(reader);
     String line = null;
@@ -145,17 +145,17 @@ public class ClasspathToolParser
       {
         while ((line = breader.readLine()) != null)
           parseLine(line, cb);
-          
+
         reader.close();
       }
     catch (IOException ioe)
       {
         throw new OptionException("I/O error while reading a file list", ioe);
       }
-      
+
   }
-  
-  /** 
+
+  /**
    * Parses whitespace separated file entries.
    *
    * Note: This is not coping with whitespace in files or quoting.
@@ -172,31 +172,31 @@ public class ClasspathToolParser
     int start = 0;
     int end = 0;
 
-		// While not reached end of line ...
+                // While not reached end of line ...
     while (start < length)
       {
-	// Search for first non-whitespace character for the start of a word.
+        // Search for first non-whitespace character for the start of a word.
         while (Character.isWhitespace(line.codePointAt(start)))
           {
             start++;
-	    
+
             if (start == length)
               return;
           }
-	
+
         end = start + 1;
-	
-	// Search for first whitespace character for the end of a word.
+
+        // Search for first whitespace character for the end of a word.
         while (end < length && !Character.isWhitespace(line.codePointAt(end)))
           end++;
-	
+
         cb.notifyFile(line.substring(start, end));
-	
+
         start = end + 1;
       }
   }
 
-  /** 
+  /**
    * Implementation of {@link FileArgumentCallback} that handles
    * file arguments in {@link #notifyFile} starting with a <code>@</code>
    * through {@link ClasspathToolParser#parseFileList}.
@@ -204,7 +204,7 @@ public class ClasspathToolParser
   class AtFileArgumentCallback extends FileArgumentCallback
   {
     FileArgumentCallback cb;
-    
+
     AtFileArgumentCallback(FileArgumentCallback cb)
     {
       this.cb = cb;
@@ -215,25 +215,25 @@ public class ClasspathToolParser
       throws OptionException
     {
       if (fileArgument.codePointAt(0) == '@')
-	{
-	  FileReader fr = null;
-	  
-	  try
-	    {
-	      fr = new FileReader(fileArgument.substring(1));
-	    }
-	  catch (FileNotFoundException fnfe)
-	    {
-	      throw new OptionException("File not found: " + fileArgument.substring(1),
-					fnfe);
-	    }
-	  
-	  ClasspathToolParser.this.parseFileList(fr, cb);
-	}
+        {
+          FileReader fr = null;
+
+          try
+            {
+              fr = new FileReader(fileArgument.substring(1));
+            }
+          catch (FileNotFoundException fnfe)
+            {
+              throw new OptionException("File not found: " + fileArgument.substring(1),
+                                        fnfe);
+            }
+
+          ClasspathToolParser.this.parseFileList(fr, cb);
+        }
       else
-	cb.notifyFile(fileArgument);
+        cb.notifyFile(fileArgument);
     }
-    
+
   }
 
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/Persistent.java b/libjava/classpath/tools/gnu/classpath/tools/common/Persistent.java
index 5a2b48a8ddc..5c85c9072be 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/common/Persistent.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/common/Persistent.java
@@ -43,7 +43,7 @@ import java.util.TimerTask;
 /**
  * The static fields, shared by the multiple classes, implementing the
  * persistent work.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public interface Persistent
@@ -58,7 +58,7 @@ public interface Persistent
       System.exit(0);
     }
   }
-  
+
   /**
    * The timer, sheduling all disk database update events, shared by all
    * instances.
@@ -78,10 +78,10 @@ public interface Persistent
    * be stored to the disk.
    */
   static long ALWAYS_UPDATE = 300000;
-  
+
   /**
    * Write the database content to the disk.
    */
-  void writeContent();  
-  
+  void writeContent();
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/ProviderUtil.java b/libjava/classpath/tools/gnu/classpath/tools/common/ProviderUtil.java
index 8d043443396..bc6d93146cf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/common/ProviderUtil.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/common/ProviderUtil.java
@@ -64,7 +64,7 @@ public abstract class ProviderUtil
    * <p>
    * <b>IMPORTANT</b>: This method overrides the security check usually carried
    * out by the security manager when inserting a new {@link Provider}.
-   * 
+   *
    * @param providerClass a fully qualified, non-null, class name of a
    *          <i>Security Provider</i> to add if it is not already installed.
    * @return an instance of {@link SecurityProviderInfo} referencing the
@@ -110,7 +110,7 @@ public abstract class ProviderUtil
    * <p>
    * <b>IMPORTANT</b>: This method overrides the security check usually carried
    * out by the security manager when inserting a new {@link Provider}.
-   * 
+   *
    * @param provider a non-null <i>Security Provider</i> to add if it is not
    *          already installed.
    * @return the new position of the designated provider in the list if it was
@@ -142,7 +142,7 @@ public abstract class ProviderUtil
    * <p>
    * <b>IMPORTANT</b>: This method overrides the security check usually carried
    * out by the security manager when removing a {@link Provider}.
-   * 
+   *
    * @param providerName the name of the {@link Provider} to remove.
    */
   public static final void removeProvider(final String providerName)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/common/SecurityProviderInfo.java b/libjava/classpath/tools/gnu/classpath/tools/common/SecurityProviderInfo.java
index e12ee4fe3ff..44faebf762d 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/common/SecurityProviderInfo.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/common/SecurityProviderInfo.java
@@ -56,7 +56,7 @@ public class SecurityProviderInfo
    * <p>
    * Used by {@link ProviderUtil} to indicate the result of adding a provider,
    * given its class name.
-   * 
+   *
    * @param provider the possibly <code>null</code> {@link Provider}.
    * @param position the position of <code>provider</code> in the list of
    * <i>Security Providers</i> in the underlying JVM runtime. <code>-1</code>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
index 8ac9add6875..4369782f960 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/AbstractDoclet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -141,7 +141,7 @@ public abstract class AbstractDoclet
    protected abstract void run()
       throws DocletConfigurationException, IOException;
 
-   public static boolean start(RootDoc rootDoc) 
+   public static boolean start(RootDoc rootDoc)
    {
       try {
 
@@ -189,7 +189,7 @@ public abstract class AbstractDoclet
       // Process command line options
 
       for (int i=0, ilim=rootDoc.options().length; i<ilim; ++i) {
-            
+
          String[] optionArr = rootDoc.options()[i];
          String _optionTag = optionArr[0];
 
@@ -209,7 +209,7 @@ public abstract class AbstractDoclet
 
       if (!getTargetDirectory().exists()) {
          if (!getTargetDirectory().mkdirs()) {
-            throw new DocletConfigurationException("Cannot create target directory " 
+            throw new DocletConfigurationException("Cannot create target directory "
                                                    + getTargetDirectory());
          }
       }
@@ -222,44 +222,44 @@ public abstract class AbstractDoclet
       return optionTargetDirectory.getValue();
    }
 
-   private DocletOptionFile optionTargetDirectory = 
-     new DocletOptionFile("-d", 
+   private DocletOptionFile optionTargetDirectory =
+     new DocletOptionFile("-d",
                           new File(System.getProperty("user.dir")));
 
-   private DocletOptionFlag optionNoEmailWarn = 
+   private DocletOptionFlag optionNoEmailWarn =
      new DocletOptionFlag("-noemailwarn");
 
-   private DocletOptionFlag optionAuthor = 
+   private DocletOptionFlag optionAuthor =
      new DocletOptionFlag("-author");
 
-   private DocletOptionFlag optionVersion = 
+   private DocletOptionFlag optionVersion =
      new DocletOptionFlag("-version");
 
-   private DocletOptionFlag optionNoSince = 
+   private DocletOptionFlag optionNoSince =
      new DocletOptionFlag("-nosince");
 
-   private DocletOptionFlag optionNoDeprecated = 
+   private DocletOptionFlag optionNoDeprecated =
      new DocletOptionFlag("-nodeprecated");
 
-   private DocletOptionGroup optionGroup = 
+   private DocletOptionGroup optionGroup =
      new DocletOptionGroup("-group");
 
-   private DocletOptionPackageWildcard optionNoQualifier = 
+   private DocletOptionPackageWildcard optionNoQualifier =
      new DocletOptionPackageWildcard("-noqualifier", true);
 
-   private DocletOptionFlag optionDocFilesSubDirs = 
+   private DocletOptionFlag optionDocFilesSubDirs =
      new DocletOptionFlag("-docfilessubdirs");
 
-   private DocletOptionColonSeparated optionExcludeDocFilesSubDir = 
+   private DocletOptionColonSeparated optionExcludeDocFilesSubDir =
      new DocletOptionColonSeparated("-excludedocfilessubdir");
 
-   private DocletOptionTagletPath optionTagletPath = 
+   private DocletOptionTagletPath optionTagletPath =
      new DocletOptionTagletPath("-tagletpath");
 
-   private DocletOptionTag optionTaglet = 
+   private DocletOptionTag optionTaglet =
      new DocletOptionTag("-taglet");
 
-   private DocletOptionTag optionTag = 
+   private DocletOptionTag optionTag =
      new DocletOptionTag("-tag");
 
    private class DocletOptionTaglet
@@ -269,7 +269,7 @@ public abstract class AbstractDoclet
       {
          super(optionName);
       }
-      
+
       public int getLength()
       {
          return 2;
@@ -340,14 +340,14 @@ public abstract class AbstractDoclet
       }
    }
 
-   private class DocletOptionGroup 
+   private class DocletOptionGroup
       extends DocletOption
    {
       DocletOptionGroup(String optionName)
       {
          super(optionName);
       }
-      
+
       public int getLength()
       {
          return 3;
@@ -363,7 +363,7 @@ public abstract class AbstractDoclet
                String packageWildcard = tokenizer.nextToken();
                packageMatcher.addWildcard(packageWildcard);
             }
-            
+
             SortedSet groupPackages = packageMatcher.filter(rootDoc.specifiedPackages());
 
             packageGroups.add(new PackageGroup(optionArr[1], groupPackages));
@@ -384,7 +384,7 @@ public abstract class AbstractDoclet
       {
          super(optionName);
       }
-      
+
       public int getLength()
       {
          return 2;
@@ -404,7 +404,7 @@ public abstract class AbstractDoclet
       {
          super(optionName);
       }
-      
+
       public int getLength()
       {
          return 2;
@@ -426,7 +426,7 @@ public abstract class AbstractDoclet
                }
                else {
                   mentionedTags.add(taglet);
-                           
+
                   // re-append taglet
                   tagletMap.remove(tagSpec);
                   tagletMap.put(tagSpec, taglet);
@@ -456,11 +456,11 @@ public abstract class AbstractDoclet
                boolean tagScopeMethods = false;
                boolean tagScopeFields = false;
                boolean tagDisabled = false;
-                        
+
             tag_option_loop:
                for (int n=ndx1+1; n<ndx2; ++n) {
                   switch (tagSpec.charAt(n)) {
-                  case 'X': 
+                  case 'X':
                      tagDisabled = true;
                      break;
                   case 'a':
@@ -494,7 +494,7 @@ public abstract class AbstractDoclet
                      break tag_option_loop;
                   }
                }
-                        
+
                if (validTagSpec) {
                   GenericTaglet taglet
                      = new GenericTaglet(tagName,
@@ -518,7 +518,7 @@ public abstract class AbstractDoclet
       }
    }
 
-   private DocletOption[] commonOptions = 
+   private DocletOption[] commonOptions =
       {
          optionTargetDirectory,
          optionAuthor,
@@ -553,7 +553,7 @@ public abstract class AbstractDoclet
 
    private boolean optionsRegistered = false;
 
-   private void registerOption(DocletOption option) 
+   private void registerOption(DocletOption option)
    {
       nameToOptionMap.put(option.getName(), option);
    }
@@ -618,14 +618,14 @@ public abstract class AbstractDoclet
          return name;
       }
    }
-   
+
    private Map categorizedIndex;
 
    protected Map getCategorizedIndex()
    {
       if (null == categorizedIndex) {
          categorizedIndex = new LinkedHashMap();
-         
+
          Map indexMap = getIndexByName();
          LinkedList keys = new LinkedList(); //indexMap.keySet().size());
          keys.addAll(indexMap.keySet());
@@ -658,7 +658,7 @@ public abstract class AbstractDoclet
          // Create index
 
          // Collect index
-            
+
          indexByName = new HashMap(); //TreeMap();
 
          // Add packages to index
@@ -707,7 +707,7 @@ public abstract class AbstractDoclet
       tagletMap.put(taglet.getName(), taglet);
    }
 
-   protected void printTaglets(Tag[] tags, TagletContext context, TagletPrinter output, boolean inline) 
+   protected void printTaglets(Tag[] tags, TagletContext context, TagletPrinter output, boolean inline)
    {
       for (Iterator it = tagletMap.keySet().iterator(); it.hasNext(); ) {
          String tagName = (String)it.next();
@@ -715,9 +715,9 @@ public abstract class AbstractDoclet
          Taglet taglet = (Taglet)o;
          Doc doc = context.getDoc();
          if (inline == taglet.isInlineTag()
-             && ((doc == null 
+             && ((doc == null
                   && taglet.inOverview())
-                 || (doc != null 
+                 || (doc != null
                      && ((doc.isConstructor() && taglet.inConstructor())
                          || (doc.isField() && taglet.inField())
                          || (doc.isMethod() && taglet.inMethod())
@@ -750,7 +750,7 @@ public abstract class AbstractDoclet
       }
    }
 
-   protected void printInlineTaglet(Tag tag, TagletContext context, TagletPrinter output) 
+   protected void printInlineTaglet(Tag tag, TagletContext context, TagletPrinter output)
    {
       Taglet taglet = (Taglet)tagletMap.get(tag.name().substring(1));
       if (null != taglet) {
@@ -770,7 +770,7 @@ public abstract class AbstractDoclet
       }
    }
 
-   protected void printMainTaglets(Tag[] tags, TagletContext context, TagletPrinter output) 
+   protected void printMainTaglets(Tag[] tags, TagletContext context, TagletPrinter output)
    {
       printTaglets(tags, context, output, false);
    }
@@ -811,7 +811,7 @@ public abstract class AbstractDoclet
       ClassDoc[] classes = rootDoc.classes();
       for (int i = 0, ilim = classes.length; i < ilim; ++ i) {
          ClassDoc clazz = classes[i];
-         
+
          if (clazz.isInterface()) {
             // classes implementing
             InterfaceRelation relation
@@ -825,7 +825,7 @@ public abstract class AbstractDoclet
          }
          else {
             // classes derived from
-            for (ClassDoc superclass = clazz.superclass(); superclass != null; 
+            for (ClassDoc superclass = clazz.superclass(); superclass != null;
                  superclass = superclass.superclass()) {
                addUsedBy(_usedClassToPackagesMap,
                          superclass, UsageType.CLASS_DERIVED_FROM, clazz, clazz.containingPackage());
@@ -836,11 +836,11 @@ public abstract class AbstractDoclet
          for (int j = 0, jlim = fields.length; j < jlim; ++ j) {
             FieldDoc field = fields[j];
 
-            // fields of type                  
+            // fields of type
             ClassDoc fieldType = field.type().asClassDoc();
             if (null != fieldType) {
                addUsedBy(_usedClassToPackagesMap,
-                         fieldType, UsageType.FIELD_OF_TYPE, 
+                         fieldType, UsageType.FIELD_OF_TYPE,
                          field, clazz.containingPackage());
             }
          }
@@ -854,7 +854,7 @@ public abstract class AbstractDoclet
             ClassDoc returnType = method.returnType().asClassDoc();
             if (null != returnType) {
                addUsedBy(_usedClassToPackagesMap,
-                         returnType, UsageType.METHOD_WITH_RETURN_TYPE, 
+                         returnType, UsageType.METHOD_WITH_RETURN_TYPE,
                          method, clazz.containingPackage());
             }
             Parameter[] parameters = method.parameters();
@@ -866,7 +866,7 @@ public abstract class AbstractDoclet
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
                   addUsedBy(_usedClassToPackagesMap,
-                            parameterType, UsageType.METHOD_WITH_PARAMETER_TYPE, 
+                            parameterType, UsageType.METHOD_WITH_PARAMETER_TYPE,
                             method, clazz.containingPackage());
                }
             }
@@ -877,11 +877,11 @@ public abstract class AbstractDoclet
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
                addUsedBy(_usedClassToPackagesMap,
-                         thrownException, UsageType.METHOD_WITH_THROWN_TYPE, 
+                         thrownException, UsageType.METHOD_WITH_THROWN_TYPE,
                          method, clazz.containingPackage());
             }
          }
-                  
+
          ConstructorDoc[] constructors = clazz.constructors();
          for (int j = 0, jlim = constructors.length; j < jlim; ++ j) {
 
@@ -891,12 +891,12 @@ public abstract class AbstractDoclet
             for (int k = 0, klim = parameters.length; k < klim; ++ k) {
 
                // constructors with parameter type
-                     
+
                Parameter parameter = parameters[k];
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
                   addUsedBy(_usedClassToPackagesMap,
-                            parameterType, UsageType.CONSTRUCTOR_WITH_PARAMETER_TYPE, 
+                            parameterType, UsageType.CONSTRUCTOR_WITH_PARAMETER_TYPE,
                             constructor, clazz.containingPackage());
                }
             }
@@ -907,7 +907,7 @@ public abstract class AbstractDoclet
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
                addUsedBy(_usedClassToPackagesMap,
-                         thrownException, UsageType.CONSTRUCTOR_WITH_THROWN_TYPE, 
+                         thrownException, UsageType.CONSTRUCTOR_WITH_THROWN_TYPE,
                          constructor, clazz.containingPackage());
             }
          }
@@ -948,8 +948,8 @@ public abstract class AbstractDoclet
          return this.id.compareTo(((UsageType)other).id);
       }
 
-      public String toString() { 
-         return "UsageType{id=" + id + "}"; 
+      public String toString() {
+         return "UsageType{id=" + id + "}";
       }
 
       public String getId() {
@@ -1062,33 +1062,33 @@ public abstract class AbstractDoclet
       throw new IOException("Couldn't locate source file for class " + classDoc.qualifiedTypeName());
    }
 
-   protected void printError(String error) 
+   protected void printError(String error)
    {
       if (null != rootDoc) {
-	 rootDoc.printError(error);
+         rootDoc.printError(error);
       }
       else {
-	 System.err.println("ERROR: "+error);
+         System.err.println("ERROR: "+error);
       }
    }
 
-   protected void printWarning(String warning) 
+   protected void printWarning(String warning)
    {
       if (null != rootDoc) {
-	 rootDoc.printWarning(warning);
+         rootDoc.printWarning(warning);
       }
       else {
-	 System.err.println("WARNING: "+warning);
+         System.err.println("WARNING: "+warning);
       }
    }
 
-   protected void printNotice(String notice) 
+   protected void printNotice(String notice)
    {
       if (null != rootDoc) {
-	 rootDoc.printNotice(notice);
+         rootDoc.printNotice(notice);
       }
       else {
-	 System.err.println(notice);
+         System.err.println(notice);
       }
    }
 
@@ -1130,7 +1130,7 @@ public abstract class AbstractDoclet
 
    protected String possiblyQualifiedName(Type type)
    {
-      if (null == type.asClassDoc() 
+      if (null == type.asClassDoc()
           || !omitPackageQualifier(type.asClassDoc().containingPackage())) {
          return type.qualifiedTypeName();
       }
@@ -1224,7 +1224,7 @@ public abstract class AbstractDoclet
          Iterator it = interfaceRelations.keySet().iterator();
          while (it.hasNext()) {
             ClassDoc interfaceDoc = (ClassDoc)it.next();
-            InterfaceRelation relation 
+            InterfaceRelation relation
                = (InterfaceRelation)interfaceRelations.get(interfaceDoc);
             Iterator superIt = relation.superInterfaces.iterator();
             while (superIt.hasNext()) {
@@ -1306,7 +1306,7 @@ public abstract class AbstractDoclet
    }
 
    protected abstract String renderTag(String tagName, Tag[] tags, TagletContext context);
-   
+
    protected abstract String getDocletVersion();
 
    protected SortedSet getThrownExceptions(ExecutableMemberDoc execMemberDoc)
@@ -1319,7 +1319,7 @@ public abstract class AbstractDoclet
       return result;
    }
 
-   protected boolean isUncheckedException(ClassDoc classDoc) 
+   protected boolean isUncheckedException(ClassDoc classDoc)
    {
       if (classDoc.isException()) {
          while (null != classDoc) {
@@ -1360,7 +1360,7 @@ public abstract class AbstractDoclet
             ClassDoc[] interfaces = cd.interfaces();
             for (int i=0; i<interfaces.length; ++i) {
                result.add(interfaces[i]);
-               InterfaceRelation relation 
+               InterfaceRelation relation
                   = (InterfaceRelation)getInterfaceRelations().get(interfaces[i]);
                if (null != relation) {
                   result.addAll(relation.superInterfaces);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java
index 6db6cc76840..0e29df928b4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletConfigurationException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -44,7 +44,7 @@ package gnu.classpath.tools.doclets;
  *
  *  @see AbstractDoclet
  */
-public class DocletConfigurationException 
+public class DocletConfigurationException
    extends Exception
 {
    public DocletConfigurationException(String message)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java
index ccfb7fa6c38..fa67f5ec7bf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOption.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java
index 5bc4a6c623b..e02e1ebb484 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionColonSeparated.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -54,7 +54,7 @@ public class DocletOptionColonSeparated
    {
       super(optionName);
    }
-      
+
    public int getLength()
    {
       return 2;
@@ -74,4 +74,3 @@ public class DocletOptionColonSeparated
       return components;
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java
index f1daf2da886..b8368575556 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFile.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java
index e6d206f3808..13afe407f6e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionFlag.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java
index 37a359b8823..33a637db80e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionPackageWildcard.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -62,7 +62,7 @@ public class DocletOptionPackageWildcard
       super(optionName);
       this.allowAll = allowAll;
    }
-      
+
    public int getLength()
    {
       return 2;
@@ -82,7 +82,7 @@ public class DocletOptionPackageWildcard
          }
          else {
             packageMatcher = new PackageMatcher();
-            
+
             StringTokenizer tokenizer = new StringTokenizer(optionArr[2], ":");
             while (tokenizer.hasMoreTokens()) {
                String packageWildcard = tokenizer.nextToken();
@@ -122,4 +122,3 @@ public class DocletOptionPackageWildcard
       }
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java
index 2bff9ce16f8..ecab8654169 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/DocletOptionString.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java
index 2897153b622..f7d4ac57350 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/InlineTagRenderer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java
index eaef3e49a99..8f34288a3a1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/InvalidPackageWildcardException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,4 +49,3 @@ public class InvalidPackageWildcardException
       super(msg);
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java
index bad38f885a0..4278ffb98f1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageGroup.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java
index 0f1b53fbe43..196b74c88c4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/PackageMatcher.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -54,7 +54,7 @@ import com.sun.javadoc.PackageDoc;
 public class PackageMatcher
 {
    private Set patterns = new HashSet();
-   
+
    /**
     *  Add a wildcard to be matched. Wildcards can contain asterisk
     *  characters which match zero or more characters.
@@ -62,7 +62,7 @@ public class PackageMatcher
     *  @throw InvalidPackageWildcardException if the wildcard cannot
     *  match any valid package name.
     */
-   public void addWildcard(String wildcard) 
+   public void addWildcard(String wildcard)
       throws InvalidPackageWildcardException
    {
       final int STATE_ID_START = 0;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java
index 7701a6eaa01..f43f2a13c07 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/StandardTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -63,11 +63,11 @@ public class StandardTaglet
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -79,14 +79,14 @@ public class StandardTaglet
    public boolean inType() {
       return true;
    }
-   
+
    public boolean isInlineTag() {
       return false;
    }
 
    public String getName() {
       return this.name;
-   }   
+   }
 
    public String toString(Tag tag) {
       //assert(false);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java
index 2029d6ce933..b59704a51cb 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/TagletPrinter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -44,4 +44,3 @@ public interface TagletPrinter
 {
    public void printTagletString(String s);
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java
index ff93f8b096f..18bf57950de 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/debugdoclet/DebugDoclet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -55,7 +55,7 @@ public class DebugDoclet
       new DebugDoclet().run(rootDoc);
       return true;
    }
-   
+
    private PrintStream out;
 
    public DebugDoclet()
@@ -84,7 +84,7 @@ public class DebugDoclet
       out.println();
    }
 
-   private void run(RootDoc rootDoc) 
+   private void run(RootDoc rootDoc)
    {
       printHeader("Overview");
 
@@ -159,7 +159,7 @@ public class DebugDoclet
 
    private void printTag(Tag tag)
    {
-      if (null != tag.text()) { 
+      if (null != tag.text()) {
          System.out.println(tag.text());
       }
    }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
index 48f1c190a54..ba4c8b685cd 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/CssClass.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
index 4c5eb1d6e36..f3b2fa8ca30 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/ExternalDocSet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -115,7 +115,7 @@ public class ExternalDocSet
               Properties properties = new Properties();
               properties.load(propertiesIn);
               propertiesIn.close();
-         
+
               String gjdocCompatProperty = properties.getProperty("gjdoc.compat");
               if (null != gjdocCompatProperty) {
                   javadocCompatible = "true".equals(properties.getProperty("gjdoc.compat"));
@@ -127,7 +127,7 @@ public class ExternalDocSet
           else {
               javadocCompatible = true;
           }
-      } 
+      }
       catch (FileNotFoundException e) {
           javadocCompatible = true;
       }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
index 7d5202c9cee..5ec9806345f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlDoclet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -159,7 +159,7 @@ public class HtmlDoclet
                output.endAnchor();
                output.endSpan(CssClass.NAVBAR_ITEM_ENABLED);
             }
-            
+
             output.print(" ");
          }
 
@@ -240,7 +240,7 @@ public class HtmlDoclet
             if (optionLinkSource.getValue()) {
                output.print(" ");
 
-               
+
                if ("source".equals(currentPage)) {
                   output.beginSpan(CssClass.NAVBAR_ITEM_ACTIVE);
                   output.print("Source");
@@ -249,7 +249,7 @@ public class HtmlDoclet
                else {
 
                   if (null != currentClass) {
-                     
+
                      output.beginSpan(CssClass.NAVBAR_ITEM_ENABLED);
                      String targetClassName = currentClass.name();
                      String targetAnchor = "";
@@ -275,7 +275,7 @@ public class HtmlDoclet
          if (!optionNoTree.getValue()) {
             output.print(" ");
 
-            if ("full-tree".equals(currentPage) 
+            if ("full-tree".equals(currentPage)
                 || "package-tree".equals(currentPage)) {
                output.beginSpan(CssClass.NAVBAR_ITEM_ACTIVE);
                output.print("Tree");
@@ -341,7 +341,7 @@ public class HtmlDoclet
          if (outputHelpPage) {
             if (!optionNoHelp.getValue()) {
                output.print(" ");
-               
+
                if ("help".equals(currentPage)) {
                   output.beginSpan(CssClass.NAVBAR_ITEM_ACTIVE);
                   output.print("Help");
@@ -410,7 +410,7 @@ public class HtmlDoclet
       printNavBarTop(output, currentPage, null, null, null);
    }
 
-   private void printNavBarTop(HtmlPage output, String currentPage, 
+   private void printNavBarTop(HtmlPage output, String currentPage,
                                ClassDoc currentClass, Object prev, Object next)
    {
       if (!optionNoNavBar.getValue()) {
@@ -468,16 +468,16 @@ public class HtmlDoclet
 
             output.beginCell(CssClass.NAVBAR_TOP_NAVI);
             output.print("Summary: ");
-            
+
             if (currentClass.innerClasses().length > 0) {
-               output.anchor("#summary-inner", "Nested");               
+               output.anchor("#summary-inner", "Nested");
             }
             else {
                output.print("Nested");
             }
 
             output.print(" | ");
-            
+
             if (currentClass.fields().length > 0) {
                output.anchor("#summary-fields", "Field");
             }
@@ -486,7 +486,7 @@ public class HtmlDoclet
             }
 
             output.print(" | ");
-            
+
             if (currentClass.methods().length > 0) {
                output.anchor("#summary-methods", "Method");
             }
@@ -495,7 +495,7 @@ public class HtmlDoclet
             }
 
             output.print(" | ");
-            
+
             if (currentClass.constructors().length > 0) {
                output.anchor("#summary-constructors", "Constr");
             }
@@ -507,16 +507,16 @@ public class HtmlDoclet
 
             output.beginCell(CssClass.NAVBAR_TOP_NAVI);
             output.print("Detail: ");
-            
+
             if (currentClass.innerClasses().length > 0) {
-               output.anchor("#detail-inner", "Nested");               
+               output.anchor("#detail-inner", "Nested");
             }
             else {
                output.print("Nested");
             }
 
             output.print(" | ");
-            
+
             if (currentClass.fields().length > 0) {
                output.anchor("#detail-fields", "Field");
             }
@@ -525,7 +525,7 @@ public class HtmlDoclet
             }
 
             output.print(" | ");
-            
+
             if (currentClass.methods().length > 0) {
                output.anchor("#detail-methods", "Method");
             }
@@ -534,7 +534,7 @@ public class HtmlDoclet
             }
 
             output.print(" | ");
-            
+
             if (currentClass.constructors().length > 0) {
                output.anchor("#detail-constructors", "Constr");
             }
@@ -549,7 +549,7 @@ public class HtmlDoclet
       }
    }
 
-   private void printNavBarTopPackage(HtmlPage output, String currentPage, 
+   private void printNavBarTopPackage(HtmlPage output, String currentPage,
                                       PackageDoc prevPackage, PackageDoc nextPackage)
    {
       if (!optionNoNavBar.getValue()) {
@@ -637,7 +637,7 @@ public class HtmlDoclet
             ClassDoc classDoc = classDocs[i];
             if (classDoc.isIncluded()) {
                output.beginRow();
-            
+
                output.beginCell(CssClass.PACKAGE_SUMMARY_LEFT);
                printType(output, classDoc);
                output.endCell();
@@ -673,9 +673,9 @@ public class HtmlDoclet
       out.close();
    }
 
-   private void printPackagePage(File packageDir, String pathToRoot, 
-                                 PackageDoc packageDoc, 
-                                 PackageDoc prevPackageDoc, 
+   private void printPackagePage(File packageDir, String pathToRoot,
+                                 PackageDoc packageDoc,
+                                 PackageDoc prevPackageDoc,
                                  PackageDoc nextPackageDoc)
       throws IOException
    {
@@ -703,14 +703,14 @@ public class HtmlDoclet
       output.beginDiv(CssClass.PACKAGE_DESCRIPTION_TOP);
       printTags(output, packageDoc, packageDoc.firstSentenceTags(), true);
       output.endDiv(CssClass.PACKAGE_DESCRIPTION_TOP);
-      
-      printPackagePageClasses(output, packageDoc.interfaces(), 
+
+      printPackagePageClasses(output, packageDoc.interfaces(),
                               "Interface Summary");
-      printPackagePageClasses(output, packageDoc.ordinaryClasses(), 
+      printPackagePageClasses(output, packageDoc.ordinaryClasses(),
                               "Class Summary");
-      printPackagePageClasses(output, packageDoc.exceptions(), 
+      printPackagePageClasses(output, packageDoc.exceptions(),
                               "Exception Summary");
-      printPackagePageClasses(output, packageDoc.errors(), 
+      printPackagePageClasses(output, packageDoc.errors(),
                               "Error Summary");
 
       output.anchorName("description");
@@ -733,7 +733,7 @@ public class HtmlDoclet
       TreeNode(ClassDoc classDoc) {
          TreeNode.this.classDoc = classDoc;
       }
-      
+
       public boolean equals(Object other)
       {
          return classDoc.equals(((TreeNode)other).classDoc);
@@ -814,7 +814,7 @@ public class HtmlDoclet
       if (null != parentNode) {
          parentClassDoc = parentNode.classDoc;
       }
-      if (interfaces.length > 0 
+      if (interfaces.length > 0
           && !(interfaces.length == 1 && interfaces[0].equals(parentClassDoc))) {
          if (node.classDoc.isInterface()) {
             output.print(" (also implements ");
@@ -860,7 +860,7 @@ public class HtmlDoclet
    }
 
    private void printClassTree(HtmlPage output, ClassDoc[] classDocs)
-   {      
+   {
       Map classTreeMap = new HashMap();
 
       for (int i=0; i<classDocs.length; ++i) {
@@ -912,7 +912,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(packageDir,
                                              "tree" + filenameExtension),
                                     pathToRoot);
-      output.beginPage(getPageTitle(packageDoc.name() + " Hierarchy"), 
+      output.beginPage(getPageTitle(packageDoc.name() + " Hierarchy"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_PACKAGE_TREE);
@@ -936,7 +936,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "tree" + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("Hierarchy"), 
+      output.beginPage(getPageTitle("Hierarchy"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_FULL_TREE);
@@ -1053,31 +1053,31 @@ public class HtmlDoclet
                                              "index" + filenameExtension),
                                     ".",
                                     HtmlPage.DOCTYPE_FRAMESET);
-      
+
       String title = getWindowTitle();
       output.beginPage(title, getOutputCharset(), getStylesheets());
       output.beginElement("frameset", "cols", "20%,80%");
 
       String contentURL;
       if (isSinglePackage()) {
-         output.atomicElement("frame", 
-                              new String[] { "src", "name" }, 
+         output.atomicElement("frame",
+                              new String[] { "src", "name" },
                               new String[] { getPackageURL(getSinglePackage()) + "classes" + filenameExtension, "classes" });
          contentURL = getPackageURL(getSinglePackage()) + "package-summary.html";
       }
       else {
          output.beginElement("frameset", "rows", "25%,75%");
-         output.atomicElement("frame", 
-                              new String[] { "src", "name" }, 
+         output.atomicElement("frame",
+                              new String[] { "src", "name" },
                               new String[] { "all-packages" + filenameExtension, "packages" });
-         output.atomicElement("frame", 
-                              new String[] { "src", "name" }, 
+         output.atomicElement("frame",
+                              new String[] { "src", "name" },
                               new String[] { "all-classes" + filenameExtension, "classes" });
          output.endElement("frameset");
          contentURL = "overview-summary" + filenameExtension;
       }
-      output.atomicElement("frame", 
-                           new String[] { "src", "name" }, 
+      output.atomicElement("frame",
+                           new String[] { "src", "name" },
                            new String[] { contentURL, "content" });
       output.endElement("frameset");
       output.endPage();
@@ -1134,7 +1134,7 @@ public class HtmlDoclet
    {
       CssClass entryClass;
       if (classDoc.isInterface()) {
-         entryClass = CssClass.CLASS_MENU_ENTRY_INTERFACE;        
+         entryClass = CssClass.CLASS_MENU_ENTRY_INTERFACE;
       }
       else {
          entryClass = CssClass.CLASS_MENU_ENTRY_CLASS;
@@ -1228,7 +1228,7 @@ public class HtmlDoclet
                                              "classes" + filenameExtension),
                                     pathToRoot);
 
-      output.beginPage(getPageTitle(packageDoc.name() + " Class Menu"), 
+      output.beginPage(getPageTitle(packageDoc.name() + " Class Menu"),
                        getOutputCharset(), getStylesheets());
       output.beginBody(CssClass.BODY_MENU_CLASSES, false);
 
@@ -1280,7 +1280,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              pageName + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("Alphabetical Index"), 
+      output.beginPage(getPageTitle("Alphabetical Index"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_INDEX);
@@ -1289,7 +1289,7 @@ public class HtmlDoclet
       }
       else {
          printNavBarTop(output, "split-index", null,
-                        (index > 1) ? new Integer(index - 1) : null, 
+                        (index > 1) ? new Integer(index - 1) : null,
                         (index < maxIndex) ? new Integer(index + 1) : null);
       }
 
@@ -1319,7 +1319,7 @@ public class HtmlDoclet
                }
                output.print(c.toString());
                output.endAnchor();
-               output.endSpan(CssClass.INDEX_LETTER);     
+               output.endSpan(CssClass.INDEX_LETTER);
                output.beginSpan(CssClass.INDEX_LETTER_SPACER);
                output.print(" ");
                output.endSpan(CssClass.INDEX_LETTER_SPACER);
@@ -1375,7 +1375,7 @@ public class HtmlDoclet
          while (it.hasNext()) {
             Doc doc = (Doc)it.next();
             output.beginRow();
-            
+
             output.beginCell(CssClass.DEPRECATION_SUMMARY_LEFT);
             if (doc instanceof Type) {
                printType(output, (Type)doc);
@@ -1412,7 +1412,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "serialized-form" + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("Serialized Form"), 
+      output.beginPage(getPageTitle("Serialized Form"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_DEPRECATED);
@@ -1466,12 +1466,12 @@ public class HtmlDoclet
                      output.endDiv(CssClass.SERIALIZED_SVUID_OUTER);
                   }
                }
-               printMemberDetails(output, 
-                                  classDoc.serializationMethods(), 
+               printMemberDetails(output,
+                                  classDoc.serializationMethods(),
                                   "Serialization Methods",
                                   true, null);
-               printMemberDetails(output, 
-                                  classDoc.serializableFields(), 
+               printMemberDetails(output,
+                                  classDoc.serializableFields(),
                                   "Serialized Fields",
                                   true, null);
             }
@@ -1492,7 +1492,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "deprecated" + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("Deprecated API"), 
+      output.beginPage(getPageTitle("Deprecated API"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_DEPRECATED);
@@ -1628,7 +1628,7 @@ public class HtmlDoclet
          output.beginDiv(CssClass.DEPRECATION_EMPTY);
          output.print("No deprecated classes or class members in this API.");
          output.endDiv(CssClass.DEPRECATION_EMPTY);
-         
+
       }
 
       printNavBarBottom(output, "deprecated");
@@ -1643,7 +1643,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "about" + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("About"), 
+      output.beginPage(getPageTitle("About"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_ABOUT);
@@ -1663,10 +1663,10 @@ public class HtmlDoclet
       output.endAnchor();
       output.print(", on ");
       DateFormat format = DateFormat.getDateTimeInstance(DateFormat.LONG,
-							 DateFormat.LONG,
-							 Locale.US);
+                                                         DateFormat.LONG,
+                                                         Locale.US);
       Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"),
-					  Locale.US);
+                                          Locale.US);
       format.setCalendar(cal);
       output.print(format.format(new Date()));
       output.print(".");
@@ -1682,10 +1682,10 @@ public class HtmlDoclet
    private void printSourcePage(File packageDir, ClassDoc classDoc, String sourceXhtml)
       throws IOException
    {
-      HtmlPage output = newHtmlPage(new File(packageDir, 
+      HtmlPage output = newHtmlPage(new File(packageDir,
                                              classDoc.name() + "-source" + filenameExtension),
                                     getPathToRoot(packageDir, getTargetDirectory()));
-      output.beginPage(getPageTitle("Source for " + classDoc.qualifiedTypeName()), 
+      output.beginPage(getPageTitle("Source for " + classDoc.qualifiedTypeName()),
                        getOutputCharset(),
                        getStylesheets());
 
@@ -1712,7 +1712,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "help" + filenameExtension),
                                     ".");
-      output.beginPage(getPageTitle("Help"), 
+      output.beginPage(getPageTitle("Help"),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_HELP);
@@ -1720,7 +1720,7 @@ public class HtmlDoclet
       printNavBarTop(output, "help");
 
       InputStream helpIn;
-      if (null != optionHelpFile.getValue()){ 
+      if (null != optionHelpFile.getValue()){
          helpIn = new FileInputStream(optionHelpFile.getValue());
       }
       else {
@@ -1742,7 +1742,7 @@ public class HtmlDoclet
       HtmlPage output = newHtmlPage(new File(getTargetDirectory(),
                                              "overview-summary" + filenameExtension),
                                     ".");
-      output.beginPage(getWindowTitle(), 
+      output.beginPage(getWindowTitle(),
                        getOutputCharset(),
                        getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_OVERVIEW);
@@ -1771,7 +1771,7 @@ public class HtmlDoclet
       List packageGroups = getPackageGroups();
 
       if (packageGroups.isEmpty()) {
-      
+
          printOverviewPackages(output, getAllPackages(),
                                "All Packages");
       }
@@ -1782,14 +1782,14 @@ public class HtmlDoclet
          Iterator it = packageGroups.iterator();
          while (it.hasNext()) {
             PackageGroup packageGroup = (PackageGroup)it.next();
-            printOverviewPackages(output, 
+            printOverviewPackages(output,
                                   packageGroup.getPackages(),
                                   packageGroup.getName());
             otherPackages.removeAll(packageGroup.getPackages());
          }
 
          if (!otherPackages.isEmpty()) {
-            printOverviewPackages(output, 
+            printOverviewPackages(output,
                                   otherPackages,
                                   "Other Packages");
          }
@@ -1816,7 +1816,7 @@ public class HtmlDoclet
       while (it.hasNext()) {
          PackageDoc packageDoc = (PackageDoc)it.next();
          output.beginRow();
-         
+
          output.beginCell(CssClass.OVERVIEW_SUMMARY_LEFT);
          output.beginAnchor(getPackageURL(packageDoc) + "package-summary" + filenameExtension);
          output.print(packageDoc.name());
@@ -1842,8 +1842,8 @@ public class HtmlDoclet
       output.beginBody(CssClass.BODY_CONTENT_USES);
       printNavBarTop(output, "uses", classDoc, null, null);
 
-      output.div(CssClass.USAGE_TITLE, 
-                 "Uses of " + getClassTypeName(classDoc) 
+      output.div(CssClass.USAGE_TITLE,
+                 "Uses of " + getClassTypeName(classDoc)
                  + " " + classDoc.qualifiedName());
 
       Map packageToUsageTypeMap = getUsageOfClass(classDoc);
@@ -1859,9 +1859,9 @@ public class HtmlDoclet
             Iterator usageTypeIterator = usageTypeToUsersMap.keySet().iterator();
             while (usageTypeIterator.hasNext()) {
                UsageType usageType = (UsageType)usageTypeIterator.next();
-               
+
                output.beginTable(CssClass.USAGE_SUMMARY, new String[] { "border", "width" }, new String[] { "1", "100%" });
-               output.rowDiv(CssClass.USAGE_TABLE_HEADER, format("usagetype." + usageType.getId(), 
+               output.rowDiv(CssClass.USAGE_TABLE_HEADER, format("usagetype." + usageType.getId(),
                                                                  classDoc.qualifiedName()));
 
                Set users = (Set)usageTypeToUsersMap.get(usageType);
@@ -1939,7 +1939,7 @@ public class HtmlDoclet
                      printParameters(output, (ExecutableMemberDoc)user);
                      output.endDiv(CssClass.USAGE_SUMMARY_SYNOPSIS);
                      output.beginDiv(CssClass.USAGE_SUMMARY_DESCRIPTION);
-                     printTags(output, ((ConstructorDoc)user), 
+                     printTags(output, ((ConstructorDoc)user),
                                ((ConstructorDoc)user).firstSentenceTags(), true);
                      output.endDiv(CssClass.USAGE_SUMMARY_DESCRIPTION);
                      output.endCell();
@@ -1953,7 +1953,7 @@ public class HtmlDoclet
       }
       else {
          output.div(CssClass.USAGE_EMPTY,
-                    getClassTypeName(classDoc) 
+                    getClassTypeName(classDoc)
                     + " " + classDoc.qualifiedName() + " is not used by any class in this documentation set.");
       }
       printNavBarBottom(output, "uses", classDoc);
@@ -1989,7 +1989,7 @@ public class HtmlDoclet
       }
    }
 
-   private static boolean isSubInterface(ClassDoc classDoc, ClassDoc otherClassDoc) 
+   private static boolean isSubInterface(ClassDoc classDoc, ClassDoc otherClassDoc)
    {
       ClassDoc[] interfaces = otherClassDoc.interfaces();
       for (int i=0; i<interfaces.length; ++i) {
@@ -2004,8 +2004,8 @@ public class HtmlDoclet
    }
 
    private void printCommaSeparatedTypes(HtmlPage output,
-                                         Collection list, 
-                                         String header, 
+                                         Collection list,
+                                         String header,
                                          CssClass cssClass)
    {
       if (!list.isEmpty()) {
@@ -2025,7 +2025,7 @@ public class HtmlDoclet
       }
    }
 
-   private void printClassPage(File packageDir, String pathToRoot, 
+   private void printClassPage(File packageDir, String pathToRoot,
                                ClassDoc classDoc, ClassDoc prevClassDoc, ClassDoc nextClassDoc)
       throws IOException
    {
@@ -2048,19 +2048,19 @@ public class HtmlDoclet
          }
       }
       String parameters = getTypeParameters(classDoc);
-      
+
       output.beginPage(getPageTitle(classDoc.name()), getOutputCharset(),
                        keywords, getStylesheets());
       output.beginBody(CssClass.BODY_CONTENT_CLASS);
       printNavBarTop(output, "class", classDoc, prevClassDoc, nextClassDoc);
-      
+
       output.beginDiv(CssClass.CLASS_TITLE);
-      output.div(CssClass.CLASS_TITLE_PACKAGE, 
+      output.div(CssClass.CLASS_TITLE_PACKAGE,
                  classDoc.containingPackage().name());
-      output.div(CssClass.CLASS_TITLE_CLASS, 
-                 getClassTypeName(classDoc) 
+      output.div(CssClass.CLASS_TITLE_CLASS,
+                 getClassTypeName(classDoc)
                  + " " + classDoc.name()
-		 + parameters);
+                 + parameters);
       output.endDiv(CssClass.CLASS_TITLE);
 
       boolean needSep = false;
@@ -2071,17 +2071,17 @@ public class HtmlDoclet
             = (InterfaceRelation)getInterfaceRelations().get(classDoc);
 
          printCommaSeparatedTypes(output,
-                                  relation.superInterfaces, 
+                                  relation.superInterfaces,
                                   "All Superinterfaces:",
                                   CssClass.CLASS_KNOWNIMPLEMENTING);
 
          printCommaSeparatedTypes(output,
-                                  relation.subInterfaces, 
+                                  relation.subInterfaces,
                                   "Known Subinterfaces:",
                                   CssClass.CLASS_KNOWNIMPLEMENTING);
 
          printCommaSeparatedTypes(output,
-                                  relation.implementingClasses, 
+                                  relation.implementingClasses,
                                   "Known Implementing Classes:",
                                   CssClass.CLASS_KNOWNIMPLEMENTING);
 
@@ -2089,7 +2089,7 @@ public class HtmlDoclet
             || !relation.subInterfaces.isEmpty()
             || !relation.implementingClasses.isEmpty();
       }
-      else {   
+      else {
          needSep = true;
 
          if (!"java.lang.Object".equals(classDoc.qualifiedName())) {
@@ -2102,7 +2102,7 @@ public class HtmlDoclet
             printSuperTreeRec(output, superClasses.listIterator(superClasses.size()), 0);
             output.endElement("ul");
             output.endDiv(CssClass.CLASS_INHERITANCETREE);
-            
+
             if (null != classDoc.containingClass()) {
                output.beginDiv(CssClass.CLASS_ENCLOSINGCLASS);
                output.div(CssClass.CLASS_ENCLOSINGCLASS_HEADER, "Enclosing Class:");
@@ -2115,7 +2115,7 @@ public class HtmlDoclet
             Set implementedInterfaces = getImplementedInterfaces(classDoc);
 
             printCommaSeparatedTypes(output,
-                                     implementedInterfaces, 
+                                     implementedInterfaces,
                                      "Implemented Interfaces:",
                                      CssClass.CLASS_KNOWNIMPLEMENTING);
 
@@ -2145,7 +2145,7 @@ public class HtmlDoclet
 
       output.beginDiv(CssClass.CLASS_SYNOPSIS);
       output.beginDiv(CssClass.CLASS_SYNOPSIS_DECLARATION);
-      output.print(getFullModifiers(classDoc) + ' ' + getClassTypeKeyword(classDoc) 
+      output.print(getFullModifiers(classDoc) + ' ' + getClassTypeKeyword(classDoc)
                    + ' ');
       output.beginSpan(CssClass.CLASS_SYNOPSIS_NAME);
       if (optionLinkSource.getValue() && null != classDoc.position()) {
@@ -2207,7 +2207,7 @@ public class HtmlDoclet
          if (!classDoc.isInterface()) {
             ClassDoc superClassDoc = classDoc.superclass();
             while (null != superClassDoc
-                   && (!haveInheritedFields 
+                   && (!haveInheritedFields
                        || !haveInheritedMethods
                        || !haveInheritedClasses)) {
                if (superClassDoc.fields().length > 0) {
@@ -2223,8 +2223,8 @@ public class HtmlDoclet
             }
          }
       }
-      
-      printProgramElementDocs(output, getSortedInnerClasses(classDoc), 
+
+      printProgramElementDocs(output, getSortedInnerClasses(classDoc),
                               "Nested Class Summary", haveInheritedClasses,
                               "summary-inner");
 
@@ -2238,7 +2238,7 @@ public class HtmlDoclet
          }
       }
 
-      printProgramElementDocs(output, getSortedFields(classDoc), 
+      printProgramElementDocs(output, getSortedFields(classDoc),
                               "Field Summary", haveInheritedFields,
                               "summary-fields");
 
@@ -2255,7 +2255,7 @@ public class HtmlDoclet
       {
          Iterator it = implementedInterfaces.iterator();
          while (it.hasNext()) {
-            ClassDoc implementedInterface 
+            ClassDoc implementedInterface
                = (ClassDoc)it.next();
             if (!"java.io.Serializable".equals(implementedInterface.qualifiedName())
                 && !"java.io.Externalizable".equals(implementedInterface.qualifiedName())) {
@@ -2263,10 +2263,10 @@ public class HtmlDoclet
                                      "Fields inherited from interface {0}",
                                      implementedInterface);
             }
-         } 
+         }
       }
 
-      printProgramElementDocs(output, getSortedConstructors(classDoc), 
+      printProgramElementDocs(output, getSortedConstructors(classDoc),
                               "Constructor Summary", false,
                               "summary-constructors");
       printProgramElementDocs(output, getSortedMethods(classDoc),
@@ -2274,7 +2274,7 @@ public class HtmlDoclet
                               "summary-methods");
 
       if (classDoc.isInterface()) {
-         InterfaceRelation relation 
+         InterfaceRelation relation
             = (InterfaceRelation)getInterfaceRelations().get(classDoc);
          Iterator it = relation.superInterfaces.iterator();
          while (it.hasNext()) {
@@ -2294,9 +2294,9 @@ public class HtmlDoclet
          }
       }
 
-      printMemberDetails(output, getSortedFields(classDoc), 
+      printMemberDetails(output, getSortedFields(classDoc),
                          "Field Details", false, "detail-fields");
-      printMemberDetails(output, getSortedConstructors(classDoc), 
+      printMemberDetails(output, getSortedConstructors(classDoc),
                          "Constructor Details", false, "detail-constructors");
       printMemberDetails(output, getSortedMethods(classDoc),
                          "Method Details", false, "detail-methods");
@@ -2309,7 +2309,7 @@ public class HtmlDoclet
    }
 
    private void printInheritedMembers(HtmlPage output,
-                                      ProgramElementDoc[] memberDocs, 
+                                      ProgramElementDoc[] memberDocs,
                                       String headerFormat,
                                       ClassDoc superclass)
    {
@@ -2325,9 +2325,9 @@ public class HtmlDoclet
          else {
             superclassLink = createTypeHref(output, superclass, true);
          }
-         output.rowDiv(CssClass.TABLE_SUB_HEADER, 
-                       new MessageFormat(headerFormat).format(new Object[] { 
-                          superclassLink 
+         output.rowDiv(CssClass.TABLE_SUB_HEADER,
+                       new MessageFormat(headerFormat).format(new Object[] {
+                          superclassLink
                        }));
 
          output.beginRow();
@@ -2343,7 +2343,7 @@ public class HtmlDoclet
             }
             else if (memberDoc.isInterface()) {
                title = "interface " + ((ClassDoc)memberDoc).qualifiedName();
-            } 
+            }
             else if (memberDoc.isClass()) {
                title = "class " + ((ClassDoc)memberDoc).qualifiedName();
             }
@@ -2360,7 +2360,7 @@ public class HtmlDoclet
       }
    }
 
-   private void collectSpecifiedByRecursive(Set specifyingInterfaces, 
+   private void collectSpecifiedByRecursive(Set specifyingInterfaces,
                                             ClassDoc classDoc,
                                             MethodDoc methodDoc)
    {
@@ -2433,7 +2433,7 @@ public class HtmlDoclet
                else {
                   type = ((FieldDoc)memberDoc).type();
                }
-               
+
                synopsis.append(" ");
                synopsisLength ++;
                synopsis.append(createTypeHref(output, type, false));
@@ -2527,14 +2527,14 @@ public class HtmlDoclet
                   Set specifyingInterfaces = new LinkedHashSet();
                   if (memberDoc.containingClass().isInterface()) {
                      collectSpecifiedByRecursive(specifyingInterfaces,
-                                                 memberDoc.containingClass(), 
+                                                 memberDoc.containingClass(),
                                                  (MethodDoc)memberDoc);
                   }
                   else {
                      for (ClassDoc cd = memberDoc.containingClass();
                           null != cd; cd = cd.superclass()) {
                         collectSpecifiedByRecursive(specifyingInterfaces,
-                                                    cd, 
+                                                    cd,
                                                     (MethodDoc)memberDoc);
                      }
                   }
@@ -2547,7 +2547,7 @@ public class HtmlDoclet
                      while (it.hasNext()) {
                         MethodDoc specifyingInterfaceMethod = (MethodDoc)it.next();
                         output.beginDiv(CssClass.MEMBER_DETAIL_SPECIFIED_BY_ITEM);
-                        output.beginAnchor(getMemberDocURL(output, 
+                        output.beginAnchor(getMemberDocURL(output,
                                                            specifyingInterfaceMethod));
                         output.print(memberDoc.name());
                         output.endAnchor();
@@ -2557,14 +2557,14 @@ public class HtmlDoclet
                      }
                      output.endDiv(CssClass.MEMBER_DETAIL_SPECIFIED_BY_LIST);
                   }
-                  
+
                   ClassDoc overriddenClassDoc = null;
                   MemberDoc specifyingSuperMethod = null;
 
                   for (ClassDoc superclassDoc = memberDoc.containingClass().superclass();
                        null != superclassDoc && null == overriddenClassDoc;
                        superclassDoc = superclassDoc.superclass()) {
-                     
+
                      MethodDoc[] methods = superclassDoc.methods();
                      for (int j=0; j<methods.length; ++j) {
                         if (methods[j].name().equals(memberDoc.name())
@@ -2581,7 +2581,7 @@ public class HtmlDoclet
                      output.div(CssClass.MEMBER_DETAIL_OVERRIDDEN_HEADER, "Overrides:");
                      output.beginDiv(CssClass.MEMBER_DETAIL_OVERRIDDEN_ITEM);
 
-                     output.beginAnchor(getMemberDocURL(output, 
+                     output.beginAnchor(getMemberDocURL(output,
                                                         specifyingSuperMethod));
                      output.print(memberDoc.name());
                      output.endAnchor();
@@ -2612,7 +2612,7 @@ public class HtmlDoclet
                               break;
                            }
                         }
-                     
+
                         if (null != paramTag) {
                            output.beginDiv(CssClass.MEMBER_DETAIL_PARAMETER_ITEM);
                            output.beginSpan(CssClass.MEMBER_DETAIL_PARAMETER_ITEM_NAME);
@@ -2630,7 +2630,7 @@ public class HtmlDoclet
                      output.endDiv(CssClass.MEMBER_DETAIL_PARAMETER_LIST);
                   }
 
-                  if (execMemberDoc.isMethod() 
+                  if (execMemberDoc.isMethod()
                       && !"void".equals(((MethodDoc)execMemberDoc).returnType().typeName())) {
 
                      Tag[] returnTags = execMemberDoc.tags("return");
@@ -2697,7 +2697,7 @@ public class HtmlDoclet
                   if (null != fieldDoc.constantValue()) {
                      output.beginDiv(CssClass.MEMBER_DETAIL_THROWN_LIST);
                      output.div(CssClass.MEMBER_DETAIL_THROWN_HEADER, "Field Value:");
-                     output.div(CssClass.MEMBER_DETAIL_THROWN_ITEM, 
+                     output.div(CssClass.MEMBER_DETAIL_THROWN_ITEM,
                                 fieldDoc.constantValueExpression().toString());
                      output.endDiv(CssClass.MEMBER_DETAIL_THROWN_LIST);
                   }
@@ -2731,7 +2731,7 @@ public class HtmlDoclet
    }
 
    private void printProgramElementDocs(HtmlPage output,
-                                        ProgramElementDoc[] memberDocs, 
+                                        ProgramElementDoc[] memberDocs,
                                         String header,
                                         boolean forceOutputHeader,
                                         String anchor)
@@ -2815,7 +2815,7 @@ public class HtmlDoclet
       }
    }
 
-   private void printTag(final HtmlPage output, 
+   private void printTag(final HtmlPage output,
                          HtmlRepairer repairer,
                          Tag tag, boolean firstSentence,
                          boolean inline,
@@ -2844,7 +2844,7 @@ public class HtmlDoclet
       /*
       if (!optionNoComment.getValue()) {
          output.print(renderInlineTags(tag.firstSentenceTags(), output));
-         HtmlRepairer repairer = new HtmlRepairer(getRootDoc(), 
+         HtmlRepairer repairer = new HtmlRepairer(getRootDoc(),
                                                   true, false,
                                                   null, null,
                                                   true);
@@ -2858,9 +2858,9 @@ public class HtmlDoclet
 
    private String getClassDocURL(HtmlPage output, ClassDoc classDoc)
    {
-      return output.getPathToRoot() 
+      return output.getPathToRoot()
          + "/"
-         + getPackageURL(classDoc.containingPackage()) 
+         + getPackageURL(classDoc.containingPackage())
          + classDoc.name() + filenameExtension;
    }
 
@@ -2905,7 +2905,7 @@ public class HtmlDoclet
          if (type.qualifiedTypeName().length() > type.typeName().length()) {
             String packageName = type.qualifiedTypeName();
             packageName = packageName.substring(0, packageName.length() - type.typeName().length() - 1);
-            
+
             ExternalDocSet externalDocSet
                = (ExternalDocSet)packageNameToDocSet.get(packageName);
             if (null != externalDocSet) {
@@ -2915,9 +2915,9 @@ public class HtmlDoclet
       }
 
       StringBuffer result = new StringBuffer();
-      
+
       if (null != url && null != asClassDoc) {
-	String parameters = getTypeParameters(asClassDoc);
+        String parameters = getTypeParameters(asClassDoc);
          if (fullyQualified) {
             result.append(output.createHrefString(url,possiblyQualifiedName(asClassDoc) + parameters));
          }
@@ -2936,7 +2936,7 @@ public class HtmlDoclet
       return result.toString();
    }
 
-   private void printTaglets(final HtmlPage output, Tag[] tags, TagletContext context) 
+   private void printTaglets(final HtmlPage output, Tag[] tags, TagletContext context)
    {
       super.printMainTaglets(tags, context, new TagletPrinter() {
             public void printTagletString(String tagletString) {
@@ -2977,7 +2977,7 @@ public class HtmlDoclet
          externalDocSet = (ExternalDocSet)packageNameToDocSet.get(classDoc.containingPackage().name());
       }
       if (null != externalDocSet) {
-         return externalDocSet.getClassDocURL(classDoc.containingPackage().name(), 
+         return externalDocSet.getClassDocURL(classDoc.containingPackage().name(),
                                               classDoc.name());
       }
       else {
@@ -3006,7 +3006,7 @@ public class HtmlDoclet
          Iterator it = externalDocSets.iterator();
          while (it.hasNext()) {
             ExternalDocSet externalDocSet = (ExternalDocSet)it.next();
-            printNotice("Fetching package list for external documentation set.");     
+            printNotice("Fetching package list for external documentation set.");
             try {
                externalDocSet.load(getTargetDirectory());
                if (!isJavadocCompatibleNames() && externalDocSet.isJavadocCompatible()
@@ -3081,7 +3081,7 @@ public class HtmlDoclet
                                     resourceName);
          InputStream in = getClass().getResourceAsStream("/htmldoclet/" + resourceName);
          if (in == null) {
-        	in = new FileInputStream("src/resources/htmldoclet/" + resourceName);
+                in = new FileInputStream("src/resources/htmldoclet/" + resourceName);
          }
          FileOutputStream out = new FileOutputStream(targetFile);
          IOToolkit.copyStream(in, out);
@@ -3091,7 +3091,7 @@ public class HtmlDoclet
 
       // Copy stylesheets
 
-      if (null != optionAddStylesheet.getValue()) { 
+      if (null != optionAddStylesheet.getValue()) {
          File addStylesheetTargetFile = new File(resourcesDir,
                                                  "user.css");
 
@@ -3099,7 +3099,7 @@ public class HtmlDoclet
                             addStylesheetTargetFile);
       }
 
-      if (null != optionStylesheetFile.getValue()) { 
+      if (null != optionStylesheetFile.getValue()) {
          File stylesheetTargetFile = new File(resourcesDir,
                                               "user.css");
 
@@ -3167,7 +3167,7 @@ public class HtmlDoclet
          for (int j=0; j<classDocs.length; ++j) {
             ClassDoc classDoc = classDocs[j];
             if (classDoc.isIncluded()) {
-               printClassPage(packageDir, pathToRoot, 
+               printClassPage(packageDir, pathToRoot,
                               classDocs[j],
                               (j > 0) ? classDocs[j - 1] : null,
                               (j < classDocs.length - 1) ? classDocs[j + 1] : null
@@ -3184,13 +3184,13 @@ public class HtmlDoclet
                      properties.setProperty("isCodeSnippet", "true");
                      properties.setProperty("hasLineNumbers", "true");
                      java2xhtml.setProperties(properties);
-                     
+
                      StringWriter sourceBuffer = new StringWriter();
                      FileReader sourceReader = new FileReader(sourceFile);
                      IOToolkit.copyStream(sourceReader, sourceBuffer);
                      sourceReader.close();
                      String result = java2xhtml.makeHTML(sourceBuffer.getBuffer(), sourceFile.getName());
-                     
+
                      printSourcePage(packageDir,
                                      classDoc,
                                      result);
@@ -3220,7 +3220,7 @@ public class HtmlDoclet
       return result.toString();
    }
 
-   private String getClassTypeName(ClassDoc classDoc) 
+   private String getClassTypeName(ClassDoc classDoc)
    {
       if (classDoc.isInterface()) {
          return "Interface";
@@ -3230,7 +3230,7 @@ public class HtmlDoclet
       }
    }
 
-   private String getClassTypeKeyword(ClassDoc classDoc) 
+   private String getClassTypeKeyword(ClassDoc classDoc)
    {
       if (classDoc.isInterface()) {
          return "interface";
@@ -3311,63 +3311,63 @@ public class HtmlDoclet
       return options;
    }
 
-   private DocletOptionFlag optionNoNavBar = 
+   private DocletOptionFlag optionNoNavBar =
      new DocletOptionFlag("-nonavbar");
 
-   private DocletOptionFlag optionNoTree = 
+   private DocletOptionFlag optionNoTree =
      new DocletOptionFlag("-notree");
 
-   private DocletOptionFlag optionNoDeprecatedList = 
+   private DocletOptionFlag optionNoDeprecatedList =
      new DocletOptionFlag("-nodeprecatedlist");
 
-   private DocletOptionFlag optionNoIndex = 
+   private DocletOptionFlag optionNoIndex =
      new DocletOptionFlag("-noindex");
 
-   private DocletOptionFlag optionUse = 
+   private DocletOptionFlag optionUse =
      new DocletOptionFlag("-use");
 
-   private DocletOptionFlag optionNoHelp = 
+   private DocletOptionFlag optionNoHelp =
      new DocletOptionFlag("-nohelp");
 
-   private DocletOptionFlag optionNoComment = 
+   private DocletOptionFlag optionNoComment =
      new DocletOptionFlag("-nocomment");
 
-   private DocletOptionFlag optionSerialWarn = 
+   private DocletOptionFlag optionSerialWarn =
      new DocletOptionFlag("-serialwarn");
 
-   private DocletOptionFlag optionSplitIndex = 
+   private DocletOptionFlag optionSplitIndex =
      new DocletOptionFlag("-splitindex");
 
-   private DocletOptionString optionHeader = 
+   private DocletOptionString optionHeader =
      new DocletOptionString("-header");
 
-   private DocletOptionString optionFooter = 
+   private DocletOptionString optionFooter =
      new DocletOptionString("-footer");
 
-   private DocletOptionString optionBottom = 
+   private DocletOptionString optionBottom =
      new DocletOptionString("-bottom");
 
-   private DocletOptionString optionWindowTitle = 
+   private DocletOptionString optionWindowTitle =
      new DocletOptionString("-windowtitle");
 
-   private DocletOptionString optionDocTitle = 
+   private DocletOptionString optionDocTitle =
      new DocletOptionString("-doctitle");
 
-   private DocletOptionString optionTitle = 
+   private DocletOptionString optionTitle =
      new DocletOptionString("-title");
 
-   private DocletOptionFile optionHelpFile = 
+   private DocletOptionFile optionHelpFile =
      new DocletOptionFile("-helpfile");
 
-   private DocletOptionFile optionStylesheetFile = 
+   private DocletOptionFile optionStylesheetFile =
      new DocletOptionFile("-stylesheetfile");
 
-   private DocletOptionFlag optionLinkSource = 
+   private DocletOptionFlag optionLinkSource =
      new DocletOptionFlag("-linksource");
 
-   private DocletOption optionLink = 
+   private DocletOption optionLink =
      new DocletOption("-link") {
-        
+
         public int getLength()
         {
            return 2;
@@ -3380,9 +3380,9 @@ public class HtmlDoclet
         }
      };
 
-   private DocletOption optionLinkOffline = 
+   private DocletOption optionLinkOffline =
      new DocletOption("-linkoffline") {
-        
+
         public int getLength()
         {
            return 3;
@@ -3404,16 +3404,16 @@ public class HtmlDoclet
    private DocletOptionString optionCharset =
      new DocletOptionString("-charset");
 
-   private DocletOptionFile optionAddStylesheet = 
+   private DocletOptionFile optionAddStylesheet =
      new DocletOptionFile("-addstylesheet");
 
-   private DocletOptionFlag optionValidHtml = 
+   private DocletOptionFlag optionValidHtml =
      new DocletOptionFlag("-validhtml");
 
-   private DocletOptionString optionBaseUrl = 
+   private DocletOptionString optionBaseUrl =
      new DocletOptionString("-baseurl");
 
-   private DocletOption[] options = 
+   private DocletOption[] options =
       {
          optionNoNavBar,
          optionNoTree,
@@ -3497,7 +3497,7 @@ public class HtmlDoclet
    {
       StringBuffer result = new StringBuffer();
 
-      HtmlRepairer repairer = new HtmlRepairer(getRootDoc(), 
+      HtmlRepairer repairer = new HtmlRepairer(getRootDoc(),
                                                true, false,
                                                null, null,
                                                true);
@@ -3515,7 +3515,7 @@ public class HtmlDoclet
          else if ("@linkplain".equals(tag.name())) {
             result.append(renderSeeTag((SeeTag)tag, context, true));
          }
-         else if ("@docRoot".equals(tag.name())) {         
+         else if ("@docRoot".equals(tag.name())) {
             result.append(((HtmlTagletContext)context).getOutput().getPathToRoot());
          }
          else {
@@ -3615,7 +3615,7 @@ public class HtmlDoclet
                if (null != referencedMemberName) {
                   label += '.';
                   label += referencedMemberName;
-                  href  += '#' + transformReferencedMemberName(referencedMemberName, 
+                  href  += '#' + transformReferencedMemberName(referencedMemberName,
                                                                externalDocSet.isJavadocCompatible());
                }
                else if (null != seeTag.referencedMemberName()) {
@@ -3624,7 +3624,7 @@ public class HtmlDoclet
             }
          }
       }
-      
+
       if (null != seeTag.label()
           && seeTag.label().length() > 0) {
          label = seeTag.label();
@@ -3640,7 +3640,7 @@ public class HtmlDoclet
          }
          label.trim();
       }
-         
+
       if (null != href) {
          result.append("<a href=\"");
          result.append(href);
@@ -3676,7 +3676,7 @@ public class HtmlDoclet
               || (doc.isClass()
                   && (((ClassDoc)doc).isSerializable()
                       || ((ClassDoc)doc).isExternalizable())))) {
-         
+
          StringBuffer result = new StringBuffer();
          result.append("<dl class=\"tag list\">");
          result.append("<dt class=\"tag section header\"><b>");
@@ -3719,7 +3719,7 @@ public class HtmlDoclet
          result.append("</dl>");
          return result.toString();
       }
-      else if (tags.length > 0 
+      else if (tags.length > 0
                && "serial".equals(tagName)
                && ((HtmlTagletContext)context).isOnSerializedPage()) {
 
@@ -3762,8 +3762,8 @@ public class HtmlDoclet
    {
       Map sheets = new HashMap();
       if (null != optionStylesheetFile.getValue()) {
-         sheets.put("User-specified", new String[] { 
-            "resources/user.css" 
+         sheets.put("User-specified", new String[] {
+            "resources/user.css"
          });
       }
       else {
@@ -3783,7 +3783,7 @@ public class HtmlDoclet
       if (getRootDoc().firstSentenceTags().length > 0) {
          return false;
       }
-      else if (null != optionDocTitle.getValue() 
+      else if (null != optionDocTitle.getValue()
                || null != optionTitle.getValue()) {
          return false;
       }
@@ -3798,25 +3798,25 @@ public class HtmlDoclet
     TypeVariable[] params = classDoc.typeParameters();
     if (params != null && params.length > 0)
       {
-	parameters = "<";
-	for (int a = 0; a < params.length; ++a)
-	  {
-	    parameters += params[a].typeName();
-	    Type[] bounds = params[a].bounds();
-	    if (bounds != null)
-	      {
-		parameters += " extends ";
-		for (int b = 0; a < bounds.length; ++b)
-		  {
-		    parameters += bounds[a];
-		    if (b != bounds.length - 1)
-		      parameters += " & ";
-		  }
-	      }
-	    if (a != params.length - 1)
-	      parameters += ",";
-	  }
-	parameters += ">";
+        parameters = "<";
+        for (int a = 0; a < params.length; ++a)
+          {
+            parameters += params[a].typeName();
+            Type[] bounds = params[a].bounds();
+            if (bounds != null)
+              {
+                parameters += " extends ";
+                for (int b = 0; a < bounds.length; ++b)
+                  {
+                    parameters += bounds[a];
+                    if (b != bounds.length - 1)
+                      parameters += " & ";
+                  }
+              }
+            if (a != params.length - 1)
+              parameters += ",";
+          }
+        parameters += ">";
       }
     return parameters;
   }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java
index e833627fda0..0315cb5dfe4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlPage.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -63,7 +63,7 @@ import com.sun.javadoc.Tag;
  *  Allows outputting an HTML document without having to build the
  *  document tree in-memory.
  */
-public class HtmlPage 
+public class HtmlPage
 {
    private File file;
    private PrintWriter out;
@@ -207,7 +207,7 @@ public class HtmlPage
       print('>');
    }
 
-   
+
    public void beginDiv(CssClass cssClass)
    {
       String[] divAttributeNames = cssClass.getAttributeNames();
@@ -221,7 +221,7 @@ public class HtmlPage
 
       String[] attributeNames = new String[1 + divAttributeNames.length];
       String[] attributeValues = new String[1 + divAttributeValues.length];
-      
+
       System.arraycopy(divAttributeNames, 0, attributeNames, 1, divAttributeNames.length);
       System.arraycopy(divAttributeValues, 0, attributeValues, 1, divAttributeNames.length);
 
@@ -261,7 +261,7 @@ public class HtmlPage
    {
       atomicElement("br");
    }
-   
+
    public void print(String text)
    {
       out.print(text);
@@ -292,7 +292,7 @@ public class HtmlPage
       beginPage(title, charset, Collections.EMPTY_SET, stylesheets);
    }
 
-   public void beginPage(String title, String charset, 
+   public void beginPage(String title, String charset,
                          Collection keywords, Map stylesheets)
       throws IOException
    {
@@ -310,25 +310,25 @@ public class HtmlPage
             url.delete(url.length() - 1, url.length());
          }
          url.append(file.getCanonicalPath().substring(rootDir.getCanonicalPath().length()));
-         atomicElement("base", 
+         atomicElement("base",
                        new String[] { "href" },
                        new String[] { url.toString() });
       }
-      beginElement("script", 
+      beginElement("script",
                     new String[] { "src", "type" },
                     new String[] { pathToRoot + "/resources/gjdoc.js", "text/javascript" });
       print("<!-- this comment required for konqueror 3.2.2 -->");
       endElement("script");
-      atomicElement("meta", 
+      atomicElement("meta",
                     new String[] { "http-equiv", "content" },
                     new String[] { "Content-Type", "text/html; charset=" + charset });
-      atomicElement("meta", 
+      atomicElement("meta",
                     new String[] { "name", "content" },
                     new String[] { "generator", "GNU Gjdoc Standard Doclet" });
       Iterator keywordIt = keywords.iterator();
       while (keywordIt.hasNext()) {
          String keyword = (String)keywordIt.next();
-         atomicElement("meta", 
+         atomicElement("meta",
                        new String[] { "name", "content" },
                        new String[] { "keywords", keyword });
       }
@@ -340,9 +340,9 @@ public class HtmlPage
 
          for (int i=0; i<sheetFiles.length; ++i) {
             String sheetFile = sheetFiles[i];
-            atomicElement("link", 
+            atomicElement("link",
                           new String[] { "rel", "type", "href", "title" },
-                          new String[] { "stylesheet", "text/css", 
+                          new String[] { "stylesheet", "text/css",
                                          pathToRoot + "/" + sheetFile, sheetName });
          }
       }
@@ -440,14 +440,14 @@ public class HtmlPage
 
    public void beginAnchor(String href, String title)
    {
-      beginElement("a", 
+      beginElement("a",
                    new String[] { "href", "title" },
                    new String[] { href, title });
    }
 
    public void beginAnchor(String href, String title, String target)
    {
-      beginElement("a", 
+      beginElement("a",
                    new String[] { "href", "title", "target" },
                    new String[] { href, title, target });
    }
@@ -482,7 +482,7 @@ public class HtmlPage
    public void beginBody(CssClass cssClass, boolean setTitle)
    {
       if (setTitle) {
-         beginElement("body", 
+         beginElement("body",
                       new String[] { "class", "onload" },
                       new String[] { cssClass.getName(), "if(parent.contentPageLoaded)parent.contentPageLoaded(document.title)" }
                       );
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java
index 5cd272d106e..7b8961361c4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/htmldoclet/HtmlTagletContext.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -40,7 +40,7 @@ package gnu.classpath.tools.doclets.htmldoclet;
 import com.sun.javadoc.Doc;
 import gnu.classpath.tools.taglets.TagletContext;
 
-public class HtmlTagletContext 
+public class HtmlTagletContext
    extends TagletContext
 {
    private HtmlPage output;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java
index b08d4902608..29a9e0906d4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -198,13 +198,13 @@ public class Driver {
 
    /**
     *  Path to the directory where temporary files should be stored.
-    *  Defaults to system tempdir, but can be overridden by user 
+    *  Defaults to system tempdir, but can be overridden by user
     *  with -workpath.
     */
    private String workingPath = System.getProperty("java.io.tmpdir");
 
    /**
-    *  Temporary directory created by this doclet where all 
+    *  Temporary directory created by this doclet where all
     *  temporary files will be stored in. If no temporary
     *  files are needed (i.e. no XSLT postprocessing stage
     *  specified by user), this is <code>null</code>.
@@ -272,7 +272,7 @@ public class Driver {
    /**
     *  Stores options to be passed to the DocTranslet.
     */
-   private DocTransletOptions docTransletOptions = new DocTransletOptions();   
+   private DocTransletOptions docTransletOptions = new DocTransletOptions();
 
    /**
     *  Stores the package groups specified in the user
@@ -301,7 +301,7 @@ public class Driver {
     *  Output an XML tag describing a com.sun.javadoc.Type object.
     *  Assumes that the tag does not have subtags.
     *
-    *  @param level  Level of indentation. Will be multiplied by 
+    *  @param level  Level of indentation. Will be multiplied by
     *                <code>indentStep</code> to yield actual amount
     *                of whitespace inserted at start of line.
     *  @param tag    Identifier for the XML tag being output.
@@ -321,11 +321,11 @@ public class Driver {
          packageName = typeAsClassDoc.containingPackage().name();
       }
       println(level, "<"+tagPrefix+":"+tag + " typename=\""+type.typeName()+"\""+
-	      " qualifiedtypename=\""+type.qualifiedTypeName()+"\""
-	      +(type.dimension().length()==0?"":" dimension=\""+type.dimension()+"\"")
+              " qualifiedtypename=\""+type.qualifiedTypeName()+"\""
+              +(type.dimension().length()==0?"":" dimension=\""+type.dimension()+"\"")
               +(isIncluded?" isIncluded=\"true\"" : "")
               +((null != packageName)?" package=\"" + packageName + "\"" : "")
-	      +(atomic?"/":"")+">");
+              +(atomic?"/":"")+">");
    }
 
    protected void outputExecutableMemberDocBody(int level, ExecutableMemberDoc memberDoc) {
@@ -336,24 +336,24 @@ public class Driver {
 
       Parameter[] parameters = memberDoc.parameters();
       for (int i=0, ilim=parameters.length; i<ilim; ++i) {
-	 Parameter parameter = parameters[i];
-	 outputType(level, "parameter name=\""+parameter.name()+"\"", parameter.type());
+         Parameter parameter = parameters[i];
+         outputType(level, "parameter name=\""+parameter.name()+"\"", parameter.type());
       }
 
       ClassDoc[] exceptions = memberDoc.thrownExceptions();
       for (int i=0, ilim=exceptions.length; i<ilim; ++i) {
-	 ClassDoc exception = exceptions[i];
-	 outputType(level, "thrownException", exception);
+         ClassDoc exception = exceptions[i];
+         outputType(level, "thrownException", exception);
        }
 
       printAtomTag(level, "signature full=\""+memberDoc.signature()+"\" flat=\""+memberDoc.flatSignature()+"\"");
 
       if (memberDoc.isNative()) {
-	 printAtomTag(level, "isNative");
+         printAtomTag(level, "isNative");
       }
 
       if (memberDoc.isSynchronized()) {
-	 printAtomTag(level, "isSynchronized");
+         printAtomTag(level, "isSynchronized");
       }
    }
 
@@ -373,10 +373,10 @@ public class Driver {
    protected void outputFieldDocBody(int level, FieldDoc fieldDoc) {
       outputType(level, "type", fieldDoc.type());
       if (fieldDoc.isTransient()) {
-	 printAtomTag(level, "isTransient");
+         printAtomTag(level, "isTransient");
       }
       if (fieldDoc.isVolatile()) {
-	 printAtomTag(level, "isVolatile");
+         printAtomTag(level, "isVolatile");
       }
    }
 
@@ -397,13 +397,13 @@ public class Driver {
 
    protected void outputSuperInterfacesRec(int level, ClassDoc classDoc) {
       if (null!=classDoc) {
-	 ClassDoc[] interfaces = classDoc.interfaces();
+         ClassDoc[] interfaces = classDoc.interfaces();
          if (null != interfaces) {
             for (int i=0, ilim=interfaces.length; i<ilim; ++i) {
                outputType(level, "superimplements", interfaces[i]);
             }
          }
-	 outputSuperInterfacesRec(level, classDoc.superclass());
+         outputSuperInterfacesRec(level, classDoc.superclass());
       }
    }
 
@@ -411,12 +411,12 @@ public class Driver {
       println();
       printOpenTag(1, "classdoc name=\""+classDoc.name()+"\" qualifiedtypename=\""+classDoc.qualifiedName()+"\" isIncluded=\"true\"");
       if (null!=classDoc.superclass()) {
-	 outputType(2, "superclass", classDoc.superclass());
+         outputType(2, "superclass", classDoc.superclass());
       }
 
       ClassDoc[] interfaces = classDoc.interfaces();
       for (int i=0, ilim=interfaces.length; i<ilim; ++i) {
-	 outputType(2, "implements", interfaces[i]);
+         outputType(2, "implements", interfaces[i]);
       }
       outputSuperInterfacesRec(2, classDoc.superclass());
 
@@ -441,33 +441,33 @@ public class Driver {
       println();
       printOpenTag(1, "packagedoc name=\""+packageDoc.name()+"\"");
       if (packageDoc.firstSentenceTags().length > 0) {
-	 printOpenTag(2, "firstSentenceTags", false);
-	 outputTags(3, packageDoc.firstSentenceTags(), true, CONTEXT_PACKAGE);
-	 printCloseTag(0, "firstSentenceTags");
-	 printOpenTag(2, "inlineTags", false);
-	 outputTags(3, packageDoc.inlineTags(), true, CONTEXT_PACKAGE);
-	 printCloseTag(0, "inlineTags");
+         printOpenTag(2, "firstSentenceTags", false);
+         outputTags(3, packageDoc.firstSentenceTags(), true, CONTEXT_PACKAGE);
+         printCloseTag(0, "firstSentenceTags");
+         printOpenTag(2, "inlineTags", false);
+         outputTags(3, packageDoc.inlineTags(), true, CONTEXT_PACKAGE);
+         printCloseTag(0, "inlineTags");
       }
 
       if (packageDoc.tags().length > 0) {
-	 printOpenTag(2, "tags");
-	 outputTags(3, packageDoc.tags(), true, CONTEXT_PACKAGE);
-	 printCloseTag(2, "tags");
+         printOpenTag(2, "tags");
+         outputTags(3, packageDoc.tags(), true, CONTEXT_PACKAGE);
+         printCloseTag(2, "tags");
       }
 
       if (packageDoc.seeTags().length > 0) {
-	 printOpenTag(2, "seeTags");
-	 outputTags(3, packageDoc.seeTags(), true, CONTEXT_PACKAGE);
-	 printCloseTag(2, "seeTags");
+         printOpenTag(2, "seeTags");
+         outputTags(3, packageDoc.seeTags(), true, CONTEXT_PACKAGE);
+         printCloseTag(2, "seeTags");
       }
 
       ClassDoc[] allClasses = (ClassDoc[]) packageDoc.allClasses().clone();
       Arrays.sort(allClasses);
 
       if (false) {
-	 for (int i = 0, ilim = allClasses.length; i < ilim; ++ i) {
-	    printAtomTag(2, "containsClass qualifiedtypename=\""+allClasses[i].qualifiedTypeName()+"\"");
-	 }
+         for (int i = 0, ilim = allClasses.length; i < ilim; ++ i) {
+            printAtomTag(2, "containsClass qualifiedtypename=\""+allClasses[i].qualifiedTypeName()+"\"");
+         }
       }
 
       printCloseTag(1, "packagedoc");
@@ -482,44 +482,44 @@ public class Driver {
 
       ClassDoc[] interfaces = classDoc.interfaces();
       for (int i=0, ilim=interfaces.length; i<ilim; ++i) {
-	 outputType(2, "implements", interfaces[i]);
+         outputType(2, "implements", interfaces[i]);
       }
       outputSuperInterfacesRec(2, classDoc.superclass());
 
       outputProgramElementDocBody(2, classDoc);
       if (classDoc.isAbstract())
-	 printAtomTag(2, "isAbstract");
+         printAtomTag(2, "isAbstract");
       if (classDoc.isSerializable())
-	 printAtomTag(2, "isSerializable");
+         printAtomTag(2, "isSerializable");
       if (classDoc.isExternalizable())
-	 printAtomTag(2, "isExternalizable");
+         printAtomTag(2, "isExternalizable");
       if (classDoc.definesSerializableFields()) {
-	 printAtomTag(2, "definesSerializableFields");
+         printAtomTag(2, "definesSerializableFields");
       }
 
       ConstructorDoc[] constructors = classDoc.constructors();
       for (int i=0, ilim=constructors.length; i<ilim; ++i) {
-	 outputConstructorDoc(2, constructors[i]);
+         outputConstructorDoc(2, constructors[i]);
       }
 
       MethodDoc[] methods = classDoc.methods();
       for (int i=0, ilim=methods.length; i<ilim; ++i) {
-	 outputMethodDoc(2, methods[i]);
+         outputMethodDoc(2, methods[i]);
       }
 
       FieldDoc[] fields = classDoc.fields();
       for (int i=0, ilim=fields.length; i<ilim; ++i) {
-	 outputFieldDoc(2, fields[i]);
+         outputFieldDoc(2, fields[i]);
       }
 
       if (classDoc.serializableFields().length > 0) {
-	 printOpenTag(2, "serializableFields");
+         printOpenTag(2, "serializableFields");
 
          FieldDoc[] sfields = classDoc.serializableFields();
          for (int i=0, ilim=sfields.length; i<ilim; ++i) {
             outputFieldDoc(2, sfields[i]);
          }
-	 printCloseTag(2, "serializableFields");
+         printCloseTag(2, "serializableFields");
       }
 
       Java2xhtml java2xhtml = new Java2xhtml();
@@ -536,12 +536,12 @@ public class Driver {
          FileReader sourceReader = new FileReader(sourceFile);
          IOToolkit.copyStream(sourceReader, sourceBuffer);
          print(java2xhtml.makeHTML(sourceBuffer.getBuffer(), sourceFile.getName()));
-         printCloseTag(2, "source");      
+         printCloseTag(2, "source");
       }
 
       ClassDoc superclassDoc = classDoc.superclass();
       while (superclassDoc != null) {
-	 outputType(2, "superclass", superclassDoc, false);
+         outputType(2, "superclass", superclassDoc, false);
 
          // FIXME: remove the following after adjusting the XSLT sheets:
          printAtomTag(3, "containingPackage name=\"" + superclassDoc.containingPackage().name() + "\"");
@@ -552,7 +552,7 @@ public class Driver {
                printAtomTag(3, "methoddoc name=\"" + superMethods[i].name() + "\" signature=\"" + superMethods[i].signature() + "\"");
             }
          }
-         
+
          FieldDoc[] superFields = superclassDoc.fields();
          if (null != superFields) {
             for (int i=0, ilim=superFields.length; i<ilim; ++i) {
@@ -560,7 +560,7 @@ public class Driver {
             }
          }
          printCloseTag(2, "superclass");
-         
+
          superclassDoc = superclassDoc.superclass();
       }
 
@@ -598,7 +598,7 @@ public class Driver {
       int context = CONTEXT_TYPE;
 
       if (doc.isClass()) {
-	 printAtomTag(level, "isClass");
+         printAtomTag(level, "isClass");
 
          ClassDoc classDoc = (ClassDoc)doc;
          ClassDoc[] classes = rootDoc.classes();
@@ -612,24 +612,24 @@ public class Driver {
          outputHeritageClose(level, classDoc);
       }
       if (doc.isConstructor()) {
-	 printAtomTag(level, "isConstructor");
+         printAtomTag(level, "isConstructor");
          context = CONTEXT_CONSTRUCTOR;
       }
       if (doc.isError()) {
-	 printAtomTag(level, "isError");
+         printAtomTag(level, "isError");
       }
       if (doc.isException()) {
-	 printAtomTag(level, "isException");
+         printAtomTag(level, "isException");
       }
       if (doc.isField()) {
-	 printAtomTag(level, "isField");
+         printAtomTag(level, "isField");
          context = CONTEXT_FIELD;
       }
       if (doc.isIncluded()) {
-	 printAtomTag(level, "isIncluded");
+         printAtomTag(level, "isIncluded");
       }
       if (doc.isInterface()) {
-	 printAtomTag(level, "isInterface");
+         printAtomTag(level, "isInterface");
 
          ClassDoc classDoc = (ClassDoc)doc;
          ClassDoc[] classes = rootDoc.classes();
@@ -649,40 +649,40 @@ public class Driver {
          }
       }
       if (doc.isMethod()) {
-	 printAtomTag(level, "isMethod");
+         printAtomTag(level, "isMethod");
          context = CONTEXT_METHOD;
       }
       if (doc.isOrdinaryClass()) {
-	 printAtomTag(level, "isOrdinaryClass");
+         printAtomTag(level, "isOrdinaryClass");
       }
 
       if (doc.inlineTags().length > 0) {
-	 printOpenTag(level, "inlineTags", false);
-	 outputTags(level+1, doc.inlineTags(), true, context);
-	 printCloseTag(0, "inlineTags");
+         printOpenTag(level, "inlineTags", false);
+         outputTags(level+1, doc.inlineTags(), true, context);
+         printCloseTag(0, "inlineTags");
       }
 
       if (doc.firstSentenceTags().length > 0) {
-	 printOpenTag(level, "firstSentenceTags", false);
-	 outputTags(level+1, doc.firstSentenceTags(), true, context);
-	 printCloseTag(0, "firstSentenceTags");
+         printOpenTag(level, "firstSentenceTags", false);
+         outputTags(level+1, doc.firstSentenceTags(), true, context);
+         printCloseTag(0, "firstSentenceTags");
       }
 
       if (doc.tags().length > 0) {
-	 printOpenTag(level, "tags");
+         printOpenTag(level, "tags");
          outputTaglets(level+1, doc.tags(), true, context);
-	 printCloseTag(level, "tags");
+         printCloseTag(level, "tags");
       }
 
       if (doc.seeTags().length > 0) {
-	 printOpenTag(level, "seeTags");
-	 outputTags(level+1, doc.seeTags(), true, context);
-	 printCloseTag(level, "seeTags");
+         printOpenTag(level, "seeTags");
+         outputTags(level+1, doc.seeTags(), true, context);
+         printCloseTag(level, "seeTags");
       }
 
       SourcePosition position = doc.position();
       if (null != position) {
-	 printAtomTag(level, "position file=\"" + position.file().getAbsolutePath() + "\" line=\"" + position.line() + "\" column=\"" + position.column() + "\"");
+         printAtomTag(level, "position file=\"" + position.file().getAbsolutePath() + "\" line=\"" + position.line() + "\" column=\"" + position.column() + "\"");
       }
    }
 
@@ -690,24 +690,24 @@ public class Driver {
       outputDocBody(level, programElementDoc);
       printAtomTag(level, "containingPackage name=\""+programElementDoc.containingPackage().name()+"\"");
       if (null!=programElementDoc.containingClass()) {
-	 outputType(level, "containingClass", programElementDoc.containingClass());
+         outputType(level, "containingClass", programElementDoc.containingClass());
       }
       String access;
-      if (programElementDoc.isPublic()) 
-	 access="public";
-      else if (programElementDoc.isProtected()) 
-	 access="protected";
-      else if (programElementDoc.isPrivate()) 
-	 access="private";
-      else if (programElementDoc.isPackagePrivate()) 
-	 access="package";
+      if (programElementDoc.isPublic())
+         access="public";
+      else if (programElementDoc.isProtected())
+         access="protected";
+      else if (programElementDoc.isPrivate())
+         access="private";
+      else if (programElementDoc.isPackagePrivate())
+         access="package";
       else
-	 throw new RuntimeException("Huh? "+programElementDoc+" is neither public, protected, private nor package protected.");
+         throw new RuntimeException("Huh? "+programElementDoc+" is neither public, protected, private nor package protected.");
       printAtomTag(level, "access scope=\""+access+"\"");
       if (programElementDoc.isFinal())
-	 printAtomTag(level, "isFinal");
+         printAtomTag(level, "isFinal");
       if (programElementDoc.isStatic())
-	 printAtomTag(level, "isStatic");
+         printAtomTag(level, "isStatic");
    }
 
    protected void outputTags(int level, Tag[] tags, boolean descend, int context) {
@@ -720,7 +720,7 @@ public class Driver {
    protected void outputTag(Tag tag, int level, boolean descend, int context, boolean lastTag) {
 
       if (!"Text".equals(tag.name())) {
-         printOpenTag(0 /* don't introduce additional whitespace */, 
+         printOpenTag(0 /* don't introduce additional whitespace */,
                       "tag kind=\""+tag.kind()+"\" name=\""+tag.name()+"\"", false);
       }
       if (tag instanceof ThrowsTag) {
@@ -782,7 +782,7 @@ public class Driver {
             outputTags(level+2, tag.firstSentenceTags(), false, context);
             printCloseTag(0, "firstSentenceTags");
          }
-	    
+
          if (tag.inlineTags().length>0) {
             printOpenTag(level+1, "inlineTags", false);
             outputTags(level+2, tag.firstSentenceTags(), false, context);
@@ -810,7 +810,7 @@ public class Driver {
       }
    }
 
-   void outputTaglets(int level, Tag[] tags, boolean descend, int context) 
+   void outputTaglets(int level, Tag[] tags, boolean descend, int context)
    {
       for (Iterator it = tagletMap.keySet().iterator(); it.hasNext(); ) {
          String tagName = (String)it.next();
@@ -824,7 +824,7 @@ public class Driver {
                  || (context != CONTEXT_OVERVIEW || taglet.inOverview())
                  || (context != CONTEXT_PACKAGE || taglet.inPackage())
                  || (context != CONTEXT_TYPE || taglet.inType()))) {
-            
+
             List tagsOfThisType = new ArrayList();
             for (int i=0, ilim=tags.length; i<ilim; ++i) {
                if (tags[i].name().substring(1).equals(tagName)) {
@@ -887,113 +887,113 @@ public class Driver {
       DeprecatedTaglet.setTagletEnabled(true);
 
       try {
-	 {
+         {
 
-	    // Process command line options passed through to this doclet
-	    
-	    TargetContext targetContext = null;
-	    
-	    TargetContext htmlTargetContext
-               = new TargetContext(DocTranslet.fromClasspath("/doctranslets/html/gjdoc.xsl"), 
+            // Process command line options passed through to this doclet
+
+            TargetContext targetContext = null;
+
+            TargetContext htmlTargetContext
+               = new TargetContext(DocTranslet.fromClasspath("/doctranslets/html/gjdoc.xsl"),
                                    targetDirectory);
 
-	    for (int i=0, ilim=rootDoc.options().length; i<ilim; ++i) {
+            for (int i=0, ilim=rootDoc.options().length; i<ilim; ++i) {
 
-	       String[] option = rootDoc.options()[i];
-	       String optionTag = option[0];
+               String[] option = rootDoc.options()[i];
+               String optionTag = option[0];
 
-	       if ("-d".equals(optionTag)) {
-		  if (null == targetDirectory) {
-		     targetDirectory = new File(option[1]);
-		  }
-		  if (null != targetContext) {
-		     targetContext.setTargetDirectory(targetDirectory);
-		  }
-	       }
+               if ("-d".equals(optionTag)) {
+                  if (null == targetDirectory) {
+                     targetDirectory = new File(option[1]);
+                  }
+                  if (null != targetContext) {
+                     targetContext.setTargetDirectory(targetDirectory);
+                  }
+               }
 
-	       else if ("-nofixhtml".equals(optionTag)) {
-		  fixHTML = false;
+               else if ("-nofixhtml".equals(optionTag)) {
+                  fixHTML = false;
                   printError("-nofixhtml currently not supported.");
                   return false;
-	       }
-	       else if ("-compress".equals(optionTag)) {
-		  compress = true;
-	       }
-	       else if ("-nohtmlwarn".equals(optionTag)) {
-		  noHTMLWarn = true;
-	       }
-	       else if ("-noemailwarn".equals(optionTag)) {
-		  noEmailWarn = true;
-	       }
-	       else if ("-indentstep".equals(optionTag)) {
-		  indentStep = Integer.parseInt(option[1]);
-	       }
-	       else if ("-doctranslet".equals(optionTag)) {
-		  targets.add(targetContext = new TargetContext(DocTranslet.fromJarFile(new File(option[1])), 
+               }
+               else if ("-compress".equals(optionTag)) {
+                  compress = true;
+               }
+               else if ("-nohtmlwarn".equals(optionTag)) {
+                  noHTMLWarn = true;
+               }
+               else if ("-noemailwarn".equals(optionTag)) {
+                  noEmailWarn = true;
+               }
+               else if ("-indentstep".equals(optionTag)) {
+                  indentStep = Integer.parseInt(option[1]);
+               }
+               else if ("-doctranslet".equals(optionTag)) {
+                  targets.add(targetContext = new TargetContext(DocTranslet.fromJarFile(new File(option[1])),
                                                                 targetDirectory));
-	       }
-	       else if ("-genhtml".equals(optionTag)) {
-		  htmlTargetContext.setTargetDirectory(targetDirectory);
-		  targets.add(targetContext = htmlTargetContext);
+               }
+               else if ("-genhtml".equals(optionTag)) {
+                  htmlTargetContext.setTargetDirectory(targetDirectory);
+                  targets.add(targetContext = htmlTargetContext);
                   xmlOnly = false;
-	       } 
-	       else if ("-geninfo".equals(optionTag)) {
+               }
+               else if ("-geninfo".equals(optionTag)) {
                   targetContext
-                              = new TargetContext(DocTranslet.fromClasspath("/doctranslets/info/gengj.xsl"), 
+                              = new TargetContext(DocTranslet.fromClasspath("/doctranslets/info/gengj.xsl"),
                                                   targetDirectory);
-		  targets.add(targetContext);
-		  if (!fixHTML) {
-		     printNotice("NOTE: -geninfo implies -fixhtml.");
-		     fixHTML = true;
-		  }
+                  targets.add(targetContext);
+                  if (!fixHTML) {
+                     printNotice("NOTE: -geninfo implies -fixhtml.");
+                     fixHTML = true;
+                  }
                   xmlOnly = false;
-	       }
-	       else if ("-gendocbook".equals(optionTag)) {
-                  targetContext = new TargetContext(DocTranslet.fromClasspath("/doctranslets/docbook/gengj.xsl"), 
+               }
+               else if ("-gendocbook".equals(optionTag)) {
+                  targetContext = new TargetContext(DocTranslet.fromClasspath("/doctranslets/docbook/gengj.xsl"),
                                                     targetDirectory);
-		  targets.add(targetContext);
-		  if (!fixHTML) {
-		     printNotice("NOTE: -gendocbook implies -fixhtml.");
-		     fixHTML = true;
-		  }
-	       }
-	       else if ("-genpdf".equals(optionTag)) {
+                  targets.add(targetContext);
+                  if (!fixHTML) {
+                     printNotice("NOTE: -gendocbook implies -fixhtml.");
+                     fixHTML = true;
+                  }
+               }
+               else if ("-genpdf".equals(optionTag)) {
                   targetContext
-                     = new TargetContext(DocTranslet.fromClasspath("/doctranslets/docbook/gengj.xsl"), 
+                     = new TargetContext(DocTranslet.fromClasspath("/doctranslets/docbook/gengj.xsl"),
                                          targetDirectory);
                                          /** "gnu.classpath.tools.doclets.xmldoclet.DocBookPostprocessor") **/
-		  targets.add(targetContext);
-		  if (!fixHTML) {
-		     printNotice("NOTE: -genpdf implies -fixhtml.");
-		     fixHTML = true;
-		  }
-	       }
-	       else if ("-xmlonly".equals(optionTag)) {
-		  xmlOnly = true;
-	       }
-	       else if ("-bottomnote".equals(optionTag)) {
+                  targets.add(targetContext);
+                  if (!fixHTML) {
+                     printNotice("NOTE: -genpdf implies -fixhtml.");
+                     fixHTML = true;
+                  }
+               }
+               else if ("-xmlonly".equals(optionTag)) {
+                  xmlOnly = true;
+               }
+               else if ("-bottomnote".equals(optionTag)) {
 
-		  FileReader reader = new FileReader(option[1]);
-		  StringWriter writer = new StringWriter();
-		  char[] buf = new char[256];
-		  int nread;
-		  while ((nread = reader.read(buf)) >= 0) {
-		     writer.write(buf, 0, nread);
-		  }
-		  writer.flush();
-		  bottomNote = writer.toString();
-		  writer.close();
-		  reader.close();
-	       }
-	       else if ("-title".equals(optionTag)) {
+                  FileReader reader = new FileReader(option[1]);
+                  StringWriter writer = new StringWriter();
+                  char[] buf = new char[256];
+                  int nread;
+                  while ((nread = reader.read(buf)) >= 0) {
+                     writer.write(buf, 0, nread);
+                  }
+                  writer.flush();
+                  bottomNote = writer.toString();
+                  writer.close();
+                  reader.close();
+               }
+               else if ("-title".equals(optionTag)) {
 
-		  title = option[1];
-	       }
-	       else if ("-workpath".equals(optionTag)) {
+                  title = option[1];
+               }
+               else if ("-workpath".equals(optionTag)) {
 
-		  workingPath = option[1];
-	       }
-	       else if ("-tagletpath".equals(optionTag)) {
+                  workingPath = option[1];
+               }
+               else if ("-tagletpath".equals(optionTag)) {
 
                   if (null == tagletPath) {
                      tagletPath = option[1];
@@ -1001,7 +1001,7 @@ public class Driver {
                   else {
                      tagletPath = tagletPath + File.pathSeparator + option[1];
                   }
-	       }
+               }
                else if ("-taglet".equals(optionTag)) {
 
                   boolean tagletLoaded = false;
@@ -1066,30 +1066,30 @@ public class Driver {
                      return false;
                   }
                }
-	       else if ("-author".equals(optionTag)) {
+               else if ("-author".equals(optionTag)) {
                   AuthorTaglet.setTagletEnabled(true);
                }
-	       else if ("-version".equals(optionTag)) {
+               else if ("-version".equals(optionTag)) {
                   VersionTaglet.setTagletEnabled(true);
                }
-	       else if ("-nosince".equals(optionTag)) {
+               else if ("-nosince".equals(optionTag)) {
                   SinceTaglet.setTagletEnabled(false);
                }
-	       else if ("-nodeprecated".equals(optionTag)) {
+               else if ("-nodeprecated".equals(optionTag)) {
                   DeprecatedTaglet.setTagletEnabled(false);
                }
-	       else if ("-authormail".equals(optionTag)) {
-                  
-		  if ("no-replace".equalsIgnoreCase(option[1])) {
+               else if ("-authormail".equals(optionTag)) {
+
+                  if ("no-replace".equalsIgnoreCase(option[1])) {
                      AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NO_REPLACEMENT);
                   }
-		  else if ("mailto-name".equalsIgnoreCase(option[1])) {
+                  else if ("mailto-name".equalsIgnoreCase(option[1])) {
                      AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.MAILTO_NAME);
                   }
-		  else if ("name-mailto-address".equalsIgnoreCase(option[1])) {
+                  else if ("name-mailto-address".equalsIgnoreCase(option[1])) {
                      AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MAILTO_ADDRESS);
                   }
-		  else if ("name-mangled-address".equalsIgnoreCase(option[1])) {
+                  else if ("name-mangled-address".equalsIgnoreCase(option[1])) {
                      AuthorTaglet.setEmailReplacementType(AuthorTaglet.EmailReplacement.NAME_MANGLED_ADDRESS);
                   }
                   else {
@@ -1097,77 +1097,77 @@ public class Driver {
                                 + " no-replace, mailto-name, name-mailto-address, name-mangled-address.");
                      return false;
                   }
-	       }
-	       else if ("-mailmangledot".equals(optionTag)) {
+               }
+               else if ("-mailmangledot".equals(optionTag)) {
                   AuthorTaglet.setDotReplacement(option[1]);
                }
-	       else if ("-mailmangleat".equals(optionTag)) {
+               else if ("-mailmangleat".equals(optionTag)) {
                   AuthorTaglet.setAtReplacement(option[1]);
                }
-	       else if ("-docfilessubdirs".equals(optionTag)) {
+               else if ("-docfilessubdirs".equals(optionTag)) {
                   docFilesSubdirsEnabled = true;
                }
-	       else if ("-excludedocfilessubdir".equals(optionTag)) {
+               else if ("-excludedocfilessubdir".equals(optionTag)) {
                   StringTokenizer st = new StringTokenizer(option[1]);
                   while (st.hasMoreTokens()) {
                      excludeDocFilesSubDirs.add(st.nextToken());
                   }
                }
-	       else if ("-nonavbar".equals(optionTag)) {
+               else if ("-nonavbar".equals(optionTag)) {
                   docTransletOptions.nonavbar = true;
                }
-	       else if ("-noindex".equals(optionTag)) {
+               else if ("-noindex".equals(optionTag)) {
                   docTransletOptions.noindex = true;
                }
-	       else if ("-notree".equals(optionTag)) {
+               else if ("-notree".equals(optionTag)) {
                   docTransletOptions.notree = true;
                }
-	       else if ("-nocomment".equals(optionTag)) {
+               else if ("-nocomment".equals(optionTag)) {
                   docTransletOptions.nocomment = true;
                }
-	       else if ("-nohelp".equals(optionTag)) {
+               else if ("-nohelp".equals(optionTag)) {
                   docTransletOptions.nohelp = true;
                }
-	       else if ("-splitindex".equals(optionTag)) {
+               else if ("-splitindex".equals(optionTag)) {
                   docTransletOptions.splitindex = true;
                }
-	       else if ("-linksource".equals(optionTag)) {
+               else if ("-linksource".equals(optionTag)) {
                   docTransletOptions.linksource = true;
                }
-	       else if ("-windowtitle".equals(optionTag)) {
+               else if ("-windowtitle".equals(optionTag)) {
                   docTransletOptions.windowtitle = option[1];
                }
-	       else if ("-helpfile".equals(optionTag)) {
+               else if ("-helpfile".equals(optionTag)) {
                   docTransletOptions.helpfile = new File(option[1]).toURL().toString();
                }
-	       else if ("-stylesheetfile".equals(optionTag)) {
+               else if ("-stylesheetfile".equals(optionTag)) {
                   docTransletOptions.stylesheetfile = new File(option[1]).toURL().toString();
                }
-	       else if ("-header".equals(optionTag)) {
+               else if ("-header".equals(optionTag)) {
                   docTransletOptions.header = option[1];
                }
-	       else if ("-footer".equals(optionTag)) {
+               else if ("-footer".equals(optionTag)) {
                   docTransletOptions.footer = option[1];
                }
-	       else if ("-bottom".equals(optionTag)) {
+               else if ("-bottom".equals(optionTag)) {
                   docTransletOptions.bottom = option[1];
                }
-	       else if ("-doctitle".equals(optionTag)) {
+               else if ("-doctitle".equals(optionTag)) {
                   docTransletOptions.doctitle = option[1];
                }
-	       else if ("-nodeprecatedlist".equals(optionTag)) {
+               else if ("-nodeprecatedlist".equals(optionTag)) {
                   docTransletOptions.nodeprecatedlist = true;
                }
-	       else if ("-uses".equals(optionTag)) {
+               else if ("-uses".equals(optionTag)) {
                   docTransletOptions.uses = true;
                }
-	       else if ("-group".equals(optionTag)) {
+               else if ("-group".equals(optionTag)) {
                   if (!processGroupOption(option[1], option[2])) {
                      printError("Invalid package wildcard list in -group option \"" + option[1] + "\" " + option[2]);
                      return false;
                   }
                }
-	       else if ("-tag".equals(optionTag)) {
+               else if ("-tag".equals(optionTag)) {
                   String tagSpec = option[1];
                   boolean validTagSpec = false;
                   int ndx1 = tagSpec.indexOf(':');
@@ -1182,7 +1182,7 @@ public class Driver {
                         }
                         else {
                            mentionedTags.add(taglet);
-                           
+
                            // re-append taglet
                            tagletMap.remove(tagSpec);
                            tagletMap.put(tagSpec, taglet);
@@ -1212,11 +1212,11 @@ public class Driver {
                         boolean tagScopeMethods = false;
                         boolean tagScopeFields = false;
                         boolean tagDisabled = false;
-                        
+
                      tag_option_loop:
                         for (int n=ndx1+1; n<ndx2; ++n) {
                            switch (tagSpec.charAt(n)) {
-                           case 'X': 
+                           case 'X':
                               tagDisabled = true;
                               break;
                            case 'a':
@@ -1250,7 +1250,7 @@ public class Driver {
                               break tag_option_loop;
                            }
                         }
-                        
+
                         if (validTagSpec) {
                            GenericTaglet taglet
                               = new GenericTaglet(tagName,
@@ -1271,7 +1271,7 @@ public class Driver {
                      printError("Value for option -tag must be in format \"<tagname>:Xaoptcmf:<taghead>\".");
                   }
                }
-	    }
+            }
 
             // Use current directory if target directory hasn't been set.
             if (null == targetDirectory) {
@@ -1281,57 +1281,57 @@ public class Driver {
                targetContext.setTargetDirectory(targetDirectory);
             }
 
-	    // It is illegal to specify targets AND -xmlonly.
+            // It is illegal to specify targets AND -xmlonly.
 
-	    if (xmlOnly && targets.size() > 0) {
+            if (xmlOnly && targets.size() > 0) {
 
-	       printError("You can only specify one of -xmlonly and a target format.");
-	       return false;
-	    }
+               printError("You can only specify one of -xmlonly and a target format.");
+               return false;
+            }
 
-	    // If no target was specified and XML only was not
-	    // requested, use HTML as default target.
+            // If no target was specified and XML only was not
+            // requested, use HTML as default target.
 
-	    if (!xmlOnly && targets.size() == 0) {
-	       targets.add(targetContext = htmlTargetContext);
-	    }
+            if (!xmlOnly && targets.size() == 0) {
+               targets.add(targetContext = htmlTargetContext);
+            }
 
-	    // Set the same target directory for all output.
+            // Set the same target directory for all output.
 
-	    // FIXME: Allow separate target directories for different
-	    // output formats.
+            // FIXME: Allow separate target directories for different
+            // output formats.
 
-	    for (Iterator it = targets.iterator(); it.hasNext(); ) {
-	       TargetContext t = (TargetContext)it.next();
-	       t.setTargetDirectory(targetDirectory);
-	    }
+            for (Iterator it = targets.iterator(); it.hasNext(); ) {
+               TargetContext t = (TargetContext)it.next();
+               t.setTargetDirectory(targetDirectory);
+            }
 
-	    // Create temporary directory if necessary
+            // Create temporary directory if necessary
 
-	    if (xmlOnly) {
+            if (xmlOnly) {
 
-	       xmlTargetDirectory = targetDirectory;
-	    }
-	    else {
+               xmlTargetDirectory = targetDirectory;
+            }
+            else {
 
-	       File workingTopDirectory = new File(workingPath);
+               File workingTopDirectory = new File(workingPath);
 
-	       workingDirectory = new File(workingTopDirectory, "gjdoc.tmp."+System.currentTimeMillis());
-	    
-	       if (!workingDirectory.mkdir()) {
-		  printError("Cannot create temporary directory at "+System.getProperty("java.io.tmpdir"));
-		  return false;
-	       }
+               workingDirectory = new File(workingTopDirectory, "gjdoc.tmp."+System.currentTimeMillis());
 
-	       File xmlTempDirectory = new File(workingDirectory, "xmloutput");
+               if (!workingDirectory.mkdir()) {
+                  printError("Cannot create temporary directory at "+System.getProperty("java.io.tmpdir"));
+                  return false;
+               }
 
-	       if (!xmlTempDirectory.mkdir()) {
-		  printError("Cannot create temporary directory for XML output at "+System.getProperty("java.io.tmpdir"));
-		  return false;
-	       }
+               File xmlTempDirectory = new File(workingDirectory, "xmloutput");
 
-	       xmlTargetDirectory = xmlTempDirectory;
-	    }
+               if (!xmlTempDirectory.mkdir()) {
+                  printError("Cannot create temporary directory for XML output at "+System.getProperty("java.io.tmpdir"));
+                  return false;
+               }
+
+               xmlTargetDirectory = xmlTempDirectory;
+            }
 
             // Create target directory if necessary
 
@@ -1373,7 +1373,7 @@ public class Driver {
                         hasDeprecatedClasses = true;
                      }
                   }
-                  
+
                   MethodDoc[] methods = c.methods();
                   for (int j = 0, jlim = methods.length; j < jlim; ++ j) {
                      MethodDoc m = methods[j];
@@ -1382,7 +1382,7 @@ public class Driver {
                         hasDeprecatedMethods = true;
                      }
                   }
-                  
+
                   FieldDoc[] fields = c.fields();
                   for (int j = 0, jlim = fields.length; j < jlim; ++ j) {
                      FieldDoc f = fields[j];
@@ -1402,21 +1402,21 @@ public class Driver {
 
             // Begin XML generation
 
-	    printNotice("Writing XML Index file...");
+            printNotice("Writing XML Index file...");
 
-	    // Assign output stream
+            // Assign output stream
 
-	    setTargetFile("index.xml");
+            setTargetFile("index.xml");
 
-	    // Output XML document header
+            // Output XML document header
 
-	    println(0, "<?xml version=\"1.0\"?>");
-	    println("<!DOCTYPE gjdoc SYSTEM \"dtd/gjdoc.dtd\">");
-	    println();
-	    printOpenTag(0, "rootdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\"");
+            println(0, "<?xml version=\"1.0\"?>");
+            println("<!DOCTYPE gjdoc SYSTEM \"dtd/gjdoc.dtd\">");
+            println();
+            printOpenTag(0, "rootdoc xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\"");
 
-	    println();
-	    println(1, "<!-- Tags from overview page, if available -->");
+            println();
+            println(1, "<!-- Tags from overview page, if available -->");
 
             if (rootDoc.firstSentenceTags().length > 0) {
                printOpenTag(2, "firstSentenceTags", false);
@@ -1429,22 +1429,22 @@ public class Driver {
                outputTags(3, rootDoc.inlineTags(), true, CONTEXT_PACKAGE);
                printCloseTag(2, "inlineTags");
             }
-	 
-	    if (null != bottomNote) {
-	       printOpenTag(1, "bottomnote");
-	       print(bottomNote);
-	       printCloseTag(1, "bottomnote");
-	    }
 
-	    if (null != title) {
-	       printOpenTag(1, "title");
-	       println(2, title);
-	       printCloseTag(1, "title");
-	    }
-	 
-	    printOpenTag(1, "created");
-	    println(2, DateFormat.getDateInstance(DateFormat.LONG, Locale.US).format(new java.util.Date()));
-	    printCloseTag(1, "created");
+            if (null != bottomNote) {
+               printOpenTag(1, "bottomnote");
+               print(bottomNote);
+               printCloseTag(1, "bottomnote");
+            }
+
+            if (null != title) {
+               printOpenTag(1, "title");
+               println(2, title);
+               printCloseTag(1, "title");
+            }
+
+            printOpenTag(1, "created");
+            println(2, DateFormat.getDateInstance(DateFormat.LONG, Locale.US).format(new java.util.Date()));
+            printCloseTag(1, "created");
 
             if (hasDeprecatedClasses) printAtomTag(1, "hasDeprecatedClasses");
             if (hasDeprecatedInterfaces) printAtomTag(1, "hasDeprecatedInterfaces");
@@ -1453,40 +1453,40 @@ public class Driver {
             if (hasDeprecatedMethods) printAtomTag(1, "hasDeprecatedMethods");
             if (hasDeprecatedFields) printAtomTag(1, "hasDeprecatedFields");
 
-	    // Output summary of all classes specified on command line
+            // Output summary of all classes specified on command line
 
-	    println();
-	    println(1, "<!-- Classes specified by user on command line -->");
-	    ClassDoc[] specifiedClasses = rootDoc.specifiedClasses();
-	    for (int i=0, ilim=specifiedClasses.length; i<ilim; ++i) {
-	       ClassDoc sc = specifiedClasses[i];
-	       printAtomTag(1, "specifiedclass fqname=\""+sc.qualifiedName()+"\" name=\""+sc.name()+"\"");
-	    }
-	    specifiedClasses = null;
+            println();
+            println(1, "<!-- Classes specified by user on command line -->");
+            ClassDoc[] specifiedClasses = rootDoc.specifiedClasses();
+            for (int i=0, ilim=specifiedClasses.length; i<ilim; ++i) {
+               ClassDoc sc = specifiedClasses[i];
+               printAtomTag(1, "specifiedclass fqname=\""+sc.qualifiedName()+"\" name=\""+sc.name()+"\"");
+            }
+            specifiedClasses = null;
 
-	    // Output summary of all packages specified on command line
+            // Output summary of all packages specified on command line
 
-	    println();
-	    println(1, "<!-- Packages specified by user on command line -->");
-	    PackageDoc[] specifiedPackages = rootDoc.specifiedPackages();
-	    for (int i=0, ilim=specifiedPackages.length; i<ilim; ++i) {
-	       PackageDoc sp = specifiedPackages[i];
-	       printAtomTag(1, "specifiedpackage name=\""+sp.name()+"\"");
-	    }
-	    specifiedPackages = null;
+            println();
+            println(1, "<!-- Packages specified by user on command line -->");
+            PackageDoc[] specifiedPackages = rootDoc.specifiedPackages();
+            for (int i=0, ilim=specifiedPackages.length; i<ilim; ++i) {
+               PackageDoc sp = specifiedPackages[i];
+               printAtomTag(1, "specifiedpackage name=\""+sp.name()+"\"");
+            }
+            specifiedPackages = null;
 
-	    // Output package group information specified on the
-	    // command line
+            // Output package group information specified on the
+            // command line
 
-	    println();
-	    println(1, "<!-- Package groups specified by user on command line -->");
+            println();
+            println(1, "<!-- Package groups specified by user on command line -->");
             {
                Iterator packageGroupIt = packageGroups.iterator();
                while (packageGroupIt.hasNext()) {
                   PackageGroup packageGroup = (PackageGroup)packageGroupIt.next();
                   SortedSet groupedPackages = packageGroup.getPackages();
                   if (groupedPackages.isEmpty()) {
-                     printWarning("Package group named '" 
+                     printWarning("Package group named '"
                                   + packageGroup.getName() + "' didn't match any packages.");
                   }
                   else {
@@ -1502,53 +1502,53 @@ public class Driver {
                packageGroups = null;
             }
 
-	    // Output information on all packages for which documentation
-	    // has been made available via the Doclet API
+            // Output information on all packages for which documentation
+            // has been made available via the Doclet API
 
-	    println();
-	    println(1, "<!-- Documentation for all packages -->");
-	    PackageDoc[] packages = rootDoc.specifiedPackages();
-	    for (int i=0, ilim=packages.length; i<ilim; ++i) {
-	       PackageDoc c = packages[i];
-	       outputPackageDoc(c);
-	    }
-	    packages = null;
+            println();
+            println(1, "<!-- Documentation for all packages -->");
+            PackageDoc[] packages = rootDoc.specifiedPackages();
+            for (int i=0, ilim=packages.length; i<ilim; ++i) {
+               PackageDoc c = packages[i];
+               outputPackageDoc(c);
+            }
+            packages = null;
 
-	    // Output brief summary on all classes for which documentation
-	    // has been made available via the Doclet API.
-	    //
-	    // While this is redundant, it can speed up XSLT
-	    // processing by orders of magnitude
+            // Output brief summary on all classes for which documentation
+            // has been made available via the Doclet API.
+            //
+            // While this is redundant, it can speed up XSLT
+            // processing by orders of magnitude
 
-	    println();
-	    println(1, "<!-- Brief summary for all classes -->");
-	    ClassDoc[] sumclasses = rootDoc.classes();
-	    for (int i=0, ilim=sumclasses.length; i<ilim; ++i) {
-	       ClassDoc c = sumclasses[i];
-	       outputClassDocSummary(c);
-	    }
-	    sumclasses = null;
-	    
-	    // Output closing tag, finish output stream
+            println();
+            println(1, "<!-- Brief summary for all classes -->");
+            ClassDoc[] sumclasses = rootDoc.classes();
+            for (int i=0, ilim=sumclasses.length; i<ilim; ++i) {
+               ClassDoc c = sumclasses[i];
+               outputClassDocSummary(c);
+            }
+            sumclasses = null;
 
-	    println();
-	    printCloseTag(0, "rootdoc");
+            // Output closing tag, finish output stream
 
-	    closeTargetFile();
+            println();
+            printCloseTag(0, "rootdoc");
+
+            closeTargetFile();
 
             createIndexByName();
 
 
 
-	    // Output information on all classes for which documentation
-	    // has been made available via the Doclet API
-	    
-	    println();
-	    println(1, "<!-- Documentation for all classes -->");
-	    ClassDoc[] classes = rootDoc.classes();
+            // Output information on all classes for which documentation
+            // has been made available via the Doclet API
+
+            println();
+            println(1, "<!-- Documentation for all classes -->");
+            ClassDoc[] classes = rootDoc.classes();
             String prevPackageName = null;
-	    for (int i = 0, ilim = classes.length; i < ilim; ++ i) {
-	       ClassDoc c = classes[i];
+            for (int i = 0, ilim = classes.length; i < ilim; ++ i) {
+               ClassDoc c = classes[i];
 
                if (isVerbose()) {
                   printNotice("Writing XML information for "+c.qualifiedName()+"...");
@@ -1560,24 +1560,24 @@ public class Driver {
                      prevPackageName = packageName;
                   }
                }
-	       
-	       setTargetFile(c.qualifiedName().replace('/','.')+".xml");
-	       
-	       println("<?xml version=\"1.0\"?>");
+
+               setTargetFile(c.qualifiedName().replace('/','.')+".xml");
+
+               println("<?xml version=\"1.0\"?>");
                println("<!DOCTYPE gjdoc SYSTEM \"dtd/gjdoc.dtd\">");
-	       
-	       outputClassDoc(c);
-	       
-	       closeTargetFile();
-	    }
-	    classes = null;
-	 }
-	 
+
+               outputClassDoc(c);
+
+               closeTargetFile();
+            }
+            classes = null;
+         }
+
          // Copy DTD files to temporary directory
-         
+
          // FIXME: try to solve this via jar: URLs. but this will
          // probably break libxmlj compatibility (?)
-         
+
          String[] resources = new String[] {
             "gjdoc.dtd",
             "gjdoc-alphaindex.dtd",
@@ -1609,7 +1609,7 @@ public class Driver {
          if ((tempDtdDirectory.exists() || tempDtdDirectory.mkdir())
              && (tempDtdEntDirectory.exists() || tempDtdEntDirectory.mkdir())) {
             for (int i = 0; i < resources.length; ++ i) {
-               copyResourceToFile("/dtd/" + resources[i], 
+               copyResourceToFile("/dtd/" + resources[i],
                                   new File(tempDtdDirectory, resources[i]));
             }
          }
@@ -1630,52 +1630,52 @@ public class Driver {
             }
          }
 
-	 // All information has been output. Apply stylesheet if given.
+         // All information has been output. Apply stylesheet if given.
 
-	 gnu.classpath.tools.gjdoc.Main.releaseRootDoc();
-         
-	 this.currentClass = null;
-	 this.currentMember = null;
-	 this.currentExecMember = null;
-	 
-	 System.gc();	 
+         gnu.classpath.tools.gjdoc.Main.releaseRootDoc();
 
-	 // From this point we are only operating on files, so we don't
-	 // need this anymore and can free up some memory
+         this.currentClass = null;
+         this.currentMember = null;
+         this.currentExecMember = null;
+
+         System.gc();
+
+         // From this point we are only operating on files, so we don't
+         // need this anymore and can free up some memory
 
          for (Iterator it = targets.iterator(); it.hasNext(); ) {
 
             TargetContext target = (TargetContext)it.next();
 
-	    // We have XSLT postprocessing, run DocTranslet.
+            // We have XSLT postprocessing, run DocTranslet.
 
             //DocTranslet docTranslet = DocTranslet.fromClasspath("/doctranslets/html/gjdoc.xsl");
-            
+
             //docTranslet.setOptions(docTransletOptions);
 
             target.getDocTranslet().setOptions(docTransletOptions);
 
-            target.getDocTranslet().apply(xmlTargetDirectory, 
-                                          target.getTargetDirectory(), 
+            target.getDocTranslet().apply(xmlTargetDirectory,
+                                          target.getTargetDirectory(),
                                           rootDoc);
-	 }
+         }
 
-	 // Done
+         // Done
 
-	 targets = null;
+         targets = null;
 
-	 System.gc();
+         System.gc();
          Runtime.getRuntime().runFinalization();
 
-	 return true;
+         return true;
       }
       catch (Exception e) {
 
-	 // Something went wrong. Report to stderr and pass error to
-	 // Javadoc Reporter
+         // Something went wrong. Report to stderr and pass error to
+         // Javadoc Reporter
 
-	 e.printStackTrace();
-	 printError(e.toString());
+         e.printStackTrace();
+         printError(e.toString());
 
          Throwable rootCause = e.getCause();
          if (null != rootCause) {
@@ -1686,20 +1686,20 @@ public class Driver {
             rootCause.printStackTrace();
          }
 
-	 return false;
+         return false;
       }
       finally {
 
-	 // In any case, delete the working directory if we created one
+         // In any case, delete the working directory if we created one
 
-	 if (null != workingDirectory) {
+         if (null != workingDirectory) {
 
-	    if (!deleteRecursive(workingDirectory)) {
-	       printWarning("Could not delete temporary directory at "+workingDirectory);
-	    }
-	 }
+            if (!deleteRecursive(workingDirectory)) {
+               printWarning("Could not delete temporary directory at "+workingDirectory);
+            }
+         }
 
-	 printNotice("Done.");
+         printNotice("Done.");
       }
    }
 
@@ -1717,16 +1717,16 @@ public class Driver {
 
       for (int i=0, ilim=files.length; i<ilim; ++i) {
 
-	 File file = files[i];
+         File file = files[i];
 
-	 if (file.isDirectory()) {
+         if (file.isDirectory()) {
 
-	    success = deleteRecursive(file) && success;
-	 }
-	 else {
+            success = deleteRecursive(file) && success;
+         }
+         else {
 
-	    success = file.delete() && success;
-	 }
+            success = file.delete() && success;
+         }
       }
 
       return directory.delete() && success;
@@ -1734,7 +1734,7 @@ public class Driver {
 
    /**
     *  Prints a string to stdout and appends a newline.  Convenience
-    *  method.  
+    *  method.
     */
    protected void println(String str) {
       out.println(str);
@@ -1742,7 +1742,7 @@ public class Driver {
 
    /**
     *  Prints a string to stdout without appending a newline.
-    *  Convenience method.  
+    *  Convenience method.
     */
    protected void print(String str) {
       out.print(str);
@@ -1751,31 +1751,31 @@ public class Driver {
    /**
     *  In standard mode, prints an empty line to stdout.
     *  In thight mode, nothing happens.
-    *  Convenience method.  
+    *  Convenience method.
     */
    protected void println() {
       if (!compress) {
-	 out.println();
+         out.println();
       }
    }
 
    /**
-    *  In standard mode, prints the given text indented to stdout and appends newline. 
+    *  In standard mode, prints the given text indented to stdout and appends newline.
     *  In tight mode, doesn't print indentation or newlines.
     */
    protected void print(int indentLevel, String msg) {
       if (compress) {
-	 out.print(msg);
+         out.print(msg);
       }
       else {
-	 StringBuffer indentation = new StringBuffer();
-	 for (int i=0; i<indentLevel*indentStep; ++i) {
-	    indentation.append(' ');
-	 }
-	 out.print(indentation+msg);
+         StringBuffer indentation = new StringBuffer();
+         for (int i=0; i<indentLevel*indentStep; ++i) {
+            indentation.append(' ');
+         }
+         out.print(indentation+msg);
       }
    }
-   
+
    /**
     *  In tight mode, prints a message at a given indentation level.
     *  In standard mode, appends a newline in addition.
@@ -1805,10 +1805,10 @@ public class Driver {
     */
    protected void printOpenTag(int level, String tag, boolean appendNewline) {
       if (appendNewline && !compress) {
-	 println(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">");
+         println(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">");
       }
       else {
-	 print(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">");
+         print(level, "<"+tagPrefix+":"+replaceCharsInTag(tag)+">");
       }
    }
 
@@ -1825,10 +1825,10 @@ public class Driver {
     */
    protected void printCloseTag(int level, String tag, boolean appendNewline) {
       if (appendNewline && !compress) {
-	 println(level, "</"+tagPrefix+":"+replaceCharsInTag(tag)+">");
+         println(level, "</"+tagPrefix+":"+replaceCharsInTag(tag)+">");
       }
       else {
-	 print(level, "</"+tagPrefix+":"+replaceCharsInTag(tag)+">");
+         print(level, "</"+tagPrefix+":"+replaceCharsInTag(tag)+">");
       }
    }
 
@@ -1893,21 +1893,21 @@ public class Driver {
     *
     *  @param tagContent  String to process
     *
-    *  @return given String with all special characters replaced by 
+    *  @return given String with all special characters replaced by
     *          HTML entities.
     */
    private static String replaceCharsInTag(String tagContent) {
-      return 
-	 replaceString(
-	    replaceString(
-	       replaceString(
-		  tagContent, 
-		  "<", "<"
-		  ), 
-	       ">", ">"
-	       ),
-	    "&", "&"
-	    );
+      return
+         replaceString(
+            replaceString(
+               replaceString(
+                  tagContent,
+                  "<", "<"
+                  ),
+               ">", ">"
+               ),
+            "&", "&"
+            );
    }
 
    /**
@@ -1921,10 +1921,10 @@ public class Driver {
    private static String replaceString(String haystack, String needle, String replacement) {
       int ndx = haystack.indexOf(needle);
       if (ndx<0)
-	 return haystack;
+         return haystack;
       else
-	 return haystack.substring(0, ndx) + replacement 
-	    + replaceString(haystack.substring(ndx+needle.length()), needle, replacement);
+         return haystack.substring(0, ndx) + replacement
+            + replaceString(haystack.substring(ndx+needle.length()), needle, replacement);
    }
 
    protected void setTargetFile(String filename) throws IOException {
@@ -1942,67 +1942,67 @@ public class Driver {
    private String cdata(String str) {
 
       if (null==str) {
-	 return str;
+         return str;
       } // end of if ((null==str)
 
       StringBuffer rc = new StringBuffer();
       for (int i=0; i<str.length(); ++i) {
-	 char c = str.charAt(i);
-	 if (c==0x09 || c==0x0a || c==0x0d || (c>=0x20 && c<=0xd7ff) || (c>=0xe000 && c<=0xfffd) || (c>=0x10000 && c<=0x10ffff)) {
-	    rc.append(c);
-	 }
-	 else {
-	    printWarning("Invalid Unicode character 0x"+Integer.toString(c, 16)+" in javadoc markup has been stripped.");
-	 } // end of else
-	 
+         char c = str.charAt(i);
+         if (c==0x09 || c==0x0a || c==0x0d || (c>=0x20 && c<=0xd7ff) || (c>=0xe000 && c<=0xfffd) || (c>=0x10000 && c<=0x10ffff)) {
+            rc.append(c);
+         }
+         else {
+            printWarning("Invalid Unicode character 0x"+Integer.toString(c, 16)+" in javadoc markup has been stripped.");
+         } // end of else
+
       }
       return rc.toString();
    }
 
    static void copyResourceToFile(String resourceName, File target) throws IOException {
-      
+
       InputStream in = Driver.class.getResourceAsStream(resourceName);
 
       if (null != in) {
 
-	 FileOutputStream out = new FileOutputStream(target);
-	 int size;
-	 byte[] buffer = new byte[512];
-	 while ((size = in.read(buffer)) >= 0) {
-	    out.write(buffer, 0, size);
-	 }
-	 out.close();
+         FileOutputStream out = new FileOutputStream(target);
+         int size;
+         byte[] buffer = new byte[512];
+         while ((size = in.read(buffer)) >= 0) {
+            out.write(buffer, 0, size);
+         }
+         out.close();
       }
       else {
 
-	 throw new IOException("Can't find resource named "+resourceName);
+         throw new IOException("Can't find resource named "+resourceName);
       }
    }
 
    private void printError(String error) {
       if (null != rootDoc) {
-	 rootDoc.printError(error);
+         rootDoc.printError(error);
       }
       else {
-	 System.err.println("ERROR: "+error);
+         System.err.println("ERROR: "+error);
       }
    }
 
    private void printWarning(String warning) {
       if (null != rootDoc) {
-	 rootDoc.printWarning(warning);
+         rootDoc.printWarning(warning);
       }
       else {
-	 System.err.println("WARNING: "+warning);
+         System.err.println("WARNING: "+warning);
       }
    }
 
    private void printNotice(String notice) {
       if (null != rootDoc) {
-	 rootDoc.printNotice(notice);
+         rootDoc.printNotice(notice);
       }
       else {
-	 System.err.println(notice);
+         System.err.println(notice);
       }
    }
 
@@ -2014,7 +2014,7 @@ public class Driver {
       File docFilesSourceDirectory
          = new File(packageDoc.packageDirectory(), "doc-files");
       File docFilesTargetDirectory
-         = new File(this.targetDirectory, 
+         = new File(this.targetDirectory,
                     packageDoc.name().replace('.', File.separatorChar));
       if (docFilesSourceDirectory.exists()) {
          printNotice("Copying files from " + docFilesSourceDirectory);
@@ -2028,7 +2028,7 @@ public class Driver {
     *  Recursively copy the contents of the input directory to the
     *  output directory. The output directory must exist.
     */
-   private static void copyDirectory(File sourceDir, File targetDir, 
+   private static void copyDirectory(File sourceDir, File targetDir,
                                      boolean recursive,
                                      Set excludeDirs) throws IOException {
       if (!targetDir.exists() && !targetDir.mkdirs()) {
@@ -2038,9 +2038,9 @@ public class Driver {
       File[] sourceFiles = sourceDir.listFiles();
       for (int i=0; i<sourceFiles.length; ++i) {
          if (sourceFiles[i].isDirectory()) {
-            if (recursive && (null == excludeDirs 
+            if (recursive && (null == excludeDirs
                               || !excludeDirs.contains(sourceFiles[i].getName()))) {
-               File targetSubDir = new File(targetDir, 
+               File targetSubDir = new File(targetDir,
                                             sourceFiles[i].getName());
                if (targetSubDir.exists() || targetSubDir.mkdir()) {
                   copyDirectory(sourceFiles[i], targetSubDir, recursive, null);
@@ -2077,7 +2077,7 @@ public class Driver {
       // Create index
 
       // Collect index
-            
+
       Map indexMap = new TreeMap(new Comparator() {
             public int compare(Object o1, Object o2) {
                return o1.toString().toLowerCase().compareTo(o2.toString().toLowerCase());
@@ -2135,7 +2135,7 @@ public class Driver {
       println("<!DOCTYPE gjdoc SYSTEM \"dtd/gjdoc-alphaindex.dtd\">");
       println();
       printOpenTag(0, "alphaindex xmlns=\"http://www.w3.org/TR/REC-html40\" xmlns:gjdoc=\"http://www.gnu.org/software/cp-tools/gjdocxml\"");
-      
+
       Iterator it = indexMap.keySet().iterator();
 
       char previousCategoryLetter = '\0';
@@ -2235,8 +2235,8 @@ public class Driver {
          this.id = id;
       }
 
-      public String toString() { 
-         return "UsageType{id=" + id + "}"; 
+      public String toString() {
+         return "UsageType{id=" + id + "}";
       }
 
       public String getId() {
@@ -2281,7 +2281,7 @@ public class Driver {
          ClassDoc clazz = classes[i];
 
          // classes derived from
-         for (ClassDoc superclass = clazz.superclass(); superclass != null; 
+         for (ClassDoc superclass = clazz.superclass(); superclass != null;
               superclass = superclass.superclass()) {
             addUsedBy(superclass, UsageType.CLASS_DERIVED_FROM, clazz, clazz.containingPackage());
          }
@@ -2290,10 +2290,10 @@ public class Driver {
          for (int j = 0, jlim = fields.length; j < jlim; ++ j) {
             FieldDoc field = fields[j];
 
-            // fields of type                  
+            // fields of type
             ClassDoc fieldType = field.type().asClassDoc();
             if (null != fieldType) {
-               addUsedBy(fieldType, UsageType.FIELD_OF_TYPE, 
+               addUsedBy(fieldType, UsageType.FIELD_OF_TYPE,
                          field, clazz.containingPackage());
             }
          }
@@ -2306,7 +2306,7 @@ public class Driver {
 
             ClassDoc returnType = method.returnType().asClassDoc();
             if (null != returnType) {
-               addUsedBy(returnType, UsageType.METHOD_WITH_RETURN_TYPE, 
+               addUsedBy(returnType, UsageType.METHOD_WITH_RETURN_TYPE,
                          method, clazz.containingPackage());
             }
             Parameter[] parameters = method.parameters();
@@ -2317,7 +2317,7 @@ public class Driver {
                Parameter parameter = parameters[k];
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
-                  addUsedBy(parameterType, UsageType.METHOD_WITH_PARAMETER_TYPE, 
+                  addUsedBy(parameterType, UsageType.METHOD_WITH_PARAMETER_TYPE,
                             method, clazz.containingPackage());
                }
             }
@@ -2327,11 +2327,11 @@ public class Driver {
             ClassDoc[] thrownExceptions = method.thrownExceptions();
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
-               addUsedBy(thrownException, UsageType.METHOD_WITH_THROWN_TYPE, 
+               addUsedBy(thrownException, UsageType.METHOD_WITH_THROWN_TYPE,
                          method, clazz.containingPackage());
             }
          }
-                  
+
          ConstructorDoc[] constructors = clazz.constructors();
          for (int j = 0, jlim = constructors.length; j < jlim; ++ j) {
 
@@ -2341,11 +2341,11 @@ public class Driver {
             for (int k = 0, klim = parameters.length; k < klim; ++ k) {
 
                // constructors with parameter type
-                     
+
                Parameter parameter = parameters[k];
                ClassDoc parameterType = parameter.type().asClassDoc();
                if (null != parameterType) {
-                  addUsedBy(parameterType, UsageType.CONSTRUCTOR_WITH_PARAMETER_TYPE, 
+                  addUsedBy(parameterType, UsageType.CONSTRUCTOR_WITH_PARAMETER_TYPE,
                             constructor, clazz.containingPackage());
                }
             }
@@ -2355,7 +2355,7 @@ public class Driver {
             ClassDoc[] thrownExceptions = constructor.thrownExceptions();
             for (int k = 0, klim = thrownExceptions.length; k < klim; ++ k) {
                ClassDoc thrownException = thrownExceptions[k];
-               addUsedBy(thrownException, UsageType.CONSTRUCTOR_WITH_THROWN_TYPE, 
+               addUsedBy(thrownException, UsageType.CONSTRUCTOR_WITH_THROWN_TYPE,
                          constructor, clazz.containingPackage());
             }
          }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java
index e2297d8e968..6744947afe1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/Driver1_4.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -62,15 +62,15 @@ public class Driver1_4 extends Driver {
    /* since 1.4
    private void outputSourcePosition(int level, SourcePosition sourcePosition) {
       println(level, "<sourceposition"
-	      + " file=\""+sourcePosition.file().toString()+"\""
-	      + " line=\""+sourcePosition.line()+"\""
-	      + " column=\""+sourceposition.column()+"\""
-	      + "/>");
+              + " file=\""+sourcePosition.file().toString()+"\""
+              + " line=\""+sourcePosition.line()+"\""
+              + " column=\""+sourceposition.column()+"\""
+              + "/>");
    }
    */
 
-   protected void outputClassDoc(ClassDoc classDoc) 
-      throws IOException 
+   protected void outputClassDoc(ClassDoc classDoc)
+      throws IOException
    {
       super.outputClassDoc(classDoc);
       //outputSourcePosition(level, doc.position());
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java
index 175d4e864a1..582a45b32fd 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/HtmlRepairer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -55,17 +55,17 @@ public final class HtmlRepairer {
       private Set parentTags = new HashSet();
 
       public TagInfo(String parentTag) {
-	 this.parentTags.add(parentTag);
+         this.parentTags.add(parentTag);
       }
 
       public TagInfo(String[] parentTagArr) {
-	 for (int i=0; i<parentTagArr.length; ++i) {
-	    this.parentTags.add(parentTagArr[i]);
-	 }
+         for (int i=0; i<parentTagArr.length; ++i) {
+            this.parentTags.add(parentTagArr[i]);
+         }
       }
 
       public boolean isLegalParentTag(String tag) {
-	 return this.parentTags.contains(tag);
+         return this.parentTags.contains(tag);
       }
    }
 
@@ -94,7 +94,7 @@ public final class HtmlRepairer {
       tagInfoMap.put("param", new TagInfo(new String[] { "applet" }));
 
       String[] noTextParentTagArr = {
-         "area", "base", "body", "br", "dd", "dt", "head", "hr", "html", 
+         "area", "base", "body", "br", "dd", "dt", "head", "hr", "html",
          "img", "input", "link", "map", "meta", "ol", "optgroup", "param",
          "select", "table", "tbody", "tfoot", "thead", "tr", "ul",
       };
@@ -105,9 +105,9 @@ public final class HtmlRepairer {
       }
    }
 
-   public HtmlRepairer(DocErrorReporter warningReporter, 
-		       boolean noWarn, boolean noEmailWarn,
-		       ClassDoc contextClass, MemberDoc contextMember,
+   public HtmlRepairer(DocErrorReporter warningReporter,
+                       boolean noWarn, boolean noEmailWarn,
+                       ClassDoc contextClass, MemberDoc contextMember,
                        boolean throwAwayLeadingPara) {
       this.warningReporter = warningReporter;
       this.noWarn = noWarn;
@@ -116,16 +116,16 @@ public final class HtmlRepairer {
       this.contextMember = contextMember;
       this.throwAwayLeadingPara = throwAwayLeadingPara;
    }
-  
+
    private static String replaceStr(String haystack, String needle, String replacement) {
       int ndx=haystack.indexOf(needle);
-      if (ndx<0) 
-	 return haystack;
-      else 
-	 return haystack.substring(0, ndx)+replacement
-	    + replaceStr(haystack.substring(ndx+needle.length()), needle, replacement);
+      if (ndx<0)
+         return haystack;
+      else
+         return haystack.substring(0, ndx)+replacement
+            + replaceStr(haystack.substring(ndx+needle.length()), needle, replacement);
    }
- 
+
    private void haveText(String text) {
 
       if (isLeadingTag && throwAwayLeadingPara) {
@@ -163,9 +163,9 @@ public final class HtmlRepairer {
       boolean isAtomTag = tag.endsWith("/");
 
       if (isEndTag && isAtomTag) {
-	 // got something like '</a/>' which is invalid.
-	 // suppose a close tag was intended.
-	 tag = tag.substring(0, tag.length()-1);
+         // got something like '</a/>' which is invalid.
+         // suppose a close tag was intended.
+         tag = tag.substring(0, tag.length()-1);
       }
 
       if (tag.length() < 1) {
@@ -177,19 +177,19 @@ public final class HtmlRepairer {
       String tagAttributes = "";
 
       for (int i=0; i<tagName.length(); ++i) {
-	 if (" \t\r\n".indexOf(tagName.charAt(i))>=0) {
-	    tagAttributes = tagName.substring(i).trim();
-	    tagName = tagName.substring(0, i);
-	    break;
-	 }
+         if (" \t\r\n".indexOf(tagName.charAt(i))>=0) {
+            tagAttributes = tagName.substring(i).trim();
+            tagName = tagName.substring(0, i);
+            break;
+         }
       }
 
       if (!isEndTag && tagName.indexOf('@')>0) {
-	 if (!noEmailWarn) {
-	    printWarning("Tag looks like email address: <"+tagName+">");
-	 }
-	 output.append("<"+tag+">");
-	 return;
+         if (!noEmailWarn) {
+            printWarning("Tag looks like email address: <"+tagName+">");
+         }
+         output.append("<"+tag+">");
+         return;
       }
 
       tagName = tagName.toLowerCase();
@@ -199,189 +199,189 @@ public final class HtmlRepairer {
       }
 
       if ("p".equals(tagName) || "br".equals(tagName) || "hr".equals(tagName)) {
-	 // throw away </p> and </br>
-	 if (isEndTag) {
-	    return;
-	 }
-	 // make sure every <p> is a <p/> and every <br> is a <br/>
-	 else if (!isAtomTag) {
-	    tag += "/";
-	    isAtomTag = true;
-	 }
+         // throw away </p> and </br>
+         if (isEndTag) {
+            return;
+         }
+         // make sure every <p> is a <p/> and every <br> is a <br/>
+         else if (!isAtomTag) {
+            tag += "/";
+            isAtomTag = true;
+         }
       }
 
       if (isEndTag) {
 
-	 // check whether this close tag is on the stack
-	 // if yes, close all tags up to this tag
-	 if (tagStack.contains(tagName)) {
-	    String popped;
-	    do {
-	       popped = (String)tagStack.pop();
-	       if (!popped.equals(tagName)) 
-		  printWarning("Inserting '</"+popped+">");
-	       output.append("</"+popped+">");
-	    }
-	    while (!popped.equals(tagName));
-	 }
-	 // if not, just throw it away
-	 else {
-	    printWarning("Deleting <"+tag+">");
-	 }
+         // check whether this close tag is on the stack
+         // if yes, close all tags up to this tag
+         if (tagStack.contains(tagName)) {
+            String popped;
+            do {
+               popped = (String)tagStack.pop();
+               if (!popped.equals(tagName))
+                  printWarning("Inserting '</"+popped+">");
+               output.append("</"+popped+">");
+            }
+            while (!popped.equals(tagName));
+         }
+         // if not, just throw it away
+         else {
+            printWarning("Deleting <"+tag+">");
+         }
       }
       else {
 
-	 final int STATE_INITIAL = 1;
-	 final int STATE_EXPECT_ATTRIBUTENAME = 2;
-	 final int STATE_UNQUOTED_ATTRIBUTEVALUE = 3;
-	 final int STATE_SINGLEQUOTE_ATTRIBUTEVALUE = 4;
-	 final int STATE_DOUBLEQUOTE_ATTRIBUTEVALUE = 5;
-	 final int STATE_EXPECT_ATTRIBUTEVALUE = 6;
-	 final int STATE_EXPECT_EQUALSIGN = 7;
+         final int STATE_INITIAL = 1;
+         final int STATE_EXPECT_ATTRIBUTENAME = 2;
+         final int STATE_UNQUOTED_ATTRIBUTEVALUE = 3;
+         final int STATE_SINGLEQUOTE_ATTRIBUTEVALUE = 4;
+         final int STATE_DOUBLEQUOTE_ATTRIBUTEVALUE = 5;
+         final int STATE_EXPECT_ATTRIBUTEVALUE = 6;
+         final int STATE_EXPECT_EQUALSIGN = 7;
 
-	 int state = STATE_INITIAL;
-	       
-	 String newAttributes = "";
-	 String attributeName = null;
-	 StringBuffer buf = new StringBuffer();
+         int state = STATE_INITIAL;
 
-	 char[] attrsAsChars = tagAttributes.toCharArray();
-	 for (int i=0, ilim=attrsAsChars.length+1; i<ilim; ++i) {
-	    int c;
-	    if (i<attrsAsChars.length)
-	       c = (int)attrsAsChars[i];
-	    else
-	       c = -1;
+         String newAttributes = "";
+         String attributeName = null;
+         StringBuffer buf = new StringBuffer();
 
-	    switch (state) {
+         char[] attrsAsChars = tagAttributes.toCharArray();
+         for (int i=0, ilim=attrsAsChars.length+1; i<ilim; ++i) {
+            int c;
+            if (i<attrsAsChars.length)
+               c = (int)attrsAsChars[i];
+            else
+               c = -1;
 
-	    case STATE_INITIAL:
-	       if (" \t\r\n".indexOf(c)>=0){
-		  continue;
-	       }
-	       else if (-1==c) {
-		  continue;
-	       }
-	       else {
-		  state = STATE_EXPECT_ATTRIBUTENAME;
-		  buf.append((char)c);
-	       }
-	       break;
+            switch (state) {
 
-	    case STATE_EXPECT_ATTRIBUTENAME:
-	       if ('='==c) {
-		  attributeName = buf.toString();
-		  buf.setLength(0);
-		  state = STATE_EXPECT_ATTRIBUTEVALUE;
-	       }
-	       else if (-1==c) {
-		  attributeName = buf.toString();
-		  buf.setLength(0);
-		  printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\"");
-	       }
-	       else if (" \t\r\n".indexOf(c)>=0) {
-		  state = STATE_EXPECT_EQUALSIGN;
-	       }
-	       else {
-		  buf.append((char)c);
-	       }
-	       break;
+            case STATE_INITIAL:
+               if (" \t\r\n".indexOf(c)>=0){
+                  continue;
+               }
+               else if (-1==c) {
+                  continue;
+               }
+               else {
+                  state = STATE_EXPECT_ATTRIBUTENAME;
+                  buf.append((char)c);
+               }
+               break;
 
-	    case STATE_EXPECT_EQUALSIGN:
-	       if (" \t\r\n".indexOf(c)>=0){
-		  continue;
-	       }
-	       else if ('='==c) {
-		  state = STATE_EXPECT_ATTRIBUTEVALUE;
-		  attributeName = buf.toString();
-		  buf.setLength(0);
-	       }
-	       else {
-		  attributeName = buf.toString();
-		  buf.setLength(0);
-		  printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\"");
-		  newAttributes += " "+attributeName+"=\""+attributeName+"\"";
-		  buf.append((char)c);
-		  state = STATE_EXPECT_ATTRIBUTENAME;
-	       }
-	       break;
+            case STATE_EXPECT_ATTRIBUTENAME:
+               if ('='==c) {
+                  attributeName = buf.toString();
+                  buf.setLength(0);
+                  state = STATE_EXPECT_ATTRIBUTEVALUE;
+               }
+               else if (-1==c) {
+                  attributeName = buf.toString();
+                  buf.setLength(0);
+                  printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\"");
+               }
+               else if (" \t\r\n".indexOf(c)>=0) {
+                  state = STATE_EXPECT_EQUALSIGN;
+               }
+               else {
+                  buf.append((char)c);
+               }
+               break;
 
-	    case STATE_EXPECT_ATTRIBUTEVALUE:
-	       if (" \t\r\n".indexOf(c)>=0){
-		  continue;
-	       }
-	       else if ('\"'==c) {
-		  state = STATE_DOUBLEQUOTE_ATTRIBUTEVALUE;
-	       }
-	       else if ('\''==c) {
-		  state = STATE_SINGLEQUOTE_ATTRIBUTEVALUE;
-	       }
-	       else {
-		  state = STATE_UNQUOTED_ATTRIBUTEVALUE;
-		  buf.append((char)c);
-	       }
-	       break;
+            case STATE_EXPECT_EQUALSIGN:
+               if (" \t\r\n".indexOf(c)>=0){
+                  continue;
+               }
+               else if ('='==c) {
+                  state = STATE_EXPECT_ATTRIBUTEVALUE;
+                  attributeName = buf.toString();
+                  buf.setLength(0);
+               }
+               else {
+                  attributeName = buf.toString();
+                  buf.setLength(0);
+                  printWarning("In Tag '"+tag+"':\nAttribute name without a value, inserting value =\""+attributeName+"\"");
+                  newAttributes += " "+attributeName+"=\""+attributeName+"\"";
+                  buf.append((char)c);
+                  state = STATE_EXPECT_ATTRIBUTENAME;
+               }
+               break;
 
-	    case STATE_UNQUOTED_ATTRIBUTEVALUE:
-	       if (-1==c || " \t\r\n".indexOf(c)>=0){
-		  state = STATE_INITIAL;
-		  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
-		  buf.setLength(0);
-	       }
-	       else {
-		  buf.append((char)c);
-	       }
-	       break;
+            case STATE_EXPECT_ATTRIBUTEVALUE:
+               if (" \t\r\n".indexOf(c)>=0){
+                  continue;
+               }
+               else if ('\"'==c) {
+                  state = STATE_DOUBLEQUOTE_ATTRIBUTEVALUE;
+               }
+               else if ('\''==c) {
+                  state = STATE_SINGLEQUOTE_ATTRIBUTEVALUE;
+               }
+               else {
+                  state = STATE_UNQUOTED_ATTRIBUTEVALUE;
+                  buf.append((char)c);
+               }
+               break;
 
-	    case STATE_SINGLEQUOTE_ATTRIBUTEVALUE:
-	       if ('\''==c) {
-		  state = STATE_INITIAL;
-		  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
-		  buf.setLength(0);
-	       }
-	       else {
-		  buf.append((char)c);
-	       }
-	       break;
+            case STATE_UNQUOTED_ATTRIBUTEVALUE:
+               if (-1==c || " \t\r\n".indexOf(c)>=0){
+                  state = STATE_INITIAL;
+                  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
+                  buf.setLength(0);
+               }
+               else {
+                  buf.append((char)c);
+               }
+               break;
 
-	    case STATE_DOUBLEQUOTE_ATTRIBUTEVALUE:
-	       if ('\"'==c) {
-		  state = STATE_INITIAL;
-		  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
-		  buf.setLength(0);
-	       }
-	       else {
-		  buf.append((char)c);
-	       }
-	       break;
-	    }
-	 }
+            case STATE_SINGLEQUOTE_ATTRIBUTEVALUE:
+               if ('\''==c) {
+                  state = STATE_INITIAL;
+                  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
+                  buf.setLength(0);
+               }
+               else {
+                  buf.append((char)c);
+               }
+               break;
+
+            case STATE_DOUBLEQUOTE_ATTRIBUTEVALUE:
+               if ('\"'==c) {
+                  state = STATE_INITIAL;
+                  newAttributes += " "+attributeName + "=\"" + buf.toString() + "\"";
+                  buf.setLength(0);
+               }
+               else {
+                  buf.append((char)c);
+               }
+               break;
+            }
+         }
 
 
-	 if (!isAtomTag) {
+         if (!isAtomTag) {
 
-	    // check whether this open tag is equal to the topmost
-	    // entry on the stack; if yes, emit a close tag first
-	    
-	    // corrects stuff like '<tr><td>...<td>...');
-	    if (!tagStack.isEmpty() && tagStack.peek().equals(tagName)) {
-	       printWarning("Inserting </"+tagName+">");
-	       output.append("</"+tagName+">");
-	       tagStack.pop();
-	    }
-	    else {
-	       processKnownChildTags(tagName, tagStack, output);
-	    }
+            // check whether this open tag is equal to the topmost
+            // entry on the stack; if yes, emit a close tag first
 
-	    // otherwise, we assume there are no close tags required 
-	    // before this open tag.
-	    tagStack.push(tagName);
+            // corrects stuff like '<tr><td>...<td>...');
+            if (!tagStack.isEmpty() && tagStack.peek().equals(tagName)) {
+               printWarning("Inserting </"+tagName+">");
+               output.append("</"+tagName+">");
+               tagStack.pop();
+            }
+            else {
+               processKnownChildTags(tagName, tagStack, output);
+            }
 
-	    output.append("<"+tagName+newAttributes+">");
-	 }
-	 else {
-	    output.append("<"+tagName+newAttributes+"/>");
-	 }
+            // otherwise, we assume there are no close tags required
+            // before this open tag.
+            tagStack.push(tagName);
+
+            output.append("<"+tagName+newAttributes+">");
+         }
+         else {
+            output.append("<"+tagName+newAttributes+"/>");
+         }
       }
    }
 
@@ -390,33 +390,33 @@ public final class HtmlRepairer {
       TagInfo tagInfo = (TagInfo)tagInfoMap.get(tagName);
       if (null != tagInfo) {
 
-	 String parentTag = null;
-	 for (Enumeration en = tagStack.elements(); en.hasMoreElements(); ) {
-	    String tag = (String)en.nextElement();
-	    if (tagInfo.isLegalParentTag(tag)) {
-	       parentTag = tag;
-	       break;
-	    }
-	 }
-	 if (parentTag != null) {
-	    while (((String)tagStack.peek()) != parentTag) {
-	       String poppedTagName = (String)tagStack.pop();
-	       output.append("</"+poppedTagName+">");
-	       printWarning("Inserting </"+poppedTagName+">");
-	    }
-	    return true;
-	 }
+         String parentTag = null;
+         for (Enumeration en = tagStack.elements(); en.hasMoreElements(); ) {
+            String tag = (String)en.nextElement();
+            if (tagInfo.isLegalParentTag(tag)) {
+               parentTag = tag;
+               break;
+            }
+         }
+         if (parentTag != null) {
+            while (((String)tagStack.peek()) != parentTag) {
+               String poppedTagName = (String)tagStack.pop();
+               output.append("</"+poppedTagName+">");
+               printWarning("Inserting </"+poppedTagName+">");
+            }
+            return true;
+         }
       }
       return false;
    }
 
    private void flush() {
-      
+
       // close all pending tags
       while (!tagStack.isEmpty()) {
-	 String tagName = (String)tagStack.pop();
-	 printWarning("Inserting </"+tagName+">");
-	 output.append("</"+tagName+">");
+         String tagName = (String)tagStack.pop();
+         printWarning("Inserting </"+tagName+">");
+         output.append("</"+tagName+">");
       }
    }
 
@@ -429,16 +429,16 @@ public final class HtmlRepairer {
     *
     *  Currently, the returned String is not guaranteed to be
     *  well-formed. In particular there are no checks on the tag
-    *  names, attribute names and entity names.  
+    *  names, attribute names and entity names.
     */
    public String getWellformedHTML(String text) {
 
-      final int	STATE_INITIAL	      = 1;
-      final int	STATE_TAG_START	      = 2;
-      final int	STATE_TAG	      = 3;
-      final int	STATE_TAG_DOUBLEQUOTE = 4;
-      final int	STATE_TAG_SINGLEQUOTE = 5;
-      final int	STATE_AMP	      = 6;
+      final int STATE_INITIAL         = 1;
+      final int STATE_TAG_START       = 2;
+      final int STATE_TAG             = 3;
+      final int STATE_TAG_DOUBLEQUOTE = 4;
+      final int STATE_TAG_SINGLEQUOTE = 5;
+      final int STATE_AMP             = 6;
 
       int state = STATE_INITIAL;
       output.setLength(0);
@@ -446,74 +446,74 @@ public final class HtmlRepairer {
 
       StringBuffer buf = new StringBuffer();
       char[] textAsChars = text.toCharArray();
-      
+
    outer_loop:
       for (int i=0, ilim=textAsChars.length+1; i<ilim; ++i) {
-	 int c;
+         int c;
 
-	 if (i<textAsChars.length) {
-	    c = textAsChars[i];
-	 }
-	 else {
-	    c = -1;
-	 }
+         if (i<textAsChars.length) {
+            c = textAsChars[i];
+         }
+         else {
+            c = -1;
+         }
 
-	 switch (state) {
+         switch (state) {
 
-	 case STATE_INITIAL:
-	    if ('<'==c) {
-	       state = STATE_TAG_START;
-	       if (buf.length()>0) {
-		  haveText(buf.toString());
-		  buf.setLength(0);
-	       }
-	    }
-	    else if ('>'==c) {
-	       // assume this is a greater-than sign
-	       buf.append(">");
-	    }
-	    else if ('&'==c) {
-	       state = STATE_AMP;
-	    }
-	    else if (-1==c) {
-	       if (buf.length()>0) {
-		  haveText(buf.toString());
-		  buf.setLength(0);
-	       }
-	       continue;
-	    }
-	    else {
-	       buf.append((char)c);
-	    }
-	    break;
+         case STATE_INITIAL:
+            if ('<'==c) {
+               state = STATE_TAG_START;
+               if (buf.length()>0) {
+                  haveText(buf.toString());
+                  buf.setLength(0);
+               }
+            }
+            else if ('>'==c) {
+               // assume this is a greater-than sign
+               buf.append(">");
+            }
+            else if ('&'==c) {
+               state = STATE_AMP;
+            }
+            else if (-1==c) {
+               if (buf.length()>0) {
+                  haveText(buf.toString());
+                  buf.setLength(0);
+               }
+               continue;
+            }
+            else {
+               buf.append((char)c);
+            }
+            break;
 
-	 case STATE_AMP:
-	    if ('<'==c) {
-	       buf.append("&");
-	       state = STATE_TAG_START;
-	       if (buf.length()>0) {
-		  haveText(buf.toString());
-		  buf.setLength(0);
-	       }
-	    }
-	    else if ('>'==c) {
-	       // assume this is a greater-than sign
-	       buf.append("&");
-	       buf.append(">");
-	       state = STATE_INITIAL;
-	    }
-	    else if ('&'==c) {
-	       buf.append("&");
-	       buf.append("&");
-	       state = STATE_INITIAL;
-	    }
-	    else if (-1==c) {
-	       buf.append("&");
-	       haveText(buf.toString());
-	       buf.setLength(0);
-	       state = STATE_INITIAL;
-	       continue;
-	    }
+         case STATE_AMP:
+            if ('<'==c) {
+               buf.append("&");
+               state = STATE_TAG_START;
+               if (buf.length()>0) {
+                  haveText(buf.toString());
+                  buf.setLength(0);
+               }
+            }
+            else if ('>'==c) {
+               // assume this is a greater-than sign
+               buf.append("&");
+               buf.append(">");
+               state = STATE_INITIAL;
+            }
+            else if ('&'==c) {
+               buf.append("&");
+               buf.append("&");
+               state = STATE_INITIAL;
+            }
+            else if (-1==c) {
+               buf.append("&");
+               haveText(buf.toString());
+               buf.setLength(0);
+               state = STATE_INITIAL;
+               continue;
+            }
             else {
                // peek forward and see whether this is a valid entity.
                if ('#'==c) {
@@ -543,114 +543,114 @@ public final class HtmlRepairer {
                }
                buf.append("&");
                buf.append((char)c);
-               state = STATE_INITIAL;                  
+               state = STATE_INITIAL;
             }
 
             /*
-	    else if ('#'==c || Character.isLetter((char)c)) {
-	       buf.append("&");
-	       buf.append((char)c);
-	       state = STATE_INITIAL;
-	    }
-	    else {
-	       buf.append("&");
-	       buf.append((char)c);
-	       state = STATE_INITIAL;	       
-	    }
+            else if ('#'==c || Character.isLetter((char)c)) {
+               buf.append("&");
+               buf.append((char)c);
+               state = STATE_INITIAL;
+            }
+            else {
+               buf.append("&");
+               buf.append((char)c);
+               state = STATE_INITIAL;
+            }
             */
-	    break;
-	    
-	 case STATE_TAG_START:
-	    if (" \t\r\n".indexOf(c)>=0) {
-	       //continue;
+            break;
 
-	       // new: assume this is a less-sign
-	       haveText("<"+c);
-	       state = STATE_INITIAL;
-	    }
-	    else if ('/'==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG;
-	    }
-	    else if ('<'==c) {
-	       // assume this is a less-sign
-	       haveText("<<");
-	       state = STATE_INITIAL;	       
-	    }
-	    else if ('>'==c) {
-	       // assume this is a less-sign
-	       haveText("<>");
-	       state = STATE_INITIAL;	       
-	    }
-	    //else if ('-'==c || '+'==c || '='==c || '\''==c || "0123456789".indexOf(c)>=0) {
-	    else if (!Character.isLetter((char)c)) {
-	       // assume this is a less-sign
-	       haveText("<"+(char)c);
-	       state = STATE_INITIAL;
-	    }
-	    else {
-	       buf.append((char)c);
-	       state = STATE_TAG;
-	    }
-	    break;
-	    
-	 case STATE_TAG:
-	    if ('\"'==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG_DOUBLEQUOTE;
-	    }
-	    else if ('\''==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG_SINGLEQUOTE;
-	    }
-	    else if ('>'==c) {
-	       state = STATE_INITIAL;
-	       haveStartOrEndTag(buf.toString());
-	       buf.setLength(0);
-	    }
-	    else if ('<'==c) {
-	       // notify user, missing greater-than sign
-	       haveStartOrEndTag(buf.toString());
-	       buf.setLength(0);
-	    }
-	    else if (-1==c) {
-	       printWarning("Unclosed tag at end-of-comment: <"+buf);
-	       haveStartOrEndTag(buf.toString());
-	       buf.setLength(0);
-	    }
-	    else {
-	       buf.append((char)c);
-	    }
-	    break;
+         case STATE_TAG_START:
+            if (" \t\r\n".indexOf(c)>=0) {
+               //continue;
 
-	 case STATE_TAG_DOUBLEQUOTE:
-	    if ('\"'==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG;
-	    }
-	    else if (-1==c) {
-	       printWarning("Unclosed attribute value at end-of-comment.");
-	       haveStartOrEndTag(buf.toString()+"\"");
-	    }
-	    else {
-	       buf.append((char)c);
-	    }
-	    break;
+               // new: assume this is a less-sign
+               haveText("<"+c);
+               state = STATE_INITIAL;
+            }
+            else if ('/'==c) {
+               buf.append((char)c);
+               state = STATE_TAG;
+            }
+            else if ('<'==c) {
+               // assume this is a less-sign
+               haveText("<<");
+               state = STATE_INITIAL;
+            }
+            else if ('>'==c) {
+               // assume this is a less-sign
+               haveText("<>");
+               state = STATE_INITIAL;
+            }
+            //else if ('-'==c || '+'==c || '='==c || '\''==c || "0123456789".indexOf(c)>=0) {
+            else if (!Character.isLetter((char)c)) {
+               // assume this is a less-sign
+               haveText("<"+(char)c);
+               state = STATE_INITIAL;
+            }
+            else {
+               buf.append((char)c);
+               state = STATE_TAG;
+            }
+            break;
 
-	 case STATE_TAG_SINGLEQUOTE:
-	    if ('\''==c) {
-	       buf.append((char)c);
-	       state = STATE_TAG;
-	    }
-	    else if (-1==c) {
-	       printWarning("Unclosed attribute value at end-of-comment.");
-	       haveStartOrEndTag(buf.toString()+"'");
-	    }
-	    else {
-	       buf.append((char)c);
-	    }
-	    break;
-	 }
+         case STATE_TAG:
+            if ('\"'==c) {
+               buf.append((char)c);
+               state = STATE_TAG_DOUBLEQUOTE;
+            }
+            else if ('\''==c) {
+               buf.append((char)c);
+               state = STATE_TAG_SINGLEQUOTE;
+            }
+            else if ('>'==c) {
+               state = STATE_INITIAL;
+               haveStartOrEndTag(buf.toString());
+               buf.setLength(0);
+            }
+            else if ('<'==c) {
+               // notify user, missing greater-than sign
+               haveStartOrEndTag(buf.toString());
+               buf.setLength(0);
+            }
+            else if (-1==c) {
+               printWarning("Unclosed tag at end-of-comment: <"+buf);
+               haveStartOrEndTag(buf.toString());
+               buf.setLength(0);
+            }
+            else {
+               buf.append((char)c);
+            }
+            break;
+
+         case STATE_TAG_DOUBLEQUOTE:
+            if ('\"'==c) {
+               buf.append((char)c);
+               state = STATE_TAG;
+            }
+            else if (-1==c) {
+               printWarning("Unclosed attribute value at end-of-comment.");
+               haveStartOrEndTag(buf.toString()+"\"");
+            }
+            else {
+               buf.append((char)c);
+            }
+            break;
+
+         case STATE_TAG_SINGLEQUOTE:
+            if ('\''==c) {
+               buf.append((char)c);
+               state = STATE_TAG;
+            }
+            else if (-1==c) {
+               printWarning("Unclosed attribute value at end-of-comment.");
+               haveStartOrEndTag(buf.toString()+"'");
+            }
+            else {
+               buf.append((char)c);
+            }
+            break;
+         }
       }
 
       return output.toString();
@@ -688,4 +688,3 @@ public final class HtmlRepairer {
       return output.toString();
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
index 6fdb8cb4875..6e05a5e966d 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/TargetContext.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java
index 3a8cabceb23..c5a9f82b9e7 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTranslet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -113,7 +113,7 @@ public class DocTranslet implements ErrorListener {
    private ClassLoader classLoader;
    private Map transformerMap = new java.util.HashMap(); //WeakHashMap();
    private DocTransletOptions options;
-   
+
    protected DocTranslet(String mainResourceFilename,
                          ClassLoader classLoader)
       throws DocTransletConfigurationException {
@@ -155,14 +155,14 @@ public class DocTranslet implements ErrorListener {
 
       try{
          URL mainResourceURL = classLoader == null ?
-	     ClassLoader.getSystemResource(mainResourceFilename):
-	     classLoader.getResource(mainResourceFilename);
+             ClassLoader.getSystemResource(mainResourceFilename):
+             classLoader.getResource(mainResourceFilename);
 
          if (null == mainResourceURL) {
             throw new DocTransletException("Cannot find resource '" + mainResourceFilename + "'");
          }
 
-         
+
          Map parameters = new HashMap();
          parameters.put("gjdoc.xmldoclet.version", Driver.XMLDOCLET_VERSION);
 
@@ -188,13 +188,13 @@ public class DocTranslet implements ErrorListener {
                                                  parameters);
 
          reporter.printNotice("Running DocTranslet...");
-            
-         TransformerFactory transformerFactory 
+
+         TransformerFactory transformerFactory
             = TransformerFactory.newInstance();
 
          transformerFactory.setErrorListener(this);
 
-         boolean isLibxmlJ 
+         boolean isLibxmlJ
             = transformerFactory.getClass().getName().equals("gnu.xml.libxmlj.transform.TransformerFactoryImpl");
 
          for (Iterator it = outputFileList.iterator(); it.hasNext(); ) {
@@ -234,7 +234,7 @@ public class DocTranslet implements ErrorListener {
             }
 
             if (null != fileInfo.getSource()) {
-            
+
                reporter.printNotice("Copying " + fileInfo.getComment() + "...");
                InputStream in = new URL(mainResourceURL, fileInfo.getSource()).openStream();
                FileOutputStream out = new FileOutputStream(targetFile.getAbsolutePath());
@@ -243,14 +243,14 @@ public class DocTranslet implements ErrorListener {
                out.close();
             }
             else {
-            
+
                reporter.printNotice("Generating " + fileInfo.getComment() + "...");
 
                String pathToRoot = "";
                for (File file = getParentFile(targetFile); !equalsFile(file, targetDirectory); file = getParentFile(file)) {
                   pathToRoot += "../";
                }
-            
+
                StreamResult out = new StreamResult(targetFile.getAbsolutePath());
 
                StreamSource in = new StreamSource(new File(xmlSourceDirectory, "index.xml").getAbsolutePath());
@@ -291,60 +291,60 @@ public class DocTranslet implements ErrorListener {
          }
       }
       catch (MalformedURLException e) {
-	 throw new DocTransletException(e);
+         throw new DocTransletException(e);
       }
       catch (TransformerFactoryConfigurationError e) {
-	 throw new DocTransletException(e);
+         throw new DocTransletException(e);
       }
       catch (TransformerException e) {
-	 throw new DocTransletException(e.getMessageAndLocation(), e);
+         throw new DocTransletException(e.getMessageAndLocation(), e);
       }
       catch (IOException e) {
-	 throw new DocTransletException(e);
+         throw new DocTransletException(e);
       }
       finally {
          System.setErr(err);
       }
    }
 
-   private List getOutputFileList(URL resource, File xmlSourceDirectory, Map parameters) 
+   private List getOutputFileList(URL resource, File xmlSourceDirectory, Map parameters)
       throws DocTransletException {
 
       try {
-	 List result;
+         List result;
 
-	 OutputStream out = new ByteArrayOutputStream();
+         OutputStream out = new ByteArrayOutputStream();
 
          DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
          DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
          Document document = documentBuilder.newDocument();
-         DOMResult domResult = new DOMResult(document);         
+         DOMResult domResult = new DOMResult(document);
          {
             StreamSource source = new StreamSource(resource.toExternalForm());
-            
+
             TransformerFactory transformerFactory = TransformerFactory.newInstance();
             Transformer transformer = (Transformer)transformerFactory.newTransformer(source);
-            
+
             transformer.clearParameters();
             for (Iterator pit = parameters.keySet().iterator(); pit.hasNext(); ) {
                String key = (String)pit.next();
                String value = (String)parameters.get(key);
                transformer.setParameter(key, value);
             }
-            
-            transformer.transform(new StreamSource(new File(xmlSourceDirectory, 
-                                                            "index.xml").getAbsolutePath()), 
+
+            transformer.transform(new StreamSource(new File(xmlSourceDirectory,
+                                                            "index.xml").getAbsolutePath()),
                                   domResult);
          }
 
-         {	 
+         {
             NodeList nodeList = document.getElementsByTagName("outputfile");
             result = new ArrayList(nodeList.getLength());
 
             for (int i=0; i<nodeList.getLength(); ++i) {
                Element elem = (Element)nodeList.item(i);
                String name    = getTextContent(elem.getElementsByTagName("name").item(0));
-               String source  
+               String source
                   = (null != elem.getElementsByTagName("source").item(0))
                   ? getTextContent(elem.getElementsByTagName("source").item(0))
                   : null;
@@ -368,13 +368,13 @@ public class DocTranslet implements ErrorListener {
          return result;
       }
       catch (TransformerFactoryConfigurationError e) {
-	 throw new DocTransletException(e);
+         throw new DocTransletException(e);
       }
       catch (TransformerException e) {
-	 throw new DocTransletException(e.getMessageAndLocation(), e);
+         throw new DocTransletException(e.getMessageAndLocation(), e);
       }
       catch (ParserConfigurationException e) {
-	 throw new DocTransletException(e);
+         throw new DocTransletException(e);
       }
    }
 
@@ -399,36 +399,36 @@ public class DocTranslet implements ErrorListener {
    }
 
 
-   public static DocTranslet fromClasspath(String resourceName) 
+   public static DocTranslet fromClasspath(String resourceName)
       throws DocTransletConfigurationException {
 
-      return new DocTranslet(resourceName, 
+      return new DocTranslet(resourceName,
                              DocTranslet.class.getClassLoader());
    }
 
-   public static DocTranslet fromJarFile(File jarFile) 
+   public static DocTranslet fromJarFile(File jarFile)
       throws DocTransletConfigurationException {
 
       try {
          JarFile inputJarFile = new JarFile(jarFile, false, JarFile.OPEN_READ);
-      
+
          Manifest manifest = inputJarFile.getManifest();
-         
+
          if (null == manifest) {
-         
+
             throw new DocTransletConfigurationException("Jar file '" + jarFile + "' doesn't contain a manifest.");
          }
-         
+
          Attributes mainAttributes = manifest.getMainAttributes();
-      
+
          String docTransletMainEntry = mainAttributes.getValue("doctranslet-main-entry");
 
          if (null == docTransletMainEntry) {
-            
+
             throw new DocTransletConfigurationException("Manifest in Jar file '" + jarFile + "' doesn't contain a doctranslet-main-entry specification.");
          }
-         
-         return new DocTranslet(docTransletMainEntry, 
+
+         return new DocTranslet(docTransletMainEntry,
                                 new JarClassLoader(inputJarFile));
       }
       catch (IOException e) {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
index 1992d166249..092d0cea73f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletConfigurationException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java
index bfb3f7697bd..96ffefa0fb1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java
index 8bf65835898..5c99ec3bd39 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/DocTransletOptions.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java
index f6eb679f84b..b7b100be1cf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/JarClassLoader.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -59,24 +59,24 @@ public class JarClassLoader extends ClassLoader {
       return defineClass(name, b, 0, b.length);
    }
 
-   private byte[] loadClassData(String className) 
-      throws ClassNotFoundException 
+   private byte[] loadClassData(String className)
+      throws ClassNotFoundException
    {
       String classFileName = className.replace('.', File.separatorChar) + ".class";
 
       try {
          JarEntry jarEntry = jarFile.getJarEntry(classFileName);
          if (null != jarEntry) {
-            return readFromStream(jarFile.getInputStream(jarEntry), 
+            return readFromStream(jarFile.getInputStream(jarEntry),
                                   jarEntry.getSize());
          }
       }
       catch (IOException ignore_) {
       }
       throw new ClassNotFoundException(className);
-   }      
+   }
 
-   private byte[] readFromStream(InputStream in, long size) 
+   private byte[] readFromStream(InputStream in, long size)
       throws IOException
    {
       byte[] result = new byte[(int)size];
diff --git a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java
index b4e394cec54..b0ede615de2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/doclets/xmldoclet/doctranslet/OutputFileInfo.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java b/libjava/classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java
index 455389127fd..53a4f3d1d11 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/getopt/FileArgumentCallback.java
@@ -54,7 +54,7 @@ public abstract class FileArgumentCallback
 
   /**
    * This is called when a file argument is seen.
-   * 
+   *
    * @param fileArgument the file name
    */
   public abstract void notifyFile(String fileArgument)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/Option.java b/libjava/classpath/tools/gnu/classpath/tools/getopt/Option.java
index 53255811eb1..e7b5d82e71b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/getopt/Option.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/getopt/Option.java
@@ -63,7 +63,7 @@ public abstract class Option
 
   /**
    * Create a new option with the given short name and description.
-   * 
+   *
    * @param shortName the short name
    * @param description the description
    */
@@ -77,7 +77,7 @@ public abstract class Option
 
   /**
    * Create a new option with the given short name and description.
-   * 
+   *
    * @param shortName the short name
    * @param description the description
    * @param argumentName the descriptive name of the argument, if this option
@@ -94,7 +94,7 @@ public abstract class Option
 
   /**
    * Create a new option with the given short name and description.
-   * 
+   *
    * @param shortName the short name
    * @param description the description
    * @param argumentName the descriptive name of the argument, if this option
@@ -115,7 +115,7 @@ public abstract class Option
   /**
    * Create a new option with the given long name and description. The long name
    * should be specified without any leading dashes.
-   * 
+   *
    * @param longName the long name
    * @param description the description
    */
@@ -128,7 +128,7 @@ public abstract class Option
   /**
    * Create a new option with the given long name and description. The long name
    * should be specified without any leading dashes.
-   * 
+   *
    * @param longName the long name
    * @param description the description
    * @param argumentName the descriptive name of the argument, if this option
@@ -144,7 +144,7 @@ public abstract class Option
   /**
    * Create a new option with the given short and long names and description.
    * The long name should be specified without any leading dashes.
-   * 
+   *
    * @param longName the long name
    * @param shortName the short name
    * @param description the description
@@ -161,7 +161,7 @@ public abstract class Option
   /**
    * Create a new option with the given short and long names and description.
    * The long name should be specified without any leading dashes.
-   * 
+   *
    * @param longName the long name
    * @param shortName the short name
    * @param description the description
@@ -182,7 +182,7 @@ public abstract class Option
   /**
    * Create a new option with the given short and long names and description.
    * The long name should be specified without any leading dashes.
-   * 
+   *
    * @param longName the long name
    * @param shortName the short name
    * @param description the description
@@ -258,7 +258,7 @@ public abstract class Option
    * called multiple times during a single parse. If this option takes an
    * argument, the argument will be passed in. Otherwise the argument will be
    * null.
-   * 
+   *
    * @param argument the argument
    * @throws OptionException if the option or its argument is somehow invalid
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java b/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java
index 63853b2d0e4..83fcca0f8b2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/getopt/OptionGroup.java
@@ -66,7 +66,7 @@ public class OptionGroup
 
   /**
    * Create a new option group with the indicated name.
-   * 
+   *
    * @param name the name
    */
   public OptionGroup(String name)
@@ -82,7 +82,7 @@ public class OptionGroup
    * <p>
    * The text to print may contain <code>\n</code> characters. This method will
    * force a line-break for each such character.
-   * 
+   *
    * @param out the {@link PrintStream} destination of the formatted text.
    * @param text the text to print.
    * @param leftMargin a positive value indicating the column position of the
@@ -107,7 +107,7 @@ public class OptionGroup
    * <p>
    * The text to print may contain <code>\n</code> characters. This method will
    * force a line-break for each such character.
-   * 
+   *
    * @param out the {@link PrintStream} destination of the formatted text.
    * @param text the text to print.
    * @param leftMargin a positive value indicating the column position of the
@@ -155,7 +155,7 @@ public class OptionGroup
 
   /**
    * Add an option to this option group.
-   * 
+   *
    * @param opt the option to add
    */
   public void add(Option opt)
@@ -165,7 +165,7 @@ public class OptionGroup
 
   /**
    * Print the help output for this option group.
-   * 
+   *
    * @param out the stream to which to print
    */
   public void printHelp(PrintStream out, boolean longOnly)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/getopt/Parser.java b/libjava/classpath/tools/gnu/classpath/tools/getopt/Parser.java
index bb38e82acc4..f23250ecaf9 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/getopt/Parser.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/getopt/Parser.java
@@ -84,7 +84,7 @@ public class Parser
   /**
    * Create a new parser. The program name is used when printing error messages.
    * The version string is printed verbatim in response to "--version".
-   * 
+   *
    * @param programName the name of the program
    * @param versionString the program's version information
    */
@@ -101,7 +101,7 @@ public class Parser
    * <p>
    * The text to print may contain <code>\n</code> characters. This method will
    * force a line-break for each such character.
-   * 
+   *
    * @param out the {@link PrintStream} destination of the formatted text.
    * @param text the text to print.
    * @see Parser#MAX_LINE_LENGTH
@@ -122,7 +122,7 @@ public class Parser
    * <p>
    * The text to print may contain <code>\n</code> characters. This method will
    * force a line-break for each such character.
-   * 
+   *
    * @param out the {@link PrintStream} destination of the formatted text.
    * @param text the text to print.
    * @param aLocale the {@link Locale} instance to use when constructing the
@@ -159,7 +159,7 @@ public class Parser
   /**
    * Create a new parser. The program name is used when printing error messages.
    * The version string is printed verbatim in response to "--version".
-   * 
+   *
    * @param programName the name of the program
    * @param versionString the program's version information
    * @param longOnly true if the parser should work in long-option-only mode
@@ -194,7 +194,7 @@ public class Parser
 
   /**
    * Set the header text that is printed by --help.
-   * 
+   *
    * @param headerText the header text
    */
   public synchronized void setHeader(String headerText)
@@ -204,7 +204,7 @@ public class Parser
 
   /**
    * Set the footer text that is printed by --help.
-   * 
+   *
    * @param footerText the footer text
    */
   public synchronized void setFooter(String footerText)
@@ -215,7 +215,7 @@ public class Parser
   /**
    * Add an option to this parser. The option is added to the default option
    * group; this affects where it is placed in the help output.
-   * 
+   *
    * @param opt the option
    */
   public synchronized void add(Option opt)
@@ -237,7 +237,7 @@ public class Parser
   /**
    * Add an option group to this parser. All the options in this group will be
    * recognized by the parser.
-   * 
+   *
    * @param group the option group
    */
   public synchronized void add(OptionGroup group)
@@ -259,8 +259,8 @@ public class Parser
     Iterator it = optionGroups.iterator();
     while (it.hasNext())
       {
-	OptionGroup group = (OptionGroup) it.next();
-	options.addAll(group.options);
+        OptionGroup group = (OptionGroup) it.next();
+        options.addAll(group.options);
       }
   }
 
@@ -308,7 +308,7 @@ public class Parser
    * user to the <code>--help</code> option.
    * <p>
    * The base implementation does nothing.
-   * 
+   *
    * @throws OptionException the error encountered
    */
   protected void validate() throws OptionException
@@ -426,7 +426,7 @@ public class Parser
    * Parse a command line. Any files which are found will be passed to the file
    * argument callback. This method will exit on error or when --help or
    * --version is specified.
-   * 
+   *
    * @param inArgs the command-line arguments
    * @param files the file argument callback
    */
@@ -477,7 +477,7 @@ public class Parser
   /**
    * Parse a command line. Any files which are found will be returned. This
    * method will exit on error or when --help or --version is specified.
-   * 
+   *
    * @param inArgs the command-line arguments
    */
   public String[] parse(String[] inArgs)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
index 2ec5af477bc..adb5b65d591 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/AbstractTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -40,9 +40,9 @@ package gnu.classpath.tools.gjdoc;
 import com.sun.javadoc.*;
 import java.util.*;
 
-public abstract class AbstractTagImpl 
+public abstract class AbstractTagImpl
    implements Tag, TagContainer {
-   
+
    private static final Tag[] emptyTags = new Tag[0];
 
    protected String text;
@@ -66,19 +66,19 @@ public abstract class AbstractTagImpl
 
    protected void setBody(String body, ClassDocImpl contextClass, MemberDocImpl contextMember) {
       this.tagMap=DocImpl.parseCommentTags(body.toCharArray(),
-					   0,
-					   body.length(),
-					   contextClass,
+                                           0,
+                                           body.length(),
+                                           contextClass,
                                            contextMember,
                                            this,
                                            null);
    }
 
-   public Tag[] firstSentenceTags() { 
-      return (tagMap!=null)? (Tag[])tagMap.get("first") : emptyTags; 
+   public Tag[] firstSentenceTags() {
+      return (tagMap!=null)? (Tag[])tagMap.get("first") : emptyTags;
    }
-   public Tag[] inlineTags() { 
-      return (tagMap!=null)? (Tag[])tagMap.get("inline") : emptyTags; 
+   public Tag[] inlineTags() {
+      return (tagMap!=null)? (Tag[])tagMap.get("inline") : emptyTags;
    }
 
    public String name() {
@@ -89,8 +89,8 @@ public abstract class AbstractTagImpl
       return text;
    }
 
-   public Map getTagMap() { 
-      return tagMap; 
+   public Map getTagMap() {
+      return tagMap;
    }
 
    /**
@@ -99,9 +99,9 @@ public abstract class AbstractTagImpl
    public String toString()
    {
      return (this.getClass().getName()
-	     + "[name=" + name()
-	     + ", text=" + text()
-	     + ", tagMap=" + getTagMap()
-	     + "]");
+             + "[name=" + name()
+             + ", text=" + text()
+             + ", tagMap=" + getTagMap()
+             + "]");
    }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java
index 4bfac862f53..cde5cbe904e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ArrayCharacterIterator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -47,72 +47,72 @@ public final class ArrayCharacterIterator implements CharacterIterator {
    private int currentIndex;
 
    public ArrayCharacterIterator(char[] data,
-				 int beginIndex) {
+                                 int beginIndex) {
       this(data,beginIndex,data.length,beginIndex);
    }
 
    public ArrayCharacterIterator(char[] data,
-				 int beginIndex,
-				 int endIndex) {
+                                 int beginIndex,
+                                 int endIndex) {
       this(data,beginIndex,endIndex,beginIndex);
    }
 
    public ArrayCharacterIterator(char[] data,
-				 int beginIndex,
-				 int endIndex,
-				 int currentIndex) {
+                                 int beginIndex,
+                                 int endIndex,
+                                 int currentIndex) {
       this.data=data;
       this.beginIndex=beginIndex;
       this.endIndex=endIndex;
       this.currentIndex=currentIndex;
    }
 
-   // Create a copy of this iterator 
+   // Create a copy of this iterator
    public Object clone() {
       return new ArrayCharacterIterator(data,beginIndex,endIndex,currentIndex);
    }
 
-   // Gets the character at the current position (as returned by getIndex()). 
+   // Gets the character at the current position (as returned by getIndex()).
    public char current() {
       return (currentIndex>=beginIndex && currentIndex<endIndex) ? data[currentIndex] : DONE;
    }
 
-   // Sets the position to getBeginIndex() and returns the character at that position. 
+   // Sets the position to getBeginIndex() and returns the character at that position.
    public char first() {
       return data[currentIndex=beginIndex];
    }
 
-   // Returns the start index of the text. 
+   // Returns the start index of the text.
    public int getBeginIndex() {
       return beginIndex;
    }
 
-   // Returns the end index of the text. 
+   // Returns the end index of the text.
    public int getEndIndex() {
       return endIndex;
    }
 
-   // Returns the current index. 
+   // Returns the current index.
    public int getIndex() {
       return currentIndex;
    }
 
-   // Sets the position to getEndIndex()-1 (getEndIndex() if the text is empty) and returns the character at that position. 
+   // Sets the position to getEndIndex()-1 (getEndIndex() if the text is empty) and returns the character at that position.
    public char last() {
       return data[currentIndex=((endIndex>beginIndex)?endIndex-1:endIndex)];
    }
 
-   // Increments the iterator's index by one and returns the character at the new index. 
+   // Increments the iterator's index by one and returns the character at the new index.
    public char next() {
       return (++currentIndex<endIndex)?data[currentIndex]:DONE;
    }
 
-   // Decrements the iterator's index by one and returns the character at the new index. 
+   // Decrements the iterator's index by one and returns the character at the new index.
    public char previous() {
       return (--currentIndex>=beginIndex)?data[currentIndex]:DONE;
    }
 
-   // Sets the position to the specified position in the text and returns that character. 
+   // Sets the position to the specified position in the text and returns that character.
    public char setIndex(int position) {
       this.currentIndex=position;
       return current();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
index b1012247164..b38c2b08379 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -46,7 +46,7 @@ import gnu.classpath.tools.gjdoc.expr.IllegalExpressionException;
 import gnu.classpath.tools.gjdoc.expr.UnknownIdentifierException;
 
 public class ClassDocImpl
-   extends ProgramElementDocImpl 
+   extends ProgramElementDocImpl
    implements ClassDoc, WritableType, EvaluatorEnvironment {
 
    private ClassDoc baseClassDoc;
@@ -58,10 +58,10 @@ public class ClassDocImpl
    private String dimension = "";
 
    public ClassDocImpl(ClassDoc containingClass,
-		       PackageDoc containingPackage,
-		       int accessLevel,
-		       boolean isFinal,
-		       boolean isStatic,
+                       PackageDoc containingPackage,
+                       int accessLevel,
+                       boolean isFinal,
+                       boolean isStatic,
                        SourcePosition position) {
       super(containingClass, containingPackage, accessLevel, isFinal, isStatic,
             position);
@@ -69,39 +69,39 @@ public class ClassDocImpl
    }
 
    public ClassDocImpl(ClassDoc containingClass,
-		       PackageDoc containingPackage,
-		       ClassDoc[] importedClasses,
-		       PackageDoc[] importedPackages,
+                       PackageDoc containingPackage,
+                       ClassDoc[] importedClasses,
+                       PackageDoc[] importedPackages,
                        SourcePosition position) {
       super(containingClass, containingPackage,
             position);
       this.importedClasses=importedClasses;
       this.importedPackages=importedPackages;
       this.baseClassDoc = this;
-   }   
+   }
 
-   // Return constructors in class. 
+   // Return constructors in class.
    public ConstructorDoc[] constructors() {
       return constructors(true);
-   } 
+   }
 
    public ConstructorDoc[] constructors(boolean filter) {
       return filter ? filteredConstructors : unfilteredConstructors;
-   } 
+   }
 
-   // Return true if Serializable fields are explicitly defined with the special class member serialPersistentFields. 
+   // Return true if Serializable fields are explicitly defined with the special class member serialPersistentFields.
    public boolean definesSerializableFields() {
       return definesSerializableFields;
-   } 
+   }
 
-   // Return fields in class. 
+   // Return fields in class.
    public FieldDoc[] fields() {
       return fields(true);
-   } 
+   }
 
    public FieldDoc[] fields(boolean filter) {
       return filter ? filteredFields : unfilteredFields;
-   } 
+   }
 
    private static Set primitiveNames;
    static {
@@ -149,15 +149,15 @@ public class ClassDocImpl
       }
    }
 
-   public ClassDoc findClass(String className) 
+   public ClassDoc findClass(String className)
    {
       String qualifiedName = Main.getRootDoc().resolveClassName(className, this);
       ClassDoc rc=Main.getRootDoc().classNamed(qualifiedName);
 
-      if (null == rc) { 
+      if (null == rc) {
          for (ClassDoc cdi=this; cdi!=null; cdi=cdi.containingClass()) {
             for (ClassDoc sdi=cdi; sdi!=null; sdi=sdi.superclass()) {
-               if (sdi instanceof ClassDocProxy) { 
+               if (sdi instanceof ClassDocProxy) {
                   ClassDoc realClass = Main.getRootDoc().classNamed(sdi.qualifiedName());
                   if (null != realClass) {
                      sdi = realClass;
@@ -172,24 +172,24 @@ public class ClassDocImpl
       return rc;
    }
 
-   // Get the list of classes declared as imported. 
+   // Get the list of classes declared as imported.
    public ClassDoc[] importedClasses() {
       return importedClasses;
-   } 
+   }
 
-   // Get the list of packages declared as imported. 
+   // Get the list of packages declared as imported.
    public PackageDoc[] importedPackages() {
       return importedPackages;
-   } 
+   }
 
-   // Return inner classes within this class. 
+   // Return inner classes within this class.
    public ClassDoc[] innerClasses() {
       return innerClasses(true);
-   } 
+   }
 
    public ClassDoc[] innerClasses(boolean filtered) {
       return filtered ? filteredInnerClasses : unfilteredInnerClasses;
-   } 
+   }
 
    void setFilteredInnerClasses(ClassDoc[] filteredInnerClasses) {
       this.filteredInnerClasses=filteredInnerClasses;
@@ -199,19 +199,19 @@ public class ClassDocImpl
       this.unfilteredInnerClasses=unfilteredInnerClasses;
    }
 
-   // Return interfaces implemented by this class or interfaces extended by this interface. 
+   // Return interfaces implemented by this class or interfaces extended by this interface.
    public ClassDoc[] interfaces() {
       return interfaces;
-   } 
+   }
 
    public void setInterfaces(ClassDoc[] interfaces) {
       this.interfaces=interfaces;
-   } 
+   }
 
-   // Return true if this class is abstract 
+   // Return true if this class is abstract
    public boolean isAbstract() {
       return isAbstract || isInterface();
-   } 
+   }
 
    public boolean isInterface() {
       return isInterface;
@@ -226,77 +226,77 @@ public class ClassDocImpl
     return isEnum;
   }
 
-   // Return true if this class is abstract 
+   // Return true if this class is abstract
    public void setIsAbstract(boolean b) {
       this.isAbstract=b;
-   } 
+   }
 
-   // Return true if this class implements java.io.Externalizable. 
+   // Return true if this class implements java.io.Externalizable.
    public boolean isExternalizable() {
       return implementsInterface("java.io.Externalizable");
-   } 
+   }
 
-   // Return true if this class implements java.io.Serializable. 
+   // Return true if this class implements java.io.Serializable.
    public boolean isSerializable() {
       return implementsInterface("java.io.Serializable");
-   } 
+   }
 
    public boolean implementsInterface(String name) {
       for (ClassDoc cdi=this; cdi!=null; cdi=(ClassDoc)cdi.superclass()) {
-	 if (cdi instanceof ClassDocImpl) {
-	    ClassDoc[] cdiInterfaces=(ClassDoc[])cdi.interfaces();
+         if (cdi instanceof ClassDocImpl) {
+            ClassDoc[] cdiInterfaces=(ClassDoc[])cdi.interfaces();
             if (null != cdiInterfaces) {
                for (int i=0; i<cdiInterfaces.length; ++i) {
                   if (cdiInterfaces[i].qualifiedName().equals(name))
                      return true;
                }
             }
-	 }
-	 else {
-	    //throw new RuntimeException("implementsInterface(\""+name+"\") failed: Not a ClassDocImpl:"+cdi);
-	 }
+         }
+         else {
+            //throw new RuntimeException("implementsInterface(\""+name+"\") failed: Not a ClassDocImpl:"+cdi);
+         }
       }
       return false;
    }
 
-   // Return methods in class. 
+   // Return methods in class.
    public MethodDoc[] methods() {
       return methods(true);
-   } 
+   }
 
-   // Return methods in class. 
+   // Return methods in class.
    public MethodDoc[] methods(boolean filter) {
       return filter ? filteredMethods : unfilteredMethods;
-   } 
+   }
 
-   // Return the Serializable fields of class. Return either a list of default fields documented by serial tag or return a single FieldDoc for serialPersistentField member. 
+   // Return the Serializable fields of class. Return either a list of default fields documented by serial tag or return a single FieldDoc for serialPersistentField member.
    public FieldDoc[] serializableFields() {
       if (serialPersistentField!=null) {
-	 return serialPersistentField;
+         return serialPersistentField;
       }
       else{
-	 return serializableFields;
+         return serializableFields;
       }
-   } 
+   }
 
-   // Return the serialization methods for this class. 
+   // Return the serialization methods for this class.
    public MethodDoc[] serializationMethods() {
       return serializationMethods;
-   } 
+   }
 
-   // Test whether this class is a subclass of the specified class. 
+   // Test whether this class is a subclass of the specified class.
    public boolean subclassOf(ClassDoc cd) {
       for (ClassDocImpl cdi=(ClassDocImpl)superclass(); cdi!=null; cdi=(ClassDocImpl)cdi.superclass()) {
-	 if (cdi.equals(cd))
-	    return true;
+         if (cdi.equals(cd))
+            return true;
       }
       return false;
-   } 
+   }
 
-   // Return the superclass of this class 
+   // Return the superclass of this class
    public ClassDoc superclass() {
       return superclass;
-   } 
+   }
 
    // Implementation of Interface Type
 
@@ -306,9 +306,9 @@ public class ClassDocImpl
    }
 
    public String typeName() { return name(); }
-   
-   public String qualifiedTypeName() { 
-      return (containingPackage()!=null && !containingPackage().equals(PackageDocImpl.DEFAULT_PACKAGE))?(containingPackage().name()+"."+name()):(name()); 
+
+   public String qualifiedTypeName() {
+      return (containingPackage()!=null && !containingPackage().equals(PackageDocImpl.DEFAULT_PACKAGE))?(containingPackage().name()+"."+name()):(name());
    }
 
    public String qualifiedName() { return qualifiedTypeName(); }
@@ -320,25 +320,25 @@ public class ClassDocImpl
    public TypeVariable asTypeVariable() { return null; }
 
    public static ClassDocImpl createInstance(ClassDoc containingClass,
-					     PackageDoc containingPackage,
-					     ClassDoc[] importedClasses,
-					     PackageDoc[] importedPackages,
-					     char[] source, int startIndex, int endIndex,
+                                             PackageDoc containingPackage,
+                                             ClassDoc[] importedClasses,
+                                             PackageDoc[] importedPackages,
+                                             char[] source, int startIndex, int endIndex,
                                              List importStatementList) throws ParseException, IOException {
 
       String superclassName = "java.lang.Object";
 
       ClassDocImpl rc=new ClassDocImpl(containingClass,
-				       containingPackage,
-				       importedClasses,
-				       importedPackages,
+                                       containingPackage,
+                                       importedClasses,
+                                       importedPackages,
                                        null);
       rc.setImportStatementList(importStatementList);
       List implementedInterfaces = new ArrayList();
-      
+
       String word="";
       int item=0;
-      
+
       final int STATE_NORMAL = 1;
       final int STATE_SLASHC = 2;
       final int STATE_STARC  = 3;
@@ -349,147 +349,147 @@ public class ClassDocImpl
       int parLevel=0;
       char prev=0;
       for (int ndx=startIndex; ndx<=endIndex; ++ndx) {
-	 char c=(ndx==endIndex)?10:source[ndx];
-	 boolean processWord=false;
-	 if (state==STATE_SLASHC) {
-	    if (c=='\n') {
-	       state=STATE_NORMAL;
-	       c=0;
-	    }
-	 }
-	 else if (state==STATE_STARC) {
-	    if (c=='/' && prev=='*') {
-	       state=STATE_NORMAL;
-	       c=0;
-	    }
-	 }
-	 else {
-	    if (c=='/' && prev=='/') {
-	       state=STATE_SLASHC;
-	       c=0;
-	       word=word.substring(0,word.length()-1);
-	       processWord=true;
-	    }
-	    else if (c=='*' && prev=='/') {
-	       state=STATE_STARC;
-	       c=0;
-	       word=word.substring(0,word.length()-1);
-	       processWord=true;
-	    }
-	    else if (c=='@') {
+         char c=(ndx==endIndex)?10:source[ndx];
+         boolean processWord=false;
+         if (state==STATE_SLASHC) {
+            if (c=='\n') {
+               state=STATE_NORMAL;
+               c=0;
+            }
+         }
+         else if (state==STATE_STARC) {
+            if (c=='/' && prev=='*') {
+               state=STATE_NORMAL;
+               c=0;
+            }
+         }
+         else {
+            if (c=='/' && prev=='/') {
+               state=STATE_SLASHC;
+               c=0;
+               word=word.substring(0,word.length()-1);
+               processWord=true;
+            }
+            else if (c=='*' && prev=='/') {
+               state=STATE_STARC;
+               c=0;
+               word=word.substring(0,word.length()-1);
+               processWord=true;
+            }
+            else if (c=='@') {
                state=STATE_ANNO;
-	       word += c;
-	    }
-	    else if (c=='(' && state==STATE_ANNO) {
+               word += c;
+            }
+            else if (c=='(' && state==STATE_ANNO) {
                ++parLevel;
                word += c;
             }
             else if (c==')' && state==STATE_ANNO) {
                --parLevel;
                word += c;
-	       if (parLevel == 0)
+               if (parLevel == 0)
                    state=STATE_NORMAL;
             }
-	    else if (c=='<')
-	      {
-		++varLevel;
-		word += c;
-	      }
-	    else if (c=='>')
-	      {
-		--varLevel;
-		word += c;
-	      }
-	    else if (c=='{' && parLevel == 0 || 
-	             c==',' && varLevel == 0 && parLevel == 0 || 
-		     Parser.WHITESPACE.indexOf(c)>=0 && parLevel == 0 && varLevel == 0) {
-	       processWord=true;
-	       state=STATE_NORMAL;
-	    }
-	    else {
-	       word+=c;
-	    }
+            else if (c=='<')
+              {
+                ++varLevel;
+                word += c;
+              }
+            else if (c=='>')
+              {
+                --varLevel;
+                word += c;
+              }
+            else if (c=='{' && parLevel == 0 ||
+                     c==',' && varLevel == 0 && parLevel == 0 ||
+                     Parser.WHITESPACE.indexOf(c)>=0 && parLevel == 0 && varLevel == 0) {
+               processWord=true;
+               state=STATE_NORMAL;
+            }
+            else {
+               word+=c;
+            }
 
-	    if (processWord && word.length()>0) {
-	       if (item==0) {
-		  if (rc.processModifier(word)) {
-		  }
-		  else if (word.equals("abstract")) {
-		     rc.setIsAbstract(true);
-		  }
-		  else if (word.equals("class")) {
-		     rc.setIsInterface(false);
-		     item=1;
-		  }
-		  else if (word.equals("enum")) 
-		    {
-		      rc.setIsEnum(true);
-		      item = 1;
-		    }
-		  else if (word.equals("interface")) {
-		     rc.setIsInterface(true);
-		     item=1;
-		  }
-		  else if (word.equals("@interface")) {
-		     rc.setIsInterface(true);
+            if (processWord && word.length()>0) {
+               if (item==0) {
+                  if (rc.processModifier(word)) {
+                  }
+                  else if (word.equals("abstract")) {
+                     rc.setIsAbstract(true);
+                  }
+                  else if (word.equals("class")) {
+                     rc.setIsInterface(false);
+                     item=1;
+                  }
+                  else if (word.equals("enum"))
+                    {
+                      rc.setIsEnum(true);
+                      item = 1;
+                    }
+                  else if (word.equals("interface")) {
+                     rc.setIsInterface(true);
+                     item=1;
+                  }
+                  else if (word.equals("@interface")) {
+                     rc.setIsInterface(true);
                      rc.setIsAnnotation(true);
-		     item=1;
-		  }
-		  else if (word.equals("strictfp")) {
-		  }
-		  else {
-		     Main.getRootDoc().printWarning("unknown modifier '"+word+"'");
-		  }
-	       }
-	       else if (word.equals("extends") && !rc.isAnnotation()) {
+                     item=1;
+                  }
+                  else if (word.equals("strictfp")) {
+                  }
+                  else {
+                     Main.getRootDoc().printWarning("unknown modifier '"+word+"'");
+                  }
+               }
+               else if (word.equals("extends") && !rc.isAnnotation()) {
                   if (rc.isInterface()) {
                      item=3;
                   }
                   else {
                      item=2;
                   }
-	       }
-	       else if (word.equals("implements") && !rc.isAnnotation()) {
-		  item=3;
-	       }
-	       else if (item==1) {
-		 int parameterIndex = word.indexOf("<");
-		 if (parameterIndex == -1)
-		   rc.setClass(word);
-		 else
-		   {
-		     rc.setClass(word.substring(0, parameterIndex));
-		     parseTypeVariables(rc,word.substring(parameterIndex,
-							  word.length()));
-		   }
-	       }
-	       else if (item==2) {
-		  //Debug.log(9,"setting baseclass of "+rc+" to "+word);
-		 int parameterIndex = word.indexOf("<");
-		 if (parameterIndex == -1)
-		   superclassName=word;
-		 else
-		   {
-		     /* FIXME: Parse type parameters */
-		     superclassName=word.substring(0,parameterIndex);
-		   }
-	       }
-	       else if (item==3) {
-		 int parameterIndex = word.indexOf("<");
-		 if (parameterIndex == -1)
-		   implementedInterfaces.add(word);
-		 else
-		   {
-		     /* FIXME: Parse type parameters */
-		     implementedInterfaces.add(word.substring(0,parameterIndex));
-		   }
-	       }      
-	       word="";
-	    }
+               }
+               else if (word.equals("implements") && !rc.isAnnotation()) {
+                  item=3;
+               }
+               else if (item==1) {
+                 int parameterIndex = word.indexOf("<");
+                 if (parameterIndex == -1)
+                   rc.setClass(word);
+                 else
+                   {
+                     rc.setClass(word.substring(0, parameterIndex));
+                     parseTypeVariables(rc,word.substring(parameterIndex,
+                                                          word.length()));
+                   }
+               }
+               else if (item==2) {
+                  //Debug.log(9,"setting baseclass of "+rc+" to "+word);
+                 int parameterIndex = word.indexOf("<");
+                 if (parameterIndex == -1)
+                   superclassName=word;
+                 else
+                   {
+                     /* FIXME: Parse type parameters */
+                     superclassName=word.substring(0,parameterIndex);
+                   }
+               }
+               else if (item==3) {
+                 int parameterIndex = word.indexOf("<");
+                 if (parameterIndex == -1)
+                   implementedInterfaces.add(word);
+                 else
+                   {
+                     /* FIXME: Parse type parameters */
+                     implementedInterfaces.add(word.substring(0,parameterIndex));
+                   }
+               }
+               word="";
+            }
 
-	    if (c=='{' && state==STATE_NORMAL) break;
-	 }
-	 prev=c;
+            if (c=='{' && state==STATE_NORMAL) break;
+         }
+         prev=c;
       }
 
       if (null != containingClass
@@ -498,7 +498,7 @@ public class ClassDocImpl
       }
 
       if (rc.name()==null) {
-	 throw new ParseException("No classdef found in expression \""+new String(source,startIndex,endIndex-startIndex)+"\"");
+         throw new ParseException("No classdef found in expression \""+new String(source,startIndex,endIndex-startIndex)+"\"");
       }
 
       rc.setPosition(ClassDocImpl.getPosition(rc, source, startIndex));
@@ -506,7 +506,7 @@ public class ClassDocImpl
       ClassDoc superclassProxy=new ClassDocProxy(superclassName, rc);
 
       if (!rc.qualifiedName().equals("java.lang.Object")) {
-	 rc.setSuperclass(superclassProxy);
+         rc.setSuperclass(superclassProxy);
       }
 
       ClassDoc[] interfaces=new ClassDoc[implementedInterfaces.size()];
@@ -516,7 +516,7 @@ public class ClassDocImpl
       rc.setInterfaces(interfaces);
 
       if (rc.isInterface() && rc.containingClass()!=null) {
-	 rc.setIsStatic(true);
+         rc.setIsStatic(true);
       }
       return rc;
    }
@@ -549,15 +549,15 @@ public class ClassDocImpl
       this.filteredConstructors=constructors;
    }
 
-   // Returns the name of this Doc item. 
+   // Returns the name of this Doc item.
    public String name() {
       if (containingClass==null) {
-	 return className;
+         return className;
       }
       else {
-	 return containingClass.name()+"."+className;
+         return containingClass.name()+"."+className;
       }
-   } 
+   }
 
    public String getClassName() {
       return className;
@@ -573,33 +573,33 @@ public class ClassDocImpl
 
    public void resolve() throws ParseException {
       if (!resolved) {
-	 resolved=true;
+         resolved=true;
 
-	 if (containingClass!=null)
-	    ((ClassDocImpl)containingClass).resolve();
+         if (containingClass!=null)
+            ((ClassDocImpl)containingClass).resolve();
 
-	 //Debug.log(9,"resolving class '"+qualifiedName()+"'");
-	 /*
-	 for (int i=0; i<importedPackages.length; ++i) {
-	       Debug.log(9,"class "+qualifiedName()+" imports "+importedPackages[i].name());
-	 }
-	 */
+         //Debug.log(9,"resolving class '"+qualifiedName()+"'");
+         /*
+         for (int i=0; i<importedPackages.length; ++i) {
+               Debug.log(9,"class "+qualifiedName()+" imports "+importedPackages[i].name());
+         }
+         */
 
-	 if (superclass instanceof ClassDocProxy) {
+         if (superclass instanceof ClassDocProxy) {
 
-	    ClassDoc realClassDoc=findClass(superclass.qualifiedName());
+            ClassDoc realClassDoc=findClass(superclass.qualifiedName());
 
-	    if (realClassDoc==null) {
-	       /*
-	       if (true) { // Main.recursiveClasses) {
-		  throw new ParseException("In class '"+qualifiedName()+"': class '"+className+"' not found.");
-	       }
-	       */
-	    }
-	    else {
-	       superclass=realClassDoc;
-	    }
-	 }
+            if (realClassDoc==null) {
+               /*
+               if (true) { // Main.recursiveClasses) {
+                  throw new ParseException("In class '"+qualifiedName()+"': class '"+className+"' not found.");
+               }
+               */
+            }
+            else {
+               superclass=realClassDoc;
+            }
+         }
 
          if (null != interfaces) {
             for (int i=0; i<interfaces.length; ++i) {
@@ -621,7 +621,7 @@ public class ClassDocImpl
             }
          }
 
-	 if (unfilteredFields!=null) {
+         if (unfilteredFields!=null) {
             for (int i=0; i<unfilteredFields.length; ++i) {
                ((FieldDocImpl)unfilteredFields[i]).resolve();
                if (unfilteredFields[i].name().equals("serialPersistentField")) {
@@ -643,7 +643,7 @@ public class ClassDocImpl
             }
          }
 
-	 List isSerMethodList=new ArrayList();
+         List isSerMethodList=new ArrayList();
 
          if (null != maybeSerMethodList) {
             for (Iterator it=maybeSerMethodList.iterator(); it.hasNext(); ) {
@@ -710,9 +710,9 @@ public class ClassDocImpl
 
    public FieldDoc findField(String fieldName) {
       for (int i=0; i<filteredFields.length; ++i) {
-	 if (filteredFields[i].name().equals(fieldName)) {
-	    return filteredFields[i];
-	 }
+         if (filteredFields[i].name().equals(fieldName)) {
+            return filteredFields[i];
+         }
       }
       return null;
    }
@@ -769,12 +769,12 @@ public class ClassDocImpl
 
    private ClassDoc superclass;
 
-   // Is this Doc item a class. 
+   // Is this Doc item a class.
    public boolean isClass() {
       return !isInterface;
-   } 
+   }
 
-   // return true if this Doc is include in the active set. 
+   // return true if this Doc is include in the active set.
    public boolean isIncluded() {
       if (this == baseClassDoc) {
          return isIncluded
@@ -783,7 +783,7 @@ public class ClassDocImpl
       else {
          return baseClassDoc.isIncluded();
       }
-   } 
+   }
 
    void setIsIncluded(boolean b) {
       this.isIncluded=b;
@@ -802,12 +802,12 @@ public class ClassDocImpl
       int ndx=typeName.indexOf('[');
       String dim="";
       if (ndx>=0) {
-	 for (int i=ndx; i<typeName.length(); ++i) {
-	    if ("[]".indexOf(typeName.charAt(i))>=0) {
-	       dim+=typeName.charAt(i);
-	    }
-	 }
-	 typeName=typeName.substring(0,ndx).trim();
+         for (int i=ndx; i<typeName.length(); ++i) {
+            if ("[]".indexOf(typeName.charAt(i))>=0) {
+               dim+=typeName.charAt(i);
+            }
+         }
+         typeName=typeName.substring(0,ndx).trim();
       }
 
       ClassDoc classDoc = findClass(typeName, dim);
@@ -817,7 +817,7 @@ public class ClassDocImpl
 
       Type type = (Type)typeMap.get(typeName+dim);
       if (null!=type) {
-	 try {
+         try {
             if (type.dimension().equals(dim)) {
                return type;
             }
@@ -826,29 +826,29 @@ public class ClassDocImpl
                ((WritableType)rc).setDimension(dim);
                return rc;
             }
-	 }
-	 catch (CloneNotSupportedException e) {
-	    throw new ParseException(e.toString());
-	 }
+         }
+         catch (CloneNotSupportedException e) {
+            throw new ParseException(e.toString());
+         }
       }
-      
+
       if ("boolean".equals(typeName)
-	  || "char".equals(typeName)
-	  || "byte".equals(typeName)
-	  || "short".equals(typeName)
-	  || "int".equals(typeName)
-	  || "long".equals(typeName)
-	  || "void".equals(typeName)
-	  || "float".equals(typeName)
-	  || "double".equals(typeName)) {
-	 Type rc=new TypeImpl(null, typeName, dim);
-	 typeMap.put(typeName+dim, rc);
-	 return rc;
+          || "char".equals(typeName)
+          || "byte".equals(typeName)
+          || "short".equals(typeName)
+          || "int".equals(typeName)
+          || "long".equals(typeName)
+          || "void".equals(typeName)
+          || "float".equals(typeName)
+          || "double".equals(typeName)) {
+         Type rc=new TypeImpl(null, typeName, dim);
+         typeMap.put(typeName+dim, rc);
+         return rc;
       }
 
       if (Main.getInstance().isDocletRunning()) {
-	 //System.err.println(findClass("java.lang.String"));
-	 //throw new ParseException("Doclet running, class not found: "+typeName+" ("+orgTypename+")");
+         //System.err.println(findClass("java.lang.String"));
+         //throw new ParseException("Doclet running, class not found: "+typeName+" ("+orgTypename+")");
       }
       Type rc=new ClassDocProxy(typeName, this);
       ((WritableType)rc).setDimension(dim);
@@ -856,20 +856,20 @@ public class ClassDocImpl
    }
 
    public boolean isException() {
-      for (ClassDoc cdi=this; 
-	   cdi!=null; 
-	   cdi=cdi.superclass()) {
+      for (ClassDoc cdi=this;
+           cdi!=null;
+           cdi=cdi.superclass()) {
 
-	 if ("java.lang.Exception".equals(cdi.qualifiedName()))
-	    return true;
+         if ("java.lang.Exception".equals(cdi.qualifiedName()))
+            return true;
       }
       return false;
    }
 
    public boolean isError() {
       for (ClassDoc cdi=this; cdi!=null; cdi=cdi.superclass()) {
-	 if ("java.lang.Error".equals(cdi.qualifiedName()))
-	    return true;
+         if ("java.lang.Error".equals(cdi.qualifiedName()))
+            return true;
       }
       return false;
    }
@@ -895,29 +895,29 @@ public class ClassDocImpl
 
       ExecutableMemberDoc rc;
       for (ClassDoc cdi=this; cdi!=null; ) {
-	 rc=findMethod(cdi, nameAndSignature);
-	 if (rc!=null) return rc;
-	 rc=findConstructor(cdi, nameAndSignature);
-	 if (rc!=null) return rc;
+         rc=findMethod(cdi, nameAndSignature);
+         if (rc!=null) return rc;
+         rc=findConstructor(cdi, nameAndSignature);
+         if (rc!=null) return rc;
 
-	 ClassDoc _superclass = cdi.superclass();
-	 if (null == _superclass) {
-	    break;
-	 }
-	 else {
-	    cdi = _superclass;
-	 }
+         ClassDoc _superclass = cdi.superclass();
+         if (null == _superclass) {
+            break;
+         }
+         else {
+            cdi = _superclass;
+         }
       }
-      return null; 
-  } 
+      return null;
+  }
 
    public static ConstructorDoc findConstructor(ClassDoc classDoc, String nameAndSignature) {
       int ndx=nameAndSignature.indexOf('(');
       if (ndx<=0)
-	 return null;
+         return null;
       else {
          String fullSignature = resolveSignature(classDoc, nameAndSignature.substring(ndx));
-	 return findConstructor(classDoc,
+         return findConstructor(classDoc,
                                 nameAndSignature.substring(0,ndx),
                                 fullSignature);
       }
@@ -938,16 +938,16 @@ public class ClassDocImpl
    public static MethodDoc findMethod(ClassDoc classDoc, String nameAndSignature) {
       int ndx=nameAndSignature.indexOf('(');
       if (ndx<=0) {
-	 return null;
+         return null;
       }
       else {
          String name = nameAndSignature.substring(0,ndx);
          String fullSignature = resolveSignature(classDoc, nameAndSignature.substring(ndx));
-	 return findMethod(classDoc, name, fullSignature);
+         return findMethod(classDoc, name, fullSignature);
       }
    }
 
-   private static String resolveSignature(ClassDoc classDoc, String signature) 
+   private static String resolveSignature(ClassDoc classDoc, String signature)
    {
       signature = signature.substring(1, signature.length() - 1).trim();
       if (0 == signature.length()) {
@@ -996,7 +996,7 @@ public class ClassDocImpl
    }
 
    private List maybeSerMethodList;
-   
+
    void setMaybeSerMethodList(List maybeSerMethodList) {
       this.maybeSerMethodList=maybeSerMethodList;
    }
@@ -1025,7 +1025,7 @@ public class ClassDocImpl
    {
       return baseClassDoc;
    }
-   
+
    public FieldDoc getFieldDoc(String name)
    {
       for (int i=0; i<unfilteredFields.length; ++i) {
@@ -1059,14 +1059,14 @@ public class ClassDocImpl
    }
 
    private Object findFieldValue(String identifier,
-                                 ClassDoc classDoc, 
+                                 ClassDoc classDoc,
                                  String fieldName,
                                  Set visitedFields)
       throws UnknownIdentifierException, IllegalExpressionException
    {
       while (classDoc != null) {
          if (classDoc instanceof ClassDocImpl) {
-            FieldDocImpl fieldDoc 
+            FieldDocImpl fieldDoc
                = (FieldDocImpl)((ClassDocImpl)classDoc).getFieldDoc(fieldName);
             if (visitedFields.contains(fieldDoc)) {
                throw new CircularExpressionException("Circular reference detected");
@@ -1079,8 +1079,8 @@ public class ClassDocImpl
             ClassDoc[] _interfaces = classDoc.interfaces();
             if (null != _interfaces) {
                for (int i=0; i<_interfaces.length; ++i) {
-                  if (_interfaces[i] instanceof ClassDocImpl) { 
-                     FieldDocImpl fieldDoc 
+                  if (_interfaces[i] instanceof ClassDocImpl) {
+                     FieldDocImpl fieldDoc
                         = (FieldDocImpl)((ClassDocImpl)_interfaces[i]).getFieldDoc(fieldName);
                      if (visitedFields.contains(fieldDoc)) {
                         throw new CircularExpressionException("Circular reference detected");
@@ -1096,7 +1096,7 @@ public class ClassDocImpl
       }
       throw new UnknownIdentifierException(identifier);
    }
-   
+
    public Object getValue(String identifier, Set visitedFields)
       throws UnknownIdentifierException, IllegalExpressionException
    {
@@ -1123,12 +1123,12 @@ public class ClassDocImpl
       return false;
    }
 
-   // Compares this Object with the specified Object for order. 
+   // Compares this Object with the specified Object for order.
    public int compareTo(java.lang.Object o) {
       int rc;
 
       if (o instanceof ClassDocImpl) {
-      
+
          ClassDocImpl c1 = this;
          ClassDocImpl c2 = (ClassDocImpl)o;
 
@@ -1155,7 +1155,7 @@ public class ClassDocImpl
 
          rc = super.compareTo(o);
          if (0 == rc) {
-            return Main.getInstance().getCollator().compare(containingPackage().name(), 
+            return Main.getInstance().getCollator().compare(containingPackage().name(),
                                                             ((ClassDocImpl)o).containingPackage().name());
          }
          else {
@@ -1165,7 +1165,7 @@ public class ClassDocImpl
       else {
          return 1;
       }
-   } 
+   }
 
    private List importStatementList;
 
@@ -1174,7 +1174,7 @@ public class ClassDocImpl
       this.importStatementList = new LinkedList();
       this.importStatementList.addAll(importStatementList);
    }
-   
+
    public List getImportSpecifierList()
    {
       return importStatementList;
@@ -1206,42 +1206,42 @@ public class ClassDocImpl
    * @throws ParseException if parsing fails.
    */
   public static void parseTypeVariables(ClassDocImpl rc,
-					String typeVariables)
+                                        String typeVariables)
     throws ParseException
   {
     List parsedBounds = null;
     StringTokenizer parameters = new StringTokenizer(typeVariables,
-						     Parser.WHITESPACE +
-						     "<>,");
+                                                     Parser.WHITESPACE +
+                                                     "<>,");
     List variables = new ArrayList();
     while (parameters.hasMoreTokens())
       {
-	String parameter = parameters.nextToken();
-	StringTokenizer parts = new StringTokenizer(parameter,
-						    Parser.WHITESPACE);
-	TypeVariableImpl variable = new TypeVariableImpl(rc.qualifiedName(),
-							 parts.nextToken(),"",
-							 rc);
-	if (parts.hasMoreTokens())
-	  {
-	    if (!parts.nextToken().equals("extends"))
-	      throw new ParseException("Invalid type parameter: " + parameter);
-	    StringTokenizer bounds = new StringTokenizer(parts.nextToken(),
-							 Parser.WHITESPACE
-							 + "&");
-	    parsedBounds = new ArrayList();
-	    while (bounds.hasMoreTokens())
-	      {
-		String bound = bounds.nextToken();
-		int nameSep = bound.lastIndexOf(".");
-		String packageName = bound.substring(0, nameSep);
-		String boundName = bound.substring(nameSep, bound.length());
-		parsedBounds.add(new TypeImpl(packageName,boundName,""));
-	      }
-	  }
-	if (parsedBounds != null)
-	  variable.setBounds(parsedBounds);
-	variables.add(variable);
+        String parameter = parameters.nextToken();
+        StringTokenizer parts = new StringTokenizer(parameter,
+                                                    Parser.WHITESPACE);
+        TypeVariableImpl variable = new TypeVariableImpl(rc.qualifiedName(),
+                                                         parts.nextToken(),"",
+                                                         rc);
+        if (parts.hasMoreTokens())
+          {
+            if (!parts.nextToken().equals("extends"))
+              throw new ParseException("Invalid type parameter: " + parameter);
+            StringTokenizer bounds = new StringTokenizer(parts.nextToken(),
+                                                         Parser.WHITESPACE
+                                                         + "&");
+            parsedBounds = new ArrayList();
+            while (bounds.hasMoreTokens())
+              {
+                String bound = bounds.nextToken();
+                int nameSep = bound.lastIndexOf(".");
+                String packageName = bound.substring(0, nameSep);
+                String boundName = bound.substring(nameSep, bound.length());
+                parsedBounds.add(new TypeImpl(packageName,boundName,""));
+              }
+          }
+        if (parsedBounds != null)
+          variable.setBounds(parsedBounds);
+        variables.add(variable);
       }
     rc.setTypeParameters(variables);
   }
@@ -1253,9 +1253,8 @@ public class ClassDocImpl
    */
   void setTypeParameters(List variables)
   {
-    typeParameters = 
+    typeParameters =
       (TypeVariable[]) variables.toArray(new TypeVariable[variables.size()]);
   }
 
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
index 6dfe821bc50..253cf5ec415 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocProxy.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -48,94 +48,94 @@ public class ClassDocProxy implements ClassDoc, WritableType {
    private ClassDoc classContext;
    private String dimension = "";
 
-   public ClassDocProxy(String qualifiedName, ClassDoc classContext) 
+   public ClassDocProxy(String qualifiedName, ClassDoc classContext)
    {
       this.qualifiedName
-         = Main.getRootDoc().resolveClassName(qualifiedName, 
+         = Main.getRootDoc().resolveClassName(qualifiedName,
                                               (ClassDocImpl)classContext);
       this.classContext=classContext;
       int pndx=qualifiedName.lastIndexOf('.');
       if (pndx>=0) {
-	 this.name=qualifiedName.substring(pndx+1);
+         this.name=qualifiedName.substring(pndx+1);
       }
       else {
-	 this.name=qualifiedName;
+         this.name=qualifiedName;
       }
    }
 
-   private final String errorText() 
+   private final String errorText()
    {
       return "CLASS "+qualifiedName+" NOT LOADED.";
    }
 
-   public ConstructorDoc[] constructors() { return new ConstructorDoc[0]; } 
+   public ConstructorDoc[] constructors() { return new ConstructorDoc[0]; }
    public ConstructorDoc[] constructors(boolean filtered) { return new ConstructorDoc[0]; }
-   public boolean definesSerializableFields() { return false; } 
-   public FieldDoc[] fields() { return new FieldDoc[0]; } 
-   public FieldDoc[] fields(boolean filtered) { return new FieldDoc[0]; } 
-   public ClassDoc findClass(java.lang.String className) { return null; } 
-   public ClassDoc[] importedClasses() { return new ClassDoc[0]; } 
-   public PackageDoc[] importedPackages() { return new PackageDoc[0]; } 
-   public ClassDoc[] innerClasses() { return new ClassDoc[0]; } 
-   public ClassDoc[] innerClasses(boolean filtered) { return new ClassDoc[0]; } 
-   public ClassDoc[] interfaces() { return new ClassDoc[0]; } 
-   public boolean isAbstract() { return false; } 
-   public boolean isExternalizable() { return false; } 
-   public boolean isSerializable() { return false; } 
-   public MethodDoc[] methods() { return new MethodDoc[0]; } 
-   public MethodDoc[] methods(boolean filtered) { return new MethodDoc[0]; } 
-   public FieldDoc[] serializableFields() { return new FieldDoc[0]; } 
-   public MethodDoc[] serializationMethods() { return new MethodDoc[0]; } 
-   public boolean subclassOf(ClassDoc cd) { return false; } 
-   public ClassDoc superclass() { return null; } 
-   public ClassDoc containingClass() { return null; } 
-   public PackageDoc containingPackage() { 
+   public boolean definesSerializableFields() { return false; }
+   public FieldDoc[] fields() { return new FieldDoc[0]; }
+   public FieldDoc[] fields(boolean filtered) { return new FieldDoc[0]; }
+   public ClassDoc findClass(java.lang.String className) { return null; }
+   public ClassDoc[] importedClasses() { return new ClassDoc[0]; }
+   public PackageDoc[] importedPackages() { return new PackageDoc[0]; }
+   public ClassDoc[] innerClasses() { return new ClassDoc[0]; }
+   public ClassDoc[] innerClasses(boolean filtered) { return new ClassDoc[0]; }
+   public ClassDoc[] interfaces() { return new ClassDoc[0]; }
+   public boolean isAbstract() { return false; }
+   public boolean isExternalizable() { return false; }
+   public boolean isSerializable() { return false; }
+   public MethodDoc[] methods() { return new MethodDoc[0]; }
+   public MethodDoc[] methods(boolean filtered) { return new MethodDoc[0]; }
+   public FieldDoc[] serializableFields() { return new FieldDoc[0]; }
+   public MethodDoc[] serializationMethods() { return new MethodDoc[0]; }
+   public boolean subclassOf(ClassDoc cd) { return false; }
+   public ClassDoc superclass() { return null; }
+   public ClassDoc containingClass() { return null; }
+   public PackageDoc containingPackage() {
       /*
       try {
-	 File file=Main.getRootDoc().findScheduledClass(qualifiedName, classContext);
-	 if (file!=null) {
-	    //String clsName=file.getCanonicalFile().getAbsolutePath().substring(new File(Main.getRootDoc().getSourcePath()).getCanonicalFile().getAbsolutePath().length()+1);
-	    String clsName=file.getAbsolutePath().substring(new File(Main.getRootDoc().getSourcePath()).getAbsolutePath().length()+1);
-	    clsName=clsName.substring(0,clsName.length()-5).replace(File.separatorChar,'.');
-	    Debug.log(9,"ClassDocProxy '"+qualifiedName+"': found class "+clsName);
-	    qualifiedName=clsName;
-	 }
-	 return new PackageDocImpl("test.");
+         File file=Main.getRootDoc().findScheduledClass(qualifiedName, classContext);
+         if (file!=null) {
+            //String clsName=file.getCanonicalFile().getAbsolutePath().substring(new File(Main.getRootDoc().getSourcePath()).getCanonicalFile().getAbsolutePath().length()+1);
+            String clsName=file.getAbsolutePath().substring(new File(Main.getRootDoc().getSourcePath()).getAbsolutePath().length()+1);
+            clsName=clsName.substring(0,clsName.length()-5).replace(File.separatorChar,'.');
+            Debug.log(9,"ClassDocProxy '"+qualifiedName+"': found class "+clsName);
+            qualifiedName=clsName;
+         }
+         return new PackageDocImpl("test.");
       }
       catch (Exception e) {
-	 return PackageDocImpl.DEFAULT_PACKAGE; 
+         return PackageDocImpl.DEFAULT_PACKAGE;
       }
       */
       return PackageDocImpl.DEFAULT_PACKAGE;
-   } 
+   }
 
-   public boolean isFinal() { return false; } 
-   public boolean isPackagePrivate() { return false; } 
-   public boolean isPrivate() { return false; } 
-   public boolean isProtected() { return false; } 
-   public boolean isPublic() { return false; } 
-   public boolean isStatic() { return false; } 
-   public String modifiers() { return ""; } 
-   public int modifierSpecifier() { return 0; } 
-   public String qualifiedName() { return qualifiedName; } 
-   public String commentText() { return null; } 
-   public Tag[] firstSentenceTags() { return new Tag[0]; } 
-   public String getRawCommentText() { return null; } 
-   public Tag[] inlineTags() { return new Tag[0]; } 
-   public boolean isClass() { return false; } 
-   public boolean isConstructor() { return false; } 
-   public boolean isError() { return false; } 
-   public boolean isException() { return false; } 
-   public boolean isField() { return false; } 
-   public boolean isIncluded() { return false; } 
-   public boolean isInterface() { return false; } 
-   public boolean isMethod() { return false; } 
-   public boolean isOrdinaryClass() { return false; } 
-   public String name() { return name; } 
+   public boolean isFinal() { return false; }
+   public boolean isPackagePrivate() { return false; }
+   public boolean isPrivate() { return false; }
+   public boolean isProtected() { return false; }
+   public boolean isPublic() { return false; }
+   public boolean isStatic() { return false; }
+   public String modifiers() { return ""; }
+   public int modifierSpecifier() { return 0; }
+   public String qualifiedName() { return qualifiedName; }
+   public String commentText() { return null; }
+   public Tag[] firstSentenceTags() { return new Tag[0]; }
+   public String getRawCommentText() { return null; }
+   public Tag[] inlineTags() { return new Tag[0]; }
+   public boolean isClass() { return false; }
+   public boolean isConstructor() { return false; }
+   public boolean isError() { return false; }
+   public boolean isException() { return false; }
+   public boolean isField() { return false; }
+   public boolean isIncluded() { return false; }
+   public boolean isInterface() { return false; }
+   public boolean isMethod() { return false; }
+   public boolean isOrdinaryClass() { return false; }
+   public String name() { return name; }
    public SourcePosition position() { return null; }
-   public SeeTag[] seeTags() { return new SeeTag[0]; } 
-   public void setRawCommentText(java.lang.String rawDocumentation) {} 
-   public Tag[] tags() { return new Tag[0]; } 
+   public SeeTag[] seeTags() { return new SeeTag[0]; }
+   public void setRawCommentText(java.lang.String rawDocumentation) {}
+   public Tag[] tags() { return new Tag[0]; }
    public Tag[] tags(java.lang.String tagname) { return new Tag[0]; }
    public String typeName() { return name; }
    public String qualifiedTypeName() { return qualifiedName; }
@@ -154,7 +154,7 @@ public class ClassDocProxy implements ClassDoc, WritableType {
       return super.clone();
    }
 
-   // Compares this Object with the specified Object for order. 
+   // Compares this Object with the specified Object for order.
    public int compareTo(java.lang.Object o) {
       if (o instanceof Doc) {
          return Main.getInstance().getCollator().compare(name(), ((Doc)o).name());
@@ -164,6 +164,6 @@ public class ClassDocProxy implements ClassDoc, WritableType {
       }
    }
 
-   public TypeVariable[] typeParameters() { return new TypeVariable[0]; } 
+   public TypeVariable[] typeParameters() { return new TypeVariable[0]; }
 
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
index b3fd83c7339..9a81cb793f0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ClassDocReflectedImpl.java
@@ -7,7 +7,7 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    GNU Classpath is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with GNU Classpath; see the file COPYING.  If not, write to the
    Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA. 
+   02111-1307 USA.
 
    Linking this library statically or dynamically with other modules is
    making a combined work based on this library.  Thus, the terms and
@@ -54,7 +54,7 @@ public class ClassDocReflectedImpl
 
    public static ClassDocReflectedImpl newInstance(Class clazz)
    {
-      ClassDocReflectedImpl result 
+      ClassDocReflectedImpl result
          = (ClassDocReflectedImpl)reflectionCache.get(clazz);
       if (null != result) {
          return result;
@@ -69,7 +69,7 @@ public class ClassDocReflectedImpl
       reflectionCache.put(clazz, this);
 
       //System.err.println("ClassDocReflectedImpl: " + clazz);
-      
+
       this.clazz = clazz;
       String className = clazz.getName();
       int ndx = className.lastIndexOf('.');
@@ -99,17 +99,17 @@ public class ClassDocReflectedImpl
       }
    }
 
-   public ConstructorDoc[] constructors() { return new ConstructorDoc[0]; } 
+   public ConstructorDoc[] constructors() { return new ConstructorDoc[0]; }
    public ConstructorDoc[] constructors(boolean filtered) { return new ConstructorDoc[0]; }
-   public boolean definesSerializableFields() { return false; } 
-   public FieldDoc[] fields() { return new FieldDoc[0]; } 
-   public FieldDoc[] fields(boolean filtered) { return new FieldDoc[0]; } 
-   public ClassDoc findClass(java.lang.String className) { return null; } 
-   public ClassDoc[] importedClasses() { return new ClassDoc[0]; } 
-   public PackageDoc[] importedPackages() { return new PackageDoc[0]; } 
-   public ClassDoc[] innerClasses() { return new ClassDoc[0]; } 
-   public ClassDoc[] innerClasses(boolean filtered) 
-   { 
+   public boolean definesSerializableFields() { return false; }
+   public FieldDoc[] fields() { return new FieldDoc[0]; }
+   public FieldDoc[] fields(boolean filtered) { return new FieldDoc[0]; }
+   public ClassDoc findClass(java.lang.String className) { return null; }
+   public ClassDoc[] importedClasses() { return new ClassDoc[0]; }
+   public PackageDoc[] importedPackages() { return new PackageDoc[0]; }
+   public ClassDoc[] innerClasses() { return new ClassDoc[0]; }
+   public ClassDoc[] innerClasses(boolean filtered)
+   {
       if (filtered) {
          return new ClassDoc[0];
       }
@@ -117,20 +117,20 @@ public class ClassDocReflectedImpl
          return unfilteredInnerClasses;
       }
    }
-   
-   public ClassDoc[] interfaces() { return new ClassDoc[0]; } 
-   public boolean isAbstract() { return false; } 
-   public boolean isExternalizable() { return false; } 
-   public boolean isSerializable() { return false; } 
-   public MethodDoc[] methods() { return new MethodDoc[0]; } 
-   public MethodDoc[] methods(boolean filtered) { return new MethodDoc[0]; } 
-   public FieldDoc[] serializableFields() { return new FieldDoc[0]; } 
-   public MethodDoc[] serializationMethods() { return new MethodDoc[0]; } 
-   public boolean subclassOf(ClassDoc cd) { return false; } 
-   public ClassDoc superclass() { 
+
+   public ClassDoc[] interfaces() { return new ClassDoc[0]; }
+   public boolean isAbstract() { return false; }
+   public boolean isExternalizable() { return false; }
+   public boolean isSerializable() { return false; }
+   public MethodDoc[] methods() { return new MethodDoc[0]; }
+   public MethodDoc[] methods(boolean filtered) { return new MethodDoc[0]; }
+   public FieldDoc[] serializableFields() { return new FieldDoc[0]; }
+   public MethodDoc[] serializationMethods() { return new MethodDoc[0]; }
+   public boolean subclassOf(ClassDoc cd) { return false; }
+   public ClassDoc superclass() {
       return superclassDoc;
-   } 
-   public ClassDoc containingClass() 
+   }
+   public ClassDoc containingClass()
    {
       Class declaringClass = clazz.getDeclaringClass();
       if (null != declaringClass) {
@@ -139,8 +139,8 @@ public class ClassDocReflectedImpl
       else {
          return null;
       }
-   } 
-   public PackageDoc containingPackage() 
+   }
+   public PackageDoc containingPackage()
    {
       Class outerClass = clazz;
       while (null != outerClass.getDeclaringClass()) {
@@ -159,33 +159,33 @@ public class ClassDocReflectedImpl
       return result;
    }
 
-   public boolean isFinal() { return false; } 
-   public boolean isPackagePrivate() { return false; } 
-   public boolean isPrivate() { return false; } 
-   public boolean isProtected() { return false; } 
-   public boolean isPublic() { return false; } 
-   public boolean isStatic() { return false; } 
-   public String modifiers() { return ""; } 
-   public int modifierSpecifier() { return 0; } 
-   public String qualifiedName() { return clazz.getName().replace('$', '.'); } 
-   public String commentText() { return null; } 
-   public Tag[] firstSentenceTags() { return new Tag[0]; } 
-   public String getRawCommentText() { return null; } 
-   public Tag[] inlineTags() { return new Tag[0]; } 
-   public boolean isClass() { return false; } 
-   public boolean isConstructor() { return false; } 
-   public boolean isError() { return false; } 
-   public boolean isException() { return false; } 
-   public boolean isField() { return false; } 
-   public boolean isIncluded() { return false; } 
-   public boolean isInterface() { return false; } 
-   public boolean isMethod() { return false; } 
-   public boolean isOrdinaryClass() { return false; } 
-   public String name() { return name; } 
+   public boolean isFinal() { return false; }
+   public boolean isPackagePrivate() { return false; }
+   public boolean isPrivate() { return false; }
+   public boolean isProtected() { return false; }
+   public boolean isPublic() { return false; }
+   public boolean isStatic() { return false; }
+   public String modifiers() { return ""; }
+   public int modifierSpecifier() { return 0; }
+   public String qualifiedName() { return clazz.getName().replace('$', '.'); }
+   public String commentText() { return null; }
+   public Tag[] firstSentenceTags() { return new Tag[0]; }
+   public String getRawCommentText() { return null; }
+   public Tag[] inlineTags() { return new Tag[0]; }
+   public boolean isClass() { return false; }
+   public boolean isConstructor() { return false; }
+   public boolean isError() { return false; }
+   public boolean isException() { return false; }
+   public boolean isField() { return false; }
+   public boolean isIncluded() { return false; }
+   public boolean isInterface() { return false; }
+   public boolean isMethod() { return false; }
+   public boolean isOrdinaryClass() { return false; }
+   public String name() { return name; }
    public SourcePosition position() { return null; }
-   public SeeTag[] seeTags() { return new SeeTag[0]; } 
-   public void setRawCommentText(java.lang.String rawDocumentation) {} 
-   public Tag[] tags() { return new Tag[0]; } 
+   public SeeTag[] seeTags() { return new SeeTag[0]; }
+   public void setRawCommentText(java.lang.String rawDocumentation) {}
+   public Tag[] tags() { return new Tag[0]; }
    public Tag[] tags(java.lang.String tagname) { return new Tag[0]; }
    public String typeName() { return name; }
    public String qualifiedTypeName() { return qualifiedName(); }
@@ -214,6 +214,6 @@ public class ClassDocReflectedImpl
       return super.clone();
    }
 
-   public TypeVariable[] typeParameters() { return new TypeVariable[0]; } 
+   public TypeVariable[] typeParameters() { return new TypeVariable[0]; }
 
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java
index 06785ae0f17..ad31ba69e06 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ConstructorDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -43,17 +43,17 @@ import com.sun.javadoc.*;
 public class ConstructorDocImpl extends ExecutableMemberDocImpl implements ConstructorDoc {
 
    public ConstructorDocImpl(ClassDoc containingClass,
-			     PackageDoc containingPackage,
+                             PackageDoc containingPackage,
                              SourcePosition position) {
-      
+
       super(containingClass,
-	    containingPackage,
+            containingPackage,
             position);
    }
 
-   // Is this Doc item a constructor. 
+   // Is this Doc item a constructor.
    public boolean isConstructor() {
       return true;
-   } 
+   }
 
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java
index 3dddf43d26c..d5020236cab 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Debug.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -53,15 +53,15 @@ public final class Debug {
 
    public static final void log(int level, String msg) {
       if (level<=logLevel) {
-	 System.err.println(msg);
+         System.err.println(msg);
       }
    }
 
    public static final void dumpArray(int level, Object[] array) {
       if (level<=logLevel) {
-	 for (int i=0; i<array.length; ++i) {
-	    System.err.println("  #"+i+": "+array[i]);
-	 }
+         for (int i=0; i<array.length; ++i) {
+            System.err.println("  #"+i+": "+array[i]);
+         }
       }
    }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java
index da365d98329..706e9b6ccc1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DirectoryTree.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -46,14 +46,14 @@ public class DirectoryTree {
       FileNode[] subNodes;
 
       FileNode(File file) {
-	 this.file=file;
-	 if (file.isDirectory()) {
-	    File[] subFiles=file.listFiles();
-	    subNodes=new FileNode[subFiles.length];
-	    for (int i=0; i<subFiles.length; ++i) {
-	       subNodes[i]=new FileNode(subFiles[i]);
-	    }
-	 }
+         this.file=file;
+         if (file.isDirectory()) {
+            File[] subFiles=file.listFiles();
+            subNodes=new FileNode[subFiles.length];
+            for (int i=0; i<subFiles.length; ++i) {
+               subNodes[i]=new FileNode(subFiles[i]);
+            }
+         }
       }
    }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java
index 86680799e37..ecd8100402c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/DocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -56,26 +56,26 @@ public abstract class DocImpl implements Doc, TagContainer {
    protected SourcePosition position;
    private String boilerplateComment;
 
-   // Return the text of the comment for this doc item. 
+   // Return the text of the comment for this doc item.
    public String commentText() {
 
       StringBuffer rc=new StringBuffer();
 
       Tag[] textTags=(Tag[])tagMap.get("text");
       if (textTags!=null) {
-	 for (int i=0; i<textTags.length; ++i) {
-	    rc.append(textTags[i].text());
-	 }
+         for (int i=0; i<textTags.length; ++i) {
+            rc.append(textTags[i].text());
+         }
       }
       return rc.toString();
    }
 
-   // Compares this Object with the specified Object for order. 
+   // Compares this Object with the specified Object for order.
    public int compareTo(java.lang.Object o) {
       return Main.getInstance().getCollator().compare(name(), ((Doc)o).name());
-   } 
+   }
 
-   // Return the first sentence of the comment as tags. 
+   // Return the first sentence of the comment as tags.
    public Tag[] firstSentenceTags() {
 
       Tag[] rc=(Tag[])tagMap.get("first");
@@ -83,17 +83,17 @@ public abstract class DocImpl implements Doc, TagContainer {
       return rc;
    }
 
-   // Return the full unprocessed text of the comment. 
+   // Return the full unprocessed text of the comment.
    public String getRawCommentText() {
       if (rawDocumentation!=null)
-	  return rawDocumentation;
+          return rawDocumentation;
       else if (rawDocOffset>=0)
-	 return Main.getRootDoc().readRawComment(rawDocOffset);      
+         return Main.getRootDoc().readRawComment(rawDocOffset);
       else
-	 return null;
-   } 
+         return null;
+   }
 
-   // Return comment as tags. 
+   // Return comment as tags.
    public Tag[] inlineTags() {
 
       Tag[] rc=(Tag[])tagMap.get("inline");
@@ -101,56 +101,56 @@ public abstract class DocImpl implements Doc, TagContainer {
       return rc;
    }
 
-   // Is this Doc item a class. 
+   // Is this Doc item a class.
    public boolean isClass() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a constructor? False until overridden. 
+   // Is this Doc item a constructor? False until overridden.
    public boolean isConstructor() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a error class? False until overridden. 
+   // Is this Doc item a error class? False until overridden.
    public boolean isError() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a exception class? False until overridden. 
+   // Is this Doc item a exception class? False until overridden.
    public boolean isException() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a field? False until overridden. 
+   // Is this Doc item a field? False until overridden.
    public boolean isField() {
       return false;
-   } 
+   }
 
-   // return true if this Doc is include in the active set. 
+   // return true if this Doc is include in the active set.
    public boolean isIncluded() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a interface? False until overridden. 
+   // Is this Doc item a interface? False until overridden.
    public boolean isInterface() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a simple method (i.e. 
+   // Is this Doc item a simple method (i.e.
    public boolean isMethod() {
       return false;
-   } 
+   }
 
    public boolean isPackage() {
       return false;
-   } 
+   }
 
-   // Is this Doc item a ordinary class (i.e. 
+   // Is this Doc item a ordinary class (i.e.
    public boolean isOrdinaryClass() {
       return false;
-   } 
+   }
 
-   // Return the see also tags in this Doc item. 
+   // Return the see also tags in this Doc item.
    public SeeTag[] seeTags() {
       return (SeeTag[])getTagArr("see", seeTagEmptyArr);
    }
@@ -159,22 +159,22 @@ public abstract class DocImpl implements Doc, TagContainer {
       Tag[] rc=(Tag[])tagMap.get(kindOfTag);
       if (rc==null) rc=defaultRc;
       return rc;
-   } 
+   }
 
-   // Set the full unprocessed text of the comment. 
+   // Set the full unprocessed text of the comment.
    public void setRawCommentText(String rawDocumentation) {
       this.rawDocumentation=rawDocumentation;
-   } 
+   }
 
    public void resolveComments() {
-      
+
       if (rawDocumentation!=null && tagMap.isEmpty()) {
          char[] charArray = rawDocumentation.toCharArray();
          int length = rawDocumentation.length();
          int startOffset = 0;
          int endOffset = 0;
-         if (charArray[0] == '/' 
-             && charArray[1] == '*' 
+         if (charArray[0] == '/'
+             && charArray[1] == '*'
              && charArray[2] == '*'
              && charArray[length - 2] == '*'
              && charArray[length - 1] == '/') {
@@ -196,7 +196,7 @@ public abstract class DocImpl implements Doc, TagContainer {
             rawDocumentation=null;
          }
 
-	 resolveTags();
+         resolveTags();
       }
       else if (tagMap.isEmpty() && null != boilerplateComment) {
          tagMap.put("all", new Tag[] { new TagImpl("@boilerplate", boilerplateComment,getContextClass(),null) });
@@ -206,7 +206,7 @@ public abstract class DocImpl implements Doc, TagContainer {
 
    public static int skipHtmlWhitespace(char[] buffer, int startIndex) {
       while (startIndex < buffer.length) {
-	 char c=buffer[startIndex];
+         char c=buffer[startIndex];
          if (!Parser.isWhitespace(c)) {
             break;
          }
@@ -216,22 +216,22 @@ public abstract class DocImpl implements Doc, TagContainer {
       }
       return startIndex;
    }
-   
+
    /**
     *  Looks for an end-of-sentence marker in <code>text</code>,
     *  starting at <code>startIndex</code> and stopping at
-    *  <code>endIndex</code>. 
+    *  <code>endIndex</code>.
     *
     *  @param text  the text to be searched
     *  @param startIndex  index in <code>text</code> at which to start
     *  @param endIndex  index in <code>text</code> at which to stop
     *
-    *  @return the index of the character following the end-of-sentence 
+    *  @return the index of the character following the end-of-sentence
     *    marker, <code>endIndex</code> if no end-of-sentence
     *    marker could be found, or -1 if not implemented.
     */
    private static int findEndOfSentence(char[] text, int startIndex,
-		   			int endIndex)
+                                        int endIndex)
    {
       if (Main.getInstance().isUseBreakIterator()) {
          Segment segment = new Segment(text, startIndex, endIndex - startIndex);
@@ -254,8 +254,8 @@ public abstract class DocImpl implements Doc, TagContainer {
                     )) {
                return startIndex;
             }
-            
-	    startIndex++;
+
+            startIndex++;
          }
          return endIndex;
       }
@@ -332,7 +332,7 @@ public abstract class DocImpl implements Doc, TagContainer {
       return bufPos;
    }
 
-   public static Map parseCommentTags(char[] comment, int startIndex, int endIndex, 
+   public static Map parseCommentTags(char[] comment, int startIndex, int endIndex,
                                       ClassDocImpl contextClass, MemberDocImpl contextMember,
                                       AbstractTagImpl contextTag, String boilerplateComment) {
 
@@ -342,33 +342,33 @@ public abstract class DocImpl implements Doc, TagContainer {
 
       if (comment.length>rawDocStart) {
 
-	 firstSentenceEnd = findEndOfSentence(comment, rawDocStart, comment.length);
-	 
-	 if (firstSentenceEnd < 0) {
-	    BreakIterator boundary = BreakIterator.getSentenceInstance(Locale.ENGLISH);
-	    boundary.setText(new ArrayCharacterIterator(comment, rawDocStart));
-	    boundary.first();
-	    boundary.next();
-	    firstSentenceEnd = boundary.current();
-	 }
+         firstSentenceEnd = findEndOfSentence(comment, rawDocStart, comment.length);
 
-	 // Always include period at end of sentence if there is one.
-	 if (firstSentenceEnd < comment.length
-			 && '.' == comment[firstSentenceEnd]) {
-	    ++ firstSentenceEnd;
-	 }
+         if (firstSentenceEnd < 0) {
+            BreakIterator boundary = BreakIterator.getSentenceInstance(Locale.ENGLISH);
+            boundary.setText(new ArrayCharacterIterator(comment, rawDocStart));
+            boundary.first();
+            boundary.next();
+            firstSentenceEnd = boundary.current();
+         }
+
+         // Always include period at end of sentence if there is one.
+         if (firstSentenceEnd < comment.length
+                         && '.' == comment[firstSentenceEnd]) {
+            ++ firstSentenceEnd;
+         }
       }
 
-      final int	STATE_BEGOFLINE		   = 1;
-      final int	STATE_TEXT		   = 2;
-      final int	STATE_PARAM		   = 3;
-      final int	STATE_PARAMVALUE	   = 4;
-      final int	STATE_PARAMWRAP		   = 5;
-      final int	STATE_INLINEPARAM	   = 6;
-      final int	STATE_INLINEPARAMVALUE	   = 7;
-      final int	STATE_WHITESPACE	   = 8;
-      final int	STATE_INLINEPARAMVALUE_BOL = 9;
-      final int	STATE_IPV_WHITESPACE       = 10;
+      final int STATE_BEGOFLINE            = 1;
+      final int STATE_TEXT                 = 2;
+      final int STATE_PARAM                = 3;
+      final int STATE_PARAMVALUE           = 4;
+      final int STATE_PARAMWRAP            = 5;
+      final int STATE_INLINEPARAM          = 6;
+      final int STATE_INLINEPARAMVALUE     = 7;
+      final int STATE_WHITESPACE           = 8;
+      final int STATE_INLINEPARAMVALUE_BOL = 9;
+      final int STATE_IPV_WHITESPACE       = 10;
 
       int state=STATE_BEGOFLINE;
       int prevState=STATE_TEXT;
@@ -386,293 +386,293 @@ public abstract class DocImpl implements Doc, TagContainer {
       final char EOL=(char)-1;
 
       for (int i=rawDocStart; i<=endIndex; ++i) {
-	 char c=(i<endIndex)?comment[i]:EOL;
-	 char peek=(i<endIndex-1)?comment[i+1]:EOL;
+         char c=(i<endIndex)?comment[i]:EOL;
+         char peek=(i<endIndex-1)?comment[i+1]:EOL;
 
-	 switch (state){
+         switch (state){
 
-	 case STATE_BEGOFLINE:
-	    if (i==firstSentenceEnd) {
-	       AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
+         case STATE_BEGOFLINE:
+            if (i==firstSentenceEnd) {
+               AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
                if (null != newTag) {
                   contextTag = newTag;
                }
-	       setBufLength(0);
-	    }
+               setBufLength(0);
+            }
 
-	    if (Parser.isWhitespace(c)) {
-	       // ignore
-	    }
-	    else if (c=='*') {
-	       // ignore, but go to STATE_TEXT
-	       if (peek!='*' && peek!='@' && peek!=EOL) {
-		  state=STATE_WHITESPACE;
-	       }
-	    }
-	    else if (c=='@' || (c=='{' && peek=='@') || c==EOL) {
-	       if (bufLength()>0) { 
-		  addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-		  setBufLength(0);
-	       }
-	       if (c=='{') {
-		  ++i;
-		  state=STATE_INLINEPARAM;
-	       }
-	       else {
-		  state=STATE_PARAM;
-	       }
-	    }
-	    else {
-	       state=STATE_TEXT;
-	       appendToBuf(whitespaceBuf);
-	       whitespaceBuf.setLength(0);
-	       appendToBuf(c);
-	    }
-	    break;
+            if (Parser.isWhitespace(c)) {
+               // ignore
+            }
+            else if (c=='*') {
+               // ignore, but go to STATE_TEXT
+               if (peek!='*' && peek!='@' && peek!=EOL) {
+                  state=STATE_WHITESPACE;
+               }
+            }
+            else if (c=='@' || (c=='{' && peek=='@') || c==EOL) {
+               if (bufLength()>0) {
+                  addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+                  setBufLength(0);
+               }
+               if (c=='{') {
+                  ++i;
+                  state=STATE_INLINEPARAM;
+               }
+               else {
+                  state=STATE_PARAM;
+               }
+            }
+            else {
+               state=STATE_TEXT;
+               appendToBuf(whitespaceBuf);
+               whitespaceBuf.setLength(0);
+               appendToBuf(c);
+            }
+            break;
 
-	 case STATE_WHITESPACE:
-	    if (i==firstSentenceEnd) {
-	       AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
+         case STATE_WHITESPACE:
+            if (i==firstSentenceEnd) {
+               AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
                if (null != newTag) {
                   contextTag = newTag;
                }
-	       setBufLength(0);
-	    }
+               setBufLength(0);
+            }
 
-	    if (c=='\n') {
-	       whitespaceBuf.append(c);
-	       state=STATE_BEGOFLINE;
-	    }
-	    else if (Parser.isWhitespace(c)) {
-	       whitespaceBuf.append(c);
-	    }
-	    else if (c=='@' || (c=='{' && peek=='@') || c==EOL) {
-	       if (bufLength()>0) { 
-		  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+            if (c=='\n') {
+               whitespaceBuf.append(c);
+               state=STATE_BEGOFLINE;
+            }
+            else if (Parser.isWhitespace(c)) {
+               whitespaceBuf.append(c);
+            }
+            else if (c=='@' || (c=='{' && peek=='@') || c==EOL) {
+               if (bufLength()>0) {
+                  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
                   if (null != newTag) {
                      contextTag = newTag;
                   }
-		  setBufLength(0);
-	       }
-	       if (c=='{') {
-		  ++i;
-		  state=STATE_INLINEPARAM;
-	       }
-	       else {
-		  state=STATE_PARAM;
-	       }
-	    }
-	    else {
-	       appendToBuf(whitespaceBuf);
-	       whitespaceBuf.setLength(0);
-	       appendToBuf(c);
-	       state=STATE_TEXT;
-	    }
-	    break;
+                  setBufLength(0);
+               }
+               if (c=='{') {
+                  ++i;
+                  state=STATE_INLINEPARAM;
+               }
+               else {
+                  state=STATE_PARAM;
+               }
+            }
+            else {
+               appendToBuf(whitespaceBuf);
+               whitespaceBuf.setLength(0);
+               appendToBuf(c);
+               state=STATE_TEXT;
+            }
+            break;
 
-	 case STATE_PARAMWRAP:
-	    if (c=='\n') {
-	       appendToBuf(c);
-	    }
-	    else if (Parser.isWhitespace(c)) {
-	       // ignore
-	    }
-	    else if (c=='*') {
-	       // ignore, but go to STATE_TEXT
-	       /*
-	       if (i<endIndex && comment[i+1]!='*' && comment[i+1]!='@') {
-		  state=STATE_PARAMVALUE;
-	       }
-	       */
-	    }
-	    else if (c=='@' || c==EOL) {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+         case STATE_PARAMWRAP:
+            if (c=='\n') {
+               appendToBuf(c);
+            }
+            else if (Parser.isWhitespace(c)) {
+               // ignore
+            }
+            else if (c=='*') {
+               // ignore, but go to STATE_TEXT
+               /*
+               if (i<endIndex && comment[i+1]!='*' && comment[i+1]!='@') {
+                  state=STATE_PARAMVALUE;
+               }
+               */
+            }
+            else if (c=='@' || c==EOL) {
+               paramValue=bufToString();
+               AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
                if (null != newTag) {
                   contextTag = newTag;
                }
-	       setBufLength(0);
-	       if (c=='{') {
-		  ++i;
-		  state=STATE_INLINEPARAM;
-	       }
-	       else {
-		  state=STATE_PARAM;
-	       }
-	    }
-	    else {
-	       state=STATE_PARAMVALUE;
-	       appendToBuf(c);
-	    }
-	    break;
+               setBufLength(0);
+               if (c=='{') {
+                  ++i;
+                  state=STATE_INLINEPARAM;
+               }
+               else {
+                  state=STATE_PARAM;
+               }
+            }
+            else {
+               state=STATE_PARAMVALUE;
+               appendToBuf(c);
+            }
+            break;
 
-	 case STATE_PARAM:
-	    if (!(c==EOL || Parser.isWhitespace(c))) {
-	       appendToBuf(c);
-	    }
-	    else if (c=='\n') {
-	       paramName=bufToString();
-	       setBufLength(0);
-	       state=STATE_PARAMWRAP;
-	    }
-	    else {
-	       paramName=bufToString();
-	       setBufLength(0);
-	       state=STATE_PARAMVALUE;
-	    }
-	    break;
+         case STATE_PARAM:
+            if (!(c==EOL || Parser.isWhitespace(c))) {
+               appendToBuf(c);
+            }
+            else if (c=='\n') {
+               paramName=bufToString();
+               setBufLength(0);
+               state=STATE_PARAMWRAP;
+            }
+            else {
+               paramName=bufToString();
+               setBufLength(0);
+               state=STATE_PARAMVALUE;
+            }
+            break;
 
-	 case STATE_INLINEPARAM:
-	    if (c=='}') {
+         case STATE_INLINEPARAM:
+            if (c=='}') {
                // tag without value
-	       paramName=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, paramName, "", i<firstSentenceEnd, contextClass, contextMember, contextTag, true);
+               paramName=bufToString();
+               AbstractTagImpl newTag = addTag(tags, paramName, "", i<firstSentenceEnd, contextClass, contextMember, contextTag, true);
                if (null != newTag) {
                   contextTag = newTag;
                }
                state=prevState;
                setBufLength(0);
             }
-	    else if (!(c==EOL || Parser.isWhitespace(c))) {
-	       appendToBuf(c);
-	    }
-	    else if (c=='\n') {
-	       paramName=bufToString();
-	       setBufLength(0);
-	       state=STATE_INLINEPARAMVALUE_BOL;
-	    }
-	    else {
-	       paramName=bufToString();
-	       setBufLength(0);
-	       state=STATE_INLINEPARAMVALUE;
-	    }
-	    break;
-
-	 case STATE_PARAMVALUE:
-	    if (c==EOL) {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-               if (null != newTag) {
-                  contextTag = newTag;
-               }
-	    }
-	    else if (c=='\n') {
-	       appendToBuf(c);
-	       state=STATE_PARAMWRAP;
-	    }
-	    else {
-	       appendToBuf(c);
-	    }
-	    break;
-
-	 case STATE_INLINEPARAMVALUE:
-	    if (c=='\n') {
-	       appendToBuf(c);
-	       state=STATE_INLINEPARAMVALUE_BOL;
-	    }
-	    else if (c==EOL || c=='}') {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, true);
-               if (null != newTag) {
-                  contextTag = newTag;
-               }
-	       state=prevState;
-	       setBufLength(0);
-	    }
-	    else {
-	       appendToBuf(c);
-	    }
-	    break;
-
-	 case STATE_INLINEPARAMVALUE_BOL:
-	    if (Parser.isWhitespace(c)) {
-	       // ignore
-	    }
-	    else if (c=='*') {
-	       // ignore, but go to STATE_TEXT
-	       if (i<endIndex && peek!='*') {
-		  state=STATE_IPV_WHITESPACE;
-	       }
-	    }
-	    else if (c==EOL) {
-	       if (bufLength()>0) { 
-		  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-                  if (null != newTag) {
-                     contextTag = newTag;
-                  }
-	       }
-	    }
-	    else {
-	       state=STATE_INLINEPARAMVALUE;
-	       appendToBuf(whitespaceBuf);
-	       whitespaceBuf.setLength(0);
-	       appendToBuf(c);
-	    }
-	    break;
-
-	 case STATE_IPV_WHITESPACE:
-	    if (c=='\n') {
-	       whitespaceBuf.append(c);
-	       state=STATE_INLINEPARAMVALUE_BOL;
-	    }
-	    else if (Parser.isWhitespace(c)) {
-	       whitespaceBuf.append(c);
-	    }
-	    else if (c==EOL) {
-	       if (bufLength()>0) { 
-		  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-                  if (null != newTag) {
-                     contextTag = newTag;
-                  }
-		  setBufLength(0);
-	       }
-	    }
-	    else {
-	       appendToBuf(whitespaceBuf);
-	       whitespaceBuf.setLength(0);
-	       appendToBuf(c);
-	       state=STATE_INLINEPARAMVALUE;
-	    }
-	    break;
-
-	 case STATE_TEXT:
-	    if (i==firstSentenceEnd) {
-	       AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
-               if (null != newTag) {
-                  contextTag = newTag;
-               }
-	       setBufLength(0);
-	    }
-
-	    if (c==EOL) {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, "text", paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-               if (null != newTag) {
-                  contextTag = newTag;
-               }
-	    }
-	    else if (c=='\n') {
-	       appendToBuf(c);
-	       state=STATE_BEGOFLINE;
-	    }
-	    else if (c=='{' && peek=='@') {
-	       paramValue=bufToString();
-	       AbstractTagImpl newTag = addTag(tags, "text", paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
-               if (null != newTag) {
-                  contextTag = newTag;
-               }
-	       ++i;
+            else if (!(c==EOL || Parser.isWhitespace(c))) {
+               appendToBuf(c);
+            }
+            else if (c=='\n') {
+               paramName=bufToString();
                setBufLength(0);
-	       state=STATE_INLINEPARAM;
-	    }
-	    else {
-	       appendToBuf(c);
-	    }
-	    break;
+               state=STATE_INLINEPARAMVALUE_BOL;
+            }
+            else {
+               paramName=bufToString();
+               setBufLength(0);
+               state=STATE_INLINEPARAMVALUE;
+            }
+            break;
 
-	 default:
-	    throw new Error("illegal state "+state);
-	 }
+         case STATE_PARAMVALUE:
+            if (c==EOL) {
+               paramValue=bufToString();
+               AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+               if (null != newTag) {
+                  contextTag = newTag;
+               }
+            }
+            else if (c=='\n') {
+               appendToBuf(c);
+               state=STATE_PARAMWRAP;
+            }
+            else {
+               appendToBuf(c);
+            }
+            break;
+
+         case STATE_INLINEPARAMVALUE:
+            if (c=='\n') {
+               appendToBuf(c);
+               state=STATE_INLINEPARAMVALUE_BOL;
+            }
+            else if (c==EOL || c=='}') {
+               paramValue=bufToString();
+               AbstractTagImpl newTag = addTag(tags, paramName, paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, true);
+               if (null != newTag) {
+                  contextTag = newTag;
+               }
+               state=prevState;
+               setBufLength(0);
+            }
+            else {
+               appendToBuf(c);
+            }
+            break;
+
+         case STATE_INLINEPARAMVALUE_BOL:
+            if (Parser.isWhitespace(c)) {
+               // ignore
+            }
+            else if (c=='*') {
+               // ignore, but go to STATE_TEXT
+               if (i<endIndex && peek!='*') {
+                  state=STATE_IPV_WHITESPACE;
+               }
+            }
+            else if (c==EOL) {
+               if (bufLength()>0) {
+                  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+                  if (null != newTag) {
+                     contextTag = newTag;
+                  }
+               }
+            }
+            else {
+               state=STATE_INLINEPARAMVALUE;
+               appendToBuf(whitespaceBuf);
+               whitespaceBuf.setLength(0);
+               appendToBuf(c);
+            }
+            break;
+
+         case STATE_IPV_WHITESPACE:
+            if (c=='\n') {
+               whitespaceBuf.append(c);
+               state=STATE_INLINEPARAMVALUE_BOL;
+            }
+            else if (Parser.isWhitespace(c)) {
+               whitespaceBuf.append(c);
+            }
+            else if (c==EOL) {
+               if (bufLength()>0) {
+                  AbstractTagImpl newTag = addTag(tags, "text", bufToString(), i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+                  if (null != newTag) {
+                     contextTag = newTag;
+                  }
+                  setBufLength(0);
+               }
+            }
+            else {
+               appendToBuf(whitespaceBuf);
+               whitespaceBuf.setLength(0);
+               appendToBuf(c);
+               state=STATE_INLINEPARAMVALUE;
+            }
+            break;
+
+         case STATE_TEXT:
+            if (i==firstSentenceEnd) {
+               AbstractTagImpl newTag = addTag(tags, "text", bufToString(), true, contextClass, contextMember, contextTag, false);
+               if (null != newTag) {
+                  contextTag = newTag;
+               }
+               setBufLength(0);
+            }
+
+            if (c==EOL) {
+               paramValue=bufToString();
+               AbstractTagImpl newTag = addTag(tags, "text", paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+               if (null != newTag) {
+                  contextTag = newTag;
+               }
+            }
+            else if (c=='\n') {
+               appendToBuf(c);
+               state=STATE_BEGOFLINE;
+            }
+            else if (c=='{' && peek=='@') {
+               paramValue=bufToString();
+               AbstractTagImpl newTag = addTag(tags, "text", paramValue, i<firstSentenceEnd, contextClass, contextMember, contextTag, false);
+               if (null != newTag) {
+                  contextTag = newTag;
+               }
+               ++i;
+               setBufLength(0);
+               state=STATE_INLINEPARAM;
+            }
+            else {
+               appendToBuf(c);
+            }
+            break;
+
+         default:
+            throw new Error("illegal state "+state);
+         }
       }
 
 
@@ -683,23 +683,23 @@ public abstract class DocImpl implements Doc, TagContainer {
       Map rc=new HashMap();
 
       for (Iterator it=tags.keySet().iterator(); it.hasNext(); ) {
-	 String key=(String)it.next();
-	 Tag[] templateArr;
-	 List list=(List)tags.get(key);
+         String key=(String)it.next();
+         Tag[] templateArr;
+         List list=(List)tags.get(key);
 
-	 if ("see".equals(key))
-	    templateArr=new SeeTag[list.size()];
-	 else if ("param".equals(key))
-	    templateArr=new ParamTag[list.size()];
-	 else if ("serialField".equals(key))
-	    templateArr=new SerialFieldTag[list.size()];
-	 else if ("throws".equals(key) || "exception".equals(key))
-	    templateArr=new ThrowsTag[list.size()];
-	 else {
-	    templateArr=new Tag[list.size()];
-	 }
+         if ("see".equals(key))
+            templateArr=new SeeTag[list.size()];
+         else if ("param".equals(key))
+            templateArr=new ParamTag[list.size()];
+         else if ("serialField".equals(key))
+            templateArr=new SerialFieldTag[list.size()];
+         else if ("throws".equals(key) || "exception".equals(key))
+            templateArr=new ThrowsTag[list.size()];
+         else {
+            templateArr=new Tag[list.size()];
+         }
 
-	 rc.put(key, list.toArray(templateArr));
+         rc.put(key, list.toArray(templateArr));
       }
 
       return rc;
@@ -707,22 +707,22 @@ public abstract class DocImpl implements Doc, TagContainer {
 
    private ClassDocImpl getContextClass() {
       if (isClass() || isInterface()) {
-	 return (ClassDocImpl)this;
+         return (ClassDocImpl)this;
       }
       else if (isField() || isMethod() || isConstructor()) {
-	 return (ClassDocImpl)((MemberDocImpl)this).containingClass();
+         return (ClassDocImpl)((MemberDocImpl)this).containingClass();
       }
       else {
-	 return null;
+         return null;
       }
    }
 
    private MemberDocImpl getContextMember() {
       if (isField() || isMethod() || isConstructor()) {
-	 return (MemberDocImpl)this;
+         return (MemberDocImpl)this;
       }
       else {
-	 return null;
+         return null;
       }
    }
 
@@ -777,7 +777,7 @@ public abstract class DocImpl implements Doc, TagContainer {
          if (haveValue) {
             //printWarning("@inheritDoc tags are not supposed to have any content.");
          }
-	 tag=new InheritDocTagImpl(contextClass, contextMember, contextTag);
+         tag=new InheritDocTagImpl(contextClass, contextMember, contextTag);
          isInline = true;
       }
       else if (name.equals("serialField")) {
@@ -795,14 +795,14 @@ public abstract class DocImpl implements Doc, TagContainer {
          else {
             //printWarning(emptyWarning);
          }
-	 name="throws";
+         name="throws";
       }
       else if (name.equals("text")) {
-	 tag=new TextTagImpl(value);
+         tag=new TextTagImpl(value);
          isInline = true;
       }
       else {
-	 tag=new TagImpl("@"+name, value.trim(), contextClass, contextMember);
+         tag=new TagImpl("@"+name, value.trim(), contextClass, contextMember);
          // FIXME: consider taglets
       }
 
@@ -823,7 +823,7 @@ public abstract class DocImpl implements Doc, TagContainer {
                      newTag = tag;
                   }
                   ((List)tags.get("first")).add(newTag);
-               
+
                }
                else {
                   ((List)tags.get("first")).add(tag);
@@ -848,19 +848,19 @@ public abstract class DocImpl implements Doc, TagContainer {
       }
    }
 
-   // Return all tags in this Doc item. 
+   // Return all tags in this Doc item.
    public Tag[] tags() {
       Tag[] rc=(Tag[])tagMap.get("all");
       if (rc==null) rc=new Tag[0];
       return rc;
-   } 
+   }
 
-   // Return tags of the specified kind in this Doc item. 
+   // Return tags of the specified kind in this Doc item.
    public Tag[] tags(java.lang.String tagname) {
       Tag[] rc=(Tag[])tagMap.get(tagname);
       if (rc==null) rc=new Tag[0];
       return rc;
-   } 
+   }
 
    protected String rawDocumentation;
    protected long rawDocOffset=-1;
@@ -873,12 +873,12 @@ public abstract class DocImpl implements Doc, TagContainer {
 
       Tag[] tags=tags();
       for (int i=0; i<tags.length; ++i) {
-	 ((AbstractTagImpl)tags[i]).resolve();
+         ((AbstractTagImpl)tags[i]).resolve();
       }
 
       Tag[] inlineTags=inlineTags();
       for (int i=0; i<inlineTags.length; ++i) {
-	 ((AbstractTagImpl)inlineTags[i]).resolve();
+         ((AbstractTagImpl)inlineTags[i]).resolve();
       }
    }
 
@@ -923,7 +923,7 @@ public abstract class DocImpl implements Doc, TagContainer {
       }
 
       File file = getFile(classDoc);
-      
+
       return new SourcePositionImpl(file, line + 1, column + 1);
    }
 
@@ -958,7 +958,7 @@ public abstract class DocImpl implements Doc, TagContainer {
          result = (DocImpl)((ClassDocImpl)classDoc).getFieldDoc(memberDoc.name());
       }
       else if (memberDoc.isMethod()) {
-         result = (DocImpl)((ClassDocImpl)classDoc).getMethodDoc(memberDoc.name(), 
+         result = (DocImpl)((ClassDocImpl)classDoc).getMethodDoc(memberDoc.name(),
                                                                  ((MethodDoc)memberDoc).signature());
       }
       else if (memberDoc.isConstructor()) {
@@ -1007,8 +1007,8 @@ public abstract class DocImpl implements Doc, TagContainer {
       }
    }
 
-   public static TagContainer findInheritedDoc(ClassDoc classDoc, 
-                                               MemberDocImpl memberDoc, 
+   public static TagContainer findInheritedDoc(ClassDoc classDoc,
+                                               MemberDocImpl memberDoc,
                                                AbstractTagImpl tag)
    {
       TagContainer result;
@@ -1027,7 +1027,7 @@ public abstract class DocImpl implements Doc, TagContainer {
       // in the order they appear following the word implements (or
       // extends) in the method declaration. Use the first doc comment
       // found for this method.
-      
+
       ClassDoc[] interfaces = classDoc.interfaces();
       if (null != interfaces) {
          for (int i=0; i<interfaces.length; ++i) {
@@ -1056,7 +1056,7 @@ public abstract class DocImpl implements Doc, TagContainer {
 
       // 3. If step 2 failed to find a doc comment and this is a class
       // other than Object (not an interface):
-      if (!classDoc.isInterface() 
+      if (!classDoc.isInterface()
           && null != superclassDoc
           && !"java.lang.Object".equals(classDoc.qualifiedTypeName())) {
 
@@ -1077,7 +1077,7 @@ public abstract class DocImpl implements Doc, TagContainer {
          return null;
       }
    }
-   
+
    public boolean isEmptyDoc()
    {
       return tagMap.isEmpty();
@@ -1088,4 +1088,3 @@ public abstract class DocImpl implements Doc, TagContainer {
       this.boilerplateComment = boilerplateComment;
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java
index 129689bc9ae..3c139ab2547 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ErrorReporter.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -66,7 +66,7 @@ public class ErrorReporter implements DocErrorReporter {
     *  When <code>true</code>, no notices will be emitted.
     */
    private boolean quiet = false;
-   
+
    /*
     *  When <code>true</code>, no warnings will be emitted.
     */
@@ -77,30 +77,30 @@ public class ErrorReporter implements DocErrorReporter {
       this.out = System.err;
    }
 
-   // Print error message, increment error count. 
+   // Print error message, increment error count.
    public void printError(java.lang.String msg) {
       out.println("ERROR: "+msg);
       ++errorCount;
    }
 
-   // Print error message, increment error count. 
+   // Print error message, increment error count.
    public void printFatal(java.lang.String msg) {
       out.println("FATAL: "+msg);
       System.exit(10);
    }
 
-   // Print a message. 
+   // Print a message.
    public void printNotice(java.lang.String msg) {
       if (!quiet) {
-	 out.println(msg);
+         out.println(msg);
       }
    }
-   
-   // Print warning message, increment warning count. 
+
+   // Print warning message, increment warning count.
    public void printWarning(java.lang.String msg) {
       if (!noWarn) {
-	 out.println("WARNING: "+msg);
-	 ++warningCount;;
+         out.println("WARNING: "+msg);
+         ++warningCount;;
       }
    }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
index f177c1531b6..d5b1b1eb018 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ExecutableMemberDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -44,32 +44,32 @@ import com.sun.javadoc.*;
 public class ExecutableMemberDocImpl extends MemberDocImpl implements ExecutableMemberDoc {
 
    protected ExecutableMemberDocImpl(ClassDoc containingClass,
-				     PackageDoc containingPackage,
+                                     PackageDoc containingPackage,
                                      SourcePosition position) {
-      
+
       super(containingClass,
-	    containingPackage,
+            containingPackage,
             position);
    }
 
    protected boolean processModifier(String word) {
       if (super.processModifier(word)) {
-	 return true;
+         return true;
       }
       else if (word.equals("synchronized")) {
-	 isSynchronized=true;
-	 return true;	 
+         isSynchronized=true;
+         return true;
       }
       else if (word.equals("native")) {
-	 isNative=true;
-	 return true;	 
+         isNative=true;
+         return true;
       }
       else if (word.equals("abstract")) {
-	 isAbstract=true;
-	 return true;	 
+         isAbstract=true;
+         return true;
       }
       else {
-	 return false;
+         return false;
       }
    }
 
@@ -87,41 +87,41 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
 
    public Parameter[] parameters() { return parameters; }
 
-   public ThrowsTag[] throwsTags() { 
+   public ThrowsTag[] throwsTags() {
       return (ThrowsTag[])getTagArr("throws", throwsTagEmptyArr);
    }
 
-   public ParamTag[] paramTags() { 
+   public ParamTag[] paramTags() {
       return (ParamTag[])getTagArr("param", paramTagEmptyArr);
    }
 
    public String signature() { return signature; }
    public String flatSignature() { return flatSignature; }
 
-   public ClassDoc overriddenClass() { 
+   public ClassDoc overriddenClass() {
       for (ClassDoc cdi=(ClassDoc)containingClass().superclass(); cdi!=null; cdi=(ClassDoc)cdi.superclass()) {
-	 if (null!=ClassDocImpl.findMethod(cdi, name(), signature()))
-	    return cdi;
+         if (null!=ClassDocImpl.findMethod(cdi, name(), signature()))
+            return cdi;
       }
       return null;
    }
 
    public static ExecutableMemberDocImpl createFromSource(ClassDoc containingClass,
-							  PackageDoc containingPackage,
-							  char[] source, int startIndex, int endIndex) throws IOException, ParseException {
+                                                          PackageDoc containingPackage,
+                                                          char[] source, int startIndex, int endIndex) throws IOException, ParseException {
 
       int lastchar=32;
       StringBuffer methodName=new StringBuffer();
       for (int i=startIndex; i<endIndex && source[i]!='('; ++i) {
-	 if ((Parser.WHITESPACE.indexOf(lastchar)>=0 && Parser.WHITESPACE.indexOf(source[i])<0)
+         if ((Parser.WHITESPACE.indexOf(lastchar)>=0 && Parser.WHITESPACE.indexOf(source[i])<0)
              || (lastchar == ']' && Parser.WHITESPACE.indexOf(source[i])<0 && '[' != source[i])) {
             methodName.setLength(0);
             methodName.append(source[i]);
          }
-	 else if (Parser.WHITESPACE.indexOf(source[i])<0) {
+         else if (Parser.WHITESPACE.indexOf(source[i])<0) {
             methodName.append(source[i]);
          }
-	 lastchar=source[i];
+         lastchar=source[i];
       }
 
       ExecutableMemberDocImpl rc;
@@ -129,24 +129,24 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
       SourcePosition position = DocImpl.getPosition(containingClass, source, startIndex);
 
       if (methodName.toString().equals(((ClassDocImpl)containingClass).getClassName())) {
-	 
-	 // Constructor
 
-	 rc=new ConstructorDocImpl(containingClass,
-				   containingPackage,
+         // Constructor
+
+         rc=new ConstructorDocImpl(containingClass,
+                                   containingPackage,
                                    position);
       }
       else {
 
-	 // Normal method
+         // Normal method
 
-	 rc=new MethodDocImpl(containingClass,
-			      containingPackage,
+         rc=new MethodDocImpl(containingClass,
+                              containingPackage,
                               position);
       }
-      
+
       if (containingClass.isInterface())
-	 rc.accessLevel=ACCESS_PUBLIC;
+         rc.accessLevel=ACCESS_PUBLIC;
 
       int ndx=rc.parseModifiers(source, startIndex, endIndex);
       StringBuffer name = new StringBuffer();
@@ -158,69 +158,69 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
       int state=STATE_NORMAL;
 
       while (source[ndx]!='(' && ndx<endIndex) {
-	 if (state==STATE_NORMAL) {
-	    if (ndx<endIndex-1 && source[ndx]=='/' && source[ndx+1]=='/') {
-	       ++ndx;
-	       state=STATE_SLASHC;
-	    }
-	    else if (ndx<endIndex-1 && source[ndx]=='/' && source[ndx+1]=='*') {
-	       ++ndx;
-	       state=STATE_STARC;
-	    }
-	    else {
-	       name.append(source[ndx]);
-	    }
-	 }
-	 else if (state==STATE_SLASHC) {
-	    if (source[ndx]=='\n')
-	       state=STATE_NORMAL;
-	 }
-	 else if (state==STATE_STARC) {
-	    if (ndx<endIndex-1 && source[ndx]=='*' && source[ndx+1]=='/') {
-	       ++ndx;
-	       state=STATE_NORMAL;
-	    }
-	 }
-	 ++ndx;
+         if (state==STATE_NORMAL) {
+            if (ndx<endIndex-1 && source[ndx]=='/' && source[ndx+1]=='/') {
+               ++ndx;
+               state=STATE_SLASHC;
+            }
+            else if (ndx<endIndex-1 && source[ndx]=='/' && source[ndx+1]=='*') {
+               ++ndx;
+               state=STATE_STARC;
+            }
+            else {
+               name.append(source[ndx]);
+            }
+         }
+         else if (state==STATE_SLASHC) {
+            if (source[ndx]=='\n')
+               state=STATE_NORMAL;
+         }
+         else if (state==STATE_STARC) {
+            if (ndx<endIndex-1 && source[ndx]=='*' && source[ndx+1]=='/') {
+               ++ndx;
+               state=STATE_NORMAL;
+            }
+         }
+         ++ndx;
       }
       rc.setName(name.toString().trim());
 
       state=STATE_NORMAL;
-      
+
       ++ndx;
       int endx;
       String param="";
       List parameterList=new ArrayList();
       for (endx=ndx; endx<endIndex; ++endx) {
-	 if (state==STATE_SLASHC) {
-	    if (source[endx]=='\n') {
-	       state=STATE_NORMAL;
-	    }
-	 }
-	 else if (state==STATE_STARC) {
-	    if (source[endx]=='*' && source[endx+1]=='/') {
-	       state=STATE_NORMAL;
-	       ++endx;
-	    }
-	 }
-	 else if (source[endx]=='/' && source[endx+1]=='*') {
-	    state=STATE_STARC;
-	    ++endx;
-	 }
-	 else if (source[endx]=='/' && source[endx+1]=='/') {
-	    state=STATE_SLASHC;
-	    ++endx;
-	 }
-	 else if (source[endx]==',' || source[endx]==')') {
-	    param=param.trim();
-	    if (param.length()>0) {
-	       int n = param.length()-1;
+         if (state==STATE_SLASHC) {
+            if (source[endx]=='\n') {
+               state=STATE_NORMAL;
+            }
+         }
+         else if (state==STATE_STARC) {
+            if (source[endx]=='*' && source[endx+1]=='/') {
+               state=STATE_NORMAL;
+               ++endx;
+            }
+         }
+         else if (source[endx]=='/' && source[endx+1]=='*') {
+            state=STATE_STARC;
+            ++endx;
+         }
+         else if (source[endx]=='/' && source[endx+1]=='/') {
+            state=STATE_SLASHC;
+            ++endx;
+         }
+         else if (source[endx]==',' || source[endx]==')') {
+            param=param.trim();
+            if (param.length()>0) {
+               int n = param.length()-1;
                int paramNameStart = 0;
                while (n >= 0) {
                   char c = param.charAt(n);
-		  if ('[' == c || ']' == c || Parser.WHITESPACE.indexOf(c)>=0) {
+                  if ('[' == c || ']' == c || Parser.WHITESPACE.indexOf(c)>=0) {
                      paramNameStart = n + 1;
-		     break;
+                     break;
                   }
                   else {
                      -- n;
@@ -235,21 +235,21 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
                int paramTypeStart = 0;
                while (n >= 0) {
                   char c = param.charAt(n);
-		  if ('[' == c || ']' == c || Parser.WHITESPACE.indexOf(c)>=0) {
+                  if ('[' == c || ']' == c || Parser.WHITESPACE.indexOf(c)>=0) {
                      paramTypeStart = n + 1;
-		     break;
+                     break;
                   }
                   else {
                      -- n;
                   }
                }
 
-	       String paramType;
-	       String paramName;
-	       if (0 != paramNameStart) {
-		  paramType=param.substring(paramTypeStart, paramTypeEnd);
-		  paramName=param.substring(paramNameStart);
-	       }
+               String paramType;
+               String paramName;
+               if (0 != paramNameStart) {
+                  paramType=param.substring(paramTypeStart, paramTypeEnd);
+                  paramName=param.substring(paramNameStart);
+               }
                else {
                   paramName = "";
                   StringBuffer paramTypeBuffer = new StringBuffer();
@@ -261,34 +261,34 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
                   }
                   paramType = paramTypeBuffer.toString();
                }
-	       String dimSuffix="";
+               String dimSuffix="";
 
                for (int i=0; i<param.length(); ++i) {
                   if ('[' == param.charAt(i)) {
                      dimSuffix += "[]";
                   }
                }
-	       paramType+=dimSuffix;
+               paramType+=dimSuffix;
 
                if (paramType.startsWith("[")) {
                   System.err.println("broken param type in " + rc + " in " +containingClass);
                }
 
-	       parameterList.add(new ParameterImpl(paramName, paramType, 
-						   ((ClassDocImpl)containingClass).typeForString(paramType)));
+               parameterList.add(new ParameterImpl(paramName, paramType,
+                                                   ((ClassDocImpl)containingClass).typeForString(paramType)));
 
-	       param="";
-	    }
-	 }
-	 else
-	    param+=source[endx];
+               param="";
+            }
+         }
+         else
+            param+=source[endx];
 
-	 if (source[endx]==')' && state==STATE_NORMAL)
-	    break;
+         if (source[endx]==')' && state==STATE_NORMAL)
+            break;
       }
 
       rc.setParameters((Parameter[])parameterList.toArray(new Parameter[0]));
-      
+
       ++endx;
       String word="";
       String dimSuffix="";
@@ -297,58 +297,58 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
 
       state=STATE_NORMAL;
       for (; endx<endIndex; ++endx) {
-	 if (state==STATE_SLASHC) {
-	    if (source[endx]=='\n') state=STATE_NORMAL;
-	 }
-	 else if (state==STATE_STARC) {
-	    if (source[endx]=='*' && source[endx+1]=='/') {
-	       state=STATE_NORMAL;
-	       ++endx;
-	    }
-	 }
-	 else if (source[endx]=='/' && source[endx+1]=='*') {
-	    state=STATE_STARC;
-	    ++endx;
-	 }
-	 else if (source[endx]=='/' && source[endx+1]=='/') {
-	    state=STATE_SLASHC;
-	    ++endx;
-	 }
-	 else if (Parser.WHITESPACE.indexOf(source[endx])>=0) {
-	    word=word.trim();
-	    if (!haveThrowsKeyword && word.length()>0) {
-	       if (word.equals("throws")) haveThrowsKeyword=true;
-	       else System.err.println("ARGH! "+word);
-	       word="";
-	    }
-	 }
-	 else if (source[endx]=='[' || source[endx]==']') {
-	    dimSuffix += source[endx];
-	 }
-	 else if (source[endx]==',' || source[endx]=='{' || source[endx]==';') {
-	    word=word.trim();
-	    if (word.length()>0) {
-	       ClassDoc exceptionType=rc.containingClass().findClass(word);
-	       if (exceptionType==null) {
-		  exceptionType=new ClassDocProxy(word, 
+         if (state==STATE_SLASHC) {
+            if (source[endx]=='\n') state=STATE_NORMAL;
+         }
+         else if (state==STATE_STARC) {
+            if (source[endx]=='*' && source[endx+1]=='/') {
+               state=STATE_NORMAL;
+               ++endx;
+            }
+         }
+         else if (source[endx]=='/' && source[endx+1]=='*') {
+            state=STATE_STARC;
+            ++endx;
+         }
+         else if (source[endx]=='/' && source[endx+1]=='/') {
+            state=STATE_SLASHC;
+            ++endx;
+         }
+         else if (Parser.WHITESPACE.indexOf(source[endx])>=0) {
+            word=word.trim();
+            if (!haveThrowsKeyword && word.length()>0) {
+               if (word.equals("throws")) haveThrowsKeyword=true;
+               else System.err.println("ARGH! "+word);
+               word="";
+            }
+         }
+         else if (source[endx]=='[' || source[endx]==']') {
+            dimSuffix += source[endx];
+         }
+         else if (source[endx]==',' || source[endx]=='{' || source[endx]==';') {
+            word=word.trim();
+            if (word.length()>0) {
+               ClassDoc exceptionType=rc.containingClass().findClass(word);
+               if (exceptionType==null) {
+                  exceptionType=new ClassDocProxy(word,
                                                   rc.containingClass());
-	       }
-	       thrownExceptionsList.add(exceptionType);
-	    }
-	    if (source[endx]=='{') {
-	       break;
-	    }
-	    else {
-	       word="";
-	    }
-	 }
-	 else {
-	    word+=source[endx];
-	 }
+               }
+               thrownExceptionsList.add(exceptionType);
+            }
+            if (source[endx]=='{') {
+               break;
+            }
+            else {
+               word="";
+            }
+         }
+         else {
+            word+=source[endx];
+         }
       }
 
       if (dimSuffix.length()>0) {
-	 rc.setTypeName(rc.getTypeName()+dimSuffix);
+         rc.setTypeName(rc.getTypeName()+dimSuffix);
       }
 
       rc.setThrownExceptions((ClassDoc[])thrownExceptionsList.toArray(new ClassDoc[0]));
@@ -372,26 +372,26 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
    void resolve() {
 
       for (int i=0; i<thrownExceptions.length; ++i) {
-	 if (thrownExceptions[i] instanceof ClassDocProxy) {
-	    String className=thrownExceptions[i].qualifiedName();
-	    ClassDoc realClassDoc=containingClass().findClass(className);
-	    if (realClassDoc!=null)
-	       thrownExceptions[i]=realClassDoc;
-	 }
+         if (thrownExceptions[i] instanceof ClassDocProxy) {
+            String className=thrownExceptions[i].qualifiedName();
+            ClassDoc realClassDoc=containingClass().findClass(className);
+            if (realClassDoc!=null)
+               thrownExceptions[i]=realClassDoc;
+         }
       }
 
       StringBuffer signatureBuf=new StringBuffer();
       StringBuffer flatSignatureBuf=new StringBuffer();
 
       for (int i=0; i<parameters.length; ++i) {
-	 ((ParameterImpl)parameters[i]).resolve(containingClass());
+         ((ParameterImpl)parameters[i]).resolve(containingClass());
 
-	 if (signatureBuf.length()>0) {
-	    signatureBuf.append(",");
-	    flatSignatureBuf.append(",");
-	 }
-	 signatureBuf.append(parameters[i].type().qualifiedTypeName());
-	 flatSignatureBuf.append(parameters[i].type().typeName());
+         if (signatureBuf.length()>0) {
+            signatureBuf.append(",");
+            flatSignatureBuf.append(",");
+         }
+         signatureBuf.append(parameters[i].type().qualifiedTypeName());
+         flatSignatureBuf.append(parameters[i].type().typeName());
          signatureBuf.append(parameters[i].type().dimension());
          flatSignatureBuf.append(parameters[i].type().dimension());
       }
@@ -406,7 +406,7 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
       int rc;
       if (other instanceof MemberDocImpl) {
          MemberDocImpl otherMember = (MemberDocImpl)other;
-	 rc = name().compareTo(otherMember.name());
+         rc = name().compareTo(otherMember.name());
          if (0 == rc) {
             if (other instanceof ExecutableMemberDocImpl) {
                rc = signature().compareTo(((ExecutableMemberDocImpl)other).signature());
@@ -420,9 +420,8 @@ public class ExecutableMemberDocImpl extends MemberDocImpl implements Executable
          }
       }
       else {
-	 rc = 1;
+         rc = 1;
       }
       return rc;
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
index 341797611ce..f99024daa70 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -45,9 +45,9 @@ import gnu.classpath.tools.gjdoc.expr.Evaluator;
 import gnu.classpath.tools.gjdoc.expr.CircularExpressionException;
 import gnu.classpath.tools.gjdoc.expr.IllegalExpressionException;
 
-public class FieldDocImpl 
-   extends MemberDocImpl 
-   implements FieldDoc, Cloneable 
+public class FieldDocImpl
+   extends MemberDocImpl
+   implements FieldDoc, Cloneable
 {
 
    private boolean isTransient;
@@ -61,7 +61,7 @@ public class FieldDocImpl
                         SourcePosition position) {
 
       super(containingClass,
-	    containingPackage,
+            containingPackage,
             position);
    }
 
@@ -82,7 +82,7 @@ public class FieldDocImpl
             dimSuffix=fieldDef.charAt(fieldDef.length()-1)+dimSuffix;
             fieldDef=fieldDef.substring(0,fieldDef.length()-1);
          }
-         
+
          fieldDoc.setTypeName(fieldDoc.getTypeName()+dimSuffix);
          fieldDoc.setName(fieldDef.trim());
          fieldDoc.setValueLiteral(fieldValueLiteral);
@@ -96,13 +96,13 @@ public class FieldDocImpl
    }
 
    public static Collection createFromSource(ClassDoc containingClass,
-					     PackageDoc containingPackage,
-					     char[] source, int startIndex, int endIndex) {
-      
+                                             PackageDoc containingPackage,
+                                             char[] source, int startIndex, int endIndex) {
+
       List rcList=new ArrayList();
 
       FieldDocImpl fd=new FieldDocImpl(containingClass,
-				       containingPackage,
+                                       containingPackage,
                                        DocImpl.getPosition(containingClass, source, startIndex));
 
       int ndx=fd.parseModifiers(source, startIndex, endIndex);
@@ -131,12 +131,12 @@ public class FieldDocImpl
 
       for (int i=ndx; i<endIndex; ++i) {
 
-	 char c = source[i];
+         char c = source[i];
          char nextChar = '\0';
          if (i + 1 < endIndex) {
             nextChar = source[i + 1];
          }
-	 switch (state) {
+         switch (state) {
          case STATE_FIELDNAME:
             if ('/' == c && '/' == nextChar) {
                prevState = state;
@@ -158,7 +158,7 @@ public class FieldDocImpl
             }
             break;
 
-	 case STATE_FIELDVALUE:
+         case STATE_FIELDVALUE:
             if ('/' == c && '/' == nextChar) {
                prevState = state;
                state = STATE_LINECOMMENT;
@@ -167,65 +167,65 @@ public class FieldDocImpl
                prevState = state;
                state = STATE_COMMENT;
             }
-	    else if ('\"' == c) {
+            else if ('\"' == c) {
                prevState = state;
-	       state = STATE_QUOTE;
+               state = STATE_QUOTE;
                fieldValueLiteralBuf.append(c);
-	    }
-	    else if ('\'' == c) {
+            }
+            else if ('\'' == c) {
                prevState = state;
-	       state = STATE_SQUOTE;
+               state = STATE_SQUOTE;
                fieldValueLiteralBuf.append(c);
-	    }
-	    else if ('{' == c || '(' == c) {
+            }
+            else if ('{' == c || '(' == c) {
                ++ bracketCount;
                fieldValueLiteralBuf.append(c);
-	    }
-	    else if ('}' == c || ')' == c) {
+            }
+            else if ('}' == c || ')' == c) {
                -- bracketCount;
                fieldValueLiteralBuf.append(c);
-	    }
-	    else if (0 == bracketCount && (',' == c || ';' == c)) {
-               rcList.add(createFieldDoc(fd, fieldNameBuf.toString(), 
+            }
+            else if (0 == bracketCount && (',' == c || ';' == c)) {
+               rcList.add(createFieldDoc(fd, fieldNameBuf.toString(),
                                          fieldValueLiteralBuf.toString()));
                fieldNameBuf.setLength(0);
                fieldValueLiteralBuf.setLength(0);
-	       state = STATE_FIELDNAME;
-	    }
+               state = STATE_FIELDNAME;
+            }
             else {
                fieldValueLiteralBuf.append(c);
             }
-	    break;
-	    
-	 case STATE_QUOTE:
-            fieldValueLiteralBuf.append(c);
-	    if ('\\' == c) {
-	       state = STATE_QUOTEBS;
-	    }
-	    else if ('\"' == c) {
-	       state = prevState;
-	    }
-	    break;
-	    
-	 case STATE_SQUOTE:
-            fieldValueLiteralBuf.append(c);
-	    if ('\\' == c) {
-	       state = STATE_SQUOTEBS;
-	    }
-	    else if ('\'' == c) {
-	       state = prevState;
-	    }
-	    break;
-	    
-	 case STATE_QUOTEBS:
-            fieldValueLiteralBuf.append(c);
-	    state = STATE_QUOTE;
-	    break;
+            break;
 
-	 case STATE_SQUOTEBS:
+         case STATE_QUOTE:
             fieldValueLiteralBuf.append(c);
-	    state = STATE_SQUOTE;
-	    break;
+            if ('\\' == c) {
+               state = STATE_QUOTEBS;
+            }
+            else if ('\"' == c) {
+               state = prevState;
+            }
+            break;
+
+         case STATE_SQUOTE:
+            fieldValueLiteralBuf.append(c);
+            if ('\\' == c) {
+               state = STATE_SQUOTEBS;
+            }
+            else if ('\'' == c) {
+               state = prevState;
+            }
+            break;
+
+         case STATE_QUOTEBS:
+            fieldValueLiteralBuf.append(c);
+            state = STATE_QUOTE;
+            break;
+
+         case STATE_SQUOTEBS:
+            fieldValueLiteralBuf.append(c);
+            state = STATE_SQUOTE;
+            break;
 
          case STATE_LINECOMMENT:
             if ('\n' == c) {
@@ -241,9 +241,9 @@ public class FieldDocImpl
             break;
          }
       }
-      
+
       if (fieldNameBuf.length() > 0) {
-         rcList.add(createFieldDoc(fd, fieldNameBuf.toString(), 
+         rcList.add(createFieldDoc(fd, fieldNameBuf.toString(),
                                    fieldValueLiteralBuf.toString()));
       }
 
@@ -252,7 +252,7 @@ public class FieldDocImpl
 
    public boolean isField() {
       return true;
-   } 
+   }
 
    public boolean isTransient() { return isTransient; }
 
@@ -262,25 +262,25 @@ public class FieldDocImpl
 
    public int modifierSpecifier() {
       return super.modifierSpecifier()
-	 | (isVolatile()?Modifier.VOLATILE:0)
-	 | (isTransient()?Modifier.TRANSIENT:0)
-	 ;
+         | (isVolatile()?Modifier.VOLATILE:0)
+         | (isTransient()?Modifier.TRANSIENT:0)
+         ;
    }
 
    protected boolean processModifier(String word) {
       if (super.processModifier(word)) {
-	 return true;
+         return true;
       }
       else if (word.equals("transient")) {
-	 isTransient=true;
-	 return true;	 
+         isTransient=true;
+         return true;
       }
       else if (word.equals("volatile")) {
-	 isVolatile=true;
-	 return true;	 
+         isVolatile=true;
+         return true;
       }
       else {
-	 return false;
+         return false;
       }
    }
 
@@ -299,10 +299,10 @@ public class FieldDocImpl
    }
 
    public Object constantValue(Set visitedFields) {
-      if (!isStatic() 
-          || !isFinal() 
+      if (!isStatic()
+          || !isFinal()
           || (!type().isPrimitive() && !"java.lang.String".equals(type().qualifiedTypeName()))
-          || type.dimension().length()>0 
+          || type.dimension().length()>0
           || null == valueLiteral) {
 
          return null;
@@ -315,7 +315,7 @@ public class FieldDocImpl
 
             String expression = "(" + type().typeName() + ")(" + valueLiteral + ")";
             try {
-               this.constantValue = Evaluator.evaluate(expression, 
+               this.constantValue = Evaluator.evaluate(expression,
                                                        visitedFields,
                                                        (ClassDocImpl)containingClass());
             }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java
index e0c74cea1a8..4cfbbe4512a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocPackageDoc.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java
index a49be2f9ec3..d45786fb986 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/GjdocRootDoc.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java
index 95b706acd00..3be63dd791b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/InheritDocTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -44,7 +44,7 @@ import java.text.*;
 /**
  *  Represents the <code>inheritDoc</code> tag.
  */
-public class InheritDocTagImpl 
+public class InheritDocTagImpl
    extends AbstractTagImpl
 {
    private ClassDocImpl contextClass;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java
index f5a507bdb08..93c08b94d1b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/JavadocWrapper.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java
index ac92dba86a5..3b2b8a8480c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/LinkTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
index 0c30a48e8b7..ce9e96d820b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Main.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -89,7 +89,7 @@ public final class Main
   /*
    *  FIXME: This should come from a ResourceBundle
    */
-  private static final String STRING_TRY_GJDOC_HELP = 
+  private static final String STRING_TRY_GJDOC_HELP =
      "Try `gjdoc --help' for more information.";
 
   /**
@@ -239,12 +239,12 @@ public final class Main
    * true when --version has been specified on the command line.
    */
   private boolean option_showVersion;
-  
+
   /**
    * true when -bootclasspath has been specified on the command line.
    */
   private boolean option_bootclasspath_specified;
-  
+
   /**
    * true when -all has been specified on the command line.
    */
@@ -254,13 +254,13 @@ public final class Main
    * true when -reflection has been specified on the command line.
    */
   private boolean option_reflection;
-  
+
   // TODO: add the rest of the options as instance variables
-  
+
   /**
    * Parse all source files/packages and subsequentially start the Doclet given
    * on the command line.
-   * 
+   *
    * @param allOptions List of all command line tokens
    */
   private boolean startDoclet(List allOptions)
@@ -500,7 +500,7 @@ public final class Main
             if (sourceFile.exists() && !sourceFile.isDirectory()) {
               rootDoc.addSpecifiedSourceFile(sourceFile);
               foundSourceFile = true;
-            } 
+            }
           }
         }
 
@@ -672,7 +672,7 @@ public final class Main
   }
 
   private void addFoundPackages(String subpackage, Set foundPackages)
-  {        
+  {
     if (foundPackages.isEmpty()) {
       reporter.printWarning("No classes found under subpackage " + subpackage);
     }
@@ -815,8 +815,8 @@ public final class Main
    *  package specified by its name and its directory. Add the names
    *  of all valid packages to the result list.
    */
-  private void findPackages(String subpackage, 
-                            File packageDir, 
+  private void findPackages(String subpackage,
+                            File packageDir,
                             Set result)
   {
     File[] files = packageDir.listFiles();
@@ -882,7 +882,7 @@ public final class Main
   /**
    * Main entry point. This is the method called when gjdoc is invoked from the
    * command line.
-   * 
+   *
    * @param args
    *          command line arguments
    */
@@ -923,7 +923,7 @@ public final class Main
   /**
    * Parses command line arguments and subsequentially handles control to the
    * startDoclet() method
-   *   
+   *
    * @param args The command line parameters.
    */
    public static int execute(String[] args)
@@ -961,7 +961,7 @@ public final class Main
   {
     return execute(args);
   }
- 
+
   /**
    * @param programName Name of the program (for error messages).
    * @param defaultDocletClassName Fully qualified class name.
@@ -974,7 +974,7 @@ public final class Main
   {
     // not yet implemented
   }*/
- 
+
   /**
    * @param programName Name of the program (for error messages).
    * @param defaultDocletClassName Fully qualified class name.
@@ -987,7 +987,7 @@ public final class Main
   {
     // not yet implemented
   }*/
- 
+
   /**
    * @param programName Name of the program (for error messages).
    * @param errWriter PrintWriter to receive error messages.
@@ -1010,7 +1010,7 @@ public final class Main
   /**
    * Parses command line arguments and subsequentially handles control to the
    * startDoclet() method
-   * 
+   *
    * @param args
    *          Command line arguments, as passed to the main() method
    * @return {@code -1} in case of a fatal error (invalid arguments),
@@ -1160,7 +1160,7 @@ public final class Main
         option_sourcepath.add(new File("."));
 
       //--- We have all information we need to start the doclet at this time
-    
+
       if (null != option_encoding) {
         rootDoc.setSourceEncoding(option_encoding);
       }
@@ -1189,7 +1189,7 @@ public final class Main
     BufferedReader reader = new BufferedReader(new InputStreamReader(in));
     String line;
     while ((line = reader.readLine()) != null) {
-      
+
       String className = line.trim();
       if (className.length() > 0) {
         ClassDocImpl classDoc =
@@ -1217,7 +1217,7 @@ public final class Main
 
     /**
      * Initializes this instance.
-     * 
+     *
      * @param argCount
      *          number of arguments
      */
@@ -1229,7 +1229,7 @@ public final class Main
     /**
      * Overridden by derived classes with behavior to parse the arguments
      * specified with this option.
-     * 
+     *
      * @param args
      *          command line arguments
      */
@@ -1337,7 +1337,7 @@ public final class Main
           void process(String[] args)
           {
             option_source = args[0];
-            if (!"1.2".equals(option_source) 
+            if (!"1.2".equals(option_source)
                 && !"1.3".equals(option_source)
                 && !"1.4".equals(option_source)) {
 
@@ -1370,7 +1370,7 @@ public final class Main
       {
         void process(String[] args)
         {
-          StringTokenizer st = new StringTokenizer(args[0], ":"); 
+          StringTokenizer st = new StringTokenizer(args[0], ":");
           while (st.hasMoreTokens()) {
             String packageName = st.nextToken();
 
@@ -1390,7 +1390,7 @@ public final class Main
       {
         void process(String[] args)
         {
-          StringTokenizer st = new StringTokenizer(args[0], ":"); 
+          StringTokenizer st = new StringTokenizer(args[0], ":");
           while (st.hasMoreTokens()) {
             String packageName = st.nextToken();
 
@@ -1487,7 +1487,7 @@ public final class Main
           try {
             getRootDoc().setRawCommentText(RootDocImpl.readHtmlBody(new File(args[0])));
           }
-          catch (IOException e) { 
+          catch (IOException e) {
             throw new RuntimeException("Cannot read file specified in option -overview: " + e.getMessage());
           }
         }
@@ -1533,7 +1533,7 @@ public final class Main
 
   /**
    * Determine how many arguments the given option requires.
-   * 
+   *
    * @param option
    *          The name of the option without leading dash.
    */
@@ -1550,7 +1550,7 @@ public final class Main
   /**
    * Process all given options. Assumes that the options have been validated
    * before.
-   * 
+   *
    * @param optionArr
    *          Each element is a series of Strings where [0] is the name of the
    *          option and [1..n] are the arguments to the option.
@@ -1699,7 +1699,7 @@ public final class Main
 
   /**
    * The root of the gjdoc tool.
-   * 
+   *
    * @return all the options of the gjdoc application.
    */
   public static RootDocImpl getRootDoc()
@@ -1709,7 +1709,7 @@ public final class Main
 
   /**
    * Get the gjdoc singleton.
-   * 
+   *
    * @return the gjdoc instance.
    */
   public static Main getInstance()
@@ -1719,7 +1719,7 @@ public final class Main
 
   /**
    * Is this access level covered?
-   * 
+   *
    * @param accessLevel
    *          the access level we want to know if it is covered.
    * @return true if the access level is covered.
@@ -1731,7 +1731,7 @@ public final class Main
 
   /**
    * Is the doclet running?
-   * 
+   *
    * @return true if it's running
    */
   public boolean isDocletRunning()
@@ -1743,7 +1743,7 @@ public final class Main
    * Check the charset. Check that all the characters of the string 'toCheck'
    * and query if they exist in the 'charSet'. The order does not matter. The
    * number of times a character is in the variable does not matter.
-   * 
+   *
    * @param toCheck
    *          the charset to check.
    * @param charSet
@@ -1809,25 +1809,25 @@ public final class Main
           && !defaultLocale.equals(locale)) {
         this.collator = Collator.getInstance(defaultLocale);
         if (null != this.collator) {
-          reporter.printWarning("No collator found for locale " 
-                                + locale.getDisplayName() 
-                                + "; using collator for default locale " 
+          reporter.printWarning("No collator found for locale "
+                                + locale.getDisplayName()
+                                + "; using collator for default locale "
                                 + defaultLocale.getDisplayName()
                                 + ".");
         }
         else {
           this.collator = Collator.getInstance();
-          reporter.printWarning("No collator found for specified locale " 
-                                + locale.getDisplayName() 
-                                + " or default locale " 
+          reporter.printWarning("No collator found for specified locale "
+                                + locale.getDisplayName()
+                                + " or default locale "
                                 + defaultLocale.getDisplayName()
                                 + ": using default collator.");
         }
       }
       if (null == this.collator) {
         this.collator = Collator.getInstance();
-        reporter.printWarning("No collator found for locale " 
-                              + locale.getDisplayName() 
+        reporter.printWarning("No collator found for locale "
+                              + locale.getDisplayName()
                               + ": using default collator.");
       }
     }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
index 07817bcb906..acc8128630c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MemberDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -46,11 +46,11 @@ public abstract class MemberDocImpl extends ProgramElementDocImpl implements Mem
    protected Type   type;
 
    public MemberDocImpl(ClassDoc containingClass,
-			PackageDoc containingPackage,
+                        PackageDoc containingPackage,
                         SourcePosition position) {
 
       super(containingClass,
-	    containingPackage,
+            containingPackage,
             position);
    }
 
@@ -78,53 +78,53 @@ public abstract class MemberDocImpl extends ProgramElementDocImpl implements Mem
       int firstChar = 0;
       int lastChar = 0;
       for (; startIndex<endIndex; ++startIndex) {
-	 if (state==STATE_STARC) {
-	    if (startIndex<endIndex-1 && source[startIndex]=='*' && source[startIndex+1]=='/') {
-	       ++startIndex;
-	       state=STATE_NORMAL;
-	    }
-	 }
-	 else if (state==STATE_SLASHC) {
-	    if (source[startIndex]=='\n') {
-	       state=STATE_NORMAL;
-	    }
-	 }
-	 else if (startIndex<endIndex-1 && source[startIndex]=='/' && source[startIndex+1]=='*') {
-	    ++startIndex;
-	    state=STATE_STARC;
-	 }
-	 else if (source[startIndex]=='=' || source[startIndex]=='(' || source[startIndex]==';') {
+         if (state==STATE_STARC) {
+            if (startIndex<endIndex-1 && source[startIndex]=='*' && source[startIndex+1]=='/') {
+               ++startIndex;
+               state=STATE_NORMAL;
+            }
+         }
+         else if (state==STATE_SLASHC) {
+            if (source[startIndex]=='\n') {
+               state=STATE_NORMAL;
+            }
+         }
+         else if (startIndex<endIndex-1 && source[startIndex]=='/' && source[startIndex+1]=='*') {
+            ++startIndex;
+            state=STATE_STARC;
+         }
+         else if (source[startIndex]=='=' || source[startIndex]=='(' || source[startIndex]==';') {
             typeName = typeNameBuf.toString();
             return lastWordStart;
-	 }
-	 else if (Parser.WHITESPACE.indexOf(source[startIndex])>=0
+         }
+         else if (Parser.WHITESPACE.indexOf(source[startIndex])>=0
                   || (startIndex > 0 && source[startIndex-1] == ']' && source[startIndex] != '[')) {
-	    if (word.length()>0 && lastChar != '.') {
-	       if (processModifier(word.toString())) {
-	       }
-	       else if (typeNameBuf.length()==0 && !isConstructor()) {
+            if (word.length()>0 && lastChar != '.') {
+               if (processModifier(word.toString())) {
+               }
+               else if (typeNameBuf.length()==0 && !isConstructor()) {
                   typeNameBuf.setLength(0);
-		  typeNameBuf.append(word);
-	       }
-	       else if ((firstChar=='[' || firstChar==']') && !isConstructor()) {
-		  typeNameBuf.append(word);
-	       }
-	       else {
+                  typeNameBuf.append(word);
+               }
+               else if ((firstChar=='[' || firstChar==']') && !isConstructor()) {
+                  typeNameBuf.append(word);
+               }
+               else {
                   typeName = typeNameBuf.toString();
-		  return lastWordStart;
-	       }
-	       word.setLength(0);
-	       lastWordStart=startIndex;
-	    }
-	 }
-	 else {
-	    if (lastWordStart<0) lastWordStart=startIndex;
+                  return lastWordStart;
+               }
+               word.setLength(0);
+               lastWordStart=startIndex;
+            }
+         }
+         else {
+            if (lastWordStart<0) lastWordStart=startIndex;
             lastChar = source[startIndex];
             if (0 == word.length()) {
                firstChar = lastChar;
             }
-	    word.append((char)lastChar);
-	 }
+            word.append((char)lastChar);
+         }
       }
 
       typeName = typeNameBuf.toString();
@@ -132,17 +132,17 @@ public abstract class MemberDocImpl extends ProgramElementDocImpl implements Mem
    }
 
     public Type type() {
-	//public Type type() throws ParseException { 
-	Debug.log(9,"type() called on "+containingClass()+"."+this);
-	if (type==null) {
-	    try {
-		type=((ClassDocImpl)containingClass()).typeForString(typeName);
-	    } catch (ParseException e) {
-	       System.err.println("FIXME: add try-catch to force compilation");
-	       e.printStackTrace();
-	    }
-	}
-	return type;
+        //public Type type() throws ParseException {
+        Debug.log(9,"type() called on "+containingClass()+"."+this);
+        if (type==null) {
+            try {
+                type=((ClassDocImpl)containingClass()).typeForString(typeName);
+            } catch (ParseException e) {
+               System.err.println("FIXME: add try-catch to force compilation");
+               e.printStackTrace();
+            }
+        }
+        return type;
     }
 
 
@@ -156,7 +156,7 @@ public abstract class MemberDocImpl extends ProgramElementDocImpl implements Mem
       return name;
    }
 
-   public void setTypeName(String typeName) { 
+   public void setTypeName(String typeName) {
       this.typeName=typeName;
       this.type=null;
    }
@@ -165,57 +165,57 @@ public abstract class MemberDocImpl extends ProgramElementDocImpl implements Mem
       return typeName;
    }
 
-   // return true if this Doc is include in the active set. 
+   // return true if this Doc is include in the active set.
    public boolean isIncluded() {
       return Main.getInstance().includeAccessLevel(accessLevel);
-   } 
+   }
 
    public int compareTo(Object o) {
       if (o instanceof MemberDocImpl) {
-	 int rc=name().compareTo(((MemberDocImpl)o).name());
-	 if (rc==0) 
-	    rc=containingClass().qualifiedName().compareTo(((MemberDocImpl)o).containingClass().qualifiedName());
-	 return rc;
+         int rc=name().compareTo(((MemberDocImpl)o).name());
+         if (rc==0)
+            rc=containingClass().qualifiedName().compareTo(((MemberDocImpl)o).containingClass().qualifiedName());
+         return rc;
       }
       else {
-	 return super.compareTo(o);
+         return super.compareTo(o);
       }
    }
 
    void resolve() {
 
       if (type==null && typeName!=null) {
-	 Debug.log(1, "MemberDocImpl.resolve(), looking up type named "+typeName);
-	 try {
-	    type=((ClassDocImpl)containingClass()).typeForString(typeName);
-	 } catch (ParseException e) {
-	    //System.err.println("FIXME: add try-catch to force compilation");
-	    //e.printStackTrace();
-	    Debug.log(1, "INTERNAL WARNING: Couldn't find type for name '"+typeName+"'");
-	 }
+         Debug.log(1, "MemberDocImpl.resolve(), looking up type named "+typeName);
+         try {
+            type=((ClassDocImpl)containingClass()).typeForString(typeName);
+         } catch (ParseException e) {
+            //System.err.println("FIXME: add try-catch to force compilation");
+            //e.printStackTrace();
+            Debug.log(1, "INTERNAL WARNING: Couldn't find type for name '"+typeName+"'");
+         }
       }
 
       if (type instanceof ClassDocProxy) {
-	 String className=type.qualifiedTypeName();
-	 ClassDoc realClassDoc=((ClassDocImpl)containingClass()).findClass(className, type.dimension());
-	 if (realClassDoc!=null) {
+         String className=type.qualifiedTypeName();
+         ClassDoc realClassDoc=((ClassDocImpl)containingClass()).findClass(className, type.dimension());
+         if (realClassDoc!=null) {
             type=realClassDoc;
-	 }
-	 else {
-	    //throw new Error("Class not found: "+className);
-	    /*** This is not an error, the class was not included
-	     * on the command line. Perhaps emit a notice here.
-	     *
+         }
+         else {
+            //throw new Error("Class not found: "+className);
+            /*** This is not an error, the class was not included
+             * on the command line. Perhaps emit a notice here.
+             *
 
-	    Main.getRootDoc().printError("Class not found '"
-			                 + className
-					 + "' in class '"
-					 + containingClass().qualifiedName()
-					 + "' member '"
-					 + name()
-					 + "'");
-	    */
-	 }
+            Main.getRootDoc().printError("Class not found '"
+                                         + className
+                                         + "' in class '"
+                                         + containingClass().qualifiedName()
+                                         + "' member '"
+                                         + name()
+                                         + "'");
+            */
+         }
       }
    }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java
index 34f3b28545b..78748c848bf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/MethodDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -43,21 +43,21 @@ import com.sun.javadoc.*;
 public class MethodDocImpl extends ExecutableMemberDocImpl implements MethodDoc {
 
    public MethodDocImpl(ClassDoc containingClass,
-			PackageDoc containingPackage,
+                        PackageDoc containingPackage,
                         SourcePosition position) {
-      
+
       super(containingClass,
-	    containingPackage,
+            containingPackage,
             position);
    }
 
-   // Is this Doc item a class. 
+   // Is this Doc item a class.
    public boolean isMethod() {
       return true;
-   } 
+   }
 
-   public Type returnType() { 
-      return super.type(); 
+   public Type returnType() {
+      return super.type();
    }
 
    public String toString() { return name()+((signature()==null)?"()":signature()); }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
index 2f37e445cf8..84960bcf349 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/PackageDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -50,7 +50,7 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
    private List   ordinaryClassesList = new ArrayList();
    private List   exceptionsList      = new ArrayList();
    private List   interfacesList      = new ArrayList();
-   private List   errorsList          = new ArrayList();   
+   private List   errorsList          = new ArrayList();
 
    private ClassDoc[] allClasses;
    private ClassDoc[] ordinaryClasses;
@@ -65,41 +65,41 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
 
    public void addClass(ClassDoc classDoc) {
       if (Main.getInstance().includeAccessLevel(((ClassDocImpl)classDoc).accessLevel)) {
-	 allClassesSet.add(classDoc);
+         allClassesSet.add(classDoc);
       }
    }
 
    public void resolve() {
       for (Iterator it=allClassesSet.iterator(); it.hasNext(); ) {
-	 ClassDocImpl classDoc=(ClassDocImpl)it.next();
-	 try {
-	     classDoc.resolve();
-	 } catch (ParseException e) {
-	     System.err.println("FIXME: add try-catch to force compilation"
-				+ e);
-	 }
+         ClassDocImpl classDoc=(ClassDocImpl)it.next();
+         try {
+             classDoc.resolve();
+         } catch (ParseException e) {
+             System.err.println("FIXME: add try-catch to force compilation"
+                                + e);
+         }
 
-	 if (classDoc.isInterface()) {
-	    interfacesList.add(classDoc);
-	 }
-	 else if (classDoc.isException()) {
-	    exceptionsList.add(classDoc);
-	 }
-	 else if (classDoc.isError()) {
-	    errorsList.add(classDoc);
-	 }
-	 else {
-	    ordinaryClassesList.add(classDoc);
-	 }
+         if (classDoc.isInterface()) {
+            interfacesList.add(classDoc);
+         }
+         else if (classDoc.isException()) {
+            exceptionsList.add(classDoc);
+         }
+         else if (classDoc.isError()) {
+            errorsList.add(classDoc);
+         }
+         else {
+            ordinaryClassesList.add(classDoc);
+         }
       }
    }
 
    public void resolveComments() {
       if (rawDocumentation!=null) {
-	 this.tagMap=parseCommentTags(rawDocumentation.toCharArray(),
-				      0,
-				      rawDocumentation.length(),
-				      null,
+         this.tagMap=parseCommentTags(rawDocumentation.toCharArray(),
+                                      0,
+                                      rawDocumentation.length(),
+                                      null,
                                       null,
                                       null,
                                       null);
@@ -108,20 +108,20 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
       resolveTags();
    }
 
-   public String name() { 
-      return packageName; 
+   public String name() {
+      return packageName;
    }
 
-   public ClassDoc[] allClasses() 
-   { 
+   public ClassDoc[] allClasses()
+   {
       if (null == this.allClasses) {
          this.allClasses = toClassDocArray(allClassesSet);
       }
       return this.allClasses;
    }
 
-   public ClassDoc[] ordinaryClasses() 
-   { 
+   public ClassDoc[] ordinaryClasses()
+   {
       if (null == this.ordinaryClasses) {
          this.ordinaryClasses = toClassDocArray(ordinaryClassesList);
       }
@@ -129,24 +129,24 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
    }
 
 
-   public ClassDoc[] exceptions() 
-   { 
+   public ClassDoc[] exceptions()
+   {
       if (null == this.exceptions) {
          this.exceptions = toClassDocArray(exceptionsList);
       }
       return this.exceptions;
    }
 
-   public ClassDoc[] interfaces() 
-   { 
+   public ClassDoc[] interfaces()
+   {
       if (null == this.interfaces) {
          this.interfaces = toClassDocArray(interfacesList);
       }
       return this.interfaces;
    }
 
-   public ClassDoc[] errors() 
-   { 
+   public ClassDoc[] errors()
+   {
       if (null == this.errors) {
          this.errors = toClassDocArray(errorsList);
       }
@@ -160,7 +160,7 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
       return result;
    }
 
-   public ClassDoc findClass(String name) { 
+   public ClassDoc findClass(String name) {
       return Main.getRootDoc().classNamed(packageName+"."+name);
    }
 
@@ -170,7 +170,7 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
 
       Debug.log(level, "Ordinary classes:");
       Debug.dumpArray(level, ordinaryClasses());
-      
+
    }
 
    public static final PackageDocImpl DEFAULT_PACKAGE = new PackageDocImpl("");
@@ -195,16 +195,16 @@ class PackageDocImpl extends DocImpl implements GjdocPackageDoc {
 
    public int compareTo(Object o) {
       if (o!=null && o instanceof PackageDocImpl)
-	 return name().compareTo(((PackageDocImpl)o).name());
+         return name().compareTo(((PackageDocImpl)o).name());
       else
-	 return 0;
+         return 0;
    }
 
    public boolean equals(Object o) {
       if (o!=null && o instanceof PackageDocImpl)
-	 return name().equals(((PackageDocImpl)o).name());
+         return name().equals(((PackageDocImpl)o).name());
       else
-	 return false;
+         return false;
    }
 
    /**
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java
index 499d43e31e2..a7491dc8e0e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParamTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -45,7 +45,7 @@ public class ParamTagImpl extends AbstractTagImpl implements ParamTag {
 
    private String parameterName;
    private String parameterComment;
-   
+
    public ParamTagImpl(String text,
                        ClassDocImpl contextClass,
                        MemberDocImpl contextMember) {
@@ -53,14 +53,14 @@ public class ParamTagImpl extends AbstractTagImpl implements ParamTag {
       char[] textarr=text.toCharArray();
       int i=0;
       for (; i<textarr.length; ++i) {
-	 if (!Parser.isWhitespace(textarr[i])) break;
+         if (!Parser.isWhitespace(textarr[i])) break;
       }
       for (; i<textarr.length; ++i) {
-	 if (Parser.isWhitespace(textarr[i])) {
-	    parameterName=new String(textarr,0,i).trim();
-	    parameterComment=new String(textarr,i,textarr.length-i).trim();
-	    break;
-	 }
+         if (Parser.isWhitespace(textarr[i])) {
+            parameterName=new String(textarr,0,i).trim();
+            parameterComment=new String(textarr,i,textarr.length-i).trim();
+            break;
+         }
       }
       if (parameterComment!=null) {
          setBody(parameterComment, contextClass, contextMember);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java
index 133077d06f4..29b8e9b7093 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParameterImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -54,9 +54,9 @@ public class ParameterImpl implements Parameter {
 
    public void resolve(ClassDoc classContext) {
       if (type instanceof ClassDocProxy) {
-	 String className=type.qualifiedTypeName();
-	 ClassDoc realClassDoc=((ClassDocImpl)classContext).findClass(className, type.dimension());
-	 if (realClassDoc!=null) {
+         String className=type.qualifiedTypeName();
+         ClassDoc realClassDoc=((ClassDocImpl)classContext).findClass(className, type.dimension());
+         if (realClassDoc!=null) {
             type=realClassDoc;
          }
       }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java
index c0ea48ea7bd..3ecd8459210 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ParseException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -39,14 +39,13 @@ package gnu.classpath.tools.gjdoc;
 
 class ParseException extends Exception {
 
-   public ParseException() 
+   public ParseException()
    {
    }
 
-   public ParseException(String msg) 
+   public ParseException(String msg)
    {
       super(msg);
    }
 
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java
index 030d4ae315d..d355b5384cc 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Parser.java
@@ -7,7 +7,7 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    GNU Classpath is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with GNU Classpath; see the file COPYING.  If not, write to the
    Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA. 
+   02111-1307 USA.
 
    Linking this library statically or dynamically with other modules is
    making a combined work based on this library.  Thus, the terms and
@@ -53,7 +53,7 @@ import gnu.classpath.tools.NotifyingInputStreamReader;
 import gnu.classpath.tools.MalformedInputListener;
 import gnu.classpath.tools.MalformedInputEvent;
 
-   class IgnoredFileParseException extends ParseException 
+   class IgnoredFileParseException extends ParseException
    {
       // marker exception
    }
@@ -63,18 +63,18 @@ import gnu.classpath.tools.MalformedInputEvent;
       abstract int match(char[] source, int index) throws ParseException;
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) throws ParseException, IOException {
-	 return endIndex;
+         return endIndex;
       }
 
       int getEndIndex(char[] source, int endIndex) throws ParseException {
-	 return endIndex;
+         return endIndex;
       }
    }
 
    abstract class BlockSourceComponent extends SourceComponent {
 
       int getEndIndex(char[] source, int endIndex) throws ParseException {
-	 return Parser.skipExpression(source, endIndex, 1, '\0');
+         return Parser.skipExpression(source, endIndex, 1, '\0');
       }
 
    }
@@ -83,27 +83,27 @@ import gnu.classpath.tools.MalformedInputEvent;
 
       int match(char[] source, int index) {
 
-	 int rc=index;
-	 int slen=source.length;
-	 while (rc<slen && Parser.WHITESPACE.indexOf(source[rc])>=0) ++rc;
+         int rc=index;
+         int slen=source.length;
+         while (rc<slen && Parser.WHITESPACE.indexOf(source[rc])>=0) ++rc;
 
-	 return (rc!=index) ? rc : -1;
+         return (rc!=index) ? rc : -1;
       }
    }
 
    class BracketClose extends SourceComponent {
 
       int match(char[] source, int index) {
-	 if (source[index]=='}') {
-	    return index+1;
-	 }
-	 else {
-	    return -1;
-	 }
+         if (source[index]=='}') {
+            return index+1;
+         }
+         else {
+            return -1;
+         }
       }
 
-     int process(Parser parser, char[] source, int startIndex, int endIndex) 
-       throws ParseException, IOException 
+     int process(Parser parser, char[] source, int startIndex, int endIndex)
+       throws ParseException, IOException
      {
        parser.classClosed();
        return endIndex;
@@ -113,24 +113,24 @@ import gnu.classpath.tools.MalformedInputEvent;
    class CommentComponent extends SourceComponent {
 
       int match(char[] source, int index) throws ParseException {
-	 if (index+1<source.length && source[index]=='/' && source[index+1]=='*') {
-	    for (index+=2; index+1<source.length; ++index) {
-	       if (source[index]=='*' && source[index+1]=='/')
-		  return index+2;
-	    }
-	    throw new ParseException("unexpected end of input");
-	 }
-	 return -1;
+         if (index+1<source.length && source[index]=='/' && source[index+1]=='*') {
+            for (index+=2; index+1<source.length; ++index) {
+               if (source[index]=='*' && source[index+1]=='/')
+                  return index+2;
+            }
+            throw new ParseException("unexpected end of input");
+         }
+         return -1;
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) {
 
-	 if (source[startIndex+0]=='/' 
-	     && source[startIndex+1]=='*' 
-	     && source[startIndex+2]=='*') {
+         if (source[startIndex+0]=='/'
+             && source[startIndex+1]=='*'
+             && source[startIndex+2]=='*') {
 
-	    parser.setLastComment(new String(source, startIndex, endIndex-startIndex));
-	 }
+            parser.setLastComment(new String(source, startIndex, endIndex-startIndex));
+         }
          else if (null == parser.getBoilerplateComment() && Main.getInstance().isCopyLicenseText()) {
             String boilerplateComment = new String(source, startIndex + 2, endIndex-startIndex - 4);
             if (boilerplateComment.toLowerCase().indexOf("copyright") >= 0) {
@@ -138,22 +138,22 @@ import gnu.classpath.tools.MalformedInputEvent;
             }
          }
 
-	 return endIndex;
+         return endIndex;
       }
    }
 
    class SlashSlashCommentComponent extends SourceComponent {
 
       int match(char[] source, int index) {
-	 if (index+1<source.length && source[index]=='/' && source[index+1]=='/') {
-	    index+=2;
-	    while (index<source.length && source[index]!='\n')
-	       ++index;
-	    return index;
-	 }
-	 else {
-	    return -1;
-	 }
+         if (index+1<source.length && source[index]=='/' && source[index+1]=='/') {
+            index+=2;
+            while (index<source.length && source[index]!='\n')
+               ++index;
+            return index;
+         }
+         else {
+            return -1;
+         }
       }
    }
 
@@ -176,120 +176,120 @@ import gnu.classpath.tools.MalformedInputEvent;
    class ImportComponent extends SourceComponent {
 
       int match(char[] source, int index) {
-	 if (index+7<source.length) {
-	    if (source[index+0]=='i' 
-		&& source[index+1]=='m'
-		&& source[index+2]=='p'
-		&& source[index+3]=='o'
-		&& source[index+4]=='r'
-		&& source[index+5]=='t'
-		&& Parser.WHITESPACE.indexOf(source[index+6])>=0) {
+         if (index+7<source.length) {
+            if (source[index+0]=='i'
+                && source[index+1]=='m'
+                && source[index+2]=='p'
+                && source[index+3]=='o'
+                && source[index+4]=='r'
+                && source[index+5]=='t'
+                && Parser.WHITESPACE.indexOf(source[index+6])>=0) {
 
-	       for (index+=7; index<source.length && source[index]!=';'; ++index)
-		  ;
+               for (index+=7; index<source.length && source[index]!=';'; ++index)
+                  ;
 
-	       return index+1;
-	    }
-	 }
-	 return -1;
+               return index+1;
+            }
+         }
+         return -1;
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) throws ParseException, IOException {
-	 String importString=new String(source,startIndex+7,endIndex-startIndex-7-1).trim();
-	 parser.importEncountered(importString);     
-	 return endIndex;
+         String importString=new String(source,startIndex+7,endIndex-startIndex-7-1).trim();
+         parser.importEncountered(importString);
+         return endIndex;
       }
    }
 
    class PackageComponent extends SourceComponent {
 
       int match(char[] source, int index) {
-	 if (index+10<source.length) {
-	    if (source[index+0]=='p' 
-		&& source[index+1]=='a'
-		&& source[index+2]=='c'
-		&& source[index+3]=='k'
-		&& source[index+4]=='a'
-		&& source[index+5]=='g'
-		&& source[index+6]=='e'
-		&& Parser.WHITESPACE.indexOf(source[index+7])>=0) {
+         if (index+10<source.length) {
+            if (source[index+0]=='p'
+                && source[index+1]=='a'
+                && source[index+2]=='c'
+                && source[index+3]=='k'
+                && source[index+4]=='a'
+                && source[index+5]=='g'
+                && source[index+6]=='e'
+                && Parser.WHITESPACE.indexOf(source[index+7])>=0) {
 
-	       for (index+=7; index<source.length && source[index]!=';'; ++index)
-		  ;
+               for (index+=7; index<source.length && source[index]!=';'; ++index)
+                  ;
 
-	       return index+1;
-	    }
-	 }
-	 return -1;
+               return index+1;
+            }
+         }
+         return -1;
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) {
-	 String packageName=new String(source,startIndex+8,endIndex-startIndex-8-1).trim();
-	 parser.packageOpened(packageName);
-	 return endIndex;
+         String packageName=new String(source,startIndex+8,endIndex-startIndex-8-1).trim();
+         parser.packageOpened(packageName);
+         return endIndex;
       }
    }
 
    class FieldComponent extends SourceComponent {
 
       int match(char[] source, int index) throws ParseException {
-	 boolean isField=false;
-	 final int STATE_NORMAL=1;
-	 final int STATE_SLASHC=2;
-	 final int STATE_STARC=3;
-	 final int STATE_FIELDVAL=4;
-	 final int STATE_STRING=5;
-	 final int STATE_SINGLEQUOTED=6;
-	 final int STATE_STRING_BS=7;
-	 final int STATE_SINGLEQUOTED_BS=8;
+         boolean isField=false;
+         final int STATE_NORMAL=1;
+         final int STATE_SLASHC=2;
+         final int STATE_STARC=3;
+         final int STATE_FIELDVAL=4;
+         final int STATE_STRING=5;
+         final int STATE_SINGLEQUOTED=6;
+         final int STATE_STRING_BS=7;
+         final int STATE_SINGLEQUOTED_BS=8;
 
-	 int state=STATE_NORMAL;
+         int state=STATE_NORMAL;
          int prevState=STATE_NORMAL;
 
          int fieldValueLevel = 0;
 
-	 for (; index<source.length && !isField; ++index) {
-	    if (state==STATE_STARC) {
-	       if (index<source.length-1 && source[index]=='*' && source[index+1]=='/') {
-		  ++index;
-		  state=prevState;
-	       }
-	    }
-	    else if (state==STATE_SLASHC) {
-	       if (source[index]=='\n') {
-		  state=prevState;
-	       }
-	    }
-	    else if (state==STATE_STRING) {
-	       if (source[index]=='\\') {
-		  state=STATE_STRING_BS;
-	       }
-	       else if (source[index]=='\"') {
-		  state=prevState;
-	       }
-	    }
-	    else if (state==STATE_STRING_BS) {
+         for (; index<source.length && !isField; ++index) {
+            if (state==STATE_STARC) {
+               if (index<source.length-1 && source[index]=='*' && source[index+1]=='/') {
+                  ++index;
+                  state=prevState;
+               }
+            }
+            else if (state==STATE_SLASHC) {
+               if (source[index]=='\n') {
+                  state=prevState;
+               }
+            }
+            else if (state==STATE_STRING) {
+               if (source[index]=='\\') {
+                  state=STATE_STRING_BS;
+               }
+               else if (source[index]=='\"') {
+                  state=prevState;
+               }
+            }
+            else if (state==STATE_STRING_BS) {
                state=STATE_STRING;
             }
-	    else if (state==STATE_SINGLEQUOTED) {
-	       if (source[index]=='\\') {
-		  state=STATE_SINGLEQUOTED_BS;
-	       }
-	       else if (source[index]=='\'') {
-		  state=prevState;
-	       }
-	    }
-	    else if (state==STATE_SINGLEQUOTED_BS) {
+            else if (state==STATE_SINGLEQUOTED) {
+               if (source[index]=='\\') {
+                  state=STATE_SINGLEQUOTED_BS;
+               }
+               else if (source[index]=='\'') {
+                  state=prevState;
+               }
+            }
+            else if (state==STATE_SINGLEQUOTED_BS) {
                state=STATE_SINGLEQUOTED;
             }
             else if (state==STATE_FIELDVAL) {
                if (source[index]=='/') {
                   if (index<source.length-1 && source[index+1]=='*') {
-                     state=STATE_STARC; 
+                     state=STATE_STARC;
                      ++index;
                   }
                   else if (index<source.length-1 && source[index+1]=='/') {
-                     state=STATE_SLASHC; 
+                     state=STATE_SLASHC;
                      ++index;
                   }
                }
@@ -310,102 +310,102 @@ import gnu.classpath.tools.MalformedInputEvent;
                   break;
                }
             }
-	    else switch (source[index]) {
-	    case '/': 
-	       if (index<source.length-1 && source[index+1]=='*') {
-		  state=STATE_STARC; 
-		  ++index;
-	       }
-	       else if (index<source.length-1 && source[index+1]=='/') {
-		  state=STATE_SLASHC; 
-		  ++index;
-	       }
-	       break;
-	    case '{':  // class
-	    case '(':  // method
-	       return -1;
-	    case '=':  // field
+            else switch (source[index]) {
+            case '/':
+               if (index<source.length-1 && source[index+1]=='*') {
+                  state=STATE_STARC;
+                  ++index;
+               }
+               else if (index<source.length-1 && source[index+1]=='/') {
+                  state=STATE_SLASHC;
+                  ++index;
+               }
+               break;
+            case '{':  // class
+            case '(':  // method
+               return -1;
+            case '=':  // field
                state=STATE_FIELDVAL;
                prevState=state;
                continue;
-	    case ';':  // field
-	       isField=true;
-	       break;
-	    }
-	    if (isField) break;
-	 }
-	 if (!isField || index==source.length) {
-	    return -1;
-	 }
+            case ';':  // field
+               isField=true;
+               break;
+            }
+            if (isField) break;
+         }
+         if (!isField || index==source.length) {
+            return -1;
+         }
 
-	 //System.err.println("char is "+source[index]);
+         //System.err.println("char is "+source[index]);
 
-	 if (source[index]!=';') {
-	    index=Parser.skipExpression(source, index, 0, ';');
-	 }
-	 return index+1;
+         if (source[index]!=';') {
+            index=Parser.skipExpression(source, index, 0, ';');
+         }
+         return index+1;
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) {
 
-	 //Debug.log(9,"found package statement: \""+str+"\"");
-	 //Debug.log(9,"found function component: '"+str+"'");
-	 //xxx(new FieldDocImpl(ctx.classDoc, ctx.classDoc.containingPackage(), 0, false, false));
+         //Debug.log(9,"found package statement: \""+str+"\"");
+         //Debug.log(9,"found function component: '"+str+"'");
+         //xxx(new FieldDocImpl(ctx.classDoc, ctx.classDoc.containingPackage(), 0, false, false));
 
-	 // Ignore superfluous semicoli after class definition
-	 if (endIndex-startIndex<=1) return endIndex;
+         // Ignore superfluous semicoli after class definition
+         if (endIndex-startIndex<=1) return endIndex;
 
-	 //assert (parser.ctx!=null);
-	 Collection fields=FieldDocImpl.createFromSource(parser.ctx.classDoc, 
-							 parser.ctx.classDoc.containingPackage(), 
-							 source, startIndex, endIndex);
+         //assert (parser.ctx!=null);
+         Collection fields=FieldDocImpl.createFromSource(parser.ctx.classDoc,
+                                                         parser.ctx.classDoc.containingPackage(),
+                                                         source, startIndex, endIndex);
 
-	 for (Iterator it=fields.iterator(); it.hasNext(); ) {
-	    FieldDocImpl field=(FieldDocImpl)it.next();
-	    boolean fieldHasSerialTag=!field.isTransient() && !field.isStatic(); //field.hasSerialTag();
-	    if ((field.isIncluded() || fieldHasSerialTag) && parser.getAddComments()) {
-	       field.setRawCommentText(parser.getLastComment());
-	    }
+         for (Iterator it=fields.iterator(); it.hasNext(); ) {
+            FieldDocImpl field=(FieldDocImpl)it.next();
+            boolean fieldHasSerialTag=!field.isTransient() && !field.isStatic(); //field.hasSerialTag();
+            if ((field.isIncluded() || fieldHasSerialTag) && parser.getAddComments()) {
+               field.setRawCommentText(parser.getLastComment());
+            }
             parser.ctx.fieldList.add(field);
-	    if (field.isIncluded()) {
-	       parser.ctx.filteredFieldList.add(field);
-	    }
-	    if (fieldHasSerialTag) {
-	       parser.ctx.sfieldList.add(field);
-	    }
-	 }
+            if (field.isIncluded()) {
+               parser.ctx.filteredFieldList.add(field);
+            }
+            if (fieldHasSerialTag) {
+               parser.ctx.sfieldList.add(field);
+            }
+         }
 
-	 parser.setLastComment(null);
-	 return endIndex;
+         parser.setLastComment(null);
+         return endIndex;
       }
-   
+
 
    }
 
    class FunctionComponent extends BlockSourceComponent {
 
       int getEndIndex(char[] source, int endIndex) throws ParseException {
-	 if (source[endIndex-1]==';') {
-	    return endIndex;
-	 }
-	 else {
-	    return super.getEndIndex(source, endIndex);
-	 }
+         if (source[endIndex-1]==';') {
+            return endIndex;
+         }
+         else {
+            return super.getEndIndex(source, endIndex);
+         }
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) throws IOException, ParseException {
 
-	 //ctx.fieldList.add(FieldDocImpl.createFromSource(source, startIndex, endIndex));
+         //ctx.fieldList.add(FieldDocImpl.createFromSource(source, startIndex, endIndex));
 
-	 //System.out.println("function match '"+new String(source,startIndex,endIndex-startIndex)+"'");
-	 ExecutableMemberDocImpl execDoc=MethodDocImpl.createFromSource(parser.ctx.classDoc, 
-									parser.ctx.classDoc.containingPackage(), 
-									source, startIndex, endIndex);
+         //System.out.println("function match '"+new String(source,startIndex,endIndex-startIndex)+"'");
+         ExecutableMemberDocImpl execDoc=MethodDocImpl.createFromSource(parser.ctx.classDoc,
+                                                                        parser.ctx.classDoc.containingPackage(),
+                                                                        source, startIndex, endIndex);
 
-	 if (parser.getAddComments())
-	    execDoc.setRawCommentText(parser.getLastComment());
+         if (parser.getAddComments())
+            execDoc.setRawCommentText(parser.getLastComment());
 
-	 parser.setLastComment(null);
+         parser.setLastComment(null);
 
          if (execDoc.isMethod()) {
             parser.ctx.methodList.add(execDoc);
@@ -420,117 +420,117 @@ import gnu.classpath.tools.MalformedInputEvent;
             }
          }
 
-	 if (execDoc.isMethod() 
-		  && (execDoc.name().equals("readObject")
-		      || execDoc.name().equals("writeObject")
-		      || execDoc.name().equals("readExternal")
-		      || execDoc.name().equals("writeExternal")
-		      || execDoc.name().equals("readResolve"))) {
+         if (execDoc.isMethod()
+                  && (execDoc.name().equals("readObject")
+                      || execDoc.name().equals("writeObject")
+                      || execDoc.name().equals("readExternal")
+                      || execDoc.name().equals("writeExternal")
+                      || execDoc.name().equals("readResolve"))) {
            // FIXME: add readExternal here?
 
-	    parser.ctx.maybeSerMethodList.add(execDoc);
-	 }
+            parser.ctx.maybeSerMethodList.add(execDoc);
+         }
 
-	 return endIndex;
+         return endIndex;
       }
 
       int match(char[] source, int index) {
-	 boolean isFunc=false;
-	 final int STATE_NORMAL=1;
-	 final int STATE_SLASHC=2;
-	 final int STATE_STARC=3;
-	 int state=STATE_NORMAL;
-	 for (; index<source.length && !isFunc; ++index) {
-	    if (state==STATE_STARC) {
-	       if (source[index]=='*' && source[index+1]=='/') {
-		  ++index;
-		  state=STATE_NORMAL;
-	       }
-	    }
-	    else if (state==STATE_SLASHC) {
-	       if (source[index]=='\n') {
-		  state=STATE_NORMAL;
-	       }
-	    }
-	    else switch (source[index]) {
-	    case '/': 
-	       if (source[index+1]=='*') {
-		  state=STATE_STARC; 
-		  ++index;
-	       }
-	       else if (source[index+1]=='/') {
-		  state=STATE_SLASHC; 
-		  ++index;
-	       }
-	       break;
-	    case '=':  // field
-	    case ';':  // field
-	    case '{':  // class
-	       return -1;
-	    case '(':
-	       isFunc=true;
-	       break;
-	    }
-	    if (isFunc) break;
-	 }
-	 if (!isFunc || index==source.length)
-	    return -1;
+         boolean isFunc=false;
+         final int STATE_NORMAL=1;
+         final int STATE_SLASHC=2;
+         final int STATE_STARC=3;
+         int state=STATE_NORMAL;
+         for (; index<source.length && !isFunc; ++index) {
+            if (state==STATE_STARC) {
+               if (source[index]=='*' && source[index+1]=='/') {
+                  ++index;
+                  state=STATE_NORMAL;
+               }
+            }
+            else if (state==STATE_SLASHC) {
+               if (source[index]=='\n') {
+                  state=STATE_NORMAL;
+               }
+            }
+            else switch (source[index]) {
+            case '/':
+               if (source[index+1]=='*') {
+                  state=STATE_STARC;
+                  ++index;
+               }
+               else if (source[index+1]=='/') {
+                  state=STATE_SLASHC;
+                  ++index;
+               }
+               break;
+            case '=':  // field
+            case ';':  // field
+            case '{':  // class
+               return -1;
+            case '(':
+               isFunc=true;
+               break;
+            }
+            if (isFunc) break;
+         }
+         if (!isFunc || index==source.length)
+            return -1;
 
-	 for (; index<source.length && (state!=STATE_NORMAL || (source[index]!='{' && source[index]!=';')); ++index)
-	    if (state==STATE_SLASHC && source[index]=='\n') {
-	       state=STATE_NORMAL;
-	    }
-	    else if (index<source.length-1) {
-	       if (state==STATE_STARC) {
-		  if (source[index]=='*' && source[index+1]=='/') {
-		     state=STATE_NORMAL;
-		  }
-	       }
-	       else {
-		  if (source[index]=='/' && source[index+1]=='*') {
-		     state=STATE_STARC;
-		  }
-		  else if (source[index]=='/' && source[index+1]=='/') {
-		     state=STATE_SLASHC;
-		  }
-	       }
-	    }
-	 return index+1;
+         for (; index<source.length && (state!=STATE_NORMAL || (source[index]!='{' && source[index]!=';')); ++index)
+            if (state==STATE_SLASHC && source[index]=='\n') {
+               state=STATE_NORMAL;
+            }
+            else if (index<source.length-1) {
+               if (state==STATE_STARC) {
+                  if (source[index]=='*' && source[index+1]=='/') {
+                     state=STATE_NORMAL;
+                  }
+               }
+               else {
+                  if (source[index]=='/' && source[index+1]=='*') {
+                     state=STATE_STARC;
+                  }
+                  else if (source[index]=='/' && source[index+1]=='/') {
+                     state=STATE_SLASHC;
+                  }
+               }
+            }
+         return index+1;
       }
-   
+
 
    }
 
    class StaticBlockComponent extends BlockSourceComponent {
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) {
-	 //Debug.log(9,"found package statement: \""+str+"\"");
-	 //Debug.log(9,"found function component: '"+str+"'");
-	 parser.setLastComment(null);
-	 return endIndex;
+         //Debug.log(9,"found package statement: \""+str+"\"");
+         //Debug.log(9,"found function component: '"+str+"'");
+         parser.setLastComment(null);
+         return endIndex;
       }
-   
+
       int match(char[] source, int index) {
-	 if (source[index]=='{') return index+1;
+         if (source[index]=='{') return index+1;
 
-	 if (index+7<source.length) {
-	    if (source[index+0]=='s' 
-		&& source[index+1]=='t'
-		&& source[index+2]=='a'
-		&& source[index+3]=='t'
-		&& source[index+4]=='i'
-		&& source[index+5]=='c') {
+         if (index+7<source.length) {
+            if (source[index+0]=='s'
+                && source[index+1]=='t'
+                && source[index+2]=='a'
+                && source[index+3]=='t'
+                && source[index+4]=='i'
+                && source[index+5]=='c') {
 
-	       for (index+=6; index<source.length && Parser.WHITESPACE.indexOf(source[index])>=0; ++index)
-		  ;
+               for (index+=6; index<source.length && Parser.WHITESPACE.indexOf(source[index])>=0; ++index)
+                  ;
 
-	       if (index<source.length && source[index]=='{')
-		  return index+1;
-	       else
-		  return -1;
-	    }
-	 }
-	 return -1;
+               if (index<source.length && source[index]=='{')
+                  return index+1;
+               else
+                  return -1;
+            }
+         }
+         return -1;
       }
 
    }
@@ -538,9 +538,9 @@ import gnu.classpath.tools.MalformedInputEvent;
    class ClassComponent extends SourceComponent {
 
       int match(char[] source, int index) {
-	 boolean isClass=false;
-	 for (; index<source.length && !isClass; ++index) {
-	    switch (source[index]) {
+         boolean isClass=false;
+         for (; index<source.length && !isClass; ++index) {
+            switch (source[index]) {
             case '/':  // possible comment
                if (index<source.length-1) {
                   char c = source[index+1];
@@ -564,70 +564,70 @@ import gnu.classpath.tools.MalformedInputEvent;
                    ++ index;
                }
                if (index<source.length && source[index]=='(') {
-		   int parLevel = 1;
+                   int parLevel = 1;
                    index += 1;
-                   while (index<source.length && parLevel>0) { 
-		       if (source[index] == '(')
+                   while (index<source.length && parLevel>0) {
+                       if (source[index] == '(')
                           ++ parLevel;
-		       if (source[index] == ')')
-			  -- parLevel;
+                       if (source[index] == ')')
+                          -- parLevel;
                        ++ index;
-		       if (parLevel==0)
-		           break;
-                   } 
+                       if (parLevel==0)
+                           break;
+                   }
                }
                break;
-	    case '=':  // field
-	    case ';':  // field
-	    case '(':  // function
-	       return -1;
-	    case '{':
-	       isClass=true;
-	       break;
-	    }
-	    if (isClass) break;
-	 }
-	 if (!isClass || index>=source.length)
-	    return -1;
+            case '=':  // field
+            case ';':  // field
+            case '(':  // function
+               return -1;
+            case '{':
+               isClass=true;
+               break;
+            }
+            if (isClass) break;
+         }
+         if (!isClass || index>=source.length)
+            return -1;
 
-	 return index+1;
+         return index+1;
       }
 
       int process(Parser parser, char[] source, int startIndex, int endIndex) throws ParseException, IOException {
 
-	 parser.classOpened(source, startIndex, endIndex);
-	 if (parser.getAddComments())
-	    parser.ctx.classDoc.setRawCommentText(parser.getLastComment());
-	 parser.setLastComment(null);
-	 if (parser.ctx.classDoc.isEnum())
-	   {
-	     int depth = 0;
-	     for (int a = endIndex; a < source.length; ++a)
-	     {
-	       Debug.log(9, "Enum skipping " + a);
-	       if (source[a] == '{')
-		 {
-		   Debug.log(1, "Found inner { in enum");
-		   ++depth;
-		 }
-	       if (source[a] == '}')
-		 {
-		   if (depth > 0)
-		     {
-		       Debug.log(1, "Found inner } in enum");
-		       --depth;
-		     }
-		   else
-		     {
-		       Debug.log(1, "Found enum }");
-		       parser.classClosed();
-		       return a + 1;
-		     }
-		 }
-	     }
-	   }
-	 int rc=parser.parse(source, endIndex, parser.getClassLevelComponents());
-	 return rc;
+         parser.classOpened(source, startIndex, endIndex);
+         if (parser.getAddComments())
+            parser.ctx.classDoc.setRawCommentText(parser.getLastComment());
+         parser.setLastComment(null);
+         if (parser.ctx.classDoc.isEnum())
+           {
+             int depth = 0;
+             for (int a = endIndex; a < source.length; ++a)
+             {
+               Debug.log(9, "Enum skipping " + a);
+               if (source[a] == '{')
+                 {
+                   Debug.log(1, "Found inner { in enum");
+                   ++depth;
+                 }
+               if (source[a] == '}')
+                 {
+                   if (depth > 0)
+                     {
+                       Debug.log(1, "Found inner } in enum");
+                       --depth;
+                     }
+                   else
+                     {
+                       Debug.log(1, "Found enum }");
+                       parser.classClosed();
+                       return a + 1;
+                     }
+                 }
+             }
+           }
+         int rc=parser.parse(source, endIndex, parser.getClassLevelComponents());
+         return rc;
       }
 
    }
@@ -649,36 +649,36 @@ public class Parser {
       int state=STATE_NORMAL;
       int prev=0;
       for (; !((level==0 && state==STATE_NORMAL && (delimiter=='\0' || source[endIndex]==delimiter))) && endIndex<source.length; ++endIndex) {
-	 int c=source[endIndex];
-	 if (state==STATE_NORMAL) {
-	    if (c=='}') --level;
-	    else if (c=='{') ++level;
-	    else if (c=='/' && prev=='/') { state=STATE_SLASHC; c=0; }
-	    else if (c=='*' && prev=='/') { state=STATE_STARC; c=0; }
-	    else if (c=='\'' && prev!='\\') { state=STATE_CHAR; c=0; }
-	    else if (c=='\"' && prev!='\\') { state=STATE_STRING; c=0; }
-	 }
-	 else if (state==STATE_SLASHC) {
-	    if (c=='\n') state=STATE_NORMAL;
-	 }
-	 else if (state==STATE_CHAR) {
-	    if (c=='\'' && prev!='\\') state=STATE_NORMAL;
-	    else if (c=='\\' && prev=='\\') c=0;
-	 }
-	 else if (state==STATE_STRING) {
-	    if (c=='\"' && prev!='\\') state=STATE_NORMAL;
-	    else if (c=='\\' && prev=='\\') c=0;
-	 }
-	 else {
-	    if (c=='/' && prev=='*') { state=STATE_NORMAL; c=0; }
-	 }
-	 prev=c;
+         int c=source[endIndex];
+         if (state==STATE_NORMAL) {
+            if (c=='}') --level;
+            else if (c=='{') ++level;
+            else if (c=='/' && prev=='/') { state=STATE_SLASHC; c=0; }
+            else if (c=='*' && prev=='/') { state=STATE_STARC; c=0; }
+            else if (c=='\'' && prev!='\\') { state=STATE_CHAR; c=0; }
+            else if (c=='\"' && prev!='\\') { state=STATE_STRING; c=0; }
+         }
+         else if (state==STATE_SLASHC) {
+            if (c=='\n') state=STATE_NORMAL;
+         }
+         else if (state==STATE_CHAR) {
+            if (c=='\'' && prev!='\\') state=STATE_NORMAL;
+            else if (c=='\\' && prev=='\\') c=0;
+         }
+         else if (state==STATE_STRING) {
+            if (c=='\"' && prev!='\\') state=STATE_NORMAL;
+            else if (c=='\\' && prev=='\\') c=0;
+         }
+         else {
+            if (c=='/' && prev=='*') { state=STATE_NORMAL; c=0; }
+         }
+         prev=c;
       }
       if (level>0)
-	 throw new ParseException("Unexpected end of source.");
+         throw new ParseException("Unexpected end of source.");
       else {
-	 String rc=new String(source, orgEndIndex, endIndex-orgEndIndex);
-	 return endIndex;
+         String rc=new String(source, orgEndIndex, endIndex-orgEndIndex);
+         return endIndex;
       }
    }
 
@@ -693,13 +693,13 @@ public class Parser {
 
    public static final boolean isWhitespace(char c) {
       return (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '');
-      //return WHITESPACE.indexOf(c)>=0; 
+      //return WHITESPACE.indexOf(c)>=0;
    }
 
    private int currentLine;
 
-   static char[] loadFile(final File file, String encoding) 
-      throws IOException 
+   static char[] loadFile(final File file, String encoding)
+      throws IOException
    {
       InputStream in = new FileInputStream(file);
       NotifyingInputStreamReader notifyingInput
@@ -733,30 +733,30 @@ public class Parser {
    public Parser() {
       try {
 
-	 sourceLevelComponents=new SourceComponent[] {
-	    new Whitespace(),
-	    new CommentComponent(),
-	    new SlashSlashCommentComponent(),
-	    new PackageComponent(),
-	    new EmptyStatementComponent(),
-	    new ImportComponent(),
-	    new ClassComponent(),
-	 };
+         sourceLevelComponents=new SourceComponent[] {
+            new Whitespace(),
+            new CommentComponent(),
+            new SlashSlashCommentComponent(),
+            new PackageComponent(),
+            new EmptyStatementComponent(),
+            new ImportComponent(),
+            new ClassComponent(),
+         };
 
-	 classLevelComponents=new SourceComponent[] {
-	    new Whitespace(),
-	    new BracketClose(),
-	    new CommentComponent(),
-	    new SlashSlashCommentComponent(),
-	    new FunctionComponent(),
-	    new StaticBlockComponent(),
-	    new ImportComponent(),
-	    new ClassComponent(),
-	    new FieldComponent(),
-	 };
+         classLevelComponents=new SourceComponent[] {
+            new Whitespace(),
+            new BracketClose(),
+            new CommentComponent(),
+            new SlashSlashCommentComponent(),
+            new FunctionComponent(),
+            new StaticBlockComponent(),
+            new ImportComponent(),
+            new ClassComponent(),
+            new FieldComponent(),
+         };
       }
       catch (Exception e) {
-	 e.printStackTrace();
+         e.printStackTrace();
       }
    }
 
@@ -766,8 +766,8 @@ public class Parser {
 
    static Set processedFiles = new HashSet();
 
-   ClassDocImpl processSourceFile(File file, boolean addComments, 
-                                  String encoding, String expectedPackageName) 
+   ClassDocImpl processSourceFile(File file, boolean addComments,
+                                  String encoding, String expectedPackageName)
       throws IOException, ParseException
    {
      //System.err.println("Processing " + file + "...");
@@ -785,9 +785,9 @@ public class Parser {
       }
 
       processedFiles.add(file);
-         
+
       Debug.log(1,"Processing file "+file);
-      
+
       contextStack.clear();
       ctx=null;
 
@@ -795,7 +795,7 @@ public class Parser {
       importedStringList.clear();
       importedPackagesList.clear();
       importedStatementList.clear();
-      
+
       currentLine = 1;
 
       char[] source = loadFile(file, encoding);
@@ -805,52 +805,52 @@ public class Parser {
 
          ClassDoc[] importedClasses=(ClassDoc[])importedClassesList.toArray(new ClassDoc[0]);
          PackageDoc[] importedPackages=(PackageDoc[])importedPackagesList.toArray(new PackageDoc[0]);
-         
+
          if (Main.DESCEND_IMPORTED) {
             for (int i=0; i<importedClasses.length; ++i) {
                Main.getRootDoc().scheduleClass(currentClass, importedClasses[i].qualifiedName());
             }
          }
-       
-         
+
+
            if (contextStack.size()>0) {
-	     Debug.log(1,"-->contextStack not empty! size is "+contextStack.size());
+             Debug.log(1,"-->contextStack not empty! size is "+contextStack.size());
            }
-         
+
          return outerClass;
       }
       catch (IgnoredFileParseException ignore) {
-	Debug.log(1, "File ignored: " + ignore);
+        Debug.log(1, "File ignored: " + ignore);
          return null;
       }
    }
-      
+
    int parse(char[] source, int index, SourceComponent[] componentTypes) throws ParseException, IOException {
 
       while (index<source.length) {
 
-	 int match=-1;
-	 int i=0;
-	 for (; i<componentTypes.length; ++i) {
-	    if ((match=componentTypes[i].match(source, index))>=0) {
-	      //Debug.log(1,componentTypes[i].getClass().getName()+" ("+match+"/"+source.length+")");
-	       break;
-	    }
-	 }
+         int match=-1;
+         int i=0;
+         for (; i<componentTypes.length; ++i) {
+            if ((match=componentTypes[i].match(source, index))>=0) {
+              //Debug.log(1,componentTypes[i].getClass().getName()+" ("+match+"/"+source.length+")");
+               break;
+            }
+         }
 
-	 if (i<componentTypes.length) {
-	    int endIndex=componentTypes[i].getEndIndex(source, match);
-	    Debug.log(9, "Processing " + new String(source,index,endIndex-index) + " with " + componentTypes[i]);
-	    index=componentTypes[i].process(this, source, index, endIndex);
-	    if (index<0) {
-	      //Debug.log(9,"exiting parse because of "+componentTypes[i].getClass().getName()+" (\""+new String(source, index, endIndex-index)+"\")");
-	       return endIndex;
-	    }
-	 }
-	 else {
-	   //Debug.log(9,"index="+index+", source.length()="+source.length);
-	    throw new ParseException("unmatched input in line "+currentLine+": "+new String(source, index, Math.min(50,source.length-index)));
-	 }
+         if (i<componentTypes.length) {
+            int endIndex=componentTypes[i].getEndIndex(source, match);
+            Debug.log(9, "Processing " + new String(source,index,endIndex-index) + " with " + componentTypes[i]);
+            index=componentTypes[i].process(this, source, index, endIndex);
+            if (index<0) {
+              //Debug.log(9,"exiting parse because of "+componentTypes[i].getClass().getName()+" (\""+new String(source, index, endIndex-index)+"\")");
+               return endIndex;
+            }
+         }
+         else {
+           //Debug.log(9,"index="+index+", source.length()="+source.length);
+            throw new ParseException("unmatched input in line "+currentLine+": "+new String(source, index, Math.min(50,source.length-index)));
+         }
 
       }
       //Debug.log(9,"exiting parse normally, index="+index+" source.length="+source.length);
@@ -860,22 +860,22 @@ public class Parser {
    private static int countNewLines(String source) {
       int i=0;
       int rc=0;
-      while ((i=source.indexOf('\n',i)+1)>0) 
-	 ++rc;
+      while ((i=source.indexOf('\n',i)+1)>0)
+         ++rc;
       return rc;
    }
 
-   public void processSourceDir(File dir, String encoding, String expectedPackageName) 
-      throws IOException, ParseException 
+   public void processSourceDir(File dir, String encoding, String expectedPackageName)
+      throws IOException, ParseException
    {
       Debug.log(9,"Processing "+dir.getParentFile().getName()+"."+dir.getName());
       File[] files=dir.listFiles();
       if (null!=files) {
-	 for (int i=0; i<files.length; ++i) {
-	    if (files[i].getName().toLowerCase().endsWith(".java")) {
-	       processSourceFile(files[i], true, encoding, expectedPackageName);
-	    }
-	 }
+         for (int i=0; i<files.length; ++i) {
+            if (files[i].getName().toLowerCase().endsWith(".java")) {
+               processSourceFile(files[i], true, encoding, expectedPackageName);
+            }
+         }
       }
    }
 
@@ -903,14 +903,14 @@ public class Parser {
       }
 
       if (currentPackageName != null)
-	 importedStatementList.add(currentPackageName + ".*");
+         importedStatementList.add(currentPackageName + ".*");
       importedStatementList.add("java.lang.*");
 
       ClassDocImpl classDoc
-	 = ClassDocImpl.createInstance((ctx!=null)?(ctx.classDoc):null, currentPackage, 
-				       null,
-				       (PackageDoc[])importedPackagesList.toArray(new PackageDoc[0]),
-				       source, startIndex, endIndex,
+         = ClassDocImpl.createInstance((ctx!=null)?(ctx.classDoc):null, currentPackage,
+                                       null,
+                                       (PackageDoc[])importedPackagesList.toArray(new PackageDoc[0]),
+                                       source, startIndex, endIndex,
                                        importedStatementList);
 
       if (ctx != null) {
@@ -921,9 +921,9 @@ public class Parser {
       }
 
       if (importedClassesList.isEmpty()) {
-	 for (Iterator it=importedStringList.iterator(); it.hasNext(); ) {
-	    importedClassesList.add(new ClassDocProxy((String)it.next(), classDoc));
-	 }
+         for (Iterator it=importedStringList.iterator(); it.hasNext(); ) {
+            importedClassesList.add(new ClassDocProxy((String)it.next(), classDoc));
+         }
       }
       classDoc.setImportedClasses((ClassDoc[])importedClassesList.toArray(new ClassDoc[0]));
 
@@ -936,7 +936,7 @@ public class Parser {
       }
 
       if (classDoc.superclass()!=null)
-	 referencedClassesList.add(classDoc.superclass());
+         referencedClassesList.add(classDoc.superclass());
 
       Debug.log(1,"classOpened "+classDoc+", adding superclass "+classDoc.superclass());
       Debug.log(1,"Pushing " + ctx);
@@ -952,9 +952,9 @@ public class Parser {
    }
 
    void classClosed() throws ParseException, IOException {
-      ctx.classDoc.setFields((FieldDoc[])toArray(ctx.fieldList, 
+      ctx.classDoc.setFields((FieldDoc[])toArray(ctx.fieldList,
                                                              new FieldDoc[0]));
-      ctx.classDoc.setFilteredFields((FieldDoc[])toArray(ctx.filteredFieldList, 
+      ctx.classDoc.setFilteredFields((FieldDoc[])toArray(ctx.filteredFieldList,
                                                                      new FieldDoc[0]));
       ctx.classDoc.setSerializableFields((FieldDoc[])toArray(ctx.sfieldList, new FieldDoc[0]));
       ctx.classDoc.setMethods((MethodDoc[])toArray(ctx.methodList, new MethodDoc[0]));
@@ -968,11 +968,11 @@ public class Parser {
       ctx.classDoc.setBoilerplateComment(boilerplateComment);
 
       Main.getRootDoc().addClassDoc(ctx.classDoc);
-      
+
       if (Main.DESCEND_INTERFACES) {
-	 for (int i=0; i<ctx.classDoc.interfaces().length; ++i) {
-	    Main.getRootDoc().scheduleClass(ctx.classDoc, ctx.classDoc.interfaces()[i].qualifiedName());
-	 }
+         for (int i=0; i<ctx.classDoc.interfaces().length; ++i) {
+            Main.getRootDoc().scheduleClass(ctx.classDoc, ctx.classDoc.interfaces()[i].qualifiedName());
+         }
       }
 
       Debug.log(1,"classClosed: "+ctx.classDoc);
@@ -982,29 +982,29 @@ public class Parser {
       ClassDoc[] referencedClasses=(ClassDoc[])referencedClassesList.toArray(new ClassDoc[0]);
 
       if (Main.DESCEND_SUPERCLASS) {
-	 for (int i=0; i<referencedClasses.length; ++i) {
-	    Main.getRootDoc().scheduleClass(currentClass, referencedClasses[i].qualifiedName());
-	 }
+         for (int i=0; i<referencedClasses.length; ++i) {
+            Main.getRootDoc().scheduleClass(currentClass, referencedClasses[i].qualifiedName());
+         }
       }
    }
-   
+
    Context      ctx             = null;
    Stack        contextStack    = new Stack();
    class Context {
       Context(ClassDocImpl classDoc) { this.classDoc=classDoc; }
       ClassDocImpl      classDoc                 = null;
-      List	        fieldList                = new LinkedList();
-      List	        filteredFieldList        = new LinkedList();
-      List	        sfieldList               = new LinkedList();
-      List	        methodList               = new LinkedList();
-      List	        filteredMethodList       = new LinkedList();
+      List              fieldList                = new LinkedList();
+      List              filteredFieldList        = new LinkedList();
+      List              sfieldList               = new LinkedList();
+      List              methodList               = new LinkedList();
+      List              filteredMethodList       = new LinkedList();
       List              maybeSerMethodList       = new LinkedList();
-      List	        constructorList          = new LinkedList();
-      List	        filteredConstructorList  = new LinkedList();
+      List              constructorList          = new LinkedList();
+      List              filteredConstructorList  = new LinkedList();
       List              innerClassesList         = new LinkedList();
       List              filteredInnerClassesList = new LinkedList();
    }
-   
+
    File currentFile = null;
    String lastComment = null;
    String expectedPackageName = null;
@@ -1028,17 +1028,17 @@ public class Parser {
    void packageOpened(String packageName) {
       currentPackageName = packageName;
    }
-   
+
    void importEncountered(String importString) throws ParseException, IOException {
       //Debug.log(9,"importing '"+importString+"'");
 
       importedStatementList.add(importString);
 
       if (importString.endsWith(".*")) {
-	 importedPackagesList.add(Main.getRootDoc().findOrCreatePackageDoc(importString.substring(0,importString.length()-2)));
+         importedPackagesList.add(Main.getRootDoc().findOrCreatePackageDoc(importString.substring(0,importString.length()-2)));
       }
       else {
-	 importedStringList.add(importString);
+         importedStringList.add(importString);
       }
    }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java
index a5588ff46cc..bdcf61bf6d8 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ProgramElementDocImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,30 +49,30 @@ public abstract class ProgramElementDocImpl extends DocImpl implements ProgramEl
    protected boolean isStatic;
    protected int     accessLevel=ProgramElementDocImpl.ACCESS_PACKAGEPRIVATE;
 
-   public static final int ACCESS_PUBLIC	  = 0;
-   public static final int ACCESS_PROTECTED	  = 1;
+   public static final int ACCESS_PUBLIC          = 0;
+   public static final int ACCESS_PROTECTED       = 1;
    public static final int ACCESS_PACKAGEPRIVATE  = 2;
-   public static final int ACCESS_PRIVATE	  = 3;
+   public static final int ACCESS_PRIVATE         = 3;
 
    private static final String[] accessModifiers = { "public ", "protected ", "", "private "};
 
-   public ProgramElementDocImpl(ClassDoc containingClass, 
+   public ProgramElementDocImpl(ClassDoc containingClass,
                                 PackageDoc containingPackage,
                                 SourcePosition position) {
       super(position);
       this.containingClass=containingClass;
       this.containingPackage=containingPackage;
-   }   
+   }
    public ProgramElementDocImpl(ClassDoc containingClass, SourcePosition position) {
       super(position);
       this.containingClass=containingClass;
       this.containingPackage=containingClass.containingPackage();
-   }   
+   }
    public ProgramElementDocImpl(ClassDoc containingClass,
-				PackageDoc containingPackage,
-				int accessLevel,
-				boolean isFinal,
-				boolean isStatic,
+                                PackageDoc containingPackage,
+                                int accessLevel,
+                                boolean isFinal,
+                                boolean isStatic,
                                 SourcePosition position) {
       super(position);
       this.containingClass=containingClass;
@@ -82,91 +82,91 @@ public abstract class ProgramElementDocImpl extends DocImpl implements ProgramEl
       this.isStatic=isStatic;
    }
 
-   //Get the containing class of this program element. 
+   //Get the containing class of this program element.
    public ClassDoc containingClass() {
       return containingClass;
    }
 
-   // Get the package that this program element is contained in. 
+   // Get the package that this program element is contained in.
    public PackageDoc containingPackage() {
       return containingPackage;
    }
- 
-   // Return true if this program element is final 
+
+   // Return true if this program element is final
    public boolean isFinal() {
       return isFinal;
    }
- 
-   // Return true if this program element is package private 
+
+   // Return true if this program element is package private
    public boolean isPackagePrivate() {
       return accessLevel==ACCESS_PACKAGEPRIVATE;
    }
- 
-   // Return true if this program element is private 
+
+   // Return true if this program element is private
    public boolean isPrivate() {
       return accessLevel==ACCESS_PRIVATE;
    }
- 
-   // Return true if this program element is protected 
+
+   // Return true if this program element is protected
    public boolean isProtected() {
       return accessLevel==ACCESS_PROTECTED;
    }
- 
-   // Return true if this program element is public 
+
+   // Return true if this program element is public
    public boolean isPublic() {
       return accessLevel==ACCESS_PUBLIC;
    }
- 
-   // Return true if this program element is static 
+
+   // Return true if this program element is static
    public boolean isStatic() {
       return isStatic;
    }
- 
-   // Get modifiers string. 
+
+   // Get modifiers string.
    public String modifiers() {
-      return 
-	 (accessModifiers[accessLevel]+
-	  (isStatic()?"static ":"")+
-	  (isFinal()?"final ":"")).trim();
+      return
+         (accessModifiers[accessLevel]+
+          (isStatic()?"static ":"")+
+          (isFinal()?"final ":"")).trim();
    }
- 
-   // Get the modifier specifier integer. 
+
+   // Get the modifier specifier integer.
    public int modifierSpecifier() {
       return (isStatic()?Modifier.STATIC:0)
-	 | (isFinal()?Modifier.FINAL:0)
-	 | (isPublic()?Modifier.PUBLIC:0)
-	 | (isProtected()?Modifier.PROTECTED:0)
-	 | (isPrivate()?Modifier.PRIVATE:0)
-//	 | (isAbstract()?Modifier.ABSTRACT:0)
-	 ;
+         | (isFinal()?Modifier.FINAL:0)
+         | (isPublic()?Modifier.PUBLIC:0)
+         | (isProtected()?Modifier.PROTECTED:0)
+         | (isPrivate()?Modifier.PRIVATE:0)
+//       | (isAbstract()?Modifier.ABSTRACT:0)
+         ;
    }
- 
-   // Get the fully qualified name. 
+
+   // Get the fully qualified name.
    public abstract String qualifiedName();
 
    protected boolean processModifier(String word) {
       if (word.equals("public")) {
-	 accessLevel=ACCESS_PUBLIC;
-	 return true;
+         accessLevel=ACCESS_PUBLIC;
+         return true;
       }
       else if (word.equals("protected")) {
-	 accessLevel=ACCESS_PROTECTED;
-	 return true;
+         accessLevel=ACCESS_PROTECTED;
+         return true;
       }
       else if (word.equals("private")) {
-	 accessLevel=ACCESS_PRIVATE;
-	 return true;
+         accessLevel=ACCESS_PRIVATE;
+         return true;
       }
       else if (word.equals("static")) {
-	 isStatic=true;
-	 return true;
+         isStatic=true;
+         return true;
       }
       else if (word.equals("final")) {
-	 isFinal=true;
-	 return true;
+         isFinal=true;
+         return true;
       }
       else {
-	 return false;
+         return false;
       }
    }
 
@@ -175,4 +175,3 @@ public abstract class ProgramElementDocImpl extends DocImpl implements ProgramEl
    }
 
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
index 21640d2feef..09d1be73b9e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/RootDocImpl.java
@@ -7,7 +7,7 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
- 
+
    GNU Classpath is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@
    You should have received a copy of the GNU General Public License
    along with GNU Classpath; see the file COPYING.  If not, write to the
    Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA. 
+   02111-1307 USA.
 
    Linking this library statically or dynamically with other modules is
    making a combined work based on this library.  Thus, the terms and
@@ -42,8 +42,8 @@ import java.util.*;
 import java.io.*;
 import java.lang.reflect.*;
 
-public class RootDocImpl 
-   extends DocImpl 
+public class RootDocImpl
+   extends DocImpl
    implements GjdocRootDoc {
 
    private ErrorReporter reporter = new ErrorReporter();
@@ -53,7 +53,7 @@ public class RootDocImpl
    /**
     *  All options and their corresponding values which are not recognized
     *  by Gjdoc. These are passed to the Doclet as "custom options".
-    *  Each element in this array is again a String array, with the 
+    *  Each element in this array is again a String array, with the
     *  option name as first element (including prefix dash) and possible
     *  option values as following elements.
     */
@@ -67,7 +67,7 @@ public class RootDocImpl
    private List specifiedSourceFiles = new LinkedList();
 
    /**
-    *  The names of all packages explicitly specified on the 
+    *  The names of all packages explicitly specified on the
     *  command line.
     *
     *  @contains String
@@ -85,7 +85,7 @@ public class RootDocImpl
 
    /**
     *  Stores all classes loaded in the course of preparing
-    *  the documentation data. Maps the fully qualified name 
+    *  the documentation data. Maps the fully qualified name
     *  of a class to its ClassDocImpl representation.
     *
     *  @contains String->ClassDocImpl
@@ -94,7 +94,7 @@ public class RootDocImpl
 
    /**
     *  Stores all packages loaded in the course of preparing
-    *  the documentation data. Maps the package name 
+    *  the documentation data. Maps the package name
     *  to its PackageDocImpl representation.
     *
     *  @contains String->PackageDocImpl
@@ -106,13 +106,13 @@ public class RootDocImpl
     *  individually specified on the command line and those contained
     *  in packages specified on the command line (as Array for quick
     *  retrieval by Doclet).  This is created from classesList after
-    *  all classes have been loaded.  
+    *  all classes have been loaded.
     */
    private ClassDocImpl[] classes;
 
    /**
-    *  All classes which were individually specified on the command 
-    *  line (as Array for quick retrieval by Doclet). This is created 
+    *  All classes which were individually specified on the command
+    *  line (as Array for quick retrieval by Doclet). This is created
     *  from specifiedClassNames after all classes have been loaded.
     */
    private List specifiedClasses;
@@ -120,7 +120,7 @@ public class RootDocImpl
    /**
     *  All packages which were specified on the command line (as Array
     *  for quick retrieval by Doclet). This is created from
-    *  specifiedPackageNames after all classes have been loaded.  
+    *  specifiedPackageNames after all classes have been loaded.
     */
    private Set specifiedPackages;
 
@@ -141,7 +141,7 @@ public class RootDocImpl
    private Set unlocatableReportedSet = new HashSet();
 
    private Set inaccessibleReportedSet = new HashSet();
-   
+
    //--------------------------------------------------------------------------
    //
    // Implementation of RootDoc interface
@@ -149,61 +149,61 @@ public class RootDocImpl
    //--------------------------------------------------------------------------
 
    /**
-    *  Return classes and interfaces to be documented. 
+    *  Return classes and interfaces to be documented.
     */
-   public ClassDoc[] classes() { return classes; } 
+   public ClassDoc[] classes() { return classes; }
 
    /**
-    *  Return a ClassDoc object for the specified class/interface 
+    *  Return a ClassDoc object for the specified class/interface
     *  name.
     *
-    *  @return a ClassDoc object describing the given class, or 
+    *  @return a ClassDoc object describing the given class, or
     *  <code>null</code> if no corresponding ClassDoc object
     *  has been constructed.
     */
-   public ClassDoc classNamed(String qualifiedName) { 
-      return (ClassDoc)classDocMap.get(qualifiedName); 
-   } 
+   public ClassDoc classNamed(String qualifiedName) {
+      return (ClassDoc)classDocMap.get(qualifiedName);
+   }
 
    /**
     *  Return an xxx
     */
-   public String[][] options() { return customOptionArr; } 
+   public String[][] options() { return customOptionArr; }
 
-   // Return a PackageDoc for the specified package name 
-   public PackageDoc packageNamed(String name) { 
-      return (PackageDoc)packageDocMap.get(name); 
+   // Return a PackageDoc for the specified package name
+   public PackageDoc packageNamed(String name) {
+      return (PackageDoc)packageDocMap.get(name);
    }
 
 
-  // classes and interfaces specified on the command line. 
-  public ClassDoc[] specifiedClasses() 
-  { 
-    return (ClassDocImpl[]) specifiedClasses.toArray(new ClassDocImpl[0]); 
-  } 
+  // classes and interfaces specified on the command line.
+  public ClassDoc[] specifiedClasses()
+  {
+    return (ClassDocImpl[]) specifiedClasses.toArray(new ClassDocImpl[0]);
+  }
 
-   // packages specified on the command line. 
-  public PackageDoc[] specifiedPackages() 
+   // packages specified on the command line.
+  public PackageDoc[] specifiedPackages()
   {
     return (PackageDocImpl[])specifiedPackages.toArray(new PackageDocImpl[0]);
   }
 
-   // Print error message, increment error count. 
+   // Print error message, increment error count.
    public void printError(java.lang.String msg) {
       reporter.printError(msg);
    }
 
-   // Print error message, increment error count. 
+   // Print error message, increment error count.
    public void printFatal(java.lang.String msg) {
       reporter.printFatal(msg);
    }
 
-   // Print a message. 
+   // Print a message.
    public void printNotice(java.lang.String msg) {
       reporter.printNotice(msg);
    }
-   
-   // Print warning message, increment warning count. 
+
+   // Print warning message, increment warning count.
    public void printWarning(java.lang.String msg) {
       reporter.printWarning(msg);
    }
@@ -232,30 +232,30 @@ public class RootDocImpl
          Iterator it = javaLangSourceDirs.iterator();
          while (it.hasNext()) {
             File javaLangSourceDir = (File)it.next();
-            parser.processSourceDir(javaLangSourceDir, 
+            parser.processSourceDir(javaLangSourceDir,
                                     sourceEncoding, "java.lang");
          }
       }
       else {
 
-	 Debug.log(1, "Sourcepath is "+sourcePath);
+         Debug.log(1, "Sourcepath is "+sourcePath);
 
-	 // Core docs not included in source-path: 
-	 // we need to gather the information about java.lang
-	 // classes via reflection...
+         // Core docs not included in source-path:
+         // we need to gather the information about java.lang
+         // classes via reflection...
 
       }
 
       //--- Parse all files in explicitly specified package directories.
-	 
+
       for (Iterator it=specifiedPackageNames.iterator(); it.hasNext(); ) {
 
-	 String specifiedPackageName = (String)it.next();
+         String specifiedPackageName = (String)it.next();
          String displayPackageName = specifiedPackageName;
          if (null == displayPackageName || 0 == displayPackageName.length()) {
             displayPackageName = "<unnamed>";
          }
-	 printNotice("Loading classes for package "+displayPackageName+"...");
+         printNotice("Loading classes for package "+displayPackageName+"...");
          String relPath;
          if (null != specifiedPackageName) {
             relPath = specifiedPackageName.replace('.',File.separatorChar);
@@ -263,17 +263,17 @@ public class RootDocImpl
          else {
             relPath = "";
          }
-	 List sourceDirs = findSourceFiles(relPath);
-	 if (!sourceDirs.isEmpty()) {
+         List sourceDirs = findSourceFiles(relPath);
+         if (!sourceDirs.isEmpty()) {
             Iterator sourceDirIt = sourceDirs.iterator();
             while (sourceDirIt.hasNext()) {
                File sourceDir = (File)sourceDirIt.next();
                parser.processSourceDir(sourceDir, sourceEncoding, specifiedPackageName);
             }
-	 }
-	 else {
-	    printError("Package '"+specifiedPackageName+"' not found.");
-	 }
+         }
+         else {
+            printError("Package '"+specifiedPackageName+"' not found.");
+         }
       }
 
       specifiedClasses = new LinkedList();
@@ -282,17 +282,17 @@ public class RootDocImpl
 
       for (Iterator it=specifiedSourceFiles.iterator(); it.hasNext(); ) {
 
-	 File specifiedSourceFile = (File)it.next();
-	 printNotice("Loading source file "+specifiedSourceFile+" ...");
+         File specifiedSourceFile = (File)it.next();
+         printNotice("Loading source file "+specifiedSourceFile+" ...");
          ClassDocImpl classDoc = parser.processSourceFile(specifiedSourceFile, true, sourceEncoding, null);
          if (null != classDoc) {
-	   specifiedClasses.add(classDoc);
-	   classesList.add(classDoc);
-	   classDoc.setIsIncluded(true);
-	   addPackageDoc(classDoc.containingPackage());
+           specifiedClasses.add(classDoc);
+           classesList.add(classDoc);
+           classDoc.setIsIncluded(true);
+           addPackageDoc(classDoc.containingPackage());
          }
       }
-   
+
 
       //--- Let the user know that all specified classes are loaded.
 
@@ -311,7 +311,7 @@ public class RootDocImpl
       printNotice("Resolving references in classes...");
 
       for (Iterator it = classDocMap.values().iterator(); it.hasNext(); ) {
-	 ClassDoc cd=(ClassDoc)it.next();
+         ClassDoc cd=(ClassDoc)it.next();
          if (cd instanceof ClassDocImpl) {
             ((ClassDocImpl)cd).resolve();
          }
@@ -322,28 +322,28 @@ public class RootDocImpl
       printNotice("Resolving references in packages...");
 
       for (Iterator it = packageDocMap.values().iterator(); it.hasNext(); ) {
-	 PackageDocImpl pd=(PackageDocImpl)it.next();
-	 pd.resolve();
+         PackageDocImpl pd=(PackageDocImpl)it.next();
+         pd.resolve();
       }
 
       //--- Assemble the array with all specified packages
 
       specifiedPackages = new LinkedHashSet();
       for (Iterator it = specifiedPackageNames.iterator(); it.hasNext(); ) {
-	 String specifiedPackageName = (String)it.next();
-	 PackageDoc specifiedPackageDoc = (PackageDoc)packageDocMap.get(specifiedPackageName);
-	 if (null!=specifiedPackageDoc) {
-	    ((PackageDocImpl)specifiedPackageDoc).setIsIncluded(true);
-	    specifiedPackages.add(specifiedPackageDoc);
+         String specifiedPackageName = (String)it.next();
+         PackageDoc specifiedPackageDoc = (PackageDoc)packageDocMap.get(specifiedPackageName);
+         if (null!=specifiedPackageDoc) {
+            ((PackageDocImpl)specifiedPackageDoc).setIsIncluded(true);
+            specifiedPackages.add(specifiedPackageDoc);
 
-	    ClassDoc[] packageClassDocs=specifiedPackageDoc.allClasses();
-	    for (int i=0; i<packageClassDocs.length; ++i) {
-	       ClassDocImpl specifiedPackageClassDoc=(ClassDocImpl)packageClassDocs[i];
-            
-	       specifiedPackageClassDoc.setIsIncluded(true);
-	       classesList.add(specifiedPackageClassDoc);
-	    }
-	 }
+            ClassDoc[] packageClassDocs=specifiedPackageDoc.allClasses();
+            for (int i=0; i<packageClassDocs.length; ++i) {
+               ClassDocImpl specifiedPackageClassDoc=(ClassDocImpl)packageClassDocs[i];
+
+               specifiedPackageClassDoc.setIsIncluded(true);
+               classesList.add(specifiedPackageClassDoc);
+            }
+         }
       }
 
       //--- Resolve pending references in comment data of all classes
@@ -351,7 +351,7 @@ public class RootDocImpl
       printNotice("Resolving references in class comments...");
 
       for (Iterator it=classDocMap.values().iterator(); it.hasNext(); ) {
-	 ClassDoc cd=(ClassDoc)it.next();
+         ClassDoc cd=(ClassDoc)it.next();
          if (cd instanceof ClassDocImpl) {
             ((ClassDocImpl)cd).resolveComments();
          }
@@ -362,8 +362,8 @@ public class RootDocImpl
       printNotice("Resolving references in package comments...");
 
       for (Iterator it=packageDocMap.values().iterator(); it.hasNext(); ) {
-	 PackageDocImpl pd=(PackageDocImpl)it.next();
-	 pd.resolveComments();
+         PackageDocImpl pd=(PackageDocImpl)it.next();
+         pd.resolveComments();
       }
 
       //--- Create array with all loaded classes
@@ -380,32 +380,32 @@ public class RootDocImpl
 
    public long writeRawComment(String rawComment) {
       try {
-	 long pos=rawCommentCache.getFilePointer();
-	 //rawCommentCache.writeUTF(rawComment);
+         long pos=rawCommentCache.getFilePointer();
+         //rawCommentCache.writeUTF(rawComment);
          byte[] bytes = rawComment.getBytes("utf-8");
          rawCommentCache.writeInt(bytes.length);
          rawCommentCache.write(bytes);
-	 return pos;
+         return pos;
       }
       catch (IOException e) {
-	 printFatal("Cannot write to comment cache: "+e.getMessage());
-	 return -1;
+         printFatal("Cannot write to comment cache: "+e.getMessage());
+         return -1;
       }
    }
 
    public String readRawComment(long pos) {
       try {
-	 rawCommentCache.seek(pos);
+         rawCommentCache.seek(pos);
          int sz = rawCommentCache.readInt();
          byte[] bytes = new byte[sz];
          rawCommentCache.read(bytes);
          return new String(bytes, "utf-8");
-	 //return rawCommentCache.readUTF();
+         //return rawCommentCache.readUTF();
       }
       catch (IOException e) {
          e.printStackTrace();
-	 printFatal("Cannot read from comment cache: "+e.getMessage());
-	 return null;
+         printFatal("Cannot read from comment cache: "+e.getMessage());
+         return null;
       }
    }
 
@@ -413,9 +413,9 @@ public class RootDocImpl
 
       List result = new LinkedList();
       for (Iterator it = sourcePath.iterator(); it.hasNext(); ) {
-	 File path = (File)it.next();
-	 File file = new File(path, relPath);
-	 if (file.exists()) {
+         File path = (File)it.next();
+         File file = new File(path, relPath);
+         if (file.exists()) {
             result.add(file);
          }
       }
@@ -426,8 +426,8 @@ public class RootDocImpl
    PackageDocImpl findOrCreatePackageDoc(String packageName) {
       PackageDocImpl rc=(PackageDocImpl)getPackageDoc(packageName);
       if (null==rc) {
-	 rc=new PackageDocImpl(packageName);
-	 if (specifiedPackageNames.contains(packageName)) {
+         rc=new PackageDocImpl(packageName);
+         if (specifiedPackageNames.contains(packageName)) {
             String packageDirectoryName = packageName.replace('.', File.separatorChar);
             List packageDirectories = findSourceFiles(packageDirectoryName);
             Iterator it = packageDirectories.iterator();
@@ -450,8 +450,8 @@ public class RootDocImpl
             if (!packageDocFound) {
                printNotice("No description found for package "+packageName);
             }
-	 }
-	 addPackageDoc(rc);
+         }
+         addPackageDoc(rc);
       }
       return rc;
    }
@@ -485,10 +485,10 @@ public class RootDocImpl
       ClassDoc contextClass;
       String qualifiedName;
       ScheduledClass(ClassDoc contextClass, String qualifiedName) {
-	 this.contextClass=contextClass;
-	 this.qualifiedName=qualifiedName;
+         this.contextClass=contextClass;
+         this.qualifiedName=qualifiedName;
       }
-      
+
       public String toString() { return "ScheduledClass{"+qualifiedName+"}"; }
    }
 
@@ -496,10 +496,10 @@ public class RootDocImpl
 
       if (classDocMap.get(qualifiedName)==null) {
 
-	 //Debug.log(9,"Scheduling "+qualifiedName+", context "+context+".");
+         //Debug.log(9,"Scheduling "+qualifiedName+", context "+context+".");
          //System.err.println("Scheduling " + qualifiedName + ", context " + context);
 
-	 scheduledClasses.add(new ScheduledClass(context, qualifiedName));
+         scheduledClasses.add(new ScheduledClass(context, qualifiedName));
       }
    }
 
@@ -521,7 +521,7 @@ public class RootDocImpl
     *  The task of this method is to ensure that Gjdoc has all this
     *  information at hand when it exits.
     *
-    * 
+    *
     */
    public void loadScheduledClasses(Parser parser) throws ParseException, IOException {
 
@@ -531,77 +531,77 @@ public class RootDocImpl
 
       while (!scheduledClasses.isEmpty()) {
 
-	 // Make a copy of scheduledClasses and empty it. This 
-	 // prevents any Concurrent Modification issues.
-	 // As the copy won't need to grow (as it won't change)
-	 // we make it an Array for performance reasons.
+         // Make a copy of scheduledClasses and empty it. This
+         // prevents any Concurrent Modification issues.
+         // As the copy won't need to grow (as it won't change)
+         // we make it an Array for performance reasons.
 
-	 ScheduledClass[] scheduledClassesArr = (ScheduledClass[])scheduledClasses.toArray(new ScheduledClass[0]);
-	 scheduledClasses.clear();
+         ScheduledClass[] scheduledClassesArr = (ScheduledClass[])scheduledClasses.toArray(new ScheduledClass[0]);
+         scheduledClasses.clear();
 
-	 // Load each class specified in our array copy
-	 
-	 for (int i=0; i<scheduledClassesArr.length; ++i) {
+         // Load each class specified in our array copy
 
-	    // The name of the class we are looking for. This name
-	    // needs not be fully qualified.
-	    
-	    String scheduledClassName=scheduledClassesArr[i].qualifiedName;
+         for (int i=0; i<scheduledClassesArr.length; ++i) {
 
-	    // The ClassDoc in whose context the scheduled class was looked for.
-	    // This is necessary in order to resolve non-fully qualified 
-	    // class names.
-	    ClassDoc scheduledClassContext=scheduledClassesArr[i].contextClass;
+            // The name of the class we are looking for. This name
+            // needs not be fully qualified.
 
-	    // If there already is a class doc with this name, skip. There's
-	    // nothing to do for us.
-	    if (classDocMap.get(scheduledClassName)!=null) {
-	       continue;
-	    }
+            String scheduledClassName=scheduledClassesArr[i].qualifiedName;
 
-	    try {
-	       // Try to load the class
+            // The ClassDoc in whose context the scheduled class was looked for.
+            // This is necessary in order to resolve non-fully qualified
+            // class names.
+            ClassDoc scheduledClassContext=scheduledClassesArr[i].contextClass;
+
+            // If there already is a class doc with this name, skip. There's
+            // nothing to do for us.
+            if (classDocMap.get(scheduledClassName)!=null) {
+               continue;
+            }
+
+            try {
+               // Try to load the class
                //printNotice("Trying to load " + scheduledClassName);
-	       loadScheduledClass(parser, scheduledClassName, scheduledClassContext);
-	    }
-	    catch (ParseException e) {
+               loadScheduledClass(parser, scheduledClassName, scheduledClassContext);
+            }
+            catch (ParseException e) {
 
-	       /**********************************************************
+               /**********************************************************
 
                // Check whether the following is necessary at all.
 
 
-	       if (scheduledClassName.indexOf('.')>0) {
+               if (scheduledClassName.indexOf('.')>0) {
 
-	       // Maybe the dotted notation doesn't mean a package
-	       // name but instead an inner class, as in 'Outer.Inner'.
-	       // so let's assume this and try to load the outer class.
+               // Maybe the dotted notation doesn't mean a package
+               // name but instead an inner class, as in 'Outer.Inner'.
+               // so let's assume this and try to load the outer class.
 
-		  String outerClass="";
-		  for (StringTokenizer st=new StringTokenizer(scheduledClassName,"."); st.hasMoreTokens(); ) {
-		     if (outerClass.length()>0) outerClass+=".";
-		     outerClass+=st.nextToken();
-		     if (!st.hasMoreTokens()) break;
-		     try {
-			loadClass(outerClass);
-			//FIXME: shouldn't this be loadScheduledClass(outerClass, scheduledClassContext); ???
-			continue;
-		     }
-		     catch (Exception ee) {
-		     // Ignore: try next level
-		     }
-		  }
-	       }
+                  String outerClass="";
+                  for (StringTokenizer st=new StringTokenizer(scheduledClassName,"."); st.hasMoreTokens(); ) {
+                     if (outerClass.length()>0) outerClass+=".";
+                     outerClass+=st.nextToken();
+                     if (!st.hasMoreTokens()) break;
+                     try {
+                        loadClass(outerClass);
+                        //FIXME: shouldn't this be loadScheduledClass(outerClass, scheduledClassContext); ???
+                        continue;
+                     }
+                     catch (Exception ee) {
+                     // Ignore: try next level
+                     }
+                  }
+               }
 
-	       **********************************************************/
+               **********************************************************/
 
-	       // If we arrive here, the class could not be found
+               // If we arrive here, the class could not be found
 
-	       printWarning("Couldn't load class "+scheduledClassName+" referenced by "+scheduledClassContext);
+               printWarning("Couldn't load class "+scheduledClassName+" referenced by "+scheduledClassContext);
 
-	       //FIXME: shouldn't this be throw new Error("cannot load: "+scheduledClassName);
-	    }
-	 }
+               //FIXME: shouldn't this be throw new Error("cannot load: "+scheduledClassName);
+            }
+         }
       }
    }
 
@@ -611,7 +611,7 @@ public class RootDocImpl
 
       if (loadedClass==null || loadedClass instanceof ClassDocProxy) {
 
-	 ClassDoc classDoc = findScheduledClassFile(scheduledClassName, scheduledClassContext);
+         ClassDoc classDoc = findScheduledClassFile(scheduledClassName, scheduledClassContext);
          if (null != classDoc) {
 
             if (classDoc instanceof ClassDocReflectedImpl) {
@@ -619,58 +619,58 @@ public class RootDocImpl
             }
 
             if (Main.DESCEND_SUPERCLASS
-                && null != classDoc.superclass() 
+                && null != classDoc.superclass()
                 && (classDoc.superclass() instanceof ClassDocProxy)) {
                scheduleClass(classDoc, classDoc.superclass().qualifiedName());
             }
          }
          else {
-	    // It might be an inner class of one of the outer/super classes.
-	    // But we can only check that when they are all fully loaded.
-	    boolean retryLater = false;
+            // It might be an inner class of one of the outer/super classes.
+            // But we can only check that when they are all fully loaded.
+            boolean retryLater = false;
 
-	    int numberOfProcessedFilesBefore = parser.getNumberOfProcessedFiles();
+            int numberOfProcessedFilesBefore = parser.getNumberOfProcessedFiles();
 
-	    ClassDoc cc = scheduledClassContext.containingClass();
-	    while (cc != null && !retryLater) {
-	       ClassDoc sc = cc.superclass();
-	       while (sc != null && !retryLater) {
-		  if (sc instanceof ClassDocProxy) {
-		     ((ClassDocImpl)cc).resolve();
-		     retryLater = true;
-		  }
-		  sc = sc.superclass();
-	       }
-	       cc = cc.containingClass();
-	    }
+            ClassDoc cc = scheduledClassContext.containingClass();
+            while (cc != null && !retryLater) {
+               ClassDoc sc = cc.superclass();
+               while (sc != null && !retryLater) {
+                  if (sc instanceof ClassDocProxy) {
+                     ((ClassDocImpl)cc).resolve();
+                     retryLater = true;
+                  }
+                  sc = sc.superclass();
+               }
+               cc = cc.containingClass();
+            }
 
-	    // Now that outer/super references have been resolved, try again
-	    // to find the class.
+            // Now that outer/super references have been resolved, try again
+            // to find the class.
 
-	    loadedClass = (ClassDoc)scheduledClassContext.findClass(scheduledClassName);
+            loadedClass = (ClassDoc)scheduledClassContext.findClass(scheduledClassName);
 
-	    int numberOfProcessedFilesAfter = parser.getNumberOfProcessedFiles();
+            int numberOfProcessedFilesAfter = parser.getNumberOfProcessedFiles();
 
-	    boolean filesWereProcessed = numberOfProcessedFilesAfter > numberOfProcessedFilesBefore;
+            boolean filesWereProcessed = numberOfProcessedFilesAfter > numberOfProcessedFilesBefore;
 
-	    // Only re-schedule class if additional files have been processed
-	    // If there haven't, there's no point in re-scheduling.
-	    // Will avoid infinite loops of re-scheduling
-	    if (null == loadedClass && retryLater && filesWereProcessed)
-	       scheduleClass(scheduledClassContext, scheduledClassName);
+            // Only re-schedule class if additional files have been processed
+            // If there haven't, there's no point in re-scheduling.
+            // Will avoid infinite loops of re-scheduling
+            if (null == loadedClass && retryLater && filesWereProcessed)
+               scheduleClass(scheduledClassContext, scheduledClassName);
 
-	    /* A warning needn't be emitted - this is normal, can happen
-	       if the scheduled class is in a package which is not
-	       included on the command line.
+            /* A warning needn't be emitted - this is normal, can happen
+               if the scheduled class is in a package which is not
+               included on the command line.
 
-	       else if (null == loadedClass)
-	       printWarning("Can't find scheduled class '"
-	       + scheduledClassName
-	       + "' in context '"
-	       + scheduledClassContext.qualifiedName()
-	       + "'");
-	    */
-	 }
+               else if (null == loadedClass)
+               printWarning("Can't find scheduled class '"
+               + scheduledClassName
+               + "' in context '"
+               + scheduledClassContext.qualifiedName()
+               + "'");
+            */
+         }
       }
    }
 
@@ -706,9 +706,9 @@ public class RootDocImpl
 
       public String match(String name)
       {
-	 if ((name.equals(this.name)) || (importSpecifier.equals(name)))
-	    return this.name;
-	 // FIXME: note that we don't handle on-demand imports here.
+         if ((name.equals(this.name)) || (importSpecifier.equals(name)))
+            return this.name;
+         // FIXME: note that we don't handle on-demand imports here.
          return null;
       }
 
@@ -761,7 +761,7 @@ public class RootDocImpl
                innerClassName = topLevelName.substring(ndx + 1);
                topLevelName = topLevelName.substring(0, ndx);
             }
-            
+
             if (topLevelClassNames.contains(topLevelName)) {
                //System.err.println(this + ".match returns " + packageName + "." + name);
                return packageName + "." + name;
@@ -828,7 +828,7 @@ public class RootDocImpl
    {
       StringTokenizer st = new StringTokenizer(innerClassName, ".");
    outer:
-      
+
       while (st.hasMoreTokens()) {
          String innerClassNameComponent = st.nextToken();
          ClassDoc[] innerClasses = topLevelClass.innerClasses();
@@ -934,7 +934,7 @@ public class RootDocImpl
          }
       }
    }
-   
+
    private class ResolvedImportReflectionClass
       implements ResolvedImport
    {
@@ -1060,7 +1060,7 @@ public class RootDocImpl
          importedPackageOrClass = importedPackageOrClass.substring(0, importedPackageOrClass.length() - 2);
 
          return new ResolvedImportReflectionPackage(importedPackageOrClass);
-         
+
          //return null;
       }
       else {
@@ -1086,7 +1086,7 @@ public class RootDocImpl
       String longestUnlocatablePrefix = "";
 
       for (Iterator it=sourcePath.iterator(); it.hasNext(); ) {
-            
+
          File _sourcePath = (File)it.next();
 
          StringBuffer packageOrClassPrefix = new StringBuffer();
@@ -1094,7 +1094,7 @@ public class RootDocImpl
          while (st.hasMoreTokens() && _sourcePath.isDirectory()) {
             String token = st.nextToken();
             if ("*".equals(token)) {
-               return new ResolvedImportPackageFile(_sourcePath, 
+               return new ResolvedImportPackageFile(_sourcePath,
                                                     packageOrClassPrefix.substring(0, packageOrClassPrefix.length() - 1));
             }
             else {
@@ -1136,7 +1136,7 @@ public class RootDocImpl
 
    private ResolvedImport getResolvedImport(String importSpecifier)
    {
-      ResolvedImport result 
+      ResolvedImport result
          = (ResolvedImport)resolvedImportCache.get(importSpecifier);
       if (null == result) {
          result = resolveImport(importSpecifier);
@@ -1160,9 +1160,9 @@ public class RootDocImpl
       return className;
    }
 
-   public ClassDoc findScheduledClassFile(String scheduledClassName, 
+   public ClassDoc findScheduledClassFile(String scheduledClassName,
                                           ClassDoc scheduledClassContext)
-      throws ParseException, IOException 
+      throws ParseException, IOException
    {
       String resolvedScheduledClassName = null;
 
@@ -1295,7 +1295,7 @@ public class RootDocImpl
       super(null);
    }
 
-   public static String readHtmlBody(File file) 
+   public static String readHtmlBody(File file)
       throws IOException
    {
       FileReader fr=new FileReader(file);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java
index 971cdef5285..12e2256dcdd 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SeeTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -70,8 +70,8 @@ public class SeeTagImpl extends AbstractTagImpl implements SeeTag {
 
       int labelNdx=text.indexOf(';');
       if (labelNdx>=0) {
-	 label="";
-	 return;
+         label="";
+         return;
       }
 
       for (int i=0; i<text.length(); ++i) {
@@ -90,37 +90,37 @@ public class SeeTagImpl extends AbstractTagImpl implements SeeTag {
       }
 
       if (labelNdx<0 || labelNdx>=text.length()) {
-	 reference=text.trim();
-	 label="";
+         reference=text.trim();
+         label="";
       }
       else {
-	 reference=text.substring(0,labelNdx).trim();
-	 label=text.substring(labelNdx).trim();
-      }  
+         reference=text.substring(0,labelNdx).trim();
+         label=text.substring(labelNdx).trim();
+      }
 
       int mspecNdx=reference.indexOf('#');
       String referencedFqName;
       if (mspecNdx<0) {
-	 referencedFqName=reference;
+         referencedFqName=reference;
       }
       else {
-	 referencedFqName=reference.substring(0,mspecNdx);
-	 referencedMemberName=reference.substring(mspecNdx+1); 
+         referencedFqName=reference.substring(0,mspecNdx);
+         referencedMemberName=reference.substring(mspecNdx+1);
      }
 
       // the following is in contradiction to the api docs, but
       // conform to sun javadoc: return fully qualified classname
       // with referencedClassName().
       if (referencedFqName.trim().length()>0) {
-	 referencedClassName=referencedFqName;
-	 if (contextClass==null)
-	    referencedClass=Main.getRootDoc().classNamed(referencedFqName);
-	 else
-	    referencedClass=contextClass.findClass(referencedFqName);
+         referencedClassName=referencedFqName;
+         if (contextClass==null)
+            referencedClass=Main.getRootDoc().classNamed(referencedFqName);
+         else
+            referencedClass=contextClass.findClass(referencedFqName);
       }
       else {
-	 referencedClassName="";
-	 referencedClass=contextClass;
+         referencedClassName="";
+         referencedClass=contextClass;
       }
 
       if (referencedClass==null) {
@@ -130,13 +130,13 @@ public class SeeTagImpl extends AbstractTagImpl implements SeeTag {
       if (referencedClass!=null && !referencedClass.isIncluded()) referencedClass=null;
 
       if (referencedClass!=null) {
-	 referencedPackage=referencedClass.containingPackage();
-	 referencedClassName=referencedClass.qualifiedName();
+         referencedPackage=referencedClass.containingPackage();
+         referencedClassName=referencedClass.qualifiedName();
 
-	 if (referencedMemberName!=null) {
+         if (referencedMemberName!=null) {
 
-	    if (referencedMemberName.indexOf('(')<0) {
-	       referencedMember=((ClassDocImpl)referencedClass).findFieldRec(referencedMemberName);
+            if (referencedMemberName.indexOf('(')<0) {
+               referencedMember=((ClassDocImpl)referencedClass).findFieldRec(referencedMemberName);
                if (null == referencedMember) {
                   MethodDoc[] methods = ((ClassDocImpl)referencedClass).methods();
                   for (int i=0; i<methods.length; ++i) {
@@ -156,19 +156,19 @@ public class SeeTagImpl extends AbstractTagImpl implements SeeTag {
                else {
                   referencedClass = referencedMember.containingClass();
                }
-	    }
-	    else {
-	       referencedMember=((ClassDocImpl)referencedClass).findExecutableRec(referencedMemberName);
+            }
+            else {
+               referencedMember=((ClassDocImpl)referencedClass).findExecutableRec(referencedMemberName);
                if (referencedMember==null) {
                   //System.err.println("cannot find member for '"+referencedMemberName+"'");
                   referencedClass = null;
                }
-	    }
-	 }
+            }
+         }
       }
       /*
       else {
-	 System.err.println("class not found: '"+referencedFqName + "' in context class " + contextClass + " in " + this);
+         System.err.println("class not found: '"+referencedFqName + "' in context class " + contextClass + " in " + this);
       }
       */
    }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
index a4408fc76ae..0ecfe637cd0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SerialFieldTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,8 +49,8 @@ public class SerialFieldTagImpl extends AbstractTagImpl implements SerialFieldTa
    private ClassDoc     fieldTypeDoc;
    private ClassDocImpl contextClass;
 
-   public SerialFieldTagImpl(String text, 
-                             ClassDocImpl contextClass, 
+   public SerialFieldTagImpl(String text,
+                             ClassDocImpl contextClass,
                              MemberDocImpl contextMember) {
       super(text);
       this.contextClass=contextClass;
@@ -65,22 +65,22 @@ public class SerialFieldTagImpl extends AbstractTagImpl implements SerialFieldTa
       int state=1;
       char[] textArr=text.toCharArray();
       for (int i=0; i<textArr.length; ++i) {
-	 char c=textArr[i];
-	 switch (state) {
-	 case 1:
-	    if (Parser.isWhitespace(c)) state=2;
-	    else fieldName+=c;
-	    break;
-	 case 2:
-	    if (Parser.isWhitespace(c)) state=3;
-	    else fieldType+=c;
-	    break;
-	 case 3:
-	    description+=c;
-	    break;
-	 }
+         char c=textArr[i];
+         switch (state) {
+         case 1:
+            if (Parser.isWhitespace(c)) state=2;
+            else fieldName+=c;
+            break;
+         case 2:
+            if (Parser.isWhitespace(c)) state=3;
+            else fieldType+=c;
+            break;
+         case 3:
+            description+=c;
+            break;
+         }
       }
-      
+
       setBody(description, contextClass, contextMember);
 
    }
@@ -89,11 +89,11 @@ public class SerialFieldTagImpl extends AbstractTagImpl implements SerialFieldTa
 
       super.resolve();
       try {
-	  Type type=contextClass.typeForString(fieldType);
-	  this.fieldTypeDoc=type.asClassDoc();
+          Type type=contextClass.typeForString(fieldType);
+          this.fieldTypeDoc=type.asClassDoc();
       } catch (ParseException e) {
-	  System.err.println("FIXME: add try-catch to force compilation"
-			     + e);
+          System.err.println("FIXME: add try-catch to force compilation"
+                             + e);
       }
    }
 
@@ -119,10 +119,10 @@ public class SerialFieldTagImpl extends AbstractTagImpl implements SerialFieldTa
 
    public int compareTo(Object o) {
       if (o!=null && o instanceof SerialFieldTagImpl) {
-	 return fieldName().compareTo(((SerialFieldTagImpl)o).fieldName());
+         return fieldName().compareTo(((SerialFieldTagImpl)o).fieldName());
       }
       else {
-	 return 0;
+         return 0;
       }
    }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java
index 93f487912f1..e2d73bbd543 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/SourcePositionImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -41,7 +41,7 @@ import com.sun.javadoc.SourcePosition;
 
 import java.io.File;
 
-public class SourcePositionImpl 
+public class SourcePositionImpl
    implements SourcePosition
 {
    private File file;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java
index d3e243ede98..1b9bc40d939 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagContainer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java
index d51ce239adf..a4b1f4b2a6f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java
index f062b2a8dcc..0333ee2b7e5 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TemporaryStore.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -88,7 +88,7 @@ package gnu.classpath.tools.gjdoc;
  *  When control flow is transferred to <code>bar()</code>,
  *  <code>foo()</code> will hold no more references to the array
  *  and so it can be garbage collected in <code>bar()</code>.
- * 
+ *
  */
 public class TemporaryStore {
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java
index f8f19630aad..812fd2fdee6 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TextTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java
index b48236af016..e4e7bbfcb6c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ThrowsTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -47,7 +47,7 @@ public class ThrowsTagImpl extends AbstractTagImpl implements ThrowsTag {
    private String exceptionName;
    private String exceptionComment;
 
-   public ThrowsTagImpl(String text, 
+   public ThrowsTagImpl(String text,
                         ClassDocImpl contextClass,
                         MemberDocImpl contextMember) {
       super(text);
@@ -55,14 +55,14 @@ public class ThrowsTagImpl extends AbstractTagImpl implements ThrowsTag {
       char[] textarr=text.toCharArray();
       int i=0;
       for (; i<textarr.length; ++i) {
-	 if (!Parser.isWhitespace(textarr[i])) break;
+         if (!Parser.isWhitespace(textarr[i])) break;
       }
       for (; i<textarr.length; ++i) {
-	 if (Parser.isWhitespace(textarr[i])) {
-	    this.exceptionName=new String(textarr,0,i).trim();
-	    this.exceptionComment=new String(textarr,i,textarr.length-i).trim();
-	    break;
-	 }
+         if (Parser.isWhitespace(textarr[i])) {
+            this.exceptionName=new String(textarr,0,i).trim();
+            this.exceptionComment=new String(textarr,i,textarr.length-i).trim();
+            break;
+         }
       }
       if (null != exceptionName) {
          if (contextClass==null) {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java
index bd866b3c1b8..93404d08ea8 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/Timer.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -46,21 +46,21 @@ public class Timer {
 
    static void shutdown() {
       try{
-	 if (stopTime==0) return;
-	 PrintWriter pw=new PrintWriter(new FileWriter("timer.out"));
-	 pw.println("Preparation (driver) took "+(((double)(beforeDocletTime-startTime))/1000.)+" s");
-	 pw.println("Generation (doclet) took "+(((double)(stopTime-beforeDocletTime))/1000.)+" s");
-	 pw.println("");
-	 pw.println("Memory used for documentation tree: "+(memoryUsed/(1024*1024))+" MB");
-	 pw.println("Max. heap used for driver: "+((maxDriverHeap<0)?"N/A":((maxDriverHeap/(1024*1024))+" MB")));
-	 pw.println("Max. heap used for doclet: "+((maxDocletHeap<0)?"N/A":((maxDocletHeap/(1024*1024))+" MB")));
-	 pw.println("");
-	 pw.println("TOTAL TIME: "+(((double)(stopTime-startTime))/1000.)+" s");
-	 pw.println("TOTAL HEAP: "+((maxDocletHeap<0)?"N/A":(Math.max(maxDocletHeap,maxDriverHeap)/(1024*1024))+" MB"));
-	 pw.close();
+         if (stopTime==0) return;
+         PrintWriter pw=new PrintWriter(new FileWriter("timer.out"));
+         pw.println("Preparation (driver) took "+(((double)(beforeDocletTime-startTime))/1000.)+" s");
+         pw.println("Generation (doclet) took "+(((double)(stopTime-beforeDocletTime))/1000.)+" s");
+         pw.println("");
+         pw.println("Memory used for documentation tree: "+(memoryUsed/(1024*1024))+" MB");
+         pw.println("Max. heap used for driver: "+((maxDriverHeap<0)?"N/A":((maxDriverHeap/(1024*1024))+" MB")));
+         pw.println("Max. heap used for doclet: "+((maxDocletHeap<0)?"N/A":((maxDocletHeap/(1024*1024))+" MB")));
+         pw.println("");
+         pw.println("TOTAL TIME: "+(((double)(stopTime-startTime))/1000.)+" s");
+         pw.println("TOTAL HEAP: "+((maxDocletHeap<0)?"N/A":(Math.max(maxDocletHeap,maxDriverHeap)/(1024*1024))+" MB"));
+         pw.close();
       }
       catch (IOException e) {
-	 e.printStackTrace();
+         e.printStackTrace();
       }
    }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java
index 7d364a17210..c2c3c3edf28 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TimerDoclet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -44,31 +44,31 @@ public class TimerDoclet {
    private static Object doclet = null;
 
    private static long maximumHeap = -1;
-   
+
    private static Thread memThread;
 
    private static boolean runMemThread = true;
 
    private static void init() throws Exception {
       if (doclet==null) {
-	 doclet=Class.forName("com.sun.tools.doclets.standard.Standard").newInstance();
-	 memThread=new Thread() {
-	       
-	       public void run() {
-		  while (runMemThread) {
-		     synchronized (TimerDoclet.class) {
-			TimerDoclet.maximumHeap=Math.max(TimerDoclet.maximumHeap,
-							 Runtime.getRuntime().totalMemory()-Runtime.getRuntime().freeMemory());
-		     }
-		     try { Thread.sleep(50); } catch (Exception e) {}
-		  }
-	       }
-	    };
-	 //memThread.start();
+         doclet=Class.forName("com.sun.tools.doclets.standard.Standard").newInstance();
+         memThread=new Thread() {
+
+               public void run() {
+                  while (runMemThread) {
+                     synchronized (TimerDoclet.class) {
+                        TimerDoclet.maximumHeap=Math.max(TimerDoclet.maximumHeap,
+                                                         Runtime.getRuntime().totalMemory()-Runtime.getRuntime().freeMemory());
+                     }
+                     try { Thread.sleep(50); } catch (Exception e) {}
+                  }
+               }
+            };
+         //memThread.start();
       }
    }
 
-   public static boolean validOptions(String[][] options, DocErrorReporter reporter)  
+   public static boolean validOptions(String[][] options, DocErrorReporter reporter)
       throws Exception {
 
       init();
@@ -84,19 +84,19 @@ public class TimerDoclet {
    public static boolean start(RootDoc root) throws Exception {
       Timer.setBeforeDocletTime();
       synchronized (TimerDoclet.class) {
-	 Timer.setMaxDriverHeap(maximumHeap);
-	 maximumHeap=-1;
+         Timer.setMaxDriverHeap(maximumHeap);
+         maximumHeap=-1;
       }
       //new com.sun.tools.doclets.standard.Standard().validOptions(root.options(), root);
       //new com.sun.tools.doclets.standard.Standard().start(root);
-      
+
       if (validOptions(root.options(), root)) {
-	 doclet.getClass().getMethod("start", new Class[]{RootDoc.class}).invoke(null, new Object[]{root});
+         doclet.getClass().getMethod("start", new Class[]{RootDoc.class}).invoke(null, new Object[]{root});
       }
       runMemThread=false;
       Timer.setStopTime();
       synchronized (TimerDoclet.class) {
-	 Timer.setMaxDocletHeap(maximumHeap);
+         Timer.setMaxDocletHeap(maximumHeap);
       }
       Timer.shutdown();
       return true;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java
index a0b4cf0d2ca..8c1bd5a0d1a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -61,13 +61,13 @@ public class TypeImpl implements Type, WritableType {
    public ClassDoc asClassDoc() {
 
       if (this instanceof ClassDoc)
-	 return ((ClassDocImpl)(ClassDoc)this).getBaseClassDoc();
+         return ((ClassDocImpl)(ClassDoc)this).getBaseClassDoc();
       else
-	 return null;
+         return null;
    }
 
    public String typeName() { return typeName; }
-   
+
    public String qualifiedTypeName() { return (packageName!=null)?(packageName+"."+typeName):(typeName); }
 
    public String dimension() { return dimension; }
@@ -98,7 +98,7 @@ public class TypeImpl implements Type, WritableType {
       primitiveNames = Collections.unmodifiableSet(_primitiveNames);
    }
 
-  public TypeVariable asTypeVariable() 
+  public TypeVariable asTypeVariable()
   {
     if (this instanceof TypeVariable)
       return (TypeVariable) this;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java
index 097b1ff869b..08a2366838f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/TypeVariableImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -43,9 +43,9 @@ import com.sun.javadoc.TypeVariable;
 
 import java.util.List;
 
-public class TypeVariableImpl 
+public class TypeVariableImpl
   extends TypeImpl
-  implements TypeVariable, WritableType 
+  implements TypeVariable, WritableType
 {
 
   /**
@@ -67,7 +67,7 @@ public class TypeVariableImpl
    * @param owner the owning program element of the type variable.
    */
   TypeVariableImpl(String packageName, String typeName, String dimension,
-		   ProgramElementDoc owner) 
+                   ProgramElementDoc owner)
   {
     super(packageName, typeName, dimension);
     this.owner = owner;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java
index 14381dff537..024594c6a7c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/ValueTagImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java
index 00f599bb2c2..39cfb3f258f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/WritableType.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java
index ed2cb24bac8..82502c431f2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AdditionExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -73,7 +73,7 @@ class AdditionExpression
 
       if (Type.STRING == leftValue.getType()
           || Type.STRING == rightValue.getType()) {
-         
+
          return new ConstantString(leftValue.asObject().toString()
                                    + rightValue.asObject().toString());
       }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java
index 6411cdac70c..ac807728b0f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/AndExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java
index 90ae8920387..3c44ce7d86a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryBitwiseExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java
index 519ab828730..15d016e1f42 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryComputationExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java
index 7b3312e9192..1b37c233af7 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryEqualityExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java
index 28ba32f0123..557b514c735 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java
index 7314fa9bca7..7fa51869cc1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryLogicalExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java
index c7fbee838e2..f6ef45cf5fb 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryRelationExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java
index 17129e25555..32ccea20947 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BinaryShiftExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java
index 27ed3b308c5..eca1a52579e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/BitShiftRightExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java
index 008cee64a2b..a9bfacc8959 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/CircularExpressionException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java
index c01dc6a407b..d9532efb04e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConditionalExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -43,7 +43,7 @@ class ConditionalExpression
    private Expression condition;
    private Expression ifTrue;
    private Expression ifFalse;
-   
+
    ConditionalExpression(Expression condition, Expression ifTrue, Expression ifFalse)
    {
       this.condition = condition;
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java
index 4119dd9d10a..83faf1f2008 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantBoolean.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java
index ccdeed99547..e206e567fa0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantByte.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java
index a6dfef16935..3cbeac12615 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantChar.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -52,7 +52,7 @@ class ConstantChar
          case 'f': value = '\f'; break;
          case 'r': value = '\r'; break;
          case 'b': value = '\b'; break;
-         case 'u': 
+         case 'u':
             {
                String stringVal = stringValue.substring(3, stringValue.length() - 1);
                /*
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java
index 1b8e35a7fce..5faa5a17b04 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantDouble.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java
index 78f8590c10d..93923e6aec2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java
index 0735ff64139..46895500dd2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantFloat.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java
index 667eb615a93..10804a69590 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantInteger.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java
index c6828f4ec18..a0a2f4b8055 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantLong.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java
index e5b1e2532c3..c27b10b8a9b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantNull.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java
index ef9f76e8790..5f4f00e1cb6 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantShort.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java
index ba24cc39230..4e9ecdee1a3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ConstantString.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -72,4 +72,3 @@ class ConstantString
       return value;
    }
 }
-
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java
index f22dffb366d..f6d1ebc10c2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Context.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java
index caa9ae907ff..85206d4fb7e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/DivisionExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java
index 18639adda43..d7385fd7c77 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EqualExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
index e1d089f235e..d12da3519b1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Evaluator.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -67,7 +67,7 @@ public class Evaluator
     *  invalid, uses unsupported syntax constructs (e.g. method calls,
     *  array access) or references unknown static fields.
     */
-   public static Object evaluate(String expression, 
+   public static Object evaluate(String expression,
                                  Set visitedFields,
                                  EvaluatorEnvironment environment)
       throws IllegalExpressionException
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
index 0f51f90dbb7..cf4df8938b4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/EvaluatorEnvironment.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java
index 1d4b0fbb72d..eb992fc2879 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ExclusiveOrExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java
index 6a0f3dc20cd..ca1ccc645a0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Expression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java
index 6594b49678e..995f7ae80a0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java
index 51f3cd22d59..4e7ca4a0164 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/GreaterThanOrEqualExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java
index 2d8df5ea734..8d254927cdb 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IdentifierExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java
index 315265e93d5..65cd5da1149 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/IllegalExpressionException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java
index 7a3d69e5b6d..2b025013353 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/InclusiveOrExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java
index dbddecb4143..4e784cdcc29 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java
index 9ba697c0be9..803ad5ee3f6 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LessThanOrEqualExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java
index b78315ed2f4..3b0409155d1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalAndExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java
index dc85eb65c47..4c7bf70f709 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalNotExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java
index 181bb68e276..625a6e5e839 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/LogicalOrExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java
index 6375b163dfd..6aca379dc53 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ModuloExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java
index 6108a97bf39..3d3071a5063 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/MultiplicationExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java
index 6cdb0c9cce0..5b66fecd217 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NegateExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java
index c7db2550d5b..eb49bc08730 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotEqualExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java
index 41bb0fc2be0..7359a055a95 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/NotExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java
index 132cd35f46c..ad72efbfb2c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftLeftExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java
index bebd0ce5170..f9d7820bbbf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/ShiftRightExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java
index 8f9def918d0..dc0101ffc5c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/SubtractionExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java
index 55c8b996594..92382c41a70 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/Type.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java
index 46f0cc5346c..c434ae870be 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/TypeCastExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java
index 9a912b95591..33befcb8488 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnaryExpression.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java
index 9eedd66172f..894a717168c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/UnknownIdentifierException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java
index 6ffce18ac05..be8d2a16ffd 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java
@@ -146,7 +146,7 @@ public class Creator
       {
         if (filename.charAt(filename.length() - 1) != '/')
           filename += '/';
-	writeFile(isDirectory, null, filename, verbose);
+        writeFile(isDirectory, null, filename, verbose);
       }
     else
       {
@@ -218,11 +218,11 @@ public class Creator
      * as Sun's jar tool */
     if (parameters.wantManifest)
       {
-	  Attributes attr = manifest.getMainAttributes();
-	  if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
-	      attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
-	  attr.putValue("Created-By", System.getProperty("java.version") +
-		  " (" + System.getProperty("java.vendor") + ")");
+          Attributes attr = manifest.getMainAttributes();
+          if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
+              attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
+          attr.putValue("Created-By", System.getProperty("java.version") +
+                  " (" + System.getProperty("java.vendor") + ")");
       }
     outputStream = new JarOutputStream(os, manifest);
     // FIXME: this sets the method too late for the manifest file.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java
index 217b64405a6..ae79b26e967 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Indexer.java
@@ -89,7 +89,7 @@ public class Indexer
         result.append(fileName);
         // Any line ending will do.
         result.append('\n');
-	for (String s : entries)
+        for (String s : entries)
           {
             result.append(s);
             result.append('\n');
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
index e5f1a3fb1e9..34ef928fe05 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Main.java
@@ -238,7 +238,7 @@ public class Main
     {
       public void parsed(String argument) throws OptionException
       {
-	readNamesFromStdin = true;
+        readNamesFromStdin = true;
       }
     });
     p.add(grp);
@@ -251,14 +251,14 @@ public class Main
     String line;
     try
       {
-	BufferedReader br
-	  = new BufferedReader(new InputStreamReader(System.in));
-	while ((line = br.readLine()) != null)
-	  entries.add(new Entry(new File(line)));
+        BufferedReader br
+          = new BufferedReader(new InputStreamReader(System.in));
+        while ((line = br.readLine()) != null)
+          entries.add(new Entry(new File(line)));
       }
     catch (IOException _)
       {
-	// Ignore.
+        // Ignore.
       }
   }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java
index f25d56fdc7d..e1df852ff69 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java
@@ -72,7 +72,7 @@ public class Updater
 
     // Write all the new entries to a temporary file.
     File tmpFile = File.createTempFile("jarcopy", null,
-				       parameters.archiveFile.getParentFile());
+                                       parameters.archiveFile.getParentFile());
     OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
     writeCommandLineEntries(parameters, os);
 
@@ -90,8 +90,8 @@ public class Updater
     close();
     if (!tmpFile.renameTo(parameters.archiveFile))
       {
-	  throw new IOException("Couldn't rename new JAR file " + tmpFile +
-				"to " + parameters.archiveFile);
+          throw new IOException("Couldn't rename new JAR file " + tmpFile +
+                                "to " + parameters.archiveFile);
       }
   }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java
index 8847441fa4e..b920d74c128 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/JarVerifier.java
@@ -243,7 +243,7 @@ public class JarVerifier
    * <p>
    * This method, uses the contents of the corresponding <code>.SF</code> file
    * to compute and verify the hashes of the manifest entries in the JAR file.
-   * 
+   *
    * @param alias the name of the signature file; i.e. the name to use for both
    *          the .SF and .DSA files.
    * @return <code>true</code> if all the entries in the corresponding
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java
index cea521c7e38..c7fb5856a2c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/Main.java
@@ -166,7 +166,7 @@ public class Main
   /**
    * Read the command line arguments setting the tool's parameters in
    * preparation for the user desired action.
-   * 
+   *
    * @param args an array of options (strings).
    * @throws Exception if an exception occurs during the process.
    */
@@ -223,7 +223,7 @@ public class Main
    * <p>
    * Depending on the result of processing the command line arguments, this
    * handler may be one for signing the jar, or verifying it.
-   * 
+   *
    * @throws Exception if an exception occurs during the process.
    */
   private void start() throws Exception
@@ -271,7 +271,7 @@ public class Main
    * <p>
    * Common parameters are those which are allowed in both signing and
    * verification modes.
-   * 
+   *
    * @throws InstantiationException if a security provider class name is
    *           specified but that class name is that of either an interface or
    *           an abstract class.
@@ -342,7 +342,7 @@ public class Main
    * After processing the command line arguments, this method is invoked to
    * process the parameters which may have been encountered among the actual
    * arguments, and which are specific to the signing action of the tool.
-   * 
+   *
    * @throws KeyStoreException if no implementation of the designated (or
    *           default type) of a key store is availabe.
    * @throws IOException if an I/O related exception occurs during the process.
@@ -524,7 +524,7 @@ public class Main
    * If no installed providers were found, this method falls back on the GNU
    * provider, by-passing the Security search mechanism. The default console
    * callback handler implementation is {@link ConsoleCallbackHandler}.
-   * 
+   *
    * @return a console-based {@link CallbackHandler}.
    */
   protected CallbackHandler getCallbackHandler()
diff --git a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java
index dc0f1993789..9e4882f0e43 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jarsigner/SFHelper.java
@@ -122,7 +122,7 @@ public class SFHelper
    * Writes the contents of the <code>.SF</code> file to the designated JAR
    * output stream. Line-endings are platform-independent and consist of the
    * 2-codepoint sequence <code>0x0D</code> and <code>0x0A</code>.
-   * 
+   *
    * @param jar the JAR output stream to write a <code>.SF</code> file to.
    * @throws IOException if an I/O related exception occurs during the process.
    */
@@ -153,7 +153,7 @@ public class SFHelper
    *   contentType     ContentType,
    *   content     [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL
    * }
-   * 
+   *
    * ContentType ::= OBJECT IDENTIFIER
    * </pre>
    * <p>
@@ -171,9 +171,9 @@ public class SFHelper
    *   crls         [1] IMPLICIT CertificateRevocationLists OPTIONAL,
    *   signerInfos      SignerInfos
    * }
-   * 
+   *
    * DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
-   * 
+   *
    * SignerInfos ::= SET OF SignerInfo
    * </pre>
    * <p>
@@ -189,18 +189,18 @@ public class SFHelper
    *   encryptedDigest               EncryptedDigest,
    *   unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL
    * }
-   * 
+   *
    * EncryptedDigest ::= OCTET STRING
    * </pre>
-   * 
+   *
    * @param jar the JAR output stream to write a <code>.DSA</code> file to.
    * @param signerKey the private key to sign with.
    * @param certificates the possibly null signer certificate chain.
    * @param internalSF if <code>true</code> then include the .SF file contents
-   * in the signed .DSA file; otherwise don't. 
+   * in the signed .DSA file; otherwise don't.
    * @throws IOException if an I/O related exception occurs during the process.
-   * @throws CRLException 
-   * @throws CertificateEncodingException 
+   * @throws CRLException
+   * @throws CertificateEncodingException
    */
   void writeDSA(JarOutputStream jar, PrivateKey signerKey,
                 Certificate[] certificates, boolean internalSF)
@@ -335,7 +335,7 @@ public class SFHelper
   {
     if (this.state != STARTED)
       throw new IllegalStateException(Messages.getString("SFHelper.10")); //$NON-NLS-1$
-      
+
     String name = entry.getName();
     InputStream jeis = jar.getInputStream(entry);
     String hash = util.hashStream(jeis);
@@ -396,7 +396,7 @@ public class SFHelper
   /**
    * Given an X.509 certificate this method returns the string representation of
    * the Issuer Distinguished Name.
-   * 
+   *
    * @param cert an X.509 certificate.
    * @return the string representation of the Issuer's DN.
    */
@@ -424,7 +424,7 @@ public class SFHelper
   /**
    * Given an X.509 certificate this method returns the string representation of
    * the Subject Distinguished Name.
-   * 
+   *
    * @param cert an X.509 certificate.
    * @return the string representation of the Subject's DN.
    */
@@ -450,9 +450,9 @@ public class SFHelper
   }
 
   /**
-   * Given an X.509 certificate this method returns the end validity date of 
+   * Given an X.509 certificate this method returns the end validity date of
    * this certificate.
-   * 
+   *
    * @param cert an X.509 certificate.
    * @return the date when this certificate stops being valid.
    */
@@ -472,7 +472,7 @@ public class SFHelper
   /**
    * Given an X.509 certificate this method returns the start validity date of
    * this certificate.
-   * 
+   *
    * @param cert an X.509 certificate.
    * @return the date when this certificate starts being valid.
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java b/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java
index 70e238ec7a3..90c6d4c38b3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/java2xhtml/Java2xhtml.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -42,7 +42,7 @@ exception statement from your version. */
  * NOTE: Common java naming structure is assumed
  *       Capitalize the first letter that appears in a class or interface name
  *       Use lowercase for the first letter in a method or variable name
- *       Use only uppercase letters when naming constants 
+ *       Use only uppercase letters when naming constants
  *
  * @version     0.9, March 2003
  * @author      Shayne Steele
@@ -87,7 +87,7 @@ public class Java2xhtml
     // call the HTMLifier on good input
     public static void main(String args[])
     {
-        // parse the invokation arguments 
+        // parse the invokation arguments
         if (args.length < 1 || args.length > 3) // invoked program incorrectly
         {
             System.out.println("Java2xhtml Version 0.9 (C) 2005 Free Software Foundation");
@@ -140,15 +140,15 @@ public class Java2xhtml
                                " (default false)");
             System.out.println("        hasLineNumbers=boolean" +
                                " (default false)");
-            System.out.println("        hasLineModulusDrawnLines=boolean" + 
+            System.out.println("        hasLineModulusDrawnLines=boolean" +
                                " (default false)");
             System.out.println("        hasLineModulusCodeBlocks=boolean" +
                                " (default false)");
-            System.out.println("        hasFooter=boolean" + 
+            System.out.println("        hasFooter=boolean" +
                                " (default false)");
-            System.out.println("        hasFooterIcons=boolean" + 
+            System.out.println("        hasFooterIcons=boolean" +
                                " (default false)");
-            System.out.println("        hasFooterDate=boolean" + 
+            System.out.println("        hasFooterDate=boolean" +
                                " (default true)");
             System.out.println("    NOTE: filename must end with '.prop'");
             System.out.println("    Default [options file] is " +
@@ -170,7 +170,7 @@ public class Java2xhtml
                                "given options file (options.prop)):");
             System.out.println("    java  Java2xhtml  C:\\HOME options.prop");
         }
-        else  
+        else
         {
             // invoked program correctly, now get command line arguments
             // get the source file name
@@ -178,12 +178,12 @@ public class Java2xhtml
             sourceName = args[0];
             // make sure that the source file exist and if so HTMLify it
             File sourceFilePath = new File(sourceName);
-            if (sourceFilePath.exists())  
+            if (sourceFilePath.exists())
             {
                 // good pathname so HTMLify it
                 // get the default html options file name
                 String propertiesFileName = "options.prop";
-                // create a unique default html file name, 
+                // create a unique default html file name,
                 // bubba.java -> bubba_java.html
                 String htmlFileName = sourceName.replace('.', '_') + ".html";
                 if (args.length == 2 || args.length == 3)
@@ -199,7 +199,7 @@ public class Java2xhtml
                         htmlFileName = args[1];
                     }
                 }
-                if (args.length == 3) 
+                if (args.length == 3)
                 {
                     if (args[2].endsWith(".prop"))
                     {
@@ -212,7 +212,7 @@ public class Java2xhtml
                         htmlFileName = args[2];
                     }
                 }
-                new Java2xhtml(propertiesFileName, sourceFilePath, 
+                new Java2xhtml(propertiesFileName, sourceFilePath,
                                htmlFileName);
             }
             else // source file does not exist, print message and exit normally
@@ -221,10 +221,10 @@ public class Java2xhtml
                                    " file or directory");
                 System.out.println("Run Java2xHtml without parameters for " +
                                    "help");
-            }                 
+            }
         }
     }
-    
+
     // collect various sets of keywords
     static Collection keywordCollection;
     static Collection primitiveTypeCollection;
@@ -250,21 +250,21 @@ public class Java2xhtml
     boolean hasExternalStyleSheet = true;
     String externalStyleSheetName = "style.css";
 
-    static 
+    static
     {
-        // collection type is Hashset for unique elements and fast retieval 
+        // collection type is Hashset for unique elements and fast retieval
         String keywordArray[] =
             {
-                "abstract", "default",      "if",           "private",      
+                "abstract", "default",      "if",           "private",
                 "do",       "implements",   "protected",    "throws",
                 "break",    "import",       "public",       "transient",
                 "else",     "instanceof",   "return",       "try",
                 "case",     "extends",      "throw",        "static",
-                "catch",    "final",        "interface",    "while",       
+                "catch",    "final",        "interface",    "while",
                 "volatile", "finally",      "super",        "synchronized",
                 "class",    "native",       "switch",       "package",
                 "const",    "for",          "new",          "goto",
-                "continue", "this",         "assert",       "strictfp"       
+                "continue", "this",         "assert",       "strictfp"
             };
         keywordCollection = new HashSet(Arrays.asList(keywordArray));
         String primitiveTypeArray[] =
@@ -272,30 +272,30 @@ public class Java2xhtml
                 "boolean",  "char",     "byte",         "short",        "int",
                 "long",     "float",    "double",       "void"
             };
-        primitiveTypeCollection = 
+        primitiveTypeCollection =
             new HashSet(Arrays.asList(primitiveTypeArray));
         String primitiveLiteralArray[]=
             {
                 "false", "null", "true"
             };
-        primitiveLiteralCollection = 
+        primitiveLiteralCollection =
             new HashSet(Arrays.asList(primitiveLiteralArray));
         String javadocTagArray[]=
             {
-                "see", "author", "version", "param", "return", "exception", 
-                "deprecated", "throws", "link", "since", "serial", 
+                "see", "author", "version", "param", "return", "exception",
+                "deprecated", "throws", "link", "since", "serial",
                 "serialField","serialData", "beaninfo"
             };
         javadocTagCollection = new HashSet(Arrays.asList(javadocTagArray));
     }
-    
+
     public Java2xhtml()
     {
     }
 
-    // create the various keyword collections 
+    // create the various keyword collections
     // parse the html options file
-    Java2xhtml(String propertiesFileName, File sourceFilePath, 
+    Java2xhtml(String propertiesFileName, File sourceFilePath,
                String htmlFileName)
     {
         // get html properties (use defaults if necessary)
@@ -303,23 +303,23 @@ public class Java2xhtml
         if (propertiesFilePath.exists())
         {
             // html properies file exist try parsing it
-            try 
+            try
             {
-                InputStream propertiesFile = 
+                InputStream propertiesFile =
                     new FileInputStream(propertiesFileName);
                 Properties htmlProperties = new Properties();
                 htmlProperties.load(propertiesFile);
                 propertiesFile.close();
                 setProperties(htmlProperties);
             }
-            catch (IOException exception) 
+            catch (IOException exception)
             {
-                System.out.println(exception);  
+                System.out.println(exception);
             }
         }
         if (sourceFilePath.isFile())
         {
-            // process the file 
+            // process the file
             processFile(sourceFilePath, htmlFileName);
         }
         else if (sourceFilePath.isDirectory())
@@ -330,8 +330,8 @@ public class Java2xhtml
             {
                 if (((sourceFilePathArray[i]).getName()).endsWith(".java"))
                 {
-                    // process each file that ends in .java 
-                    // create a unique default html file name, 
+                    // process each file that ends in .java
+                    // create a unique default html file name,
                     // bubba.java -> bubba_java.html
                     htmlFileName = ((sourceFilePathArray[i]).getName()).replace(
                         '.', '_') + ".html";
@@ -344,7 +344,7 @@ public class Java2xhtml
     public void setProperties(Properties htmlProperties)
     {
         hasLegend
-            = Boolean.valueOf(htmlProperties.getProperty("hasLegend", 
+            = Boolean.valueOf(htmlProperties.getProperty("hasLegend",
                                                          "false")).booleanValue();
         extraIndentation
             = Integer.parseInt(htmlProperties.getProperty("extraIndentation", "0"));
@@ -391,22 +391,22 @@ public class Java2xhtml
         externalStyleSheetName
             = htmlProperties.getProperty("externalStyleSheetName", "style.css");
     }
-    
-    
+
+
     // read the file and put it into a stringbuffer
     void processFile(File sourceFilePath, String htmlFileName)
     {
-        // open the file, copy it to a Stringbuffer , process into an 
+        // open the file, copy it to a Stringbuffer , process into an
         // HTMLified String and convert result into an HTML file
         try
         {
-            BufferedReader sourceReader = 
+            BufferedReader sourceReader =
                 new BufferedReader(new FileReader(sourceFilePath));
             StringBuffer bufferIn = new StringBuffer();
             int readInInt = 0;
             char presentChar = 0;
             // copy file into a Stringbuffer
-            while (readInInt != -1) // -1 value means end of stream/file 
+            while (readInInt != -1) // -1 value means end of stream/file
             {
                 // put the file into a Stringbuffer
                 readInInt= sourceReader.read();
@@ -414,21 +414,21 @@ public class Java2xhtml
                 bufferIn.append(presentChar);
             }
             sourceReader.close();
-            BufferedWriter tempBufferedWriter = 
+            BufferedWriter tempBufferedWriter =
                 new BufferedWriter(new FileWriter(htmlFileName));
-            tempBufferedWriter.write(makeHTML(bufferIn, 
+            tempBufferedWriter.write(makeHTML(bufferIn,
                                               sourceFilePath.getName()));
-            tempBufferedWriter.close();     
-            System.out.println(sourceFilePath.getName() + " --> " + 
+            tempBufferedWriter.close();
+            System.out.println(sourceFilePath.getName() + " --> " +
                                htmlFileName);
         }
-        catch (IOException exception) 
+        catch (IOException exception)
         {
-            System.out.println(exception);  
+            System.out.println(exception);
         }
     }
-    
-    // constant 'States' java source code can be in 
+
+    // constant 'States' java source code can be in
     public final static class State
     {
         public final static State TEXT = new State();
@@ -440,18 +440,18 @@ public class Java2xhtml
         public final static State SINGLE_QUOTE = new State();
         public final static State TRADITIONAL_COMMENT = new State();
         public final static State LINE_COMMENT = new State();
-        
-        // empty constructor 
+
+        // empty constructor
         private State()
         {
             // empty body
         }
     }
-    
-    // Convert java source code StringBufffer into colorized (and tab spaced) 
+
+    // Convert java source code StringBufffer into colorized (and tab spaced)
     // HTML String .
     // Assumes that Java naming convention is used
-    // Uses a very basic state machine design.   
+    // Uses a very basic state machine design.
     public String makeHTML(StringBuffer bufferIn, String sourceFileName)
     {
         int codeLineNumber = 0;
@@ -467,7 +467,7 @@ public class Java2xhtml
         StringBuffer bufferOut = new StringBuffer(8192);
         if (!isCodeSnippet)
         {
-            bufferOut.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"); 
+            bufferOut.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n");
             if (isXHTML_1_1)
             {
                 bufferOut.append("<!DOCTYPE html PUBLIC " +
@@ -517,7 +517,7 @@ public class Java2xhtml
                     bufferOut.append("     {\r\n");
                     bufferOut.append("       font-weight: bold;\r\n");
                     bufferOut.append("       color: #000000;\r\n");
-                    bufferOut.append("       background-color: "); 
+                    bufferOut.append("       background-color: ");
                     bufferOut.append("transparent;\r\n");
                     bufferOut.append("     }\r\n");
                     if (hasLineModulusDrawnLines)
@@ -541,7 +541,7 @@ public class Java2xhtml
                         bufferOut.append("     {\r\n");
                         bufferOut.append("       color: #000000;\r\n");
                         bufferOut.append("       background-color: ");
-                        bufferOut.append("#CCCCCC;\r\n"); 
+                        bufferOut.append("#CCCCCC;\r\n");
                         bufferOut.append("     }\r\n");
                     }
                 }
@@ -552,12 +552,12 @@ public class Java2xhtml
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + methodStyle + "\r\n");
                 bufferOut.append("     {\r\n");
-                bufferOut.append("       color: #0000FF;\r\n"); 
+                bufferOut.append("       color: #0000FF;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + variableStyle + "\r\n");
                 bufferOut.append("     {\r\n");
-                bufferOut.append("       color: #CC9933;\r\n"); 
+                bufferOut.append("       color: #CC9933;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + singleLineCommentStyle + "\r\n");
@@ -567,7 +567,7 @@ public class Java2xhtml
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + traditionalCommentStyle + "\r\n");
                 bufferOut.append("     {\r\n");
-                bufferOut.append("       color: #FF0000;\r\n"); 
+                bufferOut.append("       color: #FF0000;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + javadocCommentStyle + "\r\n");
@@ -600,7 +600,7 @@ public class Java2xhtml
                 bufferOut.append("       color: #009966;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
-                bufferOut.append("    ." + constructorStyle + "\r\n"); 
+                bufferOut.append("    ." + constructorStyle + "\r\n");
                 bufferOut.append("     {\r\n");
                 bufferOut.append("       color: #3300CC;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
@@ -622,27 +622,27 @@ public class Java2xhtml
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("       font-style: oblique;\r\n");
                 bufferOut.append("     }\r\n");
-                bufferOut.append("    ." + numericLiteralStyle + "\r\n"); 
+                bufferOut.append("    ." + numericLiteralStyle + "\r\n");
                 bufferOut.append("     {\r\n");
-                bufferOut.append("       color: #333300;\r\n"); 
+                bufferOut.append("       color: #333300;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
                 bufferOut.append("    ." + primitiveLiteralStyle + "\r\n");
                 bufferOut.append("     {\r\n");
-                bufferOut.append("       color: #006600;\r\n"); 
+                bufferOut.append("       color: #006600;\r\n");
                 bufferOut.append("       background-color: transparent;\r\n");
                 bufferOut.append("     }\r\n");
                 if (hasFooterIcons)
                 {
                     bufferOut.append("    ." + iconStyle + "\r\n");
                     bufferOut.append("     {\r\n");
-                    bufferOut.append("       border-style: none;\r\n"); 
+                    bufferOut.append("       border-style: none;\r\n");
                     bufferOut.append("     }\r\n");
                 }
                 if (hasTitle)
                 {
                     bufferOut.append("    #title\r\n");
-                    bufferOut.append("     {\r\n"); 
+                    bufferOut.append("     {\r\n");
                     bufferOut.append("       text-align: center;\r\n");
                     bufferOut.append("       font-size: xx-large;\r\n");
                     bufferOut.append("     }\r\n");
@@ -650,20 +650,20 @@ public class Java2xhtml
                 if (hasLegend)
                 {
                     bufferOut.append("    #legendTitle\r\n");
-                    bufferOut.append("     {\r\n"); 
+                    bufferOut.append("     {\r\n");
                     bufferOut.append("       text-align: center;\r\n");
                     bufferOut.append("       font-size: x-large;\r\n");
                     bufferOut.append("     }\r\n");
                     bufferOut.append("    #legend\r\n");
-                    bufferOut.append("     {\r\n"); 
+                    bufferOut.append("     {\r\n");
                     bufferOut.append("       font-family: monospace;\r\n");
                     bufferOut.append("       font-size: large;\r\n");
                     bufferOut.append("     }\r\n");
-                }                
+                }
                 if (hasFooter)
                 {
                     bufferOut.append("    #footer\r\n");
-                    bufferOut.append("     {\r\n"); 
+                    bufferOut.append("     {\r\n");
                     bufferOut.append("       font-size: xx-small;\r\n");
                     bufferOut.append("     }\r\n");
                 }
@@ -674,7 +674,7 @@ public class Java2xhtml
             if (hasExternalStyleSheet)
             {
                 bufferOut.append("  <link rel=\"stylesheet\" " +
-                                 "type=\"text/css\" href=\"" + 
+                                 "type=\"text/css\" href=\"" +
                                  externalStyleSheetName + "\" />\r\n");
             }
             bufferOut.append(" </head>\r\n");
@@ -754,7 +754,7 @@ public class Java2xhtml
                 // add line numbers if desired
                 // line numbers are 1 - 9999 then rotate line numbers
                 codeLineNumber = (++codeLineNumber)%10000;
-                if ((lineModulus > 0) && hasLineModulusCodeBlocks && 
+                if ((lineModulus > 0) && hasLineModulusCodeBlocks &&
                     (codeLineNumber%lineModulus == 1))
                 {
                     if (isNewBlock)
@@ -762,8 +762,8 @@ public class Java2xhtml
                         if ((State.TRADITIONAL_COMMENT == presentState) ||
                             (State.JAVADOC == presentState))
                         {
-                                bufferOut.insert((bufferOut.length() - 
-                                                  ("\r\n").length()), 
+                                bufferOut.insert((bufferOut.length() -
+                                                  ("\r\n").length()),
                                                  "</span>");
                         }
                         bufferOut.append("</pre>\r\n");
@@ -817,7 +817,7 @@ public class Java2xhtml
                                      bufferIn.charAt(presentIndex))) ||
                                     (bufferIn.charAt(presentIndex) == '\t')))
                             {
-                                // for each tab, insert tabSize spaces 
+                                // for each tab, insert tabSize spaces
                                 if (bufferIn.charAt(presentIndex) == '\t')
                                 {
                                     for (int i = 0; i < tabSize; i++)
@@ -842,7 +842,7 @@ public class Java2xhtml
                                 }
                                 presentIndex++;
                             }
-                            // check if line is empty 
+                            // check if line is empty
                             // (no printable characters on line)
                             if ((presentIndex == (bufferIn.length() - 1)) ||
                                 (Character.isWhitespace(bufferIn.charAt(
@@ -853,18 +853,18 @@ public class Java2xhtml
                             // draw the line
                             if (spaceLength > 1)
                             {
-                                bufferOut.insert((bufferOut.length() - 
+                                bufferOut.insert((bufferOut.length() -
                                                   spaceLength), "<span class=" +
                                                  "\"modulusLineStyle\">");
-                                bufferOut.insert((bufferOut.length() - 
+                                bufferOut.insert((bufferOut.length() -
                                                   (" ").length()), "</span>");
                             }
                             spaceLength = 0;
                         }
                     }
-                    else 
+                    else
                     {
-                        // line numbers are in lineNumberColor 
+                        // line numbers are in lineNumberColor
                         bufferOut.append("<span class=\"" + lineNumberStyle + "\">");
                         bufferOut.append(codeLineNumber);
                         bufferOut.append(":</span> ");
@@ -883,27 +883,27 @@ public class Java2xhtml
                 bufferOut.append(presentChar);
                 identifierLength++;
                 continue; // keep adding characters until identifier is done
-            } 
+            }
             if (identifierLength > 0)
             {
                 // identifier
-                qualifiedIdentifierLength = 
+                qualifiedIdentifierLength =
                     qualifiedIdentifierLength + identifierLength;
                 if (bufferIn.charAt(presentIndex) == '.')
                 {
-                    // qualified identifier 
+                    // qualified identifier
                     bufferOut.append(presentChar);
                     qualifiedIdentifierLength++;
                     identifierLength = 0;
                     continue;  // keep adding characters to qualified identifier
                 }
-                String identifier = 
-                    bufferOut.substring(bufferOut.length() - 
+                String identifier =
+                    bufferOut.substring(bufferOut.length() -
                                         identifierLength);
                 if ((State.PARAM_VARIABLE == presentState))
                 {
                     // any identifier after a param in a javadoc is assumed to
-                    // be a variable 
+                    // be a variable
                     bufferOut.insert(bufferOut.length() -
                                      qualifiedIdentifierLength,
                                      "<span class=\"" + variableStyle + "\">");
@@ -912,9 +912,9 @@ public class Java2xhtml
                 }
                 else if (State.JAVADOC == presentState)
                 {
-                    // in javadoc state 
+                    // in javadoc state
                     if ((javadocTagCollection.contains(identifier)) &&
-                        (bufferIn.charAt(presentIndex - 
+                        (bufferIn.charAt(presentIndex -
                                          (identifierLength + 1)) == '@'))
                     {
                         // identifier is a javadocTag
@@ -924,7 +924,7 @@ public class Java2xhtml
                         if (("param").equals(identifier))
                         {
                             // any identifier after a param is assumed to
-                            // be a variable, get into a state to do this 
+                            // be a variable, get into a state to do this
                             presentState = State.PARAM_VARIABLE;
                         }
                     }
@@ -932,7 +932,7 @@ public class Java2xhtml
                 else if (State.IMPORT_NAME == presentState)
                 {
                     // import identifier
-                    bufferOut.insert(bufferOut.length() - 
+                    bufferOut.insert(bufferOut.length() -
                                      qualifiedIdentifierLength,
                                      "<span class=\"" + importNameStyle + "\">");
                     bufferOut.append("</span>");
@@ -941,7 +941,7 @@ public class Java2xhtml
                 else if (State.PACKAGE_NAME == presentState)
                 {
                     // package identifier
-                    bufferOut.insert(bufferOut.length() - 
+                    bufferOut.insert(bufferOut.length() -
                                      qualifiedIdentifierLength,
                                      "<span class=\"" + packageNameStyle + "\">");
                     bufferOut.append("</span>");
@@ -951,27 +951,27 @@ public class Java2xhtml
                 {
                     if (keywordCollection.contains(identifier))
                     {
-                        // identifier is a keyword 
-                        bufferOut.insert(bufferOut.length() - 
+                        // identifier is a keyword
+                        bufferOut.insert(bufferOut.length() -
                                          qualifiedIdentifierLength,
                                          "<span class=\"" + keywordStyle + "\">");
                         bufferOut.append("</span>");
                         if (("import").equals(identifier))
                         {
-                            // anything after an import in text mode must be 
+                            // anything after an import in text mode must be
                             // an import name, so enter state to process this
                             presentState = State.IMPORT_NAME;
                         }
                         else if (("package").equals(identifier))
                         {
-                            // anything after an package in text mode must be 
+                            // anything after an package in text mode must be
                             // an package name, so enter state to process this
                             presentState = State.PACKAGE_NAME;
                         }
                     }
                     else if (primitiveTypeCollection.contains(identifier))
                     {
-                        // identifier is a primitive type  
+                        // identifier is a primitive type
                         bufferOut.insert(bufferOut.length() -
                                          qualifiedIdentifierLength,
                                          "<span class=\"" + primitiveTypeStyle + "\">");
@@ -982,14 +982,14 @@ public class Java2xhtml
                     {
                         // identifier is a constant
                         bufferOut.insert(bufferOut.length() -
-                                         qualifiedIdentifierLength, 
+                                         qualifiedIdentifierLength,
                                          "<span class=\"" + constantStyle + "\">");
                         bufferOut.append("</span>");
                     }
                     else if (Character.isUpperCase(identifier.charAt(0)))
                     {
                         // identifier is a constructor or non-primitive type
-                        // eat white space 
+                        // eat white space
                         saveIndex = presentIndex;
                         while (Character.isWhitespace(
                                    bufferIn.charAt(saveIndex++)))
@@ -1006,10 +1006,10 @@ public class Java2xhtml
                         }
                         else
                         {
-                            // identifier is a non-primitive type 
+                            // identifier is a non-primitive type
                             bufferOut.insert(bufferOut.length() -
                                              qualifiedIdentifierLength,
-                                             "<span class=" + 
+                                             "<span class=" +
                                              "\"" + nonPrimitiveTypeStyle + "\">");
                             bufferOut.append("</span>");
                         }
@@ -1029,33 +1029,33 @@ public class Java2xhtml
                         // identifier is a method
                         if (bufferIn.charAt(saveIndex) == '(')
                         {
-                            bufferOut.insert(bufferOut.length() - 
-                                             qualifiedIdentifierLength, 
+                            bufferOut.insert(bufferOut.length() -
+                                             qualifiedIdentifierLength,
                                              "<span class=\"" + methodStyle + "\">");
-                            bufferOut.append("</span>");                 
+                            bufferOut.append("</span>");
                         }
                         else if (bufferIn.charAt(saveIndex) == ',')
                         {
                             // comma seperated variables
-                            bufferOut.insert(bufferOut.length() - 
-                                             qualifiedIdentifierLength, 
+                            bufferOut.insert(bufferOut.length() -
+                                             qualifiedIdentifierLength,
                                              "<span class=\"" + variableStyle + "\">");
-                            bufferOut.append("</span>"); 
+                            bufferOut.append("</span>");
                         }
                         else
                         {
                             // a variable
                             // take care of cases such as array[index].variable
-                            if (bufferIn.charAt(presentIndex - 
-                                                (qualifiedIdentifierLength 
+                            if (bufferIn.charAt(presentIndex -
+                                                (qualifiedIdentifierLength
                                                  + 1)) == '.')
                             {
                                 qualifiedIdentifierLength++;
                             }
-                            bufferOut.insert(bufferOut.length() - 
-                                             qualifiedIdentifierLength, 
+                            bufferOut.insert(bufferOut.length() -
+                                             qualifiedIdentifierLength,
                                              "<span class=\"" + variableStyle + "\">");
-                            bufferOut.append("</span>");                        
+                            bufferOut.append("</span>");
                         }
                     }
                     else
@@ -1069,17 +1069,17 @@ public class Java2xhtml
                             bufferOut.append("</span>");
                         }
                         // a numeric literal
-                        else 
+                        else
                         {
-                            if (((presentIndex - 
-                                  (qualifiedIdentifierLength + 1)) > 0) && 
-                                (bufferIn.charAt(presentIndex - 
+                            if (((presentIndex -
+                                  (qualifiedIdentifierLength + 1)) > 0) &&
+                                (bufferIn.charAt(presentIndex -
                                      (qualifiedIdentifierLength + 1)) == '.'))
                             {
                                 qualifiedIdentifierLength++;
                             }
-                            bufferOut.insert(bufferOut.length() - 
-                                             qualifiedIdentifierLength, 
+                            bufferOut.insert(bufferOut.length() -
+                                             qualifiedIdentifierLength,
                                              "<span class=" +
                                              "\"" + numericLiteralStyle + "\">");
                             bufferOut.append("</span>");
@@ -1089,7 +1089,7 @@ public class Java2xhtml
                 qualifiedIdentifierLength = 0;
                 identifierLength = 0;
             }
-            // process characters NOT in identifiers 
+            // process characters NOT in identifiers
             switch (presentChar)
             {
                 case '&': //ampersand
@@ -1108,7 +1108,7 @@ public class Java2xhtml
                         presentState = State.DOUBLE_QUOTE;
                         bufferOut.insert(bufferOut.length()-(""").length(),
                                          "<span class=\"" + doubleQuoteStyle + "\">");
-                    }   
+                    }
                     else if (State.DOUBLE_QUOTE == presentState)
                     {
                         presentState = State.TEXT;
@@ -1120,7 +1120,7 @@ public class Java2xhtml
                     if (State.TEXT == presentState)
                     {
                         presentState = State.SINGLE_QUOTE;
-                        bufferOut.insert(bufferOut.length() - ("\'").length(), 
+                        bufferOut.insert(bufferOut.length() - ("\'").length(),
                                          "<span class=\"" + singleQuoteStyle + "\">");
                     }
                     else if (State.SINGLE_QUOTE == presentState)
@@ -1131,37 +1131,37 @@ public class Java2xhtml
                     break;
                 case '\\': // backslash
                     bufferOut.append("\\");
-                    if ((State.DOUBLE_QUOTE == presentState) || 
+                    if ((State.DOUBLE_QUOTE == presentState) ||
                          (State.SINGLE_QUOTE == presentState))
                     {
-                        // treat as a character escape sequence 
+                        // treat as a character escape sequence
                         bufferOut.append(bufferIn.charAt(++presentIndex));
                     }
                     break;
                 case '\t': // tab
                     // replace tabs with tabsize number of spaces
-                    for (int i = 0; i < tabSize; i++) 
+                    for (int i = 0; i < tabSize; i++)
                     {
                         bufferOut.append(' ');
                     }
                     break;
                 case '*': // star
                     bufferOut.append("*");
-                    if ((State.TEXT ==  presentState) && 
+                    if ((State.TEXT ==  presentState) &&
                         (bufferIn.charAt(presentIndex - 1) == '/'))
                     {
                         if (((bufferIn.length() - 1) > presentIndex)  &&
                             (bufferIn.charAt(presentIndex + 1) == '*'))
                         {
                             presentState = State.JAVADOC;
-                            bufferOut.insert(bufferOut.length() - 
+                            bufferOut.insert(bufferOut.length() -
                                              ("/*").length(), "<span class=" +
                                              "\"" + javadocCommentStyle + "\">");
                         }
                         else
-                        {                        
+                        {
                             presentState = State.TRADITIONAL_COMMENT;
-                            bufferOut.insert(bufferOut.length() - 
+                            bufferOut.insert(bufferOut.length() -
                                              ("/*").length(), "<span class=" +
                                              "\"" + traditionalCommentStyle + "\">");
                         }
@@ -1169,31 +1169,31 @@ public class Java2xhtml
                     break;
                 case '/': // foward slash
                     bufferOut.append("/");
-                    if (((State.TRADITIONAL_COMMENT == presentState) || 
+                    if (((State.TRADITIONAL_COMMENT == presentState) ||
                          (State.JAVADOC == presentState)) &&
                         (bufferIn.charAt(presentIndex - 1) == '*'))
                     {
                         bufferOut.append("</span>");
                         presentState = State.TEXT;
                     }
-                    if ((State.TEXT == presentState) && 
+                    if ((State.TEXT == presentState) &&
                         (presentIndex > 0)  &&
                         (bufferIn.charAt(presentIndex - 1) == '/'))
-                    {   
-                        bufferOut.insert(bufferOut.length() - ("//").length(), 
-                                         "<span class=" + 
+                    {
+                        bufferOut.insert(bufferOut.length() - ("//").length(),
+                                         "<span class=" +
                                          "\"" + singleLineCommentStyle + "\">");
                         presentState = State.LINE_COMMENT;
-                    } 
+                    }
                     break;
                 case '\r': // carriage return
-                    // fall through  
+                    // fall through
                 case '\n': // line feed
                     // all HTML lines end in \r\n
                     if ((bufferIn.charAt(presentIndex) == '\r') &&
                         ((bufferIn.length() - 1) > presentIndex)  &&
                         (bufferIn.charAt(presentIndex + 1) == '\n'))
-                    {    
+                    {
                         ++presentIndex;
                     }
                     // end single line comments
@@ -1202,8 +1202,8 @@ public class Java2xhtml
                         bufferOut.append("</span>");
                         presentState = State.TEXT;
                     }
-                    // end of block  
-                    if ((lineModulus > 0) && hasLineModulusCodeBlocks && 
+                    // end of block
+                    if ((lineModulus > 0) && hasLineModulusCodeBlocks &&
                         ((codeLineNumber%lineModulus == 0) && !isNewBlock))
                     {
                         // end multi-line spanning states
@@ -1231,19 +1231,19 @@ public class Java2xhtml
                     }
                     else
                     {
-                        // div automatically starts new line 
+                        // div automatically starts new line
                         bufferOut.append("\r\n");
                     }
                     isNewLine = true;
                     break;
                 case 0: // nul character
-                    if ((State.LINE_COMMENT == presentState) && 
+                    if ((State.LINE_COMMENT == presentState) &&
                         (presentIndex == (bufferIn.length() - 1)))
                     {
                         bufferOut.append("</span>");
                     }
                     break;
-                default:  // everything else 
+                default:  // everything else
                     bufferOut.append(presentChar);
             }
             qualifiedIdentifierLength = 0;
@@ -1254,7 +1254,7 @@ public class Java2xhtml
 
         bufferOut.append("</pre>\r\n");
         // end block early if no more source code
-        if ((lineModulus > 0) && hasLineModulusCodeBlocks && !isNewBlock && 
+        if ((lineModulus > 0) && hasLineModulusCodeBlocks && !isNewBlock &&
             (codeLineNumber%lineModulus != 0))
         {
             bufferOut.append("   </div>\r\n");
@@ -1315,8 +1315,8 @@ public class Java2xhtml
                 }
                 else
                 {
-                    bufferOut.append("   This is a valid\r\n"); 
-                    bufferOut.append("   <a href=\"http://"); 
+                    bufferOut.append("   This is a valid\r\n");
+                    bufferOut.append("   <a href=\"http://");
                     bufferOut.append("validator.w3.org/check/referer");
                     if (isXHTML_1_1)
                     {
@@ -1331,7 +1331,7 @@ public class Java2xhtml
                     bufferOut.append("jigsaw.w3.org");
                     bufferOut.append("/css-validator/check/referer");
                     bufferOut.append("\">CSS</a>\r\n");
-                    bufferOut.append("   document \r\n"); 
+                    bufferOut.append("   document \r\n");
                     if (hasFooterDate)
                     {
                         bufferOut.append("   <script type=\"text/javaScript\"");
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java
index 4b4d250469c..ffecac35c47 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java
@@ -193,14 +193,14 @@ public class ClassWrapper
         superClass.makeVtable();
         vtable = new ArrayList<MethodNode>(superClass.vtable);
         bridgeTargets = new HashSet<String>(superClass.bridgeTargets);
-	methodNameMap = new HashMap<String,String>(superClass.methodNameMap);
+        methodNameMap = new HashMap<String,String>(superClass.methodNameMap);
       }
     else
       {
         // Object.
         vtable = new ArrayList<MethodNode>();
         bridgeTargets = new HashSet<String>();
-	methodNameMap = new HashMap<String,String>();
+        methodNameMap = new HashMap<String,String>();
       }
     addLocalMethods();
     addInterfaces(this);
@@ -217,18 +217,18 @@ public class ClassWrapper
         MethodNode m = (MethodNode) i.next();
         String desc = MethodHelper.getBridgeTarget(m);
         if (desc != null)
-	  {
-	    String sum = m.name + desc;
-	    boolean newTarget = bridgeTargets.add(sum);
-	    if (newTarget)
-	      {
-		// Bridge target that is new in this class.
-		String cname = this.name;
-		int index = cname.lastIndexOf('/');
-		cname = cname.substring(index + 1);
-		methodNameMap.put(sum, cname + "$" + m.name);
-	      }
-	  }
+          {
+            String sum = m.name + desc;
+            boolean newTarget = bridgeTargets.add(sum);
+            if (newTarget)
+              {
+                // Bridge target that is new in this class.
+                String cname = this.name;
+                int index = cname.lastIndexOf('/');
+                cname = cname.substring(index + 1);
+                methodNameMap.put(sum, cname + "$" + m.name);
+              }
+          }
       }
   }
 
@@ -255,13 +255,13 @@ public class ClassWrapper
     while (i.hasNext())
       {
         MethodNode m = (MethodNode) i.next();
-	String nameToUse;
-	String sum = m.name + m.desc;
-	if (bridgeTargets.contains(sum))
-	  nameToUse = (String) methodNameMap.get(sum);
-	else
-	  nameToUse = m.name;
-	methodNameMap.put(sum, nameToUse);
+        String nameToUse;
+        String sum = m.name + m.desc;
+        if (bridgeTargets.contains(sum))
+          nameToUse = (String) methodNameMap.get(sum);
+        else
+          nameToUse = m.name;
+        methodNameMap.put(sum, nameToUse);
         MethodHelper.print(out, m, this, nameToUse);
       }
   }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java
index 52e6e539da7..df2b723e7d5 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java
@@ -1,4 +1,4 @@
-/* CniPrintStream.java - PrintStream that emits CNI declarations 
+/* CniPrintStream.java - PrintStream that emits CNI declarations
  Copyright (C) 2006 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
@@ -125,7 +125,7 @@ public class CniPrintStream
     // Add the plain class name; we'll handle it when
     // we process namespaces.
     allClasses.add(name);
-    return name; 
+    return name;
   }
 
   // Print the C++ form of TYPE, mangling C++ keywords.
@@ -142,9 +142,9 @@ public class CniPrintStream
       }
     if (type.getSort() == Type.OBJECT)
       {
-	print("::");
+        print("::");
         printName(getClassName(type));
-	print(" *");
+        print(" *");
       }
     else
       {
@@ -166,9 +166,9 @@ public class CniPrintStream
     String[] parts = name.split("::|/");
     for (int i = 0; i < parts.length; i++)
       {
-	if (i != 0)
-	  out.print("::");
-	out.print(Keywords.getCxxName(parts[i]));
+        if (i != 0)
+          out.print("::");
+        out.print(Keywords.getCxxName(parts[i]));
       }
   }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java
index 0b69d311658..bf466484dd2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/GcjhMain.java
@@ -70,33 +70,33 @@ public class GcjhMain extends Main
     OptionGroup text = new OptionGroup("CNI text options");
     text.add(new Option("add", "Insert TEXT into class body", "TEXT")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	  commands.add(new Text(Text.ADD, arg));
-	}
+        public void parsed(String arg) throws OptionException
+        {
+          commands.add(new Text(Text.ADD, arg));
+        }
       });
     text.add(new Option("append", "Append TEXT after class declaration",
-			"TEXT")
+                        "TEXT")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	  commands.add(new Text(Text.APPEND, arg));
-	}
+        public void parsed(String arg) throws OptionException
+        {
+          commands.add(new Text(Text.APPEND, arg));
+        }
       });
     text.add(new Option("friend", "Insert TEXT as a 'friend' declaration",
-			"TEXT")
+                        "TEXT")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	  commands.add(new Text(Text.FRIEND, arg));
-	}
+        public void parsed(String arg) throws OptionException
+        {
+          commands.add(new Text(Text.FRIEND, arg));
+        }
       });
     text.add(new Option("prepend", "Insert TEXT before start of class", "TEXT")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	  commands.add(new Text(Text.PREPEND, arg));
-	}
+        public void parsed(String arg) throws OptionException
+        {
+          commands.add(new Text(Text.PREPEND, arg));
+        }
       });
     result.add(text);
 
@@ -105,34 +105,34 @@ public class GcjhMain extends Main
     // didn't add them here since they should really be unused by now.
     compat.add(new Option("td", "Unused compatibility option", "DIRECTORY")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	}
+        public void parsed(String arg) throws OptionException
+        {
+        }
       });
     // I don't believe anyone ever used these options.
     compat.add(new Option("M", "Unused compatibility option")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	}
+        public void parsed(String arg) throws OptionException
+        {
+        }
       });
     compat.add(new Option("MM", "Unused compatibility option")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	}
+        public void parsed(String arg) throws OptionException
+        {
+        }
       });
     compat.add(new Option("MD", "Unused compatibility option")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	}
+        public void parsed(String arg) throws OptionException
+        {
+        }
       });
     compat.add(new Option("MMD", "Unused compatibility option")
       {
-	public void parsed(String arg) throws OptionException
-	{
-	}
+        public void parsed(String arg) throws OptionException
+        {
+        }
       });
 
     result.add(compat);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniHelper.java
index f2ca90e01b6..9225444be27 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniHelper.java
@@ -1,4 +1,4 @@
-/* JniHelper.java - name mangling and other JNI support 
+/* JniHelper.java - name mangling and other JNI support
  Copyright (C) 2006 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
index bbede8ea0c3..cb8bcd8d9c2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniIncludePrinter.java
@@ -75,7 +75,7 @@ public class JniIncludePrinter
             if (! (field.value instanceof Integer)
                 && ! (field.value instanceof Long))
               continue;
-            
+
             // Note that we don't want to mangle the field name.
             String name = (JniHelper.mangle(klass.name) + "_" + field.name);
             out.print("#undef ");
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
index 41b90b017db..4a1803a275d 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/JniStubPrinter.java
@@ -77,9 +77,9 @@ public class JniStubPrinter
     if (! klass.hasNativeMethod())
       return;
     String xname = JniHelper.mangle(klass.name);
-    JniPrintStream out 
-      = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".c", 
-					klass);
+    JniPrintStream out
+      = (JniPrintStream) getPrintStream(klass.name.replace('/', '_') + ".c",
+                                        klass);
     if (out == null)
       return;
     out.println();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java
index 73e2c627caa..9c76a366057 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java
@@ -44,7 +44,7 @@ public class Keywords
 {
 /* A sorted list of all C++ keywords.  This is identical to the list
    in gcc/java/mangle.c.  */
-  private static final String[] words = 
+  private static final String[] words =
     {
       "_Complex",
       "__alignof",
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 15fd52c8a05..bec04f00dab 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -248,7 +248,7 @@ public class Main
       {
         if (cniOrJniSeen && cni)
           throw new OptionException("only one of -jni or -cni may be used");
-	cniOrJniSeen = true;
+        cniOrJniSeen = true;
         cni = false;
       }
     });
@@ -258,7 +258,7 @@ public class Main
       {
         if (cniOrJniSeen && ! cni)
           throw new OptionException("only one of -jni or -cni may be used");
-	cniOrJniSeen = true;
+        cniOrJniSeen = true;
         cni = true;
       }
     });
@@ -323,8 +323,8 @@ public class Main
     Iterator<Map.Entry<File,ClassWrapper>> i = klasses.entrySet().iterator();
     while (i.hasNext())
       {
-	Map.Entry<File,ClassWrapper> e = i.next();
-	File file = e.getKey();
+        Map.Entry<File,ClassWrapper> e = i.next();
+        File file = e.getKey();
         ClassWrapper klass = e.getValue();
         if (verbose)
           System.err.println("[writing " + klass + " as " + file + "]");
@@ -393,14 +393,14 @@ public class Main
         // file name.
         Object item = i.next();
         ClassWrapper klass;
-	File filename;
+        File filename;
         if (item instanceof File)
           {
             // Load class from file.
             if (verbose)
               System.err.println("[reading file " + item + "]");
             klass = getClass((File) item);
-	    filename = new File(klass.name);
+            filename = new File(klass.name);
           }
         else
           {
@@ -408,9 +408,9 @@ public class Main
             String className = ((String) item).replace('.', '/');
             if (verbose)
               System.err.println("[reading class " + className + "]");
-	    // Use the name the user specified, even if it is
-	    // different from the ultimate class name.
-	    filename = new File(className);
+            // Use the name the user specified, even if it is
+            // different from the ultimate class name.
+            filename = new File(className);
             klass = getClass(className);
           }
         results.put(filename, klass);
@@ -452,7 +452,7 @@ public class Main
         URL url = loader.findResource(resource);
         if (url == null)
           throw new IOException("can't find class file " + resource
-				+ " in " + loader);
+                                + " in " + loader);
         InputStream is = url.openStream();
         ClassWrapper result = readClass(is);
         classMap.put(name, result);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java
index 8743f9a84f4..d65cc93d70b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java
@@ -97,7 +97,7 @@ public class MethodHelper
       {
         out.print(Type.getReturnType(meth.desc));
         out.print(" ");
-	out.printName(realMethodName);
+        out.printName(realMethodName);
       }
     else
       {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java
index a53a8b21ae3..603385d1978 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/CACertCmd.java
@@ -65,7 +65,7 @@ import java.util.logging.Logger;
  *      <dd>The fully qualified path of the file containing the trusted CA
  *      certificate to import. If omitted, the tool will process STDIN.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -73,7 +73,7 @@ import java.util.logging.Logger;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -86,13 +86,13 @@ import java.util.logging.Logger;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -100,7 +100,7 @@ import java.util.logging.Logger;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
@@ -278,7 +278,7 @@ public class CACertCmd
    * replaces any space and dot characters with underscores. For example the
    * input string <code>brasil.gov.br.cert</code> will result in
    * <code>brasil_gov_br</code> as its alias.
-   * 
+   *
    * @param fileName the name of the file containing the CA certificate
    * @return a string which can, and will, be used as the Alias of this CA
    *         certificate.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java
index 327320ad1ff..e14fa4916d2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/CertReqCmd.java
@@ -84,14 +84,14 @@ import javax.security.auth.x500.X500Principal;
  *   signatureAlgorithm        AlgorithmIdentifier,
  *   signature                 BIT STRING
  * }
- * 
+ *
  * CertificationRequestInfo ::= SEQUENCE {
  *   version           INTEGER -- v1(0)
  *   subject           Name,
  *   subjectPKInfo     SubjectPublicKeyInfo,
  *   attributes    [0] IMPLICIT Attributes -- see note later
  * }
- * 
+ *
  * SubjectPublicKeyInfo ::= SEQUENCE {
  *   algorithm         AlgorithmIdentifier,
  *   subjectPublicKey  BIT STRING
@@ -114,7 +114,7 @@ import javax.security.auth.x500.X500Principal;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-sigalg ALGORITHM</dt>
  *      <dd>The canonical name of the digital signature algorithm to use for
  *      signing the certificate. If this option is omitted, a default value will
@@ -124,11 +124,11 @@ import javax.security.auth.x500.X500Principal;
  *      If on the other hand the private key is an <code>RSA</code> one, then
  *      the tool will use <code>MD5withRSA</code> as the signature algorithm.
  *      <p></dd>
- *      
+ *
  *      <dt>-file FILE_NAME</dt>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -136,7 +136,7 @@ import javax.security.auth.x500.X500Principal;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -149,13 +149,13 @@ import javax.security.auth.x500.X500Principal;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -163,11 +163,11 @@ import javax.security.auth.x500.X500Principal;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.
  *      <p></dd>
- *      
+ *
  *      <dt>-attributes</dt>
  *      <dd>Use this option to force the tool to encode a NULL DER value in the
  *      CSR as the value of the Attributes field.</dd>
@@ -421,9 +421,9 @@ class CertReqCmd extends Command
    * @param publicKey
    * @param privateKey
    * @return the DER encoded Certificate Signing Request.
-   * @throws IOException 
-   * @throws InvalidKeyException 
-   * @throws SignatureException 
+   * @throws IOException
+   * @throws InvalidKeyException
+   * @throws SignatureException
    */
   private byte[] getCSR(X500Principal aliasName, PublicKey publicKey,
                         PrivateKey privateKey)
@@ -454,7 +454,7 @@ class CertReqCmd extends Command
     sigAlgorithm.trimToSize();
     DERValue derSignatureAlgorithm = new DERValue(DER.CONSTRUCTED | DER.SEQUENCE,
                                                   sigAlgorithm);
-    
+
     signatureAlgorithm.initSign(privateKey);
     signatureAlgorithm.update(derCertRequestInfo.getEncoded());
     byte[] sigBytes = signatureAlgorithm.sign();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/Command.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/Command.java
index af91e4a7151..050e75b3707 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/Command.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/Command.java
@@ -192,7 +192,7 @@ abstract class Command
    * implementation attempts to release any resources that may have been
    * allocated at the time the exception occurs, before re-throwing that
    * exception.
-   * 
+   *
    * @throws Exception if an exception occurs during the processing of this
    *           command. For a more comprehensive list of exceptions that may
    *           occur, see the documentation of the {@link #setup()} and
@@ -235,7 +235,7 @@ abstract class Command
    * <code>startIndex</code> argument pointing to the keyword argument that
    * uniquelly identifies the command itself; e.g. <code>-genkey</code> or
    * <code>-list</code>, etc...
-   * 
+   *
    * @param args an array of options for this handler and possibly other
    *          commands and their options.
    * @return the remaining un-processed <code>args</code>.
@@ -257,7 +257,7 @@ abstract class Command
    * <p>
    * Handlers usually initialize their local variables and resources within the
    * scope of this call.
-   * 
+   *
    * @throws IOException if an I/O related exception, such as opening an input
    *           stream, occurs during the execution of this method.
    * @throws UnsupportedCallbackException if a requested callback handler
@@ -284,7 +284,7 @@ abstract class Command
    * <p>
    * The code in this (abstract) class throws a <i>Not implemented yet</i>
    * runtime exception. Concrete implementations MUST override this method.
-   * 
+   *
    * @throws CertificateException If no concrete implementation was found for a
    *           certificate Factory of a designated type. In this tool, the type
    *           is usually X.509 v1.
@@ -378,7 +378,7 @@ abstract class Command
    * <code>false</code> to the first argument implying that no attempt to
    * create the keystore will be made if one was not found at the designated
    * location.
-   * 
+   *
    * @param className the potentially null fully qualified class name of a
    *          security provider to add at runtime, if no installed provider is
    *          able to provide a key store implementation of the desired type.
@@ -398,7 +398,7 @@ abstract class Command
   /**
    * Convenience method to setup the key store given its type, its password, its
    * location and portentially a specialized security provider.
-   * 
+   *
    * @param createIfNotFound if <code>true</code> then create the keystore if
    *          it was not found; otherwise do not.
    * @param className the potentially null fully qualified class name of a
@@ -422,7 +422,7 @@ abstract class Command
   /**
    * Set a security provider class name to (install and) use for key store
    * related operations.
-   * 
+   *
    * @param className the possibly null, fully qualified class name of a
    *          security provider to add, if it is not already installed, to the
    *          set of available providers.
@@ -447,7 +447,7 @@ abstract class Command
 
   /**
    * Set the type of key store to initialize, load and use.
-   * 
+   *
    * @param type the possibly null type of the key store. if this argument is
    *          <code>null</code>, or is an empty string, then this method sets
    *          the type of the key store to be the default value returned from
@@ -468,7 +468,7 @@ abstract class Command
   /**
    * Set the key password given a command line option argument. If no value was
    * present on the command line then prompt the user to provide one.
-   * 
+   *
    * @param password a possibly null key password gleaned from the command line.
    * @throws IOException if an I/O related exception occurs.
    * @throws UnsupportedCallbackException if no concrete implementation of a
@@ -485,7 +485,7 @@ abstract class Command
   /**
    * Set the Alias to use when associating Key Entries and Trusted Certificates
    * in the current key store.
-   * 
+   *
    * @param name the possibly null alias to use. If this arfument is
    *          <code>null</code>, then a default value of <code>mykey</code>
    *          will be used instead.
@@ -497,7 +497,7 @@ abstract class Command
 
   /**
    * Set the key password given a command line option argument.
-   * 
+   *
    * @param password a possibly null key password gleaned from the command line.
    */
   protected void setKeyPasswordNoPrompt(String password)
@@ -509,7 +509,7 @@ abstract class Command
   /**
    * Prompt the user to provide a password to protect a Key Entry in the key
    * store.
-   * 
+   *
    * @throws IOException if an I/O related exception occurs.
    * @throws UnsupportedCallbackException if no concrete implementation of a
    *           password callback was found at runtime.
@@ -545,7 +545,7 @@ abstract class Command
 
   /**
    * Set the key store URL to use.
-   * 
+   *
    * @param createIfNotFound when <code>true</code> an attempt to create a
    *          keystore at the designated location will be made. If
    *          <code>false</code> then no file creation is carried out, which
@@ -699,7 +699,7 @@ abstract class Command
   /**
    * Set both the key-pair generation algorithm, and the digital signature
    * algorithm instances to use when generating new entries.
-   * 
+   *
    * @param kpAlg the possibly null name of a key-pair generator algorithm.
    *          if this argument is <code>null</code> or is an empty string, the
    *          "DSS" algorithm will be used.
@@ -754,7 +754,7 @@ abstract class Command
    * <code>MD5withRSA</code>. If the private key is neither a private DSA nor
    * a private RSA key, then this method throws an
    * {@link IllegalArgumentException}.
-   * 
+   *
    * @param algorithm the possibly null name of a digital signature algorithm.
    * @param privateKey an instance of a private key to use as a fal-back option
    *          when <code>algorithm</code> is invalid.
@@ -780,7 +780,7 @@ abstract class Command
   /**
    * Set the validity period, in number of days, to use when issuing new
    * certificates.
-   * 
+   *
    * @param days the number of days, as a string, the generated certificate will
    *          be valid for, starting from today's date. if this argument is
    *          <code>null</code>, a default value of <code>90</code> days
@@ -807,14 +807,14 @@ abstract class Command
    * RFC-2459 (http://rfc.net/rfc2459.html) fully describes the structure and
    * semantics of X.509 certificates. The ASN.1 structures below are gleaned
    * from that reference.
-   * 
+   *
    * <pre>
    *  Certificate ::= SEQUENCE {
    *    tbsCertificate      TBSCertificate,
    *    signatureAlgorithm  AlgorithmIdentifier,
    *    signatureValue      BIT STRING
    *  }
-   *  
+   *
    *  TBSCertificate ::= SEQUENCE {
    *    version           [0] EXPLICIT Version DEFAULT v1,
    *    serialNumber          CertificateSerialNumber,
@@ -824,29 +824,29 @@ abstract class Command
    *    subject               Name,
    *    subjectPublicKeyInfo  SubjectPublicKeyInfo
    *  }
-   *  
+   *
    *  Version ::= INTEGER { v1(0), v2(1), v3(2) }
-   *  
+   *
    *  CertificateSerialNumber ::= INTEGER
-   *  
+   *
    *  Validity ::= SEQUENCE {
    *    notBefore  Time,
    *    notAfter   Time
    *  }
-   *  
+   *
    *  Time ::= CHOICE {
    *    utcTime      UTCTime,
    *    generalTime  GeneralizedTime
    *  }
-   *  
+   *
    *  UniqueIdentifier ::= BIT STRING
-   *  
+   *
    *  SubjectPublicKeyInfo ::= SEQUENCE {
    *    algorithm         AlgorithmIdentifier,
    *    subjectPublicKey  BIT STRING
    *  }
    * </pre>
-   * 
+   *
    * @param distinguishedName the X.500 Distinguished Name to use as both the
    *          Issuer and Subject of the self-signed certificate to generate.
    * @param publicKey the public key of the issuer/subject.
@@ -890,7 +890,7 @@ abstract class Command
     // algorithm field in an AlgorithmIdentifier, the encoding shall omit
     // the parameters field.  That is, the AlgorithmIdentifier shall be a
     // SEQUENCE of one component - the OBJECT IDENTIFIER id-dsa-with-sha1.
-    // 
+    //
     // for RSA signatures:
     // ...When any of these three OIDs (i.e. xxxWithRSAEncryption) appears
     // within the ASN.1 type AlgorithmIdentifier, the parameters component of
@@ -905,7 +905,7 @@ abstract class Command
 
     long notBefore = System.currentTimeMillis();
     long notAfter = notBefore + validityInDays * MILLIS_IN_A_DAY;
-    
+
     ArrayList validity = new ArrayList(2);
     validity.add(new DERValue(DER.UTC_TIME, new Date(notBefore)));
     validity.add(new DERValue(DER.UTC_TIME, new Date(notAfter)));
@@ -958,30 +958,30 @@ abstract class Command
    * signature algorithm used to sign the certificate. The OIDs returned are
    * those described in RFC-2459. They are listed here for the sake of
    * completness.
-   * 
+   *
    * <pre>
    *  id-dsa-with-sha1 OBJECT IDENTIFIER ::= {
    *    iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3
    *  }
-   *  
+   *
    *  md2WithRSAEncryption OBJECT IDENTIFIER ::= {
    *    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1) 2
    *  }
-   *  
+   *
    *  md5WithRSAEncryption OBJECT IDENTIFIER ::= {
    *    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1) 4
    *  }
-   *  
+   *
    *  sha-1WithRSAEncryption OBJECT IDENTIFIER ::= {
    *    iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1) 5
    *  }
    * </pre>
-   * 
+   *
    * <b>IMPORTANT</b>: This method checks the signature algorithm name against
    * (a) The GNU algorithm implementation's name, and (b) publicly referenced
    * names of the same algorithm. In other words this search is not
    * comprehensive and may fail for uncommon names of the same algorithms.
-   * 
+   *
    * @return the OID of the signature algorithm in use.
    * @throws InvalidParameterException if the concrete signature algorithm does
    *           not know its name, no OID is known/supported for that name, or we
@@ -1001,7 +1001,7 @@ abstract class Command
     if (algorithm.equalsIgnoreCase(Registry.DSS_SIG)
         || algorithm.equalsIgnoreCase("SHA1withDSA")) //$NON-NLS-1$
       return SHA1_WITH_DSA;
-    
+
     if (algorithm.equalsIgnoreCase(Registry.RSA_PKCS1_V1_5_SIG + "-" //$NON-NLS-1$
                                    + Registry.MD2_HASH)
         || algorithm.equalsIgnoreCase("MD2withRSA")) //$NON-NLS-1$
@@ -1027,7 +1027,7 @@ abstract class Command
    * by handlers if/when the key store password has changed, or amendements have
    * been made to the contents of the store; e.g. addition of a new Key Entry or
    * a Trusted Certificate.
-   * 
+   *
    * @param password the password protecting the key store.
    * @throws IOException if an I/O related exception occurs during the process.
    * @throws CertificateException if any of the certificates in the current key
@@ -1057,8 +1057,8 @@ abstract class Command
 
   /**
    * Convenience method. Calls the method with the same name passing it the
-   * same password characters used to initially load the key-store. 
-   * 
+   * same password characters used to initially load the key-store.
+   *
    * @throws IOException if an I/O related exception occurs during the process.
    * @throws KeyStoreException if the key store has not been loaded previously.
    * @throws NoSuchAlgorithmException if a required data integrity algorithm
@@ -1075,7 +1075,7 @@ abstract class Command
   /**
    * Prints a human-readable form of the designated certificate to a designated
    * {@link PrintWriter}.
-   * 
+   *
    * @param certificate the certificate to process.
    * @param writer where to print it.
    * @throws CertificateEncodingException if an exception occurs while obtaining
@@ -1099,7 +1099,7 @@ abstract class Command
   /**
    * Convenience method. Prints a human-readable form of the designated
    * certificate to <code>System.out</code>.
-   * 
+   *
    * @param certificate the certificate to process.
    * @throws CertificateEncodingException if an exception occurs while obtaining
    *           the DER encoded form <code>certificate</code>.
@@ -1114,7 +1114,7 @@ abstract class Command
    * Digest the designated contents with MD5 and return a string representation
    * suitable for use as a fingerprint; i.e. sequence of hexadecimal pairs of
    * characters separated by a colon.
-   * 
+   *
    * @param contents the non-null contents to digest.
    * @return a sequence of hexadecimal pairs of characters separated by colons.
    */
@@ -1138,7 +1138,7 @@ abstract class Command
   /**
    * Ensure that the currently set Alias is contained in the currently set key
    * store; otherwise throw an exception.
-   * 
+   *
    * @throws KeyStoreException if the keystore has not been loaded.
    * @throws IllegalArgumentException if the currently set alias is not known to
    *           the currently set key store.
@@ -1153,7 +1153,7 @@ abstract class Command
   /**
    * Ensure that the currently set Alias is associated with a Key Entry in the
    * currently set key store; otherwise throw an exception.
-   * 
+   *
    * @throws KeyStoreException if the keystore has not been loaded.
    * @throws SecurityException if the currently set alias is not a Key Entry in
    *           the currently set key store.
@@ -1204,7 +1204,7 @@ abstract class Command
    * provider, by-passing the Security search mechanism. The default console
    * callback handler implementation is
    * {@link gnu.javax.security.auth.callback.ConsoleCallbackHandler}.
-   * 
+   *
    * @return a console-based {@link CallbackHandler}.
    */
   protected CallbackHandler getCallbackHandler()
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java
index 53611b21cda..5a9cbfd1f63 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/DeleteCmd.java
@@ -70,7 +70,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -78,7 +78,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -91,13 +91,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -105,7 +105,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
@@ -257,7 +257,7 @@ class DeleteCmd extends Command
    * Unlike in other keytool handlers, the default value (<i>mykey</i>) for the
    * Alias is not used. Instead, if an alias was not found on the command line,
    * the user is prompted to enter one.
-   * 
+   *
    * @param anAlias a possibly null Alias gleaned from the command line.
    * @throws IOException if an I/O related exception occurs during the process.
    * @throws UnsupportedCallbackException if no implementation of a password
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java
index e0f16542561..035fbab6a41 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/ExportCmd.java
@@ -69,12 +69,12 @@ import java.util.logging.Logger;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-file FILE_NAME</dt>
  *      <dd>The fully qualified path of the file where the certificate will be
  *      exported to. If omitted, STDOUT will be used instead.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -82,7 +82,7 @@ import java.util.logging.Logger;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -95,13 +95,13 @@ import java.util.logging.Logger;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -109,11 +109,11 @@ import java.util.logging.Logger;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-rfc</dt>
  *      <dd>Use RFC-1421 specifications when encoding the output.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Output the certificate in binary DER encoding. This is the default
  *      output format of the command if neither <code>-rfc</code> nor
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
index 79d3824af81..b892ca7940f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/GenKeyCmd.java
@@ -83,21 +83,21 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-keyalg ALGORITHM</dt>
  *      <dd>Use this option to specify the canonical name of the key-pair
  *      generation algorithm. The default value for this option is
  *      <code>DSS</code> (a synonym for the Digital Signature Algorithm also
  *      known as <code>DSA</code>).
  *      <p></dd>
- *      
+ *
  *      <dt>-keysize KEY_SIZE</dt>
  *      <dd>Use this option to specify the number of bits of the shared modulus
  *      (for both the public and private keys) to use when generating new keys.
  *      A default value of <code>1024</code> will be used if this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-sigalg ALGORITHM</dt>
  *      <dd>The canonical name of the digital signature algorithm to use for
  *      signing certificates. If this option is omitted, a default value will be
@@ -108,7 +108,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      key-pair generation algorithm is <code>RSA</code>, then the tool will
  *      use <code>MD5withRSA</code> as the signature algorithm.
  *      <p></dd>
- *      
+ *
  *      <dt>-dname NAME</dt>
  *      <dd>This a mandatory value for this command. If this option is omitted
  *      the tool will prompt you to enter a <i>Distinguished Name</i> to use as
@@ -122,19 +122,19 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      <dl>
  *              <dt>CN</dt>
  *              <dd>The Common Name; e.g. "host.domain.com"</dd>
- *              
+ *
  *              <dt>OU</dt>
  *              <dd>The Organizational Unit; e.g. "IT Department"</dd>
- *              
+ *
  *              <dt>O</dt>
  *              <dd>The Organization Name; e.g. "The Sample Company"</dd>
- *              
+ *
  *              <dt>L</dt>
  *              <dd>The Locality Name; e.g. "Sydney"</dd>
- *              
+ *
  *              <dt>ST</dt>
  *              <dd>The State Name; e.g. "New South Wales"</dd>
- *              
+ *
  *              <dt>C</dt>
  *              <dd>The 2-letter Country identifier; e.g. "AU"</dd>
  *      </dl>
@@ -149,16 +149,16 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      If this option is omitted, the tool will prompt you to enter the
  *      information through the console.
  *      <p></dd>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
  *      <dd>Use this option to specify the password which the tool will use to
  *      protect the newly created Key Entry.
  *      <p>
  *      If this option is omitted, you will be prompted to provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-validity DAY_COUNT</dt>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -166,7 +166,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -179,13 +179,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -193,7 +193,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
index ac0ee1329e9..e52c90299a4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/IdentityDBCmd.java
@@ -61,7 +61,7 @@ import java.util.logging.Logger;
  *      <dd>The fully qualified path of the identity file to import. If this
  *      option is omitted, the tool will process STDIN.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -69,7 +69,7 @@ import java.util.logging.Logger;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -82,13 +82,13 @@ import java.util.logging.Logger;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -96,7 +96,7 @@ import java.util.logging.Logger;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java
index 18a21aa683d..b68760d095f 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/ImportCmd.java
@@ -120,12 +120,12 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-file FILE_NAME</dt>
  *      <dd>The fully qualified path of the file to read from. If omitted, the
  *      tool will process STDIN.
  *      <p></dd>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
  *      <dd>Use this option to specify the password which the tool will use to
  *      protect the <i>Key Entry</i> associated with the designated <i>Alias</i>,
@@ -137,18 +137,18 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      <i>Key Entry</i> using the same password protecting the key store. If
  *      this fails, you will then be prompted to provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-noprompt</dt>
  *      <dd>Use this option to prevent the tool from prompting the user.
  *      <p></dd>
- *      
+ *
  *      <dt>-trustcacerts</dt>
  *      <dd>Use this option to indicate to the tool that a key store, of type
  *      <code>JKS</code>, named <code>cacerts</code>, and usually located in
  *      <code>lib/security</code> in an installed Java Runtime Environment
  *      should be considered when trying to establish chain-of-trusts.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -156,7 +156,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -169,13 +169,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -183,7 +183,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
@@ -468,14 +468,14 @@ class ImportCmd extends Command
    * with the option of aborting the import operation. If however the option
    * <code>-noprompt</code> was detected on the command line, no interaction
    * with the user will take place and the import operation will abort.
-   * 
+   *
    * @throws CertificateException
    * @throws KeyStoreException
    * @throws NoSuchAlgorithmException
-   * @throws UnsupportedCallbackException 
-   * @throws IOException 
-   * @throws UnrecoverableKeyException 
-   * @throws CertPathValidatorException 
+   * @throws UnsupportedCallbackException
+   * @throws IOException
+   * @throws UnrecoverableKeyException
+   * @throws CertPathValidatorException
    */
   private void importNewTrustedCertificate() throws CertificateException,
       KeyStoreException, NoSuchAlgorithmException, IOException,
@@ -514,7 +514,7 @@ class ImportCmd extends Command
    * found in the key store, of type <code>JKS</code> named <code>cacerts</code>
    * located in <code>${JAVA_HOME}/lib/security</code>, where
    * <code>${JAVA_HOME}</code> is the root folder location of a Java runtime.
-   * 
+   *
    * @throws CertificateException
    * @throws UnsupportedCallbackException
    * @throws IOException
@@ -552,15 +552,15 @@ class ImportCmd extends Command
    * out the certificate, nor does it prompt the user to verify it. This is
    * because it is very hard (if not impossible) for a user to determine the
    * authenticity of the certificate reply.
-   * 
+   *
    * @param certificate the certificate reply to import into the key store.
-   * @throws NoSuchAlgorithmException 
-   * @throws CertPathValidatorException 
-   * @throws UnsupportedCallbackException 
-   * @throws IOException 
-   * @throws UnrecoverableKeyException 
-   * @throws KeyStoreException 
-   * @throws CertificateException 
+   * @throws NoSuchAlgorithmException
+   * @throws CertPathValidatorException
+   * @throws UnsupportedCallbackException
+   * @throws IOException
+   * @throws UnrecoverableKeyException
+   * @throws KeyStoreException
+   * @throws CertificateException
    */
   private void importCertificate(Certificate certificate)
       throws NoSuchAlgorithmException, CertPathValidatorException,
@@ -596,16 +596,16 @@ class ImportCmd extends Command
    * The user then has the option of aborting the import operation. If the
    * -noprompt option is given, however, there will be no interaction with the
    * user.
-   * 
+   *
    * @param chain the collection of certificates parsed from the user
    *          designated input.
-   * @throws UnsupportedCallbackException 
-   * @throws IOException 
-   * @throws UnrecoverableKeyException 
-   * @throws KeyStoreException 
-   * @throws CertPathValidatorException 
-   * @throws NoSuchAlgorithmException 
-   * @throws CertificateException 
+   * @throws UnsupportedCallbackException
+   * @throws IOException
+   * @throws UnrecoverableKeyException
+   * @throws KeyStoreException
+   * @throws CertPathValidatorException
+   * @throws NoSuchAlgorithmException
+   * @throws CertificateException
    */
   private void importChain(Collection chain) throws NoSuchAlgorithmException,
       CertPathValidatorException, KeyStoreException, UnrecoverableKeyException,
@@ -629,7 +629,7 @@ class ImportCmd extends Command
    * Check to ensure that alias's public key is the subject of the first
    * certificate in the passed certificate collection. Throws an exception if
    * the public keys do not match.
-   * 
+   *
    * @param certificates a {@link Collection} of certificate replies (either a
    *          signle certificate reply, or a PKCS#7 certificate reply chain)
    *          usually sent by a CA as a response to a Certificate Signing
@@ -720,7 +720,7 @@ class ImportCmd extends Command
    * designated collection which can be used as the start of the chain, or (b)
    * if a chain can not be constructed using all the certificates in the
    * designated collection.
-   * 
+   *
    * @param chain a collection of certificates, not necessarily ordered, but
    *          assumed to include a CA certificate authenticating our alias
    *          public key, which is the subject of the alias self-signed
@@ -772,7 +772,7 @@ class ImportCmd extends Command
    * the import operation. On the other hand if the <code>promptUser</code>
    * parameter is <code>false</code> then this method will throw an exception
    * if no trust anchor is to be found.
-   * 
+   *
    * @param reply an ordered certificate path, where the last entry is the CA's
    *          self-signed certificate.
    * @param promptUser a boolean flag indicating whether or not to prompt the
@@ -863,7 +863,7 @@ class ImportCmd extends Command
   /**
    * Return an instance of {@link PKIXParameters} constructed using a key store
    * of the designated type and located at the designated path.
-   * 
+   *
    * @param type the type of the key-store to load.
    * @param pathName the local File System fully qualified path name to the key
    *          store.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
index 973ed46ce51..a05a5962f52 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyCloneCmd.java
@@ -77,12 +77,12 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-dest ALIAS</dt>
  *      <dd>Use this option to specify the new <i>Alias</i> which will be used
  *      to identify the cloned copy of the <i>Key Entry</i>.
  *      <p></dd>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
  *      <dd>Use this option to specify the password which the tool will use to
  *      unlock the <i>Key Entry</i> associated with the designated <i>Alias</i>.
@@ -91,12 +91,12 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      <i>Key Entry</i> using the same password protecting the key store. If
  *      this fails, you will then be prompted to provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-new PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the private key
  *      material of the newly cloned copy of the <i>Key Entry</i>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -104,7 +104,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -117,13 +117,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -131,7 +131,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
index 5f91becd973..7652cc84300 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/KeyPasswdCmd.java
@@ -77,7 +77,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
  *      <dd>Use this option to specify the password which the tool will use to
  *      unlock the <i>Key Entry</i> associated with the designated <i>Alias</i>.
@@ -86,12 +86,12 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      <i>Key Entry</i> using the same password protecting the key store. If
  *      this fails, you will then be prompted to provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-new PASSWORD</dt>
  *      <dd>The new, and different, password which will be used to protect the
  *      private key material of the designated Key Entry.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -99,7 +99,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -112,13 +112,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -126,7 +126,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
@@ -317,7 +317,7 @@ class KeyPasswdCmd extends Command
 
   /**
    * Set the new password to use for protecting Alias's private key.
-   * 
+   *
    * @param password the new key password. if <code>null</code> prompt the
    *          user to provide one. When prompting, the password is entered twice
    *          and compared for a match.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java
index 9c9f871cddd..55c8c7683a4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/ListCmd.java
@@ -69,7 +69,7 @@ import java.util.logging.Logger;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -77,7 +77,7 @@ import java.util.logging.Logger;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -90,13 +90,13 @@ import java.util.logging.Logger;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -104,11 +104,11 @@ import java.util.logging.Logger;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-rfc</dt>
  *      <dd>Use RFC-1421 specifications when encoding the output.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Output the certificate in human-readable format. If both this option
  *      and the <code>-rfc</code> option are detected on the command line, the
@@ -307,7 +307,7 @@ class ListCmd extends Command
 
   /**
    * Prints the certificate(s) associated with the designated alias.
-   * 
+   *
    * @param anAlias a non-null string denoting an alias in the key-store.
    * @param writer where to print.
    * @throws KeyStoreException if an exception occurs while obtaining the
@@ -355,7 +355,7 @@ class ListCmd extends Command
    * is generated.
    * <p>Note that both <code>v</code> and <code>rfc</code> cannot both be
    * <code>true</code> at the same time.
-   * 
+   *
    * @param chain the certificate chain to process.
    * @param writer where to print.
    * @throws CertificateEncodingException if an exception occurs while obtaining
@@ -395,7 +395,7 @@ class ListCmd extends Command
    * is generated.
    * <p>Note that both <code>v</code> and <code>rfc</code> cannot both be
    * <code>true</code> at the same time.
-   * 
+   *
    * @param certificate the certificate to process.
    * @param writer where to print.
    * @throws CertificateEncodingException if an exception occurs while obtaining
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java
index 2100a60261b..cb9d035130d 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/PrintCertCmd.java
@@ -62,7 +62,7 @@ import java.util.logging.Logger;
  *      <dd>The fully qualified path of the file to read the certificate from.
  *      If this option is omitted, the tool will process STDIN.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
index f297046c79a..395bfe2cd9c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/SelfCertCmd.java
@@ -81,7 +81,7 @@ import javax.security.auth.x500.X500Principal;
  *      a default value of <code>mykey</code> shall be used when this option is
  *      omitted from the command line.
  *      <p></dd>
- *      
+ *
  *      <dt>-sigalg ALGORITHM</dt>
  *      <dd>The canonical name of the digital signature algorithm to use for
  *      signing the certificate. If this option is omitted, a default value will
@@ -91,7 +91,7 @@ import javax.security.auth.x500.X500Principal;
  *      If on the other hand the private key is an <code>RSA</code> one, then
  *      the tool will use <code>MD5withRSA</code> as the signature algorithm.
  *      <p></dd>
- *      
+ *
  *      <dt>-dname NAME</dt>
  *      <dd>Use this option to specify the <i>Distinguished Name</i> of the
  *      newly generated self-signed certificate. If this option is omitted, the
@@ -105,19 +105,19 @@ import javax.security.auth.x500.X500Principal;
  *      <dl>
  *              <dt>CN</dt>
  *              <dd>The Common Name; e.g. "host.domain.com"</dd>
- *              
+ *
  *              <dt>OU</dt>
  *              <dd>The Organizational Unit; e.g. "IT Department"</dd>
- *              
+ *
  *              <dt>O</dt>
  *              <dd>The Organization Name; e.g. "The Sample Company"</dd>
- *              
+ *
  *              <dt>L</dt>
  *              <dd>The Locality Name; e.g. "Sydney"</dd>
- *              
+ *
  *              <dt>ST</dt>
  *              <dd>The State Name; e.g. "New South Wales"</dd>
- *              
+ *
  *              <dt>C</dt>
  *              <dd>The 2-letter Country identifier; e.g. "AU"</dd>
  *      </dl>
@@ -130,11 +130,11 @@ import javax.security.auth.x500.X500Principal;
  *        CN=host.domain.com, O=The Sample Company, L=Sydney, ST=NSW, C=AU
  *      </pre>
  *      <p></dd>
- *      
+ *
  *      <dt>-validity DAY_COUNT</dt>
- *      
+ *
  *      <dt>-keypass PASSWORD</dt>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -142,7 +142,7 @@ import javax.security.auth.x500.X500Principal;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -155,13 +155,13 @@ import javax.security.auth.x500.X500Principal;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -169,7 +169,7 @@ import javax.security.auth.x500.X500Principal;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java b/libjava/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
index 489ecccb070..24a4b0fa1f3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/keytool/StorePasswdCmd.java
@@ -70,7 +70,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      <dd>The new, and different, password which will be used to protect the
  *      designated key store.
  *      <p></dd>
- *      
+ *
  *      <dt>-storetype STORE_TYPE</dt>
  *      <dd>Use this option to specify the type of the key store to use. The
  *      default value, if this option is omitted, is that of the property
@@ -78,7 +78,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      obtained by invoking the {@link java.security.KeyStore#getDefaultType()}
  *      static method.
  *      <p></dd>
- *      
+ *
  *      <dt>-keystore URL</dt>
  *      <dd>Use this option to specify the location of the key store to use.
  *      The default value is a file {@link java.net.URL} referencing the file
@@ -91,13 +91,13 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      name (with absolute or relative path-name) of a key store --as if the
  *      protocol was <code>file:</code>.
  *      <p></dd>
- *      
+ *
  *      <dt>-storepass PASSWORD</dt>
  *      <dd>Use this option to specify the password protecting the key store. If
  *      this option is omitted from the command line, you will be prompted to
  *      provide a password.
  *      <p></dd>
- *      
+ *
  *      <dt>-provider PROVIDER_CLASS_NAME</dt>
  *      <dd>A fully qualified class name of a Security Provider to add to the
  *      current list of Security Providers already installed in the JVM in-use.
@@ -105,7 +105,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
  *      added to the runtime --i.e. it was not already installed-- then the tool
  *      will attempt to removed this Security Provider before exiting.
  *      <p></dd>
- *      
+ *
  *      <dt>-v</dt>
  *      <dd>Use this option to enable more verbose output.</dd>
  * </dl>
diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
index 05951b7c4cf..7e970adfbbf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/Main.java
@@ -54,12 +54,12 @@ import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
 /**
- * The server for the GNU Classpath persistent naming service. 
- * 
+ * The server for the GNU Classpath persistent naming service.
+ *
  * GNU Classpath currently works with this naming service and is also
  * interoperable with the Sun Microsystems naming services from releases 1.3 and
  * 1.4, both transient <i>tnameserv</i> and persistent <i>orbd</i>.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class Main
@@ -78,7 +78,7 @@ public class Main
   /**
    * Get the object key for the naming service. The default key is the string
    * "NameService" in ASCII.
-   * 
+   *
    * @return the byte array.
    */
   public static byte[] getDefaultKey()
diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContext.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContext.java
index 9b4f27a3d7d..4526813b81d 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContext.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContext.java
@@ -55,7 +55,7 @@ import org.omg.CosNaming.NamingContextPackage.NotFound;
  * This class implements the persistent naming service, defined by
  * {@link NamingContext}. The 'persistent' means that the service remembers the
  * mappings, stored between restarts.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class PersistentContext
@@ -65,27 +65,27 @@ public class PersistentContext
    * Use serial version UID for interoperability.
    */
   private static final long serialVersionUID = 2;
-  
+
   /**
    * The folder, where the persistent context information is stored.
    */
   File contextFolder;
-  
+
   /**
    * The uinque context identifier.
    */
   static long num = System.currentTimeMillis();
-  
+
   /**
    * The naming service orb.
    */
   ORB orb;
-  
+
   /**
    * Create the persistent naming context that will store the files in the given
    * folder of the local file system. This method also connects object to the
    * passed ORB.
-   * 
+   *
    * @param an_orb the naming service ORB, used to obtain and produce the object
    *          stringified references.
    * @param folder the folder, where the persistent information is stored.
@@ -97,23 +97,23 @@ public class PersistentContext
   {
     super(
          new PersistentContextMap(an_orb, new File(folder, "contexts.txt"), reset),
-         new PersistentMap(an_orb, new File(folder, "objects.txt"), reset));         
+         new PersistentMap(an_orb, new File(folder, "objects.txt"), reset));
     contextFolder = folder;
     folder.mkdirs();
     orb = an_orb;
     orb.connect(this);
   }
-  
+
   /**
    * Get the unique context number;
-   * 
+   *
    * @return the context number
    */
   static synchronized String getNum()
   {
     return Long.toHexString(num++);
   }
-  
+
   /**
    * Create new persistent context.
    */
@@ -122,11 +122,11 @@ public class PersistentContext
     File ctxFolder = new File(contextFolder, "ctx_"+getNum());
     return new PersistentContext(orb, ctxFolder, true);
   }
-  
+
   /**
    * Create a new context and give it a given name (bound it) in the current
    * context. The method benefits from passing the better readable context name.
-   * 
+   *
    * @param a_name the name being given to the new context.
    * @return the newly created context.
    * @throws AlreadyBound if the name is already in use.
@@ -148,5 +148,5 @@ public class PersistentContext
     NamingContext child = new PersistentContext(orb, ctxFolder, true);
     bind_context(a_name, child);
     return child;
-  }  
+  }
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContextMap.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContextMap.java
index e983ef30f7a..d83f2bf4c95 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContextMap.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentContextMap.java
@@ -44,8 +44,8 @@ import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 
 /**
- * The persistent context naming map for the persistent naming service. 
- * 
+ * The persistent context naming map for the persistent naming service.
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class PersistentContextMap extends PersistentMap
@@ -53,7 +53,7 @@ public class PersistentContextMap extends PersistentMap
   /**
    * Create the persistent context map that stores information in the given
    * file.
-   * 
+   *
    * @param an_orb the naming service ORB, used to obtain and produce the object
    *          stringified references.
    * @param mapFile the file, where the persistent information is stored.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentMap.java b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentMap.java
index 87ade64cc95..a39ff28bac2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentMap.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/orbd/PersistentMap.java
@@ -61,7 +61,7 @@ import org.omg.CosNaming.NamingContextPackage.InvalidName;
  * inherited (super.) naming map implementation is transient and is used as a
  * cache. During the normal work, the naming map does not read from the disk,
  * just stores the changes there. Map only reads from the disk when it starts.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public class PersistentMap
@@ -158,7 +158,7 @@ public class PersistentMap
 
     /**
      * Get the key value from the name component.
-     * 
+     *
      * @param id the component id
      * @param kind the component kind
      * @return the key value
@@ -176,7 +176,7 @@ public class PersistentMap
     /**
      * Append the contents of the string to this string buffer, inserting the
      * escape sequences, where required.
-     * 
+     *
      * @param b a buffer to append the contents to.
      * @param s a string to append.
      */
@@ -214,7 +214,7 @@ public class PersistentMap
    * references.
    */
   ORB orb;
-  
+
   /**
    * If true, all existing data on the file system are discarded.
    */
@@ -222,7 +222,7 @@ public class PersistentMap
 
   /**
    * Create the persistent map that stores information in the given file.
-   * 
+   *
    * @param an_orb the naming service ORB, used to obtain and produce the object
    *          stringified references.
    * @param mapFile the file, where the persistent information is stored.
@@ -264,28 +264,28 @@ public class PersistentMap
           }
       }
   }
-  
+
   /**
    * Restore object from its string description.
-   * 
+   *
    * @param description the string, describing the object
-   * 
+   *
    * @return the object.
    */
   protected org.omg.CORBA.Object string_to_object(String description)
   {
     return orb.string_to_object(description);
   }
-  
+
   /**
    * Convert the object to its string description
-   * 
+   *
    * @param object the object to convert
    * @return the string description of the object
    */
   protected String object_to_string(org.omg.CORBA .Object object)
   {
-      return orb.object_to_string(object);    
+      return orb.object_to_string(object);
   }
 
   /**
@@ -293,7 +293,7 @@ public class PersistentMap
    * with the given name already exists, or if the given object is already
    * mapped under another name, the {@link AlreadyBound} exception will be
    * thrown.
-   * 
+   *
    * @param name the name
    * @param object the object
    */
@@ -312,7 +312,7 @@ public class PersistentMap
   /**
    * Put the given CORBA object, specifying the given name as a key. Remove all
    * pre - existing mappings for the given name and object.
-   * 
+   *
    * @param name the name.
    * @param object the object
    */
@@ -324,7 +324,7 @@ public class PersistentMap
         org.omg.CORBA.Object existing = get(name);
         String ior = object_to_string(object);
         String xior = object_to_string(existing);
-        
+
         // Same name and same ior - nothing to do.
         if (ior.equals(xior))
           return;
@@ -349,7 +349,7 @@ public class PersistentMap
 
   /**
    * Removes the given name, if present.
-   * 
+   *
    * @param name a name to remove.
    */
   public void remove(NameComponent name)
@@ -360,7 +360,7 @@ public class PersistentMap
 
   /**
    * Register this name - object pair in the persistent storage.
-   * 
+   *
    * @param name the name.
    * @param object the object
    */
@@ -399,7 +399,7 @@ public class PersistentMap
 
   /**
    * Remove this name from the persistent storage.
-   * 
+   *
    * @param name the name to remove
    */
   public void unregister(NameComponent name)
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java
index 492566a80f6..7c6b7222fb5 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/AbstractMethodGenerator.java
@@ -44,10 +44,10 @@ public interface AbstractMethodGenerator
    * Generate this method for the Stub (remote caller) class.
    */
   String generateStubMethod();
-  
+
   /**
    * Generate this method for the Tie (remote servant) class.
    */
   String generateTieMethod();
-  
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
index 251e2199e0d..9ac103c75a1 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/ClassRmicCompiler.java
@@ -17,7 +17,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -109,12 +109,12 @@ public class ClassRmicCompiler
 
     for (int i = next; i < args.length; i++)
       {
-	try
-	  {
+        try
+          {
             if (verbose)
-	      System.out.println("[Processing class " + args[i] + ".class]");
-	    processClass(args[i].replace(File.separatorChar, '.'));
-	  }
+              System.out.println("[Processing class " + args[i] + ".class]");
+            processClass(args[i].replace(File.separatorChar, '.'));
+          }
         catch (IOException e)
           {
             errors.add(e);
@@ -1587,15 +1587,15 @@ public class ClassRmicCompiler
   {
     for (int i = 0; i < except.length; i++)
       {
-	for (int j = i + 1; j < except.length; j++)
-	  {
-	    if (except[i].isAssignableFrom(except[j]))
-	      {
-		Class tmp = except[i];
-		except[i] = except[j];
-		except[j] = tmp;
-	      }
-	  }
+        for (int j = i + 1; j < except.length; j++)
+          {
+            if (except[i].isAssignableFrom(except[j]))
+              {
+                Class tmp = except[i];
+                except[i] = except[j];
+                except[j] = tmp;
+              }
+          }
       }
     return (except);
   }
@@ -1732,14 +1732,14 @@ public class ClassRmicCompiler
     StringBuilder str = new StringBuilder();
     for (int count = 0;; count++)
       {
-	if (! cls.isArray())
-	  {
-	    str.append(cls.getName());
-	    for (; count > 0; count--)
-	      str.append("[]");
-	    return (str.toString());
-	  }
-	cls = cls.getComponentType();
+        if (! cls.isArray())
+          {
+            str.append(cls.getName());
+            for (; count > 0; count--)
+              str.append("[]");
+            return (str.toString());
+          }
+        cls = cls.getComponentType();
       }
   }
 
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java
index 244b469133e..2bfea7cc40c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/CompilationError.java
@@ -41,15 +41,15 @@ package gnu.classpath.tools.rmic;
 /**
  * This error is thrown when the target being compiled has illegal
  * strutures.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class CompilationError extends Error
 {
-  /** 
-   * Use serialVersionUID for interoperability. 
+  /**
+   * Use serialVersionUID for interoperability.
    */
-  private static final long serialVersionUID = 1;  
+  private static final long serialVersionUID = 1;
 
   /**
    * Create error with explaining message and cause.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java
index 270f6eaf806..ba659d2c50c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Generator.java
@@ -49,14 +49,14 @@ import java.util.Map;
 
 /**
  * Contains basic methods, used in code generation.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class Generator
 {
   /**
    * Get resource with the given name, as string.
-   * 
+   *
    * @param name the resource name
    * @return the resourse string (in subfolder /templates).
    */
@@ -96,7 +96,7 @@ public class Generator
    * Replace the variable references (starting from #) in the template string by
    * the values, present in the given map. The strings, not present in the
    * variable map, are ignored.
-   * 
+   *
    * @param template
    *          the template string
    * @param variables
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java
index 42f291b4fb5..c3b3bc0a46c 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/GiopIo.java
@@ -44,7 +44,7 @@ import org.omg.CORBA.portable.ObjectImpl;
 
 /**
  * Generates the code for reading and writing data over GIOP stream.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class GiopIo
@@ -52,7 +52,7 @@ public class GiopIo
   /**
    * Get the statement for writing the variable of the given type to the GIOP ({@link org.omg.CORBA_2_3.portable.OutputStream) stream. The
    * stream is always named "out".
-   * 
+   *
    * @param c
    *          the class of the object being written
    * @param variable
@@ -90,7 +90,7 @@ public class GiopIo
   /**
    * Get the statement for reading the value of the given type from to the GIOP ({@link org.omg.CORBA_2_3.portable.InputStream) stream. The
    * stream is always named "in".
-   * 
+   *
    * @param c
    *          the class of the object being written
    * @param r
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java
index c3e363c8da1..7b6fc9bb59e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/HashFinder.java
@@ -45,15 +45,15 @@ import java.util.HashSet;
  * the passed array of strings). This character is used to accelerate the
  * method invocation by name.
  *
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class HashFinder
 {
    /**
    * Find the hash char position in the given collection of strings.
-   * 
+   *
    * @param strings the string collection
-   * 
+   *
    * @return the optimal hash character position, always less then the
    * length of the shortest string.
    */
@@ -81,10 +81,10 @@ public class HashFinder
         {
           charLists[p].add(new Integer(strings[i].charAt(p)));
         }
-    
+
     int m = 0;
     int v = charLists[0].size();
-    
+
     for (int i = 1; i < charLists.length; i++)
       {
         // Replace on equality also, seeking the hash char closer to the end
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java
index 204bb3be719..868fc758ee3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Main.java
@@ -47,8 +47,8 @@ import java.util.ArrayList;
 
 /**
  * Generates the ordinary stubs (not GIOP based) for java.rmi.*  package.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class Main
 {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java
index ecac907657d..27a4bd2e1b3 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/MethodGenerator.java
@@ -46,7 +46,7 @@ import java.util.Properties;
 /**
  * Keeps information about the single method and generates the code fragments,
  * related to that method.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class MethodGenerator implements AbstractMethodGenerator
@@ -60,13 +60,13 @@ public class MethodGenerator implements AbstractMethodGenerator
    * The parent code generator.
    */
   SourceGiopRmicCompiler rmic;
-  
+
   /**
-   * The previous method in the list, null for the first element. 
+   * The previous method in the list, null for the first element.
    * Used to avoid repretetive inclusion of the same hash code label.
    */
   MethodGenerator previous = null;
-  
+
   /**
    * The hash character position.
    */
@@ -74,7 +74,7 @@ public class MethodGenerator implements AbstractMethodGenerator
 
   /**
    * Create the new method generator for the given method.
-   * 
+   *
    * @param aMethod
    *          the related method.
    * @param aRmic
@@ -86,10 +86,10 @@ public class MethodGenerator implements AbstractMethodGenerator
     method = aMethod;
     rmic = aRmic;
   }
-  
+
   /**
    * Get the method name.
-   * 
+   *
    * @return the name of the method.
    */
   public String getGiopMethodName()
@@ -105,7 +105,7 @@ public class MethodGenerator implements AbstractMethodGenerator
 
   /**
    * Get the method parameter declaration.
-   * 
+   *
    * @return the string - method parameter declaration.
    */
   public String getArgumentList()
@@ -127,7 +127,7 @@ public class MethodGenerator implements AbstractMethodGenerator
   /**
    * Get the method parameter list only (no type declarations). This is used to
    * generate the method invocations statement.
-   * 
+   *
    * @return the string - method parameter list.
    */
   public String getArgumentNames()
@@ -147,7 +147,7 @@ public class MethodGenerator implements AbstractMethodGenerator
 
   /**
    * Get the list of exceptions, thrown by this method.
-   * 
+   *
    * @return the list of exceptions.
    */
   public String getThrows()
@@ -167,7 +167,7 @@ public class MethodGenerator implements AbstractMethodGenerator
 
   /**
    * Generate this method for the Stub class.
-   * 
+   *
    * @return the method body for the stub class.
    */
   public String generateStubMethod()
@@ -177,7 +177,7 @@ public class MethodGenerator implements AbstractMethodGenerator
     Properties vars = new Properties(rmic.vars);
     vars.put("#return_type", rmic.name(method.getReturnType()));
     vars.put("#method_name", method.getName());
-    vars.put("#giop_method_name", getGiopMethodName());    
+    vars.put("#giop_method_name", getGiopMethodName());
     vars.put("#argument_list", getArgumentList());
     vars.put("#argument_names", getArgumentNames());
 
@@ -204,15 +204,15 @@ public class MethodGenerator implements AbstractMethodGenerator
                                           rmic));
         templateName = "StubMethod.jav";
       }
-    
-    String template = rmic.getResource(templateName);        
+
+    String template = rmic.getResource(templateName);
     String generated = rmic.replaceAll(template, vars);
     return generated;
   }
-  
+
   /**
    * Generate this method handling fragment for the Tie class.
-   * 
+   *
    * @return the fragment to handle this method for the Tie class.
    */
   public String generateTieMethod()
@@ -222,12 +222,12 @@ public class MethodGenerator implements AbstractMethodGenerator
     Properties vars = new Properties(rmic.vars);
     vars.put("#return_type", rmic.name(method.getReturnType()));
     vars.put("#method_name", method.getName());
-    vars.put("#giop_method_name", getGiopMethodName());    
+    vars.put("#giop_method_name", getGiopMethodName());
     vars.put("#argument_list", getArgumentList());
     vars.put("#argument_names", getArgumentNames());
 
     vars.put("#argument_write", getStubParaWriteStatement());
-    
+
     if (previous == null || previous.getHashChar()!=getHashChar())
       vars.put("#hashCodeLabel","    case '"+getHashChar()+"':");
     else
@@ -247,11 +247,11 @@ public class MethodGenerator implements AbstractMethodGenerator
     String template = rmic.getResource(templateName);
     String generated = rmic.replaceAll(template, vars);
     return generated;
-  }  
-  
+  }
+
   /**
    * Generate sentences for Reading and Defining Arguments.
-   * 
+   *
    * @return the sequence of sentences for reading and defining arguments.
    */
   public String getRda()
@@ -275,7 +275,7 @@ public class MethodGenerator implements AbstractMethodGenerator
 
   /**
    * Get the write statement for writing parameters inside the stub.
-   * 
+   *
    * @return the write statement.
    */
   public String getStubParaWriteStatement()
@@ -291,7 +291,7 @@ public class MethodGenerator implements AbstractMethodGenerator
       }
     return b.toString();
   }
-  
+
   /**
    * Get the hash char.
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java
index 28eb8d42c56..ca9983d0aae 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RMICException.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -40,7 +40,7 @@ package gnu.classpath.tools.rmic;
 /**
  * Thrown by the underlying compiler used by RMIC when it fails to compile a
  * file.
- * 
+ *
  * @author Dalibor Topic (robilad@kaffe.org)
  */
 public class RMICException
@@ -48,7 +48,7 @@ public class RMICException
 {
   /**
    * Create an exception with a message. The cause remains uninitialized.
-   * 
+   *
    * @param message the message string
    * @see #initCause(Throwable)
    */
@@ -59,7 +59,7 @@ public class RMICException
 
   /**
    * Create an exception with a message and a cause.
-   * 
+   *
    * @param message the message string
    * @param cause the cause of this exception
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
index 8d1a1e805ba..e02f086efdc 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmiMethodGenerator.java
@@ -31,7 +31,7 @@
  independent module, the terms and conditions of the license of that
  module.  An independent module is a module which is not derived from
  or based on this library.  If you modify this library, you may extend
- this exception to your version of the library, but you are not 
+ this exception to your version of the library, but you are not
  obligated to do so.  If you do not wish to do so, delete this
  exception statement from your version. */
 
@@ -46,7 +46,7 @@ import java.util.Properties;
 /**
  * Keeps information about the single method and generates the code fragments,
  * related to that method.
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class RmiMethodGenerator
@@ -61,10 +61,10 @@ public class RmiMethodGenerator
    * The parent code generator.
    */
   SourceRmicCompiler rmic;
-  
+
   /**
    * Create the new method generator for the given method.
-   * 
+   *
    * @param aMethod the related method.
    * @param aRmic the Rmic generator instance, where more class - related
    *          information is defined.
@@ -79,7 +79,7 @@ public class RmiMethodGenerator
 
   /**
    * Get the method parameter declaration.
-   * 
+   *
    * @return the string - method parameter declaration.
    */
   public String getArgumentList()
@@ -101,7 +101,7 @@ public class RmiMethodGenerator
   /**
    * Get the method parameter list only (no type declarations). This is used to
    * generate the method invocations statement.
-   * 
+   *
    * @return the string - method parameter list.
    */
   public String getArgumentNames()
@@ -121,7 +121,7 @@ public class RmiMethodGenerator
 
   /**
    * Get the list of exceptions, thrown by this method.
-   * 
+   *
    * @return the list of exceptions.
    */
   public String getThrows()
@@ -141,7 +141,7 @@ public class RmiMethodGenerator
 
   /**
    * Generate this method for the Stub class.
-   * 
+   *
    * @return the method body for the stub class.
    */
   public String generateStubMethod()
@@ -178,7 +178,7 @@ public class RmiMethodGenerator
 
   /**
    * Generate sentences for Reading and Defining Arguments.
-   * 
+   *
    * @return the sequence of sentences for reading and defining arguments.
    */
   public String getStaticMethodDeclarations()
@@ -201,16 +201,16 @@ public class RmiMethodGenerator
 
   /**
    * Get the write statement for writing parameters inside the stub.
-   * 
+   *
    * @return the write statement.
    */
   public String getArgListAsObjectArray()
   {
     Class[] args = method.getParameterTypes();
-    
+
     if (args.length==0)
       return "NO_ARGS";
-    
+
     StringBuilder b = new StringBuilder("new Object[] {");
 
     for (int i = 0; i < args.length; i++)
@@ -228,7 +228,7 @@ public class RmiMethodGenerator
     b.append("}");
     return b.toString();
   }
-  
+
   /**
    * Get the return statement, assuming that the returned object is placed into
    * the variable "result".
@@ -250,7 +250,7 @@ public class RmiMethodGenerator
           return "return (" + rmic.name(r) + ") result;";
       }
   }
-  
+
   /**
    * Get argument list as class array.
    */
@@ -285,7 +285,7 @@ public class RmiMethodGenerator
   {
     return RMIHashes.getMethodHash(method)+"L";
   }
-  
+
   /**
    * Additional processing of the stub name (nothing to do for JRMP stubs).
    */
@@ -293,5 +293,5 @@ public class RmiMethodGenerator
   {
     return name;
   }
-  
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java
index db71b21effe..92f982d53d4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/RmicBackend.java
@@ -17,7 +17,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
index b7ad7f440a5..dd35c2bd5a0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java
@@ -46,7 +46,7 @@ import java.util.TreeSet;
 /**
  * Provides the extended rmic functionality to generate the POA - based classes
  * for GIOP (javax.rmi.CORBA package).
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (audriusa@Bioinformatics.org)
  */
 public class SourceGiopRmicCompiler
@@ -121,7 +121,7 @@ public class SourceGiopRmicCompiler
    * Verbose output
    */
   protected boolean verbose = false;
-  
+
   /**
    * Force mode - do not check the exceptions
    */
@@ -148,10 +148,10 @@ public class SourceGiopRmicCompiler
     methods.clear();
     vars.clear();
   }
-  
+
   /**
    * Set the class path (handle the -classpath key)
-   * 
+   *
    * @param classPath the class path to set.
    */
   public void setClassPath(String classPath)
@@ -196,11 +196,11 @@ public class SourceGiopRmicCompiler
       }
 
     classLoader = new URLClassLoader(u, classLoader);
-  }    
-  
+  }
+
   /**
    * Loads the class with the given name (uses class path, if applicable)
-   * 
+   *
    * @param name the name of the class.
    */
   public Class loadClass(String name)
@@ -224,7 +224,7 @@ public class SourceGiopRmicCompiler
   /**
    * Compile the given class (the instance of Remote), generating the stub and
    * tie for it.
-   * 
+   *
    * @param remote
    *          the class to compile.
    */
@@ -247,7 +247,7 @@ public class SourceGiopRmicCompiler
         packag = s.substring(0, p);
         implName = name = s.substring(p + 1);
       }
-     
+
     name = convertStubName(name);
 
     stubName = name;
@@ -297,12 +297,12 @@ public class SourceGiopRmicCompiler
                     remEx = true;
                     break;
                   }
-	      }
-	    if (! remEx && !force)
-	      throw new CompilationError(m[i].getName() + ", defined in "
-					 + c.getName()
-					 + ", does not throw "
-					 + RemoteException.class.getName());
+              }
+            if (! remEx && !force)
+              throw new CompilationError(m[i].getName() + ", defined in "
+                                         + c.getName()
+                                         + ", does not throw "
+                                         + RemoteException.class.getName());
             AbstractMethodGenerator mm = createMethodGenerator(m[i]);
             methods.add(mm);
           }
@@ -311,9 +311,9 @@ public class SourceGiopRmicCompiler
 
   /**
    * Create the method generator for the given method.
-   * 
+   *
    * @param m the method
-   * 
+   *
    * @return the created method generator
    */
   protected AbstractMethodGenerator createMethodGenerator(Method m)
@@ -324,7 +324,7 @@ public class SourceGiopRmicCompiler
   /**
    * Get the name of the given class. The class is added to imports, if not
    * already present and not from java.lang and not from the current package.
-   * 
+   *
    * @param nameIt
    *          the class to name
    * @return the name of class as it should appear in java language
@@ -369,7 +369,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Get the RMI-style repository Id for the given class.
-   * 
+   *
    * @param c
    *          the interface, for that the repository Id must be created.
    * @return the repository id
@@ -381,7 +381,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Get repository Id string array declaration.
-   * 
+   *
    * @param remotes
    *          the collection of interfaces
    * @return the fully formatted string array.
@@ -412,7 +412,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Generate stub. Can only be called from {@link #compile}.
-   * 
+   *
    * @return the string, containing the text of the generated stub.
    */
   public String generateStub()
@@ -439,7 +439,7 @@ public class SourceGiopRmicCompiler
   /**
    * Get the list of all interfaces, implemented by the class, that are
    * derived from Remote.
-   * 
+   *
    * @return the string - all interfaces.
    */
   public String getAllInterfaces()
@@ -459,7 +459,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Generate Tie. Can only be called from {@link #compile}.
-   * 
+   *
    * @return the string, containing the text of the generated Tie.
    */
   public String generateTie()
@@ -525,7 +525,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Import the extra classes, used as the method parameters and return values.
-   * 
+   *
    * @return the additional import block.
    */
   protected String getImportStatements()
@@ -561,7 +561,7 @@ public class SourceGiopRmicCompiler
 
   /**
    * Set the verbose output mode (false by default)
-   * 
+   *
    * @param isVerbose the verbose output mode
    */
   public void setVerbose(boolean isVerbose)
@@ -576,7 +576,7 @@ public class SourceGiopRmicCompiler
   {
     warnings = warn;
   }
-  
+
   /**
    * Set the error ignore mode.
    */
@@ -600,7 +600,7 @@ public class SourceGiopRmicCompiler
   {
     return stubName;
   }
-  
+
   /**
    * Additional processing of the stub name.
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
index a6f642b7997..413d91ad20b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/SourceRmicCompiler.java
@@ -46,7 +46,7 @@ import gnu.classpath.tools.rmic.AbstractMethodGenerator;
 /**
  * RMI stub source code generator, required to support java.rmi.*
  *
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) 
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class SourceRmicCompiler extends SourceGiopRmicCompiler
 {
@@ -55,10 +55,10 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
    * garbage generation.
    */
   public boolean addZeroSizeObjecArray;
-  
+
   /**
    * Generate a RMI stub.
-   * 
+   *
    * @return the string, containing the text of the generated stub.
    */
   public String generateStub()
@@ -89,7 +89,7 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
     else
       {
         vars.put("#zeroSizeObjecArray","");
-        vars.put("#zeroSizeClassArray","");        
+        vars.put("#zeroSizeClassArray","");
       }
 
     String output = replaceAll(template, vars);
@@ -102,17 +102,17 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
   protected AbstractMethodGenerator createMethodGenerator(Method m)
   {
     return new RmiMethodGenerator(m, this);
-  } 
-  
+  }
+
   /**
    * Get the stub method declarations.
    */
   public String getStubMethodDeclarations()
   {
     StringBuilder b = new StringBuilder();
-    
+
     Iterator iter = methods.iterator();
-     
+
     while (iter.hasNext())
       {
         RmiMethodGenerator method = (RmiMethodGenerator) iter.next();
@@ -125,7 +125,7 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
       }
     return b.toString();
   }
-  
+
   /**
    * Get stub method initializations. These must be done in a try-catch
    * statement to catch {@link NoSuchMethodException}.
@@ -133,9 +133,9 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
   public String getStubMethodInitializations()
   {
     StringBuilder b = new StringBuilder();
-    
+
     Iterator iter = methods.iterator();
-     
+
     while (iter.hasNext())
       {
         RmiMethodGenerator method = (RmiMethodGenerator) iter.next();
@@ -147,7 +147,7 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
         b.append(".class.getMethod(");
         b.append('"');
         b.append(method.method.getName());
-        b.append("\", ");        
+        b.append("\", ");
         if (method.method.getParameterTypes().length == 0)
           b.append("NO_ARGSc);");
         else
@@ -177,7 +177,7 @@ public class SourceRmicCompiler extends SourceGiopRmicCompiler
   public String convertStubName(String name)
   {
     return name;
-  }  
+  }
 
   /**
    * Override to do nothing.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java
index e3568e93340..1fc6a809518 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/Variables.java
@@ -17,7 +17,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java b/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
index 3737334a458..cb412851b5b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmic/WrapUnWrapper.java
@@ -43,9 +43,9 @@ public class WrapUnWrapper
 {
   /**
    * Get the wrapper class for the primitive type
-   * 
+   *
    * @param primitive the class of the primitive type
-   * 
+   *
    * @return the wrapper class
    */
   public static Class getWrappingClass(Class primitive)
@@ -67,12 +67,12 @@ public class WrapUnWrapper
     else
       return null;
   }
-  
+
   /**
    * Get the method, invocation of that would return the wrapped value.
-   * 
+   *
    * @param primitive the class of the primitive type.
-   * 
+   *
    * @return the wrapper method that unwraps the value to the primitive type.
    */
   public static String getUnwrappingMethod(Class primitive)
@@ -92,8 +92,8 @@ public class WrapUnWrapper
     if (primitive.equals(char.class))
       return "charValue()";
     else
-      return null;    
+      return null;
   }
-  
-  
+
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
index 402727ff350..fb2764873ec 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -61,7 +61,7 @@ import java.rmi.activation.UnknownObjectException;
 
 /**
  * Implements the rmid activation system.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class ActivationSystemImpl extends ActivationSystemTransient implements
@@ -71,15 +71,15 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
    * Use for interoperability.
    */
   private static final long serialVersionUID = 1;
-  
+
   /**
    * The singleton instance of this class.
    */
   public static ActivationSystemImpl singleton2;
-  
+
   /**
    * Obtain the singleton instance of this class.
-   * 
+   *
    * @param folder the folder, where the activation system will keep its files.
    * @param cold do the cold start if true, hot (usual) if false.
    */
@@ -88,11 +88,11 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
     if (singleton2 == null)
       singleton2 = new ActivationSystemImpl(folder, cold);
     return singleton2;
-  }  
-  
+  }
+
   /**
    * Creates the group with transient maps.
-   * 
+   *
    * @param folder
    *          the folder, where the activation system will keep its files.
    * @param cold
@@ -106,8 +106,8 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
         new File(folder, "asi_objects.data"), cold);
     ((PersistentBidiHashTable) descriptions).init(
         new File(folder, "asi_groups.data"),  cold);
-  }  
-  
+  }
+
   /** @inheritDoc */
   public MarshalledObject activate(ActivationID id, boolean force)
       throws ActivationException, UnknownObjectException, RemoteException
@@ -190,12 +190,12 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
 
   /**
    * This method saves the state of the activation system and then
-   * terminates in 10 seconds. 
+   * terminates in 10 seconds.
    */
   public void shutdown() throws RemoteException
   {
     super.shutdown();
-    System.out.println("Shutdown command received. Will terminate in 10 s");    
+    System.out.println("Shutdown command received. Will terminate in 10 s");
     Persistent.timer.schedule(new Persistent.ExitTask(), 10000);
   }
 
@@ -215,9 +215,9 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
 
   /**
    * Read the object from the input stream.
-   * 
+   *
    * @param in the stream to read from
-   * 
+   *
    * @throws IOException if thrown by the stream
    * @throws ClassNotFoundException
    */
@@ -226,10 +226,10 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
   {
     // Read no fields.
   }
-  
+
   /**
    * Write the object to the output stream.
-   * 
+   *
    * @param out the stream to write int
    * @throws IOException if thrown by the stream
    * @throws ClassNotFoundException
@@ -238,6 +238,6 @@ public class ActivationSystemImpl extends ActivationSystemTransient implements
       ClassNotFoundException
   {
     // Write no fields.
-  }  
-  
+  }
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java
index 535f8ab92ac..446a87fb2db 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/ActivationSystemImpl_Stub.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -59,23 +59,23 @@ import java.rmi.UnexpectedException;
 
 /**
  * This class delegates its method calls to the remote RMI object, referenced
- * by {@link RemoteRef}. 
+ * by {@link RemoteRef}.
  *
  * It is normally generated with rmic.
  */
-public final class ActivationSystemImpl_Stub 
+public final class ActivationSystemImpl_Stub
     extends RemoteStub
     implements ActivationMonitor, Activator, ActivationSystem
 {
     /**
-     * Use serialVersionUID for interoperability 
+     * Use serialVersionUID for interoperability
      */
     private static final long serialVersionUID = 2;
-    
+
     /**
      * The explaining message for {@ling UnexpectedException}.
      */
-    private static final String exception_message = 
+    private static final String exception_message =
       "undeclared checked exception";
 
      /* All remote methods, invoked by this stub: */
@@ -96,8 +96,8 @@ public final class ActivationSystemImpl_Stub
     private static final Object[] NO_ARGS = new Object[0];
     static
       {
-        final Class[]  NO_ARGSc = new Class[0];      
-        try 
+        final Class[]  NO_ARGSc = new Class[0];
+        try
           {
              met_setActivationGroupDesc =
                ActivationSystem.class.getMethod("setActivationGroupDesc", new Class[]
@@ -174,20 +174,20 @@ public final class ActivationSystemImpl_Stub
                "ActivationSystemImpl_Stub class initialization failed");
              err.initCause(nex);
              throw err;
-          }  
+          }
       }
-    
+
     /**
      * Create the instance for _ActivationSystemImpl_Stub that forwards method calls to the
      * remote object.
      *
      * @para the reference to the remote object.
      */
-    public ActivationSystemImpl_Stub(RemoteRef reference) 
+    public ActivationSystemImpl_Stub(RemoteRef reference)
     {
        super(reference);
-    }    
-    
+    }
+
     /* Methods */
   /** @inheritDoc */
   public ActivationGroupDesc setActivationGroupDesc(ActivationGroupID p0,
@@ -216,7 +216,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void inactiveGroup(ActivationGroupID p0, long p1)
       throws UnknownGroupException, RemoteException
@@ -241,7 +241,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void unregisterObject(ActivationID p0) throws ActivationException,
       UnknownObjectException, RemoteException
@@ -266,7 +266,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationDesc getActivationDesc(ActivationID p0)
       throws ActivationException, UnknownObjectException, RemoteException
@@ -292,7 +292,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationDesc setActivationDesc(ActivationID p0, ActivationDesc p1)
       throws ActivationException, UnknownObjectException,
@@ -320,7 +320,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void shutdown() throws RemoteException
   {
@@ -343,7 +343,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public MarshalledObject activate(ActivationID p0, boolean p1)
       throws ActivationException, UnknownObjectException, RemoteException
@@ -370,7 +370,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationMonitor activeGroup(ActivationGroupID p0,
                                        ActivationInstantiator p1, long p2)
@@ -398,7 +398,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationGroupID registerGroup(ActivationGroupDesc p0)
       throws ActivationException, RemoteException
@@ -424,7 +424,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationGroupDesc getActivationGroupDesc(ActivationGroupID p0)
       throws ActivationException, UnknownGroupException, RemoteException
@@ -450,7 +450,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void activeObject(ActivationID p0, MarshalledObject p1)
       throws UnknownObjectException, RemoteException
@@ -475,7 +475,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public ActivationID registerObject(ActivationDesc p0)
       throws ActivationException, UnknownGroupException, RemoteException
@@ -501,7 +501,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void inactiveObject(ActivationID p0) throws UnknownObjectException,
       RemoteException
@@ -526,7 +526,7 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
   public void unregisterGroup(ActivationGroupID p0) throws ActivationException,
       UnknownGroupException, RemoteException
@@ -551,6 +551,6 @@ public final class ActivationSystemImpl_Stub
         throw uex;
       }
   }
-   
-    
+
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java
index 4ee079c1e5c..3cc2a12adbf 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/Main.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -58,7 +58,7 @@ import java.rmi.server.RMIServerSocketFactory;
 
 /**
  * The persistent RMI activation daemon.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class Main
@@ -67,17 +67,17 @@ public class Main
    * The RMI server socket factory.
    */
   static RMIServerSocketFactory ACTIVATION_REGISTY_SOCKET_FACTORY = null;
-  
+
   /**
    * The activation registry port.
    */
   static int ACTIVATION_REGISTRY_PORT = ActivationSystem.SYSTEM_PORT;
-  
+
   /**
    * The activation system name.
    */
   static String ACTIVATION_SYSTEM_NAME = "java.rmi.activation.ActivationSystem";
-  
+
   // Parse parameters:
   private boolean stop = false;
   private String directory = ".";
@@ -169,16 +169,16 @@ public class Main
             if (!dataDirectory.exists())
               dataDirectory.mkdirs();
             ActivationSystem system;
-            
+
             if (!persistent)
               system = ActivationSystemTransient.getInstance();
             else
               system = ActivationSystemImpl.getInstance(dataDirectory, cold);
-            
+
             // We must export with the specific activation id that is only
             // possible when going into the gnu.java.rmi.activation.
             UnicastServerRef sref = new UnicastServerRef(
-               new ObjID(ObjID.ACTIVATOR_ID), ACTIVATION_REGISTRY_PORT, 
+               new ObjID(ObjID.ACTIVATOR_ID), ACTIVATION_REGISTRY_PORT,
                ACTIVATION_REGISTY_SOCKET_FACTORY);
             Remote systemStub = sref.exportObject(system);
 
@@ -200,7 +200,7 @@ public class Main
                 r.rebind(ACTIVATION_SYSTEM_NAME, systemStub);
               }
             String host = InetAddress.getLocalHost().getCanonicalHostName();
-            System.out.println("The RMI daemon is listening on " + host + 
+            System.out.println("The RMI daemon is listening on " + host +
                                " (port "
                                + ACTIVATION_REGISTRY_PORT + ")");
 
@@ -216,7 +216,7 @@ public class Main
                 // Expect the naming service running first.
                 // The local host may want to use the shared registry
                 r = LocateRegistry.getRegistry(ACTIVATION_REGISTRY_PORT);
-                ActivationSystem asys = 
+                ActivationSystem asys =
                   (ActivationSystem) r.lookup(ACTIVATION_SYSTEM_NAME);
                 asys.shutdown();
                 System.out.println("OK.");
@@ -236,7 +236,7 @@ public class Main
         if (ActivationSystemTransient.debug)
           e.printStackTrace();
       }
-  } 
+  }
 
   /**
    * The activation system entry point.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java b/libjava/classpath/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java
index d213373d5ff..9d98496630e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmid/PersistentBidiHashTable.java
@@ -61,7 +61,7 @@ import java.util.TimerTask;
  * database change or at most after ALWAYS_UPDATE, if the database is updated
  * very frequently. To ensure that no information is lost, the shutdown method
  * must be called before exit.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class PersistentBidiHashTable extends BidiTable implements
@@ -129,7 +129,7 @@ public class PersistentBidiHashTable extends BidiTable implements
   /**
    * Create a new persistent table that stores its information into the given
    * file. The ActivationSystemImpl.singleton2 must be assigned.
-   * 
+   *
    * @param file
    *          the file, where the table stores its information.
    * @param coldStart
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/Main.java b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/Main.java
index e5c41930de1..f22e81b6e9e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/Main.java
@@ -59,7 +59,7 @@ import java.util.Map;
 
 /**
  * The optionally persistent RMI registry implementation.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class Main
@@ -68,7 +68,7 @@ public class Main
    * The stop command.
    */
   public static String STOP = "gnu.classpath.tools.rmi.registry.command.STOP";
-  
+
   /**
    * If true, the registry prints registration events to console.
    */
@@ -195,7 +195,7 @@ public class Main
           {
             Registry r = LocateRegistry.getRegistry(port);
             // Search for this specific line will command to stop the registry.
-            
+
             // Our service returns null, but any other service will thrown
             // NotBoundException.
             r.unbind(STOP);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java
index 89d66ce4ad7..3202a84059a 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/PersistentHashTable.java
@@ -56,11 +56,11 @@ import java.util.TimerTask;
  * SAVE_AT_MOST_AFTER time from the latest database change or at most after
  * ALWAYS_UPDATE, if the database is updated very frequently. To ensure that no
  * information is lost, the shutdown method must be called before exit.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
-public class PersistentHashTable 
-  extends Hashtable 
+public class PersistentHashTable
+  extends Hashtable
   implements Serializable, Persistent
 {
 
@@ -95,14 +95,14 @@ public class PersistentHashTable
    * The time, when the disk database was last updated.
    */
   long lastUpdated;
-  
+
   /**
    * Setting to false prevents the automated disk update.
    * The initial value is true to prevent writing while reading and is set
    * to false in createInstance.
    */
   transient boolean ready;
-  
+
   /**
    * Use static method to obtain the instance.
    */
@@ -116,7 +116,7 @@ public class PersistentHashTable
   /**
    * Create a new persistent table that stores its information into the given
    * file.
-   * 
+   *
    * @param file
    *          the file, where the table stores its information.
    * @param coldStart
@@ -161,7 +161,7 @@ public class PersistentHashTable
           k2v = new PersistentHashTable(file);
         System.out.println ("Here7");
           }
-        
+
         System.out.println ("Here8");
         k2v.ready = true;
         return k2v;
@@ -174,8 +174,8 @@ public class PersistentHashTable
         throw ierr;
       }
   }
-  
-  
+
+
   /**
    * Write the database content to the disk.
    */
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java
index b93d3c1169e..80d0fe0c1d8 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl.java
@@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -51,7 +51,7 @@ import java.util.Map;
 
 /**
  * The optionally persistent registry implementation.
- * 
+ *
  * @author Audrius Meskauskas (audriusa@bioinformatics.org)
  */
 public class RegistryImpl implements Registry
@@ -60,16 +60,16 @@ public class RegistryImpl implements Registry
    * The binding table.
    */
   Map bindings;
-  
+
   /**
    * Create the registry implementation that uses the given bidirectinal
    * table to keep the data.
    */
   public RegistryImpl(Map aTable)
   {
-    bindings = aTable;    
+    bindings = aTable;
   }
-  
+
   /** @inheritDoc */
   public Remote lookup(String name) throws RemoteException, NotBoundException,
       AccessException
@@ -107,7 +107,7 @@ public class RegistryImpl implements Registry
       {
         if (Main.verbose)
           System.out.println("Unbind "+name);
-        
+
         if (!bindings.containsKey(name))
           throw new NotBoundException(name);
         else
@@ -124,7 +124,7 @@ public class RegistryImpl implements Registry
     bindings.put(name, obj);
   }
 
-  /** @inheritDoc */  
+  /** @inheritDoc */
   public String[] list() throws RemoteException, AccessException
   {
     // Create a separated array to prevent race conditions.
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java
index 5150debd1de..fa717892a1e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Skel.java
@@ -49,7 +49,7 @@ import java.rmi.server.RemoteCall;
 import java.rmi.server.SkeletonMismatchException;
 
 /**
- * This skeleton supports unlikely cases when the naming service is 
+ * This skeleton supports unlikely cases when the naming service is
  * contacted from other interoperable java implementation that still uses
  * the old style skeleton-dependent invocations.
  */
@@ -57,18 +57,18 @@ public final class RegistryImpl_Skel
     implements java.rmi.server.Skeleton
 {
     private static final long interfaceHash = 4905912898345647071L;
-    
+
     /**
      * Repeated multiple times.
      */
     static final String EUM = "error unmarshalling arguments for Registry";
-    
+
     /**
      * Repeated multiple times.
      */
     static final String EMR = "error marshalling return from Registry";
-    
-    private static final Operation[] operations = 
+
+    private static final Operation[] operations =
       {
          new Operation("void bind(java.lang.String, Remote"),
          new Operation("java.lang.String[] list("),
@@ -76,12 +76,12 @@ public final class RegistryImpl_Skel
          new Operation("void rebind(java.lang.String, Remote"),
          new Operation("void unbind(java.lang.String")
       };
-    
+
     public Operation[] getOperations()
   {
     return ((Operation[]) operations.clone());
   }
-    
+
     public void dispatch(Remote obj, RemoteCall call,
                        int opnum, long hash) throws java.lang.Exception
   {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java
index 94d35e92fb3..dfb277fbde0 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/rmiregistry/RegistryImpl_Stub.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -51,23 +51,23 @@ import java.rmi.UnexpectedException;
 
 /**
  * This class delegates its method calls to the remote RMI object, referenced
- * by {@link RemoteRef}. 
+ * by {@link RemoteRef}.
  *
  * It is normally generated with rmic.
  */
-public final class RegistryImpl_Stub 
+public final class RegistryImpl_Stub
     extends RemoteStub
     implements Registry
 {
     /**
-     * Use serialVersionUID for interoperability 
+     * Use serialVersionUID for interoperability
      */
     private static final long serialVersionUID = 3;
-    
+
     /**
      * The explaining message for {@ling UnexpectedException}.
      */
-    private static final String exception_message = 
+    private static final String exception_message =
       "undeclared checked exception";
 
      /* All remote methods, invoked by this stub: */
@@ -79,8 +79,8 @@ public final class RegistryImpl_Stub
     private static final Object[] NO_ARGS = new Object[0];
     static
       {
-        final Class[]  NO_ARGSc = new Class[0];      
-        try 
+        final Class[]  NO_ARGSc = new Class[0];
+        try
           {
              met_list =
                Registry.class.getMethod("list", NO_ARGSc);
@@ -112,23 +112,23 @@ public final class RegistryImpl_Stub
                "RegistryImpl_Stub class initialization failed");
              err.initCause(nex);
              throw err;
-          }  
+          }
       }
-    
+
     /**
      * Create the instance for _RegistryImpl_Stub that forwards method calls to the
      * remote object.
      *
      * @para the reference to the remote object.
      */
-    public RegistryImpl_Stub(RemoteRef reference) 
+    public RegistryImpl_Stub(RemoteRef reference)
     {
        super(reference);
-    }    
-    
-    /* Methods */    
+    }
+
+    /* Methods */
   /** @inheritDoc */
-  public String [] list() 
+  public String [] list()
     throws RemoteException, AccessException
   {
     try
@@ -136,7 +136,7 @@ public final class RegistryImpl_Stub
         Object result =  ref.invoke(this, met_list,
                    NO_ARGS,
                    2571371476350237748L);
-        return (String []) result;           
+        return (String []) result;
       }
     catch (RuntimeException e)
       {
@@ -153,9 +153,9 @@ public final class RegistryImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
-  public void rebind(String p0, Remote p1) 
+  public void rebind(String p0, Remote p1)
     throws RemoteException, AccessException
   {
     try
@@ -179,9 +179,9 @@ public final class RegistryImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
-  public void unbind(String p0) 
+  public void unbind(String p0)
     throws RemoteException, NotBoundException, AccessException
   {
     try
@@ -205,9 +205,9 @@ public final class RegistryImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
-  public Remote lookup(String p0) 
+  public Remote lookup(String p0)
     throws RemoteException, NotBoundException, AccessException
   {
     try
@@ -215,7 +215,7 @@ public final class RegistryImpl_Stub
         Object result =  ref.invoke(this, met_lookup,
                    new Object[] {p0},
                    -7538657168040752697L);
-        return (Remote) result;           
+        return (Remote) result;
       }
     catch (RuntimeException e)
       {
@@ -232,9 +232,9 @@ public final class RegistryImpl_Stub
         throw uex;
       }
   }
-   
+
   /** @inheritDoc */
-  public void bind(String p0, Remote p1) 
+  public void bind(String p0, Remote p1)
     throws RemoteException, AlreadyBoundException, AccessException
   {
     try
@@ -258,6 +258,6 @@ public final class RegistryImpl_Stub
         throw uex;
       }
   }
-   
-    
+
+
 }
diff --git a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java
index ba586170e52..5fd7419b2df 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/serialver/SerialVer.java
@@ -7,7 +7,7 @@
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2, or (at your option)
  any later version.
- 
+
  GNU Classpath is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@
  You should have received a copy of the GNU General Public License
  along with GNU Classpath; see the file COPYING.  If not, write to the
  Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. 
+ 02111-1307 USA.
 
  Linking this library statically or dynamically with other modules is
  making a combined work based on this library.  Thus, the terms and
@@ -176,4 +176,4 @@ public class SerialVer
   {
     new SerialVer().run(args);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java
index fd6e924f18c..1a1f32b7dfe 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/AuthorTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -52,7 +52,7 @@ import com.sun.javadoc.Tag;
  *  @author Julian Scheid (julian@sektor37.de)
  */
 public class AuthorTaglet implements Taglet {
-   
+
    /**
     *  Enum class which denotes whether and how to replace email
     *  addresses in author tags.
@@ -86,7 +86,7 @@ public class AuthorTaglet implements Taglet {
        *  specified by AuthorTaglet.emailAtReplacement and
        *  AuthorTaglet.emailDotReplacement.
        */
-      public static final EmailReplacement NAME_MANGLED_ADDRESS = new EmailReplacement();      
+      public static final EmailReplacement NAME_MANGLED_ADDRESS = new EmailReplacement();
    }
 
    private static EmailReplacement emailReplacementType = EmailReplacement.NO_REPLACEMENT;
@@ -98,7 +98,7 @@ public class AuthorTaglet implements Taglet {
    private static final String MULTI_HEADER = "Authors:";
 
    private static boolean enabled = true;
-   
+
    /**
     *  Matches <code>.</code> (dot).
     */
@@ -119,9 +119,9 @@ public class AuthorTaglet implements Taglet {
                        + "(?:[^\t\r\n ]|\\()+" // first name
                        + "(?:\\s+(?:[^\t\r\n ]|\\()+)*" // additional names
                        + ")" // group #1 end
-                       + "\\s*" // optional whitespace                    
+                       + "\\s*" // optional whitespace
                        + "[(<]" // opening paren
-                       + "\\s*" // optional whitespace                       
+                       + "\\s*" // optional whitespace
                        + "(" // group #2 start (email address)
                        + "(" // group #3 start (email user)
                        + "[A-z0-9_\\-\\.]+" // username
@@ -132,11 +132,11 @@ public class AuthorTaglet implements Taglet {
                        + "\\s*" // optional whitespace
                        + "(?:\\)|>)" // closing paren
                        + "$");
-    
+
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -144,11 +144,11 @@ public class AuthorTaglet implements Taglet {
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -160,10 +160,10 @@ public class AuthorTaglet implements Taglet {
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public static void register(Map tagletMap) {
       AuthorTaglet authorTaglet = new AuthorTaglet();
@@ -190,7 +190,7 @@ public class AuthorTaglet implements Taglet {
                haveValidTag = true;
             }
          }
-         
+
          if (haveValidTag) {
             StringBuffer result = new StringBuffer();
             result.append("<dl class=\"tag list\">");
@@ -214,7 +214,7 @@ public class AuthorTaglet implements Taglet {
             return null;
          }
       }
-   }   
+   }
 
    /**
     *  Reformat the tag text according to {@link #emailReplacementType}.
@@ -229,7 +229,7 @@ public class AuthorTaglet implements Taglet {
          if (matcher.matches()) {
             String realName = matcher.group(1);
             String emailAddress = matcher.group(2);
-            if (EmailReplacement.MAILTO_NAME == emailReplacementType) {         
+            if (EmailReplacement.MAILTO_NAME == emailReplacementType) {
                return "<a href=\"mailto:" + emailAddress + "\">" + realName + "</a>";
             }
             else if (EmailReplacement.NAME_MAILTO_ADDRESS == emailReplacementType) {
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java
index f76e77965aa..adc34f391e8 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/CodeTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -53,7 +53,7 @@ import com.sun.javadoc.SeeTag;
  *
  *  @author Julian Scheid (julian@sektor37.de)
  */
-public class CodeTaglet 
+public class CodeTaglet
    implements Taglet
 {
    private static final String NAME = "code";
@@ -61,7 +61,7 @@ public class CodeTaglet
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -69,11 +69,11 @@ public class CodeTaglet
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -85,10 +85,10 @@ public class CodeTaglet
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return true;
-   }    
+   }
 
    public String toString(Tag tag) {
       return "<code>" + tag.text() + "</code>";
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java
index 6f744a9f21d..60e3e40a86e 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/CopyrightTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -50,11 +50,11 @@ public class CopyrightTaglet implements Taglet {
 
    private static final String NAME = "copyright";
    private static final String HEADER = "Copyright:";
-    
+
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -62,11 +62,11 @@ public class CopyrightTaglet implements Taglet {
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -78,10 +78,10 @@ public class CopyrightTaglet implements Taglet {
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public static void register(Map tagletMap) {
       CopyrightTaglet copyrightTaglet = new CopyrightTaglet();
@@ -103,7 +103,7 @@ public class CopyrightTaglet implements Taglet {
                haveValidTag = true;
             }
          }
-         
+
          if (haveValidTag) {
             StringBuffer result = new StringBuffer();
             result.append("<dl>");
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java
index aae4ad357b1..d292c7f3a35 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/DeprecatedTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,16 +49,16 @@ import com.sun.javadoc.Tag;
  *  @author Julian Scheid (julian@sektor37.de)
  */
 public class DeprecatedTaglet implements Taglet {
-   
+
    private static final String NAME = "deprecated";
    private static final String HEADER = "Deprecated:";
 
    private static boolean enabled = true;
-   
+
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -66,11 +66,11 @@ public class DeprecatedTaglet implements Taglet {
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -82,10 +82,10 @@ public class DeprecatedTaglet implements Taglet {
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public static void register(Map tagletMap) {
       DeprecatedTaglet deprecatedTaglet = new DeprecatedTaglet();
@@ -106,7 +106,7 @@ public class DeprecatedTaglet implements Taglet {
          return null;
       }
       else {
-         
+
          StringBuffer result = new StringBuffer();
          result.append("<div class=\"classdoc-tag-section-header\">");
          result.append(HEADER);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java
index 34eac2badef..31ff289223b 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/GenericTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,7 +49,7 @@ import com.sun.javadoc.Tag;
  *  @author Julian Scheid (julian@sektor37.de)
  */
 public class GenericTaglet implements Taglet {
-   
+
    private String name = "since";
    private String header = "Since:";
 
@@ -80,11 +80,11 @@ public class GenericTaglet implements Taglet {
       this.scopeMethod = scopeMethod;
       this.scopeField = scopeField;
    }
-   
+
    public String getName() {
       return name;
    }
-    
+
    public boolean inField() {
       return scopeField;
    }
@@ -92,11 +92,11 @@ public class GenericTaglet implements Taglet {
    public boolean inConstructor() {
       return scopeConstructor;
    }
-    
+
    public boolean inMethod() {
       return scopeMethod;
    }
-   
+
    public boolean inOverview() {
       return scopeOverview;
    }
@@ -108,10 +108,10 @@ public class GenericTaglet implements Taglet {
    public boolean inType() {
       return scopeType;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public void register(Map tagletMap) {
       tagletMap.put(getName(), this);
@@ -131,7 +131,7 @@ public class GenericTaglet implements Taglet {
          return null;
       }
       else {
-         
+
          StringBuffer result = new StringBuffer();
          result.append("<div class=\"classdoc-tag-section-header\">");
          result.append(header);
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java
index 5f8726aa048..e7801906795 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/GnuExtendedTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java
index aa1e1149165..c3737522d68 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/SinceTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -51,7 +51,7 @@ import gnu.classpath.tools.doclets.InlineTagRenderer;
  *  @author Julian Scheid (julian@sektor37.de)
  */
 public class SinceTaglet implements GnuExtendedTaglet {
-   
+
    private static final String NAME = "since";
    private static final String HEADER = "Since:";
 
@@ -63,11 +63,11 @@ public class SinceTaglet implements GnuExtendedTaglet {
    {
       this.inlineTagRenderer = inlineTagRenderer;
    }
-   
+
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -75,11 +75,11 @@ public class SinceTaglet implements GnuExtendedTaglet {
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -91,10 +91,10 @@ public class SinceTaglet implements GnuExtendedTaglet {
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public String toString(Tag tag) {
       // should raise assertion
@@ -111,12 +111,12 @@ public class SinceTaglet implements GnuExtendedTaglet {
       return toString(tags, null);
    }
 
-   public String toString(Tag tag, TagletContext context) 
+   public String toString(Tag tag, TagletContext context)
    {
       return null;
    }
 
-   public String toString(Tag[] tags, TagletContext context) 
+   public String toString(Tag[] tags, TagletContext context)
    {
       if (!enabled || tags.length == 0) {
          return null;
@@ -128,7 +128,7 @@ public class SinceTaglet implements GnuExtendedTaglet {
                haveValidTag = true;
             }
          }
-         
+
          if (haveValidTag) {
             StringBuffer result = new StringBuffer();
             result.append("<dl class=\"tag list\">");
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java
index ff26747e2d9..82d8aea26b9 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/TagletContext.java
@@ -1,4 +1,4 @@
-/* TagletContext.java - 
+/* TagletContext.java -
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java
index cfc393886f4..1b07ada8c50 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/ValueTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -52,7 +52,7 @@ import com.sun.javadoc.SeeTag;
  *
  *  @author Julian Scheid (julian@sektor37.de)
  */
-public class ValueTaglet 
+public class ValueTaglet
    implements GnuExtendedTaglet
 {
    private static final String NAME = "value";
@@ -60,7 +60,7 @@ public class ValueTaglet
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -68,11 +68,11 @@ public class ValueTaglet
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -84,10 +84,10 @@ public class ValueTaglet
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return true;
-   }    
+   }
 
    public static void register(Map tagletMap) {
       ValueTaglet valueTaglet = new ValueTaglet();
diff --git a/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java b/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java
index fadb972ea87..fed926e0632 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/taglets/VersionTaglet.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -16,7 +16,7 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA. 
+02111-1307 USA.
 
 Linking this library statically or dynamically with other modules is
 making a combined work based on this library.  Thus, the terms and
@@ -49,16 +49,16 @@ import com.sun.javadoc.Tag;
  *  @author Julian Scheid (julian@sektor37.de)
  */
 public class VersionTaglet implements Taglet {
-   
+
    private static final String NAME = "version";
    private static final String HEADER = "Version:";
 
    private static boolean enabled = true;
-   
+
    public String getName() {
       return NAME;
    }
-    
+
    public boolean inField() {
       return true;
    }
@@ -66,11 +66,11 @@ public class VersionTaglet implements Taglet {
    public boolean inConstructor() {
       return true;
    }
-    
+
    public boolean inMethod() {
       return true;
    }
-   
+
    public boolean inOverview() {
       return true;
    }
@@ -82,10 +82,10 @@ public class VersionTaglet implements Taglet {
    public boolean inType() {
       return true;
    }
-    
+
    public boolean isInlineTag() {
       return false;
-   }    
+   }
 
    public static void register(Map tagletMap) {
       VersionTaglet versionTaglet = new VersionTaglet();
@@ -112,9 +112,9 @@ public class VersionTaglet implements Taglet {
                haveValidTag = true;
             }
          }
-         
+
          if (haveValidTag) {
-            
+
             StringBuffer result = new StringBuffer();
             result.append("<dl class=\"tag list\">");
             result.append("</dl>");
diff --git a/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java b/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java
index 78a8f98c4f0..b163fd539ed 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/tnameserv/Main.java
@@ -48,12 +48,12 @@ import gnu.classpath.tools.getopt.Parser;
  * is a kind of the network server that registers local and remote objects
  * by name, and later can provide the object reference in response to the
  * given name.
- * 
+ *
  * GNU Classpath currently works with this naming service and is also
  * interoperable with the Sun Microsystems naming services from releases 1.3 and
  * 1.4, both transient <i>tnameserv</i> and persistent <i>orbd</i>.
- * 
- * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)  
+ *
+ * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class Main
 {
diff --git a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMFrame.java b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMFrame.java
index 767a902ff1c..6419d3ee97a 100644
--- a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMFrame.java
+++ b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMFrame.java
@@ -44,8 +44,8 @@ import gnu.classpath.jdwp.value.Value;
 
 /**
  * Reference implementation of VM hooks for JDWP Frame access.
- * 
- * @author aluchko 
+ *
+ * @author aluchko
  */
 
 public class VMFrame
@@ -54,22 +54,22 @@ public class VMFrame
    * Returns the size of a frame ID over JDWP
    */
   public static final int SIZE = 8;
-  
+
   //The thread this frame resides in
   private Thread thread;
 
   // The object this frame resides in
   private Object obj;
-  
+
   // The current location of this frame
   private Location loc;
-  
+
   // id of this frame
   private long id;
-  
+
   /**
    * Create a new VMFrame object.
-   * 
+   *
    * @param thr a Thread, the thread this frame is in
    * @param frame_id a long, the jframeID of this frame
    * @param frame_loc a Location, the location of this frame
@@ -83,7 +83,7 @@ public class VMFrame
     loc = frame_loc;
     obj = frame_obj;
   }
-  
+
   /**
    * Gets the current location of the frame.
    */
@@ -94,18 +94,18 @@ public class VMFrame
 
   /**
    * Returns the value of the variable in the given slot.
-   * 
+   *
    * @param slot the slot containing the variable
    */
   public native Value getValue(int slot, byte sig);
 
   /**
-   * Assigns the given variable to the given value. 
+   * Assigns the given variable to the given value.
    * @param slot The slot which contains the variable
    * @param value The value to assign the variable to
    */
   public native void setValue(int slot, Value value);
-  
+
   /**
    * Get the thread this frame is in.
    */
diff --git a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMIdManager.java b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMIdManager.java
index 9360e764dfb..ac3e05a7c27 100644
--- a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMIdManager.java
+++ b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMIdManager.java
@@ -119,49 +119,49 @@ public class VMIdManager
 
       // Special case: arrays
       if (object.getClass ().isArray ())
-	id = new ArrayId ();
+        id = new ArrayId ();
       else
-	{
-	  // Loop through all classes until we hit baseclass
-	  Class myClass;
-	  for (myClass = object.getClass (); myClass != null;
-	       myClass = myClass.getSuperclass ())
-	    {
-	      Class clz = (Class) _idList.get (myClass);
-	      if (clz != null)
-		{
-		  try
-		    {
-		      id = (ObjectId) clz.newInstance ();
-		      synchronized (_idLock)
-			{
-			  id.setId (++_lastId);
-			}
-		      id.setReference (obj);
-		      return id;
-		    }
-		  catch (InstantiationException ie)
-		    {
-		      // This really should not happen
-		      throw new RuntimeException ("cannot create new ID", ie);
-		    }
-		  catch (IllegalAccessException iae)
-		    {
-		      // This really should not happen
-		      throw new RuntimeException ("illegal access of ID", iae);
-		    }
-		}
-	    }
+        {
+          // Loop through all classes until we hit baseclass
+          Class myClass;
+          for (myClass = object.getClass (); myClass != null;
+               myClass = myClass.getSuperclass ())
+            {
+              Class clz = (Class) _idList.get (myClass);
+              if (clz != null)
+                {
+                  try
+                    {
+                      id = (ObjectId) clz.newInstance ();
+                      synchronized (_idLock)
+                        {
+                          id.setId (++_lastId);
+                        }
+                      id.setReference (obj);
+                      return id;
+                    }
+                  catch (InstantiationException ie)
+                    {
+                      // This really should not happen
+                      throw new RuntimeException ("cannot create new ID", ie);
+                    }
+                  catch (IllegalAccessException iae)
+                    {
+                      // This really should not happen
+                      throw new RuntimeException ("illegal access of ID", iae);
+                    }
+                }
+            }
 
-	  /* getSuperclass returned null and no matching ID type found.
-	     So it must derive from Object. */
-	  id = new ObjectId ();
-	}
+          /* getSuperclass returned null and no matching ID type found.
+             So it must derive from Object. */
+          id = new ObjectId ();
+        }
 
       synchronized (_idLock)
-	{
-	  id.setId (++_lastId);
-	}
+        {
+          id.setId (++_lastId);
+        }
       id.setReference (obj);
       return id;
     }
@@ -178,19 +178,19 @@ public class VMIdManager
       ReferenceTypeId id;
       Class clazz = (Class) ref.get ();
       if (clazz == null)
-	return null;
+        return null;
 
       if (clazz.isArray ())
-	id = new ArrayReferenceTypeId ();
+        id = new ArrayReferenceTypeId ();
       else if (clazz.isInterface ())
-	id = new InterfaceReferenceTypeId ();
+        id = new InterfaceReferenceTypeId ();
       else
-	id = new ClassReferenceTypeId ();
+        id = new ClassReferenceTypeId ();
       id.setReference (ref);
       synchronized (_ridLock)
-	{
-	  id.setId (++_lastRid);
-	}
+        {
+          id.setId (++_lastRid);
+        }
       return id;
     }
   }
@@ -218,7 +218,7 @@ public class VMIdManager
       super (referent);
       _hash = referent.hashCode ();
     }
-    
+
     /**
      * Constructs a new <code>ReferenceKey</code> object
      * with the given referent and reference queue.
@@ -235,7 +235,7 @@ public class VMIdManager
       super (referent, queue);
       _hash = referent.hashCode ();
     }
-    
+
     /**
      * Returns the hash code of the referent.
      * This seems hacky, but is required in order to use this class
@@ -262,21 +262,21 @@ public class VMIdManager
     public boolean equals (Object obj)
     {
       if (obj instanceof ReferenceKey)
-	{
-	  ReferenceKey ref = (ReferenceKey) obj;
-	  
-	  /* First check if the two references are the same.
-	     If they are, that means we must be clearing GCd objects. */
-	  if (this == obj)
-	    return true;
-	  
-	  return (ref.get () == get ());
-	}
-      
+        {
+          ReferenceKey ref = (ReferenceKey) obj;
+
+          /* First check if the two references are the same.
+             If they are, that means we must be clearing GCd objects. */
+          if (this == obj)
+            return true;
+
+          return (ref.get () == get ());
+        }
+
       return false;
     }
   }
-  
+
   // instance of VMIdManager
   private static VMIdManager _idm = new VMIdManager ();
 
@@ -322,9 +322,9 @@ public class VMIdManager
     Reference ref;
     while ((ref = _refQueue.poll ()) != null)
       {
-	ObjectId id = (ObjectId) _oidTable.get (ref);
-	_oidTable.remove (ref);
-	_idTable.remove (new Long (id.getId ()));
+        ObjectId id = (ObjectId) _oidTable.get (ref);
+        _oidTable.remove (ref);
+        _idTable.remove (new Long (id.getId ()));
       }
   }
 
@@ -340,18 +340,18 @@ public class VMIdManager
     // Special case: null
     if (theObject == null)
       return new NullObjectId ();
-    
+
     ReferenceKey ref = new ReferenceKey (theObject, _refQueue);
     ObjectId id = (ObjectId) _oidTable.get (ref);
     if (id == null)
       {
-	// update the tables -- this is an arbitrary place to put this
-	_update ();
+        // update the tables -- this is an arbitrary place to put this
+        _update ();
 
-	// Object not found. Make new id for it
-	id = IdFactory.newObjectId (ref);
-	_oidTable.put (ref, id);
-	_idTable.put (new Long (id.getId ()), id);
+        // Object not found. Make new id for it
+        id = IdFactory.newObjectId (ref);
+        _oidTable.put (ref, id);
+        _idTable.put (new Long (id.getId ()), id);
       }
 
     return id;
@@ -371,11 +371,11 @@ public class VMIdManager
     // Special case: null
     if (id == 0)
       return new NullObjectId ();
-    
+
     ObjectId oid = (ObjectId) _idTable.get (new Long (id));
     if (oid == null)
       throw new InvalidObjectException (id);
- 
+
     return oid;
   }
 
@@ -399,10 +399,10 @@ public class VMIdManager
     ReferenceTypeId id = (ReferenceTypeId)_classTable.get (ref);
     if (id == null)
       {
-	// Object not found. Make new id for it
-	id = IdFactory.newReferenceTypeId (ref);
-	_classTable.put (ref, id);
-	_ridTable.put (new Long (id.getId ()), id);
+        // Object not found. Make new id for it
+        id = IdFactory.newReferenceTypeId (ref);
+        _classTable.put (ref, id);
+        _ridTable.put (new Long (id.getId ()), id);
       }
 
     return id;
@@ -422,7 +422,7 @@ public class VMIdManager
     ReferenceTypeId rid = (ReferenceTypeId) _ridTable.get (new Long (id));
     if (rid == null)
       throw new InvalidClassException (id);
- 
+
     return rid;
   }
 
diff --git a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMMethod.java b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMMethod.java
index 6a2b04ecf97..8e15a48d15c 100644
--- a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMMethod.java
+++ b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMMethod.java
@@ -180,8 +180,8 @@ public class VMMethod
   {
     if (obj instanceof VMMethod)
       {
-	VMMethod m = (VMMethod) obj;
-	return (getId() == m.getId());
+        VMMethod m = (VMMethod) obj;
+        return (getId() == m.getId());
       }
 
     return false;
diff --git a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
index 639a957194b..1f85a4a1865 100644
--- a/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
+++ b/libjava/classpath/vm/reference/gnu/classpath/jdwp/VMVirtualMachine.java
@@ -98,10 +98,10 @@ public class VMVirtualMachine
     ThreadGroup parent = group.getParent ();
     while (parent != null)
       {
-	group = parent;
-	parent = group.getParent ();
+        group = parent;
+        parent = group.getParent ();
       }
-    
+
     // Get all the threads in the system
     int num = group.activeCount ();
     Thread[] threads = new Thread[num];
@@ -109,17 +109,17 @@ public class VMVirtualMachine
 
     for (int i = 0; i < num; ++i)
       {
-	Thread t = threads[i];
-	if (t != null)
-	  {
-	    if (t.getThreadGroup () == jdwpGroup || t == current)
-	      {
-		// Don't suspend the current thread or any JDWP thread
-		continue;
-	      }
-	    else
-	      suspendThread (t);
-	  }
+        Thread t = threads[i];
+        if (t != null)
+          {
+            if (t.getThreadGroup () == jdwpGroup || t == current)
+              {
+                // Don't suspend the current thread or any JDWP thread
+                continue;
+              }
+            else
+              suspendThread (t);
+          }
       }
 
     // Now suspend the current thread
@@ -153,10 +153,10 @@ public class VMVirtualMachine
     ThreadGroup parent = group.getParent ();
     while (parent != null)
       {
-	group = parent;
-	parent = group.getParent ();
+        group = parent;
+        parent = group.getParent ();
       }
-    
+
     // Get all the threads in the system
     int num = group.activeCount ();
     Thread[] threads = new Thread[num];
@@ -164,17 +164,17 @@ public class VMVirtualMachine
 
     for (int i = 0; i < num; ++i)
       {
-	Thread t = threads[i];
-	if (t != null)
-	  {
-	    if (t.getThreadGroup () == jdwpGroup || t == current)
-	      {
-		// Don't resume the current thread or any JDWP thread
-		continue;
-	      }
-	    else
-	      resumeThread (t);
-	  }
+        Thread t = threads[i];
+        if (t != null)
+          {
+            if (t.getThreadGroup () == jdwpGroup || t == current)
+              {
+                // Don't resume the current thread or any JDWP thread
+                continue;
+              }
+            else
+              resumeThread (t);
+          }
       }
   }
 
@@ -186,7 +186,7 @@ public class VMVirtualMachine
    */
   public static native int getSuspendCount(Thread thread)
     throws JdwpException;
- 
+
   /**
    * Returns a Collection of all classes loaded in the VM
    */
@@ -236,7 +236,7 @@ public class VMVirtualMachine
    * @return a list of frames
    */
   public static native ArrayList getFrames(Thread thread, int start,
-					    int length)
+                                            int length)
     throws JdwpException;
 
   /**
@@ -297,9 +297,9 @@ public class VMVirtualMachine
    * @return a result object containing the results of the invocation
    */
   public static native MethodResult executeMethod (Object obj, Thread thread,
-					    Class clazz, VMMethod method,
-					    Value[] values,
-					    int options)
+                                            Class clazz, VMMethod method,
+                                            Value[] values,
+                                            int options)
     throws JdwpException;
 
   /**
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/VMCPStringBuilder.java b/libjava/classpath/vm/reference/gnu/java/lang/VMCPStringBuilder.java
index 8e137cd3fec..c3a3784f398 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/VMCPStringBuilder.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/VMCPStringBuilder.java
@@ -59,16 +59,16 @@ final class VMCPStringBuilder
   {
     try
       {
-	cons = String.class.getDeclaredConstructor(new Class[] { char[].class,
-								 Integer.TYPE,
-								 Integer.TYPE,
-								 Boolean.TYPE });
-	cons.setAccessible(true);
+        cons = String.class.getDeclaredConstructor(new Class[] { char[].class,
+                                                                 Integer.TYPE,
+                                                                 Integer.TYPE,
+                                                                 Boolean.TYPE });
+        cons.setAccessible(true);
       }
     catch (NoSuchMethodException e)
       {
-	throw (Error) 
-	  new InternalError("Could not get no-copy String constructor").initCause(e);
+        throw (Error)
+          new InternalError("Could not get no-copy String constructor").initCause(e);
       }
   }
 
@@ -87,25 +87,25 @@ final class VMCPStringBuilder
   {
     try
       {
-	return (String)
-	  cons.newInstance(new Object[] { value, Integer.valueOf(startIndex),
-					  Integer.valueOf(count),
-					  Boolean.valueOf(true) });
+        return (String)
+          cons.newInstance(new Object[] { value, Integer.valueOf(startIndex),
+                                          Integer.valueOf(count),
+                                          Boolean.valueOf(true) });
       }
     catch (InstantiationException e)
       {
-	throw (Error) 
-	  new InternalError("Could not instantiate no-copy String constructor").initCause(e);
+        throw (Error)
+          new InternalError("Could not instantiate no-copy String constructor").initCause(e);
       }
     catch (IllegalAccessException e)
       {
-	throw (Error) 
-	  new InternalError("Could not access no-copy String constructor").initCause(e);
+        throw (Error)
+          new InternalError("Could not access no-copy String constructor").initCause(e);
       }
     catch (InvocationTargetException e)
       {
-	throw (Error) 
-	  new InternalError("Error calling no-copy String constructor").initCause(e);
+        throw (Error)
+          new InternalError("Error calling no-copy String constructor").initCause(e);
       }
   }
 
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/VMInstrumentationImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/VMInstrumentationImpl.java
index eee94702d35..5501f0f7f5b 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/VMInstrumentationImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/VMInstrumentationImpl.java
@@ -48,14 +48,14 @@ import java.lang.instrument.Instrumentation;
  */
 final class VMInstrumentationImpl
 {
- 
+
   /**
    * Returns if the current JVM supports class redefinition
-   * 
+   *
    * @return true if the current JVM supports class redefinition
    */
   static native boolean isRedefineClassesSupported();
-    
+
   /**
    * Redefines classes given as parameters. The method has to call
    * the callTransformers from InstrumentationImpl
@@ -63,8 +63,8 @@ final class VMInstrumentationImpl
    * @param inst an instrumentation object
    * @param definitions an array of bytecode<->class correspondance
    *
-   * @throws ClassNotFoundException if a class cannot be found 
-   * @throws UnmodifiableClassException if a class cannot be modified 
+   * @throws ClassNotFoundException if a class cannot be found
+   * @throws UnmodifiableClassException if a class cannot be modified
    * @throws UnsupportedOperationException if the JVM does not support
    * redefinition or the redefinition made unsupported changes
    * @throws ClassFormatError if a class file is not valid
@@ -74,14 +74,14 @@ final class VMInstrumentationImpl
    * are unsupported
    * @throws ClassCircularityError if circularity occured with the new
    * classes
-   * @throws LinkageError if a linkage error occurs 
+   * @throws LinkageError if a linkage error occurs
    */
   static native void redefineClasses(Instrumentation inst,
       ClassDefinition[] definitions);
- 
+
   /**
    * Get all the classes loaded by the JVM.
-   * 
+   *
    * @return an array containing all the classes loaded by the JVM. The array
    * is empty if no class is loaded.
    */
@@ -89,9 +89,9 @@ final class VMInstrumentationImpl
 
   /**
    * Get all the classes loaded by a given class loader
-   * 
+   *
    * @param loader the loader
-   * 
+   *
    * @return an array containing all the classes loaded by the given loader.
    * The array is empty if no class was loaded by the loader.
    */
@@ -99,7 +99,7 @@ final class VMInstrumentationImpl
 
   /**
    * Get the size of an object. The object is not null
-   * 
+   *
    * @param objectToSize the object
    * @return the size of the object
    */
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java
index c1c7d13dd44..ea49897419b 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMClassLoadingMXBeanImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 package gnu.java.lang.management;
 
 /**
- * Provides access to information about the class loading 
+ * Provides access to information about the class loading
  * behaviour of the current invocation of the virtual
  * machine.  Instances of this bean are obtained by calling
  * {@link ManagementFactory#getClassLoadingMXBean()}.
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java
index b9b5bbcefc7..019af0ca411 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java
@@ -38,7 +38,7 @@ exception statement from your version. */
 package gnu.java.lang.management;
 
 /**
- * Provides access to information about the JIT 
+ * Provides access to information about the JIT
  * compiler of the virtual machine, if one exists.
  * Instances of this bean are obtained by calling
  * {@link ManagementFactory#getCompilationMXBean()},
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java
index 2a202849a8f..00861bc21de 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java
@@ -70,7 +70,7 @@ final class VMGarbageCollectorMXBeanImpl
    * Note that the accumulated time may not change, even when the
    * collection count increases, if the time taken is sufficiently
    * short; this depends on the resolution of the timer used.
-   * 
+   *
    * @param name the name of the garbage collector.
    * @return the accumulated number of milliseconds spent collecting,
    *         or -1 if this is undefined.
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
index eade26374db..7f69bdfb741 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
@@ -126,29 +126,29 @@ final class VMMemoryMXBeanImpl
       ManagementFactory.getMemoryPoolMXBeans().iterator();
     while (pools.hasNext())
       {
-	MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next();
-	if (pool.getType() == type)
-	  {
-	    MemoryUsage usage = pool.getUsage();
-	    if (init != -1)
-	      {
-		long poolInit = usage.getInit();
-		if (poolInit == -1)
-		  init = -1;
-		else
-		  init += poolInit;
-	      }
-	    committed += usage.getCommitted();
-	    used += usage.getUsed();
-	    if (max != -1)
-	      {
-		long poolMax = usage.getMax();
-		if (poolMax == -1)
-		  max = -1;
-		else
-		  max += poolMax;
-	      }
-	  }
+        MemoryPoolMXBean pool = (MemoryPoolMXBean) pools.next();
+        if (pool.getType() == type)
+          {
+            MemoryUsage usage = pool.getUsage();
+            if (init != -1)
+              {
+                long poolInit = usage.getInit();
+                if (poolInit == -1)
+                  init = -1;
+                else
+                  init += poolInit;
+              }
+            committed += usage.getCommitted();
+            used += usage.getUsed();
+            if (max != -1)
+              {
+                long poolMax = usage.getMax();
+                if (poolMax == -1)
+                  max = -1;
+                else
+                  max += poolMax;
+              }
+          }
       }
     return new MemoryUsage(init, used, committed, max);
   }
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java
index 0a4204a6d57..477329f0aed 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java
@@ -56,10 +56,10 @@ import java.util.List;
 final class VMMemoryManagerMXBeanImpl
 {
 
-  /** 
+  /**
    * Returns an array containing the names of the memory pools
    * this memory manager manages.
-   * 
+   *
    * @param name the name of the memory manager.
    * @return an array containing the name of each memory pool
    *         this manager is responsible for.
@@ -70,14 +70,14 @@ final class VMMemoryManagerMXBeanImpl
     Iterator beans = ManagementFactory.getMemoryPoolMXBeans().iterator();
     while (beans.hasNext())
       {
-	MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next();
-	String[] managers = bean.getMemoryManagerNames();
-	for (int a = 0; a < managers.length; ++a)
-	  if (managers[a].equals(name))
-	    {
-	      managedPools.add(bean.getName());
-	      break;
-	    }
+        MemoryPoolMXBean bean = (MemoryPoolMXBean) beans.next();
+        String[] managers = bean.getMemoryManagerNames();
+        for (int a = 0; a < managers.length; ++a)
+          if (managers[a].equals(name))
+            {
+              managedPools.add(bean.getName());
+              break;
+            }
       }
     return (String[]) managedPools.toArray(new String[managedPools.size()]);
   }
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java
index 723d4e89713..36cd2586a8e 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java
@@ -106,7 +106,7 @@ final class VMMemoryPoolMXBeanImpl
   static native MemoryUsage getPeakUsage(String name);
 
   /**
-   * Returns the type of memory used by the specified pool. 
+   * Returns the type of memory used by the specified pool.
    * The value must be either "HEAP" or "NON_HEAP".
    *
    * @param name the name of the pool to obtain statistics on.
@@ -149,7 +149,7 @@ final class VMMemoryPoolMXBeanImpl
    * @return the usage threshold count.
    */
   static native long getUsageThresholdCount(String name);
-  
+
   /**
    * Returns true if the specified pool is still valid i.e.
    * it is still in use by the virtual machine.
@@ -158,7 +158,7 @@ final class VMMemoryPoolMXBeanImpl
    * @return true if the pool is valid.
    */
   static native boolean isValid(String name);
-  
+
   /**
    * Resets the peak usage level to the current usage level for
    * the specified pool.
@@ -173,7 +173,7 @@ final class VMMemoryPoolMXBeanImpl
    * This is only called if this functionality is supported
    * by the virtual machine (i.e. the appropriate property,
    * <code>gnu.java.lang.management.CollectionUsageThresholdSupport</code>,
-   * is defined). 
+   * is defined).
    *
    * @param name the name of the pool to set the threshold of.
    * @param threshold the new threshold level.
@@ -185,7 +185,7 @@ final class VMMemoryPoolMXBeanImpl
    * This is only called if this functionality is supported
    * by the virtual machine (i.e. the appropriate property,
    * <code>gnu.java.lang.management.UsageThresholdSupport</code>,
-   * is defined). 
+   * is defined).
    *
    * @param name the name of the pool to set the threshold of.
    * @param threshold the new threshold level.
diff --git a/libjava/classpath/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java b/libjava/classpath/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java
index 1c061aa9356..33448d9d534 100644
--- a/libjava/classpath/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/lang/management/VMThreadMXBeanImpl.java
@@ -40,7 +40,7 @@ package gnu.java.lang.management;
 import java.lang.management.ThreadInfo;
 
 /**
- * Provides access to information about the threads 
+ * Provides access to information about the threads
  * of the virtual machine.  An instance of this bean is
  * obtained by calling
  * {@link ManagementFactory#getThreadMXBean()}.
@@ -87,13 +87,13 @@ final class VMThreadMXBeanImpl
     filled = group.enumerate(threadList);
     while (filled == arraySize)
       {
-	arraySize *= 2;
-	threadList = new Thread[arraySize];
-	filled = group.enumerate(threadList);
+        arraySize *= 2;
+        threadList = new Thread[arraySize];
+        filled = group.enumerate(threadList);
       }
     return threadList;
   }
-  
+
   /**
    * Returns the id of all live threads at the time of execution.
    *
@@ -141,8 +141,8 @@ final class VMThreadMXBeanImpl
     int daemonCount = 0;
     for (int a = 0; a < filled; ++a)
       {
-	if (threadList[a].isDaemon())
-	  ++daemonCount;
+        if (threadList[a].isDaemon())
+          ++daemonCount;
       }
     return daemonCount;
   }
@@ -205,7 +205,7 @@ final class VMThreadMXBeanImpl
    * @return the corresponding <code>ThreadInfo</code>.
    */
   static native ThreadInfo getThreadInfoForId(long id, int maxDepth);
-  
+
   /**
    * Returns the number of nanoseconds of user time
    * the specified thread has used in total.   This is
@@ -217,7 +217,7 @@ final class VMThreadMXBeanImpl
    *         the thread.
    */
   static native long getThreadUserTime(long id);
-  
+
   /**
    * Returns the total number of threads that have
    * been started over the lifetime of the virtual
diff --git a/libjava/classpath/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java b/libjava/classpath/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
index 958c2187412..da0f893cfbc 100644
--- a/libjava/classpath/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -69,7 +69,7 @@ public final class VMPlainDatagramSocketImpl
         System.loadLibrary("javanet");
       }
   }
-  
+
   /**
    * Binds this socket to a particular port and interface
    *
@@ -78,9 +78,9 @@ public final class VMPlainDatagramSocketImpl
    * @param addr the address to bind to
    *
    * @throws SocketException If an error occurs
-   */  
+   */
   static native void bind(PlainDatagramSocketImpl socket, int port,
-                          InetAddress addr) 
+                          InetAddress addr)
     throws SocketException;
 
   /**
@@ -127,7 +127,7 @@ public final class VMPlainDatagramSocketImpl
    *
    * @param socket the socket object
    * @param addr the address to send to
-   * @param port the port to send to 
+   * @param port the port to send to
    * @param buf the buffer to send
    * @param offset the offset of the data in the buffer to send
    * @param len the length of the data to send
diff --git a/libjava/classpath/vm/reference/gnu/java/net/VMPlainSocketImpl.java b/libjava/classpath/vm/reference/gnu/java/net/VMPlainSocketImpl.java
index 916f9593087..c72e6a5eb21 100644
--- a/libjava/classpath/vm/reference/gnu/java/net/VMPlainSocketImpl.java
+++ b/libjava/classpath/vm/reference/gnu/java/net/VMPlainSocketImpl.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -62,7 +62,7 @@ public final class VMPlainSocketImpl
   private static final int CP_IP_TTL = 0x1E61;
 
   private final State nfd;
-  
+
   /**
    * Static initializer to load native library.
    */
@@ -73,19 +73,19 @@ public final class VMPlainSocketImpl
         System.loadLibrary("javanet");
       }
   }
-  
+
   public VMPlainSocketImpl()
   {
     // XXX consider adding security check here.
     nfd = new State();
   }
-  
+
   public VMPlainSocketImpl(VMChannel channel) throws IOException
   {
     this();
     nfd.setChannelFD(channel.getState());
   }
-  
+
   public State getState()
   {
     return nfd;
@@ -144,7 +144,7 @@ public final class VMPlainSocketImpl
     else
       throw new IllegalArgumentException("option value type "
                                          + optionValue.getClass().getName());
-    
+
     try
       {
         setOption(nfd.getNativeFD(), optionId, value);
@@ -156,7 +156,7 @@ public final class VMPlainSocketImpl
         throw se;
       }
   }
-  
+
   private static native void setOption(int fd, int id, int value)
     throws SocketException;
 
@@ -198,16 +198,16 @@ public final class VMPlainSocketImpl
   /**
    * Get a socket option. This implementation is only required to support
    * socket options that are boolean values, which include:
-   * 
+   *
    *  SocketOptions.IP_MULTICAST_LOOP
    *  SocketOptions.SO_BROADCAST
    *  SocketOptions.SO_KEEPALIVE
    *  SocketOptions.SO_OOBINLINE
    *  SocketOptions.SO_REUSEADDR
    *  SocketOptions.TCP_NODELAY
-   * 
+   *
    * and socket options that are integer values, which include:
-   * 
+   *
    *  SocketOptions.IP_TOS
    *  SocketOptions.SO_LINGER
    *  SocketOptions.SO_RCVBUF
@@ -232,7 +232,7 @@ public final class VMPlainSocketImpl
         se.initCause(ioe);
         throw se;
       }
-    
+
     switch (optionId)
       {
         case SocketOptions.IP_MULTICAST_LOOP:
@@ -242,20 +242,20 @@ public final class VMPlainSocketImpl
         case SocketOptions.SO_REUSEADDR:
         case SocketOptions.TCP_NODELAY:
           return Boolean.valueOf(value != 0);
-          
+
         case SocketOptions.IP_TOS:
         case SocketOptions.SO_LINGER:
         case SocketOptions.SO_RCVBUF:
         case SocketOptions.SO_SNDBUF:
         case SocketOptions.SO_TIMEOUT:
           return new Integer(value);
-          
+
         default:
           throw new SocketException("getting option " + optionId +
                                     " not supported here");
       }
   }
-  
+
   private static native int getOption(int fd, int id) throws SocketException;
 
   /**
@@ -264,7 +264,7 @@ public final class VMPlainSocketImpl
    *
    * The optionId is provided to make it possible that the native
    * implementation may do something different depending on whether
-   * the value is SocketOptions.IP_MULTICAST_IF or 
+   * the value is SocketOptions.IP_MULTICAST_IF or
    * SocketOptions.IP_MULTICAST_IF2.
    */
   public InetAddress getMulticastInterface(int optionId)
@@ -284,7 +284,7 @@ public final class VMPlainSocketImpl
 
   private static native InetAddress getMulticastInterface(int fd,
                                                           int optionId);
-  
+
   /**
    * Binds this socket to the given local address and port.
    *
@@ -306,11 +306,11 @@ public final class VMPlainSocketImpl
     else
       throw new SocketException ("unsupported address type");
   }
-  
+
   /**
    * Native bind function for IPv4 addresses. The addr array must be
    * exactly four bytes long.
-   * 
+   *
    * VMs without native support need not implement this.
    *
    * @param fd The native file descriptor integer.
@@ -320,11 +320,11 @@ public final class VMPlainSocketImpl
    */
   private static native void bind(int fd, byte[] addr, int port)
     throws IOException;
-  
+
   /**
    * Native bind function for IPv6 addresses. The addr array must be
    * exactly sixteen bytes long.
-   * 
+   *
    * VMs without native support need not implement this.
    *
    * @param fd The native file descriptor integer.
@@ -346,7 +346,7 @@ public final class VMPlainSocketImpl
   {
     listen(nfd.getNativeFD(), backlog);
   }
-  
+
   /**
    * Native listen function. VMs without native support need not implement
    * this.
@@ -366,11 +366,11 @@ public final class VMPlainSocketImpl
     else
       throw new IllegalArgumentException("unknown address type");
   }
-  
+
   private static native void join(int fd, byte[] addr) throws IOException;
-  
+
   private static native void join6(int fd, byte[] addr) throws IOException;
-  
+
   public void leave(InetAddress group) throws IOException
   {
     if (group instanceof Inet4Address)
@@ -380,16 +380,16 @@ public final class VMPlainSocketImpl
     else
       throw new IllegalArgumentException("unknown address type");
   }
-  
+
   private static native void leave(int fd, byte[] addr) throws IOException;
-  
+
   private static native void leave6(int fd, byte[] addr) throws IOException;
 
   public void joinGroup(InetSocketAddress addr, NetworkInterface netif)
     throws IOException
   {
     InetAddress address = addr.getAddress();
-    
+
     if (address instanceof Inet4Address)
       joinGroup(nfd.getNativeFD(), address.getAddress(),
                 netif != null ? netif.getName() : null);
@@ -399,13 +399,13 @@ public final class VMPlainSocketImpl
     else
       throw new IllegalArgumentException("unknown address type");
   }
-  
+
   private static native void joinGroup(int fd, byte[] addr, String ifname)
     throws IOException;
-  
+
   private static native void joinGroup6(int fd, byte[] addr, String ifname)
     throws IOException;
-  
+
   public void leaveGroup(InetSocketAddress addr, NetworkInterface netif)
     throws IOException
   {
@@ -419,42 +419,42 @@ public final class VMPlainSocketImpl
     else
       throw new IllegalArgumentException("unknown address type");
   }
-  
+
   private static native void leaveGroup(int fd, byte[] addr, String ifname)
     throws IOException;
-  
+
   private static native void leaveGroup6(int fd, byte[] addr, String ifname)
     throws IOException;
-  
-  
+
+
   public void shutdownInput() throws IOException
   {
     shutdownInput(nfd.getNativeFD());
   }
-  
+
   private static native void shutdownInput(int native_fd) throws IOException;
-  
+
   public void shutdownOutput() throws IOException
   {
     shutdownOutput(nfd.getNativeFD());
   }
-  
+
   private static native void shutdownOutput(int native_fd) throws IOException;
-  
+
   public void sendUrgentData(int data) throws IOException
   {
     sendUrgentData(nfd.getNativeFD(), data);
   }
-  
+
   private static native void sendUrgentData(int natfive_fd, int data) throws IOException;
-  
+
   public void close() throws IOException
   {
     nfd.close();
   }
-  
+
   // Inner classes.
-  
+
   /**
    * Our wrapper for the native file descriptor. In this implementation,
    * it is a simple wrapper around {@link VMChannel.State}, to simplify
@@ -463,38 +463,38 @@ public final class VMPlainSocketImpl
   public final class State
   {
     private VMChannel.State channelFd;
-    
+
     State()
     {
       channelFd = null;
     }
-    
+
     public boolean isValid()
     {
       if (channelFd != null)
         return channelFd.isValid();
       return false;
     }
-    
+
     public int getNativeFD() throws IOException
     {
       return channelFd.getNativeFD();
     }
-    
+
     public void setChannelFD(final VMChannel.State nfd) throws IOException
     {
       if (this.channelFd != null && this.channelFd.isValid())
         throw new IOException("file descriptor already initialized");
       this.channelFd = nfd;
     }
-    
+
     public void close() throws IOException
     {
       if (channelFd == null)
         throw new IOException("invalid file descriptor");
       channelFd.close();
     }
-    
+
     protected void finalize() throws Throwable
     {
       try
@@ -509,4 +509,3 @@ public final class VMPlainSocketImpl
     }
   }
 }
-
diff --git a/libjava/classpath/vm/reference/gnu/java/nio/VMChannel.java b/libjava/classpath/vm/reference/gnu/java/nio/VMChannel.java
index a9d1452b72d..4494ff13ca4 100644
--- a/libjava/classpath/vm/reference/gnu/java/nio/VMChannel.java
+++ b/libjava/classpath/vm/reference/gnu/java/nio/VMChannel.java
@@ -53,7 +53,7 @@ import java.nio.MappedByteBuffer;
 /**
  * Native interface to support configuring of channel to run in a non-blocking
  * manner and support scatter/gather io operations.
- * 
+ *
  * @author Michael Barker <mike@middlesoft.co.uk>
  *
  */
@@ -61,12 +61,12 @@ public final class VMChannel
 {
   /**
    * Our reference implementation uses an integer to store the native
-   * file descriptor. Implementations without such support 
+   * file descriptor. Implementations without such support
    */
   private final State nfd;
-  
+
   private Kind kind;
-  
+
   public VMChannel()
   {
     // XXX consider adding security check here, so only Classpath
@@ -74,14 +74,14 @@ public final class VMChannel
     this.nfd = new State();
     kind = Kind.OTHER;
   }
-  
+
   /**
    * This constructor is used by the POSIX reference implementation;
    * other virtual machines need not support it.
-   * 
+   *
    * <strong>Important:</strong> do not call this in library code that is
    * not specific to Classpath's reference implementation.
-   * 
+   *
    * @param native_fd The native file descriptor integer.
    * @throws IOException
    */
@@ -90,7 +90,7 @@ public final class VMChannel
     this();
     this.nfd.setNativeFD(native_fd);
   }
-  
+
   public State getState()
   {
     return nfd;
@@ -105,62 +105,62 @@ public final class VMChannel
       }
     initIDs();
   }
-  
+
   public static VMChannel getStdin() throws IOException
   {
     return new VMChannel(stdin_fd());
   }
-  
+
   public static VMChannel getStdout() throws IOException
   {
     return new VMChannel(stdout_fd());
   }
-  
+
   public static VMChannel getStderr() throws IOException
   {
     return new VMChannel(stderr_fd());
   }
-  
+
   private static native int stdin_fd();
   private static native int stdout_fd();
   private static native int stderr_fd();
-  
+
   /**
    * Set the file descriptor to have the required blocking
    * setting.
-   * 
+   *
    * @param blocking The blocking flag to set.
    */
   public void setBlocking(boolean blocking) throws IOException
   {
     setBlocking(nfd.getNativeFD(), blocking);
   }
-  
+
   private static native void setBlocking(int fd, boolean blocking)
     throws IOException;
-  
+
   public int available() throws IOException
   {
     return available(nfd.getNativeFD());
   }
-  
+
   private static native int available(int native_fd) throws IOException;
 
   /**
    * Reads a byte buffer directly using the supplied file descriptor.
-   * 
+   *
    * @param dst Direct Byte Buffer to read to.
    * @return Number of bytes read.
-   * @throws IOException If an error occurs or dst is not a direct buffers. 
+   * @throws IOException If an error occurs or dst is not a direct buffers.
    */
   public int read(ByteBuffer dst)
     throws IOException
   {
     return read(nfd.getNativeFD(), dst);
   }
-  
+
   private static native int read(int fd, ByteBuffer dst) throws IOException;
-  
+
   /**
    * Read a single byte.
    *
@@ -171,19 +171,19 @@ public final class VMChannel
   {
     return read(nfd.getNativeFD());
   }
-  
+
   private static native int read(int fd) throws IOException;
-  
+
   /**
    * Reads into byte buffers directly using the supplied file descriptor.
    * Assumes that the buffer list contains DirectBuffers.  Will perform a
    * scattering read.
-   * 
+   *
    * @param dsts An array direct byte buffers.
    * @param offset Index of the first buffer to read to.
    * @param length The number of buffers to read to.
    * @return Number of bytes read.
-   * @throws IOException If an error occurs or the dsts are not direct buffers. 
+   * @throws IOException If an error occurs or the dsts are not direct buffers.
    */
   public long readScattering(ByteBuffer[] dsts, int offset, int length)
     throws IOException
@@ -193,11 +193,11 @@ public final class VMChannel
 
     return readScattering(nfd.getNativeFD(), dsts, offset, length);
   }
-  
+
   private static native long readScattering(int fd, ByteBuffer[] dsts,
                                             int offset, int length)
     throws IOException;
-  
+
   /**
    * Receive a datagram on this channel, returning the host address
    * that sent the datagram.
@@ -228,18 +228,18 @@ public final class VMChannel
         int port = hostPort.getShort() & 0xFFFF;
         return new InetSocketAddress(Inet6Address.getByAddress(addr), port);
       }
-    
+
     throw new SocketException("host address received with invalid length: "
                               + hostlen);
   }
-  
+
   private static native int receive (int fd, ByteBuffer dst, ByteBuffer address)
     throws IOException;
 
   /**
    * Writes from a direct byte bufer using the supplied file descriptor.
    * Assumes the buffer is a DirectBuffer.
-   * 
+   *
    * @param src The source buffer.
    * @return Number of bytes written.
    * @throws IOException
@@ -248,14 +248,14 @@ public final class VMChannel
   {
     return write(nfd.getNativeFD(), src);
   }
-  
+
   private native int write(int fd, ByteBuffer src) throws IOException;
 
   /**
    * Writes from byte buffers directly using the supplied file descriptor.
    * Assumes the that buffer list constains DirectBuffers.  Will perform
    * as gathering write.
-   * 
+   *
    * @param srcs
    * @param offset
    * @param length
@@ -267,13 +267,13 @@ public final class VMChannel
   {
     if (offset + length > srcs.length)
       throw new IndexOutOfBoundsException("offset + length > srcs.length");
-    
+
     // A gathering write is limited to 16 buffers; when writing, ensure
     // that we have at least one buffer with something in it in the 16
     // buffer window starting at offset.
     while (!srcs[offset].hasRemaining() && offset < srcs.length)
       offset++;
-    
+
     // There are no buffers with anything to write.
     if (offset == srcs.length)
       return 0;
@@ -285,11 +285,11 @@ public final class VMChannel
 
     return writeGathering(nfd.getNativeFD(), srcs, offset, length);
   }
-  
+
   private native long writeGathering(int fd, ByteBuffer[] srcs,
                                      int offset, int length)
     throws IOException;
-  
+
   /**
    * Send a datagram to the given address.
    *
@@ -311,15 +311,15 @@ public final class VMChannel
     else
       throw new SocketException("unrecognized inet address type");
   }
-  
+
   // Send to an IPv4 address.
   private static native int send(int fd, ByteBuffer src, byte[] addr, int port)
     throws IOException;
-  
+
   // Send to an IPv6 address.
   private static native int send6(int fd, ByteBuffer src, byte[] addr, int port)
     throws IOException;
-  
+
   /**
    * Write a single byte.
    *
@@ -330,13 +330,13 @@ public final class VMChannel
   {
     write(nfd.getNativeFD(), b);
   }
-  
+
   private static native void write(int fd, int b) throws IOException;
-  
+
   private native static void initIDs();
 
   // Network (socket) specific methods.
-  
+
   /**
    * Create a new socket. This method will initialize the native file
    * descriptor state of this instance.
@@ -356,7 +356,7 @@ public final class VMChannel
       kind = Kind.SOCK_DGRAM;
     nfd.setNativeFD(socket(stream));
   }
-  
+
   /**
    * Create a new socket, returning the native file descriptor.
    *
@@ -382,7 +382,7 @@ public final class VMChannel
     int fd;
 
     InetAddress addr = saddr.getAddress();
- 
+
     // Translates an IOException into a SocketException to conform
     // to the throws clause.
     try
@@ -402,13 +402,13 @@ public final class VMChannel
                       timeout);
     throw new SocketException("unsupported internet address");
   }
-  
+
   private static native boolean connect(int fd, byte[] addr, int port, int timeout)
     throws SocketException;
-  
+
   private static native boolean connect6(int fd, byte[] addr, int port, int timeout)
     throws SocketException;
-  
+
   /**
    * Disconnect this channel, if it is a datagram socket. Disconnecting
    * a datagram channel will disassociate it from any address, so the
@@ -424,9 +424,9 @@ public final class VMChannel
       throw new IOException("can only disconnect datagram channels");
     disconnect(nfd.getNativeFD());
   }
-  
+
   private static native void disconnect(int fd) throws IOException;
-  
+
   public InetSocketAddress getLocalAddress() throws IOException
   {
     if (!nfd.isValid())
@@ -451,7 +451,7 @@ public final class VMChannel
       }
     throw new SocketException("invalid address length");
   }
-  
+
   private static native int getsockname(int fd, ByteBuffer name)
     throws IOException;
 
@@ -486,7 +486,7 @@ public final class VMChannel
       }
     throw new SocketException("invalid address length");
   }
-  
+
   /*
    * The format here is the peer address, followed by the port number.
    * The returned value is the length of the peer address; thus, there
@@ -494,7 +494,7 @@ public final class VMChannel
    */
   private static native int getpeername(int fd, ByteBuffer name)
     throws IOException;
-  
+
   /**
    * Accept an incoming connection, returning a new VMChannel, or null
    * if the channel is nonblocking and no connection is pending.
@@ -509,17 +509,17 @@ public final class VMChannel
       return null;
     return new VMChannel(new_fd);
   }
-  
+
   private static native int accept(int native_fd) throws IOException;
 
   // File-specific methods.
-  
+
   /**
    * Open a file at PATH, initializing the native state to operate on
    * that open file.
-   * 
+   *
    * @param path The absolute file path.
-   * @throws IOException If the file cannot be opened, or if this 
+   * @throws IOException If the file cannot be opened, or if this
    *  channel was previously initialized.
    */
   public void openFile(String path, int mode) throws IOException
@@ -530,25 +530,25 @@ public final class VMChannel
     nfd.setNativeFD(fd);
     kind = Kind.FILE;
   }
-  
+
   private static native int open(String path, int mode) throws IOException;
-  
+
   public long position() throws IOException
   {
     if (kind != Kind.FILE)
       throw new IOException("not a file");
     return position(nfd.getNativeFD());
   }
-  
+
   private static native long position(int fd) throws IOException;
-  
+
   public void seek(long pos) throws IOException
   {
     if (kind != Kind.FILE)
       throw new IOException("not a file");
     seek(nfd.getNativeFD(), pos);
   }
-  
+
   private static native void seek(int fd, long pos) throws IOException;
 
   public void truncate(long length) throws IOException
@@ -557,9 +557,9 @@ public final class VMChannel
       throw new IOException("not a file");
     truncate(nfd.getNativeFD(), length);
   }
-  
+
   private static native void truncate(int fd, long len) throws IOException;
-  
+
   public boolean lock(long pos, long len, boolean shared, boolean wait)
     throws IOException
   {
@@ -567,27 +567,27 @@ public final class VMChannel
       throw new IOException("not a file");
     return lock(nfd.getNativeFD(), pos, len, shared, wait);
   }
-  
+
   private static native boolean lock(int fd, long pos, long len,
                                      boolean shared, boolean wait)
     throws IOException;
-  
+
   public void unlock(long pos, long len) throws IOException
   {
     if (kind != Kind.FILE)
       throw new IOException("not a file");
     unlock(nfd.getNativeFD(), pos, len);
   }
-  
+
   private static native void unlock(int fd, long pos, long len) throws IOException;
-  
+
   public long size() throws IOException
   {
     if (kind != Kind.FILE)
       throw new IOException("not a file");
     return size(nfd.getNativeFD());
   }
-  
+
   private static native long size(int fd) throws IOException;
 
   public MappedByteBuffer map(char mode, long position, int size)
@@ -597,22 +597,22 @@ public final class VMChannel
       throw new IOException("not a file");
     return map(nfd.getNativeFD(), mode, position, size);
   }
-  
+
   private static native MappedByteBuffer map(int fd, char mode,
                                              long position, int size)
     throws IOException;
-  
+
   public boolean flush(boolean metadata) throws IOException
   {
     if (kind != Kind.FILE)
       throw new IOException("not a file");
     return flush(nfd.getNativeFD(), metadata);
   }
-  
+
   private static native boolean flush(int fd, boolean metadata) throws IOException;
-  
+
   // Close.
-  
+
   /**
    * Close this socket. The socket is also automatically closed when this
    * object is finalized.
@@ -624,13 +624,13 @@ public final class VMChannel
   {
     nfd.close();
   }
-  
+
   static native void close(int native_fd) throws IOException;
-  
+
   /**
    * <p>Provides a simple mean for the JNI code to find out whether the
    * current thread was interrupted by a call to Thread.interrupt().</p>
-   * 
+   *
    * @return
    */
   static boolean isThreadInterrupted()
@@ -639,15 +639,15 @@ public final class VMChannel
   }
 
   // Inner classes.
-  
+
   /**
    * A wrapper for a native file descriptor integer. This tracks the state
-   * of an open file descriptor, and ensures that 
-   * 
+   * of an open file descriptor, and ensures that
+   *
    * This class need not be fully supported by virtual machines; if a
    * virtual machine does not use integer file descriptors, or does and
    * wishes to hide that, then the methods of this class may be stubbed out.
-   * 
+   *
    * System-specific classes that depend on access to native file descriptor
    * integers SHOULD declare this fact.
    */
@@ -656,31 +656,31 @@ public final class VMChannel
     private int native_fd;
     private boolean valid;
     private boolean closed;
-    
+
     State()
     {
       native_fd = -1;
       valid = false;
       closed = false;
     }
-    
+
     public boolean isValid()
     {
       return valid;
     }
-    
+
     public boolean isClosed()
     {
       return closed;
     }
-    
+
     public int getNativeFD() throws IOException
     {
       if (!valid)
         throw new IOException("invalid file descriptor");
       return native_fd;
     }
-    
+
     void setNativeFD(final int native_fd) throws IOException
     {
       if (valid)
@@ -688,7 +688,7 @@ public final class VMChannel
       this.native_fd = native_fd;
       valid = true;
     }
-    
+
     public void close() throws IOException
     {
       if (!valid)
@@ -703,7 +703,7 @@ public final class VMChannel
           closed = true;
         }
     }
-    
+
     public String toString()
     {
       if (closed)
@@ -712,7 +712,7 @@ public final class VMChannel
         return "<<invalid>>";
       return String.valueOf(native_fd);
     }
-    
+
     protected void finalize() throws Throwable
     {
       try
@@ -726,7 +726,7 @@ public final class VMChannel
         }
     }
   }
-  
+
   /**
    * An enumeration of possible kinds of channel.
    */
@@ -734,16 +734,16 @@ public final class VMChannel
   {
     /** A streaming (TCP) socket. */
     static final Kind SOCK_STREAM = new Kind();
-    
+
     /** A datagram (UDP) socket. */
     static final Kind SOCK_DGRAM = new Kind();
-    
+
     /** A file. */
     static final Kind FILE = new Kind();
-    
+
     /** Something else; not a socket or file. */
     static final Kind OTHER = new Kind();
-    
+
     private Kind() { }
   }
 }
diff --git a/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java b/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
index e5257c1cf96..a369704522a 100644
--- a/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
+++ b/libjava/classpath/vm/reference/gnu/java/nio/VMPipe.java
@@ -57,7 +57,7 @@ final class VMPipe
         System.loadLibrary ("javanio");
       }
   }
-  
+
   /**
    * Create a pipe, consisting of a readable VMChannel and a writable
    * VMChannel. The readable channel is returned is the first element
@@ -75,6 +75,6 @@ final class VMPipe
     pipe[1] = new VMChannel(fds[1]);
     return pipe;
   }
-  
+
   private static native int[] pipe0() throws IOException;
 }
diff --git a/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java b/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
index 488132d24c2..4d37c2c1ca9 100644
--- a/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
+++ b/libjava/classpath/vm/reference/gnu/java/nio/VMSelector.java
@@ -1,4 +1,4 @@
-/* VMSelector.java -- 
+/* VMSelector.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -50,7 +50,7 @@ public final class VMSelector
         System.loadLibrary ("javanio");
       }
   }
-  
+
   // A timeout value of 0 means block forever.
   static native int select (int[] read, int[] write,
                                         int[] except, long timeout)
diff --git a/libjava/classpath/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java b/libjava/classpath/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java
index 28a02102706..86faa097c17 100644
--- a/libjava/classpath/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java
+++ b/libjava/classpath/vm/reference/gnu/java/security/jce/prng/VMSecureRandom.java
@@ -126,4 +126,4 @@ final class VMSecureRandom
       running = false;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/vm/reference/java/io/VMFile.java b/libjava/classpath/vm/reference/java/io/VMFile.java
index 9f584af239e..2af1e95c864 100644
--- a/libjava/classpath/vm/reference/java/io/VMFile.java
+++ b/libjava/classpath/vm/reference/java/io/VMFile.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -61,7 +61,7 @@ final class VMFile
         System.loadLibrary("javaio");
       }
   }
-  
+
   /*
    * This native method does the actual work of getting the last file
    * modification time.  It also does the existence check to avoid the
@@ -120,38 +120,38 @@ final class VMFile
    * Gets the total bytes of the filesystem named by path.
    */
   public static native long getTotalSpace(String path);
-  
+
   /**
    * Gets the total free bytes of the filesystem named by path.
    */
   public static native long getFreeSpace(String path);
-  
+
   /**
    * Gets the available bytes of the filesystem named by path.
    */
   public static native long getUsableSpace(String path);
-  
+
   /**
    * Set the read permission of the file.
    */
   public static synchronized native boolean setReadable(String path,
-                                           		boolean readable,
-                                           		boolean ownerOnly);
-  
+                                                        boolean readable,
+                                                        boolean ownerOnly);
+
   /**
    * Set the write permission of the file.
    */
   public static synchronized native boolean setWritable(String path,
                                                         boolean writable,
                                                         boolean ownerOnly);
-  
+
   /**
    * Set the execute permission of the file.
    */
   public static synchronized native boolean setExecutable(String path,
                                                           boolean executable,
                                                           boolean ownerOnly);
-  
+
   /*
    * This native method does the actual check of whether or not a file
    * is a plain file or not.  It also handles the existence check to
@@ -163,7 +163,7 @@ final class VMFile
    * This native method checks file permissions for writing
    */
   static synchronized native boolean canWrite(String path);
-  
+
   /**
    * This methods checks if a directory can be written to.
    */
@@ -178,7 +178,7 @@ final class VMFile
    * This native method checks file permissions for execution
    */
   static synchronized native boolean canExecute(String path);
-  
+
   /*
    * This method does the actual check of whether or not a file is a
    * directory or not.  It also handle the existence check to eliminate
@@ -193,7 +193,7 @@ final class VMFile
   {
     return canWriteDirectory(path.getAbsolutePath());
   }
-  
+
   /**
    * This method returns an array of filesystem roots.  Some operating systems
    * have volume oriented filesystem.  This method provides a mechanism for
@@ -207,9 +207,9 @@ final class VMFile
    */
   static File[] listRoots()
   {
-	File[] roots = new File[1];
-	roots[0] = new File("/");
-	return roots;
+        File[] roots = new File[1];
+        roots[0] = new File("/");
+        return roots;
   }
 
   /**
@@ -225,8 +225,8 @@ final class VMFile
    */
   static boolean isHidden(String path)
   {
-	// FIXME: this only works on UNIX
-	return getName(path).startsWith(".");
+        // FIXME: this only works on UNIX
+        return getName(path).startsWith(".");
   }
 
   /**
@@ -238,14 +238,14 @@ final class VMFile
    */
   static String getName(String path)
   {
-	int pos = PlatformHelper.lastIndexOfSeparator(path);
-	if (pos == -1)
-	  return path;
-	
-	if (PlatformHelper.endWithSeparator(path))
-	  return "";
-	
-	return path.substring(pos + File.separator.length());
+        int pos = PlatformHelper.lastIndexOfSeparator(path);
+        if (pos == -1)
+          return path;
+
+        if (PlatformHelper.endWithSeparator(path))
+          return "";
+
+        return path.substring(pos + File.separator.length());
   }
 
   /**
@@ -260,7 +260,7 @@ final class VMFile
    */
   static String getAbsolutePath(String path)
   {
-    if (File.separatorChar == '\\' 
+    if (File.separatorChar == '\\'
       && path.length() > 0 && path.charAt (0) == '\\')
       {
         // On Windows, even if the path starts with a '\\' it is not
@@ -274,8 +274,8 @@ final class VMFile
              || (path.charAt (0) >= 'A' && path.charAt (0) <= 'Z')))
       {
         // On Windows, a process has a current working directory for
-        // each drive and a path like "G:foo\bar" would mean the 
-        // absolute path "G:\wombat\foo\bar" if "\wombat" is the 
+        // each drive and a path like "G:foo\bar" would mean the
+        // absolute path "G:\wombat\foo\bar" if "\wombat" is the
         // working directory on the G drive.
         String drvDir = null;
         try
@@ -288,7 +288,7 @@ final class VMFile
           }
 
         // Note: this would return "C:\\." for the path "C:.", if "\"
-        // is the working folder on the C drive, but this is 
+        // is the working folder on the C drive, but this is
         // consistent with what Sun's JRE 1.4.1.01 actually returns!
         if (path.length() > 2)
           return drvDir + '\\' + path.substring (2, path.length());
@@ -341,7 +341,7 @@ final class VMFile
     throws MalformedURLException
   {
     // On Win32, Sun's JDK returns URLs of the form "file:/c:/foo/bar.txt",
-    // while on UNIX, it returns URLs of the form "file:/foo/bar.txt". 
+    // while on UNIX, it returns URLs of the form "file:/foo/bar.txt".
     if (File.separatorChar == '\\')
       return new URL ("file:/" + file.getAbsolutePath().replace ('\\', '/')
                       + (file.isDirectory() ? "/" : ""));
@@ -358,7 +358,7 @@ final class VMFile
    * "." and "..", and symbolic links.
    * <p>
    * Note that this method, unlike the other methods which return path
-   * names, can throw an IOException.  This is because native method 
+   * names, can throw an IOException.  This is because native method
    * might be required in order to resolve the canonical path
    *
    * @exception IOException If an error occurs
diff --git a/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java b/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java
index be0f8eb5235..10e1f34cbd2 100644
--- a/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java
+++ b/libjava/classpath/vm/reference/java/io/VMObjectInputStream.java
@@ -48,7 +48,7 @@ final class VMObjectInputStream
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary("javaio");
+        System.loadLibrary("javaio");
       }
   }
 
@@ -59,6 +59,6 @@ final class VMObjectInputStream
    * which is a super class of the given clazz.
    */
   static native Object allocateObject(Class clazz, Class constr_clazz,
-				      Constructor constructor)
+                                      Constructor constructor)
     throws InstantiationException;
 }
diff --git a/libjava/classpath/vm/reference/java/io/VMObjectStreamClass.java b/libjava/classpath/vm/reference/java/io/VMObjectStreamClass.java
index 77470fa807f..fbaf7d6c8c5 100644
--- a/libjava/classpath/vm/reference/java/io/VMObjectStreamClass.java
+++ b/libjava/classpath/vm/reference/java/io/VMObjectStreamClass.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -47,7 +47,7 @@ final class VMObjectStreamClass
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary("javaio");
+        System.loadLibrary("javaio");
       }
   }
 
@@ -92,7 +92,7 @@ final class VMObjectStreamClass
    */
   static native void setLongNative(Field field, Object obj, long val)
     throws InternalError;
-  
+
   /**
    * Sets the value of the specified field. This method handles "int".
    * Warning ! The types are not truely checked here and final values may be
@@ -102,9 +102,9 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setIntNative(Field field, Object obj, int val) 
+  static native void setIntNative(Field field, Object obj, int val)
     throws InternalError;
-  
+
   /**
    * Sets the value of the specified field. This method handles "short".
    * Warning ! The types are not truely checked here and final values may be
@@ -114,7 +114,7 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setShortNative(Field field, Object obj, short val) 
+  static native void setShortNative(Field field, Object obj, short val)
     throws InternalError;
 
   /**
@@ -126,7 +126,7 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setCharNative(Field field, Object obj, char val) 
+  static native void setCharNative(Field field, Object obj, char val)
     throws InternalError;
 
   /**
@@ -138,7 +138,7 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setByteNative(Field field, Object obj, byte val) 
+  static native void setByteNative(Field field, Object obj, byte val)
     throws InternalError;
 
   /**
@@ -150,7 +150,7 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setBooleanNative(Field field, Object obj, boolean val) 
+  static native void setBooleanNative(Field field, Object obj, boolean val)
     throws InternalError;
 
   /**
@@ -162,8 +162,7 @@ final class VMObjectStreamClass
    * @param obj Instance which will have its field set.
    * @param val Value to put in the field.
    */
-  static native void setObjectNative(Field field, Object obj, Object val) 
+  static native void setObjectNative(Field field, Object obj, Object val)
     throws InternalError;
-  
-}
 
+}
diff --git a/libjava/classpath/vm/reference/java/lang/VMClass.java b/libjava/classpath/vm/reference/java/lang/VMClass.java
index 7e9620b4b59..a0091c073c5 100644
--- a/libjava/classpath/vm/reference/java/lang/VMClass.java
+++ b/libjava/classpath/vm/reference/java/lang/VMClass.java
@@ -58,7 +58,7 @@ import java.lang.reflect.Modifier;
  * @author Tom Tromey (tromey@cygnus.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  */
-final class VMClass 
+final class VMClass
 {
 
   // Only static methods. Cannot be instantiated.
@@ -287,11 +287,11 @@ final class VMClass
    * <code>getName()</code> which follows the last ".".  Anonymous
    * classes have no name, and so the result of calling this method is
    * "".  The simple name of an array consists of the simple name of
-   * its component type, followed by "[]".  Thus, an array with the 
+   * its component type, followed by "[]".  Thus, an array with the
    * component type of an anonymous class has a simple name of simply
    * "[]".
    *
-   * @param klass the class whose simple name should be returned. 
+   * @param klass the class whose simple name should be returned.
    * @return the simple name for this class.
    */
   static String getSimpleName(Class klass)
@@ -300,7 +300,7 @@ final class VMClass
       return "";
     if (isArray(klass))
       {
-	return getComponentType(klass).getSimpleName() + "[]";
+        return getComponentType(klass).getSimpleName() + "[]";
       }
     String fullName = getName(klass);
     int pos = fullName.lastIndexOf("$");
@@ -308,9 +308,9 @@ final class VMClass
       pos = 0;
     else
       {
-	++pos;
-	while (Character.isDigit(fullName.charAt(pos)))
-	  ++pos;
+        ++pos;
+        while (Character.isDigit(fullName.charAt(pos)))
+          ++pos;
       }
     int packagePos = fullName.lastIndexOf(".", pos);
     if (packagePos == -1)
@@ -346,7 +346,7 @@ final class VMClass
    * The canonical name for top-level classes, top-level interfaces and
    * primitive types is always the same as the fully-qualified name.
    * For array types, the canonical name is the canonical name of its
-   * component type with `[]' appended.  
+   * component type with `[]' appended.
    * </p>
    * <p>
    * The canonical name of a member class always refers to the place where
@@ -374,17 +374,17 @@ final class VMClass
       return null;
     if (isArray(klass))
       {
-	String componentName = getComponentType(klass).getCanonicalName();
-	if (componentName != null)
-	  return componentName + "[]";
+        String componentName = getComponentType(klass).getCanonicalName();
+        if (componentName != null)
+          return componentName + "[]";
       }
     if (isMemberClass(klass))
       {
-	String memberName = getDeclaringClass(klass).getCanonicalName();
-	if (memberName != null)
-	  return memberName + "." + getSimpleName(klass);
-	else
-	  return memberName;
+        String memberName = getDeclaringClass(klass).getCanonicalName();
+        if (memberName != null)
+          return memberName + "." + getSimpleName(klass);
+        else
+          return memberName;
       }
     return getName(klass);
   }
@@ -402,7 +402,7 @@ final class VMClass
 
   /**
    * Returns the constructor which immediately encloses the specified class.
-   * If the class is a top-level class, or a local or anonymous class 
+   * If the class is a top-level class, or a local or anonymous class
    * immediately enclosed by a type definition, instance initializer
    * or static initializer, then <code>null</code> is returned.
    *
@@ -416,7 +416,7 @@ final class VMClass
 
   /**
    * Returns the method which immediately encloses the specified class.  If
-   * the class is a top-level class, or a local or anonymous class 
+   * the class is a top-level class, or a local or anonymous class
    * immediately enclosed by a type definition, instance initializer
    * or static initializer, then <code>null</code> is returned.
    *
@@ -460,7 +460,7 @@ final class VMClass
   /**
    * Returns true if the specified class represents an member class.
    *
-   * @param klass the klass to test. 
+   * @param klass the klass to test.
    * @return true if the specified class represents an member class.
    * @since 1.5
    */
diff --git a/libjava/classpath/vm/reference/java/lang/VMClassLoader.java b/libjava/classpath/vm/reference/java/lang/VMClassLoader.java
index e56152d0126..c1d4625883c 100644
--- a/libjava/classpath/vm/reference/java/lang/VMClassLoader.java
+++ b/libjava/classpath/vm/reference/java/lang/VMClassLoader.java
@@ -77,7 +77,7 @@ final class VMClassLoader
 
   /** jars from property java.boot.class.path */
   static final HashMap bootjars = new HashMap();
-  
+
 
   /**
    * Converts the array string of native package names to
@@ -87,18 +87,18 @@ final class VMClassLoader
   static
   {
     String[] packages = getBootPackages();
-    
+
     if( packages != null)
       {
-        String specName = 
+        String specName =
               SystemProperties.getProperty("java.specification.name");
         String vendor =
               SystemProperties.getProperty("java.specification.vendor");
         String version =
               SystemProperties.getProperty("java.specification.version");
-        
+
         Package p;
-              
+
         for(int i = 0; i < packages.length; i++)
           {
             p = new Package(packages[i],
@@ -116,7 +116,7 @@ final class VMClassLoader
       }
   }
 
-  
+
   /**
    * Helper to define a class using a string of bytes. This assumes that
    * the security checks have already been performed, if necessary.
@@ -186,23 +186,23 @@ final class VMClassLoader
     Vector v = new Vector();
     while (st.hasMoreTokens())
       {
-	File file = new File(st.nextToken());
-	if (file.isDirectory())
-	  {
-	    try
-	      {
+        File file = new File(st.nextToken());
+        if (file.isDirectory())
+          {
+            try
+              {
                 File f = new File(file, name);
                 if (!f.exists()) continue;
                 v.add(new URL("file://" + f.getAbsolutePath()));
-	      }
-	    catch (MalformedURLException e)
-	      {
-		throw new Error(e);
-	      }
-	  }
-	else if (file.isFile())
-	  {
-	    ZipFile zip;
+              }
+            catch (MalformedURLException e)
+              {
+                throw new Error(e);
+              }
+          }
+        else if (file.isFile())
+          {
+            ZipFile zip;
             synchronized(bootjars)
               {
                 zip = (ZipFile) bootjars.get(file.getName());
@@ -210,31 +210,31 @@ final class VMClassLoader
             if(zip == null)
               {
                 try
-	          {
+                  {
                     zip = new ZipFile(file);
                     synchronized(bootjars)
                       {
                         bootjars.put(file.getName(), zip);
                       }
-	          }
-	        catch (IOException e)
-	          {
-		    continue;
-	          }
+                  }
+                catch (IOException e)
+                  {
+                    continue;
+                  }
               }
-	    String zname = name.startsWith("/") ? name.substring(1) : name;
-	    if (zip.getEntry(zname) == null)
-	      continue;
-	    try
-	      {
-		v.add(new URL("jar:file://"
-		  + file.getAbsolutePath() + "!/" + zname));
-	      }
-	    catch (MalformedURLException e)
-	      {
-		throw new Error(e);
-	      }
-	  }
+            String zname = name.startsWith("/") ? name.substring(1) : name;
+            if (zip.getEntry(zname) == null)
+              continue;
+            try
+              {
+                v.add(new URL("jar:file://"
+                  + file.getAbsolutePath() + "!/" + zname));
+              }
+            catch (MalformedURLException e)
+              {
+                throw new Error(e);
+              }
+          }
       }
     return v.elements();
   }
@@ -297,9 +297,9 @@ final class VMClassLoader
   }
 
 
-  
+
   /**
-   * Helper to get all packages from the bootstrap class loader.  
+   * Helper to get all packages from the bootstrap class loader.
    *
    * @return all named packages, if any exist
    */
@@ -410,7 +410,7 @@ final class VMClassLoader
   static final Class defineClassWithTransformers(ClassLoader loader,
       String name, byte[] data, int offset, int len, ProtectionDomain pd)
   {
-    
+
     if (instrumenter != null)
       {
         byte[] modifiedData = new byte[len];
@@ -419,7 +419,7 @@ final class VMClassLoader
         modifiedData =
           ((InstrumentationImpl)instrumenter).callTransformers(loader, jvmName,
             null, pd, modifiedData);
-        
+
         return defineClass(loader, name, modifiedData, 0, modifiedData.length,
             pd);
       }
diff --git a/libjava/classpath/vm/reference/java/lang/VMDouble.java b/libjava/classpath/vm/reference/java/lang/VMDouble.java
index 58b3b45b420..8e523cd2e85 100644
--- a/libjava/classpath/vm/reference/java/lang/VMDouble.java
+++ b/libjava/classpath/vm/reference/java/lang/VMDouble.java
@@ -46,7 +46,7 @@ import gnu.classpath.Configuration;
  */
 
 /**
- * Code relocated from java.lang.Double by 
+ * Code relocated from java.lang.Double by
  * @author Dave Grove (groved@us.ibm.com)
  */
 final class VMDouble
@@ -59,7 +59,7 @@ final class VMDouble
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary("javalang");
+        System.loadLibrary("javalang");
       }
 
     initIDs();
diff --git a/libjava/classpath/vm/reference/java/lang/VMFloat.java b/libjava/classpath/vm/reference/java/lang/VMFloat.java
index 26d89dc9d19..ba523d6973e 100644
--- a/libjava/classpath/vm/reference/java/lang/VMFloat.java
+++ b/libjava/classpath/vm/reference/java/lang/VMFloat.java
@@ -46,7 +46,7 @@ import gnu.classpath.Configuration;
  */
 
 /**
- * Code relocated from java.lang.Float by 
+ * Code relocated from java.lang.Float by
  * @author Dave Grove <groved@us.ibm.com>
  */
 final class VMFloat
diff --git a/libjava/classpath/vm/reference/java/lang/VMMath.java b/libjava/classpath/vm/reference/java/lang/VMMath.java
index 4d378245465..dc5fd420708 100644
--- a/libjava/classpath/vm/reference/java/lang/VMMath.java
+++ b/libjava/classpath/vm/reference/java/lang/VMMath.java
@@ -47,7 +47,7 @@ class VMMath
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary("javalang");
+        System.loadLibrary("javalang");
       }
   }
 
@@ -330,7 +330,7 @@ class VMMath
    * the original value is returned.  The returned result must be within 1 ulp
    * of the exact result.  For a finite value, <code>x</code>, the cube root
    * of <code>-x</code> is equal to the negation of the cube root
-   * of <code>x</code>. 
+   * of <code>x</code>.
    * </p>
    * <p>
    * For a square root, use <code>sqrt</code>.  For other roots, use
@@ -347,7 +347,7 @@ class VMMath
   /**
    * <p>
    * Returns the hyperbolic cosine of the given value.  For a value,
-   * <code>x</code>, the hyperbolic cosine is <code>(e<sup>x</sup> + 
+   * <code>x</code>, the hyperbolic cosine is <code>(e<sup>x</sup> +
    * e<sup>-x</sup>)/2</code>
    * with <code>e</code> being <a href="#E">Euler's number</a>.  The returned
    * result must be within 2.5 ulps of the exact result.
@@ -357,7 +357,7 @@ class VMMath
    * returned.  For either infinity, positive infinity is returned.
    * The hyperbolic cosine of zero must be 1.0.
    * </p>
-   * 
+   *
    * @param a the numeric argument
    * @return the hyperbolic cosine of <code>a</code>.
    * @since 1.5
@@ -372,12 +372,12 @@ class VMMath
    * 1 ulp of the exact result, and results must be semi-monotonic.  For finite
    * inputs, the returned value must be greater than or equal to -1.0.  Once
    * a result enters within half a ulp of this limit, the limit is returned.
-   * </p>   
+   * </p>
    * <p>
    * For <code>NaN</code>, positive infinity and zero, the original value
    * is returned.  Negative infinity returns a result of -1.0 (the limit).
    * </p>
-   * 
+   *
    * @param a the numeric argument
    * @return <code>e<sup>a</sup> - 1</code>
    * @since 1.5
@@ -396,7 +396,7 @@ class VMMath
    * is positive infinity.  Otherwise, if either argument is <code>NaN</code>,
    * then <code>NaN</code> is returned.
    * </p>
-   * 
+   *
    * @param a the first parameter.
    * @param b the second parameter.
    * @return the hypotenuse matching the supplied parameters.
@@ -449,7 +449,7 @@ class VMMath
   /**
    * <p>
    * Returns the hyperbolic sine of the given value.  For a value,
-   * <code>x</code>, the hyperbolic sine is <code>(e<sup>x</sup> - 
+   * <code>x</code>, the hyperbolic sine is <code>(e<sup>x</sup> -
    * e<sup>-x</sup>)/2</code>
    * with <code>e</code> being <a href="#E">Euler's number</a>.  The returned
    * result must be within 2.5 ulps of the exact result.
@@ -458,7 +458,7 @@ class VMMath
    * If the supplied value is <code>NaN</code>, an infinity or a zero, then the
    * original value is returned.
    * </p>
-   * 
+   *
    * @param a the numeric argument
    * @return the hyperbolic sine of <code>a</code>.
    * @since 1.5
@@ -468,7 +468,7 @@ class VMMath
   /**
    * <p>
    * Returns the hyperbolic tangent of the given value.  For a value,
-   * <code>x</code>, the hyperbolic tangent is <code>(e<sup>x</sup> - 
+   * <code>x</code>, the hyperbolic tangent is <code>(e<sup>x</sup> -
    * e<sup>-x</sup>)/(e<sup>x</sup> + e<sup>-x</sup>)</code>
    * (i.e. <code>sinh(a)/cosh(a)</code>)
    * with <code>e</code> being <a href="#E">Euler's number</a>.  The returned
@@ -483,7 +483,7 @@ class VMMath
    * value is returned.  Positive infinity returns +1.0 and negative infinity
    * returns -1.0.
    * </p>
-   * 
+   *
    * @param a the numeric argument
    * @return the hyperbolic tangent of <code>a</code>.
    * @since 1.5
diff --git a/libjava/classpath/vm/reference/java/lang/VMObject.java b/libjava/classpath/vm/reference/java/lang/VMObject.java
index 1d1ec40b511..279f250c089 100644
--- a/libjava/classpath/vm/reference/java/lang/VMObject.java
+++ b/libjava/classpath/vm/reference/java/lang/VMObject.java
@@ -54,7 +54,7 @@ final class VMObject
    * @return the class of the Object.
    */
   static native Class getClass(Object obj);
-  
+
   /**
    * The VM is expected to make a field-for-field shallow copy of the
    * argument. Thus, the copy has the same runtime type as the argument.
diff --git a/libjava/classpath/vm/reference/java/lang/VMProcess.java b/libjava/classpath/vm/reference/java/lang/VMProcess.java
index 076e5999d60..c41d7cc0c08 100644
--- a/libjava/classpath/vm/reference/java/lang/VMProcess.java
+++ b/libjava/classpath/vm/reference/java/lang/VMProcess.java
@@ -85,17 +85,17 @@ final class VMProcess extends Process
   static int reapedExitValue;
 
   // Information about this process
-  int state;				       // current state of process
-  final String[] cmd;			       // copied from Runtime.exec()
-  final String[] env;			       // copied from Runtime.exec()
-  final File dir;			       // copied from Runtime.exec()
-  Throwable exception;			       // if process failed to start
-  long pid;				       // process id
-  OutputStream stdin;			       // process input stream
-  InputStream stdout;			       // process output stream
-  InputStream stderr;			       // process error stream
-  int exitValue;			       // process exit value
-  boolean redirect;			       // redirect stderr -> stdout
+  int state;                                   // current state of process
+  final String[] cmd;                          // copied from Runtime.exec()
+  final String[] env;                          // copied from Runtime.exec()
+  final File dir;                              // copied from Runtime.exec()
+  Throwable exception;                         // if process failed to start
+  long pid;                                    // process id
+  OutputStream stdin;                          // process input stream
+  InputStream stdout;                          // process output stream
+  InputStream stderr;                          // process error stream
+  int exitValue;                               // process exit value
+  boolean redirect;                            // redirect stderr -> stdout
 
   //
   // Dedicated thread that does all the fork()'ing and wait()'ing
@@ -125,97 +125,97 @@ final class VMProcess extends Process
     {
       final LinkedList workList = VMProcess.workList;
       while (true)
-	{
+        {
 
-	  // Get the next process to spawn (if any) and spawn it. Spawn
-	  // at most one at a time before checking for reapable children.
-	  VMProcess process = null;
-	  synchronized (workList)
-	    {
-	      if (!workList.isEmpty())
-		process = (VMProcess)workList.removeFirst();
-	    }
+          // Get the next process to spawn (if any) and spawn it. Spawn
+          // at most one at a time before checking for reapable children.
+          VMProcess process = null;
+          synchronized (workList)
+            {
+              if (!workList.isEmpty())
+                process = (VMProcess)workList.removeFirst();
+            }
 
-	  if (process != null)
-	    spawn(process);
+          if (process != null)
+            spawn(process);
 
 
-	  // Check for termination of active child processes
-	  while (!activeMap.isEmpty() && VMProcess.nativeReap())
-	    {
-	      long pid = VMProcess.reapedPid;
-	      int exitValue = VMProcess.reapedExitValue;
-	      process = (VMProcess)activeMap.remove(new Long(pid));
-	      if (process != null)
-		{
-		  synchronized (process)
-		    {
-		      process.exitValue = exitValue;
-		      process.state = TERMINATED;
-		      process.notify();
-		    }
-		}
-	      else
-		System.err.println("VMProcess WARNING reaped unknown process: "
-				   + pid);
-	    }
+          // Check for termination of active child processes
+          while (!activeMap.isEmpty() && VMProcess.nativeReap())
+            {
+              long pid = VMProcess.reapedPid;
+              int exitValue = VMProcess.reapedExitValue;
+              process = (VMProcess)activeMap.remove(new Long(pid));
+              if (process != null)
+                {
+                  synchronized (process)
+                    {
+                      process.exitValue = exitValue;
+                      process.state = TERMINATED;
+                      process.notify();
+                    }
+                }
+              else
+                System.err.println("VMProcess WARNING reaped unknown process: "
+                                   + pid);
+            }
 
 
-	  // If there are more new processes to create, go do that now.
-	  // If there is nothing left to do, exit this thread. Otherwise,
-	  // sleep a little while, and then check again for reapable children.
-	  // We will get woken up immediately if there are new processes to
-	  // spawn, but not if there are new children to reap. So we only
-	  // sleep a short time, in effect polling while processes are active.
-	  synchronized (workList)
-	    {
-	      if (!workList.isEmpty())
-		continue;
-	      if (activeMap.isEmpty())
-		{
-		  processThread = null;
-		  break;
-		}
-	
-	      try
-		{
-		  workList.wait(MAX_REAP_DELAY);
-		}
-	      catch (InterruptedException e)
-		{
-		  /* ignore */
-		}
-	    }
-	}
+          // If there are more new processes to create, go do that now.
+          // If there is nothing left to do, exit this thread. Otherwise,
+          // sleep a little while, and then check again for reapable children.
+          // We will get woken up immediately if there are new processes to
+          // spawn, but not if there are new children to reap. So we only
+          // sleep a short time, in effect polling while processes are active.
+          synchronized (workList)
+            {
+              if (!workList.isEmpty())
+                continue;
+              if (activeMap.isEmpty())
+                {
+                  processThread = null;
+                  break;
+                }
+
+              try
+                {
+                  workList.wait(MAX_REAP_DELAY);
+                }
+              catch (InterruptedException e)
+                {
+                  /* ignore */
+                }
+            }
+        }
     }
 
     // Spawn a process
     private void spawn(VMProcess process)
     {
-      
+
       // Spawn the process and put it in our active map indexed by pid.
       // If the spawn operation fails, store the exception with the process.
       // In either case, wake up thread that created the process.
       synchronized (process)
-	{
-	  try
-	    {
-	      process.nativeSpawn(process.cmd, process.env, process.dir,
-				  process.redirect);
-	      process.state = RUNNING;
-	      activeMap.put(new Long(process.pid), process);
-	    }
+        {
+          try
+            {
+              process.nativeSpawn(process.cmd, process.env, process.dir,
+                                  process.redirect);
+              process.state = RUNNING;
+              activeMap.put(new Long(process.pid), process);
+            }
           catch (ThreadDeath death)
             {
               throw death;
             }
-	  catch (Throwable t)
-	    {
-	      process.state = TERMINATED;
-	      process.exception = t;
-	    }
-	  process.notify();
-	}
+          catch (Throwable t)
+            {
+              process.state = TERMINATED;
+              process.exception = t;
+            }
+          process.notify();
+        }
     }
   }
 
@@ -223,77 +223,77 @@ final class VMProcess extends Process
   private VMProcess(String[] cmd, String[] env, File dir, boolean redirect)
     throws IOException
   {
-    
+
     // Initialize this process
     this.state = INITIAL;
     this.cmd = cmd;
     this.env = env;
     this.dir = dir;
     this.redirect = redirect;
-  
+
     // Add process to the new process work list and wakeup processThread
     synchronized (workList)
       {
-	workList.add(this);
-	if (processThread == null)
-	  {
-	    processThread = new ProcessThread();
-	    processThread.setDaemon(true);
-	    processThread.start();
-	  }
-	else
-	  {
-	    workList.notify();
-	  }
+        workList.add(this);
+        if (processThread == null)
+          {
+            processThread = new ProcessThread();
+            processThread.setDaemon(true);
+            processThread.start();
+          }
+        else
+          {
+            workList.notify();
+          }
       }
 
     // Wait for processThread to spawn this process and update its state
     synchronized (this)
       {
-	while (state == INITIAL)
-	  {
-	    try
-	      {
-		wait();
-	      }
-	    catch (InterruptedException e)
-	      {
-		/* ignore */
-	      }
-	  }
+        while (state == INITIAL)
+          {
+            try
+              {
+                wait();
+              }
+            catch (InterruptedException e)
+              {
+                /* ignore */
+              }
+          }
       }
 
     // If spawning failed, rethrow the exception in this thread
     if (exception != null)
       {
-	exception.fillInStackTrace();
-	if (exception instanceof IOException)
-	  throw (IOException)exception;
+        exception.fillInStackTrace();
+        if (exception instanceof IOException)
+          throw (IOException)exception;
 
-	if (exception instanceof Error)
-	  throw (Error)exception;
+        if (exception instanceof Error)
+          throw (Error)exception;
 
-	if (exception instanceof RuntimeException)
-	  throw (RuntimeException)exception;
+        if (exception instanceof RuntimeException)
+          throw (RuntimeException)exception;
 
-	throw new RuntimeException(exception);
+        throw new RuntimeException(exception);
       }
   }
 
   // Invoked by native code (from nativeSpawn()) to record process info.
   private void setProcessInfo(OutputStream stdin,
-			      InputStream stdout, InputStream stderr, long pid)
+                              InputStream stdout, InputStream stderr, long pid)
   {
     this.stdin = stdin;
     this.stdout = stdout;
     if (stderr == null)
       this.stderr = new InputStream()
-	{
-	  public int read() throws IOException
-	  {
-	    return -1;
-	  }
-	};
+        {
+          public int read() throws IOException
+          {
+            return -1;
+          }
+        };
     else
       this.stderr = stderr;
     this.pid = pid;
@@ -308,7 +308,7 @@ final class VMProcess extends Process
   }
 
   static Process exec(List cmd, Map env,
-		      File dir, boolean redirect) throws IOException
+                      File dir, boolean redirect) throws IOException
   {
     String[] acmd = (String[]) cmd.toArray(new String[cmd.size()]);
     String[] aenv = new String[env.size()];
@@ -317,8 +317,8 @@ final class VMProcess extends Process
     Iterator iter = env.entrySet().iterator();
     while (iter.hasNext())
       {
-	Map.Entry entry = (Map.Entry) iter.next();
-	aenv[i++] = entry.getKey() + "=" + entry.getValue();
+        Map.Entry entry = (Map.Entry) iter.next();
+        aenv[i++] = entry.getKey() + "=" + entry.getValue();
       }
 
     return new VMProcess(acmd, aenv, dir, redirect);
@@ -359,17 +359,17 @@ final class VMProcess extends Process
       return;
 
     nativeKill(pid);
-    
+
     while (state != TERMINATED)
       {
-	try
-	  {
-	    wait();
-	  }
-	catch (InterruptedException e)
-	  {
-	    /* ignore */
-	  }
+        try
+          {
+            wait();
+          }
+        catch (InterruptedException e)
+          {
+            /* ignore */
+          }
       }
   }
 
@@ -381,7 +381,7 @@ final class VMProcess extends Process
    * @throws IOException if the O/S process could not be created.
    */
   native void nativeSpawn(String[] cmd, String[] env, File dir,
-			  boolean redirect)
+                          boolean redirect)
     throws IOException;
 
   /**
diff --git a/libjava/classpath/vm/reference/java/lang/VMRuntime.java b/libjava/classpath/vm/reference/java/lang/VMRuntime.java
index b685b351239..0b58d5f44db 100644
--- a/libjava/classpath/vm/reference/java/lang/VMRuntime.java
+++ b/libjava/classpath/vm/reference/java/lang/VMRuntime.java
@@ -50,7 +50,7 @@ final class VMRuntime
     /**
      * No instance is ever created.
      */
-    private VMRuntime() 
+    private VMRuntime()
     {
     }
 
@@ -177,7 +177,7 @@ final class VMRuntime
      * @throws NullPointerException if cmd or env have null elements
      */
     static Process exec(String[] cmd, String[] env, File dir)
-	throws IOException {
+        throws IOException {
       return VMProcess.exec(cmd, env, dir);
     }
 
diff --git a/libjava/classpath/vm/reference/java/lang/VMString.java b/libjava/classpath/vm/reference/java/lang/VMString.java
index 7e65eed98f7..e1fbf839023 100644
--- a/libjava/classpath/vm/reference/java/lang/VMString.java
+++ b/libjava/classpath/vm/reference/java/lang/VMString.java
@@ -47,7 +47,7 @@ import java.util.WeakHashMap;
  */
 
 /**
- * Code relocated from java.lang.String by 
+ * Code relocated from java.lang.String by
  * @author Dave Grove <groved@us.ibm.com>
  */
 final class VMString
diff --git a/libjava/classpath/vm/reference/java/lang/VMSystem.java b/libjava/classpath/vm/reference/java/lang/VMSystem.java
index bf46b27aa92..52a3c1c9f66 100644
--- a/libjava/classpath/vm/reference/java/lang/VMSystem.java
+++ b/libjava/classpath/vm/reference/java/lang/VMSystem.java
@@ -163,7 +163,7 @@ final class VMSystem
    * </p>
    *
    * @return the time of a system timer in nanoseconds.
-   * @since 1.5 
+   * @since 1.5
    */
   public static native long nanoTime();
 
@@ -178,18 +178,18 @@ final class VMSystem
   /**
    * Helper method which creates the standard input stream.
    * VM implementors may choose to construct these streams differently.
-   * This method can also return null if the stream is created somewhere 
+   * This method can also return null if the stream is created somewhere
    * else in the VM startup sequence.
    */
   static InputStream makeStandardInputStream()
   {
     return new BufferedInputStream(new FileInputStream(FileDescriptor.in));
   }
-  
+
   /**
    * Helper method which creates the standard output stream.
    * VM implementors may choose to construct these streams differently.
-   * This method can also return null if the stream is created somewhere 
+   * This method can also return null if the stream is created somewhere
    * else in the VM startup sequence.
    */
   static PrintStream makeStandardOutputStream()
@@ -200,14 +200,14 @@ final class VMSystem
   /**
    * Helper method which creates the standard error stream.
    * VM implementors may choose to construct these streams differently.
-   * This method can also return null if the stream is created somewhere 
+   * This method can also return null if the stream is created somewhere
    * else in the VM startup sequence.
    */
   static PrintStream makeStandardErrorStream()
   {
     return new PrintStream(new BufferedOutputStream(new FileOutputStream(FileDescriptor.err)), true);
   }
-  
+
   /**
    * Gets the value of an environment variable.
    * Always returning null is a valid (but not very useful) implementation.
diff --git a/libjava/classpath/vm/reference/java/lang/VMThread.java b/libjava/classpath/vm/reference/java/lang/VMThread.java
index ff0ec687863..1b461a69436 100644
--- a/libjava/classpath/vm/reference/java/lang/VMThread.java
+++ b/libjava/classpath/vm/reference/java/lang/VMThread.java
@@ -62,7 +62,7 @@ package java.lang;
  * or to implement some optional (and sometimes deprecated) behaviour. Default
  * implementations are provided but it is highly recommended to optimize them
  * for a specific VM.
- * 
+ *
  * @author Jeroen Frijters (jeroen@frijters.net)
  * @author Dalibor Topic (robilad@kaffe.org)
  */
@@ -93,7 +93,7 @@ final class VMThread
      */
     private VMThread(Thread thread)
     {
-	this.thread = thread;
+        this.thread = thread;
     }
 
     /**
@@ -103,48 +103,48 @@ final class VMThread
      */
     private void run()
     {
-	try
-	{
-	    try
-	    {
-		running = true;
-		synchronized(thread)
-		{
-		    Throwable t = thread.stillborn;
-		    if(t != null)
-		    {
-			thread.stillborn = null;
-			throw t;
-		    }
-		}
-		thread.run();
-	    }
-	    catch(Throwable t)
-	    {
-		try
-		{
-		  Thread.UncaughtExceptionHandler handler;
-		  handler = thread.getUncaughtExceptionHandler();
-		  handler.uncaughtException(thread, t);
-		}
-		catch(Throwable ignore)
-		{
-		}
-	    }
-	}
-	finally
-	{
-	    // Setting runnable to false is partial protection against stop
-	    // being called while we're cleaning up. To be safe all code in
-	    // VMThread be unstoppable.
-	    running = false;
-	    thread.die();
-	    synchronized(this)
-	    {
-		// release the threads waiting to join us
-		notifyAll();
-	    }
-	}
+        try
+        {
+            try
+            {
+                running = true;
+                synchronized(thread)
+                {
+                    Throwable t = thread.stillborn;
+                    if(t != null)
+                    {
+                        thread.stillborn = null;
+                        throw t;
+                    }
+                }
+                thread.run();
+            }
+            catch(Throwable t)
+            {
+                try
+                {
+                  Thread.UncaughtExceptionHandler handler;
+                  handler = thread.getUncaughtExceptionHandler();
+                  handler.uncaughtException(thread, t);
+                }
+                catch(Throwable ignore)
+                {
+                }
+            }
+        }
+        finally
+        {
+            // Setting runnable to false is partial protection against stop
+            // being called while we're cleaning up. To be safe all code in
+            // VMThread be unstoppable.
+            running = false;
+            thread.die();
+            synchronized(this)
+            {
+                // release the threads waiting to join us
+                notifyAll();
+            }
+        }
     }
 
     /**
@@ -158,9 +158,9 @@ final class VMThread
      */
     static void create(Thread thread, long stacksize)
     {
-	VMThread vmThread = new VMThread(thread);
-	vmThread.start(stacksize);
-	thread.vmThread = vmThread;
+        VMThread vmThread = new VMThread(thread);
+        vmThread.start(stacksize);
+        thread.vmThread = vmThread;
     }
 
     /**
@@ -170,7 +170,7 @@ final class VMThread
      */
     String getName()
     {
-	return thread.name;
+        return thread.name;
     }
 
     /**
@@ -181,7 +181,7 @@ final class VMThread
      */
     void setName(String name)
     {
-	thread.name = name;
+        thread.name = name;
     }
 
     /**
@@ -192,8 +192,8 @@ final class VMThread
      */
     void setPriority(int priority)
     {
-	thread.priority = priority;
-	nativeSetPriority(priority);
+        thread.priority = priority;
+        nativeSetPriority(priority);
     }
 
     /**
@@ -243,32 +243,32 @@ final class VMThread
      */
     synchronized void join(long ms, int ns) throws InterruptedException
     {
-	// Round up
-	ms += (ns != 0) ? 1 : 0;
+        // Round up
+        ms += (ns != 0) ? 1 : 0;
 
-	// Compute end time, but don't overflow
-	long now = System.currentTimeMillis();
-	long end = now + ms;
-	if (end < now)
-	    end = Long.MAX_VALUE;
+        // Compute end time, but don't overflow
+        long now = System.currentTimeMillis();
+        long end = now + ms;
+        if (end < now)
+            end = Long.MAX_VALUE;
 
-	// A VM is allowed to return from wait() without notify() having been
-	// called, so we loop to handle possible spurious wakeups.
-	while(thread.vmThread != null)
-	{
-	    // We use the VMThread object to wait on, because this is a private
-	    // object, so client code cannot call notify on us.
-	    wait(ms);
-	    if(ms != 0)
-	    {
-		now = System.currentTimeMillis();
-		ms = end - now;
-		if(ms <= 0)
-		{
-		    break;
-		}
-	    }
-	}
+        // A VM is allowed to return from wait() without notify() having been
+        // called, so we loop to handle possible spurious wakeups.
+        while(thread.vmThread != null)
+        {
+            // We use the VMThread object to wait on, because this is a private
+            // object, so client code cannot call notify on us.
+            wait(ms);
+            if(ms != 0)
+            {
+                now = System.currentTimeMillis();
+                ms = end - now;
+                if(ms <= 0)
+                {
+                    break;
+                }
+            }
+        }
     }
 
     /**
@@ -276,7 +276,7 @@ final class VMThread
      * If you stop a Thread that has not yet started, the stop is ignored
      * (contrary to what the JDK documentation says).
      * <b>WARNING</b>This bypasses Java security, and can throw a checked
-     * exception which the call stack is unprepared to handle. Do not abuse 
+     * exception which the call stack is unprepared to handle. Do not abuse
      * this power.
      *
      * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
@@ -290,12 +290,12 @@ final class VMThread
      */
     void stop(Throwable t)
     {
-	// Note: we assume that we own the lock on thread
-	// (i.e. that Thread.stop() is synchronized)
-	if(running)
-	    nativeStop(t);
-	else
-	    thread.stillborn = t;
+        // Note: we assume that we own the lock on thread
+        // (i.e. that Thread.stop() is synchronized)
+        if(running)
+            nativeStop(t);
+        else
+            thread.stillborn = t;
     }
 
     /**
@@ -383,33 +383,33 @@ final class VMThread
       // It's unclear if this is a bug in the implementation or the spec.
       // See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6213203
       if (ms == 0 && ns == 0)
-	{
-	  if (Thread.interrupted())
-	    throw new InterruptedException();
-	  return;
-	}
+        {
+          if (Thread.interrupted())
+            throw new InterruptedException();
+          return;
+        }
 
       // Compute end time, but don't overflow
       long now = System.currentTimeMillis();
       long end = now + ms;
       if (end < now)
-	  end = Long.MAX_VALUE;
+          end = Long.MAX_VALUE;
 
       // A VM is allowed to return from wait() without notify() having been
       // called, so we loop to handle possible spurious wakeups.
       VMThread vt = Thread.currentThread().vmThread;
       synchronized (vt)
-	{
-	  while (true)
-	    {
-	      vt.wait(ms, ns);
-	      now = System.currentTimeMillis();
-	      if (now >= end)
-		break;
-	      ms = end - now;
-	      ns = 0;
-	    }
-	}
+        {
+          while (true)
+            {
+              vt.wait(ms, ns);
+              now = System.currentTimeMillis();
+              if (now >= end)
+                break;
+              ms = end - now;
+              ns = 0;
+            }
+        }
     }
 
     /**
@@ -428,23 +428,23 @@ final class VMThread
      * @return true if the current thread is currently synchronized on obj
      * @throws NullPointerException if obj is null
      */
-    static boolean holdsLock(Object obj) 
+    static boolean holdsLock(Object obj)
     {
       /* Use obj.notify to check if the current thread holds
        * the monitor of the object.
        * If it doesn't, notify will throw an exception.
        */
-      try 
-	{
-	  obj.notify();
-	  // okay, current thread holds lock
-	  return true;
-	}
+      try
+        {
+          obj.notify();
+          // okay, current thread holds lock
+          return true;
+        }
       catch (IllegalMonitorStateException e)
-	{
-	  // it doesn't hold the lock
-	  return false;
-	}
+        {
+          // it doesn't hold the lock
+          return false;
+        }
     }
 
   /**
@@ -453,7 +453,7 @@ final class VMThread
    * "RUNNABLE", "TERMINATED", "TIMED_WAITING" or
    * "WAITING".
    *
-   * @return a string corresponding to one of the 
+   * @return a string corresponding to one of the
    *         thread enumeration states specified above.
    */
   native String getState();
diff --git a/libjava/classpath/vm/reference/java/lang/reflect/VMConstructor.java b/libjava/classpath/vm/reference/java/lang/reflect/VMConstructor.java
index dbed90388a3..c6f3190268b 100644
--- a/libjava/classpath/vm/reference/java/lang/reflect/VMConstructor.java
+++ b/libjava/classpath/vm/reference/java/lang/reflect/VMConstructor.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -47,7 +47,7 @@ final class VMConstructor
   Class clazz;
   int slot;
 
-  /** 
+  /**
    * This field allows us to refer back to the main constructor instance.
    *  It is set by the constructor of Constructor.
    */
@@ -97,7 +97,7 @@ final class VMConstructor
    * is no Signature attribute, return null.
    */
   native String getSignature();
-  
+
   /**
    * <p>
    * Return an array of arrays representing the annotations on each
@@ -112,7 +112,7 @@ final class VMConstructor
    * The returned annotations are serialized.  Changing the annotations has
    * no affect on the return value of future calls to this method.
    * </p>
-   * 
+   *
    * @return an array of arrays which represents the annotations used on the
    *         parameters of this constructor.  The order of the array elements
    *         matches the declaration order of the parameters.
@@ -134,7 +134,7 @@ final class VMConstructor
   {
     if (!(o instanceof Constructor))
       return false;
-    Constructor that = (Constructor)o; 
+    Constructor that = (Constructor)o;
     if (clazz != that.getDeclaringClass())
       return false;
     if (!Arrays.equals(getParameterTypes(), that.getParameterTypes()))
diff --git a/libjava/classpath/vm/reference/java/lang/reflect/VMField.java b/libjava/classpath/vm/reference/java/lang/reflect/VMField.java
index 53f38474952..ee9239a8e2f 100644
--- a/libjava/classpath/vm/reference/java/lang/reflect/VMField.java
+++ b/libjava/classpath/vm/reference/java/lang/reflect/VMField.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -45,8 +45,8 @@ final class VMField
   Class clazz;
   String name;
   int slot;
-  
-  /** 
+
+  /**
    * This field allows us to refer back to the main constructor instance.
    *  It is set by the constructor of Field.
    */
@@ -512,7 +512,7 @@ final class VMField
   {
     if (!(o instanceof Field))
       return false;
-    Field that = (Field)o; 
+    Field that = (Field)o;
     if (clazz != that.getDeclaringClass())
       return false;
     if (!name.equals(that.getName()))
diff --git a/libjava/classpath/vm/reference/java/lang/reflect/VMMethod.java b/libjava/classpath/vm/reference/java/lang/reflect/VMMethod.java
index f8574cd87a2..d8bb8b4a3b0 100644
--- a/libjava/classpath/vm/reference/java/lang/reflect/VMMethod.java
+++ b/libjava/classpath/vm/reference/java/lang/reflect/VMMethod.java
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -48,7 +48,7 @@ final class VMMethod
   String name;
   int slot;
 
-  /** 
+  /**
    * This field allows us to refer back to the main constructor instance.
    *  It is set by the constructor of Field.
    */
@@ -129,7 +129,7 @@ final class VMMethod
    * The returned annotations are serialized.  Changing the annotations has
    * no affect on the return value of future calls to this method.
    * </p>
-   * 
+   *
    * @return an array of arrays which represents the annotations used on the
    *         parameters of this method.  The order of the array elements
    *         matches the declaration order of the parameters.
@@ -206,4 +206,3 @@ final class VMMethod
   native Annotation[] getDeclaredAnnotations();
 
 }
-
diff --git a/libjava/classpath/vm/reference/java/net/VMNetworkInterface.java b/libjava/classpath/vm/reference/java/net/VMNetworkInterface.java
index 63a29b16ba5..fca0c525ae1 100644
--- a/libjava/classpath/vm/reference/java/net/VMNetworkInterface.java
+++ b/libjava/classpath/vm/reference/java/net/VMNetworkInterface.java
@@ -64,7 +64,7 @@ final class VMNetworkInterface
     this.name = name;
     addresses = new HashSet();
   }
-  
+
   /**
    * Creates a dummy instance which represents any network
    * interface.
@@ -81,15 +81,15 @@ final class VMNetworkInterface
         // Cannot happen.
       }
   }
-  
+
   static
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       System.loadLibrary("javanet");
-    
+
     initIds();
   }
-  
+
   private static native void initIds();
 
   /**
@@ -100,7 +100,7 @@ final class VMNetworkInterface
    */
   public static native VMNetworkInterface[] getVMInterfaces()
     throws SocketException;
-  
+
   private void addAddress(ByteBuffer addr)
     throws SocketException, UnknownHostException
   {
diff --git a/libjava/classpath/vm/reference/java/nio/channels/VMChannels.java b/libjava/classpath/vm/reference/java/nio/channels/VMChannels.java
index c833b6eecfd..05b1441c06e 100644
--- a/libjava/classpath/vm/reference/java/nio/channels/VMChannels.java
+++ b/libjava/classpath/vm/reference/java/nio/channels/VMChannels.java
@@ -63,35 +63,35 @@ final class VMChannels
   {
     try
       {
-	Class[] argTypes = new Class[1];
-	argTypes[0] = FileChannelImpl.class;
-	Constructor constructor =
-	  streamClass.getDeclaredConstructor(argTypes);
-	constructor.setAccessible(true);
-	Object[] args = new Object[1];
-	args[0] = ch;
-	return constructor.newInstance(args);
+        Class[] argTypes = new Class[1];
+        argTypes[0] = FileChannelImpl.class;
+        Constructor constructor =
+          streamClass.getDeclaredConstructor(argTypes);
+        constructor.setAccessible(true);
+        Object[] args = new Object[1];
+        args[0] = ch;
+        return constructor.newInstance(args);
       }
     catch (IllegalAccessException e)
       {
-	// Ignored.
+        // Ignored.
       }
     catch (InstantiationException e)
       {
-	// Ignored.
+        // Ignored.
       }
     catch (InvocationTargetException e)
       {
-	// Ignored.
+        // Ignored.
       }
     catch (NoSuchMethodException e)
       {
-	// Ignored.
+        // Ignored.
       }
 
     return null;
   }
-  
+
   /**
    * Constructs a stream that reads bytes from the given channel.
    */
@@ -99,7 +99,7 @@ final class VMChannels
   {
     if (ch instanceof FileChannelImpl)
       return (FileInputStream) createStream(FileInputStream.class, ch);
-    
+
     return  new ChannelInputStream(ch);
   }
 
@@ -110,7 +110,7 @@ final class VMChannels
   {
     if (ch instanceof FileChannelImpl)
       return (FileOutputStream) createStream(FileOutputStream.class, ch);
-    
+
     return new ChannelOutputStream(ch);
   }
 }
diff --git a/libjava/classpath/vm/reference/java/security/VMAccessController.java b/libjava/classpath/vm/reference/java/security/VMAccessController.java
index da13c688946..9299e6f84cc 100644
--- a/libjava/classpath/vm/reference/java/security/VMAccessController.java
+++ b/libjava/classpath/vm/reference/java/security/VMAccessController.java
@@ -205,8 +205,8 @@ final class VMAccessController
             && method.equals ("doPrivileged"))
           {
             // If there was a call to doPrivileged with a supplied context,
-            // return that context. If using JAAS doAs*, it should be 
-	    // a context with a SubjectDomainCombiner
+            // return that context. If using JAAS doAs*, it should be
+            // a context with a SubjectDomainCombiner
             LinkedList l = (LinkedList) contexts.get();
             if (l != null)
               context = (AccessControlContext) l.getFirst();
@@ -214,7 +214,7 @@ final class VMAccessController
           }
 
         // subject to getProtectionDomain RuntimePermission
-	ProtectionDomain domain = clazz.getProtectionDomain();
+        ProtectionDomain domain = clazz.getProtectionDomain();
 
         if (domain == null)
           continue;
diff --git a/libjava/classpath/vm/reference/java/security/VMSecureRandom.java b/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
index 5eeb158bc81..bea15497762 100644
--- a/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
+++ b/libjava/classpath/vm/reference/java/security/VMSecureRandom.java
@@ -126,4 +126,4 @@ final class VMSecureRandom
       running = false;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/vm/reference/java/util/VMTimeZone.java b/libjava/classpath/vm/reference/java/util/VMTimeZone.java
index 992ecaf28a8..11061aa32bf 100644
--- a/libjava/classpath/vm/reference/java/util/VMTimeZone.java
+++ b/libjava/classpath/vm/reference/java/util/VMTimeZone.java
@@ -55,10 +55,10 @@ final class VMTimeZone
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary("javautil");
+        System.loadLibrary("javautil");
       }
   }
-		
+
   /**
    * This method returns a time zone id string which is in the form
    * (standard zone name) or (standard zone name)(GMT offset) or
@@ -104,67 +104,67 @@ final class VMTimeZone
     // Try to parse /etc/timezone.
     if (zone == null)
       {
-	tzid = readTimeZoneFile("/etc/timezone");
-	if (tzid != null && !tzid.equals(""))
-	  zone = TimeZone.getDefaultTimeZone(tzid);
+        tzid = readTimeZoneFile("/etc/timezone");
+        if (tzid != null && !tzid.equals(""))
+          zone = TimeZone.getDefaultTimeZone(tzid);
       }
-    
+
     // Try to parse /etc/localtime
     if (zone == null)
       {
-	zone = ZoneInfo.readTZFile((String) null, "/etc/localtime");
-	if (zone != null)
-	  {
-	    // Try to find a more suitable ID for the /etc/localtime
-	    // timezone.
-	    // Sometimes /etc/localtime is a symlink to some
-	    // /usr/share/zoneinfo/ file.
-	    String id = null;
-	    try
-	      {
-		id = new File("/etc/localtime").getCanonicalPath();
-		if (id != null)
-		  {
-		    String zoneinfo_dir
-		      = SystemProperties.getProperty("gnu.java.util.zoneinfo.dir");
-		    if (zoneinfo_dir != null)
-		      zoneinfo_dir
-			= new File(zoneinfo_dir
-				   + File.separatorChar).getCanonicalPath();
-		    if (zoneinfo_dir != null && id.startsWith(zoneinfo_dir))
-		      {
-			int pos = zoneinfo_dir.length();
-			while (pos < id.length()
-			       && id.charAt(pos) == File.separatorChar)
-			  pos++;
-			if (pos < id.length())
-			  id = id.substring(pos);
-			else
-			  id = null;
-		      }
-		    else
-		      id = null;
-		  }
-	      }
-	    catch (IOException ioe)
-	      {
-		id = null;
-	      }
+        zone = ZoneInfo.readTZFile((String) null, "/etc/localtime");
+        if (zone != null)
+          {
+            // Try to find a more suitable ID for the /etc/localtime
+            // timezone.
+            // Sometimes /etc/localtime is a symlink to some
+            // /usr/share/zoneinfo/ file.
+            String id = null;
+            try
+              {
+                id = new File("/etc/localtime").getCanonicalPath();
+                if (id != null)
+                  {
+                    String zoneinfo_dir
+                      = SystemProperties.getProperty("gnu.java.util.zoneinfo.dir");
+                    if (zoneinfo_dir != null)
+                      zoneinfo_dir
+                        = new File(zoneinfo_dir
+                                   + File.separatorChar).getCanonicalPath();
+                    if (zoneinfo_dir != null && id.startsWith(zoneinfo_dir))
+                      {
+                        int pos = zoneinfo_dir.length();
+                        while (pos < id.length()
+                               && id.charAt(pos) == File.separatorChar)
+                          pos++;
+                        if (pos < id.length())
+                          id = id.substring(pos);
+                        else
+                          id = null;
+                      }
+                    else
+                      id = null;
+                  }
+              }
+            catch (IOException ioe)
+              {
+                id = null;
+              }
 
-	    if (id == null)
-	      id = readSysconfigClockFile("/etc/sysconfig/clock");
+            if (id == null)
+              id = readSysconfigClockFile("/etc/sysconfig/clock");
 
-	    if (id != null)
-	      zone.setID(id);
-	  }
+            if (id != null)
+              zone.setID(id);
+          }
       }
 
     // Try some system specific way
     if (zone == null)
       {
-	tzid = getSystemTimeZoneId();
-	if (tzid != null && !tzid.equals(""))
-	  zone = TimeZone.getDefaultTimeZone(tzid);
+        tzid = getSystemTimeZoneId();
+        if (tzid != null && !tzid.equals(""))
+          zone = TimeZone.getDefaultTimeZone(tzid);
       }
 
     return zone;
@@ -192,42 +192,42 @@ final class VMTimeZone
     InputStreamReader isr = null;
     try
       {
-	FileInputStream fis = new FileInputStream(f);
-	BufferedInputStream bis = new BufferedInputStream(fis);
-	isr = new InputStreamReader(bis);
-	
-	StringBuffer sb = new StringBuffer();
-	int i = isr.read();
-	while (i != -1)
-	  {
-	    char c = (char) i;
-	    if (Character.isLetter(c) || Character.isDigit(c)
-		|| c == '/' || c == '-' || c == '_')
-	      {
-		sb.append(c);
-		i = isr.read();
-	      }
-	    else
-	      break;
-	  }
-	return sb.toString();
+        FileInputStream fis = new FileInputStream(f);
+        BufferedInputStream bis = new BufferedInputStream(fis);
+        isr = new InputStreamReader(bis);
+
+        StringBuffer sb = new StringBuffer();
+        int i = isr.read();
+        while (i != -1)
+          {
+            char c = (char) i;
+            if (Character.isLetter(c) || Character.isDigit(c)
+                || c == '/' || c == '-' || c == '_')
+              {
+                sb.append(c);
+                i = isr.read();
+              }
+            else
+              break;
+          }
+        return sb.toString();
       }
     catch (IOException ioe)
       {
-	// Parse error, not a proper tzfile.
-	return null;
+        // Parse error, not a proper tzfile.
+        return null;
       }
     finally
       {
-	try
-	  {
-	    if (isr != null)
-	      isr.close();
-	  }
-	catch (IOException ioe)
-	  {
-	    // Error while close, nothing we can do.
-	  }
+        try
+          {
+            if (isr != null)
+              isr.close();
+          }
+        catch (IOException ioe)
+          {
+            // Error while close, nothing we can do.
+          }
       }
   }
 
@@ -248,48 +248,48 @@ final class VMTimeZone
     BufferedReader br = null;
     try
       {
-	FileInputStream fis = new FileInputStream(file);
-	BufferedInputStream bis = new BufferedInputStream(fis);
-	br = new BufferedReader(new InputStreamReader(bis));
+        FileInputStream fis = new FileInputStream(file);
+        BufferedInputStream bis = new BufferedInputStream(fis);
+        br = new BufferedReader(new InputStreamReader(bis));
 
-	for (String line = br.readLine(); line != null; line = br.readLine())
-	  {
-	    line = line.trim();
-	    if (line.length() < 8 || !line.startsWith("ZONE="))
-	      continue;
-	    int posstart = 6;
-	    int posend;
-	    if (line.charAt(5) == '"')
-	      posend = line.indexOf('"', 6);
-	    else if (line.charAt(5) == '\'')
-	      posend = line.indexOf('\'', 6);
-	    else
-	      {
-		posstart = 5;
-		posend = line.length();
-	      }
-	    if (posend < 0)
-	      return null;
-	    return line.substring(posstart, posend);
-	  }
-	return null;
+        for (String line = br.readLine(); line != null; line = br.readLine())
+          {
+            line = line.trim();
+            if (line.length() < 8 || !line.startsWith("ZONE="))
+              continue;
+            int posstart = 6;
+            int posend;
+            if (line.charAt(5) == '"')
+              posend = line.indexOf('"', 6);
+            else if (line.charAt(5) == '\'')
+              posend = line.indexOf('\'', 6);
+            else
+              {
+                posstart = 5;
+                posend = line.length();
+              }
+            if (posend < 0)
+              return null;
+            return line.substring(posstart, posend);
+          }
+        return null;
       }
     catch (IOException ioe)
       {
-	// Parse error, not a proper tzfile.
-	return null;
+        // Parse error, not a proper tzfile.
+        return null;
       }
     finally
       {
-	try
-	  {
-	    if (br != null)
-	      br.close();
-	  }
-	catch (IOException ioe)
-	  {
-	    // Error while close, nothing we can do.
-	  }
+        try
+          {
+            if (br != null)
+              br.close();
+          }
+        catch (IOException ioe)
+          {
+            // Error while close, nothing we can do.
+          }
       }
   }
 
diff --git a/libjava/classpath/vm/reference/sun/misc/Unsafe.java b/libjava/classpath/vm/reference/sun/misc/Unsafe.java
index 5dee8cfefd7..e316bdb8da1 100644
--- a/libjava/classpath/vm/reference/sun/misc/Unsafe.java
+++ b/libjava/classpath/vm/reference/sun/misc/Unsafe.java
@@ -76,7 +76,7 @@ public class Unsafe
       sm.checkPropertiesAccess();
     return unsafe;
   }
-  
+
   /**
    * Returns the memory address offset of the given static field.
    * The offset is merely used as a means to access a particular field
@@ -272,7 +272,7 @@ public class Unsafe
   /**
    * Returns the offset of the first element for a given array class.
    * To access elements of the array class, this value may be used along
-   * with that returned by 
+   * with that returned by
    * <a href="#arrayIndexScale"><code>arrayIndexScale</code></a>,
    * if non-zero.
    *
@@ -287,7 +287,7 @@ public class Unsafe
    * Returns the scale factor used for addressing elements of the supplied
    * array class.  Where a suitable scale factor can not be returned (e.g.
    * for primitive types), zero should be returned.  The returned value
-   * can be used with 
+   * can be used with
    * <a href="#arrayBaseOffset"><code>arrayBaseOffset</code></a>
    * to access elements of the class.
    *
@@ -295,9 +295,9 @@ public class Unsafe
    * @return the scale factor, or zero if not supported for this array class.
    */
   public native int arrayIndexScale(Class arrayClass);
-  
+
   /**
-   * Releases the block on a thread created by 
+   * Releases the block on a thread created by
    * <a href="#park"><code>park</code></a>.  This method can also be used
    * to terminate a blockage caused by a prior call to <code>park</code>.
    * This operation is unsafe, as the thread must be guaranteed to be
@@ -308,7 +308,7 @@ public class Unsafe
   public native void unpark(Object thread);
 
   /**
-   * Blocks the thread until a matching 
+   * Blocks the thread until a matching
    * <a href="#unpark"><code>unpark</code></a> occurs, the thread is
    * interrupted or the optional timeout expires.  If an <code>unpark</code>
    * call has already occurred, this also counts.  A timeout value of zero
diff --git a/libjava/classpath/vm/reference/sun/reflect/Reflection.java b/libjava/classpath/vm/reference/sun/reflect/Reflection.java
index ef25ce71f1c..ddbb69d16a8 100644
--- a/libjava/classpath/vm/reference/sun/reflect/Reflection.java
+++ b/libjava/classpath/vm/reference/sun/reflect/Reflection.java
@@ -42,7 +42,7 @@ import gnu.classpath.VMStackWalker;
 public class Reflection
 {
   /**
-   * A stack-walking wrapper method used by the JSR 166 RI. 
+   * A stack-walking wrapper method used by the JSR 166 RI.
    */
   public static Class getCallerClass(int depth)
   {
diff --git a/libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java b/libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java
index 88a6f2515bf..aca365d6b9e 100644
--- a/libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java
+++ b/libjava/classpath/vm/reference/sun/reflect/misc/ReflectUtil.java
@@ -53,7 +53,7 @@ public class ReflectUtil
 
   /**
    * Check if the current thread is allowed to access the package of
-   * the declaringClass. 
+   * the declaringClass.
    *
    * @param declaringClass class name to check access to
    * @throws SecurityException if permission is denied
@@ -64,15 +64,15 @@ public class ReflectUtil
     SecurityManager sm;
     if ((sm = System.getSecurityManager()) != null)
       {
-	while (declaringClass.isArray())
-	  declaringClass = declaringClass.getComponentType();
-	String name = declaringClass.getName();
-	int i = name.lastIndexOf('.');
-	if (i != -1) // if declaringClass is a member of a package
-	  {
-	    name = name.substring(0, i);
-	    sm.checkPackageAccess(name);
-	  }
+        while (declaringClass.isArray())
+          declaringClass = declaringClass.getComponentType();
+        String name = declaringClass.getName();
+        int i = name.lastIndexOf('.');
+        if (i != -1) // if declaringClass is a member of a package
+          {
+            name = name.substring(0, i);
+            sm.checkPackageAccess(name);
+          }
       }
   }